From b02f71ca84f7d4d9b6e9c5a7a0abf2cbae8537bf Mon Sep 17 00:00:00 2001 From: Kaballist Date: Fri, 28 Jul 2023 00:50:44 -0700 Subject: [PATCH 01/17] Update gradle and kotlin version Migrate to gradle version catalogs opt in for typesafe project accessors modify launcher update to create the bat if none is there --- annotations/build.gradle.kts | 2 +- api-rs/build.gradle.kts | 4 +- api/build.gradle.kts | 18 +-- build.gradle.kts | 4 +- cache/build.gradle.kts | 26 ++-- client/build.gradle.kts | 134 +++++++++--------- .../main/java/meteor/hiscore/HiscoreClient.kt | 2 +- .../meteor/launcher/CreateLauncherUpdate.kt | 26 ++-- .../main/java/meteor/session/SessionClient.kt | 2 +- .../java/meteor/util/RuntimeConfigLoader.kt | 2 +- deobfuscator/build.gradle.kts | 26 ++-- gradle/libs.versions.toml | 58 ++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 35 +++-- gradlew.bat | 15 +- http/build.gradle.kts | 17 ++- injector/build.gradle.kts | 34 ++--- mixins/build.gradle.kts | 26 ++-- osrs/build.gradle.kts | 21 ++- scripts/build.gradle.kts | 27 ++-- settings.gradle.kts | 1 + versions.properties | 10 +- 23 files changed, 289 insertions(+), 204 deletions(-) create mode 100644 gradle/libs.versions.toml delete mode 100644 gradle/wrapper/gradle-wrapper.jar diff --git a/annotations/build.gradle.kts b/annotations/build.gradle.kts index a5c4fae5e..7c243cf96 100644 --- a/annotations/build.gradle.kts +++ b/annotations/build.gradle.kts @@ -10,7 +10,7 @@ repositories { mavenCentral() } dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib:_") + implementation(libs.kotlin.stdlib) } tasks.compileJava { diff --git a/api-rs/build.gradle.kts b/api-rs/build.gradle.kts index 9bbcc5ed8..a6ebae7fc 100644 --- a/api-rs/build.gradle.kts +++ b/api-rs/build.gradle.kts @@ -12,8 +12,8 @@ repositories { } dependencies { - implementation(project(":annotations")) - implementation(project(":api")) + implementation(projects.annotations) + implementation(projects.api) } java { diff --git a/api/build.gradle.kts b/api/build.gradle.kts index db338e27d..110d80aaa 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -10,15 +10,15 @@ repositories { } dependencies { - implementation(project(":annotations")) - implementation(project(":logger")) - implementation(group = "com.google.code.findbugs", name = "jsr305", version = "_") - implementation(group = "com.google.guava", name = "guava", version = "_") - implementation(group = "org.apache.commons", name = "commons-text", version = "_") - implementation(group = "com.google.code.findbugs", name = "jsr305", version = "_") - compileOnly("org.projectlombok:lombok:_") - annotationProcessor("org.projectlombok:lombok:_") - implementation("org.jetbrains:annotations:_") + implementation(projects.annotations) + implementation(projects.logger) + implementation(libs.jsr305) + implementation(libs.guava) + implementation(libs.commons.text) + implementation(libs.jsr305) + compileOnly(libs.lombok) + annotationProcessor(libs.lombok) + implementation(libs.annotations) } tasks.withType().all { diff --git a/build.gradle.kts b/build.gradle.kts index 79250dcc7..dc0e4cb78 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,5 @@ plugins{ - kotlin("jvm") version "1.8.10" apply false + kotlin("jvm") version "_" apply false } version = "9.9.9" group = "meteor" - - diff --git a/cache/build.gradle.kts b/cache/build.gradle.kts index 2f1f25e79..de9108af1 100644 --- a/cache/build.gradle.kts +++ b/cache/build.gradle.kts @@ -37,21 +37,19 @@ repositories { } dependencies { - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.24") - compileOnly(project(":http")) - - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.24") - - implementation(group = "com.google.code.gson", name = "gson", version = "2.8.5") - implementation(group = "com.google.guava", name = "guava", version = "30.1.1-jre") - implementation(group = "commons-cli", name = "commons-cli", version = "1.4") - implementation(group = "io.netty", name = "netty-buffer", version = "4.1.54.Final") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.1") - implementation(group = "org.antlr", name = "antlr4-runtime", version = "4.8-1") - implementation(group = "org.apache.commons", name = "commons-compress", version = "1.21") - implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.32") - testImplementation("junit:junit:4.13.2") + compileOnly(projects.http) + annotationProcessor(libs.lombok) + compileOnly(libs.lombok) + implementation(libs.gson) + implementation(libs.guava) + implementation(libs.commons.cli) + implementation(libs.netty.buffer) + implementation(libs.okhttp) + implementation(libs.atlr4.runtime) + implementation(libs.commons.compress) + implementation(libs.slf4j.api) + testImplementation(libs.junit) } tasks { diff --git a/client/build.gradle.kts b/client/build.gradle.kts index e96c106b2..438382b5a 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -1,15 +1,15 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Deb import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Exe import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Dmg -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + plugins { + java + `maven-publish` kotlin("jvm") - id("org.jetbrains.compose") version "1.3.0" kotlin("plugin.serialization") version "1.7.21" + id("org.jetbrains.compose") version "1.4.3" id("org.jetbrains.dokka") version "1.7.20" - java - `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.2" } @@ -19,6 +19,7 @@ group = "meteor" version = "${majorRelease.split(".")[0]}.${majorRelease.split(".")[1]}.$release" publishing { + repositories { mavenLocal() } @@ -37,94 +38,97 @@ publishing { } } + repositories { + google() mavenLocal() - maven {url = uri("https://androidx.dev/storage/compose-compiler/repository")} + mavenCentral() + maven { url = uri("https://androidx.dev/storage/compose-compiler/repository") } maven { url = uri("https://raw.githubusercontent.com/open-osrs/hosting/master/") } - maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev/")} + maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev/") } maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") } - google() - mavenCentral() maven { url = uri("https://jitpack.io") } maven { url = uri("https://raw.githubusercontent.com/MeteorLite/hosting/main/repo/") } } dependencies { - @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) + // meteor-api - implementation("com.google.inject:guice:4.0") - implementation(project(":api-rs")) - implementation(project(":api")) - implementation(project(":http")) - implementation(project(":annotations")) - implementation(project(":logger")) + implementation(projects.apiRs) + implementation(projects.api) + implementation(projects.http) + implementation(projects.annotations) + implementation(projects.logger) + implementation(libs.guice) + implementation(libs.java.inject) + runtimeOnly(projects.scripts) runtimeOnly(files("./src/main/resources/injected-client.jar")) - runtimeOnly(project(":scripts")) //Deob - implementation(group = "org.bouncycastle", name = "bcprov-jdk15on", version = "1.64") - + implementation(libs.bouncycastle) + implementation(libs.proguard) //GPU - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") - implementation(group = "net.runelite.jocl", name = "jocl", version = "_") - runtimeOnly(group = "net.runelite.jocl", name = "jocl", version = "_", classifier = "macos-x64") - runtimeOnly(group = "net.runelite.jocl", name = "jocl", version = "_", classifier = "macos-arm64") - implementation(group = "net.runelite", name = "rlawt", version = "_") - implementation(group = "org.lwjgl", name = "lwjgl", version = "_") - implementation(group = "org.lwjgl", name = "lwjgl-opengl", version = "_") - runtimeOnly(group = "org.lwjgl", name = "lwjgl", version = "_", classifier = "natives-linux") - runtimeOnly(group = "org.lwjgl", name = "lwjgl", version = "_", classifier = "natives-windows") - runtimeOnly(group = "org.lwjgl", name = "lwjgl", version = "_", classifier = "natives-windows-x86") - runtimeOnly(group = "org.lwjgl", name = "lwjgl", version = "_", classifier = "natives-macos") - runtimeOnly(group = "org.lwjgl", name = "lwjgl", version = "_", classifier = "natives-macos-arm64") - runtimeOnly(group = "org.lwjgl", name = "lwjgl-opengl", version = "_", classifier = "natives-linux") - runtimeOnly(group = "org.lwjgl", name = "lwjgl-opengl", version = "_", classifier = "natives-windows") - runtimeOnly(group = "org.lwjgl", name = "lwjgl-opengl", version = "_", classifier = "natives-windows-x86") - runtimeOnly(group = "org.lwjgl", name = "lwjgl-opengl", version = "_", classifier = "natives-macos") - runtimeOnly(group = "org.lwjgl", name = "lwjgl-opengl", version = "_", classifier = "natives-macos-arm64") + //implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") + implementation(libs.jocl) + implementation(libs.lwjgl) + implementation(libs.lwjgl.opengl) + implementation(libs.rlawt) + implementation(variantOf(libs.jocl){ classifier("macos-x64") } ) + implementation(variantOf(libs.jocl){ classifier("macos-arm64") } ) + runtimeOnly(variantOf(libs.lwjgl){ classifier("natives-windows") } ) + runtimeOnly(variantOf(libs.lwjgl){ classifier("natives-windows-x86") } ) + runtimeOnly(variantOf(libs.lwjgl){ classifier("natives-linux") } ) + runtimeOnly(variantOf(libs.lwjgl){ classifier("natives-macos") } ) + runtimeOnly(variantOf(libs.lwjgl){ classifier("natives-macos-arm64") } ) + runtimeOnly(variantOf(libs.lwjgl.opengl){ classifier("natives-windows") } ) + runtimeOnly(variantOf(libs.lwjgl.opengl){ classifier("natives-windows-x86") } ) + runtimeOnly(variantOf(libs.lwjgl.opengl){ classifier("natives-linux") } ) + runtimeOnly(variantOf(libs.lwjgl.opengl){ classifier("natives-macos") } ) + runtimeOnly(variantOf(libs.lwjgl.opengl){ classifier("natives-macos-arm64") } ) + //RuneLite Plugins - implementation("org.slf4j:slf4j-api:_") - implementation("org.slf4j:slf4j-simple:_") - compileOnly(group= "org.projectlombok", name= "lombok", version= "_") - annotationProcessor(group= "org.projectlombok", name= "lombok", version= "_") + implementation(libs.slf4j.api) + implementation(libs.slf4j.simple) + compileOnly(libs.lombok) + annotationProcessor(libs.lombok) //Util - implementation(group = "org.json", name = "json", version = "20220924") - implementation(project(":eventbus")) - implementation(group = "org.apache.commons", name = "commons-lang3", version = "_") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "_") - implementation(group = "com.google.guava", name = "guava", version = "_") - implementation(group = "org.apache.commons", name = "commons-text", version = "_") - implementation(group = "commons-io", name = "commons-io", version = "_") - implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "_") - implementation(group = "com.google.code.gson", name = "gson", version = "_") - implementation(group = "net.runelite", name = "discord", version = "1.4") - implementation("com.formdev:flatlaf:_") - implementation("com.formdev:flatlaf-intellij-themes:_") - implementation("com.miglayout:miglayout:_") - implementation("com.kitfox.svg:svg-salamander:_") - implementation("com.formdev:flatlaf-extras:_") - implementation("com.godaddy.android.colorpicker:compose-color-picker-jvm:_") - implementation("br.com.devsrsouza.compose.icons.jetbrains:octicons:_") - implementation("br.com.devsrsouza.compose.icons.jetbrains:tabler-icons:1.0.0") - implementation("br.com.devsrsouza.compose.icons.jetbrains:line-awesome:1.0.0") - implementation(kotlin("stdlib-jdk8:1.8.0-RC2")) + implementation(libs.json) + implementation(projects.eventbus) + implementation(libs.commons.lang3) + implementation(libs.okhttp) + implementation(libs.guava) + implementation(libs.commons.text) + implementation(libs.commons.io) + implementation(libs.jopt.simple) + implementation(libs.gson) + implementation(libs.discord) + implementation(libs.flatlaf) + implementation(libs.flatlaf.intellij.themes) + implementation(libs.miglayout) + implementation(libs.svg.salamander) + implementation(libs.flatlaf.extras) + implementation(libs.godaddy.colorpicker) + implementation(libs.octicions) + implementation(libs.tabler.icons) + implementation(libs.line.awesome) + implementation(libs.jna) + implementation(kotlin("stdlib-jdk8")) implementation(kotlin("reflect")) - implementation("net.java.dev.jna:jna:_") implementation(compose.desktop.currentOs) } compose { - kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:1.4.0") + kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:_") desktop { application { mainClass = "meteor.Main" nativeDistributions { - version = "1.5.10" + version = "1.9.0" targetFormats(Exe, Deb, Dmg) includeAllModules = true windows { @@ -158,8 +162,8 @@ compose { tasks { shadowJar { - baseName = "meteor-client-all" - classifier = "" + archiveBaseName.set("meteor-client-all") + archiveClassifier.set("") mergeServiceFiles() manifest { attributes(mapOf("Main-Class" to "meteor.Main")) @@ -220,7 +224,7 @@ tasks.compileJava { tasks.withType().all { kotlinOptions { - apiVersion = "1.8" + //apiVersion = "" languageVersion = "1.8" jvmTarget = "17" // We can't use K2 yet due to using some kotlin compiler plugins which aren't supported yet. diff --git a/client/src/main/java/meteor/hiscore/HiscoreClient.kt b/client/src/main/java/meteor/hiscore/HiscoreClient.kt index 2062f6040..e19df595f 100644 --- a/client/src/main/java/meteor/hiscore/HiscoreClient.kt +++ b/client/src/main/java/meteor/hiscore/HiscoreClient.kt @@ -101,7 +101,7 @@ class HiscoreClient @Inject constructor() { } throw IOException("Error retrieving data from Jagex Hiscores: $response") } - val responseStr = response.body.string() + val responseStr = response.body?.string() val skills = ImmutableMap.builder() val map = mappings[endpoint]!!.iterator() for (line in NEWLINE_SPLITTER.split(responseStr)) { diff --git a/client/src/main/java/meteor/launcher/CreateLauncherUpdate.kt b/client/src/main/java/meteor/launcher/CreateLauncherUpdate.kt index be073af2e..47a39ea8d 100644 --- a/client/src/main/java/meteor/launcher/CreateLauncherUpdate.kt +++ b/client/src/main/java/meteor/launcher/CreateLauncherUpdate.kt @@ -9,11 +9,13 @@ import java.util.zip.CRC32 import kotlin.math.ceil object CreateLauncherUpdate { - private val releaseVersion = "286" - private val runtimeVersion = "17.0.5" + private val releaseVersion = "292" + private val runtimeVersion = "17.0.2" private val release = LauncherUpdate() - private val releaseDir = java.io.File(".\\build\\release\\") + private val releaseDir = java.io.File("./client/build/release/") + private val clientBat = java.io.File("./client/build/compose/binaries/main/app/client/client.bat") + @JvmStatic fun main(args: Array) { @@ -23,15 +25,17 @@ object CreateLauncherUpdate { if (releaseDir.exists()) releaseDir.deleteRecursively() + releaseDir.mkdir() + + if (!clientBat.exists()) clientBat.createNewFile() + clientBat.writeText("\"%USERPROFILE%\\.meteor\\launcher\\client.exe\"\n" + "pause") + + crawlDirectory(java.io.File("./client/build/compose/binaries/main/app/client/")) + + java.io.File("./client/build/release/release.json").writeText(gson.toJson(release)) + + java.io.File("./client/build/release/runtime.version").writeText(runtimeVersion) - releaseDir.mkdirs() - java.io.File("./build/compose/binaries/main/app/client/client.bat") - .writeText( - "\"%USERPROFILE%\\.meteor\\launcher\\client.exe\"\n" + - "pause") - crawlDirectory(java.io.File("./build/compose/binaries/main/app/client/")) - java.io.File("./build/release/release.json").writeText(gson.toJson(release)) - java.io.File("./build/release/runtime.version").writeText(runtimeVersion) } private fun crawlDirectory(dir: java.io.File) { diff --git a/client/src/main/java/meteor/session/SessionClient.kt b/client/src/main/java/meteor/session/SessionClient.kt index f8fd08f30..a17f5b91d 100644 --- a/client/src/main/java/meteor/session/SessionClient.kt +++ b/client/src/main/java/meteor/session/SessionClient.kt @@ -57,7 +57,7 @@ internal class SessionClient { log.warn("Built URI: $url") client.newCall(request).execute().use { response -> val body = response.body - val `in` = body.byteStream() + val `in` = body?.byteStream() return RuneLiteAPI.GSON.fromJson(InputStreamReader(`in`, StandardCharsets.UTF_8), UUID::class.java) } } catch (ex: JsonParseException) // UUID.fromString can throw IllegalArgumentException diff --git a/client/src/main/java/meteor/util/RuntimeConfigLoader.kt b/client/src/main/java/meteor/util/RuntimeConfigLoader.kt index e3cf4bb8f..de5369c73 100644 --- a/client/src/main/java/meteor/util/RuntimeConfigLoader.kt +++ b/client/src/main/java/meteor/util/RuntimeConfigLoader.kt @@ -78,7 +78,7 @@ object RuntimeConfigLoader : Supplier { override fun onResponse(call: Call, response: Response) { try // NOPMD: UseTryWithResources { - val config = RuneLiteAPI.GSON.fromJson(response.body.charStream(), RuntimeConfig::class.java) + val config = RuneLiteAPI.GSON.fromJson(response.body?.charStream(), RuntimeConfig::class.java) future.complete(config) } catch (ex: Throwable) { future.completeExceptionally(ex) diff --git a/deobfuscator/build.gradle.kts b/deobfuscator/build.gradle.kts index 34e0ef87f..d470c6c06 100644 --- a/deobfuscator/build.gradle.kts +++ b/deobfuscator/build.gradle.kts @@ -11,20 +11,20 @@ repositories { } dependencies { - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "_") - implementation(project(":annotations")) - implementation(project(":api")) - implementation(project(":api-rs")) - implementation(project(":logger")) - implementation(group = "org.jetbrains", name = "annotations", version = "_") - implementation(group = "org.ow2.asm", name = "asm", version = "_") - implementation(group = "org.ow2.asm", name = "asm-util", version = "_") - implementation(group = "net.runelite", name = "fernflower", version = "07082019") - implementation(project(":cache")) - implementation(group = "com.google.code.gson", name = "gson", version = "_") - implementation(group = "com.google.guava", name = "guava", version = "_") - compileOnly("org.projectlombok:lombok:_") + implementation(projects.annotations) + implementation(projects.api) + implementation(projects.apiRs) + implementation(projects.logger) + implementation(projects.cache) + annotationProcessor(libs.lombok) + implementation(libs.annotations) + implementation(libs.asm) + implementation(libs.asm.util) + implementation(libs.fernflower) + implementation(libs.gson) + implementation(libs.guava) + compileOnly(libs.lombok) } tasks.test { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..411823d81 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,58 @@ +[versions] +kotlin = "1.8.0-RC2" +coroutines = "1.6.4" + +[libraries] +jocl = {group = "net.runelite.jocl", name = "jocl", version = "_"} +jocl-macos-x64 = {group = "net.runelite.jocl", name = "jocl", version = "_"} +jocl-macos-arm64 = {group = "net.runelite.jocl", name = "jocl", version = "_"} +rlawt = {group = "net.runelite", name = "rlawt", version = "_"} +lwjgl = {group = "org.lwjgl", name = "lwjgl", version = "_"} +lwjgl-opengl = {group = "org.lwjgl", name = "lwjgl-opengl", version = "_"} +commons-lang3 = {group = "org.apache.commons", name = "commons-lang3", version = "_"} +discord = {group = "net.runelite", name = "discord", version = "1.4"} +flatlaf = {group = "com.formdev", name = "flatlaf", version = "_"} +flatlaf-intellij-themes = {group = "com.formdev", name = "flatlaf-intellij-themes", version = "_"} +svg-salamander = {group = "com.kitfox.svg", name = "svg-salamander", version = "_"} +flatlaf-extras = {group = "com.formdev", name = "flatlaf-extras", version = "_"} +godaddy-colorpicker = {group = "com.godaddy.android.colorpicker", name = "compose-color-picker-jvm", version = "_"} +octicions = { group = "br.com.devsrsouza.compose.icons.jetbrains", name = "octicons", version = "_"} +tabler-icons = { group = "br.com.devsrsouza.compose.icons.jetbrains", name = "tabler-icons", version = "_"} +line-awesome = { group = "br.com.devsrsouza.compose.icons.jetbrains", name = "line-awesome", version = "_"} +jna = {group = "net.java.dev.jna", name = "jna", version = "_"} +miglayout = {group = "com.miglayout", name = "miglayout", version = "_"} + + +proguard = {group = "com.guardsquare", name = "proguard-gradle", version = "7.2.2"} +guice = {group = "com.google.inject", name = "guice", version = "_"} +sisu-inject = {group = "org.eclipse.sisu", name = "org.eclipse.sisu.inject", version = "_"} +maven-plugin-annotations = {group = "org.apache.maven.plugin-tools", name = "maven-plugin-annotations", version = "_"} +maven-plugin-api = {group = "org.apache.maven", name = "maven-plugin-api", version = "_"} +junit-jupiter-api = {group = "org.junit.jupiter", name = "junit-jupiter-api", version = "_"} +junit-jupiter-engine = {group = "org.junit.jupiter", name = "junit-jupiter-engine", version = "_"} +json = {group = "org.json", name = "json", version = "_"} +bouncycastle = {group = "org.bouncycastle", name = "bcprov-jdk15on", version = "1.64"} +java-inject = {group = "javax.inject", name = "javax.inject", version = "_"} +jopt-simple = {group = "net.sf.jopt-simple", name = "jopt-simple", version = "_"} +kotlin-logging = {group = "io.github.microutils", name = "kotlin-logging", version = "_"} +asm = {group = "org.ow2.asm", name = "asm", version = "_"} +asm-util = {group = "org.ow2.asm", name = "asm-util", version = "_"} +fernflower = {group = "net.runelite", name = "fernflower", version = "07082019"} +lombok = {group = "org.projectlombok", name = "lombok", version = "1.18.20"} +gson = {group = "com.google.code.gson", name = "gson", version = "2.8.9"} +kotlin_stdlib = {group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin"} +kotlin_coroutines = {group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-jvm", version.ref = "coroutines"} +guava = {group = "com.google.guava", name = "guava", version = "_"} +commons-io = {group = "commons-io", name = "commons-io", version = "_"} +commons-csv = {group = "org.apache.commons", name = "commons-csv", version = "_"} +commons-cli = {group = "commons-cli", name = "commons-cli", version = "1.4"} +netty-buffer = {group = "io.netty", name = "netty-buffer", version = "4.1.68.Final"} +okhttp = {group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.2"} +atlr4-runtime = {group = "org.antlr", name = "antlr4-runtime", version = "4.9.2"} +commons-compress = {group = "org.apache.commons", name = "commons-compress", version = "1.21"} +commons-text = {group = "org.apache.commons", name = "commons-text", version = "_"} +slf4j-simple = {group = "org.slf4j", name = "slf4j-simple", version = "_"} +slf4j-api = {group = "org.slf4j", name = "slf4j-api", version = "1.7.32"} +junit = {group = "junit", name = "junit", version = "4.13.2"} +jsr305 = {group = "com.google.code.findbugs", name = "jsr305", version = "_" } +annotations = {group = "org.jetbrains", name = "annotations", version = "_"} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 zcma&NbC71ylI~qywr$(CZQJHswz}-9F59+k+g;UV+cs{`J?GrGXYR~=-ydruB3JCa zB64N^cILAcWk5iofq)<(fq;O7{th4@;QxID0)qN`mJ?GIqLY#rX8-|G{5M0pdVW5^ zzXk$-2kQTAC?_N@B`&6-N-rmVFE=$QD?>*=4<|!MJu@}isLc4AW#{m2if&A5T5g&~ ziuMQeS*U5sL6J698wOd)K@oK@1{peP5&Esut<#VH^u)gp`9H4)`uE!2$>RTctN+^u z=ASkePDZA-X8)rp%D;p*~P?*a_=*Kwc<^>QSH|^<0>o37lt^+Mj1;4YvJ(JR-Y+?%Nu}JAYj5 z_Qc5%Ao#F?q32i?ZaN2OSNhWL;2oDEw_({7ZbgUjna!Fqn3NzLM@-EWFPZVmc>(fZ z0&bF-Ch#p9C{YJT9Rcr3+Y_uR^At1^BxZ#eo>$PLJF3=;t_$2|t+_6gg5(j{TmjYU zK12c&lE?Eh+2u2&6Gf*IdKS&6?rYbSEKBN!rv{YCm|Rt=UlPcW9j`0o6{66#y5t9C zruFA2iKd=H%jHf%ypOkxLnO8#H}#Zt{8p!oi6)7#NqoF({t6|J^?1e*oxqng9Q2Cc zg%5Vu!em)}Yuj?kaP!D?b?(C*w!1;>R=j90+RTkyEXz+9CufZ$C^umX^+4|JYaO<5 zmIM3#dv`DGM;@F6;(t!WngZSYzHx?9&$xEF70D1BvfVj<%+b#)vz)2iLCrTeYzUcL z(OBnNoG6Le%M+@2oo)&jdOg=iCszzv59e zDRCeaX8l1hC=8LbBt|k5?CXgep=3r9BXx1uR8!p%Z|0+4Xro=xi0G!e{c4U~1j6!) zH6adq0}#l{%*1U(Cb%4AJ}VLWKBPi0MoKFaQH6x?^hQ!6em@993xdtS%_dmevzeNl z(o?YlOI=jl(`L9^ z0O+H9k$_@`6L13eTT8ci-V0ljDMD|0ifUw|Q-Hep$xYj0hTO@0%IS^TD4b4n6EKDG z??uM;MEx`s98KYN(K0>c!C3HZdZ{+_53DO%9k5W%pr6yJusQAv_;IA}925Y%;+!tY z%2k!YQmLLOr{rF~!s<3-WEUs)`ix_mSU|cNRBIWxOox_Yb7Z=~Q45ZNe*u|m^|)d* zog=i>`=bTe!|;8F+#H>EjIMcgWcG2ORD`w0WD;YZAy5#s{65~qfI6o$+Ty&-hyMyJ z3Ra~t>R!p=5ZpxA;QkDAoPi4sYOP6>LT+}{xp}tk+<0k^CKCFdNYG(Es>p0gqD)jP zWOeX5G;9(m@?GOG7g;e74i_|SmE?`B2i;sLYwRWKLy0RLW!Hx`=!LH3&k=FuCsM=9M4|GqzA)anEHfxkB z?2iK-u(DC_T1};KaUT@3nP~LEcENT^UgPvp!QC@Dw&PVAhaEYrPey{nkcn(ro|r7XUz z%#(=$7D8uP_uU-oPHhd>>^adbCSQetgSG`e$U|7mr!`|bU0aHl_cmL)na-5x1#OsVE#m*+k84Y^+UMeSAa zbrVZHU=mFwXEaGHtXQq`2ZtjfS!B2H{5A<3(nb-6ARVV8kEmOkx6D2x7~-6hl;*-*}2Xz;J#a8Wn;_B5=m zl3dY;%krf?i-Ok^Pal-}4F`{F@TYPTwTEhxpZK5WCpfD^UmM_iYPe}wpE!Djai6_{ z*pGO=WB47#Xjb7!n2Ma)s^yeR*1rTxp`Mt4sfA+`HwZf%!7ZqGosPkw69`Ix5Ku6G z@Pa;pjzV&dn{M=QDx89t?p?d9gna*}jBly*#1!6}5K<*xDPJ{wv4& zM$17DFd~L*Te3A%yD;Dp9UGWTjRxAvMu!j^Tbc}2v~q^59d4bz zvu#!IJCy(BcWTc`;v$9tH;J%oiSJ_i7s;2`JXZF+qd4C)vY!hyCtl)sJIC{ebI*0> z@x>;EzyBv>AI-~{D6l6{ST=em*U( z(r$nuXY-#CCi^8Z2#v#UXOt`dbYN1z5jzNF2 z411?w)whZrfA20;nl&C1Gi+gk<`JSm+{|*2o<< zqM#@z_D`Cn|0H^9$|Tah)0M_X4c37|KQ*PmoT@%xHc3L1ZY6(p(sNXHa&49Frzto& zR`c~ClHpE~4Z=uKa5S(-?M8EJ$zt0&fJk~p$M#fGN1-y$7!37hld`Uw>Urri(DxLa;=#rK0g4J)pXMC zxzraOVw1+kNWpi#P=6(qxf`zSdUC?D$i`8ZI@F>k6k zz21?d+dw7b&i*>Kv5L(LH-?J%@WnqT7j#qZ9B>|Zl+=> z^U-pV@1y_ptHo4hl^cPRWewbLQ#g6XYQ@EkiP z;(=SU!yhjHp%1&MsU`FV1Z_#K1&(|5n(7IHbx&gG28HNT)*~-BQi372@|->2Aw5It z0CBpUcMA*QvsPy)#lr!lIdCi@1k4V2m!NH)%Px(vu-r(Q)HYc!p zJ^$|)j^E#q#QOgcb^pd74^JUi7fUmMiNP_o*lvx*q%_odv49Dsv$NV;6J z9GOXKomA{2Pb{w}&+yHtH?IkJJu~}Z?{Uk++2mB8zyvh*xhHKE``99>y#TdD z&(MH^^JHf;g(Tbb^&8P*;_i*2&fS$7${3WJtV7K&&(MBV2~)2KB3%cWg#1!VE~k#C z!;A;?p$s{ihyojEZz+$I1)L}&G~ml=udD9qh>Tu(ylv)?YcJT3ihapi!zgPtWb*CP zlLLJSRCj-^w?@;RU9aL2zDZY1`I3d<&OMuW=c3$o0#STpv_p3b9Wtbql>w^bBi~u4 z3D8KyF?YE?=HcKk!xcp@Cigvzy=lnFgc^9c%(^F22BWYNAYRSho@~*~S)4%AhEttv zvq>7X!!EWKG?mOd9&n>vvH1p4VzE?HCuxT-u+F&mnsfDI^}*-d00-KAauEaXqg3k@ zy#)MGX!X;&3&0s}F3q40ZmVM$(H3CLfpdL?hB6nVqMxX)q=1b}o_PG%r~hZ4gUfSp zOH4qlEOW4OMUc)_m)fMR_rl^pCfXc{$fQbI*E&mV77}kRF z&{<06AJyJ!e863o-V>FA1a9Eemx6>^F$~9ppt()ZbPGfg_NdRXBWoZnDy2;#ODgf! zgl?iOcF7Meo|{AF>KDwTgYrJLb$L2%%BEtO>T$C?|9bAB&}s;gI?lY#^tttY&hfr# zKhC+&b-rpg_?~uVK%S@mQleU#_xCsvIPK*<`E0fHE1&!J7!xD#IB|SSPW6-PyuqGn3^M^Rz%WT{e?OI^svARX&SAdU77V(C~ zM$H{Kg59op{<|8ry9ecfP%=kFm(-!W&?U0@<%z*+!*<e0XesMxRFu9QnGqun6R_%T+B%&9Dtk?*d$Q zb~>84jEAPi@&F@3wAa^Lzc(AJz5gsfZ7J53;@D<;Klpl?sK&u@gie`~vTsbOE~Cd4 z%kr56mI|#b(Jk&;p6plVwmNB0H@0SmgdmjIn5Ne@)}7Vty(yb2t3ev@22AE^s!KaN zyQ>j+F3w=wnx7w@FVCRe+`vUH)3gW%_72fxzqX!S&!dchdkRiHbXW1FMrIIBwjsai8`CB2r4mAbwp%rrO>3B$Zw;9=%fXI9B{d(UzVap7u z6piC-FQ)>}VOEuPpuqznpY`hN4dGa_1Xz9rVg(;H$5Te^F0dDv*gz9JS<|>>U0J^# z6)(4ICh+N_Q`Ft0hF|3fSHs*?a=XC;e`sJaU9&d>X4l?1W=|fr!5ShD|nv$GK;j46@BV6+{oRbWfqOBRb!ir88XD*SbC(LF}I1h#6@dvK%Toe%@ zhDyG$93H8Eu&gCYddP58iF3oQH*zLbNI;rN@E{T9%A8!=v#JLxKyUe}e}BJpB{~uN zqgxRgo0*-@-iaHPV8bTOH(rS(huwK1Xg0u+e!`(Irzu@Bld&s5&bWgVc@m7;JgELd zimVs`>vQ}B_1(2#rv#N9O`fJpVfPc7V2nv34PC);Dzbb;p!6pqHzvy?2pD&1NE)?A zt(t-ucqy@wn9`^MN5apa7K|L=9>ISC>xoc#>{@e}m#YAAa1*8-RUMKwbm|;5p>T`Z zNf*ph@tnF{gmDa3uwwN(g=`Rh)4!&)^oOy@VJaK4lMT&5#YbXkl`q?<*XtsqD z9PRK6bqb)fJw0g-^a@nu`^?71k|m3RPRjt;pIkCo1{*pdqbVs-Yl>4E>3fZx3Sv44grW=*qdSoiZ9?X0wWyO4`yDHh2E!9I!ZFi zVL8|VtW38}BOJHW(Ax#KL_KQzarbuE{(%TA)AY)@tY4%A%P%SqIU~8~-Lp3qY;U-} z`h_Gel7;K1h}7$_5ZZT0&%$Lxxr-<89V&&TCsu}LL#!xpQ1O31jaa{U34~^le*Y%L za?7$>Jk^k^pS^_M&cDs}NgXlR>16AHkSK-4TRaJSh#h&p!-!vQY%f+bmn6x`4fwTp z$727L^y`~!exvmE^W&#@uY!NxJi`g!i#(++!)?iJ(1)2Wk;RN zFK&O4eTkP$Xn~4bB|q8y(btx$R#D`O@epi4ofcETrx!IM(kWNEe42Qh(8*KqfP(c0 zouBl6>Fc_zM+V;F3znbo{x#%!?mH3`_ANJ?y7ppxS@glg#S9^MXu|FM&ynpz3o&Qh z2ujAHLF3($pH}0jXQsa#?t--TnF1P73b?4`KeJ9^qK-USHE)4!IYgMn-7z|=ALF5SNGkrtPG@Y~niUQV2?g$vzJN3nZ{7;HZHzWAeQ;5P|@Tl3YHpyznGG4-f4=XflwSJY+58-+wf?~Fg@1p1wkzuu-RF3j2JX37SQUc? zQ4v%`V8z9ZVZVqS8h|@@RpD?n0W<=hk=3Cf8R?d^9YK&e9ZybFY%jdnA)PeHvtBe- zhMLD+SSteHBq*q)d6x{)s1UrsO!byyLS$58WK;sqip$Mk{l)Y(_6hEIBsIjCr5t>( z7CdKUrJTrW%qZ#1z^n*Lb8#VdfzPw~OIL76aC+Rhr<~;4Tl!sw?Rj6hXj4XWa#6Tp z@)kJ~qOV)^Rh*-?aG>ic2*NlC2M7&LUzc9RT6WM%Cpe78`iAowe!>(T0jo&ivn8-7 zs{Qa@cGy$rE-3AY0V(l8wjI^uB8Lchj@?L}fYal^>T9z;8juH@?rG&g-t+R2dVDBe zq!K%{e-rT5jX19`(bP23LUN4+_zh2KD~EAYzhpEO3MUG8@}uBHH@4J zd`>_(K4q&>*k82(dDuC)X6JuPrBBubOg7qZ{?x!r@{%0);*`h*^F|%o?&1wX?Wr4b z1~&cy#PUuES{C#xJ84!z<1tp9sfrR(i%Tu^jnXy;4`Xk;AQCdFC@?V%|; zySdC7qS|uQRcH}EFZH%mMB~7gi}a0utE}ZE_}8PQH8f;H%PN41Cb9R%w5Oi5el^fd z$n{3SqLCnrF##x?4sa^r!O$7NX!}&}V;0ZGQ&K&i%6$3C_dR%I7%gdQ;KT6YZiQrW zk%q<74oVBV>@}CvJ4Wj!d^?#Zwq(b$E1ze4$99DuNg?6t9H}k_|D7KWD7i0-g*EO7 z;5{hSIYE4DMOK3H%|f5Edx+S0VI0Yw!tsaRS2&Il2)ea^8R5TG72BrJue|f_{2UHa z@w;^c|K3da#$TB0P3;MPlF7RuQeXT$ zS<<|C0OF(k)>fr&wOB=gP8!Qm>F41u;3esv7_0l%QHt(~+n; zf!G6%hp;Gfa9L9=AceiZs~tK+Tf*Wof=4!u{nIO90jH@iS0l+#%8=~%ASzFv7zqSB^?!@N7)kp0t&tCGLmzXSRMRyxCmCYUD2!B`? zhs$4%KO~m=VFk3Buv9osha{v+mAEq=ik3RdK@;WWTV_g&-$U4IM{1IhGX{pAu%Z&H zFfwCpUsX%RKg);B@7OUzZ{Hn{q6Vv!3#8fAg!P$IEx<0vAx;GU%}0{VIsmFBPq_mb zpe^BChDK>sc-WLKl<6 zwbW|e&d&dv9Wu0goueyu>(JyPx1mz0v4E?cJjFuKF71Q1)AL8jHO$!fYT3(;U3Re* zPPOe%*O+@JYt1bW`!W_1!mN&=w3G9ru1XsmwfS~BJ))PhD(+_J_^N6j)sx5VwbWK| zwRyC?W<`pOCY)b#AS?rluxuuGf-AJ=D!M36l{ua?@SJ5>e!IBr3CXIxWw5xUZ@Xrw z_R@%?{>d%Ld4p}nEsiA@v*nc6Ah!MUs?GA7e5Q5lPpp0@`%5xY$C;{%rz24$;vR#* zBP=a{)K#CwIY%p} zXVdxTQ^HS@O&~eIftU+Qt^~(DGxrdi3k}DdT^I7Iy5SMOp$QuD8s;+93YQ!OY{eB24%xY7ml@|M7I(Nb@K_-?F;2?et|CKkuZK_>+>Lvg!>JE~wN`BI|_h6$qi!P)+K-1Hh(1;a`os z55)4Q{oJiA(lQM#;w#Ta%T0jDNXIPM_bgESMCDEg6rM33anEr}=|Fn6)|jBP6Y}u{ zv9@%7*#RI9;fv;Yii5CI+KrRdr0DKh=L>)eO4q$1zmcSmglsV`*N(x=&Wx`*v!!hn6X-l0 zP_m;X??O(skcj+oS$cIdKhfT%ABAzz3w^la-Ucw?yBPEC+=Pe_vU8nd-HV5YX6X8r zZih&j^eLU=%*;VzhUyoLF;#8QsEfmByk+Y~caBqSvQaaWf2a{JKB9B>V&r?l^rXaC z8)6AdR@Qy_BxQrE2Fk?ewD!SwLuMj@&d_n5RZFf7=>O>hzVE*seW3U?_p|R^CfoY`?|#x9)-*yjv#lo&zP=uI`M?J zbzC<^3x7GfXA4{FZ72{PE*-mNHyy59Q;kYG@BB~NhTd6pm2Oj=_ zizmD?MKVRkT^KmXuhsk?eRQllPo2Ubk=uCKiZ&u3Xjj~<(!M94c)Tez@9M1Gfs5JV z->@II)CDJOXTtPrQudNjE}Eltbjq>6KiwAwqvAKd^|g!exgLG3;wP+#mZYr`cy3#39e653d=jrR-ulW|h#ddHu(m9mFoW~2yE zz5?dB%6vF}+`-&-W8vy^OCxm3_{02royjvmwjlp+eQDzFVEUiyO#gLv%QdDSI#3W* z?3!lL8clTaNo-DVJw@ynq?q!%6hTQi35&^>P85G$TqNt78%9_sSJt2RThO|JzM$iL zg|wjxdMC2|Icc5rX*qPL(coL!u>-xxz-rFiC!6hD1IR%|HSRsV3>Kq~&vJ=s3M5y8SG%YBQ|{^l#LGlg!D?E>2yR*eV%9m$_J6VGQ~AIh&P$_aFbh zULr0Z$QE!QpkP=aAeR4ny<#3Fwyw@rZf4?Ewq`;mCVv}xaz+3ni+}a=k~P+yaWt^L z@w67!DqVf7D%7XtXX5xBW;Co|HvQ8WR1k?r2cZD%U;2$bsM%u8{JUJ5Z0k= zZJARv^vFkmWx15CB=rb=D4${+#DVqy5$C%bf`!T0+epLJLnh1jwCdb*zuCL}eEFvE z{rO1%gxg>1!W(I!owu*mJZ0@6FM(?C+d*CeceZRW_4id*D9p5nzMY&{mWqrJomjIZ z97ZNnZ3_%Hx8dn;H>p8m7F#^2;T%yZ3H;a&N7tm=Lvs&lgJLW{V1@h&6Vy~!+Ffbb zv(n3+v)_D$}dqd!2>Y2B)#<+o}LH#%ogGi2-?xRIH)1!SD)u-L65B&bsJTC=LiaF+YOCif2dUX6uAA|#+vNR z>U+KQekVGon)Yi<93(d!(yw1h3&X0N(PxN2{%vn}cnV?rYw z$N^}_o!XUB!mckL`yO1rnUaI4wrOeQ(+&k?2mi47hzxSD`N#-byqd1IhEoh!PGq>t z_MRy{5B0eKY>;Ao3z$RUU7U+i?iX^&r739F)itdrTpAi-NN0=?^m%?{A9Ly2pVv>Lqs6moTP?T2-AHqFD-o_ znVr|7OAS#AEH}h8SRPQ@NGG47dO}l=t07__+iK8nHw^(AHx&Wb<%jPc$$jl6_p(b$ z)!pi(0fQodCHfM)KMEMUR&UID>}m^(!{C^U7sBDOA)$VThRCI0_+2=( zV8mMq0R(#z;C|7$m>$>`tX+T|xGt(+Y48@ZYu#z;0pCgYgmMVbFb!$?%yhZqP_nhn zy4<#3P1oQ#2b51NU1mGnHP$cf0j-YOgAA}A$QoL6JVLcmExs(kU{4z;PBHJD%_=0F z>+sQV`mzijSIT7xn%PiDKHOujX;n|M&qr1T@rOxTdxtZ!&u&3HHFLYD5$RLQ=heur zb>+AFokUVQeJy-#LP*^)spt{mb@Mqe=A~-4p0b+Bt|pZ+@CY+%x}9f}izU5;4&QFE zO1bhg&A4uC1)Zb67kuowWY4xbo&J=%yoXlFB)&$d*-}kjBu|w!^zbD1YPc0-#XTJr z)pm2RDy%J3jlqSMq|o%xGS$bPwn4AqitC6&e?pqWcjWPt{3I{>CBy;hg0Umh#c;hU3RhCUX=8aR>rmd` z7Orw(5tcM{|-^J?ZAA9KP|)X6n9$-kvr#j5YDecTM6n z&07(nD^qb8hpF0B^z^pQ*%5ePYkv&FabrlI61ntiVp!!C8y^}|<2xgAd#FY=8b*y( zuQOuvy2`Ii^`VBNJB&R!0{hABYX55ooCAJSSevl4RPqEGb)iy_0H}v@vFwFzD%>#I>)3PsouQ+_Kkbqy*kKdHdfkN7NBcq%V{x^fSxgXpg7$bF& zj!6AQbDY(1u#1_A#1UO9AxiZaCVN2F0wGXdY*g@x$ByvUA?ePdide0dmr#}udE%K| z3*k}Vv2Ew2u1FXBaVA6aerI36R&rzEZeDDCl5!t0J=ug6kuNZzH>3i_VN`%BsaVB3 zQYw|Xub_SGf{)F{$ZX5`Jc!X!;eybjP+o$I{Z^Hsj@D=E{MnnL+TbC@HEU2DjG{3-LDGIbq()U87x4eS;JXnSh;lRlJ z>EL3D>wHt-+wTjQF$fGyDO$>d+(fq@bPpLBS~xA~R=3JPbS{tzN(u~m#Po!?H;IYv zE;?8%^vle|%#oux(Lj!YzBKv+Fd}*Ur-dCBoX*t{KeNM*n~ZPYJ4NNKkI^MFbz9!v z4(Bvm*Kc!-$%VFEewYJKz-CQN{`2}KX4*CeJEs+Q(!kI%hN1!1P6iOq?ovz}X0IOi z)YfWpwW@pK08^69#wSyCZkX9?uZD?C^@rw^Y?gLS_xmFKkooyx$*^5#cPqntNTtSG zlP>XLMj2!VF^0k#ole7`-c~*~+_T5ls?x4)ah(j8vo_ zwb%S8qoaZqY0-$ZI+ViIA_1~~rAH7K_+yFS{0rT@eQtTAdz#8E5VpwnW!zJ_^{Utv zlW5Iar3V5t&H4D6A=>?mq;G92;1cg9a2sf;gY9pJDVKn$DYdQlvfXq}zz8#LyPGq@ z+`YUMD;^-6w&r-82JL7mA8&M~Pj@aK!m{0+^v<|t%APYf7`}jGEhdYLqsHW-Le9TL z_hZZ1gbrz7$f9^fAzVIP30^KIz!!#+DRLL+qMszvI_BpOSmjtl$hh;&UeM{ER@INV zcI}VbiVTPoN|iSna@=7XkP&-4#06C};8ajbxJ4Gcq8(vWv4*&X8bM^T$mBk75Q92j z1v&%a;OSKc8EIrodmIiw$lOES2hzGDcjjB`kEDfJe{r}yE6`eZL zEB`9u>Cl0IsQ+t}`-cx}{6jqcANucqIB>Qmga_&<+80E2Q|VHHQ$YlAt{6`Qu`HA3 z03s0-sSlwbvgi&_R8s={6<~M^pGvBNjKOa>tWenzS8s zR>L7R5aZ=mSU{f?ib4Grx$AeFvtO5N|D>9#)ChH#Fny2maHWHOf2G=#<9Myot#+4u zWVa6d^Vseq_0=#AYS(-m$Lp;*8nC_6jXIjEM`omUmtH@QDs3|G)i4j*#_?#UYVZvJ z?YjT-?!4Q{BNun;dKBWLEw2C-VeAz`%?A>p;)PL}TAZn5j~HK>v1W&anteARlE+~+ zj>c(F;?qO3pXBb|#OZdQnm<4xWmn~;DR5SDMxt0UK_F^&eD|KZ=O;tO3vy4@4h^;2 zUL~-z`-P1aOe?|ZC1BgVsL)2^J-&vIFI%q@40w0{jjEfeVl)i9(~bt2z#2Vm)p`V_ z1;6$Ae7=YXk#=Qkd24Y23t&GvRxaOoad~NbJ+6pxqzJ>FY#Td7@`N5xp!n(c!=RE& z&<<@^a$_Ys8jqz4|5Nk#FY$~|FPC0`*a5HH!|Gssa9=~66&xG9)|=pOOJ2KE5|YrR zw!w6K2aC=J$t?L-;}5hn6mHd%hC;p8P|Dgh6D>hGnXPgi;6r+eA=?f72y9(Cf_ho{ zH6#)uD&R=73^$$NE;5piWX2bzR67fQ)`b=85o0eOLGI4c-Tb@-KNi2pz=Ke@SDcPn za$AxXib84`!Sf;Z3B@TSo`Dz7GM5Kf(@PR>Ghzi=BBxK8wRp>YQoXm+iL>H*Jo9M3 z6w&E?BC8AFTFT&Tv8zf+m9<&S&%dIaZ)Aoqkak_$r-2{$d~0g2oLETx9Y`eOAf14QXEQw3tJne;fdzl@wV#TFXSLXM2428F-Q}t+n2g%vPRMUzYPvzQ9f# zu(liiJem9P*?0%V@RwA7F53r~|I!Ty)<*AsMX3J{_4&}{6pT%Tpw>)^|DJ)>gpS~1rNEh z0$D?uO8mG?H;2BwM5a*26^7YO$XjUm40XmBsb63MoR;bJh63J;OngS5sSI+o2HA;W zdZV#8pDpC9Oez&L8loZO)MClRz!_!WD&QRtQxnazhT%Vj6Wl4G11nUk8*vSeVab@N#oJ}`KyJv+8Mo@T1-pqZ1t|?cnaVOd;1(h9 z!$DrN=jcGsVYE-0-n?oCJ^4x)F}E;UaD-LZUIzcD?W^ficqJWM%QLy6QikrM1aKZC zi{?;oKwq^Vsr|&`i{jIphA8S6G4)$KGvpULjH%9u(Dq247;R#l&I0{IhcC|oBF*Al zvLo7Xte=C{aIt*otJD}BUq)|_pdR>{zBMT< z(^1RpZv*l*m*OV^8>9&asGBo8h*_4q*)-eCv*|Pq=XNGrZE)^(SF7^{QE_~4VDB(o zVcPA_!G+2CAtLbl+`=Q~9iW`4ZRLku!uB?;tWqVjB0lEOf}2RD7dJ=BExy=<9wkb- z9&7{XFA%n#JsHYN8t5d~=T~5DcW4$B%3M+nNvC2`0!#@sckqlzo5;hhGi(D9=*A4` z5ynobawSPRtWn&CDLEs3Xf`(8^zDP=NdF~F^s&={l7(aw&EG}KWpMjtmz7j_VLO;@ zM2NVLDxZ@GIv7*gzl1 zjq78tv*8#WSY`}Su0&C;2F$Ze(q>F(@Wm^Gw!)(j;dk9Ad{STaxn)IV9FZhm*n+U} zi;4y*3v%A`_c7a__DJ8D1b@dl0Std3F||4Wtvi)fCcBRh!X9$1x!_VzUh>*S5s!oq z;qd{J_r79EL2wIeiGAqFstWtkfIJpjVh%zFo*=55B9Zq~y0=^iqHWfQl@O!Ak;(o*m!pZqe9 z%U2oDOhR)BvW8&F70L;2TpkzIutIvNQaTjjs5V#8mV4!NQ}zN=i`i@WI1z0eN-iCS z;vL-Wxc^Vc_qK<5RPh(}*8dLT{~GzE{w2o$2kMFaEl&q zP{V=>&3kW7tWaK-Exy{~`v4J0U#OZBk{a9{&)&QG18L@6=bsZ1zC_d{{pKZ-Ey>I> z;8H0t4bwyQqgu4hmO`3|4K{R*5>qnQ&gOfdy?z`XD%e5+pTDzUt3`k^u~SaL&XMe= z9*h#kT(*Q9jO#w2Hd|Mr-%DV8i_1{J1MU~XJ3!WUplhXDYBpJH><0OU`**nIvPIof z|N8@I=wA)sf45SAvx||f?Z5uB$kz1qL3Ky_{%RPdP5iN-D2!p5scq}buuC00C@jom zhfGKm3|f?Z0iQ|K$Z~!`8{nmAS1r+fp6r#YDOS8V*;K&Gs7Lc&f^$RC66O|)28oh`NHy&vq zJh+hAw8+ybTB0@VhWN^0iiTnLsCWbS_y`^gs!LX!Lw{yE``!UVzrV24tP8o;I6-65 z1MUiHw^{bB15tmrVT*7-#sj6cs~z`wk52YQJ*TG{SE;KTm#Hf#a~|<(|ImHH17nNM z`Ub{+J3dMD!)mzC8b(2tZtokKW5pAwHa?NFiso~# z1*iaNh4lQ4TS)|@G)H4dZV@l*Vd;Rw;-;odDhW2&lJ%m@jz+Panv7LQm~2Js6rOW3 z0_&2cW^b^MYW3)@o;neZ<{B4c#m48dAl$GCc=$>ErDe|?y@z`$uq3xd(%aAsX)D%l z>y*SQ%My`yDP*zof|3@_w#cjaW_YW4BdA;#Glg1RQcJGY*CJ9`H{@|D+*e~*457kd z73p<%fB^PV!Ybw@)Dr%(ZJbX}xmCStCYv#K3O32ej{$9IzM^I{6FJ8!(=azt7RWf4 z7ib0UOPqN40X!wOnFOoddd8`!_IN~9O)#HRTyjfc#&MCZ zZAMzOVB=;qwt8gV?{Y2?b=iSZG~RF~uyx18K)IDFLl})G1v@$(s{O4@RJ%OTJyF+Cpcx4jmy|F3euCnMK!P2WTDu5j z{{gD$=M*pH!GGzL%P)V2*ROm>!$Y=z|D`!_yY6e7SU$~a5q8?hZGgaYqaiLnkK%?0 zs#oI%;zOxF@g*@(V4p!$7dS1rOr6GVs6uYCTt2h)eB4?(&w8{#o)s#%gN@BBosRUe z)@P@8_Zm89pr~)b>e{tbPC~&_MR--iB{=)y;INU5#)@Gix-YpgP<-c2Ms{9zuCX|3 z!p(?VaXww&(w&uBHzoT%!A2=3HAP>SDxcljrego7rY|%hxy3XlODWffO_%g|l+7Y_ zqV(xbu)s4lV=l7M;f>vJl{`6qBm>#ZeMA}kXb97Z)?R97EkoI?x6Lp0yu1Z>PS?2{ z0QQ(8D)|lc9CO3B~e(pQM&5(1y&y=e>C^X$`)_&XuaI!IgDTVqt31wX#n+@!a_A0ZQkA zCJ2@M_4Gb5MfCrm5UPggeyh)8 zO9?`B0J#rkoCx(R0I!ko_2?iO@|oRf1;3r+i)w-2&j?=;NVIdPFsB)`|IC0zk6r9c zRrkfxWsiJ(#8QndNJj@{@WP2Ackr|r1VxV{7S&rSU(^)-M8gV>@UzOLXu9K<{6e{T zXJ6b92r$!|lwjhmgqkdswY&}c)KW4A)-ac%sU;2^fvq7gfUW4Bw$b!i@duy1CAxSn z(pyh$^Z=&O-q<{bZUP+$U}=*#M9uVc>CQVgDs4swy5&8RAHZ~$)hrTF4W zPsSa~qYv_0mJnF89RnnJTH`3}w4?~epFl=D(35$ zWa07ON$`OMBOHgCmfO(9RFc<)?$x)N}Jd2A(<*Ll7+4jrRt9w zwGxExUXd9VB#I|DwfxvJ;HZ8Q{37^wDhaZ%O!oO(HpcqfLH%#a#!~;Jl7F5>EX_=8 z{()l2NqPz>La3qJR;_v+wlK>GsHl;uRA8%j`A|yH@k5r%55S9{*Cp%uw6t`qc1!*T za2OeqtQj7sAp#Q~=5Fs&aCR9v>5V+s&RdNvo&H~6FJOjvaj--2sYYBvMq;55%z8^o z|BJDA4vzfow#DO#ZQHh;Oq_{r+qP{R9ox2TOgwQiv7Ow!zjN+A@BN;0tA2lUb#+zO z(^b89eV)D7UVE+h{mcNc6&GtpOqDn_?VAQ)Vob$hlFwW%xh>D#wml{t&Ofmm_d_+; zKDxzdr}`n2Rw`DtyIjrG)eD0vut$}dJAZ0AohZ+ZQdWXn_Z@dI_y=7t3q8x#pDI-K z2VVc&EGq445Rq-j0=U=Zx`oBaBjsefY;%)Co>J3v4l8V(T8H?49_@;K6q#r~Wwppc z4XW0(4k}cP=5ex>-Xt3oATZ~bBWKv)aw|I|Lx=9C1s~&b77idz({&q3T(Y(KbWO?+ zmcZ6?WeUsGk6>km*~234YC+2e6Zxdl~<_g2J|IE`GH%n<%PRv-50; zH{tnVts*S5*_RxFT9eM0z-pksIb^drUq4>QSww=u;UFCv2AhOuXE*V4z?MM`|ABOC4P;OfhS(M{1|c%QZ=!%rQTDFx`+}?Kdx$&FU?Y<$x;j7z=(;Lyz+?EE>ov!8vvMtSzG!nMie zsBa9t8as#2nH}n8xzN%W%U$#MHNXmDUVr@GX{?(=yI=4vks|V)!-W5jHsU|h_&+kY zS_8^kd3jlYqOoiI`ZqBVY!(UfnAGny!FowZWY_@YR0z!nG7m{{)4OS$q&YDyw6vC$ zm4!$h>*|!2LbMbxS+VM6&DIrL*X4DeMO!@#EzMVfr)e4Tagn~AQHIU8?e61TuhcKD zr!F4(kEebk(Wdk-?4oXM(rJwanS>Jc%<>R(siF+>+5*CqJLecP_we33iTFTXr6W^G z7M?LPC-qFHK;E!fxCP)`8rkxZyFk{EV;G-|kwf4b$c1k0atD?85+|4V%YATWMG|?K zLyLrws36p%Qz6{}>7b>)$pe>mR+=IWuGrX{3ZPZXF3plvuv5Huax86}KX*lbPVr}L z{C#lDjdDeHr~?l|)Vp_}T|%$qF&q#U;ClHEPVuS+Jg~NjC1RP=17=aQKGOcJ6B3mp z8?4*-fAD~}sX*=E6!}^u8)+m2j<&FSW%pYr_d|p_{28DZ#Cz0@NF=gC-o$MY?8Ca8 zr5Y8DSR^*urS~rhpX^05r30Ik#2>*dIOGxRm0#0YX@YQ%Mg5b6dXlS!4{7O_kdaW8PFSdj1=ryI-=5$fiieGK{LZ+SX(1b=MNL!q#lN zv98?fqqTUH8r8C7v(cx#BQ5P9W>- zmW93;eH6T`vuJ~rqtIBg%A6>q>gnWb3X!r0wh_q;211+Om&?nvYzL1hhtjB zK_7G3!n7PL>d!kj){HQE zE8(%J%dWLh1_k%gVXTZt zEdT09XSKAx27Ncaq|(vzL3gm83q>6CAw<$fTnMU05*xAe&rDfCiu`u^1)CD<>sx0i z*hr^N_TeN89G(nunZoLBf^81#pmM}>JgD@Nn1l*lN#a=B=9pN%tmvYFjFIoKe_(GF z-26x{(KXdfsQL7Uv6UtDuYwV`;8V3w>oT_I<`Ccz3QqK9tYT5ZQzbop{=I=!pMOCb zCU68`n?^DT%^&m>A%+-~#lvF!7`L7a{z<3JqIlk1$<||_J}vW1U9Y&eX<}l8##6i( zZcTT@2`9(Mecptm@{3A_Y(X`w9K0EwtPq~O!16bq{7c0f7#(3wn-^)h zxV&M~iiF!{-6A@>o;$RzQ5A50kxXYj!tcgme=Qjrbje~;5X2xryU;vH|6bE(8z^<7 zQ>BG7_c*JG8~K7Oe68i#0~C$v?-t@~@r3t2inUnLT(c=URpA9kA8uq9PKU(Ps(LVH zqgcqW>Gm?6oV#AldDPKVRcEyQIdTT`Qa1j~vS{<;SwyTdr&3*t?J)y=M7q*CzucZ&B0M=joT zBbj@*SY;o2^_h*>R0e({!QHF0=)0hOj^B^d*m>SnRrwq>MolNSgl^~r8GR#mDWGYEIJA8B<|{{j?-7p zVnV$zancW3&JVDtVpIlI|5djKq0(w$KxEFzEiiL=h5Jw~4Le23@s(mYyXWL9SX6Ot zmb)sZaly_P%BeX_9 zw&{yBef8tFm+%=--m*J|o~+Xg3N+$IH)t)=fqD+|fEk4AAZ&!wcN5=mi~Vvo^i`}> z#_3ahR}Ju)(Px7kev#JGcSwPXJ2id9%Qd2A#Uc@t8~egZ8;iC{e! z%=CGJOD1}j!HW_sgbi_8suYnn4#Ou}%9u)dXd3huFIb!ytlX>Denx@pCS-Nj$`VO&j@(z!kKSP0hE4;YIP#w9ta=3DO$7f*x zc9M4&NK%IrVmZAe=r@skWD`AEWH=g+r|*13Ss$+{c_R!b?>?UaGXlw*8qDmY#xlR= z<0XFbs2t?8i^G~m?b|!Hal^ZjRjt<@a? z%({Gn14b4-a|#uY^=@iiKH+k?~~wTj5K1A&hU z2^9-HTC)7zpoWK|$JXaBL6C z#qSNYtY>65T@Zs&-0cHeu|RX(Pxz6vTITdzJdYippF zC-EB+n4}#lM7`2Ry~SO>FxhKboIAF#Z{1wqxaCb{#yEFhLuX;Rx(Lz%T`Xo1+a2M}7D+@wol2)OJs$TwtRNJ={( zD@#zTUEE}#Fz#&(EoD|SV#bayvr&E0vzmb%H?o~46|FAcx?r4$N z&67W3mdip-T1RIxwSm_&(%U|+WvtGBj*}t69XVd&ebn>KOuL(7Y8cV?THd-(+9>G7*Nt%T zcH;`p={`SOjaf7hNd(=37Lz3-51;58JffzIPgGs_7xIOsB5p2t&@v1mKS$2D$*GQ6 zM(IR*j4{nri7NMK9xlDy-hJW6sW|ZiDRaFiayj%;(%51DN!ZCCCXz+0Vm#};70nOx zJ#yA0P3p^1DED;jGdPbQWo0WATN=&2(QybbVdhd=Vq*liDk`c7iZ?*AKEYC#SY&2g z&Q(Ci)MJ{mEat$ZdSwTjf6h~roanYh2?9j$CF@4hjj_f35kTKuGHvIs9}Re@iKMxS-OI*`0S z6s)fOtz}O$T?PLFVSeOjSO26$@u`e<>k(OSP!&YstH3ANh>)mzmKGNOwOawq-MPXe zy4xbeUAl6tamnx))-`Gi2uV5>9n(73yS)Ukma4*7fI8PaEwa)dWHs6QA6>$}7?(L8 ztN8M}?{Tf!Zu22J5?2@95&rQ|F7=FK-hihT-vDp!5JCcWrVogEnp;CHenAZ)+E+K5 z$Cffk5sNwD_?4+ymgcHR(5xgt20Z8M`2*;MzOM#>yhk{r3x=EyM226wb&!+j`W<%* zSc&|`8!>dn9D@!pYow~(DsY_naSx7(Z4i>cu#hA5=;IuI88}7f%)bRkuY2B;+9Uep zpXcvFWkJ!mQai63BgNXG26$5kyhZ2&*3Q_tk)Ii4M>@p~_~q_cE!|^A;_MHB;7s#9 zKzMzK{lIxotjc};k67^Xsl-gS!^*m*m6kn|sbdun`O?dUkJ{0cmI0-_2y=lTAfn*Y zKg*A-2sJq)CCJgY0LF-VQvl&6HIXZyxo2#!O&6fOhbHXC?%1cMc6y^*dOS{f$=137Ds1m01qs`>iUQ49JijsaQ( zksqV9@&?il$|4Ua%4!O15>Zy&%gBY&wgqB>XA3!EldQ%1CRSM(pp#k~-pkcCg4LAT zXE=puHbgsw)!xtc@P4r~Z}nTF=D2~j(6D%gTBw$(`Fc=OOQ0kiW$_RDd=hcO0t97h zb86S5r=>(@VGy1&#S$Kg_H@7G^;8Ue)X5Y+IWUi`o;mpvoV)`fcVk4FpcT|;EG!;? zHG^zrVVZOm>1KFaHlaogcWj(v!S)O(Aa|Vo?S|P z5|6b{qkH(USa*Z7-y_Uvty_Z1|B{rTS^qmEMLEYUSk03_Fg&!O3BMo{b^*`3SHvl0 zhnLTe^_vVIdcSHe)SQE}r~2dq)VZJ!aSKR?RS<(9lzkYo&dQ?mubnWmgMM37Nudwo z3Vz@R{=m2gENUE3V4NbIzAA$H1z0pagz94-PTJyX{b$yndsdKptmlKQKaaHj@3=ED zc7L?p@%ui|RegVYutK$64q4pe9+5sv34QUpo)u{1ci?)_7gXQd{PL>b0l(LI#rJmN zGuO+%GO`xneFOOr4EU(Wg}_%bhzUf;d@TU+V*2#}!2OLwg~%D;1FAu=Un>OgjPb3S z7l(riiCwgghC=Lm5hWGf5NdGp#01xQ59`HJcLXbUR3&n%P(+W2q$h2Qd z*6+-QXJ*&Kvk9ht0f0*rO_|FMBALen{j7T1l%=Q>gf#kma zQlg#I9+HB+z*5BMxdesMND`_W;q5|FaEURFk|~&{@qY32N$G$2B=&Po{=!)x5b!#n zxLzblkq{yj05#O7(GRuT39(06FJlalyv<#K4m}+vs>9@q-&31@1(QBv82{}Zkns~K ze{eHC_RDX0#^A*JQTwF`a=IkE6Ze@j#-8Q`tTT?k9`^ZhA~3eCZJ-Jr{~7Cx;H4A3 zcZ+Zj{mzFZbVvQ6U~n>$U2ZotGsERZ@}VKrgGh0xM;Jzt29%TX6_&CWzg+YYMozrM z`nutuS)_0dCM8UVaKRj804J4i%z2BA_8A4OJRQ$N(P9Mfn-gF;4#q788C@9XR0O3< zsoS4wIoyt046d+LnSCJOy@B@Uz*#GGd#+Ln1ek5Dv>(ZtD@tgZlPnZZJGBLr^JK+!$$?A_fA3LOrkoDRH&l7 zcMcD$Hsjko3`-{bn)jPL6E9Ds{WskMrivsUu5apD z?grQO@W7i5+%X&E&p|RBaEZ(sGLR@~(y^BI@lDMot^Ll?!`90KT!JXUhYS`ZgX3jnu@Ja^seA*M5R@f`=`ynQV4rc$uT1mvE?@tz)TN<=&H1%Z?5yjxcpO+6y_R z6EPuPKM5uxKpmZfT(WKjRRNHs@ib)F5WAP7QCADvmCSD#hPz$V10wiD&{NXyEwx5S z6NE`3z!IS^$s7m}PCwQutVQ#~w+V z=+~->DI*bR2j0^@dMr9`p>q^Ny~NrAVxrJtX2DUveic5vM%#N*XO|?YAWwNI$Q)_) zvE|L(L1jP@F%gOGtnlXtIv2&1i8q<)Xfz8O3G^Ea~e*HJsQgBxWL(yuLY+jqUK zRE~`-zklrGog(X}$9@ZVUw!8*=l`6mzYLtsg`AvBYz(cxmAhr^j0~(rzXdiOEeu_p zE$sf2(w(BPAvO5DlaN&uQ$4@p-b?fRs}d7&2UQ4Fh?1Hzu*YVjcndqJLw0#q@fR4u zJCJ}>_7-|QbvOfylj+e^_L`5Ep9gqd>XI3-O?Wp z-gt*P29f$Tx(mtS`0d05nHH=gm~Po_^OxxUwV294BDKT>PHVlC5bndncxGR!n(OOm znsNt@Q&N{TLrmsoKFw0&_M9$&+C24`sIXGWgQaz=kY;S{?w`z^Q0JXXBKFLj0w0U6P*+jPKyZHX9F#b0D1$&(- zrm8PJd?+SrVf^JlfTM^qGDK&-p2Kdfg?f>^%>1n8bu&byH(huaocL>l@f%c*QkX2i znl}VZ4R1en4S&Bcqw?$=Zi7ohqB$Jw9x`aM#>pHc0x z0$!q7iFu zZ`tryM70qBI6JWWTF9EjgG@>6SRzsd}3h+4D8d~@CR07P$LJ}MFsYi-*O%XVvD@yT|rJ+Mk zDllJ7$n0V&A!0flbOf)HE6P_afPWZmbhpliqJuw=-h+r;WGk|ntkWN(8tKlYpq5Ow z(@%s>IN8nHRaYb*^d;M(D$zGCv5C|uqmsDjwy4g=Lz>*OhO3z=)VD}C<65;`89Ye} zSCxrv#ILzIpEx1KdLPlM&%Cctf@FqTKvNPXC&`*H9=l=D3r!GLM?UV zOxa(8ZsB`&+76S-_xuj?G#wXBfDY@Z_tMpXJS7^mp z@YX&u0jYw2A+Z+bD#6sgVK5ZgdPSJV3>{K^4~%HV?rn~4D)*2H!67Y>0aOmzup`{D zzDp3c9yEbGCY$U<8biJ_gB*`jluz1ShUd!QUIQJ$*1;MXCMApJ^m*Fiv88RZ zFopLViw}{$Tyhh_{MLGIE2~sZ)t0VvoW%=8qKZ>h=adTe3QM$&$PO2lfqH@brt!9j ziePM8$!CgE9iz6B<6_wyTQj?qYa;eC^{x_0wuwV~W+^fZmFco-o%wsKSnjXFEx02V zF5C2t)T6Gw$Kf^_c;Ei3G~uC8SM-xyycmXyC2hAVi-IfXqhu$$-C=*|X?R0~hu z8`J6TdgflslhrmDZq1f?GXF7*ALeMmOEpRDg(s*H`4>_NAr`2uqF;k;JQ+8>A|_6ZNsNLECC%NNEb1Y1dP zbIEmNpK)#XagtL4R6BC{C5T(+=yA-(Z|Ap}U-AfZM#gwVpus3(gPn}Q$CExObJ5AC z)ff9Yk?wZ}dZ-^)?cbb9Fw#EjqQ8jxF4G3=L?Ra zg_)0QDMV1y^A^>HRI$x?Op@t;oj&H@1xt4SZ9(kifQ zb59B*`M99Td7@aZ3UWvj1rD0sE)d=BsBuW*KwkCds7ay(7*01_+L}b~7)VHI>F_!{ zyxg-&nCO?v#KOUec0{OOKy+sjWA;8rTE|Lv6I9H?CI?H(mUm8VXGwU$49LGpz&{nQp2}dinE1@lZ1iox6{ghN&v^GZv9J${7WaXj)<0S4g_uiJ&JCZ zr8-hsu`U%N;+9N^@&Q0^kVPB3)wY(rr}p7{p0qFHb3NUUHJb672+wRZs`gd1UjKPX z4o6zljKKA+Kkj?H>Ew63o%QjyBk&1!P22;MkD>sM0=z_s-G{mTixJCT9@_|*(p^bz zJ8?ZZ&;pzV+7#6Mn`_U-)k8Pjg?a;|Oe^us^PoPY$Va~yi8|?+&=y$f+lABT<*pZr zP}D{~Pq1Qyni+@|aP;ixO~mbEW9#c0OU#YbDZIaw=_&$K%Ep2f%hO^&P67hApZe`x zv8b`Mz@?M_7-)b!lkQKk)JXXUuT|B8kJlvqRmRpxtQDgvrHMXC1B$M@Y%Me!BSx3P z#2Eawl$HleZhhTS6Txm>lN_+I`>eV$&v9fOg)%zVn3O5mI*lAl>QcHuW6!Kixmq`X zBCZ*Ck6OYtDiK!N47>jxI&O2a9x7M|i^IagRr-fmrmikEQGgw%J7bO|)*$2FW95O4 zeBs>KR)izRG1gRVL;F*sr8A}aRHO0gc$$j&ds8CIO1=Gwq1%_~E)CWNn9pCtBE}+`Jelk4{>S)M)`Ll=!~gnn1yq^EX(+y*ik@3Ou0qU`IgYi3*doM+5&dU!cho$pZ zn%lhKeZkS72P?Cf68<#kll_6OAO26bIbueZx**j6o;I0cS^XiL`y+>{cD}gd%lux} z)3N>MaE24WBZ}s0ApfdM;5J_Ny}rfUyxfkC``Awo2#sgLnGPewK};dORuT?@I6(5~ z?kE)Qh$L&fwJXzK){iYx!l5$Tt|^D~MkGZPA}(o6f7w~O2G6Vvzdo*a;iXzk$B66$ zwF#;wM7A+(;uFG4+UAY(2`*3XXx|V$K8AYu#ECJYSl@S=uZW$ksfC$~qrrbQj4??z-)uz0QL}>k^?fPnJTPw% zGz)~?B4}u0CzOf@l^um}HZzbaIwPmb<)< zi_3@E9lc)Qe2_`*Z^HH;1CXOceL=CHpHS{HySy3T%<^NrWQ}G0i4e1xm_K3(+~oi$ zoHl9wzb?Z4j#90DtURtjtgvi7uw8DzHYmtPb;?%8vb9n@bszT=1qr)V_>R%s!92_` zfnHQPANx z<#hIjIMm#*(v*!OXtF+w8kLu`o?VZ5k7{`vw{Yc^qYclpUGIM_PBN1+c{#Vxv&E*@ zxg=W2W~JuV{IuRYw3>LSI1)a!thID@R=bU+cU@DbR^_SXY`MC7HOsCN z!dO4OKV7(E_Z8T#8MA1H`99?Z!r0)qKW_#|29X3#Jb+5+>qUidbeP1NJ@)(qi2S-X zao|f0_tl(O+$R|Qwd$H{_ig|~I1fbp_$NkI!0E;Y z6JrnU{1Ra6^on{9gUUB0mwzP3S%B#h0fjo>JvV~#+X0P~JV=IG=yHG$O+p5O3NUgG zEQ}z6BTp^Fie)Sg<){Z&I8NwPR(=mO4joTLHkJ>|Tnk23E(Bo`FSbPc05lF2-+)X? z6vV3*m~IBHTy*^E!<0nA(tCOJW2G4DsH7)BxLV8kICn5lu6@U*R`w)o9;Ro$i8=Q^V%uH8n3q=+Yf;SFRZu z!+F&PKcH#8cG?aSK_Tl@K9P#8o+jry@gdexz&d(Q=47<7nw@e@FFfIRNL9^)1i@;A z28+$Z#rjv-wj#heI|<&J_DiJ*s}xd-f!{J8jfqOHE`TiHHZVIA8CjkNQ_u;Ery^^t zl1I75&u^`1_q)crO+JT4rx|z2ToSC>)Or@-D zy3S>jW*sNIZR-EBsfyaJ+Jq4BQE4?SePtD2+jY8*%FsSLZ9MY>+wk?}}}AFAw)vr{ml)8LUG-y9>^t!{~|sgpxYc0Gnkg`&~R z-pilJZjr@y5$>B=VMdZ73svct%##v%wdX~9fz6i3Q-zOKJ9wso+h?VME7}SjL=!NUG{J?M&i!>ma`eoEa@IX`5G>B1(7;%}M*%-# zfhJ(W{y;>MRz!Ic8=S}VaBKqh;~7KdnGEHxcL$kA-6E~=!hrN*zw9N+_=odt<$_H_8dbo;0=42wcAETPCVGUr~v(`Uai zb{=D!Qc!dOEU6v)2eHSZq%5iqK?B(JlCq%T6av$Cb4Rko6onlG&?CqaX7Y_C_cOC3 zYZ;_oI(}=>_07}Oep&Ws7x7-R)cc8zfe!SYxJYP``pi$FDS)4Fvw5HH=FiU6xfVqIM!hJ;Rx8c0cB7~aPtNH(Nmm5Vh{ibAoU#J6 zImRCr?(iyu_4W_6AWo3*vxTPUw@vPwy@E0`(>1Qi=%>5eSIrp^`` zK*Y?fK_6F1W>-7UsB)RPC4>>Ps9)f+^MqM}8AUm@tZ->j%&h1M8s*s!LX5&WxQcAh z8mciQej@RPm?660%>{_D+7er>%zX_{s|$Z+;G7_sfNfBgY(zLB4Ey}J9F>zX#K0f6 z?dVNIeEh?EIShmP6>M+d|0wMM85Sa4diw1hrg|ITJ}JDg@o8y>(rF9mXk5M z2@D|NA)-7>wD&wF;S_$KS=eE84`BGw3g0?6wGxu8ys4rwI?9U=*^VF22t3%mbGeOh z`!O-OpF7#Vceu~F`${bW0nYVU9ecmk31V{tF%iv&5hWofC>I~cqAt@u6|R+|HLMMX zVxuSlMFOK_EQ86#E8&KwxIr8S9tj_goWtLv4f@!&h8;Ov41{J~496vp9vX=(LK#j! zAwi*21RAV-LD>9Cw3bV_9X(X3)Kr0-UaB*7Y>t82EQ%!)(&(XuAYtTsYy-dz+w=$ir)VJpe!_$ z6SGpX^i(af3{o=VlFPC);|J8#(=_8#vdxDe|Cok+ANhYwbE*FO`Su2m1~w+&9<_9~ z-|tTU_ACGN`~CNW5WYYBn^B#SwZ(t4%3aPp z;o)|L6Rk569KGxFLUPx@!6OOa+5OjQLK5w&nAmwxkC5rZ|m&HT8G%GVZxB_@ME z>>{rnXUqyiJrT(8GMj_ap#yN_!9-lO5e8mR3cJiK3NE{_UM&=*vIU`YkiL$1%kf+1 z4=jk@7EEj`u(jy$HnzE33ZVW_J4bj}K;vT?T91YlO(|Y0FU4r+VdbmQ97%(J5 zkK*Bed8+C}FcZ@HIgdCMioV%A<*4pw_n}l*{Cr4}a(lq|injK#O?$tyvyE`S%(1`H z_wwRvk#13ElkZvij2MFGOj`fhy?nC^8`Zyo%yVcUAfEr8x&J#A{|moUBAV_^f$hpaUuyQeY3da^ zS9iRgf87YBwfe}>BO+T&Fl%rfpZh#+AM?Dq-k$Bq`vG6G_b4z%Kbd&v>qFjow*mBl z-OylnqOpLg}or7_VNwRg2za3VBK6FUfFX{|TD z`Wt0Vm2H$vdlRWYQJqDmM?JUbVqL*ZQY|5&sY*?!&%P8qhA~5+Af<{MaGo(dl&C5t zE%t!J0 zh6jqANt4ABdPxSTrVV}fLsRQal*)l&_*rFq(Ez}ClEH6LHv{J#v?+H-BZ2)Wy{K@9 z+ovXHq~DiDvm>O~r$LJo!cOuwL+Oa--6;UFE2q@g3N8Qkw5E>ytz^(&($!O47+i~$ zKM+tkAd-RbmP{s_rh+ugTD;lriL~`Xwkad#;_aM?nQ7L_muEFI}U_4$phjvYgleK~`Fo`;GiC07&Hq1F<%p;9Q;tv5b?*QnR%8DYJH3P>Svmv47Y>*LPZJy8_{9H`g6kQpyZU{oJ`m%&p~D=K#KpfoJ@ zn-3cqmHsdtN!f?~w+(t+I`*7GQA#EQC^lUA9(i6=i1PqSAc|ha91I%X&nXzjYaM{8$s&wEx@aVkQ6M{E2 zfzId#&r(XwUNtPcq4Ngze^+XaJA1EK-%&C9j>^9(secqe{}z>hR5CFNveMsVA)m#S zk)_%SidkY-XmMWlVnQ(mNJ>)ooszQ#vaK;!rPmGKXV7am^_F!Lz>;~{VrIO$;!#30XRhE1QqO_~#+Ux;B_D{Nk=grn z8Y0oR^4RqtcYM)7a%@B(XdbZCOqnX#fD{BQTeLvRHd(irHKq=4*jq34`6@VAQR8WG z^%)@5CXnD_T#f%@-l${>y$tfb>2LPmc{~5A82|16mH)R?&r#KKLs7xpN-D`=&Cm^R zvMA6#Ahr<3X>Q7|-qfTY)}32HkAz$_mibYV!I)u>bmjK`qwBe(>za^0Kt*HnFbSdO z1>+ryKCNxmm^)*$XfiDOF2|{-v3KKB?&!(S_Y=Ht@|ir^hLd978xuI&N{k>?(*f8H z=ClxVJK_%_z1TH0eUwm2J+2To7FK4o+n_na)&#VLn1m;!+CX+~WC+qg1?PA~KdOlC zW)C@pw75_xoe=w7i|r9KGIvQ$+3K?L{7TGHwrQM{dCp=Z*D}3kX7E-@sZnup!BImw z*T#a=+WcTwL78exTgBn|iNE3#EsOorO z*kt)gDzHiPt07fmisA2LWN?AymkdqTgr?=loT7z@d`wnlr6oN}@o|&JX!yPzC*Y8d zu6kWlTzE1)ckyBn+0Y^HMN+GA$wUO_LN6W>mxCo!0?oiQvT`z$jbSEu&{UHRU0E8# z%B^wOc@S!yhMT49Y)ww(Xta^8pmPCe@eI5C*ed96)AX9<>))nKx0(sci8gwob_1}4 z0DIL&vsJ1_s%<@y%U*-eX z5rN&(zef-5G~?@r79oZGW1d!WaTqQn0F6RIOa9tJ=0(kdd{d1{<*tHT#cCvl*i>YY zH+L7jq8xZNcTUBqj(S)ztTU!TM!RQ}In*n&Gn<>(60G7}4%WQL!o>hbJqNDSGwl#H z`4k+twp0cj%PsS+NKaxslAEu9!#U3xT1|_KB6`h=PI0SW`P9GTa7caD1}vKEglV8# zjKZR`pluCW19c2fM&ZG)c3T3Um;ir3y(tSCJ7Agl6|b524dy5El{^EQBG?E61H0XY z`bqg!;zhGhyMFl&(o=JWEJ8n~z)xI}A@C0d2hQGvw7nGv)?POU@(kS1m=%`|+^ika zXl8zjS?xqW$WlO?Ewa;vF~XbybHBor$f<%I&*t$F5fynwZlTGj|IjZtVfGa7l&tK} zW>I<69w(cZLu)QIVG|M2xzW@S+70NinQzk&Y0+3WT*cC)rx~04O-^<{JohU_&HL5XdUKW!uFy|i$FB|EMu0eUyW;gsf`XfIc!Z0V zeK&*hPL}f_cX=@iv>K%S5kL;cl_$v?n(Q9f_cChk8Lq$glT|=e+T*8O4H2n<=NGmn z+2*h+v;kBvF>}&0RDS>)B{1!_*XuE8A$Y=G8w^qGMtfudDBsD5>T5SB;Qo}fSkkiV ze^K^M(UthkwrD!&*tTsu>Dacdj_q`~V%r_twr$(Ct&_dKeeXE?fA&4&yASJWJ*}~- zel=@W)tusynfC_YqH4ll>4Eg`Xjs5F7Tj>tTLz<0N3)X<1px_d2yUY>X~y>>93*$) z5PuNMQLf9Bu?AAGO~a_|J2akO1M*@VYN^VxvP0F$2>;Zb9;d5Yfd8P%oFCCoZE$ z4#N$^J8rxYjUE_6{T%Y>MmWfHgScpuGv59#4u6fpTF%~KB^Ae`t1TD_^Ud#DhL+Dm zbY^VAM#MrAmFj{3-BpVSWph2b_Y6gCnCAombVa|1S@DU)2r9W<> zT5L8BB^er3zxKt1v(y&OYk!^aoQisqU zH(g@_o)D~BufUXcPt!Ydom)e|aW{XiMnes2z&rE?og>7|G+tp7&^;q?Qz5S5^yd$i z8lWr4g5nctBHtigX%0%XzIAB8U|T6&JsC4&^hZBw^*aIcuNO47de?|pGXJ4t}BB`L^d8tD`H`i zqrP8?#J@8T#;{^B!KO6J=@OWKhAerih(phML`(Rg7N1XWf1TN>=Z3Do{l_!d~DND&)O)D>ta20}@Lt77qSnVsA7>)uZAaT9bsB>u&aUQl+7GiY2|dAEg@%Al3i316y;&IhQL^8fw_nwS>f60M_-m+!5)S_6EPM7Y)(Nq^8gL7(3 zOiot`6Wy6%vw~a_H?1hLVzIT^i1;HedHgW9-P#)}Y6vF%C=P70X0Tk^z9Te@kPILI z_(gk!k+0%CG)%!WnBjjw*kAKs_lf#=5HXC00s-}oM-Q1aXYLj)(1d!_a7 z*Gg4Fe6F$*ujVjI|79Z5+Pr`us%zW@ln++2l+0hsngv<{mJ%?OfSo_3HJXOCys{Ug z00*YR-(fv<=&%Q!j%b-_ppA$JsTm^_L4x`$k{VpfLI(FMCap%LFAyq;#ns5bR7V+x zO!o;c5y~DyBPqdVQX)8G^G&jWkBy2|oWTw>)?5u}SAsI$RjT#)lTV&Rf8;>u*qXnb z8F%Xb=7#$m)83z%`E;49)t3fHInhtc#kx4wSLLms!*~Z$V?bTyUGiS&m>1P(952(H zuHdv=;o*{;5#X-uAyon`hP}d#U{uDlV?W?_5UjJvf%11hKwe&(&9_~{W)*y1nR5f_ z!N(R74nNK`y8>B!0Bt_Vr!;nc3W>~RiKtGSBkNlsR#-t^&;$W#)f9tTlZz>n*+Fjz z3zXZ;jf(sTM(oDzJt4FJS*8c&;PLTW(IQDFs_5QPy+7yhi1syPCarvqrHFcf&yTy)^O<1EBx;Ir`5W{TIM>{8w&PB>ro4;YD<5LF^TjTb0!zAP|QijA+1Vg>{Afv^% zmrkc4o6rvBI;Q8rj4*=AZacy*n8B{&G3VJc)so4$XUoie0)vr;qzPZVbb<#Fc=j+8CGBWe$n|3K& z_@%?{l|TzKSlUEO{U{{%Fz_pVDxs7i9H#bnbCw7@4DR=}r_qV!Zo~CvD4ZI*+j3kO zW6_=|S`)(*gM0Z;;}nj`73OigF4p6_NPZQ-Od~e$c_);;4-7sR>+2u$6m$Gf%T{aq zle>e3(*Rt(TPD}03n5)!Ca8Pu!V}m6v0o1;5<1h$*|7z|^(3$Y&;KHKTT}hV056wuF0Xo@mK-52~r=6^SI1NC%c~CC?n>yX6wPTgiWYVz!Sx^atLby9YNn1Rk{g?|pJaxD4|9cUf|V1_I*w zzxK)hRh9%zOl=*$?XUjly5z8?jPMy%vEN)f%T*|WO|bp5NWv@B(K3D6LMl!-6dQg0 zXNE&O>Oyf%K@`ngCvbGPR>HRg5!1IV$_}m@3dWB7x3t&KFyOJn9pxRXCAzFr&%37wXG;z^xaO$ekR=LJG ztIHpY8F5xBP{mtQidqNRoz= z@){+N3(VO5bD+VrmS^YjG@+JO{EOIW)9=F4v_$Ed8rZtHvjpiEp{r^c4F6Ic#ChlC zJX^DtSK+v(YdCW)^EFcs=XP7S>Y!4=xgmv>{S$~@h=xW-G4FF9?I@zYN$e5oF9g$# zb!eVU#J+NjLyX;yb)%SY)xJdvGhsnE*JEkuOVo^k5PyS=o#vq!KD46UTW_%R=Y&0G zFj6bV{`Y6)YoKgqnir2&+sl+i6foAn-**Zd1{_;Zb7Ki=u394C5J{l^H@XN`_6XTKY%X1AgQM6KycJ+= zYO=&t#5oSKB^pYhNdzPgH~aEGW2=ec1O#s-KG z71}LOg@4UEFtp3GY1PBemXpNs6UK-ax*)#$J^pC_me;Z$Je(OqLoh|ZrW*mAMBFn< zHttjwC&fkVfMnQeen8`Rvy^$pNRFVaiEN4Pih*Y3@jo!T0nsClN)pdrr9AYLcZxZ| zJ5Wlj+4q~($hbtuY zVQ7hl>4-+@6g1i`1a)rvtp-;b0>^`Dloy(#{z~ytgv=j4q^Kl}wD>K_Y!l~ zp(_&7sh`vfO(1*MO!B%<6E_bx1)&s+Ae`O)a|X=J9y~XDa@UB`m)`tSG4AUhoM=5& znWoHlA-(z@3n0=l{E)R-p8sB9XkV zZ#D8wietfHL?J5X0%&fGg@MH~(rNS2`GHS4xTo7L$>TPme+Is~!|79=^}QbPF>m%J zFMkGzSndiPO|E~hrhCeo@&Ea{M(ieIgRWMf)E}qeTxT8Q#g-!Lu*x$v8W^M^>?-g= zwMJ$dThI|~M06rG$Sv@C@tWR>_YgaG&!BAbkGggVQa#KdtDB)lMLNVLN|51C@F^y8 zCRvMB^{GO@j=cHfmy}_pCGbP%xb{pNN>? z?7tBz$1^zVaP|uaatYaIN+#xEN4jBzwZ|YI_)p(4CUAz1ZEbDk>J~Y|63SZaak~#0 zoYKruYsWHoOlC1(MhTnsdUOwQfz5p6-D0}4;DO$B;7#M{3lSE^jnTT;ns`>!G%i*F?@pR1JO{QTuD0U+~SlZxcc8~>IB{)@8p`P&+nDxNj`*gh|u?yrv$phpQcW)Us)bi`kT%qLj(fi{dWRZ%Es2!=3mI~UxiW0$-v3vUl?#g{p6eF zMEUAqo5-L0Ar(s{VlR9g=j7+lt!gP!UN2ICMokAZ5(Agd>})#gkA2w|5+<%-CuEP# zqgcM}u@3(QIC^Gx<2dbLj?cFSws_f3e%f4jeR?4M^M3cx1f+Qr6ydQ>n)kz1s##2w zk}UyQc+Z5G-d-1}{WzjkLXgS-2P7auWSJ%pSnD|Uivj5u!xk0 z_^-N9r9o;(rFDt~q1PvE#iJZ_f>J3gcP$)SOqhE~pD2|$=GvpL^d!r z6u=sp-CrMoF7;)}Zd7XO4XihC4ji?>V&(t^?@3Q&t9Mx=qex6C9d%{FE6dvU6%d94 zIE;hJ1J)cCqjv?F``7I*6bc#X)JW2b4f$L^>j{*$R`%5VHFi*+Q$2;nyieduE}qdS{L8y8F08yLs?w}{>8>$3236T-VMh@B zq-nujsb_1aUv_7g#)*rf9h%sFj*^mIcImRV*k~Vmw;%;YH(&ylYpy!&UjUVqqtfG` zox3esju?`unJJA_zKXRJP)rA3nXc$m^{S&-p|v|-0x9LHJm;XIww7C#R$?00l&Yyj z=e}gKUOpsImwW?N)+E(awoF@HyP^EhL+GlNB#k?R<2>95hz!h9sF@U20DHSB3~WMa zk90+858r@-+vWwkawJ)8ougd(i#1m3GLN{iSTylYz$brAsP%=&m$mQQrH$g%3-^VR zE%B`Vi&m8f3T~&myTEK28BDWCVzfWir1I?03;pX))|kY5ClO^+bae z*7E?g=3g7EiisYOrE+lA)2?Ln6q2*HLNpZEWMB|O-JI_oaHZB%CvYB(%=tU= zE*OY%QY58fW#RG5=gm0NR#iMB=EuNF@)%oZJ}nmm=tsJ?eGjia{e{yuU0l3{d^D@)kVDt=1PE)&tf_hHC%0MB znL|CRCPC}SeuVTdf>-QV70`0(EHizc21s^sU>y%hW0t!0&y<7}Wi-wGy>m%(-jsDj zP?mF|>p_K>liZ6ZP(w5(|9Ga%>tLgb$|doDDfkdW>Z z`)>V2XC?NJT26mL^@ zf+IKr27TfM!UbZ@?zRddC7#6ss1sw%CXJ4FWC+t3lHZupzM77m^=9 z&(a?-LxIq}*nvv)y?27lZ{j zifdl9hyJudyP2LpU$-kXctshbJDKS{WfulP5Dk~xU4Le4c#h^(YjJit4#R8_khheS z|8(>2ibaHES4+J|DBM7I#QF5u-*EdN{n=Kt@4Zt?@Tv{JZA{`4 zU#kYOv{#A&gGPwT+$Ud}AXlK3K7hYzo$(fBSFjrP{QQ zeaKg--L&jh$9N}`pu{Bs>?eDFPaWY4|9|foN%}i;3%;@4{dc+iw>m}{3rELqH21G! z`8@;w-zsJ1H(N3%|1B@#ioLOjib)j`EiJqPQVSbPSPVHCj6t5J&(NcWzBrzCiDt{4 zdlPAUKldz%6x5II1H_+jv)(xVL+a;P+-1hv_pM>gMRr%04@k;DTokASSKKhU1Qms| zrWh3a!b(J3n0>-tipg{a?UaKsP7?+|@A+1WPDiQIW1Sf@qDU~M_P65_s}7(gjTn0X zucyEm)o;f8UyshMy&>^SC3I|C6jR*R_GFwGranWZe*I>K+0k}pBuET&M~ z;Odo*ZcT?ZpduHyrf8E%IBFtv;JQ!N_m>!sV6ly$_1D{(&nO~w)G~Y`7sD3#hQk%^ zp}ucDF_$!6DAz*PM8yE(&~;%|=+h(Rn-=1Wykas_-@d&z#=S}rDf`4w(rVlcF&lF! z=1)M3YVz7orwk^BXhslJ8jR);sh^knJW(Qmm(QdSgIAIdlN4Te5KJisifjr?eB{FjAX1a0AB>d?qY4Wx>BZ8&}5K0fA+d{l8 z?^s&l8#j7pR&ijD?0b%;lL9l$P_mi2^*_OL+b}4kuLR$GAf85sOo02?Y#90}CCDiS zZ%rbCw>=H~CBO=C_JVV=xgDe%b4FaEFtuS7Q1##y686r%F6I)s-~2(}PWK|Z8M+Gu zl$y~5@#0Ka%$M<&Cv%L`a8X^@tY&T7<0|(6dNT=EsRe0%kp1Qyq!^43VAKYnr*A5~ zsI%lK1ewqO;0TpLrT9v}!@vJK{QoVa_+N4FYT#h?Y8rS1S&-G+m$FNMP?(8N`MZP zels(*?kK{{^g9DOzkuZXJ2;SrOQsp9T$hwRB1(phw1c7`!Q!by?Q#YsSM#I12RhU{$Q+{xj83axHcftEc$mNJ8_T7A-BQc*k(sZ+~NsO~xAA zxnbb%dam_fZlHvW7fKXrB~F&jS<4FD2FqY?VG?ix*r~MDXCE^WQ|W|WM;gsIA4lQP zJ2hAK@CF*3*VqPr2eeg6GzWFlICi8S>nO>5HvWzyZTE)hlkdC_>pBej*>o0EOHR|) z$?};&I4+_?wvL*g#PJ9)!bc#9BJu1(*RdNEn>#Oxta(VWeM40ola<0aOe2kSS~{^P zDJBd}0L-P#O-CzX*%+$#v;(x%<*SPgAje=F{Zh-@ucd2DA(yC|N_|ocs*|-!H%wEw z@Q!>siv2W;C^^j^59OAX03&}&D*W4EjCvfi(ygcL#~t8XGa#|NPO+*M@Y-)ctFA@I z-p7npT1#5zOLo>7q?aZpCZ=iecn3QYklP;gF0bq@>oyBq94f6C=;Csw3PkZ|5q=(c zfs`aw?II0e(h=|7o&T+hq&m$; zBrE09Twxd9BJ2P+QPN}*OdZ-JZV7%av@OM7v!!NL8R;%WFq*?{9T3{ct@2EKgc8h) zMxoM$SaF#p<`65BwIDfmXG6+OiK0e)`I=!A3E`+K@61f}0e z!2a*FOaDrOe>U`q%K!QN`&=&0C~)CaL3R4VY(NDt{Xz(Xpqru5=r#uQN1L$Je1*dkdqQ*=lofQaN%lO!<5z9ZlHgxt|`THd>2 zsWfU$9=p;yLyJyM^t zS2w9w?Bpto`@H^xJpZDKR1@~^30Il6oFGfk5%g6w*C+VM)+%R@gfIwNprOV5{F^M2 zO?n3DEzpT+EoSV-%OdvZvNF+pDd-ZVZ&d8 zKeIyrrfPN=EcFRCPEDCVflX#3-)Ik_HCkL(ejmY8vzcf-MTA{oHk!R2*36`O68$7J zf}zJC+bbQk--9Xm!u#lgLvx8TXx2J258E5^*IZ(FXMpq$2LUUvhWQPs((z1+2{Op% z?J}9k5^N=z;7ja~zi8a_-exIqWUBJwohe#4QJ`|FF*$C{lM18z^#hX6!5B8KAkLUX ziP=oti-gpV(BsLD{0(3*dw}4JxK23Y7M{BeFPucw!sHpY&l%Ws4pSm`+~V7;bZ%Dx zeI)MK=4vC&5#;2MT7fS?^ch9?2;%<8Jlu-IB&N~gg8t;6S-#C@!NU{`p7M8@2iGc& zg|JPg%@gCoCQ&s6JvDU&`X2S<57f(k8nJ1wvBu{8r?;q3_kpZZ${?|( z+^)UvR33sjSd)aT!UPkA;ylO6{aE3MQa{g%Mcf$1KONcjO@&g5zPHWtzM1rYC{_K> zgQNcs<{&X{OA=cEWw5JGqpr0O>x*Tfak2PE9?FuWtz^DDNI}rwAaT0(bdo-<+SJ6A z&}S%boGMWIS0L}=S>|-#kRX;e^sUsotry(MjE|3_9duvfc|nwF#NHuM-w7ZU!5ei8 z6Mkf>2)WunY2eU@C-Uj-A zG(z0Tz2YoBk>zCz_9-)4a>T46$(~kF+Y{#sA9MWH%5z#zNoz)sdXq7ZR_+`RZ%0(q zC7&GyS_|BGHNFl8Xa%@>iWh%Gr?=J5<(!OEjauj5jyrA-QXBjn0OAhJJ9+v=!LK`` z@g(`^*84Q4jcDL`OA&ZV60djgwG`|bcD*i50O}Q{9_noRg|~?dj%VtKOnyRs$Uzqg z191aWoR^rDX#@iSq0n z?9Sg$WSRPqSeI<}&n1T3!6%Wj@5iw5`*`Btni~G=&;J+4`7g#OQTa>u`{4ZZ(c@s$ zK0y;ySOGD-UTjREKbru{QaS>HjN<2)R%Nn-TZiQ(Twe4p@-saNa3~p{?^V9Nixz@a zykPv~<@lu6-Ng9i$Lrk(xi2Tri3q=RW`BJYOPC;S0Yly%77c727Yj-d1vF!Fuk{Xh z)lMbA69y7*5ufET>P*gXQrxsW+ zz)*MbHZv*eJPEXYE<6g6_M7N%#%mR{#awV3i^PafNv(zyI)&bH?F}2s8_rR(6%!V4SOWlup`TKAb@ee>!9JKPM=&8g#BeYRH9FpFybxBXQI2|g}FGJfJ+ zY-*2hB?o{TVL;Wt_ek;AP5PBqfDR4@Z->_182W z{P@Mc27j6jE*9xG{R$>6_;i=y{qf(c`5w9fa*`rEzX6t!KJ(p1H|>J1pC-2zqWENF zmm=Z5B4u{cY2XYl(PfrInB*~WGWik3@1oRhiMOS|D;acnf-Bs(QCm#wR;@Vf!hOPJ zgjhDCfDj$HcyVLJ=AaTbQ{@vIv14LWWF$=i-BDoC11}V;2V8A`S>_x)vIq44-VB-v z*w-d}$G+Ql?En8j!~ZkCpQ$|cA0|+rrY>tiCeWxkRGPoarxlGU2?7%k#F693RHT24 z-?JsiXlT2PTqZqNb&sSc>$d;O4V@|b6VKSWQb~bUaWn1Cf0+K%`Q&Wc<>mQ>*iEGB zbZ;aYOotBZ{vH3y<0A*L0QVM|#rf*LIsGx(O*-7)r@yyBIzJnBFSKBUSl1e|8lxU* zzFL+YDVVkIuzFWeJ8AbgN&w(4-7zbiaMn{5!JQXu)SELk*CNL+Fro|2v|YO)1l15t zs(0^&EB6DPMyaqvY>=KL>)tEpsn;N5Q#yJj<9}ImL((SqErWN3Q=;tBO~ExTCs9hB z2E$7eN#5wX4<3m^5pdjm#5o>s#eS_Q^P)tm$@SawTqF*1dj_i#)3};JslbLKHXl_N z)Fxzf>FN)EK&Rz&*|6&%Hs-^f{V|+_vL1S;-1K-l$5xiC@}%uDuwHYhmsV?YcOUlk zOYkG5v2+`+UWqpn0aaaqrD3lYdh0*!L`3FAsNKu=Q!vJu?Yc8n|CoYyDo_`r0mPoo z8>XCo$W4>l(==h?2~PoRR*kEe)&IH{1sM41mO#-36`02m#nTX{r*r`Q5rZ2-sE|nA zhnn5T#s#v`52T5|?GNS`%HgS2;R(*|^egNPDzzH_z^W)-Q98~$#YAe)cEZ%vge965AS_am#DK#pjPRr-!^za8>`kksCAUj(Xr*1NW5~e zpypt_eJpD&4_bl_y?G%>^L}=>xAaV>KR6;^aBytqpiHe%!j;&MzI_>Sx7O%F%D*8s zSN}cS^<{iiK)=Ji`FpO#^zY!_|D)qeRNAtgmH)m;qC|mq^j(|hL`7uBz+ULUj37gj zksdbnU+LSVo35riSX_4z{UX=%n&}7s0{WuZYoSfwAP`8aKN9P@%e=~1`~1ASL-z%# zw>DO&ixr}c9%4InGc*_y42bdEk)ZdG7-mTu0bD@_vGAr*NcFoMW;@r?@LUhRI zCUJgHb`O?M3!w)|CPu~ej%fddw20lod?Ufp8Dmt0PbnA0J%KE^2~AIcnKP()025V> zG>noSM3$5Btmc$GZoyP^v1@Poz0FD(6YSTH@aD0}BXva?LphAiSz9f&Y(aDAzBnUh z?d2m``~{z;{}kZJ>a^wYI?ry(V9hIoh;|EFc0*-#*`$T0DRQ1;WsqInG;YPS+I4{g zJGpKk%%Sdc5xBa$Q^_I~(F97eqDO7AN3EN0u)PNBAb+n+ zWBTxQx^;O9o0`=g+Zrt_{lP!sgWZHW?8bLYS$;1a@&7w9rD9|Ge;Gb?sEjFoF9-6v z#!2)t{DMHZ2@0W*fCx;62d#;jouz`R5Y(t{BT=$N4yr^^o$ON8d{PQ=!O zX17^CrdM~7D-;ZrC!||<+FEOxI_WI3CA<35va%4v>gc zEX-@h8esj=a4szW7x{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1* znV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI z##W$P9M{B3c3Si9gw^jlPU-JqD~Cye;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP> zrp)BWKA9<}^R9g!0q7yWlh;gr_TEOD|#BmGq<@IV;ueg+D2}cjpp+dPf&Q(36sFU&K8}hA85U61faW&{ zlB`9HUl-WWCG|<1XANN3JVAkRYvr5U4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvx zK%p23>M&=KTCgR!Ee8c?DAO2_R?B zkaqr6^BSP!8dHXxj%N1l+V$_%vzHjqvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rU zHfcog>kv3UZAEB*g7Er@t6CF8kHDmKTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B zZ+jjWgjJ!043F+&#_;D*mz%Q60=L9Ove|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw- z19qI#oB(RSNydn0t~;tAmK!P-d{b-@@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^8 z2zk8VXx|>#R^JCcWdBCy{0nPmYFOxN55#^-rlqobe0#L6)bi?E?SPymF*a5oDDeSd zO0gx?#KMoOd&G(2O@*W)HgX6y_aa6iMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H z`oa=g0SyiLd~BxAj2~l$zRSDHxvDs;I4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*( ze-417=bO2q{492SWrqDK+L3#ChUHtz*@MP)e^%@>_&#Yk^1|tv@j4%3T)diEX zATx4K*hcO`sY$jk#jN5WD<=C3nvuVsRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_ zl3F^#f_rDu8l}l8qcAz0FFa)EAt32IUy_JLIhU_J^l~FRH&6-ivSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPm zZi-noqS!^Ftb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@ zfFGJtW3r>qV>1Z0r|L>7I3un^gcep$AAWfZHRvB|E*kktY$qQP_$YG60C@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn` zEgAp!h|r03h7B!$#OZW#ACD+M;-5J!W+{h|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czP zg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-&SFp;!k?uFayytV$8HPwuyELSXOs^27XvK-D zOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2S43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@ zK^kpH8=yFuP+vI^+59|3%Zqnb5lTDAykf z9S#X`3N(X^SpdMyWQGOQRjhiwlj!0W-yD<3aEj^&X%=?`6lCy~?`&WSWt z?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6VjA#>1f@EYiS8MRHZphp zMA_5`znM=pzUpBPO)pXGYpQ6gkine{6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ z<1SE2Edkfk9C!0t%}8Yio09^F`YGzpaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8p zT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk7v1W)5H9wkorE0ZZjL0Q1=NRGY>zwgfm81DdoaVwNH;or{{eSyybt)m<=zXoA^RALYG-2t zouH|L*BLvmm9cdMmn+KGopyR@4*=&0&4g|FLoreZOhRmh=)R0bg~ zT2(8V_q7~42-zvb)+y959OAv!V$u(O3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+ zMWQoJI_r$HxL5km1#6(e@{lK3Udc~n0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai< z6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF# zMnbr-f55(cTa^q4+#)=s+ThMaV~E`B8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg% zbOg8>mbRN%7^Um-7oj4=6`$|(K7!+t^90a{$18Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9Sq zuGh<9<=AO&g6BZte6hn>Qmvv;Rt)*cJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapi zPbLg_pxm`+HZurtFZ;wZ=`Vk*do~$wB zxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5o}_(P;=!y-AjFrERh%8la!z6Fn@lR?^E~H12D?8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2 zwG1|5ikb^qHv&9hT8w83+yv&BQXOQyMVJSBL(Ky~p)gU3#%|blG?IR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-} z9?*x{y(`509qhCV*B47f2hLrGl^<@SuRGR!KwHei?!CM10Tq*YDIoBNyRuO*>3FU? zHjipIE#B~y3FSfOsMfj~F9PNr*H?0oHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R% zrq|ic4fzJ#USpTm;X7K+E%xsT_3VHKe?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>Jm ziU#?2^`>arnsl#)*R&nf_%>A+qwl%o{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVD zM8AI6MM2V*^_M^sQ0dmHu11fy^kOqXqzpr?K$`}BKWG`=Es(9&S@K@)ZjA{lj3ea7_MBP zk(|hBFRjHVMN!sNUkrB;(cTP)T97M$0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5 zI7{`Z=z_X*no8s>mY;>BvEXK%b`a6(DTS6t&b!vf_z#HM{Uoy_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIo zIZSVls9kFGsTwvr4{T_LidcWtt$u{kJlW7moRaH6+A5hW&;;2O#$oKyEN8kx`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41Uw z`P+tft^E2B$domKT@|nNW`EHwyj>&}K;eDpe z1bNOh=fvIfk`&B61+S8ND<(KC%>y&?>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xo zaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$itm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H z?n6^}l{D``Me90`^o|q!olsF?UX3YSq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfw zR!gX_%AR=L3BFsf8LxI|K^J}deh0ZdV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z z-G6kzA01M?rba+G_mwNMQD1mbVbNTWmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bA zv!b;%yo{g*9l2)>tsZJOOp}U~8VUH`}$ z8p_}t*XIOehezolNa-a2x0BS})Y9}&*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWK zDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~VCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjMsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3 z-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$)WL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>I zgy8p#i4GN{>#v=pFYUQT(g&b$OeTy-X_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6< znXs{W!bkP|s_YI*Yx%4stI`=ZO45IK6rBs`g7sP40ic}GZ58s?Mc$&i`kq_tfci>N zIHrC0H+Qpam1bNa=(`SRKjixBTtm&e`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_ z%7SUeH6=TrXt3J@js`4iDD0=IoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bUpX9ATD#moByY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOx zXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+pmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X z?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L z*&?(77!-=zvnCVW&kUcZMb6;2!83si518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j( ziTaS4HhQ)ldR=r)_7vYFUr%THE}cPF{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVA zdDZRybv?H|>`9f$AKVjFWJ=wegO7hOOIYCtd?Vj{EYLT*^gl35|HQ`R=ti+ADm{jyQE7K@kdjuqJhWVSks>b^ zxha88-h3s;%3_5b1TqFCPTxVjvuB5U>v=HyZ$?JSk+&I%)M7KE*wOg<)1-Iy)8-K! z^XpIt|0ibmk9RtMmlUd7#Ap3Q!q9N4atQy)TmrhrFhfx1DAN`^vq@Q_SRl|V z#lU<~n67$mT)NvHh`%als+G-)x1`Y%4Bp*6Un5Ri9h=_Db zA-AdP!f>f0m@~>7X#uBM?diI@)Egjuz@jXKvm zJo+==juc9_<;CqeRaU9_Mz@;3e=E4=6TK+c`|uu#pIqhSyNm`G(X)&)B`8q0RBv#> z`gGlw(Q=1Xmf55VHj%C#^1lpc>LY8kfA@|rlC1EA<1#`iuyNO z(=;irt{_&K=i4)^x%;U(Xv<)+o=dczC5H3W~+e|f~{*ucxj@{Yi-cw^MqYr3fN zF5D+~!wd$#al?UfMnz(@K#wn`_5na@rRr8XqN@&M&FGEC@`+OEv}sI1hw>Up0qAWf zL#e4~&oM;TVfjRE+10B_gFlLEP9?Q-dARr3xi6nQqnw>k-S;~b z;!0s2VS4}W8b&pGuK=7im+t(`nz@FnT#VD|!)eQNp-W6)@>aA+j~K*H{$G`y2|QHY z|Hmy+CR@#jWY4~)lr1qBJB_RfHJFfP<}pK5(#ZZGSqcpyS&}01LnTWk5fzmXMGHkJ zTP6L^B+uj;lmB_W<~4=${+v0>z31M!-_O@o-O9GyW)j_mjx}!0@br_LE-7SIuPP84 z;5=O(U*g_um0tyG|61N@d9lEuOeiRd+#NY^{nd5;-CVlw&Ap7J?qwM^?E29wvS}2d zbzar4Fz&RSR(-|s!Z6+za&Z zY#D<5q_JUktIzvL0)yq_kLWG6DO{ri=?c!y!f(Dk%G{8)k`Gym%j#!OgXVDD3;$&v@qy#ISJfp=Vm>pls@9-mapVQChAHHd-x+OGx)(*Yr zC1qDUTZ6mM(b_hi!TuFF2k#8uI2;kD70AQ&di$L*4P*Y-@p`jdm%_c3f)XhYD^6M8&#Y$ZpzQMcR|6nsH>b=*R_Von!$BTRj7yGCXokoAQ z&ANvx0-Epw`QIEPgI(^cS2f(Y85yV@ygI{ewyv5Frng)e}KCZF7JbR(&W618_dcEh(#+^zZFY;o<815<5sOHQdeax9_!PyM&;{P zkBa5xymca0#)c#tke@3KNEM8a_mT&1gm;p&&JlMGH(cL(b)BckgMQ^9&vRwj!~3@l zY?L5}=Jzr080OGKb|y`ee(+`flQg|!lo6>=H)X4`$Gz~hLmu2a%kYW_Uu8x09Pa0J zKZ`E$BKJ=2GPj_3l*TEcZ*uYRr<*J^#5pILTT;k_cgto1ZL-%slyc16J~OH-(RgDA z%;EjEnoUkZ&acS{Q8`{i6T5^nywgqQI5bDIymoa7CSZG|WWVk>GM9)zy*bNih|QIm z%0+(Nnc*a_xo;$=!HQYaapLms>J1ToyjtFByY`C2H1wT#178#4+|{H0BBqtCdd$L% z_3Hc60j@{t9~MjM@LBalR&6@>B;9?r<7J~F+WXyYu*y3?px*=8MAK@EA+jRX8{CG?GI-< z54?Dc9CAh>QTAvyOEm0^+x;r2BWX|{3$Y7)L5l*qVE*y0`7J>l2wCmW zL1?|a`pJ-l{fb_N;R(Z9UMiSj6pQjOvQ^%DvhIJF!+Th7jO2~1f1N+(-TyCFYQZYw z4)>7caf^Ki_KJ^Zx2JUb z&$3zJy!*+rCV4%jqwyuNY3j1ZEiltS0xTzd+=itTb;IPYpaf?8Y+RSdVdpacB(bVQ zC(JupLfFp8y43%PMj2}T|VS@%LVp>hv4Y!RPMF?pp8U_$xCJ)S zQx!69>bphNTIb9yn*_yfj{N%bY)t{L1cs8<8|!f$;UQ*}IN=2<6lA;x^(`8t?;+ST zh)z4qeYYgZkIy{$4x28O-pugO&gauRh3;lti9)9Pvw+^)0!h~%m&8Q!AKX%urEMnl z?yEz?g#ODn$UM`+Q#$Q!6|zsq_`dLO5YK-6bJM6ya>}H+vnW^h?o$z;V&wvuM$dR& zeEq;uUUh$XR`TWeC$$c&Jjau2it3#%J-y}Qm>nW*s?En?R&6w@sDXMEr#8~$=b(gk zwDC3)NtAP;M2BW_lL^5ShpK$D%@|BnD{=!Tq)o(5@z3i7Z){} zGr}Exom_qDO{kAVkZ*MbLNHE666Kina#D{&>Jy%~w7yX$oj;cYCd^p9zy z8*+wgSEcj$4{WxKmCF(5o7U4jqwEvO&dm1H#7z}%VXAbW&W24v-tS6N3}qrm1OnE)fUkoE8yMMn9S$?IswS88tQWm4#Oid#ckgr6 zRtHm!mfNl-`d>O*1~d7%;~n+{Rph6BBy^95zqI{K((E!iFQ+h*C3EsbxNo_aRm5gj zKYug($r*Q#W9`p%Bf{bi6;IY0v`pB^^qu)gbg9QHQ7 zWBj(a1YSu)~2RK8Pi#C>{DMlrqFb9e_RehEHyI{n?e3vL_}L>kYJC z_ly$$)zFi*SFyNrnOt(B*7E$??s67EO%DgoZL2XNk8iVx~X_)o++4oaK1M|ou73vA0K^503j@uuVmLcHH4ya-kOIDfM%5%(E z+Xpt~#7y2!KB&)PoyCA+$~DXqxPxxALy!g-O?<9+9KTk4Pgq4AIdUkl`1<1#j^cJg zgU3`0hkHj_jxV>`Y~%LAZl^3o0}`Sm@iw7kwff{M%VwtN)|~!p{AsfA6vB5UolF~d zHWS%*uBDt<9y!9v2Xe|au&1j&iR1HXCdyCjxSgG*L{wmTD4(NQ=mFjpa~xooc6kju z`~+d{j7$h-;HAB04H!Zscu^hZffL#9!p$)9>sRI|Yovm)g@F>ZnosF2EgkU3ln0bR zTA}|+E(tt)!SG)-bEJi_0m{l+(cAz^pi}`9=~n?y&;2eG;d9{M6nj>BHGn(KA2n|O zt}$=FPq!j`p&kQ8>cirSzkU0c08%8{^Qyqi-w2LoO8)^E7;;I1;HQ6B$u0nNaX2CY zSmfi)F`m94zL8>#zu;8|{aBui@RzRKBlP1&mfFxEC@%cjl?NBs`cr^nm){>;$g?rhKr$AO&6qV_Wbn^}5tfFBry^e1`%du2~o zs$~dN;S_#%iwwA_QvmMjh%Qo?0?rR~6liyN5Xmej8(*V9ym*T`xAhHih-v$7U}8=dfXi2i*aAB!xM(Xekg*ix@r|ymDw*{*s0?dlVys2e)z62u1 z+k3esbJE=-P5S$&KdFp+2H7_2e=}OKDrf( z9-207?6$@f4m4B+9E*e((Y89!q?zH|mz_vM>kp*HGXldO0Hg#!EtFhRuOm$u8e~a9 z5(roy7m$Kh+zjW6@zw{&20u?1f2uP&boD}$#Zy)4o&T;vyBoqFiF2t;*g=|1=)PxB z8eM3Mp=l_obbc?I^xyLz?4Y1YDWPa+nm;O<$Cn;@ane616`J9OO2r=rZr{I_Kizyc zP#^^WCdIEp*()rRT+*YZK>V@^Zs=ht32x>Kwe zab)@ZEffz;VM4{XA6e421^h~`ji5r%)B{wZu#hD}f3$y@L0JV9f3g{-RK!A?vBUA}${YF(vO4)@`6f1 z-A|}e#LN{)(eXloDnX4Vs7eH|<@{r#LodP@Nz--$Dg_Par%DCpu2>2jUnqy~|J?eZ zBG4FVsz_A+ibdwv>mLp>P!(t}E>$JGaK$R~;fb{O3($y1ssQQo|5M;^JqC?7qe|hg zu0ZOqeFcp?qVn&Qu7FQJ4hcFi&|nR!*j)MF#b}QO^lN%5)4p*D^H+B){n8%VPUzi! zDihoGcP71a6!ab`l^hK&*dYrVYzJ0)#}xVrp!e;lI!+x+bfCN0KXwUAPU9@#l7@0& QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661ee..37aef8d3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefaa5..aeb74cbb4 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +210,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..93e3f59f1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/http/build.gradle.kts b/http/build.gradle.kts index 172d840a7..4b80235ac 100644 --- a/http/build.gradle.kts +++ b/http/build.gradle.kts @@ -11,15 +11,14 @@ repositories { } dependencies { - implementation(project(":api")) - implementation(project(":logger")) - - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "_") - compileOnly(group = "org.projectlombok", name = "lombok", version = "_") - implementation(group = "com.google.code.gson", name = "gson", version = "_") - implementation(group = "com.google.guava", name = "guava", version = "_") - implementation("com.squareup.okhttp3:okhttp:_") - implementation(group = "org.apache.commons", name = "commons-csv", version = "_") + implementation(projects.api) + implementation(projects.logger) + annotationProcessor(libs.lombok) + compileOnly(libs.lombok) + implementation(libs.gson) + implementation(libs.guava) + implementation(libs.okhttp) + implementation(libs.commons.csv) } tasks.test { diff --git a/injector/build.gradle.kts b/injector/build.gradle.kts index d1679db80..49cf721ed 100644 --- a/injector/build.gradle.kts +++ b/injector/build.gradle.kts @@ -12,26 +12,28 @@ repositories{ } dependencies{ - compileOnly("org.projectlombok:lombok:_") - annotationProcessor("org.projectlombok:lombok:_") - - implementation(project(":annotations")) - implementation(project(":deobfuscator")) - implementation(project(":api-rs")) - implementation(project(":logger")) - implementation(project(":cache")) - implementation("javax.inject:javax.inject:1") - implementation(group = "com.google.code.gson", name = "gson", version = "_") - - implementation(group = "org.ow2.asm", name = "asm", version = "_") - implementation(group = "org.ow2.asm", name = "asm-util", version = "_") - implementation(group = "org.jetbrains", name = "annotations", version = "_") - implementation(group = "com.google.guava", name = "guava", version = "_") - implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "_") + compileOnly(libs.lombok) + annotationProcessor(libs.lombok) + + implementation(projects.annotations) + implementation(projects.deobfuscator) + implementation(projects.apiRs) + implementation(projects.logger) + implementation(projects.cache) + implementation(libs.java.inject) + implementation(libs.gson) + + implementation(libs.asm) + implementation(libs.asm.util) + implementation(libs.annotations) + implementation(libs.guava) + implementation(libs.jopt.simple) } tasks{ + + test { useJUnitPlatform() } diff --git a/mixins/build.gradle.kts b/mixins/build.gradle.kts index 130921af0..e6ca71890 100644 --- a/mixins/build.gradle.kts +++ b/mixins/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - java + java } group = "org.meteorlite" @@ -17,18 +17,18 @@ repositories { dependencies { compileOnly(gradleApi()) - compileOnly(group = "com.google.guava", name = "guava", version = "_") - compileOnly(group = "javax.inject", name = "javax.inject", version = "_") - compileOnly(group = "commons-io", name = "commons-io", version = "_") - compileOnly(project(":annotations")) - compileOnly(project(":api-rs")) - compileOnly(project(":osrs")) - compileOnly(project(":api")) - compileOnly(project(":logger")) - compileOnly(project(":cache")) + compileOnly(libs.guava) + compileOnly(libs.java.inject) + compileOnly(libs.commons.io) + compileOnly(projects.annotations) + compileOnly(projects.apiRs) + compileOnly(projects.osrs) + compileOnly(projects.api) + compileOnly(projects.logger) + compileOnly(projects.cache) } tasks{ -test { - useJUnitPlatform() -} + test { + useJUnitPlatform() + } } \ No newline at end of file diff --git a/osrs/build.gradle.kts b/osrs/build.gradle.kts index 5385a8e15..72cf8f0fc 100644 --- a/osrs/build.gradle.kts +++ b/osrs/build.gradle.kts @@ -8,16 +8,15 @@ repositories{ mavenCentral() } dependencies{ - implementation(project(":api")) - implementation(project(":api-rs")) - implementation(project(":annotations")) - implementation(project(":logger")) - implementation(group = "org.bouncycastle", name = "bcprov-jdk15on", version = "1.64") - implementation(group = "org.json", name = "json", version = "_") - - testImplementation("org.junit.jupiter:junit-jupiter-api:_") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-api:_") - implementation("com.google.code.gson:gson:_") + implementation(projects.api) + implementation(projects.apiRs) + implementation(projects.annotations) + implementation(projects.logger) + implementation(libs.bouncycastle) + implementation(libs.json) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.api) + implementation(libs.gson) } tasks{ @@ -36,7 +35,7 @@ tasks{ disableAutoTargetJvm() } withType(){ - classpath = sourceSets["main"].runtimeClasspath + classpath = sourceSets["main"].runtimeClasspath mainClass.set("net.runelite.rs.UpdateRefMap") } test{ diff --git a/scripts/build.gradle.kts b/scripts/build.gradle.kts index 9bc099e5f..a1fb8bf0a 100644 --- a/scripts/build.gradle.kts +++ b/scripts/build.gradle.kts @@ -10,17 +10,16 @@ repositories{ mavenCentral() } dependencies { - annotationProcessor(group = "org.eclipse.sisu", name = "org.eclipse.sisu.inject", version = "_") - - compileOnly(group = "org.apache.maven.plugin-tools", name = "maven-plugin-annotations", version = "_") - implementation(project(":cache")) - implementation(project(":api")) - implementation(project(":logger")) - implementation("com.google.guava:guava:31.1-jre") - runtimeOnly(group = "org.apache.maven", name = "maven-plugin-api", version = "_") - implementation("org.slf4j:slf4j-simple:2.0.6") - testImplementation("org.junit.jupiter:junit-jupiter-api:_") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:_") + annotationProcessor(libs.sisu.inject) + compileOnly(libs.maven.plugin.annotations) + implementation(projects.cache) + implementation(projects.api) + implementation(projects.logger) + implementation(libs.guava) + runtimeOnly(libs.maven.plugin.api) + implementation(libs.slf4j.simple) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) } tasks{ @@ -29,9 +28,6 @@ tasks{ include( "scripts/runelite/**" ) } } - processResources { - dependsOn(":injector:inject") - } test{ useJUnitPlatform() } @@ -39,6 +35,9 @@ tasks{ classpath(sourceSets["main"].runtimeClasspath) mainClass.set("meteor.scripts.AssembleScripts") } + processResources { + dependsOn(":injector:inject") + } java{ sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/settings.gradle.kts b/settings.gradle.kts index ea26d9301..aef4ee1ec 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,6 +4,7 @@ pluginManagement { maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") plugins { id("de.fayard.refreshVersions") version("0.51.0") } diff --git a/versions.properties b/versions.properties index e7f131a84..c473b17a2 100644 --- a/versions.properties +++ b/versions.properties @@ -7,7 +7,15 @@ #### suppress inspection "SpellCheckingInspection" for whole file #### suppress inspection "UnusedProperty" for whole file -version.kotlin=1.8.0 +version.androidx.compose.compiler=1.5.1 + +version.br.com.devsrsouza.compose.icons.jetbrains..line-awesome=1.0.0 + +version.br.com.devsrsouza.compose.icons.jetbrains..tabler-icons=1.0.0 + +version.com.google.inject..guice=7.0.0 + +version.kotlin=1.9.0 ## # available=1.8.10 ## # available=1.8.20-Beta From 7d678c7e68bbd5aa850ca86b81f68fc30a8962c6 Mon Sep 17 00:00:00 2001 From: Kaballist Date: Fri, 28 Jul 2023 00:57:41 -0700 Subject: [PATCH 02/17] uhh yeah might need this --- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 62076 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1962a79e29d3e0ab67b14947c167a862655af9b GIT binary patch literal 62076 zcmb5VV{~QRw)Y#`wrv{~+qP{x72B%VwzFc}c2cp;N~)5ZbDrJayPv(!dGEd-##*zr z)#n-$y^sH|_dchh3@8{H5D*j;5D<{i*8l5IFJ|DjL!e)upfGNX(kojugZ3I`oH1PvW`wFW_ske0j@lB9bX zO;2)`y+|!@X(fZ1<2n!Qx*)_^Ai@Cv-dF&(vnudG?0CsddG_&Wtae(n|K59ew)6St z#dj7_(Cfwzh$H$5M!$UDd8=4>IQsD3xV=lXUq($;(h*$0^yd+b{qq63f0r_de#!o_ zXDngc>zy`uor)4A^2M#U*DC~i+dc<)Tb1Tv&~Ev@oM)5iJ4Sn#8iRw16XXuV50BS7 zdBL5Mefch(&^{luE{*5qtCZk$oFr3RH=H!c3wGR=HJ(yKc_re_X9pD` zJ;uxPzUfVpgU>DSq?J;I@a+10l0ONXPcDkiYcihREt5~T5Gb}sT0+6Q;AWHl`S5dV>lv%-p9l#xNNy7ZCr%cyqHY%TZ8Q4 zbp&#ov1*$#grNG#1vgfFOLJCaNG@K|2!W&HSh@3@Y%T?3YI75bJp!VP*$*!< z;(ffNS_;@RJ`=c7yX04!u3JP*<8jeqLHVJu#WV&v6wA!OYJS4h<_}^QI&97-;=ojW zQ-1t)7wnxG*5I%U4)9$wlv5Fr;cIizft@&N+32O%B{R1POm$oap@&f| zh+5J{>U6ftv|vAeKGc|zC=kO(+l7_cLpV}-D#oUltScw})N>~JOZLU_0{Ka2e1evz z{^a*ZrLr+JUj;)K&u2CoCAXLC2=fVScI(m_p~0FmF>>&3DHziouln?;sxW`NB}cSX z8?IsJB)Z=aYRz!X=yJn$kyOWK%rCYf-YarNqKzmWu$ZvkP12b4qH zhS9Q>j<}(*frr?z<%9hl*i^#@*O2q(Z^CN)c2c z>1B~D;@YpG?G!Yk+*yn4vM4sO-_!&m6+`k|3zd;8DJnxsBYtI;W3We+FN@|tQ5EW= z!VU>jtim0Mw#iaT8t_<+qKIEB-WwE04lBd%Letbml9N!?SLrEG$nmn7&W(W`VB@5S zaY=sEw2}i@F_1P4OtEw?xj4@D6>_e=m=797#hg}f*l^`AB|Y0# z9=)o|%TZFCY$SzgSjS|8AI-%J4x}J)!IMxY3_KYze`_I=c1nmrk@E8c9?MVRu)7+Ue79|)rBX7tVB7U|w4*h(;Gi3D9le49B38`wuv zp7{4X^p+K4*$@gU(Tq3K1a#3SmYhvI42)GzG4f|u zwQFT1n_=n|jpi=70-yE9LA+d*T8u z`=VmmXJ_f6WmZveZPct$Cgu^~gFiyL>Lnpj*6ee>*0pz=t$IJ}+rE zsf@>jlcG%Wx;Cp5x)YSVvB1$yyY1l&o zvwX=D7k)Dn;ciX?Z)Pn8$flC8#m`nB&(8?RSdBvr?>T9?E$U3uIX7T?$v4dWCa46 z+&`ot8ZTEgp7G+c52oHJ8nw5}a^dwb_l%MOh(ebVj9>_koQP^$2B~eUfSbw9RY$_< z&DDWf2LW;b0ZDOaZ&2^i^g+5uTd;GwO(-bbo|P^;CNL-%?9mRmxEw~5&z=X^Rvbo^WJW=n_%*7974RY}JhFv46> zd}`2|qkd;89l}R;i~9T)V-Q%K)O=yfVKNM4Gbacc7AOd>#^&W&)Xx!Uy5!BHnp9kh z`a(7MO6+Ren#>R^D0K)1sE{Bv>}s6Rb9MT14u!(NpZOe-?4V=>qZ>}uS)!y~;jEUK z&!U7Fj&{WdgU#L0%bM}SYXRtM5z!6M+kgaMKt%3FkjWYh=#QUpt$XX1!*XkpSq-pl zhMe{muh#knk{9_V3%qdDcWDv}v)m4t9 zQhv{;} zc{}#V^N3H>9mFM8`i`0p+fN@GqX+kl|M94$BK3J-X`Hyj8r!#x6Vt(PXjn?N)qedP z=o1T^#?1^a{;bZ&x`U{f?}TMo8ToN zkHj5v|}r}wDEi7I@)Gj+S1aE-GdnLN+$hw!=DzglMaj#{qjXi_dwpr|HL(gcCXwGLEmi|{4&4#OZ4ChceA zKVd4K!D>_N=_X;{poT~4Q+!Le+ZV>=H7v1*l%w`|`Dx8{)McN@NDlQyln&N3@bFpV z_1w~O4EH3fF@IzJ9kDk@7@QctFq8FbkbaH7K$iX=bV~o#gfh?2JD6lZf(XP>~DACF)fGFt)X%-h1yY~MJU{nA5 ze2zxWMs{YdX3q5XU*9hOH0!_S24DOBA5usB+Ws$6{|AMe*joJ?RxfV}*7AKN9V*~J zK+OMcE@bTD>TG1*yc?*qGqjBN8mgg@h1cJLDv)0!WRPIkC` zZrWXrceVw;fB%3`6kq=a!pq|hFIsQ%ZSlo~)D z|64!aCnw-?>}AG|*iOl44KVf8@|joXi&|)1rB;EQWgm+iHfVbgllP$f!$Wf42%NO5b(j9Bw6L z;0dpUUK$5GX4QbMlTmLM_jJt!ur`_0~$b#BB7FL*%XFf<b__1o)Ao3rlobbN8-(T!1d-bR8D3S0@d zLI!*GMb5s~Q<&sjd}lBb8Nr0>PqE6_!3!2d(KAWFxa{hm`@u|a(%#i(#f8{BP2wbs zt+N_slWF4IF_O|{w`c~)Xvh&R{Au~CFmW#0+}MBd2~X}t9lz6*E7uAD`@EBDe$>7W zzPUkJx<`f$0VA$=>R57^(K^h86>09?>_@M(R4q($!Ck6GG@pnu-x*exAx1jOv|>KH zjNfG5pwm`E-=ydcb+3BJwuU;V&OS=6yM^4Jq{%AVqnTTLwV`AorIDD}T&jWr8pB&j28fVtk_y*JRP^t@l*($UZ z6(B^-PBNZ+z!p?+e8@$&jCv^EWLb$WO=}Scr$6SM*&~B95El~;W_0(Bvoha|uQ1T< zO$%_oLAwf1bW*rKWmlD+@CP&$ObiDy=nh1b2ejz%LO9937N{LDe7gle4i!{}I$;&Y zkexJ9Ybr+lrCmKWg&}p=`2&Gf10orS?4$VrzWidT=*6{KzOGMo?KI0>GL0{iFWc;C z+LPq%VH5g}6V@-tg2m{C!-$fapJ9y}c$U}aUmS{9#0CM*8pC|sfer!)nG7Ji>mfRh z+~6CxNb>6eWKMHBz-w2{mLLwdA7dA-qfTu^A2yG1+9s5k zcF=le_UPYG&q!t5Zd_*E_P3Cf5T6821bO`daa`;DODm8Ih8k89=RN;-asHIigj`n=ux>*f!OC5#;X5i;Q z+V!GUy0|&Y_*8k_QRUA8$lHP;GJ3UUD08P|ALknng|YY13)}!!HW@0z$q+kCH%xet zlWf@BXQ=b=4}QO5eNnN~CzWBbHGUivG=`&eWK}beuV*;?zt=P#pM*eTuy3 zP}c#}AXJ0OIaqXji78l;YrP4sQe#^pOqwZUiiN6^0RCd#D271XCbEKpk`HI0IsN^s zES7YtU#7=8gTn#lkrc~6)R9u&SX6*Jk4GFX7){E)WE?pT8a-%6P+zS6o&A#ml{$WX zABFz#i7`DDlo{34)oo?bOa4Z_lNH>n;f0nbt$JfAl~;4QY@}NH!X|A$KgMmEsd^&Y zt;pi=>AID7ROQfr;MsMtClr5b0)xo|fwhc=qk33wQ|}$@?{}qXcmECh>#kUQ-If0$ zseb{Wf4VFGLNc*Rax#P8ko*=`MwaR-DQ8L8V8r=2N{Gaips2_^cS|oC$+yScRo*uF zUO|5=?Q?{p$inDpx*t#Xyo6=s?bbN}y>NNVxj9NZCdtwRI70jxvm3!5R7yiWjREEd zDUjrsZhS|P&|Ng5r+f^kA6BNN#|Se}_GF>P6sy^e8kBrgMv3#vk%m}9PCwUWJg-AD zFnZ=}lbi*mN-AOm zCs)r=*YQAA!`e#1N>aHF=bb*z*hXH#Wl$z^o}x##ZrUc=kh%OHWhp=7;?8%Xj||@V?1c ziWoaC$^&04;A|T)!Zd9sUzE&$ODyJaBpvqsw19Uiuq{i#VK1!htkdRWBnb z`{rat=nHArT%^R>u#CjjCkw-7%g53|&7z-;X+ewb?OLWiV|#nuc8mp*LuGSi3IP<<*Wyo9GKV7l0Noa4Jr0g3p_$ z*R9{qn=?IXC#WU>48-k5V2Oc_>P;4_)J@bo1|pf=%Rcbgk=5m)CJZ`caHBTm3%!Z9 z_?7LHr_BXbKKr=JD!%?KhwdYSdu8XxPoA{n8^%_lh5cjRHuCY9Zlpz8g+$f@bw@0V z+6DRMT9c|>1^3D|$Vzc(C?M~iZurGH2pXPT%F!JSaAMdO%!5o0uc&iqHx?ImcX6fI zCApkzc~OOnfzAd_+-DcMp&AOQxE_EsMqKM{%dRMI5`5CT&%mQO?-@F6tE*xL?aEGZ z8^wH@wRl`Izx4sDmU>}Ym{ybUm@F83qqZPD6nFm?t?(7>h*?`fw)L3t*l%*iw0Qu#?$5eq!Qc zpQvqgSxrd83NsdO@lL6#{%lsYXWen~d3p4fGBb7&5xqNYJ)yn84!e1PmPo7ChVd%4 zHUsV0Mh?VpzZD=A6%)Qrd~i7 z96*RPbid;BN{Wh?adeD_p8YU``kOrGkNox3D9~!K?w>#kFz!4lzOWR}puS(DmfjJD z`x0z|qB33*^0mZdM&6$|+T>fq>M%yoy(BEjuh9L0>{P&XJ3enGpoQRx`v6$txXt#c z0#N?b5%srj(4xmPvJxrlF3H%OMB!jvfy z;wx8RzU~lb?h_}@V=bh6p8PSb-dG|-T#A?`c&H2`_!u+uenIZe`6f~A7r)`9m8atC zt(b|6Eg#!Q*DfRU=Ix`#B_dK)nnJ_+>Q<1d7W)eynaVn`FNuN~%B;uO2}vXr5^zi2 z!ifIF5@Zlo0^h~8+ixFBGqtweFc`C~JkSq}&*a3C}L?b5Mh-bW=e)({F_g4O3 zb@SFTK3VD9QuFgFnK4Ve_pXc3{S$=+Z;;4+;*{H}Rc;845rP?DLK6G5Y-xdUKkA6E3Dz&5f{F^FjJQ(NSpZ8q-_!L3LL@H* zxbDF{gd^U3uD;)a)sJwAVi}7@%pRM&?5IaUH%+m{E)DlA_$IA1=&jr{KrhD5q&lTC zAa3c)A(K!{#nOvenH6XrR-y>*4M#DpTTOGQEO5Jr6kni9pDW`rvY*fs|ItV;CVITh z=`rxcH2nEJpkQ^(;1c^hfb8vGN;{{oR=qNyKtR1;J>CByul*+=`NydWnSWJR#I2lN zTvgnR|MBx*XFsfdA&;tr^dYaqRZp*2NwkAZE6kV@1f{76e56eUmGrZ>MDId)oqSWw z7d&r3qfazg+W2?bT}F)4jD6sWaw`_fXZGY&wnGm$FRPFL$HzVTH^MYBHWGCOk-89y zA+n+Q6EVSSCpgC~%uHfvyg@ufE^#u?JH?<73A}jj5iILz4Qqk5$+^U(SX(-qv5agK znUkfpke(KDn~dU0>gdKqjTkVk`0`9^0n_wzXO7R!0Thd@S;U`y)VVP&mOd-2 z(hT(|$=>4FY;CBY9#_lB$;|Wd$aOMT5O_3}DYXEHn&Jrc3`2JiB`b6X@EUOD zVl0S{ijm65@n^19T3l%>*;F(?3r3s?zY{thc4%AD30CeL_4{8x6&cN}zN3fE+x<9; zt2j1RRVy5j22-8U8a6$pyT+<`f+x2l$fd_{qEp_bfxfzu>ORJsXaJn4>U6oNJ#|~p z`*ZC&NPXl&=vq2{Ne79AkQncuxvbOG+28*2wU$R=GOmns3W@HE%^r)Fu%Utj=r9t` zd;SVOnA(=MXgnOzI2@3SGKHz8HN~Vpx&!Ea+Df~`*n@8O=0!b4m?7cE^K*~@fqv9q zF*uk#1@6Re_<^9eElgJD!nTA@K9C732tV~;B`hzZ321Ph=^BH?zXddiu{Du5*IPg} zqDM=QxjT!Rp|#Bkp$(mL)aar)f(dOAXUiw81pX0DC|Y4;>Vz>>DMshoips^8Frdv} zlTD=cKa48M>dR<>(YlLPOW%rokJZNF2gp8fwc8b2sN+i6&-pHr?$rj|uFgktK@jg~ zIFS(%=r|QJ=$kvm_~@n=ai1lA{7Z}i+zj&yzY+!t$iGUy|9jH#&oTNJ;JW-3n>DF+ z3aCOzqn|$X-Olu_p7brzn`uk1F*N4@=b=m;S_C?#hy{&NE#3HkATrg?enaVGT^$qIjvgc61y!T$9<1B@?_ibtDZ{G zeXInVr5?OD_nS_O|CK3|RzzMmu+8!#Zb8Ik;rkIAR%6?$pN@d<0dKD2c@k2quB%s( zQL^<_EM6ow8F6^wJN1QcPOm|ehA+dP(!>IX=Euz5qqIq}Y3;ibQtJnkDmZ8c8=Cf3 zu`mJ!Q6wI7EblC5RvP*@)j?}W=WxwCvF3*5Up_`3*a~z$`wHwCy)2risye=1mSp%p zu+tD6NAK3o@)4VBsM!@);qgsjgB$kkCZhaimHg&+k69~drbvRTacWKH;YCK(!rC?8 zP#cK5JPHSw;V;{Yji=55X~S+)%(8fuz}O>*F3)hR;STU`z6T1aM#Wd+FP(M5*@T1P z^06O;I20Sk!bxW<-O;E081KRdHZrtsGJflFRRFS zdi5w9OVDGSL3 zNrC7GVsGN=b;YH9jp8Z2$^!K@h=r-xV(aEH@#JicPy;A0k1>g1g^XeR`YV2HfmqXY zYbRwaxHvf}OlCAwHoVI&QBLr5R|THf?nAevV-=~V8;gCsX>jndvNOcFA+DI+zbh~# zZ7`qNk&w+_+Yp!}j;OYxIfx_{f0-ONc?mHCiCUak=>j>~>YR4#w# zuKz~UhT!L~GfW^CPqG8Lg)&Rc6y^{%3H7iLa%^l}cw_8UuG;8nn9)kbPGXS}p3!L_ zd#9~5CrH8xtUd?{d2y^PJg+z(xIfRU;`}^=OlehGN2=?}9yH$4Rag}*+AWotyxfCJ zHx=r7ZH>j2kV?%7WTtp+-HMa0)_*DBBmC{sd$)np&GEJ__kEd`xB5a2A z*J+yx>4o#ZxwA{;NjhU*1KT~=ZK~GAA;KZHDyBNTaWQ1+;tOFFthnD)DrCn`DjBZ% zk$N5B4^$`n^jNSOr=t(zi8TN4fpaccsb`zOPD~iY=UEK$0Y70bG{idLx@IL)7^(pL z{??Bnu=lDeguDrd%qW1)H)H`9otsOL-f4bSu};o9OXybo6J!Lek`a4ff>*O)BDT_g z<6@SrI|C9klY(>_PfA^qai7A_)VNE4c^ZjFcE$Isp>`e5fLc)rg@8Q_d^Uk24$2bn z9#}6kZ2ZxS9sI(RqT7?El2@B+($>eBQrNi_k#CDJ8D9}8$mmm z4oSKO^F$i+NG)-HE$O6s1--6EzJa?C{x=QgK&c=)b(Q9OVoAXYEEH20G|q$}Hue%~ zO3B^bF=t7t48sN zWh_zA`w~|){-!^g?6Mqf6ieV zFx~aPUOJGR=4{KsW7I?<=J2|lY`NTU=lt=%JE9H1vBpkcn=uq(q~=?iBt_-r(PLBM zP-0dxljJO>4Wq-;stY)CLB4q`-r*T$!K2o}?E-w_i>3_aEbA^MB7P5piwt1dI-6o!qWCy0 ztYy!x9arGTS?kabkkyv*yxvsPQ7Vx)twkS6z2T@kZ|kb8yjm+^$|sEBmvACeqbz)RmxkkDQX-A*K!YFziuhwb|ym>C$}U|J)4y z$(z#)GH%uV6{ec%Zy~AhK|+GtG8u@c884Nq%w`O^wv2#A(&xH@c5M`Vjk*SR_tJnq z0trB#aY)!EKW_}{#L3lph5ow=@|D5LzJYUFD6 z7XnUeo_V0DVSIKMFD_T0AqAO|#VFDc7c?c-Q%#u00F%!_TW1@JVnsfvm@_9HKWflBOUD~)RL``-!P;(bCON_4eVdduMO>?IrQ__*zE@7(OX zUtfH@AX*53&xJW*Pu9zcqxGiM>xol0I~QL5B%Toog3Jlenc^WbVgeBvV8C8AX^Vj& z^I}H})B=VboO%q1;aU5ACMh{yK4J;xlMc`jCnZR^!~LDs_MP&8;dd@4LDWw~*>#OT zeZHwdQWS!tt5MJQI~cw|Ka^b4c|qyd_ly(+Ql2m&AAw^ zQeSXDOOH!!mAgzAp0z)DD>6Xo``b6QwzUV@w%h}Yo>)a|xRi$jGuHQhJVA%>)PUvK zBQ!l0hq<3VZ*RnrDODP)>&iS^wf64C;MGqDvx>|p;35%6(u+IHoNbK z;Gb;TneFo*`zUKS6kwF*&b!U8e5m4YAo03a_e^!5BP42+r)LFhEy?_7U1IR<; z^0v|DhCYMSj<-;MtY%R@Fg;9Kky^pz_t2nJfKWfh5Eu@_l{^ph%1z{jkg5jQrkvD< z#vdK!nku*RrH~TdN~`wDs;d>XY1PH?O<4^U4lmA|wUW{Crrv#r%N>7k#{Gc44Fr|t z@UZP}Y-TrAmnEZ39A*@6;ccsR>)$A)S>$-Cj!=x$rz7IvjHIPM(TB+JFf{ehuIvY$ zsDAwREg*%|=>Hw$`us~RP&3{QJg%}RjJKS^mC_!U;E5u>`X`jW$}P`Mf}?7G7FX#{ zE(9u1SO;3q@ZhDL9O({-RD+SqqPX)`0l5IQu4q)49TUTkxR(czeT}4`WV~pV*KY&i zAl3~X%D2cPVD^B43*~&f%+Op)wl<&|D{;=SZwImydWL6@_RJjxP2g)s=dH)u9Npki zs~z9A+3fj0l?yu4N0^4aC5x)Osnm0qrhz@?nwG_`h(71P znbIewljU%T*cC=~NJy|)#hT+lx#^5MuDDnkaMb*Efw9eThXo|*WOQzJ*#3dmRWm@! zfuSc@#kY{Um^gBc^_Xdxnl!n&y&}R4yAbK&RMc+P^Ti;YIUh|C+K1|=Z^{nZ}}rxH*v{xR!i%qO~o zTr`WDE@k$M9o0r4YUFFeQO7xCu_Zgy)==;fCJ94M_rLAv&~NhfvcLWCoaGg2ao~3e zBG?Ms9B+efMkp}7BhmISGWmJsKI@a8b}4lLI48oWKY|8?zuuNc$lt5Npr+p7a#sWu zh!@2nnLBVJK!$S~>r2-pN||^w|fY`CT{TFnJy`B|e5;=+_v4l8O-fkN&UQbA4NKTyntd zqK{xEKh}U{NHoQUf!M=2(&w+eef77VtYr;xs%^cPfKLObyOV_9q<(%76-J%vR>w9!us-0c-~Y?_EVS%v!* z15s2s3eTs$Osz$JayyH|5nPAIPEX=U;r&p;K14G<1)bvn@?bM5kC{am|C5%hyxv}a z(DeSKI5ZfZ1*%dl8frIX2?);R^^~LuDOpNpk-2R8U1w92HmG1m&|j&J{EK=|p$;f9 z7Rs5|jr4r8k5El&qcuM+YRlKny%t+1CgqEWO>3;BSRZi(LA3U%Jm{@{y+A+w(gzA< z7dBq6a1sEWa4cD0W7=Ld9z0H7RI^Z7vl(bfA;72j?SWCo`#5mVC$l1Q2--%V)-uN* z9ha*s-AdfbDZ8R8*fpwjzx=WvOtmSzGFjC#X)hD%Caeo^OWjS(3h|d9_*U)l%{Ab8 zfv$yoP{OuUl@$(-sEVNt{*=qi5P=lpxWVuz2?I7Dc%BRc+NGNw+323^ z5BXGfS71oP^%apUo(Y#xkxE)y?>BFzEBZ}UBbr~R4$%b7h3iZu3S(|A;&HqBR{nK& z$;GApNnz=kNO^FL&nYcfpB7Qg;hGJPsCW44CbkG1@l9pn0`~oKy5S777uH)l{irK!ru|X+;4&0D;VE*Ii|<3P zUx#xUqvZT5kVQxsF#~MwKnv7;1pR^0;PW@$@T7I?s`_rD1EGUdSA5Q(C<>5SzE!vw z;{L&kKFM-MO>hy#-8z`sdVx})^(Dc-dw;k-h*9O2_YZw}|9^y-|8RQ`BWJUJL(Cer zP5Z@fNc>pTXABbTRY-B5*MphpZv6#i802giwV&SkFCR zGMETyUm(KJbh+&$8X*RB#+{surjr;8^REEt`2&Dubw3$mx>|~B5IKZJ`s_6fw zKAZx9&PwBqW1Oz0r0A4GtnZd7XTKViX2%kPfv+^X3|_}RrQ2e3l=KG_VyY`H?I5&CS+lAX5HbA%TD9u6&s#v!G> zzW9n4J%d5ye7x0y`*{KZvqyXUfMEE^ZIffzI=Hh|3J}^yx7eL=s+TPH(Q2GT-sJ~3 zI463C{(ag7-hS1ETtU;_&+49ABt5!A7CwLwe z=SoA8mYZIQeU;9txI=zcQVbuO%q@E)JI+6Q!3lMc=Gbj(ASg-{V27u>z2e8n;Nc*pf}AqKz1D>p9G#QA+7mqqrEjGfw+85Uyh!=tTFTv3|O z+)-kFe_8FF_EkTw!YzwK^Hi^_dV5x-Ob*UWmD-})qKj9@aE8g240nUh=g|j28^?v7 zHRTBo{0KGaWBbyX2+lx$wgXW{3aUab6Bhm1G1{jTC7ota*JM6t+qy)c5<@ zpc&(jVdTJf(q3xB=JotgF$X>cxh7k*(T`-V~AR+`%e?YOeALQ2Qud( zz35YizXt(aW3qndR}fTw1p()Ol4t!D1pitGNL95{SX4ywzh0SF;=!wf=?Q?_h6!f* zh7<+GFi)q|XBsvXZ^qVCY$LUa{5?!CgwY?EG;*)0ceFe&=A;!~o`ae}Z+6me#^sv- z1F6=WNd6>M(~ z+092z>?Clrcp)lYNQl9jN-JF6n&Y0mp7|I0dpPx+4*RRK+VQI~>en0Dc;Zfl+x z_e_b7s`t1_A`RP3$H}y7F9_na%D7EM+**G_Z0l_nwE+&d_kc35n$Fxkd4r=ltRZhh zr9zER8>j(EdV&Jgh(+i}ltESBK62m0nGH6tCBr90!4)-`HeBmz54p~QP#dsu%nb~W z7sS|(Iydi>C@6ZM(Us!jyIiszMkd)^u<1D+R@~O>HqZIW&kearPWmT>63%_t2B{_G zX{&a(gOYJx!Hq=!T$RZ&<8LDnxsmx9+TBL0gTk$|vz9O5GkK_Yx+55^R=2g!K}NJ3 zW?C;XQCHZl7H`K5^BF!Q5X2^Mj93&0l_O3Ea3!Ave|ixx+~bS@Iv18v2ctpSt4zO{ zp#7pj!AtDmti$T`e9{s^jf(ku&E|83JIJO5Qo9weT6g?@vX!{7)cNwymo1+u(YQ94 zopuz-L@|5=h8A!(g-MXgLJC0MA|CgQF8qlonnu#j z;uCeq9ny9QSD|p)9sp3ebgY3rk#y0DA(SHdh$DUm^?GI<>%e1?&}w(b zdip1;P2Z=1wM+$q=TgLP$}svd!vk+BZ@h<^4R=GS2+sri7Z*2f`9 z5_?i)xj?m#pSVchk-SR!2&uNhzEi+#5t1Z$o0PoLGz*pT64%+|Wa+rd5Z}60(j?X= z{NLjtgRb|W?CUADqOS@(*MA-l|E342NxRaxLTDqsOyfWWe%N(jjBh}G zm7WPel6jXijaTiNita+z(5GCO0NM=Melxud57PP^d_U## zbA;9iVi<@wr0DGB8=T9Ab#2K_#zi=$igyK48@;V|W`fg~7;+!q8)aCOo{HA@vpSy-4`^!ze6-~8|QE||hC{ICKllG9fbg_Y7v z$jn{00!ob3!@~-Z%!rSZ0JO#@>|3k10mLK0JRKP-Cc8UYFu>z93=Ab-r^oL2 zl`-&VBh#=-?{l1TatC;VweM^=M7-DUE>m+xO7Xi6vTEsReyLs8KJ+2GZ&rxw$d4IT zPXy6pu^4#e;;ZTsgmG+ZPx>piodegkx2n0}SM77+Y*j^~ICvp#2wj^BuqRY*&cjmL zcKp78aZt>e{3YBb4!J_2|K~A`lN=u&5j!byw`1itV(+Q_?RvV7&Z5XS1HF)L2v6ji z&kOEPmv+k_lSXb{$)of~(BkO^py&7oOzpjdG>vI1kcm_oPFHy38%D4&A4h_CSo#lX z2#oqMCTEP7UvUR3mwkPxbl8AMW(e{ARi@HCYLPSHE^L<1I}OgZD{I#YH#GKnpRmW3 z2jkz~Sa(D)f?V?$gNi?6)Y;Sm{&?~2p=0&BUl_(@hYeX8YjaRO=IqO7neK0RsSNdYjD zaw$g2sG(>JR=8Iz1SK4`*kqd_3-?;_BIcaaMd^}<@MYbYisWZm2C2|Np_l|8r9yM|JkUngSo@?wci(7&O9a z%|V(4C1c9pps0xxzPbXH=}QTxc2rr7fXk$9`a6TbWKPCz&p=VsB8^W96W=BsB|7bc zf(QR8&Ktj*iz)wK&mW`#V%4XTM&jWNnDF56O+2bo<3|NyUhQ%#OZE8$Uv2a@J>D%t zMVMiHh?es!Ex19q&6eC&L=XDU_BA&uR^^w>fpz2_`U87q_?N2y;!Z!bjoeKrzfC)} z?m^PM=(z{%n9K`p|7Bz$LuC7!>tFOuN74MFELm}OD9?%jpT>38J;=1Y-VWtZAscaI z_8jUZ#GwWz{JqvGEUmL?G#l5E=*m>`cY?m*XOc*yOCNtpuIGD+Z|kn4Xww=BLrNYS zGO=wQh}Gtr|7DGXLF%|`G>J~l{k^*{;S-Zhq|&HO7rC_r;o`gTB7)uMZ|WWIn@e0( zX$MccUMv3ABg^$%_lNrgU{EVi8O^UyGHPNRt%R!1#MQJn41aD|_93NsBQhP80yP<9 zG4(&0u7AtJJXLPcqzjv`S~5;Q|5TVGccN=Uzm}K{v)?f7W!230C<``9(64}D2raRU zAW5bp%}VEo{4Rko`bD%Ehf=0voW?-4Mk#d3_pXTF!-TyIt6U+({6OXWVAa;s-`Ta5 zTqx&8msH3+DLrVmQOTBOAj=uoxKYT3DS1^zBXM?1W+7gI!aQNPYfUl{3;PzS9*F7g zWJN8x?KjBDx^V&6iCY8o_gslO16=kh(|Gp)kz8qlQ`dzxQv;)V&t+B}wwdi~uBs4? zu~G|}y!`3;8#vIMUdyC7YEx6bb^1o}G!Jky4cN?BV9ejBfN<&!4M)L&lRKiuMS#3} z_B}Nkv+zzxhy{dYCW$oGC&J(Ty&7%=5B$sD0bkuPmj7g>|962`(Q{ZZMDv%YMuT^KweiRDvYTEop3IgFv#)(w>1 zSzH>J`q!LK)c(AK>&Ib)A{g`Fdykxqd`Yq@yB}E{gnQV$K!}RsgMGWqC3DKE(=!{}ekB3+(1?g}xF>^icEJbc z5bdxAPkW90atZT+&*7qoLqL#p=>t-(-lsnl2XMpZcYeW|o|a322&)yO_8p(&Sw{|b zn(tY$xn5yS$DD)UYS%sP?c|z>1dp!QUD)l;aW#`%qMtQJjE!s2z`+bTSZmLK7SvCR z=@I4|U^sCwZLQSfd*ACw9B@`1c1|&i^W_OD(570SDLK`MD0wTiR8|$7+%{cF&){$G zU~|$^Ed?TIxyw{1$e|D$050n8AjJvvOWhLtLHbSB|HIfjMp+gu>DraHZJRrdO53(= z+o-f{+qNog+qSLB%KY;5>Av6X(>-qYk3IIEwZ5~6a+P9lMpC^ z8CJ0q>rEpjlsxCvJm=kms@tlN4+sv}He`xkr`S}bGih4t`+#VEIt{1veE z{ZLtb_pSbcfcYPf4=T1+|BtR!x5|X#x2TZEEkUB6kslKAE;x)*0x~ES0kl4Dex4e- zT2P~|lT^vUnMp{7e4OExfxak0EE$Hcw;D$ehTV4a6hqxru0$|Mo``>*a5=1Ym0u>BDJKO|=TEWJ5jZu!W}t$Kv{1!q`4Sn7 zrxRQOt>^6}Iz@%gA3&=5r;Lp=N@WKW;>O!eGIj#J;&>+3va^~GXRHCY2}*g#9ULab zitCJt-OV0*D_Q3Q`p1_+GbPxRtV_T`jyATjax<;zZ?;S+VD}a(aN7j?4<~>BkHK7bO8_Vqfdq1#W&p~2H z&w-gJB4?;Q&pG9%8P(oOGZ#`!m>qAeE)SeL*t8KL|1oe;#+uOK6w&PqSDhw^9-&Fa zuEzbi!!7|YhlWhqmiUm!muO(F8-F7|r#5lU8d0+=;<`{$mS=AnAo4Zb^{%p}*gZL! zeE!#-zg0FWsSnablw!9$<&K(#z!XOW z;*BVx2_+H#`1b@>RtY@=KqD)63brP+`Cm$L1@ArAddNS1oP8UE$p05R=bvZoYz+^6 z<)!v7pRvi!u_-V?!d}XWQR1~0q(H3{d^4JGa=W#^Z<@TvI6J*lk!A zZ*UIKj*hyO#5akL*Bx6iPKvR3_2-^2mw|Rh-3O_SGN3V9GRo52Q;JnW{iTGqb9W99 z7_+F(Op6>~3P-?Q8LTZ-lwB}xh*@J2Ni5HhUI3`ct|*W#pqb>8i*TXOLn~GlYECIj zhLaa_rBH|1jgi(S%~31Xm{NB!30*mcsF_wgOY2N0XjG_`kFB+uQuJbBm3bIM$qhUyE&$_u$gb zpK_r{99svp3N3p4yHHS=#csK@j9ql*>j0X=+cD2dj<^Wiu@i>c_v zK|ovi7}@4sVB#bzq$n3`EgI?~xDmkCW=2&^tD5RuaSNHf@Y!5C(Is$hd6cuyoK|;d zO}w2AqJPS`Zq+(mc*^%6qe>1d&(n&~()6-ZATASNPsJ|XnxelLkz8r1x@c2XS)R*H(_B=IN>JeQUR;T=i3<^~;$<+8W*eRKWGt7c#>N`@;#!`kZ!P!&{9J1>_g8Zj zXEXxmA=^{8A|3=Au+LfxIWra)4p<}1LYd_$1KI0r3o~s1N(x#QYgvL4#2{z8`=mXy zQD#iJ0itk1d@Iy*DtXw)Wz!H@G2St?QZFz zVPkM%H8Cd2EZS?teQN*Ecnu|PrC!a7F_XX}AzfZl3fXfhBtc2-)zaC2eKx*{XdM~QUo4IwcGgVdW69 z1UrSAqqMALf^2|(I}hgo38l|Ur=-SC*^Bo5ej`hb;C$@3%NFxx5{cxXUMnTyaX{>~ zjL~xm;*`d08bG_K3-E+TI>#oqIN2=An(C6aJ*MrKlxj?-;G zICL$hi>`F%{xd%V{$NhisHSL~R>f!F7AWR&7b~TgLu6!3s#~8|VKIX)KtqTH5aZ8j zY?wY)XH~1_a3&>#j7N}0az+HZ;is;Zw(Am{MX}YhDTe(t{ZZ;TG}2qWYO+hdX}vp9 z@uIRR8g#y~-^E`Qyem(31{H0&V?GLdq9LEOb2(ea#e-$_`5Q{T%E?W(6 z(XbX*Ck%TQM;9V2LL}*Tf`yzai{0@pYMwBu%(I@wTY!;kMrzcfq0w?X`+y@0ah510 zQX5SU(I!*Fag4U6a7Lw%LL;L*PQ}2v2WwYF(lHx_Uz2ceI$mnZ7*eZ?RFO8UvKI0H z9Pq-mB`mEqn6n_W9(s~Jt_D~j!Ln9HA)P;owD-l~9FYszs)oEKShF9Zzcmnb8kZ7% zQ`>}ki1kwUO3j~ zEmh140sOkA9v>j@#56ymn_RnSF`p@9cO1XkQy6_Kog?0ivZDb`QWOX@tjMd@^Qr(p z!sFN=A)QZm!sTh(#q%O{Ovl{IxkF!&+A)w2@50=?a-+VuZt6On1;d4YtUDW{YNDN_ zG@_jZi1IlW8cck{uHg^g=H58lPQ^HwnybWy@@8iw%G! zwB9qVGt_?~M*nFAKd|{cGg+8`+w{j_^;nD>IrPf-S%YjBslSEDxgKH{5p)3LNr!lD z4ii)^%d&cCXIU7UK?^ZQwmD(RCd=?OxmY(Ko#+#CsTLT;p#A%{;t5YpHFWgl+@)N1 zZ5VDyB;+TN+g@u~{UrWrv)&#u~k$S&GeW)G{M#&Di)LdYk?{($Cq zZGMKeYW)aMtjmKgvF0Tg>Mmkf9IB#2tYmH-s%D_9y3{tfFmX1BSMtbe<(yqAyWX60 zzkgSgKb3c{QPG2MalYp`7mIrYg|Y<4Jk?XvJK)?|Ecr+)oNf}XLPuTZK%W>;<|r+% zTNViRI|{sf1v7CsWHvFrkQ$F7+FbqPQ#Bj7XX=#M(a~9^80}~l-DueX#;b}Ajn3VE z{BWI}$q{XcQ3g{(p>IOzFcAMDG0xL)H%wA)<(gl3I-oVhK~u_m=hAr&oeo|4lZbf} z+pe)c34Am<=z@5!2;_lwya;l?xV5&kWe}*5uBvckm(d|7R>&(iJNa6Y05SvlZcWBlE{{%2- z`86)Y5?H!**?{QbzGG~|k2O%eA8q=gxx-3}&Csf6<9BsiXC)T;x4YmbBIkNf;0Nd5 z%whM^!K+9zH>on_<&>Ws?^v-EyNE)}4g$Fk?Z#748e+GFp)QrQQETx@u6(1fk2!(W zWiCF~MomG*y4@Zk;h#2H8S@&@xwBIs|82R*^K(i*0MTE%Rz4rgO&$R zo9Neb;}_ulaCcdn3i17MO3NxzyJ=l;LU*N9ztBJ30j=+?6>N4{9YXg$m=^9@Cl9VY zbo^{yS@gU=)EpQ#;UIQBpf&zfCA;00H-ee=1+TRw@(h%W=)7WYSb5a%$UqNS@oI@= zDrq|+Y9e&SmZrH^iA>Of8(9~Cf-G(P^5Xb%dDgMMIl8gk6zdyh`D3OGNVV4P9X|EvIhplXDld8d z^YWtYUz@tpg*38Xys2?zj$F8%ivA47cGSl;hjD23#*62w3+fwxNE7M7zVK?x_`dBSgPK zWY_~wF~OEZi9|~CSH8}Xi>#8G73!QLCAh58W+KMJJC81{60?&~BM_0t-u|VsPBxn* zW7viEKwBBTsn_A{g@1!wnJ8@&h&d>!qAe+j_$$Vk;OJq`hrjzEE8Wjtm)Z>h=*M25 zOgETOM9-8xuuZ&^@rLObtcz>%iWe%!uGV09nUZ*nxJAY%&KAYGY}U1WChFik7HIw% zZP$3Bx|TG_`~19XV7kfi2GaBEhKap&)Q<9`aPs#^!kMjtPb|+-fX66z3^E)iwyXK7 z8)_p<)O{|i&!qxtgBvWXx8*69WO$5zACl++1qa;)0zlXf`eKWl!0zV&I`8?sG)OD2Vy?reNN<{eK+_ za4M;Hh%&IszR%)&gpgRCP}yheQ+l#AS-GnY81M!kzhWxIR?PW`G3G?} z$d%J28uQIuK@QxzGMKU_;r8P0+oIjM+k)&lZ39i#(ntY)*B$fdJnQ3Hw3Lsi8z&V+ zZly2}(Uzpt2aOubRjttzqrvinBFH4jrN)f0hy)tj4__UTwN)#1fj3-&dC_Vh7}ri* zfJ=oqLMJ-_<#rwVyN}_a-rFBe2>U;;1(7UKH!$L??zTbbzP#bvyg7OQBGQklJ~DgP zd<1?RJ<}8lWwSL)`jM53iG+}y2`_yUvC!JkMpbZyb&50V3sR~u+lok zT0uFRS-yx@8q4fPRZ%KIpLp8R#;2%c&Ra4p(GWRT4)qLaPNxa&?8!LRVdOUZ)2vrh zBSx&kB%#Y4!+>~)<&c>D$O}!$o{<1AB$M7-^`h!eW;c(3J~ztoOgy6Ek8Pwu5Y`Xion zFl9fb!k2`3uHPAbd(D^IZmwR5d8D$495nN2`Ue&`W;M-nlb8T-OVKt|fHk zBpjX$a(IR6*-swdNk@#}G?k6F-~c{AE0EWoZ?H|ZpkBxqU<0NUtvubJtwJ1mHV%9v?GdDw; zAyXZiD}f0Zdt-cl9(P1la+vQ$Er0~v}gYJVwQazv zH#+Z%2CIfOf90fNMGos|{zf&N`c0@x0N`tkFv|_9af3~<0z@mnf*e;%r*Fbuwl-IW z{}B3=(mJ#iwLIPiUP`J3SoP~#)6v;aRXJ)A-pD2?_2_CZ#}SAZ<#v7&Vk6{*i(~|5 z9v^nC`T6o`CN*n%&9+bopj^r|E(|pul;|q6m7Tx+U|UMjWK8o-lBSgc3ZF=rP{|l9 zc&R$4+-UG6i}c==!;I#8aDIbAvgLuB66CQLRoTMu~jdw`fPlKy@AKYWS-xyZzPg&JRAa@m-H43*+ne!8B7)HkQY4 zIh}NL4Q79a-`x;I_^>s$Z4J4-Ngq=XNWQ>yAUCoe&SMAYowP>r_O}S=V+3=3&(O=h zNJDYNs*R3Y{WLmBHc?mFEeA4`0Y`_CN%?8qbDvG2m}kMAiqCv`_BK z_6a@n`$#w6Csr@e2YsMx8udNWtNt=kcqDZdWZ-lGA$?1PA*f4?X*)hjn{sSo8!bHz zb&lGdAgBx@iTNPK#T_wy`KvOIZvTWqSHb=gWUCKXAiB5ckQI`1KkPx{{%1R*F2)Oc z(9p@yG{fRSWE*M9cdbrO^)8vQ2U`H6M>V$gK*rz!&f%@3t*d-r3mSW>D;wYxOhUul zk~~&ip5B$mZ~-F1orsq<|1bc3Zpw6)Ws5;4)HilsN;1tx;N6)tuePw& z==OlmaN*ybM&-V`yt|;vDz(_+UZ0m&&9#{9O|?0I|4j1YCMW;fXm}YT$0%EZ5^YEI z4i9WV*JBmEU{qz5O{#bs`R1wU%W$qKx?bC|e-iS&d*Qm7S=l~bMT{~m3iZl+PIXq{ zn-c~|l)*|NWLM%ysfTV-oR0AJ3O>=uB-vpld{V|cWFhI~sx>ciV9sPkC*3i0Gg_9G!=4ar*-W?D9)?EFL1=;O+W8}WGdp8TT!Fgv z{HKD`W>t(`Cds_qliEzuE!r{ihwEv1l5o~iqlgjAyGBi)$%zNvl~fSlg@M=C{TE;V zQkH`zS8b&!ut(m)%4n2E6MB>p*4(oV>+PT51#I{OXs9j1vo>9I<4CL1kv1aurV*AFZ^w_qfVL*G2rG@D2 zrs87oV3#mf8^E5hd_b$IXfH6vHe&lm@7On~Nkcq~YtE!}ad~?5*?X*>y`o;6Q9lkk zmf%TYonZM`{vJg$`lt@MXsg%*&zZZ0uUSse8o=!=bfr&DV)9Y6$c!2$NHyYAQf*Rs zk{^?gl9E z5Im8wlAsvQ6C2?DyG@95gUXZ3?pPijug25g;#(esF_~3uCj3~94}b*L>N2GSk%Qst z=w|Z>UX$m!ZOd(xV*2xvWjN&c5BVEdVZ0wvmk)I+YxnyK%l~caR=7uNQ=+cnNTLZ@&M!I$Mj-r{!P=; z`C2)D=VmvK8@T5S9JZoRtN!S*D_oqOxyy!q6Zk|~4aT|*iRN)fL)c>-yycR>-is0X zKrko-iZw(f(!}dEa?hef5yl%p0-v-8#8CX8!W#n2KNyT--^3hq6r&`)5Y@>}e^4h- zlPiDT^zt}Ynk&x@F8R&=)k8j$=N{w9qUcIc&)Qo9u4Y(Ae@9tA`3oglxjj6c{^pN( zQH+Uds2=9WKjH#KBIwrQI%bbs`mP=7V>rs$KG4|}>dxl_k!}3ZSKeEen4Iswt96GGw`E6^5Ov)VyyY}@itlj&sao|>Sb5 zeY+#1EK(}iaYI~EaHQkh7Uh>DnzcfIKv8ygx1Dv`8N8a6m+AcTa-f;17RiEed>?RT zk=dAksmFYPMV1vIS(Qc6tUO+`1jRZ}tcDP? zt)=7B?yK2RcAd1+Y!$K5*ds=SD;EEqCMG6+OqPoj{&8Y5IqP(&@zq@=A7+X|JBRi4 zMv!czlMPz)gt-St2VZwDD=w_S>gRpc-g zUd*J3>bXeZ?Psjohe;z7k|d<*T21PA1i)AOi8iMRwTBSCd0ses{)Q`9o&p9rsKeLaiY zluBw{1r_IFKR76YCAfl&_S1*(yFW8HM^T()&p#6y%{(j7Qu56^ZJx1LnN`-RTwimdnuo*M8N1ISl+$C-%=HLG-s} zc99>IXRG#FEWqSV9@GFW$V8!{>=lSO%v@X*pz*7()xb>=yz{E$3VE;e)_Ok@A*~El zV$sYm=}uNlUxV~6e<6LtYli1!^X!Ii$L~j4e{sI$tq_A(OkGquC$+>Rw3NFObV2Z)3Rt~Jr{oYGnZaFZ^g5TDZlg;gaeIP} z!7;T{(9h7mv{s@piF{-35L=Ea%kOp;^j|b5ZC#xvD^^n#vPH=)lopYz1n?Kt;vZmJ z!FP>Gs7=W{sva+aO9S}jh0vBs+|(B6Jf7t4F^jO3su;M13I{2rd8PJjQe1JyBUJ5v zcT%>D?8^Kp-70bP8*rulxlm)SySQhG$Pz*bo@mb5bvpLAEp${?r^2!Wl*6d7+0Hs_ zGPaC~w0E!bf1qFLDM@}zso7i~(``)H)zRgcExT_2#!YOPtBVN5Hf5~Ll3f~rWZ(UsJtM?O*cA1_W0)&qz%{bDoA}{$S&-r;0iIkIjbY~ zaAqH45I&ALpP=9Vof4OapFB`+_PLDd-0hMqCQq08>6G+C;9R~}Ug_nm?hhdkK$xpI zgXl24{4jq(!gPr2bGtq+hyd3%Fg%nofK`psHMs}EFh@}sdWCd!5NMs)eZg`ZlS#O0 zru6b8#NClS(25tXqnl{|Ax@RvzEG!+esNW-VRxba(f`}hGoqci$U(g30i}2w9`&z= zb8XjQLGN!REzGx)mg~RSBaU{KCPvQx8)|TNf|Oi8KWgv{7^tu}pZq|BS&S<53fC2K4Fw6>M^s$R$}LD*sUxdy6Pf5YKDbVet;P!bw5Al-8I1Nr(`SAubX5^D9hk6$agWpF}T#Bdf{b9-F#2WVO*5N zp+5uGgADy7m!hAcFz{-sS0kM7O)qq*rC!>W@St~^OW@R1wr{ajyYZq5H!T?P0e+)a zaQ%IL@X_`hzp~vRH0yUblo`#g`LMC%9}P;TGt+I7qNcBSe&tLGL4zqZqB!Bfl%SUa z6-J_XLrnm*WA`34&mF+&e1sPCP9=deazrM=Pc4Bn(nV;X%HG^4%Afv4CI~&l!Sjzb z{rHZ3od0!Al{}oBO>F*mOFAJrz>gX-vs!7>+_G%BB(ljWh$252j1h;9p~xVA=9_`P z5KoFiz96_QsTK%B&>MSXEYh`|U5PjX1(+4b#1PufXRJ*uZ*KWdth1<0 zsAmgjT%bowLyNDv7bTUGy|g~N34I-?lqxOUtFpTLSV6?o?<7-UFy*`-BEUsrdANh} zBWkDt2SAcGHRiqz)x!iVoB~&t?$yn6b#T=SP6Ou8lW=B>=>@ik93LaBL56ub`>Uo!>0@O8?e)$t(sgy$I z6tk3nS@yFFBC#aFf?!d_3;%>wHR;A3f2SP?Na8~$r5C1N(>-ME@HOpv4B|Ty7%jAv zR}GJwsiJZ5@H+D$^Cwj#0XA_(m^COZl8y7Vv(k=iav1=%QgBOVzeAiw zaDzzdrxzj%sE^c9_uM5D;$A_7)Ln}BvBx^=)fO+${ou%B*u$(IzVr-gH3=zL6La;G zu0Kzy5CLyNGoKRtK=G0-w|tnwI)puPDOakRzG(}R9fl7#<|oQEX;E#yCWVg95 z;NzWbyF&wGg_k+_4x4=z1GUcn6JrdX4nOVGaAQ8#^Ga>aFvajQN{!+9rgO-dHP zIp@%&ebVg}IqnRWwZRTNxLds+gz2@~VU(HI=?Epw>?yiEdZ>MjajqlO>2KDxA>)cj z2|k%dhh%d8SijIo1~20*5YT1eZTDkN2rc^zWr!2`5}f<2f%M_$to*3?Ok>e9$X>AV z2jYmfAd)s|(h?|B(XYrIfl=Wa_lBvk9R1KaP{90-z{xKi+&8=dI$W0+qzX|ZovWGOotP+vvYR(o=jo?k1=oG?%;pSqxcU* zWVGVMw?z__XQ9mnP!hziHC`ChGD{k#SqEn*ph6l46PZVkm>JF^Q{p&0=MKy_6apts z`}%_y+Tl_dSP(;Ja&sih$>qBH;bG;4;75)jUoVqw^}ee=ciV;0#t09AOhB^Py7`NC z-m+ybq1>_OO+V*Z>dhk}QFKA8V?9Mc4WSpzj{6IWfFpF7l^au#r7&^BK2Ac7vCkCn{m0uuN93Ee&rXfl1NBY4NnO9lFUp zY++C1I;_{#OH#TeP2Dp?l4KOF8ub?m6zE@XOB5Aiu$E~QNBM@;r+A5mF2W1-c7>ex zHiB=WJ&|`6wDq*+xv8UNLVUy4uW1OT>ey~Xgj@MMpS@wQbHAh>ysYvdl-1YH@&+Q! z075(Qd4C!V`9Q9jI4 zSt{HJRvZec>vaL_brKhQQwbpQd4_Lmmr0@1GdUeU-QcC{{8o=@nwwf>+dIKFVzPriGNX4VjHCa zTbL9w{Y2V87c2ofX%`(48A+4~mYTiFFl!e{3K^C_k%{&QTsgOd0*95KmWN)P}m zTRr{`f7@=v#+z_&fKYkQT!mJn{*crj%ZJz#(+c?>cD&2Lo~FFAWy&UG*Op^pV`BR^I|g?T>4l5;b|5OQ@t*?_Slp`*~Y3`&RfKD^1uLezIW(cE-Dq2z%I zBi8bWsz0857`6e!ahet}1>`9cYyIa{pe53Kl?8|Qg2RGrx@AlvG3HAL-^9c^1GW;)vQt8IK+ zM>!IW*~682A~MDlyCukldMd;8P|JCZ&oNL(;HZgJ>ie1PlaInK7C@Jg{3kMKYui?e!b`(&?t6PTb5UPrW-6DVU%^@^E`*y-Fd(p|`+JH&MzfEq;kikdse ziFOiDWH(D< zyV7Rxt^D0_N{v?O53N$a2gu%1pxbeK;&ua`ZkgSic~$+zvt~|1Yb=UfKJW2F7wC^evlPf(*El+#}ZBy0d4kbVJsK- z05>;>?HZO(YBF&v5tNv_WcI@O@LKFl*VO?L(!BAd!KbkVzo;v@~3v`-816GG?P zY+H3ujC>5=Am3RIZDdT#0G5A6xe`vGCNq88ZC1aVXafJkUlcYmHE^+Z{*S->ol%-O znm9R0TYTr2w*N8Vs#s-5=^w*{Y}qp5GG)Yt1oLNsH7y~N@>Eghms|K*Sdt_u!&I}$ z+GSdFTpbz%KH+?B%Ncy;C`uW6oWI46(tk>r|5|-K6)?O0d_neghUUOa9BXHP*>vi; z={&jIGMn-92HvInCMJcyXwHTJ42FZp&Wxu+9Rx;1x(EcIQwPUQ@YEQQ`bbMy4q3hP zNFoq~Qd0=|xS-R}k1Im3;8s{BnS!iaHIMLx)aITl)+)?Yt#fov|Eh>}dv@o6R{tG>uHsy&jGmWN5+*wAik|78(b?jtysPHC#e+Bzz~V zS3eEXv7!Qn4uWi!FS3B?afdD*{fr9>B~&tc671fi--V}~E4un;Q|PzZRwk-azprM$4AesvUb5`S`(5x#5VJ~4%ET6&%GR$}muHV-5lTsCi_R|6KM(g2PCD@|yOpKluT zakH!1V7nKN)?6JmC-zJoA#ciFux8!)ajiY%K#RtEg$gm1#oKUKX_Ms^%hvKWi|B=~ zLbl-L)-=`bfhl`>m!^sRR{}cP`Oim-{7}oz4p@>Y(FF5FUEOfMwO!ft6YytF`iZRq zfFr{!&0Efqa{1k|bZ4KLox;&V@ZW$997;+Ld8Yle91he{BfjRhjFTFv&^YuBr^&Pe zswA|Bn$vtifycN8Lxr`D7!Kygd7CuQyWqf}Q_PM}cX~S1$-6xUD%-jrSi24sBTFNz(Fy{QL2AmNbaVggWOhP;UY4D>S zqKr!UggZ9Pl9Nh_H;qI`-WoH{ceXj?m8y==MGY`AOJ7l0Uu z)>M%?dtaz2rjn1SW3k+p`1vs&lwb%msw8R!5nLS;upDSxViY98IIbxnh{}mRfEp=9 zbrPl>HEJeN7J=KnB6?dwEA6YMs~chHNG?pJsEj#&iUubdf3JJwu=C(t?JpE6xMyhA3e}SRhunDC zn-~83*9=mADUsk^sCc%&&G1q5T^HR9$P#2DejaG`Ui*z1hI#h7dwpIXg)C{8s< z%^#@uQRAg-$z&fmnYc$Duw63_Zopx|n{Bv*9Xau{a)2%?H<6D>kYY7_)e>OFT<6TT z0A}MQLgXbC2uf`;67`mhlcUhtXd)Kbc$PMm=|V}h;*_%vCw4L6r>3Vi)lE5`8hkSg zNGmW-BAOO)(W((6*e_tW&I>Nt9B$xynx|sj^ux~?q?J@F$L4;rnm_xy8E*JYwO-02u9_@@W0_2@?B@1J{y~Q39N3NX^t7#`=34Wh)X~sU&uZWgS1Z09%_k|EjA4w_QqPdY`oIdv$dJZ;(!k)#U8L+|y~gCzn+6WmFt#d{OUuKHqh1-uX_p*Af8pFYkYvKPKBxyid4KHc}H` z*KcyY;=@wzXYR{`d{6RYPhapShXIV?0cg_?ahZ7do)Ot#mxgXYJYx}<%E1pX;zqHd zf!c(onm{~#!O$2`VIXezECAHVd|`vyP)Uyt^-075X@NZDBaQt<>trA3nY-Dayki4S zZ^j6CCmx1r46`4G9794j-WC0&R9(G7kskS>=y${j-2;(BuIZTLDmAyWTG~`0)Bxqk zd{NkDe9ug|ms@0A>JVmB-IDuse9h?z9nw!U6tr7t-Lri5H`?TjpV~8(gZWFq4Vru4 z!86bDB;3lpV%{rZ`3gtmcRH1hjj!loI9jN>6stN6A*ujt!~s!2Q+U1(EFQEQb(h4E z6VKuRouEH`G6+8Qv2C)K@^;ldIuMVXdDDu}-!7FS8~k^&+}e9EXgx~)4V4~o6P^52 z)a|`J-fOirL^oK}tqD@pqBZi_;7N43%{IQ{v&G9^Y^1?SesL`;Z(dt!nn9Oj5Odde%opv&t zxJ><~b#m+^KV&b?R#)fRi;eyqAJ_0(nL*61yPkJGt;gZxSHY#t>ATnEl-E%q$E16% zZdQfvhm5B((y4E3Hk6cBdwGdDy?i5CqBlCVHZr-rI$B#>Tbi4}Gcvyg_~2=6O9D-8 zY2|tKrNzbVR$h57R?Pe+gUU_il}ZaWu|Az#QO@};=|(L-RVf0AIW zq#pO+RfM7tdV`9lI6g;{qABNId`fG%U9Va^ravVT^)CklDcx)YJKeJdGpM{W1v8jg z@&N+mR?BPB=K1}kNwXk_pj44sd>&^;d!Z~P>O78emE@Qp@&8PyB^^4^2f7e)gekMv z2aZNvP@;%i{+_~>jK7*2wQc6nseT^n6St9KG#1~Y@$~zR_=AcO2hF5lCoH|M&c{vR zSp(GRVVl=T*m~dIA;HvYm8HOdCkW&&4M~UDd^H)`p__!4k+6b)yG0Zcek8OLw$C^K z3-BbLiG_%qX|ZYpXJ$(c@aa7b4-*IQkDF}=gZSV`*ljP|5mWuHSCcf$5qqhZTv&P?I$z^>}qP(q!Aku2yA5vu38d8x*q{6-1`%PrE_r0-9Qo?a#7Zbz#iGI7K<(@k^|i4QJ1H z4jx?{rZbgV!me2VT72@nBjucoT zUM9;Y%TCoDop?Q5fEQ35bCYk7!;gH*;t9t-QHLXGmUF;|vm365#X)6b2Njsyf1h9JW#x$;@x5Nx2$K$Z-O3txa%;OEbOn6xBzd4n4v)Va=sj5 z%rb#j7{_??Tjb8(Hac<^&s^V{yO-BL*uSUk2;X4xt%NC8SjO-3?;Lzld{gM5A=9AV z)DBu-Z8rRvXXwSVDH|dL-3FODWhfe1C_iF``F05e{dl(MmS|W%k-j)!7(ARkV?6r~ zF=o42y+VapxdZn;GnzZfGu<6oG-gQ7j7Zvgo7Am@jYxC2FpS@I;Jb%EyaJDBQC(q% zKlZ}TVu!>;i3t~OAgl@QYy1X|T~D{HOyaS*Bh}A}S#a9MYS{XV{R-|niEB*W%GPW! zP^NU(L<}>Uab<;)#H)rYbnqt|dOK(-DCnY==%d~y(1*{D{Eo1cqIV8*iMfx&J*%yh zx=+WHjt0q2m*pLx8=--UqfM6ZWjkev>W-*}_*$Y(bikH`#-Gn#!6_ zIA&kxn;XYI;eN9yvqztK-a113A%97in5CL5Z&#VsQ4=fyf&3MeKu70)(x^z_uw*RG zo2Pv&+81u*DjMO6>Mrr7vKE2CONqR6C0(*;@4FBM;jPIiuTuhQ-0&C)JIzo_k>TaS zN_hB;_G=JJJvGGpB?uGgSeKaix~AkNtYky4P7GDTW6{rW{}V9K)Cn^vBYKe*OmP!; zohJs=l-0sv5&phSCi&8JSrokrKP$LVa!LbtlN#T^cedgH@ijt5T-Acxd9{fQY z4qsg1O{|U5Rzh_j;9QD(g*j+*=xULyi-FY|-mUXl7-2O`TYQny<@jSQ%^ye*VW_N< z4mmvhrDYBJ;QSoPvwgi<`7g*Pwg5ANA8i%Kum;<=i|4lwEdN+`)U3f2%bcRZRK!P z70kd~`b0vX=j20UM5rBO#$V~+grM)WRhmzb15ya^Vba{SlSB4Kn}zf#EmEEhGruj| zBn0T2n9G2_GZXnyHcFkUlzdRZEZ0m&bP-MxNr zd;kl7=@l^9TVrg;Y6J(%!p#NV*Lo}xV^Nz0#B*~XRk0K2hgu5;7R9}O=t+R(r_U%j z$`CgPL|7CPH&1cK5vnBo<1$P{WFp8#YUP%W)rS*a_s8kKE@5zdiAh*cjmLiiKVoWD z!y$@Cc5=Wj^VDr$!04FI#%pu6(a9 zM_FAE+?2tp2<$Sqp5VtADB>yY*cRR+{OeZ5g2zW=`>(tA~*-T)X|ahF{xQmypWp%2X{385+=0S|Jyf`XA-c7wAx`#5n2b-s*R>m zP30qtS8aUXa1%8KT8p{=(yEvm2Gvux5z22;isLuY5kN{IIGwYE1Pj);?AS@ex~FEt zQ`Gc|)o-eOyCams!|F0_;YF$nxcMl^+z0sSs@ry01hpsy3p<|xOliR zr-dxK0`DlAydK!br?|Xi(>buASy4@C8)ccRCJ3w;v&tA1WOCaieifLl#(J% zODPi5fr~ASdz$Hln~PVE6xekE{Xb286t(UtYhDWo8JWN6sNyRVkIvC$unIl8QMe@^ z;1c<0RO5~Jv@@gtDGPDOdqnECOurq@l02NC#N98-suyq_)k(`G=O`dJU8I8LcP!4z z8fkgqViqFbR+3IkwLa)^>Z@O{qxTLU63~^lod{@${q;-l?S|4Tq0)As-Gz!D(*P)Vf6wm6B8GGWi7B)Q^~T?sseZeI+}LyBAG!LRZn_ktDlht1j2ok@ljteyuNUkG67 zipkCx-7k(FZQhYjZ%T9X7`tO99$Wj~K`9r0IkWhPul`Q_t1YnVK=YI1dMc_b!FEU4 zkv=PGf{5$P#w{|m92tfVnsnfd%%KW;1a*cLmga4bSYl^*49M4cs+Fe>P!n=$G6hL6 z>IM&0+c(Nvr0I!5CGx7WK*Z3V^w0+QcF=hU0B4=+;=tn*+XDxKa;NB-z4O~I zf}TSb^Z;L_Og>!D1`;w@zf@GCqCUNY%N?IPmEkTco^}bX~BWM_Hamu05>#B zBh%QfUeHPu`MsYVQQ3hOT;HmP_C|nOl zjluk7vaSICyQ01h`^c)DWp>cxPjGEc6D^~2L79hyK_J#<9H#8o`&XM4=aB`@< z<|1oR6Djf))P1l2C{qSwa4u-&LDG{FLz#ym_@I+vo}D}#%;vNN%& zW&9||THv_^B!1Fo+$3A6hEAed$I-{a^6FVvwMtT~e%*&RvY5mj<@(-{y^xn6ZCYqNK|#v^xbWpy15YL18z#Y&5YwOnd!A*@>k^7CaX0~4*6QB{Bgh$KJqesFc(lSQ{iQAKY%Ge}2CeuFJ{4YmgrP(gpcH zXJQjSH^cw`Z0tV^axT&RkOBP2A~#fvmMFrL&mwdDn<*l3;3A425_lzHL`+6sT9LeY zu@TH0u4tj199jQBzz*~Up5)7=4OP%Ok{rxQYNb!hphAoW-BFJn>O=%ov*$ir?dIx% z56Y`>?(1YQ8Fc(D7pq2`9swz@*RIoTAvMT%CPbt;$P%eG(P%*ZMjklLoXqTE*Jg^T zlEQbMi@_E|ll_>pTJ!(-x41R}4sY<5A2VVQ^#4eE{imHt#NEi+#p#EBC2C=9B4A|n zqe03T*czDqQ-VxZ+jPQG!}!M0SlFm^@wTW?otBZ+q~xkk29u1i7Q|kaJ(9{AiP1`p zbEe5&!>V;1wnQ1-Qpyn2B5!S(lh=38hl6IilCC6n4|yz~q94S9_5+Od*$c)%r|)f~ z;^-lf=6POs>Ur4i-F>-wm;3(v7Y_itzt)*M!b~&oK%;re(p^>zS#QZ+Rt$T#Y%q1{ zx+?@~+FjR1MkGr~N`OYBSsVr}lcBZ+ij!0SY{^w((2&U*M`AcfSV9apro+J{>F&tX zT~e zMvsv$Q)AQl_~);g8OOt4plYESr8}9?T!yO(Wb?b~1n0^xVG;gAP}d}#%^9wqN7~F5 z!jWIpqxZ28LyT|UFH!u?V>F6&Hd~H|<(3w*o{Ps>G|4=z`Ws9oX5~)V=uc?Wmg6y< zJKnB4Opz^9v>vAI)ZLf2$pJdm>ZwOzCX@Yw0;-fqB}Ow+u`wglzwznQAP(xbs`fA7 zylmol=ea)g}&;8;)q0h7>xCJA+01w+RY`x`RO% z9g1`ypy?w-lF8e5xJXS4(I^=k1zA46V)=lkCv?k-3hR9q?oZPzwJl$yOHWeMc9wFuE6;SObNsmC4L6;eWPuAcfHoxd59gD7^Xsb$lS_@xI|S-gb? z*;u@#_|4vo*IUEL2Fxci+@yQY6<&t=oNcWTVtfi1Ltveqijf``a!Do0s5e#BEhn5C zBXCHZJY-?lZAEx>nv3k1lE=AN10vz!hpeUY9gy4Xuy940j#Rq^yH`H0W2SgXtn=X1 zV6cY>fVbQhGwQIaEG!O#p)aE8&{gAS z^oVa-0M`bG`0DE;mV)ATVNrt;?j-o*?Tdl=M&+WrW12B{+5Um)qKHd_HIv@xPE+;& zPI|zXfrErYzDD2mOhtrZLAQ zP#f9e!vqBSyoKZ#{n6R1MAW$n8wH~)P3L~CSeBrk4T0dzIp&g9^(_5zY*7$@l%%nL zG$Z}u8pu^Mw}%{_KDBaDjp$NWes|DGAn~WKg{Msbp*uPiH9V|tJ_pLQROQY?T0Pmt zs4^NBZbn7B^L%o#q!-`*+cicZS9Ycu+m)rDb98CJ+m1u}e5ccKwbc0|q)ICBEnLN# zV)8P1s;r@hE3sG2wID0@`M9XIn~hm+W1(scCZr^Vs)w4PKIW_qasyjbOBC`ixG8K$ z9xu^v(xNy4HV{wu2z-B87XG#yWu~B6@|*X#BhR!_jeF*DG@n_RupAvc{DsC3VCHT# za6Z&9k#<*y?O0UoK3MLlSX6wRh`q&E>DOZTG=zRxj0pR0c3vskjPOqkh9;o>a1>!P zxD|LU0qw6S4~iN8EIM2^$k72(=a6-Tk?%1uSj@0;u$0f*LhC%|mC`m`w#%W)IK zN_UvJkmzdP84ZV7CP|@k>j^ zPa%;PDu1TLyNvLQdo!i1XA|49nN}DuTho6=z>Vfduv@}mpM({Jh289V%W@9opFELb z?R}D#CqVew1@W=XY-SoMNul(J)zX(BFP?#@9x<&R!D1X&d|-P;VS5Gmd?Nvu$eRNM zG;u~o*~9&A2k&w}IX}@x>LMHv`ith+t6`uQGZP8JyVimg>d}n$0dDw$Av{?qU=vRq zU@e2worL8vTFtK@%pdbaGdUK*BEe$XE=pYxE_q{(hUR_Gzkn=c#==}ZS^C6fKBIfG z@hc);p+atn`3yrTY^x+<y`F0>p02jUL8cgLa|&yknDj;g73m&Sm&@ju91?uG*w?^d%Yap&d2Bp3v7KlQmh z(N<38o-iRk9*UV?wFirV>|46JqxOZ_o8xv_eJ1dv} zw&zDHZOU%`U{9ckU8DS$lB6J!B`JuThCnwKphODv`3bd?_=~tjNHstM>xoA53-p#F zLCVB^E`@r_D>yHLr10Sm4NRX8FQ+&zw)wt)VsPmLK|vLwB-}}jwEIE!5fLE;(~|DA ztMr8D0w^FPKp{trPYHXI7-;UJf;2+DOpHt%*qRgdWawy1qdsj%#7|aRSfRmaT=a1> zJ8U>fcn-W$l-~R3oikH+W$kRR&a$L!*HdKD_g}2eu*3p)twz`D+NbtVCD|-IQdJlFnZ0%@=!g`nRA(f!)EnC0 zm+420FOSRm?OJ;~8D2w5HD2m8iH|diz%%gCWR|EjYI^n7vRN@vcBrsyQ;zha15{uh zJ^HJ`lo+k&C~bcjhccoiB77-5=SS%s7UC*H!clrU$4QY@aPf<9 z0JGDeI(6S%|K-f@U#%SP`{>6NKP~I#&rSHBTUUvHn#ul4*A@BcRR`#yL%yfZj*$_% zAa$P%`!8xJp+N-Zy|yRT$gj#4->h+eV)-R6l}+)9_3lq*A6)zZ)bnogF9`5o!)ub3 zxCx|7GPCqJlnRVPb&!227Ok@-5N2Y6^j#uF6ihXjTRfbf&ZOP zVc$!`$ns;pPW_=n|8Kw4*2&qx+WMb9!DQ7lC1f@DZyr|zeQcC|B6ma*0}X%BSmFJ6 zeDNWGf=Pmmw5b{1)OZ6^CMK$kw2z*fqN+oup2J8E^)mHj?>nWhBIN|hm#Km4eMyL= zXRqzro9k7(ulJi5J^<`KHJAh-(@W=5x>9+YMFcx$6A5dP-5i6u!k*o-zD z37IkyZqjlNh*%-)rAQrCjJo)u9Hf9Yb1f3-#a=nY&M%a{t0g7w6>{AybZ9IY46i4+%^u zwq}TCN@~S>i7_2T>GdvrCkf&=-OvQV9V3$RR_Gk7$t}63L}Y6d_4l{3b#f9vup-7s z3yKz5)54OVLzH~Ty=HwVC=c$Tl=cvi1L?R>*#ki4t6pgqdB$sx6O(IIvYO8Q>&kq;c3Y-T?b z*6XAc?orv>?V7#vxmD7geKjf%v~%yjbp%^`%e>dw96!JAm4ybAJLo0+4=TB% zShgMl)@@lgdotD?C1Ok^o&hFRYfMbmlbfk677k%%Qy-BG3V9txEjZmK+QY5nlL2D$Wq~04&rwN`-ujpp)wUm5YQc}&tK#zUR zW?HbbHFfSDsT{Xh&RoKiGp)7WPX4 zD^3(}^!TS|hm?YC16YV59v9ir>ypihBLmr?LAY87PIHgRv*SS>FqZwNJKgf6hy8?9 zaGTxa*_r`ZhE|U9S*pn5Mngb7&%!as3%^ifE@zDvX`GP+=oz@p)rAl2KL}ZO1!-us zY`+7ln`|c!2=?tVsO{C}=``aibcdc1N#;c^$BfJr84=5DCy+OT4AB1BUWkDw1R$=FneVh*ajD&(j2IcWH8stMShVcMe zAi6d7p)>hgPJbcb(=NMw$Bo;gQ}3=hCQsi{6{2s~=ZEOizY(j{zYY-W8RiNjycv00 z8(JpE{}=CHx0ib3(nZgo776X=wBUbfk$y2r*}aNG@A0_zOa4k3?1EeH7Z43{@IP>{^M+M`M)0w*@Go z>kg~UfgP1{vH+IU(0p(VRVlLNMHN1C&3cFnp*}4d1a*kwHJL)rjf`Fi5z)#RGTr7E zOhWfTtQyCo&8_N(zIYEugQI}_k|2X(=dMA43Nt*e93&otv`ha-i;ACB$tIK% zRDOtU^1CD5>7?&Vbh<+cz)(CBM}@a)qZ^ld?uYfp3OjiZOCP7u6~H# zMU;=U=1&DQ9Qp|7j4qpN5Dr7sH(p^&Sqy|{uH)lIv3wk?xoVuN`ILg}HUCLs1Bp2^ za8&M?ZQVWFX>Rg4_i$C$U`89i6O(RmWQ4&O=?B6@6`a8fI)Q6q0t{&o%)|n7jN)7V z{S;u+{UzXnUJN}bCE&4u5wBxaFv7De0huAjhy#o~6NH&1X{OA4Y>v0$F-G*gZqFym zhTZ7~nfaMdN8I&2ri;fk*`LhES$vkyq-dBuRF!BC)q%;lt0`Z(*=Sl>uvU`LAvbyt zL1|M@Jas<@1hK!prK}$@&fbf70o7>3&CovCKi815v$6T7R&1GOG~R4pEu2B z%bxG{n`u$7ps(}Tt(P608J@{+>X(?=-j8CkF!T79c`1@E%?vOL%TYrMe1ozi<##IsIC1YRojP!gD%|+7|z^-Vj$a85gbmtB#unyoy%gw9m1yB z|L^-wylT%}=pNpq!QYz9zoV7>zM2g2d9lm{Q zP|dx3=De3NSNGuMWRdO_ctQJUud?_96HbrHiSKmp;{MHZhX#*L+^I11#r;grJ8_21 zt6b*wmCaAw(>A`ftjlL@vi06Z7xF<&xNOrTHrDeMHk*$$+pGK0p+|}H=Kgl{=naBy zclyQsRTraO4!uo})OTSp_x`^0jj7>|H=FOGnAbKT_LuSUiSd3QuCMq>sEhB=V63Nm zZxrtB0)U@x2A#VHqo2ab=pn~tu>kJ;TVASb_&ePAgVcic@>^YM?^LYRLr^O12>~45 z-EE?-Z$xjxsN92EaBi)~D~1OzRVH`o!)kYv7IIx??(B)>R|xa&(wmlU2gdV0+N+3% z7r$w5(L<|?@46ITJZS5koAELgVV_&KHj(9KG??A);@gL`s1th*c#t5>U(*+nb0+H% zOhJG5tth59%*>S~JIi%<0VAi;k>}&(Ojg!fyH0(fza!1kA~a}Vt{|3z{`Pt@VuYyB zFUt(kR$<`X_J&UQ%;ui2zob1!H{PL8X>>wbpGn~@&h__AfBit)4`D^#->1+Qn^MH9 zYD?%)Pa)D-xQzVGm!g)N$^_z`9)(>)gyQ+(7N@k4GO?~43wcE-|77;CPwPXHQcfcJ^I&IOOah zzL|dhoR*#m5sw{b&L=@<-30s9F|{@V05;4Wf6Z_1gpZnJ*SVN}3O7)-=yYuj2)O0d zX=I9TzzTK%QG&ujvS!F*aJ8eqt4|#VE;``yKqCx7#8QC7AmVn+zW9km3L5TN=R>{5 zLcW`6NKkTz`c{`-w!X9zMG;JZP|skLGs7qBHaWj7Ew!VR=`>n30NX)7j~-RbDmQ6b zHr)zVcn^~e2xqFCBG4P$ZCcRDml-&1^5fqN=CHgBVu1yTg32_N>tZ;N%h*TwOf^1lE#w1$yF$kXaP|V$2XuZ+3wH4Ws6%U;^iP|c6`#etHogQ+E@+~PZ1zdGAty6qTmBM z>!)Wfgq~%lD)m>avXMm)ReN}s9!T_>ic6xA|m7$(&n(Z&j} zHC=}~I(^-*PS2pc7%>)6w}F1il&p*0jX1z)jSvG%S{I3d9w$A|5;TS)4w81yzq5f8 zZVfF~`74m1KXQg|`OS>;FCgZw!AL;2PV{&8%~rG!;`eD=g!luE0k40GjIgjD!JSDNf$eW zZtPMF)&EH_#?IwVLEx&Tosh9K8Ln4Pb$`j2=><6MAezsQvhP#YNnw&cL>12xf)dPz z1tk;{SH6HDcbV0x(+5=2n;A->&iYDa5Zr9$&j?2iAz-(l1;#Vc3-ULyqRV9d0*psG7QHE! z*J=*^sKK?iTO$g*+j~C?QzzIu`6Z{2N-ANrd5*?o%x& z&WMin)$Wq%G!?{EH(2}A?Wx@ zn8|q7xPad4Gu>l^&SBl|mhUxp;S+Cb125`h5aBz9pM34$7n-GHGx*=yqAphZKkds7 z$=5Jnt*6&8@y80jNXm|>2IR<$D5frk;c2f5zLS5xe*^W>kkZa5R1+Am34;mo{Gr=Z zD=z8fgTHwx%)7hzjOo9*Cogbru8GgDzrE;3y%TR+u`|zz%c0Tyd8;#EQXdr4Rgx(2LPRzVI2FwsbXwnF;DP^fg zdYOd|zU&AqgCJ;R+?oSgEgZM`ZX>7&$A-j2m|Tcz4ictXoQkz6Tr<2zhOudU16k<7 zLdk&FCL>=a^>0gV@m#9SnMd)R$5&1mh8p2McnUbk;1|C;`7pPkYjf|o>|a6`x`z1O zt>8~Q%zHX%C=D2!;_1eo3qfbB4QQK^{ON_f*7XhLk{6sr2(KIVmax}fUtF-zHZiUd zHPb9jidV`dE;lsw?1uQH!b%MvPE|lh9-8R_z4^PC8{XAf?S73(n*FvYPoMES+LfOx zcjm4ZZOmKY>M2e${QBVT+XnBQ(oC0fAYcXi7+=}_!hS9m>Y%G@zxn3z#Pb;bJ~-kI zAHNmWgQJp$e8L-uKQ|c4B;#0BTsfRB+}pl7xe=2_1U7pahx5S$TVbRnU0oi1?Wh|A zR7ebg9TK1GgKa4@ic#q_*<;c8?CkjX zMMyq`J()_&(j-FZY7q%z6CN^a0%V{UL)jmrvEg{doZd?qIjgJ^UPr(QUs`68;qkdI zzj_XBQ|#K2U!5?fmIEtXX6^rFY;h4=Vx<-C(d;W6Bi_Xsg{ZJPL*K;I?5U$=V-BNP zn9pKiMc=hZNe**GZBw1kVs#-8c2ZRjol}}^V@^}BqY7c0=!mA;v0`d|(d;R-iT|GK z>zt>Tt3oV09%Y;^RM6=p9C-ys_a``HB_D-pnyX(CeA(GiJqx7xxFE52Y`j~iMv;sP z%jPmx#8p%5`flAU(b!c9XBvV+fygn`BP-C#lyRa;9%>YyW6~A_g?@2J+oY0HAg{qO znT4%ViCgw&eE=W8yt-0{cw`tMieWOG3wyNX#3a^qPhE8TH1?QhwhR~}Ic zZ^q$TF8$p0b0=L8aw&qaTjuAYPmr-6x;U*k*vRnOaBwb_( z5+ls5b(E!(71*l)M&(7ZEgBCtB{6Kh#ArV4u0iNnK!ml!nK5=3;9e76yD9oU4xTAK zPGsGkjtFMMY3pRP5u07;#af?b0C7u) zD^=9X@DRasHaf#c>4rF5GAT!Ggj0!7!z?Q-1_X6ZP2g|+?nVutp|rp}eFlKc8}Q&_ z17$NpDQvQolMWZfj0W0|WKm`nd_KXYH_#wRRzs1aRBYqo#feM}a?joONn30Z4Z9PG zg1c!_<52-9D53Wq4z8pUzGkEFm1@Ws(kp4}CO7csZ-7+b)^)M)(xo}_IpTLl7}5BmbBCI{4>rw>4c_gBQHtRd5Z=SW&6Qp2qMOjr3W+ZRmP;S(U+h=^BHKohhRp6Zgf zwt&$zQXhMm@kh1@SB%dIE*kFDZym3Mky$NRljX?}&JGK`PIV1C;Pf!JV{hb4y;Ju- zlpfEPUd+mV5XQH<#BRFhZ}>b#IdF?a?x;rBg-v)@fZpA?+J{3WZjbl3E zv(a&1=pGYPxP@K!6Qg5Vx=-jwc=BA{xL3+QWb&9~DGS1EFkIC+>55{dvY4LV@s5$C zKJmCjigp7?m27*GN_GROz}y+y5%iIj=*JTYccaFjvD&VN%ewfSp=0P zspdFfDqj?gs!N64cEy5uR~wD>af!1PE*xo{^a^8BPIL2=U>B!m2AM0Jf<8qWLoHxi zxQfkbbwkRXgJgLW_j{ZkCxHLBU{@D6T5u90UNs5P769Zei|C$@nA5$L$4ZvxQl1i? z8vLHg17}e{zM$=&h%8Swbfz7yw~X^N|7Chp1bC(oV72l#R8&%Ne5>F=7wR(dB; zkDX!%&fxS19JBjP<6H7+!dO`nPLvB~xn{aDh#^iHKP|A5UQlCG%v%x9@q1w2fa#&% za^UwHu!~(qrv99G%9_e4OBbJ-CkB*1M_?t6UXZ#}4JFDzB|x(1Z}ckuiY}${zj`eVo})!rN8Je z%h2CVJG1$K$2deXx^h8trLs~Han^e>_-M6@0o4C7d548|#mKtm@DvdVAX5ZzA8=*! zKq5C+cM9u)qJ%YBJ1UAcG}6Ji4=$piaZ(K@>1BiD;$R9bR*QP`dH2T=)dgW#f7U)S zZ~i#VYLOnUZt^~Iu3x8QPJaHVUxtRyipQ+tbmWKl14iW1!f6JSDvT$xt8>~7-1ZlJ zU|)Ab*lhvz-JO!$a}RBH9u8$=R)*qeD@iS@(px~OVvML-qqO5&Ujnhw1>G~**Ld{W zE+7h|!{rDZ#;ipZx4^Tcr9vnO)0>WFPzpFu*MYST(`GFzCq*@Gqse6VwDH#x?-{rs z+=dqd$W0*AuAEhzM@GC&!oZa1*lRsx>>mP>DNYigdm^A~xzo}=uV$w#iadO+!&q_~ zT>AsHXOEGsNyfcJt2V$rhGxaIcTEvZr7CMVEu=>l30N~52^71U^<_uw6h@v@`BA2! z)ViU+wF#^$=5o44TpOj?#eyq*+A&c0ghrt8%}SiK)FgLk-;-^+ zXt|1}1vcKAAuR|?L*a8;04p%!M~U2~UC-OJK)DMtBQ#+ZttJgDFNA4zchA*T)cN(E zmpIMLU*c*NrCSV^qdLXD751DsO`#V#K1BVX4qI-B3Rg(zcvlg^mgY^V3Q*5RRQ4-8 z_kAlUisma2SNEx47euK5Y#eu_-gwRW0}M90hEI}eIJ9aU?t11^jSCn4>e~XLSF7Y3 z7JF)1ZbS_P<$<#y(*u@w!jF4FW_f~bxzi%cgP~B1K5N6GFYSAf=D_s5XomU0G9I%Y zPWc{&MItPR#^Le)?zsRkQMmHx^Cnn&;TrPzRVG`wyNH*U;|r3^2NY(z0lwikP}cWF z`p%R@?dy*7H~0&3ST>L9)b7#kwg+|n0#E&-FNf+Z_t7tpa711FogBPV`S3MW_FMGQ zJ@8Z}qXR4-l%p76mvcH`{Fu(^O;8H2@#LZUH#9p6!EX$AEYV$c`s zkPimL3kv>y=WQ+?KIAuim``%cAeBhA6g8}p_*FBH(#{vKi)CIz_D)DFXPql*ccC}O zRW;+Y6V@=&*d6QJUbRxPX+-_24tc-hYHEFaP-IAj*|-P5%xbWujQvu#TF>xigr_r! znuu7b(!PyYX=O#>;+0cGRx>Sy39(3y=TCf_BZ$<%m#inup$>o(3dA1Byfsip8S975-iVe7UklFm|$4&kaJ!n66_k-7-k}Z_?){LQe&wTeJ^CR{u6p+U#4_iSZZ1wjB-1gVGNQqnkk*-wFLj(eK8Ut{waU zb1jwb2I?Wg&98jSQWom8c?2>BWt*!3WQ?>fB$KguB9_sStno%x=JXPEFrT|hh~Po2 zSPzu3IL10O?9U(3{X8OLN-!l6DJVtgr$yYXeAPh~%(FECDe;$mIY7R4Miv1GEFk9x zpw`}E5M)qTr60D^;a#OCd0xP*w8y+my1^l8Qd*V`wLoj)GFFj;;esW2PMO=sbas{yX6asXIJ$|LW< zts$A+JaxoM({kv+2d@#bhl?#V#FZn_=8tTTvup?Vq!p!46W{be)EP=VlYE|UzAU}) zz})UzJVWi;9br0k&5>}sqwa_`TP*c}^$9+q)Dks#qEVg>p)71sqKF-YLP@UF{(>lp7;CHAWK;K0TZ_+?>EtZKprfU@;52a1IU8HNx-mnoZrb8| zP8FPb#T$0VE+G-l508;d{DSfC6#dbp(j|^i^I3z9?Qmkr+(dw^w??h}WTN{_ls-GuE~lF;1Urgbtq|Ud_r>wecb@?{{z? zX>X$&Ud+(I(5}5d^>&Z2m+qy=h#vR*lS084ATwUWZLg6PX1Ft+YI`0iI)ynij}{4X zrQE!Mr1m^-?kw<|VT0mG+5J{!;j;zJT`?_=P*09n+=e``CN|7rC$u~Ksg7LSMS(Q~ z51!n1htcK0q7*K-*u0?c8ZlvPXcNwXmFe0Or2}}R@?j@{ECCNZ6va1tZ>|ZOgGZ1j z9?mRkeSK%{X4O>J$@hyFsD)7s67Uldb>O93wQQiV%-FfbEY_@q>1VUstIJs|QgB`o1z**F#s z^joAYN~5{EQ_wZ~R6-nEV#HsQbNU59dT;G zovb$}pb=LdR^{W2Nh~8yWfq*vC_DvJxM=)2N`5x+N6Sl`3{Wl@$*BYol#0^idTuM` zJ=prt$REkxn6%dimg%99{(Dt6D67sTUR6l1F@9&Z9<)XgWK#x zVohUH6>_xRuw1^V**+BCZ@dZj97T*67OBO>6UUivH`<@ray~ym^E?bO=vKqFfK3Kv z`RKxs4raHacB<(XAeH`@0G*K2@ill_U@m=icT@F{k1PU3j4VBde`ThtW8%Z~A>)45ARjQCDXbH}_rS^IxHGp#utBEj3W3KSAU+$6I4s~9OWueETo!J-f~+DV8< z+VMtdcQ?M+?S}kl&uImYiIUJ-K0-te7W4sdWpS6Fqs-I!Tj{8Qp6lMn$Zm8uU)s{X z8|O}HN%8sEl4em&qv{VBq{}$@cCG{B z5~3DY$WRYSkO~z=sxRct5^G5bPZW;LF)(zY)HREgpRrkYV@H3^BTD6u+bJE~$cqr< zw@Gb3^|n*kHZ%Vnu6~B7pB4iM0C4kDuk8Q1R^<(x%>|sCOl%CTe^N)K?Tiepg?|#m z94!og0*38u|67h%*!)SJhUdvFimsktaqp#im9IpH-$fQc79gi259qPkEZ)XU?2uWW zRg?$8`vl;V%-Tk+rwpTGaxy)h%3AmF^78<#i+Q6~M4#>J4`NNEEzy~xZ&O*9q%}@7 zs9XBO#vSKSM<-OjPIDzO9JiAYFWrK14Am{uZT=S3zaCu~K%kZo&u*=k9L#xi6vyaG zQFD76MOE&=c1G;7Zivp<%%fRq+@3wgZg>k@AYQf|*Qyzy$tqc20m?F5nGbG@V#gW` z8RMb2oBxgiqa?)_G6&-;L#(HCoaJrs_ED{IUZ^$~)+e#0iZT!AJDb2V{Sen*70TO& zyI`*~#ZdLFhYP_#DTuoqQ0OS6j0o15r{}O&YoT5wCp|x_dD{#Y;Y}0P1ta?2VEh4* ztrRN5tL6UvoH@M9L z=%FKpf@iSp2P>C(*o<-Ng4qF#A?i!AxjXLG8%Gm`$rZxw;ZqSvv5@@sZ|N*~do5fb zKWR)T_>`kxaS|MHFh`-`fc`C%=i@EFk$O&)*_OVrgP4MWsZkE2RJB(WC>w}him zb3KV>1I&nHP9};o8Kw-K$wF8`(R?UMzNB22kSIn#dEe|V-CuMw8I7|#`qSB6dpYg$ zoaDHj%zV6*;`u`VVdsTBKv&g75Q`68rdQU6O>_wkMT9d!z@)q2E)R3(j$*C4jp$Fo z2pE>*ih{4Xzh}W+5!Qw)#M*^E(0X-6-!%wj@4*^)8F=N*0Y5Or+>d= zhMNs@R~>R9;KmyP@I@bpU3&w?)jj0rGrb@q)P>wLVbz1!TZY$#+H-mK6B^0{vdvt0 zaJ0~7p%I#1PpPm1DvBzh7*UsCl^I5^`@XzPzbg+v3T_WyKN?TJ9J=57v^IUO`aQN} z@>Y>WIj+gT@-sobU-tW%L5GP(qY?Eep&I;@osY}O*3i1Ar?Sv|EI6S-pK_!~*A$K| zs-hHESqd`vv;zIzgv2ho5-hsIL5Ke~siJ(v0`Qm7W_Rms2rB67=p&HGRhA-)$p-BS zvXSmgGIGgeJMBcsgp=L8U3Ep$VPBFhvJ!3M5{pocGBS~iZj0({9Jt9nbC{Z$LVb%= zGqzRBjlqkAU{#sOX56})^QjX;jQ26M`poAFIZ#H31td9sQlgBBrfIYgDC9+kO~}s{ zb1i*{#{5tPWhv4pecAZygXG>?5xKx7iPXd?nR;QaIfhlhqNBaLDy>9Yd1Sf3P!s4~ zhfHaFGsIFy&ZM=6^qc>>V>o!zk%5Lk5BtS7oU=YfjWUN;c zrh$6Cyr%KC@QNTzTZvb)QXQkV)01MEY+EzC%CJx)Q&6MM={paB}Dp=qCn^eJ}5LeXG9Gqynt0ir>DvSIZ=i?*_xR3=% zppf1w51ypF2KL6ug zCm}eCi>&>xT;Idzh^PmtDWrU(&eC2hAt(nmd#?;W)*&4lb2Z2Ykv*XLNDEm`_1n3C z`l!wZwiF9b?mN@z?s~>v%hT01C{E3md6M5_Xi3fKD6s26Tt~Z>8|~Ao9ds!cF_Y1| zRG>!=TD0k0`|T*)oX!SlSt8g4Uh@nc(QosCoen@i*ZCSyh|IliliuhEw$8?4ZL9N2 zMQ%%S=3Tj_QilhHW@cSr1UYTtDem{A-ZxyCa$K9A%(!`X_?ieJzXbfERST|JxqmbL zHe!hSqYk|!=!$8CJ5>q}Pj63@Q#PO{gpVb+0-qHFM`j5x_s#~dxvy5u62vywq8upP z_)N)3n9cn7YEf2D8L}x0#_B_~>HT8;;8JC5q+}1gEyd%XqYvY?deQzwD1Lx{ghI3; zv?f;&6CY$H&dDL$k#)hb)5lIqUZ~oU!z)hMI!B9THhw?9!}ykqpFJ|hB?JjV9uwqb z3_70pMV^C7I<3Cg&yMi8JJ3V2gYTOMV=IopfZ#1o>&+j-mB-V${Ok(f?I3{+vR~zE_RR$?9xI~^% z53~ z&bCl+6UeKkUWJ-%mnK{9K>?(3BM3C`@xi}v8)q#;YJhMr5dWvMtAL7X``!bHv~(%m zH8d#Q4N6G~lEW}aGn9ZZNT?v9bV$emf)dg#ASDV?(nu+wpu!_X;(vL<<1zBo-~X&N z>keyizVGaP&c65DbIyEwFn2%(L`P424ZI3nFBA%w{yJ?E} zlwSKF;jIhs(!TFOdMUW|(=qHjr#U-k>`>1u1_yL5Gyy;7@WTOt_)nfIp{D9kwR8f0 z;^Fq=iF(&yd|z30&+I`FBM-P6ouHQ@96TkIe@9=pDDL#_zgXos)-ri5lX-&2D~DsI z4R>xVM$c&aFLgFjwq{1I;jpODOx|n*#@e2+Wgdkm(E(Fad_)peD`1^CJ2TpglmgoC)F(Z)F7y2rzzDU^4wvO{bzw{mzSs4tF;*qabKkC?D!j!tbF z4D_6zbqFVI>n@2-Qmg1BiDdD}>E(72)aMv1Y9duOxwlG|E!L(QmQ#j5vmN@a7v{zIt3qQSP?96^$ITE=h~sLn|N|v8YqmA~-0HWgcPHZ@!3Dzm2X{Bozc{qm>J`Ehp}`FQ%Ecbw%+|H8f`pykvo-%&0a z?&ZtJF*{#AYs8Z|z(IFI8sBiZs)L!C9#1W@;hEInZZZdPz2ZnmhoSP9VHQt7mzZUZ zhM!!5IJbe4Z@zEoMjKaxH&Px8p}1<0YmtWwcG@ZPY@*oQSteU zRy+W=Rs>sJ##v^8EJJt0=5---o<@^?fOEp=N<~xXvcf?$gXD0zVHziRMMmC#Mp3o ze(eT!dvjmXp9_C%pV_>{H=nsqYO)n1J?Ihi zjy7f00`|S<;)I!ZyUO{~#+wXX)z(BWsN|$7n9s}H%ZzE8YQv#vRTHjq@D%tYyfe=3)|7jYxRT#E16nFk&1jFC6CH5d4kiJCVq+%r_$Rec7=G!GuZ-0*$5N2GqXB(dqWPS1Um4{xgi2k=;eO_LDy&GR=Q!)bjKY{f!0yoc0Rol&!E`2BkI$5y4U^*k0=GyL-m8XJL%8prM%;fwyX9M^ zs48n3Oh#a>FVWI7dsm~*l0$^J)lxnfTTw~1ceZ73yNvNurwd`;+^1XuucaFN85M8? z$fNl!D9g*O>6IE^POaoDq`86Sw0t4%jIi`&*EEZI?wwOiEvH8(qpfyDvAe`4pWf7k z3-pFgeT{qtj)B!1ZamZ5g3z6Nd40P(%^Kf@#!uzbIk~8w`9wbhWc~1E|sw6-FsOqrhb2DLDwlaq@)Y zAi$KoA=Vyn=Yxqxtf7wu*$47Ht>WZi{AdeN79#9ws~CtE;~gC$q7T>*5yKK3VT)Q=sllRR}lBIGd17+bOu| zeUeUrMgF=Gjk-{epAyUd_KNgwZK_Pz=H$+{4~E_ZRa3IJpU~IZ5U4Z3l%u3{Ls~`H z(iysmm+!HBJTC-$EpHM9yrXUM^_FZ(3sdmsyZ6=lU8bb3V(WK>P0$l~#QA&NMj@OA z*OQ>^-s_D-bda022~!G!bTh7@FR>t!1r`Js1;4$(^_*hH-_pUPf5C}K-v$%i#KBB! zU{~a7)R>ix z#LA|<6v#rwKkB1JBLWkWu#M0#8i1J0e4dFDP3jrlFfxhkDs%Q~)e6e7fR$U?e$<{x zfZb0?UMsB|E}Fk)@|^{)_^L7O%rp1GRNig@bUX(^6}6HoGi8IXoSKpI1A(GV)uA=7 zOXG&KjZYVjYn6}2YV0yfnKsnpDlF)h$Gv--|6$BsWFg|IWnp|#sk}zOAb6Bb?vb@t zs^7=4IdiKE_rUT@rG!D4Zy zcnas#XT77V&%igMXY(lQS|)lgO{pN9!P-94KeZH_+PK5jESYCSPMN)=D(JIAVeB%D zI_>_lvD;pylkZ#Ral0IzC6ei$J$4NnGw(pnVd`&aaNT5mfq-4)aPjj(v;`VvJ6Xxjm@3DX+Kju z@9-h++s7x>idTEL zd)ptYy?P2$S*_DI;eMR0ZdAuS)~fGEZEguO&+3AwW@Sw$&KvgJr6aGK*Ar;0wx`lr z7V&!+9C7`VcV^t+Wj~AweOGQL!)0)serr$8Fez7kC(VSVRdjqpQuq964RW^2euIre zh10&Tv)|dj*CoRozrW<4y_+5}3EGRok+G7ODl3-CF1r?JYDdw&NbcVT=7ljq_K+8bMeG3uRw@3=cof?j+v+WaKI`WqwByf#7aFK3 z0+R34xQ-6nxQ&9xJKl}`C9FlUe1-h^i?5fr5kjot#MA-$%k106t>*gM+yF3m2X#=1tt07`cK)37dA^A4d8%6R>@0U-UZ~wSvzMlK$tlm~aK`%e8|quXyH`aLM0#Dcu%sqEsKV%i zVn_*W-Qbnl)h?RP>)$rZ5JL!*H;Z{ zk7(FB`lo~h&zB|S6j-Na;y$QM*rn^tkO{>#DWZN@IwJps3*Nm&ox0{{;=J~hvPb-* zvAOEPImrdq()yl~`j`Q;R1Y%CdLKKw*;gtNaM~WDO95YXsTjKCOdRD2Is@aVRTYFD zpS=_EB!@Ub&c*JmNMF=F+)Bq)52|=83IEG;M5(Ol*97!W(S-5X-5w&7->`1Pw-0Ml zpA>jaofnyPQTCzoIG}OK9j^nn>F>jC#$iSnJY8y6ue4nxs@3HtfNx01XVK7NcX#Cu z34g-z=0!7ip&@wI>>6ynJYyFTEgH6DA?b>~V%2s_@NPDza5&6cno!S(|85*74}6_M z%s1c4`B{lqMu``(4~Jk#_`^=tu36TgXPv_}{lhhyi(rrSM_uoVVNuZOuxCXom9|wg zNf&BtzX=hVi*4dG&1J!^QW;O%fQ$jVH=W74B8WR)*tM1{(@cHRqiS_W6R^h8uxd@zV>KNI zR(-LNNkLqh>e=CmL|q9sRHm#15%q$o7_GQMp8FLX-HGnJ<+(;k{Q%+Sk+!^mM+2#1y9+gG2IDZGt%;Cfk{+ zT5}^x=!i2$tnH_se6eC zkn;kK>%ICpo=X&=cSsbxQ|AjJ;5Ff;AyIj>$YA8cw*?W^Nn}S|1jrbf@Bd zr82I8KlOh4#5C0sw3oVvuC0NFPKH4S0$~F$U4JM1Im$B%%oGm_5$Lnr{#Pv}eL1k& zMP(pG$MI^8&!nYffq#$zJ^3GF|cC%2d4V@qKV#fu6u2O

k)oKu82Fu=RODzQrHPEC+Mz{hW(G7VuCl8g1ou-Ot!41bp_>OC1&@A_6e*hc)1X zMuDvzEZyB*fW1^+7dL0%ofr;-xT6B@0~|VazatI{60!X=po^uOr6UB$1POKmuI_&b zOL&O+w*!>`k+y%?Z|wm4$@_1|WC|pKM(F{k8TR$-4hs?i|GBc9)qa{vYq)~5qa(2N zsR?s}0Pp^ufVGEB8oE9VCFa0K$x0HSpem!tIyR69y0rnjg8cqjmWyz7*Kx3~X> z|BZX}Y;oVB1HX@l9_-y7dI*WgruY@?rC&64`}3W`ECA>O@Y#Q@JS<4WBF(QbwJqHM zt)fE#6jTSyZ^E8y0INaIf!omWjvS=@15`O%V2CKg+}z=M9##kLKRN0uJuK250bXVU zwzT&n@30^dzKnlL^us;wClg?CKWEtiEb#zhPVx{PxFQiwEPp^C53zN21EdZAz?3D& zC6fK|_!S5Mq&0z;xWGLEv}!zjfpRg_orp7|fXMx=uP!@X`yT@5(N_Hza}p5fBk&|)J7fZ`NQ9Nz@5xT? zi?iV$q+bG!2LZUpF)>Yl!u;DEHV3!i{ipcJm_8Gj@Dac%N3|SQVGqRhrJ;WOR|CtrwzPTW^&$A6!A$E)h7xohm>hA8p{PUZ~ z_&zeg@OL3PxPtzkfsNZAqXCZ8Is7yQ+plm~8;}|~DEkv&f@?q5hB*OGQYXuwVQOp0 z?QQ`6qyp|-$47wjuV74IE_x2I17$+grwMBE^25d<5!lYhnszuh|5Yk;RB+Uk*hk=m zu73=E^7ul{40{A^?Rg^fq0ZfZO@C1HupR*_d;J>lkFv6&x&}4N;t}1T@2}~AC^<3b zA}RxFPPZe5R{_6dIN9N-GT29Oa}RzA2ekKuEVZbuMOB?Xf**`N5&m}?)TjigdY(rF z?~+a=`0);TlDa1j)1G`AfW? zRl883QPq=w zbB|bHEx%_u*$t@Yl#Vc;y*?2W^|^NJ)DmioQFr~1&>MSBL_b(YIpGWdDm3bT=Mgm1 e+h0K+-~H6qzyuy}`;+tYAZFmzUSVSYum1yJqxCBQ literal 0 HcmV?d00001 From f017c06b01936d8c46c7b6ff1ebf794610f4aa3f Mon Sep 17 00:00:00 2001 From: Kaballist Date: Fri, 28 Jul 2023 01:45:06 -0700 Subject: [PATCH 03/17] finish up with build scripts --- api-rs/build.gradle.kts | 8 +- api/build.gradle.kts | 29 +++++--- cache/build.gradle.kts | 28 +++---- client/build.gradle.kts | 134 +++++++++++++++++----------------- deobfuscator/build.gradle.kts | 33 +++++---- eventbus/build.gradle.kts | 14 ++-- http/build.gradle.kts | 24 +++--- injector/build.gradle.kts | 37 ++++++---- mixins/build.gradle.kts | 26 ++++--- osrs/build.gradle.kts | 28 ++++--- scripts/build.gradle.kts | 28 ++++--- 11 files changed, 223 insertions(+), 166 deletions(-) diff --git a/api-rs/build.gradle.kts b/api-rs/build.gradle.kts index a6ebae7fc..e3c0d3bfb 100644 --- a/api-rs/build.gradle.kts +++ b/api-rs/build.gradle.kts @@ -12,8 +12,12 @@ repositories { } dependencies { - implementation(projects.annotations) - implementation(projects.api) + + with(projects) { + implementation(api) + implementation(annotations) + } + } java { diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 110d80aaa..9c363403f 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -10,17 +10,23 @@ repositories { } dependencies { - implementation(projects.annotations) - implementation(projects.logger) - implementation(libs.jsr305) - implementation(libs.guava) - implementation(libs.commons.text) - implementation(libs.jsr305) - compileOnly(libs.lombok) - annotationProcessor(libs.lombok) - implementation(libs.annotations) -} + with(projects) { + implementation(annotations) + implementation(logger) + } + + with(libs) { + implementation(jsr305) + implementation(guava) + implementation(commons.text) + implementation(jsr305) + compileOnly(lombok) + annotationProcessor(lombok) + implementation(annotations) + } + +} tasks.withType().all { kotlinOptions { apiVersion = "1.7" @@ -29,7 +35,8 @@ tasks.withType().all { // We can't use K2 yet due to using some kotlin compiler plugins which aren't supported yet. freeCompilerArgs = listOf( //"-Xuse-k2", "-Xjvm-default=all", - "-Xbackend-threads=4") + "-Xbackend-threads=4" + ) } } diff --git a/cache/build.gradle.kts b/cache/build.gradle.kts index de9108af1..64530ffeb 100644 --- a/cache/build.gradle.kts +++ b/cache/build.gradle.kts @@ -23,8 +23,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.apache.tools.ant.filters.ReplaceTokens - description = "Cache" plugins { @@ -39,17 +37,21 @@ repositories { dependencies { compileOnly(projects.http) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) - implementation(libs.gson) - implementation(libs.guava) - implementation(libs.commons.cli) - implementation(libs.netty.buffer) - implementation(libs.okhttp) - implementation(libs.atlr4.runtime) - implementation(libs.commons.compress) - implementation(libs.slf4j.api) - testImplementation(libs.junit) + + with(libs) { + annotationProcessor(lombok) + compileOnly(lombok) + implementation(gson) + implementation(guava) + implementation(commons.cli) + implementation(netty.buffer) + implementation(okhttp) + implementation(atlr4.runtime) + implementation(commons.compress) + implementation(slf4j.api) + testImplementation(junit) + } + } tasks { diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 438382b5a..8574ab5a1 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -1,6 +1,4 @@ -import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Deb -import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Exe -import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Dmg +import org.jetbrains.compose.desktop.application.dsl.TargetFormat.* plugins { @@ -54,69 +52,74 @@ repositories { dependencies { // meteor-api - implementation(projects.apiRs) - implementation(projects.api) - implementation(projects.http) - implementation(projects.annotations) - implementation(projects.logger) - implementation(libs.guice) - implementation(libs.java.inject) - runtimeOnly(projects.scripts) - runtimeOnly(files("./src/main/resources/injected-client.jar")) - - //Deob - implementation(libs.bouncycastle) - implementation(libs.proguard) - //GPU - //implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") - implementation(libs.jocl) - implementation(libs.lwjgl) - implementation(libs.lwjgl.opengl) - implementation(libs.rlawt) - implementation(variantOf(libs.jocl){ classifier("macos-x64") } ) - implementation(variantOf(libs.jocl){ classifier("macos-arm64") } ) - runtimeOnly(variantOf(libs.lwjgl){ classifier("natives-windows") } ) - runtimeOnly(variantOf(libs.lwjgl){ classifier("natives-windows-x86") } ) - runtimeOnly(variantOf(libs.lwjgl){ classifier("natives-linux") } ) - runtimeOnly(variantOf(libs.lwjgl){ classifier("natives-macos") } ) - runtimeOnly(variantOf(libs.lwjgl){ classifier("natives-macos-arm64") } ) - runtimeOnly(variantOf(libs.lwjgl.opengl){ classifier("natives-windows") } ) - runtimeOnly(variantOf(libs.lwjgl.opengl){ classifier("natives-windows-x86") } ) - runtimeOnly(variantOf(libs.lwjgl.opengl){ classifier("natives-linux") } ) - runtimeOnly(variantOf(libs.lwjgl.opengl){ classifier("natives-macos") } ) - runtimeOnly(variantOf(libs.lwjgl.opengl){ classifier("natives-macos-arm64") } ) - - - //RuneLite Plugins - implementation(libs.slf4j.api) - implementation(libs.slf4j.simple) - compileOnly(libs.lombok) - annotationProcessor(libs.lombok) - - //Util - implementation(libs.json) - implementation(projects.eventbus) - implementation(libs.commons.lang3) - implementation(libs.okhttp) - implementation(libs.guava) - implementation(libs.commons.text) - implementation(libs.commons.io) - implementation(libs.jopt.simple) - implementation(libs.gson) - implementation(libs.discord) - implementation(libs.flatlaf) - implementation(libs.flatlaf.intellij.themes) - implementation(libs.miglayout) - implementation(libs.svg.salamander) - implementation(libs.flatlaf.extras) - implementation(libs.godaddy.colorpicker) - implementation(libs.octicions) - implementation(libs.tabler.icons) - implementation(libs.line.awesome) - implementation(libs.jna) + with(projects) { + implementation(apiRs) + implementation(api) + implementation(http) + implementation(annotations) + implementation(logger) + runtimeOnly(scripts) + } + + with(libs) { + implementation(guice) + implementation(java.inject) + runtimeOnly(files("./src/main/resources/injected-client.jar")) + + //Deob + implementation(bouncycastle) + implementation(proguard) + + //GPU + //implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") + implementation(jocl) + implementation(lwjgl) + implementation(lwjgl.opengl) + implementation(rlawt) + implementation(variantOf(jocl) { classifier("macos-x64") }) + implementation(variantOf(jocl) { classifier("macos-arm64") }) + runtimeOnly(variantOf(lwjgl) { classifier("natives-windows") }) + runtimeOnly(variantOf(lwjgl) { classifier("natives-windows-x86") }) + runtimeOnly(variantOf(lwjgl) { classifier("natives-linux") }) + runtimeOnly(variantOf(lwjgl) { classifier("natives-macos") }) + runtimeOnly(variantOf(lwjgl) { classifier("natives-macos-arm64") }) + runtimeOnly(variantOf(lwjgl.opengl) { classifier("natives-windows") }) + runtimeOnly(variantOf(lwjgl.opengl) { classifier("natives-windows-x86") }) + runtimeOnly(variantOf(lwjgl.opengl) { classifier("natives-linux") }) + runtimeOnly(variantOf(lwjgl.opengl) { classifier("natives-macos") }) + runtimeOnly(variantOf(lwjgl.opengl) { classifier("natives-macos-arm64") }) + + //RuneLite Plugins + implementation(slf4j.api) + implementation(slf4j.simple) + compileOnly(lombok) + annotationProcessor(lombok) + + //Util + implementation(json) + implementation(projects.eventbus) + implementation(commons.lang3) + implementation(okhttp) + implementation(guava) + implementation(commons.text) + implementation(commons.io) + implementation(jopt.simple) + implementation(gson) + implementation(discord) + implementation(flatlaf) + implementation(flatlaf.intellij.themes) + implementation(miglayout) + implementation(svg.salamander) + implementation(flatlaf.extras) + implementation(godaddy.colorpicker) + implementation(octicions) + implementation(tabler.icons) + implementation(line.awesome) + implementation(jna) + } + implementation(kotlin("stdlib-jdk8")) implementation(kotlin("reflect")) - implementation(compose.desktop.currentOs) } @@ -230,7 +233,8 @@ tasks.withType().all { // We can't use K2 yet due to using some kotlin compiler plugins which aren't supported yet. freeCompilerArgs = listOf( //"-Xuse-k2", "-Xjvm-default=all", - "-Xbackend-threads=4") + "-Xbackend-threads=4" + ) } } diff --git a/deobfuscator/build.gradle.kts b/deobfuscator/build.gradle.kts index d470c6c06..1cad79c9e 100644 --- a/deobfuscator/build.gradle.kts +++ b/deobfuscator/build.gradle.kts @@ -12,21 +12,28 @@ repositories { dependencies { - implementation(projects.annotations) - implementation(projects.api) - implementation(projects.apiRs) - implementation(projects.logger) - implementation(projects.cache) - annotationProcessor(libs.lombok) - implementation(libs.annotations) - implementation(libs.asm) - implementation(libs.asm.util) - implementation(libs.fernflower) - implementation(libs.gson) - implementation(libs.guava) - compileOnly(libs.lombok) + with(projects) { + implementation(annotations) + implementation(api) + implementation(apiRs) + implementation(logger) + implementation(cache) + } + + with(libs) { + annotationProcessor(lombok) + implementation(annotations) + implementation(asm) + implementation(asm.util) + implementation(fernflower) + implementation(gson) + implementation(guava) + compileOnly(lombok) + } + } + tasks.test { useJUnitPlatform() } \ No newline at end of file diff --git a/eventbus/build.gradle.kts b/eventbus/build.gradle.kts index bd486367b..adedf31cf 100644 --- a/eventbus/build.gradle.kts +++ b/eventbus/build.gradle.kts @@ -11,12 +11,14 @@ repositories { } dependencies { - val coroutinesVersion = "1.6.4" - /** Kotlin --------------------------------------------------------- */ - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$coroutinesVersion") - /** Logging -------------------------------------------------------- */ - implementation("io.github.microutils:kotlin-logging:3.0.4") - implementation(project(":logger")) + + with(libs) { + implementation(kotlin.coroutines) + implementation(kotlin.logging) + } + + implementation(projects.logger) + } tasks.withType().all { diff --git a/http/build.gradle.kts b/http/build.gradle.kts index 4b80235ac..3ab513af0 100644 --- a/http/build.gradle.kts +++ b/http/build.gradle.kts @@ -11,16 +11,22 @@ repositories { } dependencies { - implementation(projects.api) - implementation(projects.logger) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) - implementation(libs.gson) - implementation(libs.guava) - implementation(libs.okhttp) - implementation(libs.commons.csv) -} + with(projects) { + implementation(api) + implementation(logger) + } + + with(libs) { + annotationProcessor(lombok) + compileOnly(lombok) + implementation(gson) + implementation(guava) + implementation(okhttp) + implementation(commons.csv) + } + +} tasks.test { useJUnitPlatform() } diff --git a/injector/build.gradle.kts b/injector/build.gradle.kts index 49cf721ed..4230810ad 100644 --- a/injector/build.gradle.kts +++ b/injector/build.gradle.kts @@ -12,22 +12,27 @@ repositories{ } dependencies{ - compileOnly(libs.lombok) - annotationProcessor(libs.lombok) - - implementation(projects.annotations) - implementation(projects.deobfuscator) - implementation(projects.apiRs) - implementation(projects.logger) - implementation(projects.cache) - implementation(libs.java.inject) - implementation(libs.gson) - - implementation(libs.asm) - implementation(libs.asm.util) - implementation(libs.annotations) - implementation(libs.guava) - implementation(libs.jopt.simple) + + with(projects){ + implementation(annotations) + implementation(deobfuscator) + implementation(apiRs) + implementation(logger) + implementation(cache) + + } + + with(libs){ + compileOnly(lombok) + annotationProcessor(lombok) + implementation(gson) + implementation(java.inject) + implementation(asm) + implementation(asm.util) + implementation(guava) + implementation(jopt.simple) + implementation(annotations) + } } diff --git a/mixins/build.gradle.kts b/mixins/build.gradle.kts index e6ca71890..20487a00e 100644 --- a/mixins/build.gradle.kts +++ b/mixins/build.gradle.kts @@ -16,16 +16,24 @@ repositories { } dependencies { + compileOnly(gradleApi()) - compileOnly(libs.guava) - compileOnly(libs.java.inject) - compileOnly(libs.commons.io) - compileOnly(projects.annotations) - compileOnly(projects.apiRs) - compileOnly(projects.osrs) - compileOnly(projects.api) - compileOnly(projects.logger) - compileOnly(projects.cache) + + with(libs){ + compileOnly(guava) + compileOnly(java.inject) + compileOnly(commons.io) + } + + with(projects){ + compileOnly(api) + compileOnly(apiRs) + compileOnly(annotations) + compileOnly(logger) + compileOnly(osrs) + compileOnly(cache) + } + } tasks{ test { diff --git a/osrs/build.gradle.kts b/osrs/build.gradle.kts index 72cf8f0fc..b9e0112fe 100644 --- a/osrs/build.gradle.kts +++ b/osrs/build.gradle.kts @@ -7,18 +7,24 @@ version = "1.0-SNAPSHOT" repositories{ mavenCentral() } -dependencies{ - implementation(projects.api) - implementation(projects.apiRs) - implementation(projects.annotations) - implementation(projects.logger) - implementation(libs.bouncycastle) - implementation(libs.json) - testImplementation(libs.junit.jupiter.api) - testRuntimeOnly(libs.junit.jupiter.api) - implementation(libs.gson) -} +dependencies { + + with(projects) { + implementation(api) + implementation(apiRs) + implementation(annotations) + implementation(logger) + } + with(libs) { + implementation(bouncycastle) + implementation(json) + testImplementation(junit.jupiter.api) + testRuntimeOnly(junit.jupiter.api) + implementation(gson) + } + +} tasks{ jar { outputs.upToDateWhen { diff --git a/scripts/build.gradle.kts b/scripts/build.gradle.kts index a1fb8bf0a..76d06b68b 100644 --- a/scripts/build.gradle.kts +++ b/scripts/build.gradle.kts @@ -10,18 +10,24 @@ repositories{ mavenCentral() } dependencies { - annotationProcessor(libs.sisu.inject) - compileOnly(libs.maven.plugin.annotations) - implementation(projects.cache) - implementation(projects.api) - implementation(projects.logger) - implementation(libs.guava) - runtimeOnly(libs.maven.plugin.api) - implementation(libs.slf4j.simple) - testImplementation(libs.junit.jupiter.api) - testRuntimeOnly(libs.junit.jupiter.engine) -} + with(projects) { + implementation(cache) + implementation(api) + implementation(logger) + } + + with(libs) { + annotationProcessor(sisu.inject) + compileOnly(maven.plugin.annotations) + implementation(guava) + runtimeOnly(maven.plugin.api) + implementation(slf4j.simple) + testImplementation(junit.jupiter.api) + testRuntimeOnly(junit.jupiter.engine) + } + +} tasks{ jar { from("build") { From a98fd01474e05cf35339c403c6a9cebfe5c6692f Mon Sep 17 00:00:00 2001 From: Kaballist Date: Thu, 24 Aug 2023 01:01:37 -0700 Subject: [PATCH 04/17] Project: rev 216 Note- almost finished still some buffer methods out of wack and I think some got named wrong --- .../java/net/runelite/rs/api/RSBuffer.java | 2 +- .../java/net/runelite/rs/api/RSClient.java | 1 + .../net/runelite/rs/api/RSClientPacket.java | 228 +- .../main/java/net/runelite/api/Buffer.java | 2 +- .../main/java/net/runelite/api/Client.java | 2 + .../runelite/api/packets/ClientPacket.java | 230 +- client/src/main/java/meteor/Main.kt | 2 + .../src/main/java/meteor/api/ClientPackets.kt | 193 +- .../src/main/java/mixins/ReflectionMixin.java | 16 +- osrs/build.gradle.kts | 1 - osrs/src/main/java/AABB.java | 169 +- osrs/src/main/java/AbstractArchive.java | 648 +- .../main/java/AbstractByteArrayCopier.java | 23 +- osrs/src/main/java/AbstractFont.java | 217 +- .../src/main/java/AbstractRasterProvider.java | 44 +- osrs/src/main/java/AbstractSocket.java | 90 +- osrs/src/main/java/AbstractSound.java | 6 +- .../src/main/java/AbstractUserComparator.java | 533 +- osrs/src/main/java/AbstractWorldMapData.java | 151 +- osrs/src/main/java/AbstractWorldMapIcon.java | 112 +- osrs/src/main/java/AccessFile.java | 45 +- osrs/src/main/java/Actor.java | 588 +- osrs/src/main/java/AddRequestTask.java | 96 +- osrs/src/main/java/Animation.java | 76 +- .../main/java/ApproximateRouteStrategy.java | 442 +- osrs/src/main/java/Archive.java | 261 +- osrs/src/main/java/ArchiveDisk.java | 75 +- osrs/src/main/java/ArchiveDiskAction.java | 177 +- .../main/java/ArchiveDiskActionHandler.java | 321 +- osrs/src/main/java/ArchiveLoader.java | 176 +- osrs/src/main/java/AttackOption.java | 212 +- osrs/src/main/java/AudioFilter.java | 106 +- osrs/src/main/java/BZip2Decompressor.java | 84 +- osrs/src/main/java/BZip2State.java | 110 +- osrs/src/main/java/BoundaryObject.java | 40 +- osrs/src/main/java/Bounds.java | 148 +- osrs/src/main/java/Buddy.java | 26 +- osrs/src/main/java/BuddyRankComparator.java | 36 +- osrs/src/main/java/Buffer.java | 738 +- osrs/src/main/java/BufferedFile.java | 109 +- osrs/src/main/java/BufferedNetSocket.java | 71 +- osrs/src/main/java/BufferedSink.java | 61 +- osrs/src/main/java/BufferedSource.java | 166 +- osrs/src/main/java/ByteArrayPool.java | 275 +- osrs/src/main/java/Calendar.java | 58 +- osrs/src/main/java/Canvas.java | 190 +- osrs/src/main/java/ChatChannel.java | 70 +- osrs/src/main/java/ClanChannel.java | 283 +- osrs/src/main/java/ClanChannelMember.java | 857 +- osrs/src/main/java/ClanMate.java | 88 +- osrs/src/main/java/ClanSettings.java | 450 +- osrs/src/main/java/Client.java | 7109 ++++++++--------- osrs/src/main/java/ClientPacket.java | 968 ++- osrs/src/main/java/ClientPreferences.java | 406 +- osrs/src/main/java/Clips.java | 104 +- osrs/src/main/java/Clock.java | 202 +- osrs/src/main/java/CollisionMap.java | 131 +- osrs/src/main/java/ConcurrentMidiTask.java | 89 +- osrs/src/main/java/Coord.java | 37 +- osrs/src/main/java/DbRowType.java | 301 +- osrs/src/main/java/DbTableType.java | 65 +- osrs/src/main/java/Decimator.java | 328 +- osrs/src/main/java/DefaultsGroup.java | 14 +- osrs/src/main/java/DelayFadeTask.java | 130 +- osrs/src/main/java/DemotingHashTable.java | 42 +- .../java/DesktopPlatformInfoProvider.java | 120 +- osrs/src/main/java/DevicePcmPlayer.java | 71 +- .../main/java/DevicePcmPlayerProvider.java | 113 +- osrs/src/main/java/DirectByteArrayCopier.java | 57 +- osrs/src/main/java/DirectWrapper.java | 10 +- osrs/src/main/java/DualNode.java | 16 +- osrs/src/main/java/DualNodeDeque.java | 24 +- osrs/src/main/java/DynamicObject.java | 123 +- osrs/src/main/java/EnumComposition.java | 69 +- .../main/java/EvictingDualNodeHashTable.java | 32 +- osrs/src/main/java/FaceNormal.java | 134 +- osrs/src/main/java/FadeInTask.java | 105 +- osrs/src/main/java/FadeOutTask.java | 86 +- osrs/src/main/java/FileSystem.java | 935 +-- osrs/src/main/java/FillMode.java | 42 +- osrs/src/main/java/FloorDecoration.java | 117 +- .../src/main/java/FloorOverlayDefinition.java | 186 +- .../main/java/FloorUnderlayDefinition.java | 62 +- osrs/src/main/java/Font.java | 8 +- osrs/src/main/java/FontName.java | 346 +- osrs/src/main/java/Fonts.java | 30 +- osrs/src/main/java/Frames.java | 269 +- osrs/src/main/java/Friend.java | 32 +- osrs/src/main/java/FriendLoginUpdate.java | 44 +- osrs/src/main/java/FriendSystem.java | 460 +- osrs/src/main/java/FriendsChat.java | 246 +- osrs/src/main/java/FriendsList.java | 54 +- osrs/src/main/java/GZipDecompressor.java | 24 +- osrs/src/main/java/GameBuild.java | 205 +- osrs/src/main/java/GameEngine.java | 710 +- osrs/src/main/java/GameObject.java | 71 +- osrs/src/main/java/GrandExchangeEvent.java | 47 +- osrs/src/main/java/GrandExchangeEvents.java | 74 +- osrs/src/main/java/GrandExchangeOffer.java | 65 +- .../java/GrandExchangeOfferAgeComparator.java | 15 +- .../GrandExchangeOfferNameComparator.java | 279 +- .../GrandExchangeOfferOwnWorldComparator.java | 211 +- ...dExchangeOfferTotalQuantityComparator.java | 192 +- ...GrandExchangeOfferUnitPriceComparator.java | 50 +- .../GrandExchangeOfferWorldComparator.java | 914 ++- osrs/src/main/java/GraphicsDefaults.java | 89 +- osrs/src/main/java/GraphicsObject.java | 77 +- osrs/src/main/java/HealthBar.java | 79 +- osrs/src/main/java/HealthBarDefinition.java | 117 +- osrs/src/main/java/HealthBarUpdate.java | 134 +- osrs/src/main/java/HitSplatDefinition.java | 322 +- osrs/src/main/java/HorizontalAlignment.java | 93 +- osrs/src/main/java/Huffman.java | 37 +- osrs/src/main/java/IgnoreList.java | 754 +- osrs/src/main/java/Ignored.java | 96 +- osrs/src/main/java/IndexedSprite.java | 37 +- osrs/src/main/java/Instrument.java | 87 +- osrs/src/main/java/IntHashTable.java | 16 +- osrs/src/main/java/IntegerNode.java | 6 +- osrs/src/main/java/InterfaceParent.java | 250 +- osrs/src/main/java/Interpreter.java | 580 +- osrs/src/main/java/InvDefinition.java | 164 +- osrs/src/main/java/IsaacCipher.java | 44 +- osrs/src/main/java/ItemComposition.java | 350 +- osrs/src/main/java/ItemContainer.java | 50 +- osrs/src/main/java/ItemLayer.java | 154 +- osrs/src/main/java/IterableDualNodeQueue.java | 41 +- .../java/IterableDualNodeQueueIterator.java | 21 +- osrs/src/main/java/IterableNodeDeque.java | 89 +- .../IterableNodeDequeDescendingIterator.java | 41 +- osrs/src/main/java/IterableNodeHashTable.java | 41 +- .../java/IterableNodeHashTableIterator.java | 31 +- osrs/src/main/java/JagNetThread.java | 597 +- osrs/src/main/java/JagexCache.java | 70 +- osrs/src/main/java/KeyHandler.java | 607 +- osrs/src/main/java/KitDefinition.java | 190 +- osrs/src/main/java/Language.java | 301 +- osrs/src/main/java/Link.java | 14 +- osrs/src/main/java/LinkDeque.java | 24 +- osrs/src/main/java/LoadSongTask.java | 103 - osrs/src/main/java/Login.java | 222 +- osrs/src/main/java/LoginPacket.java | 270 +- osrs/src/main/java/LoginScreenAnimation.java | 334 +- osrs/src/main/java/LoginType.java | 137 +- osrs/src/main/java/LongNode.java | 6 +- osrs/src/main/java/MenuAction.java | 209 +- osrs/src/main/java/Message.java | 152 +- osrs/src/main/java/Messages.java | 83 +- osrs/src/main/java/MidiFileReader.java | 98 +- osrs/src/main/java/MidiPcmStream.java | 953 +-- osrs/src/main/java/MilliClock.java | 104 +- osrs/src/main/java/ModeWhere.java | 267 +- osrs/src/main/java/Model.java | 1146 +-- osrs/src/main/java/ModelData.java | 372 +- osrs/src/main/java/ModelData0.java | 245 +- osrs/src/main/java/MouseHandler.java | 107 +- osrs/src/main/java/MouseRecorder.java | 312 +- osrs/src/main/java/MouseWheelHandler.java | 31 +- osrs/src/main/java/MoveSpeed.java | 91 +- osrs/src/main/java/MusicPatch.java | 194 +- osrs/src/main/java/MusicPatchNode.java | 139 +- osrs/src/main/java/MusicPatchNode2.java | 208 +- osrs/src/main/java/MusicPatchPcmStream.java | 181 +- osrs/src/main/java/MusicSong.java | 165 +- osrs/src/main/java/MusicTrack.java | 28 +- osrs/src/main/java/NPC.java | 296 +- osrs/src/main/java/NPCComposition.java | 401 +- osrs/src/main/java/NanoClock.java | 16 +- osrs/src/main/java/NewShit.java | 92 +- osrs/src/main/java/Node.java | 18 +- osrs/src/main/java/NodeDeque.java | 54 +- osrs/src/main/java/NodeHashTable.java | 40 +- .../java/{JSONObject$Null.java => Null.java} | 11 +- osrs/src/main/java/OAuthApi.java | 5 + osrs/src/main/java/ObfuscatedClassMap.java | 8 + osrs/src/main/java/ObjTypeCustomisation.java | 730 +- osrs/src/main/java/ObjectComposition.java | 322 +- osrs/src/main/java/ObjectNode.java | 6 +- osrs/src/main/java/ObjectSound.java | 284 +- osrs/src/main/java/Occluder.java | 238 +- osrs/src/main/java/OtlTokenRequester.java | 15 + osrs/src/main/java/OtlTokenResponse.java | 7 +- osrs/src/main/java/PacketBuffer.java | 82 +- osrs/src/main/java/PacketBufferNode.java | 95 +- osrs/src/main/java/PacketWriter.java | 334 +- osrs/src/main/java/ParamComposition.java | 527 +- osrs/src/main/java/PcmPlayer.java | 967 ++- osrs/src/main/java/PcmStream.java | 36 +- osrs/src/main/java/PcmStreamMixer.java | 114 +- .../src/main/java/PcmStreamMixerListener.java | 10 +- osrs/src/main/java/PendingSpawn.java | 491 +- osrs/src/main/java/PlatformInfo.java | 240 +- osrs/src/main/java/Player.java | 289 +- osrs/src/main/java/PlayerComposition.java | 336 +- osrs/src/main/java/PlayerType.java | 146 +- osrs/src/main/java/Players.java | 83 +- osrs/src/main/java/PrivateChatMode.java | 30 +- osrs/src/main/java/Projectile.java | 141 +- osrs/src/main/java/RasterProvider.java | 54 +- osrs/src/main/java/Rasterizer2D.java | 137 +- osrs/src/main/java/Rasterizer3D.java | 204 +- osrs/src/main/java/RawPcmStream.java | 930 +-- osrs/src/main/java/RawSound.java | 22 +- osrs/src/main/java/ReflectionCheck.java | 83 +- .../java/RefreshAccessTokenRequester.java | 12 + .../main/java/RefreshAccessTokenResponse.java | 19 + osrs/src/main/java/Renderable.java | 39 +- osrs/src/main/java/RouteStrategy.java | 76 +- osrs/src/main/java/RunException.java | 37 +- osrs/src/main/java/Scene.java | 690 +- osrs/src/main/java/SceneTileModel.java | 85 +- osrs/src/main/java/SceneTilePaint.java | 158 +- osrs/src/main/java/Script.java | 107 +- osrs/src/main/java/ScriptEvent.java | 117 +- osrs/src/main/java/ScriptFrame.java | 70 +- osrs/src/main/java/ScriptOpcodes.java | 3 + osrs/src/main/java/SecureRandomCallable.java | 275 +- osrs/src/main/java/SecureRandomFuture.java | 584 +- osrs/src/main/java/SequenceDefinition.java | 240 +- osrs/src/main/java/ServerPacket.java | 860 +- osrs/src/main/java/Skeleton.java | 778 +- osrs/src/main/java/Skills.java | 14 +- osrs/src/main/java/SoftWrapper.java | 13 +- osrs/src/main/java/SongTask.java | 159 +- osrs/src/main/java/SoundCache.java | 438 +- osrs/src/main/java/SoundEffect.java | 24 +- osrs/src/main/java/SoundEnvelope.java | 38 +- osrs/src/main/java/SoundSystem.java | 57 +- osrs/src/main/java/SpotAnimation.java | 44 +- .../main/java/SpotAnimationDefinition.java | 116 +- osrs/src/main/java/SpriteMask.java | 30 +- osrs/src/main/java/SpritePixels.java | 126 +- osrs/src/main/java/Strings.java | 55 +- osrs/src/main/java/StructComposition.java | 134 +- osrs/src/main/java/StudioGame.java | 157 +- osrs/src/main/java/SwapSongTask.java | 34 +- osrs/src/main/java/Task.java | 18 +- osrs/src/main/java/TaskHandler.java | 114 +- osrs/src/main/java/Texture.java | 133 +- osrs/src/main/java/TextureLoader.java | 22 +- osrs/src/main/java/TextureProvider.java | 141 +- osrs/src/main/java/Tile.java | 123 +- osrs/src/main/java/TileItem.java | 102 +- osrs/src/main/java/Tiles.java | 205 +- osrs/src/main/java/Timer.java | 225 +- osrs/src/main/java/TriBool.java | 25 +- osrs/src/main/java/UrlRequest.java | 97 +- osrs/src/main/java/UrlRequester.java | 151 +- osrs/src/main/java/User.java | 85 +- osrs/src/main/java/UserComparator1.java | 15 +- osrs/src/main/java/UserComparator10.java | 260 +- osrs/src/main/java/UserComparator2.java | 21 +- osrs/src/main/java/UserComparator3.java | 57 +- osrs/src/main/java/UserComparator4.java | 129 +- osrs/src/main/java/UserComparator5.java | 230 +- osrs/src/main/java/UserComparator6.java | 99 +- osrs/src/main/java/UserComparator7.java | 217 +- osrs/src/main/java/UserComparator8.java | 227 +- osrs/src/main/java/UserComparator9.java | 204 +- osrs/src/main/java/UserList.java | 283 +- osrs/src/main/java/Username.java | 151 +- osrs/src/main/java/Usernamed.java | 10 +- osrs/src/main/java/VarbitComposition.java | 306 +- osrs/src/main/java/VarcInt.java | 79 +- osrs/src/main/java/Varcs.java | 173 +- osrs/src/main/java/VarpDefinition.java | 180 +- osrs/src/main/java/Varps.java | 26 +- osrs/src/main/java/VertexNormal.java | 30 +- osrs/src/main/java/VerticalAlignment.java | 86 +- osrs/src/main/java/ViewportMouse.java | 435 +- osrs/src/main/java/VorbisCodebook.java | 70 +- osrs/src/main/java/VorbisFloor.java | 122 +- osrs/src/main/java/VorbisMapping.java | 28 +- osrs/src/main/java/VorbisSample.java | 259 +- osrs/src/main/java/WallDecoration.java | 67 +- osrs/src/main/java/Widget.java | 952 +-- osrs/src/main/java/World.java | 747 +- osrs/src/main/java/WorldMap.java | 1008 ++- osrs/src/main/java/WorldMapArchiveLoader.java | 54 +- osrs/src/main/java/WorldMapArea.java | 248 +- osrs/src/main/java/WorldMapAreaData.java | 174 +- osrs/src/main/java/WorldMapCacheName.java | 73 +- osrs/src/main/java/WorldMapData_0.java | 379 +- osrs/src/main/java/WorldMapData_1.java | 184 +- osrs/src/main/java/WorldMapDecoration.java | 180 +- .../src/main/java/WorldMapDecorationType.java | 174 +- osrs/src/main/java/WorldMapElement.java | 248 +- osrs/src/main/java/WorldMapEvent.java | 83 +- osrs/src/main/java/WorldMapIcon_0.java | 42 +- osrs/src/main/java/WorldMapIcon_1.java | 121 +- osrs/src/main/java/WorldMapLabel.java | 41 +- osrs/src/main/java/WorldMapLabelSize.java | 93 +- osrs/src/main/java/WorldMapManager.java | 357 +- osrs/src/main/java/WorldMapRectangle.java | 537 +- osrs/src/main/java/WorldMapRegion.java | 582 +- osrs/src/main/java/WorldMapScaleHandler.java | 330 +- osrs/src/main/java/WorldMapSection.java | 38 +- osrs/src/main/java/WorldMapSection0.java | 83 +- osrs/src/main/java/WorldMapSection1.java | 427 +- osrs/src/main/java/WorldMapSection2.java | 126 +- osrs/src/main/java/WorldMapSectionType.java | 184 +- osrs/src/main/java/WorldMapSprite.java | 485 +- osrs/src/main/java/Wrapper.java | 10 +- osrs/src/main/java/ZoneOperation.java | 106 +- osrs/src/main/java/_VanillaLauncher.java | 6 +- osrs/src/main/java/class0.java | 17 +- osrs/src/main/java/class1.java | 42 +- osrs/src/main/java/class10.java | 244 +- osrs/src/main/java/class101.java | 56 +- osrs/src/main/java/class102.java | 324 +- osrs/src/main/java/class105.java | 774 +- osrs/src/main/java/class106.java | 77 +- osrs/src/main/java/class108.java | 238 +- osrs/src/main/java/class11.java | 168 +- osrs/src/main/java/class113.java | 164 +- osrs/src/main/java/class12.java | 237 +- osrs/src/main/java/class124.java | 4 +- osrs/src/main/java/class125.java | 179 +- osrs/src/main/java/class126.java | 387 +- osrs/src/main/java/class127.java | 318 +- osrs/src/main/java/class128.java | 432 +- osrs/src/main/java/class129.java | 619 +- osrs/src/main/java/class13.java | 111 +- osrs/src/main/java/class130.java | 326 +- osrs/src/main/java/class131.java | 216 +- osrs/src/main/java/class132.java | 789 +- osrs/src/main/java/class133.java | 88 +- osrs/src/main/java/class134.java | 273 +- osrs/src/main/java/class135.java | 658 +- osrs/src/main/java/class136.java | 21 +- osrs/src/main/java/class137.java | 441 +- osrs/src/main/java/class138.java | 109 +- osrs/src/main/java/class139.java | 337 +- osrs/src/main/java/class14.java | 169 +- osrs/src/main/java/class140.java | 112 +- osrs/src/main/java/class141.java | 117 +- osrs/src/main/java/class142.java | 247 +- osrs/src/main/java/class143.java | 184 +- osrs/src/main/java/class144.java | 97 +- osrs/src/main/java/class146.java | 122 +- osrs/src/main/java/class147.java | 454 +- osrs/src/main/java/class148.java | 78 +- osrs/src/main/java/class149.java | 70 +- osrs/src/main/java/class15.java | 52 +- osrs/src/main/java/class150.java | 162 +- osrs/src/main/java/class151.java | 383 +- osrs/src/main/java/class152.java | 179 +- osrs/src/main/java/class153.java | 178 +- osrs/src/main/java/class155.java | 87 +- osrs/src/main/java/class156.java | 65 +- osrs/src/main/java/class157.java | 126 +- osrs/src/main/java/class158.java | 114 +- osrs/src/main/java/class159.java | 120 +- osrs/src/main/java/class16.java | 431 +- osrs/src/main/java/class160.java | 112 +- osrs/src/main/java/class161.java | 136 +- osrs/src/main/java/class162.java | 70 +- osrs/src/main/java/class164.java | 138 +- osrs/src/main/java/class165.java | 93 +- osrs/src/main/java/class166.java | 100 +- osrs/src/main/java/class167.java | 253 +- osrs/src/main/java/class169.java | 183 +- osrs/src/main/java/class17.java | 170 +- osrs/src/main/java/class170.java | 438 +- osrs/src/main/java/class172.java | 167 +- osrs/src/main/java/class174.java | 8 +- osrs/src/main/java/class176.java | 45 +- osrs/src/main/java/class177.java | 154 +- osrs/src/main/java/class178.java | 43 +- osrs/src/main/java/class18.java | 607 +- osrs/src/main/java/class181.java | 96 +- osrs/src/main/java/class184.java | 64 +- osrs/src/main/java/class19.java | 114 +- osrs/src/main/java/class191.java | 33 +- osrs/src/main/java/class197.java | 123 +- osrs/src/main/java/class2.java | 4 +- osrs/src/main/java/class20.java | 423 +- osrs/src/main/java/class200.java | 50 +- osrs/src/main/java/class203.java | 44 - osrs/src/main/java/class209.java | 120 + osrs/src/main/java/class210.java | 415 +- osrs/src/main/java/class211.java | 363 +- osrs/src/main/java/class212.java | 289 +- osrs/src/main/java/class213.java | 230 - osrs/src/main/java/class214.java | 101 + osrs/src/main/java/class215.java | 148 - osrs/src/main/java/class216.java | 149 + osrs/src/main/java/class217.java | 136 - osrs/src/main/java/class218.java | 76 + osrs/src/main/java/class219.java | 86 +- osrs/src/main/java/class220.java | 35 - osrs/src/main/java/class227.java | 184 + osrs/src/main/java/class228.java | 187 +- osrs/src/main/java/class229.java | 97 - osrs/src/main/java/class238.java | 56 + osrs/src/main/java/class239.java | 32 - .../java/{class244.java => class243.java} | 356 +- .../java/{class246.java => class245.java} | 606 +- osrs/src/main/java/class26.java | 26 +- osrs/src/main/java/class260.java | 252 + osrs/src/main/java/class261.java | 153 +- osrs/src/main/java/class27.java | 853 +- osrs/src/main/java/class270.java | 111 + osrs/src/main/java/class271.java | 219 +- osrs/src/main/java/class272.java | 29 +- osrs/src/main/java/class273.java | 80 - osrs/src/main/java/class28.java | 113 +- osrs/src/main/java/class280.java | 5 + osrs/src/main/java/class281.java | 16 +- osrs/src/main/java/class282.java | 51 +- osrs/src/main/java/class283.java | 6 +- osrs/src/main/java/class284.java | 8 +- osrs/src/main/java/class285.java | 7 - osrs/src/main/java/class29.java | 22 +- osrs/src/main/java/class291.java | 7 + osrs/src/main/java/class292.java | 60 +- osrs/src/main/java/class293.java | 16 +- osrs/src/main/java/class294.java | 5 - osrs/src/main/java/class299.java | 143 + osrs/src/main/java/class3.java | 8 +- osrs/src/main/java/class30.java | 170 +- osrs/src/main/java/class300.java | 86 +- osrs/src/main/java/class301.java | 142 +- osrs/src/main/java/class302.java | 103 +- osrs/src/main/java/class303.java | 808 +- osrs/src/main/java/class304.java | 72 - osrs/src/main/java/class305.java | 62 + osrs/src/main/java/class306.java | 133 - osrs/src/main/java/class308.java | 34 + osrs/src/main/java/class309.java | 36 +- osrs/src/main/java/class31.java | 103 +- osrs/src/main/java/class310.java | 42 - osrs/src/main/java/class311.java | 12 + osrs/src/main/java/class312.java | 77 +- osrs/src/main/java/class313.java | 132 - osrs/src/main/java/class316.java | 178 + osrs/src/main/java/class317.java | 151 - osrs/src/main/java/class318.java | 426 + osrs/src/main/java/class319.java | 96 - osrs/src/main/java/class323.java | 14 + osrs/src/main/java/class324.java | 24 +- osrs/src/main/java/class325.java | 57 +- osrs/src/main/java/class326.java | 119 +- osrs/src/main/java/class327.java | 104 +- osrs/src/main/java/class328.java | 61 - osrs/src/main/java/class329.java | 1240 +++ osrs/src/main/java/class33.java | 60 +- osrs/src/main/java/class330.java | 1256 +-- osrs/src/main/java/class331.java | 20 - osrs/src/main/java/class332.java | 22 + osrs/src/main/java/class333.java | 47 - .../java/{class253.java => class334.java} | 14 +- osrs/src/main/java/class335.java | 288 - osrs/src/main/java/class338.java | 87 + osrs/src/main/java/class339.java | 290 +- osrs/src/main/java/class340.java | 49 - osrs/src/main/java/class342.java | 51 + osrs/src/main/java/class343.java | 22 +- osrs/src/main/java/class344.java | 81 +- osrs/src/main/java/class345.java | 254 +- osrs/src/main/java/class346.java | 39 - osrs/src/main/java/class348.java | 129 + osrs/src/main/java/class349.java | 100 + osrs/src/main/java/class350.java | 31 +- osrs/src/main/java/class351.java | 94 - osrs/src/main/java/class352.java | 276 + osrs/src/main/java/class353.java | 68 - osrs/src/main/java/class357.java | 18 + osrs/src/main/java/class358.java | 489 -- osrs/src/main/java/class36.java | 101 +- osrs/src/main/java/class365.java | 14 - osrs/src/main/java/class369.java | 231 + osrs/src/main/java/class370.java | 420 +- osrs/src/main/java/class371.java | 61 +- osrs/src/main/java/class372.java | 198 +- osrs/src/main/java/class373.java | 14 - osrs/src/main/java/class383.java | 24 + osrs/src/main/java/class384.java | 44 +- osrs/src/main/java/class385.java | 246 +- osrs/src/main/java/class386.java | 116 +- osrs/src/main/java/class387.java | 172 +- osrs/src/main/java/class388.java | 48 + osrs/src/main/java/class389.java | 118 - osrs/src/main/java/class390.java | 51 +- osrs/src/main/java/class391.java | 61 +- osrs/src/main/java/class392.java | 253 +- osrs/src/main/java/class393.java | 273 - osrs/src/main/java/class394.java | 799 ++ osrs/src/main/java/class395.java | 1310 +-- osrs/src/main/java/class396.java | 174 +- osrs/src/main/java/class397.java | 16 - osrs/src/main/java/class398.java | 155 + osrs/src/main/java/class399.java | 149 - osrs/src/main/java/class4.java | 383 +- osrs/src/main/java/class401.java | 73 + osrs/src/main/java/class402.java | 61 - osrs/src/main/java/class403.java | 54 + osrs/src/main/java/class404.java | 57 - osrs/src/main/java/class408.java | 118 + osrs/src/main/java/class409.java | 94 + osrs/src/main/java/class410.java | 91 +- osrs/src/main/java/class411.java | 27 - osrs/src/main/java/class415.java | 270 +- osrs/src/main/java/class416.java | 82 + osrs/src/main/java/class417.java | 17 - osrs/src/main/java/class418.java | 45 + osrs/src/main/java/class419.java | 194 +- osrs/src/main/java/class420.java | 239 +- osrs/src/main/java/class421.java | 88 +- osrs/src/main/java/class422.java | 60 +- osrs/src/main/java/class423.java | 340 +- osrs/src/main/java/class424.java | 240 +- osrs/src/main/java/class425.java | 91 - osrs/src/main/java/class448.java | 138 + osrs/src/main/java/class449.java | 134 +- osrs/src/main/java/class450.java | 503 +- osrs/src/main/java/class451.java | 553 +- osrs/src/main/java/class452.java | 176 +- osrs/src/main/java/class453.java | 93 +- osrs/src/main/java/class454.java | 92 +- osrs/src/main/java/class455.java | 74 +- osrs/src/main/java/class456.java | 157 +- osrs/src/main/java/class457.java | 90 +- osrs/src/main/java/class458.java | 90 +- osrs/src/main/java/class459.java | 6 +- osrs/src/main/java/class46.java | 76 +- osrs/src/main/java/class460.java | 60 +- osrs/src/main/java/class461.java | 44 +- osrs/src/main/java/class462.java | 94 +- osrs/src/main/java/class463.java | 106 +- osrs/src/main/java/class464.java | 68 +- osrs/src/main/java/class465.java | 30 +- osrs/src/main/java/class466.java | 653 +- osrs/src/main/java/class467.java | 289 - osrs/src/main/java/class47.java | 1160 +-- osrs/src/main/java/class475.java | 14 + osrs/src/main/java/class476.java | 91 +- osrs/src/main/java/class477.java | 152 +- osrs/src/main/java/class478.java | 71 +- osrs/src/main/java/class479.java | 48 +- osrs/src/main/java/class480.java | 57 +- osrs/src/main/java/class481.java | 56 - osrs/src/main/java/class485.java | 70 + osrs/src/main/java/class486.java | 63 - osrs/src/main/java/class489.java | 19 + osrs/src/main/java/class490.java | 71 +- osrs/src/main/java/class491.java | 69 - osrs/src/main/java/class492.java | 19 - osrs/src/main/java/class493.java | 94 + osrs/src/main/java/class494.java | 33 - osrs/src/main/java/class496.java | 45 + osrs/src/main/java/class497.java | 124 +- osrs/src/main/java/class498.java | 83 +- osrs/src/main/java/class499.java | 98 +- osrs/src/main/java/class5.java | 33 +- osrs/src/main/java/class500.java | 41 +- osrs/src/main/java/class501.java | 38 +- osrs/src/main/java/class502.java | 106 +- osrs/src/main/java/class503.java | 168 +- osrs/src/main/java/class504.java | 62 +- osrs/src/main/java/class505.java | 9 - osrs/src/main/java/class506.java | 81 + osrs/src/main/java/class507.java | 80 - osrs/src/main/java/class508.java | 14 + osrs/src/main/java/class509.java | 26 - osrs/src/main/java/class51.java | 10 +- osrs/src/main/java/class510.java | 234 +- osrs/src/main/java/class514.java | 68 - osrs/src/main/java/class515.java | 68 + osrs/src/main/java/class517.java | 11 - osrs/src/main/java/class518.java | 73 +- osrs/src/main/java/class519.java | 74 + osrs/src/main/java/class521.java | 14 - osrs/src/main/java/class522.java | 52 +- osrs/src/main/java/class523.java | 42 + osrs/src/main/java/class528.java | 21 - osrs/src/main/java/class529.java | 15 + osrs/src/main/java/class53.java | 508 +- osrs/src/main/java/class531.java | 132 - osrs/src/main/java/class532.java | 132 + osrs/src/main/java/class535.java | 43 - osrs/src/main/java/class538.java | 12 +- osrs/src/main/java/class59.java | 394 +- osrs/src/main/java/class6.java | 158 +- osrs/src/main/java/class60.java | 884 +- osrs/src/main/java/class7.java | 190 +- osrs/src/main/java/class72.java | 41 +- osrs/src/main/java/class74.java | 98 +- osrs/src/main/java/class8.java | 30 +- osrs/src/main/java/class85.java | 252 +- osrs/src/main/java/class89.java | 135 +- osrs/src/main/java/class9.java | 1165 +-- osrs/src/main/java/class90.java | 90 +- osrs/src/main/java/class92.java | 550 +- osrs/src/main/java/class93.java | 408 +- .../java/com/jagex/oldscape/pub/OAuthApi.java | 2 +- .../jagex/oldscape/pub/OtlTokenRequester.java | 12 +- .../pub/RefreshAccessTokenRequester.java | 7 +- .../pub/RefreshAccessTokenResponse.java | 9 +- .../net/runelite/rs/ObfuscatedClassMap.java | 1026 +-- .../main/java/net/runelite/rs/Opcodes.java | 9 - .../main/java/net/runelite/rs/Reflection.java | 162 + .../java/net/runelite/rs/ScriptOpcodes.java | 7 +- .../main/java/netscape/js/JSException.java | 24 + osrs/src/main/java/netscape/js/JSObject.java | 199 + .../java/netscape/js/JSObjectProvider.java | 19 + .../main/java/{ => org/json}/JSONArray.java | 49 +- .../java/{ => org/json}/JSONException.java | 6 +- .../main/java/{ => org/json}/JSONObject.java | 134 +- .../main/java/{ => org/json}/JSONString.java | 6 +- .../main/java/{ => org/json}/JSONTokener.java | 17 +- osrs/src/main/java/org/json/Null.java | 27 + versions.properties | 4 + 613 files changed, 58641 insertions(+), 56461 deletions(-) delete mode 100644 osrs/src/main/java/LoadSongTask.java rename osrs/src/main/java/{JSONObject$Null.java => Null.java} (80%) create mode 100644 osrs/src/main/java/OAuthApi.java create mode 100644 osrs/src/main/java/ObfuscatedClassMap.java create mode 100644 osrs/src/main/java/OtlTokenRequester.java create mode 100644 osrs/src/main/java/RefreshAccessTokenRequester.java create mode 100644 osrs/src/main/java/RefreshAccessTokenResponse.java create mode 100644 osrs/src/main/java/ScriptOpcodes.java delete mode 100644 osrs/src/main/java/class203.java create mode 100644 osrs/src/main/java/class209.java delete mode 100644 osrs/src/main/java/class213.java create mode 100644 osrs/src/main/java/class214.java delete mode 100644 osrs/src/main/java/class215.java create mode 100644 osrs/src/main/java/class216.java delete mode 100644 osrs/src/main/java/class217.java create mode 100644 osrs/src/main/java/class218.java delete mode 100644 osrs/src/main/java/class220.java create mode 100644 osrs/src/main/java/class227.java delete mode 100644 osrs/src/main/java/class229.java create mode 100644 osrs/src/main/java/class238.java delete mode 100644 osrs/src/main/java/class239.java rename osrs/src/main/java/{class244.java => class243.java} (88%) rename osrs/src/main/java/{class246.java => class245.java} (81%) create mode 100644 osrs/src/main/java/class260.java create mode 100644 osrs/src/main/java/class270.java delete mode 100644 osrs/src/main/java/class273.java create mode 100644 osrs/src/main/java/class280.java delete mode 100644 osrs/src/main/java/class285.java create mode 100644 osrs/src/main/java/class291.java delete mode 100644 osrs/src/main/java/class294.java create mode 100644 osrs/src/main/java/class299.java delete mode 100644 osrs/src/main/java/class304.java create mode 100644 osrs/src/main/java/class305.java delete mode 100644 osrs/src/main/java/class306.java create mode 100644 osrs/src/main/java/class308.java delete mode 100644 osrs/src/main/java/class310.java create mode 100644 osrs/src/main/java/class311.java delete mode 100644 osrs/src/main/java/class313.java create mode 100644 osrs/src/main/java/class316.java delete mode 100644 osrs/src/main/java/class317.java create mode 100644 osrs/src/main/java/class318.java delete mode 100644 osrs/src/main/java/class319.java create mode 100644 osrs/src/main/java/class323.java delete mode 100644 osrs/src/main/java/class328.java create mode 100644 osrs/src/main/java/class329.java delete mode 100644 osrs/src/main/java/class331.java create mode 100644 osrs/src/main/java/class332.java delete mode 100644 osrs/src/main/java/class333.java rename osrs/src/main/java/{class253.java => class334.java} (52%) delete mode 100644 osrs/src/main/java/class335.java create mode 100644 osrs/src/main/java/class338.java delete mode 100644 osrs/src/main/java/class340.java create mode 100644 osrs/src/main/java/class342.java delete mode 100644 osrs/src/main/java/class346.java create mode 100644 osrs/src/main/java/class348.java create mode 100644 osrs/src/main/java/class349.java delete mode 100644 osrs/src/main/java/class351.java create mode 100644 osrs/src/main/java/class352.java delete mode 100644 osrs/src/main/java/class353.java create mode 100644 osrs/src/main/java/class357.java delete mode 100644 osrs/src/main/java/class358.java delete mode 100644 osrs/src/main/java/class365.java create mode 100644 osrs/src/main/java/class369.java delete mode 100644 osrs/src/main/java/class373.java create mode 100644 osrs/src/main/java/class383.java create mode 100644 osrs/src/main/java/class388.java delete mode 100644 osrs/src/main/java/class389.java delete mode 100644 osrs/src/main/java/class393.java create mode 100644 osrs/src/main/java/class394.java delete mode 100644 osrs/src/main/java/class397.java create mode 100644 osrs/src/main/java/class398.java delete mode 100644 osrs/src/main/java/class399.java create mode 100644 osrs/src/main/java/class401.java delete mode 100644 osrs/src/main/java/class402.java create mode 100644 osrs/src/main/java/class403.java delete mode 100644 osrs/src/main/java/class404.java create mode 100644 osrs/src/main/java/class408.java create mode 100644 osrs/src/main/java/class409.java delete mode 100644 osrs/src/main/java/class411.java create mode 100644 osrs/src/main/java/class416.java delete mode 100644 osrs/src/main/java/class417.java create mode 100644 osrs/src/main/java/class418.java delete mode 100644 osrs/src/main/java/class425.java create mode 100644 osrs/src/main/java/class448.java delete mode 100644 osrs/src/main/java/class467.java create mode 100644 osrs/src/main/java/class475.java delete mode 100644 osrs/src/main/java/class481.java create mode 100644 osrs/src/main/java/class485.java delete mode 100644 osrs/src/main/java/class486.java create mode 100644 osrs/src/main/java/class489.java delete mode 100644 osrs/src/main/java/class491.java delete mode 100644 osrs/src/main/java/class492.java create mode 100644 osrs/src/main/java/class493.java delete mode 100644 osrs/src/main/java/class494.java create mode 100644 osrs/src/main/java/class496.java delete mode 100644 osrs/src/main/java/class505.java create mode 100644 osrs/src/main/java/class506.java delete mode 100644 osrs/src/main/java/class507.java create mode 100644 osrs/src/main/java/class508.java delete mode 100644 osrs/src/main/java/class509.java delete mode 100644 osrs/src/main/java/class514.java create mode 100644 osrs/src/main/java/class515.java delete mode 100644 osrs/src/main/java/class517.java create mode 100644 osrs/src/main/java/class519.java delete mode 100644 osrs/src/main/java/class521.java create mode 100644 osrs/src/main/java/class523.java delete mode 100644 osrs/src/main/java/class528.java create mode 100644 osrs/src/main/java/class529.java delete mode 100644 osrs/src/main/java/class531.java create mode 100644 osrs/src/main/java/class532.java delete mode 100644 osrs/src/main/java/class535.java delete mode 100644 osrs/src/main/java/net/runelite/rs/Opcodes.java create mode 100644 osrs/src/main/java/net/runelite/rs/Reflection.java create mode 100644 osrs/src/main/java/netscape/js/JSException.java create mode 100644 osrs/src/main/java/netscape/js/JSObject.java create mode 100644 osrs/src/main/java/netscape/js/JSObjectProvider.java rename osrs/src/main/java/{ => org/json}/JSONArray.java (89%) rename osrs/src/main/java/{ => org/json}/JSONException.java (90%) rename osrs/src/main/java/{ => org/json}/JSONObject.java (85%) rename osrs/src/main/java/{ => org/json}/JSONString.java (83%) rename osrs/src/main/java/{ => org/json}/JSONTokener.java (96%) create mode 100644 osrs/src/main/java/org/json/Null.java diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java b/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java index e40de0616..67df6bd26 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java @@ -34,7 +34,7 @@ public interface RSBuffer extends Buffer, RSNode @Import("readUnsignedByteSub") @Override -byte readUnsignedByteSub$api(); +int readUnsignedByteSub$api(); @Import("readUnsignedByte") @Override diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java index a60a46768..fa05809ca 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java @@ -1616,6 +1616,7 @@ public interface RSClient extends RSGameEngine, Client @Construct RSClientPacket createClientPacket(int opcode, int length); + @Import("Login_password") @Override String getPassword(); diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSClientPacket.java b/api-rs/src/main/java/net/runelite/rs/api/RSClientPacket.java index d7c401daf..bf85a71bb 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSClientPacket.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSClientPacket.java @@ -5,11 +5,227 @@ public interface RSClientPacket extends ClientPacket { -@Import("id") -@Override -int getId(); + @Import("id") + @Override + int getId(); -@Import("length") -@Override -int getLength(); + @Import("length") + @Override + int getLength(); + + @Import("RESUME_PAUSEBUTTON") + RSClientPacket RESUME_PAUSEBUTTON(); + + @Import("RESUME_NAMEDIALOG") + RSClientPacket RESUME_NAMEDIALOG(); + + @Import("EVENT_KEYBOARD") + RSClientPacket EVENT_KEYBOARD(); + + @Import("EVENT_APPLET_FOCUS") + RSClientPacket EVENT_APPLET_FOCUS(); + +// @Import("CLICKWORLDMAP_TELEPORT") +// RSClientPacket CLICKWORLDMAP_TELEPORT(); + + @Import("IF_BUTTONT") + RSClientPacket IF_BUTTONT(); + + @Import("OPPLAYER6") + RSClientPacket OPPLAYER6(); + + @Import("OPNPC2") + RSClientPacket OPNPC2(); + + @Import("OPPLAYER7") + RSClientPacket OPPLAYER7(); + + @Import("OPNPC3") + RSClientPacket OPNPC3(); + + @Import("OPLOC2") + RSClientPacket OPLOC2(); + + @Import("OPPLAYER8") + RSClientPacket OPPLAYER8(); + + @Import("OPNPC1") + RSClientPacket OPNPC1(); + + @Import("OPLOC1") + RSClientPacket OPLOC1(); + + @Import("OPLOC4") + RSClientPacket OPLOC4(); + + @Import("FREECAM_EXIT") + RSClientPacket FREECAM_EXIT(); + + @Import("OPPLAYER2") + RSClientPacket OPPLAYER2(); + + @Import("OPLOC3") + RSClientPacket OPLOC3(); + + @Import("OPPLAYER3") + RSClientPacket OPPLAYER3(); + + @Import("OPPLAYER4") + RSClientPacket OPPLAYER4(); + + @Import("OPNPC4") + RSClientPacket OPNPC4(); + + @Import("LOGIN_TIMINGS") + RSClientPacket LOGIN_TIMINGS(); + + @Import("OPLOC5") + RSClientPacket OPLOC5(); + + @Import("OPPLAYER5") + RSClientPacket OPPLAYER5(); + + @Import("EVENT_MOUSE_IDLE") + RSClientPacket EVENT_MOUSE_IDLE(); + + @Import("OPNPC5") + RSClientPacket OPNPC5(); + + @Import("CHAT_SENDPRIVATE") + RSClientPacket CHAT_SENDPRIVATE(); + + @Import("CLOSE_MODAL") + RSClientPacket CLOSE_MODAL(); + + @Import("OPPLAYER1") + RSClientPacket OPPLAYER1(); + + @Import("CHAT_SENDABUSEREPORT") + RSClientPacket CHAT_SENDABUSEREPORT(); + + @Import("PING_STATISTICS") + RSClientPacket PING_STATISTICS(); + + @Import("EVENT_WINDOW_SETTING") + RSClientPacket EVENT_WINDOW_SETTING(); + + @Import("OPOBJ1") + RSClientPacket OPOBJ1(); + + @Import("FRIEND_ADDUSER") + RSClientPacket FRIEND_ADDUSER(); + + @Import("DOCHEAT") + RSClientPacket DOCHEAT(); + + @Import("IF_BUTTON9") + RSClientPacket IF_BUTTON9(); + + @Import("CLAN_KICKUSER") + RSClientPacket CLAN_KICKUSER(); + + @Import("IF_BUTTON8") + RSClientPacket IF_BUTTON8(); + + @Import("OPOBJ5") + RSClientPacket OPOBJ5(); + + @Import("IGNORE_DELUSER") + RSClientPacket IGNORE_DELUSER(); + + @Import("IF_BUTTON5") + RSClientPacket IF_BUTTON5(); + + @Import("IF_BUTTON4") + RSClientPacket IF_BUTTON4(); + + @Import("OPOBJ4") + RSClientPacket OPOBJ4(); + + @Import("OPOBJ3") + RSClientPacket OPOBJ3(); + + @Import("IF_BUTTON7") + RSClientPacket IF_BUTTON7(); + + @Import("CHAT_SETFILTER") + RSClientPacket CHAT_SETFILTER(); + + @Import("OPOBJ2") + RSClientPacket OPOBJ2(); + + @Import("IF_BUTTON6") + RSClientPacket IF_BUTTON6(); + + @Import("OPHELDD") + RSClientPacket OPHELDD(); + + @Import("RESUME_COUNTDIALOG") + RSClientPacket RESUME_COUNTDIALOG(); + + @Import("NO_TIMEOUT") + RSClientPacket NO_TIMEOUT(); + + @Import("OPLOCT") + RSClientPacket OPLOCT(); + + @Import("RESUME_OBJDIALOG") + RSClientPacket RESUME_OBJDIALOG(); + + @Import("OPPLAYERT") + RSClientPacket OPPLAYERT(); + + @Import("OPNPCT") + RSClientPacket OPNPCT(); + + @Import("FRIEND_DELUSER") + RSClientPacket FRIEND_DELUSER(); + + //@Import("IF_BUTTOND") + //RSClientPacket IF_BUTTOND(); + + @Import("OPLOCE") + RSClientPacket OPLOCE(); + + @Import("OPNPCE") + RSClientPacket OPNPCE(); + + @Import("EVENT_CAMERA_POSITION") + RSClientPacket EVENT_CAMERA_POSITION(); + + @Import("REFLECTION_CHECK_REPLY") + RSClientPacket REFLECTION_CHECK_REPLY(); + + @Import("OPOBJT") + RSClientPacket OPOBJT(); + + @Import("DETECT_MODIFIED_CLIENT") + RSClientPacket DETECT_MODIFIED_CLIENT(); + + @Import("OPOBJE") + RSClientPacket OPOBJE(); + + @Import("RESUME_STRINGDIALOG") + RSClientPacket RESUME_STRINGDIALOG(); + + @Import("IF_BUTTON1") + RSClientPacket IF_BUTTON1(); + + @Import("MOVE_GAMECLICK") + RSClientPacket MOVE_GAMECLICK(); + + @Import("IF_BUTTON3") + RSClientPacket IF_BUTTON3(); + + @Import("IF_BUTTON2") + RSClientPacket IF_BUTTON2(); + + @Import("EVENT_MOUSE_CLICK") + RSClientPacket EVENT_MOUSE_CLICK(); + + @Import("IF_BUTTON10") + RSClientPacket IF_BUTTON10(); + + @Import("WIDGET_TYPE") + RSClientPacket WIDGET_TYPE(); } \ No newline at end of file diff --git a/api/src/main/java/net/runelite/api/Buffer.java b/api/src/main/java/net/runelite/api/Buffer.java index 2cde96a52..0ada0b905 100644 --- a/api/src/main/java/net/runelite/api/Buffer.java +++ b/api/src/main/java/net/runelite/api/Buffer.java @@ -11,7 +11,7 @@ public interface Buffer extends Node byte readByteAdd(); byte readByteNeg(); - byte readUnsignedByteSub$api(); + int readUnsignedByteSub$api(); int readUnsignedByte$api(); byte readByte$api(); int readUnsignedShort$api(); diff --git a/api/src/main/java/net/runelite/api/Client.java b/api/src/main/java/net/runelite/api/Client.java index 7a076dd7b..34f7034e0 100644 --- a/api/src/main/java/net/runelite/api/Client.java +++ b/api/src/main/java/net/runelite/api/Client.java @@ -2452,6 +2452,8 @@ default void interact(int identifier, int opcode, int param0, int param1, int cl ClientPacket createClientPacket(int opcode, int length); + + String getPassword(); long[] getEntitiesAtMouse(); diff --git a/api/src/main/java/net/runelite/api/packets/ClientPacket.java b/api/src/main/java/net/runelite/api/packets/ClientPacket.java index add259c61..99062ab89 100644 --- a/api/src/main/java/net/runelite/api/packets/ClientPacket.java +++ b/api/src/main/java/net/runelite/api/packets/ClientPacket.java @@ -1,7 +1,233 @@ package net.runelite.api.packets; +import java.util.Map; + public interface ClientPacket { -int getId(); -int getLength(); + int getId(); + + int getLength(); + + ClientPacket RESUME_PAUSEBUTTON(); + + ClientPacket RESUME_NAMEDIALOG(); + + ClientPacket EVENT_KEYBOARD(); + + ClientPacket EVENT_APPLET_FOCUS(); + +// ClientPacket CLICKWORLDMAP_TELEPORT(); + + ClientPacket IF_BUTTONT(); + + ClientPacket OPPLAYER6(); + + ClientPacket OPNPC2(); + + ClientPacket OPPLAYER7(); + + ClientPacket OPNPC3(); + + ClientPacket OPLOC2(); + + ClientPacket OPPLAYER8(); + + ClientPacket OPNPC1(); + + ClientPacket OPLOC1(); + + ClientPacket OPLOC4(); + + ClientPacket FREECAM_EXIT(); + + ClientPacket OPPLAYER2(); + + ClientPacket OPLOC3(); + + ClientPacket OPPLAYER3(); + + ClientPacket OPPLAYER4(); + + ClientPacket OPNPC4(); + + ClientPacket LOGIN_TIMINGS(); + + ClientPacket OPLOC5(); + + ClientPacket OPPLAYER5(); + + ClientPacket EVENT_MOUSE_IDLE(); + + ClientPacket OPNPC5(); + + ClientPacket CHAT_SENDPRIVATE(); + + ClientPacket CLOSE_MODAL(); + + ClientPacket OPPLAYER1(); + + ClientPacket CHAT_SENDABUSEREPORT(); + + ClientPacket PING_STATISTICS(); + + ClientPacket EVENT_WINDOW_SETTING(); + + ClientPacket OPOBJ1(); + + ClientPacket FRIEND_ADDUSER(); + + ClientPacket DOCHEAT(); + + ClientPacket IF_BUTTON9(); + + ClientPacket CLAN_KICKUSER(); + + ClientPacket IF_BUTTON8(); + + ClientPacket OPOBJ5(); + + ClientPacket IGNORE_DELUSER(); + + ClientPacket IF_BUTTON5(); + + ClientPacket IF_BUTTON4(); + + ClientPacket OPOBJ4(); + + ClientPacket OPOBJ3(); + + ClientPacket IF_BUTTON7(); + + ClientPacket CHAT_SETFILTER(); + + ClientPacket OPOBJ2(); + + ClientPacket IF_BUTTON6(); + + ClientPacket OPHELDD(); + + ClientPacket RESUME_COUNTDIALOG(); + + ClientPacket NO_TIMEOUT(); + + ClientPacket OPLOCT(); + + ClientPacket RESUME_OBJDIALOG(); + + ClientPacket OPPLAYERT(); + + ClientPacket OPNPCT(); + + ClientPacket FRIEND_DELUSER(); + + //ClientPacket IF_BUTTOND(); + + ClientPacket OPLOCE(); + + ClientPacket OPNPCE(); + + ClientPacket EVENT_CAMERA_POSITION(); + + ClientPacket REFLECTION_CHECK_REPLY(); + + ClientPacket OPOBJT(); + + ClientPacket DETECT_MODIFIED_CLIENT(); + + ClientPacket OPOBJE(); + + ClientPacket RESUME_STRINGDIALOG(); + + ClientPacket IF_BUTTON1(); + + ClientPacket MOVE_GAMECLICK(); + + ClientPacket IF_BUTTON3(); + + ClientPacket IF_BUTTON2(); + + ClientPacket EVENT_MOUSE_CLICK(); + + ClientPacket IF_BUTTON10(); + + ClientPacket WIDGET_TYPE(); + + default Map getClientPackets() + { + //noinspection RedundantTypeArguments (explicit type arguments speedup compilation and analysis time) + return Map.ofEntries( + Map.entry(RESUME_PAUSEBUTTON(), "RESUME_PAUSEBUTTON"), + Map.entry(RESUME_NAMEDIALOG(), "RESUME_NAMEDIALOG"), + Map.entry(EVENT_KEYBOARD(), "EVENT_KEYBOARD"), + Map.entry(EVENT_APPLET_FOCUS(), "EVENT_APPLET_FOCUS"), +// Map.entry(CLICKWORLDMAP_TELEPORT(), "CLICKWORLDMAP_TELEPORT"), + Map.entry(IF_BUTTONT(), "IF_BUTTONT"), + Map.entry(OPPLAYER6(), "OPPLAYER6"), + Map.entry(OPNPC2(), "OPNPC2"), + Map.entry(OPPLAYER7(), "OPPLAYER7"), + Map.entry(OPNPC3(), "OPNPC3"), + Map.entry(OPLOC2(), "OPLOC2"), + Map.entry(OPPLAYER8(), "OPPLAYER8"), + Map.entry(OPNPC1(), "OPNPC1"), + Map.entry(OPLOC1(), "OPLOC1"), + Map.entry(OPLOC4(), "OPLOC4"), + Map.entry(FREECAM_EXIT(), "FREECAM_EXIT"), + Map.entry(OPPLAYER2(), "OPPLAYER2"), + Map.entry(OPLOC3(), "OPLOC3"), + Map.entry(OPPLAYER3(), "OPPLAYER3"), + Map.entry(OPPLAYER4(), "OPPLAYER4"), + Map.entry(OPNPC4(), "OPNPC4"), + Map.entry(LOGIN_TIMINGS(), "LOGIN_TIMINGS"), + Map.entry(OPLOC5(), "OPLOC5"), + Map.entry(OPPLAYER5(), "OPPLAYER5"), + Map.entry(EVENT_MOUSE_IDLE(), "EVENT_MOUSE_IDLE"), + Map.entry(OPNPC5(), "OPNPC5"), + Map.entry(CHAT_SENDPRIVATE(), "CHAT_SENDPRIVATE"), + Map.entry(CLOSE_MODAL(), "CLOSE_MODAL"), + Map.entry(OPPLAYER1(), "OPPLAYER1"), + Map.entry(CHAT_SENDABUSEREPORT(), "CHAT_SENDABUSEREPORT"), + Map.entry(PING_STATISTICS(), "PING_STATISTICS"), + Map.entry(EVENT_WINDOW_SETTING(), "EVENT_WINDOW_SETTING"), + Map.entry(OPOBJ1(), "OPOBJ1"), + Map.entry(FRIEND_ADDUSER(), "FRIEND_ADDUSER"), + Map.entry(DOCHEAT(), "DOCHEAT"), + Map.entry(IF_BUTTON9(), "IF_BUTTON9"), + Map.entry(CLAN_KICKUSER(), "CLAN_KICKUSER"), + Map.entry(IF_BUTTON8(), "IF_BUTTON8"), + Map.entry(OPOBJ5(), "OPOBJ5"), + Map.entry(IGNORE_DELUSER(), "IGNORE_DELUSER"), + Map.entry(IF_BUTTON5(), "IF_BUTTON5"), + Map.entry(IF_BUTTON4(), "IF_BUTTON4"), + Map.entry(OPOBJ4(), "OPOBJ4"), + Map.entry(OPOBJ3(), "OPOBJ3"), + Map.entry(IF_BUTTON7(), "IF_BUTTON7"), + Map.entry(CHAT_SETFILTER(), "CHAT_SETFILTER"), + Map.entry(OPOBJ2(), "OPOBJ2"), + Map.entry(IF_BUTTON6(), "IF_BUTTON6"), + Map.entry(OPHELDD(), "OPHELDD"), + Map.entry(RESUME_COUNTDIALOG(), "RESUME_COUNTDIALOG"), + Map.entry(NO_TIMEOUT(), "NO_TIMEOUT"), + Map.entry(OPLOCT(), "OPLOCT"), + Map.entry(RESUME_OBJDIALOG(), "RESUME_OBJDIALOG"), + Map.entry(OPPLAYERT(), "OPPLAYERT"), + Map.entry(OPNPCT(), "OPNPCT"), + Map.entry(FRIEND_DELUSER(), "FRIEND_DELUSER"), + //Map.entry(IF_BUTTOND(), "IF_BUTTOND"), + Map.entry(OPLOCE(), "OPLOCE"), + Map.entry(OPNPCE(), "OPNPCE"), + Map.entry(EVENT_CAMERA_POSITION(), "EVENT_CAMERA_POSITION"), + Map.entry(REFLECTION_CHECK_REPLY(), "REFLECTION_CHECK_REPLY"), + Map.entry(OPOBJT(), "OPOBJT"), + Map.entry(DETECT_MODIFIED_CLIENT(), "DETECT_MODIFIED_CLIENT"), + Map.entry(OPOBJE(), "OPOBJE"), + Map.entry(RESUME_STRINGDIALOG(), "RESUME_STRINGDIALOG"), + Map.entry(IF_BUTTON1(), "IF_BUTTON1"), + Map.entry(MOVE_GAMECLICK(), "MOVE_GAMECLICK"), + Map.entry(IF_BUTTON3(), "IF_BUTTON3"), + Map.entry(IF_BUTTON2(), "IF_BUTTON2"), + Map.entry(EVENT_MOUSE_CLICK(), "EVENT_MOUSE_CLICK"), + Map.entry(IF_BUTTON10(), "IF_BUTTON10"), + Map.entry(WIDGET_TYPE(), "WIDGET_TYPE") + ); + } } \ No newline at end of file diff --git a/client/src/main/java/meteor/Main.kt b/client/src/main/java/meteor/Main.kt index 40d63ed9e..23c66a545 100644 --- a/client/src/main/java/meteor/Main.kt +++ b/client/src/main/java/meteor/Main.kt @@ -59,6 +59,7 @@ import meteor.plugins.privateserver.PrivateServerConfig import meteor.rmi.handshake.HandshakeService import meteor.rmi.handshake.HandshakeClient import meteor.ui.composables.preferences.uiColor +import net.runelite.api.packets.ClientPacket import net.runelite.client.plugins.gpu.GpuPlugin import net.runelite.http.api.chat.ChatClient import net.runelite.http.api.xp.XpClient @@ -102,6 +103,7 @@ object Main : ApplicationScope, EventSubscriber() { lateinit var chatMessageManager: ChatMessageManager lateinit var chatCommandManager: ChatCommandManager lateinit var xpDropManager: XpDropManager + var logger = Logger("Main") val eventBus = EventBus val httpClient = OkHttpClient() diff --git a/client/src/main/java/meteor/api/ClientPackets.kt b/client/src/main/java/meteor/api/ClientPackets.kt index 4ba257166..43e10e26f 100644 --- a/client/src/main/java/meteor/api/ClientPackets.kt +++ b/client/src/main/java/meteor/api/ClientPackets.kt @@ -3,12 +3,14 @@ package meteor.api import dev.hoot.api.InteractionException import dev.hoot.api.events.AutomatedMenu +import dev.hoot.api.game.Game.getClientPacket import dev.hoot.api.packets.WidgetPackets import dev.hoot.api.widgets.Widgets import meteor.Main import meteor.plugins.meteor.AutoInteractOverlay import meteor.rs.ClientThread.invoke import net.runelite.api.MenuAction +import net.runelite.api.packets.ClientPacket import net.runelite.api.packets.PacketBufferNode import net.runelite.api.widgets.Widget import net.runelite.api.widgets.WidgetType @@ -20,11 +22,11 @@ import java.awt.Point */ object ClientPackets { - // OPLOC1 + // OPOBJ1 // param0: worldX // param1: worldY fun createGroundItemAction1Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(37, 7) + val bufferNode = preparePacketBuffer(getClientPacket().OPOBJ1()) bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) bufferNode.packetBuffer.`writeShort$api`(worldY) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) @@ -32,11 +34,11 @@ object ClientPackets { return bufferNode } - // OPLOC2 + // OPOBJ2 // param0: worldX // param1: worldY fun createGroundItemAction2Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(9, 7) + val bufferNode = preparePacketBuffer(getClientPacket().OPOBJ2()) bufferNode.packetBuffer.`writeShortAdd$api`(worldY) bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) @@ -44,11 +46,11 @@ object ClientPackets { return bufferNode } - // OPLOC3 + // OPOBJ3 // param0: worldX // param1: worldY fun createGroundItemAction3Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(42, 7) + val bufferNode = preparePacketBuffer(getClientPacket().OPOBJ3()) bufferNode.packetBuffer.`writeShortAdd$api`(worldX) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) @@ -56,11 +58,11 @@ object ClientPackets { return bufferNode } - // OPLOC4 + // OPOBJ4 // param0: worldX // param1: worldY fun createGroundItemAction4Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(59, 7) + val bufferNode = preparePacketBuffer(getClientPacket().OPOBJ4()) bufferNode.packetBuffer.`writeShortAdd$api`(worldX) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) @@ -68,11 +70,11 @@ object ClientPackets { return bufferNode } - // OPLOC5 + // OPOBJ5 // param0: worldX // param1: worldY fun createGroundItemAction5Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(1, 7) + val bufferNode = preparePacketBuffer(getClientPacket().OPOBJ5()) bufferNode.packetBuffer.`writeShortLE$api`(worldY) bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShort$api`(worldX) @@ -80,7 +82,7 @@ object ClientPackets { return bufferNode } - // OPOBJ1 + // OPLOC1 // param0: worldX // param1: worldY fun createObjectAction1Packet( @@ -89,15 +91,15 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(37, 7) - bufferNode.packetBuffer.`writeShortLE$api`(worldY) - bufferNode.packetBuffer.`writeShortLE$api`(worldX) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShort$api`(objectID) + val bufferNode = preparePacketBuffer(getClientPacket().OPLOC1()) + bufferNode.packetBuffer.`writeShort$api`(worldX) + bufferNode.packetBuffer.`writeIntME$api`(worldY) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAddLE$api`(objectID) return bufferNode } - // OPOBJ2 + // OPLOC2 // param0: worldX // param1: worldY fun createObjectAction2Packet( @@ -106,15 +108,15 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(9, 7) - bufferNode.packetBuffer.`writeShortLE$api`(worldY) - bufferNode.packetBuffer.`writeShortAddLE$api`(objectID) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + val bufferNode = preparePacketBuffer(getClientPacket().OPLOC2()) + bufferNode.packetBuffer.`writeShort$api`(worldX) + bufferNode.packetBuffer.`writeShort$api`(worldY) + bufferNode.packetBuffer.`writeIntME$api`(objectID) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) return bufferNode } - // OPOBJ3 + // OPLOC3 // param0: worldX // param1: worldY fun createObjectAction3Packet( @@ -123,15 +125,15 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(42, 7) - bufferNode.packetBuffer.`writeShortAdd$api`(worldX) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAdd$api`(worldY) - bufferNode.packetBuffer.`writeShortAddLE$api`(objectID) + val bufferNode = preparePacketBuffer(getClientPacket().OPLOC3()) + bufferNode.packetBuffer.`writeShort$api`(objectID) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(worldY) return bufferNode } - // OPOBJ4 + // OPLOC4 // param0: worldX // param1: worldY fun createObjectAction4Packet( @@ -140,7 +142,7 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(53, 7) + val bufferNode = preparePacketBuffer(getClientPacket().OPLOC4()) bufferNode.packetBuffer.`writeShortAdd$api`(objectID) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAdd$api`(worldY) @@ -148,7 +150,7 @@ object ClientPackets { return bufferNode } - // OPOBJ5 + // OPLOC5 // param0: worldX // param1: worldY fun createObjectAction5Packet( @@ -157,15 +159,15 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(45, 7) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAddLE$api`(objectID) - bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + val bufferNode = preparePacketBuffer(getClientPacket().OPLOC5()) bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) + bufferNode.packetBuffer.`writeIntME$api`(worldX) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(objectID) return bufferNode } - // OPOBJT + // OPLOCT // param0: worldX // param1: worldY fun createItemWidgetOnGameObjectPacket( @@ -177,7 +179,7 @@ object ClientPackets { itemWidgetID: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(36, 15) + val bufferNode = preparePacketBuffer(getClientPacket().OPLOCT()) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortLE$api`(objectID) bufferNode.packetBuffer.`writeShortLE$api`(itemId) @@ -196,7 +198,7 @@ object ClientPackets { itemSlot: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(8, 11) + val bufferNode = preparePacketBuffer(getClientPacket().OPNPCT()) bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) bufferNode.packetBuffer.`writeShortLE$api`(itemSlot) bufferNode.packetBuffer.`writeShortLE$api`(itemID) @@ -207,23 +209,23 @@ object ClientPackets { //OPNPC1 fun createNPCAction1Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(31, 3) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAddLE$api`(npcIdx) + val bufferNode = preparePacketBuffer(getClientPacket().OPNPC1()) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(npcIdx) return bufferNode } //OPNPC2 fun createNPCAction2Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(76, 3) + val bufferNode = preparePacketBuffer(getClientPacket().OPNPC2()) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortLE$api`(npcIdx) + bufferNode.packetBuffer.`writeIntME$api`(npcIdx) return bufferNode } //OPNPC3 fun createNPCAction3Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(11, 3) + val bufferNode = preparePacketBuffer(getClientPacket().OPNPC3()) bufferNode.packetBuffer.`writeShort$api`(npcIdx) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) return bufferNode @@ -231,17 +233,17 @@ object ClientPackets { //OPNPC4 fun createNPCAction4Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(80, 3) - bufferNode.packetBuffer.`writeShortLE$api`(npcIdx) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + val bufferNode = preparePacketBuffer(getClientPacket().OPNPC4()) + bufferNode.packetBuffer.`writeByteAdd$api`(npcIdx) + bufferNode.packetBuffer.`writeShort$api`(if (shiftPressed) 1 else 0) return bufferNode } //OPNPC5 fun createNPCAction5Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(30, 3) + val bufferNode = preparePacketBuffer(getClientPacket().OPNPC5()) bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShort$api`(npcIdx) + bufferNode.packetBuffer.`writeIntME$api`(npcIdx) return bufferNode } @@ -253,18 +255,18 @@ object ClientPackets { itemWidgetID: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(90, 11) + val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYERT()) bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) bufferNode.packetBuffer.`writeIntME$api`(itemWidgetID) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShort$api`(itemId) - bufferNode.packetBuffer.`writeShortLE$api`(itemSlot) + bufferNode.packetBuffer.`writeIntIME$api`(itemSlot) + bufferNode.packetBuffer.`writeIntME$api`(itemId) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) return bufferNode } ///OPPLAYER1 fun createPlayerAction1Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(79, 3) + val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER1()) bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode @@ -272,15 +274,15 @@ object ClientPackets { ///OPPLAYER2 fun createPlayerAction2Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(56, 3) + val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER2()) bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) return bufferNode } ///OPPLAYER3 fun createPlayerAction3Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(40, 3) + val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER3()) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShort$api`(playerIdx) return bufferNode @@ -288,41 +290,41 @@ object ClientPackets { ///OPPLAYER4 fun createPlayerAction4Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(55, 3) + val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER4()) bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) return bufferNode } ///OPPLAYER5 fun createPlayerAction5Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(61, 3) + val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER5()) bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode } ///OPPLAYER6 fun createPlayerAction6Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(64, 3) - bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) + val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER6()) + bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode } ///OPPLAYER7 fun createPlayerAction7Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(77, 3) - bufferNode.packetBuffer.`writeShort$api`(playerIdx) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER7()) + bufferNode.packetBuffer.`writeIntME$api`(playerIdx) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) return bufferNode } ///OPPLAYER8 fun createPlayerAction8Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(70, 3) - bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER8()) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) return bufferNode } @@ -336,14 +338,14 @@ object ClientPackets { itemWidgetID: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(89, 15) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + val bufferNode = preparePacketBuffer(getClientPacket().OPLOCT()) + bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) bufferNode.packetBuffer.`writeShort$api`(groundItemID) bufferNode.packetBuffer.`writeShort$api`(itemID) bufferNode.packetBuffer.`writeShort$api`(worldY) bufferNode.packetBuffer.`writeShortAdd$api`(worldX) bufferNode.packetBuffer.`writeShortLE$api`(itemSlot) - bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) return bufferNode } @@ -358,10 +360,10 @@ object ClientPackets { destinationSlot: Int, destinationItemId: Int ): PacketBufferNode { - val bufferNode = preparePacketBuffer(15, 16) - bufferNode.packetBuffer.`writeShortLE$api`(destinationSlot) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTONT()) bufferNode.packetBuffer.`writeShort$api`(destinationItemId) bufferNode.packetBuffer.`writeIntME$api`(sourceWidgetId) + bufferNode.packetBuffer.`writeShortLE$api`(destinationSlot) bufferNode.packetBuffer.`writeShortAddLE$api`(sourceSlot) bufferNode.packetBuffer.`writeIntIME$api`(destinationWidgetId) bufferNode.packetBuffer.`writeShortAdd$api`(sourceItemId) @@ -376,7 +378,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(34, 8) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON1()) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -391,7 +393,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(83, 8) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON2()) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -406,7 +408,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(6, 8) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON3()) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -421,7 +423,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(52, 8) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON4()) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -436,7 +438,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(32, 8) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON5()) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -451,7 +453,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(47, 8) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON6()) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -466,7 +468,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(82, 8) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON7()) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -481,7 +483,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(84, 8) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON8()) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -496,7 +498,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(24, 8) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON9()) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -511,7 +513,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(22, 8) + val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON10()) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -520,26 +522,27 @@ object ClientPackets { // CLICK fun createClickPacket(mouseInfo: Int, x: Int, y: Int): PacketBufferNode { - val bufferNode = preparePacketBuffer(16, 6) + val bufferNode = preparePacketBuffer(getClientPacket().EVENT_MOUSE_CLICK()) bufferNode.packetBuffer.`writeShort$api`(mouseInfo) - bufferNode.packetBuffer.`writeShort$api`(x) bufferNode.packetBuffer.`writeShort$api`(y) + bufferNode.packetBuffer.`writeShort$api`(x) return bufferNode } // WALK fun createMovementPacket(worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(93, -1) + + val bufferNode = preparePacketBuffer(getClientPacket().MOVE_GAMECLICK()) bufferNode.packetBuffer.`writeByte$api`(5) - bufferNode.packetBuffer.`writeShort$api`(worldX) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortLE$api`(worldY) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) + bufferNode.packetBuffer.`writeShortAdd$api`(worldY) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode } // CONTINUE fun createContinuePacket(widgetId: Int, childId: Int): PacketBufferNode { - val bufferNode = preparePacketBuffer(76, 6) + val bufferNode = preparePacketBuffer(getClientPacket().RESUME_PAUSEBUTTON()) bufferNode.packetBuffer.`writeIntME$api`(widgetId) bufferNode.packetBuffer.`writeShortLE$api`(childId) return bufferNode @@ -549,13 +552,21 @@ object ClientPackets { * creates a new packetBuffer with the provided [opcode] and [size] */ fun preparePacketBuffer(opcode: Int, size: Int): PacketBufferNode { + val clientPacket = Main.client.createClientPacket(opcode, size) return Main.client.preparePacket( clientPacket, Main.client.packetWriter.isaacCipher ) } + fun preparePacketBuffer(clientPacket: ClientPacket): PacketBufferNode { + val clientPacket = Main.client.createClientPacket(clientPacket.id, clientPacket.length) + return Main.client.preparePacket( + clientPacket, + Main.client.packetWriter.isaacCipher + ) + } fun queueClickPacket(clickPoint: Point) { AutoInteractOverlay.interactPoint = clickPoint queueClickPacket(clickPoint.x, clickPoint.y) diff --git a/mixins/src/main/java/mixins/ReflectionMixin.java b/mixins/src/main/java/mixins/ReflectionMixin.java index 61b9a8410..ebbe5acfb 100644 --- a/mixins/src/main/java/mixins/ReflectionMixin.java +++ b/mixins/src/main/java/mixins/ReflectionMixin.java @@ -81,21 +81,21 @@ public static void reportFindField(Class clazz, String fieldName) { public static void reportInvoke(Method method, Object reference, Object[] args) { String className = method.getClass().getName(); int arg = 0; - client.getLogger().error("Reflection:INVOKE - " + className + "." + method.getName()); + client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - " + className + "." + method.getName()); if (reference != null) - client.getLogger().error("Reflection:INVOKE - reference - " + reference.getClass().getName()); + client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - reference - " + reference.getClass().getName()); for (Object o : args) { - client.getLogger().error("Reflection:INVOKE - arg" + arg + " - " + o.getClass().getName()); + client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - arg" + arg + " - " + o.getClass().getName()); if (o instanceof Integer) - client.getLogger().error("Reflection:INVOKE - intValue" + arg + " - " + o); + client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - intValue" + arg + " - " + o); if (o instanceof String) - client.getLogger().error("Reflection:INVOKE - strValue" + arg + " - " + o); + client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - strValue" + arg + " - " + o); if (o instanceof Long) - client.getLogger().error("Reflection:INVOKE - longValue" + arg + " - " + o); + client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - longValue" + arg + " - " + o); if (o instanceof Byte) - client.getLogger().error("Reflection:INVOKE - byteValue" + arg + " - " + o); + client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - byteValue" + arg + " - " + o); if (o instanceof Boolean) - client.getLogger().error("Reflection:INVOKE - boolValue" + arg + " - " + o); + client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - boolValue" + arg + " - " + o); arg++; } } diff --git a/osrs/build.gradle.kts b/osrs/build.gradle.kts index b9e0112fe..485b2795d 100644 --- a/osrs/build.gradle.kts +++ b/osrs/build.gradle.kts @@ -18,7 +18,6 @@ dependencies { with(libs) { implementation(bouncycastle) - implementation(json) testImplementation(junit.jupiter.api) testRuntimeOnly(junit.jupiter.api) implementation(gson) diff --git a/osrs/src/main/java/AABB.java b/osrs/src/main/java/AABB.java index 266b52760..2c50633b4 100644 --- a/osrs/src/main/java/AABB.java +++ b/osrs/src/main/java/AABB.java @@ -1,29 +1,26 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") +@ObfuscatedName("ip") @Implements("AABB") public class AABB { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("xMid") int xMid; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("yMid") int yMid; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("zMid") int zMid; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("zMidOffset") int zMidOffset; @@ -35,154 +32,4 @@ public class AABB { this.yMidOffset = var5; this.zMidOffset = var6; } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-817024530" - ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); - var2.size = var0.readUnsignedByte(); - var2.id = var0.readInt(); - var2.operations = new int[var2.size]; - var2.creationErrors = new int[var2.size]; - var2.fields = new Field[var2.size]; - var2.intReplaceValues = new int[var2.size]; - var2.methods = new Method[var2.size]; - var2.arguments = new byte[var2.size][][]; - - for (int var3 = 0; var3 < var2.size; ++var3) { - try { - int var4 = var0.readUnsignedByte(); - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { - if (var4 == 3 || var4 == 4) { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = var0.readUnsignedByte(); - String[] var8 = new String[var7]; - - for (int var9 = 0; var9 < var7; ++var9) { - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); - byte[][] var10 = new byte[var7][]; - int var12; - if (var4 == 3) { - for (int var11 = 0; var11 < var7; ++var11) { - var12 = var0.readInt(); - var10[var11] = new byte[var12]; - var0.readBytes(var10[var11], 0, var12); - } - } - - var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; - - for (var12 = 0; var12 < var7; ++var12) { - var21[var12] = class282.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = class282.loadClassFromDescriptor(var20); - if (class282.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = class282.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if (var21.length == var17.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var17[var19] != var21[var19]) { - var18 = false; - break; - } - } - - if (var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; - } - } - } - } - - var2.arguments[var3] = var10; - } - } else { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (class282.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(class282.loadClassFromDescriptor(var5), var6); - } - } catch (ClassNotFoundException var24) { - var2.creationErrors[var3] = -1; - } catch (SecurityException var25) { - var2.creationErrors[var3] = -2; - } catch (NullPointerException var26) { - var2.creationErrors[var3] = -3; - } catch (Exception var27) { - var2.creationErrors[var3] = -4; - } catch (Throwable var28) { - var2.creationErrors[var3] = -5; - } - } - - class36.reflectionChecks.addFirst(var2); - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1736131350" - ) - public static int method1266(int var0, int var1, int var2) { - int var3 = class228.method1190(var2 - var1 + 1); - var3 <<= var1; - var0 |= var3; - return var0; - } - - @ObfuscatedName("kg") - @ObfuscatedSignature( - descriptor = "(IIIIII)Z", - garbageValue = "692488885" - ) - static final boolean method1268(int var0, int var1, int var2, int var3, int var4) { - PendingSpawn var5 = null; - - for (PendingSpawn var6 = (PendingSpawn)Client.pendingSpawns.last(); var6 != null; var6 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var6.plane && var6.x == var1 && var2 == var6.y && var3 == var6.type) { - var5 = var6; - break; - } - } - - if (var5 != null) { - var5.field948 = var4; - return true; - } else { - return false; - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/AbstractArchive.java b/osrs/src/main/java/AbstractArchive.java index 39f6cb724..df0a9e38d 100644 --- a/osrs/src/main/java/AbstractArchive.java +++ b/osrs/src/main/java/AbstractArchive.java @@ -3,70 +3,67 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nd") +@ObfuscatedName("nu") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("bf") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lun;" + descriptor = "Lus;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("maximumContainerSize") static int maximumContainerSize; - @ObfuscatedName("jp") - @Export("baseX") - static int baseX; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("groupCount") int groupCount; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("groupIds") int[] groupIds; - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Luj;" + descriptor = "Luz;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("bd") + @ObfuscatedName("bh") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("bb") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "[Luj;" + descriptor = "[Luz;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("groups") Object[] groups; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("files") Object[][] files; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("hash") public int hash; - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("shallowFiles") boolean shallowFiles; @@ -80,159 +77,168 @@ public abstract class AbstractArchive { this.shallowFiles = var2; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-664965088" + garbageValue = "-1272707955" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1837159139" + garbageValue = "402130956" ) @Export("loadGroup") void loadGroup(int var1) { } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1193931520" + garbageValue = "-1917091652" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("bl") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "-62" + descriptor = "([BI)V", + garbageValue = "1178944062" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - this.hash = class313.method1646(var1, var1.length); - Buffer var2 = new Buffer(class304.decompressBytes(var1)); - int var3 = var2.readUnsignedByte(); - if (var3 >= 5 && var3 <= 7) { - if (var3 >= 6) { - var2.readInt(); + int var3 = var1.length; + int var5 = -1; + + int var6; + for (var6 = 0; var6 < var3; ++var6) { + var5 = var5 >>> 8 ^ Buffer.crc32Table[(var5 ^ var1[var6]) & 255]; + } + + var5 = ~var5; + this.hash = var5; + Buffer var15 = new Buffer(class53.decompressBytes(var1)); + var5 = var15.readUnsignedByte(); + if (var5 >= 5 && var5 <= 7) { + if (var5 >= 6) { + var15.readInt(); } - int var4 = var2.readUnsignedByte(); - if (var3 >= 7) { - this.groupCount = var2.method2542(); + var6 = var15.readUnsignedByte(); + if (var5 >= 7) { + this.groupCount = var15.method2562(); } else { - this.groupCount = var2.readUnsignedShort(); + this.groupCount = var15.readUnsignedShort(); } - int var5 = 0; - int var6 = -1; + int var7 = 0; + int var8 = -1; this.groupIds = new int[this.groupCount]; - int var7; - if (var3 >= 7) { - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.method2542(); - if (this.groupIds[var7] > var6) { - var6 = this.groupIds[var7]; + int var9; + if (var5 >= 7) { + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupIds[var9] = var7 += var15.method2562(); + if (this.groupIds[var9] > var8) { + var8 = this.groupIds[var9]; } } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.readUnsignedShort(); - if (this.groupIds[var7] > var6) { - var6 = this.groupIds[var7]; + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupIds[var9] = var7 += var15.readUnsignedShort(); + if (this.groupIds[var9] > var8) { + var8 = this.groupIds[var9]; } } } - this.groupCrcs = new int[var6 + 1]; - this.groupVersions = new int[var6 + 1]; - this.fileCounts = new int[var6 + 1]; - this.fileIds = new int[var6 + 1][]; - this.groups = new Object[var6 + 1]; - this.files = new Object[var6 + 1][]; - if (var4 != 0) { - this.groupNameHashes = new int[var6 + 1]; - - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); + this.groupCrcs = new int[var8 + 1]; + this.groupVersions = new int[var8 + 1]; + this.fileCounts = new int[var8 + 1]; + this.fileIds = new int[var8 + 1][]; + this.groups = new Object[var8 + 1]; + this.files = new Object[var8 + 1][]; + if (var6 != 0) { + this.groupNameHashes = new int[var8 + 1]; + + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupNameHashes[this.groupIds[var9]] = var15.readInt(); } this.groupNameHashTable = new IntHashTable(this.groupNameHashes); } - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupCrcs[this.groupIds[var7]] = var2.readInt(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupCrcs[this.groupIds[var9]] = var15.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupVersions[this.groupIds[var7]] = var2.readInt(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupVersions[this.groupIds[var9]] = var15.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.fileCounts[this.groupIds[var9]] = var15.readUnsignedShort(); } - int var8; - int var9; int var10; int var11; int var12; - if (var3 >= 7) { - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - var5 = 0; - var10 = -1; - this.fileIds[var8] = new int[var9]; - - for (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.method2542(); - if (var12 > var10) { - var10 = var12; + int var13; + int var14; + if (var5 >= 7) { + for (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; + var11 = this.fileCounts[var10]; + var7 = 0; + var12 = -1; + this.fileIds[var10] = new int[var11]; + + for (var13 = 0; var13 < var11; ++var13) { + var14 = this.fileIds[var10][var13] = var7 += var15.method2562(); + if (var14 > var12) { + var12 = var14; } } - this.files[var8] = new Object[var10 + 1]; + this.files[var10] = new Object[var12 + 1]; } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - var5 = 0; - var10 = -1; - this.fileIds[var8] = new int[var9]; - - for (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); - if (var12 > var10) { - var10 = var12; + for (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; + var11 = this.fileCounts[var10]; + var7 = 0; + var12 = -1; + this.fileIds[var10] = new int[var11]; + + for (var13 = 0; var13 < var11; ++var13) { + var14 = this.fileIds[var10][var13] = var7 += var15.readUnsignedShort(); + if (var14 > var12) { + var12 = var14; } } - this.files[var8] = new Object[var10 + 1]; + this.files[var10] = new Object[var12 + 1]; } } - if (var4 != 0) { - this.fileNameHashes = new int[var6 + 1][]; - this.fileNameHashTables = new IntHashTable[var6 + 1]; + if (var6 != 0) { + this.fileNameHashes = new int[var8 + 1][]; + this.fileNameHashTables = new IntHashTable[var8 + 1]; - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - this.fileNameHashes[var8] = new int[this.files[var8].length]; + for (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; + var11 = this.fileCounts[var10]; + this.fileNameHashes[var10] = new int[this.files[var10].length]; - for (var10 = 0; var10 < var9; ++var10) { - this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); + for (var12 = 0; var12 < var11; ++var12) { + this.fileNameHashes[var10][this.fileIds[var10][var12]] = var15.readInt(); } - this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); + this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); } } @@ -241,20 +247,20 @@ void decodeIndex(byte[] var1) { } } - @ObfuscatedName("bt") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(III)[B", - garbageValue = "-1888233667" + descriptor = "(IIB)[B", + garbageValue = "-1" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("by") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "-979807337" + garbageValue = "1244530387" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -270,7 +276,7 @@ public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { } } - byte[] var5 = class150.method785(this.files[var1][var2], false); + byte[] var5 = class126.method699(this.files[var1][var2], false); if (this.shallowFiles) { this.files[var1][var2] = null; } @@ -281,10 +287,10 @@ public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { } } - @ObfuscatedName("bg") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-100656912" + descriptor = "(IIB)Z", + garbageValue = "57" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -302,12 +308,12 @@ public boolean tryLoadFile(int var1, int var2) { } } - @ObfuscatedName("bj") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "75" + descriptor = "(II)Z", + garbageValue = "-2143773006" ) - public boolean method1872(int var1) { + public boolean method1906(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -317,10 +323,10 @@ public boolean method1872(int var1) { } } - @ObfuscatedName("ct") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-247725441" + garbageValue = "-1627595520" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -332,10 +338,10 @@ public boolean tryLoadGroup(int var1) { } } - @ObfuscatedName("cf") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-78" + descriptor = "(I)Z", + garbageValue = "-796696946" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -354,10 +360,10 @@ public boolean isFullyLoaded() { return var1; } - @ObfuscatedName("cz") + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "-2047218130" + garbageValue = "-118859567" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -370,10 +376,10 @@ public byte[] takeFileFlat(int var1) { } } - @ObfuscatedName("cb") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(IIB)[B", - garbageValue = "8" + descriptor = "(III)[B", + garbageValue = "-1922174985" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -389,17 +395,17 @@ public byte[] getFile(int var1, int var2) { } } - byte[] var4 = class150.method785(this.files[var1][var2], false); + byte[] var4 = class126.method699(this.files[var1][var2], false); return var4; } else { return null; } } - @ObfuscatedName("cs") + @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "2068434253" + garbageValue = "-893648028" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -412,10 +418,10 @@ public byte[] getFileFlat(int var1) { } } - @ObfuscatedName("cj") + @ObfuscatedName("cm") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1146410571" + garbageValue = "76530715" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { @@ -424,28 +430,28 @@ public int[] getGroupFileIds(int var1) { @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-637205539" + descriptor = "(IB)I", + garbageValue = "11" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files != null && var1 < this.files.length && this.files[var1] != null ? this.files[var1].length : 0; } - @ObfuscatedName("cw") + @ObfuscatedName("cs") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-76" + garbageValue = "-92" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; } - @ObfuscatedName("ce") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-120" + descriptor = "(I)V", + garbageValue = "64500147" ) @Export("clearGroups") public void clearGroups() { @@ -455,10 +461,10 @@ public void clearGroups() { } - @ObfuscatedName("cq") + @ObfuscatedName("cr") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-50" + garbageValue = "1" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -468,10 +474,10 @@ public void clearFilesGroup(int var1) { } - @ObfuscatedName("cm") + @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "321577490" + descriptor = "(B)V", + garbageValue = "68" ) @Export("clearFiles") public void clearFiles() { @@ -485,10 +491,10 @@ public void clearFiles() { } - @ObfuscatedName("ca") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(I[II)Z", - garbageValue = "512786407" + descriptor = "(I[IB)Z", + garbageValue = "-93" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -512,24 +518,25 @@ boolean buildFiles(int var1, int[] var2) { } else { byte[] var21; if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) { - var21 = class150.method785(this.groups[var1], true); + var21 = class126.method699(this.groups[var1], true); Buffer var8 = new Buffer(var21); var8.xteaDecrypt(var2, 5, var8.array.length); } else { - var21 = class150.method785(this.groups[var1], false); + var21 = class126.method699(this.groups[var1], false); } - byte[] var24 = class304.decompressBytes(var21); + byte[] var25 = class53.decompressBytes(var21); if (this.releaseGroups) { this.groups[var1] = null; } + int var10; if (var3 > 1) { - int var9 = var24.length; + int var9 = var25.length; --var9; - int var10 = var24[var9] & 255; + var10 = var25[var9] & 255; var9 -= var10 * var3 * 4; - Buffer var11 = new Buffer(var24); + Buffer var11 = new Buffer(var25); int[] var12 = new int[var3]; var11.offset = var9; @@ -544,10 +551,10 @@ boolean buildFiles(int var1, int[] var2) { } } - byte[][] var22 = new byte[var3][]; + byte[][] var23 = new byte[var3][]; for (var14 = 0; var14 < var3; ++var14) { - var22[var14] = new byte[var12[var14]]; + var23[var14] = new byte[var12[var14]]; var12[var14] = 0; } @@ -560,7 +567,7 @@ boolean buildFiles(int var1, int[] var2) { for (var17 = 0; var17 < var3; ++var17) { var16 += var11.readInt(); - System.arraycopy(var24, var14, var22[var17], var12[var17], var16); + System.arraycopy(var25, var14, var23[var17], var12[var17], var16); var12[var17] += var16; var14 += var16; } @@ -569,7 +576,7 @@ boolean buildFiles(int var1, int[] var2) { for (var15 = 0; var15 < var3; ++var15) { if (!this.shallowFiles) { var17 = var4[var15]; - byte[] var19 = var22[var15]; + byte[] var19 = var23[var15]; Object var18; if (var19 == null) { var18 = null; @@ -583,13 +590,25 @@ boolean buildFiles(int var1, int[] var2) { var5[var17] = var18; } else { - var5[var4[var15]] = var22[var15]; + var5[var4[var15]] = var23[var15]; } } } else if (!this.shallowFiles) { - var5[var4[0]] = MusicPatchNode.method1657(var24, false); + var10 = var4[0]; + Object var26; + if (var25 == null) { + var26 = null; + } else if (var25.length > 136) { + DirectByteArrayCopier var27 = new DirectByteArrayCopier(); + var27.set(var25); + var26 = var27; + } else { + var26 = var25; + } + + var5[var10] = var26; } else { - var5[var4[0]] = var24; + var5[var4[0]] = var25; } return true; @@ -597,109 +616,344 @@ boolean buildFiles(int var1, int[] var2) { } } - @ObfuscatedName("cx") + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "-18" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-1972103558" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(PcmPlayer.hashString(var1)); + return this.groupNameHashTable.get(WorldMapElement.hashString(var1)); } - @ObfuscatedName("co") + @ObfuscatedName("cp") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)I", - garbageValue = "91721922" + garbageValue = "22201919" ) @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(PcmPlayer.hashString(var2)); + return this.fileNameHashTables[var1].get(WorldMapElement.hashString(var2)); } - @ObfuscatedName("cu") + @ObfuscatedName("cv") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "831469561" + garbageValue = "978478615" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(PcmPlayer.hashString(var1)); + int var3 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(PcmPlayer.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(WorldMapElement.hashString(var2)); return var4 >= 0; } } - @ObfuscatedName("cr") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;B)[B", - garbageValue = "68" + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", + garbageValue = "1446262093" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(PcmPlayer.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(PcmPlayer.hashString(var2)); + int var3 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(WorldMapElement.hashString(var2)); return this.takeFile(var3, var4); } - @ObfuscatedName("cd") + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;S)Z", - garbageValue = "238" + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "-254123457" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(PcmPlayer.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(PcmPlayer.hashString(var2)); + int var3 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(WorldMapElement.hashString(var2)); return this.tryLoadFile(var3, var4); } - @ObfuscatedName("cy") + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "656064124" + descriptor = "(Ljava/lang/String;B)Z", + garbageValue = "64" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(PcmPlayer.hashString(var1)); + int var2 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); return this.tryLoadGroup(var2); } - @ObfuscatedName("ck") + @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-946943017" + garbageValue = "-2037127897" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(PcmPlayer.hashString(var1)); + int var2 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); if (var2 >= 0) { this.loadRegionFromGroup(var2); } } - @ObfuscatedName("cl") + @ObfuscatedName("ci") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1785019666" + garbageValue = "-1703515273" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(PcmPlayer.hashString(var1)); + int var2 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); return this.groupLoadPercent(var2); } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(II)Lhh;", + garbageValue = "-2101462016" + ) + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = class13.InvDefinition_archive.takeFile(5, var0); + var1 = new InvDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lto;II)V", + garbageValue = "-312425420" + ) + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; + if (var2) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); + Player var4 = Client.players[var1]; + if (var3 == 0) { + if (var2) { + var4.hasMovementPending = false; + } else if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (class47.baseY + var4.pathY[0] >> 13) + (UrlRequester.baseX + var4.pathX[0] >> 13 << 14); + if (var4.movingOrientation != -1) { + Players.Players_orientations[var1] = var4.movingOrientation; + } else { + Players.Players_orientations[var1] = var4.orientation; + } + + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { + KitDefinition.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { + var5 = var0.readBits(3); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + --var6; + --var7; + } else if (var5 == 1) { + --var7; + } else if (var5 == 2) { + ++var6; + --var7; + } else if (var5 == 3) { + --var6; + } else if (var5 == 4) { + ++var6; + } else if (var5 == 5) { + --var6; + ++var7; + } else if (var5 == 6) { + ++var7; + } else if (var5 == 7) { + ++var6; + ++var7; + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.hasMovementPending = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.hasMovementPending = false; + var4.move(var6, var7, Players.playerMovementSpeeds[var1]); + } + } else { + var4.resetPath(var6, var7); + var4.hasMovementPending = false; + } + + } else if (var3 == 2) { + var5 = var0.readBits(4); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + var6 -= 2; + var7 -= 2; + } else if (var5 == 1) { + --var6; + var7 -= 2; + } else if (var5 == 2) { + var7 -= 2; + } else if (var5 == 3) { + ++var6; + var7 -= 2; + } else if (var5 == 4) { + var6 += 2; + var7 -= 2; + } else if (var5 == 5) { + var6 -= 2; + --var7; + } else if (var5 == 6) { + var6 += 2; + --var7; + } else if (var5 == 7) { + var6 -= 2; + } else if (var5 == 8) { + var6 += 2; + } else if (var5 == 9) { + var6 -= 2; + ++var7; + } else if (var5 == 10) { + var6 += 2; + ++var7; + } else if (var5 == 11) { + var6 -= 2; + var7 += 2; + } else if (var5 == 12) { + --var6; + var7 += 2; + } else if (var5 == 13) { + var7 += 2; + } else if (var5 == 14) { + ++var6; + var7 += 2; + } else if (var5 == 15) { + var6 += 2; + var7 += 2; + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.hasMovementPending = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.hasMovementPending = false; + var4.move(var6, var7, Players.playerMovementSpeeds[var1]); + } + } else { + var4.resetPath(var6, var7); + var4.hasMovementPending = false; + } + + } else { + var5 = var0.readBits(1); + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { + var6 = var0.readBits(12); + var7 = var6 >> 10; + var8 = var6 >> 5 & 31; + if (var8 > 15) { + var8 -= 32; + } + + var9 = var6 & 31; + if (var9 > 15) { + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; + var11 = var9 + var4.pathY[0]; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.hasMovementPending = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.hasMovementPending = false; + var4.move(var10, var11, Players.playerMovementSpeeds[var1]); + } + } else { + var4.resetPath(var10, var11); + var4.hasMovementPending = false; + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + HealthBar.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (var8 + UrlRequester.baseX + var4.pathX[0] & 16383) - UrlRequester.baseX; + var11 = (var9 + class47.baseY + var4.pathY[0] & 16383) - class47.baseY; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.hasMovementPending = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.hasMovementPending = false; + var4.move(var10, var11, Players.playerMovementSpeeds[var1]); + } + } else { + var4.resetPath(var10, var11); + var4.hasMovementPending = false; + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + HealthBar.Client_plane = var4.plane; + } + + } + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/AbstractByteArrayCopier.java b/osrs/src/main/java/AbstractByteArrayCopier.java index 2e7e67262..e23a753d3 100644 --- a/osrs/src/main/java/AbstractByteArrayCopier.java +++ b/osrs/src/main/java/AbstractByteArrayCopier.java @@ -3,25 +3,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("me") +@ObfuscatedName("ma") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { AbstractByteArrayCopier() { } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-2134030911" + garbageValue = "-962589916" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "-379413774" + garbageValue = "1426025249" ) @Export("set") public abstract void set(byte[] var1); -} + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIB)Lco;", + garbageValue = "64" + ) + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/AbstractFont.java b/osrs/src/main/java/AbstractFont.java index 5784b841d..2c4941769 100644 --- a/osrs/src/main/java/AbstractFont.java +++ b/osrs/src/main/java/AbstractFont.java @@ -1,79 +1,80 @@ -import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pq") +import java.util.Random; + +@ObfuscatedName("pk") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "[Luu;" + descriptor = "[Luk;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("pixels") byte[][] pixels; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("advances") int[] advances; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("widths") int[] widths; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("heights") int[] heights; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("topBearings") int[] topBearings; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("ascent") public int ascent; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("kerning") byte[] kerning; @@ -123,15 +124,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.readMetrics(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; @@ -193,7 +194,7 @@ void readMetrics(byte[] var1) { if (var13 != 32 && var13 != 160) { for (var8 = 0; var8 < 256; ++var8) { if (var8 != 32 && var8 != 160) { - this.kerning[var8 + (var13 << 8)] = (byte)method2041(var11, var12, var4, this.advances, var10, var13, var8); + this.kerning[var8 + (var13 << 8)] = (byte)method2080(var11, var12, var4, this.advances, var10, var13, var8); } } } @@ -204,17 +205,17 @@ void readMetrics(byte[] var1) { } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("charWidth") public int charWidth(char var1) { if (var1 == 160) { var1 = ' '; } - return this.advances[class313.charToByteCp1252(var1) & 255]; + return this.advances[class348.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { @@ -238,7 +239,7 @@ public int stringWidth(String var1) { if (!var7.equals("gt")) { if (var7.startsWith("img=")) { try { - int var8 = class306.method1584(var7.substring(4)); + int var8 = HealthBarUpdate.method524(var7.substring(4)); var4 += AbstractFont_modIconSprites[var8].width; var3 = -1; } catch (Exception var10) { @@ -256,7 +257,7 @@ public int stringWidth(String var1) { } if (var2 == -1) { - var4 += this.advances[(char)(class313.charToByteCp1252(var6) & 255)]; + var4 += this.advances[(char)(class348.charToByteCp1252(var6) & 255)]; if (this.kerning != null && var3 != -1) { var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +271,7 @@ public int stringWidth(String var1) { } } - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { @@ -321,7 +322,7 @@ public int breakLines(String var1, int[] var2, String[] var3) { var11 = '>'; } else if (var16.startsWith("img=")) { try { - int var17 = class306.method1584(var16.substring(4)); + int var17 = HealthBarUpdate.method524(var16.substring(4)); var4 += AbstractFont_modIconSprites[var17].width; var11 = 0; } catch (Exception var20) { @@ -375,7 +376,7 @@ public int breakLines(String var1, int[] var2, String[] var3) { } } - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); @@ -391,17 +392,17 @@ public int lineWidth(String var1, int var2) { return var4; } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;II)Lrk;" + descriptor = "(IILjava/lang/String;II)Lrb;" ) - public Bounds method2048(int var1, int var2, String var3, int var4, int var5) { + public Bounds method2087(int var1, int var2, String var3, int var4, int var5) { if (var3 != null && var3.length() >= var2 + var1) { int var6 = var4 - this.stringWidth(var3) / 2; var6 += this.stringWidth(var3.substring(0, var1)); @@ -414,7 +415,7 @@ public Bounds method2048(int var1, int var2, String var3, int var4, int var5) { } } - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -423,7 +424,7 @@ public void draw(String var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -433,7 +434,7 @@ public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int v } } - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -442,7 +443,7 @@ public void drawRightAligned(String var1, int var2, int var3, int var4, int var5 } } - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -451,14 +452,14 @@ public void drawCentered(String var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - return this.method2054(var1, var2, var3, var4, var5, var6, var7, 256, var8, var9, var10); + return this.method2093(var1, var2, var3, var4, var5, var6, var7, 256, var8, var9, var10); } - @ObfuscatedName("an") - public int method2054(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { + @ObfuscatedName("aj") + public int method2093(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { if (var1 == null) { return 0; } else { @@ -522,24 +523,24 @@ public int method2054(String var1, int var2, int var3, int var4, int var5, int v } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lpo;IIIII)Lsf;" + descriptor = "(Lpl;IIIII)Lss;" ) - public class486 method2055(class399 var1, int var2, int var3, int var4, int var5, int var6) { - if (!var1.method2076()) { + public class485 method2094(class398 var1, int var2, int var3, int var4, int var5, int var6) { + if (!var1.method2115()) { this.reset(var4, var5); var3 -= this.ascent; - for (int var7 = 0; var7 < var1.method2077(); ++var7) { - class397 var8 = var1.method2081(var7); - if (var6 != -1 && var8.field3672 > var6) { - return new class486(var8.field3673, var8.field3672); + for (int var7 = 0; var7 < var1.method2116(); ++var7) { + class396 var8 = var1.method2120(var7); + if (var6 != -1 && var8.field3682 > var6) { + return new class485(var8.field3681, var8.field3682); } - char var9 = var8.field3671; + char var9 = var8.field3680; if (var9 != '\n') { - if (var1.method2075(var7)) { + if (var1.method2114(var7)) { var9 = '*'; } @@ -548,8 +549,8 @@ public class486 method2055(class399 var1, int var2, int var3, int var4, int var5 var9 = ' '; } - int var10 = var2 + var8.field3673; - int var11 = var3 + var8.field3672; + int var10 = var2 + var8.field3681; + int var11 = var3 + var8.field3682; int var12 = this.widths[var9]; int var13 = this.heights[var9]; if (AbstractFont_shadow != -1) { @@ -562,16 +563,16 @@ public class486 method2055(class399 var1, int var2, int var3, int var4, int var5 } } - return var1.method2080(); + return var1.method2119(); } - @ObfuscatedName("ai") - public void method2056(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { + @ObfuscatedName("aw") + public void method2095(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { if (var1 != null) { this.reset(var4, var5); int[] var8 = null; if (var7 != null) { - var8 = this.method2061(var7, var1.length()); + var8 = this.method2100(var7, var1.length()); } int[] var9 = new int[var1.length()]; @@ -580,17 +581,17 @@ public void method2056(String var1, int var2, int var3, int var4, int var5, int var9[var10] = (int)(Math.sin((double)var10 / 2.0D + (double)var6 / 5.0D) * 5.0D); } - this.method2067(var1, var2 - this.stringWidth(var1) / 2, var3, var8, (int[])null, var9); + this.method2106(var1, var2 - this.stringWidth(var1) / 2, var3, var8, (int[])null, var9); } } - @ObfuscatedName("al") - public void method2057(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { + @ObfuscatedName("ak") + public void method2096(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { if (var1 != null) { this.reset(var4, var5); int[] var8 = null; if (var7 != null) { - var8 = this.method2061(var7, var1.length()); + var8 = this.method2100(var7, var1.length()); } int[] var9 = new int[var1.length()]; @@ -601,17 +602,17 @@ public void method2057(String var1, int var2, int var3, int var4, int var5, int var10[var11] = (int)(Math.sin((double)var11 / 3.0D + (double)var6 / 5.0D) * 5.0D); } - this.method2067(var1, var2 - this.stringWidth(var1) / 2, var3, var8, var9, var10); + this.method2106(var1, var2 - this.stringWidth(var1) / 2, var3, var8, var9, var10); } } - @ObfuscatedName("bd") - public void method2058(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int[] var8) { + @ObfuscatedName("bh") + public void method2097(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int[] var8) { if (var1 != null) { this.reset(var4, var5); int[] var9 = null; if (var8 != null) { - var9 = this.method2061(var8, var1.length()); + var9 = this.method2100(var8, var1.length()); } double var10 = 7.0D - (double)var7 / 8.0D; @@ -625,38 +626,38 @@ public void method2058(String var1, int var2, int var3, int var4, int var5, int var12[var13] = (int)(Math.sin((double)var13 / 1.5D + (double)var6 / 1.0D) * var10); } - this.method2067(var1, var2 - this.stringWidth(var1) / 2, var3, var9, (int[])null, var12); + this.method2106(var1, var2 - this.stringWidth(var1) / 2, var3, var9, (int[])null, var12); } } - @ObfuscatedName("bb") - public void method2059(String var1, int var2, int var3, int var4, int var5, int[] var6) { + @ObfuscatedName("bj") + public void method2098(String var1, int var2, int var3, int var4, int var5, int[] var6) { if (var1 != null) { this.reset(var4, var5); int[] var7 = null; if (var6 != null) { - var7 = this.method2061(var6, var1.length()); + var7 = this.method2100(var6, var1.length()); } - this.method2067(var1, var2 - this.stringWidth(var1) / 2, var3, var7, (int[])null, (int[])null); + this.method2106(var1, var2 - this.stringWidth(var1) / 2, var3, var7, (int[])null, (int[])null); } } - @ObfuscatedName("bn") - public void method2060(String var1, int var2, int var3, int var4, int var5, int[] var6) { + @ObfuscatedName("bk") + public void method2099(String var1, int var2, int var3, int var4, int var5, int[] var6) { if (var1 != null) { this.reset(var4, var5); int[] var7 = null; if (var6 != null) { - var7 = this.method2061(var6, var1.length()); + var7 = this.method2100(var6, var1.length()); } - this.method2067(var1, var2, var3, var7, (int[])null, (int[])null); + this.method2106(var1, var2, var3, var7, (int[])null, (int[])null); } } - @ObfuscatedName("ba") - int[] method2061(int[] var1, int var2) { + @ObfuscatedName("bv") + int[] method2100(int[] var1, int var2) { if (var2 == 0) { return null; } else { @@ -671,7 +672,7 @@ int[] method2061(int[] var1, int var2) { } } - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -688,11 +689,11 @@ public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, } } - this.method2067(var1, var2, var3, (int[])null, var7, (int[])null); + this.method2106(var1, var2, var3, (int[])null, var7, (int[])null); } } - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; @@ -706,7 +707,7 @@ void reset(int var1, int var2) { AbstractFont_justificationCurrent = 0; } - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("decodeTag") void decodeTag(String var1) { try { @@ -714,13 +715,13 @@ void decodeTag(String var1) { String var3; if (var1.startsWith("col=")) { var3 = var1.substring(4); - var2 = ClanChannel.method854(var3, 16, true); + var2 = DevicePcmPlayerProvider.method75(var3, 16, true); AbstractFont_color = var2; } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { var3 = var1.substring(4); - var2 = ClanChannel.method854(var3, 16, true); + var2 = DevicePcmPlayerProvider.method75(var3, 16, true); AbstractFont_strike = var2; } else if (var1.equals("str")) { AbstractFont_strike = 8388608; @@ -728,7 +729,7 @@ void decodeTag(String var1) { AbstractFont_strike = -1; } else if (var1.startsWith("u=")) { var3 = var1.substring(2); - var2 = ClanChannel.method854(var3, 16, true); + var2 = DevicePcmPlayerProvider.method75(var3, 16, true); AbstractFont_underline = var2; } else if (var1.equals("u")) { AbstractFont_underline = 0; @@ -736,7 +737,7 @@ void decodeTag(String var1) { AbstractFont_underline = -1; } else if (var1.startsWith("shad=")) { var3 = var1.substring(5); - var2 = ClanChannel.method854(var3, 16, true); + var2 = DevicePcmPlayerProvider.method75(var3, 16, true); AbstractFont_shadow = var2; } else if (var1.equals("shad")) { AbstractFont_shadow = 0; @@ -750,7 +751,7 @@ void decodeTag(String var1) { } - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; @@ -773,7 +774,7 @@ void calculateLineJustification(String var1, int var2) { } - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; @@ -782,7 +783,7 @@ void draw0(String var1, int var2, int var3) { for (int var6 = 0; var6 < var1.length(); ++var6) { if (var1.charAt(var6) != 0) { - char var7 = (char)(class313.charToByteCp1252(var1.charAt(var6)) & 255); + char var7 = (char)(class348.charToByteCp1252(var1.charAt(var6)) & 255); if (var7 == '<') { var4 = var6; } else { @@ -796,7 +797,7 @@ void draw0(String var1, int var2, int var3) { if (!var8.equals("gt")) { if (var8.startsWith("img=")) { try { - var9 = class306.method1584(var8.substring(4)); + var9 = HealthBarUpdate.method524(var8.substring(4)); IndexedSprite var10 = AbstractFont_modIconSprites[var9]; var10.drawAt(var2, var3 + this.ascent - var10.height); var2 += var10.width; @@ -862,8 +863,8 @@ void draw0(String var1, int var2, int var3) { } - @ObfuscatedName("bo") - void method2067(String var1, int var2, int var3, int[] var4, int[] var5, int[] var6) { + @ObfuscatedName("bf") + void method2106(String var1, int var2, int var3, int[] var4, int[] var5, int[] var6) { var3 -= this.ascent; int var7 = -1; int var8 = -1; @@ -871,7 +872,7 @@ void method2067(String var1, int var2, int var3, int[] var4, int[] var5, int[] v for (int var10 = 0; var10 < var1.length(); ++var10) { if (var1.charAt(var10) != 0) { - char var11 = (char)(class313.charToByteCp1252(var1.charAt(var10)) & 255); + char var11 = (char)(class348.charToByteCp1252(var1.charAt(var10)) & 255); if (var11 == '<') { var7 = var10; } else { @@ -900,7 +901,7 @@ void method2067(String var1, int var2, int var3, int[] var4, int[] var5, int[] v } ++var9; - var15 = class306.method1584(var12.substring(4)); + var15 = HealthBarUpdate.method524(var12.substring(4)); IndexedSprite var16 = AbstractFont_modIconSprites[var15]; var16.drawAt(var13 + var2, var14 + (var3 + this.ascent - var16.height)); var2 += var16.width; @@ -986,8 +987,8 @@ void method2067(String var1, int var2, int var3, int[] var4, int[] var5, int[] v } - @ObfuscatedName("ap") - static int method2041(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("af") + static int method2080(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { int var7 = var2[var5]; int var8 = var7 + var4[var5]; int var9 = var2[var6]; @@ -1022,7 +1023,7 @@ static int method2041(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[ return -var13; } - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); @@ -1051,7 +1052,7 @@ public static String escapeBrackets(String var0) { return var6.toString(); } - @ObfuscatedName("br") + @ObfuscatedName("bq") @Export("AbstractFont_drawGlyph") static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -1093,7 +1094,7 @@ static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, in } } - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("AbstractFont_placeGlyph") static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -1141,7 +1142,7 @@ static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, } - @ObfuscatedName("be") + @ObfuscatedName("bl") @Export("AbstractFont_drawGlyphAlpha") static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -1183,7 +1184,7 @@ static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var } } - @ObfuscatedName("bc") + @ObfuscatedName("bp") @Export("AbstractFont_placeGlyphAlpha") static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; @@ -1204,4 +1205,4 @@ static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/AbstractRasterProvider.java b/osrs/src/main/java/AbstractRasterProvider.java index 68186b8a1..b3862034f 100644 --- a/osrs/src/main/java/AbstractRasterProvider.java +++ b/osrs/src/main/java/AbstractRasterProvider.java @@ -3,56 +3,56 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uk") +@ObfuscatedName("uq") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("pixels") public int[] pixels; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("width") public int width; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("height") public int height; - @ObfuscatedName("aj") - protected float[] field4179; + @ObfuscatedName("ai") + protected float[] field4225; protected AbstractRasterProvider() { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2103103659" + descriptor = "(IIB)V", + garbageValue = "-46" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-93" + descriptor = "(IIIII)V", + garbageValue = "1065945289" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("at") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1721609371" + descriptor = "(B)V", + garbageValue = "-109" ) @Export("apply") public final void apply() { - Rasterizer2D.method2601(this.pixels, this.width, this.height, this.field4179); + Rasterizer2D.method2620(this.pixels, this.width, this.height, this.field4225); } - @ObfuscatedName("ah") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "24429174" + descriptor = "(ZB)V", + garbageValue = "-37" ) - public final void method2627(boolean var1) { - this.field4179 = var1 ? new float[this.width * this.height + 1] : null; + public final void method2646(boolean var1) { + this.field4225 = var1 ? new float[this.height * this.width + 1] : null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/AbstractSocket.java b/osrs/src/main/java/AbstractSocket.java index fdd15925c..ed862a179 100644 --- a/osrs/src/main/java/AbstractSocket.java +++ b/osrs/src/main/java/AbstractSocket.java @@ -1,92 +1,98 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qh") +import java.io.IOException; +import java.util.Iterator; + +@ObfuscatedName("qi") @Implements("AbstractSocket") public abstract class AbstractSocket { + @ObfuscatedName("ii") + @ObfuscatedSignature( + descriptor = "Lqi;" + ) + static AbstractSocket field3819; + AbstractSocket() { } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1802443781" + descriptor = "(IB)Z", + garbageValue = "-67" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1927697779" + garbageValue = "1947351494" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "59" + descriptor = "(I)I", + garbageValue = "969166986" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "435794101" + descriptor = "([BIIS)I", + garbageValue = "206" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1992519516" + garbageValue = "1371855899" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1268085940" + garbageValue = "-1457160931" ) @Export("close") public abstract void close(); - @ObfuscatedName("ay") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(IB)Ltk;", - garbageValue = "16" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-148355488" ) - @Export("getDbTableType") - public static DbTableType getDbTableType(int var0) { - DbTableType var1 = (DbTableType)DbTableType.DBTableType_cache.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = DbTableType.field4098.takeFile(39, var0); - var1 = new DbTableType(); - if (var2 != null) { - var1.method2480(new Buffer(var2)); - } - - var1.method2482(); - DbTableType.DBTableType_cache.put(var1, (long)var0); - return var1; - } + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; } - @ObfuscatedName("ar") + @ObfuscatedName("nn") @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "19989" + descriptor = "(I)V", + garbageValue = "-99692388" ) - public static int method2227(int var0) { - return class465.field3895[var0 & 16383]; + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromIgnored(); + } + + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.invalidateIgnoreds(); + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/AbstractSound.java b/osrs/src/main/java/AbstractSound.java index f8c7c6d92..3bc0cb139 100644 --- a/osrs/src/main/java/AbstractSound.java +++ b/osrs/src/main/java/AbstractSound.java @@ -2,13 +2,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("cm") +@ObfuscatedName("cp") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("position") int position; AbstractSound() { } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/AbstractUserComparator.java b/osrs/src/main/java/AbstractUserComparator.java index ccdb19a85..bb0cc22ba 100644 --- a/osrs/src/main/java/AbstractUserComparator.java +++ b/osrs/src/main/java/AbstractUserComparator.java @@ -1,23 +1,30 @@ -import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.Comparator; + @ObfuscatedName("qz") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("ay") + @ObfuscatedName("tk") + @ObfuscatedSignature( + descriptor = "Lui;" + ) + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("ae") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } - @ObfuscatedName("ag") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "2023236765" + garbageValue = "-2074845369" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -29,10 +36,10 @@ final void addComparator(Comparator var1) { } - @ObfuscatedName("az") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lqe;Lqe;I)I", - garbageValue = "1411068838" + descriptor = "(Lqs;Lqs;I)I", + garbageValue = "1850684132" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -44,514 +51,4 @@ protected final int compareUser(User var1, User var2) { public boolean equals(Object var1) { return super.equals(var1); } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Liz;[Lij;I)V", - garbageValue = "875823996" - ) - static final void method2194(Scene var0, CollisionMap[] var1) { - int var2; - int var3; - int var4; - int var5; - for (var2 = 0; var2 < 4; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { - var5 = var2; - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 - 1; - } - - if (var5 >= 0) { - var1[var5].setBlockedByFloor(var3, var4); - } - } - } - } - } - - Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; - if (Tiles.rndHue < -8) { - Tiles.rndHue = -8; - } - - if (Tiles.rndHue > 8) { - Tiles.rndHue = 8; - } - - Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; - if (Tiles.rndLightness < -16) { - Tiles.rndLightness = -16; - } - - if (Tiles.rndLightness > 16) { - Tiles.rndLightness = 16; - } - - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int[] var10000; - int var17; - int var18; - for (var2 = 0; var2 < 4; ++var2) { - byte[][] var45 = InvDefinition.field1488[var2]; - boolean var52 = true; - boolean var53 = true; - boolean var6 = true; - boolean var7 = true; - boolean var8 = true; - var9 = (int)Math.sqrt(5100.0D); - var10 = var9 * 768 >> 8; - - int var20; - int var48; - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; - var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); - var16 = (var13 << 8) / var15; - var17 = 65536 / var15; - var18 = (var14 << 8) / var15; - var48 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; - var20 = (var45[var12 - 1][var11] >> 2) + (var45[var12][var11 - 1] >> 2) + (var45[var12 + 1][var11] >> 3) + (var45[var12][var11 + 1] >> 3) + (var45[var12][var11] >> 1); - class135.field1283[var12][var11] = var48 - var20; - } - } - - for (var11 = 0; var11 < 104; ++var11) { - class172.Tiles_hue[var11] = 0; - GameBuild.Tiles_saturation[var11] = 0; - Tiles.Tiles_lightness[var11] = 0; - Language.Tiles_hueMultiplier[var11] = 0; - class159.field1403[var11] = 0; - } - - for (var11 = -5; var11 < 109; ++var11) { - for (var12 = 0; var12 < 104; ++var12) { - var13 = var11 + 5; - int var10002; - if (var13 >= 0 && var13 < 104) { - var14 = (int)Client.method359(15); - var15 = Tiles.Tiles_underlays[var2][var13][var12] & var14; - if (var15 > 0) { - var17 = var15 - 1; - FloorUnderlayDefinition var46 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var17); - FloorUnderlayDefinition var47; - if (var46 != null) { - var47 = var46; - } else { - byte[] var19 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var17); - var46 = new FloorUnderlayDefinition(); - if (var19 != null) { - var46.decode(new Buffer(var19), var17); - } - - var46.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var46, (long)var17); - var47 = var46; - } - - var10000 = class172.Tiles_hue; - var10000[var12] += var47.hue; - var10000 = GameBuild.Tiles_saturation; - var10000[var12] += var47.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var12] += var47.lightness; - var10000 = Language.Tiles_hueMultiplier; - var10000[var12] += var47.hueMultiplier; - var10002 = class159.field1403[var12]++; - } - } - - var14 = var11 - 5; - if (var14 >= 0 && var14 < 104) { - var15 = (int)Client.method359(15); - var16 = Tiles.Tiles_underlays[var2][var14][var12] & var15; - if (var16 > 0) { - var18 = var16 - 1; - FloorUnderlayDefinition var58 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var18); - FloorUnderlayDefinition var50; - if (var58 != null) { - var50 = var58; - } else { - byte[] var51 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var18); - var58 = new FloorUnderlayDefinition(); - if (var51 != null) { - var58.decode(new Buffer(var51), var18); - } - - var58.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var58, (long)var18); - var50 = var58; - } - - var10000 = class172.Tiles_hue; - var10000[var12] -= var50.hue; - var10000 = GameBuild.Tiles_saturation; - var10000[var12] -= var50.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var12] -= var50.lightness; - var10000 = Language.Tiles_hueMultiplier; - var10000[var12] -= var50.hueMultiplier; - var10002 = class159.field1403[var12]--; - } - } - } - - if (var11 >= 1 && var11 < 103) { - var12 = 0; - var13 = 0; - var14 = 0; - var15 = 0; - var16 = 0; - - for (var17 = -5; var17 < 109; ++var17) { - var18 = var17 + 5; - if (var18 >= 0 && var18 < 104) { - var12 += class172.Tiles_hue[var18]; - var13 += GameBuild.Tiles_saturation[var18]; - var14 += Tiles.Tiles_lightness[var18]; - var15 += Language.Tiles_hueMultiplier[var18]; - var16 += class159.field1403[var18]; - } - - var48 = var17 - 5; - if (var48 >= 0 && var48 < 104) { - var12 -= class172.Tiles_hue[var48]; - var13 -= GameBuild.Tiles_saturation[var48]; - var14 -= Tiles.Tiles_lightness[var48]; - var15 -= Language.Tiles_hueMultiplier[var48]; - var16 -= class159.field1403[var48]; - } - - if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { - if (var2 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var2; - } - - var20 = (int)Client.method359(15); - int var21 = Tiles.Tiles_underlays[var2][var11][var17] & var20; - int var22 = Tiles.Tiles_overlays[var2][var11][var17] & var20; - if (var21 > 0 || var22 > 0) { - int var23 = Tiles.Tiles_heights[var2][var11][var17]; - int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17]; - int var25 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; - int var26 = Tiles.Tiles_heights[var2][var11][var17 + 1]; - int var27 = class135.field1283[var11][var17]; - int var28 = class135.field1283[var11 + 1][var17]; - int var29 = class135.field1283[var11 + 1][var17 + 1]; - int var30 = class135.field1283[var11][var17 + 1]; - int var31 = -1; - int var32 = -1; - int var33; - int var34; - if (var21 > 0) { - var33 = var12 * 256 / var15; - var34 = var13 / var16; - int var35 = var14 / var16; - var31 = class36.method173(var33, var34, var35); - var33 = var33 + Tiles.rndHue & 255; - var35 += Tiles.rndLightness; - if (var35 < 0) { - var35 = 0; - } else if (var35 > 255) { - var35 = 255; - } - - var32 = class36.method173(var33, var34, var35); - } - - if (var2 > 0) { - boolean var59 = true; - if (var21 == 0 && class19.Tiles_shapes[var2][var11][var17] != 0) { - var59 = false; - } - - if (var22 > 0 && !class131.method718(var22 - 1).hideUnderlay) { - var59 = false; - } - - if (var59 && var23 == var24 && var23 == var25 && var23 == var26) { - var10000 = BufferedNetSocket.field3806[var2][var11]; - var10000[var17] |= 2340; - } - } - - var33 = 0; - if (var32 != -1) { - var33 = Rasterizer3D.Rasterizer3D_colorPalette[class421.method2140(var32, 96)]; - } - - if (var22 == 0) { - var0.addTile(var2, var11, var17, 0, 0, -1, var23, var24, var25, var26, class421.method2140(var31, var27), class421.method2140(var31, var28), class421.method2140(var31, var29), class421.method2140(var31, var30), 0, 0, 0, 0, var33, 0); - } else { - var34 = class19.Tiles_shapes[var2][var11][var17] + 1; - byte var60 = UserComparator10.field1180[var2][var11][var17]; - int var37 = var22 - 1; - FloorOverlayDefinition var38 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var37); - FloorOverlayDefinition var36; - if (var38 != null) { - var36 = var38; - } else { - byte[] var39 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var37); - var38 = new FloorOverlayDefinition(); - if (var39 != null) { - var38.decode(new Buffer(var39), var37); - } - - var38.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var38, (long)var37); - var36 = var38; - } - - int var49 = var36.texture; - int var40; - int var41; - int var42; - int var43; - if (var49 >= 0) { - var41 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var49); - var40 = -1; - } else if (var36.primaryRgb == 16711935) { - var40 = -2; - var49 = -1; - var41 = -2; - } else { - var40 = class36.method173(var36.hue, var36.saturation, var36.lightness); - var42 = var36.hue + Tiles.rndHue & 255; - var43 = var36.lightness + Tiles.rndLightness; - if (var43 < 0) { - var43 = 0; - } else if (var43 > 255) { - var43 = 255; - } - - var41 = class36.method173(var42, var36.saturation, var43); - } - - var42 = 0; - if (var41 != -2) { - var42 = Rasterizer3D.Rasterizer3D_colorPalette[class271.method1502(var41, 96)]; - } - - if (var36.secondaryRgb != -1) { - var43 = var36.secondaryHue + Tiles.rndHue & 255; - int var44 = var36.secondaryLightness + Tiles.rndLightness; - if (var44 < 0) { - var44 = 0; - } else if (var44 > 255) { - var44 = 255; - } - - var41 = class36.method173(var43, var36.secondarySaturation, var44); - var42 = Rasterizer3D.Rasterizer3D_colorPalette[class271.method1502(var41, 96)]; - } - - var0.addTile(var2, var11, var17, var34, var60, var49, var23, var24, var25, var26, class421.method2140(var31, var27), class421.method2140(var31, var28), class421.method2140(var31, var29), class421.method2140(var31, var30), class271.method1502(var40, var27), class271.method1502(var40, var28), class271.method1502(var40, var29), class271.method1502(var40, var30), var33, var42); - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var0.setTileMinPlane(var2, var12, var11, class399.method2082(var2, var12, var11)); - } - } - - Tiles.Tiles_underlays[var2] = null; - Tiles.Tiles_overlays[var2] = null; - class19.Tiles_shapes[var2] = null; - UserComparator10.field1180[var2] = null; - InvDefinition.field1488[var2] = null; - } - - var0.method1242(-50, -10, -50); - - for (var2 = 0; var2 < 104; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var0.setLinkBelow(var2, var3); - } - } - } - - var2 = 1; - var3 = 2; - var4 = 4; - - for (var5 = 0; var5 < 4; ++var5) { - if (var5 > 0) { - var2 <<= 3; - var3 <<= 3; - var4 <<= 3; - } - - for (int var54 = 0; var54 <= var5; ++var54) { - for (int var55 = 0; var55 <= 104; ++var55) { - for (int var56 = 0; var56 <= 104; ++var56) { - short var57; - if ((BufferedNetSocket.field3806[var54][var56][var55] & var2) != 0) { - var9 = var55; - var10 = var55; - var11 = var54; - - for (var12 = var54; var9 > 0 && (BufferedNetSocket.field3806[var54][var56][var9 - 1] & var2) != 0; --var9) { - } - - while (var10 < 104 && (BufferedNetSocket.field3806[var54][var56][var10 + 1] & var2) != 0) { - ++var10; - } - - label364: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((BufferedNetSocket.field3806[var11 - 1][var56][var13] & var2) == 0) { - break label364; - } - } - - --var11; - } - - label353: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((BufferedNetSocket.field3806[var12 + 1][var56][var13] & var2) == 0) { - break label353; - } - } - - ++var12; - } - - var13 = (var12 + 1 - var11) * (var10 - var9 + 1); - if (var13 >= 8) { - var57 = 240; - var15 = Tiles.Tiles_heights[var12][var56][var9] - var57; - var16 = Tiles.Tiles_heights[var11][var56][var9]; - Scene.Scene_addOccluder(var5, 1, var56 * 128, var56 * 128, var9 * 128, var10 * 128 + 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = BufferedNetSocket.field3806[var17][var56]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((BufferedNetSocket.field3806[var54][var56][var55] & var3) != 0) { - var9 = var56; - var10 = var56; - var11 = var54; - - for (var12 = var54; var9 > 0 && (BufferedNetSocket.field3806[var54][var9 - 1][var55] & var3) != 0; --var9) { - } - - while (var10 < 104 && (BufferedNetSocket.field3806[var54][var10 + 1][var55] & var3) != 0) { - ++var10; - } - - label417: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((BufferedNetSocket.field3806[var11 - 1][var13][var55] & var3) == 0) { - break label417; - } - } - - --var11; - } - - label406: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((BufferedNetSocket.field3806[var12 + 1][var13][var55] & var3) == 0) { - break label406; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - if (var13 >= 8) { - var57 = 240; - var15 = Tiles.Tiles_heights[var12][var9][var55] - var57; - var16 = Tiles.Tiles_heights[var11][var9][var55]; - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var55 * 128, var55 * 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = BufferedNetSocket.field3806[var17][var18]; - var10000[var55] &= ~var3; - } - } - } - } - - if ((BufferedNetSocket.field3806[var54][var56][var55] & var4) != 0) { - var9 = var56; - var10 = var56; - var11 = var55; - - for (var12 = var55; var11 > 0 && (BufferedNetSocket.field3806[var54][var56][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (BufferedNetSocket.field3806[var54][var56][var12 + 1] & var4) != 0) { - ++var12; - } - - label470: - while (var9 > 0) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((BufferedNetSocket.field3806[var54][var9 - 1][var13] & var4) == 0) { - break label470; - } - } - - --var9; - } - - label459: - while (var10 < 104) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((BufferedNetSocket.field3806[var54][var10 + 1][var13] & var4) == 0) { - break label459; - } - } - - ++var10; - } - - if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { - var13 = Tiles.Tiles_heights[var54][var9][var11]; - Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); - - for (var14 = var9; var14 <= var10; ++var14) { - for (var15 = var11; var15 <= var12; ++var15) { - var10000 = BufferedNetSocket.field3806[var54][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/AbstractWorldMapData.java b/osrs/src/main/java/AbstractWorldMapData.java index e3f6982ef..01d061942 100644 --- a/osrs/src/main/java/AbstractWorldMapData.java +++ b/osrs/src/main/java/AbstractWorldMapData.java @@ -1,84 +1,85 @@ -import java.util.LinkedList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +import java.util.LinkedList; + +@ObfuscatedName("ke") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("as") - int field2408; - @ObfuscatedName("aj") - int field2405; - @ObfuscatedName("ag") + @ObfuscatedName("ac") + int field2429; + @ObfuscatedName("ai") + int field2432; + @ObfuscatedName("az") @Export("regionX") int regionX; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("regionY") int regionY; - @ObfuscatedName("av") - int field2410; - @ObfuscatedName("ap") + @ObfuscatedName("aa") + int field2428; + @ObfuscatedName("af") @Export("planes") int planes; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("groupId") int groupId; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("fileId") int fileId; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("aa") - byte[][][] field2402; - @ObfuscatedName("au") - byte[][][] field2403; - @ObfuscatedName("ae") + @ObfuscatedName("ar") + byte[][][] field2427; + @ObfuscatedName("ab") + byte[][][] field2426; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "[[[[Lkk;" + descriptor = "[[[[Lkn;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("ab") - boolean field2400; - @ObfuscatedName("ad") - boolean field2401; + @ObfuscatedName("am") + boolean field2424; + @ObfuscatedName("ax") + boolean field2425; AbstractWorldMapData() { this.groupId = -1; this.fileId = -1; new LinkedList(); - this.field2400 = false; - this.field2401 = false; + this.field2424 = false; + this.field2425 = false; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "81" + descriptor = "(Ltm;I)V", + garbageValue = "2049371979" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("ac") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-4" + descriptor = "(I)Z", + garbageValue = "2138999943" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2400 && this.field2401; + return this.field2424 && this.field2425; } @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lnd;I)V", - garbageValue = "-1020767316" + descriptor = "(Lnu;I)V", + garbageValue = "-1524601998" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -86,53 +87,53 @@ void loadGeography(AbstractArchive var1) { byte[] var2 = var1.takeFile(this.groupId, this.fileId); if (var2 != null) { this.readGeography(new Buffer(var2)); - this.field2400 = true; - this.field2401 = true; + this.field2424 = true; + this.field2425 = true; } } } - @ObfuscatedName("an") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-1792319302" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field2402 = null; - this.field2403 = null; + this.field2427 = null; + this.field2426 = null; this.decorations = null; - this.field2400 = false; - this.field2401 = false; + this.field2424 = false; + this.field2425 = false; } - @ObfuscatedName("af") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(IILty;B)V", - garbageValue = "77" + descriptor = "(IILtm;I)V", + garbageValue = "-938397050" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); if (var4 != 0) { if ((var4 & 1) != 0) { - this.method1490(var1, var2, var3, var4); + this.method1522(var1, var2, var3, var4); } else { - this.method1491(var1, var2, var3, var4); + this.method1523(var1, var2, var3, var4); } } } - @ObfuscatedName("ai") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(IILty;IB)V", - garbageValue = "12" + descriptor = "(IILtm;IS)V", + garbageValue = "23970" ) - void method1490(int var1, int var2, Buffer var3, int var4) { + void method1522(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; if (var5) { this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedShort(); @@ -141,12 +142,12 @@ void method1490(int var1, int var2, Buffer var3, int var4) { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedShort(); } - @ObfuscatedName("al") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(IILty;IB)V", - garbageValue = "-51" + descriptor = "(IILtm;II)V", + garbageValue = "-835370941" ) - void method1491(int var1, int var2, Buffer var3, int var4) { + void method1523(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; boolean var6 = (var4 & 2) != 0; boolean var7 = (var4 & 4) != 0; @@ -162,8 +163,8 @@ void method1491(int var1, int var2, Buffer var3, int var4) { if (var10 != 0) { this.floorOverlayIds[var9][var1][var2] = (short)var10; var11 = var3.readUnsignedByte(); - this.field2402[var9][var1][var2] = (byte)(var11 >> 2); - this.field2403[var9][var1][var2] = (byte)(var11 & 3); + this.field2427[var9][var1][var2] = (byte)(var11 >> 2); + this.field2426[var9][var1][var2] = (byte)(var11 & 3); } } } @@ -175,7 +176,7 @@ void method1491(int var1, int var2, Buffer var3, int var4) { WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method2543(); + int var12 = var3.method2563(); int var13 = var3.readUnsignedByte(); var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } @@ -185,23 +186,41 @@ void method1491(int var1, int var2, Buffer var3, int var4) { } - @ObfuscatedName("bd") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1822909116" + garbageValue = "-1240357684" ) @Export("getRegionX") int getRegionX() { return this.regionX; } - @ObfuscatedName("bb") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-903586613" + garbageValue = "65280" ) @Export("getRegionY") int getRegionY() { return this.regionY; } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)[Ldk;", + garbageValue = "-74962306" + ) + static class90[] method1517() { + return new class90[]{class90.field889, class90.field892, class90.field888, class90.field893, class90.field891, class90.field890}; + } + + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(B)Liz;", + garbageValue = "100" + ) + public static class212 method1526() { + return Client.keyHandlerInstance; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/AbstractWorldMapIcon.java b/osrs/src/main/java/AbstractWorldMapIcon.java index 156131e8e..4c872ba85 100644 --- a/osrs/src/main/java/AbstractWorldMapIcon.java +++ b/osrs/src/main/java/AbstractWorldMapIcon.java @@ -3,77 +3,72 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kv") +@ObfuscatedName("kp") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "[Luu;" - ) - static IndexedSprite[] field2442; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmc;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmc;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("screenX") int screenX; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lmr;Lmr;)V" + descriptor = "(Lmc;Lmc;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1799088869" + garbageValue = "2135662389" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)Lka;", - garbageValue = "8220" + descriptor = "(I)Lkq;", + garbageValue = "-2114244458" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "81" + descriptor = "(I)I", + garbageValue = "-655814171" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-565304787" + garbageValue = "-816534170" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("ao") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-2144265772" + garbageValue = "-1870658726" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -84,62 +79,62 @@ boolean fitsScreen(int var1, int var2) { } } - @ObfuscatedName("ac") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-588256332" + garbageValue = "1935416179" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("ak") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1786751810" + garbageValue = "-1283166598" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = SequenceDefinition.WorldMapElement_get(this.getElement()); + WorldMapElement var3 = class138.WorldMapElement_get(this.getElement()); int var4 = this.getSubWidth(); int var5 = this.getSubHeight(); switch(var3.horizontalAlignment.value) { case 0: - if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { + if (var1 > this.screenX - var4 && var1 <= this.screenX) { break; } return false; case 1: - if (var1 > this.screenX - var4 && var1 <= this.screenX) { + if (var1 >= this.screenX && var1 < var4 + this.screenX) { break; } return false; case 2: - if (var1 < this.screenX || var1 >= var4 + this.screenX) { + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { return false; } } switch(var3.verticalAlignment.value) { case 0: - if (var2 > this.screenY - var5 && var2 <= this.screenY) { + if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { break; } return false; case 1: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { + if (var2 <= this.screenY - var5 || var2 > this.screenY) { return false; } break; case 2: - if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { + if (var2 < this.screenY || var2 >= var5 + this.screenY) { return false; } } @@ -148,10 +143,10 @@ boolean elementFitsScreen(int var1, int var2) { } } - @ObfuscatedName("an") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-55" + descriptor = "(III)Z", + garbageValue = "-731770826" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -165,38 +160,13 @@ boolean labelFitsScreen(int var1, int var2) { } } - @ObfuscatedName("kf") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIIIIIIIIB)V", - garbageValue = "-47" + descriptor = "(II)F", + garbageValue = "1637064671" ) - @Export("updatePendingSpawn") - static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - PendingSpawn var10 = null; - - for (PendingSpawn var11 = (PendingSpawn)Client.pendingSpawns.last(); var11 != null; var11 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var11.plane && var11.x == var1 && var2 == var11.y && var3 == var11.type) { - var10 = var11; - break; - } - } - - if (var10 == null) { - var10 = new PendingSpawn(); - var10.plane = var0; - var10.type = var3; - var10.x = var1; - var10.y = var2; - var10.field948 = -1; - class11.method40(var10); - Client.pendingSpawns.addFirst(var10); - } - - var10.id = var4; - var10.objectType = var5; - var10.rotation = var6; - var10.startCycle = var8; - var10.endCycle = var9; - var10.method509(var7); + static final float method1556(int var0) { + float var1 = 10075.0F - (float)var0; + return (1.0075567F * var1 - 75.56675F) / var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/AccessFile.java b/osrs/src/main/java/AccessFile.java index 2a4c44b71..d239e6b48 100644 --- a/osrs/src/main/java/AccessFile.java +++ b/osrs/src/main/java/AccessFile.java @@ -1,23 +1,20 @@ -import java.io.EOFException; -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.io.SyncFailedException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tn") +import java.io.*; + +@ObfuscatedName("tu") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("file") RandomAccessFile file; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("maxSize") final long maxSize; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("offset") long offset; @@ -42,21 +39,21 @@ public AccessFile(File var1, String var2, long var3) throws IOException { this.file.seek(0L); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); this.offset = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1244483443" + garbageValue = "-890583938" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { - if (this.offset + (long)var3 > this.maxSize) { + if ((long)var3 + this.offset > this.maxSize) { this.file.seek(this.maxSize); this.file.write(1); throw new EOFException(); @@ -66,20 +63,20 @@ public final void write(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1963983809" + garbageValue = "346425728" ) @Export("close") public final void close() throws IOException { this.closeSync(false); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1007418662" + descriptor = "(ZB)V", + garbageValue = "26" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -97,20 +94,20 @@ public final void closeSync(boolean var1) throws IOException { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "-611739643" + garbageValue = "330936146" ) @Export("length") public final long length() throws IOException { return this.file.length(); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "-1161755198" + descriptor = "([BIIB)I", + garbageValue = "-81" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { @@ -131,4 +128,4 @@ protected void finalize() throws Throwable { } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Actor.java b/osrs/src/main/java/Actor.java index 44d857b94..2fb252cf9 100644 --- a/osrs/src/main/java/Actor.java +++ b/osrs/src/main/java/Actor.java @@ -3,90 +3,90 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") +@ObfuscatedName("dr") @Implements("Actor") public abstract class Actor extends Renderable { @ObfuscatedName("an") @Export("isWalking") boolean isWalking; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("x") int x; - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("y") int y; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("rotation") int rotation; - @ObfuscatedName("bq") + @ObfuscatedName("bm") int field976; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @Export("playerCycle") int playerCycle; - @ObfuscatedName("br") + @ObfuscatedName("bq") @Export("idleSequence") int idleSequence; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("be") + @ObfuscatedName("bl") @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("bc") + @ObfuscatedName("bp") @Export("walkSequence") int walkSequence; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("bu") + @ObfuscatedName("bo") @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("bk") + @ObfuscatedName("bb") @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("bz") + @ObfuscatedName("br") @Export("runSequence") int runSequence; - @ObfuscatedName("bx") + @ObfuscatedName("be") @Export("runBackSequence") int runBackSequence; - @ObfuscatedName("bh") + @ObfuscatedName("bi") @Export("runLeftSequence") int runLeftSequence; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @Export("runRightSequence") int runRightSequence; - @ObfuscatedName("bl") + @ObfuscatedName("bx") @Export("crawlSequence") int crawlSequence; - @ObfuscatedName("bt") + @ObfuscatedName("bn") @Export("crawlBackSequence") int crawlBackSequence; - @ObfuscatedName("by") + @ObfuscatedName("bw") @Export("crawlLeftSequence") int crawlLeftSequence; - @ObfuscatedName("bg") + @ObfuscatedName("bc") @Export("crawlRightSequence") int crawlRightSequence; - @ObfuscatedName("bj") + @ObfuscatedName("bg") @Export("overheadText") String overheadText; - @ObfuscatedName("ct") + @ObfuscatedName("cw") @Export("isAutoChatting") boolean isAutoChatting; @ObfuscatedName("cf") @Export("showPublicPlayerChat") boolean showPublicPlayerChat; - @ObfuscatedName("cz") + @ObfuscatedName("cm") @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("cb") - int field986; + @ObfuscatedName("cn") + int field995; @ObfuscatedName("cs") - int field994; - @ObfuscatedName("cj") - int[] field1023; - @ObfuscatedName("cw") + int field996; + @ObfuscatedName("cx") + int[] field1028; + @ObfuscatedName("cd") @Export("hitSplatCount") byte hitSplatCount; @ObfuscatedName("ce") @@ -95,137 +95,138 @@ public abstract class Actor extends Renderable { @ObfuscatedName("cq") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("cm") + @ObfuscatedName("cp") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("ca") + @ObfuscatedName("cv") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("cx") + @ObfuscatedName("co") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("co") + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Loc;" ) @Export("healthBars") IterableNodeDeque healthBars; @ObfuscatedName("cu") @Export("targetIndex") int targetIndex; - @ObfuscatedName("cr") + @ObfuscatedName("ch") @Export("false0") boolean false0; - @ObfuscatedName("cd") + @ObfuscatedName("ci") @Export("movingOrientation") int movingOrientation; - @ObfuscatedName("cy") - int field997; - @ObfuscatedName("ck") - int field992; - @ObfuscatedName("cl") - boolean field958; - @ObfuscatedName("cp") + @ObfuscatedName("ca") + int field988; + @ObfuscatedName("cb") + int field989; + @ObfuscatedName("cg") + boolean field959; + @ObfuscatedName("cj") @Export("movementSequence") int movementSequence; - @ObfuscatedName("ch") + @ObfuscatedName("cz") @Export("movementFrame") int movementFrame; - @ObfuscatedName("cg") + @ObfuscatedName("ct") @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("ci") - int field991; - @ObfuscatedName("cv") + @ObfuscatedName("cy") + int field999; + @ObfuscatedName("ck") @Export("sequence") int sequence; @ObfuscatedName("cc") @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("dc") + @ObfuscatedName("dh") @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("dq") + @ObfuscatedName("dj") @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("dg") + @ObfuscatedName("di") @Export("currentSequenceFrameIndex") int currentSequenceFrameIndex; - @ObfuscatedName("dj") + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "Lsa;" + descriptor = "Lsf;" ) + @Export("spotAnimations") IterableNodeHashTable spotAnimations; - @ObfuscatedName("dy") - int field1017; - @ObfuscatedName("dr") - int field1013; - @ObfuscatedName("do") - int field1011; - @ObfuscatedName("dk") - int field1007; @ObfuscatedName("dn") - int field1010; - @ObfuscatedName("di") + int field1011; + @ObfuscatedName("dg") + int field1004; + @ObfuscatedName("dd") + int field1002; + @ObfuscatedName("da") + int field1001; + @ObfuscatedName("ds") + int field1014; + @ObfuscatedName("dy") @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("de") + @ObfuscatedName("dt") @Export("exactMoveArrive1Cycle") int exactMoveArrive1Cycle; - @ObfuscatedName("dd") + @ObfuscatedName("dl") @Export("exactMoveDirection") int exactMoveDirection; - @ObfuscatedName("dt") + @ObfuscatedName("dk") @Export("npcCycle") int npcCycle; @ObfuscatedName("df") @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("dm") + @ObfuscatedName("dz") @Export("recolourStartCycle") int recolourStartCycle; - @ObfuscatedName("du") + @ObfuscatedName("dw") @Export("recolourEndCycle") int recolourEndCycle; - @ObfuscatedName("dz") + @ObfuscatedName("dv") @Export("recolourHue") byte recolourHue; - @ObfuscatedName("dx") + @ObfuscatedName("dr") @Export("recolourSaturation") byte recolourSaturation; - @ObfuscatedName("dp") + @ObfuscatedName("do") @Export("recolourLuminance") byte recolourLuminance; - @ObfuscatedName("ds") + @ObfuscatedName("db") @Export("recolourAmount") byte recolourAmount; - @ObfuscatedName("da") + @ObfuscatedName("dp") @Export("orientation") int orientation; - @ObfuscatedName("dv") - int field1016; - @ObfuscatedName("dh") - int field1005; - @ObfuscatedName("dl") + @ObfuscatedName("dm") + int field1010; + @ObfuscatedName("dx") + int field1017; + @ObfuscatedName("dq") @Export("pathLength") int pathLength; - @ObfuscatedName("db") + @ObfuscatedName("de") @Export("pathX") int[] pathX; - @ObfuscatedName("dw") + @ObfuscatedName("dc") @Export("pathY") int[] pathY; - @ObfuscatedName("et") + @ObfuscatedName("ed") @ObfuscatedSignature( - descriptor = "[Lio;" + descriptor = "[Lin;" ) @Export("pathTraversed") MoveSpeed[] pathTraversed; - @ObfuscatedName("em") - int field1020; - @ObfuscatedName("ec") - int field1018; - @ObfuscatedName("el") + @ObfuscatedName("eh") + int field1021; + @ObfuscatedName("ey") + int field1022; + @ObfuscatedName("ee") @Export("combatLevelChange") int combatLevelChange; @@ -250,9 +251,9 @@ public abstract class Actor extends Renderable { this.overheadText = null; this.showPublicPlayerChat = false; this.overheadTextCyclesRemaining = 100; - this.field986 = 0; - this.field994 = 0; - this.field1023 = null; + this.field995 = 0; + this.field996 = 0; + this.field1028 = null; this.hitSplatCount = 0; this.hitSplatTypes = new int[4]; this.hitSplatValues = new int[4]; @@ -263,58 +264,58 @@ public abstract class Actor extends Renderable { this.targetIndex = -1; this.false0 = false; this.movingOrientation = -1; - this.field997 = -1; - this.field992 = -1; + this.field988 = -1; + this.field989 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; - this.field991 = 0; + this.field999 = 0; this.sequence = -1; this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; this.currentSequenceFrameIndex = 0; this.spotAnimations = new IterableNodeHashTable(4); - this.field1017 = 0; + this.field1011 = 0; this.npcCycle = 0; this.defaultHeight = 200; this.recolourStartCycle = -1; this.recolourEndCycle = -1; - this.field1016 = 0; - this.field1005 = 32; + this.field1010 = 0; + this.field1017 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new MoveSpeed[10]; - this.field1020 = 0; - this.field1018 = 0; + this.field1021 = 0; + this.field1022 = 0; this.combatLevelChange = -1; } - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "381940201" ) @Export("isVisible") boolean isVisible() { return false; } - @ObfuscatedName("bt") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "179353417" + descriptor = "(B)V", + garbageValue = "-71" ) - final void method517() { + final void method512() { this.pathLength = 0; - this.field1018 = 0; + this.field1022 = 0; } - @ObfuscatedName("by") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "114" + descriptor = "(IIIIIII)V", + garbageValue = "1923884006" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -334,9 +335,9 @@ final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var int var10 = -1; int var11 = 0; if (var1 >= 0) { - HitSplatDefinition var12 = class177.method907(var1); - var10 = var12.field1685; - var11 = var12.field1687; + HitSplatDefinition var12 = WorldMapCacheName.method1564(var1); + var10 = var12.field1704; + var11 = var12.field1706; } int var14; @@ -392,10 +393,10 @@ final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var } } - @ObfuscatedName("bg") + @ObfuscatedName("cw") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "-730054495" + garbageValue = "1229115524" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -406,7 +407,7 @@ final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int va } else { byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); var8 = new HealthBarDefinition(); - var8.field1541 = var1; + var8.field1555 = var1; if (var9 != null) { var8.decode(new Buffer(var9)); } @@ -424,7 +425,7 @@ final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int va HealthBar var13; for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { ++var12; - if (var13.definition.field1541 == var8.field1541) { + if (var13.definition.field1555 == var8.field1555) { var13.put(var2 + var4, var5, var6, var3); return; } @@ -455,10 +456,10 @@ final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("bj") + @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "281579888" + garbageValue = "-711075108" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { @@ -469,7 +470,7 @@ final void removeHealthBar(int var1) { } else { byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); var3 = new HealthBarDefinition(); - var3.field1541 = var1; + var3.field1555 = var1; if (var4 != null) { var3.decode(new Buffer(var4)); } @@ -489,89 +490,90 @@ final void removeHealthBar(int var1) { } - @ObfuscatedName("ct") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "921981147" + descriptor = "(IIIIB)V", + garbageValue = "0" ) - void updateSpotAnimation(int idx, int graphicHeight, int graphicStart, int graphicStartCycle) { - int var5 = graphicStartCycle + Client.cycle; - SpotAnimation var6 = (SpotAnimation)this.spotAnimations.get((long)idx); + @Export("updateSpotAnimation") + void updateSpotAnimation(int var1, int var2, int var3, int var4) { + int var5 = var4 + Client.cycle; + SpotAnimation var6 = (SpotAnimation)this.spotAnimations.get((long)var1); if (var6 != null) { var6.remove(); - --this.field1017; + --this.field1011; } - if (graphicHeight != 65535 && graphicHeight != -1) { + if (var2 != 65535 && var2 != -1) { byte var7 = 0; - if (graphicStartCycle > 0) { + if (var4 > 0) { var7 = -1; } - this.spotAnimations.put(new SpotAnimation(graphicHeight, graphicStart, var5, var7), (long)idx); - ++this.field1017; + this.spotAnimations.put(new SpotAnimation(var2, var3, var5, var7), (long)var1); + ++this.field1011; } } - @ObfuscatedName("cf") + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "(I)Lsa;", - garbageValue = "655512297" + descriptor = "(I)Lsf;", + garbageValue = "-343795604" ) - IterableNodeHashTable method523() { + IterableNodeHashTable method518() { return this.spotAnimations; } - @ObfuscatedName("cz") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1776103193" + descriptor = "(S)V", + garbageValue = "-28624" ) - void method524() { + void method519() { IterableNodeHashTableIterator var1 = new IterableNodeHashTableIterator(this.spotAnimations); - for (SpotAnimation var2 = (SpotAnimation)var1.method2423(); var2 != null; var2 = (SpotAnimation)var1.next()) { + for (SpotAnimation var2 = (SpotAnimation)var1.method2449(); var2 != null; var2 = (SpotAnimation)var1.next()) { var2.remove(); } - this.field1017 = 0; + this.field1011 = 0; } - @ObfuscatedName("cb") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(Ljo;I)Ljo;", - garbageValue = "1288995708" + descriptor = "(Ljr;I)Ljr;", + garbageValue = "-787093925" ) - Model method525(Model var1) { - if (this.field1017 == 0) { + Model method520(Model var1) { + if (this.field1011 == 0) { return var1; } else { IterableNodeHashTableIterator var2 = new IterableNodeHashTableIterator(this.spotAnimations); int var3 = var1.verticesCount; int var4 = var1.indicesCount; - int var5 = var1.field2216; - byte var6 = var1.field2211; + int var5 = var1.field2242; + byte var6 = var1.field2235; - for (SpotAnimation var7 = (SpotAnimation)var2.method2423(); var7 != null; var7 = (SpotAnimation)var2.next()) { - if (var7.field4239 != -1) { - Model var8 = NPCComposition.SpotAnimationDefinition_get(var7.field4238).method985(); + for (SpotAnimation var7 = (SpotAnimation)var2.method2449(); var7 != null; var7 = (SpotAnimation)var2.next()) { + if (var7.field4278 != -1) { + Model var8 = StructComposition.SpotAnimationDefinition_get(var7.field4281).method1002(); if (var8 != null) { var3 += var8.verticesCount; var4 += var8.indicesCount; - var5 += var8.field2216; + var5 += var8.field2242; } } } Model var10 = new Model(var3, var4, var5, var6); - var10.method1285(var1); + var10.method1314(var1); - for (SpotAnimation var11 = (SpotAnimation)var2.method2423(); var11 != null; var11 = (SpotAnimation)var2.next()) { - if (var11.field4239 != -1) { - Model var9 = NPCComposition.SpotAnimationDefinition_get(var11.field4238).getModel(var11.field4239); + for (SpotAnimation var11 = (SpotAnimation)var2.method2449(); var11 != null; var11 = (SpotAnimation)var2.next()) { + if (var11.field4278 != -1) { + Model var9 = StructComposition.SpotAnimationDefinition_get(var11.field4281).getModel(var11.field4278); if (var9 != null) { - var9.offsetBy(0, -var11.field4237, 0); - var10.method1285(var9); + var9.offsetBy(0, -var11.field4277, 0); + var10.method1314(var9); } } } @@ -580,161 +582,171 @@ Model method525(Model var1) { } } - @ObfuscatedName("cs") + @ObfuscatedName("cr") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "110" + garbageValue = "-23" ) - void method526() { - this.field958 = false; + void method521() { + this.field959 = false; this.movingOrientation = -1; - this.field997 = -1; - this.field992 = -1; + this.field988 = -1; + this.field989 = -1; } - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIIB)V", - garbageValue = "-19" + descriptor = "(Lto;I)V", + garbageValue = "-1660235487" ) - public static void method516(String[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - int var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - int var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - method516(var0, var1, var2, var5 - 1); - method516(var0, var1, var5 + 1, var3); + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = VarbitComposition.localPlayer = Client.players[var1] = new Player(); + var2.index = var1; + int var3 = var0.readBits(30); + byte var4 = (byte)(var3 >> 28); + int var5 = var3 >> 14 & 16383; + int var6 = var3 & 16383; + var2.pathX[0] = var5 - UrlRequester.baseX; + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); + var2.pathY[0] = var6 - class47.baseY; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + HealthBar.Client_plane = var2.plane = var4; + if (Players.cachedAppearanceBuffer[var1] != null) { + var2.read(Players.cachedAppearanceBuffer[var1]); } - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;S)V", - garbageValue = "-1889" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; - } - - @ObfuscatedName("gk") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "101" - ) - static void method527() { - class20.field58 = System.getenv("JX_ACCESS_TOKEN"); - Script.field807 = System.getenv("JX_REFRESH_TOKEN"); - class11.field36 = System.getenv("JX_SESSION_ID"); - Login.field766 = System.getenv("JX_CHARACTER_ID"); - String var0 = System.getenv("JX_DISPLAY_NAME"); - String var1; - if (var0 != null && !var0.isEmpty() && var0.charAt(0) != '#') { - var1 = var0; - } else { - var1 = ""; + Players.Players_count = 0; + Players.Players_indices[++Players.Players_count - 1] = var1; + Players.activityFlags[var1] = 0; + Players.Players_emptyIdxCount = 0; + + for (int var7 = 1; var7 < 2048; ++var7) { + if (var7 != var1) { + int var8 = var0.readBits(18); + int var9 = var8 >> 16; + int var10 = var8 >> 8 & 597; + int var11 = var8 & 597; + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); + Players.Players_orientations[var7] = 0; + Players.Players_targetIndices[var7] = -1; + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; + Players.activityFlags[var7] = 0; + } } - Login.field761 = var1; + var0.exportIndex(); } - @ObfuscatedName("ik") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "-2105376256" + descriptor = "(ILjava/lang/String;Lon;IB)Lly;", + garbageValue = "38" ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { - byte var2 = 4; - int var3 = var2 + 6; - int var4 = var2 + 6; - int var5 = class113.fontPlain12.lineWidth(var0, 250); - int var6 = class113.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 16777215); - class113.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - Skeleton.method1209(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6); - if (var1) { - class156.rasterProvider.drawFull(0, 0); - } else { - int var7 = var3; - int var8 = var4; - int var9 = var5; - int var10 = var6; - - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { - Client.field404[var11] = true; - } - } + public static PacketBufferNode method510(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.MESSAGE_PUBLIC, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(0); + int var5 = var4.packetBuffer.offset; + var4.packetBuffer.writeByte(var0); + String var6 = var1.toLowerCase(); + int var7 = 0; + byte[] var8 = null; + if (var6.startsWith("yellow:")) { + var7 = 0; + var1 = var1.substring("yellow:".length()); + } else if (var6.startsWith("red:")) { + var7 = 1; + var1 = var1.substring("red:".length()); + } else if (var6.startsWith("green:")) { + var7 = 2; + var1 = var1.substring("green:".length()); + } else if (var6.startsWith("cyan:")) { + var7 = 3; + var1 = var1.substring("cyan:".length()); + } else if (var6.startsWith("purple:")) { + var7 = 4; + var1 = var1.substring("purple:".length()); + } else if (var6.startsWith("white:")) { + var7 = 5; + var1 = var1.substring("white:".length()); + } else if (var6.startsWith("flash1:")) { + var7 = 6; + var1 = var1.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var7 = 7; + var1 = var1.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { + var7 = 8; + var1 = var1.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { + var7 = 9; + var1 = var1.substring("glow1:".length()); + } else if (var6.startsWith("glow2:")) { + var7 = 10; + var1 = var1.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { + var7 = 11; + var1 = var1.substring("glow3:".length()); + } else if (var6.startsWith("rainbow:")) { + var7 = 12; + var1 = var1.substring("rainbow:".length()); + } else if (var6.startsWith("pattern")) { + var8 = Interpreter.method418(var6); + if (var8 != null) { + var7 = var8.length + 12; + var1 = var1.substring("pattern".length() + var8.length + 1); } - } - } - - @ObfuscatedName("md") - @ObfuscatedSignature( - descriptor = "(Ldn;ZI)V", - garbageValue = "1063629203" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1 && var2 != -1 && Widget.Widget_loadedInterfaces[var2]) { - ArchiveLoader.Widget_archive.clearFilesGroup(var2); - if (ArchiveLoader.Widget_interfaceComponents[var2] != null) { - for (int var4 = 0; var4 < ArchiveLoader.Widget_interfaceComponents[var2].length; ++var4) { - if (ArchiveLoader.Widget_interfaceComponents[var2][var4] != null) { - ArchiveLoader.Widget_interfaceComponents[var2][var4] = null; - } - } - ArchiveLoader.Widget_interfaceComponents[var2] = null; - Widget.Widget_loadedInterfaces[var2] = false; - } + var6 = var1.toLowerCase(); + byte var9 = 0; + if (var6.startsWith("wave:")) { + var9 = 1; + var1 = var1.substring("wave:".length()); + } else if (var6.startsWith("wave2:")) { + var9 = 2; + var1 = var1.substring("wave2:".length()); + } else if (var6.startsWith("shake:")) { + var9 = 3; + var1 = var1.substring("shake:".length()); + } else if (var6.startsWith("scroll:")) { + var9 = 4; + var1 = var1.substring("scroll:".length()); + } else if (var6.startsWith("slide:")) { + var9 = 5; + var1 = var1.substring("slide:".length()); } - for (IntegerNode var5 = (IntegerNode)Client.widgetFlags.first(); var5 != null; var5 = (IntegerNode)Client.widgetFlags.next()) { - if ((var5.key >> 48 & 65535L) == (long)var2) { - var5.remove(); + var4.packetBuffer.writeByte(var7); + var4.packetBuffer.writeByte(var9); + if (var8 != null && Client.param25 >= 214) { + for (int var10 = 0; var10 < var8.length; ++var10) { + var4.packetBuffer.writeByte(var8[var10]); } } - Widget var6 = VarbitComposition.getWidget(var3); - if (var6 != null) { - class200.invalidateWidget(var6); + class216.method1127(var4.packetBuffer, var1); + if (var0 == class339.field3113.rsOrdinal()) { + var4.packetBuffer.writeByte(var3); } - if (Client.rootInterface != -1) { - ChatChannel.runIntfCloseListeners(Client.rootInterface, 1); - } + var4.packetBuffer.method2540(var4.packetBuffer.offset - var5); + return var4; + } + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(Lmt;I)Z", + garbageValue = "-1903392375" + ) + static boolean method522(PlayerComposition var0) { + if (var0.equipment[0] < 512) { + return false; + } else { + ItemComposition var1 = InvDefinition.ItemDefinition_get(var0.equipment[0] - 512); + return var1.maleModel1 != class209.field1862.field1871 && var1.maleModel2 != class209.field1862.field1871; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/AddRequestTask.java b/osrs/src/main/java/AddRequestTask.java index 1c04168d5..d4aa631ab 100644 --- a/osrs/src/main/java/AddRequestTask.java +++ b/osrs/src/main/java/AddRequestTask.java @@ -1,46 +1,56 @@ -import java.util.Iterator; import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pe") +import java.util.Iterator; + +@ObfuscatedName("pf") +@Implements("AddRequestTask") public class AddRequestTask extends SongTask { + @ObfuscatedName("tw") + @ObfuscatedSignature( + descriptor = "Lbb;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedSignature( - descriptor = "(Lpp;)V" + descriptor = "(Lpm;)V" ) public AddRequestTask(SongTask var1) { super(var1); - super.field3712 = "AddRequestTask"; + super.field3722 = "AddRequestTask"; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "994462530" + descriptor = "(I)Z", + garbageValue = "1604030758" ) - public boolean vmethod2107(int var1) { - while (!class306.field2758.isEmpty()) { - MusicSong var2 = (MusicSong)class306.field2758.peek(); - if (var2 == null) { - class306.field2758.pop(); + public boolean vmethod2142() { + while (!class305.field2774.isEmpty()) { + MusicSong var1 = (MusicSong)class305.field2774.peek(); + if (var1 == null) { + class305.field2774.pop(); } else { - var2.midiPcmStream = this.method2084(); - class306.musicSongs.add(var2); - class306.field2758.pop(); + var1.midiPcmStream = this.method2123(); + class305.musicSongs.add(var1); + class305.field2774.pop(); } } return true; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Llc;", - garbageValue = "1784609156" + descriptor = "(B)Llf;", + garbageValue = "53" ) - MidiPcmStream method2084() { + MidiPcmStream method2123() { MidiPcmStream var1 = null; - Iterator var2 = class306.midiPcmStream.iterator(); + Iterator var2 = class305.midiPcmStream.iterator(); while (true) { MidiPcmStream var3; @@ -48,10 +58,10 @@ MidiPcmStream method2084() { do { if (!var2.hasNext()) { if (var1 != null) { - ++var1.field2795; - if (var1.method1588() == 0 && var1.isReady()) { + ++var1.field2809; + if (var1.method1629() == 0 && var1.isReady()) { var1.clear(); - var1.method1592(); + var1.method1633(); var1.setPcmStreamVolume(0); } } @@ -61,44 +71,26 @@ MidiPcmStream method2084() { var3 = (MidiPcmStream)var2.next(); } while(var3 == null); - } while(var1 != null && var1.field2795 <= var3.field2795 && (var3.field2795 != var1.field2795 || var3.method1588() != 0 || !var3.isReady())); + } while(var1 != null && var1.field2809 <= var3.field2809 && (var3.method1629() != 0 || !var3.isReady())); var1 = var3; } } - @ObfuscatedName("ap") + @ObfuscatedName("ij") @ObfuscatedSignature( - descriptor = "(Lmt;I[B[BS)V", - garbageValue = "24138" + descriptor = "(B)V", + garbageValue = "-71" ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2960 == null) { - if (var2 == null) { - return; + static final void method2124() { + if (WorldMapIcon_0.field2397) { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsInClanChat(); } - var0.field2960 = new byte[11][]; - var0.field2959 = new byte[11][]; - var0.field3028 = new int[11]; - var0.field3029 = new int[11]; - } - - var0.field2960[var1] = var2; - if (var2 != null) { - var0.field2951 = true; - } else { - var0.field2951 = false; - - for (int var4 = 0; var4 < var0.field2960.length; ++var4) { - if (var0.field2960[var4] != null) { - var0.field2951 = true; - break; - } - } + WorldMapIcon_0.field2397 = false; } - var0.field2959[var1] = var3; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Animation.java b/osrs/src/main/java/Animation.java index 715144915..74091b790 100644 --- a/osrs/src/main/java/Animation.java +++ b/osrs/src/main/java/Animation.java @@ -3,51 +3,51 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("ia") @Implements("Animation") public class Animation { - @ObfuscatedName("aw") - static int[] field1976; - @ObfuscatedName("ay") - static int[] field1977; - @ObfuscatedName("ar") - static int[] field1975; - @ObfuscatedName("am") - static int[] field1974; - @ObfuscatedName("as") + @ObfuscatedName("au") + static int[] field2000; + @ObfuscatedName("ae") + static int[] field1997; + @ObfuscatedName("ao") + static int[] field1998; + @ObfuscatedName("at") + static int[] field1999; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Liu;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("transformCount") int transformCount; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("transformXs") int[] transformXs; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("transformYs") int[] transformYs; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("transformZs") int[] transformZs; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1976 = new int[500]; - field1977 = new int[500]; - field1975 = new int[500]; - field1974 = new int[500]; + field2000 = new int[500]; + field1997 = new int[500]; + field1998 = new int[500]; + field1999 = new int[500]; } @ObfuscatedSignature( - descriptor = "([BLik;)V" + descriptor = "([BLiu;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; @@ -69,38 +69,38 @@ public class Animation { if (this.skeleton.transformTypes[var8] != 0) { for (int var10 = var8 - 1; var10 > var6; --var10) { if (this.skeleton.transformTypes[var10] == 0) { - field1976[var7] = var10; - field1977[var7] = 0; - field1975[var7] = 0; - field1974[var7] = 0; + field2000[var7] = var10; + field1997[var7] = 0; + field1998[var7] = 0; + field1999[var7] = 0; ++var7; break; } } } - field1976[var7] = var8; + field2000[var7] = var8; short var11 = 0; if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } if ((var9 & 1) != 0) { - field1977[var7] = var4.readShortSmart(); + field1997[var7] = var4.readShortSmart(); } else { - field1977[var7] = var11; + field1997[var7] = var11; } if ((var9 & 2) != 0) { - field1975[var7] = var4.readShortSmart(); + field1998[var7] = var4.readShortSmart(); } else { - field1975[var7] = var11; + field1998[var7] = var11; } if ((var9 & 4) != 0) { - field1974[var7] = var4.readShortSmart(); + field1999[var7] = var4.readShortSmart(); } else { - field1974[var7] = var11; + field1999[var7] = var11; } var6 = var8; @@ -121,12 +121,12 @@ public class Animation { this.transformZs = new int[var7]; for (var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = field1976[var8]; - this.transformXs[var8] = field1977[var8]; - this.transformYs[var8] = field1975[var8]; - this.transformZs[var8] = field1974[var8]; + this.transformSkeletonLabels[var8] = field2000[var8]; + this.transformXs[var8] = field1997[var8]; + this.transformYs[var8] = field1998[var8]; + this.transformZs[var8] = field1999[var8]; } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ApproximateRouteStrategy.java b/osrs/src/main/java/ApproximateRouteStrategy.java index 515eddcc6..df766c9b5 100644 --- a/osrs/src/main/java/ApproximateRouteStrategy.java +++ b/osrs/src/main/java/ApproximateRouteStrategy.java @@ -3,405 +3,113 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("cl") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { ApproximateRouteStrategy() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIILij;I)Z", - garbageValue = "2142084611" + descriptor = "(IIILis;B)Z", + garbageValue = "85" ) @Export("hasArrived") protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lfm;FI)F", - garbageValue = "451306103" + descriptor = "(III)I", + garbageValue = "-11903000" ) - static float method348(class130 var0, float var1) { - if (var0 != null && var0.method717() != 0) { - if (var1 < (float)var0.field1232[0].field1193) { - return var0.field1231 == class128.field1217 ? var0.field1232[0].field1192 : Language.method1942(var0, var1, true); - } else if (var1 > (float)var0.field1232[var0.method717() - 1].field1193) { - return var0.field1230 == class128.field1217 ? var0.field1232[var0.method717() - 1].field1192 : Language.method1942(var0, var1, false); - } else if (var0.field1229) { - return var0.field1232[0].field1192; - } else { - class125 var2 = var0.method716(var1); - boolean var3 = false; - boolean var4 = false; - if (var2 == null) { - return 0.0F; - } else { - if (0.0D == (double)var2.field1191 && (double)var2.field1188 == 0.0D) { - var3 = true; - } else if (Float.MAX_VALUE == var2.field1191 && Float.MAX_VALUE == var2.field1188) { - var4 = true; - } else if (var2.field1187 != null) { - if (var0.field1226) { - float var5 = (float)var2.field1193; - float var9 = var2.field1192; - float var6 = 0.33333334F * var2.field1191 + var5; - float var10 = var9 + 0.33333334F * var2.field1188; - float var8 = (float)var2.field1187.field1193; - float var12 = var2.field1187.field1192; - float var7 = var8 - 0.33333334F * var2.field1187.field1190; - float var11 = var12 - 0.33333334F * var2.field1187.field1189; - float var13; - float var14; - float var15; - float var16; - float var17; - float var18; - float var19; - if (var0.field1228) { - var15 = var10; - var16 = var11; - if (var0 != null) { - var17 = var8 - var5; - if ((double)var17 != 0.0D) { - var18 = var6 - var5; - var19 = var7 - var5; - float[] var20 = new float[]{var18 / var17, var19 / var17}; - var0.field1227 = 0.33333334F == var20[0] && var20[1] == 0.6666667F; - float var21 = var20[0]; - float var22 = var20[1]; - if ((double)var20[0] < 0.0D) { - var20[0] = 0.0F; - } - - if ((double)var20[1] > 1.0D) { - var20[1] = 1.0F; - } - - if ((double)var20[0] > 1.0D || var20[1] < -1.0F) { - UserComparator3.method675(var20); - } - - if (var21 != var20[0]) { - var13 = var17 * var20[0] + var5; - if ((double)var21 != 0.0D) { - var15 = (var10 - var9) * var20[0] / var21 + var9; - } - } - - if (var22 != var20[1]) { - var14 = var17 * var20[1] + var5; - if (1.0D != (double)var22) { - var16 = (float)((double)var12 - (double)(var12 - var11) * (1.0D - (double)var20[1]) / (1.0D - (double)var22)); - } - } - - var0.field1234 = var5; - var0.field1244 = var8; - ParamComposition.method1001(0.0F, var20[0], var20[1], 1.0F, var0); - float var23 = var15 - var9; - float var24 = var16 - var15; - float var25 = var12 - var16; - float var26 = var24 - var23; - var0.field1241 = var25 - var24 - var26; - var0.field1233 = var26 + var26 + var26; - var0.field1243 = var23 + var23 + var23; - var0.field1235 = var9; - } - } - } else if (var0 != null) { - var0.field1234 = var5; - var13 = var8 - var5; - var14 = var12 - var9; - var15 = var6 - var5; - var16 = 0.0F; - var17 = 0.0F; - if ((double)var15 != 0.0D) { - var16 = (var10 - var9) / var15; - } - - var15 = var8 - var7; - if (0.0D != (double)var15) { - var17 = (var12 - var11) / var15; - } - - var18 = 1.0F / (var13 * var13); - var19 = var13 * var16; - float var27 = var17 * var13; - var0.field1242 = var18 * (var27 + var19 - var14 - var14) / var13; - var0.field1238 = var18 * (var14 + var14 + var14 - var19 - var19 - var27); - var0.field1239 = var16; - var0.field1240 = var9; - } - - var0.field1226 = false; - } - } else { - var3 = true; - } - - if (var3) { - return var2.field1192; - } else if (var4) { - return (float)var2.field1193 != var1 && var2.field1187 != null ? var2.field1187.field1192 : var2.field1192; - } else { - return var0.field1228 ? NewShit.method961(var0, var1) : class165.method863(var0, var1); - } - } + static int method342(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 0) { + var1 = 0; + } else if (var1 > 127) { + var1 = 127; } + + var1 = 127 - var1; + return var1; } else { - return 0.0F; + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1468252059" + descriptor = "(Llw;Lux;I)Lly;", + garbageValue = "1633353192" ) - public static void method349(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = class146.method779(); + var2.clientPacket = var0; + var2.clientPacketLength = var0.length; + if (var2.clientPacketLength == -1) { + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); + } else if (var2.clientPacketLength <= 18) { + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); + } + + var2.packetBuffer.setIsaacCipher(var1); + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); + var2.index = 0; + return var2; } - @ObfuscatedName("bd") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(ILdc;ZS)I", - garbageValue = "-12497" + descriptor = "(II)Lhi;", + garbageValue = "1872404275" ) - static int method350(int var0, Script var1, boolean var2) { - if (var0 == 3300) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; - return 1; + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - int var3; - int var4; - if (var0 == 3301) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.method1571(var3, var4); - return 1; - } else if (var0 == 3302) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FontName.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == 3303) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ObjectSound.method422(var3, var4); - return 1; - } else if (var0 == 3304) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GameEngine.getInvDefinition(var3).size; - return 1; - } else if (var0 == 3305) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == 3306) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == 3307) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; - } else { - int var5; - if (var0 == 3308) { - var3 = class36.Client_plane; - var4 = (class136.localPlayer.x >> 7) + AbstractArchive.baseX; - var5 = (class136.localPlayer.y >> 7) + class148.baseY; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == 3309) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == 3310) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == 3311) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == 3312) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == 3313) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.method1571(var3, var4); - return 1; - } else if (var0 == 3314) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FontName.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == 3315) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ObjectSound.method422(var3, var4); - return 1; - } else if (var0 == 3316) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3317) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == 3318) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == 3321) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy / 100; - return 1; - } else if (var0 == 3322) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == 3323) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3324) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == 3325) { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == 3326) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.lastMouseRecordX; - return 1; - } else if (var0 == 3327) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.lastMouseRecordY; - return 1; - } else if (var0 == 3331) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else { - return 2; - } + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); + var1 = new VarpDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("bk") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "2112043439" + descriptor = "(Lnu;IIB)Z", + garbageValue = "2" ) - static int method351(int var0, Script var1, boolean var2) { - if (var0 == 6200) { - Interpreter.Interpreter_intStackSize -= 2; - Client.field634 = (short)GameObject.method1359(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - if (Client.field634 <= 0) { - Client.field634 = 256; - } - - Client.field637 = (short)GameObject.method1359(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - if (Client.field637 <= 0) { - Client.field637 = 256; - } - - return 1; - } else if (var0 == 6201) { - Interpreter.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; - } - - return 1; - } else if (var0 == 6202) { - Interpreter.Interpreter_intStackSize -= 4; - Client.field631 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (Client.field631 <= 0) { - Client.field631 = 1; - } - - Client.field630 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (Client.field630 <= 0) { - Client.field630 = 32767; - } else if (Client.field630 < Client.field631) { - Client.field630 = Client.field631; - } - - Client.field633 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (Client.field633 <= 0) { - Client.field633 = 1; - } - - Client.field636 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - if (Client.field636 <= 0) { - Client.field636 = 32767; - } else if (Client.field636 < Client.field633) { - Client.field636 = Client.field633; - } - - return 1; - } else if (var0 == 6203) { - if (Client.viewportWidget != null) { - class31.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } else if (var0 == 6204) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; - } else if (var0 == 6205) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class159.method837(Client.field634); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class159.method837(Client.field637); - return 1; - } else if (var0 == 6220) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6221) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6222) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.canvasHeight; - return 1; + static boolean method345(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); + if (var3 == null) { + return false; } else { - return 2; + class137.SpriteBuffer_decode(var3); + return true; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Archive.java b/osrs/src/main/java/Archive.java index b8d582493..640ffc084 100644 --- a/osrs/src/main/java/Archive.java +++ b/osrs/src/main/java/Archive.java @@ -1,97 +1,98 @@ -import java.util.zip.CRC32; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ny") +import java.util.zip.CRC32; + +@ObfuscatedName("nk") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lrg;" + descriptor = "Lru;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lrg;" + descriptor = "Lru;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("index") int index; - @ObfuscatedName("av") - volatile int field3515; - @ObfuscatedName("ap") - boolean field3505; - @ObfuscatedName("aq") + @ObfuscatedName("aa") + volatile int field3525; + @ObfuscatedName("af") + boolean field3516; + @ObfuscatedName("ad") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("indexCrc") int indexCrc; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("indexVersion") int indexVersion; - @ObfuscatedName("aa") - int field3507; - @ObfuscatedName("au") - boolean field3506; - @ObfuscatedName("ae") + @ObfuscatedName("ar") + int field3520; + @ObfuscatedName("ab") + boolean field3515; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lnq;" + descriptor = "Lnf;" ) - JagNetThread field3511; + JagNetThread field3521; static { Archive_crc = new CRC32(); } @ObfuscatedSignature( - descriptor = "(Lrg;Lrg;Lnq;IZZZZ)V" + descriptor = "(Lru;Lru;Lnf;IZZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, JagNetThread var3, int var4, boolean var5, boolean var6, boolean var7, boolean var8) { super(var5, var6); - this.field3515 = 0; - this.field3505 = false; - this.field3507 = -1; - this.field3506 = false; + this.field3525 = 0; + this.field3516 = false; + this.field3520 = -1; + this.field3515 = false; this.archiveDisk = var1; this.masterDisk = var2; this.index = var4; - this.field3505 = var7; - this.field3506 = var8; - this.field3511 = var3; - this.field3511.method1898(this, this.index); + this.field3516 = var7; + this.field3515 = var8; + this.field3521 = var3; + this.field3521.method1934(this, this.index); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-873348564" + garbageValue = "-432364648" ) - public boolean method1851() { - return this.field3515 == 1; + public boolean method1887() { + return this.field3525 == 1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-436771566" + descriptor = "(B)I", + garbageValue = "-60" ) @Export("percentage") public int percentage() { - if (this.field3515 == 1 || this.field3506 && this.field3515 == 2) { + if (this.field3525 == 1 || this.field3515 && this.field3525 == 2) { return 100; } else if (super.groups != null) { return 99; } else { - int var1 = this.field3511.method1902(255, this.index); + int var1 = this.field3521.method1938(255, this.index); if (var1 >= 100) { var1 = 99; } @@ -100,20 +101,20 @@ public int percentage() { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-664965088" + garbageValue = "-1272707955" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - this.field3511.method1901(this.index, var1); + this.field3521.method1937(this.index, var1); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1837159139" + garbageValue = "402130956" ) @Export("loadGroup") void loadGroup(int var1) { @@ -122,7 +123,7 @@ void loadGroup(int var1) { byte[] var4 = null; synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { + if ((long)var1 == var6.key && var2 == var6.archiveDisk && var6.type == 0) { var4 = var6.data; break; } @@ -136,18 +137,18 @@ void loadGroup(int var1) { this.load(var2, var1, var5, true); } } else { - this.field3511.method1900(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + this.field3521.method1936(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1883553102" + descriptor = "(B)V", + garbageValue = "1" ) - void method1855() { - this.field3515 = 2; + void method1891() { + this.field3525 = 2; super.groupIds = new int[0]; super.groupCrcs = new int[0]; super.groupVersions = new int[0]; @@ -157,10 +158,10 @@ void method1855() { super.files = new Object[0][]; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-771832324" + descriptor = "(IIB)V", + garbageValue = "18" ) @Export("loadIndex") void loadIndex(int var1, int var2) { @@ -172,7 +173,7 @@ void loadIndex(int var1, int var2) { byte[] var6 = null; synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { + if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { var6 = var8.data; break; } @@ -186,20 +187,20 @@ void loadIndex(int var1, int var2) { this.load(var4, var3, var7, true); } } else { - this.field3511.method1900(this, 255, this.index, this.indexCrc, (byte)0, true); + this.field3521.method1936(this, 255, this.index, this.indexCrc, (byte)0, true); } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I[BZZI)V", - garbageValue = "-559357154" + garbageValue = "1578809524" ) @Export("write") void write(int var1, byte[] var2, boolean var3, boolean var4) { if (var3) { - if (this.field3515 == 1) { + if (this.field3525 == 1) { throw new RuntimeException(); } @@ -215,7 +216,7 @@ void write(int var1, byte[] var2, boolean var3, boolean var4) { ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); } - class292.method1567(); + UserComparator8.method671(); } this.decodeIndex(var2); @@ -234,7 +235,7 @@ void write(int var1, byte[] var2, boolean var3, boolean var4) { ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var16); } - class292.method1567(); + UserComparator8.method671(); this.validGroups[var1] = true; } @@ -257,27 +258,27 @@ void write(int var1, byte[] var2, boolean var3, boolean var4) { } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lrg;I[BZB)V", - garbageValue = "-13" + descriptor = "(Lru;I[BZI)V", + garbageValue = "-250323664" ) @Export("load") - void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; if (var1 == this.masterDisk) { - if (this.field3515 == 1) { + if (this.field3525 == 1) { throw new RuntimeException(); } else if (var3 == null) { - this.field3511.method1900(this, 255, this.index, this.indexCrc, (byte)0, true); + this.field3521.method1936(this, 255, this.index, this.indexCrc, (byte)0, true); } else { Archive_crc.reset(); Archive_crc.update(var3, 0, var3.length); var5 = (int)Archive_crc.getValue(); if (var5 != this.indexCrc) { - this.field3511.method1900(this, 255, this.index, this.indexCrc, (byte)0, true); + this.field3521.method1936(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - Buffer var6 = new Buffer(class304.decompressBytes(var3)); + Buffer var6 = new Buffer(class53.decompressBytes(var3)); int var7 = var6.readUnsignedByte(); if (var7 != 5 && var7 != 6) { throw new RuntimeException(var7 + "," + this.index + "," + var2); @@ -288,7 +289,7 @@ void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { } if (var8 != this.indexVersion) { - this.field3511.method1900(this, 255, this.index, this.indexCrc, (byte)0, true); + this.field3521.method1936(this, 255, this.index, this.indexCrc, (byte)0, true); } else { this.decodeIndex(var3); this.loadAllLocal(); @@ -297,8 +298,8 @@ void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { } } } else { - if (!var4 && var2 == this.field3507) { - this.field3515 = 1; + if (!var4 && var2 == this.field3520) { + this.field3525 = 1; } if (var3 != null && var3.length > 2) { @@ -326,25 +327,25 @@ void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { } else { this.validGroups[var2] = false; - if (this.field3505 || var4) { - this.field3511.method1900(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3516 || var4) { + this.field3521.method1936(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } } else { this.validGroups[var2] = false; - if (this.field3505 || var4) { - this.field3511.method1900(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3516 || var4) { + this.field3521.method1936(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } } } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-835286146" + garbageValue = "1319297597" ) @Export("loadAllLocal") void loadAllLocal() { @@ -356,60 +357,60 @@ void loadAllLocal() { } if (this.archiveDisk == null) { - this.field3515 = 1; + this.field3525 = 1; } else { - this.field3507 = -1; + this.field3520 = -1; for (var1 = 0; var1 < this.validGroups.length; ++var1) { if (super.fileCounts[var1] > 0) { - class148.method779(var1, this.archiveDisk, this); - this.field3507 = var1; + SceneTilePaint.method1350(var1, this.archiveDisk, this); + this.field3520 = var1; } } - if (this.field3507 == -1) { - this.field3515 = 1; + if (this.field3520 == -1) { + this.field3525 = 1; } } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1193931520" + garbageValue = "-1917091652" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { if (super.groups[var1] != null) { return 100; } else { - return this.validGroups[var1] ? 100 : this.field3511.method1902(this.index, var1); + return this.validGroups[var1] ? 100 : this.field3521.method1938(this.index, var1); } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "38" + descriptor = "(II)Z", + garbageValue = "-354618855" ) - public boolean method1861(int var1) { + public boolean method1897(int var1) { return this.validGroups[var1]; } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "1" + descriptor = "(II)Z", + garbageValue = "1031243198" ) - public boolean method1862(int var1) { + public boolean method1898(int var1) { return this.getGroupFileIds(var1) != null; } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1480167179" + garbageValue = "-91850240" ) @Export("loadPercent") public int loadPercent() { @@ -431,66 +432,4 @@ public int loadPercent() { return var3; } } - - @ObfuscatedName("aw") - public static final int method1850(double var0, double var2, double var4) { - double var6 = var4; - double var8 = var4; - double var10 = var4; - if (var2 != 0.0D) { - double var12; - if (var4 < 0.5D) { - var12 = var4 * (1.0D + var2); - } else { - var12 = var4 + var2 - var4 * var2; - } - - double var14 = var4 * 2.0D - var12; - double var16 = var0 + 0.3333333333333333D; - if (var16 > 1.0D) { - --var16; - } - - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } - - if (var16 * 6.0D < 1.0D) { - var6 = var14 + var16 * (var12 - var14) * 6.0D; - } else if (var16 * 2.0D < 1.0D) { - var6 = var12; - } else if (3.0D * var16 < 2.0D) { - var6 = 6.0D * (0.6666666666666666D - var16) * (var12 - var14) + var14; - } else { - var6 = var14; - } - - if (var0 * 6.0D < 1.0D) { - var8 = var14 + 6.0D * (var12 - var14) * var0; - } else if (2.0D * var0 < 1.0D) { - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; - } else { - var8 = var14; - } - - if (var20 * 6.0D < 1.0D) { - var10 = (var12 - var14) * 6.0D * var20 + var14; - } else if (var20 * 2.0D < 1.0D) { - var10 = var12; - } else if (var20 * 3.0D < 2.0D) { - var10 = 6.0D * (var12 - var14) * (0.6666666666666666D - var20) + var14; - } else { - var10 = var14; - } - } - - int var22 = (int)(var6 * 256.0D); - int var13 = (int)(var8 * 256.0D); - int var23 = (int)(var10 * 256.0D); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveDisk.java b/osrs/src/main/java/ArchiveDisk.java index 7ddcbe3a3..ceeb82c84 100644 --- a/osrs/src/main/java/ArchiveDisk.java +++ b/osrs/src/main/java/ArchiveDisk.java @@ -1,32 +1,33 @@ -import java.io.EOFException; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rg") +import java.io.EOFException; +import java.io.IOException; + +@ObfuscatedName("ru") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lts;" + descriptor = "Ltd;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lts;" + descriptor = "Ltd;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("archive") int archive; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("maxEntrySize") int maxEntrySize; @@ -35,7 +36,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - descriptor = "(ILts;Lts;I)V" + descriptor = "(ILtd;Ltd;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; @@ -47,10 +48,10 @@ public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.maxEntrySize = var4; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "-29" + descriptor = "(II)[B", + garbageValue = "1248586811" ) @Export("read") public byte[] read(int var1) { @@ -82,7 +83,7 @@ public byte[] read(int var1) { return (byte[])var10000; } - this.datFile.seek((long)var4 * 520L); + this.datFile.seek(520L * (long)var4); int var8 = var3 - var6; int var9; int var10; @@ -113,7 +114,7 @@ public byte[] read(int var1) { var12 = ArchiveDisk_buffer[7] & 255; } - if (var9 == var1 && var10 == var7 && var12 == this.archive) { + if (var9 == var1 && var7 == var10 && var12 == this.archive) { if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { int var14 = var8 + var13; @@ -147,10 +148,10 @@ public byte[] read(int var1) { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I[BIB)Z", - garbageValue = "36" + garbageValue = "-86" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -168,10 +169,10 @@ public boolean write(int var1, byte[] var2, int var3) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I[BIZS)Z", - garbageValue = "-18346" + descriptor = "(I[BIZI)Z", + garbageValue = "-1401240217" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -243,7 +244,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) { var12 = ArchiveDisk_buffer[7] & 255; } - if (var10 != var1 || var8 != var11 || var12 != this.archive) { + if (var10 != var1 || var11 != var8 || var12 != this.archive) { var10000 = false; return var10000; } @@ -261,7 +262,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) { ++var9; } - if (var6 == var9) { + if (var9 == var6) { ++var9; } } @@ -303,7 +304,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) { ArchiveDisk_buffer[5] = (byte)(var9 >> 8); ArchiveDisk_buffer[6] = (byte)var9; ArchiveDisk_buffer[7] = (byte)this.archive; - this.datFile.seek((long)var6 * 520L); + this.datFile.seek(520L * (long)var6); this.datFile.write(ArchiveDisk_buffer, 0, 8); var10 = var3 - var7; if (var10 > 512) { @@ -334,4 +335,28 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) { public String toString() { return "" + this.archive; } -} + + @ObfuscatedName("hs") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1458737660" + ) + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); + Tiles.method461(); + class130.scene.clear(); + + for (int var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0].clear(); + } + + Client.field423.method1090(); + System.gc(); + Script.method445(0, 0); + UrlRequester.method652(); + Client.playingJingle = false; + class388.method2029(); + MusicSong.updateGameState(10); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveDiskAction.java b/osrs/src/main/java/ArchiveDiskAction.java index 8d84b6c2d..e5ec05058 100644 --- a/osrs/src/main/java/ArchiveDiskAction.java +++ b/osrs/src/main/java/ArchiveDiskAction.java @@ -1,185 +1,30 @@ -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InvalidClassException; -import java.io.ObjectInputStream; -import java.io.OptionalDataException; -import java.io.StreamCorruptedException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nn") +@ObfuscatedName("nw") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("av") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("type") int type; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("data") - byte[] data; - @ObfuscatedName("ar") + public byte[] data; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lrg;" + descriptor = "Lru;" ) @Export("archiveDisk") - ArchiveDisk archiveDisk; - @ObfuscatedName("am") + public ArchiveDisk archiveDisk; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lnk;" ) @Export("archive") - Archive archive; + public Archive archive; ArchiveDiskAction() { } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Ltc;B)V", - garbageValue = "67" - ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class36.reflectionChecks.last(); - if (var1 != null) { - int var2 = var0.offset; - var0.writeInt(var1.id); - - for (int var3 = 0; var3 < var1.size; ++var3) { - if (var1.creationErrors[var3] != 0) { - var0.writeByte(var1.creationErrors[var3]); - } else { - try { - int var4 = var1.operations[var3]; - Field var5; - int var6; - if (var4 == 0) { - var5 = var1.fields[var3]; - var6 = Reflection.getInt(var5, (Object)null); - var0.writeByte(0); - var0.writeInt(var6); - } else if (var4 == 1) { - var5 = var1.fields[var3]; - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); - var0.writeByte(0); - } else if (var4 == 2) { - var5 = var1.fields[var3]; - var6 = var5.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - - Method var25; - if (var4 != 3) { - if (var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - } else { - var25 = var1.methods[var3]; - byte[][] var10 = var1.arguments[var3]; - Object[] var7 = new Object[var10.length]; - - for (int var8 = 0; var8 < var10.length; ++var8) { - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); - var7[var8] = var9.readObject(); - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); - if (var11 == null) { - var0.writeByte(0); - } else if (var11 instanceof Number) { - var0.writeByte(1); - var0.writeLong(((Number)var11).longValue()); - } else if (var11 instanceof String) { - var0.writeByte(2); - var0.writeStringCp1252NullTerminated((String)var11); - } else { - var0.writeByte(4); - } - } - } catch (ClassNotFoundException var13) { - var0.writeByte(-10); - } catch (InvalidClassException var14) { - var0.writeByte(-11); - } catch (StreamCorruptedException var15) { - var0.writeByte(-12); - } catch (OptionalDataException var16) { - var0.writeByte(-13); - } catch (IllegalAccessException var17) { - var0.writeByte(-14); - } catch (IllegalArgumentException var18) { - var0.writeByte(-15); - } catch (InvocationTargetException var19) { - var0.writeByte(-16); - } catch (SecurityException var20) { - var0.writeByte(-17); - } catch (IOException var21) { - var0.writeByte(-18); - } catch (NullPointerException var22) { - var0.writeByte(-19); - } catch (Exception var23) { - var0.writeByte(-20); - } catch (Throwable var24) { - var0.writeByte(-21); - } - } - } - - var0.writeCrc(var2); - var1.remove(); - } - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-71491800" - ) - public static void method1847() { - synchronized(ArchiveDiskActionHandler.field3500) { - if (ArchiveDiskActionHandler.field3499 != 0) { - ArchiveDiskActionHandler.field3499 = 1; - ArchiveDiskActionHandler.field3498 = true; - - try { - ArchiveDiskActionHandler.field3500.wait(); - } catch (InterruptedException var3) { - } - } - - } - } - - @ObfuscatedName("kh") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-836117707" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = MouseRecorder.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var5); - } - - Client.selectedSpellItemId = var3; - Client.isSpellSelected = true; - class33.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - PcmPlayer.selectedSpellFlags = var2; - class200.invalidateWidget(var4); - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveDiskActionHandler.java b/osrs/src/main/java/ArchiveDiskActionHandler.java index fb13ac115..f8c980713 100644 --- a/osrs/src/main/java/ArchiveDiskActionHandler.java +++ b/osrs/src/main/java/ArchiveDiskActionHandler.java @@ -3,37 +3,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nl") +@ObfuscatedName("ny") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("ArchiveDiskActionHandler_requestQueue") - static final NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("ay") + public static final NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("ArchiveDiskActionHandler_responseQueue") - static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("ar") - static int field3499; - @ObfuscatedName("am") - static boolean field3498; - @ObfuscatedName("as") - static Object field3500; - @ObfuscatedName("aj") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; + public static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("ao") + static int field3512; + @ObfuscatedName("at") + static boolean field3511; + @ObfuscatedName("ac") + static Object field3513; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3499 = 0; - field3498 = false; - field3500 = new Object(); + field3512 = 0; + field3511 = false; + field3513 = new Object(); } ArchiveDiskActionHandler() { @@ -62,39 +59,291 @@ public void run() { } } - synchronized(field3500) { - if ((field3498 || field3499 <= 1) && ArchiveDiskActionHandler_requestQueue.method1960()) { - field3499 = 0; - field3500.notifyAll(); + synchronized(field3513) { + if ((field3511 || field3512 <= 1) && ArchiveDiskActionHandler_requestQueue.method1997()) { + field3512 = 0; + field3513.notifyAll(); return; } - field3499 = 600; + field3512 = 600; } } else { - class13.method44(100L); - synchronized(field3500) { - if ((field3498 || field3499 <= 1) && ArchiveDiskActionHandler_requestQueue.method1960()) { - field3499 = 0; - field3500.notifyAll(); + PendingSpawn.method505(100L); + synchronized(field3513) { + if ((field3511 || field3512 <= 1) && ArchiveDiskActionHandler_requestQueue.method1997()) { + field3512 = 0; + field3513.notifyAll(); return; } - --field3499; + --field3512; } } } } catch (Exception var13) { - class317.RunException_sendStackTrace((String)null, var13); + Messages.RunException_sendStackTrace((String)null, var13); } } - @ObfuscatedName("as") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "707019941" + garbageValue = "-224365630" ) - public static void method1849() { - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); + static void method1884() { + ItemComposition.field1768 = new int[2000]; + int var0 = 0; + int var1 = 240; + + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { + var3 = ArchiveLoader.method463((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F)); + ItemComposition.field1768[var0] = var3; + ++var0; + } + + var1 = 48; + + for (int var5 = var1 / 6; var0 < ItemComposition.field1768.length; var1 -= var5) { + var3 = var0 * 2; + + for (int var4 = ArchiveLoader.method463((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < ItemComposition.field1768.length; ++var0) { + ItemComposition.field1768[var0] = var4; + } + } + + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "63" + ) + public static final boolean method1885(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; + } + + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "(ILdh;ZB)I", + garbageValue = "5" + ) + static int method1886(int var0, Script var1, boolean var2) { + if (var0 == 5000) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == 5001) { + SoundCache.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + class128.privateChatMode = DevicePcmPlayerProvider.method74(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + if (class128.privateChatMode == null) { + class128.privateChatMode = PrivateChatMode.field4271; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + PacketBufferNode var11 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.SET_CHATFILTERSETTINGS, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeByte(Client.publicChatMode); + var11.packetBuffer.writeByte(class128.privateChatMode.id); + var11.packetBuffer.writeByte(Client.tradeChatMode); + Client.packetWriter.addNode(var11); + return 1; + } else { + String var3; + int var4; + int var5; + PacketBufferNode var6; + if (var0 == 5002) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + SoundCache.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var6 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.SEND_SNAPSHOT, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var3) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var3); + var6.packetBuffer.writeByte(var4 - 1); + var6.packetBuffer.writeByte(var5); + Client.packetWriter.addNode(var6); + return 1; + } else { + int var7; + Message var8; + if (var0 == 5003) { + SoundCache.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var8 = AbstractByteArrayCopier.Messages_getByChannelAndID(var7, var4); + if (var8 != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.count; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.cycle; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + Message var9; + if (var0 == 5004) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var9 = class33.Messages_getMessage(var7); + if (var9 != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.type; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.cycle; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 5005) { + if (class128.privateChatMode == null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class128.privateChatMode.id; + } + + return 1; + } else { + PacketBufferNode var12; + if (var0 == 5008) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var12 = Actor.method510(var4, var3, ClanChannelMember.clientLanguage, -1); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == 5009) { + class137.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; + String var13 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; + var12 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.MESSAGE_PRIVATE, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShort(0); + int var10 = var12.packetBuffer.offset; + var12.packetBuffer.writeStringCp1252NullTerminated(var3); + class216.method1127(var12.packetBuffer, var13); + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == 5010) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + SoundCache.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var6 = Actor.method510(var4, var3, ClanChannelMember.clientLanguage, var5); + Client.packetWriter.addNode(var6); + return 1; + } else if (var0 != 5015) { + if (var0 == 5016) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == 5017) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = HorizontalAlignment.Messages_getHistorySize(var7); + return 1; + } else if (var0 == 5018) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ClientPacket.Messages_getLastChatID(var7); + return 1; + } else if (var0 == 5019) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ClanChannelMember.method776(var7); + return 1; + } else if (var0 == 5020) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + class85.doCheat(var3); + return 1; + } else if (var0 == 5021) { + Client.field602 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == 5022) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = Client.field602; + return 1; + } else if (var0 == 5023) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + System.out.println(var3); + return 1; + } else if (var0 == 5030) { + SoundCache.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var8 = AbstractByteArrayCopier.Messages_getByChannelAndID(var7, var4); + if (var8 != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.count; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.cycle; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 5031) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var9 = class33.Messages_getMessage(var7); + if (var9 != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.type; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.cycle; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + if (VarbitComposition.localPlayer != null && VarbitComposition.localPlayer.username != null) { + var3 = VarbitComposition.localPlayer.username.getName(); + } else { + var3 = ""; + } + + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3; + return 1; + } + } + } + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveLoader.java b/osrs/src/main/java/ArchiveLoader.java index 5b5b37454..f085eb7c5 100644 --- a/osrs/src/main/java/ArchiveLoader.java +++ b/osrs/src/main/java/ArchiveLoader.java @@ -3,41 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") +@ObfuscatedName("dg") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("al") + @ObfuscatedName("ks") @ObfuscatedSignature( - descriptor = "[[Lmt;" + descriptor = "[Lui;" ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("bb") + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("Widget_archive") - public static AbstractArchive Widget_archive; - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "Lni;" - ) - static GameBuild field849; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lnk;" ) @Export("archive") final Archive archive; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("groupCount") final int groupCount; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Lny;Ljava/lang/String;)V" + descriptor = "(Lnk;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -45,17 +34,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1342854003" + garbageValue = "-533040087" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method1862(var1) || this.archive.method1861(var1)) { + if (!this.archive.method1898(var1) || this.archive.method1897(var1)) { ++this.loadedCount; } } @@ -63,27 +52,136 @@ boolean isLoaded() { return this.loadedCount >= this.groupCount; } - @ObfuscatedName("at") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1877487702" + descriptor = "(Lnu;Lnu;IZB)Ljt;", + garbageValue = "14" ) - public static void method464(int var0, int var1, int var2, int var3) { - class306.musicPlayerStatus = var0; - class306.field2753 = var1; - class306.field2754 = var2; - class306.field2751 = var3; + public static Frames method464(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; + int[] var5 = var0.getGroupFileIds(var2); + + for (int var6 = 0; var6 < var5.length; ++var6) { + byte[] var7 = var0.getFile(var2, var5[var6]); + if (var7 == null) { + var4 = false; + } else { + int var8 = (var7[0] & 255) << 8 | var7[1] & 255; + byte[] var9; + if (var3) { + var9 = var1.getFile(0, var8); + } else { + var9 = var1.getFile(var8, 0); + } + + if (var9 == null) { + var4 = false; + } + } + } + + if (!var4) { + return null; + } else { + try { + return new Frames(var0, var1, var2, var3); + } catch (Exception var11) { + return null; + } + } } - @ObfuscatedName("jd") + @ObfuscatedName("au") + public static final int method463(double var0, double var2, double var4) { + double var6 = var4; + double var8 = var4; + double var10 = var4; + if (var2 != 0.0D) { + double var12; + if (var4 < 0.5D) { + var12 = var4 * (var2 + 1.0D); + } else { + var12 = var4 + var2 - var4 * var2; + } + + double var14 = var4 * 2.0D - var12; + double var16 = var0 + 0.3333333333333333D; + if (var16 > 1.0D) { + --var16; + } + + double var20 = var0 - 0.3333333333333333D; + if (var20 < 0.0D) { + ++var20; + } + + if (var16 * 6.0D < 1.0D) { + var6 = var16 * (var12 - var14) * 6.0D + var14; + } else if (var16 * 2.0D < 1.0D) { + var6 = var12; + } else if (var16 * 3.0D < 2.0D) { + var6 = 6.0D * (0.6666666666666666D - var16) * (var12 - var14) + var14; + } else { + var6 = var14; + } + + if (6.0D * var0 < 1.0D) { + var8 = var0 * 6.0D * (var12 - var14) + var14; + } else if (2.0D * var0 < 1.0D) { + var8 = var12; + } else if (3.0D * var0 < 2.0D) { + var8 = (var12 - var14) * (0.6666666666666666D - var0) * 6.0D + var14; + } else { + var8 = var14; + } + + if (var20 * 6.0D < 1.0D) { + var10 = var20 * 6.0D * (var12 - var14) + var14; + } else if (2.0D * var20 < 1.0D) { + var10 = var12; + } else if (var20 * 3.0D < 2.0D) { + var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14; + } else { + var10 = var14; + } + } + + int var22 = (int)(var6 * 256.0D); + int var13 = (int)(var8 * 256.0D); + int var23 = (int)(var10 * 256.0D); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; + } + + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1936332581" + descriptor = "(II)Lew;", + garbageValue = "-1390229612" ) - static void method465() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - GrandExchangeOfferNameComparator.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + static class128 method466(int var0) { + class128 var1 = (class128)KeyHandler.findEnumerated(FileSystem.method912(), var0); + if (var1 == null) { + var1 = class128.field1229; } + return var1; + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(Lmi;II)V", + garbageValue = "468246736" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field2977 == null) { + throw new RuntimeException(); + } else { + if (var0.field3055 == null) { + var0.field3055 = new int[var0.field2977.length]; + } + + var0.field3055[var1] = Integer.MAX_VALUE; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/AttackOption.java b/osrs/src/main/java/AttackOption.java index c92615282..288855654 100644 --- a/osrs/src/main/java/AttackOption.java +++ b/osrs/src/main/java/AttackOption.java @@ -3,39 +3,50 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") +@ObfuscatedName("dc") @Implements("AttackOption") -public enum AttackOption implements class372 { - @ObfuscatedName("aw") +public enum AttackOption implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Ldc;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Ldc;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Ldc;" ) - field1089(2), - @ObfuscatedName("am") + field1099(2), + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Ldc;" ) @Export("AttackOption_hidden") AttackOption_hidden(3), - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Ldc;" ) - field1090(4); + field1097(4); - @ObfuscatedName("aj") + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Luq;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("fr") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + static Archive field1096; + @ObfuscatedName("ai") @Export("id") final int id; @@ -43,45 +54,158 @@ public enum AttackOption implements class372 { this.id = var3; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("ar") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(IS)Lfj;", - garbageValue = "-25003" + descriptor = "(ILdh;ZB)I", + garbageValue = "-76" ) - static class138 method610(int var0) { - class138 var1 = (class138)ClientPreferences.findEnumerated(GZipDecompressor.method2679(), var0); - if (var1 == null) { - var1 = class138.field1300; - } + static int method607(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 4200) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = InvDefinition.ItemDefinition_get(var3).name; + return 1; + } else { + int var4; + ItemComposition var5; + if (var0 == 4201) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = InvDefinition.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } - return var1; - } + return 1; + } else if (var0 == 4202) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = InvDefinition.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" - ) - static final boolean method609() { - return ViewportMouse.ViewportMouse_isInViewport; - } + return 1; + } else if (var0 == 4203) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == 4204) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; + } else { + ItemComposition var6; + if (var0 == 4205) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var6 = InvDefinition.ItemDefinition_get(var3); + if (var6.noteTemplate == -1 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; + } - @ObfuscatedName("kv") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-57" - ) - static final boolean method611() { - return Client.isMenuOpen; + return 1; + } else if (var0 == 4206) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var6 = InvDefinition.ItemDefinition_get(var3); + if (var6.noteTemplate >= 0 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4207) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == 4208) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var6 = InvDefinition.ItemDefinition_get(var3); + if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4209) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var6 = InvDefinition.ItemDefinition_get(var3); + if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4210) { + String var7 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class161.findItemDefinitions(var7, var4 == 1); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class28.foundItemIdCount; + return 1; + } else if (var0 != 4211) { + if (var0 == 4212) { + class372.foundItemIndex = 0; + return 1; + } else if (var0 == 4213) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var4 = InvDefinition.ItemDefinition_get(var3).getShiftClickIndex(); + if (var4 == -1) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 + 1; + } + + return 1; + } else if (var0 == 4214) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).maleModel; + return 1; + } else if (var0 == 4215) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).maleModel1; + return 1; + } else if (var0 == 4216) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).maleModel2; + return 1; + } else if (var0 == 4217) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var6 = InvDefinition.ItemDefinition_get(var3); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.field1806; + return 1; + } else { + return 2; + } + } else { + if (class156.foundItemIds != null && class372.foundItemIndex < class28.foundItemIdCount) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class156.foundItemIds[++class372.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/AudioFilter.java b/osrs/src/main/java/AudioFilter.java index 46d4f6c5c..f84cfc0c3 100644 --- a/osrs/src/main/java/AudioFilter.java +++ b/osrs/src/main/java/AudioFilter.java @@ -3,119 +3,119 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("cr") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("aj") - static float[][] field300; - @ObfuscatedName("ag") + @ObfuscatedName("ai") + static float[][] field301; + @ObfuscatedName("az") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("az") - static float field299; - @ObfuscatedName("av") + @ObfuscatedName("ap") + static float field300; + @ObfuscatedName("aa") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("pairs") int[] pairs; - @ObfuscatedName("ar") + @ObfuscatedName("ao") int[][][] field306; - @ObfuscatedName("am") - int[][][] field305; - @ObfuscatedName("as") - int[] field303; + @ObfuscatedName("at") + int[][][] field307; + @ObfuscatedName("ac") + int[] field304; static { - field300 = new float[2][8]; + field301 = new float[2][8]; coefficients = new int[2][8]; } AudioFilter() { this.pairs = new int[2]; this.field306 = new int[2][2][4]; - this.field305 = new int[2][2][4]; - this.field303 = new int[2]; + this.field307 = new int[2][2][4]; + this.field304 = new int[2]; } - @ObfuscatedName("aw") - float method313(int var1, int var2, float var3) { - float var4 = (float)this.field305[var1][0][var2] + var3 * (float)(this.field305[var1][1][var2] - this.field305[var1][0][var2]); + @ObfuscatedName("au") + float method316(int var1, int var2, float var3) { + float var4 = (float)this.field307[var1][0][var2] + var3 * (float)(this.field307[var1][1][var2] - this.field307[var1][0][var2]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } - @ObfuscatedName("ar") - float method315(int var1, int var2, float var3) { + @ObfuscatedName("ao") + float method318(int var1, int var2, float var3) { float var4 = (float)this.field306[var1][0][var2] + var3 * (float)(this.field306[var1][1][var2] - this.field306[var1][0][var2]); var4 *= 1.2207031E-4F; return normalize(var4); } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { - var3 = (float)this.field303[0] + (float)(this.field303[1] - this.field303[0]) * var2; + var3 = (float)this.field304[0] + (float)(this.field304[1] - this.field304[0]) * var2; var3 *= 0.0030517578F; - field299 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field299 * 65536.0F); + field300 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field300 * 65536.0F); } if (this.pairs[var1] == 0) { return 0; } else { - var3 = this.method313(var1, 0, var2); - field300[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method315(var1, 0, var2)); - field300[var1][1] = var3 * var3; + var3 = this.method316(var1, 0, var2); + field301[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method318(var1, 0, var2)); + field301[var1][1] = var3 * var3; float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method313(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method315(var1, var4, var2)); + var3 = this.method316(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method318(var1, var4, var2)); float var6 = var3 * var3; - field300[var1][var4 * 2 + 1] = field300[var1][var4 * 2 - 1] * var6; - field300[var1][var4 * 2] = field300[var1][var4 * 2 - 1] * var5 + field300[var1][var4 * 2 - 2] * var6; + field301[var1][var4 * 2 + 1] = field301[var1][var4 * 2 - 1] * var6; + field301[var1][var4 * 2] = field301[var1][var4 * 2 - 1] * var5 + field301[var1][var4 * 2 - 2] * var6; for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field300[var1]; - var10000[var7] += field300[var1][var7 - 1] * var5 + field300[var1][var7 - 2] * var6; + var10000 = field301[var1]; + var10000[var7] += field301[var1][var7 - 1] * var5 + field301[var1][var7 - 2] * var6; } - var10000 = field300[var1]; - var10000[1] += field300[var1][0] * var5 + var6; - var10000 = field300[var1]; + var10000 = field301[var1]; + var10000[1] += field301[var1][0] * var5 + var6; + var10000 = field301[var1]; var10000[0] += var5; } if (var1 == 0) { for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field300[0]; - var10000[var4] *= field299; + var10000 = field301[0]; + var10000[var4] *= field300; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field300[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field301[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lty;Lbz;)V" + descriptor = "(Ltm;Lbr;)V" ) - final void method317(Buffer var1, SoundEnvelope var2) { + final void method320(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.pairs[0] = var3 >> 4; this.pairs[1] = var3 & 15; if (var3 != 0) { - this.field303[0] = var1.readUnsignedShort(); - this.field303[1] = var1.readUnsignedShort(); + this.field304[0] = var1.readUnsignedShort(); + this.field304[1] = var1.readUnsignedShort(); int var4 = var1.readUnsignedByte(); int var5; @@ -123,7 +123,7 @@ final void method317(Buffer var1, SoundEnvelope var2) { for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { this.field306[var5][0][var6] = var1.readUnsignedShort(); - this.field305[var5][0][var6] = var1.readUnsignedShort(); + this.field307[var5][0][var6] = var1.readUnsignedShort(); } } @@ -131,29 +131,29 @@ final void method317(Buffer var1, SoundEnvelope var2) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { if ((var4 & 1 << var5 * 4 << var6) != 0) { this.field306[var5][1][var6] = var1.readUnsignedShort(); - this.field305[var5][1][var6] = var1.readUnsignedShort(); + this.field307[var5][1][var6] = var1.readUnsignedShort(); } else { this.field306[var5][1][var6] = this.field306[var5][0][var6]; - this.field305[var5][1][var6] = this.field305[var5][0][var6]; + this.field307[var5][1][var6] = this.field307[var5][0][var6]; } } } - if (var4 != 0 || this.field303[1] != this.field303[0]) { + if (var4 != 0 || this.field304[1] != this.field304[0]) { var2.decodeSegments(var1); } } else { - int[] var7 = this.field303; - this.field303[1] = 0; + int[] var7 = this.field304; + this.field304[1] = 0; var7[0] = 0; } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); return var1 * 3.1415927F / 11025.0F; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/BZip2Decompressor.java b/osrs/src/main/java/BZip2Decompressor.java index 4c54b3259..bb3d12e0f 100644 --- a/osrs/src/main/java/BZip2Decompressor.java +++ b/osrs/src/main/java/BZip2Decompressor.java @@ -3,12 +3,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tj") +@ObfuscatedName("tt") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Ltb;" + descriptor = "Lte;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { @@ -29,7 +29,7 @@ public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var BZip2Decompressor_state.bsLive = 0; BZip2Decompressor_state.bsBuff = 0; BZip2Decompressor_state.nextBit_unused = 0; - BZip2Decompressor_state.field4135 = 0; + BZip2Decompressor_state.field4182 = 0; BZip2Decompressor_decompress(BZip2Decompressor_state); var1 -= BZip2Decompressor_state.outputLength; BZip2Decompressor_state.inputArray = null; @@ -38,21 +38,21 @@ public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ltb;)V" + descriptor = "(Lte;)V" ) - static void method2588(BZip2State var0) { + static void method2607(BZip2State var0) { byte var2 = var0.out_char; int var3 = var0.su_rNToGo; int var4 = var0.nblocks_used; int var5 = var0.su_ch2; - int[] var6 = class505.BZip2Decompressor_block; - int var7 = var0.field4138; + int[] var6 = class148.BZip2Decompressor_block; + int var7 = var0.field4179; byte[] var8 = var0.outputArray; int var9 = var0.next_out; int var10 = var0.outputLength; - int var12 = var0.field4144 + 1; + int var12 = var0.field4189 + 1; label62: while (true) { @@ -148,25 +148,25 @@ static void method2588(BZip2State var0) { break; } - int var13 = var0.field4135; - var0.field4135 += var10 - var10; - if (var0.field4135 < var13) { + int var13 = var0.field4182; + var0.field4182 += var10 - var10; + if (var0.field4182 < var13) { } var0.out_char = var2; var0.su_rNToGo = var3; var0.nblocks_used = var4; var0.su_ch2 = var5; - class505.BZip2Decompressor_block = var6; - var0.field4138 = var7; + class148.BZip2Decompressor_block = var6; + var0.field4179 = var7; var0.outputArray = var8; var0.next_out = var9; var0.outputLength = var10; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltb;)V" + descriptor = "(Lte;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ static void BZip2Decompressor_decompress(BZip2State var0) { int[] var23 = null; int[] var24 = null; int[] var25 = null; - var0.blockSize100k = -331702915; - if (class505.BZip2Decompressor_block == null) { - class505.BZip2Decompressor_block = new int[var0.blockSize100k * -911678688]; + var0.blockSize100k = -1562387581; + if (class148.BZip2Decompressor_block == null) { + class148.BZip2Decompressor_block = new int[var0.blockSize100k * 731544800]; } boolean var26 = true; @@ -430,7 +430,7 @@ static void BZip2Decompressor_decompress(BZip2State var0) { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; - class505.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + class148.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; ++var47; if (var45 == 0) { ++var43; @@ -489,7 +489,7 @@ static void BZip2Decompressor_decompress(BZip2State var0) { var10000 = var0.unzftab; for (var10000[var1 & 255] += var48; var48 > 0; --var48) { - class505.BZip2Decompressor_block[var47] = var1 & 255; + class148.BZip2Decompressor_block[var47] = var1 & 255; ++var47; } } @@ -509,22 +509,22 @@ static void BZip2Decompressor_decompress(BZip2State var0) { } for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(class505.BZip2Decompressor_block[var36] & 255); - var10000 = class505.BZip2Decompressor_block; + var1 = (byte)(class148.BZip2Decompressor_block[var36] & 255); + var10000 = class148.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; } - var0.field4138 = class505.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.field4179 = class148.BZip2Decompressor_block[var0.originalPointer] >> 8; var0.nblocks_used = 0; - var0.field4138 = class505.BZip2Decompressor_block[var0.field4138]; - var0.su_ch2 = (byte)(var0.field4138 & 255); - var0.field4138 >>= 8; + var0.field4179 = class148.BZip2Decompressor_block[var0.field4179]; + var0.su_ch2 = (byte)(var0.field4179 & 255); + var0.field4179 >>= 8; ++var0.nblocks_used; - var0.field4144 = var47; - method2588(var0); - if (var0.field4144 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field4189 = var47; + method2607(var0); + if (var0.field4189 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } @@ -538,27 +538,27 @@ static void BZip2Decompressor_decompress(BZip2State var0) { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ltb;)B" + descriptor = "(Lte;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltb;)B" + descriptor = "(Lte;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(ILtb;)I" + descriptor = "(ILte;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ static int BZip2Decompressor_readBits(int var0, BZip2State var1) { return var2; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Ltb;)V" + descriptor = "(Lte;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ static void makeMaps(BZip2State var0) { } - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; @@ -637,4 +637,4 @@ static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/BZip2State.java b/osrs/src/main/java/BZip2State.java index 7df914f6e..3d930ce08 100644 --- a/osrs/src/main/java/BZip2State.java +++ b/osrs/src/main/java/BZip2State.java @@ -2,122 +2,122 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("tb") +@ObfuscatedName("te") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("aw") - final int field4156; - @ObfuscatedName("ay") - final int field4157; - @ObfuscatedName("ar") - final int field4154; - @ObfuscatedName("am") - final int field4153; - @ObfuscatedName("as") - final int field4155; - @ObfuscatedName("aj") - final int field4152; - @ObfuscatedName("ag") + @ObfuscatedName("au") + final int field4202; + @ObfuscatedName("ae") + final int field4198; + @ObfuscatedName("ao") + final int field4200; + @ObfuscatedName("at") + final int field4201; + @ObfuscatedName("ac") + final int field4197; + @ObfuscatedName("ai") + final int field4199; + @ObfuscatedName("az") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("nextByte") int nextByte; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("next_out") int next_out; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("outputLength") int outputLength; - @ObfuscatedName("ah") - int field4135; - @ObfuscatedName("ax") + @ObfuscatedName("al") + int field4182; + @ObfuscatedName("an") @Export("out_char") byte out_char; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("bsBuff") int bsBuff; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("bsLive") int bsLive; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("originalPointer") int originalPointer; - @ObfuscatedName("ao") - int field4138; - @ObfuscatedName("ac") + @ObfuscatedName("ah") + int field4179; + @ObfuscatedName("as") @Export("su_ch2") int su_ch2; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("unzftab") int[] unzftab; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("cftab") int[] cftab; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("nInUse") int nInUse; - @ObfuscatedName("bd") + @ObfuscatedName("bh") @Export("inUse") boolean[] inUse; - @ObfuscatedName("bb") + @ObfuscatedName("bj") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("ll8") byte[] ll8; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("selector") byte[] selector; - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("limit") int[][] limit; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @Export("base") int[][] base; - @ObfuscatedName("br") + @ObfuscatedName("bq") @Export("perm") int[][] perm; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("minLens") int[] minLens; - @ObfuscatedName("be") - int field4144; + @ObfuscatedName("bl") + int field4189; BZip2State() { - this.field4156 = 4096; - this.field4157 = 16; - this.field4154 = 258; - this.field4153 = 6; - this.field4155 = 50; - this.field4152 = 18002; + this.field4202 = 4096; + this.field4198 = 16; + this.field4200 = 258; + this.field4201 = 6; + this.field4197 = 50; + this.field4199 = 18002; this.nextByte = 0; this.next_out = 0; this.unzftab = new int[256]; @@ -135,4 +135,4 @@ public final class BZip2State { this.perm = new int[6][258]; this.minLens = new int[6]; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/BoundaryObject.java b/osrs/src/main/java/BoundaryObject.java index 72047d655..9aded7d30 100644 --- a/osrs/src/main/java/BoundaryObject.java +++ b/osrs/src/main/java/BoundaryObject.java @@ -3,45 +3,40 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("jo") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - public static AbstractArchive field2256; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("z") int z; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("x") int x; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("y") int y; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("orientationA") int orientationA; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("orientationB") int orientationB; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lik;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lik;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("tag") public long tag; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("flags") int flags; @@ -49,4 +44,13 @@ public final class BoundaryObject { this.tag = 0L; this.flags = 0; } -} + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)Z", + garbageValue = "1066903143" + ) + static boolean method1384(String var0, int var1) { + return class299.method1618(var0, var1, "openjs"); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Bounds.java b/osrs/src/main/java/Bounds.java index 7d82ac97f..b03499b6f 100644 --- a/osrs/src/main/java/Bounds.java +++ b/osrs/src/main/java/Bounds.java @@ -3,22 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rk") +@ObfuscatedName("rb") @Implements("Bounds") public class Bounds { - @ObfuscatedName("an") - @Export("userHomeDirectory") - static String userHomeDirectory; - @ObfuscatedName("aw") + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lui;" + ) + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("au") @Export("lowX") public int lowX; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("lowY") public int lowY; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("highX") public int highX; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("highY") public int highY; @@ -31,10 +34,10 @@ public Bounds(int var1, int var2) { this(0, 0, var1, var2); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1375793969" + descriptor = "(IIB)V", + garbageValue = "14" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -42,10 +45,10 @@ public void setLow(int var1, int var2) { this.lowY = var2; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1178115137" + descriptor = "(IIB)V", + garbageValue = "15" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -53,40 +56,40 @@ public void setHigh(int var1, int var2) { this.highY = var2; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "-4" + garbageValue = "-32" ) - public boolean method2257(int var1, int var2) { - return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY; + public boolean method2284(int var1, int var2) { + return var1 >= this.lowX && var1 < this.highX + this.lowX && var2 >= this.lowY && var2 < this.lowY + this.highY; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lrk;Lrk;I)V", - garbageValue = "839108851" + descriptor = "(Lrb;Lrb;I)V", + garbageValue = "1929087402" ) - public void method2258(Bounds var1, Bounds var2) { - this.method2259(var1, var2); - this.method2260(var1, var2); + public void method2285(Bounds var1, Bounds var2) { + this.method2286(var1, var2); + this.method2287(var1, var2); } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lrk;Lrk;B)V", - garbageValue = "-5" + descriptor = "(Lrb;Lrb;I)V", + garbageValue = "-270985515" ) - void method2259(Bounds var1, Bounds var2) { + void method2286(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { - var2.highX = (var2.highX * 1322732417 - (var1.lowX * 1322732417 - this.lowX * 1322732417)) * 1200419969; + var2.highX = (var2.highX * 2133643001 - (var1.lowX * 2133643001 - this.lowX * 2133643001)) * -2074045623; var2.lowX = var1.lowX; } - if (var2.method2261() > var1.method2261()) { - var2.highX -= var2.method2261() - var1.method2261(); + if (var2.method2288() > var1.method2288()) { + var2.highX -= var2.method2288() - var1.method2288(); } if (var2.highX < 0) { @@ -95,21 +98,21 @@ void method2259(Bounds var1, Bounds var2) { } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lrk;Lrk;I)V", - garbageValue = "-1620507171" + descriptor = "(Lrb;Lrb;B)V", + garbageValue = "32" ) - void method2260(Bounds var1, Bounds var2) { + void method2287(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { - var2.highY = (var2.highY * 1916255941 - (var1.lowY * 1916255941 - this.lowY * 1916255941)) * 1043533837; + var2.highY = (var2.highY * -584535177 - (var1.lowY * -584535177 - this.lowY * -584535177)) * 377886279; var2.lowY = var1.lowY; } - if (var2.method2262() > var1.method2262()) { - var2.highY -= var2.method2262() - var1.method2262(); + if (var2.method2289() > var1.method2289()) { + var2.highY -= var2.method2289() - var1.method2289(); } if (var2.highY < 0) { @@ -118,22 +121,22 @@ void method2260(Bounds var1, Bounds var2) { } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-16" + garbageValue = "109" ) - int method2261() { + int method2288() { return this.highX + this.lowX; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-83" + descriptor = "(I)I", + garbageValue = "1442366153" ) - int method2262() { - return this.highY + this.lowY; + int method2289() { + return this.lowY + this.highY; } @Export("toString") @@ -142,28 +145,47 @@ public String toString() { return null; } - @ObfuscatedName("ok") + @ObfuscatedName("nz") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2055136301" + descriptor = "(Lmi;I)Z", + garbageValue = "703583258" ) - static void method2263() { - if (Client.oculusOrbOnLocalPlayer && class136.localPlayer != null) { - int var0 = class136.localPlayer.pathX[0]; - int var1 = class136.localPlayer.pathY[0]; - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { - return; + static final boolean method2290(Widget var0) { + int var1 = var0.contentType; + if (var1 == 205) { + Client.logoutTimer = 250; + return true; + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { + var2 = (var1 - 300) / 2; + var3 = var1 & 1; + Client.playerAppearance.changeAppearance(var2, var3 == 1); } - class467.oculusOrbFocalPointX = class136.localPlayer.x; - int var2 = class306.getTileHeight(class136.localPlayer.x, class136.localPlayer.y, class36.Client_plane) - Client.camFollowHeight; - if (var2 < class90.field887) { - class90.field887 = var2; + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method1722(var2, var3 == 1); } - class36.oculusOrbFocalPointY = class136.localPlayer.y; - Client.oculusOrbOnLocalPlayer = false; - } + if (var1 == 324) { + Client.playerAppearance.method1723(0); + } + + if (var1 == 325) { + Client.playerAppearance.method1723(1); + } + if (var1 == 326) { + PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.UPDATE_APPEARANCE, Client.packetWriter.isaacCipher); + Client.playerAppearance.write(var4.packetBuffer); + Client.packetWriter.addNode(var4); + return true; + } else { + return false; + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Buddy.java b/osrs/src/main/java/Buddy.java index f2602c1ad..ebff9e772 100644 --- a/osrs/src/main/java/Buddy.java +++ b/osrs/src/main/java/Buddy.java @@ -3,16 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qa") +@ObfuscatedName("qb") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("world") public int world; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("int2") public int int2; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("rank") public int rank; @@ -20,10 +20,10 @@ public class Buddy extends User { this.world = -1; } - @ObfuscatedName("be") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-104" + descriptor = "(III)V", + garbageValue = "2111367662" ) @Export("set") void set(int var1, int var2) { @@ -31,23 +31,23 @@ void set(int var1, int var2) { this.int2 = var2; } - @ObfuscatedName("bc") + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "1" + garbageValue = "-12" ) @Export("getWorld") public int getWorld() { return this.world; } - @ObfuscatedName("bi") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1047684295" + descriptor = "(B)Z", + garbageValue = "-120" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/BuddyRankComparator.java b/osrs/src/main/java/BuddyRankComparator.java index d571adf5e..873360fb8 100644 --- a/osrs/src/main/java/BuddyRankComparator.java +++ b/osrs/src/main/java/BuddyRankComparator.java @@ -3,12 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ea") +@ObfuscatedName("ek") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("ha") - static String field1182; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -16,10 +14,10 @@ public BuddyRankComparator(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqa;Lqa;I)I", - garbageValue = "1135205552" + descriptor = "(Lqb;Lqb;I)I", + garbageValue = "-1874488966" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -36,14 +34,24 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ov") + @ObfuscatedName("oa") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1036481495" + descriptor = "(Lmi;I)Lmi;", + garbageValue = "915415331" ) - static void setLoginState(int var0) { - if (var0 != Client.loginState) { - Client.loginState = var0; + static Widget method691(Widget var0) { + int var1 = SpriteMask.method1706(NewShit.getWidgetFlags(var0)); + if (var1 == 0) { + return null; + } else { + for (int var2 = 0; var2 < var1; ++var2) { + var0 = class92.getWidget(var0.parentId); + if (var0 == null) { + return null; + } + } + + return var0; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Buffer.java b/osrs/src/main/java/Buffer.java index 2745c0cb0..1fdae79ae 100644 --- a/osrs/src/main/java/Buffer.java +++ b/osrs/src/main/java/Buffer.java @@ -1,22 +1,23 @@ -import java.math.BigInteger; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ty") +import java.math.BigInteger; + +@ObfuscatedName("tm") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("crc32Table") - static int[] crc32Table; - @ObfuscatedName("at") + public static int[] crc32Table; + @ObfuscatedName("aq") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("array") public byte[] array; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("offset") public int offset; @@ -61,7 +62,7 @@ public Buffer(int var1, boolean var2) { } public Buffer(int var1) { - this.array = SpriteMask.ByteArrayPool_getArray(var1); + this.array = class125.ByteArrayPool_getArray(var1); this.offset = 0; } @@ -70,45 +71,45 @@ public Buffer(byte[] var1) { this.offset = 0; } - @ObfuscatedName("bi") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1223847751" + garbageValue = "-1801780173" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { - GrandExchangeOfferUnitPriceComparator.ByteArrayPool_release(this.array); + PlayerType.ByteArrayPool_release(this.array); } this.array = null; } - @ObfuscatedName("bu") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2096591074" + garbageValue = "1656080005" ) - + @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("bk") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1565420110" + garbageValue = "1405457732" ) - + @Export("writeShort") public void writeShort(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("bz") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1259049822" + descriptor = "(IB)V", + garbageValue = "-83" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -117,10 +118,10 @@ public void writeMedium(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("bx") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "278729890" ) @Export("writeInt") public void writeInt(int var1) { @@ -130,7 +131,7 @@ public void writeInt(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("bh") + @ObfuscatedName("bx") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); @@ -141,7 +142,7 @@ public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bm") + @ObfuscatedName("bn") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); @@ -154,20 +155,20 @@ public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bl") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "507731046" + garbageValue = "-80697695" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); } - @ObfuscatedName("by") + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2011320913" + garbageValue = "915346202" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -175,15 +176,15 @@ public void writeStringCp1252NullTerminated(String var1) { if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.offset += class143.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += LoginPacket.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bj") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "1000" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2010597854" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { @@ -192,63 +193,28 @@ public void writeStringCp1252NullCircumfixed(String var1) { throw new IllegalArgumentException(""); } else { this.array[++this.offset - 1] = 0; - this.offset += class143.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += LoginPacket.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("ct") + @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-591645790" + garbageValue = "-2085392381" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { - int var3 = var1.length(); - int var4 = 0; - - int var5; - for (var5 = 0; var5 < var3; ++var5) { - char var6 = var1.charAt(var5); - if (var6 <= 127) { - ++var4; - } else if (var6 <= 2047) { - var4 += 2; - } else { - var4 += 3; - } - } - + int var2 = InvDefinition.method937(var1); this.array[++this.offset - 1] = 0; - this.writeVarInt(var4); - var4 = this.offset * 646629181; - byte[] var12 = this.array; - int var7 = this.offset; - int var8 = var1.length(); - int var9 = var7; - - for (int var10 = 0; var10 < var8; ++var10) { - char var11 = var1.charAt(var10); - if (var11 <= 127) { - var12[var9++] = (byte)var11; - } else if (var11 <= 2047) { - var12[var9++] = (byte)(192 | var11 >> 6); - var12[var9++] = (byte)(128 | var11 & '?'); - } else { - var12[var9++] = (byte)(224 | var11 >> '\f'); - var12[var9++] = (byte)(128 | var11 >> 6 & 63); - var12[var9++] = (byte)(128 | var11 & '?'); - } - } - - var5 = var9 - var7; - this.offset = (var4 + var5 * 646629181) * -164706283; + this.writeVarInt(var2); + this.offset += FloorDecoration.method1179(this.array, this.offset, var1); } - @ObfuscatedName("cf") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "8" + descriptor = "([BIII)V", + garbageValue = "1427589221" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { @@ -258,19 +224,19 @@ public void writeBytes(byte[] var1, int var2, int var3) { } - @ObfuscatedName("cz") + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "250123763" + descriptor = "(Ltm;I)V", + garbageValue = "51362349" ) - public void method2517(Buffer var1) { + public void method2537(Buffer var1) { this.writeBytes(var1.array, 0, var1.offset); } - @ObfuscatedName("cb") + @ObfuscatedName("cs") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "12" + garbageValue = "82" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { @@ -284,10 +250,10 @@ public void writeLengthInt(int var1) { } } - @ObfuscatedName("cs") + @ObfuscatedName("cx") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "739157690" + garbageValue = "-44738618" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { @@ -299,12 +265,12 @@ public void writeLengthShort(int var1) { } } - @ObfuscatedName("cj") + @ObfuscatedName("cr") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "475928363" + garbageValue = "-1799868177" ) - public void method2520(int var1) { + public void method2540(int var1) { if (var1 >= 0 && var1 <= 255) { this.array[this.offset - var1 - 1] = (byte)var1; } else { @@ -312,10 +278,10 @@ public void method2520(int var1) { } } - @ObfuscatedName("cn") + @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-3" + descriptor = "(IS)V", + garbageValue = "15989" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { @@ -328,10 +294,10 @@ public void writeSmartByteShort(int var1) { } } - @ObfuscatedName("cw") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1639112231" + descriptor = "(IB)V", + garbageValue = "26" ) @Export("writeVarInt") public void writeVarInt(int var1) { @@ -354,30 +320,30 @@ public void writeVarInt(int var1) { this.writeByte(var1 & 127); } - @ObfuscatedName("ce") + @ObfuscatedName("cq") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-541617533" + garbageValue = "515674060" ) @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; } - @ObfuscatedName("cq") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "59" + descriptor = "(I)B", + garbageValue = "130364470" ) @Export("readByte") public byte readByte() { return this.array[++this.offset - 1]; } - @ObfuscatedName("cm") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "326" + descriptor = "(B)I", + garbageValue = "-85" ) @Export("readUnsignedShort") public int readUnsignedShort() { @@ -385,10 +351,10 @@ public int readUnsignedShort() { return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("ca") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-1858143695" ) @Export("readShort") public int readShort() { @@ -401,10 +367,10 @@ public int readShort() { return var1; } - @ObfuscatedName("cx") + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1853077439" + descriptor = "(B)I", + garbageValue = "87" ) @Export("readMedium") public int readMedium() { @@ -412,12 +378,12 @@ public int readMedium() { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("co") + @ObfuscatedName("cu") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-515940811" + garbageValue = "618141055" ) - public int method2528() { + public int method2548() { this.offset += 3; int var1 = ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 8388607) { @@ -427,10 +393,10 @@ public int method2528() { return var1; } - @ObfuscatedName("cu") + @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1745928681" + garbageValue = "-85665102" ) @Export("readInt") public int readInt() { @@ -438,41 +404,41 @@ public int readInt() { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); } - @ObfuscatedName("cr") + @ObfuscatedName("ci") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "-1163035721" + garbageValue = "-1147621862" ) @Export("readLong") public long readLong() { long var1 = (long)this.readInt() & 4294967295L; long var3 = (long)this.readInt() & 4294967295L; - return (var1 << 32) + var3; + return var3 + (var1 << 32); } - @ObfuscatedName("cd") + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "(I)F", - garbageValue = "-141150710" + descriptor = "(B)F", + garbageValue = "1" ) - public float method2531() { + public float method2551() { return Float.intBitsToFloat(this.readInt()); } - @ObfuscatedName("cy") + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-769755356" + descriptor = "(B)Z", + garbageValue = "8" ) @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; } - @ObfuscatedName("ck") + @ObfuscatedName("cg") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1454341581" + garbageValue = "1848740572" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { @@ -484,10 +450,10 @@ public String readStringCp1252NullTerminatedOrNull() { } } - @ObfuscatedName("cl") + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "2" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "262549745" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { @@ -497,43 +463,106 @@ public String readStringCp1252NullTerminated() { } int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : LoginType.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : class325.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("cp") + @ObfuscatedName("cz") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-706510313" + garbageValue = "-1654554633" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { byte var1 = this.array[++this.offset - 1]; - int var2 = this.offset; + if (var1 != 0) { + throw new IllegalStateException(""); + } else { + int var2 = this.offset; - while (this.array[++this.offset - 1] != 0) { - } + while (this.array[++this.offset - 1] != 0) { + } - int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : LoginType.decodeStringCp1252(this.array, var2, var3); + int var3 = this.offset - var2 - 1; + return var3 == 0 ? "" : class325.decodeStringCp1252(this.array, var2, var3); + } } - @ObfuscatedName("ch") + @ObfuscatedName("ct") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "381399450" + garbageValue = "-935649711" ) - public String method2536() { + public String method2556() { byte var1 = this.array[++this.offset - 1]; - int var2 = this.readVarInt(); - String var3 = DelayFadeTask.method2088(this.array, this.offset, var2); - this.offset += var2; - return var3; + if (var1 != 0) { + throw new IllegalStateException(""); + } else { + int var2 = this.readVarInt(); + if (var2 + this.offset > this.array.length) { + throw new IllegalStateException(""); + } else { + byte[] var4 = this.array; + int var5 = this.offset; + char[] var6 = new char[var2]; + int var7 = 0; + int var8 = var5; + + int var11; + for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { + int var10 = var4[var8++] & 255; + if (var10 < 128) { + if (var10 == 0) { + var11 = 65533; + } else { + var11 = var10; + } + } else if (var10 < 192) { + var11 = 65533; + } else if (var10 < 224) { + if (var8 < var9 && (var4[var8] & 192) == 128) { + var11 = (var10 & 31) << 6 | var4[var8++] & 63; + if (var11 < 128) { + var11 = 65533; + } + } else { + var11 = 65533; + } + } else if (var10 < 240) { + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; + if (var11 < 2048) { + var11 = 65533; + } + } else { + var11 = 65533; + } + } else if (var10 < 248) { + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; + if (var11 >= 65536 && var11 <= 1114111) { + var11 = 65533; + } else { + var11 = 65533; + } + } else { + var11 = 65533; + } + } else { + var11 = 65533; + } + } + + String var3 = new String(var6, 0, var7); + this.offset += var2; + return var3; + } + } } - @ObfuscatedName("cg") + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-479440090" + descriptor = "([BIIB)V", + garbageValue = "37" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { @@ -543,10 +572,10 @@ public void readBytes(byte[] var1, int var2, int var3) { } - @ObfuscatedName("ci") + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "234174840" ) @Export("readShortSmart") public int readShortSmart() { @@ -554,10 +583,10 @@ public int readShortSmart() { return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } - @ObfuscatedName("cv") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-19" + descriptor = "(I)I", + garbageValue = "1174509102" ) @Export("readUShortSmart") public int readUShortSmart() { @@ -565,22 +594,22 @@ public int readUShortSmart() { return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } - @ObfuscatedName("cc") + @ObfuscatedName("dh") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "20" + descriptor = "(I)I", + garbageValue = "-1553236934" ) - public int method2540() { + public int method2560() { int var1 = this.array[this.offset] & 255; return var1 < 128 ? this.readUnsignedByte() - 1 : this.readUnsignedShort() - 32769; } - @ObfuscatedName("dc") + @ObfuscatedName("dj") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1421104365" + descriptor = "(B)I", + garbageValue = "-94" ) - public int method2541() { + public int method2561() { int var1 = 0; int var2; @@ -592,21 +621,21 @@ public int method2541() { return var1; } - @ObfuscatedName("dq") + @ObfuscatedName("di") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-552900164" + garbageValue = "776176450" ) - public int method2542() { + public int method2562() { return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } - @ObfuscatedName("dg") + @ObfuscatedName("du") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-668079554" + garbageValue = "-1431150361" ) - public int method2543() { + public int method2563() { if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { @@ -615,10 +644,10 @@ public int method2543() { } } - @ObfuscatedName("dj") + @ObfuscatedName("dn") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "823098522" + descriptor = "(B)I", + garbageValue = "41" ) @Export("readVarInt") public int readVarInt() { @@ -632,12 +661,12 @@ public int readVarInt() { return var2 | var1; } - @ObfuscatedName("dy") + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1950523962" + descriptor = "(S)I", + garbageValue = "-28338" ) - public int method2545() { + public int method2565() { int var2 = 0; int var3 = 0; @@ -651,10 +680,10 @@ public int method2545() { return var2; } - @ObfuscatedName("dr") + @ObfuscatedName("dd") @ObfuscatedSignature( descriptor = "([IB)V", - garbageValue = "116" + garbageValue = "2" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { @@ -679,10 +708,10 @@ public void xteaEncryptAll(int[] var1) { } - @ObfuscatedName("do") + @ObfuscatedName("da") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "2089048160" + garbageValue = "-1321598468" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { @@ -707,10 +736,10 @@ public void xteaDecryptAll(int[] var1) { } - @ObfuscatedName("dk") + @ObfuscatedName("ds") @ObfuscatedSignature( descriptor = "([IIII)V", - garbageValue = "-493349311" + garbageValue = "1099130018" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { @@ -737,10 +766,10 @@ public void xteaEncrypt(int[] var1, int var2, int var3) { this.offset = var4; } - @ObfuscatedName("dn") + @ObfuscatedName("dy") @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "1219178611" + descriptor = "([IIIB)V", + garbageValue = "-14" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { @@ -767,10 +796,10 @@ public void xteaDecrypt(int[] var1, int var2, int var3) { this.offset = var4; } - @ObfuscatedName("di") + @ObfuscatedName("dt") @ObfuscatedSignature( descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-2130125779" + garbageValue = "849520517" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { @@ -786,184 +815,207 @@ public void encryptRsa(BigInteger var1, BigInteger var2) { this.writeBytes(var7, 0, var7.length); } - @ObfuscatedName("de") + @ObfuscatedName("dl") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" + descriptor = "(II)I", + garbageValue = "-1394849822" ) @Export("writeCrc") public int writeCrc(int var1) { - int var2 = class358.method1864(this.array, var1, this.offset); - this.writeInt(var2); - return var2; + byte[] var3 = this.array; + int var4 = this.offset; + int var5 = -1; + + for (int var6 = var1; var6 < var4; ++var6) { + var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; + } + + var5 = ~var5; + this.writeInt(var5); + return var5; } - @ObfuscatedName("dd") + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "105" + descriptor = "(I)Z", + garbageValue = "-1935079225" ) @Export("checkCrc") public boolean checkCrc() { this.offset -= 4; - int var1 = class358.method1864(this.array, 0, this.offset); - int var2 = this.readInt(); - return var2 == var1; + byte[] var2 = this.array; + int var3 = this.offset; + int var4 = -1; + + int var5; + for (var5 = 0; var5 < var3; ++var5) { + var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255]; + } + + var4 = ~var4; + var5 = this.readInt(); + return var5 == var4; } - @ObfuscatedName("dt") + @ObfuscatedName("df") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "3631" + descriptor = "(II)V", + garbageValue = "-1286227217" ) public void writeByteAdd(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("df") + @ObfuscatedName("dz") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "1" + garbageValue = "73" ) + @Export("writeMed0") public void writeByteNeg(int var1) { this.array[++this.offset - 1] = (byte)(0 - var1); } - @ObfuscatedName("dm") + @ObfuscatedName("dw") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1114683794" + garbageValue = "1646305705" ) + @Export("writeByteSub") public void writeByteSub(int var1) { this.array[++this.offset - 1] = (byte)(128 - var1); } - @ObfuscatedName("du") + @ObfuscatedName("dv") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "660455721" + garbageValue = "316083007" ) + @Export("readUnsignedByteAdd") public int readUnsignedByteAdd() { return this.array[++this.offset - 1] - 128 & 255; } - @ObfuscatedName("dz") + @ObfuscatedName("dr") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-778478825" + garbageValue = "1007097777" ) + @Export("readUnsignedByteNeg") public int readUnsignedByteNeg() { return 0 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("dx") + @ObfuscatedName("do") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "27227" + descriptor = "(I)I", + garbageValue = "-1108822306" ) + @Export("readUnsignedByteSub") public int readUnsignedByteSub() { return 128 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("dp") + @ObfuscatedName("db") @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "0" + descriptor = "(I)B", + garbageValue = "-302199246" ) + @Export("readByteAdd") public byte readByteAdd() { return (byte)(this.array[++this.offset - 1] - 128); } - @ObfuscatedName("ds") + @ObfuscatedName("dp") @ObfuscatedSignature( descriptor = "(B)B", - garbageValue = "105" + garbageValue = "-122" ) public byte readByteNeg() { return (byte)(0 - this.array[++this.offset - 1]); } - @ObfuscatedName("da") + @ObfuscatedName("dm") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "-963591919" + garbageValue = "1035435646" ) + @Export("readSignedByteSub") public byte readSignedByteSub() { return (byte)(128 - this.array[++this.offset - 1]); } - @ObfuscatedName("dv") + @ObfuscatedName("dx") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1732670980" + garbageValue = "-792934648" ) - @Export("writeShortAdd") - public void writeShortLE(int var1) { + @Export("writeIntME") + public void writeIntME(int var1) { this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("dh") + @ObfuscatedName("dq") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1935689498" + garbageValue = "-1242931377" ) - @Export("writeByteNeg") - public void writeShortAdd(int var1) { + @Export("writeShortAddLE") + public void writeShortAddLE(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("dl") + @ObfuscatedName("de") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "111" + descriptor = "(II)V", + garbageValue = "1382454914" ) - @Export("writeShortAddLE") - public void writeShortAddLE(int var1) { + @Export("writeShortAdd") + public void writeShortAdd(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("db") + @ObfuscatedName("dc") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1581813727" + garbageValue = "1918488867" ) - @Export("readUnsignedByteAdd") - public int readUnsignedShortLE() { + @Export("readIntME") + public int readIntME() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); } - @ObfuscatedName("dw") + @ObfuscatedName("ed") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-35" + descriptor = "(I)I", + garbageValue = "-1798524926" ) - @Export("readUnsignedShortAddLE") - public int readUnsignedShortAdd() { + @Export("readUnsignedShortLE") + public int readUnsignedShortLE() { this.offset += 2; return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("et") + @ObfuscatedName("eh") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "601175876" + descriptor = "(B)I", + garbageValue = "73" ) - - public int readUnsignedShortAddLE() { + public int method2587() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); } - @ObfuscatedName("em") + @ObfuscatedName("ey") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-128" + descriptor = "(I)I", + garbageValue = "2113595632" ) - public int readSignedShortLE() { + public int method2588() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); if (var1 > 32767) { @@ -973,10 +1025,10 @@ public int readSignedShortLE() { return var1; } - @ObfuscatedName("ec") + @ObfuscatedName("ee") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "2" + descriptor = "(I)I", + garbageValue = "-1366788649" ) @Export("readSignedShortAdd") public int readSignedShortAdd() { @@ -989,45 +1041,46 @@ public int readSignedShortAdd() { return var1; } - @ObfuscatedName("el") + @ObfuscatedName("eq") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "176308421" + garbageValue = "-614629253" ) - public void writeMed0(int var1) { + @Export("writeMediumLE") + public void writeMediumLE(int var1) { this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 >> 16); } - @ObfuscatedName("er") + @ObfuscatedName("ej") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-225477546" + garbageValue = "-535659552" ) - public int readUMed2() { + public int method2591() { this.offset += 3; - return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); } - @ObfuscatedName("ew") + @ObfuscatedName("ea") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1135039814" + descriptor = "(B)I", + garbageValue = "1" ) - public int readUMed1() { + public int method2592() { this.offset += 3; - return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); } - @ObfuscatedName("eo") + @ObfuscatedName("er") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "25" + garbageValue = "117" ) - public int readSMed0() { + public int method2593() { this.offset += 3; - int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); + int var1 = (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); if (var1 > 8388607) { var1 -= 16777216; } @@ -1035,11 +1088,27 @@ public int readSMed0() { return var1; } - @ObfuscatedName("eb") + @ObfuscatedName("ev") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-73" + ) + public int method2594() { + this.offset += 3; + int var1 = ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); + if (var1 > 8388607) { + var1 -= 16777216; + } + + return var1; + } + + @ObfuscatedName("ez") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1385470000" + garbageValue = "1615991822" ) + @Export("writeIntLE") public void writeIntLE(int var1) { this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); @@ -1047,25 +1116,25 @@ public void writeIntLE(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 24); } - @ObfuscatedName("ej") + @ObfuscatedName("et") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-326257860" + descriptor = "(IB)V", + garbageValue = "46" ) - @Export("writeIntME") - public void writeIntME(int var1) { + + public void writeIntIME_(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 24); this.array[++this.offset - 1] = (byte)(var1 >> 16); } - @ObfuscatedName("eh") + @ObfuscatedName("en") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "48" + descriptor = "(II)V", + garbageValue = "-2112145568" ) - @Export("writeIntLE") + @Export("writeIntIME") public void writeIntIME(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 16); this.array[++this.offset - 1] = (byte)(var1 >> 24); @@ -1073,128 +1142,47 @@ public void writeIntIME(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("ei") + @ObfuscatedName("eb") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1217320965" + descriptor = "(B)I", + garbageValue = "10" ) - @Export("readUnsignedByteNeg") - public int readIntLE() { + public int method2598() { this.offset += 4; return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); } - @ObfuscatedName("en") + @ObfuscatedName("ei") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1244908443" + garbageValue = "-2095905136" ) - public int readIntME() { + @Export("readUnsignedByteNeg") + public int readUnsignedIntIME() { this.offset += 4; return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); } @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1942437295" + descriptor = "(B)I", + garbageValue = "0" ) + @Export("readUnsignedShortAddLE") public int readIntIME() { this.offset += 4; return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); } - @ObfuscatedName("eq") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "1978153967" - ) - public void readBytesReversed(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { - var1[var4] = this.array[++this.offset - 1]; - } - - } - - @ObfuscatedName("ee") + @ObfuscatedName("el") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "25112654" + garbageValue = "1107296257" ) - public void readBytesReversedAdd(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { + public void method2601(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } } - - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "104" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - class150.clientPreferences.setRoofsHidden(!class150.clientPreferences.getRoofsHidden()); - if (class150.clientPreferences.getRoofsHidden()) { - class415.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - class415.addGameMessage(99, "", "Roofs will only be removed selectively"); - } - } - - if (var0.startsWith("zbuf")) { - boolean var1 = class306.method1584(var0.substring(5).trim()) == 1; - TileItem.client.method152(var1); - Rasterizer3D.method1162(var1); - } - - if (var0.equalsIgnoreCase("z")) { - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("displayfps")) { - class150.clientPreferences.method556(); - } - - if (var0.equalsIgnoreCase("renderself")) { - Client.field382 = !Client.field382; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { - if (var0.equalsIgnoreCase("errortest")) { - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { - class127.worldMap.showCoord = !class127.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { - class150.clientPreferences.method555(true); - } - - if (var0.equalsIgnoreCase("fpsoff")) { - class150.clientPreferences.method555(false); - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { - class93.method508(); - } - } - - PacketBufferNode var2 = class503.getPacketBufferNode(ClientPacket.CLIENT_CHEAT, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(var0.length() + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var2); - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/BufferedFile.java b/osrs/src/main/java/BufferedFile.java index eed8e4c05..6ac6a3269 100644 --- a/osrs/src/main/java/BufferedFile.java +++ b/osrs/src/main/java/BufferedFile.java @@ -1,52 +1,53 @@ -import java.io.EOFException; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ts") +import java.io.EOFException; +import java.io.IOException; + +@ObfuscatedName("td") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ltn;" + descriptor = "Ltu;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("offset") long offset; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("fileLength") long fileLength; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("length") long length; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Ltn;II)V" + descriptor = "(Ltu;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; @@ -59,10 +60,10 @@ public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.offset = 0L; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-57" + garbageValue = "22" ) @Export("close") public void close() throws IOException { @@ -70,7 +71,7 @@ public void close() throws IOException { this.accessFile.close(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { @@ -80,30 +81,30 @@ public void seek(long var1) throws IOException { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(B)J", - garbageValue = "42" + garbageValue = "109" ) @Export("length") public long length() { return this.length; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "-738733320" + garbageValue = "-560983071" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "2118152582" + garbageValue = "-639853271" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -112,7 +113,7 @@ public void read(byte[] var1, int var2, int var3) throws IOException { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { + if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) { System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); this.offset += (long)var3; return; @@ -159,7 +160,7 @@ public void read(byte[] var1, int var2, int var3) throws IOException { this.offset += (long)var8; } - if (this.writeBufferOffset != -1L) { + if (-1L != this.writeBufferOffset) { if (this.writeBufferOffset > this.offset && var3 > 0) { var8 = var2 + (int)(this.writeBufferOffset - this.offset); if (var8 > var3 + var2) { @@ -181,10 +182,10 @@ public void read(byte[] var1, int var2, int var3) throws IOException { var13 = var4; } - if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { + if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= (long)var7 + var4) { var10 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { - var10 = var4 + (long)var7; + } else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { + var10 = (long)var7 + var4; } if (var13 > -1L && var10 > var13) { @@ -206,10 +207,10 @@ public void read(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1103407968" + garbageValue = "-960197049" ) @Export("load") void load() throws IOException { @@ -236,23 +237,23 @@ void load() throws IOException { } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "110" + descriptor = "([BIII)V", + garbageValue = "480897367" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { if ((long)var3 + this.offset > this.length) { - this.length = (long)var3 + this.offset; + this.length = this.offset + (long)var3; } - if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { + if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { this.flush(); } - if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { + if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); this.offset += (long)var4; @@ -264,7 +265,7 @@ public void write(byte[] var1, int var2, int var3) throws IOException { if (var3 <= this.writeBuffer.length) { if (var3 > 0) { - if (this.writeBufferOffset == -1L) { + if (-1L == this.writeBufferOffset) { this.writeBufferOffset = this.offset; } @@ -276,7 +277,7 @@ public void write(byte[] var1, int var2, int var3) throws IOException { } } else { - if (this.fileOffset != this.offset) { + if (this.offset != this.fileOffset) { this.accessFile.seek(this.offset); this.fileOffset = this.offset; } @@ -289,15 +290,15 @@ public void write(byte[] var1, int var2, int var3) throws IOException { long var9 = -1L; long var6 = -1L; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { var9 = this.offset; } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { var9 = this.readBufferOffset; } - if ((long)var3 + this.offset > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { - var6 = (long)var3 + this.offset; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { + if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) { + var6 = this.offset + (long)var3; + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { var6 = this.readBufferOffset + (long)this.readBufferLength; } @@ -314,15 +315,15 @@ public void write(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1216049802" + garbageValue = "-1104225308" ) @Export("flush") void flush() throws IOException { - if (-1L != this.writeBufferOffset) { - if (this.fileOffset != this.writeBufferOffset) { + if (this.writeBufferOffset != -1L) { + if (this.writeBufferOffset != this.fileOffset) { this.accessFile.seek(this.writeBufferOffset); this.fileOffset = this.writeBufferOffset; } @@ -335,16 +336,16 @@ void flush() throws IOException { long var1 = -1L; long var3 = -1L; - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { var1 = this.writeBufferOffset; } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { var1 = this.readBufferOffset; } - if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) { - var3 = (long)this.writeBufferLength + this.writeBufferOffset; - } else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) { - var3 = (long)this.readBufferLength + this.readBufferOffset; + if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { + var3 = this.writeBufferOffset + (long)this.writeBufferLength; + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= this.writeBufferOffset + (long)this.writeBufferLength) { + var3 = this.readBufferOffset + (long)this.readBufferLength; } if (var1 > -1L && var3 > var1) { @@ -357,4 +358,4 @@ void flush() throws IOException { } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/BufferedNetSocket.java b/osrs/src/main/java/BufferedNetSocket.java index a1e31b734..2e572fd9f 100644 --- a/osrs/src/main/java/BufferedNetSocket.java +++ b/osrs/src/main/java/BufferedNetSocket.java @@ -1,32 +1,33 @@ -import java.io.IOException; -import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qq") +import java.io.IOException; +import java.net.Socket; + +@ObfuscatedName("qy") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("aa") - static int[][][] field3806; - @ObfuscatedName("aw") + @ObfuscatedName("ar") + static int[][][] field3820; + @ObfuscatedName("au") @Export("socket") Socket socket; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lqy;" + descriptor = "Lqa;" ) @Export("source") BufferedSource source; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lrh;" + descriptor = "Lqh;" ) @Export("sink") BufferedSink sink; - BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { + public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { this.socket = var1; this.socket.setSoTimeout(30000); this.socket.setTcpNoDelay(true); @@ -36,60 +37,60 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1802443781" + descriptor = "(IB)Z", + garbageValue = "-67" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1927697779" + garbageValue = "1947351494" ) @Export("available") public int available() throws IOException { return this.source.available(); } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "59" + descriptor = "(I)I", + garbageValue = "969166986" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "435794101" + descriptor = "([BIIS)I", + garbageValue = "206" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1992519516" + garbageValue = "1371855899" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1268085940" + garbageValue = "-1457160931" ) @Export("close") public void close() { @@ -109,18 +110,12 @@ protected void finalize() { this.close(); } - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIIZII)J", - garbageValue = "-139142803" + descriptor = "(B)[Lub;", + garbageValue = "-1" ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; - if (var3) { - var5 |= 65536L; - } - - return var5; + static PrivateChatMode[] method2261() { + return new PrivateChatMode[]{PrivateChatMode.field4273, PrivateChatMode.field4272, PrivateChatMode.field4271}; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/BufferedSink.java b/osrs/src/main/java/BufferedSink.java index aef6d64b3..979ed2d82 100644 --- a/osrs/src/main/java/BufferedSink.java +++ b/osrs/src/main/java/BufferedSink.java @@ -1,35 +1,36 @@ -import java.io.IOException; -import java.io.OutputStream; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rh") +import java.io.IOException; +import java.io.OutputStream; + +@ObfuscatedName("qh") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("thread") Thread thread; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("capacity") int capacity; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("buffer") byte[] buffer; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("position") int position; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("limit") int limit; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("exception") IOException exception; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("closed") boolean closed; @@ -44,10 +45,10 @@ public class BufferedSink implements Runnable { this.thread.start(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1093105883" + descriptor = "(S)Z", + garbageValue = "8226" ) @Export("isClosed") boolean isClosed() { @@ -69,10 +70,10 @@ boolean isClosed() { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1711047468" + descriptor = "([BIIB)V", + garbageValue = "37" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -109,10 +110,10 @@ void write(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2122797894" + garbageValue = "-210183735" ) @Export("close") void close() { @@ -189,24 +190,4 @@ public void run() { } while(!this.isClosed()); } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "8211" - ) - public static void method2247() { - while (true) { - ArchiveDiskAction var0; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); - } - - if (var0 == null) { - return; - } - - var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/BufferedSource.java b/osrs/src/main/java/BufferedSource.java index b14adeec1..e77f799b6 100644 --- a/osrs/src/main/java/BufferedSource.java +++ b/osrs/src/main/java/BufferedSource.java @@ -1,33 +1,34 @@ -import java.io.EOFException; -import java.io.IOException; -import java.io.InputStream; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qy") +import java.io.EOFException; +import java.io.IOException; +import java.io.InputStream; + +@ObfuscatedName("qa") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("thread") Thread thread; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("capacity") int capacity; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("buffer") byte[] buffer; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("position") int position; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("limit") int limit; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("exception") IOException exception; @@ -42,10 +43,10 @@ public class BufferedSource implements Runnable { this.thread.start(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1308813308" + descriptor = "(IB)Z", + garbageValue = "23" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -76,10 +77,10 @@ boolean isAvailable(int var1) throws IOException { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "647536706" + garbageValue = "719652359" ) @Export("available") int available() throws IOException { @@ -100,10 +101,10 @@ int available() throws IOException { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1535921504" + descriptor = "(B)I", + garbageValue = "102" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { @@ -123,10 +124,10 @@ int readUnsignedByte() throws IOException { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-1691910602" + garbageValue = "360959196" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -164,10 +165,10 @@ int read(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1404907821" + descriptor = "(S)V", + garbageValue = "-20258" ) @Export("close") void close() { @@ -236,117 +237,12 @@ public void run() { } } - @ObfuscatedName("ld") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;B)V", - garbageValue = "9" + descriptor = "(Lnu;B)V", + garbageValue = "-122" ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = MouseRecorder.getWidgetChild(var1, var2); - if (var5 != null) { - if (var5.onOp != null) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var5; - var6.opIndex = var0; - var6.targetName = var4; - var6.args = var5.onOp; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var6); - } - - boolean var11 = true; - if (var5.contentType > 0) { - var11 = class467.method2326(var5); - } - - if (var11) { - int var8 = UserComparator8.getWidgetFlags(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = class503.getPacketBufferNode(ClientPacket.IF_BUTTON1, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 2) { - var10 = class503.getPacketBufferNode(ClientPacket.IF_BUTTON2, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 3) { - var10 = class503.getPacketBufferNode(ClientPacket.IF_BUTTON3, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 4) { - var10 = class503.getPacketBufferNode(ClientPacket.IF_BUTTON4, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 5) { - var10 = class503.getPacketBufferNode(ClientPacket.IF_BUTTON5, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = class503.getPacketBufferNode(ClientPacket.IF_BUTTON6, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = class503.getPacketBufferNode(ClientPacket.IF_BUTTON7, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = class503.getPacketBufferNode(ClientPacket.IF_BUTTON8, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = class503.getPacketBufferNode(ClientPacket.IF_BUTTON9, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 10) { - var10 = class503.getPacketBufferNode(ClientPacket.IF_BUTTON10, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - } - } - } + public static void method2268(AbstractArchive var0) { + DbTableType.field4110 = var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ByteArrayPool.java b/osrs/src/main/java/ByteArrayPool.java index a48ea4835..0d8d95a03 100644 --- a/osrs/src/main/java/ByteArrayPool.java +++ b/osrs/src/main/java/ByteArrayPool.java @@ -1,77 +1,70 @@ -import java.util.ArrayList; -import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pk") +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; + +@ObfuscatedName("pb") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("az") - static int field3736; - @ObfuscatedName("av") - static int field3735; @ObfuscatedName("ap") - static int field3731; + static int field3743; + @ObfuscatedName("aa") + static int field3738; + @ObfuscatedName("af") + static int field3741; + @ObfuscatedName("ad") + static int field3740; @ObfuscatedName("aq") - static int field3732; - @ObfuscatedName("at") - static int field3734; - @ObfuscatedName("ah") + static int field3744; + @ObfuscatedName("al") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("au") - static byte[][] field3727; - @ObfuscatedName("ae") - @Export("ByteArrayPool_alternativeSizes") - public static int[] ByteArrayPool_alternativeSizes; @ObfuscatedName("ab") - static String[] field3737; - @ObfuscatedName("ao") - public static ArrayList field3724; + static byte[][] field3734; + @ObfuscatedName("ah") + static ArrayList field3746; static { ByteArrayPool_smallCount = 0; ByteArrayPool_mediumCount = 0; ByteArrayPool_largeCount = 0; - field3736 = 0; - field3735 = 1000; - field3731 = 250; - field3732 = 100; - field3734 = 50; + field3743 = 0; + field3738 = 1000; + field3741 = 250; + field3740 = 100; + field3744 = 50; ByteArrayPool_small = new byte[1000][]; ByteArrayPool_medium = new byte[250][]; ByteArrayPool_large = new byte[100][]; - field3727 = new byte[50][]; - field3724 = new ArrayList(); - field3724.clear(); - field3724.add(100); - field3724.add(5000); - field3724.add(10000); - field3724.add(30000); + field3734 = new byte[50][]; + field3746 = new ArrayList(); + class101.method599(); new HashMap(); } - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IZI)[B", - garbageValue = "-1680084006" + garbageValue = "1767173651" ) @Export("ByteArrayPool_getArrayBool") public static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -88,26 +81,26 @@ public static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean v var2 = ByteArrayPool_large[--ByteArrayPool_largeCount]; ByteArrayPool_large[ByteArrayPool_largeCount] = null; return var2; - } else if ((var0 == 30000 || var0 < 30000 && var1) && field3736 > 0) { - var2 = field3727[--field3736]; - field3727[field3736] = null; + } else if ((var0 == 30000 || var0 < 30000 && var1) && field3743 > 0) { + var2 = field3734[--field3743]; + field3734[field3743] = null; return var2; } else { int var4; - if (class152.ByteArrayPool_arrays != null) { - for (var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) { - if ((ByteArrayPool_alternativeSizes[var4] == var0 || var0 < ByteArrayPool_alternativeSizes[var4] && var1) && class125.ByteArrayPool_altSizeArrayCounts[var4] > 0) { - byte[] var3 = class152.ByteArrayPool_arrays[var4][--class125.ByteArrayPool_altSizeArrayCounts[var4]]; - class152.ByteArrayPool_arrays[var4][class125.ByteArrayPool_altSizeArrayCounts[var4]] = null; + if (class410.ByteArrayPool_arrays != null) { + for (var4 = 0; var4 < class416.ByteArrayPool_alternativeSizes.length; ++var4) { + if ((class416.ByteArrayPool_alternativeSizes[var4] == var0 || var0 < class416.ByteArrayPool_alternativeSizes[var4] && var1) && StructComposition.ByteArrayPool_altSizeArrayCounts[var4] > 0) { + byte[] var3 = class410.ByteArrayPool_arrays[var4][--StructComposition.ByteArrayPool_altSizeArrayCounts[var4]]; + class410.ByteArrayPool_arrays[var4][StructComposition.ByteArrayPool_altSizeArrayCounts[var4]] = null; return var3; } } } - if (var1 && ByteArrayPool_alternativeSizes != null) { - for (var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) { - if (var0 <= ByteArrayPool_alternativeSizes[var4] && class125.ByteArrayPool_altSizeArrayCounts[var4] < class152.ByteArrayPool_arrays[var4].length) { - return new byte[ByteArrayPool_alternativeSizes[var4]]; + if (var1 && class416.ByteArrayPool_alternativeSizes != null) { + for (var4 = 0; var4 < class416.ByteArrayPool_alternativeSizes.length; ++var4) { + if (var0 <= class416.ByteArrayPool_alternativeSizes[var4] && StructComposition.ByteArrayPool_altSizeArrayCounts[var4] < class410.ByteArrayPool_arrays[var4].length) { + return new byte[class416.ByteArrayPool_alternativeSizes[var4]]; } } } @@ -115,4 +108,182 @@ public static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean v return new byte[var0]; } } -} + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-8" + ) + static void method2148() { + Iterator var0 = class305.musicSongs.iterator(); + + while (true) { + MusicSong var1; + do { + if (!var0.hasNext()) { + class305.musicSongs.clear(); + return; + } + + var1 = (MusicSong)var0.next(); + } while(var1 == null); + + var1.midiPcmStream.clear(); + var1.midiPcmStream.method1633(); + var1.midiPcmStream.setPcmStreamVolume(0); + var1.midiPcmStream.field2809 = 0; + int var2 = var1.musicTrackGroupId; + int var3 = var1.musicTrackFileId; + Iterator var4 = class305.field2778.iterator(); + + while (var4.hasNext()) { + class311 var5 = (class311)var4.next(); + var5.vmethod1644(var2, var3); + } + } + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "-2055623953" + ) + static int method2149(int var0, Script var1, boolean var2) { + Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + if (var0 == 2600) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == 2601) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == 2602) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == 2603) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == 2604) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == 2605) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == 2606) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == 2607) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == 2608) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == 2609) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 2610) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == 2611) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == 2612) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 2613) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == 2614) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + class324 var4; + if (var0 == 2617) { + var4 = var3.method1845(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2892 * -1007608077 * 1891510843 : 0; + } + + if (var0 == 2618) { + var4 = var3.method1845(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2890 * -113152143 * 439316881 : 0; + return 1; + } else { + class329 var7; + if (var0 == 2619) { + var7 = var3.method1844(); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1780().method2041() : ""; + return 1; + } else if (var0 == 2620) { + var4 = var3.method1845(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2891 * 1092445257 * -767308295 : 0; + return 1; + } else if (var0 == 2621) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1790() : 0; + return 1; + } else if (var0 == 2622) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1791() : 0; + return 1; + } else if (var0 == 2623) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1792() : 0; + return 1; + } else if (var0 == 2624) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null && var7.method1782() ? 1 : 0; + return 1; + } else if (var0 != 2625) { + if (var0 == 2626) { + var7 = var3.method1844(); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1781().method2113() : ""; + return 1; + } else if (var0 == 2627) { + var7 = var3.method1844(); + int var5 = var7 != null ? var7.method1786() : 0; + int var6 = var7 != null ? var7.method1785() : 0; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Math.min(var5, var6); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Math.max(var5, var6); + return 1; + } else if (var0 == 2628) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1785() : 0; + return 1; + } else if (var0 == 2629) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1794() : 0; + return 1; + } else if (var0 == 2630) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1793() : 0; + return 1; + } else if (var0 == 2631) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1795() : 0; + return 1; + } else if (var0 == 2632) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1796() : 0; + return 1; + } else { + class27 var8; + if (var0 == 2633) { + var8 = var3.method1846(); + Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = var8 != null ? var8.method98(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]) : 0; + return 1; + } else if (var0 == 2634) { + var8 = var3.method1846(); + Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = var8 != null ? var8.method99((char)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]) : 0; + return 1; + } else { + return 2; + } + } + } else { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null && var7.method1783() ? 1 : 0; + return 1; + } + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Calendar.java b/osrs/src/main/java/Calendar.java index 16c65f84f..dca6510c1 100644 --- a/osrs/src/main/java/Calendar.java +++ b/osrs/src/main/java/Calendar.java @@ -1,68 +1,26 @@ -import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("md") +import java.util.TimeZone; + +@ObfuscatedName("mo") @Implements("Calendar") public class Calendar { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("MONTH_NAMES_ENGLISH_GERMAN") public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("DAYS_OF_THE_WEEK") public static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("Calendar_calendar") public static java.util.Calendar Calendar_calendar; - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "Lpc;" - ) - @Export("fontBold12") - static Font fontBold12; static { - MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; + MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "M\u00e4r", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "f\u00e9v", "mars", "avr", "mai", "juin", "juil", "ao\u00fbt", "sept", "oct", "nov", "d\u00e9c"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; java.util.Calendar.getInstance(); Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Ljo;IIIII)Z", - garbageValue = "-596982918" - ) - static final boolean method1820(Model var0, int var1, int var2, int var3, int var4) { - if (!AttackOption.method609()) { - return false; - } else { - class11.method39(); - AABB var5 = (AABB)var0.aabb.get(var1); - int var6 = var2 + var5.xMid; - int var7 = var3 + var5.yMid; - int var8 = var4 + var5.zMid; - int var9 = var5.xMidOffset; - int var10 = var5.yMidOffset; - int var11 = var5.zMidOffset; - int var12 = ViewportMouse.field2228 - var6; - int var13 = ViewportMouse.field2227 - var7; - int var14 = class151.field1351 - var8; - if (Math.abs(var12) > var9 + class90.field886) { - return false; - } else if (Math.abs(var13) > var10 + class136.field1286) { - return false; - } else if (Math.abs(var14) > var11 + class387.field3645) { - return false; - } else if (Math.abs(var14 * ViewportMouse.field2229 - var13 * class133.field1281) > var10 * class387.field3645 + var11 * class136.field1286) { - return false; - } else if (Math.abs(var12 * class133.field1281 - var14 * class538.field4242) > var11 * class90.field886 + var9 * class387.field3645) { - return false; - } else { - return Math.abs(var13 * class538.field4242 - var12 * ViewportMouse.field2229) <= var9 * class136.field1286 + var10 * class90.field886; - } - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Canvas.java b/osrs/src/main/java/Canvas.java index b914cb1d2..57ff334b9 100644 --- a/osrs/src/main/java/Canvas.java +++ b/osrs/src/main/java/Canvas.java @@ -1,31 +1,33 @@ -import java.awt.Component; -import java.awt.Graphics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +import java.awt.*; +import java.util.ArrayList; +import java.util.Iterator; + +@ObfuscatedName("av") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("fu") + @ObfuscatedName("wb") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lsi;" ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("nx") - @Export("menuX") - static int menuX; - @ObfuscatedName("sm") + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("ae") + static long field61; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lqk;" + descriptor = "Lbe;" ) - @Export("friendsChat") - static FriendsChat friendsChat; - @ObfuscatedName("um") - static int cameraLookAtX; - @ObfuscatedName("aw") + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("pr") + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("au") @Export("component") Component component; @@ -41,48 +43,124 @@ public final void paint(Graphics var1) { this.component.paint(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("hr") @ObfuscatedSignature( - descriptor = "(IIII)Lud;", - garbageValue = "-2020031634" + descriptor = "(I)V", + garbageValue = "1772266899" ) - static SpritePixels method82(int var0, int var1, int var2) { - DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; - long var4 = (long)(var2 << 16 | var0 << 8 | var1); - return (SpritePixels)var3.get(var4); - } + static final void method77() { + int var3; + for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { + int var10002 = Client.queuedSoundEffectDelays[var0]--; + if (Client.queuedSoundEffectDelays[var0] >= -10) { + SoundEffect var9 = Client.soundEffects[var0]; + if (var9 == null) { + Object var10000 = null; + var9 = SoundEffect.readSoundEffect(class28.field81, Client.soundEffectIds[var0], 0); + if (var9 == null) { + continue; + } - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1227105827" - ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } + int[] var18 = Client.queuedSoundEffectDelays; + var18[var0] += var9.calculateDelay(); + Client.soundEffects[var0] = var9; + } - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "590249840" - ) - static final void method83(String var0) { - PacketBufferNode var1 = class503.getPacketBufferNode(ClientPacket.FRIENDLIST_ADD, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class501.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } + if (Client.queuedSoundEffectDelays[var0] < 0) { + int var2; + if (Client.soundLocations[var0] != 0) { + var3 = (Client.soundLocations[var0] & 255) * 128; + int var4 = Client.soundLocations[var0] >> 16 & 255; + int var5 = var4 * 128 + 64 - VarbitComposition.localPlayer.x; + if (var5 < 0) { + var5 = -var5; + } + + int var6 = Client.soundLocations[var0] >> 8 & 255; + int var7 = var6 * 128 + 64 - VarbitComposition.localPlayer.y; + if (var7 < 0) { + var7 = -var7; + } + + int var8 = var7 + var5 - 128; + if (var8 > var3) { + Client.queuedSoundEffectDelays[var0] = -100; + continue; + } + + if (var8 < 0) { + var8 = 0; + } + + var2 = (var3 - var8) * class449.clientPreferences.getAreaSoundEffectsVolume() / var3; + } else { + var2 = class449.clientPreferences.getCurrentSoundEffectsVolume(); + } + + if (var2 > 0) { + RawSound var10 = var9.toRawSound().resample(class330.decimator); + RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); + var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); + class162.pcmStreamMixer.addSubStream(var11); + } + + Client.queuedSoundEffectDelays[var0] = -100; + } + } else { + --Client.soundEffectCount; + + for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { + Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; + Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; + Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; + Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; + Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; + } + + --var0; + } + } + + if (Client.playingJingle) { + boolean var15; + if (!class305.field2771.isEmpty()) { + var15 = true; + } else if (!class305.musicSongs.isEmpty() && class305.musicSongs.get(0) != null && ((MusicSong)class305.musicSongs.get(0)).midiPcmStream != null) { + var15 = ((MusicSong)class305.musicSongs.get(0)).midiPcmStream.isReady(); + } else { + var15 = false; + } + + if (!var15) { + if (class449.clientPreferences.getCurrentMusicVolume() != 0) { + boolean var16 = !class305.field2773.isEmpty(); + if (var16) { + Archive var12 = class385.archive6; + var3 = class449.clientPreferences.getCurrentMusicVolume(); + if (!class305.field2773.isEmpty()) { + ArrayList var17 = new ArrayList(); + Iterator var13 = class305.field2773.iterator(); + + while (var13.hasNext()) { + MusicSong var14 = (MusicSong)var13.next(); + var14.field2865 = false; + var14.field2866 = false; + var14.field2862 = false; + var14.field2863 = false; + var14.musicTrackArchive = var12; + var14.musicTrackVolume = var3; + var14.field2867 = 0.0F; + var17.add(var14); + } + + class53.method291(var17, class305.musicPlayerStatus, class305.field2766, class305.field2769, class305.field2768, false); + } + } + } + + Client.playingJingle = false; + } + } - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1064085790" - ) - static final int method85(int var0, int var1) { - int var2 = var1 * 57 + var0; - var2 ^= var2 << 13; - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ChatChannel.java b/osrs/src/main/java/ChatChannel.java index e04949f3f..bf3d34cdc 100644 --- a/osrs/src/main/java/ChatChannel.java +++ b/osrs/src/main/java/ChatChannel.java @@ -3,16 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") +@ObfuscatedName("di") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[Lcx;" + descriptor = "[Lco;" ) @Export("messages") Message[] messages; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("count") int count; @@ -20,10 +20,10 @@ public class ChatChannel { this.messages = new Message[100]; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lcx;", - garbageValue = "118" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lco;", + garbageValue = "100" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { @@ -51,51 +51,57 @@ Message addMessage(int var1, String var2, String var3, String var4) { return var5; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)Lcx;", - garbageValue = "1212172296" + descriptor = "(II)Lco;", + garbageValue = "-1297953730" ) @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1702570435" + garbageValue = "1659980687" ) @Export("size") int size() { return this.count; } - @ObfuscatedName("aa") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "932818549" + descriptor = "(I)V", + garbageValue = "818523875" ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; - } + static void method451() { + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; } - @ObfuscatedName("mj") + @ObfuscatedName("hg") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "95" + descriptor = "(I)Z", + garbageValue = "130826002" ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (Login.loadInterface(var0)) { - class420.runComponentCloseListeners(ArchiveLoader.Widget_interfaceComponents[var0], var1); + static boolean method455() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); + if (!var0.isLoaded()) { + return false; + } + + ++Client.archiveLoadersDone; + } + + return true; + } else { + return true; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ClanChannel.java b/osrs/src/main/java/ClanChannel.java index 0cb699ad0..7bb0f931d 100644 --- a/osrs/src/main/java/ClanChannel.java +++ b/osrs/src/main/java/ClanChannel.java @@ -1,53 +1,52 @@ -import java.util.ArrayList; -import java.util.BitSet; -import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +import java.util.ArrayList; +import java.util.BitSet; +import java.util.List; + +@ObfuscatedName("go") @Implements("ClanChannel") public class ClanChannel extends Node { - @ObfuscatedName("at") - public static short[][] field1410; - @ObfuscatedName("aw") - boolean field1411; - @ObfuscatedName("ay") - boolean field1412; - @ObfuscatedName("ar") + @ObfuscatedName("au") + boolean field1423; + @ObfuscatedName("ae") + boolean field1422; + @ObfuscatedName("ao") @Export("members") public List members; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("as") - long field1414; - @ObfuscatedName("aj") + @ObfuscatedName("ac") + public long field1429; + @ObfuscatedName("ai") @Export("name") public String name; - @ObfuscatedName("ag") - public byte field1415; @ObfuscatedName("az") - public byte field1416; + public byte field1426; + @ObfuscatedName("ap") + public byte field1425; static { new BitSet(65536); } @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) public ClanChannel(Buffer var1) { - this.field1412 = true; + this.field1422 = true; this.name = null; - this.method853(var1); + this.method861(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "612198158" + descriptor = "(B)[I", + garbageValue = "74" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -56,20 +55,20 @@ public int[] getSortedMembers() { this.sortedMembers = new int[this.members.size()]; for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { - var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method2682(); + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method2700(); } int[] var3 = this.sortedMembers; - Actor.method516(var1, var3, 0, var1.length - 1); + VerticalAlignment.method998(var1, var3, 0, var1.length - 1); } return this.sortedMembers; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfv;I)V", - garbageValue = "-1094917033" + descriptor = "(Lfu;I)V", + garbageValue = "2089443829" ) @Export("addMember") void addMember(ClanChannelMember var1) { @@ -77,10 +76,10 @@ void addMember(ClanChannelMember var1) { this.sortedMembers = null; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-35" + descriptor = "(II)V", + garbageValue = "-753870503" ) @Export("removeMember") void removeMember(int var1) { @@ -88,22 +87,22 @@ void removeMember(int var1) { this.sortedMembers = null; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1130527405" + descriptor = "(B)I", + garbageValue = "65" ) - public int method851() { + public int method859() { return this.members.size(); } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1760330664" + descriptor = "(Ljava/lang/String;S)I", + garbageValue = "179" ) - public int method852(String var1) { - if (!this.field1412) { + public int method860(String var1) { + if (!this.field1422) { throw new RuntimeException("Displaynames not available"); } else { for (int var2 = 0; var2 < this.members.size(); ++var2) { @@ -116,19 +115,19 @@ public int method852(String var1) { } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "-404696620" + descriptor = "(Ltm;I)V", + garbageValue = "-1748777408" ) - void method853(Buffer var1) { + void method861(Buffer var1) { int var2 = var1.readUnsignedByte(); if ((var2 & 1) != 0) { - this.field1411 = true; + this.field1423 = true; } if ((var2 & 2) != 0) { - this.field1412 = true; + this.field1422 = true; } int var3 = 2; @@ -137,22 +136,22 @@ void method853(Buffer var1) { } super.key = var1.readLong(); - this.field1414 = var1.readLong(); + this.field1429 = var1.readLong(); this.name = var1.readStringCp1252NullTerminated(); var1.readBoolean(); - this.field1416 = var1.readByte(); - this.field1415 = var1.readByte(); + this.field1425 = var1.readByte(); + this.field1426 = var1.readByte(); int var4 = var1.readUnsignedShort(); if (var4 > 0) { this.members = new ArrayList(var4); for (int var5 = 0; var5 < var4; ++var5) { ClanChannelMember var6 = new ClanChannelMember(); - if (this.field1411) { + if (this.field1423) { var1.readLong(); } - if (this.field1412) { + if (this.field1422) { var6.username = new Username(var1.readStringCp1252NullTerminated()); } @@ -168,135 +167,81 @@ void method853(Buffer var1) { } - @ObfuscatedName("as") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)I", - garbageValue = "-1273732472" + descriptor = "(II)Lhz;", + garbageValue = "1042028592" ) - public static int method854(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - throw new NumberFormatException(); - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - throw new NumberFormatException(); - } - - if (var3) { - var10 = -var10; - } - - int var9 = var5 * var1 + var10; - if (var9 / var1 != var5) { - throw new NumberFormatException(); - } - - var5 = var9; - var4 = true; - } - - if (!var4) { - throw new NumberFormatException(); - } else { - return var5; - } + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-1607234368" - ) - static int method856(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == 2700) { - var3 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == 2701) { - var3 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 2702) { - int var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); - if (var4 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - return 1; - } else if (var0 == 2706) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; - } else if (var0 == 2707) { - var3 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method1795() ? 1 : 0; - return 1; - } else if (var0 == 2708) { - var3 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return class74.method439(var3); - } else if (var0 == 2709) { - var3 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return class133.method728(var3); - } else { - return 2; + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("ha") + @ObfuscatedName("jx") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1686824610" + descriptor = "(Lie;S)V", + garbageValue = "12208" ) - static int method855() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - int var0 = 0; + static void method862(class211 var0) { + if (var0 != null && var0.field1878 != null) { + if (var0.field1878.childIndex >= 0) { + Widget var1 = class92.getWidget(var0.field1878.parentId); + if (var1 == null || var1.children == null || var1.children.length == 0 || var0.field1878.childIndex >= var1.children.length || var0.field1878 != var1.children[var0.field1878.childIndex]) { + return; + } + } - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + if (var0.field1878.type == 11 && var0.field1875 == 0) { + if (var0.field1878.method1833(var0.field1876, var0.field1877, 0, 0)) { + switch(var0.field1878.method1837()) { + case 0: + class30.openURL(var0.field1878.method1839(), true, false); + break; + case 1: + int var2 = NewShit.getWidgetFlags(var0.field1878); + boolean var5 = (var2 >> 22 & 1) != 0; + if (var5) { + int[] var3 = var0.field1878.method1840(); + if (var3 != null) { + PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2583, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeIntIME_(var3[1]); + var4.packetBuffer.writeIntIME(var0.field1878.id); + var4.packetBuffer.writeIntME(var0.field1878.childIndex); + var4.packetBuffer.writeInt(var0.field1878.method1838()); + var4.packetBuffer.writeIntIME(var3[2]); + var4.packetBuffer.writeIntIME(var3[0]); + Client.packetWriter.addNode(var4); + } + } + } + } + } else if (var0.field1878.type == 12) { + class329 var6 = var0.field1878.method1844(); + if (var6 != null && var6.method1783()) { + switch(var0.field1875) { + case 0: + Client.field423.method1088(var0.field1878); + var6.method1731(true); + var6.method1770(var0.field1876, var0.field1877, Client.keyHandlerInstance.getKeyPressed(82), Client.keyHandlerInstance.getKeyPressed(81)); + break; + case 1: + var6.method1771(var0.field1876, var0.field1877); + } + } } - return var0 * 10000 / Client.field548; - } else { - return 10000; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ClanChannelMember.java b/osrs/src/main/java/ClanChannelMember.java index dfcbfa841..28628609a 100644 --- a/osrs/src/main/java/ClanChannelMember.java +++ b/osrs/src/main/java/ClanChannelMember.java @@ -1,26 +1,31 @@ -import java.awt.datatransfer.Clipboard; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fu") @Implements("ClanChannelMember") public class ClanChannelMember { - @ObfuscatedName("aw") + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lon;" + ) + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + static Archive field1339; + @ObfuscatedName("au") @Export("rank") public byte rank; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("world") public int world; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lui;" + descriptor = "Luc;" ) @Export("username") public Username username; @@ -28,681 +33,237 @@ public class ClanChannelMember { ClanChannelMember() { } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "([BB)Lud;", - garbageValue = "-39" + descriptor = "(IIIII)I", + garbageValue = "-485826730" ) - public static final SpritePixels method769(byte[] var0) { - BufferedImage var1 = null; - - try { - Class var2 = ImageIO.class; - synchronized(ImageIO.class) { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); - } - - int var6 = var1.getWidth(); - int var7 = var1.getHeight(); - int[] var4 = new int[var7 * var6]; - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var6, var7, var4, 0, var6); - var5.grabPixels(); - return new SpritePixels(var4, var6, var7); - } catch (IOException var9) { - } catch (InterruptedException var10) { - } - - return new SpritePixels(0, 0); + static final int method775(int var0, int var1, int var2, int var3) { + return var3 * var0 + var2 * var1 >> 16; } - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-729456803" + descriptor = "(IB)I", + garbageValue = "2" ) - static int method770(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 0) { - var1 = 0; - } else if (var1 > 127) { - var1 = 127; - } - - var1 = 127 - var1; - return var1; + static int method776(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; } } - @ObfuscatedName("mw") + @ObfuscatedName("iu") @ObfuscatedSignature( - descriptor = "([Lmt;IIIIIIIB)V", - garbageValue = "14" + descriptor = "(Ldr;I)V", + garbageValue = "-973066355" ) - @Export("updateInterface") - static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { - Widget var9 = var0[var8]; - if (var9 != null && var9.parentId == var1 && (var9.method1787() || UserComparator8.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { - if (var9.isIf3) { - if (WorldMapDecorationType.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != WorldMapScaleHandler.mousedOverWidgetIf1 && WorldMapDecorationType.isComponentHidden(var9)) { - continue; - } - - if (var9.type == 11) { - if (var9.method1802(WorldMapLabel.urlRequester)) { - if (var9.method1795()) { - class200.invalidateWidget(var9); - SoundCache.revalidateWidgetScroll(var9.children, var9, true); - } - - if (var9.field3072 != null) { - ScriptEvent var10 = new ScriptEvent(); - var10.widget = var9; - var10.args = var9.field3072; - Client.scriptEvents.addFirst(var10); - } - } - } else if (var9.type == 12 && var9.method1810()) { - class200.invalidateWidget(var9); - } - - int var26 = var9.x + var6; - int var11 = var7 + var9.y; - int var12; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - if (var9.type == 9) { - var16 = var26; - var17 = var11; - var18 = var26 + var9.width; - int var19 = var11 + var9.height; - if (var18 < var26) { - var16 = var18; - var18 = var26; - } - - if (var19 < var11) { - var17 = var19; - var19 = var11; - } + static final void method777(Actor var0) { + int var2; + int var3; + int var4; + int var6; + if (var0.targetIndex != -1) { + Object var1 = null; + var2 = 65536; + if (var0.targetIndex < var2) { + var1 = Client.npcs[var0.targetIndex]; + } else { + var1 = Client.players[var0.targetIndex - var2]; + } - ++var18; - ++var19; - var12 = var16 > var2 ? var16 : var2; - var13 = var17 > var3 ? var17 : var3; - var14 = var18 < var4 ? var18 : var4; - var15 = var19 < var5 ? var19 : var5; - } else { - var16 = var26 + var9.width; - var17 = var11 + var9.height; - var12 = var26 > var2 ? var26 : var2; - var13 = var11 > var3 ? var11 : var3; - var14 = var16 < var4 ? var16 : var4; - var15 = var17 < var5 ? var17 : var5; + if (var1 != null) { + var3 = var0.x - ((Actor)var1).x; + var4 = var0.y - ((Actor)var1).y; + if (var3 != 0 || var4 != 0) { + var6 = (int)(Math.atan2((double)var3, (double)var4) * 325.94932345220167D) & 2047; + var0.orientation = var6; } + } else if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + } - if (var9 == Client.clickedWidget) { - Client.field393 = true; - Client.field520 = var26; - Client.field510 = var11; + int var7; + if (var0.pathLength == 0 || var0.field1021 > 0) { + var7 = -1; + if (var0.field988 != -1 && var0.field989 != -1) { + var2 = var0.field988 * 128 - UrlRequester.baseX * 128 + 64; + var3 = var0.field989 * 128 - class47.baseY * 128 + 64; + var4 = var0.x - var2; + int var8 = var0.y - var3; + if (var4 != 0 || var8 != 0) { + var6 = (int)(Math.atan2((double)var4, (double)var8) * 325.94932345220167D) & 2047; + var7 = var6; } + } else if (var0.movingOrientation != -1) { + var7 = var0.movingOrientation; + } - boolean var34 = false; - if (var9.field2951) { - switch(Client.field503) { - case 0: - var34 = true; - case 1: - default: - break; - case 2: - if (Client.field502 == var9.id >>> 16) { - var34 = true; - } - break; - case 3: - if (var9.id == Client.field502) { - var34 = true; - } - } + if (var7 != -1) { + var0.orientation = var7; + if (var0.field959) { + var0.rotation = var0.orientation; } + } - if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { - if (var9.isIf3) { - ScriptEvent var27; - if (var9.noClickThrough) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var27.field859) { - var27.remove(); - var27.widget.field2954 = false; - } - } - - class417.method2121(); - if (class130.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - class89.addCancelMenuEntry(); - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var27.field859 && var27.widget.onScroll == var27.args) { - var27.remove(); - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var17 = MouseHandler.MouseHandler_lastPressedX; - var18 = MouseHandler.MouseHandler_lastPressedY; - } - - boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; - if (var9.contentType == 1337) { - if (!Client.isLoading && !Client.isMenuOpen && var35) { - class59.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - class166.checkIfMinimapClicked(var9, var26, var11); - } else { - if (var9.contentType == 1400) { - class127.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var35) { - if (var9.contentType == 1400) { - class127.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); - } else { - class317.method1663(var9); - } - } - - boolean var21; - int var23; - if (var34) { - for (int var20 = 0; var20 < var9.field2960.length; ++var20) { - var21 = false; - boolean var22 = false; - if (!var21 && var9.field2960[var20] != null) { - for (var23 = 0; var23 < var9.field2960[var20].length; ++var23) { - boolean var24 = false; - if (var9.field3037 != null) { - var24 = Client.keyHandlerInstance.getKeyPressed(var9.field2960[var20][var23]); - } - - if (class319.method1667(var9.field2960[var20][var23]) || var24) { - var21 = true; - if (var9.field3037 != null && var9.field3037[var20] > Client.cycle) { - break; - } - - byte var33 = var9.field2959[var20][var23]; - if (var33 == 0 || ((var33 & 8) == 0 || !Client.keyHandlerInstance.getKeyPressed(86) && !Client.keyHandlerInstance.getKeyPressed(82) && !Client.keyHandlerInstance.getKeyPressed(81)) && ((var33 & 2) == 0 || Client.keyHandlerInstance.getKeyPressed(86)) && ((var33 & 1) == 0 || Client.keyHandlerInstance.getKeyPressed(82)) && ((var33 & 4) == 0 || Client.keyHandlerInstance.getKeyPressed(81))) { - var22 = true; - break; - } - } - } - } - - if (var22) { - if (var20 < 10) { - BufferedSource.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - SoundCache.Widget_runOnTargetLeave(); - ArchiveDiskAction.selectSpell(var9.id, var9.childIndex, class273.Widget_unpackTargetMask(UserComparator8.getWidgetFlags(var9)), var9.itemId); - Client.field597 = class13.Widget_getSpellActionName(var9); - if (Client.field597 == null) { - Client.field597 = "null"; - } - - Client.field596 = var9.dataText + MusicPatchPcmStream.colorStartTag(16777215); - } - - var23 = var9.field3028[var20]; - if (var9.field3037 == null) { - var9.field3037 = new int[var9.field2960.length]; - } - - if (var9.field3029 == null) { - var9.field3029 = new int[var9.field2960.length]; - } - - if (var23 != 0) { - if (var9.field3037[var20] == 0) { - var9.field3037[var20] = var23 + Client.cycle + var9.field3029[var20]; - } else { - var9.field3037[var20] = var23 + Client.cycle; - } - } else { - var9.field3037[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field3037 != null) { - var9.field3037[var20] = 0; - } - } - } - - if (var9.isIf3) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - var35 = true; - } else { - var35 = false; - } - - boolean var36 = false; - if ((MouseHandler.MouseHandler_currentButton == 1 || !class28.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { - var36 = true; - } - - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !class28.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { - var21 = true; - } - - if (var21) { - class353.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.method1788()) { - if (var21) { - Client.field625.addFirst(new class212(0, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); - } - - if (var36) { - Client.field625.addFirst(new class212(1, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); - } - } - - if (var9.contentType == 1400) { - class127.worldMap.method2361(var17, var18, var35 & var36, var35 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && class319.method1665(UserComparator8.getWidgetFlags(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field391 = true; - Client.field500 = var26; - Client.field504 = var11; - } - - if (var9.hasListener) { - ScriptEvent var28; - if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var28 = new ScriptEvent(); - var28.field859 = true; - var28.widget = var9; - var28.mouseY = Client.mouseWheelRotation; - var28.args = var9.onScroll; - Client.scriptEvents.addFirst(var28); - } - - if (Client.clickedWidget != null || Client.isMenuOpen) { - var21 = false; - var36 = false; - var35 = false; - } - - if (!var9.field2957 && var21) { - var9.field2957 = true; - if (var9.onClick != null) { - var28 = new ScriptEvent(); - var28.field859 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; - var28.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var28.args = var9.onClick; - Client.scriptEvents.addFirst(var28); - } - } - - if (var9.field2957 && var36 && var9.onClickRepeat != null) { - var28 = new ScriptEvent(); - var28.field859 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onClickRepeat; - Client.scriptEvents.addFirst(var28); - } - - if (var9.field2957 && !var36) { - var9.field2957 = false; - if (var9.onRelease != null) { - var28 = new ScriptEvent(); - var28.field859 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onRelease; - Client.field626.addFirst(var28); - } - } - - if (var36 && var9.onHold != null) { - var28 = new ScriptEvent(); - var28.field859 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onHold; - Client.scriptEvents.addFirst(var28); - } - - if (!var9.field2954 && var35) { - var9.field2954 = true; - if (var9.onMouseOver != null) { - var28 = new ScriptEvent(); - var28.field859 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onMouseOver; - Client.scriptEvents.addFirst(var28); - } - } - - if (var9.field2954 && var35 && var9.onMouseRepeat != null) { - var28 = new ScriptEvent(); - var28.field859 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var28); - } - - if (var9.field2954 && !var35) { - var9.field2954 = false; - if (var9.onMouseLeave != null) { - var28 = new ScriptEvent(); - var28.field859 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onMouseLeave; - Client.field626.addFirst(var28); - } - } - - if (var9.onTimer != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onTimer; - Client.field624.addFirst(var28); - } - - ScriptEvent var25; - int var37; - int var38; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3024) { - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3024 <= 32) { - label648: - for (var37 = var9.field3024; var37 < Client.changedVarpCount; ++var37) { - var23 = Client.changedVarps[var37 & 31]; - - for (var38 = 0; var38 < var9.varTransmitTriggers.length; ++var38) { - if (var23 == var9.varTransmitTriggers[var38]) { - var25 = new ScriptEvent(); - var25.widget = var9; - var25.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var25); - break label648; - } - } - } - } else { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3024 = Client.changedVarpCount; - } - - if (var9.onInvTransmit != null && Client.changedItemContainersCount > var9.field3023) { - if (var9.invTransmitTriggers != null && Client.changedItemContainersCount - var9.field3023 <= 32) { - label624: - for (var37 = var9.field3023; var37 < Client.changedItemContainersCount; ++var37) { - var23 = Client.changedItemContainers[var37 & 31]; - - for (var38 = 0; var38 < var9.invTransmitTriggers.length; ++var38) { - if (var23 == var9.invTransmitTriggers[var38]) { - var25 = new ScriptEvent(); - var25.widget = var9; - var25.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var25); - break label624; - } - } - } - } else { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3023 = Client.changedItemContainersCount; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3025) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3025 <= 32) { - label600: - for (var37 = var9.field3025; var37 < Client.changedSkillsCount; ++var37) { - var23 = Client.changedSkills[var37 & 31]; - - for (var38 = 0; var38 < var9.statTransmitTriggers.length; ++var38) { - if (var23 == var9.statTransmitTriggers[var38]) { - var25 = new ScriptEvent(); - var25.widget = var9; - var25.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var25); - break label600; - } - } - } - } else { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3025 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field3026 && var9.onChatTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field516 > var9.field3026 && var9.onFriendTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field509 > var9.field3026 && var9.onClanTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field514 > var9.field3026 && var9.field3070 != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.field3070; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field512 > var9.field3026 && var9.field3062 != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.field3062; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field518 > var9.field3026 && var9.onStockTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var28); - } + var0.method521(); + } - if (Client.field521 > var9.field3026 && var9.field3069 != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.field3069; - Client.scriptEvents.addFirst(var28); - } + var7 = var0.orientation - var0.rotation & 2047; + if (var7 != 0) { + boolean var10 = true; + boolean var11 = true; + ++var0.field1010; + var4 = var7 > 1024 ? -1 : 1; + var0.rotation += var0.field1017 * var4; + boolean var12 = true; + if (var7 < var0.field1017 || var7 > 2048 - var0.field1017) { + var0.rotation = var0.orientation; + var12 = false; + } - if (Client.field524 > var9.field3026 && var9.onMiscTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var28); - } + if (var0.field1017 > 0 && var0.movementSequence == var0.idleSequence && (var0.field1010 > 25 || var12)) { + if (var4 == -1 && var0.turnLeftSequence != -1) { + var0.movementSequence = var0.turnLeftSequence; + } else if (var4 == 1 && var0.turnRightSequence != -1) { + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } - var9.field3026 = Client.cycleCntr; - if (var9.onKey != null) { - for (var37 = 0; var37 < Client.field529; ++var37) { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.keyTyped = Client.field578[var37]; - var29.keyPressed = Client.field576[var37]; - var29.args = var9.onKey; - Client.scriptEvents.addFirst(var29); - } - } + var0.rotation &= 2047; + } else { + if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } - ScriptEvent var30; - int[] var39; - if (var9.field3061 != null) { - var39 = Client.keyHandlerInstance.method1089(); + var0.field1010 = 0; + } - for (var23 = 0; var23 < var39.length; ++var23) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = var39[var23]; - var30.args = var9.field3061; - Client.scriptEvents.addFirst(var30); - } - } + } - if (var9.field3068 != null) { - var39 = Client.keyHandlerInstance.method1090(); + @ObfuscatedName("me") + @ObfuscatedSignature( + descriptor = "(Lmi;B)V", + garbageValue = "70" + ) + static final void method778(Widget var0) { + String var1; + int var2; + int var3; + if (var0.buttonType == 1) { + var1 = var0.buttonText; + var2 = var0.id; + var3 = var0.itemId; + UserComparator8.insertMenuItem(var1, "", 24, 0, 0, var2, var3, false); + } - for (var23 = 0; var23 < var39.length; ++var23) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = var39[var23]; - var30.args = var9.field3068; - Client.scriptEvents.addFirst(var30); - } - } - } - } + int var4; + String var9; + if (var0.buttonType == 2 && !Client.isSpellSelected) { + var1 = class300.Widget_getSpellActionName(var0); + if (var1 != null) { + var9 = MoveSpeed.colorStartTag(65280) + var0.field3097; + var3 = var0.id; + var4 = var0.itemId; + UserComparator8.insertMenuItem(var1, var9, 25, 0, -1, var3, var4, false); + } + } - if (!var9.isIf3) { - if (Client.clickedWidget != null || Client.isMenuOpen) { - continue; - } + if (var0.buttonType == 3) { + class385.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); + } - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - if (var9.mouseOverRedirect >= 0) { - WorldMapScaleHandler.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - WorldMapScaleHandler.mousedOverWidgetIf1 = var9; - } - } + if (var0.buttonType == 4) { + class385.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + } - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - DelayFadeTask.field3700 = var9; - } + if (var0.buttonType == 5) { + class385.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + } - if (var9.scrollHeight > var9.height) { - class143.method761(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { + class385.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + } - if (var9.type == 0) { - updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); - if (var9.children != null) { - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); - } + if (var0.isIf3) { + int var5; + int var6; + int var7; + String var11; + String var12; + if (Client.isSpellSelected) { + var2 = NewShit.getWidgetFlags(var0); + boolean var10 = (var2 >> 21 & 1) != 0; + if (var10 && (Canvas.selectedSpellFlags & 32) == 32) { + var11 = Client.field600; + var12 = Client.field601 + " " + "->" + " " + var0.dataText; + var5 = var0.childIndex; + var6 = var0.id; + var7 = var0.itemId; + UserComparator8.insertMenuItem(var11, var12, 58, 0, var5, var6, var7, false); + } + } else { + for (int var16 = 9; var16 >= 5; --var16) { + var4 = NewShit.getWidgetFlags(var0); + boolean var14 = (var4 >> var16 + 1 & 1) != 0; + if (!var14 && var0.onOp == null) { + var9 = null; + } else if (var0.actions != null && var0.actions.length > var16 && var0.actions[var16] != null && var0.actions[var16].trim().length() != 0) { + var9 = var0.actions[var16]; + } else { + var9 = null; + } - InterfaceParent var31 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var31 != null) { - if (var31.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (ScriptEvent var32 = (ScriptEvent)Client.scriptEvents.last(); var32 != null; var32 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var32.field859) { - var32.remove(); - var32.widget.field2954 = false; - } - } + if (var9 != null) { + var12 = var0.dataText; + var5 = var16 + 1; + var6 = var0.childIndex; + var7 = var0.id; + int var8 = var0.itemId; + UserComparator8.insertMenuItem(var9, var12, 1007, var5, var6, var7, var8, false); + } + } - if (class130.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } + var1 = class300.Widget_getSpellActionName(var0); + if (var1 != null) { + var9 = var0.dataText; + var3 = var0.childIndex; + var4 = var0.id; + var5 = var0.itemId; + UserComparator8.insertMenuItem(var1, var9, 25, 0, var3, var4, var5, false); + } - if (!Client.isMenuOpen) { - class89.addCancelMenuEntry(); - } - } + for (var2 = 4; var2 >= 0; --var2) { + var5 = NewShit.getWidgetFlags(var0); + boolean var15 = (var5 >> var2 + 1 & 1) != 0; + if (!var15 && var0.onOp == null) { + var11 = null; + } else if (var0.actions != null && var0.actions.length > var2 && var0.actions[var2] != null && var0.actions[var2].trim().length() != 0) { + var11 = var0.actions[var2]; + } else { + var11 = null; + } - class10.updateRootInterface(var31.group, var12, var13, var14, var15, var26, var11); - } - } + if (var11 != null) { + UserComparator8.insertMenuItem(var11, var0.dataText, 57, var2 + 1, var0.childIndex, var0.id, var0.itemId, var0.prioritizeMenuEntry); } } + + var3 = NewShit.getWidgetFlags(var0); + boolean var13 = (var3 & 1) != 0; + if (var13) { + class385.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + } } } } - - @ObfuscatedName("oi") - @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/datatransfer/Clipboard;", - garbageValue = "-2056572724" - ) - public static Clipboard method772() { - return TileItem.client.getClipboard(); - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ClanMate.java b/osrs/src/main/java/ClanMate.java index 1747c18aa..62c1b2b9c 100644 --- a/osrs/src/main/java/ClanMate.java +++ b/osrs/src/main/java/ClanMate.java @@ -3,18 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qg") +@ObfuscatedName("qx") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lqj;" + descriptor = "Lqp;" ) @Export("friend") TriBool friend; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lqj;" + descriptor = "Lqp;" ) @Export("ignored") TriBool ignored; @@ -24,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "67" + descriptor = "(I)V", + garbageValue = "298547326" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2011263729" + garbageValue = "1361963631" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public final boolean isFriend() { return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("az") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1028184707" + descriptor = "(B)V", + garbageValue = "9" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = class177.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.friend = class299.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("av") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-24" + descriptor = "(I)V", + garbageValue = "678229771" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("ah") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1660942663" + descriptor = "(B)Z", + garbageValue = "1" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,51 +82,13 @@ public final boolean isIgnored() { return this.ignored == TriBool.TriBool_true; } - @ObfuscatedName("ax") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1198262183" + descriptor = "(B)V", + garbageValue = "-63" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = class177.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "3" - ) - static int method2183(int var0) { - return var0 * 3 + 600; - } - - @ObfuscatedName("mg") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1681653366" - ) - static final void method2184(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - class150.clientPreferences.setCurrentSoundEffectVolume(var0); - } - - @ObfuscatedName("ol") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "779330688" - ) - static String method2185(String var0) { - PlayerType[] var1 = PendingSpawn.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(SecureRandomCallable.addImageTag(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; - } - } - - return var0; + this.ignored = class299.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ClanSettings.java b/osrs/src/main/java/ClanSettings.java index 36e7e0021..6d96f8087 100644 --- a/osrs/src/main/java/ClanSettings.java +++ b/osrs/src/main/java/ClanSettings.java @@ -3,98 +3,95 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("fi") @Implements("ClanSettings") public class ClanSettings { - @ObfuscatedName("wp") - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("useHashes") boolean useHashes; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("useNames") boolean useNames; - @ObfuscatedName("am") - long field1366; - @ObfuscatedName("as") - int field1363; - @ObfuscatedName("aj") + @ObfuscatedName("at") + long field1377; + @ObfuscatedName("ac") + public int field1388; + @ObfuscatedName("ai") @Export("name") public String name; - @ObfuscatedName("ag") - int field1362; @ObfuscatedName("az") + int field1374; + @ObfuscatedName("ap") @Export("allowGuests") public boolean allowGuests; - @ObfuscatedName("av") - public byte field1375; - @ObfuscatedName("ap") - public byte field1372; + @ObfuscatedName("aa") + public byte field1383; + @ObfuscatedName("af") + public byte field1385; + @ObfuscatedName("ad") + public byte field1384; @ObfuscatedName("aq") - public byte field1373; - @ObfuscatedName("at") - public byte field1374; - @ObfuscatedName("ah") + public byte field1386; + @ObfuscatedName("al") @Export("memberCount") public int memberCount; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("memberHashes") long[] memberHashes; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("memberRanks") public byte[] memberRanks; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("ae") - int[] field1364; - @ObfuscatedName("ab") - public int[] field1381; - @ObfuscatedName("ad") - public boolean[] field1371; - @ObfuscatedName("ao") + @ObfuscatedName("ag") + int[] field1376; + @ObfuscatedName("am") + public int[] field1393; + @ObfuscatedName("ax") + public boolean[] field1382; + @ObfuscatedName("ah") @Export("currentOwner") public int currentOwner; - @ObfuscatedName("ac") - public int field1377; - @ObfuscatedName("ak") + @ObfuscatedName("as") + public int field1391; + @ObfuscatedName("ay") @Export("bannedMemberCount") public int bannedMemberCount; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("bannedMemberHashes") long[] bannedMemberHashes; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("memberNames") public String[] memberNames; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("bannedMemberNames") public String[] bannedMemberNames; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lsa;" + descriptor = "Lsf;" ) @Export("parameters") IterableNodeHashTable parameters; @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) public ClanSettings(Buffer var1) { - this.field1363 = 0; + this.field1388 = 0; this.name = null; - this.field1362 = 0; + this.field1374 = 0; this.currentOwner = -1; - this.field1377 = -1; - this.method822(var1); + this.field1391 = -1; + this.method825(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-99" + descriptor = "(II)V", + garbageValue = "-1511272498" ) - void method801(int var1) { + void method806(int var1) { if (this.useHashes) { if (this.memberHashes != null) { System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); @@ -117,32 +114,32 @@ void method801(int var1) { this.memberRanks = new byte[var1]; } - if (this.field1364 != null) { - System.arraycopy(this.field1364, 0, this.field1364 = new int[var1], 0, this.memberCount); + if (this.field1376 != null) { + System.arraycopy(this.field1376, 0, this.field1376 = new int[var1], 0, this.memberCount); } else { - this.field1364 = new int[var1]; + this.field1376 = new int[var1]; } - if (this.field1381 != null) { - System.arraycopy(this.field1381, 0, this.field1381 = new int[var1], 0, this.memberCount); + if (this.field1393 != null) { + System.arraycopy(this.field1393, 0, this.field1393 = new int[var1], 0, this.memberCount); } else { - this.field1381 = new int[var1]; + this.field1393 = new int[var1]; } - if (this.field1371 != null) { - System.arraycopy(this.field1371, 0, this.field1371 = new boolean[var1], 0, this.memberCount); + if (this.field1382 != null) { + System.arraycopy(this.field1382, 0, this.field1382 = new boolean[var1], 0, this.memberCount); } else { - this.field1371 = new boolean[var1]; + this.field1382 = new boolean[var1]; } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "27" + garbageValue = "7" ) - void method802(int var1) { + void method807(int var1) { if (this.useHashes) { if (this.bannedMemberHashes != null) { System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); @@ -161,12 +158,12 @@ void method802(int var1) { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "0" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-849658856" ) - public int method803(String var1) { + public int method808(String var1) { if (var1 != null && var1.length() != 0) { for (int var2 = 0; var2 < this.memberCount; ++var2) { if (this.memberNames[var2].equals(var1)) { @@ -180,20 +177,20 @@ public int method803(String var1) { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "-1559681164" + garbageValue = "1158045265" ) - public int method804(int var1, int var2, int var3) { + public int method809(int var1, int var2, int var3) { int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; - return (this.field1364[var1] & var4) >>> var2; + return (this.field1376[var1] & var4) >>> var2; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/Integer;", - garbageValue = "-1591193195" + garbageValue = "1038796157" ) @Export("getTitleGroupValue") public Integer getTitleGroupValue(int var1) { @@ -205,10 +202,10 @@ public Integer getTitleGroupValue(int var1) { } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "-7" + descriptor = "(I)[I", + garbageValue = "-521962752" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -224,29 +221,29 @@ public int[] getSortedMembers() { } int[] var3 = this.sortedMembers; - Actor.method516(var1, var3, 0, var1.length - 1); + VerticalAlignment.method998(var1, var3, 0, var1.length - 1); } return this.sortedMembers; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;II)V", - garbageValue = "467664753" + descriptor = "(JLjava/lang/String;IB)V", + garbageValue = "-21" ) - void method808(long var1, String var3, int var4) { + void method812(long var1, String var3, int var4) { if (var3 != null && var3.length() == 0) { var3 = null; } if (this.useHashes != var1 > 0L) { throw new RuntimeException(""); - } else if (var3 != null != this.useNames) { + } else if (this.useNames != (var3 != null)) { throw new RuntimeException(""); } else { if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { - this.method801(this.memberCount + 5); + this.method806(this.memberCount + 5); } if (this.memberHashes != null) { @@ -264,20 +261,20 @@ void method808(long var1, String var3, int var4) { this.memberRanks[this.memberCount] = 0; } - this.field1364[this.memberCount] = 0; - this.field1381[this.memberCount] = var4; - this.field1371[this.memberCount] = false; + this.field1376[this.memberCount] = 0; + this.field1393[this.memberCount] = var4; + this.field1382[this.memberCount] = false; ++this.memberCount; this.sortedMembers = null; } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1952591895" + descriptor = "(IB)V", + garbageValue = "-22" ) - void method809(int var1) { + void method813(int var1) { if (var1 >= 0 && var1 < this.memberCount) { --this.memberCount; this.sortedMembers = null; @@ -285,16 +282,16 @@ void method809(int var1) { this.memberHashes = null; this.memberNames = null; this.memberRanks = null; - this.field1364 = null; - this.field1381 = null; - this.field1371 = null; + this.field1376 = null; + this.field1393 = null; + this.field1382 = null; this.currentOwner = -1; - this.field1377 = -1; + this.field1391 = -1; } else { System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); - System.arraycopy(this.field1364, var1 + 1, this.field1364, var1, this.memberCount - var1); - System.arraycopy(this.field1381, var1 + 1, this.field1381, var1, this.memberCount - var1); - System.arraycopy(this.field1371, var1 + 1, this.field1371, var1, this.memberCount - var1); + System.arraycopy(this.field1376, var1 + 1, this.field1376, var1, this.memberCount - var1); + System.arraycopy(this.field1393, var1 + 1, this.field1393, var1, this.memberCount - var1); + System.arraycopy(this.field1382, var1 + 1, this.field1382, var1, this.memberCount - var1); if (this.memberHashes != null) { System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); } @@ -311,32 +308,32 @@ void method809(int var1) { } } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "512" + descriptor = "(I)V", + garbageValue = "1152334560" ) @Export("updateOwner") void updateOwner() { if (this.memberCount == 0) { this.currentOwner = -1; - this.field1377 = -1; + this.field1391 = -1; } else { this.currentOwner = -1; - this.field1377 = -1; + this.field1391 = -1; int var1 = 0; byte var2 = this.memberRanks[0]; for (int var3 = 1; var3 < this.memberCount; ++var3) { if (this.memberRanks[var3] > var2) { if (var2 == 125) { - this.field1377 = var1; + this.field1391 = var1; } var1 = var3; var2 = this.memberRanks[var3]; - } else if (this.field1377 == -1 && this.memberRanks[var3] == 125) { - this.field1377 = var3; + } else if (this.field1391 == -1 && this.memberRanks[var3] == 125) { + this.field1391 = var3; } } @@ -348,23 +345,23 @@ void updateOwner() { } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;B)V", - garbageValue = "14" + descriptor = "(JLjava/lang/String;I)V", + garbageValue = "-1457470912" ) - void method811(long var1, String var3) { + void method815(long var1, String var3) { if (var3 != null && var3.length() == 0) { var3 = null; } if (this.useHashes != var1 > 0L) { throw new RuntimeException(""); - } else if (this.useNames != (var3 != null)) { + } else if (var3 != null != this.useNames) { throw new RuntimeException(""); } else { if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { - this.method802(this.bannedMemberCount + 5); + this.method807(this.bannedMemberCount + 5); } if (this.bannedMemberHashes != null) { @@ -379,12 +376,12 @@ void method811(long var1, String var3) { } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1088918765" + garbageValue = "509826850" ) - void method812(int var1) { + void method816(int var1) { --this.bannedMemberCount; if (this.bannedMemberCount == 0) { this.bannedMemberHashes = null; @@ -401,14 +398,14 @@ void method812(int var1) { } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(IBB)I", - garbageValue = "52" + garbageValue = "91" ) - int method813(int var1, byte var2) { + int method817(int var1, byte var2) { if (var2 != 126 && var2 != 127) { - if (this.currentOwner == var1 && (this.field1377 == -1 || this.memberRanks[this.field1377] < 125)) { + if (this.currentOwner == var1 && (this.field1391 == -1 || this.memberRanks[this.field1391] < 125)) { return -1; } else if (this.memberRanks[var1] == var2) { return -1; @@ -422,15 +419,15 @@ int method813(int var1, byte var2) { } } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-396487017" + garbageValue = "1652565060" ) - boolean method814(int var1) { + boolean method818(int var1) { if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { this.memberRanks[this.currentOwner] = 125; - this.field1377 = this.currentOwner; + this.field1391 = this.currentOwner; this.memberRanks[var1] = 126; this.currentOwner = var1; return true; @@ -439,47 +436,47 @@ boolean method814(int var1) { } } - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(IZI)I", - garbageValue = "-2064740841" + garbageValue = "-1953931812" ) - int method816(int var1, boolean var2) { - if (this.field1371[var1] == var2) { + int method819(int var1, boolean var2) { + if (this.field1382[var1] == var2) { return -1; } else { - this.field1371[var1] = var2; + this.field1382[var1] = var2; return var1; } } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(IIIII)I", - garbageValue = "1959406854" + garbageValue = "-637099928" ) - int method817(int var1, int var2, int var3, int var4) { + int method820(int var1, int var2, int var3, int var4) { int var5 = (1 << var3) - 1; int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; int var7 = var6 ^ var5; var2 <<= var3; var2 &= var7; - int var8 = this.field1364[var1]; + int var8 = this.field1376[var1]; if ((var8 & var7) == var2) { return -1; } else { var8 &= ~var7; - this.field1364[var1] = var8 | var2; + this.field1376[var1] = var8 | var2; return var1; } } - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1527590852" + garbageValue = "-2075021651" ) - boolean method818(int var1, int var2) { + boolean method821(int var1, int var2) { if (this.parameters != null) { Node var3 = this.parameters.get((long)var1); if (var3 != null) { @@ -503,12 +500,12 @@ boolean method818(int var1, int var2) { return true; } - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IIIII)Z", - garbageValue = "1527727717" + descriptor = "(IIIIB)Z", + garbageValue = "0" ) - boolean method819(int var1, int var2, int var3, int var4) { + boolean method822(int var1, int var2, int var3, int var4) { int var5 = (1 << var3) - 1; int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; int var7 = var6 ^ var5; @@ -538,8 +535,8 @@ boolean method819(int var1, int var2, int var3, int var4) { return true; } - @ObfuscatedName("ab") - boolean method820(int var1, long var2) { + @ObfuscatedName("am") + boolean method823(int var1, long var2) { if (this.parameters != null) { Node var4 = this.parameters.get((long)var1); if (var4 != null) { @@ -563,12 +560,12 @@ boolean method820(int var1, long var2) { return true; } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;S)Z", - garbageValue = "15012" + descriptor = "(ILjava/lang/String;I)Z", + garbageValue = "-713995944" ) - boolean method821(int var1, String var2) { + boolean method824(int var1, String var2) { if (var2 == null) { var2 = ""; } else if (var2.length() > 80) { @@ -601,12 +598,12 @@ boolean method821(int var1, String var2) { return true; } - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "-641248299" + descriptor = "(Ltm;I)V", + garbageValue = "633008304" ) - void method822(Buffer var1) { + void method825(Buffer var1) { int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 6) { int var3 = var1.readUnsignedByte(); @@ -628,10 +625,10 @@ void method822(Buffer var1) { this.bannedMemberNames = null; } - this.field1363 = var1.readInt(); - this.field1362 = var1.readInt(); - if (var2 <= 3 && this.field1362 != 0) { - this.field1362 += 16912800; + this.field1388 = var1.readInt(); + this.field1374 = var1.readInt(); + if (var2 <= 3 && this.field1374 != 0) { + this.field1374 += 16912800; } this.memberCount = var1.readUnsignedShort(); @@ -642,10 +639,10 @@ void method822(Buffer var1) { } this.allowGuests = var1.readUnsignedByte() == 1; - this.field1375 = var1.readByte(); - this.field1372 = var1.readByte(); - this.field1373 = var1.readByte(); - this.field1374 = var1.readByte(); + this.field1383 = var1.readByte(); + this.field1385 = var1.readByte(); + this.field1384 = var1.readByte(); + this.field1386 = var1.readByte(); int var4; if (this.memberCount > 0) { if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { @@ -660,16 +657,16 @@ void method822(Buffer var1) { this.memberRanks = new byte[this.memberCount]; } - if (this.field1364 == null || this.field1364.length < this.memberCount) { - this.field1364 = new int[this.memberCount]; + if (this.field1376 == null || this.field1376.length < this.memberCount) { + this.field1376 = new int[this.memberCount]; } - if (this.field1381 == null || this.field1381.length < this.memberCount) { - this.field1381 = new int[this.memberCount]; + if (this.field1393 == null || this.field1393.length < this.memberCount) { + this.field1393 = new int[this.memberCount]; } - if (this.field1371 == null || this.field1371.length < this.memberCount) { - this.field1371 = new boolean[this.memberCount]; + if (this.field1382 == null || this.field1382.length < this.memberCount) { + this.field1382 = new boolean[this.memberCount]; } for (var4 = 0; var4 < this.memberCount; ++var4) { @@ -683,19 +680,19 @@ void method822(Buffer var1) { this.memberRanks[var4] = var1.readByte(); if (var2 >= 2) { - this.field1364[var4] = var1.readInt(); + this.field1376[var4] = var1.readInt(); } if (var2 >= 5) { - this.field1381[var4] = var1.readUnsignedShort(); + this.field1393[var4] = var1.readUnsignedShort(); } else { - this.field1381[var4] = 0; + this.field1393[var4] = 0; } if (var2 >= 6) { - this.field1371[var4] = var1.readUnsignedByte() == 1; + this.field1382[var4] = var1.readUnsignedByte() == 1; } else { - this.field1371[var4] = false; + this.field1382[var4] = false; } } @@ -725,7 +722,7 @@ void method822(Buffer var1) { if (var2 >= 3) { var4 = var1.readUnsignedShort(); if (var4 > 0) { - this.parameters = new IterableNodeHashTable(var4 < 16 ? UrlRequest.method657(var4) : 16); + this.parameters = new IterableNodeHashTable(var4 < 16 ? WorldMapIcon_1.method1401(var4) : 16); while (var4-- > 0) { int var5 = var1.readInt(); @@ -749,123 +746,4 @@ void method822(Buffer var1) { throw new RuntimeException("" + var2); } } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "-422907991" - ) - static char method806(char var0) { - if (var0 == 198) { - return 'E'; - } else if (var0 == 230) { - return 'e'; - } else if (var0 == 223) { - return 's'; - } else if (var0 == 338) { - return 'E'; - } else { - return (char)(var0 == 339 ? 'e' : '\u0000'); - } - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Lcr;Lcr;IZI)I", - garbageValue = "242171091" - ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { - int var4 = var0.population; - int var5 = var1.population; - if (!var3) { - if (var4 == -1) { - var4 = 2001; - } - - if (var5 == -1) { - var5 = 2001; - } - } - - return var4 - var5; - } else if (var2 == 2) { - return var0.location - var1.location; - } else if (var2 == 3) { - if (var0.activity.equals("-")) { - if (var1.activity.equals("-")) { - return 0; - } else { - return var3 ? -1 : 1; - } - } else if (var1.activity.equals("-")) { - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); - } - } else if (var2 == 4) { - return var0.method398() ? (var1.method398() ? 0 : 1) : (var1.method398() ? -1 : 0); - } else if (var2 == 5) { - return var0.method396() ? (var1.method396() ? 0 : 1) : (var1.method396() ? -1 : 0); - } else if (var2 == 6) { - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } else { - return var0.id - var1.id; - } - } - - @ObfuscatedName("kl") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "993695105" - ) - static void method823(int var0, int var1) { - int var2 = Calendar.fontBold12.stringWidth("Choose Option"); - - int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - Font var4 = Calendar.fontBold12; - String var5; - if (var3 < 0) { - var5 = ""; - } else if (Client.menuTargets[var3].length() > 0) { - var5 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; - } else { - var5 = Client.menuActions[var3]; - } - - int var6 = var4.stringWidth(var5); - if (var6 > var2) { - var2 = var6; - } - } - - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - int var7 = var0 - var2 / 2; - if (var2 + var7 > GrandExchangeOfferTotalQuantityComparator.canvasWidth) { - var7 = GrandExchangeOfferTotalQuantityComparator.canvasWidth - var2; - } - - if (var7 < 0) { - var7 = 0; - } - - int var8 = var1; - if (var3 + var1 > WorldMapArchiveLoader.canvasHeight) { - var8 = WorldMapArchiveLoader.canvasHeight - var3; - } - - if (var8 < 0) { - var8 = 0; - } - - Canvas.menuX = var7; - UserComparator6.menuY = var8; - UserComparator5.menuWidth = var2; - ModeWhere.menuHeight = Client.menuOptionsCount * 15 + 22; - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Client.java b/osrs/src/main/java/Client.java index eeb896ab7..25cf068c5 100644 --- a/osrs/src/main/java/Client.java +++ b/osrs/src/main/java/Client.java @@ -1,957 +1,984 @@ -import cloud.ServerPacketsEnum; import com.jagex.oldscape.pub.OAuthApi; import com.jagex.oldscape.pub.OtlTokenRequester; import com.jagex.oldscape.pub.RefreshAccessTokenRequester; import com.jagex.oldscape.pub.RefreshAccessTokenResponse; -import java.io.IOException; -import java.net.Socket; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.api.RSClient; +import netscape.js.JSObject; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.net.Socket; +import java.net.URL; +import java.util.*; +import java.util.concurrent.Future; @Implements("Client") @ObfuscatedName("client") -public final class Client extends GameEngine implements Usernamed, OAuthApi, class312 { - +public final class Client extends GameEngine implements Usernamed, OAuthApi, class311 { boolean shouldProcessClick() { return false; } - @ObfuscatedName("vq") + @ObfuscatedName("vd") @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("vu") + @ObfuscatedName("vc") @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("wj") - public static int field364; + @ObfuscatedName("wd") + public static int field369; + @ObfuscatedName("xy") + static int[] field593; + @ObfuscatedName("uh") + static boolean field400; + @ObfuscatedName("xf") + static int[] field592; @ObfuscatedName("xm") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcl;" ) - static final ApproximateRouteStrategy field647; - @ObfuscatedName("xk") - static int[] field589; - @ObfuscatedName("xz") - static int[] field590; - @ObfuscatedName("wc") + static final ApproximateRouteStrategy field652; + @ObfuscatedName("vb") + static int field542; + @ObfuscatedName("vw") + @Export("cameraShaking") + static boolean[] cameraShaking; + @ObfuscatedName("vy") + @ObfuscatedSignature( + descriptor = "Lmt;" + ) + @Export("playerAppearance") + static PlayerComposition playerAppearance; + @ObfuscatedName("vs") + static int field547; + @ObfuscatedName("wx") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("vz") - static int field545; - @ObfuscatedName("wl") + @ObfuscatedName("wj") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("Widget_cachedFonts") static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("vi") - @ObfuscatedSignature( - descriptor = "Lmb;" - ) - @Export("playerAppearance") - static PlayerComposition playerAppearance; - @ObfuscatedName("vt") - static int field542; @ObfuscatedName("wv") - @ObfuscatedSignature( - descriptor = "Lql;" - ) - @Export("archive5") - static class424 archive5; - @ObfuscatedName("wz") @Export("archiveLoaders") static ArrayList archiveLoaders; - @ObfuscatedName("vf") - static boolean[] cameraShaking; - @ObfuscatedName("wb") + @ObfuscatedName("wk") @Export("archiveLoadersDone") static int archiveLoadersDone; - @ObfuscatedName("vy") + @ObfuscatedName("ws") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Lqv;" ) - static class476 field641; - @ObfuscatedName("vm") - static short field634; - @ObfuscatedName("vv") + @Export("archive5") + static class423 archive5; + @ObfuscatedName("wo") + @ObfuscatedSignature( + descriptor = "Lsv;" + ) + static class475 field645; + @ObfuscatedName("vl") + static short field638; + @ObfuscatedName("vp") + static short field640; + @ObfuscatedName("vu") + static short field641; + @ObfuscatedName("vj") static short field637; - @ObfuscatedName("vk") - static short field633; - @ObfuscatedName("vr") - static short field636; - @ObfuscatedName("va") - static short field630; - @ObfuscatedName("vg") + @ObfuscatedName("ve") + static short field634; + @ObfuscatedName("vx") @Export("viewportZoom") static int viewportZoom; - @ObfuscatedName("vb") - static short field631; - @ObfuscatedName("wy") - static int field548; - @ObfuscatedName("vw") + @ObfuscatedName("vf") + static short field635; + @ObfuscatedName("vo") @Export("viewportWidth") static int viewportWidth; - @ObfuscatedName("vh") + @ObfuscatedName("we") + static int field550; + @ObfuscatedName("vn") @Export("viewportHeight") static int viewportHeight; - @ObfuscatedName("vl") - static int[] cameraMoveIntensity; - @ObfuscatedName("vc") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("vo") + @ObfuscatedName("vm") @Export("zoomHeight") static short zoomHeight; - @ObfuscatedName("wu") + @ObfuscatedName("vi") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("vq") + @Export("cameraMoveIntensity") + static int[] cameraMoveIntensity; + @ObfuscatedName("vh") + @Export("cameraShakeIntensity") + static int[] cameraShakeIntensity; + @ObfuscatedName("vk") + @Export("cameraShakeSpeed") + static int[] cameraShakeSpeed; + @ObfuscatedName("vz") + @Export("cameraShakeCycle") + static int[] cameraShakeCycle; + @ObfuscatedName("wf") @ObfuscatedSignature( - descriptor = "[Loc;" + descriptor = "[Loh;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("vn") - static int[] cameraShakeIntensity; - @ObfuscatedName("vs") - static int[] cameraShakeSpeed; - @ObfuscatedName("vj") - static int[] cameraShakeCycle; - @ObfuscatedName("we") + @ObfuscatedName("wy") @ObfuscatedSignature( descriptor = "Lcu;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; - @ObfuscatedName("ws") - static int field547; - @ObfuscatedName("wh") - static List field605; - @ObfuscatedName("bg") + @ObfuscatedName("wa") + static int field549; + @ObfuscatedName("wt") + static List field609; + @ObfuscatedName("bc") @Export("lockMouseRecorder") static boolean lockMouseRecorder; - @ObfuscatedName("bj") + @ObfuscatedName("bg") @Export("worldId") public static int worldId; - @ObfuscatedName("ct") + @ObfuscatedName("cw") @Export("worldProperties") static int worldProperties; - @ObfuscatedName("cz") + @ObfuscatedName("cm") @Export("gameBuild") static int gameBuild; - @ObfuscatedName("cj") + @ObfuscatedName("cx") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("cn") + @ObfuscatedName("cr") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("ca") + @ObfuscatedName("cv") @Export("param21") static int param21; - @ObfuscatedName("cx") + @ObfuscatedName("co") @Export("clientType") static int clientType; - @ObfuscatedName("co") - static int field421; + @ObfuscatedName("cl") + static int field424; @ObfuscatedName("cu") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("cr") + @ObfuscatedName("ch") @Export("param25") public static int param25; - @ObfuscatedName("dq") + @ObfuscatedName("dj") @Export("gameState") static int gameState; - @ObfuscatedName("dg") + @ObfuscatedName("di") + @Export("reloadJS5") static boolean reloadJS5; - @ObfuscatedName("et") + @ObfuscatedName("ed") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("em") + @ObfuscatedName("eh") @Export("cycle") static int cycle; - @ObfuscatedName("ec") + @ObfuscatedName("ey") @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("er") + @ObfuscatedName("eq") @Export("lastMouseRecordX") static int lastMouseRecordX; - @ObfuscatedName("ew") + @ObfuscatedName("ej") @Export("lastMouseRecordY") static int lastMouseRecordY; - @ObfuscatedName("eo") - static long field609; - @ObfuscatedName("eb") + @ObfuscatedName("ea") + static long field612; + @ObfuscatedName("er") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("ej") + @ObfuscatedName("ev") @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("eh") + @ObfuscatedName("ez") @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("ei") + @ObfuscatedName("et") @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; @ObfuscatedName("en") @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("es") + @ObfuscatedName("eb") + @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("eq") + @ObfuscatedName("ei") + @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("ee") + @ObfuscatedName("es") + @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("eg") + @ObfuscatedName("el") + @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("ey") + @ObfuscatedName("em") + @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("ea") + @ObfuscatedName("ek") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Ldc;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("ex") + @ObfuscatedName("ec") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Ldc;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("ef") + @ObfuscatedName("eu") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("fq") + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static class92 field412; - @ObfuscatedName("fp") + static class92 field419; + @ObfuscatedName("fj") @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("fz") + @ObfuscatedName("fv") @Export("js5Cycles") static int js5Cycles; - @ObfuscatedName("gs") + @ObfuscatedName("gg") @Export("js5Errors") static int js5Errors; - @ObfuscatedName("go") + @ObfuscatedName("gi") @Export("loginState") static int loginState; - @ObfuscatedName("gh") - static int field440; + @ObfuscatedName("go") + static int field448; + @ObfuscatedName("gl") + static int field447; + @ObfuscatedName("gb") + static int field444; @ObfuscatedName("gj") - static int field441; - @ObfuscatedName("gm") - static int field442; - @ObfuscatedName("gx") @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfr;" ) - static class139 field415; - @ObfuscatedName("gr") + static class139 field421; + @ObfuscatedName("ge") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Ltv;" ) - static class518 field644; - @ObfuscatedName("hx") - static final String field650; - @ObfuscatedName("hq") + static class519 field648; + @ObfuscatedName("hl") + static final String field656; + @ObfuscatedName("hg") + static final String field655; + @ObfuscatedName("hm") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("hu") + @ObfuscatedName("hv") @ObfuscatedSignature( descriptor = "Lcc;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("ig") + @ObfuscatedName("ie") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("ih") + @ObfuscatedName("ij") @ObfuscatedSignature( - descriptor = "[Ldh;" + descriptor = "[Ldx;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("ij") + @ObfuscatedName("in") @Export("npcCount") static int npcCount; - @ObfuscatedName("ir") + @ObfuscatedName("ih") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("in") - static int field446; - @ObfuscatedName("iq") - static int[] field549; - @ObfuscatedName("id") + @ObfuscatedName("it") + static String field599; + @ObfuscatedName("ir") + static int field451; + @ObfuscatedName("ic") + static int[] field552; + @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "Leb;" + descriptor = "Ler;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("ip") + @ObfuscatedName("im") @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("ic") + @ObfuscatedName("id") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("im") + @ObfuscatedName("iu") @ObfuscatedSignature( - descriptor = "Lpm;" + descriptor = "Lpy;" ) @Export("timer") static Timer timer; - @ObfuscatedName("if") + @ObfuscatedName("jn") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("it") - static String field595; - @ObfuscatedName("jo") - static int field450; - @ObfuscatedName("jr") - static int field451; - @ObfuscatedName("jk") - static int field448; - @ObfuscatedName("jl") - static int field449; - @ObfuscatedName("jw") + @ObfuscatedName("jg") + static int field452; + @ObfuscatedName("ji") static int field453; - @ObfuscatedName("jn") + @ObfuscatedName("jl") + static int field455; + @ObfuscatedName("jj") + static int field454; + @ObfuscatedName("jq") + static int field456; + @ObfuscatedName("jz") @ObfuscatedSignature( - descriptor = "[Lij;" + descriptor = "[Lis;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("jz") + @ObfuscatedName("jp") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("jj") + @ObfuscatedName("jf") + @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("jg") - static final int[] field648; - @ObfuscatedName("jv") - static int field452; - @ObfuscatedName("ka") - static int field454; + @ObfuscatedName("jm") + static final int[] field653; + @ObfuscatedName("kb") + static int field457; + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "Lui;" + ) + @Export("compass") + static SpritePixels compass; @ObfuscatedName("kx") - static int field461; - @ObfuscatedName("ku") - static int field459; - @ObfuscatedName("kq") - static int field458; + static int field462; @ObfuscatedName("ky") - static boolean field378; + static int field463; + @ObfuscatedName("kp") + static int field459; + @ObfuscatedName("kr") + static int field460; + @ObfuscatedName("kw") + static boolean field382; @ObfuscatedName("kv") @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("kc") + @ObfuscatedName("kg") @Export("camAngleX") static int camAngleX; - @ObfuscatedName("kb") + @ObfuscatedName("lx") @Export("camAngleY") static int camAngleY; - @ObfuscatedName("kh") + @ObfuscatedName("le") + @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("lj") + @ObfuscatedName("lu") + @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("lr") - static int field471; + @ObfuscatedName("lo") + static int field473; @ObfuscatedName("ld") - static int field463; - @ObfuscatedName("li") + static int field465; + @ObfuscatedName("lm") @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("la") + @ObfuscatedName("lp") @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("lh") - static int field464; - @ObfuscatedName("lw") - static int field473; - @ObfuscatedName("lo") + @ObfuscatedName("ly") + static int field480; + @ObfuscatedName("lg") static int field468; - @ObfuscatedName("ls") + @ObfuscatedName("lk") + static int field471; + @ObfuscatedName("lc") @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("lx") + @ObfuscatedName("lv") @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("ln") - public static int field363; + @ObfuscatedName("lr") + static int field476; @ObfuscatedName("lt") @Export("oculusOrbOnLocalPlayer") static boolean oculusOrbOnLocalPlayer; - @ObfuscatedName("lp") + @ObfuscatedName("lj") + @Export("packetIndicator") static int packetIndicator; - @ObfuscatedName("lf") + @ObfuscatedName("lz") + @Export("emitPackets") static boolean emitPackets; - @ObfuscatedName("ly") - static int field475; - @ObfuscatedName("lk") + @ObfuscatedName("lf") + static int field467; + @ObfuscatedName("lq") @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("lq") + @ObfuscatedName("lh") @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("lc") + @ObfuscatedName("li") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("lb") + @ObfuscatedName("ll") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("lg") + @ObfuscatedName("lb") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("ll") + @ObfuscatedName("md") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("lm") + @ObfuscatedName("mh") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("mn") + @ObfuscatedName("mv") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("mf") - static int[][] field591; - @ObfuscatedName("mm") + @ObfuscatedName("mg") + static int[][] field594; + @ObfuscatedName("mq") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("mp") - static String[] field599; - @ObfuscatedName("mw") + @ObfuscatedName("mu") + static String[] field603; + @ObfuscatedName("mk") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("mh") + @ObfuscatedName("mr") @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("mj") + @ObfuscatedName("me") @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("mx") + @ObfuscatedName("mz") @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("mu") + @ObfuscatedName("mc") @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("mi") + @ObfuscatedName("mf") @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("mq") + @ObfuscatedName("ml") @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("mr") + @ObfuscatedName("mj") @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("mv") + @ObfuscatedName("mw") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("my") - static int field485; - @ObfuscatedName("mc") + @ObfuscatedName("mp") + static int field486; + @ObfuscatedName("mb") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("mb") + @ObfuscatedName("mi") @ObfuscatedSignature( descriptor = "[Ldf;" ) @Export("players") static Player[] players; - @ObfuscatedName("mg") + @ObfuscatedName("mx") @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("mt") + @ObfuscatedName("my") @Export("isMembers") static int isMembers; - @ObfuscatedName("mk") + @ObfuscatedName("ma") @Export("playerUUID") static long playerUUID; - @ObfuscatedName("ml") - static boolean field382; - @ObfuscatedName("nb") + @ObfuscatedName("ms") + static boolean field386; + @ObfuscatedName("nd") @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("no") - static int field488; - @ObfuscatedName("nh") - static int[] field558; - @ObfuscatedName("na") + @ObfuscatedName("ng") + static int field492; + @ObfuscatedName("nt") + static int[] field564; + @ObfuscatedName("nb") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; @ObfuscatedName("ns") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("nc") + @ObfuscatedName("nz") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; + @ObfuscatedName("ne") + static int[] field561; @ObfuscatedName("ni") - static int[] field559; - @ObfuscatedName("nu") @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("nk") + @ObfuscatedName("nr") @ObfuscatedSignature( - descriptor = "[[[Lod;" + descriptor = "[[[Low;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("nm") + @ObfuscatedName("np") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("nt") + @ObfuscatedName("nn") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("nz") + @ObfuscatedName("nw") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("nr") + @ObfuscatedName("ny") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("nw") + @ObfuscatedName("nk") @Export("levels") static int[] levels; - @ObfuscatedName("nn") + @ObfuscatedName("nj") @Export("experience") static int[] experience; - @ObfuscatedName("nl") + @ObfuscatedName("nu") @Export("leftClickOpensMenu") static boolean leftClickOpensMenu; - @ObfuscatedName("ny") + @ObfuscatedName("nf") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("nj") + @ObfuscatedName("om") @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("ou") + @ObfuscatedName("oz") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("ow") + @ObfuscatedName("oh") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("ok") + @ObfuscatedName("oy") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("ol") + @ObfuscatedName("od") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("oc") + @ObfuscatedName("og") @Export("menuItemIds") static int[] menuItemIds; - @ObfuscatedName("ov") + @ObfuscatedName("ob") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("oq") + @ObfuscatedName("ok") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("oe") + @ObfuscatedName("on") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("os") + @ObfuscatedName("oe") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("ot") + @ObfuscatedName("os") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("ox") + @ObfuscatedName("ow") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("og") + @ObfuscatedName("ot") @Export("viewportX") static int viewportX; - @ObfuscatedName("ob") + @ObfuscatedName("oc") @Export("viewportY") static int viewportY; - @ObfuscatedName("om") - static int field494; - @ObfuscatedName("oj") - static int field493; - @ObfuscatedName("oz") + @ObfuscatedName("oi") + static int field496; + @ObfuscatedName("oq") + static int field498; + @ObfuscatedName("ov") @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("oy") + @ObfuscatedName("or") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("op") + @ObfuscatedName("of") @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("of") + @ObfuscatedName("ps") @Export("selectedSpellItemId") static int selectedSpellItemId; - @ObfuscatedName("pl") - static String field597; @ObfuscatedName("pa") - static String field596; - @ObfuscatedName("pg") + static String field600; + @ObfuscatedName("pi") + static String field601; + @ObfuscatedName("pj") @Export("rootInterface") static int rootInterface; - @ObfuscatedName("pd") + @ObfuscatedName("pu") @ObfuscatedSignature( - descriptor = "Lsm;" + descriptor = "Lso;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("pq") - static int field503; @ObfuscatedName("po") - static int field502; - @ObfuscatedName("pe") + static int field505; + @ObfuscatedName("pv") + static int field508; + @ObfuscatedName("pn") @Export("chatEffects") static int chatEffects; - @ObfuscatedName("pj") + @ObfuscatedName("pd") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmi;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("pu") + @ObfuscatedName("px") @Export("runEnergy") static int runEnergy; - @ObfuscatedName("pn") + @ObfuscatedName("pt") @Export("weight") static int weight; - @ObfuscatedName("pi") + @ObfuscatedName("pm") @Export("staffModLevel") - static int staffModLevel; - @ObfuscatedName("px") + public static int staffModLevel; + @ObfuscatedName("pe") @Export("followerIndex") static int followerIndex; - @ObfuscatedName("pb") + @ObfuscatedName("pp") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("pp") + @ObfuscatedName("pg") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmi;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("pf") + @ObfuscatedName("ph") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmi;" ) @Export("clickedWidget") public static Widget clickedWidget; - @ObfuscatedName("ps") + @ObfuscatedName("pb") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmi;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("py") + @ObfuscatedName("pc") @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("pw") + @ObfuscatedName("py") @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("pk") + @ObfuscatedName("pq") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmi;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("pv") - static boolean field391; - @ObfuscatedName("pm") - static int field500; - @ObfuscatedName("pr") - static int field504; - @ObfuscatedName("qx") - static boolean field393; - @ObfuscatedName("qw") - static int field520; + @ObfuscatedName("pw") + static boolean field395; + @ObfuscatedName("qe") + static int field514; + @ObfuscatedName("qd") + static int field513; + @ObfuscatedName("qn") + static boolean field397; @ObfuscatedName("qf") - static int field510; - @ObfuscatedName("qc") + static int field515; + @ObfuscatedName("qr") + static int field521; + @ObfuscatedName("qm") @Export("isDraggingWidget") static boolean isDraggingWidget; @ObfuscatedName("ql") @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("qv") + @ObfuscatedName("qo") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("qp") + @ObfuscatedName("qg") @Export("changedVarpCount") static int changedVarpCount; - @ObfuscatedName("qk") + @ObfuscatedName("qx") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("qi") + @ObfuscatedName("qs") @Export("changedItemContainersCount") static int changedItemContainersCount; - @ObfuscatedName("qt") + @ObfuscatedName("qz") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("qg") + @ObfuscatedName("qt") @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("qe") - static int[] field568; - @ObfuscatedName("qz") - static int field522; - @ObfuscatedName("qs") + @ObfuscatedName("qu") + static int[] field572; + @ObfuscatedName("qb") + static int field512; + @ObfuscatedName("qp") @Export("chatCycle") static int chatCycle; - @ObfuscatedName("qn") - static int field516; - @ObfuscatedName("qa") - static int field509; - @ObfuscatedName("qj") - static int field514; - @ObfuscatedName("qh") - static int field512; - @ObfuscatedName("qq") + @ObfuscatedName("qi") static int field518; @ObfuscatedName("qy") - static int field521; - @ObfuscatedName("rh") static int field524; - @ObfuscatedName("ra") + @ObfuscatedName("qa") + static int field511; + @ObfuscatedName("qh") + static int field517; + @ObfuscatedName("ru") + static int field529; + @ObfuscatedName("rh") + static int field525; + @ObfuscatedName("rr") + static int field528; + @ObfuscatedName("rz") @Export("mouseWheelRotation") static int mouseWheelRotation; - @ObfuscatedName("ri") + @ObfuscatedName("rm") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Luo;" ) - static class531 field646; - @ObfuscatedName("rj") + static class532 field651; + @ObfuscatedName("rc") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("rm") + @ObfuscatedName("rq") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) - static NodeDeque field624; - @ObfuscatedName("rv") + static NodeDeque field629; + @ObfuscatedName("rs") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) - static NodeDeque field626; + static NodeDeque field630; @ObfuscatedName("rp") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) - static NodeDeque field625; - @ObfuscatedName("rr") + static NodeDeque field628; + @ObfuscatedName("rg") @ObfuscatedSignature( - descriptor = "Lsm;" + descriptor = "Lso;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("rn") + @ObfuscatedName("ry") @Export("rootWidgetCount") static int rootWidgetCount; + @ObfuscatedName("rk") + static int field527; + @ObfuscatedName("re") + static boolean[] field407; + @ObfuscatedName("rf") + static boolean[] field408; @ObfuscatedName("rl") - static int field525; - @ObfuscatedName("rc") - static boolean[] field403; - @ObfuscatedName("ro") - static boolean[] field404; - @ObfuscatedName("rw") - static boolean[] field405; - @ObfuscatedName("rs") + static boolean[] field409; + @ObfuscatedName("rt") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("rq") + @ObfuscatedName("rx") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("re") + @ObfuscatedName("rw") @Export("rootWidgetWidths") static int[] rootWidgetWidths; - @ObfuscatedName("rx") + @ObfuscatedName("rn") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("ry") + @ObfuscatedName("ri") @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("rd") - static long field611; - @ObfuscatedName("rz") + @ObfuscatedName("sq") + static long field615; + @ObfuscatedName("sd") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("su") - static int[] field577; - @ObfuscatedName("sy") + @ObfuscatedName("se") + static int[] field579; + @ObfuscatedName("sk") @Export("publicChatMode") static int publicChatMode; - @ObfuscatedName("sc") + @ObfuscatedName("sn") @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("sd") - static String field598; - @ObfuscatedName("sl") + @ObfuscatedName("sc") + static String field602; + @ObfuscatedName("si") static long[] crossWorldMessageIds; - @ObfuscatedName("sk") + @ObfuscatedName("sr") static int crossWorldMessageIdsIndex; - @ObfuscatedName("st") + @ObfuscatedName("sp") @ObfuscatedSignature( - descriptor = "Lih;" + descriptor = "Liz;" ) @Export("keyHandlerInstance") - static class213 keyHandlerInstance; - @ObfuscatedName("sq") + static class212 keyHandlerInstance; + @ObfuscatedName("ss") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lig;" ) - static class211 field594; - @ObfuscatedName("sg") - static int field529; + static class210 field423; @ObfuscatedName("sf") - static int[] field576; - @ObfuscatedName("sw") - static int[] field578; - @ObfuscatedName("sa") + static int field532; + @ObfuscatedName("so") + static int[] field580; + @ObfuscatedName("su") + static int[] field581; + @ObfuscatedName("sx") @Export("timeOfPreviousKeyPress") static long timeOfPreviousKeyPress; - @ObfuscatedName("sn") + @ObfuscatedName("tu") @ObfuscatedSignature( - descriptor = "[Lfx;" + descriptor = "[Lfi;" ) @Export("currentClanSettings") static ClanSettings[] currentClanSettings; - @ObfuscatedName("ta") + @ObfuscatedName("tn") @ObfuscatedSignature( - descriptor = "[Lgh;" + descriptor = "[Lgo;" ) @Export("currentClanChannels") static ClanChannel[] currentClanChannels; - @ObfuscatedName("ts") - static int field535; - @ObfuscatedName("tt") + @ObfuscatedName("tj") + static int field538; + @ObfuscatedName("tl") + @Export("mapIconCount") static int mapIconCount; - @ObfuscatedName("tp") + @ObfuscatedName("tq") + @Export("mapIconXs") static int[] mapIconXs; - @ObfuscatedName("td") + @ObfuscatedName("tg") + @Export("mapIconYs") static int[] mapIconYs; - @ObfuscatedName("te") + @ObfuscatedName("tb") @ObfuscatedSignature( - descriptor = "[Lud;" + descriptor = "[Lui;" ) + @Export("mapIcons") static SpritePixels[] mapIcons; - @ObfuscatedName("tv") + @ObfuscatedName("tz") @Export("destinationX") static int destinationX; @ObfuscatedName("ti") @Export("destinationY") static int destinationY; - @ObfuscatedName("tq") + @ObfuscatedName("ta") @Export("minimapState") static int minimapState; - @ObfuscatedName("th") + @ObfuscatedName("tp") @Export("playingJingle") static boolean playingJingle; - @ObfuscatedName("tb") + @ObfuscatedName("tt") @Export("soundEffectCount") static int soundEffectCount; - @ObfuscatedName("tj") + @ObfuscatedName("tf") @Export("soundEffectIds") static int[] soundEffectIds; - @ObfuscatedName("tl") + @ObfuscatedName("tv") @Export("queuedSoundEffectLoops") static int[] queuedSoundEffectLoops; - @ObfuscatedName("tf") + @ObfuscatedName("ua") @Export("queuedSoundEffectDelays") static int[] queuedSoundEffectDelays; - @ObfuscatedName("tz") + @ObfuscatedName("uj") @Export("soundLocations") static int[] soundLocations; - @ObfuscatedName("uw") + @ObfuscatedName("uu") @ObfuscatedSignature( - descriptor = "[Lbc;" + descriptor = "[Lbp;" ) @Export("soundEffects") static SoundEffect[] soundEffects; - @ObfuscatedName("uh") + @ObfuscatedName("ut") @Export("isCameraLocked") static boolean isCameraLocked; - @ObfuscatedName("uu") - static int cameraMoveToSpeed; + @ObfuscatedName("ur") + static boolean field402; + @ObfuscatedName("ux") + static boolean field404; + @ObfuscatedName("uo") + static boolean field401; @ObfuscatedName("uv") - static boolean field398; - @ObfuscatedName("uz") - static boolean field400; - @ObfuscatedName("uy") - static boolean field399; - @ObfuscatedName("ub") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lsn;" ) - static class480 field638; - @ObfuscatedName("ui") + static class479 field642; + @ObfuscatedName("ue") @ObfuscatedSignature( - descriptor = "Lss;" + descriptor = "Lsy;" ) - static class479 field642; - @ObfuscatedName("up") + static class478 field646; + @ObfuscatedName("uy") @ObfuscatedSignature( - descriptor = "Lss;" + descriptor = "Lsy;" ) - static class479 field643; - @ObfuscatedName("uo") - static boolean field397; - @ObfuscatedName("gu") - String field658; - @ObfuscatedName("gw") + static class478 field647; + @ObfuscatedName("gz") + String field665; + @ObfuscatedName("gn") @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lar;" ) - class14 field651; - @ObfuscatedName("hf") + class14 field658; + @ObfuscatedName("ht") @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Lax;" ) - class18 field652; - @ObfuscatedName("hv") - OtlTokenRequester field656; - @ObfuscatedName("hp") - Future field660; + class18 field660; + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "Lcom/jagex/oldscape/pub/OtlTokenRequester;" + ) + OtlTokenRequester field662; + @ObfuscatedName("hj") + Future field666; @ObfuscatedName("hh") - boolean field655; - @ObfuscatedName("hg") + boolean field661; + @ObfuscatedName("hi") + int field664; + @ObfuscatedName("hd") @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Lax;" ) - class18 field653; - @ObfuscatedName("ho") + class18 field659; + @ObfuscatedName("hk") @ObfuscatedSignature( descriptor = "Lcom/jagex/oldscape/pub/RefreshAccessTokenRequester;" ) - RefreshAccessTokenRequester field657; - @ObfuscatedName("he") - Future field659; - @ObfuscatedName("hb") + RefreshAccessTokenRequester field663; + @ObfuscatedName("hz") + Future field667; + @ObfuscatedName("ib") @ObfuscatedSignature( - descriptor = "Lty;" + descriptor = "Ltm;" ) - Buffer field662; - @ObfuscatedName("hc") + Buffer field669; + @ObfuscatedName("il") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lap;" ) - class7 field654; - @ObfuscatedName("ia") - long field661; + class7 field657; + @ObfuscatedName("ig") + long field668; static { lockMouseRecorder = true; @@ -962,9 +989,9 @@ boolean shouldProcessClick() { isLowDetail = false; param21 = -1; clientType = -1; - field421 = -1; + field424 = -1; onMobile = false; - param25 = 215; + param25 = 216; gameState = 0; reloadJS5 = false; isLoading = true; @@ -972,7 +999,7 @@ boolean shouldProcessClick() { mouseLastLastPressedTimeMillis = -1L; lastMouseRecordX = -1; lastMouseRecordY = -1; - field609 = -1L; + field612 = -1L; hadFocus = true; rebootTimer = 0; hintArrowType = 0; @@ -986,76 +1013,93 @@ boolean shouldProcessClick() { playerAttackOption = AttackOption.AttackOption_hidden; npcAttackOption = AttackOption.AttackOption_hidden; renderSelf = false; - field412 = class92.field937; + field419 = class92.field940; js5ConnectState = 0; js5Cycles = 0; js5Errors = 0; loginState = 0; - field440 = 0; - field441 = 0; - field442 = 0; - field415 = class139.field1307; - field644 = class518.field4159; - int var1 = "com_jagex_auth_desktop_osrs:public".length(); - byte[] var2 = new byte[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = "com_jagex_auth_desktop_osrs:public".charAt(var3); - if (var4 > 127) { - var2[var3] = 63; + field448 = 0; + field447 = 0; + field444 = 0; + field421 = class139.field1320; + field648 = class519.field4205; + int var2 = "com_jagex_auth_desktop_osrs:public".length(); + byte[] var3 = new byte[var2]; + + int var4; + char var5; + for (var4 = 0; var4 < var2; ++var4) { + var5 = "com_jagex_auth_desktop_osrs:public".charAt(var4); + if (var5 > 127) { + var3[var4] = 63; } else { - var2[var3] = (byte)var4; + var3[var4] = (byte)var5; } } - field650 = class345.method1832(var2); + String var0 = class11.method32(var3, 0, var3.length); + field656 = var0; + var2 = "com_jagex_auth_desktop_runelite:public".length(); + var3 = new byte[var2]; + + for (var4 = 0; var4 < var2; ++var4) { + var5 = "com_jagex_auth_desktop_runelite:public".charAt(var4); + if (var5 > 127) { + var3[var4] = 63; + } else { + var3[var4] = (byte)var5; + } + } + + var0 = class11.method32(var3, 0, var3.length); + field655 = var0; Login_isUsernameRemembered = false; secureRandomFuture = new SecureRandomFuture(); randomDatData = null; npcs = new NPC[65536]; npcCount = 0; npcIndices = new int[65536]; - field446 = 0; - field549 = new int[250]; + field451 = 0; + field552 = new int[250]; packetWriter = new PacketWriter(); logoutTimer = 0; hadNetworkError = false; timer = new Timer(); fontsMap = new HashMap(); - field450 = 0; - field451 = 1; - field448 = 0; - field449 = 1; - field453 = 0; + field452 = 0; + field453 = 1; + field455 = 0; + field454 = 1; + field456 = 0; collisionMaps = new CollisionMap[4]; isInInstance = false; instanceChunkTemplates = new int[4][13][13]; - field648 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; - field452 = 0; - field454 = 2301979; - field461 = 5063219; + field653 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; + field457 = 0; + field462 = 2301979; + field463 = 5063219; field459 = 3353893; - field458 = 7759444; - field378 = false; + field460 = 7759444; + field382 = false; alternativeScrollbarWidth = 0; camAngleX = 128; camAngleY = 0; camAngleDY = 0; camAngleDX = 0; - field471 = 0; - field463 = 0; + field473 = 0; + field465 = 0; oculusOrbState = 0; camFollowHeight = 50; - field464 = 0; - field473 = 0; + field480 = 0; field468 = 0; + field471 = 0; oculusOrbNormalSpeed = 12; oculusOrbSlowedSpeed = 6; - field363 = 0; + field476 = 0; oculusOrbOnLocalPlayer = false; packetIndicator = 0; emitPackets = false; - field475 = 0; + field467 = 0; overheadTextLimit = 0; overheadTextCount = 50; overheadTextXs = new int[overheadTextCount]; @@ -1064,9 +1108,9 @@ boolean shouldProcessClick() { overheadTextXOffsets = new int[overheadTextCount]; overheadTextColors = new int[overheadTextCount]; overheadTextEffects = new int[overheadTextCount]; - field591 = new int[overheadTextCount][]; + field594 = new int[overheadTextCount][]; overheadTextCyclesRemaining = new int[overheadTextCount]; - field599 = new String[overheadTextCount]; + field603 = new String[overheadTextCount]; tileLastDrawnActor = new int[104][104]; viewportDrawCount = 0; viewportTempX = -1; @@ -1076,20 +1120,20 @@ boolean shouldProcessClick() { mouseCrossState = 0; mouseCrossColor = 0; showMouseCross = true; - field485 = 0; + field486 = 0; showLoadingMessages = true; players = new Player[2048]; localPlayerIndex = -1; isMembers = 0; playerUUID = -1L; - field382 = true; + field386 = true; drawPlayerNames = 0; - field488 = 0; - field558 = new int[1000]; + field492 = 0; + field564 = new int[1000]; playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; playerMenuActions = new String[8]; playerOptionsPriorities = new boolean[8]; - field559 = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; + field561 = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; combatTargetPlayerIndex = -1; groundItems = new NodeDeque[4][104][104]; pendingSpawns = new NodeDeque(); @@ -1114,19 +1158,19 @@ boolean shouldProcessClick() { showMouseOverText = true; viewportX = -1; viewportY = -1; - field494 = 0; - field493 = 50; + field496 = 0; + field498 = 50; isItemSelected = 0; - field595 = null; + field599 = null; isSpellSelected = false; selectedSpellChildIndex = -1; selectedSpellItemId = -1; - field597 = null; - field596 = null; + field600 = null; + field601 = null; rootInterface = -1; interfaceParents = new NodeHashTable(8); - field503 = 0; - field502 = -1; + field505 = 0; + field508 = -1; chatEffects = 0; meslayerContinueWidget = null; runEnergy = 0; @@ -1140,12 +1184,12 @@ boolean shouldProcessClick() { widgetClickX = 0; widgetClickY = 0; draggedOnWidget = null; - field391 = false; - field500 = -1; - field504 = -1; - field393 = false; - field520 = -1; - field510 = -1; + field395 = false; + field514 = -1; + field513 = -1; + field397 = false; + field515 = -1; + field521 = -1; isDraggingWidget = false; cycleCntr = 1; changedVarps = new int[32]; @@ -1154,50 +1198,50 @@ boolean shouldProcessClick() { changedItemContainersCount = 0; changedSkills = new int[32]; changedSkillsCount = 0; - field568 = new int[32]; - field522 = 0; - chatCycle = 0; - field516 = 0; - field509 = 0; - field514 = 0; + field572 = new int[32]; field512 = 0; + chatCycle = 0; field518 = 0; - field521 = 0; field524 = 0; + field511 = 0; + field517 = 0; + field529 = 0; + field525 = 0; + field528 = 0; mouseWheelRotation = 0; - field646 = new class531(); + field651 = new class532(); scriptEvents = new NodeDeque(); - field624 = new NodeDeque(); - field626 = new NodeDeque(); - field625 = new NodeDeque(); + field629 = new NodeDeque(); + field630 = new NodeDeque(); + field628 = new NodeDeque(); widgetFlags = new NodeHashTable(512); rootWidgetCount = 0; - field525 = -2; - field403 = new boolean[100]; - field404 = new boolean[100]; - field405 = new boolean[100]; + field527 = -2; + field407 = new boolean[100]; + field408 = new boolean[100]; + field409 = new boolean[100]; rootWidgetXs = new int[100]; rootWidgetYs = new int[100]; rootWidgetWidths = new int[100]; rootWidgetHeights = new int[100]; gameDrawingMode = 0; - field611 = 0L; + field615 = 0L; isResizable = true; - field577 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + field579 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field598 = ""; + field602 = ""; crossWorldMessageIds = new long[100]; crossWorldMessageIdsIndex = 0; - keyHandlerInstance = new class213(); - field594 = new class211(); - field529 = 0; - field576 = new int[128]; - field578 = new int[128]; + keyHandlerInstance = new class212(); + field423 = new class210(); + field532 = 0; + field580 = new int[128]; + field581 = new int[128]; timeOfPreviousKeyPress = -1L; currentClanSettings = new ClanSettings[4]; currentClanChannels = new ClanChannel[4]; - field535 = -1; + field538 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; @@ -1213,64 +1257,65 @@ boolean shouldProcessClick() { soundLocations = new int[50]; soundEffects = new SoundEffect[50]; isCameraLocked = false; - field398 = false; - field400 = false; - field399 = false; - field638 = null; + field402 = false; + field404 = false; + field401 = false; field642 = null; - field643 = null; - field397 = false; + field646 = null; + field647 = null; + field400 = false; cameraShaking = new boolean[5]; cameraShakeIntensity = new int[5]; cameraMoveIntensity = new int[5]; cameraShakeSpeed = new int[5]; cameraShakeCycle = new int[5]; - field634 = 256; - field637 = 205; + field638 = 256; + field640 = 205; zoomHeight = 256; zoomWidth = 320; - field631 = 1; - field630 = 32767; - field633 = 1; - field636 = 32767; + field635 = 1; + field634 = 32767; + field641 = 1; + field637 = 32767; viewportOffsetX = 0; viewportOffsetY = 0; viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; playerAppearance = new PlayerComposition(); - field545 = -1; field542 = -1; - field641 = new DesktopPlatformInfoProvider(); + field547 = -1; + field645 = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - archive5 = new class424(8, class422.field3754); + archive5 = new class423(8, class421.field3766); Widget_cachedModels = new EvictingDualNodeHashTable(64); Widget_cachedFonts = new EvictingDualNodeHashTable(64); - field547 = -1; - field364 = -1; - field605 = new ArrayList(); + field549 = -1; + field369 = -1; + field609 = new ArrayList(); archiveLoaders = new ArrayList(10); archiveLoadersDone = 0; - field548 = 0; - field647 = new ApproximateRouteStrategy(); - field589 = new int[50]; - field590 = new int[50]; + field550 = 0; + field652 = new ApproximateRouteStrategy(); + field593 = new int[50]; + field592 = new int[50]; } public Client() { - this.field655 = false; - this.field661 = -1L; + this.field661 = false; + this.field664 = 0; + this.field668 = -1L; } - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-19" + garbageValue = "59" ) @Export("resizeGame") protected final void resizeGame() { - field611 = class113.clockNow() + 500L; + field615 = GameEngine.clockNow() + 500L; this.resizeJS(); if (rootInterface != -1) { this.resizeRoot(true); @@ -1278,216 +1323,234 @@ protected final void resizeGame() { } - @ObfuscatedName("br") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "72" + descriptor = "(I)V", + garbageValue = "208117174" ) @Export("setUp") protected final void setUp() { - int[] var1 = new int[]{20, 260, 10000}; - int[] var2 = new int[]{1000, 100, 500}; - if (var1 != null && var2 != null) { - ByteArrayPool.ByteArrayPool_alternativeSizes = var1; - class125.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; - class152.ByteArrayPool_arrays = new byte[var1.length][][]; - - for (int var3 = 0; var3 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var3) { - class152.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; - ByteArrayPool.field3724.add(var1[var3]); + PacketBufferNode.method1611(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); + class480.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; + class129.js5Port = gameBuild == 0 ? 443 : worldId + 50000; + class4.currentPort = class480.worldPort; + UrlRequest.field1174 = class330.field2941; + class140.field1328 = class330.field2942; + PlayerComposition.field2904 = class330.field2940; + PlayerComposition.field2905 = class330.field2943; + FriendsChat.urlRequester = new class113(this.field661, 216); + this.setUpKeyboard(); + this.method143(); + class12.mouseWheel = this.mouseWheel(); + this.method142(field423, 0); + this.method142(keyHandlerInstance, 1); + class6.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + AccessFile var2 = null; + ClientPreferences var3 = new ClientPreferences(); + + try { + var2 = Decimator.getPreferencesFile("", WorldMapSectionType.field2417.name, false); + byte[] var4 = new byte[(int)var2.length()]; + + int var6; + for (int var5 = 0; var5 < var4.length; var5 += var6) { + var6 = var2.read(var4, var5, var4.length - var5); + if (var6 == -1) { + throw new IOException(); + } } - Collections.sort(ByteArrayPool.field3724); - } else { - ByteArrayPool.ByteArrayPool_alternativeSizes = null; - class125.ByteArrayPool_altSizeArrayCounts = null; - class152.ByteArrayPool_arrays = null; - ByteArrayPool.field3724.clear(); - ByteArrayPool.field3724.add(100); - ByteArrayPool.field3724.add(5000); - ByteArrayPool.field3724.add(10000); - ByteArrayPool.field3724.add(30000); + var3 = new ClientPreferences(new Buffer(var4)); + } catch (Exception var8) { } - Login.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; - class11.js5Port = gameBuild == 0 ? 443 : worldId + 50000; - Varps.currentPort = Login.worldPort; - class33.field89 = class331.field2923; - ClanChannel.field1410 = class331.field2925; - ViewportMouse.field2226 = class331.field2922; - WorldMapSectionType.field2391 = class331.field2924; - WorldMapLabel.urlRequester = new class113(this.field655, 215); - this.setUpKeyboard(); - this.method146(); - MidiPcmStream.mouseWheel = this.mouseWheel(); - this.method145(field594, 0); - this.method145(keyHandlerInstance, 1); - class158.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - class150.clientPreferences = class126.method690(); + try { + if (var2 != null) { + var2.close(); + } + } catch (Exception var7) { + } + + class449.clientPreferences = var3; this.setUpClipboard(); - WorldMapSectionType.method1479(this, class326.field2877); - RouteStrategy.setWindowedMode(class150.clientPreferences.method573()); - class177.friendSystem = new FriendSystem(class457.loginType); - this.field651 = new class14("tokenRequest", 1, 1); - class102.method605(this); - class219.field1905 = new class217[1]; - class215 var4 = class215.field1877; - class219.field1905[0] = new class217(var4.field1887, var4.field1886); + KeyHandler.method85(this, class18.field50); + class270.setWindowedMode(class449.clientPreferences.method566()); + class299.friendSystem = new FriendSystem(Language.loginType); + this.field658 = new class14("tokenRequest", 1, 1); + if (!class305.field2778.contains(this)) { + class305.field2778.add(this); + } + + class218.field1926 = new class216[1]; + class214 var9 = class214.field1898; + class218.field1926[0] = new class216(var9.field1907, var9.field1908); } - @ObfuscatedName("bw") + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "443189499" + garbageValue = "1753601126" ) @Export("doCycle") protected final void doCycle() { ++cycle; this.doCycleJs5(); - BufferedSink.method2247(); - boolean var1 = InterfaceParent.method470(cycle); - if (var1 && playingJingle && VerticalAlignment.pcmPlayer1 != null) { - VerticalAlignment.pcmPlayer1.tryDiscard(); - } - class105.method618(); - keyHandlerInstance.method1084(); - this.method144(); - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; - MouseHandler.MouseHandler_lastButtonVolatile = 0; - } - - if (MidiPcmStream.mouseWheel != null) { - int var4 = MidiPcmStream.mouseWheel.useRotation(); - mouseWheelRotation = var4; - } - - if (gameState == 0) { - Skeleton.method1208(); - HealthBarDefinition.method953(); - } else if (gameState == 5) { - FileSystem.method906(this, ItemComposition.fontPlain11, class113.fontPlain12); - Skeleton.method1208(); - HealthBarDefinition.method953(); - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - FileSystem.method906(this, ItemComposition.fontPlain11, class113.fontPlain12); - this.doCycleLoggedOut(); - } else if (gameState == 50) { - FileSystem.method906(this, ItemComposition.fontPlain11, class113.fontPlain12); - this.doCycleLoggedOut(); - } else if (gameState == 25) { - class126.method692(); + while (true) { + ArchiveDiskAction var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); } - } else { - FileSystem.method906(this, ItemComposition.fontPlain11, class113.fontPlain12); - } - if (gameState == 30) { - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { - this.doCycleLoggedOut(); - } + if (var1 == null) { + boolean var5 = WorldMapArea.method1425(); + if (var5 && playingJingle && AddRequestTask.pcmPlayer1 != null) { + AddRequestTask.pcmPlayer1.tryDiscard(); + } + + class301.method1622(); + keyHandlerInstance.method1104(); + this.method141(); + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; + MouseHandler.MouseHandler_lastButtonVolatile = 0; + } + + if (class12.mouseWheel != null) { + int var6 = class12.mouseWheel.useRotation(); + mouseWheelRotation = var6; + } + + if (gameState == 0) { + ParamComposition.method1017(); + PacketWriter.method645(); + } else if (gameState == 5) { + GrandExchangeOfferWorldComparator.method1950(this, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); + ParamComposition.method1017(); + PacketWriter.method645(); + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { + GrandExchangeOfferWorldComparator.method1950(this, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); + this.doCycleLoggedOut(); + } else if (gameState == 50) { + GrandExchangeOfferWorldComparator.method1950(this, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); + this.doCycleLoggedOut(); + } else if (gameState == 25) { + class370.method1968(); + } + } else { + GrandExchangeOfferWorldComparator.method1950(this, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); + } + if (gameState == 30) { + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { + this.doCycleLoggedOut(); + } + + return; + } + + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); + } } - @ObfuscatedName("be") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-23" + descriptor = "(ZI)V", + garbageValue = "-1944984067" ) @Export("draw") protected final void draw(boolean var1) { - if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field611 && class113.clockNow() > field611) { - RouteStrategy.setWindowedMode(Huffman.getWindowedMode()); + if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field615 && GameEngine.clockNow() > field615) { + class270.setWindowedMode(class218.getWindowedMode()); } int var2; if (var1) { for (var2 = 0; var2 < 100; ++var2) { - field403[var2] = true; + field407[var2] = true; } } if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - class395.drawTitle(Calendar.fontBold12, ItemComposition.fontPlain11, class113.fontPlain12); + class105.drawTitle(class59.fontBold12, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - class395.drawTitle(Calendar.fontBold12, ItemComposition.fontPlain11, class113.fontPlain12); + class105.drawTitle(class59.fontBold12, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); } else if (gameState == 50) { - class395.drawTitle(Calendar.fontBold12, ItemComposition.fontPlain11, class113.fontPlain12); + class105.drawTitle(class59.fontBold12, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); } else if (gameState == 25) { - if (field453 == 1) { - if (field450 > field451) { - field451 = field450; + if (field456 == 1) { + if (field452 > field453) { + field453 = field452; } - var2 = (field451 * 50 - field450 * 50) / field451; - Actor.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); - } else if (field453 == 2) { - if (field448 > field449) { - field449 = field448; + var2 = (field453 * 50 - field452 * 50) / field453; + FadeInTask.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); + } else if (field456 == 2) { + if (field455 > field454) { + field454 = field455; } - var2 = (field449 * 50 - field448 * 50) / field449 + 50; - Actor.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); + var2 = (field454 * 50 - field455 * 50) / field454 + 50; + FadeInTask.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); } else { - Actor.drawLoadingMessage("Loading - please wait.", false); + FadeInTask.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - Actor.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + FadeInTask.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); } else if (gameState == 45) { - Actor.drawLoadingMessage("Please wait...", false); + FadeInTask.drawLoadingMessage("Please wait...", false); } } else { - class395.drawTitle(Calendar.fontBold12, ItemComposition.fontPlain11, class113.fontPlain12); + class105.drawTitle(class59.fontBold12, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { for (var2 = 0; var2 < rootWidgetCount; ++var2) { - if (field404[var2]) { - class156.rasterProvider.draw(rootWidgetXs[var2], rootWidgetYs[var2], rootWidgetWidths[var2], rootWidgetHeights[var2]); - field404[var2] = false; + if (field408[var2]) { + AttackOption.rasterProvider.draw(rootWidgetXs[var2], rootWidgetYs[var2], rootWidgetWidths[var2], rootWidgetHeights[var2]); + field408[var2] = false; } } } else if (gameState > 0) { - class156.rasterProvider.drawFull(0, 0); + AttackOption.rasterProvider.drawFull(0, 0); for (var2 = 0; var2 < rootWidgetCount; ++var2) { - field404[var2] = false; + field408[var2] = false; } } } - @ObfuscatedName("bc") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "73" + descriptor = "(I)V", + garbageValue = "-1298916795" ) @Export("kill0") protected final void kill0() { - if (PendingSpawn.varcs.hasUnwrittenChanges()) { - PendingSpawn.varcs.write(); + if (KeyHandler.varcs.hasUnwrittenChanges()) { + KeyHandler.varcs.write(); } - if (class497.mouseRecorder != null) { - class497.mouseRecorder.isRunning = false; + if (class126.mouseRecorder != null) { + class126.mouseRecorder.isRunning = false; } - class497.mouseRecorder = null; + class126.mouseRecorder = null; packetWriter.close(); if (MouseHandler.MouseHandler_instance != null) { synchronized(MouseHandler.MouseHandler_instance) { @@ -1495,216 +1558,222 @@ protected final void kill0() { } } - MidiPcmStream.mouseWheel = null; - if (VerticalAlignment.pcmPlayer1 != null) { - VerticalAlignment.pcmPlayer1.shutdown(); - } - - class153.field1356.method1904(); - ArchiveDiskAction.method1847(); - if (WorldMapLabel.urlRequester != null) { - WorldMapLabel.urlRequester.close(); - WorldMapLabel.urlRequester = null; + class12.mouseWheel = null; + if (AddRequestTask.pcmPlayer1 != null) { + AddRequestTask.pcmPlayer1.shutdown(); } - try { - JagexCache.JagexCache_dat2File.close(); - - for (int var3 = 0; var3 < JagexCache.field1450; ++var3) { - class302.JagexCache_idxFiles[var3].close(); - } - - JagexCache.JagexCache_idx255File.close(); - JagexCache.JagexCache_randomDat.close(); - } catch (Exception var5) { + class308.field2819.method1940(); + class214.method1124(); + if (FriendsChat.urlRequester != null) { + FriendsChat.urlRequester.close(); + FriendsChat.urlRequester = null; } - this.field651.method50(); + class510.method2513(); + this.field658.method40(); } - @ObfuscatedName("bl") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2050335898" + garbageValue = "1929688897" ) + @Export("vmethod1485") protected final void vmethod1485() { } - @ObfuscatedName("gz") + @ObfuscatedName("gx") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-57" + descriptor = "(I)Z", + garbageValue = "920896355" ) - boolean method361() { - return class20.field58 != null && !class20.field58.trim().isEmpty() && Script.field807 != null && !Script.field807.trim().isEmpty(); + boolean method351() { + return this.field664 == 1; } - @ObfuscatedName("gi") + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1597201922" + ) + boolean method352() { + return class27.field76 != null && !class27.field76.trim().isEmpty() && class9.field20 != null && !class9.field20.trim().isEmpty(); + } + + @ObfuscatedName("gt") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "7" + garbageValue = "106" ) - boolean method362() { - return class11.field36 != null && !class11.field36.trim().isEmpty() && Login.field766 != null && !Login.field766.trim().isEmpty(); + boolean method353() { + return class157.field1407 != null && !class157.field1407.trim().isEmpty() && Varcs.field1140 != null && !Varcs.field1140.trim().isEmpty(); } - @ObfuscatedName("gb") + @ObfuscatedName("gr") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1435710939" + descriptor = "(B)Z", + garbageValue = "13" ) - boolean method363() { - return this.field656 != null; + boolean method354() { + return this.field662 != null; } - @ObfuscatedName("gn") + @ObfuscatedName("gz") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1913894736" + garbageValue = "1881627729" ) - void method364(String var1) throws IOException { + void method355(String var1) throws IOException { HashMap var2 = new HashMap(); var2.put("grant_type", "refresh_token"); var2.put("scope", "gamesso.token.create"); var2.put("refresh_token", var1); - URL var3 = new URL(BuddyRankComparator.field1182 + "shield/oauth/token" + (new class464(var2)).method2319()); - class420 var4 = new class420(); - var4.method2130(field650); - var4.method2127("Host", (new URL(BuddyRankComparator.field1182)).getHost()); - var4.method2134(class461.field3889); - class9 var5 = class9.field17; - RefreshAccessTokenRequester var6 = this.field657; + URL var3 = new URL(class510.field4133 + "shield/oauth/token" + (new class463(var2)).method2342()); + class419 var4 = new class419(); + if (this.method351()) { + var4.method2169(field655); + } else { + var4.method2169(field656); + } + + var4.method2166("Host", (new URL(class510.field4133)).getHost()); + var4.method2173(class460.field3901); + class9 var5 = class9.field18; + RefreshAccessTokenRequester var6 = this.field663; if (var6 != null) { - this.field659 = var6.request(var5.method25(), var3, var4.method2126(), ""); + this.field667 = var6.request(var5.method22(), var3, var4.method2165(), ""); } else { - class10 var7 = new class10(var3, var5, var4, this.field655); - this.field653 = this.field651.method49(var7); + class10 var7 = new class10(var3, var5, var4, this.field661); + this.field659 = this.field658.method38(var7); } } - @ObfuscatedName("gu") + @ObfuscatedName("gn") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "828576760" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "1" ) - void method365(String var1) throws IOException { - URL var2 = new URL(BuddyRankComparator.field1182 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); - class420 var3 = new class420(); - var3.method2131(var1); - class9 var4 = class9.field18; - OtlTokenRequester var5 = this.field656; + void method356(String var1) throws IOException { + URL var2 = new URL(class510.field4133 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); + class419 var3 = new class419(); + var3.method2170(var1); + class9 var4 = class9.field17; + OtlTokenRequester var5 = this.field662; if (var5 != null) { - this.field660 = var5.request(var4.method25(), var2, var3.method2126(), ""); + this.field666 = var5.request(var4.method22(), var2, var3.method2165(), ""); } else { - class10 var6 = new class10(var2, var4, var3, this.field655); - this.field652 = this.field651.method49(var6); + class10 var6 = new class10(var2, var4, var3, this.field661); + this.field660 = this.field658.method38(var6); } } - @ObfuscatedName("gw") + @ObfuscatedName("ht") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-176461860" + garbageValue = "1347426796" ) - void method366(String var1, String var2) throws IOException, JSONException { - URL var3 = new URL(BuddyRankComparator.field1182 + "game-session/v1/tokens"); - class10 var4 = new class10(var3, class9.field17, this.field655); - var4.method31().method2131(var1); - var4.method31().method2134(class461.field3889); + void method358(String var1, String var2) throws IOException, JSONException { + URL var3 = new URL(class510.field4133 + "game-session/v1/tokens"); + class10 var4 = new class10(var3, class9.field18, this.field661); + var4.method27().method2170(var1); + var4.method27().method2173(class460.field3901); JSONObject var5 = new JSONObject(); - var5.method2691("accountId", var2); - var4.method32(new class463(var5)); - this.field652 = this.field651.method49(var4); + var5.method2709("accountId", var2); + var4.method28(new class462(var5)); + this.field660 = this.field658.method38(var4); } - @ObfuscatedName("hh") + @ObfuscatedName("hd") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1086320458" + garbageValue = "286321361" ) @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { - boolean var1 = class153.field1356.method1895(); + boolean var1 = class308.field2819.method1930(); if (!var1) { - this.method372(); + this.method364(); } } } - @ObfuscatedName("hg") + @ObfuscatedName("hk") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1146125856" + garbageValue = "375037576" ) - void method372() { - if (class153.field1356.field3560 >= 4) { + void method364() { + if (class308.field2819.field3570 >= 4) { this.error("js5crc"); - class129.updateGameState(1000); + MusicSong.updateGameState(1000); } else { - if (class153.field1356.field3561 >= 4) { + if (class308.field2819.field3569 >= 4) { if (gameState <= 5) { this.error("js5io"); - class129.updateGameState(1000); + MusicSong.updateGameState(1000); return; } js5Cycles = 3000; - class153.field1356.field3561 = 3; + class308.field2819.field3569 = 3; } if (--js5Cycles + 1 <= 0) { try { if (js5ConnectState == 0) { - class303.js5SocketTask = GameEngine.taskHandler.newSocketTask(VarbitComposition.worldHost, Varps.currentPort); + class126.js5SocketTask = GameEngine.taskHandler.newSocketTask(class292.worldHost, class4.currentPort); ++js5ConnectState; } if (js5ConnectState == 1) { - if (class303.js5SocketTask.status == 2) { + if (class126.js5SocketTask.status == 2) { this.js5Error(-1); return; } - if (class303.js5SocketTask.status == 1) { + if (class126.js5SocketTask.status == 1) { ++js5ConnectState; } } if (js5ConnectState == 2) { - class147.js5Socket = class310.method1640((Socket)class303.js5SocketTask.result, 40000, 5000); - Buffer var1 = new Buffer(5); - var1.writeByte(15); - var1.writeInt(215); - class147.js5Socket.write(var1.array, 0, 5); + Socket var2 = (Socket)class126.js5SocketTask.result; + BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); + class59.js5Socket = var1; + Buffer var3 = new Buffer(5); + var3.writeByte(15); + var3.writeInt(216); + class59.js5Socket.write(var3.array, 0, 5); ++js5ConnectState; - class197.field1620 = class113.clockNow(); + class270.field2451 = GameEngine.clockNow(); } if (js5ConnectState == 3) { - if (class147.js5Socket.available() > 0) { - int var2 = class147.js5Socket.readUnsignedByte(); - if (var2 != 0) { - this.js5Error(var2); + if (class59.js5Socket.available() > 0) { + int var4 = class59.js5Socket.readUnsignedByte(); + if (var4 != 0) { + this.js5Error(var4); return; } ++js5ConnectState; - } else if (class113.clockNow() - class197.field1620 > 30000L) { + } else if (GameEngine.clockNow() - class270.field2451 > 30000L) { this.js5Error(-2); return; } } if (js5ConnectState == 4) { - class153.field1356.method1897(class147.js5Socket, gameState > 20); - class303.js5SocketTask = null; - class147.js5Socket = null; + class308.field2819.method1933(class59.js5Socket, gameState > 20); + class126.js5SocketTask = null; + class59.js5Socket = null; js5ConnectState = 0; js5Errors = 0; } - } catch (IOException var3) { + } catch (IOException var5) { this.js5Error(-3); } @@ -1712,371 +1781,375 @@ void method372() { } } - @ObfuscatedName("ho") + @ObfuscatedName("hz") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2121536022" + descriptor = "(IB)V", + garbageValue = "17" ) @Export("js5Error") void js5Error(int var1) { - class303.js5SocketTask = null; - class147.js5Socket = null; + class126.js5SocketTask = null; + class59.js5Socket = null; js5ConnectState = 0; - if (Varps.currentPort == Login.worldPort) { - Varps.currentPort = class11.js5Port; + if (class4.currentPort == class480.worldPort) { + class4.currentPort = class129.js5Port; } else { - Varps.currentPort = Login.worldPort; + class4.currentPort = class480.worldPort; } ++js5Errors; if (js5Errors < 2 || var1 != 7 && var1 != 9) { if (js5Errors >= 2 && var1 == 6) { this.error("js5connect_outofdate"); - class129.updateGameState(1000); + MusicSong.updateGameState(1000); } else if (js5Errors >= 4) { if (gameState <= 5) { this.error("js5connect"); - class129.updateGameState(1000); + MusicSong.updateGameState(1000); } else { js5Cycles = 3000; } } } else if (gameState <= 5) { this.error("js5connect_full"); - class129.updateGameState(1000); + MusicSong.updateGameState(1000); } else { js5Cycles = 3000; } } - @ObfuscatedName("hi") + @ObfuscatedName("hy") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-10" + garbageValue = "70" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - AbstractSocket var1 = packetWriter.getSocket(); + Object var1 = packetWriter.getSocket(); PacketBuffer var2 = packetWriter.packetBuffer; try { if (loginState == 0) { - if (ObjTypeCustomisation.secureRandom == null && (secureRandomFuture.isDone() || field440 > 250)) { - ObjTypeCustomisation.secureRandom = secureRandomFuture.get(); + if (GraphicsObject.secureRandom == null && (secureRandomFuture.isDone() || field448 > 250)) { + GraphicsObject.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if (ObjTypeCustomisation.secureRandom != null) { + if (GraphicsObject.secureRandom != null) { if (var1 != null) { - var1.close(); + ((AbstractSocket)var1).close(); var1 = null; } - class457.socketTask = null; + VarcInt.socketTask = null; hadNetworkError = false; - field440 = 0; - if (field644.method2597()) { - if (this.method361()) { + field448 = 0; + if (field648.method2616()) { + if (this.method352()) { try { - this.method364(Script.field807); - BuddyRankComparator.setLoginState(21); + this.method355(class9.field20); + class316.method1700(21); } catch (Throwable var25) { - class317.RunException_sendStackTrace((String)null, var25); - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); + Messages.RunException_sendStackTrace((String)null, var25); + class387.getLoginError(65); return; } } else { - if (!this.method362()) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); + if (!this.method353()) { + class387.getLoginError(65); return; } try { - this.method366(class11.field36, Login.field766); - BuddyRankComparator.setLoginState(20); + this.method358(class157.field1407, Varcs.field1140); + class316.method1700(20); } catch (Exception var24) { - class317.RunException_sendStackTrace((String)null, var24); - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); + Messages.RunException_sendStackTrace((String)null, var24); + class387.getLoginError(65); return; } } } else { - BuddyRankComparator.setLoginState(1); + class316.method1700(1); } } } class20 var27; if (loginState == 21) { - if (this.field659 != null) { - if (!this.field659.isDone()) { + if (this.field667 != null) { + if (!this.field667.isDone()) { return; } - if (this.field659.isCancelled()) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field659 = null; + if (this.field667.isCancelled()) { + class387.getLoginError(65); + this.field667 = null; return; } try { - RefreshAccessTokenResponse var3 = (RefreshAccessTokenResponse)this.field659.get(); + RefreshAccessTokenResponse var3 = (RefreshAccessTokenResponse)this.field667.get(); if (!var3.isSuccess()) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field659 = null; + class387.getLoginError(65); + this.field667 = null; return; } - class20.field58 = var3.getAccessToken(); - Script.field807 = var3.getRefreshToken(); - this.field659 = null; + class27.field76 = var3.getAccessToken(); + class9.field20 = var3.getRefreshToken(); + this.field667 = null; } catch (Exception var23) { - class317.RunException_sendStackTrace((String)null, var23); - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field659 = null; + Messages.RunException_sendStackTrace((String)null, var23); + class387.getLoginError(65); + this.field667 = null; return; } } else { - if (this.field653 == null) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); + if (this.field659 == null) { + class387.getLoginError(65); return; } - if (!this.field653.method62()) { + if (!this.field659.method54()) { return; } - if (this.field653.method61()) { - class317.RunException_sendStackTrace(this.field653.method59(), (Throwable)null); - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field653 = null; + if (this.field659.method53()) { + Messages.RunException_sendStackTrace(this.field659.method52(), (Throwable)null); + class387.getLoginError(65); + this.field659 = null; return; } - var27 = this.field653.method63(); - if (var27.method70() != 200) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field653 = null; + var27 = this.field659.method55(); + if (var27.method63() != 200) { + class387.getLoginError(65); + this.field659 = null; return; } - field440 = 0; - class463 var4 = new class463(var27.method72()); + field448 = 0; + class462 var4 = new class462(var27.method66()); try { - class20.field58 = var4.method2315().getString("access_token"); - Script.field807 = var4.method2315().getString("refresh_token"); + class27.field76 = var4.method2338().getString("access_token"); + class9.field20 = var4.method2338().getString("refresh_token"); } catch (Exception var22) { - class317.RunException_sendStackTrace("Error parsing tokens", var22); - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field653 = null; + Messages.RunException_sendStackTrace("Error parsing tokens", var22); + class387.getLoginError(65); + this.field659 = null; return; } } - this.method365(class20.field58); - BuddyRankComparator.setLoginState(20); + this.method356(class27.field76); + class316.method1700(20); } if (loginState == 20) { - if (this.field660 != null) { - if (!this.field660.isDone()) { + if (this.field666 != null) { + if (!this.field666.isDone()) { return; } - if (this.field660.isCancelled()) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field660 = null; + if (this.field666.isCancelled()) { + class387.getLoginError(65); + this.field666 = null; return; } try { - OtlTokenResponse var28 = (OtlTokenResponse)this.field660.get(); + OtlTokenResponse var28 = (OtlTokenResponse)this.field666.get(); if (!var28.isSuccess()) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field660 = null; + class387.getLoginError(65); + this.field666 = null; return; } - this.field658 = var28.getToken(); - this.field660 = null; + this.field665 = var28.getToken(); + this.field666 = null; } catch (Exception var21) { - class317.RunException_sendStackTrace((String)null, var21); - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field660 = null; + Messages.RunException_sendStackTrace((String)null, var21); + class387.getLoginError(65); + this.field666 = null; return; } } else { - if (this.field652 == null) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); + if (this.field660 == null) { + class387.getLoginError(65); return; } - if (!this.field652.method62()) { + if (!this.field660.method54()) { return; } - if (this.field652.method61()) { - class317.RunException_sendStackTrace(this.field652.method59(), (Throwable)null); - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field652 = null; + if (this.field660.method53()) { + Messages.RunException_sendStackTrace(this.field660.method52(), (Throwable)null); + class387.getLoginError(65); + this.field660 = null; return; } - var27 = this.field652.method63(); - if (var27.method70() != 200) { - class317.RunException_sendStackTrace("Response code: " + var27.method70() + "Response body: " + var27.method72(), (Throwable)null); - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field652 = null; + var27 = this.field660.method55(); + if (var27.method63() != 200) { + Messages.RunException_sendStackTrace("Response code: " + var27.method63() + "Response body: " + var27.method66(), (Throwable)null); + class387.getLoginError(65); + this.field660 = null; return; } - List var29 = (List)var27.method71().get("Content-Type"); - if (var29 != null && var29.contains(class461.field3889.method2309())) { + List var30 = (List)var27.method65().get("Content-Type"); + if (var30 != null && var30.contains(class460.field3901.method2331())) { try { - JSONObject var5 = new JSONObject(var27.method72()); - this.field658 = var5.getString("token"); + JSONObject var5 = new JSONObject(var27.method66()); + this.field665 = var5.getString("token"); } catch (JSONException var20) { - class317.RunException_sendStackTrace((String)null, var20); - GrandExchangeOfferTotalQuantityComparator.getLoginError(65); - this.field652 = null; + Messages.RunException_sendStackTrace((String)null, var20); + class387.getLoginError(65); + this.field660 = null; return; } } else { - this.field658 = var27.method72(); + this.field665 = var27.method66(); } - this.field652 = null; + this.field660 = null; } - field440 = 0; - BuddyRankComparator.setLoginState(1); + field448 = 0; + class316.method1700(1); } if (loginState == 1) { - if (class457.socketTask == null) { - class457.socketTask = GameEngine.taskHandler.newSocketTask(VarbitComposition.worldHost, Varps.currentPort); + if (VarcInt.socketTask == null) { + VarcInt.socketTask = GameEngine.taskHandler.newSocketTask(class292.worldHost, class4.currentPort); } - if (class457.socketTask.status == 2) { + if (VarcInt.socketTask.status == 2) { throw new IOException(); } - if (class457.socketTask.status == 1) { - var1 = class310.method1640((Socket)class457.socketTask.result, 40000, 5000); - packetWriter.setSocket(var1); - class457.socketTask = null; - BuddyRankComparator.setLoginState(2); + if (VarcInt.socketTask.status == 1) { + Socket var31 = (Socket)VarcInt.socketTask.result; + BufferedNetSocket var29 = new BufferedNetSocket(var31, 40000, 5000); + var1 = var29; + packetWriter.setSocket(var29); + VarcInt.socketTask = null; + class316.method1700(2); } } - PacketBufferNode var31; + PacketBufferNode var33; if (loginState == 2) { packetWriter.clearBuffer(); - var31 = class130.method708(); - var31.clientPacket = null; - var31.clientPacketLength = 0; - var31.packetBuffer = new PacketBuffer(5000); - var31.packetBuffer.writeByte(LoginPacket.field2725.id); - packetWriter.addNode(var31); + var33 = class146.method779(); + var33.clientPacket = null; + var33.clientPacketLength = 0; + var33.packetBuffer = new PacketBuffer(5000); + var33.packetBuffer.writeByte(LoginPacket.field2746.id); + packetWriter.addNode(var33); packetWriter.flush(); var2.offset = 0; - BuddyRankComparator.setLoginState(3); + class316.method1700(3); } int var13; if (loginState == 3) { - if (VerticalAlignment.pcmPlayer1 != null) { - VerticalAlignment.pcmPlayer1.method201(); + if (AddRequestTask.pcmPlayer1 != null) { + AddRequestTask.pcmPlayer1.method200(); } - if (var1.isAvailable(1)) { - var13 = var1.readUnsignedByte(); - if (VerticalAlignment.pcmPlayer1 != null) { - VerticalAlignment.pcmPlayer1.method201(); + if (((AbstractSocket)var1).isAvailable(1)) { + var13 = ((AbstractSocket)var1).readUnsignedByte(); + if (AddRequestTask.pcmPlayer1 != null) { + AddRequestTask.pcmPlayer1.method200(); } if (var13 != 0) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(var13); + class387.getLoginError(var13); return; } var2.offset = 0; - BuddyRankComparator.setLoginState(4); + class316.method1700(4); } } if (loginState == 4) { if (var2.offset < 8) { - var13 = var1.available(); + var13 = ((AbstractSocket)var1).available(); if (var13 > 8 - var2.offset) { var13 = 8 - var2.offset; } if (var13 > 0) { - var1.read(var2.array, var2.offset, var13); + ((AbstractSocket)var1).read(var2.array, var2.offset, var13); var2.offset += var13; } } if (var2.offset == 8) { var2.offset = 0; - class313.field2820 = var2.readLong(); - BuddyRankComparator.setLoginState(5); + class125.field1195 = var2.readLong(); + class316.method1700(5); } } if (loginState == 5) { packetWriter.packetBuffer.offset = 0; packetWriter.clearBuffer(); - PacketBuffer var30 = new PacketBuffer(500); - int[] var33 = new int[]{ObjTypeCustomisation.secureRandom.nextInt(), ObjTypeCustomisation.secureRandom.nextInt(), ObjTypeCustomisation.secureRandom.nextInt(), ObjTypeCustomisation.secureRandom.nextInt()}; - var30.offset = 0; - var30.writeByte(1); - var30.writeInt(var33[0]); - var30.writeInt(var33[1]); - var30.writeInt(var33[2]); - var30.writeInt(var33[3]); - var30.writeLong(class313.field2820); + PacketBuffer var32 = new PacketBuffer(500); + int[] var35 = new int[]{GraphicsObject.secureRandom.nextInt(), GraphicsObject.secureRandom.nextInt(), GraphicsObject.secureRandom.nextInt(), GraphicsObject.secureRandom.nextInt()}; + var32.offset = 0; + var32.writeByte(1); + var32.writeInt(var35[0]); + var32.writeInt(var35[1]); + var32.writeInt(var35[2]); + var32.writeInt(var35[3]); + var32.writeLong(class125.field1195); if (gameState == 40) { - var30.writeInt(GrandExchangeOfferWorldComparator.field3568[0]); - var30.writeInt(GrandExchangeOfferWorldComparator.field3568[1]); - var30.writeInt(GrandExchangeOfferWorldComparator.field3568[2]); - var30.writeInt(GrandExchangeOfferWorldComparator.field3568[3]); + var32.writeInt(NewShit.field1577[0]); + var32.writeInt(NewShit.field1577[1]); + var32.writeInt(NewShit.field1577[2]); + var32.writeInt(NewShit.field1577[3]); } else { if (gameState == 50) { - var30.writeByte(class139.field1308.rsOrdinal()); - var30.writeInt(World.field666); + var32.writeByte(class139.field1318.rsOrdinal()); + var32.writeInt(class72.field730); } else { - var30.writeByte(field415.rsOrdinal()); - switch(field415.field1313) { + var32.writeByte(field421.rsOrdinal()); + switch(field421.field1327) { + case 0: + var32.writeInt(class449.clientPreferences.method569(Login.Login_username)); case 1: - case 4: - var30.writeMedium(class424.field3758); - ++var30.offset; + default: break; case 2: - var30.offset += 4; + case 4: + var32.writeMedium(class503.field4107); + ++var32.offset; break; case 3: - var30.writeInt(class150.clientPreferences.method576(Login.Login_username)); + var32.offset += 4; } } - if (field644.method2597()) { - var30.writeByte(class518.field4160.rsOrdinal()); - var30.writeStringCp1252NullTerminated(this.field658); + if (field648.method2616()) { + var32.writeByte(class519.field4204.rsOrdinal()); + var32.writeStringCp1252NullTerminated(this.field665); } else { - var30.writeByte(class518.field4159.rsOrdinal()); - var30.writeStringCp1252NullTerminated(Login.Login_password); + var32.writeByte(class519.field4205.rsOrdinal()); + var32.writeStringCp1252NullTerminated(Login.Login_password); } } - var30.encryptRsa(class74.field736, class74.field737); - GrandExchangeOfferWorldComparator.field3568 = var33; - PacketBufferNode var6 = class130.method708(); + var32.encryptRsa(class74.field742, class74.field741); + NewShit.field1577 = var35; + PacketBufferNode var6 = class146.method779(); var6.clientPacket = null; var6.clientPacketLength = 0; var6.packetBuffer = new PacketBuffer(5000); @@ -2089,218 +2162,220 @@ final void doCycleLoggedOut() { var6.packetBuffer.writeShort(0); int var7 = var6.packetBuffer.offset; - var6.packetBuffer.writeInt(215); + var6.packetBuffer.writeInt(216); var6.packetBuffer.writeInt(1); var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeByte(field421); + var6.packetBuffer.writeByte(field424); byte var8 = 0; var6.packetBuffer.writeByte(var8); - var6.packetBuffer.writeBytes(var30.array, 0, var30.offset); + var6.packetBuffer.writeBytes(var32.array, 0, var32.offset); int var9 = var6.packetBuffer.offset; var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var6.packetBuffer.writeShort(GrandExchangeOfferTotalQuantityComparator.canvasWidth); - var6.packetBuffer.writeShort(WorldMapArchiveLoader.canvasHeight); - VertexNormal.method1323(var6.packetBuffer); - var6.packetBuffer.writeStringCp1252NullTerminated(class36.param9); - - var6.packetBuffer.writeInt(PcmPlayer.field182); // @TODO Same - + var6.packetBuffer.writeShort(class113.canvasWidth); + var6.packetBuffer.writeShort(class177.canvasHeight); + class177.method919(var6.packetBuffer); + var6.packetBuffer.writeStringCp1252NullTerminated(MusicPatchPcmStream.param9); + var6.packetBuffer.writeInt(WorldMapSectionType.field2416); if (param25 > 213) { var6.packetBuffer.writeByte(0); } - Buffer var10 = new Buffer(NPCComposition.field1570.size()); - NPCComposition.field1570.write(var10); + Buffer var10 = new Buffer(class18.field51.size()); + class18.field51.write(var10); var6.packetBuffer.writeBytes(var10.array, 0, var10.array.length); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.writeIntME(class197.archive2.hash); - var6.packetBuffer.writeIntLE(Interpreter.field713.hash); - var6.packetBuffer.writeIntME(class151.field1352.hash); + var6.packetBuffer.writeIntLE(class499.archive9.hash); + var6.packetBuffer.writeIntLE(Tiles.field838.hash); + var6.packetBuffer.writeIntLE(class106.field1107.hash); + var6.packetBuffer.writeIntLE(class147.field1348.hash); + var6.packetBuffer.writeIntLE(class388.field3655.hash); + var6.packetBuffer.writeIntIME(ObjectSound.archive4.hash); + var6.packetBuffer.writeInt(class227.field2040.hash); + var6.packetBuffer.writeIntIME_(class28.field81.hash); + var6.packetBuffer.writeInt(AttackOption.field1096.hash); + var6.packetBuffer.writeIntLE(class10.field28.hash); var6.packetBuffer.writeIntLE(0); - var6.packetBuffer.writeIntME(class253.archive4.hash); - var6.packetBuffer.writeIntIME(World.field670.hash); - var6.packetBuffer.writeInt(class131.archive10.hash); - var6.packetBuffer.writeIntIME(class7.archive11.hash); - var6.packetBuffer.writeIntLE(class126.archive12.hash); - var6.packetBuffer.writeIntLE(Canvas.archive9.hash); - var6.packetBuffer.writeIntME(TileItem.archive7.hash); - var6.packetBuffer.writeIntME(class191.field1546.hash); - var6.packetBuffer.writeIntIME(Varcs.field1130.hash); - var6.packetBuffer.writeIntLE(class386.archive8.hash); - var6.packetBuffer.writeInt(GrandExchangeOfferOwnWorldComparator.field358.hash); - var6.packetBuffer.writeIntIME(FontName.archive13.hash); - var6.packetBuffer.writeInt(class106.field1099.hash); - var6.packetBuffer.writeIntME(ReflectionCheck.field151.hash); - var6.packetBuffer.writeIntIME(class148.field1335.hash); - var6.packetBuffer.writeIntME(class149.field1340.hash); - var6.packetBuffer.writeIntIME(class13.archive6.hash); - var6.packetBuffer.xteaEncrypt(var33, var9, var6.packetBuffer.offset); + var6.packetBuffer.writeIntIME(ClanChannelMember.field1339.hash); + var6.packetBuffer.writeIntLE(Player.archive13.hash); + var6.packetBuffer.writeIntIME_(class141.archive10.hash); + var6.packetBuffer.writeIntLE(class1.archive2.hash); + var6.packetBuffer.writeIntIME(class318.archive7.hash); + var6.packetBuffer.writeIntIME_(class385.archive6.hash); + var6.packetBuffer.writeInt(WorldMapElement.field1509.hash); + var6.packetBuffer.writeIntIME_(Message.archive11.hash); + var6.packetBuffer.writeIntIME(PcmPlayer.archive8.hash); + var6.packetBuffer.writeInt(GrandExchangeOffer.archive12.hash); + var6.packetBuffer.xteaEncrypt(var35, var9, var6.packetBuffer.offset); var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var7); packetWriter.addNode(var6); packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var33); + packetWriter.isaacCipher = new IsaacCipher(var35); int[] var11 = new int[4]; for (int var12 = 0; var12 < 4; ++var12) { - var11[var12] = var33[var12] + 50; + var11[var12] = var35[var12] + 50; } var2.newIsaacCipher(var11); - BuddyRankComparator.setLoginState(6); + class316.method1700(6); } int var14; - if (loginState == 6 && var1.available() > 0) { - var13 = var1.readUnsignedByte(); + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { + var13 = ((AbstractSocket)var1).readUnsignedByte(); if (var13 == 61) { - var14 = var1.available(); - Message.field347 = var14 == 1 && var1.readUnsignedByte() == 1; - BuddyRankComparator.setLoginState(5); + var14 = ((AbstractSocket)var1).available(); + ModeWhere.field3613 = var14 == 1 && ((AbstractSocket)var1).readUnsignedByte() == 1; + class316.method1700(5); } if (var13 == 21 && gameState == 20) { - BuddyRankComparator.setLoginState(12); + class316.method1700(12); } else if (var13 == 2) { - BuddyRankComparator.setLoginState(14); + class316.method1700(14); } else if (var13 == 15 && gameState == 40) { packetWriter.serverPacketLength = -1; - BuddyRankComparator.setLoginState(19); + class316.method1700(19); } else if (var13 == 64) { - BuddyRankComparator.setLoginState(10); - } else if (var13 == 23 && field441 < 1) { - ++field441; - BuddyRankComparator.setLoginState(0); + class316.method1700(10); + } else if (var13 == 23 && field447 < 1) { + ++field447; + class316.method1700(0); } else if (var13 == 29) { - BuddyRankComparator.setLoginState(17); + class316.method1700(17); } else { if (var13 != 69) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(var13); + class387.getLoginError(var13); return; } - BuddyRankComparator.setLoginState(7); + class316.method1700(7); } } - if (loginState == 7 && var1.available() >= 2) { - var1.read(var2.array, 0, 2); + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { + ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; - class386.field3640 = var2.readUnsignedShort(); - BuddyRankComparator.setLoginState(8); + class12.field37 = var2.readUnsignedShort(); + class316.method1700(8); } - if (loginState == 8 && var1.available() >= class386.field3640) { + if (loginState == 8 && ((AbstractSocket)var1).available() >= class12.field37) { var2.offset = 0; - var1.read(var2.array, var2.offset, class386.field3640); - class6 var32 = class304.method1581()[var2.readUnsignedByte()]; + ((AbstractSocket)var1).read(var2.array, var2.offset, class12.field37); + class6 var34 = class303.method1624()[var2.readUnsignedByte()]; try { - class3 var35 = Interpreter.method424(var32); - this.field654 = new class7(var2, var35); - BuddyRankComparator.setLoginState(9); + switch(var34.field8) { + case 0: + class0 var38 = new class0(); + this.field657 = new class7(var2, var38); + class316.method1700(9); + break; + default: + throw new IllegalArgumentException(); + } } catch (Exception var19) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(22); + class387.getLoginError(22); return; } } - if (loginState == 9 && this.field654.method14()) { - this.field662 = this.field654.method16(); - this.field654.method15(); - this.field654 = null; - if (this.field662 == null) { - GrandExchangeOfferTotalQuantityComparator.getLoginError(22); + if (loginState == 9 && this.field657.method14()) { + this.field669 = this.field657.method16(); + this.field657.method15(); + this.field657 = null; + if (this.field669 == null) { + class387.getLoginError(22); return; } packetWriter.clearBuffer(); - var31 = class130.method708(); - var31.clientPacket = null; - var31.clientPacketLength = 0; - var31.packetBuffer = new PacketBuffer(5000); - var31.packetBuffer.writeByte(LoginPacket.field2724.id); - var31.packetBuffer.writeShort(this.field662.offset); - var31.packetBuffer.method2517(this.field662); - packetWriter.addNode(var31); + var33 = class146.method779(); + var33.clientPacket = null; + var33.clientPacketLength = 0; + var33.packetBuffer = new PacketBuffer(5000); + var33.packetBuffer.writeByte(LoginPacket.field2743.id); + var33.packetBuffer.writeShort(this.field669.offset); + var33.packetBuffer.method2537(this.field669); + packetWriter.addNode(var33); packetWriter.flush(); - this.field662 = null; - BuddyRankComparator.setLoginState(6); + this.field669 = null; + class316.method1700(6); } - if (loginState == 10 && var1.available() > 0) { - class293.field2480 = var1.readUnsignedByte(); - BuddyRankComparator.setLoginState(11); + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { + KeyHandler.field69 = ((AbstractSocket)var1).readUnsignedByte(); + class316.method1700(11); } - if (loginState == 11 && var1.available() >= class293.field2480) { - var1.read(var2.array, 0, class293.field2480); + if (loginState == 11 && ((AbstractSocket)var1).available() >= KeyHandler.field69) { + ((AbstractSocket)var1).read(var2.array, 0, KeyHandler.field69); var2.offset = 0; - BuddyRankComparator.setLoginState(6); + class316.method1700(6); } - if (loginState == 12 && var1.available() > 0) { - field442 = (var1.readUnsignedByte() + 3) * 60; - BuddyRankComparator.setLoginState(13); + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { + field444 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + class316.method1700(13); } if (loginState == 13) { - field440 = 0; - Actor.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field442 / 60 + " seconds."); - if (--field442 <= 0) { - BuddyRankComparator.setLoginState(0); + field448 = 0; + class318.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field444 / 60 + " seconds."); + if (--field444 <= 0) { + class316.method1700(0); } } else { - if (loginState == 14 && var1.available() >= 1) { - class28.playerUUIDLength = var1.readUnsignedByte(); - BuddyRankComparator.setLoginState(15); + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { + class398.playerUUIDLength = ((AbstractSocket)var1).readUnsignedByte(); + class316.method1700(15); } - if (loginState == 15 && var1.available() >= class28.playerUUIDLength) { - boolean var43 = var1.readUnsignedByte() == 1; - var1.read(var2.array, 0, 4); + if (loginState == 15 && ((AbstractSocket)var1).available() >= class398.playerUUIDLength) { + boolean var44 = ((AbstractSocket)var1).readUnsignedByte() == 1; + ((AbstractSocket)var1).read(var2.array, 0, 4); var2.offset = 0; - boolean var42 = false; - if (var43) { + boolean var43 = false; + if (var44) { var14 = var2.readByteIsaac() << 24; var14 |= var2.readByteIsaac() << 16; var14 |= var2.readByteIsaac() << 8; var14 |= var2.readByteIsaac(); - class150.clientPreferences.method574(Login.Login_username, var14); + class449.clientPreferences.method567(Login.Login_username, var14); } if (Login_isUsernameRemembered) { - class150.clientPreferences.setUsernameToRemember(Login.Login_username); + class449.clientPreferences.setUsernameToRemember(Login.Login_username); } else { - class150.clientPreferences.setUsernameToRemember((String)null); + class449.clientPreferences.setUsernameToRemember((String)null); } - GrandExchangeEvents.savePreferences(); - staffModLevel = var1.readUnsignedByte(); - playerMod = var1.readUnsignedByte() == 1; - localPlayerIndex = var1.readUnsignedByte(); + class338.savePreferences(); + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; - localPlayerIndex += var1.readUnsignedByte(); - isMembers = var1.readUnsignedByte(); - var1.read(var2.array, 0, 8); + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); + isMembers = ((AbstractSocket)var1).readUnsignedByte(); + ((AbstractSocket)var1).read(var2.array, 0, 8); var2.offset = 0; - this.field661 = var2.readLong(); - var1.read(var2.array, 0, 8); + this.field668 = var2.readLong(); + ((AbstractSocket)var1).read(var2.array, 0, 8); var2.offset = 0; playerUUID = var2.readLong(); if (param25 >= 214) { - var1.read(var2.array, 0, 8); + ((AbstractSocket)var1).read(var2.array, 0, 8); var2.offset = 0; var2.readLong(); } - var1.read(var2.array, 0, 1); + ((AbstractSocket)var1).read(var2.array, 0, 1); var2.offset = 0; - ServerPacket[] var36 = Messages.method635(); + ServerPacket[] var36 = class176.method916(); int var15 = var2.readSmartByteShortIsaac(); if (var15 < 0 || var15 >= var36.length) { throw new IOException(var15 + " " + var2.offset); @@ -2308,59 +2383,125 @@ final void doCycleLoggedOut() { packetWriter.serverPacket = var36[var15]; packetWriter.serverPacketLength = packetWriter.serverPacket.length; - var1.read(var2.array, 0, 2); + ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - Client var16 = TileItem.client; - //JSObject.getWindow(var16).call("zap", (Object[])null); + Client var16 = class219.client; + JSObject.getWindow(var16).call("zap", (Object[])null); } catch (Throwable var18) { } - BuddyRankComparator.setLoginState(16); + class316.method1700(16); } - if (loginState == 16) { - if (var1.available() >= packetWriter.serverPacketLength) { + if (loginState != 16) { + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + class342.field3146 = var2.readUnsignedShort(); + class316.method1700(18); + } + + if (loginState == 18 && ((AbstractSocket)var1).available() >= class342.field3146) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, class342.field3146); + var2.offset = 0; + String var40 = var2.readStringCp1252NullTerminated(); + String var42 = var2.readStringCp1252NullTerminated(); + String var39 = var2.readStringCp1252NullTerminated(); + class318.setLoginResponseString(var40, var42, var39); + MusicSong.updateGameState(10); + if (field648.method2616()) { + PcmPlayer.method212(9); + } + } + + if (loginState == 19) { + if (packetWriter.serverPacketLength == -1) { + if (((AbstractSocket)var1).available() < 2) { + return; + } + + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + packetWriter.serverPacketLength = var2.readUnsignedShort(); + } + + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + var2.offset = 0; + var13 = packetWriter.serverPacketLength; + timer.method2155(); + class105.method615(); + Actor.updatePlayer(var2); + if (var13 != var2.offset) { + throw new RuntimeException(); + } + } + } else { + ++field448; + if (field448 > 2000) { + if (field447 < 1) { + if (class480.worldPort == class4.currentPort) { + class4.currentPort = class129.js5Port; + } else { + class4.currentPort = class480.worldPort; + } + + ++field447; + class316.method1700(0); + } else { + class387.getLoginError(-3); + } + } + } + } else { + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { var2.offset = 0; - var1.read(var2.array, 0, packetWriter.serverPacketLength); - timer.method2116(); + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + timer.method2153(); mouseLastLastPressedTimeMillis = -1L; - class497.mouseRecorder.index = 0; - class326.hasFocus = true; + class126.mouseRecorder.index = 0; + class370.hasFocus = true; hadFocus = true; timeOfPreviousKeyPress = -1L; - class19.method66(); + GrandExchangeOfferTotalQuantityComparator.method1943(); packetWriter.clearBuffer(); packetWriter.packetBuffer.offset = 0; packetWriter.serverPacket = null; - packetWriter.field1147 = null; - packetWriter.field1146 = null; - packetWriter.field1148 = null; + packetWriter.field1159 = null; + packetWriter.field1157 = null; + packetWriter.field1158 = null; packetWriter.serverPacketLength = 0; - packetWriter.field1141 = 0; + packetWriter.field1154 = 0; rebootTimer = 0; logoutTimer = 0; hintArrowType = 0; - menuOptionsCount = 0; - isMenuOpen = false; - ApproximateRouteStrategy.method349(0); - SoundCache.method224(); + Frames.method1297(); + class20.method64(0); + ChatChannel.method451(); isItemSelected = 0; isSpellSelected = false; soundEffectCount = 0; camAngleY = 0; oculusOrbState = 0; - UserComparator7.field1171 = null; + class390.field3656 = null; minimapState = 0; - field535 = -1; + field538 = -1; destinationX = 0; destinationY = 0; playerAttackOption = AttackOption.AttackOption_hidden; npcAttackOption = AttackOption.AttackOption_hidden; npcCount = 0; - CollisionMap.method1102(); + Players.Players_count = 0; + + for (var13 = 0; var13 < 2048; ++var13) { + Players.cachedAppearanceBuffer[var13] = null; + Players.playerMovementSpeeds[var13] = MoveSpeed.WALK; + } for (var13 = 0; var13 < 2048; ++var13) { players[var13] = null; @@ -2383,196 +2524,85 @@ final void doCycleLoggedOut() { } pendingSpawns = new NodeDeque(); - class177.friendSystem.clear(); + class299.friendSystem.clear(); - for (var13 = 0; var13 < VarpDefinition.field1491; ++var13) { - VarpDefinition var41 = class158.VarpDefinition_get(var13); + for (var13 = 0; var13 < VarpDefinition.field1498; ++var13) { + VarpDefinition var41 = ApproximateRouteStrategy.VarpDefinition_get(var13); if (var41 != null) { Varps.Varps_temp[var13] = 0; Varps.Varps_main[var13] = 0; } } - PendingSpawn.varcs.clearTransient(); + KeyHandler.varcs.clearTransient(); followerIndex = -1; if (rootInterface != -1) { - var13 = rootInterface; - if (var13 != -1 && Widget.Widget_loadedInterfaces[var13]) { - ArchiveLoader.Widget_archive.clearFilesGroup(var13); - if (ArchiveLoader.Widget_interfaceComponents[var13] != null) { - for (var14 = 0; var14 < ArchiveLoader.Widget_interfaceComponents[var13].length; ++var14) { - if (ArchiveLoader.Widget_interfaceComponents[var13][var14] != null) { - ArchiveLoader.Widget_interfaceComponents[var13][var14] = null; - } - } - - ArchiveLoader.Widget_interfaceComponents[var13] = null; - Widget.Widget_loadedInterfaces[var13] = false; - } - } + Skeleton.method1232(rootInterface); } for (InterfaceParent var37 = (InterfaceParent)interfaceParents.first(); var37 != null; var37 = (InterfaceParent)interfaceParents.next()) { - Actor.closeInterface(var37, true); + class92.closeInterface(var37, true); } rootInterface = -1; interfaceParents = new NodeHashTable(8); meslayerContinueWidget = null; - menuOptionsCount = 0; - isMenuOpen = false; - playerAppearance.method1680((int[])null, (int[])null, new int[]{0, 0, 0, 0, 0}, 0, -1); + Frames.method1297(); + playerAppearance.method1718((int[])null, (int[])null, new int[]{0, 0, 0, 0, 0}, 0, -1); for (var13 = 0; var13 < 8; ++var13) { playerMenuActions[var13] = null; playerOptionsPriorities[var13] = false; } - ItemContainer.itemContainers = new NodeHashTable(32); + LoginPacket.method1614(); isLoading = true; for (var13 = 0; var13 < 100; ++var13) { - field403[var13] = true; + field407[var13] = true; } - LoadSongTask.method2108(); - Canvas.friendsChat = null; - class11.guestClanSettings = null; + Message.method341(); + ReflectionCheck.friendsChat = null; + Players.guestClanSettings = null; Arrays.fill(currentClanSettings, (Object)null); - WorldMapLabelSize.guestClanChannel = null; + VerticalAlignment.guestClanChannel = null; Arrays.fill(currentClanChannels, (Object)null); for (var13 = 0; var13 < 8; ++var13) { grandExchangeOffers[var13] = new GrandExchangeOffer(); } - class28.grandExchangeEvents = null; + class392.grandExchangeEvents = null; reloadJS5 = false; - class164.updatePlayer(var2); - class309.timeOfPreviousKeyPress = -1; - class303.loadRegions(false, var2); + Actor.updatePlayer(var2); + Tiles.timeOfPreviousKeyPress = -1; + class271.loadRegions(false, var2); packetWriter.serverPacket = null; } - } else { - if (loginState == 17 && var1.available() >= 2) { - var2.offset = 0; - var1.read(var2.array, 0, 2); - var2.offset = 0; - WorldMapSectionType.field2392 = var2.readUnsignedShort(); - BuddyRankComparator.setLoginState(18); - } - - if (loginState == 18 && var1.available() >= WorldMapSectionType.field2392) { - var2.offset = 0; - var1.read(var2.array, 0, WorldMapSectionType.field2392); - var2.offset = 0; - String var34 = var2.readStringCp1252NullTerminated(); - String var39 = var2.readStringCp1252NullTerminated(); - String var38 = var2.readStringCp1252NullTerminated(); - Actor.setLoginResponseString(var34, var39, var38); - class129.updateGameState(10); - if (field644.method2597()) { - class328.method1678(9); - } - } - - if (loginState != 19) { - ++field440; - if (field440 > 2000) { - if (field441 < 1) { - if (Login.worldPort == Varps.currentPort) { - Varps.currentPort = class11.js5Port; - } else { - Varps.currentPort = Login.worldPort; - } - - ++field441; - BuddyRankComparator.setLoginState(0); - } else { - GrandExchangeOfferTotalQuantityComparator.getLoginError(-3); - } - } - } else { - if (packetWriter.serverPacketLength == -1) { - if (var1.available() < 2) { - return; - } - - var1.read(var2.array, 0, 2); - var2.offset = 0; - packetWriter.serverPacketLength = var2.readUnsignedShort(); - } - - if (var1.available() >= packetWriter.serverPacketLength) { - var1.read(var2.array, 0, packetWriter.serverPacketLength); - var2.offset = 0; - var13 = packetWriter.serverPacketLength; - timer.method2118(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1147 = null; - packetWriter.field1146 = null; - packetWriter.field1148 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1141 = 0; - rebootTimer = 0; - menuOptionsCount = 0; - isMenuOpen = false; - minimapState = 0; - destinationX = 0; - - for (var14 = 0; var14 < 2048; ++var14) { - players[var14] = null; - } - - class136.localPlayer = null; - - for (var14 = 0; var14 < npcs.length; ++var14) { - NPC var40 = npcs[var14]; - if (var40 != null) { - var40.targetIndex = -1; - var40.false0 = false; - } - } - - ItemContainer.itemContainers = new NodeHashTable(32); - class129.updateGameState(30); - - for (var14 = 0; var14 < 100; ++var14) { - field403[var14] = true; - } - - LoadSongTask.method2108(); - class164.updatePlayer(var2); - if (var13 != var2.offset) { - throw new RuntimeException(); - } - } - } } } } catch (IOException var26) { - if (field441 < 1) { - if (Login.worldPort == Varps.currentPort) { - Varps.currentPort = class11.js5Port; + if (field447 < 1) { + if (class480.worldPort == class4.currentPort) { + class4.currentPort = class129.js5Port; } else { - Varps.currentPort = Login.worldPort; + class4.currentPort = class480.worldPort; } - ++field441; - BuddyRankComparator.setLoginState(0); + ++field447; + class316.method1700(0); } else { - GrandExchangeOfferTotalQuantityComparator.getLoginError(-2); + class387.getLoginError(-2); } } } - @ObfuscatedName("hu") + @ObfuscatedName("hv") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2055696363" + garbageValue = "-1704146678" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { @@ -2586,890 +2616,546 @@ final void doCycleLoggedIn() { if (hadNetworkError) { hadNetworkError = false; - class93.method508(); + Renderable.method1291(); } else { if (!isMenuOpen) { - class89.addCancelMenuEntry(); + class349.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method382(packetWriter); ++var1) { + for (var1 = 0; var1 < 100 && this.method374(packetWriter); ++var1) { } if (gameState == 30) { - int var2; - PacketBufferNode var14; - - while (GraphicsObject.method430()) { - var14 = class503.getPacketBufferNode(ClientPacket.REFLECTION_CHECK_REPLY, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - var2 = var14.packetBuffer.offset; - ArchiveDiskAction.performReflectionCheck(var14.packetBuffer); - var14.packetBuffer.method2520(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - } - - if (timer.field3747) { - var14 = class503.getPacketBufferNode(ClientPacket.LOGIN_STATISTICS, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - var2 = var14.packetBuffer.offset; - timer.write(var14.packetBuffer); - var14.packetBuffer.method2520(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - timer.method2117(); - } - - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - PacketBuffer var10000; - synchronized(class497.mouseRecorder.lock) { - if (!lockMouseRecorder) { - class497.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || class497.mouseRecorder.index >= 40) { - PacketBufferNode var15 = null; - var3 = 0; - var4 = 0; - var5 = 0; - var6 = 0; - - for (var7 = 0; var7 < class497.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { - var4 = var7; - var8 = class497.mouseRecorder.ys[var7]; - if (var8 < -1) { - var8 = -1; - } else if (var8 > 65534) { - var8 = 65534; - } + while (true) { + ReflectionCheck var2 = (ReflectionCheck)class36.reflectionChecks.last(); + boolean var29; + if (var2 == null) { + var29 = false; + } else { + var29 = true; + } + + int var3; + PacketBufferNode var30; + if (!var29) { + PacketBufferNode var14; + int var15; + if (timer.field3756) { + var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.LOGIN_STATISTICS, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + var15 = var14.packetBuffer.offset; + timer.write(var14.packetBuffer); + var14.packetBuffer.method2540(var14.packetBuffer.offset - var15); + packetWriter.addNode(var14); + timer.method2154(); + } - var9 = class497.mouseRecorder.xs[var7]; - if (var9 < -1) { - var9 = -1; - } else if (var9 > 65534) { - var9 = 65534; - } + int var4; + int var5; + synchronized(class126.mouseRecorder.lock) { + if (!lockMouseRecorder) { + class126.mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || class126.mouseRecorder.index >= 40) { + var30 = null; + var3 = 0; + var4 = 0; + var5 = 0; + int var6 = 0; + + int var7; + for (var7 = 0; var7 < class126.mouseRecorder.index && (var30 == null || var30.packetBuffer.offset - var3 < 246); ++var7) { + var4 = var7; + int var8 = class126.mouseRecorder.ys[var7]; + if (var8 < -1) { + var8 = -1; + } else if (var8 > 65534) { + var8 = 65534; + } + + int var9 = class126.mouseRecorder.xs[var7]; + if (var9 < -1) { + var9 = -1; + } else if (var9 > 65534) { + var9 = 65534; + } + + if (var9 != lastMouseRecordX || var8 != lastMouseRecordY) { + if (var30 == null) { + var30 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.notsure, packetWriter.isaacCipher); + var30.packetBuffer.writeByte(0); + var3 = var30.packetBuffer.offset; + PacketBuffer var10000 = var30.packetBuffer; + var10000.offset += 2; + var5 = 0; + var6 = 0; + } + + int var10; + int var11; + int var12; + if (field612 != -1L) { + var10 = var9 - lastMouseRecordX; + var11 = var8 - lastMouseRecordY; + var12 = (int)((class126.mouseRecorder.millis[var7] - field612) / 20L); + var5 = (int)((long)var5 + (class126.mouseRecorder.millis[var7] - field612) % 20L); + } else { + var10 = var9; + var11 = var8; + var12 = Integer.MAX_VALUE; + } - if (var9 != lastMouseRecordX || var8 != lastMouseRecordY) { - if (var15 == null) { - var15 = class503.getPacketBufferNode(ClientPacket.EVENT_MOUSE_MOVE, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - var3 = var15.packetBuffer.offset; - var10000 = var15.packetBuffer; - var10000.offset += 2; - var5 = 0; - var6 = 0; + lastMouseRecordX = var9; + lastMouseRecordY = var8; + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { + var10 += 32; + var11 += 32; + var30.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { + var10 += 128; + var11 += 128; + var30.packetBuffer.writeByte(var12 + 128); + var30.packetBuffer.writeShort(var11 + (var10 << 8)); + } else if (var12 < 32) { + var30.packetBuffer.writeByte(var12 + 192); + if (var9 != -1 && var8 != -1) { + var30.packetBuffer.writeInt(var9 | var8 << 16); + } else { + var30.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } else { + var30.packetBuffer.writeShort((var12 & 8191) + 57344); + if (var9 != -1 && var8 != -1) { + var30.packetBuffer.writeInt(var9 | var8 << 16); + } else { + var30.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } + + ++var6; + field612 = class126.mouseRecorder.millis[var7]; + } } - if (-1L != field609) { - var10 = var9 - lastMouseRecordX; - var11 = var8 - lastMouseRecordY; - var12 = (int)((class497.mouseRecorder.millis[var7] - field609) / 20L); - var5 = (int)((long)var5 + (class497.mouseRecorder.millis[var7] - field609) % 20L); - } else { - var10 = var9; - var11 = var8; - var12 = Integer.MAX_VALUE; + if (var30 != null) { + var30.packetBuffer.method2540(var30.packetBuffer.offset - var3); + var7 = var30.packetBuffer.offset; + var30.packetBuffer.offset = var3; + var30.packetBuffer.writeByte(var5 / var6); + var30.packetBuffer.writeByte(var5 % var6); + var30.packetBuffer.offset = var7; + packetWriter.addNode(var30); } - lastMouseRecordX = var9; - lastMouseRecordY = var8; - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { - var10 += 32; - var11 += 32; - var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { - var10 += 128; - var11 += 128; - var15.packetBuffer.writeByte(var12 + 128); - var15.packetBuffer.writeShort(var11 + (var10 << 8)); - } else if (var12 < 32) { - var15.packetBuffer.writeByte(var12 + 192); - if (var9 != -1 && var8 != -1) { - var15.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); - } + if (var4 >= class126.mouseRecorder.index) { + class126.mouseRecorder.index = 0; } else { - var15.packetBuffer.writeShort((var12 & 8191) + 57344); - if (var9 != -1 && var8 != -1) { - var15.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); - } + MouseRecorder var43 = class126.mouseRecorder; + var43.index -= var4; + System.arraycopy(class126.mouseRecorder.xs, var4, class126.mouseRecorder.xs, 0, class126.mouseRecorder.index); + System.arraycopy(class126.mouseRecorder.ys, var4, class126.mouseRecorder.ys, 0, class126.mouseRecorder.index); + System.arraycopy(class126.mouseRecorder.millis, var4, class126.mouseRecorder.millis, 0, class126.mouseRecorder.index); } - - ++var6; - field609 = class497.mouseRecorder.millis[var7]; } } - if (var15 != null) { - var15.packetBuffer.method2520(var15.packetBuffer.offset - var3); - var7 = var15.packetBuffer.offset; - var15.packetBuffer.offset = var3; - var15.packetBuffer.writeByte(var5 / var6); - var15.packetBuffer.writeByte(var5 % var6); - var15.packetBuffer.offset = var7; - packetWriter.addNode(var15); - } + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; + if (var16 > 32767L) { + var16 = 32767L; + } - if (var4 >= class497.mouseRecorder.index) { - class497.mouseRecorder.index = 0; - } else { - MouseRecorder var50 = class497.mouseRecorder; - var50.index -= var4; - System.arraycopy(class497.mouseRecorder.xs, var4, class497.mouseRecorder.xs, 0, class497.mouseRecorder.index); - System.arraycopy(class497.mouseRecorder.ys, var4, class497.mouseRecorder.ys, 0, class497.mouseRecorder.index); - System.arraycopy(class497.mouseRecorder.millis, var4, class497.mouseRecorder.millis, 0, class497.mouseRecorder.index); - } - } - } + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; + var3 = MouseHandler.MouseHandler_lastPressedY; + if (var3 < 0) { + var3 = 0; + } else if (var3 > class177.canvasHeight) { + var3 = class177.canvasHeight; + } - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !class28.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; - if (var16 > 32767L) { - var16 = 32767L; - } + var4 = MouseHandler.MouseHandler_lastPressedX; + if (var4 < 0) { + var4 = 0; + } else if (var4 > class113.canvasWidth) { + var4 = class113.canvasWidth; + } - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; - var3 = MouseHandler.MouseHandler_lastPressedY; - if (var3 < 0) { - var3 = 0; - } else if (var3 > WorldMapArchiveLoader.canvasHeight) { - var3 = WorldMapArchiveLoader.canvasHeight; - } + var5 = (int)var16; + if (shouldProcessClick()) { + var18 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_MOUSE_CLICK, packetWriter.isaacCipher); + var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); + var18.packetBuffer.writeShort(var4); + var18.packetBuffer.writeShort(var3); + packetWriter.addNode(var18); + } + } - var4 = MouseHandler.MouseHandler_lastPressedX; - if (var4 < 0) { - var4 = 0; - } else if (var4 > GrandExchangeOfferTotalQuantityComparator.canvasWidth) { - var4 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; - } + if (mouseWheelRotation != 0) { + var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_MOUSE_SCROLl, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(mouseWheelRotation); + packetWriter.addNode(var14); + } - var5 = (int)var16; - var18 = class503.getPacketBufferNode(ClientPacket.EVENT_MOUSE_CLICK, packetWriter.isaacCipher); - var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); - var18.packetBuffer.writeShort(var4); - var18.packetBuffer.writeShort(var3); - packetWriter.addNode(var18); - } + if (keyHandlerInstance.pressedKeysCount > 0) { + var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_KEYBOARD, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(0); + var15 = var14.packetBuffer.offset; + long var19 = GameEngine.clockNow(); - if (mouseWheelRotation != 0) { - var14 = class503.getPacketBufferNode(ClientPacket.EVENT_MOUSE_SCROLl, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(mouseWheelRotation); - packetWriter.addNode(var14); - } + for (var5 = 0; var5 < keyHandlerInstance.pressedKeysCount; ++var5) { + long var21 = var19 - timeOfPreviousKeyPress; + if (var21 > 16777215L) { + var21 = 16777215L; + } - if (keyHandlerInstance.pressedKeysCount > 0) { - var14 = class503.getPacketBufferNode(ClientPacket.EVENT_KEYBOARD, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(0); - var2 = var14.packetBuffer.offset; - long var19 = class113.clockNow(); + timeOfPreviousKeyPress = var19; + var14.packetBuffer.writeByteNeg(keyHandlerInstance.field1892[var5]); + var14.packetBuffer.writeMediumLE((int)var21); + } - for (var5 = 0; var5 < keyHandlerInstance.pressedKeysCount; ++var5) { - long var21 = var19 - timeOfPreviousKeyPress; - if (var21 > 16777215L) { - var21 = 16777215L; + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); + packetWriter.addNode(var14); } - timeOfPreviousKeyPress = var19; - var14.packetBuffer.writeMed0((int)var21); - var14.packetBuffer.writeByteAdd(keyHandlerInstance.field1870[var5]); - } - - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - } - - if (packetIndicator > 0) { - --packetIndicator; - } + if (packetIndicator > 0) { + --packetIndicator; + } - if (keyHandlerInstance.getKeyPressed(96) || keyHandlerInstance.getKeyPressed(97) || keyHandlerInstance.getKeyPressed(98) || keyHandlerInstance.getKeyPressed(99)) { - emitPackets = true; - } + if (keyHandlerInstance.getKeyPressed(96) || keyHandlerInstance.getKeyPressed(97) || keyHandlerInstance.getKeyPressed(98) || keyHandlerInstance.getKeyPressed(99)) { + emitPackets = true; + } - if (emitPackets && packetIndicator <= 0) { - packetIndicator = 20; - emitPackets = false; - var14 = class503.getPacketBufferNode(ClientPacket.EVENT_CAMERA_POSITION, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(camAngleY); - var14.packetBuffer.writeShort(camAngleX); - packetWriter.addNode(var14); - } + if (emitPackets && packetIndicator <= 0) { + packetIndicator = 20; + emitPackets = false; + var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_CAMERA_POSITION, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(camAngleY); + var14.packetBuffer.writeShortAddLE(camAngleX); + packetWriter.addNode(var14); + } - if (class326.hasFocus && !hadFocus) { - hadFocus = true; - var14 = class503.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(1); - packetWriter.addNode(var14); - } + if (class370.hasFocus && !hadFocus) { + hadFocus = true; + var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(1); + packetWriter.addNode(var14); + } - if (!class326.hasFocus && hadFocus) { - hadFocus = false; - var14 = class503.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - packetWriter.addNode(var14); - } + if (!class370.hasFocus && hadFocus) { + hadFocus = false; + var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + packetWriter.addNode(var14); + } - if (class127.worldMap != null) { - class127.worldMap.method2359(); - } + if (Canvas.worldMap != null) { + Canvas.worldMap.method2384(); + } - Player var31; - if (DynamicObject.ClanChat_inClanChat) { - if (Canvas.friendsChat != null) { - Canvas.friendsChat.sort(); - } + if (SpotAnimationDefinition.ClanChat_inClanChat) { + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.sort(); + } - for (var1 = 0; var1 < Players.Players_count; ++var1) { - var31 = players[Players.Players_indices[var1]]; - var31.clearIsInFriendsChat(); - } + for (var1 = 0; var1 < Players.Players_count; ++var1) { + Player var31 = players[Players.Players_indices[var1]]; + var31.clearIsInFriendsChat(); + } - DynamicObject.ClanChat_inClanChat = false; - } + SpotAnimationDefinition.ClanChat_inClanChat = false; + } - if (class458.field3887) { - for (var1 = 0; var1 < Players.Players_count; ++var1) { - var31 = players[Players.Players_indices[var1]]; - var31.clearIsInClanChat(); - } + AddRequestTask.method2124(); + class164.method864(); + if (gameState != 30) { + return; + } - class458.field3887 = false; - } + Ignored.method2249(); + Canvas.method77(); + ++packetWriter.field1154; + if (packetWriter.field1154 > 750) { + Renderable.method1291(); + return; + } - if (class36.Client_plane != field535) { - field535 = class36.Client_plane; - class12.method43(class36.Client_plane); - } + var1 = Players.Players_count; + int[] var32 = Players.Players_indices; - if (gameState == 30) { - for (PendingSpawn var30 = (PendingSpawn)pendingSpawns.last(); var30 != null; var30 = (PendingSpawn)pendingSpawns.previous()) { - if (var30.endCycle > 0) { - --var30.endCycle; + for (var3 = 0; var3 < var1; ++var3) { + Player var23 = players[var32[var3]]; + if (var23 != null) { + class318.updateActorSequence(var23, 1); + } } - if (var30.endCycle == 0) { - if (var30.objectId < 0 || DevicePcmPlayerProvider.method80(var30.objectId, var30.field943)) { - ObjTypeCustomisation.addPendingSpawnToScene(var30.plane, var30.type, var30.x, var30.y, var30.objectId, var30.field945, var30.field943, var30.field948); - var30.remove(); - } - } else { - if (var30.startCycle > 0) { - --var30.startCycle; + for (var1 = 0; var1 < npcCount; ++var1) { + var15 = npcIndices[var1]; + NPC var24 = npcs[var15]; + if (var24 != null) { + class318.updateActorSequence(var24, var24.definition.size); } + } - if (var30.startCycle == 0 && var30.x >= 1 && var30.y >= 1 && var30.x <= 102 && var30.y <= 102 && (var30.id < 0 || DevicePcmPlayerProvider.method80(var30.id, var30.objectType))) { - ObjTypeCustomisation.addPendingSpawnToScene(var30.plane, var30.type, var30.x, var30.y, var30.id, var30.rotation, var30.objectType, var30.field948); - var30.startCycle = -1; - if (var30.objectId == var30.id && var30.objectId == -1) { - var30.remove(); - } else if (var30.objectId == var30.id && var30.field945 == var30.rotation && var30.objectType == var30.field943) { - var30.remove(); - } + WorldMapManager.method1482(); + ++field457; + if (mouseCrossColor != 0) { + mouseCrossState += 20; + if (mouseCrossState >= 400) { + mouseCrossColor = 0; } } - } - int var10002; - for (var1 = 0; var1 < soundEffectCount; ++var1) { - var10002 = queuedSoundEffectDelays[var1]--; - if (queuedSoundEffectDelays[var1] >= -10) { - SoundEffect var34 = soundEffects[var1]; - if (var34 == null) { - var10000 = null; - var34 = SoundEffect.readSoundEffect(class149.field1340, soundEffectIds[var1], 0); - if (var34 == null) { - continue; - } + Widget var35 = class146.mousedOverWidgetIf1; + Widget var33 = class343.field3147; + class146.mousedOverWidgetIf1 = null; + class343.field3147 = null; + draggedOnWidget = null; + field397 = false; + field395 = false; + field532 = 0; - int[] var51 = queuedSoundEffectDelays; - var51[var1] += var34.calculateDelay(); - soundEffects[var1] = var34; - } + while (keyHandlerInstance.method1105() && field532 < 128) { + if (staffModLevel >= 2 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.field1890 == 66) { + StringBuilder var38 = new StringBuilder(); - if (queuedSoundEffectDelays[var1] < 0) { - if (soundLocations[var1] != 0) { - var4 = (soundLocations[var1] & 255) * 128; - var5 = soundLocations[var1] >> 16 & 255; - var6 = var5 * 128 + 64 - class136.localPlayer.x; - if (var6 < 0) { - var6 = -var6; + Message var36; + for (Iterator var25 = Messages.Messages_hashTable.iterator(); var25.hasNext(); var38.append(var36.text).append('\n')) { + var36 = (Message)var25.next(); + if (var36.sender != null && !var36.sender.isEmpty()) { + var38.append(var36.sender).append(':'); } + } - var7 = soundLocations[var1] >> 8 & 255; - var8 = var7 * 128 + 64 - class136.localPlayer.y; - if (var8 < 0) { - var8 = -var8; - } + String var40 = var38.toString(); + class219.client.method138(var40); + } else if (oculusOrbState != 1 || keyHandlerInstance.field1889 <= 0) { + field581[field532] = keyHandlerInstance.field1890; + field580[field532] = keyHandlerInstance.field1889; + ++field532; + } + } - var9 = var8 + var6 - 128; - if (var9 > var4) { - queuedSoundEffectDelays[var1] = -100; - continue; - } + boolean var34 = staffModLevel >= 2; + if (var34 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.getKeyPressed(81) && mouseWheelRotation != 0) { + var4 = VarbitComposition.localPlayer.plane - mouseWheelRotation; + if (var4 < 0) { + var4 = 0; + } else if (var4 > 3) { + var4 = 3; + } - if (var9 < 0) { - var9 = 0; - } + if (var4 != VarbitComposition.localPlayer.plane) { + NPC.method597(VarbitComposition.localPlayer.pathX[0] + UrlRequester.baseX, VarbitComposition.localPlayer.pathY[0] + class47.baseY, var4, false); + } - var3 = (var4 - var9) * class150.clientPreferences.getAreaSoundEffectsVolume() / var4; - } else { - var3 = class150.clientPreferences.getCurrentSoundEffectsVolume(); - } - - if (var3 > 0) { - RawSound var23 = var34.toRawSound().resample(SoundCache.decimator); - RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); - var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); - SecureRandomCallable.pcmStreamMixer.addSubStream(var24); - } - - queuedSoundEffectDelays[var1] = -100; - } - } else { - --soundEffectCount; - - for (var2 = var1; var2 < soundEffectCount; ++var2) { - soundEffectIds[var2] = soundEffectIds[var2 + 1]; - soundEffects[var2] = soundEffects[var2 + 1]; - queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; - queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; - soundLocations[var2] = soundLocations[var2 + 1]; - } - - --var1; - } - } - - if (playingJingle && !ItemContainer.method466()) { - if (class150.clientPreferences.getCurrentMusicVolume() != 0 && HorizontalAlignment.method960()) { - Archive var32 = class13.archive6; - var2 = class150.clientPreferences.getCurrentMusicVolume(); - if (!class306.field2755.isEmpty()) { - ArrayList var25 = new ArrayList(); - Iterator var38 = class306.field2755.iterator(); - - while (var38.hasNext()) { - MusicSong var41 = (MusicSong)var38.next(); - var41.field2852 = false; - var41.field2849 = false; - var41.field2851 = false; - var41.musicTrackArchive = var32; - var41.musicTrackVolume = var2; - var41.field2853 = 0.0F; - var25.add(var41); - } - - UserComparator4.method663(var25, class306.musicPlayerStatus, class306.field2753, class306.field2754, class306.field2751, false); - } - } - - playingJingle = false; - } - - ++packetWriter.field1141; - if (packetWriter.field1141 > 750) { - class93.method508(); - } else { - class27.method115(); - class132.method725(); - int[] var33 = Players.Players_indices; - - for (var2 = 0; var2 < Players.Players_count; ++var2) { - Player var45 = players[var33[var2]]; - if (var45 != null && var45.overheadTextCyclesRemaining > 0) { - --var45.overheadTextCyclesRemaining; - if (var45.overheadTextCyclesRemaining == 0) { - var45.overheadText = null; - } - } - } - - for (var2 = 0; var2 < npcCount; ++var2) { - var3 = npcIndices[var2]; - NPC var39 = npcs[var3]; - if (var39 != null && var39.overheadTextCyclesRemaining > 0) { - --var39.overheadTextCyclesRemaining; - if (var39.overheadTextCyclesRemaining == 0) { - var39.overheadText = null; - } - } - } - - ++field452; - if (mouseCrossColor != 0) { - mouseCrossState += 20; - if (mouseCrossState >= 400) { - mouseCrossColor = 0; - } - } - - Widget var35 = WorldMapScaleHandler.mousedOverWidgetIf1; - Widget var37 = DelayFadeTask.field3700; - WorldMapScaleHandler.mousedOverWidgetIf1 = null; - DelayFadeTask.field3700 = null; - draggedOnWidget = null; - field393 = false; - field391 = false; - field529 = 0; - - while (keyHandlerInstance.method1085() && field529 < 128) { - if (staffModLevel >= 2 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.field1869 == 66) { - StringBuilder var40 = new StringBuilder(); - - Message var36; - for (Iterator var43 = Messages.Messages_hashTable.iterator(); var43.hasNext(); var40.append(var36.text).append('\n')) { - var36 = (Message)var43.next(); - if (var36.sender != null && !var36.sender.isEmpty()) { - var40.append(var36.sender).append(':'); - } - } - - String var46 = var40.toString(); - TileItem.client.method141(var46); - } else if (oculusOrbState != 1 || keyHandlerInstance.field1867 <= 0) { - field578[field529] = keyHandlerInstance.field1869; - field576[field529] = keyHandlerInstance.field1867; - ++field529; - } - } - - if (class158.method835() && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.getKeyPressed(81) && mouseWheelRotation != 0) { - var3 = class136.localPlayer.plane - mouseWheelRotation; - if (var3 < 0) { - var3 = 0; - } else if (var3 > 3) { - var3 = 3; - } - - if (var3 != class136.localPlayer.plane) { - var4 = class136.localPlayer.pathX[0] + AbstractArchive.baseX; - var5 = class136.localPlayer.pathY[0] + class148.baseY; - var18 = class503.getPacketBufferNode(ClientPacket.TELEPORT, packetWriter.isaacCipher); - var18.packetBuffer.writeIntME(0); - var18.packetBuffer.writeShortAddLE(var4); - var18.packetBuffer.writeByteAdd(var3); - var18.packetBuffer.writeShortAdd(var5); - packetWriter.addNode(var18); - } - - mouseWheelRotation = 0; - } + mouseWheelRotation = 0; + } if (MouseHandler.MouseHandler_lastButton == 1) { - field594.method1071(); + field423.method1090(); } if (rootInterface != -1) { - class10.updateRootInterface(rootInterface, 0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, WorldMapArchiveLoader.canvasHeight, 0, 0); + LoginScreenAnimation.updateRootInterface(rootInterface, 0, 0, class113.canvasWidth, class177.canvasHeight, 0, 0); } ++cycleCntr; while (true) { + Widget var37; + ScriptEvent var39; Widget var42; - Widget var44; - ScriptEvent var47; do { - var47 = (ScriptEvent)field624.removeLast(); - if (var47 == null) { + var39 = (ScriptEvent)field629.removeLast(); + if (var39 == null) { while (true) { do { - var47 = (ScriptEvent)field626.removeLast(); - if (var47 == null) { + var39 = (ScriptEvent)field630.removeLast(); + if (var39 == null) { while (true) { do { - var47 = (ScriptEvent)scriptEvents.removeLast(); - if (var47 == null) { + var39 = (ScriptEvent)scriptEvents.removeLast(); + if (var39 == null) { while (true) { - class212 var49 = (class212)field625.removeLast(); - if (var49 == null) { + class211 var41 = (class211)field628.removeLast(); + if (var41 == null) { this.menu(); - if (class127.worldMap != null) { - class127.worldMap.method2369(class36.Client_plane, (class136.localPlayer.x >> 7) + AbstractArchive.baseX, (class136.localPlayer.y >> 7) + class148.baseY, false); - class127.worldMap.loadCache(); - } - + WorldMapRectangle.method1529(); if (clickedWidget != null) { - this.method389(); + this.method380(); } if (Scene.shouldSendWalk()) { - var3 = Scene.Scene_selectedX; - var4 = Scene.Scene_selectedY; - PacketBufferNode var48 = class503.getPacketBufferNode(ClientPacket.MOVE_GAMECLICK, packetWriter.isaacCipher); - var48.packetBuffer.writeByte(5); - var48.packetBuffer.writeShort(var3 + AbstractArchive.baseX); - var48.packetBuffer.writeByteAdd(keyHandlerInstance.getKeyPressed(82) ? (keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); - var48.packetBuffer.writeShortLE(var4 + class148.baseY); - packetWriter.addNode(var48); - Scene.method1253(); + var4 = Scene.Scene_selectedX; + var5 = Scene.Scene_selectedY; + var18 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.MOVE_GAMECLICK, packetWriter.isaacCipher); + var18.packetBuffer.writeByte(5); + var18.packetBuffer.writeShortAddLE(var4 + UrlRequester.baseX); + var18.packetBuffer.writeShortAdd(var5 + class47.baseY); + var18.packetBuffer.writeByteSub(keyHandlerInstance.getKeyPressed(82) ? (keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); + packetWriter.addNode(var18); + Scene.method1275(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; mouseCrossColor = 1; mouseCrossState = 0; - destinationX = var3; - destinationY = var4; + destinationX = var4; + destinationY = var5; } - if (var35 != WorldMapScaleHandler.mousedOverWidgetIf1) { + if (var35 != class146.mousedOverWidgetIf1) { if (var35 != null) { - class200.invalidateWidget(var35); + class218.invalidateWidget(var35); } - if (WorldMapScaleHandler.mousedOverWidgetIf1 != null) { - class200.invalidateWidget(WorldMapScaleHandler.mousedOverWidgetIf1); + if (class146.mousedOverWidgetIf1 != null) { + class218.invalidateWidget(class146.mousedOverWidgetIf1); } } - if (var37 != DelayFadeTask.field3700 && field493 == field494) { - if (var37 != null) { - class200.invalidateWidget(var37); + if (var33 != class343.field3147 && field496 == field498) { + if (var33 != null) { + class218.invalidateWidget(var33); } - if (DelayFadeTask.field3700 != null) { - class200.invalidateWidget(DelayFadeTask.field3700); + if (class343.field3147 != null) { + class218.invalidateWidget(class343.field3147); } } - if (DelayFadeTask.field3700 != null) { - if (field494 < field493) { - ++field494; - if (field493 == field494) { - class200.invalidateWidget(DelayFadeTask.field3700); - } - } - } else if (field494 > 0) { - --field494; - } - - if (oculusOrbState == 0) { - var3 = class136.localPlayer.x; - var4 = class136.localPlayer.y; - if (class467.oculusOrbFocalPointX - var3 < -500 || class467.oculusOrbFocalPointX - var3 > 500 || class36.oculusOrbFocalPointY - var4 < -500 || class36.oculusOrbFocalPointY - var4 > 500) { - class467.oculusOrbFocalPointX = var3; - class36.oculusOrbFocalPointY = var4; - } - - if (var3 != class467.oculusOrbFocalPointX) { - class467.oculusOrbFocalPointX += (var3 - class467.oculusOrbFocalPointX) / 16; - } - - if (var4 != class36.oculusOrbFocalPointY) { - class36.oculusOrbFocalPointY += (var4 - class36.oculusOrbFocalPointY) / 16; - } - - var5 = class467.oculusOrbFocalPointX >> 7; - var6 = class36.oculusOrbFocalPointY >> 7; - var7 = class306.getTileHeight(class467.oculusOrbFocalPointX, class36.oculusOrbFocalPointY, class36.Client_plane); - var8 = 0; - if (var5 > 3 && var6 > 3 && var5 < 100 && var6 < 100) { - for (var9 = var5 - 4; var9 <= var5 + 4; ++var9) { - for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { - var11 = class36.Client_plane; - if (var11 < 3 && (Tiles.Tiles_renderFlags[1][var9][var10] & 2) == 2) { - ++var11; - } - - var12 = var7 - Tiles.Tiles_heights[var11][var9][var10]; - if (var12 > var8) { - var8 = var12; - } - } - } - } - - var9 = var8 * 192; - if (var9 > 98048) { - var9 = 98048; - } - - if (var9 < 32768) { - var9 = 32768; - } - - if (var9 > field475) { - field475 += (var9 - field475) / 24; - } else if (var9 < field475) { - field475 += (var9 - field475) / 80; - } - - class90.field887 = class306.getTileHeight(class136.localPlayer.x, class136.localPlayer.y, class36.Client_plane) - camFollowHeight; - } else if (oculusOrbState == 1) { - Bounds.method2263(); - short var29 = -1; - if (keyHandlerInstance.getKeyPressed(33)) { - var29 = 0; - } else if (keyHandlerInstance.getKeyPressed(49)) { - var29 = 1024; - } - - if (keyHandlerInstance.getKeyPressed(48)) { - if (var29 == 0) { - var29 = 1792; - } else if (var29 == 1024) { - var29 = 1280; - } else { - var29 = 1536; - } - } else if (keyHandlerInstance.getKeyPressed(50)) { - if (var29 == 0) { - var29 = 256; - } else if (var29 == 1024) { - var29 = 768; - } else { - var29 = 512; - } - } - - byte var28 = 0; - if (keyHandlerInstance.getKeyPressed(35)) { - var28 = -1; - } else if (keyHandlerInstance.getKeyPressed(51)) { - var28 = 1; - } - - var5 = 0; - if (var29 >= 0 || var28 != 0) { - var5 = keyHandlerInstance.getKeyPressed(81) ? oculusOrbSlowedSpeed * 1568461633 * -427705151 : oculusOrbNormalSpeed * 1667775323 * 1739947219; - var5 *= 16; - field473 = var29; - field468 = var28; - } - - if (field464 < var5) { - field464 += var5 / 8; - if (field464 > var5) { - field464 = var5; - } - } else if (field464 > var5) { - field464 = field464 * 9 / 10; - } - - if (field464 > 0) { - var6 = field464 / 16; - if (field473 >= 0) { - var3 = field473 - class456.cameraYaw & 2047; - var7 = Rasterizer3D.Rasterizer3D_sine[var3]; - var8 = Rasterizer3D.Rasterizer3D_cosine[var3]; - class467.oculusOrbFocalPointX += var6 * var7 / 65536; - class36.oculusOrbFocalPointY += var8 * var6 / 65536; + if (class343.field3147 != null) { + if (field496 < field498) { + ++field496; + if (field496 == field498) { + class218.invalidateWidget(class343.field3147); } - - if (field468 != 0) { - class90.field887 += var6 * field468; - if (class90.field887 > 0) { - class90.field887 = 0; - } - } - } else { - field473 = -1; - field468 = -1; - } - - if (keyHandlerInstance.getKeyPressed(13)) { - packetWriter.addNode(class503.getPacketBufferNode(ClientPacket.EXIT_FREECAM, packetWriter.isaacCipher)); - oculusOrbState = 0; - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && class28.mouseCam) { - var3 = MouseHandler.MouseHandler_y - field463; - camAngleDX = var3 * 2; - field463 = var3 != -1 && var3 != 1 ? (field463 + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * -1733330503 * 1549057161; - var4 = field471 - MouseHandler.MouseHandler_x; - camAngleDY = var4 * 2; - field471 = var4 != -1 && var4 != 1 ? (field471 + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -88003869 * -964990261; - } else { - if (keyHandlerInstance.getKeyPressed(96)) { - camAngleDY += (-24 - camAngleDY) / 2; - } else if (keyHandlerInstance.getKeyPressed(97)) { - camAngleDY += (24 - camAngleDY) / 2; - } else { - camAngleDY /= 2; - } - - if (keyHandlerInstance.getKeyPressed(98)) { - camAngleDX += (12 - camAngleDX) / 2; - } else if (keyHandlerInstance.getKeyPressed(99)) { - camAngleDX += (-12 - camAngleDX) / 2; - } else { - camAngleDX /= 2; } - - field463 = MouseHandler.MouseHandler_y; - field471 = MouseHandler.MouseHandler_x; - } - - camAngleY = camAngleDY / 2 + camAngleY & 2047; - camAngleX += camAngleDX / 2; - if (camAngleX < 128) { - camAngleX = 128; + } else if (field496 > 0) { + --field496; } - if (camAngleX > 383) { - camAngleX = 383; - } - - if (field397) { - class89.method482(class422.field3755, FadeInTask.field3706, ModeWhere.field3604); - class184.method926(class165.field1420, class4.field3); - if (class157.cameraX == class422.field3755 && FadeInTask.field3706 == class384.cameraY && ModeWhere.field3604 == SoundSystem.cameraZ && class165.field1420 == class19.cameraPitch && class456.cameraYaw == class4.field3) { - field397 = false; - isCameraLocked = false; - field398 = false; + class415.method2159(); + if (field400) { + class126.method702(FontName.field4045, KeyHandler.field70, class31.field84); + class416.method2161(UserComparator4.field1180, VertexNormal.field2255); + if (NPCComposition.cameraX == FontName.field4045 && class133.cameraY == KeyHandler.field70 && class139.cameraZ == class31.field84 && class129.cameraPitch == UserComparator4.field1180 && UserComparator10.cameraYaw == VertexNormal.field2255) { field400 = false; - Canvas.cameraLookAtX = 0; - ObjTypeCustomisation.cameraLookAtY = 0; - FontName.cameraLookAtHeight = 0; - class18.cameraLookAtSpeed = 0; - class157.cameraLookAtAcceleration = 0; - SecureRandomFuture.cameraMoveToAcceleration = 0; - cameraMoveToSpeed = 0; - WorldMapIcon_1.cameraMoveToX = 0; - class132.cameraMoveToY = 0; - ModeWhere.cameraMoveToHeight = 0; - field638 = null; - field643 = null; + isCameraLocked = false; + field402 = false; + field404 = false; + PendingSpawn.cameraLookAtX = 0; + VarbitComposition.cameraLookAtY = 0; + MusicPatchNode2.cameraLookAtHeight = 0; + class33.cameraLookAtSpeed = 0; + WorldMapElement.cameraLookAtAcceleration = 0; + MouseHandler.cameraMoveToAcceleration = 0; + class344.cameraMoveToSpeed = 0; + Players.cameraMoveToX = 0; + class33.cameraMoveToY = 0; + VarpDefinition.cameraMoveToHeight = 0; field642 = null; + field647 = null; + field646 = null; } } else if (isCameraLocked) { - if (!field398) { - var3 = WorldMapIcon_1.cameraMoveToX * 128 + 64; - var4 = class132.cameraMoveToY * 128 + 64; - var5 = class306.getTileHeight(var3, var4, class36.Client_plane) - ModeWhere.cameraMoveToHeight; - class89.method482(var3, var5, var4); - } else if (field638 != null) { - class157.cameraX = field638.vmethod2349(); - SoundSystem.cameraZ = field638.vmethod2347(); - if (field399) { - class384.cameraY = field638.vmethod2320(); - } else { - class384.cameraY = class306.getTileHeight(class157.cameraX, SoundSystem.cameraZ, class36.Client_plane) - field638.vmethod2320(); - } - - field638.method2351(); - } - - if (!field400) { - var3 = Canvas.cameraLookAtX * 128 + 64; - var4 = ObjTypeCustomisation.cameraLookAtY * 128 + 64; - var5 = class306.getTileHeight(var3, var4, class36.Client_plane) - FontName.cameraLookAtHeight; - var6 = var3 - class157.cameraX; - var7 = var5 - class384.cameraY; - var8 = var4 - SoundSystem.cameraZ; - var9 = (int)Math.sqrt((double)(var8 * var8 + var6 * var6)); - var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.9490051269531D) & 2047; - var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.9490051269531D) & 2047; - class184.method926(var10, var11); - } else { - if (field643 != null) { - class19.cameraPitch = field643.method2346(); - class19.cameraPitch = Math.min(Math.max(class19.cameraPitch, 128), 383); - field643.method2351(); - } - - if (field642 != null) { - class456.cameraYaw = field642.method2346() & 2047; - field642.method2351(); - } - } + class140.method762(); } - for (var3 = 0; var3 < 5; ++var3) { - var10002 = cameraShakeCycle[var3]++; + for (var4 = 0; var4 < 5; ++var4) { + int var10002 = cameraShakeCycle[var4]++; } - PendingSpawn.varcs.tryWrite(); - var3 = ++MouseHandler.MouseHandler_idleCycles - 1; - var5 = class1.method3(); - if (var3 > 15000 && var5 > 15000) { + KeyHandler.varcs.tryWrite(); + var4 = MusicPatchPcmStream.method1690(); + var5 = GameEngine.keyHandler.getIdleCycles(); + PacketBufferNode var26; + if (var4 > 15000 && var5 > 15000) { logoutTimer = 250; - ApproximateRouteStrategy.method349(14500); - var18 = class503.getPacketBufferNode(ClientPacket.IDLE_LOGOUT, packetWriter.isaacCipher); - packetWriter.addNode(var18); + class20.method64(14500); + var26 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IDLE_LOGOUT, packetWriter.isaacCipher); + packetWriter.addNode(var26); } - class177.friendSystem.processFriendUpdates(); - class146.method776(); + class299.friendSystem.processFriendUpdates(); + FileSystem.method915(); ++packetWriter.pendingWrites; if (packetWriter.pendingWrites > 50) { - var18 = class503.getPacketBufferNode(ClientPacket.NO_TIMEOUT, packetWriter.isaacCipher); - packetWriter.addNode(var18); + var26 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.NO_TIMEOUT, packetWriter.isaacCipher); + packetWriter.addNode(var26); } try { packetWriter.flush(); - } catch (IOException var26) { - class93.method508(); + } catch (IOException var27) { + Renderable.method1291(); } return; } - PacketWriter.method643(var49); + ClanChannel.method862(var41); } } - var42 = var47.widget; + var42 = var39.widget; if (var42.childIndex < 0) { break; } - var44 = VarbitComposition.getWidget(var42.parentId); - } while(var44 == null || var44.children == null || var42.childIndex >= var44.children.length || var42 != var44.children[var42.childIndex]); + var37 = class92.getWidget(var42.parentId); + } while(var37 == null || var37.children == null || var42.childIndex >= var37.children.length || var42 != var37.children[var42.childIndex]); - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var47); + WorldMapSection1.runScriptEvent(var39); } } - var42 = var47.widget; + var42 = var39.widget; if (var42.childIndex < 0) { break; } - var44 = VarbitComposition.getWidget(var42.parentId); - } while(var44 == null || var44.children == null || var42.childIndex >= var44.children.length || var42 != var44.children[var42.childIndex]); + var37 = class92.getWidget(var42.parentId); + } while(var37 == null || var37.children == null || var42.childIndex >= var37.children.length || var42 != var37.children[var42.childIndex]); - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var47); + WorldMapSection1.runScriptEvent(var39); } } - var42 = var47.widget; + var42 = var39.widget; if (var42.childIndex < 0) { break; } - var44 = VarbitComposition.getWidget(var42.parentId); - } while(var44 == null || var44.children == null || var42.childIndex >= var44.children.length || var42 != var44.children[var42.childIndex]); + var37 = class92.getWidget(var42.parentId); + } while(var37 == null || var37.children == null || var42.childIndex >= var37.children.length || var42 != var37.children[var42.childIndex]); - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var47); + WorldMapSection1.runScriptEvent(var39); } } + + var30 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.REFLECTION_CHECK_REPLY, packetWriter.isaacCipher); + var30.packetBuffer.writeByte(0); + var3 = var30.packetBuffer.offset; + SceneTilePaint.performReflectionCheck(var30.packetBuffer); + var30.packetBuffer.method2540(var30.packetBuffer.offset - var3); + packetWriter.addNode(var30); } } } } - @ObfuscatedName("iy") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "57" + descriptor = "(IIS)V", + garbageValue = "-9429" ) + @Export("vmethod1644") public void vmethod1644(int var1, int var2) { if (packetWriter != null && packetWriter.isaacCipher != null) { - if (var1 > -1 && class150.clientPreferences.getCurrentMusicVolume() > 0 && !playingJingle) { - PacketBufferNode var3 = class503.getPacketBufferNode(ClientPacket.SOUND_SONGEND, packetWriter.isaacCipher); + if (var1 > -1 && class449.clientPreferences.getCurrentMusicVolume() > 0 && !playingJingle) { + PacketBufferNode var3 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.SOUND_SONGEND, packetWriter.isaacCipher); var3.packetBuffer.writeInt(var1); packetWriter.addNode(var3); } @@ -3477,15 +3163,15 @@ public void vmethod1644(int var1, int var2) { } } - @ObfuscatedName("iv") + @ObfuscatedName("jk") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2120321682" + garbageValue = "347895574" ) @Export("resizeJS") void resizeJS() { - int var1 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; - int var2 = WorldMapArchiveLoader.canvasHeight; + int var1 = class113.canvasWidth; + int var2 = class177.canvasHeight; if (super.contentWidth < var1) { var1 = super.contentWidth; } @@ -3494,72 +3180,89 @@ void resizeJS() { var2 = super.contentHeight; } - if (class150.clientPreferences != null) { + if (class449.clientPreferences != null) { try { - class26.method101(TileItem.client, "resize", new Object[]{Huffman.getWindowedMode()}); + class26.method95(class219.client, "resize", new Object[]{class218.getWindowedMode()}); } catch (Throwable var4) { } } } - @ObfuscatedName("ii") + @ObfuscatedName("jv") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1641979157" + descriptor = "(B)V", + garbageValue = "1" ) @Export("drawLoggedIn") final void drawLoggedIn() { - int var1; if (rootInterface != -1) { - var1 = rootInterface; - if (Login.loadInterface(var1)) { - class142.drawModelComponents(ArchiveLoader.Widget_interfaceComponents[var1], -1); - } + class316.method1699(rootInterface); } + int var1; for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field403[var1]) { - field404[var1] = true; + if (field407[var1]) { + field408[var1] = true; } - field405[var1] = field403[var1]; - field403[var1] = false; + field409[var1] = field407[var1]; + field407[var1] = false; } - field525 = cycle; + field527 = cycle; viewportX = -1; viewportY = -1; if (rootInterface != -1) { rootWidgetCount = 0; - class7.drawWidgets(rootInterface, 0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, WorldMapArchiveLoader.canvasHeight, 0, 0, -1); + class36.drawWidgets(rootInterface, 0, 0, class113.canvasWidth, class177.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); if (showMouseCross) { if (mouseCrossColor == 1) { - class211.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + class152.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } if (mouseCrossColor == 2) { - class211.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + class152.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } + int var2; + int var3; if (!isMenuOpen) { if (viewportX != -1) { - class335.method1816(viewportX, viewportY); + var1 = viewportX; + var2 = viewportY; + if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { + var3 = menuOptionsCount - 1; + String var5; + if (isItemSelected == 1 && menuOptionsCount < 2) { + var5 = "Use" + " " + field599 + " " + "->"; + } else if (isSpellSelected && menuOptionsCount < 2) { + var5 = field600 + " " + field601 + " " + "->"; + } else { + var5 = class181.method928(var3); + } + + if (menuOptionsCount > 2) { + var5 = var5 + MoveSpeed.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + } + + class59.fontBold12.drawRandomAlphaAndSpacing(var5, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); + } } } else { - var1 = Canvas.menuX; - int var2 = UserComparator6.menuY; - int var3 = UserComparator5.menuWidth; - int var4 = ModeWhere.menuHeight; - int var5 = 6116423; - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); + var1 = class12.menuX; + var2 = class419.menuY; + var3 = class316.menuWidth; + int var4 = Occluder.menuHeight; + int var13 = 6116423; + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var13); Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); - Calendar.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); + class59.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var13, -1); int var6 = MouseHandler.MouseHandler_x; int var7 = MouseHandler.MouseHandler_y; @@ -3567,127 +3270,117 @@ final void drawLoggedIn() { int var9; int var10; for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; + var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; var10 = 16777215; if (var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { var10 = 16776960; } - Font var13 = Calendar.fontBold12; - String var14; - if (var8 < 0) { - var14 = ""; - } else if (menuTargets[var8].length() > 0) { - var14 = menuActions[var8] + " " + menuTargets[var8]; - } else { - var14 = menuActions[var8]; - } - - var13.draw(var14, var1 + 3, var9, var10, 0); + class59.fontBold12.draw(class181.method928(var8), var1 + 3, var9, var10, 0); } - var8 = Canvas.menuX; - var9 = UserComparator6.menuY; - var10 = UserComparator5.menuWidth; - int var11 = ModeWhere.menuHeight; + var8 = class12.menuX; + var9 = class419.menuY; + var10 = class316.menuWidth; + int var11 = Occluder.menuHeight; for (int var12 = 0; var12 < rootWidgetCount; ++var12) { - if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var8 + var10 && rootWidgetYs[var12] + rootWidgetHeights[var12] > var9 && rootWidgetYs[var12] < var11 + var9) { - field404[var12] = true; + if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var8 && rootWidgetXs[var12] < var8 + var10 && rootWidgetYs[var12] + rootWidgetHeights[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { + field408[var12] = true; } } } if (gameDrawingMode == 3) { for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field405[var1]) { + if (field409[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field404[var1]) { + } else if (field408[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - class456.method2301(class36.Client_plane, class136.localPlayer.x, class136.localPlayer.y, field452); - field452 = 0; + class131.method729(HealthBar.Client_plane, VarbitComposition.localPlayer.x, VarbitComposition.localPlayer.y, field457); + field457 = 0; } - @ObfuscatedName("jf") + @ObfuscatedName("ks") @ObfuscatedSignature( - descriptor = "(Leb;IB)Z", - garbageValue = "84" + descriptor = "(Ler;II)Z", + garbageValue = "692591213" ) - boolean method380(PacketWriter var1, int var2) { + boolean method372(PacketWriter var1, int var2) { if (var1.serverPacketLength == 0) { - Canvas.friendsChat = null; + ReflectionCheck.friendsChat = null; } else { - if (Canvas.friendsChat == null) { - Canvas.friendsChat = new FriendsChat(class457.loginType, TileItem.client); + if (ReflectionCheck.friendsChat == null) { + ReflectionCheck.friendsChat = new FriendsChat(Language.loginType, class219.client); } - Canvas.friendsChat.method2168(var1.packetBuffer, var2); + ReflectionCheck.friendsChat.method2201(var1.packetBuffer, var2); } - field509 = cycleCntr; - DynamicObject.ClanChat_inClanChat = true; + field524 = cycleCntr; + SpotAnimationDefinition.ClanChat_inClanChat = true; var1.serverPacket = null; return true; } - @ObfuscatedName("kt") + @ObfuscatedName("kn") @ObfuscatedSignature( - descriptor = "(Leb;B)Z", - garbageValue = "46" + descriptor = "(Ler;I)Z", + garbageValue = "-1865308830" ) - boolean method381(PacketWriter var1) { - if (Canvas.friendsChat != null) { - Canvas.friendsChat.method2169(var1.packetBuffer); + boolean method373(PacketWriter var1) { + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.method2202(var1.packetBuffer); } - field509 = cycleCntr; - DynamicObject.ClanChat_inClanChat = true; + field524 = cycleCntr; + SpotAnimationDefinition.ClanChat_inClanChat = true; var1.serverPacket = null; return true; } @ObfuscatedName("kd") @ObfuscatedSignature( - descriptor = "(Leb;I)Z", - garbageValue = "1827422343" + descriptor = "(Ler;I)Z", + garbageValue = "-1722622027" ) - final boolean method382(PacketWriter var1) { + final boolean method374(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; } else { + int var6; String var21; - int flags; try { int var5; if (var1.serverPacket == null) { - if (var1.field1140) { + if (var1.field1152) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 0, 1); - var1.field1141 = 0; - var1.field1140 = false; + var1.field1154 = 0; + var1.field1152 = false; } var3.offset = 0; - if (var3.method2498()) { + if (var3.method2518()) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 1, 1); - var1.field1141 = 0; + var1.field1154 = 0; } - var1.field1140 = true; - ServerPacket[] var4 = Messages.method635(); + var1.field1152 = true; + ServerPacket[] var4 = class176.method916(); var5 = var3.readSmartByteShortIsaac(); if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); @@ -3720,806 +3413,853 @@ final boolean method382(PacketWriter var1) { return false; } - if (ServerPacketsEnum.getById(var1.serverPacket.id) != null) { - String packet = ServerPacketsEnum.getById(var1.serverPacket.id).name(); - //System.out.println("Received-Packet : " + packet); - } - - - var3.offset = 0; var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1141 = 0; - timer.method2112(); - var1.field1148 = var1.field1146; - var1.field1146 = var1.field1147; - var1.field1147 = var1.serverPacket; - Widget var6; - int var20; - if (ServerPacket.IF_SETTEXT == var1.serverPacket) { - var20 = var3.readIntME(); - var21 = var3.readStringCp1252NullTerminated(); - var6 = VarbitComposition.getWidget(var20); - if (!var21.equals(var6.text)) { - var6.text = var21; - class200.invalidateWidget(var6); - } - + var1.field1154 = 0; + timer.method2150(); + var1.field1158 = var1.field1157; + var1.field1157 = var1.field1159; + var1.field1159 = var1.serverPacket; + if (ServerPacket.UPDATE_UID192 == var1.serverPacket) { + class128.privateChatMode = DevicePcmPlayerProvider.method74(var3.readUnsignedByte()); var1.serverPacket = null; return true; } int var7; int var8; - int var11; - int var57; + int var9; + int var10; + int var13; + int var15; + int var56; int var59; - if (ServerPacket.SPOTANIM_SPECIFIC == var1.serverPacket) { - var59 = var3.readUnsignedByteNeg(); - flags = var3.readUMed1(); - var20 = flags >> 16; - var5 = flags >> 8 & 255; - var7 = var20 + (flags >> 4 & 7); - var8 = var5 + (flags & 7); - var57 = var3.readUnsignedShort(); - var11 = var3.readUnsignedShort(); - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - var7 = var7 * 128 + 64; - var8 = var8 * 128 + 64; - GraphicsObject var61 = new GraphicsObject(var57, class36.Client_plane, var7, var8, class306.getTileHeight(var7, var8, class36.Client_plane) - var59, var11, cycle); - graphicsObjects.addFirst(var61); + int var68; + if (ServerPacket.IF_SETMODEL == var1.serverPacket) { + var6 = var3.method2591(); + var68 = var6 >> 16; + var5 = var6 >> 8 & 255; + var7 = var68 + (var6 >> 4 & 7); + var8 = var5 + (var6 & 7); + var9 = var3.readUnsignedByteSub(); + var10 = var9 >> 2; + var56 = var9 & 3; + var59 = field653[var10]; + var13 = var3.readUnsignedShort(); + if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { + if (var59 == 0) { + BoundaryObject var67 = class130.scene.method1255(HealthBar.Client_plane, var7, var8); + if (var67 != null) { + var15 = InvDefinition.Entity_unpackID(var67.tag); + if (var10 == 2) { + var67.renderable1 = new DynamicObject(var15, 2, var56 + 4, HealthBar.Client_plane, var7, var8, var13, false, var67.renderable1); + var67.renderable2 = new DynamicObject(var15, 2, var56 + 1 & 3, HealthBar.Client_plane, var7, var8, var13, false, var67.renderable2); + } else { + var67.renderable1 = new DynamicObject(var15, var10, var56, HealthBar.Client_plane, var7, var8, var13, false, var67.renderable1); + } + } + } else if (var59 == 1) { + WallDecoration var66 = class130.scene.method1256(HealthBar.Client_plane, var7, var8); + if (var66 != null) { + var15 = InvDefinition.Entity_unpackID(var66.tag); + if (var10 != 4 && var10 != 5) { + if (var10 == 6) { + var66.renderable1 = new DynamicObject(var15, 4, var56 + 4, HealthBar.Client_plane, var7, var8, var13, false, var66.renderable1); + } else if (var10 == 7) { + var66.renderable1 = new DynamicObject(var15, 4, (var56 + 2 & 3) + 4, HealthBar.Client_plane, var7, var8, var13, false, var66.renderable1); + } else if (var10 == 8) { + var66.renderable1 = new DynamicObject(var15, 4, var56 + 4, HealthBar.Client_plane, var7, var8, var13, false, var66.renderable1); + var66.renderable2 = new DynamicObject(var15, 4, (var56 + 2 & 3) + 4, HealthBar.Client_plane, var7, var8, var13, false, var66.renderable2); + } + } else { + var66.renderable1 = new DynamicObject(var15, 4, var56, HealthBar.Client_plane, var7, var8, var13, false, var66.renderable1); + } + } + } else if (var59 == 2) { + GameObject var64 = class130.scene.getGameObject(HealthBar.Client_plane, var7, var8); + if (var10 == 11) { + var10 = 10; + } + + if (var64 != null) { + var64.renderable = new DynamicObject(InvDefinition.Entity_unpackID(var64.tag), var10, var56, HealthBar.Client_plane, var7, var8, var13, false, var64.renderable); + } + } else if (var59 == 3) { + FloorDecoration var65 = class130.scene.getFloorDecoration(HealthBar.Client_plane, var7, var8); + if (var65 != null) { + var65.renderable = new DynamicObject(InvDefinition.Entity_unpackID(var65.tag), 22, var56, HealthBar.Client_plane, var7, var8, var13, false, var65.renderable); + } + } } var1.serverPacket = null; return true; } - boolean var23; - boolean var62; - int var79; - if (ServerPacket.CAM_MOVETO_EASED_CIRCULAR == var1.serverPacket) { - isCameraLocked = true; - field397 = false; - field398 = true; - WorldMapIcon_1.cameraMoveToX = var3.readUnsignedByte(); - class132.cameraMoveToY = var3.readUnsignedByte(); - var20 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte() * 128 + 64; - flags = var3.readUnsignedByte() * 128 + 64; - var7 = var3.readUnsignedShort(); - field399 = var3.readBoolean(); - var8 = var3.readUnsignedByte(); - var57 = WorldMapIcon_1.cameraMoveToX * 128 + 64; - var59 = class132.cameraMoveToY * 128 + 64; - var62 = false; - var23 = false; - if (field399) { - var11 = class384.cameraY; - var79 = class306.getTileHeight(var57, var59, class36.Client_plane) - var20; - } else { - var11 = class306.getTileHeight(class157.cameraX, SoundSystem.cameraZ, class36.Client_plane) - class384.cameraY; - var79 = var20; - } - - field638 = new class477(class157.cameraX, SoundSystem.cameraZ, var11, var57, var59, var79, var5, flags, var7, var8); + Widget var76; + if (ServerPacket.IF_SETANIM == var1.serverPacket) { + var68 = var3.readInt(); + var76 = class92.getWidget(var68); + var76.modelType = 3; + var76.modelId = VarbitComposition.localPlayer.appearance.getChatHeadId(); + class218.invalidateWidget(var76); var1.serverPacket = null; return true; } - if (ServerPacket.NPC_ANIM_SPECIFIC == var1.serverPacket) { - flags = var3.readUnsignedByteAdd(); - var20 = var3.readUnsignedShortLE(); - var5 = var3.readUnsignedShortLE(); - if (var5 == 65535) { - var5 = -1; - } + if (ServerPacket.CAM_LOOKAT == var1.serverPacket) { + field400 = false; + isCameraLocked = false; + field402 = false; + field404 = false; + PendingSpawn.cameraLookAtX = 0; + VarbitComposition.cameraLookAtY = 0; + MusicPatchNode2.cameraLookAtHeight = 0; + field401 = false; + class33.cameraLookAtSpeed = 0; + WorldMapElement.cameraLookAtAcceleration = 0; + MouseHandler.cameraMoveToAcceleration = 0; + class344.cameraMoveToSpeed = 0; + Players.cameraMoveToX = 0; + class33.cameraMoveToY = 0; + VarpDefinition.cameraMoveToHeight = 0; + field642 = null; + field647 = null; + field646 = null; - NPC var86 = npcs[var20]; - if (var86 != null) { - if (var5 == var86.sequence && var5 != -1) { - var8 = class135.SequenceDefinition_get(var5).replyMode; - if (var8 == 1) { - var86.sequenceFrame = 0; - var86.sequenceFrameCycle = 0; - var86.sequenceDelay = flags; - var86.currentSequenceFrameIndex = 0; - } else if (var8 == 2) { - var86.currentSequenceFrameIndex = 0; - } - } else if (var5 == -1 || var86.sequence == -1 || class135.SequenceDefinition_get(var5).forcedPriority >= class135.SequenceDefinition_get(var86.sequence).forcedPriority) { - var86.sequence = var5; - var86.sequenceFrame = 0; - var86.sequenceFrameCycle = 0; - var86.sequenceDelay = flags; - var86.currentSequenceFrameIndex = 0; - var86.field1018 = var86.pathLength; - } + for (var68 = 0; var68 < 5; ++var68) { + cameraShaking[var68] = false; } var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_STAT == var1.serverPacket) { - DbRowType.process(); - var20 = var3.readIntIME(); // xp - var5 = var3.readUnsignedByte(); // level - flags = var3.readUnsignedByteNeg(); // skill - experience[flags] = var20; - currentLevels[flags] = var5; - levels[flags] = 1; - - for (var7 = 0; var7 < 98; ++var7) { - if (var20 >= Skills.Skills_experienceTable[var7]) { - levels[flags] = var7 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = flags; + if (ServerPacket.SET_PLAYER_OP == var1.serverPacket) { + class139.varclan = null; var1.serverPacket = null; return true; } - if (ServerPacket.RESET_ANIMS == var1.serverPacket) { - for (var20 = 0; var20 < players.length; ++var20) { - if (players[var20] != null) { - players[var20].sequence = -1; - } - } - - for (var20 = 0; var20 < npcs.length; ++var20) { - if (npcs[var20] != null) { - npcs[var20].sequence = -1; - } - } - + if (ServerPacket.LOC_DEL == var1.serverPacket) { + var68 = var3.readInt(); + var5 = var3.readInt(); + var6 = WorldMapManager.getGcDuration(); + PacketBufferNode var79 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2581, packetWriter.isaacCipher); + var79.packetBuffer.writeByte(GameEngine.fps); + var79.packetBuffer.writeIntLE(var68); + var79.packetBuffer.writeIntIME(var5); + var79.packetBuffer.writeByteAdd(var6); + packetWriter.addNode(var79); var1.serverPacket = null; return true; } - if (ServerPacket.LOGOUT == var1.serverPacket) { - var20 = var3.readUnsignedByte(); - GrandExchangeEvents.forceDisconnect(var20); + if (ServerPacket.VARCLAN_ENABLE == var1.serverPacket) { + class113.process(); + weight = var3.readShort(); + field528 = cycleCntr; var1.serverPacket = null; - return false; + return true; } - String var64; - if (ServerPacket.OPEN_URL == var1.serverPacket) { - byte[] var54 = new byte[var1.serverPacketLength]; - var3.method2500(var54, 0, var54.length); - Buffer var83 = new Buffer(var54); - var64 = var83.readStringCp1252NullTerminated(); - NPC.openURL(var64, true, false); + if (ServerPacket.OBJ_COUNT == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.LOC_ANIM); var1.serverPacket = null; return true; } - Widget var78; - if (ServerPacket.IF_SETPLAYERHEAD == var1.serverPacket) { - var20 = var3.readIntIME(); - var78 = VarbitComposition.getWidget(var20); - var78.modelType = 3; - var78.modelId = class136.localPlayer.appearance.getChatHeadId(); - class200.invalidateWidget(var78); + if (ServerPacket.OBJ_ADD == var1.serverPacket) { + var68 = var3.readIntME(); + KeyHandler.method93(var68); + changedItemContainers[++changedItemContainersCount - 1 & 31] = var68 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.MAPPROJ_ANIM == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.MAPPROJ_ANIM); + if (ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.AREA_SOUND); var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SONG == var1.serverPacket) { - var7 = var3.readUnsignedShortAddLE(); // Song - var5 = var3.readUnsignedShortAddLE(); // fadeOutDelay - var8 = var3.readUnsignedShort(); // fadeOutSpeed - flags = var3.readUnsignedShortAdd(); // fadeInDelay - var20 = var3.readUnsignedShortAdd(); // fadeInSpeed - if (var20 == 65535) { - var20 = -1; + boolean var11; + byte var20; + long var23; + long var25; + long var27; + String var30; + int var85; + if (ServerPacket.LOGOUT_FULL == var1.serverPacket) { + var20 = var3.readByte(); + var23 = (long)var3.readUnsignedShort(); + var25 = (long)var3.readMedium(); + var27 = (var23 << 32) + var25; + var11 = false; + ClanChannel var81 = var20 >= 0 ? currentClanChannels[var20] : VerticalAlignment.guestClanChannel; + if (var81 == null) { + var11 = true; + } else { + for (var13 = 0; var13 < 100; ++var13) { + if (crossWorldMessageIds[var13] == var27) { + var11 = true; + break; + } + } } - ArrayList var84 = new ArrayList(); - var84.add(var20); - ObjectComposition.method1031(var84, var5, flags, var7, var8); - var1.serverPacket = null; - return true; - } + if (!var11) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var27; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var30 = DirectByteArrayCopier.readString(var3); + var85 = var20 >= 0 ? 43 : 46; + class416.addChatMessage(var85, "", var30, var81.name); + } - int var15; - int var69; - if (ServerPacket.CAM_LOOKAT_EASED_COORD == var1.serverPacket) { - isCameraLocked = true; - field397 = false; - field400 = true; - Canvas.cameraLookAtX = var3.readUnsignedByte(); - ObjTypeCustomisation.cameraLookAtY = var3.readUnsignedByte(); - FontName.cameraLookAtHeight = var3.readUnsignedShort(); - var20 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - flags = Canvas.cameraLookAtX * 128 + 64; - var7 = ObjTypeCustomisation.cameraLookAtY * 128 + 64; - var8 = class306.getTileHeight(flags, var7, class36.Client_plane) - FontName.cameraLookAtHeight; - var57 = flags - class157.cameraX; - var59 = var8 - class384.cameraY; - var11 = var7 - SoundSystem.cameraZ; - double var85 = Math.sqrt((double)(var11 * var11 + var57 * var57)); - var69 = class74.method440((int)(Math.atan2((double)var59, var85) * 325.9490051269531D) & 2047); - var15 = class4.method5((int)(Math.atan2((double)var57, (double)var11) * -325.9490051269531D) & 2047); - field643 = new class479(class19.cameraPitch, var69, var20, var5); - field642 = new class479(class456.cameraYaw, var15, var20, var5); var1.serverPacket = null; return true; } - if (ServerPacket.EMPTY_PACKET == var1.serverPacket) { + if (ServerPacket.MAP_ANIM == var1.serverPacket) { + UserComparator8.updatePlayers(var3, var1.serverPacketLength); + class383.method2021(); var1.serverPacket = null; return true; } - if (ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE == var1.serverPacket) { + if (ServerPacket.SYNTH_SOUND == var1.serverPacket) { isCameraLocked = true; - field397 = false; - field400 = true; - var20 = var3.readShort(); - var5 = var3.readShort(); - flags = class74.method440(var5 + class19.cameraPitch & 2027); - var7 = var20 + class456.cameraYaw; - var8 = var3.readUnsignedShort(); - var57 = var3.readUnsignedByte(); - field643 = new class479(class19.cameraPitch, flags, var8, var57); - field642 = new class479(class456.cameraYaw, var7, var8, var57); + field400 = false; + field404 = true; + PendingSpawn.cameraLookAtX = var3.readUnsignedByte(); + VarbitComposition.cameraLookAtY = var3.readUnsignedByte(); + MusicPatchNode2.cameraLookAtHeight = var3.readUnsignedShort(); + var68 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var6 = PendingSpawn.cameraLookAtX * 128 + 64; + var7 = VarbitComposition.cameraLookAtY * 128 + 64; + var8 = class18.getTileHeight(var6, var7, HealthBar.Client_plane) - MusicPatchNode2.cameraLookAtHeight; + var9 = var6 - NPCComposition.cameraX; + var10 = var8 - class133.cameraY; + var56 = var7 - class139.cameraZ; + double var84 = Math.sqrt((double)(var56 * var56 + var9 * var9)); + var85 = UserComparator8.method674((int)(Math.atan2((double)var10, var84) * 325.9490051269531D) & 2047); + var15 = class7.method18((int)(Math.atan2((double)var9, (double)var56) * -325.9490051269531D) & 2047); + field647 = new class478(class129.cameraPitch, var85, var68, var5); + field646 = new class478(UserComparator10.cameraYaw, var15, var68, var5); var1.serverPacket = null; return true; } - if (ServerPacket.CAM_LOOKAT == var1.serverPacket) { - isCameraLocked = true; - field397 = false; - field400 = false; - Canvas.cameraLookAtX = var3.readUnsignedByte(); - ObjTypeCustomisation.cameraLookAtY = var3.readUnsignedByte(); - FontName.cameraLookAtHeight = var3.readUnsignedShort(); - class18.cameraLookAtSpeed = var3.readUnsignedByte(); - class157.cameraLookAtAcceleration = var3.readUnsignedByte(); - if (class157.cameraLookAtAcceleration >= 100) { - var20 = Canvas.cameraLookAtX * 128 + 64; - var5 = ObjTypeCustomisation.cameraLookAtY * 128 + 64; - flags = class306.getTileHeight(var20, var5, class36.Client_plane) - FontName.cameraLookAtHeight; - var7 = var20 - class157.cameraX; - var8 = flags - class384.cameraY; - var57 = var5 - SoundSystem.cameraZ; - var59 = (int)Math.sqrt((double)(var7 * var7 + var57 * var57)); - class19.cameraPitch = (int)(Math.atan2((double)var8, (double)var59) * 325.9490051269531D) & 2047; - class456.cameraYaw = (int)(Math.atan2((double)var7, (double)var57) * -325.9490051269531D) & 2047; - if (class19.cameraPitch < 128) { - class19.cameraPitch = 128; - } - - if (class19.cameraPitch > 383) { - class19.cameraPitch = 383; - } + long var32; + InterfaceParent var74; + if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 == var1.serverPacket) { + var68 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; } - var1.serverPacket = null; - return true; - } + var6 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.resizeRoot(false); + class19.Widget_resetModelFrames(rootInterface); + MoveSpeed.runWidgetOnLoadListener(rootInterface); - if (ServerPacket.IF_SETCOLOUR == var1.serverPacket) { - var20 = var3.readUnsignedShortLE(); - var5 = var3.readInt(); - flags = var20 >> 10 & 31; - var7 = var20 >> 5 & 31; - var8 = var20 & 31; - var57 = (var7 << 11) + (flags << 19) + (var8 << 3); - Widget var90 = VarbitComposition.getWidget(var5); - if (var57 != var90.color) { - var90.color = var57; - class200.invalidateWidget(var90); + for (var7 = 0; var7 < 100; ++var7) { + field407[var7] = true; + } } - var1.serverPacket = null; - return true; - } + InterfaceParent var88; + for (; var6-- > 0; var88.field858 = true) { + var7 = var3.readInt(); + var8 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + var88 = (InterfaceParent)interfaceParents.get((long)var7); + if (var88 != null && var8 != var88.group) { + class92.closeInterface(var88, true); + var88 = null; + } + + if (var88 == null) { + var88 = class339.ifOpenSub(var7, var8, var9); + } + } + + for (var74 = (InterfaceParent)interfaceParents.first(); var74 != null; var74 = (InterfaceParent)interfaceParents.next()) { + if (var74.field858) { + var74.field858 = false; + } else { + class92.closeInterface(var74, true); + } + } + + widgetFlags = new NodeHashTable(512); + + while (var3.offset < var68) { + var7 = var3.readInt(); + var8 = var3.readUnsignedShort(); + var9 = var3.readUnsignedShort(); + var10 = var3.readInt(); + + for (var56 = var8; var56 <= var9; ++var56) { + var32 = ((long)var7 << 32) + (long)var56; + widgetFlags.put(new IntegerNode(var10), var32); + } + } - if (ServerPacket.UPDATE_RUNWEIGHT == var1.serverPacket) { - DbRowType.process(); - weight = var3.readShort(); - field524 = cycleCntr; var1.serverPacket = null; return true; } - boolean var87; - if (ServerPacket.TRADING_POST_RESULTS == var1.serverPacket) { - var87 = var3.readUnsignedByte() == 1; - if (var87) { - VerticalAlignment.field1614 = class113.clockNow() - var3.readLong(); - class28.grandExchangeEvents = new GrandExchangeEvents(var3, true); - } else { - class28.grandExchangeEvents = null; + Widget var93; + if (ServerPacket.TOGGLE_OCULUS_ORB == var1.serverPacket) { + var68 = var3.readInt(); + var5 = var3.method2598(); + InterfaceParent var97 = (InterfaceParent)interfaceParents.get((long)var5); + var74 = (InterfaceParent)interfaceParents.get((long)var68); + if (var74 != null) { + class92.closeInterface(var74, var97 == null || var74.group != var97.group); + } + + if (var97 != null) { + var97.remove(); + interfaceParents.put(var97, (long)var68); + } + + var93 = class92.getWidget(var5); + if (var93 != null) { + class218.invalidateWidget(var93); + } + + var93 = class92.getWidget(var68); + if (var93 != null) { + class218.invalidateWidget(var93); + Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var93.id >>> 16], var93, true); + } + + if (rootInterface != -1) { + class385.runIntfCloseListeners(rootInterface, 1); } - field521 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL == var1.serverPacket) { - return this.method380(var1, 1); - } + if (ServerPacket.UPDATE_INV_FULL == var1.serverPacket) { + WorldMapSection2.method1410(); + var20 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var20 >= 0) { + currentClanSettings[var20] = null; + } else { + Players.guestClanSettings = null; + } - if (ServerPacket.TOGGLE_OCULUS_ORB == var1.serverPacket) { - var20 = var3.readInt(); - if (var20 != field363) { - field363 = var20; - UserComparator7.method670(); + var1.serverPacket = null; + return true; + } + + if (var20 >= 0) { + currentClanSettings[var20] = new ClanSettings(var3); + } else { + Players.guestClanSettings = new ClanSettings(var3); } var1.serverPacket = null; return true; } - if (ServerPacket.NEW_PACKET_CAM_RESET_V2 == var1.serverPacket && isCameraLocked) { - field397 = true; - field400 = false; - field398 = false; + if (ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT == var1.serverPacket) { + var68 = var3.readInt(); + InterfaceParent var78 = (InterfaceParent)interfaceParents.get((long)var68); + if (var78 != null) { + class92.closeInterface(var78, true); + } - for (var20 = 0; var20 < 5; ++var20) { - cameraShaking[var20] = false; + if (meslayerContinueWidget != null) { + class218.invalidateWidget(meslayerContinueWidget); + meslayerContinueWidget = null; } var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETANIM == var1.serverPacket) { - var20 = var3.readSignedShortAdd(); // Anim - var5 = var3.readInt(); // Interface - var6 = VarbitComposition.getWidget(var5); - if (var20 != var6.sequenceId || var20 == -1) { - var6.sequenceId = var20; - var6.modelFrame = 0; - var6.modelFrameCycle = 0; - class200.invalidateWidget(var6); + if (ServerPacket.LOGOUT == var1.serverPacket) { + var9 = var3.readUnsignedShort(); + var6 = var3.method2591(); + var68 = var6 >> 16; + var5 = var6 >> 8 & 255; + var7 = var68 + (var6 >> 4 & 7); + var8 = var5 + (var6 & 7); + var10 = var3.readUnsignedByteAdd(); + var56 = var3.readUnsignedShortLE(); + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + var7 = var7 * 128 + 64; + var8 = var8 * 128 + 64; + GraphicsObject var29 = new GraphicsObject(var9, HealthBar.Client_plane, var7, var8, class18.getTileHeight(var7, var8, HealthBar.Client_plane) - var10, var56, cycle); + graphicsObjects.addFirst(var29); } var1.serverPacket = null; return true; } - long var26; - long var29; - long var31; - long var33; - String var36; - String var52; - if (ServerPacket.MESSAGE_FRIENDCHANNEL == var1.serverPacket) { - var52 = var3.readStringCp1252NullTerminated(); - var29 = var3.readLong(); - var31 = (long)var3.readUnsignedShort(); - var33 = (long)var3.readMedium(); - PlayerType var91 = (PlayerType)ClientPreferences.findEnumerated(PendingSpawn.PlayerType_values(), var3.readUnsignedByte()); - var26 = (var31 << 32) + var33; - boolean var70 = false; - - for (var15 = 0; var15 < 100; ++var15) { - if (crossWorldMessageIds[var15] == var26) { - var70 = true; - break; + if (ServerPacket.CAM_RESET == var1.serverPacket) { + field517 = cycleCntr; + var20 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var20 >= 0) { + currentClanChannels[var20] = null; + } else { + VerticalAlignment.guestClanChannel = null; } - } - if (var91.isUser && class177.friendSystem.isIgnored(new Username(var52, class457.loginType))) { - var70 = true; + var1.serverPacket = null; + return true; } - if (!var70 && field485 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var26; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var36 = AbstractFont.escapeBrackets(class153.method797(class292.readString(var3))); - if (var91.modIcon != -1) { - class213.addChatMessage(9, SecureRandomCallable.addImageTag(var91.modIcon) + var52, var36, class170.base37DecodeLong(var29)); - } else { - class213.addChatMessage(9, var52, var36, class170.base37DecodeLong(var29)); - } + if (var20 >= 0) { + currentClanChannels[var20] = new ClanChannel(var3); + } else { + VerticalAlignment.guestClanChannel = new ClanChannel(var3); } var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SONG_STOP == var1.serverPacket) { - var5 = var3.readUnsignedShortAddLE(); - var20 = var3.readUnsignedShortAddLE(); - RouteStrategy.method1107(var20, var5); + if (ServerPacket.UPDATE_INV_PARTIAL == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.PREFETCH_GAMEOBJECTS); var1.serverPacket = null; return true; } - if (ServerPacket.LOGOUT_FULL == var1.serverPacket) { - WorldMapScaleHandler.logOut(); + if (ServerPacket.RESET_CLIENT_VARCACHE == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.LOC_ADD_CHANGE); var1.serverPacket = null; - return false; + return true; } - if (ServerPacket.MESSAGE_GAME == var1.serverPacket) { - var20 = var3.readUShortSmart(); - boolean var81 = var3.readUnsignedByte() == 1; - var64 = ""; - boolean var66 = false; - if (var81) { - var64 = var3.readStringCp1252NullTerminated(); - if (class177.friendSystem.isIgnored(new Username(var64, class457.loginType))) { - var66 = true; - } - } - - String var97 = var3.readStringCp1252NullTerminated(); - if (!var66) { - class415.addGameMessage(var20, var64, var97); + if (ServerPacket.IF_SETPLAYERMODEL_SELF == var1.serverPacket) { + var68 = var3.readIntME(); + var5 = var3.readUnsignedByteSub(); + if (var68 == 65535) { + var68 = -1; } + LoginType.performPlayerAnimation(VarbitComposition.localPlayer, var68, var5); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETSCROLLPOS == var1.serverPacket) { - var20 = var3.readIntLE(); - var5 = var3.readUnsignedShort(); - var6 = VarbitComposition.getWidget(var20); - if (var6 != null && var6.type == 0) { - if (var5 > var6.scrollHeight - var6.height) { - var5 = var6.scrollHeight - var6.height; - } - - if (var5 < 0) { - var5 = 0; - } - - if (var5 != var6.scrollY) { - var6.scrollY = var5; - class200.invalidateWidget(var6); - } - } - + if (ServerPacket.MIDI_SWAP == var1.serverPacket) { + class271.loadRegions(true, var1.packetBuffer); var1.serverPacket = null; return true; } - if (ServerPacket.CAM_RESET == var1.serverPacket) { - field397 = false; - isCameraLocked = false; - field398 = false; - field400 = false; - Canvas.cameraLookAtX = 0; - ObjTypeCustomisation.cameraLookAtY = 0; - FontName.cameraLookAtHeight = 0; - field399 = false; - class18.cameraLookAtSpeed = 0; - class157.cameraLookAtAcceleration = 0; - SecureRandomFuture.cameraMoveToAcceleration = 0; - cameraMoveToSpeed = 0; - WorldMapIcon_1.cameraMoveToX = 0; - class132.cameraMoveToY = 0; - ModeWhere.cameraMoveToHeight = 0; - field638 = null; - field643 = null; - field642 = null; - - for (var20 = 0; var20 < 5; ++var20) { - cameraShaking[var20] = false; + if (ServerPacket.UPDATE_RUNWEIGHT == var1.serverPacket) { + if (rootInterface != -1) { + class385.runIntfCloseListeners(rootInterface, 0); } var1.serverPacket = null; return true; } - if (ServerPacket.OBJ_DEL_LEGACY == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.OBJ_DEL_LEGACY); + Widget var71; + if (ServerPacket.HEAT_MAP == var1.serverPacket) { + var68 = var3.readIntIME(); + var5 = var3.method2587(); + var6 = var3.readUnsignedShortLE(); + var71 = class92.getWidget(var68); + var71.rotationKey = var6 + (var5 << 16); var1.serverPacket = null; return true; } - if (ServerPacket.LOC_DEL == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.LOC_DEL); + if (ServerPacket.CAM_MOVETO_EASED_CIRCULAR == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); var1.serverPacket = null; return true; } - int var13; - String var38; - byte var72; - if (ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM == var1.serverPacket) { - var72 = var3.readByte(); - var29 = (long)var3.readUnsignedShort(); - var31 = (long)var3.readMedium(); - var33 = var31 + (var29 << 32); - var62 = false; - ClanChannel var12 = var72 >= 0 ? currentClanChannels[var72] : WorldMapLabelSize.guestClanChannel; - if (var12 == null) { - var62 = true; + int var16; + String var43; + if (ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED == var1.serverPacket) { + var20 = var3.readByte(); + var21 = var3.readStringCp1252NullTerminated(); + long var37 = (long)var3.readUnsignedShort(); + long var39 = (long)var3.readMedium(); + PlayerType var87 = (PlayerType)KeyHandler.findEnumerated(MidiPcmStream.PlayerType_values(), var3.readUnsignedByte()); + long var41 = (var37 << 32) + var39; + boolean var63 = false; + ClanChannel var14 = null; + var14 = var20 >= 0 ? currentClanChannels[var20] : VerticalAlignment.guestClanChannel; + if (var14 == null) { + var63 = true; } else { - for (var13 = 0; var13 < 100; ++var13) { - if (var33 == crossWorldMessageIds[var13]) { - var62 = true; + var15 = 0; + + while (true) { + if (var15 >= 100) { + if (var87.isUser && class299.friendSystem.isIgnored(new Username(var21, Language.loginType))) { + var63 = true; + } break; } + + if (crossWorldMessageIds[var15] == var41) { + var63 = true; + break; + } + + ++var15; } } - if (!var62) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var33; + if (!var63) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var38 = class292.readString(var3); - var69 = var72 >= 0 ? 43 : 46; - class213.addChatMessage(var69, "", var38, var12.name); + var43 = AbstractFont.escapeBrackets(DirectByteArrayCopier.readString(var3)); + var16 = var20 >= 0 ? 41 : 44; + if (var87.modIcon != -1) { + class416.addChatMessage(var16, Tile.addImageTag(var87.modIcon) + var21, var43, var14.name); + } else { + class416.addChatMessage(var16, var21, var43, var14.name); + } } var1.serverPacket = null; return true; } - int var16; - if (ServerPacket.MAPPROJ_ANIM_SPECIFIC == var1.serverPacket) { - byte var68 = var3.readByte(); - int var18 = var3.readUnsignedByteAdd(); - int var17 = var3.readUnsignedByte(); - var69 = var3.readUnsignedByte() * 4; - byte var63 = var3.readByteAdd(); - var13 = var3.readUnsignedByteNeg() * 4; - flags = var3.readUMed1(); - var20 = flags >> 16; - var5 = flags >> 8 & 255; - var7 = var20 + (flags >> 4 & 7); - var8 = var5 + (flags & 7); - var11 = var3.method2528(); - var79 = var3.readUnsignedShortAddLE(); - var16 = var3.readUnsignedShortAdd(); - var15 = var3.readUnsignedShortAddLE(); - var57 = var68 + var7; - var59 = var63 + var8; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var57 >= 0 && var59 >= 0 && var57 < 104 && var59 < 104 && var79 != 65535) { - var7 = var7 * 128 + 64; - var8 = var8 * 128 + 64; - var57 = var57 * 128 + 64; - var59 = var59 * 128 + 64; - Projectile var19 = new Projectile(var79, class36.Client_plane, var7, var8, class306.getTileHeight(var7, var8, class36.Client_plane) - var13, var15 + cycle, var16 + cycle, var17, var18, var11, var69); - var19.setDestination(var57, var59, class306.getTileHeight(var57, var59, class36.Client_plane) - var69, var15 + cycle); - projectiles.addFirst(var19); + if (ServerPacket.VARCLAN == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + class27.method109(var3, var3.offset - 28); } var1.serverPacket = null; return true; } - InterfaceParent var82; - if (ServerPacket.GAMEFRAME_FULL == var1.serverPacket) { - var20 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - flags = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - class92.Widget_resetModelFrames(rootInterface); - ScriptFrame.runWidgetOnLoadListener(rootInterface); - - for (var7 = 0; var7 < 100; ++var7) { - field403[var7] = true; + String var51; + if (ServerPacket.CAM_MOVETO == var1.serverPacket) { + var51 = var3.readStringCp1252NullTerminated(); + var5 = var3.readUnsignedByteAdd(); + var6 = var3.readUnsignedByteSub(); + if (var6 >= 1 && var6 <= 8) { + if (var51.equalsIgnoreCase("null")) { + var51 = null; } + + playerMenuActions[var6 - 1] = var51; + playerOptionsPriorities[var6 - 1] = var5 == 0; } - InterfaceParent var89; - for (; flags-- > 0; var89.field856 = true) { - var7 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var57 = var3.readUnsignedByte(); - var89 = (InterfaceParent)interfaceParents.get((long)var7); - if (var89 != null && var8 != var89.group) { - Actor.closeInterface(var89, true); - var89 = null; - } + var1.serverPacket = null; + return true; + } - if (var89 == null) { - var89 = WorldMapLabelSize.ifOpenSub(var7, var8, var57); - } + if (ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR == var1.serverPacket) { + var68 = var3.readUnsignedShort(); + if (var68 == 65535) { + var68 = -1; } - for (var82 = (InterfaceParent)interfaceParents.first(); var82 != null; var82 = (InterfaceParent)interfaceParents.next()) { - if (var82.field856) { - var82.field856 = false; - } else { - Actor.closeInterface(var82, true); - } + WorldMapSection1.playSong(var68); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.NPC_ANIM_SPECIFIC == var1.serverPacket) { + var68 = var3.method2587(); + if (var68 == 65535) { + var68 = -1; } - widgetFlags = new NodeHashTable(512); + var5 = var3.method2592(); + Login.playJingle(var68, var5); + var1.serverPacket = null; + return true; + } - while (var3.offset < var20) { - var7 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var57 = var3.readUnsignedShort(); - var59 = var3.readInt(); + if (ServerPacket.UPDATE_STAT == var1.serverPacket) { + ArchiveDisk.logOut(); + var1.serverPacket = null; + return false; + } - for (var11 = var8; var11 <= var57; ++var11) { - var26 = ((long)var7 << 32) + (long)var11; - widgetFlags.put(new IntegerNode(var59), var26); - } + if (ServerPacket.MIDI_SONG_WITH_SECONDARY == var1.serverPacket) { + var68 = var3.readUnsignedIntIME(); + var5 = var3.readUnsignedByteSub(); + var6 = var3.method2587(); + var74 = (InterfaceParent)interfaceParents.get((long)var68); + if (var74 != null) { + class92.closeInterface(var74, var6 != var74.group); } + class339.ifOpenSub(var68, var6, var5); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 == var1.serverPacket) { - return this.method380(var1, 2); + boolean var80; + Widget var89; + if (ServerPacket.LOC_ANIM_SPECIFIC == var1.serverPacket) { + var80 = var3.readUnsignedByteNeg() == 1; + var5 = var3.readInt(); + var89 = class92.getWidget(var5); + if (var80 != var89.isHidden) { + var89.isHidden = var80; + class218.invalidateWidget(var89); + } + + var1.serverPacket = null; + return true; } - if (ServerPacket.UPDATE_INV_CLEAR == var1.serverPacket) { - var20 = var3.readInt(); - var78 = VarbitComposition.getWidget(var20); + if (ServerPacket.IF_SETEVENTS == var1.serverPacket) { + var68 = var3.method2587(); + var5 = var3.readUnsignedShort(); + var6 = var3.readIntIME(); + var7 = var3.readUnsignedShort(); + var93 = class92.getWidget(var6); + if (var7 != var93.modelAngleX || var68 != var93.modelAngleY || var5 != var93.modelZoom) { + var93.modelAngleX = var7; + var93.modelAngleY = var68; + var93.modelZoom = var5; + class218.invalidateWidget(var93); + } + + var1.serverPacket = null; + return true; + } - for (flags = 0; flags < var78.itemIds.length; ++flags) { - var78.itemIds[flags] = -1; - var78.itemIds[flags] = 0; + if (ServerPacket.REFLECTIONCHECK_FRIENDLIST == var1.serverPacket) { + var68 = var3.readUnsignedShortLE(); + var5 = var3.readUnsignedIntIME(); + var89 = class92.getWidget(var5); + if (var89.modelType != 1 || var68 != var89.modelId) { + var89.modelType = 1; + var89.modelId = var68; + class218.invalidateWidget(var89); } - class200.invalidateWidget(var78); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_SITESETTINGS == var1.serverPacket) { - class450.method2270(var3.readStringCp1252NullTerminated()); + if (ServerPacket.CLANSETTINGS_DELTA == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.MAPPROJ_ANIM); var1.serverPacket = null; return true; } - if (ServerPacket.PLAYER_SPOTANIM_SPECIFIC == var1.serverPacket) { - var20 = var3.readUnsignedShortLE(); - Player var94; - if (var20 == localPlayerIndex) { - var94 = class136.localPlayer; - } else { - var94 = players[var20]; - } + if (ServerPacket.IF1_MODELROTATE == var1.serverPacket) { + var8 = var3.readUnsignedShortLE(); + var6 = var3.readIntME(); + var7 = var3.readIntME(); + var68 = var3.method2587(); + var5 = var3.method2587(); + if (var68 == 65535) { + var68 = -1; + } + + ArrayList var98 = new ArrayList(); + var98.add(var68); + class157.method836(var98, var5, var6, var7, var8); + var1.serverPacket = null; + return true; + } - var7 = var3.readUnsignedByte(); - var5 = var3.readUnsignedShortAddLE(); - flags = var3.readIntIME(); - if (var94 != null) { - var94.updateSpotAnimation(var7, var5, flags >> 16, flags & 65535); - } + if (ServerPacket.MAPPROJ_ANIM_SPECIFIC == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.LOC_DEL); + var1.serverPacket = null; + return true; + } + if (ServerPacket.RUN_CLIENTSCRIPT == var1.serverPacket) { + class299.friendSystem.method399(); + field518 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_UID192 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - DelayFadeTask.method2091(var3, var3.offset - 28); + String var94; + if (ServerPacket.NPC_HEADICON_SPECIFIC == var1.serverPacket) { + byte[] var54 = new byte[var1.serverPacketLength]; + var3.method2520(var54, 0, var54.length); + Buffer var77 = new Buffer(var54); + var94 = var77.readStringCp1252NullTerminated(); + class30.openURL(var94, true, false); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.IF_SETPLAYERMODEL_BODYTYPE == var1.serverPacket) { + World var53 = new World(); + var53.host = var3.readStringCp1252NullTerminated(); + var53.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var53.properties = var5; + if (var53.isDeadman()) { + var53.field679 = "beta"; } + MusicSong.updateGameState(45); + var2.close(); + var2 = null; + ModeWhere.changeWorld(var53); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.MIDI_JINGLE == var1.serverPacket) { + rebootTimer = var3.readUnsignedShortLE() * 30; + field528 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.RUN_CLIENTSCRIPT == var1.serverPacket) { - var52 = var3.readStringCp1252NullTerminated(); - Object[] var77 = new Object[var52.length() + 1]; + if (ServerPacket.CHAT_FILTER_SETTINGS == var1.serverPacket) { + var68 = var3.readUnsignedShort(); + if (var68 == 65535) { + var68 = -1; + } - for (flags = var52.length() - 1; flags >= 0; --flags) { - if (var52.charAt(flags) == 's') { - var77[flags + 1] = var3.readStringCp1252NullTerminated(); - } else { - var77[flags + 1] = new Integer(var3.readInt()); - } + rootInterface = var68; + this.resizeRoot(false); + class19.Widget_resetModelFrames(var68); + MoveSpeed.runWidgetOnLoadListener(rootInterface); + + for (var5 = 0; var5 < 100; ++var5) { + field407[var5] = true; } - var77[0] = new Integer(var3.readInt()); - ScriptEvent var67 = new ScriptEvent(); - var67.args = var77; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var67); var1.serverPacket = null; return true; } - if (ServerPacket.HEAT_MAP == var1.serverPacket) { - var87 = var3.readBoolean(); - if (var87) { - if (UserComparator7.field1171 == null) { - UserComparator7.field1171 = new class370(); - } + if (ServerPacket.IF_SETCOLOUR == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field402 = true; + Players.cameraMoveToX = var3.readUnsignedByte(); + class33.cameraMoveToY = var3.readUnsignedByte(); + var68 = var3.readUnsignedShort(); + var5 = var3.readUnsignedShort(); + field401 = var3.readBoolean(); + var6 = var3.readUnsignedByte(); + var7 = Players.cameraMoveToX * 128 + 64; + var8 = class33.cameraMoveToY * 128 + 64; + boolean var62 = false; + boolean var60 = false; + if (field401) { + var9 = class133.cameraY; + var10 = class18.getTileHeight(var7, var8, HealthBar.Client_plane) - var68; } else { - UserComparator7.field1171 = null; + var9 = class18.getTileHeight(NPCComposition.cameraX, class139.cameraZ, HealthBar.Client_plane) - class133.cameraY; + var10 = var68; } + field642 = new class477(NPCComposition.cameraX, class139.cameraZ, var9, var7, var8, var10, var5, var6); var1.serverPacket = null; return true; } - if (ServerPacket.TRIGGER_ONDIALOGABORT == var1.serverPacket) { - if (rootInterface != -1) { - ChatChannel.runIntfCloseListeners(rootInterface, 0); + if (ServerPacket.PLAYER_SPOTANIM_SPECIFIC == var1.serverPacket) { + class271.loadRegions(false, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.IF_OPENTOP == var1.serverPacket) { + var68 = var3.method2598(); + var76 = class92.getWidget(var68); + + for (var6 = 0; var6 < var76.itemIds.length; ++var6) { + var76.itemIds[var6] = -1; + var76.itemIds[var6] = 0; } + class218.invalidateWidget(var76); var1.serverPacket = null; return true; } - Widget var80; - if (ServerPacket.IF_SETOBJECT == var1.serverPacket) { - var20 = var3.readUnsignedShortLE(); // Item - if (var20 == 65535) { - var20 = -1; - } - - var5 = var3.readIntLE(); // Hash - flags = var3.readIntLE(); // Amount - var80 = VarbitComposition.getWidget(var5); - ItemComposition var93; - if (!var80.isIf3) { - if (var20 == -1) { - var80.modelType = 0; - var1.serverPacket = null; - return true; + if (ServerPacket.MINIMAP_TOGGLE == var1.serverPacket) { + var68 = var3.readIntME(); + var5 = var3.method2598(); + var89 = class92.getWidget(var5); + if (var89 != null && var89.type == 0) { + if (var68 > var89.scrollHeight - var89.height) { + var68 = var89.scrollHeight - var89.height; } - var93 = class125.ItemDefinition_get(var20).getCountObj(flags); - var80.modelType = 4; - var80.modelId = var20; - var80.modelAngleX = var93.xan2d; - var80.modelAngleY = var93.yan2d; - var80.modelZoom = var93.zoom2d * 100 / flags; - class200.invalidateWidget(var80); - } else { - var80.itemId = var20; - var80.itemQuantity = flags; - var93 = class125.ItemDefinition_get(var20).getCountObj(flags); - var80.modelAngleX = var93.xan2d; - var80.modelAngleY = var93.yan2d; - var80.modelAngleZ = var93.zan2d; - var80.modelOffsetX = var93.offsetX2d; - var80.modelOffsetY = var93.offsetY2d; - var80.modelZoom = var93.zoom2d; - if (var93.isStackable == 1) { - var80.itemQuantityMode = 1; - } else { - var80.itemQuantityMode = 2; + if (var68 < 0) { + var68 = 0; } - if (var80.modelRotation > 0) { - var80.modelZoom = var80.modelZoom * 32 / var80.modelRotation; - } else if (var80.rawWidth > 0) { - var80.modelZoom = var80.modelZoom * 32 / var80.rawWidth; + if (var68 != var89.scrollY) { + var89.scrollY = var68; + class218.invalidateWidget(var89); } - - class200.invalidateWidget(var80); } var1.serverPacket = null; return true; } - if (ServerPacket.IF1_MODELROTATE == var1.serverPacket) { - var20 = var3.readUnsignedShortLE(); - var5 = var3.readIntLE(); - flags = var3.readUnsignedShortLE(); - var80 = VarbitComposition.getWidget(var5); - var80.rotationKey = var20 + (flags << 16); + if (ServerPacket.UPDATE_REBOOT_TIMER == var1.serverPacket) { + tradeChatMode = var3.readUnsignedByte(); + publicChatMode = var3.readUnsignedByteAdd(); var1.serverPacket = null; return true; } - if (ServerPacket.HINT_ARROW == var1.serverPacket) { + if (ServerPacket.CLANCHANNEL_FULL == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field404 = false; + PendingSpawn.cameraLookAtX = var3.readUnsignedByte(); + VarbitComposition.cameraLookAtY = var3.readUnsignedByte(); + MusicPatchNode2.cameraLookAtHeight = var3.readUnsignedShort(); + class33.cameraLookAtSpeed = var3.readUnsignedByte(); + WorldMapElement.cameraLookAtAcceleration = var3.readUnsignedByte(); + if (WorldMapElement.cameraLookAtAcceleration >= 100) { + var68 = PendingSpawn.cameraLookAtX * 128 + 64; + var5 = VarbitComposition.cameraLookAtY * 128 + 64; + var6 = class18.getTileHeight(var68, var5, HealthBar.Client_plane) - MusicPatchNode2.cameraLookAtHeight; + var7 = var68 - NPCComposition.cameraX; + var8 = var6 - class133.cameraY; + var9 = var5 - class139.cameraZ; + var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); + class129.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.9490051269531D) & 2047; + UserComparator10.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; + if (class129.cameraPitch < 128) { + class129.cameraPitch = 128; + } + + if (class129.cameraPitch > 383) { + class129.cameraPitch = 383; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.IF_SETANGLE == var1.serverPacket) { + return this.method372(var1, 1); + } + + if (ServerPacket.IF_OPENSUB == var1.serverPacket) { hintArrowType = var3.readUnsignedByte(); if (hintArrowType == 1) { hintArrowNpcIndex = var3.readUnsignedShort(); @@ -4565,606 +4305,449 @@ final boolean method382(PacketWriter var1) { return true; } - if (ServerPacket.IF_CLOSESUB == var1.serverPacket) { - var20 = var3.readInt(); - InterfaceParent var76 = (InterfaceParent)interfaceParents.get((long)var20); - if (var76 != null) { - Actor.closeInterface(var76, true); + if (ServerPacket.GAMEFRAME_FULL == var1.serverPacket) { + WorldMapSection2.method1410(); + var20 = var3.readByte(); + class146 var75 = new class146(var3); + ClanSettings var96; + if (var20 >= 0) { + var96 = currentClanSettings[var20]; + } else { + var96 = Players.guestClanSettings; } - if (meslayerContinueWidget != null) { - class200.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; + if (var96 == null) { + this.method384(var20); + var1.serverPacket = null; + return true; + } + + if (var75.field1347 > var96.field1388) { + this.method384(var20); + var1.serverPacket = null; + return true; + } + + if (var75.field1347 < var96.field1388) { + var1.serverPacket = null; + return true; } + var75.method781(var96); var1.serverPacket = null; return true; } - if (ServerPacket.VARCLAN_ENABLE == var1.serverPacket) { - class135.varclan = new class455(class344.HitSplatDefinition_cached); + if (ServerPacket.LOC_ANIM == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.OBJ_DEL_LEGACY); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS == var1.serverPacket) { - class387.ZONE_Y = var3.readUnsignedByte(); - WorldMapSectionType.ZONE_X = var3.readUnsignedByte(); + if (ServerPacket.CAM_LOOKAT_EASED_ANGLE_ABSOLUTE == var1.serverPacket) { + var68 = var3.method2588(); + var5 = var3.readInt(); + var6 = var3.readShort(); + var71 = class92.getWidget(var5); + if (var6 != var71.rawX || var68 != var71.rawY || var71.xAlignment != 0 || var71.yAlignment != 0) { + var71.rawX = var6; + var71.rawY = var68; + var71.xAlignment = 0; + var71.yAlignment = 0; + class218.invalidateWidget(var71); + this.alignWidget(var71); + if (var71.type == 0) { + Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var5 >> 16], var71, false); + } + } + var1.serverPacket = null; return true; } - if (ServerPacket.CAM_LOOKAT_EASED_ANGLE_ABSOLUTE == var1.serverPacket) { - isCameraLocked = true; - field397 = false; - field400 = true; - var20 = class4.method5(var3.readShort() & 2027); - var5 = class74.method440(var3.readShort() & 2027); - flags = var3.readUnsignedShort(); - var7 = var3.readUnsignedByte(); - field643 = new class479(class19.cameraPitch, var5, flags, var7); - field642 = new class479(class456.cameraYaw, var20, flags, var7); + if (ServerPacket.IF_SETPLAYERHEAD == var1.serverPacket) { + var68 = var3.readIntIME(); + var5 = var3.readUnsignedIntIME(); + var89 = class92.getWidget(var5); + ReflectionCheck.method174(var89, var68); + class218.invalidateWidget(var89); var1.serverPacket = null; return true; } - if (ServerPacket.VARCLAN == var1.serverPacket) { - if (class135.varclan == null) { - class135.varclan = new class455(class344.HitSplatDefinition_cached); + if (ServerPacket.NEW_PACKET_CAM_RESET_V2 == var1.serverPacket) { + var68 = var3.readUnsignedShort(); + var5 = var3.method2598(); + var89 = class92.getWidget(var5); + if (var89.modelType != 6 || var68 != var89.modelId) { + var89.modelType = 6; + var89.modelId = var68; + class218.invalidateWidget(var89); } - class522 var53 = class344.HitSplatDefinition_cached.method2300(var3); - class135.varclan.field3883.vmethod8143(var53.field4170, var53.field4169); - field568[++field522 - 1 & 31] = var53.field4170; var1.serverPacket = null; return true; } - if (ServerPacket.LOC_ANIM_SPECIFIC == var1.serverPacket) { - var57 = var3.readUnsignedByteSub(); - var59 = var57 >> 2; - var11 = var57 & 3; - var79 = field648[var59]; - var13 = var3.readUnsignedShort(); - flags = var3.readMedium(); - var20 = flags >> 16; - var5 = flags >> 8 & 255; - var7 = var20 + (flags >> 4 & 7); - var8 = var5 + (flags & 7); - if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { - if (var79 == 0) { - BoundaryObject var99 = UserComparator5.scene.method1233(class36.Client_plane, var7, var8); - if (var99 != null) { - var15 = class458.Entity_unpackID(var99.tag); - if (var59 == 2) { - var99.renderable1 = new DynamicObject(var15, 2, var11 + 4, class36.Client_plane, var7, var8, var13, false, var99.renderable1); - var99.renderable2 = new DynamicObject(var15, 2, var11 + 1 & 3, class36.Client_plane, var7, var8, var13, false, var99.renderable2); - } else { - var99.renderable1 = new DynamicObject(var15, var59, var11, class36.Client_plane, var7, var8, var13, false, var99.renderable1); - } - } - } else if (var79 == 1) { - WallDecoration var98 = UserComparator5.scene.method1234(class36.Client_plane, var7, var8); - if (var98 != null) { - var15 = class458.Entity_unpackID(var98.tag); - if (var59 != 4 && var59 != 5) { - if (var59 == 6) { - var98.renderable1 = new DynamicObject(var15, 4, var11 + 4, class36.Client_plane, var7, var8, var13, false, var98.renderable1); - } else if (var59 == 7) { - var98.renderable1 = new DynamicObject(var15, 4, (var11 + 2 & 3) + 4, class36.Client_plane, var7, var8, var13, false, var98.renderable1); - } else if (var59 == 8) { - var98.renderable1 = new DynamicObject(var15, 4, var11 + 4, class36.Client_plane, var7, var8, var13, false, var98.renderable1); - var98.renderable2 = new DynamicObject(var15, 4, (var11 + 2 & 3) + 4, class36.Client_plane, var7, var8, var13, false, var98.renderable2); - } - } else { - var98.renderable1 = new DynamicObject(var15, 4, var11, class36.Client_plane, var7, var8, var13, false, var98.renderable1); - } - } - } else if (var79 == 2) { - GameObject var95 = UserComparator5.scene.getGameObject(class36.Client_plane, var7, var8); - if (var59 == 11) { - var59 = 10; - } - - if (var95 != null) { - var95.renderable = new DynamicObject(class458.Entity_unpackID(var95.tag), var59, var11, class36.Client_plane, var7, var8, var13, false, var95.renderable); - } - } else if (var79 == 3) { - FloorDecoration var96 = UserComparator5.scene.getFloorDecoration(class36.Client_plane, var7, var8); - if (var96 != null) { - var96.renderable = new DynamicObject(class458.Entity_unpackID(var96.tag), 22, var11, class36.Client_plane, var7, var8, var13, false, var96.renderable); - } - } + if (ServerPacket.SEND_PING == var1.serverPacket) { + byte var58 = var3.readByteAdd(); + var85 = var3.readUnsignedByteNeg() * 4; + byte var57 = var3.readByteAdd(); + var59 = var3.readUnsignedShortLE(); + var56 = var3.method2548(); + var16 = var3.readIntME(); + var13 = var3.readUnsignedByteAdd() * 4; + var15 = var3.method2587(); + var6 = var3.method2591(); + var68 = var6 >> 16; + var5 = var6 >> 8 & 255; + var7 = var68 + (var6 >> 4 & 7); + var8 = var5 + (var6 & 7); + int var18 = var3.readUnsignedByte(); + int var17 = var3.readUnsignedByteSub(); + var9 = var58 + var7; + var10 = var57 + var8; + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var59 != 65535) { + var7 = var7 * 128 + 64; + var8 = var8 * 128 + 64; + var9 = var9 * 128 + 64; + var10 = var10 * 128 + 64; + Projectile var19 = new Projectile(var59, HealthBar.Client_plane, var7, var8, class18.getTileHeight(var7, var8, HealthBar.Client_plane) - var13, var15 + cycle, var16 + cycle, var17, var18, var56, var85); + var19.setDestination(var9, var10, class18.getTileHeight(var9, var10, HealthBar.Client_plane) - var85, var15 + cycle); + projectiles.addFirst(var19); } var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SWAP == var1.serverPacket) { - var5 = var3.readUnsignedShort(); - var7 = var3.readUnsignedShort(); - var20 = var3.readUnsignedShortLE(); - flags = var3.readUnsignedShortLE(); - class452.someMusicMethod(var20, var5, flags, var7); + if (ServerPacket.VARCLAN_DISABLE == var1.serverPacket) { + class139.varclan = new class454(SwapSongTask.HitSplatDefinition_cached); var1.serverPacket = null; return true; } - if (ServerPacket.SET_PLAYER_OP == var1.serverPacket) { - var20 = var3.readUnsignedByteNeg(); // Index - var5 = var3.readUnsignedByteNeg(); // Left_click - var64 = var3.readStringCp1252NullTerminated(); // Option - if (var20 >= 1 && var20 <= 8) { - if (var64.equalsIgnoreCase("null")) { - var64 = null; - } - - playerMenuActions[var20 - 1] = var64; - playerOptionsPriorities[var20 - 1] = var5 == 0; - } - + if (ServerPacket.FRIENDLIST_LOADED == var1.serverPacket) { + ObjectSound.field686 = var3.readUnsignedByteNeg(); + class125.field1193 = var3.readUnsignedByteSub(); var1.serverPacket = null; return true; } - if (ServerPacket.PLAYER_ANIM_SPECIFIC == var1.serverPacket) { - var20 = var3.readUnsignedByteNeg(); - var5 = var3.readUnsignedShortAdd(); - if (var5 == 65535) { - var5 = -1; + if (ServerPacket.MIDI_SONG_STOP == var1.serverPacket) { + for (var68 = 0; var68 < players.length; ++var68) { + if (players[var68] != null) { + players[var68].sequence = -1; + } + } + + for (var68 = 0; var68 < npcs.length; ++var68) { + if (npcs[var68] != null) { + npcs[var68].sequence = -1; + } } - WorldMapSectionType.performPlayerAnimation(class136.localPlayer, var5, var20); var1.serverPacket = null; return true; } - if (ServerPacket.OBJ_ADD == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.OBJ_ADD); + if (ServerPacket.REBUILD_REGION == var1.serverPacket) { + Frames.updateNpcs(false, var3); var1.serverPacket = null; return true; } - if (ServerPacket.LOGIN_SCREEN_PACKET == var1.serverPacket) { - var20 = var3.readUnsignedShort(); - var5 = var3.readIntME(); - var6 = VarbitComposition.getWidget(var5); - if (var6.modelType != 6 || var20 != var6.modelId) { - var6.modelType = 6; - var6.modelId = var20; - class200.invalidateWidget(var6); - } - + if (ServerPacket.SPOTANIM_SPECIFIC == var1.serverPacket) { + NPCComposition.readReflectionCheck(var3, var1.serverPacketLength); var1.serverPacket = null; return true; } - if (ServerPacket.SET_MAP_FLAG == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { - destinationY = 0; - } - + if (ServerPacket.REFLECTION_CHECK == var1.serverPacket) { + Frames.updateNpcs(true, var3); var1.serverPacket = null; return true; } - if (ServerPacket.CLANCHANNEL_DELTA == var1.serverPacket) { - field512 = cycleCntr; - var72 = var3.readByte(); - class160 var75 = new class160(var3); - ClanChannel var60; - if (var72 >= 0) { - var60 = currentClanChannels[var72]; - } else { - var60 = WorldMapLabelSize.guestClanChannel; - } - - var75.method842(var60); + if (ServerPacket.VARP_SMALL == var1.serverPacket) { + var68 = var3.readUnsignedByteAdd(); + var5 = var3.readUnsignedByteAdd(); + var6 = var3.method2598(); + var71 = class92.getWidget(var6); + Tiles.method460(var71, var5, var68); + class218.invalidateWidget(var71); var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SONG_WITH_SECONDARY == var1.serverPacket) { - var8 = var3.readUnsignedShortAddLE(); + if (ServerPacket.UPDATE_INV_CLEAR == var1.serverPacket) { var5 = var3.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - var20 = var3.readUnsignedShortAdd(); - if (var20 == 65535) { - var20 = -1; - } - - var57 = var3.readUnsignedShort(); - var7 = var3.readUnsignedShortAdd(); - flags = var3.readUnsignedShortAddLE(); - ArrayList var88 = new ArrayList(); - var88.add(var20); - var88.add(var5); - ObjectComposition.method1031(var88, flags, var7, var8, var57); + var68 = var3.readIntME(); + Script.method445(var68, var5); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_INV_FULL == var1.serverPacket) { - var20 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var20 < -70000) { - var5 += 32768; - } - - if (var20 >= 0) { - var6 = VarbitComposition.getWidget(var20); - } else { - var6 = null; - } - - if (var6 != null) { - for (var7 = 0; var7 < var6.itemIds.length; ++var7) { - var6.itemIds[var7] = 0; - var6.field3036[var7] = 0; - } - } - - GrandExchangeOfferNameComparator.clearItemContainer(var5); - var7 = var3.readUnsignedShort(); - - for (var8 = 0; var8 < var7; ++var8) { - var57 = var3.readUnsignedByteSub(); - if (var57 == 255) { - var57 = var3.readInt(); - } - - var59 = var3.readUnsignedShortLE(); - if (var6 != null && var8 < var6.itemIds.length) { - var6.itemIds[var8] = var59; - var6.field3036[var8] = var57; + if (ServerPacket.SET_MAP_FLAG == var1.serverPacket) { + var80 = var3.readBoolean(); + if (var80) { + if (class390.field3656 == null) { + class390.field3656 = new class369(); } - - ObjectComposition.itemContainerSetItem(var5, var8, var59 - 1, var57); - } - - if (var6 != null) { - class200.invalidateWidget(var6); + } else { + class390.field3656 = null; } - DbRowType.process(); - changedItemContainers[++changedItemContainersCount - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.PLAYER_INFO == var1.serverPacket) { - var87 = this.username() == null; - class85.updatePlayers(var3, var1.serverPacketLength); - WorldMapSectionType.method1485(); - if (var87 && this.username() != null && this.username().method2682().equalsIgnoreCase("nin")) { - class415.addGameMessage(4, "", "$jmod_luck = true"); - } - + if (ServerPacket.MIDI_SONG_LEGACY == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field404 = true; + var68 = class7.method18(var3.readShort() & 2027); + var5 = UserComparator8.method674(var3.readShort() & 2027); + var6 = var3.readUnsignedShort(); + var7 = var3.readUnsignedByte(); + field647 = new class478(class129.cameraPitch, var5, var6, var7); + field646 = new class478(UserComparator10.cameraYaw, var68, var6, var7); var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_CLANCHANNEL == var1.serverPacket) { - var72 = var3.readByte(); - var21 = var3.readStringCp1252NullTerminated(); - long var40 = (long)var3.readUnsignedShort(); - long var42 = (long)var3.readMedium(); - PlayerType var28 = (PlayerType)ClientPreferences.findEnumerated(PendingSpawn.PlayerType_values(), var3.readUnsignedByte()); - long var44 = var42 + (var40 << 32); - boolean var65 = false; - ClanChannel var39 = null; - var39 = var72 >= 0 ? currentClanChannels[var72] : WorldMapLabelSize.guestClanChannel; - if (var39 == null) { - var65 = true; - } else { - var15 = 0; - - while (true) { - if (var15 >= 100) { - if (var28.isUser && class177.friendSystem.isIgnored(new Username(var21, class457.loginType))) { - var65 = true; - } - break; - } - - if (var44 == crossWorldMessageIds[var15]) { - var65 = true; - break; - } - - ++var15; - } - } - - if (!var65) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var44; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var36 = AbstractFont.escapeBrackets(class292.readString(var3)); - var16 = var72 >= 0 ? 41 : 44; - if (var28.modIcon != -1) { - class213.addChatMessage(var16, SecureRandomCallable.addImageTag(var28.modIcon) + var21, var36, var39.name); - } else { - class213.addChatMessage(var16, var21, var36, var39.name); - } - } + if (ServerPacket.TRADING_POST_RESULTS == var1.serverPacket) { + return this.method373(var1); + } + if (ServerPacket.VARP_LARGE == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.OBJ_COUNT); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETEVENTS == var1.serverPacket) { - var20 = var3.readUnsignedShortAddLE(); - if (var20 == 65535) { - var20 = -1; + if (ServerPacket.IF_SETNPCHEAD == var1.serverPacket) { + var68 = var3.readUnsignedIntIME(); + var5 = var3.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; } - var5 = var3.readIntIME(); - flags = var3.readUnsignedShortLE(); - if (flags == 65535) { - flags = -1; + var6 = var3.readIntIME(); + var7 = var3.method2587(); + if (var7 == 65535) { + var7 = -1; } - var7 = var3.readIntIME(); - - for (var8 = var20; var8 <= flags; ++var8) { - var33 = (long)var8 + ((long)var7 << 32); - Node var35 = widgetFlags.get(var33); - if (var35 != null) { - var35.remove(); + for (var8 = var7; var8 <= var5; ++var8) { + var27 = ((long)var6 << 32) + (long)var8; + Node var99 = widgetFlags.get(var27); + if (var99 != null) { + var99.remove(); } - widgetFlags.put(new IntegerNode(var5), var33); + widgetFlags.put(new IntegerNode(var68), var27); } var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPLAYERMODEL_OBJ == var1.serverPacket) { - var20 = var3.readIntME(); - var5 = var3.readInt(); - var6 = VarbitComposition.getWidget(var20); - UserComparator9.method679(var6, var5); - class200.invalidateWidget(var6); - var1.serverPacket = null; - return true; - } + if (ServerPacket.PREFETCH_GAMEOBJECTS == var1.serverPacket) { + var7 = var3.readUnsignedShortLE(); + var5 = var3.method2587(); + if (var5 == 65535) { + var5 = -1; + } - if (ServerPacket.IF_SETMODEL == var1.serverPacket) { - var20 = var3.readIntLE(); // Interface - var5 = var3.readUnsignedShortAdd(); // Model - var6 = VarbitComposition.getWidget(var20); - if (var6.modelType != 1 || var5 != var6.modelId) { - var6.modelType = 1; - var6.modelId = var5; - class200.invalidateWidget(var6); + var8 = var3.method2587(); + var6 = var3.readIntME(); + var9 = var3.readIntME(); + var68 = var3.readUnsignedShortLE(); + if (var68 == 65535) { + var68 = -1; } + ArrayList var86 = new ArrayList(); + var86.add(var68); + var86.add(var5); + class157.method836(var86, var6, var7, var8, var9); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_FRIENDLIST == var1.serverPacket) { - class177.friendSystem.readUpdate(var3, var1.serverPacketLength); - field516 = cycleCntr; - var1.serverPacket = null; - return true; - } + if (ServerPacket.HINT_ARROW == var1.serverPacket) { + class113.process(); + var68 = var3.readUnsignedByteSub(); + var5 = var3.readUnsignedByteAdd(); + var6 = var3.method2598(); + experience[var5] = var6; + currentLevels[var5] = var68; + levels[var5] = 1; - if (ServerPacket.IF_OPENSUB == var1.serverPacket) { - var20 = var3.readInt(); // Overlay - var5 = var3.readUnsignedByte(); // Type - flags = var3.readUnsignedShortAddLE(); // Component - var82 = (InterfaceParent)interfaceParents.get((long)var20); - if (var82 != null) { - Actor.closeInterface(var82, flags != var82.group); + for (var7 = 0; var7 < 98; ++var7) { + if (var6 >= Skills.Skills_experienceTable[var7]) { + levels[var5] = var7 + 2; + } } - WorldMapLabelSize.ifOpenSub(var20, flags, var5); + changedSkills[++changedSkillsCount - 1 & 31] = var5; var1.serverPacket = null; return true; } - if (ServerPacket.CHAT_FILTER_SETTINGS == var1.serverPacket) { - tradeChatMode = var3.readUnsignedByteAdd(); - publicChatMode = var3.readUnsignedByteNeg(); + if (ServerPacket.UPDATE_SITESETTINGS == var1.serverPacket) { + var68 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedShort(); + class27.queueSoundEffect(var68, var5, var6); var1.serverPacket = null; return true; } - if (ServerPacket.RESET_CLIENT_VARCACHE == var1.serverPacket) { - for (var20 = 0; var20 < VarpDefinition.field1491; ++var20) { - VarpDefinition var74 = class158.VarpDefinition_get(var20); - if (var74 != null) { - Varps.Varps_temp[var20] = 0; - Varps.Varps_main[var20] = 0; - } - } - - DbRowType.process(); - changedVarpCount += 32; + if (ServerPacket.CLANSETTINGS_FULL == var1.serverPacket) { + var68 = var3.readUnsignedByte(); + var5 = var3.readIntIME(); + var89 = class92.getWidget(var5); + class135.method742(var89, VarbitComposition.localPlayer.appearance.field2916, var68); + class218.invalidateWidget(var89); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPLAYERMODEL_SELF == var1.serverPacket) { - var87 = var3.readUnsignedByteAdd() == 1; - var5 = var3.readIntLE(); - var6 = VarbitComposition.getWidget(var5); - WorldMapManager.method1453(var6, class136.localPlayer.appearance, var87); - class200.invalidateWidget(var6); + if (ServerPacket.NPC_SPOTANIM_SPECIFIC == var1.serverPacket) { + var68 = var3.readIntIME(); + var5 = var3.readUnsignedShort(); + var89 = class92.getWidget(var68); + if (var89.modelType != 2 || var5 != var89.modelId) { + var89.modelType = 2; + var89.modelId = var5; + class218.invalidateWidget(var89); + } + var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR == var1.serverPacket) { - var20 = var3.readUnsignedByteAdd(); - var5 = var3.readUnsignedByteSub(); - flags = var3.readIntME(); - var80 = VarbitComposition.getWidget(flags); - class310.method1641(var80, var5, var20); - class200.invalidateWidget(var80); + if (ServerPacket.TRADING_POST_UPDATE == var1.serverPacket) { + var68 = var3.readUnsignedByte(); + Script.forceDisconnect(var68); var1.serverPacket = null; - return true; + return false; } - if (ServerPacket.IF_SETPLAYERMODEL_BODYTYPE == var1.serverPacket) { - var20 = var3.readInt(); - var5 = var3.readUnsignedByteSub(); - var6 = VarbitComposition.getWidget(var20); - TaskHandler.method898(var6, class136.localPlayer.appearance.field2900, var5); - class200.invalidateWidget(var6); + if (ServerPacket.UPDATE_INV_STOP_TRANSMIT == var1.serverPacket) { + class113.process(); + runEnergy = var3.readUnsignedShort(); + field528 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SONG_LEGACY == var1.serverPacket) { - var20 = var3.readUnsignedShort(); - if (var20 == 65535) { - var20 = -1; - } - - WorldMapSectionType.playSong(var20); + boolean var61; + if (ServerPacket.LOGIN_SCREEN_PACKET == var1.serverPacket) { + var68 = var3.readIntIME(); + var61 = var3.readUnsignedByte() == 1; + var89 = class92.getWidget(var68); + class160.method846(var89, VarbitComposition.localPlayer.appearance, var61); + class218.invalidateWidget(var89); var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_JINGLE == var1.serverPacket) { - var20 = var3.readUMed2(); // Garbage - var5 = var3.readUnsignedShortAddLE(); // Id - if (var5 == 65535) { - var5 = -1; + if (ServerPacket.RESET_ANIMS == var1.serverPacket) { + var20 = var3.readByteNeg(); + var5 = var3.readUnsignedShortLE(); + Varps.Varps_temp[var5] = var20; + if (Varps.Varps_main[var5] != var20) { + Varps.Varps_main[var5] = var20; } - Interpreter.playJingle(var5, var20); + WorldMapDecoration.changeGameOptions(var5); + changedVarps[++changedVarpCount - 1 & 31] = var5; var1.serverPacket = null; return true; } - if (ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT == var1.serverPacket) { - class14.privateChatMode = class228.method1187(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } + boolean var12; + if (ServerPacket.CAM_SHAKE == var1.serverPacket) { + var51 = var3.readStringCp1252NullTerminated(); + var23 = (long)var3.readUnsignedShort(); + var25 = (long)var3.readMedium(); + PlayerType var44 = (PlayerType)KeyHandler.findEnumerated(MidiPcmStream.PlayerType_values(), var3.readUnsignedByte()); + long var46 = (var23 << 32) + var25; + var12 = false; - if (ServerPacket.CLANCHANNEL_FULL == var1.serverPacket) { - field512 = cycleCntr; - var72 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var72 >= 0) { - currentClanChannels[var72] = null; - } else { - WorldMapLabelSize.guestClanChannel = null; + for (var13 = 0; var13 < 100; ++var13) { + if (var46 == crossWorldMessageIds[var13]) { + var12 = true; + break; } - - var1.serverPacket = null; - return true; } - if (var72 >= 0) { - currentClanChannels[var72] = new ClanChannel(var3); - } else { - WorldMapLabelSize.guestClanChannel = new ClanChannel(var3); + if (class299.friendSystem.isIgnored(new Username(var51, Language.loginType))) { + var12 = true; } - var1.serverPacket = null; - return true; - } + if (!var12 && field486 == 0) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var46; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var30 = AbstractFont.escapeBrackets(World.method385(DirectByteArrayCopier.readString(var3))); + byte var83; + if (var44.isPrivileged) { + var83 = 7; + } else { + var83 = 3; + } - if (ServerPacket.TRADING_POST_UPDATE == var1.serverPacket) { - var20 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var20] = new GrandExchangeOffer(); - var3.offset += 18; - } else { - --var3.offset; - grandExchangeOffers[var20] = new GrandExchangeOffer(var3, false); + if (var44.modIcon != -1) { + MouseHandler.addGameMessage(var83, Tile.addImageTag(var44.modIcon) + var51, var30); + } else { + MouseHandler.addGameMessage(var83, var51, var30); + } } - field518 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.LOC_ADD_CHANGE == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.LOC_ADD_CHANGE); - var1.serverPacket = null; - return true; - } + if (ServerPacket.NEW_PACK_215 == var1.serverPacket) { + if (class139.varclan == null) { + class139.varclan = new class454(SwapSongTask.HitSplatDefinition_cached); + } - if (ServerPacket.LOC_ANIM == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.LOC_ANIM); + class523 var52 = SwapSongTask.HitSplatDefinition_cached.method2324(var3); + class139.varclan.field3899.vmethod8143(var52.field4216, var52.field4215); + field572[++field512 - 1 & 31] = var52.field4216; var1.serverPacket = null; return true; } - if (ServerPacket.CLANSETTINGS_DELTA == var1.serverPacket) { - Tile.method1161(); - var72 = var3.readByte(); - class146 var73 = new class146(var3); - ClanSettings var56; - if (var72 >= 0) { - var56 = currentClanSettings[var72]; - } else { - var56 = class11.guestClanSettings; - } - - var73.method774(var56); + if (ServerPacket.SYNC_CLIENT_VARCACHE == var1.serverPacket) { var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETHIDE == var1.serverPacket) { - var87 = var3.readUnsignedByteSub() == 1; - var5 = var3.readIntLE(); - var6 = VarbitComposition.getWidget(var5); - if (var87 != var6.isHidden) { - var6.isHidden = var87; - class200.invalidateWidget(var6); + NPC var91; + if (ServerPacket.IF_CLOSESUB == var1.serverPacket) { + short var82 = (short)var3.method2588(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedShort(); + var7 = var3.readUnsignedIntIME(); + var91 = npcs[var6]; + if (var91 != null) { + var91.method589(var5, var7, var82); } var1.serverPacket = null; return true; } - Widget var37; - if (ServerPacket.IF_MOVESUB == var1.serverPacket) { - var20 = var3.readIntIME(); // to - var5 = var3.readIntLE(); // from - InterfaceParent var55 = (InterfaceParent)interfaceParents.get((long)var5); - var82 = (InterfaceParent)interfaceParents.get((long)var20); - if (var82 != null) { - Actor.closeInterface(var82, var55 == null || var82.group != var55.group); - } - - if (var55 != null) { - var55.remove(); - interfaceParents.put(var55, (long)var20); - } - - var37 = VarbitComposition.getWidget(var5); - if (var37 != null) { - class200.invalidateWidget(var37); - } - - var37 = VarbitComposition.getWidget(var20); - if (var37 != null) { - class200.invalidateWidget(var37); - SoundCache.revalidateWidgetScroll(ArchiveLoader.Widget_interfaceComponents[var37.id >>> 16], var37, true); - } - - if (rootInterface != -1) { - ChatChannel.runIntfCloseListeners(rootInterface, 1); + if (ServerPacket.REBUILD_REGION_NORMAL == var1.serverPacket) { + var68 = var3.readInt(); + if (var68 != field476) { + field476 = var68; + WorldMapSection2.method1411(); } var1.serverPacket = null; @@ -5172,196 +4755,220 @@ final boolean method382(PacketWriter var1) { } if (ServerPacket.IF_SETPOSITION == var1.serverPacket) { - var20 = var3.readSignedShortAdd(); - var5 = var3.readIntIME(); - flags = var3.readSignedShortLE(); - var80 = VarbitComposition.getWidget(var5); - if (var20 != var80.rawX || flags != var80.rawY || var80.xAlignment != 0 || var80.yAlignment != 0) { - var80.rawX = var20; - var80.rawY = flags; - var80.xAlignment = 0; - var80.yAlignment = 0; - class200.invalidateWidget(var80); - this.alignWidget(var80); - if (var80.type == 0) { - SoundCache.revalidateWidgetScroll(ArchiveLoader.Widget_interfaceComponents[var5 >> 16], var80, false); + for (var68 = 0; var68 < VarpDefinition.field1498; ++var68) { + VarpDefinition var73 = ApproximateRouteStrategy.VarpDefinition_get(var68); + if (var73 != null) { + Varps.Varps_temp[var68] = 0; + Varps.Varps_main[var68] = 0; } } + class113.process(); + changedVarpCount += 32; var1.serverPacket = null; return true; } - if (ServerPacket.SYNC_CLIENT_VARCACHE == var1.serverPacket) { - for (var20 = 0; var20 < Varps.Varps_main.length; ++var20) { - if (Varps.Varps_temp[var20] != Varps.Varps_main[var20]) { - Varps.Varps_main[var20] = Varps.Varps_temp[var20]; - MenuAction.changeGameOptions(var20); - changedVarps[++changedVarpCount - 1 & 31] = var20; + if (ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS == var1.serverPacket) { + var51 = var3.readStringCp1252NullTerminated(); + Object[] var72 = new Object[var51.length() + 1]; + + for (var6 = var51.length() - 1; var6 >= 0; --var6) { + if (var51.charAt(var6) == 's') { + var72[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var72[var6 + 1] = new Integer(var3.readInt()); } } + var72[0] = new Integer(var3.readInt()); + ScriptEvent var95 = new ScriptEvent(); + var95.args = var72; + WorldMapSection1.runScriptEvent(var95); var1.serverPacket = null; return true; } - if (ServerPacket.VARCLAN_DISABLE == var1.serverPacket) { - class135.varclan = null; + if (ServerPacket.PLAYER_INFO == var1.serverPacket) { + var51 = var3.readStringCp1252NullTerminated(); + var21 = AbstractFont.escapeBrackets(World.method385(DirectByteArrayCopier.readString(var3))); + MouseHandler.addGameMessage(6, var51, var21); var1.serverPacket = null; return true; } - if (ServerPacket.SYNTH_SOUND == var1.serverPacket) { - var20 = var3.readUnsignedShort(); // Sound - var5 = var3.readUnsignedByte(); // Volume - flags = var3.readUnsignedShort(); // Delay - class17.queueSoundEffect(var20, var5, flags); + if (ServerPacket.IF_SETHIDE == var1.serverPacket) { + class299.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + AbstractSocket.FriendSystem_invalidateIgnoreds(); + field518 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.NPC_INFO_LARGE == var1.serverPacket) { - class358.updateNpcs(true, var3); - var1.serverPacket = null; - return true; - } + if (ServerPacket.UPDATE_RUNENERGY == var1.serverPacket) { + var68 = var3.readUShortSmart(); + var61 = var3.readUnsignedByte() == 1; + var94 = ""; + boolean var55 = false; + if (var61) { + var94 = var3.readStringCp1252NullTerminated(); + if (class299.friendSystem.isIgnored(new Username(var94, Language.loginType))) { + var55 = true; + } + } + + String var92 = var3.readStringCp1252NullTerminated(); + if (!var55) { + MouseHandler.addGameMessage(var68, var94, var92); + } - if (ServerPacket.ENTER_FREECAM == var1.serverPacket) { - var20 = var3.readUnsignedByte(); - FriendsChat.method2173(var20); var1.serverPacket = null; return true; } - NPC var92; - if (ServerPacket.NPC_SPOTANIM_SPECIFIC == var1.serverPacket) { - var5 = var3.readIntME(); - flags = var3.readUnsignedShortAdd(); - var20 = var3.readUnsignedShortAddLE(); - var92 = npcs[var20]; - var7 = var3.readUnsignedByte(); - if (var92 != null) { - var92.updateSpotAnimation(var7, flags, var5 >> 16, var5 & 65535); + if (ServerPacket.MAPPROJ_ANIM == var1.serverPacket) { + var80 = var3.readUnsignedByte() == 1; + if (var80) { + class132.field1272 = GameEngine.clockNow() - var3.readLong(); + class392.grandExchangeEvents = new GrandExchangeEvents(var3, true); + } else { + class392.grandExchangeEvents = null; } + field525 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.AREA_SOUND == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.AREA_SOUND); - var1.serverPacket = null; - return true; - } + if (ServerPacket.CAM_MOVETO_EASED == var1.serverPacket) { + var68 = var3.readUnsignedShortLE(); + var91 = npcs[var68]; + var7 = var3.readUnsignedByteAdd(); + var6 = var3.readUnsignedShortLE(); + var5 = var3.readUnsignedIntIME(); + if (var91 != null) { + var91.updateSpotAnimation(var7, var6, var5 >> 16, var5 & 65535); + } - if (ServerPacket.MINIMAP_TOGGLE == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); var1.serverPacket = null; return true; } - if (ServerPacket.REFLECTIONCHECK_FRIENDLIST == var1.serverPacket) { - return this.method381(var1); - } - if (ServerPacket.MESSAGE_PRIVATE_ECHO == var1.serverPacket) { - var52 = var3.readStringCp1252NullTerminated(); - var21 = AbstractFont.escapeBrackets(class153.method797(class292.readString(var3))); - class415.addGameMessage(6, var52, var21); - var1.serverPacket = null; - return true; - } + var68 = var3.readIntME(); + if (var68 == 65535) { + var68 = -1; + } - if (ServerPacket.SEND_PING == var1.serverPacket) { - var20 = var3.readInt(); var5 = var3.readInt(); - flags = class27.getGcDuration(); - PacketBufferNode var24 = class503.getPacketBufferNode(ClientPacket.SEND_PING_REPLY, packetWriter.isaacCipher); - var24.packetBuffer.writeByteNeg(flags); - var24.packetBuffer.writeByteAdd(GameEngine.fps); - var24.packetBuffer.writeIntLE(var20); - var24.packetBuffer.writeInt(var5); - packetWriter.addNode(var24); - var1.serverPacket = null; - return true; - } + var6 = var3.readIntIME(); + var71 = class92.getWidget(var5); + ItemComposition var90; + if (!var71.isIf3) { + if (var68 == -1) { + var71.modelType = 0; + var1.serverPacket = null; + return true; + } - if (ServerPacket.CLANSETTINGS_FULL == var1.serverPacket) { - Tile.method1161(); - var72 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var72 >= 0) { - currentClanSettings[var72] = null; + var90 = InvDefinition.ItemDefinition_get(var68).getCountObj(var6); + var71.modelType = 4; + var71.modelId = var68; + var71.modelAngleX = var90.xan2d; + var71.modelAngleY = var90.yan2d; + var71.modelZoom = var90.zoom2d * 100 / var6; + class218.invalidateWidget(var71); + } else { + var71.itemId = var68; + var71.itemQuantity = var6; + var90 = InvDefinition.ItemDefinition_get(var68).getCountObj(var6); + var71.modelAngleX = var90.xan2d; + var71.modelAngleY = var90.yan2d; + var71.modelAngleZ = var90.zan2d; + var71.modelOffsetX = var90.offsetX2d; + var71.modelOffsetY = var90.offsetY2d; + var71.modelZoom = var90.zoom2d; + if (var90.isStackable == 1) { + var71.itemQuantityMode = 1; } else { - class11.guestClanSettings = null; + var71.itemQuantityMode = 2; } - var1.serverPacket = null; - return true; - } + if (var71.modelRotation > 0) { + var71.modelZoom = var71.modelZoom * 32 / var71.modelRotation; + } else if (var71.rawWidth > 0) { + var71.modelZoom = var71.modelZoom * 32 / var71.rawWidth; + } - if (var72 >= 0) { - currentClanSettings[var72] = new ClanSettings(var3); - } else { - class11.guestClanSettings = new ClanSettings(var3); + class218.invalidateWidget(var71); } var1.serverPacket = null; return true; } - if (ServerPacket.REFLECTION_CHECK == var1.serverPacket) { - AABB.readReflectionCheck(var3, var1.serverPacketLength); - var1.serverPacket = null; - return true; - } + if (ServerPacket.PLAYER_ANIM_SPECIFIC == var1.serverPacket) { + var5 = var3.method2587(); + var6 = var3.readUnsignedByteAdd(); + var68 = var3.readIntME(); + if (var5 == 65535) { + var5 = -1; + } - if (ServerPacket.REBUILD_REGION_NORMAL == var1.serverPacket) { - class303.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } + NPC var22 = npcs[var68]; + if (var22 != null) { + if (var5 == var22.sequence && var5 != -1) { + var8 = EnumComposition.SequenceDefinition_get(var5).replyMode; + if (var8 == 1) { + var22.sequenceFrame = 0; + var22.sequenceFrameCycle = 0; + var22.sequenceDelay = var6; + var22.currentSequenceFrameIndex = 0; + } else if (var8 == 2) { + var22.currentSequenceFrameIndex = 0; + } + } else if (var5 == -1 || var22.sequence == -1 || EnumComposition.SequenceDefinition_get(var5).forcedPriority >= EnumComposition.SequenceDefinition_get(var22.sequence).forcedPriority) { + var22.sequence = var5; + var22.sequenceFrame = 0; + var22.sequenceFrameCycle = 0; + var22.sequenceDelay = var6; + var22.currentSequenceFrameIndex = 0; + var22.field1022 = var22.pathLength; + } + } - if (ServerPacket.REBUILD_REGION == var1.serverPacket) { - class303.loadRegions(true, var1.packetBuffer); var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_PRIVATE == var1.serverPacket) { - var52 = var3.readStringCp1252NullTerminated(); - var29 = (long)var3.readUnsignedShort(); - var31 = (long)var3.readMedium(); - PlayerType var25 = (PlayerType)ClientPreferences.findEnumerated(PendingSpawn.PlayerType_values(), var3.readUnsignedByte()); - long var46 = (var29 << 32) + var31; - var23 = false; + if (ServerPacket.IF_SETTEXT == var1.serverPacket) { + var51 = var3.readStringCp1252NullTerminated(); + var23 = var3.readLong(); + var25 = (long)var3.readUnsignedShort(); + var27 = (long)var3.readMedium(); + PlayerType var45 = (PlayerType)KeyHandler.findEnumerated(MidiPcmStream.PlayerType_values(), var3.readUnsignedByte()); + var32 = var27 + (var25 << 32); + boolean var31 = false; - for (var13 = 0; var13 < 100; ++var13) { - if (var46 == crossWorldMessageIds[var13]) { - var23 = true; + for (var15 = 0; var15 < 100; ++var15) { + if (crossWorldMessageIds[var15] == var32) { + var31 = true; break; } } - if (class177.friendSystem.isIgnored(new Username(var52, class457.loginType))) { - var23 = true; + if (var45.isUser && class299.friendSystem.isIgnored(new Username(var51, Language.loginType))) { + var31 = true; } - if (!var23 && field485 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var46; + if (!var31 && field486 == 0) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var32; crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var38 = AbstractFont.escapeBrackets(class153.method797(class292.readString(var3))); - byte var14; - if (var25.isPrivileged) { - var14 = 7; + var43 = AbstractFont.escapeBrackets(World.method385(DirectByteArrayCopier.readString(var3))); + if (var45.modIcon != -1) { + class416.addChatMessage(9, Tile.addImageTag(var45.modIcon) + var51, var43, class211.base37DecodeLong(var23)); } else { - var14 = 3; - } - - if (var25.modIcon != -1) { - class415.addGameMessage(var14, SecureRandomCallable.addImageTag(var25.modIcon) + var52, var38); - } else { - class415.addGameMessage(var14, var52, var38); + class416.addChatMessage(9, var51, var43, class211.base37DecodeLong(var23)); } } @@ -5369,395 +4976,585 @@ final boolean method382(PacketWriter var1) { return true; } - if (ServerPacket.NEW_PACK_215 == var1.serverPacket) { - World var51 = new World(); - var51.host = var3.readStringCp1252NullTerminated(); - var51.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var51.properties = var5; - if (var51.isDeadman()) { - var51.field677 = "beta"; - } - - class129.updateGameState(45); - var2.close(); - var2 = null; - class137.changeWorld(var51); + if (ServerPacket.IF_SETPLAYERMODEL_OBJ == var1.serverPacket) { + var68 = var3.readUnsignedByte(); + MusicPatchNode2.method1625(var68); var1.serverPacket = null; - return false; + return true; } - if (ServerPacket.UPDATE_RUNENERGY == var1.serverPacket) { - DbRowType.process(); - runEnergy = var3.readUnsignedShort(); - field524 = cycleCntr; + if (ServerPacket.CLANCHANNEL_DELTA == var1.serverPacket) { + var68 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedByte(); + var7 = var3.readUnsignedByte(); + cameraShaking[var68] = true; + cameraShakeIntensity[var68] = var5; + cameraMoveIntensity[var68] = var6; + cameraShakeSpeed[var68] = var7; + cameraShakeCycle[var68] = 0; var1.serverPacket = null; return true; } - if (ServerPacket.NPC_HEADICON_SPECIFIC == var1.serverPacket) { - var20 = var3.readIntIME(); - short var58 = (short)var3.readSignedShortLE(); - flags = var3.readUnsignedByteAdd(); - var7 = var3.readUnsignedShortLE(); - var92 = npcs[var7]; - if (var92 != null) { - var92.method593(flags, var20, var58); + if (ServerPacket.UPDATE_FRIENDLIST == var1.serverPacket) { + var68 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var68 < -70000) { + var5 += 32768; + } + + if (var68 >= 0) { + var89 = class92.getWidget(var68); + } else { + var89 = null; + } + + for (; var3.offset < var1.serverPacketLength; FriendsChat.itemContainerSetItem(var5, var7, var8 - 1, var9)) { + var7 = var3.readUShortSmart(); + var8 = var3.readUnsignedShort(); + var9 = 0; + if (var8 != 0) { + var9 = var3.readUnsignedByte(); + if (var9 == 255) { + var9 = var3.readInt(); + } + } + + if (var89 != null && var7 >= 0 && var7 < var89.itemIds.length) { + var89.itemIds[var7] = var8; + var89.field3054[var7] = var9; + } + } + + if (var89 != null) { + class218.invalidateWidget(var89); } + class113.process(); + changedItemContainers[++changedItemContainersCount - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.IF_OPENTOP == var1.serverPacket) { - var20 = var3.readUnsignedShortAddLE(); - if (var20 == 65535) { - var20 = -1; + if (ServerPacket.IF_SETOBJECT == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field404 = true; + var68 = var3.readShort(); + var5 = var3.readShort(); + var6 = UserComparator8.method674(var5 + class129.cameraPitch & 2027); + var7 = var68 + UserComparator10.cameraYaw; + var8 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + field647 = new class478(class129.cameraPitch, var6, var8, var9); + field646 = new class478(UserComparator10.cameraYaw, var7, var8, var9); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.NPC_INFO_LARGE == var1.serverPacket) { + var7 = var3.readUnsignedByteAdd(); + var6 = var3.readUnsignedIntIME(); + var5 = var3.readUnsignedShort(); + var68 = var3.readIntME(); + Player var36; + if (var68 == localPlayerIndex) { + var36 = VarbitComposition.localPlayer; + } else { + var36 = players[var68]; } - rootInterface = var20; - this.resizeRoot(false); - class92.Widget_resetModelFrames(var20); - ScriptFrame.runWidgetOnLoadListener(rootInterface); + if (var36 != null) { + var36.updateSpotAnimation(var7, var5, var6 >> 16, var6 & 65535); + } - for (var5 = 0; var5 < 100; ++var5) { - field403[var5] = true; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.ENTER_FREECAM == var1.serverPacket) { + for (var68 = 0; var68 < Varps.Varps_main.length; ++var68) { + if (Varps.Varps_main[var68] != Varps.Varps_temp[var68]) { + Varps.Varps_main[var68] = Varps.Varps_temp[var68]; + WorldMapDecoration.changeGameOptions(var68); + changedVarps[++changedVarpCount - 1 & 31] = var68; + } } var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_INV_STOP_TRANSMIT == var1.serverPacket) { - var20 = var3.readUnsignedShortLE(); - class59.method320(var20); - changedItemContainers[++changedItemContainersCount - 1 & 31] = var20 & 32767; + if (ServerPacket.field2725 == var1.serverPacket) { + Interpreter.method421(var3.readStringCp1252NullTerminated()); var1.serverPacket = null; return true; } - if (ServerPacket.FRIENDLIST_LOADED == var1.serverPacket) { - class177.friendSystem.setFriendListToLoaded(); - field516 = cycleCntr; + if (ServerPacket.AREA_SOUND == var1.serverPacket) { + var68 = var3.readIntIME(); + var5 = var3.readSignedShortAdd(); + var89 = class92.getWidget(var68); + if (var5 != var89.sequenceId || var5 == -1) { + var89.sequenceId = var5; + var89.modelFrame = 0; + var89.modelFrameCycle = 0; + class218.invalidateWidget(var89); + } + var1.serverPacket = null; return true; } - if (ServerPacket.OBJ_COUNT == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.OBJ_COUNT); + if (ServerPacket.TRIGGER_ONDIALOGABORT == var1.serverPacket) { + ObjectSound.field686 = var3.readUnsignedByte(); + class125.field1193 = var3.readUnsignedByteSub(); + + while (var3.offset < var1.serverPacketLength) { + var68 = var3.readUnsignedByte(); + ZoneOperation var70 = WorldMapSection0.method1506()[var68]; + World.processZoneOperation(var70); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.IF_SETSCROLLPOS == var1.serverPacket) { + var68 = var3.readUnsignedShortLE(); + var5 = var3.method2587(); + var7 = var3.method2587(); + var6 = var3.readIntME(); + PacketWriter.someMusicMethod(var68, var5, var6, var7); var1.serverPacket = null; return true; } - if (ServerPacket.MAP_ANIM == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.MAP_ANIM); + if (ServerPacket.MESSAGE_PRIVATE == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field402 = true; + Players.cameraMoveToX = var3.readUnsignedByte(); + class33.cameraMoveToY = var3.readUnsignedByte(); + var68 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte() * 128 + 64; + var6 = var3.readUnsignedByte() * 128 + 64; + var7 = var3.readUnsignedShort(); + field401 = var3.readBoolean(); + var8 = var3.readUnsignedByte(); + var9 = Players.cameraMoveToX * 128 + 64; + var10 = class33.cameraMoveToY * 128 + 64; + var11 = false; + var12 = false; + if (field401) { + var56 = class133.cameraY; + var59 = class18.getTileHeight(var9, var10, HealthBar.Client_plane) - var68; + } else { + var56 = class18.getTileHeight(NPCComposition.cameraX, class139.cameraZ, HealthBar.Client_plane) - class133.cameraY; + var59 = var68; + } + + field642 = new class476(NPCComposition.cameraX, class139.cameraZ, var56, var9, var10, var59, var5, var6, var7, var8); var1.serverPacket = null; return true; } - if (ServerPacket.OBJ_DEL == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.OBJ_DEL); + if (ServerPacket.OPEN_URL == var1.serverPacket) { + class299.friendSystem.readUpdate(var3, var1.serverPacketLength); + field518 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED == var1.serverPacket) { - class387.ZONE_Y = var3.readUnsignedByteSub(); - WorldMapSectionType.ZONE_X = var3.readUnsignedByteNeg(); - - while (var3.offset < var1.serverPacketLength) { - var20 = var3.readUnsignedByte(); - ZoneOperation var71 = ViewportMouse.ZoneOperationOrder()[var20]; - class27.processZoneOperation(var71); + if (ServerPacket.NPC_INFO_SMALL == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field402 = false; + Players.cameraMoveToX = var3.readUnsignedByte(); + class33.cameraMoveToY = var3.readUnsignedByte(); + VarpDefinition.cameraMoveToHeight = var3.readUnsignedShort(); + class344.cameraMoveToSpeed = var3.readUnsignedByte(); + MouseHandler.cameraMoveToAcceleration = var3.readUnsignedByte(); + if (MouseHandler.cameraMoveToAcceleration >= 100) { + NPCComposition.cameraX = Players.cameraMoveToX * 128 + 64; + class139.cameraZ = class33.cameraMoveToY * 128 + 64; + class133.cameraY = class18.getTileHeight(NPCComposition.cameraX, class139.cameraZ, HealthBar.Client_plane) - VarpDefinition.cameraMoveToHeight; } var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_IGNORELIST == var1.serverPacket) { - class177.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - GameBuild.FriendSystem_invalidateIgnoreds(); - field516 = cycleCntr; - var1.serverPacket = null; - return true; - } + if (ServerPacket.OBJ_DEL_LEGACY == var1.serverPacket) { + var68 = var3.readIntIME(); + var5 = var3.readUnsignedShortLE(); + var6 = var5 >> 10 & 31; + var7 = var5 >> 5 & 31; + var8 = var5 & 31; + var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); + Widget var34 = class92.getWidget(var68); + if (var9 != var34.color) { + var34.color = var9; + class218.invalidateWidget(var34); + } - if (ServerPacket.UPDATE_REBOOT_TIMER == var1.serverPacket) { - rebootTimer = var3.readUnsignedShortAdd() * 30; - field524 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETANGLE == var1.serverPacket) { - var20 = var3.readUnsignedShortAdd(); - var5 = var3.readInt(); - flags = var3.readUnsignedShortAdd(); - var7 = var3.readUnsignedShortAdd(); - var37 = VarbitComposition.getWidget(var5); - if (var7 != var37.modelAngleX || var20 != var37.modelAngleY || flags != var37.modelZoom) { - var37.modelAngleX = var7; - var37.modelAngleY = var20; - var37.modelZoom = flags; - class200.invalidateWidget(var37); + if (ServerPacket.MESSAGE_GAME == var1.serverPacket) { + var51 = var3.readStringCp1252NullTerminated(); + var5 = var3.method2598(); + var89 = class92.getWidget(var5); + if (!var51.equals(var89.text)) { + var89.text = var51; + class218.invalidateWidget(var89); } var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_INV_PARTIAL == var1.serverPacket) { - var20 = var3.readInt(); + if (ServerPacket.MESSAGE_FRIENDCHANNEL == var1.serverPacket) { + var68 = var3.readInt(); var5 = var3.readUnsignedShort(); - if (var20 < -70000) { + if (var68 < -70000) { var5 += 32768; } - if (var20 >= 0) { - var6 = VarbitComposition.getWidget(var20); + if (var68 >= 0) { + var89 = class92.getWidget(var68); } else { - var6 = null; + var89 = null; } - for (; var3.offset < var1.serverPacketLength; ObjectComposition.itemContainerSetItem(var5, var7, var8 - 1, var57)) { - var7 = var3.readUShortSmart(); - var8 = var3.readUnsignedShort(); - var57 = 0; - if (var8 != 0) { - var57 = var3.readUnsignedByte(); - if (var57 == 255) { - var57 = var3.readInt(); - } + if (var89 != null) { + for (var7 = 0; var7 < var89.itemIds.length; ++var7) { + var89.itemIds[var7] = 0; + var89.field3054[var7] = 0; + } + } + + SoundCache.clearItemContainer(var5); + var7 = var3.readUnsignedShort(); + + for (var8 = 0; var8 < var7; ++var8) { + var9 = var3.readUnsignedShort(); + var10 = var3.readUnsignedByteSub(); + if (var10 == 255) { + var10 = var3.method2598(); } - if (var6 != null && var7 >= 0 && var7 < var6.itemIds.length) { - var6.itemIds[var7] = var8; - var6.field3036[var7] = var57; + if (var89 != null && var8 < var89.itemIds.length) { + var89.itemIds[var8] = var9; + var89.field3054[var8] = var10; } + + FriendsChat.itemContainerSetItem(var5, var8, var9 - 1, var10); } - if (var6 != null) { - class200.invalidateWidget(var6); + if (var89 != null) { + class218.invalidateWidget(var89); } - DbRowType.process(); + class113.process(); changedItemContainers[++changedItemContainersCount - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.VARP_SMALL == var1.serverPacket) { - var72 = var3.readSignedByteSub(); - var5 = var3.readUnsignedShort(); - Varps.Varps_temp[var5] = var72; - if (Varps.Varps_main[var5] != var72) { - Varps.Varps_main[var5] = var72; + if (ServerPacket.MESSAGE_CLANCHANNEL == var1.serverPacket) { + var68 = var3.readIntME(); + var5 = var3.method2598(); + Varps.Varps_temp[var68] = var5; + if (Varps.Varps_main[var68] != var5) { + Varps.Varps_main[var68] = var5; } - MenuAction.changeGameOptions(var5); - changedVarps[++changedVarpCount - 1 & 31] = var5; + WorldMapDecoration.changeGameOptions(var68); + changedVarps[++changedVarpCount - 1 & 31] = var68; var1.serverPacket = null; return true; } - if (ServerPacket.PREFETCH_GAMEOBJECTS == var1.serverPacket) { - class27.processZoneOperation(ZoneOperation.PREFETCH_GAMEOBJECTS); + if (ServerPacket.UPDATE_IGNORELIST == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.field2607); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.MAP_ANIM); var1.serverPacket = null; return true; } if (ServerPacket.UPDATE_ZONE_FULL_FOLLOWS == var1.serverPacket) { - class387.ZONE_Y = var3.readUnsignedByte(); - WorldMapSectionType.ZONE_X = var3.readUnsignedByte(); - - for (var20 = WorldMapSectionType.ZONE_X; var20 < WorldMapSectionType.ZONE_X + 8; ++var20) { - for (var5 = class387.ZONE_Y; var5 < class387.ZONE_Y + 8; ++var5) { - if (groundItems[class36.Client_plane][var20][var5] != null) { - groundItems[class36.Client_plane][var20][var5] = null; - class344.updateItemPile(var20, var5); - } - } - } + World.processZoneOperation(ZoneOperation.OBJ_ADD); + var1.serverPacket = null; + return true; + } - for (PendingSpawn var50 = (PendingSpawn)pendingSpawns.last(); var50 != null; var50 = (PendingSpawn)pendingSpawns.previous()) { - if (var50.x >= WorldMapSectionType.ZONE_X && var50.x < WorldMapSectionType.ZONE_X + 8 && var50.y >= class387.ZONE_Y && var50.y < class387.ZONE_Y + 8 && var50.plane == class36.Client_plane) { - var50.endCycle = 0; - } + if (ServerPacket.EMPTY_PACKET == var1.serverPacket) { + var68 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var68] = new GrandExchangeOffer(); + var3.offset += 18; + } else { + --var3.offset; + grandExchangeOffers[var68] = new GrandExchangeOffer(var3, false); } + field529 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETNPCHEAD == var1.serverPacket) { - var20 = var3.readUnsignedShortLE(); - var5 = var3.readIntIME(); - var6 = VarbitComposition.getWidget(var5); - if (var6.modelType != 2 || var20 != var6.modelId) { - var6.modelType = 2; - var6.modelId = var20; - class200.invalidateWidget(var6); + if (ServerPacket.OBJ_DEL == var1.serverPacket && isCameraLocked) { + field400 = true; + field404 = false; + field402 = false; + + for (var68 = 0; var68 < 5; ++var68) { + cameraShaking[var68] = false; } var1.serverPacket = null; return true; } - if (ServerPacket.CAM_SHAKE == var1.serverPacket) { - var20 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - flags = var3.readUnsignedByte(); - var7 = var3.readUnsignedByte(); - cameraShaking[var20] = true; - cameraShakeIntensity[var20] = var5; - cameraMoveIntensity[var20] = flags; - cameraShakeSpeed[var20] = var7; - cameraShakeCycle[var20] = 0; + if (ServerPacket.IF_MOVESUB == var1.serverPacket) { + ObjectSound.field686 = var3.readUnsignedByteNeg(); + class125.field1193 = var3.readUnsignedByteSub(); + + for (var68 = ObjectSound.field686; var68 < ObjectSound.field686 + 8; ++var68) { + for (var5 = class125.field1193; var5 < class125.field1193 + 8; ++var5) { + if (groundItems[HealthBar.Client_plane][var68][var5] != null) { + groundItems[HealthBar.Client_plane][var68][var5] = null; + class135.updateItemPile(var68, var5); + } + } + } + + for (PendingSpawn var50 = (PendingSpawn)pendingSpawns.last(); var50 != null; var50 = (PendingSpawn)pendingSpawns.previous()) { + if (var50.x >= ObjectSound.field686 && var50.x < ObjectSound.field686 + 8 && var50.y >= class125.field1193 && var50.y < class125.field1193 + 8 && var50.plane == HealthBar.Client_plane) { + var50.endCycle = 0; + } + } + var1.serverPacket = null; return true; } - if (ServerPacket.NPC_INFO_SMALL == var1.serverPacket) { - class358.updateNpcs(false, var3); - var1.serverPacket = null; - return true; + if (ServerPacket.LOC_ADD_CHANGE == var1.serverPacket) { + return this.method372(var1, 2); } - if (ServerPacket.CAM_MOVETO == var1.serverPacket) { - isCameraLocked = true; - field397 = false; - field398 = false; - WorldMapIcon_1.cameraMoveToX = var3.readUnsignedByte(); - class132.cameraMoveToY = var3.readUnsignedByte(); - ModeWhere.cameraMoveToHeight = var3.readUnsignedShort(); - cameraMoveToSpeed = var3.readUnsignedByte(); - SecureRandomFuture.cameraMoveToAcceleration = var3.readUnsignedByte(); - if (SecureRandomFuture.cameraMoveToAcceleration >= 100) { - class157.cameraX = WorldMapIcon_1.cameraMoveToX * 128 + 64; - SoundSystem.cameraZ = class132.cameraMoveToY * 128 + 64; - class384.cameraY = class306.getTileHeight(class157.cameraX, SoundSystem.cameraZ, class36.Client_plane) - ModeWhere.cameraMoveToHeight; + if (ServerPacket.CAM_LOOKAT_EASED_COORD == var1.serverPacket) { + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { + destinationY = 0; } var1.serverPacket = null; return true; } - if (ServerPacket.VARP_LARGE == var1.serverPacket) { - var20 = var3.readUnsignedShortAddLE(); - var5 = var3.readIntIME(); - Varps.Varps_temp[var20] = var5; - if (Varps.Varps_main[var20] != var5) { - Varps.Varps_main[var20] = var5; + if (ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM == var1.serverPacket) { + field517 = cycleCntr; + var20 = var3.readByte(); + class160 var69 = new class160(var3); + ClanChannel var35; + if (var20 >= 0) { + var35 = currentClanChannels[var20]; + } else { + var35 = VerticalAlignment.guestClanChannel; + } + + if (var35 == null) { + this.method383(var20); + var1.serverPacket = null; + return true; + } + + if (var69.field1415 > var35.field1429) { + this.method383(var20); + var1.serverPacket = null; + return true; } - MenuAction.changeGameOptions(var20); - changedVarps[++changedVarpCount - 1 & 31] = var20; + if (var69.field1415 < var35.field1429) { + var1.serverPacket = null; + return true; + } + + var69.method844(var35); var1.serverPacket = null; return true; } - if (ServerPacket.CAM_MOVETO_EASED == var1.serverPacket) { - isCameraLocked = true; - field397 = false; - field398 = true; - WorldMapIcon_1.cameraMoveToX = var3.readUnsignedByte(); - class132.cameraMoveToY = var3.readUnsignedByte(); - var20 = var3.readUnsignedShort(); - var5 = var3.readUnsignedShort(); - field399 = var3.readBoolean(); - flags = var3.readUnsignedByte(); - var7 = WorldMapIcon_1.cameraMoveToX * 128 + 64; - var8 = class132.cameraMoveToY * 128 + 64; - boolean var9 = false; - boolean var10 = false; - if (field399) { - var57 = class384.cameraY; - var59 = class306.getTileHeight(var7, var8, class36.Client_plane) - var20; - } else { - var57 = class306.getTileHeight(class157.cameraX, SoundSystem.cameraZ, class36.Client_plane) - class384.cameraY; - var59 = var20; - } - - field638 = new class478(class157.cameraX, SoundSystem.cameraZ, var57, var7, var8, var59, var5, flags); + if (ServerPacket.field2730 == var1.serverPacket) { + World.processZoneOperation(ZoneOperation.OBJ_DEL); var1.serverPacket = null; return true; } - class317.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -1448898935 * 1217808313 : -1) + "," + (var1.field1146 != null ? var1.field1146.id * -1448898935 * 1217808313 : -1) + "," + (var1.field1148 != null ? var1.field1148.id * -1448898935 * 1217808313 : -1) + "," + var1.serverPacketLength, (Throwable)null); - WorldMapScaleHandler.logOut(); + Messages.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -908169793 * 1400406591 : -1) + "," + (var1.field1157 != null ? var1.field1157.id * -908169793 * 1400406591 : -1) + "," + (var1.field1158 != null ? var1.field1158.id * -908169793 * 1400406591 : -1) + "," + var1.serverPacketLength, (Throwable)null); + ArchiveDisk.logOut(); } catch (IOException var48) { - class93.method508(); + Renderable.method1291(); } catch (Exception var49) { - var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -1448898935 * 1217808313 : -1) + "," + (var1.field1146 != null ? var1.field1146.id * -1448898935 * 1217808313 : -1) + "," + (var1.field1148 != null ? var1.field1148.id * -1448898935 * 1217808313 : -1) + "," + var1.serverPacketLength + "," + (class136.localPlayer.pathX[0] + AbstractArchive.baseX) + "," + (class136.localPlayer.pathY[0] + class148.baseY) + ","; + var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -908169793 * 1400406591 : -1) + "," + (var1.field1157 != null ? var1.field1157.id * -908169793 * 1400406591 : -1) + "," + (var1.field1158 != null ? var1.field1158.id * -908169793 * 1400406591 : -1) + "," + var1.serverPacketLength + "," + (VarbitComposition.localPlayer.pathX[0] + UrlRequester.baseX) + "," + (VarbitComposition.localPlayer.pathY[0] + class47.baseY) + ","; - for (flags = 0; flags < var1.serverPacketLength && flags < 50; ++flags) { - var21 = var21 + var3.array[flags] + ","; + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { + var21 = var21 + var3.array[var6] + ","; } - class317.RunException_sendStackTrace(var21, var49); - WorldMapScaleHandler.logOut(); + Messages.RunException_sendStackTrace(var21, var49); + ArchiveDisk.logOut(); } return true; } } - @ObfuscatedName("kz") + @ObfuscatedName("lx") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1663377203" + descriptor = "(B)V", + garbageValue = "-90" ) @Export("menu") final void menu() { - class143.method760(); + boolean var1 = false; + + int var2; + int var5; + while (!var1) { + var1 = true; + + for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { + if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { + String var3 = menuTargets[var2]; + menuTargets[var2] = menuTargets[var2 + 1]; + menuTargets[var2 + 1] = var3; + String var4 = menuActions[var2]; + menuActions[var2] = menuActions[var2 + 1]; + menuActions[var2 + 1] = var4; + var5 = menuOpcodes[var2]; + menuOpcodes[var2] = menuOpcodes[var2 + 1]; + menuOpcodes[var2 + 1] = var5; + var5 = menuArguments1[var2]; + menuArguments1[var2] = menuArguments1[var2 + 1]; + menuArguments1[var2 + 1] = var5; + var5 = menuArguments2[var2]; + menuArguments2[var2] = menuArguments2[var2 + 1]; + menuArguments2[var2 + 1] = var5; + var5 = menuIdentifiers[var2]; + menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; + menuIdentifiers[var2 + 1] = var5; + var5 = menuItemIds[var2]; + menuItemIds[var2] = menuItemIds[var2 + 1]; + menuItemIds[var2 + 1] = var5; + boolean var6 = menuShiftClick[var2]; + menuShiftClick[var2] = menuShiftClick[var2 + 1]; + menuShiftClick[var2 + 1] = var6; + var1 = false; + } + } + } + if (clickedWidget == null) { - int var1 = MouseHandler.MouseHandler_lastButton; - int var2; + int var19 = MouseHandler.MouseHandler_lastButton; + int var7; + int var8; + int var16; + int var20; if (isMenuOpen) { - int var3; - if (var1 != 1 && (class28.mouseCam || var1 != 4)) { + int var15; + if (var19 != 1 && (ObjTypeCustomisation.mouseCam || var19 != 4)) { var2 = MouseHandler.MouseHandler_x; - var3 = MouseHandler.MouseHandler_y; - if (var2 < Canvas.menuX - 10 || var2 > Canvas.menuX + UserComparator5.menuWidth + 10 || var3 < UserComparator6.menuY - 10 || var3 > UserComparator6.menuY + ModeWhere.menuHeight + 10) { + var15 = MouseHandler.MouseHandler_y; + if (var2 < class12.menuX - 10 || var2 > class12.menuX + class316.menuWidth + 10 || var15 < class419.menuY - 10 || var15 > class419.menuY + Occluder.menuHeight + 10) { isMenuOpen = false; - Skeleton.method1209(Canvas.menuX, UserComparator6.menuY, UserComparator5.menuWidth, ModeWhere.menuHeight); + var16 = class12.menuX; + var5 = class419.menuY; + var20 = class316.menuWidth; + var7 = Occluder.menuHeight; + + for (var8 = 0; var8 < rootWidgetCount; ++var8) { + if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var16 && rootWidgetXs[var8] < var16 + var20 && rootWidgetYs[var8] + rootWidgetHeights[var8] > var5 && rootWidgetYs[var8] < var5 + var7) { + field407[var8] = true; + } + } } } - if (var1 == 1 || !class28.mouseCam && var1 == 4) { - var2 = Canvas.menuX; - var3 = UserComparator6.menuY; - int var4 = UserComparator5.menuWidth; - int var5 = MouseHandler.MouseHandler_lastPressedX; - int var6 = MouseHandler.MouseHandler_lastPressedY; - int var7 = -1; + if (var19 == 1 || !ObjTypeCustomisation.mouseCam && var19 == 4) { + var2 = class12.menuX; + var15 = class419.menuY; + var16 = class316.menuWidth; + var5 = MouseHandler.MouseHandler_lastPressedX; + var20 = MouseHandler.MouseHandler_lastPressedY; + var7 = -1; - for (int var8 = 0; var8 < menuOptionsCount; ++var8) { - int var9 = (menuOptionsCount - 1 - var8) * 15 + var3 + 31; - if (var5 > var2 && var5 < var2 + var4 && var6 > var9 - 13 && var6 < var9 + 3) { + int var9; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { + var9 = (menuOptionsCount - 1 - var8) * 15 + var15 + 31; + if (var5 > var2 && var5 < var16 + var2 && var20 > var9 - 13 && var20 < var9 + 3) { var7 = var8; } } - if (var7 != -1) { - SoundCache.method229(var7); + int var10; + int var11; + int var12; + if (var7 != -1 && var7 >= 0) { + var8 = menuArguments1[var7]; + var9 = menuArguments2[var7]; + var10 = menuOpcodes[var7]; + var11 = menuIdentifiers[var7]; + var12 = menuItemIds[var7]; + String var13 = menuActions[var7]; + String var14 = menuTargets[var7]; + IgnoreList.menuAction(var8, var9, var10, var11, var12, var13, var14, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } isMenuOpen = false; - Skeleton.method1209(Canvas.menuX, UserComparator6.menuY, UserComparator5.menuWidth, ModeWhere.menuHeight); + var8 = class12.menuX; + var9 = class419.menuY; + var10 = class316.menuWidth; + var11 = Occluder.menuHeight; + + for (var12 = 0; var12 < rootWidgetCount; ++var12) { + if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var8 + var10 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { + field407[var12] = true; + } + } } } else { - var2 = class59.method323(); - if ((var1 == 1 || !class28.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { - var1 = 2; + var2 = menuOptionsCount - 1; + if ((var19 == 1 || !ObjTypeCustomisation.mouseCam && var19 == 4) && this.shouldLeftClickOpenMenu()) { + var19 = 2; } - if ((var1 == 1 || !class28.mouseCam && var1 == 4) && menuOptionsCount > 0) { - SoundCache.method229(var2); + if ((var19 == 1 || !ObjTypeCustomisation.mouseCam && var19 == 4) && menuOptionsCount > 0 && var2 >= 0) { + var16 = menuArguments1[var2]; + var5 = menuArguments2[var2]; + var20 = menuOpcodes[var2]; + var7 = menuIdentifiers[var2]; + var8 = menuItemIds[var2]; + String var17 = menuActions[var2]; + String var18 = menuTargets[var2]; + IgnoreList.menuAction(var16, var5, var20, var7, var8, var17, var18, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } - if (var1 == 2 && menuOptionsCount > 0) { + if (var19 == 2 && menuOptionsCount > 0) { this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } } @@ -5765,109 +5562,109 @@ final void menu() { } } - @ObfuscatedName("ko") + @ObfuscatedName("le") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1989304759" + descriptor = "(B)Z", + garbageValue = "-84" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = class59.method323(); - return (leftClickOpensMenu && menuOptionsCount > 2 || class127.method704(var1)) && !menuShiftClick[var1]; + int var1 = menuOptionsCount - 1; + return (leftClickOpensMenu && menuOptionsCount > 2 || class53.method298(var1)) && !menuShiftClick[var1]; } - @ObfuscatedName("ki") + @ObfuscatedName("lu") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "14" + descriptor = "(III)V", + garbageValue = "1301595463" ) @Export("openMenu") final void openMenu(int var1, int var2) { - ClanSettings.method823(var1, var2); + class342.method1867(var1, var2); var1 -= viewportOffsetX; var2 -= viewportOffsetY; - UserComparator5.scene.menuOpen(class36.Client_plane, var1, var2, false); + class130.scene.menuOpen(HealthBar.Client_plane, var1, var2, false); isMenuOpen = true; } - @ObfuscatedName("lp") + @ObfuscatedName("li") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-657989898" + garbageValue = "571828087" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { int var2 = rootInterface; - int var3 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; - int var4 = WorldMapArchiveLoader.canvasHeight; - if (Login.loadInterface(var2)) { - class36.resizeInterface(ArchiveLoader.Widget_interfaceComponents[var2], -1, var3, var4, var1); + int var3 = class113.canvasWidth; + int var4 = class177.canvasHeight; + if (ModeWhere.loadInterface(var2)) { + PcmPlayer.resizeInterface(PacketBufferNode.Widget_interfaceComponents[var2], -1, var3, var4, var1); } } - @ObfuscatedName("lf") + @ObfuscatedName("ll") @ObfuscatedSignature( - descriptor = "(Lmt;I)V", - garbageValue = "1861901325" + descriptor = "(Lmi;I)V", + garbageValue = "649704501" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : VarbitComposition.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : class92.getWidget(var1.parentId); int var3; int var4; if (var2 == null) { - var3 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; - var4 = WorldMapArchiveLoader.canvasHeight; + var3 = class113.canvasWidth; + var4 = class177.canvasHeight; } else { var3 = var2.width; var4 = var2.height; } - FriendSystem.alignWidgetSize(var1, var3, var4, false); - class17.alignWidgetPosition(var1, var3, var4); + class369.alignWidgetSize(var1, var3, var4, false); + WorldMapArea.alignWidgetPosition(var1, var3, var4); } - @ObfuscatedName("mi") + @ObfuscatedName("mb") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-36" + descriptor = "(I)V", + garbageValue = "-332488970" ) - final void method389() { - class200.invalidateWidget(clickedWidget); - ++class130.widgetDragDuration; + final void method380() { + class218.invalidateWidget(clickedWidget); + ++class159.widgetDragDuration; int var1; int var2; - if (field393 && field391) { + if (field397 && field395) { var1 = MouseHandler.MouseHandler_x; var2 = MouseHandler.MouseHandler_y; var1 -= widgetClickX; var2 -= widgetClickY; - if (var1 < field500) { - var1 = field500; + if (var1 < field514) { + var1 = field514; } - if (var1 + clickedWidget.width > field500 + clickedWidgetParent.width) { - var1 = field500 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field514 + clickedWidgetParent.width) { + var1 = field514 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field504) { - var2 = field504; + if (var2 < field513) { + var2 = field513; } - if (var2 + clickedWidget.height > field504 + clickedWidgetParent.height) { - var2 = field504 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field513 + clickedWidgetParent.height) { + var2 = field513 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field520; - int var4 = var2 - field510; + int var3 = var1 - field515; + int var4 = var2 - field521; int var5 = clickedWidget.dragZoneSize; - if (class130.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + if (class159.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { isDraggingWidget = true; } - int var6 = var1 - field500 + clickedWidgetParent.scrollX; - int var7 = var2 - field504 + clickedWidgetParent.scrollY; + int var6 = var1 - field514 + clickedWidgetParent.scrollX; + int var7 = var2 - field513 + clickedWidgetParent.scrollY; ScriptEvent var8; if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); @@ -5875,7 +5672,7 @@ final void method389() { var8.mouseX = var6; var8.mouseY = var7; var8.args = clickedWidget.onDrag; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var8); + WorldMapSection1.runScriptEvent(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -5887,46 +5684,39 @@ final void method389() { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args = clickedWidget.onDragComplete; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var8); + WorldMapSection1.runScriptEvent(var8); } - if (draggedOnWidget != null && WorldMapEvent.method1547(clickedWidget) != null) { - PacketBufferNode var13 = class503.getPacketBufferNode(ClientPacket.IF_BUTTOND, packetWriter.isaacCipher); - var13.packetBuffer.writeShort(clickedWidget.itemId); - var13.packetBuffer.writeShortLE(clickedWidget.childIndex); - var13.packetBuffer.writeShort(draggedOnWidget.childIndex); - var13.packetBuffer.writeShortAddLE(draggedOnWidget.itemId); - var13.packetBuffer.writeIntLE(clickedWidget.id); - var13.packetBuffer.writeIntME(draggedOnWidget.id); - packetWriter.addNode(var13); + if (draggedOnWidget != null && BuddyRankComparator.method691(clickedWidget) != null) { + PacketBufferNode var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTOND, packetWriter.isaacCipher); + var10.packetBuffer.writeIntIME_(clickedWidget.id); + var10.packetBuffer.writeIntLE(draggedOnWidget.id); + var10.packetBuffer.writeShort(clickedWidget.childIndex); + var10.packetBuffer.writeShort(draggedOnWidget.itemId); + var10.packetBuffer.writeShortAdd(draggedOnWidget.childIndex); + var10.packetBuffer.writeShortAdd(clickedWidget.itemId); + packetWriter.addNode(var10); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(widgetClickX + field520, widgetClickY + field510); + this.openMenu(field515 + widgetClickX, field521 + widgetClickY); } else if (menuOptionsCount > 0) { - int var11 = widgetClickX + field520; - int var9 = widgetClickY + field510; - MenuAction var10 = WorldMapRegion.tempMenuAction; - if (var10 != null) { - class60.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.itemId, var10.action, var10.target, var11, var9); - } - - WorldMapRegion.tempMenuAction = null; + method381(widgetClickX + field515, widgetClickY + field521); } clickedWidget = null; } } else { - if (class130.widgetDragDuration > 1) { + if (class159.widgetDragDuration > 1) { if (!isDraggingWidget && menuOptionsCount > 0) { - var1 = widgetClickX + field520; - var2 = field510 + widgetClickY; - MenuAction var12 = WorldMapRegion.tempMenuAction; - if (var12 != null) { - class60.menuAction(var12.param0, var12.param1, var12.opcode, var12.identifier, var12.itemId, var12.action, var12.target, var1, var2); + var1 = widgetClickX + field515; + var2 = widgetClickY + field521; + MenuAction var9 = class9.tempMenuAction; + if (var9 != null) { + IgnoreList.menuAction(var9.param0, var9.param1, var9.opcode, var9.identifier, var9.itemId, var9.action, var9.target, var1, var2); } - WorldMapRegion.tempMenuAction = null; + class9.tempMenuAction = null; } clickedWidget = null; @@ -5935,226 +5725,233 @@ final void method389() { } } - @ObfuscatedName("ne") + @ObfuscatedName("ok") @ObfuscatedSignature( - descriptor = "(I)Lui;", - garbageValue = "466420447" + descriptor = "(S)Luc;", + garbageValue = "-775" ) @Export("username") public Username username() { - return class136.localPlayer != null ? class136.localPlayer.username : null; + return VarbitComposition.localPlayer != null ? VarbitComposition.localPlayer.username : null; + } + + @ObfuscatedName("of") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "516" + ) + void method383(int var1) { + if (param25 >= 216) { + PacketBufferNode var2 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2582, packetWriter.isaacCipher); + var2.packetBuffer.writeByte(var1); + packetWriter.addNode(var2); + } + + } + + @ObfuscatedName("ps") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1345860990" + ) + void method384(int var1) { + if (param25 >= 216) { + PacketBufferNode var2 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2572, packetWriter.isaacCipher); + var2.packetBuffer.writeByte(var1); + packetWriter.addNode(var2); + } + } @Export("init") @ObfuscatedName("init") public final void init() { - if (this.checkHost()) { - for (int var1 = 0; var1 <= 28; ++var1) { - String var2 = this.getParameter(Integer.toString(var1)); - if (var2 != null) { - int var4; - switch(var1) { - case 3: - if (var2.equalsIgnoreCase("true")) { - isMembersWorld = true; - } else { - isMembersWorld = false; - } - break; - case 4: - if (clientType == -1) { - clientType = Integer.parseInt(var2); - } - break; - case 5: - worldProperties = Integer.parseInt(var2); - break; - case 6: - var4 = Integer.parseInt(var2); - Language var14; - if (var4 >= 0 && var4 < Language.field3593.length) { - var14 = Language.field3593[var4]; - } else { - var14 = null; - } + try { + if (this.checkHost()) { + for (int var1 = 0; var1 <= 28; ++var1) { + String var2 = this.getParameter(Integer.toString(var1)); + if (var2 != null) { + switch(var1) { + case 3: + if (var2.equalsIgnoreCase("true")) { + isMembersWorld = true; + } else { + isMembersWorld = false; + } + break; + case 4: + if (clientType == -1) { + clientType = Integer.parseInt(var2); + } + break; + case 5: + worldProperties = Integer.parseInt(var2); + break; + case 6: + ClanChannelMember.clientLanguage = Language.method1976(Integer.parseInt(var2)); + break; + case 7: + int var4 = Integer.parseInt(var2); + GameBuild[] var5 = UrlRequest.method664(); + int var6 = 0; + + GameBuild var13; + while (true) { + if (var6 >= var5.length) { + var13 = null; + break; + } - Interpreter.clientLanguage = var14; - break; - case 7: - var4 = Integer.parseInt(var2); - GameBuild[] var5 = new GameBuild[]{GameBuild.WIP, GameBuild.RC, GameBuild.LIVE, GameBuild.BUILDLIVE}; - GameBuild[] var6 = var5; - int var7 = 0; + GameBuild var7 = var5[var6]; + if (var4 == var7.buildId) { + var13 = var7; + break; + } - GameBuild var13; - while (true) { - if (var7 >= var6.length) { - var13 = null; - break; + ++var6; } - GameBuild var8 = var6[var7]; - if (var4 == var8.buildId) { - var13 = var8; - break; + WorldMapLabelSize.field2323 = var13; + break; + case 8: + if (var2.equalsIgnoreCase("true")) { + } + break; + case 9: + MusicPatchPcmStream.param9 = var2; + break; + case 10: + StudioGame[] var3 = new StudioGame[]{StudioGame.stellardawn, StudioGame.game5, StudioGame.game4, StudioGame.runescape, StudioGame.game3, StudioGame.oldscape}; + WorldMapSectionType.field2417 = (StudioGame)KeyHandler.findEnumerated(var3, Integer.parseInt(var2)); + if (StudioGame.oldscape == WorldMapSectionType.field2417) { + Language.loginType = LoginType.oldscape; + } else { + Language.loginType = LoginType.field4066; + } + break; + case 11: + class510.field4133 = var2; + break; + case 12: + worldId = Integer.parseInt(var2); + case 13: + case 16: + case 18: + case 19: + case 20: + case 22: + case 23: + case 24: + default: + break; + case 14: + WorldMapSectionType.field2416 = Integer.parseInt(var2); + break; + case 15: + gameBuild = Integer.parseInt(var2); + break; + case 17: + class200.field1669 = var2; + break; + case 21: + param21 = Integer.parseInt(var2); + break; + case 25: + int var8 = var2.indexOf("."); + if (var8 == -1) { + param25 = Integer.parseInt(var2); + } else { + param25 = Integer.parseInt(var2.substring(0, var8)); + Integer.parseInt(var2.substring(var8 + 1)); } - - ++var7; - } - - ArchiveLoader.field849 = var13; - break; - case 8: - if (var2.equalsIgnoreCase("true")) { - } - break; - case 9: - class36.param9 = var2; - break; - case 10: - StudioGame[] var9 = new StudioGame[]{StudioGame.game5, StudioGame.oldscape, StudioGame.stellardawn, StudioGame.game4, StudioGame.runescape, StudioGame.game3}; - KeyHandler.field72 = (StudioGame)ClientPreferences.findEnumerated(var9, Integer.parseInt(var2)); - if (StudioGame.oldscape == KeyHandler.field72) { - class457.loginType = LoginType.oldscape; - } else { - class457.loginType = LoginType.field4055; - } - break; - case 11: - BuddyRankComparator.field1182 = var2; - break; - case 12: - worldId = Integer.parseInt(var2); - case 13: - case 16: - case 18: - case 19: - case 20: - case 22: - case 23: - case 24: - default: - break; - case 14: - PcmPlayer.field182 = Integer.parseInt(var2); - break; - case 15: - gameBuild = Integer.parseInt(var2); - break; - case 17: - class292.field2478 = var2; - break; - case 21: - param21 = Integer.parseInt(var2); - break; - case 25: - int var3 = var2.indexOf("."); - if (var3 == -1) { - param25 = Integer.parseInt(var2); - } else { - param25 = Integer.parseInt(var2.substring(0, var3)); - Integer.parseInt(var2.substring(var3 + 1)); } } } - } - class92.method504(); - VarbitComposition.worldHost = this.getCodeBase().getHost(); - class153.field1356 = new JagNetThread(); - String var10 = ArchiveLoader.field849.name; - byte var11 = 0; - if ((worldProperties & 65536) != 0) { - VarpDefinition.field1494 = "beta"; - } + Scene.Scene_isLowDetail = false; + isLowDetail = false; + class292.worldHost = this.getCodeBase().getHost(); + class308.field2819 = new JagNetThread(); + String var9 = WorldMapLabelSize.field2323.name; + byte var10 = 0; + if ((worldProperties & class510.field4125.rsOrdinal()) != 0) { + class30.field83 = "beta"; + } - try { - ObjTypeCustomisation.method923("oldschool", VarpDefinition.field1494, var10, var11, 22); - } catch (Exception var12) { - class317.RunException_sendStackTrace((String)null, var12); - } + try { + SecureRandomCallable.method462("oldschool", class30.field83, var9, var10, 22); + } catch (Exception var11) { + Messages.RunException_sendStackTrace((String)null, var11); + } - TileItem.client = this; - RuneLiteMenuEntry.client = (RSClient) (Object) this; - RunException.field4246 = clientType; - Actor.method527(); - if (Boolean.parseBoolean(System.getProperty("jagex.disableBouncyCastle"))) { - this.field655 = true; - } + class219.client = this; + RunException.field4285 = clientType; + class18.method58(); + if (Boolean.parseBoolean(System.getProperty("jagex.disableBouncyCastle"))) { + this.field661 = true; + } - if (field421 == -1) { - if (!this.method361() && !this.method362()) { - field421 = 0; - } else { - field421 = 5; + if (field424 == -1) { + if (!this.method352() && !this.method353()) { + field424 = 0; + } else { + field424 = 5; + } } - } - this.startThread(765, 503, 215, 1); + this.startThread(765, 503, 216, 1); + } + } catch (RuntimeException var12) { + throw SecureRandomFuture.method438(var12, "client.init(" + ')'); } } + @Export("finalize") + @ObfuscatedName("finalize") protected void finalize() throws Throwable { - class306.field2759.remove(this); + HorizontalAlignment.method975(this); super.finalize(); } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IB)J", - garbageValue = "-71" + descriptor = "(IIB)I", + garbageValue = "24" ) - public static long method359(int var0) { - if (var0 > 63) { - throw new class390("Cannot generate max unsigned value for more than 63 bits as this is greater than the boundaries of a java long. Value provided: %d", new Object[]{var0}); + static final int method357(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return var1; } else { - return (long)Math.pow(2.0D, (double)var0) - 1L; - } - } + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(Ldh;B)V", - garbageValue = "2" - ) - static void method383(NPC var0) { - var0.field976 = var0.definition.size; - var0.field1005 = var0.definition.rotation; - var0.walkSequence = var0.definition.walkSequence; - var0.walkBackSequence = var0.definition.walkBackSequence; - var0.walkLeftSequence = var0.definition.walkLeftSequence; - var0.walkRightSequence = var0.definition.walkRightSequence; - var0.idleSequence = var0.definition.idleSequence; - var0.turnLeftSequence = var0.definition.turnLeftSequence; - var0.turnRightSequence = var0.definition.turnRightSequence; - var0.runSequence = var0.definition.runSequence; - var0.runBackSequence = var0.definition.runBackSequence; - var0.runLeftSequence = var0.definition.runLeftSequence; - var0.runRightSequence = var0.definition.runRightSequence; - var0.crawlSequence = var0.definition.crawlSequence; - var0.crawlBackSequence = var0.definition.crawlBackSequence; - var0.crawlLeftSequence = var0.definition.crawlLeftSequence; - var0.crawlRightSequence = var0.definition.crawlRightSequence; + return (var0 & 65408) + var1; + } } - @ObfuscatedName("nu") + @ObfuscatedName("mm") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2022659709" + descriptor = "(IIB)V", + garbageValue = "18" ) - static final void method390(int var0, int var1) { - ClanChannel var2 = var0 >= 0 ? currentClanChannels[var0] : WorldMapLabelSize.guestClanChannel; - if (var2 != null && var1 >= 0 && var1 < var2.method851()) { - ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); - if (var3.rank == -1) { - String var4 = var3.username.getName(); - PacketBufferNode var5 = class503.getPacketBufferNode(ClientPacket.CLANCHANNEL_KICKUSER, packetWriter.isaacCipher); - var5.packetBuffer.writeByte(3 + class501.stringCp1252NullTerminatedByteSize(var4)); - var5.packetBuffer.writeByte(var0); - var5.packetBuffer.writeShort(var1); - var5.packetBuffer.writeStringCp1252NullTerminated(var4); - packetWriter.addNode(var5); - } + static void method381(int var0, int var1) { + MenuAction var2 = class9.tempMenuAction; + if (var2 != null) { + IgnoreList.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.itemId, var2.action, var2.target, var0, var1); } + + class9.tempMenuAction = null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ClientPacket.java b/osrs/src/main/java/ClientPacket.java index 017df71ec..108adf756 100644 --- a/osrs/src/main/java/ClientPacket.java +++ b/osrs/src/main/java/ClientPacket.java @@ -5,338 +5,730 @@ @ObfuscatedName("lw") @Implements("ClientPacket") -public class ClientPacket implements class294 { - @ObfuscatedName("aw") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket MOVE_MINIMAPCLICK = new ClientPacket(0, -1); - @ObfuscatedName("ay") - @ObfuscatedSignature(descriptor = "Llw;") @Export("OPPLAYER3") - public static final ClientPacket OPLOC5 = new ClientPacket(1, 7); - @ObfuscatedName("ar") - @ObfuscatedSignature(descriptor = "Llw;") @Export("IF_BUTTON2") - public static final ClientPacket IDLE_LOGOUT = new ClientPacket(2, 0); - @ObfuscatedName("am") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket NATIVE_PACKET3 = new ClientPacket(3, -1); - @ObfuscatedName("as") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket TELEPORT = new ClientPacket(4, 9); - @ObfuscatedName("aj") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket BUTTON_CLICK = new ClientPacket(5, 4); - @ObfuscatedName("ag") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket IF_BUTTON3 = new ClientPacket(6, 8); - @ObfuscatedName("az") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket EVENT_APPLET_FOCUS = new ClientPacket(7, 1); - @ObfuscatedName("av") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPNPCT = new ClientPacket(8, 11); - @ObfuscatedName("ap") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPOBJ2 = new ClientPacket(9, 7); - @ObfuscatedName("aq") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket CLICKWORLDMAP = new ClientPacket(10, 4); - @ObfuscatedName("at") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPNPC3 = new ClientPacket(11, 3); - @ObfuscatedName("ah") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPLOC6 = new ClientPacket(12, 6); - @ObfuscatedName("ax") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket FRIENDLIST_DEL = new ClientPacket(13, -1); - @ObfuscatedName("aa") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket CLAN_JOINCHAT_LEAVECHAT = new ClientPacket(14, -1); +public class ClientPacket implements class293 { @ObfuscatedName("au") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket IF_BUTTONT = new ClientPacket(15, 16); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + static final ClientPacket field2592; @ObfuscatedName("ae") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket EVENT_MOUSE_CLICK = new ClientPacket(16, 6); - @ObfuscatedName("ab") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("IF_BUTTON7") - public static final ClientPacket NATIVE_PACKET4 = new ClientPacket(17, 2); - @ObfuscatedName("ad") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket UPDATE_APPEARANCE = new ClientPacket(18, 13); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTON8") + public static final ClientPacket IF_BUTTON8; @ObfuscatedName("ao") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket EVENT_KEYBOARD = new ClientPacket(19, -2); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("RESUME_P_NAMEDIALOG") + public static final ClientPacket RESUME_P_NAMEDIALOG; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("NATIVE_PACKET3") + public static final ClientPacket OPLOC2; @ObfuscatedName("ac") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket EVENT_MOUSE_MOVE = new ClientPacket(20, -1); - @ObfuscatedName("ak") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket CLIENT_CHEAT = new ClientPacket(21, -1); - @ObfuscatedName("an") - @ObfuscatedSignature(descriptor = "Llw;") @Export("OPPLAYERT") - public static final ClientPacket IF_BUTTON10 = new ClientPacket(22, 8); - @ObfuscatedName("af") - @ObfuscatedSignature(descriptor = "Llw;") @Export("OPPLAYER7") - public static final ClientPacket SEND_SNAPSHOT = new ClientPacket(23, -1); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IGNORELIST_ADD") + public static final ClientPacket IGNORELIST_ADD; @ObfuscatedName("ai") - @ObfuscatedSignature(descriptor = "Llw;") @Export("WALK") - public static final ClientPacket IF_BUTTON9 = new ClientPacket(24, 8); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTON4") + public static final ClientPacket IF_BUTTON4; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTON6") + public static final ClientPacket IF_BUTTON6; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("CLICKWORLDMAP") + public static final ClientPacket CLICKWORLDMAP; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("CLOSE_MODAL") + public static final ClientPacket CLOSE_MODAL; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPOBJ2") + static final ClientPacket OPOBJ2_; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPPLAYER1") + public static final ClientPacket OPPLAYER1; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("CLIENT_CHEAT") + public static final ClientPacket CLIENT_CHEAT; @ObfuscatedName("al") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPNPC6 = new ClientPacket(25, 2); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPLOC6") + public static final ClientPacket OPLOC6; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPPLAYER5; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket IF_BUTTONT; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("LOGIN_STATISTICS") + public static final ClientPacket LOGIN_STATISTICS; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTON2") + public static final ClientPacket IF_BUTTON2; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("MAP_BUILD_COMPLETE") + public static final ClientPacket MAP_BUILD_COMPLETE; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPLOCT; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("FRIENDLIST_ADD") + public static final ClientPacket FRIENDLIST_ADD; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPPLAYER7") + public static final ClientPacket OPPLAYER7; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL") + public static final ClientPacket AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("BUG_REPORT") + public static final ClientPacket BUG_REPORT; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("EVENT_CAMERA_POSITION") + public static final ClientPacket EVENT_CAMERA_POSITION; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IDLE_LOGOUT") + public static final ClientPacket IDLE_LOGOUT; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPNPC6") + public static final ClientPacket OPNPC6; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTON1") + public static final ClientPacket IF_BUTTON1; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("TELEPORT") + public static final ClientPacket TELEPORT; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPOBJ1; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("EVENT_KEYBOARD") + public static final ClientPacket EVENT_KEYBOARD; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPNPC5") + static final ClientPacket OPNPC5_; @ObfuscatedName("bd") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket FRIEND_SETRANK = new ClientPacket(26, -1); - @ObfuscatedName("bb") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket WINDOW_STATUS = new ClientPacket(27, 5); - @ObfuscatedName("bn") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket NO_TIMEOUT = new ClientPacket(28, 0); - @ObfuscatedName("ba") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket RESUME_P_NAMEDIALOG = new ClientPacket(29, -1); - @ObfuscatedName("bf") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPNPC5 = new ClientPacket(30, 3); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPNPC1") + public static final ClientPacket OPPLAYER2; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTON10") + public static final ClientPacket IF_BUTTON10; @ObfuscatedName("bs") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPNPC1 = new ClientPacket(31, 3); - @ObfuscatedName("bp") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPNPC2") - public static final ClientPacket IF_BUTTON5 = new ClientPacket(32, 8); - @ObfuscatedName("bv") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket SEND_PING_REPLY = new ClientPacket(33, 10); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("SEND_PING_REPLY") + public static final ClientPacket EVENT_MOUSE_CLICK; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPNPC1; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPOBJU") + public static final ClientPacket OPNPC5; @ObfuscatedName("bq") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("IF_BUTTON1") - public static final ClientPacket IF_BUTTON1 = new ClientPacket(34, 8); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPLOCU") + public static final ClientPacket OPLOC5; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("MESSAGE_PUBLIC") + public static final ClientPacket MESSAGE_PUBLIC; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("MOVE_GAMECLICK") + public static final ClientPacket MOVE_GAMECLICK; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPLOC3; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("NO_TIMEOUT") + public static final ClientPacket NO_TIMEOUT; @ObfuscatedName("bo") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPOBJU = new ClientPacket(35, 15); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("MOVE_MINIMAPCLICK") + public static final ClientPacket MOVE_MINIMAPCLICK; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPOBJ3") + static final ClientPacket OPOBJ3; @ObfuscatedName("br") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPOBJT = new ClientPacket(36, 15); - @ObfuscatedName("bw") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPOBJ1 = new ClientPacket(37, 7); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("REFLECTION_CHECK_REPLY") + public static final ClientPacket REFLECTION_CHECK_REPLY; @ObfuscatedName("be") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket RESUME_P_STRINGDIALOG = new ClientPacket(38, -1); - @ObfuscatedName("bc") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPLOCU = new ClientPacket(39, 15); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPOBJ4; @ObfuscatedName("bi") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPOBJ3") - public static final ClientPacket OPPLAYER3 = new ClientPacket(40, 3); - @ObfuscatedName("bu") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket RESUME_P_OBJDIALOG = new ClientPacket(41, 2); - @ObfuscatedName("bk") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPOBJ3 = new ClientPacket(42, 7); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPOBJ5") + static final ClientPacket OPOBJ5; @ObfuscatedName("bz") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket NATIVE_PACKET = new ClientPacket(43, 7); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPOBJE; @ObfuscatedName("bx") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL = new ClientPacket(44, -1); - @ObfuscatedName("bh") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPOBJ5 = new ClientPacket(45, 7); - @ObfuscatedName("bm") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPOBJ5") - public static final ClientPacket BUG_REPORT = new ClientPacket(46, -2); - @ObfuscatedName("bl") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket IF_BUTTON6 = new ClientPacket(47, 8); - @ObfuscatedName("bt") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket FRIENDLIST_ADD = new ClientPacket(48, -1); - @ObfuscatedName("by") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPPLAYER8") - public static final ClientPacket OPNPCU = new ClientPacket(49, 11); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("EVENT_APPLET_FOCUS") + public static final ClientPacket EVENT_APPLET_FOCUS; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPPLAYER6") + public static final ClientPacket OPPLAYER6; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("RESUME_P_STRINGDIALOG") + public static final ClientPacket RESUME_P_STRINGDIALOG; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPOBJ2; @ObfuscatedName("bg") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPLOC4") - public static final ClientPacket RESUME_P_COUNTDIALOG = new ClientPacket(50, 4); - @ObfuscatedName("bj") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket CLANCHANNEL_KICKUSER = new ClientPacket(51, -1); - @ObfuscatedName("ct") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPNPC5") - public static final ClientPacket IF_BUTTON4 = new ClientPacket(52, 8); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPNPC4") + public static final ClientPacket OPNPCU; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket field2567; @ObfuscatedName("cf") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPLOC4 = new ClientPacket(53, 7); - @ObfuscatedName("cz") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket EXIT_FREECAM = new ClientPacket(54, 0); - @ObfuscatedName("cb") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPPLAYER4 = new ClientPacket(55, 3); - @ObfuscatedName("cs") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPPLAYER2 = new ClientPacket(56, 3); - @ObfuscatedName("cj") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket LOGIN_STATISTICS = new ClientPacket(57, -1); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPNPCT") + public static final ClientPacket OPNPC2; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("EXIT_FREECAM") + public static final ClientPacket EXIT_FREECAM; @ObfuscatedName("cn") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPLOC2 = new ClientPacket(58, 7); - @ObfuscatedName("cw") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPOBJ4 = new ClientPacket(59, 7); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTON7") + public static final ClientPacket IF_BUTTON7; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("CONTINUE") + public static final ClientPacket CONTINUE; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IGNORELIST_DEL") + public static final ClientPacket IGNORELIST_DEL; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPLOC2") + public static final ClientPacket OPPLAYERT; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPNPCU") + public static final ClientPacket OPNPC4; @ObfuscatedName("ce") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket IGNORELIST_DEL = new ClientPacket(60, -1); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("UPDATE_APPEARANCE") + public static final ClientPacket UPDATE_APPEARANCE; @ObfuscatedName("cq") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPPLAYER5 = new ClientPacket(61, 3); - @ObfuscatedName("cm") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket CLAN_KICKUSER = new ClientPacket(62, -1); - @ObfuscatedName("ca") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket NATIVE_PACKET2 = new ClientPacket(63, -1); - @ObfuscatedName("cx") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("IF_BUTTONT") - public static final ClientPacket OPPLAYER6 = new ClientPacket(64, 3); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPPLAYER5") + public static final ClientPacket OPPLAYER8; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("EVENT_MOUSE_SCROLl") + public static final ClientPacket EVENT_MOUSE_SCROLl; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("NATIVE_PACKET2") + public static final ClientPacket OPPLAYER3; @ObfuscatedName("co") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket DETECT_MODIFIED_CLIENT = new ClientPacket(65, 4); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPLOCE; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPNPCE; @ObfuscatedName("cu") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket MESSAGE_PRIVATE = new ClientPacket(66, -2); - @ObfuscatedName("cr") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPOBJ2") - public static final ClientPacket OPLOC1 = new ClientPacket(67, 7); - @ObfuscatedName("cd") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("CONTINUE") - public static final ClientPacket CONTINUE = new ClientPacket(68, 6); - @ObfuscatedName("cy") - @ObfuscatedSignature(descriptor = "Llw;") + @ObfuscatedSignature( + descriptor = "Llw;" + ) @Export("OPPLAYER4") - public static final ClientPacket OPPLAYERU = new ClientPacket(69, 11); - @ObfuscatedName("ck") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPPLAYER8 = new ClientPacket(70, 3); - @ObfuscatedName("cl") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPOBJ6 = new ClientPacket(71, 2); - @ObfuscatedName("cp") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPLOC3 = new ClientPacket(72, 7); + public static final ClientPacket OPPLAYER4; @ObfuscatedName("ch") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket IGNORELIST_ADD = new ClientPacket(73, -1); - @ObfuscatedName("cg") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("IF_BUTTON3") - public static final ClientPacket CAMVIEW_CLICK = new ClientPacket(74, 22); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("CLAN_JOINCHAT_LEAVECHAT") + public static final ClientPacket CLAN_JOINCHAT_LEAVECHAT; @ObfuscatedName("ci") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket REFLECTION_CHECK_REPLY = new ClientPacket(75, -1); - @ObfuscatedName("cv") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPNPC2 = new ClientPacket(76, 3); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTON3") + public static final ClientPacket IF_BUTTON3; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPPLAYERU") + public static final ClientPacket OPPLAYERU; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL") + public static final ClientPacket AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("OPOBJ6") + public static final ClientPacket OPOBJ6; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket notsure; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPLOC4; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("FRIEND_SETRANK") + public static final ClientPacket FRIEND_SETRANK; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket field2569; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTON9") + public static final ClientPacket IF_BUTTON9; @ObfuscatedName("cc") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPOBJT") - public static final ClientPacket OPPLAYER7 = new ClientPacket(77, 3); - @ObfuscatedName("dc") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPOBJ1") - public static final ClientPacket MAP_BUILD_COMPLETE = new ClientPacket(78, 0); - @ObfuscatedName("dq") - @ObfuscatedSignature(descriptor = "Llw;") @Export("OPPLAYER1") - public static final ClientPacket OPPLAYER1 = new ClientPacket(79, 3); - @ObfuscatedName("dg") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPPLAYER6") - public static final ClientPacket OPNPC4 = new ClientPacket(80, 3); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPOBJT; + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket field2576; @ObfuscatedName("dj") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket CLOSE_MODAL = new ClientPacket(81, 0); - @ObfuscatedName("dy") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket IF_BUTTON7 = new ClientPacket(82, 8); - @ObfuscatedName("dr") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPLOC5") - public static final ClientPacket IF_BUTTON2 = new ClientPacket(83, 8); - @ObfuscatedName("do") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket IF_BUTTON8 = new ClientPacket(84, 8); - @ObfuscatedName("dk") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL = new ClientPacket(85, -1); - @ObfuscatedName("dn") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket SET_CHATFILTERSETTINGS = new ClientPacket(86, 3); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPLOC1; @ObfuscatedName("di") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket SOUND_SONGEND = new ClientPacket(87, 4); - @ObfuscatedName("de") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket IF_BUTTOND = new ClientPacket(88, 16); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("SET_CHATFILTERSETTINGS") + public static final ClientPacket SET_CHATFILTERSETTINGS; + @ObfuscatedName("du") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket OPNPC3; + @ObfuscatedName("dn") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket field2581; + @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("CLANCHANNEL_KICKUSER") + public static final ClientPacket CLANCHANNEL_KICKUSER; @ObfuscatedName("dd") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket OPLOCT = new ClientPacket(89, 15); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("SEND_SNAPSHOT") + public static final ClientPacket SEND_SNAPSHOT; + @ObfuscatedName("da") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("MESSAGE_PRIVATE") + public static final ClientPacket MESSAGE_PRIVATE; + @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("FRIENDLIST_DEL") + public static final ClientPacket FRIENDLIST_DEL; + @ObfuscatedName("dy") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("CLAN_KICKUSER") + public static final ClientPacket CLAN_KICKUSER; @ObfuscatedName("dt") - @ObfuscatedSignature(descriptor = "Llw;") - @Export("OPPLAYER5") - public static final ClientPacket OPPLAYERT = new ClientPacket(90, 11); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("DETECT_MODIFIED_CLIENT") + public static final ClientPacket DETECT_MODIFIED_CLIENT; + @ObfuscatedName("dl") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTON5") + public static final ClientPacket IF_BUTTON5; + @ObfuscatedName("dk") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("WINDOW_STATUS") + public static final ClientPacket WINDOW_STATUS; @ObfuscatedName("df") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket EVENT_CAMERA_POSITION = new ClientPacket(91, 4); - @ObfuscatedName("dm") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket NATIVE_PACKET5 = new ClientPacket(92, 2); - @ObfuscatedName("du") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket MOVE_GAMECLICK = new ClientPacket(93, -1); + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("RESUME_P_OBJDIALOG") + public static final ClientPacket RESUME_P_OBJDIALOG; @ObfuscatedName("dz") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket MESSAGE_PUBLIC = new ClientPacket(94, -1); - @ObfuscatedName("dx") - @ObfuscatedSignature(descriptor = "Llw;") - public static final ClientPacket EVENT_MOUSE_SCROLl = new ClientPacket(95, 2); - @ObfuscatedName("dp") @Export("id") final int id; - @ObfuscatedName("ds") @Export("length") final int length; + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("SOUND_SONGEND") + public static final ClientPacket SOUND_SONGEND; + @ObfuscatedName("dw") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("IF_BUTTOND") + public static final ClientPacket IF_BUTTOND; + @ObfuscatedName("dv") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("RESUME_P_COUNTDIALOG") + public static final ClientPacket RESUME_P_COUNTDIALOG; + @ObfuscatedName("dr") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket field2583; + @ObfuscatedName("do") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket field2582; + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + public static final ClientPacket field2572; + @ObfuscatedName("dp") + @Export("id") + final int id; + @ObfuscatedName("dm") + @Export("length") + final int length; + static { + field2592 = new ClientPacket(0, 2); + IF_BUTTON8 = new ClientPacket(1, 8); + RESUME_P_NAMEDIALOG = new ClientPacket(2, -1); + OPLOC2 = new ClientPacket(3, 7); + IGNORELIST_ADD = new ClientPacket(4, -1); + IF_BUTTON4 = new ClientPacket(5, 8); + IF_BUTTON6 = new ClientPacket(6, 8); + CLICKWORLDMAP = new ClientPacket(7, 4); + CLOSE_MODAL = new ClientPacket(8, 0); + OPOBJ2_ = new ClientPacket(9, -1); + OPPLAYER1 = new ClientPacket(10, 3); + CLIENT_CHEAT = new ClientPacket(11, -1); + OPLOC6 = new ClientPacket(12, 15); + OPPLAYER5 = new ClientPacket(13, 3); + IF_BUTTONT = new ClientPacket(14, 16); + LOGIN_STATISTICS = new ClientPacket(15, -1); + IF_BUTTON2 = new ClientPacket(16, 8); + MAP_BUILD_COMPLETE = new ClientPacket(17, 0); + OPLOCT = new ClientPacket(18, 15); + FRIENDLIST_ADD = new ClientPacket(19, -1); + OPPLAYER7 = new ClientPacket(20, 3); + AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL = new ClientPacket(21, -1); + BUG_REPORT = new ClientPacket(22, -2); + EVENT_CAMERA_POSITION = new ClientPacket(23, 4); + IDLE_LOGOUT = new ClientPacket(24, 0); + OPNPC6 = new ClientPacket(25, 7); + IF_BUTTON1 = new ClientPacket(26, 8); + TELEPORT = new ClientPacket(27, 9); + OPOBJ1 = new ClientPacket(28, 7); + EVENT_KEYBOARD = new ClientPacket(29, -2); + OPNPC5_ = new ClientPacket(30, 2); + OPPLAYER2 = new ClientPacket(31, 3); + IF_BUTTON10 = new ClientPacket(32, 8); + EVENT_MOUSE_CLICK = new ClientPacket(33, 6); + OPNPC1 = new ClientPacket(34, 3); + OPNPC5 = new ClientPacket(35, 3); + OPLOC5 = new ClientPacket(36, 7); + MESSAGE_PUBLIC = new ClientPacket(37, -1); + MOVE_GAMECLICK = new ClientPacket(38, -1); + OPLOC3 = new ClientPacket(39, 7); + NO_TIMEOUT = new ClientPacket(40, 0); + MOVE_MINIMAPCLICK = new ClientPacket(41, -1); + OPOBJ3 = new ClientPacket(42, -1); + REFLECTION_CHECK_REPLY = new ClientPacket(43, -1); + OPOBJ4 = new ClientPacket(44, 7); + OPOBJ5 = new ClientPacket(45, 7); + OPOBJE = new ClientPacket(46, 6); + EVENT_APPLET_FOCUS = new ClientPacket(47, 1); + OPPLAYER6 = new ClientPacket(48, 3); + RESUME_P_STRINGDIALOG = new ClientPacket(49, -1); + OPOBJ2 = new ClientPacket(50, 7); + OPNPCU = new ClientPacket(51, 11); + field2567 = new ClientPacket(52, 4); + OPNPC2 = new ClientPacket(53, 3); + EXIT_FREECAM = new ClientPacket(54, 15); + IF_BUTTON7 = new ClientPacket(55, 8); + CONTINUE = new ClientPacket(56, 6); + IGNORELIST_DEL = new ClientPacket(57, -1); + OPPLAYERT = new ClientPacket(58, 11); + OPNPC4 = new ClientPacket(59, 3); + UPDATE_APPEARANCE = new ClientPacket(60, 13); + OPPLAYER8 = new ClientPacket(61, 3); + EVENT_MOUSE_SCROLl = new ClientPacket(62, 2); + OPPLAYER3 = new ClientPacket(63, 3); + OPLOCE = new ClientPacket(64, 2); + OPNPCE = new ClientPacket(65, 2); + OPPLAYER4 = new ClientPacket(66, 3); + CLAN_JOINCHAT_LEAVECHAT = new ClientPacket(67, -1); + IF_BUTTON3 = new ClientPacket(68, 8); + OPPLAYERU = new ClientPacket(69, 11); + AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL = new ClientPacket(70, -1); + OPOBJ6 = new ClientPacket(71, 7); + notsure = new ClientPacket(72, -1); + OPLOC4 = new ClientPacket(73, 7); + FRIEND_SETRANK = new ClientPacket(74, -1); + field2569 = new ClientPacket(75, 0); + IF_BUTTON9 = new ClientPacket(76, 8); + OPOBJT = new ClientPacket(77, 15); + field2576 = new ClientPacket(78, 11); + OPLOC1 = new ClientPacket(79, 7); + SET_CHATFILTERSETTINGS = new ClientPacket(80, 3); + OPNPC3 = new ClientPacket(81, 3); + field2581 = new ClientPacket(82, 10); + CLANCHANNEL_KICKUSER = new ClientPacket(83, -1); + SEND_SNAPSHOT = new ClientPacket(84, -1); + MESSAGE_PRIVATE = new ClientPacket(85, -2); + FRIENDLIST_DEL = new ClientPacket(86, -1); + CLAN_KICKUSER = new ClientPacket(87, -1); + DETECT_MODIFIED_CLIENT = new ClientPacket(88, 4); + IF_BUTTON5 = new ClientPacket(89, 8); + WINDOW_STATUS = new ClientPacket(90, 5); + RESUME_P_OBJDIALOG = new ClientPacket(91, 2); + SOUND_SONGEND = new ClientPacket(92, 4); + IF_BUTTOND = new ClientPacket(93, 16); + RESUME_P_COUNTDIALOG = new ClientPacket(94, 4); + field2583 = new ClientPacket(95, 22); + field2582 = new ClientPacket(96, 1); + field2572 = new ClientPacket(97, 1); + } ClientPacket(int var1, int var2) { this.id = var1; this.length = var2; } - @ObfuscatedName("ay") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1172052861" + garbageValue = "-712911733" ) - public static int method1569(int var0) { - return var0 >> 17 & 7; + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; + } } - @ObfuscatedName("jh") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(I)Lod;", - garbageValue = "1574453085" + descriptor = "(B)[Lui;", + garbageValue = "14" ) - @Export("getScriptEvents") - public static NodeDeque getScriptEvents() { - return Client.scriptEvents; + static SpritePixels[] method1608() { + SpritePixels[] var0 = new SpritePixels[class529.SpriteBuffer_spriteCount]; + + for (int var1 = 0; var1 < class529.SpriteBuffer_spriteCount; ++var1) { + SpritePixels var2 = var0[var1] = new SpritePixels(); + var2.width = class529.SpriteBuffer_spriteWidth; + var2.height = class420.SpriteBuffer_spriteHeight; + var2.xOffset = class529.SpriteBuffer_xOffsets[var1]; + var2.yOffset = class152.SpriteBuffer_yOffsets[var1]; + var2.subWidth = HealthBarUpdate.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = SpriteMask.SpriteBuffer_spriteHeights[var1]; + int var3 = var2.subWidth * var2.subHeight; + byte[] var4 = Coord.SpriteBuffer_pixels[var1]; + var2.pixels = new int[var3]; + + for (int var5 = 0; var5 < var3; ++var5) { + var2.pixels[var5] = DbTableType.SpriteBuffer_spritePalette[var4[var5] & 255]; + } + } + + class529.SpriteBuffer_xOffsets = null; + class152.SpriteBuffer_yOffsets = null; + HealthBarUpdate.SpriteBuffer_spriteWidths = null; + SpriteMask.SpriteBuffer_spriteHeights = null; + DbTableType.SpriteBuffer_spritePalette = null; + Coord.SpriteBuffer_pixels = null; + return var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ClientPreferences.java b/osrs/src/main/java/ClientPreferences.java index 7a81f79ec..ff00dfd6a 100644 --- a/osrs/src/main/java/ClientPreferences.java +++ b/osrs/src/main/java/ClientPreferences.java @@ -1,50 +1,51 @@ -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Map.Entry; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("da") +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Map.Entry; + +@ObfuscatedName("dp") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("displayFps") boolean displayFps; - @ObfuscatedName("av") - int field1062; - @ObfuscatedName("ap") + @ObfuscatedName("aa") + int field1061; + @ObfuscatedName("af") @Export("brightness") double brightness; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("musicVolume") int musicVolume; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("ax") - int field1063; - @ObfuscatedName("aa") + @ObfuscatedName("an") + int field1065; + @ObfuscatedName("ar") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("windowMode") int windowMode; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("parameters") final Map parameters; @@ -55,15 +56,15 @@ public class ClientPreferences { this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1063 = -1; + this.field1065 = -1; this.rememberedUsername = null; this.windowMode = 1; this.parameters = new LinkedHashMap(); - this.method547(true); + this.method540(true); } @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) ClientPreferences(Buffer var1) { this.hideUsername = false; @@ -72,7 +73,7 @@ public class ClientPreferences { this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1063 = -1; + this.field1065 = -1; this.rememberedUsername = null; this.windowMode = 1; this.parameters = new LinkedHashMap(); @@ -117,7 +118,7 @@ public class ClientPreferences { } if (var2 > 7) { - this.field1063 = var1.readUnsignedByte(); + this.field1065 = var1.readUnsignedByte(); } if (var2 > 8) { @@ -125,29 +126,29 @@ public class ClientPreferences { } if (var2 > 9) { - this.field1062 = var1.readInt(); + this.field1061 = var1.readInt(); } } else { - this.method547(true); + this.method540(true); } } else { - this.method547(true); + this.method540(true); } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "-46" + garbageValue = "-35" ) - void method547(boolean var1) { + void method540(boolean var1) { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Lty;", - garbageValue = "-819930938" + descriptor = "(I)Ltm;", + garbageValue = "1941143653" ) @Export("toBuffer") Buffer toBuffer() { @@ -171,268 +172,268 @@ Buffer toBuffer() { var1.writeByte(this.musicVolume); var1.writeByte(this.soundEffectsVolume); var1.writeByte(this.areaSoundEffectsVolume); - var1.writeByte(this.field1063); + var1.writeByte(this.field1065); var1.writeByte(this.displayFps ? 1 : 0); - var1.writeInt(this.field1062); + var1.writeInt(this.field1061); return var1; } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "100" + descriptor = "(ZI)V", + garbageValue = "932955968" ) @Export("setRoofsHidden") void setRoofsHidden(boolean var1) { this.roofsHidden = var1; - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-38" + descriptor = "(I)Z", + garbageValue = "-767626364" ) @Export("getRoofsHidden") boolean getRoofsHidden() { return this.roofsHidden; } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "441049992" + garbageValue = "-211242200" ) @Export("setIsUsernameHidden") void setIsUsernameHidden(boolean var1) { this.hideUsername = var1; - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2023726507" + garbageValue = "1977526319" ) @Export("getIsUsernameHidden") boolean getIsUsernameHidden() { return this.hideUsername; } - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1734059763" + garbageValue = "-973658923" ) @Export("getTitleMusicDisabled") void getTitleMusicDisabled(boolean var1) { this.titleMusicDisabled = var1; - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } - @ObfuscatedName("ap") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1364267368" + descriptor = "(B)Z", + garbageValue = "120" ) @Export("getTitleMusicDisabled") boolean getTitleMusicDisabled() { return this.titleMusicDisabled; } - @ObfuscatedName("aq") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "102997965" + garbageValue = "534613668" ) - void method555(boolean var1) { + void method548(boolean var1) { this.displayFps = var1; - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-728222714" + garbageValue = "-1847880996" ) - void method556() { - this.method555(!this.displayFps); + void method549() { + this.method548(!this.displayFps); } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "19" + descriptor = "(I)Z", + garbageValue = "1017741261" ) - boolean method557() { + boolean method550() { return this.displayFps; } - @ObfuscatedName("ax") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-95805097" + descriptor = "(IB)V", + garbageValue = "-11" ) - void method558(int var1) { - this.field1062 = var1; - GrandExchangeEvents.savePreferences(); + void method551(int var1) { + this.field1061 = var1; + class338.savePreferences(); } - @ObfuscatedName("aa") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-11415" + descriptor = "(I)I", + garbageValue = "1963125343" ) - int method559() { - return this.field1062; + int method552() { + return this.field1061; } - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("setBrightness") void setBrightness(double var1) { this.brightness = var1; - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } - @ObfuscatedName("ae") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)D", - garbageValue = "49" + descriptor = "(I)D", + garbageValue = "-1673173244" ) @Export("getBrightness") double getBrightness() { return this.brightness; } - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1354981451" + garbageValue = "-631794357" ) @Export("setCurrentMusicVolume") void setCurrentMusicVolume(int var1) { this.musicVolume = var1; - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-54" + garbageValue = "121" ) @Export("getCurrentMusicVolume") int getCurrentMusicVolume() { return this.musicVolume; } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-65" + garbageValue = "-18" ) @Export("setCurrentSoundEffectVolume") void setCurrentSoundEffectVolume(int var1) { this.soundEffectsVolume = var1; - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-232317840" + garbageValue = "1509566185" ) @Export("getCurrentSoundEffectsVolume") int getCurrentSoundEffectsVolume() { return this.soundEffectsVolume; } - @ObfuscatedName("ak") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-58" + descriptor = "(II)V", + garbageValue = "291571755" ) @Export("setAreaSoundEffectsVolume") void setAreaSoundEffectsVolume(int var1) { this.areaSoundEffectsVolume = var1; - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "160605956" + descriptor = "(B)I", + garbageValue = "-76" ) @Export("getAreaSoundEffectsVolume") int getAreaSoundEffectsVolume() { return this.areaSoundEffectsVolume; } - @ObfuscatedName("af") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "-1250" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1859632471" ) @Export("setUsernameToRemember") void setUsernameToRemember(String var1) { this.rememberedUsername = var1; - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } - @ObfuscatedName("ai") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "575676245" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "63" ) @Export("getUsernameToRemember") String getUsernameToRemember() { return this.rememberedUsername; } - @ObfuscatedName("al") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2070702766" + garbageValue = "1109709806" ) - void method570(int var1) { - this.field1063 = var1; - GrandExchangeEvents.savePreferences(); + void method563(int var1) { + this.field1065 = var1; + class338.savePreferences(); } - @ObfuscatedName("bd") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2072184025" + garbageValue = "-1749033471" ) - int method571() { - return this.field1063; + int method564() { + return this.field1065; } - @ObfuscatedName("bb") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1480770994" + descriptor = "(IB)V", + garbageValue = "23" ) - void method572(int var1) { + void method565(int var1) { this.windowMode = var1; - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } - @ObfuscatedName("bn") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-56" + descriptor = "(I)I", + garbageValue = "-1232255249" ) - int method573() { + int method566() { return this.windowMode; } - @ObfuscatedName("ba") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;II)V", - garbageValue = "-159104125" + garbageValue = "-867564338" ) - void method574(String var1, int var2) { - int var3 = this.method577(var1); + void method567(String var1, int var2) { + int var3 = this.method570(var1); if (this.parameters.size() >= 10 && !this.parameters.containsKey(var3)) { Iterator var4 = this.parameters.entrySet().iterator(); var4.next(); @@ -440,66 +441,149 @@ void method574(String var1, int var2) { } this.parameters.put(var3, var2); - GrandExchangeEvents.savePreferences(); + class338.savePreferences(); } - @ObfuscatedName("bf") + @ObfuscatedName("bv") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "1920162688" + garbageValue = "-1796045546" ) - boolean method575(String var1) { - int var2 = this.method577(var1); + boolean method568(String var1) { + int var2 = this.method570(var1); return this.parameters.containsKey(var2); } - @ObfuscatedName("bs") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-458294629" + descriptor = "(Ljava/lang/String;S)I", + garbageValue = "-25926" ) - int method576(String var1) { - int var2 = this.method577(var1); + int method569(String var1) { + int var2 = this.method570(var1); return !this.parameters.containsKey(var2) ? 0 : (Integer)this.parameters.get(var2); } - @ObfuscatedName("bp") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1103687979" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "-112" ) - int method577(String var1) { - return ItemLayer.method1128(var1.toLowerCase()); + int method570(String var1) { + return VarbitComposition.method1012(var1.toLowerCase()); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "([Los;II)Los;", - garbageValue = "-1385726051" + descriptor = "(II)I", + garbageValue = "-1544580715" ) - @Export("findEnumerated") - public static class372 findEnumerated(class372[] var0, int var1) { - class372[] var2 = var0; + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var1 = class384.method2022(var0); + int var2 = var1.baseVar; + int var3 = var1.startBit; + int var4 = var1.endBit; + int var5 = Varps.Varps_masks[var4 - var3]; + return Varps.Varps_main[var2] >> var3 & var5; + } - for (int var3 = 0; var3 < var2.length; ++var3) { - class372 var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { - return var4; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "31" + ) + public static final boolean method537(char var0) { + if (Character.isISOControl(var0)) { + return false; + } else if (WorldMapLabel.isAlphaNumeric(var0)) { + return true; + } else { + char[] var1 = class493.field4077; + + int var2; + char var3; + for (var2 = 0; var2 < var1.length; ++var2) { + var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } + + var1 = class493.field4078; + + for (var2 = 0; var2 < var1.length; ++var2) { + var3 = var1[var2]; + if (var0 == var3) { + return true; + } } + + return false; } + } - return null; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(Ltm;J)V" + ) + static void method539(Buffer var0, long var1) { + var1 /= 10L; + if (var1 < 0L) { + var1 = 0L; + } else if (var1 > 65535L) { + var1 = 65535L; + } + + var0.writeShort((int)var1); } @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(FB)F", - garbageValue = "-99" + descriptor = "(IB)I", + garbageValue = "-51" + ) + public static int method571(int var0) { + class137 var1 = class338.method1862(var0); + if (var1 == null) { + return 2; + } else { + return var1.method746() ? 0 : 1; + } + } + + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIIIS)V", + garbageValue = "10324" ) - public static final float method546(float var0) { - float var1 = 75.0F; - float var2 = 10000.0F; - float var3 = 750000.0F / (10000.0F - var0 * 9925.0F); - return (var3 - 75.0F) / 9925.0F; + @Export("updatePendingSpawn") + static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { + PendingSpawn var10 = null; + + for (PendingSpawn var11 = (PendingSpawn)Client.pendingSpawns.last(); var11 != null; var11 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var11.plane && var11.x == var1 && var2 == var11.y && var3 == var11.type) { + var10 = var11; + break; + } + } + + if (var10 == null) { + var10 = new PendingSpawn(); + var10.plane = var0; + var10.type = var3; + var10.x = var1; + var10.y = var2; + var10.field945 = -1; + PacketWriter.method646(var10); + Client.pendingSpawns.addFirst(var10); + } + + var10.id = var4; + var10.objectType = var5; + var10.rotation = var6; + var10.startCycle = var8; + var10.endCycle = var9; + var10.method506(var7); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Clips.java b/osrs/src/main/java/Clips.java index e7840cca5..4250f0242 100644 --- a/osrs/src/main/java/Clips.java +++ b/osrs/src/main/java/Clips.java @@ -1,73 +1,77 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("jl") +@Implements("Clips") public class Clips { - @ObfuscatedName("aw") - boolean field2241; - @ObfuscatedName("ay") - public boolean field2252; - @ObfuscatedName("ar") - int field2248; - @ObfuscatedName("aj") - public int field2253; - @ObfuscatedName("ag") + @ObfuscatedName("au") + boolean field2268; + @ObfuscatedName("ae") + public boolean field2279; + @ObfuscatedName("ao") + int field2275; + @ObfuscatedName("ai") + public int field2280; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Ljs;" ) @Export("Rasterizer3D_textureLoader") public TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("ah") - int field2246; - @ObfuscatedName("ax") - int field2250; - @ObfuscatedName("aa") - int field2242; - @ObfuscatedName("au") - int field2249; - @ObfuscatedName("ae") - int clipNegativeMidX; + @ObfuscatedName("al") + int field2272; + @ObfuscatedName("an") + int field2274; + @ObfuscatedName("ar") + int field2276; @ObfuscatedName("ab") - int field2243; - @ObfuscatedName("ad") + int field2269; + @ObfuscatedName("ag") + @Export("clipNegativeMidX") + int clipNegativeMidX; + @ObfuscatedName("am") + int field2273; + @ObfuscatedName("ax") + @Export("clipNegativeMidY") int clipNegativeMidY; - @ObfuscatedName("ao") - int field2247; - @ObfuscatedName("ac") + @ObfuscatedName("ah") + int field2271; + @ObfuscatedName("as") @Export("Rasterizer3D_rowOffsets") int[] Rasterizer3D_rowOffsets; Clips() { - this.field2241 = false; - this.field2252 = true; - this.field2248 = 0; - this.field2253 = 512; + this.field2268 = false; + this.field2279 = true; + this.field2275 = 0; + this.field2280 = 512; this.Rasterizer3D_rowOffsets = new int[1024]; } - @ObfuscatedName("aw") - void method1333() { - this.field2246 = this.field2242 / 2; - this.field2250 = this.field2249 / 2; - this.clipNegativeMidX = -this.field2246; - this.field2243 = this.field2242 - this.field2246; - this.clipNegativeMidY = -this.field2250; - this.field2247 = this.field2249 - this.field2250; + @ObfuscatedName("au") + void method1361() { + this.field2272 = this.field2276 / 2; + this.field2274 = this.field2269 / 2; + this.clipNegativeMidX = -this.field2272; + this.field2273 = this.field2276 - this.field2272; + this.clipNegativeMidY = -this.field2274; + this.field2271 = this.field2269 - this.field2274; } - @ObfuscatedName("ay") - void method1334(int var1, int var2, int var3, int var4) { - this.field2246 = var1 - var2; - this.field2250 = var3 - var4; - this.clipNegativeMidX = -this.field2246; - this.field2243 = this.field2242 - this.field2246; - this.clipNegativeMidY = -this.field2250; - this.field2247 = this.field2249 - this.field2250; + @ObfuscatedName("ae") + void method1362(int var1, int var2, int var3, int var4) { + this.field2272 = var1 - var2; + this.field2274 = var3 - var4; + this.clipNegativeMidX = -this.field2272; + this.field2273 = this.field2276 - this.field2272; + this.clipNegativeMidY = -this.field2274; + this.field2271 = this.field2269 - this.field2274; } - @ObfuscatedName("ar") - void method1335(int var1, int var2, int var3) { - this.field2241 = var1 < 0 || var1 > this.field2242 || var2 < 0 || var2 > this.field2242 || var3 < 0 || var3 > this.field2242; + @ObfuscatedName("ao") + void method1363(int var1, int var2, int var3) { + this.field2268 = var1 < 0 || var1 > this.field2276 || var2 < 0 || var2 > this.field2276 || var3 < 0 || var3 > this.field2276; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Clock.java b/osrs/src/main/java/Clock.java index 195ba0b09..17fc338b6 100644 --- a/osrs/src/main/java/Clock.java +++ b/osrs/src/main/java/Clock.java @@ -3,203 +3,55 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("ht") @Implements("Clock") public abstract class Clock { Clock() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1541664401" + garbageValue = "-1021685028" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(IIB)I", - garbageValue = "64" + garbageValue = "20" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("aq") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lmt;IIIB)V", - garbageValue = "-28" + descriptor = "(DDII)[D", + garbageValue = "1988860737" ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field3028 == null) { - throw new RuntimeException(); - } else { - var0.field3028[var1] = var2; - var0.field3029[var1] = var3; + public static double[] method930(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; + double[] var6 = new double[var5]; + int var7 = -var4; + + for (int var8 = 0; var7 <= var4; ++var8) { + double var15 = ((double)var7 - var0) / var2; + double var13 = Math.exp(-var15 * var15 / 2.0D) / Math.sqrt(6.283185307179586D); + double var11 = var13 / var2; + var6[var8] = var11; + ++var7; } + + return var6; } - @ObfuscatedName("lm") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lmt;II)I", - garbageValue = "-1427021078" + descriptor = "(I)V", + garbageValue = "-322311297" ) - static final int method920(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { - try { - int[] var2 = var0.cs1Instructions[var1]; - int var3 = 0; - int var4 = 0; - byte var5 = 0; - - while (true) { - int var6 = var2[var4++]; - int var7 = 0; - byte var8 = 0; - if (var6 == 0) { - return var3; - } - - if (var6 == 1) { - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = VarbitComposition.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!class125.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 += var10.field3036[var12]; - } - } - } - } - - if (var6 == 5) { - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { - var7 = class136.localPlayer.combatLevel; - } - - if (var6 == 9) { - for (var9 = 0; var9 < 25; ++var9) { - if (Skills.Skills_enabled[var9]) { - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = VarbitComposition.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!class125.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 = 999999999; - break; - } - } - } - } - - if (var6 == 11) { - var7 = Client.runEnergy; - } - - if (var6 == 12) { - var7 = Client.weight; - } - - if (var6 == 13) { - var9 = Varps.Varps_main[var2[var4++]]; - int var13 = var2[var4++]; - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; - } - - if (var6 == 14) { - var9 = var2[var4++]; - var7 = WallDecoration.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = (class136.localPlayer.x >> 7) + AbstractArchive.baseX; - } - - if (var6 == 19) { - var7 = (class136.localPlayer.y >> 7) + class148.baseY; - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 == 0) { - if (var5 == 0) { - var3 += var7; - } - - if (var5 == 1) { - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { - var3 /= var7; - } - - if (var5 == 3) { - var3 *= var7; - } - - var5 = 0; - } else { - var5 = var8; - } - } - } catch (Exception var14) { - return -1; - } - } else { - return -2; - } + static final void method931() { + UserComparator8.method673("You can't add yourself to your own friend list"); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/CollisionMap.java b/osrs/src/main/java/CollisionMap.java index 12fffadb3..260605987 100644 --- a/osrs/src/main/java/CollisionMap.java +++ b/osrs/src/main/java/CollisionMap.java @@ -1,27 +1,24 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("is") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("ac") - public static String field1871; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("xInset") int xInset; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("yInset") int yInset; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @Export("xSize") int xSize; - @ObfuscatedName("br") + @ObfuscatedName("bq") @Export("ySize") int ySize; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("flags") public int[][] flags; @@ -34,10 +31,10 @@ public CollisionMap(int var1, int var2) { this.clear(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1057196754" + garbageValue = "594753621" ) @Export("clear") public void clear() { @@ -53,12 +50,12 @@ public void clear() { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-1208247289" + garbageValue = "927391421" ) - public void method1093(int var1, int var2, int var3, int var4, boolean var5) { + public void method1113(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -205,10 +202,10 @@ public void method1093(int var1, int var2, int var3, int var4, boolean var5) { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "1569995917" + descriptor = "(IIIIZB)V", + garbageValue = "-55" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -232,10 +229,10 @@ public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "745791000" + descriptor = "(IIB)V", + garbageValue = "-52" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -245,10 +242,10 @@ public void setBlockedByFloor(int var1, int var2) { var10000[var2] |= 2097152; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-190738836" + garbageValue = "952149721" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -258,10 +255,10 @@ public void setBlockedByFloorDec(int var1, int var2) { var10000[var2] |= 262144; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(IIIB)V", - garbageValue = "45" + garbageValue = "-70" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -269,12 +266,12 @@ void setFlag(int var1, int var2, int var3) { var10000[var2] |= var3; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-908082263" + garbageValue = "-191479302" ) - public void method1098(int var1, int var2, int var3, int var4, boolean var5) { + public void method1118(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -421,10 +418,10 @@ public void method1098(int var1, int var2, int var3, int var4, boolean var5) { } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(IIIIIZI)V", - garbageValue = "1718462800" + garbageValue = "-320113584" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -454,10 +451,10 @@ public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5 } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-866743118" + garbageValue = "-675298247" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -465,76 +462,24 @@ void setFlagOff(int var1, int var2, int var3) { var10000[var2] &= ~var3; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" + descriptor = "(III)V", + garbageValue = "2112024151" ) - public void method1101(int var1, int var2) { + public void method1121(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; int[] var10000 = this.flags[var1]; var10000[var2] &= -262145; } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-118" - ) - public static int method1091(int var0, int var1) { - int var2; - for (var2 = 1; var1 > 1; var1 >>= 1) { - if ((var1 & 1) != 0) { - var2 = var0 * var2; - } - - var0 *= var0; - } - - if (var1 == 1) { - return var0 * var2; - } else { - return var2; - } - } - - @ObfuscatedName("ag") + @ObfuscatedName("oo") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1867192379" + descriptor = "(B)Lnf;", + garbageValue = "-74" ) - static void method1102() { - Players.Players_count = 0; - - for (int var0 = 0; var0 < 2048; ++var0) { - Players.cachedAppearanceBuffer[var0] = null; - Players.playerMovementSpeeds[var0] = MoveSpeed.WALK; - } - - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1603276123" - ) - static final void method1103(boolean var0) { - class105.method618(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = class503.getPacketBufferNode(ClientPacket.NO_TIMEOUT, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.hadNetworkError = true; - } - } - - } + static JagNetThread method1122() { + return class308.field2819; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ConcurrentMidiTask.java b/osrs/src/main/java/ConcurrentMidiTask.java index 5045fad16..7b72e5f5f 100644 --- a/osrs/src/main/java/ConcurrentMidiTask.java +++ b/osrs/src/main/java/ConcurrentMidiTask.java @@ -1,85 +1,56 @@ -import java.util.ArrayList; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pf") +import java.util.ArrayList; + +@ObfuscatedName("pe") +@Implements("ConcurrentMidiTask") public class ConcurrentMidiTask extends SongTask { - @ObfuscatedName("aw") - ArrayList field3715; + @ObfuscatedName("au") + ArrayList field3725; @ObfuscatedSignature( - descriptor = "(Lpp;Ljava/util/ArrayList;)V" + descriptor = "(Lpm;Ljava/util/ArrayList;)V" ) public ConcurrentMidiTask(SongTask var1, ArrayList var2) { super(var1); - this.field3715 = var2; - super.field3712 = "ConcurrentMidiTask"; + this.field3725 = var2; + super.field3722 = "ConcurrentMidiTask"; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "994462530" + descriptor = "(I)Z", + garbageValue = "1604030758" ) - public boolean vmethod2107(int var1) { - for (int var2 = 0; var2 < this.field3715.size(); ++var2) { - SongTask var3 = (SongTask)this.field3715.get(var2); - if (var3 == null) { - this.field3715.remove(var2); - --var2; - } else if (var3.vmethod2107(var1)) { - if (var3.method2098()) { - this.method2102(var3.method2100()); - this.field3715.clear(); + public boolean vmethod2142() { + for (int var1 = 0; var1 < this.field3725.size(); ++var1) { + SongTask var2 = (SongTask)this.field3725.get(var1); + if (var2 == null) { + this.field3725.remove(var1); + --var1; + } else if (var2.vmethod2142()) { + if (var2.method2132()) { + this.method2138(var2.method2135()); + this.field3725.clear(); return true; } - if (var3.method2101() != null) { - this.field3715.add(var3.method2101()); + if (var2.method2136() != null) { + this.field3725.add(var2.method2136()); } - super.field3711 = var3.field3711; - this.field3715.remove(var2); - --var2; + super.field3721 = var2.field3721; + this.field3725.remove(var1); + --var1; } } - if (this.field3715.isEmpty()) { + if (this.field3725.isEmpty()) { return true; } else { return false; } } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;IIS)Lpc;", - garbageValue = "-2870" - ) - public static Font method2106(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - byte[] var5 = var0.takeFile(var2, var3); - boolean var4; - if (var5 == null) { - var4 = false; - } else { - VarbitComposition.SpriteBuffer_decode(var5); - var4 = true; - } - - if (!var4) { - return null; - } else { - byte[] var6 = var1.takeFile(var2, var3); - Font var8; - if (var6 == null) { - var8 = null; - } else { - Font var7 = new Font(var6, class492.SpriteBuffer_xOffsets, class134.SpriteBuffer_yOffsets, class172.SpriteBuffer_spriteWidths, class528.SpriteBuffer_spriteHeights, class528.SpriteBuffer_spritePalette, ArchiveDiskAction.SpriteBuffer_pixels); - DbTableType.method2483(); - var8 = var7; - } - - return var8; - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Coord.java b/osrs/src/main/java/Coord.java index 2b0b32eea..3e2e09955 100644 --- a/osrs/src/main/java/Coord.java +++ b/osrs/src/main/java/Coord.java @@ -3,21 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mr") +@ObfuscatedName("mc") @Implements("Coord") public class Coord { - @ObfuscatedName("aw") + @ObfuscatedName("aa") + @Export("SpriteBuffer_pixels") + static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("au") @Export("plane") public int plane; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("x") public int x; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lmr;)V" + descriptor = "(Lmc;)V" ) public Coord(Coord var1) { this.plane = var1.plane; @@ -42,20 +45,24 @@ public Coord(int var1) { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1164685435" + garbageValue = "1852623783" ) @Export("packed") public int packed() { - return class492.method2438(this.plane, this.x, this.y); + int var2 = this.plane; + int var3 = this.x; + int var4 = this.y; + int var1 = var2 << 28 | var3 << 14 | var4; + return var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lmr;I)Z", - garbageValue = "916547059" + descriptor = "(Lmc;B)Z", + garbageValue = "-109" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -68,10 +75,10 @@ boolean equalsCoord(Coord var1) { } } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "16" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "1357161194" ) @Export("toString") String toString(String var1) { @@ -99,4 +106,4 @@ public int hashCode() { public String toString() { return this.toString(","); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DbRowType.java b/osrs/src/main/java/DbRowType.java index 0b640e9d6..c2a9af279 100644 --- a/osrs/src/main/java/DbRowType.java +++ b/osrs/src/main/java/DbRowType.java @@ -3,26 +3,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tu") +@ObfuscatedName("tc") @Implements("DbRowType") public class DbRowType extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) - static AbstractArchive field4105; - @ObfuscatedName("ay") + static AbstractArchive field4116; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("DBRowType_cache") - public static EvictingDualNodeHashTable DBRowType_cache; - @ObfuscatedName("ar") + static EvictingDualNodeHashTable DBRowType_cache; + @ObfuscatedName("ao") @Export("columnTypes") Object[][] columnTypes; - @ObfuscatedName("am") - int[][] field4106; - @ObfuscatedName("as") + @ObfuscatedName("at") + int[][] field4117; + @ObfuscatedName("ac") @Export("tableId") public int tableId; @@ -34,43 +34,43 @@ public class DbRowType extends DualNode { this.tableId = -1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "1416782085" + descriptor = "(Ltm;I)V", + garbageValue = "-1552202999" ) - void method2487(Buffer var1) { + void method2508(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method2489(var1, var2); + this.method2510(var1, var2); } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)[Ljava/lang/Object;", - garbageValue = "-444511694" + garbageValue = "1717778174" ) @Export("getColumnType") public Object[] getColumnType(int var1) { return this.columnTypes == null ? null : this.columnTypes[var1]; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-1836238392" + descriptor = "(Ltm;II)V", + garbageValue = "1262873215" ) - void method2489(Buffer var1, int var2) { + void method2510(Buffer var1, int var2) { if (var2 == 3) { int var3 = var1.readUnsignedByte(); if (this.columnTypes == null) { this.columnTypes = new Object[var3][]; - this.field4106 = new int[var3][]; + this.field4117 = new int[var3][]; } for (int var4 = var1.readUnsignedByte(); var4 != 255; var4 = var1.readUnsignedByte()) { @@ -81,261 +81,20 @@ void method2489(Buffer var1, int var2) { var6[var7] = var1.readUShortSmart(); } - this.columnTypes[var4] = class10.method30(var1, var6); - this.field4106[var4] = var6; + this.columnTypes[var4] = KeyHandler.method88(var1, var6); + this.field4117[var4] = var6; } } else if (var2 == 4) { - this.tableId = var1.method2545(); + this.tableId = var1.method2565(); } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-72" + garbageValue = "-55" ) - void method2490() { + void method2511() { } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "([FIFZFZ[FI)I", - garbageValue = "972688880" - ) - public static int method2486(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { - float var7 = 0.0F; - - for (int var8 = 0; var8 < var1 + 1; ++var8) { - var7 += Math.abs(var0[var8]); - } - - float var44 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class126.field1194; - if (var7 <= var44) { - return -1; - } else { - float[] var9 = new float[var1 + 1]; - - int var10; - for (var10 = 0; var10 < var1 + 1; ++var10) { - var9[var10] = var0[var10] * (1.0F / var7); - } - - while (Math.abs(var9[var1]) < var44) { - --var1; - } - - var10 = 0; - if (var1 == 0) { - return var10; - } else if (var1 == 1) { - var6[0] = -var9[0] / var9[1]; - boolean var11 = var3 ? var2 < var6[0] + var44 : var2 < var6[0] - var44; - boolean var12 = var5 ? var4 > var6[0] - var44 : var4 > var44 + var6[0]; - var10 = var11 && var12 ? 1 : 0; - if (var10 > 0) { - if (var3 && var6[0] < var2) { - var6[0] = var2; - } else if (var5 && var6[0] > var4) { - var6[0] = var4; - } - } - - return var10; - } else { - class453 var41 = new class453(var9, var1); - float[] var42 = new float[var1 + 1]; - - for (int var13 = 1; var13 <= var1; ++var13) { - var42[var13 - 1] = (float)var13 * var9[var13]; - } - - float[] var43 = new float[var1 + 1]; - int var14 = method2486(var42, var1 - 1, var2, false, var4, false, var43); - if (var14 == -1) { - return 0; - } else { - boolean var15 = false; - float var17 = 0.0F; - float var18 = 0.0F; - float var19 = 0.0F; - - for (int var20 = 0; var20 <= var14; ++var20) { - if (var10 > var1) { - return var10; - } - - float var16; - if (var20 == 0) { - var16 = var2; - var18 = class328.method1677(var9, var1, var2); - if (Math.abs(var18) <= var44 && var3) { - var6[var10++] = var2; - } - } else { - var16 = var19; - var18 = var17; - } - - if (var20 == var14) { - var19 = var4; - var15 = false; - } else { - var19 = var43[var20]; - } - - var17 = class328.method1677(var9, var1, var19); - if (var15) { - var15 = false; - } else if (Math.abs(var17) < var44) { - if (var20 != var14 || var5) { - var6[var10++] = var19; - var15 = true; - } - } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { - int var22 = var10++; - float var24 = var16; - float var25 = var19; - float var26 = class328.method1677(var41.field3875, var41.field3876, var16); - float var23; - if (Math.abs(var26) < class126.field1194) { - var23 = var16; - } else { - float var27 = class328.method1677(var41.field3875, var41.field3876, var19); - if (Math.abs(var27) < class126.field1194) { - var23 = var19; - } else { - float var28 = 0.0F; - float var29 = 0.0F; - float var30 = 0.0F; - float var35 = 0.0F; - boolean var36 = true; - boolean var37 = false; - - do { - var37 = false; - if (var36) { - var28 = var24; - var35 = var26; - var29 = var25 - var24; - var30 = var29; - var36 = false; - } - - if (Math.abs(var35) < Math.abs(var27)) { - var24 = var25; - var25 = var28; - var28 = var24; - var26 = var27; - var27 = var35; - var35 = var26; - } - - float var38 = class126.field1195 * Math.abs(var25) + 0.0F; - float var39 = 0.5F * (var28 - var25); - boolean var40 = Math.abs(var39) > var38 && var27 != 0.0F; - if (var40) { - if (Math.abs(var30) >= var38 && Math.abs(var26) > Math.abs(var27)) { - float var34 = var27 / var26; - float var31; - float var32; - if (var24 == var28) { - var31 = 2.0F * var39 * var34; - var32 = 1.0F - var34; - } else { - var32 = var26 / var35; - float var33 = var27 / var35; - var31 = ((var32 - var33) * 2.0F * var39 * var32 - (var25 - var24) * (var33 - 1.0F)) * var34; - var32 = (var34 - 1.0F) * (var33 - 1.0F) * (var32 - 1.0F); - } - - if ((double)var31 > 0.0D) { - var32 = -var32; - } else { - var31 = -var31; - } - - var34 = var30; - var30 = var29; - if (2.0F * var31 < var32 * 3.0F * var39 - Math.abs(var32 * var38) && var31 < Math.abs(var32 * 0.5F * var34)) { - var29 = var31 / var32; - } else { - var29 = var39; - var30 = var39; - } - } else { - var29 = var39; - var30 = var39; - } - - var24 = var25; - var26 = var27; - if (Math.abs(var29) > var38) { - var25 += var29; - } else if ((double)var39 > 0.0D) { - var25 += var38; - } else { - var25 -= var38; - } - - var27 = class328.method1677(var41.field3875, var41.field3876, var25); - if ((double)(var27 * (var35 / Math.abs(var35))) > 0.0D) { - var36 = true; - var37 = true; - } else { - var37 = true; - } - } - } while(var37); - - var23 = var25; - } - } - - var6[var22] = var23; - if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var44) { - var6[var10 - 2] = (var6[var10 - 1] + var6[var10 - 2]) * 0.5F; - --var10; - } - } - } - - return var10; - } - } - } - } - - @ObfuscatedName("mv") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1993931981" - ) - @Export("process") - static void process() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (Login.loadInterface(var1)) { - boolean var2 = true; - Widget[] var3 = ArchiveLoader.Widget_interfaceComponents[var1]; - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { - if (var3[var4] != null) { - var2 = var3[var4].isIf3; - break; - } - } - - if (!var2) { - var4 = (int)var0.key; - Widget var5 = VarbitComposition.getWidget(var4); - if (var5 != null) { - class200.invalidateWidget(var5); - } - } - } - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DbTableType.java b/osrs/src/main/java/DbTableType.java index 86025d988..26836e8c2 100644 --- a/osrs/src/main/java/DbTableType.java +++ b/osrs/src/main/java/DbTableType.java @@ -6,27 +6,24 @@ @ObfuscatedName("tk") @Implements("DbTableType") public class DbTableType extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) - static AbstractArchive field4098; - @ObfuscatedName("ay") + static AbstractArchive field4110; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("DBTableType_cache") static EvictingDualNodeHashTable DBTableType_cache; - @ObfuscatedName("kr") - @ObfuscatedSignature( - descriptor = "[Lud;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; - @ObfuscatedName("ar") + @ObfuscatedName("ap") + @Export("SpriteBuffer_spritePalette") + static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("ao") @Export("types") public int[][] types; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("defaultValues") public Object[][] defaultValues; @@ -37,28 +34,28 @@ public class DbTableType extends DualNode { DbTableType() { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "871558389" + descriptor = "(Ltm;B)V", + garbageValue = "2" ) - void method2480(Buffer var1) { + void method2503(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method2481(var1, var2); + this.method2504(var1, var2); } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;IB)V", - garbageValue = "-2" + descriptor = "(Ltm;II)V", + garbageValue = "-1215696705" ) - void method2481(Buffer var1, int var2) { + void method2504(Buffer var1, int var2) { if (var2 == 1) { int var3 = var1.readUnsignedByte(); if (this.types == null) { @@ -80,32 +77,18 @@ void method2481(Buffer var1, int var2) { this.defaultValues = new Object[this.types.length][]; } - this.defaultValues[var5] = class10.method30(var1, var7); + this.defaultValues[var5] = KeyHandler.method88(var1, var7); } } } } - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1574876599" - ) - void method2482() { - } - - @ObfuscatedName("aq") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1773514467" + garbageValue = "2013883832" ) - public static void method2483() { - class492.SpriteBuffer_xOffsets = null; - class134.SpriteBuffer_yOffsets = null; - class172.SpriteBuffer_spriteWidths = null; - class528.SpriteBuffer_spriteHeights = null; - class528.SpriteBuffer_spritePalette = null; - ArchiveDiskAction.SpriteBuffer_pixels = null; + void method2505() { } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Decimator.java b/osrs/src/main/java/Decimator.java index 21fffb909..ab3e4457a 100644 --- a/osrs/src/main/java/Decimator.java +++ b/osrs/src/main/java/Decimator.java @@ -1,23 +1,31 @@ -import java.io.File; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +import java.io.File; +import java.io.IOException; +import java.util.Date; +import java.util.Iterator; + +@ObfuscatedName("cx") @Implements("Decimator") public class Decimator { - @ObfuscatedName("ar") - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("am") + @ObfuscatedName("wm") + static Iterator field296; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("Widget_archive") + public static AbstractArchive Widget_archive; + @ObfuscatedName("at") @Export("inputRate") int inputRate; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("outputRate") int outputRate; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("table") int[][] table; @@ -50,30 +58,30 @@ public Decimator(int var1, int var2) { var11 = 0; } - int var12 = (int)Math.ceil(7.0D + var9); + int var12 = (int)Math.ceil(var9 + 7.0D); if (var12 > 14) { var12 = 14; } for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { - double var15 = 3.141592653589793D * ((double)var11 - var9); + double var15 = ((double)var11 - var9) * 3.141592653589793D; double var17 = var13; if (var15 < -1.0E-4D || var15 > 1.0E-4D) { var17 = var13 * (Math.sin(var15) / var15); } var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); - var8[var11] = (int)Math.floor(var17 * 65536.0D + 0.5D); + var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D); } } } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-1075089216" + descriptor = "([BS)[B", + garbageValue = "31853" ) @Export("resample") byte[] resample(byte[] var1) { @@ -90,7 +98,7 @@ byte[] resample(byte[] var1) { int var9; for (var9 = 0; var9 < 14; ++var9) { - var3[var4 + var9] += var7 * var8[var9]; + var3[var9 + var4] += var7 * var8[var9]; } var5 += this.outputRate; @@ -116,24 +124,24 @@ byte[] resample(byte[] var1) { return var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-396018153" + descriptor = "(IB)I", + garbageValue = "1" ) @Export("scaleRate") int scaleRate(int var1) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); } return var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1694829585" + garbageValue = "429071526" ) @Export("scalePosition") int scalePosition(int var1) { @@ -144,10 +152,40 @@ int scalePosition(int var1) { return var1; } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Ltn;", - garbageValue = "0" + descriptor = "(Ltm;Lsf;I)Lsf;", + garbageValue = "-738926216" + ) + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); + int var3; + if (var1 == null) { + var3 = WorldMapIcon_1.method1401(var2); + var1 = new IterableNodeHashTable(var3); + } + + for (var3 = 0; var3 < var2; ++var3) { + boolean var4 = var0.readUnsignedByte() == 1; + int var5 = var0.readMedium(); + Object var6; + if (var4) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); + } + + var1.put((Node)var6, (long)var5); + } + + return var1; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Ltu;", + garbageValue = "1734618555" ) @Export("getPreferencesFile") public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { @@ -161,13 +199,13 @@ public static AccessFile getPreferencesFile(String var0, String var1, boolean va } String var4 = ""; - if (UserList.cacheGamebuild == 33) { + if (JagexCache.cacheGamebuild == 33) { var4 = "_rc"; - } else if (UserList.cacheGamebuild == 34) { + } else if (JagexCache.cacheGamebuild == 34) { var4 = "_wip"; } - File var5 = new File(Bounds.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); + File var5 = new File(class36.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); AccessFile var6; if (!var2 && var5.exists()) { try { @@ -185,23 +223,229 @@ public static AccessFile getPreferencesFile(String var0, String var1, boolean va } } - @ObfuscatedName("am") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(CLot;I)I", - garbageValue = "-316987264" + descriptor = "(B)Z", + garbageValue = "88" ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { - var0 = Character.toLowerCase(var0); - var2 = (var0 << 4) + 1; - } + static final boolean method312() { + return ViewportMouse.ViewportMouse_isInViewport; + } - if (var0 == 241 && var1 == Language.Language_ES) { - var2 = 1762; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(Lnu;IB)Z", + garbageValue = "0" + ) + public static boolean method313(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + if (var2 == null) { + return false; + } else { + class137.SpriteBuffer_decode(var2); + return true; } + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(ILdh;ZB)I", + garbageValue = "-94" + ) + static int method315(int var0, Script var1, boolean var2) { + String var3; + int var4; + if (var0 == 4100) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3 + var4; + return 1; + } else { + String var9; + if (var0 == 4101) { + class137.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } else if (var0 == 4102) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3 + class60.intToString(var4, true); + return 1; + } else if (var0 == 4103) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } else { + int var6; + int var10; + if (var0 == 4104) { + var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + long var11 = 86400000L * ((long)var10 + 11745L); + Interpreter.Interpreter_calendar.setTime(new Date(var11)); + var6 = Interpreter.Interpreter_calendar.get(5); + int var17 = Interpreter.Interpreter_calendar.get(2); + int var8 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; + return 1; + } else if (var0 != 4105) { + if (var0 == 4106) { + var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == 4107) { + class137.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ItemComposition.method1054(StudioGame.compareStrings(Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1], ClanChannelMember.clientLanguage)); + return 1; + } else { + int var5; + byte[] var13; + Font var14; + if (var0 == 4108) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + SoundCache.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var13 = Player.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + return 1; + } else if (var0 == 4109) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + SoundCache.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var13 = Player.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + return 1; + } else if (var0 == 4110) { + class137.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9; + } + + return 1; + } else if (var0 == 4111) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == 4112) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3 + (char)var4; + return 1; + } else if (var0 == 4113) { + var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4114) { + var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = WorldMapLabel.isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4115) { + var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class200.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4116) { + var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class330.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4117) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } - return var2; + return 1; + } else if (var0 == 4118) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + SoundCache.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); + return 1; + } else if (var0 == 4119) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + StringBuilder var18 = new StringBuilder(var3.length()); + boolean var16 = false; + + for (var6 = 0; var6 < var3.length(); ++var6) { + char var7 = var3.charAt(var6); + if (var7 == '<') { + var16 = true; + } else if (var7 == '>') { + var16 = false; + } else if (!var16) { + var18.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var18.toString(); + return 1; + } else if (var0 == 4120) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.indexOf(var4); + return 1; + } else if (var0 == 4121) { + class137.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + return 1; + } else if (var0 == 4122) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } else if (var0 == 4123) { + class137.Interpreter_stringStackSize -= 3; + var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; + String var15 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 2]; + if (VarbitComposition.localPlayer.appearance == null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var15; + return 1; + } else { + switch(VarbitComposition.localPlayer.appearance.field2918) { + case 0: + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3; + break; + case 1: + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9; + break; + case 2: + default: + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var15; + } + + return 1; + } + } else { + return 2; + } + } + } else { + class137.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; + if (VarbitComposition.localPlayer.appearance != null && VarbitComposition.localPlayer.appearance.field2916 != 0) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9; + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3; + } + + return 1; + } + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DefaultsGroup.java b/osrs/src/main/java/DefaultsGroup.java index 326106199..38b93dfc9 100644 --- a/osrs/src/main/java/DefaultsGroup.java +++ b/osrs/src/main/java/DefaultsGroup.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rf") +@ObfuscatedName("rh") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lrf;" + descriptor = "Lrh;" ) - static final DefaultsGroup field3830; - @ObfuscatedName("ay") + static final DefaultsGroup field3844; + @ObfuscatedName("ae") @Export("group") final int group; static { - field3830 = new DefaultsGroup(3); + field3844 = new DefaultsGroup(3); } DefaultsGroup(int var1) { this.group = var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DelayFadeTask.java b/osrs/src/main/java/DelayFadeTask.java index 4dacfbd70..ef894cfce 100644 --- a/osrs/src/main/java/DelayFadeTask.java +++ b/osrs/src/main/java/DelayFadeTask.java @@ -1,127 +1,37 @@ +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("pn") +@Implements("DelayFadeTask") public class DelayFadeTask extends SongTask { - @ObfuscatedName("or") - @ObfuscatedSignature( - descriptor = "Lmt;" - ) - static Widget field3700; - @ObfuscatedName("aw") - long field3703; - @ObfuscatedName("ay") - int field3702; - @ObfuscatedName("ar") - boolean field3701; + @ObfuscatedName("ag") + static String[] field3712; + @ObfuscatedName("au") + long field3714; + @ObfuscatedName("ae") + int field3713; @ObfuscatedSignature( - descriptor = "(Lpp;I)V" + descriptor = "(Lpm;I)V" ) public DelayFadeTask(SongTask var1, int var2) { super(var1); - this.field3701 = false; - this.field3702 = var2; - super.field3712 = "DelayFadeTask"; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "994462530" - ) - public boolean vmethod2107(int var1) { - if (!this.field3701) { - this.field3703 = (long)var1; - this.field3701 = true; - } - - return (long)var1 >= this.field3703 + (long)this.field3702; + this.field3713 = var2; + super.field3722 = "DelayFadeTask"; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lsi;I)I", - garbageValue = "1563471733" + descriptor = "(I)Z", + garbageValue = "1604030758" ) - static final int method2089(LoginType var0) { - if (var0 == null) { - return 12; + public boolean vmethod2142() { + if (this.field3714 < (long)this.field3713) { + ++this.field3714; + return false; } else { - switch(var0.field4064) { - case 8: - return 20; - default: - return 12; - } + return true; } } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "1912660533" - ) - public static String method2088(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - int var5 = var1; - - int var8; - for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { - int var7 = var0[var5++] & 255; - if (var7 < 128) { - if (var7 == 0) { - var8 = 65533; - } else { - var8 = var7; - } - } else if (var7 < 192) { - var8 = 65533; - } else if (var7 < 224) { - if (var5 < var6 && (var0[var5] & 192) == 128) { - var8 = (var7 & 31) << 6 | var0[var5++] & 63; - if (var8 < 128) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 240) { - if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { - var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 < 2048) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 248) { - if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { - var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 >= 65536 && var8 <= 1114111) { - var8 = 65533; - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } - } - - return new String(var3, 0, var4); - } - - @ObfuscatedName("nq") - @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-2009704277" - ) - static void method2091(Buffer var0, int var1) { - Language.VorbisSample_setData(var0.array, var1); - WorldMapSectionType.method1482(var0, var1); - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DemotingHashTable.java b/osrs/src/main/java/DemotingHashTable.java index 5e4e62466..7889f4673 100644 --- a/osrs/src/main/java/DemotingHashTable.java +++ b/osrs/src/main/java/DemotingHashTable.java @@ -3,32 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("kg") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("capacity") int capacity; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("remaining") int remaining; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsa;" + descriptor = "Lsf;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lou;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "Lkh;" ) - class285 field2467; + class284 field2485; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); @@ -46,7 +46,7 @@ public DemotingHashTable(int var1) { this(var1, var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); @@ -77,16 +77,16 @@ public Object get(long var1) { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); this.removeWrapper(var3); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lla;)V" + descriptor = "(Llo;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -98,12 +98,12 @@ void removeWrapper(Wrapper var1) { } - @ObfuscatedName("am") - public void method1553(Object var1, long var2) { + @ObfuscatedName("at") + public void method1593(Object var1, long var2) { this.put(var1, var2, 1); } - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("put") public void put(Object var1, long var2, int var4) { this.remove(var2); @@ -119,8 +119,8 @@ public void put(Object var1, long var2, int var4) { } this.removeWrapper(var5); - if (this.field2467 != null) { - this.field2467.method1549(var5.get()); + if (this.field2485 != null) { + this.field2485.method1589(var5.get()); } } @@ -130,7 +130,7 @@ public void put(Object var1, long var2, int var4) { var6.keyDual = 0L; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { @@ -151,11 +151,11 @@ public void demote(int var1) { } - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("clear") public void clear() { this.queue.clear(); this.hashTable.clear(); this.remaining = this.capacity; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DesktopPlatformInfoProvider.java b/osrs/src/main/java/DesktopPlatformInfoProvider.java index 089a17e4d..a07796a9a 100644 --- a/osrs/src/main/java/DesktopPlatformInfoProvider.java +++ b/osrs/src/main/java/DesktopPlatformInfoProvider.java @@ -3,29 +3,29 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("su") +@ObfuscatedName("sw") @Implements("DesktopPlatformInfoProvider") -public class DesktopPlatformInfoProvider implements class476 { - @ObfuscatedName("am") - int field3915; - @ObfuscatedName("as") - int field3916; - @ObfuscatedName("aj") - int field3914; - - @ObfuscatedName("aw") +public class DesktopPlatformInfoProvider implements class475 { + @ObfuscatedName("at") + int field3928; + @ObfuscatedName("ac") + int field3926; + @ObfuscatedName("ai") + int field3927; + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lsy;", - garbageValue = "1568411855" + descriptor = "(S)Lsm;", + garbageValue = "256" ) @Export("get") public PlatformInfo get() { byte var1; - if (CollisionMap.field1871.startsWith("win")) { + if (Messages.field1146.startsWith("win")) { var1 = 1; - } else if (CollisionMap.field1871.startsWith("mac")) { + } else if (Messages.field1146.startsWith("mac")) { var1 = 2; - } else if (CollisionMap.field1871.startsWith("linux")) { + } else if (Messages.field1146.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -123,11 +123,11 @@ public PlatformInfo get() { var8 = 4; } - this.method2332(var5); + this.method2358(var5); boolean var9 = false; int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; int var11; - if (this.field3915 > 3) { + if (this.field3928 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; @@ -149,101 +149,55 @@ public PlatformInfo get() { String var25 = ""; String var26 = ""; boolean var27 = false; - return new PlatformInfo(var1, var28, var7, var8, this.field3915, this.field3916, this.field3914, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "", ""); + return new PlatformInfo(var1, var28, var7, var8, this.field3928, this.field3926, this.field3927, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "", ""); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-738858129" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "10" ) - void method2332(String var1) { + void method2358(String var1) { if (var1.startsWith("1.")) { - this.method2333(var1); + this.method2359(var1); } else { - this.method2335(var1); + this.method2360(var1); } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "234184738" + garbageValue = "133401339" ) - void method2333(String var1) { + void method2359(String var1) { String[] var2 = var1.split("\\."); try { - this.field3915 = Integer.parseInt(var2[1]); + this.field3928 = Integer.parseInt(var2[1]); var2 = var2[2].split("_"); - this.field3916 = Integer.parseInt(var2[0]); - this.field3914 = Integer.parseInt(var2[1]); + this.field3926 = Integer.parseInt(var2[0]); + this.field3927 = Integer.parseInt(var2[1]); } catch (Exception var4) { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "21471391" + garbageValue = "1874487348" ) - void method2335(String var1) { + void method2360(String var1) { String[] var2 = var1.split("\\."); try { - this.field3915 = Integer.parseInt(var2[0]); - this.field3916 = Integer.parseInt(var2[1]); - this.field3914 = Integer.parseInt(var2[2]); + this.field3928 = Integer.parseInt(var2[0]); + this.field3926 = Integer.parseInt(var2[1]); + this.field3927 = Integer.parseInt(var2[2]); } catch (Exception var4) { } } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lnd;Ljava/lang/String;Ljava/lang/String;I)[Luu;", - garbageValue = "-578185470" - ) - public static IndexedSprite[] method2334(AbstractArchive var0, String var1, String var2) { - if (!var0.isValidFileName(var1, var2)) { - return null; - } else { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - byte[] var7 = var0.takeFile(var3, var4); - boolean var6; - if (var7 == null) { - var6 = false; - } else { - VarbitComposition.SpriteBuffer_decode(var7); - var6 = true; - } - - IndexedSprite[] var5; - if (!var6) { - var5 = null; - } else { - IndexedSprite[] var8 = new IndexedSprite[class528.SpriteBuffer_spriteCount]; - - for (int var9 = 0; var9 < class528.SpriteBuffer_spriteCount; ++var9) { - IndexedSprite var10 = var8[var9] = new IndexedSprite(); - var10.width = class528.SpriteBuffer_spriteWidth; - var10.height = class528.SpriteBuffer_spriteHeight; - var10.xOffset = class492.SpriteBuffer_xOffsets[var9]; - var10.yOffset = class134.SpriteBuffer_yOffsets[var9]; - var10.subWidth = class172.SpriteBuffer_spriteWidths[var9]; - var10.subHeight = class528.SpriteBuffer_spriteHeights[var9]; - var10.palette = class528.SpriteBuffer_spritePalette; - var10.pixels = ArchiveDiskAction.SpriteBuffer_pixels[var9]; - } - - DbTableType.method2483(); - var5 = var8; - } - - return var5; - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DevicePcmPlayer.java b/osrs/src/main/java/DevicePcmPlayer.java index 0632069fa..d25121fd9 100644 --- a/osrs/src/main/java/DevicePcmPlayer.java +++ b/osrs/src/main/java/DevicePcmPlayer.java @@ -1,59 +1,60 @@ -import javax.sound.sampled.AudioFormat; -import javax.sound.sampled.AudioSystem; -import javax.sound.sampled.LineUnavailableException; -import javax.sound.sampled.SourceDataLine; -import javax.sound.sampled.DataLine.Info; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ai") +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.DataLine.Info; +import javax.sound.sampled.LineUnavailableException; +import javax.sound.sampled.SourceDataLine; + +@ObfuscatedName("aw") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("format") AudioFormat format; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("line") SourceDataLine line; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("capacity2") int capacity2; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-27916" + descriptor = "(I)V", + garbageValue = "-1766369380" ) @Export("init") - public void init() { - this.format = new AudioFormat((float)PcmPlayer.field181, 16, class373.PcmPlayer_stereo ? 2 : 1, true, false); - this.byteSamples = new byte[256 << (class373.PcmPlayer_stereo ? 2 : 1)]; + protected void init() { + this.format = new AudioFormat((float)PcmPlayer.field181, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); + this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1387208790" + descriptor = "(IB)V", + garbageValue = "-83" ) @Export("open") - public void open(int var1) throws LineUnavailableException { + protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (class373.PcmPlayer_stereo ? 2 : 1)); + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); this.line = (SourceDataLine)AudioSystem.getLine(var2); this.line.open(); this.line.start(); this.capacity2 = var1; } catch (LineUnavailableException var3) { - if (MouseRecorder.method477(var1) != 1) { - this.open(UrlRequest.method657(var1)); + if (PacketBufferNode.method1609(var1) != 1) { + this.open(WorldMapIcon_1.method1401(var1)); } else { this.line = null; throw var3; @@ -61,21 +62,21 @@ public void open(int var1) throws LineUnavailableException { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-110" + descriptor = "(I)I", + garbageValue = "-1982834691" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (class373.PcmPlayer_stereo ? 2 : 1)); + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("write") protected void write() { int var1 = 256; - if (class373.PcmPlayer_stereo) { + if (PcmPlayer.PcmPlayer_stereo) { var1 <<= 1; } @@ -92,10 +93,10 @@ protected void write() { this.line.write(this.byteSamples, 0, var1 << 1); } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1310720179" + garbageValue = "1874015336" ) @Export("close") protected void close() { @@ -106,13 +107,13 @@ protected void close() { } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1294273793" + descriptor = "(B)V", + garbageValue = "54" ) @Export("discard") protected void discard() { this.line.flush(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DevicePcmPlayerProvider.java b/osrs/src/main/java/DevicePcmPlayerProvider.java index a1949146e..2224c693b 100644 --- a/osrs/src/main/java/DevicePcmPlayerProvider.java +++ b/osrs/src/main/java/DevicePcmPlayerProvider.java @@ -3,55 +3,116 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("an") +@ObfuscatedName("aj") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements class51 { DevicePcmPlayerProvider() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lbk;", - garbageValue = "415453075" + descriptor = "(B)Lbb;", + garbageValue = "74" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } - @ObfuscatedName("ak") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1853930476" + descriptor = "(II)Lub;", + garbageValue = "13212181" ) - static final boolean method80(int var0, int var1) { - ObjectComposition var2 = class90.getObjectDefinition(var0); - if (var1 == 11) { - var1 = 10; - } + public static PrivateChatMode method74(int var0) { + PrivateChatMode[] var1 = BufferedNetSocket.method2261(); - if (var1 >= 5 && var1 <= 8) { - var1 = 4; + for (int var2 = 0; var2 < var1.length; ++var2) { + PrivateChatMode var3 = var1[var2]; + if (var0 == var3.id) { + return var3; + } } - return var2.method1021(var1); + return null; } - @ObfuscatedName("nb") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lmt;IIII)V", - garbageValue = "-1524791147" + descriptor = "(Ljava/lang/CharSequence;IZB)I", + garbageValue = "-2" ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - if (Client.minimapState < 3) { - class10.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + public static int method75(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); + + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + throw new NumberFormatException(); + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + throw new NumberFormatException(); + } + + if (var3) { + var10 = -var10; + } + + int var9 = var10 + var5 * var1; + if (var9 / var1 != var5) { + throw new NumberFormatException(); + } + + var5 = var9; + var4 = true; + } + + if (!var4) { + throw new NumberFormatException(); } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + return var5; } + } else { + throw new IllegalArgumentException("" + var1); + } + } + @ObfuscatedName("kg") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "41" + ) + static final void method76(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { + if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { + Client.field408[var4] = true; + } } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DirectByteArrayCopier.java b/osrs/src/main/java/DirectByteArrayCopier.java index e01036b9d..55cfde764 100644 --- a/osrs/src/main/java/DirectByteArrayCopier.java +++ b/osrs/src/main/java/DirectByteArrayCopier.java @@ -1,27 +1,21 @@ -import java.nio.ByteBuffer; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("np") +import java.nio.ByteBuffer; + +@ObfuscatedName("ms") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Luu;" - ) - static IndexedSprite field3096; - @ObfuscatedName("ix") - static int field3095; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-2134030911" + garbageValue = "-962589916" ) @Export("get") byte[] get() { @@ -31,10 +25,10 @@ byte[] get() { return var1; } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "-379413774" + garbageValue = "1426025249" ) @Export("set") public void set(byte[] var1) { @@ -42,4 +36,37 @@ public void set(byte[] var1) { this.directBuffer.position(0); this.directBuffer.put(var1); } -} + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ltm;I)Ljava/lang/String;", + garbageValue = "1088330937" + ) + @Export("readString") + public static String readString(Buffer var0) { + return class155.method826(var0, 32767); + } + + @ObfuscatedName("la") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "625731844" + ) + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = SoundCache.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + WorldMapSection1.runScriptEvent(var5); + } + + Client.selectedSpellItemId = var3; + Client.isSpellSelected = true; + ModeWhere.selectedSpellWidget = var0; + Client.selectedSpellChildIndex = var1; + Canvas.selectedSpellFlags = var2; + class218.invalidateWidget(var4); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/DirectWrapper.java b/osrs/src/main/java/DirectWrapper.java index 21ef7d377..15bb5f6df 100644 --- a/osrs/src/main/java/DirectWrapper.java +++ b/osrs/src/main/java/DirectWrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("li") +@ObfuscatedName("lu") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("obj") Object obj; @@ -14,15 +14,15 @@ public class DirectWrapper extends Wrapper { this.obj = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("get") Object get() { return this.obj; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("isSoft") boolean isSoft() { return false; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DualNode.java b/osrs/src/main/java/DualNode.java index ba1ee91df..dbd473d6d 100644 --- a/osrs/src/main/java/DualNode.java +++ b/osrs/src/main/java/DualNode.java @@ -3,26 +3,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sh") +@ObfuscatedName("sq") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("ew") + @ObfuscatedName("ej") @Export("keyDual") public long keyDual; - @ObfuscatedName("eo") + @ObfuscatedName("ea") @ObfuscatedSignature( - descriptor = "Lsh;" + descriptor = "Lsq;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("eb") + @ObfuscatedName("er") @ObfuscatedSignature( - descriptor = "Lsh;" + descriptor = "Lsq;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("fy") + @ObfuscatedName("ex") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { @@ -32,4 +32,4 @@ public void removeDual() { this.nextDual = null; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DualNodeDeque.java b/osrs/src/main/java/DualNodeDeque.java index 9bf3f2bd8..9abd5539d 100644 --- a/osrs/src/main/java/DualNodeDeque.java +++ b/osrs/src/main/java/DualNodeDeque.java @@ -3,12 +3,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ob") +@ObfuscatedName("os") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsh;" + descriptor = "Lsq;" ) @Export("sentinel") DualNode sentinel; @@ -19,11 +19,11 @@ public DualNodeDeque() { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lsh;)V" + descriptor = "(Lsq;)V" ) - public void method1947(DualNode var1) { + public void method1984(DualNode var1) { if (var1.nextDual != null) { var1.removeDual(); } @@ -34,11 +34,11 @@ public void method1947(DualNode var1) { var1.previousDual.nextDual = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lsh;)V" + descriptor = "(Lsq;)V" ) - public void method1948(DualNode var1) { + public void method1985(DualNode var1) { if (var1.nextDual != null) { var1.removeDual(); } @@ -49,13 +49,13 @@ public void method1948(DualNode var1) { var1.previousDual.nextDual = var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "()Lsh;" + descriptor = "()Lsq;" ) @Export("removeLast") public DualNode removeLast() { DualNode var1 = this.sentinel.previousDual; return var1 == this.sentinel ? null : var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/DynamicObject.java b/osrs/src/main/java/DynamicObject.java index 90213cb8a..77df1db7e 100644 --- a/osrs/src/main/java/DynamicObject.java +++ b/osrs/src/main/java/DynamicObject.java @@ -1,53 +1,44 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("dj") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "[Lud;" - ) - static SpritePixels[] mapMarkerSprites; - @ObfuscatedName("se") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("id") int id; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("type") int type; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("orientation") int orientation; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("plane") int plane; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("x") int x; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("y") int y; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lib;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("frame") int frame; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLit;)V" + descriptor = "(IIIIIIIZLik;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; @@ -57,7 +48,7 @@ public class DynamicObject extends Renderable { this.x = var5; this.y = var6; if (var7 != -1) { - this.sequenceDefinition = class135.SequenceDefinition_get(var7); + this.sequenceDefinition = EnumComposition.SequenceDefinition_get(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; if (this.sequenceDefinition.replyMode == 0 && var9 != null && var9 instanceof DynamicObject) { @@ -74,17 +65,17 @@ public class DynamicObject extends Renderable { this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); } else { - this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method1067()); + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method1085()); } } } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Ljo;", - garbageValue = "-983173466" + descriptor = "(I)Ljr;", + garbageValue = "798227647" ) @Export("getModel") protected final Model getModel() { @@ -96,7 +87,7 @@ protected final Model getModel() { } if (this.sequenceDefinition.isCachedModelIdSet()) { - var2 = this.sequenceDefinition.method1067(); + var2 = this.sequenceDefinition.method1085(); this.frame += var1; var1 = 0; if (this.frame >= var2) { @@ -127,7 +118,7 @@ protected final Model getModel() { this.cycleStart = Client.cycle - var1; } - ObjectComposition var12 = class90.getObjectDefinition(this.id); + ObjectComposition var12 = WorldMapElement.getObjectDefinition(this.id); if (var12.transforms != null) { var12 = var12.transform(); } @@ -149,50 +140,56 @@ protected final Model getModel() { int var6 = (var3 >> 1) + this.y; int var7 = (var3 + 1 >> 1) + this.y; int[][] var8 = Tiles.Tiles_heights[this.plane]; - int var9 = var8[var5][var7] + var8[var4][var7] + var8[var4][var6] + var8[var5][var6] >> 2; + int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2; int var10 = (this.x << 7) + (var2 << 6); int var11 = (this.y << 7) + (var3 << 6); return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1663341979" + descriptor = "(IIB)I", + garbageValue = "43" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (World.World_request == null) { - World.World_request = WorldMapLabel.urlRequester.request(new URL(class292.field2478)); - } else if (World.World_request.isDone()) { - byte[] var0 = World.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - class387.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = class387.World_worlds[var2] = new World(); - var3.id = var1.readUnsignedShort(); - var3.properties = var1.readInt(); - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); - var3.location = var1.readUnsignedByte(); - var3.population = var1.readShort(); - } + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; + } + } - VarbitComposition.sortWorlds(class387.World_worlds, 0, class387.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - World.World_request = null; - return true; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "-173700764" + ) + static int method450(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + if (var0 == 1700) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == 1701) { + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; } - } catch (Exception var4) { - var4.printStackTrace(); - World.World_request = null; - } - return false; + return 1; + } else if (var0 == 1702) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; + } else if (var0 == 1707) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.method1834() ? 1 : 0; + return 1; + } else if (var0 == 1708) { + return WorldMapDecoration.method1530(var3); + } else { + return var0 == 1709 ? class390.method2030(var3) : 2; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/EnumComposition.java b/osrs/src/main/java/EnumComposition.java index df1c4dc58..bcf02ba58 100644 --- a/osrs/src/main/java/EnumComposition.java +++ b/osrs/src/main/java/EnumComposition.java @@ -3,43 +3,43 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("hu") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("EnumDefinition_archive") public static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("inputType") public char inputType; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("outputType") public char outputType; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("defaultInt") public int defaultInt; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("outputCount") public int outputCount; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("keys") public int[] keys; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("intVals") public int[] intVals; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("strVals") public String[] strVals; @@ -52,10 +52,10 @@ public class EnumComposition extends DualNode { this.outputCount = 0; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "101" + descriptor = "(Ltm;I)V", + garbageValue = "-388021324" ) @Export("decode") void decode(Buffer var1) { @@ -69,10 +69,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;IB)V", - garbageValue = "0" + descriptor = "(Ltm;II)V", + garbageValue = "-227336783" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -109,13 +109,36 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1514549348" + descriptor = "(B)I", + garbageValue = "55" ) @Export("size") public int size() { return this.outputCount; } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(II)Lib;", + garbageValue = "2100193586" + ) + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = UserComparator2.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/EvictingDualNodeHashTable.java b/osrs/src/main/java/EvictingDualNodeHashTable.java index 25db11b8e..bc56c154a 100644 --- a/osrs/src/main/java/EvictingDualNodeHashTable.java +++ b/osrs/src/main/java/EvictingDualNodeHashTable.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("le") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsh;" + descriptor = "Lsq;" ) @Export("dualNode") DualNode dualNode; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("capacity") int capacity; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsa;" + descriptor = "Lsf;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lou;" ) @Export("deque") IterableDualNodeQueue deque; @@ -44,9 +44,9 @@ public EvictingDualNodeHashTable(int var1) { this.hashTable = new IterableNodeHashTable(var2); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(J)Lsh;" + descriptor = "(J)Lsq;" ) @Export("get") public DualNode get(long var1) { @@ -58,7 +58,7 @@ public DualNode get(long var1) { return var3; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); @@ -70,9 +70,9 @@ public void remove(long var1) { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lsh;J)V" + descriptor = "(Lsq;J)V" ) @Export("put") public void put(DualNode var1, long var2) { @@ -93,7 +93,7 @@ public void put(DualNode var1, long var2) { this.deque.add(var1); } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("clear") public void clear() { this.deque.clear(); @@ -101,4 +101,4 @@ public void clear() { this.dualNode = new DualNode(); this.remainingCapacity = this.capacity; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FaceNormal.java b/osrs/src/main/java/FaceNormal.java index cd632a1c0..d3bfed12c 100644 --- a/osrs/src/main/java/FaceNormal.java +++ b/osrs/src/main/java/FaceNormal.java @@ -1,144 +1,20 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("iq") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("x") int x; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("y") int y; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("z") int z; FaceNormal() { } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(IIIIIZI)Lud;", - garbageValue = "1537290681" - ) - @Export("getItemSprite") - public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { - var4 = 0; - } else if (var4 == 2 && var1 != 1) { - var4 = 1; - } - - long var6 = ((long)var3 << 42) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40); - SpritePixels var8; - if (!var5) { - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } - } - - ItemComposition var9 = class125.ItemDefinition_get(var0); - if (var1 > 1 && var9.countobj != null) { - int var10 = -1; - - for (int var11 = 0; var11 < 10; ++var11) { - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { - var9 = class125.ItemDefinition_get(var10); - } - } - - Model var20 = var9.getModel(1); - if (var20 == null) { - return null; - } else { - SpritePixels var21 = null; - if (var9.noteTemplate != -1) { - var21 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if (var21 == null) { - return null; - } - } else if (var9.notedId != -1) { - var21 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if (var21 == null) { - return null; - } - } else if (var9.placeholderTemplate != -1) { - var21 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if (var21 == null) { - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; - int var13 = Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_height; - float[] var15 = Rasterizer2D.field4171; - int[] var16 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var16); - var8 = new SpritePixels(36, 32); - Rasterizer3D.method1175(var8.pixels, 36, 32, (float[])null); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.method1176(); - Rasterizer3D.method1179(16, 16); - Rasterizer3D.clips.field2252 = false; - if (var9.placeholderTemplate != -1) { - var21.drawTransBgAt(0, 0); - } - - int var17 = var9.zoom2d; - if (var5) { - var17 = (int)((double)var17 * 1.5D); - } else if (var2 == 2) { - var17 = (int)((double)var17 * 1.04D); - } - - int var18 = var17 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; - int var19 = var17 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; - var20.calculateBoundsCylinder(); - var20.method1309(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var20.height / 2 + var18 + var9.offsetY2d, var19 + var9.offsetY2d); - if (var9.notedId != -1) { - var21.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { - var8.outline(1); - } - - if (var2 >= 2) { - var8.outline(16777215); - } - - if (var3 != 0) { - var8.shadow(var3); - } - - Rasterizer3D.method1175(var8.pixels, 36, 32, (float[])null); - if (var9.noteTemplate != -1) { - var21.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - FloorDecoration.ItemDefinition_fontPlain11.draw(class177.method909(var1), 0, 9, 16776960, 1); - } - - if (!var5) { - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer3D.method1175(var12, var13, var14, var15); - Rasterizer2D.Rasterizer2D_setClipArray(var16); - Rasterizer3D.method1176(); - Rasterizer3D.clips.field2252 = true; - return var8; - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FadeInTask.java b/osrs/src/main/java/FadeInTask.java index 88b20fab9..01c622a4e 100644 --- a/osrs/src/main/java/FadeInTask.java +++ b/osrs/src/main/java/FadeInTask.java @@ -1,67 +1,104 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pb") +@ObfuscatedName("pt") +@Implements("FadeInTask") public class FadeInTask extends SongTask { - @ObfuscatedName("ue") - static int field3706; - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lmj;" + descriptor = "Lmu;" ) - MusicSong field3708; - @ObfuscatedName("ay") - int field3707; + MusicSong field3719; + @ObfuscatedName("ae") + int field3718; @ObfuscatedSignature( - descriptor = "(Lpp;IZI)V" + descriptor = "(Lpm;IZI)V" ) public FadeInTask(SongTask var1, int var2, boolean var3, int var4) { super(var1); - this.field3708 = null; - this.field3707 = 0; - super.field3712 = "FadeInTask"; + this.field3719 = null; + this.field3718 = 0; + super.field3722 = "FadeInTask"; if (var2 >= 0) { - if (var3 && var2 < class306.field2758.size()) { - this.field3708 = (MusicSong)class306.field2758.get(var2); - } else if (!var3 && var2 < class306.musicSongs.size()) { - this.field3708 = (MusicSong)class306.musicSongs.get(var2); + if (var3 && var2 < class305.field2774.size()) { + this.field3719 = (MusicSong)class305.field2774.get(var2); + } else if (!var3 && var2 < class305.musicSongs.size()) { + this.field3719 = (MusicSong)class305.musicSongs.get(var2); } - this.field3707 = var4; + this.field3718 = var4; } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "994462530" + descriptor = "(I)Z", + garbageValue = "1604030758" ) - public boolean vmethod2107(int var1) { - if (this.field3708 != null && this.field3708.midiPcmStream != null) { - this.field3708.field2851 = true; + public boolean vmethod2142() { + if (this.field3719 != null && this.field3719.midiPcmStream != null) { + this.field3719.field2862 = true; try { - if (this.field3708.field2853 < (float)this.field3708.musicTrackVolume && this.field3708.midiPcmStream.isReady()) { - float var2 = this.field3707 == 0 ? (float)this.field3707 : (float)this.field3708.musicTrackVolume / (float)this.field3707; - MusicSong var10000 = this.field3708; - var10000.field2853 += var2 == 0.0F ? (float)this.field3708.musicTrackVolume : var2; - if (this.field3708.field2853 > (float)this.field3708.musicTrackVolume) { - this.field3708.field2853 = (float)this.field3708.musicTrackVolume; + if (this.field3719.field2867 < (float)this.field3719.musicTrackVolume && this.field3719.midiPcmStream.isReady()) { + float var1 = this.field3718 == 0 ? (float)this.field3718 : (float)this.field3719.musicTrackVolume / (float)this.field3718; + MusicSong var10000 = this.field3719; + var10000.field2867 += 0.0F == var1 ? (float)this.field3719.musicTrackVolume : var1; + if (this.field3719.field2867 > (float)this.field3719.musicTrackVolume) { + this.field3719.field2867 = (float)this.field3719.musicTrackVolume; } - this.field3708.midiPcmStream.setPcmStreamVolume((int)this.field3708.field2853); + this.field3719.midiPcmStream.setPcmStreamVolume((int)this.field3719.field2867); return false; } - } catch (Exception var4) { - this.method2102(var4.getMessage()); + } catch (Exception var3) { + this.method2138(var3.getMessage()); return true; } - this.field3708.field2851 = false; + this.field3719.field2862 = false; return true; } else { return true; } } -} + + @ObfuscatedName("je") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)V", + garbageValue = "0" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { + byte var2 = 4; + int var3 = var2 + 6; + int var4 = var2 + 6; + int var5 = SecureRandomCallable.fontPlain12.lineWidth(var0, 250); + int var6 = SecureRandomCallable.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 16777215); + SecureRandomCallable.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + int var7 = var3 - var2; + int var8 = var4 - var2; + int var9 = var2 + var5 + var2; + int var10 = var2 + var6 + var2; + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { + Client.field407[var11] = true; + } + } + + if (var1) { + AttackOption.rasterProvider.drawFull(0, 0); + } else { + DevicePcmPlayerProvider.method76(var3, var4, var5, var6); + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/FadeOutTask.java b/osrs/src/main/java/FadeOutTask.java index 34464508b..86ef5681c 100644 --- a/osrs/src/main/java/FadeOutTask.java +++ b/osrs/src/main/java/FadeOutTask.java @@ -1,87 +1,67 @@ +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("px") +@Implements("FadeOutTask") public class FadeOutTask extends SongTask { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lmj;" + descriptor = "Lmu;" ) - MusicSong field3705; - @ObfuscatedName("ay") - int field3704; + MusicSong field3717; + @ObfuscatedName("ae") + int field3716; @ObfuscatedSignature( - descriptor = "(Lpp;IZI)V" + descriptor = "(Lpm;IZI)V" ) public FadeOutTask(SongTask var1, int var2, boolean var3, int var4) { super(var1); - this.field3705 = null; - this.field3704 = 0; - super.field3712 = "FadeOutTask"; + this.field3717 = null; + this.field3716 = 0; + super.field3722 = "FadeOutTask"; if (var2 >= 0) { - if (var3 && var2 < class306.field2758.size()) { - this.field3705 = (MusicSong)class306.field2758.get(var2); - } else if (!var3 && var2 < class306.musicSongs.size()) { - this.field3705 = (MusicSong)class306.musicSongs.get(var2); + if (var3 && var2 < class305.field2774.size()) { + this.field3717 = (MusicSong)class305.field2774.get(var2); + } else if (!var3 && var2 < class305.musicSongs.size()) { + this.field3717 = (MusicSong)class305.musicSongs.get(var2); } - this.field3704 = var4; + this.field3716 = var4; } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "994462530" + descriptor = "(I)Z", + garbageValue = "1604030758" ) - public boolean vmethod2107(int var1) { - if (this.field3705 != null && this.field3705.midiPcmStream != null) { - this.field3705.field2851 = true; + public boolean vmethod2142() { + if (this.field3717 != null && this.field3717.midiPcmStream != null) { + this.field3717.field2862 = true; try { - if (this.field3705.field2853 > 0.0F && this.field3705.midiPcmStream.isReady()) { - float var2 = this.field3704 == 0 ? (float)this.field3704 : (float)this.field3705.musicTrackVolume / (float)this.field3704; - MusicSong var10000 = this.field3705; - var10000.field2853 -= 0.0F == var2 ? (float)this.field3705.musicTrackVolume : var2; - if (this.field3705.field2853 < 0.0F) { - this.field3705.field2853 = 0.0F; + if (this.field3717.field2867 > 0.0F && this.field3717.midiPcmStream.isReady()) { + float var1 = this.field3716 == 0 ? (float)this.field3716 : (float)this.field3717.musicTrackVolume / (float)this.field3716; + MusicSong var10000 = this.field3717; + var10000.field2867 -= var1 == 0.0F ? (float)this.field3717.musicTrackVolume : var1; + if (this.field3717.field2867 < 0.0F) { + this.field3717.field2867 = 0.0F; } - this.field3705.midiPcmStream.setPcmStreamVolume((int)this.field3705.field2853); + this.field3717.midiPcmStream.setPcmStreamVolume((int)this.field3717.field2867); return false; } - } catch (Exception var4) { - this.method2102(var4.getMessage()); + } catch (Exception var3) { + this.method2138(var3.getMessage()); return true; } - this.field3705.field2851 = false; + this.field3717.field2862 = false; return true; } else { return true; } } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1708215021" - ) - public static void method2095() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); - } - - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "(Lig;IIII)V", - garbageValue = "1446109595" - ) - static void method2096(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && class150.clientPreferences.getAreaSoundEffectsVolume() != 0) { - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { - SoundSystem.method220(var0.soundEffects[var1], var2, var3); - } - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FileSystem.java b/osrs/src/main/java/FileSystem.java index 8545f1b29..0d3b32991 100644 --- a/osrs/src/main/java/FileSystem.java +++ b/osrs/src/main/java/FileSystem.java @@ -1,900 +1,113 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.File; -import java.io.IOException; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; -import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.Hashtable; + +@ObfuscatedName("ga") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("FileSystem_cacheDir") static File FileSystem_cacheDir; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("FileSystem_cacheFiles") - public static Hashtable FileSystem_cacheFiles; + static Hashtable FileSystem_cacheFiles; static { FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lsa;III)I", - garbageValue = "503830382" + descriptor = "(B)[Lew;", + garbageValue = "-66" ) - static int method904(IterableNodeHashTable var0, int var1, int var2) { - if (var0 == null) { - return var2; - } else { - IntegerNode var3 = (IntegerNode)var0.get((long)var1); - return var3 == null ? var2 : var3.integer; - } + static class128[] method912() { + return new class128[]{class128.field1229, class128.field1226, class128.field1227, class128.field1228, class128.field1225}; } - @ObfuscatedName("az") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lbq;Lpc;Lpc;I)V", - garbageValue = "-2089610118" + descriptor = "(Lnu;I)V", + garbageValue = "1743339101" ) - static void method906(GameEngine var0, Font var1, Font var2) { - if (Login.worldSelectOpen) { - class20.method75(var0); - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !class28.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - class150.clientPreferences.getTitleMusicDisabled(!class150.clientPreferences.getTitleMusicDisabled()); - if (!class150.clientPreferences.getTitleMusicDisabled()) { - ArrayList var3 = new ArrayList(); - var3.add(new MusicSong(class13.archive6, "scape main", "", 255, false)); - UserComparator4.method663(var3, 0, 0, 0, 100, false); - } else { - RouteStrategy.method1107(0, 0); - } - - class306.field2755.clear(); - } - - if (Client.gameState != 5) { - if (Login.field772 == -1L) { - Login.field772 = class113.clockNow() + 1000L; - } - - long var23 = class113.clockNow(); - if (class28.method119() && -1L == Login.field771) { - Login.field771 = var23; - if (Login.field771 > Login.field772) { - Login.field772 = Login.field771; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - int var5; - if (Language.Language_EN == Interpreter.clientLanguage) { - if (MouseHandler.MouseHandler_lastButton == 1 || !class28.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var5 = Login.xPadding + 5; - short var6 = 463; - byte var7 = 100; - byte var8 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + var7 && MouseHandler.MouseHandler_lastPressedY >= var6 && MouseHandler.MouseHandler_lastPressedY <= var8 + var6) { - if (DynamicObject.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - - return; - } - } + public static void method911(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; + VarpDefinition.field1498 = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); + } - if (World.World_request != null && DynamicObject.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-1" + ) + static void method913() { + try { + File var0 = new File(class36.userHomeDirectory, "random.dat"); + int var2; + if (var0.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + } else { + label34: + for (int var1 = 0; var1 < JagexCache.field1464.length; ++var1) { + for (var2 = 0; var2 < DelayFadeTask.field3712.length; ++var2) { + File var3 = new File(DelayFadeTask.field3712[var2] + JagexCache.field1464[var1] + File.separatorChar + "random.dat"); + if (var3.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); + break label34; } } + } + } - var5 = MouseHandler.MouseHandler_lastButton; - int var41 = MouseHandler.MouseHandler_lastPressedX; - int var42 = MouseHandler.MouseHandler_lastPressedY; - if (var5 == 0) { - var41 = MouseHandler.MouseHandler_x; - var42 = MouseHandler.MouseHandler_y; - } - - if (!class28.mouseCam && var5 == 4) { - var5 = 1; - } - - class213 var25 = SceneTilePaint.method1324(); - short var44; - int var45; - if (Login.loginIndex == 0) { - boolean var50 = false; - - while (var25.method1085()) { - if (var25.field1869 == 84) { - var50 = true; - } - } - - var45 = Script.loginBoxCenter - 80; - var44 = 291; - if (var5 == 1 && var41 >= var45 - 75 && var41 <= var45 + 75 && var42 >= var44 - 20 && var42 <= var44 + 20) { - NPC.openURL(UrlRequest.method661("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var45 = Script.loginBoxCenter + 80; - if (var5 == 1 && var41 >= var45 - 75 && var41 <= var45 + 75 && var42 >= var44 - 20 && var42 <= var44 + 20 || var50) { - if ((Client.worldProperties & 33554432) != 0) { - Login.Login_response0 = ""; - Login.Login_response1 = "This is a Beta world."; - Login.Login_response2 = "Your normal account will not be affected."; - Login.Login_response3 = ""; - class328.method1678(1); - class395.method2020(); - } else if ((Client.worldProperties & 4) != 0) { - if ((Client.worldProperties & 1024) != 0) { - Login.Login_response1 = "This is a High Risk PvP world."; - Login.Login_response2 = "Players can attack each other almost everywhere"; - Login.Login_response3 = "and the Protect Item prayer won't work."; - } else { - Login.Login_response1 = "This is a PvP world."; - Login.Login_response2 = "Players can attack each other"; - Login.Login_response3 = "almost everywhere."; - } - - Login.Login_response0 = "Warning!"; - class328.method1678(1); - class395.method2020(); - } else if ((Client.worldProperties & 1024) != 0) { - Login.Login_response1 = "This is a High Risk world."; - Login.Login_response2 = "The Protect Item prayer will"; - Login.Login_response3 = "not work on this world."; - Login.Login_response0 = "Warning!"; - class328.method1678(1); - class395.method2020(); - } else { - PlayerComposition.Login_promptCredentials(false); - } - } - } else { - int var9; - short var10; - if (Login.loginIndex == 1) { - while (true) { - if (!var25.method1085()) { - var9 = Script.loginBoxCenter - 80; - var10 = 321; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - PlayerComposition.Login_promptCredentials(false); - } - - var9 = Script.loginBoxCenter + 80; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - class328.method1678(0); - } - break; - } - - if (var25.field1869 == 84) { - PlayerComposition.Login_promptCredentials(false); - } else if (var25.field1869 == 13) { - class328.method1678(0); - } - } - } else { - short var43; - boolean var46; - if (Login.loginIndex == 2) { - var43 = 201; - var9 = var43 + 52; - if (var5 == 1 && var42 >= var9 - 12 && var42 < var9 + 2) { - Login.currentLoginField = 0; - } - - var9 += 15; - if (var5 == 1 && var42 >= var9 - 12 && var42 < var9 + 2) { - Login.currentLoginField = 1; - } - - var9 += 15; - var43 = 361; - if (class343.field3130 != null) { - var45 = class343.field3130.highX / 2; - if (var5 == 1 && var41 >= class343.field3130.lowX - var45 && var41 <= var45 + class343.field3130.lowX && var42 >= var43 - 15 && var42 < var43) { - switch(Login.field747) { - case 1: - Actor.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - class328.method1678(5); - return; - case 2: - NPC.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var45 = Script.loginBoxCenter - 80; - var44 = 321; - if (var5 == 1 && var41 >= var45 - 75 && var41 <= var45 + 75 && var42 >= var44 - 20 && var42 <= var44 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - Actor.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - Actor.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - Actor.setLoginResponseString("", "Connecting to server...", ""); - GrandExchangeOfferTotalQuantityComparator.method1911(false); - class129.updateGameState(20); - return; - } - - var45 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var41 >= var45 - 75 && var41 <= var45 + 75 && var42 >= var44 - 20 && var42 <= var44 + 20) { - class328.method1678(0); - Login.Login_username = ""; - Login.Login_password = ""; - class424.field3758 = 0; - Login.otp = ""; - Login.field739 = true; - } - - var45 = Script.loginBoxCenter + -117; - var44 = 277; - Login.field741 = var41 >= var45 && var41 < var45 + class139.field1311 && var42 >= var44 && var42 < var44 + class453.field3874; - if (var5 == 1 && Login.field741) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && class150.clientPreferences.getUsernameToRemember() != null) { - class150.clientPreferences.setUsernameToRemember((String)null); - } - } - - var45 = Script.loginBoxCenter + 24; - var44 = 277; - Login.field740 = var41 >= var45 && var41 < var45 + class139.field1311 && var42 >= var44 && var42 < var44 + class453.field3874; - if (var5 == 1 && Login.field740) { - class150.clientPreferences.setIsUsernameHidden(!class150.clientPreferences.getIsUsernameHidden()); - if (!class150.clientPreferences.getIsUsernameHidden()) { - Login.Login_username = ""; - class150.clientPreferences.setUsernameToRemember((String)null); - class395.method2020(); - } - } - - label1056: - while (true) { - int var48; - Transferable var54; - do { - while (true) { - char var47; - label997: - do { - while (true) { - while (var25.method1085()) { - if (var25.field1869 != 13) { - if (Login.currentLoginField != 0) { - continue label997; - } - - class60.method329(var25.field1867); - if (var25.field1869 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (var25.field1869 == 84 || var25.field1869 == 80) { - Login.currentLoginField = 1; - } - - var47 = var25.field1867; - var46 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var47) != -1; - if (var46 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + var25.field1867; - } - } else { - class328.method1678(0); - Login.Login_username = ""; - Login.Login_password = ""; - class424.field3758 = 0; - Login.otp = ""; - Login.field739 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (var25.field1869 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (var25.field1869 == 84 || var25.field1869 == 80) { - Login.currentLoginField = 0; - if (var25.field1869 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - Actor.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - Actor.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - Actor.setLoginResponseString("", "Connecting to server...", ""); - GrandExchangeOfferTotalQuantityComparator.method1911(false); - class129.updateGameState(20); - return; - } - } - - if ((var25.getKeyPressed(82) || var25.getKeyPressed(87)) && var25.field1869 == 67) { - Clipboard var53 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var54 = var53.getContents(TileItem.client); - var48 = 20 - Login.Login_password.length(); - break; - } - - if (Script.method449(var25.field1867)) { - var47 = var25.field1867; - var46 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var47) != -1; - if (var46 && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + var25.field1867; - } - } - } - } while(var48 <= 0); - - try { - String var15 = (String)var54.getTransferData(DataFlavor.stringFlavor); - int var16 = Math.min(var48, var15.length()); - int var49 = 0; - - while (true) { - if (var49 >= var16) { - Login.Login_password = Login.Login_password + var15.substring(0, var16); - continue label1056; - } - - char var51 = var15.charAt(var49); - boolean var18; - if ((var51 < ' ' || var51 >= 127) && (var51 <= 127 || var51 >= 160) && (var51 <= 160 || var51 > 255)) { - label1184: { - if (var51 != 0) { - char[] var20 = class385.cp1252AsciiExtension; - - for (int var21 = 0; var21 < var20.length; ++var21) { - char var22 = var20[var21]; - if (var22 == var51) { - var18 = true; - break label1184; - } - } - } - - var18 = false; - } - } else { - var18 = true; - } - - if (!var18) { - break; - } - - char var52 = var15.charAt(var49); - boolean var28 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var52) != -1; - if (!var28) { - break; - } - - ++var49; - } - - class328.method1678(3); - return; - } catch (UnsupportedFlavorException var39) { - } catch (IOException var40) { - } - } - } else { - Bounds var29; - if (Login.loginIndex == 3) { - var9 = Login.loginBoxX + 180; - var10 = 241; - var29 = var1.method2048(25, "need to log in using the Jagex Launcher instead.".length() - 34, "need to log in using the Jagex Launcher instead.", var9, var10); - if (var5 == 1 && var29.method2257(var41, var42)) { - NPC.openURL("https://oldschool.runescape.com/launcher", true, false); - } - - var9 = Login.loginBoxX + 180; - var10 = 276; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - class333.method1811(false); - } - - var9 = Login.loginBoxX + 180; - var10 = 326; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - Actor.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - class328.method1678(5); - return; - } - } else { - int var12; - if (Login.loginIndex == 4) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - Login.otp.trim(); - if (Login.otp.length() != 6) { - Actor.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class424.field3758 = Integer.parseInt(Login.otp); - Login.otp = ""; - GrandExchangeOfferTotalQuantityComparator.method1911(true); - Actor.setLoginResponseString("", "Connecting to server...", ""); - class129.updateGameState(20); - return; - } - - if (var5 == 1 && var41 >= Login.loginBoxX + 180 - 9 && var41 <= Login.loginBoxX + 180 + 130 && var42 >= 263 && var42 <= 296) { - Login.field739 = !Login.field739; - } - - if (var5 == 1 && var41 >= Login.loginBoxX + 180 - 34 && var41 <= Login.loginBoxX + 34 + 180 && var42 >= 351 && var42 <= 363) { - NPC.openURL(UrlRequest.method661("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - class328.method1678(0); - Login.Login_username = ""; - Login.Login_password = ""; - class424.field3758 = 0; - Login.otp = ""; - } - - while (var25.method1085()) { - boolean var11 = false; - - for (var12 = 0; var12 < "1234567890".length(); ++var12) { - if (var25.field1867 == "1234567890".charAt(var12)) { - var11 = true; - break; - } - } - - if (var25.field1869 == 13) { - class328.method1678(0); - Login.Login_username = ""; - Login.Login_password = ""; - class424.field3758 = 0; - Login.otp = ""; - } else { - if (var25.field1869 == 85 && Login.otp.length() > 0) { - Login.otp = Login.otp.substring(0, Login.otp.length() - 1); - } - - if (var25.field1869 == 84) { - Login.otp.trim(); - if (Login.otp.length() != 6) { - Actor.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class424.field3758 = Integer.parseInt(Login.otp); - Login.otp = ""; - GrandExchangeOfferTotalQuantityComparator.method1911(true); - Actor.setLoginResponseString("", "Connecting to server...", ""); - class129.updateGameState(20); - return; - } - - if (var11 && Login.otp.length() < 6) { - Login.otp = Login.otp + var25.field1867; - } - } - } - } else { - int var13; - if (Login.loginIndex == 5) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - World.method404(); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - PlayerComposition.Login_promptCredentials(true); - } - - var44 = 361; - if (class313.field2821 != null) { - var12 = class313.field2821.highX / 2; - if (var5 == 1 && var41 >= class313.field2821.lowX - var12 && var41 <= var12 + class313.field2821.lowX && var42 >= var44 - 15 && var42 < var44) { - NPC.openURL(UrlRequest.method661("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (var25.method1085()) { - var46 = false; - - for (var13 = 0; var13 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var13) { - if (var25.field1867 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var13)) { - var46 = true; - break; - } - } - - if (var25.field1869 == 13) { - PlayerComposition.Login_promptCredentials(true); - } else { - if (var25.field1869 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (var25.field1869 == 84) { - World.method404(); - return; - } - - if (var46 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + var25.field1867; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - if (Message.field347 && !Client.onMobile) { - var9 = Script.loginBoxCenter - 150; - var45 = var9 + 40 + 240 + 25; - var44 = 231; - var12 = var44 + 40; - if (var5 == 1 && var41 >= var9 && var41 <= var45 && var42 >= var44 && var42 <= var12) { - Login.field748 = class152.method794(var9, var41); - } - - var13 = Login.loginBoxX + 180 - 80; - short var14 = 321; - boolean var17; - boolean var19; - Date var30; - boolean var32; - java.util.Calendar var33; - Date var34; - if (var5 == 1 && var41 >= var13 - 75 && var41 <= var13 + 75 && var42 >= var14 - 20 && var42 <= var14 + 20) { - label900: { - try { - var30 = class16.method53(); - } catch (ParseException var38) { - class328.method1678(7); - Actor.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); - var32 = false; - break label900; - } - - if (var30 == null) { - var32 = false; - } else { - var33 = java.util.Calendar.getInstance(); - var33.set(1, var33.get(1) - 13); - var33.set(5, var33.get(5) + 1); - var33.set(11, 0); - var33.set(12, 0); - var33.set(13, 0); - var33.set(14, 0); - var34 = var33.getTime(); - var17 = var30.before(var34); - var19 = class453.method2295(var30); - if (!var19) { - class328.method1678(7); - Actor.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); - var32 = false; - } else { - if (!var17) { - World.field666 = 8388607; - } else { - World.field666 = (int)(var30.getTime() / 86400000L - 11745L); - } - - var32 = true; - } - } - } - - if (var32) { - class129.updateGameState(50); - return; - } - } - - var13 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var41 >= var13 - 75 && var41 <= var13 + 75 && var42 >= var14 - 20 && var42 <= var14 + 20) { - Login.field767 = new String[8]; - PlayerComposition.Login_promptCredentials(true); - } - - while (var25.method1085()) { - if (var25.field1869 == 101) { - Login.field767[Login.field748] = null; - } - - if (var25.field1869 == 85) { - if (Login.field767[Login.field748] == null && Login.field748 > 0) { - --Login.field748; - } - - Login.field767[Login.field748] = null; - } - - if (var25.field1867 >= '0' && var25.field1867 <= '9') { - Login.field767[Login.field748] = "" + var25.field1867; - if (Login.field748 < 7) { - ++Login.field748; - } - } - - if (var25.field1869 == 84) { - label836: { - try { - var30 = class16.method53(); - } catch (ParseException var37) { - class328.method1678(7); - Actor.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); - var32 = false; - break label836; - } - - if (var30 == null) { - var32 = false; - } else { - var33 = java.util.Calendar.getInstance(); - var33.set(1, var33.get(1) - 13); - var33.set(5, var33.get(5) + 1); - var33.set(11, 0); - var33.set(12, 0); - var33.set(13, 0); - var33.set(14, 0); - var34 = var33.getTime(); - var17 = var30.before(var34); - var19 = class453.method2295(var30); - if (!var19) { - class328.method1678(7); - Actor.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); - var32 = false; - } else { - if (!var17) { - World.field666 = 8388607; - } else { - World.field666 = (int)(var30.getTime() / 86400000L - 11745L); - } - - var32 = true; - } - } - } - - if (var32) { - class129.updateGameState(50); - } - - return; - } - } - } else { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - NPC.openURL(UrlRequest.method661("secure", true) + "m=dob/set_dob.ws", true, false); - Actor.setLoginResponseString("", "Page has opened in the browser.", ""); - class328.method1678(6); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - PlayerComposition.Login_promptCredentials(true); - } - } - } else if (Login.loginIndex == 8) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - NPC.openURL("https://www.jagex.com/terms/privacy", true, false); - Actor.setLoginResponseString("", "Page has opened in the browser.", ""); - class328.method1678(6); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - PlayerComposition.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 9) { - var9 = Login.loginBoxX + 180; - var10 = 311; - if (var25.field1869 == 84 || var25.field1869 == 13 || var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - class333.method1811(false); - } - } else if (Login.loginIndex == 10) { - var9 = Login.loginBoxX + 180; - var10 = 209; - if (var25.field1869 == 84 || var5 == 1 && var41 >= var9 - 109 && var41 <= var9 + 109 && var42 >= var10 && var42 <= var10 + 68) { - Actor.setLoginResponseString("", "Connecting to server...", ""); - Client.field644 = class518.field4160; - GrandExchangeOfferTotalQuantityComparator.method1911(false); - class129.updateGameState(20); - } - } else if (Login.loginIndex == 12) { - var9 = Script.loginBoxCenter; - var10 = 233; - var29 = var2.method2048(0, 30, "terms of use, privacy policy, and end user licence", var9, var10); - Bounds var26 = var2.method2048(32, 32, "terms of use, privacy policy, and end user licence", var9, var10); - Bounds var27 = var2.method2048(70, 34, "terms of use, privacy policy, and end user licence", var9, var10); - var45 = var10 + 17; - Bounds var35 = var2.method2048(0, 34, "agreement (EULA).", var9, var45); - if (var5 == 1) { - if (var29.method2257(var41, var42)) { - NPC.openURL("https://www.jagex.com/terms", true, false); - } else if (var26.method2257(var41, var42)) { - NPC.openURL("https://www.jagex.com/terms/privacy", true, false); - } else if (var27.method2257(var41, var42) || var35.method2257(var41, var42)) { - NPC.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); - } - } - - var9 = Script.loginBoxCenter - 80; - var10 = 311; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - class150.clientPreferences.method570(Client.param21); - class333.method1811(true); - } - - var9 = Script.loginBoxCenter + 80; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - Login.loginIndex = 13; - } - } else if (Login.loginIndex == 13) { - var9 = Script.loginBoxCenter; - var10 = 321; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - class333.method1811(true); - } - } else if (Login.loginIndex == 14) { - String var36 = ""; - switch(Login.field746) { - case 0: - var36 = "https://secure.runescape.com/m=offence-appeal/account-history"; - break; - case 1: - var36 = "https://secure.runescape.com/m=accountappeal/passwordrecovery"; - break; - case 2: - var36 = "https://support.runescape.com/hc/en-gb/articles/207256855-Settle-an-Unpaid-Balance"; - break; - default: - PlayerComposition.Login_promptCredentials(false); - } - - var45 = Login.loginBoxX + 180; - var44 = 276; - if (var5 == 1 && var41 >= var45 - 75 && var41 <= var45 + 75 && var42 >= var44 - 20 && var42 <= var44 + 20) { - NPC.openURL(var36, true, false); - Actor.setLoginResponseString("", "Page has opened in the browser.", ""); - class328.method1678(6); - return; - } - - var45 = Login.loginBoxX + 180; - var44 = 326; - if (var5 == 1 && var41 >= var45 - 75 && var41 <= var45 + 75 && var42 >= var44 - 20 && var42 <= var44 + 20) { - PlayerComposition.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var9 = Login.loginBoxX + 180; - var10 = 301; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - class333.method1811(false); - } - } else if (Login.loginIndex == 32) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - NPC.openURL(UrlRequest.method661("secure", true) + "m=dob/set_dob.ws", true, false); - Actor.setLoginResponseString("", "Page has opened in the browser.", ""); - class328.method1678(6); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - PlayerComposition.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 33) { - var9 = Login.loginBoxX + 180; - var10 = 276; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - NPC.openURL("https://oldschool.runescape.com/launcher", true, false); - } - - var9 = Login.loginBoxX + 180; - var10 = 326; - if (var5 == 1 && var41 >= var9 - 75 && var41 <= var9 + 75 && var42 >= var10 - 20 && var42 <= var10 + 20) { - PlayerComposition.Login_promptCredentials(true); - } - } - } else { - while (true) { - do { - if (!var25.method1085()) { - var43 = 321; - if (var5 == 1 && var42 >= var43 - 20 && var42 <= var43 + 20) { - PlayerComposition.Login_promptCredentials(true); - } - - return; - } - } while(var25.field1869 != 84 && var25.field1869 != 13); + if (JagexCache.JagexCache_randomDat == null) { + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); + var2 = var4.read(); + var4.seek(0L); + var4.write(var2); + var4.seek(0L); + var4.close(); + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + } + } catch (IOException var5) { + } - PlayerComposition.Login_promptCredentials(true); - } - } - } - } - } - } - } + } - } + @ObfuscatedName("ib") + @ObfuscatedSignature( + descriptor = "(Lib;IIII)V", + garbageValue = "-1577193721" + ) + static void method914(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class449.clientPreferences.getAreaSoundEffectsVolume() != 0) { + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { + MouseHandler.method172(var0.soundEffects[var1], var2, var3); } } } - @ObfuscatedName("av") + @ObfuscatedName("or") @ObfuscatedSignature( - descriptor = "(B)Lud;", - garbageValue = "-79" + descriptor = "(I)V", + garbageValue = "-1893759044" ) - static SpritePixels method905() { - SpritePixels var0 = new SpritePixels(); - var0.width = class528.SpriteBuffer_spriteWidth; - var0.height = class528.SpriteBuffer_spriteHeight; - var0.xOffset = class492.SpriteBuffer_xOffsets[0]; - var0.yOffset = class134.SpriteBuffer_yOffsets[0]; - var0.subWidth = class172.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class528.SpriteBuffer_spriteHeights[0]; - int var1 = var0.subHeight * var0.subWidth; - byte[] var2 = ArchiveDiskAction.SpriteBuffer_pixels[0]; - var0.pixels = new int[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var0.pixels[var3] = class528.SpriteBuffer_spritePalette[var2[var3] & 255]; + static void method915() { + for (int var0 = 0; var0 < Client.field609.size(); ++var0) { + if (ClientPreferences.method571((Integer)Client.field609.get(var0)) != 2) { + Client.field609.remove(var0); + --var0; + } } - DbTableType.method2483(); - return var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FillMode.java b/osrs/src/main/java/FillMode.java index 3dd10224b..0e272fbcc 100644 --- a/osrs/src/main/java/FillMode.java +++ b/osrs/src/main/java/FillMode.java @@ -2,42 +2,42 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uc") -public enum FillMode implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("um") +public enum FillMode implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Luc;" + descriptor = "Lum;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Luc;" + descriptor = "Lum;" ) - field4185(1, 1), - @ObfuscatedName("ar") + field4230(1, 1), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Luc;" + descriptor = "Lum;" ) - field4184(2, 2); + field4231(2, 2); - @ObfuscatedName("am") - public final int field4187; - @ObfuscatedName("as") - final int field4186; + @ObfuscatedName("at") + public final int field4233; + @ObfuscatedName("ac") + final int field4232; FillMode(int var3, int var4) { - this.field4187 = var3; - this.field4186 = var4; + this.field4233 = var3; + this.field4232 = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4186; + return this.field4232; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FloorDecoration.java b/osrs/src/main/java/FloorDecoration.java index 8dce42f51..f9f5ee009 100644 --- a/osrs/src/main/java/FloorDecoration.java +++ b/osrs/src/main/java/FloorDecoration.java @@ -3,118 +3,63 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ip") +@ObfuscatedName("iy") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lpc;" + descriptor = "Lbg;" ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("aw") + @Export("pcmPlayerProvider") + public static class51 pcmPlayerProvider; + @ObfuscatedName("au") @Export("z") int z; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("x") int x; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("y") int y; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lik;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("tag") public long tag; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("flags") int flags; FloorDecoration() { } - @ObfuscatedName("bb") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(ILdc;ZB)I", - garbageValue = "116" + descriptor = "([BILjava/lang/CharSequence;I)I", + garbageValue = "-2024995343" ) - static int method1155(int var0, Script var1, boolean var2) { - int var3; - int var4; - int var6; - if (var0 == 3400) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - EnumComposition var5 = class371.getEnum(var3); - if (var5.outputType != 's') { - } - - for (var6 = 0; var6 < var5.outputCount; ++var6) { - if (var4 == var5.keys[var6]) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.strVals[var6]; - var5 = null; - break; - } - } - - if (var5 != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.defaultStr; - } - - return 1; - } else if (var0 != 3408) { - if (var0 == 3411) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - EnumComposition var10 = class371.getEnum(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var10.size(); - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - EnumComposition var7 = class371.getEnum(var9); - if (var3 == var7.inputType && var4 == var7.outputType) { - for (int var8 = 0; var8 < var7.outputCount; ++var8) { - if (var6 == var7.keys[var8]) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; - } - - var7 = null; - break; - } - } + public static int method1179(byte[] var0, int var1, CharSequence var2) { + int var3 = var2.length(); + int var4 = var1; - if (var7 != null) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; - } - } - - return 1; + for (int var5 = 0; var5 < var3; ++var5) { + char var6 = var2.charAt(var5); + if (var6 <= 127) { + var0[var4++] = (byte)var6; + } else if (var6 <= 2047) { + var0[var4++] = (byte)(192 | var6 >> 6); + var0[var4++] = (byte)(128 | var6 & '?'); } else { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; + var0[var4++] = (byte)(224 | var6 >> '\f'); + var0[var4++] = (byte)(128 | var6 >> 6 & 63); + var0[var4++] = (byte)(128 | var6 & '?'); } } + + return var4 - var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FloorOverlayDefinition.java b/osrs/src/main/java/FloorOverlayDefinition.java index 015c6199d..b85c290dd 100644 --- a/osrs/src/main/java/FloorOverlayDefinition.java +++ b/osrs/src/main/java/FloorOverlayDefinition.java @@ -1,52 +1,57 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("hr") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("FloorOverlayDefinition_cached") public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("ar") + @ObfuscatedName("kq") + @ObfuscatedSignature( + descriptor = "[Lui;" + ) + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + @ObfuscatedName("ao") @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("texture") public int texture; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("hue") public int hue; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("saturation") public int saturation; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("lightness") public int lightness; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("secondaryLightness") public int secondaryLightness; @@ -61,10 +66,10 @@ public FloorOverlayDefinition() { this.secondaryRgb = -1; } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2116098894" + descriptor = "(B)V", + garbageValue = "32" ) @Export("postDecode") public void postDecode() { @@ -78,10 +83,10 @@ public void postDecode() { this.setHsl(this.primaryRgb); } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-120471705" + descriptor = "(Ltm;IB)V", + garbageValue = "7" ) @Export("decode") public void decode(Buffer var1, int var2) { @@ -95,10 +100,10 @@ public void decode(Buffer var1, int var2) { } } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;IIB)V", - garbageValue = "25" + descriptor = "(Ltm;IIB)V", + garbageValue = "42" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -115,10 +120,10 @@ void decodeNext(Buffer var1, int var2, int var3) { } - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1944811115" + garbageValue = "-718150791" ) @Export("setHsl") void setHsl(int var1) { @@ -145,29 +150,29 @@ void setHsl(int var1) { double var12 = 0.0D; double var14 = 0.0D; - double var16 = (var10 + var8) / 2.0D; + double var16 = (var8 + var10) / 2.0D; if (var10 != var8) { if (var16 < 0.5D) { - var14 = (var10 - var8) / (var8 + var10); + var14 = (var10 - var8) / (var10 + var8); } if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { + if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { + } else if (var10 == var4) { var12 = 2.0D + (var6 - var2) / (var10 - var8); - } else if (var6 == var10) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + } else if (var10 == var6) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; } } var12 /= 6.0D; - this.hue = (int)(256.0D * var12); - this.saturation = (int)(var14 * 256.0D); - this.lightness = (int)(var16 * 256.0D); + this.hue = (int)(var12 * 256.0D); + this.saturation = (int)(256.0D * var14); + this.lightness = (int)(256.0D * var16); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -181,111 +186,4 @@ void setHsl(int var1) { } } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lot;I)I", - garbageValue = "-452810030" - ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); - int var4 = var1.length(); - int var5 = 0; - int var6 = 0; - char var7 = 0; - char var8 = 0; - - while (var5 - var7 < var3 || var6 - var8 < var4) { - if (var5 - var7 >= var3) { - return -1; - } - - if (var6 - var8 >= var4) { - return 1; - } - - char var9; - if (var7 != 0) { - var9 = var7; - boolean var14 = false; - } else { - var9 = var0.charAt(var5++); - } - - char var10; - if (var8 != 0) { - var10 = var8; - boolean var15 = false; - } else { - var10 = var1.charAt(var6++); - } - - var7 = ClanSettings.method806(var9); - var8 = ClanSettings.method806(var10); - var9 = class102.standardizeChar(var9, var2); - var10 = class102.standardizeChar(var10, var2); - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var9 != var10) { - return Decimator.lowercaseChar(var9, var2) - Decimator.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); - - char var12; - int var17; - for (var17 = 0; var17 < var16; ++var17) { - if (var2 == Language.Language_FR) { - var5 = var3 - 1 - var17; - var6 = var4 - 1 - var17; - } else { - var6 = var17; - var5 = var17; - } - - char var11 = var0.charAt(var5); - var12 = var1.charAt(var6); - if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { - var11 = Character.toLowerCase(var11); - var12 = Character.toLowerCase(var12); - if (var12 != var11) { - return Decimator.lowercaseChar(var11, var2) - Decimator.lowercaseChar(var12, var2); - } - } - } - - var17 = var3 - var4; - if (var17 != 0) { - return var17; - } else { - for (int var18 = 0; var18 < var16; ++var18) { - var12 = var0.charAt(var18); - char var13 = var1.charAt(var18); - if (var12 != var13) { - return Decimator.lowercaseChar(var12, var2) - Decimator.lowercaseChar(var13, var2); - } - } - - return 0; - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "464683458" - ) - public static void method1052(int var0, int var1) { - Iterator var2 = class306.field2759.iterator(); - - while (var2.hasNext()) { - class312 var3 = (class312)var2.next(); - var3.vmethod1644(var0, var1); - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FloorUnderlayDefinition.java b/osrs/src/main/java/FloorUnderlayDefinition.java index 85a70610d..16dcd393a 100644 --- a/osrs/src/main/java/FloorUnderlayDefinition.java +++ b/osrs/src/main/java/FloorUnderlayDefinition.java @@ -3,40 +3,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("hs") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lhf;" - ) - @Export("clock") - static Clock clock; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("rgb") int rgb; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("hue") public int hue; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("saturation") public int saturation; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("lightness") public int lightness; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("hueMultiplier") public int hueMultiplier; @@ -48,20 +42,20 @@ public FloorUnderlayDefinition() { this.rgb = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1194722068" + garbageValue = "-525788142" ) @Export("postDecode") public void postDecode() { this.setHsl(this.rgb); } - @ObfuscatedName("ay") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;IB)V", - garbageValue = "1" + descriptor = "(Ltm;II)V", + garbageValue = "1362647388" ) @Export("decode") public void decode(Buffer var1, int var2) { @@ -75,10 +69,10 @@ public void decode(Buffer var1, int var2) { } } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;IIS)V", - garbageValue = "1927" + descriptor = "(Ltm;IIB)V", + garbageValue = "34" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -88,10 +82,10 @@ void decodeNext(Buffer var1, int var2, int var3) { } - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-13737" + descriptor = "(II)V", + garbageValue = "-628456834" ) @Export("setHsl") void setHsl(int var1) { @@ -121,24 +115,24 @@ void setHsl(int var1) { double var16 = (var8 + var10) / 2.0D; if (var10 != var8) { if (var16 < 0.5D) { - var14 = (var10 - var8) / (var10 + var8); + var14 = (var10 - var8) / (var8 + var10); } if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { + if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); } else if (var10 == var4) { var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; + var12 = 4.0D + (var2 - var4) / (var10 - var8); } } var12 /= 6.0D; - this.saturation = (int)(256.0D * var14); + this.saturation = (int)(var14 * 256.0D); this.lightness = (int)(256.0D * var16); if (this.saturation < 0) { this.saturation = 0; @@ -153,7 +147,7 @@ void setHsl(int var1) { } if (var16 > 0.5D) { - this.hueMultiplier = (int)(512.0D * (1.0D - var16) * var14); + this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); } else { this.hueMultiplier = (int)(var14 * var16 * 512.0D); } @@ -162,6 +156,6 @@ void setHsl(int var1) { this.hueMultiplier = 1; } - this.hue = (int)((double)this.hueMultiplier * var12); + this.hue = (int)(var12 * (double)this.hueMultiplier); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Font.java b/osrs/src/main/java/Font.java index d42369252..8626f2ccf 100644 --- a/osrs/src/main/java/Font.java +++ b/osrs/src/main/java/Font.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("pc") +@ObfuscatedName("pi") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { @@ -13,7 +13,7 @@ public Font(byte[] var1) { super(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; @@ -55,7 +55,7 @@ final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; @@ -96,4 +96,4 @@ final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, i AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FontName.java b/osrs/src/main/java/FontName.java index ff477182c..e3ada27b5 100644 --- a/osrs/src/main/java/FontName.java +++ b/osrs/src/main/java/FontName.java @@ -3,60 +3,48 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sg") +@ObfuscatedName("sp") @Implements("FontName") public class FontName { - @ObfuscatedName("aw") + @ObfuscatedName("up") + static int field4045; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lsp;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lsp;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lsp;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lsp;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lsp;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lsp;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("dd") - @ObfuscatedSignature( - descriptor = "Luu;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("fe") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("un") - static int cameraLookAtHeight; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("name") String name; @@ -73,106 +61,250 @@ public class FontName { this.name = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-821041494" + descriptor = "(IIILiw;Lis;Lij;I)Z", + garbageValue = "-287593620" ) - static int method2418(int var0, int var1) { - FloorOverlayDefinition var2 = class131.method718(var0); - if (var2 == null) { - return var1; - } else { - int var4; - int var5; - int var6; - int var7; - int var8; - if (var2.secondaryRgb >= 0) { - var4 = var2.secondaryHue; - var5 = var2.secondarySaturation; - var6 = var2.secondaryLightness; - if (var6 > 179) { - var5 /= 2; - } + static final boolean method2446(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, class216 var5) { + int var6 = var5.method1132(); + int var7 = var5.method1133(); + int[][] var8 = var5.method1135(); + int[][] var9 = var5.method1134(); + int[] var10 = var5.method1136(); + int[] var11 = var5.method1137(); + int var12 = var5.method1138(); + int var13 = var0; + int var14 = var1; + int var15 = var6 >> 1; + int var16 = var7 >> 1; + int var17 = var0 - var15; + int var18 = var1 - var16; + var9[var15][var16] = 99; + var8[var15][var16] = 0; + byte var19 = 0; + int var20 = 0; + var10[var19] = var0; + int var26 = var19 + 1; + var11[var19] = var1; + int[][] var21 = var4.flags; - if (var6 > 192) { - var5 /= 2; - } + while (true) { + label265: + while (true) { + int var22; + int var23; + int var24; + int var25; + do { + do { + do { + label242: + do { + if (var20 == var26) { + var5.method1129(var13, var14); + return false; + } - if (var6 > 217) { - var5 /= 2; - } + var13 = var10[var20]; + var14 = var11[var20]; + var20 = var20 + 1 & var12; + var15 = var13 - var17; + var16 = var14 - var18; + var22 = var13 - var4.xInset; + var23 = var14 - var4.yInset; + if (var3.hasArrived(var2, var13, var14, var4)) { + var5.method1129(var13, var14); + return true; + } - if (var6 > 243) { - var5 /= 2; - } + var24 = var8[var15][var16] + 1; + if (var15 > 0 && var9[var15 - 1][var16] == 0 && (var21[var22 - 1][var23] & 19136782) == 0 && (var21[var22 - 1][var23 + var2 - 1] & 19136824) == 0) { + var25 = 1; - var7 = (var5 / 32 << 7) + var6 / 2 + (var4 / 4 << 10); - var8 = ClanChannelMember.method770(var7, 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216; - } else if (var2.texture >= 0) { - int var3 = ClanChannelMember.method770(Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; - } else { - var4 = var2.hue; - var5 = var2.saturation; - var6 = var2.lightness; - if (var6 > 179) { - var5 /= 2; - } + while (true) { + if (var25 >= var2 - 1) { + var10[var26] = var13 - 1; + var11[var26] = var14; + var26 = var26 + 1 & var12; + var9[var15 - 1][var16] = 2; + var8[var15 - 1][var16] = var24; + break; + } - if (var6 > 192) { - var5 /= 2; - } + if ((var21[var22 - 1][var25 + var23] & 19136830) != 0) { + break; + } - if (var6 > 217) { - var5 /= 2; - } + ++var25; + } + } + + if (var15 < var6 - var2 && var9[var15 + 1][var16] == 0 && (var21[var22 + var2][var23] & 19136899) == 0 && (var21[var22 + var2][var23 + var2 - 1] & 19136992) == 0) { + var25 = 1; + + while (true) { + if (var25 >= var2 - 1) { + var10[var26] = var13 + 1; + var11[var26] = var14; + var26 = var26 + 1 & var12; + var9[var15 + 1][var16] = 8; + var8[var15 + 1][var16] = var24; + break; + } + + if ((var21[var22 + var2][var25 + var23] & 19136995) != 0) { + break; + } + + ++var25; + } + } + + if (var16 > 0 && var9[var15][var16 - 1] == 0 && (var21[var22][var23 - 1] & 19136782) == 0 && (var21[var22 + var2 - 1][var23 - 1] & 19136899) == 0) { + var25 = 1; + + while (true) { + if (var25 >= var2 - 1) { + var10[var26] = var13; + var11[var26] = var14 - 1; + var26 = var26 + 1 & var12; + var9[var15][var16 - 1] = 1; + var8[var15][var16 - 1] = var24; + break; + } + + if ((var21[var22 + var25][var23 - 1] & 19136911) != 0) { + break; + } + + ++var25; + } + } + + if (var16 < var7 - var2 && var9[var15][var16 + 1] == 0 && (var21[var22][var23 + var2] & 19136824) == 0 && (var21[var22 + var2 - 1][var23 + var2] & 19136992) == 0) { + var25 = 1; - if (var6 > 243) { - var5 /= 2; + while (true) { + if (var25 >= var2 - 1) { + var10[var26] = var13; + var11[var26] = var14 + 1; + var26 = var26 + 1 & var12; + var9[var15][var16 + 1] = 4; + var8[var15][var16 + 1] = var24; + break; + } + + if ((var21[var25 + var22][var23 + var2] & 19137016) != 0) { + break; + } + + ++var25; + } + } + + if (var15 > 0 && var16 > 0 && var9[var15 - 1][var16 - 1] == 0 && (var21[var22 - 1][var23 - 1] & 19136782) == 0) { + var25 = 1; + + while (true) { + if (var25 >= var2) { + var10[var26] = var13 - 1; + var11[var26] = var14 - 1; + var26 = var26 + 1 & var12; + var9[var15 - 1][var16 - 1] = 3; + var8[var15 - 1][var16 - 1] = var24; + break; + } + + if ((var21[var22 - 1][var25 + (var23 - 1)] & 19136830) != 0 || (var21[var25 + (var22 - 1)][var23 - 1] & 19136911) != 0) { + break; + } + + ++var25; + } + } + + if (var15 < var6 - var2 && var16 > 0 && var9[var15 + 1][var16 - 1] == 0 && (var21[var22 + var2][var23 - 1] & 19136899) == 0) { + var25 = 1; + + while (true) { + if (var25 >= var2) { + var10[var26] = var13 + 1; + var11[var26] = var14 - 1; + var26 = var26 + 1 & var12; + var9[var15 + 1][var16 - 1] = 9; + var8[var15 + 1][var16 - 1] = var24; + break; + } + + if ((var21[var22 + var2][var25 + (var23 - 1)] & 19136995) != 0 || (var21[var22 + var25][var23 - 1] & 19136911) != 0) { + break; + } + + ++var25; + } + } + + if (var15 > 0 && var16 < var7 - var2 && var9[var15 - 1][var16 + 1] == 0 && (var21[var22 - 1][var23 + var2] & 19136824) == 0) { + for (var25 = 1; var25 < var2; ++var25) { + if ((var21[var22 - 1][var23 + var25] & 19136830) != 0 || (var21[var25 + (var22 - 1)][var23 + var2] & 19137016) != 0) { + continue label242; + } + } + + var10[var26] = var13 - 1; + var11[var26] = var14 + 1; + var26 = var26 + 1 & var12; + var9[var15 - 1][var16 + 1] = 6; + var8[var15 - 1][var16 + 1] = var24; + } + } while(var15 >= var6 - var2); + } while(var16 >= var7 - var2); + } while(var9[var15 + 1][var16 + 1] != 0); + } while((var21[var22 + var2][var23 + var2] & 19136992) != 0); + + for (var25 = 1; var25 < var2; ++var25) { + if ((var21[var22 + var25][var23 + var2] & 19137016) != 0 || (var21[var22 + var2][var23 + var25] & 19136995) != 0) { + continue label265; + } } - var7 = (var5 / 32 << 7) + var6 / 2 + (var4 / 4 << 10); - var8 = ClanChannelMember.method770(var7, 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216; + var10[var26] = var13 + 1; + var11[var26] = var14 + 1; + var26 = var26 + 1 & var12; + var9[var15 + 1][var16 + 1] = 12; + var8[var15 + 1][var16 + 1] = var24; } } } - @ObfuscatedName("aw") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(I)[Lsg;", - garbageValue = "-347561633" + descriptor = "(IIIZIB)J", + garbageValue = "0" ) - public static FontName[] method2419() { - return new FontName[]{FontName_verdana15, FontName_bold12, FontName_verdana13, FontName_plain11, FontName_plain12, FontName_verdana11}; - } + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; + if (var3) { + var5 |= 65536L; + } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)[Ldd;", - garbageValue = "-718226553" - ) - static class89[] method2420() { - return new class89[]{class89.field883, class89.field880, class89.field881, class89.field879, class89.field882}; + return var5; } - @ObfuscatedName("ay") + @ObfuscatedName("op") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1946858719" + descriptor = "(IB)V", + garbageValue = "-80" ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; + static void method2447(int var0) { + SequenceDefinition var1 = EnumComposition.SequenceDefinition_get(var0); + if (var1.isCachedModelIdSet()) { + if (ClientPreferences.method571(var1.SequenceDefinition_cachedModelId) == 2) { + Client.field609.add(var1.SequenceDefinition_cachedModelId); + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Fonts.java b/osrs/src/main/java/Fonts.java index f181f145e..6732fd4ac 100644 --- a/osrs/src/main/java/Fonts.java +++ b/osrs/src/main/java/Fonts.java @@ -1,30 +1,34 @@ -import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sz") +import java.util.HashMap; + +@ObfuscatedName("sr") @Implements("Fonts") public class Fonts { - @ObfuscatedName("aw") + @ObfuscatedName("af") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;)V" + descriptor = "(Lnu;Lnu;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; @@ -32,10 +36,10 @@ public Fonts(AbstractArchive var1, AbstractArchive var2) { this.map = new HashMap(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "([Lsg;I)Ljava/util/HashMap;", - garbageValue = "-631729363" + descriptor = "([Lsp;I)Ljava/util/HashMap;", + garbageValue = "-537170056" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -56,7 +60,7 @@ public HashMap createMap(FontName[] var1) { } else { int var10 = var7.getGroupId(var9); int var11 = var7.getFileId(var10, ""); - var6 = ConcurrentMidiTask.method2106(var7, var8, var10, var11); + var6 = LoginPacket.method1613(var7, var8, var10, var11); } if (var6 != null) { @@ -68,4 +72,4 @@ public HashMap createMap(FontName[] var1) { return var2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Frames.java b/osrs/src/main/java/Frames.java index 8af48faf6..ca60cda53 100644 --- a/osrs/src/main/java/Frames.java +++ b/osrs/src/main/java/Frames.java @@ -3,29 +3,20 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") +@ObfuscatedName("jt") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("aj") + @ObfuscatedName("af") + static int field2121; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("ItemDefinition_archive") - static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("tm") - @ObfuscatedSignature( - descriptor = "Lud;" - ) - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "[Lim;" + descriptor = "[Lia;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;IZ)V" + descriptor = "(Lnu;Lnu;IZ)V" ) Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); @@ -62,13 +53,255 @@ public class Frames extends DualNode { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-844175799" + garbageValue = "-8394863" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-292158439" + ) + public static void method1293(int var0, int var1) { + VarbitComposition var2 = class384.method2022(var0); + int var3 = var2.baseVar; + int var4 = var2.startBit; + int var5 = var2.endBit; + int var6 = Varps.Varps_masks[var5 - var4]; + if (var1 < 0 || var1 > var6) { + var1 = 0; + } + + var6 <<= var4; + Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1760053534" + ) + public static int method1292(int var0) { + return class464.field3907[var0 & 16383]; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILdh;ZB)I", + garbageValue = "-8" + ) + static int method1295(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == 100) { + SoundCache.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + if (var4 == 0) { + throw new RuntimeException(); + } else { + Widget var6 = class92.getWidget(var3); + if (var6.children == null) { + var6.children = new Widget[var5 + 1]; + } + + if (var6.children.length <= var5) { + Widget[] var7 = new Widget[var5 + 1]; + + for (int var8 = 0; var8 < var6.children.length; ++var8) { + var7[var8] = var6.children[var8]; + } + + var6.children = var7; + } + + if (var5 > 0 && var6.children[var5 - 1] == null) { + throw new RuntimeException("" + (var5 - 1)); + } else { + Widget var12 = new Widget(); + var12.type = var4; + var12.parentId = var12.id = var6.id; + var12.childIndex = var5; + var12.isIf3 = true; + if (var4 == 12) { + var12.method1843(); + var12.method1844().method1778(new class105(var12)); + var12.method1844().method1777(new class106(var12)); + } + + var6.children[var5] = var12; + if (var2) { + GameObject.scriptDotWidget = var12; + } else { + SceneTilePaint.scriptActiveWidget = var12; + } + + class218.invalidateWidget(var6); + return 1; + } + } + } else { + Widget var9; + if (var0 == 101) { + var9 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + Widget var10 = class92.getWidget(var9.id); + var10.children[var9.childIndex] = null; + class218.invalidateWidget(var10); + return 1; + } else if (var0 == 102) { + var9 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + var9.children = null; + class218.invalidateWidget(var9); + return 1; + } else if (var0 != 200) { + if (var0 == 201) { + var9 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + if (var9 != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + if (var2) { + GameObject.scriptDotWidget = var9; + } else { + SceneTilePaint.scriptActiveWidget = var9; + } + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Widget var11 = SoundCache.getWidgetChild(var3, var4); + if (var11 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + if (var2) { + GameObject.scriptDotWidget = var11; + } else { + SceneTilePaint.scriptActiveWidget = var11; + } + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(ZLto;I)V", + garbageValue = "101109035" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field492 = 0; + Client.field451 = 0; + var1.importIndex(); + int var2 = var1.readBits(8); + int var3; + if (var2 < Client.npcCount) { + for (var3 = var2; var3 < Client.npcCount; ++var3) { + Client.field564[++Client.field492 - 1] = Client.npcIndices[var3]; + } + } + + if (var2 > Client.npcCount) { + throw new RuntimeException(""); + } else { + Client.npcCount = 0; + + for (var3 = 0; var3 < var2; ++var3) { + int var4 = Client.npcIndices[var3]; + NPC var5 = Client.npcs[var4]; + int var6 = var1.readBits(1); + if (var6 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var4; + var5.npcCycle = Client.cycle; + } else { + int var7 = var1.readBits(2); + if (var7 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var4; + var5.npcCycle = Client.cycle; + Client.field552[++Client.field451 - 1] = var4; + } else { + int var8; + int var9; + if (var7 == 1) { + Client.npcIndices[++Client.npcCount - 1] = var4; + var5.npcCycle = Client.cycle; + var8 = var1.readBits(3); + var5.move(var8, MoveSpeed.WALK); + var9 = var1.readBits(1); + if (var9 == 1) { + Client.field552[++Client.field451 - 1] = var4; + } + } else if (var7 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var4; + var5.npcCycle = Client.cycle; + if (var1.readBits(1) == 1) { + var8 = var1.readBits(3); + var5.move(var8, MoveSpeed.RUN); + var9 = var1.readBits(3); + var5.move(var9, MoveSpeed.RUN); + } else { + var8 = var1.readBits(3); + var5.move(var8, MoveSpeed.CRAWL); + } + + var8 = var1.readBits(1); + if (var8 == 1) { + Client.field552[++Client.field451 - 1] = var4; + } + } else if (var7 == 3) { + Client.field564[++Client.field492 - 1] = var4; + } + } + } + } + + class349.method1874(var0, var1); + class151.method795(var1); + + for (var2 = 0; var2 < Client.field492; ++var2) { + var3 = Client.field564[var2]; + if (Client.npcs[var3].npcCycle != Client.cycle) { + Client.npcs[var3].definition = null; + Client.npcs[var3] = null; + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var2 = 0; var2 < Client.npcCount; ++var2) { + if (Client.npcs[Client.npcIndices[var2]] == null) { + throw new RuntimeException(var2 + "," + Client.npcCount); + } + } + + } + } + } + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1066961664" + ) + static void method1297() { + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Friend.java b/osrs/src/main/java/Friend.java index 0c00221bf..5dae40e82 100644 --- a/osrs/src/main/java/Friend.java +++ b/osrs/src/main/java/Friend.java @@ -3,21 +3,21 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qi") +@ObfuscatedName("qo") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("aw") - boolean field3782; - @ObfuscatedName("ay") - boolean field3783; + @ObfuscatedName("au") + boolean field3794; + @ObfuscatedName("ae") + boolean field3793; Friend() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqi;I)I", - garbageValue = "-1755487366" + descriptor = "(Lqo;I)I", + garbageValue = "-1434956269" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -29,23 +29,23 @@ int compareToFriend(Friend var1) { return -1; } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field3782 && !var1.field3782) { + } else if (this.field3794 && !var1.field3794) { return -1; - } else if (!this.field3782 && var1.field3782) { + } else if (!this.field3794 && var1.field3794) { return 1; - } else if (this.field3783 && !var1.field3783) { + } else if (this.field3793 && !var1.field3793) { return -1; - } else if (!this.field3783 && var1.field3783) { + } else if (!this.field3793 && var1.field3793) { return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lqe;B)I", - garbageValue = "114" + descriptor = "(Lqs;I)I", + garbageValue = "1756748027" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -56,4 +56,4 @@ public int compareTo_user(User var1) { public int compareTo(Object var1) { return this.compareToFriend((Friend)var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FriendLoginUpdate.java b/osrs/src/main/java/FriendLoginUpdate.java index b93f8fe53..7db9f27df 100644 --- a/osrs/src/main/java/FriendLoginUpdate.java +++ b/osrs/src/main/java/FriendLoginUpdate.java @@ -3,50 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qt") +@ObfuscatedName("qg") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("aw") - public int field3784; - @ObfuscatedName("ay") + @ObfuscatedName("la") + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("au") + public int field3796; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lui;" + descriptor = "Luc;" ) @Export("friendUsername") public Username friendUsername; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("worldId") public short worldId; @ObfuscatedSignature( - descriptor = "(Lui;I)V" + descriptor = "(Luc;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3784 = (int)(class113.clockNow() / 1000L); + this.field3796 = (int)(GameEngine.clockNow() / 1000L); this.friendUsername = var1; this.worldId = (short)var2; } - - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1532325121" - ) - static final void method2176() { - Client.field485 = 0; - int var0 = (class136.localPlayer.x >> 7) + AbstractArchive.baseX; - int var1 = (class136.localPlayer.y >> 7) + class148.baseY; - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { - Client.field485 = 1; - } - - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { - Client.field485 = 1; - } - - if (Client.field485 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { - Client.field485 = 0; - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FriendSystem.java b/osrs/src/main/java/FriendSystem.java index 1fddfc656..b7aff205d 100644 --- a/osrs/src/main/java/FriendSystem.java +++ b/osrs/src/main/java/FriendSystem.java @@ -1,35 +1,37 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +import java.util.Iterator; + +@ObfuscatedName("ci") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lqk;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lqm;" + descriptor = "Lqq;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("ag") + @ObfuscatedName("az") + @Export("friendListStatus") int friendListStatus; @ObfuscatedSignature( - descriptor = "(Lsi;)V" + descriptor = "(Lsl;)V" ) FriendSystem(LoginType var1) { this.friendListStatus = 0; @@ -38,28 +40,28 @@ public class FriendSystem { this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "106" + descriptor = "(I)Z", + garbageValue = "1751365649" ) - boolean method406() { + boolean method398() { return this.friendListStatus == 2; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "109" + descriptor = "(I)V", + garbageValue = "-641955560" ) - final void setFriendListToLoaded() { + final void method399() { this.friendListStatus = 1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "1175550458" + descriptor = "(Ltm;II)V", + garbageValue = "-479200024" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { @@ -71,28 +73,34 @@ final void readUpdate(Buffer var1, int var2) { var4.clearIsFriend(); } - class106.method619(); - if (Canvas.friendsChat != null) { - Canvas.friendsChat.clearFriends(); + Iterator var5 = Messages.Messages_hashTable.iterator(); + + while (var5.hasNext()) { + Message var6 = (Message)var5.next(); + var6.clearIsFromFriend(); + } + + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.clearFriends(); } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-119" + descriptor = "(I)V", + garbageValue = "-676446193" ) @Export("processFriendUpdates") final void processFriendUpdates() { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3784 < class113.clockNow() / 1000L - 5L) { + if ((long)var1.field3796 < GameEngine.clockNow() / 1000L - 5L) { if (var1.worldId > 0) { - class415.addGameMessage(5, "", var1.friendUsername + " has logged in."); + MouseHandler.addGameMessage(5, "", var1.friendUsername + " has logged in."); } if (var1.worldId == 0) { - class415.addGameMessage(5, "", var1.friendUsername + " has logged out."); + MouseHandler.addGameMessage(5, "", var1.friendUsername + " has logged out."); } var1.remove(); @@ -101,10 +109,10 @@ final void processFriendUpdates() { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1126290435" + descriptor = "(B)V", + garbageValue = "60" ) @Export("clear") final void clear() { @@ -113,26 +121,26 @@ final void clear() { this.ignoreList.clear(); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lui;ZB)Z", - garbageValue = "77" + descriptor = "(Luc;ZI)Z", + garbageValue = "496878304" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } else if (var1.equals(class136.localPlayer.username)) { + } else if (var1.equals(VarbitComposition.localPlayer.username)) { return true; } else { return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lui;I)Z", - garbageValue = "1453652382" + descriptor = "(Luc;I)Z", + garbageValue = "-1644388901" ) @Export("isIgnored") final boolean isIgnored(Username var1) { @@ -143,10 +151,10 @@ final boolean isIgnored(Username var1) { } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "119" + garbageValue = "76" ) @Export("addFriend") final void addFriend(String var1) { @@ -154,34 +162,34 @@ final void addFriend(String var1) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsListIsFull()) { - Tile.method1160("Your friend list is full. Max of 200 for free users, and 400 for members"); - } else if (class136.localPlayer.username.equals(var2)) { - class220.method1126(); + UserComparator8.method673("Your friend list is full. Max of 200 for free users, and 400 for members"); + } else if (VarbitComposition.localPlayer.username.equals(var2)) { + Clock.method931(); } else if (this.isFriended(var2, false)) { - WorldMapSectionType.method1481(var1); + Strings.method1877(var1); } else if (this.isIgnored(var2)) { - Tile.method1160("Please remove " + var1 + " from your ignore list first"); + UserComparator8.method673("Please remove " + var1 + " from your ignore list first"); } else { - Canvas.method83(var1); + MouseHandler.method171(var1); } } } } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-30" + descriptor = "(I)Z", + garbageValue = "1246160052" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.isMembers != 1; } - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "109" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "541901649" ) @Export("addIgnore") final void addIgnore(String var1) { @@ -189,34 +197,37 @@ final void addIgnore(String var1) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.canAddIgnore()) { - UserComparator5.method672(); - } else if (class136.localPlayer.username.equals(var2)) { - Tile.method1160("You can't add yourself to your own ignore list"); + UserComparator8.method673("Your ignore list is full. Max of 100 for free users, and 400 for members"); + } else if (VarbitComposition.localPlayer.username.equals(var2)) { + class503.method2501(); } else if (this.isIgnored(var2)) { - MusicPatchNode.method1660(var1); + class31.method121(var1); } else if (this.isFriended(var2, false)) { - Tile.method1160("Please remove " + var1 + " from your friend list first"); + UserComparator8.method673("Please remove " + var1 + " from your friend list first"); } else { - ItemContainer.method467(var1); + PacketBufferNode var3 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IGNORELIST_ADD, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); } } } } - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-876943227" + garbageValue = "203788977" ) @Export("canAddIgnore") final boolean canAddIgnore() { return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.isMembers != 1; } - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1474613294" + garbageValue = "2045043911" ) @Export("removeFriend") final void removeFriend(String var1) { @@ -224,9 +235,9 @@ final void removeFriend(String var1) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { - Client.field516 = Client.cycleCntr; - PacketBufferNode var3 = class503.getPacketBufferNode(ClientPacket.FRIENDLIST_DEL, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class501.stringCp1252NullTerminatedByteSize(var1)); + class113.method663(); + PacketBufferNode var3 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.FRIENDLIST_DEL, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } @@ -236,19 +247,25 @@ final void removeFriend(String var1) { var4.clearIsFriend(); } - class106.method619(); - if (Canvas.friendsChat != null) { - Canvas.friendsChat.clearFriends(); + Iterator var6 = Messages.Messages_hashTable.iterator(); + + while (var6.hasNext()) { + Message var7 = (Message)var6.next(); + var7.clearIsFromFriend(); + } + + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.clearFriends(); } } } } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)V", - garbageValue = "-31" + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "81642025" ) @Export("removeIgnore") public final void removeIgnore(String var1, boolean var2) { @@ -256,24 +273,24 @@ public final void removeIgnore(String var1, boolean var2) { Username var3 = new Username(var1, this.loginType); if (var3.hasCleanName()) { if (this.ignoreList.removeByUsername(var3)) { - Client.field516 = Client.cycleCntr; + class113.method663(); if (var2) { - PacketBufferNode var4 = class503.getPacketBufferNode(ClientPacket.IGNORELIST_DEL, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(class501.stringCp1252NullTerminatedByteSize(var1)); + PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IGNORELIST_DEL, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var1)); var4.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var4); } } - GameBuild.FriendSystem_invalidateIgnoreds(); + AbstractSocket.FriendSystem_invalidateIgnoreds(); } } } - @ObfuscatedName("ak") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lui;B)Z", - garbageValue = "24" + descriptor = "(Luc;I)Z", + garbageValue = "1021453892" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { @@ -281,255 +298,60 @@ final boolean isFriendAndHasWorld(Username var1) { return var2 != null && var2.hasWorld(); } - @ObfuscatedName("bq") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-1211828959" + descriptor = "([Ljava/lang/String;[SIIB)V", + garbageValue = "108" ) - static int method420(int var0, Script var1, boolean var2) { - String var3; - int var4; - if (var0 == 4100) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } else { - String var9; - if (var0 == 4101) { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else if (var0 == 4102) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + class509.intToString(var4, true); - return 1; - } else if (var0 == 4103) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; - } else { - int var6; - int var10; - if (var0 == 4104) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - long var11 = (11745L + (long)var10) * 86400000L; - Interpreter.Interpreter_calendar.setTime(new Date(var11)); - var6 = Interpreter.Interpreter_calendar.get(5); - int var17 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; - return 1; - } else if (var0 != 4105) { - if (var0 == 4106) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == 4107) { - Interpreter.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.method1909(FloorOverlayDefinition.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], Interpreter.clientLanguage)); - return 1; - } else { - int var5; - byte[] var13; - Font var14; - if (var0 == 4108) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var13 = FontName.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); - return 1; - } else if (var0 == 4109) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var13 = FontName.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); - return 1; - } else if (var0 == 4110) { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9; - } - - return 1; - } else if (var0 == 4111) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == 4112) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var4; - return 1; - } else if (var0 == 4113) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ChatChannel.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4114) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class126.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4115) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4116) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class164.isDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4117) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 4118) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); - return 1; - } else if (var0 == 4119) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - StringBuilder var18 = new StringBuilder(var3.length()); - boolean var16 = false; - - for (var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if (var7 == '<') { - var16 = true; - } else if (var7 == '>') { - var16 = false; - } else if (!var16) { - var18.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18.toString(); - return 1; - } else if (var0 == 4120) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4); - return 1; - } else if (var0 == 4121) { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); - return 1; - } else if (var0 == 4122) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else if (var0 == 4123) { - Interpreter.Interpreter_stringStackSize -= 3; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - String var15 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 2]; - if (class136.localPlayer.appearance == null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15; - return 1; - } else { - switch(class136.localPlayer.appearance.field2899) { - case 0: - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - break; - case 1: - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9; - break; - case 2: - default: - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15; - } - - return 1; - } - } else { - return 2; - } - } - } else { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - if (class136.localPlayer.appearance != null && class136.localPlayer.appearance.field2900 != 0) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - } - - return 1; + @Export("sortItemsByName") + public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + short var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + short var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; } } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + sortItemsByName(var0, var1, var2, var5 - 1); + sortItemsByName(var0, var1, var5 + 1, var3); } + } - @ObfuscatedName("lq") + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "(Lmt;IIZI)V", - garbageValue = "-593729074" + descriptor = "(I)I", + garbageValue = "284694724" ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; - int var5 = var0.height; - if (var0.widthAlignment == 0) { - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { - var0.width = var0.rawWidth * var1 >> 14; - } - - if (var0.heightAlignment == 0) { - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; - } - - if (var0.widthAlignment == 4) { - var0.width = var0.height * var0.field2990 / var0.field2981; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.width * var0.field2981 / var0.field2990; - } + static int method412() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + int var0 = 0; - if (var0.contentType == 1337) { - Client.viewportWidget = var0; - } - - if (var0.type == 12) { - var0.method1805().method1699(var0.width, var0.height); - } + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + } - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args = var0.onResize; - Client.scriptEvents.addFirst(var6); + return var0 * 10000 / Client.field550; + } else { + return 10000; } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FriendsChat.java b/osrs/src/main/java/FriendsChat.java index 6cf5aa2bf..51e95480c 100644 --- a/osrs/src/main/java/FriendsChat.java +++ b/osrs/src/main/java/FriendsChat.java @@ -3,39 +3,45 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qk") +@ObfuscatedName("qc") @Implements("FriendsChat") public class FriendsChat extends UserList { - @ObfuscatedName("ay") + @ObfuscatedName("iv") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lev;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lsl;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lqv;" + descriptor = "Lql;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("name") public String name; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("owner") public String owner; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("minKick") public byte minKick; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("rank") public int rank; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("memberCount") int memberCount; @ObfuscatedSignature( - descriptor = "(Lsi;Lqv;)V" + descriptor = "(Lsl;Lql;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { super(500); @@ -46,51 +52,51 @@ public FriendsChat(LoginType var1, Usernamed var2) { this.localUser = var2; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)Lqe;", - garbageValue = "3401" + descriptor = "(I)Lqs;", + garbageValue = "-1997275235" ) @Export("newInstance") User newInstance() { return new ClanMate(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IB)[Lqe;", - garbageValue = "7" + descriptor = "(IB)[Lqs;", + garbageValue = "99" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1311029407" + garbageValue = "-1793987000" ) - final void method2166(String var1) { - this.name = MusicPatchPcmStream.method1652(var1); + final void method2198(String var1) { + this.name = class385.method2023(var1); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-429338938" + garbageValue = "-1839249281" ) - final void method2167(String var1) { - this.owner = MusicPatchPcmStream.method1652(var1); + final void method2199(String var1) { + this.owner = class385.method2023(var1); } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-1516158083" + descriptor = "(Ltm;II)V", + garbageValue = "1203512341" ) - public final void method2168(Buffer var1, int var2) { - this.method2167(var1.readStringCp1252NullTerminated()); + public final void method2201(Buffer var1, int var2) { + this.method2199(var1.readStringCp1252NullTerminated()); long var3 = var1.readLong(); long var6 = var3; String var5; @@ -101,7 +107,7 @@ public final void method2168(Buffer var1, int var2) { } else { var8 = 0; - for (long var9 = var3; var9 != 0L; var9 /= 37L) { + for (long var9 = var3; 0L != var9; var9 /= 37L) { ++var8; } @@ -110,7 +116,7 @@ public final void method2168(Buffer var1, int var2) { while (var6 != 0L) { long var12 = var6; var6 /= 37L; - var11.append(class389.base37Table[(int)(var12 - 37L * var6)]); + var11.append(class388.base37Table[(int)(var12 - var6 * 37L)]); } var5 = var11.reverse().toString(); @@ -119,7 +125,7 @@ public final void method2168(Buffer var1, int var2) { var5 = null; } - this.method2166(var5); + this.method2198(var5); this.minKick = var1.readByte(); short var14; if (var2 == 1) { @@ -130,11 +136,11 @@ public final void method2168(Buffer var1, int var2) { throw new IllegalArgumentException("Invalid friend chat full update version: " + var2); } - var8 = var1.method2540(); + var8 = var1.method2560(); var14 = -1; } - if (var8 != var14) { + if (var14 != var8) { int var10 = var8; this.clear(); @@ -150,12 +156,12 @@ public final void method2168(Buffer var1, int var2) { } } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "808649523" + descriptor = "(Ltm;B)V", + garbageValue = "-59" ) - public final void method2169(Buffer var1) { + public final void method2202(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); @@ -192,10 +198,10 @@ public final void method2169(Buffer var1) { } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-157826721" + descriptor = "(B)V", + garbageValue = "-39" ) @Export("clearFriends") public final void clearFriends() { @@ -205,10 +211,10 @@ public final void clearFriends() { } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "9" + garbageValue = "-1" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { @@ -218,10 +224,10 @@ public final void invalidateIgnoreds() { } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lqg;B)V", - garbageValue = "115" + descriptor = "(Lqx;I)V", + garbageValue = "-617315153" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { @@ -231,93 +237,89 @@ final void isLocalPlayer(ClanMate var1) { } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Lsi;I)Ljava/lang/String;", - garbageValue = "-1798627336" + descriptor = "(IIIII)V", + garbageValue = "-652647003" ) - public static String method2165(CharSequence var0, LoginType var1) { - if (var0 == null) { - return null; - } else { - int var2 = 0; + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var4 == null) { + var4 = new ItemContainer(); + ItemContainer.itemContainers.put(var4, (long)var0); + } - int var3; - for (var3 = var0.length(); var2 < var3 && WorldMapArea.method1383(var0.charAt(var2)); ++var2) { + if (var4.ids.length <= var1) { + int[] var5 = new int[var1 + 1]; + int[] var6 = new int[var1 + 1]; + + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { + var5[var7] = var4.ids[var7]; + var6[var7] = var4.quantities[var7]; } - while (var3 > var2 && WorldMapArea.method1383(var0.charAt(var3 - 1))) { - --var3; + for (var7 = var4.ids.length; var7 < var1; ++var7) { + var5[var7] = -1; + var6[var7] = 0; } - int var4 = var3 - var2; - if (var4 >= 1 && var4 <= DelayFadeTask.method2089(var1)) { - StringBuilder var5 = new StringBuilder(var4); - - for (int var6 = var2; var6 < var3; ++var6) { - char var7 = var0.charAt(var6); - boolean var8; - if (Character.isISOControl(var7)) { - var8 = false; - } else if (class126.isAlphaNumeric(var7)) { - var8 = true; - } else { - char[] var9 = class494.field4067; - int var10 = 0; - - label62: - while (true) { - char var11; - if (var10 >= var9.length) { - var9 = class494.field4066; - - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - if (var11 == var7) { - var8 = true; - break label62; - } - } - - var8 = false; - break; - } - - var11 = var9[var10]; - if (var7 == var11) { - var8 = true; - break; - } - - ++var10; - } + var4.ids = var5; + var4.quantities = var6; + } + + var4.ids[var1] = var2; + var4.quantities[var1] = var3; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "([BIILiv;[Lis;I)V", + garbageValue = "420755705" + ) + static final void method2206(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); + int var6 = -1; + + while (true) { + int var7 = var5.method2561(); + if (var7 == 0) { + return; + } + + var6 += var7; + int var8 = 0; + + while (true) { + int var9 = var5.readUShortSmart(); + if (var9 == 0) { + break; + } + + var8 += var9 - 1; + int var10 = var8 & 63; + int var11 = var8 >> 6 & 63; + int var12 = var8 >> 12; + int var13 = var5.readUnsignedByte(); + int var14 = var13 >> 2; + int var15 = var13 & 3; + int var16 = var11 + var1; + int var17 = var10 + var2; + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { + int var18 = var12; + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { + var18 = var12 - 1; } - if (var8) { - char var12 = class20.method73(var7); - if (var12 != 0) { - var5.append(var12); - } + CollisionMap var19 = null; + if (var18 >= 0) { + var19 = var4[var18]; } - } - if (var5.length() == 0) { - return null; - } else { - return var5.toString(); + class128.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); } - } else { - return null; } } } - - @ObfuscatedName("ou") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "256" - ) - static void method2173(int var0) { - Client.oculusOrbState = var0; - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/FriendsList.java b/osrs/src/main/java/FriendsList.java index 9bceadb9c..e8d70f44b 100644 --- a/osrs/src/main/java/FriendsList.java +++ b/osrs/src/main/java/FriendsList.java @@ -3,58 +3,58 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qp") +@ObfuscatedName("qk") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("am") - int field3772; - @ObfuscatedName("as") + @ObfuscatedName("at") + int field3782; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lox;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lsi;)V" + descriptor = "(Lsl;)V" ) public FriendsList(LoginType var1) { super(400); - this.field3772 = 1; + this.field3782 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)Lqe;", - garbageValue = "3401" + descriptor = "(I)Lqs;", + garbageValue = "-1997275235" ) @Export("newInstance") User newInstance() { return new Friend(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IB)[Lqe;", - garbageValue = "7" + descriptor = "(IB)[Lqs;", + garbageValue = "99" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lui;ZI)Z", - garbageValue = "326733323" + descriptor = "(Luc;ZI)Z", + garbageValue = "-1577740414" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -66,10 +66,10 @@ public boolean isFriended(Username var1, boolean var2) { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lty;IB)V", - garbageValue = "63" + descriptor = "(Ltm;IB)V", + garbageValue = "-1" ) @Export("read") public void read(Buffer var1, int var2) { @@ -94,7 +94,7 @@ public void read(Buffer var1, int var2) { Friend var11 = (Friend)this.getByCurrentUsername(var4); if (var3) { Friend var12 = (Friend)this.getByCurrentUsername(var5); - if (var12 != null && var11 != var12) { + if (var12 != null && var12 != var11) { if (var11 != null) { this.remove(var12); } else { @@ -133,17 +133,17 @@ public void read(Buffer var1, int var2) { } if (var6 != var11.world) { - var11.int2 = ++this.field3772 - 1; + var11.int2 = ++this.field3782 - 1; if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * -294863233) * -1422851713; + var11.int2 = -(var11.int2 * -1297576351) * -585067103; } var11.world = var6; } var11.rank = var7; - var11.field3782 = var9; - var11.field3783 = var10; + var11.field3794 = var9; + var11.field3793 = var10; continue; } @@ -154,4 +154,4 @@ public void read(Buffer var1, int var2) { return; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GZipDecompressor.java b/osrs/src/main/java/GZipDecompressor.java index 24f642825..fd537682a 100644 --- a/osrs/src/main/java/GZipDecompressor.java +++ b/osrs/src/main/java/GZipDecompressor.java @@ -1,13 +1,14 @@ -import java.util.zip.Inflater; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("un") +import java.util.zip.Inflater; + +@ObfuscatedName("us") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("inflater") Inflater inflater; @@ -22,10 +23,10 @@ public GZipDecompressor() { GZipDecompressor(int var1, int var2, int var3) { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;[BB)V", - garbageValue = "0" + descriptor = "(Ltm;[BI)V", + garbageValue = "1223236718" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { @@ -47,13 +48,4 @@ public void decompress(Buffer var1, byte[] var2) { throw new RuntimeException(""); } } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(S)[Lfj;", - garbageValue = "12402" - ) - static class138[] method2679() { - return new class138[]{class138.field1301, class138.field1302, class138.field1298, class138.field1297, class138.field1299, class138.field1296, class138.field1295, class138.field1303, class138.field1300}; - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GameBuild.java b/osrs/src/main/java/GameBuild.java index b1b9ec6f3..060329983 100644 --- a/osrs/src/main/java/GameBuild.java +++ b/osrs/src/main/java/GameBuild.java @@ -1,43 +1,39 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ni") +@ObfuscatedName("nb") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnb;" ) @Export("LIVE") - public static final GameBuild LIVE; - @ObfuscatedName("ay") + static final GameBuild LIVE; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnb;" ) @Export("BUILDLIVE") - public static final GameBuild BUILDLIVE; - @ObfuscatedName("ar") + static final GameBuild BUILDLIVE; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnb;" ) @Export("RC") - public static final GameBuild RC; - @ObfuscatedName("am") + static final GameBuild RC; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnb;" ) @Export("WIP") - public static final GameBuild WIP; - @ObfuscatedName("aq") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("as") + static final GameBuild WIP; + @ObfuscatedName("ac") @Export("name") public final String name; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("buildId") public final int buildId; @@ -53,42 +49,153 @@ public class GameBuild { this.buildId = var2; } - @ObfuscatedName("aw") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(Lnd;B)I", - garbageValue = "-18" + descriptor = "(ILdh;ZI)I", + garbageValue = "-1216130805" ) - static int method1836(AbstractArchive var0) { - int var1 = Login.field770.length + Login.field769.length; - String[] var2 = Login.field768; + static int method1869(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3903) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == 3904) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == 3905) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == 3906) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == 3907) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == 3908) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; + } else { + int var12; + if (var0 == 3910) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; + return 1; + } else if (var0 == 3911) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; + return 1; + } else if (var0 == 3912) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; + return 1; + } else if (var0 == 3913) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; + return 1; + } else { + boolean var13; + if (var0 == 3914) { + var13 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (class392.grandExchangeEvents != null) { + class392.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); + } - for (int var3 = 0; var3 < var2.length; ++var3) { - String var4 = var2[var3]; - if (var0.getGroupId(var4) != -1) { - ++var1; - } - } + return 1; + } else if (var0 == 3915) { + var13 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (class392.grandExchangeEvents != null) { + class392.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); + } - return var1; - } + return 1; + } else if (var0 == 3916) { + SoundCache.Interpreter_intStackSize -= 2; + var13 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1] == 1; + if (class392.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; + class392.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); + } - @ObfuscatedName("nv") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); + return 1; + } else if (var0 == 3917) { + var13 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (class392.grandExchangeEvents != null) { + class392.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); + } - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); - } + return 1; + } else if (var0 == 3918) { + var13 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (class392.grandExchangeEvents != null) { + class392.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); + } - if (Canvas.friendsChat != null) { - Canvas.friendsChat.invalidateIgnoreds(); + return 1; + } else if (var0 == 3919) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class392.grandExchangeEvents == null ? 0 : class392.grandExchangeEvents.events.size(); + return 1; + } else { + GrandExchangeEvent var11; + if (var0 == 3920) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var11.world; + return 1; + } else if (var0 == 3921) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var11.getOfferName(); + return 1; + } else if (var0 == 3922) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); + return 1; + } else if (var0 == 3923) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); + long var5 = GameEngine.clockNow() - class132.field1272 - var11.age; + int var7 = (int)(var5 / 3600000L); + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == 3924) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == 3925) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == 3926) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + return 1; + } else if (var0 == 3939) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).isTradable ? 1 : 0; + return 1; + } else { + return 2; + } + } + } } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GameEngine.java b/osrs/src/main/java/GameEngine.java index ecd987aab..3d4d7ee3c 100644 --- a/osrs/src/main/java/GameEngine.java +++ b/osrs/src/main/java/GameEngine.java @@ -1,138 +1,132 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + import java.applet.Applet; -import java.awt.Color; -import java.awt.Container; -import java.awt.EventQueue; -import java.awt.Frame; -import java.awt.Graphics; -import java.awt.Insets; -import java.awt.LayoutManager; -import java.awt.Rectangle; -import java.awt.Toolkit; +import java.awt.*; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.ClipboardOwner; import java.awt.datatransfer.StringSelection; -import java.awt.event.ActionEvent; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; +import java.awt.event.*; import java.awt.image.ImageObserver; import java.net.URL; -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bm") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgh;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lbq;" + descriptor = "Lbm;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("isKilled") static boolean isKilled; @ObfuscatedName("az") + @Export("gameCyclesToDo") + static int gameCyclesToDo; + @ObfuscatedName("ap") @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("fps") protected static int fps; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("graphicsTickTimes") static long[] graphicsTickTimes; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("clientTickTimes") static long[] clientTickTimes; - @ObfuscatedName("bv") - static int field101; - @ObfuscatedName("bk") + @ObfuscatedName("by") + static Image field103; + @ObfuscatedName("bs") + static int field102; + @ObfuscatedName("bb") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("bx") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Lak;" ) @Export("keyHandler") - static KeyHandler keyHandler; - @ObfuscatedName("bm") + protected static KeyHandler keyHandler; + @ObfuscatedName("bz") @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("bl") + @ObfuscatedName("bx") @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("canvasX") int canvasX; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("canvasY") int canvasY; - @ObfuscatedName("an") - int field115; - @ObfuscatedName("af") - int field112; - @ObfuscatedName("ai") + @ObfuscatedName("aj") + int field114; + @ObfuscatedName("av") + int field116; + @ObfuscatedName("aw") @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("bd") - protected boolean field121; - @ObfuscatedName("ba") + @ObfuscatedName("bh") + protected boolean field123; + @ObfuscatedName("bv") @Export("frame") Frame frame; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("br") - volatile long field126; - @ObfuscatedName("bc") + @ObfuscatedName("bq") + volatile long field128; + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Lak;" + descriptor = "Lay;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("bu") + @ObfuscatedName("bo") @Export("eventQueue") final EventQueue eventQueue; @@ -146,7 +140,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen fps = 0; graphicsTickTimes = new long[32]; clientTickTimes = new long[32]; - field101 = 500; + field102 = 500; volatileFocus = true; keyHandler = new KeyHandler(); garbageCollectorLastCollectionTime = -1L; @@ -157,11 +151,11 @@ protected GameEngine() { this.hasErrored = false; this.canvasX = 0; this.canvasY = 0; - this.field121 = false; + this.field123 = false; this.fullRedraw = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; - this.field126 = 0L; + this.field128 = 0L; EventQueue var1 = null; try { @@ -170,34 +164,35 @@ protected GameEngine() { } this.eventQueue = var1; - HorizontalAlignment.method959(new DevicePcmPlayerProvider()); + DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); + FloorDecoration.pcmPlayerProvider = var2; } - @ObfuscatedName("az") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1942642885" + garbageValue = "1343076745" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method157(); + this.method155(); } this.maxCanvasWidth = var1; this.maxCanvasHeight = var2; } - @ObfuscatedName("av") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "198791699" + garbageValue = "-272604069" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - class13.method44(1L); + PendingSpawn.method505(1L); } if (var1 != null) { @@ -207,10 +202,10 @@ final void post(Object var1) { } } - @ObfuscatedName("ap") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(I)Lgf;", - garbageValue = "1549057161" + descriptor = "(B)Lgk;", + garbageValue = "24" ) @Export("mouseWheel") protected class174 mouseWheel() { @@ -222,85 +217,115 @@ protected class174 mouseWheel() { return this.mouseWheelHandler; } - @ObfuscatedName("aq") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "68" + garbageValue = "-84" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); } - @ObfuscatedName("at") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1812985969" + descriptor = "(Ljava/lang/String;S)V", + garbageValue = "255" ) - protected void method141(String var1) { + protected void method138(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); } - @ObfuscatedName("ah") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)Ljava/awt/datatransfer/Clipboard;", - garbageValue = "1105846557" + garbageValue = "-1215097022" ) @Export("getClipboard") protected Clipboard getClipboard() { return this.clipboard; } - @ObfuscatedName("ax") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1263435879" + garbageValue = "216188058" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - class306.method1585(); - keyHandler.method94(this.canvas); + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { + class28.KeyHandler_keyCodes[186] = 57; + class28.KeyHandler_keyCodes[187] = 27; + class28.KeyHandler_keyCodes[188] = 71; + class28.KeyHandler_keyCodes[189] = 26; + class28.KeyHandler_keyCodes[190] = 72; + class28.KeyHandler_keyCodes[191] = 73; + class28.KeyHandler_keyCodes[192] = 58; + class28.KeyHandler_keyCodes[219] = 42; + class28.KeyHandler_keyCodes[220] = 74; + class28.KeyHandler_keyCodes[221] = 43; + class28.KeyHandler_keyCodes[222] = 59; + class28.KeyHandler_keyCodes[223] = 28; + } else { + class28.KeyHandler_keyCodes[44] = 71; + class28.KeyHandler_keyCodes[45] = 26; + class28.KeyHandler_keyCodes[46] = 72; + class28.KeyHandler_keyCodes[47] = 73; + class28.KeyHandler_keyCodes[59] = 57; + class28.KeyHandler_keyCodes[61] = 27; + class28.KeyHandler_keyCodes[91] = 42; + class28.KeyHandler_keyCodes[92] = 74; + class28.KeyHandler_keyCodes[93] = 43; + class28.KeyHandler_keyCodes[192] = 28; + class28.KeyHandler_keyCodes[222] = 58; + class28.KeyHandler_keyCodes[520] = 59; + } + + keyHandler.method89(this.canvas); } - @ObfuscatedName("au") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "22228" + descriptor = "(B)V", + garbageValue = "61" ) - protected final void method144() { - keyHandler.method96(); + protected final void method141() { + keyHandler.method92(); } - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lba;II)V", - garbageValue = "1385664005" + descriptor = "(Lbv;II)V", + garbageValue = "178768313" ) - protected void method145(class29 var1, int var2) { - keyHandler.method92(var1, var2); + protected void method142(class29 var1, int var2) { + keyHandler.method86(var1, var2); } - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "6" + descriptor = "(I)V", + garbageValue = "-1089439044" ) - protected final void method146() { - WorldMapDecorationType.method1826(this.canvas); + protected final void method143() { + java.awt.Canvas var1 = this.canvas; + var1.addMouseListener(MouseHandler.MouseHandler_instance); + var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var1.addFocusListener(MouseHandler.MouseHandler_instance); } - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "712495605" + descriptor = "(B)V", + garbageValue = "122" ) @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); if (var1 != null) { Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field115); - this.contentHeight = Math.max(var2.highY, this.field112); + this.contentWidth = Math.max(var2.highX, this.field114); + this.contentHeight = Math.max(var2.highY, this.field116); if (this.contentWidth <= 0) { this.contentWidth = 1; } @@ -309,15 +334,15 @@ final void resizeCanvas() { this.contentHeight = 1; } - GrandExchangeOfferTotalQuantityComparator.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - WorldMapArchiveLoader.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - GrandExchangeOfferTotalQuantityComparator.canvasWidth) / 2; + class113.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + class177.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - class113.canvasWidth) / 2; this.canvasY = 0; - this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, WorldMapArchiveLoader.canvasHeight); - class156.rasterProvider = new RasterProvider(GrandExchangeOfferTotalQuantityComparator.canvasWidth, WorldMapArchiveLoader.canvasHeight, this.canvas, this.field121); + this.canvas.setSize(class113.canvasWidth, class177.canvasHeight); + AttackOption.rasterProvider = new RasterProvider(class113.canvasWidth, class177.canvasHeight, this.canvas, this.field123); if (var1 == this.frame) { Insets var3 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); + this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -327,25 +352,25 @@ final void resizeCanvas() { } } - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-19" + garbageValue = "59" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "3" + descriptor = "(I)V", + garbageValue = "-1724529603" ) @Export("clearBackground") void clearBackground() { int var1 = this.canvasX; int var2 = this.canvasY; - int var3 = this.contentWidth - GrandExchangeOfferTotalQuantityComparator.canvasWidth - var1; - int var4 = this.contentHeight - WorldMapArchiveLoader.canvasHeight - var2; + int var3 = this.contentWidth - class113.canvasWidth - var1; + int var4 = this.contentHeight - class177.canvasHeight - var2; if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); @@ -380,37 +405,40 @@ void clearBackground() { } - @ObfuscatedName("ak") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1818250139" + descriptor = "(S)V", + garbageValue = "239" ) @Export("replaceCanvas") final void replaceCanvas() { - keyHandler.method95(this.canvas); + keyHandler.method90(this.canvas); java.awt.Canvas var1 = this.canvas; var1.removeMouseListener(MouseHandler.MouseHandler_instance); var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); var1.removeFocusListener(MouseHandler.MouseHandler_instance); MouseHandler.MouseHandler_currentButtonVolatile = 0; if (this.mouseWheelHandler != null) { - this.mouseWheelHandler.method77(this.canvas); + this.mouseWheelHandler.method71(this.canvas); } this.addCanvas(); - keyHandler.method94(this.canvas); - WorldMapDecorationType.method1826(this.canvas); + keyHandler.method89(this.canvas); + java.awt.Canvas var2 = this.canvas; + var2.addMouseListener(MouseHandler.MouseHandler_instance); + var2.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var2.addFocusListener(MouseHandler.MouseHandler_instance); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method157(); + this.method155(); } - @ObfuscatedName("an") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "52" + descriptor = "(IIIII)V", + garbageValue = "-1491001696" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3, int var4) { @@ -427,10 +455,10 @@ protected final void startThread(int var1, int var2, int var3, int var4) { } gameEngine = this; - GrandExchangeOfferTotalQuantityComparator.canvasWidth = var1; - WorldMapArchiveLoader.canvasHeight = var2; + class113.canvasWidth = var1; + class177.canvasHeight = var2; RunException.RunException_revision = var3; - RunException.field4244 = var4; + RunException.field4287 = var4; RunException.RunException_applet = this; if (taskHandler == null) { taskHandler = new TaskHandler(); @@ -438,16 +466,16 @@ protected final void startThread(int var1, int var2, int var3, int var4) { taskHandler.newThreadTask(this, 1); } catch (Exception var6) { - class317.RunException_sendStackTrace((String)null, var6); + Messages.RunException_sendStackTrace((String)null, var6); this.error("crash"); } } - @ObfuscatedName("af") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-679598443" + descriptor = "(B)V", + garbageValue = "3" ) @Export("addCanvas") final synchronized void addCanvas() { @@ -457,20 +485,20 @@ final synchronized void addCanvas() { var1.remove(this.canvas); } - GrandExchangeOfferTotalQuantityComparator.canvasWidth = Math.max(var1.getWidth(), this.field115); - WorldMapArchiveLoader.canvasHeight = Math.max(var1.getHeight(), this.field112); + class113.canvasWidth = Math.max(var1.getWidth(), this.field114); + class177.canvasHeight = Math.max(var1.getHeight(), this.field116); Insets var2; if (this.frame != null) { var2 = this.frame.getInsets(); - GrandExchangeOfferTotalQuantityComparator.canvasWidth -= var2.left + var2.right; - WorldMapArchiveLoader.canvasHeight -= var2.bottom + var2.top; + class113.canvasWidth -= var2.right + var2.left; + class177.canvasHeight -= var2.bottom + var2.top; } this.canvas = new Canvas(this); var1.setBackground(Color.BLACK); var1.setLayout((LayoutManager)null); var1.add(this.canvas); - this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, WorldMapArchiveLoader.canvasHeight); + this.canvas.setSize(class113.canvasWidth, class177.canvasHeight); this.canvas.setVisible(true); this.canvas.setBackground(Color.BLACK); if (var1 == this.frame) { @@ -483,35 +511,35 @@ final synchronized void addCanvas() { this.canvas.addFocusListener(this); this.canvas.requestFocus(); this.fullRedraw = true; - if (class156.rasterProvider != null && GrandExchangeOfferTotalQuantityComparator.canvasWidth == class156.rasterProvider.width && WorldMapArchiveLoader.canvasHeight == class156.rasterProvider.height) { - ((RasterProvider)class156.rasterProvider).setComponent(this.canvas); - class156.rasterProvider.drawFull(0, 0); + if (AttackOption.rasterProvider != null && class113.canvasWidth == AttackOption.rasterProvider.width && class177.canvasHeight == AttackOption.rasterProvider.height) { + ((RasterProvider)AttackOption.rasterProvider).setComponent(this.canvas); + AttackOption.rasterProvider.drawFull(0, 0); } else { - class156.rasterProvider = new RasterProvider(GrandExchangeOfferTotalQuantityComparator.canvasWidth, WorldMapArchiveLoader.canvasHeight, this.canvas, this.field121); + AttackOption.rasterProvider = new RasterProvider(class113.canvasWidth, class177.canvasHeight, this.canvas, this.field123); } this.isCanvasInvalid = false; - this.field126 = class113.clockNow(); + this.field128 = clockNow(); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-823616991" + garbageValue = "366742" ) - protected void method152(boolean var1) { - if (this.field121 != var1) { - this.field121 = var1; - class156.rasterProvider.method2627(var1); - class156.rasterProvider.apply(); + protected void method149(boolean var1) { + if (this.field123 != var1) { + this.field123 = var1; + AttackOption.rasterProvider.method2646(var1); + AttackOption.rasterProvider.apply(); } } - @ObfuscatedName("al") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "120" + descriptor = "(I)Z", + garbageValue = "805251619" ) @Export("checkHost") protected final boolean checkHost() { @@ -540,52 +568,61 @@ protected final boolean checkHost() { } } - @ObfuscatedName("bd") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-968211231" + garbageValue = "-1721255354" ) @Export("clientTick") void clientTick() { - long var1 = class113.clockNow(); - long var3 = clientTickTimes[class1.field0]; - clientTickTimes[class1.field0] = var1; - class1.field0 = class1.field0 + 1 & 31; - if (var3 != 0L && var1 > var3) { + long var1 = clockNow(); + long var3 = clientTickTimes[PacketWriter.field1151]; + clientTickTimes[PacketWriter.field1151] = var1; + PacketWriter.field1151 = PacketWriter.field1151 + 1 & 31; + if (0L != var3 && var1 > var3) { } synchronized(this) { - class326.hasFocus = volatileFocus; + class370.hasFocus = volatileFocus; } this.doCycle(); } - @ObfuscatedName("bb") + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1251903818" + ) + protected final void method152() { + this.fullRedraw = true; + } + + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "939490922" + garbageValue = "543987991" ) @Export("graphicsTick") void graphicsTick() { Container var1 = this.container(); - long var2 = class113.clockNow(); - long var4 = graphicsTickTimes[class300.field2730]; - graphicsTickTimes[class300.field2730] = var2; - class300.field2730 = class300.field2730 + 1 & 31; + long var2 = clockNow(); + long var4 = graphicsTickTimes[ParamComposition.field1678]; + graphicsTickTimes[ParamComposition.field1678] = var2; + ParamComposition.field1678 = ParamComposition.field1678 + 1 & 31; if (var4 != 0L && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if (++field101 - 1 > 50) { - field101 -= 50; + if (++field102 - 1 > 50) { + field102 -= 50; this.fullRedraw = true; - this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, WorldMapArchiveLoader.canvasHeight); + this.canvas.setSize(class113.canvasWidth, class177.canvasHeight); this.canvas.setVisible(true); if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); - this.canvas.setLocation(var7.left + this.canvasX, var7.top + this.canvasY); + this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -595,7 +632,7 @@ void graphicsTick() { this.replaceCanvas(); } - this.method156(); + this.method154(); this.draw(this.fullRedraw); if (this.fullRedraw) { this.clearBackground(); @@ -604,33 +641,33 @@ void graphicsTick() { this.fullRedraw = false; } - @ObfuscatedName("bn") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1856767081" + garbageValue = "-1664691529" ) - final void method156() { + final void method154() { Bounds var1 = this.getFrameContentBounds(); - if (var1.highX != this.contentWidth || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { + if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { this.resizeCanvas(); this.resizeCanvasNextFrame = false; } } - @ObfuscatedName("ba") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-227400118" + descriptor = "(B)V", + garbageValue = "0" ) - final void method157() { + final void method155() { this.resizeCanvasNextFrame = true; } - @ObfuscatedName("bq") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "9" + garbageValue = "0" ) @Export("kill") final synchronized void kill() { @@ -665,87 +702,87 @@ final synchronized void kill() { } } - @ObfuscatedName("br") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "72" + descriptor = "(I)V", + garbageValue = "208117174" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("bw") + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "443189499" + garbageValue = "1753601126" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("be") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-23" + descriptor = "(ZI)V", + garbageValue = "-1944984067" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("bc") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "73" + descriptor = "(I)V", + garbageValue = "-1298916795" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("bi") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;ZB)V", - garbageValue = "-29" + garbageValue = "-97" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (SoundSystem.fontHelvetica13 == null) { - SoundSystem.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - class14.loginScreenFontMetrics = this.canvas.getFontMetrics(SoundSystem.fontHelvetica13); + if (ObjectSound.fontHelvetica13 == null) { + ObjectSound.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + class85.loginScreenFontMetrics = this.canvas.getFontMetrics(ObjectSound.fontHelvetica13); } if (var3) { var4.setColor(Color.black); - var4.fillRect(0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, WorldMapArchiveLoader.canvasHeight); + var4.fillRect(0, 0, class113.canvasWidth, class177.canvasHeight); } Color var5 = new Color(140, 17, 17); try { - if (class467.field3902 == null) { - class467.field3902 = this.canvas.createImage(304, 34); + if (field103 == null) { + field103 = this.canvas.createImage(304, 34); } - Graphics var6 = class467.field3902.getGraphics(); + Graphics var6 = field103.getGraphics(); var6.setColor(var5); var6.drawRect(0, 0, 303, 33); var6.fillRect(2, 2, var1 * 3, 30); var6.setColor(Color.black); var6.drawRect(1, 1, 301, 31); var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); - var6.setFont(SoundSystem.fontHelvetica13); + var6.setFont(ObjectSound.fontHelvetica13); var6.setColor(Color.white); - var6.drawString(var2, (304 - class14.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(class467.field3902, GrandExchangeOfferTotalQuantityComparator.canvasWidth / 2 - 152, WorldMapArchiveLoader.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - class85.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(field103, class113.canvasWidth / 2 - 152, class177.canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { - int var7 = GrandExchangeOfferTotalQuantityComparator.canvasWidth / 2 - 152; - int var8 = WorldMapArchiveLoader.canvasHeight / 2 - 18; + int var7 = class113.canvasWidth / 2 - 152; + int var8 = class177.canvasHeight / 2 - 18; var4.setColor(var5); var4.drawRect(var7, var8, 303, 33); var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); var4.setColor(Color.black); var4.drawRect(var7 + 1, var8 + 1, 301, 31); - var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(SoundSystem.fontHelvetica13); + var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); + var4.setFont(ObjectSound.fontHelvetica13); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - class14.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - class85.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -753,21 +790,21 @@ protected final void drawInitial(int var1, String var2, boolean var3) { } - @ObfuscatedName("bu") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-109" + descriptor = "(I)V", + garbageValue = "-146638494" ) - protected final void method160() { - class467.field3902 = null; - SoundSystem.fontHelvetica13 = null; - class14.loginScreenFontMetrics = null; + protected final void method158() { + field103 = null; + ObjectSound.fontHelvetica13 = null; + class85.loginScreenFontMetrics = null; } - @ObfuscatedName("bk") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-845408623" + garbageValue = "305949479" ) @Export("error") protected void error(String var1) { @@ -783,49 +820,49 @@ protected void error(String var1) { } } - @ObfuscatedName("bz") + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(I)Ljava/awt/Container;", - garbageValue = "-1949821746" + garbageValue = "-1637240751" ) @Export("container") Container container() { return (Container)(this.frame != null ? this.frame : this); } - @ObfuscatedName("bx") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(I)Lrk;", - garbageValue = "483391550" + descriptor = "(I)Lrb;", + garbageValue = "790707673" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field115); - int var3 = Math.max(var1.getHeight(), this.field112); + int var2 = Math.max(var1.getWidth(), this.field114); + int var3 = Math.max(var1.getHeight(), this.field116); if (this.frame != null) { Insets var4 = this.frame.getInsets(); - var2 -= var4.left + var4.right; + var2 -= var4.right + var4.left; var3 -= var4.top + var4.bottom; } return new Bounds(var2, var3); } - @ObfuscatedName("bh") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1832672848" + garbageValue = "1032464717" ) @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; } - @ObfuscatedName("bl") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2050335898" + garbageValue = "1929688897" ) @Export("vmethod1485") protected abstract void vmethod1485(); @@ -834,8 +871,8 @@ protected final boolean hasFrame() { @ObfuscatedName("destroy") public final void destroy() { if (this == gameEngine && !isKilled) { - stopTimeMs = class113.clockNow(); - class13.method44(5000L); + stopTimeMs = clockNow(); + PendingSpawn.method505(5000L); this.kill(); } } @@ -845,9 +882,9 @@ public final void destroy() { public final synchronized void paint(Graphics var1) { if (this == gameEngine && !isKilled) { this.fullRedraw = true; - if (class113.clockNow() - this.field126 > 1000L) { + if (clockNow() - this.field128 > 1000L) { Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= GrandExchangeOfferTotalQuantityComparator.canvasWidth && var2.height >= WorldMapArchiveLoader.canvasHeight) { + if (var2 == null || var2.width >= class113.canvasWidth && var2.height >= class177.canvasHeight) { this.isCanvasInvalid = true; } } @@ -862,7 +899,7 @@ public void run() { if (TaskHandler.javaVendor != null) { String var1 = TaskHandler.javaVendor.toLowerCase(); if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { - String var2 = TaskHandler.javaVersion; + String var2 = class106.javaVersion; if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { this.error("wrongjava"); return; @@ -870,11 +907,11 @@ public void run() { if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && class164.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && class330.isDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if (Skeleton.isNumber(var4) && class306.method1584(var4) < 10) { + if (class218.isNumber(var4) && HealthBarUpdate.method524(var4) < 10) { this.error("wrongjava"); return; } @@ -895,12 +932,12 @@ public void run() { var8 = new MilliClock(); } - FloorUnderlayDefinition.clock = (Clock)var8; + class332.clock = (Clock)var8; - while (stopTimeMs == 0L || class113.clockNow() < stopTimeMs) { - class313.gameCyclesToDo = FloorUnderlayDefinition.clock.wait(cycleDurationMillis, fiveOrOne); + while (0L == stopTimeMs || clockNow() < stopTimeMs) { + gameCyclesToDo = class332.clock.wait(cycleDurationMillis, fiveOrOne); - for (int var5 = 0; var5 < class313.gameCyclesToDo; ++var5) { + for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { this.clientTick(); } @@ -908,7 +945,7 @@ public void run() { this.post(this.canvas); } } catch (Exception var7) { - class317.RunException_sendStackTrace((String)null, var7); + Messages.RunException_sendStackTrace((String)null, var7); this.error("crash"); } @@ -927,7 +964,7 @@ public final void start() { @ObfuscatedName("stop") public final void stop() { if (this == gameEngine && !isKilled) { - stopTimeMs = class113.clockNow() + 4000L; + stopTimeMs = clockNow() + 4000L; } } @@ -975,74 +1012,131 @@ public final void windowOpened(WindowEvent var1) { @ObfuscatedName("init") public abstract void init(); - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Lhh;", - garbageValue = "380782889" + descriptor = "(I)J", + garbageValue = "1742672473" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; + @Export("clockNow") + public static final synchronized long clockNow() { + long var0 = System.currentTimeMillis(); + if (var0 < class301.field2754) { + Canvas.field61 += class301.field2754 - var0; } - } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IIIB)Ldc;", - garbageValue = "-91" - ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = UserComparator3.method673(var1, var0); - Script var4 = class30.method125(var3, var0); - if (var4 != null) { - return var4; - } else { - var3 = class135.method732(var2, var0); - var4 = class30.method125(var3, var0); - if (var4 != null) { - return var4; - } else { - int var5 = var0 + -512; - var4 = class30.method125(var5, var0); - return var4 != null ? var4 : null; - } - } + class301.field2754 = var0; + return var0 + Canvas.field61; } - @ObfuscatedName("nh") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIIILud;Lmi;I)V", - garbageValue = "-1471720013" + descriptor = "([Lch;II[I[II)V", + garbageValue = "1909898083" ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { - int var6 = Client.camAngleY & 2047; - int var7 = var3 * var3 + var2 * var2; - if (var7 <= 6400) { - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var10 = var9 * var2 + var3 * var8 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - if (var7 > 2500) { - var4.method2665(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); - } + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { + int var5 = var1 - 1; + int var6 = var2 + 1; + int var7 = (var2 + var1) / 2; + World var8 = var0[var7]; + var0[var7] = var0[var1]; + var0[var1] = var8; + + while (var5 < var6) { + boolean var9 = true; + + int var10; + int var11; + int var12; + do { + --var6; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var6].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var6].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var6].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var6].id; + var12 = var8.id; + } + + if (var11 != var12) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + var9 = false; + } + break; + } + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + var9 = true; + + do { + ++var5; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var5].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var5].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var5].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var5].id; + var12 = var8.id; + } + + if (var11 != var12) { + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { + World var13 = var0[var5]; + var0[var5] = var0[var6]; + var0[var6] = var13; + } } + + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GameObject.java b/osrs/src/main/java/GameObject.java index b1bf0b80a..d00a184ea 100644 --- a/osrs/src/main/java/GameObject.java +++ b/osrs/src/main/java/GameObject.java @@ -3,51 +3,57 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("jy") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("aw") + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lmi;" + ) + @Export("scriptDotWidget") + static Widget scriptDotWidget; + @ObfuscatedName("au") @Export("plane") int plane; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("z") int z; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("centerX") int centerX; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("centerY") int centerY; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lik;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("orientation") int orientation; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("startX") int startX; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("endX") int endX; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("startY") int startY; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("endY") int endY; + @ObfuscatedName("ad") + int field2306; @ObfuscatedName("aq") - int field2282; - @ObfuscatedName("at") @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("tag") public long tag; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("flags") int flags; @@ -55,35 +61,4 @@ public final class GameObject { this.tag = 0L; this.flags = 0; } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)I", - garbageValue = "37" - ) - public static int method1358(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { - int var6 = var3; - var3 = var4; - var4 = var6; - } - - var2 &= 3; - if (var2 == 0) { - return var0; - } else if (var2 == 1) { - return var1; - } else { - return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); - } - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-982961579" - ) - static int method1359(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeEvent.java b/osrs/src/main/java/GrandExchangeEvent.java index 9896fddca..572131270 100644 --- a/osrs/src/main/java/GrandExchangeEvent.java +++ b/osrs/src/main/java/GrandExchangeEvent.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ol") +@ObfuscatedName("oz") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("world") public final int world; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("age") public final long age; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Loc;" + descriptor = "Loh;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("offerName") String offerName; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lty;BI)V" + descriptor = "(Ltm;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -36,8 +36,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method1924(2); - this.grandExchangeOffer.method1925(var2); + this.grandExchangeOffer.method1958(2); + this.grandExchangeOffer.method1959(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -45,23 +45,38 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1134198101" + garbageValue = "366933810" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1406199718" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "7" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "([FIFI)F", + garbageValue = "-1423774644" + ) + static float method1953(float[] var0, int var1, float var2) { + float var3 = var0[var1]; + + for (int var4 = var1 - 1; var4 >= 0; --var4) { + var3 = var3 * var2 + var0[var4]; + } + + return var3; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeEvents.java b/osrs/src/main/java/GrandExchangeEvents.java index 786627696..f079535d1 100644 --- a/osrs/src/main/java/GrandExchangeEvents.java +++ b/osrs/src/main/java/GrandExchangeEvents.java @@ -1,28 +1,29 @@ -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ng") +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +@ObfuscatedName("no") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("events") public final List events; @@ -35,7 +36,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - descriptor = "(Lty;Z)V", + descriptor = "(Ltm;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -57,10 +58,10 @@ public GrandExchangeEvents(Buffer var1, boolean var2) { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;ZI)V", - garbageValue = "97179778" + garbageValue = "2032347624" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -71,49 +72,4 @@ public void sort(Comparator var1, boolean var2) { } } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-93" - ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; - - try { - var0 = Decimator.getPreferencesFile("", KeyHandler.field72.name, true); - Buffer var1 = class150.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { - } - - try { - if (var0 != null) { - var0.closeSync(true); - } - } catch (Exception var2) { - } - - } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "40" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - WorldMapScaleHandler.logOut(); - switch(var0) { - case 1: - class328.method1678(24); - Actor.setLoginResponseString("", "You were disconnected from the server.", ""); - break; - case 2: - class328.method1678(24); - Actor.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOffer.java b/osrs/src/main/java/GrandExchangeOffer.java index b16bdb255..641679895 100644 --- a/osrs/src/main/java/GrandExchangeOffer.java +++ b/osrs/src/main/java/GrandExchangeOffer.java @@ -3,25 +3,31 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oc") +@ObfuscatedName("oh") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("aw") + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + @Export("archive12") + static Archive archive12; + @ObfuscatedName("au") @Export("state") byte state; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("id") public int id; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("unitPrice") public int unitPrice; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("currentPrice") public int currentPrice; @@ -29,7 +35,7 @@ public GrandExchangeOffer() { } @ObfuscatedSignature( - descriptor = "(Lty;Z)V", + descriptor = "(Ltm;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -41,42 +47,42 @@ public GrandExchangeOffer(Buffer var1, boolean var2) { this.currentPrice = var1.readInt(); } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1630378592" + descriptor = "(B)I", + garbageValue = "-104" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1876480089" + garbageValue = "-247945963" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1208558885" + garbageValue = "-847011160" ) - void method1924(int var1) { + void method1958(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "336856274" + descriptor = "(IB)V", + garbageValue = "-48" ) - void method1925(int var1) { + void method1959(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); @@ -84,17 +90,14 @@ void method1925(int var1) { } - @ObfuscatedName("cb") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILmr;ZI)V", - garbageValue = "1667240320" + descriptor = "(IS)V", + garbageValue = "11520" ) - static void method1926(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = class102.getWorldMap().getMapArea(var0); - int var4 = class136.localPlayer.plane; - int var5 = (class136.localPlayer.x >> 7) + AbstractArchive.baseX; - int var6 = (class136.localPlayer.y >> 7) + class148.baseY; - Coord var7 = new Coord(var4, var5, var6); - class102.getWorldMap().method2375(var3, var7, var1, var2); + static void method1954(int var0) { + class449.field3867 = var0; + class449.field3868 = new class449[var0]; + class338.field3112 = 0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferAgeComparator.java b/osrs/src/main/java/GrandExchangeOfferAgeComparator.java index 240235aa9..6f06cd79f 100644 --- a/osrs/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,20 +1,21 @@ -import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ou") +import java.util.Comparator; + +@ObfuscatedName("nc") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lol;Lol;I)I", - garbageValue = "693904147" + descriptor = "(Loz;Loz;I)I", + garbageValue = "1942939549" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); + return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); } @Export("compare") @@ -28,4 +29,4 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferNameComparator.java b/osrs/src/main/java/GrandExchangeOfferNameComparator.java index 43ed9bb67..d04d98dba 100644 --- a/osrs/src/main/java/GrandExchangeOfferNameComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,16 +1,17 @@ -import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nj") +import java.util.Comparator; + +@ObfuscatedName("nh") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lol;Lol;I)I", - garbageValue = "19401628" + descriptor = "(Loz;Loz;I)I", + garbageValue = "1380948435" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -28,270 +29,4 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Ltc;II)V", - garbageValue = "1015918827" - ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; - if (var2) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - int var3 = var0.readBits(2); - Player var4 = Client.players[var1]; - if (var3 == 0) { - if (var2) { - var4.hasMovementPending = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (AbstractArchive.baseX + var4.pathX[0] >> 13 << 14) + (class148.baseY + var4.pathY[0] >> 13); - if (var4.movingOrientation != -1) { - Players.Players_orientations[var1] = var4.movingOrientation; - } else { - Players.Players_orientations[var1] = var4.orientation; - } - - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - ObjTypeCustomisation.updateExternalPlayer(var0, var1); - } - - } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { - var5 = var0.readBits(3); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - --var6; - --var7; - } else if (var5 == 1) { - --var7; - } else if (var5 == 2) { - ++var6; - --var7; - } else if (var5 == 3) { - --var6; - } else if (var5 == 4) { - ++var6; - } else if (var5 == 5) { - --var6; - ++var7; - } else if (var5 == 6) { - ++var7; - } else if (var5 == 7) { - ++var6; - ++var7; - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var6, var7); - var4.hasMovementPending = false; - } else if (var2) { - var4.hasMovementPending = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.hasMovementPending = false; - var4.move(var6, var7, Players.playerMovementSpeeds[var1]); - } - - } else if (var3 == 2) { - var5 = var0.readBits(4); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - var6 -= 2; - var7 -= 2; - } else if (var5 == 1) { - --var6; - var7 -= 2; - } else if (var5 == 2) { - var7 -= 2; - } else if (var5 == 3) { - ++var6; - var7 -= 2; - } else if (var5 == 4) { - var6 += 2; - var7 -= 2; - } else if (var5 == 5) { - var6 -= 2; - --var7; - } else if (var5 == 6) { - var6 += 2; - --var7; - } else if (var5 == 7) { - var6 -= 2; - } else if (var5 == 8) { - var6 += 2; - } else if (var5 == 9) { - var6 -= 2; - ++var7; - } else if (var5 == 10) { - var6 += 2; - ++var7; - } else if (var5 == 11) { - var6 -= 2; - var7 += 2; - } else if (var5 == 12) { - --var6; - var7 += 2; - } else if (var5 == 13) { - var7 += 2; - } else if (var5 == 14) { - ++var6; - var7 += 2; - } else if (var5 == 15) { - var6 += 2; - var7 += 2; - } - - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.hasMovementPending = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.hasMovementPending = false; - var4.move(var6, var7, Players.playerMovementSpeeds[var1]); - } - } else { - var4.resetPath(var6, var7); - var4.hasMovementPending = false; - } - - } else { - var5 = var0.readBits(1); - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { - var6 = var0.readBits(12); - var7 = var6 >> 10; - var8 = var6 >> 5 & 31; - if (var8 > 15) { - var8 -= 32; - } - - var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; - var11 = var9 + var4.pathY[0]; - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.hasMovementPending = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.hasMovementPending = false; - var4.move(var10, var11, Players.playerMovementSpeeds[var1]); - } - } else { - var4.resetPath(var10, var11); - var4.hasMovementPending = false; - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - class36.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (var8 + AbstractArchive.baseX + var4.pathX[0] & 16383) - AbstractArchive.baseX; - var11 = (var9 + class148.baseY + var4.pathY[0] & 16383) - class148.baseY; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.hasMovementPending = false; - } else if (var2) { - var4.hasMovementPending = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.hasMovementPending = false; - var4.move(var10, var11, Players.playerMovementSpeeds[var1]); - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - class36.Client_plane = var4.plane; - } - - } - } - } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "64983376" - ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - for (int var2 = 0; var2 < var1.ids.length; ++var2) { - var1.ids[var2] = -1; - var1.quantities[var2] = 0; - } - - } - } - - @ObfuscatedName("jm") - @ObfuscatedSignature( - descriptor = "(Ldf;ZI)V", - garbageValue = "-226318338" - ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { - var0.isUnanimated = true; - } - - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = BufferedNetSocket.calculateTag(0, 0, 0, false, var0.index); - if (var0.attachedModel != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = class306.getTileHeight(var0.x, var0.y, class36.Client_plane); - var0.playerCycle = Client.cycle; - UserComparator5.scene.addNullableObject(class36.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; - } - - var0.tileHeight = class306.getTileHeight(var0.x, var0.y, class36.Client_plane); - var0.playerCycle = Client.cycle; - UserComparator5.scene.drawEntity(class36.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); - } - } - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java index a5c6a20a8..787a6501f 100644 --- a/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,28 +1,38 @@ -import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.Comparator; + @ObfuscatedName("cu") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("fk") + @ObfuscatedName("ao") + static int field361; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lkl;" ) - static Archive field358; - @ObfuscatedName("aw") + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "[Luk;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("au") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lol;Lol;I)I", - garbageValue = "1985558289" + descriptor = "(Loz;Loz;I)I", + garbageValue = "117695478" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -55,124 +65,111 @@ public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ldi;I)V", - garbageValue = "150868940" + descriptor = "(CB)Z", + garbageValue = "126" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - UserComparator8.runScript(var0, 500000, 475000); + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; + } } - @ObfuscatedName("am") + @ObfuscatedName("jc") @ObfuscatedSignature( - descriptor = "(IIILhb;II)V", - garbageValue = "1372641495" + descriptor = "(IIIIZI)V", + garbageValue = "-1589346294" ) - static void method353(int var0, int var1, int var2, ObjectComposition var3, int var4) { - ObjectSound var5 = new ObjectSound(); - var5.plane = var0; - var5.x = var1 * 128; - var5.y = var2 * 128; - int var6 = var3.sizeX; - int var7 = var3.sizeY; - if (var4 == 1 || var4 == 3) { - var6 = var3.sizeY; - var7 = var3.sizeX; + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { + var2 = 1; } - var5.maxX = (var6 + var1) * 128; - var5.maxY = (var7 + var2) * 128; - var5.soundEffectId = var3.ambientSoundId; - var5.field687 = var3.int7 * 128; - var5.field691 = var3.int5; - var5.field692 = var3.int6; - var5.soundEffectIds = var3.soundEffectIds; - if (var3.transforms != null) { - var5.obj = var3; - var5.set(); + if (var3 < 1) { + var3 = 1; } - ObjectSound.objectSounds.addFirst(var5); - if (var5.soundEffectIds != null) { - var5.field688 = var5.field691 + (int)(Math.random() * (double)(var5.field692 - var5.field691)); + int var5 = var3 - 334; + int var6; + if (var5 < 0) { + var6 = Client.field638; + } else if (var5 >= 100) { + var6 = Client.field640; + } else { + var6 = (Client.field640 - Client.field638) * var5 / 100 + Client.field638; } - } + int var7 = var3 * var6 * 512 / (var2 * 334); + int var8; + int var9; + short var17; + if (var7 < Client.field641) { + var17 = Client.field641; + var6 = var17 * var2 * 334 / (var3 * 512); + if (var6 > Client.field634) { + var6 = Client.field634; + var8 = var3 * var6 * 512 / (var17 * 334); + var9 = (var2 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); + } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1850423431" - ) - public static void method355() { - ItemComposition.ItemDefinition_cached.clear(); - ItemComposition.ItemDefinition_cachedModels.clear(); - ItemComposition.ItemDefinition_cachedSprites.clear(); - } + var0 += var9; + var2 -= var9 * 2; + } + } else if (var7 > Client.field637) { + var17 = Client.field637; + var6 = var17 * var2 * 334 / (var3 * 512); + if (var6 < Client.field635) { + var6 = Client.field635; + var8 = var17 * var2 * 334 / (var6 * 512); + var9 = (var3 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); + } - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(ILdc;ZB)I", - garbageValue = "41" - ) - static int method356(int var0, Script var1, boolean var2) { - if (var0 == 6754) { - int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - NPCComposition var4 = Tile.getNpcDefinition(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; - return 1; - } else { - NPCComposition var5; - if (var0 == 6764) { - Interpreter.Interpreter_intStackSize -= 2; - var5 = Tile.getNpcDefinition(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.method975(var6); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.method977(var6); - return 1; - } else if (var0 == 6765) { - var5 = Tile.getNpcDefinition(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5 != null ? var5.combatLevel * 985027529 * -1879689607 : 0; - return 1; - } else { - return 2; + var1 += var9; + var3 -= var9 * 2; } } - } - @ObfuscatedName("ll") - @ObfuscatedSignature( - descriptor = "(Lmt;I)Z", - garbageValue = "1778748581" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = Clock.method920(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var3 == var2) { - return false; - } - } else if (var2 != var3) { - return false; + Client.viewportZoom = var3 * var6 / 334; + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + int[] var16 = new int[9]; + + for (var9 = 0; var9 < var16.length; ++var9) { + int var10 = var9 * 32 + 15 + 128; + int var11 = class172.method907(var10); + int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; + int var14 = var3 - 334; + if (var14 < 0) { + var14 = 0; + } else if (var14 > 100) { + var14 = 100; } + + int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; + int var13 = var15 * var11 / 256; + var16[var9] = var13 * var12 >> 16; } - return true; + Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); } + + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 4d96704b0..9118b7b18 100644 --- a/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,20 +1,18 @@ -import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ne") +import java.awt.datatransfer.Clipboard; +import java.util.Comparator; + +@ObfuscatedName("nx") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("ac") - @Export("canvasWidth") - public static int canvasWidth; - - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lol;Lol;I)I", - garbageValue = "-1467178768" + descriptor = "(Loz;Loz;I)I", + garbageValue = "1689920131" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -35,175 +33,19 @@ public boolean equals(Object var1) { @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1454802245" - ) - public static int method1909(int var0) { - if (var0 > 0) { - return 1; - } else { - return var0 < 0 ? -1 : 0; - } - } - - @ObfuscatedName("hl") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2107301035" + descriptor = "(I)V", + garbageValue = "957509190" ) - @Export("getLoginError") - static void getLoginError(int var0) { - int var1 = Login.loginIndex; - if (var0 == -3) { - Actor.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - Actor.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - Actor.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - class328.method1678(3); - Login.field747 = 1; - } else if (var0 == 4) { - class328.method1678(14); - Login.field746 = 0; - } else if (var0 == 5) { - Login.field747 = 2; - Actor.setLoginResponseString("Either your account is still logged in, or the last", "world you were using has become unavailable.", "Please try again later."); - } else if (var0 == 68) { - if (!Client.reloadJS5) { - Client.reloadJS5 = true; - InterfaceParent.reloadJS5(); - return; - } - - Actor.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (!Client.onMobile && var0 == 6) { - Actor.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - Actor.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - Actor.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - Actor.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - Actor.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - Actor.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - Actor.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - Actor.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - Actor.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - Actor.setLoginResponseString("Too many login attempts.", "You can use the Jagex Launcher to continue playing.", "Press the button below to download it now."); - class328.method1678(33); - } else if (var0 == 17) { - Actor.setLoginResponseString("To access this free world, log into a", "members world and move your character", "to a non-members area."); - } else if (var0 == 18) { - class328.method1678(14); - Login.field746 = 1; - } else if (var0 == 19) { - Actor.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - Actor.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - Actor.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - Actor.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - Actor.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - Actor.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - Actor.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - Actor.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - Actor.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); - } else if (var0 == 32) { - class328.method1678(14); - Login.field746 = 2; - } else if (var0 == 37) { - Actor.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - Actor.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { - class328.method1678(8); - } else { - if (var0 == 56) { - Actor.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - class129.updateGameState(11); - return; - } - - if (var0 == 57) { - Actor.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - class129.updateGameState(11); - return; - } - - if (var0 == 61) { - Actor.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); - class328.method1678(7); - } else { - if (var0 == 62) { - class129.updateGameState(10); - class328.method1678(9); - Actor.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); - return; - } - - if (var0 == 63) { - class129.updateGameState(10); - class328.method1678(9); - Actor.setLoginResponseString("You were signed out.", "Please sign in again.", ""); - return; - } - - if (var0 == 65 || var0 == 67) { - class129.updateGameState(10); - class328.method1678(9); - Actor.setLoginResponseString("Failed to login.", "Please try again.", ""); - return; - } - - if (var0 == 71) { - class129.updateGameState(10); - class328.method1678(7); - Actor.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); - } else if (var0 == 73) { - class129.updateGameState(10); - class328.method1678(6); - Actor.setLoginResponseString("Your date of birth information is waiting", "to be reviewed by our staff.", "It will be processed shortly."); - } else if (var0 == 72) { - class129.updateGameState(10); - class328.method1678(32); - } else { - Actor.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); - } - } - } - - class129.updateGameState(10); - boolean var3 = var1 != class93.method507(); - if (!var3 && Client.field644.method2597()) { - class328.method1678(9); - } - + public static void method1943() { + class36.reflectionChecks = new IterableNodeDeque(); } - @ObfuscatedName("hq") + @ObfuscatedName("ov") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "8" + descriptor = "(I)Ljava/awt/datatransfer/Clipboard;", + garbageValue = "1573357466" ) - static final void method1911(boolean var0) { - if (var0) { - Client.field415 = Login.field739 ? class139.field1310 : class139.field1306; - } else { - Client.field415 = class150.clientPreferences.method575(Login.Login_username) ? class139.field1309 : class139.field1307; - } - + public static Clipboard method1945() { + return class219.client.getClipboard(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 8732ed723..c0d5abfba 100644 --- a/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,16 +1,17 @@ -import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ov") +import java.util.Comparator; + +@ObfuscatedName("oy") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lol;Lol;I)I", - garbageValue = "693078358" + descriptor = "(Loz;Loz;I)I", + garbageValue = "-370241365" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -28,41 +29,4 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "17" - ) - public static int method1927(int var0, int var1) { - return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-890105680" - ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field3735) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field3731) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field3732) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.field3736 < ByteArrayPool.field3734) { - ByteArrayPool.field3727[++ByteArrayPool.field3736 - 1] = var0; - } else { - if (class152.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && class125.ByteArrayPool_altSizeArrayCounts[var1] < class152.ByteArrayPool_arrays[var1].length) { - class152.ByteArrayPool_arrays[var1][class125.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } - } - } - - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferWorldComparator.java b/osrs/src/main/java/GrandExchangeOfferWorldComparator.java index 86a3cc6a3..4ca7332d7 100644 --- a/osrs/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,19 +1,24 @@ -import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ok") +import java.awt.*; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Comparator; + +@ObfuscatedName("om") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("hk") - static int[] field3568; - - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lol;Lol;I)I", - garbageValue = "-1681652123" + descriptor = "(Loz;Loz;I)I", + garbageValue = "456180240" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -31,4 +36,895 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(IIII)Ldh;", + garbageValue = "1291618963" + ) + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = (var1 << 8) + var0; + Script var5 = ModeWhere.method1981(var3, var0); + if (var5 != null) { + return var5; + } else { + int var6 = (-3 - var2 << 8) + var0; + var5 = ModeWhere.method1981(var6, var0); + if (var5 != null) { + return var5; + } else { + int var7 = var0 + -512; + var5 = ModeWhere.method1981(var7, var0); + return var5 != null ? var5 : null; + } + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lbm;Lpi;Lpi;I)V", + garbageValue = "-567709199" + ) + static void method1950(GameEngine var0, Font var1, Font var2) { + int var5; + boolean var11; + int var35; + int var36; + boolean var45; + if (Login.worldSelectOpen) { + class212 var34 = AbstractWorldMapData.method1526(); + + while (true) { + if (!var34.method1105()) { + if (MouseHandler.MouseHandler_lastButton != 1 && (ObjTypeCustomisation.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { + break; + } + + int var4 = Login.xPadding + 280; + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class153.changeWorldSelectSorting(0, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class153.changeWorldSelectSorting(0, 1); + break; + } + + var5 = Login.xPadding + 390; + if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class153.changeWorldSelectSorting(1, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class153.changeWorldSelectSorting(1, 1); + break; + } + + var35 = Login.xPadding + 500; + if (MouseHandler.MouseHandler_lastPressedX >= var35 && MouseHandler.MouseHandler_lastPressedX <= var35 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class153.changeWorldSelectSorting(2, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var35 + 15 && MouseHandler.MouseHandler_lastPressedX <= var35 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class153.changeWorldSelectSorting(2, 1); + break; + } + + var36 = Login.xPadding + 610; + if (MouseHandler.MouseHandler_lastPressedX >= var36 && MouseHandler.MouseHandler_lastPressedX <= var36 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class153.changeWorldSelectSorting(3, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var36 + 15 && MouseHandler.MouseHandler_lastPressedX <= var36 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class153.changeWorldSelectSorting(3, 1); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { + WorldMapData_1.method1491(); + break; + } + + if (Login.hoveredWorldIndex != -1) { + World var37 = class176.World_worlds[Login.hoveredWorldIndex]; + if (var37.isDeadman()) { + var37.field679 = "beta"; + } + + var45 = false; + if (var37.properties != Client.worldProperties) { + boolean var46 = (Client.worldProperties & class510.field4125.rsOrdinal()) != 0; + var11 = var37.isDeadman(); + if (var46 && !var11 || !var46 && var11) { + var45 = true; + } + } + + ModeWhere.changeWorld(var37); + WorldMapData_1.method1491(); + if (var45) { + class415.reloadJS5(); + } + } else { + if (Login.worldSelectPage > 0 && class85.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class85.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class177.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class177.canvasHeight / 2 + 50) { + --Login.worldSelectPage; + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && Skeleton.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= class113.canvasWidth - Skeleton.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= class113.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class177.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class177.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; + } + } + break; + } + + if (var34.field1890 == 13) { + WorldMapData_1.method1491(); + break; + } + + if (var34.field1890 == 96) { + if (Login.worldSelectPage > 0 && class85.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (var34.field1890 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && Skeleton.worldSelectRightSprite != null) { + ++Login.worldSelectPage; + } + } + + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + class449.clientPreferences.getTitleMusicDisabled(!class449.clientPreferences.getTitleMusicDisabled()); + if (!class449.clientPreferences.getTitleMusicDisabled()) { + ArrayList var3 = new ArrayList(); + var3.add(new MusicSong(class385.archive6, "scape main", "", 255, false)); + class53.method291(var3, 0, 0, 0, 100, false); + } else { + Script.method445(0, 0); + } + + UrlRequester.method652(); + } + + if (Client.gameState != 5) { + if (-1L == Login.field773) { + Login.field773 = GameEngine.clockNow() + 1000L; + } + + long var23 = GameEngine.clockNow(); + if (ChatChannel.method455() && -1L == Login.field772) { + Login.field772 = var23; + if (Login.field772 > Login.field773) { + Login.field773 = Login.field772; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + if (ClanChannelMember.clientLanguage == Language.Language_EN) { + if (MouseHandler.MouseHandler_lastButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var5 = Login.xPadding + 5; + short var6 = 463; + byte var7 = 100; + byte var25 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var7 + var5 && MouseHandler.MouseHandler_lastPressedY >= var6 && MouseHandler.MouseHandler_lastPressedY <= var25 + var6) { + if (class125.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + + return; + } + } + + if (WorldMapLabelSize.World_request != null) { + class53.method296(); + } + } + + var5 = MouseHandler.MouseHandler_lastButton; + var35 = MouseHandler.MouseHandler_lastPressedX; + var36 = MouseHandler.MouseHandler_lastPressedY; + if (var5 == 0) { + var35 = MouseHandler.MouseHandler_x; + var36 = MouseHandler.MouseHandler_y; + } + + if (!ObjTypeCustomisation.mouseCam && var5 == 4) { + var5 = 1; + } + + class212 var8 = AbstractWorldMapData.method1526(); + short var39; + int var40; + if (Login.loginIndex == 0) { + var45 = false; + + while (var8.method1105()) { + if (var8.field1890 == 84) { + var45 = true; + } + } + + var40 = class452.loginBoxCenter - 80; + var39 = 291; + if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { + class30.openURL(HorizontalAlignment.method978("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + } + + var40 = class452.loginBoxCenter + 80; + if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20 || var45) { + if ((Client.worldProperties & class510.field4126.rsOrdinal()) != 0) { + Login.Login_response0 = ""; + Login.Login_response1 = "This is a Beta world."; + Login.Login_response2 = "Your normal account will not be affected."; + Login.Login_response3 = ""; + PcmPlayer.method212(1); + ObjectComposition.method1042(); + } else if ((Client.worldProperties & class510.field4127.rsOrdinal()) != 0) { + if ((Client.worldProperties & class510.field4123.rsOrdinal()) != 0) { + Login.Login_response1 = "This is a High Risk PvP world."; + Login.Login_response2 = "Players can attack each other almost everywhere"; + Login.Login_response3 = "and the Protect Item prayer won't work."; + } else { + Login.Login_response1 = "This is a PvP world."; + Login.Login_response2 = "Players can attack each other"; + Login.Login_response3 = "almost everywhere."; + } + + Login.Login_response0 = "Warning!"; + PcmPlayer.method212(1); + ObjectComposition.method1042(); + } else if ((Client.worldProperties & class510.field4123.rsOrdinal()) != 0) { + Login.Login_response1 = "This is a High Risk world."; + Login.Login_response2 = "The Protect Item prayer will"; + Login.Login_response3 = "not work on this world."; + Login.Login_response0 = "Warning!"; + PcmPlayer.method212(1); + ObjectComposition.method1042(); + } else { + WorldMapAreaData.Login_promptCredentials(false); + } + } + } else { + int var9; + short var10; + if (Login.loginIndex == 1) { + while (true) { + if (!var8.method1105()) { + var9 = class452.loginBoxCenter - 80; + var10 = 321; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + WorldMapAreaData.Login_promptCredentials(false); + } + + var9 = class452.loginBoxCenter + 80; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + PcmPlayer.method212(0); + } + break; + } + + if (var8.field1890 == 84) { + WorldMapAreaData.Login_promptCredentials(false); + } else if (var8.field1890 == 13) { + PcmPlayer.method212(0); + } + } + } else { + int var14; + int var29; + short var38; + boolean var47; + if (Login.loginIndex == 2) { + var38 = 201; + var9 = var38 + 52; + if (var5 == 1 && var36 >= var9 - 12 && var36 < var9 + 2) { + Login.currentLoginField = 0; + } + + var9 += 15; + if (var5 == 1 && var36 >= var9 - 12 && var36 < var9 + 2) { + Login.currentLoginField = 1; + } + + var9 += 15; + var38 = 361; + if (class102.field1090 != null) { + var40 = class102.field1090.highX / 2; + if (var5 == 1 && var35 >= class102.field1090.lowX - var40 && var35 <= var40 + class102.field1090.lowX && var36 >= var38 - 15 && var36 < var38) { + switch(Login.field751) { + case 1: + class30.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); + return; + case 2: + class30.openURL("https://support.runescape.com/hc/en-gb", true, false); + } + } + } + + var40 = class452.loginBoxCenter - 80; + var39 = 321; + if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + class318.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + class318.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + class318.setLoginResponseString("", "Connecting to server...", ""); + PendingSpawn.method509(false); + MusicSong.updateGameState(20); + return; + } + + var40 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { + PcmPlayer.method212(0); + Login.Login_username = ""; + Login.Login_password = ""; + class503.field4107 = 0; + class369.otp = ""; + Login.field743 = true; + } + + var40 = class452.loginBoxCenter + -117; + var39 = 277; + Login.field745 = var35 >= var40 && var35 < var40 + class136.field1295 && var36 >= var39 && var36 < var39 + User.field3801; + if (var5 == 1 && Login.field745) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && class449.clientPreferences.getUsernameToRemember() != null) { + class449.clientPreferences.setUsernameToRemember((String)null); + } + } + + var40 = class452.loginBoxCenter + 24; + var39 = 277; + Login.field744 = var35 >= var40 && var35 < var40 + class136.field1295 && var36 >= var39 && var36 < var39 + User.field3801; + if (var5 == 1 && Login.field744) { + class449.clientPreferences.setIsUsernameHidden(!class449.clientPreferences.getIsUsernameHidden()); + if (!class449.clientPreferences.getIsUsernameHidden()) { + Login.Login_username = ""; + class449.clientPreferences.setUsernameToRemember((String)null); + ObjectComposition.method1042(); + } + } + + while (true) { + Transferable var42; + do { + while (true) { + label1169: + do { + while (true) { + while (var8.method1105()) { + if (var8.field1890 != 13) { + if (Login.currentLoginField != 0) { + continue label1169; + } + + class148.method788(var8.field1889); + if (var8.field1890 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (var8.field1890 == 84 || var8.field1890 == 80) { + Login.currentLoginField = 1; + } + + if (class157.method835(var8.field1889) && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + var8.field1889; + } + } else { + PcmPlayer.method212(0); + Login.Login_username = ""; + Login.Login_password = ""; + class503.field4107 = 0; + class369.otp = ""; + Login.field743 = true; + } + } + + return; + } + } while(Login.currentLoginField != 1); + + if (var8.field1890 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } else if (var8.field1890 == 84 || var8.field1890 == 80) { + Login.currentLoginField = 0; + if (var8.field1890 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + class318.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + class318.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + class318.setLoginResponseString("", "Connecting to server...", ""); + PendingSpawn.method509(false); + MusicSong.updateGameState(20); + return; + } + } + + if ((var8.getKeyPressed(82) || var8.getKeyPressed(87)) && var8.field1890 == 67) { + Clipboard var41 = Toolkit.getDefaultToolkit().getSystemClipboard(); + var42 = var41.getContents(class219.client); + var14 = 20 - Login.Login_password.length(); + break; + } + + char var48 = var8.field1889; + if (var48 >= ' ' && var48 < 127 || var48 > 127 && var48 < 160 || var48 > 160 && var48 <= 255) { + var47 = true; + } else { + label1408: { + if (var48 != 0) { + char[] var49 = class384.cp1252AsciiExtension; + + for (var29 = 0; var29 < var49.length; ++var29) { + char var16 = var49[var29]; + if (var16 == var48) { + var47 = true; + break label1408; + } + } + } + + var47 = false; + } + } + + if (var47 && class157.method835(var8.field1889) && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + var8.field1889; + } + } + } while(var14 <= 0); + + try { + String var15 = (String)var42.getTransferData(DataFlavor.stringFlavor); + int var44 = Math.min(var14, var15.length()); + + for (int var17 = 0; var17 < var44; ++var17) { + char var19 = var15.charAt(var17); + boolean var18; + if ((var19 < ' ' || var19 >= 127) && (var19 <= 127 || var19 >= 160) && (var19 <= 160 || var19 > 255)) { + label1392: { + if (var19 != 0) { + char[] var20 = class384.cp1252AsciiExtension; + + for (int var21 = 0; var21 < var20.length; ++var21) { + char var22 = var20[var21]; + if (var22 == var19) { + var18 = true; + break label1392; + } + } + } + + var18 = false; + } + } else { + var18 = true; + } + + if (!var18 || !class157.method835(var15.charAt(var17))) { + PcmPlayer.method212(3); + return; + } + } + + Login.Login_password = Login.Login_password + var15.substring(0, var44); + } catch (UnsupportedFlavorException var32) { + } catch (IOException var33) { + } + } + } else { + Bounds var30; + if (Login.loginIndex == 3) { + var9 = Login.loginBoxX + 180; + var10 = 241; + var30 = var1.method2087(25, "need to log in using the Jagex Launcher instead.".length() - 34, "need to log in using the Jagex Launcher instead.", var9, var10); + if (var5 == 1 && var30.method2284(var35, var36)) { + class30.openURL("https://oldschool.runescape.com/launcher", true, false); + } + + var9 = Login.loginBoxX + 180; + var10 = 276; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + WorldMapAreaData.method1574(false); + } + + var9 = Login.loginBoxX + 180; + var10 = 326; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + class30.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); + return; + } + } else { + int var27; + if (Login.loginIndex == 4) { + var9 = Login.loginBoxX + 180 - 80; + var10 = 321; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + class369.otp.trim(); + if (class369.otp.length() != 6) { + class318.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class503.field4107 = Integer.parseInt(class369.otp); + class369.otp = ""; + PendingSpawn.method509(true); + class318.setLoginResponseString("", "Connecting to server...", ""); + MusicSong.updateGameState(20); + return; + } + + if (var5 == 1 && var35 >= Login.loginBoxX + 180 - 9 && var35 <= Login.loginBoxX + 180 + 130 && var36 >= 263 && var36 <= 296) { + Login.field743 = !Login.field743; + } + + if (var5 == 1 && var35 >= Login.loginBoxX + 180 - 34 && var35 <= Login.loginBoxX + 34 + 180 && var36 >= 351 && var36 <= 363) { + class30.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); + } + + var9 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + PcmPlayer.method212(0); + Login.Login_username = ""; + Login.Login_password = ""; + class503.field4107 = 0; + class369.otp = ""; + } + + while (var8.method1105()) { + var11 = false; + + for (var27 = 0; var27 < "1234567890".length(); ++var27) { + if (var8.field1889 == "1234567890".charAt(var27)) { + var11 = true; + break; + } + } + + if (var8.field1890 == 13) { + PcmPlayer.method212(0); + Login.Login_username = ""; + Login.Login_password = ""; + class503.field4107 = 0; + class369.otp = ""; + } else { + if (var8.field1890 == 85 && class369.otp.length() > 0) { + class369.otp = class369.otp.substring(0, class369.otp.length() - 1); + } + + if (var8.field1890 == 84) { + class369.otp.trim(); + if (class369.otp.length() != 6) { + class318.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class503.field4107 = Integer.parseInt(class369.otp); + class369.otp = ""; + PendingSpawn.method509(true); + class318.setLoginResponseString("", "Connecting to server...", ""); + MusicSong.updateGameState(20); + return; + } + + if (var11 && class369.otp.length() < 6) { + class369.otp = class369.otp + var8.field1889; + } + } + } + } else { + int var26; + if (Login.loginIndex == 5) { + var9 = Login.loginBoxX + 180 - 80; + var10 = 321; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + class108.method620(); + return; + } + + var9 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + WorldMapAreaData.Login_promptCredentials(true); + } + + var39 = 361; + if (class90.field887 != null) { + var27 = class90.field887.highX / 2; + if (var5 == 1 && var35 >= class90.field887.lowX - var27 && var35 <= var27 + class90.field887.lowX && var36 >= var39 - 15 && var36 < var39) { + class30.openURL(HorizontalAlignment.method978("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + } + } + + while (var8.method1105()) { + var47 = false; + + for (var26 = 0; var26 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var26) { + if (var8.field1889 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var26)) { + var47 = true; + break; + } + } + + if (var8.field1890 == 13) { + WorldMapAreaData.Login_promptCredentials(true); + } else { + if (var8.field1890 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (var8.field1890 == 84) { + class108.method620(); + return; + } + + if (var47 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + var8.field1889; + } + } + } + } else if (Login.loginIndex != 6) { + if (Login.loginIndex == 7) { + if (ModeWhere.field3613 && !Client.onMobile) { + var9 = class452.loginBoxCenter - 150; + var40 = var9 + 40 + 240 + 25; + var39 = 231; + var27 = var39 + 40; + if (var5 == 1 && var35 >= var9 && var35 <= var40 && var36 >= var39 && var36 <= var27) { + var14 = var9; + var29 = 0; + + while (true) { + if (var29 >= 8) { + var26 = 0; + break; + } + + if (var35 <= var14 + 30) { + var26 = var29; + break; + } + + var14 += 30; + var14 += var29 != 1 && var29 != 3 ? 5 : 20; + ++var29; + } + + Login.field752 = var26; + } + + var26 = Login.loginBoxX + 180 - 80; + short var43 = 321; + boolean var50; + if (var5 == 1 && var35 >= var26 - 75 && var35 <= var26 + 75 && var36 >= var43 - 20 && var36 <= var43 + 20) { + var50 = UserComparator6.method694(); + if (var50) { + MusicSong.updateGameState(50); + return; + } + } + + var26 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var35 >= var26 - 75 && var35 <= var26 + 75 && var36 >= var43 - 20 && var36 <= var43 + 20) { + Login.field768 = new String[8]; + WorldMapAreaData.Login_promptCredentials(true); + } + + while (var8.method1105()) { + if (var8.field1890 == 101) { + Login.field768[Login.field752] = null; + } + + if (var8.field1890 == 85) { + if (Login.field768[Login.field752] == null && Login.field752 > 0) { + --Login.field752; + } + + Login.field768[Login.field752] = null; + } + + if (var8.field1889 >= '0' && var8.field1889 <= '9') { + Login.field768[Login.field752] = "" + var8.field1889; + if (Login.field752 < 7) { + ++Login.field752; + } + } + + if (var8.field1890 == 84) { + var50 = UserComparator6.method694(); + if (var50) { + MusicSong.updateGameState(50); + } + + return; + } + } + } else { + var9 = Login.loginBoxX + 180 - 80; + var10 = 321; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + class30.openURL(HorizontalAlignment.method978("secure", true) + "m=dob/set_dob.ws", true, false); + class318.setLoginResponseString("", "Page has opened in the browser.", ""); + PcmPlayer.method212(6); + return; + } + + var9 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + WorldMapAreaData.Login_promptCredentials(true); + } + } + } else if (Login.loginIndex == 8) { + var9 = Login.loginBoxX + 180 - 80; + var10 = 321; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + class30.openURL("https://www.jagex.com/terms/privacy", true, false); + class318.setLoginResponseString("", "Page has opened in the browser.", ""); + PcmPlayer.method212(6); + return; + } + + var9 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + WorldMapAreaData.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 9) { + var9 = Login.loginBoxX + 180; + var10 = 311; + if (var8.field1890 == 84 || var8.field1890 == 13 || var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + WorldMapAreaData.method1574(false); + } + } else if (Login.loginIndex == 10) { + var9 = Login.loginBoxX + 180; + var10 = 209; + if (var8.field1890 == 84 || var5 == 1 && var35 >= var9 - 109 && var35 <= var9 + 109 && var36 >= var10 && var36 <= var10 + 68) { + class318.setLoginResponseString("", "Connecting to server...", ""); + Client.field648 = class519.field4204; + PendingSpawn.method509(false); + MusicSong.updateGameState(20); + } + } else if (Login.loginIndex == 12) { + var9 = class452.loginBoxCenter; + var10 = 233; + var30 = var2.method2087(0, 30, "terms of use, privacy policy, and end user licence", var9, var10); + Bounds var12 = var2.method2087(32, 32, "terms of use, privacy policy, and end user licence", var9, var10); + Bounds var13 = var2.method2087(70, 34, "terms of use, privacy policy, and end user licence", var9, var10); + var40 = var10 + 17; + Bounds var28 = var2.method2087(0, 34, "agreement (EULA).", var9, var40); + if (var5 == 1) { + if (var30.method2284(var35, var36)) { + class30.openURL("https://www.jagex.com/terms", true, false); + } else if (var12.method2284(var35, var36)) { + class30.openURL("https://www.jagex.com/terms/privacy", true, false); + } else if (var13.method2284(var35, var36) || var28.method2284(var35, var36)) { + class30.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); + } + } + + var9 = class452.loginBoxCenter - 80; + var10 = 311; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + class9.method26(); + WorldMapAreaData.method1574(true); + } + + var9 = class452.loginBoxCenter + 80; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + Login.loginIndex = 13; + } + } else if (Login.loginIndex == 13) { + var9 = class452.loginBoxCenter; + var10 = 321; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + WorldMapAreaData.method1574(true); + } + } else if (Login.loginIndex == 14) { + String var31 = ""; + switch(Login.field750) { + case 0: + var31 = "https://secure.runescape.com/m=offence-appeal/account-history"; + break; + case 1: + var31 = "https://secure.runescape.com/m=accountappeal/passwordrecovery"; + break; + case 2: + var31 = "https://support.runescape.com/hc/en-gb/articles/207256855-Settle-an-Unpaid-Balance"; + break; + default: + WorldMapAreaData.Login_promptCredentials(false); + } + + var40 = Login.loginBoxX + 180; + var39 = 276; + if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { + class30.openURL(var31, true, false); + class318.setLoginResponseString("", "Page has opened in the browser.", ""); + PcmPlayer.method212(6); + return; + } + + var40 = Login.loginBoxX + 180; + var39 = 326; + if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { + WorldMapAreaData.Login_promptCredentials(false); + } + } else if (Login.loginIndex == 24) { + var9 = Login.loginBoxX + 180; + var10 = 301; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + WorldMapAreaData.method1574(false); + } + } else if (Login.loginIndex == 32) { + var9 = Login.loginBoxX + 180 - 80; + var10 = 321; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + class30.openURL(HorizontalAlignment.method978("secure", true) + "m=dob/set_dob.ws", true, false); + class318.setLoginResponseString("", "Page has opened in the browser.", ""); + PcmPlayer.method212(6); + return; + } + + var9 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + WorldMapAreaData.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 33) { + var9 = Login.loginBoxX + 180; + var10 = 276; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + class30.openURL("https://oldschool.runescape.com/launcher", true, false); + } + + var9 = Login.loginBoxX + 180; + var10 = 326; + if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { + WorldMapAreaData.Login_promptCredentials(true); + } + } + } else { + while (true) { + do { + if (!var8.method1105()) { + var38 = 321; + if (var5 == 1 && var36 >= var38 - 20 && var36 <= var38 + 20) { + WorldMapAreaData.Login_promptCredentials(true); + } + + return; + } + } while(var8.field1890 != 84 && var8.field1890 != 13); + + WorldMapAreaData.Login_promptCredentials(true); + } + } + } + } + } + } + } + + } + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/GraphicsDefaults.java b/osrs/src/main/java/GraphicsDefaults.java index b88494694..b353f7697 100644 --- a/osrs/src/main/java/GraphicsDefaults.java +++ b/osrs/src/main/java/GraphicsDefaults.java @@ -3,57 +3,62 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ru") +import java.lang.management.GarbageCollectorMXBean; + +@ObfuscatedName("rr") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("aw") + @ObfuscatedName("bi") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("au") @Export("compass") public int compass; - @ObfuscatedName("ay") - public int field3841; - @ObfuscatedName("ar") + @ObfuscatedName("ae") + public int field3850; + @ObfuscatedName("ao") @Export("mapScenes") public int mapScenes; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("as") - public int field3838; - @ObfuscatedName("aj") - public int field3833; - @ObfuscatedName("ag") - public int field3832; + @ObfuscatedName("ac") + public int field3848; + @ObfuscatedName("ai") + public int field3852; @ObfuscatedName("az") - public int field3842; - @ObfuscatedName("av") - public int field3839; + public int field3857; @ObfuscatedName("ap") - public int field3835; - @ObfuscatedName("aq") - public int field3836; + public int field3854; + @ObfuscatedName("aa") + public int field3847; + @ObfuscatedName("af") + public int field3851; + @ObfuscatedName("ad") + public int field3849; public GraphicsDefaults() { this.compass = -1; - this.field3841 = -1; + this.field3850 = -1; this.mapScenes = -1; this.headIconsPk = -1; - this.field3838 = -1; - this.field3833 = -1; - this.field3832 = -1; - this.field3842 = -1; - this.field3839 = -1; - this.field3835 = -1; - this.field3836 = -1; + this.field3848 = -1; + this.field3852 = -1; + this.field3857 = -1; + this.field3854 = -1; + this.field3847 = -1; + this.field3851 = -1; + this.field3849 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;I)V", - garbageValue = "-1842345605" + descriptor = "(Lnu;I)V", + garbageValue = "497895580" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3830.group); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3844.group); Buffer var3 = new Buffer(var2); while (true) { @@ -67,18 +72,18 @@ public void decode(AbstractArchive var1) { var3.readMedium(); break; case 2: - this.compass = var3.method2543(); - this.field3841 = var3.method2543(); - this.mapScenes = var3.method2543(); - this.headIconsPk = var3.method2543(); - this.field3838 = var3.method2543(); - this.field3833 = var3.method2543(); - this.field3832 = var3.method2543(); - this.field3842 = var3.method2543(); - this.field3839 = var3.method2543(); - this.field3835 = var3.method2543(); - this.field3836 = var3.method2543(); + this.compass = var3.method2563(); + this.field3850 = var3.method2563(); + this.mapScenes = var3.method2563(); + this.headIconsPk = var3.method2563(); + this.field3848 = var3.method2563(); + this.field3852 = var3.method2563(); + this.field3857 = var3.method2563(); + this.field3854 = var3.method2563(); + this.field3847 = var3.method2563(); + this.field3851 = var3.method2563(); + this.field3849 = var3.method2563(); } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/GraphicsObject.java b/osrs/src/main/java/GraphicsObject.java index 419ab5e82..d93418b28 100644 --- a/osrs/src/main/java/GraphicsObject.java +++ b/osrs/src/main/java/GraphicsObject.java @@ -3,40 +3,45 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +import java.security.SecureRandom; + +@ObfuscatedName("cg") @Implements("GraphicsObject") public class GraphicsObject extends Renderable { - @ObfuscatedName("aw") + @ObfuscatedName("hn") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("au") @Export("id") int id; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("cycleStart") int cycleStart; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("plane") int plane; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("x") int x; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("y") int y; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("z") int z; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lib;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("frame") int frame; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("frameCycle") int frameCycle; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("isFinished") boolean isFinished; @@ -50,20 +55,20 @@ public class GraphicsObject extends Renderable { this.y = var4; this.z = var5; this.cycleStart = var7 + var6; - int var8 = NPCComposition.SpotAnimationDefinition_get(this.id).sequence; + int var8 = StructComposition.SpotAnimationDefinition_get(this.id).sequence; if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = class135.SequenceDefinition_get(var8); + this.sequenceDefinition = EnumComposition.SequenceDefinition_get(var8); } else { this.isFinished = true; } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-1" + garbageValue = "47" ) @Export("advance") final void advance(int var1) { @@ -80,7 +85,7 @@ final void advance(int var1) { } } else { this.frame += var1; - if (this.frame >= this.sequenceDefinition.method1067()) { + if (this.frame >= this.sequenceDefinition.method1085()) { this.isFinished = true; } } @@ -88,14 +93,14 @@ final void advance(int var1) { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Ljo;", - garbageValue = "-983173466" + descriptor = "(I)Ljr;", + garbageValue = "798227647" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = NPCComposition.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = StructComposition.SpotAnimationDefinition_get(this.id); Model var2; if (!this.isFinished) { var2 = var1.getModel(this.frame); @@ -106,34 +111,6 @@ protected final Model getModel() { return var2 == null ? null : var2; } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-30148371" - ) - public static boolean method430() { - ReflectionCheck var0 = (ReflectionCheck)class36.reflectionChecks.last(); - return var0 != null; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Lmt;II)V", - garbageValue = "762775056" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2960 == null) { - throw new RuntimeException(); - } else { - if (var0.field3037 == null) { - var0.field3037 = new int[var0.field2960.length]; - } - - var0.field3037[var1] = Integer.MAX_VALUE; - } - } - public GraphicsObject() { } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/HealthBar.java b/osrs/src/main/java/HealthBar.java index e585bb8c3..d559b5b7e 100644 --- a/osrs/src/main/java/HealthBar.java +++ b/osrs/src/main/java/HealthBar.java @@ -3,34 +3,43 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("dm") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("ar") + @ObfuscatedName("aa") + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("ls") + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("mn") + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhl;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Loc;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lha;)V" + descriptor = "(Lhl;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); this.definition = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(IIIIB)V", - garbageValue = "-79" + garbageValue = "0" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -63,10 +72,10 @@ void put(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)Ldp;", - garbageValue = "2046925775" + descriptor = "(IB)Ldo;", + garbageValue = "-93" ) @Export("get") HealthBarUpdate get(int var1) { @@ -77,7 +86,7 @@ HealthBarUpdate get(int var1) { var2 = var3; } - if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { + if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { return var2; } else { var2.remove(); @@ -88,22 +97,48 @@ HealthBarUpdate get(int var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2086945413" + descriptor = "(B)Z", + garbageValue = "-45" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method1971(); + return this.updates.method2008(); } - @ObfuscatedName("ak") + @ObfuscatedName("jd") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-137871436" + descriptor = "(IIII)V", + garbageValue = "-1142010157" ) - public static void method581() { - ItemComposition.ItemDefinition_cachedSprites.clear(); + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = class18.getTileHeight(var0, var1, Client_plane) - var2; + var0 -= NPCComposition.cameraX; + var3 -= class133.cameraY; + var1 -= class139.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[class129.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[class129.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[UserComparator10.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[UserComparator10.cameraYaw]; + int var8 = var6 * var1 + var0 * var7 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var5 * var3 - var4 * var1 >> 16; + var1 = var5 * var1 + var3 * var4 >> 16; + if (var1 >= 50) { + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; + Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/HealthBarDefinition.java b/osrs/src/main/java/HealthBarDefinition.java index 82f1e49b1..a8902311d 100644 --- a/osrs/src/main/java/HealthBarDefinition.java +++ b/osrs/src/main/java/HealthBarDefinition.java @@ -3,58 +3,53 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ha") +@ObfuscatedName("hl") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - public static AbstractArchive field1534; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("HealthBarDefinition_cachedSprites") - static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("as") - public int field1541; - @ObfuscatedName("az") + public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("ac") + public int field1555; + @ObfuscatedName("ap") @Export("int1") public int int1; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("int2") public int int2; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("int3") public int int3; + @ObfuscatedName("ad") + public int field1556; @ObfuscatedName("aq") - public int field1540; - @ObfuscatedName("at") @Export("int5") public int int5; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("width") public int width; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("widthPadding") public int widthPadding; @@ -67,7 +62,7 @@ public HealthBarDefinition() { this.int1 = 255; this.int2 = 255; this.int3 = -1; - this.field1540 = 1; + this.field1556 = 1; this.int5 = 70; this.frontSpriteID = -1; this.backSpriteID = -1; @@ -75,10 +70,10 @@ public HealthBarDefinition() { this.widthPadding = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "-1925241492" + descriptor = "(Ltm;B)V", + garbageValue = "-25" ) @Export("decode") public void decode(Buffer var1) { @@ -92,10 +87,10 @@ public void decode(Buffer var1) { } } - @ObfuscatedName("ay") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-562332706" + descriptor = "(Ltm;II)V", + garbageValue = "1395373315" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -112,9 +107,9 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { - this.frontSpriteID = var1.method2543(); + this.frontSpriteID = var1.method2563(); } else if (var2 == 8) { - this.backSpriteID = var1.method2543(); + this.backSpriteID = var1.method2563(); } else if (var2 == 11) { this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { @@ -125,10 +120,10 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(S)Lud;", - garbageValue = "5771" + descriptor = "(B)Lui;", + garbageValue = "26" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { @@ -139,7 +134,7 @@ public SpritePixels getFrontSprite() { if (var1 != null) { return var1; } else { - var1 = WorldMap.SpriteBuffer_getSprite(field1534, this.frontSpriteID, 0); + var1 = Tiles.SpriteBuffer_getSprite(class422.field3769, this.frontSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } @@ -149,10 +144,10 @@ public SpritePixels getFrontSprite() { } } - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)Lud;", - garbageValue = "44" + descriptor = "(I)Lui;", + garbageValue = "314676722" ) @Export("getBackSprite") public SpritePixels getBackSprite() { @@ -163,7 +158,7 @@ public SpritePixels getBackSprite() { if (var1 != null) { return var1; } else { - var1 = WorldMap.SpriteBuffer_getSprite(field1534, this.backSpriteID, 0); + var1 = Tiles.SpriteBuffer_getSprite(class422.field3769, this.backSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } @@ -173,23 +168,33 @@ public SpritePixels getBackSprite() { } } - @ObfuscatedName("bo") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1108196628" + descriptor = "(II)I", + garbageValue = "-293165010" ) - protected static final void method953() { - FloorUnderlayDefinition.clock.mark(); - - int var0; - for (var0 = 0; var0 < 32; ++var0) { - GameEngine.graphicsTickTimes[var0] = 0L; - } + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; + } - for (var0 = 0; var0 < 32; ++var0) { - GameEngine.clientTickTimes[var0] = 0L; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "([BI)Lpi;", + garbageValue = "-1270824804" + ) + static Font method969(byte[] var0) { + if (var0 == null) { + return null; + } else { + Font var1 = new Font(var0, class529.SpriteBuffer_xOffsets, class152.SpriteBuffer_yOffsets, HealthBarUpdate.SpriteBuffer_spriteWidths, SpriteMask.SpriteBuffer_spriteHeights, DbTableType.SpriteBuffer_spritePalette, Coord.SpriteBuffer_pixels); + class529.SpriteBuffer_xOffsets = null; + class152.SpriteBuffer_yOffsets = null; + HealthBarUpdate.SpriteBuffer_spriteWidths = null; + SpriteMask.SpriteBuffer_spriteHeights = null; + DbTableType.SpriteBuffer_spritePalette = null; + Coord.SpriteBuffer_pixels = null; + return var1; } - - class313.gameCyclesToDo = 0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/HealthBarUpdate.java b/osrs/src/main/java/HealthBarUpdate.java index 4f96122a9..46ae4a991 100644 --- a/osrs/src/main/java/HealthBarUpdate.java +++ b/osrs/src/main/java/HealthBarUpdate.java @@ -1,26 +1,30 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("do") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("ai") + @Export("SpriteBuffer_spriteWidths") + static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("ik") + @ObfuscatedSignature( + descriptor = "Lpi;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("au") @Export("cycle") int cycle; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("health") int health; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("health2") int health2; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("cycleOffset") int cycleOffset; @@ -31,10 +35,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-2011079863" + descriptor = "(IIIIB)V", + garbageValue = "75" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -44,91 +48,37 @@ void set(int var1, int var2, int var3, int var4) { this.cycleOffset = var4; } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "2092480098" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-2006181389" ) - static String method532(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { - RunException var2 = (RunException)var0; - var1 = var2.field4249 + " | "; - var0 = var2.parent; - } else { - var1 = ""; - } - - StringWriter var12 = new StringWriter(); - PrintWriter var3 = new PrintWriter(var12); - var0.printStackTrace(var3); - var3.close(); - String var4 = var12.toString(); - BufferedReader var5 = new BufferedReader(new StringReader(var4)); - String var6 = var5.readLine(); - - while (true) { - while (true) { - String var7 = var5.readLine(); - if (var7 == null) { - var1 = var1 + "| " + var6; - return var1; - } - - int var8 = var7.indexOf(40); - int var9 = var7.indexOf(41, var8 + 1); - if (var8 >= 0 && var9 >= 0) { - String var10 = var7.substring(var8 + 1, var9); - int var11 = var10.indexOf(".java:"); - if (var11 >= 0) { - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); - var1 = var1 + var10 + ' '; - continue; - } - - var7 = var7.substring(0, var8); - } - - var7 = var7.trim(); - var7 = var7.substring(var7.lastIndexOf(32) + 1); - var7 = var7.substring(var7.lastIndexOf(9) + 1); - var1 = var1 + var7 + ' '; - } - } + public static int method524(CharSequence var0) { + return DevicePcmPlayerProvider.method75(var0, 10, true); } - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-1197133658" + descriptor = "(Lch;Lch;IZIZI)I", + garbageValue = "1278568965" ) - static int method533(int var0, Script var1, boolean var2) { - Widget var3 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == 2800) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class273.Widget_unpackTargetMask(UserComparator8.getWidgetFlags(var3)); - return 1; - } else if (var0 != 2801) { - if (var0 == 2802) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } + static int method525(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = class139.compareWorlds(var0, var1, var2, var3); + if (var6 != 0) { + return var3 ? -var6 : var6; + } else if (var4 == -1) { + return 0; } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + int var7 = class139.compareWorlds(var0, var1, var4, var5); + return var5 ? -var7 : var7; } } -} + + @ObfuscatedName("na") + static final void method526(double var0) { + Rasterizer3D.method1187(var0); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(var0); + UrlRequester.method653(); + class449.clientPreferences.setBrightness(var0); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/HitSplatDefinition.java b/osrs/src/main/java/HitSplatDefinition.java index 0818c86ca..617346da1 100644 --- a/osrs/src/main/java/HitSplatDefinition.java +++ b/osrs/src/main/java/HitSplatDefinition.java @@ -3,74 +3,79 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") +@ObfuscatedName("hm") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("HitSplatDefinition_archive") public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" + ) + public static AbstractArchive field1689; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lnu;" ) @Export("HitSplatDefinition_fontsArchive") public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("HitSplatDefinition_cached") - public static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("as") + static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("HitSplatDefinition_cachedSprites") - public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("aj") + static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("HitSplatDefinition_cachedFonts") - public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("at") + static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; + @ObfuscatedName("aq") @Export("fontId") int fontId; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("textColor") public int textColor; - @ObfuscatedName("ax") - public int field1687; - @ObfuscatedName("aa") - int field1673; - @ObfuscatedName("au") - int field1678; - @ObfuscatedName("ae") - int field1675; - @ObfuscatedName("ab") - int field1674; - @ObfuscatedName("ad") - public int field1682; - @ObfuscatedName("ao") - public int field1686; - @ObfuscatedName("ac") - public int field1681; - @ObfuscatedName("ak") - String field1680; @ObfuscatedName("an") - public int field1685; - @ObfuscatedName("af") - public int field1683; - @ObfuscatedName("ai") + public int field1706; + @ObfuscatedName("ar") + int field1700; + @ObfuscatedName("ab") + int field1695; + @ObfuscatedName("ag") + int field1696; + @ObfuscatedName("am") + int field1698; + @ObfuscatedName("ax") + public int field1709; + @ObfuscatedName("ah") + public int field1703; + @ObfuscatedName("as") + public int field1707; + @ObfuscatedName("ay") + String field1702; + @ObfuscatedName("aj") + public int field1704; + @ObfuscatedName("av") + public int field1708; + @ObfuscatedName("aw") @Export("transforms") public int[] transforms; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("bd") + @ObfuscatedName("bh") @Export("transformVarp") int transformVarp; @@ -83,25 +88,25 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition() { this.fontId = -1; this.textColor = 16777215; - this.field1687 = 70; - this.field1673 = -1; - this.field1678 = -1; - this.field1675 = -1; - this.field1674 = -1; - this.field1682 = 0; - this.field1686 = 0; - this.field1681 = -1; - this.field1680 = ""; - this.field1685 = -1; - this.field1683 = 0; + this.field1706 = 70; + this.field1700 = -1; + this.field1695 = -1; + this.field1696 = -1; + this.field1698 = -1; + this.field1709 = 0; + this.field1703 = 0; + this.field1707 = -1; + this.field1702 = ""; + this.field1704 = -1; + this.field1708 = 0; this.transformVarbit = -1; this.transformVarp = -1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "17891601" + descriptor = "(Ltm;B)V", + garbageValue = "-96" ) @Export("decode") void decode(Buffer var1) { @@ -115,41 +120,41 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "1627766366" + descriptor = "(Ltm;IB)V", + garbageValue = "-17" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.fontId = var1.method2543(); + this.fontId = var1.method2563(); } else if (var2 == 2) { this.textColor = var1.readMedium(); } else if (var2 == 3) { - this.field1673 = var1.method2543(); + this.field1700 = var1.method2563(); } else if (var2 == 4) { - this.field1675 = var1.method2543(); + this.field1696 = var1.method2563(); } else if (var2 == 5) { - this.field1678 = var1.method2543(); + this.field1695 = var1.method2563(); } else if (var2 == 6) { - this.field1674 = var1.method2543(); + this.field1698 = var1.method2563(); } else if (var2 == 7) { - this.field1682 = var1.readShort(); + this.field1709 = var1.readShort(); } else if (var2 == 8) { - this.field1680 = var1.readStringCp1252NullCircumfixed(); + this.field1702 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field1687 = var1.readUnsignedShort(); + this.field1706 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field1686 = var1.readShort(); + this.field1703 = var1.readShort(); } else if (var2 == 11) { - this.field1681 = 0; + this.field1707 = 0; } else if (var2 == 12) { - this.field1685 = var1.readUnsignedByte(); + this.field1704 = var1.readUnsignedByte(); } else if (var2 == 13) { - this.field1683 = var1.readShort(); + this.field1708 = var1.readShort(); } else if (var2 == 14) { - this.field1681 = var1.readUnsignedShort(); + this.field1707 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { @@ -184,16 +189,16 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lhk;", - garbageValue = "-517578279" + descriptor = "(I)Lhm;", + garbageValue = "-478851441" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WallDecoration.getVarbit(this.transformVarbit); + var1 = ClientPreferences.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -205,17 +210,17 @@ public final HitSplatDefinition transform() { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class177.method907(var2) : null; + return var2 != -1 ? WorldMapCacheName.method1564(var2) : null; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1987893545" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "85" ) @Export("getString") public String getString(int var1) { - String var2 = this.field1680; + String var2 = this.field1702; while (true) { int var3 = var2.indexOf("%1"); @@ -223,26 +228,26 @@ public String getString(int var1) { return var2; } - var2 = var2.substring(0, var3) + class509.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + class60.intToString(var1, false) + var2.substring(var3 + 2); } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)Lud;", - garbageValue = "6" + descriptor = "(I)Lui;", + garbageValue = "2088271438" ) - public SpritePixels method1012() { - if (this.field1673 < 0) { + public SpritePixels method1032() { + if (this.field1700 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1673); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1700); if (var1 != null) { return var1; } else { - var1 = WorldMap.SpriteBuffer_getSprite(class387.field3643, this.field1673, 0); + var1 = Tiles.SpriteBuffer_getSprite(field1689, this.field1700, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1673); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1700); } return var1; @@ -250,22 +255,22 @@ public SpritePixels method1012() { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)Lud;", - garbageValue = "-36" + descriptor = "(I)Lui;", + garbageValue = "1718225131" ) - public SpritePixels method1013() { - if (this.field1678 < 0) { + public SpritePixels method1033() { + if (this.field1695 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1678); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1695); if (var1 != null) { return var1; } else { - var1 = WorldMap.SpriteBuffer_getSprite(class387.field3643, this.field1678, 0); + var1 = Tiles.SpriteBuffer_getSprite(field1689, this.field1695, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1678); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1695); } return var1; @@ -273,22 +278,22 @@ public SpritePixels method1013() { } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)Lud;", - garbageValue = "122" + descriptor = "(I)Lui;", + garbageValue = "-816789070" ) - public SpritePixels method1014() { - if (this.field1675 < 0) { + public SpritePixels method1034() { + if (this.field1696 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1675); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1696); if (var1 != null) { return var1; } else { - var1 = WorldMap.SpriteBuffer_getSprite(class387.field3643, this.field1675, 0); + var1 = Tiles.SpriteBuffer_getSprite(field1689, this.field1696, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1675); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1696); } return var1; @@ -296,22 +301,22 @@ public SpritePixels method1014() { } } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)Lud;", - garbageValue = "1252714259" + descriptor = "(B)Lui;", + garbageValue = "3" ) - public SpritePixels method1015() { - if (this.field1674 < 0) { + public SpritePixels method1035() { + if (this.field1698 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1674); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1698); if (var1 != null) { return var1; } else { - var1 = WorldMap.SpriteBuffer_getSprite(class387.field3643, this.field1674, 0); + var1 = Tiles.SpriteBuffer_getSprite(field1689, this.field1698, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1674); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1698); } return var1; @@ -319,10 +324,10 @@ public SpritePixels method1015() { } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(I)Lpc;", - garbageValue = "-1649845453" + descriptor = "(I)Lpi;", + garbageValue = "1628284483" ) @Export("getFont") public Font getFont() { @@ -333,7 +338,7 @@ public Font getFont() { if (var1 != null) { return var1; } else { - var1 = ConcurrentMidiTask.method2106(class387.field3643, HitSplatDefinition_fontsArchive, this.fontId, 0); + var1 = LoginPacket.method1613(field1689, HitSplatDefinition_fontsArchive, this.fontId, 0); if (var1 != null) { HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); } @@ -342,4 +347,87 @@ public Font getFont() { } } } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "731414958" + ) + static int method1026(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; + } + + if (var2 > 192) { + var1 /= 2; + } + + if (var2 > 217) { + var1 /= 2; + } + + if (var2 > 243) { + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "([BB)Ldh;", + garbageValue = "10" + ) + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); + Buffer var2 = new Buffer(var0); + var2.offset = var2.array.length - 2; + int var3 = var2.readUnsignedShort(); + int var4 = var2.array.length - 2 - var3 - 12; + var2.offset = var4; + int var5 = var2.readInt(); + var1.localIntCount = var2.readUnsignedShort(); + var1.localStringCount = var2.readUnsignedShort(); + var1.intArgumentCount = var2.readUnsignedShort(); + var1.stringArgumentCount = var2.readUnsignedShort(); + int var6 = var2.readUnsignedByte(); + int var7; + int var8; + if (var6 > 0) { + var1.switches = var1.newIterableNodeHashTable(var6); + + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2.readUnsignedShort(); + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? WorldMapIcon_1.method1401(var8) : 1); + var1.switches[var7] = var9; + + while (var8-- > 0) { + int var10 = var2.readInt(); + int var11 = var2.readInt(); + var9.put(new IntegerNode(var11), (long)var10); + } + } + } + + var2.offset = 0; + var1.field817 = var2.readStringCp1252NullTerminatedOrNull(); + var1.opcodes = new int[var5]; + var1.intOperands = new int[var5]; + var1.stringOperands = new String[var5]; + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { + var8 = var2.readUnsignedShort(); + if (var8 == 3) { + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); + } + } + + return var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/HorizontalAlignment.java b/osrs/src/main/java/HorizontalAlignment.java index 617227d52..0a56bc7b9 100644 --- a/osrs/src/main/java/HorizontalAlignment.java +++ b/osrs/src/main/java/HorizontalAlignment.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hz") +@ObfuscatedName("he") @Implements("HorizontalAlignment") -public enum HorizontalAlignment implements class372 { - @ObfuscatedName("aw") +public enum HorizontalAlignment implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lhe;" ) - field1558(1, 0), - @ObfuscatedName("ay") + field1574(0, 0), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lhe;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(0, 1), - @ObfuscatedName("ar") + HorizontalAlignment_centered(2, 1), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lhe;" ) - field1557(2, 2); + field1573(1, 2); - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("value") public final int value; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("id") final int id; @@ -35,31 +35,70 @@ public enum HorizontalAlignment implements class372 { this.id = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-858932897" + descriptor = "(Llb;I)V", + garbageValue = "819955380" ) - public static boolean method960() { - return !class306.field2755.isEmpty(); + public static void method975(class311 var0) { + class305.field2778.remove(var0); } - @ObfuscatedName("ak") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lbj;I)V", - garbageValue = "-539334926" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "2133819886" ) - public static final void method959(class51 var0) { - class309.pcmPlayerProvider = var0; + public static String method977(String var0) { + return var0 != null && !var0.isEmpty() && var0.charAt(0) != '#' ? var0 : ""; } -} + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "36" + ) + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); + } + + @ObfuscatedName("oh") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", + garbageValue = "2" + ) + static String method978(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; + if (Client.gameBuild == 1) { + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { + var0 = "local"; + } + + String var3 = ""; + if (MusicPatchPcmStream.param9 != null) { + var3 = "/p=" + MusicPatchPcmStream.param9; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + ClanChannelMember.clientLanguage + "/a=" + WorldMapSectionType.field2416 + var3 + "/"; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Huffman.java b/osrs/src/main/java/Huffman.java index 99e9fed71..05fdec341 100644 --- a/osrs/src/main/java/Huffman.java +++ b/osrs/src/main/java/Huffman.java @@ -3,16 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") +@ObfuscatedName("mx") @Implements("Huffman") public class Huffman { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("masks") int[] masks; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("bits") byte[] bits; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("keys") int[] keys; @@ -99,10 +99,10 @@ public Huffman(byte[] var1) { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "([BII[BIS)I", - garbageValue = "-4227" + descriptor = "([BII[BII)I", + garbageValue = "-2112188877" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -150,10 +150,10 @@ int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "([BI[BIIB)I", - garbageValue = "-90" + garbageValue = "23" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -294,13 +294,18 @@ int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { } } - @ObfuscatedName("im") + @ObfuscatedName("id") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-873357491" + descriptor = "(Ldr;I)V", + garbageValue = "-652382825" ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; + static final void method1853(Actor var0) { + int var1 = Math.max(1, var0.spotAnimation - Client.cycle); + int var2 = var0.field976 * 64 + var0.field1004 * 128; + int var3 = var0.field976 * 64 + var0.field1001 * 128; + var0.x += (var2 - var0.x) / var1; + var0.y += (var3 - var0.y) / var1; + var0.field1021 = 0; + var0.orientation = var0.exactMoveDirection; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IgnoreList.java b/osrs/src/main/java/IgnoreList.java index d5806a14d..c21b793ed 100644 --- a/osrs/src/main/java/IgnoreList.java +++ b/osrs/src/main/java/IgnoreList.java @@ -3,61 +3,69 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qm") +@ObfuscatedName("qq") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) - final LoginType field3771; + final LoginType field3781; @ObfuscatedSignature( - descriptor = "(Lsi;)V" + descriptor = "(Lsl;)V" ) public IgnoreList(LoginType var1) { super(400); - this.field3771 = var1; + this.field3781 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)Lqe;", - garbageValue = "3401" + descriptor = "(I)Lqs;", + garbageValue = "-1997275235" ) @Export("newInstance") User newInstance() { return new Ignored(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IB)[Lqe;", - garbageValue = "7" + descriptor = "(IB)[Lqs;", + garbageValue = "99" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "1365602141" + descriptor = "(Ltm;II)V", + garbageValue = "974375681" ) @Export("read") public void read(Buffer var1, int var2) { while (var1.offset < var2) { int var3 = var1.readUnsignedByte(); if (var3 == 4) { - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.field3771); + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.field3781); + if (!var4.hasCleanName()) { + throw new IllegalStateException(); + } + boolean var5 = false; - class177.friendSystem.removeIgnore(var4.getName(), var5); + class299.friendSystem.removeIgnore(var4.getName(), var5); } else { boolean var9 = (var3 & 1) != 0; - Username var10 = new Username(var1.readStringCp1252NullTerminated(), this.field3771); - Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.field3771); + Username var10 = new Username(var1.readStringCp1252NullTerminated(), this.field3781); + Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.field3781); var1.readStringCp1252NullTerminated(); + if (!var10.hasCleanName()) { + throw new IllegalStateException(); + } + Ignored var7 = (Ignored)this.getByCurrentUsername(var10); if (var9) { Ignored var8 = (Ignored)this.getByCurrentUsername(var6); @@ -81,4 +89,710 @@ public void read(Buffer var1, int var2) { } } -} + + @ObfuscatedName("lm") + @ObfuscatedSignature( + descriptor = "(IIIIILjava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "5" + ) + @Export("menuAction") + static final void menuAction(int var0, int var1, int var2, int var3, int var4, String var5, String var6, int var7, int var8) { + if (var2 >= 2000) { + var2 -= 2000; + } + + NPC var9; + PacketBufferNode var10; + if (var2 == 9) { + var9 = Client.npcs[var3]; + if (var9 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC1, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 12) { + var9 = Client.npcs[var3]; + if (var9 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC4, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + } + + Player var14; + if (var2 == 45) { + var14 = Client.players[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER2, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShortAddLE(var3); + var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 47) { + var14 = Client.players[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShortAdd(var3); + var10.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + Widget var15; + if (var2 == 57 || var2 == 1007) { + var15 = SoundCache.getWidgetChild(var1, var0); + if (var15 != null) { + class47.widgetDefaultMenuAction(var3, var1, var0, var4, var6); + } + } + + PacketBufferNode var16; + if (var2 == 19) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJ2, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShort(class47.baseY + var1); + var16.packetBuffer.writeShortAddLE(var0 + UrlRequester.baseX); + var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var16); + } + + if (var2 == 1) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOCT, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShortAdd(class157.field1406); + var16.packetBuffer.writeInt(class138.field1306); + var16.packetBuffer.writeShort(WorldMapArea.field2343); + var16.packetBuffer.writeShortAddLE(var3); + var16.packetBuffer.writeShortAdd(class47.baseY + var1); + var16.packetBuffer.writeShortAdd(var0 + UrlRequester.baseX); + var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var16); + } + + if (var2 == 13) { + var9 = Client.npcs[var3]; + if (var9 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC5, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 14) { + var14 = Client.players[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPCU, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntLE(class138.field1306); + var10.packetBuffer.writeShortAdd(class157.field1406); + var10.packetBuffer.writeShortAdd(WorldMapArea.field2343); + var10.packetBuffer.writeShortAdd(var3); + var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 1002) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOCE, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShortAddLE(var3); + Client.packetWriter.addNode(var16); + } + + if (var2 == 10) { + var9 = Client.npcs[var3]; + if (var9 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC2, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 1001) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC5, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShortAddLE(class47.baseY + var1); + var16.packetBuffer.writeIntME(var0 + UrlRequester.baseX); + var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var16); + } + + if (var2 == 26) { + WorldMapIcon_1.method1402(); + } + + if (var2 == 8) { + var9 = Client.npcs[var3]; + if (var9 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2576, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShortAdd(var3); + var10.packetBuffer.writeIntME(Client.selectedSpellItemId); + var10.packetBuffer.writeIntIME(ModeWhere.selectedSpellWidget); + var10.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 18) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJ1, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShortAdd(var3); + var16.packetBuffer.writeShortAddLE(var0 + UrlRequester.baseX); + var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeShort(class47.baseY + var1); + Client.packetWriter.addNode(var16); + } + + if (var2 == 23) { + if (Client.isMenuOpen) { + class130.scene.setViewportWalking(); + } else { + class130.scene.menuOpen(HealthBar.Client_plane, var0, var1, true); + } + } + + PacketBufferNode var11; + if (var2 == 24) { + var15 = class92.getWidget(var1); + if (var15 != null) { + boolean var12 = true; + if (var15.contentType > 0) { + var12 = Bounds.method2290(var15); + } + + if (var12) { + var11 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2567, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var11); + } + } + } + + if (var2 == 11) { + var9 = Client.npcs[var3]; + if (var9 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC3, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShortAddLE(var3); + var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 49) { + var14 = Client.players[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShortAdd(var3); + var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 16) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EXIT_FREECAM, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShortAddLE(class157.field1406); + var16.packetBuffer.writeIntME(var3); + var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeShortAdd(WorldMapArea.field2343); + var16.packetBuffer.writeIntME(var0 + UrlRequester.baseX); + var16.packetBuffer.writeShortAdd(class47.baseY + var1); + var16.packetBuffer.writeIntIME_(class138.field1306); + Client.packetWriter.addNode(var16); + } + + if (var2 == 2) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC6, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShortAddLE(var3); + var16.packetBuffer.writeShortAdd(var0 + UrlRequester.baseX); + var16.packetBuffer.writeShort(class47.baseY + var1); + var16.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); + var16.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeShortAddLE(Client.selectedSpellItemId); + var16.packetBuffer.writeIntLE(ModeWhere.selectedSpellWidget); + Client.packetWriter.addNode(var16); + } + + if (var2 == 1008 || var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1012) { + Canvas.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); + } + + if (var2 == 6) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC4, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShortAdd(var3); + var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeShortAdd(class47.baseY + var1); + var16.packetBuffer.writeIntLE(var0 + UrlRequester.baseX); + Client.packetWriter.addNode(var16); + } + + if (var2 == 21) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJ4, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeIntME(var0 + UrlRequester.baseX); + var16.packetBuffer.writeShortAdd(class47.baseY + var1); + var16.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var16); + } + + if (var2 == 30 && Client.meslayerContinueWidget == null) { + class466.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = SoundCache.getWidgetChild(var1, var0); + class218.invalidateWidget(Client.meslayerContinueWidget); + } + + if (var2 == 15) { + var14 = Client.players[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYERT, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); + var10.packetBuffer.writeIntME(Client.selectedSpellItemId); + var10.packetBuffer.writeIntIME(ModeWhere.selectedSpellWidget); + var10.packetBuffer.writeIntME(var3); + var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + int var13; + Widget var17; + if (var2 == 28) { + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2567, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var16); + var17 = class92.getWidget(var1); + if (var17 != null && var17.cs1Instructions != null && var17.cs1Instructions[0][0] == 5) { + var13 = var17.cs1Instructions[0][1]; + Varps.Varps_main[var13] = 1 - Varps.Varps_main[var13]; + WorldMapDecoration.changeGameOptions(var13); + } + } + + if (var2 == 48) { + var14 = Client.players[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER5, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShortAdd(var3); + var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 4) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC2, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShort(var0 + UrlRequester.baseX); + var16.packetBuffer.writeShort(class47.baseY + var1); + var16.packetBuffer.writeIntME(var3); + var16.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var16); + } + + if (var2 == 29) { + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2567, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var16); + var17 = class92.getWidget(var1); + if (var17 != null && var17.cs1Instructions != null && var17.cs1Instructions[0][0] == 5) { + var13 = var17.cs1Instructions[0][1]; + if (Varps.Varps_main[var13] != var17.cs1ComparisonValues[0]) { + Varps.Varps_main[var13] = var17.cs1ComparisonValues[0]; + WorldMapDecoration.changeGameOptions(var13); + } + } + } + + if (var2 == 1003) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var9 = Client.npcs[var3]; + if (var9 != null) { + NPCComposition var18 = var9.definition; + if (var18.transforms != null) { + var18 = var18.transform(); + } + + if (var18 != null) { + var11 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPCE, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeShortAdd(var18.id); + Client.packetWriter.addNode(var11); + } + } + } + + if (var2 == 44) { + var14 = Client.players[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShortAddLE(var3); + var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 1004) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJE, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShort(var0 + UrlRequester.baseX); + var16.packetBuffer.writeShortAddLE(var3); + var16.packetBuffer.writeIntME(class47.baseY + var1); + Client.packetWriter.addNode(var16); + } + + if (var2 == 46) { + var14 = Client.players[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER3, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByte(var3); + var10.packetBuffer.writeShort(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 22) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJ6, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShortAddLE(var0 + UrlRequester.baseX); + var16.packetBuffer.writeShort(class47.baseY + var1); + var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var16); + } + + if (var2 == 58) { + var15 = SoundCache.getWidgetChild(var1, var0); + if (var15 != null) { + if (var15.field3076 != null) { + ScriptEvent var19 = new ScriptEvent(); + var19.widget = var15; + var19.opIndex = var3; + var19.targetName = var6; + var19.args = var15.field3076; + WorldMapSection1.runScriptEvent(var19); + } + + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTONT, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShortAdd(Client.selectedSpellItemId); + var10.packetBuffer.writeShort(var0); + var10.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); + var10.packetBuffer.writeShort(var4); + var10.packetBuffer.writeIntIME(ModeWhere.selectedSpellWidget); + var10.packetBuffer.writeIntIME_(var1); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 5) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC3, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShort(var3); + var16.packetBuffer.writeShortAddLE(var0 + UrlRequester.baseX); + var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeShort(class47.baseY + var1); + Client.packetWriter.addNode(var16); + } + + if (var2 == 50) { + var14 = Client.players[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntME(var3); + var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 25) { + var15 = SoundCache.getWidgetChild(var1, var0); + if (var15 != null) { + InvDefinition.Widget_runOnTargetLeave(); + DirectByteArrayCopier.selectSpell(var1, var0, HealthBarDefinition.Widget_unpackTargetMask(NewShit.getWidgetFlags(var15)), var4); + Client.isItemSelected = 0; + Client.field600 = class300.Widget_getSpellActionName(var15); + if (Client.field600 == null) { + Client.field600 = "null"; + } + + if (var15.isIf3) { + Client.field601 = var15.dataText + MoveSpeed.colorStartTag(16777215); + } else { + Client.field601 = MoveSpeed.colorStartTag(65280) + var15.field3097 + MoveSpeed.colorStartTag(16777215); + } + } + + } else { + if (var2 == 17) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJT, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeIntME(var0 + UrlRequester.baseX); + var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeShortAdd(Client.selectedSpellItemId); + var16.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); + var16.packetBuffer.writeIntIME(ModeWhere.selectedSpellWidget); + var16.packetBuffer.writeShortAdd(class47.baseY + var1); + var16.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var16); + } + + if (var2 == 20) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC6, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeIntME(class47.baseY + var1); + var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeShortAddLE(var3); + var16.packetBuffer.writeIntME(var0 + UrlRequester.baseX); + Client.packetWriter.addNode(var16); + } + + if (var2 == 3) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC1, Client.packetWriter.isaacCipher); + var16.packetBuffer.writeShort(var0 + UrlRequester.baseX); + var16.packetBuffer.writeIntME(class47.baseY + var1); + var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var16.packetBuffer.writeShortAddLE(var3); + Client.packetWriter.addNode(var16); + } + + if (var2 == 51) { + var14 = Client.players[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER8, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 7) { + var9 = Client.npcs[var3]; + if (var9 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYERU, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntME(WorldMapArea.field2343); + var10.packetBuffer.writeIntME(class157.field1406); + var10.packetBuffer.writeIntLE(class138.field1306); + var10.packetBuffer.writeIntME(var3); + var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + class218.invalidateWidget(class92.getWidget(class138.field1306)); + } + + if (Client.isSpellSelected) { + InvDefinition.Widget_runOnTargetLeave(); + } + + } + } + + @ObfuscatedName("oq") + @ObfuscatedSignature( + descriptor = "(IS)Ltx;", + garbageValue = "-11165" + ) + static class506 method2190(int var0) { + class506 var1 = (class506)Client.Widget_cachedFonts.get((long)var0); + if (var1 == null) { + var1 = new class506(class343.field3148, var0); + } + + return var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Ignored.java b/osrs/src/main/java/Ignored.java index 97cefa545..fac65f9c5 100644 --- a/osrs/src/main/java/Ignored.java +++ b/osrs/src/main/java/Ignored.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qn") +@ObfuscatedName("qu") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("id") int id; Ignored() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqn;I)I", - garbageValue = "-315070761" + descriptor = "(Lqu;I)I", + garbageValue = "-1019476190" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lqe;B)I", - garbageValue = "114" + descriptor = "(Lqs;I)I", + garbageValue = "1756748027" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -38,26 +38,76 @@ public int compareTo(Object var1) { return this.compareTo_ignored((Ignored)var1); } - @ObfuscatedName("ay") + @ObfuscatedName("kp") @ObfuscatedSignature( - descriptor = "([BI)[I", - garbageValue = "-957986123" + descriptor = "(B)V", + garbageValue = "44" ) - public static int[] method2221(byte[] var0) { - if (var0 != null && var0.length != 0 && var0.length <= 8) { - int[] var1 = new int[var0.length]; + static final void method2249() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.endCycle > 0) { + --var0.endCycle; + } + + boolean var1; + int var2; + int var3; + ObjectComposition var4; + if (var0.endCycle == 0) { + if (var0.objectId >= 0) { + var2 = var0.objectId; + var3 = var0.field956; + var4 = WorldMapElement.getObjectDefinition(var2); + if (var3 == 11) { + var3 = 10; + } + + if (var3 >= 5 && var3 <= 8) { + var3 = 4; + } - for (int var2 = 0; var2 < var0.length; ++var2) { - if (var0[var2] < 0 || var0[var2] > class538.field4243.length) { - return null; + var1 = var4.method1040(var3); + if (!var1) { + continue; + } } - var1[var2] = class538.field4243[var0[var2]]; - } + WorldMap.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field948, var0.field956, var0.field945); + var0.remove(); + } else { + if (var0.startCycle > 0) { + --var0.startCycle; + } + + if (var0.startCycle == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { + if (var0.id >= 0) { + var2 = var0.id; + var3 = var0.objectType; + var4 = WorldMapElement.getObjectDefinition(var2); + if (var3 == 11) { + var3 = 10; + } - return var1; - } else { - return null; + if (var3 >= 5 && var3 <= 8) { + var3 = 4; + } + + var1 = var4.method1040(var3); + if (!var1) { + continue; + } + } + + WorldMap.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.rotation, var0.objectType, var0.field945); + var0.startCycle = -1; + if (var0.id == var0.objectId && var0.objectId == -1) { + var0.remove(); + } else if (var0.id == var0.objectId && var0.rotation == var0.field948 && var0.field956 == var0.objectType) { + var0.remove(); + } + } + } } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IndexedSprite.java b/osrs/src/main/java/IndexedSprite.java index d08b81e51..2aabed072 100644 --- a/osrs/src/main/java/IndexedSprite.java +++ b/osrs/src/main/java/IndexedSprite.java @@ -2,35 +2,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("uu") +@ObfuscatedName("uk") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("pixels") public byte[] pixels; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("palette") public int[] palette; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("subWidth") public int subWidth; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("subHeight") public int subHeight; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("xOffset") public int xOffset; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("yOffset") public int yOffset; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("width") public int width; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("height") public int height; - @ObfuscatedName("aw") + IndexedSprite() { + } + + @ObfuscatedName("au") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -51,7 +54,7 @@ public void normalize() { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { @@ -84,7 +87,7 @@ public void shiftColors(int var1, int var2, int var3) { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -130,8 +133,8 @@ public void drawAt(int var1, int var2) { } } - @ObfuscatedName("as") - public void method2635(int var1, int var2, int var3, int var4) { + @ObfuscatedName("ac") + public void method2654(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -192,7 +195,7 @@ public void method2635(int var1, int var2, int var3, int var4) { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -246,7 +249,7 @@ static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("IndexedSprite_something") static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; @@ -271,4 +274,4 @@ static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Instrument.java b/osrs/src/main/java/Instrument.java index ce401403a..9bdcc6fcf 100644 --- a/osrs/src/main/java/Instrument.java +++ b/osrs/src/main/java/Instrument.java @@ -1,115 +1,116 @@ -import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.Random; + @ObfuscatedName("cq") @Implements("Instrument") public class Instrument { - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbr;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbr;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbr;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbr;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbr;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbr;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbr;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbr;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("delayTime") int delayTime; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("delayDecay") int delayDecay; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcr;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbr;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("duration") int duration; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("offset") int offset; @@ -146,10 +147,10 @@ public class Instrument { this.offset = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class410.clearIntArray(Instrument_samples, 0, var1); + class409.clearIntArray(Instrument_samples, 0, var1); if (var2 < 10) { return Instrument_samples; } else { @@ -354,7 +355,7 @@ final int[] synthesize(int var1, int var2) { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { @@ -368,9 +369,9 @@ final int evaluateWave(int var1, int var2, int var3) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -422,6 +423,6 @@ final void decode(Buffer var1) { this.offset = var1.readUnsignedShort(); this.filter = new AudioFilter(); this.filterEnvelope = new SoundEnvelope(); - this.filter.method317(var1, this.filterEnvelope); + this.filter.method320(var1, this.filterEnvelope); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IntHashTable.java b/osrs/src/main/java/IntHashTable.java index 559c268fe..e8b46fae8 100644 --- a/osrs/src/main/java/IntHashTable.java +++ b/osrs/src/main/java/IntHashTable.java @@ -3,16 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uj") +@ObfuscatedName("uz") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("NpcDefinition_archive") - public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("array") int[] array; @@ -38,10 +32,10 @@ public IntHashTable(int[] var1) { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1748231444" + garbageValue = "-1742890609" ) @Export("get") public int get(int var1) { @@ -61,4 +55,4 @@ public int get(int var1) { var3 = var3 + 1 & var2; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IntegerNode.java b/osrs/src/main/java/IntegerNode.java index cd0c536d2..504fe53a4 100644 --- a/osrs/src/main/java/IntegerNode.java +++ b/osrs/src/main/java/IntegerNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("sx") +@ObfuscatedName("sz") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("integer") public int integer; public IntegerNode(int var1) { this.integer = var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/InterfaceParent.java b/osrs/src/main/java/InterfaceParent.java index c016f8f34..5adf6d30b 100644 --- a/osrs/src/main/java/InterfaceParent.java +++ b/osrs/src/main/java/InterfaceParent.java @@ -1,162 +1,160 @@ -import java.io.IOException; -import java.util.ArrayList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dn") +@ObfuscatedName("ds") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("group") int group; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("type") int type; - @ObfuscatedName("ar") - boolean field856; + @ObfuscatedName("ao") + boolean field858; InterfaceParent() { - this.field856 = false; + this.field858 = false; } - @ObfuscatedName("ap") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "143844531" + descriptor = "(IIIIIII)I", + garbageValue = "1893248685" ) - public static boolean method470(int var0) { - boolean var1 = false; - boolean var2 = false; - if (!class306.field2760.isEmpty()) { - SongTask var3 = (SongTask)class306.field2760.get(0); - if (var3 == null) { - class306.field2760.remove(0); - } else if (var3.vmethod2107(var0)) { - if (var3.method2098()) { - System.out.println("Error in midimanager.service: " + var3.method2100()); - var1 = true; - } else { - if (var3.method2101() != null) { - class306.field2760.add(1, var3.method2101()); - } - - var2 = var3.method2099(); - } - - class306.field2760.remove(0); - } else { - var2 = var3.method2099(); - } + public static int method473(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { + int var6 = var3; + var3 = var4; + var4 = var6; } - if (var1) { - class306.field2760.clear(); - ArrayList var4 = class162.method847(); - class306.field2760.add(new class402((SongTask)null, var4)); + var2 &= 3; + if (var2 == 0) { + return var1; + } else if (var2 == 1) { + return 7 - var0 - (var3 - 1); + } else { + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; } - - return var2; } - @ObfuscatedName("hv") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2055389038" + descriptor = "(ILdh;ZI)I", + garbageValue = "-612957518" ) - static void reloadJS5() { - if (PendingSpawn.varcs.hasUnwrittenChanges()) { - PendingSpawn.varcs.write(); + static int method474(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + } else { + var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; } - if (class497.mouseRecorder != null) { - class497.mouseRecorder.isRunning = false; - } - - class497.mouseRecorder = null; - Client.packetWriter.close(); - if (GameEngine.taskHandler != null) { - try { - GameEngine.taskHandler.close(); - } catch (Exception var3) { + class218.invalidateWidget(var3); + int var4; + int var5; + if (var0 != 1200 && var0 != 1205 && var0 != 1212) { + if (var0 == 1201) { + var3.modelType = 2; + var3.modelId = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + return 1; + } else if (var0 == 1202) { + var3.modelType = 3; + var3.modelId = VarbitComposition.localPlayer.appearance.getChatHeadId(); + return 1; + } else if (var0 == 1207) { + boolean var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class160.method846(var3, VarbitComposition.localPlayer.appearance, var7); + return 1; + } else if (var0 == 1208) { + var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var3.field3101 == null) { + throw new RuntimeException(""); + } else { + ReflectionCheck.method174(var3, var4); + return 1; + } + } else if (var0 == 1209) { + SoundCache.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + if (var3.field3101 == null) { + throw new RuntimeException(""); + } else { + Tiles.method460(var3, var4, var5); + return 1; + } + } else if (var0 == 1210) { + var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var3.field3101 == null) { + throw new RuntimeException(""); + } else { + class135.method742(var3, VarbitComposition.localPlayer.appearance.field2916, var4); + return 1; + } + } else { + return 2; + } + } else { + SoundCache.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemComposition var6 = InvDefinition.ItemDefinition_get(var4); + var3.modelAngleX = var6.xan2d; + var3.modelAngleY = var6.yan2d; + var3.modelAngleZ = var6.zan2d; + var3.modelOffsetX = var6.offsetX2d; + var3.modelOffsetY = var6.offsetY2d; + var3.modelZoom = var6.zoom2d; + if (var0 == 1205) { + var3.itemQuantityMode = 0; + } else if (var0 == 1212 | var6.isStackable == 1) { + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; } - } - - GameEngine.taskHandler = null; - class159.method836(); - class197.archive2.clearFiles(); - FontName.archive13.clearFiles(); - ReflectionCheck.field151.clearFiles(); - class191.field1546.clearFiles(); - World.field670.clearFiles(); - class106.field1099.clearFiles(); - Varcs.field1130.clearFiles(); - Interpreter.field713.clearFiles(); - class10.compass = null; - SoundCache.redHintArrowSprite = null; - class282.mapSceneSprites = null; - DbTableType.headIconPkSprites = null; - class17.headIconPrayerSprites = null; - class345.headIconHintSprites = null; - DynamicObject.mapMarkerSprites = null; - class211.crossSprites = null; - MusicPatchNode2.mapDotSprites = null; - class302.scrollBarSprites = null; - AbstractWorldMapIcon.field2442 = null; - UserComparator5.scene.clear(); - - int var1; - for (var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); - } - - class127.worldMap = null; - RouteStrategy.method1107(0, 0); - class306.field2755.clear(); - Client.playingJingle = false; - class133.method727(); - if (VerticalAlignment.pcmPlayer1 != null) { - VerticalAlignment.pcmPlayer1.shutdown(); - } - - class153.field1356.method1904(); - ArchiveDiskAction.method1847(); - if (WorldMapLabel.urlRequester != null) { - WorldMapLabel.urlRequester.close(); - } - - try { - JagexCache.JagexCache_dat2File.close(); - for (var1 = 0; var1 < JagexCache.field1450; ++var1) { - class302.JagexCache_idxFiles[var1].close(); + if (var3.modelRotation > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.modelRotation; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; } - JagexCache.JagexCache_idx255File.close(); - JagexCache.JagexCache_randomDat.close(); - } catch (Exception var4) { + return 1; } + } - JagexCache.JagexCache_dat2File = null; - JagexCache.JagexCache_idx255File = null; - class302.JagexCache_idxFiles = null; - FileSystem.FileSystem_cacheFiles.clear(); - class158.masterDisk = null; - Client.archiveLoaders.clear(); - Client.field548 = 0; - class153.field1356 = new JagNetThread(); - WorldMapLabel.urlRequester = new class113(TileItem.client.field655, 215); + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(ILdh;ZB)I", + garbageValue = "-104" + ) + static int method476(int var0, Script var1, boolean var2) { + if (var0 == 7463) { + boolean var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + SecureRandomFuture.method444(var3); + return 1; + } else { + return 2; + } + } - try { - ObjTypeCustomisation.method923("oldschool", VarpDefinition.field1494, ArchiveLoader.field849.name, 0, 22); - } catch (IOException var2) { - throw new RuntimeException(var2); + @ObfuscatedName("jg") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-59" + ) + static void method475() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + class92.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); } - class158.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - GameEngine.taskHandler = new TaskHandler(); - Client.field412 = class92.field937; - class129.updateGameState(0); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Interpreter.java b/osrs/src/main/java/Interpreter.java index 99ef96592..7db486ee0 100644 --- a/osrs/src/main/java/Interpreter.java +++ b/osrs/src/main/java/Interpreter.java @@ -1,72 +1,57 @@ -import java.util.ArrayList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.js.JSObject; + +import java.util.ArrayList; +import java.util.Date; -@ObfuscatedName("ck") +@ObfuscatedName("cb") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("am") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("Interpreter_stringLocals") static String[] Interpreter_stringLocals; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("av") - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; @ObfuscatedName("aq") - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("at") @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lca;" + descriptor = "[Lcv;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("ad") + @ObfuscatedName("an") + static int[] field710; + @ObfuscatedName("ax") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("ak") - static boolean field698; - @ObfuscatedName("an") - static boolean field699; - @ObfuscatedName("af") - static ArrayList field711; - @ObfuscatedName("ai") - static int field701; - @ObfuscatedName("bn") - static final double field715; - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "Lot;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static Archive field713; + @ObfuscatedName("ay") + static boolean field705; + @ObfuscatedName("aj") + static boolean field704; + @ObfuscatedName("av") + static ArrayList field715; + @ObfuscatedName("aw") + static int field708; + @ObfuscatedName("bk") + static final double field717; static { Interpreter_arrayLengths = new int[5]; @@ -77,94 +62,477 @@ public class Interpreter { Interpreter_frames = new ScriptFrame[50]; Interpreter_calendar = java.util.Calendar.getInstance(); Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - field698 = false; - field699 = false; - field711 = new ArrayList(); - field701 = 0; - field715 = Math.log(2.0D); + field705 = false; + field704 = false; + field715 = new ArrayList(); + field708 = 0; + field717 = Math.log(2.0D); } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lag;I)Lam;", - garbageValue = "-654808051" + descriptor = "(Ljava/lang/String;I)[B", + garbageValue = "-1581379999" ) - public static class3 method424(class6 var0) { - switch(var0.field8) { - case 0: - return new class0(); - default: - throw new IllegalArgumentException(); + static byte[] method418(String var0) { + boolean var1 = true; + boolean var2 = true; + int var3 = "pattern".length(); + int var4 = 0; + byte[] var5 = new byte[8]; + + while (true) { + int var6 = var4 + var3; + if (var6 >= var0.length()) { + return null; + } + + char var7 = var0.charAt(var6); + if (var7 == ':') { + if (var4 == 0) { + return null; + } + + byte[] var8 = new byte[var4]; + System.arraycopy(var5, 0, var8, 0, var4); + return var8; + } + + if (var5.length == var4) { + return null; + } + + if (var7 >= '0' && var7 <= '9') { + var7 = (char)(var7 - '0'); + } else { + if (var7 < 'a' || var7 > 'z') { + return null; + } + + var7 = (char)(var7 - 'W'); + } + + var5[var4++] = (byte)var7; } } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;ZLpc;I)V", - garbageValue = "2044314347" + descriptor = "(IB)I", + garbageValue = "-4" ) - public static void method426(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - Frames.ItemDefinition_archive = var0; - class140.ItemDefinition_modelArchive = var1; - class502.ItemDefinition_inMembersWorld = var2; - class239.ItemDefinition_fileCount = Frames.ItemDefinition_archive.getGroupFileCount(10); - FloorDecoration.ItemDefinition_fontPlain11 = var3; + public static int method417(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 0 & 127L); + return var1; } - @ObfuscatedName("aw") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(IB)Ldc;", - garbageValue = "-81" + descriptor = "(ILdh;ZI)I", + garbageValue = "-86107696" ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); - if (var1 != null) { - return var1; + static int method419(int var0, Script var1, boolean var2) { + if (var0 == 5630) { + Client.logoutTimer = 250; + return 1; } else { - byte[] var2 = class126.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; - } else { - var1 = SoundCache.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; - } + return 2; } } - @ObfuscatedName("bf") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-2066860268" + descriptor = "(ILdh;ZI)I", + garbageValue = "-752327040" ) - static int method427(int var0, Script var1, boolean var2) { - return 2; - } + static int method420(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { + var3 = HealthBar.Client_plane; + int var9 = (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX; + int var5 = (VarbitComposition.localPlayer.y >> 7) + class47.baseY; + class227.getWorldMap().method2394(var3, var9, var5, true); + return 1; + } else { + WorldMapArea var11; + if (var0 == 6601) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + String var16 = ""; + var11 = class227.getWorldMap().getMapArea(var3); + if (var11 != null) { + var16 = var11.getExternalName(); + } - @ObfuscatedName("iw") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "81" - ) - @Export("playJingle") - static void playJingle(int var0, int var1) { - if (class150.clientPreferences.getCurrentMusicVolume() != 0 && var0 != -1) { - ArrayList var2 = new ArrayList(); - var2.add(new MusicSong(GrandExchangeOfferOwnWorldComparator.field358, var0, 0, class150.clientPreferences.getCurrentMusicVolume(), false)); - UserComparator4.method663(var2, 0, 0, 0, 0, true); - Client.playingJingle = true; - } + Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == 6602) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class227.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == 6603) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == 6604) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class227.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == 6605) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; + } else { + Coord var15; + if (var0 == 6606) { + var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + class227.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); + return 1; + } else if (var0 == 6607) { + var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + class227.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); + return 1; + } else if (var0 == 6608) { + var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + class227.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == 6609) { + var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + class227.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == 6610) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getDisplayX(); + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getDisplayY(); + return 1; + } else { + WorldMapArea var13; + if (var0 == 6611) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var13 = class227.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); + } + + return 1; + } else if (var0 == 6612) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var13 = class227.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; + } + + return 1; + } else if (var0 == 6613) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var13 = class227.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } else if (var0 == 6614) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var13 = class227.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getZoom(); + } + + return 1; + } else if (var0 == 6615) { + var15 = class227.getWorldMap().getDisplayCoord(); + if (var15 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var15.x; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var15.y; + } + return 1; + } else if (var0 == 6616) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == 6617) { + var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + var13 = class227.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + int[] var14 = var13.position(var15.plane, var15.x, var15.y); + if (var14 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var14[0]; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var14[1]; + } + + return 1; + } + } else { + Coord var7; + if (var0 == 6618) { + var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + var13 = class227.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + var7 = var13.coord(var15.x, var15.y); + if (var7 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } + } else { + Coord var12; + if (var0 == 6619) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var12 = new Coord(Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + class162.method854(var3, var12, false); + return 1; + } else if (var0 == 6620) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var12 = new Coord(Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + class162.method854(var3, var12, true); + return 1; + } else if (var0 == 6621) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var12 = new Coord(Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + var11 = class227.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; + return 1; + } + } else if (var0 == 6622) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getDisplayWith(); + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + var13 = class227.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); + if (var13 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getId(); + } + + return 1; + } else if (var0 == 6624) { + class227.getWorldMap().setMaxFlashCount(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + class227.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + class227.getWorldMap().setCyclesPerFlash(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + class227.getWorldMap().resetCyclesPerFlash(); + return 1; + } else { + boolean var10; + if (var0 == 6628) { + var10 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class227.getWorldMap().setPerpetualFlash(var10); + return 1; + } else if (var0 == 6629) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class227.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == 6630) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class227.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == 6631) { + class227.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == 6632) { + var10 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class227.getWorldMap().setElementsDisabled(var10); + return 1; + } else { + boolean var4; + if (var0 == 6633) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1] == 1; + class227.getWorldMap().disableElement(var3, var4); + return 1; + } else if (var0 == 6634) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1] == 1; + class227.getWorldMap().setCategoryDisabled(var3, var4); + return 1; + } else if (var0 == 6635) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == 6636) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6637) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var12 = new Coord(Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + var7 = class227.getWorldMap().method2438(var3, var12); + if (var7 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } else { + AbstractWorldMapIcon var8; + if (var0 == 6639) { + var8 = class227.getWorldMap().iconStart(); + if (var8 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else if (var0 == 6640) { + var8 = class227.getWorldMap().iconNext(); + if (var8 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else { + WorldMapElement var6; + if (var0 == 6693) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var6 = class138.WorldMapElement_get(var3); + if (var6.name == null) { + Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var6.name; + } + + return 1; + } else if (var0 == 6694) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var6 = class138.WorldMapElement_get(var3); + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.textSize; + return 1; + } else if (var0 == 6695) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var6 = class138.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.category; + } + + return 1; + } else if (var0 == 6696) { + var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var6 = class138.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.sprite1; + } + + return 1; + } else if (var0 == 6697) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == 6699) { + Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.worldMapEvent.coord2.packed(); + return 1; + } else { + return 2; + } + } + } + } + } + } + } + } + } + } } - @ObfuscatedName("mt") + @ObfuscatedName("oy") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-47" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1076140788" ) - static final void method429(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - class150.clientPreferences.setAreaSoundEffectsVolume(var0); + static void method421(String var0) { + MusicPatchPcmStream.param9 = var0; + + try { + String var1 = class219.client.getParameter(Integer.toString(18)); + String var2 = class219.client.getParameter(Integer.toString(13)); + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; + String var5; + if (var0.length() == 0) { + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + String var4 = var3 + "; Expires="; + long var6 = GameEngine.clockNow() + 94608000000L; + Calendar.Calendar_calendar.setTime(new Date(var6)); + int var8 = Calendar.Calendar_calendar.get(7); + int var9 = Calendar.Calendar_calendar.get(5); + int var10 = Calendar.Calendar_calendar.get(2); + int var11 = Calendar.Calendar_calendar.get(1); + int var12 = Calendar.Calendar_calendar.get(11); + int var13 = Calendar.Calendar_calendar.get(12); + int var14 = Calendar.Calendar_calendar.get(13); + var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; + var3 = var4 + var5 + "; Max-Age=" + 94608000L; + } + + Client var16 = class219.client; + var5 = "document.cookie=\"" + var3 + "\""; + JSObject.getWindow(var16).eval(var5); + } catch (Throwable var15) { + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/InvDefinition.java b/osrs/src/main/java/InvDefinition.java index e8017823c..8971c2791 100644 --- a/osrs/src/main/java/InvDefinition.java +++ b/osrs/src/main/java/InvDefinition.java @@ -6,21 +6,13 @@ @ObfuscatedName("hh") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("InvDefinition_archive") - public static AbstractArchive InvDefinition_archive; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("az") - static byte[][][] field1488; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("size") public int size; @@ -32,10 +24,10 @@ public class InvDefinition extends DualNode { this.size = 0; } - @ObfuscatedName("ay") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "-746767254" + descriptor = "(Ltm;B)V", + garbageValue = "-4" ) @Export("decode") void decode(Buffer var1) { @@ -49,10 +41,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;IB)V", - garbageValue = "-96" + descriptor = "(Ltm;II)V", + garbageValue = "1263853199" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -62,13 +54,139 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("aj") + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-329385926" + ) + public static int method937(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if (var4 <= 127) { + ++var2; + } else if (var4 <= 2047) { + var2 += 2; + } else { + var2 += 3; + } + } + + return var2; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(II)Lhn;", + garbageValue = "1028115024" + ) + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = class384.ItemDefinition_archive.takeFile(10, var0); + var1 = new ItemComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.post(); + if (var1.noteTemplate != -1) { + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!ItemComposition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { + if (var1.noteTemplate == -1 && var1.notedId == -1 && var1.placeholderTemplate == -1) { + var1.name = var1.name + " (Members)"; + } + + var1.isTradable = false; + + int var3; + for (var3 = 0; var3 < var1.groundActions.length; ++var3) { + var1.groundActions[var3] = null; + } + + for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { + if (var3 != 4) { + var1.inventoryActions[var3] = null; + } + } + + var1.shiftClickIndex = -2; + var1.team = 0; + if (var1.params != null) { + boolean var6 = false; + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { + ParamComposition var5 = ObjTypeCustomisation.getParamDefinition((int)var4.key); + if (var5.autoDisable) { + var4.remove(); + } else { + var6 = true; + } + } + + if (!var6) { + var1.params = null; + } + } + } + + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "-115" + ) + public static int method940(int var0, int var1, int var2) { + int var3 = Projectile.method430(var2 - var1 + 1); + var3 <<= var1; + return var0 & ~var3; + } + + @ObfuscatedName("ac") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); + } + + @ObfuscatedName("lw") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "122" + garbageValue = "-95" ) - public static void method929() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { + Widget var0 = SoundCache.getWidgetChild(ModeWhere.selectedSpellWidget, Client.selectedSpellChildIndex); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + WorldMapSection1.runScriptEvent(var1); + } + + Client.selectedSpellItemId = -1; + Client.isSpellSelected = false; + class218.invalidateWidget(var0); + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IsaacCipher.java b/osrs/src/main/java/IsaacCipher.java index 3f811fd4b..c8fea7524 100644 --- a/osrs/src/main/java/IsaacCipher.java +++ b/osrs/src/main/java/IsaacCipher.java @@ -3,25 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uy") +@ObfuscatedName("ux") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("results") int[] results; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("mm") int[] mm; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("aa") int aa; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("bb") int bb; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("cc") int cc; @@ -33,13 +33,13 @@ public IsaacCipher(int[] var1) { this.results[var2] = var1[var2]; } - this.method2674(); + this.method2693(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1840020352" + garbageValue = "-66287514" ) @Export("nextInt") public final int nextInt() { @@ -51,12 +51,12 @@ public final int nextInt() { return this.results[--this.valuesRemaining]; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "18" + descriptor = "(I)I", + garbageValue = "1374032282" ) - public final int method2672() { + public final int method2691() { if (this.valuesRemaining == 0) { this.generateMoreResults(); this.valuesRemaining = 256; @@ -65,10 +65,10 @@ public final int method2672() { return this.results[this.valuesRemaining - 1]; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "3" + descriptor = "(I)V", + garbageValue = "1084555952" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -96,12 +96,12 @@ final void generateMoreResults() { } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-312675449" + descriptor = "(B)V", + garbageValue = "4" ) - final void method2674() { + final void method2693() { int var9 = -1640531527; int var8 = -1640531527; int var7 = -1640531527; @@ -228,4 +228,4 @@ final void method2674() { this.generateMoreResults(); this.valuesRemaining = 256; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ItemComposition.java b/osrs/src/main/java/ItemComposition.java index c7e1b1af5..3c54b952e 100644 --- a/osrs/src/main/java/ItemComposition.java +++ b/osrs/src/main/java/ItemComposition.java @@ -3,177 +3,182 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("hn") @Implements("ItemComposition") public class ItemComposition extends DualNode { + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; @ObfuscatedName("ap") + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("aa") + static int[] field1768; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("ItemDefinition_cached") - static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("aq") + public static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("ItemDefinition_cachedModels") - static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("at") + public static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("ItemDefinition_cachedSprites") - static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("iv") - @ObfuscatedSignature( - descriptor = "Lpc;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("ax") + public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; + @ObfuscatedName("an") @Export("id") int id; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("model") int model; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("name") public String name; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("zoom2d") public int zoom2d; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("xan2d") public int xan2d; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("yan2d") public int yan2d; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("zan2d") public int zan2d; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("isStackable") public int isStackable; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("price") public int price; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("maleModel") public int maleModel; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("maleModel1") public int maleModel1; - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("maleModel2") public int maleModel2; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("be") + @ObfuscatedName("bl") @Export("femaleModel") int femaleModel; - @ObfuscatedName("bc") + @ObfuscatedName("bp") @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("bu") + @ObfuscatedName("bo") @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("bk") + @ObfuscatedName("bb") @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("bz") - int field1759; - @ObfuscatedName("bx") + @ObfuscatedName("br") + int field1779; + @ObfuscatedName("be") @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("bh") + @ObfuscatedName("bi") @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("bl") - int field1752; - @ObfuscatedName("bt") - int field1754; - @ObfuscatedName("by") - int field1758; - @ObfuscatedName("bg") + @ObfuscatedName("bx") + int field1782; + @ObfuscatedName("bn") + int field1776; + @ObfuscatedName("bw") + int field1781; + @ObfuscatedName("bc") @Export("countobj") int[] countobj; - @ObfuscatedName("bj") + @ObfuscatedName("bg") @Export("countco") int[] countco; - @ObfuscatedName("ct") + @ObfuscatedName("cw") @Export("note") public int note; @ObfuscatedName("cf") @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("cz") + @ObfuscatedName("cm") @Export("resizeX") int resizeX; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @Export("resizeY") int resizeY; @ObfuscatedName("cs") @Export("resizeZ") int resizeZ; - @ObfuscatedName("cj") - public int field1783; - @ObfuscatedName("cn") - public int field1784; - @ObfuscatedName("cw") + @ObfuscatedName("cx") + public int field1812; + @ObfuscatedName("cr") + public int field1809; + @ObfuscatedName("cd") @Export("team") public int team; @ObfuscatedName("ce") - public int field1781; + public int field1806; @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "Lsa;" + descriptor = "Lsf;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("cm") + @ObfuscatedName("cp") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("ca") + @ObfuscatedName("cv") @Export("unnotedId") int unnotedId; - @ObfuscatedName("cx") + @ObfuscatedName("co") @Export("notedId") int notedId; - @ObfuscatedName("co") + @ObfuscatedName("cl") @Export("placeholder") public int placeholder; @ObfuscatedName("cu") @@ -208,22 +213,22 @@ public class ItemComposition extends DualNode { this.femaleOffset = 0; this.maleHeadModel = -1; this.maleHeadModel2 = -1; - this.field1759 = 0; + this.field1779 = 0; this.femaleModel2 = -1; this.femaleHeadModel = -1; this.femaleHeadModel2 = -1; - this.field1752 = -1; - this.field1754 = -1; - this.field1758 = -1; + this.field1782 = -1; + this.field1776 = -1; + this.field1781 = -1; this.note = -1; this.noteTemplate = -1; this.resizeX = 128; this.resizeY = 128; this.resizeZ = 128; - this.field1783 = 0; - this.field1784 = 0; + this.field1812 = 0; + this.field1809 = 0; this.team = 0; - this.field1781 = 0; + this.field1806 = 0; this.isTradable = false; this.unnotedId = -1; this.notedId = -1; @@ -231,23 +236,23 @@ public class ItemComposition extends DualNode { this.placeholderTemplate = -1; } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "908624790" + garbageValue = "864940411" ) @Export("post") void post() { if (this.isStackable == 1) { - this.field1781 = 0; + this.field1806 = 0; } } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "-591135841" + descriptor = "(Ltm;B)V", + garbageValue = "3" ) @Export("decode") void decode(Buffer var1) { @@ -261,10 +266,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-1732783795" + descriptor = "(Ltm;II)V", + garbageValue = "628173380" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -307,7 +312,7 @@ void decodeNext(Buffer var1, int var2) { this.femaleModel1 = var1.readUnsignedShort(); } else if (var2 == 25) { this.maleHeadModel = var1.readUnsignedShort(); - this.field1759 = var1.readUnsignedByte(); + this.field1779 = var1.readUnsignedByte(); } else if (var2 == 26) { this.maleHeadModel2 = var1.readUnsignedShort(); } else if (var2 == 27) { @@ -345,7 +350,7 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 65) { this.isTradable = true; } else if (var2 == 75) { - this.field1781 = var1.readShort(); + this.field1806 = var1.readShort(); } else if (var2 == 78) { this.femaleModel2 = var1.readUnsignedShort(); } else if (var2 == 79) { @@ -353,11 +358,11 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 90) { this.femaleHeadModel2 = var1.readUnsignedShort(); } else if (var2 == 91) { - this.field1754 = var1.readUnsignedShort(); + this.field1776 = var1.readUnsignedShort(); } else if (var2 == 92) { - this.field1752 = var1.readUnsignedShort(); + this.field1782 = var1.readUnsignedShort(); } else if (var2 == 93) { - this.field1758 = var1.readUnsignedShort(); + this.field1781 = var1.readUnsignedShort(); } else if (var2 == 94) { var1.readUnsignedShort(); } else if (var2 == 95) { @@ -381,9 +386,9 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 112) { this.resizeZ = var1.readUnsignedShort(); } else if (var2 == 113) { - this.field1783 = var1.readByte(); + this.field1812 = var1.readByte(); } else if (var2 == 114) { - this.field1784 = var1.readByte() * 5; + this.field1809 = var1.readByte() * 5; } else if (var2 == 115) { this.team = var1.readUnsignedByte(); } else if (var2 == 139) { @@ -395,16 +400,16 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = class141.readStringIntParameters(var1, this.params); + this.params = Decimator.readStringIntParameters(var1, this.params); } } } - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lhc;Lhc;I)V", - garbageValue = "-279159278" + descriptor = "(Lhn;Lhn;B)V", + garbageValue = "-46" ) @Export("genCert") void genCert(ItemComposition var1, ItemComposition var2) { @@ -425,10 +430,10 @@ void genCert(ItemComposition var1, ItemComposition var2) { this.isStackable = 1; } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lhc;Lhc;B)V", - garbageValue = "74" + descriptor = "(Lhn;Lhn;B)V", + garbageValue = "-88" ) @Export("genBought") void genBought(ItemComposition var1, ItemComposition var2) { @@ -456,12 +461,12 @@ void genBought(ItemComposition var1, ItemComposition var2) { this.maleHeadModel2 = var2.maleHeadModel2; this.femaleHeadModel = var2.femaleHeadModel; this.femaleHeadModel2 = var2.femaleHeadModel2; - this.field1752 = var2.field1752; - this.field1754 = var2.field1754; - this.field1758 = var2.field1758; + this.field1782 = var2.field1782; + this.field1776 = var2.field1776; + this.field1781 = var2.field1781; this.team = var2.team; this.groundActions = var2.groundActions; - this.field1781 = var2.field1781; + this.field1806 = var2.field1806; this.inventoryActions = new String[5]; if (var2.inventoryActions != null) { for (int var3 = 0; var3 < 4; ++var3) { @@ -475,8 +480,8 @@ void genBought(ItemComposition var1, ItemComposition var2) { @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lhc;Lhc;B)V", - garbageValue = "37" + descriptor = "(Lhn;Lhn;I)V", + garbageValue = "-490617872" ) @Export("genPlaceholder") void genPlaceholder(ItemComposition var1, ItemComposition var2) { @@ -498,10 +503,10 @@ void genPlaceholder(ItemComposition var1, ItemComposition var2) { this.isTradable = false; } - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(II)Lie;", - garbageValue = "1090571932" + descriptor = "(IB)Lic;", + garbageValue = "0" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -516,11 +521,11 @@ public final ModelData getModelData(int var1) { } if (var2 != -1) { - return class125.ItemDefinition_get(var2).getModelData(1); + return InvDefinition.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(class140.ItemDefinition_modelArchive, this.model, 0); + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; } else { @@ -544,10 +549,10 @@ public final ModelData getModelData(int var1) { } } - @ObfuscatedName("ap") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IB)Ljo;", - garbageValue = "1" + descriptor = "(II)Ljr;", + garbageValue = "220465503" ) @Export("getModel") public final Model getModel(int var1) { @@ -561,7 +566,7 @@ public final Model getModel(int var1) { } if (var2 != -1) { - return class125.ItemDefinition_get(var2).getModel(1); + return InvDefinition.ItemDefinition_get(var2).getModel(1); } } @@ -569,7 +574,7 @@ public final Model getModel(int var1) { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.ModelData_get(class140.ItemDefinition_modelArchive, this.model, 0); + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); if (var6 == null) { return null; } else { @@ -590,7 +595,7 @@ public final Model getModel(int var1) { } } - var5 = var6.toModel(this.field1783 + 64, this.field1784 + 768, -50, -10, -50); + var5 = var6.toModel(this.field1812 + 64, this.field1809 + 768, -50, -10, -50); var5.isSingleTile = true; ItemDefinition_cachedModels.put(var5, (long)this.id); return var5; @@ -598,10 +603,10 @@ public final Model getModel(int var1) { } } - @ObfuscatedName("aq") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(IB)Lhc;", - garbageValue = "1" + descriptor = "(II)Lhn;", + garbageValue = "-257318968" ) @Export("getCountObj") public ItemComposition getCountObj(int var1) { @@ -615,19 +620,19 @@ public ItemComposition getCountObj(int var1) { } if (var2 != -1) { - return class125.ItemDefinition_get(var2); + return InvDefinition.ItemDefinition_get(var2); } } return this; } - @ObfuscatedName("ax") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "14" + garbageValue = "-106" ) - public final boolean method1041(int var1) { + public final boolean method1061(int var1) { int var2 = this.femaleModel; int var3 = this.femaleModel1; int var4 = this.femaleModel2; @@ -641,15 +646,15 @@ public final boolean method1041(int var1) { return true; } else { boolean var5 = true; - if (!class140.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !class140.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !class140.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -657,12 +662,12 @@ public final boolean method1041(int var1) { } } - @ObfuscatedName("aa") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II)Lie;", - garbageValue = "-1706198430" + descriptor = "(II)Lic;", + garbageValue = "768545854" ) - public final ModelData method1042(int var1) { + public final ModelData method1062(int var1) { int var2 = this.femaleModel; int var3 = this.femaleModel1; int var4 = this.femaleModel2; @@ -675,11 +680,11 @@ public final ModelData method1042(int var1) { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.ModelData_get(class140.ItemDefinition_modelArchive, var2, 0); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(class140.ItemDefinition_modelArchive, var3, 0); + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(class140.ItemDefinition_modelArchive, var4, 0); + ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); } else { @@ -692,8 +697,8 @@ public final ModelData method1042(int var1) { var5.changeOffset(0, this.femaleOffset, 0); } - if (var1 == 1 && this.field1759 != 0) { - var5.changeOffset(0, this.field1759, 0); + if (var1 == 1 && this.field1779 != 0) { + var5.changeOffset(0, this.field1779, 0); } int var9; @@ -713,28 +718,28 @@ public final ModelData method1042(int var1) { } } - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1820118028" + garbageValue = "-594458202" ) - public final boolean method1043(int var1) { + public final boolean method1063(int var1) { int var2 = this.femaleHeadModel2; - int var3 = this.field1752; + int var3 = this.field1782; if (var1 == 1) { - var2 = this.field1754; - var3 = this.field1758; + var2 = this.field1776; + var3 = this.field1781; } if (var2 == -1) { return true; } else { boolean var4 = true; - if (!class140.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !class140.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -742,25 +747,25 @@ public final boolean method1043(int var1) { } } - @ObfuscatedName("ae") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(II)Lie;", - garbageValue = "1709950556" + descriptor = "(II)Lic;", + garbageValue = "1601057747" ) - public final ModelData method1044(int var1) { + public final ModelData method1064(int var1) { int var2 = this.femaleHeadModel2; - int var3 = this.field1752; + int var3 = this.field1782; if (var1 == 1) { - var2 = this.field1754; - var3 = this.field1758; + var2 = this.field1776; + var3 = this.field1781; } if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.ModelData_get(class140.ItemDefinition_modelArchive, var2, 0); + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(class140.ItemDefinition_modelArchive, var3, 0); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } @@ -784,18 +789,18 @@ public final ModelData method1044(int var1) { @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "655176958" + descriptor = "(IIS)I", + garbageValue = "6798" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return FileSystem.method904(this.params, var1, var2); + return class14.method39(this.params, var1, var2); } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1588687604" + garbageValue = "693488201" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { @@ -815,16 +820,16 @@ public String getStringParam(int var1, String var2) { return var3; } - @ObfuscatedName("ao") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "43603249" + garbageValue = "-702688256" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { if (this.shiftClickIndex != -1 && this.inventoryActions != null) { if (this.shiftClickIndex >= 0) { - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -361234249 * 1689705735 : -1; + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -947919987 * -252831931 : -1; } else { return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } @@ -833,23 +838,36 @@ public int getShiftClickIndex() { } } - @ObfuscatedName("af") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "339" + descriptor = "(I)Z", + garbageValue = "-2125931156" ) @Export("hasRecolor") boolean hasRecolor() { return this.recolorTo != null; } - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1427886067" + garbageValue = "-889947333" ) @Export("hasRetexture") boolean hasRetexture() { return this.retextureTo != null; } -} + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1033906298" + ) + public static int method1054(int var0) { + if (var0 > 0) { + return 1; + } else { + return var0 < 0 ? -1 : 0; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/ItemContainer.java b/osrs/src/main/java/ItemContainer.java index 4d984d9c9..3f5629bc6 100644 --- a/osrs/src/main/java/ItemContainer.java +++ b/osrs/src/main/java/ItemContainer.java @@ -3,19 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("dd") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsm;" + descriptor = "Lso;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("ay") + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Luk;" + ) + static IndexedSprite field853; + @ObfuscatedName("ae") @Export("ids") int[] ids; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("quantities") int[] quantities; @@ -28,28 +33,27 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; } - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-96469770" ) - public static boolean method466() { - if (!class306.field2760.isEmpty()) { - return true; - } else { - return !class306.musicSongs.isEmpty() && class306.musicSongs.get(0) != null && ((MusicSong)class306.musicSongs.get(0)).midiPcmStream != null ? ((MusicSong)class306.musicSongs.get(0)).midiPcmStream.isReady() : false; - } + public static void method468() { + FileSystem.FileSystem_cacheFiles.clear(); } - @ObfuscatedName("ae") + @ObfuscatedName("js") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "409263053" + descriptor = "(III)V", + garbageValue = "2139499432" ) - static final void method467(String var0) { - PacketBufferNode var1 = class503.getPacketBufferNode(ClientPacket.IGNORELIST_ADD, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class501.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + static final void method469(int var0, int var1) { + if (Client.hintArrowType == 2) { + HealthBar.worldToScreen((Client.hintArrowX - UrlRequester.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class47.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + ArchiveLoader.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ItemLayer.java b/osrs/src/main/java/ItemLayer.java index bfa107eef..740d11815 100644 --- a/osrs/src/main/java/ItemLayer.java +++ b/osrs/src/main/java/ItemLayer.java @@ -2,79 +2,165 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("ix") +@ObfuscatedName("ir") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("z") int z; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("x") int x; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("y") int y; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lik;" ) @Export("first") Renderable first; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lik;" ) @Export("second") Renderable second; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lik;" ) @Export("third") Renderable third; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("tag") long tag; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("height") int height; ItemLayer() { } - @ObfuscatedName("aw") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)[Ldw;", - garbageValue = "-986587125" + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "1457055781" ) - static AttackOption[] method1129() { - return new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.field1089, AttackOption.field1090}; + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { + return Byte.TYPE; + } else if (var0.equals("I")) { + return Integer.TYPE; + } else if (var0.equals("S")) { + return Short.TYPE; + } else if (var0.equals("J")) { + return Long.TYPE; + } else if (var0.equals("Z")) { + return Boolean.TYPE; + } else if (var0.equals("F")) { + return Float.TYPE; + } else if (var0.equals("D")) { + return Double.TYPE; + } else if (var0.equals("C")) { + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); + } } - @ObfuscatedName("aw") + @ObfuscatedName("kk") @ObfuscatedSignature( - descriptor = "(I)[Luc;", - garbageValue = "643907738" + descriptor = "(Ldx;B)V", + garbageValue = "-52" ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.SOLID, FillMode.field4185, FillMode.field4184}; + static void method1152(NPC var0) { + var0.field976 = var0.definition.size; + var0.field1017 = var0.definition.rotation; + var0.walkSequence = var0.definition.walkSequence; + var0.walkBackSequence = var0.definition.walkBackSequence; + var0.walkLeftSequence = var0.definition.walkLeftSequence; + var0.walkRightSequence = var0.definition.walkRightSequence; + var0.idleSequence = var0.definition.idleSequence; + var0.turnLeftSequence = var0.definition.turnLeftSequence; + var0.turnRightSequence = var0.definition.turnRightSequence; + var0.runSequence = var0.definition.runSequence; + var0.runBackSequence = var0.definition.runBackSequence; + var0.runLeftSequence = var0.definition.runLeftSequence; + var0.runRightSequence = var0.definition.runRightSequence; + var0.crawlSequence = var0.definition.crawlSequence; + var0.crawlBackSequence = var0.definition.crawlBackSequence; + var0.crawlLeftSequence = var0.definition.crawlLeftSequence; + var0.crawlRightSequence = var0.definition.crawlRightSequence; } - @ObfuscatedName("av") + @ObfuscatedName("lr") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "2136056509" + descriptor = "(Ldf;IIII)V", + garbageValue = "-836252773" ) - public static int method1128(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (VarbitComposition.localPlayer != var0) { + if (Client.menuOptionsCount < 400) { + String var4; + if (var0.skillLevel == 0) { + var4 = var0.actions[0] + var0.username + var0.actions[1] + class14.method42(var0.combatLevel, VarbitComposition.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; + } - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + var0.charAt(var3); - } + int var5; + if (Client.isItemSelected == 1) { + class385.insertMenuItemNoShift("Use", Client.field599 + " " + "->" + " " + MoveSpeed.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((Canvas.selectedSpellFlags & 8) == 8) { + class385.insertMenuItemNoShift(Client.field600, Client.field601 + " " + "->" + " " + MoveSpeed.colorStartTag(16777215) + var4, 15, var1, var2, var3); + } + } else { + for (var5 = 7; var5 >= 0; --var5) { + if (Client.playerMenuActions[var5] != null) { + short var6 = 0; + if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { + if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { + continue; + } + + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > VarbitComposition.localPlayer.combatLevel) { + var6 = 2000; + } - return var2; + if (VarbitComposition.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == VarbitComposition.localPlayer.team) { + var6 = 2000; + } else { + var6 = 0; + } + } else if (Client.playerAttackOption == AttackOption.field1097 && var0.isClanMember()) { + var6 = 2000; + } + } else if (Client.playerOptionsPriorities[var5]) { + var6 = 2000; + } + + boolean var7 = false; + int var8 = Client.playerMenuOpcodes[var5] + var6; + class385.insertMenuItemNoShift(Client.playerMenuActions[var5], MoveSpeed.colorStartTag(16777215) + var4, var8, var1, var2, var3); + } + } + } + + for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (Client.menuOpcodes[var5] == 23) { + Client.menuTargets[var5] = MoveSpeed.colorStartTag(16777215) + var4; + break; + } + } + + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IterableDualNodeQueue.java b/osrs/src/main/java/IterableDualNodeQueue.java index f9b01c9ea..7b11ac9d9 100644 --- a/osrs/src/main/java/IterableDualNodeQueue.java +++ b/osrs/src/main/java/IterableDualNodeQueue.java @@ -1,21 +1,22 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oz") +import java.util.Iterator; + +@ObfuscatedName("ou") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsh;" + descriptor = "Lsq;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsh;" + descriptor = "Lsq;" ) @Export("head") DualNode head; @@ -26,7 +27,7 @@ public IterableDualNodeQueue() { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { @@ -35,9 +36,9 @@ public void clear() { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lsh;)V" + descriptor = "(Lsq;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,9 +52,9 @@ public void add(DualNode var1) { var1.previousDual.nextDual = var1; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "()Lsh;" + descriptor = "()Lsq;" ) @Export("removeLast") public DualNode removeLast() { @@ -66,18 +67,18 @@ public DualNode removeLast() { } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "()Lsh;" + descriptor = "()Lsq;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lsh;)Lsh;" + descriptor = "(Lsq;)Lsq;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -97,9 +98,9 @@ DualNode previousOrLast(DualNode var1) { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "()Lsh;" + descriptor = "()Lsq;" ) @Export("previous") public DualNode previous() { @@ -119,9 +120,9 @@ public Iterator iterator() { return new IterableDualNodeQueueIterator(this); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lsh;Lsh;)V" + descriptor = "(Lsq;Lsq;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { @@ -134,4 +135,4 @@ public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { var0.nextDual.previousDual = var0; var0.previousDual.nextDual = var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IterableDualNodeQueueIterator.java b/osrs/src/main/java/IterableDualNodeQueueIterator.java index b92a6ac94..2ac5466bb 100644 --- a/osrs/src/main/java/IterableDualNodeQueueIterator.java +++ b/osrs/src/main/java/IterableDualNodeQueueIterator.java @@ -1,33 +1,34 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oj") +import java.util.Iterator; + +@ObfuscatedName("ol") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lou;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsh;" + descriptor = "Lsq;" ) @Export("head") DualNode head; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsh;" + descriptor = "Lsq;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Loz;)V" + descriptor = "(Lou;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; @@ -63,4 +64,4 @@ public void remove() { this.last.removeDual(); this.last = null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IterableNodeDeque.java b/osrs/src/main/java/IterableNodeDeque.java index 2795e60a3..8d84bfe26 100644 --- a/osrs/src/main/java/IterableNodeDeque.java +++ b/osrs/src/main/java/IterableNodeDeque.java @@ -1,24 +1,25 @@ -import java.util.Collection; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("or") +import java.util.Collection; +import java.util.Iterator; + +@ObfuscatedName("oc") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) - Node field3627; + Node field3636; public IterableNodeDeque() { this.sentinel = new Node(); @@ -26,7 +27,7 @@ public IterableNodeDeque() { this.sentinel.next = this.sentinel; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { @@ -35,9 +36,9 @@ public void rsClear() { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lsb;)V" + descriptor = "(Lsj;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +52,9 @@ public void addFirst(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lsb;)V" + descriptor = "(Lsj;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +68,20 @@ public void addLast(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("last") public Node last() { - return this.method1968((Node)null); + return this.method2005((Node)null); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lsb;)Lsb;" + descriptor = "(Lsj;)Lsj;" ) - Node method1968(Node var1) { + Node method2005(Node var1) { Node var2; if (var1 == null) { var2 = this.sentinel.previous; @@ -89,32 +90,32 @@ Node method1968(Node var1) { } if (var2 == this.sentinel) { - this.field3627 = null; + this.field3636 = null; return null; } else { - this.field3627 = var2.previous; + this.field3636 = var2.previous; return var2; } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("previous") public Node previous() { - Node var1 = this.field3627; + Node var1 = this.field3636; if (var1 == this.sentinel) { - this.field3627 = null; + this.field3636 = null; return null; } else { - this.field3627 = var1.previous; + this.field3636 = var1.previous; return var1; } } - @ObfuscatedName("az") - int method1970() { + @ObfuscatedName("ap") + int method2007() { int var1 = 0; for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { @@ -124,17 +125,17 @@ int method1970() { return var1; } - @ObfuscatedName("av") - public boolean method1971() { + @ObfuscatedName("aa") + public boolean method2008() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "()[Lsb;" + descriptor = "()[Lsj;" ) - Node[] method1972() { - Node[] var1 = new Node[this.method1970()]; + Node[] method2009() { + Node[] var1 = new Node[this.method2007()]; int var2 = 0; for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { @@ -144,11 +145,11 @@ Node[] method1972() { return var1; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lsb;)Z" + descriptor = "(Lsj;)Z" ) - boolean method1973(Node var1) { + boolean method2010(Node var1) { this.addFirst(var1); return true; } @@ -162,13 +163,13 @@ public Iterator iterator() { @Export("size") @ObfuscatedName("size") public int size() { - return this.method1970(); + return this.method2007(); } @Export("isEmpty") @ObfuscatedName("isEmpty") public boolean isEmpty() { - return this.method1971(); + return this.method2008(); } public boolean contains(Object var1) { @@ -178,7 +179,7 @@ public boolean contains(Object var1) { @Export("toArray") @ObfuscatedName("toArray") public Object[] toArray() { - return this.method1972(); + return this.method2009(); } @Export("toArray") @@ -222,7 +223,7 @@ public void clear() { @Export("add") @ObfuscatedName("add") public boolean add(Object var1) { - return this.method1973((Node)var1); + return this.method2010((Node)var1); } @Export("equals") @@ -237,9 +238,9 @@ public int hashCode() { return super.hashCode(); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lsb;Lsb;)V" + descriptor = "(Lsj;Lsj;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { @@ -252,4 +253,4 @@ public static void IterableNodeDeque_addBefore(Node var0, Node var1) { var0.next.previous = var0; var0.previous.next = var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IterableNodeDequeDescendingIterator.java b/osrs/src/main/java/IterableNodeDequeDescendingIterator.java index 34d37f6fd..550cb087b 100644 --- a/osrs/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/osrs/src/main/java/IterableNodeDequeDescendingIterator.java @@ -1,41 +1,42 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("on") +import java.util.Iterator; + +@ObfuscatedName("ot") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Loc;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) - Node field3625; - @ObfuscatedName("ar") + Node field3634; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lor;)V" + descriptor = "(Loc;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; this.setDeque(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lor;)V" + descriptor = "(Loc;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,22 +44,22 @@ void setDeque(IterableNodeDeque var1) { this.start(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("start") void start() { - this.field3625 = this.deque != null ? this.deque.sentinel.previous : null; + this.field3634 = this.deque != null ? this.deque.sentinel.previous : null; this.last = null; } @Export("next") @ObfuscatedName("next") public Object next() { - Node var1 = this.field3625; + Node var1 = this.field3634; if (var1 == this.deque.sentinel) { var1 = null; - this.field3625 = null; + this.field3634 = null; } else { - this.field3625 = var1.previous; + this.field3634 = var1.previous; } this.last = var1; @@ -68,11 +69,13 @@ public Object next() { @Export("hasNext") @ObfuscatedName("hasNext") public boolean hasNext() { - return this.deque.sentinel != this.field3625 && this.field3625 != null; + return this.deque.sentinel != this.field3634 && this.field3634 != null; } + @Export("remove") + @ObfuscatedName("remove") public void remove() { this.last.remove(); this.last = null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IterableNodeHashTable.java b/osrs/src/main/java/IterableNodeHashTable.java index d76c0fbc7..66ab609d5 100644 --- a/osrs/src/main/java/IterableNodeHashTable.java +++ b/osrs/src/main/java/IterableNodeHashTable.java @@ -1,34 +1,35 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sa") +import java.util.Iterator; + +@ObfuscatedName("sf") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("size") int size; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[Lsb;" + descriptor = "[Lsj;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("current") Node current; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("index") int index; @@ -45,9 +46,9 @@ public IterableNodeHashTable(int var1) { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(J)Lsb;" + descriptor = "(J)Lsj;" ) @Export("get") public Node get(long var1) { @@ -65,9 +66,9 @@ public Node get(long var1) { return null; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lsb;J)V" + descriptor = "(Lsj;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -83,7 +84,7 @@ public void put(Node var1, long var2) { var1.key = var2; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { @@ -103,9 +104,9 @@ public void clear() { this.current = null; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("first") public Node first() { @@ -113,9 +114,9 @@ public Node first() { return this.next(); } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("next") public Node next() { @@ -143,4 +144,4 @@ public Node next() { public Iterator iterator() { return new IterableNodeHashTableIterator(this); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/IterableNodeHashTableIterator.java b/osrs/src/main/java/IterableNodeHashTableIterator.java index bf6745263..3dfc64603 100644 --- a/osrs/src/main/java/IterableNodeHashTableIterator.java +++ b/osrs/src/main/java/IterableNodeHashTableIterator.java @@ -1,36 +1,37 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sw") +import java.util.Iterator; + +@ObfuscatedName("sa") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsa;" + descriptor = "Lsf;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("head") Node head; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("index") int index; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lsa;)V" + descriptor = "(Lsf;)V" ) public IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; @@ -38,7 +39,7 @@ public IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.start(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; @@ -46,11 +47,11 @@ void start() { this.last = null; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) - public Node method2423() { + public Node method2449() { this.start(); return (Node)this.next(); } @@ -104,4 +105,4 @@ public void remove() { this.last.remove(); this.last = null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/JagNetThread.java b/osrs/src/main/java/JagNetThread.java index 04cfec935..2157a63ce 100644 --- a/osrs/src/main/java/JagNetThread.java +++ b/osrs/src/main/java/JagNetThread.java @@ -1,166 +1,169 @@ -import java.io.IOException; -import java.util.zip.CRC32; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nq") +import java.io.IOException; +import java.util.zip.CRC32; + +@ObfuscatedName("nf") +@Implements("JagNetThread") public class JagNetThread { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lqh;" + descriptor = "Lqi;" ) - AbstractSocket field3552; - @ObfuscatedName("ay") - int field3546; - @ObfuscatedName("ar") - long field3548; - @ObfuscatedName("am") + AbstractSocket field3561; + @ObfuscatedName("ae") + int field3549; + @ObfuscatedName("ao") + long field3557; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsm;" + descriptor = "Lso;" ) - NodeHashTable field3554; - @ObfuscatedName("as") - int field3544; - @ObfuscatedName("aj") + NodeHashTable field3565; + @ObfuscatedName("ac") + int field3548; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lsm;" + descriptor = "Lso;" ) - NodeHashTable field3553; - @ObfuscatedName("ag") - int field3540; + NodeHashTable field3564; @ObfuscatedName("az") + int field3555; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lob;" + descriptor = "Los;" ) - DualNodeDeque field3551; - @ObfuscatedName("av") + DualNodeDeque field3560; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lsm;" + descriptor = "Lso;" ) - NodeHashTable field3556; - @ObfuscatedName("ap") - int field3543; - @ObfuscatedName("aq") + NodeHashTable field3562; + @ObfuscatedName("af") + int field3550; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lsm;" + descriptor = "Lso;" ) - NodeHashTable field3555; - @ObfuscatedName("at") - int field3545; - @ObfuscatedName("ah") - boolean field3537; - @ObfuscatedName("ax") + NodeHashTable field3563; + @ObfuscatedName("aq") + int field3553; + @ObfuscatedName("al") + boolean field3546; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lnj;" ) - class358 field3549; - @ObfuscatedName("aa") + class357 field3558; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lty;" + descriptor = "Ltm;" ) - Buffer field3557; - @ObfuscatedName("au") + Buffer field3568; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lty;" + descriptor = "Ltm;" ) - Buffer field3559; - @ObfuscatedName("ae") - int field3539; - @ObfuscatedName("ad") - CRC32 field3547; - @ObfuscatedName("ao") + Buffer field3566; + @ObfuscatedName("ag") + int field3551; + @ObfuscatedName("ax") + CRC32 field3556; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lty;" + descriptor = "Ltm;" ) - Buffer field3558; - @ObfuscatedName("ac") + Buffer field3567; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "[Lny;" + descriptor = "[Lnk;" ) - Archive[] field3550; + Archive[] field3559; + @ObfuscatedName("ay") + int field3554; + @ObfuscatedName("aj") + int field3552; + @ObfuscatedName("av") + byte field3547; + @ObfuscatedName("aw") + public int field3570; @ObfuscatedName("ak") - int field3541; - @ObfuscatedName("an") - int field3542; - @ObfuscatedName("af") - byte field3538; - @ObfuscatedName("ai") - public int field3560; - @ObfuscatedName("al") - public int field3561; + public int field3569; public JagNetThread() { - this.field3546 = 0; - this.field3554 = new NodeHashTable(4096); - this.field3544 = 0; - this.field3553 = new NodeHashTable(32); - this.field3540 = 0; - this.field3551 = new DualNodeDeque(); - this.field3556 = new NodeHashTable(4096); - this.field3543 = 0; - this.field3555 = new NodeHashTable(4096); - this.field3545 = 0; - this.field3557 = new Buffer(8); - this.field3539 = 0; - this.field3547 = new CRC32(); - this.field3550 = new Archive[256]; - this.field3541 = -1; - this.field3542 = 255; - this.field3538 = 0; - this.field3560 = 0; - this.field3561 = 0; + this.field3549 = 0; + this.field3565 = new NodeHashTable(4096); + this.field3548 = 0; + this.field3564 = new NodeHashTable(32); + this.field3555 = 0; + this.field3560 = new DualNodeDeque(); + this.field3562 = new NodeHashTable(4096); + this.field3550 = 0; + this.field3563 = new NodeHashTable(4096); + this.field3553 = 0; + this.field3568 = new Buffer(8); + this.field3551 = 0; + this.field3556 = new CRC32(); + this.field3559 = new Archive[256]; + this.field3554 = -1; + this.field3552 = 255; + this.field3547 = 0; + this.field3570 = 0; + this.field3569 = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-1782" + descriptor = "(I)Z", + garbageValue = "935597926" ) - public boolean method1895() { - long var1 = class113.clockNow(); - int var3 = (int)(var1 - this.field3548); - this.field3548 = var1; + public boolean method1930() { + long var1 = GameEngine.clockNow(); + int var3 = (int)(var1 - this.field3557); + this.field3557 = var1; if (var3 > 200) { var3 = 200; } - this.field3546 += var3; - if (this.field3545 == 0 && this.field3540 == 0 && this.field3543 == 0 && this.field3544 == 0) { + this.field3549 += var3; + if (this.field3553 == 0 && this.field3555 == 0 && this.field3550 == 0 && this.field3548 == 0) { return true; - } else if (this.field3552 == null) { + } else if (this.field3561 == null) { return false; } else { try { - if (this.field3546 > 30000) { + if (this.field3549 > 30000) { throw new IOException(); } else { - class358 var4; + class357 var4; Buffer var5; - while (this.field3540 < 200 && this.field3544 > 0) { - var4 = (class358)this.field3554.first(); + while (this.field3555 < 200 && this.field3548 > 0) { + var4 = (class357)this.field3565.first(); var5 = new Buffer(4); var5.writeByte(1); var5.writeMedium((int)var4.key); - this.field3552.write(var5.array, 0, 4); - this.field3553.put(var4, var4.key); - --this.field3544; - ++this.field3540; + this.field3561.write(var5.array, 0, 4); + this.field3564.put(var4, var4.key); + --this.field3548; + ++this.field3555; } - while (this.field3545 < 200 && this.field3543 > 0) { - var4 = (class358)this.field3551.removeLast(); + while (this.field3553 < 200 && this.field3550 > 0) { + var4 = (class357)this.field3560.removeLast(); var5 = new Buffer(4); var5.writeByte(0); var5.writeMedium((int)var4.key); - this.field3552.write(var5.array, 0, 4); + this.field3561.write(var5.array, 0, 4); var4.removeDual(); - this.field3555.put(var4, var4.key); - --this.field3543; - ++this.field3545; + this.field3563.put(var4, var4.key); + --this.field3550; + ++this.field3553; } for (int var16 = 0; var16 < 100; ++var16) { - int var17 = this.field3552.available(); + int var17 = this.field3561.available(); if (var17 < 0) { throw new IOException(); } @@ -169,11 +172,11 @@ public boolean method1895() { break; } - this.field3546 = 0; + this.field3549 = 0; byte var6 = 0; - if (this.field3549 == null) { + if (this.field3558 == null) { var6 = 8; - } else if (this.field3539 == 0) { + } else if (this.field3551 == 0) { var6 = 1; } @@ -184,38 +187,38 @@ public boolean method1895() { int var10001; Buffer var22; if (var6 > 0) { - var7 = var6 - this.field3557.offset; + var7 = var6 - this.field3568.offset; if (var7 > var17) { var7 = var17; } - this.field3552.read(this.field3557.array, this.field3557.offset, var7); - if (this.field3538 != 0) { + this.field3561.read(this.field3568.array, this.field3568.offset, var7); + if (this.field3547 != 0) { for (var8 = 0; var8 < var7; ++var8) { - var10000 = this.field3557.array; - var10001 = this.field3557.offset + var8; - var10000[var10001] ^= this.field3538; + var10000 = this.field3568.array; + var10001 = var8 + this.field3568.offset; + var10000[var10001] ^= this.field3547; } } - var22 = this.field3557; + var22 = this.field3568; var22.offset += var7; - if (this.field3557.offset < var6) { + if (this.field3568.offset < var6) { break; } - if (this.field3549 == null) { - this.field3557.offset = 0; - var8 = this.field3557.readUnsignedByte(); - var9 = this.field3557.readUnsignedShort(); - int var10 = this.field3557.readUnsignedByte(); - int var11 = this.field3557.readInt(); + if (this.field3558 == null) { + this.field3568.offset = 0; + var8 = this.field3568.readUnsignedByte(); + var9 = this.field3568.readUnsignedShort(); + int var10 = this.field3568.readUnsignedByte(); + int var11 = this.field3568.readInt(); long var12 = (long)(var9 + (var8 << 16)); - class358 var14 = (class358)this.field3553.get(var12); - this.field3537 = true; + class357 var14 = (class357)this.field3564.get(var12); + this.field3546 = true; if (var14 == null) { - var14 = (class358)this.field3555.get(var12); - this.field3537 = false; + var14 = (class357)this.field3563.get(var12); + this.field3546 = false; } if (var14 == null) { @@ -223,90 +226,90 @@ public boolean method1895() { } int var15 = var10 == 0 ? 5 : 9; - this.field3549 = var14; - this.field3559 = new Buffer(this.field3549.field3516 + var15 + var11); - this.field3559.writeByte(var10); - this.field3559.writeInt(var11); - this.field3539 = 8; - this.field3557.offset = 0; - } else if (this.field3539 == 0) { - if (this.field3557.array[0] == -1) { - this.field3539 = 1; - this.field3557.offset = 0; + this.field3558 = var14; + this.field3566 = new Buffer(this.field3558.field3526 + var11 + var15); + this.field3566.writeByte(var10); + this.field3566.writeInt(var11); + this.field3551 = 8; + this.field3568.offset = 0; + } else if (this.field3551 == 0) { + if (this.field3568.array[0] == -1) { + this.field3551 = 1; + this.field3568.offset = 0; } else { - this.field3549 = null; + this.field3558 = null; } } } else { - var7 = this.field3559.array.length - this.field3549.field3516; - var8 = 512 - this.field3539; - if (var8 > var7 - this.field3559.offset) { - var8 = var7 - this.field3559.offset; + var7 = this.field3566.array.length - this.field3558.field3526; + var8 = 512 - this.field3551; + if (var8 > var7 - this.field3566.offset) { + var8 = var7 - this.field3566.offset; } if (var8 > var17) { var8 = var17; } - this.field3552.read(this.field3559.array, this.field3559.offset, var8); - if (this.field3538 != 0) { + this.field3561.read(this.field3566.array, this.field3566.offset, var8); + if (this.field3547 != 0) { for (var9 = 0; var9 < var8; ++var9) { - var10000 = this.field3559.array; - var10001 = var9 + this.field3559.offset; - var10000[var10001] ^= this.field3538; + var10000 = this.field3566.array; + var10001 = var9 + this.field3566.offset; + var10000[var10001] ^= this.field3547; } } - var22 = this.field3559; + var22 = this.field3566; var22.offset += var8; - this.field3539 += var8; - if (this.field3559.offset == var7) { - if (this.field3549.key == 16711935L) { - this.field3558 = this.field3559; + this.field3551 += var8; + if (this.field3566.offset == var7) { + if (16711935L == this.field3558.key) { + this.field3567 = this.field3566; for (var9 = 0; var9 < 256; ++var9) { - Archive var18 = this.field3550[var9]; + Archive var18 = this.field3559[var9]; if (var18 != null) { - this.method1899(var18, var9); + this.method1935(var18, var9); } } } else { - this.field3547.reset(); - this.field3547.update(this.field3559.array, 0, var7); - var9 = (int)this.field3547.getValue(); - if (this.field3549.field3517 != var9) { + this.field3556.reset(); + this.field3556.update(this.field3566.array, 0, var7); + var9 = (int)this.field3556.getValue(); + if (this.field3558.field3527 != var9) { try { - this.field3552.close(); + this.field3561.close(); } catch (Exception var20) { } - ++this.field3560; - this.field3552 = null; - this.field3538 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + ++this.field3570; + this.field3561 = null; + this.field3547 = (byte)((int)(Math.random() * 255.0D + 1.0D)); return false; } - this.field3560 = 0; - this.field3561 = 0; - this.field3549.field3518.write((int)(this.field3549.key & 65535L), this.field3559.array, (this.field3549.key & 16711680L) == 16711680L, this.field3537); + this.field3570 = 0; + this.field3569 = 0; + this.field3558.field3528.write((int)(this.field3558.key & 65535L), this.field3566.array, 16711680L == (this.field3558.key & 16711680L), this.field3546); } - this.field3549.remove(); - if (this.field3537) { - --this.field3540; + this.field3558.remove(); + if (this.field3546) { + --this.field3555; } else { - --this.field3545; + --this.field3553; } - this.field3539 = 0; - this.field3549 = null; - this.field3559 = null; + this.field3551 = 0; + this.field3558 = null; + this.field3566 = null; } else { - if (this.field3539 != 512) { + if (this.field3551 != 512) { break; } - this.field3539 = 0; + this.field3551 = 0; } } } @@ -315,197 +318,197 @@ public boolean method1895() { } } catch (IOException var21) { try { - this.field3552.close(); + this.field3561.close(); } catch (Exception var19) { } - ++this.field3561; - this.field3552 = null; + ++this.field3569; + this.field3561 = null; return false; } } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-89" + descriptor = "(ZI)V", + garbageValue = "-2147075944" ) - public void method1896(boolean var1) { - if (this.field3552 != null) { + public void method1932(boolean var1) { + if (this.field3561 != null) { try { Buffer var2 = new Buffer(4); var2.writeByte(var1 ? 2 : 3); var2.writeMedium(0); - this.field3552.write(var2.array, 0, 4); + this.field3561.write(var2.array, 0, 4); } catch (IOException var5) { try { - this.field3552.close(); + this.field3561.close(); } catch (Exception var4) { } - ++this.field3561; - this.field3552 = null; + ++this.field3569; + this.field3561 = null; } } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lqh;ZB)V", - garbageValue = "64" + descriptor = "(Lqi;ZI)V", + garbageValue = "-1755212969" ) - public void method1897(AbstractSocket var1, boolean var2) { - if (this.field3552 != null) { + public void method1933(AbstractSocket var1, boolean var2) { + if (this.field3561 != null) { try { - this.field3552.close(); + this.field3561.close(); } catch (Exception var7) { } - this.field3552 = null; + this.field3561 = null; } - this.field3552 = var1; - this.method1896(var2); - this.field3557.offset = 0; - this.field3549 = null; - this.field3559 = null; - this.field3539 = 0; + this.field3561 = var1; + this.method1932(var2); + this.field3568.offset = 0; + this.field3558 = null; + this.field3566 = null; + this.field3551 = 0; while (true) { - class358 var3 = (class358)this.field3553.first(); + class357 var3 = (class357)this.field3564.first(); if (var3 == null) { while (true) { - var3 = (class358)this.field3555.first(); + var3 = (class357)this.field3563.first(); if (var3 == null) { - if (this.field3538 != 0) { + if (this.field3547 != 0) { try { Buffer var8 = new Buffer(4); var8.writeByte(4); - var8.writeByte(this.field3538); + var8.writeByte(this.field3547); var8.writeShort(0); - this.field3552.write(var8.array, 0, 4); + this.field3561.write(var8.array, 0, 4); } catch (IOException var6) { try { - this.field3552.close(); + this.field3561.close(); } catch (Exception var5) { } - ++this.field3561; - this.field3552 = null; + ++this.field3569; + this.field3561 = null; } } - this.field3546 = 0; - this.field3548 = class113.clockNow(); + this.field3549 = 0; + this.field3557 = GameEngine.clockNow(); return; } - this.field3551.method1948(var3); - this.field3556.put(var3, var3.key); - ++this.field3543; - --this.field3545; + this.field3560.method1985(var3); + this.field3562.put(var3, var3.key); + ++this.field3550; + --this.field3553; } } - this.field3554.put(var3, var3.key); - ++this.field3544; - --this.field3540; + this.field3565.put(var3, var3.key); + ++this.field3548; + --this.field3555; } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lny;II)V", - garbageValue = "-830735706" + descriptor = "(Lnk;II)V", + garbageValue = "1859946409" ) - void method1898(Archive var1, int var2) { - if (var1.field3506) { - if (var2 <= this.field3541) { + void method1934(Archive var1, int var2) { + if (var1.field3515) { + if (var2 <= this.field3554) { throw new RuntimeException(""); } - if (var2 < this.field3542) { - this.field3542 = var2; + if (var2 < this.field3552) { + this.field3552 = var2; } } else { - if (var2 >= this.field3542) { + if (var2 >= this.field3552) { throw new RuntimeException(""); } - if (var2 > this.field3541) { - this.field3541 = var2; + if (var2 > this.field3554) { + this.field3554 = var2; } } - if (this.field3558 != null) { - this.method1899(var1, var2); + if (this.field3567 != null) { + this.method1935(var1, var2); } else { - this.method1900((Archive)null, 255, 255, 0, (byte)0, true); - this.field3550[var2] = var1; + this.method1936((Archive)null, 255, 255, 0, (byte)0, true); + this.field3559[var2] = var1; } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lny;IB)V", - garbageValue = "5" + descriptor = "(Lnk;II)V", + garbageValue = "-1785545796" ) - void method1899(Archive var1, int var2) { - this.field3558.offset = var2 * 8 + 5; - if (this.field3558.offset >= this.field3558.array.length) { - if (var1.field3506) { - var1.method1855(); + void method1935(Archive var1, int var2) { + this.field3567.offset = var2 * 8 + 5; + if (this.field3567.offset >= this.field3567.array.length) { + if (var1.field3515) { + var1.method1891(); } else { throw new RuntimeException(""); } } else { - int var3 = this.field3558.readInt(); - int var4 = this.field3558.readInt(); + int var3 = this.field3567.readInt(); + int var4 = this.field3567.readInt(); var1.loadIndex(var3, var4); } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lny;IIIBZI)V", - garbageValue = "-1002085673" + descriptor = "(Lnk;IIIBZB)V", + garbageValue = "-83" ) - void method1900(Archive var1, int var2, int var3, int var4, byte var5, boolean var6) { + void method1936(Archive var1, int var2, int var3, int var4, byte var5, boolean var6) { long var7 = (long)(var3 + (var2 << 16)); - class358 var9 = (class358)this.field3554.get(var7); + class357 var9 = (class357)this.field3565.get(var7); if (var9 == null) { - var9 = (class358)this.field3553.get(var7); + var9 = (class357)this.field3564.get(var7); if (var9 == null) { - var9 = (class358)this.field3556.get(var7); + var9 = (class357)this.field3562.get(var7); if (var9 != null) { if (var6) { var9.removeDual(); - this.field3554.put(var9, var7); - --this.field3543; - ++this.field3544; + this.field3565.put(var9, var7); + --this.field3550; + ++this.field3548; } } else { if (!var6) { - var9 = (class358)this.field3555.get(var7); + var9 = (class357)this.field3563.get(var7); if (var9 != null) { return; } } - var9 = new class358(); - var9.field3518 = var1; - var9.field3517 = var4; - var9.field3516 = var5; + var9 = new class357(); + var9.field3528 = var1; + var9.field3527 = var4; + var9.field3526 = var5; if (var6) { - this.field3554.put(var9, var7); - ++this.field3544; + this.field3565.put(var9, var7); + ++this.field3548; } else { - this.field3551.method1947(var9); - this.field3556.put(var9, var7); - ++this.field3543; + this.field3560.method1984(var9); + this.field3562.put(var9, var7); + ++this.field3550; } } @@ -513,49 +516,77 @@ void method1900(Archive var1, int var2, int var3, int var4, byte var5, boolean v } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2091914027" + garbageValue = "1960227475" ) - void method1901(int var1, int var2) { + void method1937(int var1, int var2) { long var3 = (long)((var1 << 16) + var2); - class358 var5 = (class358)this.field3556.get(var3); + class357 var5 = (class357)this.field3562.get(var3); if (var5 != null) { - this.field3551.method1948(var5); + this.field3560.method1985(var5); } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "106" + descriptor = "(III)I", + garbageValue = "-1437295059" ) - int method1902(int var1, int var2) { + int method1938(int var1, int var2) { long var3 = (long)((var1 << 16) + var2); - return this.field3549 != null && this.field3549.key == var3 ? this.field3559.offset * 99 / (this.field3559.array.length - this.field3549.field3516) + 1 : 0; + return this.field3558 != null && var3 == this.field3558.key ? this.field3566.offset * 99 / (this.field3566.array.length - this.field3558.field3526) + 1 : 0; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(ZZI)I", - garbageValue = "-988136504" + descriptor = "(ZZS)I", + garbageValue = "-10235" ) - public int method1903(boolean var1, boolean var2) { + public int method1939(boolean var1, boolean var2) { byte var3 = 0; - int var4 = var3 + this.field3544 + this.field3540; + int var4 = var3 + this.field3555 + this.field3548; return var4; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-102" + descriptor = "(I)V", + garbageValue = "-1866561588" ) - public void method1904() { - if (this.field3552 != null) { - this.field3552.close(); + public void method1940() { + if (this.field3561 != null) { + this.field3561.close(); } } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)[Ldc;", + garbageValue = "569243283" + ) + static AttackOption[] method1941() { + return new AttackOption[]{AttackOption.field1099, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1097}; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(CI)C", + garbageValue = "-162809884" + ) + static char method1931(char var0) { + if (var0 == 198) { + return 'E'; + } else if (var0 == 230) { + return 'e'; + } else if (var0 == 223) { + return 's'; + } else if (var0 == 338) { + return 'E'; + } else { + return (char)(var0 == 339 ? 'e' : '\u0000'); + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/JagexCache.java b/osrs/src/main/java/JagexCache.java index 717573ff6..0180ee5ce 100644 --- a/osrs/src/main/java/JagexCache.java +++ b/osrs/src/main/java/JagexCache.java @@ -1,38 +1,43 @@ -import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +import java.io.File; + +@ObfuscatedName("gp") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("wt") - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("as") + @ObfuscatedName("at") + static File field1463; + @ObfuscatedName("ac") @Export("cacheDir") static File cacheDir; - @ObfuscatedName("aj") - public static int field1450; - @ObfuscatedName("at") + @ObfuscatedName("ai") + static int field1461; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lts;" + descriptor = "Ltd;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lts;" + descriptor = "Ltd;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lts;" + descriptor = "Ltd;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; + @ObfuscatedName("ab") + @Export("cacheGamebuild") + static int cacheGamebuild; + @ObfuscatedName("am") + static String[] field1464; static { JagexCache_randomDat = null; @@ -40,37 +45,12 @@ public class JagexCache { JagexCache_idx255File = null; } - @ObfuscatedName("la") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", - garbageValue = "-50" - ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - class7.insertMenuItem(var0, var1, var2, var3, var4, var5, -1, false); - } - - @ObfuscatedName("mb") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "206796942" + descriptor = "(II)I", + garbageValue = "-812306716" ) - static final int method901() { - float var0 = 200.0F * ((float)class150.clientPreferences.getBrightness() - 0.5F); - return 100 - Math.round(var0); - } - - @ObfuscatedName("os") - @ObfuscatedSignature( - descriptor = "(IB)Ltx;", - garbageValue = "52" - ) - static class507 method902(int var0) { - class507 var1 = (class507)Client.Widget_cachedFonts.get((long)var0); - if (var1 == null) { - var1 = new class507(class176.field1459, var0); - } - - return var1; + static int method909(int var0) { + return class28.KeyHandler_keyCodes[var0]; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/KeyHandler.java b/osrs/src/main/java/KeyHandler.java index f65d623d5..9d3a7b3d5 100644 --- a/osrs/src/main/java/KeyHandler.java +++ b/osrs/src/main/java/KeyHandler.java @@ -1,4 +1,10 @@ -import java.awt.Component; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.applet.Applet; +import java.awt.*; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyEvent; @@ -6,141 +12,135 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("ak") @Implements("KeyHandler") public class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("cb") + @ObfuscatedName("uw") + static int field70; + @ObfuscatedName("gp") + static int field69; + @ObfuscatedName("rb") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lej;" ) - static StudioGame field72; - @ObfuscatedName("ay") - Collection field76; - @ObfuscatedName("ar") - Collection field75; - @ObfuscatedName("am") + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("ae") + Collection field73; + @ObfuscatedName("ao") + Collection field74; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "[Lba;" + descriptor = "[Lbv;" ) - class29[] field73; - @ObfuscatedName("as") + class29[] field72; + @ObfuscatedName("ac") @Export("KeyHandler_pressedKeys") boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("KeyHandler_idleCycles") volatile int KeyHandler_idleCycles; KeyHandler() { - this.field73 = new class29[3]; + this.field72 = new class29[3]; this.KeyHandler_pressedKeys = new boolean[112]; this.KeyHandler_idleCycles = 0; - this.field76 = new ArrayList(100); - this.field75 = new ArrayList(100); + this.field73 = new ArrayList(100); + this.field74 = new ArrayList(100); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lba;II)V", - garbageValue = "801097328" + descriptor = "(Lbv;II)V", + garbageValue = "226491014" ) - void method92(class29 var1, int var2) { - this.field73[var2] = var1; + void method86(class29 var1, int var2) { + this.field72[var2] = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661246345" + garbageValue = "2034769800" ) @Export("getIdleCycles") - int getIdleCycles() { + public int getIdleCycles() { return this.KeyHandler_idleCycles; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1935152839" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "77" ) - void method94(Component var1) { + void method89(Component var1) { var1.setFocusTraversalKeysEnabled(false); var1.addKeyListener(this); var1.addFocusListener(this); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "26" + garbageValue = "70" ) - synchronized void method95(Component var1) { + synchronized void method90(Component var1) { var1.removeKeyListener(this); var1.removeFocusListener(this); synchronized(this) { - this.field76.add(new class33(4, 0)); + this.field73.add(new class33(4, 0)); } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1132854168" + garbageValue = "2096534148" ) - void method96() { + void method92() { ++this.KeyHandler_idleCycles; - this.method97(); - Iterator var1 = this.field75.iterator(); + this.method94(); + Iterator var1 = this.field74.iterator(); while (var1.hasNext()) { class33 var2 = (class33)var1.next(); - for (int var3 = 0; var3 < this.field73.length && !var2.method134(this.field73[var3]); ++var3) { + for (int var3 = 0; var3 < this.field72.length && !var2.method130(this.field72[var3]); ++var3) { } } - this.field75.clear(); + this.field74.clear(); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "325496091" + garbageValue = "-1568153203" ) - synchronized void method97() { - Collection var1 = this.field75; - this.field75 = this.field76; - this.field76 = var1; + synchronized void method94() { + Collection var1 = this.field74; + this.field74 = this.field73; + this.field73 = var1; } @Export("keyPressed") @ObfuscatedName("keyPressed") public final synchronized void keyPressed(KeyEvent var1) { - int var2; - label23: { - var2 = var1.getKeyCode(); - if (var2 >= 0) { - int var4 = class28.KeyHandler_keyCodes.length; - if (var2 < var4) { - var2 = class343.method1829(var2); - boolean var5 = (var2 & 128) != 0; - if (var5) { - var2 = -1; - } - break label23; - } + int var2 = var1.getKeyCode(); + if (var2 >= 0 && var2 < class1.method2()) { + var2 = JagexCache.method909(var2); + boolean var3 = (var2 & 128) != 0; + if (var3) { + var2 = -1; } - + } else { var2 = -1; } if (var2 >= 0) { this.KeyHandler_pressedKeys[var2] = true; - this.field76.add(new class33(1, var2)); + this.field73.add(new class33(1, var2)); this.KeyHandler_idleCycles = 0; } @@ -156,7 +156,7 @@ public final synchronized void keyReleased(KeyEvent var1) { if (var2 >= 0) { int var4 = class28.KeyHandler_keyCodes.length; if (var2 < var4) { - var2 = class343.method1829(var2) & -129; + var2 = JagexCache.method909(var2) & -129; break label16; } } @@ -166,7 +166,7 @@ public final synchronized void keyReleased(KeyEvent var1) { if (var2 >= 0) { this.KeyHandler_pressedKeys[var2] = false; - this.field76.add(new class33(2, var2)); + this.field73.add(new class33(2, var2)); } var1.consume(); @@ -178,28 +178,28 @@ public final synchronized void keyTyped(KeyEvent var1) { char var2 = var1.getKeyChar(); if (var2 != 0 && var2 != '\uffff') { boolean var3; - if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { - var3 = true; - } else { - label53: { + if ((var2 <= 0 || var2 >= 128) && (var2 < 160 || var2 > 255)) { + label47: { if (var2 != 0) { - char[] var4 = class385.cp1252AsciiExtension; + char[] var4 = class384.cp1252AsciiExtension; for (int var5 = 0; var5 < var4.length; ++var5) { char var6 = var4[var5]; if (var6 == var2) { var3 = true; - break label53; + break label47; } } } var3 = false; } + } else { + var3 = true; } if (var3) { - this.field76.add(new class33(3, var2)); + this.field73.add(new class33(3, var2)); } } @@ -207,7 +207,7 @@ public final synchronized void keyTyped(KeyEvent var1) { } public final synchronized void focusGained(FocusEvent var1) { - this.field76.add(new class33(4, 1)); + this.field73.add(new class33(4, 1)); } @Export("focusLost") @@ -216,354 +216,153 @@ public final synchronized void focusLost(FocusEvent var1) { for (int var2 = 0; var2 < 112; ++var2) { if (this.KeyHandler_pressedKeys[var2]) { this.KeyHandler_pressedKeys[var2] = false; - this.field76.add(new class33(2, var2)); + this.field73.add(new class33(2, var2)); } } - this.field76.add(new class33(4, 0)); + this.field73.add(new class33(4, 0)); } - @ObfuscatedName("aj") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ltc;I)V", - garbageValue = "483892465" + descriptor = "([Lob;II)Lob;", + garbageValue = "-1278288180" ) - static final void method98(PacketBuffer var0) { - for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { - int var2 = Players.Players_pendingUpdateIndices[var1]; - Player var3 = Client.players[var2]; - int var4 = var0.readUnsignedByte(); - - // Excess Flag 8 Bytes - if ((var4 & 4) != 0) { - var4 += var0.readUnsignedByte() << 8; - } - // Excess Flag 16 Bytes - if ((var4 & 16384) != 0) { - var4 += var0.readUnsignedByte() << 16; - } - - byte var5 = MoveSpeed.STATIONARY.speed; - // Move Speed - if ((var4 & 512) != 0) { - MoveSpeed[] var6 = Players.playerMovementSpeeds; - MoveSpeed[] var8 = new MoveSpeed[]{MoveSpeed.STATIONARY, MoveSpeed.WALK, MoveSpeed.CRAWL, MoveSpeed.RUN}; - var6[var2] = (MoveSpeed)ClientPreferences.findEnumerated(var8, var0.readByteAdd()); - } - - int var17; - // Face Pawn - if ((var4 & 32) != 0) { - var3.targetIndex = var0.readUnsignedShortAddLE(); - var3.targetIndex += var0.readUnsignedByte() << 16; - var17 = 16777215; - if (var17 == var3.targetIndex) { - var3.targetIndex = -1; - } - } - - int var7; - // Animation - if ((var4 & 2) != 0) { - var17 = var0.readUnsignedShortLE(); - if (var17 == 65535) { - var17 = -1; - } - - var7 = var0.readUnsignedByteAdd(); - WorldMapSectionType.performPlayerAnimation(var3, var17, var7); - } - - int var9; - int var10; - int var13; - // Public Chat legacy - if ((var4 & 16) != 0) { - var17 = var0.readUnsignedShort(); - PlayerType var18 = (PlayerType)ClientPreferences.findEnumerated(PendingSpawn.PlayerType_values(), var0.readUnsignedByteNeg()); - boolean var19 = var0.readUnsignedByte() == 1; - var9 = var0.readUnsignedByteSub(); - var10 = var0.offset; - if (var3.username != null && var3.appearance != null) { - boolean var11 = false; - if (var18.isUser && class177.friendSystem.isIgnored(var3.username)) { - var11 = true; - } - - if (!var11 && Client.field485 == 0 && !var3.isHidden) { - Players.field1111.offset = 0; - var0.readBytesReversedAdd(Players.field1111.array, 0, var9); - Players.field1111.offset = 0; - String var12 = AbstractFont.escapeBrackets(class153.method797(class292.readString(Players.field1111))); - var3.overheadText = var12.trim(); - var3.field986 = var17 >> 8; - var3.field994 = var17 & 255; - var3.overheadTextCyclesRemaining = 150; - var3.field1023 = null; - var3.isAutoChatting = var19; - var3.showPublicPlayerChat = var3 != class136.localPlayer && var18.isUser && !Client.field598.isEmpty() && var12.toLowerCase().indexOf(Client.field598) == -1; - if (var18.isPrivileged) { - var13 = var19 ? 91 : 1; - } else { - var13 = var19 ? 90 : 2; - } - - if (var18.modIcon != -1) { - class415.addGameMessage(var13, SecureRandomCallable.addImageTag(var18.modIcon) + var3.username.getName(), var12); - } else { - class415.addGameMessage(var13, var3.username.getName(), var12); - } - } - } - - var0.offset = var10 + var9; - } - // Context Menu - if ((var4 & 8192) != 0) { - for (var17 = 0; var17 < 3; ++var17) { - var3.actions[var17] = var0.readStringCp1252NullTerminated(); - } - } - // Force Movement - if ((var4 & 4096) != 0) { - var3.field1013 = var0.readSignedByteSub(); - var3.field1007 = var0.readByteAdd(); - var3.field1011 = var0.readByteAdd(); - var3.field1010 = var0.readSignedByteSub(); - var3.spotAnimation = var0.readUnsignedShortAdd() + Client.cycle; - var3.exactMoveArrive1Cycle = var0.readUnsignedShortAddLE() + Client.cycle; - var3.exactMoveDirection = var0.readUnsignedShortAddLE(); - if (var3.hasMovementPending) { - var3.field1013 += var3.tileX; - var3.field1007 += var3.tileY; - var3.field1011 += var3.tileX; - var3.field1010 += var3.tileY; - var3.pathLength = 0; - } else { - var3.field1013 += var3.pathX[0]; - var3.field1007 += var3.pathY[0]; - var3.field1011 += var3.pathX[0]; - var3.field1010 += var3.pathY[0]; - var3.pathLength = 1; - } - - var3.field1018 = 0; - } - // Force Chat - if ((var4 & 64) != 0) { - var3.overheadText = var0.readStringCp1252NullTerminated(); - if (var3.overheadText.charAt(0) == '~') { - var3.overheadText = var3.overheadText.substring(1); - class415.addGameMessage(2, var3.username.getName(), var3.overheadText); - } else if (var3 == class136.localPlayer) { - class415.addGameMessage(2, var3.username.getName(), var3.overheadText); - } - - var3.isAutoChatting = false; - var3.field986 = 0; - var3.field994 = 0; - var3.overheadTextCyclesRemaining = 150; - } - // Movement (one-tick state) temp move - if ((var4 & 32768) != 0) { - var5 = var0.readSignedByteSub(); - } - - int var21; - int var25; - int var29; - // Public Chat - if ((var4 & 2048) != 0) { - var17 = var0.readUnsignedShortAddLE(); - var7 = var17 >> 8; - var29 = var7 >= 13 && var7 <= 20 ? var7 - 12 : 0; // @TODO - PlayerType var20 = (PlayerType)ClientPreferences.findEnumerated(PendingSpawn.PlayerType_values(), var0.readUnsignedByteAdd()); - boolean var24 = var0.readUnsignedByteAdd() == 1; - var25 = var0.readUnsignedByteAdd(); - var21 = var0.offset; - if (var3.username != null && var3.appearance != null) { - boolean var26 = false; - if (var20.isUser && class177.friendSystem.isIgnored(var3.username)) { - var26 = true; - } - if (!var26 && Client.field485 == 0 && !var3.isHidden) { - Players.field1111.offset = 0; - var0.readBytesReversed(Players.field1111.array, 0, var25); - Players.field1111.offset = 0; - String var14 = AbstractFont.escapeBrackets(class153.method797(class292.readString(Players.field1111))); - var3.overheadText = var14.trim(); - var3.field986 = var17 >> 8; - var3.field994 = var17 & 255; - var3.overheadTextCyclesRemaining = 150; - byte[] var15 = null; - int var16; - if (var29 > 0 && var29 <= 8) { - var15 = new byte[var29]; - - for (var16 = 0; var16 < var29; ++var16) { - var15[var16] = var0.readByteNeg(); - } - } - - var3.field1023 = Ignored.method2221(var15); - var3.isAutoChatting = var24; - var3.showPublicPlayerChat = var3 != class136.localPlayer && var20.isUser && !Client.field598.isEmpty() && var14.toLowerCase().indexOf(Client.field598) == -1; - if (var20.isPrivileged) { - var16 = var24 ? 91 : 1; - } else { - var16 = var24 ? 90 : 2; - } - - if (var20.modIcon != -1) { - class415.addGameMessage(var16, SecureRandomCallable.addImageTag(var20.modIcon) + var3.username.getName(), var14); - } else { - class415.addGameMessage(var16, var3.username.getName(), var14); - } - } - } - - var0.offset = var29 + var21 + var25; - } - // Gfx - if ((var4 & 65536) != 0) { - var17 = var0.readUnsignedByteAdd(); - - for (var7 = 0; var7 < var17; ++var7) { - var29 = var0.readUnsignedByteSub(); - var9 = var0.readUnsignedShort(); - var10 = var0.readIntIME(); - var3.updateSpotAnimation(var29, var9, var10 >> 16, var10 & 65535); - } - } - // Hitmark - if ((var4 & 8) != 0) { - var17 = var0.readUnsignedByteAdd(); - if (var17 > 0) { - for (var7 = 0; var7 < var17; ++var7) { - var9 = -1; - var10 = -1; - var25 = -1; - var29 = var0.readUShortSmart(); - if (var29 == 32767) { - var29 = var0.readUShortSmart(); - var10 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var25 = var0.readUShortSmart(); - } else if (var29 != 32766) { - var10 = var0.readUShortSmart(); - } else { - var29 = -1; - } - - var21 = var0.readUShortSmart(); - var3.addHitSplat(var29, var10, var9, var25, Client.cycle, var21); - } - } - - var7 = var0.readUnsignedByteNeg(); - if (var7 > 0) { - for (var29 = 0; var29 < var7; ++var29) { - var9 = var0.readUShortSmart(); - var10 = var0.readUShortSmart(); - if (var10 != 32767) { - var25 = var0.readUShortSmart(); - var21 = var0.readUnsignedByte(); - var13 = var10 > 0 ? var0.readUnsignedByteNeg() : var21; - var3.addHealthBar(var9, Client.cycle, var10, var25, var21, var13); - } else { - var3.removeHealthBar(var9); - } - } - } - } - // face tile - if ((var4 & 128) != 0) { - var3.movingOrientation = var0.readUnsignedShortAdd(); - if (var3.pathLength == 0) { - var3.orientation = var3.movingOrientation; - var3.method526(); - } - } - // Apply Tint - if ((var4 & 256) != 0) { - var3.recolourStartCycle = Client.cycle + var0.readUnsignedShort(); - var3.recolourEndCycle = Client.cycle + var0.readUnsignedShortAddLE(); - var3.recolourHue = var0.readSignedByteSub(); - var3.recolourSaturation = var0.readByteNeg(); - var3.recolourLuminance = var0.readByte(); - var3.recolourAmount = (byte)var0.readUnsignedByte(); - } - // Appearance - if ((var4 & 1) != 0) { - var17 = var0.readUnsignedByte(); - byte[] var27 = new byte[var17]; - Buffer var23 = new Buffer(var27); - var0.readBytesReversed(var27, 0, var17); - Players.cachedAppearanceBuffer[var2] = var23; - var3.read(var23); + @Export("findEnumerated") + public static class371 findEnumerated(class371[] var0, int var1) { + class371[] var2 = var0; + + for (int var3 = 0; var3 < var2.length; ++var3) { + class371 var4 = var2[var3]; + if (var1 == var4.rsOrdinal()) { + return var4; } + } - if (var3.hasMovementPending) { - if (var5 == 127) { - var3.resetPath(var3.tileX, var3.tileY); - } else { - MoveSpeed var22; - if (var5 != MoveSpeed.STATIONARY.speed) { - MoveSpeed[] var28 = new MoveSpeed[]{MoveSpeed.STATIONARY, MoveSpeed.WALK, MoveSpeed.CRAWL, MoveSpeed.RUN}; - var22 = (MoveSpeed)ClientPreferences.findEnumerated(var28, var5); - } else { - var22 = Players.playerMovementSpeeds[var2]; - } + return null; + } - var3.move(var3.tileX, var3.tileY, var22); - } - } + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-2016250661" + ) + public static void method85(Applet var0, String var1) { + class31.field85 = var0; + if (var1 != null) { + class31.field86 = var1; } } - @ObfuscatedName("lx") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "1524159145" + descriptor = "(CI)C", + garbageValue = "-1543892590" ) - static final void method99(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; - int var7 = var3 - var1; - int var8 = var6 >= 0 ? var6 : -var6; - int var9 = var7 >= 0 ? var7 : -var7; - int var10 = var8; - if (var8 < var9) { - var10 = var9; + public static char method91(char var0) { + switch(var0) { + case ' ': + case '-': + case '_': + case '\u00a0': + return '_'; + case '#': + case '[': + case ']': + return var0; + case '\u00c0': + case '\u00c1': + case '\u00c2': + case '\u00c3': + case '\u00c4': + case '\u00e0': + case '\u00e1': + case '\u00e2': + case '\u00e3': + case '\u00e4': + return 'a'; + case '\u00c7': + case '\u00e7': + return 'c'; + case '\u00c8': + case '\u00c9': + case '\u00ca': + case '\u00cb': + case '\u00e8': + case '\u00e9': + case '\u00ea': + case '\u00eb': + return 'e'; + case '\u00cd': + case '\u00ce': + case '\u00cf': + case '\u00ed': + case '\u00ee': + case '\u00ef': + return 'i'; + case '\u00d1': + case '\u00f1': + return 'n'; + case '\u00d2': + case '\u00d3': + case '\u00d4': + case '\u00d5': + case '\u00d6': + case '\u00f2': + case '\u00f3': + case '\u00f4': + case '\u00f5': + case '\u00f6': + return 'o'; + case '\u00d9': + case '\u00da': + case '\u00db': + case '\u00dc': + case '\u00f9': + case '\u00fa': + case '\u00fb': + case '\u00fc': + return 'u'; + case '\u00df': + return 'b'; + case '\u00ff': + case '\u0178': + return 'y'; + default: + return Character.toLowerCase(var0); } + } - if (var10 != 0) { - int var11 = (var6 << 16) / var10; - int var12 = (var7 << 16) / var10; - if (var12 <= var11) { - var11 = -var11; - } else { - var12 = -var12; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ltm;[II)[Ljava/lang/Object;", + garbageValue = "-165535984" + ) + static Object[] method88(Buffer var0, int[] var1) { + int var2 = var0.readUShortSmart(); + Object[] var3 = new Object[var1.length * var2]; + + for (int var4 = 0; var4 < var2; ++var4) { + for (int var5 = 0; var5 < var1.length; ++var5) { + int var6 = var1.length * var4 + var5; + class502 var7 = SequenceDefinition.method1074(var1[var5]); + var3[var6] = var7.method2497(var0); } + } + + return var3; + } - int var13 = var5 * var12 >> 17; - int var14 = var5 * var12 + 1 >> 17; - int var15 = var5 * var11 >> 17; - int var16 = var5 * var11 + 1 >> 17; - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; - int var17 = var0 + var13; - int var18 = var0 - var14; - int var19 = var0 + var6 - var14; - int var20 = var0 + var13 + var6; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var7 + var15 + var1; - Rasterizer3D.method1180(var17, var18, var19); - Rasterizer3D.method1182(var21, var22, var23, var17, var18, var19, 0.0F, 0.0F, 0.0F, var4); - Rasterizer3D.method1180(var17, var19, var20); - Rasterizer3D.method1182(var21, var23, var24, var17, var19, var20, 0.0F, 0.0F, 0.0F, var4); + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "24" + ) + static void method93(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/KitDefinition.java b/osrs/src/main/java/KitDefinition.java index 221143242..8f548b24d 100644 --- a/osrs/src/main/java/KitDefinition.java +++ b/osrs/src/main/java/KitDefinition.java @@ -3,46 +3,52 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("hz") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" + ) + @Export("KitDefinition_archive") + public static AbstractArchive KitDefinition_archive; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lnu;" ) @Export("KitDefinition_modelsArchive") - static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("ar") + public static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("ao") @Export("KitDefinition_fileCount") public static int KitDefinition_fileCount; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("KitDefinition_cached") - public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("as") + static EvictingDualNodeHashTable KitDefinition_cached; + @ObfuscatedName("ac") @Export("bodypartID") public int bodypartID; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("models2") int[] models2; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("models") int[] models; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("nonSelectable") public boolean nonSelectable; @@ -56,10 +62,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "1840765694" + descriptor = "(Ltm;B)V", + garbageValue = "-6" ) @Export("decode") void decode(Buffer var1) { @@ -73,10 +79,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-1616518435" + descriptor = "(Ltm;II)V", + garbageValue = "-1997251998" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -119,10 +125,10 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "39" + descriptor = "(I)Z", + garbageValue = "-1590063702" ) @Export("ready") public boolean ready() { @@ -141,10 +147,10 @@ public boolean ready() { } } - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Lie;", - garbageValue = "-344960538" + descriptor = "(B)Lic;", + garbageValue = "-23" ) @Export("getModelData") public ModelData getModelData() { @@ -181,12 +187,12 @@ public ModelData getModelData() { } } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1457771753" + garbageValue = "-2117319302" ) - public boolean method947() { + public boolean method961() { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { @@ -200,8 +206,8 @@ public boolean method947() { @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)Lie;", - garbageValue = "-73" + descriptor = "(I)Lic;", + garbageValue = "-1595711476" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -230,4 +236,120 @@ public ModelData getKitDefinitionModels() { return var5; } -} + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lto;IB)Z", + garbageValue = "-108" + ) + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { + if (var0.readBits(1) != 0) { + updateExternalPlayer(var0, var1); + } + + var3 = var0.readBits(13); + var4 = var0.readBits(13); + boolean var12 = var0.readBits(1) == 1; + if (var12) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { + throw new RuntimeException(); + } else { + Player var6 = Client.players[var1] = new Player(); + var6.index = var1; + if (Players.cachedAppearanceBuffer[var1] != null) { + var6.read(Players.cachedAppearanceBuffer[var1]); + } + + var6.orientation = Players.Players_orientations[var1]; + var6.targetIndex = Players.Players_targetIndices[var1]; + var7 = Players.Players_regions[var1]; + var8 = var7 >> 28; + var9 = var7 >> 14 & 255; + var10 = var7 & 255; + var6.pathTraversed[0] = Players.playerMovementSpeeds[var1]; + var6.plane = (byte)var8; + var6.resetPath((var9 << 13) + var3 - UrlRequester.baseX, (var10 << 13) + var4 - class47.baseY); + var6.hasMovementPending = false; + return true; + } + } else if (var2 == 1) { + var3 = var0.readBits(2); + var4 = Players.Players_regions[var1]; + Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); + return false; + } else { + int var5; + int var11; + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var11 = Players.Players_regions[var1]; + var7 = (var11 >> 28) + var4 & 3; + var8 = var11 >> 14 & 255; + var9 = var11 & 255; + if (var5 == 0) { + --var8; + --var9; + } + + if (var5 == 1) { + --var9; + } + + if (var5 == 2) { + ++var8; + --var9; + } + + if (var5 == 3) { + --var8; + } + + if (var5 == 4) { + ++var8; + } + + if (var5 == 5) { + --var8; + ++var9; + } + + if (var5 == 6) { + ++var9; + } + + if (var5 == 7) { + ++var8; + ++var9; + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + return false; + } else { + var3 = var0.readBits(18); + var4 = var3 >> 16; + var5 = var3 >> 8 & 255; + var11 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var7 + var11 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Language.java b/osrs/src/main/java/Language.java index b1d1def7f..b70ecb3c5 100644 --- a/osrs/src/main/java/Language.java +++ b/osrs/src/main/java/Language.java @@ -1,91 +1,103 @@ -import java.util.Locale; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ot") +import java.util.Locale; + + + +@ObfuscatedName("on") @Implements("Language") -public class Language implements class372 { - @ObfuscatedName("aw") +public class Language implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lon;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lon;" ) - static final Language field3598; - @ObfuscatedName("ar") + static final Language field3606; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lon;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lon;" ) - static final Language field3596; - @ObfuscatedName("as") + static final Language field3607; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lon;" ) - static final Language field3597; - @ObfuscatedName("aj") + static final Language field3605; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lon;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lon;" ) - static final Language field3595; - @ObfuscatedName("aq") + static final Language field3608; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "[Lot;" + descriptor = "[Lon;" ) - public static final Language[] field3593; - @ObfuscatedName("ah") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("az") - final String field3601; - @ObfuscatedName("av") + static final Language[] field3609; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("Widget_spritesArchive") + public static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lsl;" + ) + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("ap") + final String field3612; + @ObfuscatedName("aa") @Export("language") final String language; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field3615, 0, "GB"); - field3598 = new Language("DE", "de", "German", ModeWhere.field3615, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", ModeWhere.field3615, 2, "FR"); - field3596 = new Language("PT", "pt", "Portuguese", ModeWhere.field3615, 3, "BR"); - field3597 = new Language("NL", "nl", "Dutch", ModeWhere.field3608, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3608, 5, "ES"); - field3595 = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3615, 6, "MX"); - Language[] var0 = method1939(); - field3593 = new Language[var0.length]; + Language_EN = new Language("EN", "en", "English", ModeWhere.field3626, 0, "GB"); + field3606 = new Language("DE", "de", "German", ModeWhere.field3626, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3626, 2, "FR"); + field3607 = new Language("PT", "pt", "Portuguese", ModeWhere.field3626, 3, "BR"); + field3605 = new Language("NL", "nl", "Dutch", ModeWhere.field3625, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3625, 5, "ES"); + field3608 = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3626, 6, "MX"); + Language[] var0 = method1972(); + field3609 = new Language[var0.length]; Language[] var1 = var0; for (int var2 = 0; var2 < var1.length; ++var2) { Language var3 = var1[var2]; - field3593[var3.id] = var3; + field3609[var3.id] = var3; } } @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lox;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Loe;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field3601 = var1; + this.field3612 = var1; this.language = var2; this.id = var5; if (var6 != null) { @@ -96,20 +108,20 @@ public class Language implements class372 { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "57" + garbageValue = "82" ) @Export("getLanguage") String getLanguage() { @@ -122,142 +134,87 @@ public String toString() { return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)[Lot;", - garbageValue = "2127004251" - ) - static Language[] method1939() { - return new Language[]{field3595, Language_EN, Language_ES, field3596, Language_FR, field3598, field3597}; - } - - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;I)V", - garbageValue = "1823199498" + descriptor = "(I)[Lon;", + garbageValue = "-905836833" ) - public static void method1938(AbstractArchive var0) { - DbRowType.field4105 = var0; + static Language[] method1972() { + return new Language[]{Language_ES, field3606, Language_FR, field3608, field3605, Language_EN, field3607}; } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lfm;FZB)F", - garbageValue = "53" - ) - static float method1942(class130 var0, float var1, boolean var2) { - float var3 = 0.0F; - if (var0 != null && var0.method717() != 0) { - float var4 = (float)var0.field1232[0].field1193; - float var5 = (float)var0.field1232[var0.method717() - 1].field1193; - float var6 = var5 - var4; - if ((double)var6 == 0.0D) { - return var0.field1232[0].field1192; - } else { - float var7 = 0.0F; - if (var1 > var5) { - var7 = (var1 - var5) / var6; - } else { - var7 = (var1 - var4) / var6; - } - - double var8 = (double)((int)var7); - float var10 = Math.abs((float)((double)var7 - var8)); - float var11 = var10 * var6; - var8 = Math.abs(var8 + 1.0D); - double var12 = var8 / 2.0D; - double var14 = (double)((int)var12); - var10 = (float)(var12 - var14); - float var16; - float var17; - if (var2) { - if (var0.field1231 == class128.field1216) { - if ((double)var10 != 0.0D) { - var11 += var4; - } else { - var11 = var5 - var11; - } - } else if (var0.field1231 != class128.field1215 && var0.field1231 != class128.field1214) { - if (var0.field1231 == class128.field1218) { - var11 = var4 - var1; - var16 = var0.field1232[0].field1190; - var17 = var0.field1232[0].field1189; - var3 = var0.field1232[0].field1192; - if (0.0D != (double)var16) { - var3 -= var11 * var17 / var16; - } - - return var3; - } - } else { - var11 = var5 - var11; - } - } else if (var0.field1230 == class128.field1216) { - if ((double)var10 != 0.0D) { - var11 = var5 - var11; - } else { - var11 += var4; - } - } else if (var0.field1230 != class128.field1215 && var0.field1230 != class128.field1214) { - if (var0.field1230 == class128.field1218) { - var11 = var1 - var5; - var16 = var0.field1232[var0.method717() - 1].field1191; - var17 = var0.field1232[var0.method717() - 1].field1188; - var3 = var0.field1232[var0.method717() - 1].field1192; - if (0.0D != (double)var16) { - var3 += var11 * var17 / var16; - } - - return var3; - } - } else { - var11 += var4; - } - - var3 = ApproximateRouteStrategy.method348(var0, var11); - float var18; - if (var2 && var0.field1231 == class128.field1214) { - var18 = var0.field1232[var0.method717() - 1].field1192 - var0.field1232[0].field1192; - var3 = (float)((double)var3 - (double)var18 * var8); - } else if (!var2 && var0.field1230 == class128.field1214) { - var18 = var0.field1232[var0.method717() - 1].field1192 - var0.field1232[0].field1192; - var3 = (float)((double)var3 + var8 * (double)var18); - } - - return var3; - } - } else { - return var3; - } + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "66381547" + ) + static void method1973() { + Tiles.Tiles_minPlane = 99; + Tiles.Tiles_underlays = new short[4][104][104]; + class227.Tiles_overlays = new short[4][104][104]; + class172.Tiles_shapes = new byte[4][104][104]; + ModelData0.field2282 = new byte[4][104][104]; + BufferedNetSocket.field3820 = new int[4][105][105]; + MoveSpeed.field1924 = new byte[4][105][105]; + class162.field1419 = new int[105][105]; + Fonts.Tiles_hue = new int[104]; + class466.Tiles_saturation = new int[104]; + Tiles.Tiles_lightness = new int[104]; + class128.Tiles_hueMultiplier = new int[104]; + Interpreter.field710 = new int[104]; } - @ObfuscatedName("mq") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-18764" + descriptor = "(II)Lon;", + garbageValue = "-695535703" ) - static void method1943(int var0) { - WorldMapRegion.tempMenuAction = new MenuAction(); - WorldMapRegion.tempMenuAction.param0 = Client.menuArguments1[var0]; - WorldMapRegion.tempMenuAction.param1 = Client.menuArguments2[var0]; - WorldMapRegion.tempMenuAction.opcode = Client.menuOpcodes[var0]; - WorldMapRegion.tempMenuAction.identifier = Client.menuIdentifiers[var0]; - WorldMapRegion.tempMenuAction.itemId = Client.menuItemIds[var0]; - WorldMapRegion.tempMenuAction.action = Client.menuActions[var0]; - WorldMapRegion.tempMenuAction.target = Client.menuTargets[var0]; + public static Language method1976(int var0) { + return var0 >= 0 && var0 < field3609.length ? field3609[var0] : null; } - @ObfuscatedName("nd") + @ObfuscatedName("lf") @ObfuscatedSignature( - descriptor = "([BII)V", - garbageValue = "-1791629405" + descriptor = "(IIIIIIB)V", + garbageValue = "56" ) - @Export("VorbisSample_setData") - static void VorbisSample_setData(byte[] var0, int var1) { - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; + static final void method1977(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; + int var7 = var3 - var1; + int var8 = var6 >= 0 ? var6 : -var6; + int var9 = var7 >= 0 ? var7 : -var7; + int var10 = var8; + if (var8 < var9) { + var10 = var9; } - class410.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); + if (var10 != 0) { + int var11 = (var6 << 16) / var10; + int var12 = (var7 << 16) / var10; + if (var12 <= var11) { + var11 = -var11; + } else { + var12 = -var12; + } + + int var13 = var5 * var12 >> 17; + int var14 = var5 * var12 + 1 >> 17; + int var15 = var5 * var11 >> 17; + int var16 = var5 * var11 + 1 >> 17; + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; + int var17 = var0 + var13; + int var18 = var0 - var14; + int var19 = var0 + var6 - var14; + int var20 = var0 + var13 + var6; + int var21 = var15 + var1; + int var22 = var1 - var16; + int var23 = var7 + var1 - var16; + int var24 = var15 + var7 + var1; + Rasterizer3D.method1203(var17, var18, var19); + Rasterizer3D.method1205(var21, var22, var23, var17, var18, var19, 0.0F, 0.0F, 0.0F, var4); + Rasterizer3D.method1203(var17, var19, var20); + Rasterizer3D.method1205(var21, var23, var24, var17, var19, var20, 0.0F, 0.0F, 0.0F, var4); + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Link.java b/osrs/src/main/java/Link.java index bcdc0e99a..b2c81581a 100644 --- a/osrs/src/main/java/Link.java +++ b/osrs/src/main/java/Link.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sp") +@ObfuscatedName("ri") @Implements("Link") public class Link { - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Lri;" ) @Export("previous") public Link previous; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Lri;" ) @Export("next") public Link next; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("remove") public void remove() { if (this.next != null) { @@ -29,4 +29,4 @@ public void remove() { this.next = null; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/LinkDeque.java b/osrs/src/main/java/LinkDeque.java index 7403ed2af..45089972d 100644 --- a/osrs/src/main/java/LinkDeque.java +++ b/osrs/src/main/java/LinkDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("om") +@ObfuscatedName("ox") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Lri;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Lri;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public LinkDeque() { this.sentinel.next = this.sentinel; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lsp;)V" + descriptor = "(Lri;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public void addFirst(Link var1) { var1.previous.next = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "()Lsp;" + descriptor = "()Lri;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public Link last() { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "()Lsp;" + descriptor = "()Lri;" ) @Export("previous") public Link previous() { @@ -72,4 +72,4 @@ public Link previous() { return var1; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/LoadSongTask.java b/osrs/src/main/java/LoadSongTask.java deleted file mode 100644 index 621a3fdce..000000000 --- a/osrs/src/main/java/LoadSongTask.java +++ /dev/null @@ -1,103 +0,0 @@ -import java.util.Iterator; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ps") -public class LoadSongTask extends SongTask { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - AbstractArchive field3717; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - AbstractArchive field3718; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - AbstractArchive field3716; - - @ObfuscatedSignature( - descriptor = "(Lpp;Lnd;Lnd;Lnd;)V" - ) - public LoadSongTask(SongTask var1, AbstractArchive var2, AbstractArchive var3, AbstractArchive var4) { - super(var1); - this.field3717 = var2; - this.field3718 = var3; - this.field3716 = var4; - super.field3712 = "LoadSongTask"; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "994462530" - ) - public boolean vmethod2107(int var1) { - int var2 = 0; - Iterator var3 = class306.musicSongs.iterator(); - - while (true) { - while (var3.hasNext()) { - MusicSong var4 = (MusicSong)var3.next(); - if (var4 != null && var4.midiPcmStream.field2795 > 1 && var4.midiPcmStream.method1596()) { - this.method2102("Attempted to load patches of already loading midiplayer!"); - return true; - } - - if (var4 != null && !var4.field2849) { - try { - if (var4.musicTrackArchive != null && var4.musicTrackGroupId != -1 && var4.musicTrackFileId != -1) { - if (var4.field2858 == null) { - var4.field2858 = MusicTrack.readTrack(var4.musicTrackArchive, var4.musicTrackGroupId, var4.musicTrackFileId); - if (var4.field2858 == null) { - continue; - } - } - - if (var4.field2848 == null) { - var4.field2848 = new SoundCache(this.field3716, this.field3718); - } - - if (var4.midiPcmStream.method1589(var4.field2858, this.field3717, var4.field2848)) { - ++var2; - var4.field2849 = true; - var4.midiPcmStream.method1590(); - } - } else { - ++var2; - } - } catch (Exception var6) { - var6.printStackTrace(); - this.method2102(var6.getMessage()); - return true; - } - } else { - ++var2; - } - } - - if (var2 == class306.musicSongs.size()) { - return true; - } - - return false; - } - } - - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "115" - ) - static void method2108() { - PacketBufferNode var0 = class503.getPacketBufferNode(ClientPacket.WINDOW_STATUS, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(Huffman.getWindowedMode()); - var0.packetBuffer.writeShort(GrandExchangeOfferTotalQuantityComparator.canvasWidth); - var0.packetBuffer.writeShort(WorldMapArchiveLoader.canvasHeight); - Client.packetWriter.addNode(var0); - } -} diff --git a/osrs/src/main/java/Login.java b/osrs/src/main/java/Login.java index 19c636afb..43e62c887 100644 --- a/osrs/src/main/java/Login.java +++ b/osrs/src/main/java/Login.java @@ -1,134 +1,125 @@ -import java.text.DecimalFormat; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +import java.text.DecimalFormat; +import java.util.ArrayList; + +@ObfuscatedName("cy") @Implements("Login") public class Login { - @ObfuscatedName("ay") - @Export("clearLoginScreen") - static boolean clearLoginScreen; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("xPadding") static int xPadding; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "[Luu;" + descriptor = "[Luk;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Luu;" + descriptor = "Luk;" ) @Export("titleboxSprite") static IndexedSprite titleboxSprite; - @ObfuscatedName("aj") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Luu;" + descriptor = "Luk;" ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("ag") + static IndexedSprite field777; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Luu;" + descriptor = "Lui;" ) - static IndexedSprite field773; - @ObfuscatedName("aq") + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Luu;" + descriptor = "Luk;" ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("ak") + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("ay") @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("bh") - static int field746; - @ObfuscatedName("bt") - static int field747; - @ObfuscatedName("ct") + @ObfuscatedName("bi") + static int field750; + @ObfuscatedName("bn") + static int field751; + @ObfuscatedName("cw") @Export("loginIndex") static int loginIndex; @ObfuscatedName("cf") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("cz") + @ObfuscatedName("cm") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @Export("Login_response2") static String Login_response2; @ObfuscatedName("cs") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("cj") + @ObfuscatedName("cx") @Export("Login_username") static String Login_username; - @ObfuscatedName("cn") + @ObfuscatedName("cr") @Export("Login_password") static String Login_password; @ObfuscatedName("ce") - static int field748; + static int field752; @ObfuscatedName("cq") - static String[] field767; + static String[] field768; @ObfuscatedName("cu") - static String field761; - @ObfuscatedName("ch") - static boolean field741; - @ObfuscatedName("cg") - static boolean field740; - @ObfuscatedName("cv") - @Export("otp") - static String otp; + static String field764; + @ObfuscatedName("cz") + static boolean field745; + @ObfuscatedName("ct") + static boolean field744; @ObfuscatedName("cc") - static boolean field739; - @ObfuscatedName("dc") + static boolean field743; + @ObfuscatedName("dh") @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("dy") + @ObfuscatedName("dn") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("dt") + @ObfuscatedName("dk") @Export("hoveredWorldIndex") static int hoveredWorldIndex; @ObfuscatedName("df") @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("dm") + @ObfuscatedName("dz") @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("dz") + @ObfuscatedName("dv") + static long field773; + @ObfuscatedName("dr") static long field772; - @ObfuscatedName("dx") - static long field771; - @ObfuscatedName("dp") - static String[] field769; - @ObfuscatedName("ds") + @ObfuscatedName("do") static String[] field770; - @ObfuscatedName("da") - static String[] field768; - @ObfuscatedName("gt") - @Export("worldPort") - static int worldPort; - @ObfuscatedName("gn") - static String field766; + @ObfuscatedName("db") + static String[] field769; + @ObfuscatedName("dp") + static String[] field771; static { xPadding = 0; loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; - field746 = -1; - field747 = 1; + field750 = -1; + field751 = 1; loginIndex = 0; Login_response0 = ""; Login_response1 = ""; @@ -136,12 +127,12 @@ public class Login { Login_response3 = ""; Login_username = ""; Login_password = ""; - field748 = 0; - field767 = new String[8]; - field761 = ""; - field741 = false; - field740 = false; - field739 = true; + field752 = 0; + field768 = new String[8]; + field764 = ""; + field745 = false; + field744 = false; + field743 = true; currentLoginField = 0; worldSelectOpen = false; hoveredWorldIndex = -1; @@ -149,52 +140,69 @@ public class Login { worldSelectPagesCount = 0; new DecimalFormat("##0.00"); new class133(); + field773 = -1L; field772 = -1L; - field771 = -1L; - field769 = new String[]{"title.jpg"}; - field770 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; - field768 = new String[]{"logo_speedrunning"}; + field770 = new String[]{"title.jpg"}; + field769 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; + field771 = new String[]{"logo_speedrunning"}; } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "288446910" + descriptor = "(I)Lro;", + garbageValue = "1233302527" ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (Widget.Widget_loadedInterfaces[var0]) { - return true; - } else if (!ArchiveLoader.Widget_archive.tryLoadGroup(var0)) { - return false; - } else { - int var1 = ArchiveLoader.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - Widget.Widget_loadedInterfaces[var0] = true; - return true; + public static class449 method427() { + synchronized(class449.field3868) { + if (class338.field3112 == 0) { + return new class449(); } else { - if (ArchiveLoader.Widget_interfaceComponents[var0] == null) { - ArchiveLoader.Widget_interfaceComponents[var0] = new Widget[var1]; - } + class449.field3868[--class338.field3112].method2296(); + return class449.field3868[class338.field3112]; + } + } + } - for (int var2 = 0; var2 < var1; ++var2) { - if (ArchiveLoader.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = ArchiveLoader.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - ArchiveLoader.Widget_interfaceComponents[var0][var2] = new Widget(); - ArchiveLoader.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - ArchiveLoader.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - ArchiveLoader.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } - } - } - } + @ObfuscatedName("io") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1609122082" + ) + @Export("playJingle") + static void playJingle(int var0, int var1) { + if (class449.clientPreferences.getCurrentMusicVolume() != 0 && var0 != -1) { + ArrayList var2 = new ArrayList(); + var2.add(new MusicSong(class388.field3655, var0, 0, class449.clientPreferences.getCurrentMusicVolume(), false)); + class53.method291(var2, 0, 0, 0, 0, true); + Client.playingJingle = true; + } - Widget.Widget_loadedInterfaces[var0] = true; - return true; + } + + @ObfuscatedName("lb") + @ObfuscatedSignature( + descriptor = "([Lmi;Lmi;ZI)V", + garbageValue = "1287151342" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -1561222175 * -568991711 : var1.width * 501302871 * 2076902759; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 917378589 * 1251957813 : var1.height * -556278153 * 1553685319; + PcmPlayer.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { + PcmPlayer.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); + if (var5 != null) { + int var6 = var5.group; + if (ModeWhere.loadInterface(var6)) { + PcmPlayer.resizeInterface(PacketBufferNode.Widget_interfaceComponents[var6], -1, var3, var4, var2); } } + + if (var1.contentType == 1337) { + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/LoginPacket.java b/osrs/src/main/java/LoginPacket.java index 320d43ff7..bddd72d30 100644 --- a/osrs/src/main/java/LoginPacket.java +++ b/osrs/src/main/java/LoginPacket.java @@ -3,62 +3,63 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lx") +@ObfuscatedName("lk") @Implements("LoginPacket") -public class LoginPacket implements class294 { - @ObfuscatedName("aw") +public class LoginPacket implements class293 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Llk;" ) - public static final LoginPacket field2725; - @ObfuscatedName("ay") + public static final LoginPacket field2746; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Llk;" ) - static final LoginPacket field2727; - @ObfuscatedName("ar") + static final LoginPacket field2747; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Llk;" ) @Export("NEW_LOGIN_CONNECTION") public static final LoginPacket NEW_LOGIN_CONNECTION; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Llk;" ) @Export("RECONNECT_LOGIN_CONNECTION") public static final LoginPacket RECONNECT_LOGIN_CONNECTION; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Llk;" ) - public static final LoginPacket field2724; - @ObfuscatedName("aj") + public static final LoginPacket field2743; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Llk;" ) - static final LoginPacket field2726; - @ObfuscatedName("az") + static final LoginPacket field2748; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Llx;" + descriptor = "[Llk;" ) - static final LoginPacket[] field2728; - @ObfuscatedName("ag") + static final LoginPacket[] field2749; + @ObfuscatedName("az") @Export("id") public final int id; static { - field2725 = new LoginPacket(14, 0); - field2727 = new LoginPacket(15, 4); + field2746 = new LoginPacket(14, 0); + field2747 = new LoginPacket(15, 4); NEW_LOGIN_CONNECTION = new LoginPacket(16, -2); RECONNECT_LOGIN_CONNECTION = new LoginPacket(18, -2); - field2724 = new LoginPacket(19, -2); - field2726 = new LoginPacket(27, 0); - field2728 = new LoginPacket[32]; - LoginPacket[] var0 = class138.method743(); + field2743 = new LoginPacket(19, -2); + field2748 = new LoginPacket(27, 0); + field2749 = new LoginPacket[32]; + LoginPacket[] var0 = new LoginPacket[]{field2746, field2747, RECONNECT_LOGIN_CONNECTION, field2748, field2743, NEW_LOGIN_CONNECTION}; + LoginPacket[] var1 = var0; - for (int var1 = 0; var1 < var0.length; ++var1) { - field2728[var0[var1].id] = var0[var1]; + for (int var2 = 0; var2 < var1.length; ++var2) { + field2749[var1[var2].id] = var1[var2]; } } @@ -70,4 +71,211 @@ public class LoginPacket implements class294 { LoginPacket(int var1, int var2) { this.id = var1; } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(IILiw;Lis;Lij;S)Z", + garbageValue = "24346" + ) + static final boolean method1616(int var0, int var1, RouteStrategy var2, CollisionMap var3, class216 var4) { + int var5 = var4.method1132(); + int var6 = var4.method1133(); + int[][] var7 = var4.method1135(); + int[][] var8 = var4.method1134(); + int[] var9 = var4.method1136(); + int[] var10 = var4.method1137(); + int var11 = var4.method1138(); + int var12 = var0; + int var13 = var1; + int var14 = var5 >> 1; + int var15 = var6 >> 1; + int var16 = var0 - var14; + int var17 = var1 - var15; + var8[var14][var15] = 99; + var7[var14][var15] = 0; + byte var18 = 0; + int var19 = 0; + var9[var18] = var0; + byte var10001 = var18; + int var24 = var18 + 1; + var10[var10001] = var1; + int[][] var20 = var3.flags; + + while (var19 != var24) { + var12 = var9[var19]; + var13 = var10[var19]; + var19 = var19 + 1 & var11; + var14 = var12 - var16; + var15 = var13 - var17; + int var21 = var12 - var3.xInset; + int var22 = var13 - var3.yInset; + if (var2.hasArrived(2, var12, var13, var3)) { + var4.method1129(var12, var13); + return true; + } + + int var23 = var7[var14][var15] + 1; + if (var14 > 0 && var8[var14 - 1][var15] == 0 && (var20[var21 - 1][var22] & 19136782) == 0 && (var20[var21 - 1][var22 + 1] & 19136824) == 0) { + var9[var24] = var12 - 1; + var10[var24] = var13; + var24 = var24 + 1 & var11; + var8[var14 - 1][var15] = 2; + var7[var14 - 1][var15] = var23; + } + + if (var14 < var5 - 2 && var8[var14 + 1][var15] == 0 && (var20[var21 + 2][var22] & 19136899) == 0 && (var20[var21 + 2][var22 + 1] & 19136992) == 0) { + var9[var24] = var12 + 1; + var10[var24] = var13; + var24 = var24 + 1 & var11; + var8[var14 + 1][var15] = 8; + var7[var14 + 1][var15] = var23; + } + + if (var15 > 0 && var8[var14][var15 - 1] == 0 && (var20[var21][var22 - 1] & 19136782) == 0 && (var20[var21 + 1][var22 - 1] & 19136899) == 0) { + var9[var24] = var12; + var10[var24] = var13 - 1; + var24 = var24 + 1 & var11; + var8[var14][var15 - 1] = 1; + var7[var14][var15 - 1] = var23; + } + + if (var15 < var6 - 2 && var8[var14][var15 + 1] == 0 && (var20[var21][var22 + 2] & 19136824) == 0 && (var20[var21 + 1][var22 + 2] & 19136992) == 0) { + var9[var24] = var12; + var10[var24] = var13 + 1; + var24 = var24 + 1 & var11; + var8[var14][var15 + 1] = 4; + var7[var14][var15 + 1] = var23; + } + + if (var14 > 0 && var15 > 0 && var8[var14 - 1][var15 - 1] == 0 && (var20[var21 - 1][var22] & 19136830) == 0 && (var20[var21 - 1][var22 - 1] & 19136782) == 0 && (var20[var21][var22 - 1] & 19136911) == 0) { + var9[var24] = var12 - 1; + var10[var24] = var13 - 1; + var24 = var24 + 1 & var11; + var8[var14 - 1][var15 - 1] = 3; + var7[var14 - 1][var15 - 1] = var23; + } + + if (var14 < var5 - 2 && var15 > 0 && var8[var14 + 1][var15 - 1] == 0 && (var20[var21 + 1][var22 - 1] & 19136911) == 0 && (var20[var21 + 2][var22 - 1] & 19136899) == 0 && (var20[var21 + 2][var22] & 19136995) == 0) { + var9[var24] = var12 + 1; + var10[var24] = var13 - 1; + var24 = var24 + 1 & var11; + var8[var14 + 1][var15 - 1] = 9; + var7[var14 + 1][var15 - 1] = var23; + } + + if (var14 > 0 && var15 < var6 - 2 && var8[var14 - 1][var15 + 1] == 0 && (var20[var21 - 1][var22 + 1] & 19136830) == 0 && (var20[var21 - 1][var22 + 2] & 19136824) == 0 && (var20[var21][var22 + 2] & 19137016) == 0) { + var9[var24] = var12 - 1; + var10[var24] = var13 + 1; + var24 = var24 + 1 & var11; + var8[var14 - 1][var15 + 1] = 6; + var7[var14 - 1][var15 + 1] = var23; + } + + if (var14 < var5 - 2 && var15 < var6 - 2 && var8[var14 + 1][var15 + 1] == 0 && (var20[var21 + 1][var22 + 2] & 19137016) == 0 && (var20[var21 + 2][var22 + 2] & 19136992) == 0 && (var20[var21 + 2][var22 + 1] & 19136995) == 0) { + var9[var24] = var12 + 1; + var10[var24] = var13 + 1; + var24 = var24 + 1 & var11; + var8[var14 + 1][var15 + 1] = 12; + var7[var14 + 1][var15 + 1] = var23; + } + } + + var4.method1129(var12, var13); + return false; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lnu;Lnu;IIB)Lpi;", + garbageValue = "69" + ) + public static Font method1613(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + return !ApproximateRouteStrategy.method345(var0, var2, var3) ? null : HealthBarDefinition.method969(var1.takeFile(var2, var3)); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II[BIB)I", + garbageValue = "88" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; + + for (int var6 = 0; var6 < var5; ++var6) { + char var7 = var0.charAt(var6 + var1); + if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { + if (var7 == 8364) { + var3[var6 + var4] = -128; + } else if (var7 == 8218) { + var3[var6 + var4] = -126; + } else if (var7 == 402) { + var3[var6 + var4] = -125; + } else if (var7 == 8222) { + var3[var6 + var4] = -124; + } else if (var7 == 8230) { + var3[var6 + var4] = -123; + } else if (var7 == 8224) { + var3[var6 + var4] = -122; + } else if (var7 == 8225) { + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; + } else if (var7 == 8240) { + var3[var6 + var4] = -119; + } else if (var7 == 352) { + var3[var6 + var4] = -118; + } else if (var7 == 8249) { + var3[var6 + var4] = -117; + } else if (var7 == 338) { + var3[var6 + var4] = -116; + } else if (var7 == 381) { + var3[var6 + var4] = -114; + } else if (var7 == 8216) { + var3[var6 + var4] = -111; + } else if (var7 == 8217) { + var3[var6 + var4] = -110; + } else if (var7 == 8220) { + var3[var6 + var4] = -109; + } else if (var7 == 8221) { + var3[var6 + var4] = -108; + } else if (var7 == 8226) { + var3[var6 + var4] = -107; + } else if (var7 == 8211) { + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; + } else if (var7 == 732) { + var3[var6 + var4] = -104; + } else if (var7 == 8482) { + var3[var6 + var4] = -103; + } else if (var7 == 353) { + var3[var6 + var4] = -102; + } else if (var7 == 8250) { + var3[var6 + var4] = -101; + } else if (var7 == 339) { + var3[var6 + var4] = -100; + } else if (var7 == 382) { + var3[var6 + var4] = -98; + } else if (var7 == 376) { + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; + } + } else { + var3[var6 + var4] = (byte)var7; + } + } + + return var5; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-245858333" + ) + static void method1614() { + ItemContainer.itemContainers = new NodeHashTable(32); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/LoginScreenAnimation.java b/osrs/src/main/java/LoginScreenAnimation.java index f2b074dcf..0ba0b5a79 100644 --- a/osrs/src/main/java/LoginScreenAnimation.java +++ b/osrs/src/main/java/LoginScreenAnimation.java @@ -3,84 +3,84 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("db") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "[Luu;" + descriptor = "[Luk;" ) - IndexedSprite[] field1052; - @ObfuscatedName("ag") - int[] field1046; + IndexedSprite[] field1055; @ObfuscatedName("az") - int field1042; - @ObfuscatedName("av") - int[] field1051; + int[] field1054; @ObfuscatedName("ap") - int[] field1047; - @ObfuscatedName("aq") - int[] field1048; - @ObfuscatedName("at") + int field1043; + @ObfuscatedName("aa") + int[] field1046; + @ObfuscatedName("af") int[] field1049; - @ObfuscatedName("ah") - int field1039; - @ObfuscatedName("ax") + @ObfuscatedName("ad") + int[] field1048; + @ObfuscatedName("aq") + int[] field1052; + @ObfuscatedName("al") int field1041; - @ObfuscatedName("aa") - int[] field1043; - @ObfuscatedName("au") - int[] field1050; - @ObfuscatedName("ae") - int[] field1045; + @ObfuscatedName("an") + int field1042; + @ObfuscatedName("ar") + int[] field1053; @ObfuscatedName("ab") - int[] field1044; - @ObfuscatedName("ad") - int field1038; - @ObfuscatedName("ao") + int[] field1047; + @ObfuscatedName("ag") + int[] field1050; + @ObfuscatedName("am") + int[] field1051; + @ObfuscatedName("ax") + int field1045; + @ObfuscatedName("ah") int field1040; - @ObfuscatedName("ac") - int field1037; + @ObfuscatedName("as") + int field1044; @ObfuscatedSignature( - descriptor = "([Luu;)V" + descriptor = "([Luk;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1046 = new int[256]; - this.field1042 = 0; - this.field1039 = 0; + this.field1054 = new int[256]; + this.field1043 = 0; this.field1041 = 0; - this.field1038 = 0; + this.field1042 = 0; + this.field1045 = 0; this.field1040 = 0; - this.field1037 = 0; - this.field1052 = var1; + this.field1044 = 0; + this.field1055 = var1; this.initColors(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1971878867" + descriptor = "(B)V", + garbageValue = "-111" ) @Export("initColors") void initColors() { - this.field1047 = new int[256]; + this.field1049 = new int[256]; int var1; for (var1 = 0; var1 < 64; ++var1) { - this.field1047[var1] = var1 * 262144; + this.field1049[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1047[var1 + 64] = var1 * 1024 + 16711680; + this.field1049[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1047[var1 + 128] = var1 * 4 + 16776960; + this.field1049[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1047[var1 + 192] = 16777215; + this.field1049[var1 + 192] = 16777215; } this.field1048 = new int[256]; @@ -101,91 +101,91 @@ void initColors() { this.field1048[var1 + 192] = 16777215; } - this.field1049 = new int[256]; + this.field1052 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1] = var1 * 4; + this.field1052[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1 + 64] = var1 * 262144 + 255; + this.field1052[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1 + 128] = var1 * 1024 + 16711935; + this.field1052[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1 + 192] = 16777215; + this.field1052[var1 + 192] = 16777215; } - this.field1051 = new int[256]; - this.field1038 = 0; - this.field1045 = new int[32768]; - this.field1044 = new int[32768]; - this.method543((IndexedSprite)null); - this.field1043 = new int[32768]; + this.field1046 = new int[256]; + this.field1045 = 0; this.field1050 = new int[32768]; + this.field1051 = new int[32768]; + this.method535((IndexedSprite)null); + this.field1053 = new int[32768]; + this.field1047 = new int[32768]; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-14" + descriptor = "(I)V", + garbageValue = "1799116765" ) - void method536() { - this.field1047 = null; - this.field1048 = null; + void method528() { this.field1049 = null; - this.field1051 = null; - this.field1045 = null; - this.field1044 = null; - this.field1043 = null; + this.field1048 = null; + this.field1052 = null; + this.field1046 = null; this.field1050 = null; - this.field1038 = 0; + this.field1051 = null; + this.field1053 = null; + this.field1047 = null; + this.field1045 = 0; this.field1040 = 0; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2005060089" + descriptor = "(IIB)V", + garbageValue = "-48" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1043 == null) { + if (this.field1053 == null) { this.initColors(); } - if (this.field1037 == 0) { - this.field1037 = var2; + if (this.field1044 == 0) { + this.field1044 = var2; } - int var3 = var2 - this.field1037; + int var3 = var2 - this.field1044; if (var3 >= 256) { var3 = 0; } - this.field1037 = var2; + this.field1044 = var2; if (var3 > 0) { - this.method538(var3); + this.method530(var3); } - this.method540(var1); + this.method532(var1); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "16626" + descriptor = "(IB)V", + garbageValue = "0" ) - final void method538(int var1) { - this.field1038 += var1 * 128; + final void method530(int var1) { + this.field1045 += var1 * 128; int var2; - if (this.field1038 > this.field1045.length) { - this.field1038 -= this.field1045.length; + if (this.field1045 > this.field1050.length) { + this.field1045 -= this.field1050.length; var2 = (int)(Math.random() * 12.0D); - this.method543(this.field1052[var2]); + this.method535(this.field1055[var2]); } var2 = 0; @@ -194,12 +194,12 @@ final void method538(int var1) { int var6; for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1043[var2 + var3] - this.field1045[var2 + this.field1038 & this.field1045.length - 1] * var1 / 6; + var6 = this.field1053[var3 + var2] - this.field1050[var2 + this.field1045 & this.field1050.length - 1] * var1 / 6; if (var6 < 0) { var6 = 0; } - this.field1043[var2++] = var6; + this.field1053[var2++] = var6; } byte var15 = 10; @@ -213,39 +213,39 @@ final void method538(int var1) { for (int var9 = 0; var9 < 128; ++var9) { var10 = (int)(Math.random() * 100.0D); if (var10 < 50 && var9 > var15 && var9 < var6) { - this.field1043[var9 + var8] = 255; + this.field1053[var9 + var8] = 255; } else { - this.field1043[var8 + var9] = 0; + this.field1053[var9 + var8] = 0; } } } - if (this.field1039 > 0) { - this.field1039 -= var1 * 4; - } - if (this.field1041 > 0) { this.field1041 -= var1 * 4; } - if (this.field1039 == 0 && this.field1041 == 0) { + if (this.field1042 > 0) { + this.field1042 -= var1 * 4; + } + + if (this.field1041 == 0 && this.field1042 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); if (var7 == 0) { - this.field1039 = 1024; + this.field1041 = 1024; } if (var7 == 1) { - this.field1041 = 1024; + this.field1042 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1046[var7] = this.field1046[var7 + var1]; + this.field1054[var7] = this.field1054[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1046[var7] = (int)(Math.sin((double)this.field1042 / 14.0D) * 16.0D + Math.sin((double)this.field1042 / 15.0D) * 14.0D + Math.sin((double)this.field1042 / 16.0D) * 12.0D); - ++this.field1042; + this.field1054[var7] = (int)(Math.sin((double)this.field1043 / 14.0D) * 16.0D + Math.sin((double)this.field1043 / 15.0D) * 14.0D + Math.sin((double)this.field1043 / 16.0D) * 12.0D); + ++this.field1043; } this.field1040 += var1; @@ -261,7 +261,7 @@ final void method538(int var1) { for (var11 = 0; var11 < this.field1040 * 100; ++var11) { var12 = (int)(Math.random() * (double)var10) + var17; var13 = (int)(Math.random() * (double)var16) + var16; - this.field1043[var12 + (var13 << 7)] = 192; + this.field1053[var12 + (var13 << 7)] = 192; } this.field1040 = 0; @@ -272,16 +272,16 @@ final void method538(int var1) { var13 = var11 * 128; for (var14 = -var7; var14 < 128; ++var14) { - if (var14 + var7 < 128) { - var12 += this.field1043[var7 + var14 + var13]; + if (var7 + var14 < 128) { + var12 += this.field1053[var7 + var14 + var13]; } if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1043[var13 + var14 - (var7 + 1)]; + var12 -= this.field1053[var13 + var14 - (var7 + 1)]; } if (var14 >= 0) { - this.field1050[var13 + var14] = var12 / (var7 * 2 + 1); + this.field1047[var14 + var13] = var12 / (var7 * 2 + 1); } } } @@ -292,15 +292,15 @@ final void method538(int var1) { for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; if (var7 + var13 < 256) { - var12 += this.field1050[var7 * 128 + var11 + var14]; + var12 += this.field1047[var7 * 128 + var14 + var11]; } if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1050[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1047[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1043[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1053[var11 + var14] = var12 / (var7 * 2 + 1); } } } @@ -308,66 +308,66 @@ final void method538(int var1) { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "24" + descriptor = "(IIIS)I", + garbageValue = "1630" ) - final int method539(int var1, int var2, int var3) { + final int method531(int var1, int var2, int var3) { int var4 = 256 - var3; return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2121548101" + garbageValue = "-1503103603" ) - final void method540(int var1) { - int var2 = this.field1051.length; - if (this.field1039 > 0) { - this.method541(this.field1039, this.field1048); - } else if (this.field1041 > 0) { - this.method541(this.field1041, this.field1049); + final void method532(int var1) { + int var2 = this.field1046.length; + if (this.field1041 > 0) { + this.method533(this.field1041, this.field1048); + } else if (this.field1042 > 0) { + this.method533(this.field1042, this.field1052); } else { for (int var3 = 0; var3 < var2; ++var3) { - this.field1051[var3] = this.field1047[var3]; + this.field1046[var3] = this.field1049[var3]; } } - this.method542(var1); + this.method534(var1); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I[IB)V", - garbageValue = "2" + garbageValue = "106" ) - final void method541(int var1, int[] var2) { - int var3 = this.field1051.length; + final void method533(int var1, int[] var2) { + int var3 = this.field1046.length; for (int var4 = 0; var4 < var3; ++var4) { if (var1 > 768) { - this.field1051[var4] = this.method539(this.field1047[var4], var2[var4], 1024 - var1); + this.field1046[var4] = this.method531(this.field1049[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1051[var4] = var2[var4]; + this.field1046[var4] = var2[var4]; } else { - this.field1051[var4] = this.method539(var2[var4], this.field1047[var4], 256 - var1); + this.field1046[var4] = this.method531(var2[var4], this.field1049[var4], 256 - var1); } } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2130924481" + garbageValue = "-1021290032" ) - final void method542(int var1) { + final void method534(int var1) { int var2 = 0; for (int var3 = 1; var3 < 255; ++var3) { - int var4 = (256 - var3) * this.field1046[var3] / 256; + int var4 = (256 - var3) * this.field1054[var3] / 256; int var5 = var4 + var1; int var6 = 0; int var7 = 128; @@ -376,22 +376,22 @@ final void method542(int var1) { var5 = 0; } - if (var5 + 128 >= class156.rasterProvider.width) { - var7 = class156.rasterProvider.width - var5; + if (var5 + 128 >= AttackOption.rasterProvider.width) { + var7 = AttackOption.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * class156.rasterProvider.width; + int var8 = var5 + (var3 + 8) * AttackOption.rasterProvider.width; var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1043[var2++]; + int var10 = this.field1053[var2++]; int var11 = var8 % Rasterizer2D.Rasterizer2D_width; if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { int var12 = var10; int var13 = 256 - var10; - var10 = this.field1051[var10]; - int var14 = class156.rasterProvider.pixels[var8]; - class156.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) >> 8; + var10 = this.field1046[var10]; + int var14 = AttackOption.rasterProvider.pixels[var8]; + AttackOption.rasterProvider.pixels[var8++] = -16777216 | ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) + (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) >> 8; } else { ++var8; } @@ -402,21 +402,21 @@ final void method542(int var1) { } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Luu;B)V", - garbageValue = "38" + descriptor = "(Luk;I)V", + garbageValue = "-1981831992" ) - final void method543(IndexedSprite var1) { + final void method535(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1045.length; ++var2) { - this.field1045[var2] = 0; + for (var2 = 0; var2 < this.field1050.length; ++var2) { + this.field1050[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1045[var3] = (int)(Math.random() * 256.0D); + this.field1050[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -425,13 +425,13 @@ final void method543(IndexedSprite var1) { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); - this.field1044[var5] = (this.field1045[var5 - 128] + this.field1045[var5 + 1] + this.field1045[var5 + 128] + this.field1045[var5 - 1]) / 4; + this.field1051[var5] = (this.field1050[var5 + 128] + this.field1050[var5 - 128] + this.field1050[var5 + 1] + this.field1050[var5 - 1]) / 4; } } - int[] var8 = this.field1045; - this.field1045 = this.field1044; - this.field1044 = var8; + int[] var8 = this.field1050; + this.field1050 = this.field1051; + this.field1051 = var8; } if (var1 != null) { @@ -443,7 +443,7 @@ final void method543(IndexedSprite var1) { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1045[var7] = 0; + this.field1050[var7] = 0; } } } @@ -451,35 +451,15 @@ final void method543(IndexedSprite var1) { } - @ObfuscatedName("aw") + @ObfuscatedName("mf") @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "-66" + descriptor = "(IIIIIIII)V", + garbageValue = "1528651927" ) - static final int method534(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; - } - - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "(Lhb;I)Z", - garbageValue = "1149776403" - ) - static boolean method544(ObjectComposition var0) { - if (var0.transforms != null) { - int[] var1 = var0.transforms; - - for (int var2 = 0; var2 < var1.length; ++var2) { - int var3 = var1[var2]; - ObjectComposition var4 = class90.getObjectDefinition(var3); - if (var4.mapIconId != -1) { - return true; - } - } - } else if (var0.mapIconId != -1) { - return true; + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (ModeWhere.loadInterface(var0)) { + class9.updateInterface(PacketBufferNode.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); } - - return false; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/LoginType.java b/osrs/src/main/java/LoginType.java index c2d7dd130..2397b6b77 100644 --- a/osrs/src/main/java/LoginType.java +++ b/osrs/src/main/java/LoginType.java @@ -3,117 +3,118 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("si") +@ObfuscatedName("sl") @Implements("LoginType") public class LoginType { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) - static final LoginType field4062; - @ObfuscatedName("ar") + static final LoginType field4069; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) - static final LoginType field4060; - @ObfuscatedName("am") + static final LoginType field4071; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) - static final LoginType field4059; - @ObfuscatedName("as") + static final LoginType field4073; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) - static final LoginType field4061; - @ObfuscatedName("aj") + static final LoginType field4068; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) - static final LoginType field4058; - @ObfuscatedName("ag") + static final LoginType field4070; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) - static final LoginType field4057; - @ObfuscatedName("az") + static final LoginType field4074; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) - static final LoginType field4063; - @ObfuscatedName("av") + static final LoginType field4072; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lsl;" ) - public static final LoginType field4055; - @ObfuscatedName("ap") - final int field4064; - @ObfuscatedName("aq") - final String field4065; + public static final LoginType field4066; + @ObfuscatedName("af") + public final int field4076; + @ObfuscatedName("ad") + final String field4075; static { - oldscape = new LoginType(4, 0, "", ""); - field4062 = new LoginType(1, 1, "", ""); - field4060 = new LoginType(6, 2, "", ""); - field4059 = new LoginType(7, 3, "", ""); - field4061 = new LoginType(5, 4, "", ""); - field4058 = new LoginType(8, 5, "", ""); - field4057 = new LoginType(0, 6, "", ""); - field4063 = new LoginType(2, 7, "", ""); - field4055 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4062, field4060, field4061, field4059}); + oldscape = new LoginType(8, 0, "", ""); + field4069 = new LoginType(4, 1, "", ""); + field4071 = new LoginType(1, 2, "", ""); + field4073 = new LoginType(6, 3, "", ""); + field4068 = new LoginType(2, 4, "", ""); + field4070 = new LoginType(0, 5, "", ""); + field4074 = new LoginType(5, 6, "", ""); + field4072 = new LoginType(7, 7, "", ""); + field4066 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4069, field4071, field4068, field4073}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4064 = var1; - this.field4065 = var4; + this.field4076 = var1; + this.field4075 = var4; } @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lsi;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lsl;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4064 = var1; - this.field4065 = var4; + this.field4076 = var1; + this.field4075 = var4; } @Export("toString") @ObfuscatedName("toString") public String toString() { - return this.field4065; + return this.field4075; } - @ObfuscatedName("as") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "-10" + descriptor = "(Ldf;III)V", + garbageValue = "-1416218434" ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - - for (int var5 = 0; var5 < var2; ++var5) { - int var6 = var0[var5 + var1] & 255; - if (var6 != 0) { - if (var6 >= 128 && var6 < 160) { - char var7 = class385.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; - } - - var6 = var7; - } + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = EnumComposition.SequenceDefinition_get(var1).replyMode; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.currentSequenceFrameIndex = 0; + } - var3[var4++] = (char)var6; + if (var3 == 2) { + var0.currentSequenceFrameIndex = 0; } + } else if (var1 == -1 || var0.sequence == -1 || EnumComposition.SequenceDefinition_get(var1).forcedPriority >= EnumComposition.SequenceDefinition_get(var0.sequence).forcedPriority) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.currentSequenceFrameIndex = 0; + var0.field1022 = var0.pathLength; } - return new String(var3, 0, var4); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/LongNode.java b/osrs/src/main/java/LongNode.java index 0a73d4d1f..c2faf27dc 100644 --- a/osrs/src/main/java/LongNode.java +++ b/osrs/src/main/java/LongNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("sv") +@ObfuscatedName("st") @Implements("LongNode") public class LongNode extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("longValue") public long longValue; public LongNode(long var1) { this.longValue = var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/MenuAction.java b/osrs/src/main/java/MenuAction.java index 2e031595c..dd839cec7 100644 --- a/osrs/src/main/java/MenuAction.java +++ b/osrs/src/main/java/MenuAction.java @@ -3,197 +3,74 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("cz") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("param0") int param0; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("param1") int param1; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("opcode") int opcode; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("identifier") int identifier; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("itemId") int itemId; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("action") String action; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("target") String target; MenuAction() { } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)[Lfg;", - garbageValue = "-994330440" - ) - static class132[] method434() { - return new class132[]{class132.field1274, class132.field1276, class132.field1269, class132.field1266, class132.field1270, class132.field1265, class132.field1263, class132.field1277, class132.field1273, class132.field1267, class132.field1268, class132.field1271, class132.field1264, class132.field1275, class132.field1261, class132.field1272, class132.field1262}; - } - - @ObfuscatedName("cf") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(ILdc;ZB)I", - garbageValue = "4" + descriptor = "(III)V", + garbageValue = "1991089185" ) - static int method435(int var0, Script var1, boolean var2) { - return 2; + public static final void method425(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; + ViewportMouse.ViewportMouse_y = var1; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; } - @ObfuscatedName("mk") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1834048836" + descriptor = "(ILdh;ZB)I", + garbageValue = "64" ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - DbRowType.process(); - class19.method67(); - int var1 = class158.VarpDefinition_get(var0).type; - if (var1 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var1 == 1) { - if (var2 == 1) { - Rasterizer3D.method1164(0.9D); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.9D); - HealthBar.method581(); - class150.clientPreferences.setBrightness(0.9D); - } - - if (var2 == 2) { - Rasterizer3D.method1164(0.8D); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.8D); - HealthBar.method581(); - class150.clientPreferences.setBrightness(0.8D); - } - - if (var2 == 3) { - Rasterizer3D.method1164(0.7D); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.7D); - HealthBar.method581(); - class150.clientPreferences.setBrightness(0.7D); - } - - if (var2 == 4) { - Rasterizer3D.method1164(0.6D); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.6D); - HealthBar.method581(); - class150.clientPreferences.setBrightness(0.6D); - } - } - - if (var1 == 3) { - if (var2 == 0) { - StudioGame.method1839(255); - } - - if (var2 == 1) { - StudioGame.method1839(192); - } - - if (var2 == 2) { - StudioGame.method1839(128); - } - - if (var2 == 3) { - StudioGame.method1839(64); - } - - if (var2 == 4) { - StudioGame.method1839(0); - } - } - - if (var1 == 4) { - if (var2 == 0) { - ClanMate.method2184(127); - } - - if (var2 == 1) { - ClanMate.method2184(96); - } - - if (var2 == 2) { - ClanMate.method2184(64); - } - - if (var2 == 3) { - ClanMate.method2184(32); - } - - if (var2 == 4) { - ClanMate.method2184(0); - } - } - - if (var1 == 5) { - Client.leftClickOpensMenu = var2 == 1; - } - - if (var1 == 6) { - Client.chatEffects = var2; - } - - if (var1 == 9) { - } - - if (var1 == 10) { - if (var2 == 0) { - Interpreter.method429(127); - } - - if (var2 == 1) { - Interpreter.method429(96); - } - - if (var2 == 2) { - Interpreter.method429(64); - } - - if (var2 == 3) { - Interpreter.method429(32); - } - - if (var2 == 4) { - Interpreter.method429(0); - } - } - - if (var1 == 17) { - Client.followerIndex = var2 & 65535; - } - - if (var1 == 18) { - Client.playerAttackOption = (AttackOption)ClientPreferences.findEnumerated(ItemLayer.method1129(), var2); - if (Client.playerAttackOption == null) { - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var1 == 19) { - if (var2 == -1) { - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; - } - } - - if (var1 == 22) { - Client.npcAttackOption = (AttackOption)ClientPreferences.findEnumerated(ItemLayer.method1129(), var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - + static int method426(int var0, Script var1, boolean var2) { + Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + if (var0 == 2500) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == 2501) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == 2502) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == 2503) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == 2504) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == 2505) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Message.java b/osrs/src/main/java/Message.java index 488b6d592..9c84ae39f 100644 --- a/osrs/src/main/java/Message.java +++ b/osrs/src/main/java/Message.java @@ -3,50 +3,58 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cx") +import java.io.File; +import java.io.RandomAccessFile; + +@ObfuscatedName("co") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("fn") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + @Export("archive11") + static Archive archive11; + @ObfuscatedName("kn") @ObfuscatedSignature( - descriptor = "Luu;" + descriptor = "[Lui;" ) - static IndexedSprite field348; - @ObfuscatedName("dw") - static boolean field347; - @ObfuscatedName("aw") + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("au") @Export("count") int count; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("cycle") int cycle; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("type") int type; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("sender") String sender; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lui;" + descriptor = "Luc;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lqj;" + descriptor = "Lqp;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lqj;" + descriptor = "Lqp;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("prefix") String prefix; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("text") String text; @@ -56,14 +64,15 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "936252808" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "80" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - this.count = class425.method2153(); + int var5 = ++Messages.Messages_count - 1; + this.count = var5; this.cycle = Client.cycle; this.type = var1; this.sender = var2; @@ -74,20 +83,20 @@ void set(int var1, String var2, String var3, String var4) { this.clearIsFromIgnored(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "53" + descriptor = "(I)V", + garbageValue = "963763449" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1790809365" + descriptor = "(B)Z", + garbageValue = "10" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -98,30 +107,30 @@ final boolean isFromFriend() { return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1483847830" + descriptor = "(B)V", + garbageValue = "-35" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = class177.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromFriend0 = class299.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-45" + garbageValue = "1" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1800868921" + garbageValue = "1755097600" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -132,61 +141,64 @@ final boolean isFromIgnored() { return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-106" + descriptor = "(I)V", + garbageValue = "1656305683" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = class177.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = class299.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1553597211" + descriptor = "(B)V", + garbageValue = "70" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(ClanMate.method2185(this.sender), class457.loginType); + this.senderUsername = new Username(ObjTypeCustomisation.method936(this.sender), Language.loginType); } else { this.senderUsername = null; } } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "18" - ) - public static int method337(int var0) { - return var0 >>> 4 & class509.field4109; - } - - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1851914192" + descriptor = "(Ljava/io/File;ZI)Z", + garbageValue = "1803169793" ) - public static void method347() { - DbTableType.DBTableType_cache.clear(); + static boolean method340(File var0, boolean var1) { + try { + RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); + int var3 = var2.read(); + var2.seek(0L); + var2.write(var3); + var2.seek(0L); + var2.close(); + if (var1) { + var0.delete(); + } + + return true; + } catch (Exception var4) { + return false; + } } - @ObfuscatedName("az") + @ObfuscatedName("jn") @ObfuscatedSignature( - descriptor = "(Lty;J)V" + descriptor = "(B)V", + garbageValue = "-103" ) - static void method345(Buffer var0, long var1) { - var1 /= 10L; - if (var1 < 0L) { - var1 = 0L; - } else if (var1 > 65535L) { - var1 = 65535L; - } - - var0.writeShort((int)var1); + static void method341() { + PacketBufferNode var0 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.WINDOW_STATUS, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(class218.getWindowedMode()); + var0.packetBuffer.writeShort(class113.canvasWidth); + var0.packetBuffer.writeShort(class177.canvasHeight); + Client.packetWriter.addNode(var0); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Messages.java b/osrs/src/main/java/Messages.java index 8899e380f..6185a9a0c 100644 --- a/osrs/src/main/java/Messages.java +++ b/osrs/src/main/java/Messages.java @@ -1,31 +1,36 @@ -import java.util.HashMap; -import java.util.Map; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eo") +import java.io.DataInputStream; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +@ObfuscatedName("ea") @Implements("Messages") public class Messages { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsa;" + descriptor = "Lsf;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lou;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("Messages_count") static int Messages_count; + @ObfuscatedName("as") + public static String field1146; static { Messages_channels = new HashMap(); @@ -34,12 +39,60 @@ public class Messages { Messages_count = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "886881488" + ) + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; + if (var1 != null) { + var2 = class493.method2465(var1); + } + + if (var0 != null) { + if (var1 != null) { + var2 = var2 + " | "; + } + + var2 = var2 + var0; + } + + System.out.println("Error: " + var2); + var2 = var2.replace(':', '.'); + var2 = var2.replace('@', '_'); + var2 = var2.replace('&', '_'); + var2 = var2.replace('#', '_'); + if (RunException.RunException_applet == null) { + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?cv=" + RunException.RunException_revision + "&cs=" + RunException.field4287 + "&u=" + RunException.field4289 + "&v1=" + TaskHandler.javaVendor + "&v2=" + class106.javaVersion + "&ct=" + RunException.field4285 + "&e=" + var2); + DataInputStream var4 = new DataInputStream(var3.openStream()); + var4.read(); + var4.close(); + } catch (Exception var5) { + } + + } + } + + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(I)[Lls;", - garbageValue = "-1826957735" + descriptor = "(ILdh;ZI)I", + garbageValue = "1446947589" ) - public static ServerPacket[] method635() { - return new ServerPacket[]{ServerPacket.NPC_ANIM_SPECIFIC, ServerPacket.AREA_SOUND, ServerPacket.TRADING_POST_UPDATE, ServerPacket.SEND_PING, ServerPacket.UPDATE_REBOOT_TIMER, ServerPacket.IF_SETEVENTS, ServerPacket.NEW_PACKET_CAM_RESET_V2, ServerPacket.SET_PLAYER_OP, ServerPacket.VARP_LARGE, ServerPacket.IF_SETOBJECT, ServerPacket.OPEN_URL, ServerPacket.IF_MOVESUB, ServerPacket.CAM_LOOKAT_EASED_ANGLE_ABSOLUTE, ServerPacket.CAM_MOVETO_EASED_CIRCULAR, ServerPacket.IF_SETTEXT, ServerPacket.REFLECTIONCHECK_FRIENDLIST, ServerPacket.MAPPROJ_ANIM, ServerPacket.GAMEFRAME_FULL, ServerPacket.UPDATE_INV_STOP_TRANSMIT, ServerPacket.MESSAGE_PRIVATE_ECHO, ServerPacket.RUN_CLIENTSCRIPT, ServerPacket.VARCLAN_ENABLE, ServerPacket.MAPPROJ_ANIM_SPECIFIC, ServerPacket.UPDATE_RUNENERGY, ServerPacket.CAM_SHAKE, ServerPacket.MESSAGE_CLANCHANNEL, ServerPacket.IF_SETNPCHEAD, ServerPacket.IF_CLOSESUB, ServerPacket.UPDATE_STAT, ServerPacket.UPDATE_IGNORELIST, ServerPacket.IF_SETCOLOUR, ServerPacket.MAP_ANIM, ServerPacket.NPC_SPOTANIM_SPECIFIC, ServerPacket.HEAT_MAP, ServerPacket.LOC_ADD_CHANGE, ServerPacket.PLAYER_ANIM_SPECIFIC, ServerPacket.OBJ_ADD, ServerPacket.TRADING_POST_RESULTS, ServerPacket.SPOTANIM_SPECIFIC, ServerPacket.VARP_SMALL, ServerPacket.CHAT_FILTER_SETTINGS, ServerPacket.UPDATE_RUNWEIGHT, ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS, ServerPacket.RESET_ANIMS, ServerPacket.SYNTH_SOUND, ServerPacket.MIDI_JINGLE, ServerPacket.IF1_MODELROTATE, ServerPacket.HINT_ARROW, ServerPacket.NEW_PACK_215, ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR, ServerPacket.IF_SETANGLE, ServerPacket.NPC_HEADICON_SPECIFIC, ServerPacket.MESSAGE_PRIVATE, ServerPacket.IF_SETSCROLLPOS, ServerPacket.REBUILD_REGION, ServerPacket.LOC_ANIM_SPECIFIC, ServerPacket.MESSAGE_GAME, ServerPacket.UPDATE_INV_FULL, ServerPacket.IF_SETANIM, ServerPacket.IF_OPENSUB, ServerPacket.IF_SETMODEL, ServerPacket.UPDATE_UID192, ServerPacket.SYNC_CLIENT_VARCACHE, ServerPacket.CLANSETTINGS_FULL, ServerPacket.CAM_LOOKAT, ServerPacket.SET_MAP_FLAG, ServerPacket.MINIMAP_TOGGLE, ServerPacket.UPDATE_FRIENDLIST, ServerPacket.TRIGGER_ONDIALOGABORT, ServerPacket.IF_SETPLAYERMODEL_OBJ, ServerPacket.PLAYER_SPOTANIM_SPECIFIC, ServerPacket.OBJ_COUNT, ServerPacket.IF_SETPOSITION, ServerPacket.UPDATE_INV_PARTIAL, ServerPacket.RESET_CLIENT_VARCACHE, ServerPacket.FRIENDLIST_LOADED, ServerPacket.NPC_INFO_SMALL, ServerPacket.MESSAGE_FRIENDCHANNEL, ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT, ServerPacket.PLAYER_INFO, ServerPacket.IF_SETPLAYERMODEL_BODYTYPE, ServerPacket.TOGGLE_OCULUS_ORB, ServerPacket.CAM_MOVETO_EASED, ServerPacket.VARCLAN, ServerPacket.LOC_DEL, ServerPacket.REFLECTION_CHECK, ServerPacket.VARCLAN_DISABLE, ServerPacket.ENTER_FREECAM, ServerPacket.CLANCHANNEL_FULL, ServerPacket.MIDI_SONG_LEGACY, ServerPacket.IF_SETHIDE, ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM, ServerPacket.OBJ_DEL_LEGACY, ServerPacket.CLANSETTINGS_DELTA, ServerPacket.UPDATE_ZONE_FULL_FOLLOWS, ServerPacket.UPDATE_INV_CLEAR, ServerPacket.CLANCHANNEL_DELTA, ServerPacket.CAM_RESET, ServerPacket.EMPTY_PACKET, ServerPacket.REBUILD_REGION_NORMAL, ServerPacket.LOGOUT, ServerPacket.LOGOUT_FULL, ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED, ServerPacket.CAM_LOOKAT_EASED_COORD, ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2, ServerPacket.IF_OPENTOP, ServerPacket.field2719, ServerPacket.CAM_MOVETO, ServerPacket.UPDATE_SITESETTINGS, ServerPacket.PREFETCH_GAMEOBJECTS, ServerPacket.IF_SETPLAYERHEAD, ServerPacket.LOC_ANIM, ServerPacket.OBJ_DEL, ServerPacket.LOGIN_SCREEN_PACKET, ServerPacket.NPC_INFO_LARGE, ServerPacket.IF_SETPLAYERMODEL_SELF, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL, ServerPacket.MIDI_SONG, ServerPacket.MIDI_SONG_STOP, ServerPacket.MIDI_SONG_WITH_SECONDARY, ServerPacket.MIDI_SWAP}; + static int method635(int var0, Script var1, boolean var2) { + if (var0 == 7108) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = UserList.method2244() ? 1 : 0; + return 1; + } else { + return 2; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/MidiFileReader.java b/osrs/src/main/java/MidiFileReader.java index affe45fdc..08d144050 100644 --- a/osrs/src/main/java/MidiFileReader.java +++ b/osrs/src/main/java/MidiFileReader.java @@ -3,52 +3,52 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("lq") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("ap") - static final byte[] field2796; - @ObfuscatedName("aw") + @ObfuscatedName("af") + static final byte[] field2810; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lty;" + descriptor = "Ltm;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("division") int division; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("aj") - int[] field2799; - @ObfuscatedName("ag") - int field2797; - @ObfuscatedName("av") - long field2803; + @ObfuscatedName("ai") + int[] field2814; + @ObfuscatedName("az") + int field2812; + @ObfuscatedName("aa") + long field2817; static { - field2796 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + field2810 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; } MidiFileReader() { this.buffer = new Buffer((byte[])null); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("parse") void parse(byte[] var1) { this.buffer.array = var1; this.buffer.offset = 10; int var2 = this.buffer.readUnsignedShort(); this.division = this.buffer.readUnsignedShort(); - this.field2797 = 500000; + this.field2812 = 500000; this.trackStarts = new int[var2]; Buffer var10000; @@ -65,7 +65,7 @@ void parse(byte[] var1) { var10000 = this.buffer; } - this.field2803 = 0L; + this.field2817 = 0L; this.trackPositions = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { @@ -73,50 +73,50 @@ void parse(byte[] var1) { } this.trackLengths = new int[var2]; - this.field2799 = new int[var2]; + this.field2814 = new int[var2]; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("clear") void clear() { this.buffer.array = null; this.trackStarts = null; this.trackPositions = null; this.trackLengths = null; - this.field2799 = null; + this.field2814 = null; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("isReady") boolean isReady() { return this.buffer.array != null; } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("trackCount") int trackCount() { return this.trackPositions.length; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); @@ -124,36 +124,36 @@ void readTrackLength(int var1) { var10000[var1] += var2; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); return var2; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; int var5; if (var2 < 0) { var5 = var2 & 255; - this.field2799[var1] = var5; + this.field2814[var1] = var5; ++this.buffer.offset; } else { - var5 = this.field2799[var1]; + var5 = this.field2814[var1]; } if (var5 != 240 && var5 != 247) { - return this.method1635(var1, var5); + return this.method1677(var1, var5); } else { int var3 = this.buffer.readVarInt(); if (var5 == 247 && var3 > 0) { int var4 = this.buffer.array[this.buffer.offset] & 255; if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { ++this.buffer.offset; - this.field2799[var1] = var4; - return this.method1635(var1, var4); + this.field2814[var1] = var4; + return this.method1677(var1, var4); } } @@ -163,8 +163,8 @@ int readMessage0(int var1) { } } - @ObfuscatedName("aq") - int method1635(int var1, int var2) { + @ObfuscatedName("ad") + int method1677(int var1, int var2) { int var4; if (var2 == 255) { int var7 = this.buffer.readUnsignedByte(); @@ -178,8 +178,8 @@ int method1635(int var1, int var2) { int var5 = this.buffer.readMedium(); var4 -= 3; int var6 = this.trackLengths[var1]; - this.field2803 += (long)var6 * (long)(this.field2797 - var5); - this.field2797 = var5; + this.field2817 += (long)var6 * (long)(this.field2812 - var5); + this.field2812 = var5; var10000 = this.buffer; var10000.offset += var4; return 2; @@ -189,7 +189,7 @@ int method1635(int var1, int var2) { return 3; } } else { - byte var3 = field2796[var2 - 128]; + byte var3 = field2810[var2 - 128]; var4 = var2; if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -203,12 +203,12 @@ int method1635(int var1, int var2) { } } - @ObfuscatedName("at") - long method1636(int var1) { - return this.field2803 + (long)var1 * (long)this.field2797; + @ObfuscatedName("aq") + long method1678(int var1) { + return this.field2817 + (long)var1 * (long)this.field2812; } - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; @@ -225,7 +225,7 @@ int getPrioritizedTrack() { return var2; } - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; @@ -239,19 +239,19 @@ boolean isDone() { return true; } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("reset") void reset(long var1) { - this.field2803 = var1; + this.field2817 = var1; int var3 = this.trackPositions.length; for (int var4 = 0; var4 < var3; ++var4) { this.trackLengths[var4] = 0; - this.field2799[var4] = 0; + this.field2814[var4] = 0; this.buffer.offset = this.trackStarts[var4]; this.readTrackLength(var4); this.trackPositions[var4] = this.buffer.offset; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/MidiPcmStream.java b/osrs/src/main/java/MidiPcmStream.java index 639b5dae8..324055532 100644 --- a/osrs/src/main/java/MidiPcmStream.java +++ b/osrs/src/main/java/MidiPcmStream.java @@ -1,170 +1,165 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + import java.util.Iterator; import java.util.PriorityQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("lf") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("bo") - static AtomicBoolean field2766; - @ObfuscatedName("br") - static ThreadPoolExecutor field2765; - @ObfuscatedName("rb") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - @Export("mouseWheel") - static class174 mouseWheel; - @ObfuscatedName("aw") + @ObfuscatedName("bf") + static AtomicBoolean field2780; + @ObfuscatedName("bq") + static ThreadPoolExecutor field2779; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsm;" + descriptor = "Lso;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("ay") - int field2769; - @ObfuscatedName("ar") - int field2768; - @ObfuscatedName("am") - int[] field2778; - @ObfuscatedName("as") - int[] field2783; - @ObfuscatedName("aj") - int[] field2776; - @ObfuscatedName("ag") - int[] field2774; + @ObfuscatedName("ae") + int field2782; + @ObfuscatedName("ao") + int field2783; + @ObfuscatedName("at") + int[] field2796; + @ObfuscatedName("ac") + int[] field2787; + @ObfuscatedName("ai") + int[] field2791; @ObfuscatedName("az") - int[] field2786; - @ObfuscatedName("av") - int[] field2785; + int[] field2800; @ObfuscatedName("ap") - int[] field2781; + int[] field2793; + @ObfuscatedName("aa") + int[] field2786; + @ObfuscatedName("af") + int[] field2789; + @ObfuscatedName("ad") + int[] field2788; @ObfuscatedName("aq") - int[] field2782; - @ObfuscatedName("at") - int[] field2784; - @ObfuscatedName("ao") - int[] field2780; - @ObfuscatedName("ac") - int[] field2772; + int[] field2794; + @ObfuscatedName("ah") + int[] field2790; + @ObfuscatedName("as") + int[] field2795; + @ObfuscatedName("ay") + int[] field2799; + @ObfuscatedName("aj") + int[] field2792; + @ObfuscatedName("av") + int[] field2797; + @ObfuscatedName("aw") + int[] field2798; @ObfuscatedName("ak") - int[] field2777; - @ObfuscatedName("an") - int[] field2779; - @ObfuscatedName("af") - int[] field2773; - @ObfuscatedName("ai") - int[] field2775; - @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[[Lmw;" + descriptor = "[[Lmg;" ) - MusicPatchNode[][] field2792; - @ObfuscatedName("bd") + MusicPatchNode[][] field2805; + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "[[Lmw;" + descriptor = "[[Lmg;" ) - MusicPatchNode[][] field2793; - @ObfuscatedName("bb") + MusicPatchNode[][] field2806; + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Llb;" + descriptor = "Llq;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("bn") - boolean field2767; - @ObfuscatedName("ba") + @ObfuscatedName("bk") + boolean field2781; + @ObfuscatedName("bv") @Export("track") int track; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("trackLength") int trackLength; + @ObfuscatedName("bd") + long field2802; + @ObfuscatedName("by") + long field2803; @ObfuscatedName("bs") - long field2790; - @ObfuscatedName("bp") - long field2789; - @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmh;" ) @Export("patchStream") MusicPatchPcmStream patchStream; - @ObfuscatedName("bq") - PriorityQueue field2787; - @ObfuscatedName("bw") - public int field2795; + @ObfuscatedName("bm") + PriorityQueue field2801; + @ObfuscatedName("ba") + public int field2809; static { - field2766 = null; - field2765 = null; + field2780 = null; + field2779 = null; } public MidiPcmStream() { - this.field2769 = 256; - this.field2768 = 1000000; - this.field2778 = new int[16]; - this.field2783 = new int[16]; - this.field2776 = new int[16]; - this.field2774 = new int[16]; + this.field2782 = 256; + this.field2783 = 1000000; + this.field2796 = new int[16]; + this.field2787 = new int[16]; + this.field2791 = new int[16]; + this.field2800 = new int[16]; + this.field2793 = new int[16]; this.field2786 = new int[16]; - this.field2785 = new int[16]; - this.field2781 = new int[16]; - this.field2782 = new int[16]; - this.field2784 = new int[16]; - this.field2780 = new int[16]; - this.field2772 = new int[16]; - this.field2777 = new int[16]; - this.field2779 = new int[16]; - this.field2773 = new int[16]; - this.field2775 = new int[16]; - this.field2792 = new MusicPatchNode[16][128]; - this.field2793 = new MusicPatchNode[16][128]; + this.field2789 = new int[16]; + this.field2788 = new int[16]; + this.field2794 = new int[16]; + this.field2790 = new int[16]; + this.field2795 = new int[16]; + this.field2799 = new int[16]; + this.field2792 = new int[16]; + this.field2797 = new int[16]; + this.field2798 = new int[16]; + this.field2805 = new MusicPatchNode[16][128]; + this.field2806 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); - this.field2787 = new PriorityQueue(5, new class317()); - this.field2795 = 0; + this.field2801 = new PriorityQueue(5, new class316()); + this.field2809 = 0; this.musicPatches = new NodeHashTable(128); - this.method1609(); + this.method1650(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "3" + descriptor = "(II)V", + garbageValue = "178339919" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field2769 = var1; + this.field2782 = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1139038647" + garbageValue = "1304608444" ) - public int method1588() { - return this.field2769; + public int method1629() { + return this.field2782; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lmp;Lnd;Lbh;S)Z", - garbageValue = "195" + descriptor = "(Lmv;Lnu;Lbi;I)Z", + garbageValue = "2146420949" ) - public synchronized boolean method1589(MusicTrack var1, AbstractArchive var2, SoundCache var3) { + public synchronized boolean method1630(MusicTrack var1, AbstractArchive var2, SoundCache var3) { boolean var4 = true; - synchronized(this.field2787) { - this.field2787.clear(); + synchronized(this.field2801) { + this.field2801.clear(); } - for (class319 var5 = (class319)var1.field2826.first(); var5 != null; var5 = (class319)var1.field2826.next()) { + for (class318 var5 = (class318)var1.field2837.first(); var5 != null; var5 = (class318)var1.field2837.next()) { int var12 = (int)var5.key; MusicPatch var7 = (MusicPatch)this.musicPatches.get((long)var12); if (var7 == null) { @@ -185,15 +180,15 @@ public synchronized boolean method1589(MusicTrack var1, AbstractArchive var2, So this.musicPatches.put(var8, (long)var12); } - if (!var7.method1642(var3, var5.field2861)) { + if (!var7.method1682(var3, var5.field2876)) { var4 = false; - } else if (this.field2787 != null) { - synchronized(this.field2787) { - Iterator var15 = var7.field2816.iterator(); + } else if (this.field2801 != null) { + synchronized(this.field2801) { + Iterator var15 = var7.field2828.iterator(); while (var15.hasNext()) { class53 var10 = (class53)var15.next(); - this.field2787.add(new class310(var5.field2860, var10)); + this.field2801.add(new class309(var5.field2875, var10)); } } } @@ -202,135 +197,135 @@ public synchronized boolean method1589(MusicTrack var1, AbstractArchive var2, So return var4; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1319222681" + garbageValue = "-932325376" ) - public void method1590() { - if (this.field2787 != null) { - if (field2766 != null) { - field2766.set(true); + public void method1631() { + if (this.field2801 != null) { + if (field2780 != null) { + field2780.set(true); } - field2766 = new AtomicBoolean(false); - AtomicBoolean var1 = field2766; - if (field2765 == null) { + field2780 = new AtomicBoolean(false); + AtomicBoolean var1 = field2780; + if (field2779 == null) { int var2 = Runtime.getRuntime().availableProcessors(); - field2765 = new ThreadPoolExecutor(0, var2, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), new class309(this)); + field2779 = new ThreadPoolExecutor(0, var2, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), new class308(this)); } - field2765.submit(new class313(this, var1)); + field2779.submit(new class312(this, var1)); } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-59" + descriptor = "(I)V", + garbageValue = "2076204033" ) - public synchronized void method1591() { + public synchronized void method1632() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.clear(); } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "()Lby;" + descriptor = "()Lbw;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "()Lby;" + descriptor = "()Lbw;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } - @ObfuscatedName("az") + @ObfuscatedName("ap") protected synchronized int vmethod5648() { return 0; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2768 / PcmPlayer.field181; + int var4 = this.midiFile.division * this.field2783 / PcmPlayer.field181; do { - long var5 = (long)var4 * (long)var3 + this.field2790; - if (this.field2789 - var5 >= 0L) { - this.field2790 = var5; + long var5 = (long)var4 * (long)var3 + this.field2802; + if (this.field2803 - var5 >= 0L) { + this.field2802 = var5; break; } - int var7 = (int)((this.field2789 - this.field2790 + (long)var4 - 1L) / (long)var4); - this.field2790 += (long)var4 * (long)var7; + int var7 = (int)(((long)var4 + (this.field2803 - this.field2802) - 1L) / (long)var4); + this.field2802 += (long)var4 * (long)var7; this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; - this.method1622(); + this.method1664(); } while(this.midiFile.isReady()); } this.patchStream.fill(var1, var2, var3); } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-80" + descriptor = "(I)V", + garbageValue = "-1876288055" ) - public synchronized void method1592() { + public synchronized void method1633() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.remove(); } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2768 / PcmPlayer.field181; + int var2 = this.midiFile.division * this.field2783 / PcmPlayer.field181; do { - long var3 = this.field2790 + (long)var1 * (long)var2; - if (this.field2789 - var3 >= 0L) { - this.field2790 = var3; + long var3 = this.field2802 + (long)var1 * (long)var2; + if (this.field2803 - var3 >= 0L) { + this.field2802 = var3; break; } - int var5 = (int)(((long)var2 + (this.field2789 - this.field2790) - 1L) / (long)var2); - this.field2790 += (long)var2 * (long)var5; + int var5 = (int)(((long)var2 + (this.field2803 - this.field2802) - 1L) / (long)var2); + this.field2802 += (long)var2 * (long)var5; this.patchStream.skip(var5); var1 -= var5; - this.method1622(); + this.method1664(); } while(this.midiFile.isReady()); } this.patchStream.skip(var1); } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lmp;ZI)V", - garbageValue = "1966762890" + descriptor = "(Lmv;ZI)V", + garbageValue = "718932503" ) @Export("setMusicTrack") public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.field2767 = var2; - this.field2790 = 0L; + this.field2781 = var2; + this.field2802 = 0L; int var3 = this.midiFile.trackCount(); for (int var4 = 0; var4 < var3; ++var4) { @@ -341,235 +336,235 @@ public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2789 = this.midiFile.method1636(this.trackLength); + this.field2803 = this.midiFile.method1678(this.trackLength); } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-38" + descriptor = "(I)V", + garbageValue = "965115955" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); - this.method1609(); + this.method1650(); } - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-53" + garbageValue = "-12" ) @Export("isReady") public synchronized boolean isReady() { return this.midiFile.isReady(); } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-958919488" + descriptor = "(B)Z", + garbageValue = "8" ) - public synchronized boolean method1596() { - return this.musicPatches.method2430() > 0; + public synchronized boolean method1637() { + return this.musicPatches.method2456() > 0; } - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-736064552" + garbageValue = "1830042203" ) - public synchronized void method1597(int var1, int var2) { - this.method1598(var1, var2); + public synchronized void method1638(int var1, int var2) { + this.method1639(var1, var2); } - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1708470262" + descriptor = "(IIB)V", + garbageValue = "-22" ) - void method1598(int var1, int var2) { - this.field2774[var1] = var2; - this.field2785[var1] = var2 & -128; - this.method1599(var1, var2); + void method1639(int var1, int var2) { + this.field2800[var1] = var2; + this.field2786[var1] = var2 & -128; + this.method1640(var1, var2); } - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1087105384" + descriptor = "(IIB)V", + garbageValue = "71" ) - void method1599(int var1, int var2) { - if (var2 != this.field2786[var1]) { - this.field2786[var1] = var2; + void method1640(int var1, int var2) { + if (var2 != this.field2793[var1]) { + this.field2793[var1] = var2; for (int var3 = 0; var3 < 128; ++var3) { - this.field2793[var1][var3] = null; + this.field2806[var1][var3] = null; } } } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "2143768499" + garbageValue = "896950696" ) - void method1600(int var1, int var2, int var3) { - this.method1602(var1, var2, 64); - if ((this.field2780[var1] & 2) != 0) { + void method1641(int var1, int var2, int var3) { + this.method1643(var1, var2, 64); + if ((this.field2790[var1] & 2) != 0) { for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2843 == var1 && var4.field2829 < 0) { - this.field2792[var1][var4.field2834] = null; - this.field2792[var1][var2] = var4; - int var5 = (var4.field2838 * var4.field2837 >> 12) + var4.field2842; - var4.field2842 += var2 - var4.field2834 << 8; - var4.field2837 = var5 - var4.field2842; - var4.field2838 = 4096; - var4.field2834 = var2; + if (var4.field2854 == var1 && var4.field2853 < 0) { + this.field2805[var1][var4.field2847] = null; + this.field2805[var1][var2] = var4; + int var5 = (var4.field2844 * var4.field2843 >> 12) + var4.field2840; + var4.field2840 += var2 - var4.field2847 << 8; + var4.field2844 = var5 - var4.field2840; + var4.field2843 = 4096; + var4.field2847 = var2; return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2786[var1]); + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2793[var1]); if (var9 != null) { if (var9.rawSounds[var2] != null) { - RawSound var8 = var9.rawSounds[var2].method296(); + RawSound var8 = var9.rawSounds[var2].method292(); if (var8 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.field2843 = var1; + var6.field2854 = var1; var6.table = var9; var6.rawSound = var8; - var6.field2846 = var9.field2817[var2]; - var6.field2839 = var9.field2812[var2]; - var6.field2834 = var2; - var6.field2832 = var3 * var3 * var9.field2811[var2] * var9.field2814 + 1024 >> 11; - var6.field2845 = var9.field2810[var2] & 255; - var6.field2842 = (var2 << 8) - (var9.field2818[var2] & 32767); - var6.field2840 = 0; - var6.field2833 = 0; - var6.field2844 = 0; - var6.field2829 = -1; + var6.field2857 = var9.field2829[var2]; + var6.field2842 = var9.field2824[var2]; + var6.field2847 = var2; + var6.field2856 = var3 * var3 * var9.field2822[var2] * var9.field2826 + 1024 >> 11; + var6.field2851 = var9.field2823[var2] & 255; + var6.field2840 = (var2 << 8) - (var9.field2830[var2] & 32767); + var6.field2852 = 0; + var6.field2848 = 0; + var6.field2850 = 0; + var6.field2853 = -1; var6.field2841 = 0; - if (this.field2779[var1] == 0) { - var6.stream = RawPcmStream.method240(var8, this.method1614(var6), this.method1615(var6), this.method1616(var6)); + if (this.field2792[var1] == 0) { + var6.stream = RawPcmStream.method235(var8, this.method1656(var6), this.method1657(var6), this.method1658(var6)); } else { - var6.stream = RawPcmStream.method240(var8, this.method1614(var6), 0, this.method1616(var6)); - this.method1601(var6, var9.field2818[var2] < 0); + var6.stream = RawPcmStream.method235(var8, this.method1656(var6), 0, this.method1658(var6)); + this.method1642(var6, var9.field2830[var2] < 0); } - if (var9.field2818[var2] < 0) { + if (var9.field2830[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field2839 >= 0) { - MusicPatchNode var7 = this.field2793[var1][var6.field2839]; - if (var7 != null && var7.field2829 < 0) { - this.field2792[var1][var7.field2834] = null; - var7.field2829 = 0; + if (var6.field2842 >= 0) { + MusicPatchNode var7 = this.field2806[var1][var6.field2842]; + if (var7 != null && var7.field2853 < 0) { + this.field2805[var1][var7.field2847] = null; + var7.field2853 = 0; } - this.field2793[var1][var6.field2839] = var6; + this.field2806[var1][var6.field2842] = var6; } this.patchStream.queue.addFirst(var6); - this.field2792[var1][var2] = var6; + this.field2805[var1][var2] = var6; } } } } - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lmw;ZI)V", - garbageValue = "1613914943" + descriptor = "(Lmg;ZS)V", + garbageValue = "5717" ) - void method1601(MusicPatchNode var1, boolean var2) { + void method1642(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; int var4; - if (var2 && var1.rawSound.field168) { + if (var2 && var1.rawSound.field167) { int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)this.field2779[var1.field2843] * (long)var5 >> 6); + var4 = (int)((long)var5 * (long)this.field2792[var1.field2854] >> 6); var3 <<= 8; if (var4 >= var3) { var4 = var3 + var3 - 1 - var4; - var1.stream.method249(); + var1.stream.method244(); } } else { - var4 = (int)((long)var3 * (long)this.field2779[var1.field2843] >> 6); + var4 = (int)((long)var3 * (long)this.field2792[var1.field2854] >> 6); } - var1.stream.method248(var4); + var1.stream.method243(var4); } - @ObfuscatedName("ac") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1076595045" + garbageValue = "1002745448" ) - void method1602(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2792[var1][var2]; + void method1643(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2805[var1][var2]; if (var4 != null) { - this.field2792[var1][var2] = null; - if ((this.field2780[var1] & 2) != 0) { + this.field2805[var1][var2] = null; + if ((this.field2790[var1] & 2) != 0) { for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var4.field2843 == var5.field2843 && var5.field2829 < 0 && var4 != var5) { - var4.field2829 = 0; + if (var5.field2854 == var4.field2854 && var5.field2853 < 0 && var4 != var5) { + var4.field2853 = 0; break; } } } else { - var4.field2829 = 0; + var4.field2853 = 0; } } } - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "2035773529" + garbageValue = "-1830352831" ) - void method1603(int var1, int var2, int var3) { + void method1644(int var1, int var2, int var3) { } - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "105" + descriptor = "(III)V", + garbageValue = "-1399006127" ) - void method1604(int var1, int var2) { + void method1645(int var1, int var2) { } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1823688205" + garbageValue = "1713272694" ) - void method1605(int var1, int var2) { - this.field2781[var1] = var2; + void method1646(int var1, int var2) { + this.field2789[var1] = var2; } - @ObfuscatedName("ai") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-361813593" + garbageValue = "405588365" ) - void method1606(int var1) { + void method1647(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2843 == var1) { + if (var1 < 0 || var2.field2854 == var1) { if (var2.stream != null) { - var2.stream.method253(PcmPlayer.field181 / 100); - if (var2.stream.method257()) { + var2.stream.method248(PcmPlayer.field181 / 100); + if (var2.stream.method252()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method1659(); + var2.method1696(); } - if (var2.field2829 < 0) { - this.field2792[var2.field2843][var2.field2834] = null; + if (var2.field2853 < 0) { + this.field2805[var2.field2854][var2.field2847] = null; } var2.remove(); @@ -578,107 +573,107 @@ void method1606(int var1) { } - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1673747519" + descriptor = "(IB)V", + garbageValue = "11" ) - void method1607(int var1) { + void method1648(int var1) { if (var1 >= 0) { - this.field2778[var1] = 12800; - this.field2783[var1] = 8192; - this.field2776[var1] = 16383; - this.field2781[var1] = 8192; - this.field2782[var1] = 0; - this.field2784[var1] = 8192; - this.method1610(var1); - this.method1611(var1); - this.field2780[var1] = 0; - this.field2772[var1] = 32767; - this.field2777[var1] = 256; - this.field2779[var1] = 0; - this.method1613(var1, 8192); + this.field2796[var1] = 12800; + this.field2787[var1] = 8192; + this.field2791[var1] = 16383; + this.field2789[var1] = 8192; + this.field2788[var1] = 0; + this.field2794[var1] = 8192; + this.method1652(var1); + this.method1653(var1); + this.field2790[var1] = 0; + this.field2795[var1] = 32767; + this.field2799[var1] = 256; + this.field2792[var1] = 0; + this.method1655(var1, 8192); } else { for (var1 = 0; var1 < 16; ++var1) { - this.method1607(var1); + this.method1648(var1); } } } - @ObfuscatedName("bd") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-694816578" + descriptor = "(IB)V", + garbageValue = "2" ) - void method1608(int var1) { + void method1649(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2843 == var1) && var2.field2829 < 0) { - this.field2792[var2.field2843][var2.field2834] = null; - var2.field2829 = 0; + if ((var1 < 0 || var2.field2854 == var1) && var2.field2853 < 0) { + this.field2805[var2.field2854][var2.field2847] = null; + var2.field2853 = 0; } } } - @ObfuscatedName("bb") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1070396160" + garbageValue = "1873768041" ) - void method1609() { - this.method1606(-1); - this.method1607(-1); + void method1650() { + this.method1647(-1); + this.method1648(-1); int var1; for (var1 = 0; var1 < 16; ++var1) { - this.field2786[var1] = this.field2774[var1]; + this.field2793[var1] = this.field2800[var1]; } for (var1 = 0; var1 < 16; ++var1) { - this.field2785[var1] = this.field2774[var1] & -128; + this.field2786[var1] = this.field2800[var1] & -128; } } - @ObfuscatedName("bc") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1321540000" + garbageValue = "-1931071556" ) - void method1610(int var1) { - if ((this.field2780[var1] & 2) != 0) { + void method1652(int var1) { + if ((this.field2790[var1] & 2) != 0) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2843 == var1 && this.field2792[var1][var2.field2834] == null && var2.field2829 < 0) { - var2.field2829 = 0; + if (var2.field2854 == var1 && this.field2805[var1][var2.field2847] == null && var2.field2853 < 0) { + var2.field2853 = 0; } } } } - @ObfuscatedName("bi") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2058782045" + garbageValue = "-1591565057" ) - void method1611(int var1) { - if ((this.field2780[var1] & 4) != 0) { + void method1653(int var1) { + if ((this.field2790[var1] & 4) != 0) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2843 == var1) { - var2.field2835 = 0; + if (var2.field2854 == var1) { + var2.field2855 = 0; } } } } - @ObfuscatedName("bu") + @ObfuscatedName("ba") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-76" + garbageValue = "-60" ) - void method1612(int var1) { + void method1654(int var1) { int var2 = var1 & 240; int var3; int var4; @@ -687,260 +682,260 @@ void method1612(int var1) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method1602(var3, var4, var5); + this.method1643(var3, var4, var5); } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var5 > 0) { - this.method1600(var3, var4, var5); + this.method1641(var3, var4, var5); } else { - this.method1602(var3, var4, 64); + this.method1643(var3, var4, 64); } } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method1603(var3, var4, var5); + this.method1644(var3, var4, var5); } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var4 == 0) { - this.field2785[var3] = (var5 << 14) + (this.field2785[var3] & -2080769); + this.field2786[var3] = (var5 << 14) + (this.field2786[var3] & -2080769); } if (var4 == 32) { - this.field2785[var3] = (var5 << 7) + (this.field2785[var3] & -16257); + this.field2786[var3] = (var5 << 7) + (this.field2786[var3] & -16257); } if (var4 == 1) { - this.field2782[var3] = (var5 << 7) + (this.field2782[var3] & -16257); + this.field2788[var3] = (var5 << 7) + (this.field2788[var3] & -16257); } if (var4 == 33) { - this.field2782[var3] = var5 + (this.field2782[var3] & -128); + this.field2788[var3] = var5 + (this.field2788[var3] & -128); } if (var4 == 5) { - this.field2784[var3] = (var5 << 7) + (this.field2784[var3] & -16257); + this.field2794[var3] = (var5 << 7) + (this.field2794[var3] & -16257); } if (var4 == 37) { - this.field2784[var3] = var5 + (this.field2784[var3] & -128); + this.field2794[var3] = var5 + (this.field2794[var3] & -128); } if (var4 == 7) { - this.field2778[var3] = (var5 << 7) + (this.field2778[var3] & -16257); + this.field2796[var3] = (var5 << 7) + (this.field2796[var3] & -16257); } if (var4 == 39) { - this.field2778[var3] = var5 + (this.field2778[var3] & -128); + this.field2796[var3] = var5 + (this.field2796[var3] & -128); } if (var4 == 10) { - this.field2783[var3] = (var5 << 7) + (this.field2783[var3] & -16257); + this.field2787[var3] = (var5 << 7) + (this.field2787[var3] & -16257); } if (var4 == 42) { - this.field2783[var3] = var5 + (this.field2783[var3] & -128); + this.field2787[var3] = var5 + (this.field2787[var3] & -128); } if (var4 == 11) { - this.field2776[var3] = (var5 << 7) + (this.field2776[var3] & -16257); + this.field2791[var3] = (var5 << 7) + (this.field2791[var3] & -16257); } if (var4 == 43) { - this.field2776[var3] = var5 + (this.field2776[var3] & -128); + this.field2791[var3] = var5 + (this.field2791[var3] & -128); } int[] var10000; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field2780; + var10000 = this.field2790; var10000[var3] |= 1; } else { - var10000 = this.field2780; + var10000 = this.field2790; var10000[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field2780; + var10000 = this.field2790; var10000[var3] |= 2; } else { - this.method1610(var3); - var10000 = this.field2780; + this.method1652(var3); + var10000 = this.field2790; var10000[var3] &= -3; } } if (var4 == 99) { - this.field2772[var3] = (var5 << 7) + (this.field2772[var3] & 127); + this.field2795[var3] = (var5 << 7) + (this.field2795[var3] & 127); } if (var4 == 98) { - this.field2772[var3] = (this.field2772[var3] & 16256) + var5; + this.field2795[var3] = (this.field2795[var3] & 16256) + var5; } if (var4 == 101) { - this.field2772[var3] = (var5 << 7) + (this.field2772[var3] & 127) + 16384; + this.field2795[var3] = (var5 << 7) + (this.field2795[var3] & 127) + 16384; } if (var4 == 100) { - this.field2772[var3] = (this.field2772[var3] & 16256) + var5 + 16384; + this.field2795[var3] = (this.field2795[var3] & 16256) + var5 + 16384; } if (var4 == 120) { - this.method1606(var3); + this.method1647(var3); } if (var4 == 121) { - this.method1607(var3); + this.method1648(var3); } if (var4 == 123) { - this.method1608(var3); + this.method1649(var3); } int var6; if (var4 == 6) { - var6 = this.field2772[var3]; + var6 = this.field2795[var3]; if (var6 == 16384) { - this.field2777[var3] = (var5 << 7) + (this.field2777[var3] & -16257); + this.field2799[var3] = (var5 << 7) + (this.field2799[var3] & -16257); } } if (var4 == 38) { - var6 = this.field2772[var3]; + var6 = this.field2795[var3]; if (var6 == 16384) { - this.field2777[var3] = var5 + (this.field2777[var3] & -128); + this.field2799[var3] = var5 + (this.field2799[var3] & -128); } } if (var4 == 16) { - this.field2779[var3] = (var5 << 7) + (this.field2779[var3] & -16257); + this.field2792[var3] = (var5 << 7) + (this.field2792[var3] & -16257); } if (var4 == 48) { - this.field2779[var3] = var5 + (this.field2779[var3] & -128); + this.field2792[var3] = var5 + (this.field2792[var3] & -128); } if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field2780; + var10000 = this.field2790; var10000[var3] |= 4; } else { - this.method1611(var3); - var10000 = this.field2780; + this.method1653(var3); + var10000 = this.field2790; var10000[var3] &= -5; } } if (var4 == 17) { - this.method1613(var3, (var5 << 7) + (this.field2773[var3] & -16257)); + this.method1655(var3, (var5 << 7) + (this.field2797[var3] & -16257)); } if (var4 == 49) { - this.method1613(var3, var5 + (this.field2773[var3] & -128)); + this.method1655(var3, var5 + (this.field2797[var3] & -128)); } } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method1599(var3, var4 + this.field2785[var3]); + this.method1640(var3, var4 + this.field2786[var3]); } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method1604(var3, var4); + this.method1645(var3, var4); } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method1605(var3, var4); + this.method1646(var3, var4); } else { var2 = var1 & 255; if (var2 == 255) { - this.method1609(); + this.method1650(); } } } - @ObfuscatedName("bk") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1175935963" + garbageValue = "943957578" ) - void method1613(int var1, int var2) { - this.field2773[var1] = var2; - this.field2775[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); + void method1655(int var1, int var2) { + this.field2797[var1] = var2; + this.field2798[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); } - @ObfuscatedName("bh") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(Lmw;I)I", - garbageValue = "389364679" + descriptor = "(Lmg;B)I", + garbageValue = "-57" ) - int method1614(MusicPatchNode var1) { - int var2 = (var1.field2838 * var1.field2837 >> 12) + var1.field2842; - var2 += (this.field2781[var1.field2843] - 8192) * this.field2777[var1.field2843] >> 12; - MusicPatchNode2 var3 = var1.field2846; + int method1656(MusicPatchNode var1) { + int var2 = (var1.field2843 * var1.field2844 >> 12) + var1.field2840; + var2 += (this.field2789[var1.field2854] - 8192) * this.field2799[var1.field2854] >> 12; + MusicPatchNode2 var3 = var1.field2857; int var4; - if (var3.field2750 > 0 && (var3.field2744 > 0 || this.field2782[var1.field2843] > 0)) { - var4 = var3.field2744 << 2; - int var5 = var3.field2749 << 1; - if (var1.field2831 < var5) { - var4 = var4 * var1.field2831 / var5; + if (var3.field2763 > 0 && (var3.field2765 > 0 || this.field2788[var1.field2854] > 0)) { + var4 = var3.field2765 << 2; + int var5 = var3.field2759 << 1; + if (var1.field2845 < var5) { + var4 = var4 * var1.field2845 / var5; } - var4 += this.field2782[var1.field2843] >> 7; - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2830 & 511)); + var4 += this.field2788[var1.field2854] >> 7; + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2849 & 511)); var2 += (int)((double)var4 * var6); } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)PcmPlayer.field181 + 0.5D); + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field181 + 0.5D); return var4 < 1 ? 1 : var4; } - @ObfuscatedName("bm") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(Lmw;B)I", - garbageValue = "92" + descriptor = "(Lmg;I)I", + garbageValue = "-1224155709" ) - int method1615(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2846; - int var3 = this.field2776[var1.field2843] * this.field2778[var1.field2843] + 4096 >> 13; + int method1657(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2857; + int var3 = this.field2796[var1.field2854] * this.field2791[var1.field2854] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2832 + 16384 >> 15; - var3 = var3 * this.field2769 + 128 >> 8; - if (var2.field2747 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2747 * 1.953125E-5D * (double)var1.field2840) + 0.5D); + var3 = var3 * var1.field2856 + 16384 >> 15; + var3 = var3 * this.field2782 + 128 >> 8; + if (var2.field2762 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2852 * (double)var2.field2762) + 0.5D); } int var4; int var5; int var6; int var7; - if (var2.field2742 != null) { - var4 = var1.field2833; - var5 = var2.field2742[var1.field2844 + 1]; - if (var1.field2844 < var2.field2742.length - 2) { - var6 = (var2.field2742[var1.field2844] & 255) << 8; - var7 = (var2.field2742[var1.field2844 + 2] & 255) << 8; - var5 += (var4 - var6) * (var2.field2742[var1.field2844 + 3] - var5) / (var7 - var6); + if (var2.field2758 != null) { + var4 = var1.field2848; + var5 = var2.field2758[var1.field2850 + 1]; + if (var1.field2850 < var2.field2758.length - 2) { + var6 = (var2.field2758[var1.field2850] & 255) << 8; + var7 = (var2.field2758[var1.field2850 + 2] & 255) << 8; + var5 += (var2.field2758[var1.field2850 + 3] - var5) * (var4 - var6) / (var7 - var6); } var3 = var5 * var3 + 32 >> 6; } - if (var1.field2829 > 0 && var2.field2743 != null) { - var4 = var1.field2829; - var5 = var2.field2743[var1.field2841 + 1]; - if (var1.field2841 < var2.field2743.length - 2) { - var6 = (var2.field2743[var1.field2841] & 255) << 8; - var7 = (var2.field2743[var1.field2841 + 2] & 255) << 8; - var5 += (var4 - var6) * (var2.field2743[var1.field2841 + 3] - var5) / (var7 - var6); + if (var1.field2853 > 0 && var2.field2757 != null) { + var4 = var1.field2853; + var5 = var2.field2757[var1.field2841 + 1]; + if (var1.field2841 < var2.field2757.length - 2) { + var6 = (var2.field2757[var1.field2841] & 255) << 8; + var7 = (var2.field2757[var1.field2841 + 2] & 255) << 8; + var5 += (var2.field2757[var1.field2841 + 3] - var5) * (var4 - var6) / (var7 - var6); } var3 = var3 * var5 + 32 >> 6; @@ -949,27 +944,27 @@ int method1615(MusicPatchNode var1) { return var3; } - @ObfuscatedName("bl") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(Lmw;B)I", - garbageValue = "5" + descriptor = "(Lmg;I)I", + garbageValue = "-1781769455" ) - int method1616(MusicPatchNode var1) { - int var2 = this.field2783[var1.field2843]; - return var2 < 8192 ? var2 * var1.field2845 + 32 >> 6 : 16384 - ((128 - var1.field2845) * (16384 - var2) + 32 >> 6); + int method1658(MusicPatchNode var1) { + int var2 = this.field2787[var1.field2854]; + return var2 < 8192 ? var2 * var1.field2851 + 32 >> 6 : 16384 - ((128 - var1.field2851) * (16384 - var2) + 32 >> 6); } - @ObfuscatedName("bt") + @ObfuscatedName("bx") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-128" + garbageValue = "-25" ) - void method1622() { + void method1664() { int var1 = this.track; int var2 = this.trackLength; long var3; - for (var3 = this.field2789; var2 == this.trackLength; var3 = this.midiFile.method1636(var2)) { + for (var3 = this.field2803; var2 == this.trackLength; var3 = this.midiFile.method1678(var2)) { while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); @@ -977,8 +972,8 @@ void method1622() { this.midiFile.setTrackDone(); this.midiFile.markTrackPosition(var1); if (this.midiFile.isDone()) { - if (!this.field2767 || var2 == 0) { - this.method1609(); + if (!this.field2781 || var2 == 0) { + this.method1650(); this.midiFile.clear(); return; } @@ -989,7 +984,7 @@ void method1622() { } if ((var5 & 128) != 0) { - this.method1612(var5); + this.method1654(var5); } this.midiFile.readTrackLength(var1); @@ -1002,20 +997,20 @@ void method1622() { this.track = var1; this.trackLength = var2; - this.field2789 = var3; + this.field2803 = var3; } - @ObfuscatedName("bg") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(Lmw;I)Z", - garbageValue = "1539883938" + descriptor = "(Lmg;I)Z", + garbageValue = "845643756" ) - boolean method1623(MusicPatchNode var1) { + boolean method1665(MusicPatchNode var1) { if (var1.stream == null) { - if (var1.field2829 >= 0) { + if (var1.field2853 >= 0) { var1.remove(); - if (var1.field2839 > 0 && var1 == this.field2793[var1.field2843][var1.field2839]) { - this.field2793[var1.field2843][var1.field2839] = null; + if (var1.field2842 > 0 && var1 == this.field2806[var1.field2854][var1.field2842]) { + this.field2806[var1.field2854][var1.field2842] = null; } } @@ -1025,103 +1020,143 @@ boolean method1623(MusicPatchNode var1) { } } - @ObfuscatedName("bj") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(Lmw;[IIIS)Z", - garbageValue = "20993" + descriptor = "(Lmg;[IIII)Z", + garbageValue = "1875808849" ) - boolean method1624(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2836 = PcmPlayer.field181 / 100; - if (var1.field2829 < 0 || var1.stream != null && !var1.stream.method256()) { - int var5 = var1.field2838; + boolean method1666(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2846 = PcmPlayer.field181 / 100; + if (var1.field2853 < 0 || var1.stream != null && !var1.stream.method251()) { + int var5 = var1.field2843; if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2784[var1.field2843]) + 0.5D); + var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2794[var1.field2854]) + 0.5D); if (var5 < 0) { var5 = 0; } - var1.field2838 = var5; + var1.field2843 = var5; } - var1.stream.method254(this.method1614(var1)); - MusicPatchNode2 var6 = var1.field2846; + var1.stream.method249(this.method1656(var1)); + MusicPatchNode2 var6 = var1.field2857; boolean var7 = false; - ++var1.field2831; - var1.field2830 += var6.field2750; - double var8 = (double)((var1.field2834 - 60 << 8) + (var1.field2838 * var1.field2837 >> 12)) * 5.086263020833333E-6D; - if (var6.field2747 > 0) { - if (var6.field2745 > 0) { - var1.field2840 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2745 * var8) + 0.5D); + ++var1.field2845; + var1.field2849 += var6.field2763; + double var8 = 5.086263020833333E-6D * (double)((var1.field2847 - 60 << 8) + (var1.field2844 * var1.field2843 >> 12)); + if (var6.field2762 > 0) { + if (var6.field2761 > 0) { + var1.field2852 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2761 * var8) + 0.5D); } else { - var1.field2840 += 128; + var1.field2852 += 128; } } - if (var6.field2742 != null) { - if (var6.field2746 > 0) { - var1.field2833 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2746 * var8) + 0.5D); + if (var6.field2758 != null) { + if (var6.field2764 > 0) { + var1.field2848 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2764) + 0.5D); } else { - var1.field2833 += 128; + var1.field2848 += 128; } - while (var1.field2844 < var6.field2742.length - 2 && var1.field2833 > (var6.field2742[var1.field2844 + 2] & 255) << 8) { - var1.field2844 += 2; + while (var1.field2850 < var6.field2758.length - 2 && var1.field2848 > (var6.field2758[var1.field2850 + 2] & 255) << 8) { + var1.field2850 += 2; } - if (var6.field2742.length - 2 == var1.field2844 && var6.field2742[var1.field2844 + 1] == 0) { + if (var6.field2758.length - 2 == var1.field2850 && var6.field2758[var1.field2850 + 1] == 0) { var7 = true; } } - if (var1.field2829 >= 0 && var6.field2743 != null && (this.field2780[var1.field2843] & 1) == 0 && (var1.field2839 < 0 || var1 != this.field2793[var1.field2843][var1.field2839])) { - if (var6.field2748 > 0) { - var1.field2829 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2748 * var8) + 0.5D); + if (var1.field2853 >= 0 && var6.field2757 != null && (this.field2790[var1.field2854] & 1) == 0 && (var1.field2842 < 0 || var1 != this.field2806[var1.field2854][var1.field2842])) { + if (var6.field2760 > 0) { + var1.field2853 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2760) + 0.5D); } else { - var1.field2829 += 128; + var1.field2853 += 128; } - while (var1.field2841 < var6.field2743.length - 2 && var1.field2829 > (var6.field2743[var1.field2841 + 2] & 255) << 8) { + while (var1.field2841 < var6.field2757.length - 2 && var1.field2853 > (var6.field2757[var1.field2841 + 2] & 255) << 8) { var1.field2841 += 2; } - if (var6.field2743.length - 2 == var1.field2841) { + if (var6.field2757.length - 2 == var1.field2841) { var7 = true; } } if (var7) { - var1.stream.method253(var1.field2836); + var1.stream.method248(var1.field2846); if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); } - if (var1.stream.method257()) { + if (var1.stream.method252()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method1659(); - if (var1.field2829 >= 0) { + var1.method1696(); + if (var1.field2853 >= 0) { var1.remove(); - if (var1.field2839 > 0 && var1 == this.field2793[var1.field2843][var1.field2839]) { - this.field2793[var1.field2843][var1.field2839] = null; + if (var1.field2842 > 0 && var1 == this.field2806[var1.field2854][var1.field2842]) { + this.field2806[var1.field2854][var1.field2842] = null; } } return true; } else { - var1.stream.method252(var1.field2836, this.method1615(var1), this.method1616(var1)); + var1.stream.method247(var1.field2846, this.method1657(var1), this.method1658(var1)); return false; } } else { - var1.method1659(); + var1.method1696(); var1.remove(); - if (var1.field2839 > 0 && var1 == this.field2793[var1.field2843][var1.field2839]) { - this.field2793[var1.field2843][var1.field2839] = null; + if (var1.field2842 > 0 && var1 == this.field2806[var1.field2854][var1.field2842]) { + this.field2806[var1.field2854][var1.field2842] = null; } return true; } } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)[Lnn;", + garbageValue = "1169137618" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.field3487, PlayerType.PlayerType_ultimateIronman, PlayerType.field3493, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_playerModerator, PlayerType.field3496, PlayerType.field3489, PlayerType.PlayerType_ironman, PlayerType.PlayerType_normal, PlayerType.field3490, PlayerType.field3485, PlayerType.field3497, PlayerType.PlayerType_hardcoreIronman, PlayerType.field3492, PlayerType.field3500, PlayerType.field3495, PlayerType.field3484}; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)[Lum;", + garbageValue = "37" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4230, FillMode.field4231, FillMode.SOLID}; + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(II)Ljt;", + garbageValue = "2017214624" + ) + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; + } else { + var1 = ArchiveLoader.method464(VarpDefinition.SequenceDefinition_animationsArchive, class485.SequenceDefinition_skeletonsArchive, var0, false); + if (var1 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + } + + return var1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/MilliClock.java b/osrs/src/main/java/MilliClock.java index 638e4cd97..b45957e20 100644 --- a/osrs/src/main/java/MilliClock.java +++ b/osrs/src/main/java/MilliClock.java @@ -3,102 +3,102 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("gr") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("aw") - long[] field1474; - @ObfuscatedName("ay") - int field1472; - @ObfuscatedName("ar") - int field1470; - @ObfuscatedName("am") - long field1473; - @ObfuscatedName("as") - int field1471; - @ObfuscatedName("aj") - int field1469; + @ObfuscatedName("au") + long[] field1484; + @ObfuscatedName("ae") + int field1480; + @ObfuscatedName("ao") + int field1482; + @ObfuscatedName("at") + long field1483; + @ObfuscatedName("ac") + int field1479; + @ObfuscatedName("ai") + int field1481; public MilliClock() { - this.field1474 = new long[10]; - this.field1472 = 256; - this.field1470 = 1; - this.field1471 = 0; - this.field1473 = class113.clockNow(); + this.field1484 = new long[10]; + this.field1480 = 256; + this.field1482 = 1; + this.field1479 = 0; + this.field1483 = GameEngine.clockNow(); for (int var1 = 0; var1 < 10; ++var1) { - this.field1474[var1] = this.field1473; + this.field1484[var1] = this.field1483; } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1541664401" + garbageValue = "-1021685028" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { - this.field1474[var1] = 0L; + this.field1484[var1] = 0L; } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(IIB)I", - garbageValue = "64" + garbageValue = "20" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1472; - int var4 = this.field1470; - this.field1472 = 300; - this.field1470 = 1; - this.field1473 = class113.clockNow(); - if (0L == this.field1474[this.field1469]) { - this.field1472 = var3; - this.field1470 = var4; - } else if (this.field1473 > this.field1474[this.field1469]) { - this.field1472 = (int)((long)(var1 * 2560) / (this.field1473 - this.field1474[this.field1469])); + int var3 = this.field1480; + int var4 = this.field1482; + this.field1480 = 300; + this.field1482 = 1; + this.field1483 = GameEngine.clockNow(); + if (0L == this.field1484[this.field1481]) { + this.field1480 = var3; + this.field1482 = var4; + } else if (this.field1483 > this.field1484[this.field1481]) { + this.field1480 = (int)((long)(var1 * 2560) / (this.field1483 - this.field1484[this.field1481])); } - if (this.field1472 < 25) { - this.field1472 = 25; + if (this.field1480 < 25) { + this.field1480 = 25; } - if (this.field1472 > 256) { - this.field1472 = 256; - this.field1470 = (int)((long)var1 - (this.field1473 - this.field1474[this.field1469]) / 10L); + if (this.field1480 > 256) { + this.field1480 = 256; + this.field1482 = (int)((long)var1 - (this.field1483 - this.field1484[this.field1481]) / 10L); } - if (this.field1470 > var1) { - this.field1470 = var1; + if (this.field1482 > var1) { + this.field1482 = var1; } - this.field1474[this.field1469] = this.field1473; - this.field1469 = (this.field1469 + 1) % 10; + this.field1484[this.field1481] = this.field1483; + this.field1481 = (this.field1481 + 1) % 10; int var5; - if (this.field1470 > 1) { + if (this.field1482 > 1) { for (var5 = 0; var5 < 10; ++var5) { - if (this.field1474[var5] != 0L) { - this.field1474[var5] += (long)this.field1470; + if (0L != this.field1484[var5]) { + this.field1484[var5] += (long)this.field1482; } } } - if (this.field1470 < var2) { - this.field1470 = var2; + if (this.field1482 < var2) { + this.field1482 = var2; } - class13.method44((long)this.field1470); + PendingSpawn.method505((long)this.field1482); - for (var5 = 0; this.field1471 < 256; this.field1471 += this.field1472) { + for (var5 = 0; this.field1479 < 256; this.field1479 += this.field1480) { ++var5; } - this.field1471 &= 255; + this.field1479 &= 255; return var5; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ModeWhere.java b/osrs/src/main/java/ModeWhere.java index fd4477d0e..41cfe09f6 100644 --- a/osrs/src/main/java/ModeWhere.java +++ b/osrs/src/main/java/ModeWhere.java @@ -1,128 +1,257 @@ -import java.util.HashSet; -import java.util.Set; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ox") +import java.util.HashSet; +import java.util.Set; + +@ObfuscatedName("oe") @Implements("ModeWhere") -public enum ModeWhere implements class372 { - @ObfuscatedName("aw") +public enum ModeWhere implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3615("", 0, new class371[]{class371.field3585, class371.field3587}), - @ObfuscatedName("ay") + field3626("", 0, new class370[]{class370.field3597, class370.field3598}), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3616("", 1, new class371[]{class371.field3586, class371.field3585, class371.field3587}), - @ObfuscatedName("ar") + field3618("", 1, new class370[]{class370.field3596, class370.field3597, class370.field3598}), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3611("", 2, new class371[]{class371.field3586, class371.field3588, class371.field3585}), - @ObfuscatedName("am") + field3622("", 2, new class370[]{class370.field3596, class370.field3595, class370.field3597}), + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3608("", 3, new class371[]{class371.field3586}), - @ObfuscatedName("as") + field3625("", 3, new class370[]{class370.field3596}), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3612("", 4), - @ObfuscatedName("aj") + field3616("", 4), + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3607("", 5, new class371[]{class371.field3586, class371.field3585}), - @ObfuscatedName("ag") + field3620("", 5, new class370[]{class370.field3596, class370.field3597}), + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3605("", 6, new class371[]{class371.field3585}), - @ObfuscatedName("az") + field3627("", 6, new class370[]{class370.field3597}), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3617("", 8, new class371[]{class371.field3586, class371.field3585}), - @ObfuscatedName("av") + field3623("", 8, new class370[]{class370.field3596, class370.field3597}), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3614("", 9, new class371[]{class371.field3586, class371.field3588}), - @ObfuscatedName("ap") + field3615("", 9, new class370[]{class370.field3596, class370.field3595}), + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3609("", 10, new class371[]{class371.field3586}), - @ObfuscatedName("aq") + field3619("", 10, new class370[]{class370.field3596}), + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3610("", 11, new class371[]{class371.field3586}), - @ObfuscatedName("at") + field3617("", 11, new class370[]{class370.field3596}), + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3613("", 12, new class371[]{class371.field3586, class371.field3585}), - @ObfuscatedName("ah") + field3624("", 12, new class370[]{class370.field3596, class370.field3597}), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loe;" ) - field3606("", 13, new class371[]{class371.field3586}); + field3621("", 13, new class370[]{class370.field3596}); - @ObfuscatedName("ug") - static int field3604; - @ObfuscatedName("ng") - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("uc") - static int cameraMoveToHeight; - @ObfuscatedName("ax") + @ObfuscatedName("dc") + static boolean field3613; + @ObfuscatedName("oo") + @Export("selectedSpellWidget") + static int selectedSpellWidget; + @ObfuscatedName("an") @Export("id") final int id; - @ObfuscatedName("aa") - final Set field3619; + @ObfuscatedName("ar") + final Set field3629; + + static { + $values(); + } @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Loe;)V" + descriptor = "(Ljava/lang/String;I[Log;)V" ) - ModeWhere(String var3, int var4, class371[] var5) { - this.field3619 = new HashSet(); + ModeWhere(String var3, int var4, class370[] var5) { + this.field3629 = new HashSet(); this.id = var4; - class371[] var6 = var5; + class370[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { - class371 var8 = var6[var7]; - this.field3619.add(var8); + class370 var8 = var6[var7]; + this.field3629.add(var8); } } ModeWhere(String var3, int var4) { - this.field3619 = new HashSet(); + this.field3629 = new HashSet(); this.id = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("jl") + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)[Loe;", + garbageValue = "-1302821718" + ) + @Export("$values") + static ModeWhere[] $values() { + return new ModeWhere[]{field3617, field3621, field3616, field3615, field3623, field3625, field3619, field3624, field3620, field3618, field3627, field3622, field3626}; + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1069349497" + descriptor = "(Lnu;I)V", + garbageValue = "-1598349673" ) - static boolean method1946() { - return (Client.drawPlayerNames & 2) != 0; + public static void method1978(AbstractArchive var0) { + class13.InvDefinition_archive = var0; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "1" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (class316.Widget_loadedInterfaces[var0]) { + return true; + } else if (!Decimator.Widget_archive.tryLoadGroup(var0)) { + return false; + } else { + int var1 = Decimator.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + class316.Widget_loadedInterfaces[var0] = true; + return true; + } else { + if (PacketBufferNode.Widget_interfaceComponents[var0] == null) { + PacketBufferNode.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { + if (PacketBufferNode.Widget_interfaceComponents[var0][var2] == null) { + byte[] var3 = Decimator.Widget_archive.takeFile(var0, var2); + if (var3 != null) { + PacketBufferNode.Widget_interfaceComponents[var0][var2] = new Widget(); + PacketBufferNode.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); + if (var3[0] == -1) { + PacketBufferNode.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + PacketBufferNode.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); + } + } + } + } + + class316.Widget_loadedInterfaces[var0] = true; + return true; + } + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(III)Ldh;", + garbageValue = "-305798584" + ) + static Script method1981(int var0, int var1) { + Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); + if (var2 != null) { + return var2; + } else { + String var3 = String.valueOf(var0); + int var4 = GrandExchangeOffer.archive12.getGroupId(var3); + if (var4 == -1) { + return null; + } else { + byte[] var5 = GrandExchangeOffer.archive12.takeFileFlat(var4); + if (var5 != null) { + if (var5.length <= 1) { + return null; + } + + var2 = HitSplatDefinition.newScript(var5); + if (var2 != null) { + Script.Script_cached.put(var2, (long)(var0 << 16)); + return var2; + } + } + + return null; + } + } + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Lch;I)V", + garbageValue = "516890386" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + boolean var1 = var0.isMembersOnly(); + if (var1 != ItemComposition.ItemDefinition_inMembersWorld) { + ItemComposition.ItemDefinition_cached.clear(); + ItemComposition.ItemDefinition_cachedModels.clear(); + ItemComposition.ItemDefinition_cachedSprites.clear(); + ItemComposition.ItemDefinition_inMembersWorld = var1; + } + } + + if (var0.properties != Client.worldProperties) { + Archive var3 = PcmPlayer.archive8; + int var2 = var0.properties; + if ((var2 & class510.field4132.rsOrdinal()) != 0) { + SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var3, "logo_deadman_mode", ""); + } else if ((var2 & class510.field4131.rsOrdinal()) != 0) { + SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var3, "logo_seasonal_mode", ""); + } else if ((var2 & class510.field4122.rsOrdinal()) != 0) { + SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var3, "logo_speedrunning", ""); + } else { + SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var3, "logo", ""); + } + } + + class292.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + class30.field83 = var0.field679; + class480.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + class129.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; + class4.currentPort = class480.worldPort; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Model.java b/osrs/src/main/java/Model.java index 4c3b4cfa3..a5a5e0b51 100644 --- a/osrs/src/main/java/Model.java +++ b/osrs/src/main/java/Model.java @@ -1,250 +1,251 @@ -import java.util.Arrays; -import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jo") +import java.util.Arrays; +import java.util.HashMap; + +@ObfuscatedName("jr") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ljo;" + descriptor = "Ljr;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ljo;" + descriptor = "Ljr;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lrm;" + descriptor = "Lrz;" ) - static class451 field2182; - @ObfuscatedName("aj") + static class450 field2204; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lrm;" + descriptor = "Lrz;" ) - static class451 field2181; - @ObfuscatedName("ag") + static class450 field2205; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lrm;" + descriptor = "Lrz;" ) - static class451 field2180; - @ObfuscatedName("bc") - static boolean[] field2149; - @ObfuscatedName("bi") - static boolean[] field2150; + static class450 field2206; + @ObfuscatedName("bp") + static boolean[] field2173; @ObfuscatedName("bu") + static boolean[] field2174; + @ObfuscatedName("bo") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("bk") + @ObfuscatedName("bb") @Export("modelViewportYs") static int[] modelViewportYs; + @ObfuscatedName("br") + static float[] field2179; + @ObfuscatedName("be") + static int[] field2185; + @ObfuscatedName("bi") + static int[] field2187; @ObfuscatedName("bz") - static float[] field2155; + static int[] field2190; @ObfuscatedName("bx") - static int[] field2166; - @ObfuscatedName("bh") - static int[] field2160; - @ObfuscatedName("bm") - static int[] field2164; - @ObfuscatedName("bl") - static int[] field2163; - @ObfuscatedName("by") - static char[] field2153; + static int[] field2189; + @ObfuscatedName("bw") + static char[] field2177; + @ObfuscatedName("bc") + static char[][] field2178; @ObfuscatedName("bg") - static char[][] field2154; - @ObfuscatedName("bj") - static int[] field2161; - @ObfuscatedName("ct") - static int[][] field2177; + static int[] field2186; + @ObfuscatedName("cw") + static int[][] field2201; @ObfuscatedName("cf") - static int[] field2169; - @ObfuscatedName("cz") - @Export("Model_transformTempX") - static int Model_transformTempX; - @ObfuscatedName("cb") - static int[] field2167; - @ObfuscatedName("cs") - static int[] field2173; - @ObfuscatedName("cj") - static int[] field2170; + static int[] field2192; + @ObfuscatedName("cm") + static int[] field2195; @ObfuscatedName("cn") - static int[] field2171; - @ObfuscatedName("cw") - static int[] field2175; + static int[] field2196; + @ObfuscatedName("cs") + static int[] field2198; + @ObfuscatedName("cx") + static int[] field2200; + @ObfuscatedName("cr") + static int[] field2197; + @ObfuscatedName("cd") + static float[] field2180; @ObfuscatedName("ce") - static float[] field2156; + @Export("Model_transformTempX") + static int Model_transformTempX; @ObfuscatedName("cq") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("cm") + @ObfuscatedName("cp") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("ca") - static boolean field2148; + @ObfuscatedName("cv") + static boolean field2172; @ObfuscatedName("cu") - static int[] field2174; - @ObfuscatedName("cr") - static int[] field2172; - @ObfuscatedName("cd") - static int[] field2168; - @ObfuscatedName("cy") - static int[] field2176; - @ObfuscatedName("cp") - static final float field2183; - @ObfuscatedName("az") + static int[] field2199; + @ObfuscatedName("ch") + static int[] field2193; + @ObfuscatedName("ci") + static int[] field2194; + @ObfuscatedName("ca") + static int[] field2191; + @ObfuscatedName("cj") + static final float field2207; + @ObfuscatedName("ap") @Export("verticesCount") public int verticesCount; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("verticesX") int[] verticesX; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("verticesY") int[] verticesY; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("indicesCount") public int indicesCount; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("indices1") int[] indices1; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("indices2") int[] indices2; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("indices3") int[] indices3; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("ac") - byte[] field2184; - @ObfuscatedName("ak") + @ObfuscatedName("as") + byte[] field2209; + @ObfuscatedName("ay") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("an") - public byte field2211; - @ObfuscatedName("af") - public int field2216; - @ObfuscatedName("ai") - int[] field2196; - @ObfuscatedName("al") - int[] field2197; - @ObfuscatedName("bd") - int[] field2203; - @ObfuscatedName("bb") + @ObfuscatedName("aj") + public byte field2235; + @ObfuscatedName("av") + public int field2242; + @ObfuscatedName("aw") + int[] field2226; + @ObfuscatedName("ak") + int[] field2221; + @ObfuscatedName("bh") + int[] field2227; + @ObfuscatedName("bj") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("ba") - int[][] field2204; - @ObfuscatedName("bf") - int[][] field2206; - @ObfuscatedName("bs") + @ObfuscatedName("bv") + int[][] field2231; + @ObfuscatedName("bt") + int[][] field2230; + @ObfuscatedName("bd") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("boundsType") int boundsType; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("bottomY") int bottomY; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("xzRadius") int xzRadius; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @Export("diameter") int diameter; - @ObfuscatedName("br") + @ObfuscatedName("bq") @Export("radius") int radius; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("aabb") HashMap aabb; - @ObfuscatedName("ch") + @ObfuscatedName("cz") @Export("overrideHue") public byte overrideHue; - @ObfuscatedName("cg") + @ObfuscatedName("ct") @Export("overrideSaturation") public byte overrideSaturation; - @ObfuscatedName("ci") + @ObfuscatedName("cy") @Export("overrideLuminance") public byte overrideLuminance; - @ObfuscatedName("cv") + @ObfuscatedName("ck") @Export("overrideAmount") public byte overrideAmount; @ObfuscatedName("cc") - public short field2219; + public short field2243; static { Model_sharedSequenceModel = new Model(); Model_sharedSequenceModelFaceAlphas = new byte[1]; Model_sharedSpotAnimationModel = new Model(); Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; - field2182 = new class451(); - field2181 = new class451(); - field2180 = new class451(); - field2149 = new boolean[6500]; - field2150 = new boolean[6500]; + field2204 = new class450(); + field2205 = new class450(); + field2206 = new class450(); + field2173 = new boolean[6500]; + field2174 = new boolean[6500]; modelViewportXs = new int[6500]; modelViewportYs = new int[6500]; - field2155 = new float[6500]; - field2166 = new int[6500]; - field2160 = new int[6500]; - field2164 = new int[6500]; - field2163 = new int[6500]; - field2153 = new char[6000]; - field2154 = new char[6000][512]; - field2161 = new int[12]; - field2177 = new int[12][2000]; - field2169 = new int[2000]; - field2167 = new int[2000]; - field2173 = new int[12]; - field2170 = new int[10]; - field2171 = new int[10]; - field2175 = new int[10]; - field2156 = new float[10]; - field2148 = true; - field2174 = Rasterizer3D.Rasterizer3D_sine; - field2172 = Rasterizer3D.Rasterizer3D_cosine; - field2168 = Rasterizer3D.Rasterizer3D_colorPalette; - field2176 = Rasterizer3D.field2014; - field2183 = Strings.method1841(50); + field2179 = new float[6500]; + field2185 = new int[6500]; + field2187 = new int[6500]; + field2190 = new int[6500]; + field2189 = new int[6500]; + field2177 = new char[6000]; + field2178 = new char[6000][512]; + field2186 = new int[12]; + field2201 = new int[12][2000]; + field2192 = new int[2000]; + field2195 = new int[2000]; + field2196 = new int[12]; + field2198 = new int[10]; + field2200 = new int[10]; + field2197 = new int[10]; + field2180 = new float[10]; + field2172 = true; + field2199 = Rasterizer3D.Rasterizer3D_sine; + field2193 = Rasterizer3D.Rasterizer3D_cosine; + field2194 = Rasterizer3D.Rasterizer3D_colorPalette; + field2191 = Rasterizer3D.field2037; + field2207 = AbstractWorldMapIcon.method1556(50); } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2211 = 0; - this.field2216 = 0; + this.field2235 = 0; + this.field2242 = 0; this.isSingleTile = false; this.aabb = new HashMap(); } @@ -252,31 +253,31 @@ public class Model extends Renderable { public Model(int var1, int var2, int var3, byte var4) { this.verticesCount = 0; this.indicesCount = 0; - this.field2211 = 0; - this.field2216 = 0; + this.field2235 = 0; + this.field2242 = 0; this.isSingleTile = false; this.aabb = new HashMap(); - this.method1283(var1, var2, var3); - this.field2211 = var4; + this.method1312(var1, var2, var3); + this.field2235 = var4; this.verticesCount = 0; this.indicesCount = 0; - this.field2216 = 0; + this.field2242 = 0; } @ObfuscatedSignature( - descriptor = "([Ljo;I)V" + descriptor = "([Ljr;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; - this.field2211 = 0; - this.field2216 = 0; + this.field2235 = 0; + this.field2242 = 0; this.isSingleTile = false; this.aabb = new HashMap(); this.verticesCount = 0; this.indicesCount = 0; - this.field2216 = 0; - this.field2211 = -1; + this.field2242 = 0; + this.field2235 = -1; int var3; for (var3 = 0; var3 < var2; ++var3) { @@ -284,26 +285,26 @@ public Model(Model[] var1, int var2) { if (var4 != null) { this.verticesCount += var4.verticesCount; this.indicesCount += var4.indicesCount; - this.field2216 += var4.field2216; - if (this.field2211 == -1) { - this.field2211 = var4.field2211; + this.field2242 += var4.field2242; + if (this.field2235 == -1) { + this.field2235 = var4.field2235; } } } - this.method1283(this.verticesCount, this.indicesCount, this.field2216); + this.method1312(this.verticesCount, this.indicesCount, this.field2242); this.verticesCount = 0; this.indicesCount = 0; - this.field2216 = 0; + this.field2242 = 0; for (var3 = 0; var3 < var2; ++var3) { - this.method1285(var1[var3]); + this.method1314(var1[var3]); } } - @ObfuscatedName("aw") - void method1283(int var1, int var2, int var3) { + @ObfuscatedName("au") + void method1312(int var1, int var2, int var3) { this.verticesX = new int[var1]; this.verticesY = new int[var1]; this.verticesZ = new int[var1]; @@ -314,22 +315,22 @@ void method1283(int var1, int var2, int var3) { this.faceColors2 = new int[var2]; this.faceColors3 = new int[var2]; if (var3 > 0) { - this.field2196 = new int[var3]; - this.field2197 = new int[var3]; - this.field2203 = new int[var3]; + this.field2226 = new int[var3]; + this.field2221 = new int[var3]; + this.field2227 = new int[var3]; } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljo;)V" + descriptor = "(Ljr;)V" ) - void method1284(Model var1) { + void method1313(Model var1) { int var2 = this.indices1.length; - if (this.faceRenderPriorities == null && (var1.faceRenderPriorities != null || this.field2211 != var1.field2211)) { + if (this.faceRenderPriorities == null && (var1.faceRenderPriorities != null || this.field2235 != var1.field2235)) { this.faceRenderPriorities = new byte[var2]; - Arrays.fill(this.faceRenderPriorities, this.field2211); + Arrays.fill(this.faceRenderPriorities, this.field2235); } if (this.faceAlphas == null && var1.faceAlphas != null) { @@ -342,20 +343,20 @@ void method1284(Model var1) { Arrays.fill(this.faceTextures, (short)-1); } - if (this.field2184 == null && var1.field2184 != null) { - this.field2184 = new byte[var2]; - Arrays.fill(this.field2184, (byte)-1); + if (this.field2209 == null && var1.field2209 != null) { + this.field2209 = new byte[var2]; + Arrays.fill(this.field2209, (byte)-1); } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljo;)V" + descriptor = "(Ljr;)V" ) - public void method1285(Model var1) { + public void method1314(Model var1) { if (var1 != null) { - this.method1284(var1); + this.method1313(var1); int var2; for (var2 = 0; var2 < var1.indicesCount; ++var2) { @@ -366,7 +367,7 @@ public void method1285(Model var1) { this.faceColors2[this.indicesCount] = var1.faceColors2[var2]; this.faceColors3[this.indicesCount] = var1.faceColors3[var2]; if (this.faceRenderPriorities != null) { - this.faceRenderPriorities[this.indicesCount] = var1.faceRenderPriorities != null ? var1.faceRenderPriorities[var2] : var1.field2211; + this.faceRenderPriorities[this.indicesCount] = var1.faceRenderPriorities != null ? var1.faceRenderPriorities[var2] : var1.field2235; } if (this.faceAlphas != null && var1.faceAlphas != null) { @@ -377,22 +378,22 @@ public void method1285(Model var1) { this.faceTextures[this.indicesCount] = var1.faceTextures != null ? var1.faceTextures[var2] : -1; } - if (this.field2184 != null) { - if (var1.field2184 != null && var1.field2184[var2] != -1) { - this.field2184[this.indicesCount] = (byte)(var1.field2184[var2] + this.field2216); + if (this.field2209 != null) { + if (var1.field2209 != null && var1.field2209[var2] != -1) { + this.field2209[this.indicesCount] = (byte)(var1.field2209[var2] + this.field2242); } else { - this.field2184[this.indicesCount] = -1; + this.field2209[this.indicesCount] = -1; } } ++this.indicesCount; } - for (var2 = 0; var2 < var1.field2216; ++var2) { - this.field2196[this.field2216] = this.verticesCount + var1.field2196[var2]; - this.field2197[this.field2216] = this.verticesCount + var1.field2197[var2]; - this.field2203[this.field2216] = this.verticesCount + var1.field2203[var2]; - ++this.field2216; + for (var2 = 0; var2 < var1.field2242; ++var2) { + this.field2226[this.field2242] = this.verticesCount + var1.field2226[var2]; + this.field2221[this.field2242] = this.verticesCount + var1.field2221[var2]; + this.field2227[this.field2242] = this.verticesCount + var1.field2227[var2]; + ++this.field2242; } for (var2 = 0; var2 < var1.verticesCount; ++var2) { @@ -405,9 +406,9 @@ public void method1285(Model var1) { } } - @ObfuscatedName("as") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Ljo;" + descriptor = "([[IIIIZI)Ljr;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -429,7 +430,7 @@ public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean v var11 = new Model(); var11.verticesCount = this.verticesCount; var11.indicesCount = this.indicesCount; - var11.field2216 = this.field2216; + var11.field2242 = this.field2242; var11.verticesX = this.verticesX; var11.verticesZ = this.verticesZ; var11.indices1 = this.indices1; @@ -440,12 +441,12 @@ public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean v var11.faceColors3 = this.faceColors3; var11.faceRenderPriorities = this.faceRenderPriorities; var11.faceAlphas = this.faceAlphas; - var11.field2184 = this.field2184; + var11.field2209 = this.field2209; var11.faceTextures = this.faceTextures; - var11.field2211 = this.field2211; - var11.field2196 = this.field2196; - var11.field2197 = this.field2197; - var11.field2203 = this.field2203; + var11.field2235 = this.field2235; + var11.field2226 = this.field2226; + var11.field2221 = this.field2221; + var11.field2227 = this.field2227; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; var11.isSingleTile = this.isSingleTile; @@ -503,9 +504,9 @@ public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean v } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Z)Ljo;" + descriptor = "(Z)Ljr;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -516,10 +517,11 @@ public Model toSharedSequenceModel(boolean var1) { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Z)Ljo;" + descriptor = "(Z)Ljr;" ) + @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100]; @@ -528,15 +530,15 @@ public Model toSharedSpotAnimationModel(boolean var1) { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(ZLjo;[B)Ljo;" + descriptor = "(ZLjr;[B)Ljr;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.field2216 = this.field2216; + var2.field2242 = this.field2242; if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { var2.verticesX = new int[this.verticesCount + 100]; var2.verticesY = new int[this.verticesCount + 100]; @@ -572,23 +574,23 @@ Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.faceColors2 = this.faceColors2; var2.faceColors3 = this.faceColors3; var2.faceRenderPriorities = this.faceRenderPriorities; - var2.field2184 = this.field2184; + var2.field2209 = this.field2209; var2.faceTextures = this.faceTextures; - var2.field2211 = this.field2211; - var2.field2196 = this.field2196; - var2.field2197 = this.field2197; - var2.field2203 = this.field2203; + var2.field2235 = this.field2235; + var2.field2226 = this.field2226; + var2.field2221 = this.field2221; + var2.field2227 = this.field2227; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; - var2.field2204 = this.field2204; - var2.field2206 = this.field2206; + var2.field2231 = this.field2231; + var2.field2230 = this.field2230; var2.isSingleTile = this.isSingleTile; var2.resetBounds(); var2.overrideAmount = 0; return var2; } - @ObfuscatedName("ap") + @ObfuscatedName("ad") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (!this.aabb.containsKey(var1)) { @@ -598,15 +600,17 @@ void calculateBoundingBox(int var1) { int var5 = 0; int var6 = 0; int var7 = 0; - int var8 = field2172[var1]; - int var9 = field2174[var1]; + int var8 = field2193[var1]; + int var9 = field2199[var1]; for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var11 = LoginScreenAnimation.method534(this.verticesX[var10], this.verticesZ[var10], var8, var9); - int var12 = this.verticesY[var10]; - int var14 = this.verticesX[var10]; - int var15 = this.verticesZ[var10]; - int var13 = var15 * var8 - var14 * var9 >> 16; + int var12 = this.verticesX[var10]; + int var13 = this.verticesZ[var10]; + int var11 = var12 * var8 + var13 * var9 >> 16; + int var15 = this.verticesY[var10]; + int var17 = this.verticesX[var10]; + int var18 = this.verticesZ[var10]; + int var16 = var18 * var8 - var9 * var17 >> 16; if (var11 < var2) { var2 = var11; } @@ -615,40 +619,40 @@ void calculateBoundingBox(int var1) { var5 = var11; } - if (var12 < var3) { - var3 = var12; + if (var15 < var3) { + var3 = var15; } - if (var12 > var6) { - var6 = var12; + if (var15 > var6) { + var6 = var15; } - if (var13 < var4) { - var4 = var13; + if (var16 < var4) { + var4 = var16; } - if (var13 > var7) { - var7 = var13; + if (var16 > var7) { + var7 = var16; } } - AABB var17 = new AABB((var5 + var2) / 2, (var6 + var3) / 2, (var7 + var4) / 2, (var5 - var2 + 1) / 2, (var6 - var3 + 1) / 2, (var7 - var4 + 1) / 2); - boolean var18 = true; - if (var17.xMidOffset < 32) { - var17.xMidOffset = 32; + AABB var20 = new AABB((var5 + var2) / 2, (var6 + var3) / 2, (var7 + var4) / 2, (var5 - var2 + 1) / 2, (var6 - var3 + 1) / 2, (var7 - var4 + 1) / 2); + boolean var21 = true; + if (var20.xMidOffset < 32) { + var20.xMidOffset = 32; } - if (var17.zMidOffset < 32) { - var17.zMidOffset = 32; + if (var20.zMidOffset < 32) { + var20.zMidOffset = 32; } if (this.isSingleTile) { - boolean var19 = true; - var17.xMidOffset += 8; - var17.zMidOffset += 8; + boolean var22 = true; + var20.xMidOffset += 8; + var20.zMidOffset += 8; } - this.aabb.put(var1, var17); + this.aabb.put(var1, var20); } } @@ -685,8 +689,8 @@ public void calculateBoundsCylinder() { } } - @ObfuscatedName("at") - void method1292() { + @ObfuscatedName("al") + void method1321() { if (this.boundsType != 2) { this.boundsType = 2; this.xzRadius = 0; @@ -707,22 +711,22 @@ void method1292() { } } - @ObfuscatedName("ah") - public int method1293() { + @ObfuscatedName("an") + public int method1322() { this.calculateBoundsCylinder(); return this.xzRadius; } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @Export("resetBounds") public void resetBounds() { this.boundsType = 0; this.aabb.clear(); } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljm;I)V" + descriptor = "(Ljt;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -744,36 +748,36 @@ public void animate(Frames var1, int var2) { } } - @ObfuscatedName("au") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lfz;I)V" + descriptor = "(Lfv;I)V" ) - public void method1296(class137 var1, int var2) { - Skeleton var3 = var1.field1294; - class228 var4 = var3.method1207(); + public void method1325(class137 var1, int var2) { + Skeleton var3 = var1.field1305; + class227 var4 = var3.method1231(); if (var4 != null) { - var3.method1207().method1193(var1, var2); - this.method1298(var3.method1207(), var1.method736()); + var3.method1231().method1216(var1, var2); + this.method1327(var3.method1231(), var1.method747()); } - if (var1.method737()) { - this.method1297(var1, var2); + if (var1.method748()) { + this.method1326(var1, var2); } this.resetBounds(); } - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lfz;I)V" + descriptor = "(Lfv;I)V" ) - void method1297(class137 var1, int var2) { - Skeleton var3 = var1.field1294; + void method1326(class137 var1, int var2) { + Skeleton var3 = var1.field1305; for (int var4 = 0; var4 < var3.count; ++var4) { int var5 = var3.transformTypes[var4]; - if (var5 == 5 && var1.field1293 != null && var1.field1293[var4] != null && var1.field1293[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { - class130 var6 = var1.field1293[var4][0]; + if (var5 == 5 && var1.field1304 != null && var1.field1304[var4] != null && var1.field1304[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { + class130 var6 = var1.field1304[var4][0]; int[] var7 = var3.labels[var4]; int var8 = var7.length; @@ -784,7 +788,7 @@ void method1297(class137 var1, int var2) { for (int var12 = 0; var12 < var11.length; ++var12) { int var13 = var11[var12]; - int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method711(var2) * 255.0F); + int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method720(var2) * 255.0F); if (var14 < 0) { var14 = 0; } else if (var14 > 255) { @@ -800,17 +804,17 @@ void method1297(class137 var1, int var2) { } - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Liv;I)V" + descriptor = "(Lim;I)V" ) - void method1298(class228 var1, int var2) { - this.method1318(var1, var2); + void method1327(class227 var1, int var2) { + this.method1347(var1, var2); } - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljm;ILjm;I[I)V" + descriptor = "(Ljt;ILjt;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -860,30 +864,30 @@ public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { } } - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lik;Lfz;I[ZZZ)V" + descriptor = "(Liu;Lfv;I[ZZZ)V" ) - public void method1300(Skeleton var1, class137 var2, int var3, boolean[] var4, boolean var5, boolean var6) { - class228 var7 = var1.method1207(); + public void method1329(Skeleton var1, class137 var2, int var3, boolean[] var4, boolean var5, boolean var6) { + class227 var7 = var1.method1231(); if (var7 != null) { - var7.method1194(var2, var3, var4, var5); + var7.method1217(var2, var3, var4, var5); if (var6) { - this.method1298(var7, var2.method736()); + this.method1327(var7, var2.method747()); } } - if (!var5 && var2.method737()) { - this.method1297(var2, var3); + if (!var5 && var2.method748()) { + this.method1326(var2, var3); } } - @ObfuscatedName("ac") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Ljm;I[IZ)V" + descriptor = "(Ljt;I[IZ)V" ) - public void method1301(Frames var1, int var2, int[] var3, boolean var4) { + public void method1330(Frames var1, int var2, int[] var3, boolean var4) { if (var3 == null) { this.animate(var1, var2); } else { @@ -913,7 +917,7 @@ public void method1301(Frames var1, int var2, int[] var3, boolean var4) { } } - @ObfuscatedName("ak") + @ObfuscatedName("aj") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; @@ -995,24 +999,24 @@ void transform(int var1, int[] var2, int var3, int var4, int var5) { int var16; int var17; if (var14 != 0) { - var15 = field2174[var14]; - var16 = field2172[var14]; + var15 = field2199[var14]; + var16 = field2193[var14]; var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; this.verticesX[var11] = var17; } if (var12 != 0) { - var15 = field2174[var12]; - var16 = field2172[var12]; + var15 = field2199[var12]; + var16 = field2193[var12]; var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; this.verticesY[var11] = var17; } if (var13 != 0) { - var15 = field2174[var13]; - var16 = field2172[var13]; + var15 = field2199[var13]; + var16 = field2193[var13]; var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; this.verticesX[var11] = var17; @@ -1081,7 +1085,7 @@ void transform(int var1, int[] var2, int var3, int var4, int var5) { } } - @ObfuscatedName("an") + @ObfuscatedName("av") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -1093,7 +1097,7 @@ public void rotateY90Ccw() { this.resetBounds(); } - @ObfuscatedName("af") + @ObfuscatedName("aw") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -1104,7 +1108,7 @@ public void rotateY180() { this.resetBounds(); } - @ObfuscatedName("ai") + @ObfuscatedName("ak") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -1116,11 +1120,11 @@ public void rotateY270Ccw() { this.resetBounds(); } - @ObfuscatedName("al") + @ObfuscatedName("bh") @Export("rotateZ") public void rotateZ(int var1) { - int var2 = field2174[var1]; - int var3 = field2172[var1]; + int var2 = field2199[var1]; + int var3 = field2193[var1]; for (int var4 = 0; var4 < this.verticesCount; ++var4) { int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; @@ -1131,7 +1135,7 @@ public void rotateZ(int var1) { this.resetBounds(); } - @ObfuscatedName("bd") + @ObfuscatedName("bj") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1146,7 +1150,7 @@ public void offsetBy(int var1, int var2, int var3) { this.resetBounds(); } - @ObfuscatedName("bb") + @ObfuscatedName("bk") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1158,22 +1162,22 @@ public void scale(int var1, int var2, int var3) { this.resetBounds(); } - @ObfuscatedName("bn") - public final void method1309(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + @ObfuscatedName("bv") + public final void method1338(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (this.boundsType != 2 && this.boundsType != 1) { - this.method1292(); + this.method1321(); } int var8 = Rasterizer3D.getClipMidX(); int var9 = Rasterizer3D.getClipMidY(); - int var10 = field2174[var1]; - int var11 = field2172[var1]; - int var12 = field2174[var2]; - int var13 = field2172[var2]; - int var14 = field2174[var3]; - int var15 = field2172[var3]; - int var16 = field2174[var4]; - int var17 = field2172[var4]; + int var10 = field2199[var1]; + int var11 = field2193[var1]; + int var12 = field2199[var2]; + int var13 = field2193[var2]; + int var14 = field2199[var3]; + int var15 = field2193[var3]; + int var16 = field2199[var4]; + int var17 = field2193[var4]; int var18 = var16 * var6 + var17 * var7 >> 16; for (int var19 = 0; var19 < this.verticesCount; ++var19) { @@ -1204,14 +1208,14 @@ public final void method1309(int var1, int var2, int var3, int var4, int var5, i var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - field2166[var19] = var22 - var18; + field2185[var19] = var22 - var18; modelViewportXs[var19] = var8 + var20 * Rasterizer3D.get3dZoom() / var22; modelViewportYs[var19] = var9 + var23 * Rasterizer3D.get3dZoom() / var22; - field2155[var19] = Strings.method1841(var22); - if (this.field2216 > 0) { - field2160[var19] = var20; - field2164[var19] = var23; - field2163[var19] = var22; + field2179[var19] = AbstractWorldMapIcon.method1556(var22); + if (this.field2242 > 0) { + field2187[var19] = var20; + field2190[var19] = var23; + field2189[var19] = var22; } } @@ -1222,22 +1226,22 @@ public final void method1309(int var1, int var2, int var3, int var4, int var5, i } - @ObfuscatedName("ba") - public final void method1310(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("bt") + public final void method1339(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (this.boundsType != 2 && this.boundsType != 1) { - this.method1292(); + this.method1321(); } int var9 = Rasterizer3D.getClipMidX(); int var10 = Rasterizer3D.getClipMidY(); - int var11 = field2174[var1]; - int var12 = field2172[var1]; - int var13 = field2174[var2]; - int var14 = field2172[var2]; - int var15 = field2174[var3]; - int var16 = field2172[var3]; - int var17 = field2174[var4]; - int var18 = field2172[var4]; + int var11 = field2199[var1]; + int var12 = field2193[var1]; + int var13 = field2199[var2]; + int var14 = field2193[var2]; + int var15 = field2199[var3]; + int var16 = field2193[var3]; + int var17 = field2199[var4]; + int var18 = field2193[var4]; int var19 = var17 * var6 + var18 * var7 >> 16; for (int var20 = 0; var20 < this.verticesCount; ++var20) { @@ -1268,14 +1272,14 @@ public final void method1310(int var1, int var2, int var3, int var4, int var5, i var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - field2166[var20] = var23 - var19; + field2185[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.get3dZoom() / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.get3dZoom() / var8; - field2155[var20] = Strings.method1841(var8); - if (this.field2216 > 0) { - field2160[var20] = var21; - field2164[var20] = var24; - field2163[var20] = var23; + field2179[var20] = AbstractWorldMapIcon.method1556(var8); + if (this.field2242 > 0) { + field2187[var20] = var21; + field2190[var20] = var24; + field2189[var20] = var23; } } @@ -1286,13 +1290,13 @@ public final void method1310(int var1, int var2, int var3, int var4, int var5, i } - @ObfuscatedName("bf") + @ObfuscatedName("bd") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { if (this.diameter < 6000) { int var6; for (var6 = 0; var6 < this.diameter; ++var6) { - field2153[var6] = 0; + field2177[var6] = 0; } var6 = var3 ? 20 : 5; @@ -1351,27 +1355,27 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { } if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { - field2150[var7] = false; - var14 = Rasterizer3D.method1174(); + field2174[var7] = false; + var14 = Rasterizer3D.method1197(); if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= var14 && var12 <= var14 && var13 <= var14) { - field2149[var7] = false; + field2173[var7] = false; } else { - field2149[var7] = true; + field2173[var7] = true; } - var15 = (field2166[var8] + field2166[var9] + field2166[var10]) / 3 + this.radius; - field2154[var15][field2153[var15]++] = var7; + var15 = (field2185[var8] + field2185[var9] + field2185[var10]) / 3 + this.radius; + field2178[var15][field2177[var15]++] = var7; } } else { - var14 = field2160[var8]; - var15 = field2160[var9]; - var16 = field2160[var10]; - var17 = field2164[var8]; - var18 = field2164[var9]; - int var19 = field2164[var10]; - int var20 = field2163[var8]; - int var21 = field2163[var9]; - int var22 = field2163[var10]; + var14 = field2187[var8]; + var15 = field2187[var9]; + var16 = field2187[var10]; + var17 = field2190[var8]; + var18 = field2190[var9]; + int var19 = field2190[var10]; + int var20 = field2189[var8]; + int var21 = field2189[var9]; + int var22 = field2189[var10]; var14 -= var15; var16 -= var15; var17 -= var18; @@ -1382,9 +1386,9 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { int var24 = var20 * var16 - var14 * var22; int var25 = var14 * var19 - var17 * var16; if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field2150[var7] = true; - int var26 = (field2166[var8] + field2166[var9] + field2166[var10]) / 3 + this.radius; - field2154[var26][field2153[var26]++] = var7; + field2174[var7] = true; + int var26 = (field2185[var8] + field2185[var9] + field2185[var10]) / 3 + this.radius; + field2178[var26][field2177[var26]++] = var7; } } } @@ -1395,9 +1399,9 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { char var34; if (this.faceRenderPriorities == null) { for (var33 = this.diameter - 1; var33 >= 0; --var33) { - var34 = field2153[var33]; + var34 = field2177[var33]; if (var34 > 0) { - var29 = field2154[var33]; + var29 = field2178[var33]; for (var10 = 0; var10 < var34; ++var10) { this.drawFace(var29[var10]); @@ -1407,56 +1411,56 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { } else { for (var33 = 0; var33 < 12; ++var33) { - field2161[var33] = 0; - field2173[var33] = 0; + field2186[var33] = 0; + field2196[var33] = 0; } for (var33 = this.diameter - 1; var33 >= 0; --var33) { - var34 = field2153[var33]; + var34 = field2177[var33]; if (var34 > 0) { - var29 = field2154[var33]; + var29 = field2178[var33]; for (var10 = 0; var10 < var34; ++var10) { char var35 = var29[var10]; byte var36 = this.faceRenderPriorities[var35]; - var13 = field2161[var36]++; - field2177[var36][var13] = var35; + var13 = field2186[var36]++; + field2201[var36][var13] = var35; if (var36 < 10) { - int[] var38 = field2173; + int[] var38 = field2196; var38[var36] += var33; } else if (var36 == 10) { - field2169[var13] = var33; + field2192[var13] = var33; } else { - field2167[var13] = var33; + field2195[var13] = var33; } } } } var33 = 0; - if (field2161[1] > 0 || field2161[2] > 0) { - var33 = (field2173[1] + field2173[2]) / (field2161[1] + field2161[2]); + if (field2186[1] > 0 || field2186[2] > 0) { + var33 = (field2196[1] + field2196[2]) / (field2186[1] + field2186[2]); } var8 = 0; - if (field2161[3] > 0 || field2161[4] > 0) { - var8 = (field2173[3] + field2173[4]) / (field2161[3] + field2161[4]); + if (field2186[3] > 0 || field2186[4] > 0) { + var8 = (field2196[3] + field2196[4]) / (field2186[3] + field2186[4]); } var9 = 0; - if (field2161[6] > 0 || field2161[8] > 0) { - var9 = (field2173[8] + field2173[6]) / (field2161[8] + field2161[6]); + if (field2186[6] > 0 || field2186[8] > 0) { + var9 = (field2196[8] + field2196[6]) / (field2186[8] + field2186[6]); } var11 = 0; - var12 = field2161[10]; - int[] var30 = field2177[10]; - int[] var31 = field2169; + var12 = field2186[10]; + int[] var30 = field2201[10]; + int[] var31 = field2192; if (var11 == var12) { var11 = 0; - var12 = field2161[11]; - var30 = field2177[11]; - var31 = field2167; + var12 = field2186[11]; + var30 = field2201[11]; + var31 = field2195; } if (var11 < var12) { @@ -1468,11 +1472,11 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { for (var15 = 0; var15 < 10; ++var15) { while (var15 == 0 && var10 > var33) { this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field2177[11]) { + if (var11 == var12 && var30 != field2201[11]) { var11 = 0; - var12 = field2161[11]; - var30 = field2177[11]; - var31 = field2167; + var12 = field2186[11]; + var30 = field2201[11]; + var31 = field2195; } if (var11 < var12) { @@ -1484,11 +1488,11 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { while (var15 == 3 && var10 > var8) { this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field2177[11]) { + if (var11 == var12 && var30 != field2201[11]) { var11 = 0; - var12 = field2161[11]; - var30 = field2177[11]; - var31 = field2167; + var12 = field2186[11]; + var30 = field2201[11]; + var31 = field2195; } if (var11 < var12) { @@ -1500,11 +1504,11 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { while (var15 == 5 && var10 > var9) { this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field2177[11]) { + if (var11 == var12 && var30 != field2201[11]) { var11 = 0; - var12 = field2161[11]; - var30 = field2177[11]; - var31 = field2167; + var12 = field2186[11]; + var30 = field2201[11]; + var31 = field2195; } if (var11 < var12) { @@ -1514,8 +1518,8 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { } } - var16 = field2161[var15]; - int[] var32 = field2177[var15]; + var16 = field2186[var15]; + int[] var32 = field2201[var15]; for (var18 = 0; var18 < var16; ++var18) { this.drawFace(var32[var18]); @@ -1524,11 +1528,11 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { while (var10 != -1000) { this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field2177[11]) { + if (var11 == var12 && var30 != field2201[11]) { var11 = 0; - var30 = field2177[11]; - var12 = field2161[11]; - var31 = field2167; + var30 = field2201[11]; + var12 = field2186[11]; + var31 = field2195; } if (var11 < var12) { @@ -1542,42 +1546,42 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { } } - @ObfuscatedName("bs") + @ObfuscatedName("by") @Export("drawFace") final void drawFace(int var1) { - if (field2150[var1]) { - this.method1316(var1); + if (field2174[var1]) { + this.method1345(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.clips.field2241 = field2149[var1]; + Rasterizer3D.clips.field2268 = field2173[var1]; if (this.faceAlphas == null) { - Rasterizer3D.clips.field2248 = 0; + Rasterizer3D.clips.field2275 = 0; } else { - Rasterizer3D.clips.field2248 = (this.faceAlphas[var1] == -1 ? 253 : this.faceAlphas[var1]) & 255; + Rasterizer3D.clips.field2275 = (this.faceAlphas[var1] == -1 ? 253 : this.faceAlphas[var1]) & 255; } - this.method1315(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2155[var2], field2155[var3], field2155[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + this.method1344(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2179[var2], field2179[var3], field2179[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } - @ObfuscatedName("bp") - boolean method1314(int var1) { - return this.overrideAmount > 0 && var1 < this.field2219; + @ObfuscatedName("bs") + boolean method1343(int var1) { + return this.overrideAmount > 0 && var1 < this.field2243; } - @ObfuscatedName("bv") - final void method1315(int var1, int var2, int var3, int var4, int var5, int var6, int var7, float var8, float var9, float var10, int var11, int var12, int var13) { + @ObfuscatedName("bm") + final void method1344(int var1, int var2, int var3, int var4, int var5, int var6, int var7, float var8, float var9, float var10, int var11, int var12, int var13) { if (this.faceTextures != null && this.faceTextures[var1] != -1) { int var15; int var16; int var18; - if (this.field2184 != null && this.field2184[var1] != -1) { - int var17 = this.field2184[var1] & 255; - var18 = this.field2196[var17]; - var15 = this.field2197[var17]; - var16 = this.field2203[var17]; + if (this.field2209 != null && this.field2209[var1] != -1) { + int var17 = this.field2209[var1] & 255; + var18 = this.field2226[var17]; + var15 = this.field2221[var17]; + var16 = this.field2227[var17]; } else { var18 = this.indices1[var1]; var15 = this.indices2[var1]; @@ -1585,40 +1589,40 @@ final void method1315(int var1, int var2, int var3, int var4, int var5, int var6 } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method1183(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var11, var11, field2160[var18], field2160[var15], field2160[var16], field2164[var18], field2164[var15], field2164[var16], field2163[var18], field2163[var15], field2163[var16], this.faceTextures[var1]); + Rasterizer3D.method1206(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var11, var11, field2187[var18], field2187[var15], field2187[var16], field2190[var18], field2190[var15], field2190[var16], field2189[var18], field2189[var15], field2189[var16], this.faceTextures[var1]); } else { - Rasterizer3D.method1183(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, field2160[var18], field2160[var15], field2160[var16], field2164[var18], field2164[var15], field2164[var16], field2163[var18], field2163[var15], field2163[var16], this.faceTextures[var1]); + Rasterizer3D.method1206(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, field2187[var18], field2187[var15], field2187[var16], field2190[var18], field2190[var15], field2190[var16], field2189[var18], field2189[var15], field2189[var16], this.faceTextures[var1]); } } else { - boolean var14 = this.method1314(var1); + boolean var14 = this.method1343(var1); if (this.faceColors3[var1] == -1 && var14) { - Rasterizer3D.method1186(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2168[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + Rasterizer3D.method1209(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2194[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method1182(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2168[this.faceColors1[var1]]); + Rasterizer3D.method1205(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2194[this.faceColors1[var1]]); } else if (var14) { - Rasterizer3D.method1185(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + Rasterizer3D.method1208(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); } else { - Rasterizer3D.method1181(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); + Rasterizer3D.method1204(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); } } } - @ObfuscatedName("bq") - final void method1316(int var1) { + @ObfuscatedName("bf") + final void method1345(int var1) { int var2 = Rasterizer3D.getClipMidX(); int var3 = Rasterizer3D.getClipMidY(); int var4 = 0; int var5 = this.indices1[var1]; int var6 = this.indices2[var1]; int var7 = this.indices3[var1]; - int var8 = field2163[var5]; - int var9 = field2163[var6]; - int var10 = field2163[var7]; + int var8 = field2189[var5]; + int var9 = field2189[var6]; + int var10 = field2189[var7]; if (this.faceAlphas == null) { - Rasterizer3D.clips.field2248 = 0; + Rasterizer3D.clips.field2275 = 0; } else { - Rasterizer3D.clips.field2248 = this.faceAlphas[var1] & 255; + Rasterizer3D.clips.field2275 = this.faceAlphas[var1] & 255; } int var11; @@ -1626,115 +1630,115 @@ final void method1316(int var1) { int var13; int var14; if (var8 >= 50) { - field2170[var4] = modelViewportXs[var5]; - field2171[var4] = modelViewportYs[var5]; - field2156[var4] = field2155[var7]; - field2175[var4++] = this.faceColors1[var1]; + field2198[var4] = modelViewportXs[var5]; + field2200[var4] = modelViewportYs[var5]; + field2180[var4] = field2179[var7]; + field2197[var4++] = this.faceColors1[var1]; } else { - var11 = field2160[var5]; - var12 = field2164[var5]; + var11 = field2187[var5]; + var12 = field2190[var5]; var13 = this.faceColors1[var1]; if (var10 >= 50) { - var14 = field2176[var10 - var8] * (50 - var8); - field2170[var4] = var2 + (var11 + ((field2160[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2171[var4] = var3 + (var12 + ((field2164[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2156[var4] = field2183; - field2175[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field2191[var10 - var8] * (50 - var8); + field2198[var4] = var2 + (var11 + ((field2187[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2200[var4] = var3 + (var12 + ((field2190[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2180[var4] = field2207; + field2197[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } if (var9 >= 50) { - var14 = field2176[var9 - var8] * (50 - var8); - field2170[var4] = var2 + (var11 + ((field2160[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2171[var4] = var3 + (var12 + ((field2164[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2156[var4] = field2183; - field2175[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field2191[var9 - var8] * (50 - var8); + field2198[var4] = var2 + (var11 + ((field2187[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2200[var4] = var3 + (var12 + ((field2190[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2180[var4] = field2207; + field2197[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } if (var9 >= 50) { - field2170[var4] = modelViewportXs[var6]; - field2171[var4] = modelViewportYs[var6]; - field2156[var4] = field2155[var7]; - field2175[var4++] = this.faceColors2[var1]; + field2198[var4] = modelViewportXs[var6]; + field2200[var4] = modelViewportYs[var6]; + field2180[var4] = field2179[var7]; + field2197[var4++] = this.faceColors2[var1]; } else { - var11 = field2160[var6]; - var12 = field2164[var6]; + var11 = field2187[var6]; + var12 = field2190[var6]; var13 = this.faceColors2[var1]; if (var8 >= 50) { - var14 = field2176[var8 - var9] * (50 - var9); - field2170[var4] = var2 + (var11 + ((field2160[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2171[var4] = var3 + (var12 + ((field2164[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2156[var4] = field2183; - field2175[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field2191[var8 - var9] * (50 - var9); + field2198[var4] = var2 + (var11 + ((field2187[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2200[var4] = var3 + (var12 + ((field2190[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2180[var4] = field2207; + field2197[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } if (var10 >= 50) { - var14 = field2176[var10 - var9] * (50 - var9); - field2170[var4] = var2 + (var11 + ((field2160[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2171[var4] = var3 + (var12 + ((field2164[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2175[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field2191[var10 - var9] * (50 - var9); + field2198[var4] = var2 + (var11 + ((field2187[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2200[var4] = var3 + (var12 + ((field2190[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2197[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } if (var10 >= 50) { - field2170[var4] = modelViewportXs[var7]; - field2171[var4] = modelViewportYs[var7]; - field2156[var4] = field2155[var7]; - field2175[var4++] = this.faceColors3[var1]; + field2198[var4] = modelViewportXs[var7]; + field2200[var4] = modelViewportYs[var7]; + field2180[var4] = field2179[var7]; + field2197[var4++] = this.faceColors3[var1]; } else { - var11 = field2160[var7]; - var12 = field2164[var7]; + var11 = field2187[var7]; + var12 = field2190[var7]; var13 = this.faceColors3[var1]; if (var9 >= 50) { - var14 = field2176[var9 - var10] * (50 - var10); - field2170[var4] = var2 + (var11 + ((field2160[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2171[var4] = var3 + (var12 + ((field2164[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2156[var4] = field2183; - field2175[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field2191[var9 - var10] * (50 - var10); + field2198[var4] = var2 + (var11 + ((field2187[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2200[var4] = var3 + (var12 + ((field2190[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2180[var4] = field2207; + field2197[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } if (var8 >= 50) { - var14 = field2176[var8 - var10] * (50 - var10); - field2170[var4] = var2 + (var11 + ((field2160[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2171[var4] = var3 + (var12 + ((field2164[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2156[var4] = field2183; - field2175[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field2191[var8 - var10] * (50 - var10); + field2198[var4] = var2 + (var11 + ((field2187[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2200[var4] = var3 + (var12 + ((field2190[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2180[var4] = field2207; + field2197[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field2170[0]; - var12 = field2170[1]; - var13 = field2170[2]; - var14 = field2171[0]; - int var15 = field2171[1]; - int var16 = field2171[2]; - float var17 = field2156[0]; - float var18 = field2156[1]; - float var19 = field2156[2]; - Rasterizer3D.clips.field2241 = false; - int var20 = Rasterizer3D.method1174(); + var11 = field2198[0]; + var12 = field2198[1]; + var13 = field2198[2]; + var14 = field2200[0]; + int var15 = field2200[1]; + int var16 = field2200[2]; + float var17 = field2180[0]; + float var18 = field2180[1]; + float var19 = field2180[2]; + Rasterizer3D.clips.field2268 = false; + int var20 = Rasterizer3D.method1197(); if (var4 == 3) { if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > var20 || var12 > var20 || var13 > var20) { - Rasterizer3D.clips.field2241 = true; + Rasterizer3D.clips.field2268 = true; } - this.method1315(var1, var14, var15, var16, var11, var12, var13, var17, var18, var19, field2175[0], field2175[1], field2175[2]); + this.method1344(var1, var14, var15, var16, var11, var12, var13, var17, var18, var19, field2197[0], field2197[1], field2197[2]); } if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > var20 || var12 > var20 || var13 > var20 || field2170[3] < 0 || field2170[3] > var20) { - Rasterizer3D.clips.field2241 = true; + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > var20 || var12 > var20 || var13 > var20 || field2198[3] < 0 || field2198[3] > var20) { + Rasterizer3D.clips.field2268 = true; } int var22; if (this.faceTextures != null && this.faceTextures[var1] != -1) { int var23; int var25; - if (this.field2184 != null && this.field2184[var1] != -1) { - int var24 = this.field2184[var1] & 255; - var25 = this.field2196[var24]; - var22 = this.field2197[var24]; - var23 = this.field2203[var24]; + if (this.field2209 != null && this.field2209[var1] != -1) { + int var24 = this.field2209[var1] & 255; + var25 = this.field2226[var24]; + var22 = this.field2221[var24]; + var23 = this.field2227[var24]; } else { var25 = var5; var22 = var6; @@ -1743,79 +1747,79 @@ final void method1316(int var1) { short var26 = this.faceTextures[var1]; if (this.faceColors3[var1] == -1) { - Rasterizer3D.method1183(var14, var15, var16, var11, var12, var13, var17, var18, var19, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2160[var25], field2160[var22], field2160[var23], field2164[var25], field2164[var22], field2164[var23], field2163[var25], field2163[var22], field2163[var23], var26); - Rasterizer3D.method1183(var14, var16, field2171[3], var11, var13, field2170[3], var17, var19, field2156[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2160[var25], field2160[var22], field2160[var23], field2164[var25], field2164[var22], field2164[var23], field2163[var25], field2163[var22], field2163[var23], var26); + Rasterizer3D.method1206(var14, var15, var16, var11, var12, var13, var17, var18, var19, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2187[var25], field2187[var22], field2187[var23], field2190[var25], field2190[var22], field2190[var23], field2189[var25], field2189[var22], field2189[var23], var26); + Rasterizer3D.method1206(var14, var16, field2200[3], var11, var13, field2198[3], var17, var19, field2180[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2187[var25], field2187[var22], field2187[var23], field2190[var25], field2190[var22], field2190[var23], field2189[var25], field2189[var22], field2189[var23], var26); } else { - Rasterizer3D.method1183(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2175[0], field2175[1], field2175[2], field2160[var25], field2160[var22], field2160[var23], field2164[var25], field2164[var22], field2164[var23], field2163[var25], field2163[var22], field2163[var23], var26); - Rasterizer3D.method1183(var14, var16, field2171[3], var11, var13, field2170[3], var17, var19, field2156[3], field2175[0], field2175[2], field2175[3], field2160[var25], field2160[var22], field2160[var23], field2164[var25], field2164[var22], field2164[var23], field2163[var25], field2163[var22], field2163[var23], var26); + Rasterizer3D.method1206(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2197[0], field2197[1], field2197[2], field2187[var25], field2187[var22], field2187[var23], field2190[var25], field2190[var22], field2190[var23], field2189[var25], field2189[var22], field2189[var23], var26); + Rasterizer3D.method1206(var14, var16, field2200[3], var11, var13, field2198[3], var17, var19, field2180[3], field2197[0], field2197[2], field2197[3], field2187[var25], field2187[var22], field2187[var23], field2190[var25], field2190[var22], field2190[var23], field2189[var25], field2189[var22], field2189[var23], var26); } } else { - boolean var21 = this.method1314(var1); + boolean var21 = this.method1343(var1); if (this.faceColors3[var1] == -1 && var21) { - var22 = field2168[this.faceColors1[var1]]; - Rasterizer3D.method1186(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); - Rasterizer3D.method1186(var14, var16, field2171[3], var11, var13, field2170[3], var17, var19, field2156[3], var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + var22 = field2194[this.faceColors1[var1]]; + Rasterizer3D.method1209(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + Rasterizer3D.method1209(var14, var16, field2200[3], var11, var13, field2198[3], var17, var19, field2180[3], var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); } else if (this.faceColors3[var1] == -1) { - var22 = field2168[this.faceColors1[var1]]; - Rasterizer3D.method1182(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22); - Rasterizer3D.method1182(var14, var16, field2171[3], var11, var13, field2170[3], var17, var19, field2156[3], var22); + var22 = field2194[this.faceColors1[var1]]; + Rasterizer3D.method1205(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22); + Rasterizer3D.method1205(var14, var16, field2200[3], var11, var13, field2198[3], var17, var19, field2180[3], var22); } else if (var21) { - Rasterizer3D.method1185(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2175[0], field2175[1], field2175[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); - Rasterizer3D.method1185(var14, var16, field2171[3], var11, var13, field2170[3], 0.0F, 0.0F, 0.0F, field2175[0], field2175[2], field2175[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); + Rasterizer3D.method1208(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2197[0], field2197[1], field2197[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); + Rasterizer3D.method1208(var14, var16, field2200[3], var11, var13, field2198[3], 0.0F, 0.0F, 0.0F, field2197[0], field2197[2], field2197[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); } else { - Rasterizer3D.method1181(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2175[0], field2175[1], field2175[2]); - Rasterizer3D.method1181(var14, var16, field2171[3], var11, var13, field2170[3], var17, var19, field2156[3], field2175[0], field2175[2], field2175[3]); + Rasterizer3D.method1204(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2197[0], field2197[1], field2197[2]); + Rasterizer3D.method1204(var14, var16, field2200[3], var11, var13, field2198[3], var17, var19, field2180[3], field2197[0], field2197[2], field2197[3]); } } } } - @ObfuscatedName("bo") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(ILrm;)V" + descriptor = "(ILrz;)V" ) - void method1317(int var1, class451 var2) { + void method1346(int var1, class450 var2) { float var3 = (float)this.verticesX[var1]; float var4 = (float)(-this.verticesY[var1]); float var5 = (float)(-this.verticesZ[var1]); float var6 = 1.0F; - this.verticesX[var1] = (int)(var2.field3861[0] * var3 + var2.field3861[4] * var4 + var2.field3861[8] * var5 + var2.field3861[12] * var6); - this.verticesY[var1] = -((int)(var2.field3861[1] * var3 + var2.field3861[5] * var4 + var2.field3861[9] * var5 + var2.field3861[13] * var6)); - this.verticesZ[var1] = -((int)(var2.field3861[2] * var3 + var2.field3861[6] * var4 + var2.field3861[10] * var5 + var2.field3861[14] * var6)); + this.verticesX[var1] = (int)(var2.field3875[0] * var3 + var2.field3875[4] * var4 + var2.field3875[8] * var5 + var2.field3875[12] * var6); + this.verticesY[var1] = -((int)(var2.field3875[1] * var3 + var2.field3875[5] * var4 + var2.field3875[9] * var5 + var2.field3875[13] * var6)); + this.verticesZ[var1] = -((int)(var2.field3875[2] * var3 + var2.field3875[6] * var4 + var2.field3875[10] * var5 + var2.field3875[14] * var6)); } - @ObfuscatedName("br") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(Liv;I)V" + descriptor = "(Lim;I)V" ) - void method1318(class228 var1, int var2) { - if (this.field2204 != null) { + void method1347(class227 var1, int var2) { + if (this.field2231 != null) { for (int var3 = 0; var3 < this.verticesCount; ++var3) { - int[] var4 = this.field2204[var3]; + int[] var4 = this.field2231[var3]; if (var4 != null && var4.length != 0) { - int[] var5 = this.field2206[var3]; - field2182.method2276(); + int[] var5 = this.field2230[var3]; + field2204.method2303(); for (int var6 = 0; var6 < var4.length; ++var6) { int var7 = var4[var6]; - class127 var8 = var1.method1191(var7); + class127 var8 = var1.method1213(var7); if (var8 != null) { - field2181.method2279((float)var5[var6] / 255.0F); - field2180.method2278(var8.method700(var2)); - field2180.method2282(field2181); - field2182.method2281(field2180); + field2205.method2305((float)var5[var6] / 255.0F); + field2206.method2304(var8.method711(var2)); + field2206.method2308(field2205); + field2204.method2307(field2206); } } - this.method1317(var3, field2182); + this.method1346(var3, field2204); } } } } - @ObfuscatedName("dx") + @ObfuscatedName("db") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { if (this.boundsType != 1) { @@ -1832,12 +1836,12 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var16 = (var15 - this.xzRadius) * Rasterizer3D.get3dZoom(); if (var16 / var14 < Rasterizer3D.getClipMidX2()) { int var17 = (var15 + this.xzRadius) * Rasterizer3D.get3dZoom(); - if (var17 / var14 > Rasterizer3D.method1169()) { + if (var17 / var14 > Rasterizer3D.method1192()) { int var18 = var3 * var7 - var11 * var2 >> 16; int var19 = var2 * this.xzRadius >> 16; int var20 = (var3 * this.bottomY >> 16) + var19; int var21 = (var18 + var20) * Rasterizer3D.get3dZoom(); - if (var21 / var14 > Rasterizer3D.method1172()) { + if (var21 / var14 > Rasterizer3D.method1195()) { int var22 = (var3 * super.height >> 16) + var19; int var23 = (var18 - var22) * Rasterizer3D.get3dZoom(); if (var23 / var14 < Rasterizer3D.getClipMidY2()) { @@ -1848,11 +1852,11 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, var26 = true; } - boolean var27 = var26 || this.field2216 > 0; + boolean var27 = var26 || this.field2242 > 0; int var28 = ViewportMouse.ViewportMouse_x; int var30 = ViewportMouse.ViewportMouse_y; - boolean var32 = AttackOption.method609(); - boolean var34 = var9 != 0L; + boolean var32 = Decimator.method312(); + boolean var34 = 0L != var9; boolean var35; if (var34) { var35 = (int)(var9 >>> 16 & 1L) == 1; @@ -1860,38 +1864,75 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, } var35 = false; - int var37; - int var38; - int var39; + int var40; + int var41; + int var42; + int var43; + int var44; + int var49; + int var50; + int var56; if (var34 && var32) { boolean var36 = false; - if (field2148) { - var36 = Calendar.method1820(this, var1, var6, var7, var8); + if (field2172) { + boolean var37; + if (!Decimator.method312()) { + var37 = false; + } else { + class11.method33(); + AABB var39 = (AABB)this.aabb.get(var1); + var40 = var39.xMid + var6; + var41 = var7 + var39.yMid; + var42 = var8 + var39.zMid; + var43 = var39.xMidOffset; + var44 = var39.yMidOffset; + int var45 = var39.zMidOffset; + int var46 = ViewportMouse.field2249 - var40; + int var47 = ViewportMouse.field2252 - var41; + int var48 = ViewportMouse.field2254 - var42; + if (Math.abs(var46) > var43 + ViewportMouse.field2250) { + var37 = false; + } else if (Math.abs(var47) > var44 + class7.field9) { + var37 = false; + } else if (Math.abs(var48) > var45 + class30.field82) { + var37 = false; + } else if (Math.abs(var48 * ViewportMouse.field2248 - var47 * Frames.field2121) > var44 * class30.field82 + var45 * class7.field9) { + var37 = false; + } else if (Math.abs(var46 * Frames.field2121 - var48 * class261.field2396) > var43 * class30.field82 + var45 * ViewportMouse.field2250) { + var37 = false; + } else if (Math.abs(var47 * class261.field2396 - var46 * ViewportMouse.field2248) > var43 * class7.field9 + var44 * ViewportMouse.field2250) { + var37 = false; + } else { + var37 = true; + } + } + + var36 = var37; } else { - var37 = var12 - var13; - if (var37 <= 50) { - var37 = 50; + var56 = var12 - var13; + if (var56 <= 50) { + var56 = 50; } if (var15 > 0) { var16 /= var14; - var17 /= var37; + var17 /= var56; } else { var17 /= var14; - var16 /= var37; + var16 /= var56; } if (var18 > 0) { var23 /= var14; - var21 /= var37; + var21 /= var56; } else { var21 /= var14; - var23 /= var37; + var23 /= var56; } - var38 = var28 - Rasterizer3D.getClipMidX(); - var39 = var30 - Rasterizer3D.getClipMidY(); - if (var38 > var16 && var38 < var17 && var39 > var23 && var39 < var21) { + var49 = var28 - Rasterizer3D.getClipMidX(); + var50 = var30 - Rasterizer3D.getClipMidY(); + if (var49 > var16 && var49 < var17 && var50 > var23 && var50 < var21) { var36 = true; } } @@ -1905,23 +1946,22 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, } } - int var49 = Rasterizer3D.getClipMidX(); - var37 = Rasterizer3D.getClipMidY(); - var38 = 0; - var39 = 0; + int var55 = Rasterizer3D.getClipMidX(); + var56 = Rasterizer3D.getClipMidY(); + var49 = 0; + var50 = 0; if (var1 != 0) { - var38 = field2174[var1]; - var39 = field2172[var1]; + var49 = field2199[var1]; + var50 = field2193[var1]; } - for (int var40 = 0; var40 < this.verticesCount; ++var40) { - int var41 = this.verticesX[var40]; - int var42 = this.verticesY[var40]; - int var43 = this.verticesZ[var40]; - int var44; + for (var40 = 0; var40 < this.verticesCount; ++var40) { + var41 = this.verticesX[var40]; + var42 = this.verticesY[var40]; + var43 = this.verticesZ[var40]; if (var1 != 0) { - var44 = var43 * var38 + var41 * var39 >> 16; - var43 = var43 * var39 - var41 * var38 >> 16; + var44 = var43 * var49 + var41 * var50 >> 16; + var43 = var43 * var50 - var41 * var49 >> 16; var41 = var44; } @@ -1933,26 +1973,26 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, var41 = var44; var44 = var3 * var42 - var43 * var2 >> 16; var43 = var42 * var2 + var3 * var43 >> 16; - field2166[var40] = var43 - var12; + field2185[var40] = var43 - var12; if (var43 >= 50) { - modelViewportXs[var40] = var49 + var41 * Rasterizer3D.get3dZoom() / var43; - modelViewportYs[var40] = var37 + var44 * Rasterizer3D.get3dZoom() / var43; - field2155[var40] = Strings.method1841(var43); + modelViewportXs[var40] = var55 + var41 * Rasterizer3D.get3dZoom() / var43; + modelViewportYs[var40] = var56 + var44 * Rasterizer3D.get3dZoom() / var43; + field2179[var40] = AbstractWorldMapIcon.method1556(var43); } else { modelViewportXs[var40] = -5000; var25 = true; } if (var27) { - field2160[var40] = var41; - field2164[var40] = var44; - field2163[var40] = var43; + field2187[var40] = var41; + field2190[var40] = var44; + field2189[var40] = var43; } } try { this.draw0(var25, var35, this.isSingleTile, var9); - } catch (Exception var48) { + } catch (Exception var54) { } } @@ -1961,4 +2001,4 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ModelData.java b/osrs/src/main/java/ModelData.java index 322600e80..e0efd2f48 100644 --- a/osrs/src/main/java/ModelData.java +++ b/osrs/src/main/java/ModelData.java @@ -3,139 +3,139 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("ic") @Implements("ModelData") public class ModelData extends Renderable { - @ObfuscatedName("bi") - static int[] field1915; @ObfuscatedName("bu") - static int[] field1916; - @ObfuscatedName("bk") - static int field1914; - @ObfuscatedName("bz") + static int[] field1941; + @ObfuscatedName("bo") + static int[] field1939; + @ObfuscatedName("bb") + static int field1937; + @ObfuscatedName("br") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("bx") + @ObfuscatedName("be") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("verticesCount") int verticesCount; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("verticesX") int[] verticesX; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("verticesY") int[] verticesY; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("faceCount") int faceCount; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("indices1") int[] indices1; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("indices2") int[] indices2; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("indices3") int[] indices3; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("faceColors") short[] faceColors; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("priority") byte priority; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("bd") + @ObfuscatedName("bh") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("bb") - int[][] field1943; - @ObfuscatedName("bn") - int[][] field1945; - @ObfuscatedName("ba") + @ObfuscatedName("bj") + int[][] field1967; + @ObfuscatedName("bk") + int[][] field1968; + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "[Ljd;" + descriptor = "[Liq;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "[Ljk;" + descriptor = "[Lja;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "[Ljk;" + descriptor = "[Lja;" ) @Export("vertexVertices") VertexNormal[] vertexVertices; - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("ambient") public short ambient; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("contrast") public short contrast; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("bo") - int field1931; - @ObfuscatedName("br") - int field1932; - @ObfuscatedName("bw") - int field1933; - @ObfuscatedName("be") - int field1930; - @ObfuscatedName("bc") - int field1929; + @ObfuscatedName("bf") + int field1953; + @ObfuscatedName("bq") + int field1956; + @ObfuscatedName("ba") + int field1952; + @ObfuscatedName("bl") + int field1954; + @ObfuscatedName("bp") + int field1955; static { - field1915 = new int[10000]; - field1916 = new int[10000]; - field1914 = 0; + field1941 = new int[10000]; + field1939 = new int[10000]; + field1937 = 0; ModelData_sine = Rasterizer3D.Rasterizer3D_sine; ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } @@ -148,7 +148,7 @@ public class ModelData extends Renderable { } @ObfuscatedSignature( - descriptor = "([Lie;I)V" + descriptor = "([Lic;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -192,7 +192,7 @@ public ModelData(ModelData[] var1, int var2) { var6 |= var11.faceSkins != null; var7 |= var11.faceTextures != null; var8 |= var11.textureCoords != null; - var9 |= var11.field1943 != null; + var9 |= var11.field1967 != null; } } @@ -228,8 +228,8 @@ public ModelData(ModelData[] var1, int var2) { } if (var9) { - this.field1943 = new int[this.verticesCount][]; - this.field1945 = new int[this.verticesCount][]; + this.field1967 = new int[this.verticesCount][]; + this.field1968 = new int[this.verticesCount][]; } this.faceColors = new short[this.faceCount]; @@ -286,18 +286,18 @@ public ModelData(ModelData[] var1, int var2) { } this.faceColors[this.faceCount] = var11.faceColors[var12]; - this.indices1[this.faceCount] = this.method1135(var11, var11.indices1[var12]); - this.indices2[this.faceCount] = this.method1135(var11, var11.indices2[var12]); - this.indices3[this.faceCount] = this.method1135(var11, var11.indices3[var12]); + this.indices1[this.faceCount] = this.method1159(var11, var11.indices1[var12]); + this.indices2[this.faceCount] = this.method1159(var11, var11.indices2[var12]); + this.indices3[this.faceCount] = this.method1159(var11, var11.indices3[var12]); ++this.faceCount; } for (var12 = 0; var12 < var11.textureTriangleCount; ++var12) { byte var13 = this.textureRenderTypes[this.textureTriangleCount] = var11.textureRenderTypes[var12]; if (var13 == 0) { - this.texTriangleX[this.textureTriangleCount] = (short)this.method1135(var11, var11.texTriangleX[var12]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method1135(var11, var11.texTriangleY[var12]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method1135(var11, var11.texTriangleZ[var12]); + this.texTriangleX[this.textureTriangleCount] = (short)this.method1159(var11, var11.texTriangleX[var12]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method1159(var11, var11.texTriangleY[var12]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method1159(var11, var11.texTriangleZ[var12]); } ++this.textureTriangleCount; @@ -315,19 +315,19 @@ public ModelData(ModelData[] var1, int var2) { Buffer var2 = new Buffer(10); var2.writeShort(-2); if (var1[var1.length - 1] == -3 && var1[var1.length - 2] == -1) { - this.method1131(var1); + this.method1155(var1); } else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { - this.method1132(var1); + this.method1156(var1); } else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { - this.method1133(var1); + this.method1157(var1); } else { - this.method1134(var1); + this.method1158(var1); } } @ObfuscatedSignature( - descriptor = "(Lie;ZZZZ)V", + descriptor = "(Lic;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -394,14 +394,14 @@ public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boole this.vertexNormals = var1.vertexNormals; this.faceNormals = var1.faceNormals; this.vertexVertices = var1.vertexVertices; - this.field1943 = var1.field1943; - this.field1945 = var1.field1945; + this.field1967 = var1.field1967; + this.field1968 = var1.field1968; this.ambient = var1.ambient; this.contrast = var1.contrast; } - @ObfuscatedName("ar") - void method1131(byte[] var1) { + @ObfuscatedName("ao") + void method1155(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -544,8 +544,8 @@ void method1131(byte[] var1) { } if (var18 == 1) { - this.field1943 = new int[var9][]; - this.field1945 = new int[var9][]; + this.field1967 = new int[var9][]; + this.field1968 = new int[var9][]; } this.faceColors = new short[var10]; @@ -600,12 +600,12 @@ void method1131(byte[] var1) { if (var18 == 1) { for (var53 = 0; var53 < var9; ++var53) { var54 = var6.readUnsignedByte(); - this.field1943[var53] = new int[var54]; - this.field1945[var53] = new int[var54]; + this.field1967[var53] = new int[var54]; + this.field1968[var53] = new int[var54]; for (var55 = 0; var55 < var54; ++var55) { - this.field1943[var53][var55] = var6.readUnsignedByte(); - this.field1945[var53][var55] = var6.readUnsignedByte(); + this.field1967[var53][var55] = var6.readUnsignedByte(); + this.field1968[var53][var55] = var6.readUnsignedByte(); } } } @@ -723,8 +723,8 @@ void method1131(byte[] var1) { } - @ObfuscatedName("am") - void method1132(byte[] var1) { + @ObfuscatedName("at") + void method1156(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -825,8 +825,8 @@ void method1132(byte[] var1) { } if (var17 == 1) { - this.field1943 = new int[var9][]; - this.field1945 = new int[var9][]; + this.field1967 = new int[var9][]; + this.field1968 = new int[var9][]; } this.faceColors = new short[var10]; @@ -875,12 +875,12 @@ void method1132(byte[] var1) { if (var17 == 1) { for (var40 = 0; var40 < var9; ++var40) { var41 = var8.readUnsignedByte(); - this.field1943[var40] = new int[var41]; - this.field1945[var40] = new int[var41]; + this.field1967[var40] = new int[var41]; + this.field1968[var40] = new int[var41]; for (var42 = 0; var42 < var41; ++var42) { - this.field1943[var40][var42] = var8.readUnsignedByte(); - this.field1945[var40][var42] = var8.readUnsignedByte(); + this.field1967[var40][var42] = var8.readUnsignedByte(); + this.field1968[var40][var42] = var8.readUnsignedByte(); } } } @@ -1017,8 +1017,8 @@ void method1132(byte[] var1) { } - @ObfuscatedName("as") - void method1133(byte[] var1) { + @ObfuscatedName("az") + void method1157(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -1323,8 +1323,8 @@ void method1133(byte[] var1) { } - @ObfuscatedName("ag") - void method1134(byte[] var1) { + @ObfuscatedName("ap") + void method1158(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -1600,11 +1600,11 @@ void method1134(byte[] var1) { } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lie;I)I" + descriptor = "(Lic;I)I" ) - final int method1135(ModelData var1, int var2) { + final int method1159(ModelData var1, int var2) { int var3 = -1; int var4 = var1.verticesX[var2]; int var5 = var1.verticesY[var2]; @@ -1625,9 +1625,9 @@ final int method1135(ModelData var1, int var2) { this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; } - if (var1.field1943 != null) { - this.field1943[this.verticesCount] = var1.field1943[var2]; - this.field1945[this.verticesCount] = var1.field1945[var2]; + if (var1.field1967 != null) { + this.field1967[this.verticesCount] = var1.field1967[var2]; + this.field1968[this.verticesCount] = var1.field1968[var2]; } var3 = this.verticesCount++; @@ -1636,9 +1636,9 @@ final int method1135(ModelData var1, int var2) { return var3; } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "()Lie;" + descriptor = "()Lic;" ) @Export("copyModelData") public ModelData copyModelData() { @@ -1681,16 +1681,16 @@ public ModelData copyModelData() { return var1; } - @ObfuscatedName("ap") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lie;" + descriptor = "([[IIIIZI)Lic;" ) - public ModelData method1137(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method1161(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); - int var7 = var2 + this.field1932; - int var8 = var2 + this.field1933; - int var9 = var4 + this.field1929; - int var10 = var4 + this.field1930; + int var7 = var2 + this.field1956; + int var8 = var2 + this.field1952; + int var9 = var4 + this.field1955; + int var10 = var4 + this.field1954; if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { var7 >>= 7; var8 = var8 + 127 >> 7; @@ -1776,7 +1776,7 @@ public ModelData method1137(int[][] var1, int var2, int var3, int var4, boolean } @ObfuscatedName("aq") - void method1138() { + void method1162() { int[] var1; int var2; int var10002; @@ -1836,8 +1836,8 @@ void method1138() { } - @ObfuscatedName("at") - public void method1139() { + @ObfuscatedName("al") + public void method1163() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; this.verticesX[var1] = this.verticesZ[var1]; @@ -1847,8 +1847,8 @@ public void method1139() { this.invalidate(); } - @ObfuscatedName("ah") - public void method1140() { + @ObfuscatedName("an") + public void method1164() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesX[var1] = -this.verticesX[var1]; this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1857,8 +1857,8 @@ public void method1140() { this.invalidate(); } - @ObfuscatedName("ax") - public void method1141() { + @ObfuscatedName("ar") + public void method1165() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesZ[var1]; this.verticesZ[var1] = this.verticesX[var1]; @@ -1868,8 +1868,8 @@ public void method1141() { this.invalidate(); } - @ObfuscatedName("aa") - public void method1142(int var1) { + @ObfuscatedName("ab") + public void method1166(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1882,7 +1882,7 @@ public void method1142(int var1) { this.invalidate(); } - @ObfuscatedName("au") + @ObfuscatedName("ag") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1897,7 +1897,7 @@ public void changeOffset(int var1, int var2, int var3) { this.invalidate(); } - @ObfuscatedName("ae") + @ObfuscatedName("am") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { @@ -1908,7 +1908,7 @@ public void recolor(short var1, short var2) { } - @ObfuscatedName("ab") + @ObfuscatedName("ax") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { @@ -1921,8 +1921,8 @@ public void retexture(short var1, short var2) { } } - @ObfuscatedName("ad") - public void method1146() { + @ObfuscatedName("ah") + public void method1170() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1937,7 +1937,7 @@ public void method1146() { this.invalidate(); } - @ObfuscatedName("ao") + @ObfuscatedName("as") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1949,7 +1949,7 @@ public void resize(int var1, int var2, int var3) { this.invalidate(); } - @ObfuscatedName("ac") + @ObfuscatedName("ay") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { @@ -2025,7 +2025,7 @@ public void calculateVertexNormals() { } } - @ObfuscatedName("ak") + @ObfuscatedName("aj") @Export("invalidate") void invalidate() { this.vertexNormals = null; @@ -2034,43 +2034,43 @@ void invalidate() { this.isBoundsCalculated = false; } - @ObfuscatedName("an") + @ObfuscatedName("av") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { super.height = 0; - this.field1931 = 0; - this.field1932 = 999999; - this.field1933 = -999999; - this.field1930 = -99999; - this.field1929 = 99999; + this.field1953 = 0; + this.field1956 = 999999; + this.field1952 = -999999; + this.field1954 = -99999; + this.field1955 = 99999; for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; int var3 = this.verticesY[var1]; int var4 = this.verticesZ[var1]; - if (var2 < this.field1932) { - this.field1932 = var2; + if (var2 < this.field1956) { + this.field1956 = var2; } - if (var2 > this.field1933) { - this.field1933 = var2; + if (var2 > this.field1952) { + this.field1952 = var2; } - if (var4 < this.field1929) { - this.field1929 = var4; + if (var4 < this.field1955) { + this.field1955 = var4; } - if (var4 > this.field1930) { - this.field1930 = var4; + if (var4 > this.field1954) { + this.field1954 = var4; } if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field1931) { - this.field1931 = var3; + if (var3 > this.field1953) { + this.field1953 = var3; } } @@ -2078,9 +2078,9 @@ void calculateBounds() { } } - @ObfuscatedName("ai") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIIII)Ljo;" + descriptor = "(IIIII)Ljr;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -2101,38 +2101,38 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } } - var8.field2216 = 0; + var8.field2242 = 0; for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field2216; + ++var8.field2242; } } - var8.field2196 = new int[var8.field2216]; - var8.field2197 = new int[var8.field2216]; - var8.field2203 = new int[var8.field2216]; + var8.field2226 = new int[var8.field2242]; + var8.field2221 = new int[var8.field2242]; + var8.field2227 = new int[var8.field2242]; var10 = 0; int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field2196[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field2197[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field2203[var10] = this.texTriangleZ[var11] & '\uffff'; + var8.field2226[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field2221[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field2227[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.field2184 = new byte[this.faceCount]; + var8.field2209 = new byte[this.faceCount]; for (var11 = 0; var11 < this.faceCount; ++var11) { if (this.textureCoords[var11] != -1) { - var8.field2184[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field2209[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2184[var11] = -1; + var8.field2209[var11] = -1; } } } @@ -2175,7 +2175,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method1153(this.faceColors[var16] & '\uffff', var14); + var8.faceColors1[var16] = method1177(this.faceColors[var16] & '\uffff', var14); var8.faceColors3[var16] = -1; } else if (var17 == 3) { var8.faceColors1[var16] = 128; @@ -2192,7 +2192,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method1153(var15, var14); + var8.faceColors1[var16] = method1177(var15, var14); if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2200,7 +2200,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method1153(var15, var14); + var8.faceColors2[var16] = method1177(var15, var14); if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { var13 = this.vertexVertices[this.indices3[var16]]; } else { @@ -2208,13 +2208,13 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method1153(var15, var14); + var8.faceColors3[var16] = method1177(var15, var14); } } else if (var17 != 0) { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method1154(var14); + var8.faceColors1[var16] = method1178(var14); var8.faceColors3[var16] = -1; } else { var8.faceColors3[var16] = -2; @@ -2227,7 +2227,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method1154(var14); + var8.faceColors1[var16] = method1178(var14); if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2235,7 +2235,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method1154(var14); + var8.faceColors2[var16] = method1178(var14); if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { var13 = this.vertexVertices[this.indices3[var16]]; } else { @@ -2243,11 +2243,11 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method1154(var14); + var8.faceColors3[var16] = method1178(var14); } } - this.method1138(); + this.method1162(); var8.verticesCount = this.verticesCount; var8.verticesX = this.verticesX; var8.verticesY = this.verticesY; @@ -2258,18 +2258,18 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { var8.indices3 = this.indices3; var8.faceRenderPriorities = this.faceRenderPriorities; var8.faceAlphas = this.faceAlphas; - var8.field2211 = this.priority; + var8.field2235 = this.priority; var8.vertexLabels = this.vertexLabels; var8.faceLabelsAlpha = this.faceLabelsAlpha; var8.faceTextures = this.faceTextures; - var8.field2204 = this.field1943; - var8.field2206 = this.field1945; + var8.field2231 = this.field1967; + var8.field2230 = this.field1968; return var8; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;II)Lie;" + descriptor = "(Lnu;II)Lic;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -2277,16 +2277,16 @@ public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) return var3 == null ? null : new ModelData(var3); } - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Lie;Lie;IIIZ)V" + descriptor = "(Lic;Lic;IIIZ)V" ) - static void method1151(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method1175(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); var0.calculateVertexNormals(); var1.calculateBounds(); var1.calculateVertexNormals(); - ++field1914; + ++field1937; int var6 = 0; int[] var7 = var1.verticesX; int var8 = var1.verticesCount; @@ -2296,11 +2296,11 @@ static void method1151(ModelData var0, ModelData var1, int var2, int var3, int v VertexNormal var10 = var0.vertexNormals[var9]; if (var10.magnitude != 0) { int var11 = var0.verticesY[var9] - var3; - if (var11 <= var1.field1931) { + if (var11 <= var1.field1953) { int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field1932 && var12 <= var1.field1933) { + if (var12 >= var1.field1956 && var12 <= var1.field1952) { int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field1929 && var13 <= var1.field1930) { + if (var13 >= var1.field1955 && var13 <= var1.field1954) { for (int var14 = 0; var14 < var8; ++var14) { VertexNormal var15 = var1.vertexNormals[var14]; if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { @@ -2331,8 +2331,8 @@ static void method1151(ModelData var0, ModelData var1, int var2, int var3, int v var17.z += var10.z; var17.magnitude += var10.magnitude; ++var6; - field1915[var9] = field1914; - field1916[var14] = field1914; + field1941[var9] = field1937; + field1939[var14] = field1937; } } } @@ -2343,7 +2343,7 @@ static void method1151(ModelData var0, ModelData var1, int var2, int var3, int v if (var6 >= 3 && var5) { for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field1915[var0.indices1[var9]] == field1914 && field1915[var0.indices2[var9]] == field1914 && field1915[var0.indices3[var9]] == field1914) { + if (field1941[var0.indices1[var9]] == field1937 && field1941[var0.indices2[var9]] == field1937 && field1941[var0.indices3[var9]] == field1937) { if (var0.faceRenderTypes == null) { var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -2353,7 +2353,7 @@ static void method1151(ModelData var0, ModelData var1, int var2, int var3, int v } for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field1914 == field1916[var1.indices1[var9]] && field1914 == field1916[var1.indices2[var9]] && field1914 == field1916[var1.indices3[var9]]) { + if (field1937 == field1939[var1.indices1[var9]] && field1937 == field1939[var1.indices2[var9]] && field1937 == field1939[var1.indices3[var9]]) { if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -2365,8 +2365,8 @@ static void method1151(ModelData var0, ModelData var1, int var2, int var3, int v } } - @ObfuscatedName("al") - static final int method1153(int var0, int var1) { + @ObfuscatedName("bh") + static final int method1177(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2377,8 +2377,8 @@ static final int method1153(int var0, int var1) { return (var0 & 65408) + var1; } - @ObfuscatedName("bd") - static final int method1154(int var0) { + @ObfuscatedName("bj") + static final int method1178(int var0) { if (var0 < 2) { var0 = 2; } else if (var0 > 126) { @@ -2387,4 +2387,4 @@ static final int method1154(int var0) { return var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ModelData0.java b/osrs/src/main/java/ModelData0.java index 42fb2f0d0..e7c0d7815 100644 --- a/osrs/src/main/java/ModelData0.java +++ b/osrs/src/main/java/ModelData0.java @@ -1,12 +1,249 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ja") +import java.util.Date; + +@ObfuscatedName("jq") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("av") - static int[] field2255; + @ObfuscatedName("az") + static byte[][][] field2282; ModelData0() { } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "([FIFZFZ[FI)I", + garbageValue = "1909003343" + ) + public static int method1381(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { + float var7 = 0.0F; + + for (int var8 = 0; var8 < var1 + 1; ++var8) { + var7 += Math.abs(var0[var8]); + } + + float var44 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class126.field1204; + if (var7 <= var44) { + return -1; + } else { + float[] var9 = new float[var1 + 1]; + + int var10; + for (var10 = 0; var10 < var1 + 1; ++var10) { + var9[var10] = 1.0F / var7 * var0[var10]; + } + + while (Math.abs(var9[var1]) < var44) { + --var1; + } + + var10 = 0; + if (var1 == 0) { + return var10; + } else if (var1 == 1) { + var6[0] = -var9[0] / var9[1]; + boolean var11 = var3 ? var2 < var6[0] + var44 : var2 < var6[0] - var44; + boolean var12 = var5 ? var4 > var6[0] - var44 : var4 > var6[0] + var44; + var10 = var11 && var12 ? 1 : 0; + if (var10 > 0) { + if (var3 && var6[0] < var2) { + var6[0] = var2; + } else if (var5 && var6[0] > var4) { + var6[0] = var4; + } + } + + return var10; + } else { + class452 var41 = new class452(var9, var1); + float[] var42 = new float[var1 + 1]; + + for (int var13 = 1; var13 <= var1; ++var13) { + var42[var13 - 1] = (float)var13 * var9[var13]; + } + + float[] var43 = new float[var1 + 1]; + int var14 = method1381(var42, var1 - 1, var2, false, var4, false, var43); + if (var14 == -1) { + return 0; + } else { + boolean var15 = false; + float var17 = 0.0F; + float var18 = 0.0F; + float var19 = 0.0F; + + for (int var20 = 0; var20 <= var14; ++var20) { + if (var10 > var1) { + return var10; + } + + float var16; + if (var20 == 0) { + var16 = var2; + var18 = GrandExchangeEvent.method1953(var9, var1, var2); + if (Math.abs(var18) <= var44 && var3) { + var6[var10++] = var2; + } + } else { + var16 = var19; + var18 = var17; + } + + if (var14 == var20) { + var19 = var4; + var15 = false; + } else { + var19 = var43[var20]; + } + + var17 = GrandExchangeEvent.method1953(var9, var1, var19); + if (var15) { + var15 = false; + } else if (Math.abs(var17) < var44) { + if (var14 != var20 || var5) { + var6[var10++] = var19; + var15 = true; + } + } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { + int var22 = var10++; + float var24 = var16; + float var25 = var19; + float var26 = GrandExchangeEvent.method1953(var41.field3891, var41.field3892, var16); + float var23; + if (Math.abs(var26) < class126.field1204) { + var23 = var16; + } else { + float var27 = GrandExchangeEvent.method1953(var41.field3891, var41.field3892, var19); + if (Math.abs(var27) < class126.field1204) { + var23 = var19; + } else { + float var28 = 0.0F; + float var29 = 0.0F; + float var30 = 0.0F; + float var35 = 0.0F; + boolean var36 = true; + boolean var37 = false; + + do { + var37 = false; + if (var36) { + var28 = var24; + var35 = var26; + var29 = var25 - var24; + var30 = var29; + var36 = false; + } + + if (Math.abs(var35) < Math.abs(var27)) { + var24 = var25; + var25 = var28; + var28 = var24; + var26 = var27; + var27 = var35; + var35 = var26; + } + + float var38 = class126.field1203 * Math.abs(var25) + 0.0F; + float var39 = 0.5F * (var28 - var25); + boolean var40 = Math.abs(var39) > var38 && var27 != 0.0F; + if (var40) { + if (Math.abs(var30) >= var38 && Math.abs(var26) > Math.abs(var27)) { + float var34 = var27 / var26; + float var31; + float var32; + if (var24 == var28) { + var31 = var39 * 2.0F * var34; + var32 = 1.0F - var34; + } else { + var32 = var26 / var35; + float var33 = var27 / var35; + var31 = var34 * (var39 * 2.0F * var32 * (var32 - var33) - (var33 - 1.0F) * (var25 - var24)); + var32 = (var33 - 1.0F) * (var32 - 1.0F) * (var34 - 1.0F); + } + + if ((double)var31 > 0.0D) { + var32 = -var32; + } else { + var31 = -var31; + } + + var34 = var30; + var30 = var29; + if (2.0F * var31 < 3.0F * var39 * var32 - Math.abs(var32 * var38) && var31 < Math.abs(var32 * var34 * 0.5F)) { + var29 = var31 / var32; + } else { + var29 = var39; + var30 = var39; + } + } else { + var29 = var39; + var30 = var39; + } + + var24 = var25; + var26 = var27; + if (Math.abs(var29) > var38) { + var25 += var29; + } else if ((double)var39 > 0.0D) { + var25 += var38; + } else { + var25 -= var38; + } + + var27 = GrandExchangeEvent.method1953(var41.field3891, var41.field3892, var25); + if ((double)(var27 * (var35 / Math.abs(var35))) > 0.0D) { + var36 = true; + var37 = true; + } else { + var37 = true; + } + } + } while(var37); + + var23 = var25; + } + } + + var6[var22] = var23; + if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var44) { + var6[var10 - 2] = 0.5F * (var6[var10 - 2] + var6[var10 - 1]); + --var10; + } + } + } + + return var10; + } + } + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lnu;B)V", + garbageValue = "48" + ) + public static void method1382(AbstractArchive var0) { + DbRowType.field4116 = var0; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Ljava/util/Date;I)Z", + garbageValue = "-1268034054" + ) + static boolean method1383(Date var0) { + java.util.Calendar var1 = java.util.Calendar.getInstance(); + var1.set(1, var1.get(1) - 13); + var1.set(5, var1.get(5) + 1); + var1.set(11, 0); + var1.set(12, 0); + var1.set(13, 0); + var1.set(14, 0); + Date var2 = var1.getTime(); + return var0.before(var2); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/MouseHandler.java b/osrs/src/main/java/MouseHandler.java index dc9739166..655c79267 100644 --- a/osrs/src/main/java/MouseHandler.java +++ b/osrs/src/main/java/MouseHandler.java @@ -1,75 +1,73 @@ -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bo") +import java.awt.event.*; + +@ObfuscatedName("bf") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lbo;" + descriptor = "Lbf;" ) @Export("MouseHandler_instance") public static MouseHandler MouseHandler_instance; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("MouseHandler_idleCycles") - public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("aj") + static volatile int MouseHandler_idleCycles; + @ObfuscatedName("ai") @Export("MouseHandler_currentButtonVolatile") public static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("MouseHandler_xVolatile") public static volatile int MouseHandler_xVolatile; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("MouseHandler_yVolatile") public static volatile int MouseHandler_yVolatile; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("MouseHandler_lastMovedVolatile") public static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("MouseHandler_x") public static int MouseHandler_x; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("MouseHandler_y") public static int MouseHandler_y; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("MouseHandler_lastButtonVolatile") public static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("MouseHandler_lastPressedXVolatile") public static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("MouseHandler_lastPressedYVolatile") public static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("MouseHandler_lastPressedTimeMillisVolatile") public static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("by") - static String field145; + @ObfuscatedName("uf") + @Export("cameraMoveToAcceleration") + static int cameraMoveToAcceleration; static { MouseHandler_instance = new MouseHandler(); @@ -95,10 +93,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/awt/event/MouseEvent;B)I", - garbageValue = "0" + descriptor = "(Ljava/awt/event/MouseEvent;I)I", + garbageValue = "-343088867" ) @Export("getButton") final int getButton(MouseEvent var1) { @@ -127,7 +125,7 @@ public final synchronized void mousePressed(MouseEvent var1) { MouseHandler_idleCycles = 0; MouseHandler_lastPressedXVolatile = var1.getX(); MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = class113.clockNow(); + MouseHandler_lastPressedTimeMillisVolatile = GameEngine.clockNow(); MouseHandler_lastButtonVolatile = this.getButton(var1); if (MouseHandler_lastButtonVolatile != 0) { MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; @@ -190,4 +188,47 @@ public final synchronized void focusLost(FocusEvent var1) { } } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-463307133" + ) + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + class416.addChatMessage(var0, var1, var2, (String)null); + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "412937353" + ) + static final void method171(String var0) { + PacketBufferNode var1 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.FRIENDLIST_ADD, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } + + @ObfuscatedName("ig") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1731210540" + ) + static void method172(int var0, int var1, int var2) { + if (var0 != 0) { + int var3 = var0 >> 8; + int var4 = var0 >> 4 & 7; + int var5 = var0 & 15; + Client.soundEffectIds[Client.soundEffectCount] = var3; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; + Client.soundEffects[Client.soundEffectCount] = null; + int var6 = (var1 - 64) / 128; + int var7 = (var2 - 64) / 128; + Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); + ++Client.soundEffectCount; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/MouseRecorder.java b/osrs/src/main/java/MouseRecorder.java index ad33fd024..90c650b6c 100644 --- a/osrs/src/main/java/MouseRecorder.java +++ b/osrs/src/main/java/MouseRecorder.java @@ -1,30 +1,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("dt") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("wo") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("aw") + @ObfuscatedName("ja") + static int field873; + @ObfuscatedName("au") @Export("isRunning") boolean isRunning; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("lock") Object lock; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("index") int index; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("xs") int[] xs; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("ys") int[] ys; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("millis") long[] millis; @@ -40,7 +38,7 @@ public class MouseRecorder implements Runnable { @Export("run") @ObfuscatedName("run") public void run() { - for (; this.isRunning; class13.method44(50L)) { + for (; this.isRunning; PendingSpawn.method505(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; @@ -52,292 +50,4 @@ public void run() { } } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lnd;III)Luu;", - garbageValue = "-1148229033" - ) - static IndexedSprite method476(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); - boolean var3; - if (var4 == null) { - var3 = false; - } else { - VarbitComposition.SpriteBuffer_decode(var4); - var3 = true; - } - - return !var3 ? null : Script.method451(); - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(III)Lmt;", - garbageValue = "-365664003" - ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = VarbitComposition.getWidget(var0); - if (var1 == -1) { - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1818117868" - ) - public static int method477(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); - var0 = var0 + (var0 >>> 4) & 252645135; - var0 += var0 >>> 8; - var0 += var0 >>> 16; - return var0 & 255; - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "1736369402" - ) - static int method479(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == 4000) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + var3; - return 1; - } else if (var0 == 4001) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } else if (var0 == 4002) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 * var3; - return 1; - } else if (var0 == 4003) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } else if (var0 == 4004) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } else if (var0 == 4005) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); - return 1; - } else { - int var5; - int var6; - int var7; - if (var0 == 4006) { - Interpreter.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); - return 1; - } else if (var0 == 4007) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; - return 1; - } else if (var0 == 4008) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } else if (var0 == 4009) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } else if (var0 == 4010) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } else if (var0 == 4011) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } else if (var0 == 4012) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); - } - - return 1; - } else if (var0 == 4013) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - } else if (var0 == 4014) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } else if (var0 == 4015) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } else if (var0 == 4016) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 < var4 ? var3 : var4; - return 1; - } else if (var0 == 4017) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 > var4 ? var3 : var4; - return 1; - } else if (var0 == 4018) { - Interpreter.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); - return 1; - } else if (var0 == 4025) { - var3 = method477(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == 4026) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; - return 1; - } else if (var0 == 4027) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AABB.method1266(var3, var4, var5); - return 1; - } else if (var0 == 4028) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class28.method118(var3, var4, var5); - return 1; - } else if (var0 == 4029) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = 31 - var5; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; - return 1; - } else if (var0 == 4030) { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var3 = class28.method118(var3, var5, var6); - var7 = class228.method1190(var6 - var5 + 1); - if (var4 > var7) { - var4 = var7; - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4 << var5; - return 1; - } else if (var0 == 4032) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = TriBool.method2225(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4033) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = AbstractSocket.method2227(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4034) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = GrandExchangeOfferUnitPriceComparator.method1927(var3, var4); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; - return 1; - } else if (var0 == 4035) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4036) { - String var15 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = -1; - if (Skeleton.isNumber(var15)) { - var4 = class306.method1584(var15); - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - return 1; - } else { - return 2; - } - } - } - - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-1998229147" - ) - static int method480(int var0, Script var1, boolean var2) { - return 2; - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/MouseWheelHandler.java b/osrs/src/main/java/MouseWheelHandler.java index 5c8ffa5ef..6c62cb0cd 100644 --- a/osrs/src/main/java/MouseWheelHandler.java +++ b/osrs/src/main/java/MouseWheelHandler.java @@ -1,15 +1,16 @@ -import java.awt.Component; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ak") +import java.awt.*; +import java.awt.event.MouseWheelEvent; +import java.awt.event.MouseWheelListener; + +@ObfuscatedName("ay") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements class174, MouseWheelListener { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("rotation") int rotation; @@ -17,29 +18,29 @@ public final class MouseWheelHandler implements class174, MouseWheelListener { this.rotation = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "2110290044" + descriptor = "(Ljava/awt/Component;S)V", + garbageValue = "-260" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-945995629" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "0" ) - void method77(Component var1) { + void method71(Component var1) { var1.removeMouseWheelListener(this); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "496669737" + garbageValue = "-2061400252" ) @Export("useRotation") public synchronized int useRotation() { @@ -53,4 +54,4 @@ public synchronized int useRotation() { public synchronized void mouseWheelMoved(MouseWheelEvent var1) { this.rotation += var1.getWheelRotation(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/MoveSpeed.java b/osrs/src/main/java/MoveSpeed.java index fb6d90781..a8b731909 100644 --- a/osrs/src/main/java/MoveSpeed.java +++ b/osrs/src/main/java/MoveSpeed.java @@ -3,41 +3,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("io") +@ObfuscatedName("in") @Implements("MoveSpeed") -public enum MoveSpeed implements class372 { - @ObfuscatedName("aw") +public enum MoveSpeed implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Lin;" ) @Export("STATIONARY") STATIONARY((byte)-1), - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Lin;" ) @Export("CRAWL") CRAWL((byte)0), - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Lin;" ) @Export("WALK") WALK((byte)1), - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Lin;" ) @Export("RUN") RUN((byte)2); - @ObfuscatedName("dn") - @ObfuscatedSignature( - descriptor = "[Luu;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("as") + @ObfuscatedName("ap") + static byte[][][] field1924; + @ObfuscatedName("ac") @Export("speed") public byte speed; @@ -45,13 +41,66 @@ public enum MoveSpeed implements class372 { this.speed = var3; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.speed; } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "-51" + ) + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1754323091" + ) + public static int method1141(int var0) { + return (var0 & class508.field4120) - 1; + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "-4242" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { + if (ModeWhere.loadInterface(var0)) { + Widget[] var1 = PacketBufferNode.Widget_interfaceComponents[var0]; + + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3.onLoad != null) { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onLoad; + NPC.runScript(var4, 5000000, 0); + } + } + + } + } + } + + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/Object;", + garbageValue = "-77" + ) + static Object method1143(int var0) { + return class172.method908((class502)KeyHandler.findEnumerated(class502.method2494(), var0)); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatch.java b/osrs/src/main/java/MusicPatch.java index 75dba4430..0b430eaf4 100644 --- a/osrs/src/main/java/MusicPatch.java +++ b/osrs/src/main/java/MusicPatch.java @@ -1,51 +1,49 @@ -import java.util.ArrayList; -import java.util.BitSet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +import java.util.ArrayList; +import java.util.BitSet; + +@ObfuscatedName("ll") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("jq") - @Export("regions") - static int[] regions; - @ObfuscatedName("aw") - int field2814; - @ObfuscatedName("ar") + @ObfuscatedName("au") + int field2826; + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "[Lcf;" ) @Export("rawSounds") class53[] rawSounds; - @ObfuscatedName("am") - short[] field2818; - @ObfuscatedName("as") - byte[] field2811; - @ObfuscatedName("aj") - byte[] field2810; - @ObfuscatedName("ag") + @ObfuscatedName("at") + short[] field2830; + @ObfuscatedName("ac") + byte[] field2822; + @ObfuscatedName("ai") + byte[] field2823; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "[Llk;" + descriptor = "[Llj;" ) - MusicPatchNode2[] field2817; - @ObfuscatedName("az") - byte[] field2812; - @ObfuscatedName("av") - ArrayList field2816; + MusicPatchNode2[] field2829; @ObfuscatedName("ap") - int[] field2815; + byte[] field2824; + @ObfuscatedName("aa") + ArrayList field2828; + @ObfuscatedName("af") + int[] field2827; MusicPatch(byte[] var1) { - this.field2816 = new ArrayList(8); + this.field2828 = new ArrayList(8); this.rawSounds = new class53[128]; - this.field2818 = new short[128]; - this.field2811 = new byte[128]; - this.field2810 = new byte[128]; - this.field2817 = new MusicPatchNode2[128]; - this.field2812 = new byte[128]; - this.field2815 = new int[128]; + this.field2830 = new short[128]; + this.field2822 = new byte[128]; + this.field2823 = new byte[128]; + this.field2829 = new MusicPatchNode2[128]; + this.field2824 = new byte[128]; + this.field2827 = new int[128]; Buffer var2 = new Buffer(var1); int var3; @@ -125,13 +123,13 @@ public class MusicPatch extends Node { var38 = var37[var14] = new MusicPatchNode2(); int var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2742 = new byte[var16 * 2]; + var38.field2758 = new byte[var16 * 2]; } var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2743 = new byte[var16 * 2 + 2]; - var38.field2743[1] = 64; + var38.field2757 = new byte[var16 * 2 + 2]; + var38.field2757[1] = 64; } } @@ -158,7 +156,7 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - this.field2818[var20] = (short)var19; + this.field2830[var20] = (short)var19; } var19 = 0; @@ -166,7 +164,7 @@ public class MusicPatch extends Node { short[] var48; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - var48 = this.field2818; + var48 = this.field2830; var48[var20] = (short)(var48[var20] + (var19 << 8)); } @@ -186,9 +184,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); } - var48 = this.field2818; + var48 = this.field2830; var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field2815[var23] = var22; + this.field2827[var23] = var22; --var20; } @@ -198,7 +196,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { - if (this.field2815[var24] != 0) { + if (this.field2827[var24] != 0) { if (var20 == 0) { if (var21 < var4.length) { var20 = var4[var21++]; @@ -209,7 +207,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; } - this.field2812[var24] = (byte)var23; + this.field2824[var24] = (byte)var23; --var20; } } @@ -219,7 +217,7 @@ public class MusicPatch extends Node { var24 = 0; for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2815[var25] != 0) { + if (this.field2827[var25] != 0) { if (var20 == 0) { if (var21 < var7.length) { var20 = var7[var21++]; @@ -230,7 +228,7 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; } - this.field2810[var25] = (byte)var24; + this.field2823[var25] = (byte)var24; --var20; } } @@ -241,7 +239,7 @@ public class MusicPatch extends Node { int var26; for (var26 = 0; var26 < 128; ++var26) { - if (this.field2815[var26] != 0) { + if (this.field2827[var26] != 0) { if (var20 == 0) { var40 = var37[var36[var21]]; if (var21 < var10.length) { @@ -251,7 +249,7 @@ public class MusicPatch extends Node { } } - this.field2817[var26] = var40; + this.field2829[var26] = var40; --var20; } } @@ -269,30 +267,30 @@ public class MusicPatch extends Node { var20 = -1; } - if (this.field2815[var27] > 0) { + if (this.field2827[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field2811[var27] = (byte)var26; + this.field2822[var27] = (byte)var26; --var20; } - this.field2814 = var2.readUnsignedByte() + 1; + this.field2826 = var2.readUnsignedByte() + 1; MusicPatchNode2 var28; int var29; for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2742 != null) { - for (var29 = 1; var29 < var28.field2742.length; var29 += 2) { - var28.field2742[var29] = var2.readByte(); + if (var28.field2758 != null) { + for (var29 = 1; var29 < var28.field2758.length; var29 += 2) { + var28.field2758[var29] = var2.readByte(); } } - if (var28.field2743 != null) { - for (var29 = 3; var29 < var28.field2743.length - 2; var29 += 2) { - var28.field2743[var29] = var2.readByte(); + if (var28.field2757 != null) { + for (var29 = 3; var29 < var28.field2757.length - 2; var29 += 2) { + var28.field2757[var29] = var2.readByte(); } } } @@ -311,24 +309,24 @@ public class MusicPatch extends Node { for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2743 != null) { + if (var28.field2757 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2743.length; var29 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var28.field2743[var29] = (byte)var19; + for (var29 = 2; var29 < var28.field2757.length; var29 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var28.field2757[var29] = (byte)var19; } } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2742 != null) { + if (var28.field2758 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2742.length; var29 += 2) { + for (var29 = 2; var29 < var28.field2758.length; var29 += 2) { var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2742[var29] = (byte)var19; + var28.field2758[var29] = (byte)var19; } } } @@ -344,7 +342,7 @@ public class MusicPatch extends Node { var45[0] = (byte)var19; for (var27 = 2; var27 < var45.length; var27 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); + var19 = var19 + 1 + var2.readUnsignedByte(); var45[var27] = (byte)var19; } @@ -352,7 +350,7 @@ public class MusicPatch extends Node { byte var41 = var45[1]; for (var29 = 0; var29 < var44; ++var29) { - this.field2811[var29] = (byte)(var41 * this.field2811[var29] + 32 >> 6); + this.field2822[var29] = (byte)(var41 * this.field2822[var29] + 32 >> 6); } for (var29 = 2; var29 < var45.length; var29 += 2) { @@ -361,8 +359,8 @@ public class MusicPatch extends Node { var32 = var41 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = class228.method1195(var32, var30 - var44); - this.field2811[var33] = (byte)(var34 * this.field2811[var33] + 32 >> 6); + var34 = SecureRandomFuture.method439(var32, var30 - var44); + this.field2822[var33] = (byte)(var34 * this.field2822[var33] + 32 >> 6); var32 += var31 - var41; } @@ -371,7 +369,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - this.field2811[var42] = (byte)(var41 * this.field2811[var42] + 32 >> 6); + this.field2822[var42] = (byte)(var41 * this.field2822[var42] + 32 >> 6); } var38 = null; @@ -390,7 +388,7 @@ public class MusicPatch extends Node { int var47 = var39[1] << 1; for (var29 = 0; var29 < var44; ++var29) { - var42 = var47 + (this.field2810[var29] & 255); + var42 = var47 + (this.field2823[var29] & 255); if (var42 < 0) { var42 = 0; } @@ -399,7 +397,7 @@ public class MusicPatch extends Node { var42 = 128; } - this.field2810[var29] = (byte)var42; + this.field2823[var29] = (byte)var42; } int var43; @@ -409,8 +407,8 @@ public class MusicPatch extends Node { var32 = var47 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = class228.method1195(var32, var30 - var44); - int var35 = var34 + (this.field2810[var33] & 255); + var34 = SecureRandomFuture.method439(var32, var30 - var44); + int var35 = var34 + (this.field2823[var33] & 255); if (var35 < 0) { var35 = 0; } @@ -419,7 +417,7 @@ public class MusicPatch extends Node { var35 = 128; } - this.field2810[var33] = (byte)var35; + this.field2823[var33] = (byte)var35; var32 += var43 - var47; } @@ -428,7 +426,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - var43 = var47 + (this.field2810[var42] & 255); + var43 = var47 + (this.field2823[var42] & 255); if (var43 < 0) { var43 = 0; } @@ -437,57 +435,57 @@ public class MusicPatch extends Node { var43 = 128; } - this.field2810[var42] = (byte)var43; + this.field2823[var42] = (byte)var43; } Object var46 = null; } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2747 = var2.readUnsignedByte(); + var37[var27].field2762 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2742 != null) { - var28.field2746 = var2.readUnsignedByte(); + if (var28.field2758 != null) { + var28.field2764 = var2.readUnsignedByte(); } - if (var28.field2743 != null) { - var28.field2748 = var2.readUnsignedByte(); + if (var28.field2757 != null) { + var28.field2760 = var2.readUnsignedByte(); } - if (var28.field2747 > 0) { - var28.field2745 = var2.readUnsignedByte(); + if (var28.field2762 > 0) { + var28.field2761 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2750 = var2.readUnsignedByte(); + var37[var27].field2763 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2750 > 0) { - var28.field2744 = var2.readUnsignedByte(); + if (var28.field2763 > 0) { + var28.field2765 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2744 > 0) { - var28.field2749 = var2.readUnsignedByte(); + if (var28.field2765 > 0) { + var28.field2759 = var2.readUnsignedByte(); } } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lbh;Ljava/util/BitSet;B)Z", - garbageValue = "-82" + descriptor = "(Lbi;Ljava/util/BitSet;I)Z", + garbageValue = "-1836403783" ) - boolean method1642(SoundCache var1, BitSet var2) { + boolean method1682(SoundCache var1, BitSet var2) { boolean var3 = true; int var4 = 0; class53 var5 = new class53(); @@ -498,26 +496,26 @@ boolean method1642(SoundCache var1, BitSet var2) { for (int var8 = var6; var8 < var7; ++var8) { if (var2.get(var8)) { - int var9 = this.field2815[var8]; + int var9 = this.field2827[var8]; if (var9 != 0) { if (var9 != var4) { var4 = var9--; if ((var9 & 1) == 0) { - var5 = new class53(var1.method226(var9 >> 2)); + var5 = new class53(var1.method225(var9 >> 2)); } else { - var5 = var1.method225(var9 >> 2); + var5 = var1.method223(var9 >> 2); } - if (var5.method294()) { + if (var5.method289()) { var3 = false; } else { - this.field2816.add(this.field2816.size(), var5); + this.field2828.add(this.field2828.size(), var5); } } - if (!var5.method294()) { + if (!var5.method289()) { this.rawSounds[var8] = var5; - this.field2815[var8] = 0; + this.field2827[var8] = 0; } } } @@ -527,13 +525,13 @@ boolean method1642(SoundCache var1, BitSet var2) { return var3; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-629563522" + garbageValue = "-1286940116" ) @Export("clear") void clear() { - this.field2815 = null; + this.field2827 = null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatchNode.java b/osrs/src/main/java/MusicPatchNode.java index b66eb3e68..3cbdcdd23 100644 --- a/osrs/src/main/java/MusicPatchNode.java +++ b/osrs/src/main/java/MusicPatchNode.java @@ -3,128 +3,79 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mw") +@ObfuscatedName("mg") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("aw") - int field2843; - @ObfuscatedName("ay") + @ObfuscatedName("au") + int field2854; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Llm;" + descriptor = "Lll;" ) @Export("table") MusicPatch table; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lbi;" + descriptor = "Lbu;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Llj;" ) - MusicPatchNode2 field2846; - @ObfuscatedName("as") - int field2839; - @ObfuscatedName("aj") - int field2834; - @ObfuscatedName("ag") - int field2832; - @ObfuscatedName("az") - int field2845; - @ObfuscatedName("av") + MusicPatchNode2 field2857; + @ObfuscatedName("ac") int field2842; + @ObfuscatedName("ai") + int field2847; + @ObfuscatedName("az") + int field2856; @ObfuscatedName("ap") - int field2837; - @ObfuscatedName("aq") - int field2838; - @ObfuscatedName("at") + int field2851; + @ObfuscatedName("aa") int field2840; - @ObfuscatedName("ah") - int field2833; - @ObfuscatedName("ax") + @ObfuscatedName("af") int field2844; - @ObfuscatedName("aa") - int field2829; - @ObfuscatedName("au") - int field2841; - @ObfuscatedName("ae") - int field2831; - @ObfuscatedName("ab") - int field2830; @ObfuscatedName("ad") + int field2843; + @ObfuscatedName("aq") + int field2852; + @ObfuscatedName("al") + int field2848; + @ObfuscatedName("an") + int field2850; + @ObfuscatedName("ar") + int field2853; + @ObfuscatedName("ab") + int field2841; + @ObfuscatedName("ag") + int field2845; + @ObfuscatedName("am") + int field2849; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "Lbn;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("ao") - int field2836; - @ObfuscatedName("ak") - int field2835; + @ObfuscatedName("ah") + int field2846; + @ObfuscatedName("ay") + int field2855; MusicPatchNode() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1119340106" + descriptor = "(B)V", + garbageValue = "-26" ) - void method1659() { + void method1696() { this.table = null; this.rawSound = null; - this.field2846 = null; + this.field2857 = null; this.stream = null; } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "([BZI)Ljava/lang/Object;", - garbageValue = "-2056513709" - ) - public static Object method1657(byte[] var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0.length > 136) { - DirectByteArrayCopier var2 = new DirectByteArrayCopier(); - var2.set(var0); - return var2; - } else { - return var0; - } - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Lhq;", - garbageValue = "325991417" - ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-82" - ) - static final void method1660(String var0) { - Tile.method1160(var0 + " is already on your ignore list"); - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatchNode2.java b/osrs/src/main/java/MusicPatchNode2.java index cd1587eca..89684235c 100644 --- a/osrs/src/main/java/MusicPatchNode2.java +++ b/osrs/src/main/java/MusicPatchNode2.java @@ -3,194 +3,40 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("lj") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("kn") - @ObfuscatedSignature( - descriptor = "[Lud;" - ) - static SpritePixels[] mapDotSprites; - @ObfuscatedName("aw") - byte[] field2742; - @ObfuscatedName("ay") - byte[] field2743; - @ObfuscatedName("ar") - int field2747; - @ObfuscatedName("am") - int field2746; - @ObfuscatedName("as") - int field2748; - @ObfuscatedName("aj") - int field2745; - @ObfuscatedName("ag") - int field2744; + @ObfuscatedName("uz") + @Export("cameraLookAtHeight") + static int cameraLookAtHeight; + @ObfuscatedName("au") + byte[] field2758; + @ObfuscatedName("ae") + byte[] field2757; + @ObfuscatedName("ao") + int field2762; + @ObfuscatedName("at") + int field2764; + @ObfuscatedName("ac") + int field2760; + @ObfuscatedName("ai") + int field2761; @ObfuscatedName("az") - int field2750; - @ObfuscatedName("av") - int field2749; + int field2765; + @ObfuscatedName("ap") + int field2763; + @ObfuscatedName("aa") + int field2759; MusicPatchNode2() { } - @ObfuscatedName("jv") + @ObfuscatedName("oe") @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "-19" + descriptor = "(II)V", + garbageValue = "31198036" ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = UserComparator5.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var14; - int var26; - if (0L != var5) { - var7 = UserComparator5.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - boolean var12 = 0L != var5; - if (var12) { - boolean var13 = (int)(var5 >>> 16 & 1L) == 1; - var12 = !var13; - } - - if (var12) { - var10 = var4; - } - - int[] var19 = Frames.sceneMinimapSprite.pixels; - var26 = var1 * 4 + (103 - var2) * 2048 + 24624; - var14 = class458.Entity_unpackID(var5); - ObjectComposition var15 = class90.getObjectDefinition(var14); - if (var15.mapSceneId != -1) { - IndexedSprite var16 = class282.mapSceneSprites[var15.mapSceneId]; - if (var16 != null) { - int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; - var16.drawAt(var17 + var1 * 4 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); - } - } else { - if (var9 == 0 || var9 == 2) { - if (var8 == 0) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if (var8 == 1) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; - } - } - - if (var9 == 3) { - if (var8 == 0) { - var19[var26] = var10; - } else if (var8 == 1) { - var19[var26 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { - var19[var26 + 1536] = var10; - } - } - - if (var9 == 2) { - if (var8 == 3) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if (var8 == 0) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if (var8 == 1) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; - } - } - } - } - - var5 = UserComparator5.scene.getGameObjectTag(var0, var1, var2); - if (0L != var5) { - var7 = UserComparator5.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = class458.Entity_unpackID(var5); - ObjectComposition var20 = class90.getObjectDefinition(var10); - if (var20.mapSceneId != -1) { - IndexedSprite var28 = class282.mapSceneSprites[var20.mapSceneId]; - if (var28 != null) { - var26 = (var20.sizeX * 4 - var28.subWidth) / 2; - var14 = (var20.sizeY * 4 - var28.subHeight) / 2; - var28.drawAt(var26 + var1 * 4 + 48, var14 + (104 - var2 - var20.sizeY) * 4 + 48); - } - } else if (var9 == 9) { - int var25 = 15658734; - boolean var27 = var5 != 0L; - if (var27) { - boolean var21 = (int)(var5 >>> 16 & 1L) == 1; - var27 = !var21; - } - - if (var27) { - var25 = 15597568; - } - - int[] var22 = Frames.sceneMinimapSprite.pixels; - int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; - if (var8 != 0 && var8 != 2) { - var22[var29] = var25; - var22[var29 + 1 + 512] = var25; - var22[var29 + 1024 + 2] = var25; - var22[var29 + 1536 + 3] = var25; - } else { - var22[var29 + 1536] = var25; - var22[var29 + 1 + 1024] = var25; - var22[var29 + 512 + 2] = var25; - var22[var29 + 3] = var25; - } - } - } - - var5 = UserComparator5.scene.getFloorDecorationTag(var0, var1, var2); - if (var5 != 0L) { - var7 = class458.Entity_unpackID(var5); - ObjectComposition var23 = class90.getObjectDefinition(var7); - if (var23.mapSceneId != -1) { - IndexedSprite var24 = class282.mapSceneSprites[var23.mapSceneId]; - if (var24 != null) { - var10 = (var23.sizeX * 4 - var24.subWidth) / 2; - int var11 = (var23.sizeY * 4 - var24.subHeight) / 2; - var24.drawAt(var1 * 4 + var10 + 48, var11 + (104 - var2 - var23.sizeY) * 4 + 48); - } - } - } - + static void method1625(int var0) { + Client.oculusOrbState = var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatchPcmStream.java b/osrs/src/main/java/MusicPatchPcmStream.java index ef5229805..f2e13bcf7 100644 --- a/osrs/src/main/java/MusicPatchPcmStream.java +++ b/osrs/src/main/java/MusicPatchPcmStream.java @@ -3,30 +3,39 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mm") +@ObfuscatedName("mh") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("aw") + @ObfuscatedName("cq") + @Export("param9") + static String param9; + @ObfuscatedName("da") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "[Luk;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Llf;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lbe;" + descriptor = "Lbl;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Llc;)V" + descriptor = "(Llf;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -34,26 +43,26 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lmw;[IIIIB)V", - garbageValue = "106" + descriptor = "(Lmg;[IIIII)V", + garbageValue = "-1470888543" ) - void method1654(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2780[var1.field2843] & 4) != 0 && var1.field2829 < 0) { - int var6 = this.superStream.field2775[var1.field2843] / PcmPlayer.field181; + void method1693(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2790[var1.field2854] & 4) != 0 && var1.field2853 < 0) { + int var6 = this.superStream.field2798[var1.field2854] / PcmPlayer.field181; while (true) { - int var7 = (var6 + 1048575 - var1.field2835) / var6; + int var7 = (var6 + 1048575 - var1.field2855) / var6; if (var7 > var4) { - var1.field2835 += var6 * var4; + var1.field2855 += var6 * var4; break; } var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; - var1.field2835 += var7 * var6 - 1048576; + var1.field2855 += var7 * var6 - 1048576; int var8 = PcmPlayer.field181 / 100; int var9 = 262144 / var6; if (var9 < var8) { @@ -61,21 +70,21 @@ void method1654(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { } RawPcmStream var10 = var1.stream; - if (this.superStream.field2779[var1.field2843] == 0) { - var1.stream = RawPcmStream.method240(var1.rawSound, var10.method255(), var10.method246(), var10.method247()); + if (this.superStream.field2792[var1.field2854] == 0) { + var1.stream = RawPcmStream.method235(var1.rawSound, var10.method250(), var10.method241(), var10.method242()); } else { - var1.stream = RawPcmStream.method240(var1.rawSound, var10.method255(), 0, var10.method247()); - this.superStream.method1601(var1, var1.table.field2818[var1.field2834] < 0); - var1.stream.method251(var8, var10.method246()); + var1.stream = RawPcmStream.method235(var1.rawSound, var10.method250(), 0, var10.method242()); + this.superStream.method1642(var1, var1.table.field2830[var1.field2847] < 0); + var1.stream.method246(var8, var10.method241()); } - if (var1.table.field2818[var1.field2834] < 0) { + if (var1.table.field2830[var1.field2847] < 0) { var1.stream.setNumLoops(-1); } - var10.method253(var8); + var10.method248(var8); var10.fill(var2, var3, var5 - var3); - if (var10.method257()) { + if (var10.method252()) { this.mixer.addSubStream(var10); } } @@ -84,38 +93,38 @@ void method1654(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { var1.stream.fill(var2, var3, var4); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lmw;IB)V", - garbageValue = "1" + descriptor = "(Lmg;II)V", + garbageValue = "-2042371851" ) - void method1655(MusicPatchNode var1, int var2) { - if ((this.superStream.field2780[var1.field2843] & 4) != 0 && var1.field2829 < 0) { - int var3 = this.superStream.field2775[var1.field2843] / PcmPlayer.field181; - int var4 = (var3 + 1048575 - var1.field2835) / var3; - var1.field2835 = var3 * var2 + var1.field2835 & 1048575; + void method1694(MusicPatchNode var1, int var2) { + if ((this.superStream.field2790[var1.field2854] & 4) != 0 && var1.field2853 < 0) { + int var3 = this.superStream.field2798[var1.field2854] / PcmPlayer.field181; + int var4 = (var3 + 1048575 - var1.field2855) / var3; + var1.field2855 = var3 * var2 + var1.field2855 & 1048575; if (var4 <= var2) { - if (this.superStream.field2779[var1.field2843] == 0) { - var1.stream = RawPcmStream.method240(var1.rawSound, var1.stream.method255(), var1.stream.method246(), var1.stream.method247()); + if (this.superStream.field2792[var1.field2854] == 0) { + var1.stream = RawPcmStream.method235(var1.rawSound, var1.stream.method250(), var1.stream.method241(), var1.stream.method242()); } else { - var1.stream = RawPcmStream.method240(var1.rawSound, var1.stream.method255(), 0, var1.stream.method247()); - this.superStream.method1601(var1, var1.table.field2818[var1.field2834] < 0); + var1.stream = RawPcmStream.method235(var1.rawSound, var1.stream.method250(), 0, var1.stream.method242()); + this.superStream.method1642(var1, var1.table.field2830[var1.field2847] < 0); } - if (var1.table.field2818[var1.field2834] < 0) { + if (var1.table.field2830[var1.field2847] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2835 / var3; + var2 = var1.field2855 / var3; } } var1.stream.skip(var2); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "()Lby;" + descriptor = "()Lbw;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -127,9 +136,9 @@ protected PcmStream firstSubStream() { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "()Lby;" + descriptor = "()Lbw;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -144,106 +153,68 @@ protected PcmStream nextSubStream() { return var1.stream; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("vmethod5648") protected int vmethod5648() { return 0; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method1623(var6)) { + if (!this.superStream.method1665(var6)) { int var4 = var2; int var5 = var3; do { - if (var5 <= var6.field2836) { - this.method1654(var6, var1, var4, var5, var4 + var5); - var6.field2836 -= var5; + if (var5 <= var6.field2846) { + this.method1693(var6, var1, var4, var5, var5 + var4); + var6.field2846 -= var5; break; } - this.method1654(var6, var1, var4, var6.field2836, var5 + var4); - var4 += var6.field2836; - var5 -= var6.field2836; - } while(!this.superStream.method1624(var6, var1, var4, var5)); + this.method1693(var6, var1, var4, var6.field2846, var4 + var5); + var4 += var6.field2846; + var5 -= var6.field2846; + } while(!this.superStream.method1666(var6, var1, var4, var5)); } } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method1623(var3)) { + if (!this.superStream.method1665(var3)) { int var2 = var1; do { - if (var2 <= var3.field2836) { - this.method1655(var3, var2); - var3.field2836 -= var2; + if (var2 <= var3.field2846) { + this.method1694(var3, var2); + var3.field2846 -= var2; break; } - this.method1655(var3, var3.field2836); - var2 -= var3.field2836; - } while(!this.superStream.method1624(var3, (int[])null, 0, var2)); + this.method1694(var3, var3.field2846); + var2 -= var3.field2846; + } while(!this.superStream.method1666(var3, (int[])null, 0, var2)); } } } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;S)Ljava/lang/String;", - garbageValue = "-15982" - ) - public static String method1652(CharSequence var0) { - long var3 = 0L; - int var5 = var0.length(); - - for (int var6 = 0; var6 < var5; ++var6) { - var3 *= 37L; - char var7 = var0.charAt(var6); - if (var7 >= 'A' && var7 <= 'Z') { - var3 += (long)(var7 + 1 - 65); - } else if (var7 >= 'a' && var7 <= 'z') { - var3 += (long)(var7 + 1 - 97); - } else if (var7 >= '0' && var7 <= '9') { - var3 += (long)(var7 + 27 - 48); - } - - if (var3 >= 177917621779460413L) { - break; - } - } - - while (0L == var3 % 37L && var3 != 0L) { - var3 /= 37L; - } - - String var8 = class170.base37DecodeLong(var3); - if (var8 == null) { - var8 = ""; - } - - return var8; - } - - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1653228105" + descriptor = "(S)I", + garbageValue = "8192" ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; + public static int method1690() { + return ++MouseHandler.MouseHandler_idleCycles - 1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/MusicSong.java b/osrs/src/main/java/MusicSong.java index b2e19f1c7..cab615059 100644 --- a/osrs/src/main/java/MusicSong.java +++ b/osrs/src/main/java/MusicSong.java @@ -1,83 +1,174 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("mu") +@Implements("MusicSong") public class MusicSong { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) + @Export("musicTrackArchive") public AbstractArchive musicTrackArchive; - @ObfuscatedName("ay") + @ObfuscatedName("ae") + @Export("musicTrackGroupId") public int musicTrackGroupId; - @ObfuscatedName("ar") + @ObfuscatedName("ao") + @Export("musicTrackFileId") public int musicTrackFileId; - @ObfuscatedName("am") + @ObfuscatedName("at") + @Export("musicTrackVolume") public int musicTrackVolume; - @ObfuscatedName("as") - public float field2853; - @ObfuscatedName("aj") + @ObfuscatedName("ac") + public float field2867; + @ObfuscatedName("ai") + @Export("musicTrackBoolean") public boolean musicTrackBoolean; - @ObfuscatedName("ag") - public boolean field2849; @ObfuscatedName("az") - public boolean field2852; - @ObfuscatedName("av") - public boolean field2851; + public boolean field2866; @ObfuscatedName("ap") + public boolean field2865; + @ObfuscatedName("aa") + public boolean field2862; + @ObfuscatedName("af") + public boolean field2863; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Llf;" ) + @Export("midiPcmStream") public MidiPcmStream midiPcmStream; @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lbh;" + descriptor = "Lbi;" ) - public SoundCache field2848; - @ObfuscatedName("at") + public SoundCache field2861; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lmp;" + descriptor = "Lmv;" ) - public MusicTrack field2858; + public MusicTrack field2872; @ObfuscatedSignature( - descriptor = "(Lnd;IIIZ)V" + descriptor = "(Lnu;Ljava/lang/String;Ljava/lang/String;IZ)V" ) - public MusicSong(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + public MusicSong(AbstractArchive var1, String var2, String var3, int var4, boolean var5) { this.musicTrackGroupId = -1; this.musicTrackFileId = -1; this.musicTrackVolume = 0; - this.field2853 = 0.0F; + this.field2867 = 0.0F; this.musicTrackBoolean = false; - this.field2851 = false; - this.method1664(var1, var2, var3, var4, var5); + this.field2862 = false; + this.field2863 = false; + this.musicTrackGroupId = var1.getGroupId(var2); + this.musicTrackFileId = var1.getFileId(this.musicTrackGroupId, var3); + this.method1701(var1, this.musicTrackGroupId, this.musicTrackFileId, var4, var5); } @ObfuscatedSignature( - descriptor = "(Lnd;Ljava/lang/String;Ljava/lang/String;IZ)V" + descriptor = "(Lnu;IIIZ)V" ) - public MusicSong(AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + public MusicSong(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { this.musicTrackGroupId = -1; this.musicTrackFileId = -1; this.musicTrackVolume = 0; - this.field2853 = 0.0F; + this.field2867 = 0.0F; this.musicTrackBoolean = false; - this.field2851 = false; - this.musicTrackGroupId = var1.getGroupId(var2); - this.musicTrackFileId = var1.getFileId(this.musicTrackGroupId, var3); - this.method1664(var1, this.musicTrackGroupId, this.musicTrackFileId, var4, var5); + this.field2862 = false; + this.field2863 = false; + this.method1701(var1, var2, var3, var4, var5); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;IIIZB)V", - garbageValue = "10" + descriptor = "(Lnu;IIIZB)V", + garbageValue = "28" ) - void method1664(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + void method1701(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { this.musicTrackArchive = var1; this.musicTrackGroupId = var2; this.musicTrackFileId = var3; this.musicTrackVolume = var4; this.musicTrackBoolean = var5; } -} + + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-79" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 30) { + Client.field423.method1090(); + } + + if (Client.gameState == 0) { + class219.client.method158(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { + class316.method1700(0); + Client.field448 = 0; + Client.field447 = 0; + Client.timer.method2152(var0); + if (var0 != 20) { + PendingSpawn.method509(false); + } + } + + if (var0 != 20 && var0 != 40 && AbstractSocket.field3819 != null) { + AbstractSocket.field3819.close(); + AbstractSocket.field3819 = null; + } + + if (Client.gameState == 25) { + Client.field456 = 0; + Client.field452 = 0; + Client.field453 = 1; + Client.field455 = 0; + Client.field454 = 1; + } + + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + int var3 = Client.gameState == 11 ? 4 : 0; + Timer.method2157(class141.archive10, PcmPlayer.archive8, false, var3); + } else if (var0 == 11) { + Timer.method2157(class141.archive10, PcmPlayer.archive8, false, 4); + } else if (var0 == 50) { + class318.setLoginResponseString("", "Updating date of birth...", ""); + Timer.method2157(class141.archive10, PcmPlayer.archive8, false, 7); + } else if (class403.clearLoginScreen) { + Login.titleboxSprite = null; + class219.titlebuttonSprite = null; + Login.runesSprite = null; + Login.leftTitleSprite = null; + Bounds.rightTitleSprite = null; + SoundSystem.logoSprite = null; + class13.title_muteSprite = null; + Login.options_buttons_0Sprite = null; + UserComparator6.options_buttons_2Sprite = null; + class74.worldSelectBackSprites = null; + SoundCache.worldSelectFlagSprites = null; + MusicPatchPcmStream.worldSelectArrows = null; + SecureRandomCallable.worldSelectStars = null; + VarcInt.field1534 = null; + class139.field1323.method528(); + Script.method445(0, 100); + CollisionMap.method1122().method1932(true); + class403.clearLoginScreen = false; + } + } else { + boolean var1 = class449.clientPreferences.method564() >= Client.param21; + int var2 = var1 ? 0 : 12; + Timer.method2157(class141.archive10, PcmPlayer.archive8, true, var2); + } + + Client.gameState = var0; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/MusicTrack.java b/osrs/src/main/java/MusicTrack.java index 0306ab245..bab2fb74e 100644 --- a/osrs/src/main/java/MusicTrack.java +++ b/osrs/src/main/java/MusicTrack.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mp") +@ObfuscatedName("mv") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsm;" + descriptor = "Lso;" ) - NodeHashTable field2826; - @ObfuscatedName("ay") + NodeHashTable field2837; + @ObfuscatedName("ae") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) MusicTrack(Buffer var1) { - this.field2826 = new NodeHashTable(16); + this.field2837 = new NodeHashTable(16); var1.offset = var1.array.length - 3; int var2 = var1.readUnsignedByte(); int var3 = var1.readUnsignedShort(); @@ -254,13 +254,13 @@ public class MusicTrack extends Node { var51.writeByte(var71); if (var71 > 0) { int var72 = var61[var52]; - class319 var73 = (class319)this.field2826.get((long)var72); + class318 var73 = (class318)this.field2837.get((long)var72); if (var73 == null) { - var73 = new class319(var65); - this.field2826.put(var73, (long)var72); + var73 = new class318(var65); + this.field2837.put(var73, (long)var72); } - var73.field2861.set(var74); + var73.field2876.set(var74); } } else if (var66 == 1) { if (var69) { @@ -367,13 +367,13 @@ public class MusicTrack extends Node { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;II)Lmp;" + descriptor = "(Lnu;II)Lmv;" ) @Export("readTrack") public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new MusicTrack(new Buffer(var3)); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/NPC.java b/osrs/src/main/java/NPC.java index 8456df21d..ff1993a9b 100644 --- a/osrs/src/main/java/NPC.java +++ b/osrs/src/main/java/NPC.java @@ -1,81 +1,78 @@ -import java.awt.Desktop; -import java.awt.Desktop.Action; -import java.net.URI; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dh") +@ObfuscatedName("dx") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("ag") - static int field1068; - @ObfuscatedName("av") - static int field1069; - @ObfuscatedName("aw") + @ObfuscatedName("az") + static int field1075; + @ObfuscatedName("aa") + static int field1074; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lhw;" ) @Export("definition") NPCComposition definition; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("nameChange") String nameChange; - @ObfuscatedName("am") - int field1073; - @ObfuscatedName("as") + @ObfuscatedName("at") + int field1079; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ltr;" + descriptor = "Ltw;" ) - class514 field1075; - @ObfuscatedName("aj") + class515 field1081; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhq;" ) - NewShit field1071; - @ObfuscatedName("az") + NewShit field1076; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhq;" ) - NewShit field1072; + NewShit field1077; static { - field1068 = 1; - field1069 = 1; + field1075 = 1; + field1074 = 1; } NPC() { this.nameChange = ""; - this.field1073 = 31; + this.field1079 = 31; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-265998562" + garbageValue = "-1576222812" ) - void method582(String var1) { + void method577(String var1) { this.nameChange = var1 == null ? "" : var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Ljo;", - garbageValue = "-983173466" + descriptor = "(I)Ljr;", + garbageValue = "798227647" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class135.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.idleSequence || var1 == null) ? class135.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? EnumComposition.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : EnumComposition.SequenceDefinition_get(super.movementSequence); Model var3 = null; - if (this.field1071 != null && this.field1071.field1565) { - var3 = class136.localPlayer.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); + if (this.field1076 != null && this.field1076.field1581) { + var3 = VarbitComposition.localPlayer.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); } else { - var3 = this.definition.method966(var1, super.sequenceFrame, var2, super.movementFrame, this.field1071); + var3 = this.definition.method985(var1, super.sequenceFrame, var2, super.movementFrame, this.field1076); } if (var3 == null) { @@ -84,7 +81,7 @@ protected final Model getModel() { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; int var4 = var3.indicesCount; - var3 = this.method525(var3); + var3 = this.method520(var3); if (this.definition.size == 1) { var3.isSingleTile = true; } @@ -94,7 +91,7 @@ protected final Model getModel() { var3.overrideSaturation = super.recolourSaturation; var3.overrideLuminance = super.recolourLuminance; var3.overrideAmount = super.recolourAmount; - var3.field2219 = (short)var4; + var3.field2243 = (short)var4; } else { var3.overrideAmount = 0; } @@ -104,34 +101,34 @@ protected final Model getModel() { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1401431099" + garbageValue = "-979887943" ) - void method584(int var1) { - this.field1073 = var1; + void method579(int var1) { + this.field1079 = var1; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1268295960" + garbageValue = "-1723224473" ) - boolean method585(int var1) { + boolean method580(int var1) { if (var1 >= 0 && var1 <= 4) { - return (this.field1073 & 1 << var1) != 0; + return (this.field1079 & 1 << var1) != 0; } else { return true; } } - @ObfuscatedName("as") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "2003079034" + garbageValue = "-1406418583" ) - final String method586() { + final String method581() { if (!this.nameChange.isEmpty()) { return this.nameChange; } else { @@ -147,10 +144,10 @@ final String method586() { } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ILio;I)V", - garbageValue = "69019912" + descriptor = "(ILin;I)V", + garbageValue = "1389933188" ) @Export("move") final void move(int var1, MoveSpeed var2) { @@ -192,7 +189,7 @@ final void move(int var1, MoveSpeed var2) { --var4; } - if (super.sequence != -1 && class135.SequenceDefinition_get(super.sequence).priority == 1) { + if (super.sequence != -1 && EnumComposition.SequenceDefinition_get(super.sequence).priority == 1) { super.sequence = -1; } @@ -211,13 +208,13 @@ final void move(int var1, MoveSpeed var2) { super.pathTraversed[0] = var2; } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "0" + descriptor = "(IIZI)V", + garbageValue = "-2120679358" ) - final void method588(int var1, int var2, boolean var3) { - if (super.sequence != -1 && class135.SequenceDefinition_get(super.sequence).priority == 1) { + final void method583(int var1, int var2, boolean var3) { + if (super.sequence != -1 && EnumComposition.SequenceDefinition_get(super.sequence).priority == 1) { super.sequence = -1; } @@ -243,148 +240,179 @@ final void method588(int var1, int var2, boolean var3) { } super.pathLength = 0; - super.field1018 = 0; - super.field1020 = 0; + super.field1022 = 0; + super.field1021 = 0; super.pathX[0] = var1; super.pathY[0] = var2; super.x = super.field976 * 64 + super.pathX[0] * 128; - super.y = super.field976 * 64 + super.pathY[0] * 128; + super.y = super.pathY[0] * 128 + super.field976 * 64; } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "-1083968241" + garbageValue = "2108949560" ) - int[] method591() { - return this.field1075 != null ? this.field1075.method2583() : this.definition.method974(); + int[] method587() { + return this.field1081 != null ? this.field1081.method2602() : this.definition.method993(); } - @ObfuscatedName("ap") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(B)[S", - garbageValue = "77" + descriptor = "(S)[S", + garbageValue = "17216" ) - short[] method592() { - return this.field1075 != null ? this.field1075.method2584() : this.definition.method976(); + short[] method588() { + return this.field1081 != null ? this.field1081.method2603() : this.definition.method995(); } @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IISB)V", - garbageValue = "0" + descriptor = "(IISI)V", + garbageValue = "-1331637163" ) - void method593(int var1, int var2, short var3) { - if (this.field1075 == null) { - this.field1075 = new class514(this.definition); + void method589(int var1, int var2, short var3) { + if (this.field1081 == null) { + this.field1081 = new class515(this.definition); } - this.field1075.method2585(var1, var2, var3); + this.field1081.method2604(var1, var2, var3); } - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "([I[SI)V", - garbageValue = "-1811218204" + garbageValue = "1783936038" ) - void method594(int[] var1, short[] var2) { - if (this.field1075 == null) { - this.field1075 = new class514(this.definition); + void method590(int[] var1, short[] var2) { + if (this.field1081 == null) { + this.field1081 = new class515(this.definition); } - this.field1075.method2586(var1, var2); + this.field1081.method2605(var1, var2); } - @ObfuscatedName("ah") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1565977870" + garbageValue = "707622194" ) - void method595() { - this.field1075 = null; + void method591() { + this.field1081 = null; } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lhs;I)V", - garbageValue = "-1331713030" + descriptor = "(Lhq;I)V", + garbageValue = "244947071" ) - void method596(NewShit var1) { - this.field1072 = var1; + void method592(NewShit var1) { + this.field1077 = var1; } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)Lhs;", - garbageValue = "-1510314469" + descriptor = "(I)Lhq;", + garbageValue = "1386769503" ) - NewShit method597() { - return this.field1072; + NewShit method593() { + return this.field1077; } - @ObfuscatedName("au") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lhs;I)V", - garbageValue = "-1722306850" + descriptor = "(Lhq;B)V", + garbageValue = "-37" ) - void method598(NewShit var1) { - this.field1071 = var1; + void method594(NewShit var1) { + this.field1076 = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "381940201" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; } - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-883060880" + garbageValue = "-1283231682" ) - void method599() { - this.field1072 = null; + void method595() { + this.field1077 = null; } - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1751428186" + descriptor = "(B)V", + garbageValue = "58" ) - void method600() { - this.field1071 = null; + void method596() { + this.field1076 = null; } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZB)V", - garbageValue = "-9" + descriptor = "(III)I", + garbageValue = "-1698780109" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - if (var1) { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { - try { - Desktop.getDesktop().browse(new URI(var0)); - return; - } catch (Exception var4) { - } + public static int method578(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { + if ((var1 & 1) != 0) { + var2 = var0 * var2; } - if (class31.field86.startsWith("win")) { - class351.method1840(var0, 0, "openjs"); - } else if (class31.field86.startsWith("mac")) { - class351.method1840(var0, 1, "openjs"); - } else { - class351.method1840(var0, 2, "openjs"); - } + var0 *= var0; + } + + if (var1 == 1) { + return var0 * var2; + } else { + return var2; + } + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Ldy;IIB)V", + garbageValue = "-51" + ) + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; + Script var4; + if (SongTask.isWorldMapEvent(var0.type)) { + GrandExchangeOfferOwnWorldComparator.worldMapEvent = (WorldMapEvent)var3[0]; + WorldMapElement var5 = class138.WorldMapElement_get(GrandExchangeOfferOwnWorldComparator.worldMapEvent.mapElement); + var4 = GrandExchangeOfferWorldComparator.getWorldMapScript(var0.type, var5.objectId, var5.category); } else { - class351.method1840(var0, 3, "openjs"); + int var6 = (Integer)var3[0]; + var4 = class133.getScript(var6); + } + + if (var4 != null) { + class147.runScriptLogic(var0, var4, var1, var2); } } -} + + @ObfuscatedName("on") + @ObfuscatedSignature( + descriptor = "(IIIZB)V", + garbageValue = "-59" + ) + public static void method597(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.TELEPORT, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByteNeg(var2); + var4.packetBuffer.writeShort(var1); + var4.packetBuffer.writeIntIME(var3 ? Client.field476 * -1700661189 * -770825997 : 0); + var4.packetBuffer.writeShortAdd(var0); + Client.packetWriter.addNode(var4); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/NPCComposition.java b/osrs/src/main/java/NPCComposition.java index d7c12b2fc..e0bed69a0 100644 --- a/osrs/src/main/java/NPCComposition.java +++ b/osrs/src/main/java/NPCComposition.java @@ -2,157 +2,165 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("hi") +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +@ObfuscatedName("hw") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("vd") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsy;" + descriptor = "Lnu;" ) - static PlatformInfo field1570; - @ObfuscatedName("ar") + @Export("NpcDefinition_archive") + public static AbstractArchive NpcDefinition_archive; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) - public static AbstractArchive field1567; - @ObfuscatedName("am") + public static AbstractArchive field1586; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("NpcDefinition_cached") - static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("as") + public static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("NpcDefinition_cachedModels") - static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("aj") + public static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("kk") + @Export("cameraX") + static int cameraX; + @ObfuscatedName("ai") @Export("id") public int id; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("name") public String name; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("size") public int size; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("models") int[] models; - @ObfuscatedName("ap") - int[] field1577; - @ObfuscatedName("aq") + @ObfuscatedName("af") + int[] field1595; + @ObfuscatedName("ad") @Export("idleSequence") public int idleSequence; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("walkSequence") public int walkSequence; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("runSequence") public int runSequence; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("runBackSequence") public int runBackSequence; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("runLeftSequence") public int runLeftSequence; - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("runRightSequence") public int runRightSequence; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("crawlSequence") public int crawlSequence; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("crawlBackSequence") public int crawlBackSequence; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("crawlLeftSequence") public int crawlLeftSequence; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("crawlRightSequence") public int crawlRightSequence; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("bd") + @ObfuscatedName("bh") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("bb") + @ObfuscatedName("bj") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("actions") public String[] actions; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("combatLevel") public int combatLevel; - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("widthScale") int widthScale; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("heightScale") int heightScale; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @Export("ambient") int ambient; - @ObfuscatedName("br") + @ObfuscatedName("bq") @Export("contrast") int contrast; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("rotation") public int rotation; - @ObfuscatedName("be") + @ObfuscatedName("bl") @Export("transforms") public int[] transforms; - @ObfuscatedName("bc") + @ObfuscatedName("bp") @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @Export("transformVarp") int transformVarp; - @ObfuscatedName("bu") + @ObfuscatedName("bo") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("bk") + @ObfuscatedName("bb") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("bz") + @ObfuscatedName("br") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("bx") + @ObfuscatedName("be") @Export("headIconArchiveIds") int[] headIconArchiveIds; - @ObfuscatedName("bh") + @ObfuscatedName("bi") @Export("headIconSpriteIndexes") short[] headIconSpriteIndexes; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Lsa;" + descriptor = "Lsf;" ) @Export("params") IterableNodeHashTable params; @@ -198,19 +206,19 @@ public class NPCComposition extends DualNode { this.headIconSpriteIndexes = null; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "906627314" + garbageValue = "1327356589" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "80" + descriptor = "(Ltm;B)V", + garbageValue = "61" ) @Export("decode") void decode(Buffer var1) { @@ -224,10 +232,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "2143209883" + descriptor = "(Ltm;II)V", + garbageValue = "-394380179" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -284,10 +292,10 @@ void decodeNext(Buffer var1, int var2) { } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.field1577 = new int[var3]; + this.field1595 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field1577[var4] = var1.readUnsignedShort(); + this.field1595[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; @@ -321,8 +329,8 @@ void decodeNext(Buffer var1, int var2) { this.headIconArchiveIds[var6] = -1; this.headIconSpriteIndexes[var6] = -1; } else { - this.headIconArchiveIds[var6] = var1.method2543(); - this.headIconSpriteIndexes[var6] = (short)var1.method2540(); + this.headIconArchiveIds[var6] = var1.method2563(); + this.headIconSpriteIndexes[var6] = (short)var1.method2560(); } } } else if (var2 == 103) { @@ -349,7 +357,7 @@ void decodeNext(Buffer var1, int var2) { this.crawlLeftSequence = var1.readUnsignedShort(); this.crawlRightSequence = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = class141.readStringIntParameters(var1, this.params); + this.params = Decimator.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -386,24 +394,24 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lig;ILig;ILhs;I)Ljo;", - garbageValue = "1827488061" + descriptor = "(Lib;ILib;ILhq;I)Ljr;", + garbageValue = "209230471" ) - public final Model method966(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4, NewShit var5) { + public final Model method985(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4, NewShit var5) { if (this.transforms != null) { NPCComposition var6 = this.transform(); - return var6 == null ? null : var6.method966(var1, var2, var3, var4, var5); + return var6 == null ? null : var6.method985(var1, var2, var3, var4, var5); } else { long var10 = (long)this.id; if (var5 != null) { - var10 |= var5.field1566 << 16; + var10 |= var5.field1582 << 16; } Model var8 = (Model)NpcDefinition_cachedModels.get(var10); if (var8 == null) { - ModelData var9 = this.method968(this.models, var5); + ModelData var9 = this.method987(this.models, var5); if (var9 == null) { return null; } @@ -431,29 +439,29 @@ public final Model method966(SequenceDefinition var1, int var2, SequenceDefiniti } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lhs;I)Lie;", - garbageValue = "1919655467" + descriptor = "(Lhq;I)Lic;", + garbageValue = "-539413854" ) - public final ModelData method967(NewShit var1) { + public final ModelData method986(NewShit var1) { if (this.transforms != null) { NPCComposition var2 = this.transform(); - return var2 == null ? null : var2.method967(var1); + return var2 == null ? null : var2.method986(var1); } else { - return this.method968(this.field1577, var1); + return this.method987(this.field1595, var1); } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "([ILhs;I)Lie;", - garbageValue = "1988428396" + descriptor = "([ILhq;I)Lic;", + garbageValue = "-1668692143" ) - ModelData method968(int[] var1, NewShit var2) { + ModelData method987(int[] var1, NewShit var2) { int[] var3 = var1; - if (var2 != null && var2.field1562 != null) { - var3 = var2.field1562; + if (var2 != null && var2.field1578 != null) { + var3 = var2.field1578; } if (var3 == null) { @@ -462,7 +470,7 @@ ModelData method968(int[] var1, NewShit var2) { boolean var4 = false; for (int var5 = 0; var5 < var3.length; ++var5) { - if (var3[var5] != -1 && !field1567.tryLoadFile(var3[var5], 0)) { + if (var3[var5] != -1 && !field1586.tryLoadFile(var3[var5], 0)) { var4 = true; } } @@ -473,7 +481,7 @@ ModelData method968(int[] var1, NewShit var2) { ModelData[] var9 = new ModelData[var3.length]; for (int var6 = 0; var6 < var3.length; ++var6) { - var9[var6] = ModelData.ModelData_get(field1567, var3[var6], 0); + var9[var6] = ModelData.ModelData_get(field1586, var3[var6], 0); } ModelData var10; @@ -490,8 +498,8 @@ ModelData method968(int[] var1, NewShit var2) { int var8; if (this.recolorFrom != null) { var7 = this.recolorTo; - if (var2 != null && var2.field1564 != null) { - var7 = var2.field1564; + if (var2 != null && var2.field1579 != null) { + var7 = var2.field1579; } for (var8 = 0; var8 < this.recolorFrom.length; ++var8) { @@ -501,8 +509,8 @@ ModelData method968(int[] var1, NewShit var2) { if (this.retextureFrom != null) { var7 = this.retextureTo; - if (var2 != null && var2.field1563 != null) { - var7 = var2.field1563; + if (var2 != null && var2.field1580 != null) { + var7 = var2.field1580; } for (var8 = 0; var8 < this.retextureFrom.length; ++var8) { @@ -515,16 +523,16 @@ ModelData method968(int[] var1, NewShit var2) { } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)Lhi;", - garbageValue = "253383500" + descriptor = "(I)Lhw;", + garbageValue = "601463714" ) @Export("transform") public final NPCComposition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WallDecoration.getVarbit(this.transformVarbit); + var1 = ClientPreferences.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -536,13 +544,13 @@ public final NPCComposition transform() { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? Tile.getNpcDefinition(var2) : null; + return var2 != -1 ? class90.getNpcDefinition(var2) : null; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1593779214" + garbageValue = "-1759835926" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -551,7 +559,7 @@ public boolean transformIsVisible() { } else { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WallDecoration.getVarbit(this.transformVarbit); + var1 = ClientPreferences.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -564,20 +572,33 @@ public boolean transformIsVisible() { } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-17" + descriptor = "(III)I", + garbageValue = "666148564" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return FileSystem.method904(this.params, var1, var2); + IterableNodeHashTable var4 = this.params; + int var3; + if (var4 == null) { + var3 = var2; + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = var5.integer; + } + } + + return var3; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-802547226" + descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", + garbageValue = "18686" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { @@ -597,71 +618,163 @@ public String getStringParam(int var1, String var2) { return var3; } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "193919919" + garbageValue = "-1337566276" ) - public boolean method973() { + public boolean method992() { return this.headIconArchiveIds != null && this.headIconSpriteIndexes != null; } - @ObfuscatedName("ax") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "898038948" + garbageValue = "44298877" ) - public int[] method974() { + public int[] method993() { return this.headIconArchiveIds; } - @ObfuscatedName("aa") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "2078204105" + garbageValue = "-1762616246" ) - public int method975(int var1) { + public int method994(int var1) { return this.headIconArchiveIds != null && var1 < this.headIconArchiveIds.length ? this.headIconArchiveIds[var1] : -1; } - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)[S", - garbageValue = "-68700738" + garbageValue = "1594332022" ) - public short[] method976() { + public short[] method995() { return this.headIconSpriteIndexes; } - @ObfuscatedName("ae") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)S", - garbageValue = "1198678943" + descriptor = "(IB)S", + garbageValue = "-67" ) - public short method977(int var1) { + public short method996(int var1) { return this.headIconSpriteIndexes != null && var1 < this.headIconSpriteIndexes.length ? this.headIconSpriteIndexes[var1] : -1; } - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)Lhw;", - garbageValue = "93" + descriptor = "(Ltm;II)V", + garbageValue = "1881602206" ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); + var2.size = var0.readUnsignedByte(); + var2.id = var0.readInt(); + var2.operations = new int[var2.size]; + var2.creationErrors = new int[var2.size]; + var2.fields = new Field[var2.size]; + var2.intReplaceValues = new int[var2.size]; + var2.methods = new Method[var2.size]; + var2.arguments = new byte[var2.size][][]; + + for (int var3 = 0; var3 < var2.size; ++var3) { + try { + int var4 = var0.readUnsignedByte(); + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { + if (var4 == 3 || var4 == 4) { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = var0.readUnsignedByte(); + String[] var8 = new String[var7]; + + for (int var9 = 0; var9 < var7; ++var9) { + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); + byte[][] var10 = new byte[var7][]; + int var12; + if (var4 == 3) { + for (int var11 = 0; var11 < var7; ++var11) { + var12 = var0.readInt(); + var10[var11] = new byte[var12]; + var0.readBytes(var10[var11], 0, var12); + } + } + + var2.operations[var3] = var4; + Class[] var21 = new Class[var7]; + + for (var12 = 0; var12 < var7; ++var12) { + var21[var12] = ItemLayer.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = ItemLayer.loadClassFromDescriptor(var20); + if (ItemLayer.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + Method[] var13 = ItemLayer.loadClassFromDescriptor(var5).getDeclaredMethods(); + Method[] var14 = var13; + + for (int var15 = 0; var15 < var14.length; ++var15) { + Method var16 = var14[var15]; + if (Reflection.getMethodName(var16).equals(var6)) { + Class[] var17 = Reflection.getParameterTypes(var16); + if (var17.length == var21.length) { + boolean var18 = true; + + for (int var19 = 0; var19 < var21.length; ++var19) { + if (var21[var19] != var17[var19]) { + var18 = false; + break; + } + } + + if (var18 && var22 == var16.getReturnType()) { + var2.methods[var3] = var16; + } + } + } + } + + var2.arguments[var3] = var10; + } + } else { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = 0; + if (var4 == 1) { + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; + var2.intReplaceValues[var3] = var7; + if (ItemLayer.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; + var2.fields[var3] = Reflection.findField(ItemLayer.loadClassFromDescriptor(var5), var6); + } + } catch (ClassNotFoundException var24) { + var2.creationErrors[var3] = -1; + } catch (SecurityException var25) { + var2.creationErrors[var3] = -2; + } catch (NullPointerException var26) { + var2.creationErrors[var3] = -3; + } catch (Exception var27) { + var2.creationErrors[var3] = -4; + } catch (Throwable var28) { + var2.creationErrors[var3] = -5; + } } + + class36.reflectionChecks.addFirst(var2); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/NanoClock.java b/osrs/src/main/java/NanoClock.java index 022f19545..3569396a0 100644 --- a/osrs/src/main/java/NanoClock.java +++ b/osrs/src/main/java/NanoClock.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gy") +@ObfuscatedName("gs") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("lastTimeNano") long lastTimeNano; @@ -14,20 +14,20 @@ public NanoClock() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1541664401" + garbageValue = "-1021685028" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(IIB)I", - garbageValue = "64" + garbageValue = "20" ) @Export("wait") public int wait(int var1, int var2) { @@ -37,7 +37,7 @@ public int wait(int var1, int var2) { var5 = var3; } - class13.method44(var5 / 1000000L); + PendingSpawn.method505(var5 / 1000000L); long var7 = System.nanoTime(); int var9; @@ -51,4 +51,4 @@ public int wait(int var1, int var2) { return var9; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/NewShit.java b/osrs/src/main/java/NewShit.java index e8b556a9f..d3cbae177 100644 --- a/osrs/src/main/java/NewShit.java +++ b/osrs/src/main/java/NewShit.java @@ -1,70 +1,50 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("hq") @Implements("NewShit") public class NewShit { - @ObfuscatedName("aw") - public long field1566; - @ObfuscatedName("ay") - int[] field1562; - @ObfuscatedName("ar") - short[] field1564; - @ObfuscatedName("am") - short[] field1563; - @ObfuscatedName("as") - public boolean field1565; + @ObfuscatedName("hr") + static int[] field1577; + @ObfuscatedName("au") + public long field1582; + @ObfuscatedName("ae") + int[] field1578; + @ObfuscatedName("ao") + short[] field1579; + @ObfuscatedName("at") + short[] field1580; + @ObfuscatedName("ac") + public boolean field1581; public NewShit(long var1, int[] var3, short[] var4, short[] var5, boolean var6) { - this.field1565 = false; - this.field1566 = var1; - this.field1562 = var3; - this.field1564 = var4; - this.field1563 = var5; - this.field1565 = var6; + this.field1581 = false; + this.field1582 = var1; + this.field1578 = var3; + this.field1579 = var4; + this.field1580 = var5; + this.field1581 = var6; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfm;FI)F", - garbageValue = "-1510328589" + descriptor = "(IB)I", + garbageValue = "29" ) - static float method961(class130 var0, float var1) { - if (var0 == null) { - return 0.0F; - } else { - float var2; - if (var0.field1234 == var1) { - var2 = 0.0F; - } else if (var1 == var0.field1244) { - var2 = 1.0F; - } else { - var2 = (var1 - var0.field1234) / (var0.field1244 - var0.field1234); - } - - float var3; - if (var0.field1227) { - var3 = var2; - } else { - class126.field1197[3] = var0.field1240; - class126.field1197[2] = var0.field1239; - class126.field1197[1] = var0.field1238; - class126.field1197[0] = var0.field1242 - var2; - class126.field1196[0] = 0.0F; - class126.field1196[1] = 0.0F; - class126.field1196[2] = 0.0F; - class126.field1196[3] = 0.0F; - class126.field1196[4] = 0.0F; - int var4 = DbRowType.method2486(class126.field1197, 3, 0.0F, true, 1.0F, true, class126.field1196); - if (var4 == 1) { - var3 = class126.field1196[0]; - } else { - var3 = 0.0F; - } - } + public static int method979(int var0) { + return var0 >>> 4 & class508.field4121; + } - return (var0.field1243 + (var0.field1233 + var3 * var0.field1241) * var3) * var3 + var0.field1235; - } + @ObfuscatedName("nc") + @ObfuscatedSignature( + descriptor = "(Lmi;I)I", + garbageValue = "-282927864" + ) + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); + return var1 != null ? var1.integer : var0.flags; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Node.java b/osrs/src/main/java/Node.java index c453d04db..7b7f7a394 100644 --- a/osrs/src/main/java/Node.java +++ b/osrs/src/main/java/Node.java @@ -3,26 +3,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sb") +@ObfuscatedName("sj") @Implements("Node") public class Node { - @ObfuscatedName("hs") + @ObfuscatedName("hq") @Export("key") public long key; - @ObfuscatedName("hl") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("previous") public Node previous; - @ObfuscatedName("hd") + @ObfuscatedName("hy") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("next") public Node next; - @ObfuscatedName("gf") + @ObfuscatedName("gg") @Export("remove") public void remove() { if (this.next != null) { @@ -33,9 +33,9 @@ public void remove() { } } - @ObfuscatedName("gk") + @ObfuscatedName("gw") @Export("hasNext") public boolean hasNext() { return this.next != null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/NodeDeque.java b/osrs/src/main/java/NodeDeque.java index d3ba55a11..10dcfc715 100644 --- a/osrs/src/main/java/NodeDeque.java +++ b/osrs/src/main/java/NodeDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("od") +@ObfuscatedName("ow") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public NodeDeque() { this.sentinel.next = this.sentinel; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public void clear() { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lsb;)V" + descriptor = "(Lsj;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public void addFirst(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lsb;)V" + descriptor = "(Lsj;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public void addLast(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public Node removeLast() { } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public Node removeFirst() { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public Node last() { } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public Node first() { } } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public Node previous() { } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("next") public Node next() { @@ -165,14 +165,14 @@ public Node next() { } } - @ObfuscatedName("aq") - public boolean method1960() { + @ObfuscatedName("ad") + public boolean method1997() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lsb;Lsb;)V" + descriptor = "(Lsj;Lsj;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { @@ -185,4 +185,4 @@ public static void NodeDeque_addBefore(Node var0, Node var1) { var0.next.previous = var0; var0.previous.next = var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/NodeHashTable.java b/osrs/src/main/java/NodeHashTable.java index c2ae50e3e..74a687646 100644 --- a/osrs/src/main/java/NodeHashTable.java +++ b/osrs/src/main/java/NodeHashTable.java @@ -3,31 +3,31 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sm") +@ObfuscatedName("so") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("size") int size; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[Lsb;" + descriptor = "[Lsj;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsj;" ) @Export("current") Node current; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("index") int index; @@ -44,9 +44,9 @@ public NodeHashTable(int var1) { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(J)Lsb;" + descriptor = "(J)Lsj;" ) @Export("get") public Node get(long var1) { @@ -64,8 +64,8 @@ public Node get(long var1) { return null; } - @ObfuscatedName("ay") - public int method2430() { + @ObfuscatedName("ae") + public int method2456() { int var1 = 0; for (int var2 = 0; var2 < this.size; ++var2) { @@ -79,9 +79,9 @@ public int method2430() { return var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lsb;J)V" + descriptor = "(Lsj;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -97,9 +97,9 @@ public void put(Node var1, long var2) { var1.key = var2; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("first") public Node first() { @@ -107,9 +107,9 @@ public Node first() { return this.next(); } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsj;" ) @Export("next") public Node next() { @@ -131,4 +131,4 @@ public Node next() { return var1; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/JSONObject$Null.java b/osrs/src/main/java/Null.java similarity index 80% rename from osrs/src/main/java/JSONObject$Null.java rename to osrs/src/main/java/Null.java index 92701f26d..4905f7268 100644 --- a/osrs/src/main/java/JSONObject$Null.java +++ b/osrs/src/main/java/Null.java @@ -2,16 +2,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@Implements("JSONObject$Null") +@Implements("org/json/JSONObject$Null") @ObfuscatedName("org/json/JSONObject$Null") -final class JSONObject$Null { - JSONObject$Null() { +final class Null { + + + Null() { } public final Object clone() { return this; } + @Export("equals") @ObfuscatedName("equals") public boolean equals(Object var1) { return var1 == null || this == var1; @@ -20,4 +23,4 @@ public boolean equals(Object var1) { public String toString() { return "null"; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/OAuthApi.java b/osrs/src/main/java/OAuthApi.java new file mode 100644 index 000000000..a0c704f6f --- /dev/null +++ b/osrs/src/main/java/OAuthApi.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.Implements; + +@Implements("OAuthApi") +public interface OAuthApi { +} \ No newline at end of file diff --git a/osrs/src/main/java/ObfuscatedClassMap.java b/osrs/src/main/java/ObfuscatedClassMap.java new file mode 100644 index 000000000..65aafe687 --- /dev/null +++ b/osrs/src/main/java/ObfuscatedClassMap.java @@ -0,0 +1,8 @@ +import java.util.HashMap; + +public class ObfuscatedClassMap extends HashMap { + public static ObfuscatedClassMap INSTANCE = new ObfuscatedClassMap(); + static { + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/ObjTypeCustomisation.java b/osrs/src/main/java/ObjTypeCustomisation.java index 769cd4a59..3be82be48 100644 --- a/osrs/src/main/java/ObjTypeCustomisation.java +++ b/osrs/src/main/java/ObjTypeCustomisation.java @@ -1,31 +1,26 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("ho") @Implements("ObjTypeCustomisation") public class ObjTypeCustomisation { - @ObfuscatedName("av") - public static int field1482; - @ObfuscatedName("ht") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("ut") - static int cameraLookAtY; - @ObfuscatedName("ar") + @ObfuscatedName("ef") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("jw") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("ao") @Export("recol") public short[] recol; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("retex") public short[] retex; public ObjTypeCustomisation(int var1) { - ItemComposition var2 = class125.ItemDefinition_get(var1); + ItemComposition var2 = InvDefinition.ItemDefinition_get(var1); if (var2.hasRecolor()) { this.recol = new short[var2.recolorTo.length]; System.arraycopy(var2.recolorTo, 0, this.recol, 0, this.recol.length); @@ -38,692 +33,61 @@ public ObjTypeCustomisation(int var1) { } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-1206238469" + descriptor = "(II)Lhx;", + garbageValue = "1562515394" ) - public static void method923(String var0, String var1, String var2, int var3, int var4) throws IOException { - if (var1 != null && !var1.isEmpty()) { - var0 = var0 + "-" + var1; - } - - JagexCache.field1450 = var4; - UserList.cacheGamebuild = var3; - - try { - class424.field3759 = System.getProperty("os.name"); - } catch (Exception var36) { - class424.field3759 = "Unknown"; - } - - CollisionMap.field1871 = class424.field3759.toLowerCase(); - Bounds.userHomeDirectory = null; - - try { - Bounds.userHomeDirectory = System.getProperty("jagex.userhome"); - } catch (Exception var35) { - } - - if (Bounds.userHomeDirectory == null) { - try { - Bounds.userHomeDirectory = System.getProperty("user.home"); - } catch (Exception var34) { - } - } - - if (Bounds.userHomeDirectory != null) { - Bounds.userHomeDirectory = Bounds.userHomeDirectory + "/"; - } - - try { - if (CollisionMap.field1871.startsWith("win")) { - if (Bounds.userHomeDirectory == null) { - Bounds.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (Bounds.userHomeDirectory == null) { - Bounds.userHomeDirectory = System.getenv("HOME"); - } - - if (Bounds.userHomeDirectory != null) { - Bounds.userHomeDirectory = Bounds.userHomeDirectory + "/"; - } - } catch (Exception var33) { - } - - if (Bounds.userHomeDirectory == null) { - Bounds.userHomeDirectory = "~/"; - } - - class157.field1396 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", Bounds.userHomeDirectory, "/tmp/", ""}; - ByteArrayPool.field3737 = new String[]{".jagex_cache_" + UserList.cacheGamebuild, ".file_store_" + UserList.cacheGamebuild}; - int var19 = 0; - - label265: - while (var19 < 4) { - String var7 = var19 == 0 ? "" : "" + var19; - class158.field1398 = new File(Bounds.userHomeDirectory, "jagex_cl_" + var0 + "_" + var2 + var7 + ".dat"); - String var8 = null; - String var9 = null; - boolean var10 = false; - Buffer var12; - int var13; - int var15; - File var41; - if (class158.field1398.exists()) { - try { - AccessFile var11 = new AccessFile(class158.field1398, "rw", 10000L); - - for (var12 = new Buffer((int)var11.length()); var12.offset < var12.array.length; var12.offset += var13) { - var13 = var11.read(var12.array, var12.offset, var12.array.length - var12.offset); - if (var13 == -1) { - throw new IOException(); - } - } - - var12.offset = 0; - var13 = var12.readUnsignedByte(); - if (var13 < 1 || var13 > 3) { - throw new IOException("" + var13); - } - - int var14 = 0; - if (var13 > 1) { - var14 = var12.readUnsignedByte(); - } - - if (var13 <= 2) { - var8 = var12.readStringCp1252NullCircumfixed(); - if (var14 == 1) { - var9 = var12.readStringCp1252NullCircumfixed(); - } - } else { - var8 = var12.method2536(); - if (var14 == 1) { - var9 = var12.method2536(); - } - } - - var11.close(); - } catch (IOException var38) { - var38.printStackTrace(); - } - - if (var8 != null) { - var41 = new File(var8); - if (!var41.exists()) { - var8 = null; - } - } - - if (var8 != null) { - var41 = new File(var8, "test.dat"); - - boolean var43; - try { - RandomAccessFile var20 = new RandomAccessFile(var41, "rw"); - var15 = var20.read(); - var20.seek(0L); - var20.write(var15); - var20.seek(0L); - var20.close(); - var41.delete(); - var43 = true; - } catch (Exception var32) { - var43 = false; - } - - if (!var43) { - var8 = null; - } - } - } - - if (var8 == null && var19 == 0) { - label239: - for (int var21 = 0; var21 < ByteArrayPool.field3737.length; ++var21) { - for (int var22 = 0; var22 < class157.field1396.length; ++var22) { - File var23 = new File(class157.field1396[var22] + ByteArrayPool.field3737[var21] + File.separatorChar + var0 + File.separatorChar); - if (var23.exists()) { - File var24 = new File(var23, "test.dat"); - - boolean var45; - try { - RandomAccessFile var16 = new RandomAccessFile(var24, "rw"); - int var17 = var16.read(); - var16.seek(0L); - var16.write(var17); - var16.seek(0L); - var16.close(); - var24.delete(); - var45 = true; - } catch (Exception var31) { - var45 = false; - } - - if (var45) { - var8 = var23.toString(); - var10 = true; - break label239; - } - } - } - } - } - - if (var8 == null) { - var8 = Bounds.userHomeDirectory + File.separatorChar + "jagexcache" + var7 + File.separatorChar + var0 + File.separatorChar + var2 + File.separatorChar; - var10 = true; - } - - File var40; - if (var9 != null) { - var40 = new File(var9); - var41 = new File(var8); - - try { - File[] var50 = var40.listFiles(); - File[] var47 = var50; - - for (var15 = 0; var15 < var47.length; ++var15) { - File var46 = var47[var15]; - File var25 = new File(var41, var46.getName()); - boolean var18 = var46.renameTo(var25); - if (!var18) { - throw new IOException(); - } - } - } catch (Exception var37) { - var37.printStackTrace(); - } - - var10 = true; - } - - if (var10) { - var40 = new File(var8); - var12 = null; - - try { - AccessFile var51 = new AccessFile(class158.field1398, "rw", 10000L); - Buffer var48 = new Buffer(500); - var48.writeByte(3); - var48.writeByte(var12 != null ? 1 : 0); - var48.writeCESU8(var40.getPath()); - if (var12 != null) { - var48.writeCESU8(""); - } - - var51.write(var48.array, 0, var48.offset); - var51.close(); - } catch (IOException var30) { - var30.printStackTrace(); - } - } - - File var6 = new File(var8); - JagexCache.cacheDir = var6; - if (!JagexCache.cacheDir.exists()) { - JagexCache.cacheDir.mkdirs(); - } - - File[] var39 = JagexCache.cacheDir.listFiles(); - if (var39 != null) { - File[] var42 = var39; - - for (int var26 = 0; var26 < var42.length; ++var26) { - File var27 = var42[var26]; - - boolean var49; - try { - RandomAccessFile var44 = new RandomAccessFile(var27, "rw"); - var13 = var44.read(); - var44.seek(0L); - var44.write(var13); - var44.seek(0L); - var44.close(); - var49 = true; - } catch (Exception var29) { - var49 = false; - } - - if (!var49) { - ++var19; - continue label265; - } - } - } - break; - } - - File var5 = JagexCache.cacheDir; - FileSystem.FileSystem_cacheDir = var5; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - FileSystem.FileSystem_hasPermissions = true; - User.method2191(); - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class7.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class7.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - class302.JagexCache_idxFiles = new BufferedFile[JagexCache.field1450]; - - for (int var28 = 0; var28 < JagexCache.field1450; ++var28) { - class302.JagexCache_idxFiles[var28] = new BufferedFile(new AccessFile(class7.getFile("main_file_cache.idx" + var28), "rw", 1048576L), 6000, 0); + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } + var1.postDecode(); + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("as") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(Ltc;IB)Z", - garbageValue = "-18" + descriptor = "(ILdh;ZI)I", + garbageValue = "-1153015817" ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { - if (var0.readBits(1) != 0) { - updateExternalPlayer(var0, var1); - } - - var3 = var0.readBits(13); - var4 = var0.readBits(13); - boolean var12 = var0.readBits(1) == 1; - if (var12) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { - throw new RuntimeException(); - } else { - Player var11 = Client.players[var1] = new Player(); - var11.index = var1; - if (Players.cachedAppearanceBuffer[var1] != null) { - var11.read(Players.cachedAppearanceBuffer[var1]); - } - - var11.orientation = Players.Players_orientations[var1]; - var11.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var11.pathTraversed[0] = Players.playerMovementSpeeds[var1]; - var11.plane = (byte)var8; - var11.resetPath((var9 << 13) + var3 - AbstractArchive.baseX, (var10 << 13) + var4 - class148.baseY); - var11.hasMovementPending = false; - return true; - } - } else if (var2 == 1) { - var3 = var0.readBits(2); - var4 = Players.Players_regions[var1]; - Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); - return false; + static int method935(int var0, Script var1, boolean var2) { + if (var0 == 6809) { + int var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + ObjectComposition var4 = WorldMapElement.getObjectDefinition(var3); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; + return 1; } else { - int var5; - int var6; - if (var2 == 2) { - var3 = var0.readBits(5); - var4 = var3 >> 3; - var5 = var3 & 7; - var6 = Players.Players_regions[var1]; - var7 = (var6 >> 28) + var4 & 3; - var8 = var6 >> 14 & 255; - var9 = var6 & 255; - if (var5 == 0) { - --var8; - --var9; - } - - if (var5 == 1) { - --var9; - } - - if (var5 == 2) { - ++var8; - --var9; - } - - if (var5 == 3) { - --var8; - } - - if (var5 == 4) { - ++var8; - } - - if (var5 == 5) { - --var8; - ++var9; - } - - if (var5 == 6) { - ++var9; - } - - if (var5 == 7) { - ++var8; - ++var9; - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); - return false; - } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var6 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var6 + var7 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); - return false; - } + return 2; } } - @ObfuscatedName("kn") + @ObfuscatedName("ot") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-1851987184" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1860309613" ) - @Export("addPendingSpawnToScene") - static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if (Client.isLowDetail && var0 != class36.Client_plane) { - return; - } - - long var8 = 0L; - boolean var10 = true; - boolean var11 = false; - boolean var12 = false; - if (var1 == 0) { - var8 = UserComparator5.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var8 = UserComparator5.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var8 = UserComparator5.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var8 = UserComparator5.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var13; - if (var8 != 0L) { - var13 = UserComparator5.scene.getObjectFlags(var0, var2, var3, var8); - int var41 = class458.Entity_unpackID(var8); - int var42 = var13 & 31; - int var43 = var13 >> 6 & 3; - ObjectComposition var14; - if (var1 == 0) { - UserComparator5.scene.removeBoundaryObject(var0, var2, var3); - var14 = class90.getObjectDefinition(var41); - if (var14.interactType != 0) { - Client.collisionMaps[var0].method1098(var2, var3, var42, var43, var14.boolean1); - } - } - - if (var1 == 1) { - UserComparator5.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - UserComparator5.scene.removeGameObject(var0, var2, var3); - var14 = class90.getObjectDefinition(var41); - if (var2 + var14.sizeX > 103 || var3 + var14.sizeX > 103 || var2 + var14.sizeY > 103 || var3 + var14.sizeY > 103) { - return; - } - - if (var14.interactType != 0) { - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var14.sizeX, var14.sizeY, var43, var14.boolean1); - } - } - - if (var1 == 3) { - UserComparator5.scene.removeFloorDecoration(var0, var2, var3); - var14 = class90.getObjectDefinition(var41); - if (var14.interactType == 1) { - Client.collisionMaps[var0].method1101(var2, var3); - } - } - } - - if (var4 >= 0) { - var13 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var13 = var0 + 1; - } - - Scene var44 = UserComparator5.scene; - CollisionMap var15 = Client.collisionMaps[var0]; - ObjectComposition var16 = class90.getObjectDefinition(var4); - int var17 = var7 >= 0 ? var7 : var16.animationId * 1366970691 * 763282283; - int var18; - int var19; - if (var5 != 1 && var5 != 3) { - var18 = var16.sizeX; - var19 = var16.sizeY; - } else { - var18 = var16.sizeY; - var19 = var16.sizeX; - } - - int var20; - int var21; - if (var18 + var2 <= 104) { - var20 = (var18 >> 1) + var2; - var21 = var2 + (var18 + 1 >> 1); - } else { - var20 = var2; - var21 = var2 + 1; - } - - int var22; - int var23; - if (var3 + var19 <= 104) { - var22 = var3 + (var19 >> 1); - var23 = var3 + (var19 + 1 >> 1); - } else { - var22 = var3; - var23 = var3 + 1; - } - - int[][] var24 = Tiles.Tiles_heights[var13]; - int var25 = var24[var21][var23] + var24[var20][var22] + var24[var21][var22] + var24[var20][var23] >> 2; - int var26 = (var2 << 7) + (var18 << 6); - int var27 = (var3 << 7) + (var19 << 6); - long var28 = BufferedNetSocket.calculateTag(var2, var3, 2, var16.int1 == 0, var4); - int var30 = (var5 << 6) + var6; - if (var16.int3 == 1) { - var30 += 256; - } - - Object var31; - if (var6 == 22) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(22, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 22, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newFloorDecoration(var0, var2, var3, var25, (Renderable)var31, var28, var30); - if (var16.interactType == 1) { - var15.setBlockedByFloorDec(var2, var3); - } - } else if (var6 != 10 && var6 != 11) { - if (var6 >= 12) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(var6, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, var6, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.method1221(var0, var2, var3, var25, 1, 1, (Renderable)var31, 0, var28, var30); - if (var16.interactType != 0) { - var15.addGameObject(var2, var3, var18, var19, var16.boolean1); - } - } else if (var6 == 0) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(0, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 0, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field840[var5], 0, var28, var30); - if (var16.interactType != 0) { - var15.method1093(var2, var3, var6, var5, var16.boolean1); - } - } else if (var6 == 1) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(1, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 1, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field844[var5], 0, var28, var30); - if (var16.interactType != 0) { - var15.method1093(var2, var3, var6, var5, var16.boolean1); - } - } else { - int var37; - if (var6 == 2) { - var37 = var5 + 1 & 3; - Object var32; - Object var33; - if (var17 == -1 && var16.transforms == null) { - var32 = var16.getModel(2, var5 + 4, var24, var26, var25, var27); - var33 = var16.getModel(2, var37, var24, var26, var25, var27); - } else { - var32 = new DynamicObject(var4, 2, var5 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - var33 = new DynamicObject(var4, 2, var37, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var32, (Renderable)var33, Tiles.field840[var5], Tiles.field840[var37], var28, var30); - if (var16.interactType != 0) { - var15.method1093(var2, var3, var6, var5, var16.boolean1); - } - } else if (var6 == 3) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(3, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 3, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field844[var5], 0, var28, var30); - if (var16.interactType != 0) { - var15.method1093(var2, var3, var6, var5, var16.boolean1); - } - } else if (var6 == 9) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(var6, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, var6, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.method1221(var0, var2, var3, var25, 1, 1, (Renderable)var31, 0, var28, var30); - if (var16.interactType != 0) { - var15.addGameObject(var2, var3, var18, var19, var16.boolean1); - } - } else if (var6 == 4) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(4, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 4, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field840[var5], 0, 0, 0, var28, var30); - } else { - Object var34; - long var38; - if (var6 == 5) { - var37 = 16; - var38 = var44.getBoundaryObjectTag(var0, var2, var3); - if (0L != var38) { - var37 = class90.getObjectDefinition(class458.Entity_unpackID(var38)).int2; - } - - if (var17 == -1 && var16.transforms == null) { - var34 = var16.getModel(4, var5, var24, var26, var25, var27); - } else { - var34 = new DynamicObject(var4, 4, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)null, Tiles.field840[var5], 0, var37 * Tiles.field839[var5], var37 * Tiles.field842[var5], var28, var30); - } else if (var6 == 6) { - var37 = 8; - var38 = var44.getBoundaryObjectTag(var0, var2, var3); - if (0L != var38) { - var37 = class90.getObjectDefinition(class458.Entity_unpackID(var38)).int2 / 2; - } - - if (var17 == -1 && var16.transforms == null) { - var34 = var16.getModel(4, var5 + 4, var24, var26, var25, var27); - } else { - var34 = new DynamicObject(var4, 4, var5 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)null, 256, var5, var37 * Tiles.field843[var5], var37 * Tiles.field841[var5], var28, var30); - } else if (var6 == 7) { - int var40 = var5 + 2 & 3; - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(4, var40 + 4, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 4, var40 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, 256, var40, 0, 0, var28, var30); - } else if (var6 == 8) { - var37 = 8; - var38 = var44.getBoundaryObjectTag(var0, var2, var3); - if (var38 != 0L) { - var37 = class90.getObjectDefinition(class458.Entity_unpackID(var38)).int2 / 2; - } - - int var36 = var5 + 2 & 3; - Object var35; - if (var17 == -1 && var16.transforms == null) { - var34 = var16.getModel(4, var5 + 4, var24, var26, var25, var27); - var35 = var16.getModel(4, var36 + 4, var24, var26, var25, var27); - } else { - var34 = new DynamicObject(var4, 4, var5 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - var35 = new DynamicObject(var4, 4, var36 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)var35, 256, var5, var37 * Tiles.field843[var5], var37 * Tiles.field841[var5], var28, var30); - } - } - } - } else { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(10, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 10, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - if (var31 != null) { - var44.method1221(var0, var2, var3, var25, var18, var19, (Renderable)var31, var6 == 11 ? 256 : 0, var28, var30); - } + static String method936(String var0) { + PlayerType[] var1 = MidiPcmStream.PlayerType_values(); - if (var16.interactType != 0) { - var15.addGameObject(var2, var3, var18, var19, var16.boolean1); - } - } + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon != -1 && var0.startsWith(Tile.addImageTag(var3.modIcon))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); + break; } } + return var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ObjectComposition.java b/osrs/src/main/java/ObjectComposition.java index a3b0a611c..ae1ce2517 100644 --- a/osrs/src/main/java/ObjectComposition.java +++ b/osrs/src/main/java/ObjectComposition.java @@ -1,188 +1,187 @@ -import java.util.ArrayList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("hv") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("ObjectDefinition_isLowDetail") public static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("ObjectDefinition_archive") public static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("ObjectDefinition_modelsArchive") public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("ObjectDefinition_cached") - public static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("as") + static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("ObjectDefinition_cachedEntities") - public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("ag") + static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("ObjectDefinition_cachedModels") - public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("az") + static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Lie;" + descriptor = "[Lic;" ) - static ModelData[] field1696; - @ObfuscatedName("av") + static ModelData[] field1715; + @ObfuscatedName("aa") @Export("id") public int id; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("modelIds") int[] modelIds; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("models") int[] models; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("name") public String name; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("sizeX") public int sizeX; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("sizeY") public int sizeY; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("interactType") public int interactType; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("int1") public int int1; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("clipType") int clipType; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("animationId") public int animationId; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("int2") public int int2; - @ObfuscatedName("bd") + @ObfuscatedName("bh") @Export("ambient") int ambient; - @ObfuscatedName("bb") + @ObfuscatedName("bj") @Export("contrast") int contrast; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("actions") public String[] actions; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("mapIconId") public int mapIconId; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("isRotated") boolean isRotated; - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("clipped") public boolean clipped; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("modelHeight") int modelHeight; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("br") + @ObfuscatedName("bq") @Export("offsetX") int offsetX; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("be") + @ObfuscatedName("bl") @Export("offsetY") int offsetY; - @ObfuscatedName("bc") + @ObfuscatedName("bp") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @Export("isSolid") boolean isSolid; - @ObfuscatedName("bu") + @ObfuscatedName("bo") @Export("int3") public int int3; - @ObfuscatedName("bk") + @ObfuscatedName("bb") @Export("transforms") public int[] transforms; - @ObfuscatedName("bz") + @ObfuscatedName("br") @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("bx") + @ObfuscatedName("be") @Export("transformVarp") int transformVarp; - @ObfuscatedName("bh") + @ObfuscatedName("bi") @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @Export("int7") public int int7; - @ObfuscatedName("bl") + @ObfuscatedName("bx") @Export("int5") public int int5; - @ObfuscatedName("bt") + @ObfuscatedName("bn") @Export("int6") public int int6; - @ObfuscatedName("by") + @ObfuscatedName("bw") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("bg") + @ObfuscatedName("bc") @Export("boolean3") public boolean boolean3; - @ObfuscatedName("bj") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lsa;" + descriptor = "Lsf;" ) @Export("params") IterableNodeHashTable params; @@ -193,7 +192,7 @@ public class ObjectComposition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field1696 = new ModelData[4]; + field1715 = new ModelData[4]; } ObjectComposition() { @@ -233,10 +232,10 @@ public class ObjectComposition extends DualNode { this.boolean3 = true; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-44" + descriptor = "(I)V", + garbageValue = "1533225250" ) @Export("postDecode") void postDecode() { @@ -259,10 +258,10 @@ void postDecode() { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "-2056657016" + descriptor = "(Ltm;I)V", + garbageValue = "814995396" ) @Export("decode") void decode(Buffer var1) { @@ -276,10 +275,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-1391399549" + descriptor = "(Ltm;IB)V", + garbageValue = "-24" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -289,7 +288,7 @@ void decodeNext(Buffer var1, int var2) { var3 = var1.readUnsignedByte(); if (var3 > 0) { if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += var3 * 3; + var1.offset += 3 * var3; } else { this.models = new int[var3]; this.modelIds = new int[var3]; @@ -418,7 +417,7 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 89) { this.boolean3 = false; } else if (var2 == 249) { - this.params = class141.readStringIntParameters(var1, this.params); + this.params = Decimator.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -454,12 +453,12 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-167413289" + garbageValue = "-972773688" ) - public final boolean method1021(int var1) { + public final boolean method1040(int var1) { if (this.models != null) { for (int var4 = 0; var4 < this.models.length; ++var4) { if (this.models[var4] == var1) { @@ -483,10 +482,10 @@ public final boolean method1021(int var1) { } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-34" + descriptor = "(I)Z", + garbageValue = "-559148506" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -503,10 +502,10 @@ public final boolean needsModelFiles() { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(II[[IIIIB)Lit;", - garbageValue = "4" + descriptor = "(II[[IIIII)Lik;", + garbageValue = "1807425281" ) @Export("getEntity") public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -544,17 +543,17 @@ public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, in if (var9 instanceof Model) { var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method1137(var3, var4, var5, var6, true, this.clipType); + var9 = ((ModelData)var9).method1161(var3, var4, var5, var6, true, this.clipType); } } return (Renderable)var9; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Ljo;", - garbageValue = "-348605554" + descriptor = "(II[[IIIII)Ljr;", + garbageValue = "186697514" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -583,10 +582,10 @@ public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5 return var9; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(II[[IIIILig;II)Ljo;", - garbageValue = "1903396477" + descriptor = "(II[[IIIILib;II)Ljr;", + garbageValue = "-749242095" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -625,10 +624,10 @@ public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, i } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(III)Lie;", - garbageValue = "535897413" + descriptor = "(IIB)Lic;", + garbageValue = "54" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -666,19 +665,19 @@ final ModelData getModelData(int var1, int var2) { } if (var4) { - var3.method1146(); + var3.method1170(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); } if (var5 > 1) { - field1696[var6] = var3; + field1715[var6] = var3; } } if (var5 > 1) { - var3 = new ModelData(field1696, var5); + var3 = new ModelData(field1715, var5); } } else { int var9 = -1; @@ -708,7 +707,7 @@ final ModelData getModelData(int var1, int var2) { } if (var10) { - var3.method1146(); + var3.method1170(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); @@ -728,19 +727,19 @@ final ModelData getModelData(int var1, int var2) { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true); if (var1 == 4 && var2 > 3) { - var8.method1142(256); + var8.method1166(256); var8.changeOffset(45, 0, -45); } var2 &= 3; if (var2 == 1) { - var8.method1139(); + var8.method1163(); } else if (var2 == 2) { - var8.method1140(); + var8.method1164(); } else if (var2 == 3) { - var8.method1141(); + var8.method1165(); } if (this.recolorFrom != null) { @@ -766,16 +765,16 @@ final ModelData getModelData(int var1, int var2) { return var8; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(I)Lhb;", - garbageValue = "-389274434" + descriptor = "(I)Lhv;", + garbageValue = "1529858789" ) @Export("transform") public final ObjectComposition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WallDecoration.getVarbit(this.transformVarbit); + var1 = ClientPreferences.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -787,23 +786,23 @@ public final ObjectComposition transform() { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class90.getObjectDefinition(var2) : null; + return var2 != -1 ? WorldMapElement.getObjectDefinition(var2) : null; } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-72" + descriptor = "(III)I", + garbageValue = "-545468094" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return FileSystem.method904(this.params, var1, var2); + return class14.method39(this.params, var1, var2); } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", - garbageValue = "2608" + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "-40" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { @@ -823,10 +822,10 @@ public String getStringParam(int var1, String var2) { return var3; } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-79" + descriptor = "(I)Z", + garbageValue = "-1618181755" ) @Export("hasSound") public boolean hasSound() { @@ -835,7 +834,7 @@ public boolean hasSound() { } else { for (int var1 = 0; var1 < this.transforms.length; ++var1) { if (this.transforms[var1] != -1) { - ObjectComposition var2 = class90.getObjectDefinition(this.transforms[var1]); + ObjectComposition var2 = WorldMapElement.getObjectDefinition(this.transforms[var1]); if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { return true; } @@ -846,78 +845,17 @@ public boolean hasSound() { } } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "20257906" + descriptor = "(I)V", + garbageValue = "1838195729" ) - @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var4 == null) { - var4 = new ItemContainer(); - ItemContainer.itemContainers.put(var4, (long)var0); - } - - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; - - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { - var5[var7] = var4.ids[var7]; - var6[var7] = var4.quantities[var7]; - } - - for (var7 = var4.ids.length; var7 < var1; ++var7) { - var5[var7] = -1; - var6[var7] = 0; - } - - var4.ids = var5; - var4.quantities = var6; + static void method1042() { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; } - var4.ids[var1] = var2; - var4.quantities[var1] = var3; - } - - @ObfuscatedName("is") - @ObfuscatedSignature( - descriptor = "(Ljava/util/ArrayList;IIIII)V", - garbageValue = "711671962" - ) - static void method1031(ArrayList var0, int var1, int var2, int var3, int var4) { - if (!var0.isEmpty()) { - int var5 = (Integer)var0.get(0); - if (var5 == -1 && !Client.playingJingle) { - RouteStrategy.method1107(0, 0); - } else if (var5 != -1) { - boolean var6; - if (class306.field2755.isEmpty()) { - var6 = false; - } else { - MusicSong var7 = (MusicSong)class306.field2755.get(0); - var6 = var7 != null && var5 == var7.musicTrackGroupId; - } - - if (!var6 && class150.clientPreferences.getCurrentMusicVolume() != 0) { - ArrayList var9 = new ArrayList(); - - for (int var8 = 0; var8 < var0.size(); ++var8) { - var9.add(new MusicSong(class13.archive6, (Integer)var0.get(var8), 0, class150.clientPreferences.getCurrentMusicVolume(), false)); - } - - if (Client.playingJingle) { - class306.field2755.clear(); - class306.field2755.addAll(var9); - ArchiveLoader.method464(var1, var2, var3, var4); - } else { - UserComparator4.method663(var9, var1, var2, var3, var4, false); - } - } - } - - } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ObjectNode.java b/osrs/src/main/java/ObjectNode.java index 92fdf0baa..718e396be 100644 --- a/osrs/src/main/java/ObjectNode.java +++ b/osrs/src/main/java/ObjectNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("sr") +@ObfuscatedName("sd") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("obj") public final Object obj; public ObjectNode(Object var1) { this.obj = var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ObjectSound.java b/osrs/src/main/java/ObjectSound.java index 57a39f387..fd29bc816 100644 --- a/osrs/src/main/java/ObjectSound.java +++ b/osrs/src/main/java/ObjectSound.java @@ -3,59 +3,70 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cy") +@ObfuscatedName("ca") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("ay") + @ObfuscatedName("bj") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + @Export("archive4") + static Archive archive4; + @ObfuscatedName("jd") + static int field686; + @ObfuscatedName("ae") @Export("plane") int plane; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("x") int x; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("y") int y; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("maxX") int maxX; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("maxY") int maxY; - @ObfuscatedName("ag") - int field687; @ObfuscatedName("az") + int field702; + @ObfuscatedName("ap") @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "Lbn;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("ap") - int field691; + @ObfuscatedName("af") + int field696; + @ObfuscatedName("ad") + int field694; @ObfuscatedName("aq") - int field692; - @ObfuscatedName("at") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("ah") - int field688; - @ObfuscatedName("ax") + @ObfuscatedName("al") + int field698; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "Lbn;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lhb;" + descriptor = "Lhv;" ) @Export("obj") ObjectComposition obj; @@ -67,10 +78,10 @@ public final class ObjectSound extends Node { ObjectSound() { } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1847013025" + garbageValue = "1805200159" ) @Export("set") void set() { @@ -78,46 +89,225 @@ void set() { ObjectComposition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field687 = var2.int7 * 128; - this.field691 = var2.int5; - this.field692 = var2.int6; + this.field702 = var2.int7 * 128; + this.field696 = var2.int5; + this.field694 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field687 = 0; - this.field691 = 0; - this.field692 = 0; + this.field702 = 0; + this.field696 = 0; + this.field694 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(this.stream1); + class162.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "0" + descriptor = "(B)V", + garbageValue = "-42" ) - static int method422(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else if (var1 == -1) { - return 0; + static void method414() { + Tiles.Tiles_underlays = null; + class227.Tiles_overlays = null; + class172.Tiles_shapes = null; + ModelData0.field2282 = null; + BufferedNetSocket.field3820 = null; + MoveSpeed.field1924 = null; + class162.field1419 = null; + Fonts.Tiles_hue = null; + class466.Tiles_saturation = null; + Tiles.Tiles_lightness = null; + class128.Tiles_hueMultiplier = null; + Interpreter.field710 = null; + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "449179665" + ) + static int method415(int var0, Script var1, boolean var2) { + if (var0 == 3800) { + if (Players.guestClanSettings != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + class466.field3912 = Players.guestClanSettings; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; } else { - int var3 = 0; + int var3; + if (var0 == 3801) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (Client.currentClanSettings[var3] != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + class466.field3912 = Client.currentClanSettings[var3]; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3802) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = class466.field3912.name; + return 1; + } else if (var0 == 3803) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.allowGuests ? 1 : 0; + return 1; + } else if (var0 == 3804) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1383; + return 1; + } else if (var0 == 3805) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1385; + return 1; + } else if (var0 == 3806) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1384; + return 1; + } else if (var0 == 3807) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1386; + return 1; + } else if (var0 == 3809) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.memberCount; + return 1; + } else if (var0 == 3810) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = class466.field3912.memberNames[var3]; + return 1; + } else if (var0 == 3811) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.memberRanks[var3]; + return 1; + } else if (var0 == 3812) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.bannedMemberCount; + return 1; + } else if (var0 == 3813) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = class466.field3912.bannedMemberNames[var3]; + return 1; + } else { + int var5; + int var6; + if (var0 == 3814) { + SoundCache.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.method809(var3, var6, var5); + return 1; + } else if (var0 == 3815) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.currentOwner; + return 1; + } else if (var0 == 3816) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1391; + return 1; + } else if (var0 == 3817) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.method808(Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]); + return 1; + } else if (var0 == 3818) { + Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = class466.field3912.getSortedMembers()[Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == 3819) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + class386.method2027(var6, var3); + return 1; + } else if (var0 == 3820) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1393[var3]; + return 1; + } else { + if (var0 == 3821) { + SoundCache.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + SoundSystem.method219(var5, var3, var4); + } + + if (var0 == 3822) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1382[var3] ? 1 : 0; + return 1; + } else if (var0 == 3850) { + if (VerticalAlignment.guestClanChannel != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + class396.field3679 = VerticalAlignment.guestClanChannel; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; + return 1; + } else if (var0 == 3851) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (Client.currentClanChannels[var3] != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + class396.field3679 = Client.currentClanChannels[var3]; + class113.field1172 = var3; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3852) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = class396.field3679.name; + return 1; + } else if (var0 == 3853) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class396.field3679.field1425; + return 1; + } else if (var0 == 3854) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class396.field3679.field1426; + return 1; + } else if (var0 == 3855) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class396.field3679.method859(); + return 1; + } else if (var0 == 3856) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class396.field3679.members.get(var3)).username.getName(); + return 1; + } else if (var0 == 3857) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((ClanChannelMember)class396.field3679.members.get(var3)).rank; + return 1; + } else if (var0 == 3858) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((ClanChannelMember)class396.field3679.members.get(var3)).world; + return 1; + } else if (var0 == 3859) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + UserComparator10.method689(class113.field1172, var3); + return 1; + } else if (var0 == 3860) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class396.field3679.method860(Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]); + return 1; + } else if (var0 == 3861) { + Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = class396.field3679.getSortedMembers()[Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == 3890) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class139.varclan != null ? 1 : 0; + return 1; + } else { + return 2; + } } } - - return var3; } } -} + + @ObfuscatedName("oj") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-24646" + ) + static void method416() { + Client.packetWriter.addNode(ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2569, Client.packetWriter.isaacCipher)); + Client.oculusOrbState = 0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Occluder.java b/osrs/src/main/java/Occluder.java index 0339bfc76..6076cfc1e 100644 --- a/osrs/src/main/java/Occluder.java +++ b/osrs/src/main/java/Occluder.java @@ -3,207 +3,115 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("jn") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("aw") + @ObfuscatedName("nc") + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("au") @Export("minTileX") int minTileX; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("maxTileX") int maxTileX; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("minTileY") int minTileY; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("maxTileY") int maxTileY; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("type") int type; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("minX") int minX; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("maxX") int maxX; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("minZ") int minZ; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("maxZ") int maxZ; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("minY") int minY; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("maxY") int maxY; - @ObfuscatedName("at") - int field2110; - @ObfuscatedName("ah") - int field2103; - @ObfuscatedName("ax") - int field2114; - @ObfuscatedName("aa") - int field2099; - @ObfuscatedName("au") - int field2111; - @ObfuscatedName("ae") - int field2101; + @ObfuscatedName("aq") + int field2137; + @ObfuscatedName("al") + int field2132; + @ObfuscatedName("an") + int field2134; + @ObfuscatedName("ar") + int field2138; @ObfuscatedName("ab") - int field2100; + int field2125; + @ObfuscatedName("ag") + int field2130; + @ObfuscatedName("am") + int field2133; Occluder() { } - @ObfuscatedName("bp") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "402674072" + descriptor = "(IIIZIZI)V", + garbageValue = "124948705" ) - static int method1273(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3903) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == 3904) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == 3905) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == 3906) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == 3907) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == 3908) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; - } else { - int var12; - if (var0 == 3910) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; - return 1; - } else if (var0 == 3911) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; - return 1; - } else if (var0 == 3912) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; - return 1; - } else if (var0 == 3913) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; - return 1; - } else { - boolean var13; - if (var0 == 3914) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class28.grandExchangeEvents != null) { - class28.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { + int var6 = (var0 + var1) / 2; + int var7 = var0; + World var8 = class176.World_worlds[var6]; + class176.World_worlds[var6] = class176.World_worlds[var1]; + class176.World_worlds[var1] = var8; - return 1; - } else if (var0 == 3915) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class28.grandExchangeEvents != null) { - class28.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); - } - - return 1; - } else if (var0 == 3916) { - Interpreter.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - if (class28.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - class28.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } + for (int var9 = var0; var9 < var1; ++var9) { + if (HealthBarUpdate.method525(class176.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { + World var10 = class176.World_worlds[var9]; + class176.World_worlds[var9] = class176.World_worlds[var7]; + class176.World_worlds[var7++] = var10; + } + } - return 1; - } else if (var0 == 3917) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class28.grandExchangeEvents != null) { - class28.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } + class176.World_worlds[var1] = class176.World_worlds[var7]; + class176.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + } - return 1; - } else if (var0 == 3918) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class28.grandExchangeEvents != null) { - class28.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } + } - return 1; - } else if (var0 == 3919) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class28.grandExchangeEvents == null ? 0 : class28.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var11; - if (var0 == 3920) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class28.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.world; - return 1; - } else if (var0 == 3921) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class28.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.getOfferName(); - return 1; - } else if (var0 == 3922) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class28.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); - return 1; - } else if (var0 == 3923) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class28.grandExchangeEvents.events.get(var3); - long var5 = class113.clockNow() - VerticalAlignment.field1614 - var11.age; - int var7 = (int)(var5 / 3600000L); - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == 3924) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class28.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == 3925) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class28.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == 3926) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class28.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } else if (var0 == 3939) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class125.ItemDefinition_get(var3).isTradable ? 1 : 0; - return 1; - } else { - return 2; - } + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "(Ldf;I)Z", + garbageValue = "-1141977008" + ) + static boolean method1299(Player var0) { + if (Client.drawPlayerNames == 0) { + return false; + } else { + boolean var1; + if (VarbitComposition.localPlayer == var0) { + var1 = (Client.drawPlayerNames & 8) != 0; + return var1; + } else { + var1 = UserComparator6.method695(); + if (!var1) { + boolean var2 = (Client.drawPlayerNames & 1) != 0; + var1 = var2 && var0.isFriend(); } + + return var1 || UrlRequester.method655() && var0.isFriendsChatMember(); } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/OtlTokenRequester.java b/osrs/src/main/java/OtlTokenRequester.java new file mode 100644 index 000000000..3eb5c8e93 --- /dev/null +++ b/osrs/src/main/java/OtlTokenRequester.java @@ -0,0 +1,15 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; + +import java.net.URL; +import java.util.Map; +import java.util.concurrent.Future; + +@Implements("com/jagex/oldscape/pub/OtlTokenRequester") +@ObfuscatedName("com/jagex/oldscape/pub/OtlTokenRequester") +public interface OtlTokenRequester { + @Export("request") + @ObfuscatedName("request") + Future request(String var1, URL var2, Map var3, String var4); +} \ No newline at end of file diff --git a/osrs/src/main/java/OtlTokenResponse.java b/osrs/src/main/java/OtlTokenResponse.java index c9d8c31c0..eb2d947d2 100644 --- a/osrs/src/main/java/OtlTokenResponse.java +++ b/osrs/src/main/java/OtlTokenResponse.java @@ -1,10 +1,15 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @Implements("OtlTokenResponse") @ObfuscatedName("com/jagex/oldscape/pub/OtlTokenResponse") public interface OtlTokenResponse { + @Export("isSuccess") + @ObfuscatedName("isSuccess") boolean isSuccess(); + @Export("getToken") + @ObfuscatedName("getToken") String getToken(); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PacketBuffer.java b/osrs/src/main/java/PacketBuffer.java index 546eeef8a..ee51caefa 100644 --- a/osrs/src/main/java/PacketBuffer.java +++ b/osrs/src/main/java/PacketBuffer.java @@ -3,83 +3,83 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tc") +@ObfuscatedName("to") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("ay") - static final int[] field4111; - @ObfuscatedName("aw") + @ObfuscatedName("ae") + static final int[] field4156; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Luy;" + descriptor = "Lux;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("bitIndex") int bitIndex; static { - field4111 = 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}; + field4156 = 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) { super(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "([IB)V", - garbageValue = "-15" + garbageValue = "4" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Luy;I)V", - garbageValue = "643801392" + descriptor = "(Lux;I)V", + garbageValue = "-1893850673" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-388593426" + garbageValue = "-500862184" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-116" + descriptor = "(I)I", + garbageValue = "-2096542528" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "789201223" + descriptor = "(B)Z", + garbageValue = "1" ) - public boolean method2498() { - int var1 = super.array[super.offset] - this.isaacCipher.method2672() & 255; + public boolean method2518() { + int var1 = super.array[super.offset] - this.isaacCipher.method2691() & 255; return var1 >= 128; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1742041211" + garbageValue = "1524220690" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -87,32 +87,32 @@ public int readSmartByteShortIsaac() { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1283729608" + garbageValue = "-1401941730" ) - public void method2500(byte[] var1, int var2, int var3) { + public void method2520(byte[] var1, int var2, int var3) { for (int var4 = 0; var4 < var3; ++var4) { var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-91" + descriptor = "(I)V", + garbageValue = "859542429" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "298906303" + descriptor = "(IB)I", + garbageValue = "49" ) @Export("readBits") public int readBits(int var1) { @@ -121,36 +121,36 @@ public int readBits(int var1) { int var4 = 0; for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field4111[var3]) << var1 - var3; + var4 += (super.array[var2++] & field4156[var3]) << var1 - var3; var1 -= var3; } if (var3 == var1) { - var4 += super.array[var2] & field4111[var3]; + var4 += super.array[var2] & field4156[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4111[var1]; + var4 += super.array[var2] >> var3 - var1 & field4156[var1]; } return var4; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "793482014" + garbageValue = "-512119498" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "376984714" + garbageValue = "2109529499" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PacketBufferNode.java b/osrs/src/main/java/PacketBufferNode.java index 7874f1d85..71f591053 100644 --- a/osrs/src/main/java/PacketBufferNode.java +++ b/osrs/src/main/java/PacketBufferNode.java @@ -3,39 +3,47 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lv") +import java.util.Collections; + +@ObfuscatedName("ly") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Llv;" + descriptor = "[Lly;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lfx;" + descriptor = "[[Lmi;" ) - static ClanSettings field2591; - @ObfuscatedName("aw") + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("ip") + @ObfuscatedSignature( + descriptor = "Lsr;" + ) + static Fonts field2613; + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "Llw;" ) @Export("clientPacket") public ClientPacket clientPacket; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("clientPacketLength") public int clientPacketLength; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lto;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("index") public int index; @@ -47,10 +55,10 @@ public class PacketBufferNode extends Node { PacketBufferNode() { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "488598402" + garbageValue = "-1268899261" ) @Export("release") public void release() { @@ -59,43 +67,42 @@ public void release() { } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1856308846" + descriptor = "([I[II)V", + garbageValue = "-469977275" ) - static int method1571(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; + public static void method1611(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { + class416.ByteArrayPool_alternativeSizes = var0; + StructComposition.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; + class410.ByteArrayPool_arrays = new byte[var0.length][][]; + + for (int var2 = 0; var2 < class416.ByteArrayPool_alternativeSizes.length; ++var2) { + class410.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; + ByteArrayPool.field3746.add(var0[var2]); + } + + Collections.sort(ByteArrayPool.field3746); } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; + class416.ByteArrayPool_alternativeSizes = null; + StructComposition.ByteArrayPool_altSizeArrayCounts = null; + class410.ByteArrayPool_arrays = null; + class101.method599(); } } - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "758333384" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); - } - - @ObfuscatedName("ns") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-33" + garbageValue = "1208755601" ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (Canvas.friendsChat != null) { - PacketBufferNode var1 = class503.getPacketBufferNode(ClientPacket.CLAN_KICKUSER, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class501.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } + public static int method1609(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); + var0 = var0 + (var0 >>> 4) & 252645135; + var0 += var0 >>> 8; + var0 += var0 >>> 16; + return var0 & 255; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PacketWriter.java b/osrs/src/main/java/PacketWriter.java index 1568d8771..6b6343810 100644 --- a/osrs/src/main/java/PacketWriter.java +++ b/osrs/src/main/java/PacketWriter.java @@ -1,76 +1,80 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +import java.io.IOException; +import java.util.ArrayList; + +@ObfuscatedName("er") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("aw") + @ObfuscatedName("ab") + static int field1151; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lqh;" + descriptor = "Lqi;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Loc;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("bufferSize") int bufferSize; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lty;" + descriptor = "Ltm;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Luy;" + descriptor = "Lux;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lto;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("av") - boolean field1140; - @ObfuscatedName("ap") - int field1141; - @ObfuscatedName("aq") + @ObfuscatedName("aa") + boolean field1152; + @ObfuscatedName("af") + int field1154; + @ObfuscatedName("ad") @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - ServerPacket field1147; - @ObfuscatedName("ah") + ServerPacket field1159; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - ServerPacket field1146; - @ObfuscatedName("ax") + ServerPacket field1157; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - ServerPacket field1148; + ServerPacket field1158; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); @@ -79,15 +83,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); this.serverPacket = null; this.serverPacketLength = 0; - this.field1140 = true; - this.field1141 = 0; + this.field1152 = true; + this.field1154 = 0; this.pendingWrites = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1305418239" + garbageValue = "1375263214" ) @Export("clearBuffer") final void clearBuffer() { @@ -95,10 +99,10 @@ final void clearBuffer() { this.bufferSize = 0; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "14" + garbageValue = "-55" ) @Export("flush") final void flush() throws IOException { @@ -123,10 +127,10 @@ final void flush() throws IOException { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Llv;I)V", - garbageValue = "1819467600" + descriptor = "(Lly;B)V", + garbageValue = "17" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -136,20 +140,20 @@ public final void addNode(PacketBufferNode var1) { this.bufferSize += var1.index; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lqh;I)V", - garbageValue = "12780855" + descriptor = "(Lqi;B)V", + garbageValue = "-68" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2143075980" + garbageValue = "272973129" ) @Export("close") void close() { @@ -160,79 +164,213 @@ void close() { } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1207430407" + garbageValue = "-1646741588" ) @Export("removeSocket") void removeSocket() { this.socket = null; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)Lqh;", - garbageValue = "29" + descriptor = "(I)Lqi;", + garbageValue = "-972291242" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; } - @ObfuscatedName("jr") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Liy;I)V", - garbageValue = "-950444283" + descriptor = "(ILdh;ZI)I", + garbageValue = "899578863" ) - static void method643(class212 var0) { - if (var0 != null && var0.field1856 != null) { - if (var0.field1856.childIndex >= 0) { - Widget var1 = VarbitComposition.getWidget(var0.field1856.parentId); - if (var1 == null || var1.children == null || var1.children.length == 0 || var0.field1856.childIndex >= var1.children.length || var0.field1856 != var1.children[var0.field1856.childIndex]) { - return; - } - } + static int method644(int var0, Script var1, boolean var2) { + if (var0 < 1000) { + return Frames.method1295(var0, var1, var2); + } else if (var0 < 1100) { + return SecureRandomFuture.method441(var0, var1, var2); + } else if (var0 < 1200) { + return class93.method504(var0, var1, var2); + } else if (var0 < 1300) { + return InterfaceParent.method474(var0, var1, var2); + } else if (var0 < 1400) { + return class12.method35(var0, var1, var2); + } else if (var0 < 1500) { + return class169.method879(var0, var1, var2); + } else if (var0 < 1600) { + return class132.method735(var0, var1, var2); + } else if (var0 < 1700) { + return WorldMapRectangle.method1528(var0, var1, var2); + } else if (var0 < 1800) { + return DynamicObject.method450(var0, var1, var2); + } else if (var0 < 1900) { + return SecureRandomFuture.method442(var0, var1, var2); + } else if (var0 < 2000) { + return class499.method2489(var0, var1, var2); + } else if (var0 < 2100) { + return SecureRandomFuture.method441(var0, var1, var2); + } else if (var0 < 2200) { + return class93.method504(var0, var1, var2); + } else if (var0 < 2300) { + return InterfaceParent.method474(var0, var1, var2); + } else if (var0 < 2400) { + return class12.method35(var0, var1, var2); + } else if (var0 < 2500) { + return class169.method879(var0, var1, var2); + } else if (var0 < 2600) { + return MenuAction.method426(var0, var1, var2); + } else if (var0 < 2700) { + return ByteArrayPool.method2149(var0, var1, var2); + } else if (var0 < 2800) { + return class326.method1716(var0, var1, var2); + } else if (var0 < 2900) { + return Player.method499(var0, var1, var2); + } else if (var0 < 3000) { + return class499.method2489(var0, var1, var2); + } else if (var0 < 3200) { + return class466.method2349(var0, var1, var2); + } else if (var0 < 3300) { + return WorldMapSection1.method1553(var0, var1, var2); + } else if (var0 < 3400) { + return class372.method1971(var0, var1, var2); + } else if (var0 < 3500) { + return UserList.method2243(var0, var1, var2); + } else if (var0 < 3600) { + return class238.method1311(var0, var1, var2); + } else if (var0 < 3700) { + return class16.method48(var0, var1, var2); + } else if (var0 < 3800) { + return class31.method123(var0, var1, var2); + } else if (var0 < 3900) { + return ObjectSound.method415(var0, var1, var2); + } else if (var0 < 4000) { + return GameBuild.method1869(var0, var1, var2); + } else if (var0 < 4100) { + return class352.method1880(var0, var1, var2); + } else if (var0 < 4200) { + return Decimator.method315(var0, var1, var2); + } else if (var0 < 4300) { + return AttackOption.method607(var0, var1, var2); + } else if (var0 < 5100) { + return ArchiveDiskActionHandler.method1886(var0, var1, var2); + } else if (var0 < 5400) { + return class161.method850(var0, var1, var2); + } else if (var0 < 5600) { + return class466.method2351(var0, var1, var2); + } else if (var0 < 5700) { + return Interpreter.method419(var0, var1, var2); + } else if (var0 < 6300) { + return class448.method2292(var0, var1, var2); + } else if (var0 < 6600) { + return class139.method759(var0, var1, var2); + } else if (var0 < 6700) { + return Interpreter.method420(var0, var1, var2); + } else if (var0 < 6800) { + return class101.method600(var0, var1, var2); + } else if (var0 < 6900) { + return ObjTypeCustomisation.method935(var0, var1, var2); + } else if (var0 < 7000) { + return class53.method297(var0, var1, var2); + } else if (var0 < 7100) { + return class6.method12(var0, var1, var2); + } else if (var0 < 7200) { + return Messages.method635(var0, var1, var2); + } else if (var0 < 7300) { + return class170.method900(var0, var1, var2); + } else if (var0 < 7500) { + return InterfaceParent.method476(var0, var1, var2); + } else if (var0 < 7600) { + return SoundCache.method228(var0, var1, var2); + } else if (var0 < 7700) { + return class178.method922(var0, var1, var2); + } else { + return var0 < 8100 ? class218.method1146(var0, var1, var2) : 2; + } + } - if (var0.field1856.type == 11 && var0.field1855 == 0) { - if (var0.field1856.method1794(var0.field1854, var0.field1853, 0, 0)) { - switch(var0.field1856.method1798()) { - case 0: - NPC.openURL(var0.field1856.method1800(), true, false); - break; - case 1: - int var2 = UserComparator8.getWidgetFlags(var0.field1856); - boolean var5 = (var2 >> 22 & 1) != 0; - if (var5) { - int[] var3 = var0.field1856.method1801(); - if (var3 != null) { - PacketBufferNode var4 = class503.getPacketBufferNode(ClientPacket.CAMVIEW_CLICK, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeShortAddLE(var0.field1856.childIndex); - var4.packetBuffer.writeIntME(var3[1]); - var4.packetBuffer.writeIntIME(var0.field1856.method1799()); - var4.packetBuffer.writeIntLE(var3[2]); - var4.packetBuffer.writeIntLE(var3[0]); - var4.packetBuffer.writeIntIME(var0.field1856.id); - Client.packetWriter.addNode(var4); - } - } - } - } - } else if (var0.field1856.type == 12) { - class330 var6 = var0.field1856.method1805(); - if (var6 != null && var6.method1746()) { - switch(var0.field1855) { - case 0: - Client.field594.method1069(var0.field1856); - var6.method1694(true); - var6.method1733(var0.field1854, var0.field1853, Client.keyHandlerInstance.getKeyPressed(82), Client.keyHandlerInstance.getKeyPressed(81)); - break; - case 1: - var6.method1734(var0.field1854, var0.field1853); - } - } + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "49" + ) + @Export("someMusicMethod") + public static void someMusicMethod(int var0, int var1, int var2, int var3) { + if (class305.musicSongs.size() > 1 && class305.musicSongs.get(0) != null && ((MusicSong)class305.musicSongs.get(0)).midiPcmStream.isReady() && class305.musicSongs.get(1) != null && ((MusicSong)class305.musicSongs.get(1)).midiPcmStream.isReady()) { + class270.method1537(var0, var1, var2, var3); + class305.field2771.add(new SwapSongTask((SongTask)null)); + ArrayList var4 = new ArrayList(); + var4.add(new DelayFadeTask(new FadeInTask((SongTask)null, 1, false, class305.field2768), class305.field2769)); + var4.add(new DelayFadeTask(new FadeOutTask((SongTask)null, 0, false, class305.field2766), class305.musicPlayerStatus)); + class305.field2771.add(new ConcurrentMidiTask((SongTask)null, var4)); + if (class305.field2773.get(0) != null && class305.field2773.get(1) != null) { + MusicSong var5 = (MusicSong)class305.field2773.get(0); + class305.field2773.set(0, class305.musicSongs.get(1)); + class305.field2773.set(1, var5); } + } + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-581625069" + ) + protected static final void method645() { + class332.clock.mark(); + + int var0; + for (var0 = 0; var0 < 32; ++var0) { + GameEngine.graphicsTickTimes[var0] = 0L; } + + for (var0 = 0; var0 < 32; ++var0) { + GameEngine.clientTickTimes[var0] = 0L; + } + + GameEngine.gameCyclesToDo = 0; + } + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(Ldv;I)V", + garbageValue = "-932722306" + ) + static final void method646(PendingSpawn var0) { + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { + var1 = class130.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { + var1 = class130.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { + var1 = class130.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = class130.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var1 != 0L) { + int var6 = class130.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = InvDefinition.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; + } + + var0.objectId = var3; + var0.field956 = var4; + var0.field948 = var5; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ParamComposition.java b/osrs/src/main/java/ParamComposition.java index 53c8fc823..c53c6b224 100644 --- a/osrs/src/main/java/ParamComposition.java +++ b/osrs/src/main/java/ParamComposition.java @@ -3,31 +3,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +import java.util.ArrayList; + +@ObfuscatedName("hx") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("ParamDefinition_archive") - public static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("ay") + static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("ParamDefinition_cached") - public static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("ar") + static EvictingDualNodeHashTable ParamDefinition_cached; + @ObfuscatedName("an") + static int field1678; + @ObfuscatedName("ao") @Export("type") char type; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("defaultInt") public int defaultInt; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("autoDisable") boolean autoDisable; @@ -39,19 +43,19 @@ public class ParamComposition extends DualNode { this.autoDisable = true; } - @ObfuscatedName("ay") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-17467" + descriptor = "(I)V", + garbageValue = "-990843992" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "1931541536" + descriptor = "(Ltm;B)V", + garbageValue = "-59" ) @Export("decode") void decode(Buffer var1) { @@ -65,15 +69,15 @@ void decode(Buffer var1) { } } - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "243375101" + descriptor = "(Ltm;II)V", + garbageValue = "-1461368185" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.type = class17.method54(var1.readByte()); + this.type = ViewportMouse.method1348(var1.readByte()); } else if (var2 == 2) { this.defaultInt = var1.readInt(); } else if (var2 == 4) { @@ -84,29 +88,480 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("as") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-791513096" + garbageValue = "-785538560" ) @Export("isString") public boolean isString() { return this.type == 's'; } - @ObfuscatedName("ag") + @ObfuscatedName("hq") @ObfuscatedSignature( - descriptor = "(FFFFLfm;I)V", - garbageValue = "-1881059806" + descriptor = "(B)V", + garbageValue = "-50" ) - static void method1001(float var0, float var1, float var2, float var3, class130 var4) { - float var5 = var1 - var0; - float var6 = var2 - var1; - float var7 = var3 - var2; - float var8 = var6 - var5; - var4.field1240 = var7 - var6 - var8; - var4.field1239 = var8 + var8 + var8; - var4.field1238 = var5 + var5 + var5; - var4.field1242 = var0; + static void method1017() { + int var0; + if (Client.field419 == class92.field940) { + class130.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); + + for (var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0] = new CollisionMap(104, 104); + } + + AbstractUserComparator.sceneMinimapSprite = new SpritePixels(512, 512); + Login.Login_loadingText = "Starting game engine..."; + Login.Login_loadingPercent = 5; + Client.field419 = class92.field930; + } else if (class92.field930 == Client.field419) { + Login.Login_loadingText = "Prepared visibility map"; + Login.Login_loadingPercent = 10; + Client.field419 = class92.field935; + } else if (class92.field935 == Client.field419) { + AttackOption.field1096 = class133.newArchive(0, false, true, true, false); + class318.archive7 = class133.newArchive(1, false, true, true, false); + class1.archive2 = class133.newArchive(2, true, false, true, false); + ObjectSound.archive4 = class133.newArchive(3, false, true, true, false); + class28.field81 = class133.newArchive(4, false, true, true, false); + class499.archive9 = class133.newArchive(5, true, true, true, false); + class385.archive6 = class133.newArchive(6, true, true, true, false); + Message.archive11 = class133.newArchive(7, false, true, true, false); + PcmPlayer.archive8 = class133.newArchive(8, false, true, true, false); + class147.field1348 = class133.newArchive(9, false, true, true, false); + class141.archive10 = class133.newArchive(10, false, true, true, false); + class388.field3655 = class133.newArchive(11, false, true, true, false); + GrandExchangeOffer.archive12 = class133.newArchive(12, false, true, true, false); + Player.archive13 = class133.newArchive(13, true, false, true, false); + class106.field1107 = class133.newArchive(14, false, true, true, false); + Tiles.field838 = class133.newArchive(15, false, true, true, false); + class10.field28 = class133.newArchive(17, true, true, true, false); + WorldMapElement.field1509 = class133.newArchive(18, false, true, true, false); + ClanChannelMember.field1339 = class133.newArchive(19, false, true, true, false); + class227.field2040 = class133.newArchive(20, false, true, true, false); + class343.field3148 = class133.newArchive(21, false, true, true, true); + Login.Login_loadingText = "Connecting to update server"; + Login.Login_loadingPercent = 20; + Client.field419 = class92.field939; + } else if (class92.field939 == Client.field419) { + byte var43 = 0; + var0 = var43 + AttackOption.field1096.percentage() * 4 / 100; + var0 += class318.archive7.percentage() * 4 / 100; + var0 += class1.archive2.percentage() * 2 / 100; + var0 += ObjectSound.archive4.percentage() * 2 / 100; + var0 += class28.field81.percentage() * 6 / 100; + var0 += class499.archive9.percentage() * 4 / 100; + var0 += class385.archive6.percentage() * 2 / 100; + var0 += Message.archive11.percentage() * 55 / 100; + var0 += PcmPlayer.archive8.percentage() * 2 / 100; + var0 += class147.field1348.percentage() * 2 / 100; + var0 += class141.archive10.percentage() * 2 / 100; + var0 += class388.field3655.percentage() * 2 / 100; + var0 += GrandExchangeOffer.archive12.percentage() * 2 / 100; + var0 += Player.archive13.percentage() * 2 / 100; + var0 += class106.field1107.percentage() * 2 / 100; + var0 += Tiles.field838.percentage() * 2 / 100; + var0 += ClanChannelMember.field1339.percentage() / 100; + var0 += WorldMapElement.field1509.percentage() / 100; + var0 += class227.field2040.percentage() / 100; + var0 += class343.field3148.percentage() / 100; + var0 += class10.field28.method1887() && class10.field28.isFullyLoaded() ? 1 : 0; + if (var0 != 100) { + if (var0 != 0) { + Login.Login_loadingText = "Checking for updates - " + var0 + "%"; + } + + Login.Login_loadingPercent = 30; + } else { + class466.method2348(AttackOption.field1096, "Animations"); + class466.method2348(class318.archive7, "Skeletons"); + class466.method2348(class28.field81, "Sound FX"); + class466.method2348(class499.archive9, "Maps"); + class466.method2348(class385.archive6, "Music Tracks"); + class466.method2348(Message.archive11, "Models"); + class466.method2348(PcmPlayer.archive8, "Sprites"); + class466.method2348(class388.field3655, "Music Jingles"); + class466.method2348(class106.field1107, "Music Samples"); + class466.method2348(Tiles.field838, "Music Patches"); + class466.method2348(ClanChannelMember.field1339, "World Map"); + class466.method2348(WorldMapElement.field1509, "World Map Geography"); + class466.method2348(class227.field2040, "World Map Ground"); + class387.field3652 = new GraphicsDefaults(); + class387.field3652.decode(class10.field28); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.field419 = class92.field928; + } + } else { + int var2; + Archive var3; + Archive var29; + if (class92.field928 == Client.field419) { + class504.method2502(22050, !Client.isLowDetail, 2); + ArrayList var48 = new ArrayList(3); + AddRequestTask.pcmPlayer1 = TileItem.method612(GameEngine.taskHandler, 0, 2048); + class162.pcmStreamMixer = new PcmStreamMixer(); + PcmStreamMixer var37 = new PcmStreamMixer(); + var37.addSubStream(class162.pcmStreamMixer); + + for (var2 = 0; var2 < 3; ++var2) { + MidiPcmStream var39 = new MidiPcmStream(); + var39.method1638(9, 128); + var37.addSubStream(var39); + var48.add(var39); + } + + AddRequestTask.pcmPlayer1.setStream(var37); + var29 = Tiles.field838; + var3 = class106.field1107; + Archive var40 = class28.field81; + class305.field2777 = var29; + class305.field2775 = var3; + class305.field2776 = var40; + class305.midiPcmStream = var48; + class330.decimator = new Decimator(22050, PcmPlayer.field181); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.field419 = class92.field932; + PacketBufferNode.field2613 = new Fonts(PcmPlayer.archive8, Player.archive13); + } else { + int var30; + if (Client.field419 == class92.field932) { + FontName[] var47 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_plain12}; + var30 = var47.length; + Fonts var49 = PacketBufferNode.field2613; + FontName[] var38 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_plain12}; + Client.fontsMap = var49.createMap(var38); + if (Client.fontsMap.size() < var30) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var30 + "%"; + Login.Login_loadingPercent = 40; + } else { + HealthBarUpdate.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + SecureRandomCallable.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + class59.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + class18.field51 = Client.field645.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.field419 = class92.field941; + } + } else { + Archive var1; + int var31; + Archive var32; + if (Client.field419 == class92.field941) { + var1 = class141.archive10; + var29 = PcmPlayer.archive8; + var31 = 0; + String[] var4 = Login.field770; + + int var5; + String var41; + for (var5 = 0; var5 < var4.length; ++var5) { + var41 = var4[var5]; + if (var1.tryLoadFileByNames(var41, "")) { + ++var31; + } + } + + var4 = Login.field769; + + for (var5 = 0; var5 < var4.length; ++var5) { + var41 = var4[var5]; + if (var29.tryLoadFileByNames(var41, "")) { + ++var31; + } + } + + var4 = Login.field771; + + for (var5 = 0; var5 < var4.length; ++var5) { + var41 = var4[var5]; + if (var29.getGroupId(var41) != -1 && var29.tryLoadFileByNames(var41, "")) { + ++var31; + } + } + + var32 = PcmPlayer.archive8; + int var33 = Login.field770.length + Login.field769.length; + String[] var42 = Login.field771; + + for (int var8 = 0; var8 < var42.length; ++var8) { + String var44 = var42[var8]; + if (var32.getGroupId(var44) != -1) { + ++var33; + } + } + + if (var31 < var33) { + Login.Login_loadingText = "Loading title screen - " + var31 * 100 / var33 + "%"; + Login.Login_loadingPercent = 50; + } else { + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + MusicSong.updateGameState(5); + Client.field419 = class92.field936; + } + } else if (class92.field936 == Client.field419) { + if (!class1.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + class1.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; + } else if (!class343.field3148.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + (80 + GrandExchangeOffer.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 60; + } else { + class326.method1714(class1.archive2); + SecureRandomFuture.method435(class1.archive2); + Archive var46 = class1.archive2; + var1 = Message.archive11; + KitDefinition.KitDefinition_archive = var46; + KitDefinition.KitDefinition_modelsArchive = var1; + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + var29 = class1.archive2; + var3 = Message.archive11; + boolean var50 = Client.isLowDetail; + ObjectComposition.ObjectDefinition_archive = var29; + ObjectComposition.ObjectDefinition_modelsArchive = var3; + ObjectComposition.ObjectDefinition_isLowDetail = var50; + var32 = class1.archive2; + Archive var6 = Message.archive11; + NPCComposition.NpcDefinition_archive = var32; + NPCComposition.field1586 = var6; + Archive var7 = class1.archive2; + StructComposition.StructDefinition_archive = var7; + Archive var35 = class1.archive2; + Archive var9 = Message.archive11; + boolean var10 = Client.isMembersWorld; + Font var11 = HealthBarUpdate.fontPlain11; + class384.ItemDefinition_archive = var35; + ItemComposition.ItemDefinition_modelArchive = var9; + ItemComposition.ItemDefinition_inMembersWorld = var10; + HealthBar.ItemDefinition_fileCount = class384.ItemDefinition_archive.getGroupFileCount(10); + class452.ItemDefinition_fontPlain11 = var11; + class227.method1215(class1.archive2, AttackOption.field1096, class318.archive7); + Archive var12 = class1.archive2; + Archive var13 = Message.archive11; + SpotAnimationDefinition.SpotAnimationDefinition_archive = var12; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var13; + ServerPacket.method1612(class1.archive2); + FileSystem.method911(class1.archive2); + Archive var14 = ObjectSound.archive4; + Archive var15 = Message.archive11; + Archive var16 = PcmPlayer.archive8; + Archive var17 = Player.archive13; + int var18 = 0; + if (var14 != null) { + Decimator.Widget_archive = var14; + class47.field226 = var15; + Language.Widget_spritesArchive = var16; + class155.Widget_fontsArchive = var17; + var18 = Decimator.Widget_archive.getGroupCount(); + } + + PacketBufferNode.Widget_interfaceComponents = new Widget[var18][]; + class316.Widget_loadedInterfaces = new boolean[var18]; + ModeWhere.method1978(class1.archive2); + Archive var36 = class1.archive2; + EnumComposition.EnumDefinition_archive = var36; + Archive var19 = class1.archive2; + VarcInt.VarcInt_archive = var19; + Archive var20 = class1.archive2; + class139.method756(class1.archive2); + BufferedSource.method2268(class1.archive2); + ModelData0.method1382(class1.archive2); + class47.HitSplatDefinition_cachedSprites = new class497(WorldMapSectionType.field2417, 54, ClanChannelMember.clientLanguage, class1.archive2); + SwapSongTask.HitSplatDefinition_cached = new class497(WorldMapSectionType.field2417, 47, ClanChannelMember.clientLanguage, class1.archive2); + KeyHandler.varcs = new Varcs(); + Archive var21 = class1.archive2; + Archive var22 = PcmPlayer.archive8; + Archive var23 = Player.archive13; + HitSplatDefinition.HitSplatDefinition_archive = var21; + HitSplatDefinition.field1689 = var22; + HitSplatDefinition.HitSplatDefinition_fontsArchive = var23; + class152.method796(class1.archive2, PcmPlayer.archive8); + Archive var24 = class1.archive2; + Archive var25 = PcmPlayer.archive8; + WorldMapElement.WorldMapElement_archive = var25; + if (var24.isFullyLoaded()) { + WorldMapElement.WorldMapElement_count = var24.getGroupFileCount(35); + WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; + + for (int var26 = 0; var26 < WorldMapElement.WorldMapElement_count; ++var26) { + byte[] var27 = var24.takeFile(35, var26); + WorldMapElement.WorldMapElement_cached[var26] = new WorldMapElement(var26); + if (var27 != null) { + WorldMapElement.WorldMapElement_cached[var26].decode(new Buffer(var27)); + WorldMapElement.WorldMapElement_cached[var26].method949(); + } + } + } + + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.field419 = class92.field926; + } + } else if (Client.field419 == class92.field926) { + var0 = 0; + if (Client.compass == null) { + Client.compass = Tiles.SpriteBuffer_getSprite(PcmPlayer.archive8, class387.field3652.compass, 0); + } else { + ++var0; + } + + if (class167.redHintArrowSprite == null) { + class167.redHintArrowSprite = Tiles.SpriteBuffer_getSprite(PcmPlayer.archive8, class387.field3652.field3850, 0); + } else { + ++var0; + } + + if (class299.mapSceneSprites == null) { + class299.mapSceneSprites = class28.method110(PcmPlayer.archive8, class387.field3652.mapScenes, 0); + } else { + ++var0; + } + + if (class178.headIconPkSprites == null) { + class178.headIconPkSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.headIconsPk, 0); + } else { + ++var0; + } + + if (class502.headIconPrayerSprites == null) { + class502.headIconPrayerSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.field3848, 0); + } else { + ++var0; + } + + if (ArchiveLoader.headIconHintSprites == null) { + ArchiveLoader.headIconHintSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.field3852, 0); + } else { + ++var0; + } + + if (Message.mapMarkerSprites == null) { + Message.mapMarkerSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.field3857, 0); + } else { + ++var0; + } + + if (class152.crossSprites == null) { + class152.crossSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.field3854, 0); + } else { + ++var0; + } + + if (FloorOverlayDefinition.mapDotSprites == null) { + FloorOverlayDefinition.mapDotSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.field3847, 0); + } else { + ++var0; + } + + if (GrandExchangeOfferOwnWorldComparator.scrollBarSprites == null) { + GrandExchangeOfferOwnWorldComparator.scrollBarSprites = class28.method110(PcmPlayer.archive8, class387.field3652.field3851, 0); + } else { + ++var0; + } + + if (class451.field3876 == null) { + class451.field3876 = class28.method110(PcmPlayer.archive8, class387.field3652.field3849, 0); + } else { + ++var0; + } + + if (var0 < 11) { + Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; + } else { + AbstractFont.AbstractFont_modIconSprites = class451.field3876; + class167.redHintArrowSprite.normalize(); + var30 = (int)(Math.random() * 21.0D) - 10; + var2 = (int)(Math.random() * 21.0D) - 10; + var31 = (int)(Math.random() * 21.0D) - 10; + int var34 = (int)(Math.random() * 41.0D) - 20; + class299.mapSceneSprites[0].shiftColors(var34 + var30, var2 + var34, var34 + var31); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.field419 = class92.field931; + } + } else if (Client.field419 == class92.field931) { + if (!class147.field1348.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; + } else { + class129.textureProvider = new TextureProvider(class147.field1348, PcmPlayer.archive8, 20, class449.clientPreferences.getBrightness(), Client.isLowDetail ? 64 : 128); + Rasterizer3D.method1186(class129.textureProvider); + Rasterizer3D.method1187(class449.clientPreferences.getBrightness()); + Client.field419 = class92.field929; + } + } else if (class92.field929 == Client.field419) { + var0 = class129.textureProvider.getLoadedPercentage(); + if (var0 < 100) { + Login.Login_loadingText = "Loading textures - " + var0 + "%"; + Login.Login_loadingPercent = 90; + } else { + Login.Login_loadingText = "Loaded textures"; + Login.Login_loadingPercent = 90; + Client.field419 = class92.field937; + } + } else if (Client.field419 == class92.field937) { + class126.mouseRecorder = new MouseRecorder(); + GameEngine.taskHandler.newThreadTask(class126.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.field419 = class92.field933; + } else if (class92.field933 == Client.field419) { + if (!class141.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; + } else { + Huffman var45 = new Huffman(class141.archive10.takeFileByNames("huffman", "")); + UserComparator9.method683(var45); + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.field419 = class92.field934; + } + } else if (class92.field934 == Client.field419) { + if (!ObjectSound.archive4.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + ObjectSound.archive4.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!GrandExchangeOffer.archive12.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + GrandExchangeOffer.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 96; + } else if (!Player.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + Player.archive13.loadPercent() / 50) + "%"; + Login.Login_loadingPercent = 96; + } else { + Login.Login_loadingText = "Loaded interfaces"; + Login.Login_loadingPercent = 98; + if (GrandExchangeOffer.archive12.isValidFileName("version.dat", "")) { + Buffer var28 = new Buffer(GrandExchangeOffer.archive12.takeFileByNames("version.dat", "")); + var28.readUnsignedShort(); + } + + Client.field419 = class92.field938; + } + } else if (Client.field419 == class92.field938) { + Login.Login_loadingPercent = 100; + if (ClanChannelMember.field1339.getGroupCount() > 0 && !ClanChannelMember.field1339.tryLoadGroupByName(WorldMapCacheName.field2471.name)) { + Login.Login_loadingText = "Loading world map - " + ClanChannelMember.field1339.groupLoadPercentByName(WorldMapCacheName.field2471.name) / 10 + "%"; + } else { + if (Canvas.worldMap == null) { + Canvas.worldMap = new WorldMap(); + Canvas.worldMap.init(ClanChannelMember.field1339, WorldMapElement.field1509, class227.field2040, class59.fontBold12, Client.fontsMap, class299.mapSceneSprites); + } + + Login.Login_loadingText = "Loaded world map"; + Client.field419 = class92.field927; + } + } else { + if (class92.field927 == Client.field419) { + MusicSong.updateGameState(10); + } + + } + } + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PcmPlayer.java b/osrs/src/main/java/PcmPlayer.java index 90507dab8..0b296c83d 100644 --- a/osrs/src/main/java/PcmPlayer.java +++ b/osrs/src/main/java/PcmPlayer.java @@ -3,164 +3,175 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bk") +import java.util.concurrent.ScheduledExecutorService; + +@ObfuscatedName("bb") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("as") + @ObfuscatedName("ac") public static int field181; - @ObfuscatedName("cm") + @ObfuscatedName("ai") + @Export("PcmPlayer_stereo") + protected static boolean PcmPlayer_stereo; + @ObfuscatedName("ap") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("aa") static int field182; - @ObfuscatedName("oa") - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("ax") + @ObfuscatedName("fx") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + @Export("archive8") + static Archive archive8; + @ObfuscatedName("an") @Export("samples") - public int[] samples; - @ObfuscatedName("aa") + protected int[] samples; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lby;" + descriptor = "Lbw;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("au") - int field192; - @ObfuscatedName("ae") + @ObfuscatedName("ab") + int field189; + @ObfuscatedName("ag") @Export("timeMs") long timeMs; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("capacity") - public int capacity; - @ObfuscatedName("ad") - public int field198; - @ObfuscatedName("ao") - int field191; - @ObfuscatedName("ac") - long field194; - @ObfuscatedName("ak") - int field189; - @ObfuscatedName("an") + int capacity; + @ObfuscatedName("ax") + int field194; + @ObfuscatedName("ah") int field190; - @ObfuscatedName("af") - int field188; - @ObfuscatedName("ai") - long field196; - @ObfuscatedName("al") - boolean field184; - @ObfuscatedName("bs") + @ObfuscatedName("as") + long field198; + @ObfuscatedName("ay") + int field195; + @ObfuscatedName("aj") + int field191; + @ObfuscatedName("av") int field193; - @ObfuscatedName("bp") + @ObfuscatedName("aw") + long field199; + @ObfuscatedName("ak") + boolean field185; + @ObfuscatedName("bd") + int field196; + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "[Lby;" + descriptor = "[Lbw;" ) - PcmStream[] field186; - @ObfuscatedName("bv") + PcmStream[] field188; + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "[Lby;" + descriptor = "[Lbw;" ) PcmStream[] field187; - public PcmPlayer() { - this.field192 = 32; - this.timeMs = class113.clockNow(); - this.field194 = 0L; - this.field189 = 0; - this.field190 = 0; - this.field188 = 0; - this.field196 = 0L; - this.field184 = true; + protected PcmPlayer() { + this.field189 = 32; + this.timeMs = GameEngine.clockNow(); + this.field198 = 0L; + this.field195 = 0; + this.field191 = 0; this.field193 = 0; - this.field186 = new PcmStream[8]; + this.field199 = 0L; + this.field185 = true; + this.field196 = 0; + this.field188 = new PcmStream[8]; this.field187 = new PcmStream[8]; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-27916" + descriptor = "(I)V", + garbageValue = "-1766369380" ) @Export("init") - public void init() throws Exception { + protected void init() throws Exception { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1387208790" + descriptor = "(IB)V", + garbageValue = "-83" ) @Export("open") - public void open(int var1) throws Exception { + protected void open(int var1) throws Exception { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-110" + descriptor = "(I)I", + garbageValue = "-1982834691" ) @Export("position") protected int position() throws Exception { return this.capacity; } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("write") protected void write() throws Exception { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1310720179" + garbageValue = "1874015336" ) @Export("close") protected void close() { } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1294273793" + descriptor = "(B)V", + garbageValue = "54" ) @Export("discard") protected void discard() throws Exception { } - @ObfuscatedName("af") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lby;B)V", - garbageValue = "46" + descriptor = "(Lbw;I)V", + garbageValue = "-828545471" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; } - @ObfuscatedName("ai") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1561448166" + descriptor = "(B)V", + garbageValue = "1" ) @Export("run") public final synchronized void run() { if (this.samples != null) { - long var1 = class113.clockNow(); + long var1 = GameEngine.clockNow(); try { - if (this.field194 != 0L) { - if (var1 < this.field194) { + if (0L != this.field198) { + if (var1 < this.field198) { return; } this.open(this.capacity); - this.field194 = 0L; - this.field184 = true; + this.field198 = 0L; + this.field185 = true; } int var3 = this.position(); - if (this.field188 - var3 > this.field189) { - this.field189 = this.field188 - var3; + if (this.field193 - var3 > this.field195) { + this.field195 = this.field193 - var3; } - int var4 = this.field191 + this.field198; + int var4 = this.field190 + this.field194; if (var4 + 256 > 16384) { var4 = 16128; } @@ -174,10 +185,10 @@ public final synchronized void run() { this.close(); this.open(this.capacity); var3 = 0; - this.field184 = true; + this.field185 = true; if (var4 + 256 > this.capacity) { var4 = this.capacity - 256; - this.field191 = var4 - this.field198; + this.field190 = var4 - this.field194; } } @@ -187,28 +198,28 @@ public final synchronized void run() { var3 += 256; } - if (var1 > this.field196) { - if (!this.field184) { - if (this.field189 == 0 && this.field190 == 0) { + if (var1 > this.field199) { + if (!this.field185) { + if (this.field195 == 0 && this.field191 == 0) { this.close(); - this.field194 = var1 + 2000L; + this.field198 = var1 + 2000L; return; } - this.field191 = Math.min(this.field190, this.field189); - this.field190 = this.field189; + this.field190 = Math.min(this.field191, this.field195); + this.field191 = this.field195; } else { - this.field184 = false; + this.field185 = false; } - this.field189 = 0; - this.field196 = 2000L + var1; + this.field195 = 0; + this.field199 = var1 + 2000L; } - this.field188 = var3; + this.field193 = var3; } catch (Exception var7) { this.close(); - this.field194 = var1 + 2000L; + this.field198 = 2000L + var1; } try { @@ -216,7 +227,7 @@ public final synchronized void run() { var1 = this.timeMs; } - while (var1 > 5000L + this.timeMs) { + while (var1 > this.timeMs + 5000L) { this.skip(256); this.timeMs += (long)(256000 / field181); } @@ -227,57 +238,57 @@ public final synchronized void run() { } } - @ObfuscatedName("al") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1629205695" + garbageValue = "-1331437422" ) - public final void method201() { - this.field184 = true; + public final void method200() { + this.field185 = true; } - @ObfuscatedName("bd") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2090417340" + descriptor = "(B)V", + garbageValue = "30" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field184 = true; + this.field185 = true; try { this.discard(); } catch (Exception var2) { this.close(); - this.field194 = class113.clockNow() + 2000L; + this.field198 = GameEngine.clockNow() + 2000L; } } - @ObfuscatedName("bb") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1796457673" + descriptor = "(B)V", + garbageValue = "-35" ) @Export("shutdown") public final synchronized void shutdown() { - if (WorldMapSectionType.soundSystem != null) { + if (Canvas.soundSystem != null) { boolean var1 = true; for (int var2 = 0; var2 < 2; ++var2) { - if (this == WorldMapSectionType.soundSystem.players[var2]) { - WorldMapSectionType.soundSystem.players[var2] = null; + if (this == Canvas.soundSystem.players[var2]) { + Canvas.soundSystem.players[var2] = null; } - if (WorldMapSectionType.soundSystem.players[var2] != null) { + if (Canvas.soundSystem.players[var2] != null) { var1 = false; } } if (var1) { - class273.soundSystemExecutor.shutdownNow(); - class273.soundSystemExecutor = null; - WorldMapSectionType.soundSystem = null; + soundSystemExecutor.shutdownNow(); + soundSystemExecutor = null; + Canvas.soundSystem = null; } } @@ -285,16 +296,16 @@ public final synchronized void shutdown() { this.samples = null; } - @ObfuscatedName("bn") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "75" + garbageValue = "9" ) @Export("skip") final void skip(int var1) { - this.field193 -= var1; - if (this.field193 < 0) { - this.field193 = 0; + this.field196 -= var1; + if (this.field196 < 0) { + this.field196 = 0; } if (this.stream != null) { @@ -303,20 +314,20 @@ final void skip(int var1) { } - @ObfuscatedName("ba") + @ObfuscatedName("bh") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; - if (class373.PcmPlayer_stereo) { + if (PcmPlayer_stereo) { var3 = var2 << 1; } - class410.clearIntArray(var1, 0, var3); - this.field193 -= var2; - if (this.stream != null && this.field193 <= 0) { - this.field193 += field181 >> 4; - class345.PcmStream_disable(this.stream); - this.method207(this.stream, this.stream.vmethod1019()); + class409.clearIntArray(var1, 0, var3); + this.field196 -= var2; + if (this.stream != null && this.field196 <= 0) { + this.field196 += field181 >> 4; + class31.PcmStream_disable(this.stream); + this.method205(this.stream, this.stream.vmethod1019()); int var4 = 0; int var5 = 255; @@ -338,7 +349,7 @@ final void fill(int[] var1, int var2) { if ((var9 & 1) != 0) { var5 &= ~(1 << var7); var10 = null; - PcmStream var11 = this.field186[var7]; + PcmStream var11 = this.field188[var7]; label99: while (true) { @@ -360,21 +371,21 @@ final void fill(int[] var1, int var2) { var12.position += var13; } - if (var4 >= this.field192) { + if (var4 >= this.field189) { break label105; } PcmStream var14 = var11.firstSubStream(); if (var14 != null) { - for (int var15 = var11.field248; var14 != null; var14 = var11.nextSubStream()) { - this.method207(var14, var15 * var14.vmethod1019() >> 8); + for (int var15 = var11.field249; var14 != null; var14 = var11.nextSubStream()) { + this.method205(var14, var15 * var14.vmethod1019() >> 8); } } PcmStream var16 = var11.after; var11.after = null; if (var10 == null) { - this.field186[var7] = var16; + this.field188[var7] = var16; } else { var10.after = var16; } @@ -395,8 +406,8 @@ final void fill(int[] var1, int var2) { } for (var6 = 0; var6 < 8; ++var6) { - PcmStream var17 = this.field186[var6]; - PcmStream[] var18 = this.field186; + PcmStream var17 = this.field188[var6]; + PcmStream[] var18 = this.field188; this.field187[var6] = null; for (var18[var6] = null; var17 != null; var17 = var10) { @@ -406,69 +417,703 @@ final void fill(int[] var1, int var2) { } } - if (this.field193 < 0) { - this.field193 = 0; + if (this.field196 < 0) { + this.field196 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = class113.clockNow(); + this.timeMs = GameEngine.clockNow(); } - @ObfuscatedName("bs") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(Lby;II)V", - garbageValue = "702268738" + descriptor = "(Lbw;II)V", + garbageValue = "1754087851" ) - final void method207(PcmStream var1, int var2) { + final void method205(PcmStream var1, int var2) { int var3 = var2 >> 5; PcmStream var4 = this.field187[var3]; if (var4 == null) { - this.field186[var3] = var1; + this.field188[var3] = var1; } else { var4.after = var1; } this.field187[var3] = var1; - var1.field248 = var2; + var1.field249 = var2; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ZZI)Luu;", - garbageValue = "1707988592" + descriptor = "(IB)I", + garbageValue = "125" ) - static IndexedSprite method209(boolean var0, boolean var1) { - return var0 ? (var1 ? Message.field348 : class11.options_buttons_2Sprite) : (var1 ? class4.field4 : WorldMapLabelSize.options_buttons_0Sprite); + public static int method197(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 7 & 127L); + return var1; } - @ObfuscatedName("ag") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)Lcr;", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "2108015149" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return class419.getNextWorldListWorld(); + static void method212(int var0) { + if (var0 != Login.loginIndex) { + Login.loginIndex = var0; + } } - @ObfuscatedName("az") + @ObfuscatedName("jp") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", + descriptor = "(Ldr;IIIIIB)V", garbageValue = "1" ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { + if (var0 instanceof NPC) { + NPCComposition var6 = ((NPC)var0).definition; + if (var6.transforms != null) { + var6 = var6.transform(); + } - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + class313.charToByteCp1252(var0.charAt(var3)); + if (var6 == null) { + return; + } + } + + int var75 = Players.Players_count; + int[] var7 = Players.Players_indices; + boolean var8 = var1 < var75; + int var9 = -2; + if (var0.overheadText != null && (!var8 || !var0.showPublicPlayerChat && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + SecureRandomFuture.method443(var0, var0.defaultHeight); + if (Client.viewportTempX > -1 && Client.overheadTextLimit < Client.overheadTextCount) { + Client.overheadTextXOffsets[Client.overheadTextLimit] = class59.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextLimit] = class59.fontBold12.ascent; + Client.overheadTextXs[Client.overheadTextLimit] = Client.viewportTempX; + Client.overheadTextYs[Client.overheadTextLimit] = Client.viewportTempY - var9; + Client.overheadTextColors[Client.overheadTextLimit] = var0.field995; + Client.overheadTextEffects[Client.overheadTextLimit] = var0.field996; + Client.overheadTextCyclesRemaining[Client.overheadTextLimit] = var0.overheadTextCyclesRemaining; + Client.field594[Client.overheadTextLimit] = var0.field1028; + Client.field603[Client.overheadTextLimit] = var0.overheadText; + ++Client.overheadTextLimit; + var9 += 12; + } + } + + int var15; + int var22; + int var23; + if (!var0.healthBars.method2008()) { + SecureRandomFuture.method443(var0, var0.defaultHeight + 15); + + for (HealthBar var10 = (HealthBar)var0.healthBars.last(); var10 != null; var10 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var11 = var10.get(Client.cycle); + if (var11 == null) { + if (var10.isEmpty()) { + var10.remove(); + } + } else { + HealthBarDefinition var12 = var10.definition; + SpritePixels var13 = var12.getBackSprite(); + SpritePixels var14 = var12.getFrontSprite(); + int var16 = 0; + if (var13 != null && var14 != null) { + if (var12.widthPadding * 2 < var14.subWidth) { + var16 = var12.widthPadding; + } + + var15 = var14.subWidth - var16 * 2; + } else { + var15 = var12.width; + } + + int var17 = 255; + boolean var18 = true; + int var19 = Client.cycle - var11.cycle; + int var20 = var15 * var11.health2 / var12.width; + int var21; + int var97; + if (var11.cycleOffset > var19) { + var21 = var12.field1556 == 0 ? 0 : var12.field1556 * (var19 / var12.field1556); + var22 = var15 * var11.health / var12.width; + var97 = var21 * (var20 - var22) / var11.cycleOffset + var22; + } else { + var97 = var20; + var21 = var11.cycleOffset + var12.int5 - var19; + if (var12.int3 >= 0) { + var17 = (var21 << 8) / (var12.int5 - var12.int3); + } + } + + if (var11.health2 > 0 && var97 < 1) { + var97 = 1; + } + + if (var13 != null && var14 != null) { + if (var15 == var97) { + var97 += var16 * 2; + } else { + var97 += var16; + } + + var21 = var13.subHeight; + var9 += var21; + var22 = var2 + Client.viewportTempX - (var15 >> 1); + var23 = var3 + Client.viewportTempY - var9; + var22 -= var16; + if (var17 >= 0 && var17 < 255) { + var13.drawTransAt(var22, var23, var17); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var23 + var21); + var14.drawTransAt(var22, var23, var17); + } else { + var13.drawTransBgAt(var22, var23); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var21 + var23); + var14.drawTransBgAt(var22, var23); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var9 += 2; + } else { + var9 += 5; + if (Client.viewportTempX > -1) { + var21 = var2 + Client.viewportTempX - (var15 >> 1); + var22 = var3 + Client.viewportTempY - var9; + Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var97, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var97 + var21, var22, var15 - var97, 5, 16711680); + } + + var9 += 2; + } + } + } + } + + if (var9 == -2) { + var9 += 7; + } + + Player var90; + if (var8 && var0.playerCycle == Client.cycle && Occluder.method1299((Player)var0)) { + var90 = (Player)var0; + if (var8) { + SecureRandomFuture.method443(var0, var0.defaultHeight + 15); + AbstractFont var91 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + var9 += 4; + var91.drawCentered(var90.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var9, 16777215, 0); + var9 += 18; + } + } + + if (var8) { + var90 = (Player)var0; + if (var90.isHidden) { + return; + } + + if (var90.headIconPk != -1 || var90.headIconPrayer != -1) { + SecureRandomFuture.method443(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + if (var90.headIconPk != -1) { + var9 += 25; + class178.headIconPkSprites[var90.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); + } + + if (var90.headIconPrayer != -1) { + var9 += 25; + class502.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + SecureRandomFuture.method443(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var9 += ArchiveLoader.headIconHintSprites[1].subHeight; + ArchiveLoader.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); + } + } + } else { + NPC var92 = (NPC)var0; + int[] var93 = var92.method587(); + short[] var94 = var92.method588(); + if (var94 != null && var93 != null) { + for (int var76 = 0; var76 < var94.length; ++var76) { + if (var94[var76] >= 0 && var93[var76] >= 0) { + long var77 = (long)var93[var76] << 8 | (long)var94[var76]; + SpritePixels var79 = (SpritePixels)Client.archive5.method2180(var77); + if (var79 == null) { + SpritePixels[] var80 = WorldMapArchiveLoader.method2379(archive8, var93[var76], 0); + if (var80 != null && var94[var76] < var80.length) { + var79 = var80[var94[var76]]; + Client.archive5.method2181(var77, var79); + } + } + + if (var79 != null) { + SecureRandomFuture.method443(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var79.drawTransBgAt(var2 + Client.viewportTempX - (var79.subWidth >> 1), Client.viewportTempY + (var3 - var79.subHeight) - 4); + } + } + } + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + SecureRandomFuture.method443(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + ArchiveLoader.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + for (int var81 = 0; var81 < 4; ++var81) { + int var82 = var0.hitSplatCycles[var81]; + int var83 = var0.hitSplatTypes[var81]; + HitSplatDefinition var95 = null; + int var84 = 0; + if (var83 >= 0) { + if (var82 <= Client.cycle) { + continue; + } + + var95 = WorldMapCacheName.method1564(var0.hitSplatTypes[var81]); + var84 = var95.field1706; + if (var95 != null && var95.transforms != null) { + var95 = var95.transform(); + if (var95 == null) { + var0.hitSplatCycles[var81] = -1; + continue; + } + } + } else if (var82 < 0) { + continue; + } + + var15 = var0.hitSplatTypes2[var81]; + HitSplatDefinition var99 = null; + if (var15 >= 0) { + var99 = WorldMapCacheName.method1564(var15); + if (var99 != null && var99.transforms != null) { + var99 = var99.transform(); + } + } + + if (var82 - var84 <= Client.cycle) { + if (var95 == null) { + var0.hitSplatCycles[var81] = -1; + } else { + SecureRandomFuture.method443(var0, var0.defaultHeight / 2); + if (Client.viewportTempX > -1) { + boolean var96 = true; + if (var81 == 1) { + Client.viewportTempY -= 20; + } + + if (var81 == 2) { + Client.viewportTempX -= 15; + Client.viewportTempY -= 10; + } + + if (var81 == 3) { + Client.viewportTempX += 15; + Client.viewportTempY -= 10; + } + + SpritePixels var85 = null; + SpritePixels var86 = null; + SpritePixels var87 = null; + SpritePixels var88 = null; + var22 = 0; + var23 = 0; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + int var28 = 0; + int var29 = 0; + SpritePixels var30 = null; + SpritePixels var31 = null; + SpritePixels var32 = null; + SpritePixels var33 = null; + int var34 = 0; + int var35 = 0; + int var36 = 0; + int var37 = 0; + int var38 = 0; + int var39 = 0; + int var40 = 0; + int var41 = 0; + int var42 = 0; + var85 = var95.method1032(); + int var43; + if (var85 != null) { + var22 = var85.subWidth; + var43 = var85.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var26 = var85.xOffset; + } + + var86 = var95.method1033(); + if (var86 != null) { + var23 = var86.subWidth; + var43 = var86.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var27 = var86.xOffset; + } + + var87 = var95.method1034(); + if (var87 != null) { + var24 = var87.subWidth; + var43 = var87.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var28 = var87.xOffset; + } + + var88 = var95.method1035(); + if (var88 != null) { + var25 = var88.subWidth; + var43 = var88.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var29 = var88.xOffset; + } + + if (var99 != null) { + var30 = var99.method1032(); + if (var30 != null) { + var34 = var30.subWidth; + var43 = var30.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var38 = var30.xOffset; + } + + var31 = var99.method1033(); + if (var31 != null) { + var35 = var31.subWidth; + var43 = var31.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var39 = var31.xOffset; + } + + var32 = var99.method1034(); + if (var32 != null) { + var36 = var32.subWidth; + var43 = var32.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var40 = var32.xOffset; + } + + var33 = var99.method1035(); + if (var33 != null) { + var37 = var33.subWidth; + var43 = var33.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var41 = var33.xOffset; + } + } + + Font var89 = var95.getFont(); + if (var89 == null) { + var89 = HealthBarUpdate.fontPlain11; + } + + Font var44; + if (var99 != null) { + var44 = var99.getFont(); + if (var44 == null) { + var44 = HealthBarUpdate.fontPlain11; + } + } else { + var44 = HealthBarUpdate.fontPlain11; + } + + String var45 = null; + String var46 = null; + boolean var47 = false; + int var48 = 0; + var45 = var95.getString(var0.hitSplatValues[var81]); + int var98 = var89.stringWidth(var45); + if (var99 != null) { + var46 = var99.getString(var0.hitSplatValues2[var81]); + var48 = var44.stringWidth(var46); + } + + int var49 = 0; + int var50 = 0; + if (var23 > 0) { + if (var87 == null && var88 == null) { + var49 = 1; + } else { + var49 = var98 / var23 + 1; + } + } + + if (var99 != null && var35 > 0) { + if (var32 == null && var33 == null) { + var50 = 1; + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; + int var52 = var51; + if (var22 > 0) { + var51 += var22; + } + + var51 += 2; + int var53 = var51; + if (var24 > 0) { + var51 += var24; + } + + int var54 = var51; + int var55 = var51; + int var56; + if (var23 > 0) { + var56 = var23 * var49; + var51 += var56; + var55 += (var56 - var98) / 2; + } else { + var51 += var98; + } + + var56 = var51; + if (var25 > 0) { + var51 += var25; + } + + int var57 = 0; + int var58 = 0; + int var59 = 0; + int var60 = 0; + int var61 = 0; + int var62; + if (var99 != null) { + var51 += 2; + var57 = var51; + if (var34 > 0) { + var51 += var34; + } + + var51 += 2; + var58 = var51; + if (var36 > 0) { + var51 += var36; + } + + var59 = var51; + var61 = var51; + if (var35 > 0) { + var62 = var50 * var35; + var51 += var62; + var61 += (var62 - var48) / 2; + } else { + var51 += var48; + } + + var60 = var51; + if (var37 > 0) { + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var81] - Client.cycle; + int var63 = var95.field1709 - var62 * var95.field1709 / var95.field1706; + int var64 = var62 * var95.field1703 / var95.field1706 + -var95.field1703; + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); + int var66 = var3 + Client.viewportTempY - 12 + var64; + int var67 = var66; + int var68 = var42 + var66; + int var69 = var66 + var95.field1708 + 15; + int var70 = var69 - var89.maxAscent; + int var71 = var69 + var89.maxDescent; + if (var70 < var66) { + var67 = var70; + } + + if (var71 > var68) { + var68 = var71; + } + + int var72 = 0; + int var73; + int var74; + if (var99 != null) { + var72 = var66 + var99.field1708 + 15; + var73 = var72 - var44.maxAscent; + var74 = var72 + var44.maxDescent; + if (var73 < var67) { + ; + } + + if (var74 > var68) { + ; + } + } + + var73 = 255; + if (var95.field1707 >= 0) { + var73 = (var62 << 8) / (var95.field1706 - var95.field1707); + } + + if (var73 >= 0 && var73 < 255) { + if (var85 != null) { + var85.drawTransAt(var65 + var52 - var26, var66, var73); + } + + if (var87 != null) { + var87.drawTransAt(var65 + var53 - var28, var66, var73); + } + + if (var86 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var86.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); + } + } + + if (var88 != null) { + var88.drawTransAt(var65 + var56 - var29, var66, var73); + } + + var89.drawAlpha(var45, var65 + var55, var69, var95.textColor, 0, var73); + if (var99 != null) { + if (var30 != null) { + var30.drawTransAt(var57 + var65 - var38, var66, var73); + } + + if (var32 != null) { + var32.drawTransAt(var58 + var65 - var40, var66, var73); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); + } + } + + if (var33 != null) { + var33.drawTransAt(var65 + var60 - var41, var66, var73); + } + + var44.drawAlpha(var46, var61 + var65, var72, var99.textColor, 0, var73); + } + } else { + if (var85 != null) { + var85.drawTransBgAt(var65 + var52 - var26, var66); + } + + if (var87 != null) { + var87.drawTransBgAt(var65 + var53 - var28, var66); + } + + if (var86 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var86.drawTransBgAt(var23 * var74 + (var65 + var54 - var27), var66); + } + } + + if (var88 != null) { + var88.drawTransBgAt(var56 + var65 - var29, var66); + } + + var89.draw(var45, var65 + var55, var69, var95.textColor | -16777216, 0); + if (var99 != null) { + if (var30 != null) { + var30.drawTransBgAt(var57 + var65 - var38, var66); + } + + if (var32 != null) { + var32.drawTransBgAt(var58 + var65 - var40, var66); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); + } + } + + if (var33 != null) { + var33.drawTransBgAt(var65 + var60 - var41, var66); + } + + var44.draw(var46, var65 + var61, var72, var99.textColor | -16777216, 0); + } + } + } + } + } + } + + } + } + + @ObfuscatedName("md") + @ObfuscatedSignature( + descriptor = "([Lmi;IIIZI)V", + garbageValue = "-166664235" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { + Widget var6 = var0[var5]; + if (var6 != null && var6.parentId == var1) { + class369.alignWidgetSize(var6, var2, var3, var4); + WorldMapArea.alignWidgetPosition(var6, var2, var3); + if (var6.scrollX > var6.scrollWidth - var6.width) { + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { + var6.scrollY = 0; + } + + if (var6.type == 0) { + Login.revalidateWidgetScroll(var0, var6, var4); + } + } } - return var2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PcmStream.java b/osrs/src/main/java/PcmStream.java index ebc3aa4a5..39ade77d6 100644 --- a/osrs/src/main/java/PcmStream.java +++ b/osrs/src/main/java/PcmStream.java @@ -3,24 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("by") +@ObfuscatedName("bw") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lby;" + descriptor = "Lbw;" ) @Export("after") PcmStream after; - @ObfuscatedName("ae") - int field248; - @ObfuscatedName("ab") + @ObfuscatedName("ag") + int field249; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lcm;" + descriptor = "Lcp;" ) @Export("sound") AbstractSound sound; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("active") volatile boolean active; @@ -28,39 +28,39 @@ protected PcmStream() { this.active = true; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "()Lby;" + descriptor = "()Lbw;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "()Lby;" + descriptor = "()Lbw;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("vmethod5648") protected abstract int vmethod5648(); - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("by") + @ObfuscatedName("br") @Export("vmethod1019") int vmethod1019() { return 255; } - @ObfuscatedName("gy") + @ObfuscatedName("fq") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { @@ -70,4 +70,4 @@ final void update(int[] var1, int var2, int var3) { } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PcmStreamMixer.java b/osrs/src/main/java/PcmStreamMixer.java index 5a3c97685..392119a22 100644 --- a/osrs/src/main/java/PcmStreamMixer.java +++ b/osrs/src/main/java/PcmStreamMixer.java @@ -3,85 +3,85 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("be") +@ObfuscatedName("bl") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) - NodeDeque field163; - @ObfuscatedName("ar") - int field161; - @ObfuscatedName("am") + NodeDeque field161; + @ObfuscatedName("ao") + int field159; + @ObfuscatedName("at") int field160; public PcmStreamMixer() { this.subStreams = new NodeDeque(); - this.field163 = new NodeDeque(); - this.field161 = 0; + this.field161 = new NodeDeque(); + this.field159 = 0; this.field160 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lby;)V" + descriptor = "(Lbw;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lby;)V" + descriptor = "(Lbw;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); } - @ObfuscatedName("ar") - void method179() { - if (this.field161 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field163.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field163.previous()) { - var1.field294 -= this.field161; + @ObfuscatedName("ao") + void method177() { + if (this.field159 > 0) { + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field161.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field161.previous()) { + var1.field294 -= this.field159; } - this.field160 -= this.field161; - this.field161 = 0; + this.field160 -= this.field159; + this.field159 = 0; } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lsb;Lcs;)V" + descriptor = "(Lsj;Lcs;)V" ) - void method180(Node var1, PcmStreamMixerListener var2) { - while (this.field163.sentinel != var1 && ((PcmStreamMixerListener)var1).field294 <= var2.field294) { + void method178(Node var1, PcmStreamMixerListener var2) { + while (this.field161.sentinel != var1 && ((PcmStreamMixerListener)var1).field294 <= var2.field294) { var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); - this.field160 = ((PcmStreamMixerListener)this.field163.sentinel.previous).field294; + this.field160 = ((PcmStreamMixerListener)this.field161.sentinel.previous).field294; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Lcs;)V" ) - void method181(PcmStreamMixerListener var1) { + void method179(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); - Node var2 = this.field163.sentinel.previous; - if (var2 == this.field163.sentinel) { + Node var2 = this.field161.sentinel.previous; + if (var2 == this.field161.sentinel) { this.field160 = -1; } else { this.field160 = ((PcmStreamMixerListener)var2).field294; @@ -89,31 +89,31 @@ void method181(PcmStreamMixerListener var1) { } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "()Lby;" + descriptor = "()Lbw;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "()Lby;" + descriptor = "()Lbw;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("vmethod5648") protected int vmethod5648() { return 0; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { @@ -122,34 +122,34 @@ public final synchronized void fill(int[] var1, int var2, int var3) { return; } - if (var3 + this.field161 < this.field160) { - this.field161 += var3; + if (var3 + this.field159 < this.field160) { + this.field159 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.field160 - this.field161; + int var4 = this.field160 - this.field159; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; - this.field161 += var4; - this.method179(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field163.last(); + this.field159 += var4; + this.method177(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field161.last(); synchronized(var5) { int var7 = var5.update(); if (var7 < 0) { var5.field294 = 0; - this.method181(var5); + this.method179(var5); } else { var5.field294 = var7; - this.method180(var5.previous, var5); + this.method178(var5.previous, var5); } } } while(var3 != 0); } - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { @@ -158,7 +158,7 @@ void updateSubStreams(int[] var1, int var2, int var3) { } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("skip") public final synchronized void skip(int var1) { do { @@ -167,33 +167,33 @@ public final synchronized void skip(int var1) { return; } - if (this.field161 + var1 < this.field160) { - this.field161 += var1; + if (this.field159 + var1 < this.field160) { + this.field159 += var1; this.skipSubStreams(var1); return; } - int var2 = this.field160 - this.field161; + int var2 = this.field160 - this.field159; this.skipSubStreams(var2); var1 -= var2; - this.field161 += var2; - this.method179(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field163.last(); + this.field159 += var2; + this.method177(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field161.last(); synchronized(var3) { int var5 = var3.update(); if (var5 < 0) { var3.field294 = 0; - this.method181(var3); + this.method179(var3); } else { var3.field294 = var5; - this.method180(var3.previous, var3); + this.method178(var3.previous, var3); } } } while(var1 != 0); } - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { @@ -201,4 +201,4 @@ void skipSubStreams(int var1) { } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PcmStreamMixerListener.java b/osrs/src/main/java/PcmStreamMixerListener.java index aa59780f2..ef6604295 100644 --- a/osrs/src/main/java/PcmStreamMixerListener.java +++ b/osrs/src/main/java/PcmStreamMixerListener.java @@ -6,17 +6,17 @@ @ObfuscatedName("cs") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("au") int field294; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("remove2") abstract void remove2(); - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lbe;)I" + descriptor = "(Lbl;)I" ) @Export("update") abstract int update(); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PendingSpawn.java b/osrs/src/main/java/PendingSpawn.java index c74537bf5..49550de63 100644 --- a/osrs/src/main/java/PendingSpawn.java +++ b/osrs/src/main/java/PendingSpawn.java @@ -3,491 +3,124 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") +import java.net.MalformedURLException; +import java.net.URL; + +@ObfuscatedName("dv") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("rg") - @ObfuscatedSignature( - descriptor = "Lew;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("aw") + @ObfuscatedName("ub") + @Export("cameraLookAtX") + static int cameraLookAtX; + @ObfuscatedName("au") @Export("plane") int plane; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("type") int type; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("x") int x; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("y") int y; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("objectId") int objectId; - @ObfuscatedName("aj") - int field945; - @ObfuscatedName("ag") - int field943; + @ObfuscatedName("ai") + int field948; @ObfuscatedName("az") + int field956; + @ObfuscatedName("ap") @Export("id") int id; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("rotation") int rotation; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("objectType") int objectType; - @ObfuscatedName("aq") - int field948; - @ObfuscatedName("ah") - int field944; - @ObfuscatedName("ax") + @ObfuscatedName("ad") + int field945; + @ObfuscatedName("al") + int field949; + @ObfuscatedName("an") @Export("startCycle") int startCycle; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("endCycle") int endCycle; PendingSpawn() { - this.field944 = 31; + this.field949 = 31; this.startCycle = 0; this.endCycle = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2117178902" + garbageValue = "-390756021" ) - void method509(int var1) { - this.field944 = var1; + void method506(int var1) { + this.field949 = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1391421037" + garbageValue = "-1725061454" ) - boolean method510(int var1) { + boolean method507(int var1) { if (var1 >= 0 && var1 <= 4) { - return (this.field944 & 1 << var1) != 0; + return (this.field949 & 1 << var1) != 0; } else { return true; } } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)[Lnw;", - garbageValue = "-1780334162" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_normal, PlayerType.field3484, PlayerType.field3472, PlayerType.field3473, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ironman, PlayerType.field3483, PlayerType.field3474, PlayerType.PlayerType_ultimateIronman, PlayerType.field3475, PlayerType.field3479, PlayerType.PlayerType_playerModerator, PlayerType.field3482, PlayerType.field3486, PlayerType.field3488, PlayerType.field3478}; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(IIIIIILiz;Lij;I)V", - garbageValue = "235941196" - ) - @Export("addObjects") - static final void addObjects(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { - if (var0 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var0; - } - - ObjectComposition var8 = class90.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; + @ObfuscatedName("au") + public static final void method505(long var0) { + if (var0 > 0L) { + if (0L == var0 % 10L) { + WorldMapData_0.method1390(var0 - 1L); + WorldMapData_0.method1390(1L); } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; - } - - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var11][var14] + var15[var11][var13] + var15[var12][var13] + var15[var12][var14] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = BufferedNetSocket.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - if (var8.hasSound()) { - GrandExchangeOfferOwnWorldComparator.method353(var0, var1, var2, var8, var4); + WorldMapData_0.method1390(var0); } - Object var22; - if (var5 == 22) { - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var22, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else { - int var31; - if (var5 != 10 && var5 != 11) { - int[] var10000; - if (var5 >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.method1221(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = BufferedNetSocket.field3806[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field840[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - InvDefinition.field1488[var0][var1][var2] = 50; - InvDefinition.field1488[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = BufferedNetSocket.field3806[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - InvDefinition.field1488[var0][var1][var2 + 1] = 50; - InvDefinition.field1488[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = BufferedNetSocket.field3806[var0][var1]; - var10000[var2 + 1] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - InvDefinition.field1488[var0][var1 + 1][var2] = 50; - InvDefinition.field1488[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = BufferedNetSocket.field3806[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - InvDefinition.field1488[var0][var1][var2] = 50; - InvDefinition.field1488[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = BufferedNetSocket.field3806[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1093(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method1227(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field844[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - InvDefinition.field1488[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - InvDefinition.field1488[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - InvDefinition.field1488[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - InvDefinition.field1488[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1093(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { - var28 = var4 + 1 & 3; - Object var23; - Object var24; - if (var8.animationId == -1 && var8.transforms == null) { - var23 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); - var24 = var8.getEntity(2, var28, var15, var17, var16, var18); - } else { - var23 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - var24 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var23, (Renderable)var24, Tiles.field840[var4], Tiles.field840[var28], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = BufferedNetSocket.field3806[var0][var1]; - var10000[var2] |= 585; - var10000 = BufferedNetSocket.field3806[var0][var1]; - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { - var10000 = BufferedNetSocket.field3806[var0][var1]; - var10000[var2 + 1] |= 1170; - var10000 = BufferedNetSocket.field3806[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = BufferedNetSocket.field3806[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = BufferedNetSocket.field3806[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = BufferedNetSocket.field3806[var0][var1]; - var10000[var2] |= 1170; - var10000 = BufferedNetSocket.field3806[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1093(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method1227(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field844[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - InvDefinition.field1488[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - InvDefinition.field1488[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - InvDefinition.field1488[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - InvDefinition.field1488[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1093(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.method1221(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method1227(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field840[var4], 0, 0, 0, var19, var21); - } else { - Object var25; - long var29; - if (var5 == 5) { - var28 = 16; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var29) { - var28 = class90.getObjectDefinition(class458.Entity_unpackID(var29)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field840[var4], 0, var28 * Tiles.field839[var4], var28 * Tiles.field842[var4], var19, var21); - } else if (var5 == 6) { - var28 = 8; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var29 != 0L) { - var28 = class90.getObjectDefinition(class458.Entity_unpackID(var29)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field843[var4], var28 * Tiles.field841[var4], var19, var21); - } else if (var5 == 7) { - var31 = var4 + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var31 + 4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 4, var31 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, 256, var31, 0, 0, var19, var21); - } else if (var5 == 8) { - var28 = 8; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var29) { - var28 = class90.getObjectDefinition(class458.Entity_unpackID(var29)).int2 / 2; - } - - int var27 = var4 + 2 & 3; - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field843[var4], var28 * Tiles.field841[var4], var19, var21); - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - if (var22 != null && var6.method1221(var0, var1, var2, var16, var9, var10, (Renderable)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { - var31 = 15; - if (var22 instanceof Model) { - var31 = ((Model)var22).method1293() / 4; - if (var31 > 30) { - var31 = 30; - } - } - - for (int var32 = 0; var32 <= var9; ++var32) { - for (int var33 = 0; var33 <= var10; ++var33) { - if (var31 > InvDefinition.field1488[var0][var32 + var1][var33 + var2]) { - InvDefinition.field1488[var0][var32 + var1][var33 + var2] = (byte)var31; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } } } - @ObfuscatedName("an") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-230258157" + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "1525376195" ) - public static void method513(boolean var0) { - if (var0 != class502.ItemDefinition_inMembersWorld) { - GrandExchangeOfferOwnWorldComparator.method355(); - class502.ItemDefinition_inMembersWorld = var0; + static boolean method508(String var0) { + if (var0 == null) { + return false; + } else { + try { + new URL(var0); + return true; + } catch (MalformedURLException var2) { + return false; + } } - } - @ObfuscatedName("hs") + @ObfuscatedName("hm") @ObfuscatedSignature( - descriptor = "(IZZZZS)Lny;", - garbageValue = "-12533" + descriptor = "(ZI)V", + garbageValue = "-1915855915" ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3, boolean var4) { - ArchiveDisk var5 = null; - if (JagexCache.JagexCache_dat2File != null) { - var5 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class302.JagexCache_idxFiles[var0], 1000000); + static final void method509(boolean var0) { + if (var0) { + Client.field421 = Login.field743 ? class139.field1319 : class139.field1321; + } else { + Client.field421 = class449.clientPreferences.method568(Login.Login_username) ? class139.field1322 : class139.field1320; } - return new Archive(var5, class158.masterDisk, class153.field1356, var0, var1, var2, var3, var4); - } - - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "1729163536" - ) - static long method515() { - return Client.playerUUID; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PlatformInfo.java b/osrs/src/main/java/PlatformInfo.java index 769d3c5cb..b66e8f1cf 100644 --- a/osrs/src/main/java/PlatformInfo.java +++ b/osrs/src/main/java/PlatformInfo.java @@ -3,148 +3,164 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sy") +@ObfuscatedName("sm") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("bp") - int field3924; - @ObfuscatedName("bv") - boolean field3918; + @ObfuscatedName("by") + int field3943; + @ObfuscatedName("bs") + boolean field3930; + @ObfuscatedName("bm") + int field3937; + @ObfuscatedName("bf") + int field3934; @ObfuscatedName("bq") - int field3925; + int field3939; + @ObfuscatedName("ba") + int field3931; + @ObfuscatedName("bl") + int field3936; + @ObfuscatedName("bp") + boolean field3929; + @ObfuscatedName("bu") + int field3941; @ObfuscatedName("bo") - int field3923; + int field3938; @ObfuscatedName("br") - int field3926; - @ObfuscatedName("bw") - int field3928; + int field3940; @ObfuscatedName("be") - int field3919; - @ObfuscatedName("bc") - boolean field3917; + int field3933; @ObfuscatedName("bi") - int field3921; - @ObfuscatedName("bu") - int field3927; + String field3947; @ObfuscatedName("bz") - int field3931; + String field3950; @ObfuscatedName("bx") - int field3929; - @ObfuscatedName("bh") - String field3935; - @ObfuscatedName("bm") - String field3937; - @ObfuscatedName("bl") - String field3936; - @ObfuscatedName("bt") - String field3938; - @ObfuscatedName("by") - int field3930; + String field3949; + @ObfuscatedName("bn") + String field3948; + @ObfuscatedName("bw") + int field3942; + @ObfuscatedName("bc") + int field3932; @ObfuscatedName("bg") - int field3920; - @ObfuscatedName("bj") - int field3922; - @ObfuscatedName("ct") - int field3933; + int field3935; + @ObfuscatedName("cw") + int field3945; @ObfuscatedName("cf") - String field3939; - @ObfuscatedName("cz") - String field3942; - @ObfuscatedName("cb") - int[] field3934; - @ObfuscatedName("cs") - int field3932; - @ObfuscatedName("cj") - String field3940; + String field3951; + @ObfuscatedName("cm") + String field3952; @ObfuscatedName("cn") - String field3941; + int[] field3946; + @ObfuscatedName("cs") + int field3944; + @ObfuscatedName("cx") + String field3954; + @ObfuscatedName("cr") + String field3953; PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25, String var26) { - this.field3934 = new int[3]; - this.field3924 = var1; - this.field3918 = var2; - this.field3925 = var3; - this.field3923 = var4; - this.field3926 = var5; - this.field3928 = var6; - this.field3919 = var7; - this.field3917 = var8; - this.field3921 = var9; - this.field3927 = var10; - this.field3931 = var11; - this.field3929 = var12; - this.field3935 = var13; - this.field3937 = var14; - this.field3936 = var15; - this.field3938 = var16; - this.field3930 = var17; - this.field3920 = var18; - this.field3922 = var19; - this.field3933 = var20; - this.field3939 = var21; - this.field3942 = var22; - this.field3934 = var23; - this.field3932 = var24; - this.field3940 = var25; - this.field3941 = var26; + this.field3946 = new int[3]; + this.field3943 = var1; + this.field3930 = var2; + this.field3937 = var3; + this.field3934 = var4; + this.field3939 = var5; + this.field3931 = var6; + this.field3936 = var7; + this.field3929 = var8; + this.field3941 = var9; + this.field3938 = var10; + this.field3940 = var11; + this.field3933 = var12; + this.field3947 = var13; + this.field3950 = var14; + this.field3949 = var15; + this.field3948 = var16; + this.field3942 = var17; + this.field3932 = var18; + this.field3935 = var19; + this.field3945 = var20; + this.field3951 = var21; + this.field3952 = var22; + this.field3946 = var23; + this.field3944 = var24; + this.field3954 = var25; + this.field3953 = var26; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "-1478570586" + descriptor = "(Ltm;B)V", + garbageValue = "77" ) @Export("write") public void write(Buffer var1) { var1.writeByte(9); - var1.writeByte(this.field3924); - var1.writeByte(this.field3918 ? 1 : 0); - var1.writeShort(this.field3925); - var1.writeByte(this.field3923); - var1.writeByte(this.field3926); - var1.writeByte(this.field3928); - var1.writeByte(this.field3919); - var1.writeByte(this.field3917 ? 1 : 0); - var1.writeShort(this.field3921); - var1.writeByte(this.field3927); - var1.writeMedium(this.field3931); - var1.writeShort(this.field3929); - var1.writeStringCp1252NullCircumfixed(this.field3935); - var1.writeStringCp1252NullCircumfixed(this.field3937); - var1.writeStringCp1252NullCircumfixed(this.field3936); - var1.writeStringCp1252NullCircumfixed(this.field3938); - var1.writeByte(this.field3920); - var1.writeShort(this.field3930); - var1.writeStringCp1252NullCircumfixed(this.field3939); - var1.writeStringCp1252NullCircumfixed(this.field3942); - var1.writeByte(this.field3922); - var1.writeByte(this.field3933); + var1.writeByte(this.field3943); + var1.writeByte(this.field3930 ? 1 : 0); + var1.writeShort(this.field3937); + var1.writeByte(this.field3934); + var1.writeByte(this.field3939); + var1.writeByte(this.field3931); + var1.writeByte(this.field3936); + var1.writeByte(this.field3929 ? 1 : 0); + var1.writeShort(this.field3941); + var1.writeByte(this.field3938); + var1.writeMedium(this.field3940); + var1.writeShort(this.field3933); + var1.writeStringCp1252NullCircumfixed(this.field3947); + var1.writeStringCp1252NullCircumfixed(this.field3950); + var1.writeStringCp1252NullCircumfixed(this.field3949); + var1.writeStringCp1252NullCircumfixed(this.field3948); + var1.writeByte(this.field3932); + var1.writeShort(this.field3942); + var1.writeStringCp1252NullCircumfixed(this.field3951); + var1.writeStringCp1252NullCircumfixed(this.field3952); + var1.writeByte(this.field3935); + var1.writeByte(this.field3945); - for (int var2 = 0; var2 < this.field3934.length; ++var2) { - var1.writeInt(this.field3934[var2]); + for (int var2 = 0; var2 < this.field3946.length; ++var2) { + var1.writeInt(this.field3946[var2]); } - var1.writeInt(this.field3932); - var1.writeStringCp1252NullCircumfixed(this.field3940); - var1.writeStringCp1252NullCircumfixed(this.field3941); + var1.writeInt(this.field3944); + var1.writeStringCp1252NullCircumfixed(this.field3954); + var1.writeStringCp1252NullCircumfixed(this.field3953); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-209852192" + garbageValue = "-1863641013" ) @Export("size") public int size() { byte var1 = 39; - int var2 = var1 + class387.method1985(this.field3935); - var2 += class387.method1985(this.field3937); - var2 += class387.method1985(this.field3936); - var2 += class387.method1985(this.field3938); - var2 += class387.method1985(this.field3939); - var2 += class387.method1985(this.field3942); - var2 += class387.method1985(this.field3940); - var2 += class387.method1985(this.field3941); - return var2; + String var4 = this.field3947; + int var3 = var4.length() + 2; + int var26 = var3 + var1; + String var7 = this.field3950; + int var6 = var7.length() + 2; + var26 += var6; + String var10 = this.field3949; + int var9 = var10.length() + 2; + var26 += var9; + String var13 = this.field3948; + int var12 = var13.length() + 2; + var26 += var12; + String var16 = this.field3951; + int var15 = var16.length() + 2; + var26 += var15; + String var19 = this.field3952; + int var18 = var19.length() + 2; + var26 += var18; + String var22 = this.field3954; + int var21 = var22.length() + 2; + var26 += var21; + String var25 = this.field3953; + int var24 = var25.length() + 2; + var26 += var24; + return var26; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Player.java b/osrs/src/main/java/Player.java index 036df1739..f4ce32849 100644 --- a/osrs/src/main/java/Player.java +++ b/osrs/src/main/java/Player.java @@ -6,107 +6,113 @@ @ObfuscatedName("df") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("aw") + @ObfuscatedName("fy") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lui;" + descriptor = "Luc;" ) @Export("username") Username username; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmt;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("headIconPk") int headIconPk; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("actions") String[] actions; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("combatLevel") int combatLevel; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("skillLevel") int skillLevel; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("tileHeight") int tileHeight; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("at") - int field911; - @ObfuscatedName("ah") + @ObfuscatedName("aq") + int field909; + @ObfuscatedName("al") @Export("baseTileHeight") int baseTileHeight; - @ObfuscatedName("ax") - int field914; - @ObfuscatedName("aa") + @ObfuscatedName("ar") + int field910; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Ljo;" + descriptor = "Ljr;" ) @Export("attachedModel") Model attachedModel; - @ObfuscatedName("au") + @ObfuscatedName("ag") @Export("minX") int minX; - @ObfuscatedName("ae") + @ObfuscatedName("am") @Export("minY") int minY; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @Export("maxX") int maxX; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @Export("maxY") int maxY; - @ObfuscatedName("ao") + @ObfuscatedName("as") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("ac") + @ObfuscatedName("ay") @Export("team") int team; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @Export("isHidden") boolean isHidden; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("plane") int plane; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("index") int index; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lqj;" + descriptor = "Lqp;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("bd") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lqj;" + descriptor = "Lqp;" ) @Export("isInFriendsChat") TriBool isInFriendsChat; - @ObfuscatedName("bb") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Lqj;" + descriptor = "Lqp;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("hasMovementPending") boolean hasMovementPending; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("tileX") int tileX; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("tileY") int tileY; @@ -132,10 +138,10 @@ public final class Player extends Actor { this.hasMovementPending = false; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "0" + descriptor = "(Ltm;I)V", + garbageValue = "-1203582421" ) @Export("read") final void read(Buffer var1) { @@ -164,7 +170,7 @@ final void read(Buffer var1) { } if (var5[var6] >= 512) { - var9 = class125.ItemDefinition_get(var5[var6] - 512).team; + var9 = InvDefinition.ItemDefinition_get(var5[var6] - 512).team; if (var9 != 0) { this.team = var9; } @@ -191,7 +197,7 @@ final void read(Buffer var1) { for (var8 = 0; var8 < 5; ++var8) { var9 = var1.readUnsignedByte(); - if (var9 < 0 || var9 >= ClanChannel.field1410[var8].length) { + if (var9 < 0 || var9 >= class140.field1328[var8].length) { var9 = 0; } @@ -234,12 +240,12 @@ final void read(Buffer var1) { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), class457.loginType); + this.username = new Username(var1.readStringCp1252NullTerminated(), Language.loginType); this.clearIsFriend(); this.clearIsInFriendsChat(); this.clearIsInClanChat(); - if (this == class136.localPlayer) { - RunException.field4248 = this.username.getName(); + if (this == VarbitComposition.localPlayer) { + RunException.field4289 = this.username.getName(); } this.combatLevel = var1.readUnsignedByte(); @@ -314,21 +320,21 @@ final void read(Buffer var1) { this.appearance = new PlayerComposition(); } - this.appearance.method1679(var26, var5, var28, var30, var27, var2, var4, var29); + this.appearance.method1717(var26, var5, var28, var30, var27, var2, var4, var29); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Ljo;", - garbageValue = "-983173466" + descriptor = "(I)Ljr;", + garbageValue = "798227647" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class135.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null) ? class135.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? EnumComposition.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : EnumComposition.SequenceDefinition_get(super.movementSequence); Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -337,7 +343,7 @@ protected final Model getModel() { super.defaultHeight = var3.height; int var4 = var3.indicesCount; if (!this.isUnanimated) { - var3 = this.method525(var3); + var3 = this.method520(var3); } if (!this.isUnanimated && this.attachedModel != null) { @@ -347,7 +353,7 @@ protected final Model getModel() { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { Model var5 = this.attachedModel; - var5.offsetBy(this.field911 - super.x, this.baseTileHeight - this.tileHeight, this.field914 - super.y); + var5.offsetBy(this.field909 - super.x, this.baseTileHeight - this.tileHeight, this.field910 - super.y); if (super.orientation == 512) { var5.rotateY90Ccw(); var5.rotateY90Ccw(); @@ -372,7 +378,7 @@ protected final Model getModel() { var5.rotateY90Ccw(); } - var5.offsetBy(super.x - this.field911, this.tileHeight - this.baseTileHeight, super.y - this.field914); + var5.offsetBy(super.x - this.field909, this.tileHeight - this.baseTileHeight, super.y - this.field910); } } @@ -382,7 +388,7 @@ protected final Model getModel() { var3.overrideSaturation = super.recolourSaturation; var3.overrideLuminance = super.recolourLuminance; var3.overrideAmount = super.recolourAmount; - var3.field2219 = (short)var4; + var3.field2243 = (short)var4; } else { var3.overrideAmount = 0; } @@ -392,10 +398,10 @@ protected final Model getModel() { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-21914" + descriptor = "(I)Z", + garbageValue = "-458663829" ) @Export("isFriend") boolean isFriend() { @@ -406,31 +412,32 @@ boolean isFriend() { return this.isFriendTriBool == TriBool.TriBool_true; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-96" + descriptor = "(I)V", + garbageValue = "-1612741711" ) @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; } - @ObfuscatedName("as") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-37" + descriptor = "(I)V", + garbageValue = "-1885104280" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = class177.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriendTriBool = class299.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-57" + descriptor = "(I)Z", + garbageValue = "-563231680" ) + @Export("isFriendsChatMember") boolean isFriendsChatMember() { if (this.isInFriendsChat == TriBool.TriBool_unknown) { this.updateIsInFriendsChat(); @@ -439,35 +446,35 @@ boolean isFriendsChatMember() { return this.isInFriendsChat == TriBool.TriBool_true; } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1960093479" + garbageValue = "2081555377" ) @Export("clearIsInFriendsChat") void clearIsInFriendsChat() { this.isInFriendsChat = TriBool.TriBool_unknown; } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-90872532" + garbageValue = "-690843287" ) @Export("updateIsInFriendsChat") void updateIsInFriendsChat() { - this.isInFriendsChat = Canvas.friendsChat != null && Canvas.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isInFriendsChat = ReflectionCheck.friendsChat != null && ReflectionCheck.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ap") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2049718150" + garbageValue = "816626450" ) @Export("updateIsInClanChat") void updateIsInClanChat() { for (int var1 = 0; var1 < 4; ++var1) { - if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method803(this.username.getName()) != -1 && var1 != 2) { + if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method808(this.username.getName()) != -1 && var1 != 2) { this.isInClanChat = TriBool.TriBool_true; return; } @@ -479,17 +486,17 @@ void updateIsInClanChat() { @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-973154491" + garbageValue = "-1097598998" ) @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; } - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1722956510" + garbageValue = "-1383064946" ) @Export("isClanMember") boolean isClanMember() { @@ -500,35 +507,53 @@ boolean isClanMember() { return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("ah") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1861536704" + garbageValue = "1884466033" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? Tile.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? class90.getNpcDefinition(this.appearance.npcTransformId).size : 1; } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IILio;I)V", - garbageValue = "-1313304376" + descriptor = "(IILin;I)V", + garbageValue = "-1206182432" ) @Export("move") final void move(int var1, int var2, MoveSpeed var3) { - if (super.sequence != -1 && class135.SequenceDefinition_get(super.sequence).priority == 1) { + if (super.sequence != -1 && EnumComposition.SequenceDefinition_get(super.sequence).priority == 1) { super.sequence = -1; } - this.method526(); + this.method521(); if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { if (var3 == MoveSpeed.RUN) { - World.method405(this, var1, var2, MoveSpeed.RUN); + Player var4 = this; + MoveSpeed var5 = MoveSpeed.RUN; + int var6 = super.pathX[0]; + int var7 = super.pathY[0]; + int var8 = this.transformedSize(); + if (var6 >= var8 && var6 < 104 - var8 && var7 >= var8 && var7 < 104 - var8 && var1 >= var8 && var1 < 104 - var8 && var2 >= var8 && var2 < 104 - var8) { + int var10 = this.transformedSize(); + RouteStrategy var11 = class299.method1619(var1, var2); + CollisionMap var12 = Client.collisionMaps[this.plane]; + int[] var13 = Client.field593; + int[] var14 = Client.field592; + int var9 = class4.method4(var6, var7, var10, var11, var12, true, var13, var14, class218.field1926[0]); + int var15 = var9; + if (var9 >= 1) { + for (int var16 = 0; var16 < var15 - 1; ++var16) { + var4.method497(Client.field593[var16], Client.field592[var16], var5); + } + } + } } - this.method501(var1, var2, var3); + this.method497(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -538,29 +563,29 @@ final void move(int var1, int var2, MoveSpeed var3) { } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "110" + descriptor = "(III)V", + garbageValue = "-1786168705" ) @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.field1018 = 0; - super.field1020 = 0; + super.field1022 = 0; + super.field1021 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); super.x = var3 * 64 + super.pathX[0] * 128; - super.y = super.pathY[0] * 128 + var3 * 64; + super.y = var3 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("au") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IILio;I)V", - garbageValue = "2146337033" + descriptor = "(IILin;I)V", + garbageValue = "112065194" ) - final void method501(int var1, int var2, MoveSpeed var3) { + final void method497(int var1, int var2, MoveSpeed var3) { if (super.pathLength < 9) { ++super.pathLength; } @@ -576,44 +601,60 @@ final void method501(int var1, int var2, MoveSpeed var3) { super.pathTraversed[0] = var3; } - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "381940201" ) @Export("isVisible") final boolean isVisible() { return this.appearance != null; } - @ObfuscatedName("au") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "2090788951" + descriptor = "(ILdh;ZI)I", + garbageValue = "-1849336655" ) - static int method503(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - if (var0 == 1700) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; + static int method499(int var0, Script var1, boolean var2) { + Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + if (var0 == 2800) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = HealthBarDefinition.Widget_unpackTargetMask(NewShit.getWidgetFlags(var3)); return 1; - } else if (var0 == 1701) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else if (var0 != 2801) { + if (var0 == 2802) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } + } else { + int var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.actions[var4]; } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if (var0 == 1702) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; - } else if (var0 == 1707) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method1795() ? 1 : 0; - return 1; - } else if (var0 == 1708) { - return class74.method439(var3); - } else { - return var0 == 1709 ? class133.method728(var3) : 2; } } -} + + @ObfuscatedName("nu") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1159741420" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLAN_JOINCHAT_LEAVECHAT, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/PlayerComposition.java b/osrs/src/main/java/PlayerComposition.java index f7eb4fa36..97d2ca3f5 100644 --- a/osrs/src/main/java/PlayerComposition.java +++ b/osrs/src/main/java/PlayerComposition.java @@ -1,131 +1,136 @@ -import java.util.Arrays; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mb") +import java.util.Arrays; + +@ObfuscatedName("mt") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("aa") + @ObfuscatedName("al") + public static short[] field2904; + @ObfuscatedName("an") + public static short[][] field2905; + @ObfuscatedName("ar") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("PlayerAppearance_cachedModels") public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lqv;" ) - static class424 field2889; - @ObfuscatedName("ao") - static int field2888; - @ObfuscatedName("aw") - int[] field2894; - @ObfuscatedName("ay") + static class423 field2907; + @ObfuscatedName("ah") + static int field2906; + @ObfuscatedName("au") + int[] field2913; + @ObfuscatedName("ae") @Export("equipment") int[] equipment; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("am") - public int field2899; - @ObfuscatedName("as") - public int field2900; - @ObfuscatedName("aj") + @ObfuscatedName("at") + public int field2918; + @ObfuscatedName("ac") + public int field2916; + @ObfuscatedName("ai") @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("hash") long hash; - @ObfuscatedName("az") - long field2897; - @ObfuscatedName("av") + @ObfuscatedName("ap") + long field2914; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "[Lhv;" + descriptor = "[Lho;" ) @Export("customisations") ObjTypeCustomisation[] customisations; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("isFemale") boolean isFemale; static { - equipmentIndices = new int[]{class210.field1838.field1848, class210.field1837.field1848, class210.field1836.field1848, class210.field1833.field1848, class210.field1834.field1848, class210.field1839.field1848, class210.field1835.field1848}; + equipmentIndices = new int[]{class209.field1857.field1871, class209.field1862.field1871, class209.field1858.field1871, class209.field1863.field1871, class209.field1860.field1871, class209.field1861.field1871, class209.field1859.field1871}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); - field2889 = new class424(16, class422.field3754); - field2888 = 0; + field2907 = new class423(16, class421.field3766); + field2906 = 0; } public PlayerComposition() { - this.field2899 = -1; - this.field2900 = 0; + this.field2918 = -1; + this.field2916 = 0; this.isFemale = false; } @ObfuscatedSignature( - descriptor = "(Lmb;)V" + descriptor = "(Lmt;)V" ) PlayerComposition(PlayerComposition var1) { - this.field2899 = -1; - this.field2900 = 0; + this.field2918 = -1; + this.field2916 = 0; this.isFemale = false; int[] var2 = Arrays.copyOf(var1.equipment, var1.equipment.length); - int[] var3 = Arrays.copyOf(var1.field2894, var1.field2894.length); + int[] var3 = Arrays.copyOf(var1.field2913, var1.field2913.length); ObjTypeCustomisation[] var4 = (ObjTypeCustomisation[])(var1.customisations != null ? (ObjTypeCustomisation[])Arrays.copyOf(var1.customisations, var1.customisations.length) : null); int[] var5 = Arrays.copyOf(var1.bodyColors, var1.bodyColors.length); - this.method1679(var3, var2, var4, false, var5, var1.field2900, var1.npcTransformId, var1.field2899); + this.method1717(var3, var2, var4, false, var5, var1.field2916, var1.npcTransformId, var1.field2918); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "([I[I[Lhv;Z[IIIII)V", - garbageValue = "1828739510" + descriptor = "([I[I[Lho;Z[IIIII)V", + garbageValue = "-1866336930" ) - public void method1679(int[] var1, int[] var2, ObjTypeCustomisation[] var3, boolean var4, int[] var5, int var6, int var7, int var8) { + public void method1717(int[] var1, int[] var2, ObjTypeCustomisation[] var3, boolean var4, int[] var5, int var6, int var7, int var8) { this.customisations = var3; this.isFemale = var4; - this.field2899 = var8; - this.method1680(var1, var2, var5, var6, var7); + this.field2918 = var8; + this.method1718(var1, var2, var5, var6, var7); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "([I[I[IIII)V", - garbageValue = "439535909" + garbageValue = "1458257561" ) - public void method1680(int[] var1, int[] var2, int[] var3, int var4, int var5) { + public void method1718(int[] var1, int[] var2, int[] var3, int var4, int var5) { if (var1 == null) { - var1 = this.method1681(var4); + var1 = this.method1720(var4); } if (var2 == null) { - var2 = this.method1681(var4); + var2 = this.method1720(var4); } - this.field2894 = var1; + this.field2913 = var1; this.equipment = var2; this.bodyColors = var3; - this.field2900 = var4; + this.field2916 = var4; this.npcTransformId = var5; this.setHash(); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)[I", - garbageValue = "-1012952291" + descriptor = "(IB)[I", + garbageValue = "67" ) - int[] method1681(int var1) { + int[] method1720(int var1) { int[] var2 = new int[12]; for (int var3 = 0; var3 < 7; ++var3) { for (int var4 = 0; var4 < KitDefinition.KitDefinition_fileCount; ++var4) { - KitDefinition var5 = class132.KitDefinition_get(var4); - if (var5 != null && !var5.nonSelectable && var5.bodypartID == var3 + (var1 == 1 ? 7 : 0)) { + KitDefinition var5 = ClanChannel.KitDefinition_get(var4); + if (var5 != null && !var5.nonSelectable && var3 + (var1 == 1 ? 7 : 0) == var5.bodypartID) { var2[equipmentIndices[var3]] = var4 + 256; break; } @@ -135,10 +140,10 @@ int[] method1681(int var1) { return var2; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "-2138181432" + garbageValue = "-1083968287" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -160,27 +165,27 @@ public void changeAppearance(int var1, boolean var2) { } } - var4 = class132.KitDefinition_get(var3); - } while(var4 == null || var4.nonSelectable || var1 + (this.field2900 == 1 ? 7 : 0) != var4.bodypartID); + var4 = ClanChannel.KitDefinition_get(var3); + } while(var4 == null || var4.nonSelectable || (this.field2916 == 1 ? 7 : 0) + var1 != var4.bodypartID); this.equipment[equipmentIndices[var1]] = var3 + 256; this.setHash(); } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "953473118" + descriptor = "(IZB)V", + garbageValue = "8" ) - public void method1683(int var1, boolean var2) { + public void method1722(int var1, boolean var2) { int var3 = this.bodyColors[var1]; boolean var4; if (!var2) { do { --var3; if (var3 < 0) { - var3 = ClanChannel.field1410[var1].length - 1; + var3 = class140.field1328[var1].length - 1; } if (var1 == 4 && var3 >= 8) { @@ -192,7 +197,7 @@ public void method1683(int var1, boolean var2) { } else { do { ++var3; - if (var3 >= ClanChannel.field1410[var1].length) { + if (var3 >= class140.field1328[var1].length) { var3 = 0; } @@ -208,25 +213,25 @@ public void method1683(int var1, boolean var2) { this.setHash(); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1643075322" + garbageValue = "-782377094" ) - public void method1684(int var1) { - if (this.field2900 != var1) { - this.method1680((int[])null, (int[])null, this.bodyColors, var1, -1); + public void method1723(int var1) { + if (this.field2916 != var1) { + this.method1718((int[])null, (int[])null, this.bodyColors, var1, -1); } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "-1001147090" + descriptor = "(Ltm;I)V", + garbageValue = "-544852329" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.field2900); + var1.writeByte(this.field2916); int var2; for (var2 = 0; var2 < 7; ++var2) { @@ -244,10 +249,10 @@ public void write(Buffer var1) { } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-11" + garbageValue = "12" ) @Export("setHash") void setHash() { @@ -280,24 +285,24 @@ void setHash() { } this.hash <<= 1; - this.hash += (long)this.field2900; + this.hash += (long)this.field2916; this.equipment[5] = var3; this.equipment[9] = var4; - if (0L != var1 && var1 != this.hash || this.isFemale) { + if (var1 != 0L && var1 != this.hash || this.isFemale) { PlayerAppearance_cachedModels.remove(var1); } } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lig;ILig;IB)Ljo;", - garbageValue = "-42" + descriptor = "(Lib;ILib;II)Ljr;", + garbageValue = "-616726225" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return Tile.getNpcDefinition(this.npcTransformId).method966(var1, var2, var3, var4, (NewShit)null); + return class90.getNpcDefinition(this.npcTransformId).method985(var1, var2, var3, var4, (NewShit)null); } else { long var5 = this.hash; int[] var7 = this.equipment; @@ -326,18 +331,18 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 int var11; for (int var10 = 0; var10 < 12; ++var10) { var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !class132.KitDefinition_get(var11 - 256).ready()) { + if (var11 >= 256 && var11 < 512 && !ClanChannel.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !class125.ItemDefinition_get(var11 - 512).method1041(this.field2900)) { + if (var11 >= 512 && !InvDefinition.ItemDefinition_get(var11 - 512).method1061(this.field2916)) { var9 = true; } } if (var9) { - if (-1L != this.field2897) { - var18 = (Model)PlayerAppearance_cachedModels.get(this.field2897); + if (-1L != this.field2914) { + var18 = (Model)PlayerAppearance_cachedModels.get(this.field2914); } if (var18 == null) { @@ -353,15 +358,15 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 for (int var12 = 0; var12 < 12; ++var12) { var13 = var7[var12]; if (var13 >= 256 && var13 < 512) { - ModelData var14 = class132.KitDefinition_get(var13 - 256).getModelData(); + ModelData var14 = ClanChannel.KitDefinition_get(var13 - 256).getModelData(); if (var14 != null) { var19[var11++] = var14; } } if (var13 >= 512) { - ItemComposition var22 = class125.ItemDefinition_get(var13 - 512); - ModelData var15 = var22.method1042(this.field2900); + ItemComposition var22 = InvDefinition.ItemDefinition_get(var13 - 512); + ModelData var15 = var22.method1062(this.field2916); if (var15 != null) { if (this.customisations != null) { ObjTypeCustomisation var16 = this.customisations[var12]; @@ -389,18 +394,18 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 ModelData var20 = new ModelData(var19, var11); for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < ClanChannel.field1410[var13].length) { - var20.recolor(class33.field89[var13], ClanChannel.field1410[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < class140.field1328[var13].length) { + var20.recolor(UrlRequest.field1174[var13], class140.field1328[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < WorldMapSectionType.field2391[var13].length) { - var20.recolor(ViewportMouse.field2226[var13], WorldMapSectionType.field2391[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < field2905[var13].length) { + var20.recolor(field2904[var13], field2905[var13][this.bodyColors[var13]]); } } var18 = var20.toModel(64, 850, -30, -50, -30); PlayerAppearance_cachedModels.put(var18, var5); - this.field2897 = var5; + this.field2914 = var5; } } @@ -419,26 +424,26 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(I)Lie;", - garbageValue = "-734942912" + descriptor = "(I)Lic;", + garbageValue = "-812517450" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { - return Tile.getNpcDefinition(this.npcTransformId).method967((NewShit)null); + return class90.getNpcDefinition(this.npcTransformId).method986((NewShit)null); } else { boolean var1 = false; int var3; for (int var2 = 0; var2 < 12; ++var2) { var3 = this.equipment[var2]; - if (var3 >= 256 && var3 < 512 && !class132.KitDefinition_get(var3 - 256).method947()) { + if (var3 >= 256 && var3 < 512 && !ClanChannel.KitDefinition_get(var3 - 256).method961()) { var1 = true; } - if (var3 >= 512 && !class125.ItemDefinition_get(var3 - 512).method1043(this.field2900)) { + if (var3 >= 512 && !InvDefinition.ItemDefinition_get(var3 - 512).method1063(this.field2916)) { var1 = true; } } @@ -454,14 +459,14 @@ ModelData getModelData() { var5 = this.equipment[var4]; ModelData var6; if (var5 >= 256 && var5 < 512) { - var6 = class132.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + var6 = ClanChannel.KitDefinition_get(var5 - 256).getKitDefinitionModels(); if (var6 != null) { var7[var3++] = var6; } } if (var5 >= 512) { - var6 = class125.ItemDefinition_get(var5 - 512).method1044(this.field2900); + var6 = InvDefinition.ItemDefinition_get(var5 - 512).method1064(this.field2916); if (var6 != null) { var7[var3++] = var6; } @@ -471,12 +476,12 @@ ModelData getModelData() { ModelData var8 = new ModelData(var7, var3); for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < ClanChannel.field1410[var5].length) { - var8.recolor(class33.field89[var5], ClanChannel.field1410[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < class140.field1328[var5].length) { + var8.recolor(UrlRequest.field1174[var5], class140.field1328[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < WorldMapSectionType.field2391[var5].length) { - var8.recolor(ViewportMouse.field2226[var5], WorldMapSectionType.field2391[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < field2905[var5].length) { + var8.recolor(field2904[var5], field2905[var5][this.bodyColors[var5]]); } } @@ -485,10 +490,10 @@ ModelData getModelData() { } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "295497" + descriptor = "(B)I", + garbageValue = "14" ) @Export("getChatHeadId") public int getChatHeadId() { @@ -497,53 +502,108 @@ public int getChatHeadId() { var1 = -65536L | (long)this.npcTransformId; } - Integer var3 = (Integer)field2889.method2146(var1); + Integer var3 = (Integer)field2907.method2180(var1); if (var3 == null) { - var3 = ++field2888 - 1; - field2889.method2147(var1, var3); - field2888 %= 65535; + var3 = ++field2906 - 1; + field2907.method2181(var1, var3); + field2906 %= 65535; } return var3; } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "481625166" + garbageValue = "1158771729" ) - void method1690() { - this.method1680(this.field2894, this.equipment, this.bodyColors, this.field2900, this.npcTransformId); + void method1729() { + this.method1718(this.field2913, this.equipment, this.bodyColors, this.field2916, this.npcTransformId); } - @ObfuscatedName("ax") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-121" + descriptor = "(CLon;B)C", + garbageValue = "1" ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - if (!TileItem.client.method361() && !TileItem.client.method363() && !TileItem.client.method362()) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - class328.method1678(2); - if (var0) { - Login.Login_password = ""; + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { + if (var0 >= 192 && var0 <= 198) { + return 'A'; } - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (class150.clientPreferences.getUsernameToRemember() != null) { - Login.Login_username = class150.clientPreferences.getUsernameToRemember(); - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; - } + if (var0 == 199) { + return 'C'; } - class395.method2020(); + if (var0 >= 200 && var0 <= 203) { + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { + return 'U'; + } + + if (var0 == 221) { + return 'Y'; + } + + if (var0 == 223) { + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { + return 'a'; + } + + if (var0 == 231) { + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { + return 'u'; + } + + if (var0 == 253 || var0 == 255) { + return 'y'; + } + } + + if (var0 == 338) { + return 'O'; + } else if (var0 == 339) { + return 'o'; } else { - class328.method1678(10); + return var0 == 376 ? 'Y' : var0; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PlayerType.java b/osrs/src/main/java/PlayerType.java index 4b62b211a..68c13d2d3 100644 --- a/osrs/src/main/java/PlayerType.java +++ b/osrs/src/main/java/PlayerType.java @@ -3,111 +3,111 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nw") +@ObfuscatedName("nn") @Implements("PlayerType") -public enum PlayerType implements class372 { - @ObfuscatedName("aw") +public enum PlayerType implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) - field3474(6, 22, false, false, true), - @ObfuscatedName("az") + field3500(6, 22, false, false, true), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) - field3488(7, 41, false, false, true), - @ObfuscatedName("av") + field3495(7, 41, false, false, true), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) field3484(8, 42, false, false, true), - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) - field3478(9, 43, false, false, true), - @ObfuscatedName("aq") + field3489(9, 43, false, false, true), + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) - field3479(10, 44, false, false, true), - @ObfuscatedName("at") + field3487(10, 44, false, false, true), + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) - field3482(11, 45, false, false, true), - @ObfuscatedName("ah") + field3496(11, 45, false, false, true), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) - field3475(12, 46, false, false, true), - @ObfuscatedName("ax") + field3492(12, 46, false, false, true), + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) - field3486(13, 47, false, false, true), - @ObfuscatedName("aa") + field3493(13, 47, false, false, true), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) - field3472(14, 48, false, false, true), - @ObfuscatedName("au") + field3497(14, 48, false, false, true), + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) - field3483(15, 49, false, false, true), - @ObfuscatedName("ae") + field3485(15, 49, false, false, true), + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnn;" ) - field3473(16, 52, false, false, true); + field3490(16, 52, false, false, true); - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("id") final int id; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("modIcon") public final int modIcon; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("isUser") public final boolean isUser; @@ -118,13 +118,51 @@ public enum PlayerType implements class372 { this.isUser = var7; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } -} + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "414749289" + ) + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field3738) { + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field3741) { + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; + } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field3740) { + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; + } else if (var0.length == 30000 && ByteArrayPool.field3743 < ByteArrayPool.field3744) { + ByteArrayPool.field3734[++ByteArrayPool.field3743 - 1] = var0; + } else { + if (class410.ByteArrayPool_arrays != null) { + for (int var1 = 0; var1 < class416.ByteArrayPool_alternativeSizes.length; ++var1) { + if (var0.length == class416.ByteArrayPool_alternativeSizes[var1] && StructComposition.ByteArrayPool_altSizeArrayCounts[var1] < class410.ByteArrayPool_arrays[var1].length) { + class410.ByteArrayPool_arrays[var1][StructComposition.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; + return; + } + } + } + + } + } + + @ObfuscatedName("nq") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-72" + ) + static final int method1883() { + float var0 = 200.0F * ((float)class449.clientPreferences.getBrightness() - 0.5F); + return 100 - Math.round(var0); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Players.java b/osrs/src/main/java/Players.java index 00170ed82..a371055f0 100644 --- a/osrs/src/main/java/Players.java +++ b/osrs/src/main/java/Players.java @@ -3,56 +3,65 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("ee") @Implements("Players") public class Players { - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("activityFlags") static byte[] activityFlags; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "[Lio;" + descriptor = "[Lin;" ) @Export("playerMovementSpeeds") static MoveSpeed[] playerMovementSpeeds; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Lty;" + descriptor = "[Ltm;" ) @Export("cachedAppearanceBuffer") static Buffer[] cachedAppearanceBuffer; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("Players_count") static int Players_count; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lty;" + descriptor = "Ltm;" ) - static Buffer field1111; + static Buffer field1121; + @ObfuscatedName("sg") + @ObfuscatedSignature( + descriptor = "Lfi;" + ) + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + @ObfuscatedName("uq") + @Export("cameraMoveToX") + static int cameraMoveToX; static { activityFlags = new byte[2048]; @@ -67,15 +76,39 @@ public class Players { Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1111 = new Buffer(new byte[5000]); + field1121 = new Buffer(new byte[5000]); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(II)Lhc;", + garbageValue = "-1692851000" + ) + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); + var1 = new StructComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + StructComposition.StructDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("aw") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1685678133" + descriptor = "(I)V", + garbageValue = "-831991142" ) - public static boolean method622(int var0) { - return var0 == WorldMapDecorationType.field3117.id; + public static final void method619() { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/PrivateChatMode.java b/osrs/src/main/java/PrivateChatMode.java index 33535523e..ede5ce3eb 100644 --- a/osrs/src/main/java/PrivateChatMode.java +++ b/osrs/src/main/java/PrivateChatMode.java @@ -3,35 +3,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ut") +@ObfuscatedName("ub") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lut;" + descriptor = "Lub;" ) - static final PrivateChatMode field4229; - @ObfuscatedName("ay") + static final PrivateChatMode field4273; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lut;" + descriptor = "Lub;" ) - public static final PrivateChatMode field4227; - @ObfuscatedName("ar") + public static final PrivateChatMode field4271; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lut;" + descriptor = "Lub;" ) - static final PrivateChatMode field4228; - @ObfuscatedName("am") + static final PrivateChatMode field4272; + @ObfuscatedName("at") @Export("id") public final int id; static { - field4229 = new PrivateChatMode(0); - field4227 = new PrivateChatMode(1); - field4228 = new PrivateChatMode(2); + field4273 = new PrivateChatMode(0); + field4271 = new PrivateChatMode(1); + field4272 = new PrivateChatMode(2); } PrivateChatMode(int var1) { this.id = var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Projectile.java b/osrs/src/main/java/Projectile.java index 4738536c8..5e3cf9b54 100644 --- a/osrs/src/main/java/Projectile.java +++ b/osrs/src/main/java/Projectile.java @@ -3,85 +3,89 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cv") +@ObfuscatedName("ck") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("id") int id; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("plane") int plane; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("sourceX") int sourceX; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("sourceY") int sourceY; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("sourceZ") int sourceZ; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("endHeight") int endHeight; - @ObfuscatedName("ag") + @ObfuscatedName("az") + int field805; + @ObfuscatedName("ap") + int field799; + @ObfuscatedName("aa") + int field789; + @ObfuscatedName("af") @Export("cycleStart") int cycleStart; - @ObfuscatedName("az") + @ObfuscatedName("ad") @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("av") + @ObfuscatedName("aq") @Export("slope") int slope; - @ObfuscatedName("ap") + @ObfuscatedName("al") @Export("startHeight") int startHeight; - @ObfuscatedName("aq") + @ObfuscatedName("an") + int field797; + @ObfuscatedName("ar") @Export("targetIndex") int targetIndex; - @ObfuscatedName("at") + @ObfuscatedName("ab") @Export("isMoving") boolean isMoving; - @ObfuscatedName("ah") + @ObfuscatedName("ag") @Export("x") double x; - @ObfuscatedName("ax") + @ObfuscatedName("am") @Export("y") double y; - @ObfuscatedName("aa") + @ObfuscatedName("ax") @Export("z") double z; - @ObfuscatedName("au") - @Export("speedX") - double speedX; - @ObfuscatedName("ae") - @Export("speedY") + @ObfuscatedName("ah") double speedY; - @ObfuscatedName("ab") - @Export("speed") + @ObfuscatedName("as") + double speedX; + @ObfuscatedName("ay") double speed; - @ObfuscatedName("ad") + @ObfuscatedName("aj") @Export("speedZ") double speedZ; - @ObfuscatedName("ao") - @Export("accelerationZ") - double accelerationZ; - @ObfuscatedName("ac") + @ObfuscatedName("av") + double field785; + @ObfuscatedName("aw") @Export("yaw") int yaw; @ObfuscatedName("ak") @Export("pitch") int pitch; - @ObfuscatedName("an") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lib;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("af") + @ObfuscatedName("bj") @Export("frame") int frame; - @ObfuscatedName("ai") + @ObfuscatedName("bk") @Export("frameCycle") int frameCycle; @@ -101,51 +105,59 @@ public final class Projectile extends Renderable { this.targetIndex = var10; this.endHeight = var11; this.isMoving = false; - int var12 = NPCComposition.SpotAnimationDefinition_get(this.id).sequence; + int var12 = StructComposition.SpotAnimationDefinition_get(this.id).sequence; if (var12 != -1) { - this.sequenceDefinition = class135.SequenceDefinition_get(var12); + this.sequenceDefinition = EnumComposition.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; } } - @ObfuscatedName("aw") + Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + this(var1, var2, var3, var4, var5, var6, var7, var8, var9, var11, var12); + this.field797 = var10; + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "1" + descriptor = "(IIIII)V", + garbageValue = "-912424366" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { + this.field805 = var1; + this.field799 = var2; + this.field789 = var3; double var5; if (!this.isMoving) { - var5 = (double)(var1 - this.sourceX); - double var7 = (double)(var2 - this.sourceY); - double var9 = Math.sqrt(var7 * var7 + var5 * var5); + var5 = (double)(this.field805 - this.sourceX); + double var7 = (double)(this.field799 - this.sourceY); + double var9 = Math.sqrt(var5 * var5 + var7 * var7); this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; - this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; + this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; this.z = (double)this.sourceZ; } var5 = (double)(this.cycleEnd + 1 - var4); - this.speedX = ((double)var1 - this.x) / var5; - this.speedY = ((double)var2 - this.y) / var5; - this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); + this.speedY = ((double)this.field805 - this.x) / var5; + this.speedX = ((double)this.field799 - this.y) / var5; + this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); if (!this.isMoving) { - this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); + this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); } - this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); + this.field785 = ((double)this.field789 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Ljo;", - garbageValue = "-983173466" + descriptor = "(I)Ljr;", + garbageValue = "798227647" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = NPCComposition.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = StructComposition.SpotAnimationDefinition_get(this.id); Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; @@ -155,19 +167,19 @@ protected final Model getModel() { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1587354661" + descriptor = "(IB)V", + garbageValue = "30" ) @Export("advance") final void advance(int var1) { this.isMoving = true; - this.x += this.speedX * (double)var1; - this.y += this.speedY * (double)var1; - this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + (double)var1 * this.speedZ; - this.speedZ += this.accelerationZ * (double)var1; - this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; + this.x += this.speedY * (double)var1; + this.y += (double)var1 * this.speedX; + this.z += 0.5D * this.field785 * (double)var1 * (double)var1 + (double)var1 * this.speedZ; + this.speedZ += this.field785 * (double)var1; + this.yaw = (int)(Math.atan2(this.speedY, this.speedX) * 325.949D) + 1024 & 2047; this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; if (this.sequenceDefinition != null) { if (!this.sequenceDefinition.isCachedModelIdSet()) { @@ -191,7 +203,7 @@ final void advance(int var1) { } } else { this.frame += var1; - int var2 = this.sequenceDefinition.method1067(); + int var2 = this.sequenceDefinition.method1085(); if (this.frame >= var2) { this.frame = var2 - this.sequenceDefinition.frameCount; } @@ -199,4 +211,13 @@ final void advance(int var1) { } } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "992783271" + ) + public static int method430(int var0) { + return class303.field2755[var0]; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/RasterProvider.java b/osrs/src/main/java/RasterProvider.java index c0008b5db..ad92b3815 100644 --- a/osrs/src/main/java/RasterProvider.java +++ b/osrs/src/main/java/RasterProvider.java @@ -1,26 +1,20 @@ -import java.awt.Component; -import java.awt.Graphics; -import java.awt.Image; -import java.awt.Point; -import java.awt.Shape; -import java.awt.image.BufferedImage; -import java.awt.image.DataBufferInt; -import java.awt.image.DirectColorModel; -import java.awt.image.Raster; -import java.awt.image.WritableRaster; -import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +import java.awt.*; +import java.awt.image.*; +import java.util.Hashtable; + +@ObfuscatedName("by") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("component") Component component; - @ObfuscatedName("ay") + @ObfuscatedName("ae") + @Export("image") Image image; RasterProvider(int var1, int var2, Component var3, boolean var4) { @@ -28,7 +22,7 @@ public final class RasterProvider extends AbstractRasterProvider { super.height = var2; super.pixels = new int[var2 * var1 + 1]; if (var4) { - super.field4179 = new float[var2 * var1 + 1]; + super.field4225 = new float[var2 * var1 + 1]; } DataBufferInt var5 = new DataBufferInt(super.pixels, super.pixels.length); @@ -39,40 +33,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1695632451" + descriptor = "(Ljava/awt/Component;S)V", + garbageValue = "10944" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2103103659" + descriptor = "(IIB)V", + garbageValue = "-46" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-93" + descriptor = "(IIIII)V", + garbageValue = "1065945289" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIB)V", - garbageValue = "-48" + descriptor = "(Ljava/awt/Graphics;III)V", + garbageValue = "-1661158948" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -84,10 +78,10 @@ final void drawFull0(Graphics var1, int var2, int var3) { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "-1274592617" + garbageValue = "1529858789" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { @@ -101,4 +95,4 @@ final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Rasterizer2D.java b/osrs/src/main/java/Rasterizer2D.java index 92c5254e2..bde97209a 100644 --- a/osrs/src/main/java/Rasterizer2D.java +++ b/osrs/src/main/java/Rasterizer2D.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("us") +@ObfuscatedName("ut") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("bd") - public static float[] field4171; - @ObfuscatedName("bn") + @ObfuscatedName("bh") + public static float[] field4217; + @ObfuscatedName("bk") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -40,16 +40,16 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } - @ObfuscatedName("ed") - protected static void method2601(int[] var0, int var1, int var2, float[] var3) { + @ObfuscatedName("em") + protected static void method2620(int[] var0, int var1, int var2, float[] var3) { Rasterizer2D_pixels = var0; Rasterizer2D_width = var1; Rasterizer2D_height = var2; - field4171 = var3; + field4217 = var3; Rasterizer2D_setClip(0, 0, var1, var2); } - @ObfuscatedName("ea") + @ObfuscatedName("ef") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; @@ -58,7 +58,7 @@ public static void Rasterizer2D_resetClip() { Rasterizer2D_yClipEnd = Rasterizer2D_height; } - @ObfuscatedName("ex") + @ObfuscatedName("ek") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { @@ -83,7 +83,7 @@ public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) Rasterizer2D_yClipEnd = var3; } - @ObfuscatedName("ef") + @ObfuscatedName("ec") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { @@ -104,7 +104,7 @@ public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var } - @ObfuscatedName("ev") + @ObfuscatedName("eu") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; @@ -113,7 +113,7 @@ public static void Rasterizer2D_getClipArray(int[] var0) { var0[3] = Rasterizer2D_yClipEnd; } - @ObfuscatedName("ez") + @ObfuscatedName("eg") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; @@ -122,7 +122,7 @@ public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_yClipEnd = var0[3]; } - @ObfuscatedName("ek") + @ObfuscatedName("ft") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; @@ -141,10 +141,10 @@ public static void Rasterizer2D_clear() { for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { } - method2624(); + method2643(); } - @ObfuscatedName("eu") + @ObfuscatedName("fs") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { @@ -239,7 +239,7 @@ static void drawCircle(int var0, int var1, int var2, int var3) { } } - @ObfuscatedName("ep") + @ObfuscatedName("fl") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { @@ -352,7 +352,7 @@ public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, in } } - @ObfuscatedName("fm") + @ObfuscatedName("fe") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { @@ -390,7 +390,7 @@ public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, } - @ObfuscatedName("fa") + @ObfuscatedName("fd") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { @@ -424,7 +424,7 @@ public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int } - @ObfuscatedName("fg") + @ObfuscatedName("fj") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { @@ -468,7 +468,7 @@ public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int va } } - @ObfuscatedName("fq") + @ObfuscatedName("fv") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var2 > 0 && var3 > 0) { @@ -526,7 +526,7 @@ public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, i } } - @ObfuscatedName("fw") + @ObfuscatedName("fb") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" @@ -607,7 +607,7 @@ public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, } } - @ObfuscatedName("fp") + @ObfuscatedName("fr") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); @@ -616,7 +616,7 @@ public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); } - @ObfuscatedName("fz") + @ObfuscatedName("fq") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); @@ -628,7 +628,7 @@ public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, } - @ObfuscatedName("fj") + @ObfuscatedName("fp") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { if (var0 < Rasterizer2D_xClipStart) { @@ -649,7 +649,7 @@ public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, } } - @ObfuscatedName("fb") + @ObfuscatedName("fg") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -679,7 +679,7 @@ static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, i } } - @ObfuscatedName("fl") + @ObfuscatedName("fo") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { if (var1 < Rasterizer2D_yClipStart) { @@ -700,7 +700,7 @@ public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, i } } - @ObfuscatedName("fd") + @ObfuscatedName("fz") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -731,7 +731,7 @@ static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int } } - @ObfuscatedName("fh") + @ObfuscatedName("fu") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; @@ -813,7 +813,7 @@ public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, } } - @ObfuscatedName("fc") + @ObfuscatedName("fn") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { @@ -821,7 +821,7 @@ static void Rasterizer2D_setPixel(int var0, int var1, int var2) { } } - @ObfuscatedName("fu") + @ObfuscatedName("fx") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; @@ -838,28 +838,28 @@ public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2 } - @ObfuscatedName("fv") - public static void method2624() { - if (field4171 != null) { + @ObfuscatedName("ff") + public static void method2643() { + if (field4217 != null) { int var0; int var1; int var2; if (Rasterizer2D_xClipStart == 0 && Rasterizer2D_xClipEnd == Rasterizer2D_width && Rasterizer2D_yClipStart == 0 && Rasterizer2D_yClipEnd == Rasterizer2D_height) { - var0 = field4171.length; + var0 = field4217.length; var1 = var0 - (var0 & 7); - for (var2 = 0; var2 < var1; field4171[var2++] = 0.0F) { - field4171[var2++] = 0.0F; - field4171[var2++] = 0.0F; - field4171[var2++] = 0.0F; - field4171[var2++] = 0.0F; - field4171[var2++] = 0.0F; - field4171[var2++] = 0.0F; - field4171[var2++] = 0.0F; + for (var2 = 0; var2 < var1; field4217[var2++] = 0.0F) { + field4217[var2++] = 0.0F; + field4217[var2++] = 0.0F; + field4217[var2++] = 0.0F; + field4217[var2++] = 0.0F; + field4217[var2++] = 0.0F; + field4217[var2++] = 0.0F; + field4217[var2++] = 0.0F; } while (var2 < var0) { - field4171[var2++] = 0.0F; + field4217[var2++] = 0.0F; } } else { var0 = Rasterizer2D_xClipEnd - Rasterizer2D_xClipStart; @@ -877,21 +877,21 @@ public static void method2624() { do { ++var0; - field4171[var0] = 0.0F; + field4217[var0] = 0.0F; ++var0; - field4171[var0] = 0.0F; + field4217[var0] = 0.0F; ++var0; - field4171[var0] = 0.0F; + field4217[var0] = 0.0F; ++var0; - field4171[var0] = 0.0F; + field4217[var0] = 0.0F; ++var0; - field4171[var0] = 0.0F; + field4217[var0] = 0.0F; ++var0; - field4171[var0] = 0.0F; + field4217[var0] = 0.0F; ++var0; - field4171[var0] = 0.0F; + field4217[var0] = 0.0F; ++var0; - field4171[var0] = 0.0F; + field4217[var0] = 0.0F; --var6; } while(var6 > 0); } @@ -901,7 +901,7 @@ public static void method2624() { do { ++var0; - field4171[var0] = 0.0F; + field4217[var0] = 0.0F; --var6; } while(var6 > 0); } @@ -913,18 +913,23 @@ public static void method2624() { } } - @ObfuscatedName("fr") - public static void method2625() { - if (field4171 != null) { - int var0 = field4171.length; + @ObfuscatedName("fc") + public static void method2644() { + if (field4217 != null) { + int var0 = field4217.length; for (int var1 = 0; var1 < var0; ++var1) { - if (var1 % Rasterizer2D_width < Rasterizer2D_width / 2 && field4171[var1] > 0.0F) { - int var2 = (int)(255.0F * ClientPreferences.method546(field4171[var1])); - Rasterizer2D_pixels[var1] = var2 << 16 | var2 << 8 | var2; + if (var1 % Rasterizer2D_width < Rasterizer2D_width / 2 && field4217[var1] > 0.0F) { + float var3 = field4217[var1]; + float var4 = 75.0F; + float var5 = 10000.0F; + float var6 = 750000.0F / (10000.0F - 9925.0F * var3); + float var2 = (var6 - 75.0F) / 9925.0F; + int var7 = (int)(255.0F * var2); + Rasterizer2D_pixels[var1] = var7 << 16 | var7 << 8 | var7; } } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Rasterizer3D.java b/osrs/src/main/java/Rasterizer3D.java index 885991ea8..9febe31bf 100644 --- a/osrs/src/main/java/Rasterizer3D.java +++ b/osrs/src/main/java/Rasterizer3D.java @@ -3,57 +3,58 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("ix") @Implements("Rasterizer3D") public class Rasterizer3D { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("ay") - static int[] field2015; - @ObfuscatedName("ar") - static int[] field2014; - @ObfuscatedName("am") + @ObfuscatedName("ae") + static int[] field2036; + @ObfuscatedName("ao") + static int[] field2037; + @ObfuscatedName("at") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljl;" ) + @Export("clips") public static Clips clips; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lid;" ) - static class229 field2013; - @ObfuscatedName("az") + static class228 field2035; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lid;" ) - static final class229 field2017; - @ObfuscatedName("av") + static final class228 field2039; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lid;" ) - static final class229 field2016; + static final class228 field2038; static { Rasterizer3D_colorPalette = new int[65536]; - field2015 = new int[512]; - field2014 = new int[2048]; + field2036 = new int[512]; + field2037 = new int[2048]; Rasterizer3D_sine = new int[2048]; Rasterizer3D_cosine = new int[2048]; int var0; for (var0 = 1; var0 < 512; ++var0) { - field2015[var0] = 32768 / var0; + field2036[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { - field2014[var0] = 65536 / var0; + field2037[var0] = 65536 / var0; } for (var0 = 0; var0 < 2048; ++var0) { @@ -62,35 +63,35 @@ public class Rasterizer3D { } clips = new Clips(); - field2017 = new class244(clips); - field2016 = new class246(clips); - field2013 = field2017; + field2039 = new class243(clips); + field2038 = new class245(clips); + field2035 = field2039; } - @ObfuscatedName("aw") - public static void method1162(boolean var0) { - if (var0 && Rasterizer2D.field4171 != null) { - field2013 = field2016; + @ObfuscatedName("au") + public static void method1185(boolean var0) { + if (var0 && Rasterizer2D.field4217 != null) { + field2035 = field2038; } else { - field2013 = field2017; + field2035 = field2039; } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljy;)V" + descriptor = "(Ljs;)V" ) - public static void method1163(TextureLoader var0) { + public static void method1186(TextureLoader var0) { clips.Rasterizer3D_textureLoader = var0; } - @ObfuscatedName("ar") - public static void method1164(double var0) { + @ObfuscatedName("ao") + public static void method1187(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("Rasterizer3D_buildPalette") static void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; @@ -169,7 +170,7 @@ static void Rasterizer3D_buildPalette(double var0, int var2, int var3) { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; @@ -184,123 +185,128 @@ static int Rasterizer3D_brighten(int var0, double var1) { return var11 + (var10 << 8) + (var9 << 16); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") + @Export("getClipMidX") static int getClipMidX() { - return clips.field2246; + return clips.field2272; } - @ObfuscatedName("ag") + @ObfuscatedName("az") + @Export("getClipMidY") static int getClipMidY() { - return clips.field2250; + return clips.field2274; } - @ObfuscatedName("az") - static int method1169() { + @ObfuscatedName("ap") + static int method1192() { return clips.clipNegativeMidX; } - @ObfuscatedName("av") + @ObfuscatedName("aa") + @Export("getClipMidX2") static int getClipMidX2() { - return clips.field2243; + return clips.field2273; } - @ObfuscatedName("ap") + @ObfuscatedName("af") + @Export("getClipMidY2") static int getClipMidY2() { - return clips.field2247; + return clips.field2271; } - @ObfuscatedName("aq") - static int method1172() { + @ObfuscatedName("ad") + static int method1195() { return clips.clipNegativeMidY; } - @ObfuscatedName("at") + @ObfuscatedName("aq") + @Export("get3dZoom") public static int get3dZoom() { - return clips.field2253; + return clips.field2280; } - @ObfuscatedName("ah") - static int method1174() { - return clips.field2242; + @ObfuscatedName("al") + static int method1197() { + return clips.field2276; } - @ObfuscatedName("ax") - public static void method1175(int[] var0, int var1, int var2, float[] var3) { - if (var3 == null && field2013 == field2016) { - field2013 = field2017; + @ObfuscatedName("an") + public static void method1198(int[] var0, int var1, int var2, float[] var3) { + if (var3 == null && field2035 == field2038) { + field2035 = field2039; } - field2013.method1196(var0, var1, var2, var3); + field2035.method1220(var0, var1, var2, var3); } - @ObfuscatedName("aa") - public static void method1176() { - method1177(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); + @ObfuscatedName("ar") + public static void method1199() { + method1200(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } - @ObfuscatedName("au") - static void method1177(int var0, int var1, int var2, int var3) { - clips.field2242 = var2 - var0; - clips.field2249 = var3 - var1; - method1178(); - if (clips.Rasterizer3D_rowOffsets.length < clips.field2249) { - clips.Rasterizer3D_rowOffsets = new int[UrlRequest.method657(clips.field2249)]; + @ObfuscatedName("ab") + static void method1200(int var0, int var1, int var2, int var3) { + clips.field2276 = var2 - var0; + clips.field2269 = var3 - var1; + method1201(); + if (clips.Rasterizer3D_rowOffsets.length < clips.field2269) { + clips.Rasterizer3D_rowOffsets = new int[WorldMapIcon_1.method1401(clips.field2269)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; - for (int var5 = 0; var5 < clips.field2249; ++var5) { + for (int var5 = 0; var5 < clips.field2269; ++var5) { clips.Rasterizer3D_rowOffsets[var5] = var4; var4 += Rasterizer2D.Rasterizer2D_width; } } - @ObfuscatedName("ae") - public static void method1178() { - clips.method1333(); + @ObfuscatedName("ag") + public static void method1201() { + clips.method1361(); } - @ObfuscatedName("ab") - public static void method1179(int var0, int var1) { + @ObfuscatedName("am") + public static void method1202(int var0, int var1) { int var2 = clips.Rasterizer3D_rowOffsets[0]; int var3 = var2 / Rasterizer2D.Rasterizer2D_width; int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; - clips.method1334(var0, var4, var1, var3); + clips.method1362(var0, var4, var1, var3); } - @ObfuscatedName("ad") - public static void method1180(int var0, int var1, int var2) { - clips.method1335(var0, var1, var2); + @ObfuscatedName("ax") + public static void method1203(int var0, int var1, int var2) { + clips.method1363(var0, var1, var2); } - @ObfuscatedName("ao") - static void method1181(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11) { - field2013.vmethod1374(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11); + @ObfuscatedName("ah") + static void method1204(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11) { + field2035.vmethod1374(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11); } - @ObfuscatedName("ac") - public static void method1182(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9) { - field2013.vmethod1366(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9); + @ObfuscatedName("as") + public static void method1205(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9) { + field2035.vmethod1366(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9); } - @ObfuscatedName("ak") - static void method1183(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { - field2013.vmethod1378(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); + @ObfuscatedName("ay") + static void method1206(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { + field2035.vmethod1378(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); } - @ObfuscatedName("an") - static void method1184(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { - field2013.vmethod1362(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); + @ObfuscatedName("aj") + static void method1207(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { + field2035.vmethod1362(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); } - @ObfuscatedName("af") - static void method1185(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, byte var12, byte var13, byte var14, byte var15) { - field2013.method1199(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15); + @ObfuscatedName("av") + static void method1208(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, byte var12, byte var13, byte var14, byte var15) { + field2035.method1223(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15); } - @ObfuscatedName("ai") - static void method1186(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, byte var10, byte var11, byte var12, byte var13) { - field2013.method1200(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); + @ObfuscatedName("aw") + static void method1209(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, byte var10, byte var11, byte var12, byte var13) { + field2035.method1224(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/RawPcmStream.java b/osrs/src/main/java/RawPcmStream.java index e2628a9d3..0095ecb4b 100644 --- a/osrs/src/main/java/RawPcmStream.java +++ b/osrs/src/main/java/RawPcmStream.java @@ -3,108 +3,108 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bt") +@ObfuscatedName("bn") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("aw") - int field242; - @ObfuscatedName("ay") - int field244; - @ObfuscatedName("ar") - int field238; - @ObfuscatedName("am") - int field236; - @ObfuscatedName("as") - int field239; - @ObfuscatedName("aj") + @ObfuscatedName("au") + int field245; + @ObfuscatedName("ae") int field235; - @ObfuscatedName("ag") - int field233; + @ObfuscatedName("ao") + int field240; + @ObfuscatedName("at") + int field244; + @ObfuscatedName("ac") + int field234; + @ObfuscatedName("ai") + int field237; @ObfuscatedName("az") + int field246; + @ObfuscatedName("ap") @Export("numLoops") int numLoops; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("start") int start; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("end") int end; + @ObfuscatedName("ad") + boolean field232; @ObfuscatedName("aq") - boolean field231; - @ObfuscatedName("at") - int field240; - @ObfuscatedName("ah") - int field234; - @ObfuscatedName("ax") + int field242; + @ObfuscatedName("al") + int field238; + @ObfuscatedName("an") + int field239; + @ObfuscatedName("ar") int field243; - @ObfuscatedName("aa") - int field232; @ObfuscatedSignature( - descriptor = "(Lbi;III)V" + descriptor = "(Lbu;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field231 = var1.field168; - this.field244 = var2; - this.field238 = var3; - this.field236 = var4; - this.field242 = 0; - this.method241(); + this.field232 = var1.field167; + this.field235 = var2; + this.field240 = var3; + this.field244 = var4; + this.field245 = 0; + this.method236(); } @ObfuscatedSignature( - descriptor = "(Lbi;II)V" + descriptor = "(Lbu;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field231 = var1.field168; - this.field244 = var2; - this.field238 = var3; - this.field236 = 8192; - this.field242 = 0; - this.method241(); + this.field232 = var1.field167; + this.field235 = var2; + this.field240 = var3; + this.field244 = 8192; + this.field245 = 0; + this.method236(); } - @ObfuscatedName("as") - void method241() { - this.field239 = this.field238; - this.field235 = method236(this.field238, this.field236); - this.field233 = method237(this.field238, this.field236); + @ObfuscatedName("ac") + void method236() { + this.field234 = this.field240; + this.field237 = method231(this.field240, this.field244); + this.field246 = method232(this.field240, this.field244); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "()Lby;" + descriptor = "()Lbw;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "()Lby;" + descriptor = "()Lbw;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("vmethod5648") protected int vmethod5648() { - return this.field238 == 0 && this.field240 == 0 ? 0 : 1; + return this.field240 == 0 && this.field242 == 0 ? 0 : 1; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field238 == 0 && this.field240 == 0) { + if (this.field240 == 0 && this.field242 == 0) { this.skip(var3); } else { RawSound var4 = (RawSound)super.sound; @@ -118,163 +118,163 @@ public synchronized void fill(int[] var1, int var2, int var3) { int var9 = var2; var3 += var2; - if (this.field242 < 0) { - if (this.field244 <= 0) { - this.method250(); + if (this.field245 < 0) { + if (this.field235 <= 0) { + this.method245(); this.remove(); return; } - this.field242 = 0; + this.field245 = 0; } - if (this.field242 >= var7) { - if (this.field244 >= 0) { - this.method250(); + if (this.field245 >= var7) { + if (this.field235 >= 0) { + this.method245(); this.remove(); return; } - this.field242 = var7 - 1; + this.field245 = var7 - 1; } if (this.numLoops < 0) { - if (this.field231) { - if (this.field244 < 0) { - var9 = this.method264(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field242 >= var5) { + if (this.field232) { + if (this.field235 < 0) { + var9 = this.method259(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field245 >= var5) { return; } - this.field242 = var5 + var5 - 1 - this.field242; - this.field244 = -this.field244; + this.field245 = var5 + var5 - 1 - this.field245; + this.field235 = -this.field235; } while (true) { - var9 = this.method263(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field242 < var6) { + var9 = this.method258(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field245 < var6) { return; } - this.field242 = var6 + var6 - 1 - this.field242; - this.field244 = -this.field244; - var9 = this.method264(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field242 >= var5) { + this.field245 = var6 + var6 - 1 - this.field245; + this.field235 = -this.field235; + var9 = this.method259(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field245 >= var5) { return; } - this.field242 = var5 + var5 - 1 - this.field242; - this.field244 = -this.field244; + this.field245 = var5 + var5 - 1 - this.field245; + this.field235 = -this.field235; } - } else if (this.field244 < 0) { + } else if (this.field235 < 0) { while (true) { - var9 = this.method264(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field242 >= var5) { + var9 = this.method259(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field245 >= var5) { return; } - this.field242 = var6 - 1 - (var6 - 1 - this.field242) % var8; + this.field245 = var6 - 1 - (var6 - 1 - this.field245) % var8; } } else { while (true) { - var9 = this.method263(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field242 < var6) { + var9 = this.method258(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field245 < var6) { return; } - this.field242 = var5 + (this.field242 - var5) % var8; + this.field245 = var5 + (this.field245 - var5) % var8; } } } else { if (this.numLoops > 0) { - if (this.field231) { + if (this.field232) { label133: { - if (this.field244 < 0) { - var9 = this.method264(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field242 >= var5) { + if (this.field235 < 0) { + var9 = this.method259(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field245 >= var5) { return; } - this.field242 = var5 + var5 - 1 - this.field242; - this.field244 = -this.field244; + this.field245 = var5 + var5 - 1 - this.field245; + this.field235 = -this.field235; if (--this.numLoops == 0) { break label133; } } do { - var9 = this.method263(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field242 < var6) { + var9 = this.method258(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field245 < var6) { return; } - this.field242 = var6 + var6 - 1 - this.field242; - this.field244 = -this.field244; + this.field245 = var6 + var6 - 1 - this.field245; + this.field235 = -this.field235; if (--this.numLoops == 0) { break; } - var9 = this.method264(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field242 >= var5) { + var9 = this.method259(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field245 >= var5) { return; } - this.field242 = var5 + var5 - 1 - this.field242; - this.field244 = -this.field244; + this.field245 = var5 + var5 - 1 - this.field245; + this.field235 = -this.field235; } while(--this.numLoops != 0); } } else { int var10; - if (this.field244 < 0) { + if (this.field235 < 0) { while (true) { - var9 = this.method264(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field242 >= var5) { + var9 = this.method259(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field245 >= var5) { return; } - var10 = (var6 - 1 - this.field242) / var8; + var10 = (var6 - 1 - this.field245) / var8; if (var10 >= this.numLoops) { - this.field242 += var8 * this.numLoops; + this.field245 += var8 * this.numLoops; this.numLoops = 0; break; } - this.field242 += var8 * var10; + this.field245 += var8 * var10; this.numLoops -= var10; } } else { while (true) { - var9 = this.method263(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field242 < var6) { + var9 = this.method258(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field245 < var6) { return; } - var10 = (this.field242 - var5) / var8; + var10 = (this.field245 - var5) / var8; if (var10 >= this.numLoops) { - this.field242 -= var8 * this.numLoops; + this.field245 -= var8 * this.numLoops; this.numLoops = 0; break; } - this.field242 -= var8 * var10; + this.field245 -= var8 * var10; this.numLoops -= var10; } } } } - if (this.field244 < 0) { - this.method264(var1, var9, 0, var3, 0); - if (this.field242 < 0) { - this.field242 = -1; - this.method250(); + if (this.field235 < 0) { + this.method259(var1, var9, 0, var3, 0); + if (this.field245 < 0) { + this.field245 = -1; + this.method245(); this.remove(); } } else { - this.method263(var1, var9, var7, var3, 0); - if (this.field242 >= var7) { - this.field242 = var7; - this.method250(); + this.method258(var1, var9, var7, var3, 0); + if (this.field245 >= var7) { + this.field245 = var7; + this.method245(); this.remove(); } } @@ -283,33 +283,33 @@ public synchronized void fill(int[] var1, int var2, int var3) { } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("skip") public synchronized void skip(int var1) { - if (this.field240 > 0) { - if (var1 >= this.field240) { - if (this.field238 == Integer.MIN_VALUE) { - this.field238 = 0; - this.field233 = 0; - this.field235 = 0; - this.field239 = 0; + if (this.field242 > 0) { + if (var1 >= this.field242) { + if (this.field240 == Integer.MIN_VALUE) { + this.field240 = 0; + this.field246 = 0; + this.field237 = 0; + this.field234 = 0; this.remove(); - var1 = this.field240; + var1 = this.field242; } - this.field240 = 0; - this.method241(); + this.field242 = 0; + this.method236(); } else { - this.field239 += this.field234 * var1; - this.field235 += this.field243 * var1; - this.field233 += this.field232 * var1; - this.field240 -= var1; + this.field234 += this.field238 * var1; + this.field237 += this.field239 * var1; + this.field246 += this.field243 * var1; + this.field242 -= var1; } } @@ -322,130 +322,130 @@ public synchronized void skip(int var1) { this.numLoops = 0; } - if (this.field242 < 0) { - if (this.field244 <= 0) { - this.method250(); + if (this.field245 < 0) { + if (this.field235 <= 0) { + this.method245(); this.remove(); return; } - this.field242 = 0; + this.field245 = 0; } - if (this.field242 >= var5) { - if (this.field244 >= 0) { - this.method250(); + if (this.field245 >= var5) { + if (this.field235 >= 0) { + this.method245(); this.remove(); return; } - this.field242 = var5 - 1; + this.field245 = var5 - 1; } - this.field242 += this.field244 * var1; + this.field245 += this.field235 * var1; if (this.numLoops < 0) { - if (!this.field231) { - if (this.field244 < 0) { - if (this.field242 >= var3) { + if (!this.field232) { + if (this.field235 < 0) { + if (this.field245 >= var3) { return; } - this.field242 = var4 - 1 - (var4 - 1 - this.field242) % var6; + this.field245 = var4 - 1 - (var4 - 1 - this.field245) % var6; } else { - if (this.field242 < var4) { + if (this.field245 < var4) { return; } - this.field242 = var3 + (this.field242 - var3) % var6; + this.field245 = var3 + (this.field245 - var3) % var6; } } else { - if (this.field244 < 0) { - if (this.field242 >= var3) { + if (this.field235 < 0) { + if (this.field245 >= var3) { return; } - this.field242 = var3 + var3 - 1 - this.field242; - this.field244 = -this.field244; + this.field245 = var3 + var3 - 1 - this.field245; + this.field235 = -this.field235; } - while (this.field242 >= var4) { - this.field242 = var4 + var4 - 1 - this.field242; - this.field244 = -this.field244; - if (this.field242 >= var3) { + while (this.field245 >= var4) { + this.field245 = var4 + var4 - 1 - this.field245; + this.field235 = -this.field235; + if (this.field245 >= var3) { return; } - this.field242 = var3 + var3 - 1 - this.field242; - this.field244 = -this.field244; + this.field245 = var3 + var3 - 1 - this.field245; + this.field235 = -this.field235; } } } else { if (this.numLoops > 0) { - if (this.field231) { + if (this.field232) { label121: { - if (this.field244 < 0) { - if (this.field242 >= var3) { + if (this.field235 < 0) { + if (this.field245 >= var3) { return; } - this.field242 = var3 + var3 - 1 - this.field242; - this.field244 = -this.field244; + this.field245 = var3 + var3 - 1 - this.field245; + this.field235 = -this.field235; if (--this.numLoops == 0) { break label121; } } do { - if (this.field242 < var4) { + if (this.field245 < var4) { return; } - this.field242 = var4 + var4 - 1 - this.field242; - this.field244 = -this.field244; + this.field245 = var4 + var4 - 1 - this.field245; + this.field235 = -this.field235; if (--this.numLoops == 0) { break; } - if (this.field242 >= var3) { + if (this.field245 >= var3) { return; } - this.field242 = var3 + var3 - 1 - this.field242; - this.field244 = -this.field244; + this.field245 = var3 + var3 - 1 - this.field245; + this.field235 = -this.field235; } while(--this.numLoops != 0); } } else { label153: { int var7; - if (this.field244 < 0) { - if (this.field242 >= var3) { + if (this.field235 < 0) { + if (this.field245 >= var3) { return; } - var7 = (var4 - 1 - this.field242) / var6; + var7 = (var4 - 1 - this.field245) / var6; if (var7 >= this.numLoops) { - this.field242 += var6 * this.numLoops; + this.field245 += var6 * this.numLoops; this.numLoops = 0; break label153; } - this.field242 += var6 * var7; + this.field245 += var6 * var7; this.numLoops -= var7; } else { - if (this.field242 < var4) { + if (this.field245 < var4) { return; } - var7 = (this.field242 - var3) / var6; + var7 = (this.field245 - var3) / var6; if (var7 >= this.numLoops) { - this.field242 -= var6 * this.numLoops; + this.field245 -= var6 * this.numLoops; this.numLoops = 0; break label153; } - this.field242 -= var6 * var7; + this.field245 -= var6 * var7; this.numLoops -= var7; } @@ -454,51 +454,51 @@ public synchronized void skip(int var1) { } } - if (this.field244 < 0) { - if (this.field242 < 0) { - this.field242 = -1; - this.method250(); + if (this.field235 < 0) { + if (this.field245 < 0) { + this.field245 = -1; + this.method245(); this.remove(); } - } else if (this.field242 >= var5) { - this.field242 = var5; - this.method250(); + } else if (this.field245 >= var5) { + this.field245 = var5; + this.method245(); this.remove(); } } } - @ObfuscatedName("at") - public synchronized void method243(int var1) { - this.method245(var1 << 6, this.method247()); + @ObfuscatedName("aq") + public synchronized void method238(int var1) { + this.method240(var1 << 6, this.method242()); } - @ObfuscatedName("ah") - synchronized void method244(int var1) { - this.method245(var1, this.method247()); + @ObfuscatedName("al") + synchronized void method239(int var1) { + this.method240(var1, this.method242()); } - @ObfuscatedName("ax") - synchronized void method245(int var1, int var2) { - this.field238 = var1; - this.field236 = var2; - this.field240 = 0; - this.method241(); + @ObfuscatedName("an") + synchronized void method240(int var1, int var2) { + this.field240 = var1; + this.field244 = var2; + this.field242 = 0; + this.method236(); } - @ObfuscatedName("aa") - public synchronized int method246() { - return this.field238 == Integer.MIN_VALUE ? 0 : this.field238; + @ObfuscatedName("ar") + public synchronized int method241() { + return this.field240 == Integer.MIN_VALUE ? 0 : this.field240; } - @ObfuscatedName("au") - public synchronized int method247() { - return this.field236 < 0 ? -1 : this.field236; + @ObfuscatedName("ab") + public synchronized int method242() { + return this.field244 < 0 ? -1 : this.field244; } - @ObfuscatedName("ae") - public synchronized void method248(int var1) { + @ObfuscatedName("ag") + public synchronized void method243(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if (var1 < -1) { var1 = -1; @@ -508,254 +508,254 @@ public synchronized void method248(int var1) { var1 = var2; } - this.field242 = var1; + this.field245 = var1; } - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method249() { - this.field244 = (this.field244 ^ this.field244 >> 31) + (this.field244 >>> 31); - this.field244 = -this.field244; + public synchronized void method244() { + this.field235 = (this.field235 ^ this.field235 >> 31) + (this.field235 >>> 31); + this.field235 = -this.field235; } - @ObfuscatedName("ad") - void method250() { - if (this.field240 != 0) { - if (this.field238 == Integer.MIN_VALUE) { - this.field238 = 0; + @ObfuscatedName("ax") + void method245() { + if (this.field242 != 0) { + if (this.field240 == Integer.MIN_VALUE) { + this.field240 = 0; } - this.field240 = 0; - this.method241(); + this.field242 = 0; + this.method236(); } } - @ObfuscatedName("ao") - public synchronized void method251(int var1, int var2) { - this.method252(var1, var2, this.method247()); + @ObfuscatedName("ah") + public synchronized void method246(int var1, int var2) { + this.method247(var1, var2, this.method242()); } - @ObfuscatedName("ac") - public synchronized void method252(int var1, int var2, int var3) { + @ObfuscatedName("as") + public synchronized void method247(int var1, int var2, int var3) { if (var1 == 0) { - this.method245(var2, var3); + this.method240(var2, var3); } else { - int var4 = method236(var2, var3); - int var5 = method237(var2, var3); - if (var4 == this.field235 && var5 == this.field233) { - this.field240 = 0; + int var4 = method231(var2, var3); + int var5 = method232(var2, var3); + if (var4 == this.field237 && var5 == this.field246) { + this.field242 = 0; } else { - int var6 = var2 - this.field239; - if (this.field239 - var2 > var6) { - var6 = this.field239 - var2; + int var6 = var2 - this.field234; + if (this.field234 - var2 > var6) { + var6 = this.field234 - var2; } - if (var4 - this.field235 > var6) { - var6 = var4 - this.field235; + if (var4 - this.field237 > var6) { + var6 = var4 - this.field237; } - if (this.field235 - var4 > var6) { - var6 = this.field235 - var4; + if (this.field237 - var4 > var6) { + var6 = this.field237 - var4; } - if (var5 - this.field233 > var6) { - var6 = var5 - this.field233; + if (var5 - this.field246 > var6) { + var6 = var5 - this.field246; } - if (this.field233 - var5 > var6) { - var6 = this.field233 - var5; + if (this.field246 - var5 > var6) { + var6 = this.field246 - var5; } if (var1 > var6) { var1 = var6; } - this.field240 = var1; - this.field238 = var2; - this.field236 = var3; - this.field234 = (var2 - this.field239) / var1; - this.field243 = (var4 - this.field235) / var1; - this.field232 = (var5 - this.field233) / var1; + this.field242 = var1; + this.field240 = var2; + this.field244 = var3; + this.field238 = (var2 - this.field234) / var1; + this.field239 = (var4 - this.field237) / var1; + this.field243 = (var5 - this.field246) / var1; } } } - @ObfuscatedName("ak") - public synchronized void method253(int var1) { + @ObfuscatedName("ay") + public synchronized void method248(int var1) { if (var1 == 0) { - this.method244(0); + this.method239(0); this.remove(); - } else if (this.field235 == 0 && this.field233 == 0) { + } else if (this.field237 == 0 && this.field246 == 0) { + this.field242 = 0; this.field240 = 0; - this.field238 = 0; - this.field239 = 0; + this.field234 = 0; this.remove(); } else { - int var2 = -this.field239; - if (this.field239 > var2) { - var2 = this.field239; + int var2 = -this.field234; + if (this.field234 > var2) { + var2 = this.field234; } - if (-this.field235 > var2) { - var2 = -this.field235; + if (-this.field237 > var2) { + var2 = -this.field237; } - if (this.field235 > var2) { - var2 = this.field235; + if (this.field237 > var2) { + var2 = this.field237; } - if (-this.field233 > var2) { - var2 = -this.field233; + if (-this.field246 > var2) { + var2 = -this.field246; } - if (this.field233 > var2) { - var2 = this.field233; + if (this.field246 > var2) { + var2 = this.field246; } if (var1 > var2) { var1 = var2; } - this.field240 = var1; - this.field238 = Integer.MIN_VALUE; - this.field234 = -this.field239 / var1; - this.field243 = -this.field235 / var1; - this.field232 = -this.field233 / var1; + this.field242 = var1; + this.field240 = Integer.MIN_VALUE; + this.field238 = -this.field234 / var1; + this.field239 = -this.field237 / var1; + this.field243 = -this.field246 / var1; } } - @ObfuscatedName("an") - public synchronized void method254(int var1) { - if (this.field244 < 0) { - this.field244 = -var1; + @ObfuscatedName("aj") + public synchronized void method249(int var1) { + if (this.field235 < 0) { + this.field235 = -var1; } else { - this.field244 = var1; + this.field235 = var1; } } - @ObfuscatedName("af") - public synchronized int method255() { - return this.field244 < 0 ? -this.field244 : this.field244; + @ObfuscatedName("av") + public synchronized int method250() { + return this.field235 < 0 ? -this.field235 : this.field235; } - @ObfuscatedName("ai") - public boolean method256() { - return this.field242 < 0 || this.field242 >= ((RawSound)super.sound).samples.length << 8; + @ObfuscatedName("aw") + public boolean method251() { + return this.field245 < 0 || this.field245 >= ((RawSound)super.sound).samples.length << 8; } - @ObfuscatedName("al") - public boolean method257() { - return this.field240 != 0; + @ObfuscatedName("ak") + public boolean method252() { + return this.field242 != 0; } - @ObfuscatedName("bd") - int method263(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("bh") + int method258(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field240 > 0) { - int var6 = var2 + this.field240; + if (this.field242 > 0) { + int var6 = var2 + this.field242; if (var6 > var4) { var6 = var4; } - this.field240 += var2; - if (this.field244 == 256 && (this.field242 & 255) == 0) { - if (class373.PcmPlayer_stereo) { - var2 = method275(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field235, this.field233, this.field243, this.field232, 0, var6, var3, this); + this.field242 += var2; + if (this.field235 == 256 && (this.field245 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method270(0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, this.field239, this.field243, 0, var6, var3, this); } else { - var2 = method274(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field234, 0, var6, var3, this); + var2 = method269(((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, this.field238, 0, var6, var3, this); } - } else if (class373.PcmPlayer_stereo) { - var2 = method279(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field235, this.field233, this.field243, this.field232, 0, var6, var3, this, this.field244, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method274(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, this.field239, this.field243, 0, var6, var3, this, this.field235, var5); } else { - var2 = method278(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field234, 0, var6, var3, this, this.field244, var5); + var2 = method273(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, this.field238, 0, var6, var3, this, this.field235, var5); } - this.field240 -= var2; - if (this.field240 != 0) { + this.field242 -= var2; + if (this.field242 != 0) { return var2; } - if (!this.method265()) { + if (!this.method260()) { continue; } return var4; } - if (this.field244 == 256 && (this.field242 & 255) == 0) { - if (class373.PcmPlayer_stereo) { - return method267(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field235, this.field233, 0, var4, var3, this); + if (this.field235 == 256 && (this.field245 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method262(0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, 0, var4, var3, this); } - return method266(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this); + return method261(((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, 0, var4, var3, this); } - if (class373.PcmPlayer_stereo) { - return method271(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field235, this.field233, 0, var4, var3, this, this.field244, var5); + if (PcmPlayer.PcmPlayer_stereo) { + return method266(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, 0, var4, var3, this, this.field235, var5); } - return method270(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this, this.field244, var5); + return method265(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, 0, var4, var3, this, this.field235, var5); } } - @ObfuscatedName("bb") - int method264(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("bm") + int method259(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field240 > 0) { - int var6 = var2 + this.field240; + if (this.field242 > 0) { + int var6 = var2 + this.field242; if (var6 > var4) { var6 = var4; } - this.field240 += var2; - if (this.field244 == -256 && (this.field242 & 255) == 0) { - if (class373.PcmPlayer_stereo) { - var2 = method277(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field235, this.field233, this.field243, this.field232, 0, var6, var3, this); + this.field242 += var2; + if (this.field235 == -256 && (this.field245 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method272(0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, this.field239, this.field243, 0, var6, var3, this); } else { - var2 = method276(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field234, 0, var6, var3, this); + var2 = method271(((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, this.field238, 0, var6, var3, this); } - } else if (class373.PcmPlayer_stereo) { - var2 = method281(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field235, this.field233, this.field243, this.field232, 0, var6, var3, this, this.field244, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method276(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, this.field239, this.field243, 0, var6, var3, this, this.field235, var5); } else { - var2 = method280(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field234, 0, var6, var3, this, this.field244, var5); + var2 = method275(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, this.field238, 0, var6, var3, this, this.field235, var5); } - this.field240 -= var2; - if (this.field240 != 0) { + this.field242 -= var2; + if (this.field242 != 0) { return var2; } - if (!this.method265()) { + if (!this.method260()) { continue; } return var4; } - if (this.field244 == -256 && (this.field242 & 255) == 0) { - if (class373.PcmPlayer_stereo) { - return method269(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field235, this.field233, 0, var4, var3, this); + if (this.field235 == -256 && (this.field245 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method264(0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, 0, var4, var3, this); } - return method268(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this); + return method263(((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, 0, var4, var3, this); } - if (class373.PcmPlayer_stereo) { - return method273(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field235, this.field233, 0, var4, var3, this, this.field244, var5); + if (PcmPlayer.PcmPlayer_stereo) { + return method268(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, 0, var4, var3, this, this.field235, var5); } - return method272(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this, this.field244, var5); + return method267(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, 0, var4, var3, this, this.field235, var5); } } - @ObfuscatedName("bc") - boolean method265() { - int var1 = this.field238; + @ObfuscatedName("bf") + boolean method260() { + int var1 = this.field240; int var2; int var3; if (var1 == Integer.MIN_VALUE) { @@ -763,72 +763,72 @@ boolean method265() { var2 = 0; var1 = 0; } else { - var2 = method236(var1, this.field236); - var3 = method237(var1, this.field236); + var2 = method231(var1, this.field244); + var3 = method232(var1, this.field244); } - if (var1 == this.field239 && var2 == this.field235 && var3 == this.field233) { - if (this.field238 == Integer.MIN_VALUE) { - this.field238 = 0; - this.field233 = 0; - this.field235 = 0; - this.field239 = 0; + if (var1 == this.field234 && var2 == this.field237 && var3 == this.field246) { + if (this.field240 == Integer.MIN_VALUE) { + this.field240 = 0; + this.field246 = 0; + this.field237 = 0; + this.field234 = 0; this.remove(); return true; } else { - this.method241(); + this.method236(); return false; } } else { - if (this.field239 < var1) { - this.field234 = 1; - this.field240 = var1 - this.field239; - } else if (this.field239 > var1) { - this.field234 = -1; - this.field240 = this.field239 - var1; + if (this.field234 < var1) { + this.field238 = 1; + this.field242 = var1 - this.field234; + } else if (this.field234 > var1) { + this.field238 = -1; + this.field242 = this.field234 - var1; } else { - this.field234 = 0; + this.field238 = 0; } - if (this.field235 < var2) { - this.field243 = 1; - if (this.field240 == 0 || this.field240 > var2 - this.field235) { - this.field240 = var2 - this.field235; + if (this.field237 < var2) { + this.field239 = 1; + if (this.field242 == 0 || this.field242 > var2 - this.field237) { + this.field242 = var2 - this.field237; } - } else if (this.field235 > var2) { - this.field243 = -1; - if (this.field240 == 0 || this.field240 > this.field235 - var2) { - this.field240 = this.field235 - var2; + } else if (this.field237 > var2) { + this.field239 = -1; + if (this.field242 == 0 || this.field242 > this.field237 - var2) { + this.field242 = this.field237 - var2; } } else { - this.field243 = 0; + this.field239 = 0; } - if (this.field233 < var3) { - this.field232 = 1; - if (this.field240 == 0 || this.field240 > var3 - this.field233) { - this.field240 = var3 - this.field233; + if (this.field246 < var3) { + this.field243 = 1; + if (this.field242 == 0 || this.field242 > var3 - this.field246) { + this.field242 = var3 - this.field246; } - } else if (this.field233 > var3) { - this.field232 = -1; - if (this.field240 == 0 || this.field240 > this.field233 - var3) { - this.field240 = this.field233 - var3; + } else if (this.field246 > var3) { + this.field243 = -1; + if (this.field242 == 0 || this.field242 > this.field246 - var3) { + this.field242 = this.field246 - var3; } } else { - this.field232 = 0; + this.field243 = 0; } return false; } } - @ObfuscatedName("by") + @ObfuscatedName("br") @Export("vmethod1019") int vmethod1019() { - int var1 = this.field239 * 3 >> 6; + int var1 = this.field234 * 3 >> 6; var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); if (this.numLoops == 0) { - var1 -= var1 * this.field242 / (((RawSound)super.sound).samples.length << 8); + var1 -= var1 * this.field245 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; } @@ -836,38 +836,38 @@ int vmethod1019() { return var1 > 255 ? 255 : var1; } - @ObfuscatedName("aw") - static int method236(int var0, int var1) { + @ObfuscatedName("au") + static int method231(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("ay") - static int method237(int var0, int var1) { + @ObfuscatedName("ae") + static int method232(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lbi;II)Lbt;" + descriptor = "(Lbu;II)Lbn;" ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field181 * 100)), var2 << 6) : null; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lbi;III)Lbt;" + descriptor = "(Lbu;III)Lbn;" ) - public static RawPcmStream method240(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method235(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } - @ObfuscatedName("bi") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILbt;)I" + descriptor = "([B[IIIIIIILbn;)I" ) - static int method266(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method261(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -890,15 +890,15 @@ static int method266(byte[] var0, int[] var1, int var2, int var3, int var4, int var10001 = var3++; } - var8.field242 = var2 << 8; + var8.field245 = var2 << 8; return var3; } - @ObfuscatedName("bu") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILbt;)I" + descriptor = "(I[B[IIIIIIIILbn;)I" ) - static int method267(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method262(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -941,15 +941,15 @@ static int method267(int var0, byte[] var1, int[] var2, int var3, int var4, int var10001 = var4++; } - var10.field242 = var3 << 8; + var10.field245 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bk") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILbt;)I" + descriptor = "([B[IIIIIIILbn;)I" ) - static int method268(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method263(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -972,15 +972,15 @@ static int method268(byte[] var0, int[] var1, int var2, int var3, int var4, int var10001 = var3++; } - var8.field242 = var2 << 8; + var8.field245 = var2 << 8; return var3; } - @ObfuscatedName("bh") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILbt;)I" + descriptor = "(I[B[IIIIIIIILbn;)I" ) - static int method269(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method264(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -1023,15 +1023,15 @@ static int method269(int var0, byte[] var1, int[] var2, int var3, int var4, int var10001 = var4++; } - var10.field242 = var3 << 8; + var10.field245 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bm") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILbt;II)I" + descriptor = "(II[B[IIIIIIILbn;II)I" ) - static int method270(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method265(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { var7 = var8; } @@ -1056,15 +1056,15 @@ static int method270(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field242 = var4; + var10.field245 = var4; return var5; } - @ObfuscatedName("bl") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbt;II)I" + descriptor = "(II[B[IIIIIIIILbn;II)I" ) - static int method271(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method266(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1098,15 +1098,15 @@ static int method271(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += var0 * var7 >> 6; } - var11.field242 = var4; + var11.field245 = var4; return var5 >> 1; } - @ObfuscatedName("bt") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILbt;II)I" + descriptor = "(II[B[IIIIIIILbn;II)I" ) - static int method272(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method267(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { var7 = var8; } @@ -1131,15 +1131,15 @@ static int method272(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field242 = var4; + var10.field245 = var4; return var5; } - @ObfuscatedName("bg") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbt;II)I" + descriptor = "(II[B[IIIIIIIILbn;II)I" ) - static int method273(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method268(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1171,15 +1171,15 @@ static int method273(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += var0 * var7 >> 6; } - var11.field242 = var4; + var11.field245 = var4; return var5 >> 1; } - @ObfuscatedName("bj") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILbt;)I" + descriptor = "([B[IIIIIIIILbn;)I" ) - static int method274(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method269(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1188,8 +1188,8 @@ static int method274(byte[] var0, int[] var1, int var2, int var3, int var4, int var6 = var7; } - var9.field235 += var9.field243 * (var6 - var3); - var9.field233 += var9.field232 * (var6 - var3); + var9.field237 += var9.field239 * (var6 - var3); + var9.field246 += var9.field243 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1211,16 +1211,16 @@ static int method274(byte[] var0, int[] var1, int var2, int var3, int var4, int var1[var10001] += var0[var2++] * var4; } - var9.field239 = var4 >> 2; - var9.field242 = var2 << 8; + var9.field234 = var4 >> 2; + var9.field245 = var2 << 8; return var3; } - @ObfuscatedName("ct") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILbt;)I" + descriptor = "(I[B[IIIIIIIIIILbn;)I" ) - static int method275(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method270(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1231,7 +1231,7 @@ static int method275(int var0, byte[] var1, int[] var2, int var3, int var4, int var9 = var10; } - var12.field239 += var12.field234 * (var9 - var4); + var12.field234 += var12.field238 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1276,17 +1276,17 @@ static int method275(int var0, byte[] var1, int[] var2, int var3, int var4, int var2[var10001] += var13 * var6; } - var12.field235 = var5 >> 2; - var12.field233 = var6 >> 2; - var12.field242 = var3 << 8; + var12.field237 = var5 >> 2; + var12.field246 = var6 >> 2; + var12.field245 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("cf") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILbt;)I" + descriptor = "([B[IIIIIIIILbn;)I" ) - static int method276(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method271(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1295,8 +1295,8 @@ static int method276(byte[] var0, int[] var1, int var2, int var3, int var4, int var6 = var7; } - var9.field235 += var9.field243 * (var6 - var3); - var9.field233 += var9.field232 * (var6 - var3); + var9.field237 += var9.field239 * (var6 - var3); + var9.field246 += var9.field243 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1318,16 +1318,16 @@ static int method276(byte[] var0, int[] var1, int var2, int var3, int var4, int var1[var10001] += var0[var2--] * var4; } - var9.field239 = var4 >> 2; - var9.field242 = var2 << 8; + var9.field234 = var4 >> 2; + var9.field245 = var2 << 8; return var3; } - @ObfuscatedName("cz") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILbt;)I" + descriptor = "(I[B[IIIIIIIIIILbn;)I" ) - static int method277(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method272(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1338,7 +1338,7 @@ static int method277(int var0, byte[] var1, int[] var2, int var3, int var4, int var9 = var10; } - var12.field239 += var12.field234 * (var9 - var4); + var12.field234 += var12.field238 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1383,19 +1383,19 @@ static int method277(int var0, byte[] var1, int[] var2, int var3, int var4, int var2[var10001] += var13 * var6; } - var12.field235 = var5 >> 2; - var12.field233 = var6 >> 2; - var12.field242 = var3 << 8; + var12.field237 = var5 >> 2; + var12.field246 = var6 >> 2; + var12.field245 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("cb") + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbt;II)I" + descriptor = "(II[B[IIIIIIIILbn;II)I" ) - static int method278(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field235 -= var11.field243 * var5; - var11.field233 -= var11.field232 * var5; + static int method273(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field237 -= var11.field239 * var5; + var11.field246 -= var11.field243 * var5; if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1422,19 +1422,19 @@ static int method278(int var0, int var1, byte[] var2, int[] var3, int var4, int var6 += var7; } - var11.field235 += var11.field243 * var5; - var11.field233 += var11.field232 * var5; - var11.field239 = var6; - var11.field242 = var4; + var11.field237 += var11.field239 * var5; + var11.field246 += var11.field243 * var5; + var11.field234 = var6; + var11.field245 = var4; return var5; } - @ObfuscatedName("cs") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILbt;II)I" + descriptor = "(II[B[IIIIIIIIIILbn;II)I" ) - static int method279(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field239 -= var5 * var13.field234; + static int method274(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field234 -= var5 * var13.field238; if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } @@ -1473,20 +1473,20 @@ static int method279(int var0, int var1, byte[] var2, int[] var3, int var4, int } var5 >>= 1; - var13.field239 += var13.field234 * var5; - var13.field235 = var6; - var13.field233 = var7; - var13.field242 = var4; + var13.field234 += var13.field238 * var5; + var13.field237 = var6; + var13.field246 = var7; + var13.field245 = var4; return var5; } - @ObfuscatedName("cj") + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbt;II)I" + descriptor = "(II[B[IIIIIIIILbn;II)I" ) - static int method280(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field235 -= var11.field243 * var5; - var11.field233 -= var11.field232 * var5; + static int method275(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field237 -= var11.field239 * var5; + var11.field246 -= var11.field243 * var5; if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1513,19 +1513,19 @@ static int method280(int var0, int var1, byte[] var2, int[] var3, int var4, int var6 += var7; } - var11.field235 += var11.field243 * var5; - var11.field233 += var11.field232 * var5; - var11.field239 = var6; - var11.field242 = var4; + var11.field237 += var11.field239 * var5; + var11.field246 += var11.field243 * var5; + var11.field234 = var6; + var11.field245 = var4; return var5; } - @ObfuscatedName("cn") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILbt;II)I" + descriptor = "(II[B[IIIIIIIIIILbn;II)I" ) - static int method281(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field239 -= var5 * var13.field234; + static int method276(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field234 -= var5 * var13.field238; if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } @@ -1562,10 +1562,10 @@ static int method281(int var0, int var1, byte[] var2, int[] var3, int var4, int } var5 >>= 1; - var13.field239 += var13.field234 * var5; - var13.field235 = var6; - var13.field233 = var7; - var13.field242 = var4; + var13.field234 += var13.field238 * var5; + var13.field237 = var6; + var13.field246 = var7; + var13.field245 = var4; return var5; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/RawSound.java b/osrs/src/main/java/RawSound.java index da2fe2920..9b6989313 100644 --- a/osrs/src/main/java/RawSound.java +++ b/osrs/src/main/java/RawSound.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("bu") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("samples") public byte[] samples; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("start") public int start; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("end") int end; - @ObfuscatedName("as") - public boolean field168; + @ObfuscatedName("ac") + public boolean field167; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; this.start = var3; this.end = var4; - this.field168 = var5; + this.field167 = var5; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lcj;)Lbi;" + descriptor = "(Lcx;)Lbu;" ) @Export("resample") public RawSound resample(Decimator var1) { @@ -56,4 +56,4 @@ public RawSound resample(Decimator var1) { return this; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ReflectionCheck.java b/osrs/src/main/java/ReflectionCheck.java index 885d7c844..05347ae42 100644 --- a/osrs/src/main/java/ReflectionCheck.java +++ b/osrs/src/main/java/ReflectionCheck.java @@ -1,86 +1,63 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +@ObfuscatedName("ba") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("fo") + @ObfuscatedName("sh") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lqc;" ) - static Archive field151; - @ObfuscatedName("aw") + @Export("friendsChat") + static FriendsChat friendsChat; + @ObfuscatedName("au") @Export("id") int id; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("size") int size; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("operations") int[] operations; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("as") + @ObfuscatedName("ac") Field[] fields; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("methods") Method[] methods; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("arguments") byte[][][] arguments; ReflectionCheck() { } - @ObfuscatedName("aw") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(Lnd;B)V", - garbageValue = "-7" + descriptor = "(Lmi;II)V", + garbageValue = "-1454269975" ) - public static void method175(AbstractArchive var0) { - VarbitComposition.VarbitDefinition_archive = var0; - } - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "6" - ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = class306.getTileHeight(var0, var1, class36.Client_plane) - var2; - var0 -= class157.cameraX; - var3 -= class384.cameraY; - var1 -= SoundSystem.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[class19.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[class19.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[class456.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[class456.cameraYaw]; - int var8 = var6 * var1 + var0 * var7 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var5 * var3 - var4 * var1 >> 16; - var1 = var5 * var1 + var3 * var4 >> 16; - if (var1 >= 50) { - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; - Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; - } + public static void method174(Widget var0, int var1) { + ItemComposition var2 = InvDefinition.ItemDefinition_get(var1); + var0.field3101.equipment[var2.maleModel] = var1 + 512; + if (var2.maleModel1 != -1) { + var0.field3101.equipment[var2.maleModel1] = 0; + } - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + if (var2.maleModel2 != -1) { + var0.field3101.equipment[var2.maleModel2] = 0; } + + var0.field3101.method1729(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/RefreshAccessTokenRequester.java b/osrs/src/main/java/RefreshAccessTokenRequester.java new file mode 100644 index 000000000..6c0f51bb8 --- /dev/null +++ b/osrs/src/main/java/RefreshAccessTokenRequester.java @@ -0,0 +1,12 @@ +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; + +import java.net.URL; +import java.util.Map; +import java.util.concurrent.Future; + +@Implements("com/jagex/oldscape/pub/RefreshAccessTokenRequester") +@ObfuscatedName("com/jagex/oldscape/pub/RefreshAccessTokenRequester") +public interface RefreshAccessTokenRequester { + Future request(String var1, URL var2, Map var3, String var4); +} \ No newline at end of file diff --git a/osrs/src/main/java/RefreshAccessTokenResponse.java b/osrs/src/main/java/RefreshAccessTokenResponse.java new file mode 100644 index 000000000..82833cb94 --- /dev/null +++ b/osrs/src/main/java/RefreshAccessTokenResponse.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; + +@Implements("com/jagex/oldscape/pub/RefreshAccessTokenResponse") +@ObfuscatedName("com/jagex/oldscape/pub/RefreshAccessTokenResponse") +public interface RefreshAccessTokenResponse { + @Export("isSuccess") + @ObfuscatedName("isSuccess") + boolean isSuccess(); + + @Export("getAccessToken") + @ObfuscatedName("getAccessToken") + String getAccessToken(); + + @Export("getRefreshToken") + @ObfuscatedName("getRefreshToken") + String getRefreshToken(); +} \ No newline at end of file diff --git a/osrs/src/main/java/Renderable.java b/osrs/src/main/java/Renderable.java index 689b80f1b..2cbfc8b55 100644 --- a/osrs/src/main/java/Renderable.java +++ b/osrs/src/main/java/Renderable.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("ik") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("er") + @ObfuscatedName("eq") @Export("height") public int height; @@ -14,17 +14,17 @@ protected Renderable() { this.height = 1000; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Ljo;", - garbageValue = "-983173466" + descriptor = "(I)Ljr;", + garbageValue = "798227647" ) @Export("getModel") protected Model getModel() { return null; } - @ObfuscatedName("dx") + @ObfuscatedName("db") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); @@ -34,4 +34,29 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, } } -} + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-109873503" + ) + public static void method1290() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + } + + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-597035474" + ) + static final void method1291() { + if (Client.logoutTimer > 0) { + ArchiveDisk.logOut(); + } else { + Client.timer.method2151(); + MusicSong.updateGameState(40); + AbstractSocket.field3819 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/RouteStrategy.java b/osrs/src/main/java/RouteStrategy.java index 779e4a42e..cdba866f6 100644 --- a/osrs/src/main/java/RouteStrategy.java +++ b/osrs/src/main/java/RouteStrategy.java @@ -1,90 +1,44 @@ -import java.util.ArrayList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +@ObfuscatedName("iw") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("approxDestinationSizeY") public int approxDestinationSizeY; protected RouteStrategy() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIILij;I)Z", - garbageValue = "2142084611" + descriptor = "(IIILis;B)Z", + garbageValue = "85" ) @Export("hasArrived") protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("aj") + @ObfuscatedName("ja") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-1978" + descriptor = "(I)V", + garbageValue = "1131670989" ) - public static void method1107(int var0, int var1) { - ArchiveLoader.method464(var0, var1, 0, 0); - class306.field2755.clear(); - if (!class306.musicSongs.isEmpty() && (var0 != 0 || var1 != 0)) { - class306.field2760.add(new DelayFadeTask((SongTask)null, class306.musicPlayerStatus)); - class306.field2760.add(new FadeOutTask((SongTask)null, 0, false, class306.field2753)); + static void method1125() { + if (Client.field386) { + class92.addPlayerToScene(VarbitComposition.localPlayer, false); } - ArrayList var2 = class162.method847(); - class306.field2760.add(new class402((SongTask)null, var2)); } - - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(ILdc;ZS)I", - garbageValue = "-21358" - ) - static int method1108(int var0, Script var1, boolean var2) { - if (var0 == 5630) { - Client.logoutTimer = 250; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("il") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-774340966" - ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field611 = 0L; - if (var0 >= 2) { - Client.isResizable = true; - } else { - Client.isResizable = false; - } - - if (Huffman.getWindowedMode() == 1) { - TileItem.client.setMaxCanvasSize(765, 503); - } else { - TileItem.client.setMaxCanvasSize(7680, 2160); - } - - if (Client.gameState >= 25) { - LoadSongTask.method2108(); - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/RunException.java b/osrs/src/main/java/RunException.java index 05a25ad3c..2d33c007c 100644 --- a/osrs/src/main/java/RunException.java +++ b/osrs/src/main/java/RunException.java @@ -1,25 +1,34 @@ -import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("uf") +import java.applet.Applet; + +@ObfuscatedName("uy") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("ay") - public static String field4248; - @ObfuscatedName("ar") + @ObfuscatedName("ae") + public static String field4289; + @ObfuscatedName("ao") @Export("RunException_revision") public static int RunException_revision; - @ObfuscatedName("am") - public static int field4244; - @ObfuscatedName("as") - public static int field4246; - @ObfuscatedName("aj") - String field4249; - @ObfuscatedName("ag") + @ObfuscatedName("at") + public static int field4287; + @ObfuscatedName("ac") + public static int field4285; + @ObfuscatedName("jy") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("ai") + String field4291; + @ObfuscatedName("az") Throwable parent; -} + + RunException(Throwable var1, String var2) { + this.field4291 = var2; + this.parent = var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Scene.java b/osrs/src/main/java/Scene.java index ba4769728..7f928e4b4 100644 --- a/osrs/src/main/java/Scene.java +++ b/osrs/src/main/java/Scene.java @@ -3,129 +3,129 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iz") +@ObfuscatedName("iv") @Implements("Scene") public class Scene { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("bd") + @ObfuscatedName("bh") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("bb") + @ObfuscatedName("bj") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "[Ljc;" + descriptor = "[Ljy;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("br") + @ObfuscatedName("bq") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("bu") + @ObfuscatedName("bo") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("bk") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "[[Ljp;" + descriptor = "[[Ljn;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("bz") + @ObfuscatedName("br") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("bx") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "[Ljp;" + descriptor = "[Ljn;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("bh") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("bm") - static final int[] field2071; - @ObfuscatedName("bl") - static final int[] field2070; - @ObfuscatedName("bt") - static final int[] field2072; - @ObfuscatedName("by") - static final int[] field2073; + @ObfuscatedName("bz") + static final int[] field2098; + @ObfuscatedName("bx") + static final int[] field2097; + @ObfuscatedName("bn") + static final int[] field2095; + @ObfuscatedName("bw") + static final int[] field2096; + @ObfuscatedName("bc") + static final int[] field2093; @ObfuscatedName("bg") - static final int[] field2068; - @ObfuscatedName("bj") - static final int[] field2069; - @ObfuscatedName("ct") - static final int[] field2074; + static final int[] field2094; @ObfuscatedName("cw") + static final int[] field2099; + @ObfuscatedName("cd") @Export("visibilityMap") static boolean[][][][] visibilityMap; @ObfuscatedName("ce") @@ -134,57 +134,57 @@ public class Scene { @ObfuscatedName("cq") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("cm") + @ObfuscatedName("cp") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("ca") + @ObfuscatedName("cv") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("cx") + @ObfuscatedName("co") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("co") + @ObfuscatedName("cl") @Export("Scene_viewportXMax") static int Scene_viewportXMax; @ObfuscatedName("cu") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("planes") int planes; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("xSize") int xSize; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("ySize") int ySize; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "[[[Lil;" + descriptor = "[[[Lii;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("minPlane") int minPlane; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "[Ljc;" + descriptor = "[Ljy;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("ap") - int[][][] field2083; - @ObfuscatedName("cj") + @ObfuscatedName("af") + int[][][] field2109; + @ObfuscatedName("cx") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("cn") + @ObfuscatedName("cr") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; Scene_currentOccluders = new Occluder[500]; Scene_tilesDeque = new NodeDeque(); - field2071 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field2070 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field2072 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field2073 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field2068 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field2069 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field2074 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + field2098 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field2097 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field2095 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field2096 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field2093 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field2094 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field2099 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; visibilityMap = new boolean[8][32][51][51]; } @@ -226,12 +226,12 @@ public Scene(int var1, int var2, int var3, int[][][] var4) { this.xSize = var2; this.ySize = var3; this.tiles = new Tile[var1][var2][var3]; - this.field2083 = new int[var1][var2 + 1][var3 + 1]; + this.field2109 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public void clear() { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("init") public void init(int var1) { this.minPlane = var1; @@ -279,7 +279,7 @@ public void init(int var1) { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; @@ -292,7 +292,7 @@ public void setLinkBelow(int var1, int var2) { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { GameObject var7 = var5.gameObjects[var6]; long var9 = var7.tag; - boolean var8 = class6.method12(var9) == 2; + boolean var8 = class177.method918(var9) == 2; if (var8 && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } @@ -308,7 +308,7 @@ public void setLinkBelow(int var1, int var2) { this.tiles[3][var1][var2] = null; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; @@ -317,7 +317,7 @@ public void setTileMinPlane(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { SceneTilePaint var21; @@ -355,9 +355,9 @@ public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IIIILit;JI)V" + descriptor = "(IIIILik;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { @@ -377,9 +377,9 @@ public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderabl } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIIILit;JLit;Lit;)V" + descriptor = "(IIIILik;JLik;Lik;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) { @@ -413,9 +413,9 @@ public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable this.tiles[var1][var2][var3].itemLayer = var10; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IIIILit;Lit;IIJI)V" + descriptor = "(IIIILik;Lik;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) { @@ -441,9 +441,9 @@ public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(IIIILit;Lit;IIIIJI)V" + descriptor = "(IIIILik;Lik;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) { @@ -471,11 +471,11 @@ public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IIIIIILit;IJI)Z" + descriptor = "(IIIIIILik;IJI)Z" ) - public boolean method1221(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + public boolean method1243(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { if (var7 == null) { return true; } else { @@ -485,9 +485,9 @@ public boolean method1221(int var1, int var2, int var3, int var4, int var5, int } } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IIIIILit;IJZ)Z" + descriptor = "(IIIIILik;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) { @@ -524,18 +524,18 @@ public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Rend } } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIIIILit;IJIIII)Z" + descriptor = "(IIIIILik;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) { return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); } - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IIIIIIIILit;IZJI)Z" + descriptor = "(IIIIIIIILik;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) { @@ -607,7 +607,7 @@ boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6 return true; } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { @@ -619,9 +619,9 @@ public void clearTempGameObjects() { this.tempGameObjectsCount = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljc;)V" + descriptor = "(Ljy;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -655,8 +655,8 @@ void removeGameObject(GameObject var1) { } - @ObfuscatedName("ae") - public void method1227(int var1, int var2, int var3, int var4) { + @ObfuscatedName("ag") + public void method1249(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; if (var5 != null) { WallDecoration var6 = var5.wallDecoration; @@ -667,7 +667,7 @@ public void method1227(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -676,7 +676,7 @@ public void removeBoundaryObject(int var1, int var2, int var3) { } } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -685,7 +685,7 @@ public void removeWallDecoration(int var1, int var2, int var3) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -693,7 +693,7 @@ public void removeGameObject(int var1, int var2, int var3) { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; long var8 = var6.tag; - boolean var7 = class6.method12(var8) == 2; + boolean var7 = class177.method918(var8) == 2; if (var7 && var2 == var6.startX && var3 == var6.startY) { this.removeGameObject(var6); return; @@ -703,7 +703,7 @@ public void removeGameObject(int var1, int var2, int var3) { } } - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -712,7 +712,7 @@ public void removeFloorDecoration(int var1, int var2, int var3) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -721,27 +721,27 @@ public void removeGroundItemPile(int var1, int var2, int var3) { } } - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(III)Lje;" + descriptor = "(III)Ljo;" ) - public BoundaryObject method1233(int var1, int var2, int var3) { + public BoundaryObject method1255(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.boundaryObject; } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(III)Ljt;" + descriptor = "(III)Ljw;" ) - public WallDecoration method1234(int var1, int var2, int var3) { + public WallDecoration method1256(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.wallDecoration; } - @ObfuscatedName("ai") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(III)Ljc;" + descriptor = "(III)Ljy;" ) @Export("getGameObject") public GameObject getGameObject(int var1, int var2, int var3) { @@ -752,7 +752,7 @@ public GameObject getGameObject(int var1, int var2, int var3) { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; long var8 = var6.tag; - boolean var7 = class6.method12(var8) == 2; + boolean var7 = class177.method918(var8) == 2; if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6; } @@ -762,9 +762,9 @@ public GameObject getGameObject(int var1, int var2, int var3) { } } - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(III)Lip;" + descriptor = "(III)Liy;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { @@ -772,21 +772,21 @@ public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } - @ObfuscatedName("bd") + @ObfuscatedName("bh") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; } - @ObfuscatedName("bb") + @ObfuscatedName("bj") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; } - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -796,7 +796,7 @@ public long getGameObjectTag(int var1, int var2, int var3) { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; long var8 = var6.tag; - boolean var7 = class6.method12(var8) == 2; + boolean var7 = class177.method918(var8) == 2; if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } @@ -806,14 +806,14 @@ public long getGameObjectTag(int var1, int var2, int var3) { } } - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; @@ -836,8 +836,8 @@ public int getObjectFlags(int var1, int var2, int var3, long var4) { } } - @ObfuscatedName("bs") - public void method1242(int var1, int var2, int var3) { + @ObfuscatedName("bd") + public void method1264(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.planes; ++var4) { for (int var5 = 0; var5 < this.xSize; ++var5) { for (int var6 = 0; var6 < this.ySize; ++var6) { @@ -847,11 +847,11 @@ public void method1242(int var1, int var2, int var3) { ModelData var10; if (var8 != null && var8.renderable1 instanceof ModelData) { ModelData var9 = (ModelData)var8.renderable1; - this.method1244(var9, var4, var5, var6, 1, 1); + this.method1266(var9, var4, var5, var6, 1, 1); if (var8.renderable2 instanceof ModelData) { var10 = (ModelData)var8.renderable2; - this.method1244(var10, var4, var5, var6, 1, 1); - ModelData.method1151(var9, var10, 0, 0, 0, false); + this.method1266(var10, var4, var5, var6, 1, 1); + ModelData.method1175(var9, var10, 0, 0, 0, false); var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } @@ -862,7 +862,7 @@ public void method1242(int var1, int var2, int var3) { GameObject var14 = var7.gameObjects[var12]; if (var14 != null && var14.renderable instanceof ModelData) { ModelData var11 = (ModelData)var14.renderable; - this.method1244(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + this.method1266(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); } } @@ -870,7 +870,7 @@ public void method1242(int var1, int var2, int var3) { FloorDecoration var13 = var7.floorDecoration; if (var13 != null && var13.renderable instanceof ModelData) { var10 = (ModelData)var13.renderable; - this.method1243(var10, var4, var5, var6); + this.method1265(var10, var4, var5, var6); var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } @@ -880,11 +880,11 @@ public void method1242(int var1, int var2, int var3) { } - @ObfuscatedName("bp") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(Lie;III)V" + descriptor = "(Lic;III)V" ) - void method1243(ModelData var1, int var2, int var3, int var4) { + void method1265(ModelData var1, int var2, int var3, int var4) { int var6 = var3 + 1; int var7 = var4 - 1; int var8 = var4 + 1; @@ -895,9 +895,9 @@ void method1243(ModelData var1, int var2, int var3, int var4) { if (var10 >= 0 && var10 < this.ySize && (var9 >= var6 || var10 >= var8)) { Tile var11 = this.tiles[var2][var9][var10]; if (var11 != null && var11.floorDecoration != null && var11.floorDecoration.renderable instanceof ModelData) { - int var12 = this.method1245(var2, var9, var10, var2, var3, var4); + int var12 = this.method1267(var2, var9, var10, var2, var3, var4); ModelData var13 = (ModelData)var11.floorDecoration.renderable; - ModelData.method1151(var1, var13, (var9 - var3) * 128, var12, (var10 - var4) * 128, true); + ModelData.method1175(var1, var13, (var9 - var3) * 128, var12, (var10 - var4) * 128, true); } } } @@ -906,11 +906,11 @@ void method1243(ModelData var1, int var2, int var3, int var4) { } - @ObfuscatedName("bv") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(Lie;IIIII)V" + descriptor = "(Lic;IIIII)V" ) - void method1244(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method1266(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; @@ -925,18 +925,18 @@ void method1244(ModelData var1, int var2, int var3, int var4, int var5, int var6 if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { Tile var15 = this.tiles[var12][var13][var14]; if (var15 != null) { - int var16 = this.method1245(var12, var13, var14, var2, var3, var4); + int var16 = this.method1267(var12, var13, var14, var2, var3, var4); BoundaryObject var17 = var15.boundaryObject; if (var17 != null) { ModelData var18; if (var17.renderable1 instanceof ModelData) { var18 = (ModelData)var17.renderable1; - ModelData.method1151(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method1175(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } if (var17.renderable2 instanceof ModelData) { var18 = (ModelData)var17.renderable2; - ModelData.method1151(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method1175(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } @@ -946,7 +946,7 @@ void method1244(ModelData var1, int var2, int var3, int var4, int var5, int var6 ModelData var20 = (ModelData)var19.renderable; int var21 = var19.endX - var19.startX + 1; int var22 = var19.endY - var19.startY + 1; - ModelData.method1151(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + ModelData.method1175(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -962,17 +962,17 @@ void method1244(ModelData var1, int var2, int var3, int var4, int var5, int var6 } - @ObfuscatedName("bq") - int method1245(int var1, int var2, int var3, int var4, int var5, int var6) { - return this.method1246(var1, var2, var3) - this.method1246(var4, var5, var6); + @ObfuscatedName("bm") + int method1267(int var1, int var2, int var3, int var4, int var5, int var6) { + return this.method1268(var1, var2, var3) - this.method1268(var4, var5, var6); } - @ObfuscatedName("bo") - int method1246(int var1, int var2, int var3) { + @ObfuscatedName("bf") + int method1268(int var1, int var2, int var3) { return (this.tileHeights[var1][var2 + 1][var3 + 1] + this.tileHeights[var1][var2][var3] + this.tileHeights[var1][var2][var3 + 1] + this.tileHeights[var1][var2 + 1][var3]) / 4; } - @ObfuscatedName("br") + @ObfuscatedName("bq") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; @@ -1037,7 +1037,7 @@ public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, } } - @ObfuscatedName("bc") + @ObfuscatedName("bp") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { if (!shouldSendWalk() || var4) { @@ -1051,13 +1051,13 @@ public void menuOpen(int var1, int var2, int var3, boolean var4) { } } - @ObfuscatedName("bi") + @ObfuscatedName("bu") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; } - @ObfuscatedName("bz") + @ObfuscatedName("br") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { @@ -1124,11 +1124,7 @@ public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { Tile var16 = var8[var9][var10]; if (var16 != null) { - if (var16.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { - var16.drawPrimary = false; - var16.drawSecondary = false; - var16.drawGameObjectEdges = 0; - } else { + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { var16.drawPrimary = true; var16.drawSecondary = true; if (var16.gameObjectsCount > 0) { @@ -1138,6 +1134,10 @@ public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { } ++tileUpdateCount; + } else { + var16.drawPrimary = false; + var16.drawSecondary = false; + var16.drawGameObjectEdges = 0; } } } @@ -1254,9 +1254,9 @@ public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { checkClick = false; } - @ObfuscatedName("bx") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(Lil;Z)V" + descriptor = "(Lii;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1350,10 +1350,10 @@ void drawTile(Tile var1, boolean var2) { if (var3.linkedBelowTile != null) { var9 = var3.linkedBelowTile; if (var9.paint != null) { - if (!this.method1261(0, var4, var5)) { + if (!this.method1283(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method1261(0, var4, var5)) { + } else if (var9.model != null && !this.method1283(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1372,13 +1372,13 @@ void drawTile(Tile var1, boolean var2) { var20 = false; if (var3.paint != null) { - if (!this.method1261(var7, var4, var5)) { + if (!this.method1283(var7, var4, var5)) { var20 = true; if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method1261(var7, var4, var5)) { + } else if (var3.model != null && !this.method1283(var7, var4, var5)) { var20 = true; this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1400,43 +1400,43 @@ void drawTile(Tile var1, boolean var2) { var21 += 6; } - var11 = field2071[var21]; - var3.field1993 = field2072[var21]; + var11 = field2098[var21]; + var3.field2022 = field2095[var21]; } if (var31 != null) { - if ((var31.orientationA & field2070[var21]) != 0) { + if ((var31.orientationA & field2097[var21]) != 0) { if (var31.orientationA == 16) { var3.drawGameObjectEdges = 3; - var3.field1995 = field2073[var21]; - var3.field1991 = 3 - var3.field1995; + var3.field2014 = field2096[var21]; + var3.field2018 = 3 - var3.field2014; } else if (var31.orientationA == 32) { var3.drawGameObjectEdges = 6; - var3.field1995 = field2068[var21]; - var3.field1991 = 6 - var3.field1995; + var3.field2014 = field2093[var21]; + var3.field2018 = 6 - var3.field2014; } else if (var31.orientationA == 64) { var3.drawGameObjectEdges = 12; - var3.field1995 = field2069[var21]; - var3.field1991 = 12 - var3.field1995; + var3.field2014 = field2094[var21]; + var3.field2018 = 12 - var3.field2014; } else { var3.drawGameObjectEdges = 9; - var3.field1995 = field2074[var21]; - var3.field1991 = 9 - var3.field1995; + var3.field2014 = field2099[var21]; + var3.field2018 = 9 - var3.field2014; } } else { var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method1262(var7, var4, var5, var31.orientationA)) { + if ((var31.orientationA & var11) != 0 && !this.method1284(var7, var4, var5, var31.orientationA)) { var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method1262(var7, var4, var5, var31.orientationB)) { + if ((var31.orientationB & var11) != 0 && !this.method1284(var7, var4, var5, var31.orientationB)) { var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method1263(var7, var4, var5, var13.renderable1.height)) { + if (var13 != null && !this.method1285(var7, var4, var5, var13.renderable1.height)) { if ((var13.orientation & var11) != 0) { var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.z - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); } else if (var13.orientation == 256) { @@ -1524,7 +1524,7 @@ void drawTile(Tile var1, boolean var2) { var20 = true; for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1995) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2014) { var20 = false; break; } @@ -1532,7 +1532,7 @@ void drawTile(Tile var1, boolean var2) { if (var20) { var10 = var3.boundaryObject; - if (!this.method1262(var7, var4, var5, var10.orientationA)) { + if (!this.method1284(var7, var4, var5, var10.orientationA)) { var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.z - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } @@ -1579,7 +1579,7 @@ void drawTile(Tile var1, boolean var2) { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field1991) { + if ((var16 & var36.drawGameObjectEdges) == var3.field2018) { var3.drawGameObjects = true; continue label563; } @@ -1597,9 +1597,9 @@ void drawTile(Tile var1, boolean var2) { var15 = Scene_cameraYTile - var12.startY; var16 = var12.endY - Scene_cameraYTile; if (var16 > var15) { - var12.field2282 = var24 + var16; + var12.field2306 = var24 + var16; } else { - var12.field2282 = var24 + var15; + var12.field2306 = var24 + var15; } } } @@ -1611,10 +1611,10 @@ void drawTile(Tile var1, boolean var2) { for (var24 = 0; var24 < var21; ++var24) { GameObject var35 = gameObjects[var24]; if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field2282 > var11) { - var11 = var35.field2282; + if (var35.field2306 > var11) { + var11 = var35.field2306; var25 = var24; - } else if (var11 == var35.field2282) { + } else if (var11 == var35.field2306) { var15 = var35.centerX - Scene_cameraX; var16 = var35.centerY - Scene_cameraZ; var17 = gameObjects[var25].centerX - Scene_cameraX; @@ -1632,7 +1632,7 @@ void drawTile(Tile var1, boolean var2) { GameObject var33 = gameObjects[var25]; var33.lastDrawn = Scene_drawnCount; - if (!this.method1264(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { + if (!this.method1286(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } @@ -1704,10 +1704,10 @@ void drawTile(Tile var1, boolean var2) { } } - if (var3.field1993 != 0) { + if (var3.field2022 != 0) { WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method1263(var7, var4, var5, var29.renderable1.height)) { - if ((var29.orientation & var3.field1993) != 0) { + if (var29 != null && !this.method1285(var7, var4, var5, var29.renderable1.height)) { + if ((var29.orientation & var3.field2022) != 0) { var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.z - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); } else if (var29.orientation == 256) { var11 = var29.x - Scene_cameraX; @@ -1736,11 +1736,11 @@ void drawTile(Tile var1, boolean var2) { BoundaryObject var27 = var3.boundaryObject; if (var27 != null) { - if ((var27.orientationB & var3.field1993) != 0 && !this.method1262(var7, var4, var5, var27.orientationB)) { + if ((var27.orientationB & var3.field2022) != 0 && !this.method1284(var7, var4, var5, var27.orientationB)) { var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field1993) != 0 && !this.method1262(var7, var4, var5, var27.orientationA)) { + if ((var27.orientationA & var3.field2022) != 0 && !this.method1284(var7, var4, var5, var27.orientationA)) { var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } @@ -1784,9 +1784,9 @@ void drawTile(Tile var1, boolean var2) { } } - @ObfuscatedName("bh") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(Ljl;IIIIIII)V" + descriptor = "(Ljg;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -1837,18 +1837,18 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var int var27 = Rasterizer3D.getClipMidY() + var19 * Rasterizer3D.get3dZoom() / var16; int var28 = Rasterizer3D.getClipMidX() + var9 * Rasterizer3D.get3dZoom() / var15; int var29 = Rasterizer3D.getClipMidY() + var21 * Rasterizer3D.get3dZoom() / var15; - float var30 = Strings.method1841(var12); - float var31 = Strings.method1841(var11); - float var32 = Strings.method1841(var16); - float var33 = Strings.method1841(var15); - Rasterizer3D.clips.field2248 = 0; + float var30 = AbstractWorldMapIcon.method1556(var12); + float var31 = AbstractWorldMapIcon.method1556(var11); + float var32 = AbstractWorldMapIcon.method1556(var16); + float var33 = AbstractWorldMapIcon.method1556(var15); + Rasterizer3D.clips.field2275 = 0; int var34; int var35; if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.clips.field2241 = false; - var34 = Rasterizer3D.method1174(); + Rasterizer3D.clips.field2268 = false; + var34 = Rasterizer3D.method1197(); if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > var34 || var28 > var34 || var24 > var34) { - Rasterizer3D.clips.field2241 = true; + Rasterizer3D.clips.field2268 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { @@ -1858,25 +1858,25 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var if (var1.texture == -1) { if (var1.neColor != 12345678) { - Rasterizer3D.method1181(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor); + Rasterizer3D.method1204(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor); } } else if (!Scene_isLowDetail) { if (var1.isFlat) { - Rasterizer3D.method1184(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); + Rasterizer3D.method1207(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - Rasterizer3D.method1184(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); + Rasterizer3D.method1207(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); } } else { var35 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method1181(var27, var29, var25, var26, var28, var24, var32, var33, var31, method1258(var35, var1.neColor), method1258(var35, var1.nwColor), method1258(var35, var1.seColor)); + Rasterizer3D.method1204(var27, var29, var25, var26, var28, var24, var32, var33, var31, method1280(var35, var1.neColor), method1280(var35, var1.nwColor), method1280(var35, var1.seColor)); } } if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.clips.field2241 = false; - var34 = Rasterizer3D.method1174(); + Rasterizer3D.clips.field2268 = false; + var34 = Rasterizer3D.method1197(); if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > var34 || var24 > var34 || var28 > var34) { - Rasterizer3D.clips.field2241 = true; + Rasterizer3D.clips.field2268 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { @@ -1886,13 +1886,13 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var if (var1.texture == -1) { if (var1.swColor != 12345678) { - Rasterizer3D.method1181(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor); + Rasterizer3D.method1204(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor); } } else if (!Scene_isLowDetail) { - Rasterizer3D.method1184(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); + Rasterizer3D.method1207(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { var35 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method1181(var23, var25, var29, var22, var24, var28, var30, var31, var33, method1258(var35, var1.swColor), method1258(var35, var1.seColor), method1258(var35, var1.nwColor)); + Rasterizer3D.method1204(var23, var25, var29, var22, var24, var28, var30, var31, var33, method1280(var35, var1.swColor), method1280(var35, var1.seColor), method1280(var35, var1.nwColor)); } } @@ -1902,9 +1902,9 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var } } - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(Lju;IIIIII)V" + descriptor = "(Ljv;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -1929,37 +1929,37 @@ void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5 } if (var1.triangleTextureId != null) { - SceneTileModel.field2126[var9] = var10; - SceneTileModel.field2128[var9] = var13; - SceneTileModel.field2125[var9] = var12; + SceneTileModel.field2154[var9] = var10; + SceneTileModel.field2152[var9] = var13; + SceneTileModel.field2153[var9] = var12; } - SceneTileModel.field2129[var9] = Rasterizer3D.getClipMidX() + var10 * Rasterizer3D.get3dZoom() / var12; - SceneTileModel.field2127[var9] = Rasterizer3D.getClipMidY() + var13 * Rasterizer3D.get3dZoom() / var12; - SceneTileModel.field2124[var9] = Strings.method1841(var12); + SceneTileModel.field2150[var9] = Rasterizer3D.getClipMidX() + var10 * Rasterizer3D.get3dZoom() / var12; + SceneTileModel.field2151[var9] = Rasterizer3D.getClipMidY() + var13 * Rasterizer3D.get3dZoom() / var12; + SceneTileModel.field2149[var9] = AbstractWorldMapIcon.method1556(var12); } - Rasterizer3D.clips.field2248 = 0; + Rasterizer3D.clips.field2275 = 0; var8 = var1.faceX.length; for (var9 = 0; var9 < var8; ++var9) { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = SceneTileModel.field2129[var10]; - int var14 = SceneTileModel.field2129[var11]; - int var15 = SceneTileModel.field2129[var12]; - int var16 = SceneTileModel.field2127[var10]; - int var17 = SceneTileModel.field2127[var11]; - int var18 = SceneTileModel.field2127[var12]; - float var19 = SceneTileModel.field2124[var10]; - float var20 = SceneTileModel.field2124[var11]; - float var21 = SceneTileModel.field2124[var12]; + var13 = SceneTileModel.field2150[var10]; + int var14 = SceneTileModel.field2150[var11]; + int var15 = SceneTileModel.field2150[var12]; + int var16 = SceneTileModel.field2151[var10]; + int var17 = SceneTileModel.field2151[var11]; + int var18 = SceneTileModel.field2151[var12]; + float var19 = SceneTileModel.field2149[var10]; + float var20 = SceneTileModel.field2149[var11]; + float var21 = SceneTileModel.field2149[var12]; if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.clips.field2241 = false; - int var22 = Rasterizer3D.method1174(); + Rasterizer3D.clips.field2268 = false; + int var22 = Rasterizer3D.method1197(); if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > var22 || var14 > var22 || var15 > var22) { - Rasterizer3D.clips.field2241 = true; + Rasterizer3D.clips.field2268 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { @@ -1970,23 +1970,23 @@ void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5 if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { if (!Scene_isLowDetail) { if (var1.isFlat) { - Rasterizer3D.method1184(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2126[0], SceneTileModel.field2126[1], SceneTileModel.field2126[3], SceneTileModel.field2128[0], SceneTileModel.field2128[1], SceneTileModel.field2128[3], SceneTileModel.field2125[0], SceneTileModel.field2125[1], SceneTileModel.field2125[3], var1.triangleTextureId[var9]); + Rasterizer3D.method1207(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2154[0], SceneTileModel.field2154[1], SceneTileModel.field2154[3], SceneTileModel.field2152[0], SceneTileModel.field2152[1], SceneTileModel.field2152[3], SceneTileModel.field2153[0], SceneTileModel.field2153[1], SceneTileModel.field2153[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.method1184(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2126[var10], SceneTileModel.field2126[var11], SceneTileModel.field2126[var12], SceneTileModel.field2128[var10], SceneTileModel.field2128[var11], SceneTileModel.field2128[var12], SceneTileModel.field2125[var10], SceneTileModel.field2125[var11], SceneTileModel.field2125[var12], var1.triangleTextureId[var9]); + Rasterizer3D.method1207(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2154[var10], SceneTileModel.field2154[var11], SceneTileModel.field2154[var12], SceneTileModel.field2152[var10], SceneTileModel.field2152[var11], SceneTileModel.field2152[var12], SceneTileModel.field2153[var10], SceneTileModel.field2153[var11], SceneTileModel.field2153[var12], var1.triangleTextureId[var9]); } } else { int var23 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method1181(var16, var17, var18, var13, var14, var15, var19, var20, var21, method1258(var23, var1.triangleColorA[var9]), method1258(var23, var1.triangleColorB[var9]), method1258(var23, var1.triangleColorC[var9])); + Rasterizer3D.method1204(var16, var17, var18, var13, var14, var15, var19, var20, var21, method1280(var23, var1.triangleColorA[var9]), method1280(var23, var1.triangleColorB[var9]), method1280(var23, var1.triangleColorC[var9])); } } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method1181(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + Rasterizer3D.method1204(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } } - @ObfuscatedName("by") + @ObfuscatedName("bw") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; @@ -2025,20 +2025,20 @@ void occlude() { if (var13) { var9 = Scene_cameraX - var4.minX; if (var9 > 32) { - var4.field2110 = 1; + var4.field2137 = 1; } else { if (var9 >= -32) { continue; } - var4.field2110 = 2; + var4.field2137 = 2; var9 = -var9; } - var4.field2099 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field2111 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field2101 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2100 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field2138 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field2125 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field2130 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2133 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2067,20 +2067,20 @@ void occlude() { if (var13) { var9 = Scene_cameraZ - var4.minZ; if (var9 > 32) { - var4.field2110 = 3; + var4.field2137 = 3; } else { if (var9 >= -32) { continue; } - var4.field2110 = 4; + var4.field2137 = 4; var9 = -var9; } - var4.field2103 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field2114 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field2101 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2100 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field2132 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field2134 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field2130 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2133 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2121,11 +2121,11 @@ void occlude() { } if (var10) { - var4.field2110 = 5; - var4.field2103 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field2114 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field2099 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field2111 = (var4.maxZ - Scene_cameraZ << 8) / var5; + var4.field2137 = 5; + var4.field2132 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field2134 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field2138 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field2125 = (var4.maxZ - Scene_cameraZ << 8) / var5; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2135,9 +2135,9 @@ void occlude() { } - @ObfuscatedName("bg") - boolean method1261(int var1, int var2, int var3) { - int var4 = this.field2083[var1][var2][var3]; + @ObfuscatedName("bc") + boolean method1283(int var1, int var2, int var3) { + int var4 = this.field2109[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; } else if (var4 == Scene_drawnCount) { @@ -2145,19 +2145,19 @@ boolean method1261(int var1, int var2, int var3) { } else { int var5 = var2 << 7; int var6 = var3 << 7; - if (this.method1265(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method1265(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method1265(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method1265(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field2083[var1][var2][var3] = Scene_drawnCount; + if (this.method1287(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method1287(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method1287(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method1287(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field2109[var1][var2][var3] = Scene_drawnCount; return true; } else { - this.field2083[var1][var2][var3] = -Scene_drawnCount; + this.field2109[var1][var2][var3] = -Scene_drawnCount; return false; } } } - @ObfuscatedName("bj") - boolean method1262(int var1, int var2, int var3, int var4) { - if (!this.method1261(var1, var2, var3)) { + @ObfuscatedName("bg") + boolean method1284(int var1, int var2, int var3, int var4) { + if (!this.method1283(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; @@ -2169,30 +2169,30 @@ boolean method1262(int var1, int var2, int var3, int var4) { if (var4 < 16) { if (var4 == 1) { if (var5 > Scene_cameraX) { - if (!this.method1265(var5, var7, var6)) { + if (!this.method1287(var5, var7, var6)) { return false; } - if (!this.method1265(var5, var7, var6 + 128)) { + if (!this.method1287(var5, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method1265(var5, var8, var6)) { + if (!this.method1287(var5, var8, var6)) { return false; } - if (!this.method1265(var5, var8, var6 + 128)) { + if (!this.method1287(var5, var8, var6 + 128)) { return false; } } - if (!this.method1265(var5, var9, var6)) { + if (!this.method1287(var5, var9, var6)) { return false; } - if (!this.method1265(var5, var9, var6 + 128)) { + if (!this.method1287(var5, var9, var6 + 128)) { return false; } @@ -2201,30 +2201,30 @@ boolean method1262(int var1, int var2, int var3, int var4) { if (var4 == 2) { if (var6 < Scene_cameraZ) { - if (!this.method1265(var5, var7, var6 + 128)) { + if (!this.method1287(var5, var7, var6 + 128)) { return false; } - if (!this.method1265(var5 + 128, var7, var6 + 128)) { + if (!this.method1287(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method1265(var5, var8, var6 + 128)) { + if (!this.method1287(var5, var8, var6 + 128)) { return false; } - if (!this.method1265(var5 + 128, var8, var6 + 128)) { + if (!this.method1287(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method1265(var5, var9, var6 + 128)) { + if (!this.method1287(var5, var9, var6 + 128)) { return false; } - if (!this.method1265(var5 + 128, var9, var6 + 128)) { + if (!this.method1287(var5 + 128, var9, var6 + 128)) { return false; } @@ -2233,30 +2233,30 @@ boolean method1262(int var1, int var2, int var3, int var4) { if (var4 == 4) { if (var5 < Scene_cameraX) { - if (!this.method1265(var5 + 128, var7, var6)) { + if (!this.method1287(var5 + 128, var7, var6)) { return false; } - if (!this.method1265(var5 + 128, var7, var6 + 128)) { + if (!this.method1287(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method1265(var5 + 128, var8, var6)) { + if (!this.method1287(var5 + 128, var8, var6)) { return false; } - if (!this.method1265(var5 + 128, var8, var6 + 128)) { + if (!this.method1287(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method1265(var5 + 128, var9, var6)) { + if (!this.method1287(var5 + 128, var9, var6)) { return false; } - if (!this.method1265(var5 + 128, var9, var6 + 128)) { + if (!this.method1287(var5 + 128, var9, var6 + 128)) { return false; } @@ -2265,30 +2265,30 @@ boolean method1262(int var1, int var2, int var3, int var4) { if (var4 == 8) { if (var6 > Scene_cameraZ) { - if (!this.method1265(var5, var7, var6)) { + if (!this.method1287(var5, var7, var6)) { return false; } - if (!this.method1265(var5 + 128, var7, var6)) { + if (!this.method1287(var5 + 128, var7, var6)) { return false; } } if (var1 > 0) { - if (!this.method1265(var5, var8, var6)) { + if (!this.method1287(var5, var8, var6)) { return false; } - if (!this.method1265(var5 + 128, var8, var6)) { + if (!this.method1287(var5 + 128, var8, var6)) { return false; } } - if (!this.method1265(var5, var9, var6)) { + if (!this.method1287(var5, var9, var6)) { return false; } - if (!this.method1265(var5 + 128, var9, var6)) { + if (!this.method1287(var5 + 128, var9, var6)) { return false; } @@ -2296,49 +2296,49 @@ boolean method1262(int var1, int var2, int var3, int var4) { } } - if (!this.method1265(var5 + 64, var10, var6 + 64)) { + if (!this.method1287(var5 + 64, var10, var6 + 64)) { return false; } else if (var4 == 16) { - return this.method1265(var5, var9, var6 + 128); + return this.method1287(var5, var9, var6 + 128); } else if (var4 == 32) { - return this.method1265(var5 + 128, var9, var6 + 128); + return this.method1287(var5 + 128, var9, var6 + 128); } else if (var4 == 64) { - return this.method1265(var5 + 128, var9, var6); + return this.method1287(var5 + 128, var9, var6); } else if (var4 == 128) { - return this.method1265(var5, var9, var6); + return this.method1287(var5, var9, var6); } else { return true; } } } - @ObfuscatedName("ct") - boolean method1263(int var1, int var2, int var3, int var4) { - if (!this.method1261(var1, var2, var3)) { + @ObfuscatedName("cw") + boolean method1285(int var1, int var2, int var3, int var4) { + if (!this.method1283(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; int var6 = var3 << 7; - return this.method1265(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method1265(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method1265(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method1265(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + return this.method1287(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method1287(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method1287(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method1287(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } } @ObfuscatedName("cf") - boolean method1264(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method1286(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; if (var3 == var2 && var5 == var4) { - if (!this.method1261(var1, var2, var4)) { + if (!this.method1283(var1, var2, var4)) { return false; } else { var7 = var2 << 7; var8 = var4 << 7; - return this.method1265(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method1265(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method1265(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method1265(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + return this.method1287(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method1287(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method1287(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method1287(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); } } else { for (var7 = var2; var7 <= var3; ++var7) { for (var8 = var4; var8 <= var5; ++var8) { - if (this.field2083[var1][var7][var8] == -Scene_drawnCount) { + if (this.field2109[var1][var7][var8] == -Scene_drawnCount) { return false; } } @@ -2347,17 +2347,17 @@ boolean method1264(int var1, int var2, int var3, int var4, int var5, int var6) { var7 = (var2 << 7) + 1; var8 = (var4 << 7) + 2; int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method1265(var7, var9, var8)) { + if (!this.method1287(var7, var9, var8)) { return false; } else { int var10 = (var3 << 7) - 1; - if (!this.method1265(var10, var9, var8)) { + if (!this.method1287(var10, var9, var8)) { return false; } else { int var11 = (var5 << 7) - 1; - if (!this.method1265(var7, var9, var11)) { + if (!this.method1287(var7, var9, var11)) { return false; - } else if (!this.method1265(var10, var9, var11)) { + } else if (!this.method1287(var10, var9, var11)) { return false; } else { return true; @@ -2367,8 +2367,8 @@ boolean method1264(int var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("cz") - boolean method1265(int var1, int var2, int var3) { + @ObfuscatedName("cm") + boolean method1287(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; int var6; @@ -2376,57 +2376,57 @@ boolean method1265(int var1, int var2, int var3) { int var8; int var9; int var10; - if (var5.field2110 == 1) { + if (var5.field2137 == 1) { var6 = var5.minX - var1; if (var6 > 0) { - var7 = (var6 * var5.field2099 >> 8) + var5.minZ; - var8 = (var6 * var5.field2111 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2101 >> 8) + var5.minY; - var10 = (var6 * var5.field2100 >> 8) + var5.maxY; + var7 = (var6 * var5.field2138 >> 8) + var5.minZ; + var8 = (var6 * var5.field2125 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2130 >> 8) + var5.minY; + var10 = (var6 * var5.field2133 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2110 == 2) { + } else if (var5.field2137 == 2) { var6 = var1 - var5.minX; if (var6 > 0) { - var7 = (var6 * var5.field2099 >> 8) + var5.minZ; - var8 = (var6 * var5.field2111 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2101 >> 8) + var5.minY; - var10 = (var6 * var5.field2100 >> 8) + var5.maxY; + var7 = (var6 * var5.field2138 >> 8) + var5.minZ; + var8 = (var6 * var5.field2125 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2130 >> 8) + var5.minY; + var10 = (var6 * var5.field2133 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2110 == 3) { + } else if (var5.field2137 == 3) { var6 = var5.minZ - var3; if (var6 > 0) { - var7 = (var6 * var5.field2103 >> 8) + var5.minX; - var8 = (var6 * var5.field2114 >> 8) + var5.maxX; - var9 = (var6 * var5.field2101 >> 8) + var5.minY; - var10 = (var6 * var5.field2100 >> 8) + var5.maxY; + var7 = (var6 * var5.field2132 >> 8) + var5.minX; + var8 = (var6 * var5.field2134 >> 8) + var5.maxX; + var9 = (var6 * var5.field2130 >> 8) + var5.minY; + var10 = (var6 * var5.field2133 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2110 == 4) { + } else if (var5.field2137 == 4) { var6 = var3 - var5.minZ; if (var6 > 0) { - var7 = (var6 * var5.field2103 >> 8) + var5.minX; - var8 = (var6 * var5.field2114 >> 8) + var5.maxX; - var9 = (var6 * var5.field2101 >> 8) + var5.minY; - var10 = (var6 * var5.field2100 >> 8) + var5.maxY; + var7 = (var6 * var5.field2132 >> 8) + var5.minX; + var8 = (var6 * var5.field2134 >> 8) + var5.maxX; + var9 = (var6 * var5.field2130 >> 8) + var5.minY; + var10 = (var6 * var5.field2133 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2110 == 5) { + } else if (var5.field2137 == 5) { var6 = var2 - var5.minY; if (var6 > 0) { - var7 = (var6 * var5.field2103 >> 8) + var5.minX; - var8 = (var6 * var5.field2114 >> 8) + var5.maxX; - var9 = (var6 * var5.field2099 >> 8) + var5.minZ; - var10 = (var6 * var5.field2111 >> 8) + var5.maxZ; + var7 = (var6 * var5.field2132 >> 8) + var5.minX; + var8 = (var6 * var5.field2134 >> 8) + var5.maxX; + var9 = (var6 * var5.field2138 >> 8) + var5.minZ; + var10 = (var6 * var5.field2125 >> 8) + var5.maxZ; if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } @@ -2437,7 +2437,7 @@ boolean method1265(int var1, int var2, int var3) { return false; } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { Occluder var8 = new Occluder(); @@ -2455,7 +2455,7 @@ public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; } - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; @@ -2488,7 +2488,7 @@ public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int v boolean var14 = false; for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method1249(var12, var0[var8] + var15, var13)) { + if (method1271(var12, var0[var8] + var15, var13)) { var14 = true; break; } @@ -2539,8 +2539,8 @@ public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int v } - @ObfuscatedName("be") - static boolean method1249(int var0, int var1, int var2) { + @ObfuscatedName("bl") + static boolean method1271(int var0, int var1, int var2) { int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; @@ -2554,20 +2554,20 @@ static boolean method1249(int var0, int var1, int var2) { } } - @ObfuscatedName("bu") + @ObfuscatedName("bo") @Export("shouldSendWalk") public static boolean shouldSendWalk() { return viewportWalking && Scene_selectedX != -1; } - @ObfuscatedName("bk") - public static void method1253() { + @ObfuscatedName("bb") + public static void method1275() { Scene_selectedX = -1; viewportWalking = false; } - @ObfuscatedName("bl") - static final int method1258(int var0, int var1) { + @ObfuscatedName("bx") + static final int method1280(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2578,7 +2578,7 @@ static final int method1258(int var0, int var1) { return (var0 & 65408) + var1; } - @ObfuscatedName("bt") + @ObfuscatedName("bn") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 < var2 && var1 < var3 && var1 < var4) { @@ -2604,4 +2604,4 @@ static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SceneTileModel.java b/osrs/src/main/java/SceneTileModel.java index 81e1614e2..402ecdafa 100644 --- a/osrs/src/main/java/SceneTileModel.java +++ b/osrs/src/main/java/SceneTileModel.java @@ -2,79 +2,80 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ju") +@ObfuscatedName("jv") @Implements("SceneTileModel") public final class SceneTileModel { - @ObfuscatedName("au") - static int[] field2129; - @ObfuscatedName("ae") - static int[] field2127; @ObfuscatedName("ab") - static float[] field2124; - @ObfuscatedName("ad") - static int[] field2126; - @ObfuscatedName("ao") - static int[] field2128; - @ObfuscatedName("ac") - static int[] field2125; - @ObfuscatedName("ak") - static final int[][] field2130; - @ObfuscatedName("an") - static final int[][] field2131; - @ObfuscatedName("aw") + static int[] field2150; + @ObfuscatedName("ag") + static int[] field2151; + @ObfuscatedName("am") + static float[] field2149; + @ObfuscatedName("ax") + static int[] field2154; + @ObfuscatedName("ah") + static int[] field2152; + @ObfuscatedName("as") + static int[] field2153; + @ObfuscatedName("ay") + static final int[][] field2156; + @ObfuscatedName("aj") + static final int[][] field2155; + @ObfuscatedName("au") @Export("vertexX") int[] vertexX; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("vertexY") int[] vertexY; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("faceX") int[] faceX; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("faceY") int[] faceY; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("faceZ") int[] faceZ; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("aq") + @ObfuscatedName("ad") + @Export("isFlat") boolean isFlat; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("shape") int shape; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("rotation") int rotation; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("overlayRgb") int overlayRgb; static { - field2129 = new int[6]; - field2127 = new int[6]; - field2124 = new float[6]; - field2126 = new int[6]; - field2128 = new int[6]; - field2125 = new int[6]; - field2130 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; - field2131 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; + field2150 = new int[6]; + field2151 = new int[6]; + field2149 = new float[6]; + field2154 = new int[6]; + field2152 = new int[6]; + field2153 = new int[6]; + field2156 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; + field2155 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -91,7 +92,7 @@ public final class SceneTileModel { int var21 = var20 / 2; int var22 = var20 / 4; int var23 = var20 * 3 / 4; - int[] var24 = field2130[var1]; + int[] var24 = field2156[var1]; int var25 = var24.length; this.vertexX = new int[var25]; this.vertexY = new int[var25]; @@ -226,7 +227,7 @@ public final class SceneTileModel { var27[var30] = var36; } - int[] var38 = field2131[var1]; + int[] var38 = field2155[var1]; var31 = var38.length / 4; this.faceX = new int[var31]; this.faceY = new int[var31]; @@ -307,4 +308,4 @@ public final class SceneTileModel { var33 /= 14; var34 /= 14; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SceneTilePaint.java b/osrs/src/main/java/SceneTilePaint.java index 490980319..62d7f0745 100644 --- a/osrs/src/main/java/SceneTilePaint.java +++ b/osrs/src/main/java/SceneTilePaint.java @@ -2,29 +2,41 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("jl") +import java.io.*; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +@ObfuscatedName("jg") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("aw") + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lmi;" + ) + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("au") @Export("swColor") int swColor; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("seColor") int seColor; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("neColor") int neColor; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("nwColor") int nwColor; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("texture") int texture; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("isFlat") boolean isFlat; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("rgb") int rgb; @@ -39,12 +51,130 @@ public final class SceneTilePaint { this.isFlat = var7; } - @ObfuscatedName("hf") + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(ILru;Lnk;B)V", + garbageValue = "7" + ) + static void method1350(int var0, ArchiveDisk var1, Archive var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 1; + var3.key = (long)var0; + var3.archiveDisk = var1; + var3.archive = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); + } + + UserComparator8.method671(); + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Lto;I)V", + garbageValue = "1309449245" + ) + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class36.reflectionChecks.last(); + if (var1 != null) { + int var2 = var0.offset; + var0.writeInt(var1.id); + + for (int var3 = 0; var3 < var1.size; ++var3) { + if (var1.creationErrors[var3] != 0) { + var0.writeByte(var1.creationErrors[var3]); + } else { + try { + int var4 = var1.operations[var3]; + Field var5; + int var6; + if (var4 == 0) { + var5 = var1.fields[var3]; + var6 = Reflection.getInt(var5, (Object)null); + var0.writeByte(0); + var0.writeInt(var6); + } else if (var4 == 1) { + var5 = var1.fields[var3]; + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); + var0.writeByte(0); + } else if (var4 == 2) { + var5 = var1.fields[var3]; + var6 = var5.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + + Method var25; + if (var4 != 3) { + if (var4 == 4) { + var25 = var1.methods[var3]; + var6 = var25.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + } else { + var25 = var1.methods[var3]; + byte[][] var10 = var1.arguments[var3]; + Object[] var7 = new Object[var10.length]; + + for (int var8 = 0; var8 < var10.length; ++var8) { + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); + var7[var8] = var9.readObject(); + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); + if (var11 == null) { + var0.writeByte(0); + } else if (var11 instanceof Number) { + var0.writeByte(1); + var0.writeLong(((Number)var11).longValue()); + } else if (var11 instanceof String) { + var0.writeByte(2); + var0.writeStringCp1252NullTerminated((String)var11); + } else { + var0.writeByte(4); + } + } + } catch (ClassNotFoundException var13) { + var0.writeByte(-10); + } catch (InvalidClassException var14) { + var0.writeByte(-11); + } catch (StreamCorruptedException var15) { + var0.writeByte(-12); + } catch (OptionalDataException var16) { + var0.writeByte(-13); + } catch (IllegalAccessException var17) { + var0.writeByte(-14); + } catch (IllegalArgumentException var18) { + var0.writeByte(-15); + } catch (InvocationTargetException var19) { + var0.writeByte(-16); + } catch (SecurityException var20) { + var0.writeByte(-17); + } catch (IOException var21) { + var0.writeByte(-18); + } catch (NullPointerException var22) { + var0.writeByte(-19); + } catch (Exception var23) { + var0.writeByte(-20); + } catch (Throwable var24) { + var0.writeByte(-21); + } + } + } + + var0.writeCrc(var2); + var1.remove(); + } + } + + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)Lih;", - garbageValue = "107" + descriptor = "(CI)C", + garbageValue = "1859445774" ) - public static class213 method1324() { - return Client.keyHandlerInstance; + static char method1352(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Script.java b/osrs/src/main/java/Script.java index 41fd49f89..1a592e071 100644 --- a/osrs/src/main/java/Script.java +++ b/osrs/src/main/java/Script.java @@ -3,46 +3,44 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dc") +import java.util.ArrayList; +import java.util.Iterator; + +@ObfuscatedName("dh") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("an") - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("gi") - static String field807; - @ObfuscatedName("ay") - String field815; - @ObfuscatedName("ar") + @ObfuscatedName("ae") + String field817; + @ObfuscatedName("ao") @Export("opcodes") int[] opcodes; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("intOperands") int[] intOperands; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("localIntCount") int localIntCount; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("localStringCount") int localStringCount; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "[Lsa;" + descriptor = "[Lsf;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -54,56 +52,59 @@ public class Script extends DualNode { Script() { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)[Lsa;", - garbageValue = "1100527320" + descriptor = "(II)[Lsf;", + garbageValue = "-723912201" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; } - @ObfuscatedName("ay") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1835095730" + descriptor = "(IIB)V", + garbageValue = "0" ) - public static boolean method449(char var0) { - if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { - return true; + public static void method445(int var0, int var1) { + class270.method1537(var0, var1, 0, 0); + class305.field2773.clear(); + class305.field2771.clear(); + if (class305.musicSongs.isEmpty() || var0 == 0 && var1 == 0) { + ByteArrayPool.method2148(); } else { - if (var0 != 0) { - char[] var1 = class385.cp1252AsciiExtension; + class305.field2771.add(new DelayFadeTask((SongTask)null, class305.musicPlayerStatus)); + class305.field2771.add(new FadeOutTask((SongTask)null, 0, false, class305.field2766)); + ArrayList var3 = new ArrayList(); + Iterator var4 = class305.musicSongs.iterator(); - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } + while (var4.hasNext()) { + MusicSong var5 = (MusicSong)var4.next(); + var3.add(var5); } - return false; + class305.field2771.add(new class401((SongTask)null, var3)); } + } - @ObfuscatedName("az") + @ObfuscatedName("hf") @ObfuscatedSignature( - descriptor = "(I)Luu;", - garbageValue = "-2099566519" + descriptor = "(II)V", + garbageValue = "-69260226" ) - static IndexedSprite method451() { - IndexedSprite var0 = new IndexedSprite(); - var0.width = class528.SpriteBuffer_spriteWidth; - var0.height = class528.SpriteBuffer_spriteHeight; - var0.xOffset = class492.SpriteBuffer_xOffsets[0]; - var0.yOffset = class134.SpriteBuffer_yOffsets[0]; - var0.subWidth = class172.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class528.SpriteBuffer_spriteHeights[0]; - var0.palette = class528.SpriteBuffer_spritePalette; - var0.pixels = ArchiveDiskAction.SpriteBuffer_pixels[0]; - DbTableType.method2483(); - return var0; + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + ArchiveDisk.logOut(); + switch(var0) { + case 1: + class463.method2343(); + break; + case 2: + PcmPlayer.method212(24); + class318.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ScriptEvent.java b/osrs/src/main/java/ScriptEvent.java index 1d96a3cff..7b64b9fd6 100644 --- a/osrs/src/main/java/ScriptEvent.java +++ b/osrs/src/main/java/ScriptEvent.java @@ -3,47 +3,47 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +@ObfuscatedName("dy") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("args") Object[] args; - @ObfuscatedName("ay") - boolean field859; - @ObfuscatedName("ar") + @ObfuscatedName("ae") + boolean field861; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmi;" ) @Export("widget") Widget widget; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("mouseX") int mouseX; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("mouseY") int mouseY; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("opIndex") int opIndex; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmi;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("keyTyped") int keyTyped; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("keyPressed") int keyPressed; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("targetName") String targetName; + @ObfuscatedName("ad") + int field864; @ObfuscatedName("aq") - int field862; - @ObfuscatedName("at") @Export("type") int type; @@ -51,99 +51,32 @@ public ScriptEvent() { this.type = 76; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "-720294865" + garbageValue = "-1709292397" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2065386179" + garbageValue = "693110805" ) @Export("setType") public void setType(int var1) { this.type = var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lmt;I)V", - garbageValue = "1544953462" + descriptor = "(Lmi;B)V", + garbageValue = "-48" ) - public void method474(Widget var1) { + public void method479(Widget var1) { this.widget = var1; } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Lty;IIIIIIB)V", - garbageValue = "1" - ) - @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = var1 >= 0 && var1 < 4 && var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104; - int var8; - if (var7) { - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - - while (true) { - var8 = var0.readUnsignedShort(); - if (var8 == 0) { - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -UserComparator10.method684(var4 + 932731, var5 + 556238) * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; - } - break; - } - - if (var8 == 1) { - int var9 = var0.readUnsignedByte(); - if (var9 == 1) { - var9 = 0; - } - - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var9 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var9 * 8; - } - break; - } - - if (var8 <= 49) { - Tiles.Tiles_overlays[var1][var2][var3] = (short)var0.readShort(); - class19.Tiles_shapes[var1][var2][var3] = (byte)((var8 - 2) / 4); - UserComparator10.field1180[var1][var2][var3] = (byte)(var8 - 2 + var6 & 3); - } else if (var8 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var8 - 49); - } else { - Tiles.Tiles_underlays[var1][var2][var3] = (short)(var8 - 81); - } - } - } else { - while (true) { - var8 = var0.readUnsignedShort(); - if (var8 == 0) { - break; - } - - if (var8 == 1) { - var0.readUnsignedByte(); - break; - } - - if (var8 <= 49) { - var0.readShort(); - } - } - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ScriptFrame.java b/osrs/src/main/java/ScriptFrame.java index f06b96a58..ee67dabe6 100644 --- a/osrs/src/main/java/ScriptFrame.java +++ b/osrs/src/main/java/ScriptFrame.java @@ -3,80 +3,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("cv") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lud;" - ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("aw") + @ObfuscatedName("ay") + static String field345; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ldc;" + descriptor = "Ldh;" ) @Export("script") Script script; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("pc") int pc; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("intLocals") int[] intLocals; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("stringLocals") String[] stringLocals; ScriptFrame() { this.pc = -1; } - - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-922438804" - ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (Login.loadInterface(var0)) { - Widget[] var1 = ArchiveLoader.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3.onLoad != null) { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onLoad; - UserComparator8.runScript(var4, 5000000, 0); - } - } - - } - } - } - - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-77" - ) - static final void method336() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.endCycle == -1) { - var0.startCycle = 0; - class11.method40(var0); - } else { - var0.remove(); - } - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ScriptOpcodes.java b/osrs/src/main/java/ScriptOpcodes.java new file mode 100644 index 000000000..a91a3cebd --- /dev/null +++ b/osrs/src/main/java/ScriptOpcodes.java @@ -0,0 +1,3 @@ +public class ScriptOpcodes { + public static final int RUNELITE_EXECUTE = 6599; +} \ No newline at end of file diff --git a/osrs/src/main/java/SecureRandomCallable.java b/osrs/src/main/java/SecureRandomCallable.java index fcc132c4d..9da41a22f 100644 --- a/osrs/src/main/java/SecureRandomCallable.java +++ b/osrs/src/main/java/SecureRandomCallable.java @@ -1,20 +1,29 @@ -import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.security.SecureRandom; +import java.util.concurrent.Callable; + +@ObfuscatedName("dn") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("oh") - static int field846; - @ObfuscatedName("tc") + @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "[Luk;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("iq") @ObfuscatedSignature( - descriptor = "Lbe;" + descriptor = "Lpi;" ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; + @Export("fontPlain12") + static Font fontPlain12; SecureRandomCallable() { } @@ -22,42 +31,234 @@ public class SecureRandomCallable implements Callable { @Export("call") @ObfuscatedName("call") public Object call() { - return WorldMapSection2.method1377(); + SecureRandom var2 = new SecureRandom(); + var2.nextInt(); + return var2; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "2007772558" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;III)V", + garbageValue = "297617664" ) - @Export("addImageTag") - static String addImageTag(int var0) { - return ""; - } + public static void method462(String var0, String var1, String var2, int var3, int var4) throws IOException { + if (var1 != null && !var1.isEmpty()) { + var0 = var0 + "-" + var1; + } - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "([FI)V", - garbageValue = "-1364633543" - ) - static void method462(float[] var0) { - if (var0[0] + class126.field1194 < 1.3333334F) { - float var1 = var0[0] - 2.0F; - float var2 = var0[0] - 1.0F; - float var3 = (float)Math.sqrt((double)(var1 * var1 - var2 * 4.0F * var2)); - float var4 = (-var1 + var3) * 0.5F; - if (class126.field1194 + var0[1] > var4) { - var0[1] = var4 - class126.field1194; - } else { - var4 = (-var1 - var3) * 0.5F; - if (var0[1] < class126.field1194 + var4) { - var0[1] = var4 + class126.field1194; + JagexCache.field1461 = var4; + JagexCache.cacheGamebuild = var3; + + try { + ScriptFrame.field345 = System.getProperty("os.name"); + } catch (Exception var31) { + ScriptFrame.field345 = "Unknown"; + } + + Messages.field1146 = ScriptFrame.field345.toLowerCase(); + class36.userHomeDirectory = null; + + try { + class36.userHomeDirectory = System.getProperty("jagex.userhome"); + } catch (Exception var30) { + } + + if (class36.userHomeDirectory == null) { + try { + class36.userHomeDirectory = System.getProperty("user.home"); + } catch (Exception var29) { + } + } + + if (class36.userHomeDirectory != null) { + class36.userHomeDirectory = class36.userHomeDirectory + "/"; + } + + try { + if (Messages.field1146.startsWith("win")) { + if (class36.userHomeDirectory == null) { + class36.userHomeDirectory = System.getenv("USERPROFILE"); } + } else if (class36.userHomeDirectory == null) { + class36.userHomeDirectory = System.getenv("HOME"); } - } else { - var0[0] = 1.3333334F - class126.field1194; - var0[1] = 0.33333334F - class126.field1194; + + if (class36.userHomeDirectory != null) { + class36.userHomeDirectory = class36.userHomeDirectory + "/"; + } + } catch (Exception var28) { + } + + if (class36.userHomeDirectory == null) { + class36.userHomeDirectory = "~/"; } + DelayFadeTask.field3712 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class36.userHomeDirectory, "/tmp/", ""}; + JagexCache.field1464 = new String[]{".jagex_cache_" + JagexCache.cacheGamebuild, ".file_store_" + JagexCache.cacheGamebuild}; + int var19 = 0; + + label233: + while (var19 < 4) { + String var7 = var19 == 0 ? "" : "" + var19; + JagexCache.field1463 = new File(class36.userHomeDirectory, "jagex_cl_" + var0 + "_" + var2 + var7 + ".dat"); + String var8 = null; + String var9 = null; + boolean var10 = false; + int var15; + File var36; + if (JagexCache.field1463.exists()) { + try { + AccessFile var11 = new AccessFile(JagexCache.field1463, "rw", 10000L); + + Buffer var12; + int var13; + for (var12 = new Buffer((int)var11.length()); var12.offset < var12.array.length; var12.offset += var13) { + var13 = var11.read(var12.array, var12.offset, var12.array.length - var12.offset); + if (var13 == -1) { + throw new IOException(); + } + } + + var12.offset = 0; + var13 = var12.readUnsignedByte(); + if (var13 < 1 || var13 > 3) { + throw new IOException("" + var13); + } + + int var14 = 0; + if (var13 > 1) { + var14 = var12.readUnsignedByte(); + } + + if (var13 <= 2) { + var8 = var12.readStringCp1252NullCircumfixed(); + if (var14 == 1) { + var9 = var12.readStringCp1252NullCircumfixed(); + } + } else { + var8 = var12.method2556(); + if (var14 == 1) { + var9 = var12.method2556(); + } + } + + var11.close(); + } catch (IOException var33) { + var33.printStackTrace(); + } + + if (var8 != null) { + var36 = new File(var8); + if (!var36.exists()) { + var8 = null; + } + } + + if (var8 != null) { + var36 = new File(var8, "test.dat"); + + boolean var38; + try { + RandomAccessFile var20 = new RandomAccessFile(var36, "rw"); + var15 = var20.read(); + var20.seek(0L); + var20.write(var15); + var20.seek(0L); + var20.close(); + var36.delete(); + var38 = true; + } catch (Exception var27) { + var38 = false; + } + + if (!var38) { + var8 = null; + } + } + } + + if (var8 == null && var19 == 0) { + label208: + for (int var21 = 0; var21 < JagexCache.field1464.length; ++var21) { + for (int var22 = 0; var22 < DelayFadeTask.field3712.length; ++var22) { + File var23 = new File(DelayFadeTask.field3712[var22] + JagexCache.field1464[var21] + File.separatorChar + var0 + File.separatorChar); + if (var23.exists() && Message.method340(new File(var23, "test.dat"), true)) { + var8 = var23.toString(); + var10 = true; + break label208; + } + } + } + } + + if (var8 == null) { + var8 = class36.userHomeDirectory + File.separatorChar + "jagexcache" + var7 + File.separatorChar + var0 + File.separatorChar + var2 + File.separatorChar; + var10 = true; + } + + if (var9 != null) { + File var35 = new File(var9); + var36 = new File(var8); + + try { + File[] var40 = var35.listFiles(); + File[] var39 = var40; + + for (var15 = 0; var15 < var39.length; ++var15) { + File var16 = var39[var15]; + File var17 = new File(var36, var16.getName()); + boolean var18 = var16.renameTo(var17); + if (!var18) { + throw new IOException(); + } + } + } catch (Exception var32) { + var32.printStackTrace(); + } + + var10 = true; + } + + if (var10) { + class165.method868(new File(var8), (File)null); + } + + File var6 = new File(var8); + JagexCache.cacheDir = var6; + if (!JagexCache.cacheDir.exists()) { + JagexCache.cacheDir.mkdirs(); + } + + File[] var34 = JagexCache.cacheDir.listFiles(); + if (var34 != null) { + File[] var37 = var34; + + for (int var24 = 0; var24 < var37.length; ++var24) { + File var25 = var37[var24]; + if (!Message.method340(var25, false)) { + ++var19; + continue label233; + } + } + } + break; + } + + File var5 = JagexCache.cacheDir; + FileSystem.FileSystem_cacheDir = var5; + if (!FileSystem.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; + FileSystem.method913(); + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class299.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class299.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + WallDecoration.JagexCache_idxFiles = new BufferedFile[JagexCache.field1461]; + + for (int var26 = 0; var26 < JagexCache.field1461; ++var26) { + WallDecoration.JagexCache_idxFiles[var26] = new BufferedFile(new AccessFile(class299.getFile("main_file_cache.idx" + var26), "rw", 1048576L), 6000, 0); + } + + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SecureRandomFuture.java b/osrs/src/main/java/SecureRandomFuture.java index 953453aa7..f68f3e275 100644 --- a/osrs/src/main/java/SecureRandomFuture.java +++ b/osrs/src/main/java/SecureRandomFuture.java @@ -1,21 +1,20 @@ -import java.security.SecureRandom; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.security.SecureRandom; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + @ObfuscatedName("cc") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("ud") - static int cameraMoveToAcceleration; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("executor") ExecutorService executor; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("future") Future future; @@ -24,10 +23,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "527623643" + garbageValue = "-2045980697" ) @Export("shutdown") void shutdown() { @@ -35,420 +34,255 @@ void shutdown() { this.executor = null; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "62920637" + garbageValue = "1770543009" ) @Export("isDone") boolean isDone() { return this.future.isDone(); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "-1723376644" + descriptor = "(B)Ljava/security/SecureRandom;", + garbageValue = "-53" ) @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); - } catch (Exception var2) { - return WorldMapSection2.method1377(); + } catch (Exception var4) { + SecureRandom var3 = new SecureRandom(); + var3.nextInt(); + return var3; } } - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILdc;ZB)I", - garbageValue = "49" + descriptor = "(Lnu;I)V", + garbageValue = "-1197212946" ) - static int method448(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var3 = VarbitComposition.getWidget(var4); + public static void method435(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Luy;" + ) + public static RunException method438(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { + var2 = (RunException)var0; + var2.field4291 = var2.field4291 + ' ' + var1; } else { - var3 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; + var2 = new RunException(var0, var1); } - int var10; - if (var0 == 1100) { - Interpreter.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3.type == 12) { - class330 var7 = var3.method1805(); - if (var7 != null && var7.method1703(var10, var6)) { - class200.invalidateWidget(var3); - } - } else { - var3.scrollX = var10; - if (var3.scrollX > var3.scrollWidth - var3.width) { - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { - var3.scrollX = 0; - } - - var3.scrollY = var6; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } + return var2; + } - if (var3.scrollY < 0) { - var3.scrollY = 0; - } + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(ILdh;ZS)I", + garbageValue = "-1442" + ) + static int method441(int var0, Script var1, boolean var2) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var4 = class92.getWidget(var3); + } else { + var4 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + } - class200.invalidateWidget(var3); + if (var0 == 1000) { + SoundCache.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + class218.invalidateWidget(var4); + class219.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var3 >> 16], var4, false); } return 1; - } else if (var0 == 1101) { - var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1102) { - var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1103) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1104) { - var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1105) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1106) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1107) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1108) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1109) { - Interpreter.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1110) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var10 != var3.sequenceId) { - var3.sequenceId = var10; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - class200.invalidateWidget(var3); + } else if (var0 == 1001) { + SoundCache.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + class218.invalidateWidget(var4); + class219.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var3 >> 16], var4, false); } return 1; - } else if (var0 == 1111) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1112) { - String var14 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - if (!var14.equals(var3.text)) { - var3.text = var14; - class200.invalidateWidget(var3); + } else if (var0 == 1003) { + boolean var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + class218.invalidateWidget(var4); } + return 1; + } else if (var0 == 1005) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1006) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; return 1; } else { - class330 var11; - if (var0 == 1113) { - var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3.type == 12) { - var11 = var3.method1805(); - if (var11 != null) { - var11.method1710(); - } - } + return 2; + } + } - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1114) { - Interpreter.Interpreter_intStackSize -= 3; - if (var3.type == 12) { - var11 = var3.method1805(); - if (var11 != null) { - var11.method1704(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - var11.method1705(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Ltm;IIIIIII)V", + garbageValue = "-1694412552" + ) + @Export("loadTerrain") + static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7; + if (class30.method116(var1, var2, var3)) { + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; + + while (true) { + var7 = var0.readUnsignedShort(); + if (var7 == 0) { + if (var1 == 0) { + int[] var8 = Tiles.Tiles_heights[0][var2]; + int var11 = var4 + 932731; + int var12 = var5 + 556238; + int var13 = class141.method765(var11 + 45365, 91923 + var12, 4) - 128 + (class141.method765(10294 + var11, var12 + 37821, 2) - 128 >> 1) + (class141.method765(var11, var12, 1) - 128 >> 2); + var13 = (int)((double)var13 * 0.3D) + 35; + if (var13 < 10) { + var13 = 10; + } else if (var13 > 60) { + var13 = 60; + } + + var8[var3] = -var13 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; } - } else { - var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + break; } - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1115) { - var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1116) { - var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1117) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1118) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1119) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1120) { - Interpreter.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - class200.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - SoundCache.revalidateWidgetScroll(ArchiveLoader.Widget_interfaceComponents[var4 >> 16], var3, false); - } + if (var7 == 1) { + int var14 = var0.readUnsignedByte(); + if (var14 == 1) { + var14 = 0; + } - return 1; - } else if (var0 == 1121) { - WorldMapArea.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1123) { - var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1125) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FillMode var12 = (FillMode)ClientPreferences.findEnumerated(ItemLayer.FillMode_values(), var10); - if (var12 != null) { - var3.fillMode = var12; - class200.invalidateWidget(var3); + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -var14 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var14 * 8; + } + break; } - return 1; - } else { - boolean var5; - if (var0 == 1126) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - var3.field2943 = var5; - return 1; - } else if (var0 == 1127) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else if (var0 == 1129) { - var3.field3073 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class200.invalidateWidget(var3); - return 1; - } else if (var0 == 1130) { - var3.method1789(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize], WorldMapLabel.urlRequester, PendingSpawn.method515()); - return 1; - } else if (var0 == 1131) { - Interpreter.Interpreter_intStackSize -= 2; - var3.method1792(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == 1132) { - var3.method1793(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; + if (var7 <= 49) { + class227.Tiles_overlays[var1][var2][var3] = (short)var0.readShort(); + class172.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); + ModelData0.field2282[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); } else { - class325 var13; - if (var0 == 1133) { - --Interpreter.Interpreter_intStackSize; - var13 = var3.method1806(); - if (var13 != null) { - var13.field2874 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1134) { - --Interpreter.Interpreter_intStackSize; - var13 = var3.method1806(); - if (var13 != null) { - var13.field2875 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1135) { - --Interpreter.Interpreter_stringStackSize; - var11 = var3.method1805(); - if (var11 != null) { - var3.text2 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - } - - return 1; - } else if (var0 == 1136) { - --Interpreter.Interpreter_intStackSize; - var13 = var3.method1806(); - if (var13 != null) { - var13.field2873 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - class200.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1137) { - --Interpreter.Interpreter_intStackSize; - var11 = var3.method1805(); - if (var11 != null && var11.method1700(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { - class200.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1138) { - --Interpreter.Interpreter_intStackSize; - var11 = var3.method1805(); - if (var11 != null && var11.method1701(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { - class200.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1139) { - --Interpreter.Interpreter_intStackSize; - var11 = var3.method1805(); - if (var11 != null && var11.method1702(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { - class200.invalidateWidget(var3); - } - - return 1; - } else { - class330 var9; - if (var0 == 1140) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Client.field594.method1071(); - var9 = var3.method1805(); - if (var9 != null && var9.method1694(var5)) { - if (var5) { - Client.field594.method1069(var3); - } - - class200.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1141) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (!var5 && Client.field594.method1070() == var3) { - Client.field594.method1071(); - class200.invalidateWidget(var3); - } - - var9 = var3.method1805(); - if (var9 != null) { - var9.method1695(var5); - } + Tiles.Tiles_underlays[var1][var2][var3] = (short)(var7 - 81); + } + } + } else { + while (true) { + var7 = var0.readUnsignedShort(); + if (var7 == 0) { + break; + } - return 1; - } else if (var0 == 1142) { - Interpreter.Interpreter_intStackSize -= 2; - var11 = var3.method1805(); - if (var11 != null && var11.method1718(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1])) { - class200.invalidateWidget(var3); - } + if (var7 == 1) { + var0.readUnsignedByte(); + break; + } - return 1; - } else if (var0 == 1143) { - --Interpreter.Interpreter_intStackSize; - var11 = var3.method1805(); - if (var11 != null && var11.method1718(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { - class200.invalidateWidget(var3); - } + if (var7 <= 49) { + var0.readShort(); + } + } + } - return 1; - } else if (var0 == 1144) { - --Interpreter.Interpreter_intStackSize; - var11 = var3.method1805(); - if (var11 != null) { - var11.method1707(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - class200.invalidateWidget(var3); - } + } - return 1; - } else if (var0 == 1145) { - --Interpreter.Interpreter_intStackSize; - var11 = var3.method1805(); - if (var11 != null) { - var11.method1706(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - } + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-760322108" + ) + public static int method439(int var0, int var1) { + int var2 = var0 >>> 31; + return (var0 + var2) / var1 - var2; + } - return 1; - } else if (var0 == 1146) { - --Interpreter.Interpreter_intStackSize; - var11 = var3.method1805(); - if (var11 != null) { - var11.method1709(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - } + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(ILdh;ZB)I", + garbageValue = "-52" + ) + static int method442(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + if (var0 == 1800) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = HealthBarDefinition.Widget_unpackTargetMask(NewShit.getWidgetFlags(var3)); + return 1; + } else if (var0 != 1801) { + if (var0 == 1802) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.dataText; + } - return 1; - } else if (var0 == 1147) { - --Interpreter.Interpreter_intStackSize; - var11 = var3.method1805(); - if (var11 != null) { - var11.method1708(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - class200.invalidateWidget(var3); - } + return 1; + } else { + return 2; + } + } else { + int var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } - return 1; - } else { - class27 var8; - if (var0 == 1148) { - Interpreter.Interpreter_intStackSize -= 2; - var8 = var3.method1807(); - if (var8 != null) { - var8.method102(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - } + return 1; + } + } - return 1; - } else if (var0 == 1149) { - Interpreter.Interpreter_intStackSize -= 2; - var8 = var3.method1807(); - if (var8 != null) { - var8.method103((char)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - } + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "(Ldr;II)V", + garbageValue = "1880526861" + ) + static final void method443(Actor var0, int var1) { + HealthBar.worldToScreen(var0.x, var0.y, var1); + } - return 1; - } else if (var0 == 1150) { - var3.method1790(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize], WorldMapLabel.urlRequester); - return 1; - } else { - return 2; - } - } - } - } - } - } + @ObfuscatedName("ou") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1763932419" + ) + static void method444(boolean var0) { + Client.leftClickOpensMenu = var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SequenceDefinition.java b/osrs/src/main/java/SequenceDefinition.java index 902b0cce1..9a73ef756 100644 --- a/osrs/src/main/java/SequenceDefinition.java +++ b/osrs/src/main/java/SequenceDefinition.java @@ -1,101 +1,96 @@ -import java.util.HashMap; -import java.util.Map; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +import java.util.HashMap; +import java.util.Map; + +@ObfuscatedName("ib") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("aw") - static boolean field1808; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("SequenceDefinition_archive") - static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("az") + @ObfuscatedName("au") + static boolean field1836; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("SequenceDefinition_cached") - static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("av") + public static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("SequenceDefinition_cachedFrames") - static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("ap") + public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("SequenceDefinition_cachedModel") - static EvictingDualNodeHashTable SequenceDefinition_cachedModel; - @ObfuscatedName("aq") + public static EvictingDualNodeHashTable SequenceDefinition_cachedModel; + @ObfuscatedName("ad") @Export("SequenceDefinition_cachedModelId") public int SequenceDefinition_cachedModelId; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("animMayaFrameSounds") public Map animMayaFrameSounds; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("animMayaStart") int animMayaStart; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("animMayaEnd") int animMayaEnd; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("frameCount") public int frameCount; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("mergedBoneGroups") int[] mergedBoneGroups; - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("animMayaMasks") boolean[] animMayaMasks; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("stretches") public boolean stretches; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("forcedPriority") public int forcedPriority; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("shield") public int shield; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("weapon") public int weapon; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("iterations") public int iterations; - @ObfuscatedName("bd") - public boolean field1819; - @ObfuscatedName("bb") + @ObfuscatedName("bh") + public boolean field1843; + @ObfuscatedName("bj") @Export("precedenceAnimating") public int precedenceAnimating; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("priority") public int priority; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("replyMode") public int replyMode; static { - field1808 = false; + field1836 = false; SequenceDefinition_cached = new EvictingDualNodeHashTable(64); SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); SequenceDefinition_cachedModel = new EvictingDualNodeHashTable(100); @@ -111,16 +106,16 @@ public class SequenceDefinition extends DualNode { this.shield = -1; this.weapon = -1; this.iterations = 99; - this.field1819 = false; + this.field1843 = false; this.precedenceAnimating = -1; this.priority = -1; this.replyMode = 2; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;S)V", - garbageValue = "-22539" + descriptor = "(Ltm;I)V", + garbageValue = "-1228314075" ) @Export("decode") void decode(Buffer var1) { @@ -134,10 +129,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "1148727534" + descriptor = "(Ltm;II)V", + garbageValue = "-998572107" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -181,7 +176,7 @@ void decodeNext(Buffer var1, int var2) { this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { this.iterations = var1.readUnsignedByte(); - this.field1819 = true; + this.field1843 = true; } else if (var2 == 9) { this.precedenceAnimating = var1.readUnsignedByte(); } else if (var2 == 10) { @@ -236,10 +231,10 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "121" + descriptor = "(I)V", + garbageValue = "968421208" ) @Export("postDecode") void postDecode() { @@ -261,17 +256,17 @@ void postDecode() { } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ljo;II)Ljo;", - garbageValue = "509430466" + descriptor = "(Ljr;II)Ljr;", + garbageValue = "-2024092599" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { Model var4; if (!this.isCachedModelIdSet()) { var2 = this.frameIds[var2]; - Frames var5 = class157.getFrames(var2 >> 16); + Frames var5 = MidiPcmStream.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var1.toSharedSequenceModel(true); @@ -281,28 +276,28 @@ public Model transformActorModel(Model var1, int var2) { return var4; } } else { - class137 var3 = class181.method917(this.SequenceDefinition_cachedModelId); + class137 var3 = Tile.method1184(this.SequenceDefinition_cachedModelId); if (var3 == null) { return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var3.method737()); - var4.method1296(var3, var2); + var4 = var1.toSharedSequenceModel(!var3.method748()); + var4.method1325(var3, var2); return var4; } } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Ljo;IIB)Ljo;", - garbageValue = "-111" + descriptor = "(Ljr;IIB)Ljr;", + garbageValue = "93" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { Model var5; if (!this.isCachedModelIdSet()) { var2 = this.frameIds[var2]; - Frames var6 = class157.getFrames(var2 >> 16); + Frames var6 = MidiPcmStream.getFrames(var2 >> 16); var2 &= 65535; if (var6 == null) { return var1.toSharedSequenceModel(true); @@ -329,11 +324,11 @@ Model transformObjectModel(Model var1, int var2, int var3) { return var5; } } else { - class137 var4 = class181.method917(this.SequenceDefinition_cachedModelId); + class137 var4 = Tile.method1184(this.SequenceDefinition_cachedModelId); if (var4 == null) { return var1.toSharedSequenceModel(true); } else { - var5 = var1.toSharedSequenceModel(!var4.method737()); + var5 = var1.toSharedSequenceModel(!var4.method748()); var3 &= 3; if (var3 == 1) { var5.rotateY270Ccw(); @@ -343,7 +338,7 @@ Model transformObjectModel(Model var1, int var2, int var3) { var5.rotateY90Ccw(); } - var5.method1296(var4, var2); + var5.method1325(var4, var2); if (var3 == 1) { var5.rotateY90Ccw(); } else if (var3 == 2) { @@ -357,16 +352,17 @@ Model transformObjectModel(Model var1, int var2, int var3) { } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Ljo;II)Ljo;", - garbageValue = "1735736185" + descriptor = "(Ljr;II)Ljr;", + garbageValue = "1650193615" ) + @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { Model var4; if (!this.isCachedModelIdSet()) { var2 = this.frameIds[var2]; - Frames var5 = class157.getFrames(var2 >> 16); + Frames var5 = MidiPcmStream.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var1.toSharedSpotAnimationModel(true); @@ -376,26 +372,26 @@ Model transformSpotAnimationModel(Model var1, int var2) { return var4; } } else { - class137 var3 = class181.method917(this.SequenceDefinition_cachedModelId); + class137 var3 = Tile.method1184(this.SequenceDefinition_cachedModelId); if (var3 == null) { return var1.toSharedSpotAnimationModel(true); } else { - var4 = var1.toSharedSpotAnimationModel(!var3.method737()); - var4.method1296(var3, var2); + var4 = var1.toSharedSpotAnimationModel(!var3.method748()); + var4.method1325(var3, var2); return var4; } } } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Ljo;ILig;II)Ljo;", - garbageValue = "-1383318725" + descriptor = "(Ljr;ILib;II)Ljr;", + garbageValue = "-587997563" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - if (field1808 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { - return this.method1064(var1, var2, var3, var4); + if (field1836 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { + return this.method1082(var1, var2, var3, var4); } else { Model var5 = var1.toSharedSequenceModel(false); boolean var6 = false; @@ -403,21 +399,21 @@ public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, Skeleton var8 = null; class137 var9; if (this.isCachedModelIdSet()) { - var9 = this.method1068(); + var9 = this.method1086(); if (var9 == null) { return var5; } if (var3.isCachedModelIdSet() && this.animMayaMasks == null) { - var5.method1296(var9, var2); + var5.method1325(var9, var2); return var5; } - var8 = var9.field1294; - var5.method1300(var8, var9, var2, this.animMayaMasks, false, !var3.isCachedModelIdSet()); + var8 = var9.field1305; + var5.method1329(var8, var9, var2, this.animMayaMasks, false, !var3.isCachedModelIdSet()); } else { var2 = this.frameIds[var2]; - var7 = class157.getFrames(var2 >> 16); + var7 = MidiPcmStream.getFrames(var2 >> 16); var2 &= 65535; if (var7 == null) { return var3.transformActorModel(var1, var4); @@ -435,34 +431,34 @@ public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, var6 = var3.isCachedModelIdSet(); if (!var6) { - var5.method1301(var7, var2, this.mergedBoneGroups, false); + var5.method1330(var7, var2, this.mergedBoneGroups, false); } } if (var3.isCachedModelIdSet()) { - var9 = var3.method1068(); + var9 = var3.method1086(); if (var9 == null) { return var5; } if (var8 == null) { - var8 = var9.field1294; + var8 = var9.field1305; } - var5.method1300(var8, var9, var4, this.animMayaMasks, true, true); + var5.method1329(var8, var9, var4, this.animMayaMasks, true, true); } else { var4 = var3.frameIds[var4]; - Frames var10 = class157.getFrames(var4 >> 16); + Frames var10 = MidiPcmStream.getFrames(var4 >> 16); var4 &= 65535; if (var10 == null) { return this.transformActorModel(var1, var2); } - var5.method1301(var10, var4, this.mergedBoneGroups, true); + var5.method1330(var10, var4, this.mergedBoneGroups, true); } if (var6 && var7 != null) { - var5.method1301(var7, var2, this.mergedBoneGroups, false); + var5.method1330(var7, var2, this.mergedBoneGroups, false); } var5.resetBounds(); @@ -470,20 +466,20 @@ public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Ljo;ILig;IB)Ljo;", - garbageValue = "6" + descriptor = "(Ljr;ILib;II)Ljr;", + garbageValue = "-2128259101" ) - Model method1064(Model var1, int var2, SequenceDefinition var3, int var4) { + Model method1082(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; - Frames var5 = class157.getFrames(var2 >> 16); + Frames var5 = MidiPcmStream.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; - Frames var6 = class157.getFrames(var4 >> 16); + Frames var6 = MidiPcmStream.getFrames(var4 >> 16); var4 &= 65535; Model var7; if (var6 == null) { @@ -498,16 +494,16 @@ Model method1064(Model var1, int var2, SequenceDefinition var3, int var4) { } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Ljo;II)Ljo;", - garbageValue = "-2020208153" + descriptor = "(Ljr;II)Ljr;", + garbageValue = "-1580674405" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { if (!this.isCachedModelIdSet()) { int var3 = this.frameIds[var2]; - Frames var4 = class157.getFrames(var3 >> 16); + Frames var4 = MidiPcmStream.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -516,7 +512,7 @@ public Model transformWidgetModel(Model var1, int var2) { int var6 = 0; if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { var6 = this.chatFrameIds[var2]; - var5 = class157.getFrames(var6 >> 16); + var5 = MidiPcmStream.getFrames(var6 >> 16); var6 &= 65535; } @@ -537,41 +533,47 @@ public Model transformWidgetModel(Model var1, int var2) { } } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2102518176" + garbageValue = "-1169271782" ) @Export("isCachedModelIdSet") public boolean isCachedModelIdSet() { return this.SequenceDefinition_cachedModelId >= 0; } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "791799028" + garbageValue = "-2010728570" ) - public int method1067() { + public int method1085() { return this.animMayaEnd - this.animMayaStart; } - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)Lfz;", - garbageValue = "49" + descriptor = "(I)Lfv;", + garbageValue = "-46871670" ) - class137 method1068() { - return this.isCachedModelIdSet() ? class181.method917(this.SequenceDefinition_cachedModelId) : null; + class137 method1086() { + return this.isCachedModelIdSet() ? Tile.method1184(this.SequenceDefinition_cachedModelId) : null; } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)Lho;", - garbageValue = "-1093606391" + descriptor = "(II)Ltb;", + garbageValue = "1250355259" ) - @Export("WorldMapElement_get") - public static WorldMapElement WorldMapElement_get(int var0) { - return var0 >= 0 && var0 < class335.WorldMapElement_cached.length && class335.WorldMapElement_cached[var0] != null ? class335.WorldMapElement_cached[var0] : new WorldMapElement(var0); + public static class502 method1074(int var0) { + int var1 = class500.field4098[var0]; + if (var1 == 1) { + return class502.field4101; + } else if (var1 == 2) { + return class502.field4100; + } else { + return var1 == 3 ? class502.field4099 : null; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ServerPacket.java b/osrs/src/main/java/ServerPacket.java index a89096292..5098070ad 100644 --- a/osrs/src/main/java/ServerPacket.java +++ b/osrs/src/main/java/ServerPacket.java @@ -3,785 +3,889 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("lg") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("NPC_ANIM_SPECIFIC") public static final ServerPacket NPC_ANIM_SPECIFIC; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("AREA_SOUND") public static final ServerPacket AREA_SOUND; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("TRADING_POST_UPDATE") public static final ServerPacket TRADING_POST_UPDATE; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("CLANCHANNEL_DELTA") + @Export("SEND_PING") public static final ServerPacket SEND_PING; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("IF_SETTEXT") + @Export("UPDATE_REBOOT_TIMER") public static final ServerPacket UPDATE_REBOOT_TIMER; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETEVENTS") public static final ServerPacket IF_SETEVENTS; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("REFLECTION_CHECK") + @Export("NEW_PACKET_CAM_RESET_V2") public static final ServerPacket NEW_PACKET_CAM_RESET_V2; - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("SET_PLAYER_OP") public static final ServerPacket SET_PLAYER_OP; - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("VARP_LARGE") public static final ServerPacket VARP_LARGE; - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETOBJECT") public static final ServerPacket IF_SETOBJECT; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("CHAT_FILTER_SETTINGS") + @Export("OPEN_URL") public static final ServerPacket OPEN_URL; - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_MOVESUB") public static final ServerPacket IF_MOVESUB; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("CAM_LOOKAT_EASED_ANGLE_ABSOLUTE") public static final ServerPacket CAM_LOOKAT_EASED_ANGLE_ABSOLUTE; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("CAM_MOVETO_EASED_CIRCULAR") public static final ServerPacket CAM_MOVETO_EASED_CIRCULAR; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETTEXT") public static final ServerPacket IF_SETTEXT; - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("REFLECTIONCHECK_FRIENDLIST") public static final ServerPacket REFLECTIONCHECK_FRIENDLIST; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("MAPPROJ_ANIM") public static final ServerPacket MAPPROJ_ANIM; - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("GAMEFRAME_FULL") public static final ServerPacket GAMEFRAME_FULL; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("UPDATE_INV_STOP_TRANSMIT") public static final ServerPacket UPDATE_INV_STOP_TRANSMIT; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("MESSAGE_PRIVATE_ECHO") public static final ServerPacket MESSAGE_PRIVATE_ECHO; - @ObfuscatedName("ac") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("RUN_CLIENTSCRIPT") public static final ServerPacket RUN_CLIENTSCRIPT; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("SPOTANIM_SPECIFIC") + @Export("VARCLAN_ENABLE") public static final ServerPacket VARCLAN_ENABLE; - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("MAPPROJ_ANIM_SPECIFIC") public static final ServerPacket MAPPROJ_ANIM_SPECIFIC; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("NPC_INFO_LARGE") + @Export("UPDATE_RUNENERGY") public static final ServerPacket UPDATE_RUNENERGY; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("CAM_SHAKE") public static final ServerPacket CAM_SHAKE; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("ENTER_FREECAM") + @Export("MESSAGE_CLANCHANNEL") public static final ServerPacket MESSAGE_CLANCHANNEL; - @ObfuscatedName("bd") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETNPCHEAD") public static final ServerPacket IF_SETNPCHEAD; - @ObfuscatedName("bb") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("IF_SETPOSITION") + @Export("IF_CLOSESUB") public static final ServerPacket IF_CLOSESUB; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("UPDATE_STAT") public static final ServerPacket UPDATE_STAT; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("UPDATE_IGNORELIST") public static final ServerPacket UPDATE_IGNORELIST; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETCOLOUR") public static final ServerPacket IF_SETCOLOUR; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("MAP_ANIM") public static final ServerPacket MAP_ANIM; - @ObfuscatedName("bp") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("NPC_SPOTANIM_SPECIFIC") public static final ServerPacket NPC_SPOTANIM_SPECIFIC; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("UPDATE_INV_PARTIAL") + @Export("HEAT_MAP") public static final ServerPacket HEAT_MAP; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("LOC_ADD_CHANGE") public static final ServerPacket LOC_ADD_CHANGE; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("PLAYER_ANIM_SPECIFIC") public static final ServerPacket PLAYER_ANIM_SPECIFIC; - @ObfuscatedName("br") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("PLAYER_INFO") + @Export("OBJ_ADD") public static final ServerPacket OBJ_ADD; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("TRADING_POST_RESULTS") public static final ServerPacket TRADING_POST_RESULTS; - @ObfuscatedName("be") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("IF_SETOBJECT") + @Export("SPOTANIM_SPECIFIC") public static final ServerPacket SPOTANIM_SPECIFIC; - @ObfuscatedName("bc") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("VARP_SMALL") public static final ServerPacket VARP_SMALL; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("CHAT_FILTER_SETTINGS") public static final ServerPacket CHAT_FILTER_SETTINGS; - @ObfuscatedName("bu") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("UPDATE_RUNWEIGHT") public static final ServerPacket UPDATE_RUNWEIGHT; - @ObfuscatedName("bk") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("RESET_ANIMS") + @Export("UPDATE_ZONE_PARTIAL_FOLLOWS") public static final ServerPacket UPDATE_ZONE_PARTIAL_FOLLOWS; - @ObfuscatedName("bz") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("RESET_ANIMS") public static final ServerPacket RESET_ANIMS; - @ObfuscatedName("bx") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("SYNTH_SOUND") public static final ServerPacket SYNTH_SOUND; - @ObfuscatedName("bh") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("UPDATE_INV_FULL") + @Export("MIDI_JINGLE") public static final ServerPacket MIDI_JINGLE; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("MESSAGE_CLANCHANNEL_SYSTEM") + @Export("IF1_MODELROTATE") public static final ServerPacket IF1_MODELROTATE; - @ObfuscatedName("bl") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("HINT_ARROW") public static final ServerPacket HINT_ARROW; - @ObfuscatedName("bt") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("NEW_PACK_215") public static final ServerPacket NEW_PACK_215; - @ObfuscatedName("by") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETPLAYERMODEL_BASECOLOUR") public static final ServerPacket IF_SETPLAYERMODEL_BASECOLOUR; - @ObfuscatedName("bg") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETANGLE") public static final ServerPacket IF_SETANGLE; - @ObfuscatedName("bj") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("NPC_HEADICON_SPECIFIC") public static final ServerPacket NPC_HEADICON_SPECIFIC; - @ObfuscatedName("ct") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("UPDATE_UID192") + @Export("MESSAGE_PRIVATE") public static final ServerPacket MESSAGE_PRIVATE; @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETSCROLLPOS") public static final ServerPacket IF_SETSCROLLPOS; - @ObfuscatedName("cz") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("REBUILD_REGION") public static final ServerPacket REBUILD_REGION; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("LOC_ANIM_SPECIFIC") public static final ServerPacket LOC_ANIM_SPECIFIC; @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("UPDATE_ZONE_PARTIAL_FOLLOWS") + @Export("MESSAGE_GAME") public static final ServerPacket MESSAGE_GAME; - @ObfuscatedName("cj") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("IF_SETNPCHEAD") + @Export("UPDATE_INV_FULL") public static final ServerPacket UPDATE_INV_FULL; - @ObfuscatedName("cn") + @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETANIM") public static final ServerPacket IF_SETANIM; - @ObfuscatedName("cw") + @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("HEAT_MAP") + @Export("IF_OPENSUB") public static final ServerPacket IF_OPENSUB; @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("TRIGGER_ONDIALOGABORT") + @Export("IF_SETMODEL") public static final ServerPacket IF_SETMODEL; @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("IF_OPENSUB") + @Export("UPDATE_UID192") public static final ServerPacket UPDATE_UID192; - @ObfuscatedName("cm") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("SYNC_CLIENT_VARCACHE") public static final ServerPacket SYNC_CLIENT_VARCACHE; - @ObfuscatedName("ca") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("CLANSETTINGS_FULL") public static final ServerPacket CLANSETTINGS_FULL; - @ObfuscatedName("cx") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("REBUILD_REGION") + @Export("CAM_LOOKAT") public static final ServerPacket CAM_LOOKAT; - @ObfuscatedName("co") + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("SET_MAP_FLAG") public static final ServerPacket SET_MAP_FLAG; @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("CAM_LOOKAT") + @Export("MINIMAP_TOGGLE") public static final ServerPacket MINIMAP_TOGGLE; - @ObfuscatedName("cr") + @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("UPDATE_FRIENDLIST") public static final ServerPacket UPDATE_FRIENDLIST; - @ObfuscatedName("cd") + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("TRIGGER_ONDIALOGABORT") public static final ServerPacket TRIGGER_ONDIALOGABORT; - @ObfuscatedName("cy") + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETPLAYERMODEL_OBJ") public static final ServerPacket IF_SETPLAYERMODEL_OBJ; - @ObfuscatedName("ck") + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("PLAYER_SPOTANIM_SPECIFIC") public static final ServerPacket PLAYER_SPOTANIM_SPECIFIC; - @ObfuscatedName("cl") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("OBJ_COUNT") public static final ServerPacket OBJ_COUNT; - @ObfuscatedName("cp") + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETPOSITION") public static final ServerPacket IF_SETPOSITION; - @ObfuscatedName("ch") + @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("UPDATE_INV_PARTIAL") public static final ServerPacket UPDATE_INV_PARTIAL; - @ObfuscatedName("cg") + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("GAMEFRAME_FULL") + @Export("RESET_CLIENT_VARCACHE") public static final ServerPacket RESET_CLIENT_VARCACHE; - @ObfuscatedName("ci") + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("VARCLAN") + @Export("FRIENDLIST_LOADED") public static final ServerPacket FRIENDLIST_LOADED; - @ObfuscatedName("cv") + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("NPC_INFO_SMALL") public static final ServerPacket NPC_INFO_SMALL; @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("LOGOUT_TRANSFER") + @Export("MESSAGE_FRIENDCHANNEL") public static final ServerPacket MESSAGE_FRIENDCHANNEL; - @ObfuscatedName("dc") + @ObfuscatedName("dh") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("CHAT_FILTER_SETTINGS_PRIVATECHAT") public static final ServerPacket CHAT_FILTER_SETTINGS_PRIVATECHAT; - @ObfuscatedName("dq") + @ObfuscatedName("dj") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("PLAYER_INFO") public static final ServerPacket PLAYER_INFO; - @ObfuscatedName("dg") + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETPLAYERMODEL_BODYTYPE") public static final ServerPacket IF_SETPLAYERMODEL_BODYTYPE; - @ObfuscatedName("dj") + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("TOGGLE_OCULUS_ORB") public static final ServerPacket TOGGLE_OCULUS_ORB; - @ObfuscatedName("dy") + @ObfuscatedName("dn") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("CAM_MOVETO_EASED") public static final ServerPacket CAM_MOVETO_EASED; - @ObfuscatedName("dr") + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("VARCLAN") public static final ServerPacket VARCLAN; - @ObfuscatedName("do") + @ObfuscatedName("dd") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("LOC_DEL") public static final ServerPacket LOC_DEL; - @ObfuscatedName("dk") + @ObfuscatedName("da") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("REFLECTION_CHECK") public static final ServerPacket REFLECTION_CHECK; - @ObfuscatedName("dn") + @ObfuscatedName("ds") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("VARCLAN_DISABLE") public static final ServerPacket VARCLAN_DISABLE; - @ObfuscatedName("di") + @ObfuscatedName("dy") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("ENTER_FREECAM") public static final ServerPacket ENTER_FREECAM; - @ObfuscatedName("de") + @ObfuscatedName("dt") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("NPC_INFO_SMALL") + @Export("CLANCHANNEL_FULL") public static final ServerPacket CLANCHANNEL_FULL; - @ObfuscatedName("dd") + @ObfuscatedName("dl") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("MIDI_SONG_LEGACY") public static final ServerPacket MIDI_SONG_LEGACY; - @ObfuscatedName("dt") + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETHIDE") public static final ServerPacket IF_SETHIDE; @ObfuscatedName("df") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("MESSAGE_CLANCHANNEL_SYSTEM") public static final ServerPacket MESSAGE_CLANCHANNEL_SYSTEM; - @ObfuscatedName("dm") + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("OBJ_DEL_LEGACY") public static final ServerPacket OBJ_DEL_LEGACY; - @ObfuscatedName("du") + @ObfuscatedName("dw") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("CLANSETTINGS_DELTA") public static final ServerPacket CLANSETTINGS_DELTA; - @ObfuscatedName("dz") + @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("UPDATE_INV_CLEAR") + @Export("UPDATE_ZONE_FULL_FOLLOWS") public static final ServerPacket UPDATE_ZONE_FULL_FOLLOWS; - @ObfuscatedName("dx") + @ObfuscatedName("dr") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("UPDATE_INV_CLEAR") public static final ServerPacket UPDATE_INV_CLEAR; - @ObfuscatedName("dp") + @ObfuscatedName("do") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("TRADING_POST_RESULTS") + @Export("CLANCHANNEL_DELTA") public static final ServerPacket CLANCHANNEL_DELTA; - @ObfuscatedName("ds") + @ObfuscatedName("db") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("MESSAGE_PRIVATE_ECHO") + @Export("CAM_RESET") public static final ServerPacket CAM_RESET; - @ObfuscatedName("da") + @ObfuscatedName("dp") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("EMPTY_PACKET") public static final ServerPacket EMPTY_PACKET; - @ObfuscatedName("dv") + @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("REBUILD_REGION_NORMAL") public static final ServerPacket REBUILD_REGION_NORMAL; - @ObfuscatedName("dh") + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("LOGOUT") public static final ServerPacket LOGOUT; - @ObfuscatedName("dl") + @ObfuscatedName("dq") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("LOGOUT_FULL") public static final ServerPacket LOGOUT_FULL; - @ObfuscatedName("db") + @ObfuscatedName("de") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("UPDATE_ZONE_PARTIAL_ENCLOSED") public static final ServerPacket UPDATE_ZONE_PARTIAL_ENCLOSED; - @ObfuscatedName("dw") + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("CAM_LOOKAT_EASED_COORD") public static final ServerPacket CAM_LOOKAT_EASED_COORD; - @ObfuscatedName("et") + @ObfuscatedName("ed") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("CAM_LOOKAT_EASED_ANGLE_RELATIVE") public static final ServerPacket CAM_LOOKAT_EASED_ANGLE_RELATIVE; - @ObfuscatedName("em") + @ObfuscatedName("eh") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("UPDATE_FRIENDCHAT_CHANNEL_FULL_V2") public static final ServerPacket UPDATE_FRIENDCHAT_CHANNEL_FULL_V2; - @ObfuscatedName("ec") + @ObfuscatedName("ey") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_OPENTOP") public static final ServerPacket IF_OPENTOP; - @ObfuscatedName("el") + @ObfuscatedName("ee") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - static final ServerPacket field2719; - @ObfuscatedName("er") + public static final ServerPacket field2725; + @ObfuscatedName("eq") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("UPDATE_RUNENERGY") + @Export("CAM_MOVETO") public static final ServerPacket CAM_MOVETO; - @ObfuscatedName("ew") + @ObfuscatedName("ej") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("MESSAGE_PRIVATE") + @Export("UPDATE_SITESETTINGS") public static final ServerPacket UPDATE_SITESETTINGS; - @ObfuscatedName("eo") + @ObfuscatedName("ea") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("PREFETCH_GAMEOBJECTS") public static final ServerPacket PREFETCH_GAMEOBJECTS; - @ObfuscatedName("eb") + @ObfuscatedName("er") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETPLAYERHEAD") public static final ServerPacket IF_SETPLAYERHEAD; - @ObfuscatedName("ej") + @ObfuscatedName("ev") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("LOC_ANIM") public static final ServerPacket LOC_ANIM; - @ObfuscatedName("eh") + @ObfuscatedName("ez") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - @Export("REBUILD_REGION_NORMAL") + @Export("OBJ_DEL") public static final ServerPacket OBJ_DEL; - @ObfuscatedName("ei") + @ObfuscatedName("et") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("LOGIN_SCREEN_PACKET") public static final ServerPacket LOGIN_SCREEN_PACKET; @ObfuscatedName("en") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("NPC_INFO_LARGE") public static final ServerPacket NPC_INFO_LARGE; - @ObfuscatedName("es") + @ObfuscatedName("eb") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("IF_SETPLAYERMODEL_SELF") public static final ServerPacket IF_SETPLAYERMODEL_SELF; - @ObfuscatedName("eq") + @ObfuscatedName("ei") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("UPDATE_FRIENDCHAT_CHANNEL_FULL") public static final ServerPacket UPDATE_FRIENDCHAT_CHANNEL_FULL; - @ObfuscatedName("ee") + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) - public static final ServerPacket MIDI_SONG; - @ObfuscatedName("eg") + @Export("MIDI_SONG") + static final ServerPacket MIDI_SONG; + @ObfuscatedName("el") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("MIDI_SONG_STOP") public static final ServerPacket MIDI_SONG_STOP; - @ObfuscatedName("ey") + @ObfuscatedName("em") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("MIDI_SONG_WITH_SECONDARY") public static final ServerPacket MIDI_SONG_WITH_SECONDARY; - @ObfuscatedName("ed") + @ObfuscatedName("ef") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llg;" ) + @Export("MIDI_SWAP") public static final ServerPacket MIDI_SWAP; - @ObfuscatedName("ea") + @ObfuscatedName("ek") + @ObfuscatedSignature( + descriptor = "Llg;" + ) + public static final ServerPacket field2730; + @ObfuscatedName("ec") @Export("id") public final int id; - @ObfuscatedName("ex") + @ObfuscatedName("eu") @Export("length") public final int length; static { NPC_ANIM_SPECIFIC = new ServerPacket(0, 5); - AREA_SOUND = new ServerPacket(1, 5); - TRADING_POST_UPDATE = new ServerPacket(2, 20); - SEND_PING = new ServerPacket(3, 8); + AREA_SOUND = new ServerPacket(1, 6); + TRADING_POST_UPDATE = new ServerPacket(2, 1); + SEND_PING = new ServerPacket(3, 17); UPDATE_REBOOT_TIMER = new ServerPacket(4, 2); - IF_SETEVENTS = new ServerPacket(5, 12); - NEW_PACKET_CAM_RESET_V2 = new ServerPacket(6, 4); - SET_PLAYER_OP = new ServerPacket(7, -1); - VARP_LARGE = new ServerPacket(8, 6); - IF_SETOBJECT = new ServerPacket(9, 10); + IF_SETEVENTS = new ServerPacket(5, 10); + NEW_PACKET_CAM_RESET_V2 = new ServerPacket(6, 6); + SET_PLAYER_OP = new ServerPacket(7, 0); + VARP_LARGE = new ServerPacket(8, 4); + IF_SETOBJECT = new ServerPacket(9, 7); OPEN_URL = new ServerPacket(10, -2); - IF_MOVESUB = new ServerPacket(11, 8); - CAM_LOOKAT_EASED_ANGLE_ABSOLUTE = new ServerPacket(12, 7); - CAM_MOVETO_EASED_CIRCULAR = new ServerPacket(13, 10); - IF_SETTEXT = new ServerPacket(14, -2); - REFLECTIONCHECK_FRIENDLIST = new ServerPacket(15, -1); - MAPPROJ_ANIM = new ServerPacket(16, 16); + IF_MOVESUB = new ServerPacket(11, 2); + CAM_LOOKAT_EASED_ANGLE_ABSOLUTE = new ServerPacket(12, 8); + CAM_MOVETO_EASED_CIRCULAR = new ServerPacket(13, 1); + IF_SETTEXT = new ServerPacket(14, -1); + REFLECTIONCHECK_FRIENDLIST = new ServerPacket(15, 6); + MAPPROJ_ANIM = new ServerPacket(16, -2); GAMEFRAME_FULL = new ServerPacket(17, -2); UPDATE_INV_STOP_TRANSMIT = new ServerPacket(18, 2); - MESSAGE_PRIVATE_ECHO = new ServerPacket(19, -2); - RUN_CLIENTSCRIPT = new ServerPacket(20, -2); - VARCLAN_ENABLE = new ServerPacket(21, 0); - MAPPROJ_ANIM_SPECIFIC = new ServerPacket(22, 17); - UPDATE_RUNENERGY = new ServerPacket(23, 2); - CAM_SHAKE = new ServerPacket(24, 4); - MESSAGE_CLANCHANNEL = new ServerPacket(25, -1); - IF_SETNPCHEAD = new ServerPacket(26, 6); - IF_CLOSESUB = new ServerPacket(27, 4); - UPDATE_STAT = new ServerPacket(28, 6); - UPDATE_IGNORELIST = new ServerPacket(29, -2); - IF_SETCOLOUR = new ServerPacket(30, 6); - MAP_ANIM = new ServerPacket(31, 6); - NPC_SPOTANIM_SPECIFIC = new ServerPacket(32, 9); - HEAT_MAP = new ServerPacket(33, 1); - LOC_ADD_CHANGE = new ServerPacket(34, 5); - PLAYER_ANIM_SPECIFIC = new ServerPacket(35, 3); - OBJ_ADD = new ServerPacket(36, 14); - TRADING_POST_RESULTS = new ServerPacket(37, -2); - SPOTANIM_SPECIFIC = new ServerPacket(38, 8); - VARP_SMALL = new ServerPacket(39, 3); + MESSAGE_PRIVATE_ECHO = new ServerPacket(19, 10); + RUN_CLIENTSCRIPT = new ServerPacket(20, 0); + VARCLAN_ENABLE = new ServerPacket(21, 2); + MAPPROJ_ANIM_SPECIFIC = new ServerPacket(22, 16); + UPDATE_RUNENERGY = new ServerPacket(23, -1); + CAM_SHAKE = new ServerPacket(24, -2); + MESSAGE_CLANCHANNEL = new ServerPacket(25, 6); + IF_SETNPCHEAD = new ServerPacket(26, 12); + IF_CLOSESUB = new ServerPacket(27, 9); + UPDATE_STAT = new ServerPacket(28, 0); + UPDATE_IGNORELIST = new ServerPacket(29, 4); + IF_SETCOLOUR = new ServerPacket(30, 8); + MAP_ANIM = new ServerPacket(31, -2); + NPC_SPOTANIM_SPECIFIC = new ServerPacket(32, 6); + HEAT_MAP = new ServerPacket(33, 8); + LOC_ADD_CHANGE = new ServerPacket(34, -2); + PLAYER_ANIM_SPECIFIC = new ServerPacket(35, 5); + OBJ_ADD = new ServerPacket(36, 2); + TRADING_POST_RESULTS = new ServerPacket(37, -1); + SPOTANIM_SPECIFIC = new ServerPacket(38, -2); + VARP_SMALL = new ServerPacket(39, 6); CHAT_FILTER_SETTINGS = new ServerPacket(40, 2); - UPDATE_RUNWEIGHT = new ServerPacket(41, 2); - UPDATE_ZONE_PARTIAL_FOLLOWS = new ServerPacket(42, 2); - RESET_ANIMS = new ServerPacket(43, 0); - SYNTH_SOUND = new ServerPacket(44, 5); - MIDI_JINGLE = new ServerPacket(45, 5); - IF1_MODELROTATE = new ServerPacket(46, 8); + UPDATE_RUNWEIGHT = new ServerPacket(41, 0); + UPDATE_ZONE_PARTIAL_FOLLOWS = new ServerPacket(42, -2); + RESET_ANIMS = new ServerPacket(43, 3); + SYNTH_SOUND = new ServerPacket(44, 7); + MIDI_JINGLE = new ServerPacket(45, 2); + IF1_MODELROTATE = new ServerPacket(46, 10); HINT_ARROW = new ServerPacket(47, 6); NEW_PACK_215 = new ServerPacket(48, -1); - IF_SETPLAYERMODEL_BASECOLOUR = new ServerPacket(49, 6); - IF_SETANGLE = new ServerPacket(50, 10); - NPC_HEADICON_SPECIFIC = new ServerPacket(51, 9); - MESSAGE_PRIVATE = new ServerPacket(52, -2); - IF_SETSCROLLPOS = new ServerPacket(53, 6); + IF_SETPLAYERMODEL_BASECOLOUR = new ServerPacket(49, 2); + IF_SETANGLE = new ServerPacket(50, -2); + NPC_HEADICON_SPECIFIC = new ServerPacket(51, -2); + MESSAGE_PRIVATE = new ServerPacket(52, 10); + IF_SETSCROLLPOS = new ServerPacket(53, 8); REBUILD_REGION = new ServerPacket(54, -2); - LOC_ANIM_SPECIFIC = new ServerPacket(55, 6); - MESSAGE_GAME = new ServerPacket(56, -1); + LOC_ANIM_SPECIFIC = new ServerPacket(55, 5); + MESSAGE_GAME = new ServerPacket(56, -2); UPDATE_INV_FULL = new ServerPacket(57, -2); - IF_SETANIM = new ServerPacket(58, 6); - IF_OPENSUB = new ServerPacket(59, 7); + IF_SETANIM = new ServerPacket(58, 4); + IF_OPENSUB = new ServerPacket(59, 6); IF_SETMODEL = new ServerPacket(60, 6); - UPDATE_UID192 = new ServerPacket(61, 28); + UPDATE_UID192 = new ServerPacket(61, 1); SYNC_CLIENT_VARCACHE = new ServerPacket(62, 0); - CLANSETTINGS_FULL = new ServerPacket(63, -2); - CAM_LOOKAT = new ServerPacket(64, 6); - SET_MAP_FLAG = new ServerPacket(65, 2); - MINIMAP_TOGGLE = new ServerPacket(66, 1); + CLANSETTINGS_FULL = new ServerPacket(63, 5); + CAM_LOOKAT = new ServerPacket(64, 0); + SET_MAP_FLAG = new ServerPacket(65, 1); + MINIMAP_TOGGLE = new ServerPacket(66, 6); UPDATE_FRIENDLIST = new ServerPacket(67, -2); - TRIGGER_ONDIALOGABORT = new ServerPacket(68, 0); - IF_SETPLAYERMODEL_OBJ = new ServerPacket(69, 8); - PLAYER_SPOTANIM_SPECIFIC = new ServerPacket(70, 9); - OBJ_COUNT = new ServerPacket(71, 11); - IF_SETPOSITION = new ServerPacket(72, 8); - UPDATE_INV_PARTIAL = new ServerPacket(73, -2); - RESET_CLIENT_VARCACHE = new ServerPacket(74, 0); - FRIENDLIST_LOADED = new ServerPacket(75, 0); - NPC_INFO_SMALL = new ServerPacket(76, -2); - MESSAGE_FRIENDCHANNEL = new ServerPacket(77, -1); - CHAT_FILTER_SETTINGS_PRIVATECHAT = new ServerPacket(78, 1); + TRIGGER_ONDIALOGABORT = new ServerPacket(68, -2); + IF_SETPLAYERMODEL_OBJ = new ServerPacket(69, 1); + PLAYER_SPOTANIM_SPECIFIC = new ServerPacket(70, -2); + OBJ_COUNT = new ServerPacket(71, 6); + IF_SETPOSITION = new ServerPacket(72, 0); + UPDATE_INV_PARTIAL = new ServerPacket(73, 7); + RESET_CLIENT_VARCACHE = new ServerPacket(74, 2); + FRIENDLIST_LOADED = new ServerPacket(75, 2); + NPC_INFO_SMALL = new ServerPacket(76, 6); + MESSAGE_FRIENDCHANNEL = new ServerPacket(77, -2); + CHAT_FILTER_SETTINGS_PRIVATECHAT = new ServerPacket(78, 4); PLAYER_INFO = new ServerPacket(79, -2); - IF_SETPLAYERMODEL_BODYTYPE = new ServerPacket(80, 5); - TOGGLE_OCULUS_ORB = new ServerPacket(81, 4); - CAM_MOVETO_EASED = new ServerPacket(82, 8); - VARCLAN = new ServerPacket(83, -1); - LOC_DEL = new ServerPacket(84, 2); + IF_SETPLAYERMODEL_BODYTYPE = new ServerPacket(80, -1); + TOGGLE_OCULUS_ORB = new ServerPacket(81, 8); + CAM_MOVETO_EASED = new ServerPacket(82, 9); + VARCLAN = new ServerPacket(83, 28); + LOC_DEL = new ServerPacket(84, 8); REFLECTION_CHECK = new ServerPacket(85, -2); VARCLAN_DISABLE = new ServerPacket(86, 0); - ENTER_FREECAM = new ServerPacket(87, 1); - CLANCHANNEL_FULL = new ServerPacket(88, -2); - MIDI_SONG_LEGACY = new ServerPacket(89, 2); - IF_SETHIDE = new ServerPacket(90, 5); - MESSAGE_CLANCHANNEL_SYSTEM = new ServerPacket(91, -1); - OBJ_DEL_LEGACY = new ServerPacket(92, 4); - CLANSETTINGS_DELTA = new ServerPacket(93, -2); - UPDATE_ZONE_FULL_FOLLOWS = new ServerPacket(94, 2); + ENTER_FREECAM = new ServerPacket(87, 0); + CLANCHANNEL_FULL = new ServerPacket(88, 6); + MIDI_SONG_LEGACY = new ServerPacket(89, 7); + IF_SETHIDE = new ServerPacket(90, -2); + MESSAGE_CLANCHANNEL_SYSTEM = new ServerPacket(91, -2); + OBJ_DEL_LEGACY = new ServerPacket(92, 6); + CLANSETTINGS_DELTA = new ServerPacket(93, 5); + UPDATE_ZONE_FULL_FOLLOWS = new ServerPacket(94, 14); UPDATE_INV_CLEAR = new ServerPacket(95, 4); - CLANCHANNEL_DELTA = new ServerPacket(96, -2); - CAM_RESET = new ServerPacket(97, 0); - EMPTY_PACKET = new ServerPacket(98, 0); - REBUILD_REGION_NORMAL = new ServerPacket(99, -2); - LOGOUT = new ServerPacket(100, 1); - LOGOUT_FULL = new ServerPacket(101, 0); - UPDATE_ZONE_PARTIAL_ENCLOSED = new ServerPacket(102, -2); - CAM_LOOKAT_EASED_COORD = new ServerPacket(103, 7); - CAM_LOOKAT_EASED_ANGLE_RELATIVE = new ServerPacket(104, 7); + CLANCHANNEL_DELTA = new ServerPacket(96, 4); + CAM_RESET = new ServerPacket(97, -2); + EMPTY_PACKET = new ServerPacket(98, 20); + REBUILD_REGION_NORMAL = new ServerPacket(99, 4); + LOGOUT = new ServerPacket(100, 8); + LOGOUT_FULL = new ServerPacket(101, -1); + UPDATE_ZONE_PARTIAL_ENCLOSED = new ServerPacket(102, -1); + CAM_LOOKAT_EASED_COORD = new ServerPacket(103, 2); + CAM_LOOKAT_EASED_ANGLE_RELATIVE = new ServerPacket(104, 11); UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 = new ServerPacket(105, -2); - IF_OPENTOP = new ServerPacket(106, 2); - field2719 = new ServerPacket(107, -2); - CAM_MOVETO = new ServerPacket(108, 6); - UPDATE_SITESETTINGS = new ServerPacket(109, -1); - PREFETCH_GAMEOBJECTS = new ServerPacket(110, 14); - IF_SETPLAYERHEAD = new ServerPacket(111, 4); - LOC_ANIM = new ServerPacket(112, 4); - OBJ_DEL = new ServerPacket(113, 7); - LOGIN_SCREEN_PACKET = new ServerPacket(114, 6); - NPC_INFO_LARGE = new ServerPacket(115, -2); - IF_SETPLAYERMODEL_SELF = new ServerPacket(116, 5); - UPDATE_FRIENDCHAT_CHANNEL_FULL = new ServerPacket(117, -2); - MIDI_SONG = new ServerPacket(118, 10); - MIDI_SONG_STOP = new ServerPacket(119, 4); - MIDI_SONG_WITH_SECONDARY = new ServerPacket(120, 12); - MIDI_SWAP = new ServerPacket(121, 8); + IF_OPENTOP = new ServerPacket(106, 4); + field2725 = new ServerPacket(107, -1); + CAM_MOVETO = new ServerPacket(108, -1); + UPDATE_SITESETTINGS = new ServerPacket(109, 5); + PREFETCH_GAMEOBJECTS = new ServerPacket(110, 12); + IF_SETPLAYERHEAD = new ServerPacket(111, 8); + LOC_ANIM = new ServerPacket(112, 14); + OBJ_DEL = new ServerPacket(113, 4); + LOGIN_SCREEN_PACKET = new ServerPacket(114, 5); + NPC_INFO_LARGE = new ServerPacket(115, 9); + IF_SETPLAYERMODEL_SELF = new ServerPacket(116, 3); + UPDATE_FRIENDCHAT_CHANNEL_FULL = new ServerPacket(117, 5); + MIDI_SONG = new ServerPacket(118, -2); + MIDI_SONG_STOP = new ServerPacket(119, 0); + MIDI_SONG_WITH_SECONDARY = new ServerPacket(120, 7); + MIDI_SWAP = new ServerPacket(121, -2); + field2730 = new ServerPacket(122, 19); } ServerPacket(int var1, int var2) { this.id = var1; this.length = var2; } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-76771490" + ) + public static void method1612(AbstractArchive var0) { + VarbitComposition.VarbitDefinition_archive = var0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Skeleton.java b/osrs/src/main/java/Skeleton.java index febfc6b90..d146e3c1a 100644 --- a/osrs/src/main/java/Skeleton.java +++ b/osrs/src/main/java/Skeleton.java @@ -1,31 +1,34 @@ -import java.util.ArrayList; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("iu") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("aj") + @ObfuscatedName("dl") + @ObfuscatedSignature( + descriptor = "Luk;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("ai") @Export("id") int id; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("count") int count; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("labels") int[][] labels; - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lim;" ) - class228 field2028; + class227 field2049; public Skeleton(int var1, byte[] var2) { this.id = var1; @@ -52,639 +55,206 @@ public Skeleton(int var1, byte[] var2) { if (var3.offset < var3.array.length) { var4 = var3.readUnsignedShort(); if (var4 > 0) { - this.field2028 = new class228(var3, var4); + this.field2049 = new class227(var3, var4); } } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2119821577" + garbageValue = "657439907" ) - public int method1206() { + public int method1230() { return this.count; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Liv;", - garbageValue = "632962128" + descriptor = "(I)Lim;", + garbageValue = "-896390577" ) - public class228 method1207() { - return this.field2028; + public class227 method1231() { + return this.field2049; } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-442215173" - ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - return UserComparator10.method681(var0, 10, true); - } - - @ObfuscatedName("hz") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "85" + descriptor = "(Lfh;FB)F", + garbageValue = "0" ) - static void method1208() { - int var0; - if (class92.field937 == Client.field412) { - UserComparator5.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0] = new CollisionMap(104, 104); - } - - Frames.sceneMinimapSprite = new SpritePixels(512, 512); - Login.Login_loadingText = "Starting game engine..."; - Login.Login_loadingPercent = 5; - Client.field412 = class92.field939; - } else if (class92.field939 == Client.field412) { - Login.Login_loadingText = "Prepared visibility map"; - Login.Login_loadingPercent = 10; - Client.field412 = class92.field932; - } else if (class92.field932 == Client.field412) { - class151.field1352 = PendingSpawn.newArchive(0, false, true, true, false); - TileItem.archive7 = PendingSpawn.newArchive(1, false, true, true, false); - class197.archive2 = PendingSpawn.newArchive(2, true, false, true, false); - class253.archive4 = PendingSpawn.newArchive(3, false, true, true, false); - class149.field1340 = PendingSpawn.newArchive(4, false, true, true, false); - Canvas.archive9 = PendingSpawn.newArchive(5, true, true, true, false); - class13.archive6 = PendingSpawn.newArchive(6, true, true, true, false); - class7.archive11 = PendingSpawn.newArchive(7, false, true, true, false); - class386.archive8 = PendingSpawn.newArchive(8, false, true, true, false); - class148.field1335 = PendingSpawn.newArchive(9, false, true, true, false); - class131.archive10 = PendingSpawn.newArchive(10, false, true, true, false); - GrandExchangeOfferOwnWorldComparator.field358 = PendingSpawn.newArchive(11, false, true, true, false); - class126.archive12 = PendingSpawn.newArchive(12, false, true, true, false); - FontName.archive13 = PendingSpawn.newArchive(13, true, false, true, false); - ReflectionCheck.field151 = PendingSpawn.newArchive(14, false, true, true, false); - class191.field1546 = PendingSpawn.newArchive(15, false, true, true, false); - World.field670 = PendingSpawn.newArchive(17, true, true, true, false); - class106.field1099 = PendingSpawn.newArchive(18, false, true, true, false); - Varcs.field1130 = PendingSpawn.newArchive(19, false, true, true, false); - Interpreter.field713 = PendingSpawn.newArchive(20, false, true, true, false); - class176.field1459 = PendingSpawn.newArchive(21, false, true, true, true); - Login.Login_loadingText = "Connecting to update server"; - Login.Login_loadingPercent = 20; - Client.field412 = class92.field929; - } else if (Client.field412 == class92.field929) { - byte var47 = 0; - var0 = var47 + class151.field1352.percentage() * 4 / 100; - var0 += TileItem.archive7.percentage() * 4 / 100; - var0 += class197.archive2.percentage() * 2 / 100; - var0 += class253.archive4.percentage() * 2 / 100; - var0 += class149.field1340.percentage() * 6 / 100; - var0 += Canvas.archive9.percentage() * 4 / 100; - var0 += class13.archive6.percentage() * 2 / 100; - var0 += class7.archive11.percentage() * 55 / 100; - var0 += class386.archive8.percentage() * 2 / 100; - var0 += class148.field1335.percentage() * 2 / 100; - var0 += class131.archive10.percentage() * 2 / 100; - var0 += GrandExchangeOfferOwnWorldComparator.field358.percentage() * 2 / 100; - var0 += class126.archive12.percentage() * 2 / 100; - var0 += FontName.archive13.percentage() * 2 / 100; - var0 += ReflectionCheck.field151.percentage() * 2 / 100; - var0 += class191.field1546.percentage() * 2 / 100; - var0 += Varcs.field1130.percentage() / 100; - var0 += class106.field1099.percentage() / 100; - var0 += Interpreter.field713.percentage() / 100; - var0 += class176.field1459.percentage() / 100; - var0 += World.field670.method1851() && World.field670.isFullyLoaded() ? 1 : 0; - if (var0 != 100) { - if (var0 != 0) { - Login.Login_loadingText = "Checking for updates - " + var0 + "%"; - } - - Login.Login_loadingPercent = 30; + static float method1229(class130 var0, float var1) { + if (var0 != null && var0.method726() != 0) { + if (var1 < (float)var0.field1244[0].field1202) { + return var0.field1245 == class128.field1229 ? var0.field1244[0].field1198 : UserComparator4.method669(var0, var1, true); + } else if (var1 > (float)var0.field1244[var0.method726() - 1].field1202) { + return var0.field1246 == class128.field1229 ? var0.field1244[var0.method726() - 1].field1198 : UserComparator4.method669(var0, var1, false); + } else if (var0.field1240) { + return var0.field1244[0].field1198; } else { - class197.method980(class151.field1352, "Animations"); - class197.method980(TileItem.archive7, "Skeletons"); - class197.method980(class149.field1340, "Sound FX"); - class197.method980(Canvas.archive9, "Maps"); - class197.method980(class13.archive6, "Music Tracks"); - class197.method980(class7.archive11, "Models"); - class197.method980(class386.archive8, "Sprites"); - class197.method980(GrandExchangeOfferOwnWorldComparator.field358, "Music Jingles"); - class197.method980(ReflectionCheck.field151, "Music Samples"); - class197.method980(class191.field1546, "Music Patches"); - class197.method980(Varcs.field1130, "World Map"); - class197.method980(class106.field1099, "World Map Geography"); - class197.method980(Interpreter.field713, "World Map Ground"); - class350.field3154 = new GraphicsDefaults(); - class350.field3154.decode(World.field670); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.field412 = class92.field933; - } - } else { - int var5; - if (Client.field412 == class92.field933) { - WorldMapManager.method1442(22050, !Client.isLowDetail, 2); - ArrayList var52 = new ArrayList(3); - TaskHandler var36 = GameEngine.taskHandler; - short var44 = 2048; - if (var44 < 256) { - var44 = 256; - } - - PcmPlayer var41; - try { - PcmPlayer var42 = class309.pcmPlayerProvider.player(); - var42.samples = new int[(class373.PcmPlayer_stereo ? 2 : 1) * 256]; - var42.field198 = var44; - var42.init(); - var42.capacity = (var44 & -1024) + 1024; - if (var42.capacity > 16384) { - var42.capacity = 16384; - } - - var42.open(var42.capacity); - if (ObjTypeCustomisation.field1482 > 0 && WorldMapSectionType.soundSystem == null) { - WorldMapSectionType.soundSystem = new SoundSystem(); - class273.soundSystemExecutor = Executors.newScheduledThreadPool(1); - class273.soundSystemExecutor.scheduleAtFixedRate(WorldMapSectionType.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (WorldMapSectionType.soundSystem != null) { - if (WorldMapSectionType.soundSystem.players[0] != null) { - throw new IllegalArgumentException(); - } - - WorldMapSectionType.soundSystem.players[0] = var42; - } - - var41 = var42; - } catch (Throwable var34) { - var41 = new PcmPlayer(); - } - - VerticalAlignment.pcmPlayer1 = var41; - SecureRandomCallable.pcmStreamMixer = new PcmStreamMixer(); - PcmStreamMixer var43 = new PcmStreamMixer(); - var43.addSubStream(SecureRandomCallable.pcmStreamMixer); - - for (var5 = 0; var5 < 3; ++var5) { - MidiPcmStream var48 = new MidiPcmStream(); - var48.method1597(9, 128); - var43.addSubStream(var48); - var52.add(var48); - } - - VerticalAlignment.pcmPlayer1.setStream(var43); - WorldMapCacheName.method1521(class191.field1546, ReflectionCheck.field151, class149.field1340, var52); - SoundCache.decimator = new Decimator(22050, PcmPlayer.field181); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.field412 = class92.field928; - Tile.field1985 = new Fonts(class386.archive8, FontName.archive13); - } else if (Client.field412 == class92.field928) { - var0 = FontName.method2419().length; - Fonts var40 = Tile.field1985; - FontName[] var35 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_verdana13, FontName.FontName_plain11, FontName.FontName_plain12, FontName.FontName_verdana11}; - Client.fontsMap = var40.createMap(var35); - if (Client.fontsMap.size() < var0) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var0 + "%"; - Login.Login_loadingPercent = 40; + class125 var2 = var0.method725(var1); + boolean var3 = false; + boolean var4 = false; + if (var2 == null) { + return 0.0F; } else { - ItemComposition.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - class113.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - Calendar.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - NPCComposition.field1570 = Client.field641.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.field412 = class92.field926; - } - } else { - Archive var2; - int var3; - Archive var37; - int var54; - if (class92.field926 == Client.field412) { - var37 = class131.archive10; - var2 = class386.archive8; - var3 = 0; - String[] var38 = Login.field769; - - String var46; - for (var5 = 0; var5 < var38.length; ++var5) { - var46 = var38[var5]; - if (var37.tryLoadFileByNames(var46, "")) { - ++var3; - } - } - - var38 = Login.field770; - - for (var5 = 0; var5 < var38.length; ++var5) { - var46 = var38[var5]; - if (var2.tryLoadFileByNames(var46, "")) { - ++var3; - } - } - - var38 = Login.field768; - - for (var5 = 0; var5 < var38.length; ++var5) { - var46 = var38[var5]; - if (var2.getGroupId(var46) != -1 && var2.tryLoadFileByNames(var46, "")) { - ++var3; - } - } - - var54 = GameBuild.method1836(class386.archive8); - if (var3 < var54) { - Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var54 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - class129.updateGameState(5); - Client.field412 = class92.field940; - } - } else if (Client.field412 == class92.field940) { - if (!class197.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + class197.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else if (!class176.field1459.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + (80 + class126.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 60; - } else { - class149.method782(class197.archive2); - Archive var51 = class197.archive2; - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var51; - UserComparator7.method668(class197.archive2, class7.archive11); - var37 = class197.archive2; - var2 = class7.archive11; - boolean var39 = Client.isLowDetail; - ObjectComposition.ObjectDefinition_archive = var37; - ObjectComposition.ObjectDefinition_modelsArchive = var2; - ObjectComposition.ObjectDefinition_isLowDetail = var39; - Archive var4 = class197.archive2; - Archive var53 = class7.archive11; - IntHashTable.NpcDefinition_archive = var4; - NPCComposition.field1567 = var53; - class20.method69(class197.archive2); - Interpreter.method426(class197.archive2, class7.archive11, Client.isMembersWorld, ItemComposition.fontPlain11); - SongTask.method2103(class197.archive2, class151.field1352, TileItem.archive7); - Archive var45 = class197.archive2; - Archive var7 = class7.archive11; - SpotAnimationDefinition.SpotAnimationDefinition_archive = var45; - class53.SpotAnimationDefinition_modelArchive = var7; - ReflectionCheck.method175(class197.archive2); - Archive var49 = class197.archive2; - VarpDefinition.VarpDefinition_archive = var49; - VarpDefinition.field1491 = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - Archive var9 = class253.archive4; - Archive var10 = class7.archive11; - Archive var11 = class386.archive8; - Archive var12 = FontName.archive13; - int var13 = 0; - if (var9 != null) { - ArchiveLoader.Widget_archive = var9; - BoundaryObject.field2256 = var10; - UserComparator10.Widget_spritesArchive = var11; - WallDecoration.Widget_fontsArchive = var12; - var13 = ArchiveLoader.Widget_archive.getGroupCount(); - } - - ArchiveLoader.Widget_interfaceComponents = new Widget[var13][]; - Widget.Widget_loadedInterfaces = new boolean[var13]; - Archive var30 = class197.archive2; - InvDefinition.InvDefinition_archive = var30; - Archive var14 = class197.archive2; - EnumComposition.EnumDefinition_archive = var14; - Archive var15 = class197.archive2; - VarcInt.VarcInt_archive = var15; - Archive var16 = class197.archive2; - Archive var17 = class197.archive2; - ParamComposition.ParamDefinition_archive = var17; - class404.method2093(class197.archive2); - Language.method1938(class197.archive2); - class293.HitSplatDefinition_cachedSprites = new class498(KeyHandler.field72, 54, Interpreter.clientLanguage, class197.archive2); - class344.HitSplatDefinition_cached = new class498(KeyHandler.field72, 47, Interpreter.clientLanguage, class197.archive2); - PendingSpawn.varcs = new Varcs(); - Archive var18 = class197.archive2; - Archive var19 = class386.archive8; - Archive var20 = FontName.archive13; - HitSplatDefinition.HitSplatDefinition_archive = var18; - class387.field3643 = var19; - HitSplatDefinition.HitSplatDefinition_fontsArchive = var20; - Archive var21 = class197.archive2; - Archive var22 = class386.archive8; - HealthBarDefinition.HealthBarDefinition_archive = var21; - HealthBarDefinition.field1534 = var22; - Archive var23 = class197.archive2; - Archive var24 = class386.archive8; - WorldMapElement.WorldMapElement_archive = var24; - if (var23.isFullyLoaded()) { - Decimator.WorldMapElement_count = var23.getGroupFileCount(35); - class335.WorldMapElement_cached = new WorldMapElement[Decimator.WorldMapElement_count]; - - for (int var25 = 0; var25 < Decimator.WorldMapElement_count; ++var25) { - byte[] var26 = var23.takeFile(35, var25); - class335.WorldMapElement_cached[var25] = new WorldMapElement(var25); - if (var26 != null) { - class335.WorldMapElement_cached[var25].decode(new Buffer(var26)); - class335.WorldMapElement_cached[var25].method935(); + float var5; + float var6; + if (0.0D == (double)var2.field1197 && (double)var2.field1199 == 0.0D) { + var3 = true; + } else if (Float.MAX_VALUE == var2.field1197 && Float.MAX_VALUE == var2.field1199) { + var4 = true; + } else if (var2.field1196 != null) { + if (var0.field1241) { + var5 = (float)var2.field1202; + float var9 = var2.field1198; + var6 = 0.33333334F * var2.field1197 + var5; + float var10 = var2.field1199 * 0.33333334F + var9; + float var8 = (float)var2.field1196.field1202; + float var12 = var2.field1196.field1198; + float var7 = var8 - var2.field1196.field1200 * 0.33333334F; + float var11 = var12 - var2.field1196.field1201 * 0.33333334F; + float var15; + float var16; + float var17; + float var18; + float var19; + if (var0.field1243) { + var15 = var10; + var16 = var11; + if (var0 != null) { + var17 = var8 - var5; + if ((double)var17 != 0.0D) { + var18 = var6 - var5; + var19 = var7 - var5; + float[] var20 = new float[]{var18 / var17, var19 / var17}; + var0.field1242 = 0.33333334F == var20[0] && var20[1] == 0.6666667F; + float var21 = var20[0]; + float var22 = var20[1]; + if ((double)var20[0] < 0.0D) { + var20[0] = 0.0F; + } + + if ((double)var20[1] > 1.0D) { + var20[1] = 1.0F; + } + + if ((double)var20[0] > 1.0D || var20[1] < -1.0F) { + class160.method845(var20); + } + + float var10000; + if (var20[0] != var21) { + var10000 = var5 + var17 * var20[0]; + if (0.0D != (double)var21) { + var15 = (var10 - var9) * var20[0] / var21 + var9; + } + } + + if (var22 != var20[1]) { + var10000 = var5 + var17 * var20[1]; + if (1.0D != (double)var22) { + var16 = (float)((double)var12 - (1.0D - (double)var20[1]) * (double)(var12 - var11) / (1.0D - (double)var22)); + } + } + + var0.field1258 = var5; + var0.field1254 = var8; + float var23 = var20[0]; + float var24 = var20[1]; + float var25 = var23 - 0.0F; + float var26 = var24 - var23; + float var27 = 1.0F - var24; + float var28 = var26 - var25; + var0.field1255 = var27 - var26 - var28; + var0.field1249 = var28 + var28 + var28; + var0.field1250 = var25 + var25 + var25; + var0.field1247 = 0.0F; + var25 = var15 - var9; + var26 = var16 - var15; + var27 = var12 - var16; + var28 = var26 - var25; + var0.field1248 = var27 - var26 - var28; + var0.field1256 = var28 + var28 + var28; + var0.field1253 = var25 + var25 + var25; + var0.field1252 = var9; + } + } + } else if (var0 != null) { + var0.field1258 = var5; + float var13 = var8 - var5; + float var14 = var12 - var9; + var15 = var6 - var5; + var16 = 0.0F; + var17 = 0.0F; + if ((double)var15 != 0.0D) { + var16 = (var10 - var9) / var15; } - } - } - - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.field412 = class92.field936; - } - } else if (Client.field412 == class92.field936) { - var0 = 0; - if (class10.compass == null) { - class10.compass = WorldMap.SpriteBuffer_getSprite(class386.archive8, class350.field3154.compass, 0); - } else { - ++var0; - } - - if (SoundCache.redHintArrowSprite == null) { - SoundCache.redHintArrowSprite = WorldMap.SpriteBuffer_getSprite(class386.archive8, class350.field3154.field3841, 0); - } else { - ++var0; - } - - IndexedSprite[] var1; - IndexedSprite[] var6; - IndexedSprite var8; - boolean var28; - byte[] var29; - int var31; - if (class282.mapSceneSprites == null) { - var2 = class386.archive8; - var3 = class350.field3154.mapScenes; - var29 = var2.takeFile(var3, 0); - if (var29 == null) { - var28 = false; - } else { - VarbitComposition.SpriteBuffer_decode(var29); - var28 = true; - } - if (!var28) { - var1 = null; - } else { - var6 = new IndexedSprite[class528.SpriteBuffer_spriteCount]; + var15 = var8 - var7; + if ((double)var15 != 0.0D) { + var17 = (var12 - var11) / var15; + } - for (var31 = 0; var31 < class528.SpriteBuffer_spriteCount; ++var31) { - var8 = var6[var31] = new IndexedSprite(); - var8.width = class528.SpriteBuffer_spriteWidth; - var8.height = class528.SpriteBuffer_spriteHeight; - var8.xOffset = class492.SpriteBuffer_xOffsets[var31]; - var8.yOffset = class134.SpriteBuffer_yOffsets[var31]; - var8.subWidth = class172.SpriteBuffer_spriteWidths[var31]; - var8.subHeight = class528.SpriteBuffer_spriteHeights[var31]; - var8.palette = class528.SpriteBuffer_spritePalette; - var8.pixels = ArchiveDiskAction.SpriteBuffer_pixels[var31]; + var18 = 1.0F / (var13 * var13); + var19 = var16 * var13; + float var29 = var17 * var13; + var0.field1247 = var18 * (var19 + var29 - var14 - var14) / var13; + var0.field1250 = var18 * (var14 + var14 + var14 - var19 - var19 - var29); + var0.field1249 = var16; + var0.field1255 = var9; } - DbTableType.method2483(); - var1 = var6; + var0.field1241 = false; } - - class282.mapSceneSprites = var1; - } else { - ++var0; - } - - if (DbTableType.headIconPkSprites == null) { - DbTableType.headIconPkSprites = class453.method2294(class386.archive8, class350.field3154.headIconsPk, 0); - } else { - ++var0; - } - - if (class17.headIconPrayerSprites == null) { - class17.headIconPrayerSprites = class453.method2294(class386.archive8, class350.field3154.field3838, 0); - } else { - ++var0; - } - - if (class345.headIconHintSprites == null) { - class345.headIconHintSprites = class453.method2294(class386.archive8, class350.field3154.field3833, 0); - } else { - ++var0; - } - - if (DynamicObject.mapMarkerSprites == null) { - DynamicObject.mapMarkerSprites = class453.method2294(class386.archive8, class350.field3154.field3832, 0); - } else { - ++var0; - } - - if (class211.crossSprites == null) { - class211.crossSprites = class453.method2294(class386.archive8, class350.field3154.field3842, 0); - } else { - ++var0; - } - - if (MusicPatchNode2.mapDotSprites == null) { - MusicPatchNode2.mapDotSprites = class453.method2294(class386.archive8, class350.field3154.field3839, 0); } else { - ++var0; + var3 = true; } - if (class302.scrollBarSprites == null) { - var2 = class386.archive8; - var3 = class350.field3154.field3835; - var29 = var2.takeFile(var3, 0); - if (var29 == null) { - var28 = false; - } else { - VarbitComposition.SpriteBuffer_decode(var29); - var28 = true; - } - - if (!var28) { - var1 = null; - } else { - var6 = new IndexedSprite[class528.SpriteBuffer_spriteCount]; - - for (var31 = 0; var31 < class528.SpriteBuffer_spriteCount; ++var31) { - var8 = var6[var31] = new IndexedSprite(); - var8.width = class528.SpriteBuffer_spriteWidth; - var8.height = class528.SpriteBuffer_spriteHeight; - var8.xOffset = class492.SpriteBuffer_xOffsets[var31]; - var8.yOffset = class134.SpriteBuffer_yOffsets[var31]; - var8.subWidth = class172.SpriteBuffer_spriteWidths[var31]; - var8.subHeight = class528.SpriteBuffer_spriteHeights[var31]; - var8.palette = class528.SpriteBuffer_spritePalette; - var8.pixels = ArchiveDiskAction.SpriteBuffer_pixels[var31]; - } - - DbTableType.method2483(); - var1 = var6; - } - - class302.scrollBarSprites = var1; + if (var3) { + return var2.field1198; + } else if (var4) { + return (float)var2.field1202 != var1 && var2.field1196 != null ? var2.field1196.field1198 : var2.field1198; + } else if (var0.field1243) { + return class454.method2321(var0, var1); } else { - ++var0; - } - - if (AbstractWorldMapIcon.field2442 == null) { - var2 = class386.archive8; - var3 = class350.field3154.field3836; - var29 = var2.takeFile(var3, 0); - if (var29 == null) { - var28 = false; + if (var0 == null) { + var5 = 0.0F; } else { - VarbitComposition.SpriteBuffer_decode(var29); - var28 = true; - } - - if (!var28) { - var1 = null; - } else { - var6 = new IndexedSprite[class528.SpriteBuffer_spriteCount]; - - for (var31 = 0; var31 < class528.SpriteBuffer_spriteCount; ++var31) { - var8 = var6[var31] = new IndexedSprite(); - var8.width = class528.SpriteBuffer_spriteWidth; - var8.height = class528.SpriteBuffer_spriteHeight; - var8.xOffset = class492.SpriteBuffer_xOffsets[var31]; - var8.yOffset = class134.SpriteBuffer_yOffsets[var31]; - var8.subWidth = class172.SpriteBuffer_spriteWidths[var31]; - var8.subHeight = class528.SpriteBuffer_spriteHeights[var31]; - var8.palette = class528.SpriteBuffer_spritePalette; - var8.pixels = ArchiveDiskAction.SpriteBuffer_pixels[var31]; - } - - DbTableType.method2483(); - var1 = var6; - } - - AbstractWorldMapIcon.field2442 = var1; - } else { - ++var0; - } - - if (var0 < 11) { - Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = AbstractWorldMapIcon.field2442; - SoundCache.redHintArrowSprite.normalize(); - int var32 = (int)(Math.random() * 21.0D) - 10; - int var33 = (int)(Math.random() * 21.0D) - 10; - var3 = (int)(Math.random() * 21.0D) - 10; - var54 = (int)(Math.random() * 41.0D) - 20; - class282.mapSceneSprites[0].shiftColors(var54 + var32, var33 + var54, var3 + var54); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.field412 = class92.field930; - } - } else if (Client.field412 == class92.field930) { - if (!class148.field1335.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - class113.textureProvider = new TextureProvider(class148.field1335, class386.archive8, 20, class150.clientPreferences.getBrightness(), Client.isLowDetail ? 64 : 128); - Rasterizer3D.method1163(class113.textureProvider); - Rasterizer3D.method1164(class150.clientPreferences.getBrightness()); - Client.field412 = class92.field931; - } - } else if (Client.field412 == class92.field931) { - var0 = class113.textureProvider.getLoadedPercentage(); - if (var0 < 100) { - Login.Login_loadingText = "Loading textures - " + var0 + "%"; - Login.Login_loadingPercent = 90; - } else { - Login.Login_loadingText = "Loaded textures"; - Login.Login_loadingPercent = 90; - Client.field412 = class92.field934; - } - } else if (Client.field412 == class92.field934) { - class497.mouseRecorder = new MouseRecorder(); - GameEngine.taskHandler.newThreadTask(class497.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.field412 = class92.field927; - } else if (Client.field412 == class92.field927) { - if (!class131.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var50 = new Huffman(class131.archive10.takeFileByNames("huffman", "")); - class335.huffman = var50; - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.field412 = class92.field938; - } - } else if (class92.field938 == Client.field412) { - if (!class253.archive4.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + class253.archive4.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!class126.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + class126.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!FontName.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + FontName.archive13.loadPercent() / 50) + "%"; - Login.Login_loadingPercent = 96; - } else { - Login.Login_loadingText = "Loaded interfaces"; - Login.Login_loadingPercent = 98; - if (class126.archive12.isValidFileName("version.dat", "")) { - Buffer var27 = new Buffer(class126.archive12.takeFileByNames("version.dat", "")); - var27.readUnsignedShort(); - } - - Client.field412 = class92.field925; - } - } else if (Client.field412 == class92.field925) { - Login.Login_loadingPercent = 100; - if (Varcs.field1130.getGroupCount() > 0 && !Varcs.field1130.tryLoadGroupByName(WorldMapCacheName.field2449.name)) { - Login.Login_loadingText = "Loading world map - " + Varcs.field1130.groupLoadPercentByName(WorldMapCacheName.field2449.name) / 10 + "%"; - } else { - if (class127.worldMap == null) { - class127.worldMap = new WorldMap(); - class127.worldMap.init(Varcs.field1130, class106.field1099, Interpreter.field713, Calendar.fontBold12, Client.fontsMap, class282.mapSceneSprites); + var6 = var1 - var0.field1258; + var5 = var0.field1255 + var6 * ((var6 * var0.field1247 + var0.field1250) * var6 + var0.field1249); } - Login.Login_loadingText = "Loaded world map"; - Client.field412 = class92.field935; - } - } else { - if (class92.field935 == Client.field412) { - class129.updateGameState(10); + return var5; } - } } + } else { + return 0.0F; } } - @ObfuscatedName("kp") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-2127910071" + descriptor = "(II)V", + garbageValue = "-1406508387" ) - static final void method1209(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field403[var4] = true; + public static void method1232(int var0) { + if (var0 != -1) { + if (class316.Widget_loadedInterfaces[var0]) { + Decimator.Widget_archive.clearFilesGroup(var0); + if (PacketBufferNode.Widget_interfaceComponents[var0] != null) { + for (int var1 = 0; var1 < PacketBufferNode.Widget_interfaceComponents[var0].length; ++var1) { + if (PacketBufferNode.Widget_interfaceComponents[var0][var1] != null) { + PacketBufferNode.Widget_interfaceComponents[var0][var1] = null; + } + } + + PacketBufferNode.Widget_interfaceComponents[var0] = null; + class316.Widget_loadedInterfaces[var0] = false; + } } } - - } - - @ObfuscatedName("ni") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = class503.getPacketBufferNode(ClientPacket.CLAN_JOINCHAT_LEAVECHAT, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Skills.java b/osrs/src/main/java/Skills.java index 39dd6d1c6..1a9495ae3 100644 --- a/osrs/src/main/java/Skills.java +++ b/osrs/src/main/java/Skills.java @@ -1,16 +1,22 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nh") +@ObfuscatedName("nl") @Implements("Skills") public class Skills { - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Luk;" + ) + static IndexedSprite field3145; static { Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; @@ -25,4 +31,4 @@ public class Skills { } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SoftWrapper.java b/osrs/src/main/java/SoftWrapper.java index e1d69e897..9f0851468 100644 --- a/osrs/src/main/java/SoftWrapper.java +++ b/osrs/src/main/java/SoftWrapper.java @@ -1,12 +1,13 @@ -import java.lang.ref.SoftReference; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lr") +import java.lang.ref.SoftReference; + +@ObfuscatedName("lx") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("ref") SoftReference ref; @@ -15,15 +16,15 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("get") Object get() { return this.ref.get(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("isSoft") boolean isSoft() { return true; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SongTask.java b/osrs/src/main/java/SongTask.java index a5137d228..5ee7a8307 100644 --- a/osrs/src/main/java/SongTask.java +++ b/osrs/src/main/java/SongTask.java @@ -1,97 +1,146 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pp") +@ObfuscatedName("pm") +@Implements("SongTask") public abstract class SongTask { - @ObfuscatedName("av") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "Lpm;" ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lpp;" - ) - SongTask field3714; - @ObfuscatedName("as") - String field3713; - @ObfuscatedName("aj") - String field3712; - @ObfuscatedName("ag") - boolean field3710; + SongTask field3724; + @ObfuscatedName("at") + String field3723; + @ObfuscatedName("ac") + String field3722; + @ObfuscatedName("ai") + boolean field3720; @ObfuscatedName("az") - boolean field3711; + boolean field3721; @ObfuscatedSignature( - descriptor = "(Lpp;)V" + descriptor = "(Lpm;)V" ) - SongTask(SongTask var1) { - this.field3714 = var1; + SongTask(SongTask var1) { + this.field3724 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "994462530" + descriptor = "(I)Z", + garbageValue = "1604030758" ) - public abstract boolean vmethod2107(int var1); + public abstract boolean vmethod2142(); - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "15" + garbageValue = "3" ) - public boolean method2098() { - return this.field3710; + public boolean method2132() { + return this.field3720; } @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "751419690" + garbageValue = "1850076782" ) - public boolean method2099() { - return this.field3711; + public boolean method2134() { + return this.field3721; } - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-29" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "2126528347" ) - public String method2100() { - return "Error in task: " + this.field3712 + ", Error message: " + this.field3713; + public String method2135() { + return "Error in task: " + this.field3722 + ", Error message: " + this.field3723; } - @ObfuscatedName("ap") + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(S)Lpm;", + garbageValue = "255" + ) + public SongTask method2136() { + return this.field3724; + } + + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(S)Lpp;", - garbageValue = "276" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "14" ) - public SongTask method2101() { - return this.field3714; + void method2138(String var1) { + this.field3720 = true; + this.field3723 = var1; } - @ObfuscatedName("aq") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "934674418" + descriptor = "(IB)Z", + garbageValue = "-7" ) - void method2102(String var1) { - this.field3710 = true; - this.field3713 = var1; + @Export("isWorldMapEvent") + public static boolean isWorldMapEvent(int var0) { + return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; } - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;Lnd;I)V", - garbageValue = "-1865602506" + descriptor = "(II)I", + garbageValue = "-1563316878" ) - public static void method2103(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - SequenceDefinition.SequenceDefinition_archive = var0; - class333.SequenceDefinition_animationsArchive = var1; - class169.SequenceDefinition_skeletonsArchive = var2; + public static int method2137(int var0) { + return class464.field3908[var0 & 16383]; + } + + @ObfuscatedName("mg") + @ObfuscatedSignature( + descriptor = "(Lmi;IIIIIIB)V", + garbageValue = "-68" + ) + static final void method2139(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field382) { + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; + } + + Client.field382 = false; + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + class218.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + class218.invalidateWidget(var0); + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { + var7 = var3 * (var3 - 32) / var4; + if (var7 < 8) { + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + class218.invalidateWidget(var0); + Client.field382 = true; + } + } + + if (Client.mouseWheelRotation != 0) { + var7 = var0.width; + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + var0.scrollY += Client.mouseWheelRotation * 45; + class218.invalidateWidget(var0); + } + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SoundCache.java b/osrs/src/main/java/SoundCache.java index 6a07e0727..5e27e3c56 100644 --- a/osrs/src/main/java/SoundCache.java +++ b/osrs/src/main/java/SoundCache.java @@ -1,64 +1,61 @@ -import java.util.concurrent.ThreadPoolExecutor; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +import java.util.LinkedList; +import java.util.List; + +@ObfuscatedName("bi") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("az") - public static ThreadPoolExecutor field214; - @ObfuscatedName("kt") - @ObfuscatedSignature( - descriptor = "Lud;" - ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - @ObfuscatedName("ul") + @ObfuscatedName("aa") + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("dd") @ObfuscatedSignature( - descriptor = "Lcj;" + descriptor = "[Luk;" ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("aw") + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) - AbstractArchive field218; - @ObfuscatedName("ar") + AbstractArchive field216; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsm;" + descriptor = "Lso;" ) - NodeHashTable field219; + NodeHashTable field218; @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;)V" + descriptor = "(Lnu;Lnu;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { new NodeHashTable(256); - this.field219 = new NodeHashTable(256); + this.field218 = new NodeHashTable(256); this.soundEffectIndex = var1; - this.field218 = var2; + this.field216 = var2; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II[II)Lbi;", - garbageValue = "-446008293" + descriptor = "(II[II)Lbu;", + garbageValue = "-1861641707" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { - long var4 = this.method227(var1, var2, false); - class53 var6 = (class53)this.field219.get(var4); + long var4 = this.method226(var1, var2, false); + class53 var6 = (class53)this.field218.get(var4); if (var6 != null) { - return var6.method296(); + return var6.method292(); } else if (var3 != null && var3[0] <= 0) { return null; } else { @@ -67,7 +64,7 @@ RawSound getSoundEffect0(int var1, int var2, int[] var3) { return null; } else { RawSound var8 = var7.toRawSound(); - this.field219.put(new class53(var8), var4); + this.field218.put(new class53(var8), var4); if (var3 != null) { var3[0] -= var8.samples.length; } @@ -77,32 +74,32 @@ RawSound getSoundEffect0(int var1, int var2, int[] var3) { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(IIB)Lcf;", - garbageValue = "45" + garbageValue = "-98" ) - class53 method222(int var1, int var2) { - long var3 = this.method227(var1, var2, true); - class53 var5 = (class53)this.field219.get(var3); + class53 method221(int var1, int var2) { + long var3 = this.method226(var1, var2, true); + class53 var5 = (class53)this.field218.get(var3); if (var5 != null) { return var5; } else { - VorbisSample var6 = VorbisSample.readMusicSample(this.field218, var1, var2); + VorbisSample var6 = VorbisSample.readMusicSample(this.field216, var1, var2); if (var6 == null) { return new class53(); } else { class53 var7 = new class53(var6); - this.field219.put(var7, var3); + this.field218.put(var7, var3); return var7; } } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I[II)Lbi;", - garbageValue = "290841412" + descriptor = "(I[II)Lbu;", + garbageValue = "88728645" ) @Export("getSoundEffect") RawSound getSoundEffect(int var1, int[] var2) { @@ -115,174 +112,271 @@ RawSound getSoundEffect(int var1, int[] var2) { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)Lcf;", - garbageValue = "-1226471323" + garbageValue = "134889372" ) - public class53 method225(int var1) { - if (this.field218.getGroupCount() == 1) { - return this.method222(0, var1); - } else if (this.field218.getGroupFileCount(var1) == 1) { - return this.method222(var1, 0); + public class53 method223(int var1) { + if (this.field216.getGroupCount() == 1) { + return this.method221(0, var1); + } else if (this.field216.getGroupFileCount(var1) == 1) { + return this.method221(var1, 0); } else { throw new RuntimeException(); } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IS)Lbi;", - garbageValue = "500" + descriptor = "(II)Lbu;", + garbageValue = "1913686453" ) - public RawSound method226(int var1) { + public RawSound method225(int var1) { return this.getSoundEffect(var1, (int[])null); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(IIZI)J", - garbageValue = "-167512765" + garbageValue = "1190461425" ) - long method227(int var1, int var2, boolean var3) { + long method226(int var1, int var2, boolean var3) { int var4 = var2 ^ (var1 << 4 & 65535 | var1 >> 12); var4 |= var1 << 16; return var3 ? (long)var4 ^ 4294967296L : (long)var4; } - @ObfuscatedName("am") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "([BB)Ldc;", - garbageValue = "60" + descriptor = "(III)Lmi;", + garbageValue = "139540914" ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); - Buffer var2 = new Buffer(var0); - var2.offset = var2.array.length - 2; - int var3 = var2.readUnsignedShort(); - int var4 = var2.array.length - 2 - var3 - 12; - var2.offset = var4; - int var5 = var2.readInt(); - var1.localIntCount = var2.readUnsignedShort(); - var1.localStringCount = var2.readUnsignedShort(); - var1.intArgumentCount = var2.readUnsignedShort(); - var1.stringArgumentCount = var2.readUnsignedShort(); - int var6 = var2.readUnsignedByte(); - int var7; - int var8; - if (var6 > 0) { - var1.switches = var1.newIterableNodeHashTable(var6); - - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? UrlRequest.method657(var8) : 1); - var1.switches[var7] = var9; - - while (var8-- > 0) { - int var10 = var2.readInt(); - int var11 = var2.readInt(); - var9.put(new IntegerNode(var11), (long)var10); - } - } - } - - var2.offset = 0; - var1.field815 = var2.readStringCp1252NullTerminatedOrNull(); - var1.opcodes = new int[var5]; - var1.intOperands = new int[var5]; - var1.stringOperands = new String[var5]; - - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { - var8 = var2.readUnsignedShort(); - if (var8 == 3) { - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); - } + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = class92.getWidget(var0); + if (var1 == -1) { + return var2; + } else { + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; } - - return var1; } - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-29" + descriptor = "(II)V", + garbageValue = "-1117171488" ) - static void method224() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - } + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + for (int var2 = 0; var2 < var1.ids.length; ++var2) { + var1.ids[var2] = -1; + var1.quantities[var2] = 0; + } - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "104" - ) - static final void method229(int var0) { - if (var0 >= 0) { - int var1 = Client.menuArguments1[var0]; - int var2 = Client.menuArguments2[var0]; - int var3 = Client.menuOpcodes[var0]; - int var4 = Client.menuIdentifiers[var0]; - int var5 = Client.menuItemIds[var0]; - String var6 = Client.menuActions[var0]; - String var7 = Client.menuTargets[var0]; - class60.menuAction(var1, var2, var3, var4, var5, var6, var7, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } } - @ObfuscatedName("lj") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-3" + descriptor = "(ILdh;ZI)I", + garbageValue = "-1164645966" ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { - Widget var0 = MouseRecorder.getWidgetChild(class33.selectedSpellWidget, Client.selectedSpellChildIndex); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var1); - } + static int method228(int var0, Script var1, boolean var2) { + int var3; + int var5; + int var7; + Object var21; + class506 var22; + if (var0 != 7500 && var0 != 7508) { + if (var0 != 7501) { + int var4; + int var6; + if (var0 == 7502) { + Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; + var6 = UserComparator3.method682(var4); + var7 = NewShit.method979(var4); + int var8 = MoveSpeed.method1141(var4); + DbRowType var23 = class159.getDbRowType(var3); + DbTableType var24 = class159.getDbTableType(var6); + int[] var25 = var24.types[var7]; + int var12 = 0; + int var13 = var25.length; + if (var8 >= 0) { + if (var8 >= var13) { + throw new RuntimeException("Tuple index out-of-bounds. Requested: " + var8 + ", Max: " + var13); + } - Client.selectedSpellItemId = -1; - Client.isSpellSelected = false; - class200.invalidateWidget(var0); - } - } + var12 = var8; + var13 = var8 + 1; + } - @ObfuscatedName("ly") - @ObfuscatedSignature( - descriptor = "([Lmt;Lmt;ZI)V", - garbageValue = "1867193194" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1086068083 * 685053883 : var1.width * -1335812425 * 1247813383; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 257692207 * 1689285839 : var1.height * 1681849845 * -633207203; - class36.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - class36.resizeInterface(var1.children, var1.id, var3, var4, var2); - } + Object[] var14 = var23.getColumnType(var7); + if (var14 == null && var24.defaultValues != null) { + var14 = var24.defaultValues[var7]; + } - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - int var6 = var5.group; - if (Login.loadInterface(var6)) { - class36.resizeInterface(ArchiveLoader.Widget_interfaceComponents[var6], -1, var3, var4, var2); + int var15; + int var16; + if (var14 == null) { + for (var15 = var12; var15 < var13; ++var15) { + var16 = var25[var15]; + class502 var17 = SequenceDefinition.method1074(var16); + if (var17 == class502.field4100) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = class127.method703(var16); + } + } + + return 1; + } else { + var15 = var14.length / var25.length; + if (var5 >= 0 && var5 < var15) { + for (var16 = var12; var16 < var13; ++var16) { + int var19 = var16 + var25.length * var5; + class502 var18 = SequenceDefinition.method1074(var25[var16]); + if (var18 == class502.field4100) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = (String)var14[var19]; + } else { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (Integer)var14[var19]; + } + } + + return 1; + } else { + throw new RuntimeException(); + } + } + } else if (var0 == 7503) { + Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; + var5 = 0; + var6 = UserComparator3.method682(var4); + var7 = NewShit.method979(var4); + DbRowType var26 = class159.getDbRowType(var3); + DbTableType var9 = class159.getDbTableType(var6); + int[] var10 = var9.types[var7]; + Object[] var11 = var26.getColumnType(var7); + if (var11 == null && var9.defaultValues != null) { + var11 = var9.defaultValues[var7]; + } + + if (var11 != null) { + var5 = var11.length / var10.length; + } + + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var5; + return 1; + } else if (var0 != 7504 && var0 != 7510) { + if (var0 == 7505) { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + DbRowType var28 = class159.getDbRowType(var3); + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var28.tableId; + return 1; + } else if (var0 == 7506) { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + var4 = -1; + if (VarcInt.field1532 != null && var3 >= 0 && var3 < VarcInt.field1532.size()) { + var4 = (Integer)VarcInt.field1532.get(var3); + } + + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var4; + return 1; + } else if (var0 != 7507 && var0 != 7509) { + return 2; + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + var21 = MoveSpeed.method1143(var3); + var5 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + var22 = class344.method1868(var5); + if (var22 == null) { + throw new RuntimeException(); + } else if (UserComparator3.method682(var5) != Client.field549) { + throw new RuntimeException(); + } else if (VarcInt.field1532 == null && VarcInt.field1532.isEmpty()) { + throw new RuntimeException(); + } else { + var7 = MoveSpeed.method1141(var5); + List var20 = var22.method2507(var21, var7); + VarcInt.field1532 = new LinkedList(VarcInt.field1532); + if (var20 != null) { + VarcInt.field1532.retainAll(var20); + } else { + VarcInt.field1532.clear(); + } + + Decimator.field296 = VarcInt.field1532.iterator(); + if (var0 == 7507) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = VarcInt.field1532.size(); + } + + return 1; + } + } + } else { + --Interpreter_intStackSize; + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; + class506 var27 = IgnoreList.method2190(var3); + if (var27 == null) { + throw new RuntimeException(); + } else { + VarcInt.field1532 = var27.method2507(0, 0); + var5 = 0; + if (VarcInt.field1532 != null) { + Client.field549 = var3; + Decimator.field296 = VarcInt.field1532.iterator(); + var5 = VarcInt.field1532.size(); + } + + if (var0 == 7504) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var5; + } + + return 1; + } + } + } else { + if (Decimator.field296 != null && Decimator.field296.hasNext()) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (Integer)Decimator.field296.next(); + } else { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = -1; + } + + return 1; } - } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + var21 = MoveSpeed.method1143(var3); + var5 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + var22 = class344.method1868(var5); + if (var22 == null) { + throw new RuntimeException(); + } else { + var7 = MoveSpeed.method1141(var5); + VarcInt.field1532 = var22.method2507(var21, var7); + if (VarcInt.field1532 != null) { + Client.field549 = UserComparator3.method682(var5); + Decimator.field296 = VarcInt.field1532.iterator(); + if (var0 == 7500) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = VarcInt.field1532.size(); + } + } else { + Client.field549 = -1; + Decimator.field296 = null; + if (var0 == 7500) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 0; + } + } - if (var1.contentType == 1337) { + return 1; + } } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SoundEffect.java b/osrs/src/main/java/SoundEffect.java index 61fe0f621..aa01b3be8 100644 --- a/osrs/src/main/java/SoundEffect.java +++ b/osrs/src/main/java/SoundEffect.java @@ -3,24 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("bp") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "[Lcq;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("start") int start; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbu;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public RawSound toRawSound() { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; @@ -83,7 +83,7 @@ public final int calculateDelay() { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("mix") final byte[] mix() { int var1 = 0; @@ -122,13 +122,13 @@ final byte[] mix() { } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;II)Lbc;" + descriptor = "(Lnu;II)Lbp;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new SoundEffect(new Buffer(var3)); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SoundEnvelope.java b/osrs/src/main/java/SoundEnvelope.java index e22b26aa8..b5f50238b 100644 --- a/osrs/src/main/java/SoundEnvelope.java +++ b/osrs/src/main/java/SoundEnvelope.java @@ -3,40 +3,40 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bz") +@ObfuscatedName("br") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("segments") int segments; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("durations") int[] durations; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("phases") int[] phases; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("start") int start; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("end") int end; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("form") int form; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("ticks") int ticks; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("step") int step; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("amplitude") int amplitude; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("max") int max; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ final void decode(Buffer var1) { this.decodeSegments(var1); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ final void decodeSegments(Buffer var1) { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("reset") final void reset() { this.ticks = 0; @@ -89,7 +89,7 @@ final void reset() { this.max = 0; } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { @@ -108,4 +108,4 @@ final int doStep(int var1) { ++this.max; return this.amplitude - this.step >> 15; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SoundSystem.java b/osrs/src/main/java/SoundSystem.java index 51d0570fd..11b89467f 100644 --- a/osrs/src/main/java/SoundSystem.java +++ b/osrs/src/main/java/SoundSystem.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bx") +@ObfuscatedName("be") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("bb") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("kl") - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "[Lbk;" + descriptor = "Luk;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "[Lbb;" ) @Export("players") - public volatile PcmPlayer[] players; + volatile PcmPlayer[] players; - public SoundSystem() { + SoundSystem() { this.players = new PcmPlayer[2]; } @@ -34,29 +34,28 @@ public void run() { } } } catch (Exception var4) { - class317.RunException_sendStackTrace((String)null, var4); + Messages.RunException_sendStackTrace((String)null, var4); } } - @ObfuscatedName("hc") + @ObfuscatedName("nx") @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "13799" + descriptor = "(IIZB)V", + garbageValue = "0" ) - static void method220(int var0, int var1, int var2) { - if (var0 != 0) { - int var3 = var0 >> 8; - int var4 = var0 >> 4 & 7; - int var5 = var0 & 15; - Client.soundEffectIds[Client.soundEffectCount] = var3; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; - Client.soundEffects[Client.soundEffectCount] = null; - int var6 = (var1 - 64) / 128; - int var7 = (var2 - 64) / 128; - Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); - ++Client.soundEffectCount; + static final void method219(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method859()) { + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(4 + AbstractSocket.stringCp1252NullTerminatedByteSize(var3.username.getName())); + var4.packetBuffer.writeByte(var0); + var4.packetBuffer.writeShort(var1); + var4.packetBuffer.writeBoolean(var2); + var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); + Client.packetWriter.addNode(var4); + } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SpotAnimation.java b/osrs/src/main/java/SpotAnimation.java index cd7d1ac14..c3d8fdb9f 100644 --- a/osrs/src/main/java/SpotAnimation.java +++ b/osrs/src/main/java/SpotAnimation.java @@ -1,27 +1,29 @@ +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ub") +@ObfuscatedName("un") +@Implements("SpotAnimation") public class SpotAnimation extends Node { - @ObfuscatedName("aw") - public int field4238; - @ObfuscatedName("ay") - public int field4239; - @ObfuscatedName("ar") - public int field4236; - @ObfuscatedName("am") - public int field4235; - @ObfuscatedName("as") - public int field4237; + @ObfuscatedName("au") + public int field4281; + @ObfuscatedName("ae") + public int field4278; + @ObfuscatedName("ao") + public int field4279; + @ObfuscatedName("at") + public int field4280; + @ObfuscatedName("ac") + public int field4277; public SpotAnimation(int var1, int var2, int var3, int var4) { - this.field4238 = -1; - this.field4239 = 0; - this.field4236 = 0; - this.field4235 = 0; - this.field4237 = 0; - this.field4238 = var1; - this.field4237 = var2; - this.field4235 = var3; - this.field4239 = var4; + this.field4281 = -1; + this.field4278 = 0; + this.field4279 = 0; + this.field4280 = 0; + this.field4277 = 0; + this.field4281 = var1; + this.field4277 = var2; + this.field4280 = var3; + this.field4278 = var4; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SpotAnimationDefinition.java b/osrs/src/main/java/SpotAnimationDefinition.java index ccd99c55b..5daec246a 100644 --- a/osrs/src/main/java/SpotAnimationDefinition.java +++ b/osrs/src/main/java/SpotAnimationDefinition.java @@ -3,61 +3,75 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; + +@ObfuscatedName("ha") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("SpotAnimationDefinition_archive") public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("ar") + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("SpotAnimationDefinition_modelArchive") + public static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("SpotAnimationDefinition_cached") - static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("am") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("SpotAnimationDefinition_cachedModels") - static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("as") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("sl") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("ac") @Export("id") int id; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("archive") int archive; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("sequence") public int sequence; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("widthScale") int widthScale; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("heightScale") int heightScale; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("orientation") int orientation; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("ambient") int ambient; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("contrast") int contrast; @@ -75,10 +89,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "26" + descriptor = "(Ltm;B)V", + garbageValue = "127" ) @Export("decode") void decode(Buffer var1) { @@ -92,10 +106,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-797026654" + descriptor = "(Ltm;IB)V", + garbageValue = "83" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -139,17 +153,17 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)Ljo;", - garbageValue = "-2055096855" + descriptor = "(II)Ljr;", + garbageValue = "620606809" ) @Export("getModel") public final Model getModel(int var1) { - Model var2 = this.method985(); + Model var2 = this.method1002(); Model var3; if (this.sequence != -1 && var1 != -1) { - var3 = class135.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var3 = EnumComposition.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var3 = var2.toSharedSpotAnimationModel(true); } @@ -178,15 +192,15 @@ public final Model getModel(int var1) { return var3; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Ljo;", - garbageValue = "1754203875" + descriptor = "(B)Ljr;", + garbageValue = "-10" ) - public final Model method985() { + public final Model method1002() { Model var1 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); if (var1 == null) { - ModelData var2 = ModelData.ModelData_get(class53.SpotAnimationDefinition_modelArchive, this.archive, 0); + ModelData var2 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); if (var2 == null) { return null; } @@ -210,4 +224,30 @@ public final Model method985() { return var1; } -} + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/Date;", + garbageValue = "1382100876" + ) + static Date method1003() throws ParseException { + SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); + var0.setLenient(false); + StringBuilder var1 = new StringBuilder(); + String[] var2 = Login.field768; + + for (int var3 = 0; var3 < var2.length; ++var3) { + String var4 = var2[var3]; + if (var4 == null) { + PcmPlayer.method212(7); + class318.setLoginResponseString("Date not valid.", "Please ensure all characters are populated.", ""); + return null; + } + + var1.append(var4); + } + + var1.append("12"); + return var0.parse(var1.toString()); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/SpriteMask.java b/osrs/src/main/java/SpriteMask.java index 5cbbcfd4e..c5fc33b4f 100644 --- a/osrs/src/main/java/SpriteMask.java +++ b/osrs/src/main/java/SpriteMask.java @@ -3,19 +3,22 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mi") +@ObfuscatedName("me") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("az") + @Export("SpriteBuffer_spriteHeights") + static int[] SpriteBuffer_spriteHeights; + @ObfuscatedName("au") @Export("width") public final int width; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("height") public final int height; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("xStarts") public final int[] xStarts; @@ -26,10 +29,10 @@ public class SpriteMask extends DualNode { this.xStarts = var4; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-2123679375" + garbageValue = "152224212" ) @Export("contains") public boolean contains(int var1, int var2) { @@ -43,13 +46,12 @@ public boolean contains(int var1, int var2) { return false; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "4" + descriptor = "(II)I", + garbageValue = "-1301851589" ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); + public static int method1706(int var0) { + return var0 >> 17 & 7; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SpritePixels.java b/osrs/src/main/java/SpritePixels.java index db63d3e90..5a81c5f67 100644 --- a/osrs/src/main/java/SpritePixels.java +++ b/osrs/src/main/java/SpritePixels.java @@ -3,28 +3,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ud") +@ObfuscatedName("ui") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("pixels") public int[] pixels; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("subWidth") public int subWidth; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("subHeight") public int subHeight; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("xOffset") public int xOffset; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("yOffset") int yOffset; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("width") public int width; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("height") public int height; @@ -43,9 +43,9 @@ public SpritePixels(int var1, int var2) { SpritePixels() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "()Lud;" + descriptor = "()Lui;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { @@ -64,11 +64,11 @@ public SpritePixels mirrorHorizontally() { return var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "()Lud;" + descriptor = "()Lui;" ) - public SpritePixels method2638() { + public SpritePixels method2657() { SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); var1.width = this.width; var1.height = this.height; @@ -83,9 +83,9 @@ public SpritePixels method2638() { return var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "()Lud;" + descriptor = "()Lui;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { @@ -100,13 +100,13 @@ public SpritePixels copyNormalized() { return var1; } - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("setRaster") public void setRaster() { - Rasterizer2D.method2601(this.pixels, this.subWidth, this.subHeight, (float[])null); + Rasterizer2D.method2620(this.pixels, this.subWidth, this.subHeight, (float[])null); } - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -126,7 +126,7 @@ public void normalize() { } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -168,7 +168,7 @@ public void pad(int var1) { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -184,7 +184,7 @@ public void flipHorizontally() { this.xOffset = this.width - this.subWidth - this.xOffset; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -200,7 +200,7 @@ public void flipVertically() { this.yOffset = this.height - this.subHeight - this.yOffset; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; @@ -228,7 +228,7 @@ public void outline(int var1) { this.pixels = var2; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { @@ -243,7 +243,7 @@ public void shadow(int var1) { } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -289,7 +289,7 @@ public void drawAt(int var1, int var2) { } } - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; @@ -335,7 +335,7 @@ public void drawTransBgAt(int var1, int var2) { } } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { @@ -400,7 +400,7 @@ public void drawScaledAt(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { @@ -450,7 +450,7 @@ public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; @@ -496,7 +496,7 @@ public void drawTransAt(int var1, int var2, int var3) { } } - @ObfuscatedName("ac") + @ObfuscatedName("as") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { @@ -561,8 +561,8 @@ public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) } } - @ObfuscatedName("an") - public void method2659(int var1, int var2, int var3) { + @ObfuscatedName("aj") + public void method2678(int var1, int var2, int var3) { var1 += this.xOffset; var2 += this.yOffset; int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -603,16 +603,16 @@ public void method2659(int var1, int var2, int var3) { if (var7 > 0 && var6 > 0) { if (var3 == 256) { - method2660(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method2679(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method2661(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method2680(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } } - @ObfuscatedName("al") - public void method2662(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ak") + public void method2681(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { int var6 = this.subWidth; int var7 = this.subHeight; @@ -672,16 +672,16 @@ public void method2662(int var1, int var2, int var3, int var4, int var5) { } if (var5 == 256) { - method2663(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method2682(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method2664(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method2683(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } } - @ObfuscatedName("bn") - public void method2665(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("bk") + public void method2684(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0 ? -var2 : 0; int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; int var11 = var1 < 0 ? -var1 : 0; @@ -728,7 +728,7 @@ public void method2665(int var1, int var2, int var3, int var4, int var5, int var } - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { @@ -763,8 +763,8 @@ public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int va } - @ObfuscatedName("bf") - public void method2667(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("bt") + public void method2686(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; int var11 = -var4 / 2; @@ -802,13 +802,13 @@ public void method2667(int var1, int var2, int var3, int var4, int var5, int var } - @ObfuscatedName("bs") - public void method2668(int var1, int var2, int var3, int var4) { - this.method2669(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + @ObfuscatedName("bd") + public void method2687(int var1, int var2, int var3, int var4) { + this.method2688(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } - @ObfuscatedName("bp") - void method2669(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("by") + void method2688(int var1, int var2, int var3, int var4, int var5, int var6) { if (var6 != 0) { var1 -= this.xOffset << 4; var2 -= this.yOffset << 4; @@ -1276,7 +1276,7 @@ void method2669(int var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { @@ -1399,7 +1399,7 @@ public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { @@ -1419,7 +1419,7 @@ static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, in } - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -1472,7 +1472,7 @@ static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int v } - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; @@ -1498,7 +1498,7 @@ static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int va } - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { int var11 = 256 - var9; @@ -1524,7 +1524,7 @@ static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, } - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; @@ -1546,7 +1546,7 @@ static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, i } - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { int var13 = 256 - var12; @@ -1574,8 +1574,8 @@ static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, i } - @ObfuscatedName("af") - static void method2660(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + @ObfuscatedName("av") + static void method2679(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1596,8 +1596,8 @@ static void method2660(int var0, int var1, int var2, int[] var3, int[] var4, int } - @ObfuscatedName("ai") - static void method2661(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + @ObfuscatedName("aw") + static void method2680(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1620,8 +1620,8 @@ static void method2661(int var0, int var1, int var2, int[] var3, int[] var4, int } - @ObfuscatedName("bd") - static void method2663(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + @ObfuscatedName("bh") + static void method2682(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { for (int var16 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); @@ -1647,8 +1647,8 @@ static void method2663(int var0, int var1, int var2, int var3, int[] var4, int[] } - @ObfuscatedName("bb") - static void method2664(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { + @ObfuscatedName("bj") + static void method2683(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { for (int var17 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); @@ -1675,4 +1675,4 @@ static void method2664(int var0, int var1, int var2, int var3, int[] var4, int[] } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Strings.java b/osrs/src/main/java/Strings.java index 321bb1ff2..c12154aa1 100644 --- a/osrs/src/main/java/Strings.java +++ b/osrs/src/main/java/Strings.java @@ -2,46 +2,43 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nz") +@ObfuscatedName("nr") @Implements("Strings") public class Strings { - @ObfuscatedName("fg") - public static String field3291; + @ObfuscatedName("fs") + public static String field3315; @ObfuscatedName("kl") - public static String field3412; - @ObfuscatedName("ks") - public static String field3419; - @ObfuscatedName("kj") - public static String field3410; + public static String field3423; + @ObfuscatedName("kk") + public static String field3422; + @ObfuscatedName("kc") + public static String field3414; static { - field3291 = "Please visit the support page for assistance."; - field3412 = ""; - field3419 = "Page has opened in the browser."; - field3410 = ""; + field3315 = "Please visit the support page for assistance."; + field3423 = ""; + field3422 = "Page has opened in the browser."; + field3414 = ""; } - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "189737600" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "64" ) - static final float method1841(int var0) { - float var1 = 10075.0F - (float)var0; - return (1.0075567F * var1 - 75.56675F) / var1; + static final void method1877(String var0) { + UserComparator8.method673(var0 + " is already on your friend list"); } - @ObfuscatedName("av") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-2120353581" + descriptor = "(IIB)I", + garbageValue = "-116" ) - static int method1842(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; - } + static final int method1878(int var0, int var1) { + int var2 = var1 * 57 + var0; + var2 ^= var2 << 13; + int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; + return var3 >> 19 & 255; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/StructComposition.java b/osrs/src/main/java/StructComposition.java index 97352cafb..e4c7bcc19 100644 --- a/osrs/src/main/java/StructComposition.java +++ b/osrs/src/main/java/StructComposition.java @@ -3,24 +3,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("hc") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("StructDefinition_archive") - static AbstractArchive StructDefinition_archive; - @ObfuscatedName("ay") + public static AbstractArchive StructDefinition_archive; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("StructDefinition_cached") - static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("ar") + public static EvictingDualNodeHashTable StructDefinition_cached; + @ObfuscatedName("am") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsa;" + descriptor = "Lsf;" ) @Export("params") IterableNodeHashTable params; @@ -32,19 +35,19 @@ public class StructComposition extends DualNode { StructComposition() { } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "448946158" + garbageValue = "-1093103177" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;B)V", + garbageValue = "-50" ) @Export("decode") void decode(Buffer var1) { @@ -58,33 +61,33 @@ void decode(Buffer var1) { } } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "595587202" + descriptor = "(Ltm;II)V", + garbageValue = "1817135134" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = class141.readStringIntParameters(var1, this.params); + this.params = Decimator.readStringIntParameters(var1, this.params); } } - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-154725242" + garbageValue = "-1339358564" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return FileSystem.method904(this.params, var1, var2); + return class14.method39(this.params, var1, var2); } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "-86" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "792481447" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { @@ -103,4 +106,85 @@ public String getStringParam(int var1, String var2) { return var3; } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IS)Lha;", + garbageValue = "-32325" + ) + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("jo") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1529858789" + ) + static final int method1024() { + if (class449.clientPreferences.getRoofsHidden()) { + return HealthBar.Client_plane; + } else { + int var0 = class18.getTileHeight(NPCComposition.cameraX, class139.cameraZ, HealthBar.Client_plane); + return var0 - class133.cameraY < 800 && (Tiles.Tiles_renderFlags[HealthBar.Client_plane][NPCComposition.cameraX >> 7][class139.cameraZ >> 7] & 4) != 0 ? HealthBar.Client_plane : 3; + } + } + + @ObfuscatedName("nt") + @ObfuscatedSignature( + descriptor = "(Lmi;B)V", + garbageValue = "-126" + ) + static final void method1025(Widget var0) { + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field542 == -1) { + Client.field542 = var0.spriteId2; + Client.field547 = var0.spriteId; + } + + if (Client.playerAppearance.field2916 == 1) { + var0.spriteId2 = Client.field542; + } else { + var0.spriteId2 = Client.field547; + } + + } else if (var1 == 325) { + if (Client.field542 == -1) { + Client.field542 = var0.spriteId2; + Client.field547 = var0.spriteId; + } + + if (Client.playerAppearance.field2916 == 1) { + var0.spriteId2 = Client.field547; + } else { + var0.spriteId2 = Client.field542; + } + + } else if (var1 == 327) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 0; + } else if (var1 == 328) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/StudioGame.java b/osrs/src/main/java/StudioGame.java index 563364e65..12d650fbd 100644 --- a/osrs/src/main/java/StudioGame.java +++ b/osrs/src/main/java/StudioGame.java @@ -1,54 +1,52 @@ -import java.util.ArrayList; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nu") +@ObfuscatedName("ns") @Implements("StudioGame") -public enum StudioGame implements class372 { - @ObfuscatedName("aw") +public enum StudioGame implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lns;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lns;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lns;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lns;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lns;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lns;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("name") public final String name; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("id") final int id; @@ -57,62 +55,105 @@ public enum StudioGame implements class372 { this.id = var5; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("mo") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lon;I)I", + garbageValue = "-1695354605" ) - static final void method1839(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); - if (var0 != class150.clientPreferences.getCurrentMusicVolume()) { - label36: { - if (class150.clientPreferences.getCurrentMusicVolume() == 0) { - boolean var1 = !class306.field2755.isEmpty(); - if (var1) { - Archive var2 = class13.archive6; - if (!class306.field2755.isEmpty()) { - ArrayList var3 = new ArrayList(); - Iterator var4 = class306.field2755.iterator(); + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); + int var4 = var1.length(); + int var5 = 0; + int var6 = 0; + char var7 = 0; + char var8 = 0; - while (var4.hasNext()) { - MusicSong var5 = (MusicSong)var4.next(); - var5.field2852 = false; - var5.field2849 = false; - var5.field2851 = false; - var5.musicTrackArchive = var2; - var5.musicTrackVolume = var0; - var5.field2853 = 0.0F; - var3.add(var5); - } + while (var5 - var7 < var3 || var6 - var8 < var4) { + if (var5 - var7 >= var3) { + return -1; + } - UserComparator4.method663(var3, class306.musicPlayerStatus, class306.field2753, class306.field2754, class306.field2751, false); - } + if (var6 - var8 >= var4) { + return 1; + } - Client.playingJingle = false; - break label36; - } - } + char var9; + if (var7 != 0) { + var9 = var7; + boolean var14 = false; + } else { + var9 = var0.charAt(var5++); + } + + char var10; + if (var8 != 0) { + var10 = var8; + boolean var15 = false; + } else { + var10 = var1.charAt(var6++); + } - if (var0 == 0) { - RouteStrategy.method1107(0, 0); - Client.playingJingle = false; - } else { - class7.method18(var0); + var7 = JagNetThread.method1931(var9); + var8 = JagNetThread.method1931(var10); + var9 = PlayerComposition.standardizeChar(var9, var2); + var10 = PlayerComposition.standardizeChar(var10, var2); + if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var9 != var10) { + return class59.lowercaseChar(var9, var2) - class59.lowercaseChar(var10, var2); } } + } + + int var16 = Math.min(var3, var4); + + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { + if (var2 == Language.Language_FR) { + var5 = var3 - 1 - var17; + var6 = var4 - 1 - var17; + } else { + var6 = var17; + var5 = var17; + } - class150.clientPreferences.setCurrentMusicVolume(var0); + char var11 = var0.charAt(var5); + var12 = var1.charAt(var6); + if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { + var11 = Character.toLowerCase(var11); + var12 = Character.toLowerCase(var12); + if (var11 != var12) { + return class59.lowercaseChar(var11, var2) - class59.lowercaseChar(var12, var2); + } + } } + var17 = var3 - var4; + if (var17 != 0) { + return var17; + } else { + for (int var18 = 0; var18 < var16; ++var18) { + var12 = var0.charAt(var18); + char var13 = var1.charAt(var18); + if (var13 != var12) { + return class59.lowercaseChar(var12, var2) - class59.lowercaseChar(var13, var2); + } + } + + return 0; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/SwapSongTask.java b/osrs/src/main/java/SwapSongTask.java index c1555cde2..521a72cb9 100644 --- a/osrs/src/main/java/SwapSongTask.java +++ b/osrs/src/main/java/SwapSongTask.java @@ -1,28 +1,38 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pj") +@ObfuscatedName("po") +@Implements("SwapSongTask") public class SwapSongTask extends SongTask { + @ObfuscatedName("rd") @ObfuscatedSignature( - descriptor = "(Lpp;)V" + descriptor = "Lth;" + ) + @Export("HitSplatDefinition_cached") + static class497 HitSplatDefinition_cached; + + @ObfuscatedSignature( + descriptor = "(Lpm;)V" ) public SwapSongTask(SongTask var1) { super(var1); - super.field3712 = "SwapSongTask"; + super.field3722 = "SwapSongTask"; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "994462530" + descriptor = "(I)Z", + garbageValue = "1604030758" ) - public boolean vmethod2107(int var1) { - if (class306.musicSongs.size() > 1 && class306.musicSongs.get(0) != null && ((MusicSong)class306.musicSongs.get(0)).midiPcmStream.isReady() && class306.musicSongs.get(1) != null && ((MusicSong)class306.musicSongs.get(1)).midiPcmStream.isReady()) { - MusicSong var2 = (MusicSong)class306.musicSongs.get(0); - class306.musicSongs.set(0, class306.musicSongs.get(1)); - class306.musicSongs.set(1, var2); + public boolean vmethod2142() { + if (class305.musicSongs.size() > 1 && class305.musicSongs.get(0) != null && ((MusicSong)class305.musicSongs.get(0)).midiPcmStream.isReady() && class305.musicSongs.get(1) != null && ((MusicSong)class305.musicSongs.get(1)).midiPcmStream.isReady()) { + MusicSong var1 = (MusicSong)class305.musicSongs.get(0); + class305.musicSongs.set(0, class305.musicSongs.get(1)); + class305.musicSongs.set(1, var1); } return true; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Task.java b/osrs/src/main/java/Task.java index 5a8073e6f..ae230de5d 100644 --- a/osrs/src/main/java/Task.java +++ b/osrs/src/main/java/Task.java @@ -3,32 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("gz") @Implements("Task") public class Task { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lgz;" ) @Export("next") Task next; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("status") public volatile int status; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("type") int type; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("intArgument") public int intArgument; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("result") public volatile Object result; Task() { this.status = 0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/TaskHandler.java b/osrs/src/main/java/TaskHandler.java index 6d0ad999e..626f1b8f1 100644 --- a/osrs/src/main/java/TaskHandler.java +++ b/osrs/src/main/java/TaskHandler.java @@ -1,37 +1,35 @@ -import java.io.DataInputStream; -import java.net.InetAddress; -import java.net.Socket; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +import java.io.DataInputStream; +import java.net.InetAddress; +import java.net.Socket; +import java.net.URL; + +@ObfuscatedName("gh") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("ay") - @Export("javaVersion") - public static String javaVersion; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lgz;" ) @Export("current") Task current; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lgz;" ) @Export("task") Task task; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("thread") Thread thread; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("isClosed") boolean isClosed; @@ -40,11 +38,11 @@ public TaskHandler() { this.task = null; this.isClosed = false; javaVendor = "Unknown"; - javaVersion = "1.6"; + class106.javaVersion = "1.6"; try { javaVendor = System.getProperty("java.vendor"); - javaVersion = System.getProperty("java.version"); + class106.javaVersion = System.getProperty("java.version"); } catch (Exception var2) { } @@ -55,10 +53,10 @@ public TaskHandler() { this.thread.start(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-226500506" + garbageValue = "629286454" ) @Export("close") public final void close() { @@ -74,10 +72,10 @@ public final void close() { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;I)Lgu;", - garbageValue = "1529565884" + descriptor = "(IIILjava/lang/Object;B)Lgz;", + garbageValue = "-15" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -98,20 +96,20 @@ final Task newTask(int var1, int var2, int var3, Object var4) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lgu;", - garbageValue = "-907549820" + descriptor = "(Ljava/lang/String;II)Lgz;", + garbageValue = "1426154941" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lgu;", - garbageValue = "2145317836" + descriptor = "(Ljava/lang/Runnable;II)Lgz;", + garbageValue = "1501831193" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -167,62 +165,4 @@ public final void run() { } } } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(Lmt;III)V", - garbageValue = "-302173760" - ) - public static void method898(Widget var0, int var1, int var2) { - PlayerComposition var3 = var0.field3081; - boolean var4 = var2 != var3.field2900; - var3.field2900 = var2; - if (var4) { - int var5; - int var10; - if (var3.field2900 == var1) { - for (var5 = 0; var5 < PlayerComposition.equipmentIndices.length; ++var5) { - var10 = PlayerComposition.equipmentIndices[var5]; - if (var3.equipment[var10] > 0 && var3.equipment[var10] < 512) { - var3.equipment[var10] = var3.field2894[var10]; - } - } - } else { - label84: { - if (var3.equipment[0] >= 512) { - boolean var11; - if (var3.equipment[0] < 512) { - var11 = false; - } else { - ItemComposition var6 = class125.ItemDefinition_get(var3.equipment[0] - 512); - var11 = var6.maleModel1 != class210.field1837.field1848 && var6.maleModel2 != class210.field1837.field1848; - } - - if (!var11) { - break label84; - } - } - - var3.equipment[class210.field1837.field1848] = 1; - } - - for (var5 = 0; var5 < 7; ++var5) { - var10 = PlayerComposition.equipmentIndices[var5]; - if (var3.equipment[var10] > 0 && var3.equipment[var10] < 512) { - int[] var7 = var3.equipment; - - for (int var8 = 0; var8 < KitDefinition.KitDefinition_fileCount; ++var8) { - KitDefinition var9 = class132.KitDefinition_get(var8); - if (var9 != null && !var9.nonSelectable && (var2 == 1 ? 7 : 0) + var5 == var9.bodypartID) { - var7[PlayerComposition.equipmentIndices[var5]] = var8 + 256; - break; - } - } - } - } - } - } - - var3.method1690(); - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Texture.java b/osrs/src/main/java/Texture.java index 3718d23f2..6e3c63e86 100644 --- a/osrs/src/main/java/Texture.java +++ b/osrs/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("if") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("averageRGB") int averageRGB; - @ObfuscatedName("aj") - boolean field1964; - @ObfuscatedName("ag") + @ObfuscatedName("ai") + boolean field1987; + @ObfuscatedName("az") @Export("fileIds") int[] fileIds; - @ObfuscatedName("az") - int[] field1973; - @ObfuscatedName("av") - int[] field1972; @ObfuscatedName("ap") - int[] field1971; - @ObfuscatedName("aq") + int[] field1995; + @ObfuscatedName("aa") + int[] field1992; + @ObfuscatedName("af") + int[] field1993; + @ObfuscatedName("ad") @Export("animationDirection") int animationDirection; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("pixels") int[] pixels; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) Texture(Buffer var1) { this.isLoaded = false; this.averageRGB = var1.readUnsignedShort(); - this.field1964 = var1.readUnsignedByte() == 1; + this.field1987 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 4) { this.fileIds = new int[var2]; @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { - this.field1973 = new int[var2 - 1]; + this.field1995 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1973[var3] = var1.readUnsignedByte(); + this.field1995[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { - this.field1972 = new int[var2 - 1]; + this.field1992 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1972[var3] = var1.readUnsignedByte(); + this.field1992[var3] = var1.readUnsignedByte(); } } - this.field1971 = new int[var2]; + this.field1993 = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.field1971[var3] = var1.readInt(); + this.field1993[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); @@ -82,9 +82,9 @@ public class Texture extends Node { } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(DILnd;)Z" + descriptor = "(DILnu;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,55 +99,62 @@ boolean load(double var1, int var3, AbstractArchive var4) { this.pixels = new int[var5]; for (int var6 = 0; var6 < this.fileIds.length; ++var6) { - IndexedSprite var7 = class494.method2440(var4, this.fileIds[var6]); + int var8 = this.fileIds[var6]; + IndexedSprite var7; + if (!Decimator.method313(var4, var8)) { + var7 = null; + } else { + var7 = class493.method2466(); + } + var7.normalize(); - byte[] var8 = var7.pixels; - int[] var9 = var7.palette; - int var10 = this.field1971[var6]; - if ((var10 & -16777216) == 16777216) { + byte[] var10 = var7.pixels; + int[] var11 = var7.palette; + int var12 = this.field1993[var6]; + if ((var12 & -16777216) == 16777216) { } - if ((var10 & -16777216) == 33554432) { + if ((var12 & -16777216) == 33554432) { } - int var11; - int var12; int var13; int var14; - if ((var10 & -16777216) == 50331648) { - var11 = var10 & 16711935; - var12 = var10 >> 8 & 255; - - for (var13 = 0; var13 < var9.length; ++var13) { - var14 = var9[var13]; - if (var14 >> 8 == (var14 & 65535)) { - var14 &= 255; - var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; + int var15; + int var16; + if ((var12 & -16777216) == 50331648) { + var13 = var12 & 16711935; + var14 = var12 >> 8 & 255; + + for (var15 = 0; var15 < var11.length; ++var15) { + var16 = var11[var15]; + if (var16 >> 8 == (var16 & 65535)) { + var16 &= 255; + var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; } } } - for (var11 = 0; var11 < var9.length; ++var11) { - var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); + for (var13 = 0; var13 < var11.length; ++var13) { + var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], var1); } if (var6 == 0) { - var11 = 0; + var13 = 0; } else { - var11 = this.field1973[var6 - 1]; + var13 = this.field1995[var6 - 1]; } - if (var11 == 0) { + if (var13 == 0) { if (var3 == var7.subWidth) { - for (var12 = 0; var12 < var5; ++var12) { - this.pixels[var12] = var9[var8[var12] & 255]; + for (var14 = 0; var14 < var5; ++var14) { + this.pixels[var14] = var11[var10[var14] & 255]; } } else if (var7.subWidth == 64 && var3 == 128) { - var12 = 0; + var14 = 0; - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { - this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { + for (var16 = 0; var16 < var3; ++var16) { + this.pixels[var14++] = var11[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; } } } else { @@ -155,36 +162,36 @@ boolean load(double var1, int var3, AbstractArchive var4) { throw new RuntimeException(); } - var12 = 0; + var14 = 0; - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { - this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { + for (var16 = 0; var16 < var3; ++var16) { + this.pixels[var14++] = var11[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; } } } } - if (var11 == 1) { + if (var13 == 1) { } - if (var11 == 2) { + if (var13 == 2) { } - if (var11 == 3) { + if (var13 == 3) { } } return true; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("reset") void reset() { this.pixels = null; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("animate") void animate(int var1) { if (this.pixels != null) { @@ -256,4 +263,4 @@ void animate(int var1) { } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/TextureLoader.java b/osrs/src/main/java/TextureLoader.java index ec02a65e3..4125a000c 100644 --- a/osrs/src/main/java/TextureLoader.java +++ b/osrs/src/main/java/TextureLoader.java @@ -3,38 +3,38 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("js") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)[I", - garbageValue = "84" + descriptor = "(II)[I", + garbageValue = "-1284455059" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1542791475" + garbageValue = "-1228029354" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "41" + garbageValue = "89" ) @Export("vmethod3989") boolean vmethod3989(int var1); - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1788191406" + garbageValue = "-1328264692" ) @Export("isLowDetail") boolean isLowDetail(int var1); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/TextureProvider.java b/osrs/src/main/java/TextureProvider.java index bb367f6e4..fe0f16322 100644 --- a/osrs/src/main/java/TextureProvider.java +++ b/osrs/src/main/java/TextureProvider.java @@ -3,42 +3,42 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("jk") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "[Lic;" + descriptor = "[Lif;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Low;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("capacity") int capacity; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("remaining") int remaining; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("brightness") double brightness; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("textureSize") int textureSize; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;IDI)V" + descriptor = "(Lnu;Lnu;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); @@ -65,10 +65,10 @@ public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, dou } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-243247454" + descriptor = "(B)I", + garbageValue = "1" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -87,7 +87,7 @@ public int getLoadedPercentage() { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.archive.method1872(var8)) { + if (this.archive.method1906(var8)) { ++var2; } } @@ -102,17 +102,17 @@ public int getLoadedPercentage() { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; this.clear(); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)[I", - garbageValue = "84" + descriptor = "(II)[I", + garbageValue = "-1284455059" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -142,40 +142,40 @@ public int[] getTexturePixels(int var1) { return null; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1542791475" + garbageValue = "-1228029354" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "41" + garbageValue = "89" ) @Export("vmethod3989") public boolean vmethod3989(int var1) { - return this.textures[var1].field1964; + return this.textures[var1].field1987; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1788191406" + garbageValue = "-1328264692" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-24" + descriptor = "(I)V", + garbageValue = "-1655781551" ) @Export("clear") public void clear() { @@ -189,10 +189,10 @@ public void clear() { this.remaining = this.capacity; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1648148323" + garbageValue = "2107237619" ) @Export("animate") public void animate(int var1) { @@ -205,4 +205,79 @@ public void animate(int var1) { } } -} + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;B)[B", + garbageValue = "1" + ) + public static byte[] method1301(CharSequence var0) { + int var1 = var0.length(); + byte[] var2 = new byte[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { + var2[var3] = (byte)var4; + } else if (var4 == 8364) { + var2[var3] = -128; + } else if (var4 == 8218) { + var2[var3] = -126; + } else if (var4 == 402) { + var2[var3] = -125; + } else if (var4 == 8222) { + var2[var3] = -124; + } else if (var4 == 8230) { + var2[var3] = -123; + } else if (var4 == 8224) { + var2[var3] = -122; + } else if (var4 == 8225) { + var2[var3] = -121; + } else if (var4 == 710) { + var2[var3] = -120; + } else if (var4 == 8240) { + var2[var3] = -119; + } else if (var4 == 352) { + var2[var3] = -118; + } else if (var4 == 8249) { + var2[var3] = -117; + } else if (var4 == 338) { + var2[var3] = -116; + } else if (var4 == 381) { + var2[var3] = -114; + } else if (var4 == 8216) { + var2[var3] = -111; + } else if (var4 == 8217) { + var2[var3] = -110; + } else if (var4 == 8220) { + var2[var3] = -109; + } else if (var4 == 8221) { + var2[var3] = -108; + } else if (var4 == 8226) { + var2[var3] = -107; + } else if (var4 == 8211) { + var2[var3] = -106; + } else if (var4 == 8212) { + var2[var3] = -105; + } else if (var4 == 732) { + var2[var3] = -104; + } else if (var4 == 8482) { + var2[var3] = -103; + } else if (var4 == 353) { + var2[var3] = -102; + } else if (var4 == 8250) { + var2[var3] = -101; + } else if (var4 == 339) { + var2[var3] = -100; + } else if (var4 == 382) { + var2[var3] = -98; + } else if (var4 == 376) { + var2[var3] = -97; + } else { + var2[var3] = 63; + } + } + + return var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Tile.java b/osrs/src/main/java/Tile.java index 89c17bd62..5c13ee528 100644 --- a/osrs/src/main/java/Tile.java +++ b/osrs/src/main/java/Tile.java @@ -3,101 +3,96 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("ii") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "Lsz;" - ) - static Fonts field1985; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("plane") int plane; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("x") int x; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("y") int y; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("originalPlane") int originalPlane; - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljg;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljv;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lje;" + descriptor = "Ljo;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljw;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Liy;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lir;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "[Ljc;" + descriptor = "[Ljy;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("minPlane") int minPlane; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("ao") - int field1995; - @ObfuscatedName("ac") - int field1991; - @ObfuscatedName("ak") - int field1993; - @ObfuscatedName("an") + @ObfuscatedName("ah") + int field2014; + @ObfuscatedName("as") + int field2018; + @ObfuscatedName("ay") + int field2022; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lil;" + descriptor = "Lii;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -111,46 +106,22 @@ public final class Tile extends Node { this.y = var3; } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Lhi;", - garbageValue = "1533776836" - ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = IntHashTable.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "83" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1321170330" ) - static final void method1160(String var0) { - class415.addGameMessage(30, "", var0); + @Export("addImageTag") + static String addImageTag(int var0) { + return ""; } - @ObfuscatedName("na") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1158913545" + descriptor = "(II)Lfv;", + garbageValue = "-1875628936" ) - static final void method1161() { - Client.field514 = Client.cycleCntr; - class458.field3887 = true; + static class137 method1184(int var0) { + return ClientPreferences.method571(var0) != 0 ? null : class338.method1862(var0); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/TileItem.java b/osrs/src/main/java/TileItem.java index 1c7a0b757..3e8a4a2ad 100644 --- a/osrs/src/main/java/TileItem.java +++ b/osrs/src/main/java/TileItem.java @@ -3,63 +3,99 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; + +@ObfuscatedName("ed") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("by") - @Export("client") - @ObfuscatedSignature( - descriptor = "Lclient;" - ) - static Client client; - @ObfuscatedName("fl") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("id") int id; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("quantity") int quantity; - @ObfuscatedName("am") - int field1096; + @ObfuscatedName("at") + int field1104; TileItem() { - this.field1096 = 31; + this.field1104 = 31; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2123957786" + descriptor = "(IS)V", + garbageValue = "11584" ) - void method613(int var1) { - this.field1096 = var1; + void method609(int var1) { + this.field1104 = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Ljo;", - garbageValue = "-983173466" + descriptor = "(I)Ljr;", + garbageValue = "798227647" ) @Export("getModel") protected final Model getModel() { - return class125.ItemDefinition_get(this.id).getModel(this.quantity); + return InvDefinition.ItemDefinition_get(this.id).getModel(this.quantity); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-83" + descriptor = "(II)Z", + garbageValue = "1782436453" ) - boolean method614(int var1) { + boolean method610(int var1) { if (var1 >= 0 && var1 <= 4) { - return (this.field1096 & 1 << var1) != 0; + return (this.field1104 & 1 << var1) != 0; } else { return true; } } -} + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lgh;III)Lbb;", + garbageValue = "881365546" + ) + public static final PcmPlayer method612(TaskHandler var0, int var1, int var2) { + if (var1 >= 0 && var1 < 2) { + if (var2 < 256) { + var2 = 256; + } + + try { + PcmPlayer var3 = FloorDecoration.pcmPlayerProvider.player(); + var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; + var3.field194 = var2; + var3.init(); + var3.capacity = (var2 & -1024) + 1024; + if (var3.capacity > 16384) { + var3.capacity = 16384; + } + + var3.open(var3.capacity); + if (PcmPlayer.field182 > 0 && Canvas.soundSystem == null) { + Canvas.soundSystem = new SoundSystem(); + PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); + PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(Canvas.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + } + + if (Canvas.soundSystem != null) { + if (Canvas.soundSystem.players[var1] != null) { + throw new IllegalArgumentException(); + } + + Canvas.soundSystem.players[var1] = var3; + } + + return var3; + } catch (Throwable var4) { + return new PcmPlayer(); + } + } else { + throw new IllegalArgumentException(); + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Tiles.java b/osrs/src/main/java/Tiles.java index db33f2d76..e8bf2f70b 100644 --- a/osrs/src/main/java/Tiles.java +++ b/osrs/src/main/java/Tiles.java @@ -3,79 +3,103 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dj") +@ObfuscatedName("du") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("Tiles_underlays") static short[][][] Tiles_underlays; - @ObfuscatedName("as") - @Export("Tiles_overlays") - static short[][][] Tiles_overlays; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("Tiles_lightness") static int[] Tiles_lightness; - @ObfuscatedName("ad") - static final int[] field840; - @ObfuscatedName("ao") + @ObfuscatedName("ax") static final int[] field844; - @ObfuscatedName("ac") - static final int[] field839; - @ObfuscatedName("ak") + @ObfuscatedName("ah") + static final int[] field840; + @ObfuscatedName("as") static final int[] field842; - @ObfuscatedName("an") - static final int[] field843; - @ObfuscatedName("af") + @ObfuscatedName("ay") + static final int[] field845; + @ObfuscatedName("aj") static final int[] field841; - @ObfuscatedName("ai") + @ObfuscatedName("av") + static final int[] field843; + @ObfuscatedName("aw") @Export("rndHue") static int rndHue; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("rndLightness") static int rndLightness; + @ObfuscatedName("fi") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + static Archive field838; + @ObfuscatedName("jc") + @Export("timeOfPreviousKeyPress") + static int timeOfPreviousKeyPress; static { Tiles_heights = new int[4][105][105]; Tiles_renderFlags = new byte[4][104][104]; Tiles_minPlane = 99; - field840 = new int[]{1, 2, 4, 8}; - field844 = new int[]{16, 32, 64, 128}; - field839 = new int[]{1, 0, -1, 0}; - field842 = new int[]{0, -1, 0, 1}; - field843 = new int[]{1, -1, -1, 1}; - field841 = new int[]{-1, -1, 1, 1}; + field844 = new int[]{1, 2, 4, 8}; + field840 = new int[]{16, 32, 64, 128}; + field842 = new int[]{1, 0, -1, 0}; + field845 = new int[]{0, -1, 0, 1}; + field841 = new int[]{1, -1, -1, 1}; + field843 = new int[]{-1, -1, 1, 1}; rndHue = (int)(Math.random() * 17.0D) - 8; rndLightness = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("aw") + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)[Lhy;", + garbageValue = "1" + ) + static VerticalAlignment[] method457() { + return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1634, VerticalAlignment.field1633}; + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)[Lnr;", - garbageValue = "57" + descriptor = "(IIIII)I", + garbageValue = "-360252292" ) - public static class353[] method459() { - return new class353[]{class353.field3468, class353.field3470, class353.field3467, class353.field3469}; + static final int method456(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; } - @ObfuscatedName("ap") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "([BIIIIIIILiz;[Lij;)V" + descriptor = "(Lnu;III)Lui;", + garbageValue = "1499324687" ) - static final void method460(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + return !ApproximateRouteStrategy.method345(var0, var1, var2) ? null : UserComparator6.method693(); + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "([BIIIIIIILiv;[Lis;)V" + ) + static final void method459(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { Buffer var10 = new Buffer(var0); int var11 = -1; while (true) { - int var12 = var10.method2541(); + int var12 = var10.method2561(); if (var12 == 0) { return; } @@ -97,24 +121,111 @@ static final void method460(byte[] var0, int var1, int var2, int var3, int var4, int var19 = var18 >> 2; int var20 = var18 & 3; if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { - ObjectComposition var21 = class90.getObjectDefinition(var11); - int var22 = var2 + GameObject.method1358(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); - int var23 = var3 + World.method392(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); - if (var22 > 0 && var23 > 0 && var22 < 103 && var23 < 103) { - int var24 = var1; - if ((Tiles_renderFlags[1][var22][var23] & 2) == 2) { - var24 = var1 - 1; + ObjectComposition var21 = WorldMapElement.getObjectDefinition(var11); + int var24 = var16 & 7; + int var25 = var15 & 7; + int var27 = var21.sizeX; + int var28 = var21.sizeY; + int var29; + if ((var20 & 1) == 1) { + var29 = var27; + var27 = var28; + var28 = var29; + } + + int var26 = var7 & 3; + int var23; + if (var26 == 0) { + var23 = var24; + } else if (var26 == 1) { + var23 = var25; + } else if (var26 == 2) { + var23 = 7 - var24 - (var27 - 1); + } else { + var23 = 7 - var25 - (var28 - 1); + } + + var29 = var2 + var23; + int var30 = var3 + InterfaceParent.method473(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); + if (var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { + int var31 = var1; + if ((Tiles_renderFlags[1][var29][var30] & 2) == 2) { + var31 = var1 - 1; } - CollisionMap var25 = null; - if (var24 >= 0) { - var25 = var9[var24]; + CollisionMap var32 = null; + if (var31 >= 0) { + var32 = var9[var31]; } - PendingSpawn.addObjects(var1, var22, var23, var11, var20 + var7 & 3, var19, var8, var25); + class128.addObjects(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); } } } } } -} + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(Lmi;III)V", + garbageValue = "2062613871" + ) + public static void method460(Widget var0, int var1, int var2) { + var0.field3101.bodyColors[var1] = var2; + var0.field3101.method1729(); + } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "645111513" + ) + static final void method461() { + Renderable.method1290(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); + class153.method802(); + UserComparator9.method685(); + NPCComposition.NpcDefinition_cached.clear(); + NPCComposition.NpcDefinition_cachedModels.clear(); + ItemComposition.ItemDefinition_cached.clear(); + ItemComposition.ItemDefinition_cachedModels.clear(); + ItemComposition.ItemDefinition_cachedSprites.clear(); + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + SequenceDefinition.SequenceDefinition_cachedModel.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); + VarbitComposition.VarbitDefinition_cached.clear(); + VarpDefinition.VarpDefinition_cached.clear(); + class47.HitSplatDefinition_cachedSprites.method2483(); + SwapSongTask.HitSplatDefinition_cached.method2483(); + class394.method2053(); + HealthBarDefinition.HealthBarDefinition_cached.clear(); + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); + StructComposition.StructDefinition_cached.clear(); + class126.method700(); + WorldMapElement.WorldMapElement_cachedSprites.clear(); + class219.method1150(); + class19.method60(); + Client.Widget_cachedModels.clear(); + Client.Widget_cachedFonts.clear(); + PlayerComposition.PlayerAppearance_cachedModels.clear(); + class261.method1501(); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).clear(); + Script.Script_cached.clear(); + Client.archive5.method2184(); + AttackOption.field1096.clearFiles(); + class318.archive7.clearFiles(); + ObjectSound.archive4.clearFiles(); + class28.field81.clearFiles(); + class499.archive9.clearFiles(); + class385.archive6.clearFiles(); + Message.archive11.clearFiles(); + PcmPlayer.archive8.clearFiles(); + class147.field1348.clearFiles(); + class141.archive10.clearFiles(); + class388.field3655.clearFiles(); + GrandExchangeOffer.archive12.clearFiles(); + class343.field3148.clearFiles(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/Timer.java b/osrs/src/main/java/Timer.java index fe9f24f12..d338ce442 100644 --- a/osrs/src/main/java/Timer.java +++ b/osrs/src/main/java/Timer.java @@ -3,131 +3,202 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pm") +import java.util.ArrayList; + +@ObfuscatedName("py") @Implements("Timer") public class Timer { - @ObfuscatedName("aw") - long field3745; - @ObfuscatedName("ay") - long field3746; - @ObfuscatedName("ar") - public boolean field3747; - @ObfuscatedName("am") - long field3743; - @ObfuscatedName("as") - long field3744; - @ObfuscatedName("aj") - long field3742; - @ObfuscatedName("ag") - int field3738; + @ObfuscatedName("au") + long field3755; + @ObfuscatedName("ae") + long field3752; + @ObfuscatedName("ao") + public boolean field3756; + @ObfuscatedName("at") + long field3754; + @ObfuscatedName("ac") + long field3751; + @ObfuscatedName("ai") + long field3753; @ObfuscatedName("az") - int field3741; - @ObfuscatedName("av") - int field3740; + int field3750; @ObfuscatedName("ap") - int field3739; + int field3749; + @ObfuscatedName("aa") + int field3747; + @ObfuscatedName("af") + int field3748; public Timer() { - this.field3745 = -1L; - this.field3746 = -1L; - this.field3747 = false; - this.field3743 = 0L; - this.field3744 = 0L; - this.field3742 = 0L; - this.field3738 = 0; - this.field3741 = 0; - this.field3740 = 0; - this.field3739 = 0; + this.field3755 = -1L; + this.field3752 = -1L; + this.field3756 = false; + this.field3754 = 0L; + this.field3751 = 0L; + this.field3753 = 0L; + this.field3750 = 0; + this.field3749 = 0; + this.field3747 = 0; + this.field3748 = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(S)V", - garbageValue = "4160" + garbageValue = "8457" ) - public void method2112() { - this.field3745 = class113.clockNow(); + public void method2150() { + this.field3755 = GameEngine.clockNow(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1471320567" + garbageValue = "-1934849344" ) - public void method2113() { - if (this.field3745 != -1L) { - this.field3744 = class113.clockNow() - this.field3745; - this.field3745 = -1L; + public void method2151() { + if (-1L != this.field3755) { + this.field3751 = GameEngine.clockNow() - this.field3755; + this.field3755 = -1L; } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1578635933" + garbageValue = "-350362388" ) - public void method2115(int var1) { - this.field3746 = class113.clockNow(); - this.field3738 = var1; + public void method2152(int var1) { + this.field3752 = GameEngine.clockNow(); + this.field3750 = var1; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1011224380" + garbageValue = "1654604746" ) - public void method2116() { - if (-1L != this.field3746) { - this.field3743 = class113.clockNow() - this.field3746; - this.field3746 = -1L; + public void method2153() { + if (-1L != this.field3752) { + this.field3754 = GameEngine.clockNow() - this.field3752; + this.field3752 = -1L; } - ++this.field3740; - this.field3747 = true; + ++this.field3747; + this.field3756 = true; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1728500698" + garbageValue = "-1332700570" ) - public void method2117() { - this.field3747 = false; - this.field3741 = 0; + public void method2154() { + this.field3756 = false; + this.field3749 = 0; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2026051280" + garbageValue = "-1203645178" ) - public void method2118() { - this.method2116(); + public void method2155() { + this.method2153(); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "22" + descriptor = "(Ltm;I)V", + garbageValue = "-1131300040" ) @Export("write") public void write(Buffer var1) { - Message.method345(var1, this.field3744); - Message.method345(var1, this.field3743); - Message.method345(var1, this.field3742); - var1.writeShort(this.field3738); - var1.writeShort(this.field3741); - var1.writeShort(this.field3740); - var1.writeShort(this.field3739); + ClientPreferences.method539(var1, this.field3751); + ClientPreferences.method539(var1, this.field3754); + ClientPreferences.method539(var1, this.field3753); + var1.writeShort(this.field3750); + var1.writeShort(this.field3749); + var1.writeShort(this.field3747); + var1.writeShort(this.field3748); } - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-6" + descriptor = "(Lnu;Lnu;ZII)V", + garbageValue = "-1307965199" ) - public static int method2114(int var0) { - return (var0 & class509.field4110) - 1; + static void method2157(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (class403.clearLoginScreen) { + if (var3 == 4) { + PcmPlayer.method212(4); + } + + } else { + if (var3 == 0) { + WorldMapAreaData.method1574(var2); + } else { + PcmPlayer.method212(var3); + } + + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + Login.leftTitleSprite = WorldMapData_1.method1484(var4); + Bounds.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); + int var5 = Client.worldProperties; + if ((var5 & class510.field4132.rsOrdinal()) != 0) { + SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else if ((var5 & class510.field4131.rsOrdinal()) != 0) { + SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); + } else if ((var5 & class510.field4122.rsOrdinal()) != 0) { + SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "logo_speedrunning", ""); + } else { + SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); + } + + Login.titleboxSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + class219.titlebuttonSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + Login.field777 = class172.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); + ItemContainer.field853 = class172.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); + class172.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); + Login.runesSprite = class219.method1149(var1, "runes", ""); + class13.title_muteSprite = class219.method1149(var1, "title_mute", ""); + Login.options_buttons_0Sprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + Skills.field3145 = class172.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + UserComparator6.options_buttons_2Sprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + VerticalAlignment.field1631 = class172.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + class136.field1295 = Login.options_buttons_0Sprite.subWidth; + User.field3801 = Login.options_buttons_0Sprite.subHeight; + class139.field1323 = new LoginScreenAnimation(Login.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; + Login.field768 = new String[8]; + Login.field752 = 0; + } + + class503.field4107 = 0; + class369.otp = ""; + Login.field743 = true; + Login.worldSelectOpen = false; + if (!class449.clientPreferences.getTitleMusicDisabled()) { + ArrayList var6 = new ArrayList(); + var6.add(new MusicSong(class385.archive6, "scape main", "", 255, false)); + class53.method291(var6, 0, 0, 0, 100, false); + } else { + Script.method445(0, 0); + } + + UrlRequester.method652(); + CollisionMap.method1122().method1932(false); + class403.clearLoginScreen = true; + Login.xPadding = (class113.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class452.loginBoxCenter = Login.loginBoxX + 180; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Bounds.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + SoundSystem.logoSprite.drawAt(Login.xPadding + 382 - SoundSystem.logoSprite.subWidth / 2, 18); + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/TriBool.java b/osrs/src/main/java/TriBool.java index 1b84e0c57..d6fe9b27c 100644 --- a/osrs/src/main/java/TriBool.java +++ b/osrs/src/main/java/TriBool.java @@ -3,24 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qj") +@ObfuscatedName("qp") @Implements("TriBool") public class TriBool { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lqj;" + descriptor = "Lqp;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lqj;" + descriptor = "Lqp;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lqj;" + descriptor = "Lqp;" ) @Export("TriBool_false") public static final TriBool TriBool_false; @@ -33,13 +33,4 @@ public class TriBool { TriBool() { } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2136311618" - ) - public static int method2225(int var0) { - return class465.field3896[var0 & 16383]; - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UrlRequest.java b/osrs/src/main/java/UrlRequest.java index 61ee13509..6627c7dc6 100644 --- a/osrs/src/main/java/UrlRequest.java +++ b/osrs/src/main/java/UrlRequest.java @@ -1,103 +1,72 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +import java.net.URL; + +@ObfuscatedName("et") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("ay") - static int field1162; - @ObfuscatedName("ar") - static int field1161; - @ObfuscatedName("aw") - final URL field1163; - @ObfuscatedName("am") - volatile int field1165; - @ObfuscatedName("as") + @ObfuscatedName("ae") + static int field1175; + @ObfuscatedName("ao") + static int field1176; + @ObfuscatedName("ad") + public static short[] field1174; + @ObfuscatedName("au") + final URL field1177; + @ObfuscatedName("at") + volatile int field1179; + @ObfuscatedName("ac") @Export("response0") volatile byte[] response0; static { - field1162 = -1; - field1161 = -2; + field1175 = -1; + field1176 = -2; } UrlRequest(URL var1) { - this.field1165 = field1162; - this.field1163 = var1; + this.field1179 = field1175; + this.field1177 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1097483800" + garbageValue = "1941771443" ) @Export("isDone") public boolean isDone() { - return this.field1165 != field1162; + return this.field1179 != field1175; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "114961803" + garbageValue = "-90219734" ) @Export("getResponse") public byte[] getResponse() { return this.response0; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1911821505" + garbageValue = "79865594" ) - public String method660() { - return this.field1163.toString(); + public String method667() { + return this.field1177.toString(); } - @ObfuscatedName("aj") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "12" + descriptor = "(I)[Lnb;", + garbageValue = "2139207855" ) - public static int method657(int var0) { - --var0; - var0 |= var0 >>> 1; - var0 |= var0 >>> 2; - var0 |= var0 >>> 4; - var0 |= var0 >>> 8; - var0 |= var0 >>> 16; - return var0 + 1; - } - - @ObfuscatedName("nl") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", - garbageValue = "80" - ) - static String method661(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (Client.gameBuild == 1) { - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { - var0 = "local"; - } - - String var3 = ""; - if (class36.param9 != null) { - var3 = "/p=" + class36.param9; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + Interpreter.clientLanguage + "/a=" + PcmPlayer.field182 + var3 + "/"; + public static GameBuild[] method664() { + return new GameBuild[]{GameBuild.LIVE, GameBuild.RC, GameBuild.WIP, GameBuild.BUILDLIVE}; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UrlRequester.java b/osrs/src/main/java/UrlRequester.java index 7953b34bd..fccb81eaf 100644 --- a/osrs/src/main/java/UrlRequester.java +++ b/osrs/src/main/java/UrlRequester.java @@ -1,3 +1,8 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + import java.io.DataInputStream; import java.io.IOException; import java.net.HttpURLConnection; @@ -5,48 +10,47 @@ import java.net.URLConnection; import java.util.LinkedList; import java.util.Queue; -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("ev") @Implements("UrlRequester") public abstract class UrlRequester implements Runnable { - @ObfuscatedName("aw") - final Thread field1156; - @ObfuscatedName("ay") + @ObfuscatedName("je") + @Export("baseX") + static int baseX; + @ObfuscatedName("au") + final Thread field1169; + @ObfuscatedName("ae") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("requests") Queue requests; - @ObfuscatedName("am") - int field1154; + @ObfuscatedName("at") + int field1167; UrlRequester(int var1) { this.requests = new LinkedList(); - this.field1156 = new Thread(this); - this.field1156.setPriority(1); - this.field1156.start(); - this.field1154 = var1; + this.field1169 = new Thread(this); + this.field1169.setPriority(1); + this.field1169.start(); + this.field1167 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lei;I)V", - garbageValue = "-1617729938" + descriptor = "(Let;B)V", + garbageValue = "-114" ) @Export("vmethod2700") abstract void vmethod2700(UrlRequest var1) throws IOException; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/net/URLConnection;I)I", - garbageValue = "-258783956" + descriptor = "(Ljava/net/URLConnection;B)I", + garbageValue = "20" ) - int method645(URLConnection var1) { - int var2 = UrlRequest.field1161; + int method647(URLConnection var1) { + int var2 = UrlRequest.field1176; if (var1 != null) { try { if (var1 instanceof HttpURLConnection) { @@ -59,25 +63,25 @@ int method645(URLConnection var1) { return var2; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/net/URLConnection;I)V", - garbageValue = "396426494" + descriptor = "(Ljava/net/URLConnection;B)V", + garbageValue = "61" ) - void method646(URLConnection var1) { + void method648(URLConnection var1) { var1.setConnectTimeout(5000); var1.setReadTimeout(5000); var1.setUseCaches(false); var1.setRequestProperty("Connection", "close"); - var1.setRequestProperty("User-Agent", "OldSchoolRuneScape/" + this.field1154); + var1.setRequestProperty("User-Agent", "OldSchoolRuneScape/" + this.field1167); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/net/URLConnection;Lei;I)V", - garbageValue = "-1316938585" + descriptor = "(Ljava/net/URLConnection;Let;I)V", + garbageValue = "-703916602" ) - void method647(URLConnection var1, UrlRequest var2) { + void method649(URLConnection var1, UrlRequest var2) { DataInputStream var3 = null; try { @@ -89,7 +93,7 @@ void method647(URLConnection var1, UrlRequest var2) { var3.readFully(var4); } else { var4 = new byte[0]; - byte[] var6 = SpriteMask.ByteArrayPool_getArray(5000); + byte[] var6 = class125.ByteArrayPool_getArray(5000); byte[] var8; for (int var7 = var3.read(var6, 0, var6.length); var7 > -1; var4 = var8) { @@ -98,14 +102,14 @@ void method647(URLConnection var1, UrlRequest var2) { System.arraycopy(var6, 0, var8, var4.length, var7); } - GrandExchangeOfferUnitPriceComparator.ByteArrayPool_release(var6); + PlayerType.ByteArrayPool_release(var6); } var2.response0 = var4; } catch (IOException var14) { var2.response0 = null; } finally { - var2.field1165 = this.method645(var1); + var2.field1179 = this.method647(var1); } if (var3 != null) { @@ -117,10 +121,10 @@ void method647(URLConnection var1, UrlRequest var2) { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Lei;", - garbageValue = "1908448074" + descriptor = "(Ljava/net/URL;B)Let;", + garbageValue = "95" ) @Export("request") public UrlRequest request(URL var1) { @@ -132,10 +136,10 @@ public UrlRequest request(URL var1) { } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "29176" + descriptor = "(I)V", + garbageValue = "-710296298" ) @Export("close") public void close() { @@ -146,7 +150,7 @@ public void close() { this.notify(); } - this.field1156.join(); + this.field1169.join(); } catch (InterruptedException var4) { } @@ -171,33 +175,60 @@ public void run() { this.vmethod2700(var1); } catch (Exception var7) { - class317.RunException_sendStackTrace((String)null, var7); + Messages.RunException_sendStackTrace((String)null, var7); } } } - @ObfuscatedName("aw") + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2153026" + ) + public static void method652() { + class305.field2773.clear(); + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-85" + ) + public static void method653() { + ItemComposition.ItemDefinition_cachedSprites.clear(); + } + + @ObfuscatedName("hb") @ObfuscatedSignature( - descriptor = "(B)[Lrr;", - garbageValue = "55" + descriptor = "(I)J", + garbageValue = "286684178" ) - static class454[] method644() { - return new class454[]{class454.field3877, class454.field3878, class454.field3879, class454.field3880}; + static long method654() { + return Client.playerUUID; } - @ObfuscatedName("mz") + @ObfuscatedName("jb") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "975652572" + descriptor = "(I)Z", + garbageValue = "1352739934" ) - static final void method650(int var0) { - var0 = Math.max(Math.min(var0, 100), 0); - var0 = 100 - var0; - float var1 = 0.5F + (float)var0 / 200.0F; - Rasterizer3D.method1164((double)var1); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness((double)var1); - HealthBar.method581(); - class150.clientPreferences.setBrightness((double)var1); + static boolean method655() { + return (Client.drawPlayerNames & 2) != 0; + } + + @ObfuscatedName("nj") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1224778546" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { + PacketBufferNode var1 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLAN_JOINCHAT_LEAVECHAT, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/User.java b/osrs/src/main/java/User.java index 5e95e8f9f..a6614c8ea 100644 --- a/osrs/src/main/java/User.java +++ b/osrs/src/main/java/User.java @@ -1,23 +1,22 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qe") +@ObfuscatedName("qs") @Implements("User") public class User implements Comparable { - @ObfuscatedName("ar") + @ObfuscatedName("cj") + static int field3801; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lui;" + descriptor = "Luc;" ) @Export("username") Username username; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lui;" + descriptor = "Luc;" ) @Export("previousUsername") Username previousUsername; @@ -25,50 +24,50 @@ public class User implements Comparable { User() { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lqe;B)I", - garbageValue = "114" + descriptor = "(Lqs;I)I", + garbageValue = "1756748027" ) @Export("compareTo_user") public int compareTo_user(User var1) { return this.username.compareToTyped(var1.username); } - @ObfuscatedName("af") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)Lui;", - garbageValue = "-157442645" + descriptor = "(I)Luc;", + garbageValue = "807179111" ) @Export("getUsername") public Username getUsername() { return this.username; } - @ObfuscatedName("ai") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "7" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-346787089" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("al") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "8" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1703373764" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("bd") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lui;Lui;I)V", - garbageValue = "-1440171953" + descriptor = "(Luc;Luc;I)V", + garbageValue = "-733820505" ) @Export("set") void set(Username var1, Username var2) { @@ -85,42 +84,4 @@ void set(Username var1, Username var2) { public int compareTo(Object var1) { return this.compareTo_user((User)var1); } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "15" - ) - static void method2191() { - try { - File var0 = new File(Bounds.userHomeDirectory, "random.dat"); - int var2; - if (var0.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); - } else { - label34: - for (int var1 = 0; var1 < ByteArrayPool.field3737.length; ++var1) { - for (var2 = 0; var2 < class157.field1396.length; ++var2) { - File var3 = new File(class157.field1396[var2] + ByteArrayPool.field3737[var1] + File.separatorChar + "random.dat"); - if (var3.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); - break label34; - } - } - } - } - - if (JagexCache.JagexCache_randomDat == null) { - RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); - var2 = var4.read(); - var4.seek(0L); - var4.write(var2); - var4.seek(0L); - var4.close(); - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); - } - } catch (IOException var5) { - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator1.java b/osrs/src/main/java/UserComparator1.java index af901fa00..b1bbae3e3 100644 --- a/osrs/src/main/java/UserComparator1.java +++ b/osrs/src/main/java/UserComparator1.java @@ -1,13 +1,14 @@ -import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tz") +import java.util.Comparator; + +@ObfuscatedName("ua") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -15,10 +16,10 @@ public UserComparator1(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqe;Lqe;B)I", - garbageValue = "75" + descriptor = "(Lqs;Lqs;B)I", + garbageValue = "2" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { @@ -36,4 +37,4 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator10.java b/osrs/src/main/java/UserComparator10.java index 9770878ef..0fb1352ce 100644 --- a/osrs/src/main/java/UserComparator10.java +++ b/osrs/src/main/java/UserComparator10.java @@ -1,21 +1,15 @@ -import java.util.ArrayList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("ef") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("ag") - static byte[][][] field1180; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("Widget_spritesArchive") - public static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("aw") + @ObfuscatedName("kh") + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -23,10 +17,10 @@ public UserComparator10(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqa;Lqa;I)I", - garbageValue = "1605409711" + descriptor = "(Lqb;Lqb;I)I", + garbageValue = "-1110862870" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -43,211 +37,63 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;ZII)V", - garbageValue = "1893975915" - ) - static void method682(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.clearLoginScreen) { - if (var3 == 4) { - class328.method1678(4); - } - - } else { - if (var3 == 0) { - class333.method1811(var2); - } else { - class328.method1678(var3); - } - - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - SongTask.leftTitleSprite = ClanChannelMember.method769(var4); - ScriptFrame.rightTitleSprite = SongTask.leftTitleSprite.mirrorHorizontally(); - class425.method2154(var1, Client.worldProperties); - Login.titleboxSprite = class451.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - Login.titlebuttonSprite = class451.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - Login.field773 = class451.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); - DirectByteArrayCopier.field3096 = class451.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); - class451.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); - Login.runesSprite = DesktopPlatformInfoProvider.method2334(var1, "runes", ""); - class304.title_muteSprite = DesktopPlatformInfoProvider.method2334(var1, "title_mute", ""); - WorldMapLabelSize.options_buttons_0Sprite = class451.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - class4.field4 = class451.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - class11.options_buttons_2Sprite = class451.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - Message.field348 = class451.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - class139.field1311 = WorldMapLabelSize.options_buttons_0Sprite.subWidth; - class453.field3874 = WorldMapLabelSize.options_buttons_0Sprite.subHeight; - class165.field1419 = new LoginScreenAnimation(Login.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - Login.field767 = new String[8]; - Login.field748 = 0; - } - - class424.field3758 = 0; - Login.otp = ""; - Login.field739 = true; - Login.worldSelectOpen = false; - if (!class150.clientPreferences.getTitleMusicDisabled()) { - ArrayList var5 = new ArrayList(); - var5.add(new MusicSong(class13.archive6, "scape main", "", 255, false)); - UserComparator4.method663(var5, 0, 0, 0, 100, false); - } else { - RouteStrategy.method1107(0, 0); - } - - class306.field2755.clear(); - JagNetThread var6 = class153.field1356; - var6.method1896(false); - Login.clearLoginScreen = true; - Login.xPadding = (GrandExchangeOfferTotalQuantityComparator.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - Script.loginBoxCenter = Login.loginBoxX + 180; - SongTask.leftTitleSprite.drawAt(Login.xPadding, 0); - ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - } - } - - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZB)Z", - garbageValue = "41" + descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "74" ) - static boolean method681(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; + public static String method687(CharSequence var0) { + int var1 = var0.length(); + StringBuilder var2 = new StringBuilder(var1); + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { + if (var4 == ' ') { + var2.append('+'); } else { - if (var8 < 'a' || var8 > 'z') { - return false; + byte var5 = class348.charToByteCp1252(var4); + var2.append('%'); + int var6 = var5 >> 4 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); } - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - return false; - } - - if (var3) { - var10 = -var10; - } - - int var9 = var10 + var5 * var1; - if (var9 / var1 != var5) { - return false; + var6 = var5 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } } - - var5 = var9; - var4 = true; + } else { + var2.append(var4); } - - return var4; - } else { - throw new IllegalArgumentException("" + var1); } - } - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILdc;ZB)I", - garbageValue = "0" - ) - static int method683(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = VarbitComposition.getWidget(var3); - } else { - var4 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - } - - if (var0 == 1000) { - Interpreter.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - class200.invalidateWidget(var4); - TileItem.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - SoundCache.revalidateWidgetScroll(ArchiveLoader.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == 1001) { - Interpreter.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - class200.invalidateWidget(var4); - TileItem.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - SoundCache.revalidateWidgetScroll(ArchiveLoader.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == 1003) { - boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - class200.invalidateWidget(var4); - } - - return 1; - } else if (var0 == 1005) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1006) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else { - return 2; - } + return var2.toString(); } - @ObfuscatedName("ax") + @ObfuscatedName("nf") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1405780494" + descriptor = "(III)V", + garbageValue = "1771624140" ) - static final int method684(int var0, int var1) { - int var2 = class419.method2124(var0 + 45365, var1 + 91923, 4) - 128 + (class419.method2124(var0 + 10294, var1 + 37821, 2) - 128 >> 1) + (class419.method2124(var0, var1, 1) - 128 >> 2); - var2 = (int)(0.3D * (double)var2) + 35; - if (var2 < 10) { - var2 = 10; - } else if (var2 > 60) { - var2 = 60; + static final void method689(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : VerticalAlignment.guestClanChannel; + if (var2 != null && var1 >= 0 && var1 < var2.method859()) { + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); + if (var3.rank == -1) { + String var4 = var3.username.getName(); + PacketBufferNode var5 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLANCHANNEL_KICKUSER, Client.packetWriter.isaacCipher); + var5.packetBuffer.writeByte(3 + AbstractSocket.stringCp1252NullTerminatedByteSize(var4)); + var5.packetBuffer.writeByte(var0); + var5.packetBuffer.writeShort(var1); + var5.packetBuffer.writeStringCp1252NullTerminated(var4); + Client.packetWriter.addNode(var5); + } } - - return var2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator2.java b/osrs/src/main/java/UserComparator2.java index 0782c2e98..8211cc0e2 100644 --- a/osrs/src/main/java/UserComparator2.java +++ b/osrs/src/main/java/UserComparator2.java @@ -1,13 +1,20 @@ -import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uw") +import java.util.Comparator; + +@ObfuscatedName("uj") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("aw") + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("SequenceDefinition_archive") + static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -15,10 +22,10 @@ public UserComparator2(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqe;Lqe;I)I", - garbageValue = "-1571443229" + descriptor = "(Lqs;Lqs;I)I", + garbageValue = "-732761109" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { @@ -36,4 +43,4 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator3.java b/osrs/src/main/java/UserComparator3.java index feb83d4ab..b81c02c79 100644 --- a/osrs/src/main/java/UserComparator3.java +++ b/osrs/src/main/java/UserComparator3.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") +@ObfuscatedName("el") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public UserComparator3(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqa;Lqa;B)I", - garbageValue = "121" + descriptor = "(Lqb;Lqb;I)I", + garbageValue = "1524706236" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -34,47 +34,12 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1707669825" + descriptor = "(II)I", + garbageValue = "1521964885" ) - public static int method673(int var0, int var1) { - return (var0 << 8) + var1; + public static int method682(int var0) { + return var0 >>> 12; } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "([FI)V", - garbageValue = "-398774343" - ) - static void method675(float[] var0) { - var0[1] = 1.0F - var0[1]; - if (var0[0] < 0.0F) { - var0[0] = 0.0F; - } - - if (var0[1] < 0.0F) { - var0[1] = 0.0F; - } - - if (var0[0] > 1.0F || var0[1] > 1.0F) { - float var1 = (float)(((double)var0[1] - 2.0D) * (double)var0[1] + (double)(var0[0] * (var0[0] - 2.0F + var0[1])) + 1.0D); - if (class126.field1194 + var1 > 0.0F) { - SecureRandomCallable.method462(var0); - } - } - - var0[1] = 1.0F - var0[1]; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1187022906" - ) - public static void method676() { - NPCComposition.NpcDefinition_cached.clear(); - NPCComposition.NpcDefinition_cachedModels.clear(); - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator4.java b/osrs/src/main/java/UserComparator4.java index 0e65d5517..7ac51bff7 100644 --- a/osrs/src/main/java/UserComparator4.java +++ b/osrs/src/main/java/UserComparator4.java @@ -1,23 +1,16 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.util.ArrayList; -import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.Comparator; + @ObfuscatedName("en") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("ag") - public static int field1166; - @ObfuscatedName("bh") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("ji") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("aw") + @ObfuscatedName("vv") + static int field1180; + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -25,10 +18,10 @@ public UserComparator4(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqa;Lqa;B)I", - garbageValue = "95" + descriptor = "(Lqb;Lqb;I)I", + garbageValue = "-1072568679" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { @@ -47,36 +40,94 @@ public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/util/ArrayList;IIIIZB)V", - garbageValue = "-72" + descriptor = "(Lfh;FZI)F", + garbageValue = "-229947551" ) - public static void method663(ArrayList var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var5 || !class306.field2758.isEmpty() && !var0.isEmpty()) { - class306.field2758.clear(); - class306.field2760.clear(); - } + static float method669(class130 var0, float var1, boolean var2) { + float var3 = 0.0F; + if (var0 != null && var0.method726() != 0) { + float var4 = (float)var0.field1244[0].field1202; + float var5 = (float)var0.field1244[var0.method726() - 1].field1202; + float var6 = var5 - var4; + if ((double)var6 == 0.0D) { + return var0.field1244[0].field1198; + } else { + float var7 = 0.0F; + if (var1 > var5) { + var7 = (var1 - var5) / var6; + } else { + var7 = (var1 - var4) / var6; + } + + double var8 = (double)((int)var7); + float var10 = Math.abs((float)((double)var7 - var8)); + float var11 = var10 * var6; + var8 = Math.abs(1.0D + var8); + double var12 = var8 / 2.0D; + double var14 = (double)((int)var12); + var10 = (float)(var12 - var14); + float var16; + float var17; + if (var2) { + if (var0.field1245 == class128.field1225) { + if ((double)var10 != 0.0D) { + var11 += var4; + } else { + var11 = var5 - var11; + } + } else if (var0.field1245 != class128.field1227 && var0.field1245 != class128.field1228) { + if (var0.field1245 == class128.field1226) { + var11 = var4 - var1; + var16 = var0.field1244[0].field1200; + var17 = var0.field1244[0].field1201; + var3 = var0.field1244[0].field1198; + if (0.0D != (double)var16) { + var3 -= var11 * var17 / var16; + } + + return var3; + } + } else { + var11 = var5 - var11; + } + } else if (var0.field1246 == class128.field1225) { + if ((double)var10 != 0.0D) { + var11 = var5 - var11; + } else { + var11 += var4; + } + } else if (var0.field1246 != class128.field1227 && var0.field1246 != class128.field1228) { + if (var0.field1246 == class128.field1226) { + var11 = var1 - var5; + var16 = var0.field1244[var0.method726() - 1].field1197; + var17 = var0.field1244[var0.method726() - 1].field1199; + var3 = var0.field1244[var0.method726() - 1].field1198; + if (0.0D != (double)var16) { + var3 += var17 * var11 / var16; + } - if (!var0.isEmpty()) { - class144.method764(var0, var5); - if (!class306.field2758.isEmpty()) { - ArchiveLoader.method464(var1, var2, var3, var4); - class306.field2760.add(new AddRequestTask((SongTask)null)); - class306.field2760.add(new LoadSongTask((SongTask)null, class306.musicPatchesArchive, class306.musicSamplesArchive, class306.soundEffectsArchive)); - if (!class306.musicSongs.isEmpty()) { - ArrayList var6 = new ArrayList(); - var6.add(new DelayFadeTask(new class404(new FadeInTask((SongTask)null, 0, true, class306.field2751)), class306.field2754)); - ArrayList var7 = class162.method847(); - var6.add(new DelayFadeTask(new FadeOutTask(new class402((SongTask)null, var7), 0, false, class306.field2753), class306.musicPlayerStatus)); - class306.field2760.add(new ConcurrentMidiTask((SongTask)null, var6)); + return var3; + } } else { - class306.field2760.add(new DelayFadeTask((SongTask)null, class306.field2754)); - class306.field2760.add(new class404((SongTask)null)); - class306.field2760.add(new FadeInTask((SongTask)null, 0, true, class306.field2751)); + var11 += var4; + } + + var3 = Skeleton.method1229(var0, var11); + float var18; + if (var2 && var0.field1245 == class128.field1228) { + var18 = var0.field1244[var0.method726() - 1].field1198 - var0.field1244[0].field1198; + var3 = (float)((double)var3 - (double)var18 * var8); + } else if (!var2 && var0.field1246 == class128.field1228) { + var18 = var0.field1244[var0.method726() - 1].field1198 - var0.field1244[0].field1198; + var3 = (float)((double)var3 + (double)var18 * var8); } + return var3; } + } else { + return var3; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator5.java b/osrs/src/main/java/UserComparator5.java index d58a85a0d..75b19d675 100644 --- a/osrs/src/main/java/UserComparator5.java +++ b/osrs/src/main/java/UserComparator5.java @@ -2,25 +2,17 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("ee") +@ObfuscatedName("es") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("ie") - @ObfuscatedSignature( - descriptor = "Lqh;" - ) - static AbstractSocket field1175; - @ObfuscatedName("jc") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("nq") - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("aw") + @ObfuscatedName("jx") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -28,10 +20,10 @@ public UserComparator5(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqa;Lqa;I)I", - garbageValue = "-382682288" + descriptor = "(Lqb;Lqb;B)I", + garbageValue = "-73" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -52,12 +44,200 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("aa") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "55" + descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;S)[F", + garbageValue = "21147" ) - static final void method672() { - Tile.method1160("Your ignore list is full. Max of 100 for free users, and 400 for members"); + static float[] method679(JSONObject var0, String var1) throws JSONException { + float[] var2 = new float[4]; + + try { + JSONArray var3 = var0.getJSONArray(var1); + var2[0] = (float)var3.optDouble(0, 0.0D); + var2[1] = (float)var3.optDouble(1, 0.0D); + var2[2] = (float)var3.optDouble(2, 1.0D); + var2[3] = (float)var3.optDouble(3, 1.0D); + } catch (JSONException var4) { + var2[0] = 0.0F; + var2[1] = 0.0F; + var2[2] = 1.0F; + var2[3] = 1.0F; + } + + return var2; + } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "(Ldr;I)V", + garbageValue = "-316834748" + ) + static final void method680(Actor var0) { + var0.isWalking = false; + if (var0.movementSequence != -1) { + SequenceDefinition var1 = EnumComposition.SequenceDefinition_get(var0.movementSequence); + if (var1 != null) { + if (!var1.isCachedModelIdSet() && var1.frameIds != null) { + ++var0.movementFrameCycle; + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { + var0.movementFrameCycle = 1; + ++var0.movementFrame; + FileSystem.method914(var1, var0.movementFrame, var0.x, var0.y); + } + + if (var0.movementFrame >= var1.frameIds.length) { + if (var1.frameCount > 0) { + var0.movementFrame -= var1.frameCount; + if (var1.field1843) { + ++var0.field999; + } + + if (var0.movementFrame < 0 || var0.movementFrame >= var1.frameIds.length || var1.field1843 && var0.field999 >= var1.iterations) { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + var0.field999 = 0; + } + } else { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + } + + FileSystem.method914(var1, var0.movementFrame, var0.x, var0.y); + } + } else if (var1.isCachedModelIdSet()) { + ++var0.movementFrame; + int var2 = var1.method1085(); + if (var0.movementFrame < var2) { + class169.method880(var1, var0.movementFrame, var0.x, var0.y); + } else { + if (var1.frameCount > 0) { + var0.movementFrame -= var1.frameCount; + if (var1.field1843) { + ++var0.field999; + } + + if (var0.movementFrame < 0 || var0.movementFrame >= var2 || var1.field1843 && var0.field999 >= var1.iterations) { + var0.movementFrame = 0; + var0.movementFrameCycle = 0; + var0.field999 = 0; + } + } else { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + } + + class169.method880(var1, var0.movementFrame, var0.x, var0.y); + } + } else { + var0.movementSequence = -1; + } + } else { + var0.movementSequence = -1; + } + } + + IterableNodeHashTableIterator var7 = new IterableNodeHashTableIterator(var0.method518()); + + int var3; + for (SpotAnimation var6 = (SpotAnimation)var7.method2449(); var6 != null; var6 = (SpotAnimation)var7.next()) { + if (var6.field4281 != -1 && Client.cycle >= var6.field4280) { + var3 = StructComposition.SpotAnimationDefinition_get(var6.field4281).sequence; + if (var3 == -1) { + var6.remove(); + --var0.field1011; + } else { + var6.field4278 = Math.max(var6.field4278, 0); + SequenceDefinition var4 = EnumComposition.SequenceDefinition_get(var3); + if (var4.frameIds != null && !var4.isCachedModelIdSet()) { + ++var6.field4279; + if (var6.field4278 < var4.frameIds.length && var6.field4279 > var4.frameLengths[var6.field4278]) { + var6.field4279 = 1; + ++var6.field4278; + FileSystem.method914(var4, var6.field4278, var0.x, var0.y); + } + + if (var6.field4278 >= var4.frameIds.length) { + var6.remove(); + --var0.field1011; + } + } else if (var4.isCachedModelIdSet()) { + ++var6.field4278; + int var5 = var4.method1085(); + if (var6.field4278 < var5) { + class169.method880(var4, var6.field4278, var0.x, var0.y); + } else { + var6.remove(); + --var0.field1011; + } + } else { + var6.remove(); + --var0.field1011; + } + } + } + } + + SequenceDefinition var8; + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { + var8 = EnumComposition.SequenceDefinition_get(var0.sequence); + if (var8.precedenceAnimating == 1 && var0.field1022 > 0 && var0.spotAnimation <= Client.cycle && var0.exactMoveArrive1Cycle < Client.cycle) { + var0.sequenceDelay = 1; + return; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var8 = EnumComposition.SequenceDefinition_get(var0.sequence); + if (var8 != null) { + if (!var8.isCachedModelIdSet() && var8.frameIds != null) { + ++var0.sequenceFrameCycle; + if (var0.sequenceFrame < var8.frameIds.length && var0.sequenceFrameCycle > var8.frameLengths[var0.sequenceFrame]) { + var0.sequenceFrameCycle = 1; + ++var0.sequenceFrame; + FileSystem.method914(var8, var0.sequenceFrame, var0.x, var0.y); + } + + if (var0.sequenceFrame >= var8.frameIds.length) { + var0.sequenceFrame -= var8.frameCount; + ++var0.currentSequenceFrameIndex; + if (var0.currentSequenceFrameIndex >= var8.iterations) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var8.frameIds.length) { + FileSystem.method914(var8, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var8.stretches; + } else if (var8.isCachedModelIdSet()) { + ++var0.sequenceFrame; + var3 = var8.method1085(); + if (var0.sequenceFrame < var3) { + class169.method880(var8, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequenceFrame -= var8.frameCount; + ++var0.currentSequenceFrameIndex; + if (var0.currentSequenceFrameIndex >= var8.iterations) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var3) { + class169.method880(var8, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequence = -1; + } + } + } else { + var0.sequence = -1; + } + } else { + var0.sequence = -1; + } + } + + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator6.java b/osrs/src/main/java/UserComparator6.java index 8e7238db1..4cf224be5 100644 --- a/osrs/src/main/java/UserComparator6.java +++ b/osrs/src/main/java/UserComparator6.java @@ -3,13 +3,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +import java.text.ParseException; +import java.util.Date; + +@ObfuscatedName("ec") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("nd") - @Export("menuY") - static int menuY; - @ObfuscatedName("aw") + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Luk;" + ) + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -17,10 +23,10 @@ public UserComparator6(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqa;Lqa;B)I", - garbageValue = "-26" + descriptor = "(Lqb;Lqb;I)I", + garbageValue = "-110280632" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -36,4 +42,79 @@ int compareBuddy(Buddy var1, Buddy var2) { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } -} + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1944121723" + ) + static boolean method694() { + Date var0; + try { + var0 = SpotAnimationDefinition.method1003(); + } catch (ParseException var6) { + WorldMapScaleHandler.method1587("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); + return false; + } + + if (var0 == null) { + return false; + } else { + boolean var4 = ModelData0.method1383(var0); + Date var3 = class312.method1686(); + boolean var2 = var0.after(var3); + if (!var2) { + PcmPlayer.method212(7); + class318.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); + return false; + } else { + if (!var4) { + class72.field730 = 8388607; + } else { + class72.field730 = (int)(var0.getTime() / 86400000L - 11745L); + } + + return true; + } + } + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(B)Lui;", + garbageValue = "111" + ) + static SpritePixels method693() { + SpritePixels var0 = new SpritePixels(); + var0.width = class529.SpriteBuffer_spriteWidth; + var0.height = class420.SpriteBuffer_spriteHeight; + var0.xOffset = class529.SpriteBuffer_xOffsets[0]; + var0.yOffset = class152.SpriteBuffer_yOffsets[0]; + var0.subWidth = HealthBarUpdate.SpriteBuffer_spriteWidths[0]; + var0.subHeight = SpriteMask.SpriteBuffer_spriteHeights[0]; + int var1 = var0.subHeight * var0.subWidth; + byte[] var2 = Coord.SpriteBuffer_pixels[0]; + var0.pixels = new int[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + var0.pixels[var3] = DbTableType.SpriteBuffer_spritePalette[var2[var3] & 255]; + } + + class529.SpriteBuffer_xOffsets = null; + class152.SpriteBuffer_yOffsets = null; + HealthBarUpdate.SpriteBuffer_spriteWidths = null; + SpriteMask.SpriteBuffer_spriteHeights = null; + DbTableType.SpriteBuffer_spritePalette = null; + Coord.SpriteBuffer_pixels = null; + return var0; + } + + @ObfuscatedName("ju") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-11" + ) + static boolean method695() { + return (Client.drawPlayerNames & 4) != 0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator7.java b/osrs/src/main/java/UserComparator7.java index 16665dd5f..08b9c390f 100644 --- a/osrs/src/main/java/UserComparator7.java +++ b/osrs/src/main/java/UserComparator7.java @@ -3,15 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("ei") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("ww") - @ObfuscatedSignature( - descriptor = "Loq;" - ) - public static class370 field1171; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -19,10 +14,10 @@ public UserComparator7(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqa;Lqa;B)I", - garbageValue = "92" + descriptor = "(Lqb;Lqb;I)I", + garbageValue = "-2147158295" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -39,197 +34,23 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;B)V", - garbageValue = "7" - ) - public static void method668(AbstractArchive var0, AbstractArchive var1) { - World.KitDefinition_archive = var0; - KitDefinition.KitDefinition_modelsArchive = var1; - KitDefinition.KitDefinition_fileCount = World.KitDefinition_archive.getGroupFileCount(3); - } - - @ObfuscatedName("ji") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1065913503" + descriptor = "(III)I", + garbageValue = "-1608362555" ) - static final void method669(int var0, int var1, int var2, int var3) { - Client.overheadTextLimit = 0; - boolean var4 = false; - int var5 = -1; - int var6 = -1; - int var7 = Players.Players_count; - int[] var8 = Players.Players_indices; - - int var9; - for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { - Object var10; - if (var9 < var7) { - var10 = Client.players[var8[var9]]; - if (var8[var9] == Client.combatTargetPlayerIndex) { - var4 = true; - var5 = var9; - continue; - } - - if (var10 == class136.localPlayer) { - var6 = var9; - continue; - } - } else { - var10 = Client.npcs[Client.npcIndices[var9 - var7]]; - } - - class303.drawActor2d((Actor)var10, var9, var0, var1, var2, var3); - } - - if (Client.field382 && var6 != -1) { - class303.drawActor2d(class136.localPlayer, var6, var0, var1, var2, var3); - } - - if (var4) { - class303.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); - } - - for (var9 = 0; var9 < Client.overheadTextLimit; ++var9) { - int var21 = Client.overheadTextXs[var9]; - int var11 = Client.overheadTextYs[var9]; - int var12 = Client.overheadTextXOffsets[var9]; - int var13 = Client.overheadTextAscents[var9]; - boolean var14 = true; - - while (var14) { - var14 = false; - - for (int var15 = 0; var15 < var9; ++var15) { - if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var21 - var12 < Client.overheadTextXs[var15] + Client.overheadTextXOffsets[var15] && var12 + var21 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) { - var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15]; - var14 = true; - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var9]; - Client.viewportTempY = Client.overheadTextYs[var9] = var11; - String var22 = Client.field599[var9]; - if (Client.chatEffects == 0) { - int var16 = 16776960; - if (Client.overheadTextColors[var9] < 6) { - var16 = Client.field577[Client.overheadTextColors[var9]]; - } - - if (Client.overheadTextColors[var9] == 6) { - var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var9] == 7) { - var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var9] == 8) { - var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var17; - if (Client.overheadTextColors[var9] == 9) { - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - if (var17 < 50) { - var16 = var17 * 1280 + 16711680; - } else if (var17 < 100) { - var16 = 16776960 - (var17 - 50) * 327680; - } else if (var17 < 150) { - var16 = (var17 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var9] == 10) { - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - if (var17 < 50) { - var16 = var17 * 5 + 16711680; - } else if (var17 < 100) { - var16 = 16711935 - (var17 - 50) * 327680; - } else if (var17 < 150) { - var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; - } - } - - if (Client.overheadTextColors[var9] == 11) { - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - if (var17 < 50) { - var16 = 16777215 - var17 * 327685; - } else if (var17 < 100) { - var16 = (var17 - 50) * 327685 + 65280; - } else if (var17 < 150) { - var16 = 16777215 - (var17 - 100) * 327680; - } - } - - int var18; - if (Client.overheadTextColors[var9] == 12 && Client.field591[var9] == null) { - var17 = var22.length(); - Client.field591[var9] = new int[var17]; - - for (var18 = 0; var18 < var17; ++var18) { - int var19 = (int)((float)var18 / (float)var17 * 64.0F); - int var20 = var19 << 10 | 896 | 64; - Client.field591[var9][var18] = class467.field3899[var20]; - } - } - - if (Client.overheadTextEffects[var9] == 0) { - Calendar.fontBold12.method2059(var22, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.field591[var9]); - } - - if (Client.overheadTextEffects[var9] == 1) { - Calendar.fontBold12.method2056(var22, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, Client.field591[var9]); - } - - if (Client.overheadTextEffects[var9] == 2) { - Calendar.fontBold12.method2057(var22, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, Client.field591[var9]); - } - - if (Client.overheadTextEffects[var9] == 3) { - Calendar.fontBold12.method2058(var22, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9], Client.field591[var9]); - } - - if (Client.overheadTextEffects[var9] == 4) { - var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (Calendar.fontBold12.stringWidth(var22) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - Calendar.fontBold12.method2060(var22, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0, Client.field591[var9]); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - - if (Client.overheadTextEffects[var9] == 5) { - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - var18 = 0; - if (var17 < 25) { - var18 = var17 - 25; - } else if (var17 > 125) { - var18 = var17 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - Calendar.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - Calendar.fontBold12.method2059(var22, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0, Client.field591[var9]); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - Calendar.fontBold12.drawCentered(var22, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); + static final int method677(int var0, int var1) { + if (var0 == -1) { + return 12345678; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; } - } - } - - @ObfuscatedName("ow") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1051570454" - ) - static void method670() { - if (Client.oculusOrbState == 1) { - Client.oculusOrbOnLocalPlayer = true; + return (var0 & 65408) + var1; } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator8.java b/osrs/src/main/java/UserComparator8.java index de8231df6..8aebdeb29 100644 --- a/osrs/src/main/java/UserComparator8.java +++ b/osrs/src/main/java/UserComparator8.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") +@ObfuscatedName("eb") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public UserComparator8(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqa;Lqa;I)I", - garbageValue = "315336460" + descriptor = "(Lqb;Lqb;I)I", + garbageValue = "-1255726150" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,38 +38,207 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ldi;III)V", - garbageValue = "-574325390" + descriptor = "(I)V", + garbageValue = "-334645983" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; - Script var4; - if (class345.isWorldMapEvent(var0.type)) { - ScriptFrame.worldMapEvent = (WorldMapEvent)var3[0]; - WorldMapElement var5 = SequenceDefinition.WorldMapElement_get(ScriptFrame.worldMapEvent.mapElement); - var4 = GameEngine.getWorldMapScript(var0.type, var5.objectId, var5.category); - } else { - int var6 = (Integer)var3[0]; - var4 = Interpreter.getScript(var6); + static void method671() { + synchronized(ArchiveDiskActionHandler.field3513) { + if (ArchiveDiskActionHandler.field3512 == 0) { + class167.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + class167.ArchiveDiskActionHandler_thread.setDaemon(true); + class167.ArchiveDiskActionHandler_thread.start(); + class167.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3512 = 600; + ArchiveDiskActionHandler.field3511 = false; } + } - if (var4 != null) { - class18.runScriptLogic(var0, var4, var1, var2); + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Lto;II)V", + garbageValue = "-32046829" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + int var3 = 0; + var0.importIndex(); + + byte[] var10000; + int var4; + int var5; + int var6; + for (var4 = 0; var4 < Players.Players_count; ++var4) { + var5 = Players.Players_indices[var4]; + if ((Players.activityFlags[var5] & 1) == 0) { + if (var3 > 0) { + --var3; + var10000 = Players.activityFlags; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class20.method68(var0); + var10000 = Players.activityFlags; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + AbstractArchive.readPlayerUpdate(var0, var5); + } + } + } } + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_count; ++var4) { + var5 = Players.Players_indices[var4]; + if ((Players.activityFlags[var5] & 1) != 0) { + if (var3 > 0) { + --var3; + var10000 = Players.activityFlags; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class20.method68(var0); + var10000 = Players.activityFlags; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + AbstractArchive.readPlayerUpdate(var0, var5); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { + var5 = Players.Players_emptyIndices[var4]; + if ((Players.activityFlags[var5] & 1) != 0) { + if (var3 > 0) { + --var3; + var10000 = Players.activityFlags; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class20.method68(var0); + var10000 = Players.activityFlags; + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (KitDefinition.updateExternalPlayer(var0, var5)) { + var10000 = Players.activityFlags; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { + var5 = Players.Players_emptyIndices[var4]; + if ((Players.activityFlags[var5] & 1) == 0) { + if (var3 > 0) { + --var3; + var10000 = Players.activityFlags; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class20.method68(var0); + var10000 = Players.activityFlags; + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (KitDefinition.updateExternalPlayer(var0, var5)) { + var10000 = Players.activityFlags; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; + + for (var4 = 1; var4 < 2048; ++var4) { + var10000 = Players.activityFlags; + var10000[var4] = (byte)(var10000[var4] >> 1); + Player var7 = Client.players[var4]; + if (var7 != null) { + Players.Players_indices[++Players.Players_count - 1] = var4; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; + } + } + + class85.method471(var0); + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); + } + } + } + } + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "1" + ) + static final void method673(String var0) { + MouseHandler.addGameMessage(30, "", var0); } - @ObfuscatedName("nt") + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "(Lmt;B)I", - garbageValue = "-68" + descriptor = "(IB)I", + garbageValue = "-33" ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); - return var1 != null ? var1.integer : var0.flags; + static final int method674(int var0) { + return Math.min(Math.max(var0, 128), 383); + } + + @ObfuscatedName("lk") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIIZI)V", + garbageValue = "-1798702842" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { + if (!Client.isMenuOpen) { + if (Client.menuOptionsCount < 500) { + Client.menuActions[Client.menuOptionsCount] = var0; + Client.menuTargets[Client.menuOptionsCount] = var1; + Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuIdentifiers[Client.menuOptionsCount] = var3; + Client.menuArguments1[Client.menuOptionsCount] = var4; + Client.menuArguments2[Client.menuOptionsCount] = var5; + Client.menuItemIds[Client.menuOptionsCount] = var6; + Client.menuShiftClick[Client.menuOptionsCount] = var7; + ++Client.menuOptionsCount; + } + + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator9.java b/osrs/src/main/java/UserComparator9.java index 2194bbbb1..2ead907af 100644 --- a/osrs/src/main/java/UserComparator9.java +++ b/osrs/src/main/java/UserComparator9.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ey") +@ObfuscatedName("em") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public UserComparator9(boolean var1) { this.reversed = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqa;Lqa;I)I", - garbageValue = "-236621973" + descriptor = "(Lqb;Lqb;I)I", + garbageValue = "-38492655" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -34,31 +34,187 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)[Lir;", - garbageValue = "-164706283" + descriptor = "(Lmx;I)V", + garbageValue = "2064536991" ) - static class215[] method678() { - return new class215[]{class215.field1880, class215.field1877, class215.field1882, class215.field1878, class215.field1883, class215.field1879, class215.field1881}; + public static void method683(Huffman var0) { + class334.huffman = var0; } - @ObfuscatedName("bx") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lmt;IB)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-273787824" ) - public static void method679(Widget var0, int var1) { - ItemComposition var2 = class125.ItemDefinition_get(var1); - var0.field3081.equipment[var2.maleModel] = var1 + 512; - if (var2.maleModel1 != -1) { - var0.field3081.equipment[var2.maleModel1] = 0; - } + public static void method685() { + ObjectComposition.ObjectDefinition_cached.clear(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + ObjectComposition.ObjectDefinition_cachedEntities.clear(); + ObjectComposition.ObjectDefinition_cachedModels.clear(); + } - if (var2.maleModel2 != -1) { - var0.field3081.equipment[var2.maleModel2] = 0; - } + @ObfuscatedName("mr") + @ObfuscatedSignature( + descriptor = "(Lmi;IB)I", + garbageValue = "1" + ) + static final int method686(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { + try { + int[] var2 = var0.cs1Instructions[var1]; + int var3 = 0; + int var4 = 0; + byte var5 = 0; + + while (true) { + int var6 = var2[var4++]; + int var7 = 0; + byte var8 = 0; + if (var6 == 0) { + return var3; + } + + if (var6 == 1) { + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = class92.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!InvDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 += var10.field3054[var12]; + } + } + } + } + + if (var6 == 5) { + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { + var7 = VarbitComposition.localPlayer.combatLevel; + } + + if (var6 == 9) { + for (var9 = 0; var9 < 25; ++var9) { + if (Skills.Skills_enabled[var9]) { + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = class92.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!InvDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 = 999999999; + break; + } + } + } + } - var0.field3081.method1690(); + if (var6 == 11) { + var7 = Client.runEnergy; + } + + if (var6 == 12) { + var7 = Client.weight; + } + + if (var6 == 13) { + var9 = Varps.Varps_main[var2[var4++]]; + int var13 = var2[var4++]; + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; + } + + if (var6 == 14) { + var9 = var2[var4++]; + var7 = ClientPreferences.getVarbit(var9); + } + + if (var6 == 15) { + var8 = 1; + } + + if (var6 == 16) { + var8 = 2; + } + + if (var6 == 17) { + var8 = 3; + } + + if (var6 == 18) { + var7 = (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX; + } + + if (var6 == 19) { + var7 = (VarbitComposition.localPlayer.y >> 7) + class47.baseY; + } + + if (var6 == 20) { + var7 = var2[var4++]; + } + + if (var8 == 0) { + if (var5 == 0) { + var3 += var7; + } + + if (var5 == 1) { + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { + var3 /= var7; + } + + if (var5 == 3) { + var3 *= var7; + } + + var5 = 0; + } else { + var5 = var8; + } + } + } catch (Exception var14) { + return -1; + } + } else { + return -2; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/UserList.java b/osrs/src/main/java/UserList.java index 223496250..bfbc2921c 100644 --- a/osrs/src/main/java/UserList.java +++ b/osrs/src/main/java/UserList.java @@ -1,36 +1,34 @@ -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qs") +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; + +@ObfuscatedName("qt") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("au") - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("capacity") final int capacity; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("size") int size; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "[Lqe;" + descriptor = "[Lqs;" ) @Export("array") User[] array; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("comparator") Comparator comparator; @@ -43,26 +41,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)Lqe;", - garbageValue = "3401" + descriptor = "(I)Lqs;", + garbageValue = "-1997275235" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IB)[Lqe;", - garbageValue = "7" + descriptor = "(IB)[Lqs;", + garbageValue = "99" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("bb") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "56" + descriptor = "(I)V", + garbageValue = "501302871" ) @Export("clear") public void clear() { @@ -72,30 +70,30 @@ public void clear() { this.previousUsernamesMap.clear(); } - @ObfuscatedName("bn") + @ObfuscatedName("bv") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1660680644" + garbageValue = "899062224" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("ba") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-541461543" + descriptor = "(B)Z", + garbageValue = "31" ) @Export("isFull") public boolean isFull() { - return this.size == this.capacity; + return this.capacity == this.size; } - @ObfuscatedName("bf") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(Lui;I)Z", - garbageValue = "-442095941" + descriptor = "(Luc;I)Z", + garbageValue = "-2059645334" ) @Export("contains") public boolean contains(Username var1) { @@ -106,10 +104,10 @@ public boolean contains(Username var1) { } } - @ObfuscatedName("bs") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(Lui;I)Lqe;", - garbageValue = "-1674504609" + descriptor = "(Luc;I)Lqs;", + garbageValue = "1337477510" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -117,30 +115,30 @@ public User getByUsername(Username var1) { return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("bp") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(Lui;I)Lqe;", - garbageValue = "132205062" + descriptor = "(Luc;I)Lqs;", + garbageValue = "1463265876" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } - @ObfuscatedName("bv") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(Lui;I)Lqe;", - garbageValue = "690241029" + descriptor = "(Luc;S)Lqs;", + garbageValue = "24556" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } - @ObfuscatedName("bq") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(Lui;I)Z", - garbageValue = "1922358891" + descriptor = "(Luc;I)Z", + garbageValue = "-810573248" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -153,10 +151,10 @@ public final boolean removeByUsername(Username var1) { } } - @ObfuscatedName("bo") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(Lqe;I)V", - garbageValue = "-696802687" + descriptor = "(Lqs;I)V", + garbageValue = "1938550187" ) @Export("remove") final void remove(User var1) { @@ -167,34 +165,38 @@ final void remove(User var1) { } } - @ObfuscatedName("br") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(Lui;I)Lqe;", - garbageValue = "-1994669741" + descriptor = "(Luc;B)Lqs;", + garbageValue = "118" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); } - @ObfuscatedName("bw") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(Lui;Lui;I)Lqe;", - garbageValue = "-1347062581" + descriptor = "(Luc;Luc;B)Lqs;", + garbageValue = "0" ) @Export("addLast") User addLast(Username var1, Username var2) { - User var3 = this.newInstance(); - var3.set(var1, var2); - this.arrayAddLast(var3); - this.mapPut(var3); - return var3; + if (this.getByCurrentUsername(var1) != null) { + throw new IllegalStateException(); + } else { + User var3 = this.newInstance(); + var3.set(var1, var2); + this.arrayAddLast(var3); + this.mapPut(var3); + return var3; + } } - @ObfuscatedName("be") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(II)Lqe;", - garbageValue = "260546627" + descriptor = "(IB)Lqs;", + garbageValue = "20" ) @Export("get") public final User get(int var1) { @@ -205,10 +207,10 @@ public final User get(int var1) { } } - @ObfuscatedName("bc") + @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1082858146" + garbageValue = "1136384662" ) @Export("sort") public final void sort() { @@ -220,10 +222,10 @@ public final void sort() { } - @ObfuscatedName("bi") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(Lqe;Lui;Lui;B)V", - garbageValue = "-42" + descriptor = "(Lqs;Luc;Luc;I)V", + garbageValue = "1687018867" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -232,10 +234,10 @@ final void changeName(User var1, Username var2, Username var3) { this.mapPut(var1); } - @ObfuscatedName("bu") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(Lqe;I)I", - garbageValue = "-2051354785" + descriptor = "(Lqs;B)I", + garbageValue = "2" ) @Export("indexOf") final int indexOf(User var1) { @@ -248,33 +250,37 @@ final int indexOf(User var1) { return -1; } - @ObfuscatedName("bk") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(Lqe;I)V", - garbageValue = "858700951" + descriptor = "(Lqs;I)V", + garbageValue = "-1136381607" ) @Export("mapRemove") final void mapRemove(User var1) { - if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); - } + if (this.usernamesMap.remove(var1.username) == null) { + throw new IllegalStateException(); + } else { + if (var1.previousUsername != null) { + this.previousUsernamesMap.remove(var1.previousUsername); + } + } } - @ObfuscatedName("bz") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(Lqe;I)V", - garbageValue = "1263127165" + descriptor = "(Lqs;I)V", + garbageValue = "-633410463" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; } - @ObfuscatedName("bx") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(Lqe;I)V", - garbageValue = "540764510" + descriptor = "(Lqs;B)V", + garbageValue = "-26" ) @Export("mapPut") final void mapPut(User var1) { @@ -288,10 +294,10 @@ final void mapPut(User var1) { } - @ObfuscatedName("bh") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1297180412" + descriptor = "(IB)V", + garbageValue = "-87" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -302,20 +308,20 @@ final void arrayRemove(int var1) { } - @ObfuscatedName("bm") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1813300749" + descriptor = "(B)V", + garbageValue = "85" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; } - @ObfuscatedName("bl") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "2145677034" + descriptor = "(Ljava/util/Comparator;B)V", + garbageValue = "68" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -327,20 +333,93 @@ public final void addComparator(Comparator var1) { } - @ObfuscatedName("jc") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1830698191" + descriptor = "(ILdh;ZI)I", + garbageValue = "1913527870" ) - static int method2216(int var0, int var1) { - int var2 = var1 - 334; - if (var2 < 0) { - var2 = 0; - } else if (var2 > 100) { - var2 = 100; + static int method2243(int var0, Script var1, boolean var2) { + int var3; + int var4; + int var6; + if (var0 == 3400) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + EnumComposition var5 = class271.getEnum(var3); + if (var5.outputType != 's') { + } + + for (var6 = 0; var6 < var5.outputCount; ++var6) { + if (var4 == var5.keys[var6]) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var5.strVals[var6]; + var5 = null; + break; + } + } + + if (var5 != null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var5.defaultStr; + } + + return 1; + } else if (var0 != 3408) { + if (var0 == 3411) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + EnumComposition var10 = class271.getEnum(var3); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var10.size(); + return 1; + } else { + return 2; + } + } else { + SoundCache.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + EnumComposition var7 = class271.getEnum(var9); + if (var3 == var7.inputType && var4 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { + if (var6 == var7.keys[var8]) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7.intVals[var8]; + } + + var7 = null; + break; + } + } + + if (var7 != null) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7.defaultInt; + } + } + + return 1; + } else { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } } + } - int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; - return var0 * var3 / 256; + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-587387192" + ) + static final boolean method2244() { + return Client.isMenuOpen; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Username.java b/osrs/src/main/java/Username.java index 13ee81b9d..27ae8c40b 100644 --- a/osrs/src/main/java/Username.java +++ b/osrs/src/main/java/Username.java @@ -3,62 +3,175 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ui") +@ObfuscatedName("uc") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("name") String name; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lsi;)V" + descriptor = "(Ljava/lang/String;Lsl;)V" ) public Username(String var1, LoginType var2) { this.name = var1; - this.cleanName = FriendsChat.method2165(var1, var2); + String var4; + if (var1 == null) { + var4 = null; + } else { + label67: { + int var5 = 0; + + int var6; + for (var6 = var1.length(); var5 < var6 && ArchiveDiskActionHandler.method1885(var1.charAt(var5)); ++var5) { + } + + while (var6 > var5 && ArchiveDiskActionHandler.method1885(var1.charAt(var6 - 1))) { + --var6; + } + + int var7 = var6 - var5; + if (var7 >= 1) { + byte var9; + if (var2 == null) { + var9 = 12; + } else { + switch(var2.field4076) { + case 0: + var9 = 20; + break; + default: + var9 = 12; + } + } + + if (var7 <= var9) { + StringBuilder var12 = new StringBuilder(var7); + + for (int var13 = var5; var13 < var6; ++var13) { + char var10 = var1.charAt(var13); + if (ClientPreferences.method537(var10)) { + char var11 = KeyHandler.method91(var10); + if (var11 != 0) { + var12.append(var11); + } + } + } + + if (var12.length() == 0) { + var4 = null; + } else { + var4 = var12.toString(); + } + break label67; + } + } + + var4 = null; + } + } + + this.cleanName = var4; } public Username(String var1) { this.name = var1; - this.cleanName = FriendsChat.method2165(var1, LoginType.oldscape); + LoginType var4 = LoginType.oldscape; + String var3; + if (var1 == null) { + var3 = null; + } else { + label67: { + int var5 = 0; + + int var6; + for (var6 = var1.length(); var5 < var6 && ArchiveDiskActionHandler.method1885(var1.charAt(var5)); ++var5) { + } + + while (var6 > var5 && ArchiveDiskActionHandler.method1885(var1.charAt(var6 - 1))) { + --var6; + } + + int var7 = var6 - var5; + if (var7 >= 1) { + byte var9; + if (var4 == null) { + var9 = 12; + } else { + switch(var4.field4076) { + case 0: + var9 = 20; + break; + default: + var9 = 12; + } + } + + if (var7 <= var9) { + StringBuilder var12 = new StringBuilder(var7); + + for (int var13 = var5; var13 < var6; ++var13) { + char var10 = var1.charAt(var13); + if (ClientPreferences.method537(var10)) { + char var11 = KeyHandler.method91(var10); + if (var11 != 0) { + var12.append(var11); + } + } + } + + if (var12.length() == 0) { + var3 = null; + } else { + var3 = var12.toString(); + } + break label67; + } + } + + var3 = null; + } + } + + this.cleanName = var3; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "880493347" + garbageValue = "-1021488493" ) @Export("getName") public String getName() { return this.name; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1828095462" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "28" ) - public String method2682() { + public String method2700() { return this.cleanName; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "115" + descriptor = "(I)Z", + garbageValue = "-911492900" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; } - @ObfuscatedName("az") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lui;I)I", - garbageValue = "704664306" + descriptor = "(Luc;I)I", + garbageValue = "-2077400310" ) @Export("compareToTyped") public int compareToTyped(Username var1) { @@ -103,4 +216,4 @@ public String toString() { public int compareTo(Object var1) { return this.compareToTyped((Username)var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Usernamed.java b/osrs/src/main/java/Usernamed.java index e8dc592b7..b3b7c9b17 100644 --- a/osrs/src/main/java/Usernamed.java +++ b/osrs/src/main/java/Usernamed.java @@ -3,14 +3,14 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qv") +@ObfuscatedName("ql") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("ne") + @ObfuscatedName("ok") @ObfuscatedSignature( - descriptor = "(I)Lui;", - garbageValue = "466420447" + descriptor = "(S)Luc;", + garbageValue = "-775" ) @Export("username") Username username(); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/VarbitComposition.java b/osrs/src/main/java/VarbitComposition.java index d9764b4e3..b4b4fe12a 100644 --- a/osrs/src/main/java/VarbitComposition.java +++ b/osrs/src/main/java/VarbitComposition.java @@ -3,55 +3,64 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +@ObfuscatedName("hb") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("VarbitDefinition_archive") - public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("ay") + static AbstractArchive VarbitDefinition_archive; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("aj") - static final int[] field1655; - @ObfuscatedName("gy") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("ar") + @ObfuscatedName("ai") + static final int[] field1674; + @ObfuscatedName("mo") + @ObfuscatedSignature( + descriptor = "Ldf;" + ) + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("us") + @Export("cameraLookAtY") + static int cameraLookAtY; + @ObfuscatedName("ao") @Export("baseVar") public int baseVar; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("startBit") public int startBit; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); - field1655 = new int[32]; + field1674 = new int[32]; int var0 = 2; for (int var1 = 0; var1 < 32; ++var1) { - field1655[var1] = var0 - 1; + field1674[var1] = var0 - 1; var0 += var0; } } - @ObfuscatedName("ay") + VarbitComposition() { + } + + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "1506861624" + descriptor = "(Ltm;I)V", + garbageValue = "1889164320" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -62,10 +71,10 @@ public void decode(Buffer var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;IB)V", - garbageValue = "-7" + descriptor = "(Ltm;II)V", + garbageValue = "1344279898" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -77,250 +86,19 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("aw") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(II)Lmt;", - garbageValue = "-2070721746" + descriptor = "(Ljava/lang/CharSequence;B)I", + garbageValue = "14" ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; - int var2 = var0 & 65535; - if (ArchiveLoader.Widget_interfaceComponents[var1] == null || ArchiveLoader.Widget_interfaceComponents[var1][var2] == null) { - boolean var3 = Login.loadInterface(var1); - if (!var3) { - return null; - } - } - - return ArchiveLoader.Widget_interfaceComponents[var1][var2]; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "([Lcr;II[I[II)V", - garbageValue = "-1873571758" - ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { - int var5 = var1 - 1; - int var6 = var2 + 1; - int var7 = (var2 + var1) / 2; - World var8 = var0[var7]; - var0[var7] = var0[var1]; - var0[var1] = var8; - - while (var5 < var6) { - boolean var9 = true; - - int var10; - int var11; - int var12; - do { - --var6; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var6].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var6].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var6].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var6].id; - var12 = var8.id; - } + public static int method1012(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; - if (var12 != var11) { - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - var9 = true; - - do { - ++var5; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var5].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var5].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var5].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var5].id; - var12 = var8.id; - } - - if (var11 != var12) { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; - } - } - - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + var0.charAt(var3); } + return var2; } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "1174907654" - ) - @Export("SpriteBuffer_decode") - public static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class528.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - class492.SpriteBuffer_xOffsets = new int[class528.SpriteBuffer_spriteCount]; - class134.SpriteBuffer_yOffsets = new int[class528.SpriteBuffer_spriteCount]; - class172.SpriteBuffer_spriteWidths = new int[class528.SpriteBuffer_spriteCount]; - class528.SpriteBuffer_spriteHeights = new int[class528.SpriteBuffer_spriteCount]; - ArchiveDiskAction.SpriteBuffer_pixels = new byte[class528.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class528.SpriteBuffer_spriteCount * 8; - class528.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class528.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class528.SpriteBuffer_spriteCount; ++var3) { - class492.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class528.SpriteBuffer_spriteCount; ++var3) { - class134.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class528.SpriteBuffer_spriteCount; ++var3) { - class172.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class528.SpriteBuffer_spriteCount; ++var3) { - class528.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class528.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - class528.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - class528.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (class528.SpriteBuffer_spritePalette[var3] == 0) { - class528.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; - - for (var3 = 0; var3 < class528.SpriteBuffer_spriteCount; ++var3) { - int var4 = class172.SpriteBuffer_spriteWidths[var3]; - int var5 = class528.SpriteBuffer_spriteHeights[var3]; - int var6 = var5 * var4; - byte[] var7 = new byte[var6]; - ArchiveDiskAction.SpriteBuffer_pixels[var3] = var7; - int var8 = var1.readUnsignedByte(); - int var9; - if (var8 == 0) { - for (var9 = 0; var9 < var6; ++var9) { - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { - for (var9 = 0; var9 < var4; ++var9) { - for (int var10 = 0; var10 < var5; ++var10) { - var7[var9 + var10 * var4] = var1.readByte(); - } - } - } - } - - } - - @ObfuscatedName("ma") - @ObfuscatedSignature( - descriptor = "(Lmt;I)V", - garbageValue = "-164966121" - ) - static final void method996(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field545 == -1) { - Client.field545 = var0.spriteId2; - Client.field542 = var0.spriteId; - } - - if (Client.playerAppearance.field2900 == 1) { - var0.spriteId2 = Client.field545; - } else { - var0.spriteId2 = Client.field542; - } - - } else if (var1 == 325) { - if (Client.field545 == -1) { - Client.field545 = var0.spriteId2; - Client.field542 = var0.spriteId; - } - - if (Client.playerAppearance.field2900 == 1) { - var0.spriteId2 = Client.field542; - } else { - var0.spriteId2 = Client.field545; - } - - } else if (var1 == 327) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 0; - } else if (var1 == 328) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 1; - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/VarcInt.java b/osrs/src/main/java/VarcInt.java index 545845df7..a63292aa1 100644 --- a/osrs/src/main/java/VarcInt.java +++ b/osrs/src/main/java/VarcInt.java @@ -3,22 +3,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +import java.util.List; + +@ObfuscatedName("hk") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("wz") + static List field1532; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("VarcInt_cached") static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("ar") + @ObfuscatedName("dy") + @ObfuscatedSignature( + descriptor = "Luk;" + ) + static IndexedSprite field1534; + @ObfuscatedName("if") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("ao") @Export("persist") public boolean persist; @@ -30,61 +45,41 @@ public class VarcInt extends DualNode { this.persist = false; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "1325526126" + descriptor = "(Ltm;I)V", + garbageValue = "-2131192855" ) - void method940(Buffer var1) { + void method954(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method941(var1, var2); + this.method955(var1, var2); } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;IB)V", - garbageValue = "109" + descriptor = "(Ltm;IB)V", + garbageValue = "-12" ) - void method941(Buffer var1, int var2) { + void method955(Buffer var1, int var2) { if (var2 == 2) { this.persist = true; } } - @ObfuscatedName("ac") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "1683320936" + descriptor = "(I)Lch;", + garbageValue = "-580226644" ) - static int method942(int var0, Script var1, boolean var2) { - Widget var3 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == 2500) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == 2501) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == 2502) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == 2503) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == 2504) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == 2505) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; - } + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? class176.World_worlds[++World.World_listCount - 1] : null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Varcs.java b/osrs/src/main/java/Varcs.java index b4485f08c..44e590e05 100644 --- a/osrs/src/main/java/Varcs.java +++ b/osrs/src/main/java/Varcs.java @@ -1,63 +1,61 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + import java.io.EOFException; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ew") +@ObfuscatedName("ej") @Implements("Varcs") public class Varcs { - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static Archive field1130; - @ObfuscatedName("ar") + @ObfuscatedName("gr") + static String field1140; + @ObfuscatedName("ao") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("map") Map map; /** @deprecated */ @Deprecated - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("strings") String[] strings; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("ag") - long field1135; + @ObfuscatedName("az") + long field1145; Varcs() { this.unwrittenChanges = false; - int var1 = class197.archive2.getGroupFileCount(19); + int var1 = class1.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; int var2; for (var2 = 0; var2 < var1; ++var2) { - VarcInt var3 = class132.method721(var2); + VarcInt var3 = class227.method1210(var2); this.intsPersistence[var2] = var3.persist; } var2 = 0; - if (class197.archive2.method1862(15)) { - var2 = class197.archive2.getGroupFileCount(15); + if (class1.archive2.method1898(15)) { + var2 = class1.archive2.getGroupFileCount(15); } this.strings = new String[var2]; this.read(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1961854581" + garbageValue = "1506039349" ) @Export("setInt") void setInt(int var1, int var2) { @@ -68,10 +66,10 @@ void setInt(int var1, int var2) { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-33672218" + descriptor = "(IB)I", + garbageValue = "2" ) @Export("getInt") int getInt(int var1) { @@ -79,20 +77,20 @@ int getInt(int var1) { return var2 instanceof Integer ? (Integer)var2 : -1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)V", - garbageValue = "31" + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "-1902210814" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "91278440" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "2" ) @Export("getString") String getString(int var1) { @@ -102,10 +100,10 @@ String getString(int var1) { /** @deprecated */ @Deprecated - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)V", - garbageValue = "-22" + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "544618073" ) @Export("setStringOld") void setStringOld(int var1, String var2) { @@ -114,20 +112,20 @@ void setStringOld(int var1, String var2) { /** @deprecated */ @Deprecated - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "573236545" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "-128" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "488791013" + descriptor = "(B)V", + garbageValue = "-54" ) @Export("clearTransient") void clearTransient() { @@ -144,20 +142,20 @@ void clearTransient() { } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ZB)Ltn;", - garbageValue = "-68" + descriptor = "(ZI)Ltu;", + garbageValue = "-924681157" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return Decimator.getPreferencesFile("2", KeyHandler.field72.name, var1); + return Decimator.getPreferencesFile("2", WorldMapSectionType.field2417.name, var1); } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "65" + garbageValue = "25" ) @Export("write") void write() { @@ -177,54 +175,61 @@ void write() { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += class501.stringCp1252NullTerminatedByteSize((String)var7); + var2 += AbstractSocket.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; } } - Buffer var23 = new Buffer(var2); - var23.writeByte(2); - var23.writeShort(var3); - Iterator var24 = this.map.entrySet().iterator(); - - while (var24.hasNext()) { - Entry var12 = (Entry)var24.next(); - int var13 = (Integer)var12.getKey(); - if (this.intsPersistence[var13]) { - var23.writeShort(var13); - Object var8 = var12.getValue(); - class503 var9 = class503.method2470(var8.getClass()); - var23.writeByte(var9.field4094); - class503.method2472(var8, var23); + Buffer var26 = new Buffer(var2); + var26.writeByte(2); + var26.writeShort(var3); + Iterator var27 = this.map.entrySet().iterator(); + + while (var27.hasNext()) { + Entry var15 = (Entry)var27.next(); + int var16 = (Integer)var15.getKey(); + if (this.intsPersistence[var16]) { + var26.writeShort(var16); + Object var8 = var15.getValue(); + class502 var9 = class502.method2495(var8.getClass()); + var26.writeByte(var9.field4103); + Class var11 = var8.getClass(); + class502 var12 = class502.method2495(var11); + if (var12 == null) { + throw new IllegalArgumentException(); + } + + class498 var10 = var12.field4106; + var10.vmethod8274(var8, var26); } } - var1.write(var23.array, 0, var23.offset); - } catch (Exception var21) { + var1.write(var26.array, 0, var26.offset); + } catch (Exception var24) { } finally { try { var1.close(); - } catch (Exception var20) { + } catch (Exception var23) { } } this.unwrittenChanges = false; - this.field1135 = class113.clockNow(); + this.field1145 = GameEngine.clockNow(); } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-908905971" + garbageValue = "-137734629" ) @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); - label232: { + label220: { try { byte[] var2 = new byte[(int)var1.length()]; @@ -237,12 +242,12 @@ void read() { } Buffer var14 = new Buffer(var2); - if (var14.array.length - var14.offset < 1) { - return; - } + if (var14.array.length - var14.offset >= 1) { + int var15 = var14.readUnsignedByte(); + if (var15 < 0 || var15 > 2) { + return; + } - int var15 = var14.readUnsignedByte(); - if (var15 >= 0 && var15 <= 2) { int var7; int var8; int var9; @@ -253,13 +258,13 @@ void read() { while (true) { if (var7 >= var16) { - break label232; + break label220; } var8 = var14.readUnsignedShort(); var9 = var14.readUnsignedByte(); - class503 var10 = (class503)ClientPreferences.findEnumerated(class503.method2469(), var9); - Object var11 = var10.method2474(var14); + class502 var10 = (class502)KeyHandler.findEnumerated(class502.method2494(), var9); + Object var11 = var10.method2497(var14); if (var8 >= 0 && var8 < this.intsPersistence.length && this.intsPersistence[var8]) { this.map.put(var8, var11); } @@ -282,7 +287,7 @@ void read() { while (true) { if (var8 >= var7) { - break label232; + break label220; } var14.readUnsignedShort(); @@ -292,7 +297,7 @@ void read() { } } } catch (Exception var25) { - break label232; + break label220; } finally { try { var1.close(); @@ -307,26 +312,26 @@ void read() { this.unwrittenChanges = false; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2109482276" + garbageValue = "-1824287438" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1135 < class113.clockNow() - 60000L) { + if (this.unwrittenChanges && this.field1145 < GameEngine.clockNow() - 60000L) { this.write(); } } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "75" + garbageValue = "7" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/VarpDefinition.java b/osrs/src/main/java/VarpDefinition.java index 5f8cadfa5..541dc47be 100644 --- a/osrs/src/main/java/VarpDefinition.java +++ b/osrs/src/main/java/VarpDefinition.java @@ -3,26 +3,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") +@ObfuscatedName("hi") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("VarpDefinition_archive") - public static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("ay") - public static int field1491; - @ObfuscatedName("ar") + static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("ae") + public static int field1498; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("VarpDefinition_cached") public static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("hr") - static String field1494; - @ObfuscatedName("am") + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("SequenceDefinition_animationsArchive") + static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("uk") + @Export("cameraMoveToHeight") + static int cameraMoveToHeight; + @ObfuscatedName("at") @Export("type") public int type; @@ -34,10 +41,10 @@ public class VarpDefinition extends DualNode { this.type = 0; } - @ObfuscatedName("ay") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "1223419566" + descriptor = "(Ltm;B)V", + garbageValue = "-2" ) @Export("decode") void decode(Buffer var1) { @@ -51,10 +58,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "512935442" + descriptor = "(Ltm;II)V", + garbageValue = "1878082130" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -63,141 +70,4 @@ void decodeNext(Buffer var1, int var2) { } } - - @ObfuscatedName("lw") - @ObfuscatedSignature( - descriptor = "(Ldh;IIIB)V", - garbageValue = "79" - ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { - NPCComposition var4 = var0.definition; - if (Client.menuOptionsCount < 400) { - if (var4.transforms != null) { - var4 = var4.transform(); - } - - if (var4 != null) { - if (var4.isInteractable) { - if (!var4.isFollower || Client.followerIndex == var1) { - String var5 = var0.method586(); - int var6; - int var9; - if (var4.combatLevel != 0 && var0.combatLevelChange != 0) { - var6 = var0.combatLevelChange != -1 ? var0.combatLevelChange * -473541083 * 1655690669 : var4.combatLevel * 985027529 * -1879689607; - var9 = class136.localPlayer.combatLevel; - int var10 = var9 - var6; - String var8; - if (var10 < -9) { - var8 = MusicPatchPcmStream.colorStartTag(16711680); - } else if (var10 < -6) { - var8 = MusicPatchPcmStream.colorStartTag(16723968); - } else if (var10 < -3) { - var8 = MusicPatchPcmStream.colorStartTag(16740352); - } else if (var10 < 0) { - var8 = MusicPatchPcmStream.colorStartTag(16756736); - } else if (var10 > 9) { - var8 = MusicPatchPcmStream.colorStartTag(65280); - } else if (var10 > 6) { - var8 = MusicPatchPcmStream.colorStartTag(4259584); - } else if (var10 > 3) { - var8 = MusicPatchPcmStream.colorStartTag(8453888); - } else if (var10 > 0) { - var8 = MusicPatchPcmStream.colorStartTag(12648192); - } else { - var8 = MusicPatchPcmStream.colorStartTag(16776960); - } - - var5 = var5 + var8 + " " + " (" + "level-" + var6 + ")"; - } - - if (var4.isFollower && Client.followerOpsLowPriority) { - JagexCache.insertMenuItemNoShift("Examine", MusicPatchPcmStream.colorStartTag(16776960) + var5, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - JagexCache.insertMenuItemNoShift("Use", Client.field595 + " " + "->" + " " + MusicPatchPcmStream.colorStartTag(16776960) + var5, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((PcmPlayer.selectedSpellFlags & 2) == 2) { - JagexCache.insertMenuItemNoShift(Client.field597, Client.field596 + " " + "->" + " " + MusicPatchPcmStream.colorStartTag(16776960) + var5, 8, var1, var2, var3); - } - } else { - var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var7 = var4.actions; - int var11; - if (var7 != null) { - for (var11 = 4; var11 >= 0; --var11) { - if (var0.method585(var11) && var7[var11] != null && !var7[var11].equalsIgnoreCase("Attack")) { - var9 = 0; - if (var11 == 0) { - var9 = var6 + 9; - } - - if (var11 == 1) { - var9 = var6 + 10; - } - - if (var11 == 2) { - var9 = var6 + 11; - } - - if (var11 == 3) { - var9 = var6 + 12; - } - - if (var11 == 4) { - var9 = var6 + 13; - } - - JagexCache.insertMenuItemNoShift(var7[var11], MusicPatchPcmStream.colorStartTag(16776960) + var5, var9, var1, var2, var3); - } - } - } - - if (var7 != null) { - for (var11 = 4; var11 >= 0; --var11) { - if (var0.method585(var11) && var7[var11] != null && var7[var11].equalsIgnoreCase("Attack")) { - short var12 = 0; - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > class136.localPlayer.combatLevel) { - var12 = 2000; - } - - var9 = 0; - if (var11 == 0) { - var9 = var12 + 9; - } - - if (var11 == 1) { - var9 = var12 + 10; - } - - if (var11 == 2) { - var9 = var12 + 11; - } - - if (var11 == 3) { - var9 = var12 + 12; - } - - if (var11 == 4) { - var9 = var12 + 13; - } - - JagexCache.insertMenuItemNoShift(var7[var11], MusicPatchPcmStream.colorStartTag(16776960) + var5, var9, var1, var2, var3); - } - } - } - } - - if (!var4.isFollower || !Client.followerOpsLowPriority) { - JagexCache.insertMenuItemNoShift("Examine", MusicPatchPcmStream.colorStartTag(16776960) + var5, 1003, var1, var2, var3); - } - } - - } - } - } - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Varps.java b/osrs/src/main/java/Varps.java index 04f5739d0..bc26c0d53 100644 --- a/osrs/src/main/java/Varps.java +++ b/osrs/src/main/java/Varps.java @@ -1,22 +1,23 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mq") +@ObfuscatedName("mz") @Implements("Varps") public class Varps { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("gv") - @Export("currentPort") - static int currentPort; + @ObfuscatedName("at") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; static { Varps_masks = new int[32]; @@ -30,4 +31,13 @@ public class Varps { Varps_temp = new int[4000]; Varps_main = new int[4000]; } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)[Ldl;", + garbageValue = "-195730682" + ) + static class89[] method1708() { + return new class89[]{class89.field881, class89.field883, class89.field882, class89.field880, class89.field884}; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/VertexNormal.java b/osrs/src/main/java/VertexNormal.java index 2d0c5c1ca..3ea0c450d 100644 --- a/osrs/src/main/java/VertexNormal.java +++ b/osrs/src/main/java/VertexNormal.java @@ -3,19 +3,21 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("ja") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("aw") + @ObfuscatedName("ul") + static int field2255; + @ObfuscatedName("au") @Export("x") int x; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("y") int y; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("z") int z; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("magnitude") int magnitude; @@ -23,7 +25,7 @@ public class VertexNormal { } @ObfuscatedSignature( - descriptor = "(Ljk;)V" + descriptor = "(Lja;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; @@ -31,18 +33,4 @@ public class VertexNormal { this.z = var1.z; this.magnitude = var1.magnitude; } - - @ObfuscatedName("ng") - @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "1893711820" - ) - static void method1323(Buffer var0) { - if (Client.randomDatData != null) { - var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var1 = class215.method1106(); - var0.writeBytes(var1, 0, var1.length); - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/VerticalAlignment.java b/osrs/src/main/java/VerticalAlignment.java index 48f315600..a786fbfba 100644 --- a/osrs/src/main/java/VerticalAlignment.java +++ b/osrs/src/main/java/VerticalAlignment.java @@ -3,38 +3,41 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("hy") @Implements("VerticalAlignment") -public enum VerticalAlignment implements class372 { - @ObfuscatedName("aw") +public enum VerticalAlignment implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhy;" ) - field1616(0, 0), - @ObfuscatedName("ay") + field1634(1, 0), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhy;" ) @Export("VerticalAlignment_centered") - VerticalAlignment_centered(2, 1), - @ObfuscatedName("ar") + VerticalAlignment_centered(0, 1), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhy;" ) - field1615(1, 2); + field1633(2, 2); - @ObfuscatedName("wk") - static long field1614; - @ObfuscatedName("ty") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lbk;" + descriptor = "Luk;" ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("am") + static IndexedSprite field1631; + @ObfuscatedName("td") + @ObfuscatedSignature( + descriptor = "Lgo;" + ) + @Export("guestClanChannel") + static ClanChannel guestClanChannel; + @ObfuscatedName("at") @Export("value") public final int value; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("id") final int id; @@ -43,13 +46,50 @@ public enum VerticalAlignment implements class372 { this.id = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[IIII)V", + garbageValue = "807517970" + ) + public static void method998(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + int var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + int var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } + } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + method998(var0, var1, var2, var5 - 1); + method998(var0, var1, var5 + 1, var3); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/ViewportMouse.java b/osrs/src/main/java/ViewportMouse.java index 07e3c7ec4..77a421f81 100644 --- a/osrs/src/main/java/ViewportMouse.java +++ b/osrs/src/main/java/ViewportMouse.java @@ -1,36 +1,37 @@ -import java.util.ArrayList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("jc") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("ViewportMouse_isInViewport") - public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("ay") + static boolean ViewportMouse_isInViewport; + @ObfuscatedName("ae") @Export("ViewportMouse_x") - public static int ViewportMouse_x; - @ObfuscatedName("ar") + static int ViewportMouse_x; + @ObfuscatedName("ao") @Export("ViewportMouse_y") - public static int ViewportMouse_y; - @ObfuscatedName("am") + static int ViewportMouse_y; + @ObfuscatedName("at") @Export("ViewportMouse_false0") - public static boolean ViewportMouse_false0; - @ObfuscatedName("as") - static int field2228; - @ObfuscatedName("aj") - static int field2227; - @ObfuscatedName("av") - static int field2229; - @ObfuscatedName("ah") - public static short[] field2226; - @ObfuscatedName("ax") + static boolean ViewportMouse_false0; + @ObfuscatedName("ac") + static int field2249; + @ObfuscatedName("ai") + static int field2252; + @ObfuscatedName("az") + static int field2254; + @ObfuscatedName("aa") + static int field2248; + @ObfuscatedName("ad") + static int field2250; + @ObfuscatedName("an") @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; @@ -43,387 +44,39 @@ public class ViewportMouse { ViewportMouse_entityTags = new long[1000]; } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)[Llo;", - garbageValue = "719974539" - ) - public static ZoneOperation[] ZoneOperationOrder() { - return new ZoneOperation[] { - ZoneOperation.OBJ_DEL_LEGACY, - ZoneOperation.OBJ_ADD, - ZoneOperation.AREA_SOUND, - ZoneOperation.LOC_ANIM, - ZoneOperation.OBJ_COUNT, - ZoneOperation.PREFETCH_GAMEOBJECTS, - ZoneOperation.LOC_DEL, - ZoneOperation.LOC_ADD_CHANGE, - ZoneOperation.OBJ_DEL, - ZoneOperation.MAP_ANIM, - ZoneOperation.MAPPROJ_ANIM - }; - } - - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-900202219" + descriptor = "(BI)C", + garbageValue = "-1224781915" ) - public static int method1319(int var0) { - return var0 >>> 12; - } + public static char method1348(byte var0) { + int var1 = var0 & 255; + if (var1 == 0) { + throw new IllegalArgumentException("" + Integer.toString(var1, 16)); + } else { + if (var1 >= 128 && var1 < 160) { + char var2 = class384.cp1252AsciiExtension[var1 - 128]; + if (var2 == 0) { + var2 = '?'; + } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)Lrj;", - garbageValue = "1976955779" - ) - public static class450 method1321() { - synchronized(class450.field3852) { - if (class344.field3132 == 0) { - return new class450(); - } else { - class450.field3852[--class344.field3132].method2268(); - return class450.field3852[class344.field3132]; + var1 = var2; } + + return (char)var1; } } @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-604436276" + descriptor = "(IIII)I", + garbageValue = "759776126" ) - static int method1322(int var0, Script var1, boolean var2) { - if (var0 == 3200) { - Interpreter.Interpreter_intStackSize -= 3; - class17.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); - return 1; + static int method1349(int var0, int var1, int var2) { + if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { + return 0; } else { - int var3; - int var4; - int var5; - int var6; - int var7; - if (var0 == 3201) { - Interpreter.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - ArrayList var8 = new ArrayList(); - var8.add(var3); - ObjectComposition.method1031(var8, var4, var5, var6, var7); - return 1; - } else if (var0 == 3202) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.playJingle(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else { - class90 var12; - class89 var13; - String var15; - if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { - boolean var16; - if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { - if (var0 == 3211) { - return 1; - } else if (var0 == 3216) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = 0; - class90 var18 = (class90)ClientPreferences.findEnumerated(class1.method2(), var3); - if (var18 != null) { - var4 = var18 != class90.field892 ? 1 : 0; - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - return 1; - } else if (var0 == 3218) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = 0; - class89 var10 = (class89)ClientPreferences.findEnumerated(FontName.method2420(), var3); - if (var10 != null) { - var4 = var10 != class89.field882 ? 1 : 0; - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - return 1; - } else if (var0 != 3217 && var0 != 3219) { - if (var0 == 3220) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - RouteStrategy.method1107(var3, var4); - return 1; - } else if (var0 == 3221) { - Interpreter.Interpreter_intStackSize -= 6; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; - ArrayList var9 = new ArrayList(); - var9.add(var3); - var9.add(var4); - ObjectComposition.method1031(var9, var5, var6, var7, var11); - return 1; - } else if (var0 == 3222) { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - class452.someMusicMethod(var3, var4, var5, var6); - return 1; - } else { - return 2; - } - } else { - var12 = class90.field892; - var13 = class89.field882; - var16 = true; - boolean var17 = true; - if (var0 == 3217) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = (class90)ClientPreferences.findEnumerated(class1.method2(), var7); - if (var12 == null) { - throw new RuntimeException(String.format("Unrecognized device option %d", var7)); - } - } - - if (var0 == 3219) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = (class89)ClientPreferences.findEnumerated(FontName.method2420(), var7); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized game option %d", var7)); - } - } - - String var14; - byte var19; - if (var13 == class89.field882) { - switch(var12.field894) { - case 1: - case 2: - case 3: - var19 = 0; - var6 = 1; - break; - case 4: - var19 = 0; - var6 = Integer.MAX_VALUE; - break; - case 5: - var19 = 0; - var6 = 100; - break; - default: - var14 = String.format("Unkown device option: %s.", var12.toString()); - throw new RuntimeException(var14); - } - } else { - switch(var13.field885) { - case 1: - var19 = 0; - var6 = 1; - break; - case 2: - case 3: - case 4: - var19 = 0; - var6 = 100; - break; - default: - var14 = String.format("Unkown game option: %s.", var13.toString()); - throw new RuntimeException(var14); - } - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var19; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; - return 1; - } - } else { - var12 = class90.field892; - var13 = class89.field882; - var16 = false; - if (var0 == 3214) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = (class90)ClientPreferences.findEnumerated(class1.method2(), var6); - if (var12 == null) { - throw new RuntimeException(String.format("Unrecognized device option %d", var6)); - } - } - - if (var0 == 3215) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = (class89)ClientPreferences.findEnumerated(FontName.method2420(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized game option %d", var6)); - } - } - - if (var0 == 3210) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = (class90)ClientPreferences.findEnumerated(class1.method2(), var6); - if (var12 == null) { - var13 = (class89)ClientPreferences.findEnumerated(FontName.method2420(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized client option %d", var6)); - } - } - } else if (var0 == 3182) { - var12 = class90.field888; - } else if (var0 == 3204) { - var13 = class89.field880; - } else if (var0 == 3206) { - var13 = class89.field879; - } else if (var0 == 3208) { - var13 = class89.field881; - } - - if (var13 == class89.field882) { - switch(var12.field894) { - case 1: - var5 = class150.clientPreferences.getIsUsernameHidden() ? 1 : 0; - break; - case 2: - var5 = class150.clientPreferences.getTitleMusicDisabled() ? 1 : 0; - break; - case 3: - var5 = class150.clientPreferences.method557() ? 1 : 0; - break; - case 4: - var5 = class150.clientPreferences.method559(); - break; - case 5: - var5 = JagexCache.method901(); - break; - default: - var15 = String.format("Unkown device option: %s.", var12.toString()); - throw new RuntimeException(var15); - } - } else { - switch(var13.field885) { - case 1: - var5 = class150.clientPreferences.getRoofsHidden() ? 1 : 0; - break; - case 2: - var6 = class150.clientPreferences.getCurrentMusicVolume(); - var5 = Math.round((float)(var6 * 100) / 255.0F); - break; - case 3: - var6 = class150.clientPreferences.getCurrentSoundEffectsVolume(); - var5 = Math.round((float)(var6 * 100) / 127.0F); - break; - case 4: - var6 = class150.clientPreferences.getAreaSoundEffectsVolume(); - var5 = Math.round((float)(var6 * 100) / 127.0F); - break; - default: - var15 = String.format("Unkown game option: %s.", var13.toString()); - throw new RuntimeException(var15); - } - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; - return 1; - } - } else { - var12 = class90.field892; - var13 = class89.field882; - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var0 == 3212) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = (class90)ClientPreferences.findEnumerated(class1.method2(), var6); - if (var12 == null) { - throw new RuntimeException(String.format("Unrecognized device option %d", var6)); - } - } - - if (var0 == 3213) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = (class89)ClientPreferences.findEnumerated(FontName.method2420(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized game option %d", var6)); - } - } - - if (var0 == 3209) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = (class90)ClientPreferences.findEnumerated(class1.method2(), var6); - if (var12 == null) { - var13 = (class89)ClientPreferences.findEnumerated(FontName.method2420(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized client option %d", var6)); - } - } - } else if (var0 == 3181) { - var12 = class90.field888; - } else if (var0 == 3203) { - var13 = class89.field880; - } else if (var0 == 3205) { - var13 = class89.field879; - } else if (var0 == 3207) { - var13 = class89.field881; - } - - if (var13 == class89.field882) { - switch(var12.field894) { - case 1: - class150.clientPreferences.setIsUsernameHidden(var5 == 1); - break; - case 2: - class150.clientPreferences.getTitleMusicDisabled(var5 == 1); - break; - case 3: - class150.clientPreferences.method555(var5 == 1); - break; - case 4: - if (var5 < 0) { - var5 = 0; - } - - class150.clientPreferences.method558(var5); - break; - case 5: - UrlRequester.method650(var5); - break; - default: - var15 = String.format("Unkown device option: %s.", var12.toString()); - throw new RuntimeException(var15); - } - } else { - switch(var13.field885) { - case 1: - class150.clientPreferences.setRoofsHidden(var5 == 1); - break; - case 2: - var5 = Math.min(Math.max(var5, 0), 100); - var6 = Math.round((float)(var5 * 255) / 100.0F); - StudioGame.method1839(var6); - break; - case 3: - var5 = Math.min(Math.max(var5, 0), 100); - var6 = Math.round((float)(var5 * 127) / 100.0F); - ClanMate.method2184(var6); - break; - case 4: - var5 = Math.min(Math.max(var5, 0), 100); - var6 = Math.round((float)(var5 * 127) / 100.0F); - Interpreter.method429(var6); - break; - default: - var15 = String.format("Unkown game option: %s.", var13.toString()); - throw new RuntimeException(var15); - } - } - - return 1; - } - } + return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/VorbisCodebook.java b/osrs/src/main/java/VorbisCodebook.java index ea3152d24..4b3f537af 100644 --- a/osrs/src/main/java/VorbisCodebook.java +++ b/osrs/src/main/java/VorbisCodebook.java @@ -3,29 +3,29 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ct") +@ObfuscatedName("cw") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("aw") - int field255; - @ObfuscatedName("ay") + @ObfuscatedName("au") + int field257; + @ObfuscatedName("ae") @Export("entries") int entries; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("am") - int[] field258; - @ObfuscatedName("as") - float[][] field254; - @ObfuscatedName("aj") + @ObfuscatedName("at") + int[] field260; + @ObfuscatedName("ac") + float[][] field255; + @ObfuscatedName("ai") @Export("keys") int[] keys; VorbisCodebook() { class60 var1 = VorbisSample.field267; var1.method325(24); - this.field255 = var1.method325(16); + this.field257 = var1.method325(16); this.entries = var1.method325(24); this.lengthMap = new int[this.entries]; boolean var2 = var1.method326() != 0; @@ -36,7 +36,7 @@ public class VorbisCodebook { var3 = 0; for (var4 = var1.method325(5) + 1; var3 < this.entries; ++var4) { - int var5 = var1.method325(WorldMapRegion.iLog(this.entries - var3)); + int var5 = var1.method325(class16.iLog(this.entries - var3)); for (var6 = 0; var6 < var5; ++var6) { this.lengthMap[var3++] = var4; @@ -54,7 +54,7 @@ public class VorbisCodebook { } } - this.method291(); + this.method286(); var3 = var1.method325(4); if (var3 > 0) { float var16 = VorbisSample.float32Unpack(var1.method325(32)); @@ -63,19 +63,19 @@ public class VorbisCodebook { boolean var7 = var1.method326() != 0; int var8; if (var3 == 1) { - var8 = mapType1QuantValues(this.entries, this.field255); + var8 = mapType1QuantValues(this.entries, this.field257); } else { - var8 = this.entries * this.field255; + var8 = this.entries * this.field257; } - this.field258 = new int[var8]; + this.field260 = new int[var8]; int var9; for (var9 = 0; var9 < var8; ++var9) { - this.field258[var9] = var1.method325(var6); + this.field260[var9] = var1.method325(var6); } - this.field254 = new float[this.entries][this.field255]; + this.field255 = new float[this.entries][this.field257]; float var10; int var11; int var12; @@ -84,10 +84,10 @@ public class VorbisCodebook { var10 = 0.0F; var11 = 1; - for (var12 = 0; var12 < this.field255; ++var12) { + for (var12 = 0; var12 < this.field257; ++var12) { int var13 = var9 / var11 % var8; - float var14 = (float)this.field258[var13] * var17 + var16 + var10; - this.field254[var9][var12] = var14; + float var14 = (float)this.field260[var13] * var17 + var16 + var10; + this.field255[var9][var12] = var14; if (var7) { var10 = var14; } @@ -98,11 +98,11 @@ public class VorbisCodebook { } else { for (var9 = 0; var9 < this.entries; ++var9) { var10 = 0.0F; - var11 = var9 * this.field255; + var11 = var9 * this.field257; - for (var12 = 0; var12 < this.field255; ++var12) { - float var18 = (float)this.field258[var11] * var17 + var16 + var10; - this.field254[var9][var12] = var18; + for (var12 = 0; var12 < this.field257; ++var12) { + float var18 = (float)this.field260[var11] * var17 + var16 + var10; + this.field255[var9][var12] = var18; if (var7) { var10 = var18; } @@ -115,8 +115,8 @@ public class VorbisCodebook { } - @ObfuscatedName("ay") - void method291() { + @ObfuscatedName("ae") + void method286() { int[] var1 = new int[this.entries]; int[] var2 = new int[33]; @@ -209,11 +209,11 @@ void method291() { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(Lce;)I" ) - int method292(class60 var1) { + int method287(class60 var1) { int var2; for (var2 = 0; this.keys[var2] >= 0; var2 = var1.method326() != 0 ? this.keys[var2] : var2 + 1) { } @@ -221,21 +221,21 @@ int method292(class60 var1) { return ~this.keys[var2]; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Lce;)[F" ) - float[] method293(class60 var1) { - return this.field254[this.method292(var1)]; + float[] method288(class60 var1) { + return this.field255[this.method287(var1)]; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; CollisionMap.method1091(var2, var1) > var0; --var2) { + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; NPC.method578(var2, var1) > var0; --var2) { } return var2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/VorbisFloor.java b/osrs/src/main/java/VorbisFloor.java index df28a0732..f004abbe6 100644 --- a/osrs/src/main/java/VorbisFloor.java +++ b/osrs/src/main/java/VorbisFloor.java @@ -3,32 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("bo") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("aw") - static final int[] field173; - @ObfuscatedName("ay") + @ObfuscatedName("au") + static final int[] field172; + @ObfuscatedName("ae") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("ar") - int[] field177; - @ObfuscatedName("am") + @ObfuscatedName("ao") + int[] field176; + @ObfuscatedName("at") @Export("multiplier") int multiplier; - @ObfuscatedName("as") - int[] field178; - @ObfuscatedName("aj") - int[] field176; - @ObfuscatedName("ag") + @ObfuscatedName("ac") + int[] field174; + @ObfuscatedName("ai") int[] field175; @ObfuscatedName("az") - int[] field179; - @ObfuscatedName("av") - int[][] field180; + int[] field178; + @ObfuscatedName("ap") + int[] field177; + @ObfuscatedName("aa") + int[][] field179; static { - field173 = new int[]{256, 128, 86, 64}; + field172 = new int[]{256, 128, 86, 64}; VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; } @@ -40,34 +40,34 @@ public class VorbisFloor { } else { int var3 = var1.method325(5); int var4 = 0; - this.field178 = new int[var3]; + this.field174 = new int[var3]; int var5; int var6; for (var5 = 0; var5 < var3; ++var5) { var6 = var1.method325(4); - this.field178[var5] = var6; + this.field174[var5] = var6; if (var6 >= var4) { var4 = var6 + 1; } } - this.field176 = new int[var4]; this.field175 = new int[var4]; - this.field179 = new int[var4]; - this.field180 = new int[var4][]; + this.field178 = new int[var4]; + this.field177 = new int[var4]; + this.field179 = new int[var4][]; int var8; for (var5 = 0; var5 < var4; ++var5) { - this.field176[var5] = var1.method325(3) + 1; - var6 = this.field175[var5] = var1.method325(2); + this.field175[var5] = var1.method325(3) + 1; + var6 = this.field178[var5] = var1.method325(2); if (var6 != 0) { - this.field179[var5] = var1.method325(8); + this.field177[var5] = var1.method325(8); } var6 = 1 << var6; int[] var10 = new int[var6]; - this.field180[var5] = var10; + this.field179[var5] = var10; for (var8 = 0; var8 < var6; ++var8) { var10[var8] = var1.method325(8) - 1; @@ -80,27 +80,27 @@ public class VorbisFloor { int var7; for (var7 = 0; var7 < var3; ++var7) { - var6 += this.field176[this.field178[var7]]; + var6 += this.field175[this.field174[var7]]; } - this.field177 = new int[var6]; - this.field177[0] = 0; - this.field177[1] = 1 << var5; + this.field176 = new int[var6]; + this.field176[0] = 0; + this.field176[1] = 1 << var5; var6 = 2; for (var7 = 0; var7 < var3; ++var7) { - var8 = this.field178[var7]; + var8 = this.field174[var7]; - for (int var9 = 0; var9 < this.field176[var8]; ++var9) { - this.field177[var6++] = var1.method325(var5); + for (int var9 = 0; var9 < this.field175[var8]; ++var9) { + this.field176[var6++] = var1.method325(var5); } } } } - @ObfuscatedName("aw") - int method194(int[] var1, int var2) { + @ObfuscatedName("au") + int method192(int[] var1, int var2) { int var3 = var1[var2]; int var4 = -1; int var5 = Integer.MIN_VALUE; @@ -116,8 +116,8 @@ int method194(int[] var1, int var2) { return var4; } - @ObfuscatedName("ay") - int method195(int[] var1, int var2) { + @ObfuscatedName("ae") + int method193(int[] var1, int var2) { int var3 = var1[var2]; int var4 = -1; int var5 = Integer.MAX_VALUE; @@ -133,8 +133,8 @@ int method195(int[] var1, int var2) { return var4; } - @ObfuscatedName("ar") - int method196(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ao") + int method194(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; int var7 = var3 - var1; int var8 = var6 < 0 ? -var6 : var6; @@ -143,8 +143,8 @@ int method196(int var1, int var2, int var3, int var4, int var5) { return var6 < 0 ? var2 - var10 : var10 + var2; } - @ObfuscatedName("am") - void method197(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("at") + void method195(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; int var8 = var3 - var1; int var9 = var7 < 0 ? -var7 : var7; @@ -172,52 +172,52 @@ void method197(int var1, int var2, int var3, int var4, float[] var5, int var6) { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lce;)Lcw;" + descriptor = "(Lce;)Lcd;" ) - class59 method198(class60 var1) { + class59 method196(class60 var1) { boolean var2 = var1.method326() != 0; if (!var2) { return new class59(this, false, (int[])null, (int[])null, (boolean[])null); } else { class59 var3 = new class59(this, true, (int[])null, (int[])null, (boolean[])null); - int var4 = this.field177.length; - if (var3.field311 == null || var3.field311.length < var4) { - var3.field311 = new int[var4]; - var3.field310 = new int[var4]; - var3.field308 = new boolean[var4]; + int var4 = this.field176.length; + if (var3.field314 == null || var3.field314.length < var4) { + var3.field314 = new int[var4]; + var3.field315 = new int[var4]; + var3.field313 = new boolean[var4]; } int var5; for (var5 = 0; var5 < var4; ++var5) { - var3.field311[var5] = this.field177[var5]; + var3.field314[var5] = this.field176[var5]; } - var5 = field173[this.multiplier - 1]; - int var6 = WorldMapRegion.iLog(var5 - 1); - var3.field310[0] = var1.method325(var6); - var3.field310[1] = var1.method325(var6); + var5 = field172[this.multiplier - 1]; + int var6 = class16.iLog(var5 - 1); + var3.field315[0] = var1.method325(var6); + var3.field315[1] = var1.method325(var6); int var7 = 2; - for (int var8 = 0; var8 < this.field178.length; ++var8) { - int var9 = this.field178[var8]; - int var10 = this.field176[var9]; - int var11 = this.field175[var9]; + for (int var8 = 0; var8 < this.field174.length; ++var8) { + int var9 = this.field174[var8]; + int var10 = this.field175[var9]; + int var11 = this.field178[var9]; int var12 = (1 << var11) - 1; int var13 = 0; if (var11 > 0) { - var13 = VorbisSample.field268[this.field179[var9]].method292(var1); + var13 = VorbisSample.field268[this.field177[var9]].method287(var1); } for (int var14 = 0; var14 < var10; ++var14) { - int var15 = this.field180[var9][var13 & var12]; + int var15 = this.field179[var9][var13 & var12]; var13 >>>= var11; - var3.field310[var7++] = var15 >= 0 ? VorbisSample.field268[var15].method292(var1) : 0; + var3.field315[var7++] = var15 >= 0 ? VorbisSample.field268[var15].method287(var1) : 0; } } return var3; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/VorbisMapping.java b/osrs/src/main/java/VorbisMapping.java index 8a1e60d5b..7b9fcf64b 100644 --- a/osrs/src/main/java/VorbisMapping.java +++ b/osrs/src/main/java/VorbisMapping.java @@ -1,39 +1,39 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bg") +@ObfuscatedName("bc") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("aw") - int field250; - @ObfuscatedName("ay") + @ObfuscatedName("au") + int field252; + @ObfuscatedName("ae") int field251; - @ObfuscatedName("ar") + @ObfuscatedName("ao") int[] field253; - @ObfuscatedName("am") - int[] field252; + @ObfuscatedName("at") + int[] field254; VorbisMapping() { class60 var1 = VorbisSample.field267; var1.method325(16); - this.field250 = var1.method326() != 0 ? var1.method325(4) + 1 : 1; + this.field252 = var1.method326() != 0 ? var1.method325(4) + 1 : 1; if (var1.method326() != 0) { var1.method325(8); } var1.method325(2); - if (this.field250 > 1) { + if (this.field252 > 1) { this.field251 = var1.method325(4); } - this.field253 = new int[this.field250]; - this.field252 = new int[this.field250]; + this.field253 = new int[this.field252]; + this.field254 = new int[this.field252]; - for (int var2 = 0; var2 < this.field250; ++var2) { + for (int var2 = 0; var2 < this.field252; ++var2) { var1.method325(8); this.field253[var2] = var1.method325(8); - this.field252[var2] = var1.method325(8); + this.field254[var2] = var1.method325(8); } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/VorbisSample.java b/osrs/src/main/java/VorbisSample.java index 2ba6f4267..52703f2e2 100644 --- a/osrs/src/main/java/VorbisSample.java +++ b/osrs/src/main/java/VorbisSample.java @@ -3,93 +3,93 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cz") +@ObfuscatedName("cm") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "Lce;" ) static class60 field267; - @ObfuscatedName("az") + @ObfuscatedName("ap") static int field276; - @ObfuscatedName("av") + @ObfuscatedName("aa") static int field275; - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "[Lct;" + descriptor = "[Lcw;" ) static VorbisCodebook[] field268; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "[Lbu;" + descriptor = "[Lbo;" ) - static VorbisFloor[] field266; - @ObfuscatedName("at") + static VorbisFloor[] field263; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "[Lbm;" + descriptor = "[Lbz;" ) - static class46[] field263; - @ObfuscatedName("ah") + static class46[] field266; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lbg;" + descriptor = "[Lbc;" ) static VorbisMapping[] field262; - @ObfuscatedName("ax") + @ObfuscatedName("an") static boolean[] field265; - @ObfuscatedName("aa") + @ObfuscatedName("ar") static int[] field277; - @ObfuscatedName("au") + @ObfuscatedName("ab") static boolean field264; - @ObfuscatedName("ak") - static float[] field271; - @ObfuscatedName("an") + @ObfuscatedName("ay") static float[] field273; - @ObfuscatedName("af") + @ObfuscatedName("aj") static float[] field269; - @ObfuscatedName("ai") - static float[] field270; - @ObfuscatedName("al") + @ObfuscatedName("av") + static float[] field271; + @ObfuscatedName("aw") static float[] field272; - @ObfuscatedName("bd") + @ObfuscatedName("ak") + static float[] field270; + @ObfuscatedName("bh") static float[] field274; - @ObfuscatedName("bb") + @ObfuscatedName("bj") static int[] field278; - @ObfuscatedName("bn") + @ObfuscatedName("bk") static int[] field279; - @ObfuscatedName("aw") + @ObfuscatedName("au") byte[][] field283; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("sampleRate") int sampleRate; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("sampleCount") int sampleCount; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("start") int start; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("end") int end; - @ObfuscatedName("aj") - boolean field280; - @ObfuscatedName("ae") - float[] field285; - @ObfuscatedName("ab") - int field286; - @ObfuscatedName("ad") - int field287; - @ObfuscatedName("ao") + @ObfuscatedName("ai") boolean field281; - @ObfuscatedName("ac") + @ObfuscatedName("ag") float[] field284; - @ObfuscatedName("ba") + @ObfuscatedName("am") + int field288; + @ObfuscatedName("ax") + int field291; + @ObfuscatedName("ah") + boolean field280; + @ObfuscatedName("as") + float[] field285; + @ObfuscatedName("bv") @Export("samples") byte[] samples; - @ObfuscatedName("bf") - int field292; - @ObfuscatedName("bs") + @ObfuscatedName("bt") int field293; + @ObfuscatedName("bd") + int field292; static { field267 = new class60(); @@ -100,7 +100,7 @@ public class VorbisSample extends Node { this.read(var1); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); @@ -110,7 +110,7 @@ void read(byte[] var1) { this.end = var2.readInt(); if (this.end < 0) { this.end = ~this.end; - this.field280 = true; + this.field281 = true; } int var3 = var2.readInt(); @@ -132,13 +132,13 @@ void read(byte[] var1) { } - @ObfuscatedName("am") + @ObfuscatedName("at") float[] method302(int var1) { class60 var2 = new class60(); var2.method327(this.field283[var1], 0); - this.field284 = new float[field275]; + this.field285 = new float[field275]; var2.method326(); - int var3 = var2.method325(WorldMapRegion.iLog(field277.length - 1)); + int var3 = var2.method325(class16.iLog(field277.length - 1)); boolean var4 = field265[var3]; int var5 = var4 ? field275 : field276; boolean var6 = false; @@ -178,33 +178,33 @@ float[] method302(int var1) { VorbisMapping var15 = field262[field277[var3]]; int var16 = var15.field251; int var17 = var15.field253[var16]; - class59 var18 = field266[var17].method198(var2); - boolean var19 = !var18.method319(); + class59 var18 = field263[var17].method196(var2); + boolean var19 = !var18.method322(); int var20; - for (var20 = 0; var20 < var15.field250; ++var20) { - class46 var21 = field263[var15.field252[var20]]; - float[] var22 = this.field284; - var21.method232(var22, var5 >> 1, var19, var2); + for (var20 = 0; var20 < var15.field252; ++var20) { + class46 var21 = field266[var15.field254[var20]]; + float[] var22 = this.field285; + var21.method229(var22, var5 >> 1, var19, var2); } - if (var18.method319()) { + if (var18.method322()) { var16 = var15.field251; int var10000 = var15.field253[var16]; - var18.method318(this.field284, var5 >> 1); + var18.method321(this.field285, var5 >> 1); } int var43; int var44; - if (!var18.method319()) { + if (!var18.method322()) { for (var20 = var5 >> 1; var20 < var5; ++var20) { - this.field284[var20] = 0.0F; + this.field285[var20] = 0.0F; } } else { var20 = var5 >> 1; var43 = var5 >> 2; var44 = var5 >> 3; - float[] var23 = this.field284; + float[] var23 = this.field285; int var24; for (var24 = 0; var24 < var20; ++var24) { @@ -215,9 +215,9 @@ float[] method302(int var1) { var23[var24] = -var23[var5 - var24 - 1]; } - float[] var45 = var4 ? field270 : field271; - float[] var25 = var4 ? field272 : field273; - float[] var26 = var4 ? field274 : field269; + float[] var45 = var4 ? field272 : field273; + float[] var25 = var4 ? field270 : field269; + float[] var26 = var4 ? field274 : field271; int[] var27 = var4 ? field279 : field278; int var28; @@ -249,7 +249,7 @@ float[] method302(int var1) { var23[var28 * 4 + 1] = (var30 - var32) * var33 + (var29 - var31) * var34; } - var28 = WorldMapRegion.iLog(var5 - 1); + var28 = class16.iLog(var5 - 1); int var49; int var50; @@ -349,49 +349,49 @@ float[] method302(int var1) { float[] var57; for (var49 = var9; var49 < var10; ++var49) { var30 = (float)Math.sin(((double)(var49 - var9) + 0.5D) / (double)var11 * 0.5D * 3.141592653589793D); - var57 = this.field284; + var57 = this.field285; var57[var49] *= (float)Math.sin(1.5707963267948966D * (double)var30 * (double)var30); } for (var49 = var12; var49 < var13; ++var49) { var30 = (float)Math.sin(((double)(var49 - var12) + 0.5D) / (double)var14 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var57 = this.field284; + var57 = this.field285; var57[var49] *= (float)Math.sin(1.5707963267948966D * (double)var30 * (double)var30); } } float[] var46 = null; - if (this.field286 > 0) { - var43 = var5 + this.field286 >> 2; + if (this.field288 > 0) { + var43 = var5 + this.field288 >> 2; var46 = new float[var43]; int var47; - if (!this.field281) { - for (var44 = 0; var44 < this.field287; ++var44) { - var47 = var44 + (this.field286 >> 1); - var46[var44] += this.field285[var47]; + if (!this.field280) { + for (var44 = 0; var44 < this.field291; ++var44) { + var47 = var44 + (this.field288 >> 1); + var46[var44] += this.field284[var47]; } } - if (var18.method319()) { + if (var18.method322()) { for (var44 = var9; var44 < var5 >> 1; ++var44) { var47 = var46.length - (var5 >> 1) + var44; - var46[var47] += this.field284[var44]; + var46[var47] += this.field285[var44]; } } } - float[] var48 = this.field285; - this.field285 = this.field284; - this.field284 = var48; - this.field286 = var5; - this.field287 = var13 - (var5 >> 1); - this.field281 = !var18.method319(); + float[] var48 = this.field284; + this.field284 = this.field285; + this.field285 = var48; + this.field288 = var5; + this.field291 = var13 - (var5 >> 1); + this.field280 = !var18.method322(); return var46; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "([I)Lbi;" + descriptor = "([I)Lbu;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -399,21 +399,21 @@ RawSound toRawSound(int[] var1) { return null; } else { if (this.samples == null) { - this.field286 = 0; - this.field285 = new float[field275]; + this.field288 = 0; + this.field284 = new float[field275]; this.samples = new byte[this.sampleCount]; - this.field292 = 0; this.field293 = 0; + this.field292 = 0; } - for (; this.field293 < this.field283.length; ++this.field293) { + for (; this.field292 < this.field283.length; ++this.field292) { if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method302(this.field293); + float[] var2 = this.method302(this.field292); if (var2 != null) { - int var3 = this.field292; + int var3 = this.field293; int var4 = var2.length; if (var4 > this.sampleCount - var3) { var4 = this.sampleCount - var3; @@ -429,21 +429,21 @@ RawSound toRawSound(int[] var1) { } if (var1 != null) { - var1[0] -= var3 - this.field292; + var1[0] -= var3 - this.field293; } - this.field292 = var3; + this.field293 = var3; } } - this.field285 = null; + this.field284 = null; byte[] var7 = this.samples; this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field280); + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field281); } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; @@ -456,7 +456,7 @@ static float float32Unpack(int var0) { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") static void method301(byte[] var0) { class60 var1 = field267; var1.method327(var0, 0); @@ -473,44 +473,53 @@ static void method301(byte[] var0) { var4 = var3 >> 1; var5 = var3 >> 2; var6 = var3 >> 3; - float[] var13 = new float[var4]; + float[] var19 = new float[var4]; for (int var8 = 0; var8 < var5; ++var8) { - var13[var8 * 2] = (float)Math.cos((double)(var8 * 4) * 3.141592653589793D / (double)var3); - var13[var8 * 2 + 1] = -((float)Math.sin((double)(var8 * 4) * 3.141592653589793D / (double)var3)); + var19[var8 * 2] = (float)Math.cos((double)(var8 * 4) * 3.141592653589793D / (double)var3); + var19[var8 * 2 + 1] = -((float)Math.sin((double)(var8 * 4) * 3.141592653589793D / (double)var3)); } - float[] var14 = new float[var4]; + float[] var20 = new float[var4]; for (int var9 = 0; var9 < var5; ++var9) { - var14[var9 * 2] = (float)Math.cos((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); - var14[var9 * 2 + 1] = (float)Math.sin((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); + var20[var9 * 2] = (float)Math.cos((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); + var20[var9 * 2 + 1] = (float)Math.sin((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); } - float[] var15 = new float[var5]; + float[] var21 = new float[var5]; for (int var10 = 0; var10 < var6; ++var10) { - var15[var10 * 2] = (float)Math.cos((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3); - var15[var10 * 2 + 1] = -((float)Math.sin((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3)); + var21[var10 * 2] = (float)Math.cos((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3); + var21[var10 * 2 + 1] = -((float)Math.sin((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3)); } - int[] var16 = new int[var6]; - int var11 = WorldMapRegion.iLog(var6 - 1); + int[] var22 = new int[var6]; + int var11 = class16.iLog(var6 - 1); for (int var12 = 0; var12 < var6; ++var12) { - var16[var12] = WorldMapEvent.method1546(var12, var11); + int var16 = var12; + int var17 = var11; + + int var18; + for (var18 = 0; var17 > 0; --var17) { + var18 = var18 << 1 | var16 & 1; + var16 >>>= 1; + } + + var22[var12] = var18; } if (var2 != 0) { - field270 = var13; - field272 = var14; - field274 = var15; - field279 = var16; + field272 = var19; + field270 = var20; + field274 = var21; + field279 = var22; } else { - field271 = var13; - field273 = var14; - field269 = var15; - field278 = var16; + field273 = var19; + field269 = var20; + field271 = var21; + field278 = var22; } } @@ -528,17 +537,17 @@ static void method301(byte[] var0) { } var3 = var1.method325(6) + 1; - field266 = new VorbisFloor[var3]; + field263 = new VorbisFloor[var3]; for (var4 = 0; var4 < var3; ++var4) { - field266[var4] = new VorbisFloor(); + field263[var4] = new VorbisFloor(); } var4 = var1.method325(6) + 1; - field263 = new class46[var4]; + field266 = new class46[var4]; for (var5 = 0; var5 < var4; ++var5) { - field263[var5] = new class46(); + field266[var5] = new class46(); } var5 = var1.method325(6) + 1; @@ -561,9 +570,9 @@ static void method301(byte[] var0) { } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lnd;)Z" + descriptor = "(Lnu;)Z" ) static boolean method303(AbstractArchive var0) { if (!field264) { @@ -579,9 +588,9 @@ static boolean method303(AbstractArchive var0) { return true; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lnd;II)Lcz;" + descriptor = "(Lnu;II)Lcm;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { @@ -593,4 +602,4 @@ static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { return var3 == null ? null : new VorbisSample(var3); } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WallDecoration.java b/osrs/src/main/java/WallDecoration.java index 9c9009454..f43916f5f 100644 --- a/osrs/src/main/java/WallDecoration.java +++ b/osrs/src/main/java/WallDecoration.java @@ -3,52 +3,52 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("jw") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("bf") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "[Ltd;" ) - @Export("Widget_fontsArchive") - public static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("aw") + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("au") @Export("z") int z; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("x") int x; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("y") int y; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("orientation") int orientation; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("orientation2") int orientation2; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("xOffset") int xOffset; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("yOffset") int yOffset; - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lik;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lik;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("tag") public long tag; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("flags") int flags; @@ -56,33 +56,4 @@ public final class WallDecoration { this.tag = 0L; this.flags = 0; } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "63" - ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); - VarbitComposition var1; - if (var2 != null) { - var1 = var2; - } else { - byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); - var2 = new VarbitComposition(); - if (var3 != null) { - var2.decode(new Buffer(var3)); - } - - VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); - var1 = var2; - } - - int var7 = var1.baseVar; - int var4 = var1.startBit; - int var5 = var1.endBit; - int var6 = Varps.Varps_masks[var5 - var4]; - return Varps.Varps_main[var7] >> var4 & var6; - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Widget.java b/osrs/src/main/java/Widget.java index 1aa361aa6..8a05663de 100644 --- a/osrs/src/main/java/Widget.java +++ b/osrs/src/main/java/Widget.java @@ -1,115 +1,113 @@ -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mt") +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; + +@ObfuscatedName("mi") @Implements("Widget") public class Widget extends Node { @ObfuscatedName("bd") - @Export("Widget_loadedInterfaces") - public static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("Widget_cachedSprites") static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("bp") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("Widget_cachedFonts") static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lle;" ) @Export("Widget_cachedSpriteMasks") static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lqv;" ) - static class424 field2932; - @ObfuscatedName("br") + static class423 field2950; + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lqv;" ) - static class424 field2933; - @ObfuscatedName("bw") - public static boolean field2926; - @ObfuscatedName("be") + static class423 field2951; + @ObfuscatedName("ba") + public static boolean field2945; + @ObfuscatedName("bl") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("bc") + @ObfuscatedName("bp") @Export("id") public int id; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @Export("childIndex") public int childIndex; - @ObfuscatedName("bu") + @ObfuscatedName("bo") @Export("type") public int type; - @ObfuscatedName("bk") + @ObfuscatedName("bb") @Export("buttonType") public int buttonType; - @ObfuscatedName("bz") + @ObfuscatedName("br") @Export("contentType") public int contentType; - @ObfuscatedName("bx") + @ObfuscatedName("be") @Export("xAlignment") public int xAlignment; - @ObfuscatedName("bh") + @ObfuscatedName("bi") @Export("yAlignment") public int yAlignment; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("bl") + @ObfuscatedName("bx") @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("bt") + @ObfuscatedName("bn") @Export("rawX") public int rawX; - @ObfuscatedName("by") + @ObfuscatedName("bw") @Export("rawY") public int rawY; - @ObfuscatedName("bg") + @ObfuscatedName("bc") @Export("rawWidth") public int rawWidth; - @ObfuscatedName("bj") + @ObfuscatedName("bg") @Export("rawHeight") public int rawHeight; - @ObfuscatedName("ct") + @ObfuscatedName("cw") @Export("x") public int x; @ObfuscatedName("cf") @Export("y") public int y; - @ObfuscatedName("cz") + @ObfuscatedName("cm") @Export("width") public int width; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @Export("height") public int height; @ObfuscatedName("cs") - public int field2990; - @ObfuscatedName("cj") - public int field2981; - @ObfuscatedName("cn") + public int field3006; + @ObfuscatedName("cx") + public int field3011; + @ObfuscatedName("cr") @Export("parentId") public int parentId; - @ObfuscatedName("cw") + @ObfuscatedName("cd") @Export("isHidden") public boolean isHidden; @ObfuscatedName("ce") @@ -118,373 +116,374 @@ public class Widget extends Node { @ObfuscatedName("cq") @Export("scrollY") public int scrollY; - @ObfuscatedName("cm") + @ObfuscatedName("cp") @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("ca") + @ObfuscatedName("cv") @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("cx") + @ObfuscatedName("co") @Export("color") public int color; - @ObfuscatedName("co") + @ObfuscatedName("cl") @Export("color2") public int color2; @ObfuscatedName("cu") @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("cr") + @ObfuscatedName("ch") @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("cd") + @ObfuscatedName("ci") @Export("fill") public boolean fill; - @ObfuscatedName("cy") + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "Luc;" + descriptor = "Lum;" ) + @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("ck") + @ObfuscatedName("cb") @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("cl") + @ObfuscatedName("cg") @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("cp") + @ObfuscatedName("cj") @Export("lineWid") public int lineWid; - @ObfuscatedName("ch") - public boolean field2943; - @ObfuscatedName("cg") + @ObfuscatedName("cz") + public boolean field2962; + @ObfuscatedName("ct") @Export("spriteId2") public int spriteId2; - @ObfuscatedName("ci") + @ObfuscatedName("cy") @Export("spriteId") public int spriteId; - @ObfuscatedName("cv") - public String field3073; + @ObfuscatedName("ck") + public String field3091; @ObfuscatedName("cc") @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("dc") + @ObfuscatedName("dh") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("dq") + @ObfuscatedName("dj") @Export("outline") public int outline; - @ObfuscatedName("dg") + @ObfuscatedName("di") @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("dj") + @ObfuscatedName("du") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("dy") + @ObfuscatedName("dn") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("dr") + @ObfuscatedName("dg") @Export("modelType") public int modelType; - @ObfuscatedName("do") + @ObfuscatedName("dd") @Export("modelId") public int modelId; - @ObfuscatedName("dk") + @ObfuscatedName("da") @Export("modelType2") int modelType2; - @ObfuscatedName("dn") + @ObfuscatedName("ds") @Export("modelId2") int modelId2; - @ObfuscatedName("di") + @ObfuscatedName("dy") @Export("sequenceId") public int sequenceId; - @ObfuscatedName("de") + @ObfuscatedName("dt") @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("dd") + @ObfuscatedName("dl") @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("dt") + @ObfuscatedName("dk") @Export("modelOffsetY") public int modelOffsetY; @ObfuscatedName("df") @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("dm") + @ObfuscatedName("dz") @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("du") + @ObfuscatedName("dw") @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("dz") + @ObfuscatedName("dv") @Export("modelZoom") public int modelZoom; - @ObfuscatedName("dx") + @ObfuscatedName("dr") @Export("modelRotation") public int modelRotation; - @ObfuscatedName("dp") + @ObfuscatedName("do") @Export("rotationKey") public int rotationKey; - @ObfuscatedName("ds") + @ObfuscatedName("db") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmt;" ) - public PlayerComposition field3081; - @ObfuscatedName("da") + public PlayerComposition field3101; + @ObfuscatedName("dp") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("dv") + @ObfuscatedName("dm") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("dh") + @ObfuscatedName("dx") @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("dl") + @ObfuscatedName("dq") @Export("fontId") public int fontId; - @ObfuscatedName("db") + @ObfuscatedName("de") @Export("text") public String text; - @ObfuscatedName("dw") + @ObfuscatedName("dc") @Export("text2") public String text2; - @ObfuscatedName("et") + @ObfuscatedName("ed") @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("em") + @ObfuscatedName("eh") @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("ec") + @ObfuscatedName("ey") @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("el") + @ObfuscatedName("ee") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("er") + @ObfuscatedName("eq") @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lgf;" ) - class170 field2934; - @ObfuscatedName("ew") - int field2937; - @ObfuscatedName("eo") - HashMap field2939; - @ObfuscatedName("eb") - HashMap field2938; - @ObfuscatedName("eh") + class170 field2952; + @ObfuscatedName("ej") + int field2955; + @ObfuscatedName("ea") + HashMap field2956; + @ObfuscatedName("er") + HashMap field2957; + @ObfuscatedName("ez") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmp;" ) - class328 field2940; - @ObfuscatedName("ei") + class327 field2958; + @ObfuscatedName("et") @Export("flags") public int flags; @ObfuscatedName("en") - public boolean field2951; + public boolean field2969; + @ObfuscatedName("eb") + public byte[][] field2977; + @ObfuscatedName("ei") + public byte[][] field2978; @ObfuscatedName("es") - public byte[][] field2960; - @ObfuscatedName("eq") - public byte[][] field2959; - @ObfuscatedName("ee") - public int[] field3028; - @ObfuscatedName("eg") - public int[] field3029; - @ObfuscatedName("ef") + public int[] field3047; + @ObfuscatedName("el") + public int[] field3046; + @ObfuscatedName("eu") @Export("dataText") public String dataText; - @ObfuscatedName("ev") + @ObfuscatedName("eg") @Export("actions") public String[] actions; - @ObfuscatedName("ez") + @ObfuscatedName("ex") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmi;" ) @Export("parent") public Widget parent; - @ObfuscatedName("ek") + @ObfuscatedName("eo") @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("eu") + @ObfuscatedName("ew") @Export("dragThreshold") public int dragThreshold; @ObfuscatedName("ep") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("fm") + @ObfuscatedName("fh") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("fa") + @ObfuscatedName("ft") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("fg") + @ObfuscatedName("fs") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("fq") + @ObfuscatedName("fl") @Export("onClick") public Object[] onClick; - @ObfuscatedName("fy") + @ObfuscatedName("fe") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("fw") + @ObfuscatedName("fd") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("fp") + @ObfuscatedName("fj") @Export("onHold") public Object[] onHold; - @ObfuscatedName("fz") + @ObfuscatedName("fv") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("fj") + @ObfuscatedName("fb") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("fb") + @ObfuscatedName("fr") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("fl") + @ObfuscatedName("fq") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("fd") + @ObfuscatedName("fp") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("fh") + @ObfuscatedName("fg") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("fc") + @ObfuscatedName("fo") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("fu") + @ObfuscatedName("fz") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("fv") + @ObfuscatedName("fu") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("fr") + @ObfuscatedName("fn") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("fs") + @ObfuscatedName("fx") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("fn") + @ObfuscatedName("ff") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("ff") + @ObfuscatedName("fc") @Export("statTransmitTriggers") public int[] statTransmitTriggers; @ObfuscatedName("fk") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("ft") + @ObfuscatedName("fm") @Export("onOp") public Object[] onOp; - @ObfuscatedName("fe") - public Object[] field3042; - @ObfuscatedName("fo") + @ObfuscatedName("fy") + public Object[] field3076; + @ObfuscatedName("fw") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("fx") + @ObfuscatedName("fi") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("fi") + @ObfuscatedName("fa") @Export("onKey") public Object[] onKey; + @ObfuscatedName("gu") + public Object[] field3089; @ObfuscatedName("gc") - public Object[] field3061; - @ObfuscatedName("gp") - public Object[] field3068; - @ObfuscatedName("ga") + public Object[] field3079; + @ObfuscatedName("gd") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("gg") + @ObfuscatedName("gm") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("gs") - public Object[] field3070; - @ObfuscatedName("ge") - public Object[] field3062; - @ObfuscatedName("go") + @ObfuscatedName("gg") + public Object[] field3082; + @ObfuscatedName("gw") + public Object[] field3090; + @ObfuscatedName("gi") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("gh") + @ObfuscatedName("go") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("gj") + @ObfuscatedName("gl") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("gm") + @ObfuscatedName("gb") @Export("onResize") public Object[] onResize; - @ObfuscatedName("gx") + @ObfuscatedName("gj") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("gr") - public Object[] field3069; - @ObfuscatedName("gy") - public Object[] field3072; - @ObfuscatedName("gt") + @ObfuscatedName("ge") + public Object[] field3081; + @ObfuscatedName("gs") + public Object[] field3088; + @ObfuscatedName("gv") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("gq") + @ObfuscatedName("gf") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("gv") + @ObfuscatedName("gh") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("gl") + @ObfuscatedName("gy") @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("gd") - public String field3078; - @ObfuscatedName("gf") + @ObfuscatedName("gp") + public String field3097; + @ObfuscatedName("gk") @Export("buttonText") public String buttonText; - @ObfuscatedName("gk") + @ObfuscatedName("ga") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("gz") - public int[] field3036; - @ObfuscatedName("gi") + @ObfuscatedName("gx") + public int[] field3054; + @ObfuscatedName("gq") @Export("itemId") public int itemId; - @ObfuscatedName("gb") + @ObfuscatedName("gt") @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("gn") + @ObfuscatedName("gr") @Export("modelFrame") public int modelFrame; - @ObfuscatedName("gu") + @ObfuscatedName("gz") @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("gw") + @ObfuscatedName("gn") @ObfuscatedSignature( - descriptor = "[Lmt;" + descriptor = "[Lmi;" ) @Export("children") public Widget[] children; - @ObfuscatedName("hf") - public boolean field2954; - @ObfuscatedName("hv") - public boolean field2957; - @ObfuscatedName("hp") - public int field3026; - @ObfuscatedName("hh") - public int field3024; - @ObfuscatedName("hg") - public int field3023; + @ObfuscatedName("ht") + public boolean field2975; @ObfuscatedName("ho") - public int field3025; - @ObfuscatedName("he") + public boolean field2974; + @ObfuscatedName("hj") + public int field3043; + @ObfuscatedName("hh") + public int field3041; + @ObfuscatedName("hi") + public int field3042; + @ObfuscatedName("hd") + public int field3040; + @ObfuscatedName("hk") @Export("rootIndex") public int rootIndex; - @ObfuscatedName("hx") + @ObfuscatedName("hz") @Export("cycle") public int cycle; - @ObfuscatedName("ha") - public int[] field3037; - @ObfuscatedName("hr") + @ObfuscatedName("hl") + public int[] field3055; + @ObfuscatedName("hg") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("hm") + @ObfuscatedName("hu") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("hz") + @ObfuscatedName("he") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; @@ -493,9 +492,9 @@ public class Widget extends Node { Widget_cachedModels = new EvictingDualNodeHashTable(50); Widget_cachedFonts = new EvictingDualNodeHashTable(20); Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field2932 = new class424(10, class422.field3754); - field2933 = new class424(10, class422.field3754); - field2926 = false; + field2950 = new class423(10, class421.field3766); + field2951 = new class423(10, class421.field3766); + field2945 = false; } public Widget() { @@ -516,8 +515,8 @@ public Widget() { this.y = 0; this.width = 0; this.height = 0; - this.field2990 = 1; - this.field2981 = 1; + this.field3006 = 1; + this.field3011 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -533,7 +532,7 @@ public Widget() { this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; - this.field2943 = false; + this.field2962 = false; this.spriteId2 = -1; this.spriteId = -1; this.spriteAngle = 0; @@ -564,9 +563,9 @@ public Widget() { this.textXAlignment = 0; this.textYAlignment = 0; this.textShadowed = false; - this.field2937 = -1; + this.field2955 = -1; this.flags = 0; - this.field2951 = false; + this.field2969 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -575,18 +574,18 @@ public Widget() { this.spellActionName = ""; this.hasListener = false; this.mouseOverRedirect = -1; - this.field3078 = ""; + this.field3097 = ""; this.buttonText = "Ok"; this.itemId = -1; this.itemQuantity = 0; this.modelFrame = 0; this.modelFrameCycle = 0; - this.field2954 = false; - this.field2957 = false; - this.field3026 = -1; - this.field3024 = 0; - this.field3023 = 0; - this.field3025 = 0; + this.field2975 = false; + this.field2974 = false; + this.field3043 = -1; + this.field3041 = 0; + this.field3042 = 0; + this.field3040 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; @@ -594,10 +593,10 @@ public Widget() { this.prioritizeMenuEntry = false; } - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "765391590" + descriptor = "(Ltm;B)V", + garbageValue = "-122" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { @@ -732,7 +731,7 @@ void decodeLegacy(Buffer var1) { if (this.buttonType == 2) { this.spellActionName = var1.readStringCp1252NullTerminated(); - this.field3078 = var1.readStringCp1252NullTerminated(); + this.field3097 = var1.readStringCp1252NullTerminated(); var4 = var1.readUnsignedShort() & 63; this.flags |= var4 << 11; } @@ -768,10 +767,10 @@ void decodeLegacy(Buffer var1) { } - @ObfuscatedName("as") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "1963555900" + descriptor = "(Ltm;I)V", + garbageValue = "-1617832353" ) @Export("decode") void decode(Buffer var1) { @@ -869,7 +868,7 @@ void decode(Buffer var1) { if (this.type == 9) { this.lineWid = var1.readUnsignedByte(); this.color = var1.readInt(); - this.field2943 = var1.readUnsignedByte() == 1; + this.field2962 = var1.readUnsignedByte() == 1; } this.flags = var1.readMedium(); @@ -910,10 +909,10 @@ void decode(Buffer var1) { this.statTransmitTriggers = this.readListenerTriggers(var1); } - @ObfuscatedName("aj") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lty;B)[Ljava/lang/Object;", - garbageValue = "122" + descriptor = "(Ltm;I)[Ljava/lang/Object;", + garbageValue = "-631733803" ) @Export("readListener") Object[] readListener(Buffer var1) { @@ -937,10 +936,10 @@ Object[] readListener(Buffer var1) { } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lty;I)[I", - garbageValue = "-2000592706" + descriptor = "(Ltm;I)[I", + garbageValue = "132481992" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { @@ -958,16 +957,16 @@ int[] readListenerTriggers(Buffer var1) { } } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(ZLej;B)Lud;", - garbageValue = "-22" + descriptor = "(ZLev;I)Lui;", + garbageValue = "1752459087" ) @Export("getSprite") public SpritePixels getSprite(boolean var1, UrlRequester var2) { - field2926 = false; - if (this.field3073 != null) { - SpritePixels var3 = this.method1779(var2); + field2945 = false; + if (this.field3091 != null) { + SpritePixels var3 = this.method1818(var2); if (var3 != null) { return var3; } @@ -988,12 +987,12 @@ public SpritePixels getSprite(boolean var1, UrlRequester var2) { if (var6 != null) { return var6; } else { - var6 = WorldMap.SpriteBuffer_getSprite(UserComparator10.Widget_spritesArchive, var7, 0); + var6 = Tiles.SpriteBuffer_getSprite(Language.Widget_spritesArchive, var7, 0); if (var6 == null) { - field2926 = true; + field2945 = true; return null; } else { - this.method1782(var6); + this.method1821(var6); Widget_cachedSprites.put(var6, var4); return var6; } @@ -1001,23 +1000,23 @@ public SpritePixels getSprite(boolean var1, UrlRequester var2) { } } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lej;I)Lud;", - garbageValue = "871401764" + descriptor = "(Lev;B)Lui;", + garbageValue = "24" ) - SpritePixels method1779(UrlRequester var1) { - if (!this.method1781()) { - return this.method1780(var1); + SpritePixels method1818(UrlRequester var1) { + if (!this.method1820()) { + return this.method1819(var1); } else { - String var2 = this.field3073 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; - SpritePixels var3 = (SpritePixels)field2933.method2146(var2); + String var2 = this.field3091 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; + SpritePixels var3 = (SpritePixels)field2951.method2180(var2); if (var3 == null) { - SpritePixels var4 = this.method1780(var1); + SpritePixels var4 = this.method1819(var1); if (var4 != null) { - var3 = var4.method2638(); - this.method1782(var3); - field2933.method2147(var2, var3); + var3 = var4.method2657(); + this.method1821(var3); + field2951.method2181(var2, var3); } } @@ -1025,20 +1024,20 @@ SpritePixels method1779(UrlRequester var1) { } } - @ObfuscatedName("ap") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lej;I)Lud;", - garbageValue = "1775853493" + descriptor = "(Lev;I)Lui;", + garbageValue = "-853434695" ) - SpritePixels method1780(UrlRequester var1) { - if (this.field3073 != null && var1 != null) { - class327 var2 = (class327)field2932.method2146(this.field3073); + SpritePixels method1819(UrlRequester var1) { + if (this.field3091 != null && var1 != null) { + class326 var2 = (class326)field2950.method2180(this.field3091); if (var2 == null) { - var2 = new class327(this.field3073, var1); - field2932.method2147(this.field3073, var2); + var2 = new class326(this.field3091, var1); + field2950.method2181(this.field3091, var2); } - return var2.method1675(); + return var2.method1715(); } else { return null; } @@ -1046,19 +1045,19 @@ SpritePixels method1780(UrlRequester var1) { @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-771382672" + descriptor = "(B)Z", + garbageValue = "-32" ) - boolean method1781() { + boolean method1820() { return this.spriteFlipV || this.spriteFlipH || this.outline != 0 || this.spriteShadow != 0; } - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lud;B)V", - garbageValue = "1" + descriptor = "(Lui;B)V", + garbageValue = "-60" ) - void method1782(SpritePixels var1) { + void method1821(SpritePixels var1) { if (this.spriteFlipV) { var1.flipVertically(); } @@ -1085,14 +1084,14 @@ void method1782(SpritePixels var1) { } - @ObfuscatedName("ah") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I)Lpc;", - garbageValue = "-2062099082" + descriptor = "(I)Lpi;", + garbageValue = "1973823248" ) @Export("getFont") public Font getFont() { - field2926 = false; + field2945 = false; if (this.fontId == -1) { return null; } else { @@ -1100,11 +1099,11 @@ public Font getFont() { if (var1 != null) { return var1; } else { - var1 = ConcurrentMidiTask.method2106(UserComparator10.Widget_spritesArchive, WallDecoration.Widget_fontsArchive, this.fontId, 0); + var1 = LoginPacket.method1613(Language.Widget_spritesArchive, class155.Widget_fontsArchive, this.fontId, 0); if (var1 != null) { Widget_cachedFonts.put(var1, (long)this.fontId); } else { - field2926 = true; + field2945 = true; } return var1; @@ -1112,14 +1111,14 @@ public Font getFont() { } } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lig;IZLmb;Lhi;Lhs;I)Ljo;", - garbageValue = "-1139082268" + descriptor = "(Lib;IZLmt;Lhw;Lhq;B)Ljr;", + garbageValue = "-43" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4, NPCComposition var5, NewShit var6) { - field2926 = false; + field2945 = false; int var7; int var8; if (var3) { @@ -1143,13 +1142,13 @@ public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerCom } else if (var7 == 1 && var8 == -1) { return null; } else { - if (var6 != null && var6.field1565 && var7 == 6) { + if (var6 != null && var6.field1581 && var7 == 6) { var7 = 3; } long var9 = (long)(var8 + (var7 << 16)); if (var6 != null) { - var9 |= var6.field1566 << 20; + var9 |= var6.field1582 << 20; } Model var11 = (Model)Widget_cachedModels.get(var9); @@ -1159,28 +1158,28 @@ public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerCom int var14 = 768; switch(var7) { case 1: - var12 = ModelData.ModelData_get(BoundaryObject.field2256, var8, 0); + var12 = ModelData.ModelData_get(class47.field226, var8, 0); break; case 2: - var12 = Tile.getNpcDefinition(var8).method967((NewShit)null); + var12 = class90.getNpcDefinition(var8).method986((NewShit)null); break; case 3: var12 = var4 != null ? var4.getModelData() : null; break; case 4: - ItemComposition var15 = class125.ItemDefinition_get(var8); + ItemComposition var15 = InvDefinition.ItemDefinition_get(var8); var12 = var15.getModelData(10); - var13 += var15.field1783; - var14 += var15.field1784; + var13 += var15.field1812; + var14 += var15.field1809; case 5: default: break; case 6: - var12 = Tile.getNpcDefinition(var8).method967(var6); + var12 = class90.getNpcDefinition(var8).method986(var6); } if (var12 == null) { - field2926 = true; + field2945 = true; return null; } @@ -1196,10 +1195,10 @@ public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerCom } } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(ZB)Lmi;", - garbageValue = "-1" + descriptor = "(ZI)Lme;", + garbageValue = "1022020243" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { @@ -1207,11 +1206,11 @@ public SpriteMask getSpriteMask(boolean var1) { var1 = false; } - int var2 = var1 ? this.spriteId * -1115295013 * -1697203885 : this.spriteId2 * 2109090755 * 701078763; + int var2 = var1 ? this.spriteId * -329704335 * -243850095 : this.spriteId2 * 1694560891 * -1390207821; if (var2 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); + long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); if (var5 != null) { return var5; @@ -1255,10 +1254,10 @@ public SpriteMask getSpriteMask(boolean var1) { } } - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-1432445957" + garbageValue = "-1578890937" ) @Export("setAction") public void setAction(int var1, String var2) { @@ -1276,177 +1275,177 @@ public void setAction(int var1, String var2) { this.actions[var1] = var2; } - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-727475162" + descriptor = "(B)Z", + garbageValue = "10" ) - public boolean method1787() { + public boolean method1826() { return !this.isIf3 || this.type == 0 || this.type == 11 || this.hasListener || this.contentType == 1338 || this.type == 12; } - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1196611780" + descriptor = "(S)Z", + garbageValue = "13293" ) - public boolean method1788() { + public boolean method1827() { return this.type == 11 || this.type == 12; } - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lej;J)V" + descriptor = "(Ljava/lang/String;Lev;J)V" ) - public void method1789(String var1, UrlRequester var2, long var3) { + public void method1828(String var1, UrlRequester var2, long var3) { if (this.type == 11 && var3 != -1L) { var1 = var1.replaceAll("%userid%", Long.toString(var3)); - this.field2934 = new class170(); - if (!this.field2934.method875(var1, var2)) { - this.field2934 = null; + this.field2952 = new class170(); + if (!this.field2952.method881(var1, var2)) { + this.field2952 = null; } else { - if (this.field2939 == null || this.field2938 == null) { - this.method1791(); + if (this.field2956 == null || this.field2957 == null) { + this.method1830(); } } } } - @ObfuscatedName("ac") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lej;I)V", - garbageValue = "467943476" + descriptor = "(Ljava/lang/String;Lev;I)V", + garbageValue = "1047552277" ) - public void method1790(String var1, UrlRequester var2) { + public void method1829(String var1, UrlRequester var2) { if (this.type == 11 && var1 != null) { - this.field2934 = new class170(); - this.field2934.method893(var1, var2); + this.field2952 = new class170(); + this.field2952.method899(var1, var2); } } - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1842615926" + descriptor = "(S)V", + garbageValue = "-11260" ) - void method1791() { - this.field2939 = new HashMap(); - this.field2938 = new HashMap(); + void method1830() { + this.field2956 = new HashMap(); + this.field2957 = new HashMap(); } - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1342267996" + garbageValue = "1873888023" ) - public void method1792(int var1, int var2) { + public void method1831(int var1, int var2) { if (this.type == 11) { - if (this.field2939 == null) { - this.method1791(); + if (this.field2956 == null) { + this.method1830(); } - this.field2939.put(var1, var2); + this.field2956.put(var1, var2); } } - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;II)V", - garbageValue = "-1414965691" + garbageValue = "1531233902" ) - public void method1793(String var1, int var2) { + public void method1832(String var1, int var2) { if (this.type == 11) { - if (this.field2938 == null) { - this.method1791(); + if (this.field2957 == null) { + this.method1830(); } - this.field2938.put(var1, var2); + this.field2957.put(var1, var2); } } - @ObfuscatedName("ai") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(IIIII)Z", - garbageValue = "-233873937" + garbageValue = "182136505" ) - public boolean method1794(int var1, int var2, int var3, int var4) { - if (this.type == 11 && this.field2934 != null && this.method1795()) { + public boolean method1833(int var1, int var2, int var3, int var4) { + if (this.type == 11 && this.field2952 != null && this.method1834()) { var1 -= var3; var2 -= var4; - int var5 = (int)(this.field2934.method883()[0] * (float)this.width); - int var6 = (int)(this.field2934.method883()[1] * (float)this.height); - int var7 = var5 + (int)(this.field2934.method883()[2] * (float)this.width); - int var8 = var6 + (int)(this.field2934.method883()[3] * (float)this.height); + int var5 = (int)(this.field2952.method889()[0] * (float)this.width); + int var6 = (int)(this.field2952.method889()[1] * (float)this.height); + int var7 = var5 + (int)(this.field2952.method889()[2] * (float)this.width); + int var8 = var6 + (int)(this.field2952.method889()[3] * (float)this.height); return var1 >= var5 && var2 >= var6 && var1 < var7 && var2 < var8; } else { return false; } } - @ObfuscatedName("al") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1058749638" + garbageValue = "-1140949643" ) - public boolean method1795() { - return this.field2937 == 2; + public boolean method1834() { + return this.field2955 == 2; } - @ObfuscatedName("bd") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-2113017491" + garbageValue = "-2121469782" ) - public int method1796(String var1) { - return this.type == 11 && this.field2934 != null && this.method1795() ? this.field2934.method878(var1) : -1; + public int method1835(String var1) { + return this.type == 11 && this.field2952 != null && this.method1834() ? this.field2952.method884(var1) : -1; } - @ObfuscatedName("bb") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-425629947" + garbageValue = "-1095190564" ) - public String method1797(String var1) { - return this.type == 11 && this.field2934 != null && this.method1795() ? this.field2934.method879(var1) : null; + public String method1836(String var1) { + return this.type == 11 && this.field2952 != null && this.method1834() ? this.field2952.method885(var1) : null; } - @ObfuscatedName("bn") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "17038195" + descriptor = "(B)I", + garbageValue = "44" ) - public int method1798() { - return this.field2938 != null && this.field2938.size() > 0 ? 1 : 0; + public int method1837() { + return this.field2957 != null && this.field2957.size() > 0 ? 1 : 0; } - @ObfuscatedName("ba") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-84" + garbageValue = "47" ) - public int method1799() { - if (this.type == 11 && this.field2934 != null && this.field2938 != null && !this.field2938.isEmpty()) { - String var1 = this.field2934.method882(); - return var1 != null && this.field2938.containsKey(this.field2934.method882()) ? (Integer)this.field2938.get(var1) : -1; + public int method1838() { + if (this.type == 11 && this.field2952 != null && this.field2957 != null && !this.field2957.isEmpty()) { + String var1 = this.field2952.method888(); + return var1 != null && this.field2957.containsKey(this.field2952.method888()) ? (Integer)this.field2957.get(var1) : -1; } else { return -1; } } - @ObfuscatedName("bf") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-887288049" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "11076" ) - public String method1800() { - if (this.type == 11 && this.field2934 != null) { - String var1 = this.field2934.method882(); - Iterator var2 = this.field2934.method884().iterator(); + public String method1839() { + if (this.type == 11 && this.field2952 != null) { + String var1 = this.field2952.method888(); + Iterator var2 = this.field2952.method890().iterator(); while (var2.hasNext()) { class181 var3 = (class181)var2.next(); - String var4 = String.format("%%%S%%", var3.method914()); + String var4 = String.format("%%%S%%", var3.method925()); if (var3.vmethod3379() == 0) { var1.replaceAll(var4, Integer.toString(var3.vmethod3378())); } else { @@ -1460,20 +1459,20 @@ public String method1800() { } } - @ObfuscatedName("bs") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "-282480263" + garbageValue = "-2142205826" ) - public int[] method1801() { - if (this.type == 11 && this.field2934 != null) { + public int[] method1840() { + if (this.type == 11 && this.field2952 != null) { int[] var1 = new int[3]; int var2 = 0; - Iterator var3 = this.field2934.method884().iterator(); + Iterator var3 = this.field2952.method890().iterator(); while (var3.hasNext()) { class181 var4 = (class181)var3.next(); - if (!var4.method914().equals("user_id")) { + if (!var4.method925().equals("user_id")) { if (var4.vmethod3379() != 0) { return null; } @@ -1491,22 +1490,22 @@ public int[] method1801() { } } - @ObfuscatedName("bp") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(Lej;I)Z", - garbageValue = "-687125955" + descriptor = "(Lev;B)Z", + garbageValue = "84" ) - public boolean method1802(UrlRequester var1) { - if (this.type == 11 && this.field2934 != null) { - this.field2934.method876(var1); - if (this.field2934.method877() != this.field2937) { - this.field2937 = this.field2934.method877(); - if (this.field2937 >= 100) { + public boolean method1841(UrlRequester var1) { + if (this.type == 11 && this.field2952 != null) { + this.field2952.method882(var1); + if (this.field2952.method883() != this.field2955) { + this.field2955 = this.field2952.method883(); + if (this.field2955 >= 100) { return true; } - if (this.field2937 == 2) { - this.method1803(); + if (this.field2955 == 2) { + this.method1842(); return true; } } @@ -1517,147 +1516,186 @@ public boolean method1802(UrlRequester var1) { } } - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-228644187" + garbageValue = "757418391" ) - void method1803() { + void method1842() { this.noClickThrough = true; - ArrayList var1 = this.field2934.method880(); - ArrayList var2 = this.field2934.method881(); + ArrayList var1 = this.field2952.method886(); + ArrayList var2 = this.field2952.method887(); int var3 = var1.size() + var2.size(); this.children = new Widget[var3]; int var4 = 0; Iterator var5; - Widget var7; - for (var5 = var1.iterator(); var5.hasNext(); this.children[var4++] = var7) { + float[] var9; + Widget var10; + for (var5 = var1.iterator(); var5.hasNext(); this.children[var4++] = var10) { class176 var6 = (class176)var5.next(); - var7 = class239.method1282(5, this, var4, 0, 0, 0, 0, var6.field1461); - var7.field3073 = var6.field1460.method660(); - class327 var8 = new class327(var6.field1460); - field2932.method2147(var7.field3073, var8); + var9 = var6.field1470; + var10 = new Widget(); + var10.type = 5; + var10.parentId = this.id; + var10.childIndex = var4; + var10.isIf3 = true; + var10.xAlignment = 0; + var10.yAlignment = 0; + var10.widthAlignment = 0; + var10.heightAlignment = 0; + var10.rawX = (int)(var9[0] * (float)this.width); + var10.rawY = (int)(var9[1] * (float)this.height); + var10.rawWidth = (int)(var9[2] * (float)this.width); + var10.rawHeight = (int)((float)this.height * var9[3]); + var10.field3091 = var6.field1469.method667(); + class326 var11 = new class326(var6.field1469); + field2950.method2181(var10.field3091, var11); } - for (var5 = var2.iterator(); var5.hasNext(); this.children[var4++] = var7) { - class177 var9 = (class177)var5.next(); - var7 = class239.method1282(4, this, var4, 0, 0, 0, 0, var9.field1463); - var7.text = var9.field1467; - var7.fontId = (Integer)this.field2939.get(var9.field1466); - var7.textXAlignment = var9.field1465; - var7.textYAlignment = var9.field1464; + for (var5 = var2.iterator(); var5.hasNext(); this.children[var4++] = var10) { + class177 var12 = (class177)var5.next(); + var9 = var12.field1472; + var10 = new Widget(); + var10.type = 4; + var10.parentId = this.id; + var10.childIndex = var4; + var10.isIf3 = true; + var10.xAlignment = 0; + var10.yAlignment = 0; + var10.widthAlignment = 0; + var10.heightAlignment = 0; + var10.rawX = (int)(var9[0] * (float)this.width); + var10.rawY = (int)(var9[1] * (float)this.height); + var10.rawWidth = (int)((float)this.width * var9[2]); + var10.rawHeight = (int)(var9[3] * (float)this.height); + var10.text = var12.field1476; + var10.fontId = (Integer)this.field2956.get(var12.field1474); + var10.textXAlignment = var12.field1473; + var10.textYAlignment = var12.field1475; } } - @ObfuscatedName("bo") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "638323053" + descriptor = "(B)V", + garbageValue = "-109" ) - public void method1804() { - this.field2940 = new class328(); + public void method1843() { + this.field2958 = new class327(); for (int var1 = 1; var1 <= 12; ++var1) { - this.field2940.field2880.method102(var1, 0); + this.field2958.field2896.method96(var1, 0); } for (char var2 = 0; var2 < ' '; ++var2) { - this.field2940.field2880.method103(var2, 0); + this.field2958.field2896.method97(var2, 0); } - this.field2940.field2880.method103('\u0080', 0); - this.field2940.field2880.method102(82, 2); - this.field2940.field2880.method102(81, 2); - this.field2940.field2880.method102(86, 2); + this.field2958.field2896.method97('\u0080', 0); + this.field2958.field2896.method96(82, 2); + this.field2958.field2896.method96(81, 2); + this.field2958.field2896.method96(86, 2); } - @ObfuscatedName("br") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(I)Lmo;", - garbageValue = "1399447726" + descriptor = "(B)Lmb;", + garbageValue = "-14" ) - public class330 method1805() { - return this.field2940 != null ? this.field2940.field2886 : null; + public class329 method1844() { + return this.field2958 != null ? this.field2958.field2902 : null; } - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(I)Lmy;", - garbageValue = "-1142943567" + descriptor = "(B)Lml;", + garbageValue = "25" ) - public class325 method1806() { - return this.field2940 != null ? this.field2940.field2881 : null; + public class324 method1845() { + return this.field2958 != null ? this.field2958.field2897 : null; } - @ObfuscatedName("be") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(I)Lbb;", - garbageValue = "1031459265" + descriptor = "(I)Lbj;", + garbageValue = "1077698230" ) - public class27 method1807() { - return this.field2940 != null ? this.field2940.field2880 : null; + public class27 method1846() { + return this.field2958 != null ? this.field2958.field2896 : null; } - @ObfuscatedName("bc") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(I)Lmz;", - garbageValue = "-1841939772" + descriptor = "(I)Lmp;", + garbageValue = "-1932900136" ) - public class328 method1808() { - return this.field2940; + public class327 method1847() { + return this.field2958; } - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(Lmo;I)Z", - garbageValue = "1511239269" + descriptor = "(Lmb;B)Z", + garbageValue = "1" ) - boolean method1809(class330 var1) { + boolean method1848(class329 var1) { boolean var2 = false; if (this.text != null && !this.text.isEmpty()) { - var2 |= var1.method1696(class13.method45(this.text)); + var2 |= var1.method1733(class157.method832(this.text)); this.text = ""; } if (this.text2 != null && !this.text2.isEmpty()) { - var2 |= var1.method1697(class13.method45(this.text2)); + var2 |= var1.method1734(class157.method832(this.text2)); this.text2 = ""; } return var2; } - @ObfuscatedName("bu") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2118705753" + garbageValue = "1006338343" ) - public boolean method1810() { - class330 var1 = this.method1805(); + public boolean method1849() { + class329 var1 = this.method1844(); if (var1 == null) { return false; } else { boolean var2 = false; - if (!var1.method1750() && this.fontId != -1) { - int var3 = var1.method1751(); - int var4 = var1.method1752(); - int var5 = var1.method1749(); - int var6 = var1.method1748(); + if (!var1.method1787() && this.fontId != -1) { + int var3 = var1.method1788(); + int var4 = var1.method1789(); + int var5 = var1.method1786(); + int var6 = var1.method1785(); Font var7 = this.getFont(); if (var7 != null) { - var2 |= var1.method1698(var7); - var2 |= this.method1809(var1); - var2 |= var1.method1703(var3, var4); - var2 |= var1.method1718(var5, var6); + var2 |= var1.method1735(var7); + var2 |= this.method1848(var1); + var2 |= var1.method1740(var3, var4); + var2 |= var1.method1755(var5, var6); } - } else if (var1.method1750()) { - var2 |= this.method1809(var1); + } else if (var1.method1787()) { + var2 |= this.method1848(var1); } - var1.method1693(); + var1.method1730(); return var2; } } -} + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1138526298" + ) + public static int method1812(int var0, int var1, int var2) { + int var3 = Projectile.method430(var2 - var1 + 1); + var3 <<= var1; + var0 |= var3; + return var0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/World.java b/osrs/src/main/java/World.java index 30db11d4b..db7b1a548 100644 --- a/osrs/src/main/java/World.java +++ b/osrs/src/main/java/World.java @@ -1,71 +1,46 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; -import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("ch") @Implements("World") public class World { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("KitDefinition_archive") - static AbstractArchive KitDefinition_archive; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("World_count") static int World_count; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("World_listCount") static int World_listCount; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lei;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("cw") - static int field666; - @ObfuscatedName("ga") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static Archive field670; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("id") int id; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("properties") int properties; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("population") int population; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("host") String host; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("activity") String activity; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("location") int location; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("index") int index; - @ObfuscatedName("ab") - String field677; + @ObfuscatedName("am") + String field679; static { World_count = 0; @@ -77,382 +52,518 @@ public class World { World() { } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "18459" + descriptor = "(B)Z", + garbageValue = "2" ) @Export("isMembersOnly") boolean isMembersOnly() { - return (1 & this.properties) != 0; + return (class510.field4129.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ap") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1666523957" + garbageValue = "1342373424" ) @Export("isDeadman") boolean isDeadman() { - return (65536 & this.properties) != 0; + return (class510.field4125.rsOrdinal() & this.properties) != 0; } @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-14" + descriptor = "(I)Z", + garbageValue = "-1471748283" ) - boolean method396() { - return (2 & this.properties) != 0; + boolean method388() { + return (class510.field4124.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2076610622" + descriptor = "(B)Z", + garbageValue = "-87" ) @Export("isPvp") boolean isPvp() { - return (4 & this.properties) != 0; + return (class510.field4127.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ah") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "82" + descriptor = "(I)Z", + garbageValue = "-1678180347" ) - boolean method398() { - return (8 & this.properties) != 0; + boolean method390() { + return (class510.field4128.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "88611160" + garbageValue = "1233565973" ) - boolean method399() { - return (536870912 & this.properties) != 0; + boolean method391() { + return (class510.field4132.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1119201695" + garbageValue = "879753429" ) @Export("isBeta") boolean isBeta() { - return (33554432 & this.properties) != 0; + return (class510.field4126.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("au") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1104770276" + descriptor = "(B)Z", + garbageValue = "-6" ) - boolean method401() { - return (1073741824 & this.properties) != 0; + boolean method393() { + return (class510.field4131.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "39" + garbageValue = "2" ) - boolean method402() { - return (256 & this.properties) != 0; + boolean method394() { + return (class510.field4122.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "245225695" + descriptor = "(B)Z", + garbageValue = "8" ) - boolean method403() { - return (134217728 & this.properties) != 0; + boolean method395() { + return (class510.field4130.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ay") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IIIIIII)I", - garbageValue = "-1514003245" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-2141322867" ) - public static int method392(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { - int var6 = var3; - var3 = var4; - var4 = var6; - } - - var2 &= 3; - if (var2 == 0) { - return var1; - } else if (var2 == 1) { - return 7 - var0 - (var3 - 1); - } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; - } - } + public static String method385(String var0) { + int var1 = var0.length(); + char[] var2 = new char[var1]; + byte var3 = 2; + + for (int var4 = 0; var4 < var1; ++var4) { + char var5 = var0.charAt(var4); + if (var3 == 0) { + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { + var5 = SceneTilePaint.method1352(var5); + } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "([BIIII[Lij;B)V", - garbageValue = "0" - ) - static final void method393(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { - int var7; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 64; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var8 + var2] &= -16777217; + if (Character.isLetter(var5)) { + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { + if (Character.isSpaceChar(var5)) { + if (var3 != 2) { + var3 = 1; } + } else { + var3 = 1; } + } else { + var3 = 2; } - } - - Buffer var12 = new Buffer(var0); - for (var7 = 0; var7 < 4; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - for (int var9 = 0; var9 < 64; ++var9) { - int var10 = var8 + var1; - int var11 = var9 + var2; - ScriptEvent.loadTerrain(var12, var7, var10, var11, var3 + var10, var11 + var4, 0); - } - } + var2[var4] = var5; } + return new String(var2); } - @ObfuscatedName("au") + @ObfuscatedName("kq") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1526297994" + descriptor = "(Lls;I)V", + garbageValue = "681545140" ) - static void method404() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - Actor.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var1; - try { - URL var3 = new URL(UrlRequest.method661("services", false) + "m=accountappeal/login.ws"); - URLConnection var4 = var3.openConnection(); - var4.setRequestProperty("connection", "close"); - var4.setDoInput(true); - var4.setDoOutput(true); - var4.setConnectTimeout(5000); - OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); - var5.write("data1=req"); - var5.flush(); - InputStream var6 = var4.getInputStream(); - Buffer var7 = new Buffer(new byte[1000]); - - while (true) { - int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); - if (var8 == -1) { - var7.offset = 0; - long var22 = var7.readLong(); - var1 = var22; - break; + @Export("processZoneOperation") + static final void processZoneOperation(ZoneOperation var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + if (ZoneOperation.AREA_SOUND == var0) { + var2 = var1.readUnsignedIntIME(); + var3 = var1.readIntIME(); + var4 = var1.readUnsignedByte(); + var5 = (var4 >> 4 & 7) + ObjectSound.field686; + var6 = (var4 & 7) + class125.field1193; + var7 = var1.readUnsignedShortLE(); + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + NodeDeque var41 = Client.groundItems[HealthBar.Client_plane][var5][var6]; + if (var41 != null) { + for (TileItem var9 = (TileItem)var41.last(); var9 != null; var9 = (TileItem)var41.previous()) { + if ((var7 & 32767) == var9.id && var3 == var9.quantity) { + var9.quantity = var2; + break; + } } - var7.offset += var8; - if (var7.offset >= 1000) { - var1 = 0L; - break; - } + class135.updateItemPile(var5, var6); } - } catch (Exception var31) { - var1 = 0L; } - byte var0; - if (var1 == 0L) { - var0 = 5; - } else { - String var32 = Login.Login_username; - Random var33 = new Random(); - Buffer var26 = new Buffer(128); - Buffer var9 = new Buffer(128); - int[] var10 = new int[]{var33.nextInt(), var33.nextInt(), (int)(var1 >> 32), (int)var1}; - var26.writeByte(10); - - int var11; - for (var11 = 0; var11 < 4; ++var11) { - var26.writeInt(var33.nextInt()); + } else { + byte var10; + int var12; + int var13; + int var31; + int var32; + if (ZoneOperation.OBJ_ADD == var0) { + var2 = var1.readUnsignedByteAdd(); + var3 = var2 >> 2; + var4 = var2 & 3; + var5 = Client.field653[var3]; + var6 = var1.readUnsignedByteNeg(); + var7 = (var6 >> 4 & 7) + ObjectSound.field686; + var31 = (var6 & 7) + class125.field1193; + var32 = var1.method2587(); + var10 = var1.readByteAdd(); + byte var11 = var1.readByteNeg(); + var12 = var1.readIntME(); + var13 = var1.readIntME(); + byte var14 = var1.readSignedByteSub(); + byte var15 = var1.readByte(); + int var16 = var1.method2587(); + Player var17; + if (var32 == Client.localPlayerIndex) { + var17 = VarbitComposition.localPlayer; + } else { + var17 = Client.players[var32]; } - var26.writeInt(var10[0]); - var26.writeInt(var10[1]); - var26.writeLong(var1); - var26.writeLong(0L); + if (var17 != null) { + ObjectComposition var18 = WorldMapElement.getObjectDefinition(var13); + int var19; + int var20; + if (var4 != 1 && var4 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; + } else { + var19 = var18.sizeY; + var20 = var18.sizeX; + } - for (var11 = 0; var11 < 4; ++var11) { - var26.writeInt(var33.nextInt()); - } + int var21 = var7 + (var19 >> 1); + int var22 = var7 + (var19 + 1 >> 1); + int var23 = var31 + (var20 >> 1); + int var24 = var31 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[HealthBar.Client_plane]; + int var26 = var25[var22][var24] + var25[var21][var24] + var25[var22][var23] + var25[var21][var23] >> 2; + int var27 = (var7 << 7) + (var19 << 6); + int var28 = (var31 << 7) + (var20 << 6); + Model var29 = var18.getModel(var3, var4, var25, var27, var26, var28); + if (var29 != null) { + ClientPreferences.updatePendingSpawn(HealthBar.Client_plane, var7, var31, var5, -1, 0, 0, 31, var12 + 1, var16 + 1); + var17.animationCycleStart = var12 + Client.cycle; + var17.animationCycleEnd = var16 + Client.cycle; + var17.attachedModel = var29; + var17.field909 = var19 * 64 + var7 * 128; + var17.field910 = var20 * 64 + var31 * 128; + var17.baseTileHeight = var26; + byte var30; + if (var14 > var10) { + var30 = var14; + var14 = var10; + var10 = var30; + } - var26.encryptRsa(class72.field728, class72.field727); - var9.writeByte(10); + if (var11 > var15) { + var30 = var11; + var11 = var15; + var15 = var30; + } - for (var11 = 0; var11 < 3; ++var11) { - var9.writeInt(var33.nextInt()); + var17.minX = var7 + var14; + var17.maxX = var10 + var7; + var17.minY = var11 + var31; + var17.maxY = var15 + var31; + } } + } - var9.writeLong(var33.nextLong()); - var9.writeLongMedium(var33.nextLong()); - VertexNormal.method1323(var9); - var9.writeLong(var33.nextLong()); - var9.encryptRsa(class72.field728, class72.field727); - var11 = class501.stringCp1252NullTerminatedByteSize(var32); - if (var11 % 8 != 0) { - var11 += 8 - var11 % 8; + if (ZoneOperation.LOC_ANIM == var0) { + var2 = var1.readUnsignedByteNeg(); + var3 = (var2 >> 4 & 7) + ObjectSound.field686; + var4 = (var2 & 7) + class125.field1193; + var5 = var1.readUnsignedShort(); + var6 = var1.readUnsignedByteNeg(); + var7 = var1.readUnsignedShortLE(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + var3 = var3 * 128 + 64; + var4 = var4 * 128 + 64; + GraphicsObject var40 = new GraphicsObject(var7, HealthBar.Client_plane, var3, var4, class18.getTileHeight(var3, var4, HealthBar.Client_plane) - var6, var5, Client.cycle); + Client.graphicsObjects.addFirst(var40); } - Buffer var12 = new Buffer(var11); - var12.writeStringCp1252NullTerminated(var32); - var12.offset = var11; - var12.xteaEncryptAll(var10); - Buffer var13 = new Buffer(var9.offset + var26.offset + var12.offset + 5); - var13.writeByte(2); - var13.writeByte(var26.offset); - var13.writeBytes(var26.array, 0, var26.offset); - var13.writeByte(var9.offset); - var13.writeBytes(var9.array, 0, var9.offset); - var13.writeShort(var12.offset); - var13.writeBytes(var12.array, 0, var12.offset); - String var14 = class345.method1832(var13.array); - - byte var27; - try { - URL var15 = new URL(UrlRequest.method661("services", false) + "m=accountappeal/login.ws"); - URLConnection var16 = var15.openConnection(); - var16.setDoInput(true); - var16.setDoOutput(true); - var16.setConnectTimeout(5000); - OutputStreamWriter var17 = new OutputStreamWriter(var16.getOutputStream()); - var17.write("data2=" + class497.method2455(var14) + "&dest=" + class497.method2455("passwordchoice.ws")); - var17.flush(); - InputStream var18 = var16.getInputStream(); - var13 = new Buffer(new byte[1000]); - - while (true) { - int var19 = var18.read(var13.array, var13.offset, 1000 - var13.offset); - if (var19 == -1) { - var17.close(); - var18.close(); - String var28 = new String(var13.array); - if (var28.startsWith("OFFLINE")) { - var27 = 4; - } else if (var28.startsWith("WRONG")) { - var27 = 7; - } else if (var28.startsWith("RELOAD")) { - var27 = 3; - } else if (var28.startsWith("Not permitted for social network accounts.")) { - var27 = 6; - } else { - var13.xteaDecryptAll(var10); + } else { + int var42; + if (ZoneOperation.MAP_ANIM == var0) { + var2 = var1.readUnsignedByteAdd(); + var3 = var1.readUnsignedByteNeg(); + var4 = var3 >> 2; + var5 = var3 & 3; + var6 = Client.field653[var4]; + var7 = var1.method2587(); + var31 = var1.readUnsignedByteSub(); + var32 = (var31 >> 4 & 7) + ObjectSound.field686; + var42 = (var31 & 7) + class125.field1193; + if (var32 >= 0 && var42 >= 0 && var32 < 104 && var42 < 104) { + ClientPreferences.updatePendingSpawn(HealthBar.Client_plane, var32, var42, var6, var7, var4, var5, var2, 0, -1); + } - while (var13.offset > 0 && var13.array[var13.offset - 1] == 0) { - --var13.offset; + } else { + int var43; + if (ZoneOperation.OBJ_COUNT == var0) { + var2 = var1.readUnsignedByteNeg(); + var3 = var2 >> 2; + var4 = var2 & 3; + var5 = Client.field653[var3]; + var6 = var1.readIntME(); + var7 = var1.readUnsignedByteNeg(); + var31 = (var7 >> 4 & 7) + ObjectSound.field686; + var32 = (var7 & 7) + class125.field1193; + if (var31 >= 0 && var32 >= 0 && var31 < 103 && var32 < 103) { + if (var5 == 0) { + BoundaryObject var33 = class130.scene.method1255(HealthBar.Client_plane, var31, var32); + if (var33 != null) { + var43 = InvDefinition.Entity_unpackID(var33.tag); + if (var3 == 2) { + var33.renderable1 = new DynamicObject(var43, 2, var4 + 4, HealthBar.Client_plane, var31, var32, var6, false, var33.renderable1); + var33.renderable2 = new DynamicObject(var43, 2, var4 + 1 & 3, HealthBar.Client_plane, var31, var32, var6, false, var33.renderable2); + } else { + var33.renderable1 = new DynamicObject(var43, var3, var4, HealthBar.Client_plane, var31, var32, var6, false, var33.renderable1); + } + + return; } + } - var28 = new String(var13.array, 0, var13.offset); - boolean var20; - if (var28 == null) { - var20 = false; - } else { - label100: { - try { - new URL(var28); - } catch (MalformedURLException var29) { - var20 = false; - break label100; + if (var5 == 1) { + WallDecoration var46 = class130.scene.method1256(HealthBar.Client_plane, var31, var32); + if (var46 != null) { + var43 = InvDefinition.Entity_unpackID(var46.tag); + if (var3 != 4 && var3 != 5) { + if (var3 == 6) { + var46.renderable1 = new DynamicObject(var43, 4, var4 + 4, HealthBar.Client_plane, var31, var32, var6, false, var46.renderable1); + } else if (var3 == 7) { + var46.renderable1 = new DynamicObject(var43, 4, (var4 + 2 & 3) + 4, HealthBar.Client_plane, var31, var32, var6, false, var46.renderable1); + } else if (var3 == 8) { + var46.renderable1 = new DynamicObject(var43, 4, var4 + 4, HealthBar.Client_plane, var31, var32, var6, false, var46.renderable1); + var46.renderable2 = new DynamicObject(var43, 4, (var4 + 2 & 3) + 4, HealthBar.Client_plane, var31, var32, var6, false, var46.renderable2); } - - var20 = true; + } else { + var46.renderable1 = new DynamicObject(var43, 4, var4, HealthBar.Client_plane, var31, var32, var6, false, var46.renderable1); } + + return; + } + } + + if (var5 == 2) { + GameObject var47 = class130.scene.getGameObject(HealthBar.Client_plane, var31, var32); + if (var3 == 11) { + var3 = 10; } - if (var20) { - NPC.openURL(var28, true, false); - var27 = 2; - } else { - var27 = 5; + if (var47 != null) { + var47.renderable = new DynamicObject(InvDefinition.Entity_unpackID(var47.tag), var3, var4, HealthBar.Client_plane, var31, var32, var6, false, var47.renderable); + return; } } - break; - } - var13.offset += var19; - if (var13.offset >= 1000) { - var27 = 5; - break; + if (var5 == 3) { + FloorDecoration var48 = class130.scene.getFloorDecoration(HealthBar.Client_plane, var31, var32); + if (var48 != null) { + var48.renderable = new DynamicObject(InvDefinition.Entity_unpackID(var48.tag), 22, var4, HealthBar.Client_plane, var31, var32, var6, false, var48.renderable); + return; + } + } + + class460.method2332(HealthBar.Client_plane, var31, var32, var5, var6); } - } - } catch (Throwable var30) { - var30.printStackTrace(); - var27 = 5; - } - var0 = var27; - } + } else { + TileItem var8; + if (ZoneOperation.OBJ_DEL_LEGACY == var0) { + var1.readUnsignedByteAdd(); + var2 = var1.readUnsignedByteAdd(); + var3 = (var2 >> 4 & 7) + ObjectSound.field686; + var4 = (var2 & 7) + class125.field1193; + var5 = var1.readUnsignedByte(); + var6 = var1.readInt(); + var1.method2587(); + var1.readIntME(); + var1.readUnsignedByteAdd(); + var7 = var1.readUnsignedShort(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + var8 = new TileItem(); + var8.id = var7; + var8.quantity = var6; + var8.method609(var5); + if (Client.groundItems[HealthBar.Client_plane][var3][var4] == null) { + Client.groundItems[HealthBar.Client_plane][var3][var4] = new NodeDeque(); + } - switch(var0) { - case 2: - Actor.setLoginResponseString(Strings.field3412, Strings.field3419, Strings.field3410); - class328.method1678(6); - break; - case 3: - Actor.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - Actor.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - Actor.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - Actor.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - Actor.setLoginResponseString("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."); - } + Client.groundItems[HealthBar.Client_plane][var3][var4].addFirst(var8); + class135.updateItemPile(var3, var4); + } - } - } + } else if (ZoneOperation.LOC_ADD_CHANGE == var0) { + var2 = var1.readUnsignedByte(); + var3 = (var2 >> 4 & 7) + ObjectSound.field686; + var4 = (var2 & 7) + class125.field1193; + var5 = var1.readUnsignedByteNeg(); + var6 = var5 >> 2; + var7 = var5 & 3; + var31 = Client.field653[var6]; + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + ClientPreferences.updatePendingSpawn(HealthBar.Client_plane, var3, var4, var31, -1, var6, var7, 31, 0, -1); + } - @ObfuscatedName("ku") - @ObfuscatedSignature( - descriptor = "(Ldf;IILio;B)V", - garbageValue = "-30" - ) - static final void method405(Player var0, int var1, int var2, MoveSpeed var3) { - int var4 = var0.pathX[0]; - int var5 = var0.pathY[0]; - int var6 = var0.transformedSize(); - if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { - if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { - int var8 = var0.transformedSize(); - Client.field647.approxDestinationX = var1; - Client.field647.approxDestinationY = var2; - Client.field647.approxDestinationSizeX = 1; - Client.field647.approxDestinationSizeY = 1; - ApproximateRouteStrategy var9 = Client.field647; - CollisionMap var11 = Client.collisionMaps[var0.plane]; - int[] var12 = Client.field589; - int[] var13 = Client.field590; - int var7 = WorldMapSprite.method1499(var4, var5, var8, var9, var11, true, var12, var13, class219.field1905[0]); - int var14 = var7; - if (var7 >= 1) { - for (int var15 = 0; var15 < var14 - 1; ++var15) { - var0.method501(Client.field589[var15], Client.field590[var15], var3); - } + } else { + NodeDeque var34; + if (ZoneOperation.PREFETCH_GAMEOBJECTS == var0) { + var2 = var1.method2587(); + var3 = var1.readUnsignedIntIME(); + var4 = var1.readUnsignedByte(); + var5 = (var4 >> 4 & 7) + ObjectSound.field686; + var6 = (var4 & 7) + class125.field1193; + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var34 = Client.groundItems[HealthBar.Client_plane][var5][var6]; + if (var34 != null) { + for (var8 = (TileItem)var34.last(); var8 != null; var8 = (TileItem)var34.previous()) { + if ((var2 & 32767) == var8.id && var3 == var8.quantity) { + var8.remove(); + break; + } + } + if (var34.last() == null) { + Client.groundItems[HealthBar.Client_plane][var5][var6] = null; + } + + class135.updateItemPile(var5, var6); + } + } + + } else { + if (ZoneOperation.MAPPROJ_ANIM == var0) { + var2 = var1.readUnsignedByteAdd(); + var3 = (var2 >> 4 & 7) + ObjectSound.field686; + var4 = (var2 & 7) + class125.field1193; + var5 = var1.readUnsignedByteSub(); + var6 = var5 >> 4 & 15; + var7 = var5 & 7; + var31 = var1.readUnsignedByte(); + var32 = var1.method2587(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + var42 = var6 + 1; + if (VarbitComposition.localPlayer.pathX[0] >= var3 - var42 && VarbitComposition.localPlayer.pathX[0] <= var42 + var3 && VarbitComposition.localPlayer.pathY[0] >= var4 - var42 && VarbitComposition.localPlayer.pathY[0] <= var42 + var4 && class449.clientPreferences.getAreaSoundEffectsVolume() != 0 && var7 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var32; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var7; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var31; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var6 + (var4 << 8) + (var3 << 16); + ++Client.soundEffectCount; + } + } + } + + int var44; + if (ZoneOperation.OBJ_DEL == var0) { + var2 = var1.readUnsignedShortLE(); + var3 = var1.readUnsignedShort(); + byte var37 = var1.readSignedByteSub(); + var5 = var1.readUnsignedByteNeg(); + var6 = var1.method2593(); + byte var39 = var1.readByte(); + var31 = var1.readUnsignedByteAdd() * 4; + var32 = var1.readUnsignedByteNeg(); + var42 = var1.readUnsignedByteSub() * 4; + var43 = var1.method2594(); + var12 = var1.readUnsignedByte(); + var13 = (var12 >> 4 & 7) + ObjectSound.field686; + var44 = (var12 & 7) + class125.field1193; + int var45 = var1.method2587(); + var4 = var37 + var13; + var7 = var39 + var44; + if (var13 >= 0 && var44 >= 0 && var13 < 104 && var44 < 104 && var4 >= 0 && var7 >= 0 && var4 < 104 && var7 < 104 && var45 != 65535) { + var13 = var13 * 128 + 64; + var44 = var44 * 128 + 64; + var4 = var4 * 128 + 64; + var7 = var7 * 128 + 64; + Projectile var35 = new Projectile(var45, HealthBar.Client_plane, var13, var44, class18.getTileHeight(var13, var44, HealthBar.Client_plane) - var31, var2 + Client.cycle, var3 + Client.cycle, var5, var32, var43, var6, var42); + var35.setDestination(var4, var7, class18.getTileHeight(var4, var7, HealthBar.Client_plane) - var42, var2 + Client.cycle); + Client.projectiles.addFirst(var35); + } + + } else if (ZoneOperation.LOC_DEL == var0) { + var2 = var1.readIntME(); + var3 = var1.readUnsignedByteAdd(); + var4 = (var3 >> 4 & 7) + ObjectSound.field686; + var5 = (var3 & 7) + class125.field1193; + byte var38 = var1.readSignedByteSub(); + var7 = var1.method2594(); + var31 = var1.readUnsignedByteAdd(); + var32 = var1.method2587(); + var10 = var1.readByteAdd(); + var43 = var1.readUnsignedByteNeg() * 4; + var12 = var1.readUnsignedByteAdd(); + var13 = var1.readUnsignedByteAdd() * 4; + var44 = var1.readUnsignedShort(); + var42 = var10 + var4; + var6 = var38 + var5; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104 && var42 >= 0 && var6 >= 0 && var42 < 104 && var6 < 104 && var2 != 65535) { + var4 = var4 * 128 + 64; + var5 = var5 * 128 + 64; + var42 = var42 * 128 + 64; + var6 = var6 * 128 + 64; + Projectile var36 = new Projectile(var2, HealthBar.Client_plane, var4, var5, class18.getTileHeight(var4, var5, HealthBar.Client_plane) - var13, var44 + Client.cycle, var32 + Client.cycle, var31, var12, var7, var43); + var36.setDestination(var42, var6, class18.getTileHeight(var42, var6, HealthBar.Client_plane) - var43, var44 + Client.cycle); + Client.projectiles.addFirst(var36); + } + + } else if (ZoneOperation.field2607 == var0) { + var2 = var1.readUnsignedByte(); + var3 = (var2 >> 4 & 7) + ObjectSound.field686; + var4 = (var2 & 7) + class125.field1193; + var5 = var1.readUnsignedByteSub(); + var6 = var1.readIntME(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + var34 = Client.groundItems[HealthBar.Client_plane][var3][var4]; + if (var34 != null) { + for (var8 = (TileItem)var34.last(); var8 != null; var8 = (TileItem)var34.previous()) { + if ((var6 & 32767) == var8.id) { + var8.method609(var5); + break; + } + } + } + } + + } + } + } + } } } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMap.java b/osrs/src/main/java/WorldMap.java index aecebe675..850e1e780 100644 --- a/osrs/src/main/java/WorldMap.java +++ b/osrs/src/main/java/WorldMap.java @@ -1,216 +1,212 @@ -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sq") +import java.util.*; + +@ObfuscatedName("si") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lsp;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lsp;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lsp;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lpc;" + descriptor = "Lpi;" ) @Export("font") Font font; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("fonts") HashMap fonts; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "[Luu;" + descriptor = "[Luk;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("details") HashMap details; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Ljf;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Ljf;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Ljf;" ) - WorldMapArea field4010; - @ObfuscatedName("ao") + WorldMapArea field4023; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Ljd;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("ac") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lst;" + descriptor = "Lsb;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("centerTileX") int centerTileX; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("centerTileY") int centerTileY; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("zoom") float zoom; - @ObfuscatedName("bd") + @ObfuscatedName("bh") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("bb") + @ObfuscatedName("bj") @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("bn") + @ObfuscatedName("bk") @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("bf") + @ObfuscatedName("bt") @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("bp") + @ObfuscatedName("by") @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @Export("flashCount") int flashCount; - @ObfuscatedName("br") + @ObfuscatedName("bq") @Export("flashCycle") int flashCycle; - @ObfuscatedName("bw") + @ObfuscatedName("ba") int field3991; - @ObfuscatedName("be") - int field3982; - @ObfuscatedName("bc") - int field3981; - @ObfuscatedName("bi") - int field3984; + @ObfuscatedName("bl") + int field3997; + @ObfuscatedName("bp") + int field3998; @ObfuscatedName("bu") - long field4012; - @ObfuscatedName("bk") - int field3985; - @ObfuscatedName("bz") + int field4002; + @ObfuscatedName("bo") + long field4024; + @ObfuscatedName("bb") int field3992; + @ObfuscatedName("br") + int field4000; + @ObfuscatedName("be") + boolean field3982; @ObfuscatedName("bx") - boolean field3972; - @ObfuscatedName("bl") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("bt") + @ObfuscatedName("bn") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("by") + @ObfuscatedName("bw") @Export("enabledElementIds") HashSet enabledElementIds; + @ObfuscatedName("bc") + HashSet field4012; @ObfuscatedName("bg") - HashSet field4000; - @ObfuscatedName("bj") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("ct") - int field3996; - @ObfuscatedName("cz") + @ObfuscatedName("cw") + int field4009; + @ObfuscatedName("cm") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("cb") - List field4007; + @ObfuscatedName("cn") + List field4019; @ObfuscatedName("cs") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("cj") - HashSet field4005; - @ObfuscatedName("cn") + @ObfuscatedName("cx") + HashSet field4017; + @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmc;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("cw") + @ObfuscatedName("cd") @Export("showCoord") public boolean showCoord; @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "Lui;" ) @Export("sprite") SpritePixels sprite; @ObfuscatedName("cq") @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("cm") + @ObfuscatedName("cp") @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("ca") + @ObfuscatedName("cv") @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("cx") - int field3997; + @ObfuscatedName("co") + int field4005; static { fontNameVerdana11 = FontName.FontName_verdana11; @@ -232,29 +228,29 @@ public WorldMap() { this.flashCount = -1; this.flashCycle = -1; this.field3991 = -1; - this.field3982 = -1; - this.field3981 = -1; - this.field3984 = -1; - this.field3972 = true; + this.field3997 = -1; + this.field3998 = -1; + this.field4002 = -1; + this.field3982 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); this.enabledElementIds = new HashSet(); - this.field4000 = new HashSet(); + this.field4012 = new HashSet(); this.elementsDisabled = false; - this.field3996 = 0; + this.field4009 = 0; this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field4005 = new HashSet(); + this.field4017 = new HashSet(); this.mouseCoord = null; this.showCoord = false; this.minCachedTileX = -1; this.minCachedTileY = -1; - this.field3997 = -1; + this.field4005 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;Lnd;Lpc;Ljava/util/HashMap;[Luu;I)V", - garbageValue = "-1050451125" + descriptor = "(Lnu;Lnu;Lnu;Lpi;Ljava/util/HashMap;[Luk;I)V", + garbageValue = "98819926" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { @@ -268,7 +264,7 @@ public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); this.cacheLoader = new WorldMapArchiveLoader(var1); - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2449.name); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2471.name); int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); int var9 = var8 == null ? 0 : var8.length; this.details = new HashMap(var9); @@ -284,22 +280,22 @@ public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var } this.setCurrentMapArea(this.mainMapArea); - this.field4010 = null; + this.field4023 = null; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-65" + garbageValue = "58" ) - public void method2359() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); + public void method2384() { + class18.method56(); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIZIIIII)V", - garbageValue = "-452264165" + descriptor = "(IIZIIIIB)V", + garbageValue = "10" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { @@ -309,27 +305,27 @@ public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int va if (var3) { int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); - List var10 = this.worldMapManager.method1447(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); + List var10 = this.worldMapManager.method1475(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); HashSet var11 = new HashSet(); Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); GrandExchangeOfferOwnWorldComparator.runScriptEvent(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); WorldMapSection1.runScriptEvent(var14)) { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); - if (this.field4005.contains(var13)) { + if (this.field4017.contains(var13)) { var14.setType(17); } else { var14.setType(15); } } - var12 = this.field4005.iterator(); + var12 = this.field4017.iterator(); while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); @@ -338,90 +334,81 @@ public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int va var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var14); + WorldMapSection1.runScriptEvent(var14); } } - this.field4005 = var11; + this.field4017 = var11; } } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIZZS)V", - garbageValue = "10233" + descriptor = "(IIZZI)V", + garbageValue = "1934928050" ) - public void method2361(int var1, int var2, boolean var3, boolean var4) { + public void method2386(int var1, int var2, boolean var3, boolean var4) { long var5; label33: { - var5 = class113.clockNow(); - this.method2362(var1, var2, var4, var5); + var5 = GameEngine.clockNow(); + this.method2387(var1, var2, var4, var5); if (!this.hasTarget() && (var4 || var3)) { boolean var7 = Client.clickedWidget != null; if (!var7) { if (var4) { - this.field3981 = var1; - this.field3984 = var2; + this.field3998 = var1; + this.field4002 = var2; this.field3991 = this.centerTileX; - this.field3982 = this.centerTileY; + this.field3997 = this.centerTileY; } if (this.field3991 != -1) { - int var8 = var1 - this.field3981; - int var9 = var2 - this.field3984; - this.setWorldMapPosition(this.field3991 - (int)((float)var8 / this.zoomTarget), (int)((float)var9 / this.zoomTarget) + this.field3982, false); + int var8 = var1 - this.field3998; + int var9 = var2 - this.field4002; + this.setWorldMapPosition(this.field3991 - (int)((float)var8 / this.zoomTarget), (int)((float)var9 / this.zoomTarget) + this.field3997, false); } break label33; } } - this.method2366(); + this.method2391(); } if (var4) { - this.field4012 = var5; - this.field3985 = var1; - this.field3992 = var2; + this.field4024 = var5; + this.field3992 = var1; + this.field4000 = var2; } } - @ObfuscatedName("as") - void method2362(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("ac") + void method2387(int var1, int var2, boolean var3, long var4) { if (this.currentMapArea != null) { int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); if (this.mouseCoord != null && var3) { - class213 var8 = SceneTilePaint.method1324(); - int var10; - int var11; - if (class158.method835() && var8.getKeyPressed(82) && var8.getKeyPressed(81)) { - int var14 = this.mouseCoord.x; - var10 = this.mouseCoord.y; - var11 = this.mouseCoord.plane; - PacketBufferNode var12 = class503.getPacketBufferNode(ClientPacket.TELEPORT, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeIntME(0); - var12.packetBuffer.writeShortAddLE(var14); - var12.packetBuffer.writeByteAdd(var11); - var12.packetBuffer.writeShortAdd(var10); - Client.packetWriter.addNode(var12); + class212 var8 = AbstractWorldMapData.method1526(); + boolean var9 = Client.staffModLevel >= 2; + if (var9 && var8.getKeyPressed(82) && var8.getKeyPressed(81)) { + NPC.method597(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); } else { - boolean var9 = true; - if (this.field3972) { - var10 = var1 - this.field3985; - var11 = var2 - this.field3992; - if (var4 - this.field4012 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { - var9 = false; + boolean var10 = true; + if (this.field3982) { + int var11 = var1 - this.field3992; + int var12 = var2 - this.field4000; + if (var4 - this.field4024 > 500L || var11 < -25 || var11 > 25 || var12 < -25 || var12 > 25) { + var10 = false; } } - if (var9) { - PacketBufferNode var13 = class503.getPacketBufferNode(ClientPacket.CLICKWORLDMAP, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeIntIME(this.mouseCoord.packed()); + if (var10) { + PacketBufferNode var13 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLICKWORLDMAP, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeInt(this.mouseCoord.packed()); Client.packetWriter.addNode(var13); - this.field4012 = 0L; + this.field4024 = 0L; } } } @@ -431,14 +418,14 @@ void method2362(int var1, int var2, boolean var3, long var4) { } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "636317718" + descriptor = "(S)V", + garbageValue = "-12314" ) @Export("smoothZoom") void smoothZoom() { - if (UserComparator7.field1171 != null) { + if (class390.field3656 != null) { this.zoom = this.zoomTarget; } else { if (this.zoom < this.zoomTarget) { @@ -452,10 +439,10 @@ void smoothZoom() { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-2527" + descriptor = "(B)V", + garbageValue = "55" ) @Export("scrollToTarget") void scrollToTarget() { @@ -479,48 +466,48 @@ void scrollToTarget() { } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "-1787840553" + descriptor = "(IIZB)V", + garbageValue = "0" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; this.centerTileY = var2; - class113.clockNow(); + GameEngine.clockNow(); if (var3) { - this.method2366(); + this.method2391(); } } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "101" + descriptor = "(I)V", + garbageValue = "828394242" ) - final void method2366() { - this.field3984 = -1; - this.field3981 = -1; - this.field3982 = -1; + final void method2391() { + this.field4002 = -1; + this.field3998 = -1; + this.field3997 = -1; this.field3991 = -1; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-11" + descriptor = "(I)Z", + garbageValue = "-778313072" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IIIB)Ljs;", - garbageValue = "8" + descriptor = "(IIII)Ljf;", + garbageValue = "442093441" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { @@ -538,12 +525,12 @@ public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { return var5; } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "1991480722" + descriptor = "(IIIZB)V", + garbageValue = "88" ) - public void method2369(int var1, int var2, int var3, boolean var4) { + public void method2394(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if (var5 == null) { if (!var4) { @@ -554,8 +541,8 @@ public void method2369(int var1, int var2, int var3, boolean var4) { } boolean var6 = false; - if (var5 != this.field4010 || var4) { - this.field4010 = var5; + if (var5 != this.field4023 || var4) { + this.field4023 = var5; this.setCurrentMapArea(var5); var6 = true; } @@ -566,10 +553,10 @@ public void method2369(int var1, int var2, int var3, boolean var4) { } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "795116875" + descriptor = "(IB)V", + garbageValue = "114" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -580,30 +567,30 @@ public void setCurrentMapAreaId(int var1) { } - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1338800765" + garbageValue = "2135473352" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Ljs;", - garbageValue = "-9922858" + descriptor = "(B)Ljf;", + garbageValue = "122" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; } - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljs;I)V", - garbageValue = "1656071073" + descriptor = "(Ljf;I)V", + garbageValue = "-824827052" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -613,10 +600,10 @@ void setCurrentMapArea(WorldMapArea var1) { } } - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Ljs;I)V", - garbageValue = "1127606129" + descriptor = "(Ljf;I)V", + garbageValue = "1970114808" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -625,12 +612,12 @@ void initializeWorldMapManager(WorldMapArea var1) { this.cacheLoader.reset(this.currentMapArea == null ? null : this.currentMapArea.getInternalName()); } - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Ljs;Lmr;Lmr;ZB)V", - garbageValue = "-74" + descriptor = "(Ljf;Lmc;Lmc;ZI)V", + garbageValue = "137024863" ) - public void method2375(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method2400(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMapManager(var1); @@ -645,10 +632,10 @@ public void method2375(WorldMapArea var1, Coord var2, Coord var3, boolean var4) } } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1717944144" + descriptor = "(IIIB)V", + garbageValue = "1" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -663,16 +650,16 @@ void jump(int var1, int var2, int var3) { this.worldMapTargetY = -1; this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); this.zoomTarget = this.zoom; - this.field4007 = null; + this.field4019 = null; this.iconIterator = null; this.worldMapManager.clearIcons(); } } - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-1021505883" + descriptor = "(IIIIIB)V", + garbageValue = "-27" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { @@ -706,18 +693,20 @@ public void draw(int var1, int var2, int var3, int var4, int var5) { int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); + boolean var10; if (!this.elementsDisabled) { - boolean var10 = false; - if (var5 - this.field3996 > 100) { - this.field3996 = var5; + var10 = false; + if (var5 - this.field4009 > 100) { + this.field4009 = var5; var10 = true; } - this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4000, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); + this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4012, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); } - this.method2379(var1, var2, var3, var4, var8, var9); - if (class158.method835() && this.showCoord && this.mouseCoord != null) { + this.method2404(var1, var2, var3, var4, var8, var9); + var10 = Client.staffModLevel >= 2; + if (var10 && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } @@ -729,18 +718,18 @@ public void draw(int var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("ac") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(IIIIIII)Z", - garbageValue = "-2144848523" + garbageValue = "1770915871" ) - boolean method2378(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method2403(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.sprite == null) { return true; } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { return true; - } else if (this.field3997 != Client.field364) { + } else if (this.field4005 != Client.field369) { return true; } else if (var3 <= 0 && var4 <= 0) { return var3 + var1 < var5 || var2 + var4 < var6; @@ -752,13 +741,13 @@ boolean method2378(int var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-1743359113" + descriptor = "(IIIIIIS)V", + garbageValue = "512" ) - void method2379(int var1, int var2, int var3, int var4, int var5, int var6) { - if (UserComparator7.field1171 != null) { + void method2404(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class390.field3656 != null) { int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); int var8 = var3 + 512; int var9 = var4 + 512; @@ -769,7 +758,7 @@ void method2379(int var1, int var2, int var3, int var4, int var5, int var6) { int var12 = this.getDisplayY() - var6 / 2 - var7; int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - if (this.method2378(var8, var9, var13, var14, var3, var4)) { + if (this.method2403(var8, var9, var13, var14, var3, var4)) { if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { Arrays.fill(this.sprite.pixels, 0); } else { @@ -779,26 +768,26 @@ void method2379(int var1, int var2, int var3, int var4, int var5, int var6) { this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - UserComparator7.field1171.method1934(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field3997 = Client.field364; - var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + class390.field3656.method1965(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field4005 = Client.field369; + var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); } Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); if (var10 == 1.0F) { - this.sprite.method2659(var13, var14, 192); + this.sprite.method2678(var13, var14, 192); } else { - this.sprite.method2662(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); + this.sprite.method2681(var13, var14, (int)((float)var8 * var10), (int)(var10 * (float)var9), 192); } } } - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "1644929634" + garbageValue = "1287385022" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { @@ -814,20 +803,20 @@ public void drawOverview(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1428442334" + garbageValue = "-2033911390" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); } - @ObfuscatedName("ai") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(IIIIIB)V", - garbageValue = "-13" + garbageValue = "4" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { @@ -837,13 +826,13 @@ void drawLoading(int var1, int var2, int var3, int var4, int var5) { Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); - this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); + this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); } - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)F", - garbageValue = "235261607" + garbageValue = "818777880" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { @@ -860,50 +849,50 @@ float getZoomFromPercentage(int var1) { } } - @ObfuscatedName("bd") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1760344192" + garbageValue = "-2077099147" ) @Export("getZoomLevel") public int getZoomLevel() { - if (1.0D == (double)this.zoomTarget) { + if ((double)this.zoomTarget == 1.0D) { return 25; } else if (1.5D == (double)this.zoomTarget) { return 37; } else if ((double)this.zoomTarget == 2.0D) { return 50; - } else if ((double)this.zoomTarget == 3.0D) { + } else if (3.0D == (double)this.zoomTarget) { return 75; } else { return 4.0D == (double)this.zoomTarget ? 100 : 200; } } - @ObfuscatedName("bb") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "4429" + descriptor = "(B)V", + garbageValue = "25" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); } - @ObfuscatedName("bn") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "39" + garbageValue = "-9" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); } - @ObfuscatedName("ba") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(II)Ljs;", - garbageValue = "-677998757" + descriptor = "(IB)Ljf;", + garbageValue = "-2" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { @@ -921,10 +910,10 @@ public WorldMapArea getMapArea(int var1) { return var3; } - @ObfuscatedName("bf") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "8" + garbageValue = "-48" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -934,10 +923,10 @@ public void setWorldMapPositionTarget(int var1, int var2) { } } - @ObfuscatedName("bs") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-2050238957" + garbageValue = "-2049902032" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -948,10 +937,10 @@ public void setWorldMapPositionTargetInstant(int var1, int var2) { } } - @ObfuscatedName("bp") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "113" + descriptor = "(IIII)V", + garbageValue = "-2060098285" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -964,10 +953,10 @@ public void jumpToSourceCoord(int var1, int var2, int var3) { } } - @ObfuscatedName("bv") + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-149555116" + garbageValue = "-843499026" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -980,60 +969,60 @@ public void jumpToSourceCoordInstant(int var1, int var2, int var3) { } } - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1246259080" + garbageValue = "825863248" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } - @ObfuscatedName("bo") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1454089016" + garbageValue = "388146570" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } - @ObfuscatedName("br") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(I)Lmr;", - garbageValue = "1323166356" + descriptor = "(I)Lmc;", + garbageValue = "1721090019" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2052030046" + garbageValue = "-866759946" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; } - @ObfuscatedName("be") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-640816926" + garbageValue = "1144156363" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; } - @ObfuscatedName("bc") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-1" + descriptor = "(II)V", + garbageValue = "368918336" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1043,20 +1032,20 @@ public void setMaxFlashCount(int var1) { } - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-714878739" + descriptor = "(B)V", + garbageValue = "74" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; } - @ObfuscatedName("bu") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1573369033" + descriptor = "(IS)V", + garbageValue = "-30765" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1066,30 +1055,30 @@ public void setCyclesPerFlash(int var1) { } - @ObfuscatedName("bk") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-23" + descriptor = "(I)V", + garbageValue = "1849662360" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; } - @ObfuscatedName("bz") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "32" + descriptor = "(ZI)V", + garbageValue = "21297146" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; } - @ObfuscatedName("bx") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1425125593" + garbageValue = "1601393714" ) @Export("flashElement") public void flashElement(int var1) { @@ -1099,10 +1088,10 @@ public void flashElement(int var1) { this.flashCycle = 0; } - @ObfuscatedName("bh") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "80" + descriptor = "(II)V", + garbageValue = "1527059240" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1110,38 +1099,38 @@ public void flashCategory(int var1) { this.flashCount = 0; this.flashCycle = 0; - for (int var2 = 0; var2 < Decimator.WorldMapElement_count; ++var2) { - if (SequenceDefinition.WorldMapElement_get(var2) != null && SequenceDefinition.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(SequenceDefinition.WorldMapElement_get(var2).objectId); + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { + if (class138.WorldMapElement_get(var2) != null && class138.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(class138.WorldMapElement_get(var2).objectId); } } } - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1166571432" + garbageValue = "2116976270" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; } - @ObfuscatedName("bl") + @ObfuscatedName("bx") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-164706283" + garbageValue = "1671616581" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; } - @ObfuscatedName("bt") + @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "4" + garbageValue = "123" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1151,13 +1140,13 @@ public void disableElement(int var1, boolean var2) { this.enabledElements.remove(var1); } - this.method2411(); + this.method2436(); } - @ObfuscatedName("by") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "-1" + garbageValue = "-9" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1167,9 +1156,9 @@ public void setCategoryDisabled(int var1, boolean var2) { this.enabledCategories.remove(var1); } - for (int var3 = 0; var3 < Decimator.WorldMapElement_count; ++var3) { - if (SequenceDefinition.WorldMapElement_get(var3) != null && SequenceDefinition.WorldMapElement_get(var3).category == var1) { - int var4 = SequenceDefinition.WorldMapElement_get(var3).objectId; + for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { + if (class138.WorldMapElement_get(var3) != null && class138.WorldMapElement_get(var3).category == var1) { + int var4 = class138.WorldMapElement_get(var3).objectId; if (!var2) { this.enabledElementIds.add(var4); } else { @@ -1178,33 +1167,33 @@ public void setCategoryDisabled(int var1, boolean var2) { } } - this.method2411(); + this.method2436(); } - @ObfuscatedName("bg") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2113017491" + garbageValue = "-441970496" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; } - @ObfuscatedName("bj") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1784383589" + descriptor = "(IB)Z", + garbageValue = "115" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); } - @ObfuscatedName("ct") + @ObfuscatedName("cw") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1533983317" + garbageValue = "-638712237" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { @@ -1213,26 +1202,26 @@ public boolean isCategoryDisabled(int var1) { @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "77" + descriptor = "(I)V", + garbageValue = "-444126949" ) - void method2411() { - this.field4000.clear(); - this.field4000.addAll(this.enabledElements); - this.field4000.addAll(this.enabledElementIds); + void method2436() { + this.field4012.clear(); + this.field4012.addAll(this.enabledElements); + this.field4012.addAll(this.enabledElementIds); } - @ObfuscatedName("cz") + @ObfuscatedName("cm") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "1942190894" + garbageValue = "2039788697" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.cacheLoader.isLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); - List var9 = this.worldMapManager.method1447(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); + List var9 = this.worldMapManager.method1475(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); @@ -1243,12 +1232,12 @@ public void addElementMenuOptions(int var1, int var2, int var3, int var4, int va } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = SequenceDefinition.WorldMapElement_get(var11.getElement()); + WorldMapElement var12 = class138.WorldMapElement_get(var11.getElement()); var13 = false; for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { if (var12.menuActions[var14] != null) { - JagexCache.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + class385.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); var13 = true; } } @@ -1258,12 +1247,12 @@ public void addElementMenuOptions(int var1, int var2, int var3, int var4, int va } } - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "(ILmr;B)Lmr;", - garbageValue = "1" + descriptor = "(ILmc;I)Lmc;", + garbageValue = "501302871" ) - public Coord method2413(int var1, Coord var2) { + public Coord method2438(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { @@ -1289,7 +1278,7 @@ public Coord method2413(int var1, Coord var2) { var8 = (AbstractWorldMapIcon)var7.next(); int var9 = var8.coord2.x - var2.x; int var10 = var8.coord2.y - var2.y; - var11 = var10 * var10 + var9 * var9; + var11 = var9 * var9 + var10 * var10; if (var11 == 0) { return var8.coord2; } @@ -1306,8 +1295,8 @@ public Coord method2413(int var1, Coord var2) { @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(IILmr;Lmr;B)V", - garbageValue = "123" + descriptor = "(IILmc;Lmc;I)V", + garbageValue = "-634310433" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1331,13 +1320,13 @@ public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { var5.setType(14); } - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var5); + WorldMapSection1.runScriptEvent(var5); } - @ObfuscatedName("cj") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(S)Lkv;", - garbageValue = "-27920" + descriptor = "(I)Lkp;", + garbageValue = "1868927893" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { @@ -1347,23 +1336,23 @@ public AbstractWorldMapIcon iconStart() { return null; } else { HashMap var1 = this.worldMapManager.buildIcons(); - this.field4007 = new LinkedList(); + this.field4019 = new LinkedList(); Iterator var2 = var1.values().iterator(); while (var2.hasNext()) { List var3 = (List)var2.next(); - this.field4007.addAll(var3); + this.field4019.addAll(var3); } - this.iconIterator = this.field4007.iterator(); + this.iconIterator = this.field4019.iterator(); return this.iconNext(); } } - @ObfuscatedName("cn") + @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "(I)Lkv;", - garbageValue = "1531693993" + descriptor = "(I)Lkp;", + garbageValue = "-4783763" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { @@ -1383,22 +1372,335 @@ public AbstractWorldMapIcon iconNext() { } } - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lnd;IIB)Lud;", - garbageValue = "0" + descriptor = "(Lmi;I[B[BI)V", + garbageValue = "359324490" ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); - boolean var3; - if (var4 == null) { - var3 = false; + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field2977 == null) { + if (var2 == null) { + return; + } + + var0.field2977 = new byte[11][]; + var0.field2978 = new byte[11][]; + var0.field3047 = new int[11]; + var0.field3046 = new int[11]; + } + + var0.field2977[var1] = var2; + if (var2 != null) { + var0.field2969 = true; } else { - VarbitComposition.SpriteBuffer_decode(var4); - var3 = true; + var0.field2969 = false; + + for (int var4 = 0; var4 < var0.field2977.length; ++var4) { + if (var0.field2977[var4] != null) { + var0.field2969 = true; + break; + } + } + } + + var0.field2978[var1] = var3; + } + + @ObfuscatedName("kr") + @ObfuscatedSignature( + descriptor = "(IIIIIIIII)V", + garbageValue = "-1305820605" + ) + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { + if (Client.isLowDetail && var0 != HealthBar.Client_plane) { + return; + } + + long var8 = 0L; + boolean var10 = true; + boolean var11 = false; + boolean var12 = false; + if (var1 == 0) { + var8 = class130.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { + var8 = class130.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { + var8 = class130.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { + var8 = class130.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var13; + if (var8 != 0L) { + var13 = class130.scene.getObjectFlags(var0, var2, var3, var8); + int var41 = InvDefinition.Entity_unpackID(var8); + int var42 = var13 & 31; + int var43 = var13 >> 6 & 3; + ObjectComposition var14; + if (var1 == 0) { + class130.scene.removeBoundaryObject(var0, var2, var3); + var14 = WorldMapElement.getObjectDefinition(var41); + if (var14.interactType != 0) { + Client.collisionMaps[var0].method1118(var2, var3, var42, var43, var14.boolean1); + } + } + + if (var1 == 1) { + class130.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { + class130.scene.removeGameObject(var0, var2, var3); + var14 = WorldMapElement.getObjectDefinition(var41); + if (var2 + var14.sizeX > 103 || var3 + var14.sizeX > 103 || var2 + var14.sizeY > 103 || var3 + var14.sizeY > 103) { + return; + } + + if (var14.interactType != 0) { + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var14.sizeX, var14.sizeY, var43, var14.boolean1); + } + } + + if (var1 == 3) { + class130.scene.removeFloorDecoration(var0, var2, var3); + var14 = WorldMapElement.getObjectDefinition(var41); + if (var14.interactType == 1) { + Client.collisionMaps[var0].method1121(var2, var3); + } + } + } + + if (var4 >= 0) { + var13 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var13 = var0 + 1; + } + + Scene var44 = class130.scene; + CollisionMap var15 = Client.collisionMaps[var0]; + ObjectComposition var16 = WorldMapElement.getObjectDefinition(var4); + int var17 = var7 >= 0 ? var7 : var16.animationId * -888756473 * -671344969; + int var18; + int var19; + if (var5 != 1 && var5 != 3) { + var18 = var16.sizeX; + var19 = var16.sizeY; + } else { + var18 = var16.sizeY; + var19 = var16.sizeX; + } + + int var20; + int var21; + if (var18 + var2 <= 104) { + var20 = (var18 >> 1) + var2; + var21 = var2 + (var18 + 1 >> 1); + } else { + var20 = var2; + var21 = var2 + 1; + } + + int var22; + int var23; + if (var3 + var19 <= 104) { + var22 = var3 + (var19 >> 1); + var23 = var3 + (var19 + 1 >> 1); + } else { + var22 = var3; + var23 = var3 + 1; + } + + int[][] var24 = Tiles.Tiles_heights[var13]; + int var25 = var24[var21][var22] + var24[var20][var22] + var24[var20][var23] + var24[var21][var23] >> 2; + int var26 = (var2 << 7) + (var18 << 6); + int var27 = (var3 << 7) + (var19 << 6); + long var28 = FontName.calculateTag(var2, var3, 2, var16.int1 == 0, var4); + int var30 = (var5 << 6) + var6; + if (var16.int3 == 1) { + var30 += 256; + } + + Object var31; + if (var6 == 22) { + if (var17 == -1 && var16.transforms == null) { + var31 = var16.getModel(22, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 22, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.newFloorDecoration(var0, var2, var3, var25, (Renderable)var31, var28, var30); + if (var16.interactType == 1) { + var15.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var17 == -1 && var16.transforms == null) { + var31 = var16.getModel(var6, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, var6, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.method1243(var0, var2, var3, var25, 1, 1, (Renderable)var31, 0, var28, var30); + if (var16.interactType != 0) { + var15.addGameObject(var2, var3, var18, var19, var16.boolean1); + } + } else if (var6 == 0) { + if (var17 == -1 && var16.transforms == null) { + var31 = var16.getModel(0, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 0, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field844[var5], 0, var28, var30); + if (var16.interactType != 0) { + var15.method1113(var2, var3, var6, var5, var16.boolean1); + } + } else if (var6 == 1) { + if (var17 == -1 && var16.transforms == null) { + var31 = var16.getModel(1, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 1, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field840[var5], 0, var28, var30); + if (var16.interactType != 0) { + var15.method1113(var2, var3, var6, var5, var16.boolean1); + } + } else { + int var37; + if (var6 == 2) { + var37 = var5 + 1 & 3; + Object var32; + Object var33; + if (var17 == -1 && var16.transforms == null) { + var32 = var16.getModel(2, var5 + 4, var24, var26, var25, var27); + var33 = var16.getModel(2, var37, var24, var26, var25, var27); + } else { + var32 = new DynamicObject(var4, 2, var5 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + var33 = new DynamicObject(var4, 2, var37, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var32, (Renderable)var33, Tiles.field844[var5], Tiles.field844[var37], var28, var30); + if (var16.interactType != 0) { + var15.method1113(var2, var3, var6, var5, var16.boolean1); + } + } else if (var6 == 3) { + if (var17 == -1 && var16.transforms == null) { + var31 = var16.getModel(3, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 3, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field840[var5], 0, var28, var30); + if (var16.interactType != 0) { + var15.method1113(var2, var3, var6, var5, var16.boolean1); + } + } else if (var6 == 9) { + if (var17 == -1 && var16.transforms == null) { + var31 = var16.getModel(var6, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, var6, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.method1243(var0, var2, var3, var25, 1, 1, (Renderable)var31, 0, var28, var30); + if (var16.interactType != 0) { + var15.addGameObject(var2, var3, var18, var19, var16.boolean1); + } + } else if (var6 == 4) { + if (var17 == -1 && var16.transforms == null) { + var31 = var16.getModel(4, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 4, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field844[var5], 0, 0, 0, var28, var30); + } else { + Object var34; + long var38; + if (var6 == 5) { + var37 = 16; + var38 = var44.getBoundaryObjectTag(var0, var2, var3); + if (var38 != 0L) { + var37 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var38)).int2; + } + + if (var17 == -1 && var16.transforms == null) { + var34 = var16.getModel(4, var5, var24, var26, var25, var27); + } else { + var34 = new DynamicObject(var4, 4, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)null, Tiles.field844[var5], 0, var37 * Tiles.field842[var5], var37 * Tiles.field845[var5], var28, var30); + } else if (var6 == 6) { + var37 = 8; + var38 = var44.getBoundaryObjectTag(var0, var2, var3); + if (var38 != 0L) { + var37 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var38)).int2 / 2; + } + + if (var17 == -1 && var16.transforms == null) { + var34 = var16.getModel(4, var5 + 4, var24, var26, var25, var27); + } else { + var34 = new DynamicObject(var4, 4, var5 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)null, 256, var5, var37 * Tiles.field841[var5], var37 * Tiles.field843[var5], var28, var30); + } else if (var6 == 7) { + int var40 = var5 + 2 & 3; + if (var17 == -1 && var16.transforms == null) { + var31 = var16.getModel(4, var40 + 4, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 4, var40 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, 256, var40, 0, 0, var28, var30); + } else if (var6 == 8) { + var37 = 8; + var38 = var44.getBoundaryObjectTag(var0, var2, var3); + if (0L != var38) { + var37 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var38)).int2 / 2; + } + + int var36 = var5 + 2 & 3; + Object var35; + if (var17 == -1 && var16.transforms == null) { + var34 = var16.getModel(4, var5 + 4, var24, var26, var25, var27); + var35 = var16.getModel(4, var36 + 4, var24, var26, var25, var27); + } else { + var34 = new DynamicObject(var4, 4, var5 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + var35 = new DynamicObject(var4, 4, var36 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)var35, 256, var5, var37 * Tiles.field841[var5], var37 * Tiles.field843[var5], var28, var30); + } + } + } + } else { + if (var17 == -1 && var16.transforms == null) { + var31 = var16.getModel(10, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 10, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); + } + + if (var31 != null) { + var44.method1243(var0, var2, var3, var25, var18, var19, (Renderable)var31, var6 == 11 ? 256 : 0, var28, var30); + } + + if (var16.interactType != 0) { + var15.addGameObject(var2, var3, var18, var19, var16.boolean1); + } + } + } } - return !var3 ? null : FileSystem.method905(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapArchiveLoader.java b/osrs/src/main/java/WorldMapArchiveLoader.java index 5bae8b05c..77edf91d0 100644 --- a/osrs/src/main/java/WorldMapArchiveLoader.java +++ b/osrs/src/main/java/WorldMapArchiveLoader.java @@ -3,30 +3,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("st") +@ObfuscatedName("sb") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("ak") - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("cacheName") String cacheName; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Lnd;)V" + descriptor = "(Lnu;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; @@ -34,10 +31,10 @@ public class WorldMapArchiveLoader { this.archive = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1672803687" + garbageValue = "-1398397545" ) @Export("reset") void reset(String var1) { @@ -51,10 +48,10 @@ void reset(String var1) { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "6387" + descriptor = "(I)I", + garbageValue = "252910623" ) @Export("load") int load() { @@ -63,7 +60,7 @@ int load() { this.loaded = true; } else { if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2450.name, this.cacheName)) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2469.name, this.cacheName)) { return this.percentLoaded; } @@ -71,7 +68,7 @@ int load() { } if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field2447.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2447.name, this.cacheName)) { + if (this.archive.isValidFileName(WorldMapCacheName.field2470.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2470.name, this.cacheName)) { return this.percentLoaded; } @@ -79,7 +76,7 @@ int load() { } if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2448.name)) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2468.name)) { return this.percentLoaded; } @@ -91,23 +88,32 @@ int load() { return this.percentLoaded; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "114" + garbageValue = "103" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "125" + descriptor = "(I)I", + garbageValue = "-1879178762" ) @Export("getPercentLoaded") int getPercentLoaded() { return this.percentLoaded; } -} + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Lnu;IIB)[Lui;", + garbageValue = "-50" + ) + public static SpritePixels[] method2379(AbstractArchive var0, int var1, int var2) { + return !ApproximateRouteStrategy.method345(var0, var1, var2) ? null : ClientPacket.method1608(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapArea.java b/osrs/src/main/java/WorldMapArea.java index 1328395b4..05ed179b3 100644 --- a/osrs/src/main/java/WorldMapArea.java +++ b/osrs/src/main/java/WorldMapArea.java @@ -1,50 +1,53 @@ -import java.util.Iterator; -import java.util.LinkedList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +import java.util.Iterator; +import java.util.LinkedList; + +@ObfuscatedName("jf") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("aw") + @ObfuscatedName("op") + static int field2343; + @ObfuscatedName("au") @Export("id") int id; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("internalName") String internalName; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("externalName") String externalName; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("zoom") int zoom; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmc;" ) @Export("origin") Coord origin; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("regionLowX") int regionLowX; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("regionHighX") int regionHighX; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("regionLowY") int regionLowY; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("regionHighY") int regionHighY; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("isMain") boolean isMain; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("sections") LinkedList sections; @@ -60,10 +63,10 @@ public WorldMapArea() { this.isMain = false; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "1472949028" + descriptor = "(Ltm;IB)V", + garbageValue = "-21" ) @Export("read") public void read(Buffer var1, int var2) { @@ -85,29 +88,29 @@ public void read(Buffer var1, int var2) { this.setBounds(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;I)Lkz;", - garbageValue = "2141604791" + descriptor = "(Ltm;I)Lkw;", + garbageValue = "2096840833" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE2}; - WorldMapSectionType var4 = (WorldMapSectionType)ClientPreferences.findEnumerated(var3, var2); + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE3}; + WorldMapSectionType var4 = (WorldMapSectionType)KeyHandler.findEnumerated(var3, var2); Object var5 = null; switch(var4.type) { case 0: - var5 = new WorldMapSection1(); + var5 = new class260(); break; case 1: - var5 = new WorldMapSection2(); + var5 = new WorldMapSection0(); break; case 2: - var5 = new class261(); + var5 = new WorldMapSection2(); break; case 3: - var5 = new WorldMapSection0(); + var5 = new WorldMapSection1(); break; default: throw new IllegalStateException(""); @@ -117,10 +120,10 @@ WorldMapSection readWorldMapSection(Buffer var1) { return (WorldMapSection)var5; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "2035965907" + garbageValue = "367578160" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -138,10 +141,10 @@ public boolean containsCoord(int var1, int var2, int var3) { return true; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1924447461" + garbageValue = "770144654" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -169,10 +172,10 @@ public boolean containsPosition(int var1, int var2) { } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "-40" + descriptor = "(IIII)[I", + garbageValue = "-1546478082" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -190,10 +193,10 @@ public int[] position(int var1, int var2, int var3) { return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(III)Lmr;", - garbageValue = "322661377" + descriptor = "(III)Lmc;", + garbageValue = "1756558235" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -211,10 +214,10 @@ public Coord coord(int var1, int var2) { return var4.coord(var1, var2); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2141810509" + garbageValue = "-338264651" ) @Export("setBounds") void setBounds() { @@ -227,165 +230,226 @@ void setBounds() { } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-104" + descriptor = "(I)I", + garbageValue = "-846319025" ) @Export("getId") public int getId() { return this.id; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "12" + descriptor = "(I)Z", + garbageValue = "-1901446023" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1427046787" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "22" ) @Export("getInternalName") public String getInternalName() { return this.internalName; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "7" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1846298842" ) @Export("getExternalName") public String getExternalName() { return this.externalName; } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-128" + descriptor = "(I)I", + garbageValue = "-797170066" ) @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "69" ) @Export("getZoom") public int getZoom() { return this.zoom; } - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-77" + descriptor = "(I)I", + garbageValue = "1630610237" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1981016427" + descriptor = "(B)I", + garbageValue = "7" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; } - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-389390805" + descriptor = "(B)I", + garbageValue = "-96" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-155817671" + garbageValue = "-439375988" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; } - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1352292707" + garbageValue = "-2074797827" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-101" + garbageValue = "123" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; } - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "32" + garbageValue = "0" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("ac") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)Lmr;", - garbageValue = "117" + descriptor = "(I)Lmc;", + garbageValue = "-1932226468" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1522833237" + descriptor = "(II)V", + garbageValue = "1197510480" ) - static final boolean method1383(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; + static void method1413(int var0) { } - @ObfuscatedName("lr") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1581255918" + descriptor = "(B)Z", + garbageValue = "-41" ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = class503.getPacketBufferNode(ClientPacket.CONTINUE, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeShortAddLE(var1); - var2.packetBuffer.writeIntME(var0); - Client.packetWriter.addNode(var2); + public static boolean method1425() { + boolean var0 = false; + boolean var1 = false; + if (!class305.field2771.isEmpty()) { + SongTask var2 = (SongTask)class305.field2771.get(0); + if (var2 == null) { + class305.field2771.remove(0); + } else if (var2.vmethod2142()) { + if (var2.method2132()) { + System.out.println("Error in midimanager.service: " + var2.method2135()); + var0 = true; + } else { + if (var2.method2136() != null) { + class305.field2771.add(1, var2.method2136()); + } + + var1 = var2.method2134(); + } + + class305.field2771.remove(0); + } else { + var1 = var2.method2134(); + } + } + + if (var0) { + class305.field2771.clear(); + ByteArrayPool.method2148(); + } + + return var1; + } + + @ObfuscatedName("mv") + @ObfuscatedSignature( + descriptor = "(Lmi;IIB)V", + garbageValue = "116" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { + var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + } + + if (var0.yAlignment == 0) { + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; + } else if (var0.yAlignment == 4) { + var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapAreaData.java b/osrs/src/main/java/WorldMapAreaData.java index b007e5931..770d0dd3b 100644 --- a/osrs/src/main/java/WorldMapAreaData.java +++ b/osrs/src/main/java/WorldMapAreaData.java @@ -1,33 +1,32 @@ -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; + +@ObfuscatedName("kv") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("wi") - static List field2453; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("iconList") List iconList; WorldMapAreaData() { } - @ObfuscatedName("cv") + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "(Lty;Lty;IZB)V", - garbageValue = "-92" + descriptor = "(Ltm;Ltm;IZI)V", + garbageValue = "1963374909" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -66,10 +65,10 @@ void init(Buffer var1, Buffer var2, int var3, boolean var4) { this.initIconsList(var2, var4); } - @ObfuscatedName("cc") + @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "(Lty;ZB)V", - garbageValue = "7" + descriptor = "(Ltm;ZB)V", + garbageValue = "-123" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -77,7 +76,7 @@ void initIconsList(Buffer var1, boolean var2) { int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method2543(); + int var5 = var1.method2563(); Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { @@ -87,96 +86,73 @@ void initIconsList(Buffer var1, boolean var2) { } - @ObfuscatedName("lo") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Ldf;IIIS)V", - garbageValue = "10482" + descriptor = "(ZI)V", + garbageValue = "2073842388" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (class136.localPlayer != var0) { - if (Client.menuOptionsCount < 400) { - String var4; - int var7; - if (var0.skillLevel == 0) { - String var5 = var0.actions[0] + var0.username + var0.actions[1]; - var7 = var0.combatLevel; - int var8 = class136.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = MusicPatchPcmStream.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = MusicPatchPcmStream.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = MusicPatchPcmStream.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = MusicPatchPcmStream.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = MusicPatchPcmStream.colorStartTag(65280); - } else if (var9 > 6) { - var6 = MusicPatchPcmStream.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = MusicPatchPcmStream.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = MusicPatchPcmStream.colorStartTag(12648192); - } else { - var6 = MusicPatchPcmStream.colorStartTag(16776960); - } - - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; - } + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + if (!class219.client.method352() && !class219.client.method354() && !class219.client.method353()) { + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + PcmPlayer.method212(2); + if (var0) { + Login.Login_password = ""; + } - int var10; - if (Client.isItemSelected == 1) { - JagexCache.insertMenuItemNoShift("Use", Client.field595 + " " + "->" + " " + MusicPatchPcmStream.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((PcmPlayer.selectedSpellFlags & 8) == 8) { - JagexCache.insertMenuItemNoShift(Client.field597, Client.field596 + " " + "->" + " " + MusicPatchPcmStream.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (class449.clientPreferences.getUsernameToRemember() != null) { + Login.Login_username = class449.clientPreferences.getUsernameToRemember(); + Client.Login_isUsernameRemembered = true; } else { - for (var10 = 7; var10 >= 0; --var10) { - if (Client.playerMenuActions[var10] != null) { - short var11 = 0; - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { - continue; - } - - if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class136.localPlayer.combatLevel) { - var11 = 2000; - } - - if (class136.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == class136.localPlayer.team) { - var11 = 2000; - } else { - var11 = 0; - } - } else if (AttackOption.field1090 == Client.playerAttackOption && var0.isClanMember()) { - var11 = 2000; - } - } else if (Client.playerOptionsPriorities[var10]) { - var11 = 2000; - } - - boolean var12 = false; - var7 = Client.playerMenuOpcodes[var10] + var11; - JagexCache.insertMenuItemNoShift(Client.playerMenuActions[var10], MusicPatchPcmStream.colorStartTag(16777215) + var4, var7, var1, var2, var3); - } - } + Client.Login_isUsernameRemembered = false; } + } - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { - if (Client.menuOpcodes[var10] == 23) { - Client.menuTargets[var10] = MusicPatchPcmStream.colorStartTag(16777215) + var4; - break; - } - } + ObjectComposition.method1042(); + } else { + PcmPlayer.method212(10); + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "54" + ) + static void method1574(boolean var0) { + byte var1 = 0; + boolean var2 = class449.clientPreferences.method564() >= Client.param21; + if (!var2) { + var1 = 12; + } else if (class219.client.method352() || class219.client.method354() || class219.client.method353()) { + var1 = 10; + } + PcmPlayer.method212(var1); + if (var0) { + Login.Login_username = ""; + Login.Login_password = ""; + class503.field4107 = 0; + class369.otp = ""; + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (class449.clientPreferences.getUsernameToRemember() != null) { + Login.Login_username = class449.clientPreferences.getUsernameToRemember(); + Client.Login_isUsernameRemembered = true; + } else { + Client.Login_isUsernameRemembered = false; } } + + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapCacheName.java b/osrs/src/main/java/WorldMapCacheName.java index e89eb6a30..da8893bd4 100644 --- a/osrs/src/main/java/WorldMapCacheName.java +++ b/osrs/src/main/java/WorldMapCacheName.java @@ -1,63 +1,70 @@ -import java.util.ArrayList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("kr") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lkp;" + descriptor = "Lkr;" ) - public static final WorldMapCacheName field2449; - @ObfuscatedName("ay") + public static final WorldMapCacheName field2471; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lkp;" + descriptor = "Lkr;" ) - public static final WorldMapCacheName field2450; - @ObfuscatedName("ar") + public static final WorldMapCacheName field2469; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lkp;" + descriptor = "Lkr;" ) - public static final WorldMapCacheName field2447; - @ObfuscatedName("am") + public static final WorldMapCacheName field2470; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lkp;" + descriptor = "Lkr;" ) - static final WorldMapCacheName field2451; - @ObfuscatedName("as") + static final WorldMapCacheName field2472; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lkp;" + descriptor = "Lkr;" ) - public static final WorldMapCacheName field2448; - @ObfuscatedName("aj") + public static final WorldMapCacheName field2468; + @ObfuscatedName("ai") @Export("name") public final String name; static { - field2449 = new WorldMapCacheName("details"); - field2450 = new WorldMapCacheName("compositemap"); - field2447 = new WorldMapCacheName("compositetexture"); - field2451 = new WorldMapCacheName("area"); - field2448 = new WorldMapCacheName("labels"); + field2471 = new WorldMapCacheName("details"); + field2469 = new WorldMapCacheName("compositemap"); + field2470 = new WorldMapCacheName("compositetexture"); + field2472 = new WorldMapCacheName("area"); + field2468 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { this.name = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;Lnd;Ljava/util/ArrayList;B)Z", - garbageValue = "1" + descriptor = "(IB)Lhm;", + garbageValue = "101" ) - public static boolean method1521(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, ArrayList var3) { - class306.musicPatchesArchive = var0; - class306.musicSamplesArchive = var1; - class306.soundEffectsArchive = var2; - class306.midiPcmStream = var3; - return true; + public static HitSplatDefinition method1564(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); + return var1; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapData_0.java b/osrs/src/main/java/WorldMapData_0.java index 56d66f762..61da40e0e 100644 --- a/osrs/src/main/java/WorldMapData_0.java +++ b/osrs/src/main/java/WorldMapData_0.java @@ -3,55 +3,63 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("jx") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { WorldMapData_0() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "1035251675" + descriptor = "(Ltm;B)V", + garbageValue = "0" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - super.field2410 = var1.readUnsignedByte(); - super.planes = var1.readUnsignedByte(); - super.field2408 = var1.readUnsignedShort(); - super.field2405 = var1.readUnsignedShort(); - super.regionX = var1.readUnsignedShort(); - super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method2543(); - super.fileId = var1.method2543(); + if (var2 != class271.field2456.field2457) { + throw new IllegalStateException(""); + } else { + super.field2428 = var1.readUnsignedByte(); + super.planes = var1.readUnsignedByte(); + super.field2429 = var1.readUnsignedShort(); + super.field2432 = var1.readUnsignedShort(); + super.regionX = var1.readUnsignedShort(); + super.regionY = var1.readUnsignedShort(); + super.groupId = var1.method2563(); + super.fileId = var1.method2563(); + } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "81" + descriptor = "(Ltm;I)V", + garbageValue = "2049371979" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field2402 = new byte[super.planes][64][64]; - super.field2403 = new byte[super.planes][64][64]; + super.field2427 = new byte[super.planes][64][64]; + super.field2426 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - int var3 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); - if (var3 == super.regionX && var4 == super.regionY) { - for (int var5 = 0; var5 < 64; ++var5) { - for (int var6 = 0; var6 < 64; ++var6) { - this.readTile(var5, var6, var1); + if (var2 != class270.field2453.field2454) { + throw new IllegalStateException(""); + } else { + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY) { + for (int var5 = 0; var5 < 64; ++var5) { + for (int var6 = 0; var6 < 64; ++var6) { + this.readTile(var5, var6, var1); + } } - } - } else { - throw new IllegalStateException(""); + } else { + throw new IllegalStateException(""); + } } } @@ -62,7 +70,7 @@ public boolean equals(Object var1) { return false; } else { WorldMapData_0 var2 = (WorldMapData_0)var1; - return var2.regionX == super.regionX && var2.regionY == super.regionY; + return super.regionX == var2.regionX && super.regionY == var2.regionY; } } @@ -72,289 +80,62 @@ public int hashCode() { return super.regionX | super.regionY << 8; } - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2074287323" - ) - static void method1363() { - if (Login.clearLoginScreen) { - Login.titleboxSprite = null; - Login.titlebuttonSprite = null; - Login.runesSprite = null; - SongTask.leftTitleSprite = null; - ScriptFrame.rightTitleSprite = null; - Login.logoSprite = null; - class304.title_muteSprite = null; - WorldMapLabelSize.options_buttons_0Sprite = null; - class11.options_buttons_2Sprite = null; - class131.worldSelectBackSprites = null; - class292.worldSelectFlagSprites = null; - class30.worldSelectArrows = null; - MoveSpeed.worldSelectStars = null; - class465.field3894 = null; - class165.field1419.method536(); - RouteStrategy.method1107(0, 100); - JagNetThread var0 = class153.field1356; - var0.method1896(true); - Login.clearLoginScreen = false; + @ObfuscatedName("ae") + static final void method1390(long var0) { + try { + Thread.sleep(var0); + } catch (InterruptedException var3) { } + } - @ObfuscatedName("ad") + @ObfuscatedName("jj") @ObfuscatedSignature( - descriptor = "(Lpc;Lpc;I)V", - garbageValue = "-548197541" + descriptor = "(ZB)V", + garbageValue = "-100" ) - static void method1364(Font var0, Font var1) { - int var4; - int var5; - if (class131.worldSelectBackSprites == null) { - Archive var3 = class386.archive8; - SpritePixels[] var2; - if (!var3.isValidFileName("sl_back", "")) { - var2 = null; - } else { - var4 = var3.getGroupId("sl_back"); - var5 = var3.getFileId(var4, ""); - var2 = class453.method2294(var3, var4, var5); - } - - class131.worldSelectBackSprites = var2; - } - - if (class292.worldSelectFlagSprites == null) { - class292.worldSelectFlagSprites = DesktopPlatformInfoProvider.method2334(class386.archive8, "sl_flags", ""); - } - - if (class30.worldSelectArrows == null) { - class30.worldSelectArrows = DesktopPlatformInfoProvider.method2334(class386.archive8, "sl_arrows", ""); - } - - if (MoveSpeed.worldSelectStars == null) { - MoveSpeed.worldSelectStars = DesktopPlatformInfoProvider.method2334(class386.archive8, "sl_stars", ""); - } - - if (class47.worldSelectLeftSprite == null) { - class47.worldSelectLeftSprite = class451.SpriteBuffer_getIndexedSpriteByName(class386.archive8, "leftarrow", ""); - } - - if (FontName.worldSelectRightSprite == null) { - FontName.worldSelectRightSprite = class451.SpriteBuffer_getIndexedSpriteByName(class386.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); - if (MoveSpeed.worldSelectStars != null) { - MoveSpeed.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - MoveSpeed.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (class30.worldSelectArrows != null) { - int var22 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - class30.worldSelectArrows[2].drawAt(var22, 4); - } else { - class30.worldSelectArrows[0].drawAt(var22, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - class30.worldSelectArrows[3].drawAt(var22 + 15, 4); - } else { - class30.worldSelectArrows[1].drawAt(var22 + 15, 4); - } - - var0.draw("World", var22 + 32, 17, 16777215, -1); - int var23 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - class30.worldSelectArrows[2].drawAt(var23, 4); - } else { - class30.worldSelectArrows[0].drawAt(var23, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - class30.worldSelectArrows[3].drawAt(var23 + 15, 4); - } else { - class30.worldSelectArrows[1].drawAt(var23 + 15, 4); - } - - var0.draw("Players", var23 + 32, 17, 16777215, -1); - var4 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - class30.worldSelectArrows[2].drawAt(var4, 4); - } else { - class30.worldSelectArrows[0].drawAt(var4, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - class30.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - class30.worldSelectArrows[1].drawAt(var4 + 15, 4); - } - - var0.draw("Location", var4 + 32, 17, 16777215, -1); - var5 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - class30.worldSelectArrows[2].drawAt(var5, 4); - } else { - class30.worldSelectArrows[0].drawAt(var5, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - class30.worldSelectArrows[3].drawAt(var5 + 15, 4); - } else { - class30.worldSelectArrows[1].drawAt(var5 + 15, 4); - } - - var0.draw("Type", var5 + 32, 17, 16777215, -1); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); - Login.hoveredWorldIndex = -1; - if (class131.worldSelectBackSprites != null) { - byte var26 = 88; - byte var27 = 19; - var4 = 765 / (var26 + 1) - 1; - var5 = 480 / (var27 + 1); - - int var6; - int var7; - do { - var6 = var5; - var7 = var4; - if (var5 * (var4 - 1) >= World.World_count) { - --var4; + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { + NPC var2 = Client.npcs[Client.npcIndices[var1]]; + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { + int var3 = var2.x >> 7; + int var4 = var2.y >> 7; + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { + if (var2.field976 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; + } + + long var5 = FontName.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + class130.scene.drawEntity(HealthBar.Client_plane, var2.x, var2.y, class18.getTileHeight(var2.field976 * 64 - 64 + var2.x, var2.field976 * 64 - 64 + var2.y, HealthBar.Client_plane), var2.field976 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); } - - if (var4 * (var5 - 1) >= World.World_count) { - --var5; - } - - if (var4 * (var5 - 1) >= World.World_count) { - --var5; - } - } while(var5 != var6 || var4 != var7); - - var6 = (765 - var26 * var4) / (var4 + 1); - if (var6 > 5) { - var6 = 5; - } - - var7 = (480 - var27 * var5) / (var5 + 1); - if (var7 > 5) { - var7 = 5; - } - - int var8 = (765 - var26 * var4 - var6 * (var4 - 1)) / 2; - int var9 = (480 - var27 * var5 - var7 * (var5 - 1)) / 2; - int var10 = (var5 + World.World_count - 1) / var5; - Login.worldSelectPagesCount = var10 - var4; - if (class47.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - class47.worldSelectLeftSprite.drawAt(8, WorldMapArchiveLoader.canvasHeight / 2 - class47.worldSelectLeftSprite.subHeight / 2); - } - - if (FontName.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - FontName.worldSelectRightSprite.drawAt(GrandExchangeOfferTotalQuantityComparator.canvasWidth - FontName.worldSelectRightSprite.subWidth - 8, WorldMapArchiveLoader.canvasHeight / 2 - FontName.worldSelectRightSprite.subHeight / 2); - } - - int var11 = var9 + 23; - int var12 = var8 + Login.xPadding; - int var13 = 0; - boolean var14 = false; - int var15 = Login.worldSelectPage; - - int var16; - for (var16 = var15 * var5; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { - World var17 = class387.World_worlds[var16]; - boolean var18 = true; - String var19 = Integer.toString(var17.population); - if (var17.population == -1) { - var19 = "OFF"; - var18 = false; - } else if (var17.population > 1980) { - var19 = "FULL"; - var18 = false; - } - - class108 var20 = null; - int var21 = 0; - if (var17.isBeta()) { - var20 = var17.isMembersOnly() ? class108.field1128 : class108.field1114; - } else if (var17.isDeadman()) { - var20 = var17.isMembersOnly() ? class108.field1123 : class108.field1113; - } else if (var17.method399()) { - var21 = 16711680; - var20 = var17.isMembersOnly() ? class108.field1116 : class108.field1121; - } else if (var17.method401()) { - var20 = var17.isMembersOnly() ? class108.field1118 : class108.field1124; - } else if (var17.isPvp()) { - var20 = var17.isMembersOnly() ? class108.field1117 : class108.field1120; - } else if (var17.method402()) { - var20 = var17.isMembersOnly() ? class108.field1122 : class108.field1119; - } else if (var17.method403()) { - var20 = var17.isMembersOnly() ? class108.field1126 : class108.field1115; - } - - if (var20 == null || var20.field1129 >= class131.worldSelectBackSprites.length) { - var20 = var17.isMembersOnly() ? class108.field1127 : class108.field1125; - } - - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var26 + var12 && MouseHandler.MouseHandler_y < var11 + var27 && var18) { - Login.hoveredWorldIndex = var16; - class131.worldSelectBackSprites[var20.field1129].drawTransOverlayAt(var12, var11, 128, 16777215); - var14 = true; - } else { - class131.worldSelectBackSprites[var20.field1129].drawAt(var12, var11); - } - - if (class292.worldSelectFlagSprites != null) { - class292.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); - } - - var0.drawCentered(Integer.toString(var17.id), var12 + 15, var27 / 2 + var11 + 5, var21, -1); - var1.drawCentered(var19, var12 + 60, var27 / 2 + var11 + 5, 268435455, -1); - var11 = var11 + var27 + var7; - ++var13; - if (var13 >= var5) { - var11 = var9 + 23; - var12 = var12 + var26 + var6; - var13 = 0; - ++var15; - } - } - - if (var14) { - var16 = var1.stringWidth(class387.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var24 = var1.ascent + 8; - int var25 = MouseHandler.MouseHandler_y + 25; - if (var25 + var24 > 480) { - var25 = MouseHandler.MouseHandler_y - 25 - var24; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 0); - var1.drawCentered(class387.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); } } - class156.rasterProvider.drawFull(0, 0); } - @ObfuscatedName("ac") + @ObfuscatedName("lh") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)V", - garbageValue = "18" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "20" ) - static final void setFriendsRank(String var0, int var1) { - PacketBufferNode var2 = class503.getPacketBufferNode(ClientPacket.FRIEND_SETRANK, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(class501.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.writeByteSub(var1); - Client.packetWriter.addNode(var2); + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); + } + + if (var1.length() > 9) { + return " " + MoveSpeed.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + MoveSpeed.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + MoveSpeed.colorStartTag(16776960) + var1 + ""; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapData_1.java b/osrs/src/main/java/WorldMapData_1.java index 691e68f52..e3a225214 100644 --- a/osrs/src/main/java/WorldMapData_1.java +++ b/osrs/src/main/java/WorldMapData_1.java @@ -3,59 +3,69 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; + +@ObfuscatedName("jh") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("chunkX") int chunkX; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("chunkY") int chunkY; WorldMapData_1() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "5" + descriptor = "(Ltm;B)V", + garbageValue = "10" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - super.field2410 = var1.readUnsignedByte(); - super.planes = var1.readUnsignedByte(); - super.field2408 = var1.readUnsignedShort(); - super.field2405 = var1.readUnsignedShort(); - this.chunkXLow = var1.readUnsignedByte(); - this.chunkYLow = var1.readUnsignedByte(); - super.regionX = var1.readUnsignedShort(); - super.regionY = var1.readUnsignedShort(); - this.chunkX = var1.readUnsignedByte(); - this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method2543(); - super.fileId = var1.method2543(); + if (var2 != class271.field2455.field2457) { + throw new IllegalStateException(""); + } else { + super.field2428 = var1.readUnsignedByte(); + super.planes = var1.readUnsignedByte(); + super.field2429 = var1.readUnsignedShort(); + super.field2432 = var1.readUnsignedShort(); + this.chunkXLow = var1.readUnsignedByte(); + this.chunkYLow = var1.readUnsignedByte(); + super.regionX = var1.readUnsignedShort(); + super.regionY = var1.readUnsignedShort(); + this.chunkX = var1.readUnsignedByte(); + this.chunkY = var1.readUnsignedByte(); + super.groupId = var1.method2563(); + super.fileId = var1.method2563(); + } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "81" + descriptor = "(Ltm;I)V", + garbageValue = "2049371979" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field2402 = new byte[super.planes][64][64]; - super.field2403 = new byte[super.planes][64][64]; + super.field2427 = new byte[super.planes][64][64]; + super.field2426 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); int var3 = var1.readUnsignedByte(); @@ -74,40 +84,40 @@ void readGeography(Buffer var1) { } } - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-6628" + descriptor = "(I)I", + garbageValue = "-2024763677" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; } - @ObfuscatedName("ag") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2089356918" + garbageValue = "1047328997" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; } - @ObfuscatedName("az") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "91" + garbageValue = "127" ) @Export("getChunkX") int getChunkX() { return this.chunkX; } - @ObfuscatedName("av") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-972374199" + garbageValue = "1777174100" ) @Export("getChunkY") int getChunkY() { @@ -121,8 +131,8 @@ public boolean equals(Object var1) { return false; } else { WorldMapData_1 var2 = (WorldMapData_1)var1; - if (var2.regionX == super.regionX && var2.regionY == super.regionY) { - return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; + if (super.regionX == var2.regionX && var2.regionY == super.regionY) { + return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; } else { return false; } @@ -132,4 +142,104 @@ public boolean equals(Object var1) { public int hashCode() { return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "([BI)Lui;", + garbageValue = "-2044426638" + ) + public static final SpritePixels method1484(byte[] var0) { + BufferedImage var1 = null; + + try { + Class var2 = ImageIO.class; + synchronized(ImageIO.class) { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); + } + + int var6 = var1.getWidth(); + int var7 = var1.getHeight(); + int[] var4 = new int[var7 * var6]; + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var6, var7, var4, 0, var6); + var5.grabPixels(); + return new SpritePixels(var4, var6, var7); + } catch (IOException var9) { + } catch (InterruptedException var10) { + } + + return new SpritePixels(0, 0); + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IZI)Z", + garbageValue = "-1629994488" + ) + static boolean method1486(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); + + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + return false; + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + return false; + } + + if (var3) { + var10 = -var10; + } + + int var9 = var5 * var1 + var10; + if (var9 / var1 != var5) { + return false; + } + + var5 = var9; + var4 = true; + } + + return var4; + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "90675667" + ) + static void method1491() { + Login.worldSelectOpen = false; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Bounds.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + SoundSystem.logoSprite.drawAt(Login.xPadding + 382 - SoundSystem.logoSprite.subWidth / 2, 18); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapDecoration.java b/osrs/src/main/java/WorldMapDecoration.java index 3d70250d0..641d68842 100644 --- a/osrs/src/main/java/WorldMapDecoration.java +++ b/osrs/src/main/java/WorldMapDecoration.java @@ -3,21 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("kn") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("qd") - @ObfuscatedSignature( - descriptor = "[Lmt;" - ) - static Widget[] field2419; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("decoration") final int decoration; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("rotation") final int rotation; @@ -26,4 +21,169 @@ public class WorldMapDecoration { this.decoration = var2; this.rotation = var3; } -} + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Lmi;I)I", + garbageValue = "1522435265" + ) + static int method1530(Widget var0) { + if (var0.type != 11) { + --class137.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + String var1 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var0.method1835(var1); + return 1; + } + } + + @ObfuscatedName("ng") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "14" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + class113.process(); + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var1.obj != null) { + var1.set(); + } + } + + int var3 = ApproximateRouteStrategy.VarpDefinition_get(var0).type; + if (var3 != 0) { + int var2 = Varps.Varps_main[var0]; + if (var3 == 1) { + if (var2 == 1) { + Rasterizer3D.method1187(0.9D); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.9D); + UrlRequester.method653(); + class449.clientPreferences.setBrightness(0.9D); + } + + if (var2 == 2) { + Rasterizer3D.method1187(0.8D); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.8D); + UrlRequester.method653(); + class449.clientPreferences.setBrightness(0.8D); + } + + if (var2 == 3) { + HealthBarUpdate.method526(0.7D); + } + + if (var2 == 4) { + HealthBarUpdate.method526(0.6D); + } + } + + if (var3 == 3) { + if (var2 == 0) { + WorldMapEvent.method1588(255); + } + + if (var2 == 1) { + WorldMapEvent.method1588(192); + } + + if (var2 == 2) { + WorldMapEvent.method1588(128); + } + + if (var2 == 3) { + WorldMapEvent.method1588(64); + } + + if (var2 == 4) { + WorldMapEvent.method1588(0); + } + } + + if (var3 == 4) { + if (var2 == 0) { + class385.method2026(127); + } + + if (var2 == 1) { + class385.method2026(96); + } + + if (var2 == 2) { + class385.method2026(64); + } + + if (var2 == 3) { + class385.method2026(32); + } + + if (var2 == 4) { + class385.method2026(0); + } + } + + if (var3 == 5) { + Client.leftClickOpensMenu = var2 == 1; + } + + if (var3 == 6) { + Client.chatEffects = var2; + } + + if (var3 == 9) { + } + + if (var3 == 10) { + if (var2 == 0) { + class14.method44(127); + } + + if (var2 == 1) { + class14.method44(96); + } + + if (var2 == 2) { + class14.method44(64); + } + + if (var2 == 3) { + class14.method44(32); + } + + if (var2 == 4) { + class14.method44(0); + } + } + + if (var3 == 17) { + Client.followerIndex = var2 & 65535; + } + + if (var3 == 18) { + Client.playerAttackOption = (AttackOption)KeyHandler.findEnumerated(JagNetThread.method1941(), var2); + if (Client.playerAttackOption == null) { + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var3 == 19) { + if (var2 == -1) { + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; + } + } + + if (var3 == 22) { + Client.npcAttackOption = (AttackOption)KeyHandler.findEnumerated(JagNetThread.method1941(), var2); + if (Client.npcAttackOption == null) { + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapDecorationType.java b/osrs/src/main/java/WorldMapDecorationType.java index a95b86efc..4381196ff 100644 --- a/osrs/src/main/java/WorldMapDecorationType.java +++ b/osrs/src/main/java/WorldMapDecorationType.java @@ -1,129 +1,128 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("no") +@ObfuscatedName("nm") @Implements("WorldMapDecorationType") -public enum WorldMapDecorationType implements class372 { - @ObfuscatedName("aw") +public enum WorldMapDecorationType implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3109(0, 0), - @ObfuscatedName("ay") + field3123(0, 0), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3125(1, 0), - @ObfuscatedName("ar") + field3127(1, 0), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3107(2, 0), - @ObfuscatedName("am") + field3121(2, 0), + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3106(3, 0), - @ObfuscatedName("as") + field3122(3, 0), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3108(9, 2), - @ObfuscatedName("aj") + field3119(9, 2), + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3116(4, 1), - @ObfuscatedName("ag") + field3131(4, 1), + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3114(5, 1), - @ObfuscatedName("az") + field3141(5, 1), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3126(6, 1), - @ObfuscatedName("av") + field3135(6, 1), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3123(7, 1), - @ObfuscatedName("ap") + field3124(7, 1), + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3119(8, 1), - @ObfuscatedName("aq") + field3128(8, 1), + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3120(12, 2), - @ObfuscatedName("at") + field3126(12, 2), + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3121(13, 2), - @ObfuscatedName("ah") + field3136(13, 2), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3115(14, 2), - @ObfuscatedName("ax") + field3132(14, 2), + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3124(15, 2), - @ObfuscatedName("aa") + field3134(15, 2), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3110(16, 2), - @ObfuscatedName("au") + field3137(16, 2), + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3122(17, 2), - @ObfuscatedName("ae") + field3125(17, 2), + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3113(18, 2), - @ObfuscatedName("ab") + field3129(18, 2), + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3111(19, 2), - @ObfuscatedName("ad") + field3133(19, 2), + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3112(20, 2), - @ObfuscatedName("ao") + field3139(20, 2), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3118(21, 2), - @ObfuscatedName("ac") + field3130(21, 2), + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3104(10, 2), - @ObfuscatedName("ak") + field3138(10, 2), + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3105(11, 2), - @ObfuscatedName("an") + field3140(11, 2), + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnm;" ) - field3117(22, 3); + field3120(22, 3); - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("id") public final int id; @@ -135,34 +134,13 @@ public enum WorldMapDecorationType implements class372 { this.id = var3; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "48" - ) - static void method1826(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); - } - - @ObfuscatedName("nr") - @ObfuscatedSignature( - descriptor = "(Lmt;I)Z", - garbageValue = "1084852448" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapElement.java b/osrs/src/main/java/WorldMapElement.java index 2a06dfb27..0e6cf7847 100644 --- a/osrs/src/main/java/WorldMapElement.java +++ b/osrs/src/main/java/WorldMapElement.java @@ -1,78 +1,94 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hd") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("am") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "[Lhd;" + ) + @Export("WorldMapElement_cached") + public static WorldMapElement[] WorldMapElement_cached; + @ObfuscatedName("ao") + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lle;" ) @Export("WorldMapElement_cachedSprites") public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("as") + @ObfuscatedName("gu") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + static Archive field1509; + @ObfuscatedName("uc") + @Export("cameraLookAtAcceleration") + static int cameraLookAtAcceleration; + @ObfuscatedName("ac") @Export("objectId") public final int objectId; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("sprite1") public int sprite1; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("sprite2") int sprite2; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("name") public String name; - @ObfuscatedName("av") - public int field1513; - @ObfuscatedName("ap") + @ObfuscatedName("aa") + public int field1522; + @ObfuscatedName("af") @Export("textSize") public int textSize; - @ObfuscatedName("at") - public boolean field1507; - @ObfuscatedName("ah") - public boolean field1506; - @ObfuscatedName("ax") + @ObfuscatedName("aq") + public boolean field1519; + @ObfuscatedName("al") + public boolean field1518; + @ObfuscatedName("an") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("au") - int[] field1505; - @ObfuscatedName("ae") - int field1501; @ObfuscatedName("ab") - int field1499; - @ObfuscatedName("ad") - int field1500; - @ObfuscatedName("ao") - int field1503; - @ObfuscatedName("ac") + int[] field1516; + @ObfuscatedName("ag") + int field1511; + @ObfuscatedName("am") + int field1513; + @ObfuscatedName("ax") + int field1514; + @ObfuscatedName("ah") + int field1512; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lhe;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhy;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("an") - int[] field1504; - @ObfuscatedName("af") - byte[] field1498; - @ObfuscatedName("ai") + @ObfuscatedName("aj") + int[] field1517; + @ObfuscatedName("av") + byte[] field1510; + @ObfuscatedName("aw") @Export("category") public int category; @@ -84,23 +100,23 @@ public WorldMapElement(int var1) { this.sprite1 = -1; this.sprite2 = -1; this.textSize = 0; - this.field1507 = true; - this.field1506 = false; + this.field1519 = true; + this.field1518 = false; this.menuActions = new String[5]; - this.field1501 = Integer.MAX_VALUE; - this.field1499 = Integer.MAX_VALUE; - this.field1500 = Integer.MIN_VALUE; - this.field1503 = Integer.MIN_VALUE; + this.field1511 = Integer.MAX_VALUE; + this.field1513 = Integer.MAX_VALUE; + this.field1514 = Integer.MIN_VALUE; + this.field1512 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "-65" + descriptor = "(Ltm;I)V", + garbageValue = "332990063" ) @Export("decode") public void decode(Buffer var1) { @@ -114,21 +130,21 @@ public void decode(Buffer var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lty;IB)V", - garbageValue = "-112" + descriptor = "(Ltm;II)V", + garbageValue = "675267888" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.sprite1 = var1.method2543(); + this.sprite1 = var1.method2563(); } else if (var2 == 2) { - this.sprite2 = var1.method2543(); + this.sprite2 = var1.method2563(); } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.field1513 = var1.readMedium(); + this.field1522 = var1.readMedium(); } else if (var2 == 5) { var1.readMedium(); } else if (var2 == 6) { @@ -138,11 +154,11 @@ void decodeNext(Buffer var1, int var2) { if (var2 == 7) { var3 = var1.readUnsignedByte(); if ((var3 & 1) == 0) { - this.field1507 = false; + this.field1519 = false; } if ((var3 & 2) == 2) { - this.field1506 = true; + this.field1518 = true; } } else if (var2 == 8) { var1.readUnsignedByte(); @@ -150,32 +166,32 @@ void decodeNext(Buffer var1, int var2) { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); } else if (var2 == 15) { var3 = var1.readUnsignedByte(); - this.field1505 = new int[var3 * 2]; + this.field1516 = new int[var3 * 2]; int var4; for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field1505[var4] = var1.readShort(); + this.field1516[var4] = var1.readShort(); } var1.readInt(); var4 = var1.readUnsignedByte(); - this.field1504 = new int[var4]; + this.field1517 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field1504.length; ++var5) { - this.field1504[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1517.length; ++var5) { + this.field1517[var5] = var1.readInt(); } - this.field1498 = new byte[var3]; + this.field1510 = new byte[var3]; for (var5 = 0; var5 < var3; ++var5) { - this.field1498[var5] = var1.readByte(); + this.field1510[var5] = var1.readByte(); } } else if (var2 != 16) { if (var2 == 17) { this.menuTargetName = var1.readStringCp1252NullTerminated(); } else if (var2 == 18) { - var1.method2543(); + var1.method2563(); } else if (var2 == 19) { this.category = var1.readUnsignedShort(); } else if (var2 == 21) { @@ -190,59 +206,58 @@ void decodeNext(Buffer var1, int var2) { var1.readShort(); var1.readShort(); } else if (var2 == 25) { - var1.method2543(); + var1.method2563(); } else if (var2 == 28) { var1.readUnsignedByte(); } else if (var2 == 29) { - HorizontalAlignment[] var6 = new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1558, HorizontalAlignment.field1557}; - this.horizontalAlignment = (HorizontalAlignment)ClientPreferences.findEnumerated(var6, var1.readUnsignedByte()); + this.horizontalAlignment = (HorizontalAlignment)KeyHandler.findEnumerated(class113.method658(), var1.readUnsignedByte()); } else if (var2 == 30) { - this.verticalAlignment = (VerticalAlignment)ClientPreferences.findEnumerated(class425.method2151(), var1.readUnsignedByte()); + this.verticalAlignment = (VerticalAlignment)KeyHandler.findEnumerated(Tiles.method457(), var1.readUnsignedByte()); } } } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1012170013" + descriptor = "(B)V", + garbageValue = "-79" ) - public void method935() { - if (this.field1505 != null) { - for (int var1 = 0; var1 < this.field1505.length; var1 += 2) { - if (this.field1505[var1] < this.field1501) { - this.field1501 = this.field1505[var1]; - } else if (this.field1505[var1] > this.field1500) { - this.field1500 = this.field1505[var1]; + public void method949() { + if (this.field1516 != null) { + for (int var1 = 0; var1 < this.field1516.length; var1 += 2) { + if (this.field1516[var1] < this.field1511) { + this.field1511 = this.field1516[var1]; + } else if (this.field1516[var1] > this.field1514) { + this.field1514 = this.field1516[var1]; } - if (this.field1505[var1 + 1] < this.field1499) { - this.field1499 = this.field1505[var1 + 1]; - } else if (this.field1505[var1 + 1] > this.field1503) { - this.field1503 = this.field1505[var1 + 1]; + if (this.field1516[var1 + 1] < this.field1513) { + this.field1513 = this.field1516[var1 + 1]; + } else if (this.field1516[var1 + 1] > this.field1512) { + this.field1512 = this.field1516[var1 + 1]; } } } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ZI)Lud;", - garbageValue = "1803263735" + descriptor = "(ZB)Lui;", + garbageValue = "0" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1 * -148742303 * 179602593; + int var2 = this.sprite1 * 1744805107 * -479011781; return this.getSprite(var2); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(II)Lud;", - garbageValue = "-858203054" + descriptor = "(IB)Lui;", + garbageValue = "-54" ) @Export("getSprite") SpritePixels getSprite(int var1) { @@ -253,7 +268,7 @@ SpritePixels getSprite(int var1) { if (var2 != null) { return var2; } else { - var2 = WorldMap.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + var2 = Tiles.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } @@ -263,26 +278,59 @@ SpritePixels getSprite(int var1) { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "119" + descriptor = "(I)I", + garbageValue = "1172107767" ) @Export("getObjectId") public int getObjectId() { return this.objectId; } + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IB)Lhv;", + garbageValue = "-69" + ) + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; + } + + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); + return var1; + } + } + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/Date;", - garbageValue = "-1651888504" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "1376332394" ) - static Date method939() { - java.util.Calendar var0 = java.util.Calendar.getInstance(); - var0.set(2, 0); - var0.set(5, 1); - var0.set(1, 1900); - return var0.getTime(); + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + class348.charToByteCp1252(var0.charAt(var3)); + } + + return var2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapEvent.java b/osrs/src/main/java/WorldMapEvent.java index 50c716e3e..4fb72d7ad 100644 --- a/osrs/src/main/java/WorldMapEvent.java +++ b/osrs/src/main/java/WorldMapEvent.java @@ -3,27 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.ArrayList; +import java.util.Iterator; + @ObfuscatedName("kl") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("mapElement") public int mapElement; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmc;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmc;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILmr;Lmr;)V" + descriptor = "(ILmc;Lmc;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; @@ -31,39 +34,53 @@ public WorldMapEvent(int var1, Coord var2, Coord var3) { this.coord2 = var3; } - @ObfuscatedName("az") + @ObfuscatedName("nm") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1720811535" + descriptor = "(II)V", + garbageValue = "307364041" ) - public static int method1546(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { - var2 = var2 << 1 | var0 & 1; - var0 >>>= 1; - } + static final void method1588(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); + if (var0 != class449.clientPreferences.getCurrentMusicVolume()) { + label36: { + if (class449.clientPreferences.getCurrentMusicVolume() == 0) { + boolean var1 = !class305.field2773.isEmpty(); + if (var1) { + Archive var2 = class385.archive6; + if (!class305.field2773.isEmpty()) { + ArrayList var3 = new ArrayList(); + Iterator var4 = class305.field2773.iterator(); - return var2; - } + while (var4.hasNext()) { + MusicSong var5 = (MusicSong)var4.next(); + var5.field2865 = false; + var5.field2866 = false; + var5.field2862 = false; + var5.field2863 = false; + var5.musicTrackArchive = var2; + var5.musicTrackVolume = var0; + var5.field2867 = 0.0F; + var3.add(var5); + } - @ObfuscatedName("nz") - @ObfuscatedSignature( - descriptor = "(Lmt;B)Lmt;", - garbageValue = "84" - ) - static Widget method1547(Widget var0) { - int var1 = ClientPacket.method1569(UserComparator8.getWidgetFlags(var0)); - if (var1 == 0) { - return null; - } else { - for (int var2 = 0; var2 < var1; ++var2) { - var0 = VarbitComposition.getWidget(var0.parentId); - if (var0 == null) { - return null; + class53.method291(var3, class305.musicPlayerStatus, class305.field2766, class305.field2769, class305.field2768, false); + } + + Client.playingJingle = false; + break label36; + } + } + + if (var0 == 0) { + Script.method445(0, 0); + Client.playingJingle = false; + } else { + class300.method1620(var0); } } - return var0; + class449.clientPreferences.setCurrentMusicVolume(var0); } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapIcon_0.java b/osrs/src/main/java/WorldMapIcon_0.java index 1f70fa413..9483f6842 100644 --- a/osrs/src/main/java/WorldMapIcon_0.java +++ b/osrs/src/main/java/WorldMapIcon_0.java @@ -3,35 +3,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") +@ObfuscatedName("ki") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("qo") - static int field2371; - @ObfuscatedName("aw") + @ObfuscatedName("th") + static boolean field2397; + @ObfuscatedName("au") @Export("element") final int element; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkq;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("subWidth") final int subWidth; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lmr;Lmr;ILka;)V" + descriptor = "(Lmc;Lmc;ILkq;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.element = var3; this.label = var4; - WorldMapElement var5 = SequenceDefinition.WorldMapElement_get(this.getElement()); + WorldMapElement var5 = class138.WorldMapElement_get(this.getElement()); SpritePixels var6 = var5.getSpriteBool(false); if (var6 != null) { this.subWidth = var6.subWidth; @@ -43,43 +43,43 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1799088869" + garbageValue = "2135662389" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)Lka;", - garbageValue = "8220" + descriptor = "(I)Lkq;", + garbageValue = "-2114244458" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "81" + descriptor = "(I)I", + garbageValue = "-655814171" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-565304787" + garbageValue = "-816534170" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapIcon_1.java b/osrs/src/main/java/WorldMapIcon_1.java index 0a64212cb..cdb5c022d 100644 --- a/osrs/src/main/java/WorldMapIcon_1.java +++ b/osrs/src/main/java/WorldMapIcon_1.java @@ -3,38 +3,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jg") +@ObfuscatedName("jz") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("us") - static int cameraMoveToX; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("objectDefId") final int objectDefId; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljm;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("element") int element; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkq;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("subWidth") int subWidth; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lmr;Lmr;ILjv;)V" + descriptor = "(Lmc;Lmc;ILjm;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -43,16 +41,16 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1295582280" + descriptor = "(B)V", + garbageValue = "-10" ) @Export("init") void init() { - this.element = class90.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(SequenceDefinition.WorldMapElement_get(this.element)); - WorldMapElement var1 = SequenceDefinition.WorldMapElement_get(this.getElement()); + this.element = WorldMapElement.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(class138.WorldMapElement_get(this.element)); + WorldMapElement var1 = class138.WorldMapElement_get(this.getElement()); SpritePixels var2 = var1.getSpriteBool(false); if (var2 != null) { this.subWidth = var2.subWidth; @@ -64,87 +62,82 @@ void init() { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1799088869" + garbageValue = "2135662389" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)Lka;", - garbageValue = "8220" + descriptor = "(I)Lkq;", + garbageValue = "-2114244458" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "81" + descriptor = "(I)I", + garbageValue = "-655814171" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-565304787" + garbageValue = "-816534170" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("ad") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-2050409235" + descriptor = "(IB)I", + garbageValue = "22" ) - static int method1372(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - if (var0 == 1800) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class273.Widget_unpackTargetMask(UserComparator8.getWidgetFlags(var3)); - return 1; - } else if (var0 != 1801) { - if (var0 == 1802) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; - } + public static int method1401(int var0) { + --var0; + var0 |= var0 >>> 1; + var0 |= var0 >>> 2; + var0 |= var0 >>> 4; + var0 |= var0 >>> 8; + var0 |= var0 >>> 16; + return var0 + 1; + } - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + @ObfuscatedName("nv") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-16" + ) + static final void method1402() { + PacketBufferNode var0 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLOSE_MODAL, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var0); + Interpreter.field704 = true; + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { + if (var1.type == 0 || var1.type == 3) { + class92.closeInterface(var1, true); } + } - return 1; + if (Client.meslayerContinueWidget != null) { + class218.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; } - } - @ObfuscatedName("jk") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "650679453" - ) - static boolean method1373() { - return (Client.drawPlayerNames & 1) != 0; + Interpreter.field704 = false; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapLabel.java b/osrs/src/main/java/WorldMapLabel.java index 87d57d2c0..03b35f2ce 100644 --- a/osrs/src/main/java/WorldMapLabel.java +++ b/osrs/src/main/java/WorldMapLabel.java @@ -3,33 +3,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("kq") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("il") - @ObfuscatedSignature( - descriptor = "Lej;" - ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("text") String text; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("width") int width; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("height") int height; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ljj;" + descriptor = "Ljb;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILjj;)V" + descriptor = "(Ljava/lang/String;IILjb;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -37,4 +31,23 @@ public class WorldMapLabel { this.height = var3; this.size = var4; } -} + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "39" + ) + public static boolean method1534(int var0) { + return var0 >= WorldMapDecorationType.field3138.id && var0 <= WorldMapDecorationType.field3140.id; + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(CS)Z", + garbageValue = "256" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapLabelSize.java b/osrs/src/main/java/WorldMapLabelSize.java index 323a359c2..eb06541df 100644 --- a/osrs/src/main/java/WorldMapLabelSize.java +++ b/osrs/src/main/java/WorldMapLabelSize.java @@ -3,92 +3,77 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jj") +@ObfuscatedName("jb") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ljj;" + descriptor = "Ljb;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ljj;" + descriptor = "Ljb;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ljj;" + descriptor = "Ljb;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Luu;" + descriptor = "Let;" ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("si") + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lnb;" ) - @Export("guestClanChannel") - static ClanChannel guestClanChannel; - @ObfuscatedName("am") - final int field2299; - @ObfuscatedName("as") - final int field2300; - @ObfuscatedName("aj") - final int field2298; + static GameBuild field2323; + @ObfuscatedName("at") + final int field2326; + @ObfuscatedName("ac") + final int field2324; + @ObfuscatedName("ai") + final int field2325; static { - WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); - WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); + WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); + WorldMapLabelSize_medium = new WorldMapLabelSize(0, 1, 2); WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field2299 = var1; - this.field2300 = var2; - this.field2298 = var3; + this.field2326 = var1; + this.field2324 = var2; + this.field2325 = var3; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(FB)Z", - garbageValue = "-3" + descriptor = "(FI)Z", + garbageValue = "-122455389" ) - boolean method1365(float var1) { - return var1 >= (float)this.field2298; + boolean method1394(float var1) { + return var1 >= (float)this.field2325; } - @ObfuscatedName("me") + @ObfuscatedName("mx") @ObfuscatedSignature( - descriptor = "(IIII)Ldn;", - garbageValue = "977578301" + descriptor = "(Lmi;I)Lmi;", + garbageValue = "1356224559" ) - @Export("ifOpenSub") - static final InterfaceParent ifOpenSub(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - class92.Widget_resetModelFrames(var1); - Widget var4 = VarbitComposition.getWidget(var0); - class200.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - class200.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; + static Widget method1395(Widget var0) { + Widget var1 = BuddyRankComparator.method691(var0); + if (var1 == null) { + var1 = var0.parent; } - SoundCache.revalidateWidgetScroll(ArchiveLoader.Widget_interfaceComponents[var0 >> 16], var4, false); - ScriptFrame.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - ChatChannel.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; + return var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapManager.java b/osrs/src/main/java/WorldMapManager.java index 88b8005f6..5f72f9e18 100644 --- a/osrs/src/main/java/WorldMapManager.java +++ b/osrs/src/main/java/WorldMapManager.java @@ -1,86 +1,84 @@ -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.*; + +@ObfuscatedName("jd") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("loaded") boolean loaded; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkv;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "Lui;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("icons") HashMap icons; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "[[Ljv;" + descriptor = "[[Ljm;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Luu;" + descriptor = "[Luk;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lnu;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("fonts") final HashMap fonts; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("tileX") int tileX; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("tileY") int tileY; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("tileWidth") int tileWidth; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("tileHeight") int tileHeight; - @ObfuscatedName("au") + @ObfuscatedName("ab") @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Luu;Ljava/util/HashMap;Lnd;Lnd;)V" + descriptor = "([Luk;Ljava/util/HashMap;Lnu;Lnu;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; @@ -93,10 +91,10 @@ public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, this.groundArchive = var4; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;Ljava/lang/String;ZB)V", - garbageValue = "3" + descriptor = "(Lnu;Ljava/lang/String;ZI)V", + garbageValue = "948733359" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -104,10 +102,10 @@ public void load(AbstractArchive var1, String var2, boolean var3) { this.loaded = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.field2449.name); + int var4 = var1.getGroupId(WorldMapCacheName.field2471.name); int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2449.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2450.name, var2)); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2471.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2469.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -154,9 +152,9 @@ public void load(AbstractArchive var1, String var2, boolean var3) { System.nanoTime(); System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field2447.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2447.name, var2); - this.compositeTextureSprite = ClanChannelMember.method769(var20); + if (var1.isValidFileName(WorldMapCacheName.field2470.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2470.name, var2); + this.compositeTextureSprite = WorldMapData_1.method1484(var20); } System.nanoTime(); @@ -166,27 +164,27 @@ public void load(AbstractArchive var1, String var2, boolean var3) { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2088787807" + garbageValue = "1337729553" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-1684662753" + descriptor = "(IIIIIIIIB)V", + garbageValue = "-78" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int[] var9 = Rasterizer2D.Rasterizer2D_pixels; int var10 = Rasterizer2D.Rasterizer2D_width; int var11 = Rasterizer2D.Rasterizer2D_height; - float[] var12 = Rasterizer2D.field4171; + float[] var12 = Rasterizer2D.field4217; int[] var13 = new int[4]; Rasterizer2D.Rasterizer2D_getClipArray(var13); WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); @@ -199,7 +197,7 @@ public final void drawTiles(int var1, int var2, int var3, int var4, int var5, in this.scaleHandlers.put(var16, var17); } - int var24 = var14.width + var14.x - 1; + int var24 = var14.x + var14.width - 1; int var18 = var14.y + var14.height - 1; int var19; @@ -210,48 +208,48 @@ public final void drawTiles(int var1, int var2, int var3, int var4, int var5, in } } - Rasterizer3D.method1175(var9, var10, var11, var12); + Rasterizer3D.method1198(var9, var10, var11, var12); Rasterizer2D.Rasterizer2D_setClipArray(var13); - var19 = (int)(var15 * 64.0F); + var19 = (int)(64.0F * var15); var20 = this.tileX + var1; int var21 = var2 + this.tileY; for (int var22 = var14.x; var22 < var14.width + var14.x; ++var22) { for (int var23 = var14.y; var23 < var14.y + var14.height; ++var23) { - this.regions[var22][var23].method1405(var5 + (this.regions[var22][var23].regionX * 64 - var20) * var19 / 64, var8 - (this.regions[var22][var23].regionY * 64 - var21 + 64) * var19 / 64, var19); + this.regions[var22][var23].method1436(var5 + (this.regions[var22][var23].regionX * 64 - var20) * var19 / 64, var8 - (this.regions[var22][var23].regionY * 64 - var21 + 64) * var19 / 64, var19); } } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-1431299494" + garbageValue = "-1410241110" ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); - int var16 = (int)(var15 * 64.0F); + int var16 = (int)(64.0F * var15); int var17 = this.tileX + var1; int var18 = var2 + this.tileY; int var19; int var20; - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { if (var13) { this.regions[var19][var20].initWorldMapIcon1s(); } - this.regions[var19][var20].method1416(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); + this.regions[var19][var20].method1446(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); } } if (var10 != null && var11 > 0) { for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { - for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { this.regions[var19][var20].flashElements(var10, var11, var12); } } @@ -259,10 +257,10 @@ public final void drawElements(int var1, int var2, int var3, int var4, int var5, } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "0" + garbageValue = "28" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -299,12 +297,12 @@ public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, i } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "-734508388" + garbageValue = "790077229" ) - public List method1447(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method1475(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); if (!this.loaded) { return var11; @@ -315,9 +313,9 @@ public List method1447(int var1, int var2, int var3, int var4, int var5, int var int var15 = this.tileX + var1; int var16 = var2 + this.tileY; - for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { - for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { - List var19 = this.regions[var17][var18].method1437(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); + for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { + List var19 = this.regions[var17][var18].method1467(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); if (!var19.isEmpty()) { var11.addAll(var19); } @@ -328,10 +326,10 @@ public List method1447(int var1, int var2, int var3, int var4, int var5, int var } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IIIIB)Lkn;", - garbageValue = "0" + descriptor = "(IIIIB)Lks;", + garbageValue = "97" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { @@ -371,20 +369,20 @@ WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4 return var5; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "151100522" + descriptor = "(B)Z", + garbageValue = "-50" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)Ljava/util/HashMap;", - garbageValue = "-61" + descriptor = "(I)Ljava/util/HashMap;", + garbageValue = "1183884840" ) @Export("buildIcons") public HashMap buildIcons() { @@ -392,10 +390,10 @@ public HashMap buildIcons() { return this.icons; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1036972495" + garbageValue = "-1440528600" ) @Export("buildIcons0") void buildIcons0() { @@ -429,10 +427,10 @@ void buildIcons0() { } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(III)F", - garbageValue = "-166820479" + descriptor = "(IIB)F", + garbageValue = "0" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { @@ -447,164 +445,77 @@ float getPixelsPerTile(int var1, int var2) { } } - @ObfuscatedName("aw") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "32" + descriptor = "(I)I", + garbageValue = "1998929548" ) - static void method1440(int var0) { - class450.field3851 = var0; - class450.field3852 = new class450[var0]; - class344.field3132 = 0; - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(IZII)V", - garbageValue = "-1393534066" - ) - public static final void method1442(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { - PcmPlayer.field181 = var0; - class373.PcmPlayer_stereo = var1; - ObjTypeCustomisation.field1482 = var2; - } else { - throw new IllegalArgumentException(); + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; + if (GraphicsDefaults.garbageCollector == null || !GraphicsDefaults.garbageCollector.isValid()) { + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + GraphicsDefaults.garbageCollector = var2; + GameEngine.garbageCollectorLastCheckTimeMs = -1L; + GameEngine.garbageCollectorLastCollectionTime = -1L; + } + } + } catch (Throwable var11) { + } } - } - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(Lmt;Lmb;ZI)V", - garbageValue = "1385320547" - ) - public static void method1453(Widget var0, PlayerComposition var1, boolean var2) { - var0.modelType = 7; - var0.field3081 = new PlayerComposition(var1); - if (!var2) { - var0.field3081.equipment = Arrays.copyOf(var0.field3081.field2894, var0.field3081.field2894.length); - var0.field3081.method1690(); + if (GraphicsDefaults.garbageCollector != null) { + long var9 = GameEngine.clockNow(); + long var3 = GraphicsDefaults.garbageCollector.getCollectionTime(); + if (GameEngine.garbageCollectorLastCollectionTime != -1L) { + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; + if (var7 != 0L) { + var0 = (int)(100L * var5 / var7); + } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; + GameEngine.garbageCollectorLastCheckTimeMs = var9; } + return var0; } - @ObfuscatedName("nf") + @ObfuscatedName("it") @ObfuscatedSignature( - descriptor = "(Lmt;IIIB)V", - garbageValue = "3" + descriptor = "(I)V", + garbageValue = "549476469" ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - class105.method618(); - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); - if (Client.minimapState != 2 && Client.minimapState != 5) { - int var5 = Client.camAngleY & 2047; - int var6 = class136.localPlayer.x / 32 + 48; - int var7 = 464 - class136.localPlayer.y / 32; - Frames.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); - - int var8; - int var9; - int var10; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { - var9 = Client.mapIconXs[var8] * 4 + 2 - class136.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - class136.localPlayer.y / 32; - GameEngine.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); - } - - int var12; - int var16; - for (var8 = 0; var8 < 104; ++var8) { - for (var9 = 0; var9 < 104; ++var9) { - NodeDeque var15 = Client.groundItems[class36.Client_plane][var8][var9]; - if (var15 != null) { - var16 = var8 * 4 + 2 - class136.localPlayer.x / 32; - var12 = var9 * 4 + 2 - class136.localPlayer.y / 32; - GameEngine.drawSpriteOnMinimap(var1, var2, var16, var12, MusicPatchNode2.mapDotSprites[0], var4); - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { - NPC var14 = Client.npcs[Client.npcIndices[var8]]; - if (var14 != null && var14.isVisible()) { - NPCComposition var18 = var14.definition; - if (var18 != null && var18.transforms != null) { - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { - var16 = var14.x / 32 - class136.localPlayer.x / 32; - var12 = var14.y / 32 - class136.localPlayer.y / 32; - GameEngine.drawSpriteOnMinimap(var1, var2, var16, var12, MusicPatchNode2.mapDotSprites[1], var4); - } - } - } - - var8 = Players.Players_count; - int[] var17 = Players.Players_indices; - - for (var10 = 0; var10 < var8; ++var10) { - Player var11 = Client.players[var17[var10]]; - if (var11 != null && var11.isVisible() && !var11.isHidden && var11 != class136.localPlayer) { - var12 = var11.x / 32 - class136.localPlayer.x / 32; - int var13 = var11.y / 32 - class136.localPlayer.y / 32; - if (var11.isFriend()) { - GameEngine.drawSpriteOnMinimap(var1, var2, var12, var13, MusicPatchNode2.mapDotSprites[3], var4); - } else if (class136.localPlayer.team != 0 && var11.team != 0 && var11.team == class136.localPlayer.team) { - GameEngine.drawSpriteOnMinimap(var1, var2, var12, var13, MusicPatchNode2.mapDotSprites[4], var4); - } else if (var11.isFriendsChatMember()) { - GameEngine.drawSpriteOnMinimap(var1, var2, var12, var13, MusicPatchNode2.mapDotSprites[5], var4); - } else if (var11.isClanMember()) { - GameEngine.drawSpriteOnMinimap(var1, var2, var12, var13, MusicPatchNode2.mapDotSprites[6], var4); - } else { - GameEngine.drawSpriteOnMinimap(var1, var2, var12, var13, MusicPatchNode2.mapDotSprites[2], var4); - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { - NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; - if (var19 != null) { - var16 = var19.x / 32 - class136.localPlayer.x / 32; - var12 = var19.y / 32 - class136.localPlayer.y / 32; - class158.worldToMinimap(var1, var2, var16, var12, DynamicObject.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - AbstractArchive.baseX * 4 + 2 - class136.localPlayer.x / 32; - var16 = Client.hintArrowY * 4 - class148.baseY * 4 + 2 - class136.localPlayer.y / 32; - class158.worldToMinimap(var1, var2, var10, var16, DynamicObject.mapMarkerSprites[1], var4); - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { - Player var20 = Client.players[Client.hintArrowPlayerIndex]; - if (var20 != null) { - var16 = var20.x / 32 - class136.localPlayer.x / 32; - var12 = var20.y / 32 - class136.localPlayer.y / 32; - class158.worldToMinimap(var1, var2, var16, var12, DynamicObject.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - class136.localPlayer.x / 32; - var16 = Client.destinationY * 4 + 2 - class136.localPlayer.y / 32; - GameEngine.drawSpriteOnMinimap(var1, var2, var10, var16, DynamicObject.mapMarkerSprites[0], var4); + static final void method1482() { + int[] var0 = Players.Players_indices; + + int var1; + for (var1 = 0; var1 < Players.Players_count; ++var1) { + Player var2 = Client.players[var0[var1]]; + if (var2 != null && var2.overheadTextCyclesRemaining > 0) { + --var2.overheadTextCyclesRemaining; + if (var2.overheadTextCyclesRemaining == 0) { + var2.overheadText = null; } + } + } - if (!class136.localPlayer.isHidden) { - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + for (var1 = 0; var1 < Client.npcCount; ++var1) { + int var4 = Client.npcIndices[var1]; + NPC var3 = Client.npcs[var4]; + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { + --var3.overheadTextCyclesRemaining; + if (var3.overheadTextCyclesRemaining == 0) { + var3.overheadText = null; } - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } - - Client.field404[var3] = true; } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapRectangle.java b/osrs/src/main/java/WorldMapRectangle.java index e0f55f377..622f2693d 100644 --- a/osrs/src/main/java/WorldMapRectangle.java +++ b/osrs/src/main/java/WorldMapRectangle.java @@ -3,469 +3,198 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("ks") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("width") int width; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("height") int height; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("x") int x; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Ljd;" ) @Export("this$0") @ObfuscatedName("this$0") final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Ljf;)V" + descriptor = "(Ljd;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1583950964" - ) - public static boolean method1495(int var0) { - return (var0 >> 21 & 1) != 0; - } - - @ObfuscatedName("be") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(ILdc;ZS)I", - garbageValue = "7389" + descriptor = "(ILdh;ZI)I", + garbageValue = "-213889891" ) - static int method1496(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 5504) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; - } - + static int method1528(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + if (var0 == 1600) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollX; return 1; - } else if (var0 == 5505) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == 5506) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == 5530) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == 5531) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; + } else if (var0 == 1601) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollY; return 1; } else { - return 2; - } - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(ILdc;ZB)I", - garbageValue = "49" - ) - static int method1497(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = class36.Client_plane; - int var9 = (class136.localPlayer.x >> 7) + AbstractArchive.baseX; - int var5 = (class136.localPlayer.y >> 7) + class148.baseY; - class102.getWorldMap().method2369(var3, var9, var5, true); - return 1; - } else { - WorldMapArea var11; - if (var0 == 6601) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - String var16 = ""; - var11 = class102.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); + class329 var7; + if (var0 == 1602) { + if (var3.type == 12) { + var7 = var3.method1844(); + if (var7 != null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7.method1779().method2041(); + return 1; + } } - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == 1603) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == 1604) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == 1605) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == 1606) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == 1607) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == 1608) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; - } else if (var0 == 6602) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class102.getWorldMap().setCurrentMapAreaId(var3); + } else if (var0 == 1609) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.transparencyTop; return 1; - } else if (var0 == 6603) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class102.getWorldMap().getZoomLevel(); + } else if (var0 == 1610) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.transparencyBot; return 1; - } else if (var0 == 6604) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class102.getWorldMap().setZoomPercentage(var3); + } else if (var0 == 1611) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.color; return 1; - } else if (var0 == 6605) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class102.getWorldMap().isCacheLoaded() ? 1 : 0; + } else if (var0 == 1612) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 1613) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == 1614) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; return 1; } else { - Coord var15; - if (var0 == 6606) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class102.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); + class324 var4; + if (var0 == 1617) { + var4 = var3.method1845(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2892 * -1007608077 * 1891510843 : 0; + } + + if (var0 == 1618) { + var4 = var3.method1845(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2890 * -113152143 * 439316881 : 0; return 1; - } else if (var0 == 6607) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class102.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); + } else if (var0 == 1619) { + var7 = var3.method1844(); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1780().method2041() : ""; return 1; - } else if (var0 == 6608) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class102.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); + } else if (var0 == 1620) { + var4 = var3.method1845(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2891 * 1092445257 * -767308295 : 0; return 1; - } else if (var0 == 6609) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class102.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); + } else if (var0 == 1621) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1790() : 0; return 1; - } else if (var0 == 6610) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class102.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class102.getWorldMap().getDisplayY(); + } else if (var0 == 1622) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1791() : 0; return 1; - } else { - WorldMapArea var13; - if (var0 == 6611) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = class102.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); - } - + } else if (var0 == 1623) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1792() : 0; + return 1; + } else if (var0 == 1624) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null && var7.method1782() ? 1 : 0; + return 1; + } else if (var0 != 1625) { + if (var0 == 1626) { + var7 = var3.method1844(); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1781().method2113() : ""; return 1; - } else if (var0 == 6612) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = class102.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; - } - + } else if (var0 == 1627) { + var7 = var3.method1844(); + int var5 = var7 != null ? var7.method1786() : 0; + int var6 = var7 != null ? var7.method1785() : 0; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Math.min(var5, var6); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Math.max(var5, var6); return 1; - } else if (var0 == 6613) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = class102.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; - } - + } else if (var0 == 1628) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1785() : 0; return 1; - } else if (var0 == 6614) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = class102.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getZoom(); - } - + } else if (var0 == 1629) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1794() : 0; return 1; - } else if (var0 == 6615) { - var15 = class102.getWorldMap().getDisplayCoord(); - if (var15 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.x; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.y; - } - + } else if (var0 == 1630) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1793() : 0; + return 1; + } else if (var0 == 1631) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1795() : 0; return 1; - } else if (var0 == 6616) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class102.getWorldMap().currentMapAreaId(); + } else if (var0 == 1632) { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1796() : 0; return 1; - } else if (var0 == 6617) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = class102.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + class27 var8; + if (var0 == 1633) { + var8 = var3.method1846(); + Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = var8 != null ? var8.method98(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]) : 0; return 1; - } else { - int[] var14 = var13.position(var15.plane, var15.x, var15.y); - if (var14 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[0]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[1]; - } - + } else if (var0 == 1634) { + var8 = var3.method1846(); + Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = var8 != null ? var8.method99((char)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]) : 0; return 1; - } - } else { - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = class102.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var7 = var13.coord(var15.x, var15.y); - if (var7 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } } else { - Coord var12; - if (var0 == 6619) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - GrandExchangeOffer.method1926(var3, var12, false); - return 1; - } else if (var0 == 6620) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - GrandExchangeOffer.method1926(var3, var12, true); - return 1; - } else if (var0 == 6621) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - var11 = class102.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; - return 1; - } - } else if (var0 == 6622) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class102.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class102.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = class102.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getId(); - } - - return 1; - } else if (var0 == 6624) { - class102.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - class102.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - class102.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - class102.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var10; - if (var0 == 6628) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class102.getWorldMap().setPerpetualFlash(var10); - return 1; - } else if (var0 == 6629) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class102.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == 6630) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class102.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == 6631) { - class102.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == 6632) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class102.getWorldMap().setElementsDisabled(var10); - return 1; - } else { - boolean var4; - if (var0 == 6633) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - class102.getWorldMap().disableElement(var3, var4); - return 1; - } else if (var0 == 6634) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - class102.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } else if (var0 == 6635) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class102.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == 6636) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class102.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6637) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class102.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - var7 = class102.getWorldMap().method2413(var3, var12); - if (var7 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var8; - if (var0 == 6639) { - var8 = class102.getWorldMap().iconStart(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else if (var0 == 6640) { - var8 = class102.getWorldMap().iconNext(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var6; - if (var0 == 6693) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = SequenceDefinition.WorldMapElement_get(var3); - if (var6.name == null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name; - } - - return 1; - } else if (var0 == 6694) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = SequenceDefinition.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.textSize; - return 1; - } else if (var0 == 6695) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = SequenceDefinition.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.category; - } - - return 1; - } else if (var0 == 6696) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = SequenceDefinition.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.sprite1; - } - - return 1; - } else if (var0 == 6697) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptFrame.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptFrame.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == 6699) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptFrame.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } + return 2; } } + } else { + var7 = var3.method1844(); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null && var7.method1783() ? 1 : 0; + return 1; } } } } - @ObfuscatedName("ln") + @ObfuscatedName("ip") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lmt;I)Ljava/lang/String;", - garbageValue = "-1061464699" + descriptor = "(I)V", + garbageValue = "853160118" ) - static String method1498(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; - } - - String var4 = var0.substring(0, var3); - int var6 = Clock.method920(var1, var2 - 1); - String var5; - if (var6 < 999999999) { - var5 = Integer.toString(var6); - } else { - var5 = "*"; - } - - var0 = var4 + var5 + var0.substring(var3 + 2); - } - } + static void method1529() { + if (Canvas.worldMap != null) { + Canvas.worldMap.method2394(HealthBar.Client_plane, (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX, (VarbitComposition.localPlayer.y >> 7) + class47.baseY, false); + Canvas.worldMap.loadCache(); } - return var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapRegion.java b/osrs/src/main/java/WorldMapRegion.java index a94c5efab..e5502a046 100644 --- a/osrs/src/main/java/WorldMapRegion.java +++ b/osrs/src/main/java/WorldMapRegion.java @@ -1,57 +1,48 @@ -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map.Entry; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +import java.util.*; +import java.util.Map.Entry; + +@ObfuscatedName("jm") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Llj;" + descriptor = "Lkg;" ) @Export("WorldMapRegion_cachedSprites") - public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("od") - @ObfuscatedSignature( - descriptor = "Lch;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("aj") + static DemotingHashTable WorldMapRegion_cachedSprites; + @ObfuscatedName("ai") @Export("regionX") int regionX; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("regionY") int regionY; - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljx;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("icon0List") List icon0List; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("fonts") final HashMap fonts; @@ -69,13 +60,13 @@ public class WorldMapRegion { this.fonts = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-587218786" + garbageValue = "-1536160939" ) - void method1405(int var1, int var2, int var3) { - SpritePixels var4 = Canvas.method82(this.regionX, this.regionY, this.pixelsPerTile); + void method1436(int var1, int var2, int var3) { + SpritePixels var4 = class135.method741(this.regionX, this.regionY, this.pixelsPerTile); if (var4 != null) { if (var3 == this.pixelsPerTile * 64) { var4.drawAt(var1, var2); @@ -86,10 +77,10 @@ void method1405(int var1, int var2, int var3) { } } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljn;Ljava/util/List;I)V", - garbageValue = "712917891" + descriptor = "(Ljx;Ljava/util/List;I)V", + garbageValue = "-2004305210" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -98,10 +89,10 @@ void initWorldMapData0(WorldMapData_0 var1, List var2) { this.addAllToIconList(var2); } - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "789773548" + garbageValue = "-1161990566" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -118,15 +109,15 @@ void initWorldMapData1(HashSet var1, List var2) { this.addAllToIconList(var2); } - @ObfuscatedName("as") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(IIIILkm;I)V", - garbageValue = "600770936" + descriptor = "(IIIILke;I)V", + garbageValue = "-1191453077" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { for (int var6 = var1; var6 < var3 + var1; ++var6) { - label45: + label66: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.planes; ++var8) { WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; @@ -134,11 +125,33 @@ void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapDa WorldMapDecoration[] var10 = var9; for (int var11 = 0; var11 < var10.length; ++var11) { - WorldMapDecoration var12 = var10[var11]; - ObjectComposition var13 = class90.getObjectDefinition(var12.objectDefinitionId); - if (LoginScreenAnimation.method544(var13)) { + ObjectComposition var13; + boolean var14; + label57: { + WorldMapDecoration var12 = var10[var11]; + var13 = WorldMapElement.getObjectDefinition(var12.objectDefinitionId); + if (var13.transforms != null) { + int[] var15 = var13.transforms; + + for (int var16 = 0; var16 < var15.length; ++var16) { + int var17 = var15[var16]; + ObjectComposition var18 = WorldMapElement.getObjectDefinition(var17); + if (var18.mapIconId != -1) { + var14 = true; + break label57; + } + } + } else if (var13.mapIconId != -1) { + var14 = true; + break label57; + } + + var14 = false; + } + + if (var14) { this.getIcon(var13, var8, var6, var7, var5); - continue label45; + continue label66; } } } @@ -148,20 +161,20 @@ void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapDa } - @ObfuscatedName("aj") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lhb;IIILkm;S)V", - garbageValue = "-21474" + descriptor = "(Lhv;IIILke;I)V", + garbageValue = "882689979" ) @Export("getIcon") void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); Coord var7 = null; if (this.worldMapData_0 != null) { - var7 = new Coord(this.worldMapData_0.field2410 + var2, var3 + this.worldMapData_0.field2408 * 64, var4 + this.worldMapData_0.field2405 * 64); + var7 = new Coord(this.worldMapData_0.field2428 + var2, var3 + this.worldMapData_0.field2429 * 64, var4 + this.worldMapData_0.field2432 * 64); } else { WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.field2410, var3 + var8.field2408 * 64 + var8.getChunkXLow() * 8, var8.field2405 * 64 + var4 + var8.getChunkYLow() * 8); + var7 = new Coord(var2 + var8.field2428, var3 + var8.field2429 * 64 + var8.getChunkXLow() * 8, var4 + var8.field2432 * 64 + var8.getChunkYLow() * 8); } WorldMapElement var9; @@ -169,21 +182,21 @@ void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorld if (var1.transforms != null) { var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - var9 = SequenceDefinition.WorldMapElement_get(var1.mapIconId); + var9 = class138.WorldMapElement_get(var1.mapIconId); var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); } - var9 = SequenceDefinition.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); - if (var9.field1507) { + var9 = class138.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); + if (var9.field1519) { this.iconMap.put(new Coord(0, var3, var4), var10); } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1453549620" + garbageValue = "-1774548488" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { @@ -198,10 +211,10 @@ void initWorldMapIcon1s() { } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(Ljava/util/List;B)V", - garbageValue = "-53" + garbageValue = "67" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -209,20 +222,20 @@ void addAllToIconList(List var1) { while (var2.hasNext()) { WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); - if (SequenceDefinition.WorldMapElement_get(var3.element).field1507 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method1435(var3.element)); + if (class138.WorldMapElement_get(var3.element).field1519 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method1465(var3.element)); this.icon0List.add(var4); } } } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1975212342" + garbageValue = "-2029792015" ) - void method1413() { + void method1443() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { @@ -236,10 +249,10 @@ void method1413() { } - @ObfuscatedName("ap") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lnd;B)Z", - garbageValue = "-91" + descriptor = "(Lnu;B)Z", + garbageValue = "0" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { @@ -277,14 +290,14 @@ boolean loadGeography(AbstractArchive var1) { @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(ILki;[Luu;Lnd;Lnd;B)V", - garbageValue = "-100" + descriptor = "(ILku;[Luk;Lnu;Lnu;I)V", + garbageValue = "-2013967337" ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.pixelsPerTile = var1; if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - if (Canvas.method82(this.regionX, this.regionY, var1) == null) { + if (class135.method741(this.regionX, this.regionY, var1) == null) { boolean var6 = true; var6 &= this.loadGeography(var4); int var8; @@ -301,15 +314,15 @@ void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, Abstrac if (var7 == null) { var9 = new WorldMapSprite(); } else { - var9 = new WorldMapSprite(ClanChannelMember.method769(var7).pixels); + var9 = new WorldMapSprite(WorldMapData_1.method1484(var7).pixels); } SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); var11.setRaster(); if (this.worldMapData_0 != null) { - this.method1418(var2, var3, var9); + this.method1448(var2, var3, var9); } else { - this.method1419(var2, var3, var9); + this.method1449(var2, var3, var9); } int var12 = this.regionX; @@ -318,18 +331,18 @@ void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, Abstrac DemotingHashTable var15 = WorldMapRegion_cachedSprites; long var17 = (long)(var14 << 16 | var12 << 8 | var13); var15.put(var11, var17, var11.pixels.length * 4); - this.method1413(); + this.method1443(); } } } } - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIILjava/util/HashSet;B)V", - garbageValue = "12" + descriptor = "(IIILjava/util/HashSet;I)V", + garbageValue = "-949668643" ) - void method1416(int var1, int var2, int var3, HashSet var4) { + void method1446(int var1, int var2, int var3, HashSet var4) { if (var4 == null) { var4 = new HashSet(); } @@ -338,10 +351,10 @@ void method1416(int var1, int var2, int var3, HashSet var4) { this.drawMapLinks(var1, var2, var4, var3); } - @ObfuscatedName("ah") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "-1810904973" + garbageValue = "808374140" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { @@ -352,44 +365,44 @@ void flashElements(HashSet var1, int var2, int var3) { if (var5.hasValidElement()) { int var6 = var5.getElement(); if (var1.contains(var6)) { - WorldMapElement var7 = SequenceDefinition.WorldMapElement_get(var6); + WorldMapElement var7 = class138.WorldMapElement_get(var6); this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method1427(var1, var2, var3); + this.method1457(var1, var2, var3); } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lki;[Luu;Lkw;I)V", - garbageValue = "-1395364958" + descriptor = "(Lku;[Luk;Lkd;B)V", + garbageValue = "-44" ) - void method1418(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method1448(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); - this.method1422(var4, var5, this.worldMapData_0, var1); + this.method1452(var4, var5, this.worldMapData_0, var1); } } for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { - this.method1420(var4, var5, this.worldMapData_0, var1, var2); + this.method1450(var4, var5, this.worldMapData_0, var1, var2); } } } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lki;[Luu;Lkw;I)V", - garbageValue = "-1253145142" + descriptor = "(Lku;[Luk;Lkd;I)V", + garbageValue = "-2115982333" ) - void method1419(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method1449(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -401,7 +414,7 @@ void method1419(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { this.drawTileGround(var6, var7, var5, var1, var3); - this.method1422(var6, var7, var5, var1); + this.method1452(var6, var7, var5, var1); } } } @@ -413,27 +426,27 @@ void method1419(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { - this.method1420(var6, var7, var5, var1, var2); + this.method1450(var6, var7, var5, var1, var2); } } } } - @ObfuscatedName("au") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IILkm;Lki;[Luu;I)V", - garbageValue = "-1407383882" + descriptor = "(IILke;Lku;[Luk;B)V", + garbageValue = "32" ) - void method1420(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method1425(var1, var2, var3); - this.method1424(var1, var2, var3, var5); + void method1450(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method1455(var1, var2, var3); + this.method1454(var1, var2, var3, var5); } - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IILkm;Lki;Lkw;I)V", - garbageValue = "-714242419" + descriptor = "(IILke;Lku;Lkd;I)V", + garbageValue = "-1336656209" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { @@ -444,57 +457,134 @@ void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScale } int var8 = 16711935; + int var9; if (var7 != -1) { - var8 = FontName.method2418(var7, this.backgroundColor); + int var10 = this.backgroundColor; + FloorOverlayDefinition var12 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); + FloorOverlayDefinition var11; + if (var12 != null) { + var11 = var12; + } else { + byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); + var12 = new FloorOverlayDefinition(); + if (var13 != null) { + var12.decode(new Buffer(var13), var7); + } + + var12.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var12, (long)var7); + var11 = var12; + } + + if (var11 == null) { + var9 = var10; + } else { + int var14; + int var15; + if (var11.secondaryRgb >= 0) { + var15 = HitSplatDefinition.method1026(var11.secondaryHue, var11.secondarySaturation, var11.secondaryLightness); + var14 = ApproximateRouteStrategy.method342(var15, 96); + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var14] | -16777216; + } else if (var11.texture >= 0) { + var15 = ApproximateRouteStrategy.method342(Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; + } else if (var11.primaryRgb == 16711935) { + var9 = var10; + } else { + var15 = HitSplatDefinition.method1026(var11.hue, var11.saturation, var11.lightness); + var14 = ApproximateRouteStrategy.method342(var15, 96); + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var14] | -16777216; + } + } + + var8 = var9; } - if (var7 > -1 && var3.field2402[0][var1][var2] == 0) { + if (var7 > -1 && var3.field2427[0][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - int var9 = this.method1423(var1, var2, var3, var5); + var9 = this.method1453(var1, var2, var3, var5); if (var7 == -1) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method1531(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2402[0][var1][var2], var3.field2403[0][var1][var2]); + var4.method1575(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2427[0][var1][var2], var3.field2426[0][var1][var2]); } } } - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IILkm;Lki;I)V", - garbageValue = "-1830156506" + descriptor = "(IILke;Lku;I)V", + garbageValue = "-1187093526" ) - void method1422(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + void method1452(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { for (int var5 = 1; var5 < var3.planes; ++var5) { int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; if (var6 > -1) { - int var7 = FontName.method2418(var6, this.backgroundColor); - if (var3.field2402[var5][var1][var2] == 0) { + int var8 = this.backgroundColor; + FloorOverlayDefinition var10 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6); + FloorOverlayDefinition var9; + if (var10 != null) { + var9 = var10; + } else { + byte[] var11 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); + var10 = new FloorOverlayDefinition(); + if (var11 != null) { + var10.decode(new Buffer(var11), var6); + } + + var10.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var10, (long)var6); + var9 = var10; + } + + int var7; + if (var9 == null) { + var7 = var8; + } else { + int var12; + int var13; + if (var9.secondaryRgb >= 0) { + var13 = HitSplatDefinition.method1026(var9.secondaryHue, var9.secondarySaturation, var9.secondaryLightness); + var12 = ApproximateRouteStrategy.method342(var13, 96); + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; + } else if (var9.texture >= 0) { + var13 = ApproximateRouteStrategy.method342(Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var13] | -16777216; + } else if (var9.primaryRgb == 16711935) { + var7 = var8; + } else { + var13 = HitSplatDefinition.method1026(var9.hue, var9.saturation, var9.lightness); + var12 = ApproximateRouteStrategy.method342(var13, 96); + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; + } + } + + if (var3.field2427[var5][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var4.method1531(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2402[var5][var1][var2], var3.field2403[var5][var1][var2]); + var4.method1575(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2427[var5][var1][var2], var3.field2426[var5][var1][var2]); } } } } - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IILkm;Lkw;I)I", - garbageValue = "1088231738" + descriptor = "(IILke;Lkd;I)I", + garbageValue = "-1267425507" ) - int method1423(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + int method1453(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IILkm;[Luu;I)V", - garbageValue = "2129518441" + descriptor = "(IILke;[Luk;I)V", + garbageValue = "-2109687749" ) - void method1424(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + void method1454(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { for (int var5 = 0; var5 < var3.planes; ++var5) { WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; if (var6 != null && var6.length != 0) { @@ -502,16 +592,20 @@ void method1424(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] v for (int var8 = 0; var8 < var7.length; ++var8) { WorldMapDecoration var9 = var7[var8]; - int var11 = var9.decoration; - boolean var10 = var11 >= WorldMapDecorationType.field3104.id && var11 <= WorldMapDecorationType.field3105.id; - if (var10 || Players.method622(var9.decoration)) { - ObjectComposition var12 = class90.getObjectDefinition(var9.objectDefinitionId); - if (var12.mapSceneId != -1) { - if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { - var4[var12.mapSceneId].method2635(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); - } else { - var4[var12.mapSceneId].method2635(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); - } + if (!WorldMapLabel.method1534(var9.decoration)) { + int var11 = var9.decoration; + boolean var10 = var11 == WorldMapDecorationType.field3120.id; + if (!var10) { + continue; + } + } + + ObjectComposition var12 = WorldMapElement.getObjectDefinition(var9.objectDefinitionId); + if (var12.mapSceneId != -1) { + if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { + var4[var12.mapSceneId].method2654(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + } else { + var4[var12.mapSceneId].method2654(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); } } } @@ -520,12 +614,12 @@ void method1424(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] v } - @ObfuscatedName("ac") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IILkm;B)V", - garbageValue = "0" + descriptor = "(IILke;I)V", + garbageValue = "-1752874267" ) - void method1425(int var1, int var2, AbstractWorldMapData var3) { + void method1455(int var1, int var2, AbstractWorldMapData var3) { for (int var4 = 0; var4 < var3.planes; ++var4) { WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; if (var5 != null && var5.length != 0) { @@ -533,48 +627,46 @@ void method1425(int var1, int var2, AbstractWorldMapData var3) { for (int var7 = 0; var7 < var6.length; ++var7) { WorldMapDecoration var8 = var6[var7]; - int var10 = var8.decoration; - boolean var9 = var10 >= WorldMapDecorationType.field3109.id && var10 <= WorldMapDecorationType.field3106.id || var10 == WorldMapDecorationType.field3108.id; - if (var9) { - ObjectComposition var11 = class90.getObjectDefinition(var8.objectDefinitionId); - int var12 = var11.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field3109.id) { - this.method1439(var1, var2, var8.rotation, var12); + if (class101.method598(var8.decoration)) { + ObjectComposition var9 = WorldMapElement.getObjectDefinition(var8.objectDefinitionId); + int var10 = var9.int1 != 0 ? -3407872 : -3355444; + if (var8.decoration == WorldMapDecorationType.field3123.id) { + this.method1469(var1, var2, var8.rotation, var10); } - if (var8.decoration == WorldMapDecorationType.field3107.id) { - this.method1439(var1, var2, var8.rotation, -3355444); - this.method1439(var1, var2, var8.rotation + 1, var12); + if (var8.decoration == WorldMapDecorationType.field3121.id) { + this.method1469(var1, var2, var8.rotation, -3355444); + this.method1469(var1, var2, var8.rotation + 1, var10); } - if (var8.decoration == WorldMapDecorationType.field3106.id) { + if (var8.decoration == WorldMapDecorationType.field3122.id) { if (var8.rotation == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } if (var8.rotation == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } - if (var8.decoration == WorldMapDecorationType.field3108.id) { - int var13 = var8.rotation % 2; - int var14; - if (var13 == 0) { - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); + if (var8.decoration == WorldMapDecorationType.field3119.id) { + int var11 = var8.rotation % 2; + int var12; + if (var11 == 0) { + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); } } else { - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); } } } @@ -585,10 +677,10 @@ void method1425(int var1, int var2, AbstractWorldMapData var3) { } - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "1126474202" + descriptor = "(IILjava/util/HashSet;IB)V", + garbageValue = "-13" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { @@ -599,33 +691,33 @@ void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { while (var7.hasNext()) { Entry var8 = (Entry)var7.next(); Coord var9 = (Coord)var8.getKey(); - int var10 = (int)((float)var9.x * var5 + (float)var1 - var6); - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); + int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); + int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); if (var12 != null && var12.hasValidElement()) { var12.screenX = var10; var12.screenY = var11; - WorldMapElement var13 = SequenceDefinition.WorldMapElement_get(var12.getElement()); + WorldMapElement var13 = class138.WorldMapElement_get(var12.getElement()); if (!var3.contains(var13.getObjectId())) { - this.method1429(var12, var10, var11, var5); + this.method1459(var12, var10, var11, var5); } } } } - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "33554432" + garbageValue = "1452687017" ) - void method1427(HashSet var1, int var2, int var3) { + void method1457(HashSet var1, int var2, int var3) { Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.hasValidElement()) { - WorldMapElement var6 = SequenceDefinition.WorldMapElement_get(var5.getElement()); + WorldMapElement var6 = class138.WorldMapElement_get(var5.getElement()); if (var6 != null && var1.contains(var6.getObjectId())) { this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } @@ -634,10 +726,10 @@ void method1427(HashSet var1, int var2, int var3) { } - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Lho;IIIII)V", - garbageValue = "-756620409" + descriptor = "(Lhd;IIIII)V", + garbageValue = "-54232319" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { @@ -652,51 +744,51 @@ void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, in } } - @ObfuscatedName("ai") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lkv;IIFI)V", - garbageValue = "652243452" + descriptor = "(Lkp;IIFB)V", + garbageValue = "-45" ) - void method1429(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = SequenceDefinition.WorldMapElement_get(var1.getElement()); - this.method1430(var5, var2, var3); - this.method1431(var1, var5, var2, var3, var4); + void method1459(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = class138.WorldMapElement_get(var1.getElement()); + this.method1460(var5, var2, var3); + this.method1461(var1, var5, var2, var3, var4); } - @ObfuscatedName("al") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(Lho;IIB)V", - garbageValue = "1" + descriptor = "(Lhd;III)V", + garbageValue = "1788573667" ) - void method1430(WorldMapElement var1, int var2, int var3) { + void method1460(WorldMapElement var1, int var2, int var3) { SpritePixels var4 = var1.getSpriteBool(false); if (var4 != null) { - int var5 = this.method1433(var4, var1.horizontalAlignment); - int var6 = this.method1434(var4, var1.verticalAlignment); + int var5 = this.method1463(var4, var1.horizontalAlignment); + int var6 = this.method1464(var4, var1.verticalAlignment); var4.drawTransBgAt(var5 + var2, var3 + var6); } } - @ObfuscatedName("bd") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(Lkv;Lho;IIFB)V", - garbageValue = "10" + descriptor = "(Lkp;Lhd;IIFI)V", + garbageValue = "1203085844" ) - void method1431(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + void method1461(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.getLabel(); if (var6 != null) { - if (var6.size.method1365(var5)) { + if (var6.size.method1394(var5)) { Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1513, 0, 1, 0, var7.ascent / 2); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1522, 0, 1, 0, var7.ascent / 2); } } } - @ObfuscatedName("bb") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;IS)V", - garbageValue = "12372" + descriptor = "(IILjava/util/HashSet;IB)V", + garbageValue = "-21" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { @@ -708,62 +800,62 @@ void drawMapLinks(int var1, int var2, HashSet var3, int var4) { if (var7.hasValidElement()) { int var8 = var7.coord2.x % 64; int var9 = var7.coord2.y % 64; - var7.screenX = (int)((float)var8 * var5 + (float)var1); - var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); + var7.screenX = (int)((float)var1 + var5 * (float)var8); + var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); if (!var3.contains(var7.getElement())) { - this.method1429(var7, var7.screenX, var7.screenY, var5); + this.method1459(var7, var7.screenX, var7.screenY, var5); } } } } - @ObfuscatedName("bn") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(Lud;Lhz;B)I", - garbageValue = "62" + descriptor = "(Lui;Lhe;I)I", + garbageValue = "2074198968" ) - int method1433(SpritePixels var1, HorizontalAlignment var2) { + int method1463(SpritePixels var1, HorizontalAlignment var2) { switch(var2.value) { case 0: - return -var1.subWidth / 2; - case 1: return 0; + case 2: + return -var1.subWidth / 2; default: return -var1.subWidth; } } - @ObfuscatedName("ba") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Lud;Lhl;I)I", - garbageValue = "1142976391" + descriptor = "(Lui;Lhy;I)I", + garbageValue = "693958436" ) - int method1434(SpritePixels var1, VerticalAlignment var2) { + int method1464(SpritePixels var1, VerticalAlignment var2) { switch(var2.value) { case 0: - return 0; - case 2: return -var1.subHeight / 2; + case 1: + return 0; default: return -var1.subHeight; } } - @ObfuscatedName("bs") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(II)Lka;", - garbageValue = "-8386743" + descriptor = "(IB)Lkq;", + garbageValue = "-90" ) - WorldMapLabel method1435(int var1) { - WorldMapElement var2 = SequenceDefinition.WorldMapElement_get(var1); + WorldMapLabel method1465(int var1) { + WorldMapElement var2 = class138.WorldMapElement_get(var1); return this.createMapLabel(var2); } - @ObfuscatedName("bp") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(Lho;B)Lka;", - garbageValue = "28" + descriptor = "(Lhd;I)Lkq;", + garbageValue = "-1839741951" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { @@ -781,7 +873,7 @@ WorldMapLabel createMapLabel(WorldMapElement var1) { } WorldMapLabelSize var7 = var5[var6]; - if (var3 == var7.field2300) { + if (var3 == var7.field2324) { var2 = var7; break; } @@ -819,12 +911,12 @@ WorldMapLabel createMapLabel(WorldMapElement var1) { } } - @ObfuscatedName("bv") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(IIIIII)Ljava/util/List;", - garbageValue = "581283475" + descriptor = "(IIIIIB)Ljava/util/List;", + garbageValue = "4" ) - List method1437(int var1, int var2, int var3, int var4, int var5) { + List method1467(int var1, int var2, int var3, int var4, int var5) { LinkedList var6 = new LinkedList(); if (var4 >= var1 && var5 >= var2) { if (var4 < var3 + var1 && var5 < var3 + var2) { @@ -856,10 +948,10 @@ List method1437(int var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/List;", - garbageValue = "-1741054252" + descriptor = "(B)Ljava/util/List;", + garbageValue = "4" ) @Export("icons") List icons() { @@ -869,12 +961,12 @@ List icons() { return var1; } - @ObfuscatedName("bo") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "2121569631" + descriptor = "(IIIIB)V", + garbageValue = "-29" ) - void method1439(int var1, int var2, int var3, int var4) { + void method1469(int var1, int var2, int var3, int var4) { var3 %= 4; if (var3 == 0) { Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); @@ -893,40 +985,4 @@ void method1439(int var1, int var2, int var3, int var4) { } } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "689945900" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; - if (var0 < 0 || var0 >= 65536) { - var0 >>>= 16; - var1 += 16; - } - - if (var0 >= 256) { - var0 >>>= 8; - var1 += 8; - } - - if (var0 >= 16) { - var0 >>>= 4; - var1 += 4; - } - - if (var0 >= 4) { - var0 >>>= 2; - var1 += 2; - } - - if (var0 >= 1) { - var0 >>>= 1; - ++var1; - } - - return var0 + var1; - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapScaleHandler.java b/osrs/src/main/java/WorldMapScaleHandler.java index c9b5287c2..8a363c151 100644 --- a/osrs/src/main/java/WorldMapScaleHandler.java +++ b/osrs/src/main/java/WorldMapScaleHandler.java @@ -1,23 +1,15 @@ -import java.util.LinkedList; -import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("ku") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("on") - @ObfuscatedSignature( - descriptor = "Lmt;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("tileTemplates") byte[][][] tileTemplates; @@ -25,25 +17,25 @@ public class WorldMapScaleHandler { this.pixelsPerTile = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "16748608" + descriptor = "(IIIIIIIIS)V", + garbageValue = "-18273" ) - void method1531(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method1575(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { - var8 = this.method1532(var8, var7); - var7 = this.method1533(var7); + var8 = this.method1576(var8, var7); + var7 = this.method1577(var7); Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(IIB)I", - garbageValue = "3" + garbageValue = "-45" ) - int method1532(int var1, int var2) { + int method1576(int var1, int var2) { if (var2 == 9) { var1 = var1 + 1 & 3; } @@ -59,12 +51,12 @@ int method1532(int var1, int var2) { return var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-535525298" + garbageValue = "-1563527321" ) - int method1533(int var1) { + int method1577(int var1) { if (var1 != 9 && var1 != 10) { return var1 == 11 ? 8 : var1; } else { @@ -72,10 +64,10 @@ int method1533(int var1) { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-39" + descriptor = "(I)V", + garbageValue = "785325219" ) @Export("init") void init() { @@ -92,10 +84,10 @@ void init() { } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-69" + descriptor = "(I)V", + garbageValue = "2061815829" ) @Export("init0") void init0() { @@ -159,10 +151,10 @@ void init0() { this.tileTemplates[0][3] = var1; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-1" + descriptor = "(I)V", + garbageValue = "-555393212" ) @Export("init1") void init1() { @@ -230,10 +222,10 @@ void init1() { this.tileTemplates[1][3] = var1; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1297790581" + descriptor = "(B)V", + garbageValue = "-58" ) @Export("init2") void init2() { @@ -297,10 +289,10 @@ void init2() { this.tileTemplates[2][3] = var1; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1279427771" + garbageValue = "-1088178192" ) @Export("init3") void init3() { @@ -364,10 +356,10 @@ void init3() { this.tileTemplates[3][3] = var1; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-267130347" + garbageValue = "1688541699" ) @Export("init4") void init4() { @@ -431,10 +423,10 @@ void init4() { this.tileTemplates[4][3] = var1; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-66" + descriptor = "(I)V", + garbageValue = "1023862061" ) @Export("init5") void init5() { @@ -500,10 +492,10 @@ void init5() { this.tileTemplates[5][3] = var1; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2096123364" + descriptor = "(S)V", + garbageValue = "18020" ) @Export("init6") void init6() { @@ -569,10 +561,10 @@ void init6() { this.tileTemplates[6][3] = var1; } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1959856235" + descriptor = "(B)V", + garbageValue = "-68" ) @Export("init7") void init7() { @@ -638,241 +630,13 @@ void init7() { this.tileTemplates[7][3] = var1; } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(IZIZB)V", - garbageValue = "-4" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (class387.World_worlds != null) { - class150.doWorldSorting(0, class387.World_worlds.length - 1, var0, var1, var2, var3); - } - - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "1004328214" - ) - static int method1545(int var0, Script var1, boolean var2) { - int var3; - int var5; - int var7; - Object var21; - class507 var22; - if (var0 != 7500 && var0 != 7508) { - if (var0 != 7501) { - int var4; - int var6; - if (var0 == 7502) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = ViewportMouse.method1319(var4); - var7 = Message.method337(var4); - int var8 = Timer.method2114(var4); - DbRowType var23 = class424.getDbRowType(var3); - DbTableType var24 = AbstractSocket.getDbTableType(var6); - int[] var25 = var24.types[var7]; - int var12 = 0; - int var13 = var25.length; - if (var8 >= 0) { - if (var8 >= var13) { - throw new RuntimeException("Tuple index out-of-bounds. Requested: " + var8 + ", Max: " + var13); - } - - var12 = var8; - var13 = var8 + 1; - } - - Object[] var14 = var23.getColumnType(var7); - if (var14 == null && var24.defaultValues != null) { - var14 = var24.defaultValues[var7]; - } - - int var15; - int var16; - if (var14 == null) { - for (var15 = var12; var15 < var13; ++var15) { - var16 = var25[var15]; - class503 var19 = class395.method1994(var16); - if (var19 == class503.field4089) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class346.method1835(var16); - } - } - - return 1; - } else { - var15 = var14.length / var25.length; - if (var5 >= 0 && var5 < var15) { - for (var16 = var12; var16 < var13; ++var16) { - int var17 = var16 + var25.length * var5; - class503 var18 = class395.method1994(var25[var16]); - if (var18 == class503.field4089) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = (String)var14[var17]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (Integer)var14[var17]; - } - } - - return 1; - } else { - throw new RuntimeException(); - } - } - } else if (var0 == 7503) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = 0; - var6 = ViewportMouse.method1319(var4); - var7 = Message.method337(var4); - DbRowType var26 = class424.getDbRowType(var3); - DbTableType var9 = AbstractSocket.getDbTableType(var6); - int[] var10 = var9.types[var7]; - Object[] var11 = var26.getColumnType(var7); - if (var11 == null && var9.defaultValues != null) { - var11 = var9.defaultValues[var7]; - } - - if (var11 != null) { - var5 = var11.length / var10.length; - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; - return 1; - } else if (var0 != 7504 && var0 != 7510) { - if (var0 == 7505) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - DbRowType var28 = class424.getDbRowType(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var28.tableId; - return 1; - } else if (var0 == 7506) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = -1; - if (WorldMapAreaData.field2453 != null && var3 >= 0 && var3 < WorldMapAreaData.field2453.size()) { - var4 = (Integer)WorldMapAreaData.field2453.get(var3); - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - return 1; - } else if (var0 != 7507 && var0 != 7509) { - return 2; - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var21 = class102.method608(var3); - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var22 = class477.method2342(var5); - if (var22 == null) { - throw new RuntimeException(); - } else if (ViewportMouse.method1319(var5) != Client.field547) { - throw new RuntimeException(); - } else if (WorldMapAreaData.field2453 == null && WorldMapAreaData.field2453.isEmpty()) { - throw new RuntimeException(); - } else { - var7 = Timer.method2114(var5); - List var20 = var22.method2485(var21, var7); - WorldMapAreaData.field2453 = new LinkedList(WorldMapAreaData.field2453); - if (var20 != null) { - WorldMapAreaData.field2453.retainAll(var20); - } else { - WorldMapAreaData.field2453.clear(); - } - - class210.field1840 = WorldMapAreaData.field2453.iterator(); - if (var0 == 7507) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapAreaData.field2453.size(); - } - - return 1; - } - } - } else { - --Interpreter.Interpreter_intStackSize; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - class507 var27 = JagexCache.method902(var3); - if (var27 == null) { - throw new RuntimeException(); - } else { - WorldMapAreaData.field2453 = var27.method2485(0, 0); - var5 = 0; - if (WorldMapAreaData.field2453 != null) { - Client.field547 = var3; - class210.field1840 = WorldMapAreaData.field2453.iterator(); - var5 = WorldMapAreaData.field2453.size(); - } - - if (var0 == 7504) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; - } - - return 1; - } - } - } else { - if (class210.field1840 != null && class210.field1840.hasNext()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (Integer)class210.field1840.next(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var21 = class102.method608(var3); - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var22 = class477.method2342(var5); - if (var22 == null) { - throw new RuntimeException(); - } else { - var7 = Timer.method2114(var5); - WorldMapAreaData.field2453 = var22.method2485(var21, var7); - if (WorldMapAreaData.field2453 != null) { - Client.field547 = ViewportMouse.method1319(var5); - class210.field1840 = WorldMapAreaData.field2453.iterator(); - if (var0 == 7500) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapAreaData.field2453.size(); - } - } else { - Client.field547 = -1; - class210.field1840 = null; - if (var0 == 7500) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - } - - return 1; - } - } - } - - @ObfuscatedName("hd") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "718957128" ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); - class159.method836(); - UserComparator5.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); - } - - Client.field594.method1071(); - System.gc(); - RouteStrategy.method1107(0, 0); - class306.field2755.clear(); - Client.playingJingle = false; - class133.method727(); - class129.updateGameState(10); + static void method1587(String var0, String var1, String var2) { + PcmPlayer.method212(7); + class318.setLoginResponseString(var0, var1, var2); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSection.java b/osrs/src/main/java/WorldMapSection.java index 4303ad398..57e6a893b 100644 --- a/osrs/src/main/java/WorldMapSection.java +++ b/osrs/src/main/java/WorldMapSection.java @@ -3,54 +3,54 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("kw") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljs;I)V", - garbageValue = "104966018" + descriptor = "(Ljf;I)V", + garbageValue = "-474032336" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "37" + descriptor = "(IIII)Z", + garbageValue = "509257779" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1055724816" + descriptor = "(IIB)Z", + garbageValue = "-94" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1968685542" + garbageValue = "1978048199" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIB)Lmr;", - garbageValue = "119" + descriptor = "(III)Lmc;", + garbageValue = "-1281040923" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "706418314" + descriptor = "(Ltm;B)V", + garbageValue = "47" ) @Export("read") void read(Buffer var1); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSection0.java b/osrs/src/main/java/WorldMapSection0.java index dd90422e7..efce79174 100644 --- a/osrs/src/main/java/WorldMapSection0.java +++ b/osrs/src/main/java/WorldMapSection0.java @@ -3,59 +3,59 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("kj") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("oldZ") int oldZ; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("newZ") int newZ; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("oldX") int oldX; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("oldY") int oldY; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("newX") int newX; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("newY") int newY; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("at") + @ObfuscatedName("aq") @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("newChunkYHigh") int newChunkYHigh; WorldMapSection0() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljs;I)V", - garbageValue = "104966018" + descriptor = "(Ljf;I)V", + garbageValue = "-474032336" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -77,34 +77,34 @@ public void expandBounds(WorldMapArea var1) { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "37" + descriptor = "(IIII)Z", + garbageValue = "509257779" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { + if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; } else { return false; } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1055724816" + descriptor = "(IIB)Z", + garbageValue = "-94" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1968685542" + garbageValue = "1978048199" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -116,10 +116,10 @@ public int[] getBorderTileLengths(int var1, int var2, int var3) { } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIB)Lmr;", - garbageValue = "119" + descriptor = "(III)Lmc;", + garbageValue = "-1281040923" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -132,10 +132,10 @@ public Coord coord(int var1, int var2) { } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "706418314" + descriptor = "(Ltm;B)V", + garbageValue = "47" ) @Export("read") public void read(Buffer var1) { @@ -156,12 +156,21 @@ public void read(Buffer var1) { this.postRead(); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-33" + descriptor = "(I)V", + garbageValue = "-1295172600" ) @Export("postRead") void postRead() { } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)[Lls;", + garbageValue = "14" + ) + public static ZoneOperation[] method1506() { + return new ZoneOperation[]{ZoneOperation.MAPPROJ_ANIM, ZoneOperation.LOC_DEL, ZoneOperation.OBJ_COUNT, ZoneOperation.field2607, ZoneOperation.LOC_ADD_CHANGE, ZoneOperation.AREA_SOUND, ZoneOperation.LOC_ANIM, ZoneOperation.OBJ_ADD, ZoneOperation.OBJ_DEL_LEGACY, ZoneOperation.MAP_ANIM, ZoneOperation.PREFETCH_GAMEOBJECTS, ZoneOperation.OBJ_DEL}; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSection1.java b/osrs/src/main/java/WorldMapSection1.java index b365c6261..2ab4216d2 100644 --- a/osrs/src/main/java/WorldMapSection1.java +++ b/osrs/src/main/java/WorldMapSection1.java @@ -3,35 +3,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.ArrayList; + @ObfuscatedName("ky") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("minPlane") int minPlane; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("planes") int planes; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("regionStartX") int regionStartX; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("regionStartY") int regionStartY; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("regionEndX") int regionEndX; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("regionEndY") int regionEndY; WorldMapSection1() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljs;I)V", - garbageValue = "104966018" + descriptor = "(Ljf;I)V", + garbageValue = "-474032336" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -53,10 +55,10 @@ public void expandBounds(WorldMapArea var1) { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "37" + descriptor = "(IIII)Z", + garbageValue = "509257779" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -67,20 +69,20 @@ public boolean containsCoord(int var1, int var2, int var3) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1055724816" + descriptor = "(IIB)Z", + garbageValue = "-94" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1968685542" + garbageValue = "1978048199" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -92,10 +94,10 @@ public int[] getBorderTileLengths(int var1, int var2, int var3) { } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIB)Lmr;", - garbageValue = "119" + descriptor = "(III)Lmc;", + garbageValue = "-1281040923" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -108,10 +110,10 @@ public Coord coord(int var1, int var2) { } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "706418314" + descriptor = "(Ltm;B)V", + garbageValue = "47" ) @Export("read") public void read(Buffer var1) { @@ -124,12 +126,383 @@ public void read(Buffer var1) { this.postRead(); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-825270645" + descriptor = "(B)V", + garbageValue = "-6" ) @Export("postRead") void postRead() { } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ldy;B)V", + garbageValue = "21" + ) + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + NPC.runScript(var0, 500000, 475000); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(ILdh;ZB)I", + garbageValue = "-20" + ) + static int method1553(int var0, Script var1, boolean var2) { + if (var0 == 3200) { + SoundCache.Interpreter_intStackSize -= 3; + class27.queueSoundEffect(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]); + return 1; + } else { + int var3; + int var4; + int var5; + int var6; + int var7; + if (var0 == 3201) { + SoundCache.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 4]; + ArrayList var8 = new ArrayList(); + var8.add(var3); + class157.method836(var8, var4, var5, var6, var7); + return 1; + } else if (var0 == 3202) { + SoundCache.Interpreter_intStackSize -= 2; + Login.playJingle(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + return 1; + } else { + class90 var12; + class89 var13; + String var15; + if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { + boolean var16; + if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { + if (var0 == 3211) { + return 1; + } else if (var0 == 3216) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var4 = 0; + class90 var18 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var3); + if (var18 != null) { + var4 = var18 != class90.field893 ? 1 : 0; + } + + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4; + return 1; + } else if (var0 == 3218) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var4 = 0; + class89 var10 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var3); + if (var10 != null) { + var4 = var10 != class89.field884 ? 1 : 0; + } + + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4; + return 1; + } else if (var0 != 3217 && var0 != 3219) { + if (var0 == 3220) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Script.method445(var3, var4); + return 1; + } else if (var0 == 3221) { + SoundCache.Interpreter_intStackSize -= 6; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 4]; + int var11 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 5]; + ArrayList var9 = new ArrayList(); + var9.add(var3); + var9.add(var4); + class157.method836(var9, var5, var6, var7, var11); + return 1; + } else if (var0 == 3222) { + SoundCache.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + PacketWriter.someMusicMethod(var3, var4, var5, var6); + return 1; + } else { + return 2; + } + } else { + var12 = class90.field893; + var13 = class89.field884; + var16 = true; + boolean var17 = true; + if (var0 == 3217) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var12 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var7); + if (var12 == null) { + throw new RuntimeException(String.format("Unrecognized device option %d", var7)); + } + } + + if (var0 == 3219) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var13 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var7); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized game option %d", var7)); + } + } + + String var14; + byte var19; + if (var13 == class89.field884) { + switch(var12.field895) { + case 1: + case 2: + case 3: + var19 = 0; + var6 = 1; + break; + case 4: + var19 = 0; + var6 = Integer.MAX_VALUE; + break; + case 5: + var19 = 0; + var6 = 100; + break; + default: + var14 = String.format("Unkown device option: %s.", var12.toString()); + throw new RuntimeException(var14); + } + } else { + switch(var13.field885) { + case 1: + var19 = 0; + var6 = 1; + break; + case 2: + case 3: + case 4: + var19 = 0; + var6 = 100; + break; + default: + var14 = String.format("Unkown game option: %s.", var13.toString()); + throw new RuntimeException(var14); + } + } + + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var19; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6; + return 1; + } + } else { + var12 = class90.field893; + var13 = class89.field884; + var16 = false; + if (var0 == 3214) { + var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var12 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var6); + if (var12 == null) { + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); + } + } + + if (var0 == 3215) { + var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var13 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); + } + } + + if (var0 == 3210) { + var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var12 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var6); + if (var12 == null) { + var13 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); + } + } + } else if (var0 == 3182) { + var12 = class90.field890; + } else if (var0 == 3204) { + var13 = class89.field882; + } else if (var0 == 3206) { + var13 = class89.field883; + } else if (var0 == 3208) { + var13 = class89.field880; + } + + if (var13 == class89.field884) { + switch(var12.field895) { + case 1: + var5 = class449.clientPreferences.getIsUsernameHidden() ? 1 : 0; + break; + case 2: + var5 = class449.clientPreferences.getTitleMusicDisabled() ? 1 : 0; + break; + case 3: + var5 = class449.clientPreferences.method550() ? 1 : 0; + break; + case 4: + var5 = class449.clientPreferences.method552(); + break; + case 5: + var5 = PlayerType.method1883(); + break; + default: + var15 = String.format("Unkown device option: %s.", var12.toString()); + throw new RuntimeException(var15); + } + } else { + switch(var13.field885) { + case 1: + var5 = class449.clientPreferences.getRoofsHidden() ? 1 : 0; + break; + case 2: + var6 = class449.clientPreferences.getCurrentMusicVolume(); + var5 = Math.round((float)(var6 * 100) / 255.0F); + break; + case 3: + var6 = class449.clientPreferences.getCurrentSoundEffectsVolume(); + var5 = Math.round((float)(var6 * 100) / 127.0F); + break; + case 4: + var6 = class449.clientPreferences.getAreaSoundEffectsVolume(); + var5 = Math.round((float)(var6 * 100) / 127.0F); + break; + default: + var15 = String.format("Unkown game option: %s.", var13.toString()); + throw new RuntimeException(var15); + } + } + + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var5; + return 1; + } + } else { + var12 = class90.field893; + var13 = class89.field884; + var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var0 == 3212) { + var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var12 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var6); + if (var12 == null) { + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); + } + } + + if (var0 == 3213) { + var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var13 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); + } + } + + if (var0 == 3209) { + var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var12 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var6); + if (var12 == null) { + var13 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); + } + } + } else if (var0 == 3181) { + var12 = class90.field890; + } else if (var0 == 3203) { + var13 = class89.field882; + } else if (var0 == 3205) { + var13 = class89.field883; + } else if (var0 == 3207) { + var13 = class89.field880; + } + + if (var13 == class89.field884) { + switch(var12.field895) { + case 1: + class449.clientPreferences.setIsUsernameHidden(var5 == 1); + break; + case 2: + class449.clientPreferences.getTitleMusicDisabled(var5 == 1); + break; + case 3: + class449.clientPreferences.method548(var5 == 1); + break; + case 4: + if (var5 < 0) { + var5 = 0; + } + + class449.clientPreferences.method551(var5); + break; + case 5: + class20.method69(var5); + break; + default: + var15 = String.format("Unkown device option: %s.", var12.toString()); + throw new RuntimeException(var15); + } + } else { + switch(var13.field885) { + case 1: + class449.clientPreferences.setRoofsHidden(var5 == 1); + break; + case 2: + var5 = Math.min(Math.max(var5, 0), 100); + var6 = Math.round((float)(var5 * 255) / 100.0F); + WorldMapEvent.method1588(var6); + break; + case 3: + var5 = Math.min(Math.max(var5, 0), 100); + var6 = Math.round((float)(var5 * 127) / 100.0F); + class385.method2026(var6); + break; + case 4: + var5 = Math.min(Math.max(var5, 0), 100); + var6 = Math.round((float)(var5 * 127) / 100.0F); + class14.method44(var6); + break; + default: + var15 = String.format("Unkown game option: %s.", var13.toString()); + throw new RuntimeException(var15); + } + } + + return 1; + } + } + } + } + + @ObfuscatedName("iz") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1870954980" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.playingJingle) { + Script.method445(0, 0); + } else if (var0 != -1 && !class172.method906(var0) && class449.clientPreferences.getCurrentMusicVolume() != 0) { + ArrayList var1 = new ArrayList(); + var1.add(new MusicSong(class385.archive6, var0, 0, class449.clientPreferences.getCurrentMusicVolume(), false)); + if (Client.playingJingle) { + class305.field2773.clear(); + class305.field2773.addAll(var1); + class270.method1537(0, 100, 100, 0); + } else { + class53.method291(var1, 0, 100, 100, 0, false); + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSection2.java b/osrs/src/main/java/WorldMapSection2.java index b13b4cb7a..62d477956 100644 --- a/osrs/src/main/java/WorldMapSection2.java +++ b/osrs/src/main/java/WorldMapSection2.java @@ -1,71 +1,70 @@ -import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("jp") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("minPlane") int minPlane; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("planes") int planes; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @Export("regionStartX") int regionStartX; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("regionStartY") int regionStartY; - @ObfuscatedName("as") + @ObfuscatedName("ac") @Export("regionEndX") int regionEndX; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("regionEndY") int regionEndY; - @ObfuscatedName("ag") - int field2308; @ObfuscatedName("az") - int field2317; - @ObfuscatedName("av") - int field2314; + int field2342; @ObfuscatedName("ap") - int field2311; + int field2339; + @ObfuscatedName("aa") + int field2333; + @ObfuscatedName("af") + int field2336; WorldMapSection2() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljs;I)V", - garbageValue = "104966018" + descriptor = "(Ljf;I)V", + garbageValue = "-474032336" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2308) { - var1.regionLowX = this.field2308; + if (var1.regionLowX > this.field2342) { + var1.regionLowX = this.field2342; } - if (var1.regionHighX < this.field2314) { - var1.regionHighX = this.field2314; + if (var1.regionHighX < this.field2333) { + var1.regionHighX = this.field2333; } - if (var1.regionLowY > this.field2317) { - var1.regionLowY = this.field2317; + if (var1.regionLowY > this.field2339) { + var1.regionLowY = this.field2339; } - if (var1.regionHighY < this.field2311) { - var1.regionHighY = this.field2311; + if (var1.regionHighY < this.field2336) { + var1.regionHighY = this.field2336; } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "37" + descriptor = "(IIII)Z", + garbageValue = "509257779" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -76,51 +75,51 @@ public boolean containsCoord(int var1, int var2, int var3) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1055724816" + descriptor = "(IIB)Z", + garbageValue = "-94" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field2308 && var1 >> 6 <= this.field2314 && var2 >> 6 >= this.field2317 && var2 >> 6 <= this.field2311; + return var1 >> 6 >= this.field2342 && var1 >> 6 <= this.field2333 && var2 >> 6 >= this.field2339 && var2 >> 6 <= this.field2336; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1968685542" + garbageValue = "1978048199" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{var2 + (this.field2308 * 64 - this.regionStartX * 64), var3 + (this.field2317 * 64 - this.regionStartY * 64)}; + int[] var4 = new int[]{var2 + (this.field2342 * 64 - this.regionStartX * 64), var3 + (this.field2339 * 64 - this.regionStartY * 64)}; return var4; } } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIB)Lmr;", - garbageValue = "119" + descriptor = "(III)Lmc;", + garbageValue = "-1281040923" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.regionStartX * 64 - this.field2308 * 64 + var1; - int var4 = var2 + (this.regionStartY * 64 - this.field2317 * 64); + int var3 = this.regionStartX * 64 - this.field2342 * 64 + var1; + int var4 = var2 + (this.regionStartY * 64 - this.field2339 * 64); return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "706418314" + descriptor = "(Ltm;B)V", + garbageValue = "47" ) @Export("read") public void read(Buffer var1) { @@ -130,30 +129,41 @@ public void read(Buffer var1) { this.regionStartY = var1.readUnsignedShort(); this.regionEndX = var1.readUnsignedShort(); this.regionEndY = var1.readUnsignedShort(); - this.field2308 = var1.readUnsignedShort(); - this.field2317 = var1.readUnsignedShort(); - this.field2314 = var1.readUnsignedShort(); - this.field2311 = var1.readUnsignedShort(); + this.field2342 = var1.readUnsignedShort(); + this.field2339 = var1.readUnsignedShort(); + this.field2333 = var1.readUnsignedShort(); + this.field2336 = var1.readUnsignedShort(); this.postRead(); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1492337341" + descriptor = "(B)V", + garbageValue = "1" ) @Export("postRead") void postRead() { } - @ObfuscatedName("am") + @ObfuscatedName("ny") @ObfuscatedSignature( - descriptor = "(B)Ljava/security/SecureRandom;", - garbageValue = "63" + descriptor = "(B)V", + garbageValue = "120" ) - static SecureRandom method1377() { - SecureRandom var0 = new SecureRandom(); - var0.nextInt(); - return var0; + static final void method1410() { + Client.field511 = Client.cycleCntr; + WorldMapIcon_0.field2397 = true; + } + + @ObfuscatedName("os") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2063894036" + ) + static void method1411() { + if (Client.oculusOrbState == 1) { + Client.oculusOrbOnLocalPlayer = true; + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSectionType.java b/osrs/src/main/java/WorldMapSectionType.java index ada17f2ff..06de7610b 100644 --- a/osrs/src/main/java/WorldMapSectionType.java +++ b/osrs/src/main/java/WorldMapSectionType.java @@ -1,54 +1,47 @@ -import java.applet.Applet; -import java.util.ArrayList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ke") +@ObfuscatedName("ko") @Implements("WorldMapSectionType") -public enum WorldMapSectionType implements class372 { - @ObfuscatedName("aw") +public enum WorldMapSectionType implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lko;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(1, (byte)0), - @ObfuscatedName("ay") + WORLDMAPSECTIONTYPE0(2, (byte)0), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lko;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(0, (byte)1), - @ObfuscatedName("ar") + WORLDMAPSECTIONTYPE1(3, (byte)1), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lko;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(3, (byte)2), - @ObfuscatedName("am") + WORLDMAPSECTIONTYPE2(1, (byte)2), + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lko;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(2, (byte)3); + WORLDMAPSECTIONTYPE3(0, (byte)3); - @ObfuscatedName("ap") + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lns;" ) - @Export("soundSystem") - public static SoundSystem soundSystem; - @ObfuscatedName("ax") - public static short[][] field2391; - @ObfuscatedName("gf") - static int field2392; - @ObfuscatedName("jx") - static int ZONE_X; - @ObfuscatedName("as") + static StudioGame field2417; + @ObfuscatedName("cp") + static int field2416; + @ObfuscatedName("ac") @Export("type") final int type; - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("id") final byte id; @@ -57,133 +50,44 @@ public enum WorldMapSectionType implements class372 { this.id = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "1774560987" + descriptor = "(IB)J", + garbageValue = "-44" ) - public static void method1479(Applet var0, String var1) { - class31.field85 = var0; - if (var1 != null) { - class31.field86 = var1; - } - - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-1332701631" - ) - public static void method1482(Buffer var0, int var1) { - if (JagexCache.JagexCache_randomDat != null) { - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); - } catch (Exception var3) { - } - } - + public static long method1515(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; } - @ObfuscatedName("ap") + @ObfuscatedName("lq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-218910900" + descriptor = "(Ljava/lang/String;Lmi;B)Ljava/lang/String;", + garbageValue = "-26" ) - static final void method1481(String var0) { - Tile.method1160(var0 + " is already on your friend list"); - } - - @ObfuscatedName("ig") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1940153519" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.playingJingle) { - RouteStrategy.method1107(0, 0); - } else if (var0 != -1) { - boolean var1; - if (class306.field2755.isEmpty()) { - var1 = false; - } else { - MusicSong var2 = (MusicSong)class306.field2755.get(0); - var1 = var2 != null && var0 == var2.musicTrackGroupId; - } - - if (!var1 && class150.clientPreferences.getCurrentMusicVolume() != 0) { - ArrayList var3 = new ArrayList(); - var3.add(new MusicSong(class13.archive6, var0, 0, class150.clientPreferences.getCurrentMusicVolume(), false)); - if (Client.playingJingle) { - class306.field2755.clear(); - class306.field2755.addAll(var3); - ArchiveLoader.method464(0, 100, 100, 0); - } else { - UserComparator4.method663(var3, 0, 100, 100, 0, false); - } - } - } - - } - - @ObfuscatedName("ic") - @ObfuscatedSignature( - descriptor = "(Ldf;IIB)V", - garbageValue = "108" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = class135.SequenceDefinition_get(var1).replyMode; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.currentSequenceFrameIndex = 0; - } - - if (var3 == 2) { - var0.currentSequenceFrameIndex = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || class135.SequenceDefinition_get(var1).forcedPriority >= class135.SequenceDefinition_get(var0.sequence).forcedPriority) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.currentSequenceFrameIndex = 0; - var0.field1018 = var0.pathLength; - } - - } - - @ObfuscatedName("oc") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "94" - ) - static void method1485() { - if (UserComparator7.field1171 != null) { - Client.field364 = Client.cycle; - UserComparator7.field1171.method1933(); - - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - UserComparator7.field1171.method1932((Client.players[var0].x >> 7) + AbstractArchive.baseX, (Client.players[var0].y >> 7) + class148.baseY); + static String method1516(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { + for (int var2 = 1; var2 <= 5; ++var2) { + while (true) { + int var3 = var0.indexOf("%" + var2); + if (var3 == -1) { + break; + } + + var0 = var0.substring(0, var3) + class176.method917(UserComparator9.method686(var1, var2 - 1)) + var0.substring(var3 + 2); } } } + return var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSprite.java b/osrs/src/main/java/WorldMapSprite.java index d1064aeb0..3425e3a82 100644 --- a/osrs/src/main/java/WorldMapSprite.java +++ b/osrs/src/main/java/WorldMapSprite.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kw") +@ObfuscatedName("kd") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("tileColors") final int[] tileColors; @@ -18,483 +18,22 @@ public final class WorldMapSprite { this.tileColors = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1192538000" + descriptor = "(IIB)I", + garbageValue = "0" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var1 + var2 * 64]; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IIILin;Lij;Z[I[ILiq;I)I", - garbageValue = "-475105468" - ) - public static int method1499(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7, class217 var8) { - var8.method1111(); - int var9 = var8.method1115(); - int var10 = var8.method1116(); - int[][] var11 = var8.method1118(); - int[][] var12 = var8.method1117(); - int[] var13 = var8.method1119(); - int[] var14 = var8.method1120(); - boolean var15; - int var17; - int var18; - int var23; - int var24; - int var25; - int var26; - int var27; - int var28; - int var29; - int var31; - int var33; - int var43; - if (var2 == 1) { - var15 = class172.method899(var0, var1, var3, var4, var8); - } else { - boolean var16; - int[][] var19; - int[][] var20; - int[] var21; - int[] var22; - byte var30; - int[][] var32; - int var34; - int var35; - if (var2 == 2) { - var17 = var8.method1115(); - var18 = var8.method1116(); - var19 = var8.method1118(); - var20 = var8.method1117(); - var21 = var8.method1119(); - var22 = var8.method1120(); - var23 = var8.method1121(); - var24 = var0; - var25 = var1; - var26 = var17 >> 1; - var27 = var18 >> 1; - var28 = var0 - var26; - var29 = var1 - var27; - var20[var26][var27] = 99; - var19[var26][var27] = 0; - var30 = 0; - var31 = 0; - var21[var30] = var0; - var43 = var30 + 1; - var22[var30] = var1; - var32 = var4.flags; - - while (true) { - if (var43 == var31) { - var8.method1112(var24, var25); - var16 = false; - break; - } - - var24 = var21[var31]; - var25 = var22[var31]; - var31 = var31 + 1 & var23; - var26 = var24 - var28; - var27 = var25 - var29; - var33 = var24 - var4.xInset; - var34 = var25 - var4.yInset; - if (var3.hasArrived(2, var24, var25, var4)) { - var8.method1112(var24, var25); - var16 = true; - break; - } - - var35 = var19[var26][var27] + 1; - if (var26 > 0 && var20[var26 - 1][var27] == 0 && (var32[var33 - 1][var34] & 19136782) == 0 && (var32[var33 - 1][var34 + 1] & 19136824) == 0) { - var21[var43] = var24 - 1; - var22[var43] = var25; - var43 = var43 + 1 & var23; - var20[var26 - 1][var27] = 2; - var19[var26 - 1][var27] = var35; - } - - if (var26 < var17 - 2 && var20[var26 + 1][var27] == 0 && (var32[var33 + 2][var34] & 19136899) == 0 && (var32[var33 + 2][var34 + 1] & 19136992) == 0) { - var21[var43] = var24 + 1; - var22[var43] = var25; - var43 = var43 + 1 & var23; - var20[var26 + 1][var27] = 8; - var19[var26 + 1][var27] = var35; - } - - if (var27 > 0 && var20[var26][var27 - 1] == 0 && (var32[var33][var34 - 1] & 19136782) == 0 && (var32[var33 + 1][var34 - 1] & 19136899) == 0) { - var21[var43] = var24; - var22[var43] = var25 - 1; - var43 = var43 + 1 & var23; - var20[var26][var27 - 1] = 1; - var19[var26][var27 - 1] = var35; - } - - if (var27 < var18 - 2 && var20[var26][var27 + 1] == 0 && (var32[var33][var34 + 2] & 19136824) == 0 && (var32[var33 + 1][var34 + 2] & 19136992) == 0) { - var21[var43] = var24; - var22[var43] = var25 + 1; - var43 = var43 + 1 & var23; - var20[var26][var27 + 1] = 4; - var19[var26][var27 + 1] = var35; - } - - if (var26 > 0 && var27 > 0 && var20[var26 - 1][var27 - 1] == 0 && (var32[var33 - 1][var34] & 19136830) == 0 && (var32[var33 - 1][var34 - 1] & 19136782) == 0 && (var32[var33][var34 - 1] & 19136911) == 0) { - var21[var43] = var24 - 1; - var22[var43] = var25 - 1; - var43 = var43 + 1 & var23; - var20[var26 - 1][var27 - 1] = 3; - var19[var26 - 1][var27 - 1] = var35; - } - - if (var26 < var17 - 2 && var27 > 0 && var20[var26 + 1][var27 - 1] == 0 && (var32[var33 + 1][var34 - 1] & 19136911) == 0 && (var32[var33 + 2][var34 - 1] & 19136899) == 0 && (var32[var33 + 2][var34] & 19136995) == 0) { - var21[var43] = var24 + 1; - var22[var43] = var25 - 1; - var43 = var43 + 1 & var23; - var20[var26 + 1][var27 - 1] = 9; - var19[var26 + 1][var27 - 1] = var35; - } - - if (var26 > 0 && var27 < var18 - 2 && var20[var26 - 1][var27 + 1] == 0 && (var32[var33 - 1][var34 + 1] & 19136830) == 0 && (var32[var33 - 1][var34 + 2] & 19136824) == 0 && (var32[var33][var34 + 2] & 19137016) == 0) { - var21[var43] = var24 - 1; - var22[var43] = var25 + 1; - var43 = var43 + 1 & var23; - var20[var26 - 1][var27 + 1] = 6; - var19[var26 - 1][var27 + 1] = var35; - } - - if (var26 < var17 - 2 && var27 < var18 - 2 && var20[var26 + 1][var27 + 1] == 0 && (var32[var33 + 1][var34 + 2] & 19137016) == 0 && (var32[var33 + 2][var34 + 2] & 19136992) == 0 && (var32[var33 + 2][var34 + 1] & 19136995) == 0) { - var21[var43] = var24 + 1; - var22[var43] = var25 + 1; - var43 = var43 + 1 & var23; - var20[var26 + 1][var27 + 1] = 12; - var19[var26 + 1][var27 + 1] = var35; - } - } - - var15 = var16; - } else { - var17 = var8.method1115(); - var18 = var8.method1116(); - var19 = var8.method1118(); - var20 = var8.method1117(); - var21 = var8.method1119(); - var22 = var8.method1120(); - var23 = var8.method1121(); - var24 = var0; - var25 = var1; - var26 = var17 >> 1; - var27 = var18 >> 1; - var28 = var0 - var26; - var29 = var1 - var27; - var20[var26][var27] = 99; - var19[var26][var27] = 0; - var30 = 0; - var31 = 0; - var21[var30] = var0; - var43 = var30 + 1; - var22[var30] = var1; - var32 = var4.flags; - - label521: - while (true) { - label519: - while (true) { - int var36; - do { - do { - do { - label496: - do { - if (var31 == var43) { - var8.method1112(var24, var25); - var16 = false; - break label521; - } - - var24 = var21[var31]; - var25 = var22[var31]; - var31 = var31 + 1 & var23; - var26 = var24 - var28; - var27 = var25 - var29; - var33 = var24 - var4.xInset; - var34 = var25 - var4.yInset; - if (var3.hasArrived(var2, var24, var25, var4)) { - var8.method1112(var24, var25); - var16 = true; - break label521; - } - - var35 = var19[var26][var27] + 1; - if (var26 > 0 && var20[var26 - 1][var27] == 0 && (var32[var33 - 1][var34] & 19136782) == 0 && (var32[var33 - 1][var34 + var2 - 1] & 19136824) == 0) { - var36 = 1; - - while (true) { - if (var36 >= var2 - 1) { - var21[var43] = var24 - 1; - var22[var43] = var25; - var43 = var43 + 1 & var23; - var20[var26 - 1][var27] = 2; - var19[var26 - 1][var27] = var35; - break; - } - - if ((var32[var33 - 1][var34 + var36] & 19136830) != 0) { - break; - } - - ++var36; - } - } - - if (var26 < var17 - var2 && var20[var26 + 1][var27] == 0 && (var32[var33 + var2][var34] & 19136899) == 0 && (var32[var33 + var2][var34 + var2 - 1] & 19136992) == 0) { - var36 = 1; - - while (true) { - if (var36 >= var2 - 1) { - var21[var43] = var24 + 1; - var22[var43] = var25; - var43 = var43 + 1 & var23; - var20[var26 + 1][var27] = 8; - var19[var26 + 1][var27] = var35; - break; - } - - if ((var32[var33 + var2][var34 + var36] & 19136995) != 0) { - break; - } - - ++var36; - } - } - - if (var27 > 0 && var20[var26][var27 - 1] == 0 && (var32[var33][var34 - 1] & 19136782) == 0 && (var32[var33 + var2 - 1][var34 - 1] & 19136899) == 0) { - var36 = 1; - - while (true) { - if (var36 >= var2 - 1) { - var21[var43] = var24; - var22[var43] = var25 - 1; - var43 = var43 + 1 & var23; - var20[var26][var27 - 1] = 1; - var19[var26][var27 - 1] = var35; - break; - } - - if ((var32[var36 + var33][var34 - 1] & 19136911) != 0) { - break; - } - - ++var36; - } - } - - if (var27 < var18 - var2 && var20[var26][var27 + 1] == 0 && (var32[var33][var34 + var2] & 19136824) == 0 && (var32[var33 + var2 - 1][var34 + var2] & 19136992) == 0) { - var36 = 1; - - while (true) { - if (var36 >= var2 - 1) { - var21[var43] = var24; - var22[var43] = var25 + 1; - var43 = var43 + 1 & var23; - var20[var26][var27 + 1] = 4; - var19[var26][var27 + 1] = var35; - break; - } - - if ((var32[var33 + var36][var34 + var2] & 19137016) != 0) { - break; - } - - ++var36; - } - } - - if (var26 > 0 && var27 > 0 && var20[var26 - 1][var27 - 1] == 0 && (var32[var33 - 1][var34 - 1] & 19136782) == 0) { - var36 = 1; - - while (true) { - if (var36 >= var2) { - var21[var43] = var24 - 1; - var22[var43] = var25 - 1; - var43 = var43 + 1 & var23; - var20[var26 - 1][var27 - 1] = 3; - var19[var26 - 1][var27 - 1] = var35; - break; - } - - if ((var32[var33 - 1][var36 + (var34 - 1)] & 19136830) != 0 || (var32[var36 + (var33 - 1)][var34 - 1] & 19136911) != 0) { - break; - } - - ++var36; - } - } - - if (var26 < var17 - var2 && var27 > 0 && var20[var26 + 1][var27 - 1] == 0 && (var32[var33 + var2][var34 - 1] & 19136899) == 0) { - var36 = 1; - - while (true) { - if (var36 >= var2) { - var21[var43] = var24 + 1; - var22[var43] = var25 - 1; - var43 = var43 + 1 & var23; - var20[var26 + 1][var27 - 1] = 9; - var19[var26 + 1][var27 - 1] = var35; - break; - } - - if ((var32[var33 + var2][var36 + (var34 - 1)] & 19136995) != 0 || (var32[var33 + var36][var34 - 1] & 19136911) != 0) { - break; - } - - ++var36; - } - } - - if (var26 > 0 && var27 < var18 - var2 && var20[var26 - 1][var27 + 1] == 0 && (var32[var33 - 1][var34 + var2] & 19136824) == 0) { - for (var36 = 1; var36 < var2; ++var36) { - if ((var32[var33 - 1][var36 + var34] & 19136830) != 0 || (var32[var36 + (var33 - 1)][var34 + var2] & 19137016) != 0) { - continue label496; - } - } - - var21[var43] = var24 - 1; - var22[var43] = var25 + 1; - var43 = var43 + 1 & var23; - var20[var26 - 1][var27 + 1] = 6; - var19[var26 - 1][var27 + 1] = var35; - } - } while(var26 >= var17 - var2); - } while(var27 >= var18 - var2); - } while(var20[var26 + 1][var27 + 1] != 0); - } while((var32[var33 + var2][var34 + var2] & 19136992) != 0); - - for (var36 = 1; var36 < var2; ++var36) { - if ((var32[var33 + var36][var34 + var2] & 19137016) != 0 || (var32[var33 + var2][var36 + var34] & 19136995) != 0) { - continue label519; - } - } - - var21[var43] = var24 + 1; - var22[var43] = var25 + 1; - var43 = var43 + 1 & var23; - var20[var26 + 1][var27 + 1] = 12; - var19[var26 + 1][var27 + 1] = var35; - } - } - - var15 = var16; - } - } - - int var42 = var0 - (var9 >> 1); - var17 = var1 - (var10 >> 1); - var18 = var8.method1113(); - int var37 = var8.method1114(); - int var38; - int var39; - if (!var15) { - var38 = Integer.MAX_VALUE; - var39 = Integer.MAX_VALUE; - byte var40 = 10; - var23 = var3.approxDestinationX; - var24 = var3.approxDestinationY; - var25 = var3.approxDestinationSizeX; - var26 = var3.approxDestinationSizeY; - - for (var27 = var23 - var40; var27 <= var40 + var23; ++var27) { - for (var28 = var24 - var40; var28 <= var24 + var40; ++var28) { - var29 = var27 - var42; - var43 = var28 - var17; - if (var29 >= 0 && var43 >= 0 && var29 < var9 && var43 < var10 && var11[var29][var43] < 100) { - var31 = 0; - if (var27 < var23) { - var31 = var23 - var27; - } else if (var27 > var23 + var25 - 1) { - var31 = var27 - (var23 + var25 - 1); - } - - int var41 = 0; - if (var28 < var24) { - var41 = var24 - var28; - } else if (var28 > var26 + var24 - 1) { - var41 = var28 - (var26 + var24 - 1); - } - - var33 = var31 * var31 + var41 * var41; - if (var33 < var38 || var38 == var33 && var11[var29][var43] < var39) { - var38 = var33; - var39 = var11[var29][var43]; - var18 = var27; - var37 = var28; - } - } - } - } - - if (var38 == Integer.MAX_VALUE) { - return -1; - } - } - - if (var0 == var18 && var37 == var1) { - var6[0] = var18; - var7[0] = var37; - return 0; - } else { - byte var44 = 0; - var13[var44] = var18; - var38 = var44 + 1; - var14[var44] = var37; - - int var45; - for (var39 = var45 = var12[var18 - var42][var37 - var17]; var0 != var18 || var37 != var1; var39 = var12[var18 - var42][var37 - var17]) { - if (var45 != var39) { - var45 = var39; - var13[var38] = var18; - var14[var38++] = var37; - } - - if ((var39 & 2) != 0) { - ++var18; - } else if ((var39 & 8) != 0) { - --var18; - } - - if ((var39 & 1) != 0) { - ++var37; - } else if ((var39 & 4) != 0) { - --var37; - } - } - - var23 = 0; - - while (var38-- > 0) { - var6[var23] = var13[var38]; - var7[var23++] = var14[var38]; - if (var23 >= var6.length) { - break; - } - } - - return var23; - } + return this.tileColors[var2 * 64 + var1]; } - @ObfuscatedName("ae") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "86727146" + descriptor = "(I)[Lft;", + garbageValue = "-331325439" ) - static final int method1501(int var0, int var1) { - int var2 = Canvas.method85(var0 - 1, var1 - 1) + Canvas.method85(1 + var0, var1 - 1) + Canvas.method85(var0 - 1, var1 + 1) + Canvas.method85(1 + var0, 1 + var1); - int var3 = Canvas.method85(var0 - 1, var1) + Canvas.method85(1 + var0, var1) + Canvas.method85(var0, var1 - 1) + Canvas.method85(var0, 1 + var1); - int var4 = Canvas.method85(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; + static class131[] method1533() { + return new class131[]{class131.field1268, class131.field1264, class131.field1266, class131.field1267, class131.field1263, class131.field1265}; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/Wrapper.java b/osrs/src/main/java/Wrapper.java index 71caeea6b..b96480f06 100644 --- a/osrs/src/main/java/Wrapper.java +++ b/osrs/src/main/java/Wrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("la") +@ObfuscatedName("lo") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @Export("get") abstract Object get(); - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("isSoft") abstract boolean isSoft(); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/ZoneOperation.java b/osrs/src/main/java/ZoneOperation.java index 69f96d6ac..2a4c50b86 100644 --- a/osrs/src/main/java/ZoneOperation.java +++ b/osrs/src/main/java/ZoneOperation.java @@ -1,84 +1,102 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("ls") @Implements("ZoneOperation") public class ZoneOperation { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) - public static final ZoneOperation OBJ_DEL_LEGACY; - @ObfuscatedName("ay") + @Export("MAPPROJ_ANIM") + public static final ZoneOperation MAPPROJ_ANIM; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) - public static final ZoneOperation OBJ_ADD; - @ObfuscatedName("ar") + @Export("LOC_DEL") + public static final ZoneOperation LOC_DEL; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) - public static final ZoneOperation AREA_SOUND; - @ObfuscatedName("am") + @Export("OBJ_COUNT") + public static final ZoneOperation OBJ_COUNT; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) - public static final ZoneOperation LOC_ANIM; - @ObfuscatedName("as") + public static final ZoneOperation field2607; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) - public static final ZoneOperation OBJ_COUNT; - @ObfuscatedName("aj") + @Export("LOC_ADD_CHANGE") + public static final ZoneOperation LOC_ADD_CHANGE; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) - public static final ZoneOperation PREFETCH_GAMEOBJECTS; - @ObfuscatedName("ag") + @Export("AREA_SOUND") + public static final ZoneOperation AREA_SOUND; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) - public static final ZoneOperation LOC_DEL; - @ObfuscatedName("az") + @Export("LOC_ANIM") + public static final ZoneOperation LOC_ANIM; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) - public static final ZoneOperation LOC_ADD_CHANGE; - @ObfuscatedName("av") + @Export("OBJ_ADD") + public static final ZoneOperation OBJ_ADD; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) - public static final ZoneOperation OBJ_DEL; - @ObfuscatedName("ap") + @Export("OBJ_DEL_LEGACY") + public static final ZoneOperation OBJ_DEL_LEGACY; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) + @Export("MAP_ANIM") public static final ZoneOperation MAP_ANIM; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lls;" + ) + @Export("PREFETCH_GAMEOBJECTS") + public static final ZoneOperation PREFETCH_GAMEOBJECTS; @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lls;" ) - public static final ZoneOperation MAPPROJ_ANIM; + @Export("OBJ_DEL") + public static final ZoneOperation OBJ_DEL; static { - OBJ_DEL_LEGACY = new ZoneOperation(4); + MAPPROJ_ANIM = new ZoneOperation(5); + LOC_DEL = new ZoneOperation(16); + OBJ_COUNT = new ZoneOperation(4); + field2607 = new ZoneOperation(4); + LOC_ADD_CHANGE = new ZoneOperation(2); + AREA_SOUND = new ZoneOperation(11); + LOC_ANIM = new ZoneOperation(6); OBJ_ADD = new ZoneOperation(14); - AREA_SOUND = new ZoneOperation(5); - LOC_ANIM = new ZoneOperation(4); - OBJ_COUNT = new ZoneOperation(11); - PREFETCH_GAMEOBJECTS = new ZoneOperation(14); - LOC_DEL = new ZoneOperation(2); - LOC_ADD_CHANGE = new ZoneOperation(5); - OBJ_DEL = new ZoneOperation(7); - MAP_ANIM = new ZoneOperation(6); - MAPPROJ_ANIM = new ZoneOperation(16); + OBJ_DEL_LEGACY = new ZoneOperation(14); + MAP_ANIM = new ZoneOperation(5); + PREFETCH_GAMEOBJECTS = new ZoneOperation(7); + OBJ_DEL = new ZoneOperation(19); } @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "4" + garbageValue = "5" ) ZoneOperation(int var1) { } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/_VanillaLauncher.java b/osrs/src/main/java/_VanillaLauncher.java index 364ef338e..004f89f69 100644 --- a/osrs/src/main/java/_VanillaLauncher.java +++ b/osrs/src/main/java/_VanillaLauncher.java @@ -33,8 +33,9 @@ public static void main(String[] args) { } public void load() { + gameWindow.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - RuneLiteMenuEntry.isVanilla = true; + // RuneLiteMenuEntry.isVanilla = true; loadParamaters(); gameWindow.setSize(1280, 720); game.setSize(1280, 720); @@ -46,6 +47,7 @@ public void load() { client.init(); client.start(); + } public static void loadParamaters() { @@ -145,4 +147,4 @@ public static void loadParamaters() { @Override public Iterator getStreamKeys() { throw new UnsupportedOperationException(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class0.java b/osrs/src/main/java/class0.java index f6a372353..54b330fbd 100644 --- a/osrs/src/main/java/class0.java +++ b/osrs/src/main/java/class0.java @@ -2,14 +2,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aw") +@ObfuscatedName("au") public class class0 implements class3 { - class0() { - } - - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;)Lty;" + descriptor = "(Ltm;)Ltm;" ) @Export("vmethod12") public Buffer vmethod12(Buffer var1) { @@ -18,18 +15,18 @@ public Buffer vmethod12(Buffer var1) { return var2; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;Lty;)V" + descriptor = "(Ltm;Ltm;)V" ) void method1(Buffer var1, Buffer var2) { class8 var3 = new class8(var1); class5 var4 = new class5(var3); long var5; - for (var5 = 0L; !var4.method6(var3.method23(), var3.method22(), var5); ++var5) { + for (var5 = 0L; !var4.method6(var3.method20(), var3.method19(), var5); ++var5) { } var2.writeLong(var5); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class1.java b/osrs/src/main/java/class1.java index e62c581e6..2c3c23360 100644 --- a/osrs/src/main/java/class1.java +++ b/osrs/src/main/java/class1.java @@ -1,32 +1,37 @@ -import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +import java.util.concurrent.Callable; + +@ObfuscatedName("ae") public class class1 implements Callable { + @ObfuscatedName("fp") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + @Export("archive2") + static Archive archive2; @ObfuscatedName("au") - static int field0; - @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lty;" + descriptor = "Ltm;" ) final Buffer field2; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lam;" + descriptor = "Lat;" ) final class3 field1; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lap;" ) @Export("this$0") @ObfuscatedName("this$0") final class7 this$0; @ObfuscatedSignature( - descriptor = "(Laz;Lty;Lam;)V" + descriptor = "(Lap;Ltm;Lat;)V" ) class1(class7 var1, Buffer var2, class3 var3) { this.this$0 = var1; @@ -40,21 +45,12 @@ public Object call() { return this.field1.vmethod12(this.field2); } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)[Ldt;", - garbageValue = "-1290744164" - ) - static class90[] method2() { - return new class90[]{class90.field893, class90.field888, class90.field891, class90.field890, class90.field892, class90.field889}; - } - - @ObfuscatedName("aa") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "701566139" + garbageValue = "-262419719" ) - protected static final int method3() { - return GameEngine.keyHandler.getIdleCycles(); + static int method2() { + return class28.KeyHandler_keyCodes.length; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class10.java b/osrs/src/main/java/class10.java index e51ca131e..a9a093cbe 100644 --- a/osrs/src/main/java/class10.java +++ b/osrs/src/main/java/class10.java @@ -1,125 +1,118 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import javax.net.ssl.HttpsURLConnection; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.ProtocolException; import java.net.URL; -import javax.net.ssl.HttpsURLConnection; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aq") +@ObfuscatedName("ad") public class class10 { - @ObfuscatedName("jf") + @ObfuscatedName("gd") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "Lnk;" ) - @Export("compass") - static SpritePixels compass; - @ObfuscatedName("aw") - final HttpsURLConnection field32; - @ObfuscatedName("ay") + static Archive field28; + @ObfuscatedName("au") + final HttpsURLConnection field34; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lqb;" + descriptor = "Lqf;" ) - final class420 field33; - @ObfuscatedName("ar") + final class419 field35; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Laf;" ) - final class9 field31; - @ObfuscatedName("am") + final class9 field33; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lrq;" + descriptor = "Lrf;" ) - class462 field30; - @ObfuscatedName("as") - boolean field28; - @ObfuscatedName("aj") - boolean field27; - @ObfuscatedName("ag") - int field29; + class461 field32; + @ObfuscatedName("ac") + boolean field29; + @ObfuscatedName("ai") + boolean field30; + @ObfuscatedName("az") + int field31; @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;Lap;Lqb;Z)V" + descriptor = "(Ljava/net/URL;Laf;Lqf;Z)V" ) - public class10(URL var1, class9 var2, class420 var3, boolean var4) throws IOException { - this.field28 = false; - this.field27 = false; - this.field29 = 300000; - if (!var2.method24()) { - throw new UnsupportedEncodingException("Unsupported request method used " + var2.method25()); + public class10(URL var1, class9 var2, class419 var3, boolean var4) throws IOException { + this.field29 = false; + this.field30 = false; + this.field31 = 300000; + if (!var2.method21()) { + throw new UnsupportedEncodingException("Unsupported request method used " + var2.method22()); } else { - this.field32 = (HttpsURLConnection)var1.openConnection(); + this.field34 = (HttpsURLConnection)var1.openConnection(); if (!var4) { - HttpsURLConnection var5 = this.field32; - if (class15.field46 == null) { - class15.field46 = new class15(); - } - - class15 var6 = class15.field46; - var5.setSSLSocketFactory(var6); + this.field34.setSSLSocketFactory(class15.method45()); } - this.field31 = var2; - this.field33 = var3 != null ? var3 : new class420(); + this.field33 = var2; + this.field35 = var3 != null ? var3 : new class419(); } } @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;Lap;Z)V" + descriptor = "(Ljava/net/URL;Laf;Z)V" ) public class10(URL var1, class9 var2, boolean var3) throws IOException { - this(var1, var2, new class420(), var3); + this(var1, var2, new class419(), var3); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lqb;", - garbageValue = "1781094058" + descriptor = "(B)Lqf;", + garbageValue = "106" ) - public class420 method31() { - return this.field33; + public class419 method27() { + return this.field35; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lrq;I)V", - garbageValue = "446743890" + descriptor = "(Lrf;B)V", + garbageValue = "2" ) - public void method32(class462 var1) { - if (!this.field28) { + public void method28(class461 var1) { + if (!this.field29) { if (var1 == null) { - this.field33.method2128("Content-Type"); - this.field30 = null; + this.field35.method2167("Content-Type"); + this.field32 = null; } else { - this.field30 = var1; - if (this.field30.vmethod2213() != null) { - this.field33.method2132(this.field30.vmethod2213()); + this.field32 = var1; + if (this.field32.vmethod2213() != null) { + this.field35.method2171(this.field32.vmethod2213()); } else { - this.field33.method2133(); + this.field35.method2172(); } } } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "188935179" + garbageValue = "2080187114" ) - void method33() throws ProtocolException { - if (!this.field28) { - this.field32.setRequestMethod(this.field31.method25()); - this.field33.method2125(this.field32); - if (this.field31.method26() && this.field30 != null) { - this.field32.setDoOutput(true); + void method29() throws ProtocolException { + if (!this.field29) { + this.field34.setRequestMethod(this.field33.method22()); + this.field35.method2164(this.field34); + if (this.field33.method23() && this.field32 != null) { + this.field34.setDoOutput(true); ByteArrayOutputStream var1 = new ByteArrayOutputStream(); try { - var1.write(this.field30.vmethod7797()); - var1.writeTo(this.field32.getOutputStream()); + var1.write(this.field32.vmethod7797()); + var1.writeTo(this.field34.getOutputStream()); } catch (IOException var11) { var11.printStackTrace(); } finally { @@ -132,122 +125,51 @@ void method33() throws ProtocolException { } } - this.field32.setConnectTimeout(this.field29); - this.field32.setInstanceFollowRedirects(this.field27); - this.field28 = true; + this.field34.setConnectTimeout(this.field31); + this.field34.setInstanceFollowRedirects(this.field30); + this.field29 = true; } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1249212417" + garbageValue = "-170543381" ) - boolean method34() throws IOException { - if (!this.field28) { - this.method33(); + boolean method30() throws IOException { + if (!this.field29) { + this.method29(); } - this.field32.connect(); - return this.field32.getResponseCode() == -1; + this.field34.connect(); + return this.field34.getResponseCode() == -1; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Lac;", - garbageValue = "-1318308721" + descriptor = "(I)Las;", + garbageValue = "-1418069243" ) - class20 method35() { + class20 method31() { try { - if (!this.field28 || this.field32.getResponseCode() == -1) { + if (!this.field29 || this.field34.getResponseCode() == -1) { return new class20("No REST response has been received yet."); } } catch (IOException var10) { - this.field32.disconnect(); + this.field34.disconnect(); return new class20("Error decoding REST response code: " + var10.getMessage()); } class20 var3; try { - class20 var1 = new class20(this.field32); + class20 var1 = new class20(this.field34); return var1; } catch (IOException var8) { var3 = new class20("Error decoding REST response: " + var8.getMessage()); } finally { - this.field32.disconnect(); - } - - return var3; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lty;[II)[Ljava/lang/Object;", - garbageValue = "-1294646917" - ) - static Object[] method30(Buffer var0, int[] var1) { - int var2 = var0.readUShortSmart(); - Object[] var3 = new Object[var1.length * var2]; - - for (int var4 = 0; var4 < var2; ++var4) { - for (int var5 = 0; var5 < var1.length; ++var5) { - int var6 = var1.length * var4 + var5; - class503 var7 = class395.method1994(var1[var5]); - var3[var6] = var7.method2474(var0); - } + this.field34.disconnect(); } return var3; } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-1321398026" - ) - static int method36(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - if (var0 == 1500) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == 1501) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == 1502) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == 1503) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == 1504) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == 1505) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("mp") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-1708450572" - ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Login.loadInterface(var0)) { - ClanChannelMember.updateInterface(ArchiveLoader.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); - } - } - - @ObfuscatedName("oq") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-517461757" - ) - static void method38(boolean var0) { - Client.leftClickOpensMenu = var0; - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class101.java b/osrs/src/main/java/class101.java index bc3c30a84..b21fbaecb 100644 --- a/osrs/src/main/java/class101.java +++ b/osrs/src/main/java/class101.java @@ -1,5 +1,57 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("dq") public class class101 { -} + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1873768041" + ) + public static boolean method598(int var0) { + return var0 >= WorldMapDecorationType.field3123.id && var0 <= WorldMapDecorationType.field3122.id || var0 == WorldMapDecorationType.field3119.id; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2030205668" + ) + static void method599() { + ByteArrayPool.field3746.clear(); + ByteArrayPool.field3746.add(100); + ByteArrayPool.field3746.add(5000); + ByteArrayPool.field3746.add(10000); + ByteArrayPool.field3746.add(30000); + } + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "-1662859603" + ) + static int method600(int var0, Script var1, boolean var2) { + if (var0 == 6754) { + int var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + NPCComposition var4 = class90.getNpcDefinition(var3); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; + return 1; + } else { + NPCComposition var5; + if (var0 == 6764) { + SoundCache.Interpreter_intStackSize -= 2; + var5 = class90.getNpcDefinition(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); + int var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var5.method994(var6); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var5.method996(var6); + return 1; + } else if (var0 == 6765) { + var5 = class90.getNpcDefinition(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var5 != null ? var5.combatLevel * 989486243 * 599602955 : 0; + return 1; + } else { + return 2; + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class102.java b/osrs/src/main/java/class102.java index 75d92d56e..692368cb2 100644 --- a/osrs/src/main/java/class102.java +++ b/osrs/src/main/java/class102.java @@ -2,174 +2,260 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("db") +@ObfuscatedName("de") public class class102 { - @ObfuscatedName("aw") - int field1086; - @ObfuscatedName("ay") - int field1087; - @ObfuscatedName("ar") - int field1085; - @ObfuscatedName("am") - int field1084; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lrb;" + ) + static Bounds field1090; + @ObfuscatedName("au") + int field1094; + @ObfuscatedName("ae") + int field1091; + @ObfuscatedName("ao") + int field1092; + @ObfuscatedName("at") + int field1093; class102(int var1, int var2, int var3, int var4) { - this.field1086 = var1; - this.field1087 = var2; - this.field1085 = var3; - this.field1084 = var4; + this.field1094 = var1; + this.field1091 = var2; + this.field1092 = var3; + this.field1093 = var4; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "96" + garbageValue = "-92" ) int method601() { - return this.field1086; + return this.field1094; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1646176996" + descriptor = "(B)I", + garbageValue = "93" ) int method602() { - return this.field1087; + return this.field1091; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "257607839" + garbageValue = "-806640725" ) int method603() { - return this.field1085; + return this.field1092; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1314819947" + garbageValue = "1075721841" ) int method604() { - return this.field1084; + return this.field1093; } - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lmn;I)V", - garbageValue = "2066839976" + descriptor = "(IIZI)Ljava/lang/String;", + garbageValue = "-880794678" ) - public static void method605(class312 var0) { - if (!class306.field2759.contains(var0)) { - class306.field2759.add(var0); - } + static String method605(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + if (var2 && var0 >= 0) { + int var3 = 2; - } + for (int var4 = var0 / var1; var4 != 0; ++var3) { + var4 /= var1; + } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(CLot;B)C", - garbageValue = "-1" - ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { - if (var0 >= 192 && var0 <= 198) { - return 'A'; - } + char[] var5 = new char[var3]; + var5[0] = '+'; - if (var0 == 199) { - return 'C'; - } + for (int var6 = var3 - 1; var6 > 0; --var6) { + int var7 = var0; + var0 /= var1; + int var8 = var7 - var0 * var1; + if (var8 >= 10) { + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); + } + } - if (var0 >= 200 && var0 <= 203) { - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { - return 'U'; - } - - if (var0 == 221) { - return 'Y'; - } - - if (var0 == 223) { - return 's'; + return new String(var5); + } else { + return Integer.toString(var0, var1); } + } else { + throw new IllegalArgumentException("" + var1); + } + } - if (var0 >= 224 && var0 <= 230) { - return 'a'; + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-2114213929" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = class130.scene.getBoundaryObjectTag(var0, var1, var2); + int var7; + int var8; + int var9; + int var10; + int var14; + int var26; + if (0L != var5) { + var7 = class130.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + boolean var12 = 0L != var5; + if (var12) { + boolean var13 = (int)(var5 >>> 16 & 1L) == 1; + var12 = !var13; } - if (var0 == 231) { - return 'c'; + if (var12) { + var10 = var4; } - if (var0 >= 232 && var0 <= 235) { - return 'e'; - } + int[] var19 = AbstractUserComparator.sceneMinimapSprite.pixels; + var26 = var1 * 4 + (103 - var2) * 2048 + 24624; + var14 = InvDefinition.Entity_unpackID(var5); + ObjectComposition var15 = WorldMapElement.getObjectDefinition(var14); + if (var15.mapSceneId != -1) { + IndexedSprite var16 = class299.mapSceneSprites[var15.mapSceneId]; + if (var16 != null) { + int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; + int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; + var16.drawAt(var17 + var1 * 4 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); + } + } else { + if (var9 == 0 || var9 == 2) { + if (var8 == 0) { + var19[var26] = var10; + var19[var26 + 512] = var10; + var19[var26 + 1024] = var10; + var19[var26 + 1536] = var10; + } else if (var8 == 1) { + var19[var26] = var10; + var19[var26 + 1] = var10; + var19[var26 + 2] = var10; + var19[var26 + 3] = var10; + } else if (var8 == 2) { + var19[var26 + 3] = var10; + var19[var26 + 512 + 3] = var10; + var19[var26 + 1024 + 3] = var10; + var19[var26 + 1536 + 3] = var10; + } else if (var8 == 3) { + var19[var26 + 1536] = var10; + var19[var26 + 1536 + 1] = var10; + var19[var26 + 1536 + 2] = var10; + var19[var26 + 1536 + 3] = var10; + } + } - if (var0 >= 236 && var0 <= 239) { - return 'i'; - } + if (var9 == 3) { + if (var8 == 0) { + var19[var26] = var10; + } else if (var8 == 1) { + var19[var26 + 3] = var10; + } else if (var8 == 2) { + var19[var26 + 1536 + 3] = var10; + } else if (var8 == 3) { + var19[var26 + 1536] = var10; + } + } - if (var0 == 241 && var1 != Language.Language_ES) { - return 'n'; + if (var9 == 2) { + if (var8 == 3) { + var19[var26] = var10; + var19[var26 + 512] = var10; + var19[var26 + 1024] = var10; + var19[var26 + 1536] = var10; + } else if (var8 == 0) { + var19[var26] = var10; + var19[var26 + 1] = var10; + var19[var26 + 2] = var10; + var19[var26 + 3] = var10; + } else if (var8 == 1) { + var19[var26 + 3] = var10; + var19[var26 + 512 + 3] = var10; + var19[var26 + 1024 + 3] = var10; + var19[var26 + 1536 + 3] = var10; + } else if (var8 == 2) { + var19[var26 + 1536] = var10; + var19[var26 + 1536 + 1] = var10; + var19[var26 + 1536 + 2] = var10; + var19[var26 + 1536 + 3] = var10; + } + } } + } - if (var0 >= 242 && var0 <= 246) { - return 'o'; - } + var5 = class130.scene.getGameObjectTag(var0, var1, var2); + if (var5 != 0L) { + var7 = class130.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = InvDefinition.Entity_unpackID(var5); + ObjectComposition var20 = WorldMapElement.getObjectDefinition(var10); + if (var20.mapSceneId != -1) { + IndexedSprite var28 = class299.mapSceneSprites[var20.mapSceneId]; + if (var28 != null) { + var26 = (var20.sizeX * 4 - var28.subWidth) / 2; + var14 = (var20.sizeY * 4 - var28.subHeight) / 2; + var28.drawAt(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); + } + } else if (var9 == 9) { + int var25 = 15658734; + boolean var27 = 0L != var5; + if (var27) { + boolean var21 = (int)(var5 >>> 16 & 1L) == 1; + var27 = !var21; + } - if (var0 >= 249 && var0 <= 252) { - return 'u'; - } + if (var27) { + var25 = 15597568; + } - if (var0 == 253 || var0 == 255) { - return 'y'; + int[] var22 = AbstractUserComparator.sceneMinimapSprite.pixels; + int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; + if (var8 != 0 && var8 != 2) { + var22[var29] = var25; + var22[var29 + 1 + 512] = var25; + var22[var29 + 1024 + 2] = var25; + var22[var29 + 1536 + 3] = var25; + } else { + var22[var29 + 1536] = var25; + var22[var29 + 1 + 1024] = var25; + var22[var29 + 512 + 2] = var25; + var22[var29 + 3] = var25; + } } } - if (var0 == 338) { - return 'O'; - } else if (var0 == 339) { - return 'o'; - } else { - return var0 == 376 ? 'Y' : var0; + var5 = class130.scene.getFloorDecorationTag(var0, var1, var2); + if (var5 != 0L) { + var7 = InvDefinition.Entity_unpackID(var5); + ObjectComposition var23 = WorldMapElement.getObjectDefinition(var7); + if (var23.mapSceneId != -1) { + IndexedSprite var24 = class299.mapSceneSprites[var23.mapSceneId]; + if (var24 != null) { + var10 = (var23.sizeX * 4 - var24.subWidth) / 2; + int var11 = (var23.sizeY * 4 - var24.subHeight) / 2; + var24.drawAt(var1 * 4 + var10 + 48, (104 - var2 - var23.sizeY) * 4 + var11 + 48); + } + } } - } - - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "2" - ) - static Object method608(int var0) { - return class144.method767((class503)ClientPreferences.findEnumerated(class503.method2469(), var0)); - } - @ObfuscatedName("gq") - @ObfuscatedSignature( - descriptor = "(I)Lsq;", - garbageValue = "293868513" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return class127.worldMap; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class105.java b/osrs/src/main/java/class105.java index 6026d35b8..5e57ea6f3 100644 --- a/osrs/src/main/java/class105.java +++ b/osrs/src/main/java/class105.java @@ -2,58 +2,786 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") -final class class105 implements class324 { +@ObfuscatedName("eh") +final class class105 implements class323 { // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmi;" ) @Export("val$cc") @ObfuscatedName("val$cc") final Widget val$cc; @ObfuscatedSignature( - descriptor = "(Lmt;)V" + descriptor = "(Lmi;)V" ) class105(Widget var1) { this.val$cc = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-3" + garbageValue = "17" ) @Export("vmethod5708") public void vmethod5708() { - if (this.val$cc != null && this.val$cc.method1808().field2883 != null) { + if (this.val$cc != null && this.val$cc.method1847().field2899 != null) { ScriptEvent var1 = new ScriptEvent(); - var1.method474(this.val$cc); - var1.setArgs(this.val$cc.method1808().field2883); - ClientPacket.getScriptEvents().addFirst(var1); + var1.method479(this.val$cc); + var1.setArgs(this.val$cc.method1847().field2899); + class30.getScriptEvents().addFirst(var1); } } - @ObfuscatedName("as") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IB)Lcx;", - garbageValue = "-95" + descriptor = "(Lpi;Lpi;Lpi;B)V", + garbageValue = "-46" ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (class113.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class452.loginBoxCenter = Login.loginBoxX + 180; + byte var3; + int var4; + int var9; + boolean var15; + int var17; + int var25; + int var26; + int var34; + int var36; + int var43; + int var48; + if (Login.worldSelectOpen) { + if (class74.worldSelectBackSprites == null) { + class74.worldSelectBackSprites = class20.method67(PcmPlayer.archive8, "sl_back", ""); + } + + if (SoundCache.worldSelectFlagSprites == null) { + SoundCache.worldSelectFlagSprites = class219.method1149(PcmPlayer.archive8, "sl_flags", ""); + } + + if (MusicPatchPcmStream.worldSelectArrows == null) { + MusicPatchPcmStream.worldSelectArrows = class219.method1149(PcmPlayer.archive8, "sl_arrows", ""); + } + + if (SecureRandomCallable.worldSelectStars == null) { + SecureRandomCallable.worldSelectStars = class219.method1149(PcmPlayer.archive8, "sl_stars", ""); + } + + if (class85.worldSelectLeftSprite == null) { + class85.worldSelectLeftSprite = class172.SpriteBuffer_getIndexedSpriteByName(PcmPlayer.archive8, "leftarrow", ""); + } + + if (Skeleton.worldSelectRightSprite == null) { + Skeleton.worldSelectRightSprite = class172.SpriteBuffer_getIndexedSpriteByName(PcmPlayer.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); + if (SecureRandomCallable.worldSelectStars != null) { + SecureRandomCallable.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + SecureRandomCallable.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + if (MusicPatchPcmStream.worldSelectArrows != null) { + var34 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { + MusicPatchPcmStream.worldSelectArrows[2].drawAt(var34, 4); + } else { + MusicPatchPcmStream.worldSelectArrows[0].drawAt(var34, 4); + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { + MusicPatchPcmStream.worldSelectArrows[3].drawAt(var34 + 15, 4); + } else { + MusicPatchPcmStream.worldSelectArrows[1].drawAt(var34 + 15, 4); + } + + var0.draw("World", var34 + 32, 17, 16777215, -1); + var4 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { + MusicPatchPcmStream.worldSelectArrows[2].drawAt(var4, 4); + } else { + MusicPatchPcmStream.worldSelectArrows[0].drawAt(var4, 4); + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { + MusicPatchPcmStream.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + MusicPatchPcmStream.worldSelectArrows[1].drawAt(var4 + 15, 4); + } + + var0.draw("Players", var4 + 32, 17, 16777215, -1); + var43 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { + MusicPatchPcmStream.worldSelectArrows[2].drawAt(var43, 4); + } else { + MusicPatchPcmStream.worldSelectArrows[0].drawAt(var43, 4); + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { + MusicPatchPcmStream.worldSelectArrows[3].drawAt(var43 + 15, 4); + } else { + MusicPatchPcmStream.worldSelectArrows[1].drawAt(var43 + 15, 4); + } + + var0.draw("Location", var43 + 32, 17, 16777215, -1); + var26 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { + MusicPatchPcmStream.worldSelectArrows[2].drawAt(var26, 4); + } else { + MusicPatchPcmStream.worldSelectArrows[0].drawAt(var26, 4); + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { + MusicPatchPcmStream.worldSelectArrows[3].drawAt(var26 + 15, 4); + } else { + MusicPatchPcmStream.worldSelectArrows[1].drawAt(var26 + 15, 4); + } + + var0.draw("Type", var26 + 32, 17, 16777215, -1); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if (class74.worldSelectBackSprites != null) { + var3 = 88; + byte var39 = 19; + var43 = 765 / (var3 + 1) - 1; + var26 = 480 / (var39 + 1); + + do { + var48 = var26; + var25 = var43; + if (var26 * (var43 - 1) >= World.World_count) { + --var43; + } + + if (var43 * (var26 - 1) >= World.World_count) { + --var26; + } + + if (var43 * (var26 - 1) >= World.World_count) { + --var26; + } + } while(var48 != var26 || var25 != var43); + + var48 = (765 - var3 * var43) / (var43 + 1); + if (var48 > 5) { + var48 = 5; + } + + var25 = (480 - var39 * var26) / (var26 + 1); + if (var25 > 5) { + var25 = 5; + } + + var9 = (765 - var43 * var3 - var48 * (var43 - 1)) / 2; + int var29 = (480 - var26 * var39 - var25 * (var26 - 1)) / 2; + var36 = (var26 + World.World_count - 1) / var26; + Login.worldSelectPagesCount = var36 - var43; + if (class85.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + class85.worldSelectLeftSprite.drawAt(8, class177.canvasHeight / 2 - class85.worldSelectLeftSprite.subHeight / 2); + } + + if (Skeleton.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + Skeleton.worldSelectRightSprite.drawAt(class113.canvasWidth - Skeleton.worldSelectRightSprite.subWidth - 8, class177.canvasHeight / 2 - Skeleton.worldSelectRightSprite.subHeight / 2); + } + + int var38 = var29 + 23; + int var30 = var9 + Login.xPadding; + int var31 = 0; + var15 = false; + int var40 = Login.worldSelectPage; + + for (var17 = var26 * var40; var17 < World.World_count && var40 - Login.worldSelectPage < var43; ++var17) { + World var32 = class176.World_worlds[var17]; + boolean var19 = true; + String var20 = Integer.toString(var32.population); + if (var32.population == -1) { + var20 = "OFF"; + var19 = false; + } else if (var32.population > 1980) { + var20 = "FULL"; + var19 = false; + } + + class108 var21 = null; + int var22 = 0; + if (var32.isBeta()) { + var21 = var32.isMembersOnly() ? class108.field1133 : class108.field1138; + } else if (var32.isDeadman()) { + var21 = var32.isMembersOnly() ? class108.field1124 : class108.field1135; + } else if (var32.method391()) { + var22 = 16711680; + var21 = var32.isMembersOnly() ? class108.field1129 : class108.field1125; + } else if (var32.method393()) { + var21 = var32.isMembersOnly() ? class108.field1128 : class108.field1123; + } else if (var32.isPvp()) { + var21 = var32.isMembersOnly() ? class108.field1136 : class108.field1132; + } else if (var32.method394()) { + var21 = var32.isMembersOnly() ? class108.field1134 : class108.field1126; + } else if (var32.method395()) { + var21 = var32.isMembersOnly() ? class108.field1131 : class108.field1130; + } + + if (var21 == null || var21.field1139 >= class74.worldSelectBackSprites.length) { + var21 = var32.isMembersOnly() ? class108.field1127 : class108.field1137; + } + + if (MouseHandler.MouseHandler_x >= var30 && MouseHandler.MouseHandler_y >= var38 && MouseHandler.MouseHandler_x < var30 + var3 && MouseHandler.MouseHandler_y < var38 + var39 && var19) { + Login.hoveredWorldIndex = var17; + class74.worldSelectBackSprites[var21.field1139].drawTransOverlayAt(var30, var38, 128, 16777215); + var15 = true; + } else { + class74.worldSelectBackSprites[var21.field1139].drawAt(var30, var38); + } + + if (SoundCache.worldSelectFlagSprites != null) { + SoundCache.worldSelectFlagSprites[(var32.isMembersOnly() ? 8 : 0) + var32.location].drawAt(var30 + 29, var38); + } + + var0.drawCentered(Integer.toString(var32.id), var30 + 15, var39 / 2 + var38 + 5, var22, -1); + var1.drawCentered(var20, var30 + 60, var39 / 2 + var38 + 5, 268435455, -1); + var38 = var38 + var39 + var25; + ++var31; + if (var31 >= var26) { + var38 = var29 + 23; + var30 = var30 + var3 + var48; + var31 = 0; + ++var40; + } + } + + if (var15) { + var17 = var1.stringWidth(class176.World_worlds[Login.hoveredWorldIndex].activity) + 6; + int var41 = var1.ascent + 8; + int var42 = MouseHandler.MouseHandler_y + 25; + if (var41 + var42 > 480) { + var42 = MouseHandler.MouseHandler_y - 25 - var41; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var42, var17, var41, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var42, var17, var41, 0); + var1.drawCentered(class176.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var42 + var1.ascent + 4, 0, -1); + } + } + + } else { + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Bounds.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + SoundSystem.logoSprite.drawAt(Login.xPadding + 382 - SoundSystem.logoSprite.subWidth / 2, 18); + if (Client.gameState == 0 || Client.gameState == 5) { + var3 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); + var4 = 253 - var3; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); + } + + String var5; + String var6; + String var7; + String var8; + short var33; + short var35; + if (Client.gameState == 20) { + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); + var33 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var34 += 7; + if (Login.loginIndex != 4 && Login.loginIndex != 10) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var34, 16777215, 0); + var35 = 200; + + for (var5 = class238.method1310(); var0.stringWidth(var5) > var35; var5 = var5.substring(0, var5.length() - 1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var34, 16777215, 0); + var34 += 15; + var7 = Login.Login_password; + var6 = class270.method1538('*', var7.length()); + + for (var8 = var6; var0.stringWidth(var8) > var35; var8 = var8.substring(1)) { + } + + var0.draw("Password: " + var8, Login.loginBoxX + 180 - 108, var34, 16777215, 0); + var34 += 15; + } + } + + if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var23; + if (Login.loginIndex == 0) { + var33 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 30; + var4 = Login.loginBoxX + 180 - 80; + var23 = 291; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var4 = Login.loginBoxX + 180 + 80; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var33 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); + var34 = var33 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); + var34 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); + var34 += 15; + var4 = Login.loginBoxX + 180 - 80; + var23 = 321; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); + } else { + IndexedSprite var10; + if (Login.loginIndex == 2) { + var33 = 201; + var0.drawCentered(Login.Login_response1, class452.loginBoxCenter, var33, 16776960, 0); + var34 = var33 + 15; + var0.drawCentered(Login.Login_response2, class452.loginBoxCenter, var34, 16776960, 0); + var34 += 15; + var0.drawCentered(Login.Login_response3, class452.loginBoxCenter, var34, 16776960, 0); + var34 += 15; + var34 += 7; + var0.draw("Login: ", class452.loginBoxCenter - 110, var34, 16777215, 0); + var35 = 200; + + for (var5 = class238.method1310(); var0.stringWidth(var5) > var35; var5 = var5.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? MoveSpeed.colorStartTag(16776960) + "|" : ""), class452.loginBoxCenter - 70, var34, 16777215, 0); + var34 += 15; + var7 = Login.Login_password; + var6 = class270.method1538('*', var7.length()); + + for (var8 = var6; var0.stringWidth(var8) > var35; var8 = var8.substring(1)) { + } + + var0.draw("Password: " + var8 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? MoveSpeed.colorStartTag(16776960) + "|" : ""), class452.loginBoxCenter - 108, var34, 16777215, 0); + var34 += 15; + var33 = 277; + var9 = class452.loginBoxCenter + -117; + boolean var11 = Client.Login_isUsernameRemembered; + boolean var12 = Login.field745; + var10 = var11 ? (var12 ? VerticalAlignment.field1631 : UserComparator6.options_buttons_2Sprite) : (var12 ? Skills.field3145 : Login.options_buttons_0Sprite); + var10.drawAt(var9, var33); + var9 = var9 + var10.subWidth + 5; + var1.draw("Remember username", var9, var33 + 13, 16776960, 0); + var9 = class452.loginBoxCenter + 24; + var15 = class449.clientPreferences.getIsUsernameHidden(); + boolean var16 = Login.field744; + IndexedSprite var14 = var15 ? (var16 ? VerticalAlignment.field1631 : UserComparator6.options_buttons_2Sprite) : (var16 ? Skills.field3145 : Login.options_buttons_0Sprite); + var14.drawAt(var9, var33); + var9 = var9 + var14.subWidth + 5; + var1.draw("Hide username", var9, var33 + 13, 16776960, 0); + var34 = var33 + 15; + var17 = class452.loginBoxCenter - 80; + short var18 = 321; + class219.titlebuttonSprite.drawAt(var17 - 73, var18 - 20); + var0.drawCentered("Login", var17, var18 + 5, 16777215, 0); + var17 = class452.loginBoxCenter + 80; + class219.titlebuttonSprite.drawAt(var17 - 73, var18 - 20); + var0.drawCentered("Cancel", var17, var18 + 5, 16777215, 0); + var33 = 357; + switch(Login.field751) { + case 2: + class151.field1365 = "Having trouble logging in?"; + break; + default: + class151.field1365 = "Can't login? Click here."; + } + + class102.field1090 = new Bounds(class452.loginBoxCenter, var33, var1.stringWidth(class151.field1365), 11); + class90.field887 = new Bounds(class452.loginBoxCenter, var33, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(class151.field1365, class452.loginBoxCenter, var33, 16777215, 0); + } else if (Login.loginIndex == 3) { + var33 = 201; + var0.drawCentered("Incorrect username or password.", Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 20; + var1.drawCentered("If you have upgraded to a Jagex Account, you", Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 20; + var1.drawCentered("need to log in using the Jagex Launcher instead.", Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var4 = Login.loginBoxX + 180; + var23 = 276; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var23 = 326; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var33 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); + var34 = var33 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); + var34 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); + var34 += 15; + var5 = "PIN: "; + var7 = class369.otp; + var6 = class270.method1538('*', var7.length()); + var0.draw(var5 + var6 + (Client.cycle % 40 < 20 ? MoveSpeed.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var34, 16777215, 0); + var34 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var34, 16776960, 0); + var34 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var34, 16776960, 0); + var25 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + var9 = var34 - var0.ascent; + if (Login.field743) { + var10 = UserComparator6.options_buttons_2Sprite; + } else { + var10 = Login.options_buttons_0Sprite; + } + + var10.drawAt(var25, var9); + var34 += 15; + var36 = Login.loginBoxX + 180 - 80; + short var37 = 321; + class219.titlebuttonSprite.drawAt(var36 - 73, var37 - 20); + var0.drawCentered("Continue", var36, var37 + 5, 16777215, 0); + var36 = Login.loginBoxX + 180 + 80; + class219.titlebuttonSprite.drawAt(var36 - 73, var37 - 20); + var0.drawCentered("Cancel", var36, var37 + 5, 16777215, 0); + var1.drawCentered("Can't login? Click here.", Login.loginBoxX + 180, var37 + 36, 16777215, 0); + } else if (Login.loginIndex == 5) { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var33 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var34 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var34, 16777215, 0); + var35 = 174; + + for (var5 = class238.method1310(); var0.stringWidth(var5) > var35; var5 = var5.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? MoveSpeed.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var34, 16777215, 0); + var34 += 15; + var26 = Login.loginBoxX + 180 - 80; + short var27 = 321; + class219.titlebuttonSprite.drawAt(var26 - 73, var27 - 20); + var0.drawCentered("Recover", var26, var27 + 5, 16777215, 0); + var26 = Login.loginBoxX + 180 + 80; + class219.titlebuttonSprite.drawAt(var26 - 73, var27 - 20); + var0.drawCentered("Back", var26, var27 + 5, 16777215, 0); + var27 = 356; + var1.drawCentered("Still having trouble logging in?", class452.loginBoxCenter, var27, 268435455, 0); + } else if (Login.loginIndex == 6) { + var33 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var4 = Login.loginBoxX + 180; + var23 = 321; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + if (ModeWhere.field3613 && !Client.onMobile) { + var33 = 201; + var0.drawCentered(Login.Login_response1, class452.loginBoxCenter, var33, 16776960, 0); + var34 = var33 + 15; + var0.drawCentered(Login.Login_response2, class452.loginBoxCenter, var34, 16776960, 0); + var34 += 15; + var0.drawCentered(Login.Login_response3, class452.loginBoxCenter, var34, 16776960, 0); + var4 = class452.loginBoxCenter - 150; + var34 += 10; + + for (var43 = 0; var43 < 8; ++var43) { + class219.titlebuttonSprite.method2654(var4, var34, 30, 40); + boolean var45 = var43 == Login.field752 & Client.cycle % 40 < 20; + var0.draw((Login.field768[var43] == null ? "" : Login.field768[var43]) + (var45 ? MoveSpeed.colorStartTag(16776960) + "|" : ""), var4 + 10, var34 + 27, 16777215, 0); + if (var43 != 1 && var43 != 3) { + var4 += 35; + } else { + var4 += 50; + var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var34 + 27, 16777215, 0); + } + } + + var43 = class452.loginBoxCenter - 80; + short var46 = 321; + class219.titlebuttonSprite.drawAt(var43 - 73, var46 - 20); + var0.drawCentered("Submit", var43, var46 + 5, 16777215, 0); + var43 = class452.loginBoxCenter + 80; + class219.titlebuttonSprite.drawAt(var43 - 73, var46 - 20); + var0.drawCentered("Cancel", var43, var46 + 5, 16777215, 0); + } else { + var33 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var4 = Login.loginBoxX + 180 - 80; + var23 = 321; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } + } else if (Login.loginIndex == 8) { + var33 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var4 = Login.loginBoxX + 180 - 80; + var23 = 321; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 9) { + var33 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 25; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 25; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); + var4 = Login.loginBoxX + 180; + var23 = 311; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 10) { + var34 = Login.loginBoxX + 180; + var35 = 209; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var35, 16776960, 0); + var4 = var35 + 20; + Login.field777.drawAt(var34 - 109, var4); + if (Login.field764.isEmpty()) { + ItemContainer.field853.drawAt(var34 - 48, var4 + 18); + } else { + ItemContainer.field853.drawAt(var34 - 48, var4 + 5); + var0.drawCentered(Login.field764, var34, var4 + 68 - 15, 16776960, 0); + } + } else if (Login.loginIndex == 12) { + var34 = class452.loginBoxCenter; + var35 = 216; + var2.drawCentered("Before using this app, please read and accept our", var34, var35, 16777215, 0); + var4 = var35 + 17; + var2.drawCentered("terms of use, privacy policy, and end user licence", var34, var4, 16777215, 0); + var4 += 17; + var2.drawCentered("agreement (EULA).", var34, var4, 16777215, 0); + var4 += 17; + var2.drawCentered("By accepting, you agree to these documents.", var34, var4, 16777215, 0); + var34 = class452.loginBoxCenter - 80; + var35 = 311; + class219.titlebuttonSprite.drawAt(var34 - 73, var35 - 20); + var0.drawCentered("Accept", var34, var35 + 5, 16777215, 0); + var34 = class452.loginBoxCenter + 80; + class219.titlebuttonSprite.drawAt(var34 - 73, var35 - 20); + var0.drawCentered("Decline", var34, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 13) { + var33 = 231; + var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var33, 16777215, 0); + var34 = var33 + 20; + var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var34, 16777215, 0); + var4 = Login.loginBoxX + 180; + var33 = 311; + class219.titlebuttonSprite.drawAt(var4 - 73, var33 - 20); + var0.drawCentered("Back", var4, var33 + 5, 16777215, 0); + } else if (Login.loginIndex == 14) { + var33 = 201; + String var24 = ""; + var5 = ""; + var6 = ""; + switch(Login.field750) { + case 0: + var24 = "Your account has been involved"; + var5 = "in serious rule breaking."; + var6 = ""; + break; + case 1: + var24 = "Your account has been locked due to"; + var5 = "suspicious activity."; + var6 = "Please recover your account."; + break; + case 2: + var24 = "The unpaid balance on your account needs"; + var5 = "to be resolved before you can play."; + var6 = Strings.field3315; + break; + default: + WorldMapAreaData.Login_promptCredentials(false); + } + + var0.drawCentered(var24, Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 20; + var0.drawCentered(var5, Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 20; + var0.drawCentered(var6, Login.loginBoxX + 180, var34, 16776960, 0); + var48 = Login.loginBoxX + 180; + short var44 = 276; + class219.titlebuttonSprite.drawAt(var48 - 73, var44 - 20); + if (Login.field750 == 1) { + var0.drawCentered("Recover Account", var48, var44 + 5, 16777215, 0); + } else { + var0.drawCentered("View Appeal Options", var48, var44 + 5, 16777215, 0); + } + + var48 = Login.loginBoxX + 180; + var44 = 326; + class219.titlebuttonSprite.drawAt(var48 - 73, var44 - 20); + var0.drawCentered("Back", var48, var44 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var33 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); + var34 = var33 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); + var34 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); + var34 += 15; + var4 = Login.loginBoxX + 180; + var23 = 301; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 32) { + var33 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var4 = Login.loginBoxX + 180 - 80; + var23 = 321; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 33) { + var33 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); + var34 = var33 + 20; + var1.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 20; + var1.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); + var34 += 15; + var4 = Login.loginBoxX + 180; + var23 = 276; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var2.drawCentered("Download Launcher", var4, var23 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var23 = 326; + class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var2.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } + } + } + + if (Client.gameState >= 10) { + int[] var28 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var28); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class177.canvasHeight); + class139.field1323.draw(Login.xPadding - 22, Client.cycle); + class139.field1323.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var28); + } + + class13.title_muteSprite[class449.clientPreferences.getTitleMusicDisabled() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && Language.Language_EN == ClanChannelMember.clientLanguage) { + if (VarcInt.field1534 != null) { + var34 = Login.xPadding + 5; + var35 = 463; + byte var49 = 100; + byte var47 = 35; + VarcInt.field1534.drawAt(var34, var35); + var0.drawCentered("World" + " " + Client.worldId, var49 / 2 + var34, var47 / 2 + var35 - 2, 16777215, 0); + if (WorldMapLabelSize.World_request != null) { + var1.drawCentered("Loading...", var49 / 2 + var34, var47 / 2 + var35 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var49 / 2 + var34, var47 / 2 + var35 + 12, 16777215, 0); + } + } else { + VarcInt.field1534 = class172.SpriteBuffer_getIndexedSpriteByName(PcmPlayer.archive8, "sl_button", ""); + } + } + + } } - @ObfuscatedName("ht") + @ObfuscatedName("hp") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "16" + descriptor = "(I)V", + garbageValue = "163402086" ) - static final void method618() { - if (VerticalAlignment.pcmPlayer1 != null) { - VerticalAlignment.pcmPlayer1.run(); + static void method615() { + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1159 = null; + Client.packetWriter.field1157 = null; + Client.packetWriter.field1158 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1154 = 0; + Client.rebootTimer = 0; + Frames.method1297(); + Client.minimapState = 0; + Client.destinationX = 0; + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; + } + + VarbitComposition.localPlayer = null; + + for (var0 = 0; var0 < Client.npcs.length; ++var0) { + NPC var1 = Client.npcs[var0]; + if (var1 != null) { + var1.targetIndex = -1; + var1.false0 = false; + } + } + + LoginPacket.method1614(); + MusicSong.updateGameState(30); + + for (var0 = 0; var0 < 100; ++var0) { + Client.field407[var0] = true; } + Message.method341(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class106.java b/osrs/src/main/java/class106.java index 585950e05..c94e6b7d0 100644 --- a/osrs/src/main/java/class106.java +++ b/osrs/src/main/java/class106.java @@ -1,82 +1,71 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") -final class class106 implements class324 { - @ObfuscatedName("gc") +@ObfuscatedName("ey") +final class class106 implements class323 { + @ObfuscatedName("ae") + @Export("javaVersion") + public static String javaVersion; + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lnk;" ) - static Archive field1099; + static Archive field1107; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmi;" ) @Export("val$cc") @ObfuscatedName("val$cc") final Widget val$cc; @ObfuscatedSignature( - descriptor = "(Lmt;)V" + descriptor = "(Lmi;)V" ) class106(Widget var1) { this.val$cc = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-3" + garbageValue = "17" ) @Export("vmethod5708") public void vmethod5708() { - if (this.val$cc != null && this.val$cc.method1808().field2884 != null) { + if (this.val$cc != null && this.val$cc.method1847().field2900 != null) { ScriptEvent var1 = new ScriptEvent(); - var1.method474(this.val$cc); - var1.setArgs(this.val$cc.method1808().field2884); - ClientPacket.getScriptEvents().addFirst(var1); + var1.method479(this.val$cc); + var1.setArgs(this.val$cc.method1847().field2900); + class30.getScriptEvents().addFirst(var1); } } - @ObfuscatedName("az") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "16" + descriptor = "(IIIB)I", + garbageValue = "-47" ) - static void method619() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromFriend(); + static final int method617(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; } - } + if (var2 > 192) { + var1 /= 2; + } - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;I)[F", - garbageValue = "1061757144" - ) - static float[] method620(JSONObject var0, String var1) throws JSONException { - float[] var2 = new float[4]; + if (var2 > 217) { + var1 /= 2; + } - try { - JSONArray var3 = var0.getJSONArray(var1); - var2[0] = (float)var3.optDouble(0, 0.0D); - var2[1] = (float)var3.optDouble(1, 0.0D); - var2[2] = (float)var3.optDouble(2, 1.0D); - var2[3] = (float)var3.optDouble(3, 1.0D); - } catch (JSONException var4) { - var2[0] = 0.0F; - var2[1] = 0.0F; - var2[2] = 1.0F; - var2[3] = 1.0F; + if (var2 > 243) { + var1 /= 2; } - return var2; + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class108.java b/osrs/src/main/java/class108.java index aaa970f04..c2cad4172 100644 --- a/osrs/src/main/java/class108.java +++ b/osrs/src/main/java/class108.java @@ -1,111 +1,215 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; + +@ObfuscatedName("eq") public class class108 { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1125; - @ObfuscatedName("ay") + static final class108 field1137; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) static final class108 field1127; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1120; - @ObfuscatedName("am") + static final class108 field1132; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1117; - @ObfuscatedName("as") + static final class108 field1136; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1121; - @ObfuscatedName("aj") + static final class108 field1125; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1116; - @ObfuscatedName("ag") + static final class108 field1129; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1114; - @ObfuscatedName("az") + static final class108 field1138; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1128; - @ObfuscatedName("av") + static final class108 field1133; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1124; - @ObfuscatedName("ap") + static final class108 field1123; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1118; - @ObfuscatedName("aq") + static final class108 field1128; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1119; - @ObfuscatedName("at") + static final class108 field1126; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1122; - @ObfuscatedName("ah") + static final class108 field1134; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1115; - @ObfuscatedName("ax") + static final class108 field1130; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1126; - @ObfuscatedName("aa") + static final class108 field1131; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1113; - @ObfuscatedName("au") + static final class108 field1135; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leq;" ) - static final class108 field1123; - @ObfuscatedName("ae") - int field1129; + static final class108 field1124; + @ObfuscatedName("ag") + int field1139; static { - field1125 = new class108(0); + field1137 = new class108(0); field1127 = new class108(1); - field1120 = new class108(2); - field1117 = new class108(3); - field1121 = new class108(4); - field1116 = new class108(5); - field1114 = new class108(6); - field1128 = new class108(7); - field1124 = new class108(8); - field1118 = new class108(9); - field1119 = new class108(10); - field1122 = new class108(11); - field1115 = new class108(12); - field1126 = new class108(13); - field1113 = new class108(14); - field1123 = new class108(15); + field1132 = new class108(2); + field1136 = new class108(3); + field1125 = new class108(4); + field1129 = new class108(5); + field1138 = new class108(6); + field1133 = new class108(7); + field1123 = new class108(8); + field1128 = new class108(9); + field1126 = new class108(10); + field1134 = new class108(11); + field1130 = new class108(12); + field1131 = new class108(13); + field1135 = new class108(14); + field1124 = new class108(15); } class108(int var1) { - this.field1129 = var1; + this.field1139 = var1; + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "69" + ) + static void method620() { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + class318.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var1; + try { + URL var3 = new URL(HorizontalAlignment.method978("services", false) + "m=accountappeal/login.ws"); + URLConnection var4 = var3.openConnection(); + var4.setRequestProperty("connection", "close"); + var4.setDoInput(true); + var4.setDoOutput(true); + var4.setConnectTimeout(5000); + OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); + var5.write("data1=req"); + var5.flush(); + InputStream var6 = var4.getInputStream(); + Buffer var7 = new Buffer(new byte[1000]); + + while (true) { + int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); + if (var8 == -1) { + var7.offset = 0; + long var10 = var7.readLong(); + var1 = var10; + break; + } + + var7.offset += var8; + if (var7.offset >= 1000) { + var1 = 0L; + break; + } + } + } catch (Exception var14) { + var1 = 0L; + } + + int var0; + if (var1 == 0L) { + var0 = 5; + } else { + var0 = class318.method1703(var1, Login.Login_username); + } + + switch(var0) { + case 2: + class318.setLoginResponseString(Strings.field3423, Strings.field3422, Strings.field3414); + PcmPlayer.method212(6); + break; + case 3: + class318.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + class318.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + class318.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + class318.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + class318.setLoginResponseString("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("ki") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-154699452" + ) + static final void method621(boolean var0) { + class301.method1622(); + ++Client.packetWriter.pendingWrites; + if (Client.packetWriter.pendingWrites >= 50 || var0) { + Client.packetWriter.pendingWrites = 0; + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.NO_TIMEOUT, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var1); + + try { + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.hadNetworkError = true; + } + } + + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class11.java b/osrs/src/main/java/class11.java index ed44c7fcb..518e5e762 100644 --- a/osrs/src/main/java/class11.java +++ b/osrs/src/main/java/class11.java @@ -1,8 +1,3 @@ -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.security.cert.CertificateException; -import java.security.cert.CertificateFactory; -import java.util.LinkedList; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,35 +6,24 @@ import org.bouncycastle.crypto.tls.TlsAuthentication; import org.bouncycastle.crypto.tls.TlsCredentials; -@ObfuscatedName("at") +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.util.LinkedList; + +@ObfuscatedName("aq") class class11 implements TlsAuthentication { - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Luu;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("gq") - @Export("js5Port") - static int js5Port; - @ObfuscatedName("gb") - static String field36; - @ObfuscatedName("sj") - @ObfuscatedSignature( - descriptor = "Lfx;" - ) - @Export("guestClanSettings") - static ClanSettings guestClanSettings; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lax;" + descriptor = "Lan;" ) @Export("this$2") @ObfuscatedName("this$2") final class13 this$2; @ObfuscatedSignature( - descriptor = "(Lax;)V" + descriptor = "(Lan;)V" ) class11(class13 var1) { this.this$2 = var1; @@ -58,7 +42,7 @@ public void notifyServerCertificate(Certificate var1) throws IOException { var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); } - this.this$2.this$1.field38 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); + this.this$2.this$1.field39 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); } catch (CertificateException var7) { throw new IOException(var7); } @@ -70,12 +54,40 @@ public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOExc return null; } - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1328974540" + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "591994113" ) - static final void method39() { + public static String method32(byte[] var0, int var1, int var2) { + StringBuilder var3 = new StringBuilder(); + + for (int var4 = var1; var4 < var2 + var1; var4 += 3) { + int var5 = var0[var4] & 255; + var3.append(class385.field3649[var5 >>> 2]); + if (var4 < var2 - 1) { + int var6 = var0[var4 + 1] & 255; + var3.append(class385.field3649[(var5 & 3) << 4 | var6 >>> 4]); + if (var4 < var2 - 2) { + int var7 = var0[var4 + 2] & 255; + var3.append(class385.field3649[(var6 & 15) << 2 | var7 >>> 6]).append(class385.field3649[var7 & 63]); + } else { + var3.append(class385.field3649[(var6 & 15) << 2]).append("="); + } + } else { + var3.append(class385.field3649[(var5 & 3) << 4]).append("=="); + } + } + + return var3.toString(); + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "18671" + ) + static final void method33() { if (!ViewportMouse.ViewportMouse_false0) { int var0 = Scene.Scene_cameraPitchSine; int var1 = Scene.Scene_cameraPitchCosine; @@ -87,76 +99,44 @@ static final void method39() { int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.getClipMidY()) * var4 / Rasterizer3D.get3dZoom(); int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.getClipMidX()) * var5 / Rasterizer3D.get3dZoom(); int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.getClipMidY()) * var5 / Rasterizer3D.get3dZoom(); - int var11 = var7 * var1 + var0 * var4 >> 16; - int var12 = var4 * var1 - var7 * var0 >> 16; - int var13 = var1 * var9 + var5 * var0 >> 16; - int var14 = var5 * var1 - var9 * var0 >> 16; - int var15 = var6 * var3 - var2 * var12 >> 16; - int var16 = var2 * var6 + var3 * var12 >> 16; - int var17 = var8 * var3 - var14 * var2 >> 16; - int var18 = var14 * var3 + var8 * var2 >> 16; - ViewportMouse.field2228 = (var15 + var17) / 2; - ViewportMouse.field2227 = (var13 + var11) / 2; - class151.field1351 = (var18 + var16) / 2; - class538.field4242 = (var17 - var15) / 2; - ViewportMouse.field2229 = (var13 - var11) / 2; - class133.field1281 = (var18 - var16) / 2; - class90.field886 = Math.abs(class538.field4242); - class136.field1286 = Math.abs(ViewportMouse.field2229); - class387.field3645 = Math.abs(class133.field1281); - } - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(Ldz;I)V", - garbageValue = "-423842521" - ) - static final void method40(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = UserComparator5.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + int var10 = class33.method129(var7, var4, var1, var0); + int var11 = var4 * var1 - var0 * var7 >> 16; + var7 = var10; + var10 = class33.method129(var9, var5, var1, var0); + int var12 = var5 * var1 - var0 * var9 >> 16; + var9 = var10; + var10 = Tiles.method456(var6, var11, var3, var2); + int var13 = ClanChannelMember.method775(var6, var11, var3, var2); + var6 = var10; + var10 = Tiles.method456(var8, var12, var3, var2); + int var14 = ClanChannelMember.method775(var8, var12, var3, var2); + ViewportMouse.field2249 = (var10 + var6) / 2; + ViewportMouse.field2252 = (var7 + var9) / 2; + ViewportMouse.field2254 = (var13 + var14) / 2; + class261.field2396 = (var10 - var6) / 2; + ViewportMouse.field2248 = (var9 - var7) / 2; + Frames.field2121 = (var14 - var13) / 2; + ViewportMouse.field2250 = Math.abs(class261.field2396); + class7.field9 = Math.abs(ViewportMouse.field2248); + class30.field82 = Math.abs(Frames.field2121); } - - if (var0.type == 1) { - var1 = UserComparator5.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = UserComparator5.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = UserComparator5.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var1 != 0L) { - int var6 = UserComparator5.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = class458.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field943 = var4; - var0.field945 = var5; } - @ObfuscatedName("ot") + @ObfuscatedName("ni") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "47" + descriptor = "(Lmi;IIII)V", + garbageValue = "1018529135" ) - static void method41(int var0) { - SequenceDefinition var1 = class135.SequenceDefinition_get(var0); - if (var1.isCachedModelIdSet()) { - if (class273.method1504(var1.SequenceDefinition_cachedModelId) == 2) { - Client.field605.add(var1.SequenceDefinition_cachedModelId); + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + if (Client.minimapState < 3) { + Client.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class113.java b/osrs/src/main/java/class113.java index bfffb033c..0a6bd2434 100644 --- a/osrs/src/main/java/class113.java +++ b/osrs/src/main/java/class113.java @@ -1,36 +1,31 @@ -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URLConnection; -import javax.net.ssl.HttpsURLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +import javax.net.ssl.HttpsURLConnection; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URLConnection; + +@ObfuscatedName("ez") public class class113 extends UrlRequester { - @ObfuscatedName("ii") - @ObfuscatedSignature( - descriptor = "Lpc;" - ) - @Export("fontPlain12") - static Font fontPlain12; - @ObfuscatedName("ms") - @ObfuscatedSignature( - descriptor = "Ljb;" - ) - static TextureProvider textureProvider; + @ObfuscatedName("am") + static int field1172; @ObfuscatedName("as") - final boolean field1160; + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("ac") + final boolean field1173; public class113(boolean var1, int var2) { super(var2); - this.field1160 = var1; + this.field1173 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lei;I)V", - garbageValue = "-1617729938" + descriptor = "(Let;B)V", + garbageValue = "-114" ) @Export("vmethod2700") void vmethod2700(UrlRequest var1) throws IOException { @@ -42,24 +37,24 @@ void vmethod2700(UrlRequest var1) throws IOException { label125: { try { var9 = true; - String var3 = var1.field1163.getProtocol(); + String var3 = var1.field1177.getProtocol(); if (var3.equals("http")) { - var2 = this.method654(var1); + var2 = this.method660(var1); } else { if (!var3.equals("https")) { - var1.field1165 = UrlRequest.field1161; + var1.field1179 = UrlRequest.field1176; var9 = false; break label124; } - var2 = this.method655(var1); + var2 = this.method661(var1); } - this.method647(var2, var1); + this.method649(var2, var1); var9 = false; break label125; } catch (IOException var10) { - var1.field1165 = UrlRequest.field1161; + var1.field1179 = UrlRequest.field1176; var9 = false; } finally { if (var9) { @@ -94,89 +89,80 @@ void vmethod2700(UrlRequest var1) throws IOException { } - @ObfuscatedName("ab") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lei;I)Ljava/net/URLConnection;", - garbageValue = "1537364324" + descriptor = "(Let;B)Ljava/net/URLConnection;", + garbageValue = "46" ) - URLConnection method654(UrlRequest var1) throws IOException { - URLConnection var2 = var1.field1163.openConnection(); - this.method646(var2); + URLConnection method660(UrlRequest var1) throws IOException { + URLConnection var2 = var1.field1177.openConnection(); + this.method648(var2); return var2; } - @ObfuscatedName("ad") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lei;I)Ljava/net/URLConnection;", - garbageValue = "-1919857679" + descriptor = "(Let;B)Ljava/net/URLConnection;", + garbageValue = "-94" ) - URLConnection method655(UrlRequest var1) throws IOException { - HttpsURLConnection var2 = (HttpsURLConnection)var1.field1163.openConnection(); - if (!this.field1160) { - if (class15.field46 == null) { - class15.field46 = new class15(); - } - - class15 var4 = class15.field46; - var2.setSSLSocketFactory(var4); + URLConnection method661(UrlRequest var1) throws IOException { + HttpsURLConnection var2 = (HttpsURLConnection)var1.field1177.openConnection(); + if (!this.field1173) { + var2.setSSLSocketFactory(class15.method45()); } - this.method646(var2); + this.method648(var2); return var2; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "1625750201" + descriptor = "(I)[Lhe;", + garbageValue = "-242071193" ) - @Export("clockNow") - public static final synchronized long clockNow() { - long var0 = System.currentTimeMillis(); - if (var0 < class302.field2735) { - class302.field2736 += class302.field2735 - var0; - } - - class302.field2735 = var0; - return class302.field2736 + var0; + static HorizontalAlignment[] method658() { + return new HorizontalAlignment[]{HorizontalAlignment.field1574, HorizontalAlignment.field1573, HorizontalAlignment.HorizontalAlignment_centered}; } - @ObfuscatedName("bw") + @ObfuscatedName("mn") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "35871473" + descriptor = "(I)V", + garbageValue = "-1761588634" ) - static int method656(int var0, Script var1, boolean var2) { - if (var0 == 5306) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Huffman.getWindowedMode(); - return 1; - } else { - int var3; - if (var0 == 5307) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - RouteStrategy.setWindowedMode(var3); + @Export("process") + static void process() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (ModeWhere.loadInterface(var1)) { + boolean var2 = true; + Widget[] var3 = PacketBufferNode.Widget_interfaceComponents[var1]; + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { + if (var3[var4] != null) { + var2 = var3[var4].isIf3; + break; + } } - return 1; - } else if (var0 == 5308) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class150.clientPreferences.method573(); - return 1; - } else if (var0 != 5309) { - if (var0 == 5310) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else { - return 2; - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - class150.clientPreferences.method572(var3); + if (!var2) { + var4 = (int)var0.key; + Widget var5 = class92.getWidget(var4); + if (var5 != null) { + class218.invalidateWidget(var5); + } } - - return 1; } } + + } + + @ObfuscatedName("nw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1946244652" + ) + static final void method663() { + Client.field518 = Client.cycleCntr; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class12.java b/osrs/src/main/java/class12.java index ca71f0962..cedb398ff 100644 --- a/osrs/src/main/java/class12.java +++ b/osrs/src/main/java/class12.java @@ -1,22 +1,34 @@ -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.security.cert.Certificate; -import javax.net.ssl.HandshakeCompletedListener; -import javax.net.ssl.SSLSession; -import javax.net.ssl.SSLSocket; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.TlsClientProtocol; -@ObfuscatedName("ah") +import javax.net.ssl.HandshakeCompletedListener; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocket; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.cert.Certificate; + +@ObfuscatedName("al") class class12 extends SSLSocket { - @ObfuscatedName("aw") - Certificate[] field38; + @ObfuscatedName("ga") + static int field37; + @ObfuscatedName("no") + @Export("menuX") + static int menuX; + @ObfuscatedName("ro") + @ObfuscatedSignature( + descriptor = "Lgk;" + ) + @Export("mouseWheel") + static class174 mouseWheel; + @ObfuscatedName("au") + Certificate[] field39; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lau;" + descriptor = "Lab;" ) @Export("this$0") @ObfuscatedName("this$0") @@ -31,7 +43,7 @@ class class12 extends SSLSocket { final String val$host; @ObfuscatedSignature( - descriptor = "(Lau;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" + descriptor = "(Lab;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" ) class12(class15 var1, TlsClientProtocol var2, String var3) { this.this$0 = var1; @@ -121,89 +133,142 @@ public void startHandshake() throws IOException { this.val$tlsClientProtocol.connect(new class13(this)); } - @ObfuscatedName("bm") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-1021477297" + descriptor = "(ILdh;ZI)I", + garbageValue = "1596734724" ) - static int method42(int var0, Script var1, boolean var2) { - if (var0 == 6809) { - int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ObjectComposition var4 = class90.getObjectDefinition(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; - return 1; + static int method35(int var0, Script var1, boolean var2) { + boolean var3 = true; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var4 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + var3 = false; } else { - return 2; - } - } - - @ObfuscatedName("js") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1183286606" - ) - static final void method43(int var0) { - int[] var1 = Frames.sceneMinimapSprite.pixels; - int var2 = var1.length; - - int var3; - for (var3 = 0; var3 < var2; ++var3) { - var1[var3] = 0; - } - - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { - var4 = (103 - var3) * 2048 + 24628; - - for (var5 = 1; var5 < 103; ++var5) { - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { - UserComparator5.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - UserComparator5.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } - - var4 += 4; - } + var4 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; } - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - Frames.sceneMinimapSprite.setRaster(); - - int var6; - for (var5 = 1; var5 < 103; ++var5) { - for (var6 = 1; var6 < 103; ++var6) { - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { - MusicPatchNode2.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { - MusicPatchNode2.drawObject(var0 + 1, var6, var5, var3, var4); - } + int var11; + if (var0 == 1300) { + var11 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]); + return 1; + } else { + --class137.Interpreter_stringStackSize; + return 1; } - } + } else { + int var6; + if (var0 == 1301) { + SoundCache.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var4.parent = SoundCache.getWidgetChild(var11, var6); + return 1; + } else if (var0 == 1302) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1303) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + return 1; + } else if (var0 == 1304) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + return 1; + } else if (var0 == 1305) { + var4.dataText = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + return 1; + } else if (var0 == 1306) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + return 1; + } else if (var0 == 1307) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1309) { + --SoundCache.Interpreter_intStackSize; + return 1; + } else { + int var7; + byte[] var9; + if (var0 != 1350) { + byte var5; + if (var0 == 1351) { + SoundCache.Interpreter_intStackSize -= 2; + var5 = 10; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]}; + byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]}; + WorldMap.Widget_setKey(var4, var5, var9, var10); + return 1; + } else if (var0 == 1352) { + SoundCache.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + class126.Widget_setKeyRate(var4, var11, var6, var7); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == 1353) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class126.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == 1354) { + --SoundCache.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + ArchiveLoader.Widget_setKeyIgnoreHeld(var4, var11); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == 1355) { + var5 = 10; + ArchiveLoader.Widget_setKeyIgnoreHeld(var4, var5); + return 1; + } else { + return 2; + } + } else { + byte[] var8 = null; + var9 = null; + if (var3) { + SoundCache.Interpreter_intStackSize -= 10; + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + SoundCache.Interpreter_intStackSize] >= 0; var7 += 2) { + } + + if (var7 > 0) { + var8 = new byte[var7 / 2]; + var9 = new byte[var7 / 2]; + + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + SoundCache.Interpreter_intStackSize]; + var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + SoundCache.Interpreter_intStackSize + 1]; + } + } + } else { + SoundCache.Interpreter_intStackSize -= 2; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]}; + } - Client.mapIconCount = 0; - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - long var7 = UserComparator5.scene.getFloorDecorationTag(class36.Client_plane, var5, var6); - if (var7 != 0L) { - int var9 = class458.Entity_unpackID(var7); - int var10 = class90.getObjectDefinition(var9).mapIconId; - if (var10 >= 0 && SequenceDefinition.WorldMapElement_get(var10).field1506) { - Client.mapIcons[Client.mapIconCount] = SequenceDefinition.WorldMapElement_get(var10).getSpriteBool(false); - Client.mapIconXs[Client.mapIconCount] = var5; - Client.mapIconYs[Client.mapIconCount] = var6; - ++Client.mapIconCount; + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + WorldMap.Widget_setKey(var4, var7, var8, var9); + return 1; + } else { + throw new RuntimeException(); } } } } - - class156.rasterProvider.apply(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class124.java b/osrs/src/main/java/class124.java index c23cae197..4c5217c16 100644 --- a/osrs/src/main/java/class124.java +++ b/osrs/src/main/java/class124.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ef") +@ObfuscatedName("eu") public interface class124 { -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class125.java b/osrs/src/main/java/class125.java index a17747526..ea2d9fb38 100644 --- a/osrs/src/main/java/class125.java +++ b/osrs/src/main/java/class125.java @@ -2,121 +2,102 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ev") +import java.net.URL; + +@ObfuscatedName("eg") public class class125 { - @ObfuscatedName("ab") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("aw") - int field1193; - @ObfuscatedName("ay") - float field1192; - @ObfuscatedName("ar") - float field1190; - @ObfuscatedName("am") - float field1189; - @ObfuscatedName("as") - float field1191; - @ObfuscatedName("aj") - float field1188; - @ObfuscatedName("ag") + @ObfuscatedName("iy") + static long field1195; + @ObfuscatedName("jh") + static int field1193; + @ObfuscatedName("lw") + static int field1194; + @ObfuscatedName("au") + int field1202; + @ObfuscatedName("ae") + float field1198; + @ObfuscatedName("ao") + float field1200; + @ObfuscatedName("at") + float field1201; + @ObfuscatedName("ac") + float field1197; + @ObfuscatedName("ai") + float field1199; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lev;" + descriptor = "Leg;" ) - class125 field1187; + class125 field1196; class125() { - this.field1190 = Float.MAX_VALUE; - this.field1189 = Float.MAX_VALUE; - this.field1191 = Float.MAX_VALUE; - this.field1188 = Float.MAX_VALUE; + this.field1200 = Float.MAX_VALUE; + this.field1201 = Float.MAX_VALUE; + this.field1197 = Float.MAX_VALUE; + this.field1199 = Float.MAX_VALUE; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;IB)V", - garbageValue = "25" + descriptor = "(Ltm;IS)V", + garbageValue = "249" ) - void method688(Buffer var1, int var2) { - this.field1193 = var1.readShort(); - this.field1192 = var1.method2531(); - this.field1190 = var1.method2531(); - this.field1189 = var1.method2531(); - this.field1191 = var1.method2531(); - this.field1188 = var1.method2531(); + void method696(Buffer var1, int var2) { + this.field1202 = var1.readShort(); + this.field1198 = var1.method2551(); + this.field1200 = var1.method2551(); + this.field1201 = var1.method2551(); + this.field1197 = var1.method2551(); + this.field1199 = var1.method2551(); } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Lhc;", - garbageValue = "-1218756149" + descriptor = "(I)Z", + garbageValue = "1201510681" ) - @Export("ItemDefinition_get") - public static ItemComposition ItemDefinition_get(int var0) { - ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = Frames.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.post(); - if (var1.noteTemplate != -1) { - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } - - if (var1.notedId != -1) { - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } - - if (var1.placeholderTemplate != -1) { - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); - } - - if (!class502.ItemDefinition_inMembersWorld && var1.isMembersOnly) { - if (var1.noteTemplate == -1 && var1.notedId == -1 && var1.placeholderTemplate == -1) { - var1.name = var1.name + " (Members)"; - } - - var1.isTradable = false; + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (WorldMapLabelSize.World_request == null) { + WorldMapLabelSize.World_request = FriendsChat.urlRequester.request(new URL(class200.field1669)); + } else if (WorldMapLabelSize.World_request.isDone()) { + byte[] var0 = WorldMapLabelSize.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + class176.World_worlds = new World[World.World_count]; - int var3; - for (var3 = 0; var3 < var1.groundActions.length; ++var3) { - var1.groundActions[var3] = null; + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = class176.World_worlds[var2] = new World(); + var3.id = var1.readUnsignedShort(); + var3.properties = var1.readInt(); + var3.host = var1.readStringCp1252NullTerminated(); + var3.activity = var1.readStringCp1252NullTerminated(); + var3.location = var1.readUnsignedByte(); + var3.population = var1.readShort(); } - for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { - if (var3 != 4) { - var1.inventoryActions[var3] = null; - } - } - - var1.shiftClickIndex = -2; - var1.team = 0; - if (var1.params != null) { - boolean var6 = false; - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamComposition var5 = MusicPatchNode.getParamDefinition((int)var4.key); - if (var5.autoDisable) { - var4.remove(); - } else { - var6 = true; - } - } - - if (!var6) { - var1.params = null; - } - } + GameEngine.sortWorlds(class176.World_worlds, 0, class176.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + WorldMapLabelSize.World_request = null; + return true; } - - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); - return var1; + } catch (Exception var4) { + var4.printStackTrace(); + WorldMapLabelSize.World_request = null; } + + return false; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IB)[B", + garbageValue = "-47" + ) + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class126.java b/osrs/src/main/java/class126.java index c8ba77363..ed22842d0 100644 --- a/osrs/src/main/java/class126.java +++ b/osrs/src/main/java/class126.java @@ -1,325 +1,134 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("ex") public class class126 { - @ObfuscatedName("am") - public static final float field1194; - @ObfuscatedName("as") - public static final float field1195; - @ObfuscatedName("aj") - static float[] field1197; - @ObfuscatedName("ag") - static float[] field1196; - @ObfuscatedName("ft") + @ObfuscatedName("at") + public static final float field1204; + @ObfuscatedName("ac") + public static final float field1203; + @ObfuscatedName("ai") + static float[] field1206; + @ObfuscatedName("az") + static float[] field1207; + @ObfuscatedName("ee") + @ObfuscatedSignature( + descriptor = "Ldt;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("fe") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lgz;" ) - @Export("archive12") - static Archive archive12; + @Export("js5SocketTask") + static Task js5SocketTask; static { - field1194 = Math.ulp(1.0F); - field1195 = 2.0F * field1194; - field1197 = new float[4]; - field1196 = new float[5]; + field1204 = Math.ulp(1.0F); + field1203 = field1204 * 2.0F; + field1206 = new float[4]; + field1207 = new float[5]; } - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lda;", - garbageValue = "-1786451104" + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "-1457731236" ) - static ClientPreferences method690() { - AccessFile var0 = null; - ClientPreferences var1 = new ClientPreferences(); - - try { - var0 = Decimator.getPreferencesFile("", KeyHandler.field72.name, false); - byte[] var2 = new byte[(int)var0.length()]; - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var0.read(var2, var3, var2.length - var3); - if (var4 == -1) { - throw new IOException(); - } - } - - var1 = new ClientPreferences(new Buffer(var2)); - } catch (Exception var6) { - } - - try { - if (var0 != null) { - var0.close(); + public static byte[] method699(Object var0, boolean var1) { + if (var0 == null) { + return null; + } else if (var0 instanceof byte[]) { + byte[] var6 = (byte[])((byte[])var0); + if (var1) { + int var4 = var6.length; + byte[] var5 = new byte[var4]; + System.arraycopy(var6, 0, var5, 0, var4); + return var5; + } else { + return var6; } - } catch (Exception var5) { + } else if (var0 instanceof AbstractByteArrayCopier) { + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; + return var2.get(); + } else { + throw new IllegalArgumentException(); } - - return var1; } - @ObfuscatedName("at") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1080653526" + descriptor = "(I)V", + garbageValue = "-1320879691" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + public static void method700() { + ParamComposition.ParamDefinition_cached.clear(); } - @ObfuscatedName("jx") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(Lmi;IIIB)V", + garbageValue = "-45" ) - static final void method692() { - CollisionMap.method1103(false); - Client.field450 = 0; - boolean var0 = true; + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3047 == null) { + throw new RuntimeException(); + } else { + var0.field3047[var1] = var2; + var0.field3046[var1] = var3; + } + } - int var1; - for (var1 = 0; var1 < class155.regionLandArchives.length; ++var1) { - if (UserComparator4.regionMapArchiveIds[var1] != -1 && class155.regionLandArchives[var1] == null) { - class155.regionLandArchives[var1] = Canvas.archive9.takeFile(UserComparator4.regionMapArchiveIds[var1], 0); - if (class155.regionLandArchives[var1] == null) { - var0 = false; - ++Client.field450; - } + @ObfuscatedName("if") + @ObfuscatedSignature( + descriptor = "(IIIS)V", + garbageValue = "158" + ) + static final void method702(int var0, int var1, int var2) { + if (NPCComposition.cameraX < var0) { + NPCComposition.cameraX = (var0 - NPCComposition.cameraX) * MouseHandler.cameraMoveToAcceleration / 1000 + NPCComposition.cameraX + class344.cameraMoveToSpeed; + if (NPCComposition.cameraX > var0) { + NPCComposition.cameraX = var0; } + } - if (class170.regionLandArchiveIds[var1] != -1 && class389.regionMapArchives[var1] == null) { - class389.regionMapArchives[var1] = Canvas.archive9.takeFileEncrypted(class170.regionLandArchiveIds[var1], 0, class18.xteaKeys[var1]); - if (class389.regionMapArchives[var1] == null) { - var0 = false; - ++Client.field450; - } + if (NPCComposition.cameraX > var0) { + NPCComposition.cameraX -= (NPCComposition.cameraX - var0) * MouseHandler.cameraMoveToAcceleration / 1000 + class344.cameraMoveToSpeed; + if (NPCComposition.cameraX < var0) { + NPCComposition.cameraX = var0; } } - if (!var0) { - Client.field453 = 1; - } else { - Client.field448 = 0; - var0 = true; - - int var3; - int var4; - for (var1 = 0; var1 < class155.regionLandArchives.length; ++var1) { - byte[] var2 = class389.regionMapArchives[var1]; - if (var2 != null) { - var3 = (MusicPatch.regions[var1] >> 8) * 64 - AbstractArchive.baseX; - var4 = (MusicPatch.regions[var1] & 255) * 64 - class148.baseY; - if (Client.isInInstance) { - var3 = 10; - var4 = 10; - } - - var0 &= class303.method1578(var2, var3, var4); - } + if (class133.cameraY < var1) { + class133.cameraY = (var1 - class133.cameraY) * MouseHandler.cameraMoveToAcceleration / 1000 + class133.cameraY + class344.cameraMoveToSpeed; + if (class133.cameraY > var1) { + class133.cameraY = var1; } + } - if (!var0) { - Client.field453 = 2; - } else { - if (Client.field453 != 0) { - Actor.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - class105.method618(); - UserComparator5.scene.clear(); - - for (var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); - } - - int var15; - for (var1 = 0; var1 < 4; ++var1) { - for (var15 = 0; var15 < 104; ++var15) { - for (var3 = 0; var3 < 104; ++var3) { - Tiles.Tiles_renderFlags[var1][var15][var3] = 0; - } - } - } - - class105.method618(); - class325.method1674(); - var1 = class155.regionLandArchives.length; - class133.method727(); - CollisionMap.method1103(true); - int var17; - if (!Client.isInInstance) { - byte[] var5; - for (var15 = 0; var15 < var1; ++var15) { - var3 = (MusicPatch.regions[var15] >> 8) * 64 - AbstractArchive.baseX; - var4 = (MusicPatch.regions[var15] & 255) * 64 - class148.baseY; - var5 = class155.regionLandArchives[var15]; - if (var5 != null) { - class105.method618(); - World.method393(var5, var3, var4, class309.timeOfPreviousKeyPress * 8 - 48, class140.field1314 * 8 - 48, Client.collisionMaps); - } - } - - for (var15 = 0; var15 < var1; ++var15) { - var3 = (MusicPatch.regions[var15] >> 8) * 64 - AbstractArchive.baseX; - var4 = (MusicPatch.regions[var15] & 255) * 64 - class148.baseY; - var5 = class155.regionLandArchives[var15]; - if (var5 == null && class140.field1314 < 800) { - class105.method618(); - class203.method1002(var3, var4, 64, 64); - } - } - - CollisionMap.method1103(true); - - for (var15 = 0; var15 < var1; ++var15) { - byte[] var16 = class389.regionMapArchives[var15]; - if (var16 != null) { - var4 = (MusicPatch.regions[var15] >> 8) * 64 - AbstractArchive.baseX; - var17 = (MusicPatch.regions[var15] & 255) * 64 - class148.baseY; - class105.method618(); - class19.method68(var16, var4, var17, UserComparator5.scene, Client.collisionMaps); - } - } - } - - int var6; - int var7; - int var8; - if (Client.isInInstance) { - int var9; - int var10; - int var11; - for (var15 = 0; var15 < 4; ++var15) { - class105.method618(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - boolean var19 = false; - var6 = Client.instanceChunkTemplates[var15][var3][var4]; - if (var6 != -1) { - var7 = var6 >> 24 & 3; - var8 = var6 >> 1 & 3; - var9 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var9 / 8 << 8) + var10 / 8; - - for (int var12 = 0; var12 < MusicPatch.regions.length; ++var12) { - if (MusicPatch.regions[var12] == var11 && class155.regionLandArchives[var12] != null) { - int var13 = (var9 - var3) * 8; - int var14 = (var10 - var4) * 8; - class177.method908(class155.regionLandArchives[var12], var15, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, var13, var14, Client.collisionMaps); - var19 = true; - break; - } - } - } - - if (!var19) { - class74.method438(var15, var3 * 8, var4 * 8); - } - } - } - } - - for (var15 = 0; var15 < 13; ++var15) { - for (var3 = 0; var3 < 13; ++var3) { - var4 = Client.instanceChunkTemplates[0][var15][var3]; - if (var4 == -1) { - class203.method1002(var15 * 8, var3 * 8, 8, 8); - } - } - } - - CollisionMap.method1103(true); - - for (var15 = 0; var15 < 4; ++var15) { - class105.method618(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - var17 = Client.instanceChunkTemplates[var15][var3][var4]; - if (var17 != -1) { - var6 = var17 >> 24 & 3; - var7 = var17 >> 1 & 3; - var8 = var17 >> 14 & 1023; - var9 = var17 >> 3 & 2047; - var10 = (var8 / 8 << 8) + var9 / 8; - - for (var11 = 0; var11 < MusicPatch.regions.length; ++var11) { - if (MusicPatch.regions[var11] == var10 && class389.regionMapArchives[var11] != null) { - Tiles.method460(class389.regionMapArchives[var11], var15, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, UserComparator5.scene, Client.collisionMaps); - break; - } - } - } - } - } - } - } - - CollisionMap.method1103(true); - class105.method618(); - AbstractUserComparator.method2194(UserComparator5.scene, Client.collisionMaps); - CollisionMap.method1103(true); - var15 = Tiles.Tiles_minPlane; - if (var15 > class36.Client_plane) { - var15 = class36.Client_plane; - } - - if (var15 < class36.Client_plane - 1) { - var15 = class36.Client_plane - 1; - } - - if (Client.isLowDetail) { - UserComparator5.scene.init(Tiles.Tiles_minPlane); - } else { - UserComparator5.scene.init(0); - } - - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - class344.updateItemPile(var3, var4); - } - } - - class105.method618(); - ScriptFrame.method336(); - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var18; - if (TileItem.client.hasFrame()) { - var18 = class503.getPacketBufferNode(ClientPacket.DETECT_MODIFIED_CLIENT, Client.packetWriter.isaacCipher); - var18.packetBuffer.writeInt(1057001181); - Client.packetWriter.addNode(var18); - } - - if (!Client.isInInstance) { - var3 = (class309.timeOfPreviousKeyPress - 6) / 8; - var4 = (class309.timeOfPreviousKeyPress + 6) / 8; - var17 = (class140.field1314 - 6) / 8; - var6 = (class140.field1314 + 6) / 8; + if (class133.cameraY > var1) { + class133.cameraY -= (class133.cameraY - var1) * MouseHandler.cameraMoveToAcceleration / 1000 + class344.cameraMoveToSpeed; + if (class133.cameraY < var1) { + class133.cameraY = var1; + } + } - for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { - for (var8 = var17 - 1; var8 <= var6 + 1; ++var8) { - if (var7 < var3 || var7 > var4 || var8 < var17 || var8 > var6) { - Canvas.archive9.loadRegionFromName("m" + var7 + "_" + var8); - Canvas.archive9.loadRegionFromName("l" + var7 + "_" + var8); - } - } - } - } + if (class139.cameraZ < var2) { + class139.cameraZ = (var2 - class139.cameraZ) * MouseHandler.cameraMoveToAcceleration / 1000 + class139.cameraZ + class344.cameraMoveToSpeed; + if (class139.cameraZ > var2) { + class139.cameraZ = var2; + } + } - class129.updateGameState(30); - class105.method618(); - class164.method859(); - var18 = class503.getPacketBufferNode(ClientPacket.MAP_BUILD_COMPLETE, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var18); - HealthBarDefinition.method953(); + if (class139.cameraZ > var2) { + class139.cameraZ -= (class139.cameraZ - var2) * MouseHandler.cameraMoveToAcceleration / 1000 + class344.cameraMoveToSpeed; + if (class139.cameraZ < var2) { + class139.cameraZ = var2; } } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class127.java b/osrs/src/main/java/class127.java index eba090ddd..9a84b5133 100644 --- a/osrs/src/main/java/class127.java +++ b/osrs/src/main/java/class127.java @@ -1,251 +1,245 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("eo") public class class127 { - @ObfuscatedName("wn") + @ObfuscatedName("au") + public final int field1222; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lsq;" + descriptor = "Leo;" ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("aw") - public final int field1213; - @ObfuscatedName("ay") + public class127 field1221; + @ObfuscatedName("ao") + float[][] field1213; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lek;" + descriptor = "[Lrz;" ) - public class127 field1212; - @ObfuscatedName("ar") - float[][] field1203; - @ObfuscatedName("am") + final class450[] field1220; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Lrm;" + descriptor = "[Lrz;" ) - final class451[] field1211; - @ObfuscatedName("as") + class450[] field1218; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "[Lrm;" + descriptor = "[Lrz;" ) - class451[] field1210; - @ObfuscatedName("aj") + class450[] field1219; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "[Lrm;" + descriptor = "Lrz;" ) - class451[] field1209; - @ObfuscatedName("ag") + class450 field1217; + @ObfuscatedName("ap") + boolean field1210; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lrm;" + descriptor = "Lrz;" ) - class451 field1206; - @ObfuscatedName("az") - boolean field1201; - @ObfuscatedName("av") + class450 field1215; + @ObfuscatedName("af") + boolean field1209; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lrm;" + descriptor = "Lrz;" ) - class451 field1208; - @ObfuscatedName("ap") - boolean field1200; + class450 field1216; @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lrm;" - ) - class451 field1207; - @ObfuscatedName("at") - float[][] field1204; - @ObfuscatedName("ah") - float[][] field1202; - @ObfuscatedName("ax") - float[][] field1205; + float[][] field1214; + @ObfuscatedName("al") + float[][] field1211; + @ObfuscatedName("an") + float[][] field1212; @ObfuscatedSignature( - descriptor = "(ILty;Z)V" + descriptor = "(ILtm;Z)V" ) public class127(int var1, Buffer var2, boolean var3) { - this.field1206 = new class451(); - this.field1201 = true; - this.field1208 = new class451(); - this.field1200 = true; - this.field1207 = new class451(); - this.field1213 = var2.readShort(); - this.field1211 = new class451[var1]; - this.field1210 = new class451[this.field1211.length]; - this.field1209 = new class451[this.field1211.length]; - this.field1203 = new float[this.field1211.length][3]; - - for (int var4 = 0; var4 < this.field1211.length; ++var4) { - this.field1211[var4] = new class451(var2, var3); - this.field1203[var4][0] = var2.method2531(); - this.field1203[var4][1] = var2.method2531(); - this.field1203[var4][2] = var2.method2531(); + this.field1217 = new class450(); + this.field1210 = true; + this.field1215 = new class450(); + this.field1209 = true; + this.field1216 = new class450(); + this.field1222 = var2.readShort(); + this.field1220 = new class450[var1]; + this.field1218 = new class450[this.field1220.length]; + this.field1219 = new class450[this.field1220.length]; + this.field1213 = new float[this.field1220.length][3]; + + for (int var4 = 0; var4 < this.field1220.length; ++var4) { + this.field1220[var4] = new class450(var2, var3); + this.field1213[var4][0] = var2.method2551(); + this.field1213[var4][1] = var2.method2551(); + this.field1213[var4][2] = var2.method2551(); } - this.method693(); + this.method704(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1463837860" - ) - void method693() { - this.field1204 = new float[this.field1211.length][3]; - this.field1202 = new float[this.field1211.length][3]; - this.field1205 = new float[this.field1211.length][3]; - class451 var1 = class138.method744(); - - for (int var2 = 0; var2 < this.field1211.length; ++var2) { - class451 var3 = this.method694(var2); - var1.method2278(var3); - var1.method2286(); - this.field1204[var2] = var1.method2274(); - this.field1202[var2][0] = var3.field3861[12]; - this.field1202[var2][1] = var3.field3861[13]; - this.field1202[var2][2] = var3.field3861[14]; - this.field1205[var2] = var3.method2287(); + garbageValue = "-431712200" + ) + void method704() { + this.field1214 = new float[this.field1220.length][3]; + this.field1211 = new float[this.field1220.length][3]; + this.field1212 = new float[this.field1220.length][3]; + class450 var1; + synchronized(class450.field3873) { + if (class462.field3904 == 0) { + var1 = new class450(); + } else { + class450.field3873[--class462.field3904].method2302(); + var1 = class450.field3873[class462.field3904]; + } + } + + class450 var2 = var1; + + for (int var5 = 0; var5 < this.field1220.length; ++var5) { + class450 var4 = this.method705(var5); + var2.method2304(var4); + var2.method2312(); + this.field1214[var5] = var2.method2301(); + this.field1211[var5][0] = var4.field3875[12]; + this.field1211[var5][1] = var4.field3875[13]; + this.field1211[var5][2] = var4.field3875[14]; + this.field1212[var5] = var4.method2313(); } - var1.method2271(); + var2.method2298(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)Lrm;", - garbageValue = "-961715639" + descriptor = "(IB)Lrz;", + garbageValue = "1" ) - class451 method694(int var1) { - return this.field1211[var1]; + class450 method705(int var1) { + return this.field1220[var1]; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)Lrm;", - garbageValue = "-318230111" + descriptor = "(IS)Lrz;", + garbageValue = "18304" ) - class451 method695(int var1) { - if (this.field1210[var1] == null) { - this.field1210[var1] = new class451(this.method694(var1)); - if (this.field1212 != null) { - this.field1210[var1].method2282(this.field1212.method695(var1)); + class450 method706(int var1) { + if (this.field1218[var1] == null) { + this.field1218[var1] = new class450(this.method705(var1)); + if (this.field1221 != null) { + this.field1218[var1].method2308(this.field1221.method706(var1)); } else { - this.field1210[var1].method2282(class451.field3857); + this.field1218[var1].method2308(class450.field3874); } } - return this.field1210[var1]; + return this.field1218[var1]; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IB)Lrm;", - garbageValue = "81" + descriptor = "(II)Lrz;", + garbageValue = "1066264654" ) - class451 method696(int var1) { - if (this.field1209[var1] == null) { - this.field1209[var1] = new class451(this.method695(var1)); - this.field1209[var1].method2286(); + class450 method707(int var1) { + if (this.field1219[var1] == null) { + this.field1219[var1] = new class450(this.method706(var1)); + this.field1219[var1].method2312(); } - return this.field1209[var1]; + return this.field1219[var1]; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lrm;I)V", - garbageValue = "1524637069" + descriptor = "(Lrz;I)V", + garbageValue = "-799671526" ) - void method697(class451 var1) { - this.field1206.method2278(var1); - this.field1201 = true; - this.field1200 = true; + void method708(class450 var1) { + this.field1217.method2304(var1); + this.field1210 = true; + this.field1209 = true; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(I)Lrm;", - garbageValue = "144980279" + descriptor = "(B)Lrz;", + garbageValue = "-23" ) - class451 method698() { - return this.field1206; + class450 method709() { + return this.field1217; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)Lrm;", - garbageValue = "0" + descriptor = "(I)Lrz;", + garbageValue = "1930419113" ) - class451 method699() { - if (this.field1201) { - this.field1208.method2278(this.method698()); - if (this.field1212 != null) { - this.field1208.method2282(this.field1212.method699()); + class450 method710() { + if (this.field1210) { + this.field1215.method2304(this.method709()); + if (this.field1221 != null) { + this.field1215.method2308(this.field1221.method710()); } - this.field1201 = false; + this.field1210 = false; } - return this.field1208; + return this.field1215; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IB)Lrm;", - garbageValue = "2" + descriptor = "(II)Lrz;", + garbageValue = "1508889675" ) - public class451 method700(int var1) { - if (this.field1200) { - this.field1207.method2278(this.method696(var1)); - this.field1207.method2282(this.method699()); - this.field1200 = false; + public class450 method711(int var1) { + if (this.field1209) { + this.field1216.method2304(this.method707(var1)); + this.field1216.method2308(this.method710()); + this.field1209 = false; } - return this.field1207; + return this.field1216; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(II)[F", - garbageValue = "-1038210043" + garbageValue = "1706055895" ) - float[] method701(int var1) { - return this.field1204[var1]; + float[] method712(int var1) { + return this.field1214[var1]; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "-2141591558" + descriptor = "(IB)[F", + garbageValue = "12" ) - float[] method702(int var1) { - return this.field1202[var1]; + float[] method713(int var1) { + return this.field1211[var1]; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IB)[F", - garbageValue = "0" + descriptor = "(II)[F", + garbageValue = "1605437767" ) - float[] method703(int var1) { - return this.field1205[var1]; + float[] method714(int var1) { + return this.field1212[var1]; } - @ObfuscatedName("ks") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "552746163" + descriptor = "(IB)I", + garbageValue = "0" ) - static final boolean method704(int var0) { - if (var0 < 0) { - return false; - } else { - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; - } - - return var1 == 1007; - } + public static int method703(int var0) { + return var0 != 0 && var0 != 1 ? -1 : 0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class128.java b/osrs/src/main/java/class128.java index 9d227328f..a9112c490 100644 --- a/osrs/src/main/java/class128.java +++ b/osrs/src/main/java/class128.java @@ -2,61 +2,425 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") -public enum class128 implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("ew") +public enum class128 implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Leu;" + descriptor = "Lew;" ) - field1217(0, 0), - @ObfuscatedName("ay") + field1229(0, 0), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Leu;" + descriptor = "Lew;" ) - field1218(1, 1), - @ObfuscatedName("ar") + field1226(1, 1), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Leu;" + descriptor = "Lew;" ) - field1215(2, 2), - @ObfuscatedName("am") + field1227(2, 2), + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Leu;" + descriptor = "Lew;" ) - field1214(3, 3), - @ObfuscatedName("as") + field1228(3, 3), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Leu;" + descriptor = "Lew;" ) - field1216(4, 4); + field1225(4, 4); - @ObfuscatedName("aj") - final int field1220; - @ObfuscatedName("ag") - final int field1219; + @ObfuscatedName("al") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("sy") + @ObfuscatedSignature( + descriptor = "Lub;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("ai") + final int field1230; + @ObfuscatedName("az") + final int field1231; class128(int var3, int var4) { - this.field1220 = var3; - this.field1219 = var4; + this.field1230 = var3; + this.field1231 = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1219; + return this.field1231; } - @ObfuscatedName("au") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "-25" + descriptor = "(IIIIIILiv;Lis;I)V", + garbageValue = "2027076041" ) - static final int method706(int var0, int var1, int var2, int var3) { - int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; - return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); + @Export("addObjects") + static final void addObjects(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { + if (var0 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var0; + } + + ObjectComposition var8 = WorldMapElement.getObjectDefinition(var3); + int var9; + int var10; + if (var4 != 1 && var4 != 3) { + var9 = var8.sizeX; + var10 = var8.sizeY; + } else { + var9 = var8.sizeY; + var10 = var8.sizeX; + } + + int var11; + int var12; + if (var9 + var1 <= 104) { + var11 = (var9 >> 1) + var1; + var12 = (var9 + 1 >> 1) + var1; + } else { + var11 = var1; + var12 = var1 + 1; + } + + int var13; + int var14; + if (var10 + var2 <= 104) { + var13 = (var10 >> 1) + var2; + var14 = var2 + (var10 + 1 >> 1); + } else { + var13 = var2; + var14 = var2 + 1; + } + + int[][] var15 = Tiles.Tiles_heights[var0]; + int var16 = var15[var11][var14] + var15[var11][var13] + var15[var12][var13] + var15[var12][var14] >> 2; + int var17 = (var1 << 7) + (var9 << 6); + int var18 = (var2 << 7) + (var10 << 6); + long var19 = FontName.calculateTag(var1, var2, 2, var8.int1 == 0, var3); + int var21 = var5 + (var4 << 6); + if (var8.int3 == 1) { + var21 += 256; + } + + if (var8.hasSound()) { + class152.method797(var0, var1, var2, var8, var4); + } + + Object var22; + if (var5 == 22) { + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var22, var19, var21); + if (var8.interactType == 1 && var7 != null) { + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else { + int var31; + if (var5 != 10 && var5 != 11) { + int[] var10000; + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.method1243(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = BufferedNetSocket.field3820[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field844[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + MoveSpeed.field1924[var0][var1][var2] = 50; + MoveSpeed.field1924[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = BufferedNetSocket.field3820[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + MoveSpeed.field1924[var0][var1][var2 + 1] = 50; + MoveSpeed.field1924[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = BufferedNetSocket.field3820[var0][var1]; + var10000[var2 + 1] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + MoveSpeed.field1924[var0][var1 + 1][var2] = 50; + MoveSpeed.field1924[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = BufferedNetSocket.field3820[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + MoveSpeed.field1924[var0][var1][var2] = 50; + MoveSpeed.field1924[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = BufferedNetSocket.field3820[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1113(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method1249(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field840[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + MoveSpeed.field1924[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + MoveSpeed.field1924[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + MoveSpeed.field1924[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + MoveSpeed.field1924[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1113(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { + var28 = var4 + 1 & 3; + Object var23; + Object var24; + if (var8.animationId == -1 && var8.transforms == null) { + var23 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); + var24 = var8.getEntity(2, var28, var15, var17, var16, var18); + } else { + var23 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + var24 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var23, (Renderable)var24, Tiles.field844[var4], Tiles.field844[var28], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = BufferedNetSocket.field3820[var0][var1]; + var10000[var2] |= 585; + var10000 = BufferedNetSocket.field3820[var0][var1]; + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { + var10000 = BufferedNetSocket.field3820[var0][var1]; + var10000[var2 + 1] |= 1170; + var10000 = BufferedNetSocket.field3820[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = BufferedNetSocket.field3820[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = BufferedNetSocket.field3820[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = BufferedNetSocket.field3820[var0][var1]; + var10000[var2] |= 1170; + var10000 = BufferedNetSocket.field3820[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1113(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method1249(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field840[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + MoveSpeed.field1924[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + MoveSpeed.field1924[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + MoveSpeed.field1924[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + MoveSpeed.field1924[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1113(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.method1243(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method1249(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field844[var4], 0, 0, 0, var19, var21); + } else { + Object var25; + long var29; + if (var5 == 5) { + var28 = 16; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var29 != 0L) { + var28 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var29)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field844[var4], 0, var28 * Tiles.field842[var4], var28 * Tiles.field845[var4], var19, var21); + } else if (var5 == 6) { + var28 = 8; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var29 != 0L) { + var28 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var29)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field841[var4], var28 * Tiles.field843[var4], var19, var21); + } else if (var5 == 7) { + var31 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(4, var31 + 4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 4, var31 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, 256, var31, 0, 0, var19, var21); + } else if (var5 == 8) { + var28 = 8; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var29) { + var28 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var29)).int2 / 2; + } + + int var27 = var4 + 2 & 3; + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field841[var4], var28 * Tiles.field843[var4], var19, var21); + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + if (var22 != null && var6.method1243(var0, var1, var2, var16, var9, var10, (Renderable)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var31 = 15; + if (var22 instanceof Model) { + var31 = ((Model)var22).method1322() / 4; + if (var31 > 30) { + var31 = 30; + } + } + + for (int var32 = 0; var32 <= var9; ++var32) { + for (int var33 = 0; var33 <= var10; ++var33) { + if (var31 > MoveSpeed.field1924[var0][var32 + var1][var33 + var2]) { + MoveSpeed.field1924[var0][var32 + var1][var33 + var2] = (byte)var31; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class129.java b/osrs/src/main/java/class129.java index 619447d9d..71c0f3924 100644 --- a/osrs/src/main/java/class129.java +++ b/osrs/src/main/java/class129.java @@ -1,119 +1,604 @@ -import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.concurrent.Callable; + @ObfuscatedName("ep") public class class129 implements Callable { - @ObfuscatedName("aw") + @ObfuscatedName("gf") + @Export("js5Port") + static int js5Port; + @ObfuscatedName("kz") + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("mt") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Ljk;" ) - final class130 field1223; - @ObfuscatedName("ay") + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lfh;" ) - final class131 field1221; - @ObfuscatedName("ar") + final class130 field1235; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lft;" ) - final class132 field1222; - @ObfuscatedName("am") - final int field1224; + final class131 field1237; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lfs;" + ) + final class132 field1236; + @ObfuscatedName("at") + final int field1238; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lfv;" ) @Export("this$0") @ObfuscatedName("this$0") final class137 this$0; @ObfuscatedSignature( - descriptor = "(Lfz;Lfm;Lfa;Lfg;I)V" + descriptor = "(Lfv;Lfh;Lft;Lfs;I)V" ) class129(class137 var1, class130 var2, class131 var3, class132 var4, int var5) { this.this$0 = var1; - this.field1223 = var2; - this.field1221 = var3; - this.field1222 = var4; - this.field1224 = var5; + this.field1235 = var2; + this.field1237 = var3; + this.field1236 = var4; + this.field1238 = var5; } @Export("call") @ObfuscatedName("call") public Object call() { - this.field1223.method710(); + this.field1235.method719(); class130[][] var1; - if (this.field1221 == class131.field1256) { - var1 = this.this$0.field1288; + if (this.field1237 == class131.field1264) { + var1 = this.this$0.field1299; } else { - var1 = this.this$0.field1293; + var1 = this.this$0.field1304; } - var1[this.field1224][this.field1222.method724()] = this.field1223; + var1[this.field1238][this.field1236.method733()] = this.field1235; return null; } - @ObfuscatedName("hp") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-68" + descriptor = "(Liv;[Lis;I)V", + garbageValue = "2010483961" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 30) { - Client.field594.method1071(); - } + static final void method717(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + for (var4 = 0; var4 < 104; ++var4) { + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { + var5 = var2; + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 - 1; + } - if (Client.gameState == 0) { - TileItem.client.method160(); + if (var5 >= 0) { + var1[var5].setBlockedByFloor(var3, var4); + } + } + } } + } - if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { - BuddyRankComparator.setLoginState(0); - Client.field440 = 0; - Client.field441 = 0; - Client.timer.method2115(var0); - if (var0 != 20) { - GrandExchangeOfferTotalQuantityComparator.method1911(false); + Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; + if (Tiles.rndHue < -8) { + Tiles.rndHue = -8; + } + + if (Tiles.rndHue > 8) { + Tiles.rndHue = 8; + } + + Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; + if (Tiles.rndLightness < -16) { + Tiles.rndLightness = -16; + } + + if (Tiles.rndLightness > 16) { + Tiles.rndLightness = 16; + } + + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { + byte[][] var47 = MoveSpeed.field1924[var2]; + boolean var61 = true; + boolean var62 = true; + boolean var6 = true; + boolean var7 = true; + boolean var8 = true; + var9 = (int)Math.sqrt(5100.0D); + var10 = var9 * 768 >> 8; + + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; + var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); + var16 = (var13 << 8) / var15; + var17 = 65536 / var15; + var18 = (var14 << 8) / var15; + var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; + var20 = (var47[var12 - 1][var11] >> 2) + (var47[var12][var11 - 1] >> 2) + (var47[var12 + 1][var11] >> 3) + (var47[var12][var11 + 1] >> 3) + (var47[var12][var11] >> 1); + class162.field1419[var12][var11] = var19 - var20; } } - if (var0 != 20 && var0 != 40 && UserComparator5.field1175 != null) { - UserComparator5.field1175.close(); - UserComparator5.field1175 = null; + for (var11 = 0; var11 < 104; ++var11) { + Fonts.Tiles_hue[var11] = 0; + class466.Tiles_saturation[var11] = 0; + Tiles.Tiles_lightness[var11] = 0; + class128.Tiles_hueMultiplier[var11] = 0; + Interpreter.field710[var11] = 0; } - if (Client.gameState == 25) { - Client.field453 = 0; - Client.field450 = 0; - Client.field451 = 1; - Client.field448 = 0; - Client.field449 = 1; + for (var11 = -5; var11 < 109; ++var11) { + for (var12 = 0; var12 < 104; ++var12) { + var13 = var11 + 5; + int var10002; + if (var13 >= 0 && var13 < 104) { + long var48 = (long)Math.pow(2.0D, 15.0D) - 1L; + var16 = (int)var48; + var17 = Tiles.Tiles_underlays[var2][var13][var12] & var16; + if (var17 > 0) { + var19 = var17 - 1; + FloorUnderlayDefinition var50 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var19); + FloorUnderlayDefinition var51; + if (var50 != null) { + var51 = var50; + } else { + byte[] var21 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var19); + var50 = new FloorUnderlayDefinition(); + if (var21 != null) { + var50.decode(new Buffer(var21), var19); + } + + var50.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var50, (long)var19); + var51 = var50; + } + + var10000 = Fonts.Tiles_hue; + var10000[var12] += var51.hue; + var10000 = class466.Tiles_saturation; + var10000[var12] += var51.saturation; + var10000 = Tiles.Tiles_lightness; + var10000[var12] += var51.lightness; + var10000 = class128.Tiles_hueMultiplier; + var10000[var12] += var51.hueMultiplier; + var10002 = Interpreter.field710[var12]++; + } + } + + var14 = var11 - 5; + if (var14 >= 0 && var14 < 104) { + long var52 = (long)Math.pow(2.0D, 15.0D) - 1L; + var17 = (int)var52; + var18 = Tiles.Tiles_underlays[var2][var14][var12] & var17; + if (var18 > 0) { + var20 = var18 - 1; + FloorUnderlayDefinition var67 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var20); + FloorUnderlayDefinition var54; + if (var67 != null) { + var54 = var67; + } else { + byte[] var22 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var20); + var67 = new FloorUnderlayDefinition(); + if (var22 != null) { + var67.decode(new Buffer(var22), var20); + } + + var67.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var67, (long)var20); + var54 = var67; + } + + var10000 = Fonts.Tiles_hue; + var10000[var12] -= var54.hue; + var10000 = class466.Tiles_saturation; + var10000[var12] -= var54.saturation; + var10000 = Tiles.Tiles_lightness; + var10000[var12] -= var54.lightness; + var10000 = class128.Tiles_hueMultiplier; + var10000[var12] -= var54.hueMultiplier; + var10002 = Interpreter.field710[var12]--; + } + } + } + + if (var11 >= 1 && var11 < 103) { + var12 = 0; + var13 = 0; + var14 = 0; + var15 = 0; + var16 = 0; + + for (var17 = -5; var17 < 109; ++var17) { + var18 = var17 + 5; + if (var18 >= 0 && var18 < 104) { + var12 += Fonts.Tiles_hue[var18]; + var13 += class466.Tiles_saturation[var18]; + var14 += Tiles.Tiles_lightness[var18]; + var15 += class128.Tiles_hueMultiplier[var18]; + var16 += Interpreter.field710[var18]; + } + + var19 = var17 - 5; + if (var19 >= 0 && var19 < 104) { + var12 -= Fonts.Tiles_hue[var19]; + var13 -= class466.Tiles_saturation[var19]; + var14 -= Tiles.Tiles_lightness[var19]; + var15 -= class128.Tiles_hueMultiplier[var19]; + var16 -= Interpreter.field710[var19]; + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { + if (var2 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var2; + } + + long var55 = (long)Math.pow(2.0D, 15.0D) - 1L; + int var57 = (int)var55; + int var23 = Tiles.Tiles_underlays[var2][var11][var17] & var57; + int var24 = class227.Tiles_overlays[var2][var11][var17] & var57; + if (var23 > 0 || var24 > 0) { + int var25 = Tiles.Tiles_heights[var2][var11][var17]; + int var26 = Tiles.Tiles_heights[var2][var11 + 1][var17]; + int var27 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; + int var28 = Tiles.Tiles_heights[var2][var11][var17 + 1]; + int var29 = class162.field1419[var11][var17]; + int var30 = class162.field1419[var11 + 1][var17]; + int var31 = class162.field1419[var11 + 1][var17 + 1]; + int var32 = class162.field1419[var11][var17 + 1]; + int var33 = -1; + int var34 = -1; + int var35; + int var36; + int var37; + if (var23 > 0) { + var35 = var12 * 256 / var15; + var36 = var13 / var16; + var37 = var14 / var16; + var33 = class106.method617(var35, var36, var37); + var35 = var35 + Tiles.rndHue & 255; + var37 += Tiles.rndLightness; + if (var37 < 0) { + var37 = 0; + } else if (var37 > 255) { + var37 = 255; + } + + var34 = class106.method617(var35, var36, var37); + } + + FloorOverlayDefinition var38; + if (var2 > 0) { + boolean var68 = true; + if (var23 == 0 && class172.Tiles_shapes[var2][var11][var17] != 0) { + var68 = false; + } + + if (var24 > 0) { + var37 = var24 - 1; + var38 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var37); + FloorOverlayDefinition var58; + if (var38 != null) { + var58 = var38; + } else { + byte[] var39 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var37); + var38 = new FloorOverlayDefinition(); + if (var39 != null) { + var38.decode(new Buffer(var39), var37); + } + + var38.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var38, (long)var37); + var58 = var38; + } + + if (!var58.hideUnderlay) { + var68 = false; + } + } + + if (var68 && var26 == var25 && var27 == var25 && var25 == var28) { + var10000 = BufferedNetSocket.field3820[var2][var11]; + var10000[var17] |= 2340; + } + } + + var35 = 0; + if (var34 != -1) { + var35 = Rasterizer3D.Rasterizer3D_colorPalette[UserComparator7.method677(var34, 96)]; + } + + if (var24 == 0) { + var0.addTile(var2, var11, var17, 0, 0, -1, var25, var26, var27, var28, UserComparator7.method677(var33, var29), UserComparator7.method677(var33, var30), UserComparator7.method677(var33, var31), UserComparator7.method677(var33, var32), 0, 0, 0, 0, var35, 0); + } else { + var36 = class172.Tiles_shapes[var2][var11][var17] + 1; + byte var69 = ModelData0.field2282[var2][var11][var17]; + int var59 = var24 - 1; + FloorOverlayDefinition var40 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var59); + if (var40 != null) { + var38 = var40; + } else { + byte[] var41 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var59); + var40 = new FloorOverlayDefinition(); + if (var41 != null) { + var40.decode(new Buffer(var41), var59); + } + + var40.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var40, (long)var59); + var38 = var40; + } + + int var60 = var38.texture; + int var42; + int var43; + int var44; + int var45; + if (var60 >= 0) { + var43 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var60); + var42 = -1; + } else if (var38.primaryRgb == 16711935) { + var42 = -2; + var60 = -1; + var43 = -2; + } else { + var42 = class106.method617(var38.hue, var38.saturation, var38.lightness); + var44 = var38.hue + Tiles.rndHue & 255; + var45 = var38.lightness + Tiles.rndLightness; + if (var45 < 0) { + var45 = 0; + } else if (var45 > 255) { + var45 = 255; + } + + var43 = class106.method617(var44, var38.saturation, var45); + } + + var44 = 0; + if (var43 != -2) { + var44 = Rasterizer3D.Rasterizer3D_colorPalette[Client.method357(var43, 96)]; + } + + if (var38.secondaryRgb != -1) { + var45 = var38.secondaryHue + Tiles.rndHue & 255; + int var46 = var38.secondaryLightness + Tiles.rndLightness; + if (var46 < 0) { + var46 = 0; + } else if (var46 > 255) { + var46 = 255; + } + + var43 = class106.method617(var45, var38.secondarySaturation, var46); + var44 = Rasterizer3D.Rasterizer3D_colorPalette[Client.method357(var43, 96)]; + } + + var0.addTile(var2, var11, var17, var36, var69, var60, var25, var26, var27, var28, UserComparator7.method677(var33, var29), UserComparator7.method677(var33, var30), UserComparator7.method677(var33, var31), UserComparator7.method677(var33, var32), Client.method357(var42, var29), Client.method357(var42, var30), Client.method357(var42, var31), Client.method357(var42, var32), var35, var44); + } + } + } + } + } } - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - int var3 = Client.gameState == 11 ? 4 : 0; - UserComparator10.method682(class131.archive10, class386.archive8, false, var3); - } else if (var0 == 11) { - UserComparator10.method682(class131.archive10, class386.archive8, false, 4); - } else if (var0 == 50) { - Actor.setLoginResponseString("", "Updating date of birth...", ""); - UserComparator10.method682(class131.archive10, class386.archive8, false, 7); - } else { - WorldMapData_0.method1363(); + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var0.setTileMinPlane(var2, var12, var11, ViewportMouse.method1349(var2, var12, var11)); } - } else { - boolean var1 = class150.clientPreferences.method571() >= Client.param21; - int var2 = var1 ? 0 : 12; - UserComparator10.method682(class131.archive10, class386.archive8, true, var2); } - Client.gameState = var0; + Tiles.Tiles_underlays[var2] = null; + class227.Tiles_overlays[var2] = null; + class172.Tiles_shapes[var2] = null; + ModelData0.field2282[var2] = null; + MoveSpeed.field1924[var2] = null; } + + var0.method1264(-50, -10, -50); + + for (var2 = 0; var2 < 104; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; + var3 = 2; + var4 = 4; + + for (var5 = 0; var5 < 4; ++var5) { + if (var5 > 0) { + var2 <<= 3; + var3 <<= 3; + var4 <<= 3; + } + + for (int var63 = 0; var63 <= var5; ++var63) { + for (int var64 = 0; var64 <= 104; ++var64) { + for (int var65 = 0; var65 <= 104; ++var65) { + short var66; + if ((BufferedNetSocket.field3820[var63][var65][var64] & var2) != 0) { + var9 = var64; + var10 = var64; + var11 = var63; + + for (var12 = var63; var9 > 0 && (BufferedNetSocket.field3820[var63][var65][var9 - 1] & var2) != 0; --var9) { + } + + while (var10 < 104 && (BufferedNetSocket.field3820[var63][var65][var10 + 1] & var2) != 0) { + ++var10; + } + + label372: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((BufferedNetSocket.field3820[var11 - 1][var65][var13] & var2) == 0) { + break label372; + } + } + + --var11; + } + + label361: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((BufferedNetSocket.field3820[var12 + 1][var65][var13] & var2) == 0) { + break label361; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var66 = 240; + var15 = Tiles.Tiles_heights[var12][var65][var9] - var66; + var16 = Tiles.Tiles_heights[var11][var65][var9]; + Scene.Scene_addOccluder(var5, 1, var65 * 128, var65 * 128, var9 * 128, var10 * 128 + 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = BufferedNetSocket.field3820[var17][var65]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((BufferedNetSocket.field3820[var63][var65][var64] & var3) != 0) { + var9 = var65; + var10 = var65; + var11 = var63; + + for (var12 = var63; var9 > 0 && (BufferedNetSocket.field3820[var63][var9 - 1][var64] & var3) != 0; --var9) { + } + + while (var10 < 104 && (BufferedNetSocket.field3820[var63][var10 + 1][var64] & var3) != 0) { + ++var10; + } + + label425: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((BufferedNetSocket.field3820[var11 - 1][var13][var64] & var3) == 0) { + break label425; + } + } + + --var11; + } + + label414: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((BufferedNetSocket.field3820[var12 + 1][var13][var64] & var3) == 0) { + break label414; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var66 = 240; + var15 = Tiles.Tiles_heights[var12][var9][var64] - var66; + var16 = Tiles.Tiles_heights[var11][var9][var64]; + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var64 * 128, var64 * 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = BufferedNetSocket.field3820[var17][var18]; + var10000[var64] &= ~var3; + } + } + } + } + + if ((BufferedNetSocket.field3820[var63][var65][var64] & var4) != 0) { + var9 = var65; + var10 = var65; + var11 = var64; + + for (var12 = var64; var11 > 0 && (BufferedNetSocket.field3820[var63][var65][var11 - 1] & var4) != 0; --var11) { + } + + while (var12 < 104 && (BufferedNetSocket.field3820[var63][var65][var12 + 1] & var4) != 0) { + ++var12; + } + + label478: + while (var9 > 0) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((BufferedNetSocket.field3820[var63][var9 - 1][var13] & var4) == 0) { + break label478; + } + } + + --var9; + } + + label467: + while (var10 < 104) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((BufferedNetSocket.field3820[var63][var10 + 1][var13] & var4) == 0) { + break label467; + } + } + + ++var10; + } + + if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { + var13 = Tiles.Tiles_heights[var63][var9][var11]; + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); + + for (var14 = var9; var14 <= var10; ++var14) { + for (var15 = var11; var15 <= var12; ++var15) { + var10000 = BufferedNetSocket.field3820[var63][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class13.java b/osrs/src/main/java/class13.java index efa9cbfb1..8ad06597c 100644 --- a/osrs/src/main/java/class13.java +++ b/osrs/src/main/java/class13.java @@ -1,31 +1,36 @@ -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.DefaultTlsClient; import org.bouncycastle.crypto.tls.TlsAuthentication; -@ObfuscatedName("ax") +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.Hashtable; + +@ObfuscatedName("an") class class13 extends DefaultTlsClient { - @ObfuscatedName("fv") + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("InvDefinition_archive") + static AbstractArchive InvDefinition_archive; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "[Luk;" ) - @Export("archive6") - static Archive archive6; + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lah;" + descriptor = "Lal;" ) - @Export("this$1") - @ObfuscatedName("this$1") final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lah;)V" + descriptor = "(Lal;)V" ) class13(class12 var1) { this.this$1 = var1; @@ -57,79 +62,19 @@ public TlsAuthentication getAuthentication() throws IOException { return new class11(this); } - @ObfuscatedName("aw") - public static final void method44(long var0) { - if (var0 > 0L) { - if (var0 % 10L == 0L) { - long var2 = var0 - 1L; - - try { - Thread.sleep(var2); - } catch (InterruptedException var8) { - } - - try { - Thread.sleep(1L); - } catch (InterruptedException var7) { - } - } else { - try { - Thread.sleep(var0); - } catch (InterruptedException var6) { - } - } - - } - } - - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1527587473" + descriptor = "(Ltm;II)V", + garbageValue = "1477731180" ) - public static String method45(String var0) { - StringBuilder var1 = new StringBuilder(var0.length()); - int var2 = 0; - int var3 = -1; - - for (int var4 = 0; var4 < var0.length(); ++var4) { - char var5 = var0.charAt(var4); - if (var5 == '<') { - var1.append(var0.substring(var2, var4)); - var3 = var4; - } else if (var5 == '>' && var3 != -1) { - String var6 = var0.substring(var3 + 1, var4); - var3 = -1; - if (var6.equals("lt")) { - var1.append("<"); - } else if (var6.equals("gt")) { - var1.append(">"); - } else if (var6.equals("br")) { - var1.append("\n"); - } - - var2 = var4 + 1; + public static void method36(Buffer var0, int var1) { + if (JagexCache.JagexCache_randomDat != null) { + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); + } catch (Exception var3) { } } - if (var2 < var0.length()) { - var1.append(var0.substring(var2, var0.length())); - } - - return var1.toString(); - } - - @ObfuscatedName("nn") - @ObfuscatedSignature( - descriptor = "(Lmt;I)Ljava/lang/String;", - garbageValue = "169549382" - ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (class273.Widget_unpackTargetMask(UserComparator8.getWidgetFlags(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; - } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class130.java b/osrs/src/main/java/class130.java index e5d909557..e87542aef 100644 --- a/osrs/src/main/java/class130.java +++ b/osrs/src/main/java/class130.java @@ -2,235 +2,237 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") +@ObfuscatedName("fh") public class class130 { - @ObfuscatedName("qb") - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("aw") - boolean field1228; - @ObfuscatedName("ay") - boolean field1229; - @ObfuscatedName("ar") + @ObfuscatedName("jb") @ObfuscatedSignature( - descriptor = "Leu;" + descriptor = "Liv;" ) - class128 field1231; - @ObfuscatedName("am") + @Export("scene") + static Scene scene; + @ObfuscatedName("au") + boolean field1243; + @ObfuscatedName("ae") + boolean field1240; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Leu;" + descriptor = "Lew;" ) - class128 field1230; - @ObfuscatedName("as") + class128 field1245; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "[Lev;" + descriptor = "Lew;" ) - class125[] field1232; - @ObfuscatedName("aj") - boolean field1227; - @ObfuscatedName("ag") - float field1234; + class128 field1246; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "[Leg;" + ) + class125[] field1244; + @ObfuscatedName("ai") + boolean field1242; @ObfuscatedName("az") - float field1244; - @ObfuscatedName("av") - float field1242; + float field1258; @ObfuscatedName("ap") - float field1238; - @ObfuscatedName("aq") - float field1239; - @ObfuscatedName("at") - float field1240; - @ObfuscatedName("ah") - float field1235; - @ObfuscatedName("ax") - float field1243; + float field1254; @ObfuscatedName("aa") - float field1233; - @ObfuscatedName("au") - float field1241; - @ObfuscatedName("ae") - boolean field1226; - @ObfuscatedName("ab") - int field1246; + float field1247; + @ObfuscatedName("af") + float field1250; @ObfuscatedName("ad") - float[] field1245; - @ObfuscatedName("ao") - int field1248; - @ObfuscatedName("ac") - int field1247; - @ObfuscatedName("ak") - float field1236; + float field1249; + @ObfuscatedName("aq") + float field1255; + @ObfuscatedName("al") + float field1252; @ObfuscatedName("an") - float field1237; + float field1253; + @ObfuscatedName("ar") + float field1256; + @ObfuscatedName("ab") + float field1248; + @ObfuscatedName("ag") + boolean field1241; + @ObfuscatedName("am") + int field1261; + @ObfuscatedName("ax") + float[] field1259; + @ObfuscatedName("ah") + int field1260; + @ObfuscatedName("as") + int field1262; + @ObfuscatedName("ay") + float field1257; + @ObfuscatedName("aj") + float field1251; class130() { - this.field1226 = true; - this.field1246 = 0; + this.field1241 = true; + this.field1261 = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;IB)I", - garbageValue = "123" + descriptor = "(Ltm;IB)I", + garbageValue = "-47" ) - int method709(Buffer var1, int var2) { + int method718(Buffer var1, int var2) { int var3 = var1.readUnsignedShort(); - AttackOption.method610(var1.readUnsignedByte()); - this.field1231 = class74.method437(var1.readUnsignedByte()); - this.field1230 = class74.method437(var1.readUnsignedByte()); - this.field1228 = var1.readUnsignedByte() != 0; - this.field1232 = new class125[var3]; - class125 var4 = null; - - for (int var5 = 0; var5 < var3; ++var5) { - class125 var6 = new class125(); - var6.method688(var1, var2); - this.field1232[var5] = var6; - if (var4 != null) { - var4.field1187 = var6; + int var4 = var1.readUnsignedByte(); + class138[] var5 = new class138[]{class138.field1314, class138.field1309, class138.field1311, class138.field1313, class138.field1308, class138.field1310, class138.field1315, class138.field1312, class138.field1307}; + class138 var6 = (class138)KeyHandler.findEnumerated(var5, var4); + if (var6 == null) { + var6 = class138.field1307; + } + + this.field1245 = ArchiveLoader.method466(var1.readUnsignedByte()); + this.field1246 = ArchiveLoader.method466(var1.readUnsignedByte()); + this.field1243 = var1.readUnsignedByte() != 0; + this.field1244 = new class125[var3]; + class125 var9 = null; + + for (int var8 = 0; var8 < var3; ++var8) { + class125 var7 = new class125(); + var7.method696(var1, var2); + this.field1244[var8] = var7; + if (var9 != null) { + var9.field1196 = var7; } - var4 = var6; + var9 = var7; } return var3; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-725467027" + descriptor = "(S)V", + garbageValue = "-1069" ) - void method710() { - this.field1248 = this.field1232[0].field1193; - this.field1247 = this.field1232[this.method717() - 1].field1193; - this.field1245 = new float[this.method714() + 1]; + void method719() { + this.field1260 = this.field1244[0].field1202; + this.field1262 = this.field1244[this.method726() - 1].field1202; + this.field1259 = new float[this.method723() + 1]; - for (int var1 = this.method712(); var1 <= this.method713(); ++var1) { - this.field1245[var1 - this.method712()] = ApproximateRouteStrategy.method348(this, (float)var1); + for (int var1 = this.method721(); var1 <= this.method722(); ++var1) { + this.field1259[var1 - this.method721()] = Skeleton.method1229(this, (float)var1); } - this.field1232 = null; - this.field1236 = ApproximateRouteStrategy.method348(this, (float)(this.method712() - 1)); - this.field1237 = ApproximateRouteStrategy.method348(this, (float)(this.method713() + 1)); + this.field1244 = null; + this.field1257 = Skeleton.method1229(this, (float)(this.method721() - 1)); + this.field1251 = Skeleton.method1229(this, (float)(this.method722() + 1)); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "-1628852517" + descriptor = "(IB)F", + garbageValue = "-13" ) - public float method711(int var1) { - if (var1 < this.method712()) { - return this.field1236; + public float method720(int var1) { + if (var1 < this.method721()) { + return this.field1257; } else { - return var1 > this.method713() ? this.field1237 : this.field1245[var1 - this.method712()]; + return var1 > this.method722() ? this.field1251 : this.field1259[var1 - this.method721()]; } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-1409378084" ) - int method712() { - return this.field1248; + int method721() { + return this.field1260; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1597544274" + garbageValue = "1371661145" ) - int method713() { - return this.field1247; + int method722() { + return this.field1262; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "606654204" + garbageValue = "1808269392" ) - int method714() { - return this.method713() - this.method712(); + int method723() { + return this.method722() - this.method721(); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(FI)I", - garbageValue = "1218924507" + descriptor = "(FB)I", + garbageValue = "116" ) - int method715(float var1) { - if (this.field1246 >= 0 && (float)this.field1232[this.field1246].field1193 <= var1 && (this.field1232[this.field1246].field1187 == null || (float)this.field1232[this.field1246].field1187.field1193 > var1)) { - return this.field1246; - } else if (var1 >= (float)this.method712() && var1 <= (float)this.method713()) { - int var2 = this.method717(); - int var3 = this.field1246; - if (var2 > 0) { - int var4 = 0; - int var5 = var2 - 1; - - do { - int var6 = var4 + var5 >> 1; - if (var1 < (float)this.field1232[var6].field1193) { - if (var1 > (float)this.field1232[var6 - 1].field1193) { - var3 = var6 - 1; - break; - } - - var5 = var6 - 1; - } else { - if (var1 <= (float)this.field1232[var6].field1193) { - var3 = var6; - break; - } - - if (var1 < (float)this.field1232[var6 + 1].field1193) { - var3 = var6; - break; + int method724(float var1) { + if (this.field1261 < 0 || (float)this.field1244[this.field1261].field1202 > var1 || this.field1244[this.field1261].field1196 != null && (float)this.field1244[this.field1261].field1196.field1202 <= var1) { + if (var1 >= (float)this.method721() && var1 <= (float)this.method722()) { + int var2 = this.method726(); + int var3 = this.field1261; + if (var2 > 0) { + int var4 = 0; + int var5 = var2 - 1; + + do { + int var6 = var5 + var4 >> 1; + if (var1 < (float)this.field1244[var6].field1202) { + if (var1 > (float)this.field1244[var6 - 1].field1202) { + var3 = var6 - 1; + break; + } + + var5 = var6 - 1; + } else { + if (var1 <= (float)this.field1244[var6].field1202) { + var3 = var6; + break; + } + + if (var1 < (float)this.field1244[var6 + 1].field1202) { + var3 = var6; + break; + } + + var4 = var6 + 1; } + } while(var4 <= var5); + } - var4 = var6 + 1; - } - } while(var4 <= var5); - } + if (var3 != this.field1261) { + this.field1261 = var3; + this.field1241 = true; + } - if (var3 != this.field1246) { - this.field1246 = var3; - this.field1226 = true; + return this.field1261; + } else { + return -1; } - - return this.field1246; } else { - return -1; + return this.field1261; } } - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(FI)Lev;", - garbageValue = "-487533983" - ) - class125 method716(float var1) { - int var2 = this.method715(var1); - return var2 >= 0 && var2 < this.field1232.length ? this.field1232[var2] : null; - } - - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "2" + descriptor = "(FI)Leg;", + garbageValue = "1942643085" ) - int method717() { - return this.field1232 == null ? 0 : this.field1232.length; + class125 method725(float var1) { + int var2 = this.method724(var1); + return var2 >= 0 && var2 < this.field1244.length ? this.field1244[var2] : null; } - @ObfuscatedName("aw") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)Llv;", - garbageValue = "685705935" + descriptor = "(I)I", + garbageValue = "1392526079" ) - public static PacketBufferNode method708() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + int method726() { + return this.field1244 == null ? 0 : this.field1244.length; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class131.java b/osrs/src/main/java/class131.java index 4036b0486..b7f836d5b 100644 --- a/osrs/src/main/java/class131.java +++ b/osrs/src/main/java/class131.java @@ -2,110 +2,182 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fa") -public class class131 implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("ft") +public class class131 implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lft;" ) - static final class131 field1255; - @ObfuscatedName("ay") + static final class131 field1268; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lft;" ) - static final class131 field1256; - @ObfuscatedName("ar") + static final class131 field1264; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lft;" ) - static final class131 field1253; - @ObfuscatedName("am") + static final class131 field1266; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lft;" ) - static final class131 field1252; - @ObfuscatedName("as") + static final class131 field1267; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lft;" ) - static final class131 field1254; - @ObfuscatedName("aj") + static final class131 field1263; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lft;" ) - static final class131 field1251; - @ObfuscatedName("dr") - @ObfuscatedSignature( - descriptor = "[Lud;" - ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("ag") - final int field1257; + static final class131 field1265; @ObfuscatedName("az") - final int field1259; - @ObfuscatedName("av") - final int field1258; + final int field1271; + @ObfuscatedName("ap") + final int field1270; + @ObfuscatedName("aa") + final int field1269; static { - field1255 = new class131(0, 0, (String)null, 0); - field1256 = new class131(1, 1, (String)null, 9); - field1253 = new class131(2, 2, (String)null, 3); - field1252 = new class131(3, 3, (String)null, 6); - field1254 = new class131(4, 4, (String)null, 1); - field1251 = new class131(5, 5, (String)null, 3); + field1268 = new class131(0, 0, (String)null, 0); + field1264 = new class131(1, 1, (String)null, 9); + field1266 = new class131(2, 2, (String)null, 3); + field1267 = new class131(3, 3, (String)null, 6); + field1263 = new class131(4, 4, (String)null, 1); + field1265 = new class131(5, 5, (String)null, 3); } class131(int var1, int var2, String var3, int var4) { - this.field1257 = var1; - this.field1259 = var2; - this.field1258 = var4; + this.field1271 = var1; + this.field1270 = var2; + this.field1269 = var4; } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1580346823" + descriptor = "(B)I", + garbageValue = "41" ) - int method719() { - return this.field1258; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1270; } - @ObfuscatedName("ay") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1644350448" + garbageValue = "149385670" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1259; + int method727() { + return this.field1269; } - @ObfuscatedName("ay") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)Lia;", - garbageValue = "-1250585364" + descriptor = "(IIIIB)V", + garbageValue = "50" ) - public static FloorOverlayDefinition method718(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); - var1 = new FloorOverlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); + static void method729(int var0, int var1, int var2, int var3) { + for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { + int var5 = 0; + if (var1 > var4.maxX) { + var5 += var1 - var4.maxX; + } else if (var1 < var4.x) { + var5 += var4.x - var1; + } + + if (var2 > var4.maxY) { + var5 += var2 - var4.maxY; + } else if (var2 < var4.y) { + var5 += var4.y - var2; + } + + if (var5 - 64 <= var4.field702 && class449.clientPreferences.getAreaSoundEffectsVolume() != 0 && var0 == var4.plane) { + var5 -= 64; + if (var5 < 0) { + var5 = 0; + } + + int var6 = (var4.field702 - var5) * class449.clientPreferences.getAreaSoundEffectsVolume() / var4.field702; + if (var4.stream1 == null) { + if (var4.soundEffectId >= 0) { + SoundEffect var7 = SoundEffect.readSoundEffect(class28.field81, var4.soundEffectId, 0); + if (var7 != null) { + RawSound var8 = var7.toRawSound().resample(class330.decimator); + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); + var9.setNumLoops(-1); + class162.pcmStreamMixer.addSubStream(var9); + var4.stream1 = var9; + } + } + } else { + var4.stream1.method238(var6); + } + + if (var4.stream2 == null) { + if (var4.soundEffectIds != null && (var4.field698 -= var3) <= 0) { + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); + SoundEffect var12 = SoundEffect.readSoundEffect(class28.field81, var4.soundEffectIds[var11], 0); + if (var12 != null) { + RawSound var13 = var12.toRawSound().resample(class330.decimator); + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); + var10.setNumLoops(0); + class162.pcmStreamMixer.addSubStream(var10); + var4.stream2 = var10; + var4.field698 = var4.field696 + (int)(Math.random() * (double)(var4.field694 - var4.field696)); + } + } + } else { + var4.stream2.method238(var6); + if (!var4.stream2.hasNext()) { + var4.stream2 = null; + } + } + } else { + if (var4.stream1 != null) { + class162.pcmStreamMixer.removeSubStream(var4.stream1); + var4.stream1 = null; + } + + if (var4.stream2 != null) { + class162.pcmStreamMixer.removeSubStream(var4.stream2); + var4.stream2 = null; + } + } } + } + + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IZIZI)V", + garbageValue = "-761761706" + ) + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (class176.World_worlds != null) { + Occluder.doWorldSorting(0, class176.World_worlds.length - 1, var0, var1, var2, var3); + } + + } - var1.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); - return var1; + @ObfuscatedName("nk") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-87" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (ReflectionCheck.friendsChat != null) { + PacketBufferNode var1 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLAN_KICKUSER, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class132.java b/osrs/src/main/java/class132.java index 1171ea84e..c455e3013 100644 --- a/osrs/src/main/java/class132.java +++ b/osrs/src/main/java/class132.java @@ -2,120 +2,120 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") -public class class132 implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("fs") +public class class132 implements class371 { + @ObfuscatedName("wu") + static long field1272; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1274; - @ObfuscatedName("ay") + static final class132 field1288; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1276; - @ObfuscatedName("ar") + static final class132 field1277; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1269; - @ObfuscatedName("am") + static final class132 field1283; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1266; - @ObfuscatedName("as") + static final class132 field1287; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1270; - @ObfuscatedName("aj") + static final class132 field1275; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1265; - @ObfuscatedName("ag") + static final class132 field1280; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1263; - @ObfuscatedName("az") + static final class132 field1289; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1277; - @ObfuscatedName("av") + static final class132 field1284; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) static final class132 field1273; - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1267; - @ObfuscatedName("aq") + static final class132 field1278; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1268; - @ObfuscatedName("at") + static final class132 field1276; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1271; - @ObfuscatedName("ah") + static final class132 field1285; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1264; - @ObfuscatedName("ax") + static final class132 field1281; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1275; - @ObfuscatedName("aa") + static final class132 field1282; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1261; - @ObfuscatedName("au") + static final class132 field1286; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1272; - @ObfuscatedName("ae") + static final class132 field1274; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfs;" ) - static final class132 field1262; - @ObfuscatedName("uk") - static int cameraMoveToY; - @ObfuscatedName("ab") - final int field1278; - @ObfuscatedName("ad") - final int field1279; - @ObfuscatedName("ao") - final int field1280; + static final class132 field1279; + @ObfuscatedName("am") + final int field1291; + @ObfuscatedName("ax") + final int field1292; + @ObfuscatedName("ah") + final int field1290; static { - field1274 = new class132(0, 0, (String)null, -1, -1); - field1276 = new class132(1, 1, (String)null, 0, 2); - field1269 = new class132(2, 2, (String)null, 1, 2); - field1266 = new class132(3, 3, (String)null, 2, 2); - field1270 = new class132(4, 4, (String)null, 3, 1); - field1265 = new class132(5, 5, (String)null, 4, 1); - field1263 = new class132(6, 6, (String)null, 5, 1); - field1277 = new class132(7, 7, (String)null, 6, 3); + field1288 = new class132(0, 0, (String)null, -1, -1); + field1277 = new class132(1, 1, (String)null, 0, 2); + field1283 = new class132(2, 2, (String)null, 1, 2); + field1287 = new class132(3, 3, (String)null, 2, 2); + field1275 = new class132(4, 4, (String)null, 3, 1); + field1280 = new class132(5, 5, (String)null, 4, 1); + field1289 = new class132(6, 6, (String)null, 5, 1); + field1284 = new class132(7, 7, (String)null, 6, 3); field1273 = new class132(8, 8, (String)null, 7, 3); - field1267 = new class132(9, 9, (String)null, 8, 3); - field1268 = new class132(10, 10, (String)null, 0, 7); - field1271 = new class132(11, 11, (String)null, 1, 7); - field1264 = new class132(12, 12, (String)null, 2, 7); - field1275 = new class132(13, 13, (String)null, 3, 7); - field1261 = new class132(14, 14, (String)null, 4, 7); - field1272 = new class132(15, 15, (String)null, 5, 7); - field1262 = new class132(16, 16, (String)null, 0, 5); + field1278 = new class132(9, 9, (String)null, 8, 3); + field1276 = new class132(10, 10, (String)null, 0, 7); + field1285 = new class132(11, 11, (String)null, 1, 7); + field1281 = new class132(12, 12, (String)null, 2, 7); + field1282 = new class132(13, 13, (String)null, 3, 7); + field1286 = new class132(14, 14, (String)null, 4, 7); + field1274 = new class132(15, 15, (String)null, 5, 7); + field1279 = new class132(16, 16, (String)null, 0, 5); } @ObfuscatedSignature( @@ -123,86 +123,617 @@ public class class132 implements class372 { garbageValue = "-1" ) class132(int var1, int var2, String var3, int var4, int var5) { - this.field1278 = var1; - this.field1279 = var2; - this.field1280 = var4; + this.field1291 = var1; + this.field1292 = var2; + this.field1290 = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1644350448" + garbageValue = "-1552695494" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1279; + int method733() { + return this.field1290; } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-130893378" + descriptor = "(B)I", + garbageValue = "41" ) - int method724() { - return this.field1280; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1292; } - @ObfuscatedName("aw") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)Lhe;", - garbageValue = "2013282869" + descriptor = "([BIIIIIIIII[Lis;I)V", + garbageValue = "388906105" ) - public static VarcInt method721(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); - var1 = new VarcInt(); - if (var2 != null) { - var1.method940(new Buffer(var2)); + static final void method734(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, CollisionMap[] var10) { + int var12; + for (int var11 = 0; var11 < 8; ++var11) { + for (var12 = 0; var12 < 8; ++var12) { + if (var11 + var2 > 0 && var11 + var2 < 103 && var3 + var12 > 0 && var3 + var12 < 103) { + int[] var10000 = var10[var1].flags[var11 + var2]; + var10000[var12 + var3] &= -16777217; + } } + } - VarcInt.VarcInt_cached.put(var1, (long)var0); - return var1; + Buffer var19 = new Buffer(var0); + + for (var12 = 0; var12 < 4; ++var12) { + for (int var13 = 0; var13 < 64; ++var13) { + for (int var14 = 0; var14 < 64; ++var14) { + if (var12 == var4 && var13 >= var5 && var13 < var5 + 8 && var14 >= var6 && var14 < var6 + 8) { + int var15 = var2 + class85.method470(var13 & 7, var14 & 7, var7); + int var16 = var3 + class144.method772(var13 & 7, var14 & 7, var7); + int var17 = (var13 & 7) + var8 + var2; + int var18 = var3 + (var14 & 7) + var9; + SecureRandomFuture.loadTerrain(var19, var1, var15, var16, var17, var18, var7); + } else { + SecureRandomFuture.loadTerrain(var19, 0, -1, -1, 0, 0, 0); + } + } + } } + } - @ObfuscatedName("ay") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IB)Lhx;", - garbageValue = "1" + descriptor = "(ILdh;ZI)I", + garbageValue = "-1398962204" ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static int method735(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + if (var0 == 1500) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == 1501) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == 1502) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == 1503) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == 1504) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == 1505) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.parentId; + return 1; } else { - byte[] var2 = World.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; + return 2; } } - @ObfuscatedName("id") + @ObfuscatedName("jr") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-225277985" + descriptor = "(IIIII)V", + garbageValue = "-124816622" ) - static final void method725() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { - int var1 = Client.npcIndices[var0]; - NPC var2 = Client.npcs[var1]; - if (var2 != null) { - class47.updateActorSequence(var2, var2.definition.size); + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; + if (VarbitComposition.localPlayer.x >> 7 == Client.destinationX && VarbitComposition.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; + } + + RouteStrategy.method1125(); + InterfaceParent.method475(); + WorldMapData_0.addNpcsToScene(true); + class147.method785(); + WorldMapData_0.addNpcsToScene(false); + + int var6; + for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { + if (var4.plane == HealthBar.Client_plane && Client.cycle <= var4.cycleEnd) { + if (Client.cycle >= var4.cycleStart) { + NPC var5; + Player var40; + if (!var4.isMoving && var4.field797 != 0) { + if (var4.field797 > 0) { + var5 = Client.npcs[var4.field797 - 1]; + if (var5 != null && var5.x >= 0 && var5.x < 13312 && var5.y >= 0 && var5.y < 13312) { + var4.sourceX = var5.x; + var4.sourceY = var5.y; + var4.setDestination(var4.field805, var4.field799, var4.field789, Client.cycle); + } + } else { + var6 = -var4.field797 - 1; + if (var6 == Client.localPlayerIndex) { + var40 = VarbitComposition.localPlayer; + } else { + var40 = Client.players[var6]; + } + + if (var40 != null && var40.x >= 0 && var40.x < 13312 && var40.y >= 0 && var40.y < 13312) { + var4.sourceX = var40.x; + var4.sourceY = var40.y; + var4.setDestination(var4.field805, var4.field799, var4.field789, Client.cycle); + } + } + } + + if (var4.targetIndex > 0) { + var5 = Client.npcs[var4.targetIndex - 1]; + if (var5 != null && var5.x >= 0 && var5.x < 13312 && var5.y >= 0 && var5.y < 13312) { + var4.setDestination(var5.x, var5.y, class18.getTileHeight(var5.x, var5.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + if (var4.targetIndex < 0) { + var6 = -var4.targetIndex - 1; + if (var6 == Client.localPlayerIndex) { + var40 = VarbitComposition.localPlayer; + } else { + var40 = Client.players[var6]; + } + + if (var40 != null && var40.x >= 0 && var40.x < 13312 && var40.y >= 0 && var40.y < 13312) { + var4.setDestination(var40.x, var40.y, class18.getTileHeight(var40.x, var40.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + var4.advance(Client.field457); + class130.scene.drawEntity(HealthBar.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); + } + } else { + var4.remove(); } } + class167.method874(); + GrandExchangeOfferOwnWorldComparator.setViewportShape(var0, var1, var2, var3, true); + var0 = Client.viewportOffsetX; + var1 = Client.viewportOffsetY; + var2 = Client.viewportWidth; + var3 = Client.viewportHeight; + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + Rasterizer3D.method1199(); + Rasterizer2D.method2643(); + int var36 = Client.camAngleX; + if (Client.field467 / 256 > var36) { + var36 = Client.field467 / 256; + } + + if (Client.cameraShaking[4] && Client.cameraMoveIntensity[4] + 128 > var36) { + var36 = Client.cameraMoveIntensity[4] + 128; + } + + int var37 = Client.camAngleY & 2047; + var6 = FriendLoginUpdate.oculusOrbFocalPointX; + int var7 = class125.field1194; + int var8 = HealthBar.oculusOrbFocalPointY; + int var9 = class172.method907(var36); + int var11 = var3 - 334; + if (var11 < 0) { + var11 = 0; + } else if (var11 > 100) { + var11 = 100; + } + + int var12 = (Client.zoomWidth - Client.zoomHeight) * var11 / 100 + Client.zoomHeight; + int var10 = var12 * var9 / 256; + var11 = 2048 - var36 & 2047; + var12 = 2048 - var37 & 2047; + int var13 = 0; + int var14 = 0; + int var15 = var10; + int var16; + int var17; + int var18; + if (var11 != 0) { + var16 = Rasterizer3D.Rasterizer3D_sine[var11]; + var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; + var18 = var17 * var14 - var16 * var10 >> 16; + var15 = var17 * var10 + var16 * var14 >> 16; + var14 = var18; + } + + if (var12 != 0) { + var16 = Rasterizer3D.Rasterizer3D_sine[var12]; + var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; + var18 = var16 * var15 + var13 * var17 >> 16; + var15 = var17 * var15 - var13 * var16 >> 16; + var13 = var18; + } + + if (Client.isCameraLocked) { + FontName.field4045 = var6 - var13; + KeyHandler.field70 = var7 - var14; + class31.field84 = var8 - var15; + UserComparator4.field1180 = var36; + VertexNormal.field2255 = var37; + } else { + NPCComposition.cameraX = var6 - var13; + class133.cameraY = var7 - var14; + class139.cameraZ = var8 - var15; + class129.cameraPitch = var36; + UserComparator10.cameraYaw = var37; + } + + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (FriendLoginUpdate.oculusOrbFocalPointX >> 7 != VarbitComposition.localPlayer.x >> 7 || HealthBar.oculusOrbFocalPointY >> 7 != VarbitComposition.localPlayer.y >> 7)) { + var16 = VarbitComposition.localPlayer.plane; + var17 = (FriendLoginUpdate.oculusOrbFocalPointX >> 7) + UrlRequester.baseX; + var18 = (HealthBar.oculusOrbFocalPointY >> 7) + class47.baseY; + NPC.method597(var17, var18, var16, true); + } + + int var20; + if (!Client.isCameraLocked) { + if (class449.clientPreferences.getRoofsHidden()) { + var11 = HealthBar.Client_plane; + } else { + label577: { + var12 = 3; + if (class129.cameraPitch < 310) { + if (Client.oculusOrbState == 1) { + var13 = FriendLoginUpdate.oculusOrbFocalPointX >> 7; + var14 = HealthBar.oculusOrbFocalPointY >> 7; + } else { + var13 = VarbitComposition.localPlayer.x >> 7; + var14 = VarbitComposition.localPlayer.y >> 7; + } + + var15 = NPCComposition.cameraX >> 7; + var16 = class139.cameraZ >> 7; + if (var15 < 0 || var16 < 0 || var15 >= 104 || var16 >= 104) { + var11 = HealthBar.Client_plane; + break label577; + } + + if (var13 < 0 || var14 < 0 || var13 >= 104 || var14 >= 104) { + var11 = HealthBar.Client_plane; + break label577; + } + + if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][var15][var16] & 4) != 0) { + var12 = HealthBar.Client_plane; + } + + if (var13 > var15) { + var17 = var13 - var15; + } else { + var17 = var15 - var13; + } + + if (var14 > var16) { + var18 = var14 - var16; + } else { + var18 = var16 - var14; + } + + int var19; + if (var17 > var18) { + var19 = var18 * 65536 / var17; + var20 = 32768; + + while (var15 != var13) { + if (var15 < var13) { + ++var15; + } else if (var15 > var13) { + --var15; + } + + if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][var15][var16] & 4) != 0) { + var12 = HealthBar.Client_plane; + } + + var20 += var19; + if (var20 >= 65536) { + var20 -= 65536; + if (var16 < var14) { + ++var16; + } else if (var16 > var14) { + --var16; + } + + if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][var15][var16] & 4) != 0) { + var12 = HealthBar.Client_plane; + } + } + } + } else if (var18 > 0) { + var19 = var17 * 65536 / var18; + var20 = 32768; + + while (var14 != var16) { + if (var16 < var14) { + ++var16; + } else if (var16 > var14) { + --var16; + } + + if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][var15][var16] & 4) != 0) { + var12 = HealthBar.Client_plane; + } + + var20 += var19; + if (var20 >= 65536) { + var20 -= 65536; + if (var15 < var13) { + ++var15; + } else if (var15 > var13) { + --var15; + } + + if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][var15][var16] & 4) != 0) { + var12 = HealthBar.Client_plane; + } + } + } + } + } + + if (VarbitComposition.localPlayer.x >= 0 && VarbitComposition.localPlayer.y >= 0 && VarbitComposition.localPlayer.x < 13312 && VarbitComposition.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][VarbitComposition.localPlayer.x >> 7][VarbitComposition.localPlayer.y >> 7] & 4) != 0) { + var12 = HealthBar.Client_plane; + } + + var11 = var12; + } else { + var11 = HealthBar.Client_plane; + } + } + } + + var10 = var11; + } else { + var10 = StructComposition.method1024(); + } + + var11 = NPCComposition.cameraX; + var12 = class133.cameraY; + var13 = class139.cameraZ; + var14 = class129.cameraPitch; + var15 = UserComparator10.cameraYaw; + + for (var16 = 0; var16 < 5; ++var16) { + if (Client.cameraShaking[var16]) { + var17 = (int)(Math.random() * (double)(Client.cameraShakeIntensity[var16] * 2 + 1) - (double)Client.cameraShakeIntensity[var16] + Math.sin((double)Client.cameraShakeSpeed[var16] / 100.0D * (double)Client.cameraShakeCycle[var16]) * (double)Client.cameraMoveIntensity[var16]); + if (var16 == 0) { + NPCComposition.cameraX += var17; + } + + if (var16 == 1) { + class133.cameraY += var17; + } + + if (var16 == 2) { + class139.cameraZ += var17; + } + + if (var16 == 3) { + UserComparator10.cameraYaw = var17 + UserComparator10.cameraYaw & 2047; + } + + if (var16 == 4) { + class129.cameraPitch += var17; + if (class129.cameraPitch < 128) { + class129.cameraPitch = 128; + } + + if (class129.cameraPitch > 383) { + class129.cameraPitch = 383; + } + } + } + } + + var16 = MouseHandler.MouseHandler_x; + var17 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var16 = MouseHandler.MouseHandler_lastPressedX; + var17 = MouseHandler.MouseHandler_lastPressedY; + } + + if (var16 >= var0 && var16 < var0 + var2 && var17 >= var1 && var17 < var3 + var1) { + MenuAction.method425(var16 - var0, var17 - var1); + } else { + Players.method619(); + } + + class301.method1622(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + class301.method1622(); + var18 = Rasterizer3D.get3dZoom(); + Rasterizer3D.method1185(class219.client.field123); + Rasterizer3D.clips.field2280 = Client.viewportZoom; + class130.scene.draw(NPCComposition.cameraX, class133.cameraY, class139.cameraZ, class129.cameraPitch, UserComparator10.cameraYaw, var10); + Rasterizer3D.method1185(false); + if (Client.renderSelf) { + Rasterizer2D.method2644(); + } + + Rasterizer3D.clips.field2280 = var18; + class301.method1622(); + class130.scene.clearTempGameObjects(); + Client.overheadTextLimit = 0; + boolean var41 = false; + var20 = -1; + int var21 = -1; + int var22 = Players.Players_count; + int[] var23 = Players.Players_indices; + + int var24; + for (var24 = 0; var24 < var22 + Client.npcCount; ++var24) { + Object var25; + if (var24 < var22) { + var25 = Client.players[var23[var24]]; + if (var23[var24] == Client.combatTargetPlayerIndex) { + var41 = true; + var20 = var24; + continue; + } + + if (var25 == VarbitComposition.localPlayer) { + var21 = var24; + continue; + } + } else { + var25 = Client.npcs[Client.npcIndices[var24 - var22]]; + } + + PcmPlayer.drawActor2d((Actor)var25, var24, var0, var1, var2, var3); + } + + if (Client.field386 && var21 != -1) { + PcmPlayer.drawActor2d(VarbitComposition.localPlayer, var21, var0, var1, var2, var3); + } + + if (var41) { + PcmPlayer.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var20, var0, var1, var2, var3); + } + + for (var24 = 0; var24 < Client.overheadTextLimit; ++var24) { + int var38 = Client.overheadTextXs[var24]; + int var26 = Client.overheadTextYs[var24]; + int var27 = Client.overheadTextXOffsets[var24]; + int var28 = Client.overheadTextAscents[var24]; + boolean var29 = true; + + while (var29) { + var29 = false; + + for (int var30 = 0; var30 < var24; ++var30) { + if (var26 + 2 > Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] && var26 - var28 < Client.overheadTextYs[var30] + 2 && var38 - var27 < Client.overheadTextXOffsets[var30] + Client.overheadTextXs[var30] && var38 + var27 > Client.overheadTextXs[var30] - Client.overheadTextXOffsets[var30] && Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] < var26) { + var26 = Client.overheadTextYs[var30] - Client.overheadTextAscents[var30]; + var29 = true; + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var24]; + Client.viewportTempY = Client.overheadTextYs[var24] = var26; + String var39 = Client.field603[var24]; + if (Client.chatEffects == 0) { + int var31 = 16776960; + if (Client.overheadTextColors[var24] < 6) { + var31 = Client.field579[Client.overheadTextColors[var24]]; + } + + if (Client.overheadTextColors[var24] == 6) { + var31 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var24] == 7) { + var31 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var24] == 8) { + var31 = Client.viewportDrawCount % 20 < 10 ? '\ub000' : 8454016; + } + + int var32; + if (Client.overheadTextColors[var24] == 9) { + var32 = 150 - Client.overheadTextCyclesRemaining[var24]; + if (var32 < 50) { + var31 = var32 * 1280 + 16711680; + } else if (var32 < 100) { + var31 = 16776960 - (var32 - 50) * 327680; + } else if (var32 < 150) { + var31 = (var32 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var24] == 10) { + var32 = 150 - Client.overheadTextCyclesRemaining[var24]; + if (var32 < 50) { + var31 = var32 * 5 + 16711680; + } else if (var32 < 100) { + var31 = 16711935 - (var32 - 50) * 327680; + } else if (var32 < 150) { + var31 = (var32 - 100) * 327680 + 255 - (var32 - 100) * 5; + } + } + + if (Client.overheadTextColors[var24] == 11) { + var32 = 150 - Client.overheadTextCyclesRemaining[var24]; + if (var32 < 50) { + var31 = 16777215 - var32 * 327685; + } else if (var32 < 100) { + var31 = (var32 - 50) * 327685 + 65280; + } else if (var32 < 150) { + var31 = 16777215 - (var32 - 100) * 327680; + } + } + + int var33; + if (Client.overheadTextColors[var24] == 12 && Client.field594[var24] == null) { + var32 = var39.length(); + Client.field594[var24] = new int[var32]; + + for (var33 = 0; var33 < var32; ++var33) { + int var34 = (int)(64.0F * ((float)var33 / (float)var32)); + int var35 = var34 << 10 | 896 | 64; + Client.field594[var24][var33] = class466.field3911[var35]; + } + } + + if (Client.overheadTextEffects[var24] == 0) { + class59.fontBold12.method2098(var39, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.field594[var24]); + } + + if (Client.overheadTextEffects[var24] == 1) { + class59.fontBold12.method2095(var39, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.viewportDrawCount, Client.field594[var24]); + } + + if (Client.overheadTextEffects[var24] == 2) { + class59.fontBold12.method2096(var39, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.viewportDrawCount, Client.field594[var24]); + } + + if (Client.overheadTextEffects[var24] == 3) { + class59.fontBold12.method2097(var39, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var24], Client.field594[var24]); + } + + if (Client.overheadTextEffects[var24] == 4) { + var32 = (150 - Client.overheadTextCyclesRemaining[var24]) * (class59.fontBold12.stringWidth(var39) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + class59.fontBold12.method2099(var39, var0 + Client.viewportTempX + 50 - var32, Client.viewportTempY + var1, var31, 0, Client.field594[var24]); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + + if (Client.overheadTextEffects[var24] == 5) { + var32 = 150 - Client.overheadTextCyclesRemaining[var24]; + var33 = 0; + if (var32 < 25) { + var33 = var32 - 25; + } else if (var32 > 125) { + var33 = var32 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class59.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + class59.fontBold12.method2098(var39, var0 + Client.viewportTempX, var33 + Client.viewportTempY + var1, var31, 0, Client.field594[var24]); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + } else { + class59.fontBold12.drawCentered(var39, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); + } + } + + ItemContainer.method469(var0, var1); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).animate(Client.field457); + class153.method805(var0, var1, var2, var3); + NPCComposition.cameraX = var11; + class133.cameraY = var12; + class139.cameraZ = var13; + class129.cameraPitch = var14; + UserComparator10.cameraYaw = var15; + if (Client.isLoading && class308.field2819.method1939(true, false) == 0) { + Client.isLoading = false; + } + + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + FadeInTask.drawLoadingMessage("Loading - please wait.", false); + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class133.java b/osrs/src/main/java/class133.java index 254ddbfab..186345d5f 100644 --- a/osrs/src/main/java/class133.java +++ b/osrs/src/main/java/class133.java @@ -1,73 +1,47 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fl") public class class133 implements class124 { - @ObfuscatedName("ap") - static int field1281; + @ObfuscatedName("kc") + @Export("cameraY") + static int cameraY; - @ObfuscatedName("aw") - static double method726(double var0) { - return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); - } - - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2100564809" + descriptor = "(IB)Ldh;", + garbageValue = "47" ) - static void method727() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.stream1 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(var0.stream1); - var0.stream1 = null; - } - - if (var0.stream2 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(var0.stream2); - var0.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Lmt;I)I", - garbageValue = "-1372153517" - ) - static int method728(Widget var0) { - if (var0.type != 11) { - Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize - 1] = ""; - return 1; + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - String var1 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var0.method1797(var1); - return 1; + byte[] var2 = GrandExchangeOffer.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; + } else { + var1 = HitSplatDefinition.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; + } } } - @ObfuscatedName("ju") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(IZZZZI)Lnk;", + garbageValue = "1423183196" ) - static final void method729() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == class36.Client_plane && !var0.isFinished) { - if (Client.cycle >= var0.cycleStart) { - var0.advance(Client.field452); - if (var0.isFinished) { - var0.remove(); - } else { - UserComparator5.scene.drawEntity(var0.plane, var0.x, var0.y, var0.z, 60, var0, 0, -1L, false); - } - } - } else { - var0.remove(); - } + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3, boolean var4) { + ArchiveDisk var5 = null; + if (JagexCache.JagexCache_dat2File != null) { + var5 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, WallDecoration.JagexCache_idxFiles[var0], 1000000); } + return new Archive(var5, class6.masterDisk, class308.field2819, var0, var1, var2, var3, var4); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class134.java b/osrs/src/main/java/class134.java index 796f62308..6c419c90b 100644 --- a/osrs/src/main/java/class134.java +++ b/osrs/src/main/java/class134.java @@ -1,23 +1,23 @@ -import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") +import java.util.concurrent.Callable; + +@ObfuscatedName("fe") class class134 implements Callable { - @ObfuscatedName("as") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("qj") + static int field1294; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lfv;" ) @Export("this$0") @ObfuscatedName("this$0") final class137 this$0; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lty;" + descriptor = "Ltm;" ) @Export("val$p") @ObfuscatedName("val$p") @@ -28,7 +28,7 @@ class class134 implements Callable { final int val$version; @ObfuscatedSignature( - descriptor = "(Lfz;Lty;I)V" + descriptor = "(Lfv;Ltm;I)V" ) class134(class137 var1, Buffer var2, int var3) { this.this$0 = var1; @@ -39,25 +39,258 @@ class class134 implements Callable { @Export("call") @ObfuscatedName("call") public Object call() { - this.this$0.method734(this.val$p, this.val$version); + this.this$0.method745(this.val$p, this.val$version); return null; } - @ObfuscatedName("az") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-460438382" + descriptor = "(Ljava/lang/CharSequence;B)J", + garbageValue = "-41" ) - public static void method730() { - StructComposition.StructDefinition_cached.clear(); + static long method739(CharSequence var0) { + long var1 = 0L; + int var3 = var0.length(); + + for (int var4 = 0; var4 < var3; ++var4) { + var1 *= 37L; + char var5 = var0.charAt(var4); + if (var5 >= 'A' && var5 <= 'Z') { + var1 += (long)(var5 + 1 - 65); + } else if (var5 >= 'a' && var5 <= 'z') { + var1 += (long)(var5 + 1 - 97); + } else if (var5 >= '0' && var5 <= '9') { + var1 += (long)(var5 + 27 - 48); + } + + if (var1 >= 177917621779460413L) { + break; + } + } + + while (var1 % 37L == 0L && var1 != 0L) { + var1 /= 37L; + } + + return var1; } - @ObfuscatedName("lz") + @ObfuscatedName("lc") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIII)V", - garbageValue = "1018331432" + descriptor = "(IIIIB)V", + garbageValue = "3" ) - static final void method731(String var0, String var1, int var2, int var3, int var4, int var5, int var6) { - class7.insertMenuItem(var0, var1, var2, var3, var4, var5, var6, false); + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + class385.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + } + + long var4 = -1L; + long var6 = -1L; + int var8 = 0; + + while (true) { + int var10 = ViewportMouse.ViewportMouse_entityCount; + if (var8 >= var10) { + if (var4 != -1L) { + var8 = (int)(var4 >>> 0 & 127L); + var10 = (int)(var4 >>> 7 & 127L); + Player var12 = Client.players[Client.combatTargetPlayerIndex]; + ItemLayer.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); + } + + return; + } + + long var25 = WorldMapSectionType.method1515(var8); + if (var6 != var25) { + label309: { + var6 = var25; + int var13 = Interpreter.method417(var8); + int var14 = PcmPlayer.method197(var8); + int var15 = class177.method918(ViewportMouse.ViewportMouse_entityTags[var8]); + int var17 = InvDefinition.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); + int var18 = var17; + int var22; + if (var15 == 2 && class130.scene.getObjectFlags(HealthBar.Client_plane, var13, var14, var25) >= 0) { + ObjectComposition var19 = WorldMapElement.getObjectDefinition(var17); + if (var19.transforms != null) { + var19 = var19.transform(); + } + + if (var19 == null) { + break label309; + } + + PendingSpawn var20 = null; + + for (PendingSpawn var21 = (PendingSpawn)Client.pendingSpawns.last(); var21 != null; var21 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var21.plane == HealthBar.Client_plane && var13 == var21.x && var14 == var21.y && var18 == var21.id) { + var20 = var21; + break; + } + } + + if (Client.isItemSelected == 1) { + class385.insertMenuItemNoShift("Use", Client.field599 + " " + "->" + " " + MoveSpeed.colorStartTag(65535) + var19.name, 1, var18, var13, var14); + } else if (Client.isSpellSelected) { + if ((Canvas.selectedSpellFlags & 4) == 4) { + class385.insertMenuItemNoShift(Client.field600, Client.field601 + " " + "->" + " " + MoveSpeed.colorStartTag(65535) + var19.name, 2, var18, var13, var14); + } + } else { + String[] var34 = var19.actions; + if (var34 != null) { + for (var22 = 4; var22 >= 0; --var22) { + if ((var20 == null || var20.method507(var22)) && var34[var22] != null) { + short var23 = 0; + if (var22 == 0) { + var23 = 3; + } + + if (var22 == 1) { + var23 = 4; + } + + if (var22 == 2) { + var23 = 5; + } + + if (var22 == 3) { + var23 = 6; + } + + if (var22 == 4) { + var23 = 1001; + } + + class385.insertMenuItemNoShift(var34[var22], MoveSpeed.colorStartTag(65535) + var19.name, var23, var18, var13, var14); + } + } + } + + class385.insertMenuItemNoShift("Examine", MoveSpeed.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var14); + } + } + + int var27; + Player var28; + NPC var35; + int[] var36; + if (var15 == 1) { + NPC var30 = Client.npcs[var18]; + if (var30 == null) { + break label309; + } + + if (var30.definition.size == 1 && (var30.x & 127) == 64 && (var30.y & 127) == 64) { + for (var27 = 0; var27 < Client.npcCount; ++var27) { + var35 = Client.npcs[Client.npcIndices[var27]]; + if (var35 != null && var30 != var35 && var35.definition.size == 1 && var30.x == var35.x && var35.y == var30.y) { + class260.addNpcToMenu(var35, Client.npcIndices[var27], var13, var14); + } + } + + var27 = Players.Players_count; + var36 = Players.Players_indices; + + for (var22 = 0; var22 < var27; ++var22) { + var28 = Client.players[var36[var22]]; + if (var28 != null && var30.x == var28.x && var28.y == var30.y) { + ItemLayer.addPlayerToMenu(var28, var36[var22], var13, var14); + } + } + } + + class260.addNpcToMenu(var30, var18, var13, var14); + } + + if (var15 == 0) { + Player var31 = Client.players[var18]; + if (var31 == null) { + break label309; + } + + if ((var31.x & 127) == 64 && (var31.y & 127) == 64) { + for (var27 = 0; var27 < Client.npcCount; ++var27) { + var35 = Client.npcs[Client.npcIndices[var27]]; + if (var35 != null && var35.definition.size == 1 && var35.x == var31.x && var35.y == var31.y) { + class260.addNpcToMenu(var35, Client.npcIndices[var27], var13, var14); + } + } + + var27 = Players.Players_count; + var36 = Players.Players_indices; + + for (var22 = 0; var22 < var27; ++var22) { + var28 = Client.players[var36[var22]]; + if (var28 != null && var31 != var28 && var31.x == var28.x && var28.y == var31.y) { + ItemLayer.addPlayerToMenu(var28, var36[var22], var13, var14); + } + } + } + + if (var18 != Client.combatTargetPlayerIndex) { + ItemLayer.addPlayerToMenu(var31, var18, var13, var14); + } else { + var4 = var25; + } + } + + if (var15 == 3) { + NodeDeque var32 = Client.groundItems[HealthBar.Client_plane][var13][var14]; + if (var32 != null) { + for (TileItem var33 = (TileItem)var32.first(); var33 != null; var33 = (TileItem)var32.next()) { + ItemComposition var37 = InvDefinition.ItemDefinition_get(var33.id); + if (Client.isItemSelected == 1) { + class385.insertMenuItemNoShift("Use", Client.field599 + " " + "->" + " " + MoveSpeed.colorStartTag(16748608) + var37.name, 16, var33.id, var13, var14); + } else if (Client.isSpellSelected) { + if ((Canvas.selectedSpellFlags & 1) == 1) { + class385.insertMenuItemNoShift(Client.field600, Client.field601 + " " + "->" + " " + MoveSpeed.colorStartTag(16748608) + var37.name, 17, var33.id, var13, var14); + } + } else { + String[] var29 = var37.groundActions; + + for (int var38 = 4; var38 >= 0; --var38) { + if (var33.method610(var38)) { + if (var29 != null && var29[var38] != null) { + byte var24 = 0; + if (var38 == 0) { + var24 = 18; + } + + if (var38 == 1) { + var24 = 19; + } + + if (var38 == 2) { + var24 = 20; + } + + if (var38 == 3) { + var24 = 21; + } + + if (var38 == 4) { + var24 = 22; + } + + class385.insertMenuItemNoShift(var29[var38], MoveSpeed.colorStartTag(16748608) + var37.name, var24, var33.id, var13, var14); + } else if (var38 == 2) { + class385.insertMenuItemNoShift("Take", MoveSpeed.colorStartTag(16748608) + var37.name, 20, var33.id, var13, var14); + } + } + } + + class385.insertMenuItemNoShift("Examine", MoveSpeed.colorStartTag(16748608) + var37.name, 1004, var33.id, var13, var14); + } + } + } + } + } + } + + ++var8; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class135.java b/osrs/src/main/java/class135.java index 56c88f3d7..08c184ed1 100644 --- a/osrs/src/main/java/class135.java +++ b/osrs/src/main/java/class135.java @@ -2,46 +2,648 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("fd") public class class135 { - @ObfuscatedName("av") - static int[][] field1283; - @ObfuscatedName("rk") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lrt;" + descriptor = "(IIIB)Lui;", + garbageValue = "108" ) - @Export("varclan") - static class455 varclan; + static SpritePixels method741(int var0, int var1, int var2) { + DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; + long var4 = (long)(var2 << 16 | var0 << 8 | var1); + return (SpritePixels)var3.get(var4); + } + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(Lmi;III)V", + garbageValue = "-1092198621" + ) + public static void method742(Widget var0, int var1, int var2) { + PlayerComposition var3 = var0.field3101; + boolean var4 = var2 != var3.field2916; + var3.field2916 = var2; + if (var4) { + int var5; + int var6; + if (var3.field2916 == var1) { + for (var5 = 0; var5 < PlayerComposition.equipmentIndices.length; ++var5) { + var6 = PlayerComposition.equipmentIndices[var5]; + if (var3.equipment[var6] > 0 && var3.equipment[var6] < 512) { + var3.equipment[var6] = var3.field2913[var6]; + } + } + } else { + if (var3.equipment[0] < 512 || Actor.method522(var3)) { + var3.equipment[class209.field1862.field1871] = 1; + } + + for (var5 = 0; var5 < 7; ++var5) { + var6 = PlayerComposition.equipmentIndices[var5]; + if (var3.equipment[var6] > 0 && var3.equipment[var6] < 512) { + int[] var7 = var3.equipment; + + for (int var8 = 0; var8 < KitDefinition.KitDefinition_fileCount; ++var8) { + KitDefinition var9 = ClanChannel.KitDefinition_get(var8); + if (var9 != null && !var9.nonSelectable && var5 + (var2 == 1 ? 7 : 0) == var9.bodypartID) { + var7[PlayerComposition.equipmentIndices[var5]] = var8 + 256; + break; + } + } + } + } + } + } + + var3.method1729(); + } - @ObfuscatedName("ay") + @ObfuscatedName("kw") @ObfuscatedSignature( - descriptor = "(II)Lig;", - garbageValue = "-825741403" + descriptor = "(III)V", + garbageValue = "-1108375870" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[HealthBar.Client_plane][var0][var1]; + if (var2 == null) { + class130.scene.removeGroundItemPile(HealthBar.Client_plane, var0, var1); } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + long var3 = -99999999L; + TileItem var5 = null; + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + ItemComposition var7 = InvDefinition.ItemDefinition_get(var6.id); + long var8 = (long)var7.price; + if (var7.isStackable == 1) { + var8 *= var6.quantity < Integer.MAX_VALUE ? (long)(var6.quantity + 1) : (long)var6.quantity; + } + + if (var8 > var3) { + var3 = var8; + var5 = var6; + } } - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; + if (var5 == null) { + class130.scene.removeGroundItemPile(HealthBar.Client_plane, var0, var1); + } else { + var2.addLast(var5); + TileItem var12 = null; + TileItem var11 = null; + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + if (var6.id != var5.id) { + if (var12 == null) { + var12 = var6; + } + + if (var6.id != var12.id && var11 == null) { + var11 = var6; + } + } + } + + long var9 = FontName.calculateTag(var0, var1, 3, false, 0); + class130.scene.newGroundItemPile(HealthBar.Client_plane, var0, var1, class18.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, HealthBar.Client_plane), var5, var9, var12, var11); + } } } - @ObfuscatedName("ay") + @ObfuscatedName("lz") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1370825623" + descriptor = "([Lmi;IIIIIIIII)V", + garbageValue = "-1671360760" ) - public static int method732(int var0, int var1) { - return (-3 - var0 << 8) + var1; + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.method1199(); + + for (int var9 = 0; var9 < var0.length; ++var9) { + Widget var10 = var0[var9]; + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { + int var11; + if (var8 == -1) { + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; + var11 = ++Client.rootWidgetCount - 1; + } else { + var11 = var8; + } + + var10.rootIndex = var11; + var10.cycle = Client.cycle; + if (!var10.isIf3 || !class143.isComponentHidden(var10)) { + if (var10.contentType > 0) { + StructComposition.method1025(var10); + } + + int var12 = var10.x + var6; + int var13 = var7 + var10.y; + int var14 = var10.transparencyTop; + int var15; + int var16; + if (var10 == Client.clickedWidget) { + if (var1 != -1412584499 && !var10.isScrollBar) { + class162.field1420 = var0; + class134.field1294 = var6; + class326.field2893 = var7; + continue; + } + + if (Client.isDraggingWidget && Client.field395) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field514) { + var15 = Client.field514; + } + + if (var15 + var10.width > Client.field514 + Client.clickedWidgetParent.width) { + var15 = Client.field514 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field513) { + var16 = Client.field513; + } + + if (var16 + var10.height > Client.field513 + Client.clickedWidgetParent.height) { + var16 = Client.field513 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; + var13 = var16; + } + + if (!var10.isScrollBar) { + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 9) { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + if (var21 < var12) { + var19 = var21; + var21 = var12; + } + + if (var22 < var13) { + var20 = var22; + var22 = var13; + } + + ++var21; + ++var22; + var15 = var19 > var2 ? var19 : var2; + var16 = var20 > var3 ? var20 : var3; + var17 = var21 < var4 ? var21 : var4; + var18 = var22 < var5 ? var22 : var5; + } else { + var19 = var12 + var10.width; + var20 = var13 + var10.height; + var15 = var12 > var2 ? var12 : var2; + var16 = var13 > var3 ? var13 : var3; + var17 = var19 < var4 ? var19 : var4; + var18 = var20 < var5 ? var20 : var5; + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { + if (var10.contentType != 0) { + if (var10.contentType == 1336) { + if (class449.clientPreferences.method550()) { + var13 += 15; + SecureRandomCallable.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); + var13 += 15; + Runtime var41 = Runtime.getRuntime(); + var20 = (int)((var41.totalMemory() - var41.freeMemory()) / 1024L); + var21 = 16776960; + if (var20 > 327680 && !Client.isLowDetail) { + var21 = 16711680; + } + + SecureRandomCallable.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; + } + continue; + } + + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + class132.drawEntities(var12, var13, var10.width, var10.height); + Client.field407[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1338) { + class6.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1339) { + class11.drawCompass(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1400) { + Canvas.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); + } + + if (var10.contentType == 1401) { + Canvas.worldMap.drawOverview(var12, var13, var10.width, var10.height); + } + + if (var10.contentType == 1402) { + class139.field1323.draw(var12, Client.cycle); + } + } + + if (var10.type == 0) { + if (!var10.isIf3 && class143.isComponentHidden(var10) && var10 != class146.mousedOverWidgetIf1) { + continue; + } + + if (!var10.isIf3) { + if (var10.scrollY > var10.scrollHeight - var10.height) { + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + if (var10.children != null) { + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); + if (var28 != null) { + class36.drawWidgets(var28.group, var15, var16, var17, var18, var12, var13, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.method1199(); + } else if (var10.type == 11) { + if (class143.isComponentHidden(var10) && var10 != class146.mousedOverWidgetIf1) { + continue; + } + + if (var10.children != null) { + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.method1199(); + } + + if (Client.isResizable || Client.field409[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + class164.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { + if (var10.type == 3) { + if (class27.runCs1(var10)) { + var19 = var10.color2; + if (var10 == class146.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; + if (var10 == class146.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { + switch(var10.fillMode.field4233) { + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); + break; + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); + break; + default: + if (var14 == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } + } else if (var14 == 0) { + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } else if (var10.type == 4) { + Font var40 = var10.getFont(); + if (var40 == null) { + if (Widget.field2945) { + class218.invalidateWidget(var10); + } + } else { + String var42 = var10.text; + if (class27.runCs1(var10)) { + var20 = var10.color2; + if (var10 == class146.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { + var42 = var10.text2; + } + } else { + var20 = var10.color; + if (var10 == class146.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { + ItemComposition var43 = InvDefinition.ItemDefinition_get(var10.itemId); + var42 = var43.name; + if (var42 == null) { + var42 = "null"; + } + + if ((var43.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var42 = MoveSpeed.colorStartTag(16748608) + var42 + "" + " " + 'x' + WorldMapData_0.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { + var42 = "Please wait..."; + var20 = var10.color; + } + + if (!var10.isIf3) { + var42 = WorldMapSectionType.method1516(var42, var10); + } + + var40.method2093(var42, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, class466.method2347(var10.transparencyTop), var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); + } + } else { + int var23; + int var24; + int var25; + if (var10.type == 5) { + SpritePixels var38; + if (!var10.isIf3) { + var38 = var10.getSprite(class27.runCs1(var10), FriendsChat.urlRequester); + if (var38 != null) { + var38.drawTransBgAt(var12, var13); + } else if (Widget.field2945) { + class218.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { + var38 = class4.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var38 = var10.getSprite(false, FriendsChat.urlRequester); + } + + if (var38 == null) { + if (Widget.field2945) { + class218.invalidateWidget(var10); + } + } else { + var20 = var38.width; + var21 = var38.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { + var38.method2687(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { + var38.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { + var38.drawTransBgAt(var12, var13); + } else { + var38.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); + var22 = (var20 - 1 + var10.width) / var20; + var23 = (var21 - 1 + var10.height) / var21; + + for (var24 = 0; var24 < var22; ++var24) { + for (var25 = 0; var25 < var23; ++var25) { + if (var10.spriteAngle != 0) { + var38.method2687(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); + } else if (var14 != 0) { + var38.drawTransAt(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var38.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } else { + int var34; + if (var10.type == 6) { + boolean var36 = class27.runCs1(var10); + if (var36) { + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; + } + + Model var39 = null; + var22 = 0; + if (var10.itemId != -1) { + ItemComposition var44 = InvDefinition.ItemDefinition_get(var10.itemId); + if (var44 != null) { + var44 = var44.getCountObj(var10.itemQuantity); + var39 = var44.getModel(1); + if (var39 != null) { + var39.calculateBoundsCylinder(); + var22 = var39.height / 2; + } else { + class218.invalidateWidget(var10); + } + } + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var39 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var39 = VarbitComposition.localPlayer.getModel(); + } + } else if (var10.modelType == 7) { + var39 = var10.field3101.getModel((SequenceDefinition)null, -1, EnumComposition.SequenceDefinition_get(VarbitComposition.localPlayer.idleSequence), VarbitComposition.localPlayer.movementFrame); + } else { + NPCComposition var45 = null; + NewShit var32 = null; + if (var10.modelType == 6) { + var25 = var10.modelId; + if (var25 >= 0 && var25 < Client.npcs.length) { + NPC var26 = Client.npcs[var25]; + if (var26 != null) { + var45 = var26.definition; + var32 = var26.method593(); + } + } + } + + SequenceDefinition var33 = null; + var34 = -1; + if (var20 != -1) { + var33 = EnumComposition.SequenceDefinition_get(var20); + var34 = var10.modelFrame; + } + + var39 = var10.getModel(var33, var34, var36, VarbitComposition.localPlayer.appearance, var45, var32); + if (var39 == null && Widget.field2945) { + class218.invalidateWidget(var10); + } + } + + Rasterizer3D.method1202(var10.width / 2 + var12, var10.height / 2 + var13); + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; + if (var39 != null) { + if (!var10.isIf3) { + var39.method1338(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var39.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var39.method1339(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var39.method1338(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); + } + } + } + + Rasterizer3D.method1201(); + } else { + Font var29; + if (var10.type == 8 && var10 == class343.field3147 && Client.field498 == Client.field496) { + var19 = 0; + var20 = 0; + var29 = SecureRandomCallable.fontPlain12; + String var30 = var10.text; + + String var31; + for (var30 = WorldMapSectionType.method1516(var30, var10); var30.length() > 0; var20 = var20 + var29.ascent + 1) { + var24 = var30.indexOf("
"); + if (var24 != -1) { + var31 = var30.substring(0, var24); + var30 = var30.substring(var24 + 4); + } else { + var31 = var30; + var30 = ""; + } + + var25 = var29.stringWidth(var31); + if (var25 > var19) { + var19 = var25; + } + } + + var19 += 6; + var20 += 7; + var24 = var12 + var10.width - 5 - var19; + var25 = var13 + var10.height + 5; + if (var24 < var12 + 5) { + var24 = var12 + 5; + } + + if (var19 + var24 > var4) { + var24 = var4 - var19; + } + + if (var20 + var25 > var5) { + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); + var30 = var10.text; + var34 = var25 + var29.ascent + 2; + + for (var30 = WorldMapSectionType.method1516(var30, var10); var30.length() > 0; var34 = var34 + var29.ascent + 1) { + int var27 = var30.indexOf("
"); + if (var27 != -1) { + var31 = var30.substring(0, var27); + var30 = var30.substring(var27 + 4); + } else { + var31 = var30; + var30 = ""; + } + + var29.draw(var31, var24 + 3, var34, 0, -1); + } + } + + if (var10.type == 9) { + if (var10.field2962) { + var19 = var12; + var20 = var13 + var10.height; + var21 = var12 + var10.width; + var22 = var13; + } else { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + } + + if (var10.lineWid == 1) { + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); + } else { + Language.method1977(var19, var20, var21, var22, var10.color, var10.lineWid); + } + } else if (var10.type == 12) { + class329 var37 = var10.method1844(); + class324 var35 = var10.method1845(); + if (var37 != null && var35 != null && var37.method1787()) { + var29 = var10.getFont(); + if (var29 != null) { + Client.field651.method2694(var12, var13, var10.width, var10.height, var37.method1788(), var37.method1789(), var37.method1785(), var37.method1786(), var37.method1784()); + var22 = var10.textShadowed ? var10.spriteShadow * -2076930741 * -1858431901 : -1; + if (!var37.method1782() && var37.method1779().method2038()) { + Client.field651.method2695(var35.field2891, var22, var35.field2892, var35.field2890); + Client.field651.method2696(var37.method1780(), var29); + } else { + Client.field651.method2695(var10.color, var22, var35.field2892, var35.field2890); + Client.field651.method2696(var37.method1779(), var29); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } + } + } + } + } + } + } + } + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class136.java b/osrs/src/main/java/class136.java index 2540812b4..e02d03735 100644 --- a/osrs/src/main/java/class136.java +++ b/osrs/src/main/java/class136.java @@ -1,21 +1,16 @@ -import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +import java.util.concurrent.Callable; + +@ObfuscatedName("fj") class class136 implements Callable { - @ObfuscatedName("at") - static int field1286; - @ObfuscatedName("ma") - @ObfuscatedSignature( - descriptor = "Ldf;" - ) - @Export("localPlayer") - static Player localPlayer; + @ObfuscatedName("cg") + static int field1295; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lfv;" ) @Export("this$0") @ObfuscatedName("this$0") @@ -37,7 +32,7 @@ class class136 implements Callable { final class129[] val$curveLoadJobs; @ObfuscatedSignature( - descriptor = "(Lfz;II[Lep;)V" + descriptor = "(Lfv;II[Lep;)V" ) class136(class137 var1, int var2, int var3, class129[] var4) { this.this$0 = var1; @@ -55,4 +50,4 @@ public Object call() { return null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class137.java b/osrs/src/main/java/class137.java index 45e456679..117f34f74 100644 --- a/osrs/src/main/java/class137.java +++ b/osrs/src/main/java/class137.java @@ -1,154 +1,161 @@ -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadPoolExecutor; + +@ObfuscatedName("fv") public class class137 extends DualNode { - @ObfuscatedName("aw") - int field1290; - @ObfuscatedName("ay") + @ObfuscatedName("ap") + public static ThreadPoolExecutor field1296; + @ObfuscatedName("ad") + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("au") + int field1301; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[[Lfm;" + descriptor = "[[Lfh;" ) - public class130[][] field1293; - @ObfuscatedName("ar") + public class130[][] field1304; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "[[Lfm;" + descriptor = "[[Lfh;" ) - class130[][] field1288; - @ObfuscatedName("am") + class130[][] field1299; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Liu;" ) - public Skeleton field1294; - @ObfuscatedName("as") - int field1289; - @ObfuscatedName("aj") - boolean field1287; - @ObfuscatedName("av") - Future field1292; - @ObfuscatedName("ap") - List field1291; + public Skeleton field1305; + @ObfuscatedName("ac") + int field1300; + @ObfuscatedName("ai") + boolean field1298; + @ObfuscatedName("aa") + Future field1303; + @ObfuscatedName("af") + List field1302; @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;IZ)V", + descriptor = "(Lnu;Lnu;IZ)V", garbageValue = "0" ) public class137(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - this.field1293 = null; - this.field1288 = null; - this.field1289 = 0; - this.field1290 = var3; - byte[] var5 = var1.takeFile(this.field1290 >> 16 & 65535, this.field1290 & 65535); + this.field1304 = null; + this.field1299 = null; + this.field1300 = 0; + this.field1301 = var3; + byte[] var5 = var1.takeFile(this.field1301 >> 16 & 65535, this.field1301 & 65535); Buffer var6 = new Buffer(var5); int var7 = var6.readUnsignedByte(); int var8 = var6.readUnsignedShort(); byte[] var9 = var2.getFile(var8, 0); - this.field1294 = new Skeleton(var8, var9); - this.field1291 = new ArrayList(); - this.field1292 = SoundCache.field214.submit(new class134(this, var6, var7)); + this.field1305 = new Skeleton(var8, var9); + this.field1302 = new ArrayList(); + this.field1303 = field1296.submit(new class134(this, var6, var7)); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;IB)V", - garbageValue = "-79" + descriptor = "(Ltm;IB)V", + garbageValue = "100" ) - void method734(Buffer var1, int var2) { + void method745(Buffer var1, int var2) { var1.readUnsignedShort(); var1.readUnsignedShort(); - this.field1289 = var1.readUnsignedByte(); + this.field1300 = var1.readUnsignedByte(); int var3 = var1.readUnsignedShort(); - this.field1288 = new class130[this.field1294.method1207().method1189()][]; - this.field1293 = new class130[this.field1294.method1206()][]; + this.field1299 = new class130[this.field1305.method1231().method1212()][]; + this.field1304 = new class130[this.field1305.method1230()][]; class129[] var4 = new class129[var3]; int var5; int var7; - int var17; + int var9; for (var5 = 0; var5 < var3; ++var5) { var7 = var1.readUnsignedByte(); - class131[] var8 = new class131[]{class131.field1255, class131.field1256, class131.field1253, class131.field1252, class131.field1254, class131.field1251}; - class131 var9 = (class131)ClientPreferences.findEnumerated(var8, var7); - if (var9 == null) { - var9 = class131.field1255; + class131 var8 = (class131)KeyHandler.findEnumerated(WorldMapSprite.method1533(), var7); + if (var8 == null) { + var8 = class131.field1268; } - var17 = var1.readShortSmart(); + var9 = var1.readShortSmart(); int var11 = var1.readUnsignedByte(); - class132 var12 = (class132)ClientPreferences.findEnumerated(MenuAction.method434(), var11); - if (var12 == null) { - var12 = class132.field1274; + class132[] var12 = new class132[]{class132.field1288, class132.field1277, class132.field1283, class132.field1287, class132.field1275, class132.field1280, class132.field1289, class132.field1284, class132.field1273, class132.field1278, class132.field1276, class132.field1285, class132.field1281, class132.field1282, class132.field1286, class132.field1274, class132.field1279}; + class132 var13 = (class132)KeyHandler.findEnumerated(var12, var11); + if (var13 == null) { + var13 = class132.field1288; } - class130 var13 = new class130(); - var13.method709(var1, var2); - var4[var5] = new class129(this, var13, var9, var12, var17); - int var14 = var9.method719(); + class130 var20 = new class130(); + var20.method718(var1, var2); + var4[var5] = new class129(this, var20, var8, var13, var9); + int var14 = var8.method727(); class130[][] var15; - if (var9 == class131.field1256) { - var15 = this.field1288; + if (var8 == class131.field1264) { + var15 = this.field1299; } else { - var15 = this.field1293; + var15 = this.field1304; } - if (var15[var17] == null) { - var15[var17] = new class130[var14]; + if (var15[var9] == null) { + var15[var9] = new class130[var14]; } - if (var9 == class131.field1254) { - this.field1287 = true; + if (var8 == class131.field1263) { + this.field1298 = true; } } - var5 = var3 / UserComparator4.field1166; - int var6 = var3 % UserComparator4.field1166; - int var16 = 0; + var5 = var3 / class291.field2496; + int var16 = var3 % class291.field2496; + int var17 = 0; - for (var17 = 0; var17 < UserComparator4.field1166; ++var17) { - var7 = var16; - var16 += var5; - if (var6 > 0) { - ++var16; - --var6; + for (var9 = 0; var9 < class291.field2496; ++var9) { + var7 = var17; + var17 += var5; + if (var16 > 0) { + ++var17; + --var16; } - if (var7 == var16) { + if (var17 == var7) { break; } - this.field1291.add(SoundCache.field214.submit(new class136(this, var7, var16, var4))); + this.field1302.add(field1296.submit(new class136(this, var7, var17, var4))); } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "-1948814782" ) - public boolean method735() { - if (this.field1292 == null && this.field1291 == null) { + public boolean method746() { + if (this.field1303 == null && this.field1302 == null) { return true; } else { - if (this.field1292 != null) { - if (!this.field1292.isDone()) { + if (this.field1303 != null) { + if (!this.field1303.isDone()) { return false; } - this.field1292 = null; + this.field1303 = null; } boolean var1 = true; - for (int var2 = 0; var2 < this.field1291.size(); ++var2) { - if (!((Future)this.field1291.get(var2)).isDone()) { + for (int var2 = 0; var2 < this.field1302.size(); ++var2) { + if (!((Future)this.field1302.get(var2)).isDone()) { var1 = false; } else { - this.field1291.remove(var2); + this.field1302.remove(var2); --var2; } } @@ -156,178 +163,252 @@ public boolean method735() { if (!var1) { return false; } else { - this.field1291 = null; + this.field1302 = null; return true; } } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-316980325" + garbageValue = "-1976853081" ) - public int method736() { - return this.field1289; + public int method747() { + return this.field1300; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-96" + descriptor = "(I)Z", + garbageValue = "-1397730419" ) - public boolean method737() { - return this.field1287; + public boolean method748() { + return this.field1298; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILek;III)V", - garbageValue = "519510056" + descriptor = "(ILeo;IIB)V", + garbageValue = "-98" ) - public void method738(int var1, class127 var2, int var3, int var4) { - class451 var5 = class138.method744(); - this.method739(var5, var3, var2, var1); - this.method741(var5, var3, var2, var1); - this.method740(var5, var3, var2, var1); - var2.method697(var5); - var5.method2271(); + public void method749(int var1, class127 var2, int var3, int var4) { + class450 var5; + synchronized(class450.field3873) { + if (class462.field3904 == 0) { + var5 = new class450(); + } else { + class450.field3873[--class462.field3904].method2302(); + var5 = class450.field3873[class462.field3904]; + } + } + + this.method750(var5, var3, var2, var1); + this.method753(var5, var3, var2, var1); + this.method752(var5, var3, var2, var1); + var2.method708(var5); + var5.method2298(); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lrm;ILek;IB)V", - garbageValue = "2" + descriptor = "(Lrz;ILeo;II)V", + garbageValue = "1937438486" ) - void method739(class451 var1, int var2, class127 var3, int var4) { - float[] var5 = var3.method701(this.field1289); + void method750(class450 var1, int var2, class127 var3, int var4) { + float[] var5 = var3.method712(this.field1300); float var6 = var5[0]; float var7 = var5[1]; float var8 = var5[2]; - if (this.field1288[var2] != null) { - class130 var9 = this.field1288[var2][0]; - class130 var10 = this.field1288[var2][1]; - class130 var11 = this.field1288[var2][2]; + if (this.field1299[var2] != null) { + class130 var9 = this.field1299[var2][0]; + class130 var10 = this.field1299[var2][1]; + class130 var11 = this.field1299[var2][2]; if (var9 != null) { - var6 = var9.method711(var4); + var6 = var9.method720(var4); } if (var10 != null) { - var7 = var10.method711(var4); + var7 = var10.method720(var4); } if (var11 != null) { - var8 = var11.method711(var4); + var8 = var11.method720(var4); } } - class450 var16 = ViewportMouse.method1321(); - var16.method2267(1.0F, 0.0F, 0.0F, var6); - class450 var14 = ViewportMouse.method1321(); - var14.method2267(0.0F, 1.0F, 0.0F, var7); - class450 var15 = ViewportMouse.method1321(); - var15.method2267(0.0F, 0.0F, 1.0F, var8); - class450 var12 = ViewportMouse.method1321(); - var12.method2269(var15); - var12.method2269(var16); - var12.method2269(var14); - class451 var13 = class138.method744(); - var13.method2283(var12); - var1.method2282(var13); - var16.method2265(); - var14.method2265(); - var15.method2265(); - var12.method2265(); - var13.method2271(); + class449 var17 = Login.method427(); + var17.method2295(1.0F, 0.0F, 0.0F, var6); + class449 var18 = Login.method427(); + var18.method2295(0.0F, 1.0F, 0.0F, var7); + class449 var19 = Login.method427(); + var19.method2295(0.0F, 0.0F, 1.0F, var8); + class449 var12 = Login.method427(); + var12.method2297(var19); + var12.method2297(var17); + var12.method2297(var18); + class450 var13; + synchronized(class450.field3873) { + if (class462.field3904 == 0) { + var13 = new class450(); + } else { + class450.field3873[--class462.field3904].method2302(); + var13 = class450.field3873[class462.field3904]; + } + } + + var13.method2309(var12); + var1.method2308(var13); + var17.method2293(); + var18.method2293(); + var19.method2293(); + var12.method2293(); + var13.method2298(); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lrm;ILek;II)V", - garbageValue = "-502012777" + descriptor = "(Lrz;ILeo;II)V", + garbageValue = "1689339528" ) - void method740(class451 var1, int var2, class127 var3, int var4) { - float[] var5 = var3.method702(this.field1289); + void method752(class450 var1, int var2, class127 var3, int var4) { + float[] var5 = var3.method713(this.field1300); float var6 = var5[0]; float var7 = var5[1]; float var8 = var5[2]; - if (this.field1288[var2] != null) { - class130 var9 = this.field1288[var2][3]; - class130 var10 = this.field1288[var2][4]; - class130 var11 = this.field1288[var2][5]; + if (this.field1299[var2] != null) { + class130 var9 = this.field1299[var2][3]; + class130 var10 = this.field1299[var2][4]; + class130 var11 = this.field1299[var2][5]; if (var9 != null) { - var6 = var9.method711(var4); + var6 = var9.method720(var4); } if (var10 != null) { - var7 = var10.method711(var4); + var7 = var10.method720(var4); } if (var11 != null) { - var8 = var11.method711(var4); + var8 = var11.method720(var4); } } - var1.field3861[12] = var6; - var1.field3861[13] = var7; - var1.field3861[14] = var8; + var1.field3875[12] = var6; + var1.field3875[13] = var7; + var1.field3875[14] = var8; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lrm;ILek;II)V", - garbageValue = "1367616310" + descriptor = "(Lrz;ILeo;II)V", + garbageValue = "-2003285459" ) - void method741(class451 var1, int var2, class127 var3, int var4) { - float[] var5 = var3.method703(this.field1289); + void method753(class450 var1, int var2, class127 var3, int var4) { + float[] var5 = var3.method714(this.field1300); float var6 = var5[0]; float var7 = var5[1]; float var8 = var5[2]; - if (this.field1288[var2] != null) { - class130 var9 = this.field1288[var2][6]; - class130 var10 = this.field1288[var2][7]; - class130 var11 = this.field1288[var2][8]; + if (this.field1299[var2] != null) { + class130 var9 = this.field1299[var2][6]; + class130 var10 = this.field1299[var2][7]; + class130 var11 = this.field1299[var2][8]; if (var9 != null) { - var6 = var9.method711(var4); + var6 = var9.method720(var4); } if (var10 != null) { - var7 = var10.method711(var4); + var7 = var10.method720(var4); } if (var11 != null) { - var8 = var11.method711(var4); + var8 = var11.method720(var4); + } + } + + class450 var14; + synchronized(class450.field3873) { + if (class462.field3904 == 0) { + var14 = new class450(); + } else { + class450.field3873[--class462.field3904].method2302(); + var14 = class450.field3873[class462.field3904]; } } - class451 var12 = class138.method744(); - var12.method2280(var6, var7, var8); - var1.method2282(var12); - var12.method2271(); + var14.method2306(var6, var7, var8); + var1.method2308(var14); + var14.method2298(); } - @ObfuscatedName("ac") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lcr;I)V", - garbageValue = "1214318405" + descriptor = "([BI)V", + garbageValue = "-7280279" ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - PendingSpawn.method513(var0.isMembersOnly()); + @Export("SpriteBuffer_decode") + static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); + var1.offset = var0.length - 2; + class529.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + class529.SpriteBuffer_xOffsets = new int[class529.SpriteBuffer_spriteCount]; + class152.SpriteBuffer_yOffsets = new int[class529.SpriteBuffer_spriteCount]; + HealthBarUpdate.SpriteBuffer_spriteWidths = new int[class529.SpriteBuffer_spriteCount]; + SpriteMask.SpriteBuffer_spriteHeights = new int[class529.SpriteBuffer_spriteCount]; + Coord.SpriteBuffer_pixels = new byte[class529.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class529.SpriteBuffer_spriteCount * 8; + class529.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + class420.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + int var2 = (var1.readUnsignedByte() & 255) + 1; + + int var3; + for (var3 = 0; var3 < class529.SpriteBuffer_spriteCount; ++var3) { + class529.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); } - if (var0.properties != Client.worldProperties) { - class425.method2154(class386.archive8, var0.properties); + for (var3 = 0; var3 < class529.SpriteBuffer_spriteCount; ++var3) { + class152.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class529.SpriteBuffer_spriteCount; ++var3) { + HealthBarUpdate.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class529.SpriteBuffer_spriteCount; ++var3) { + SpriteMask.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class529.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + DbTableType.SpriteBuffer_spritePalette = new int[var2]; + + for (var3 = 1; var3 < var2; ++var3) { + DbTableType.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (DbTableType.SpriteBuffer_spritePalette[var3] == 0) { + DbTableType.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; + + for (var3 = 0; var3 < class529.SpriteBuffer_spriteCount; ++var3) { + int var4 = HealthBarUpdate.SpriteBuffer_spriteWidths[var3]; + int var5 = SpriteMask.SpriteBuffer_spriteHeights[var3]; + int var6 = var4 * var5; + byte[] var7 = new byte[var6]; + Coord.SpriteBuffer_pixels[var3] = var7; + int var8 = var1.readUnsignedByte(); + int var9; + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { + var7[var9 + var4 * var10] = var1.readByte(); + } + } + } } - VarbitComposition.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - VarpDefinition.field1494 = var0.field677; - Login.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - class11.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; - Varps.currentPort = Login.worldPort; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class138.java b/osrs/src/main/java/class138.java index 637294341..94fe53267 100644 --- a/osrs/src/main/java/class138.java +++ b/osrs/src/main/java/class138.java @@ -2,96 +2,83 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fj") -public enum class138 implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("fb") +public enum class138 implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfb;" ) - field1301(0, 0), - @ObfuscatedName("ay") + field1314(0, 0), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfb;" ) - field1302(1, 1), - @ObfuscatedName("ar") + field1309(1, 1), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfb;" ) - field1298(2, 2), - @ObfuscatedName("am") + field1311(2, 2), + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfb;" ) - field1297(3, 3), - @ObfuscatedName("as") + field1313(3, 3), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfb;" ) - field1299(4, 4), - @ObfuscatedName("aj") + field1308(4, 4), + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfb;" ) - field1296(5, 5), - @ObfuscatedName("ag") + field1310(5, 5), + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfb;" ) - field1295(6, 6), - @ObfuscatedName("az") + field1315(6, 6), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfb;" ) - field1303(7, 7), - @ObfuscatedName("av") + field1312(7, 7), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfb;" ) - field1300(8, 8); + field1307(8, 8); - @ObfuscatedName("ap") - final int field1304; - @ObfuscatedName("aq") - final int field1305; + @ObfuscatedName("ix") + static int field1306; + @ObfuscatedName("af") + final int field1317; + @ObfuscatedName("ad") + final int field1316; class138(int var3, int var4) { - this.field1304 = var3; - this.field1305 = var4; + this.field1317 = var3; + this.field1316 = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1305; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(B)Lrm;", - garbageValue = "16" - ) - public static class451 method744() { - synchronized(class451.field3860) { - if (class451.field3858 == 0) { - return new class451(); - } else { - class451.field3860[--class451.field3858].method2275(); - return class451.field3860[class451.field3858]; - } - } + return this.field1316; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)[Llx;", - garbageValue = "1787686386" + descriptor = "(II)Lhd;", + garbageValue = "-2092352148" ) - static LoginPacket[] method743() { - return new LoginPacket[]{LoginPacket.field2726, LoginPacket.field2724, LoginPacket.field2727, LoginPacket.field2725, LoginPacket.RECONNECT_LOGIN_CONNECTION, LoginPacket.NEW_LOGIN_CONNECTION}; + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class139.java b/osrs/src/main/java/class139.java index afffd75fe..a86ef256e 100644 --- a/osrs/src/main/java/class139.java +++ b/osrs/src/main/java/class139.java @@ -2,93 +2,326 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") -public enum class139 implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("fr") +public enum class139 implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfr;" ) - field1309(3, 0), - @ObfuscatedName("ay") + field1322(0, 0), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfr;" ) - field1310(1, 1), - @ObfuscatedName("ar") + field1319(2, 1), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfr;" ) - field1307(2, 2), - @ObfuscatedName("am") + field1320(3, 2), + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfr;" ) - field1306(4, 3), - @ObfuscatedName("as") + field1321(4, 3), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfr;" ) - field1308(0, 4); + field1318(1, 4); - @ObfuscatedName("cl") - static int field1311; - @ObfuscatedName("aj") - public final int field1313; @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Ldb;" + ) + static LoginScreenAnimation field1323; + @ObfuscatedName("km") + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("rj") + @ObfuscatedSignature( + descriptor = "Lrs;" + ) + @Export("varclan") + static class454 varclan; + @ObfuscatedName("ai") + public final int field1327; + @ObfuscatedName("az") @Export("id") final int id; class139(int var3, int var4) { - this.field1313 = var3; + this.field1327 = var3; this.id = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;IZI)Ljm;", - garbageValue = "-1006656334" + descriptor = "(Lnu;I)V", + garbageValue = "-1677394683" ) - public static Frames method746(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; - int[] var5 = var0.getGroupFileIds(var2); - - for (int var6 = 0; var6 < var5.length; ++var6) { - byte[] var7 = var0.getFile(var2, var5[var6]); - if (var7 == null) { - var4 = false; - } else { - int var8 = (var7[0] & 255) << 8 | var7[1] & 255; - byte[] var9; - if (var3) { - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); + public static void method756(AbstractArchive var0) { + ParamComposition.ParamDefinition_archive = var0; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Lch;Lch;IZI)I", + garbageValue = "548586770" + ) + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { + int var4 = var0.population; + int var5 = var1.population; + if (!var3) { + if (var4 == -1) { + var4 = 2001; } - if (var9 == null) { - var4 = false; + if (var5 == -1) { + var5 = 2001; } } + + return var4 - var5; + } else if (var2 == 2) { + return var0.location - var1.location; + } else if (var2 == 3) { + if (var0.activity.equals("-")) { + if (var1.activity.equals("-")) { + return 0; + } else { + return var3 ? -1 : 1; + } + } else if (var1.activity.equals("-")) { + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); + } + } else if (var2 == 4) { + return var0.method390() ? (var1.method390() ? 0 : 1) : (var1.method390() ? -1 : 0); + } else if (var2 == 5) { + return var0.method388() ? (var1.method388() ? 0 : 1) : (var1.method388() ? -1 : 0); + } else if (var2 == 6) { + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; } + } - if (!var4) { - return null; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "-808541663" + ) + static int method759(int var0, Script var1, boolean var2) { + if (var0 == 6500) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class125.loadWorlds() ? 1 : 0; + return 1; } else { - try { - return new Frames(var0, var1, var2, var3); - } catch (Exception var11) { - return null; + World var3; + if (var0 == 6501) { + var3 = class18.worldListStart(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 6502) { + var3 = VarcInt.getNextWorldListWorld(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else { + World var4; + int var5; + int var7; + if (var0 == 6506) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var4 = null; + + for (var5 = 0; var5 < World.World_count; ++var5) { + if (var7 == class176.World_worlds[var5].id) { + var4 = class176.World_worlds[var5]; + break; + } + } + + if (var4 != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 6507) { + SoundCache.Interpreter_intStackSize -= 4; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3] == 1; + class131.sortWorldList(var7, var10, var5, var6); + return 1; + } else if (var0 != 6511) { + if (var0 == 6512) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + return 1; + } else { + int var8; + ParamComposition var9; + if (var0 == 6513) { + SoundCache.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var9 = ObjTypeCustomisation.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = class90.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class90.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6514) { + SoundCache.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var9 = ObjTypeCustomisation.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = WorldMapElement.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = WorldMapElement.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6515) { + SoundCache.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var9 = ObjTypeCustomisation.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = InvDefinition.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6516) { + SoundCache.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var9 = ObjTypeCustomisation.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = Players.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Players.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6518) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == 6519) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.clientType; + return 1; + } else if (var0 == 6520) { + return 1; + } else if (var0 == 6521) { + return 1; + } else if (var0 == 6522) { + --class137.Interpreter_stringStackSize; + --SoundCache.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --class137.Interpreter_stringStackSize; + --SoundCache.Interpreter_intStackSize; + return 1; + } else if (var0 == 6524) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 6525) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == 6526) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == 6527) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.field424; + return 1; + } else { + return 2; + } + } + } else { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var7 >= 0 && var7 < World.World_count) { + var4 = class176.World_worlds[var7]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class14.java b/osrs/src/main/java/class14.java index 90c5956c9..5cf0edac4 100644 --- a/osrs/src/main/java/class14.java +++ b/osrs/src/main/java/class14.java @@ -1,54 +1,45 @@ -import java.awt.FontMetrics; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("ar") public class class14 { - @ObfuscatedName("bn") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("so") - @ObfuscatedSignature( - descriptor = "Lut;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("aw") + @ObfuscatedName("au") final int field42; - @ObfuscatedName("ay") + @ObfuscatedName("ae") final String field43; - @ObfuscatedName("ar") + @ObfuscatedName("ao") final ThreadFactory field44; - @ObfuscatedName("am") + @ObfuscatedName("at") final ThreadPoolExecutor field45; public class14(String var1, int var2, int var3) { this.field43 = var1; this.field42 = var2; this.field44 = new class16(this); - this.field45 = this.method48(var3); + this.field45 = this.method37(var3); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;", - garbageValue = "-936222323" + descriptor = "(IB)Ljava/util/concurrent/ThreadPoolExecutor;", + garbageValue = "-56" ) - final ThreadPoolExecutor method48(int var1) { + final ThreadPoolExecutor method37(int var1) { return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field42), this.field44); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Laq;I)Lad;", - garbageValue = "1690553514" + descriptor = "(Lad;B)Lax;", + garbageValue = "19" ) - public class18 method49(class10 var1) { + public class18 method38(class10 var1) { if (this.field45.getQueue().remainingCapacity() <= 0) { System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field45.getCorePoolSize() + " Queue capacity " + this.field42); return new class18("Queue full"); @@ -58,12 +49,12 @@ public class18 method49(class10 var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1652727695" + garbageValue = "2032063402" ) - public final void method50() { + public final void method40() { try { this.field45.shutdown(); } catch (Exception var2) { @@ -72,33 +63,111 @@ public final void method50() { } - @ObfuscatedName("ay") - public static double method47(double var0, double var2, double var4) { - return class133.method726((var0 - var2) / var4) / var4; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Lsf;III)I", + garbageValue = "-1229342893" + ) + static int method39(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { + return var2; + } else { + IntegerNode var3 = (IntegerNode)var0.get((long)var1); + return var3 == null ? var2 : var3.integer; + } } - @ObfuscatedName("am") + @ObfuscatedName("lp") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1748832285" + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "-525651527" ) - static String method51() { - String var0; - if (class150.clientPreferences.getIsUsernameHidden()) { - String var2 = Login.Login_username; - int var4 = var2.length(); - char[] var5 = new char[var4]; - - for (int var6 = 0; var6 < var4; ++var6) { - var5[var6] = '*'; + static void method41(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, Language.loginType); + + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != VarbitComposition.localPlayer && var7.username != null && var7.username.equals(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortAddLE(var3[var6]); + var8.packetBuffer.writeByteSub(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortAdd(var3[var6]); + var8.packetBuffer.writeByteNeg(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortAdd(var3[var6]); + var8.packetBuffer.writeByteSub(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var3[var6]); + var8.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var8); + } + + var4 = true; + break; } + } + + if (!var4) { + MouseHandler.addGameMessage(4, "", "Unable to find " + var1); + } - String var3 = new String(var5); - var0 = var3; + } + + @ObfuscatedName("lt") + @ObfuscatedSignature( + descriptor = "(III)Ljava/lang/String;", + garbageValue = "-539103842" + ) + static final String method42(int var0, int var1) { + int var2 = var1 - var0; + if (var2 < -9) { + return MoveSpeed.colorStartTag(16711680); + } else if (var2 < -6) { + return MoveSpeed.colorStartTag(16723968); + } else if (var2 < -3) { + return MoveSpeed.colorStartTag(16740352); + } else if (var2 < 0) { + return MoveSpeed.colorStartTag(16756736); + } else if (var2 > 9) { + return MoveSpeed.colorStartTag(65280); + } else if (var2 > 6) { + return MoveSpeed.colorStartTag(4259584); + } else if (var2 > 3) { + return MoveSpeed.colorStartTag(8453888); } else { - var0 = Login.Login_username; + return var2 > 0 ? MoveSpeed.colorStartTag(12648192) : MoveSpeed.colorStartTag(16776960); } + } - return var0; + @ObfuscatedName("mz") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-26" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; + } + + @ObfuscatedName("nd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-361779527" + ) + static final void method44(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); + class449.clientPreferences.setAreaSoundEffectsVolume(var0); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class140.java b/osrs/src/main/java/class140.java index 223f25d12..71129adc9 100644 --- a/osrs/src/main/java/class140.java +++ b/osrs/src/main/java/class140.java @@ -2,60 +2,104 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") +@ObfuscatedName("fq") public class class140 extends class143 { - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("ItemDefinition_modelArchive") - static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("jh") - static int field1314; - @ObfuscatedName("aw") - int field1318; - @ObfuscatedName("ay") - int field1319; - @ObfuscatedName("ar") - int field1317; - @ObfuscatedName("am") - int field1316; + @ObfuscatedName("aq") + public static short[][] field1328; + @ObfuscatedName("au") + int field1332; + @ObfuscatedName("ae") + int field1329; + @ObfuscatedName("ao") + int field1330; + @ObfuscatedName("at") + int field1331; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class140(class146 var1) { this.this$0 = var1; - this.field1318 = -1; + this.field1332 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1318 = var1.readUnsignedShort(); - this.field1319 = var1.readInt(); - this.field1317 = var1.readUnsignedByte(); - this.field1316 = var1.readUnsignedByte(); + this.field1332 = var1.readUnsignedShort(); + this.field1329 = var1.readInt(); + this.field1330 = var1.readUnsignedByte(); + this.field1331 = var1.readUnsignedByte(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method817(this.field1318, this.field1319, this.field1317, this.field1316); + var1.method820(this.field1332, this.field1329, this.field1330, this.field1331); + } + + @ObfuscatedName("ii") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-64" + ) + static final void method762() { + int var0; + int var1; + int var2; + if (!Client.field402) { + var0 = Players.cameraMoveToX * 128 + 64; + var1 = class33.cameraMoveToY * 128 + 64; + var2 = class18.getTileHeight(var0, var1, HealthBar.Client_plane) - VarpDefinition.cameraMoveToHeight; + class126.method702(var0, var2, var1); + } else if (Client.field642 != null) { + NPCComposition.cameraX = Client.field642.vmethod2349(); + class139.cameraZ = Client.field642.vmethod2347(); + if (Client.field401) { + class133.cameraY = Client.field642.vmethod2320(); + } else { + class133.cameraY = class18.getTileHeight(NPCComposition.cameraX, class139.cameraZ, HealthBar.Client_plane) - Client.field642.vmethod2320(); + } + + Client.field642.method2376(); + } + + if (!Client.field404) { + var0 = PendingSpawn.cameraLookAtX * 128 + 64; + var1 = VarbitComposition.cameraLookAtY * 128 + 64; + var2 = class18.getTileHeight(var0, var1, HealthBar.Client_plane) - MusicPatchNode2.cameraLookAtHeight; + int var3 = var0 - NPCComposition.cameraX; + int var4 = var2 - class133.cameraY; + int var5 = var1 - class139.cameraZ; + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); + int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; + int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; + class416.method2161(var7, var8); + } else { + if (Client.field647 != null) { + class129.cameraPitch = Client.field647.method2371(); + class129.cameraPitch = Math.min(Math.max(class129.cameraPitch, 128), 383); + Client.field647.method2376(); + } + + if (Client.field646 != null) { + UserComparator10.cameraYaw = Client.field646.method2371() & 2047; + Client.field646.method2376(); + } + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class141.java b/osrs/src/main/java/class141.java index 5fab8ae7f..d3183c22f 100644 --- a/osrs/src/main/java/class141.java +++ b/osrs/src/main/java/class141.java @@ -2,111 +2,74 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("fp") public class class141 extends class143 { - @ObfuscatedName("aw") - long field1321; - @ObfuscatedName("ay") - String field1320; + @ObfuscatedName("fc") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + @Export("archive10") + static Archive archive10; + @ObfuscatedName("au") + long field1335; + @ObfuscatedName("ae") + String field1334; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class141(class146 var1) { this.this$0 = var1; - this.field1321 = -1L; - this.field1320 = null; + this.field1335 = -1L; + this.field1334 = null; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { if (var1.readUnsignedByte() != 255) { --var1.offset; - this.field1321 = var1.readLong(); + this.field1335 = var1.readLong(); } - this.field1320 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1334 = var1.readStringCp1252NullTerminatedOrNull(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method808(this.field1321, this.field1320, 0); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lty;Lsa;B)Lsa;", - garbageValue = "-36" - ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); - int var3; - if (var1 == null) { - var3 = UrlRequest.method657(var2); - var1 = new IterableNodeHashTable(var3); - } - - for (var3 = 0; var3 < var2; ++var3) { - boolean var4 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); - } - - var1.put((Node)var6, (long)var5); - } - - return var1; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Ltc;I)I", - garbageValue = "-1334865028" - ) - static int method753(PacketBuffer var0) { - int var1 = var0.readBits(2); - int var2; - if (var1 == 0) { - var2 = 0; - } else if (var1 == 1) { - var2 = var0.readBits(5); - } else if (var1 == 2) { - var2 = var0.readBits(8); - } else { - var2 = var0.readBits(11); - } - - return var2; + var1.method812(this.field1335, this.field1334, 0); } - @ObfuscatedName("je") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ldx;II)V", - garbageValue = "-1017792324" + descriptor = "(IIIB)I", + garbageValue = "49" ) - static final void method754(Actor var0, int var1) { - ReflectionCheck.worldToScreen(var0.x, var0.y, var1); + static final int method765(int var0, int var1, int var2) { + int var3 = var0 / var2; + int var4 = var0 & var2 - 1; + int var5 = var1 / var2; + int var6 = var1 & var2 - 1; + int var7 = class312.method1685(var3, var5); + int var8 = class312.method1685(var3 + 1, var5); + int var9 = class312.method1685(var3, var5 + 1); + int var10 = class312.method1685(var3 + 1, var5 + 1); + int var11 = class19.method61(var7, var8, var4, var2); + int var12 = class19.method61(var9, var10, var4, var2); + return class19.method61(var11, var12, var6, var2); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class142.java b/osrs/src/main/java/class142.java index ae8d06c0e..1907df076 100644 --- a/osrs/src/main/java/class142.java +++ b/osrs/src/main/java/class142.java @@ -2,232 +2,99 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("fg") public class class142 extends class143 { - @ObfuscatedName("aw") - int field1322; + @ObfuscatedName("au") + int field1336; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class142(class146 var1) { this.this$0 = var1; - this.field1322 = -1; + this.field1336 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1322 = var1.readUnsignedShort(); + this.field1336 = var1.readUnsignedShort(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method809(this.field1322); + var1.method813(this.field1336); } - @ObfuscatedName("am") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ILdc;ZB)I", - garbageValue = "-51" + descriptor = "([BIII)Z", + garbageValue = "1391970820" ) - static int method757(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return class301.method1577(var0, var1, var2); - } else if (var0 < 1100) { - return UserComparator10.method683(var0, var1, var2); - } else if (var0 < 1200) { - return SecureRandomFuture.method448(var0, var1, var2); - } else if (var0 < 1300) { - return class60.method328(var0, var1, var2); - } else if (var0 < 1400) { - return class9.method28(var0, var1, var2); - } else if (var0 < 1500) { - return class20.method74(var0, var1, var2); - } else if (var0 < 1600) { - return class10.method36(var0, var1, var2); - } else if (var0 < 1700) { - return class423.method2143(var0, var1, var2); - } else if (var0 < 1800) { - return Player.method503(var0, var1, var2); - } else if (var0 < 1900) { - return WorldMapIcon_1.method1372(var0, var1, var2); - } else if (var0 < 2000) { - return class319.method1666(var0, var1, var2); - } else if (var0 < 2100) { - return UserComparator10.method683(var0, var1, var2); - } else if (var0 < 2200) { - return SecureRandomFuture.method448(var0, var1, var2); - } else if (var0 < 2300) { - return class60.method328(var0, var1, var2); - } else if (var0 < 2400) { - return class9.method28(var0, var1, var2); - } else if (var0 < 2500) { - return class20.method74(var0, var1, var2); - } else if (var0 < 2600) { - return VarcInt.method942(var0, var1, var2); - } else if (var0 < 2700) { - return class47.method233(var0, var1, var2); - } else if (var0 < 2800) { - return ClanChannel.method856(var0, var1, var2); - } else if (var0 < 2900) { - return HealthBarUpdate.method533(var0, var1, var2); - } else if (var0 < 3000) { - return class319.method1666(var0, var1, var2); - } else if (var0 < 3200) { - return class9.method29(var0, var1, var2); - } else if (var0 < 3300) { - return ViewportMouse.method1322(var0, var1, var2); - } else if (var0 < 3400) { - return ApproximateRouteStrategy.method350(var0, var1, var2); - } else if (var0 < 3500) { - return FloorDecoration.method1155(var0, var1, var2); - } else if (var0 < 3600) { - return class467.method2325(var0, var1, var2); - } else if (var0 < 3700) { - return class92.method505(var0, var1, var2); - } else if (var0 < 3800) { - return Interpreter.method427(var0, var1, var2); - } else if (var0 < 3900) { - return class345.method1834(var0, var1, var2); - } else if (var0 < 4000) { - return Occluder.method1273(var0, var1, var2); - } else if (var0 < 4100) { - return MouseRecorder.method479(var0, var1, var2); - } else if (var0 < 4200) { - return FriendSystem.method420(var0, var1, var2); - } else if (var0 < 4300) { - return class339.method1824(var0, var1, var2); - } else if (var0 < 5100) { - return class335.method1815(var0, var1, var2); - } else if (var0 < 5400) { - return class113.method656(var0, var1, var2); - } else if (var0 < 5600) { - return WorldMapRectangle.method1496(var0, var1, var2); - } else if (var0 < 5700) { - return RouteStrategy.method1108(var0, var1, var2); - } else if (var0 < 6300) { - return ApproximateRouteStrategy.method351(var0, var1, var2); - } else if (var0 < 6600) { - return class167.method869(var0, var1, var2); - } else if (var0 < 6700) { - return WorldMapRectangle.method1497(var0, var1, var2); - } else if (var0 < 6800) { - return GrandExchangeOfferOwnWorldComparator.method356(var0, var1, var2); - } else if (var0 < 6900) { - return class12.method42(var0, var1, var2); - } else if (var0 < 7000) { - return MouseRecorder.method480(var0, var1, var2); - } else if (var0 < 7100) { - return class159.method838(var0, var1, var2); - } else if (var0 < 7200) { - return class219.method1124(var0, var1, var2); - } else if (var0 < 7300) { - return class30.method126(var0, var1, var2); - } else if (var0 < 7500) { - return class18.method65(var0, var1, var2); - } else if (var0 < 7600) { - return WorldMapScaleHandler.method1545(var0, var1, var2); - } else { - return var0 < 7700 ? MenuAction.method435(var0, var1, var2) : 2; - } - } + static final boolean method768(byte[] var0, int var1, int var2) { + boolean var3 = true; + Buffer var4 = new Buffer(var0); + int var5 = -1; - @ObfuscatedName("mc") - @ObfuscatedSignature( - descriptor = "([Lmt;II)V", - garbageValue = "-535637665" - ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !WorldMapDecorationType.isComponentHidden(var3))) { - int var5; - if (var3.type == 0) { - if (!var3.isIf3 && WorldMapDecorationType.isComponentHidden(var3) && var3 != WorldMapScaleHandler.mousedOverWidgetIf1) { - continue; - } + label57: + while (true) { + int var6 = var4.method2561(); + if (var6 == 0) { + return var3; + } - drawModelComponents(var0, var3.id); - if (var3.children != null) { - drawModelComponents(var3.children, var3.id); - } + var5 += var6; + int var7 = 0; + boolean var8 = false; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - var5 = var4.group; - if (Login.loadInterface(var5)) { - drawModelComponents(ArchiveLoader.Widget_interfaceComponents[var5], -1); - } + while (true) { + int var9; + while (!var8) { + var9 = var4.readUShortSmart(); + if (var9 == 0) { + continue label57; } - } - if (var3.type == 6) { - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var8 = GrandExchangeOfferOwnWorldComparator.runCs1(var3); - if (var8) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } - - if (var5 != -1) { - SequenceDefinition var6 = class135.SequenceDefinition_get(var5); - if (!var6.isCachedModelIdSet()) { - for (var3.modelFrameCycle += Client.field452; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class200.invalidateWidget(var3)) { - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; - ++var3.modelFrame; - if (var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame = 0; - } - } - } - } else { - var3.modelFrame += Client.field452; - int var7 = var6.method1067(); - if (var3.modelFrame >= var7) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var7) { - var3.modelFrame = 0; - } - } - - class200.invalidateWidget(var3); + var7 += var9 - 1; + int var10 = var7 & 63; + int var11 = var7 >> 6 & 63; + int var12 = var4.readUnsignedByte() >> 2; + int var13 = var11 + var1; + int var14 = var10 + var2; + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { + ObjectComposition var15 = WorldMapElement.getObjectDefinition(var5); + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { + if (!var15.needsModelFiles()) { + ++Client.field455; + var3 = false; } + + var8 = true; } } + } - if (var3.rotationKey != 0 && !var3.isIf3) { - int var9 = var3.rotationKey >> 16; - var5 = var3.rotationKey << 16 >> 16; - var9 *= Client.field452; - var5 *= Client.field452; - var3.modelAngleX = var9 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - class200.invalidateWidget(var3); - } + var9 = var4.readUShortSmart(); + if (var9 == 0) { + break; } + + var4.readUnsignedByte(); } } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class143.java b/osrs/src/main/java/class143.java index db07a95b4..c8649da0c 100644 --- a/osrs/src/main/java/class143.java +++ b/osrs/src/main/java/class143.java @@ -2,190 +2,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("fo") public abstract class class143 extends Node { class143() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") abstract void vmethod3254(Buffer var1); - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") abstract void vmethod3248(ClanSettings var1); - @ObfuscatedName("am") + @ObfuscatedName("om") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "-92101383" + descriptor = "(Lmi;B)Z", + garbageValue = "-83" ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; - - for (int var6 = 0; var6 < var5; ++var6) { - char var7 = var0.charAt(var6 + var1); - if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { - if (var7 == 8364) { - var3[var6 + var4] = -128; - } else if (var7 == 8218) { - var3[var6 + var4] = -126; - } else if (var7 == 402) { - var3[var6 + var4] = -125; - } else if (var7 == 8222) { - var3[var6 + var4] = -124; - } else if (var7 == 8230) { - var3[var6 + var4] = -123; - } else if (var7 == 8224) { - var3[var6 + var4] = -122; - } else if (var7 == 8225) { - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; - } else if (var7 == 8240) { - var3[var6 + var4] = -119; - } else if (var7 == 352) { - var3[var6 + var4] = -118; - } else if (var7 == 8249) { - var3[var6 + var4] = -117; - } else if (var7 == 338) { - var3[var6 + var4] = -116; - } else if (var7 == 381) { - var3[var6 + var4] = -114; - } else if (var7 == 8216) { - var3[var6 + var4] = -111; - } else if (var7 == 8217) { - var3[var6 + var4] = -110; - } else if (var7 == 8220) { - var3[var6 + var4] = -109; - } else if (var7 == 8221) { - var3[var6 + var4] = -108; - } else if (var7 == 8226) { - var3[var6 + var4] = -107; - } else if (var7 == 8211) { - var3[var6 + var4] = -106; - } else if (var7 == 8212) { - var3[var6 + var4] = -105; - } else if (var7 == 732) { - var3[var6 + var4] = -104; - } else if (var7 == 8482) { - var3[var6 + var4] = -103; - } else if (var7 == 353) { - var3[var6 + var4] = -102; - } else if (var7 == 8250) { - var3[var6 + var4] = -101; - } else if (var7 == 339) { - var3[var6 + var4] = -100; - } else if (var7 == 382) { - var3[var6 + var4] = -98; - } else if (var7 == 376) { - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; - } - } else { - var3[var6 + var4] = (byte)var7; - } - } - - return var5; - } - - @ObfuscatedName("li") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1787197961" - ) - static final void method760() { - boolean var0 = false; - - while (!var0) { - var0 = true; - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { - String var2 = Client.menuTargets[var1]; - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; - Client.menuTargets[var1 + 1] = var2; - String var3 = Client.menuActions[var1]; - Client.menuActions[var1] = Client.menuActions[var1 + 1]; - Client.menuActions[var1 + 1] = var3; - int var4 = Client.menuOpcodes[var1]; - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; - Client.menuOpcodes[var1 + 1] = var4; - var4 = Client.menuArguments1[var1]; - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; - Client.menuArguments1[var1 + 1] = var4; - var4 = Client.menuArguments2[var1]; - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; - Client.menuArguments2[var1 + 1] = var4; - var4 = Client.menuIdentifiers[var1]; - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; - Client.menuIdentifiers[var1 + 1] = var4; - var4 = Client.menuItemIds[var1]; - Client.menuItemIds[var1] = Client.menuItemIds[var1 + 1]; - Client.menuItemIds[var1 + 1] = var4; - boolean var5 = Client.menuShiftClick[var1]; - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; - Client.menuShiftClick[var1 + 1] = var5; - var0 = false; - } - } - } - - } - - @ObfuscatedName("lb") - @ObfuscatedSignature( - descriptor = "(Lmt;IIIIIII)V", - garbageValue = "815157374" - ) - static final void method761(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field378) { - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; - } - - Client.field378 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !class28.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - class200.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - class200.invalidateWidget(var0); - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { - var7 = var3 * (var3 - 32) / var4; - if (var7 < 8) { - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - class200.invalidateWidget(var0); - Client.field378 = true; - } - } - - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { - var0.scrollY += Client.mouseWheelRotation * 45; - class200.invalidateWidget(var0); - } - } - + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class144.java b/osrs/src/main/java/class144.java index ff8bb6f18..e0f4af6f2 100644 --- a/osrs/src/main/java/class144.java +++ b/osrs/src/main/java/class144.java @@ -1,100 +1,61 @@ -import java.util.ArrayList; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fz") public class class144 extends class143 { - @ObfuscatedName("aw") - int field1324; - @ObfuscatedName("ay") - boolean field1323; + @ObfuscatedName("au") + int field1338; + @ObfuscatedName("ae") + boolean field1337; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class144(class146 var1) { this.this$0 = var1; - this.field1324 = -1; + this.field1338 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1324 = var1.readUnsignedShort(); - this.field1323 = var1.readUnsignedByte() == 1; + this.field1338 = var1.readUnsignedShort(); + this.field1337 = var1.readUnsignedByte() == 1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method816(this.field1324, this.field1323); + var1.method819(this.field1338, this.field1337); } - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/util/ArrayList;ZI)V", - garbageValue = "1982957469" + descriptor = "(IIII)I", + garbageValue = "-2136715015" ) - static void method764(ArrayList var0, boolean var1) { - if (!var1) { - class306.field2755.clear(); + public static int method772(int var0, int var1, int var2) { + var2 &= 3; + if (var2 == 0) { + return var1; + } else if (var2 == 1) { + return 7 - var0; + } else { + return var2 == 2 ? 7 - var1 : var0; } - - Iterator var2 = var0.iterator(); - - while (var2.hasNext()) { - MusicSong var3 = (MusicSong)var2.next(); - if (var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { - if (!var1) { - class306.field2755.add(var3); - } - - class306.field2758.add(var3); - } - } - - } - - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(Ltm;I)Ljava/lang/Object;", - garbageValue = "-1359810813" - ) - static Object method767(class503 var0) { - switch(var0.field4093) { - case 0: - return Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - case 2: - return Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - default: - throw new IllegalStateException("popValueOfType() failure - unsupported type"); - } - } - - @ObfuscatedName("mm") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2108978122" - ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class146.java b/osrs/src/main/java/class146.java index 4dcc6dc60..cbdd16214 100644 --- a/osrs/src/main/java/class146.java +++ b/osrs/src/main/java/class146.java @@ -2,35 +2,41 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") +@ObfuscatedName("fn") public class class146 { - @ObfuscatedName("aw") - long field1329; - @ObfuscatedName("ay") - int field1328; - @ObfuscatedName("ar") + @ObfuscatedName("ol") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lmi;" ) - IterableNodeDeque field1330; + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + @ObfuscatedName("au") + long field1345; + @ObfuscatedName("ae") + public int field1347; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Loc;" + ) + IterableNodeDeque field1346; @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) public class146(Buffer var1) { - this.field1328 = -1; - this.field1330 = new IterableNodeDeque(); - this.method773(var1); + this.field1347 = -1; + this.field1346 = new IterableNodeDeque(); + this.method780(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "-625880362" + descriptor = "(Ltm;B)V", + garbageValue = "-82" ) - void method773(Buffer var1) { - this.field1329 = var1.readLong(); - this.field1328 = var1.readInt(); + void method780(Buffer var1) { + this.field1345 = var1.readLong(); + this.field1347 = var1.readInt(); for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { Object var3; @@ -71,86 +77,34 @@ void method773(Buffer var1) { } ((class143)var3).vmethod3254(var1); - this.field1330.addFirst((Node)var3); + this.field1346.addFirst((Node)var3); } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;I)V", - garbageValue = "-955904177" + descriptor = "(Lfi;I)V", + garbageValue = "192399010" ) - public void method774(ClanSettings var1) { - if (this.field1329 == var1.field1366 && this.field1328 == var1.field1363) { - for (class143 var2 = (class143)this.field1330.last(); var2 != null; var2 = (class143)this.field1330.previous()) { + public void method781(ClanSettings var1) { + if (var1.field1377 == this.field1345 && this.field1347 == var1.field1388) { + for (class143 var2 = (class143)this.field1346.last(); var2 != null; var2 = (class143)this.field1346.previous()) { var2.vmethod3248(var1); } - ++var1.field1363; + ++var1.field1388; } else { throw new RuntimeException(""); } } - @ObfuscatedName("nx") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)V", - garbageValue = "0" - ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); - short[] var2 = new short[16]; - int var3 = 0; - - for (int var4 = 0; var4 < class239.ItemDefinition_fileCount; ++var4) { - ItemComposition var5 = class125.ItemDefinition_get(var4); - if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - JagexCache.foundItemIdCount = -1; - MouseRecorder.foundItemIds = null; - return; - } - - if (var3 >= var2.length) { - short[] var6 = new short[var2.length * 2]; - - for (int var7 = 0; var7 < var3; ++var7) { - var6[var7] = var2[var7]; - } - - var2 = var6; - } - - var2[var3++] = (short)var4; - } - } - - MouseRecorder.foundItemIds = var2; - ClanSettings.foundItemIndex = 0; - JagexCache.foundItemIdCount = var3; - String[] var8 = new String[JagexCache.foundItemIdCount]; - - for (int var9 = 0; var9 < JagexCache.foundItemIdCount; ++var9) { - var8[var9] = class125.ItemDefinition_get(var2[var9]).name; - } - - class481.method2350(var8, MouseRecorder.foundItemIds); - } - - @ObfuscatedName("ox") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-618232336" + descriptor = "(B)Lly;", + garbageValue = "-1" ) - static void method776() { - for (int var0 = 0; var0 < Client.field605.size(); ++var0) { - if (class273.method1504((Integer)Client.field605.get(var0)) != 2) { - Client.field605.remove(var0); - --var0; - } - } - + public static PacketBufferNode method779() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class147.java b/osrs/src/main/java/class147.java index ac7257271..550f9eeca 100644 --- a/osrs/src/main/java/class147.java +++ b/osrs/src/main/java/class147.java @@ -2,52 +2,458 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fx") public class class147 extends class143 { - @ObfuscatedName("fw") + @ObfuscatedName("ff") @ObfuscatedSignature( - descriptor = "Lqh;" + descriptor = "Lnk;" ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("aw") - int field1333; - @ObfuscatedName("ay") - byte field1332; + static Archive field1348; + @ObfuscatedName("au") + int field1350; + @ObfuscatedName("ae") + byte field1349; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class147(class146 var1) { this.this$0 = var1; - this.field1333 = -1; + this.field1350 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1333 = var1.readUnsignedShort(); - this.field1332 = var1.readByte(); + this.field1350 = var1.readUnsignedShort(); + this.field1349 = var1.readByte(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method813(this.field1333, this.field1332); + var1.method817(this.field1350, this.field1349); } -} + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ldy;Ldh;III)V", + garbageValue = "1066790817" + ) + @Export("runScriptLogic") + static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { + Object[] var4 = var0.args; + SoundCache.Interpreter_intStackSize = 0; + class137.Interpreter_stringStackSize = 0; + int var5 = -1; + int[] var6 = var1.opcodes; + int[] var7 = var1.intOperands; + byte var8 = -1; + Interpreter.Interpreter_frameDepth = 0; + Interpreter.field705 = false; + boolean var9 = false; + int var10 = 0; + boolean var29 = false; + + label860: { + label861: { + try { + int var13; + try { + var29 = true; + Varps.Interpreter_intLocals = new int[var1.localIntCount]; + int var11 = 0; + Interpreter.Interpreter_stringLocals = new String[var1.localStringCount]; + int var12 = 0; + + int var14; + String var20; + for (var13 = 1; var13 < var4.length; ++var13) { + if (var4[var13] instanceof Integer) { + var14 = (Integer)var4[var13]; + if (var14 == -2147483647) { + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { + var14 = var0.widget != null ? var0.widget.id * -198009563 * -802277715 : -1; + } + + if (var14 == -2147483644) { + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { + var14 = var0.widget != null ? var0.widget.childIndex * 1628260767 * -1714711969 : -1; + } + + if (var14 == -2147483642) { + var14 = var0.dragTarget != null ? var0.dragTarget.id * -198009563 * -802277715 : -1; + } + + if (var14 == -2147483641) { + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1628260767 * -1714711969 : -1; + } + + if (var14 == -2147483640) { + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { + var14 = var0.keyPressed; + } + + Varps.Interpreter_intLocals[var11++] = var14; + } else if (var4[var13] instanceof String) { + var20 = (String)var4[var13]; + if (var20.equals("event_opbase")) { + var20 = var0.targetName; + } + + Interpreter.Interpreter_stringLocals[var12++] = var20; + } + } + + Interpreter.field708 = var0.field864; + + label841: + while (true) { + ++var10; + if (var10 > var2) { + throw new RuntimeException(); + } + + ++var5; + int var32 = var6[var5]; + if (var32 >= 100) { + boolean var34; + if (var1.intOperands[var5] == 1) { + var34 = true; + } else { + var34 = false; + } + + var14 = PacketWriter.method644(var32, var1, var34); + switch(var14) { + case 0: + var29 = false; + break label841; + case 1: + default: + break; + case 2: + //throw new IllegalStateException(); + } + } else if (var32 == 0) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7[var5]; + } else if (var32 == 1) { + var13 = var7[var5]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; + } else if (var32 == 2) { + var13 = var7[var5]; + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + WorldMapDecoration.changeGameOptions(var13); + } else if (var32 == 3) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var1.stringOperands[var5]; + } else if (var32 == 6) { + var5 += var7[var5]; + } else if (var32 == 7) { + SoundCache.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 8) { + SoundCache.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 9) { + SoundCache.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 10) { + SoundCache.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 21) { + if (Interpreter.Interpreter_frameDepth == 0) { + var29 = false; + break label861; + } + + ScriptFrame var39 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; + var1 = var39.script; + var6 = var1.opcodes; + var7 = var1.intOperands; + var5 = var39.pc; + Varps.Interpreter_intLocals = var39.intLocals; + Interpreter.Interpreter_stringLocals = var39.stringLocals; + } else if (var32 == 25) { + var13 = var7[var5]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ClientPreferences.getVarbit(var13); + } else if (var32 == 27) { + var13 = var7[var5]; + Frames.method1293(var13, Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + } else if (var32 == 31) { + SoundCache.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 32) { + SoundCache.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 33) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Varps.Interpreter_intLocals[var7[var5]]; + } else if (var32 == 34) { + Varps.Interpreter_intLocals[var7[var5]] = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + } else if (var32 == 35) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var5]]; + } else if (var32 == 36) { + Interpreter.Interpreter_stringLocals[var7[var5]] = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + } else if (var32 == 37) { + var13 = var7[var5]; + class137.Interpreter_stringStackSize -= var13; + var20 = class271.method1540(Interpreter.Interpreter_stringStack, class137.Interpreter_stringStackSize, var13); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var20; + } else if (var32 == 38) { + --SoundCache.Interpreter_intStackSize; + } else if (var32 == 39) { + --class137.Interpreter_stringStackSize; + } else { + int var17; + if (var32 != 40) { + if (var32 == 42) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = KeyHandler.varcs.getInt(var7[var5]); + } else if (var32 == 43) { + KeyHandler.varcs.setInt(var7[var5], Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + } else if (var32 == 44) { + var13 = var7[var5] >> 16; + var14 = var7[var5] & 65535; + int var23 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var23 < 0 || var23 > 5000) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrayLengths[var13] = var23; + byte var24 = -1; + if (var14 == 105) { + var24 = 0; + } + + for (var17 = 0; var17 < var23; ++var17) { + Interpreter.Interpreter_arrays[var13][var17] = var24; + } + } else if (var32 == 45) { + var13 = var7[var5]; + var14 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; + } else if (var32 == 46) { + var13 = var7[var5]; + SoundCache.Interpreter_intStackSize -= 2; + var14 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + } else { + String var21; + if (var32 == 47) { + var21 = KeyHandler.varcs.getStringOld(var7[var5]); + if (var21 == null) { + var21 = "null"; + } + + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var21; + } else if (var32 == 48) { + KeyHandler.varcs.setStringOld(var7[var5], Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]); + } else if (var32 == 49) { + var21 = KeyHandler.varcs.getString(var7[var5]); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var21; + } else if (var32 == 50) { + KeyHandler.varcs.setString(var7[var5], Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]); + } else if (var32 == 60) { + IterableNodeHashTable var37 = var1.switches[var7[var5]]; + IntegerNode var36 = (IntegerNode)var37.get((long)Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + if (var36 != null) { + var5 += var36.integer; + } + } else { + Integer var38; + if (var32 == 74) { + var38 = class466.field3912.getTitleGroupValue(var7[var5]); + if (var38 == null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var38; + } + } else { + if (var32 != 76) { + throw new IllegalStateException(); + } + + var38 = class139.varclan.method2320(var7[var5]); + if (var38 == null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var38; + } + } + } + } + } else { + var13 = var7[var5]; + Script var35 = class133.getScript(var13); + int[] var15 = new int[var35.localIntCount]; + String[] var16 = new String[var35.localStringCount]; + + for (var17 = 0; var17 < var35.intArgumentCount; ++var17) { + var15[var17] = Interpreter.Interpreter_intStack[var17 + (SoundCache.Interpreter_intStackSize - var35.intArgumentCount)]; + } + + for (var17 = 0; var17 < var35.stringArgumentCount; ++var17) { + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class137.Interpreter_stringStackSize - var35.stringArgumentCount)]; + } + + SoundCache.Interpreter_intStackSize -= var35.intArgumentCount; + class137.Interpreter_stringStackSize -= var35.stringArgumentCount; + ScriptFrame var22 = new ScriptFrame(); + var22.script = var1; + var22.pc = var5; + var22.intLocals = Varps.Interpreter_intLocals; + var22.stringLocals = Interpreter.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; + var1 = var35; + var6 = var35.opcodes; + var7 = var35.intOperands; + var5 = -1; + Varps.Interpreter_intLocals = var15; + Interpreter.Interpreter_stringLocals = var16; + } + } + } + } catch (Exception var30) { + var9 = true; + StringBuilder var26 = new StringBuilder(30); + var26.append("").append(var1.key).append(" "); + + for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { + var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + } + + var26.append("").append(var8); + Messages.RunException_sendStackTrace(var26.toString(), var30); + var29 = false; + break label860; + } + } finally { + if (var29) { + while (Interpreter.field715.size() > 0) { + class102 var19 = (class102)Interpreter.field715.remove(0); + class47.widgetDefaultMenuAction(var19.method601(), var19.method602(), var19.method603(), var19.method604(), ""); + } + + if (Interpreter.field705) { + Interpreter.field705 = false; + WorldMapIcon_1.method1402(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + Messages.RunException_sendStackTrace("Warning: Script " + var1.field817 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + } + } + + while (Interpreter.field715.size() > 0) { + class102 var33 = (class102)Interpreter.field715.remove(0); + class47.widgetDefaultMenuAction(var33.method601(), var33.method602(), var33.method603(), var33.method604(), ""); + } + + if (Interpreter.field705) { + Interpreter.field705 = false; + WorldMapIcon_1.method1402(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + Messages.RunException_sendStackTrace("Warning: Script " + var1.field817 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + return; + } + + while (Interpreter.field715.size() > 0) { + class102 var40 = (class102)Interpreter.field715.remove(0); + class47.widgetDefaultMenuAction(var40.method601(), var40.method602(), var40.method603(), var40.method604(), ""); + } + + if (Interpreter.field705) { + Interpreter.field705 = false; + WorldMapIcon_1.method1402(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + Messages.RunException_sendStackTrace("Warning: Script " + var1.field817 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + return; + } + + while (Interpreter.field715.size() > 0) { + class102 var25 = (class102)Interpreter.field715.remove(0); + class47.widgetDefaultMenuAction(var25.method601(), var25.method602(), var25.method603(), var25.method604(), ""); + } + + if (Interpreter.field705) { + Interpreter.field705 = false; + WorldMapIcon_1.method1402(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + Messages.RunException_sendStackTrace("Warning: Script " + var1.field817 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-531661874" + ) + static void method785() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; + + for (int var2 = 0; var2 < var0; ++var2) { + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { + class92.addPlayerToScene(Client.players[var1[var2]], true); + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class148.java b/osrs/src/main/java/class148.java index 9504b3a7a..63985acf9 100644 --- a/osrs/src/main/java/class148.java +++ b/osrs/src/main/java/class148.java @@ -2,77 +2,67 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("ff") public class class148 extends class143 { - @ObfuscatedName("fn") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static Archive field1335; - @ObfuscatedName("jb") - @Export("baseY") - static int baseY; @ObfuscatedName("aw") - int field1338; - @ObfuscatedName("ay") - int field1339; - @ObfuscatedName("ar") - int field1337; - @ObfuscatedName("am") - int field1336; + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("au") + int field1355; + @ObfuscatedName("ae") + int field1352; + @ObfuscatedName("ao") + int field1353; + @ObfuscatedName("at") + int field1354; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class148(class146 var1) { this.this$0 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1338 = var1.readInt(); - this.field1336 = var1.readInt(); - this.field1339 = var1.readUnsignedByte(); - this.field1337 = var1.readUnsignedByte(); + this.field1355 = var1.readInt(); + this.field1354 = var1.readInt(); + this.field1352 = var1.readUnsignedByte(); + this.field1353 = var1.readUnsignedByte(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method819(this.field1338, this.field1336, this.field1339, this.field1337); + var1.method822(this.field1355, this.field1354, this.field1352, this.field1353); } - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(ILrg;Lny;B)V", - garbageValue = "98" + descriptor = "(CI)Z", + garbageValue = "236426958" ) - static void method779(int var0, ArchiveDisk var1, Archive var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 1; - var3.key = (long)var0; - var3.archiveDisk = var1; - var3.archive = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); + static boolean method788(char var0) { + for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { + if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { + return true; + } } - class292.method1567(); + return false; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class149.java b/osrs/src/main/java/class149.java index f73f74873..7d19cd919 100644 --- a/osrs/src/main/java/class149.java +++ b/osrs/src/main/java/class149.java @@ -2,70 +2,54 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ff") +@ObfuscatedName("fc") public class class149 extends class159 { - @ObfuscatedName("fc") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static Archive field1340; - @ObfuscatedName("aw") - int field1343; - @ObfuscatedName("ay") - byte field1341; - @ObfuscatedName("ar") - int field1342; - @ObfuscatedName("am") - String field1344; + @ObfuscatedName("au") + int field1358; + @ObfuscatedName("ae") + byte field1356; + @ObfuscatedName("ao") + int field1357; + @ObfuscatedName("at") + String field1359; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgg;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class160 this$0; @ObfuscatedSignature( - descriptor = "(Lgs;)V" + descriptor = "(Lgg;)V" ) class149(class160 var1) { this.this$0 = var1; - this.field1343 = -1; + this.field1358 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "-43" + descriptor = "(Ltm;B)V", + garbageValue = "1" ) @Export("vmethod3238") void vmethod3238(Buffer var1) { - this.field1343 = var1.readUnsignedShort(); - this.field1341 = var1.readByte(); - this.field1342 = var1.readUnsignedShort(); + this.field1358 = var1.readUnsignedShort(); + this.field1356 = var1.readByte(); + this.field1357 = var1.readUnsignedShort(); var1.readLong(); - this.field1344 = var1.readStringCp1252NullTerminated(); + this.field1359 = var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgh;I)V", - garbageValue = "-2132107044" + descriptor = "(Lgo;I)V", + garbageValue = "831405774" ) @Export("vmethod3239") void vmethod3239(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1343); - var2.rank = this.field1341; - var2.world = this.field1342; - var2.username = new Username(this.field1344); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lnd;I)V", - garbageValue = "-1871953753" - ) - public static void method782(AbstractArchive var0) { - FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1358); + var2.rank = this.field1356; + var2.world = this.field1357; + var2.username = new Username(this.field1359); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class15.java b/osrs/src/main/java/class15.java index b87d31fc4..b32c7dd74 100644 --- a/osrs/src/main/java/class15.java +++ b/osrs/src/main/java/class15.java @@ -1,3 +1,11 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import org.bouncycastle.crypto.tls.TlsClientProtocol; +import org.bouncycastle.jce.provider.BouncyCastleProvider; + +import javax.net.ssl.SSLSocket; +import javax.net.ssl.SSLSocketFactory; import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -5,22 +13,15 @@ import java.net.UnknownHostException; import java.security.SecureRandom; import java.security.Security; -import javax.net.ssl.SSLSocket; -import javax.net.ssl.SSLSocketFactory; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import org.bouncycastle.crypto.tls.TlsClientProtocol; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -@ObfuscatedName("au") +@ObfuscatedName("ab") public class class15 extends SSLSocketFactory { - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lau;" + descriptor = "Lab;" ) - public static class15 field46; - @ObfuscatedName("aw") + static class15 field46; + @ObfuscatedName("au") SecureRandom field47; static { @@ -30,16 +31,16 @@ public class class15 extends SSLSocketFactory { } - public class15() { + class15() { this.field47 = new SecureRandom(); } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;I)Ljavax/net/ssl/SSLSocket;", - garbageValue = "-485169673" + descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;B)Ljavax/net/ssl/SSLSocket;", + garbageValue = "59" ) - SSLSocket method52(String var1, TlsClientProtocol var2) { + SSLSocket method46(String var1, TlsClientProtocol var2) { return new class12(this, var2, var1); } @@ -55,7 +56,7 @@ public Socket createSocket(Socket var1, String var2, int var3, boolean var4) thr } TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field47); - return this.method52(var2, var5); + return this.method46(var2, var5); } public String[] getDefaultCipherSuites() { @@ -81,4 +82,17 @@ public Socket createSocket(String var1, int var2, InetAddress var3, int var4) th public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { return null; } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Lab;", + garbageValue = "1970056082" + ) + public static class15 method45() { + if (field46 == null) { + field46 = new class15(); + } + + return field46; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class150.java b/osrs/src/main/java/class150.java index fbd81d9e3..c975ca307 100644 --- a/osrs/src/main/java/class150.java +++ b/osrs/src/main/java/class150.java @@ -4,158 +4,54 @@ @ObfuscatedName("fk") public class class150 extends class143 { - @ObfuscatedName("vx") - @ObfuscatedSignature( - descriptor = "Lda;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("aw") - boolean field1346; - @ObfuscatedName("ay") - byte field1350; - @ObfuscatedName("ar") - byte field1348; - @ObfuscatedName("am") - byte field1347; - @ObfuscatedName("as") - byte field1349; + @ObfuscatedName("au") + boolean field1360; + @ObfuscatedName("ae") + byte field1362; + @ObfuscatedName("ao") + byte field1363; + @ObfuscatedName("at") + byte field1364; + @ObfuscatedName("ac") + byte field1361; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class150(class146 var1) { this.this$0 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1346 = var1.readUnsignedByte() == 1; - this.field1350 = var1.readByte(); - this.field1348 = var1.readByte(); - this.field1347 = var1.readByte(); - this.field1349 = var1.readByte(); + this.field1360 = var1.readUnsignedByte() == 1; + this.field1362 = var1.readByte(); + this.field1363 = var1.readByte(); + this.field1364 = var1.readByte(); + this.field1361 = var1.readByte(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.allowGuests = this.field1346; - var1.field1375 = this.field1350; - var1.field1372 = this.field1348; - var1.field1373 = this.field1347; - var1.field1374 = this.field1349; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZB)[B", - garbageValue = "75" - ) - public static byte[] method785(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var6 = (byte[])((byte[])var0); - if (var1) { - int var4 = var6.length; - byte[] var5 = new byte[var4]; - System.arraycopy(var6, 0, var5, 0, var4); - return var5; - } else { - return var6; - } - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(IIIZIZS)V", - garbageValue = "-25741" - ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { - int var6 = (var0 + var1) / 2; - int var7 = var0; - World var8 = class387.World_worlds[var6]; - class387.World_worlds[var6] = class387.World_worlds[var1]; - class387.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - World var11 = class387.World_worlds[var9]; - int var12 = ClanSettings.compareWorlds(var11, var8, var2, var3); - int var10; - if (var12 != 0) { - if (var3) { - var10 = -var12; - } else { - var10 = var12; - } - } else if (var4 == -1) { - var10 = 0; - } else { - int var13 = ClanSettings.compareWorlds(var11, var8, var4, var5); - if (var5) { - var10 = -var13; - } else { - var10 = var13; - } - } - - if (var10 <= 0) { - World var14 = class387.World_worlds[var9]; - class387.World_worlds[var9] = class387.World_worlds[var7]; - class387.World_worlds[var7++] = var14; - } - } - - class387.World_worlds[var1] = class387.World_worlds[var7]; - class387.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); - } - - } - - @ObfuscatedName("nm") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "2003552288" - ) - static final void method789(int var0, int var1, boolean var2) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method851()) { - ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - PacketBufferNode var4 = class503.getPacketBufferNode(ClientPacket.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(4 + class501.stringCp1252NullTerminatedByteSize(var3.username.getName())); - var4.packetBuffer.writeByte(var0); - var4.packetBuffer.writeShort(var1); - var4.packetBuffer.writeBoolean(var2); - var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); - Client.packetWriter.addNode(var4); - } - } + var1.allowGuests = this.field1360; + var1.field1383 = this.field1362; + var1.field1385 = this.field1363; + var1.field1384 = this.field1364; + var1.field1386 = this.field1361; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class151.java b/osrs/src/main/java/class151.java index df428af9e..071084b9d 100644 --- a/osrs/src/main/java/class151.java +++ b/osrs/src/main/java/class151.java @@ -2,41 +2,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("fm") public class class151 extends class159 { - @ObfuscatedName("ag") - static int field1351; - @ObfuscatedName("fb") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static Archive field1352; - @ObfuscatedName("aw") - int field1353; + @ObfuscatedName("bw") + static String field1365; + @ObfuscatedName("au") + int field1366; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgg;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class160 this$0; @ObfuscatedSignature( - descriptor = "(Lgs;)V" + descriptor = "(Lgg;)V" ) class151(class160 var1) { this.this$0 = var1; - this.field1353 = -1; + this.field1366 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "-43" + descriptor = "(Ltm;B)V", + garbageValue = "1" ) @Export("vmethod3238") void vmethod3238(Buffer var1) { - this.field1353 = var1.readUnsignedShort(); + this.field1366 = var1.readUnsignedShort(); var1.readUnsignedByte(); if (var1.readUnsignedByte() != 255) { --var1.offset; @@ -45,13 +38,355 @@ void vmethod3238(Buffer var1) { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgh;I)V", - garbageValue = "-2132107044" + descriptor = "(Lgo;I)V", + garbageValue = "831405774" ) @Export("vmethod3239") void vmethod3239(ClanChannel var1) { - var1.removeMember(this.field1353); + var1.removeMember(this.field1366); + } + + @ObfuscatedName("kl") + @ObfuscatedSignature( + descriptor = "(Lto;I)V", + garbageValue = "-619616137" + ) + static final void method795(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field451; ++var1) { + int var2 = Client.field552[var1]; + NPC var3 = Client.npcs[var2]; + int var4 = var0.readUnsignedByte(); + int var5; + if ((var4 & 8) != 0) { + var5 = var0.readUnsignedByte(); + var4 += var5 << 8; + } + + if ((var4 & 2048) != 0) { + var5 = var0.readUnsignedByte(); + var4 += var5 << 16; + } + + int var6; + int var7; + int var8; + int var9; + int var10; + if ((var4 & 128) != 0) { + var5 = var0.readUnsignedByteNeg(); + int var11; + if (var5 > 0) { + for (var6 = 0; var6 < var5; ++var6) { + var8 = -1; + var9 = -1; + var10 = -1; + var7 = var0.readUShortSmart(); + if (var7 == 32767) { + var7 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var8 = var0.readUShortSmart(); + var10 = var0.readUShortSmart(); + } else if (var7 != 32766) { + var9 = var0.readUShortSmart(); + } else { + var7 = -1; + } + + var11 = var0.readUShortSmart(); + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); + } + } + + var6 = var0.readUnsignedByteSub(); + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + if (var9 != 32767) { + var10 = var0.readUShortSmart(); + var11 = var0.readUnsignedByteNeg(); + int var12 = var9 > 0 ? var0.readUnsignedByteNeg() : var11; + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); + } else { + var3.removeHealthBar(var8); + } + } + } + } + + int[] var13; + short[] var14; + short[] var15; + long var16; + boolean var19; + if ((var4 & 512) != 0) { + var5 = var0.readUnsignedByte(); + if ((var5 & 1) == 1) { + var3.method595(); + } else { + var13 = null; + if ((var5 & 2) == 2) { + var7 = var0.readUnsignedByteAdd(); + var13 = new int[var7]; + + for (var8 = 0; var8 < var7; ++var8) { + var9 = var0.method2587(); + var9 = var9 == 65535 ? -1 : var9; + var13[var8] = var9; + } + } + + var14 = null; + if ((var5 & 4) == 4) { + var8 = 0; + if (var3.definition.recolorTo != null) { + var8 = var3.definition.recolorTo.length; + } + + var14 = new short[var8]; + + for (var9 = 0; var9 < var8; ++var9) { + var14[var9] = (short)var0.readUnsignedShortLE(); + } + } + + var15 = null; + if ((var5 & 8) == 8) { + var9 = 0; + if (var3.definition.retextureTo != null) { + var9 = var3.definition.retextureTo.length; + } + + var15 = new short[var9]; + + for (var10 = 0; var10 < var9; ++var10) { + var15[var10] = (short)var0.readUnsignedShortLE(); + } + } + + var19 = false; + if ((var5 & 16) != 0) { + var19 = var0.readUnsignedByteSub() == 1; + } + + var16 = (long)(++NPC.field1074 - 1); + var3.method592(new NewShit(var16, var13, var14, var15, var19)); + } + } + + if ((var4 & 32) != 0) { + var5 = var0.readUnsignedShortLE(); + var6 = var0.readUnsignedShort(); + var3.field959 = var0.readUnsignedByteNeg() == 1; + if (Client.param25 >= 212) { + var3.field988 = var5; + var3.field989 = var6; + } else { + var7 = var3.x - (var5 - UrlRequester.baseX - UrlRequester.baseX) * 64; + var8 = var3.y - (var6 - class47.baseY - class47.baseY) * 64; + if (var7 != 0 || var8 != 0) { + var10 = (int)(Math.atan2((double)var7, (double)var8) * 325.94932345220167D) & 2047; + var3.movingOrientation = var10; + } + } + } + + if ((var4 & 64) != 0) { + var5 = var0.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var0.readUnsignedByteSub(); + if (var5 == var3.sequence && var5 != -1) { + var7 = EnumComposition.SequenceDefinition_get(var5).replyMode; + if (var7 == 1) { + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.currentSequenceFrameIndex = 0; + } + + if (var7 == 2) { + var3.currentSequenceFrameIndex = 0; + } + } else if (var5 == -1 || var3.sequence == -1 || EnumComposition.SequenceDefinition_get(var5).forcedPriority >= EnumComposition.SequenceDefinition_get(var3.sequence).forcedPriority) { + var3.sequence = var5; + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.currentSequenceFrameIndex = 0; + var3.field1022 = var3.pathLength; + } + } + + if ((var4 & 131072) != 0) { + var5 = var0.readUnsignedByteNeg(); + + for (var6 = 0; var6 < var5; ++var6) { + var7 = var0.readUnsignedByteSub(); + var8 = var0.method2587(); + var9 = var0.method2598(); + var3.updateSpotAnimation(var7, var8, var9 >> 16, var9 & 65535); + } + } + + if ((var4 & 4) != 0) { + var3.definition = class90.getNpcDefinition(var0.readUnsignedShort()); + ItemLayer.method1152(var3); + var3.method591(); + } + + if ((var4 & 16) != 0) { + var3.targetIndex = var0.readIntME(); + var3.targetIndex += var0.readUnsignedByteSub() << 16; + var5 = 16777215; + if (var5 == var3.targetIndex) { + var3.targetIndex = -1; + } + } + + if ((var4 & 4096) != 0) { + var3.field1004 = var0.readSignedByteSub(); + var3.field1001 = var0.readSignedByteSub(); + var3.field1002 = var0.readByteNeg(); + var3.field1014 = var0.readByteAdd(); + var3.spotAnimation = var0.readIntME() + Client.cycle; + var3.exactMoveArrive1Cycle = var0.readUnsignedShort() + Client.cycle; + var3.exactMoveDirection = var0.method2587(); + var3.pathLength = 1; + var3.field1022 = 0; + var3.field1004 += var3.pathX[0]; + var3.field1001 += var3.pathY[0]; + var3.field1002 += var3.pathX[0]; + var3.field1014 += var3.pathY[0]; + } + + if ((var4 & 65536) != 0) { + var5 = var0.readIntIME(); + var3.turnLeftSequence = (var5 & 1) != 0 ? var0.method2587() : var3.definition.turnLeftSequence * -1670226789 * 1686120851; + var3.turnRightSequence = (var5 & 2) != 0 ? var0.readUnsignedShortLE() : var3.definition.turnRightSequence * -1405323159 * 821598169; + var3.walkSequence = (var5 & 4) != 0 ? var0.readIntME() : var3.definition.walkSequence * 636917019 * 934984979; + var3.walkBackSequence = (var5 & 8) != 0 ? var0.method2587() : var3.definition.walkBackSequence * 129510829 * 1271381541; + var3.walkLeftSequence = (var5 & 16) != 0 ? var0.readUnsignedShortLE() : var3.definition.walkLeftSequence * 799501513 * -1909691015; + var3.walkRightSequence = (var5 & 32) != 0 ? var0.readUnsignedShortLE() : var3.definition.walkRightSequence * 1831978023 * 749693847; + var3.runSequence = (var5 & 64) != 0 ? var0.method2587() : var3.definition.runSequence * -1380991387 * -725499027; + var3.runBackSequence = (var5 & 128) != 0 ? var0.method2587() : var3.definition.runBackSequence * -797891459 * 1726248149; + var3.runLeftSequence = (var5 & 256) != 0 ? var0.readIntME() : var3.definition.runLeftSequence * -1089844195 * 1675023925; + var3.runRightSequence = (var5 & 512) != 0 ? var0.method2587() : var3.definition.runRightSequence * -581873653 * -1635337309; + var3.crawlSequence = (var5 & 1024) != 0 ? var0.readIntME() : var3.definition.crawlSequence * 1002809145 * -448850167; + var3.crawlBackSequence = (var5 & 2048) != 0 ? var0.method2587() : var3.definition.crawlBackSequence * -1708442501 * -2089336141; + var3.crawlLeftSequence = (var5 & 4096) != 0 ? var0.readIntME() : var3.definition.crawlLeftSequence * 2098030227 * -1815894117; + var3.crawlRightSequence = (var5 & 8192) != 0 ? var0.readUnsignedShortLE() : var3.definition.crawlRightSequence * 1404008677 * -1427405587; + var3.idleSequence = (var5 & 16384) != 0 ? var0.readIntME() : var3.definition.idleSequence * 403001363 * 260766235; + } + + if ((var4 & 262144) != 0) { + var5 = var0.readUnsignedByte(); + var13 = new int[8]; + var14 = new short[8]; + + for (var8 = 0; var8 < 8; ++var8) { + if ((var5 & 1 << var8) != 0) { + var13[var8] = var0.method2563(); + var14[var8] = (short)var0.method2560(); + } else { + var13[var8] = -1; + var14[var8] = -1; + } + } + + var3.method590(var13, var14); + } + + if ((var4 & 32768) != 0) { + var3.method577(var0.readStringCp1252NullTerminated()); + } + + if ((var4 & 2) != 0) { + var0.readUnsignedShort(); + var0.readInt(); + } + + if ((var4 & 1) != 0) { + var3.overheadText = var0.readStringCp1252NullTerminated(); + var3.overheadTextCyclesRemaining = 100; + } + + if ((var4 & 8192) != 0) { + var3.recolourStartCycle = Client.cycle + var0.readUnsignedShort(); + var3.recolourEndCycle = Client.cycle + var0.readUnsignedShort(); + var3.recolourHue = var0.readByteNeg(); + var3.recolourSaturation = var0.readByteNeg(); + var3.recolourLuminance = var0.readByteNeg(); + var3.recolourAmount = (byte)var0.readUnsignedByte(); + } + + if ((var4 & 256) != 0) { + var5 = var0.readUnsignedByteAdd(); + if ((var5 & 1) == 1) { + var3.method596(); + } else { + var13 = null; + if ((var5 & 2) == 2) { + var7 = var0.readUnsignedByteAdd(); + var13 = new int[var7]; + + for (var8 = 0; var8 < var7; ++var8) { + var9 = var0.readUnsignedShortLE(); + var9 = var9 == 65535 ? -1 : var9; + var13[var8] = var9; + } + } + + var14 = null; + if ((var5 & 4) == 4) { + var8 = 0; + if (var3.definition.recolorTo != null) { + var8 = var3.definition.recolorTo.length; + } + + var14 = new short[var8]; + + for (var9 = 0; var9 < var8; ++var9) { + var14[var9] = (short)var0.readUnsignedShortLE(); + } + } + + var15 = null; + if ((var5 & 8) == 8) { + var9 = 0; + if (var3.definition.retextureTo != null) { + var9 = var3.definition.retextureTo.length; + } + + var15 = new short[var9]; + + for (var10 = 0; var10 < var9; ++var10) { + var15[var10] = (short)var0.readIntME(); + } + } + + var19 = false; + if ((var5 & 16) != 0) { + var19 = var0.readUnsignedByteSub() == 1; + } + + var16 = (long)(++NPC.field1075 - 1); + var3.method594(new NewShit(var16, var13, var14, var15, var19)); + } + } + + if ((var4 & 16384) != 0) { + var3.method579(var0.readUnsignedByteAdd()); + } + + if ((var4 & 1024) != 0) { + var3.combatLevelChange = var0.readInt(); + } + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class152.java b/osrs/src/main/java/class152.java index 46c264bcc..6c93fe413 100644 --- a/osrs/src/main/java/class152.java +++ b/osrs/src/main/java/class152.java @@ -2,79 +2,178 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") +@ObfuscatedName("fy") public class class152 extends class143 { - @ObfuscatedName("ad") - @Export("ByteArrayPool_arrays") - public static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("aw") - String field1355; + @ObfuscatedName("ac") + @Export("SpriteBuffer_yOffsets") + static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "[Lui;" + ) + @Export("crossSprites") + static SpritePixels[] crossSprites; + @ObfuscatedName("au") + String field1369; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class152(class146 var1) { this.this$0 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1355 = var1.readStringCp1252NullTerminated(); + this.field1369 = var1.readStringCp1252NullTerminated(); var1.readInt(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.name = this.field1355; + var1.name = this.field1369; } - @ObfuscatedName("at") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "42723484" + descriptor = "(Lnu;Lnu;I)V", + garbageValue = "185699180" ) - static int method794(int var0, int var1) { - for (int var2 = 0; var2 < 8; ++var2) { - if (var1 <= var0 + 30) { - return var2; - } + public static void method796(AbstractArchive var0, AbstractArchive var1) { + HealthBarDefinition.HealthBarDefinition_archive = var0; + class422.field3769 = var1; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIILhv;II)V", + garbageValue = "1173683624" + ) + static void method797(int var0, int var1, int var2, ObjectComposition var3, int var4) { + ObjectSound var5 = new ObjectSound(); + var5.plane = var0; + var5.x = var1 * 128; + var5.y = var2 * 128; + int var6 = var3.sizeX; + int var7 = var3.sizeY; + if (var4 == 1 || var4 == 3) { + var6 = var3.sizeY; + var7 = var3.sizeX; + } + + var5.maxX = (var6 + var1) * 128; + var5.maxY = (var7 + var2) * 128; + var5.soundEffectId = var3.ambientSoundId; + var5.field702 = var3.int7 * 128; + var5.field696 = var3.int5; + var5.field694 = var3.int6; + var5.soundEffectIds = var3.soundEffectIds; + if (var3.transforms != null) { + var5.obj = var3; + var5.set(); + } - var0 += 30; - var0 += var2 != 1 && var2 != 3 ? 5 : 20; + ObjectSound.objectSounds.addFirst(var5); + if (var5.soundEffectIds != null) { + var5.field698 = var5.field696 + (int)(Math.random() * (double)(var5.field694 - var5.field696)); } - return 0; } - @ObfuscatedName("nc") + @ObfuscatedName("mo") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2070877225" + descriptor = "([Lmi;II)V", + garbageValue = "-73715708" ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = class503.getPacketBufferNode(ClientPacket.CLAN_JOINCHAT_LEAVECHAT, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class501.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class143.isComponentHidden(var3))) { + int var5; + if (var3.type == 0) { + if (!var3.isIf3 && class143.isComponentHidden(var3) && var3 != class146.mousedOverWidgetIf1) { + continue; + } + + drawModelComponents(var0, var3.id); + if (var3.children != null) { + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + var5 = var4.group; + if (ModeWhere.loadInterface(var5)) { + drawModelComponents(PacketBufferNode.Widget_interfaceComponents[var5], -1); + } + } + } + + if (var3.type == 6) { + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var8 = class27.runCs1(var3); + if (var8) { + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; + } + + if (var5 != -1) { + SequenceDefinition var6 = EnumComposition.SequenceDefinition_get(var5); + if (!var6.isCachedModelIdSet()) { + for (var3.modelFrameCycle += Client.field457; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class218.invalidateWidget(var3)) { + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; + ++var3.modelFrame; + if (var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame = 0; + } + } + } + } else { + var3.modelFrame += Client.field457; + int var7 = var6.method1085(); + if (var3.modelFrame >= var7) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var7) { + var3.modelFrame = 0; + } + } + + class218.invalidateWidget(var3); + } + } + } + + if (var3.rotationKey != 0 && !var3.isIf3) { + int var9 = var3.rotationKey >> 16; + var5 = var3.rotationKey << 16 >> 16; + var9 *= Client.field457; + var5 *= Client.field457; + var3.modelAngleX = var9 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + class218.invalidateWidget(var3); + } + } + } } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class153.java b/osrs/src/main/java/class153.java index 05d1b48b7..b720ba5c9 100644 --- a/osrs/src/main/java/class153.java +++ b/osrs/src/main/java/class153.java @@ -2,161 +2,101 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fw") public class class153 extends class143 { - @ObfuscatedName("wm") - @ObfuscatedSignature( - descriptor = "Lnq;" - ) - static JagNetThread field1356; - @ObfuscatedName("aw") - int field1357; - @ObfuscatedName("ay") - String field1358; + @ObfuscatedName("au") + int field1370; + @ObfuscatedName("ae") + String field1371; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class153(class146 var1) { this.this$0 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1357 = var1.readInt(); - this.field1358 = var1.readStringCp1252NullTerminated(); + this.field1370 = var1.readInt(); + this.field1371 = var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method821(this.field1357, this.field1358); + var1.method824(this.field1370, this.field1371); } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "769155110" + descriptor = "(III)V", + garbageValue = "1017445786" ) - public static String method796(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var3 = var0[var1]; - return var3 == null ? "null" : var3.toString(); - } else { - int var8 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var8; ++var5) { - CharSequence var6 = var0[var5]; - if (var6 == null) { - var4 += 4; - } else { - var4 += var6.length(); - } - } - - StringBuilder var9 = new StringBuilder(var4); - - for (int var10 = var1; var10 < var8; ++var10) { - CharSequence var7 = var0[var10]; - if (var7 == null) { - var9.append("null"); - } else { - var9.append(var7); - } + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; + int[] var3 = new int[4]; + var2[0] = var0; + var3[0] = var1; + int var4 = 1; + + for (int var5 = 0; var5 < 4; ++var5) { + if (World.World_sortOption1[var5] != var0) { + var2[var4] = World.World_sortOption1[var5]; + var3[var4] = World.World_sortOption2[var5]; + ++var4; } - - return var9.toString(); } + + World.World_sortOption1 = var2; + World.World_sortOption2 = var3; + GameEngine.sortWorlds(class176.World_worlds, 0, class176.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); } - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "871826027" + descriptor = "(B)V", + garbageValue = "17" ) - public static String method797(String var0) { - int var1 = var0.length(); - char[] var2 = new char[var1]; - byte var3 = 2; - - for (int var4 = 0; var4 < var1; ++var4) { - char var5 = var0.charAt(var4); - if (var3 == 0) { - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { - char var6; - if (var5 != 181 && var5 != 402) { - var6 = Character.toTitleCase(var5); - } else { - var6 = var5; - } - - var5 = var6; - } - - if (Character.isLetter(var5)) { - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { - if (Character.isSpaceChar(var5)) { - if (var3 != 2) { - var3 = 1; - } - } else { - var3 = 1; - } - } else { - var3 = 2; - } - - var2[var4] = var5; - } - - return new String(var2); + public static void method802() { + KitDefinition.KitDefinition_cached.clear(); } - @ObfuscatedName("lg") + @ObfuscatedName("jf") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "1514663394" + descriptor = "(IIIII)V", + garbageValue = "-1977866275" ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - class302.scrollBarSprites[0].drawAt(var0, var1); - class302.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field454); - int var5 = var3 * (var3 - 32) / var4; - if (var5 < 8) { - var5 = 8; + static final void method805(int var0, int var1, int var2, int var3) { + Client.field486 = 0; + int var4 = (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX; + int var5 = (VarbitComposition.localPlayer.y >> 7) + class47.baseY; + if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { + Client.field486 = 1; + } + + if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { + Client.field486 = 1; + } + + if (Client.field486 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { + Client.field486 = 0; } - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field461); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field458); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field458); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field458); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field458); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field459); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field459); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field459); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field459); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class155.java b/osrs/src/main/java/class155.java index 953734588..48d6c49f7 100644 --- a/osrs/src/main/java/class155.java +++ b/osrs/src/main/java/class155.java @@ -2,37 +2,38 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("fa") public class class155 extends class159 { - @ObfuscatedName("jy") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("aw") - String field1388; - @ObfuscatedName("ay") - int field1387; - @ObfuscatedName("ar") - byte field1386; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("Widget_fontsArchive") + public static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("au") + String field1400; + @ObfuscatedName("ae") + int field1399; + @ObfuscatedName("ao") + byte field1398; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgg;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class160 this$0; @ObfuscatedSignature( - descriptor = "(Lgs;)V" + descriptor = "(Lgg;)V" ) class155(class160 var1) { this.this$0 = var1; - this.field1388 = null; + this.field1400 = null; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "-43" + descriptor = "(Ltm;B)V", + garbageValue = "1" ) @Export("vmethod3238") void vmethod3238(Buffer var1) { @@ -41,23 +42,53 @@ void vmethod3238(Buffer var1) { var1.readLong(); } - this.field1388 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1387 = var1.readUnsignedShort(); - this.field1386 = var1.readByte(); + this.field1400 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1399 = var1.readUnsignedShort(); + this.field1398 = var1.readByte(); var1.readLong(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgh;I)V", - garbageValue = "-2132107044" + descriptor = "(Lgo;I)V", + garbageValue = "831405774" ) @Export("vmethod3239") void vmethod3239(ClanChannel var1) { ClanChannelMember var2 = new ClanChannelMember(); - var2.username = new Username(this.field1388); - var2.world = this.field1387; - var2.rank = this.field1386; + var2.username = new Username(this.field1400); + var2.world = this.field1399; + var2.rank = this.field1398; var1.addMember(var2); } -} + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ltm;IB)Ljava/lang/String;", + garbageValue = "-80" + ) + static String method826(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); + if (var2 > var1) { + var2 = var1; + } + + byte[] var3 = new byte[var2]; + var0.offset += class334.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = class325.decodeStringCp1252(var3, 0, var2); + return var4; + } catch (Exception var6) { + return "Cabbage"; + } + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-692209680" + ) + static int method829(int var0) { + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class156.java b/osrs/src/main/java/class156.java index 362f1314f..67462428b 100644 --- a/osrs/src/main/java/class156.java +++ b/osrs/src/main/java/class156.java @@ -2,64 +2,59 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gc") +@ObfuscatedName("gu") public class class156 extends class159 { - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Luk;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("aw") - int field1392; - @ObfuscatedName("ay") - byte field1390; - @ObfuscatedName("ar") - int field1391; - @ObfuscatedName("am") - String field1393; + @ObfuscatedName("wl") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("au") + int field1404; + @ObfuscatedName("ae") + byte field1402; + @ObfuscatedName("ao") + int field1403; + @ObfuscatedName("at") + String field1405; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgg;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class160 this$0; @ObfuscatedSignature( - descriptor = "(Lgs;)V" + descriptor = "(Lgg;)V" ) class156(class160 var1) { this.this$0 = var1; - this.field1392 = -1; + this.field1404 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "-43" + descriptor = "(Ltm;B)V", + garbageValue = "1" ) @Export("vmethod3238") void vmethod3238(Buffer var1) { var1.readUnsignedByte(); - this.field1392 = var1.readUnsignedShort(); - this.field1390 = var1.readByte(); - this.field1391 = var1.readUnsignedShort(); + this.field1404 = var1.readUnsignedShort(); + this.field1402 = var1.readByte(); + this.field1403 = var1.readUnsignedShort(); var1.readLong(); - this.field1393 = var1.readStringCp1252NullTerminated(); + this.field1405 = var1.readStringCp1252NullTerminated(); var1.readUnsignedByte(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgh;I)V", - garbageValue = "-2132107044" + descriptor = "(Lgo;I)V", + garbageValue = "831405774" ) @Export("vmethod3239") void vmethod3239(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1392); - var2.rank = this.field1390; - var2.world = this.field1391; - var2.username = new Username(this.field1393); + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1404); + var2.rank = this.field1402; + var2.world = this.field1403; + var2.username = new Username(this.field1405); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class157.java b/osrs/src/main/java/class157.java index 498453c89..353b1eaf3 100644 --- a/osrs/src/main/java/class157.java +++ b/osrs/src/main/java/class157.java @@ -2,70 +2,122 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +import java.util.ArrayList; + +@ObfuscatedName("gc") public class class157 extends class143 { - @ObfuscatedName("ae") - static String[] field1396; - @ObfuscatedName("ko") - @Export("cameraX") - static int cameraX; - @ObfuscatedName("ur") - static int cameraLookAtAcceleration; - @ObfuscatedName("aw") - int field1397; + @ObfuscatedName("gt") + static String field1407; + @ObfuscatedName("iz") + static int field1406; + @ObfuscatedName("au") + int field1408; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class157(class146 var1) { this.this$0 = var1; - this.field1397 = -1; + this.field1408 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1397 = var1.readUnsignedShort(); + this.field1408 = var1.readUnsignedShort(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method812(this.field1397); + var1.method816(this.field1408); + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(CS)Z", + garbageValue = "255" + ) + static boolean method835(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-858591877" + ) + public static String method832(String var0) { + StringBuilder var1 = new StringBuilder(var0.length()); + int var2 = 0; + int var3 = -1; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + char var5 = var0.charAt(var4); + if (var5 == '<') { + var1.append(var0.substring(var2, var4)); + var3 = var4; + } else if (var5 == '>' && var3 != -1) { + String var6 = var0.substring(var3 + 1, var4); + var3 = -1; + if (var6.equals("lt")) { + var1.append("<"); + } else if (var6.equals("gt")) { + var1.append(">"); + } else if (var6.equals("br")) { + var1.append("\n"); + } + + var2 = var4 + 1; + } + } + + if (var2 < var0.length()) { + var1.append(var0.substring(var2, var0.length())); + } + + return var1.toString(); } - @ObfuscatedName("ax") + @ObfuscatedName("is") @ObfuscatedSignature( - descriptor = "(II)Ljm;", - garbageValue = "1014345527" + descriptor = "(Ljava/util/ArrayList;IIIIB)V", + garbageValue = "6" ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; - } else { - var1 = class139.method746(class333.SequenceDefinition_animationsArchive, class169.SequenceDefinition_skeletonsArchive, var0, false); - if (var1 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + static void method836(ArrayList var0, int var1, int var2, int var3, int var4) { + if (!var0.isEmpty()) { + int var5 = (Integer)var0.get(0); + if (var5 == -1 && !Client.playingJingle) { + Script.method445(0, 0); + } else if (var5 != -1 && !class172.method906(var5) && class449.clientPreferences.getCurrentMusicVolume() != 0) { + ArrayList var6 = new ArrayList(); + + for (int var7 = 0; var7 < var0.size(); ++var7) { + var6.add(new MusicSong(class385.archive6, (Integer)var0.get(var7), 0, class449.clientPreferences.getCurrentMusicVolume(), false)); + } + + if (Client.playingJingle) { + class305.field2773.clear(); + class305.field2773.addAll(var6); + class270.method1537(var1, var2, var3, var4); + } else { + class53.method291(var6, var1, var2, var3, var4, false); + } } - return var1; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class158.java b/osrs/src/main/java/class158.java index f44e0d1ac..a20608553 100644 --- a/osrs/src/main/java/class158.java +++ b/osrs/src/main/java/class158.java @@ -1,122 +1,54 @@ -import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ga") +@ObfuscatedName("gd") public class class158 extends class143 { - @ObfuscatedName("wa") - @ObfuscatedSignature( - descriptor = "Lrg;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("am") - static File field1398; - @ObfuscatedName("aw") - long field1402; - @ObfuscatedName("ay") - String field1401; - @ObfuscatedName("ar") - int field1400; + @ObfuscatedName("au") + long field1411; + @ObfuscatedName("ae") + String field1410; + @ObfuscatedName("ao") + int field1409; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class158(class146 var1) { this.this$0 = var1; - this.field1402 = -1L; - this.field1401 = null; - this.field1400 = 0; + this.field1411 = -1L; + this.field1410 = null; + this.field1409 = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { if (var1.readUnsignedByte() != 255) { --var1.offset; - this.field1402 = var1.readLong(); + this.field1411 = var1.readLong(); } - this.field1401 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1400 = var1.readUnsignedShort(); + this.field1410 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1409 = var1.readUnsignedShort(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method808(this.field1402, this.field1401, this.field1400); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Lhg;", - garbageValue = "1969817280" - ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("no") - @ObfuscatedSignature( - descriptor = "(IIIILud;Lmi;I)V", - garbageValue = "-750705418" - ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; - if (var6 > 4225 && var6 < 90000) { - int var7 = Client.camAngleY & 2047; - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; - int var10 = var9 * var2 + var3 * var8 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - double var12 = Math.atan2((double)var10, (double)var11); - int var14 = var5.width / 2 - 25; - int var15 = (int)(Math.sin(var12) * (double)var14); - int var16 = (int)(Math.cos(var12) * (double)var14); - byte var17 = 20; - SoundCache.redHintArrowSprite.method2667(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); - } else { - GameEngine.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); - } - - } - - @ObfuscatedName("nj") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2067489904" - ) - public static boolean method835() { - return Client.staffModLevel >= 2; + var1.method812(this.field1411, this.field1410, this.field1409); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class159.java b/osrs/src/main/java/class159.java index dc18a0211..25c7b94bf 100644 --- a/osrs/src/main/java/class159.java +++ b/osrs/src/main/java/class159.java @@ -2,97 +2,73 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gg") +@ObfuscatedName("gm") public abstract class class159 extends Node { - @ObfuscatedName("ax") - static int[] field1403; + @ObfuscatedName("qw") + @Export("widgetDragDuration") + static int widgetDragDuration; class159() { } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "-43" + descriptor = "(Ltm;B)V", + garbageValue = "1" ) @Export("vmethod3238") abstract void vmethod3238(Buffer var1); - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgh;I)V", - garbageValue = "-2132107044" + descriptor = "(Lgo;I)V", + garbageValue = "831405774" ) - @Export("vmethod3239") abstract void vmethod3239(ClanChannel var1); - @ObfuscatedName("bu") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1889169776" + descriptor = "(II)Ltc;", + garbageValue = "-2141629898" ) - static int method837(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field715 - 7.0D) * 256.0D); - } + @Export("getDbRowType") + public static DbRowType getDbRowType(int var0) { + DbRowType var1 = (DbRowType)DbRowType.DBRowType_cache.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = DbRowType.field4116.takeFile(38, var0); + var1 = new DbRowType(); + if (var2 != null) { + var1.method2508(new Buffer(var2)); + } - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(ILdc;ZB)I", - garbageValue = "43" - ) - static int method838(int var0, Script var1, boolean var2) { - return 2; + var1.method2511(); + DbRowType.DBRowType_cache.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("hy") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-22255" + descriptor = "(IB)Ltk;", + garbageValue = "44" ) - static final void method836() { - FadeOutTask.method2095(); - ArchiveDiskActionHandler.method1849(); - KitDefinition.KitDefinition_cached.clear(); - ObjectComposition.ObjectDefinition_cached.clear(); - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - ObjectComposition.ObjectDefinition_cachedEntities.clear(); - ObjectComposition.ObjectDefinition_cachedModels.clear(); - UserComparator3.method676(); - GrandExchangeOfferOwnWorldComparator.method355(); - class467.method2324(); - InvDefinition.method929(); - VarbitComposition.VarbitDefinition_cached.clear(); - VarpDefinition.VarpDefinition_cached.clear(); - class293.HitSplatDefinition_cachedSprites.method2458(); - class344.HitSplatDefinition_cached.method2458(); - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - class503.method2471(); - class134.method730(); - ParamComposition.ParamDefinition_cached.clear(); - WorldMapElement.WorldMapElement_cachedSprites.clear(); - Message.method347(); - DbRowType.DBRowType_cache.clear(); - Client.Widget_cachedModels.clear(); - Client.Widget_cachedFonts.clear(); - PlayerComposition.PlayerAppearance_cachedModels.clear(); - class59.method322(); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - Client.archive5.method2150(); - class151.field1352.clearFiles(); - TileItem.archive7.clearFiles(); - class253.archive4.clearFiles(); - class149.field1340.clearFiles(); - Canvas.archive9.clearFiles(); - class13.archive6.clearFiles(); - class7.archive11.clearFiles(); - class386.archive8.clearFiles(); - class148.field1335.clearFiles(); - class131.archive10.clearFiles(); - GrandExchangeOfferOwnWorldComparator.field358.clearFiles(); - class126.archive12.clearFiles(); - class176.field1459.clearFiles(); + @Export("getDbTableType") + public static DbTableType getDbTableType(int var0) { + DbTableType var1 = (DbTableType)DbTableType.DBTableType_cache.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = DbTableType.field4110.takeFile(39, var0); + var1 = new DbTableType(); + if (var2 != null) { + var1.method2503(new Buffer(var2)); + } + + var1.method2505(); + DbTableType.DBTableType_cache.put(var1, (long)var0); + return var1; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class16.java b/osrs/src/main/java/class16.java index d750d9b65..68e72cdf9 100644 --- a/osrs/src/main/java/class16.java +++ b/osrs/src/main/java/class16.java @@ -1,29 +1,26 @@ -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.atomic.AtomicInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ae") +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; + +@ObfuscatedName("ag") public class class16 implements ThreadFactory { - @ObfuscatedName("aw") + @ObfuscatedName("au") final ThreadGroup field48; - @ObfuscatedName("ay") + @ObfuscatedName("ae") final AtomicInteger field49; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lar;" ) @Export("this$0") @ObfuscatedName("this$0") final class14 this$0; @ObfuscatedSignature( - descriptor = "(Laa;)V" + descriptor = "(Lar;)V" ) class16(class14 var1) { this.this$0 = var1; @@ -41,29 +38,401 @@ public Thread newThread(Runnable var1) { return var2; } - @ObfuscatedName("aq") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/Date;", - garbageValue = "-1561438911" + descriptor = "(II)I", + garbageValue = "-192145795" ) - static Date method53() throws ParseException { - SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); - var0.setLenient(false); - StringBuilder var1 = new StringBuilder(); - String[] var2 = Login.field767; - - for (int var3 = 0; var3 < var2.length; ++var3) { - String var4 = var2[var3]; - if (var4 == null) { - class328.method1678(7); - Actor.setLoginResponseString("Date not valid.", "Please ensure all characters are populated.", ""); - return null; - } + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; + if (var0 < 0 || var0 >= 65536) { + var0 >>>= 16; + var1 += 16; + } + + if (var0 >= 256) { + var0 >>>= 8; + var1 += 8; + } + + if (var0 >= 16) { + var0 >>>= 4; + var1 += 4; + } + + if (var0 >= 4) { + var0 >>>= 2; + var1 += 2; + } - var1.append(var4); + if (var0 >= 1) { + var0 >>>= 1; + ++var1; } - var1.append("12"); - return var0.parse(var1.toString()); + return var0 + var1; + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(ILdh;ZB)I", + garbageValue = "2" + ) + static int method48(int var0, Script var1, boolean var2) { + if (var0 == 3600) { + if (class299.friendSystem.friendListStatus == 0) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -2; + } else if (class299.friendSystem.friendListStatus == 1) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class299.friendSystem.friendsList.getSize(); + } + + return 1; + } else { + int var3; + if (var0 == 3601) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (class299.friendSystem.method398() && var3 >= 0 && var3 < class299.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)class299.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3602) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (class299.friendSystem.method398() && var3 >= 0 && var3 < class299.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((Buddy)class299.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3603) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (class299.friendSystem.method398() && var3 >= 0 && var3 < class299.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((Buddy)class299.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + String var5; + if (var0 == 3604) { + var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + int var9 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class161.setFriendsRank(var5, var9); + return 1; + } else if (var0 == 3605) { + var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + class299.friendSystem.addFriend(var5); + return 1; + } else if (var0 == 3606) { + var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + class299.friendSystem.removeFriend(var5); + return 1; + } else if (var0 == 3607) { + var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + class299.friendSystem.addIgnore(var5); + return 1; + } else if (var0 == 3608) { + var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + boolean var6 = true; + class299.friendSystem.removeIgnore(var5, var6); + return 1; + } else if (var0 == 3609) { + var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var5 = ObjTypeCustomisation.method936(var5); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class299.friendSystem.isFriended(new Username(var5, Language.loginType), false) ? 1 : 0; + return 1; + } else if (var0 == 3611) { + if (ReflectionCheck.friendsChat != null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ReflectionCheck.friendsChat.name; + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3612) { + if (ReflectionCheck.friendsChat != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ReflectionCheck.friendsChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3613) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize()) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ReflectionCheck.friendsChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3614) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((Buddy)ReflectionCheck.friendsChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3615) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((Buddy)ReflectionCheck.friendsChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3616) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ReflectionCheck.friendsChat != null ? ReflectionCheck.friendsChat.minKick : 0; + return 1; + } else if (var0 == 3617) { + var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + class131.clanKickUser(var5); + return 1; + } else if (var0 == 3618) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ReflectionCheck.friendsChat != null ? ReflectionCheck.friendsChat.rank * 1868713607 * 106239799 : 0; + return 1; + } else if (var0 == 3619) { + var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + UrlRequester.Clan_joinChat(var5); + return 1; + } else if (var0 == 3620) { + Player.Clan_leaveChat(); + return 1; + } else if (var0 == 3621) { + if (!class299.friendSystem.method398()) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class299.friendSystem.ignoreList.getSize(); + } + + return 1; + } else if (var0 == 3622) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (class299.friendSystem.method398() && var3 >= 0 && var3 < class299.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)class299.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3623) { + var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var5 = ObjTypeCustomisation.method936(var5); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class299.friendSystem.isIgnored(new Username(var5, Language.loginType)) ? 1 : 0; + return 1; + } else if (var0 == 3624) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize() && ReflectionCheck.friendsChat.get(var3).getUsername().equals(VarbitComposition.localPlayer.username)) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3625) { + if (ReflectionCheck.friendsChat != null && ReflectionCheck.friendsChat.owner != null) { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ReflectionCheck.friendsChat.owner; + } else { + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3626) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize() && ((ClanMate)ReflectionCheck.friendsChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 != 3627) { + if (var0 == 3628) { + class299.friendSystem.friendsList.removeComparator(); + return 1; + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } else if (var0 == 3639) { + class299.friendSystem.friendsList.sort(); + return 1; + } else if (var0 == 3640) { + class299.friendSystem.ignoreList.removeComparator(); + return 1; + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3643) { + class299.friendSystem.ignoreList.sort(); + return 1; + } else if (var0 == 3644) { + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.removeComparator(); + } + + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } else if (var0 == 3655) { + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.sort(); + } + + return 1; + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class299.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (ReflectionCheck.friendsChat != null) { + ReflectionCheck.friendsChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize() && ((ClanMate)ReflectionCheck.friendsChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class160.java b/osrs/src/main/java/class160.java index 0913fe035..36772dad9 100644 --- a/osrs/src/main/java/class160.java +++ b/osrs/src/main/java/class160.java @@ -1,35 +1,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +import java.util.Arrays; + +@ObfuscatedName("gg") public class class160 { - @ObfuscatedName("aw") - long field1404; - @ObfuscatedName("ay") - long field1405; - @ObfuscatedName("ar") + @ObfuscatedName("au") + long field1413; + @ObfuscatedName("ae") + public long field1415; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Loc;" ) - IterableNodeDeque field1406; + IterableNodeDeque field1414; @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) public class160(Buffer var1) { - this.field1405 = -1L; - this.field1406 = new IterableNodeDeque(); - this.method841(var1); + this.field1415 = -1L; + this.field1414 = new IterableNodeDeque(); + this.method843(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "-1382103151" + descriptor = "(Ltm;I)V", + garbageValue = "-2067216516" ) - void method841(Buffer var1) { - this.field1404 = var1.readLong(); - this.field1405 = var1.readLong(); + void method843(Buffer var1) { + this.field1413 = var1.readLong(); + this.field1415 = var1.readLong(); for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { Object var3; @@ -50,25 +52,81 @@ void method841(Buffer var1) { } ((class159)var3).vmethod3238(var1); - this.field1406.addFirst((Node)var3); + this.field1414.addFirst((Node)var3); } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgh;I)V", - garbageValue = "1629184454" + descriptor = "(Lgo;B)V", + garbageValue = "-40" ) - public void method842(ClanChannel var1) { - if (this.field1404 == var1.key && this.field1405 == var1.field1414) { - for (class159 var2 = (class159)this.field1406.last(); var2 != null; var2 = (class159)this.field1406.previous()) { + public void method844(ClanChannel var1) { + if (var1.key == this.field1413 && var1.field1429 == this.field1415) { + for (class159 var2 = (class159)this.field1414.last(); var2 != null; var2 = (class159)this.field1414.previous()) { var2.vmethod3239(var1); } - ++var1.field1414; + ++var1.field1429; } else { throw new RuntimeException(""); } } -} + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "([FI)V", + garbageValue = "-753212760" + ) + static void method845(float[] var0) { + var0[1] = 1.0F - var0[1]; + if (var0[0] < 0.0F) { + var0[0] = 0.0F; + } + + if (var0[1] < 0.0F) { + var0[1] = 0.0F; + } + + if (var0[0] > 1.0F || var0[1] > 1.0F) { + float var1 = (float)(1.0D + (double)(var0[0] * (var0[0] - 2.0F + var0[1])) + ((double)var0[1] - 2.0D) * (double)var0[1]); + if (var1 + class126.field1204 > 0.0F) { + if (class126.field1204 + var0[0] < 1.3333334F) { + float var2 = var0[0] - 2.0F; + float var3 = var0[0] - 1.0F; + float var4 = (float)Math.sqrt((double)(var2 * var2 - 4.0F * var3 * var3)); + float var5 = 0.5F * (var4 + -var2); + if (var0[1] + class126.field1204 > var5) { + var0[1] = var5 - class126.field1204; + } else { + var5 = (-var2 - var4) * 0.5F; + if (var0[1] < var5 + class126.field1204) { + var0[1] = class126.field1204 + var5; + } + } + } else { + var0[0] = 1.3333334F - class126.field1204; + var0[1] = 0.33333334F - class126.field1204; + } + } + } + + var0[1] = 1.0F - var0[1]; + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(Lmi;Lmt;ZB)V", + garbageValue = "0" + ) + public static void method846(Widget var0, PlayerComposition var1, boolean var2) { + var0.modelType = 7; + var0.field3101 = new PlayerComposition(var1); + if (!var2) { + var0.field3101.equipment = Arrays.copyOf(var0.field3101.field2913, var0.field3101.field2913.length); + var0.field3101.method1729(); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class161.java b/osrs/src/main/java/class161.java index ec2128f85..77485f667 100644 --- a/osrs/src/main/java/class161.java +++ b/osrs/src/main/java/class161.java @@ -2,45 +2,143 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gw") public class class161 extends class143 { - @ObfuscatedName("aw") - int field1407; - @ObfuscatedName("ay") - int field1408; + @ObfuscatedName("au") + int field1417; + @ObfuscatedName("ae") + int field1416; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class161(class146 var1) { this.this$0 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1407 = var1.readInt(); - this.field1408 = var1.readInt(); + this.field1417 = var1.readInt(); + this.field1416 = var1.readInt(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method818(this.field1407, this.field1408); + var1.method821(this.field1417, this.field1416); } -} + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "-577871422" + ) + @Export("setFriendsRank") + static final void setFriendsRank(String var0, int var1) { + PacketBufferNode var2 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.FRIEND_SETRANK, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var0) + 1); + var2.packetBuffer.writeByte(var1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var2); + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "-1877408335" + ) + static int method850(int var0, Script var1, boolean var2) { + if (var0 == 5306) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class218.getWindowedMode(); + return 1; + } else { + int var3; + if (var0 == 5307) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + class270.setWindowedMode(var3); + } + + return 1; + } else if (var0 == 5308) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class449.clientPreferences.method566(); + return 1; + } else if (var0 != 5309) { + if (var0 == 5310) { + --SoundCache.Interpreter_intStackSize; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + class449.clientPreferences.method565(var3); + } + + return 1; + } + } + } + + @ObfuscatedName("od") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "229621192" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); + short[] var2 = new short[16]; + int var3 = 0; + + for (int var4 = 0; var4 < HealthBar.ItemDefinition_fileCount; ++var4) { + ItemComposition var5 = InvDefinition.ItemDefinition_get(var4); + if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + class28.foundItemIdCount = -1; + class156.foundItemIds = null; + return; + } + + if (var3 >= var2.length) { + short[] var6 = new short[var2.length * 2]; + + for (int var7 = 0; var7 < var3; ++var7) { + var6[var7] = var2[var7]; + } + + var2 = var6; + } + + var2[var3++] = (short)var4; + } + } + + class156.foundItemIds = var2; + class372.foundItemIndex = 0; + class28.foundItemIdCount = var3; + String[] var8 = new String[class28.foundItemIdCount]; + + for (int var9 = 0; var9 < class28.foundItemIdCount; ++var9) { + var8[var9] = InvDefinition.ItemDefinition_get(var2[var9]).name; + } + + short[] var10 = class156.foundItemIds; + FriendSystem.sortItemsByName(var8, var10, 0, var8.length - 1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class162.java b/osrs/src/main/java/class162.java index 368ca0003..d09e838b7 100644 --- a/osrs/src/main/java/class162.java +++ b/osrs/src/main/java/class162.java @@ -1,63 +1,69 @@ -import java.util.ArrayList; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("go") +@ObfuscatedName("gi") public class class162 extends class143 { - @ObfuscatedName("aw") - int field1409; + @ObfuscatedName("aa") + static int[][] field1419; + @ObfuscatedName("qv") + @ObfuscatedSignature( + descriptor = "[Lmi;" + ) + static Widget[] field1420; + @ObfuscatedName("tm") + @ObfuscatedSignature( + descriptor = "Lbl;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("au") + int field1421; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class162(class146 var1) { this.this$0 = var1; - this.field1409 = -1; + this.field1421 = -1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1409 = var1.readUnsignedShort(); + this.field1421 = var1.readUnsignedShort(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method814(this.field1409); + var1.method818(this.field1421); } - @ObfuscatedName("ah") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(B)Ljava/util/ArrayList;", - garbageValue = "1" + descriptor = "(ILmc;ZI)V", + garbageValue = "-1867605195" ) - static ArrayList method847() { - ArrayList var0 = new ArrayList(); - Iterator var1 = class306.musicSongs.iterator(); - - while (var1.hasNext()) { - MusicSong var2 = (MusicSong)var1.next(); - var0.add(var2); - } - - return var0; + static void method854(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = class227.getWorldMap().getMapArea(var0); + int var4 = VarbitComposition.localPlayer.plane; + int var5 = (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX; + int var6 = (VarbitComposition.localPlayer.y >> 7) + class47.baseY; + Coord var7 = new Coord(var4, var5, var6); + class227.getWorldMap().method2400(var3, var7, var1, var2); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class164.java b/osrs/src/main/java/class164.java index 0f0f7c883..e06e2dcf8 100644 --- a/osrs/src/main/java/class164.java +++ b/osrs/src/main/java/class164.java @@ -2,114 +2,68 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("gl") public class class164 { - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltc;S)V", - garbageValue = "15572" + descriptor = "([BI)[I", + garbageValue = "2043897954" ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = class136.localPlayer = Client.players[var1] = new Player(); - var2.index = var1; - int var3 = var0.readBits(30); - byte var4 = (byte)(var3 >> 28); - int var5 = var3 >> 14 & 16383; - int var6 = var3 & 16383; - var2.pathX[0] = var5 - AbstractArchive.baseX; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - class148.baseY; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - class36.Client_plane = var2.plane = var4; - if (Players.cachedAppearanceBuffer[var1] != null) { - var2.read(Players.cachedAppearanceBuffer[var1]); - } + public static int[] method863(byte[] var0) { + if (var0 != null && var0.length != 0 && var0.length <= 8) { + int[] var1 = new int[var0.length]; - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.activityFlags[var1] = 0; - Players.Players_emptyIdxCount = 0; + for (int var2 = 0; var2 < var0.length; ++var2) { + if (var0[var2] < 0 || var0[var2] > class538.field4284.length) { + return null; + } - for (int var7 = 1; var7 < 2048; ++var7) { - if (var7 != var1) { - int var8 = var0.readBits(18); - int var9 = var8 >> 16; - int var10 = var8 >> 8 & 597; - int var11 = var8 & 597; - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); - Players.Players_orientations[var7] = 0; - Players.Players_targetIndices[var7] = -1; - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; - Players.activityFlags[var7] = 0; + var1[var2] = class538.field4284[var0[var2]]; } - } - var0.exportIndex(); + return var1; + } else { + return null; + } } - @ObfuscatedName("ay") + @ObfuscatedName("in") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1762704908" - ) - static void method859() { - Tiles.Tiles_underlays = null; - Tiles.Tiles_overlays = null; - class19.Tiles_shapes = null; - UserComparator10.field1180 = null; - BufferedNetSocket.field3806 = null; - InvDefinition.field1488 = null; - class135.field1283 = null; - class172.Tiles_hue = null; - GameBuild.Tiles_saturation = null; - Tiles.Tiles_lightness = null; - Language.Tiles_hueMultiplier = null; - class159.field1403 = null; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "34" + garbageValue = "-1654219145" ) - public static void method858(int var0, int var1) { - VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); - VarbitComposition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); - var3 = new VarbitComposition(); - if (var4 != null) { - var3.decode(new Buffer(var4)); - } - - VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); - var2 = var3; + static final void method864() { + if (Client.field538 != HealthBar.Client_plane) { + Client.field538 = HealthBar.Client_plane; + class17.method50(HealthBar.Client_plane); } - int var8 = var2.baseVar; - int var5 = var2.startBit; - int var6 = var2.endBit; - int var7 = Varps.Varps_masks[var6 - var5]; - if (var1 < 0 || var1 > var7) { - var1 = 0; - } - - var7 <<= var5; - Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; } - @ObfuscatedName("aq") + @ObfuscatedName("mq") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "80" + descriptor = "(IIIIII)V", + garbageValue = "1697845802" ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + GrandExchangeOfferOwnWorldComparator.scrollBarSprites[0].drawAt(var0, var1); + GrandExchangeOfferOwnWorldComparator.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field462); + int var5 = var3 * (var3 - 32) / var4; + if (var5 < 8) { + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field463); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field460); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field460); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field460); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field460); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field459); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field459); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field459); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field459); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class165.java b/osrs/src/main/java/class165.java index f4fd95c1e..37a5b3b7e 100644 --- a/osrs/src/main/java/class165.java +++ b/osrs/src/main/java/class165.java @@ -2,72 +2,93 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") +import java.io.File; +import java.io.IOException; + +@ObfuscatedName("gb") public class class165 extends class143 { - @ObfuscatedName("uq") - static int field1420; + @ObfuscatedName("au") + long field1431; @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lds;" - ) - static LoginScreenAnimation field1419; - @ObfuscatedName("aw") - long field1422; - @ObfuscatedName("ay") - String field1421; + String field1430; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class165(class146 var1) { this.this$0 = var1; - this.field1422 = -1L; - this.field1421 = null; + this.field1431 = -1L; + this.field1430 = null; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { if (var1.readUnsignedByte() != 255) { --var1.offset; - this.field1422 = var1.readLong(); + this.field1431 = var1.readLong(); } - this.field1421 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1430 = var1.readStringCp1252NullTerminatedOrNull(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method811(this.field1422, this.field1421); + var1.method815(this.field1431, this.field1430); } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfm;FI)F", - garbageValue = "-655918907" + descriptor = "(Ljava/io/File;Ljava/io/File;I)V", + garbageValue = "1715361402" ) - static float method863(class130 var0, float var1) { - if (var0 == null) { - return 0.0F; - } else { - float var2 = var1 - var0.field1234; - return (var0.field1239 + (var0.field1242 * var2 + var0.field1238) * var2) * var2 + var0.field1240; + static void method868(File var0, File var1) { + try { + AccessFile var2 = new AccessFile(JagexCache.field1463, "rw", 10000L); + Buffer var3 = new Buffer(500); + var3.writeByte(3); + var3.writeByte(var1 != null ? 1 : 0); + var3.writeCESU8(var0.getPath()); + if (var1 != null) { + var3.writeCESU8(""); + } + + var2.write(var3.array, 0, var3.offset); + var2.close(); + } catch (IOException var4) { + var4.printStackTrace(); } + + } + + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "97" + ) + static final void method869() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.endCycle == -1) { + var0.startCycle = 0; + PacketWriter.method646(var0); + } else { + var0.remove(); + } + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class166.java b/osrs/src/main/java/class166.java index 7cc5e2589..b83ea866b 100644 --- a/osrs/src/main/java/class166.java +++ b/osrs/src/main/java/class166.java @@ -2,107 +2,55 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("gj") public class class166 extends class159 { - @ObfuscatedName("aw") - String field1425; - @ObfuscatedName("ay") - byte field1424; - @ObfuscatedName("ar") - byte field1423; + @ObfuscatedName("au") + String field1434; + @ObfuscatedName("ae") + byte field1432; + @ObfuscatedName("ao") + byte field1433; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgg;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class160 this$0; @ObfuscatedSignature( - descriptor = "(Lgs;)V" + descriptor = "(Lgg;)V" ) class166(class160 var1) { this.this$0 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "-43" + descriptor = "(Ltm;B)V", + garbageValue = "1" ) @Export("vmethod3238") void vmethod3238(Buffer var1) { - this.field1425 = var1.readStringCp1252NullTerminatedOrNull(); - if (this.field1425 != null) { + this.field1434 = var1.readStringCp1252NullTerminatedOrNull(); + if (this.field1434 != null) { var1.readUnsignedByte(); - this.field1424 = var1.readByte(); - this.field1423 = var1.readByte(); + this.field1432 = var1.readByte(); + this.field1433 = var1.readByte(); } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgh;I)V", - garbageValue = "-2132107044" + descriptor = "(Lgo;I)V", + garbageValue = "831405774" ) @Export("vmethod3239") void vmethod3239(ClanChannel var1) { - var1.name = this.field1425; - if (this.field1425 != null) { - var1.field1415 = this.field1424; - var1.field1416 = this.field1423; + var1.name = this.field1434; + if (this.field1434 != null) { + var1.field1426 = this.field1432; + var1.field1425 = this.field1433; } } - - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "(Lmt;III)V", - garbageValue = "1063442013" - ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class28.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.getSpriteMask(true); - if (var3 == null) { - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if (var3.contains(var4, var5)) { - var4 -= var3.width / 2; - var5 -= var3.height / 2; - int var6 = Client.camAngleY & 2047; - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var9 = var5 * var7 + var4 * var8 >> 11; - int var10 = var8 * var5 - var4 * var7 >> 11; - int var11 = var9 + class136.localPlayer.x >> 7; - int var12 = class136.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = class503.getPacketBufferNode(ClientPacket.MOVE_MINIMAPCLICK, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.writeShort(var11 + AbstractArchive.baseX); - var13.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? (Client.keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); - var13.packetBuffer.writeShortLE(var12 + class148.baseY); - var13.packetBuffer.writeByte(var4); - var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.camAngleY); - var13.packetBuffer.writeByte(57); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(89); - var13.packetBuffer.writeShort(class136.localPlayer.x); - var13.packetBuffer.writeShort(class136.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } - } - - } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class167.java b/osrs/src/main/java/class167.java index 75fe88062..ec2fd67ef 100644 --- a/osrs/src/main/java/class167.java +++ b/osrs/src/main/java/class167.java @@ -2,248 +2,75 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("ge") public class class167 extends class143 { - @ObfuscatedName("aw") - int field1426; - @ObfuscatedName("ay") - long field1427; + @ObfuscatedName("ai") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "Lui;" + ) + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; + @ObfuscatedName("au") + int field1437; + @ObfuscatedName("ae") + long field1438; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class146 this$0; @ObfuscatedSignature( - descriptor = "(Lfr;)V" + descriptor = "(Lfn;)V" ) class167(class146 var1) { this.this$0 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "1" + descriptor = "(Ltm;I)V", + garbageValue = "209179459" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1426 = var1.readInt(); - this.field1427 = var1.readLong(); + this.field1437 = var1.readInt(); + this.field1438 = var1.readLong(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfx;B)V", - garbageValue = "-72" + descriptor = "(Lfi;B)V", + garbageValue = "73" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method820(this.field1426, this.field1427); + var1.method823(this.field1437, this.field1438); } - @ObfuscatedName("bz") + @ObfuscatedName("jq") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-279174882" + descriptor = "(I)V", + garbageValue = "769198964" ) - static int method869(int var0, Script var1, boolean var2) { - if (var0 == 6500) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = DynamicObject.loadWorlds() ? 1 : 0; - return 1; - } else { - World var3; - if (var0 == 6501) { - var3 = PcmPlayer.worldListStart(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 6502) { - var3 = class419.getNextWorldListWorld(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else { - World var4; - int var5; - int var7; - if (var0 == 6506) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = null; - - for (var5 = 0; var5 < World.World_count; ++var5) { - if (var7 == class387.World_worlds[var5].id) { - var4 = class387.World_worlds[var5]; - break; - } - } - - if (var4 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 6507) { - Interpreter.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; - WorldMapScaleHandler.sortWorldList(var7, var10, var5, var6); - return 1; - } else if (var0 != 6511) { - if (var0 == 6512) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; + static final void method874() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var0.plane == HealthBar.Client_plane && !var0.isFinished) { + if (Client.cycle >= var0.cycleStart) { + var0.advance(Client.field457); + if (var0.isFinished) { + var0.remove(); } else { - int var8; - ParamComposition var9; - if (var0 == 6513) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = MusicPatchNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Tile.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tile.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6514) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = MusicPatchNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class90.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class90.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6515) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = MusicPatchNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class125.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class125.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6516) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = MusicPatchNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class219.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class219.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6518) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == 6519) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType; - return 1; - } else if (var0 == 6520) { - return 1; - } else if (var0 == 6521) { - return 1; - } else if (var0 == 6522) { - --Interpreter.Interpreter_stringStackSize; - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --Interpreter.Interpreter_stringStackSize; - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 6524) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 6525) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == 6526) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == 6527) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field421; - return 1; - } else { - return 2; - } + class130.scene.drawEntity(var0.plane, var0.x, var0.y, var0.z, 60, var0, 0, -1L, false); } - } else { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var7 >= 0 && var7 < World.World_count) { - var4 = class387.World_worlds[var7]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; } + } else { + var0.remove(); } } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class169.java b/osrs/src/main/java/class169.java index 5ece6e902..f4db7a763 100644 --- a/osrs/src/main/java/class169.java +++ b/osrs/src/main/java/class169.java @@ -2,50 +2,191 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") +@ObfuscatedName("gv") public class class169 extends class181 { - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("SequenceDefinition_skeletonsArchive") - static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("aw") - String field1430; + @ObfuscatedName("au") + String field1440; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lgf;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class170 this$0; @ObfuscatedSignature( - descriptor = "(Lgq;Ljava/lang/String;Ljava/lang/String;)V" + descriptor = "(Lgf;Ljava/lang/String;Ljava/lang/String;)V" ) class169(class170 var1, String var2, String var3) { super(var1, var2); this.this$0 = var1; - this.field1430 = var3; + this.field1440 = var3; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-14721" + descriptor = "(B)I", + garbageValue = "38" ) @Export("vmethod3379") public int vmethod3379() { return 1; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-768896166" + garbageValue = "1557827941" ) @Export("vmethod3380") public String vmethod3380() { - return this.field1430; + return this.field1440; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "-866561565" + ) + static int method879(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + } else { + var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + } + + String var4 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]) { + } + } + + var4 = var4.substring(0, var4.length() - 1); + } + + Object[] var9 = new Object[var4.length() + 1]; + + int var7; + for (var7 = var9.length - 1; var7 >= 1; --var7) { + if (var4.charAt(var7 - 1) == 's') { + var9[var7] = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + } else { + var9[var7] = new Integer(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + } + } + + var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var7 != -1) { + var9[0] = new Integer(var7); + } else { + var9 = null; + } + + if (var0 == 1400) { + var3.onClick = var9; + } else if (var0 == 1401) { + var3.onHold = var9; + } else if (var0 == 1402) { + var3.onRelease = var9; + } else if (var0 == 1403) { + var3.onMouseOver = var9; + } else if (var0 == 1404) { + var3.onMouseLeave = var9; + } else if (var0 == 1405) { + var3.onDrag = var9; + } else if (var0 == 1406) { + var3.onTargetLeave = var9; + } else if (var0 == 1407) { + var3.onVarTransmit = var9; + var3.varTransmitTriggers = var5; + } else if (var0 == 1408) { + var3.onTimer = var9; + } else if (var0 == 1409) { + var3.onOp = var9; + } else if (var0 == 1410) { + var3.onDragComplete = var9; + } else if (var0 == 1411) { + var3.onClickRepeat = var9; + } else if (var0 == 1412) { + var3.onMouseRepeat = var9; + } else if (var0 == 1414) { + var3.onInvTransmit = var9; + var3.invTransmitTriggers = var5; + } else if (var0 == 1415) { + var3.onStatTransmit = var9; + var3.statTransmitTriggers = var5; + } else if (var0 == 1416) { + var3.onTargetEnter = var9; + } else if (var0 == 1417) { + var3.onScroll = var9; + } else if (var0 == 1418) { + var3.onChatTransmit = var9; + } else if (var0 == 1419) { + var3.onKey = var9; + } else if (var0 == 1420) { + var3.onFriendTransmit = var9; + } else if (var0 == 1421) { + var3.onClanTransmit = var9; + } else if (var0 == 1422) { + var3.onMiscTransmit = var9; + } else if (var0 == 1423) { + var3.onDialogAbort = var9; + } else if (var0 == 1424) { + var3.onSubChange = var9; + } else if (var0 == 1425) { + var3.onStockTransmit = var9; + } else if (var0 == 1426) { + var3.field3081 = var9; + } else if (var0 == 1427) { + var3.onResize = var9; + } else if (var0 == 1428) { + var3.field3082 = var9; + } else if (var0 == 1429) { + var3.field3090 = var9; + } else if (var0 == 1430) { + var3.field3089 = var9; + } else if (var0 == 1431) { + var3.field3079 = var9; + } else if (var0 == 1434) { + var3.field3088 = var9; + } else if (var0 == 1435) { + var3.field3076 = var9; + } else { + if (var0 < 1436 || var0 > 1439) { + return 2; + } + + class327 var8 = var3.method1847(); + if (var8 != null) { + if (var0 == 1436) { + var8.field2898 = var9; + } else if (var0 == 1437) { + var8.field2899 = var9; + } else if (var0 == 1438) { + var8.field2901 = var9; + } else if (var0 == 1439) { + var8.field2900 = var9; + } + } + } + + var3.hasListener = true; + return 1; + } + + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(Lib;IIII)V", + garbageValue = "1647034458" + ) + static void method880(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class449.clientPreferences.getAreaSoundEffectsVolume() != 0) { + if (var0.animMayaFrameSounds != null && var0.animMayaFrameSounds.containsKey(var1)) { + MouseHandler.method172((Integer)var0.animMayaFrameSounds.get(var1), var2, var3); + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class17.java b/osrs/src/main/java/class17.java index 11a43dd70..ff1ba2089 100644 --- a/osrs/src/main/java/class17.java +++ b/osrs/src/main/java/class17.java @@ -1,31 +1,26 @@ -import java.security.Principal; -import java.security.cert.Certificate; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + import javax.net.ssl.SSLPeerUnverifiedException; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSessionContext; import javax.security.cert.X509Certificate; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; +import java.security.Principal; +import java.security.cert.Certificate; -@ObfuscatedName("ab") +@ObfuscatedName("am") class class17 implements SSLSession { - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "[Lud;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lah;" + descriptor = "Lal;" ) @Export("this$1") @ObfuscatedName("this$1") final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lah;)V" + descriptor = "(Lal;)V" ) class17(class12 var1) { this.this$1 = var1; @@ -70,7 +65,7 @@ public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedExcep } public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { - return this.this$1.field38; + return this.this$1.field39; } public String getPeerHost() { @@ -129,81 +124,104 @@ public void removeValue(String var1) { throw new UnsupportedOperationException(); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(BI)C", - garbageValue = "-1891531706" + descriptor = "(IIIII)V", + garbageValue = "-1689168407" ) - public static char method54(byte var0) { - int var1 = var0 & 255; - if (var1 == 0) { - throw new IllegalArgumentException("" + Integer.toString(var1, 16)); - } else { - if (var1 >= 128 && var1 < 160) { - char var2 = class385.cp1252AsciiExtension[var1 - 128]; - if (var2 == 0) { - var2 = '?'; + static final void method49(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { + for (int var5 = var0; var5 <= var0 + var2; ++var5) { + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { + MoveSpeed.field1924[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } + + if (var0 + var2 == var5 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } + + if (var4 == var1 && var4 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } + + if (var3 + var1 == var4 && var4 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } } - - var1 = var2; } - - return (char)var1; } + } - @ObfuscatedName("ia") + @ObfuscatedName("ko") @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "-16459" + descriptor = "(II)V", + garbageValue = "-1087980755" ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (class150.clientPreferences.getCurrentSoundEffectsVolume() != 0 && var1 != 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var0; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = 0; - ++Client.soundEffectCount; + static final void method50(int var0) { + int[] var1 = AbstractUserComparator.sceneMinimapSprite.pixels; + int var2 = var1.length; + + int var3; + for (var3 = 0; var3 < var2; ++var3) { + var1[var3] = 0; } - } + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { + var4 = (103 - var3) * 2048 + 24628; - @ObfuscatedName("lc") - @ObfuscatedSignature( - descriptor = "(Lmt;III)V", - garbageValue = "232159402" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { - var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + for (var5 = 1; var5 < 103; ++var5) { + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { + class130.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { + class130.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; + } } - if (var0.yAlignment == 0) { - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; - } else if (var0.yAlignment == 4) { - var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; + AbstractUserComparator.sceneMinimapSprite.setRaster(); + + int var6; + for (var5 = 1; var5 < 103; ++var5) { + for (var6 = 1; var6 < 103; ++var6) { + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { + class102.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { + class102.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; + + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + long var7 = class130.scene.getFloorDecorationTag(HealthBar.Client_plane, var5, var6); + if (0L != var7) { + int var9 = InvDefinition.Entity_unpackID(var7); + int var10 = WorldMapElement.getObjectDefinition(var9).mapIconId; + if (var10 >= 0 && class138.WorldMapElement_get(var10).field1518) { + Client.mapIcons[Client.mapIconCount] = class138.WorldMapElement_get(var10).getSpriteBool(false); + Client.mapIconXs[Client.mapIconCount] = var5; + Client.mapIconYs[Client.mapIconCount] = var6; + ++Client.mapIconCount; + } + } + } } + AttackOption.rasterProvider.apply(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class170.java b/osrs/src/main/java/class170.java index 557e7038b..bf0e57913 100644 --- a/osrs/src/main/java/class170.java +++ b/osrs/src/main/java/class170.java @@ -1,3 +1,9 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; @@ -5,70 +11,64 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("gf") public class class170 { - @ObfuscatedName("ja") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("av") - int field1434; - @ObfuscatedName("ap") - String field1435; - @ObfuscatedName("aq") + @ObfuscatedName("aa") + int field1443; + @ObfuscatedName("af") + String field1444; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lei;" + descriptor = "Let;" ) - UrlRequest field1432; - @ObfuscatedName("at") - String field1436; - @ObfuscatedName("ah") - float[] field1433; - @ObfuscatedName("ax") - ArrayList field1439; - @ObfuscatedName("aa") - ArrayList field1437; - @ObfuscatedName("au") - ArrayList field1438; - @ObfuscatedName("ae") - Map field1441; + UrlRequest field1441; + @ObfuscatedName("aq") + String field1445; + @ObfuscatedName("al") + float[] field1442; + @ObfuscatedName("an") + ArrayList field1447; + @ObfuscatedName("ar") + ArrayList field1448; @ObfuscatedName("ab") - Map field1440; + ArrayList field1446; + @ObfuscatedName("ag") + Map field1449; + @ObfuscatedName("am") + Map field1450; public class170() { - this.field1434 = -1; - this.field1436 = null; - this.field1433 = new float[4]; - this.field1439 = new ArrayList(); - this.field1437 = new ArrayList(); - this.field1438 = new ArrayList(); - this.field1441 = new HashMap(); - this.field1440 = new HashMap(); + this.field1443 = -1; + this.field1445 = null; + this.field1442 = new float[4]; + this.field1447 = new ArrayList(); + this.field1448 = new ArrayList(); + this.field1446 = new ArrayList(); + this.field1449 = new HashMap(); + this.field1450 = new HashMap(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lej;B)Z", - garbageValue = "-55" + descriptor = "(Ljava/lang/String;Lev;I)Z", + garbageValue = "-117070837" ) - public boolean method875(String var1, UrlRequester var2) { + public boolean method881(String var1, UrlRequester var2) { if (var1 != null && !var1.isEmpty()) { if (var2 == null) { return false; } else { - this.method885(); + this.method891(); try { - this.field1435 = var1; - this.field1432 = var2.request(new URL(this.field1435)); - this.field1434 = 0; + this.field1444 = var1; + this.field1441 = var2.request(new URL(this.field1444)); + this.field1443 = 0; return true; } catch (MalformedURLException var4) { - this.method885(); - this.field1434 = 100; + this.method891(); + this.field1443 = 100; return false; } } @@ -77,18 +77,18 @@ public boolean method875(String var1, UrlRequester var2) { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lej;B)V", - garbageValue = "88" + descriptor = "(Lev;I)V", + garbageValue = "-1262385396" ) - public void method876(UrlRequester var1) { - switch(this.field1434) { + public void method882(UrlRequester var1) { + switch(this.field1443) { case 0: - this.method886(var1); + this.method892(var1); break; case 1: - this.method887(); + this.method893(); break; default: return; @@ -96,171 +96,171 @@ public void method876(UrlRequester var1) { } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1160046533" + garbageValue = "1206059947" ) - public int method877() { - return this.field1434; + public int method883() { + return this.field1443; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "212756708" + garbageValue = "-63404292" ) - public int method878(String var1) { - return this.field1441.containsKey(var1) ? (Integer)this.field1441.get(var1) : -1; + public int method884(String var1) { + return this.field1449.containsKey(var1) ? (Integer)this.field1449.get(var1) : -1; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "103576370" + garbageValue = "-1647715363" ) - public String method879(String var1) { - return (String)((String)(this.field1440.containsKey(var1) ? this.field1440.get(var1) : null)); + public String method885(String var1) { + return (String)((String)(this.field1450.containsKey(var1) ? this.field1450.get(var1) : null)); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/ArrayList;", - garbageValue = "494222917" + descriptor = "(B)Ljava/util/ArrayList;", + garbageValue = "-87" ) - public ArrayList method880() { - return this.field1437; + public ArrayList method886() { + return this.field1448; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(B)Ljava/util/ArrayList;", - garbageValue = "35" + garbageValue = "88" ) - public ArrayList method881() { - return this.field1438; + public ArrayList method887() { + return this.field1446; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "120" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1756409477" ) - public String method882() { - return this.field1436; + public String method888() { + return this.field1445; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)[F", - garbageValue = "1926620523" + garbageValue = "-2115403959" ) - public float[] method883() { - return this.field1433; + public float[] method889() { + return this.field1442; } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(B)Ljava/util/ArrayList;", - garbageValue = "88" + garbageValue = "-78" ) - public ArrayList method884() { - return this.field1439; + public ArrayList method890() { + return this.field1447; } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "500" + descriptor = "(B)V", + garbageValue = "22" ) - void method885() { - this.field1432 = null; - this.field1436 = null; - this.field1433[0] = 0.0F; - this.field1433[1] = 0.0F; - this.field1433[2] = 1.0F; - this.field1433[3] = 1.0F; - this.field1439.clear(); - this.field1437.clear(); - this.field1438.clear(); - this.field1441.clear(); - this.field1440.clear(); + void method891() { + this.field1441 = null; + this.field1445 = null; + this.field1442[0] = 0.0F; + this.field1442[1] = 0.0F; + this.field1442[2] = 1.0F; + this.field1442[3] = 1.0F; + this.field1447.clear(); + this.field1448.clear(); + this.field1446.clear(); + this.field1449.clear(); + this.field1450.clear(); } - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lej;B)V", - garbageValue = "0" + descriptor = "(Lev;B)V", + garbageValue = "-76" ) - void method886(UrlRequester var1) { - if (this.field1432 != null && this.field1432.isDone()) { - byte[] var2 = this.field1432.getResponse(); + void method892(UrlRequester var1) { + if (this.field1441 != null && this.field1441.isDone()) { + byte[] var2 = this.field1441.getResponse(); if (var2 == null) { - this.method885(); - this.field1434 = 100; + this.method891(); + this.field1443 = 100; } else { try { - this.method892(new class463(var2), var1); + this.method898(new class462(var2), var1); } catch (UnsupportedEncodingException var4) { - this.method885(); - this.field1434 = 102; + this.method891(); + this.field1443 = 102; return; } - this.field1434 = this.field1437.size() > 0 ? 1 : 2; - this.field1432 = null; + this.field1443 = this.field1448.size() > 0 ? 1 : 2; + this.field1441 = null; } } } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "706475225" + garbageValue = "-2026180069" ) - void method887() { - Iterator var1 = this.field1437.iterator(); + void method893() { + Iterator var1 = this.field1448.iterator(); class176 var2; do { if (!var1.hasNext()) { - var1 = this.field1437.iterator(); + var1 = this.field1448.iterator(); while (var1.hasNext()) { var2 = (class176)var1.next(); - if (var2.field1460 != null) { - byte[] var3 = var2.field1460.getResponse(); + if (var2.field1469 != null) { + byte[] var3 = var2.field1469.getResponse(); if (var3 != null && var3.length > 0) { - this.field1434 = 2; + this.field1443 = 2; return; } } } - this.method885(); - this.field1434 = 101; + this.method891(); + this.field1443 = 101; return; } var2 = (class176)var1.next(); - } while(var2.field1460 == null || var2.field1460.isDone()); + } while(var2.field1469 == null || var2.field1469.isDone()); } - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONArray;Lej;I)V", - garbageValue = "-506183299" + descriptor = "(Lorg/json/JSONArray;Lev;B)V", + garbageValue = "-22" ) - void method888(JSONArray var1, UrlRequester var2) throws JSONException { + void method894(JSONArray var1, UrlRequester var2) throws JSONException { if (var1 != null) { for (int var3 = 0; var3 < var1.length(); ++var3) { try { JSONObject var4 = var1.getJSONObject(var3); class176 var5 = new class176(this); - var5.field1460 = var2.request(new URL(var4.getString("src"))); - var5.field1461 = class106.method620(var4, "placement"); - this.field1437.add(var5); + var5.field1469 = var2.request(new URL(var4.getString("src"))); + var5.field1470 = UserComparator5.method679(var4, "placement"); + this.field1448.add(var5); } catch (MalformedURLException var6) { } } @@ -268,52 +268,72 @@ void method888(JSONArray var1, UrlRequester var2) throws JSONException { } } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(Lorg/json/JSONArray;I)V", - garbageValue = "-86694133" + garbageValue = "205832282" ) - void method889(JSONArray var1) throws JSONException { + void method895(JSONArray var1) throws JSONException { if (var1 != null) { for (int var2 = 0; var2 < var1.length(); ++var2) { JSONObject var3 = var1.getJSONObject(var2); class177 var4 = new class177(this); - var4.field1467 = var3.getString("text"); - var4.field1465 = class27.method113(var3.getString("align_x")); - var4.field1464 = class27.method113(var3.getString("align_y")); - var4.field1466 = var3.getInt("font"); - var4.field1463 = class106.method620(var3, "placement"); - this.field1438.add(var4); + var4.field1476 = var3.getString("text"); + String var7 = var3.getString("align_x"); + byte var6; + if (var7.equals("centre")) { + var6 = 1; + } else if (!var7.equals("bottom") && !var7.equals("right")) { + var6 = 0; + } else { + var6 = 2; + } + + var4.field1473 = var6; + String var10 = var3.getString("align_y"); + byte var9; + if (var10.equals("centre")) { + var9 = 1; + } else if (!var10.equals("bottom") && !var10.equals("right")) { + var9 = 0; + } else { + var9 = 2; + } + + var4.field1475 = var9; + var4.field1474 = var3.getInt("font"); + var4.field1472 = UserComparator5.method679(var3, "placement"); + this.field1446.add(var4); } } } - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;S)V", - garbageValue = "-18886" + descriptor = "(Lorg/json/JSONObject;I)V", + garbageValue = "3730991" ) - void method890(JSONObject var1) throws JSONException { + void method896(JSONObject var1) throws JSONException { if (var1 != null) { - this.field1433 = class106.method620(var1, "clickbounds"); - this.field1436 = var1.getString("endpoint"); + this.field1442 = UserComparator5.method679(var1, "clickbounds"); + this.field1445 = var1.getString("endpoint"); String[] var2 = JSONObject.getNames(var1); for (int var3 = 0; var3 < var1.length(); ++var3) { if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { try { int var4 = var1.getInt(var2[var3]); - this.field1439.add(new class178(this, var2[var3], var4)); + this.field1447.add(new class178(this, var2[var3], var4)); } catch (Exception var8) { try { String var5 = var1.getString(var2[var3]); if (var5.equals("true")) { - this.field1439.add(new class178(this, var2[var3], 1)); + this.field1447.add(new class178(this, var2[var3], 1)); } else if (var5.equals("false")) { - this.field1439.add(new class178(this, var2[var3], 0)); + this.field1447.add(new class178(this, var2[var3], 0)); } else { - this.field1439.add(new class169(this, var2[var3], var5)); + this.field1447.add(new class169(this, var2[var3], var5)); } } catch (Exception var7) { } @@ -324,27 +344,27 @@ void method890(JSONObject var1) throws JSONException { } } - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;I)V", - garbageValue = "357071457" + descriptor = "(Lorg/json/JSONObject;B)V", + garbageValue = "-60" ) - void method891(JSONObject var1) throws JSONException { + void method897(JSONObject var1) throws JSONException { String[] var2 = JSONObject.getNames(var1); for (int var3 = 0; var3 < var1.length(); ++var3) { try { int var4 = var1.getInt(var2[var3]); - this.field1441.put(var2[var3], var4); + this.field1449.put(var2[var3], var4); } catch (Exception var8) { try { String var5 = var1.getString(var2[var3]); if (var5.equals("true")) { - this.field1441.put(var2[var3], 1); + this.field1449.put(var2[var3], 1); } else if (var5.equals("false")) { - this.field1441.put(var2[var3], 0); + this.field1449.put(var2[var3], 0); } else { - this.field1440.put(var2[var3], var5); + this.field1450.put(var2[var3], var5); } } catch (Exception var7) { } @@ -353,102 +373,76 @@ void method891(JSONObject var1) throws JSONException { } - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lre;Lej;B)V", - garbageValue = "28" + descriptor = "(Lrl;Lev;B)V", + garbageValue = "80" ) - void method892(class463 var1, UrlRequester var2) { + void method898(class462 var1, UrlRequester var2) { JSONObject var3; try { - var3 = var1.method2315(); + var3 = var1.method2338(); var3 = var3.getJSONObject("message"); } catch (Exception var9) { - this.method885(); - this.field1434 = 102; + this.method891(); + this.field1443 = 102; return; } try { - this.method888(var3.getJSONArray("images"), var2); + this.method894(var3.getJSONArray("images"), var2); } catch (Exception var8) { - this.field1437.clear(); + this.field1448.clear(); } try { - this.method889(var3.getJSONArray("labels")); + this.method895(var3.getJSONArray("labels")); } catch (Exception var7) { - this.field1438.clear(); + this.field1446.clear(); } try { - this.method890(var3.getJSONObject("behaviour")); + this.method896(var3.getJSONObject("behaviour")); } catch (Exception var6) { - this.field1436 = null; - this.field1433[0] = 0.0F; - this.field1433[1] = 0.0F; - this.field1433[2] = 1.0F; - this.field1433[3] = 1.0F; - this.field1439.clear(); + this.field1445 = null; + this.field1442[0] = 0.0F; + this.field1442[1] = 0.0F; + this.field1442[2] = 1.0F; + this.field1442[3] = 1.0F; + this.field1447.clear(); } try { - this.method891(var3.getJSONObject("meta")); + this.method897(var3.getJSONObject("meta")); } catch (Exception var5) { - this.field1441.clear(); - this.field1440.clear(); + this.field1449.clear(); + this.field1450.clear(); } } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lej;B)Z", - garbageValue = "6" + descriptor = "(Ljava/lang/String;Lev;I)Z", + garbageValue = "1404178579" ) - public boolean method893(String var1, UrlRequester var2) { + public boolean method899(String var1, UrlRequester var2) { try { - this.method892(new class463(var1.getBytes()), var2); - this.field1434 = this.field1437.size() > 0 ? 1 : 2; + this.method898(new class462(var1.getBytes()), var2); + this.field1443 = this.field1448.size() > 0 ? 1 : 2; } catch (UnsupportedEncodingException var4) { - this.field1434 = 102; + this.field1443 = 102; } - return this.field1434 < 100; + return this.field1443 < 100; } - @ObfuscatedName("aw") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (var0 % 37L == 0L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; 0L != var3; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class389.base37Table[(int)(var6 - var0 * 37L)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } - } else { - return null; - } + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "1176704124" + ) + static int method900(int var0, Script var1, boolean var2) { + return 2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class172.java b/osrs/src/main/java/class172.java index 4fc8cc88d..92070dd0c 100644 --- a/osrs/src/main/java/class172.java +++ b/osrs/src/main/java/class172.java @@ -2,124 +2,71 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gl") +@ObfuscatedName("gy") public class class172 { - @ObfuscatedName("aj") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("ap") - @Export("Tiles_hue") - static int[] Tiles_hue; + @ObfuscatedName("ai") + @Export("Tiles_shapes") + static byte[][][] Tiles_shapes; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(IILin;Lij;Liq;I)Z", - garbageValue = "135723678" + descriptor = "(Lnu;Ljava/lang/String;Ljava/lang/String;I)Luk;", + garbageValue = "2141415166" ) - static final boolean method899(int var0, int var1, RouteStrategy var2, CollisionMap var3, class217 var4) { - int var5 = var4.method1115(); - int var6 = var4.method1116(); - int[][] var7 = var4.method1118(); - int[][] var8 = var4.method1117(); - int[] var9 = var4.method1119(); - int[] var10 = var4.method1120(); - int var11 = var4.method1121(); - int var12 = var0; - int var13 = var1; - int var14 = var5 >> 1; - int var15 = var6 >> 1; - int var16 = var0 - var14; - int var17 = var1 - var15; - var8[var14][var15] = 99; - var7[var14][var15] = 0; - byte var18 = 0; - int var19 = 0; - var9[var18] = var0; - byte var10001 = var18; - int var24 = var18 + 1; - var10[var10001] = var1; - int[][] var20 = var3.flags; - - while (var19 != var24) { - var12 = var9[var19]; - var13 = var10[var19]; - var19 = var19 + 1 & var11; - var14 = var12 - var16; - var15 = var13 - var17; - int var21 = var12 - var3.xInset; - int var22 = var13 - var3.yInset; - if (var2.hasArrived(1, var12, var13, var3)) { - var4.method1112(var12, var13); - return true; - } - - int var23 = var7[var14][var15] + 1; - if (var14 > 0 && var8[var14 - 1][var15] == 0 && (var20[var21 - 1][var22] & 19136776) == 0) { - var9[var24] = var12 - 1; - var10[var24] = var13; - var24 = var24 + 1 & var11; - var8[var14 - 1][var15] = 2; - var7[var14 - 1][var15] = var23; - } - - if (var14 < var5 - 1 && var8[var14 + 1][var15] == 0 && (var20[var21 + 1][var22] & 19136896) == 0) { - var9[var24] = var12 + 1; - var10[var24] = var13; - var24 = var24 + 1 & var11; - var8[var14 + 1][var15] = 8; - var7[var14 + 1][var15] = var23; - } - - if (var15 > 0 && var8[var14][var15 - 1] == 0 && (var20[var21][var22 - 1] & 19136770) == 0) { - var9[var24] = var12; - var10[var24] = var13 - 1; - var24 = var24 + 1 & var11; - var8[var14][var15 - 1] = 1; - var7[var14][var15 - 1] = var23; + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + if (!var0.isValidFileName(var1, var2)) { + return null; + } else { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + IndexedSprite var5; + if (!ApproximateRouteStrategy.method345(var0, var3, var4)) { + var5 = null; + } else { + var5 = class493.method2466(); } - if (var15 < var6 - 1 && var8[var14][var15 + 1] == 0 && (var20[var21][var22 + 1] & 19136800) == 0) { - var9[var24] = var12; - var10[var24] = var13 + 1; - var24 = var24 + 1 & var11; - var8[var14][var15 + 1] = 4; - var7[var14][var15 + 1] = var23; - } - - if (var14 > 0 && var15 > 0 && var8[var14 - 1][var15 - 1] == 0 && (var20[var21 - 1][var22 - 1] & 19136782) == 0 && (var20[var21 - 1][var22] & 19136776) == 0 && (var20[var21][var22 - 1] & 19136770) == 0) { - var9[var24] = var12 - 1; - var10[var24] = var13 - 1; - var24 = var24 + 1 & var11; - var8[var14 - 1][var15 - 1] = 3; - var7[var14 - 1][var15 - 1] = var23; - } - - if (var14 < var5 - 1 && var15 > 0 && var8[var14 + 1][var15 - 1] == 0 && (var20[var21 + 1][var22 - 1] & 19136899) == 0 && (var20[var21 + 1][var22] & 19136896) == 0 && (var20[var21][var22 - 1] & 19136770) == 0) { - var9[var24] = var12 + 1; - var10[var24] = var13 - 1; - var24 = var24 + 1 & var11; - var8[var14 + 1][var15 - 1] = 9; - var7[var14 + 1][var15 - 1] = var23; - } + return var5; + } + } - if (var14 > 0 && var15 < var6 - 1 && var8[var14 - 1][var15 + 1] == 0 && (var20[var21 - 1][var22 + 1] & 19136824) == 0 && (var20[var21 - 1][var22] & 19136776) == 0 && (var20[var21][var22 + 1] & 19136800) == 0) { - var9[var24] = var12 - 1; - var10[var24] = var13 + 1; - var24 = var24 + 1 & var11; - var8[var14 - 1][var15 + 1] = 6; - var7[var14 - 1][var15 + 1] = var23; - } + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1301151779" + ) + public static boolean method906(int var0) { + if (class305.field2773.isEmpty()) { + return false; + } else { + MusicSong var1 = (MusicSong)class305.field2773.get(0); + return var1 != null && var0 == var1.musicTrackGroupId; + } + } - if (var14 < var5 - 1 && var15 < var6 - 1 && var8[var14 + 1][var15 + 1] == 0 && (var20[var21 + 1][var22 + 1] & 19136992) == 0 && (var20[var21 + 1][var22] & 19136896) == 0 && (var20[var21][var22 + 1] & 19136800) == 0) { - var9[var24] = var12 + 1; - var10[var24] = var13 + 1; - var24 = var24 + 1 & var11; - var8[var14 + 1][var15 + 1] = 12; - var7[var14 + 1][var15 + 1] = var23; - } + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "(Ltb;I)Ljava/lang/Object;", + garbageValue = "263841727" + ) + static Object method908(class502 var0) { + switch(var0.field4104) { + case 1: + return Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + case 2: + return Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + default: + throw new IllegalStateException("popValueOfType() failure - unsupported type"); } + } - var4.method1112(var12, var13); - return false; + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "0" + ) + static int method907(int var0) { + return var0 * 3 + 600; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class174.java b/osrs/src/main/java/class174.java index 85d8a4ec0..431d5a63f 100644 --- a/osrs/src/main/java/class174.java +++ b/osrs/src/main/java/class174.java @@ -2,13 +2,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gk") public interface class174 { - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "496669737" + garbageValue = "-2061400252" ) @Export("useRotation") int useRotation(); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class176.java b/osrs/src/main/java/class176.java index 17e47be10..bd2d58d23 100644 --- a/osrs/src/main/java/class176.java +++ b/osrs/src/main/java/class176.java @@ -2,33 +2,52 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gz") +@ObfuscatedName("gx") public class class176 { - @ObfuscatedName("gg") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "[Lch;" ) - static Archive field1459; - @ObfuscatedName("aw") + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lei;" + descriptor = "Let;" ) - public UrlRequest field1460; - @ObfuscatedName("ay") - public float[] field1461; + public UrlRequest field1469; + @ObfuscatedName("ae") + public float[] field1470; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lgf;" ) @Export("this$0") @ObfuscatedName("this$0") final class170 this$0; @ObfuscatedSignature( - descriptor = "(Lgq;)V" + descriptor = "(Lgf;)V" ) class176(class170 var1) { this.this$0 = var1; - this.field1461 = new float[4]; + this.field1470 = new float[4]; } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)[Llg;", + garbageValue = "-1051328819" + ) + public static ServerPacket[] method916() { + return new ServerPacket[]{ServerPacket.NPC_ANIM_SPECIFIC, ServerPacket.AREA_SOUND, ServerPacket.TRADING_POST_UPDATE, ServerPacket.SEND_PING, ServerPacket.UPDATE_REBOOT_TIMER, ServerPacket.IF_SETEVENTS, ServerPacket.NEW_PACKET_CAM_RESET_V2, ServerPacket.SET_PLAYER_OP, ServerPacket.VARP_LARGE, ServerPacket.IF_SETOBJECT, ServerPacket.OPEN_URL, ServerPacket.IF_MOVESUB, ServerPacket.CAM_LOOKAT_EASED_ANGLE_ABSOLUTE, ServerPacket.CAM_MOVETO_EASED_CIRCULAR, ServerPacket.IF_SETTEXT, ServerPacket.REFLECTIONCHECK_FRIENDLIST, ServerPacket.MAPPROJ_ANIM, ServerPacket.GAMEFRAME_FULL, ServerPacket.UPDATE_INV_STOP_TRANSMIT, ServerPacket.MESSAGE_PRIVATE_ECHO, ServerPacket.RUN_CLIENTSCRIPT, ServerPacket.VARCLAN_ENABLE, ServerPacket.MAPPROJ_ANIM_SPECIFIC, ServerPacket.UPDATE_RUNENERGY, ServerPacket.CAM_SHAKE, ServerPacket.MESSAGE_CLANCHANNEL, ServerPacket.IF_SETNPCHEAD, ServerPacket.IF_CLOSESUB, ServerPacket.UPDATE_STAT, ServerPacket.UPDATE_IGNORELIST, ServerPacket.IF_SETCOLOUR, ServerPacket.MAP_ANIM, ServerPacket.NPC_SPOTANIM_SPECIFIC, ServerPacket.HEAT_MAP, ServerPacket.LOC_ADD_CHANGE, ServerPacket.PLAYER_ANIM_SPECIFIC, ServerPacket.OBJ_ADD, ServerPacket.TRADING_POST_RESULTS, ServerPacket.SPOTANIM_SPECIFIC, ServerPacket.VARP_SMALL, ServerPacket.CHAT_FILTER_SETTINGS, ServerPacket.UPDATE_RUNWEIGHT, ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS, ServerPacket.RESET_ANIMS, ServerPacket.SYNTH_SOUND, ServerPacket.MIDI_JINGLE, ServerPacket.IF1_MODELROTATE, ServerPacket.HINT_ARROW, ServerPacket.NEW_PACK_215, ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR, ServerPacket.IF_SETANGLE, ServerPacket.NPC_HEADICON_SPECIFIC, ServerPacket.MESSAGE_PRIVATE, ServerPacket.IF_SETSCROLLPOS, ServerPacket.REBUILD_REGION, ServerPacket.LOC_ANIM_SPECIFIC, ServerPacket.MESSAGE_GAME, ServerPacket.UPDATE_INV_FULL, ServerPacket.IF_SETANIM, ServerPacket.IF_OPENSUB, ServerPacket.IF_SETMODEL, ServerPacket.UPDATE_UID192, ServerPacket.SYNC_CLIENT_VARCACHE, ServerPacket.CLANSETTINGS_FULL, ServerPacket.CAM_LOOKAT, ServerPacket.SET_MAP_FLAG, ServerPacket.MINIMAP_TOGGLE, ServerPacket.UPDATE_FRIENDLIST, ServerPacket.TRIGGER_ONDIALOGABORT, ServerPacket.IF_SETPLAYERMODEL_OBJ, ServerPacket.PLAYER_SPOTANIM_SPECIFIC, ServerPacket.OBJ_COUNT, ServerPacket.IF_SETPOSITION, ServerPacket.UPDATE_INV_PARTIAL, ServerPacket.RESET_CLIENT_VARCACHE, ServerPacket.FRIENDLIST_LOADED, ServerPacket.NPC_INFO_SMALL, ServerPacket.MESSAGE_FRIENDCHANNEL, ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT, ServerPacket.PLAYER_INFO, ServerPacket.IF_SETPLAYERMODEL_BODYTYPE, ServerPacket.TOGGLE_OCULUS_ORB, ServerPacket.CAM_MOVETO_EASED, ServerPacket.VARCLAN, ServerPacket.LOC_DEL, ServerPacket.REFLECTION_CHECK, ServerPacket.VARCLAN_DISABLE, ServerPacket.ENTER_FREECAM, ServerPacket.CLANCHANNEL_FULL, ServerPacket.MIDI_SONG_LEGACY, ServerPacket.IF_SETHIDE, ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM, ServerPacket.OBJ_DEL_LEGACY, ServerPacket.CLANSETTINGS_DELTA, ServerPacket.UPDATE_ZONE_FULL_FOLLOWS, ServerPacket.UPDATE_INV_CLEAR, ServerPacket.CLANCHANNEL_DELTA, ServerPacket.CAM_RESET, ServerPacket.EMPTY_PACKET, ServerPacket.REBUILD_REGION_NORMAL, ServerPacket.LOGOUT, ServerPacket.LOGOUT_FULL, ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED, ServerPacket.CAM_LOOKAT_EASED_COORD, ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2, ServerPacket.IF_OPENTOP, ServerPacket.field2725, ServerPacket.CAM_MOVETO, ServerPacket.UPDATE_SITESETTINGS, ServerPacket.PREFETCH_GAMEOBJECTS, ServerPacket.IF_SETPLAYERHEAD, ServerPacket.LOC_ANIM, ServerPacket.OBJ_DEL, ServerPacket.LOGIN_SCREEN_PACKET, ServerPacket.NPC_INFO_LARGE, ServerPacket.IF_SETPLAYERMODEL_SELF, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL, ServerPacket.MIDI_SONG, ServerPacket.MIDI_SONG_STOP, ServerPacket.MIDI_SONG_WITH_SECONDARY, ServerPacket.MIDI_SWAP, ServerPacket.field2730}; + } + + @ObfuscatedName("mu") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1840256196" + ) + static final String method917(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class177.java b/osrs/src/main/java/class177.java index a0be49b9b..a65f528a2 100644 --- a/osrs/src/main/java/class177.java +++ b/osrs/src/main/java/class177.java @@ -2,138 +2,76 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +import java.io.IOException; + +@ObfuscatedName("gq") public class class177 { - @ObfuscatedName("vp") - @ObfuscatedSignature( - descriptor = "Lcd;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("am") - public String field1467; - @ObfuscatedName("as") - public float[] field1463; - @ObfuscatedName("aj") - public int field1465; - @ObfuscatedName("ag") - public int field1464; + @ObfuscatedName("ay") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("at") + public String field1476; + @ObfuscatedName("ac") + public float[] field1472; + @ObfuscatedName("ai") + public int field1473; @ObfuscatedName("az") - public int field1466; + public int field1475; + @ObfuscatedName("ap") + public int field1474; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lgf;" ) @Export("this$0") @ObfuscatedName("this$0") final class170 this$0; @ObfuscatedSignature( - descriptor = "(Lgq;)V" + descriptor = "(Lgf;)V" ) class177(class170 var1) { this.this$0 = var1; - this.field1463 = new float[4]; - this.field1465 = 1; - this.field1464 = 1; - this.field1466 = 0; + this.field1472 = new float[4]; + this.field1473 = 1; + this.field1475 = 1; + this.field1474 = 0; } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Lhk;", - garbageValue = "-1653760330" - ) - public static HitSplatDefinition method907(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); - var1 = new HitSplatDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; - } + @ObfuscatedName("at") + public static int method918(long var0) { + return (int)(var0 >>> 14 & 3L); } - @ObfuscatedName("as") + @ObfuscatedName("ob") @ObfuscatedSignature( - descriptor = "([BIIIIIIIII[Lij;I)V", - garbageValue = "632004581" + descriptor = "(Ltm;S)V", + garbageValue = "-22136" ) - static final void method908(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, CollisionMap[] var10) { - int var12; - for (int var11 = 0; var11 < 8; ++var11) { - for (var12 = 0; var12 < 8; ++var12) { - if (var11 + var2 > 0 && var11 + var2 < 103 && var3 + var12 > 0 && var3 + var12 < 103) { - int[] var10000 = var10[var1].flags[var11 + var2]; - var10000[var3 + var12] &= -16777217; - } - } - } - - Buffer var29 = new Buffer(var0); + static void method919(Buffer var0) { + if (Client.randomDatData != null) { + var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + } else { + byte[] var2 = new byte[24]; - for (var12 = 0; var12 < 4; ++var12) { - for (int var13 = 0; var13 < 64; ++var13) { - for (int var14 = 0; var14 < 64; ++var14) { - if (var12 == var4 && var13 >= var5 && var13 < var5 + 8 && var14 >= var6 && var14 < var6 + 8) { - int var17 = var13 & 7; - int var18 = var14 & 7; - int var19 = var7 & 3; - int var16; - if (var19 == 0) { - var16 = var17; - } else if (var19 == 1) { - var16 = var18; - } else if (var19 == 2) { - var16 = 7 - var17; - } else { - var16 = 7 - var18; - } + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var2); - int var20 = var16 + var2; - int var23 = var13 & 7; - int var24 = var14 & 7; - int var25 = var7 & 3; - int var22; - if (var25 == 0) { - var22 = var24; - } else if (var25 == 1) { - var22 = 7 - var23; - } else if (var25 == 2) { - var22 = 7 - var24; - } else { - var22 = var23; - } + int var3; + for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { + } - int var26 = var3 + var22; - int var27 = (var13 & 7) + var8 + var2; - int var28 = var3 + (var14 & 7) + var9; - ScriptEvent.loadTerrain(var29, var1, var20, var26, var27, var28, var7); - } else { - ScriptEvent.loadTerrain(var29, 0, -1, -1, 0, 0, 0); - } + if (var3 >= 24) { + throw new IOException(); + } + } catch (Exception var6) { + for (int var4 = 0; var4 < 24; ++var4) { + var2[var4] = -1; } } - } - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-814141730" - ) - static final String method909(int var0) { - if (var0 < 100000) { - return "" + var0 + ""; - } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; + var0.writeBytes(var2, 0, var2.length); } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class178.java b/osrs/src/main/java/class178.java index 02dd2c761..b1c988aee 100644 --- a/osrs/src/main/java/class178.java +++ b/osrs/src/main/java/class178.java @@ -2,43 +2,56 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gt") public class class178 extends class181 { - @ObfuscatedName("aw") - int field1468; + @ObfuscatedName("ko") + @ObfuscatedSignature( + descriptor = "[Lui;" + ) + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("au") + int field1478; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lgf;" ) - @Export("this$0") - @ObfuscatedName("this$0") final class170 this$0; @ObfuscatedSignature( - descriptor = "(Lgq;Ljava/lang/String;I)V" + descriptor = "(Lgf;Ljava/lang/String;I)V" ) class178(class170 var1, String var2, int var3) { super(var1, var2); this.this$0 = var1; - this.field1468 = var3; + this.field1478 = var3; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-14721" + descriptor = "(B)I", + garbageValue = "38" ) public int vmethod3379() { return 0; } - @ObfuscatedName("aj") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-400866400" + garbageValue = "1630105394" ) @Export("vmethod3378") public int vmethod3378() { - return this.field1468; + return this.field1478; + } + + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "65280" + ) + static int method922(int var0, Script var1, boolean var2) { + return 2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class18.java b/osrs/src/main/java/class18.java index b9afc59e4..35615dd08 100644 --- a/osrs/src/main/java/class18.java +++ b/osrs/src/main/java/class18.java @@ -1,578 +1,153 @@ -import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ad") +import java.util.concurrent.Future; + +@ObfuscatedName("ax") public class class18 { - @ObfuscatedName("je") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("uj") - static int cameraLookAtSpeed; - @ObfuscatedName("aw") - Future field54; - @ObfuscatedName("ay") - String field53; + @ObfuscatedName("vg") + @ObfuscatedSignature( + descriptor = "Lsm;" + ) + static PlatformInfo field51; + @ObfuscatedName("ba") + protected static String field50; + @ObfuscatedName("au") + Future field53; + @ObfuscatedName("ae") + String field52; class18(Future var1) { - this.field54 = var1; + this.field53 = var1; } class18(String var1) { - this.method58(var1); + this.method51(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "57" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1898504795" ) - void method58(String var1) { + void method51(String var1) { if (var1 == null) { var1 = ""; } - this.field53 = var1; - if (this.field54 != null) { - this.field54.cancel(true); - this.field54 = null; + this.field52 = var1; + if (this.field53 != null) { + this.field53.cancel(true); + this.field53 = null; } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "33" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-197315393" ) - public final String method59() { - return this.field53; + public final String method52() { + return this.field52; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "7786" + descriptor = "(I)Z", + garbageValue = "2089695473" ) - public boolean method61() { - return this.field53 != null || this.field54 == null; + public boolean method53() { + return this.field52 != null || this.field53 == null; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "12" + garbageValue = "1" ) - public final boolean method62() { - return this.method61() ? true : this.field54.isDone(); + public final boolean method54() { + return this.method53() ? true : this.field53.isDone(); } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)Lac;", - garbageValue = "34" + descriptor = "(I)Las;", + garbageValue = "626026127" ) - public final class20 method63() { - if (this.method61()) { - return new class20(this.field53); - } else if (!this.method62()) { + public final class20 method55() { + if (this.method53()) { + return new class20(this.field52); + } else if (!this.method54()) { return null; } else { try { - return (class20)this.field54.get(); + return (class20)this.field53.get(); } catch (Exception var3) { String var2 = "Error retrieving REST request reply"; System.err.println(var2 + "\r\n" + var3); - this.method58(var2); + this.method51(var2); return new class20(var2); } } } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;Ljava/lang/String;I)I", - garbageValue = "2052181437" + descriptor = "(I)V", + garbageValue = "-1969917926" ) - public static int method57(Buffer var0, String var1) { - int var2 = var0.offset; - int var4 = var1.length(); - byte[] var5 = new byte[var4]; - - for (int var6 = 0; var6 < var4; ++var6) { - char var7 = var1.charAt(var6); - if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { - if (var7 == 8364) { - var5[var6] = -128; - } else if (var7 == 8218) { - var5[var6] = -126; - } else if (var7 == 402) { - var5[var6] = -125; - } else if (var7 == 8222) { - var5[var6] = -124; - } else if (var7 == 8230) { - var5[var6] = -123; - } else if (var7 == 8224) { - var5[var6] = -122; - } else if (var7 == 8225) { - var5[var6] = -121; - } else if (var7 == 710) { - var5[var6] = -120; - } else if (var7 == 8240) { - var5[var6] = -119; - } else if (var7 == 352) { - var5[var6] = -118; - } else if (var7 == 8249) { - var5[var6] = -117; - } else if (var7 == 338) { - var5[var6] = -116; - } else if (var7 == 381) { - var5[var6] = -114; - } else if (var7 == 8216) { - var5[var6] = -111; - } else if (var7 == 8217) { - var5[var6] = -110; - } else if (var7 == 8220) { - var5[var6] = -109; - } else if (var7 == 8221) { - var5[var6] = -108; - } else if (var7 == 8226) { - var5[var6] = -107; - } else if (var7 == 8211) { - var5[var6] = -106; - } else if (var7 == 8212) { - var5[var6] = -105; - } else if (var7 == 732) { - var5[var6] = -104; - } else if (var7 == 8482) { - var5[var6] = -103; - } else if (var7 == 353) { - var5[var6] = -102; - } else if (var7 == 8250) { - var5[var6] = -101; - } else if (var7 == 339) { - var5[var6] = -100; - } else if (var7 == 382) { - var5[var6] = -98; - } else if (var7 == 376) { - var5[var6] = -97; - } else { - var5[var6] = 63; - } - } else { - var5[var6] = (byte)var7; - } - } - - var0.writeSmartByteShort(var5.length); - var0.offset += class335.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); - return var0.offset - var2; + public static void method56() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); } - @ObfuscatedName("ar") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Ldi;Ldc;III)V", - garbageValue = "-2007406926" + descriptor = "(S)Lch;", + garbageValue = "9992" ) - static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { - Object[] var4 = var0.args; - Interpreter.Interpreter_intStackSize = 0; - Interpreter.Interpreter_stringStackSize = 0; - int var5 = -1; - int[] var6 = var1.opcodes; - int[] var7 = var1.intOperands; - byte var8 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field698 = false; - boolean var9 = false; - int var10 = 0; - boolean var29 = false; - - label859: { - label860: { - try { - int var13; - try { - var29 = true; - Interpreter.Interpreter_intLocals = new int[var1.localIntCount]; - int var11 = 0; - Interpreter.Interpreter_stringLocals = new String[var1.localStringCount]; - int var12 = 0; - - int var14; - String var20; - for (var13 = 1; var13 < var4.length; ++var13) { - if (var4[var13] instanceof Integer) { - var14 = (Integer)var4[var13]; - if (var14 == -2147483647) { - var14 = var0.mouseX; - } - - if (var14 == -2147483646) { - var14 = var0.mouseY; - } - - if (var14 == -2147483645) { - var14 = var0.widget != null ? var0.widget.id * -232044627 * -1780632539 : -1; - } - - if (var14 == -2147483644) { - var14 = var0.opIndex; - } - - if (var14 == -2147483643) { - var14 = var0.widget != null ? var0.widget.childIndex * 1116520775 * -72312713 : -1; - } - - if (var14 == -2147483642) { - var14 = var0.dragTarget != null ? var0.dragTarget.id * -232044627 * -1780632539 : -1; - } - - if (var14 == -2147483641) { - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1116520775 * -72312713 : -1; - } - - if (var14 == -2147483640) { - var14 = var0.keyTyped; - } - - if (var14 == -2147483639) { - var14 = var0.keyPressed; - } - - Interpreter.Interpreter_intLocals[var11++] = var14; - } else if (var4[var13] instanceof String) { - var20 = (String)var4[var13]; - if (var20.equals("event_opbase")) { - var20 = var0.targetName; - } - - Interpreter.Interpreter_stringLocals[var12++] = var20; - } - } - - Interpreter.field701 = var0.field862; - - label840: - while (true) { - ++var10; - if (var10 > var2) { - throw new RuntimeException(); - } - - ++var5; - int var32 = var6[var5]; - if (var32 >= 100) { - boolean var34; - if (var1.intOperands[var5] == 1) { - var34 = true; - } else { - var34 = false; - } - - var14 = class142.method757(var32, var1, var34); - switch(var14) { - case 0: - var29 = false; - break label840; - case 1: - default: - break; - case 2: - //throw new IllegalStateException(); - } - } else if (var32 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7[var5]; - } else if (var32 == 1) { - var13 = var7[var5]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; - } else if (var32 == 2) { - var13 = var7[var5]; - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - MenuAction.changeGameOptions(var13); - } else if (var32 == 3) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var1.stringOperands[var5]; - } else if (var32 == 6) { - var5 += var7[var5]; - } else if (var32 == 7) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 8) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 9) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 10) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 21) { - if (Interpreter.Interpreter_frameDepth == 0) { - var29 = false; - break label860; - } - - ScriptFrame var39 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; - var1 = var39.script; - var6 = var1.opcodes; - var7 = var1.intOperands; - var5 = var39.pc; - Interpreter.Interpreter_intLocals = var39.intLocals; - Interpreter.Interpreter_stringLocals = var39.stringLocals; - } else if (var32 == 25) { - var13 = var7[var5]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WallDecoration.getVarbit(var13); - } else if (var32 == 27) { - var13 = var7[var5]; - class164.method858(var13, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else if (var32 == 31) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 32) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 33) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var7[var5]]; - } else if (var32 == 34) { - Interpreter.Interpreter_intLocals[var7[var5]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - } else if (var32 == 35) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var5]]; - } else if (var32 == 36) { - Interpreter.Interpreter_stringLocals[var7[var5]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - } else if (var32 == 37) { - var13 = var7[var5]; - Interpreter.Interpreter_stringStackSize -= var13; - var20 = class153.method796(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var13); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var20; - } else if (var32 == 38) { - --Interpreter.Interpreter_intStackSize; - } else if (var32 == 39) { - --Interpreter.Interpreter_stringStackSize; - } else { - int var17; - if (var32 != 40) { - if (var32 == 42) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PendingSpawn.varcs.getInt(var7[var5]); - } else if (var32 == 43) { - PendingSpawn.varcs.setInt(var7[var5], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else if (var32 == 44) { - var13 = var7[var5] >> 16; - var14 = var7[var5] & 65535; - int var23 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var23 < 0 || var23 > 5000) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrayLengths[var13] = var23; - byte var24 = -1; - if (var14 == 105) { - var24 = 0; - } - - for (var17 = 0; var17 < var23; ++var17) { - Interpreter.Interpreter_arrays[var13][var17] = var24; - } - } else if (var32 == 45) { - var13 = var7[var5]; - var14 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; - } else if (var32 == 46) { - var13 = var7[var5]; - Interpreter.Interpreter_intStackSize -= 2; - var14 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - } else { - String var21; - if (var32 == 47) { - var21 = PendingSpawn.varcs.getStringOld(var7[var5]); - if (var21 == null) { - var21 = "null"; - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; - } else if (var32 == 48) { - PendingSpawn.varcs.setStringOld(var7[var5], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - } else if (var32 == 49) { - var21 = PendingSpawn.varcs.getString(var7[var5]); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; - } else if (var32 == 50) { - PendingSpawn.varcs.setString(var7[var5], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - } else if (var32 == 60) { - IterableNodeHashTable var37 = var1.switches[var7[var5]]; - IntegerNode var36 = (IntegerNode)var37.get((long)Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var36 != null) { - var5 += var36.integer; - } - } else { - Integer var38; - if (var32 == 74) { - var38 = PacketBufferNode.field2591.getTitleGroupValue(var7[var5]); - if (var38 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var38; - } - } else { - if (var32 != 76) { - throw new IllegalStateException(); - } - - var38 = class135.varclan.method2297(var7[var5]); - if (var38 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var38; - } - } - } - } - } else { - var13 = var7[var5]; - Script var35 = Interpreter.getScript(var13); - int[] var15 = new int[var35.localIntCount]; - String[] var16 = new String[var35.localStringCount]; - - for (var17 = 0; var17 < var35.intArgumentCount; ++var17) { - var15[var17] = Interpreter.Interpreter_intStack[var17 + (Interpreter.Interpreter_intStackSize - var35.intArgumentCount)]; - } - - for (var17 = 0; var17 < var35.stringArgumentCount; ++var17) { - var16[var17] = Interpreter.Interpreter_stringStack[var17 + (Interpreter.Interpreter_stringStackSize - var35.stringArgumentCount)]; - } - - Interpreter.Interpreter_intStackSize -= var35.intArgumentCount; - Interpreter.Interpreter_stringStackSize -= var35.stringArgumentCount; - ScriptFrame var22 = new ScriptFrame(); - var22.script = var1; - var22.pc = var5; - var22.intLocals = Interpreter.Interpreter_intLocals; - var22.stringLocals = Interpreter.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; - var1 = var35; - var6 = var35.opcodes; - var7 = var35.intOperands; - var5 = -1; - Interpreter.Interpreter_intLocals = var15; - Interpreter.Interpreter_stringLocals = var16; - } - } - } - } catch (Exception var30) { - var9 = true; - StringBuilder var26 = new StringBuilder(30); - var26.append("").append(var1.key).append(" "); - - for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { - var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); - } - - var26.append("").append(var8); - class317.RunException_sendStackTrace(var26.toString(), var30); - var29 = false; - break label859; - } - } finally { - if (var29) { - while (Interpreter.field711.size() > 0) { - class102 var19 = (class102)Interpreter.field711.remove(0); - BufferedSource.widgetDefaultMenuAction(var19.method601(), var19.method602(), var19.method603(), var19.method604(), ""); - } - - if (Interpreter.field698) { - Interpreter.field698 = false; - class390.method1987(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - class317.RunException_sendStackTrace("Warning: Script " + var1.field815 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - - } - } - - while (Interpreter.field711.size() > 0) { - class102 var33 = (class102)Interpreter.field711.remove(0); - BufferedSource.widgetDefaultMenuAction(var33.method601(), var33.method602(), var33.method603(), var33.method604(), ""); - } - - if (Interpreter.field698) { - Interpreter.field698 = false; - class390.method1987(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - class317.RunException_sendStackTrace("Warning: Script " + var1.field815 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - - return; - } - - while (Interpreter.field711.size() > 0) { - class102 var40 = (class102)Interpreter.field711.remove(0); - BufferedSource.widgetDefaultMenuAction(var40.method601(), var40.method602(), var40.method603(), var40.method604(), ""); - } - - if (Interpreter.field698) { - Interpreter.field698 = false; - class390.method1987(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - class317.RunException_sendStackTrace("Warning: Script " + var1.field815 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - - return; - } - - while (Interpreter.field711.size() > 0) { - class102 var25 = (class102)Interpreter.field711.remove(0); - BufferedSource.widgetDefaultMenuAction(var25.method601(), var25.method602(), var25.method603(), var25.method604(), ""); - } - - if (Interpreter.field698) { - Interpreter.field698 = false; - class390.method1987(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - class317.RunException_sendStackTrace("Warning: Script " + var1.field815 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return VarcInt.getNextWorldListWorld(); + } + @ObfuscatedName("ga") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "94" + ) + static void method58() { + class27.field76 = System.getenv("JX_ACCESS_TOKEN"); + class9.field20 = System.getenv("JX_REFRESH_TOKEN"); + class157.field1407 = System.getenv("JX_SESSION_ID"); + Varcs.field1140 = System.getenv("JX_CHARACTER_ID"); + class478.method2372(System.getenv("JX_DISPLAY_NAME")); } - @ObfuscatedName("bj") + @ObfuscatedName("jh") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "1361591852" + descriptor = "(IIII)I", + garbageValue = "-1303959829" ) - static int method65(int var0, Script var1, boolean var2) { - if (var0 == 7463) { - boolean var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class10.method38(var3); - return 1; + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; + int var4 = var1 >> 7; + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + int var5 = var2; + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 + 1; + } + + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; + int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; + return var9 * var7 + var8 * (128 - var7) >> 7; } else { - return 2; + return 0; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class181.java b/osrs/src/main/java/class181.java index a4596beb5..1f1524084 100644 --- a/osrs/src/main/java/class181.java +++ b/osrs/src/main/java/class181.java @@ -1,120 +1,74 @@ -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("gn") public abstract class class181 { - @ObfuscatedName("am") - String field1481; + @ObfuscatedName("at") + String field1491; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lgf;" ) @Export("this$0") @ObfuscatedName("this$0") final class170 this$0; @ObfuscatedSignature( - descriptor = "(Lgq;Ljava/lang/String;)V" + descriptor = "(Lgf;Ljava/lang/String;)V" ) class181(class170 var1, String var2) { this.this$0 = var1; - this.field1481 = var2; + this.field1491 = var2; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-14721" + descriptor = "(B)I", + garbageValue = "38" ) @Export("vmethod3379") public abstract int vmethod3379(); - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-768896166" + garbageValue = "1557827941" ) @Export("vmethod3380") public String vmethod3380() { return null; } - @ObfuscatedName("aj") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-400866400" + garbageValue = "1630105394" ) @Export("vmethod3378") public int vmethod3378() { return -1; } - @ObfuscatedName("ap") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1263481224" + garbageValue = "1802215739" ) - public String method914() { - return this.field1481; + public String method925() { + return this.field1491; } - @ObfuscatedName("ae") + @ObfuscatedName("ln") @ObfuscatedSignature( - descriptor = "(II)Lfz;", - garbageValue = "1920961056" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "0" ) - static class137 method917(int var0) { - if (class273.method1504(var0) != 0) { - return null; + static String method928(int var0) { + if (var0 < 0) { + return ""; } else { - class137 var2 = (class137)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); - class137 var1; - if (var2 != null) { - var1 = var2; - } else { - AbstractArchive var4 = class333.SequenceDefinition_animationsArchive; - AbstractArchive var5 = class169.SequenceDefinition_skeletonsArchive; - boolean var6 = true; - byte[] var7 = var4.getFile(var0 >> 16 & 65535, var0 & 65535); - class137 var3; - if (var7 == null) { - var6 = false; - var3 = null; - } else { - int var8 = (var7[1] & 255) << 8 | var7[2] & 255; - byte[] var9 = var5.getFile(var8, 0); - if (var9 == null) { - var6 = false; - } - - if (!var6) { - var3 = null; - } else { - if (SoundCache.field214 == null) { - UserComparator4.field1166 = Runtime.getRuntime().availableProcessors(); - SoundCache.field214 = new ThreadPoolExecutor(0, UserComparator4.field1166, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(UserComparator4.field1166 * 100 + 100), new class203()); - } - - try { - var3 = new class137(var4, var5, var0, false); - } catch (Exception var11) { - var3 = null; - } - } - } - - if (var3 != null) { - SequenceDefinition.SequenceDefinition_cachedModel.put(var3, (long)var0); - } - - var1 = var3; - } - - return var1; + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class184.java b/osrs/src/main/java/class184.java index 095f6e83e..82dc2b1fc 100644 --- a/osrs/src/main/java/class184.java +++ b/osrs/src/main/java/class184.java @@ -1,63 +1,13 @@ -import java.util.concurrent.ThreadFactory; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hp") +import java.util.concurrent.ThreadFactory; + +@ObfuscatedName("hj") final class class184 implements ThreadFactory { + @Export("newThread") + @ObfuscatedName("newThread") public Thread newThread(Runnable var1) { return new Thread(var1, "OSRS Maya Anim Load"); } - - @ObfuscatedName("io") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" - ) - static final void method926(int var0, int var1) { - if (var0 < 128) { - var0 = 128; - } else if (var0 > 383) { - var0 = 383; - } - - if (class19.cameraPitch < var0) { - class19.cameraPitch = (var0 - class19.cameraPitch) * class157.cameraLookAtAcceleration / 1000 + class19.cameraPitch + class18.cameraLookAtSpeed; - if (class19.cameraPitch > var0) { - class19.cameraPitch = var0; - } - } else if (class19.cameraPitch > var0) { - class19.cameraPitch -= (class19.cameraPitch - var0) * class157.cameraLookAtAcceleration / 1000 + class18.cameraLookAtSpeed; - if (class19.cameraPitch < var0) { - class19.cameraPitch = var0; - } - } - - var1 &= 2047; - int var2 = var1 - class456.cameraYaw; - if (var2 > 1024) { - var2 -= 2048; - } else if (var2 < -1024) { - var2 += 2048; - } - - if (var2 > 0) { - class456.cameraYaw = class456.cameraYaw + class18.cameraLookAtSpeed + var2 * class157.cameraLookAtAcceleration / 1000; - class456.cameraYaw &= 2047; - } else if (var2 < 0) { - class456.cameraYaw -= -var2 * class157.cameraLookAtAcceleration / 1000 + class18.cameraLookAtSpeed; - class456.cameraYaw &= 2047; - } - - int var3 = var1 - class456.cameraYaw; - if (var3 > 1024) { - var3 -= 2048; - } else if (var3 < -1024) { - var3 += 2048; - } - - if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { - class456.cameraYaw = var1; - } - - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class19.java b/osrs/src/main/java/class19.java index 07f862614..c9379c1fc 100644 --- a/osrs/src/main/java/class19.java +++ b/osrs/src/main/java/class19.java @@ -1,122 +1,84 @@ -import java.io.IOException; -import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +import java.io.IOException; +import java.util.concurrent.Callable; + +@ObfuscatedName("ah") public class class19 implements Callable { - @ObfuscatedName("aj") - @Export("Tiles_shapes") - static byte[][][] Tiles_shapes; - @ObfuscatedName("ks") - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Laq;" + descriptor = "Lad;" ) - final class10 field57; + final class10 field54; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lar;" ) @Export("this$0") @ObfuscatedName("this$0") final class14 this$0; @ObfuscatedSignature( - descriptor = "(Laa;Laq;)V" + descriptor = "(Lar;Lad;)V" ) class19(class14 var1, class10 var2) { this.this$0 = var1; - this.field57 = var2; + this.field54 = var2; } @Export("call") @ObfuscatedName("call") public Object call() throws Exception { try { - while (this.field57.method34()) { - class13.method44(10L); + while (this.field54.method30()) { + PendingSpawn.method505(10L); } } catch (IOException var2) { return new class20("Error servicing REST query: " + var2.getMessage()); } - return this.field57.method35(); + return this.field54.method31(); } - @ObfuscatedName("aw") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-50" + descriptor = "(I)V", + garbageValue = "1773391988" ) - public static void method66() { - class36.reflectionChecks = new IterableNodeDeque(); + public static void method60() { + DbRowType.DBRowType_cache.clear(); } - @ObfuscatedName("ay") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-525719060" + descriptor = "(IIIII)I", + garbageValue = "1020330780" ) - static void method67() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.obj != null) { - var0.set(); - } - } - + static final int method61(int var0, int var1, int var2, int var3) { + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); } - @ObfuscatedName("av") + @ObfuscatedName("my") @ObfuscatedSignature( - descriptor = "([BIILiz;[Lij;I)V", - garbageValue = "-999166250" + descriptor = "(II)V", + garbageValue = "-274496968" ) - static final void method68(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); - int var6 = -1; - - while (true) { - int var7 = var5.method2541(); - if (var7 == 0) { - return; - } + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (ModeWhere.loadInterface(var0)) { + Widget[] var1 = PacketBufferNode.Widget_interfaceComponents[var0]; - var6 += var7; - int var8 = 0; - - while (true) { - int var9 = var5.readUShortSmart(); - if (var9 == 0) { - break; - } - - var8 += var9 - 1; - int var10 = var8 & 63; - int var11 = var8 >> 6 & 63; - int var12 = var8 >> 12; - int var13 = var5.readUnsignedByte(); - int var14 = var13 >> 2; - int var15 = var13 & 3; - int var16 = var11 + var1; - int var17 = var10 + var2; - if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { - int var18 = var12; - if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { - var18 = var12 - 1; - } - - CollisionMap var19 = null; - if (var18 >= 0) { - var19 = var4[var18]; - } - - PendingSpawn.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3 != null) { + var3.modelFrame = 0; + var3.modelFrameCycle = 0; } } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class191.java b/osrs/src/main/java/class191.java index f1a1bb96e..dbefac8ab 100644 --- a/osrs/src/main/java/class191.java +++ b/osrs/src/main/java/class191.java @@ -1,32 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("hg") public class class191 { - @ObfuscatedName("fx") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static Archive field1546; - - @ObfuscatedName("lt") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-411156376" - ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { - var1 = var1.substring(0, var2) + "," + var1.substring(var2); - } - - if (var1.length() > 9) { - return " " + MusicPatchPcmStream.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + MusicPatchPcmStream.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + MusicPatchPcmStream.colorStartTag(16776960) + var1 + ""; - } - } -} + @ObfuscatedName("jo") + @Export("regions") + static int[] regions; +} \ No newline at end of file diff --git a/osrs/src/main/java/class197.java b/osrs/src/main/java/class197.java index 5e2967632..5fa6ca451 100644 --- a/osrs/src/main/java/class197.java +++ b/osrs/src/main/java/class197.java @@ -2,113 +2,60 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("hp") public class class197 { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhp;" ) - static final class197 field1627; - @ObfuscatedName("ay") + static final class197 field1643; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhp;" ) - static final class197 field1628; - @ObfuscatedName("ar") + static final class197 field1639; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhp;" ) - static final class197 field1625; - @ObfuscatedName("am") + static final class197 field1641; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhp;" ) - static final class197 field1624; - @ObfuscatedName("as") + static final class197 field1642; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhp;" ) - static final class197 field1626; - @ObfuscatedName("aj") + static final class197 field1638; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhp;" ) - static final class197 field1623; - @ObfuscatedName("ag") + static final class197 field1640; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhp;" ) - static final class197 field1622; - @ObfuscatedName("fj") - static long field1620; - @ObfuscatedName("fd") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - @Export("archive2") - static Archive archive2; + static final class197 field1644; + @ObfuscatedName("ju") + @Export("regionMapArchives") + static byte[][] regionMapArchives; static { - field1627 = new class197(0, class210.field1838); - field1628 = new class197(1, class210.field1837); - field1625 = new class197(2, class210.field1836); - field1624 = new class197(3, class210.field1833); - field1626 = new class197(4, class210.field1834); - field1623 = new class197(5, class210.field1839); - field1622 = new class197(6, class210.field1835); - } - - @ObfuscatedSignature( - descriptor = "(ILis;)V" - ) - class197(int var1, class210 var2) { - } - - @ObfuscatedName("am") - public static int method979(long var0) { - return (int)(var0 >>> 7 & 127L); + field1643 = new class197(0, class209.field1857); + field1639 = new class197(1, class209.field1862); + field1641 = new class197(2, class209.field1858); + field1642 = new class197(3, class209.field1863); + field1638 = new class197(4, class209.field1860); + field1640 = new class197(5, class209.field1861); + field1644 = new class197(6, class209.field1859); } - @ObfuscatedName("he") @ObfuscatedSignature( - descriptor = "(Lny;Ljava/lang/String;I)V", - garbageValue = "1681789978" + descriptor = "(ILil;)V" ) - static void method980(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field548 += var2.groupCount; - } - - @ObfuscatedName("ie") - @ObfuscatedSignature( - descriptor = "(Ldx;I)V", - garbageValue = "-971627157" - ) - static final void method981(Actor var0) { - boolean var1 = var0.exactMoveArrive1Cycle == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0; - if (!var1) { - SequenceDefinition var2 = class135.SequenceDefinition_get(var0.sequence); - if (var2 != null && !var2.isCachedModelIdSet()) { - var1 = var0.sequenceFrameCycle + 1 > var2.frameLengths[var0.sequenceFrame]; - } else { - var1 = true; - } - } - - if (var1) { - int var8 = var0.exactMoveArrive1Cycle - var0.spotAnimation; - int var3 = Client.cycle - var0.spotAnimation; - int var4 = var0.field976 * 64 + var0.field1013 * 128; - int var5 = var0.field976 * 64 + var0.field1007 * 128; - int var6 = var0.field976 * 64 + var0.field1011 * 128; - int var7 = var0.field976 * 64 + var0.field1010 * 128; - var0.x = (var3 * var6 + var4 * (var8 - var3)) / var8; - var0.y = (var7 * var3 + var5 * (var8 - var3)) / var8; - } - - var0.field1020 = 0; - var0.orientation = var0.exactMoveDirection; - var0.rotation = var0.orientation; + class197(int var1, class209 var2) { } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class2.java b/osrs/src/main/java/class2.java index a58008c74..39892ea2e 100644 --- a/osrs/src/main/java/class2.java +++ b/osrs/src/main/java/class2.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ar") +@ObfuscatedName("ao") public interface class2 { -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class20.java b/osrs/src/main/java/class20.java index b0c675bcb..00e98ae4a 100644 --- a/osrs/src/main/java/class20.java +++ b/osrs/src/main/java/class20.java @@ -1,35 +1,34 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.util.Map; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("as") public class class20 { - @ObfuscatedName("gz") - static String field58; - @ObfuscatedName("aw") - final int field59; - @ObfuscatedName("ay") - final Map field61; - @ObfuscatedName("ar") - final String field60; + @ObfuscatedName("au") + final int field55; + @ObfuscatedName("ae") + final Map field57; + @ObfuscatedName("ao") + final String field56; class20(String var1) { - this.field59 = 400; - this.field61 = null; - this.field60 = ""; + this.field55 = 400; + this.field57 = null; + this.field56 = ""; } class20(HttpURLConnection var1) throws IOException { - this.field59 = var1.getResponseCode(); + this.field55 = var1.getResponseCode(); var1.getResponseMessage(); - this.field61 = var1.getHeaderFields(); + this.field57 = var1.getHeaderFields(); StringBuilder var2 = new StringBuilder(); - InputStream var3 = this.field59 >= 300 ? var1.getErrorStream() : var1.getInputStream(); + InputStream var3 = this.field55 >= 300 ? var1.getErrorStream() : var1.getInputStream(); if (var3 != null) { InputStreamReader var4 = new InputStreamReader(var3); BufferedReader var5 = new BufferedReader(var4); @@ -42,374 +41,90 @@ public class class20 { var3.close(); } - this.field60 = var2.toString(); + this.field56 = var2.toString(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1919676702" + descriptor = "(S)I", + garbageValue = "20873" ) - public int method70() { - return this.field59; + public int method63() { + return this.field55; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(B)Ljava/util/Map;", - garbageValue = "93" + garbageValue = "105" ) - public Map method71() { - return this.field61; + public Map method65() { + return this.field57; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1874601503" + garbageValue = "1529858789" ) - public String method72() { - return this.field60; + public String method66() { + return this.field56; } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lnd;I)V", - garbageValue = "-425693267" + descriptor = "(IB)V", + garbageValue = "1" ) - public static void method69(AbstractArchive var0) { - StructComposition.StructDefinition_archive = var0; + public static void method64(int var0) { + MouseHandler.MouseHandler_idleCycles = var0; } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(CB)C", - garbageValue = "-112" + descriptor = "(Lto;B)I", + garbageValue = "103" ) - static char method73(char var0) { - switch(var0) { - case ' ': - case '-': - case '_': - case ' ': - return '_'; - case '#': - case '[': - case ']': - return var0; - case 'À': - case 'Ã': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - return 'a'; - case 'Ç': - case 'ç': - return 'c'; - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - return 'e'; - case 'Ã': - case 'ÃŽ': - case 'Ã': - case 'í': - case 'î': - case 'ï': - return 'i'; - case 'Ñ': - case 'ñ': - return 'n'; - case 'Ã’': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - return 'o'; - case 'Ù': - case 'Ú': - case 'Û': - case 'Ãœ': - case 'ù': - case 'ú': - case 'û': - case 'ü': - return 'u'; - case 'ß': - return 'b'; - case 'ÿ': - case 'Ÿ': - return 'y'; - default: - return Character.toLowerCase(var0); + static int method68(PacketBuffer var0) { + int var1 = var0.readBits(2); + int var2; + if (var1 == 0) { + var2 = 0; + } else if (var1 == 1) { + var2 = var0.readBits(5); + } else if (var1 == 2) { + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); } + + return var2; } - @ObfuscatedName("ah") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-2069534350" + descriptor = "(Lnu;Ljava/lang/String;Ljava/lang/String;I)[Lui;", + garbageValue = "-1440236039" ) - static int method74(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var3 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - } - - String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { - } - } - - var4 = var4.substring(0, var4.length() - 1); - } - - Object[] var9 = new Object[var4.length() + 1]; - - int var7; - for (var7 = var9.length - 1; var7 >= 1; --var7) { - if (var4.charAt(var7 - 1) == 's') { - var9[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - } else { - var9[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var7 != -1) { - var9[0] = new Integer(var7); - } else { - var9 = null; - } - - if (var0 == 1400) { - var3.onClick = var9; - } else if (var0 == 1401) { - var3.onHold = var9; - } else if (var0 == 1402) { - var3.onRelease = var9; - } else if (var0 == 1403) { - var3.onMouseOver = var9; - } else if (var0 == 1404) { - var3.onMouseLeave = var9; - } else if (var0 == 1405) { - var3.onDrag = var9; - } else if (var0 == 1406) { - var3.onTargetLeave = var9; - } else if (var0 == 1407) { - var3.onVarTransmit = var9; - var3.varTransmitTriggers = var5; - } else if (var0 == 1408) { - var3.onTimer = var9; - } else if (var0 == 1409) { - var3.onOp = var9; - } else if (var0 == 1410) { - var3.onDragComplete = var9; - } else if (var0 == 1411) { - var3.onClickRepeat = var9; - } else if (var0 == 1412) { - var3.onMouseRepeat = var9; - } else if (var0 == 1414) { - var3.onInvTransmit = var9; - var3.invTransmitTriggers = var5; - } else if (var0 == 1415) { - var3.onStatTransmit = var9; - var3.statTransmitTriggers = var5; - } else if (var0 == 1416) { - var3.onTargetEnter = var9; - } else if (var0 == 1417) { - var3.onScroll = var9; - } else if (var0 == 1418) { - var3.onChatTransmit = var9; - } else if (var0 == 1419) { - var3.onKey = var9; - } else if (var0 == 1420) { - var3.onFriendTransmit = var9; - } else if (var0 == 1421) { - var3.onClanTransmit = var9; - } else if (var0 == 1422) { - var3.onMiscTransmit = var9; - } else if (var0 == 1423) { - var3.onDialogAbort = var9; - } else if (var0 == 1424) { - var3.onSubChange = var9; - } else if (var0 == 1425) { - var3.onStockTransmit = var9; - } else if (var0 == 1426) { - var3.field3069 = var9; - } else if (var0 == 1427) { - var3.onResize = var9; - } else if (var0 == 1428) { - var3.field3070 = var9; - } else if (var0 == 1429) { - var3.field3062 = var9; - } else if (var0 == 1430) { - var3.field3061 = var9; - } else if (var0 == 1431) { - var3.field3068 = var9; - } else if (var0 == 1434) { - var3.field3072 = var9; - } else if (var0 == 1435) { - var3.field3042 = var9; + public static SpritePixels[] method67(AbstractArchive var0, String var1, String var2) { + if (!var0.isValidFileName(var1, var2)) { + return null; } else { - if (var0 < 1436 || var0 > 1439) { - return 2; - } - - class328 var8 = var3.method1808(); - if (var8 != null) { - if (var0 == 1436) { - var8.field2885 = var9; - } else if (var0 == 1437) { - var8.field2883 = var9; - } else if (var0 == 1438) { - var8.field2882 = var9; - } else if (var0 == 1439) { - var8.field2884 = var9; - } - } + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + return WorldMapArchiveLoader.method2379(var0, var3, var4); } - - var3.hasListener = true; - return 1; } - @ObfuscatedName("ao") + @ObfuscatedName("ms") @ObfuscatedSignature( - descriptor = "(Lbq;I)V", - garbageValue = "439702935" + descriptor = "(II)V", + garbageValue = "-911724199" ) - static void method75(GameEngine var0) { - class213 var1 = SceneTilePaint.method1324(); - - while (var1.method1085()) { - if (var1.field1869 == 13) { - Login.worldSelectOpen = false; - SongTask.leftTitleSprite.drawAt(Login.xPadding, 0); - ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - return; - } - - if (var1.field1869 == 96) { - if (Login.worldSelectPage > 0 && class47.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (var1.field1869 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && FontName.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } - } - - if (MouseHandler.MouseHandler_lastButton == 1 || !class28.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - int var2 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class300.changeWorldSelectSorting(0, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class300.changeWorldSelectSorting(0, 1); - return; - } - - int var3 = Login.xPadding + 390; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class300.changeWorldSelectSorting(1, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class300.changeWorldSelectSorting(1, 1); - return; - } - - int var4 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class300.changeWorldSelectSorting(2, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class300.changeWorldSelectSorting(2, 1); - return; - } - - int var5 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class300.changeWorldSelectSorting(3, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class300.changeWorldSelectSorting(3, 1); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - Login.worldSelectOpen = false; - SongTask.leftTitleSprite.drawAt(Login.xPadding, 0); - ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - return; - } - - if (Login.hoveredWorldIndex != -1) { - World var6 = class387.World_worlds[Login.hoveredWorldIndex]; - if (var6.isDeadman()) { - var6.field677 = "beta"; - } - - boolean var7 = false; - if (var6.properties != Client.worldProperties) { - boolean var8 = (Client.worldProperties & 65536) != 0; - boolean var9 = var6.isDeadman(); - if (var8 && !var9 || !var8 && var9) { - var7 = true; - } - } - - class137.changeWorld(var6); - Login.worldSelectOpen = false; - SongTask.leftTitleSprite.drawAt(Login.xPadding, 0); - ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - if (var7) { - InterfaceParent.reloadJS5(); - } - - return; - } - - if (Login.worldSelectPage > 0 && class47.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class47.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= WorldMapArchiveLoader.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= WorldMapArchiveLoader.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && FontName.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GrandExchangeOfferTotalQuantityComparator.canvasWidth - FontName.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GrandExchangeOfferTotalQuantityComparator.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= WorldMapArchiveLoader.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= WorldMapArchiveLoader.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } - + static final void method69(int var0) { + var0 = Math.max(Math.min(var0, 100), 0); + var0 = 100 - var0; + float var1 = 0.5F + (float)var0 / 200.0F; + HealthBarUpdate.method526((double)var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class200.java b/osrs/src/main/java/class200.java index f117d6b0d..670d059fd 100644 --- a/osrs/src/main/java/class200.java +++ b/osrs/src/main/java/class200.java @@ -2,22 +2,54 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +@ObfuscatedName("hf") public class class200 extends DualNode { + @ObfuscatedName("ce") + static String field1669; + static { new EvictingDualNodeHashTable(64); } - @ObfuscatedName("mr") + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "942209246" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } + + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lmt;I)V", - garbageValue = "937591187" + descriptor = "(ZB)V", + garbageValue = "56" ) - @Export("invalidateWidget") - public static void invalidateWidget(Widget var0) { - if (var0 != null && var0.cycle == Client.field525) { - Client.field403[var0.rootIndex] = true; + static void method1009(boolean var0) { + if (var0) { + ByteArrayPool.method2148(); + } else { + for (int var1 = 0; var1 < class305.musicSongs.size(); ++var1) { + MusicSong var2 = (MusicSong)class305.musicSongs.get(var1); + if (var2 == null) { + class305.musicSongs.remove(var1); + --var1; + } else if (var2.field2863) { + if (var2.midiPcmStream.field2809 > 0) { + --var2.midiPcmStream.field2809; + } + + var2.midiPcmStream.clear(); + var2.midiPcmStream.method1633(); + var2.midiPcmStream.setPcmStreamVolume(0); + class305.musicSongs.remove(var1); + --var1; + } else { + var2.field2863 = true; + } + } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class203.java b/osrs/src/main/java/class203.java deleted file mode 100644 index c9e0d27e7..000000000 --- a/osrs/src/main/java/class203.java +++ /dev/null @@ -1,44 +0,0 @@ -import java.util.concurrent.ThreadFactory; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hu") -final class class203 implements ThreadFactory { - @Export("newThread") - @ObfuscatedName("newThread") - public Thread newThread(Runnable var1) { - return new Thread(var1, "OSRS Maya Anim Load"); - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-82055773" - ) - static final void method1002(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { - for (int var5 = var0; var5 <= var0 + var2; ++var5) { - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { - InvDefinition.field1488[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var5 == var0 + var2 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var3 + var1 == var4 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } - } - - } -} diff --git a/osrs/src/main/java/class209.java b/osrs/src/main/java/class209.java new file mode 100644 index 000000000..b01483fd7 --- /dev/null +++ b/osrs/src/main/java/class209.java @@ -0,0 +1,120 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("il") +public class class209 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + static final class209 field1870; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + static final class209 field1864; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + static final class209 field1868; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + static final class209 field1869; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + public static final class209 field1858; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + static final class209 field1865; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + public static final class209 field1863; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + public static final class209 field1861; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + public static final class209 field1857; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + public static final class209 field1860; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + public static final class209 field1859; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + public static final class209 field1862; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + static final class209 field1866; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lil;" + ) + static final class209 field1867; + @ObfuscatedName("ar") + public final int field1871; + + static { + field1870 = new class209(0); + field1864 = new class209(1); + field1868 = new class209(2); + field1869 = new class209(3); + field1858 = new class209(4, class197.field1641); + field1865 = new class209(5); + field1863 = new class209(6, class197.field1642); + field1861 = new class209(7, class197.field1640); + field1857 = new class209(8, class197.field1643); + field1860 = new class209(9, class197.field1638); + field1859 = new class209(10, class197.field1644); + field1862 = new class209(11, class197.field1639); + field1866 = new class209(12); + field1867 = new class209(13); + } + + class209(int var1) { + this(var1, (class197)null); + } + + @ObfuscatedSignature( + descriptor = "(ILhp;)V" + ) + class209(int var1, class197 var2) { + this.field1871 = var1; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "61" + ) + static int method1087(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class210.java b/osrs/src/main/java/class210.java index 6f4cc56f9..64a498a1b 100644 --- a/osrs/src/main/java/class210.java +++ b/osrs/src/main/java/class210.java @@ -1,109 +1,360 @@ -import java.util.Iterator; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") -public class class210 { - @ObfuscatedName("wr") - static Iterator field1840; - @ObfuscatedName("aw") +@ObfuscatedName("ig") +public class class210 implements class29 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lmi;" ) - static final class210 field1845; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - static final class210 field1847; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - static final class210 field1844; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - static final class210 field1843; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - public static final class210 field1836; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - static final class210 field1842; - @ObfuscatedName("ag") + Widget field1874; + @ObfuscatedName("ae") + boolean field1872; + @ObfuscatedName("ao") + boolean field1873; + + public class210() { + this.field1874 = null; + this.field1872 = false; + this.field1873 = false; + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "(II)Z", + garbageValue = "1089015731" ) - public static final class210 field1833; - @ObfuscatedName("az") + @Export("vmethod3949") + public boolean vmethod3949(int var1) { + if (this.field1874 == null) { + return false; + } else { + class27 var2 = this.field1874.method1846(); + if (var2 == null) { + return false; + } else { + if (var2.method102(var1)) { + switch(var1) { + case 81: + this.field1873 = true; + break; + case 82: + this.field1872 = true; + break; + default: + if (this.method1095(var1)) { + class218.invalidateWidget(this.field1874); + } + } + } + + return var2.method100(var1); + } + } + } + + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "(II)Z", + garbageValue = "-1292750960" ) - public static final class210 field1839; - @ObfuscatedName("av") + public boolean vmethod3989(int var1) { + switch(var1) { + case 81: + this.field1873 = false; + return false; + case 82: + this.field1872 = false; + return false; + default: + return false; + } + } + + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "(CI)Z", + garbageValue = "-352714805" ) - public static final class210 field1838; - @ObfuscatedName("ap") + @Export("vmethod3951") + public boolean vmethod3951(char var1) { + if (this.field1874 == null) { + return false; + } else { + boolean var2; + if (var1 >= ' ' && var1 < 127 || var1 > 127 && var1 < 160 || var1 > 160 && var1 <= 255) { + var2 = true; + } else { + label81: { + if (var1 != 0) { + char[] var3 = class384.cp1252AsciiExtension; + + for (int var4 = 0; var4 < var3.length; ++var4) { + char var5 = var3[var4]; + if (var5 == var1) { + var2 = true; + break label81; + } + } + } + + var2 = false; + } + } + + if (!var2) { + return false; + } else { + class329 var7 = this.field1874.method1844(); + if (var7 != null && var7.method1787()) { + class27 var6 = this.field1874.method1846(); + if (var6 == null) { + return false; + } else { + if (var6.method103(var1) && var7.method1748(var1)) { + class218.invalidateWidget(this.field1874); + } + + return var6.method101(var1); + } + } else { + return false; + } + } + } + } + + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "(ZI)Z", + garbageValue = "-1559971994" ) - public static final class210 field1834; - @ObfuscatedName("aq") + @Export("vmethod3953") + public boolean vmethod3953(boolean var1) { + return false; + } + + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "(Lmi;I)V", + garbageValue = "753644002" ) - public static final class210 field1835; - @ObfuscatedName("at") + public void method1088(Widget var1) { + this.method1090(); + if (var1 != null) { + this.field1874 = var1; + class327 var2 = var1.method1847(); + if (var2 != null) { + var2.field2902.method1731(true); + if (var2.field2898 != null) { + ScriptEvent var3 = new ScriptEvent(); + var3.method479(var1); + var3.setArgs(var2.field2898); + class30.getScriptEvents().addFirst(var3); + } + } + } + + } + + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "(I)Lmi;", + garbageValue = "-869248693" ) - public static final class210 field1837; - @ObfuscatedName("ah") + public Widget method1089() { + return this.field1874; + } + + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "(B)V", + garbageValue = "3" ) - static final class210 field1841; - @ObfuscatedName("ax") + public void method1090() { + if (this.field1874 != null) { + class327 var1 = this.field1874.method1847(); + Widget var2 = this.field1874; + this.field1874 = null; + if (var1 != null) { + var1.field2902.method1731(false); + if (var1.field2898 != null) { + ScriptEvent var3 = new ScriptEvent(); + var3.method479(var2); + var3.setArgs(var1.field2898); + class30.getScriptEvents().addFirst(var3); + } + + } + } + } + + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "(IB)Z", + garbageValue = "-53" ) - static final class210 field1846; - @ObfuscatedName("aa") - public final int field1848; - - static { - field1845 = new class210(0); - field1847 = new class210(1); - field1844 = new class210(2); - field1843 = new class210(3); - field1836 = new class210(4, class197.field1625); - field1842 = new class210(5); - field1833 = new class210(6, class197.field1624); - field1839 = new class210(7, class197.field1623); - field1838 = new class210(8, class197.field1627); - field1834 = new class210(9, class197.field1626); - field1835 = new class210(10, class197.field1622); - field1837 = new class210(11, class197.field1628); - field1841 = new class210(12); - field1846 = new class210(13); - } + boolean method1095(int var1) { + if (this.field1874 == null) { + return false; + } else { + class329 var2 = this.field1874.method1844(); + if (var2 != null && var2.method1787()) { + switch(var1) { + case 13: + this.method1090(); + return true; + case 48: + if (this.field1872) { + var2.method1754(); + } + + return true; + case 65: + if (this.field1872) { + var2.method1773(GrandExchangeOfferTotalQuantityComparator.method1945()); + } - class210(int var1) { - this(var1, (class197)null); + return true; + case 66: + if (this.field1872) { + var2.method1772(GrandExchangeOfferTotalQuantityComparator.method1945()); + } + + return true; + case 67: + if (this.field1872) { + var2.method1774(GrandExchangeOfferTotalQuantityComparator.method1945()); + } + + return true; + case 84: + if (var2.method1793() == 0) { + var2.method1748(10); + } else if (this.field1873 && var2.method1797()) { + var2.method1748(10); + } else { + class327 var3 = this.field1874.method1847(); + ScriptEvent var4 = new ScriptEvent(); + var4.method479(this.field1874); + var4.setArgs(var3.field2901); + class30.getScriptEvents().addFirst(var4); + this.method1090(); + } + + return true; + case 85: + if (this.field1872) { + var2.method1751(); + } else { + var2.method1749(); + } + + return true; + case 96: + if (this.field1872) { + var2.method1762(this.field1873); + } else { + var2.method1760(this.field1873); + } + + return true; + case 97: + if (this.field1872) { + var2.method1763(this.field1873); + } else { + var2.method1761(this.field1873); + } + + return true; + case 98: + if (this.field1872) { + var2.method1775(); + } else { + var2.method1764(this.field1873); + } + + return true; + case 99: + if (this.field1872) { + var2.method1776(); + } else { + var2.method1765(this.field1873); + } + + return true; + case 101: + if (this.field1872) { + var2.method1752(); + } else { + var2.method1750(); + } + + return true; + case 102: + if (this.field1872) { + var2.method1758(this.field1873); + } else { + var2.method1756(this.field1873); + } + + return true; + case 103: + if (this.field1872) { + var2.method1759(this.field1873); + } else { + var2.method1757(this.field1873); + } + + return true; + case 104: + if (this.field1872) { + var2.method1768(this.field1873); + } else { + var2.method1766(this.field1873); + } + + return true; + case 105: + if (this.field1872) { + var2.method1769(this.field1873); + } else { + var2.method1767(this.field1873); + } + + return true; + default: + return false; + } + } else { + return false; + } + } } + @ObfuscatedName("np") @ObfuscatedSignature( - descriptor = "(ILhd;)V" + descriptor = "(IIIILui;Lme;I)V", + garbageValue = "-1589482115" ) - class210(int var1, class197 var2) { - this.field1848 = var1; + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { + int var6 = Client.camAngleY & 2047; + int var7 = var3 * var3 + var2 * var2; + if (var7 <= 6400) { + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var10 = var3 * var8 + var9 * var2 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + if (var7 > 2500) { + var4.method2684(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); + } + + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class211.java b/osrs/src/main/java/class211.java index d59dac4c1..2242ed338 100644 --- a/osrs/src/main/java/class211.java +++ b/osrs/src/main/java/class211.java @@ -2,341 +2,62 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") -public class class211 implements class29 { - @ObfuscatedName("km") +@ObfuscatedName("ie") +public class class211 extends Node { + @ObfuscatedName("ao") + public int field1876; + @ObfuscatedName("at") + public int field1877; + @ObfuscatedName("ac") + public int field1875; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "[Lud;" + descriptor = "Lmi;" ) - @Export("crossSprites") - static SpritePixels[] crossSprites; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lmt;" - ) - Widget field1852; - @ObfuscatedName("ay") - boolean field1851; - @ObfuscatedName("ar") - boolean field1850; - - public class211() { - this.field1852 = null; - this.field1851 = false; - this.field1850 = false; - } + public Widget field1878; - @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1364202239" + descriptor = "(IIILmi;)V" ) - @Export("vmethod3949") - public boolean vmethod3949(int var1) { - if (this.field1852 == null) { - return false; - } else { - class27 var2 = this.field1852.method1807(); - if (var2 == null) { - return false; - } else { - if (var2.method108(var1)) { - switch(var1) { - case 81: - this.field1850 = true; - break; - case 82: - this.field1851 = true; - break; - default: - if (this.method1076(var1)) { - class200.invalidateWidget(this.field1852); - } - } - } - - return var2.method106(var1); - } - } + public class211(int var1, int var2, int var3, Widget var4) { + this.field1875 = var1; + this.field1876 = var2; + this.field1877 = var3; + this.field1878 = var4; } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1960624058" - ) - @Export("vmethod3989") - public boolean vmethod3989(int var1) { - switch(var1) { - case 81: - this.field1850 = false; - return false; - case 82: - this.field1851 = false; - return false; - default: - return false; - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "932068520" - ) - @Export("vmethod3951") - public boolean vmethod3951(char var1) { - if (this.field1852 == null) { - return false; - } else { - boolean var2; - if ((var1 < ' ' || var1 >= 127) && (var1 <= 127 || var1 >= 160) && (var1 <= 160 || var1 > 255)) { - label76: { - if (var1 != 0) { - char[] var3 = class385.cp1252AsciiExtension; - - for (int var4 = 0; var4 < var3.length; ++var4) { - char var5 = var3[var4]; - if (var5 == var1) { - var2 = true; - break label76; - } - } - } - - var2 = false; - } - } else { - var2 = true; - } - - if (!var2) { - return false; + @ObfuscatedName("ae") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (0L == var0 % 37L) { + return null; } else { - class330 var7 = this.field1852.method1805(); - if (var7 != null && var7.method1750()) { - class27 var6 = this.field1852.method1807(); - if (var6 == null) { - return false; - } else { - if (var6.method109(var1) && var7.method1711(var1)) { - class200.invalidateWidget(this.field1852); - } - - return var6.method107(var1); - } - } else { - return false; - } - } - } - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(ZB)Z", - garbageValue = "-93" - ) - @Export("vmethod3953") - public boolean vmethod3953(boolean var1) { - return false; - } + int var2 = 0; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Lmt;B)V", - garbageValue = "-84" - ) - public void method1069(Widget var1) { - this.method1071(); - if (var1 != null) { - this.field1852 = var1; - class328 var2 = var1.method1808(); - if (var2 != null) { - var2.field2886.method1694(true); - if (var2.field2885 != null) { - ScriptEvent var3 = new ScriptEvent(); - var3.method474(var1); - var3.setArgs(var2.field2885); - ClientPacket.getScriptEvents().addFirst(var3); + for (long var3 = var0; var3 != 0L; var3 /= 37L) { + ++var2; } - } - } - - } - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(B)Lmt;", - garbageValue = "-52" - ) - public Widget method1070() { - return this.field1852; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2127531849" - ) - public void method1071() { - if (this.field1852 != null) { - class328 var1 = this.field1852.method1808(); - Widget var2 = this.field1852; - this.field1852 = null; - if (var1 != null) { - var1.field2886.method1694(false); - if (var1.field2885 != null) { - ScriptEvent var3 = new ScriptEvent(); - var3.method474(var2); - var3.setArgs(var1.field2885); - ClientPacket.getScriptEvents().addFirst(var3); + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { + long var6 = var0; + var0 /= 37L; + var8 = class388.base37Table[(int)(var6 - 37L * var0)]; + if (var8 == '_') { + int var9 = var5.length() - 1; + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); + var8 = 160; + } } + var5.reverse(); + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); + return var5.toString(); } - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "7161" - ) - boolean method1076(int var1) { - if (this.field1852 == null) { - return false; } else { - class330 var2 = this.field1852.method1805(); - if (var2 != null && var2.method1750()) { - switch(var1) { - case 13: - this.method1071(); - return true; - case 48: - if (this.field1851) { - var2.method1717(); - } - - return true; - case 65: - if (this.field1851) { - var2.method1736(ClanChannelMember.method772()); - } - - return true; - case 66: - if (this.field1851) { - var2.method1735(ClanChannelMember.method772()); - } - - return true; - case 67: - if (this.field1851) { - var2.method1737(ClanChannelMember.method772()); - } - - return true; - case 84: - if (var2.method1756() == 0) { - var2.method1711(10); - } else if (this.field1850 && var2.method1760()) { - var2.method1711(10); - } else { - class328 var3 = this.field1852.method1808(); - ScriptEvent var4 = new ScriptEvent(); - var4.method474(this.field1852); - var4.setArgs(var3.field2882); - ClientPacket.getScriptEvents().addFirst(var4); - this.method1071(); - } - - return true; - case 85: - if (this.field1851) { - var2.method1714(); - } else { - var2.method1712(); - } - - return true; - case 96: - if (this.field1851) { - var2.method1725(this.field1850); - } else { - var2.method1723(this.field1850); - } - - return true; - case 97: - if (this.field1851) { - var2.method1726(this.field1850); - } else { - var2.method1724(this.field1850); - } - - return true; - case 98: - if (this.field1851) { - var2.method1738(); - } else { - var2.method1727(this.field1850); - } - - return true; - case 99: - if (this.field1851) { - var2.method1739(); - } else { - var2.method1728(this.field1850); - } - - return true; - case 101: - if (this.field1851) { - var2.method1715(); - } else { - var2.method1713(); - } - - return true; - case 102: - if (this.field1851) { - var2.method1721(this.field1850); - } else { - var2.method1719(this.field1850); - } - - return true; - case 103: - if (this.field1851) { - var2.method1722(this.field1850); - } else { - var2.method1720(this.field1850); - } - - return true; - case 104: - if (this.field1851) { - var2.method1731(this.field1850); - } else { - var2.method1729(this.field1850); - } - - return true; - case 105: - if (this.field1851) { - var2.method1732(this.field1850); - } else { - var2.method1730(this.field1850); - } - - return true; - default: - return false; - } - } else { - return false; - } + return null; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class212.java b/osrs/src/main/java/class212.java index a6bf1f5c8..11d7c730f 100644 --- a/osrs/src/main/java/class212.java +++ b/osrs/src/main/java/class212.java @@ -1,42 +1,283 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") -public class class212 extends Node { +import java.util.Arrays; + +@ObfuscatedName("iz") +public class class212 implements class29 { + @ObfuscatedName("au") + char[] field1882; + @ObfuscatedName("ae") + int[] field1888; + @ObfuscatedName("ao") + public int[] field1892; + @ObfuscatedName("at") + @Export("pressedKeysCount") + public int pressedKeysCount; + @ObfuscatedName("ac") + int[] field1887; + @ObfuscatedName("ai") + int field1884; + @ObfuscatedName("az") + int field1886; + @ObfuscatedName("ap") + int field1885; + @ObfuscatedName("aa") + int field1883; + @ObfuscatedName("af") + boolean[] field1880; + @ObfuscatedName("ad") + boolean[] field1879; + @ObfuscatedName("aq") + boolean[] field1881; + @ObfuscatedName("al") + public char field1889; + @ObfuscatedName("an") + public int field1890; + + public class212() { + this.field1882 = new char[128]; + this.field1888 = new int[128]; + this.field1892 = new int[128]; + this.pressedKeysCount = 0; + this.field1887 = new int[128]; + this.field1884 = 0; + this.field1886 = 0; + this.field1885 = 0; + this.field1883 = 0; + this.field1880 = new boolean[112]; + this.field1879 = new boolean[112]; + this.field1881 = new boolean[112]; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1089015731" + ) + @Export("vmethod3949") + public boolean vmethod3949(int var1) { + this.method1102(var1); + this.field1880[var1] = true; + this.field1879[var1] = true; + this.field1881[var1] = false; + this.field1892[++this.pressedKeysCount - 1] = var1; + return true; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1292750960" + ) + @Export("vmethod3989") + public boolean vmethod3989(int var1) { + this.field1880[var1] = false; + this.field1879[var1] = false; + this.field1881[var1] = true; + this.field1887[++this.field1884 - 1] = var1; + return true; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-352714805" + ) + @Export("vmethod3951") + public boolean vmethod3951(char var1) { + int var2 = this.field1885 + 1 & 127; + if (var2 != this.field1886) { + this.field1888[this.field1885] = -1; + this.field1882[this.field1885] = var1; + this.field1885 = var2; + } + + return false; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "-1559971994" + ) + @Export("vmethod3953") + public boolean vmethod3953(boolean var1) { + return false; + } + @ObfuscatedName("ar") - public int field1854; + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "25" + ) + void method1102(int var1) { + int var2 = this.field1885 + 1 & 127; + if (var2 != this.field1886) { + this.field1888[this.field1885] = var1; + this.field1882[this.field1885] = 0; + this.field1885 = var2; + } + + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "831915412" + ) + public void method1104() { + this.field1886 = this.field1883; + this.field1883 = this.field1885; + this.pressedKeysCount = 0; + this.field1884 = 0; + Arrays.fill(this.field1879, false); + Arrays.fill(this.field1881, false); + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1344001483" + ) + public final boolean method1105() { + if (this.field1886 == this.field1883) { + return false; + } else { + this.field1890 = this.field1888[this.field1886]; + this.field1889 = this.field1882[this.field1886]; + this.field1886 = this.field1886 + 1 & 127; + return true; + } + } + @ObfuscatedName("am") - public int field1853; + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1783943803" + ) + public boolean method1106(int var1) { + return var1 >= 0 && var1 < 112 ? this.field1879[var1] : false; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-182514708" + ) + @Export("getKeyPressed") + public boolean getKeyPressed(int var1) { + return var1 >= 0 && var1 < 112 ? this.field1880[var1] : false; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "13" + ) + public boolean method1108(int var1) { + return var1 >= 0 && var1 < 112 ? this.field1881[var1] : false; + } + @ObfuscatedName("as") - public int field1855; - @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "(I)[I", + garbageValue = "-390851826" ) - public Widget field1856; + public int[] method1109() { + int[] var1 = new int[this.pressedKeysCount]; + + for (int var2 = 0; var2 < this.pressedKeysCount; ++var2) { + var1[var2] = this.field1892[var2]; + } + return var1; + } + + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IIILmt;)V" + descriptor = "(B)[I", + garbageValue = "60" ) - public class212(int var1, int var2, int var3, Widget var4) { - this.field1855 = var1; - this.field1854 = var2; - this.field1853 = var3; - this.field1856 = var4; + public int[] method1110() { + int[] var1 = new int[this.field1884]; + + for (int var2 = 0; var2 < this.field1884; ++var2) { + var1[var2] = this.field1887[var2]; + } + + return var1; } - @ObfuscatedName("nw") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lmt;II)Ljava/lang/String;", - garbageValue = "-1905887286" + descriptor = "(IIS)I", + garbageValue = "24356" ) - static String method1077(Widget var0, int var1) { - int var3 = UserComparator8.getWidgetFlags(var0); - boolean var2 = (var3 >> var1 + 1 & 1) != 0; - if (!var2 && var0.onOp == null) { - return null; + static int method1099(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else if (var1 == -1) { + return 0; } else { - return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; + int var3 = 0; + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; + } + } + + return var3; } } -} + + @ObfuscatedName("mp") + @ObfuscatedSignature( + descriptor = "([Lmi;IB)V", + garbageValue = "-27" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null) { + if (var3.type == 0) { + if (var3.children != null) { + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + class385.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + WorldMapSection1.runScriptEvent(var5); + } + + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = class92.getWidget(var3.id); + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { + continue; + } + } + + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onSubChange; + WorldMapSection1.runScriptEvent(var5); + } + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class213.java b/osrs/src/main/java/class213.java deleted file mode 100644 index 8b6c4cf99..000000000 --- a/osrs/src/main/java/class213.java +++ /dev/null @@ -1,230 +0,0 @@ -import java.util.Arrays; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ih") -public class class213 implements class29 { - @ObfuscatedName("aw") - char[] field1860; - @ObfuscatedName("ay") - int[] field1866; - @ObfuscatedName("ar") - public int[] field1870; - @ObfuscatedName("am") - @Export("pressedKeysCount") - public int pressedKeysCount; - @ObfuscatedName("as") - int[] field1865; - @ObfuscatedName("aj") - int field1862; - @ObfuscatedName("ag") - int field1861; - @ObfuscatedName("az") - int field1864; - @ObfuscatedName("av") - int field1863; - @ObfuscatedName("ap") - boolean[] field1857; - @ObfuscatedName("aq") - boolean[] field1858; - @ObfuscatedName("at") - boolean[] field1859; - @ObfuscatedName("ah") - public char field1867; - @ObfuscatedName("ax") - public int field1869; - - public class213() { - this.field1860 = new char[128]; - this.field1866 = new int[128]; - this.field1870 = new int[128]; - this.pressedKeysCount = 0; - this.field1865 = new int[128]; - this.field1862 = 0; - this.field1861 = 0; - this.field1864 = 0; - this.field1863 = 0; - this.field1857 = new boolean[112]; - this.field1858 = new boolean[112]; - this.field1859 = new boolean[112]; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1364202239" - ) - @Export("vmethod3949") - public boolean vmethod3949(int var1) { - this.method1082(var1); - this.field1857[var1] = true; - this.field1858[var1] = true; - this.field1859[var1] = false; - this.field1870[++this.pressedKeysCount - 1] = var1; - return true; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1960624058" - ) - @Export("vmethod3989") - public boolean vmethod3989(int var1) { - this.field1857[var1] = false; - this.field1858[var1] = false; - this.field1859[var1] = true; - this.field1865[++this.field1862 - 1] = var1; - return true; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "932068520" - ) - @Export("vmethod3951") - public boolean vmethod3951(char var1) { - int var2 = this.field1864 + 1 & 127; - if (var2 != this.field1861) { - this.field1866[this.field1864] = -1; - this.field1860[this.field1864] = var1; - this.field1864 = var2; - } - - return false; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(ZB)Z", - garbageValue = "-93" - ) - @Export("vmethod3953") - public boolean vmethod3953(boolean var1) { - return false; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1128886308" - ) - void method1082(int var1) { - int var2 = this.field1864 + 1 & 127; - if (var2 != this.field1861) { - this.field1866[this.field1864] = var1; - this.field1860[this.field1864] = 0; - this.field1864 = var2; - } - - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "196397421" - ) - public void method1084() { - this.field1861 = this.field1863; - this.field1863 = this.field1864; - this.pressedKeysCount = 0; - this.field1862 = 0; - Arrays.fill(this.field1858, false); - Arrays.fill(this.field1859, false); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-560084710" - ) - public final boolean method1085() { - if (this.field1863 == this.field1861) { - return false; - } else { - this.field1869 = this.field1866[this.field1861]; - this.field1867 = this.field1860[this.field1861]; - this.field1861 = this.field1861 + 1 & 127; - return true; - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1196932561" - ) - public boolean method1086(int var1) { - return var1 >= 0 && var1 < 112 ? this.field1858[var1] : false; - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1392271778" - ) - @Export("getKeyPressed") - public boolean getKeyPressed(int var1) { - return var1 >= 0 && var1 < 112 ? this.field1857[var1] : false; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1727357268" - ) - public boolean method1088(int var1) { - return var1 >= 0 && var1 < 112 ? this.field1859[var1] : false; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-1635816541" - ) - public int[] method1089() { - int[] var1 = new int[this.pressedKeysCount]; - - for (int var2 = 0; var2 < this.pressedKeysCount; ++var2) { - var1[var2] = this.field1870[var2]; - } - - return var1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "0" - ) - public int[] method1090() { - int[] var1 = new int[this.field1862]; - - for (int var2 = 0; var2 < this.field1862; ++var2) { - var1[var2] = this.field1865[var2]; - } - - return var1; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;S)V", - garbageValue = "4430" - ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); - if (var4 == null) { - var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); - Messages.Messages_hashTable.put(var5, (long)var5.count); - Messages.Messages_queue.add(var5); - Client.chatCycle = Client.cycleCntr; - } -} diff --git a/osrs/src/main/java/class214.java b/osrs/src/main/java/class214.java new file mode 100644 index 000000000..88cc4f3dd --- /dev/null +++ b/osrs/src/main/java/class214.java @@ -0,0 +1,101 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Arrays; + +@ObfuscatedName("io") +public class class214 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + static final class214 field1903; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + static final class214 field1900; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + public static final class214 field1898; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + static final class214 field1902; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + static final class214 field1899; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + static final class214 field1901; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + static final class214 field1904; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "[Lio;" + ) + static final class214[] field1905; + @ObfuscatedName("ap") + final int field1906; + @ObfuscatedName("aa") + public final int field1907; + @ObfuscatedName("af") + public final int field1908; + + static { + field1903 = new class214(6, 8, 8); + field1900 = new class214(3, 16, 16); + field1898 = new class214(0, 32, 32); + field1902 = new class214(2, 48, 48); + field1899 = new class214(4, 64, 64); + field1901 = new class214(5, 96, 96); + field1904 = new class214(1, 128, 128); + field1905 = class271.method1541(); + Arrays.sort(field1905, new class219()); + } + + class214(int var1, int var2, int var3) { + this.field1906 = var1; + this.field1907 = var2; + this.field1908 = var3; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-4502" + ) + int method1123() { + return this.field1908 * this.field1907; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1568434479" + ) + public static void method1124() { + synchronized(ArchiveDiskActionHandler.field3513) { + if (ArchiveDiskActionHandler.field3512 != 0) { + ArchiveDiskActionHandler.field3512 = 1; + ArchiveDiskActionHandler.field3511 = true; + + try { + ArchiveDiskActionHandler.field3513.wait(); + } catch (InterruptedException var3) { + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class215.java b/osrs/src/main/java/class215.java deleted file mode 100644 index 061df0775..000000000 --- a/osrs/src/main/java/class215.java +++ /dev/null @@ -1,148 +0,0 @@ -import java.io.IOException; -import java.util.Arrays; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ir") -public class class215 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - static final class215 field1882; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - static final class215 field1883; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - public static final class215 field1877; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - static final class215 field1880; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - static final class215 field1881; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - static final class215 field1879; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - static final class215 field1878; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "[Lir;" - ) - static final class215[] field1884; - @ObfuscatedName("az") - final int field1885; - @ObfuscatedName("av") - public final int field1887; - @ObfuscatedName("ap") - public final int field1886; - - static { - field1882 = new class215(2, 8, 8); - field1883 = new class215(4, 16, 16); - field1877 = new class215(1, 32, 32); - field1880 = new class215(0, 48, 48); - field1881 = new class215(6, 64, 64); - field1879 = new class215(5, 96, 96); - field1878 = new class215(3, 128, 128); - field1884 = UserComparator9.method678(); - Arrays.sort(field1884, new class220()); - } - - class215(int var1, int var2, int var3) { - this.field1885 = var1; - this.field1887 = var2; - this.field1886 = var3; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-9015084" - ) - int method1105() { - return this.field1887 * this.field1886; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIII)V", - garbageValue = "-2129316412" - ) - @Export("sortItemsByName") - static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - short var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - short var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - sortItemsByName(var0, var1, var2, var5 - 1); - sortItemsByName(var0, var1, var5 + 1, var3); - } - - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "1689417395" - ) - public static byte[] method1106() { - byte[] var0 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var0); - - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { - } - - if (var1 >= 24) { - throw new IOException(); - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { - var0[var2] = -1; - } - } - - return var0; - } -} diff --git a/osrs/src/main/java/class216.java b/osrs/src/main/java/class216.java new file mode 100644 index 000000000..f425f4ded --- /dev/null +++ b/osrs/src/main/java/class216.java @@ -0,0 +1,149 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ij") +public class class216 { + @ObfuscatedName("au") + final int[][] field1919; + @ObfuscatedName("ae") + final int[][] field1918; + @ObfuscatedName("ao") + int field1913; + @ObfuscatedName("at") + int field1914; + @ObfuscatedName("ac") + final int[] field1916; + @ObfuscatedName("ai") + final int[] field1917; + @ObfuscatedName("az") + final int field1915; + + public class216(int var1, int var2) { + this.field1919 = new int[var1][var2]; + this.field1918 = new int[var1][var2]; + int var3 = var2 * var1; + int var4 = WorldMapIcon_1.method1401(var3 / 4); + this.field1916 = new int[var4]; + this.field1917 = new int[var4]; + this.field1915 = var4 - 1; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "87" + ) + void method1128() { + for (int var1 = 0; var1 < this.field1919.length; ++var1) { + for (int var2 = 0; var2 < this.field1919[var1].length; ++var2) { + this.field1919[var1][var2] = 0; + this.field1918[var1][var2] = 99999999; + } + } + + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "335221263" + ) + void method1129(int var1, int var2) { + this.field1913 = var1; + this.field1914 = var2; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "14" + ) + int method1130() { + return this.field1913; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "0" + ) + int method1131() { + return this.field1914; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1220057291" + ) + int method1132() { + return this.field1919.length; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "63" + ) + int method1133() { + return this.field1919[0].length; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)[[I", + garbageValue = "1666372984" + ) + int[][] method1134() { + return this.field1919; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)[[I", + garbageValue = "-1771437641" + ) + int[][] method1135() { + return this.field1918; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "-1724623959" + ) + int[] method1136() { + return this.field1916; + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "-968317767" + ) + int[] method1137() { + return this.field1917; + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "1" + ) + int method1138() { + return this.field1915; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Ltm;Ljava/lang/String;I)I", + garbageValue = "-1998833421" + ) + public static int method1127(Buffer var0, String var1) { + int var2 = var0.offset; + byte[] var3 = TextureProvider.method1301(var1); + var0.writeSmartByteShort(var3.length); + var0.offset += class334.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); + return var0.offset - var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class217.java b/osrs/src/main/java/class217.java deleted file mode 100644 index f28ff3056..000000000 --- a/osrs/src/main/java/class217.java +++ /dev/null @@ -1,136 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iq") -public class class217 { - @ObfuscatedName("aw") - final int[][] field1897; - @ObfuscatedName("ay") - final int[][] field1898; - @ObfuscatedName("ar") - int field1893; - @ObfuscatedName("am") - int field1892; - @ObfuscatedName("as") - final int[] field1896; - @ObfuscatedName("aj") - final int[] field1895; - @ObfuscatedName("ag") - final int field1894; - - public class217(int var1, int var2) { - this.field1897 = new int[var1][var2]; - this.field1898 = new int[var1][var2]; - int var3 = var2 * var1; - int var4 = UrlRequest.method657(var3 / 4); - this.field1896 = new int[var4]; - this.field1895 = new int[var4]; - this.field1894 = var4 - 1; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-570470539" - ) - void method1111() { - for (int var1 = 0; var1 < this.field1897.length; ++var1) { - for (int var2 = 0; var2 < this.field1897[var1].length; ++var2) { - this.field1897[var1][var2] = 0; - this.field1898[var1][var2] = 99999999; - } - } - - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "527120358" - ) - void method1112(int var1, int var2) { - this.field1893 = var1; - this.field1892 = var2; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1077711185" - ) - int method1113() { - return this.field1893; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1117442087" - ) - int method1114() { - return this.field1892; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "793127968" - ) - int method1115() { - return this.field1897.length; - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-58" - ) - int method1116() { - return this.field1897[0].length; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)[[I", - garbageValue = "-1369726044" - ) - int[][] method1117() { - return this.field1897; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(B)[[I", - garbageValue = "-1" - ) - int[][] method1118() { - return this.field1898; - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-1326597582" - ) - int[] method1119() { - return this.field1896; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "-59" - ) - int[] method1120() { - return this.field1895; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-8466104" - ) - int method1121() { - return this.field1894; - } -} diff --git a/osrs/src/main/java/class218.java b/osrs/src/main/java/class218.java new file mode 100644 index 000000000..efe9af10f --- /dev/null +++ b/osrs/src/main/java/class218.java @@ -0,0 +1,76 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ih") +public class class218 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "[Lij;" + ) + public static class216[] field1926; + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "-1881729951" + ) + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return WorldMapData_1.method1486(var0, 10, true); + } + + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "-7050902" + ) + static int method1146(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == 8000) { + --SoundCache.Interpreter_intStackSize; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_arrayLengths[var3]; + class477.method2370(Interpreter.Interpreter_arrays[var3], new int[var4], 0, var4 - 1); + return 1; + } else if (var0 == 8001) { + SoundCache.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_arrayLengths[var3]; + if (var6 <= 1) { + return 1; + } else { + class409.method2146(Interpreter.Interpreter_arrays[var3], var6, var4, var5); + return 1; + } + } else { + return 2; + } + } + + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-864232113" + ) + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; + } + + @ObfuscatedName("mi") + @ObfuscatedSignature( + descriptor = "(Lmi;I)V", + garbageValue = "634496397" + ) + @Export("invalidateWidget") + public static void invalidateWidget(Widget var0) { + if (var0 != null && var0.cycle == Client.field527) { + Client.field407[var0.rootIndex] = true; + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class219.java b/osrs/src/main/java/class219.java index a260b9c89..b1e7e5a01 100644 --- a/osrs/src/main/java/class219.java +++ b/osrs/src/main/java/class219.java @@ -2,48 +2,68 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") -public class class219 { - @ObfuscatedName("aw") +import java.util.Comparator; + +@ObfuscatedName("it") +public class class219 implements Comparator { + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Luk;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("bw") + @Export("client") @ObfuscatedSignature( - descriptor = "[Liq;" + descriptor = "Lclient;" ) - public static class217[] field1905; + static Client client; + + class219() { + } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IB)Lht;", - garbageValue = "-74" + descriptor = "(Lio;Lio;I)I", + garbageValue = "-975759787" ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); - var1 = new StructComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - StructComposition.StructDefinition_cached.put(var1, (long)var0); - return var1; - } + int method1148(class214 var1, class214 var2) { + return var1.method1123() - var2.method1123(); } - @ObfuscatedName("by") + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method1148((class214)var1, (class214)var2); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILdc;ZB)I", - garbageValue = "61" + descriptor = "(Lnu;Ljava/lang/String;Ljava/lang/String;B)[Luk;", + garbageValue = "-64" ) - static int method1124(int var0, Script var1, boolean var2) { - if (var0 == 7108) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AttackOption.method611() ? 1 : 0; - return 1; + public static IndexedSprite[] method1149(AbstractArchive var0, String var1, String var2) { + if (!var0.isValidFileName(var1, var2)) { + return null; } else { - return 2; + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + return class28.method110(var0, var3, var4); } } -} + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-38" + ) + public static void method1150() { + DbTableType.DBTableType_cache.clear(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class220.java b/osrs/src/main/java/class220.java deleted file mode 100644 index 12aefab75..000000000 --- a/osrs/src/main/java/class220.java +++ /dev/null @@ -1,35 +0,0 @@ -import java.util.Comparator; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("id") -public class class220 implements Comparator { - class220() { - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lir;Lir;B)I", - garbageValue = "71" - ) - int method1125(class215 var1, class215 var2) { - return var1.method1105() - var2.method1105(); - } - - public int compare(Object var1, Object var2) { - return this.method1125((class215)var1, (class215)var2); - } - - public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1166390548" - ) - static final void method1126() { - Tile.method1160("You can't add yourself to your own friend list"); - } -} diff --git a/osrs/src/main/java/class227.java b/osrs/src/main/java/class227.java new file mode 100644 index 000000000..5e9076037 --- /dev/null +++ b/osrs/src/main/java/class227.java @@ -0,0 +1,184 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("im") +public class class227 { + @ObfuscatedName("ac") + @Export("Tiles_overlays") + static short[][][] Tiles_overlays; + @ObfuscatedName("gc") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + static Archive field2040; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "[Leo;" + ) + class127[] field2042; + @ObfuscatedName("ao") + int field2043; + + @ObfuscatedSignature( + descriptor = "(Ltm;I)V" + ) + class227(Buffer var1, int var2) { + this.field2042 = new class127[var2]; + this.field2043 = var1.readUnsignedByte(); + + for (int var3 = 0; var3 < this.field2042.length; ++var3) { + class127 var4 = new class127(this.field2043, var1, false); + this.field2042[var3] = var4; + } + + this.method1211(); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1763972541" + ) + void method1211() { + class127[] var1 = this.field2042; + + for (int var2 = 0; var2 < var1.length; ++var2) { + class127 var3 = var1[var2]; + if (var3.field1222 >= 0) { + var3.field1221 = this.field2042[var3.field1222]; + } + } + + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1286602518" + ) + public int method1212() { + return this.field2042.length; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(II)Leo;", + garbageValue = "-1526328024" + ) + class127 method1213(int var1) { + return var1 >= this.method1212() ? null : this.field2042[var1]; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)[Leo;", + garbageValue = "110730333" + ) + class127[] method1214() { + return this.field2042; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lfv;II)V", + garbageValue = "1299283005" + ) + void method1216(class137 var1, int var2) { + this.method1217(var1, var2, (boolean[])null, false); + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Lfv;I[ZZB)V", + garbageValue = "63" + ) + void method1217(class137 var1, int var2, boolean[] var3, boolean var4) { + int var5 = var1.method747(); + int var6 = 0; + class127[] var7 = this.method1214(); + + for (int var8 = 0; var8 < var7.length; ++var8) { + class127 var9 = var7[var8]; + if (var3 == null || var4 == var3[var6]) { + var1.method749(var2, var9, var6, var5); + } + + ++var6; + } + + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(II)Lhk;", + garbageValue = "-1038928775" + ) + public static VarcInt method1210(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); + var1 = new VarcInt(); + if (var2 != null) { + var1.method954(new Buffer(var2)); + } + + VarcInt.VarcInt_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lnu;Lnu;Lnu;I)V", + garbageValue = "1390466926" + ) + public static void method1215(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + UserComparator2.SequenceDefinition_archive = var0; + VarpDefinition.SequenceDefinition_animationsArchive = var1; + class485.SequenceDefinition_skeletonsArchive = var2; + } + + @ObfuscatedName("gp") + @ObfuscatedSignature( + descriptor = "(B)Lsi;", + garbageValue = "0" + ) + @Export("getWorldMap") + static WorldMap getWorldMap() { + return Canvas.worldMap; + } + + @ObfuscatedName("mt") + @ObfuscatedSignature( + descriptor = "(Lmi;III)V", + garbageValue = "-767534293" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null && WorldMapLabelSize.method1395(var0) != null) { + Client.clickedWidget = var0; + Client.clickedWidgetParent = WorldMapLabelSize.method1395(var0); + Client.widgetClickX = var1; + Client.widgetClickY = var2; + class159.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var3 = Client.menuOptionsCount - 1; + if (var3 != -1) { + class9.tempMenuAction = new MenuAction(); + class9.tempMenuAction.param0 = Client.menuArguments1[var3]; + class9.tempMenuAction.param1 = Client.menuArguments2[var3]; + class9.tempMenuAction.opcode = Client.menuOpcodes[var3]; + class9.tempMenuAction.identifier = Client.menuIdentifiers[var3]; + class9.tempMenuAction.itemId = Client.menuItemIds[var3]; + class9.tempMenuAction.action = Client.menuActions[var3]; + class9.tempMenuAction.target = Client.menuTargets[var3]; + } + + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class228.java b/osrs/src/main/java/class228.java index 232c8ee88..c143f5b2e 100644 --- a/osrs/src/main/java/class228.java +++ b/osrs/src/main/java/class228.java @@ -1,140 +1,97 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iv") -public class class228 { - @ObfuscatedName("ay") +@ObfuscatedName("id") +public abstract class class228 extends Rasterizer2D { + @ObfuscatedName("au") + boolean field2045; + @ObfuscatedName("ae") + boolean field2044; + @ObfuscatedName("az") + int[] field2046; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Lek;" + descriptor = "Ljl;" ) - class127[] field2018; - @ObfuscatedName("ar") - int field2019; + Clips field2047; @ObfuscatedSignature( - descriptor = "(Lty;I)V" + descriptor = "(Ljl;)V" ) - class228(Buffer var1, int var2) { - this.field2018 = new class127[var2]; - this.field2019 = var1.readUnsignedByte(); - - for (int var3 = 0; var3 < this.field2018.length; ++var3) { - class127 var4 = new class127(this.field2019, var1, false); - this.field2018[var3] = var4; - } - - this.method1188(); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-5" - ) - void method1188() { - class127[] var1 = this.field2018; - - for (int var2 = 0; var2 < var1.length; ++var2) { - class127 var3 = var1[var2]; - if (var3.field1213 >= 0) { - var3.field1212 = this.field2018[var3.field1213]; - } - } - + class228(Clips var1) { + this.field2045 = false; + this.field2044 = false; + this.field2046 = Rasterizer3D.Rasterizer3D_colorPalette; + this.field2047 = var1; } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "3739" - ) - public int method1189() { - return this.field2018.length; + @ObfuscatedName("au") + void method1220(int[] var1, int var2, int var3, float[] var4) { + Rasterizer2D.method2620(var1, var2, var3, var4); } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)Lek;", - garbageValue = "1197556608" - ) - class127 method1191(int var1) { - return var1 >= this.method1189() ? null : this.field2018[var1]; + @ObfuscatedName("at") + void method1223(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, byte var13, byte var14, byte var15, byte var16) { + var10 = method1221(var10, var13, var14, var15, var16); + var11 = method1221(var11, var13, var14, var15, var16); + var12 = method1221(var12, var13, var14, var15, var16); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12); } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(B)[Lek;", - garbageValue = "104" - ) - class127[] method1192() { - return this.field2018; + @ObfuscatedName("ac") + void method1224(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, byte var11, byte var12, byte var13, byte var14) { + int var15 = method1221(var10, var11, var12, var13, var14); + var10 = this.field2046[var15]; + this.vmethod1366(var1, var2, var3, var4, var5, var6, var7, var8, var9, var10); } - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lfz;II)V", - garbageValue = "233488741" - ) - void method1193(class137 var1, int var2) { - this.method1194(var1, var2, (boolean[])null, false); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Lfz;I[ZZI)V", - garbageValue = "2080039921" - ) - void method1194(class137 var1, int var2, boolean[] var3, boolean var4) { - int var5 = var1.method736(); - int var6 = 0; - class127[] var7 = this.method1192(); - - for (int var8 = 0; var8 < var7.length; ++var8) { - class127 var9 = var7[var8]; - if (var3 == null || var4 == var3[var6]) { - var1.method738(var2, var9, var6, var5); - } - - ++var6; + @ObfuscatedName("ai") + @Export("vmethod1374") + abstract void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12); + + @ObfuscatedName("az") + @Export("vmethod1366") + abstract void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10); + + @ObfuscatedName("ap") + @Export("vmethod1378") + abstract void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22); + + @ObfuscatedName("aa") + @Export("vmethod1362") + abstract void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22); + + @ObfuscatedName("ae") + static int method1221(int var0, byte var1, byte var2, byte var3, byte var4) { + int var5 = var0 >> 10 & 63; + int var6 = var0 >> 7 & 7; + int var7 = var0 & 127; + int var8 = var4 & 255; + if (var1 != -1) { + var5 += var8 * (var1 - var5) >> 7; } - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Lut;", - garbageValue = "1151848897" - ) - public static PrivateChatMode method1187(int var0) { - PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4228, PrivateChatMode.field4229, PrivateChatMode.field4227}; - PrivateChatMode[] var2 = var1; + if (var2 != -1) { + var6 += var8 * (var2 - var6) >> 7; + } - for (int var3 = 0; var3 < var2.length; ++var3) { - PrivateChatMode var4 = var2[var3]; - if (var0 == var4.id) { - return var4; - } + if (var3 != -1) { + var7 += var8 * (var3 - var7) >> 7; } - return null; + return (var5 << 10 | var6 << 7 | var7) & 65535; } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1771033339" - ) - public static int method1190(int var0) { - return class304.field2739[var0]; - } + @ObfuscatedName("ao") + static final int method1222(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1328962536" - ) - public static int method1195(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; + return (var0 & 65408) + var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class229.java b/osrs/src/main/java/class229.java deleted file mode 100644 index c65cb883a..000000000 --- a/osrs/src/main/java/class229.java +++ /dev/null @@ -1,97 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ii") -public abstract class class229 extends Rasterizer2D { - @ObfuscatedName("aw") - boolean field2020; - @ObfuscatedName("ay") - boolean field2021; - @ObfuscatedName("ag") - int[] field2022; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - Clips field2023; - - @ObfuscatedSignature( - descriptor = "(Ljq;)V" - ) - class229(Clips var1) { - this.field2020 = false; - this.field2021 = false; - this.field2022 = Rasterizer3D.Rasterizer3D_colorPalette; - this.field2023 = var1; - } - - @ObfuscatedName("aw") - void method1196(int[] var1, int var2, int var3, float[] var4) { - Rasterizer2D.method2601(var1, var2, var3, var4); - } - - @ObfuscatedName("am") - void method1199(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, byte var13, byte var14, byte var15, byte var16) { - var10 = method1197(var10, var13, var14, var15, var16); - var11 = method1197(var11, var13, var14, var15, var16); - var12 = method1197(var12, var13, var14, var15, var16); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12); - } - - @ObfuscatedName("as") - void method1200(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, byte var11, byte var12, byte var13, byte var14) { - int var15 = method1197(var10, var11, var12, var13, var14); - var10 = this.field2022[var15]; - this.vmethod1366(var1, var2, var3, var4, var5, var6, var7, var8, var9, var10); - } - - @ObfuscatedName("aj") - @Export("vmethod1374") - abstract void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12); - - @ObfuscatedName("ag") - @Export("vmethod1366") - abstract void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10); - - @ObfuscatedName("az") - @Export("vmethod1378") - abstract void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22); - - @ObfuscatedName("av") - @Export("vmethod1362") - abstract void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22); - - @ObfuscatedName("ay") - static int method1197(int var0, byte var1, byte var2, byte var3, byte var4) { - int var5 = var0 >> 10 & 63; - int var6 = var0 >> 7 & 7; - int var7 = var0 & 127; - int var8 = var4 & 255; - if (var1 != -1) { - var5 += var8 * (var1 - var5) >> 7; - } - - if (var2 != -1) { - var6 += var8 * (var2 - var6) >> 7; - } - - if (var3 != -1) { - var7 += var8 * (var3 - var7) >> 7; - } - - return (var5 << 10 | var6 << 7 | var7) & 65535; - } - - @ObfuscatedName("ar") - static final int method1198(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } -} diff --git a/osrs/src/main/java/class238.java b/osrs/src/main/java/class238.java new file mode 100644 index 000000000..d44028df8 --- /dev/null +++ b/osrs/src/main/java/class238.java @@ -0,0 +1,56 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("je") +public class class238 { + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-27" + ) + static String method1310() { + String var0; + if (class449.clientPreferences.getIsUsernameHidden()) { + String var2 = Login.Login_username; + String var1 = class270.method1538('*', var2.length()); + var0 = var1; + } else { + var0 = Login.Login_username; + } + + return var0; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1067657553" + ) + public static boolean method1309(int var0) { + return (var0 >> 20 & 1) != 0; + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(ILdh;ZB)I", + garbageValue = "-50" + ) + static int method1311(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3500) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.getKeyPressed(var3) ? 1 : 0; + return 1; + } else if (var0 == 3501) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1106(var3) ? 1 : 0; + return 1; + } else if (var0 == 3502) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1108(var3) ? 1 : 0; + return 1; + } else { + return 2; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class239.java b/osrs/src/main/java/class239.java deleted file mode 100644 index f183337ee..000000000 --- a/osrs/src/main/java/class239.java +++ /dev/null @@ -1,32 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jh") -public class class239 { - @ObfuscatedName("av") - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(ILmt;IIIII[FB)Lmt;", - garbageValue = "-37" - ) - static Widget method1282(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) { - Widget var8 = new Widget(); - var8.type = var0; - var8.parentId = var1.id; - var8.childIndex = var2; - var8.isIf3 = true; - var8.xAlignment = var3; - var8.yAlignment = var4; - var8.widthAlignment = var5; - var8.heightAlignment = var6; - var8.rawX = (int)((float)var1.width * var7[0]); - var8.rawY = (int)((float)var1.height * var7[1]); - var8.rawWidth = (int)(var7[2] * (float)var1.width); - var8.rawHeight = (int)(var7[3] * (float)var1.height); - return var8; - } -} diff --git a/osrs/src/main/java/class244.java b/osrs/src/main/java/class243.java similarity index 88% rename from osrs/src/main/java/class244.java rename to osrs/src/main/java/class243.java index b9a3181d7..7b2534b8d 100644 --- a/osrs/src/main/java/class244.java +++ b/osrs/src/main/java/class243.java @@ -2,16 +2,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jw") -public class class244 extends class229 { +@ObfuscatedName("ji") +public class class243 extends class228 { @ObfuscatedSignature( - descriptor = "(Ljq;)V" + descriptor = "(Ljl;)V" ) - class244(Clips var1) { + class243(Clips var1) { super(var1); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("vmethod1374") void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12) { int var13 = var5 - var4; @@ -45,8 +45,8 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var22 != 0) { int var23 = (var17 * var16 - var18 * var14 << 8) / var22; int var24 = (var18 * var13 - var17 * var15 << 8) / var22; - int[] var25 = super.field2023.Rasterizer3D_rowOffsets; - int var26 = super.field2023.field2249; + int[] var25 = super.field2047.Rasterizer3D_rowOffsets; + int var26 = super.field2047.field2269; if (var1 <= var2 && var1 <= var3) { if (var1 < var26) { if (var2 > var26) { @@ -87,7 +87,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var23); var6 += var21; var5 += var19; var10 += var24; @@ -95,7 +95,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); var6 += var21; var4 += var20; var10 += var24; @@ -115,7 +115,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var23); var6 += var21; var5 += var19; var10 += var24; @@ -123,7 +123,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); var6 += var21; var4 += var20; var10 += var24; @@ -159,7 +159,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); var6 += var19; var4 += var20; var10 += var24; @@ -167,7 +167,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var23); var5 += var21; var4 += var20; var10 += var24; @@ -187,7 +187,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); var6 += var19; var4 += var20; var10 += var24; @@ -195,7 +195,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var23); var5 += var21; var4 += var20; var10 += var24; @@ -244,7 +244,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var23); var4 += var20; var6 += var21; var11 += var24; @@ -252,7 +252,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); var4 += var20; var5 += var19; var11 += var24; @@ -272,7 +272,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var23); var4 += var20; var6 += var21; var11 += var24; @@ -280,7 +280,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); var4 += var20; var5 += var19; var11 += var24; @@ -316,7 +316,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); var4 += var21; var5 += var19; var11 += var24; @@ -324,7 +324,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var23); var6 += var20; var5 += var19; var11 += var24; @@ -344,7 +344,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); var4 += var21; var5 += var19; var11 += var24; @@ -352,7 +352,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var23); var6 += var20; var5 += var19; var11 += var24; @@ -400,7 +400,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var23); var5 += var19; var4 += var20; var12 += var24; @@ -408,7 +408,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); var5 += var19; var6 += var21; var12 += var24; @@ -428,7 +428,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var23); var5 += var19; var4 += var20; var12 += var24; @@ -436,7 +436,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); var5 += var19; var6 += var21; var12 += var24; @@ -472,7 +472,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); var5 += var20; var6 += var21; var12 += var24; @@ -480,7 +480,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var23); var4 += var19; var6 += var21; var12 += var24; @@ -500,7 +500,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); var5 += var20; var6 += var21; var12 += var24; @@ -508,7 +508,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1326(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var23); + this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var23); var4 += var19; var6 += var21; var12 += var24; @@ -520,7 +520,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("vmethod1366") void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10) { int var11 = 0; @@ -538,8 +538,8 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo var13 = (var4 - var6 << 14) / (var1 - var3); } - int[] var14 = super.field2023.Rasterizer3D_rowOffsets; - int var15 = super.field2023.field2249; + int[] var14 = super.field2047.Rasterizer3D_rowOffsets; + int var15 = super.field2047.field2269; if (var1 <= var2 && var1 <= var3) { if (var1 < var15) { if (var2 > var15) { @@ -578,14 +578,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14); var6 += var13; var5 += var12; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); var6 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -604,14 +604,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14); var6 += var13; var5 += var12; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); var6 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -645,14 +645,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); var6 += var12; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14); var5 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -671,14 +671,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); var6 += var12; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14); var5 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -724,14 +724,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14); var4 += var11; var6 += var13; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); var4 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -750,14 +750,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14); var4 += var11; var6 += var13; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); var4 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -791,14 +791,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); var4 += var13; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14); var6 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -817,14 +817,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); var4 += var13; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14); var6 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -869,14 +869,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14); var5 += var12; var4 += var11; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); var5 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -895,14 +895,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14); var5 += var12; var4 += var11; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); var5 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -936,14 +936,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); var5 += var11; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14); var4 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -962,14 +962,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); var5 += var11; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1328(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14); + this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14); var4 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -979,16 +979,16 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("az") + @ObfuscatedName("ap") void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2023.Rasterizer3D_textureLoader.getTexturePixels(var22); + int[] var23 = super.field2047.Rasterizer3D_textureLoader.getTexturePixels(var22); int var24; if (var23 == null) { - var24 = super.field2023.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class229.method1198(var24, var10), class229.method1198(var24, var11), class229.method1198(var24, var12)); + var24 = super.field2047.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class228.method1222(var24, var10), class228.method1222(var24, var11), class228.method1222(var24, var12)); } else { - super.field2021 = super.field2023.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2020 = super.field2023.Rasterizer3D_textureLoader.vmethod3989(var22); + super.field2044 = super.field2047.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2045 = super.field2047.Rasterizer3D_textureLoader.vmethod3989(var22); var24 = var5 - var4; int var25 = var2 - var1; int var26 = var6 - var4; @@ -1014,7 +1014,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var33 != 0) { int var34 = (var28 * var27 - var29 * var25 << 9) / var33; int var35 = (var29 * var24 - var28 * var26 << 9) / var33; - int var36 = super.field2023.field2253; + int var36 = super.field2047.field2280; var14 = var13 - var14; var17 = var16 - var17; var20 = var19 - var20; @@ -1030,8 +1030,8 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo int var43 = var17 * var15 - var18 * var14 << 14; int var44 = (int)(((long)(var18 * var20 - var17 * var21) << 3 << 14) / (long)var36); int var45 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var36); - int[] var46 = super.field2023.Rasterizer3D_rowOffsets; - int var47 = super.field2023.field2249; + int[] var46 = super.field2047.Rasterizer3D_rowOffsets; + int var47 = super.field2047.field2269; int var48; if (var1 <= var2 && var1 <= var3) { if (var1 < var47) { @@ -1059,7 +1059,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var48 = var1 - super.field2023.field2250; + var48 = var1 - super.field2047.field2274; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1077,7 +1077,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1088,7 +1088,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1111,7 +1111,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1122,7 +1122,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1147,7 +1147,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var48 = var1 - super.field2023.field2250; + var48 = var1 - super.field2047.field2274; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1165,7 +1165,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1176,7 +1176,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1199,7 +1199,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1210,7 +1210,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1248,7 +1248,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var48 = var2 - super.field2023.field2250; + var48 = var2 - super.field2047.field2274; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1266,7 +1266,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1277,7 +1277,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1300,7 +1300,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1311,7 +1311,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1336,7 +1336,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var48 = var2 - super.field2023.field2250; + var48 = var2 - super.field2047.field2274; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1354,7 +1354,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -1365,7 +1365,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -1388,7 +1388,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -1399,7 +1399,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -1436,7 +1436,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var48 = var3 - super.field2023.field2250; + var48 = var3 - super.field2047.field2274; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1454,7 +1454,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -1465,7 +1465,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -1488,7 +1488,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -1499,7 +1499,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -1524,7 +1524,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var48 = var3 - super.field2023.field2250; + var48 = var3 - super.field2047.field2274; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1542,7 +1542,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -1553,7 +1553,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -1576,7 +1576,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -1587,7 +1587,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1330(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -1603,16 +1603,16 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("av") + @ObfuscatedName("aa") void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2023.Rasterizer3D_textureLoader.getTexturePixels(var22); + int[] var23 = super.field2047.Rasterizer3D_textureLoader.getTexturePixels(var22); int var24; if (var23 == null) { - var24 = super.field2023.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class229.method1198(var24, var10), class229.method1198(var24, var11), class229.method1198(var24, var12)); + var24 = super.field2047.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class228.method1222(var24, var10), class228.method1222(var24, var11), class228.method1222(var24, var12)); } else { - super.field2021 = super.field2023.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2020 = super.field2023.Rasterizer3D_textureLoader.vmethod3989(var22); + super.field2044 = super.field2047.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2045 = super.field2047.Rasterizer3D_textureLoader.vmethod3989(var22); var24 = var5 - var4; int var25 = var2 - var1; int var26 = var6 - var4; @@ -1638,7 +1638,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var33 != 0) { int var34 = (var28 * var27 - var29 * var25 << 9) / var33; int var35 = (var29 * var24 - var28 * var26 << 9) / var33; - int var36 = super.field2023.field2253; + int var36 = super.field2047.field2280; var14 = var13 - var14; var17 = var16 - var17; var20 = var19 - var20; @@ -1654,9 +1654,9 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo int var43 = var17 * var15 - var18 * var14 << 14; int var44 = (int)(((long)(var18 * var20 - var17 * var21) << 14) / (long)var36); int var45 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var36); - int[] var46 = super.field2023.Rasterizer3D_rowOffsets; - int var47 = super.field2023.field2249; - int var48 = super.field2023.field2250; + int[] var46 = super.field2047.Rasterizer3D_rowOffsets; + int var47 = super.field2047.field2269; + int var48 = super.field2047.field2274; int var49; if (var1 <= var2 && var1 <= var3) { if (var1 < var47) { @@ -1702,7 +1702,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1713,7 +1713,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1736,7 +1736,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1747,7 +1747,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1790,7 +1790,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1801,7 +1801,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1824,7 +1824,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1835,7 +1835,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1891,7 +1891,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1902,7 +1902,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1925,7 +1925,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1936,7 +1936,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1979,7 +1979,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -1990,7 +1990,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -2013,7 +2013,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -2024,7 +2024,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -2079,7 +2079,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -2090,7 +2090,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -2113,7 +2113,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -2124,7 +2124,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -2167,7 +2167,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -2178,7 +2178,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -2201,7 +2201,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -2212,7 +2212,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1332(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -2228,11 +2228,11 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("bv") - final void method1326(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - if (super.field2023.field2241) { - if (var6 > super.field2023.field2242) { - var6 = super.field2023.field2242; + @ObfuscatedName("bf") + final void method1354(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + if (super.field2047.field2268) { + if (var6 > super.field2047.field2276) { + var6 = super.field2047.field2276; } if (var5 < 0) { @@ -2247,14 +2247,14 @@ final void method1326(int[] var1, int var2, int var3, int var4, int var5, int va int var10; int var11; int var12; - if (super.field2023.field2252) { + if (super.field2047.field2279) { var4 = var6 - var5 >> 2; var8 <<= 2; - if (super.field2023.field2248 == 0) { + if (super.field2047.field2275 == 0) { if (var4 > 0) { do { var9 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2022[var9]; + var3 = super.field2046[var9]; var7 += var8; var1[var2++] = var3; var1[var2++] = var3; @@ -2267,7 +2267,7 @@ final void method1326(int[] var1, int var2, int var3, int var4, int var5, int va var4 = var6 - var5 & 3; if (var4 > 0) { var9 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2022[var9]; + var3 = super.field2046[var9]; do { var1[var2++] = var3; @@ -2275,12 +2275,12 @@ final void method1326(int[] var1, int var2, int var3, int var4, int var5, int va } while(var4 > 0); } } else { - var9 = super.field2023.field2248; - var10 = 256 - super.field2023.field2248; + var9 = super.field2047.field2275; + var10 = 256 - super.field2047.field2275; if (var4 > 0) { do { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2022[var11]; + var3 = super.field2046[var11]; var7 += var8; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); var12 = var1[var2]; @@ -2298,7 +2298,7 @@ final void method1326(int[] var1, int var2, int var3, int var4, int var5, int va var4 = var6 - var5 & 3; if (var4 > 0) { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2022[var11]; + var3 = super.field2046[var11]; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); do { @@ -2311,20 +2311,20 @@ final void method1326(int[] var1, int var2, int var3, int var4, int var5, int va } else { var4 = var6 - var5; - if (super.field2023.field2248 == 0) { + if (super.field2047.field2275 == 0) { do { var9 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var1[var2++] = super.field2022[var9]; + var1[var2++] = super.field2046[var9]; var7 += var8; --var4; } while(var4 > 0); } else { - var9 = super.field2023.field2248; - var10 = 256 - super.field2023.field2248; + var9 = super.field2047.field2275; + var10 = 256 - super.field2047.field2275; do { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2022[var11]; + var3 = super.field2046[var11]; var7 += var8; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); var12 = var1[var2]; @@ -2338,10 +2338,10 @@ final void method1326(int[] var1, int var2, int var3, int var4, int var5, int va } @ObfuscatedName("bq") - void method1328(int[] var1, int var2, int var3, int var4, int var5, int var6) { - if (super.field2023.field2241) { - if (var6 > super.field2023.field2242) { - var6 = super.field2023.field2242; + void method1356(int[] var1, int var2, int var3, int var4, int var5, int var6) { + if (super.field2047.field2268) { + if (var6 > super.field2047.field2276) { + var6 = super.field2047.field2276; } if (var5 < 0) { @@ -2352,8 +2352,8 @@ void method1328(int[] var1, int var2, int var3, int var4, int var5, int var6) { if (var5 < var6) { var2 += var5; var4 = var6 - var5 >> 2; - if (super.field2023.field2248 != 0) { - if (super.field2023.field2248 == 254) { + if (super.field2047.field2275 != 0) { + if (super.field2047.field2275 == 254) { while (true) { --var4; if (var4 < 0) { @@ -2375,8 +2375,8 @@ void method1328(int[] var1, int var2, int var3, int var4, int var5, int var6) { var1[var2++] = var1[var2]; } } else { - int var7 = super.field2023.field2248; - int var8 = 256 - super.field2023.field2248; + int var7 = super.field2047.field2275; + int var8 = 256 - super.field2047.field2275; var3 = ((var3 & 16711935) * var8 >> 8 & 16711935) + (var8 * (var3 & 65280) >> 8 & 65280); while (true) { @@ -2431,11 +2431,11 @@ void method1328(int[] var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("bo") - void method1330(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { - if (super.field2023.field2241) { - if (var7 > super.field2023.field2242) { - var7 = super.field2023.field2242; + @ObfuscatedName("ba") + void method1358(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + if (super.field2047.field2268) { + if (var7 > super.field2047.field2276) { + var7 = super.field2047.field2276; } if (var6 < 0) { @@ -2456,8 +2456,8 @@ void method1330(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var22; int var23; int var24; - if (super.field2021) { - var24 = var6 - super.field2023.field2246; + if (super.field2044) { + var24 = var6 - super.field2047.field2272; var10 += (var13 >> 3) * var24; var11 += var24 * (var14 >> 3); var12 += (var15 >> 3) * var24; @@ -2497,7 +2497,7 @@ void method1330(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2020) { + if (super.field2045) { if (var18 > 0) { do { var4 = var2[(var3 & 4032) + (var3 >>> 26)]; @@ -2652,7 +2652,7 @@ void method1330(int[] var1, int[] var2, int var3, int var4, int var5, int var6, } } } else { - var24 = var6 - super.field2023.field2246; + var24 = var6 - super.field2047.field2272; var10 += (var13 >> 3) * var24; var11 += var24 * (var14 >> 3); var12 += (var15 >> 3) * var24; @@ -2692,7 +2692,7 @@ void method1330(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2020) { + if (super.field2045) { if (var18 > 0) { do { var4 = var2[(var3 & 16256) + (var3 >>> 25)]; @@ -2851,11 +2851,11 @@ void method1330(int[] var1, int[] var2, int var3, int var4, int var5, int var6, } } - @ObfuscatedName("br") - void method1332(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { - if (super.field2023.field2241) { - if (var7 > super.field2023.field2242) { - var7 = super.field2023.field2242; + @ObfuscatedName("bl") + void method1360(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + if (super.field2047.field2268) { + if (var7 > super.field2047.field2276) { + var7 = super.field2047.field2276; } if (var6 < 0) { @@ -2875,8 +2875,8 @@ void method1332(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var22; int var23; int var24; - if (super.field2021) { - var24 = var6 - super.field2023.field2246; + if (super.field2044) { + var24 = var6 - super.field2047.field2272; var10 += var13 * var24; var11 += var24 * var14; var12 += var24 * var15; @@ -2906,7 +2906,7 @@ void method1332(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2020) { + if (super.field2045) { if (var18 > 0) { do { var4 = var2[(var3 & 4032) + (var3 >>> 26)]; @@ -3019,7 +3019,7 @@ void method1332(int[] var1, int[] var2, int var3, int var4, int var5, int var6, } } } else { - var24 = var6 - super.field2023.field2246; + var24 = var6 - super.field2047.field2272; var10 += var13 * var24; var11 += var24 * var14; var12 += var24 * var15; @@ -3049,7 +3049,7 @@ void method1332(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2020) { + if (super.field2045) { if (var18 > 0) { do { var4 = var2[(var3 & 16256) + (var3 >>> 25)]; @@ -3165,4 +3165,4 @@ void method1332(int[] var1, int[] var2, int var3, int var4, int var5, int var6, } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class246.java b/osrs/src/main/java/class245.java similarity index 81% rename from osrs/src/main/java/class246.java rename to osrs/src/main/java/class245.java index 7dccfe4b9..712e895d5 100644 --- a/osrs/src/main/java/class246.java +++ b/osrs/src/main/java/class245.java @@ -2,16 +2,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") -public class class246 extends class229 { +@ObfuscatedName("jj") +public class class245 extends class228 { @ObfuscatedSignature( - descriptor = "(Ljq;)V" + descriptor = "(Ljl;)V" ) - class246(Clips var1) { + class245(Clips var1) { super(var1); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @Export("vmethod1374") void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12) { int var13 = var5 - var4; @@ -49,8 +49,8 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo int var26 = (var18 * var13 - var17 * var15 << 8) / var24; float var27 = (var19 * (float)var16 - var20 * (float)var14) / (float)var24; float var28 = (var20 * (float)var13 - var19 * (float)var15) / (float)var24; - int[] var29 = super.field2023.Rasterizer3D_rowOffsets; - int var30 = super.field2023.field2249; + int[] var29 = super.field2047.Rasterizer3D_rowOffsets; + int var30 = super.field2047.field2269; if (var1 <= var2 && var1 <= var3) { if (var1 < var30) { if (var2 > var30) { @@ -93,7 +93,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var25, var7, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var25, var7, var27); var6 += var23; var5 += var21; var10 += var26; @@ -102,7 +102,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); var6 += var23; var4 += var22; var10 += var26; @@ -123,7 +123,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var25, var7, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var25, var7, var27); var6 += var23; var5 += var21; var10 += var26; @@ -132,7 +132,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); var6 += var23; var4 += var22; var10 += var26; @@ -170,7 +170,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); var6 += var21; var4 += var22; var10 += var26; @@ -179,7 +179,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var25, var7, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var25, var7, var27); var5 += var23; var4 += var22; var10 += var26; @@ -200,7 +200,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); var6 += var21; var4 += var22; var10 += var26; @@ -209,7 +209,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var25, var7, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var25, var7, var27); var5 += var23; var4 += var22; var10 += var26; @@ -261,7 +261,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var25, var8, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var25, var8, var27); var4 += var22; var6 += var23; var11 += var26; @@ -270,7 +270,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); var4 += var22; var5 += var21; var11 += var26; @@ -291,7 +291,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var25, var8, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var25, var8, var27); var4 += var22; var6 += var23; var11 += var26; @@ -300,7 +300,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); var4 += var22; var5 += var21; var11 += var26; @@ -338,7 +338,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); var4 += var23; var5 += var21; var11 += var26; @@ -347,7 +347,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var25, var8, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var25, var8, var27); var6 += var22; var5 += var21; var11 += var26; @@ -368,7 +368,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); var4 += var23; var5 += var21; var11 += var26; @@ -377,7 +377,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var25, var8, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var25, var8, var27); var6 += var22; var5 += var21; var11 += var26; @@ -428,7 +428,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var25, var9, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var25, var9, var27); var5 += var21; var4 += var22; var12 += var26; @@ -437,7 +437,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); var5 += var21; var6 += var23; var12 += var26; @@ -458,7 +458,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var25, var9, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var25, var9, var27); var5 += var21; var4 += var22; var12 += var26; @@ -467,7 +467,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); var5 += var21; var6 += var23; var12 += var26; @@ -505,7 +505,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); var5 += var22; var6 += var23; var12 += var26; @@ -514,7 +514,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var25, var9, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var25, var9, var27); var4 += var21; var6 += var23; var12 += var26; @@ -535,7 +535,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); var5 += var22; var6 += var23; var12 += var26; @@ -544,7 +544,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1341(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var25, var9, var27); + this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var25, var9, var27); var4 += var21; var6 += var23; var12 += var26; @@ -557,7 +557,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("vmethod1366") void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10) { int var11 = var5 - var4; @@ -591,8 +591,8 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var20 != 0) { float var21 = (var15 * (float)var14 - var16 * (float)var12) / (float)var20; float var22 = (var16 * (float)var11 - var15 * (float)var13) / (float)var20; - int[] var23 = super.field2023.Rasterizer3D_rowOffsets; - int var24 = super.field2023.field2249; + int[] var23 = super.field2047.Rasterizer3D_rowOffsets; + int var24 = super.field2047.field2269; if (var1 <= var2 && var1 <= var3) { if (var1 < var24) { if (var2 > var24) { @@ -633,7 +633,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14, var7, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14, var7, var21); var6 += var19; var5 += var17; var1 += Rasterizer2D.Rasterizer2D_width; @@ -641,7 +641,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); var6 += var19; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -661,7 +661,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14, var7, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14, var7, var21); var6 += var19; var5 += var17; var1 += Rasterizer2D.Rasterizer2D_width; @@ -669,7 +669,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); var6 += var19; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -705,7 +705,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); var6 += var17; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -713,7 +713,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14, var7, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14, var7, var21); var5 += var19; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -733,7 +733,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); var6 += var17; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -741,7 +741,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14, var7, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14, var7, var21); var5 += var19; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -790,7 +790,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14, var8, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14, var8, var21); var4 += var18; var6 += var19; var2 += Rasterizer2D.Rasterizer2D_width; @@ -798,7 +798,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); var4 += var18; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -818,7 +818,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14, var8, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14, var8, var21); var4 += var18; var6 += var19; var2 += Rasterizer2D.Rasterizer2D_width; @@ -826,7 +826,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); var4 += var18; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -862,7 +862,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); var4 += var19; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -870,7 +870,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14, var8, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14, var8, var21); var6 += var18; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -890,7 +890,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); var4 += var19; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -898,7 +898,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14, var8, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14, var8, var21); var6 += var18; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -946,7 +946,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14, var9, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14, var9, var21); var5 += var17; var4 += var18; var3 += Rasterizer2D.Rasterizer2D_width; @@ -954,7 +954,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); var5 += var17; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -974,7 +974,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14, var9, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14, var9, var21); var5 += var17; var4 += var18; var3 += Rasterizer2D.Rasterizer2D_width; @@ -982,7 +982,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); var5 += var17; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -1018,7 +1018,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); var5 += var18; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -1026,7 +1026,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14, var9, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14, var9, var21); var4 += var17; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -1046,7 +1046,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); var5 += var18; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -1054,7 +1054,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1343(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14, var9, var21); + this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14, var9, var21); var4 += var17; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -1066,17 +1066,17 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("vmethod1378") void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2023.Rasterizer3D_textureLoader.getTexturePixels(var22); + int[] var23 = super.field2047.Rasterizer3D_textureLoader.getTexturePixels(var22); int var24; if (var23 == null) { - var24 = super.field2023.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class229.method1198(var24, var10), class229.method1198(var24, var11), class229.method1198(var24, var12)); + var24 = super.field2047.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class228.method1222(var24, var10), class228.method1222(var24, var11), class228.method1222(var24, var12)); } else { - super.field2021 = super.field2023.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2020 = super.field2023.Rasterizer3D_textureLoader.vmethod3989(var22); + super.field2044 = super.field2047.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2045 = super.field2047.Rasterizer3D_textureLoader.vmethod3989(var22); var24 = var5 - var4; int var25 = var2 - var1; int var26 = var6 - var4; @@ -1106,7 +1106,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo float var37 = var9 - var7; float var38 = (var36 * (float)var27 - var37 * (float)var25) / (float)var33; float var39 = (var37 * (float)var24 - var36 * (float)var26) / (float)var33; - int var40 = super.field2023.field2253; + int var40 = super.field2047.field2280; var14 = var13 - var14; var17 = var16 - var17; var20 = var19 - var20; @@ -1122,8 +1122,8 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo int var47 = var17 * var15 - var18 * var14 << 14; int var48 = (int)(((long)(var18 * var20 - var17 * var21) << 3 << 14) / (long)var40); int var49 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var40); - int[] var50 = super.field2023.Rasterizer3D_rowOffsets; - int var51 = super.field2023.field2249; + int[] var50 = super.field2047.Rasterizer3D_rowOffsets; + int var51 = super.field2047.field2269; int var52; if (var1 <= var2 && var1 <= var3) { if (var1 < var51) { @@ -1153,7 +1153,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var52 = var1 - super.field2023.field2250; + var52 = var1 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1171,7 +1171,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var5 += var31; var10 += var35; @@ -1183,7 +1183,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var4 += var30; var10 += var35; @@ -1207,7 +1207,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var5 += var31; var10 += var35; @@ -1219,7 +1219,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var4 += var30; var10 += var35; @@ -1246,7 +1246,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var52 = var1 - super.field2023.field2250; + var52 = var1 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1264,7 +1264,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var31; var4 += var30; var10 += var35; @@ -1276,7 +1276,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var5 += var32; var4 += var30; var10 += var35; @@ -1300,7 +1300,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var31; var4 += var30; var10 += var35; @@ -1312,7 +1312,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var5 += var32; var4 += var30; var10 += var35; @@ -1353,7 +1353,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var52 = var2 - super.field2023.field2250; + var52 = var2 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1371,7 +1371,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var6 += var32; var11 += var35; @@ -1383,7 +1383,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var5 += var31; var11 += var35; @@ -1407,7 +1407,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var6 += var32; var11 += var35; @@ -1419,7 +1419,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var5 += var31; var11 += var35; @@ -1446,7 +1446,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var52 = var2 - super.field2023.field2250; + var52 = var2 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1464,7 +1464,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var32; var5 += var31; var11 += var35; @@ -1476,7 +1476,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var6 += var30; var5 += var31; var11 += var35; @@ -1500,7 +1500,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var32; var5 += var31; var11 += var35; @@ -1512,7 +1512,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var6 += var30; var5 += var31; var11 += var35; @@ -1552,7 +1552,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var52 = var3 - super.field2023.field2250; + var52 = var3 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1570,7 +1570,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var4 += var30; var12 += var35; @@ -1582,7 +1582,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var6 += var32; var12 += var35; @@ -1606,7 +1606,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var4 += var30; var12 += var35; @@ -1618,7 +1618,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var6 += var32; var12 += var35; @@ -1645,7 +1645,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var52 = var3 - super.field2023.field2250; + var52 = var3 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1663,7 +1663,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var30; var6 += var32; var12 += var35; @@ -1675,7 +1675,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var4 += var31; var6 += var32; var12 += var35; @@ -1699,7 +1699,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var30; var6 += var32; var12 += var35; @@ -1711,7 +1711,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1350(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var4 += var31; var6 += var32; var12 += var35; @@ -1728,17 +1728,17 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("vmethod1362") void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2023.Rasterizer3D_textureLoader.getTexturePixels(var22); + int[] var23 = super.field2047.Rasterizer3D_textureLoader.getTexturePixels(var22); int var24; if (var23 == null) { - var24 = super.field2023.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class229.method1198(var24, var10), class229.method1198(var24, var11), class229.method1198(var24, var12)); + var24 = super.field2047.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class228.method1222(var24, var10), class228.method1222(var24, var11), class228.method1222(var24, var12)); } else { - super.field2021 = super.field2023.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2020 = super.field2023.Rasterizer3D_textureLoader.vmethod3989(var22); + super.field2044 = super.field2047.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2045 = super.field2047.Rasterizer3D_textureLoader.vmethod3989(var22); var24 = var5 - var4; int var25 = var2 - var1; int var26 = var6 - var4; @@ -1768,7 +1768,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo float var37 = var9 - var7; float var38 = (var36 * (float)var27 - var37 * (float)var25) / (float)var33; float var39 = (var37 * (float)var24 - var36 * (float)var26) / (float)var33; - int var40 = super.field2023.field2253; + int var40 = super.field2047.field2280; var14 = var13 - var14; var17 = var16 - var17; var20 = var19 - var20; @@ -1784,8 +1784,8 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo int var47 = var17 * var15 - var18 * var14 << 14; int var48 = (int)(((long)(var18 * var20 - var17 * var21) << 14) / (long)var40); int var49 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var40); - int[] var50 = super.field2023.Rasterizer3D_rowOffsets; - int var51 = super.field2023.field2249; + int[] var50 = super.field2047.Rasterizer3D_rowOffsets; + int var51 = super.field2047.field2269; int var52; if (var1 <= var2 && var1 <= var3) { if (var1 < var51) { @@ -1815,7 +1815,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var52 = var1 - super.field2023.field2250; + var52 = var1 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1833,7 +1833,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var5 += var31; var10 += var35; @@ -1845,7 +1845,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var4 += var30; var10 += var35; @@ -1869,7 +1869,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var5 += var31; var10 += var35; @@ -1881,7 +1881,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var4 += var30; var10 += var35; @@ -1908,7 +1908,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var52 = var1 - super.field2023.field2250; + var52 = var1 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1926,7 +1926,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var31; var4 += var30; var10 += var35; @@ -1938,7 +1938,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var5 += var32; var4 += var30; var10 += var35; @@ -1962,7 +1962,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var31; var4 += var30; var10 += var35; @@ -1974,7 +1974,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var5 += var32; var4 += var30; var10 += var35; @@ -2015,7 +2015,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var52 = var2 - super.field2023.field2250; + var52 = var2 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -2033,7 +2033,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var6 += var32; var11 += var35; @@ -2045,7 +2045,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var5 += var31; var11 += var35; @@ -2069,7 +2069,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var6 += var32; var11 += var35; @@ -2081,7 +2081,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var5 += var31; var11 += var35; @@ -2108,7 +2108,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var52 = var2 - super.field2023.field2250; + var52 = var2 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -2126,7 +2126,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var32; var5 += var31; var11 += var35; @@ -2138,7 +2138,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var6 += var30; var5 += var31; var11 += var35; @@ -2162,7 +2162,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var32; var5 += var31; var11 += var35; @@ -2174,7 +2174,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var6 += var30; var5 += var31; var11 += var35; @@ -2214,7 +2214,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var52 = var3 - super.field2023.field2250; + var52 = var3 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -2232,7 +2232,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var4 += var30; var12 += var35; @@ -2244,7 +2244,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var6 += var32; var12 += var35; @@ -2268,7 +2268,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var4 += var30; var12 += var35; @@ -2280,7 +2280,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var6 += var32; var12 += var35; @@ -2307,7 +2307,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var52 = var3 - super.field2023.field2250; + var52 = var3 - super.field2047.field2274; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -2325,7 +2325,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var30; var6 += var32; var12 += var35; @@ -2337,7 +2337,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var4 += var31; var6 += var32; var12 += var35; @@ -2361,7 +2361,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var30; var6 += var32; var12 += var35; @@ -2373,7 +2373,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1352(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var4 += var31; var6 += var32; var12 += var35; @@ -2390,38 +2390,38 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("bv") - final void method1337(int[] var1, float[] var2, int var3, int var4, float var5) { - int var6 = method1345(var2[var3], var5) ? 1 : 0; + @ObfuscatedName("bf") + final void method1365(int[] var1, float[] var2, int var3, int var4, float var5) { + int var6 = method1373(var2[var3], var5) ? 1 : 0; int var7 = 1 - var6; var1[var3] = var7 * var1[var3] + var6 * var4; var2[var3] = (float)var6 * var5 + (float)var7 * var2[var3]; } @ObfuscatedName("bq") - final void method1338(int[] var1, float[] var2, int var3, int var4, float var5) { - if (method1345(var2[var3], var5)) { + final void method1366(int[] var1, float[] var2, int var3, int var4, float var5) { + if (method1373(var2[var3], var5)) { int var6 = (var4 & (var4 >> 31 & 1) - 1) >> 8; - var1[var3] = super.field2022[var6]; + var1[var3] = super.field2046[var6]; var2[var3] = var5; } } - @ObfuscatedName("bo") - final void method1339(int[] var1, float[] var2, int var3, int var4, int var5, float var6) { - if (method1345(var2[var3], var6)) { + @ObfuscatedName("ba") + final void method1367(int[] var1, float[] var2, int var3, int var4, int var5, float var6) { + if (method1373(var2[var3], var6)) { int var7 = var1[var3]; var1[var3] = ((var7 & 16711935) * var5 >> 8 & 16711935) + var4 + (var5 * (var7 & 65280) >> 8 & 65280); } } - @ObfuscatedName("br") - final void method1340(int[] var1, float[] var2, int var3, int var4, int var5, int var6, float var7) { - if (method1345(var2[var3], var7)) { + @ObfuscatedName("bl") + final void method1368(int[] var1, float[] var2, int var3, int var4, int var5, int var6, float var7) { + if (method1373(var2[var3], var7)) { int var8 = (var4 & (var4 >> 31 & 1) - 1) >> 8; - int var9 = super.field2022[var8]; + int var9 = super.field2046[var8]; var9 = ((var9 & 65280) * var6 >> 8 & 65280) + ((var9 & 16711935) * var6 >> 8 & 16711935); int var10 = var1[var3]; var1[var3] = var9 + ((var10 & 16711935) * var5 >> 8 & 16711935) + (var5 * (var10 & 65280) >> 8 & 65280); @@ -2429,11 +2429,11 @@ final void method1340(int[] var1, float[] var2, int var3, int var4, int var5, in } - @ObfuscatedName("bw") - final void method1341(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, float var9, float var10) { - if (super.field2023.field2241) { - if (var6 > super.field2023.field2242) { - var6 = super.field2023.field2242; + @ObfuscatedName("bp") + final void method1369(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, float var9, float var10) { + if (super.field2047.field2268) { + if (var6 > super.field2047.field2276) { + var6 = super.field2047.field2276; } if (var5 < 0) { @@ -2447,25 +2447,25 @@ final void method1341(int[] var1, int var2, int var3, int var4, int var5, int va var9 += var10 * (float)var5; int var11; int var12; - if (super.field2023.field2252) { + if (super.field2047.field2279) { var4 = var6 - var5 >> 2; var8 <<= 2; - if (super.field2023.field2248 == 0) { + if (super.field2047.field2275 == 0) { if (var4 > 0) { do { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2022[var11]; + var3 = super.field2046[var11]; var7 += var8; - this.method1337(var1, Rasterizer2D.field4171, var2, var3, var9); + this.method1365(var1, Rasterizer2D.field4217, var2, var3, var9); var9 += var10; ++var2; - this.method1337(var1, Rasterizer2D.field4171, var2, var3, var9); + this.method1365(var1, Rasterizer2D.field4217, var2, var3, var9); var9 += var10; ++var2; - this.method1337(var1, Rasterizer2D.field4171, var2, var3, var9); + this.method1365(var1, Rasterizer2D.field4217, var2, var3, var9); var9 += var10; ++var2; - this.method1337(var1, Rasterizer2D.field4171, var2, var3, var9); + this.method1365(var1, Rasterizer2D.field4217, var2, var3, var9); var9 += var10; ++var2; --var4; @@ -2475,35 +2475,35 @@ final void method1341(int[] var1, int var2, int var3, int var4, int var5, int va var4 = var6 - var5 & 3; if (var4 > 0) { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2022[var11]; + var3 = super.field2046[var11]; do { - this.method1337(var1, Rasterizer2D.field4171, var2, var3, var9); + this.method1365(var1, Rasterizer2D.field4217, var2, var3, var9); var9 += var10; ++var2; --var4; } while(var4 > 0); } } else { - var11 = super.field2023.field2248; - var12 = 256 - super.field2023.field2248; + var11 = super.field2047.field2275; + var12 = 256 - super.field2047.field2275; int var13; if (var4 > 0) { do { var13 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2022[var13]; + var3 = super.field2046[var13]; var7 += var8; var3 = ((var3 & 16711935) * var12 >> 8 & 16711935) + (var12 * (var3 & 65280) >> 8 & 65280); - this.method1339(var1, Rasterizer2D.field4171, var2, var3, var11, var9); + this.method1367(var1, Rasterizer2D.field4217, var2, var3, var11, var9); ++var2; var9 += var10; - this.method1339(var1, Rasterizer2D.field4171, var2, var3, var11, var9); + this.method1367(var1, Rasterizer2D.field4217, var2, var3, var11, var9); ++var2; var9 += var10; - this.method1339(var1, Rasterizer2D.field4171, var2, var3, var11, var9); + this.method1367(var1, Rasterizer2D.field4217, var2, var3, var11, var9); ++var2; var9 += var10; - this.method1339(var1, Rasterizer2D.field4171, var2, var3, var11, var9); + this.method1367(var1, Rasterizer2D.field4217, var2, var3, var11, var9); ++var2; var9 += var10; --var4; @@ -2513,11 +2513,11 @@ final void method1341(int[] var1, int var2, int var3, int var4, int var5, int va var4 = var6 - var5 & 3; if (var4 > 0) { var13 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2022[var13]; + var3 = super.field2046[var13]; var3 = ((var3 & 16711935) * var12 >> 8 & 16711935) + (var12 * (var3 & 65280) >> 8 & 65280); do { - this.method1339(var1, Rasterizer2D.field4171, var2, var3, var11, var9); + this.method1367(var1, Rasterizer2D.field4217, var2, var3, var11, var9); ++var2; var9 += var10; --var4; @@ -2527,20 +2527,20 @@ final void method1341(int[] var1, int var2, int var3, int var4, int var5, int va } else { var4 = var6 - var5; - if (super.field2023.field2248 == 0) { + if (super.field2047.field2275 == 0) { do { - this.method1338(var1, Rasterizer2D.field4171, var2, var7, var9); + this.method1366(var1, Rasterizer2D.field4217, var2, var7, var9); var9 += var10; ++var2; var7 += var8; --var4; } while(var4 > 0); } else { - var11 = super.field2023.field2248; - var12 = 256 - super.field2023.field2248; + var11 = super.field2047.field2275; + var12 = 256 - super.field2047.field2275; do { - this.method1340(var1, Rasterizer2D.field4171, var2, var3, var11, var12, var9); + this.method1368(var1, Rasterizer2D.field4217, var2, var3, var11, var12, var9); var9 += var10; ++var2; var7 += var8; @@ -2552,11 +2552,11 @@ final void method1341(int[] var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("be") - final void method1343(int[] var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8) { - if (super.field2023.field2241) { - if (var6 > super.field2023.field2242) { - var6 = super.field2023.field2242; + @ObfuscatedName("bu") + final void method1371(int[] var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8) { + if (super.field2047.field2268) { + if (var6 > super.field2047.field2276) { + var6 = super.field2047.field2276; } if (var5 < 0) { @@ -2568,8 +2568,8 @@ final void method1343(int[] var1, int var2, int var3, int var4, int var5, int va var2 += var5; var4 = var6 - var5 >> 2; var7 += var8 * (float)var5; - if (super.field2023.field2248 != 0) { - if (super.field2023.field2248 == 254) { + if (super.field2047.field2275 != 0) { + if (super.field2047.field2275 == 254) { while (true) { --var4; if (var4 < 0) { @@ -2591,8 +2591,8 @@ final void method1343(int[] var1, int var2, int var3, int var4, int var5, int va var1[var2++] = var1[var2]; } } else { - int var9 = super.field2023.field2248; - int var10 = 256 - super.field2023.field2248; + int var9 = super.field2047.field2275; + int var10 = 256 - super.field2047.field2275; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); while (true) { @@ -2606,22 +2606,22 @@ final void method1343(int[] var1, int var2, int var3, int var4, int var5, int va return; } - this.method1339(var1, Rasterizer2D.field4171, var2, var3, var9, var7); + this.method1367(var1, Rasterizer2D.field4217, var2, var3, var9, var7); ++var2; var7 += var8; } } - this.method1339(var1, Rasterizer2D.field4171, var2, var3, var9, var7); + this.method1367(var1, Rasterizer2D.field4217, var2, var3, var9, var7); ++var2; var7 += var8; - this.method1339(var1, Rasterizer2D.field4171, var2, var3, var9, var7); + this.method1367(var1, Rasterizer2D.field4217, var2, var3, var9, var7); ++var2; var7 += var8; - this.method1339(var1, Rasterizer2D.field4171, var2, var3, var9, var7); + this.method1367(var1, Rasterizer2D.field4217, var2, var3, var9, var7); ++var2; var7 += var8; - this.method1339(var1, Rasterizer2D.field4171, var2, var3, var9, var7); + this.method1367(var1, Rasterizer2D.field4217, var2, var3, var9, var7); ++var2; var7 += var8; } @@ -2638,22 +2638,22 @@ final void method1343(int[] var1, int var2, int var3, int var4, int var5, int va return; } - this.method1337(var1, Rasterizer2D.field4171, var2, var3, var7); + this.method1365(var1, Rasterizer2D.field4217, var2, var3, var7); var7 += var8; ++var2; } } - this.method1337(var1, Rasterizer2D.field4171, var2, var3, var7); + this.method1365(var1, Rasterizer2D.field4217, var2, var3, var7); var7 += var8; ++var2; - this.method1337(var1, Rasterizer2D.field4171, var2, var3, var7); + this.method1365(var1, Rasterizer2D.field4217, var2, var3, var7); var7 += var8; ++var2; - this.method1337(var1, Rasterizer2D.field4171, var2, var3, var7); + this.method1365(var1, Rasterizer2D.field4217, var2, var3, var7); var7 += var8; ++var2; - this.method1337(var1, Rasterizer2D.field4171, var2, var3, var7); + this.method1365(var1, Rasterizer2D.field4217, var2, var3, var7); var7 += var8; ++var2; } @@ -2661,11 +2661,11 @@ final void method1343(int[] var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("bx") - final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { - if (super.field2023.field2241) { - if (var7 > super.field2023.field2242) { - var7 = super.field2023.field2242; + @ObfuscatedName("bz") + final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { + if (super.field2047.field2268) { + if (var7 > super.field2047.field2276) { + var7 = super.field2047.field2276; } if (var6 < 0) { @@ -2687,8 +2687,8 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int int var24; int var25; int var26; - if (super.field2021) { - var26 = var6 - super.field2023.field2246; + if (super.field2044) { + var26 = var6 - super.field2047.field2272; var12 += (var15 >> 3) * var26; var13 += var26 * (var16 >> 3); var14 += var26 * (var17 >> 3); @@ -2728,38 +2728,38 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int var20 >>= 3; var9 <<= 3; var18 = var8 >> 8; - if (super.field2020) { + if (super.field2045) { if (var20 > 0) { do { - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var10000 = var3 + var19; var10 += var11; @@ -2793,7 +2793,7 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -2803,35 +2803,35 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int } else { if (var20 > 0) { do { - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var10000 = var3 + var19; var10 += var11; @@ -2865,7 +2865,7 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -2874,7 +2874,7 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int } } } else { - var26 = var6 - super.field2023.field2246; + var26 = var6 - super.field2047.field2272; var12 += (var15 >> 3) * var26; var13 += var26 * (var16 >> 3); var14 += var26 * (var17 >> 3); @@ -2914,38 +2914,38 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int var20 >>= 3; var9 <<= 3; var18 = var8 >> 8; - if (super.field2020) { + if (super.field2045) { if (var20 > 0) { do { - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var10000 = var3 + var19; var10 += var11; @@ -2979,7 +2979,7 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -2989,35 +2989,35 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int } else { if (var20 > 0) { do { - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var10000 = var3 + var19; var10 += var11; @@ -3051,7 +3051,7 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3064,11 +3064,11 @@ final void method1350(int[] var1, int[] var2, int var3, int var4, int var5, int } } - @ObfuscatedName("bh") - final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { - if (super.field2023.field2241) { - if (var7 > super.field2023.field2242) { - var7 = super.field2023.field2242; + @ObfuscatedName("bx") + final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { + if (super.field2047.field2268) { + if (var7 > super.field2047.field2276) { + var7 = super.field2047.field2276; } if (var6 < 0) { @@ -3089,8 +3089,8 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int int var24; int var25; int var26; - if (super.field2021) { - var26 = var6 - super.field2023.field2246; + if (super.field2044) { + var26 = var6 - super.field2047.field2272; var12 += var26 * var15; var13 += var26 * var16; var14 += var17 * var26; @@ -3120,38 +3120,38 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int var20 >>= 3; var9 <<= 3; var18 = var8 >> 8; - if (super.field2020) { + if (super.field2045) { if (var20 > 0) { do { - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3164,7 +3164,7 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1346(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3174,35 +3174,35 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int } else { if (var20 > 0) { do { - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3215,7 +3215,7 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1347(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3224,7 +3224,7 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int } } } else { - var26 = var6 - super.field2023.field2246; + var26 = var6 - super.field2047.field2272; var12 += var26 * var15; var13 += var26 * var16; var14 += var17 * var26; @@ -3254,38 +3254,38 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int var20 >>= 3; var9 <<= 3; var18 = var8 >> 8; - if (super.field2020) { + if (super.field2045) { if (var20 > 0) { do { - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3298,7 +3298,7 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1348(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3308,35 +3308,35 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int } else { if (var20 > 0) { do { - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3349,7 +3349,7 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1349(var1, Rasterizer2D.field4171, var2, var5, var18, var3, var10); + method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3362,14 +3362,14 @@ final void method1352(int[] var1, int[] var2, int var3, int var4, int var5, int } } - @ObfuscatedName("bc") - static final boolean method1345(float var0, float var1) { + @ObfuscatedName("bo") + static final boolean method1373(float var0, float var1) { return var1 > var0; } - @ObfuscatedName("bi") - static final void method1346(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { - if (method1345(var1[var3], var6)) { + @ObfuscatedName("bb") + static final void method1374(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + if (method1373(var1[var3], var6)) { int var7 = var2[(var5 & 4032) + (var5 >>> 26)]; var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; var1[var3] = var6; @@ -3377,11 +3377,11 @@ static final void method1346(int[] var0, float[] var1, int[] var2, int var3, int } - @ObfuscatedName("bu") - static final void method1347(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + @ObfuscatedName("br") + static final void method1375(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { int var7 = var2[(var5 & 4032) + (var5 >>> 26)]; if (var7 != 0) { - if (method1345(var1[var3], var6)) { + if (method1373(var1[var3], var6)) { var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; var1[var3] = var6; } @@ -3389,9 +3389,9 @@ static final void method1347(int[] var0, float[] var1, int[] var2, int var3, int } } - @ObfuscatedName("bk") - static final void method1348(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { - if (method1345(var1[var3], var6)) { + @ObfuscatedName("be") + static final void method1376(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + if (method1373(var1[var3], var6)) { int var7 = var2[(var5 >>> 25) + (var5 & 16256)]; var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; var1[var3] = var6; @@ -3399,15 +3399,15 @@ static final void method1348(int[] var0, float[] var1, int[] var2, int var3, int } - @ObfuscatedName("bz") - static final void method1349(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + @ObfuscatedName("bi") + static final void method1377(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { int var7 = var2[(var5 >>> 25) + (var5 & 16256)]; if (var7 != 0) { - if (method1345(var1[var3], var6)) { + if (method1373(var1[var3], var6)) { var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; var1[var3] = var6; } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class26.java b/osrs/src/main/java/class26.java index baaa83fdb..ad4ef9b49 100644 --- a/osrs/src/main/java/class26.java +++ b/osrs/src/main/java/class26.java @@ -1,25 +1,17 @@ -import java.applet.Applet; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; +import netscape.js.JSObject; -@ObfuscatedName("bd") -public class class26 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "-2105892284" - ) - public static void method100(Applet var0, String var1) throws Throwable { - //JSObject.getWindow(var0).eval(var1); - } +import java.applet.Applet; - @ObfuscatedName("ay") +@ObfuscatedName("bh") +public class class26 { + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "-865413810" + garbageValue = "-1868178316" ) - public static Object method101(Applet var0, String var1, Object[] var2) throws Throwable { - return null; //JSObject.getWindow(var0).call(var1, var2); + public static Object method95(Applet var0, String var1, Object[] var2) throws Throwable { + return JSObject.getWindow(var0).call(var1, var2); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class260.java b/osrs/src/main/java/class260.java new file mode 100644 index 000000000..1bc2f33b4 --- /dev/null +++ b/osrs/src/main/java/class260.java @@ -0,0 +1,252 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kb") +public class class260 implements WorldMapSection { + @ObfuscatedName("au") + int field2394; + @ObfuscatedName("ae") + int field2388; + @ObfuscatedName("ao") + int field2391; + @ObfuscatedName("at") + int field2393; + @ObfuscatedName("ac") + int field2387; + @ObfuscatedName("ai") + int field2390; + @ObfuscatedName("az") + int field2395; + @ObfuscatedName("ap") + int field2392; + @ObfuscatedName("aa") + int field2386; + @ObfuscatedName("af") + int field2389; + + class260() { + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljf;I)V", + garbageValue = "-474032336" + ) + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field2387) { + var1.regionLowX = this.field2387; + } + + if (var1.regionHighX < this.field2387) { + var1.regionHighX = this.field2387; + } + + if (var1.regionLowY > this.field2390) { + var1.regionLowY = this.field2390; + } + + if (var1.regionHighY < this.field2390) { + var1.regionHighY = this.field2390; + } + + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(IIII)Z", + garbageValue = "509257779" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field2394 && var1 < this.field2394 + this.field2388) { + return var2 >= (this.field2391 << 6) + (this.field2395 << 3) && var2 <= (this.field2391 << 6) + (this.field2395 << 3) + 7 && var3 >= (this.field2393 << 6) + (this.field2392 << 3) && var3 <= (this.field2393 << 6) + (this.field2392 << 3) + 7; + } else { + return false; + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "-94" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field2387 << 6) + (this.field2386 << 3) && var1 <= (this.field2387 << 6) + (this.field2386 << 3) + 7 && var2 >= (this.field2390 << 6) + (this.field2389 << 3) && var2 <= (this.field2390 << 6) + (this.field2389 << 3) + 7; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "1978048199" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { + return null; + } else { + int[] var4 = new int[]{var2 + (this.field2387 * 64 - this.field2391 * 64) + (this.field2386 * 8 - this.field2395 * 8), var3 + (this.field2390 * 64 - this.field2393 * 64) + (this.field2389 * 8 - this.field2392 * 8)}; + return var4; + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(III)Lmc;", + garbageValue = "-1281040923" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { + return null; + } else { + int var3 = this.field2391 * 64 - this.field2387 * 64 + (this.field2395 * 8 - this.field2386 * 8) + var1; + int var4 = var2 + (this.field2393 * 64 - this.field2390 * 64) + (this.field2392 * 8 - this.field2389 * 8); + return new Coord(this.field2394, var3, var4); + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Ltm;B)V", + garbageValue = "47" + ) + @Export("read") + public void read(Buffer var1) { + this.field2394 = var1.readUnsignedByte(); + this.field2388 = var1.readUnsignedByte(); + this.field2391 = var1.readUnsignedShort(); + this.field2395 = var1.readUnsignedByte(); + this.field2393 = var1.readUnsignedShort(); + this.field2392 = var1.readUnsignedByte(); + this.field2387 = var1.readUnsignedShort(); + this.field2386 = var1.readUnsignedByte(); + this.field2390 = var1.readUnsignedShort(); + this.field2389 = var1.readUnsignedByte(); + this.method1498(); + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1425291786" + ) + void method1498() { + } + + @ObfuscatedName("lv") + @ObfuscatedSignature( + descriptor = "(Ldx;IIIB)V", + garbageValue = "-28" + ) + @Export("addNpcToMenu") + static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { + NPCComposition var4 = var0.definition; + if (Client.menuOptionsCount < 400) { + if (var4.transforms != null) { + var4 = var4.transform(); + } + + if (var4 != null) { + if (var4.isInteractable) { + if (!var4.isFollower || Client.followerIndex == var1) { + String var5 = var0.method581(); + int var6; + if (var4.combatLevel != 0 && var0.combatLevelChange != 0) { + var6 = var0.combatLevelChange != -1 ? var0.combatLevelChange * -611368101 * -1824049965 : var4.combatLevel * 989486243 * 599602955; + var5 = var5 + class14.method42(var6, VarbitComposition.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; + } + + if (var4.isFollower && Client.followerOpsLowPriority) { + class385.insertMenuItemNoShift("Examine", MoveSpeed.colorStartTag(16776960) + var5, 1003, var1, var2, var3); + } + + if (Client.isItemSelected == 1) { + class385.insertMenuItemNoShift("Use", Client.field599 + " " + "->" + " " + MoveSpeed.colorStartTag(16776960) + var5, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((Canvas.selectedSpellFlags & 2) == 2) { + class385.insertMenuItemNoShift(Client.field600, Client.field601 + " " + "->" + " " + MoveSpeed.colorStartTag(16776960) + var5, 8, var1, var2, var3); + } + } else { + var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var7 = var4.actions; + int var8; + int var9; + if (var7 != null) { + for (var8 = 4; var8 >= 0; --var8) { + if (var0.method580(var8) && var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { + var9 = 0; + if (var8 == 0) { + var9 = var6 + 9; + } + + if (var8 == 1) { + var9 = var6 + 10; + } + + if (var8 == 2) { + var9 = var6 + 11; + } + + if (var8 == 3) { + var9 = var6 + 12; + } + + if (var8 == 4) { + var9 = var6 + 13; + } + + class385.insertMenuItemNoShift(var7[var8], MoveSpeed.colorStartTag(16776960) + var5, var9, var1, var2, var3); + } + } + } + + if (var7 != null) { + for (var8 = 4; var8 >= 0; --var8) { + if (var0.method580(var8) && var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { + short var10 = 0; + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > VarbitComposition.localPlayer.combatLevel) { + var10 = 2000; + } + + var9 = 0; + if (var8 == 0) { + var9 = var10 + 9; + } + + if (var8 == 1) { + var9 = var10 + 10; + } + + if (var8 == 2) { + var9 = var10 + 11; + } + + if (var8 == 3) { + var9 = var10 + 12; + } + + if (var8 == 4) { + var9 = var10 + 13; + } + + class385.insertMenuItemNoShift(var7[var8], MoveSpeed.colorStartTag(16776960) + var5, var9, var1, var2, var3); + } + } + } + } + + if (!var4.isFollower || !Client.followerOpsLowPriority) { + class385.insertMenuItemNoShift("Examine", MoveSpeed.colorStartTag(16776960) + var5, 1003, var1, var2, var3); + } + } + + } + } + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class261.java b/osrs/src/main/java/class261.java index 7415a9607..bf82953cd 100644 --- a/osrs/src/main/java/class261.java +++ b/osrs/src/main/java/class261.java @@ -1,138 +1,53 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kd") -public class class261 implements WorldMapSection { - @ObfuscatedName("aw") - int field2368; - @ObfuscatedName("ay") - int field2369; - @ObfuscatedName("ar") - int field2365; - @ObfuscatedName("am") - int field2363; - @ObfuscatedName("as") - int field2366; - @ObfuscatedName("aj") - int field2362; - @ObfuscatedName("ag") - int field2361; - @ObfuscatedName("az") - int field2370; - @ObfuscatedName("av") - int field2367; +@ObfuscatedName("kt") +public class class261 { @ObfuscatedName("ap") - int field2364; - - class261() { - } + static int field2396; - @ObfuscatedName("aw") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljs;I)V", - garbageValue = "104966018" + descriptor = "([BIIII[Lis;I)V", + garbageValue = "657439907" ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2366) { - var1.regionLowX = this.field2366; - } - - if (var1.regionHighX < this.field2366) { - var1.regionHighX = this.field2366; + static final void method1500(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var7; + int var8; + for (int var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 64; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { + int[] var10000 = var5[var6].flags[var7 + var1]; + var10000[var2 + var8] &= -16777217; + } + } + } } - if (var1.regionLowY > this.field2362) { - var1.regionLowY = this.field2362; - } + Buffer var12 = new Buffer(var0); - if (var1.regionHighY < this.field2362) { - var1.regionHighY = this.field2362; + for (var7 = 0; var7 < 4; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + for (int var9 = 0; var9 < 64; ++var9) { + int var10 = var8 + var1; + int var11 = var9 + var2; + SecureRandomFuture.loadTerrain(var12, var7, var10, var11, var3 + var10, var11 + var4, 0); + } + } } } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "37" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field2368 && var1 < this.field2368 + this.field2369) { - return var2 >= (this.field2365 << 6) + (this.field2361 << 3) && var2 <= (this.field2365 << 6) + (this.field2361 << 3) + 7 && var3 >= (this.field2363 << 6) + (this.field2370 << 3) && var3 <= (this.field2363 << 6) + (this.field2370 << 3) + 7; - } else { - return false; - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1055724816" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field2366 << 6) + (this.field2367 << 3) && var1 <= (this.field2366 << 6) + (this.field2367 << 3) + 7 && var2 >= (this.field2362 << 6) + (this.field2364 << 3) && var2 <= (this.field2362 << 6) + (this.field2364 << 3) + 7; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "1968685542" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; - } else { - int[] var4 = new int[]{var2 + (this.field2366 * 64 - this.field2365 * 64) + (this.field2367 * 8 - this.field2361 * 8), var3 + (this.field2362 * 64 - this.field2363 * 64) + (this.field2364 * 8 - this.field2370 * 8)}; - return var4; - } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(IIB)Lmr;", - garbageValue = "119" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } else { - int var3 = this.field2365 * 64 - this.field2366 * 64 + (this.field2361 * 8 - this.field2367 * 8) + var1; - int var4 = var2 + (this.field2363 * 64 - this.field2362 * 64) + (this.field2370 * 8 - this.field2364 * 8); - return new Coord(this.field2368, var3, var4); - } - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "706418314" - ) - @Export("read") - public void read(Buffer var1) { - this.field2368 = var1.readUnsignedByte(); - this.field2369 = var1.readUnsignedByte(); - this.field2365 = var1.readUnsignedShort(); - this.field2361 = var1.readUnsignedByte(); - this.field2363 = var1.readUnsignedShort(); - this.field2370 = var1.readUnsignedByte(); - this.field2366 = var1.readUnsignedShort(); - this.field2367 = var1.readUnsignedByte(); - this.field2362 = var1.readUnsignedShort(); - this.field2364 = var1.readUnsignedByte(); - this.method1467(); - } - @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "522198435" + garbageValue = "-1102761288" ) - void method1467() { + public static void method1501() { + Widget.Widget_cachedSprites.clear(); + Widget.Widget_cachedModels.clear(); + Widget.Widget_cachedFonts.clear(); + Widget.Widget_cachedSpriteMasks.clear(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class27.java b/osrs/src/main/java/class27.java index fbbbd106a..13131bf9d 100644 --- a/osrs/src/main/java/class27.java +++ b/osrs/src/main/java/class27.java @@ -1,109 +1,109 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Arrays; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +import java.util.Arrays; + +@ObfuscatedName("bj") public class class27 { - @ObfuscatedName("ag") - int[] field78; + @ObfuscatedName("gx") + static String field76; @ObfuscatedName("az") - int[] field79; + int[] field78; + @ObfuscatedName("ap") + int[] field77; public class27() { this.field78 = new int[112]; - this.field79 = new int[192]; + this.field77 = new int[192]; Arrays.fill(this.field78, 3); - Arrays.fill(this.field79, 3); + Arrays.fill(this.field77, 3); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "19" + descriptor = "(IIS)V", + garbageValue = "4993" ) - public void method102(int var1, int var2) { - if (this.method110(var1) && this.method112(var2)) { + public void method96(int var1, int var2) { + if (this.method104(var1) && this.method106(var2)) { this.field78[var1] = var2; } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(CII)V", - garbageValue = "1505085994" + descriptor = "(CIB)V", + garbageValue = "4" ) - public void method103(char var1, int var2) { - if (this.method111(var1) && this.method112(var2)) { - this.field79[var1] = var2; + public void method97(char var1, int var2) { + if (this.method105(var1) && this.method106(var2)) { + this.field77[var1] = var2; } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "62" + descriptor = "(II)I", + garbageValue = "1011466688" ) - public int method104(int var1) { - return this.method110(var1) ? this.field78[var1] : 0; + public int method98(int var1) { + return this.method104(var1) ? this.field78[var1] : 0; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(CS)I", - garbageValue = "-2560" + descriptor = "(CB)I", + garbageValue = "41" ) - public int method105(char var1) { - return this.method111(var1) ? this.field79[var1] : 0; + public int method99(char var1) { + return this.method105(var1) ? this.field77[var1] : 0; } - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-2027151744" + garbageValue = "2032631567" ) - public boolean method106(int var1) { - return this.method110(var1) && (this.field78[var1] == 1 || this.field78[var1] == 3); + public boolean method100(int var1) { + return this.method104(var1) && (this.field78[var1] == 1 || this.field78[var1] == 3); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-2113017491" + descriptor = "(CB)Z", + garbageValue = "1" ) - public boolean method107(char var1) { - return this.method111(var1) && (this.field79[var1] == 1 || this.field79[var1] == 3); + public boolean method101(char var1) { + return this.method105(var1) && (this.field77[var1] == 1 || this.field77[var1] == 3); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-651027133" + descriptor = "(IB)Z", + garbageValue = "55" ) - public boolean method108(int var1) { - return this.method110(var1) && (this.field78[var1] == 2 || this.field78[var1] == 3); + public boolean method102(int var1) { + return this.method104(var1) && (this.field78[var1] == 2 || this.field78[var1] == 3); } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(CI)Z", - garbageValue = "392210402" + garbageValue = "-479848257" ) - public boolean method109(char var1) { - return this.method111(var1) && (this.field79[var1] == 2 || this.field79[var1] == 3); + public boolean method103(char var1) { + return this.method105(var1) && (this.field77[var1] == 2 || this.field77[var1] == 3); } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "295186281" + garbageValue = "516675311" ) - boolean method110(int var1) { + boolean method104(int var1) { if (var1 >= 0 && var1 < 112) { return true; } else { @@ -112,12 +112,12 @@ boolean method110(int var1) { } } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(CB)Z", - garbageValue = "16" + garbageValue = "67" ) - boolean method111(char var1) { + boolean method105(char var1) { if (var1 >= 0 && var1 < 192) { return true; } else { @@ -126,12 +126,12 @@ boolean method111(char var1) { } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1832967657" + descriptor = "(IB)Z", + garbageValue = "-13" ) - boolean method112(int var1) { + boolean method106(int var1) { if (var1 >= 0 && var1 < 4) { return true; } else { @@ -140,715 +140,70 @@ boolean method112(int var1) { } } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "0" - ) - static int method113(String var0) { - if (var0.equals("centre")) { - return 1; - } else { - return !var0.equals("bottom") && !var0.equals("right") ? 0 : 2; - } - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "937542062" - ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (UserComparator4.garbageCollector == null || !UserComparator4.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - UserComparator4.garbageCollector = var2; - GameEngine.garbageCollectorLastCheckTimeMs = -1L; - GameEngine.garbageCollectorLastCollectionTime = -1L; - } - } - } catch (Throwable var11) { - } - } - - if (UserComparator4.garbageCollector != null) { - long var9 = class113.clockNow(); - long var3 = UserComparator4.garbageCollector.getCollectionTime(); - if (GameEngine.garbageCollectorLastCollectionTime != -1L) { - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; - if (var7 != 0L) { - var0 = (int)(var5 * 100L / var7); - } - } - - GameEngine.garbageCollectorLastCollectionTime = var3; - GameEngine.garbageCollectorLastCheckTimeMs = var9; - } - - return var0; - } - - @ObfuscatedName("ib") + @ObfuscatedName("ie") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "193" + descriptor = "(IIII)V", + garbageValue = "-1897607215" ) - static final void method115() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; - - for (int var2 = 0; var2 < var0; ++var2) { - Player var3 = Client.players[var1[var2]]; - if (var3 != null) { - class47.updateActorSequence(var3, 1); - } + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (class449.clientPreferences.getCurrentSoundEffectsVolume() != 0 && var1 != 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var0; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = 0; + ++Client.soundEffectCount; } } - @ObfuscatedName("iz") + @ObfuscatedName("mk") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-71" + descriptor = "(Lmi;B)Z", + garbageValue = "14" ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - if (class136.localPlayer.x >> 7 == Client.destinationX && class136.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - class89.method483(); - ArchiveLoader.method465(); - class510.addNpcsToScene(true); - int var4 = Players.Players_count; - int[] var5 = Players.Players_indices; - - int var6; - for (var6 = 0; var6 < var4; ++var6) { - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { - GrandExchangeOfferNameComparator.addPlayerToScene(Client.players[var5[var6]], true); - } - } - - class510.addNpcsToScene(false); - class393.method1991(); - class133.method729(); - class31.setViewportShape(var0, var1, var2, var3, true); - var0 = Client.viewportOffsetX; - var1 = Client.viewportOffsetY; - var2 = Client.viewportWidth; - var3 = Client.viewportHeight; - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - Rasterizer3D.method1176(); - Rasterizer2D.method2624(); - var4 = Client.camAngleX; - if (Client.field475 / 256 > var4) { - var4 = Client.field475 / 256; - } - - if (Client.cameraShaking[4] && Client.cameraMoveIntensity[4] + 128 > var4) { - var4 = Client.cameraMoveIntensity[4] + 128; - } - - int var17 = Client.camAngleY & 2047; - class30.method127(class467.oculusOrbFocalPointX, class90.field887, class36.oculusOrbFocalPointY, var4, var17, ClanMate.method2183(var4), var3); - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - if (!Client.isCameraLocked) { - if (class150.clientPreferences.getRoofsHidden()) { - var7 = class36.Client_plane; - } else { - label290: { - var8 = 3; - if (class19.cameraPitch < 310) { - if (Client.oculusOrbState == 1) { - var9 = class467.oculusOrbFocalPointX >> 7; - var10 = class36.oculusOrbFocalPointY >> 7; - } else { - var9 = class136.localPlayer.x >> 7; - var10 = class136.localPlayer.y >> 7; - } - - var11 = class157.cameraX >> 7; - var12 = SoundSystem.cameraZ >> 7; - if (var11 < 0 || var12 < 0 || var11 >= 104 || var12 >= 104) { - var7 = class36.Client_plane; - break label290; - } - - if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104) { - var7 = class36.Client_plane; - break label290; - } - - if ((Tiles.Tiles_renderFlags[class36.Client_plane][var11][var12] & 4) != 0) { - var8 = class36.Client_plane; - } - - if (var9 > var11) { - var13 = var9 - var11; - } else { - var13 = var11 - var9; - } - - if (var10 > var12) { - var14 = var10 - var12; - } else { - var14 = var12 - var10; - } - - int var16; - if (var13 > var14) { - var15 = var14 * 65536 / var13; - var16 = 32768; - - while (var9 != var11) { - if (var11 < var9) { - ++var11; - } else if (var11 > var9) { - --var11; - } - - if ((Tiles.Tiles_renderFlags[class36.Client_plane][var11][var12] & 4) != 0) { - var8 = class36.Client_plane; - } - - var16 += var15; - if (var16 >= 65536) { - var16 -= 65536; - if (var12 < var10) { - ++var12; - } else if (var12 > var10) { - --var12; - } - - if ((Tiles.Tiles_renderFlags[class36.Client_plane][var11][var12] & 4) != 0) { - var8 = class36.Client_plane; - } - } - } - } else if (var14 > 0) { - var15 = var13 * 65536 / var14; - var16 = 32768; - - while (var10 != var12) { - if (var12 < var10) { - ++var12; - } else if (var12 > var10) { - --var12; - } - - if ((Tiles.Tiles_renderFlags[class36.Client_plane][var11][var12] & 4) != 0) { - var8 = class36.Client_plane; - } - - var16 += var15; - if (var16 >= 65536) { - var16 -= 65536; - if (var11 < var9) { - ++var11; - } else if (var11 > var9) { - --var11; - } - - if ((Tiles.Tiles_renderFlags[class36.Client_plane][var11][var12] & 4) != 0) { - var8 = class36.Client_plane; - } - } - } - } - } - - if (class136.localPlayer.x >= 0 && class136.localPlayer.y >= 0 && class136.localPlayer.x < 13312 && class136.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[class36.Client_plane][class136.localPlayer.x >> 7][class136.localPlayer.y >> 7] & 4) != 0) { - var8 = class36.Client_plane; - } - - var7 = var8; - } else { - var7 = class36.Client_plane; - } - } - } - - var6 = var7; + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { + return false; } else { - if (class150.clientPreferences.getRoofsHidden()) { - var7 = class36.Client_plane; - } else { - var8 = class306.getTileHeight(class157.cameraX, SoundSystem.cameraZ, class36.Client_plane); - if (var8 - class384.cameraY < 800 && (Tiles.Tiles_renderFlags[class36.Client_plane][class157.cameraX >> 7][SoundSystem.cameraZ >> 7] & 4) != 0) { - var7 = class36.Client_plane; - } else { - var7 = 3; - } - } - - var6 = var7; - } - - var7 = class157.cameraX; - var8 = class384.cameraY; - var9 = SoundSystem.cameraZ; - var10 = class19.cameraPitch; - var11 = class456.cameraYaw; - - for (var12 = 0; var12 < 5; ++var12) { - if (Client.cameraShaking[var12]) { - var13 = (int)(Math.random() * (double)(Client.cameraShakeIntensity[var12] * 2 + 1) - (double)Client.cameraShakeIntensity[var12] + Math.sin((double)Client.cameraShakeSpeed[var12] / 100.0D * (double)Client.cameraShakeCycle[var12]) * (double)Client.cameraMoveIntensity[var12]); - if (var12 == 0) { - class157.cameraX += var13; - } - - if (var12 == 1) { - class384.cameraY += var13; - } - - if (var12 == 2) { - SoundSystem.cameraZ += var13; - } - - if (var12 == 3) { - class456.cameraYaw = var13 + class456.cameraYaw & 2047; - } - - if (var12 == 4) { - class19.cameraPitch += var13; - if (class19.cameraPitch < 128) { - class19.cameraPitch = 128; + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { + int var2 = UserComparator9.method686(var0, var1); + int var3 = var0.cs1ComparisonValues[var1]; + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { + return false; } - - if (class19.cameraPitch > 383) { - class19.cameraPitch = 383; + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { + if (var3 == var2) { + return false; } + } else if (var2 != var3) { + return false; } } - } - - var12 = MouseHandler.MouseHandler_x; - var13 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var12 = MouseHandler.MouseHandler_lastPressedX; - var13 = MouseHandler.MouseHandler_lastPressedY; - } - - if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { - var14 = var12 - var0; - var15 = var13 - var1; - ViewportMouse.ViewportMouse_x = var14; - ViewportMouse.ViewportMouse_y = var15; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; - } else { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; - } - class105.method618(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class105.method618(); - var14 = Rasterizer3D.get3dZoom(); - Rasterizer3D.method1162(TileItem.client.field121); - Rasterizer3D.clips.field2253 = Client.viewportZoom; - UserComparator5.scene.draw(class157.cameraX, class384.cameraY, SoundSystem.cameraZ, class19.cameraPitch, class456.cameraYaw, var6); - Rasterizer3D.method1162(false); - if (Client.renderSelf) { - Rasterizer2D.method2625(); - } - - Rasterizer3D.clips.field2253 = var14; - class105.method618(); - UserComparator5.scene.clearTempGameObjects(); - UserComparator7.method669(var0, var1, var2, var3); - if (Client.hintArrowType == 2) { - ReflectionCheck.worldToScreen((Client.hintArrowX - AbstractArchive.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class148.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - class345.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).animate(Client.field452); - FriendLoginUpdate.method2176(); - class157.cameraX = var7; - class384.cameraY = var8; - SoundSystem.cameraZ = var9; - class19.cameraPitch = var10; - class456.cameraYaw = var11; - if (Client.isLoading && class153.field1356.method1903(true, false) == 0) { - Client.isLoading = false; - } - - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - Actor.drawLoadingMessage("Loading - please wait.", false); + return true; } - } - @ObfuscatedName("kr") + @ObfuscatedName("og") @ObfuscatedSignature( - descriptor = "(Llo;B)V", - garbageValue = "-63" + descriptor = "(Ltm;II)V", + garbageValue = "1204243161" ) - @Export("processZoneOperation") - static final void processZoneOperation(ZoneOperation var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var2; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - if (ZoneOperation.AREA_SOUND == var0) { - var2 = var1.readUnsignedByteNeg(); // Settings - var3 = var2 >> 4 & 15; - var4 = var2 & 7; - var5 = var1.readUnsignedByteAdd(); // Delay - var6 = var1.readUnsignedByteSub(); // Tile - var7 = (var6 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var8 = (var6 & 7) + class387.ZONE_Y; - var9 = var1.readUnsignedShortLE(); // Id - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - var10 = var3 + 1; - if (class136.localPlayer.pathX[0] >= var7 - var10 && class136.localPlayer.pathX[0] <= var7 + var10 && class136.localPlayer.pathY[0] >= var8 - var10 && class136.localPlayer.pathY[0] <= var10 + var8 && class150.clientPreferences.getAreaSoundEffectsVolume() != 0 && var4 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var9; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var3 + (var8 << 8) + (var7 << 16); - ++Client.soundEffectCount; - } - } + static void method109(Buffer var0, int var1) { + byte[] var2 = var0.array; + if (Client.randomDatData == null) { + Client.randomDatData = new byte[24]; } - TileItem var31; - if (ZoneOperation.OBJ_ADD == var0) { - var2 = var1.readIntLE(); // Amount - var3 = var1.readUnsignedByteSub(); // unknown 31 - var1.readUnsignedShort(); // Random1 - var1.readUnsignedByteNeg(); // Random2 - var4 = var1.readUnsignedShort(); // Id - var5 = var1.readUnsignedByte(); // Tile - var6 = (var5 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var7 = (var5 & 7) + class387.ZONE_Y; - var1.readUnsignedByte(); // Random3 - var1.readUnsignedShortAdd(); // Random4 - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - var31 = new TileItem(); - var31.id = var4; - var31.quantity = var2; - var31.method613(var3); - if (Client.groundItems[class36.Client_plane][var6][var7] == null) { - Client.groundItems[class36.Client_plane][var6][var7] = new NodeDeque(); - } - - Client.groundItems[class36.Client_plane][var6][var7].addFirst(var31); - class344.updateItemPile(var6, var7); - } - - } else { - int var11; - if (ZoneOperation.LOC_ANIM == var0) { - var2 = var1.readUnsignedShortLE(); // Projectile? - var3 = var1.readUnsignedByte(); // Tile - var4 = (var3 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var5 = (var3 & 7) + class387.ZONE_Y; - var6 = var1.readUnsignedByteSub(); // Settings - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field648[var7]; - if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) { - if (var9 == 0) { - BoundaryObject var32 = UserComparator5.scene.method1233(class36.Client_plane, var4, var5); - if (var32 != null) { - var11 = class458.Entity_unpackID(var32.tag); - if (var7 == 2) { - var32.renderable1 = new DynamicObject(var11, 2, var8 + 4, class36.Client_plane, var4, var5, var2, false, var32.renderable1); - var32.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, class36.Client_plane, var4, var5, var2, false, var32.renderable2); - } else { - var32.renderable1 = new DynamicObject(var11, var7, var8, class36.Client_plane, var4, var5, var2, false, var32.renderable1); - } - - return; - } - } - - if (var9 == 1) { - WallDecoration var40 = UserComparator5.scene.method1234(class36.Client_plane, var4, var5); - if (var40 != null) { - var11 = class458.Entity_unpackID(var40.tag); - if (var7 != 4 && var7 != 5) { - if (var7 == 6) { - var40.renderable1 = new DynamicObject(var11, 4, var8 + 4, class36.Client_plane, var4, var5, var2, false, var40.renderable1); - } else if (var7 == 7) { - var40.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class36.Client_plane, var4, var5, var2, false, var40.renderable1); - } else if (var7 == 8) { - var40.renderable1 = new DynamicObject(var11, 4, var8 + 4, class36.Client_plane, var4, var5, var2, false, var40.renderable1); - var40.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class36.Client_plane, var4, var5, var2, false, var40.renderable2); - } - } else { - var40.renderable1 = new DynamicObject(var11, 4, var8, class36.Client_plane, var4, var5, var2, false, var40.renderable1); - } - - return; - } - } - - if (var9 == 2) { - GameObject var43 = UserComparator5.scene.getGameObject(class36.Client_plane, var4, var5); - if (var7 == 11) { - var7 = 10; - } - - if (var43 != null) { - var43.renderable = new DynamicObject(class458.Entity_unpackID(var43.tag), var7, var8, class36.Client_plane, var4, var5, var2, false, var43.renderable); - return; - } - } - - if (var9 == 3) { - FloorDecoration var44 = UserComparator5.scene.getFloorDecoration(class36.Client_plane, var4, var5); - if (var44 != null) { - var44.renderable = new DynamicObject(class458.Entity_unpackID(var44.tag), 22, var8, class36.Client_plane, var4, var5, var2, false, var44.renderable); - return; - } - } - - AABB.method1268(class36.Client_plane, var4, var5, var9, var2); - } - - } else if (ZoneOperation.MAP_ANIM == var0) { - var2 = var1.readUnsignedByteSub(); // Height - var3 = var1.readUnsignedByte(); // Tile - var4 = (var3 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var5 = (var3 & 7) + class387.ZONE_Y; - var6 = var1.readUnsignedShort(); // Id - var7 = var1.readUnsignedShortAdd(); // Delay - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var4 = var4 * 128 + 64; - var5 = var5 * 128 + 64; - GraphicsObject var42 = new GraphicsObject(var6, class36.Client_plane, var4, var5, class306.getTileHeight(var4, var5, class36.Client_plane) - var2, var7, Client.cycle); - Client.graphicsObjects.addFirst(var42); - } - - } else if (ZoneOperation.OBJ_COUNT == var0) { - var2 = var1.readUnsignedByteAdd(); // Tile - var3 = (var2 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var4 = (var2 & 7) + class387.ZONE_Y; - var5 = var1.readUnsignedShort(); // Item - var6 = var1.readIntIME(); // Old Amount - var7 = var1.readIntIME(); // New Amount - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - NodeDeque var41 = Client.groundItems[class36.Client_plane][var3][var4]; - if (var41 != null) { - for (TileItem var33 = (TileItem)var41.last(); var33 != null; var33 = (TileItem)var41.previous()) { - if ((var5 & 32767) == var33.id && var6 == var33.quantity) { - var33.quantity = var7; - break; - } - } - - class344.updateItemPile(var3, var4); - } - } - - } else { - NodeDeque var34; - if (ZoneOperation.OBJ_DEL_LEGACY == var0) { - var2 = var1.readUnsignedByte(); - var3 = var1.readUnsignedByte(); - var4 = (var3 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var5 = (var3 & 7) + class387.ZONE_Y; - var6 = var1.readUnsignedShort(); - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var34 = Client.groundItems[class36.Client_plane][var4][var5]; - if (var34 != null) { - for (var31 = (TileItem)var34.last(); var31 != null; var31 = (TileItem)var34.previous()) { - if ((var6 & 32767) == var31.id) { - var31.method613(var2); - break; - } - } - } - } - - } else if (ZoneOperation.LOC_ADD_CHANGE == var0) { - var2 = var1.readUnsignedByteSub(); // Tile - var3 = (var2 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var4 = (var2 & 7) + class387.ZONE_Y; - var5 = var1.readUnsignedByteAdd(); // unknown - var6 = var1.readUnsignedShortLE(); // id - var7 = var1.readUnsignedByte(); // settings - var8 = var7 >> 2; - var9 = var7 & 3; - var10 = Client.field648[var8]; - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - AbstractWorldMapIcon.updatePendingSpawn(class36.Client_plane, var3, var4, var10, var6, var8, var9, var5, 0, -1); - } - - } else { - int var12; - int var13; - int var14; - if (ZoneOperation.PREFETCH_GAMEOBJECTS == var0) { - byte var36 = var1.readByteAdd(); - var3 = var1.readUnsignedByteAdd(); - var4 = (var3 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var5 = (var3 & 7) + class387.ZONE_Y; - var6 = var1.readUnsignedShortAdd(); - var7 = var1.readUnsignedShortLE(); - var8 = var1.readUnsignedShort(); - var9 = var1.readUnsignedShortAdd(); - byte var38 = var1.readByte(); - var11 = var1.readUnsignedByte(); - var12 = var11 >> 2; - var13 = var11 & 3; - var14 = Client.field648[var12]; - byte var15 = var1.readByteAdd(); - byte var16 = var1.readByte(); - Player var17; - if (var6 == Client.localPlayerIndex) { - var17 = class136.localPlayer; - } else { - var17 = Client.players[var6]; - } - - if (var17 != null) { - ObjectComposition var18 = class90.getObjectDefinition(var7); - int var19; - int var20; - if (var13 != 1 && var13 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } - - int var21 = var4 + (var19 >> 1); - int var22 = var4 + (var19 + 1 >> 1); - int var23 = var5 + (var20 >> 1); - int var24 = var5 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[class36.Client_plane]; - int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2; - int var27 = (var4 << 7) + (var19 << 6); - int var28 = (var5 << 7) + (var20 << 6); - Model var29 = var18.getModel(var12, var13, var25, var27, var26, var28); - if (var29 != null) { - AbstractWorldMapIcon.updatePendingSpawn(class36.Client_plane, var4, var5, var14, -1, 0, 0, 31, var9 + 1, var8 + 1); - var17.animationCycleStart = var9 + Client.cycle; - var17.animationCycleEnd = var8 + Client.cycle; - var17.attachedModel = var29; - var17.field911 = var19 * 64 + var4 * 128; - var17.field914 = var20 * 64 + var5 * 128; - var17.baseTileHeight = var26; - byte var30; - if (var36 > var16) { - var30 = var36; - var36 = var16; - var16 = var30; - } - - if (var38 > var15) { - var30 = var38; - var38 = var15; - var15 = var30; - } - - var17.minX = var4 + var36; - var17.maxX = var4 + var16; - var17.minY = var5 + var38; - var17.maxY = var5 + var15; - } - } - } - - if (ZoneOperation.MAPPROJ_ANIM == var0) { - var2 = var1.readUnsignedShort(); - var3 = var1.readSMed0(); - var4 = var1.readUnsignedByteNeg(); - byte var37 = var1.readSignedByteSub(); - var6 = var1.readUnsignedByteNeg(); - var7 = (var6 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var8 = (var6 & 7) + class387.ZONE_Y; - var9 = var1.readUnsignedByteAdd(); - var10 = var1.readUnsignedShortAdd(); - var11 = var1.readUnsignedShortAdd(); - byte var39 = var1.readByteAdd(); - var13 = var1.readUnsignedByteAdd() * 4; - var14 = var1.readUnsignedByteNeg() * 4; - var5 = var37 + var7; - var12 = var39 + var8; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var5 >= 0 && var12 >= 0 && var5 < 104 && var12 < 104 && var11 != 65535) { - var7 = var7 * 128 + 64; - var8 = var8 * 128 + 64; - var5 = var5 * 128 + 64; - var12 = var12 * 128 + 64; - Projectile var35 = new Projectile(var11, class36.Client_plane, var7, var8, class306.getTileHeight(var7, var8, class36.Client_plane) - var14, var2 + Client.cycle, var10 + Client.cycle, var9, var4, var3, var13); - var35.setDestination(var5, var12, class306.getTileHeight(var5, var12, class36.Client_plane) - var13, var2 + Client.cycle); - Client.projectiles.addFirst(var35); - } - - } else if (ZoneOperation.OBJ_DEL != var0) { - if (ZoneOperation.LOC_DEL == var0) { - var2 = var1.readUnsignedByteSub(); - var3 = (var2 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var4 = (var2 & 7) + class387.ZONE_Y; - var5 = var1.readUnsignedByte(); - var6 = var5 >> 2; - var7 = var5 & 3; - var8 = Client.field648[var6]; - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - AbstractWorldMapIcon.updatePendingSpawn(class36.Client_plane, var3, var4, var8, -1, var6, var7, 31, 0, -1); - } - - } - } else { - var2 = var1.readIntLE(); - var3 = var1.readUnsignedShort(); - var4 = var1.readUnsignedByteNeg(); - var5 = (var4 >> 4 & 7) + WorldMapSectionType.ZONE_X; - var6 = (var4 & 7) + class387.ZONE_Y; - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var34 = Client.groundItems[class36.Client_plane][var5][var6]; - if (var34 != null) { - for (var31 = (TileItem)var34.last(); var31 != null; var31 = (TileItem)var34.previous()) { - if ((var3 & 32767) == var31.id && var2 == var31.quantity) { - var31.remove(); - break; - } - } - - if (var34.last() == null) { - Client.groundItems[class36.Client_plane][var5][var6] = null; - } - - class344.updateItemPile(var5, var6); - } - } - - } - } - } - } + class409.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); + class13.method36(var0, var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class270.java b/osrs/src/main/java/class270.java new file mode 100644 index 000000000..70da95746 --- /dev/null +++ b/osrs/src/main/java/class270.java @@ -0,0 +1,111 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; +import java.util.Iterator; + +@ObfuscatedName("ka") +public class class270 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lka;" + ) + static final class270 field2453; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lka;" + ) + static final class270 field2452; + @ObfuscatedName("fb") + static long field2451; + @ObfuscatedName("ao") + final int field2454; + + static { + field2453 = new class270(0); + field2452 = new class270(1); + } + + class270(int var1) { + this.field2454 = var1; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Ljava/util/ArrayList;ZI)V", + garbageValue = "544527881" + ) + static void method1536(ArrayList var0, boolean var1) { + if (!var1) { + class305.field2773.clear(); + } + + Iterator var2 = var0.iterator(); + + while (var2.hasNext()) { + MusicSong var3 = (MusicSong)var2.next(); + if (var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { + if (!var1) { + class305.field2773.add(var3); + } + + class305.field2774.add(var3); + } + } + + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "2021273787" + ) + public static void method1537(int var0, int var1, int var2, int var3) { + class305.musicPlayerStatus = var0; + class305.field2766 = var1; + class305.field2769 = var2; + class305.field2768 = var3; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(CII)Ljava/lang/String;", + garbageValue = "1203600347" + ) + public static String method1538(char var0, int var1) { + char[] var2 = new char[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + var2[var3] = var0; + } + + return new String(var2); + } + + @ObfuscatedName("jt") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "340629836" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field615 = 0L; + if (var0 >= 2) { + Client.isResizable = true; + } else { + Client.isResizable = false; + } + + if (class218.getWindowedMode() == 1) { + class219.client.setMaxCanvasSize(765, 503); + } else { + class219.client.setMaxCanvasSize(7680, 2160); + } + + if (Client.gameState >= 25) { + Message.method341(); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class271.java b/osrs/src/main/java/class271.java index 2b889e35e..b1416307d 100644 --- a/osrs/src/main/java/class271.java +++ b/osrs/src/main/java/class271.java @@ -1,55 +1,214 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kx") +@ObfuscatedName("kf") public class class271 { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "Lkf;" ) - static final class271 field2429; - @ObfuscatedName("ay") + static final class271 field2456; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "Lkf;" ) - static final class271 field2430; - @ObfuscatedName("ar") - final int field2431; + static final class271 field2455; + @ObfuscatedName("ao") + final int field2457; static { - field2429 = new class271(0); - field2430 = new class271(1); + field2456 = new class271(0); + field2455 = new class271(1); } class271(int var1) { - this.field2431 = var1; + this.field2457 = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)[Lio;", + garbageValue = "-681739410" + ) + static class214[] method1541() { + return new class214[]{class214.field1898, class214.field1904, class214.field1902, class214.field1900, class214.field1899, class214.field1901, class214.field1903}; + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "25" + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "2076822771" ) - static final int method1502(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; + public static String method1540(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { + return ""; + } else if (var2 == 1) { + CharSequence var3 = var0[var1]; + return var3 == null ? "null" : var3.toString(); + } else { + int var8 = var2 + var1; + int var4 = 0; + + for (int var5 = var1; var5 < var8; ++var5) { + CharSequence var6 = var0[var5]; + if (var6 == null) { + var4 += 4; + } else { + var4 += var6.length(); + } + } + + StringBuilder var9 = new StringBuilder(var4); + + for (int var10 = var1; var10 < var8; ++var10) { + CharSequence var7 = var0[var10]; + if (var7 == null) { + var9.append("null"); + } else { + var9.append(var7); + } } + return var9.toString(); + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(II)Lhu;", + garbageValue = "1432274466" + ) + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - return (var0 & 65408) + var1; + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); + return var1; } } -} + + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "(ZLto;I)V", + garbageValue = "1816945767" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; + int var3; + int var4; + int var5; + int var6; + int var7; + if (!Client.isInInstance) { + int var2 = var1.readUnsignedShort(); + var3 = var1.method2587(); + var4 = var1.readUnsignedShort(); + RunException.xteaKeys = new int[var4][4]; + + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { + RunException.xteaKeys[var5][var6] = var1.readInt(); + } + } + + class191.regions = new int[var4]; + class59.regionMapArchiveIds = new int[var4]; + ObjTypeCustomisation.regionLandArchiveIds = new int[var4]; + UserComparator5.regionLandArchives = new byte[var4][]; + class197.regionMapArchives = new byte[var4][]; + var4 = 0; + + for (var5 = (var2 - 6) / 8; var5 <= (var2 + 6) / 8; ++var5) { + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { + var7 = var6 + (var5 << 8); + class191.regions[var4] = var7; + class59.regionMapArchiveIds[var4] = class499.archive9.getGroupId("m" + var5 + "_" + var6); + ObjTypeCustomisation.regionLandArchiveIds[var4] = class499.archive9.getGroupId("l" + var5 + "_" + var6); + ++var4; + } + } + + class316.method1698(var2, var3, true); + } else { + boolean var15 = var1.readUnsignedByte() == 1; + var3 = var1.readUnsignedShort(); + var4 = var1.readUnsignedShort(); + var5 = var1.readUnsignedShort(); + var1.importIndex(); + + int var8; + int var9; + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = var1.readBits(1); + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; + } + } + } + } + + var1.exportIndex(); + RunException.xteaKeys = new int[var5][4]; + + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + RunException.xteaKeys[var6][var7] = var1.readInt(); + } + } + + class191.regions = new int[var5]; + class59.regionMapArchiveIds = new int[var5]; + ObjTypeCustomisation.regionLandArchiveIds = new int[var5]; + UserComparator5.regionLandArchives = new byte[var5][]; + class197.regionMapArchives = new byte[var5][]; + var5 = 0; + + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = Client.instanceChunkTemplates[var6][var7][var8]; + if (var9 != -1) { + int var10 = var9 >> 14 & 1023; + int var11 = var9 >> 3 & 2047; + int var12 = (var10 / 8 << 8) + var11 / 8; + + int var13; + for (var13 = 0; var13 < var5; ++var13) { + if (class191.regions[var13] == var12) { + var12 = -1; + break; + } + } + + if (var12 != -1) { + class191.regions[var5] = var12; + var13 = var12 >> 8 & 255; + int var14 = var12 & 255; + class59.regionMapArchiveIds[var5] = class499.archive9.getGroupId("m" + var13 + "_" + var14); + ObjTypeCustomisation.regionLandArchiveIds[var5] = class499.archive9.getGroupId("l" + var13 + "_" + var14); + ++var5; + } + } + } + } + } + + class316.method1698(var4, var3, !var15); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class272.java b/osrs/src/main/java/class272.java index caf8d1dd9..eeed69357 100644 --- a/osrs/src/main/java/class272.java +++ b/osrs/src/main/java/class272.java @@ -1,27 +1,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("kx") public class class272 { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "(IB)V", + garbageValue = "119" ) - static final class272 field2432; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - static final class272 field2433; - @ObfuscatedName("ar") - final int field2434; - - static { - field2432 = new class272(0); - field2433 = new class272(1); - } - - class272(int var1) { - this.field2434 = var1; + static void method1544(int var0) { + GrandExchangeOfferOwnWorldComparator.field361 = var0; + class450.field3873 = new class450[var0]; + class462.field3904 = 0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class273.java b/osrs/src/main/java/class273.java deleted file mode 100644 index 066f63030..000000000 --- a/osrs/src/main/java/class273.java +++ /dev/null @@ -1,80 +0,0 @@ -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kq") -public class class273 { - @ObfuscatedName("az") - @Export("soundSystemExecutor") - public static ScheduledExecutorService soundSystemExecutor; - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-644224068" - ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-939807421" - ) - public static int method1504(int var0) { - class137 var2 = (class137)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); - class137 var1; - if (var2 != null) { - var1 = var2; - } else { - AbstractArchive var4 = class333.SequenceDefinition_animationsArchive; - AbstractArchive var5 = class169.SequenceDefinition_skeletonsArchive; - boolean var6 = true; - byte[] var7 = var4.getFile(var0 >> 16 & 65535, var0 & 65535); - class137 var3; - if (var7 == null) { - var6 = false; - var3 = null; - } else { - int var8 = (var7[1] & 255) << 8 | var7[2] & 255; - byte[] var9 = var5.getFile(var8, 0); - if (var9 == null) { - var6 = false; - } - - if (!var6) { - var3 = null; - } else { - if (SoundCache.field214 == null) { - UserComparator4.field1166 = Runtime.getRuntime().availableProcessors(); - SoundCache.field214 = new ThreadPoolExecutor(0, UserComparator4.field1166, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(UserComparator4.field1166 * 100 + 100), new class184()); - } - - try { - var3 = new class137(var4, var5, var0, false); - } catch (Exception var11) { - var3 = null; - } - } - } - - if (var3 != null) { - SequenceDefinition.SequenceDefinition_cachedModel.put(var3, (long)var0); - } - - var1 = var3; - } - - if (var1 == null) { - return 2; - } else { - return var1.method735() ? 0 : 1; - } - } -} diff --git a/osrs/src/main/java/class28.java b/osrs/src/main/java/class28.java index 89710d51e..1ca6530c9 100644 --- a/osrs/src/main/java/class28.java +++ b/osrs/src/main/java/class28.java @@ -2,106 +2,55 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bn") +@ObfuscatedName("bk") public class class28 { - @ObfuscatedName("wd") - @ObfuscatedSignature( - descriptor = "Lng;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("dn") + @ObfuscatedName("wn") + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("ds") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("ed") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("gl") - @Export("playerUUIDLength") - static int playerUUIDLength; + @ObfuscatedName("fo") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + static Archive field81; static { 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, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-60773254" + descriptor = "(Lnu;III)[Luk;", + garbageValue = "-1285890044" ) - public static int method118(int var0, int var1, int var2) { - int var3 = class228.method1190(var2 - var1 + 1); - var3 <<= var1; - return var0 & ~var3; + public static IndexedSprite[] method110(AbstractArchive var0, int var1, int var2) { + return !ApproximateRouteStrategy.method345(var0, var1, var2) ? null : class30.method118(); } - @ObfuscatedName("hx") + @ObfuscatedName("ow") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-725833336" + descriptor = "(I)V", + garbageValue = "972746091" ) - static boolean method119() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var0.isLoaded()) { - return false; - } - - ++Client.archiveLoadersDone; + static void method111() { + if (Client.oculusOrbOnLocalPlayer && VarbitComposition.localPlayer != null) { + int var0 = VarbitComposition.localPlayer.pathX[0]; + int var1 = VarbitComposition.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { + return; } - return true; - } else { - return true; - } - } - - @ObfuscatedName("kb") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)V", - garbageValue = "123" - ) - static void method120(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, class457.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != class136.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = class503.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortAddLE(var3[var6]); - var8.packetBuffer.writeByteSub(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = class503.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortAdd(var3[var6]); - var8.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = class503.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortAddLE(var3[var6]); - var8.packetBuffer.writeByteSub(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = class503.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3[var6]); - var8.packetBuffer.writeByteNeg(0); - Client.packetWriter.addNode(var8); - } - - var4 = true; - break; + FriendLoginUpdate.oculusOrbFocalPointX = VarbitComposition.localPlayer.x; + int var2 = class18.getTileHeight(VarbitComposition.localPlayer.x, VarbitComposition.localPlayer.y, HealthBar.Client_plane) - Client.camFollowHeight; + if (var2 < class125.field1194) { + class125.field1194 = var2; } - } - if (!var4) { - class415.addGameMessage(4, "", "Unable to find " + var1); + HealthBar.oculusOrbFocalPointY = VarbitComposition.localPlayer.y; + Client.oculusOrbOnLocalPlayer = false; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class280.java b/osrs/src/main/java/class280.java new file mode 100644 index 000000000..4e5707c01 --- /dev/null +++ b/osrs/src/main/java/class280.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("kk") +public interface class280 extends class282 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class281.java b/osrs/src/main/java/class281.java index 02a101349..15c7b75fc 100644 --- a/osrs/src/main/java/class281.java +++ b/osrs/src/main/java/class281.java @@ -1,5 +1,15 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") -public interface class281 extends class283 { -} +@ObfuscatedName("kc") +public abstract class class281 implements class283 { + @ObfuscatedName("au") + protected int field2482; + + @ObfuscatedSignature( + descriptor = "(Lns;Lon;I)V" + ) + protected class281(StudioGame var1, Language var2, int var3) { + this.field2482 = var3; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class282.java b/osrs/src/main/java/class282.java index 79ada437a..b30cba68a 100644 --- a/osrs/src/main/java/class282.java +++ b/osrs/src/main/java/class282.java @@ -1,50 +1,5 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") -public abstract class class282 implements class284 { - @ObfuscatedName("kd") - @ObfuscatedSignature( - descriptor = "[Luu;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("aw") - protected int field2464; - - @ObfuscatedSignature( - descriptor = "(Lnu;Lot;I)V" - ) - protected class282(StudioGame var1, Language var2, int var3) { - this.field2464 = var3; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "2019225375" - ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { - return Byte.TYPE; - } else if (var0.equals("I")) { - return Integer.TYPE; - } else if (var0.equals("S")) { - return Short.TYPE; - } else if (var0.equals("J")) { - return Long.TYPE; - } else if (var0.equals("Z")) { - return Boolean.TYPE; - } else if (var0.equals("F")) { - return Float.TYPE; - } else if (var0.equals("D")) { - return Double.TYPE; - } else if (var0.equals("C")) { - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); - } - } -} +@ObfuscatedName("km") +public interface class282 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class283.java b/osrs/src/main/java/class283.java index 514945d47..36cdd51e2 100644 --- a/osrs/src/main/java/class283.java +++ b/osrs/src/main/java/class283.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kc") -public interface class283 { -} +@ObfuscatedName("kz") +public interface class283 extends Iterable { +} \ No newline at end of file diff --git a/osrs/src/main/java/class284.java b/osrs/src/main/java/class284.java index 7481a8c66..5ab7b2e3d 100644 --- a/osrs/src/main/java/class284.java +++ b/osrs/src/main/java/class284.java @@ -1,5 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kb") -public interface class284 extends Iterable { -} +@ObfuscatedName("kh") +public interface class284 { + @ObfuscatedName("au") + void method1589(Object var1); +} \ No newline at end of file diff --git a/osrs/src/main/java/class285.java b/osrs/src/main/java/class285.java deleted file mode 100644 index b23e5dcf0..000000000 --- a/osrs/src/main/java/class285.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("kh") -public interface class285 { - @ObfuscatedName("aw") - void method1549(Object var1); -} diff --git a/osrs/src/main/java/class29.java b/osrs/src/main/java/class29.java index d962c3dd0..19047f9a7 100644 --- a/osrs/src/main/java/class29.java +++ b/osrs/src/main/java/class29.java @@ -2,37 +2,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ba") +@ObfuscatedName("bv") public interface class29 { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1364202239" + garbageValue = "1089015731" ) @Export("vmethod3949") boolean vmethod3949(int var1); - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1960624058" + garbageValue = "-1292750960" ) @Export("vmethod3989") boolean vmethod3989(int var1); - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(CI)Z", - garbageValue = "932068520" + garbageValue = "-352714805" ) @Export("vmethod3951") boolean vmethod3951(char var1); - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ZB)Z", - garbageValue = "-93" + descriptor = "(ZI)Z", + garbageValue = "-1559971994" ) @Export("vmethod3953") boolean vmethod3953(boolean var1); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class291.java b/osrs/src/main/java/class291.java new file mode 100644 index 000000000..94278eb0d --- /dev/null +++ b/osrs/src/main/java/class291.java @@ -0,0 +1,7 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lm") +public class class291 { + @ObfuscatedName("az") + public static int field2496; +} \ No newline at end of file diff --git a/osrs/src/main/java/class292.java b/osrs/src/main/java/class292.java index a271a304e..c60eb1b01 100644 --- a/osrs/src/main/java/class292.java +++ b/osrs/src/main/java/class292.java @@ -1,59 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("lp") public class class292 { - @ObfuscatedName("ce") - static String field2478; - @ObfuscatedName("do") - @ObfuscatedSignature( - descriptor = "[Luu;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Lty;B)Ljava/lang/String;", - garbageValue = "-1" - ) - @Export("readString") - public static String readString(Buffer var0) { - String var1; - try { - int var2 = var0.readUShortSmart(); - if (var2 > 32767) { - var2 = 32767; - } - - byte[] var3 = new byte[var2]; - var0.offset += class335.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = LoginType.decodeStringCp1252(var3, 0, var2); - var1 = var4; - } catch (Exception var6) { - var1 = "Cabbage"; - } - - return var1; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-924567891" - ) - static void method1567() { - synchronized(ArchiveDiskActionHandler.field3500) { - if (ArchiveDiskActionHandler.field3499 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3499 = 600; - ArchiveDiskActionHandler.field3498 = false; - } - } -} + @ObfuscatedName("gs") + @Export("worldHost") + static String worldHost; +} \ No newline at end of file diff --git a/osrs/src/main/java/class293.java b/osrs/src/main/java/class293.java index 6e260d4da..bd63cae04 100644 --- a/osrs/src/main/java/class293.java +++ b/osrs/src/main/java/class293.java @@ -1,15 +1,5 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") -public class class293 { - @ObfuscatedName("gd") - static int field2480; - @ObfuscatedName("rf") - @ObfuscatedSignature( - descriptor = "Ltp;" - ) - @Export("HitSplatDefinition_cachedSprites") - static class498 HitSplatDefinition_cachedSprites; -} +@ObfuscatedName("la") +public interface class293 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class294.java b/osrs/src/main/java/class294.java deleted file mode 100644 index cec9b9dfe..000000000 --- a/osrs/src/main/java/class294.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lh") -public interface class294 { -} diff --git a/osrs/src/main/java/class299.java b/osrs/src/main/java/class299.java new file mode 100644 index 000000000..a7b454c5f --- /dev/null +++ b/osrs/src/main/java/class299.java @@ -0,0 +1,143 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import netscape.js.JSObject; + +import java.applet.Applet; +import java.io.File; +import java.io.RandomAccessFile; +import java.net.URL; + +@ObfuscatedName("ln") +public class class299 { + @ObfuscatedName("va") + @ObfuscatedSignature( + descriptor = "Lci;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "[Luk;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "1126631894" + ) + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); + RandomAccessFile var3 = null; + + try { + File var4 = new File(var2.getParent()); + if (!var4.exists()) { + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); + int var5 = var3.read(); + var3.seek(0L); + var3.write(var5); + var3.seek(0L); + var3.close(); + FileSystem.FileSystem_cacheFiles.put(var0, var2); + return var2; + } + } catch (Exception var8) { + try { + if (var3 != null) { + var3.close(); + var3 = null; + } + } catch (Exception var7) { + } + + throw new RuntimeException(); + } + } + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "-644258747" + ) + static boolean method1618(String var0, int var1, String var2) { + if (var1 == 0) { + try { + if (!class31.field86.startsWith("win")) { + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { + throw new Exception(); + } else { + String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var11.indexOf(var0.charAt(var4)) == -1) { + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); + return true; + } + } catch (Throwable var5) { + return false; + } + } else if (var1 == 1) { + try { + Object var10 = class26.method95(class31.field85, var2, new Object[]{(new URL(class31.field85.getCodeBase(), var0)).toString()}); + return var10 != null; + } catch (Throwable var6) { + return false; + } + } else if (var1 == 2) { + try { + class31.field85.getAppletContext().showDocument(new URL(class31.field85.getCodeBase(), var0), "_blank"); + return true; + } catch (Exception var7) { + return false; + } + } else if (var1 == 3) { + try { + Applet var3 = class31.field85; + JSObject.getWindow(var3).call("loggedout", (Object[])null); + } catch (Throwable var9) { + } + + try { + class31.field85.getAppletContext().showDocument(new URL(class31.field85.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var8) { + return false; + } + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("kc") + @ObfuscatedSignature( + descriptor = "(IIB)Liw;", + garbageValue = "122" + ) + static RouteStrategy method1619(int var0, int var1) { + Client.field652.approxDestinationX = var0; + Client.field652.approxDestinationY = var1; + Client.field652.approxDestinationSizeX = 1; + Client.field652.approxDestinationSizeY = 1; + return Client.field652; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class3.java b/osrs/src/main/java/class3.java index 98e14cff2..47ce2f916 100644 --- a/osrs/src/main/java/class3.java +++ b/osrs/src/main/java/class3.java @@ -2,12 +2,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("am") +@ObfuscatedName("at") public interface class3 { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;)Lty;" + descriptor = "(Ltm;)Ltm;" ) @Export("vmethod12") Buffer vmethod12(Buffer var1); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class30.java b/osrs/src/main/java/class30.java index 4dcb15449..e3a41120b 100644 --- a/osrs/src/main/java/class30.java +++ b/osrs/src/main/java/class30.java @@ -1,119 +1,107 @@ -import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bf") +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.Desktop.Action; +import java.net.URI; + +@ObfuscatedName("bt") public class class30 { - @ObfuscatedName("dk") - @ObfuscatedSignature( - descriptor = "[Luu;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("al") + static int field82; + @ObfuscatedName("he") + static String field83; static { ImageIO.setUseCache(false); } - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(III)Ldc;", - garbageValue = "-1173392084" + descriptor = "(IIIB)Z", + garbageValue = "-75" ) - static Script method125(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); - if (var2 != null) { - return var2; - } else { - String var3 = String.valueOf(var0); - int var4 = class126.archive12.getGroupId(var3); - if (var4 == -1) { - return null; - } else { - byte[] var5 = class126.archive12.takeFileFlat(var4); - if (var5 != null) { - if (var5.length <= 1) { - return null; - } + static boolean method116(int var0, int var1, int var2) { + return var0 >= 0 && var0 < 4 && var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104; + } - var2 = SoundCache.newScript(var5); - if (var2 != null) { - Script.Script_cached.put(var2, (long)(var0 << 16)); - return var2; - } + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZZB)V", + garbageValue = "-94" + ) + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + if (var1) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + try { + Desktop.getDesktop().browse(new URI(var0)); + return; + } catch (Exception var4) { } + } - return null; + if (class31.field86.startsWith("win")) { + BoundaryObject.method1384(var0, 0); + } else if (class31.field86.startsWith("mac")) { + class299.method1618(var0, 1, "openjs"); + } else { + BoundaryObject.method1384(var0, 2); } + } else { + BoundaryObject.method1384(var0, 3); } - } - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "2078832853" - ) - static int method126(int var0, Script var1, boolean var2) { - return 2; } - @ObfuscatedName("jn") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIIIIIIB)V", - garbageValue = "-74" + descriptor = "(I)[Luk;", + garbageValue = "694687164" ) - static final void method127(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - var5 = UserList.method2216(var5, var6); - int var7 = 2048 - var3 & 2047; - int var8 = 2048 - var4 & 2047; - int var9 = 0; - int var10 = 0; - int var11 = var5; - int var12; - int var13; - int var14; - if (var7 != 0) { - var12 = Rasterizer3D.Rasterizer3D_sine[var7]; - var13 = Rasterizer3D.Rasterizer3D_cosine[var7]; - var14 = var13 * var10 - var12 * var5 >> 16; - var11 = var12 * var10 + var13 * var5 >> 16; - var10 = var14; - } + static IndexedSprite[] method118() { + IndexedSprite[] var0 = new IndexedSprite[class529.SpriteBuffer_spriteCount]; - if (var8 != 0) { - var12 = Rasterizer3D.Rasterizer3D_sine[var8]; - var13 = Rasterizer3D.Rasterizer3D_cosine[var8]; - var14 = var12 * var11 + var13 * var9 >> 16; - var11 = var11 * var13 - var9 * var12 >> 16; - var9 = var14; + for (int var1 = 0; var1 < class529.SpriteBuffer_spriteCount; ++var1) { + IndexedSprite var2 = var0[var1] = new IndexedSprite(); + var2.width = class529.SpriteBuffer_spriteWidth; + var2.height = class420.SpriteBuffer_spriteHeight; + var2.xOffset = class529.SpriteBuffer_xOffsets[var1]; + var2.yOffset = class152.SpriteBuffer_yOffsets[var1]; + var2.subWidth = HealthBarUpdate.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = SpriteMask.SpriteBuffer_spriteHeights[var1]; + var2.palette = DbTableType.SpriteBuffer_spritePalette; + var2.pixels = Coord.SpriteBuffer_pixels[var1]; } - if (Client.isCameraLocked) { - class422.field3755 = var0 - var9; - FadeInTask.field3706 = var1 - var10; - ModeWhere.field3604 = var2 - var11; - class165.field1420 = var3; - class4.field3 = var4; - } else { - class157.cameraX = var0 - var9; - class384.cameraY = var1 - var10; - SoundSystem.cameraZ = var2 - var11; - class19.cameraPitch = var3; - class456.cameraYaw = var4; - } + class529.SpriteBuffer_xOffsets = null; + class152.SpriteBuffer_yOffsets = null; + HealthBarUpdate.SpriteBuffer_spriteWidths = null; + SpriteMask.SpriteBuffer_spriteHeights = null; + DbTableType.SpriteBuffer_spritePalette = null; + Coord.SpriteBuffer_pixels = null; + return var0; + } - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class467.oculusOrbFocalPointX >> 7 != class136.localPlayer.x >> 7 || class36.oculusOrbFocalPointY >> 7 != class136.localPlayer.y >> 7)) { - var12 = class136.localPlayer.plane; - var13 = (class467.oculusOrbFocalPointX >> 7) + AbstractArchive.baseX; - var14 = (class36.oculusOrbFocalPointY >> 7) + class148.baseY; - PacketBufferNode var15 = class503.getPacketBufferNode(ClientPacket.TELEPORT, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeIntME(Client.field363); - var15.packetBuffer.writeShortAddLE(var13); - var15.packetBuffer.writeByteAdd(var12); - var15.packetBuffer.writeShortAdd(var14); - Client.packetWriter.addNode(var15); - } + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(I)Low;", + garbageValue = "1819650636" + ) + @Export("getScriptEvents") + public static NodeDeque getScriptEvents() { + return Client.scriptEvents; + } + @ObfuscatedName("mc") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "26" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class300.java b/osrs/src/main/java/class300.java index f43c6077a..6b2ce381f 100644 --- a/osrs/src/main/java/class300.java +++ b/osrs/src/main/java/class300.java @@ -2,36 +2,68 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") -public class class300 { - @ObfuscatedName("ax") - static int field2730; - @ObfuscatedName("qu") - static int field2731; - - @ObfuscatedName("ay") +import java.util.HashMap; +import java.util.Iterator; +import java.util.TimeZone; + + +@ObfuscatedName("lc") +public final class class300 { + @ObfuscatedName("ao") + static final HashMap field2753; + + static { + field2753 = new HashMap(); + TimeZone var0; + synchronized(field2753) { + TimeZone var2 = (TimeZone)field2753.get("Europe/London"); + if (var2 == null) { + var2 = TimeZone.getTimeZone("Europe/London"); + field2753.put("Europe/London", var2); + } + + var0 = var2; + } + + java.util.Calendar.getInstance(var0); + } + + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1871273953" + descriptor = "(IB)V", + garbageValue = "57" ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; - int[] var3 = new int[4]; - var2[0] = var0; - var3[0] = var1; - int var4 = 1; - - for (int var5 = 0; var5 < 4; ++var5) { - if (World.World_sortOption1[var5] != var0) { - var2[var4] = World.World_sortOption1[var5]; - var3[var4] = World.World_sortOption2[var5]; - ++var4; + public static void method1620(int var0) { + if (!class305.musicSongs.isEmpty()) { + Iterator var1 = class305.musicSongs.iterator(); + + while (var1.hasNext()) { + MusicSong var2 = (MusicSong)var1.next(); + if (var2 != null) { + var2.musicTrackVolume = var0; + } + } + + MusicSong var3 = (MusicSong)class305.musicSongs.get(0); + if (var3 != null && var3.midiPcmStream != null && var3.midiPcmStream.isReady() && !var3.field2862) { + var3.midiPcmStream.setPcmStreamVolume(var0); + var3.field2867 = (float)var0; } } - World.World_sortOption1 = var2; - World.World_sortOption2 = var3; - VarbitComposition.sortWorlds(class387.World_worlds, 0, class387.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); } -} + + @ObfuscatedName("oz") + @ObfuscatedSignature( + descriptor = "(Lmi;B)Ljava/lang/String;", + garbageValue = "-51" + ) + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (HealthBarDefinition.Widget_unpackTargetMask(NewShit.getWidgetFlags(var0)) == 0) { + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class301.java b/osrs/src/main/java/class301.java index 64dd79a75..eb4132ae1 100644 --- a/osrs/src/main/java/class301.java +++ b/osrs/src/main/java/class301.java @@ -1,142 +1,20 @@ -import java.util.HashMap; -import java.util.TimeZone; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lt") +@ObfuscatedName("lv") public final class class301 { - @ObfuscatedName("ar") - static final HashMap field2733; - @ObfuscatedName("iz") - static int field2732; + @ObfuscatedName("au") + static long field2754; - static { - field2733 = new HashMap(); - java.util.Calendar.getInstance(method1576("Europe/London")); - } - - @ObfuscatedName("aw") + @ObfuscatedName("hn") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)Ljava/util/TimeZone;", - garbageValue = "13393" + descriptor = "(I)V", + garbageValue = "977929295" ) - static TimeZone method1576(String var0) { - synchronized(field2733) { - TimeZone var2 = (TimeZone)field2733.get(var0); - if (var2 == null) { - var2 = TimeZone.getTimeZone(var0); - field2733.put(var0, var2); - } - - return var2; + static final void method1622() { + if (AddRequestTask.pcmPlayer1 != null) { + AddRequestTask.pcmPlayer1.run(); } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-2109434245" - ) - static int method1577(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == 100) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = VarbitComposition.getWidget(var3); - if (var6.children == null) { - var6.children = new Widget[var5 + 1]; - } - - if (var6.children.length <= var5) { - Widget[] var7 = new Widget[var5 + 1]; - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; - } - - var6.children = var7; - } - - if (var5 > 0 && var6.children[var5 - 1] == null) { - throw new RuntimeException("" + (var5 - 1)); - } else { - Widget var12 = new Widget(); - var12.type = var4; - var12.parentId = var12.id = var6.id; - var12.childIndex = var5; - var12.isIf3 = true; - if (var4 == 12) { - var12.method1804(); - var12.method1805().method1741(new class105(var12)); - var12.method1805().method1740(new class106(var12)); - } - - var6.children[var5] = var12; - if (var2) { - class36.scriptDotWidget = var12; - } else { - class351.scriptActiveWidget = var12; - } - - class200.invalidateWidget(var6); - return 1; - } - } - } else { - Widget var9; - if (var0 == 101) { - var9 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - Widget var10 = VarbitComposition.getWidget(var9.id); - var10.children[var9.childIndex] = null; - class200.invalidateWidget(var10); - return 1; - } else if (var0 == 102) { - var9 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var9.children = null; - class200.invalidateWidget(var9); - return 1; - } else if (var0 != 200) { - if (var0 == 201) { - var9 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - if (var2) { - class36.scriptDotWidget = var9; - } else { - class351.scriptActiveWidget = var9; - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Widget var11 = MouseRecorder.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - if (var2) { - class36.scriptDotWidget = var11; - } else { - class351.scriptActiveWidget = var11; - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class302.java b/osrs/src/main/java/class302.java index 578e6ce2f..e8e034ffa 100644 --- a/osrs/src/main/java/class302.java +++ b/osrs/src/main/java/class302.java @@ -1,23 +1,90 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") -public final class class302 { - @ObfuscatedName("aw") - static long field2735; - @ObfuscatedName("ay") - static long field2736; - @ObfuscatedName("aa") +@ObfuscatedName("lr") +public class class302 { + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "[Lts;" + descriptor = "(IIIB)D", + garbageValue = "-9" ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("kk") - @ObfuscatedSignature( - descriptor = "[Luu;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; -} + static double method1623(int var0, int var1, int var2) { + double var3 = var1 > 0 ? (double)Math.max(0.0F, Math.min(1.0F, (float)var0 / (float)var1)) : 1.0D; + if (var3 > 0.0D && var3 < 1.0D) { + double var5; + double var7; + switch(var2) { + case 0: + return var3; + case 1: + return 1.0D - Math.cos(3.141592653589793D * var3 / 2.0D); + case 2: + return Math.sin(var3 * 3.141592653589793D / 2.0D); + case 3: + return -(Math.cos(3.141592653589793D * var3) - 1.0D) / 2.0D; + case 4: + return var3 * var3; + case 5: + return 1.0D - (1.0D - var3) * (1.0D - var3); + case 6: + return var3 < 0.5D ? var3 * 2.0D * var3 : 1.0D - Math.pow(2.0D + var3 * -2.0D, 2.0D) / 2.0D; + case 7: + return var3 * var3 * var3; + case 8: + return 1.0D - Math.pow(1.0D - var3, 3.0D); + case 9: + return var3 < 0.5D ? var3 * 4.0D * var3 * var3 : 1.0D - Math.pow(2.0D + -2.0D * var3, 3.0D) / 2.0D; + case 10: + return var3 * var3 * var3 * var3; + case 11: + return 1.0D - Math.pow(1.0D - var3, 4.0D); + case 12: + return var3 < 0.5D ? var3 * var3 * var3 * var3 * 8.0D : 1.0D - Math.pow(2.0D + -2.0D * var3, 4.0D) / 2.0D; + case 13: + return var3 * var3 * var3 * var3 * var3; + case 14: + return 1.0D - Math.pow(1.0D - var3, 5.0D); + case 15: + return var3 < 0.5D ? var3 * var3 * 8.0D * var3 * var3 * var3 : 1.0D - Math.pow(var3 * -2.0D + 2.0D, 5.0D) / 2.0D; + case 16: + return Math.pow(2.0D, var3 * 10.0D - 10.0D); + case 17: + return 1.0D - Math.pow(2.0D, var3 * -10.0D); + case 18: + return var3 < 0.5D ? Math.pow(2.0D, 10.0D + 20.0D * var3) / 2.0D : (2.0D - Math.pow(2.0D, 10.0D + var3 * -20.0D)) / 2.0D; + case 19: + return 1.0D - Math.sqrt(1.0D - Math.pow(var3, 2.0D)); + case 20: + return Math.sqrt(1.0D - Math.pow(var3 - 1.0D, 2.0D)); + case 21: + return var3 < 0.5D ? (1.0D - Math.sqrt(1.0D - Math.pow(2.0D * var3, 2.0D))) / 2.0D : (Math.sqrt(1.0D - Math.pow(2.0D + -2.0D * var3, 2.0D)) + 1.0D) / 2.0D; + case 22: + var5 = 1.70158D; + var7 = 2.70158D; + return var3 * 2.70158D * var3 * var3 - var3 * 1.70158D * var3; + case 23: + var5 = 1.70158D; + var7 = 2.70158D; + return 1.0D + 2.70158D * Math.pow(var3 - 1.0D, 3.0D) + 1.70158D * Math.pow(var3 - 1.0D, 2.0D); + case 24: + var5 = 1.70158D; + var7 = 2.5949095D; + return var3 < 0.5D ? Math.pow(var3 * 2.0D, 2.0D) * (7.189819D * var3 - 2.5949095D) / 2.0D : (Math.pow(2.0D * var3 - 2.0D, 2.0D) * (3.5949095D * (2.0D * var3 - 2.0D) + 2.5949095D) + 2.0D) / 2.0D; + case 25: + var5 = 2.0943951023931953D; + return -Math.pow(2.0D, var3 * 10.0D - 10.0D) * Math.sin((var3 * 10.0D - 10.75D) * 2.0943951023931953D); + case 26: + var5 = 2.0943951023931953D; + return Math.pow(2.0D, -10.0D * var3) * Math.sin(2.0943951023931953D * (10.0D * var3 - 0.75D)) + 1.0D; + case 27: + var5 = 1.3962634015954636D; + var7 = Math.sin((20.0D * var3 - 11.125D) * 1.3962634015954636D); + return var3 < 0.5D ? -(Math.pow(2.0D, var3 * 20.0D - 10.0D) * var7) / 2.0D : Math.pow(2.0D, 10.0D + -20.0D * var3) * var7 / 2.0D + 1.0D; + default: + return var3; + } + } else { + return var3 <= 0.0D ? 0.0D : 1.0D; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class303.java b/osrs/src/main/java/class303.java index 60c73cee2..db003554a 100644 --- a/osrs/src/main/java/class303.java +++ b/osrs/src/main/java/class303.java @@ -1,800 +1,30 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("lt") public class class303 { - @ObfuscatedName("fy") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "([BIII)Z", - garbageValue = "756949404" - ) - static final boolean method1578(byte[] var0, int var1, int var2) { - boolean var3 = true; - Buffer var4 = new Buffer(var0); - int var5 = -1; - - label57: - while (true) { - int var6 = var4.method2541(); - if (var6 == 0) { - return var3; - } - - var5 += var6; - int var7 = 0; - boolean var8 = false; - - while (true) { - int var9; - while (!var8) { - var9 = var4.readUShortSmart(); - if (var9 == 0) { - continue label57; - } - - var7 += var9 - 1; - int var10 = var7 & 63; - int var11 = var7 >> 6 & 63; - int var12 = var4.readUnsignedByte() >> 2; - int var13 = var11 + var1; - int var14 = var10 + var2; - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { - ObjectComposition var15 = class90.getObjectDefinition(var5); - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { - if (!var15.needsModelFiles()) { - ++Client.field448; - var3 = false; - } - - var8 = true; - } - } - } - - var9 = var4.readUShortSmart(); - if (var9 == 0) { - break; - } - - var4.readUnsignedByte(); - } + @ObfuscatedName("au") + static int[] field2755; + + static { + new Object(); + field2755 = new int[33]; + field2755[0] = 0; + int var0 = 2; + + for (int var1 = 1; var1 < 33; ++var1) { + field2755[var1] = var0 - 1; + var0 += var0; } - } - - @ObfuscatedName("jq") - @ObfuscatedSignature( - descriptor = "(Ldx;IIIIII)V", - garbageValue = "-219666701" - ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCComposition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } - - if (var6 == null) { - return; - } - } - - int var75 = Players.Players_count; - int[] var7 = Players.Players_indices; - boolean var8 = var1 < var75; - int var9 = -2; - if (var0.overheadText != null && (!var8 || !var0.showPublicPlayerChat && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - class141.method754(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextLimit < Client.overheadTextCount) { - Client.overheadTextXOffsets[Client.overheadTextLimit] = Calendar.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextLimit] = Calendar.fontBold12.ascent; - Client.overheadTextXs[Client.overheadTextLimit] = Client.viewportTempX; - Client.overheadTextYs[Client.overheadTextLimit] = Client.viewportTempY - var9; - Client.overheadTextColors[Client.overheadTextLimit] = var0.field986; - Client.overheadTextEffects[Client.overheadTextLimit] = var0.field994; - Client.overheadTextCyclesRemaining[Client.overheadTextLimit] = var0.overheadTextCyclesRemaining; - Client.field591[Client.overheadTextLimit] = var0.field1023; - Client.field599[Client.overheadTextLimit] = var0.overheadText; - ++Client.overheadTextLimit; - var9 += 12; - } - } - - int var15; - int var22; - int var23; - if (!var0.healthBars.method1971()) { - class141.method754(var0, var0.defaultHeight + 15); - - for (HealthBar var10 = (HealthBar)var0.healthBars.last(); var10 != null; var10 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var11 = var10.get(Client.cycle); - if (var11 == null) { - if (var10.isEmpty()) { - var10.remove(); - } - } else { - HealthBarDefinition var12 = var10.definition; - SpritePixels var13 = var12.getBackSprite(); - SpritePixels var14 = var12.getFrontSprite(); - int var16 = 0; - if (var13 != null && var14 != null) { - if (var12.widthPadding * 2 < var14.subWidth) { - var16 = var12.widthPadding; - } - - var15 = var14.subWidth - var16 * 2; - } else { - var15 = var12.width; - } - - int var84 = 255; - boolean var86 = true; - int var87 = Client.cycle - var11.cycle; - int var88 = var15 * var11.health2 / var12.width; - int var89; - int var99; - if (var11.cycleOffset > var87) { - var89 = var12.field1540 == 0 ? 0 : var12.field1540 * (var87 / var12.field1540); - var22 = var15 * var11.health / var12.width; - var99 = var89 * (var88 - var22) / var11.cycleOffset + var22; - } else { - var99 = var88; - var89 = var11.cycleOffset + var12.int5 - var87; - if (var12.int3 >= 0) { - var84 = (var89 << 8) / (var12.int5 - var12.int3); - } - } - - if (var11.health2 > 0 && var99 < 1) { - var99 = 1; - } - - if (var13 != null && var14 != null) { - if (var15 == var99) { - var99 += var16 * 2; - } else { - var99 += var16; - } - - var89 = var13.subHeight; - var9 += var89; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var9; - var22 -= var16; - if (var84 >= 0 && var84 < 255) { - var13.drawTransAt(var22, var23, var84); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var99, var23 + var89); - var14.drawTransAt(var22, var23, var84); - } else { - var13.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var99, var23 + var89); - var14.drawTransBgAt(var22, var23); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var9 += 2; - } else { - var9 += 5; - if (Client.viewportTempX > -1) { - var89 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var9; - Rasterizer2D.Rasterizer2D_fillRectangle(var89, var22, var99, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var99 + var89, var22, var15 - var99, 5, 16711680); - } - - var9 += 2; - } - } - } - } - - if (var9 == -2) { - var9 += 7; - } - - Player var90; - if (var8 && var0.playerCycle == Client.cycle && class60.method330((Player)var0)) { - var90 = (Player)var0; - if (var8) { - class141.method754(var0, var0.defaultHeight + 15); - AbstractFont var91 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - var9 += 4; - var91.drawCentered(var90.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var9, 16777215, 0); - var9 += 18; - } - } - - if (var8) { - var90 = (Player)var0; - if (var90.isHidden) { - return; - } - - if (var90.headIconPk != -1 || var90.headIconPrayer != -1) { - class141.method754(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var90.headIconPk != -1) { - var9 += 25; - DbTableType.headIconPkSprites[var90.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); - } - - if (var90.headIconPrayer != -1) { - var9 += 25; - class17.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - class141.method754(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var9 += class345.headIconHintSprites[1].subHeight; - class345.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); - } - } - } else { - NPC var92 = (NPC)var0; - int[] var93 = var92.method591(); - short[] var94 = var92.method592(); - if (var94 != null && var93 != null) { - for (int var76 = 0; var76 < var94.length; ++var76) { - if (var94[var76] >= 0 && var93[var76] >= 0) { - long var77 = (long)var93[var76] << 8 | (long)var94[var76]; - SpritePixels var79 = (SpritePixels)Client.archive5.method2146(var77); - if (var79 == null) { - SpritePixels[] var17 = class453.method2294(class386.archive8, var93[var76], 0); - if (var17 != null && var94[var76] < var17.length) { - var79 = var17[var94[var76]]; - Client.archive5.method2147(var77, var79); - } - } - - if (var79 != null) { - class141.method754(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var79.drawTransBgAt(var2 + Client.viewportTempX - (var79.subWidth >> 1), Client.viewportTempY + (var3 - var79.subHeight) - 4); - } - } - } - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - class141.method754(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - class345.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - for (int var80 = 0; var80 < 4; ++var80) { - int var81 = var0.hitSplatCycles[var80]; - int var82 = var0.hitSplatTypes[var80]; - HitSplatDefinition var95 = null; - int var83 = 0; - if (var82 >= 0) { - if (var81 <= Client.cycle) { - continue; - } - - var95 = class177.method907(var0.hitSplatTypes[var80]); - var83 = var95.field1687; - if (var95 != null && var95.transforms != null) { - var95 = var95.transform(); - if (var95 == null) { - var0.hitSplatCycles[var80] = -1; - continue; - } - } - } else if (var81 < 0) { - continue; - } - - var15 = var0.hitSplatTypes2[var80]; - HitSplatDefinition var97 = null; - if (var15 >= 0) { - var97 = class177.method907(var15); - if (var97 != null && var97.transforms != null) { - var97 = var97.transform(); - } - } - - if (var81 - var83 <= Client.cycle) { - if (var95 == null) { - var0.hitSplatCycles[var80] = -1; - } else { - class141.method754(var0, var0.defaultHeight / 2); - if (Client.viewportTempX > -1) { - boolean var98 = true; - if (var80 == 1) { - Client.viewportTempY -= 20; - } - - if (var80 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var80 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - SpritePixels var18 = null; - SpritePixels var19 = null; - SpritePixels var20 = null; - SpritePixels var21 = null; - var22 = 0; - var23 = 0; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - int var28 = 0; - int var29 = 0; - SpritePixels var30 = null; - SpritePixels var31 = null; - SpritePixels var32 = null; - SpritePixels var33 = null; - int var34 = 0; - int var35 = 0; - int var36 = 0; - int var37 = 0; - int var38 = 0; - int var39 = 0; - int var40 = 0; - int var41 = 0; - int var42 = 0; - var18 = var95.method1012(); - int var43; - if (var18 != null) { - var22 = var18.subWidth; - var43 = var18.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var18.xOffset; - } - - var19 = var95.method1013(); - if (var19 != null) { - var23 = var19.subWidth; - var43 = var19.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var19.xOffset; - } - - var20 = var95.method1014(); - if (var20 != null) { - var24 = var20.subWidth; - var43 = var20.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var20.xOffset; - } - - var21 = var95.method1015(); - if (var21 != null) { - var25 = var21.subWidth; - var43 = var21.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var21.xOffset; - } - - if (var97 != null) { - var30 = var97.method1012(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var97.method1013(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var97.method1014(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - var40 = var32.xOffset; - } - - var33 = var97.method1015(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var85 = var95.getFont(); - if (var85 == null) { - var85 = ItemComposition.fontPlain11; - } - - Font var44; - if (var97 != null) { - var44 = var97.getFont(); - if (var44 == null) { - var44 = ItemComposition.fontPlain11; - } - } else { - var44 = ItemComposition.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var95.getString(var0.hitSplatValues[var80]); - int var96 = var85.stringWidth(var45); - if (var97 != null) { - var46 = var97.getString(var0.hitSplatValues2[var80]); - var48 = var44.stringWidth(var46); - } - - int var49 = 0; - int var50 = 0; - if (var23 > 0) { - if (var20 == null && var21 == null) { - var49 = 1; - } else { - var49 = var96 / var23 + 1; - } - } - - if (var97 != null && var35 > 0) { - if (var32 == null && var33 == null) { - var50 = 1; - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; - int var52 = var51; - if (var22 > 0) { - var51 += var22; - } - - var51 += 2; - int var53 = var51; - if (var24 > 0) { - var51 += var24; - } - - int var54 = var51; - int var55 = var51; - int var56; - if (var23 > 0) { - var56 = var49 * var23; - var51 += var56; - var55 += (var56 - var96) / 2; - } else { - var51 += var96; - } - - var56 = var51; - if (var25 > 0) { - var51 += var25; - } - - int var57 = 0; - int var58 = 0; - int var59 = 0; - int var60 = 0; - int var61 = 0; - int var62; - if (var97 != null) { - var51 += 2; - var57 = var51; - if (var34 > 0) { - var51 += var34; - } - - var51 += 2; - var58 = var51; - if (var36 > 0) { - var51 += var36; - } - - var59 = var51; - var61 = var51; - if (var35 > 0) { - var62 = var35 * var50; - var51 += var62; - var61 += (var62 - var48) / 2; - } else { - var51 += var48; - } - - var60 = var51; - if (var37 > 0) { - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var80] - Client.cycle; - int var63 = var95.field1682 - var62 * var95.field1682 / var95.field1687; - int var64 = var62 * var95.field1686 / var95.field1687 + -var95.field1686; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var3 + Client.viewportTempY - 12 + var64; - int var67 = var66; - int var68 = var66 + var42; - int var69 = var66 + var95.field1683 + 15; - int var70 = var69 - var85.maxAscent; - int var71 = var69 + var85.maxDescent; - if (var70 < var66) { - var67 = var70; - } - - if (var71 > var68) { - var68 = var71; - } - - int var72 = 0; - int var73; - int var74; - if (var97 != null) { - var72 = var66 + var97.field1683 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } - - if (var74 > var68) { - ; - } - } - - var73 = 255; - if (var95.field1681 >= 0) { - var73 = (var62 << 8) / (var95.field1687 - var95.field1681); - } - - if (var73 >= 0 && var73 < 255) { - if (var18 != null) { - var18.drawTransAt(var52 + var65 - var26, var66, var73); - } - - if (var20 != null) { - var20.drawTransAt(var53 + var65 - var28, var66, var73); - } - - if (var19 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var19.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); - } - } - - if (var21 != null) { - var21.drawTransAt(var65 + var56 - var29, var66, var73); - } - - var85.drawAlpha(var45, var65 + var55, var69, var95.textColor, 0, var73); - if (var97 != null) { - if (var30 != null) { - var30.drawTransAt(var65 + var57 - var38, var66, var73); - } - - if (var32 != null) { - var32.drawTransAt(var65 + var58 - var40, var66, var73); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); - } - } - - if (var33 != null) { - var33.drawTransAt(var65 + var60 - var41, var66, var73); - } - - var44.drawAlpha(var46, var61 + var65, var72, var97.textColor, 0, var73); - } - } else { - if (var18 != null) { - var18.drawTransBgAt(var52 + var65 - var26, var66); - } - - if (var20 != null) { - var20.drawTransBgAt(var53 + var65 - var28, var66); - } - - if (var19 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var19.drawTransBgAt(var23 * var74 + (var54 + var65 - var27), var66); - } - } - - if (var21 != null) { - var21.drawTransBgAt(var65 + var56 - var29, var66); - } - - var85.draw(var45, var55 + var65, var69, var95.textColor | -16777216, 0); - if (var97 != null) { - if (var30 != null) { - var30.drawTransBgAt(var65 + var57 - var38, var66); - } - - if (var32 != null) { - var32.drawTransBgAt(var65 + var58 - var40, var66); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransBgAt(var35 * var74 + (var59 + var65 - var39), var66); - } - } - - if (var33 != null) { - var33.drawTransBgAt(var60 + var65 - var41, var66); - } - - var44.draw(var46, var65 + var61, var72, var97.textColor | -16777216, 0); - } - } - } - } - } - } - - } } - @ObfuscatedName("jz") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ZLtc;B)V", - garbageValue = "46" + descriptor = "(I)[Laz;", + garbageValue = "-2002695578" ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var2; - int var3; - int var5; - int var6; - int var7; - if (!Client.isInInstance) { - var2 = var1.readUnsignedShort(); // Z - var3 = var1.readUnsignedShort(); // X - int var4 = var1.readUnsignedShort(); - class18.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - class18.xteaKeys[var5][var6] = var1.readInt(); - } - } - - MusicPatch.regions = new int[var4]; - UserComparator4.regionMapArchiveIds = new int[var4]; - class170.regionLandArchiveIds = new int[var4]; - class155.regionLandArchives = new byte[var4][]; - class389.regionMapArchives = new byte[var4][]; - var4 = 0; - - for (var5 = (var3 - 6) / 8; var5 <= (var3 + 6) / 8; ++var5) { - for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { - var7 = var6 + (var5 << 8); - MusicPatch.regions[var4] = var7; - UserComparator4.regionMapArchiveIds[var4] = Canvas.archive9.getGroupId("m" + var5 + "_" + var6); - class170.regionLandArchiveIds[var4] = Canvas.archive9.getGroupId("l" + var5 + "_" + var6); - ++var4; - } - } - - class385.method1984(var3, var2, true); // X Z - } else { - var2 = var1.readUnsignedShortAdd(); - var3 = var1.readUnsignedShortLE(); - boolean var15 = var1.readUnsignedByteSub() == 1; - var5 = var1.readUnsignedShort(); - var1.importIndex(); - - int var8; - int var9; - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = var1.readBits(1); - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; - } - } - } - } - - var1.exportIndex(); - class18.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - class18.xteaKeys[var6][var7] = var1.readInt(); - } - } - - MusicPatch.regions = new int[var5]; - UserComparator4.regionMapArchiveIds = new int[var5]; - class170.regionLandArchiveIds = new int[var5]; - class155.regionLandArchives = new byte[var5][]; - class389.regionMapArchives = new byte[var5][]; - var5 = 0; - - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = Client.instanceChunkTemplates[var6][var7][var8]; - if (var9 != -1) { - int var10 = var9 >> 14 & 1023; - int var11 = var9 >> 3 & 2047; - int var12 = (var10 / 8 << 8) + var11 / 8; - - int var13; - for (var13 = 0; var13 < var5; ++var13) { - if (MusicPatch.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - MusicPatch.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - UserComparator4.regionMapArchiveIds[var5] = Canvas.archive9.getGroupId("m" + var13 + "_" + var14); - class170.regionLandArchiveIds[var5] = Canvas.archive9.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - class385.method1984(var2, var3, !var15); // X Z - } - + public static class6[] method1624() { + return new class6[]{class6.field6}; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class304.java b/osrs/src/main/java/class304.java deleted file mode 100644 index e2ee9ac0d..000000000 --- a/osrs/src/main/java/class304.java +++ /dev/null @@ -1,72 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ly") -public class class304 { - @ObfuscatedName("aw") - static int[] field2739; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "[Luu;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - - static { - new Object(); - field2739 = new int[33]; - field2739[0] = 0; - int var0 = 2; - - for (int var1 = 1; var1 < 33; ++var1) { - field2739[var1] = var0 - 1; - var0 += var0; - } - - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)[Lag;", - garbageValue = "-98766558" - ) - public static class6[] method1581() { - return new class6[]{class6.field6}; - } - - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "754109388" - ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); - int var2 = var1.readUnsignedByte(); - int var3 = var1.readInt(); - if (var3 >= 0 && (AbstractArchive.maximumContainerSize == 0 || var3 <= AbstractArchive.maximumContainerSize)) { - if (var2 == 0) { - byte[] var4 = new byte[var3]; - var1.readBytes(var4, 0, var3); - return var4; - } else { - int var6 = var1.readInt(); - if (var6 < 0 || AbstractArchive.maximumContainerSize != 0 && var6 > AbstractArchive.maximumContainerSize) { - throw new RuntimeException(); - } else { - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } - - return var5; - } - } - } else { - throw new RuntimeException(); - } - } -} diff --git a/osrs/src/main/java/class305.java b/osrs/src/main/java/class305.java new file mode 100644 index 000000000..36b3ae260 --- /dev/null +++ b/osrs/src/main/java/class305.java @@ -0,0 +1,62 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +@ObfuscatedName("lz") +public class class305 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + public static AbstractArchive field2777; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + public static AbstractArchive field2775; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + public static AbstractArchive field2776; + @ObfuscatedName("at") + @Export("midiPcmStream") + public static ArrayList midiPcmStream; + @ObfuscatedName("ac") + public static LinkedList field2774; + @ObfuscatedName("ai") + @Export("musicSongs") + public static ArrayList musicSongs; + @ObfuscatedName("az") + public static ArrayList field2773; + @ObfuscatedName("ap") + public static ArrayList field2771; + @ObfuscatedName("aa") + public static final List field2778; + @ObfuscatedName("af") + @Export("musicPlayerStatus") + public static int musicPlayerStatus; + @ObfuscatedName("ad") + public static int field2766; + @ObfuscatedName("aq") + public static int field2769; + @ObfuscatedName("al") + public static int field2768; + + static { + midiPcmStream = null; + field2774 = new LinkedList(); + musicSongs = new ArrayList(3); + field2773 = new ArrayList(3); + field2771 = new ArrayList(); + field2778 = new ArrayList(); + musicPlayerStatus = 0; + field2766 = 0; + field2769 = 0; + field2768 = 0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class306.java b/osrs/src/main/java/class306.java deleted file mode 100644 index fac7bbf32..000000000 --- a/osrs/src/main/java/class306.java +++ /dev/null @@ -1,133 +0,0 @@ -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lq") -public class class306 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("musicPatchesArchive") - static AbstractArchive musicPatchesArchive; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("musicSamplesArchive") - static AbstractArchive musicSamplesArchive; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("soundEffectsArchive") - static AbstractArchive soundEffectsArchive; - @ObfuscatedName("am") - @Export("midiPcmStream") - public static ArrayList midiPcmStream; - @ObfuscatedName("as") - public static LinkedList field2758; - @ObfuscatedName("aj") - public static ArrayList musicSongs; - @ObfuscatedName("ag") - public static ArrayList field2755; - @ObfuscatedName("az") - static ArrayList field2760; - @ObfuscatedName("av") - public static final List field2759; - @ObfuscatedName("ap") - @Export("musicPlayerStatus") - public static int musicPlayerStatus; - @ObfuscatedName("aq") - public static int field2753; - @ObfuscatedName("at") - public static int field2754; - @ObfuscatedName("ah") - public static int field2751; - - static { - midiPcmStream = null; - field2758 = new LinkedList(); - musicSongs = new ArrayList(3); - field2755 = new ArrayList(3); - field2760 = new ArrayList(); - field2759 = new ArrayList(); - musicPlayerStatus = 0; - field2753 = 0; - field2754 = 0; - field2751 = 0; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-10" - ) - static void method1585() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { - class28.KeyHandler_keyCodes[186] = 57; - class28.KeyHandler_keyCodes[187] = 27; - class28.KeyHandler_keyCodes[188] = 71; - class28.KeyHandler_keyCodes[189] = 26; - class28.KeyHandler_keyCodes[190] = 72; - class28.KeyHandler_keyCodes[191] = 73; - class28.KeyHandler_keyCodes[192] = 58; - class28.KeyHandler_keyCodes[219] = 42; - class28.KeyHandler_keyCodes[220] = 74; - class28.KeyHandler_keyCodes[221] = 43; - class28.KeyHandler_keyCodes[222] = 59; - class28.KeyHandler_keyCodes[223] = 28; - } else { - class28.KeyHandler_keyCodes[44] = 71; - class28.KeyHandler_keyCodes[45] = 26; - class28.KeyHandler_keyCodes[46] = 72; - class28.KeyHandler_keyCodes[47] = 73; - class28.KeyHandler_keyCodes[59] = 57; - class28.KeyHandler_keyCodes[61] = 27; - class28.KeyHandler_keyCodes[91] = 42; - class28.KeyHandler_keyCodes[92] = 74; - class28.KeyHandler_keyCodes[93] = 43; - class28.KeyHandler_keyCodes[192] = 28; - class28.KeyHandler_keyCodes[222] = 58; - class28.KeyHandler_keyCodes[520] = 59; - } - - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1789463906" - ) - public static int method1584(CharSequence var0) { - return ClanChannel.method854(var0, 10, true); - } - - @ObfuscatedName("jt") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "739300687" - ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; - int var4 = var1 >> 7; - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { - int var5 = var2; - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 + 1; - } - - int var6 = var0 & 127; - int var7 = var1 & 127; - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; - int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; - return var8 * (128 - var7) + var9 * var7 >> 7; - } else { - return 0; - } - } -} diff --git a/osrs/src/main/java/class308.java b/osrs/src/main/java/class308.java new file mode 100644 index 000000000..34d3de662 --- /dev/null +++ b/osrs/src/main/java/class308.java @@ -0,0 +1,34 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.concurrent.ThreadFactory; + +@ObfuscatedName("lh") +class class308 implements ThreadFactory { + @ObfuscatedName("wc") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + static JagNetThread field2819; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Llf;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final MidiPcmStream this$0; + + @ObfuscatedSignature( + descriptor = "(Llf;)V" + ) + class308(MidiPcmStream var1) { + this.this$0 = var1; + } + + @Export("newThread") + @ObfuscatedName("newThread") + public Thread newThread(Runnable var1) { + return new Thread(var1, "OSRS WAV Load"); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class309.java b/osrs/src/main/java/class309.java index 72991d984..23f781673 100644 --- a/osrs/src/main/java/class309.java +++ b/osrs/src/main/java/class309.java @@ -1,33 +1,21 @@ -import java.util.concurrent.ThreadFactory; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") -class class309 implements ThreadFactory { - @ObfuscatedName("ah") +@ObfuscatedName("li") +public class class309 { + @ObfuscatedName("au") + int field2821; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lbj;" + descriptor = "Lcf;" ) - @Export("pcmPlayerProvider") - public static class51 pcmPlayerProvider; - @ObfuscatedName("ju") - @Export("timeOfPreviousKeyPress") - static int timeOfPreviousKeyPress; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Llc;" - ) - final MidiPcmStream this$0; + class53 field2820; @ObfuscatedSignature( - descriptor = "(Llc;)V" + descriptor = "(ILcf;)V" ) - class309(MidiPcmStream var1) { - this.this$0 = var1; - } - - public Thread newThread(Runnable var1) { - return new Thread(var1, "OSRS WAV Load"); + class309(int var1, class53 var2) { + this.field2821 = var1; + this.field2820 = var2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class31.java b/osrs/src/main/java/class31.java index b2de99d86..9f91c5b8e 100644 --- a/osrs/src/main/java/class31.java +++ b/osrs/src/main/java/class31.java @@ -1,13 +1,16 @@ -import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +import java.applet.Applet; + +@ObfuscatedName("bd") public class class31 { - @ObfuscatedName("aw") + @ObfuscatedName("ug") + static int field84; + @ObfuscatedName("au") static Applet field85; - @ObfuscatedName("ay") + @ObfuscatedName("ae") static String field86; static { @@ -15,77 +18,39 @@ public class class31 { field86 = ""; } - @ObfuscatedName("if") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIIIZB)V", - garbageValue = "-36" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1834627338" ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; - } - - if (var3 < 1) { - var3 = 1; - } + static final void method121(String var0) { + UserComparator8.method673(var0 + " is already on your ignore list"); + } - int var5 = var3 - 334; - int var6; - if (var5 < 0) { - var6 = Client.field634; - } else if (var5 >= 100) { - var6 = Client.field637; - } else { - var6 = (Client.field637 - Client.field634) * var5 / 100 + Client.field634; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(Lbw;I)V", + garbageValue = "-1174367966" + ) + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; + if (var0.sound != null) { + var0.sound.position = 0; } - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var10; - if (var7 < Client.field633) { - var10 = Client.field633; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 > Client.field630) { - var6 = Client.field630; - var8 = var3 * var6 * 512 / (var10 * 334); - var9 = (var2 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); - } - - var0 += var9; - var2 -= var9 * 2; - } - } else if (var7 > Client.field636) { - var10 = Client.field636; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 < Client.field631) { - var6 = Client.field631; - var8 = var10 * var2 * 334 / (var6 * 512); - var9 = (var3 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); - } - - var1 += var9; - var3 -= var9 * 2; - } + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); } - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - class421.method2141(var2, var3); - } + } - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(ILdh;ZS)I", + garbageValue = "385" + ) + static int method123(int var0, Script var1, boolean var2) { + return 2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class310.java b/osrs/src/main/java/class310.java deleted file mode 100644 index ad54d29f5..000000000 --- a/osrs/src/main/java/class310.java +++ /dev/null @@ -1,42 +0,0 @@ -import java.io.IOException; -import java.net.Socket; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ll") -public class class310 { - @ObfuscatedName("aw") - int field2808; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lcf;" - ) - class53 field2807; - - @ObfuscatedSignature( - descriptor = "(ILcf;)V" - ) - class310(int var1, class53 var2) { - this.field2808 = var1; - this.field2807 = var2; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;IIB)Lqh;", - garbageValue = "29" - ) - public static AbstractSocket method1640(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); - } - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(Lmt;III)V", - garbageValue = "924018154" - ) - public static void method1641(Widget var0, int var1, int var2) { - var0.field3081.bodyColors[var1] = var2; - var0.field3081.method1690(); - } -} diff --git a/osrs/src/main/java/class311.java b/osrs/src/main/java/class311.java new file mode 100644 index 000000000..caf466277 --- /dev/null +++ b/osrs/src/main/java/class311.java @@ -0,0 +1,12 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lb") +public interface class311 { + @ObfuscatedName("iw") + @ObfuscatedSignature( + descriptor = "(IIS)V", + garbageValue = "-9429" + ) + void vmethod1644(int var1, int var2); +} \ No newline at end of file diff --git a/osrs/src/main/java/class312.java b/osrs/src/main/java/class312.java index 17328c0f1..a2a09304c 100644 --- a/osrs/src/main/java/class312.java +++ b/osrs/src/main/java/class312.java @@ -1,12 +1,75 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") -public interface class312 { - @ObfuscatedName("iy") +import java.util.Date; +import java.util.PriorityQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicBoolean; + +@ObfuscatedName("md") +class class312 implements Callable { + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Llf;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final MidiPcmStream this$0; + // $FF: synthetic field + @Export("val$cancelled") + @ObfuscatedName("val$cancelled") + final AtomicBoolean val$cancelled; + + @ObfuscatedSignature( + descriptor = "(Llf;Ljava/util/concurrent/atomic/AtomicBoolean;)V" + ) + class312(MidiPcmStream var1, AtomicBoolean var2) { + this.this$0 = var1; + this.val$cancelled = var2; + } + + @Export("call") + @ObfuscatedName("call") + public Object call() { + PriorityQueue var1 = this.this$0.field2801; + + while (true) { + class309 var2 = null; + synchronized(var1) { + if (var1.isEmpty() || this.val$cancelled.get()) { + return null; + } + + var2 = (class309)var1.remove(); + } + + var2.field2820.method290(); + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/Date;", + garbageValue = "1739317164" + ) + static Date method1686() { + java.util.Calendar var0 = java.util.Calendar.getInstance(); + var0.set(2, 0); + var0.set(5, 1); + var0.set(1, 1900); + return var0.getTime(); + } + + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "57" + descriptor = "(III)I", + garbageValue = "-2037147642" ) - void vmethod1644(int var1, int var2); -} + static final int method1685(int var0, int var1) { + int var2 = Strings.method1878(var0 - 1, var1 - 1) + Strings.method1878(1 + var0, var1 - 1) + Strings.method1878(var0 - 1, var1 + 1) + Strings.method1878(1 + var0, var1 + 1); + int var3 = Strings.method1878(var0 - 1, var1) + Strings.method1878(1 + var0, var1) + Strings.method1878(var0, var1 - 1) + Strings.method1878(var0, var1 + 1); + int var4 = Strings.method1878(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class313.java b/osrs/src/main/java/class313.java deleted file mode 100644 index dae7b03f2..000000000 --- a/osrs/src/main/java/class313.java +++ /dev/null @@ -1,132 +0,0 @@ -import java.util.PriorityQueue; -import java.util.concurrent.Callable; -import java.util.concurrent.atomic.AtomicBoolean; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mf") -class class313 implements Callable { - @ObfuscatedName("ag") - @Export("gameCyclesToDo") - static int gameCyclesToDo; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lrk;" - ) - static Bounds field2821; - @ObfuscatedName("io") - static long field2820; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Llc;" - ) - final MidiPcmStream this$0; - // $FF: synthetic field - final AtomicBoolean val$cancelled; - - @ObfuscatedSignature( - descriptor = "(Llc;Ljava/util/concurrent/atomic/AtomicBoolean;)V" - ) - class313(MidiPcmStream var1, AtomicBoolean var2) { - this.this$0 = var1; - this.val$cancelled = var2; - } - - public Object call() { - PriorityQueue var1 = this.this$0.field2787; - - while (true) { - class310 var2 = null; - synchronized(var1) { - if (var1.isEmpty() || this.val$cancelled.get()) { - return null; - } - - var2 = (class310)var1.remove(); - } - - var2.field2807.method295(); - } - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(CB)B", - garbageValue = "90" - ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { - 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; - } - - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "([BII)I", - garbageValue = "457737070" - ) - public static int method1646(byte[] var0, int var1) { - return class358.method1864(var0, 0, var1); - } -} diff --git a/osrs/src/main/java/class316.java b/osrs/src/main/java/class316.java new file mode 100644 index 000000000..92f6a2f82 --- /dev/null +++ b/osrs/src/main/java/class316.java @@ -0,0 +1,178 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Comparator; + +@ObfuscatedName("mq") +public class class316 implements Comparator { + @ObfuscatedName("bh") + @Export("Widget_loadedInterfaces") + public static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("nh") + @Export("menuWidth") + static int menuWidth; + + class316() { + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lli;Lli;I)I", + garbageValue = "-629446065" + ) + int method1697(class309 var1, class309 var2) { + return var1.field2821 - var2.field2821; + } + + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method1697((class309)var1, (class309)var2); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "(IIZB)V", + garbageValue = "-20" + ) + static final void method1698(int var0, int var1, boolean var2) { + if (!var2 || var0 != Tiles.timeOfPreviousKeyPress || MouseRecorder.field873 != var1) { + Tiles.timeOfPreviousKeyPress = var0; + MouseRecorder.field873 = var1; + MusicSong.updateGameState(25); + FadeInTask.drawLoadingMessage("Loading - please wait.", true); + int var3 = UrlRequester.baseX; + int var4 = class47.baseY; + UrlRequester.baseX = (var0 - 6) * 8; + class47.baseY = (var1 - 6) * 8; + int var5 = UrlRequester.baseX - var3; + int var6 = class47.baseY - var4; + var3 = UrlRequester.baseX; + var4 = class47.baseY; + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 65536; ++var7) { + NPC var8 = Client.npcs[var7]; + if (var8 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var8.pathX; + var10000[var9] -= var5; + var10000 = var8.pathY; + var10000[var9] -= var6; + } + + var8.x -= var5 * 128; + var8.y -= var6 * 128; + } + } + + for (var7 = 0; var7 < 2048; ++var7) { + Player var21 = Client.players[var7]; + if (var21 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var21.pathX; + var10000[var9] -= var5; + var10000 = var21.pathY; + var10000[var9] -= var6; + } + + var21.x -= var5 * 128; + var21.y -= var6 * 128; + } + } + + byte var20 = 0; + byte var18 = 104; + byte var22 = 1; + if (var5 < 0) { + var20 = 103; + var18 = -1; + var22 = -1; + } + + byte var10 = 0; + byte var11 = 104; + byte var12 = 1; + if (var6 < 0) { + var10 = 103; + var11 = -1; + var12 = -1; + } + + int var14; + for (int var13 = var20; var13 != var18; var13 += var22) { + for (var14 = var10; var14 != var11; var14 += var12) { + int var15 = var5 + var13; + int var16 = var6 + var14; + + for (int var17 = 0; var17 < 4; ++var17) { + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + } else { + Client.groundItems[var17][var13][var14] = null; + } + } + } + } + + for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { + var19.x -= var5; + var19.y -= var6; + if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { + var19.remove(); + } + } + + if (Client.destinationX != 0) { + Client.destinationX -= var5; + Client.destinationY -= var6; + } + + Client.soundEffectCount = 0; + Client.isCameraLocked = false; + NPCComposition.cameraX -= var5 << 7; + class139.cameraZ -= var6 << 7; + FriendLoginUpdate.oculusOrbFocalPointX -= var5 << 7; + HealthBar.oculusOrbFocalPointY -= var6 << 7; + Client.field538 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14].clear(); + } + + } + } + + @ObfuscatedName("ma") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2123908840" + ) + static final void method1699(int var0) { + if (ModeWhere.loadInterface(var0)) { + class152.drawModelComponents(PacketBufferNode.Widget_interfaceComponents[var0], -1); + } + } + + @ObfuscatedName("ol") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "5" + ) + static void method1700(int var0) { + if (var0 != Client.loginState) { + Client.loginState = var0; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class317.java b/osrs/src/main/java/class317.java deleted file mode 100644 index d92d31c72..000000000 --- a/osrs/src/main/java/class317.java +++ /dev/null @@ -1,151 +0,0 @@ -import java.io.DataInputStream; -import java.net.URL; -import java.util.Comparator; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mh") -public class class317 implements Comparator { - class317() { - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lll;Lll;I)I", - garbageValue = "-1564510989" - ) - int method1662(class310 var1, class310 var2) { - return var1.field2808 - var2.field2808; - } - - public int compare(Object var1, Object var2) { - return this.method1662((class310)var1, (class310)var2); - } - - public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V", - garbageValue = "-83" - ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); - } else { - try { - String var2 = ""; - if (var1 != null) { - var2 = HealthBarUpdate.method532(var1); - } - - if (var0 != null) { - if (var1 != null) { - var2 = var2 + " | "; - } - - var2 = var2 + var0; - } - - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (RunException.RunException_applet == null) { - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?cv=" + RunException.RunException_revision + "&cs=" + RunException.field4244 + "&u=" + RunException.field4248 + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.field4246 + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { - } - - } - } - - @ObfuscatedName("mn") - @ObfuscatedSignature( - descriptor = "(Lmt;I)V", - garbageValue = "-1456057901" - ) - static final void method1663(Widget var0) { - if (var0.buttonType == 1) { - class134.method731(var0.buttonText, "", 24, 0, 0, var0.id, var0.itemId); - } - - String var1; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var1 = class13.Widget_getSpellActionName(var0); - if (var1 != null) { - class134.method731(var1, MusicPatchPcmStream.colorStartTag(65280) + var0.field3078, 25, 0, -1, var0.id, var0.itemId); - } - } - - if (var0.buttonType == 3) { - JagexCache.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - JagexCache.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - JagexCache.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - JagexCache.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - if (var0.isIf3) { - if (Client.isSpellSelected) { - if (WorldMapRectangle.method1495(UserComparator8.getWidgetFlags(var0)) && (PcmPlayer.selectedSpellFlags & 32) == 32) { - class134.method731(Client.field597, Client.field596 + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id, var0.itemId); - } - } else { - for (int var6 = 9; var6 >= 5; --var6) { - String var2 = class212.method1077(var0, var6); - if (var2 != null) { - class134.method731(var2, var0.dataText, 1007, var6 + 1, var0.childIndex, var0.id, var0.itemId); - } - } - - var1 = class13.Widget_getSpellActionName(var0); - if (var1 != null) { - class134.method731(var1, var0.dataText, 25, 0, var0.childIndex, var0.id, var0.itemId); - } - - for (int var7 = 4; var7 >= 0; --var7) { - int var5 = UserComparator8.getWidgetFlags(var0); - boolean var4 = (var5 >> var7 + 1 & 1) != 0; - String var8; - if (!var4 && var0.onOp == null) { - var8 = null; - } else if (var0.actions != null && var0.actions.length > var7 && var0.actions[var7] != null && var0.actions[var7].trim().length() != 0) { - var8 = var0.actions[var7]; - } else { - var8 = null; - } - - if (var8 != null) { - class7.insertMenuItem(var8, var0.dataText, 57, var7 + 1, var0.childIndex, var0.id, var0.itemId, var0.prioritizeMenuEntry); - } - } - - int var3 = UserComparator8.getWidgetFlags(var0); - boolean var10 = (var3 & 1) != 0; - if (var10) { - JagexCache.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } - } - } - - } -} diff --git a/osrs/src/main/java/class318.java b/osrs/src/main/java/class318.java new file mode 100644 index 000000000..24c13500e --- /dev/null +++ b/osrs/src/main/java/class318.java @@ -0,0 +1,426 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.util.BitSet; +import java.util.Random; + +@ObfuscatedName("mk") +public class class318 extends Node { + @ObfuscatedName("fq") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("au") + int field2875; + @ObfuscatedName("ae") + BitSet field2876; + + class318(int var1) { + this.field2875 = var1; + this.field2876 = new BitSet(128); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;B)I", + garbageValue = "-14" + ) + static final int method1703(long var0, String var2) { + Random var3 = new Random(); + Buffer var4 = new Buffer(128); + Buffer var5 = new Buffer(128); + int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; + var4.writeByte(10); + + int var7; + for (var7 = 0; var7 < 4; ++var7) { + var4.writeInt(var3.nextInt()); + } + + var4.writeInt(var6[0]); + var4.writeInt(var6[1]); + var4.writeLong(var0); + var4.writeLong(0L); + + for (var7 = 0; var7 < 4; ++var7) { + var4.writeInt(var3.nextInt()); + } + + var4.encryptRsa(class72.field731, class72.field732); + var5.writeByte(10); + + for (var7 = 0; var7 < 3; ++var7) { + var5.writeInt(var3.nextInt()); + } + + var5.writeLong(var3.nextLong()); + var5.writeLongMedium(var3.nextLong()); + class177.method919(var5); + var5.writeLong(var3.nextLong()); + var5.encryptRsa(class72.field731, class72.field732); + var7 = AbstractSocket.stringCp1252NullTerminatedByteSize(var2); + if (var7 % 8 != 0) { + var7 += 8 - var7 % 8; + } + + Buffer var8 = new Buffer(var7); + var8.writeStringCp1252NullTerminated(var2); + var8.offset = var7; + var8.xteaEncryptAll(var6); + Buffer var9 = new Buffer(var8.offset + var5.offset + var4.offset + 5); + var9.writeByte(2); + var9.writeByte(var4.offset); + var9.writeBytes(var4.array, 0, var4.offset); + var9.writeByte(var5.offset); + var9.writeBytes(var5.array, 0, var5.offset); + var9.writeShort(var8.offset); + var9.writeBytes(var8.array, 0, var8.offset); + byte[] var11 = var9.array; + String var10 = class11.method32(var11, 0, var11.length); + String var12 = var10; + + try { + URL var13 = new URL(HorizontalAlignment.method978("services", false) + "m=accountappeal/login.ws"); + URLConnection var14 = var13.openConnection(); + var14.setDoInput(true); + var14.setDoOutput(true); + var14.setConnectTimeout(5000); + OutputStreamWriter var15 = new OutputStreamWriter(var14.getOutputStream()); + String var17 = "data2=" + UserComparator10.method687(var12) + "&dest="; + int var19 = "passwordchoice.ws".length(); + StringBuilder var20 = new StringBuilder(var19); + + for (int var21 = 0; var21 < var19; ++var21) { + char var22 = "passwordchoice.ws".charAt(var21); + if ((var22 < 'a' || var22 > 'z') && (var22 < 'A' || var22 > 'Z') && (var22 < '0' || var22 > '9') && var22 != '.' && var22 != '-' && var22 != '*' && var22 != '_') { + if (var22 == ' ') { + var20.append('+'); + } else { + byte var23 = class348.charToByteCp1252(var22); + var20.append('%'); + int var24 = var23 >> 4 & 15; + if (var24 >= 10) { + var20.append((char)(var24 + 55)); + } else { + var20.append((char)(var24 + 48)); + } + + var24 = var23 & 15; + if (var24 >= 10) { + var20.append((char)(var24 + 55)); + } else { + var20.append((char)(var24 + 48)); + } + } + } else { + var20.append(var22); + } + } + + String var18 = var20.toString(); + var15.write(var17 + var18); + var15.flush(); + InputStream var25 = var14.getInputStream(); + var9 = new Buffer(new byte[1000]); + + do { + int var26 = var25.read(var9.array, var9.offset, 1000 - var9.offset); + if (var26 == -1) { + var15.close(); + var25.close(); + String var28 = new String(var9.array); + if (var28.startsWith("OFFLINE")) { + return 4; + } else if (var28.startsWith("WRONG")) { + return 7; + } else if (var28.startsWith("RELOAD")) { + return 3; + } else if (var28.startsWith("Not permitted for social network accounts.")) { + return 6; + } else { + var9.xteaDecryptAll(var6); + + while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { + --var9.offset; + } + + var28 = new String(var9.array, 0, var9.offset); + if (PendingSpawn.method508(var28)) { + class30.openURL(var28, true, false); + return 2; + } else { + return 5; + } + } + } + + var9.offset += var26; + } while(var9.offset < 1000); + + return 5; + } catch (Throwable var27) { + var27.printStackTrace(); + return 5; + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1758045320" + ) + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; + } + + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "(Ldr;II)V", + garbageValue = "798219365" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + if (var0.spotAnimation >= Client.cycle) { + Huffman.method1853(var0); + } else { + int var4; + int var5; + int var7; + int var8; + int var11; + if (var0.exactMoveArrive1Cycle >= Client.cycle) { + boolean var2 = var0.exactMoveArrive1Cycle == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0; + if (!var2) { + SequenceDefinition var3 = EnumComposition.SequenceDefinition_get(var0.sequence); + if (var3 != null && !var3.isCachedModelIdSet()) { + var2 = var0.sequenceFrameCycle + 1 > var3.frameLengths[var0.sequenceFrame]; + } else { + var2 = true; + } + } + + if (var2) { + var11 = var0.exactMoveArrive1Cycle - var0.spotAnimation; + var4 = Client.cycle - var0.spotAnimation; + var5 = var0.field976 * 64 + var0.field1004 * 128; + int var6 = var0.field976 * 64 + var0.field1001 * 128; + var7 = var0.field976 * 64 + var0.field1002 * 128; + var8 = var0.field976 * 64 + var0.field1014 * 128; + var0.x = (var4 * var7 + var5 * (var11 - var4)) / var11; + var0.y = (var4 * var8 + var6 * (var11 - var4)) / var11; + } + + var0.field1021 = 0; + var0.orientation = var0.exactMoveDirection; + var0.rotation = var0.orientation; + } else { + var0.movementSequence = var0.idleSequence; + if (var0.pathLength == 0) { + var0.field1021 = 0; + } else { + label298: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + SequenceDefinition var12 = EnumComposition.SequenceDefinition_get(var0.sequence); + if (var0.field1022 > 0 && var12.precedenceAnimating == 0) { + ++var0.field1021; + break label298; + } + + if (var0.field1022 <= 0 && var12.priority == 0) { + ++var0.field1021; + break label298; + } + } + + int var14 = var0.x; + var11 = var0.y; + var4 = var0.field976 * 64 + var0.pathX[var0.pathLength - 1] * 128; + var5 = var0.field976 * 64 + var0.pathY[var0.pathLength - 1] * 128; + if (var14 < var4) { + if (var11 < var5) { + var0.orientation = 1280; + } else if (var11 > var5) { + var0.orientation = 1792; + } else { + var0.orientation = 1536; + } + } else if (var14 > var4) { + if (var11 < var5) { + var0.orientation = 768; + } else if (var11 > var5) { + var0.orientation = 256; + } else { + var0.orientation = 512; + } + } else if (var11 < var5) { + var0.orientation = 1024; + } else if (var11 > var5) { + var0.orientation = 0; + } + + MoveSpeed var13 = var0.pathTraversed[var0.pathLength - 1]; + if (var4 - var14 <= 256 && var4 - var14 >= -256 && var5 - var11 <= 256 && var5 - var11 >= -256) { + var7 = var0.orientation - var0.rotation & 2047; + if (var7 > 1024) { + var7 -= 2048; + } + + var8 = var0.walkBackSequence; + if (var7 >= -256 && var7 <= 256) { + var8 = var0.walkSequence; + } else if (var7 >= 256 && var7 < 768) { + var8 = var0.walkRightSequence; + } else if (var7 >= -768 && var7 <= -256) { + var8 = var0.walkLeftSequence; + } + + if (var8 == -1) { + var8 = var0.walkSequence; + } + + var0.movementSequence = var8; + int var9 = 4; + boolean var10 = true; + if (var0 instanceof NPC) { + var10 = ((NPC)var0).definition.isClickable; + } + + if (var10) { + if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1017 != 0) { + var9 = 2; + } + + if (var0.pathLength > 2) { + var9 = 6; + } + + if (var0.pathLength > 3) { + var9 = 8; + } + + if (var0.field1021 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field1021; + } + } else { + if (var0.pathLength > 1) { + var9 = 6; + } + + if (var0.pathLength > 2) { + var9 = 8; + } + + if (var0.field1021 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field1021; + } + } + + if (var13 == MoveSpeed.RUN) { + var9 <<= 1; + } else if (var13 == MoveSpeed.CRAWL) { + var9 >>= 1; + } + + if (var9 >= 8) { + if (var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; + } else if (var0.walkBackSequence == var0.movementSequence && var0.runBackSequence != -1) { + var0.movementSequence = var0.runBackSequence; + } else if (var0.movementSequence == var0.walkLeftSequence && var0.runLeftSequence != -1) { + var0.movementSequence = var0.runLeftSequence; + } else if (var0.walkRightSequence == var0.movementSequence && var0.runRightSequence != -1) { + var0.movementSequence = var0.runRightSequence; + } + } else if (var9 <= 2) { + if (var0.movementSequence == var0.walkSequence && var0.crawlSequence != -1) { + var0.movementSequence = var0.crawlSequence; + } else if (var0.movementSequence == var0.walkBackSequence && var0.crawlBackSequence != -1) { + var0.movementSequence = var0.crawlBackSequence; + } else if (var0.walkLeftSequence == var0.movementSequence && var0.crawlLeftSequence != -1) { + var0.movementSequence = var0.crawlLeftSequence; + } else if (var0.walkRightSequence == var0.movementSequence && var0.crawlRightSequence != -1) { + var0.movementSequence = var0.crawlRightSequence; + } + } + + if (var4 != var14 || var5 != var11) { + if (var14 < var4) { + var0.x += var9; + if (var0.x > var4) { + var0.x = var4; + } + } else if (var14 > var4) { + var0.x -= var9; + if (var0.x < var4) { + var0.x = var4; + } + } + + if (var11 < var5) { + var0.y += var9; + if (var0.y > var5) { + var0.y = var5; + } + } else if (var11 > var5) { + var0.y -= var9; + if (var0.y < var5) { + var0.y = var5; + } + } + } + + if (var4 == var0.x && var5 == var0.y) { + --var0.pathLength; + if (var0.field1022 > 0) { + --var0.field1022; + } + } + } else { + var0.x = var4; + var0.y = var5; + --var0.pathLength; + if (var0.field1022 > 0) { + --var0.field1022; + } + } + } + } + } + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = 0; + var0.exactMoveArrive1Cycle = 0; + var0.method519(); + var0.x = var0.pathX[0] * 128 + var0.field976 * 64; + var0.y = var0.field976 * 64 + var0.pathY[0] * 128; + var0.method512(); + } + + if (VarbitComposition.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = 0; + var0.exactMoveArrive1Cycle = 0; + var0.method519(); + var0.x = var0.pathX[0] * 128 + var0.field976 * 64; + var0.y = var0.field976 * 64 + var0.pathY[0] * 128; + var0.method512(); + } + + ClanChannelMember.method777(var0); + UserComparator5.method680(var0); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class319.java b/osrs/src/main/java/class319.java deleted file mode 100644 index ae9ff32b2..000000000 --- a/osrs/src/main/java/class319.java +++ /dev/null @@ -1,96 +0,0 @@ -import java.util.BitSet; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mx") -public class class319 extends Node { - @ObfuscatedName("aw") - int field2860; - @ObfuscatedName("ay") - BitSet field2861; - - class319(int var1) { - this.field2860 = var1; - this.field2861 = new BitSet(128); - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2041814477" - ) - public static boolean method1665(int var0) { - return (var0 >> 20 & 1) != 0; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "1437385247" - ) - static int method1666(int var0, Script var1, boolean var2) { - Widget var7; - if (var0 != 1927 && var0 != 2927) { - int var4; - if (var0 == 1928) { - var7 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var4 >= 1 && var4 <= 10) { - class102 var8 = new class102(var4, var7.id, var7.childIndex, var7.itemId); - Interpreter.field711.add(var8); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == 2928) { - Interpreter.Interpreter_intStackSize -= 3; - int var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (var5 >= 1 && var5 <= 10) { - class102 var6 = new class102(var5, var3, var4, VarbitComposition.getWidget(var3).itemId); - Interpreter.field711.add(var6); - return 1; - } else { - throw new RuntimeException(); - } - } else { - return 2; - } - } else if (Interpreter.field701 >= 10) { - throw new RuntimeException(); - } else { - if (var0 >= 2000) { - var7 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var7 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - } - - if (var7.onResize == null) { - return 0; - } else { - ScriptEvent var9 = new ScriptEvent(); - var9.widget = var7; - var9.args = var7.onResize; - var9.field862 = Interpreter.field701 + 1; - Client.scriptEvents.addFirst(var9); - return 1; - } - } - } - - @ObfuscatedName("mh") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "1" - ) - static boolean method1667(int var0) { - for (int var1 = 0; var1 < Client.field529; ++var1) { - if (Client.field578[var1] == var0) { - return true; - } - } - - return false; - } -} diff --git a/osrs/src/main/java/class323.java b/osrs/src/main/java/class323.java new file mode 100644 index 000000000..ae285170b --- /dev/null +++ b/osrs/src/main/java/class323.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mf") +public interface class323 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "17" + ) + @Export("vmethod5708") + void vmethod5708(); +} \ No newline at end of file diff --git a/osrs/src/main/java/class324.java b/osrs/src/main/java/class324.java index b754e5b11..119b698c1 100644 --- a/osrs/src/main/java/class324.java +++ b/osrs/src/main/java/class324.java @@ -1,14 +1,14 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mv") -public interface class324 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-3" - ) - @Export("vmethod5708") - void vmethod5708(); -} +@ObfuscatedName("ml") +public class class324 { + @ObfuscatedName("au") + public int field2892; + @ObfuscatedName("ae") + public int field2890; + @ObfuscatedName("ao") + public int field2891; + + class324() { + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class325.java b/osrs/src/main/java/class325.java index abbfc26eb..7f320c1d9 100644 --- a/osrs/src/main/java/class325.java +++ b/osrs/src/main/java/class325.java @@ -1,36 +1,35 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("my") +@ObfuscatedName("mj") public class class325 { - @ObfuscatedName("aw") - public int field2874; - @ObfuscatedName("ay") - public int field2875; - @ObfuscatedName("ar") - public int field2873; - - class325() { - } - - @ObfuscatedName("aw") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "113" + descriptor = "([BIIB)Ljava/lang/String;", + garbageValue = "27" ) - static void method1674() { - Tiles.Tiles_minPlane = 99; - Tiles.Tiles_underlays = new short[4][104][104]; - Tiles.Tiles_overlays = new short[4][104][104]; - class19.Tiles_shapes = new byte[4][104][104]; - UserComparator10.field1180 = new byte[4][104][104]; - BufferedNetSocket.field3806 = new int[4][105][105]; - InvDefinition.field1488 = new byte[4][105][105]; - class135.field1283 = new int[105][105]; - class172.Tiles_hue = new int[104]; - GameBuild.Tiles_saturation = new int[104]; - Tiles.Tiles_lightness = new int[104]; - Language.Tiles_hueMultiplier = new int[104]; - class159.field1403 = new int[104]; + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; + + for (int var5 = 0; var5 < var2; ++var5) { + int var6 = var0[var5 + var1] & 255; + if (var6 != 0) { + if (var6 >= 128 && var6 < 160) { + char var7 = class384.cp1252AsciiExtension[var6 - 128]; + if (var7 == 0) { + var7 = '?'; + } + + var6 = var7; + } + + var3[var4++] = (char)var6; + } + } + + return new String(var3, 0, var4); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class326.java b/osrs/src/main/java/class326.java index 63e2a18d0..626d06d5e 100644 --- a/osrs/src/main/java/class326.java +++ b/osrs/src/main/java/class326.java @@ -1,11 +1,114 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") +import java.net.MalformedURLException; +import java.net.URL; + +@ObfuscatedName("mw") public class class326 { - @ObfuscatedName("bw") - protected static String field2877; - @ObfuscatedName("bz") - @Export("hasFocus") - protected static boolean hasFocus; -} + @ObfuscatedName("qq") + static int field2893; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Let;" + ) + UrlRequest field2894; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lui;" + ) + SpritePixels field2895; + + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lev;)V" + ) + class326(String var1, UrlRequester var2) { + try { + this.field2894 = var2.request(new URL(var1)); + } catch (MalformedURLException var4) { + this.field2894 = null; + } + + } + + @ObfuscatedSignature( + descriptor = "(Let;)V" + ) + class326(UrlRequest var1) { + this.field2894 = var1; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Lui;", + garbageValue = "-688482237" + ) + SpritePixels method1715() { + if (this.field2895 == null && this.field2894 != null && this.field2894.isDone()) { + if (this.field2894.getResponse() != null) { + this.field2895 = WorldMapData_1.method1484(this.field2894.getResponse()); + } + + this.field2894 = null; + } + + return this.field2895; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-856388391" + ) + public static void method1714(AbstractArchive var0) { + FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "-1268604308" + ) + static int method1716(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == 2700) { + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == 2701) { + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 2702) { + int var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); + if (var4 != null) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 2706) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.rootInterface; + return 1; + } else if (var0 == 2707) { + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.method1834() ? 1 : 0; + return 1; + } else if (var0 == 2708) { + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + return WorldMapDecoration.method1530(var3); + } else if (var0 == 2709) { + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + return class390.method2030(var3); + } else { + return 2; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class327.java b/osrs/src/main/java/class327.java index 3c06b0dbf..8ea2814af 100644 --- a/osrs/src/main/java/class327.java +++ b/osrs/src/main/java/class327.java @@ -1,91 +1,35 @@ -import java.net.MalformedURLException; -import java.net.URL; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("mp") public class class327 { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lei;" + descriptor = "Lmb;" ) - UrlRequest field2878; - @ObfuscatedName("ay") + public class329 field2902; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "Lml;" ) - SpritePixels field2879; - - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lej;)V" - ) - class327(String var1, UrlRequester var2) { - try { - this.field2878 = var2.request(new URL(var1)); - } catch (MalformedURLException var4) { - this.field2878 = null; - } - - } - - @ObfuscatedSignature( - descriptor = "(Lei;)V" - ) - class327(UrlRequest var1) { - this.field2878 = var1; - } - - @ObfuscatedName("aw") + class324 field2897; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Lud;", - garbageValue = "915750590" + descriptor = "Lbj;" ) - SpritePixels method1675() { - if (this.field2879 == null && this.field2878 != null && this.field2878.isDone()) { - if (this.field2878.getResponse() != null) { - this.field2879 = ClanChannelMember.method769(this.field2878.getResponse()); - } - - this.field2878 = null; - } - - return this.field2879; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(IIZI)Ljava/lang/String;", - garbageValue = "175301623" - ) - static String method1676(int var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - if (var2 && var0 >= 0) { - int var3 = 2; - - for (int var4 = var0 / var1; var4 != 0; ++var3) { - var4 /= var1; - } - - char[] var5 = new char[var3]; - var5[0] = '+'; - - for (int var6 = var3 - 1; var6 > 0; --var6) { - int var7 = var0; - var0 /= var1; - int var8 = var7 - var0 * var1; - if (var8 >= 10) { - var5[var6] = (char)(var8 + 87); - } else { - var5[var6] = (char)(var8 + 48); - } - } - - return new String(var5); - } else { - return Integer.toString(var0, var1); - } - } else { - throw new IllegalArgumentException("" + var1); - } + class27 field2896; + @ObfuscatedName("at") + public Object[] field2900; + @ObfuscatedName("ac") + public Object[] field2898; + @ObfuscatedName("ai") + public Object[] field2899; + @ObfuscatedName("az") + public Object[] field2901; + + class327() { + this.field2902 = new class329(); + this.field2897 = new class324(); + this.field2896 = new class27(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class328.java b/osrs/src/main/java/class328.java deleted file mode 100644 index e8864565a..000000000 --- a/osrs/src/main/java/class328.java +++ /dev/null @@ -1,61 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mz") -public class class328 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lmo;" - ) - public class330 field2886; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lmy;" - ) - class325 field2881; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lbb;" - ) - class27 field2880; - @ObfuscatedName("am") - public Object[] field2884; - @ObfuscatedName("as") - public Object[] field2885; - @ObfuscatedName("aj") - public Object[] field2883; - @ObfuscatedName("ag") - public Object[] field2882; - - class328() { - this.field2886 = new class330(); - this.field2881 = new class325(); - this.field2880 = new class27(); - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "([FIFI)F", - garbageValue = "39231924" - ) - static float method1677(float[] var0, int var1, float var2) { - float var3 = var0[var1]; - - for (int var4 = var1 - 1; var4 >= 0; --var4) { - var3 = var2 * var3 + var0[var4]; - } - - return var3; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2079868844" - ) - static void method1678(int var0) { - if (var0 != Login.loginIndex) { - Login.loginIndex = var0; - } - } -} diff --git a/osrs/src/main/java/class329.java b/osrs/src/main/java/class329.java new file mode 100644 index 000000000..5761b2c64 --- /dev/null +++ b/osrs/src/main/java/class329.java @@ -0,0 +1,1240 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.awt.datatransfer.*; + +@ObfuscatedName("mb") +public class class329 { + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + class394 field2938; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + class394 field2939; + @ObfuscatedName("ah") + boolean field2919; + @ObfuscatedName("as") + boolean field2921; + @ObfuscatedName("ay") + int field2925; + @ObfuscatedName("aj") + boolean field2920; + @ObfuscatedName("av") + int field2923; + @ObfuscatedName("aw") + int field2924; + @ObfuscatedName("ak") + int field2922; + @ObfuscatedName("bh") + int field2928; + @ObfuscatedName("bj") + int field2929; + @ObfuscatedName("bk") + int field2930; + @ObfuscatedName("bv") + int field2934; + @ObfuscatedName("bt") + int field2933; + @ObfuscatedName("bd") + int field2926; + @ObfuscatedName("by") + int field2935; + @ObfuscatedName("bs") + int field2932; + @ObfuscatedName("bm") + int field2931; + @ObfuscatedName("bf") + int field2927; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lmf;" + ) + class323 field2937; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lmf;" + ) + class323 field2936; + + class329() { + this.field2938 = new class394(); + this.field2939 = new class394(); + this.field2919 = false; + this.field2921 = true; + this.field2925 = 0; + this.field2920 = false; + this.field2923 = 0; + this.field2924 = 0; + this.field2922 = 0; + this.field2928 = 0; + this.field2929 = 0; + this.field2930 = 0; + this.field2934 = 0; + this.field2933 = Integer.MAX_VALUE; + this.field2926 = Integer.MAX_VALUE; + this.field2935 = 0; + this.field2932 = 0; + this.field2931 = 0; + this.field2927 = 0; + this.field2938.method2046(1); + this.field2939.method2046(1); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "108" + ) + void method1730() { + this.field2925 = (this.field2925 + 1) % 60; + if (this.field2934 > 0) { + --this.field2934; + } + + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "-1080189228" + ) + public boolean method1731(boolean var1) { + var1 = var1 && this.field2921; + boolean var2 = this.field2919 != var1; + this.field2919 = var1; + if (!this.field2919) { + this.method1755(this.field2928, this.field2928); + } + + return var2; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "220495780" + ) + public void method1732(boolean var1) { + this.field2921 = var1; + this.field2919 = var1 && this.field2919; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "-764154033" + ) + boolean method1733(String var1) { + String var2 = this.field2938.method2041(); + if (!var2.equals(var1)) { + var1 = this.method1799(var1); + this.field2938.method2054(var1); + this.method1740(this.field2931, this.field2927); + this.method1803(); + this.method1808(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Z", + garbageValue = "0" + ) + boolean method1734(String var1) { + this.field2939.method2054(var1); + return true; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Lpk;B)Z", + garbageValue = "2" + ) + boolean method1735(AbstractFont var1) { + boolean var2 = !this.field2920; + this.field2938.method2045(var1); + this.field2939.method2045(var1); + this.field2920 = true; + var2 |= this.method1740(this.field2931, this.field2927); + var2 |= this.method1755(this.field2929, this.field2928); + if (this.method1803()) { + this.method1808(); + var2 = true; + } + + return var2; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "-41" + ) + public boolean method1736(int var1, int var2) { + boolean var3 = this.field2935 != var1 || var2 != this.field2932; + this.field2935 = var1; + this.field2932 = var2; + var3 |= this.method1740(this.field2931, this.field2927); + return var3; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1183077231" + ) + public boolean method1737(int var1) { + if (var1 < 0) { + var1 = Integer.MAX_VALUE; + } + + boolean var2 = var1 == this.field2938.method2065(); + this.field2938.method2042(var1); + this.field2939.method2042(var1); + if (this.method1803()) { + this.method1808(); + var2 = true; + } + + return var2; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-790356702" + ) + public boolean method1738(int var1) { + this.field2938.method2043(var1); + if (this.method1803()) { + this.method1808(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-34" + ) + public boolean method1739(int var1) { + this.field2926 = var1; + if (this.method1803()) { + this.method1808(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "1916065285" + ) + public boolean method1740(int var1, int var2) { + if (!this.method1787()) { + this.field2931 = var1; + this.field2927 = var2; + return false; + } else { + int var3 = this.field2931; + int var4 = this.field2927; + int var5 = Math.max(0, this.field2938.method2060() - this.field2935 + 2); + int var6 = Math.max(0, this.field2938.method2061() - this.field2932 + 1); + this.field2931 = Math.max(0, Math.min(var5, var1)); + this.field2927 = Math.max(0, Math.min(var6, var2)); + return var3 != this.field2931 || var4 != this.field2927; + } + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(IIS)Z", + garbageValue = "-28947" + ) + public boolean method1741(int var1, int var2) { + boolean var3 = true; + if (var1 < 0 || var1 > 2) { + var3 = false; + } + + if (var2 < 0 || var2 > 2) { + var3 = false; + } + + return var3 ? this.field2938.method2047(var1, var2) : false; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "105" + ) + public void method1742(int var1) { + this.field2938.method2048(var1); + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "318624055" + ) + public void method1743(int var1) { + this.field2923 = var1; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-745884306" + ) + public void method1744(int var1) { + this.field2938.method2046(var1); + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "73" + ) + public void method1745(int var1) { + this.field2938.method2044(var1); + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1266422233" + ) + public boolean method1746(int var1) { + this.field2922 = var1; + String var2 = this.field2938.method2041(); + int var3 = var2.length(); + var2 = this.method1799(var2); + if (var2.length() != var3) { + this.field2938.method2054(var2); + this.method1740(this.field2931, this.field2927); + this.method1803(); + this.method1808(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-313169923" + ) + public void method1747() { + this.field2920 = false; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-88" + ) + public boolean method1748(int var1) { + if (this.method1809(var1)) { + this.method1753(); + class395 var2 = this.field2938.method2050((char)var1, this.field2928, this.field2933); + this.method1755(var2.method2078(), var2.method2078()); + this.method1803(); + this.method1808(); + } + + return true; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1833500314" + ) + public void method1749() { + if (!this.method1753() && this.field2928 > 0) { + int var1 = this.field2938.method2056(this.field2928 - 1); + this.method1808(); + this.method1755(var1, var1); + } + + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "54" + ) + public void method1750() { + if (!this.method1753() && this.field2928 < this.field2938.method2040()) { + int var1 = this.field2938.method2056(this.field2928); + this.method1808(); + this.method1755(var1, var1); + } + + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-66" + ) + public void method1751() { + if (!this.method1753() && this.field2928 > 0) { + class485 var1 = this.method1801(this.field2928 - 1); + int var2 = this.field2938.method2057((Integer)var1.field4049, this.field2928); + this.method1808(); + this.method1755(var2, var2); + } + + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-43" + ) + public void method1752() { + if (!this.method1753() && this.field2928 < this.field2938.method2040()) { + class485 var1 = this.method1801(this.field2928); + int var2 = this.field2938.method2057(this.field2928, (Integer)var1.field4048); + this.method1808(); + this.method1755(var2, var2); + } + + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1216764682" + ) + boolean method1753() { + if (!this.method1798()) { + return false; + } else { + int var1 = this.field2938.method2057(this.field2929, this.field2928); + this.method1808(); + this.method1755(var1, var1); + return true; + } + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-70" + ) + public void method1754() { + this.method1755(0, this.field2938.method2040()); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "28215574" + ) + public boolean method1755(int var1, int var2) { + if (!this.method1787()) { + this.field2929 = var1; + this.field2928 = var2; + return false; + } else { + if (var1 > this.field2938.method2040()) { + var1 = this.field2938.method2040(); + } + + if (var2 > this.field2938.method2040()) { + var2 = this.field2938.method2040(); + } + + boolean var3 = this.field2929 != var1 || var2 != this.field2928; + this.field2929 = var1; + if (var2 != this.field2928) { + this.field2928 = var2; + this.field2925 = 0; + this.method1806(); + } + + if (var3 && this.field2936 != null) { + this.field2936.vmethod5708(); + } + + return var3; + } + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "67" + ) + public void method1756(boolean var1) { + class485 var2 = this.method1802(this.field2928); + this.method1804((Integer)var2.field4049, var1); + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-86" + ) + public void method1757(boolean var1) { + class485 var2 = this.method1802(this.field2928); + this.method1804((Integer)var2.field4048, var1); + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "103" + ) + public void method1758(boolean var1) { + this.method1804(0, var1); + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1079000340" + ) + public void method1759(boolean var1) { + this.method1804(this.field2938.method2040(), var1); + } + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1431814125" + ) + public void method1760(boolean var1) { + if (this.method1798() && !var1) { + this.method1804(Math.min(this.field2929, this.field2928), var1); + } else if (this.field2928 > 0) { + this.method1804(this.field2928 - 1, var1); + } + + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1263469110" + ) + public void method1761(boolean var1) { + if (this.method1798() && !var1) { + this.method1804(Math.max(this.field2929, this.field2928), var1); + } else if (this.field2928 < this.field2938.method2040()) { + this.method1804(this.field2928 + 1, var1); + } + + } + + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "(ZS)V", + garbageValue = "-12006" + ) + public void method1762(boolean var1) { + if (this.field2928 > 0) { + class485 var2 = this.method1801(this.field2928 - 1); + this.method1804((Integer)var2.field4049, var1); + } + + } + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1452508344" + ) + public void method1763(boolean var1) { + if (this.field2928 < this.field2938.method2040()) { + class485 var2 = this.method1801(this.field2928 + 1); + this.method1804((Integer)var2.field4048, var1); + } + + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1855815967" + ) + public void method1764(boolean var1) { + if (this.field2928 > 0) { + this.method1804(this.field2938.method2059(this.field2928, -1), var1); + } + + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1322004372" + ) + public void method1765(boolean var1) { + if (this.field2928 < this.field2938.method2040()) { + this.method1804(this.field2938.method2059(this.field2928, 1), var1); + } + + } + + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "6" + ) + public void method1766(boolean var1) { + if (this.field2928 > 0) { + int var2 = this.method1805(); + this.method1804(this.field2938.method2059(this.field2928, -var2), var1); + } + + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-203552347" + ) + public void method1767(boolean var1) { + if (this.field2928 < this.field2938.method2040()) { + int var2 = this.method1805(); + this.method1804(this.field2938.method2059(this.field2928, var2), var1); + } + + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(ZS)V", + garbageValue = "2595" + ) + public void method1768(boolean var1) { + class398 var2 = this.field2938.method2049(0, this.field2928); + class485 var3 = var2.method2119(); + this.method1804(this.field2938.method2058((Integer)var3.field4049, this.field2927), var1); + } + + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1036465571" + ) + public void method1769(boolean var1) { + class398 var2 = this.field2938.method2049(0, this.field2928); + class485 var3 = var2.method2119(); + this.method1804(this.field2938.method2058((Integer)var3.field4049, this.field2932 + this.field2927), var1); + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(IIZZI)V", + garbageValue = "-1002335608" + ) + public void method1770(int var1, int var2, boolean var3, boolean var4) { + boolean var5 = false; + class485 var6; + int var8; + if (!this.field2920) { + var8 = 0; + } else { + var1 += this.field2931; + var2 += this.field2927; + var6 = this.method1810(); + var8 = this.field2938.method2058(var1 - (Integer)var6.field4049, var2 - (Integer)var6.field4048); + } + + if (var3 && var4) { + this.field2924 = 1; + var6 = this.method1801(var8); + class485 var7 = this.method1801(this.field2930); + this.method1800(var7, var6); + } else if (var3) { + this.field2924 = 1; + var6 = this.method1801(var8); + this.method1755((Integer)var6.field4049, (Integer)var6.field4048); + this.field2930 = (Integer)var6.field4049; + } else if (var4) { + this.method1755(this.field2930, var8); + } else { + if (this.field2934 > 0 && var8 == this.field2930) { + if (this.field2928 == this.field2929) { + this.field2924 = 1; + var6 = this.method1801(var8); + this.method1755((Integer)var6.field4049, (Integer)var6.field4048); + } else { + this.field2924 = 2; + var6 = this.method1802(var8); + this.method1755((Integer)var6.field4049, (Integer)var6.field4048); + } + } else { + this.field2924 = 0; + this.method1755(var8, var8); + this.field2930 = var8; + } + + this.field2934 = 25; + } + + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-30" + ) + public void method1771(int var1, int var2) { + if (this.field2920 && this.method1782()) { + var1 += this.field2931; + var2 += this.field2927; + class485 var3 = this.method1810(); + int var4 = this.field2938.method2058(var1 - (Integer)var3.field4049, var2 - (Integer)var3.field4048); + class485 var5; + class485 var6; + switch(this.field2924) { + case 0: + this.method1755(this.field2929, var4); + break; + case 1: + var5 = this.method1801(this.field2930); + var6 = this.method1801(var4); + this.method1800(var5, var6); + break; + case 2: + var5 = this.method1802(this.field2930); + var6 = this.method1802(var4); + this.method1800(var5, var6); + } + } + + } + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", + garbageValue = "-1723140286" + ) + public void method1772(Clipboard var1) { + class398 var2 = this.field2938.method2049(this.field2929, this.field2928); + if (!var2.method2115()) { + String var3 = var2.method2113(); + if (!var3.isEmpty()) { + var1.setContents(new StringSelection(var3), (ClipboardOwner)null); + } + } + + } + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", + garbageValue = "2111715206" + ) + public void method1773(Clipboard var1) { + if (this.method1798()) { + this.method1772(var1); + this.method1753(); + } + + } + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", + garbageValue = "-992379728" + ) + public void method1774(Clipboard var1) { + Transferable var2 = var1.getContents((Object)null); + if (var2 != null && var2.isDataFlavorSupported(DataFlavor.stringFlavor)) { + try { + String var3 = this.method1799((String)var2.getTransferData(DataFlavor.stringFlavor)); + this.method1753(); + class395 var4 = this.field2938.method2051(var3, this.field2928, this.field2933); + this.method1755(var4.method2078(), var4.method2078()); + this.method1803(); + this.method1808(); + } catch (Exception var5) { + } + } + + } + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "127" + ) + public void method1775() { + this.field2927 = Math.max(0, this.field2927 - this.field2938.method2062()); + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-12" + ) + public void method1776() { + int var1 = Math.max(0, this.field2938.method2061() - this.field2932); + this.field2927 = Math.min(var1, this.field2927 + this.field2938.method2062()); + } + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "(Lmf;I)V", + garbageValue = "1877137858" + ) + public void method1777(class323 var1) { + this.field2937 = var1; + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(Lmf;I)V", + garbageValue = "1739536664" + ) + public void method1778(class323 var1) { + this.field2936 = var1; + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(I)Lpj;", + garbageValue = "-2121359079" + ) + public class394 method1779() { + return this.field2938; + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(I)Lpj;", + garbageValue = "1026932642" + ) + public class394 method1780() { + return this.field2939; + } + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(I)Lpl;", + garbageValue = "-927140025" + ) + public class398 method1781() { + return this.field2938.method2049(this.field2929, this.field2928); + } + + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "10263708" + ) + public boolean method1782() { + return this.field2919; + } + + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2120535737" + ) + public boolean method1783() { + return this.field2921; + } + + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "111" + ) + public boolean method1784() { + return this.method1782() && this.field2925 % 60 < 30; + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "2" + ) + public int method1785() { + return this.field2928; + } + + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "9" + ) + public int method1786() { + return this.field2929; + } + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "73" + ) + public boolean method1787() { + return this.field2920; + } + + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1004374049" + ) + public int method1788() { + return this.field2931; + } + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-737818988" + ) + public int method1789() { + return this.field2927; + } + + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "770052367" + ) + public int method1790() { + return this.field2938.method2065(); + } + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-339785891" + ) + public int method1791() { + return this.field2938.method2066(); + } + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-105" + ) + public int method1792() { + return this.field2926; + } + + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "10872" + ) + public int method1793() { + return this.field2923; + } + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-333954295" + ) + public int method1794() { + return this.field2938.method2067(); + } + + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "1" + ) + public int method1795() { + return this.field2922; + } + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2053175833" + ) + public int method1796() { + return this.field2938.method2068(); + } + + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-20" + ) + public boolean method1797() { + return this.method1791() > 1; + } + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-350056548" + ) + boolean method1798() { + return this.field2928 != this.field2929; + } + + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "83" + ) + String method1799(String var1) { + StringBuilder var2 = new StringBuilder(var1.length()); + + for (int var3 = 0; var3 < var1.length(); ++var3) { + char var4 = var1.charAt(var3); + if (this.method1809(var4)) { + var2.append(var4); + } + } + + return var2.toString(); + } + + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "(Lss;Lss;B)V", + garbageValue = "5" + ) + void method1800(class485 var1, class485 var2) { + if ((Integer)var2.field4049 < (Integer)var1.field4049) { + this.method1755((Integer)var1.field4048, (Integer)var2.field4049); + } else { + this.method1755((Integer)var1.field4049, (Integer)var2.field4048); + } + + } + + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "(IB)Lss;", + garbageValue = "-107" + ) + class485 method1801(int var1) { + int var2 = this.field2938.method2040(); + int var3 = 0; + int var4 = var2; + + int var5; + for (var5 = var1; var5 > 0; --var5) { + if (this.method1807(this.field2938.method2036(var5 - 1).field3680)) { + var3 = var5; + break; + } + } + + for (var5 = var1; var5 < var2; ++var5) { + if (this.method1807(this.field2938.method2036(var5).field3680)) { + var4 = var5; + break; + } + } + + return new class485(var3, var4); + } + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "(II)Lss;", + garbageValue = "-982019338" + ) + class485 method1802(int var1) { + int var2 = this.field2938.method2040(); + int var3 = 0; + int var4 = var2; + + int var5; + for (var5 = var1; var5 > 0; --var5) { + if (this.field2938.method2036(var5 - 1).field3680 == '\n') { + var3 = var5; + break; + } + } + + for (var5 = var1; var5 < var2; ++var5) { + if (this.field2938.method2036(var5).field3680 == '\n') { + var4 = var5; + break; + } + } + + return new class485(var3, var4); + } + + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2078239234" + ) + boolean method1803() { + if (!this.method1787()) { + return false; + } else { + boolean var1 = false; + if (this.field2938.method2040() > this.field2926) { + this.field2938.method2057(this.field2926, this.field2938.method2040()); + var1 = true; + } + + int var2 = this.method1791(); + int var3; + if (this.field2938.method2063() > var2) { + var3 = this.field2938.method2059(0, var2) - 1; + this.field2938.method2057(var3, this.field2938.method2040()); + var1 = true; + } + + if (var1) { + var3 = this.field2928; + int var4 = this.field2929; + int var5 = this.field2938.method2040(); + if (this.field2928 > var5) { + var3 = var5; + } + + if (this.field2929 > var5) { + var4 = var5; + } + + this.method1755(var4, var3); + } + + return var1; + } + } + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "(IZI)V", + garbageValue = "1750876747" + ) + void method1804(int var1, boolean var2) { + if (var2) { + this.method1755(this.field2929, var1); + } else { + this.method1755(var1, var1); + } + + } + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "6" + ) + int method1805() { + return this.field2932 / this.field2938.method2062(); + } + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-676768049" + ) + void method1806() { + class398 var1 = this.field2938.method2049(0, this.field2928); + class485 var2 = var1.method2119(); + int var3 = this.field2938.method2062(); + int var4 = (Integer)var2.field4049 - 10; + int var5 = var4 + 20; + int var6 = (Integer)var2.field4048 - 3; + int var7 = var6 + var3 + 6; + int var8 = this.field2931; + int var9 = var8 + this.field2935; + int var10 = this.field2927; + int var11 = var10 + this.field2932; + int var12 = this.field2931; + int var13 = this.field2927; + if (var4 < var8) { + var12 = var4; + } else if (var5 > var9) { + var12 = var5 - this.field2935; + } + + if (var6 < var10) { + var13 = var6; + } else if (var7 > var11) { + var13 = var7 - this.field2932; + } + + this.method1740(var12, var13); + } + + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-369704395" + ) + boolean method1807(int var1) { + return var1 == 32 || var1 == 10 || var1 == 9; + } + + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2067288907" + ) + void method1808() { + if (this.field2937 != null) { + this.field2937.vmethod5708(); + } + + } + + @ObfuscatedName("dj") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-268502133" + ) + boolean method1809(int var1) { + switch(this.field2922) { + case 1: + return WorldMapLabel.isAlphaNumeric((char)var1); + case 2: + return class200.isCharAlphabetic((char)var1); + case 3: + return class330.isDigit((char)var1); + case 4: + char var2 = (char)var1; + if (class330.isDigit(var2)) { + return true; + } else { + if (var2 != 'k' && var2 != 'K' && var2 != 'm' && var2 != 'M' && var2 != 'b' && var2 != 'B') { + return false; + } + + return true; + } + default: + return true; + } + } + + @ObfuscatedName("di") + @ObfuscatedSignature( + descriptor = "(I)Lss;", + garbageValue = "-1390264109" + ) + class485 method1810() { + int var1 = this.field2938.method2069(this.field2935); + int var2 = this.field2938.method2070(this.field2932); + return new class485(var1, var2); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class33.java b/osrs/src/main/java/class33.java index c677fdc73..e73464021 100644 --- a/osrs/src/main/java/class33.java +++ b/osrs/src/main/java/class33.java @@ -2,44 +2,64 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bs") public class class33 { - @ObfuscatedName("aq") - public static short[] field89; - @ObfuscatedName("oo") - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("ag") - int field91; + @ObfuscatedName("um") + @Export("cameraMoveToY") + static int cameraMoveToY; + @ObfuscatedName("un") + @Export("cameraLookAtSpeed") + static int cameraLookAtSpeed; @ObfuscatedName("az") int field92; + @ObfuscatedName("ap") + int field91; class33(int var1, int var2) { - this.field91 = var1; - this.field92 = var2; + this.field92 = var1; + this.field91 = var2; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lba;S)Z", - garbageValue = "-1563" + descriptor = "(Lbv;I)Z", + garbageValue = "625917301" ) - boolean method134(class29 var1) { + boolean method130(class29 var1) { if (var1 == null) { return false; } else { - switch(this.field91) { + switch(this.field92) { case 1: - return var1.vmethod3949(this.field92); + return var1.vmethod3949(this.field91); case 2: - return var1.vmethod3989(this.field92); + return var1.vmethod3989(this.field91); case 3: - return var1.vmethod3951((char)this.field92); + return var1.vmethod3951((char)this.field91); case 4: - return var1.vmethod3953(this.field92 == 1); + return var1.vmethod3953(this.field91 == 1); default: return false; } } } -} + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIIII)I", + garbageValue = "-795893337" + ) + static final int method129(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Lco;", + garbageValue = "-1816107521" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class330.java b/osrs/src/main/java/class330.java index 7cfa72b31..08f455096 100644 --- a/osrs/src/main/java/class330.java +++ b/osrs/src/main/java/class330.java @@ -1,1248 +1,38 @@ -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.ClipboardOwner; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.StringSelection; -import java.awt.datatransfer.Transferable; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("mm") public class class330 { - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lpt;" - ) - class395 field2920; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lpt;" - ) - class395 field2921; - @ObfuscatedName("ao") - boolean field2903; - @ObfuscatedName("ac") - boolean field2901; - @ObfuscatedName("ak") - int field2906; - @ObfuscatedName("an") - boolean field2902; - @ObfuscatedName("af") - int field2904; - @ObfuscatedName("ai") - int field2905; - @ObfuscatedName("al") - int field2907; - @ObfuscatedName("bd") - int field2910; - @ObfuscatedName("bb") - int field2909; - @ObfuscatedName("bn") - int field2912; - @ObfuscatedName("ba") - int field2908; - @ObfuscatedName("bf") - int field2911; - @ObfuscatedName("bs") - int field2916; - @ObfuscatedName("bp") - int field2914; - @ObfuscatedName("bv") - int field2917; - @ObfuscatedName("bq") - int field2915; - @ObfuscatedName("bo") - int field2913; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lmv;" - ) - class324 field2918; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lmv;" - ) - class324 field2919; - - class330() { - this.field2920 = new class395(); - this.field2921 = new class395(); - this.field2903 = false; - this.field2901 = true; - this.field2906 = 0; - this.field2902 = false; - this.field2904 = 0; - this.field2905 = 0; - this.field2907 = 0; - this.field2910 = 0; - this.field2909 = 0; - this.field2912 = 0; - this.field2908 = 0; - this.field2911 = Integer.MAX_VALUE; - this.field2916 = Integer.MAX_VALUE; - this.field2914 = 0; - this.field2917 = 0; - this.field2915 = 0; - this.field2913 = 0; - this.field2920.method2005(1); - this.field2921.method2005(1); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-459181496" - ) - void method1693() { - this.field2906 = (this.field2906 + 1) % 60; - if (this.field2908 > 0) { - --this.field2908; - } - - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(ZB)Z", - garbageValue = "7" - ) - public boolean method1694(boolean var1) { - var1 = var1 && this.field2901; - boolean var2 = this.field2903 != var1; - this.field2903 = var1; - if (!this.field2903) { - this.method1718(this.field2910, this.field2910); - } - - return var2; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1718362437" - ) - public void method1695(boolean var1) { - this.field2901 = var1; - this.field2903 = var1 && this.field2903; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Z", - garbageValue = "-14" - ) - boolean method1696(String var1) { - String var2 = this.field2920.method2000(); - if (!var2.equals(var1)) { - var1 = this.method1762(var1); - this.field2920.method2012(var1); - this.method1703(this.field2915, this.field2913); - this.method1766(); - this.method1771(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "8373002" - ) - boolean method1697(String var1) { - this.field2921.method2012(var1); - return true; - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Lpq;I)Z", - garbageValue = "-1919649797" - ) - boolean method1698(AbstractFont var1) { - boolean var2 = !this.field2902; - this.field2920.method2004(var1); - this.field2921.method2004(var1); - this.field2902 = true; - var2 |= this.method1703(this.field2915, this.field2913); - var2 |= this.method1718(this.field2909, this.field2910); - if (this.method1766()) { - this.method1771(); - var2 = true; - } - - return var2; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1432554130" - ) - public boolean method1699(int var1, int var2) { - boolean var3 = this.field2914 != var1 || var2 != this.field2917; - this.field2914 = var1; - this.field2917 = var2; - var3 |= this.method1703(this.field2915, this.field2913); - return var3; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-40" - ) - public boolean method1700(int var1) { - if (var1 < 0) { - var1 = Integer.MAX_VALUE; - } - - boolean var2 = var1 == this.field2920.method2024(); - this.field2920.method2001(var1); - this.field2921.method2001(var1); - if (this.method1766()) { - this.method1771(); - var2 = true; - } - - return var2; - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "14" - ) - public boolean method1701(int var1) { - this.field2920.method2002(var1); - if (this.method1766()) { - this.method1771(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "569863727" - ) - public boolean method1702(int var1) { - this.field2916 = var1; - if (this.method1766()) { - this.method1771(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "217776537" - ) - public boolean method1703(int var1, int var2) { - if (!this.method1750()) { - this.field2915 = var1; - this.field2913 = var2; - return false; - } else { - int var3 = this.field2915; - int var4 = this.field2913; - int var5 = Math.max(0, this.field2920.method2018() - this.field2914 + 2); - int var6 = Math.max(0, this.field2920.method2019() - this.field2917 + 1); - this.field2915 = Math.max(0, Math.min(var5, var1)); - this.field2913 = Math.max(0, Math.min(var6, var2)); - return var3 != this.field2915 || var4 != this.field2913; - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(IIS)Z", - garbageValue = "-1284" - ) - public boolean method1704(int var1, int var2) { - boolean var3 = true; - if (var1 < 0 || var1 > 2) { - var3 = false; - } - - if (var2 < 0 || var2 > 2) { - var3 = false; - } - - return var3 ? this.field2920.method2006(var1, var2) : false; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1785897338" - ) - public void method1705(int var1) { - this.field2920.method2007(var1); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-39" - ) - public void method1706(int var1) { - this.field2904 = var1; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "591098801" - ) - public void method1707(int var1) { - this.field2920.method2005(var1); - } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1778164479" - ) - public void method1708(int var1) { - this.field2920.method2003(var1); - } - + public static final short[] field2941; @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "2124230223" - ) - public boolean method1709(int var1) { - this.field2907 = var1; - String var2 = this.field2920.method2000(); - int var3 = var2.length(); - var2 = this.method1762(var2); - if (var2.length() != var3) { - this.field2920.method2012(var2); - this.method1703(this.field2915, this.field2913); - this.method1766(); - this.method1771(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1676900457" - ) - public void method1710() { - this.field2902 = false; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "2097619146" - ) - public boolean method1711(int var1) { - if (this.method1772(var1)) { - this.method1716(); - class396 var2 = this.field2920.method2009((char)var1, this.field2910, this.field2911); - this.method1718(var2.method2038(), var2.method2038()); - this.method1766(); - this.method1771(); - } - - return true; - } - + public static final short[][] field2942; @ObfuscatedName("ao") + public static final short[] field2940; + @ObfuscatedName("at") + public static final short[][] field2943; + @ObfuscatedName("ud") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "639045291" - ) - public void method1712() { - if (!this.method1716() && this.field2910 > 0) { - int var1 = this.field2920.method2014(this.field2910 - 1); - this.method1771(); - this.method1718(var1, var1); - } - - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1560455499" - ) - public void method1713() { - if (!this.method1716() && this.field2910 < this.field2920.method1999()) { - int var1 = this.field2920.method2014(this.field2910); - this.method1771(); - this.method1718(var1, var1); - } - - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1632298723" - ) - public void method1714() { - if (!this.method1716() && this.field2910 > 0) { - class486 var1 = this.method1764(this.field2910 - 1); - int var2 = this.field2920.method2015((Integer)var1.field4036, this.field2910); - this.method1771(); - this.method1718(var2, var2); - } - - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "45" - ) - public void method1715() { - if (!this.method1716() && this.field2910 < this.field2920.method1999()) { - class486 var1 = this.method1764(this.field2910); - int var2 = this.field2920.method2015(this.field2910, (Integer)var1.field4037); - this.method1771(); - this.method1718(var2, var2); - } - - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "809245355" - ) - boolean method1716() { - if (!this.method1761()) { - return false; - } else { - int var1 = this.field2920.method2015(this.field2909, this.field2910); - this.method1771(); - this.method1718(var1, var1); - return true; - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-636827836" - ) - public void method1717() { - this.method1718(0, this.field2920.method1999()); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-47" - ) - public boolean method1718(int var1, int var2) { - if (!this.method1750()) { - this.field2909 = var1; - this.field2910 = var2; - return false; - } else { - if (var1 > this.field2920.method1999()) { - var1 = this.field2920.method1999(); - } - - if (var2 > this.field2920.method1999()) { - var2 = this.field2920.method1999(); - } - - boolean var3 = this.field2909 != var1 || var2 != this.field2910; - this.field2909 = var1; - if (var2 != this.field2910) { - this.field2910 = var2; - this.field2906 = 0; - this.method1769(); - } - - if (var3 && this.field2919 != null) { - this.field2919.vmethod5708(); - } - - return var3; - } - } - - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "112" - ) - public void method1719(boolean var1) { - class486 var2 = this.method1765(this.field2910); - this.method1767((Integer)var2.field4036, var1); - } - - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "647132311" - ) - public void method1720(boolean var1) { - class486 var2 = this.method1765(this.field2910); - this.method1767((Integer)var2.field4037, var1); - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "26" - ) - public void method1721(boolean var1) { - this.method1767(0, var1); - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "109" - ) - public void method1722(boolean var1) { - this.method1767(this.field2920.method1999(), var1); - } - - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "483744415" - ) - public void method1723(boolean var1) { - if (this.method1761() && !var1) { - this.method1767(Math.min(this.field2909, this.field2910), var1); - } else if (this.field2910 > 0) { - this.method1767(this.field2910 - 1, var1); - } - - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "424331931" - ) - public void method1724(boolean var1) { - if (this.method1761() && !var1) { - this.method1767(Math.max(this.field2909, this.field2910), var1); - } else if (this.field2910 < this.field2920.method1999()) { - this.method1767(this.field2910 + 1, var1); - } - - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1838680706" - ) - public void method1725(boolean var1) { - if (this.field2910 > 0) { - class486 var2 = this.method1764(this.field2910 - 1); - this.method1767((Integer)var2.field4036, var1); - } - - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-127" - ) - public void method1726(boolean var1) { - if (this.field2910 < this.field2920.method1999()) { - class486 var2 = this.method1764(this.field2910 + 1); - this.method1767((Integer)var2.field4037, var1); - } - - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-31746529" - ) - public void method1727(boolean var1) { - if (this.field2910 > 0) { - this.method1767(this.field2920.method2017(this.field2910, -1), var1); - } - - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "593239666" - ) - public void method1728(boolean var1) { - if (this.field2910 < this.field2920.method1999()) { - this.method1767(this.field2920.method2017(this.field2910, 1), var1); - } - - } - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-35" - ) - public void method1729(boolean var1) { - if (this.field2910 > 0) { - int var2 = this.method1768(); - this.method1767(this.field2920.method2017(this.field2910, -var2), var1); - } - - } - - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "46" - ) - public void method1730(boolean var1) { - if (this.field2910 < this.field2920.method1999()) { - int var2 = this.method1768(); - this.method1767(this.field2920.method2017(this.field2910, var2), var1); - } - - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "1" - ) - public void method1731(boolean var1) { - class399 var2 = this.field2920.method2008(0, this.field2910); - class486 var3 = var2.method2080(); - this.method1767(this.field2920.method2016((Integer)var3.field4036, this.field2913), var1); - } - - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1784409030" - ) - public void method1732(boolean var1) { - class399 var2 = this.field2920.method2008(0, this.field2910); - class486 var3 = var2.method2080(); - this.method1767(this.field2920.method2016((Integer)var3.field4036, this.field2913 + this.field2917), var1); - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(IIZZI)V", - garbageValue = "-1784719026" - ) - public void method1733(int var1, int var2, boolean var3, boolean var4) { - boolean var5 = false; - class486 var6; - int var8; - if (!this.field2902) { - var8 = 0; - } else { - var1 += this.field2915; - var2 += this.field2913; - var6 = this.method1773(); - var8 = this.field2920.method2016(var1 - (Integer)var6.field4036, var2 - (Integer)var6.field4037); - } - - if (var3 && var4) { - this.field2905 = 1; - var6 = this.method1764(var8); - class486 var7 = this.method1764(this.field2912); - this.method1763(var7, var6); - } else if (var3) { - this.field2905 = 1; - var6 = this.method1764(var8); - this.method1718((Integer)var6.field4036, (Integer)var6.field4037); - this.field2912 = (Integer)var6.field4036; - } else if (var4) { - this.method1718(this.field2912, var8); - } else { - if (this.field2908 > 0 && var8 == this.field2912) { - if (this.field2910 == this.field2909) { - this.field2905 = 1; - var6 = this.method1764(var8); - this.method1718((Integer)var6.field4036, (Integer)var6.field4037); - } else { - this.field2905 = 2; - var6 = this.method1765(var8); - this.method1718((Integer)var6.field4036, (Integer)var6.field4037); - } - } else { - this.field2905 = 0; - this.method1718(var8, var8); - this.field2912 = var8; - } - - this.field2908 = 25; - } - - } - - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1833413853" - ) - public void method1734(int var1, int var2) { - if (this.field2902 && this.method1745()) { - var1 += this.field2915; - var2 += this.field2913; - class486 var3 = this.method1773(); - int var4 = this.field2920.method2016(var1 - (Integer)var3.field4036, var2 - (Integer)var3.field4037); - class486 var5; - class486 var6; - switch(this.field2905) { - case 0: - this.method1718(this.field2909, var4); - break; - case 1: - var5 = this.method1764(this.field2912); - var6 = this.method1764(var4); - this.method1763(var5, var6); - break; - case 2: - var5 = this.method1765(this.field2912); - var6 = this.method1765(var4); - this.method1763(var5, var6); - } - } - - } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/datatransfer/Clipboard;B)V", - garbageValue = "47" - ) - public void method1735(Clipboard var1) { - class399 var2 = this.field2920.method2008(this.field2909, this.field2910); - if (!var2.method2076()) { - String var3 = var2.method2074(); - if (!var3.isEmpty()) { - var1.setContents(new StringSelection(var3), (ClipboardOwner)null); - } - } - - } - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", - garbageValue = "189356475" - ) - public void method1736(Clipboard var1) { - if (this.method1761()) { - this.method1735(var1); - this.method1716(); - } - - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", - garbageValue = "284807230" - ) - public void method1737(Clipboard var1) { - Transferable var2 = var1.getContents((Object)null); - if (var2 != null && var2.isDataFlavorSupported(DataFlavor.stringFlavor)) { - try { - String var3 = this.method1762((String)var2.getTransferData(DataFlavor.stringFlavor)); - this.method1716(); - class396 var4 = this.field2920.method2010(var3, this.field2910, this.field2911); - this.method1718(var4.method2038(), var4.method2038()); - this.method1766(); - this.method1771(); - } catch (Exception var5) { - } - } - - } - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-121" - ) - public void method1738() { - this.field2913 = Math.max(0, this.field2913 - this.field2920.method2021()); - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-119" - ) - public void method1739() { - int var1 = Math.max(0, this.field2920.method2019() - this.field2917); - this.field2913 = Math.min(var1, this.field2913 + this.field2920.method2021()); - } - - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "(Lmv;B)V", - garbageValue = "26" - ) - public void method1740(class324 var1) { - this.field2918 = var1; - } - - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(Lmv;I)V", - garbageValue = "-2108435148" - ) - public void method1741(class324 var1) { - this.field2919 = var1; - } - - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "(I)Lpt;", - garbageValue = "-1669614004" - ) - public class395 method1742() { - return this.field2920; - } - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(B)Lpt;", - garbageValue = "25" - ) - public class395 method1743() { - return this.field2921; - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(B)Lpo;", - garbageValue = "2" - ) - public class399 method1744() { - return this.field2920.method2008(this.field2909, this.field2910); - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1934970333" - ) - public boolean method1745() { - return this.field2903; - } - - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1635187775" - ) - public boolean method1746() { - return this.field2901; - } - - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-3" - ) - public boolean method1747() { - return this.method1745() && this.field2906 % 60 < 30; - } - - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1735474606" - ) - public int method1748() { - return this.field2910; - } - - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-912146623" - ) - public int method1749() { - return this.field2909; - } - - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-72" - ) - public boolean method1750() { - return this.field2902; - } - - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1863338129" - ) - public int method1751() { - return this.field2915; - } - - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "56" - ) - public int method1752() { - return this.field2913; - } - - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1605906220" - ) - public int method1753() { - return this.field2920.method2024(); - } - - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1275690994" - ) - public int method1754() { - return this.field2920.method2025(); - } - - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "27" - ) - public int method1755() { - return this.field2916; - } - - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2058718198" - ) - public int method1756() { - return this.field2904; - } - - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "61" - ) - public int method1757() { - return this.field2920.method2026(); - } - - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "85673603" - ) - public int method1758() { - return this.field2907; - } - - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" - ) - public int method1759() { - return this.field2920.method2027(); - } - - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-26300" - ) - public boolean method1760() { - return this.method1754() > 1; - } - - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1024988634" - ) - boolean method1761() { - return this.field2910 != this.field2909; - } - - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "755561266" - ) - String method1762(String var1) { - StringBuilder var2 = new StringBuilder(var1.length()); - - for (int var3 = 0; var3 < var1.length(); ++var3) { - char var4 = var1.charAt(var3); - if (this.method1772(var4)) { - var2.append(var4); - } - } - - return var2.toString(); - } - - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "(Lsf;Lsf;I)V", - garbageValue = "1987987448" - ) - void method1763(class486 var1, class486 var2) { - if ((Integer)var2.field4036 < (Integer)var1.field4036) { - this.method1718((Integer)var1.field4037, (Integer)var2.field4036); - } else { - this.method1718((Integer)var1.field4036, (Integer)var2.field4037); - } - - } - - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "(IB)Lsf;", - garbageValue = "42" - ) - class486 method1764(int var1) { - int var2 = this.field2920.method1999(); - int var3 = 0; - int var4 = var2; - - int var5; - for (var5 = var1; var5 > 0; --var5) { - if (this.method1770(this.field2920.method1995(var5 - 1).field3671)) { - var3 = var5; - break; - } - } - - for (var5 = var1; var5 < var2; ++var5) { - if (this.method1770(this.field2920.method1995(var5).field3671)) { - var4 = var5; - break; - } - } - - return new class486(var3, var4); - } - - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "(II)Lsf;", - garbageValue = "1047123828" - ) - class486 method1765(int var1) { - int var2 = this.field2920.method1999(); - int var3 = 0; - int var4 = var2; - - int var5; - for (var5 = var1; var5 > 0; --var5) { - if (this.field2920.method1995(var5 - 1).field3671 == '\n') { - var3 = var5; - break; - } - } - - for (var5 = var1; var5 < var2; ++var5) { - if (this.field2920.method1995(var5).field3671 == '\n') { - var4 = var5; - break; - } - } - - return new class486(var3, var4); - } - - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1532809681" - ) - boolean method1766() { - if (!this.method1750()) { - return false; - } else { - boolean var1 = false; - if (this.field2920.method1999() > this.field2916) { - this.field2920.method2015(this.field2916, this.field2920.method1999()); - var1 = true; - } - - int var2 = this.method1754(); - int var3; - if (this.field2920.method2022() > var2) { - var3 = this.field2920.method2017(0, var2) - 1; - this.field2920.method2015(var3, this.field2920.method1999()); - var1 = true; - } - - if (var1) { - var3 = this.field2910; - int var4 = this.field2909; - int var5 = this.field2920.method1999(); - if (this.field2910 > var5) { - var3 = var5; - } - - if (this.field2909 > var5) { - var4 = var5; - } - - this.method1718(var4, var3); - } - - return var1; - } - } - - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "-1065241721" - ) - void method1767(int var1, boolean var2) { - if (var2) { - this.method1718(this.field2909, var1); - } else { - this.method1718(var1, var1); - } - - } - - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1134475135" - ) - int method1768() { - return this.field2917 / this.field2920.method2021(); - } - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-886757584" - ) - void method1769() { - class399 var1 = this.field2920.method2008(0, this.field2910); - class486 var2 = var1.method2080(); - int var3 = this.field2920.method2021(); - int var4 = (Integer)var2.field4036 - 10; - int var5 = var4 + 20; - int var6 = (Integer)var2.field4037 - 3; - int var7 = var3 + var6 + 6; - int var8 = this.field2915; - int var9 = var8 + this.field2914; - int var10 = this.field2913; - int var11 = var10 + this.field2917; - int var12 = this.field2915; - int var13 = this.field2913; - if (var4 < var8) { - var12 = var4; - } else if (var5 > var9) { - var12 = var5 - this.field2914; - } - - if (var6 < var10) { - var13 = var6; - } else if (var7 > var11) { - var13 = var7 - this.field2917; - } - - this.method1703(var12, var13); - } - - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2093013908" - ) - boolean method1770(int var1) { - return var1 == 32 || var1 == 10 || var1 == 9; - } - - @ObfuscatedName("dc") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "203184236" - ) - void method1771() { - if (this.field2918 != null) { - this.field2918.vmethod5708(); - } - - } - - @ObfuscatedName("dq") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "98" + descriptor = "Lcx;" ) - boolean method1772(int var1) { - switch(this.field2907) { - case 1: - return class126.isAlphaNumeric((char)var1); - case 2: - return Canvas.isCharAlphabetic((char)var1); - case 3: - return class164.isDigit((char)var1); - case 4: - char var2 = (char)var1; - if (class164.isDigit(var2)) { - return true; - } else { - if (var2 != 'k' && var2 != 'K' && var2 != 'm' && var2 != 'M' && var2 != 'b' && var2 != 'B') { - return false; - } + @Export("decimator") + static Decimator decimator; - return true; - } - default: - return true; - } + static { + field2941 = new short[]{6798, 8741, 25238, 4626, 4550}; + field2942 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010, -22122, 937, 8130, -13422, 30385}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; + field2940 = new short[]{-10304, 9104, -1, -1, -1}; + field2943 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002, -22116, 945, 8144, -13414, 30389}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; } - @ObfuscatedName("dg") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(B)Lsf;", - garbageValue = "0" + descriptor = "(CI)Z", + garbageValue = "770001992" ) - class486 method1773() { - int var1 = this.field2920.method2028(this.field2914); - int var2 = this.field2920.method2029(this.field2917); - return new class486(var1, var2); - } - - @ObfuscatedName("ar") - static int method1692(long var0) { - return (int)(var0 >>> 0 & 127L); + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class331.java b/osrs/src/main/java/class331.java deleted file mode 100644 index b51c70f83..000000000 --- a/osrs/src/main/java/class331.java +++ /dev/null @@ -1,20 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("mg") -public class class331 { - @ObfuscatedName("aw") - public static final short[] field2923; - @ObfuscatedName("ay") - public static final short[][] field2925; - @ObfuscatedName("ar") - public static final short[] field2922; - @ObfuscatedName("am") - public static final short[][] field2924; - - static { - field2923 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2925 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010, -22122, 937, 8130, -13422, 30385}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; - field2922 = new short[]{-10304, 9104, -1, -1, -1}; - field2924 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002, -22116, 945, 8144, -13414, 30389}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; - } -} diff --git a/osrs/src/main/java/class332.java b/osrs/src/main/java/class332.java new file mode 100644 index 000000000..e90f8646e --- /dev/null +++ b/osrs/src/main/java/class332.java @@ -0,0 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mn") +public class class332 { + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + @Export("clock") + static Clock clock; + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1427775858" + ) + static int method1850(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field717 - 7.0D) * 256.0D); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class333.java b/osrs/src/main/java/class333.java deleted file mode 100644 index 8fc4a21d9..000000000 --- a/osrs/src/main/java/class333.java +++ /dev/null @@ -1,47 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mk") -public class class333 { - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("SequenceDefinition_animationsArchive") - static AbstractArchive SequenceDefinition_animationsArchive; - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-92" - ) - static void method1811(boolean var0) { - byte var1 = 0; - boolean var2 = class150.clientPreferences.method571() >= Client.param21; - if (!var2) { - var1 = 12; - } else if (TileItem.client.method361() || TileItem.client.method363() || TileItem.client.method362()) { - var1 = 10; - } - - class328.method1678(var1); - if (var0) { - Login.Login_username = ""; - Login.Login_password = ""; - class424.field3758 = 0; - Login.otp = ""; - } - - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (class150.clientPreferences.getUsernameToRemember() != null) { - Login.Login_username = class150.clientPreferences.getUsernameToRemember(); - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; - } - } - - class395.method2020(); - } -} diff --git a/osrs/src/main/java/class253.java b/osrs/src/main/java/class334.java similarity index 52% rename from osrs/src/main/java/class253.java rename to osrs/src/main/java/class334.java index 4d651a259..5ec53b987 100644 --- a/osrs/src/main/java/class253.java +++ b/osrs/src/main/java/class334.java @@ -2,12 +2,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jz") -public class class253 { - @ObfuscatedName("fh") +@ObfuscatedName("my") +public class class334 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lmx;" ) - @Export("archive4") - static Archive archive4; -} + @Export("huffman") + static Huffman huffman; +} \ No newline at end of file diff --git a/osrs/src/main/java/class335.java b/osrs/src/main/java/class335.java deleted file mode 100644 index c76dcd15e..000000000 --- a/osrs/src/main/java/class335.java +++ /dev/null @@ -1,288 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ml") -public class class335 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lma;" - ) - @Export("huffman") - public static Huffman huffman; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "[Lho;" - ) - @Export("WorldMapElement_cached") - public static WorldMapElement[] WorldMapElement_cached; - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(ILdc;ZS)I", - garbageValue = "-25634" - ) - static int method1815(int var0, Script var1, boolean var2) { - if (var0 == 5000) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } else if (var0 == 5001) { - Interpreter.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - class14.privateChatMode = class228.method1187(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - if (class14.privateChatMode == null) { - class14.privateChatMode = PrivateChatMode.field4227; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - PacketBufferNode var11 = class503.getPacketBufferNode(ClientPacket.SET_CHATFILTERSETTINGS, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeByte(Client.publicChatMode); - var11.packetBuffer.writeByte(class14.privateChatMode.id); - var11.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var11); - return 1; - } else { - String var3; - int var4; - int var5; - PacketBufferNode var6; - if (var0 == 5002) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var6 = class503.getPacketBufferNode(ClientPacket.SEND_SNAPSHOT, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(class501.stringCp1252NullTerminatedByteSize(var3) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var3); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.addNode(var6); - return 1; - } else { - int var7; - Message var8; - if (var0 == 5003) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var8 = class85.Messages_getByChannelAndID(var7, var4); - if (var8 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.count; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.cycle; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - Message var9; - if (var0 == 5004) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var9 = class105.Messages_getMessage(var7); - if (var9 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.type; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.cycle; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 5005) { - if (class14.privateChatMode == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class14.privateChatMode.id; - } - - return 1; - } else { - PacketBufferNode var12; - if (var0 == 5008) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = class396.method2039(var4, var3, Interpreter.clientLanguage, -1); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == 5009) { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - String var13 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - var12 = class503.getPacketBufferNode(ClientPacket.MESSAGE_PRIVATE, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(0); - int var10 = var12.packetBuffer.offset; - var12.packetBuffer.writeStringCp1252NullTerminated(var3); - class18.method57(var12.packetBuffer, var13); - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == 5010) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var6 = class396.method2039(var4, var3, Interpreter.clientLanguage, var5); - Client.packetWriter.addNode(var6); - return 1; - } else if (var0 != 5015) { - if (var0 == 5016) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } else if (var0 == 5017) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.Messages_getHistorySize(var7); - return 1; - } else if (var0 == 5018) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class358.Messages_getLastChatID(var7); - return 1; - } else if (var0 == 5019) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Strings.method1842(var7); - return 1; - } else if (var0 == 5020) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Buffer.doCheat(var3); - return 1; - } else if (var0 == 5021) { - Client.field598 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == 5022) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field598; - return 1; - } else if (var0 == 5023) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else if (var0 == 5030) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var8 = class85.Messages_getByChannelAndID(var7, var4); - if (var8 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.count; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.cycle; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 5031) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var9 = class105.Messages_getMessage(var7); - if (var9 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.type; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.cycle; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - if (class136.localPlayer != null && class136.localPlayer.username != null) { - var3 = class136.localPlayer.username.getName(); - } else { - var3 = ""; - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - return 1; - } - } - } - } - } - } - - @ObfuscatedName("ky") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1704956675" - ) - static final void method1816(int var0, int var1) { - if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { - if (Client.showMouseOverText) { - int var2 = class59.method323(); - String var3; - if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { - var3 = "Use" + " " + Client.field595 + " " + "->"; - } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { - var3 = Client.field597 + " " + Client.field596 + " " + "->"; - } else { - String var4; - if (var2 < 0) { - var4 = ""; - } else if (Client.menuTargets[var2].length() > 0) { - var4 = Client.menuActions[var2] + " " + Client.menuTargets[var2]; - } else { - var4 = Client.menuActions[var2]; - } - - var3 = var4; - } - - if (Client.menuOptionsCount > 2) { - var3 = var3 + MusicPatchPcmStream.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; - } - - Calendar.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); - } - } - } - - @ObfuscatedName("mf") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "0" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; - } -} diff --git a/osrs/src/main/java/class338.java b/osrs/src/main/java/class338.java new file mode 100644 index 000000000..db068bb8a --- /dev/null +++ b/osrs/src/main/java/class338.java @@ -0,0 +1,87 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +@ObfuscatedName("nq") +public class class338 { + @ObfuscatedName("ao") + static int field3112; + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2066901929" + ) + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; + + try { + var0 = Decimator.getPreferencesFile("", WorldMapSectionType.field2417.name, true); + Buffer var1 = class449.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { + } + + try { + if (var0 != null) { + var0.closeSync(true); + } + } catch (Exception var2) { + } + + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(II)Lfv;", + garbageValue = "1964561165" + ) + static class137 method1862(int var0) { + class137 var1 = (class137)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); + if (var1 != null) { + return var1; + } else { + AbstractArchive var3 = VarpDefinition.SequenceDefinition_animationsArchive; + AbstractArchive var4 = class485.SequenceDefinition_skeletonsArchive; + boolean var5 = true; + byte[] var6 = var3.getFile(var0 >> 16 & 65535, var0 & 65535); + class137 var2; + if (var6 == null) { + var5 = false; + var2 = null; + } else { + int var7 = (var6[1] & 255) << 8 | var6[2] & 255; + byte[] var8 = var4.getFile(var7, 0); + if (var8 == null) { + var5 = false; + } + + if (!var5) { + var2 = null; + } else { + if (class137.field1296 == null) { + class291.field2496 = Runtime.getRuntime().availableProcessors(); + class137.field1296 = new ThreadPoolExecutor(0, class291.field2496, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(class291.field2496 * 100 + 100), new class184()); + } + + try { + var2 = new class137(var3, var4, var0, false); + } catch (Exception var10) { + var2 = null; + } + } + } + + if (var2 != null) { + SequenceDefinition.SequenceDefinition_cachedModel.put(var2, (long)var0); + } + + return var2; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class339.java b/osrs/src/main/java/class339.java index 524cae100..3bacc18e6 100644 --- a/osrs/src/main/java/class339.java +++ b/osrs/src/main/java/class339.java @@ -1,235 +1,91 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nf") -public class class339 { +@ObfuscatedName("na") +public enum class339 implements class371 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + field3117(0), + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + field3115(1), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + field3116(2), @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIB)D", - garbageValue = "-121" + descriptor = "Lna;" ) - static double method1823(int var0, int var1, int var2) { - double var3 = var1 > 0 ? (double)Math.max(0.0F, Math.min(1.0F, (float)var0 / (float)var1)) : 1.0D; - if (var3 > 0.0D && var3 < 1.0D) { - double var5; - double var7; - switch(var2) { - case 0: - return var3; - case 1: - return 1.0D - Math.cos(3.141592653589793D * var3 / 2.0D); - case 2: - return Math.sin(3.141592653589793D * var3 / 2.0D); - case 3: - return -(Math.cos(var3 * 3.141592653589793D) - 1.0D) / 2.0D; - case 4: - return var3 * var3; - case 5: - return 1.0D - (1.0D - var3) * (1.0D - var3); - case 6: - return var3 < 0.5D ? var3 * var3 * 2.0D : 1.0D - Math.pow(2.0D + -2.0D * var3, 2.0D) / 2.0D; - case 7: - return var3 * var3 * var3; - case 8: - return 1.0D - Math.pow(1.0D - var3, 3.0D); - case 9: - return var3 < 0.5D ? var3 * var3 * 4.0D * var3 : 1.0D - Math.pow(2.0D + -2.0D * var3, 3.0D) / 2.0D; - case 10: - return var3 * var3 * var3 * var3; - case 11: - return 1.0D - Math.pow(1.0D - var3, 4.0D); - case 12: - return var3 < 0.5D ? var3 * var3 * 8.0D * var3 * var3 : 1.0D - Math.pow(var3 * -2.0D + 2.0D, 4.0D) / 2.0D; - case 13: - return var3 * var3 * var3 * var3 * var3; - case 14: - return 1.0D - Math.pow(1.0D - var3, 5.0D); - case 15: - return var3 < 0.5D ? var3 * var3 * 8.0D * var3 * var3 * var3 : 1.0D - Math.pow(var3 * -2.0D + 2.0D, 5.0D) / 2.0D; - case 16: - return Math.pow(2.0D, var3 * 10.0D - 10.0D); - case 17: - return 1.0D - Math.pow(2.0D, -10.0D * var3); - case 18: - return var3 < 0.5D ? Math.pow(2.0D, 10.0D + var3 * 20.0D) / 2.0D : (2.0D - Math.pow(2.0D, 10.0D + var3 * -20.0D)) / 2.0D; - case 19: - return 1.0D - Math.sqrt(1.0D - Math.pow(var3, 2.0D)); - case 20: - return Math.sqrt(1.0D - Math.pow(var3 - 1.0D, 2.0D)); - case 21: - return var3 < 0.5D ? (1.0D - Math.sqrt(1.0D - Math.pow(var3 * 2.0D, 2.0D))) / 2.0D : (Math.sqrt(1.0D - Math.pow(2.0D + var3 * -2.0D, 2.0D)) + 1.0D) / 2.0D; - case 22: - var5 = 1.70158D; - var7 = 2.70158D; - return var3 * 2.70158D * var3 * var3 - var3 * 1.70158D * var3; - case 23: - var5 = 1.70158D; - var7 = 2.70158D; - return 1.0D + 2.70158D * Math.pow(var3 - 1.0D, 3.0D) + 1.70158D * Math.pow(var3 - 1.0D, 2.0D); - case 24: - var5 = 1.70158D; - var7 = 2.5949095D; - return var3 < 0.5D ? Math.pow(var3 * 2.0D, 2.0D) * (var3 * 7.189819D - 2.5949095D) / 2.0D : (Math.pow(2.0D * var3 - 2.0D, 2.0D) * (2.5949095D + (2.0D * var3 - 2.0D) * 3.5949095D) + 2.0D) / 2.0D; - case 25: - var5 = 2.0943951023931953D; - return -Math.pow(2.0D, var3 * 10.0D - 10.0D) * Math.sin((var3 * 10.0D - 10.75D) * 2.0943951023931953D); - case 26: - var5 = 2.0943951023931953D; - return Math.pow(2.0D, -10.0D * var3) * Math.sin(2.0943951023931953D * (10.0D * var3 - 0.75D)) + 1.0D; - case 27: - var5 = 1.3962634015954636D; - var7 = Math.sin(1.3962634015954636D * (var3 * 20.0D - 11.125D)); - return var3 < 0.5D ? -(Math.pow(2.0D, 20.0D * var3 - 10.0D) * var7) / 2.0D : Math.pow(2.0D, 10.0D + -20.0D * var3) * var7 / 2.0D + 1.0D; - default: - return var3; - } - } else { - return var3 <= 0.0D ? 0.0D : 1.0D; - } - } - - @ObfuscatedName("bo") + field3113(3), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-626946368" + descriptor = "Lna;" ) - static int method1824(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 4200) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class125.ItemDefinition_get(var3).name; - return 1; - } else { - int var4; - ItemComposition var5; - if (var0 == 4201) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = class125.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 4202) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = class125.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } + field3114(4); - return 1; - } else if (var0 == 4203) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class125.ItemDefinition_get(var3).price; - return 1; - } else if (var0 == 4204) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class125.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemComposition var6; - if (var0 == 4205) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class125.ItemDefinition_get(var3); - if (var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } + @ObfuscatedName("ai") + final int field3118; - return 1; - } else if (var0 == 4206) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class125.ItemDefinition_get(var3); - if (var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } + class339(int var3) { + this.field3118 = var3; + } - return 1; - } else if (var0 == 4207) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class125.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == 4208) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class125.ItemDefinition_get(var3); - if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "41" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3118; + } - return 1; - } else if (var0 == 4209) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class125.ItemDefinition_get(var3); - if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } + @ObfuscatedName("nb") + @ObfuscatedSignature( + descriptor = "(IIII)Lds;", + garbageValue = "-800562138" + ) + @Export("ifOpenSub") + static final InterfaceParent ifOpenSub(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + class19.Widget_resetModelFrames(var1); + Widget var4 = class92.getWidget(var0); + class218.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + class218.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } - return 1; - } else if (var0 == 4210) { - String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class146.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = JagexCache.foundItemIdCount; - return 1; - } else if (var0 != 4211) { - if (var0 == 4212) { - ClanSettings.foundItemIndex = 0; - return 1; - } else if (var0 == 4213) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = class125.ItemDefinition_get(var3).getShiftClickIndex(); - if (var4 == -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + 1; - } + Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var0 >> 16], var4, false); + MoveSpeed.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { + class385.runIntfCloseListeners(Client.rootInterface, 1); + } - return 1; - } else if (var0 == 4214) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class125.ItemDefinition_get(var3).maleModel; - return 1; - } else if (var0 == 4215) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class125.ItemDefinition_get(var3).maleModel1; - return 1; - } else if (var0 == 4216) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class125.ItemDefinition_get(var3).maleModel2; - return 1; - } else if (var0 == 4217) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class125.ItemDefinition_get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.field1781; - return 1; - } else { - return 2; - } - } else { - if (MouseRecorder.foundItemIds != null && ClanSettings.foundItemIndex < JagexCache.foundItemIdCount) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.foundItemIds[++ClanSettings.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } + return var3; + } - return 1; - } + @ObfuscatedName("nh") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "18" + ) + static void method1865(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { + if ((var1.key >> 48 & 65535L) == (long)var0) { + var1.remove(); } } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class340.java b/osrs/src/main/java/class340.java deleted file mode 100644 index 5a580ed7d..000000000 --- a/osrs/src/main/java/class340.java +++ /dev/null @@ -1,49 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nb") -public enum class340 implements class372 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - field3101(0), - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - field3102(1), - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - field3099(2), - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - field3098(3), - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - field3100(4); - - @ObfuscatedName("aj") - final int field3103; - - class340(int var3) { - this.field3103 = var3; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3103; - } -} diff --git a/osrs/src/main/java/class342.java b/osrs/src/main/java/class342.java new file mode 100644 index 000000000..bc1f2f67b --- /dev/null +++ b/osrs/src/main/java/class342.java @@ -0,0 +1,51 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nd") +public class class342 { + @ObfuscatedName("gk") + static int field3146; + + @ObfuscatedName("lo") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1771943161" + ) + static void method1867(int var0, int var1) { + int var2 = class59.fontBold12.stringWidth("Choose Option"); + + int var3; + int var4; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + var4 = class59.fontBold12.stringWidth(class181.method928(var3)); + if (var4 > var2) { + var2 = var4; + } + } + + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + var4 = var0 - var2 / 2; + if (var4 + var2 > class113.canvasWidth) { + var4 = class113.canvasWidth - var2; + } + + if (var4 < 0) { + var4 = 0; + } + + int var5 = var1; + if (var1 + var3 > class177.canvasHeight) { + var5 = class177.canvasHeight - var3; + } + + if (var5 < 0) { + var5 = 0; + } + + class12.menuX = var4; + class419.menuY = var5; + class316.menuWidth = var2; + Occluder.menuHeight = Client.menuOptionsCount * 15 + 22; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class343.java b/osrs/src/main/java/class343.java index 250893aea..17bf235e4 100644 --- a/osrs/src/main/java/class343.java +++ b/osrs/src/main/java/class343.java @@ -1,20 +1,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nv") -public class class343 { - @ObfuscatedName("bg") +@ObfuscatedName("ng") +public final class class343 { + @ObfuscatedName("gm") @ObfuscatedSignature( - descriptor = "Lrk;" + descriptor = "Lnk;" ) - static Bounds field3130; - - @ObfuscatedName("ay") + static Archive field3148; + @ObfuscatedName("ou") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "2" + descriptor = "Lmi;" ) - static int method1829(int var0) { - return class28.KeyHandler_keyCodes[var0]; - } -} + static Widget field3147; +} \ No newline at end of file diff --git a/osrs/src/main/java/class344.java b/osrs/src/main/java/class344.java index 0ba57275a..59df3bd4d 100644 --- a/osrs/src/main/java/class344.java +++ b/osrs/src/main/java/class344.java @@ -2,69 +2,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("na") -public final class class344 { - @ObfuscatedName("ar") - static int field3132; - @ObfuscatedName("ab") - static int field3131; - @ObfuscatedName("ru") - @ObfuscatedSignature( - descriptor = "Ltp;" - ) - @Export("HitSplatDefinition_cached") - static class498 HitSplatDefinition_cached; +@ObfuscatedName("nt") +public class class344 { + @ObfuscatedName("ui") + @Export("cameraMoveToSpeed") + static int cameraMoveToSpeed; + + static { + Math.sqrt(8192.0D); + } - @ObfuscatedName("kk") + @ObfuscatedName("oi") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-512665068" + descriptor = "(II)Ltx;", + garbageValue = "2122507406" ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[class36.Client_plane][var0][var1]; - if (var2 == null) { - UserComparator5.scene.removeGroundItemPile(class36.Client_plane, var0, var1); - } else { - long var3 = -99999999L; - TileItem var5 = null; - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemComposition var7 = class125.ItemDefinition_get(var6.id); - long var8 = (long)var7.price; - if (var7.isStackable == 1) { - var8 *= var6.quantity < Integer.MAX_VALUE ? (long)(var6.quantity + 1) : (long)var6.quantity; - } - - if (var8 > var3) { - var3 = var8; - var5 = var6; - } - } - - if (var5 == null) { - UserComparator5.scene.removeGroundItemPile(class36.Client_plane, var0, var1); - } else { - var2.addLast(var5); - TileItem var12 = null; - TileItem var11 = null; - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var5.id != var6.id) { - if (var12 == null) { - var12 = var6; - } - - if (var6.id != var12.id && var11 == null) { - var11 = var6; - } - } - } - - long var9 = BufferedNetSocket.calculateTag(var0, var1, 3, false, 0); - UserComparator5.scene.newGroundItemPile(class36.Client_plane, var0, var1, class306.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class36.Client_plane), var5, var9, var12, var11); - } + static class506 method1868(int var0) { + class506 var1 = (class506)Client.Widget_cachedModels.get((long)var0); + if (var1 == null) { + var1 = new class506(class343.field3148, UserComparator3.method682(var0), NewShit.method979(var0)); + Client.Widget_cachedModels.put(var1, (long)var0); } + + return var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class345.java b/osrs/src/main/java/class345.java index e61bff285..c62cfa4bf 100644 --- a/osrs/src/main/java/class345.java +++ b/osrs/src/main/java/class345.java @@ -1,248 +1,30 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ns") +@ObfuscatedName("nv") public class class345 { - @ObfuscatedName("kg") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "[Lud;" + descriptor = "Lnv;" ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; - - static { - Math.sqrt(8192.0D); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "([BI)Ljava/lang/String;", - garbageValue = "-536830617" - ) - public static String method1832(byte[] var0) { - int var2 = var0.length; - StringBuilder var3 = new StringBuilder(); - - for (int var4 = 0; var4 < var2 + 0; var4 += 3) { - int var5 = var0[var4] & 255; - var3.append(class386.field3638[var5 >>> 2]); - if (var4 < var2 - 1) { - int var6 = var0[var4 + 1] & 255; - var3.append(class386.field3638[(var5 & 3) << 4 | var6 >>> 4]); - if (var4 < var2 - 2) { - int var7 = var0[var4 + 2] & 255; - var3.append(class386.field3638[(var6 & 15) << 2 | var7 >>> 6]).append(class386.field3638[var7 & 63]); - } else { - var3.append(class386.field3638[(var6 & 15) << 2]).append("="); - } - } else { - var3.append(class386.field3638[(var5 & 3) << 4]).append("=="); - } - } - - String var1 = var3.toString(); - return var1; - } - - @ObfuscatedName("aw") + static final class345 field3151; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-115" + descriptor = "Lnv;" ) - @Export("isWorldMapEvent") - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; - } - - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "(Lby;I)V", - garbageValue = "1549991189" - ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; - if (var0.sound != null) { - var0.sound.position = 0; - } - - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); - } + static final class345 field3150; + @ObfuscatedName("ao") + final int field3152; + @ObfuscatedName("at") + final int field3153; + static { + field3151 = new class345(51, 27, 800, 0, 16, 16); + field3150 = new class345(25, 28, 800, 656, 40, 40); } - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "1256277707" - ) - static int method1834(int var0, Script var1, boolean var2) { - if (var0 == 3800) { - if (class11.guestClanSettings != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - PacketBufferNode.field2591 = class11.guestClanSettings; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - int var3; - if (var0 == 3801) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Client.currentClanSettings[var3] != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - PacketBufferNode.field2591 = Client.currentClanSettings[var3]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3802) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketBufferNode.field2591.name; - return 1; - } else if (var0 == 3803) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.allowGuests ? 1 : 0; - return 1; - } else if (var0 == 3804) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.field1375; - return 1; - } else if (var0 == 3805) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.field1372; - return 1; - } else if (var0 == 3806) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.field1373; - return 1; - } else if (var0 == 3807) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.field1374; - return 1; - } else if (var0 == 3809) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.memberCount; - return 1; - } else if (var0 == 3810) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketBufferNode.field2591.memberNames[var3]; - return 1; - } else if (var0 == 3811) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.memberRanks[var3]; - return 1; - } else if (var0 == 3812) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.bannedMemberCount; - return 1; - } else if (var0 == 3813) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketBufferNode.field2591.bannedMemberNames[var3]; - return 1; - } else { - int var5; - int var6; - if (var0 == 3814) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.method804(var3, var6, var5); - return 1; - } else if (var0 == 3815) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.currentOwner; - return 1; - } else if (var0 == 3816) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.field1377; - return 1; - } else if (var0 == 3817) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.method803(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - return 1; - } else if (var0 == 3818) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == 3819) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - class504.method2479(var6, var3); - return 1; - } else if (var0 == 3820) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.field1381[var3]; - return 1; - } else { - if (var0 == 3821) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - class150.method789(var5, var3, var4); - } - - if (var0 == 3822) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.field2591.field1371[var3] ? 1 : 0; - return 1; - } else if (var0 == 3850) { - if (WorldMapLabelSize.guestClanChannel != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - class89.field878 = WorldMapLabelSize.guestClanChannel; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3851) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Client.currentClanChannels[var3] != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - class89.field878 = Client.currentClanChannels[var3]; - class344.field3131 = var3; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3852) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class89.field878.name; - return 1; - } else if (var0 == 3853) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class89.field878.field1416; - return 1; - } else if (var0 == 3854) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class89.field878.field1415; - return 1; - } else if (var0 == 3855) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class89.field878.method851(); - return 1; - } else if (var0 == 3856) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class89.field878.members.get(var3)).username.getName(); - return 1; - } else if (var0 == 3857) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)class89.field878.members.get(var3)).rank; - return 1; - } else if (var0 == 3858) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)class89.field878.members.get(var3)).world; - return 1; - } else if (var0 == 3859) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Client.method390(class344.field3131, var3); - return 1; - } else if (var0 == 3860) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class89.field878.method852(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - return 1; - } else if (var0 == 3861) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = class89.field878.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == 3890) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class135.varclan != null ? 1 : 0; - return 1; - } else { - return 2; - } - } - } - } + class345(int var1, int var2, int var3, int var4, int var5, int var6) { + this.field3152 = var5; + this.field3153 = var6; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class346.java b/osrs/src/main/java/class346.java deleted file mode 100644 index b43afec2c..000000000 --- a/osrs/src/main/java/class346.java +++ /dev/null @@ -1,39 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nc") -public class class346 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lnc;" - ) - static final class346 field3135; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lnc;" - ) - static final class346 field3136; - @ObfuscatedName("ar") - final int field3138; - @ObfuscatedName("am") - final int field3137; - - static { - field3135 = new class346(51, 27, 800, 0, 16, 16); - field3136 = new class346(25, 28, 800, 656, 40, 40); - } - - class346(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3138 = var5; - this.field3137 = var6; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1801743156" - ) - public static int method1835(int var0) { - return var0 != 0 && var0 != 1 ? -1 : 0; - } -} diff --git a/osrs/src/main/java/class348.java b/osrs/src/main/java/class348.java new file mode 100644 index 000000000..3885f7fe6 --- /dev/null +++ b/osrs/src/main/java/class348.java @@ -0,0 +1,129 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nz") +public class class348 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(CB)B", + garbageValue = "73" + ) + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + 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; + } + + return var1; + } + + @ObfuscatedName("ih") + @ObfuscatedSignature( + descriptor = "(Lmi;III)V", + garbageValue = "1790851766" + ) + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { + SpriteMask var3 = var0.getSpriteMask(true); + if (var3 == null) { + return; + } + + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; + if (var3.contains(var4, var5)) { + var4 -= var3.width / 2; + var5 -= var3.height / 2; + int var6 = Client.camAngleY & 2047; + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var9 = var8 * var4 + var7 * var5 >> 11; + int var10 = var8 * var5 - var7 * var4 >> 11; + int var11 = var9 + VarbitComposition.localPlayer.x >> 7; + int var12 = VarbitComposition.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.MOVE_MINIMAPCLICK, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.writeShortAddLE(var11 + UrlRequester.baseX); + var13.packetBuffer.writeShortAdd(var12 + class47.baseY); + var13.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? (Client.keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); + var13.packetBuffer.writeByte(var4); + var13.packetBuffer.writeByte(var5); + var13.packetBuffer.writeShort(Client.camAngleY); + var13.packetBuffer.writeByte(57); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(89); + var13.packetBuffer.writeShort(VarbitComposition.localPlayer.x); + var13.packetBuffer.writeShort(VarbitComposition.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class349.java b/osrs/src/main/java/class349.java new file mode 100644 index 000000000..174afd1f5 --- /dev/null +++ b/osrs/src/main/java/class349.java @@ -0,0 +1,100 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ne") +public class class349 { + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(ZLto;B)V", + garbageValue = "-101" + ) + static final void method1874(boolean var0, PacketBuffer var1) { + while (true) { + byte var2 = 16; + int var3 = 1 << var2; + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= var2 + 12) { + int var4 = var1.readBits(var2); + if (var4 != var3 - 1) { + boolean var5 = false; + if (Client.npcs[var4] == null) { + Client.npcs[var4] = new NPC(); + var5 = true; + } + + NPC var6 = Client.npcs[var4]; + Client.npcIndices[++Client.npcCount - 1] = var4; + var6.npcCycle = Client.cycle; + int var8; + if (var0) { + var8 = var1.readBits(8); + if (var8 > 127) { + var8 -= 256; + } + } else { + var8 = var1.readBits(5); + if (var8 > 15) { + var8 -= 32; + } + } + + boolean var10 = var1.readBits(1) == 1; + if (var10) { + var1.readBits(32); + } + + int var7 = var1.readBits(1); + int var11 = Client.field561[var1.readBits(3)]; + if (var5) { + var6.orientation = var6.rotation = var11; + } + + var6.definition = class90.getNpcDefinition(var1.readBits(14)); + int var12 = var1.readBits(1); + if (var12 == 1) { + Client.field552[++Client.field451 - 1] = var4; + } + + int var9; + if (var0) { + var9 = var1.readBits(8); + if (var9 > 127) { + var9 -= 256; + } + } else { + var9 = var1.readBits(5); + if (var9 > 15) { + var9 -= 32; + } + } + + ItemLayer.method1152(var6); + if (var6.field1017 == 0) { + var6.rotation = 0; + } + + var6.method583(VarbitComposition.localPlayer.pathX[0] + var8, VarbitComposition.localPlayer.pathY[0] + var9, var7 == 1); + continue; + } + } + + var1.exportIndex(); + return; + } + } + + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "87449786" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + Frames.method1297(); + Client.menuActions[0] = "Cancel"; + Client.menuTargets[0] = ""; + Client.menuOpcodes[0] = 1006; + Client.menuShiftClick[0] = false; + Client.menuOptionsCount = 1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class350.java b/osrs/src/main/java/class350.java index f9131215c..b2fbdf2e8 100644 --- a/osrs/src/main/java/class350.java +++ b/osrs/src/main/java/class350.java @@ -1,11 +1,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nm") +@ObfuscatedName("ni") public class class350 { - @ObfuscatedName("ge") + static { + int var0 = 0; + int var1 = 0; + class345[] var2 = class466.method2345(); + + for (int var3 = 0; var3 < var2.length; ++var3) { + class345 var4 = var2[var3]; + if (var4.field3152 > var0) { + var0 = var4.field3152; + } + + if (var4.field3153 > var1) { + var1 = var4.field3153; + } + } + + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lru;" + descriptor = "(III)I", + garbageValue = "-1513335843" ) - static GraphicsDefaults field3154; -} + public static int method1876(int var0, int var1) { + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class351.java b/osrs/src/main/java/class351.java deleted file mode 100644 index 156e71e46..000000000 --- a/osrs/src/main/java/class351.java +++ /dev/null @@ -1,94 +0,0 @@ -import java.applet.Applet; -import java.net.URL; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; - -@ObfuscatedName("nt") -public class class351 { - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lmt;" - ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; - - static { - int var0 = 0; - int var1 = 0; - class346[] var2 = new class346[]{class346.field3135, class346.field3136}; - class346[] var3 = var2; - - for (int var4 = 0; var4 < var3.length; ++var4) { - class346 var5 = var3[var4]; - if (var5.field3138 > var0) { - var0 = var5.field3138; - } - - if (var5.field3137 > var1) { - var1 = var5.field3137; - } - } - - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", - garbageValue = "115" - ) - static boolean method1840(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class31.field86.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; - - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var11.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; - } - } catch (Throwable var5) { - return false; - } - } else if (var1 == 1) { - try { - Object var10 = class26.method101(class31.field85, var2, new Object[]{(new URL(class31.field85.getCodeBase(), var0)).toString()}); - return var10 != null; - } catch (Throwable var6) { - return false; - } - } else if (var1 == 2) { - try { - class31.field85.getAppletContext().showDocument(new URL(class31.field85.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var7) { - return false; - } - } else if (var1 == 3) { - try { - Applet var3 = class31.field85; - //JSObject.getWindow(var3).call("loggedout", (Object[])null); - } catch (Throwable var9) { - } - - try { - class31.field85.getAppletContext().showDocument(new URL(class31.field85.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var8) { - return false; - } - } else { - throw new IllegalArgumentException(); - } - } -} diff --git a/osrs/src/main/java/class352.java b/osrs/src/main/java/class352.java new file mode 100644 index 000000000..47174002e --- /dev/null +++ b/osrs/src/main/java/class352.java @@ -0,0 +1,276 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("np") +public enum class352 implements class371 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lnp;" + ) + field3482(-1), + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lnp;" + ) + field3479(0), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lnp;" + ) + field3480(1), + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lnp;" + ) + field3481(2); + + @ObfuscatedName("ac") + final int field3483; + + class352(int var3) { + this.field3483 = var3; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "41" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3483; + } + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(ILdh;ZB)I", + garbageValue = "1" + ) + static int method1880(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == 4000) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 + var4; + return 1; + } else if (var0 == 4001) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == 4002) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 * var4; + return 1; + } else if (var0 == 4003) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == 4004) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == 4005) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; + } else { + int var5; + int var6; + int var7; + if (var0 == 4006) { + SoundCache.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); + return 1; + } else if (var0 == 4007) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; + return 1; + } else if (var0 == 4008) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == 4009) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == 4010) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == 4011) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == 4012) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); + } + + return 1; + } else if (var0 == 4013) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + switch(var4) { + case 0: + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; + case 1: + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; + break; + case 2: + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; + case 3: + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + break; + case 4: + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + break; + default: + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); + } + + return 1; + } + } else if (var0 == 4014) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 & var4; + return 1; + } else if (var0 == 4015) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 | var4; + return 1; + } else if (var0 == 4016) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 < var4 ? var3 : var4; + return 1; + } else if (var0 == 4017) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 > var4 ? var3 : var4; + return 1; + } else if (var0 == 4018) { + SoundCache.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); + return 1; + } else if (var0 == 4025) { + var3 = PacketBufferNode.method1609(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == 4026) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; + return 1; + } else if (var0 == 4027) { + SoundCache.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Widget.method1812(var3, var4, var5); + return 1; + } else if (var0 == 4028) { + SoundCache.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.method940(var3, var4, var5); + return 1; + } else if (var0 == 4029) { + SoundCache.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + var6 = 31 - var5; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; + return 1; + } else if (var0 == 4030) { + SoundCache.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + var3 = InvDefinition.method940(var3, var5, var6); + var7 = Projectile.method430(var6 - var5 + 1); + if (var4 > var7) { + var4 = var7; + } + + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 | var4 << var5; + return 1; + } else if (var0 == 4032) { + Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = Frames.method1292(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4033) { + Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = SongTask.method2137(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4034) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = class350.method1876(var3, var4); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var5; + return 1; + } else if (var0 == 4035) { + Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4036) { + String var15 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var4 = -1; + if (class218.isNumber(var15)) { + var4 = HealthBarUpdate.method524(var15); + } + + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4; + return 1; + } else { + return 2; + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class353.java b/osrs/src/main/java/class353.java deleted file mode 100644 index 7cef4b880..000000000 --- a/osrs/src/main/java/class353.java +++ /dev/null @@ -1,68 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nr") -public enum class353 implements class372 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lnr;" - ) - field3469(-1), - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lnr;" - ) - field3470(0), - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lnr;" - ) - field3468(1), - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lnr;" - ) - field3467(2); - - @ObfuscatedName("as") - final int field3471; - - class353(int var3) { - this.field3471 = var3; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3471; - } - - @ObfuscatedName("mu") - @ObfuscatedSignature( - descriptor = "(Lmt;III)V", - garbageValue = "-587359339" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null && class503.method2475(var0) != null) { - Client.clickedWidget = var0; - Client.clickedWidgetParent = class503.method2475(var0); - Client.widgetClickX = var1; - Client.widgetClickY = var2; - class130.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var3 = class59.method323(); - if (var3 != -1) { - Language.method1943(var3); - } - - } - } - } -} diff --git a/osrs/src/main/java/class357.java b/osrs/src/main/java/class357.java new file mode 100644 index 000000000..3b6470c02 --- /dev/null +++ b/osrs/src/main/java/class357.java @@ -0,0 +1,18 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nj") +public class class357 extends DualNode { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + Archive field3528; + @ObfuscatedName("ae") + int field3527; + @ObfuscatedName("ao") + byte field3526; + + class357() { + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class358.java b/osrs/src/main/java/class358.java deleted file mode 100644 index 2f8bd68c7..000000000 --- a/osrs/src/main/java/class358.java +++ /dev/null @@ -1,489 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nx") -public class class358 extends DualNode { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - Archive field3518; - @ObfuscatedName("ay") - int field3517; - @ObfuscatedName("ar") - byte field3516; - - class358() { - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "70" - ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; - } - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "0" - ) - static int method1864(byte[] var0, int var1, int var2) { - int var3 = -1; - - for (int var4 = var1; var4 < var2; ++var4) { - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; - } - - var3 = ~var3; - return var3; - } - - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "(ZLtc;I)V", - garbageValue = "-720645536" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field488 = 0; - Client.field446 = 0; - class53.method298(var1); - - int var3; - int var7; - int var8; - int var9; - int var10; - int var12; - while (true) { - byte var2 = 16; - var3 = 1 << var2; - if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) < var2 + 12) { - break; - } - - int var4 = var1.readBits(var2); - if (var4 == var3 - 1) { - break; - } - - boolean var5 = false; - if (Client.npcs[var4] == null) { - Client.npcs[var4] = new NPC(); - var5 = true; - } - - NPC var6 = Client.npcs[var4]; - Client.npcIndices[++Client.npcCount - 1] = var4; - var6.npcCycle = Client.cycle; - var10 = var1.readBits(1); - if (var10 == 1) { - Client.field549[++Client.field446 - 1] = var4; - } - - var7 = var1.readBits(1); - boolean var11 = var1.readBits(1) == 1; - if (var11) { - var1.readBits(32); - } - - if (var0) { - var9 = var1.readBits(8); - if (var9 > 127) { - var9 -= 256; - } - } else { - var9 = var1.readBits(5); - if (var9 > 15) { - var9 -= 32; - } - } - - if (var0) { - var8 = var1.readBits(8); - if (var8 > 127) { - var8 -= 256; - } - } else { - var8 = var1.readBits(5); - if (var8 > 15) { - var8 -= 32; - } - } - - var6.definition = Tile.getNpcDefinition(var1.readBits(14)); - var12 = Client.field559[var1.readBits(3)]; - if (var5) { - var6.orientation = var6.rotation = var12; - } - - Client.method383(var6); - if (var6.field1005 == 0) { - var6.rotation = 0; - } - - var6.method588(class136.localPlayer.pathX[0] + var8, class136.localPlayer.pathY[0] + var9, var7 == 1); - } - - var1.exportIndex(); - - int var22; - for (var22 = 0; var22 < Client.field446; ++var22) { - var3 = Client.field549[var22]; - NPC var14 = Client.npcs[var3]; - int var23 = var1.readUnsignedByte(); - int var15; - if ((var23 & 32) != 0) { - var15 = var1.readUnsignedByte(); - var23 += var15 << 8; - } - - if ((var23 & 1024) != 0) { - var15 = var1.readUnsignedByte(); - var23 += var15 << 16; - } - - if ((var23 & 8) != 0) { - var14.targetIndex = var1.readUnsignedShort(); - var14.targetIndex += var1.readUnsignedByte() << 16; - var15 = 16777215; - if (var15 == var14.targetIndex) { - var14.targetIndex = -1; - } - } - - if ((var23 & 1) != 0) { - var14.definition = Tile.getNpcDefinition(var1.readUnsignedShortAdd()); - Client.method383(var14); - var14.method595(); - } - - if ((var23 & 4) != 0) { - var15 = var1.readUnsignedShortLE(); - if (var15 == 65535) { - var15 = -1; - } - - var7 = var1.readUnsignedByteSub(); - if (var15 == var14.sequence && var15 != -1) { - var8 = class135.SequenceDefinition_get(var15).replyMode; - if (var8 == 1) { - var14.sequenceFrame = 0; - var14.sequenceFrameCycle = 0; - var14.sequenceDelay = var7; - var14.currentSequenceFrameIndex = 0; - } - - if (var8 == 2) { - var14.currentSequenceFrameIndex = 0; - } - } else if (var15 == -1 || var14.sequence == -1 || class135.SequenceDefinition_get(var15).forcedPriority >= class135.SequenceDefinition_get(var14.sequence).forcedPriority) { - var14.sequence = var15; - var14.sequenceFrame = 0; - var14.sequenceFrameCycle = 0; - var14.sequenceDelay = var7; - var14.currentSequenceFrameIndex = 0; - var14.field1018 = var14.pathLength; - } - } - - if ((var23 & 64) != 0) { - var1.readUnsignedShortLE(); - var1.readInt(); - } - - int[] var16; - short[] var17; - short[] var18; - long var19; - int var24; - boolean var25; - if ((var23 & 512) != 0) { - var15 = var1.readUnsignedByteSub(); - if ((var15 & 1) == 1) { - var14.method599(); - } else { - var16 = null; - if ((var15 & 2) == 2) { - var8 = var1.readUnsignedByteNeg(); - var16 = new int[var8]; - - for (var9 = 0; var9 < var8; ++var9) { - var10 = var1.readUnsignedShort(); - var10 = var10 == 65535 ? -1 : var10; - var16[var9] = var10; - } - } - - var17 = null; - if ((var15 & 4) == 4) { - var9 = 0; - if (var14.definition.recolorTo != null) { - var9 = var14.definition.recolorTo.length; - } - - var17 = new short[var9]; - - for (var10 = 0; var10 < var9; ++var10) { - var17[var10] = (short)var1.readUnsignedShort(); - } - } - - var18 = null; - if ((var15 & 8) == 8) { - var10 = 0; - if (var14.definition.retextureTo != null) { - var10 = var14.definition.retextureTo.length; - } - - var18 = new short[var10]; - - for (var24 = 0; var24 < var10; ++var24) { - var18[var24] = (short)var1.readUnsignedShortAdd(); - } - } - - var25 = false; - if ((var15 & 16) != 0) { - var25 = var1.readUnsignedByte() == 1; - } - - var19 = (long)(++NPC.field1069 - 1); - var14.method596(new NewShit(var19, var16, var17, var18, var25)); - } - } - - if ((var23 & 256) != 0) { - var15 = var1.readUnsignedByteSub(); - if ((var15 & 1) == 1) { - var14.method600(); - } else { - var16 = null; - if ((var15 & 2) == 2) { - var8 = var1.readUnsignedByteAdd(); - var16 = new int[var8]; - - for (var9 = 0; var9 < var8; ++var9) { - var10 = var1.readUnsignedShort(); - var10 = var10 == 65535 ? -1 : var10; - var16[var9] = var10; - } - } - - var17 = null; - if ((var15 & 4) == 4) { - var9 = 0; - if (var14.definition.recolorTo != null) { - var9 = var14.definition.recolorTo.length; - } - - var17 = new short[var9]; - - for (var10 = 0; var10 < var9; ++var10) { - var17[var10] = (short)var1.readUnsignedShortLE(); - } - } - - var18 = null; - if ((var15 & 8) == 8) { - var10 = 0; - if (var14.definition.retextureTo != null) { - var10 = var14.definition.retextureTo.length; - } - - var18 = new short[var10]; - - for (var24 = 0; var24 < var10; ++var24) { - var18[var24] = (short)var1.readUnsignedShortLE(); - } - } - - var25 = false; - if ((var15 & 16) != 0) { - var25 = var1.readUnsignedByteNeg() == 1; - } - - var19 = (long)(++NPC.field1068 - 1); - var14.method598(new NewShit(var19, var16, var17, var18, var25)); - } - } - - if ((var23 & 262144) != 0) { - var15 = var1.readIntME(); - var14.turnLeftSequence = (var15 & 1) != 0 ? var1.readUnsignedShortLE() : var14.definition.turnLeftSequence * -1164304999 * -740038999; - var14.turnRightSequence = (var15 & 2) != 0 ? var1.readUnsignedShort() : var14.definition.turnRightSequence * 618248039 * -858229673; - var14.walkSequence = (var15 & 4) != 0 ? var1.readUnsignedShort() : var14.definition.walkSequence * 1701863897 * -717353367; - var14.walkBackSequence = (var15 & 8) != 0 ? var1.readUnsignedShortLE() : var14.definition.walkBackSequence * 2045371335 * 551218679; - var14.walkLeftSequence = (var15 & 16) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.walkLeftSequence * -836382071 * 2076787641; - var14.walkRightSequence = (var15 & 32) != 0 ? var1.readUnsignedShortAdd() : var14.definition.walkRightSequence * 1238970345 * 724342873; - var14.runSequence = (var15 & 64) != 0 ? var1.readUnsignedShortAdd() : var14.definition.runSequence * 1872771113 * -1352211431; - var14.runBackSequence = (var15 & 128) != 0 ? var1.readUnsignedShort() : var14.definition.runBackSequence * -493138789 * -1789544045; - var14.runLeftSequence = (var15 & 256) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.runLeftSequence * 1890594435 * -1702883285; - var14.runRightSequence = (var15 & 512) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.runRightSequence * -879943903 * 12002529; - var14.crawlSequence = (var15 & 1024) != 0 ? var1.readUnsignedShortLE() : var14.definition.crawlSequence * 1478538629 * -1703871667; - var14.crawlBackSequence = (var15 & 2048) != 0 ? var1.readUnsignedShortLE() : var14.definition.crawlBackSequence * -1355856507 * 474737485; - var14.crawlLeftSequence = (var15 & 4096) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.crawlLeftSequence * 1944282437 * 904488333; - var14.crawlRightSequence = (var15 & 8192) != 0 ? var1.readUnsignedShortAdd() : var14.definition.crawlRightSequence * 881727523 * 1352095627; - var14.idleSequence = (var15 & 16384) != 0 ? var1.readUnsignedShortLE() : var14.definition.idleSequence * -1626376685 * 1344848923; - } - - if ((var23 & 131072) != 0) { - var15 = var1.readUnsignedByteNeg(); - - for (var7 = 0; var7 < var15; ++var7) { - var8 = var1.readUnsignedByteNeg(); - var9 = var1.readUnsignedShort(); - var10 = var1.readIntME(); - var14.updateSpotAnimation(var8, var9, var10 >> 16, var10 & 65535); - } - } - - if ((var23 & 32768) != 0) { - var14.field1013 = var1.readSignedByteSub(); - var14.field1007 = var1.readByteAdd(); - var14.field1011 = var1.readByte(); - var14.field1010 = var1.readByte(); - var14.spotAnimation = var1.readUnsignedShort() + Client.cycle; - var14.exactMoveArrive1Cycle = var1.readUnsignedShortLE() + Client.cycle; - var14.exactMoveDirection = var1.readUnsignedShortAdd(); - var14.pathLength = 1; - var14.field1018 = 0; - var14.field1013 += var14.pathX[0]; - var14.field1007 += var14.pathY[0]; - var14.field1011 += var14.pathX[0]; - var14.field1010 += var14.pathY[0]; - } - - if ((var23 & 2) != 0) { - var15 = var1.readUnsignedShortAddLE(); - var7 = var1.readUnsignedShortAddLE(); - var14.field958 = var1.readUnsignedByte() == 1; - if (Client.param25 >= 212) { - var14.field997 = var15; - var14.field992 = var7; - } else { - var8 = var14.x - (var15 - AbstractArchive.baseX - AbstractArchive.baseX) * 64; - var9 = var14.y - (var7 - class148.baseY - class148.baseY) * 64; - if (var8 != 0 || var9 != 0) { - var24 = (int)(Math.atan2((double)var8, (double)var9) * 325.94932345220167D) & 2047; - var14.movingOrientation = var24; - } - } - } - - if ((var23 & 4096) != 0) { - var14.recolourStartCycle = Client.cycle + var1.readUnsignedShortLE(); - var14.recolourEndCycle = Client.cycle + var1.readUnsignedShort(); - var14.recolourHue = var1.readByteAdd(); - var14.recolourSaturation = var1.readByte(); - var14.recolourLuminance = var1.readByteNeg(); - var14.recolourAmount = (byte)var1.readUnsignedByte(); - } - - if ((var23 & 16) != 0) { - var15 = var1.readUnsignedByte(); - if (var15 > 0) { - for (var7 = 0; var7 < var15; ++var7) { - var9 = -1; - var10 = -1; - var24 = -1; - var8 = var1.readUShortSmart(); - if (var8 == 32767) { - var8 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - var9 = var1.readUShortSmart(); - var24 = var1.readUShortSmart(); - } else if (var8 != 32766) { - var10 = var1.readUShortSmart(); - } else { - var8 = -1; - } - - var12 = var1.readUShortSmart(); - var14.addHitSplat(var8, var10, var9, var24, Client.cycle, var12); - } - } - - var7 = var1.readUnsignedByte(); - if (var7 > 0) { - for (var8 = 0; var8 < var7; ++var8) { - var9 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - if (var10 != 32767) { - var24 = var1.readUShortSmart(); - var12 = var1.readUnsignedByteSub(); - int var13 = var10 > 0 ? var1.readUnsignedByteSub() : var12; - var14.addHealthBar(var9, Client.cycle, var10, var24, var12, var13); - } else { - var14.removeHealthBar(var9); - } - } - } - } - - if ((var23 & 8192) != 0) { - var14.method584(var1.readUnsignedByteNeg()); - } - - if ((var23 & 16384) != 0) { - var14.combatLevelChange = var1.readIntLE(); - } - - if ((var23 & 65536) != 0) { - var15 = var1.readUnsignedByteAdd(); - var16 = new int[8]; - var17 = new short[8]; - - for (var9 = 0; var9 < 8; ++var9) { - if ((var15 & 1 << var9) != 0) { - var16[var9] = var1.method2543(); - var17[var9] = (short)var1.method2540(); - } else { - var16[var9] = -1; - var17[var9] = -1; - } - } - - var14.method594(var16, var17); - } - - if ((var23 & 2048) != 0) { - var14.method582(var1.readStringCp1252NullTerminated()); - } - - if ((var23 & 128) != 0) { - var14.overheadText = var1.readStringCp1252NullTerminated(); - var14.overheadTextCyclesRemaining = 100; - } - } - - for (var22 = 0; var22 < Client.field488; ++var22) { - var3 = Client.field558[var22]; - if (Client.npcs[var3].npcCycle != Client.cycle) { - Client.npcs[var3].definition = null; - Client.npcs[var3] = null; - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var22 = 0; var22 < Client.npcCount; ++var22) { - if (Client.npcs[Client.npcIndices[var22]] == null) { - throw new RuntimeException(var22 + "," + Client.npcCount); - } - } - - } - } -} diff --git a/osrs/src/main/java/class36.java b/osrs/src/main/java/class36.java index 22b8b4034..6ee2d3e52 100644 --- a/osrs/src/main/java/class36.java +++ b/osrs/src/main/java/class36.java @@ -2,93 +2,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bq") public class class36 { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Loc;" ) @Export("reflectionChecks") - static IterableNodeDeque reflectionChecks; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lmt;" - ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; - @ObfuscatedName("cq") - @Export("param9") - static String param9; - @ObfuscatedName("le") - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("mo") - @Export("Client_plane") - static int Client_plane; + public static IterableNodeDeque reflectionChecks; + @ObfuscatedName("aj") + @Export("userHomeDirectory") + static String userHomeDirectory; static { reflectionChecks = new IterableNodeDeque(); } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "475151817" - ) - static final int method173(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; - } - - @ObfuscatedName("lk") + @ObfuscatedName("lj") @ObfuscatedSignature( - descriptor = "([Lmt;IIIZS)V", - garbageValue = "-18913" + descriptor = "(IIIIIIIIB)V", + garbageValue = "16" ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { - Widget var6 = var0[var5]; - if (var6 != null && var6.parentId == var1) { - FriendSystem.alignWidgetSize(var6, var2, var3, var4); - class17.alignWidgetPosition(var6, var2, var3); - if (var6.scrollX > var6.scrollWidth - var6.width) { - var6.scrollX = var6.scrollWidth - var6.width; - } - - if (var6.scrollX < 0) { - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { - var6.scrollY = 0; - } + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (ModeWhere.loadInterface(var0)) { + class162.field1420 = null; + class135.drawInterface(PacketBufferNode.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (class162.field1420 != null) { + class135.drawInterface(class162.field1420, -1412584499, var1, var2, var3, var4, class134.field1294, class326.field2893, var7); + class162.field1420 = null; + } - if (var6.type == 0) { - SoundCache.revalidateWidgetScroll(var0, var6, var4); + } else { + if (var7 != -1) { + Client.field407[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { + Client.field407[var8] = true; } } - } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class365.java b/osrs/src/main/java/class365.java deleted file mode 100644 index 0fe2c8f4a..000000000 --- a/osrs/src/main/java/class365.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ow") -public class class365 { - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "113848151" - ) - public static int method1917(int var0) { - return class330.method1692(ViewportMouse.ViewportMouse_entityTags[var0]); - } -} diff --git a/osrs/src/main/java/class369.java b/osrs/src/main/java/class369.java new file mode 100644 index 000000000..c6621cd90 --- /dev/null +++ b/osrs/src/main/java/class369.java @@ -0,0 +1,231 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.HashMap; + +@ObfuscatedName("od") +public class class369 { + @ObfuscatedName("ck") + @Export("otp") + static String otp; + @ObfuscatedName("au") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lrb;" + ) + @Export("bounds") + Bounds bounds; + @ObfuscatedName("ao") + int[] field3590; + @ObfuscatedName("at") + int[] field3591; + @ObfuscatedName("ac") + int field3589; + + public class369() { + this.spriteMap = new HashMap(); + this.bounds = new Bounds(0, 0); + this.field3590 = new int[2048]; + this.field3591 = new int[2048]; + this.field3589 = 0; + ArchiveDiskActionHandler.method1884(); + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "915989256" + ) + void method1961(int var1) { + int var2 = var1 * 2 + 1; + double[] var3 = Clock.method930(0.0D, (double)((float)var1 / 3.0F), var1); + double var4 = var3[var1] * var3[var1]; + int[] var6 = new int[var2 * var2]; + boolean var7 = false; + + for (int var8 = 0; var8 < var2; ++var8) { + for (int var9 = 0; var9 < var2; ++var9) { + int var10 = var6[var9 + var8 * var2] = (int)(256.0D * (var3[var8] * var3[var9] / var4)); + if (!var7 && var10 > 0) { + var7 = true; + } + } + } + + SpritePixels var11 = new SpritePixels(var6, var2, var2); + this.spriteMap.put(var1, var11); + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IB)Lui;", + garbageValue = "63" + ) + SpritePixels method1962(int var1) { + if (!this.spriteMap.containsKey(var1)) { + this.method1961(var1); + } + + return (SpritePixels)this.spriteMap.get(var1); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1621400552" + ) + public final void method1963(int var1, int var2) { + if (this.field3589 < this.field3590.length) { + this.field3590[this.field3589] = var1; + this.field3591[this.field3589] = var2; + ++this.field3589; + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1492834453" + ) + public final void method1964() { + this.field3589 = 0; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IILui;FI)V", + garbageValue = "435818307" + ) + public final void method1965(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(var4 * 18.0F); + SpritePixels var6 = this.method1962(var5); + int var7 = var5 * 2 + 1; + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); + Bounds var9 = new Bounds(0, 0); + this.bounds.setHigh(var7, var7); + System.nanoTime(); + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field3589; ++var10) { + var11 = this.field3590[var10]; + var12 = this.field3591[var10]; + int var13 = (int)(var4 * (float)(var11 - var1)) - var5; + int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; + this.bounds.setLow(var13, var14); + this.bounds.method2285(var8, var9); + this.method1966(var6, var3, var9); + } + + System.nanoTime(); + System.nanoTime(); + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { + if (var3.pixels[var10] == 0) { + var3.pixels[var10] = -16777216; + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; + if (var11 <= 0) { + var3.pixels[var10] = -16777216; + } else { + if (var11 > ItemComposition.field1768.length) { + var11 = ItemComposition.field1768.length; + } + + var12 = ItemComposition.field1768[var11 - 1]; + var3.pixels[var10] = -16777216 | var12; + } + } + } + + System.nanoTime(); + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Lui;Lui;Lrb;I)V", + garbageValue = "-1016036720" + ) + void method1966(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { + int var4 = 0; + int var5 = 0; + if (var3.lowX == 0) { + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; + int var7 = var2.subWidth * var3.lowY + var3.lowX; + + for (int var8 = 0; var8 < var3.highY; ++var8) { + for (int var9 = 0; var9 < var3.highX; ++var9) { + int[] var10000 = var2.pixels; + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; + var7 += var2.subWidth - var3.highX; + } + + } + } + + @ObfuscatedName("mh") + @ObfuscatedSignature( + descriptor = "(Lmi;IIZI)V", + garbageValue = "1138527751" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; + int var5 = var0.height; + if (var0.widthAlignment == 0) { + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { + var0.width = var0.field3006 * var0.height / var0.field3011; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.width * var0.field3011 / var0.field3006; + } + + if (var0.contentType == 1337) { + Client.viewportWidget = var0; + } + + if (var0.type == 12) { + var0.method1844().method1736(var0.width, var0.height); + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var0; + var6.args = var0.onResize; + Client.scriptEvents.addFirst(var6); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class370.java b/osrs/src/main/java/class370.java index 80434d961..eea13349e 100644 --- a/osrs/src/main/java/class370.java +++ b/osrs/src/main/java/class370.java @@ -1,207 +1,291 @@ -import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oq") +@ObfuscatedName("og") public class class370 { - @ObfuscatedName("aw") - @Export("spriteMap") - final HashMap spriteMap; - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lrk;" + descriptor = "Log;" ) - @Export("bounds") - Bounds bounds; - @ObfuscatedName("ar") - int[] field3582; - @ObfuscatedName("am") - int[] field3581; - @ObfuscatedName("as") - int field3580; - - public class370() { - this.spriteMap = new HashMap(); - this.bounds = new Bounds(0, 0); - this.field3582 = new int[2048]; - this.field3581 = new int[2048]; - this.field3580 = 0; - ModelData0.field2255 = new int[2000]; - int var1 = 0; - int var2 = 240; - - int var4; - for (byte var3 = 12; var1 < 16; var2 -= var3) { - var4 = Archive.method1850((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)((float)var1 * 0.425F / 16.0F + 0.075F)); - ModelData0.field2255[var1] = var4; - ++var1; - } - - var2 = 48; - - for (int var6 = var2 / 6; var1 < ModelData0.field2255.length; var2 -= var6) { - var4 = var1 * 2; + static final class370 field3598; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Log;" + ) + static final class370 field3595; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Log;" + ) + static final class370 field3596; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Log;" + ) + static final class370 field3597; + @ObfuscatedName("br") + @Export("hasFocus") + protected static boolean hasFocus; - for (int var5 = Archive.method1850((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < ModelData0.field2255.length; ++var1) { - ModelData0.field2255[var1] = var5; - } - } + static { + field3598 = new class370(); + field3595 = new class370(); + field3596 = new class370(); + field3597 = new class370(); + } + class370() { } - @ObfuscatedName("aw") + @ObfuscatedName("kj") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-2133764143" ) - void method1930(int var1) { - int var2 = var1 * 2 + 1; - double var4 = (double)((float)var1 / 3.0F); - int var6 = var1 * 2 + 1; - double[] var7 = new double[var6]; - int var8 = -var1; - - for (int var9 = 0; var8 <= var1; ++var9) { - var7[var9] = class14.method47((double)var8, 0.0D, var4); - ++var8; - } + static final void method1968() { + class108.method621(false); + Client.field452 = 0; + boolean var0 = true; - double[] var14 = var7; - double var15 = var7[var1] * var7[var1]; - int[] var17 = new int[var2 * var2]; - boolean var10 = false; + int var1; + for (var1 = 0; var1 < UserComparator5.regionLandArchives.length; ++var1) { + if (class59.regionMapArchiveIds[var1] != -1 && UserComparator5.regionLandArchives[var1] == null) { + UserComparator5.regionLandArchives[var1] = class499.archive9.takeFile(class59.regionMapArchiveIds[var1], 0); + if (UserComparator5.regionLandArchives[var1] == null) { + var0 = false; + ++Client.field452; + } + } - for (int var11 = 0; var11 < var2; ++var11) { - for (int var12 = 0; var12 < var2; ++var12) { - int var13 = var17[var12 + var2 * var11] = (int)(256.0D * (var14[var12] * var14[var11] / var15)); - if (!var10 && var13 > 0) { - var10 = true; + if (ObjTypeCustomisation.regionLandArchiveIds[var1] != -1 && class197.regionMapArchives[var1] == null) { + class197.regionMapArchives[var1] = class499.archive9.takeFileEncrypted(ObjTypeCustomisation.regionLandArchiveIds[var1], 0, RunException.xteaKeys[var1]); + if (class197.regionMapArchives[var1] == null) { + var0 = false; + ++Client.field452; } } } - SpritePixels var18 = new SpritePixels(var17, var2, var2); - this.spriteMap.put(var1, var18); - } + if (!var0) { + Client.field456 = 1; + } else { + Client.field455 = 0; + var0 = true; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(II)Lud;", - garbageValue = "1395339509" - ) - SpritePixels method1931(int var1) { - if (!this.spriteMap.containsKey(var1)) { - this.method1930(var1); - } + int var3; + int var4; + for (var1 = 0; var1 < UserComparator5.regionLandArchives.length; ++var1) { + byte[] var2 = class197.regionMapArchives[var1]; + if (var2 != null) { + var3 = (class191.regions[var1] >> 8) * 64 - UrlRequester.baseX; + var4 = (class191.regions[var1] & 255) * 64 - class47.baseY; + if (Client.isInInstance) { + var3 = 10; + var4 = 10; + } - return (SpritePixels)this.spriteMap.get(var1); - } + var0 &= class142.method768(var2, var3, var4); + } + } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-205352827" - ) - public final void method1932(int var1, int var2) { - if (this.field3580 < this.field3582.length) { - this.field3582[this.field3580] = var1; - this.field3581[this.field3580] = var2; - ++this.field3580; - } - } + if (!var0) { + Client.field456 = 2; + } else { + if (Client.field456 != 0) { + FadeInTask.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1967755634" - ) - public final void method1933() { - this.field3580 = 0; - } + class301.method1622(); + class130.scene.clear(); - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(IILud;FI)V", - garbageValue = "-114256156" - ) - public final void method1934(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(var4 * 18.0F); - SpritePixels var6 = this.method1931(var5); - int var7 = var5 * 2 + 1; - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); - Bounds var9 = new Bounds(0, 0); - this.bounds.setHigh(var7, var7); - System.nanoTime(); - - int var10; - int var11; - int var12; - for (var10 = 0; var10 < this.field3580; ++var10) { - var11 = this.field3582[var10]; - var12 = this.field3581[var10]; - int var13 = (int)((float)(var11 - var1) * var4) - var5; - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; - this.bounds.setLow(var13, var14); - this.bounds.method2258(var8, var9); - this.method1935(var6, var3, var9); - } + for (var1 = 0; var1 < 4; ++var1) { + Client.collisionMaps[var1].clear(); + } - System.nanoTime(); - System.nanoTime(); + int var15; + for (var1 = 0; var1 < 4; ++var1) { + for (var15 = 0; var15 < 104; ++var15) { + for (var3 = 0; var3 < 104; ++var3) { + Tiles.Tiles_renderFlags[var1][var15][var3] = 0; + } + } + } - for (var10 = 0; var10 < var3.pixels.length; ++var10) { - if (var3.pixels[var10] == 0) { - var3.pixels[var10] = -16777216; - } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; - if (var11 <= 0) { - var3.pixels[var10] = -16777216; - } else { - if (var11 > ModelData0.field2255.length) { - var11 = ModelData0.field2255.length; + class301.method1622(); + Language.method1973(); + var1 = UserComparator5.regionLandArchives.length; + class388.method2029(); + class108.method621(true); + int var17; + if (!Client.isInInstance) { + byte[] var5; + for (var15 = 0; var15 < var1; ++var15) { + var3 = (class191.regions[var15] >> 8) * 64 - UrlRequester.baseX; + var4 = (class191.regions[var15] & 255) * 64 - class47.baseY; + var5 = UserComparator5.regionLandArchives[var15]; + if (var5 != null) { + class301.method1622(); + class261.method1500(var5, var3, var4, Tiles.timeOfPreviousKeyPress * 8 - 48, MouseRecorder.field873 * 8 - 48, Client.collisionMaps); + } + } + + for (var15 = 0; var15 < var1; ++var15) { + var3 = (class191.regions[var15] >> 8) * 64 - UrlRequester.baseX; + var4 = (class191.regions[var15] & 255) * 64 - class47.baseY; + var5 = UserComparator5.regionLandArchives[var15]; + if (var5 == null && MouseRecorder.field873 < 800) { + class301.method1622(); + class17.method49(var3, var4, 64, 64); + } } - var12 = ModelData0.field2255[var11 - 1]; - var3.pixels[var10] = -16777216 | var12; + class108.method621(true); + + for (var15 = 0; var15 < var1; ++var15) { + byte[] var16 = class197.regionMapArchives[var15]; + if (var16 != null) { + var4 = (class191.regions[var15] >> 8) * 64 - UrlRequester.baseX; + var17 = (class191.regions[var15] & 255) * 64 - class47.baseY; + class301.method1622(); + FriendsChat.method2206(var16, var4, var17, class130.scene, Client.collisionMaps); + } + } } - } - } - System.nanoTime(); - } + int var6; + int var7; + int var8; + if (Client.isInInstance) { + int var9; + int var10; + int var11; + for (var15 = 0; var15 < 4; ++var15) { + class301.method1622(); - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Lud;Lud;Lrk;S)V", - garbageValue = "-20246" - ) - void method1935(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { - int var4 = 0; - int var5 = 0; - if (var3.lowX == 0) { - var4 = var1.subWidth - var3.highX; - } + for (var3 = 0; var3 < 13; ++var3) { + for (var4 = 0; var4 < 13; ++var4) { + boolean var19 = false; + var6 = Client.instanceChunkTemplates[var15][var3][var4]; + if (var6 != -1) { + var7 = var6 >> 24 & 3; + var8 = var6 >> 1 & 3; + var9 = var6 >> 14 & 1023; + var10 = var6 >> 3 & 2047; + var11 = (var9 / 8 << 8) + var10 / 8; - if (var3.lowY == 0) { - var5 = var1.subHeight - var3.highY; - } + for (int var12 = 0; var12 < class191.regions.length; ++var12) { + if (class191.regions[var12] == var11 && UserComparator5.regionLandArchives[var12] != null) { + int var13 = (var9 - var3) * 8; + int var14 = (var10 - var4) * 8; + class132.method734(UserComparator5.regionLandArchives[var12], var15, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, var13, var14, Client.collisionMaps); + var19 = true; + break; + } + } + } + + if (!var19) { + class372.method1970(var15, var3 * 8, var4 * 8); + } + } + } + } + + for (var15 = 0; var15 < 13; ++var15) { + for (var3 = 0; var3 < 13; ++var3) { + var4 = Client.instanceChunkTemplates[0][var15][var3]; + if (var4 == -1) { + class17.method49(var15 * 8, var3 * 8, 8, 8); + } + } + } + + class108.method621(true); - int var6 = var4 + var5 * var1.subWidth; - int var7 = var3.lowX + var2.subWidth * var3.lowY; + for (var15 = 0; var15 < 4; ++var15) { + class301.method1622(); - for (int var8 = 0; var8 < var3.highY; ++var8) { - for (int var9 = 0; var9 < var3.highX; ++var9) { - int[] var10000 = var2.pixels; - int var10001 = var7++; - var10000[var10001] += var1.pixels[var6++]; + for (var3 = 0; var3 < 13; ++var3) { + for (var4 = 0; var4 < 13; ++var4) { + var17 = Client.instanceChunkTemplates[var15][var3][var4]; + if (var17 != -1) { + var6 = var17 >> 24 & 3; + var7 = var17 >> 1 & 3; + var8 = var17 >> 14 & 1023; + var9 = var17 >> 3 & 2047; + var10 = (var8 / 8 << 8) + var9 / 8; + + for (var11 = 0; var11 < class191.regions.length; ++var11) { + if (class191.regions[var11] == var10 && class197.regionMapArchives[var11] != null) { + Tiles.method459(class197.regionMapArchives[var11], var15, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, class130.scene, Client.collisionMaps); + break; + } + } + } + } + } + } } - var6 += var1.subWidth - var3.highX; - var7 += var2.subWidth - var3.highX; - } + class108.method621(true); + class301.method1622(); + class129.method717(class130.scene, Client.collisionMaps); + class108.method621(true); + var15 = Tiles.Tiles_minPlane; + if (var15 > HealthBar.Client_plane) { + var15 = HealthBar.Client_plane; + } + + if (var15 < HealthBar.Client_plane - 1) { + var15 = HealthBar.Client_plane - 1; + } + if (Client.isLowDetail) { + class130.scene.init(Tiles.Tiles_minPlane); + } else { + class130.scene.init(0); + } + + for (var3 = 0; var3 < 104; ++var3) { + for (var4 = 0; var4 < 104; ++var4) { + class135.updateItemPile(var3, var4); + } + } + + class301.method1622(); + class165.method869(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + PacketBufferNode var18; + if (class219.client.hasFrame()) { + var18 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.DETECT_MODIFIED_CLIENT, Client.packetWriter.isaacCipher); + var18.packetBuffer.writeInt(1057001181); + Client.packetWriter.addNode(var18); + } + + if (!Client.isInInstance) { + var3 = (Tiles.timeOfPreviousKeyPress - 6) / 8; + var4 = (Tiles.timeOfPreviousKeyPress + 6) / 8; + var17 = (MouseRecorder.field873 - 6) / 8; + var6 = (MouseRecorder.field873 + 6) / 8; + + for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { + for (var8 = var17 - 1; var8 <= var6 + 1; ++var8) { + if (var7 < var3 || var7 > var4 || var8 < var17 || var8 > var6) { + class499.archive9.loadRegionFromName("m" + var7 + "_" + var8); + class499.archive9.loadRegionFromName("l" + var7 + "_" + var8); + } + } + } + } + + MusicSong.updateGameState(30); + class301.method1622(); + ObjectSound.method414(); + var18 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.MAP_BUILD_COMPLETE, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var18); + PacketWriter.method645(); + } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class371.java b/osrs/src/main/java/class371.java index 6eddc8407..7bc13ad0a 100644 --- a/osrs/src/main/java/class371.java +++ b/osrs/src/main/java/class371.java @@ -2,58 +2,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oe") -public class class371 { - @ObfuscatedName("aw") +@ObfuscatedName("ob") +public interface class371 { + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "(B)I", + garbageValue = "41" ) - static final class371 field3587; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Loe;" - ) - static final class371 field3588; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Loe;" - ) - static final class371 field3586; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Loe;" - ) - static final class371 field3585; - - static { - field3587 = new class371(); - field3588 = new class371(); - field3586 = new class371(); - field3585 = new class371(); - } - - class371() { - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Lhm;", - garbageValue = "238508398" - ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); - var1 = new EnumComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); - return var1; - } - } -} + @Export("rsOrdinal") + int rsOrdinal(); +} \ No newline at end of file diff --git a/osrs/src/main/java/class372.java b/osrs/src/main/java/class372.java index ebe681c04..ced4177a7 100644 --- a/osrs/src/main/java/class372.java +++ b/osrs/src/main/java/class372.java @@ -2,13 +2,195 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("os") -public interface class372 { - @ObfuscatedName("ay") +import java.util.HashMap; + +@ObfuscatedName("ok") +public class class372 { + @ObfuscatedName("wr") + @Export("foundItemIndex") + static int foundItemIndex; + + static { + new HashMap(); + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1337034941" + ) + static final void method1970(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { + for (int var4 = 0; var4 < 8; ++var4) { + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } + } + + if (var1 > 0) { + for (var3 = 1; var3 < 8; ++var3) { + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; + } + } + + if (var2 > 0) { + for (var3 = 1; var3 < 8; ++var3) { + Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; + } + } + + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; + } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; + } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + + } + + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(ILdh;ZB)I", + garbageValue = "-1" ) - @Export("rsOrdinal") - int rsOrdinal(); -} + static int method1971(int var0, Script var1, boolean var2) { + if (var0 == 3300) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.cycle; + return 1; + } else { + int var3; + int var4; + if (var0 == 3301) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class209.method1087(var3, var4); + return 1; + } else if (var0 == 3302) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = DynamicObject.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == 3303) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class212.method1099(var3, var4); + return 1; + } else if (var0 == 3304) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = AbstractArchive.getInvDefinition(var3).size; + return 1; + } else if (var0 == 3305) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } else if (var0 == 3306) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } else if (var0 == 3307) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; + } else { + int var5; + if (var0 == 3308) { + var3 = HealthBar.Client_plane; + var4 = (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX; + var5 = (VarbitComposition.localPlayer.y >> 7) + class47.baseY; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } else if (var0 == 3309) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } else if (var0 == 3310) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } else if (var0 == 3311) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } else if (var0 == 3312) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } else if (var0 == 3313) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class209.method1087(var3, var4); + return 1; + } else if (var0 == 3314) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = DynamicObject.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == 3315) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class212.method1099(var3, var4); + return 1; + } else if (var0 == 3316) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3317) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } else if (var0 == 3318) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } else if (var0 == 3321) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.runEnergy / 100; + return 1; + } else if (var0 == 3322) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.weight; + return 1; + } else if (var0 == 3323) { + if (Client.playerMod) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3324) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } else if (var0 == 3325) { + SoundCache.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == 3326) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.lastMouseRecordX; + return 1; + } else if (var0 == 3327) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.lastMouseRecordY; + return 1; + } else if (var0 == 3331) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; + } else { + return 2; + } + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class373.java b/osrs/src/main/java/class373.java deleted file mode 100644 index fe9793562..000000000 --- a/osrs/src/main/java/class373.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.HashMap; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("oi") -public class class373 { - @ObfuscatedName("aj") - @Export("PcmPlayer_stereo") - public static boolean PcmPlayer_stereo; - - static { - new HashMap(); - } -} diff --git a/osrs/src/main/java/class383.java b/osrs/src/main/java/class383.java new file mode 100644 index 000000000..be67d8647 --- /dev/null +++ b/osrs/src/main/java/class383.java @@ -0,0 +1,24 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oi") +public final class class383 { + @ObfuscatedName("oc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1663230842" + ) + static void method2021() { + if (class390.field3656 != null) { + Client.field369 = Client.cycle; + class390.field3656.method1964(); + + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { + class390.field3656.method1963((Client.players[var0].x >> 7) + UrlRequester.baseX, (Client.players[var0].y >> 7) + class47.baseY); + } + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class384.java b/osrs/src/main/java/class384.java index ba380c96a..c04505e0f 100644 --- a/osrs/src/main/java/class384.java +++ b/osrs/src/main/java/class384.java @@ -1,9 +1,41 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oh") -public final class class384 { - @ObfuscatedName("ki") - @Export("cameraY") - static int cameraY; -} +@ObfuscatedName("oq") +public class class384 { + @ObfuscatedName("au") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; + + static { + cp1252AsciiExtension = new char[]{'\u20ac', '\u0000', '\u201a', '\u0192', '\u201e', '\u2026', '\u2020', '\u2021', '\u02c6', '\u2030', '\u0160', '\u2039', '\u0152', '\u0000', '\u017d', '\u0000', '\u0000', '\u2018', '\u2019', '\u201c', '\u201d', '\u2022', '\u2013', '\u2014', '\u02dc', '\u2122', '\u0161', '\u203a', '\u0153', '\u0000', '\u017e', '\u0178'}; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(II)Lhb;", + garbageValue = "1314651935" + ) + public static VarbitComposition method2022(int var0) { + VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); + var1 = new VarbitComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); + return var1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class385.java b/osrs/src/main/java/class385.java index 0e84fc22e..82db62e12 100644 --- a/osrs/src/main/java/class385.java +++ b/osrs/src/main/java/class385.java @@ -2,130 +2,142 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oy") +@ObfuscatedName("ov") public class class385 { - @ObfuscatedName("aw") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; + @ObfuscatedName("au") + static char[] field3649; + @ObfuscatedName("ae") + static char[] field3647; + @ObfuscatedName("ao") + static char[] field3648; + @ObfuscatedName("at") + static int[] field3650; + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + @Export("archive6") + static Archive archive6; static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'Æ’', '„', '…', '†', '‡', 'ˆ', '‰', 'Å ', '‹', 'Å’', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', 'â€', '•', '–', '—', 'Ëœ', 'â„¢', 'Å¡', '›', 'Å“', '\u0000', 'ž', 'Ÿ'}; + field3649 = new char[64]; + + int var0; + for (var0 = 0; var0 < 26; ++var0) { + field3649[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3649[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3649[var0] = (char)(var0 + 48 - 52); + } + + field3649[62] = '+'; + field3649[63] = '/'; + field3647 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3647[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3647[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3647[var0] = (char)(var0 + 48 - 52); + } + + field3647[62] = '*'; + field3647[63] = '-'; + field3648 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3648[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3648[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3648[var0] = (char)(var0 + 48 - 52); + } + + field3648[62] = '-'; + field3648[63] = '_'; + field3650 = new int[128]; + + for (var0 = 0; var0 < field3650.length; ++var0) { + field3650[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { + field3650[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { + field3650[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { + field3650[var0] = var0 - 48 + 52; + } + + int[] var2 = field3650; + field3650[43] = 62; + var2[42] = 62; + int[] var1 = field3650; + field3650[47] = 63; + var1[45] = 63; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "1294395846" + ) + public static String method2023(CharSequence var0) { + String var1 = class211.base37DecodeLong(class134.method739(var0)); + if (var1 == null) { + var1 = ""; + } + + return var1; } - @ObfuscatedName("jj") + @ObfuscatedName("lg") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "1321400505" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", + garbageValue = "12" ) - static final void method1984(int var0, int var1, boolean var2) { - if (!var2 || var0 != class309.timeOfPreviousKeyPress || class140.field1314 != var1) { - class309.timeOfPreviousKeyPress = var0; - class140.field1314 = var1; - class129.updateGameState(25); - Actor.drawLoadingMessage("Loading - please wait.", true); - int var3 = AbstractArchive.baseX; - int var4 = class148.baseY; - AbstractArchive.baseX = (var0 - 6) * 8; - class148.baseY = (var1 - 6) * 8; - int var5 = AbstractArchive.baseX - var3; - int var6 = class148.baseY - var4; - var3 = AbstractArchive.baseX; - var4 = class148.baseY; - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 65536; ++var7) { - NPC var8 = Client.npcs[var7]; - if (var8 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var8.pathX; - var10000[var9] -= var5; - var10000 = var8.pathY; - var10000[var9] -= var6; - } - - var8.x -= var5 * 128; - var8.y -= var6 * 128; - } - } - - for (var7 = 0; var7 < 2048; ++var7) { - Player var21 = Client.players[var7]; - if (var21 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var21.pathX; - var10000[var9] -= var5; - var10000 = var21.pathY; - var10000[var9] -= var6; - } - - var21.x -= var5 * 128; - var21.y -= var6 * 128; - } - } - - byte var20 = 0; - byte var18 = 104; - byte var22 = 1; - if (var5 < 0) { - var20 = 103; - var18 = -1; - var22 = -1; - } - - byte var10 = 0; - byte var11 = 104; - byte var12 = 1; - if (var6 < 0) { - var10 = 103; - var11 = -1; - var12 = -1; - } - - int var14; - for (int var13 = var20; var18 != var13; var13 += var22) { - for (var14 = var10; var11 != var14; var14 += var12) { - int var15 = var5 + var13; - int var16 = var6 + var14; - - for (int var17 = 0; var17 < 4; ++var17) { - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; - } else { - Client.groundItems[var17][var13][var14] = null; - } - } - } - } - - for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { - var19.x -= var5; - var19.y -= var6; - if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { - var19.remove(); - } - } - - if (Client.destinationX != 0) { - Client.destinationX -= var5; - Client.destinationY -= var6; - } - - Client.soundEffectCount = 0; - Client.isCameraLocked = false; - class157.cameraX -= var5 << 7; - SoundSystem.cameraZ -= var6 << 7; - class467.oculusOrbFocalPointX -= var5 << 7; - class36.oculusOrbFocalPointY -= var6 << 7; - Client.field535 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + UserComparator8.insertMenuItem(var0, var1, var2, var3, var4, var5, -1, false); + } + @ObfuscatedName("mw") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "189486485" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (ModeWhere.loadInterface(var0)) { + class212.runComponentCloseListeners(PacketBufferNode.Widget_interfaceComponents[var0], var1); } } -} + + @ObfuscatedName("nl") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-85" + ) + static final void method2026(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); + class449.clientPreferences.setCurrentSoundEffectVolume(var0); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class386.java b/osrs/src/main/java/class386.java index 4bfd1627f..f201378ff 100644 --- a/osrs/src/main/java/class386.java +++ b/osrs/src/main/java/class386.java @@ -1,99 +1,33 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oo") -public class class386 { - @ObfuscatedName("aw") - static char[] field3638; - @ObfuscatedName("ay") - static char[] field3639; - @ObfuscatedName("ar") - static char[] field3637; - @ObfuscatedName("am") - static int[] field3641; - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("gk") - static int field3640; - - static { - field3638 = new char[64]; - - int var0; - for (var0 = 0; var0 < 26; ++var0) { - field3638[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3638[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3638[var0] = (char)(var0 + 48 - 52); - } - - field3638[62] = '+'; - field3638[63] = '/'; - field3639 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3639[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3639[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3639[var0] = (char)(var0 + 48 - 52); - } +import java.util.regex.Pattern; - field3639[62] = '*'; - field3639[63] = '-'; - field3637 = new char[64]; - for (var0 = 0; var0 < 26; ++var0) { - field3637[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3637[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3637[var0] = (char)(var0 + 48 - 52); - } - - field3637[62] = '-'; - field3637[63] = '_'; - field3641 = new int[128]; - - for (var0 = 0; var0 < field3641.length; ++var0) { - field3641[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { - field3641[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { - field3641[var0] = var0 - 97 + 26; - } +@ObfuscatedName("op") +public final class class386 { + static { + Pattern.compile("^\\D*(\\d+)\\D*$"); + } - for (var0 = 48; var0 <= 57; ++var0) { - field3641[var0] = var0 - 48 + 52; + @ObfuscatedName("no") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "289831668" + ) + static final void method2027(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method859()) { + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + if (var2.rank == -1) { + PacketBufferNode var3 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(3 + AbstractSocket.stringCp1252NullTerminatedByteSize(var2.username.getName())); + var3.packetBuffer.writeByte(var0); + var3.packetBuffer.writeShort(var1); + var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); + Client.packetWriter.addNode(var3); + } + } } - - int[] var2 = field3641; - field3641[43] = 62; - var2[42] = 62; - int[] var1 = field3641; - field3641[47] = 63; - var1[45] = 63; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class387.java b/osrs/src/main/java/class387.java index d3bea8d68..6c99c84c6 100644 --- a/osrs/src/main/java/class387.java +++ b/osrs/src/main/java/class387.java @@ -2,30 +2,158 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("op") -public final class class387 { - @ObfuscatedName("ay") +@ObfuscatedName("or") +public class class387 { + @ObfuscatedName("gw") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lrr;" ) - public static AbstractArchive field3643; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "[Lcr;" - ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("ah") - static int field3645; - @ObfuscatedName("js") - static int ZONE_Y; - - @ObfuscatedName("bg") + static GraphicsDefaults field3652; + + @ObfuscatedName("ha") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)I", - garbageValue = "19345" + descriptor = "(IB)V", + garbageValue = "0" ) - public static int method1985(String var0) { - return var0.length() + 2; + @Export("getLoginError") + static void getLoginError(int var0) { + int var1 = class466.method2350(); + if (var0 == -3) { + class318.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { + class318.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { + class318.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { + PcmPlayer.method212(3); + Login.field751 = 1; + } else if (var0 == 4) { + PcmPlayer.method212(14); + Login.field750 = 0; + } else if (var0 == 5) { + Login.field751 = 2; + class318.setLoginResponseString("Either your account is still logged in, or the last", "world you were using has become unavailable.", "Please try again later."); + } else if (var0 == 68) { + if (!Client.reloadJS5) { + Client.reloadJS5 = true; + class415.reloadJS5(); + return; + } + + class318.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (!Client.onMobile && var0 == 6) { + class318.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (var0 == 7) { + class318.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { + class318.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { + class318.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { + class318.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { + class318.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { + class318.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { + class318.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { + class318.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { + class318.setLoginResponseString("Too many login attempts.", "You can use the Jagex Launcher to continue playing.", "Press the button below to download it now."); + PcmPlayer.method212(33); + } else if (var0 == 17) { + class318.setLoginResponseString("To access this free world, log into a", "members world and move your character", "to a non-members area."); + } else if (var0 == 18) { + PcmPlayer.method212(14); + Login.field750 = 1; + } else if (var0 == 19) { + class318.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { + class318.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { + class318.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { + class318.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { + class318.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { + class318.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + class318.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { + class318.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + class318.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); + } else if (var0 == 32) { + PcmPlayer.method212(14); + Login.field750 = 2; + } else if (var0 == 37) { + class318.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { + class318.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { + PcmPlayer.method212(8); + } else { + if (var0 == 56) { + class318.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + MusicSong.updateGameState(11); + return; + } + + if (var0 == 57) { + class318.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + MusicSong.updateGameState(11); + return; + } + + if (var0 == 61) { + class318.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); + PcmPlayer.method212(7); + } else { + if (var0 == 62) { + MusicSong.updateGameState(10); + PcmPlayer.method212(9); + class318.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); + return; + } + + if (var0 == 63) { + MusicSong.updateGameState(10); + PcmPlayer.method212(9); + class318.setLoginResponseString("You were signed out.", "Please sign in again.", ""); + return; + } + + if (var0 == 65 || var0 == 67) { + MusicSong.updateGameState(10); + PcmPlayer.method212(9); + class318.setLoginResponseString("Failed to login.", "Please try again.", ""); + return; + } + + if (var0 == 71) { + MusicSong.updateGameState(10); + PcmPlayer.method212(7); + class318.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); + } else if (var0 == 73) { + MusicSong.updateGameState(10); + PcmPlayer.method212(6); + class318.setLoginResponseString("Your date of birth information is waiting", "to be reviewed by our staff.", "It will be processed shortly."); + } else if (var0 == 72) { + MusicSong.updateGameState(10); + PcmPlayer.method212(32); + } else { + class318.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); + } + } + } + + MusicSong.updateGameState(10); + boolean var2 = var1 != class466.method2350(); + if (!var2 && Client.field648.method2616()) { + PcmPlayer.method212(9); + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class388.java b/osrs/src/main/java/class388.java new file mode 100644 index 000000000..f32f6f6f7 --- /dev/null +++ b/osrs/src/main/java/class388.java @@ -0,0 +1,48 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oo") +public final class class388 { + @ObfuscatedName("au") + @Export("base37Table") + public static final char[] base37Table; + @ObfuscatedName("ae") + static long[] field3654; + @ObfuscatedName("fk") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + static Archive field3655; + + static { + base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; + field3654 = new long[12]; + + for (int var0 = 0; var0 < field3654.length; ++var0) { + field3654[var0] = (long)Math.pow(37.0D, (double)var0); + } + + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-27" + ) + static void method2029() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.stream1 != null) { + class162.pcmStreamMixer.removeSubStream(var0.stream1); + var0.stream1 = null; + } + + if (var0.stream2 != null) { + class162.pcmStreamMixer.removeSubStream(var0.stream2); + var0.stream2 = null; + } + } + + ObjectSound.objectSounds.clear(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class389.java b/osrs/src/main/java/class389.java deleted file mode 100644 index 7eecbcf44..000000000 --- a/osrs/src/main/java/class389.java +++ /dev/null @@ -1,118 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("oa") -public final class class389 { - @ObfuscatedName("aw") - @Export("base37Table") - public static final char[] base37Table; - @ObfuscatedName("ay") - static long[] field3649; - @ObfuscatedName("jt") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - - static { - base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; - field3649 = new long[12]; - - for (int var0 = 0; var0 < field3649.length; ++var0) { - field3649[var0] = (long)Math.pow(37.0D, (double)var0); - } - - } - - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "(Ldx;I)V", - garbageValue = "-811988232" - ) - static final void method1986(Actor var0) { - int var2; - int var3; - int var4; - int var6; - if (var0.targetIndex != -1) { - Object var1 = null; - var2 = 65536; - if (var0.targetIndex < var2) { - var1 = Client.npcs[var0.targetIndex]; - } else { - var1 = Client.players[var0.targetIndex - var2]; - } - - if (var1 != null) { - var3 = var0.x - ((Actor)var1).x; - var4 = var0.y - ((Actor)var1).y; - if (var3 != 0 || var4 != 0) { - var6 = (int)(Math.atan2((double)var3, (double)var4) * 325.94932345220167D) & 2047; - var0.orientation = var6; - } - } else if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - } - - int var7; - if (var0.pathLength == 0 || var0.field1020 > 0) { - var7 = -1; - if (var0.field997 != -1 && var0.field992 != -1) { - var2 = var0.field997 * 128 - AbstractArchive.baseX * 128 + 64; - var3 = var0.field992 * 128 - class148.baseY * 128 + 64; - var4 = var0.x - var2; - int var8 = var0.y - var3; - if (var4 != 0 || var8 != 0) { - var6 = (int)(Math.atan2((double)var4, (double)var8) * 325.94932345220167D) & 2047; - var7 = var6; - } - } else if (var0.movingOrientation != -1) { - var7 = var0.movingOrientation; - } - - if (var7 != -1) { - var0.orientation = var7; - if (var0.field958) { - var0.rotation = var0.orientation; - } - } - - var0.method526(); - } - - var7 = var0.orientation - var0.rotation & 2047; - if (var7 != 0) { - boolean var10 = true; - boolean var11 = true; - ++var0.field1016; - var4 = var7 > 1024 ? -1 : 1; - var0.rotation += var4 * var0.field1005; - boolean var12 = true; - if (var7 < var0.field1005 || var7 > 2048 - var0.field1005) { - var0.rotation = var0.orientation; - var12 = false; - } - - if (var0.field1005 > 0 && var0.idleSequence == var0.movementSequence && (var0.field1016 > 25 || var12)) { - if (var4 == -1 && var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else if (var4 == 1 && var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - - var0.rotation &= 2047; - } else { - if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - var0.field1016 = 0; - } - - } -} diff --git a/osrs/src/main/java/class390.java b/osrs/src/main/java/class390.java index a1f9aa040..d4b2a5968 100644 --- a/osrs/src/main/java/class390.java +++ b/osrs/src/main/java/class390.java @@ -1,33 +1,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pl") -public class class390 extends RuntimeException { - public class390(String var1, Object[] var2) { - super(String.format(var1, var2)); - } - - @ObfuscatedName("ml") +@ObfuscatedName("ps") +public final class class390 { + @ObfuscatedName("wq") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-79" + descriptor = "Lod;" ) - static final void method1987() { - PacketBufferNode var0 = class503.getPacketBufferNode(ClientPacket.CLOSE_MODAL, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var0); - Interpreter.field699 = true; + public static class369 field3656; + @ObfuscatedName("au") + final Object field3658; + @ObfuscatedName("ae") + int field3657; - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { - if (var1.type == 0 || var1.type == 3) { - Actor.closeInterface(var1, true); - } - } + class390(Object var1, int var2) { + this.field3658 = var1; + this.field3657 = var2; + } - if (Client.meslayerContinueWidget != null) { - class200.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(Lmi;I)I", + garbageValue = "-490718469" + ) + static int method2030(Widget var0) { + if (var0.type != 11) { + Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize - 1] = ""; + return 1; + } else { + String var1 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var0.method1836(var1); + return 1; } - - Interpreter.field699 = false; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class391.java b/osrs/src/main/java/class391.java index 3369a4178..872a63645 100644 --- a/osrs/src/main/java/class391.java +++ b/osrs/src/main/java/class391.java @@ -1,14 +1,55 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pa") -public final class class391 { - @ObfuscatedName("aw") - final Object field3651; - @ObfuscatedName("ay") - int field3650; +import java.util.ConcurrentModificationException; +import java.util.Iterator; +import java.util.NoSuchElementException; - class391(Object var1, int var2) { - this.field3651 = var1; - this.field3650 = var2; +@ObfuscatedName("pr") +public class class391 implements Iterator { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lpa;" + ) + class392 field3661; + @ObfuscatedName("ae") + int field3659; + @ObfuscatedName("ao") + int field3660; + + @ObfuscatedSignature( + descriptor = "(Lpa;)V" + ) + class391(class392 var1) { + this.field3659 = 0; + this.field3660 = this.field3661.field3663; + this.field3661 = var1; + } + + @Export("hasNext") + @ObfuscatedName("hasNext") + public boolean hasNext() { + return this.field3659 < this.field3661.field3664; + } + + @Export("next") + @ObfuscatedName("next") + public Object next() { + if (this.field3661.field3663 != this.field3660) { + throw new ConcurrentModificationException(); + } else if (this.field3659 < this.field3661.field3664) { + Object var1 = this.field3661.field3666[this.field3659].field3658; + ++this.field3659; + return var1; + } else { + throw new NoSuchElementException(); + } + } + + @Export("remove") + @ObfuscatedName("remove") + public void remove() { + throw new UnsupportedOperationException(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class392.java b/osrs/src/main/java/class392.java index bba416a5f..c08179fe1 100644 --- a/osrs/src/main/java/class392.java +++ b/osrs/src/main/java/class392.java @@ -1,54 +1,229 @@ -import java.util.ConcurrentModificationException; -import java.util.Iterator; -import java.util.NoSuchElementException; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pg") -public class class392 implements Iterator { - @ObfuscatedName("aw") +import java.util.*; + +@ObfuscatedName("pa") +public class class392 extends AbstractQueue { + @ObfuscatedName("wh") + @ObfuscatedSignature( + descriptor = "Lno;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "[Lps;" ) - class393 field3654; - @ObfuscatedName("ay") - int field3653; - @ObfuscatedName("ar") - int field3652; + class390[] field3666; + @ObfuscatedName("ae") + Map field3665; + @ObfuscatedName("ao") + int field3664; + @ObfuscatedName("at") + final Comparator field3667; + @ObfuscatedName("ac") + int field3663; + + public class392(int var1, Comparator var2) { + this.field3663 = 0; + this.field3666 = new class390[var1]; + this.field3665 = new HashMap(); + this.field3667 = var2; + } + + public class392(int var1) { + this(var1, (Comparator)null); + } + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(B)V", + garbageValue = "0" ) - class392(class393 var1) { - this.field3653 = 0; - this.field3652 = this.field3654.field3656; - this.field3654 = var1; - } - - @Export("hasNext") - @ObfuscatedName("hasNext") - public boolean hasNext() { - return this.field3653 < this.field3654.field3655; - } - - @Export("next") - @ObfuscatedName("next") - public Object next() { - if (this.field3654.field3656 != this.field3652) { - throw new ConcurrentModificationException(); - } else if (this.field3653 < this.field3654.field3655) { - Object var1 = this.field3654.field3658[this.field3653].field3651; - ++this.field3653; - return var1; - } else { - throw new NoSuchElementException(); + void method2031() { + int var1 = (this.field3666.length << 1) + 1; + this.field3666 = (class390[])((class390[])Arrays.copyOf(this.field3666, var1)); + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-119" + ) + void method2032(int var1) { + class390 var2; + int var3; + for (var2 = this.field3666[var1]; var1 > 0; var1 = var3) { + var3 = var1 - 1 >>> 1; + class390 var4 = this.field3666[var3]; + if (this.field3667 != null) { + if (this.field3667.compare(var2.field3658, var4.field3658) >= 0) { + break; + } + } else if (((Comparable)var2.field3658).compareTo(var4.field3658) >= 0) { + break; + } + + this.field3666[var1] = var4; + this.field3666[var1].field3657 = var1; } + + this.field3666[var1] = var2; + this.field3666[var1].field3657 = var1; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-466589419" + ) + void method2033(int var1) { + class390 var2 = this.field3666[var1]; + + int var8; + for (int var3 = this.field3664 >>> 1; var1 < var3; var1 = var8) { + int var4 = (var1 << 1) + 1; + class390 var5 = this.field3666[var4]; + int var6 = (var1 << 1) + 2; + class390 var7 = this.field3666[var6]; + if (this.field3667 != null) { + if (var6 < this.field3664 && this.field3667.compare(var5.field3658, var7.field3658) > 0) { + var8 = var6; + } else { + var8 = var4; + } + } else if (var6 < this.field3664 && ((Comparable)var5.field3658).compareTo(var7.field3658) > 0) { + var8 = var6; + } else { + var8 = var4; + } + + if (this.field3667 != null) { + if (this.field3667.compare(var2.field3658, this.field3666[var8].field3658) <= 0) { + break; + } + } else if (((Comparable)var2.field3658).compareTo(this.field3666[var8].field3658) <= 0) { + break; + } + + this.field3666[var1] = this.field3666[var8]; + this.field3666[var1].field3657 = var1; + } + + this.field3666[var1] = var2; + this.field3666[var1].field3657 = var1; } @Export("remove") @ObfuscatedName("remove") - public void remove() { - throw new UnsupportedOperationException(); + public boolean remove(Object var1) { + class390 var2 = (class390)this.field3665.remove(var1); + if (var2 == null) { + return false; + } else { + ++this.field3663; + --this.field3664; + if (this.field3664 == var2.field3657) { + this.field3666[this.field3664] = null; + return true; + } else { + class390 var3 = this.field3666[this.field3664]; + this.field3666[this.field3664] = null; + this.field3666[var2.field3657] = var3; + this.field3666[var2.field3657].field3657 = var2.field3657; + this.method2033(var2.field3657); + if (var3 == this.field3666[var2.field3657]) { + this.method2032(var2.field3657); + } + + return true; + } + } + } + + @Export("peek") + @ObfuscatedName("peek") + public Object peek() { + return this.field3664 == 0 ? null : this.field3666[0].field3658; + } + + @Export("size") + @ObfuscatedName("size") + public int size() { + return this.field3664; + } + + public boolean offer(Object var1) { + if (this.field3665.containsKey(var1)) { + throw new IllegalArgumentException(""); + } else { + ++this.field3663; + int var2 = this.field3664; + if (var2 >= this.field3666.length) { + this.method2031(); + } + + ++this.field3664; + if (var2 == 0) { + this.field3666[0] = new class390(var1, 0); + this.field3665.put(var1, this.field3666[0]); + } else { + this.field3666[var2] = new class390(var1, var2); + this.field3665.put(var1, this.field3666[var2]); + this.method2032(var2); + } + + return true; + } + } + + @Export("poll") + @ObfuscatedName("poll") + public Object poll() { + if (this.field3664 == 0) { + return null; + } else { + ++this.field3663; + Object var1 = this.field3666[0].field3658; + this.field3665.remove(var1); + --this.field3664; + if (this.field3664 == 0) { + this.field3666[this.field3664] = null; + } else { + this.field3666[0] = this.field3666[this.field3664]; + this.field3666[0].field3657 = 0; + this.field3666[this.field3664] = null; + this.method2033(0); + } + + return var1; + } + } + + @Export("contains") + @ObfuscatedName("contains") + public boolean contains(Object var1) { + return this.field3665.containsKey(var1); + } + + @Export("toArray") + @ObfuscatedName("toArray") + public Object[] toArray() { + Object[] var1 = super.toArray(); + if (this.field3667 != null) { + Arrays.sort(var1, this.field3667); + } else { + Arrays.sort(var1); + } + + return var1; + } + + @Export("iterator") + @ObfuscatedName("iterator") + public Iterator iterator() { + return new class391(this); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class393.java b/osrs/src/main/java/class393.java deleted file mode 100644 index 3eda262fe..000000000 --- a/osrs/src/main/java/class393.java +++ /dev/null @@ -1,273 +0,0 @@ -import java.util.AbstractQueue; -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pd") -public class class393 extends AbstractQueue { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "[Lpa;" - ) - class391[] field3658; - @ObfuscatedName("ay") - Map field3657; - @ObfuscatedName("ar") - int field3655; - @ObfuscatedName("am") - final Comparator field3659; - @ObfuscatedName("as") - int field3656; - - public class393(int var1, Comparator var2) { - this.field3656 = 0; - this.field3658 = new class391[var1]; - this.field3657 = new HashMap(); - this.field3659 = var2; - } - - public class393(int var1) { - this(var1, (Comparator)null); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1737767650" - ) - void method1988() { - int var1 = (this.field3658.length << 1) + 1; - this.field3658 = (class391[])((class391[])Arrays.copyOf(this.field3658, var1)); - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "22" - ) - void method1989(int var1) { - class391 var2; - int var3; - for (var2 = this.field3658[var1]; var1 > 0; var1 = var3) { - var3 = var1 - 1 >>> 1; - class391 var4 = this.field3658[var3]; - if (this.field3659 != null) { - if (this.field3659.compare(var2.field3651, var4.field3651) >= 0) { - break; - } - } else if (((Comparable)var2.field3651).compareTo(var4.field3651) >= 0) { - break; - } - - this.field3658[var1] = var4; - this.field3658[var1].field3650 = var1; - } - - this.field3658[var1] = var2; - this.field3658[var1].field3650 = var1; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "4" - ) - void method1990(int var1) { - class391 var2 = this.field3658[var1]; - - int var8; - for (int var3 = this.field3655 >>> 1; var1 < var3; var1 = var8) { - int var4 = (var1 << 1) + 1; - class391 var5 = this.field3658[var4]; - int var6 = (var1 << 1) + 2; - class391 var7 = this.field3658[var6]; - if (this.field3659 != null) { - if (var6 < this.field3655 && this.field3659.compare(var5.field3651, var7.field3651) > 0) { - var8 = var6; - } else { - var8 = var4; - } - } else if (var6 < this.field3655 && ((Comparable)var5.field3651).compareTo(var7.field3651) > 0) { - var8 = var6; - } else { - var8 = var4; - } - - if (this.field3659 != null) { - if (this.field3659.compare(var2.field3651, this.field3658[var8].field3651) <= 0) { - break; - } - } else if (((Comparable)var2.field3651).compareTo(this.field3658[var8].field3651) <= 0) { - break; - } - - this.field3658[var1] = this.field3658[var8]; - this.field3658[var1].field3650 = var1; - } - - this.field3658[var1] = var2; - this.field3658[var1].field3650 = var1; - } - - @Export("remove") - @ObfuscatedName("remove") - public boolean remove(Object var1) { - class391 var2 = (class391)this.field3657.remove(var1); - if (var2 == null) { - return false; - } else { - ++this.field3656; - --this.field3655; - if (var2.field3650 == this.field3655) { - this.field3658[this.field3655] = null; - return true; - } else { - class391 var3 = this.field3658[this.field3655]; - this.field3658[this.field3655] = null; - this.field3658[var2.field3650] = var3; - this.field3658[var2.field3650].field3650 = var2.field3650; - this.method1990(var2.field3650); - if (var3 == this.field3658[var2.field3650]) { - this.method1989(var2.field3650); - } - - return true; - } - } - } - - @Export("peek") - @ObfuscatedName("peek") - public Object peek() { - return this.field3655 == 0 ? null : this.field3658[0].field3651; - } - - @Export("size") - @ObfuscatedName("size") - public int size() { - return this.field3655; - } - - @Export("offer") - @ObfuscatedName("offer") - public boolean offer(Object var1) { - /** - * @TODO - * Can't pass dialogues when this is here ;-; Cba debuging - */ - //if (this.field3657.containsKey(var1)) { - // throw new IllegalArgumentException("field3657 already contains: " + var1); - //} else { - ++this.field3656; - int var2 = this.field3655; - if (var2 >= this.field3658.length) { - this.method1988(); - } - - ++this.field3655; - if (var2 == 0) { - this.field3658[0] = new class391(var1, 0); - this.field3657.put(var1, this.field3658[0]); - } else { - this.field3658[var2] = new class391(var1, var2); - this.field3657.put(var1, this.field3658[var2]); - this.method1989(var2); - } - - return true; - // } - } - - @Export("poll") - @ObfuscatedName("poll") - public Object poll() { - if (this.field3655 == 0) { - return null; - } else { - ++this.field3656; - Object var1 = this.field3658[0].field3651; - this.field3657.remove(var1); - --this.field3655; - if (this.field3655 == 0) { - this.field3658[this.field3655] = null; - } else { - this.field3658[0] = this.field3658[this.field3655]; - this.field3658[0].field3650 = 0; - this.field3658[this.field3655] = null; - this.method1990(0); - } - - return var1; - } - } - - @Export("contains") - @ObfuscatedName("contains") - public boolean contains(Object var1) { - return this.field3657.containsKey(var1); - } - - @Export("toArray") - @ObfuscatedName("toArray") - public Object[] toArray() { - Object[] var1 = super.toArray(); - if (this.field3659 != null) { - Arrays.sort(var1, this.field3659); - } else { - Arrays.sort(var1); - } - - return var1; - } - - @Export("iterator") - @ObfuscatedName("iterator") - public Iterator iterator() { - return new class392(this); - } - - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-408081757" - ) - static final void method1991() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { - if (var0.plane == class36.Client_plane && Client.cycle <= var0.cycleEnd) { - if (Client.cycle >= var0.cycleStart) { - if (var0.targetIndex > 0) { - NPC var1 = Client.npcs[var0.targetIndex - 1]; - if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { - var0.setDestination(var1.x, var1.y, class306.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - if (var0.targetIndex < 0) { - int var2 = -var0.targetIndex - 1; - Player var3; - if (var2 == Client.localPlayerIndex) { - var3 = class136.localPlayer; - } else { - var3 = Client.players[var2]; - } - - if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.setDestination(var3.x, var3.y, class306.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - var0.advance(Client.field452); - UserComparator5.scene.drawEntity(class36.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); - } - } else { - var0.remove(); - } - } - - } -} diff --git a/osrs/src/main/java/class394.java b/osrs/src/main/java/class394.java new file mode 100644 index 000000000..1e83b98a2 --- /dev/null +++ b/osrs/src/main/java/class394.java @@ -0,0 +1,799 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; + +@ObfuscatedName("pj") +public class class394 { + @ObfuscatedName("ab") + int field3669; + @ObfuscatedName("ag") + int field3670; + @ObfuscatedName("am") + int field3672; + @ObfuscatedName("ax") + int field3675; + @ObfuscatedName("ah") + int field3671; + @ObfuscatedName("as") + boolean field3668; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lpk;" + ) + AbstractFont field3677; + @ObfuscatedName("aj") + ArrayList field3676; + @ObfuscatedName("av") + int field3673; + @ObfuscatedName("aw") + int field3674; + + public class394() { + this.field3669 = Integer.MAX_VALUE; + this.field3670 = Integer.MAX_VALUE; + this.field3672 = 0; + this.field3675 = 0; + this.field3671 = 0; + this.field3668 = true; + this.field3676 = new ArrayList(); + this.field3673 = 0; + this.field3674 = 0; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(II)Lpz;", + garbageValue = "425318611" + ) + public class396 method2036(int var1) { + return (class396)this.field3676.get(var1); + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(I)Lpz;", + garbageValue = "1830163512" + ) + class396 method2037() { + return this.field3676.size() == 0 ? null : (class396)this.field3676.get(this.field3676.size() - 1); + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1992869018" + ) + public boolean method2038() { + return this.field3676.size() == 0; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-675218118" + ) + boolean method2039() { + return this.field3670 > 1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1688510031" + ) + public int method2040() { + return this.field3676.size(); + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "163147996" + ) + public String method2041() { + if (this.method2038()) { + return ""; + } else { + StringBuilder var1 = new StringBuilder(this.method2040()); + + for (int var2 = 0; var2 < this.method2040(); ++var2) { + class396 var3 = this.method2036(var2); + var1.append(var3.field3680); + } + + return var1.toString(); + } + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-32" + ) + public void method2042(int var1) { + if (this.field3677 != null && var1 < this.field3677.ascent * 2) { + var1 = Integer.MAX_VALUE; + } + + if (this.field3669 != var1) { + this.field3669 = var1; + this.method2071(); + } + + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1949241738" + ) + public void method2043(int var1) { + if (this.field3670 != var1) { + this.field3670 = var1; + this.method2071(); + } + + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-38" + ) + public void method2044(int var1) { + if (this.field3674 != var1) { + this.field3674 = var1; + this.method2071(); + } + + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(Lpk;I)V", + garbageValue = "1103184746" + ) + public void method2045(AbstractFont var1) { + if (var1 != this.field3677) { + this.field3677 = var1; + if (this.field3677 != null) { + if (this.field3671 == 0) { + this.field3671 = this.field3677.ascent; + } + + if (!this.method2038()) { + this.method2071(); + } + } + } + + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1772052418" + ) + public void method2046(int var1) { + if (this.field3673 != var1) { + this.field3673 = var1; + this.method2071(); + } + + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-1456021058" + ) + public boolean method2047(int var1, int var2) { + if (this.field3672 != var1 || var2 != this.field3675) { + this.field3672 = var1; + this.field3675 = var2; + this.method2071(); + } + + return true; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1080029038" + ) + public void method2048(int var1) { + if (this.field3671 != var1) { + this.field3671 = var1; + this.method2071(); + } + + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(III)Lpl;", + garbageValue = "-1114977482" + ) + public class398 method2049(int var1, int var2) { + if (var2 == var1) { + return new class398(this, 0, 0); + } else if (var1 <= this.field3676.size() && var2 <= this.field3676.size()) { + return var2 < var1 ? new class398(this, var2, var1) : new class398(this, var1, var2); + } else { + return new class398(this, 0, 0); + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(CIII)Lpu;", + garbageValue = "-803390242" + ) + public class395 method2050(char var1, int var2, int var3) { + return this.method2051(Character.toString(var1), var2, var3); + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;III)Lpu;", + garbageValue = "-522015714" + ) + public class395 method2051(String var1, int var2, int var3) { + if (var3 == 0) { + var3 = Integer.MAX_VALUE; + } + + int var4 = var2; + if (this.field3676.size() >= var3) { + this.method2072(var2, var2); + return new class395(var2, true); + } else { + this.field3676.ensureCapacity(this.field3676.size() + var1.length()); + + for (int var5 = 0; var5 < var1.length() && this.field3676.size() < var3; ++var5) { + class396 var6 = new class396(); + var6.field3680 = var1.charAt(var5); + this.field3676.add(var4, var6); + ++var4; + } + + this.method2072(var2, var4); + if (this.field3670 != 0 && this.method2063() > this.field3670) { + while (var4 != var2) { + --var4; + this.method2056(var4); + if (this.method2063() <= this.field3670) { + break; + } + } + + return new class395(var4, true); + } else { + return new class395(var4, false); + } + } + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)Lpu;", + garbageValue = "-584459098" + ) + class395 method2052(String var1, int var2) { + return this.method2051(var1, this.field3676.size(), var2); + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Lpu;", + garbageValue = "67" + ) + public class395 method2054(String var1) { + this.method2055(); + return this.method2052(var1, 0); + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1865432397" + ) + void method2055() { + this.field3676.clear(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "2" + ) + public int method2056(int var1) { + return this.method2057(var1, var1 + 1); + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1605170962" + ) + public int method2057(int var1, int var2) { + int var3; + if (var2 < var1) { + var3 = var2; + var2 = var1; + var1 = var3; + } + + this.field3676.subList(var1, var2).clear(); + var3 = var1; + if (this.method2039() && this.field3673 == 1) { + while (var3 > 0) { + --var3; + char var4 = ((class396)this.field3676.get(var3)).field3680; + if (var4 == ' ' || var4 == '\t') { + break; + } + } + } + + this.method2072(var3, var2); + return var1; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(IIS)I", + garbageValue = "194" + ) + public int method2058(int var1, int var2) { + if (this.field3677 == null) { + return 0; + } else if (this.method2039() && var1 > this.field3669) { + return this.field3676.size(); + } else { + if (!this.field3676.isEmpty()) { + for (int var3 = 0; var3 < this.field3676.size(); ++var3) { + class396 var4 = (class396)this.field3676.get(var3); + if (var2 <= var4.field3682 + this.method2062()) { + if (var2 < var4.field3682) { + break; + } + + if (var1 < var4.field3681) { + return var3 > 0 ? var3 - 1 : 0; + } + + if (1 + var3 != this.field3676.size() && ((class396)this.field3676.get(1 + var3)).field3682 != var4.field3682) { + int var5 = this.method2074((class396)this.field3676.get(var3), false); + if (var1 < var5 + var4.field3681) { + return var3; + } + + if (var2 <= var4.field3682 + this.method2062()) { + return var3 + 1; + } + } + } + } + + class396 var6 = (class396)this.field3676.get(this.field3676.size() - 1); + if (var1 >= var6.field3681 && var1 <= var6.field3681 + this.method2064() && var2 >= var6.field3682 && var2 <= var6.field3682 + this.method2062()) { + return this.field3676.size() - 1; + } + } + + return this.field3676.size(); + } + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(IIS)I", + garbageValue = "139" + ) + public int method2059(int var1, int var2) { + if (this.field3677 != null && !this.method2038() && var1 <= this.field3676.size()) { + byte var3; + if (var2 > 0) { + var3 = 1; + } else { + var3 = -1; + var2 = -var2; + } + + int var4 = 0; + int var5 = 0; + if (var1 > 0) { + class396 var6 = (class396)this.field3676.get(var1 - 1); + var4 = var6.field3681 + this.method2073(var1 - 1); + var5 = var6.field3682; + } else if (var3 == -1 && var1 == 0) { + return 0; + } + + int var14 = 16777215; + int var7 = 0; + int var8 = var1; + int var9 = 16777215; + int var10 = var3 == 1 ? this.field3676.size() + 1 : 0; + + for (int var11 = var3 + var1; var10 != var11; var11 += var3) { + class396 var12 = (class396)this.field3676.get(var11 - 1); + if (var5 != var12.field3682) { + ++var7; + var5 = var12.field3682; + if (var7 > var2) { + return var8; + } + } + + if (var7 == var2) { + int var13 = Math.abs(var12.field3681 + this.method2073(var11 - 1) - var4); + if (var13 >= var9) { + return var8; + } + + var8 = var11; + var9 = var13; + } + } + + if (var3 == 1) { + return this.field3676.size(); + } else { + if (var5 != 0) { + ++var7; + } + + return var9 == 16777215 || var7 == var2 && var4 < var9 ? 0 : var8; + } + } else { + return 0; + } + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-540646519" + ) + public int method2060() { + if (!this.field3676.isEmpty() && this.method2063() == 1) { + return this.field3676.isEmpty() ? 0 : ((class396)this.field3676.get(this.field3676.size() - 1)).field3681 + this.method2064(); + } else { + int var1 = -1; + int var2 = 0; + + for (int var3 = this.field3676.size() - 1; var3 >= 0; --var3) { + class396 var4 = (class396)this.field3676.get(var3); + if (var1 != var4.field3682) { + int var5 = this.method2074(var4, false) + var4.field3681; + var2 = Math.max(var5, var2); + var1 = var4.field3682; + } + } + + return var2; + } + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "872153542" + ) + public int method2061() { + return this.method2038() ? 0 : this.field3677.ascent + ((class396)this.field3676.get(this.field3676.size() - 1)).field3682; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1220139043" + ) + public int method2062() { + return this.field3671; + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "106" + ) + public int method2063() { + return this.method2061() / this.field3677.ascent; + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1975027491" + ) + int method2064() { + return this.method2038() ? 0 : this.method2074((class396)this.field3676.get(this.field3676.size() - 1), false); + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "103" + ) + public int method2065() { + return this.field3669; + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2030708038" + ) + public int method2066() { + return this.field3670; + } + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "106" + ) + public int method2067() { + return this.field3673; + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "326799918" + ) + public int method2068() { + return this.field3674; + } + + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "0" + ) + public int method2069(int var1) { + switch(this.field3672) { + case 0: + return 0; + case 1: + return var1 / 2; + case 2: + return var1; + default: + return 0; + } + } + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "59" + ) + public int method2070(int var1) { + switch(this.field3675) { + case 0: + return 0; + case 1: + return var1 / 2; + case 2: + return var1; + default: + return 0; + } + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2042432438" + ) + void method2071() { + this.method2072(0, this.field3676.size()); + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "2146351228" + ) + void method2072(int var1, int var2) { + if (!this.method2038() && this.field3677 != null) { + class485 var3 = this.method2075(var1, var2); + boolean var4 = (Integer)var3.field4049 == 0 && (Integer)var3.field4048 == this.field3676.size(); + int var5 = (Integer)var3.field4049; + int var6 = 0; + int var7 = var4 ? 0 : ((class396)this.field3676.get((Integer)var3.field4049)).field3682 * 778585567 * -122833377; + int var8 = 0; + + int var9; + for (var9 = (Integer)var3.field4049; var9 <= (Integer)var3.field4048; ++var9) { + boolean var10 = var9 >= this.field3676.size(); + class396 var11 = (class396)this.field3676.get(!var10 ? var9 : this.field3676.size() - 1); + int var12 = !var10 ? this.method2074(var11, false) : 0; + boolean var13 = !var10 && var11.field3680 == '\n'; + boolean var14 = !var10 && this.method2039() && var12 + var6 > this.field3669; + if (var13 || var14 || var10) { + int var15 = var9; + int var16 = 0; + int var17; + int var18; + class396 var19; + if (var14) { + var17 = 0; + if (this.field3673 == 1) { + for (var18 = var9; var18 > var5; --var18) { + var19 = (class396)this.field3676.get(var18); + var17 += var18 < var15 ? this.method2074(var19, false) : 0; + if (var19.field3680 == ' ' || var19.field3680 == '\n') { + var15 = var18; + var6 -= var17; + var16 = var17; + break; + } + } + } + } + + var17 = -this.method2069(var6); + + for (var18 = var5; var18 < var15; ++var18) { + var19 = (class396)this.field3676.get(var18); + int var20 = this.method2074(var19, false); + var19.field3681 = var17; + var19.field3682 = var7; + var17 += var20; + } + + var5 = var15; + var6 = var16; + var7 += this.method2062(); + ++var8; + } + + var6 += !var10 ? var12 : 0; + } + + if (this.field3675 != 0 && var4) { + var9 = var8 * this.method2062(); + int var23 = this.method2070(var9); + + for (int var21 = 0; var21 < this.field3676.size(); ++var21) { + class396 var22 = (class396)this.field3676.get(var21); + var22.field3682 -= var23; + } + } + + } + } + + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "369306860" + ) + int method2073(int var1) { + return var1 < this.field3676.size() ? this.method2074((class396)this.field3676.get(var1), false) : 0; + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(Lpz;ZI)I", + garbageValue = "1524622539" + ) + int method2074(class396 var1, boolean var2) { + if (var1.field3680 == '\n') { + return 0; + } else if (this.field3674 == 0) { + int var3 = this.field3677.advances[var1.field3680]; + if (var3 == 0) { + return var1.field3680 == '\t' ? this.field3677.advances[32] * 3 : this.field3677.advances[32]; + } else { + return var3; + } + } else { + return this.field3677.advances[42]; + } + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(IIB)Lss;", + garbageValue = "0" + ) + class485 method2075(int var1, int var2) { + int var3 = Math.min(var1, var2); + int var4 = Math.max(var1, var2); + int var5 = this.field3676.size(); + if (var3 == 0 && var4 == var5) { + return new class485(0, var5); + } else { + int var6 = this.method2076(var3, false); + int var7 = this.method2077(var4, false); + int var8; + switch(this.field3675) { + case 0: + if (this.field3672 == 0) { + return new class485(var6, var5); + } + + var8 = this.method2076(var3, true); + return new class485(var8, var5); + case 1: + return new class485(0, var5); + case 2: + if (this.field3672 == 2) { + return new class485(0, var7); + } + + var8 = this.method2077(var4, true); + return new class485(0, var8); + default: + return new class485(0, var5); + } + } + } + + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "(IZI)I", + garbageValue = "-1605508090" + ) + int method2076(int var1, boolean var2) { + if (var1 < this.field3676.size()) { + int var3 = ((class396)this.field3676.get(var1)).field3682; + + for (int var4 = var1; var4 > 0; --var4) { + if (((class396)this.field3676.get(var4 - 1)).field3682 < var3) { + if (!var2) { + return var4; + } + + var2 = false; + var3 = ((class396)this.field3676.get(var4 - 1)).field3682; + } + } + } + + return 0; + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(IZI)I", + garbageValue = "1892979097" + ) + int method2077(int var1, boolean var2) { + if (var1 < this.field3676.size()) { + int var3 = ((class396)this.field3676.get(var1)).field3682; + + for (int var4 = var1; var4 < this.field3676.size() - 1; ++var4) { + if (((class396)this.field3676.get(var4 + 1)).field3682 > var3) { + if (!var2) { + return var4; + } + + var2 = false; + var3 = ((class396)this.field3676.get(var4 + 1)).field3682; + } + } + } + + return this.field3676.size(); + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1123926703" + ) + public static void method2053() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class395.java b/osrs/src/main/java/class395.java index 454949b50..2171bbd17 100644 --- a/osrs/src/main/java/class395.java +++ b/osrs/src/main/java/class395.java @@ -1,1317 +1,25 @@ -import java.util.ArrayList; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pt") +@ObfuscatedName("pu") public class class395 { @ObfuscatedName("au") - int field3667; - @ObfuscatedName("ae") - int field3663; - @ObfuscatedName("ab") - int field3661; - @ObfuscatedName("ad") - int field3662; - @ObfuscatedName("ao") - int field3666; - @ObfuscatedName("ac") - boolean field3660; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lpq;" - ) - AbstractFont field3669; - @ObfuscatedName("an") - ArrayList field3668; - @ObfuscatedName("af") - int field3664; - @ObfuscatedName("ai") - int field3665; - - public class395() { - this.field3667 = Integer.MAX_VALUE; - this.field3663 = Integer.MAX_VALUE; - this.field3661 = 0; - this.field3662 = 0; - this.field3666 = 0; - this.field3660 = true; - this.field3668 = new ArrayList(); - this.field3664 = 0; - this.field3665 = 0; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Lpz;", - garbageValue = "-1921326690" - ) - public class397 method1995(int var1) { - return (class397)this.field3668.get(var1); - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(B)Lpz;", - garbageValue = "5" - ) - class397 method1996() { - return this.field3668.size() == 0 ? null : (class397)this.field3668.get(this.field3668.size() - 1); - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1788834683" - ) - public boolean method1997() { - return this.field3668.size() == 0; - } + int field3678; - @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-45616913" - ) - boolean method1998() { - return this.field3663 > 1; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-520333390" - ) - public int method1999() { - return this.field3668.size(); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "370673788" - ) - public String method2000() { - if (this.method1997()) { - return ""; - } else { - StringBuilder var1 = new StringBuilder(this.method1999()); - - for (int var2 = 0; var2 < this.method1999(); ++var2) { - class397 var3 = this.method1995(var2); - var1.append(var3.field3671); - } - - return var1.toString(); - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "46" - ) - public void method2001(int var1) { - if (this.field3669 != null && var1 < this.field3669.ascent * 2) { - var1 = Integer.MAX_VALUE; - } - - if (this.field3667 != var1) { - this.field3667 = var1; - this.method2030(); - } - - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "48068084" - ) - public void method2002(int var1) { - if (this.field3663 != var1) { - this.field3663 = var1; - this.method2030(); - } - - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1944936240" - ) - public void method2003(int var1) { - if (this.field3665 != var1) { - this.field3665 = var1; - this.method2030(); - } - - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Lpq;I)V", - garbageValue = "-1981250546" - ) - public void method2004(AbstractFont var1) { - if (var1 != this.field3669) { - this.field3669 = var1; - if (this.field3669 != null) { - if (this.field3666 == 0) { - this.field3666 = this.field3669.ascent; - } - - if (!this.method1997()) { - this.method2030(); - } - } - } - - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1972843844" - ) - public void method2005(int var1) { - if (this.field3664 != var1) { - this.field3664 = var1; - this.method2030(); - } - - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1001647291" - ) - public boolean method2006(int var1, int var2) { - if (this.field3661 != var1 || var2 != this.field3662) { - this.field3661 = var1; - this.field3662 = var2; - this.method2030(); - } - - return true; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(IB)V", + descriptor = "(IZ)V", garbageValue = "1" ) - public void method2007(int var1) { - if (this.field3666 != var1) { - this.field3666 = var1; - this.method2030(); - } - - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(III)Lpo;", - garbageValue = "494218521" - ) - public class399 method2008(int var1, int var2) { - if (var2 == var1) { - return new class399(this, 0, 0); - } else if (var1 <= this.field3668.size() && var2 <= this.field3668.size()) { - return var2 < var1 ? new class399(this, var2, var1) : new class399(this, var1, var2); - } else { - return new class399(this, 0, 0); - } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(CIII)Lph;", - garbageValue = "2008322061" - ) - public class396 method2009(char var1, int var2, int var3) { - return this.method2010(Character.toString(var1), var2, var3); + class395(int var1, boolean var2) { + this.field3678 = var1; } @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;III)Lph;", - garbageValue = "-1597542040" - ) - public class396 method2010(String var1, int var2, int var3) { - if (var3 == 0) { - var3 = Integer.MAX_VALUE; - } - - int var4 = var2; - if (this.field3668.size() >= var3) { - this.method2031(var2, var2); - return new class396(var2, true); - } else { - this.field3668.ensureCapacity(this.field3668.size() + var1.length()); - - for (int var5 = 0; var5 < var1.length() && this.field3668.size() < var3; ++var5) { - class397 var6 = new class397(); - var6.field3671 = var1.charAt(var5); - this.field3668.add(var4, var6); - ++var4; - } - - this.method2031(var2, var4); - if (this.field3663 != 0 && this.method2022() > this.field3663) { - while (var4 != var2) { - --var4; - this.method2014(var4); - if (this.method2022() <= this.field3663) { - break; - } - } - - return new class396(var4, true); - } else { - return new class396(var4, false); - } - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)Lph;", - garbageValue = "-44" - ) - class396 method2011(String var1, int var2) { - return this.method2010(var1, this.field3668.size(), var2); - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Lph;", - garbageValue = "-46" - ) - public class396 method2012(String var1) { - this.method2013(); - return this.method2011(var1, 0); - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-18" - ) - void method2013() { - this.field3668.clear(); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-93" - ) - public int method2014(int var1) { - return this.method2015(var1, var1 + 1); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "1" - ) - public int method2015(int var1, int var2) { - int var3; - if (var2 < var1) { - var3 = var2; - var2 = var1; - var1 = var3; - } - - this.field3668.subList(var1, var2).clear(); - var3 = var1; - if (this.method1998() && this.field3664 == 1) { - while (var3 > 0) { - --var3; - char var4 = ((class397)this.field3668.get(var3)).field3671; - if (var4 == ' ' || var4 == '\t') { - break; - } - } - } - - this.method2031(var3, var2); - return var1; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "62" - ) - public int method2016(int var1, int var2) { - if (this.field3669 == null) { - return 0; - } else if (this.method1998() && var1 > this.field3667) { - return this.field3668.size(); - } else { - if (!this.field3668.isEmpty()) { - for (int var3 = 0; var3 < this.field3668.size(); ++var3) { - class397 var4 = (class397)this.field3668.get(var3); - if (var2 <= var4.field3672 + this.method2021()) { - if (var2 < var4.field3672) { - break; - } - - if (var1 < var4.field3673) { - return var3 > 0 ? var3 - 1 : 0; - } - - if (var3 + 1 != this.field3668.size() && ((class397)this.field3668.get(var3 + 1)).field3672 != var4.field3672) { - int var5 = this.method2033((class397)this.field3668.get(var3), false); - if (var1 < var5 + var4.field3673) { - return var3; - } - - if (var2 <= var4.field3672 + this.method2021()) { - return var3 + 1; - } - } - } - } - - class397 var6 = (class397)this.field3668.get(this.field3668.size() - 1); - if (var1 >= var6.field3673 && var1 <= var6.field3673 + this.method2023() && var2 >= var6.field3672 && var2 <= var6.field3672 + this.method2021()) { - return this.field3668.size() - 1; - } - } - - return this.field3668.size(); - } - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1416421146" - ) - public int method2017(int var1, int var2) { - if (this.field3669 != null && !this.method1997() && var1 <= this.field3668.size()) { - byte var3; - if (var2 > 0) { - var3 = 1; - } else { - var3 = -1; - var2 = -var2; - } - - int var4 = 0; - int var5 = 0; - if (var1 > 0) { - class397 var6 = (class397)this.field3668.get(var1 - 1); - var4 = var6.field3673 + this.method2032(var1 - 1); - var5 = var6.field3672; - } else if (var3 == -1 && var1 == 0) { - return 0; - } - - int var14 = 16777215; - int var7 = 0; - int var8 = var1; - int var9 = 16777215; - int var10 = var3 == 1 ? this.field3668.size() + 1 : 0; - - for (int var11 = var3 + var1; var10 != var11; var11 += var3) { - class397 var12 = (class397)this.field3668.get(var11 - 1); - if (var5 != var12.field3672) { - ++var7; - var5 = var12.field3672; - if (var7 > var2) { - return var8; - } - } - - if (var7 == var2) { - int var13 = Math.abs(var12.field3673 + this.method2032(var11 - 1) - var4); - if (var13 >= var9) { - return var8; - } - - var8 = var11; - var9 = var13; - } - } - - if (var3 == 1) { - return this.field3668.size(); - } else { - if (var5 != 0) { - ++var7; - } - - return var9 == 16777215 || var7 == var2 && var4 < var9 ? 0 : var8; - } - } else { - return 0; - } - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "1557" - ) - public int method2018() { - if (!this.field3668.isEmpty() && this.method2022() == 1) { - return this.field3668.isEmpty() ? 0 : ((class397)this.field3668.get(this.field3668.size() - 1)).field3673 + this.method2023(); - } else { - int var1 = -1; - int var2 = 0; - - for (int var3 = this.field3668.size() - 1; var3 >= 0; --var3) { - class397 var4 = (class397)this.field3668.get(var3); - if (var1 != var4.field3672) { - int var5 = this.method2033(var4, false) + var4.field3673; - var2 = Math.max(var5, var2); - var1 = var4.field3672; - } - } - - return var2; - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1208537065" - ) - public int method2019() { - return this.method1997() ? 0 : this.field3669.ascent + ((class397)this.field3668.get(this.field3668.size() - 1)).field3672; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - public int method2021() { - return this.field3666; - } - - @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(S)I", - garbageValue = "-3335" - ) - public int method2022() { - return this.method2019() / this.field3669.ascent; - } - - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-435208989" - ) - int method2023() { - return this.method1997() ? 0 : this.method2033((class397)this.field3668.get(this.field3668.size() - 1), false); - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-156407630" - ) - public int method2024() { - return this.field3667; - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-78" - ) - public int method2025() { - return this.field3663; - } - - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1411436568" + garbageValue = "28670" ) - public int method2026() { - return this.field3664; - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1254279551" - ) - public int method2027() { - return this.field3665; - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "0" - ) - public int method2028(int var1) { - switch(this.field3661) { - case 0: - return 0; - case 1: - return var1 / 2; - case 2: - return var1; - default: - return 0; - } - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "47" - ) - public int method2029(int var1) { - switch(this.field3662) { - case 0: - return 0; - case 1: - return var1 / 2; - case 2: - return var1; - default: - return 0; - } - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1723560040" - ) - void method2030() { - this.method2031(0, this.field3668.size()); - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2083638926" - ) - void method2031(int var1, int var2) { - if (!this.method1997() && this.field3669 != null) { - class486 var3 = this.method2034(var1, var2); - boolean var4 = (Integer)var3.field4036 == 0 && (Integer)var3.field4037 == this.field3668.size(); - int var5 = (Integer)var3.field4036; - int var6 = 0; - int var7 = var4 ? 0 : ((class397)this.field3668.get((Integer)var3.field4036)).field3672 * 254759267 * 2114762827; - int var8 = 0; - - int var9; - for (var9 = (Integer)var3.field4036; var9 <= (Integer)var3.field4037; ++var9) { - boolean var10 = var9 >= this.field3668.size(); - class397 var11 = (class397)this.field3668.get(!var10 ? var9 : this.field3668.size() - 1); - int var12 = !var10 ? this.method2033(var11, false) : 0; - boolean var13 = !var10 && var11.field3671 == '\n'; - boolean var14 = !var10 && this.method1998() && var6 + var12 > this.field3667; - if (var13 || var14 || var10) { - int var15 = var9; - int var16 = 0; - int var17; - int var18; - class397 var19; - if (var14) { - var17 = 0; - if (this.field3664 == 1) { - for (var18 = var9; var18 > var5; --var18) { - var19 = (class397)this.field3668.get(var18); - var17 += var18 < var15 ? this.method2033(var19, false) : 0; - if (var19.field3671 == ' ' || var19.field3671 == '\n') { - var15 = var18; - var6 -= var17; - var16 = var17; - break; - } - } - } - } - - var17 = -this.method2028(var6); - - for (var18 = var5; var18 < var15; ++var18) { - var19 = (class397)this.field3668.get(var18); - int var20 = this.method2033(var19, false); - var19.field3673 = var17; - var19.field3672 = var7; - var17 += var20; - } - - var5 = var15; - var6 = var16; - var7 += this.method2021(); - ++var8; - } - - var6 += !var10 ? var12 : 0; - } - - if (this.field3662 != 0 && var4) { - var9 = var8 * this.method2021(); - int var23 = this.method2029(var9); - - for (int var21 = 0; var21 < this.field3668.size(); ++var21) { - class397 var22 = (class397)this.field3668.get(var21); - var22.field3672 -= var23; - } - } - - } - } - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-46" - ) - int method2032(int var1) { - return var1 < this.field3668.size() ? this.method2033((class397)this.field3668.get(var1), false) : 0; - } - - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "(Lpz;ZB)I", - garbageValue = "4" - ) - int method2033(class397 var1, boolean var2) { - if (var1.field3671 == '\n') { - return 0; - } else if (this.field3665 == 0) { - int var3 = this.field3669.advances[var1.field3671]; - if (var3 == 0) { - return var1.field3671 == '\t' ? this.field3669.advances[32] * 3 : this.field3669.advances[32]; - } else { - return var3; - } - } else { - return this.field3669.advances[42]; - } - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(IIB)Lsf;", - garbageValue = "-41" - ) - class486 method2034(int var1, int var2) { - int var3 = Math.min(var1, var2); - int var4 = Math.max(var1, var2); - int var5 = this.field3668.size(); - if (var3 == 0 && var4 == var5) { - return new class486(0, var5); - } else { - int var6 = this.method2035(var3, false); - int var7 = this.method2036(var4, false); - int var8; - switch(this.field3662) { - case 0: - if (this.field3661 == 0) { - return new class486(var6, var5); - } - - var8 = this.method2035(var3, true); - return new class486(var8, var5); - case 1: - return new class486(0, var5); - case 2: - if (this.field3661 == 2) { - return new class486(0, var7); - } - - var8 = this.method2036(var4, true); - return new class486(0, var8); - default: - return new class486(0, var5); - } - } - } - - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(IZI)I", - garbageValue = "1702216179" - ) - int method2035(int var1, boolean var2) { - if (var1 < this.field3668.size()) { - int var3 = ((class397)this.field3668.get(var1)).field3672; - - for (int var4 = var1; var4 > 0; --var4) { - if (((class397)this.field3668.get(var4 - 1)).field3672 < var3) { - if (!var2) { - return var4; - } - - var2 = false; - var3 = ((class397)this.field3668.get(var4 - 1)).field3672; - } - } - } - - return 0; - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(IZI)I", - garbageValue = "-1813129427" - ) - int method2036(int var1, boolean var2) { - if (var1 < this.field3668.size()) { - int var3 = ((class397)this.field3668.get(var1)).field3672; - - for (int var4 = var1; var4 < this.field3668.size() - 1; ++var4) { - if (((class397)this.field3668.get(var4 + 1)).field3672 > var3) { - if (!var2) { - return var4; - } - - var2 = false; - var3 = ((class397)this.field3668.get(var4 + 1)).field3672; - } - } - } - - return this.field3668.size(); - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(II)Ltm;", - garbageValue = "1693423022" - ) - public static class503 method1994(int var0) { - int var1 = class501.field4087[var0]; - if (var1 == 1) { - return class503.field4090; - } else if (var1 == 2) { - return class503.field4089; - } else { - return var1 == 3 ? class503.field4091 : null; - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1112737604" - ) - static void method2020() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lpc;Lpc;Lpc;I)V", - garbageValue = "680551313" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (GrandExchangeOfferTotalQuantityComparator.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - Script.loginBoxCenter = Login.loginBoxX + 180; - if (Login.worldSelectOpen) { - WorldMapData_0.method1364(var0, var1); - } else { - SongTask.leftTitleSprite.drawAt(Login.xPadding, 0); - ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - int var4; - if (Client.gameState == 0 || Client.gameState == 5) { - byte var3 = 20; - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); - var4 = 253 - var3; - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); - } - - String var5; - String var7; - String var8; - int var9; - char[] var10; - int var11; - short var19; - int var20; - short var21; - if (Client.gameState == 20) { - Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); - var19 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var20 += 7; - if (Login.loginIndex != 4 && Login.loginIndex != 10) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var20, 16777215, 0); - var21 = 200; - - for (var5 = class14.method51(); var0.stringWidth(var5) > var21; var5 = var5.substring(0, var5.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var20, 16777215, 0); - var20 += 15; - var7 = Login.Login_password; - var9 = var7.length(); - var10 = new char[var9]; - - for (var11 = 0; var11 < var9; ++var11) { - var10[var11] = '*'; - } - - var8 = new String(var10); - - for (var8 = var8; var0.stringWidth(var8) > var21; var8 = var8.substring(1)) { - } - - var0.draw("Password: " + var8, Login.loginBoxX + 180 - 108, var20, 16777215, 0); - var20 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { - Login.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var13; - if (Login.loginIndex == 0) { - var19 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 30; - var4 = Login.loginBoxX + 180 - 80; - var13 = 291; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawLines("New User", var4 - 73, var13 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawLines("Existing User", var4 - 73, var13 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var19 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var19, 16777215, 0); - var20 = var19 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var20, 16777215, 0); - var20 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var20, 16777215, 0); - var20 += 15; - var4 = Login.loginBoxX + 180 - 80; - var13 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Continue", var4, var13 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Cancel", var4, var13 + 5, 16777215, 0); - } else { - short var12; - IndexedSprite var22; - if (Login.loginIndex == 2) { - var19 = 201; - var0.drawCentered(Login.Login_response1, Script.loginBoxCenter, var19, 16776960, 0); - var20 = var19 + 15; - var0.drawCentered(Login.Login_response2, Script.loginBoxCenter, var20, 16776960, 0); - var20 += 15; - var0.drawCentered(Login.Login_response3, Script.loginBoxCenter, var20, 16776960, 0); - var20 += 15; - var20 += 7; - var0.draw("Login: ", Script.loginBoxCenter - 110, var20, 16777215, 0); - var21 = 200; - - for (var5 = class14.method51(); var0.stringWidth(var5) > var21; var5 = var5.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? MusicPatchPcmStream.colorStartTag(16776960) + "|" : ""), Script.loginBoxCenter - 70, var20, 16777215, 0); - var20 += 15; - var7 = Login.Login_password; - var9 = var7.length(); - var10 = new char[var9]; - - for (var11 = 0; var11 < var9; ++var11) { - var10[var11] = '*'; - } - - var8 = new String(var10); - - for (var8 = var8; var0.stringWidth(var8) > var21; var8 = var8.substring(1)) { - } - - var0.draw("Password: " + var8 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? MusicPatchPcmStream.colorStartTag(16776960) + "|" : ""), Script.loginBoxCenter - 108, var20, 16777215, 0); - var20 += 15; - var19 = 277; - var9 = Script.loginBoxCenter + -117; - var22 = PcmPlayer.method209(Client.Login_isUsernameRemembered, Login.field741); - var22.drawAt(var9, var19); - var9 = var9 + var22.subWidth + 5; - var1.draw("Remember username", var9, var19 + 13, 16776960, 0); - var9 = Script.loginBoxCenter + 24; - var22 = PcmPlayer.method209(class150.clientPreferences.getIsUsernameHidden(), Login.field740); - var22.drawAt(var9, var19); - var9 = var9 + var22.subWidth + 5; - var1.draw("Hide username", var9, var19 + 13, 16776960, 0); - var20 = var19 + 15; - var11 = Script.loginBoxCenter - 80; - var12 = 321; - Login.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); - var0.drawCentered("Login", var11, var12 + 5, 16777215, 0); - var11 = Script.loginBoxCenter + 80; - Login.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); - var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); - var19 = 357; - switch(Login.field747) { - case 2: - MouseHandler.field145 = "Having trouble logging in?"; - break; - default: - MouseHandler.field145 = "Can't login? Click here."; - } - - class343.field3130 = new Bounds(Script.loginBoxCenter, var19, var1.stringWidth(MouseHandler.field145), 11); - class313.field2821 = new Bounds(Script.loginBoxCenter, var19, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(MouseHandler.field145, Script.loginBoxCenter, var19, 16777215, 0); - } else if (Login.loginIndex == 3) { - var19 = 201; - var0.drawCentered("Incorrect username or password.", Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 20; - var1.drawCentered("If you have upgraded to a Jagex Account, you", Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 20; - var1.drawCentered("need to log in using the Jagex Launcher instead.", Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var4 = Login.loginBoxX + 180; - var13 = 276; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var2.drawCentered("Try again", var4, var13 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var13 = 326; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var2.drawCentered("Forgotten password?", var4, var13 + 5, 16777215, 0); - } else if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var19 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var19, 16777215, 0); - var20 = var19 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var20, 16777215, 0); - var20 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var20, 16777215, 0); - var20 += 15; - var5 = "PIN: "; - var7 = Login.otp; - var9 = var7.length(); - var10 = new char[var9]; - - for (var11 = 0; var11 < var9; ++var11) { - var10[var11] = '*'; - } - - var8 = new String(var10); - var0.draw(var5 + var8 + (Client.cycle % 40 < 20 ? MusicPatchPcmStream.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var20, 16777215, 0); - var20 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var20, 16776960, 0); - var20 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var20, 16776960, 0); - int var16 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; - var9 = var20 - var0.ascent; - if (Login.field739) { - var22 = class11.options_buttons_2Sprite; - } else { - var22 = WorldMapLabelSize.options_buttons_0Sprite; - } - - var22.drawAt(var16, var9); - var20 += 15; - var11 = Login.loginBoxX + 180 - 80; - var12 = 321; - Login.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); - var0.drawCentered("Continue", var11, var12 + 5, 16777215, 0); - var11 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); - var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var12 + 36, 255, 0); - } else if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var19 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var20 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var20, 16777215, 0); - var21 = 174; - - for (var5 = class14.method51(); var0.stringWidth(var5) > var21; var5 = var5.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? MusicPatchPcmStream.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var20, 16777215, 0); - var20 += 15; - int var17 = Login.loginBoxX + 180 - 80; - short var15 = 321; - Login.titlebuttonSprite.drawAt(var17 - 73, var15 - 20); - var0.drawCentered("Recover", var17, var15 + 5, 16777215, 0); - var17 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var17 - 73, var15 - 20); - var0.drawCentered("Back", var17, var15 + 5, 16777215, 0); - var15 = 356; - var1.drawCentered("Still having trouble logging in?", Script.loginBoxCenter, var15, 268435455, 0); - } else if (Login.loginIndex == 6) { - var19 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var4 = Login.loginBoxX + 180; - var13 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Back", var4, var13 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - if (Message.field347 && !Client.onMobile) { - var19 = 201; - var0.drawCentered(Login.Login_response1, Script.loginBoxCenter, var19, 16776960, 0); - var20 = var19 + 15; - var0.drawCentered(Login.Login_response2, Script.loginBoxCenter, var20, 16776960, 0); - var20 += 15; - var0.drawCentered(Login.Login_response3, Script.loginBoxCenter, var20, 16776960, 0); - var4 = Script.loginBoxCenter - 150; - var20 += 10; - - int var23; - for (var23 = 0; var23 < 8; ++var23) { - Login.titlebuttonSprite.method2635(var4, var20, 30, 40); - boolean var26 = var23 == Login.field748 & Client.cycle % 40 < 20; - var0.draw((Login.field767[var23] == null ? "" : Login.field767[var23]) + (var26 ? MusicPatchPcmStream.colorStartTag(16776960) + "|" : ""), var4 + 10, var20 + 27, 16777215, 0); - if (var23 != 1 && var23 != 3) { - var4 += 35; - } else { - var4 += 50; - var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var20 + 27, 16777215, 0); - } - } - - var23 = Script.loginBoxCenter - 80; - short var27 = 321; - Login.titlebuttonSprite.drawAt(var23 - 73, var27 - 20); - var0.drawCentered("Submit", var23, var27 + 5, 16777215, 0); - var23 = Script.loginBoxCenter + 80; - Login.titlebuttonSprite.drawAt(var23 - 73, var27 - 20); - var0.drawCentered("Cancel", var23, var27 + 5, 16777215, 0); - } else { - var19 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var4 = Login.loginBoxX + 180 - 80; - var13 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Set Date of Birth", var4, var13 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Back", var4, var13 + 5, 16777215, 0); - } - } else if (Login.loginIndex == 8) { - var19 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var4 = Login.loginBoxX + 180 - 80; - var13 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Privacy Policy", var4, var13 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Back", var4, var13 + 5, 16777215, 0); - } else if (Login.loginIndex == 9) { - var19 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 25; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 25; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var20, 16776960, 0); - var4 = Login.loginBoxX + 180; - var13 = 311; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Try again", var4, var13 + 5, 16777215, 0); - } else if (Login.loginIndex == 10) { - var20 = Login.loginBoxX + 180; - var21 = 209; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var21, 16776960, 0); - var4 = var21 + 20; - Login.field773.drawAt(var20 - 109, var4); - if (Login.field761.isEmpty()) { - DirectByteArrayCopier.field3096.drawAt(var20 - 48, var4 + 18); - } else { - DirectByteArrayCopier.field3096.drawAt(var20 - 48, var4 + 5); - var0.drawCentered(Login.field761, var20, var4 + 68 - 15, 16776960, 0); - } - } else if (Login.loginIndex == 12) { - var20 = Script.loginBoxCenter; - var21 = 216; - var2.drawCentered("Before using this app, please read and accept our", var20, var21, 16777215, 0); - var4 = var21 + 17; - var2.drawCentered("terms of use, privacy policy, and end user licence", var20, var4, 16777215, 0); - var4 += 17; - var2.drawCentered("agreement (EULA).", var20, var4, 16777215, 0); - var4 += 17; - var2.drawCentered("By accepting, you agree to these documents.", var20, var4, 16777215, 0); - var20 = Script.loginBoxCenter - 80; - var21 = 311; - Login.titlebuttonSprite.drawAt(var20 - 73, var21 - 20); - var0.drawCentered("Accept", var20, var21 + 5, 16777215, 0); - var20 = Script.loginBoxCenter + 80; - Login.titlebuttonSprite.drawAt(var20 - 73, var21 - 20); - var0.drawCentered("Decline", var20, var21 + 5, 16777215, 0); - } else if (Login.loginIndex == 13) { - var19 = 231; - var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var19, 16777215, 0); - var20 = var19 + 20; - var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var20, 16777215, 0); - var4 = Login.loginBoxX + 180; - var19 = 311; - Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); - var0.drawCentered("Back", var4, var19 + 5, 16777215, 0); - } else if (Login.loginIndex == 14) { - var19 = 201; - String var14 = ""; - var5 = ""; - String var6 = ""; - switch(Login.field746) { - case 0: - var14 = "Your account has been involved"; - var5 = "in serious rule breaking."; - var6 = ""; - break; - case 1: - var14 = "Your account has been locked due to"; - var5 = "suspicious activity."; - var6 = "Please recover your account."; - break; - case 2: - var14 = "The unpaid balance on your account needs"; - var5 = "to be resolved before you can play."; - var6 = Strings.field3291; - break; - default: - PlayerComposition.Login_promptCredentials(false); - } - - var0.drawCentered(var14, Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 20; - var0.drawCentered(var5, Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 20; - var0.drawCentered(var6, Login.loginBoxX + 180, var20, 16776960, 0); - int var24 = Login.loginBoxX + 180; - short var25 = 276; - Login.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); - if (Login.field746 == 1) { - var0.drawCentered("Recover Account", var24, var25 + 5, 16777215, 0); - } else { - var0.drawCentered("View Appeal Options", var24, var25 + 5, 16777215, 0); - } - - var24 = Login.loginBoxX + 180; - var25 = 326; - Login.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); - var0.drawCentered("Back", var24, var25 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var19 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var19, 16777215, 0); - var20 = var19 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var20, 16777215, 0); - var20 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var20, 16777215, 0); - var20 += 15; - var4 = Login.loginBoxX + 180; - var13 = 301; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Ok", var4, var13 + 5, 16777215, 0); - } else if (Login.loginIndex == 32) { - var19 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var4 = Login.loginBoxX + 180 - 80; - var13 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Set Date of Birth", var4, var13 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var0.drawCentered("Back", var4, var13 + 5, 16777215, 0); - } else if (Login.loginIndex == 33) { - var19 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var19, 16776960, 0); - var20 = var19 + 20; - var1.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 20; - var1.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var20, 16776960, 0); - var20 += 15; - var4 = Login.loginBoxX + 180; - var13 = 276; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var2.drawCentered("Download Launcher", var4, var13 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var13 = 326; - Login.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); - var2.drawCentered("Back", var4, var13 + 5, 16777215, 0); - } - } - } - - if (Client.gameState >= 10) { - int[] var18 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var18); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, WorldMapArchiveLoader.canvasHeight); - class165.field1419.draw(Login.xPadding - 22, Client.cycle); - class165.field1419.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var18); - } - - class304.title_muteSprite[class150.clientPreferences.getTitleMusicDisabled() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && Language.Language_EN == Interpreter.clientLanguage) { - if (class465.field3894 != null) { - var20 = Login.xPadding + 5; - var21 = 463; - byte var28 = 100; - byte var29 = 35; - class465.field3894.drawAt(var20, var21); - var0.drawCentered("World" + " " + Client.worldId, var28 / 2 + var20, var29 / 2 + var21 - 2, 16777215, 0); - if (World.World_request != null) { - var1.drawCentered("Loading...", var28 / 2 + var20, var29 / 2 + var21 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var28 / 2 + var20, var29 / 2 + var21 + 12, 16777215, 0); - } - } else { - class465.field3894 = class451.SpriteBuffer_getIndexedSpriteByName(class386.archive8, "sl_button", ""); - } - } - - } + public int method2078() { + return this.field3678; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class396.java b/osrs/src/main/java/class396.java index 5caa61a02..879803c26 100644 --- a/osrs/src/main/java/class396.java +++ b/osrs/src/main/java/class396.java @@ -1,166 +1,22 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ph") +@ObfuscatedName("pz") public class class396 { - @ObfuscatedName("aw") - int field3670; - - @ObfuscatedSignature( - descriptor = "(IZ)V", - garbageValue = "1" - ) - class396(int var1, boolean var2) { - this.field3670 = var1; - } - - @ObfuscatedName("aw") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-83" + descriptor = "Lgo;" ) - public int method2038() { - return this.field3670; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Lot;II)Llv;", - garbageValue = "946533133" - ) - public static PacketBufferNode method2039(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = class503.getPacketBufferNode(ClientPacket.MESSAGE_PUBLIC, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(0); - int var5 = var4.packetBuffer.offset; - var4.packetBuffer.writeByte(var0); - String var6 = var1.toLowerCase(); - int var7 = 0; - byte[] var8 = null; - if (var6.startsWith("yellow:")) { - var7 = 0; - var1 = var1.substring("yellow:".length()); - } else if (var6.startsWith("red:")) { - var7 = 1; - var1 = var1.substring("red:".length()); - } else if (var6.startsWith("green:")) { - var7 = 2; - var1 = var1.substring("green:".length()); - } else if (var6.startsWith("cyan:")) { - var7 = 3; - var1 = var1.substring("cyan:".length()); - } else if (var6.startsWith("purple:")) { - var7 = 4; - var1 = var1.substring("purple:".length()); - } else if (var6.startsWith("white:")) { - var7 = 5; - var1 = var1.substring("white:".length()); - } else if (var6.startsWith("flash1:")) { - var7 = 6; - var1 = var1.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var7 = 7; - var1 = var1.substring("flash2:".length()); - } else if (var6.startsWith("flash3:")) { - var7 = 8; - var1 = var1.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { - var7 = 9; - var1 = var1.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { - var7 = 10; - var1 = var1.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { - var7 = 11; - var1 = var1.substring("glow3:".length()); - } else if (var6.startsWith("rainbow:")) { - var7 = 12; - var1 = var1.substring("rainbow:".length()); - } else if (var6.startsWith("pattern")) { - boolean var10 = true; - boolean var11 = true; - int var12 = "pattern".length(); - int var13 = 0; - byte[] var14 = new byte[8]; - - byte[] var9; - while (true) { - int var15 = var12 + var13; - if (var15 >= var6.length()) { - var9 = null; - break; - } - - char var16 = var6.charAt(var15); - if (var16 == ':') { - if (var13 == 0) { - var9 = null; - } else { - byte[] var17 = new byte[var13]; - System.arraycopy(var14, 0, var17, 0, var13); - var9 = var17; - } - break; - } - - if (var14.length == var13) { - var9 = null; - break; - } - - if (var16 >= '0' && var16 <= '9') { - var16 = (char)(var16 - '0'); - } else { - if (var16 < 'a' || var16 > 'z') { - var9 = null; - break; - } - - var16 = (char)(var16 - 'W'); - } - - var14[var13++] = (byte)var16; - } - - var8 = var9; - if (var9 != null) { - var7 = var9.length + 12; - var1 = var1.substring("pattern".length() + var9.length + 1); - } - } - - var6 = var1.toLowerCase(); - byte var18 = 0; - if (var6.startsWith("wave:")) { - var18 = 1; - var1 = var1.substring("wave:".length()); - } else if (var6.startsWith("wave2:")) { - var18 = 2; - var1 = var1.substring("wave2:".length()); - } else if (var6.startsWith("shake:")) { - var18 = 3; - var1 = var1.substring("shake:".length()); - } else if (var6.startsWith("scroll:")) { - var18 = 4; - var1 = var1.substring("scroll:".length()); - } else if (var6.startsWith("slide:")) { - var18 = 5; - var1 = var1.substring("slide:".length()); - } - - var4.packetBuffer.writeByte(var7); - var4.packetBuffer.writeByte(var18); - if (var8 != null && Client.param25 >= 214) { - for (int var19 = 0; var19 < var8.length; ++var19) { - var4.packetBuffer.writeByte(var8[var19]); - } - } - - class18.method57(var4.packetBuffer, var1); - if (var0 == class340.field3098.rsOrdinal()) { - var4.packetBuffer.writeByte(var3); - } - - var4.packetBuffer.method2520(var4.packetBuffer.offset - var5); - return var4; + static ClanChannel field3679; + @ObfuscatedName("au") + public char field3680; + @ObfuscatedName("ae") + public int field3681; + @ObfuscatedName("ao") + public int field3682; + + class396() { + this.field3681 = 0; + this.field3682 = 0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class397.java b/osrs/src/main/java/class397.java deleted file mode 100644 index b9cb46f12..000000000 --- a/osrs/src/main/java/class397.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("pz") -public class class397 { - @ObfuscatedName("aw") - public char field3671; - @ObfuscatedName("ay") - public int field3673; - @ObfuscatedName("ar") - public int field3672; - - class397() { - this.field3673 = 0; - this.field3672 = 0; - } -} diff --git a/osrs/src/main/java/class398.java b/osrs/src/main/java/class398.java new file mode 100644 index 000000000..98ef9adb1 --- /dev/null +++ b/osrs/src/main/java/class398.java @@ -0,0 +1,155 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pl") +public class class398 { + @ObfuscatedName("gy") + @Export("playerUUIDLength") + static int playerUUIDLength; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + class394 field3708; + @ObfuscatedName("ae") + int field3706; + @ObfuscatedName("ao") + int field3707; + + @ObfuscatedSignature( + descriptor = "(Lpj;II)V" + ) + class398(class394 var1, int var2, int var3) { + this.field3706 = 0; + this.field3707 = 0; + this.field3708 = var1; + this.field3706 = var2; + this.field3707 = var3; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "1" + ) + public String method2113() { + if (this.method2115()) { + return ""; + } else { + StringBuilder var1 = new StringBuilder(this.method2116()); + + for (int var2 = this.field3706; var2 < this.field3707; ++var2) { + class396 var3 = this.field3708.method2036(var2); + var1.append(var3.field3680); + } + + return var1.toString(); + } + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "0" + ) + boolean method2114(int var1) { + return this.field3708.method2068() == 2 || this.field3708.method2068() == 1 && (!this.field3708.field3668 || this.field3707 - 1 != var1); + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "181871891" + ) + public boolean method2115() { + return this.field3706 == this.field3707; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1557600445" + ) + public int method2116() { + return this.field3707 - this.field3706; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lpz;I)Z", + garbageValue = "-663348628" + ) + boolean method2117(class396 var1) { + if (this.field3708.field3674 == 2) { + return true; + } else if (this.field3708.field3674 == 0) { + return false; + } else { + return this.field3708.method2037() != var1; + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-808768391" + ) + int method2118() { + if (this.method2115()) { + return 0; + } else { + class396 var1 = this.field3708.method2036(this.field3707 - 1); + if (var1.field3680 == '\n') { + return 0; + } else if (this.method2117(var1)) { + return this.field3708.field3677.advances[42]; + } else { + int var2 = this.field3708.field3677.advances[var1.field3680]; + if (var2 == 0) { + return var1.field3680 == '\t' ? this.field3708.field3677.advances[32] * 3 : this.field3708.field3677.advances[32]; + } else { + return var2; + } + } + } + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)Lss;", + garbageValue = "-873357566" + ) + public class485 method2119() { + if (this.method2115()) { + return new class485(0, 0); + } else { + class396 var1 = this.field3708.method2036(this.field3707 - 1); + return new class485(var1.field3681 + this.method2118(), var1.field3682); + } + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(II)Lpz;", + garbageValue = "602399469" + ) + public class396 method2120(int var1) { + return var1 >= 0 && var1 < this.method2116() ? this.field3708.method2036(this.field3706 + var1) : null; + } + + @ObfuscatedName("mj") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-46" + ) + static boolean method2121(int var0) { + for (int var1 = 0; var1 < Client.field532; ++var1) { + if (Client.field581[var1] == var0) { + return true; + } + } + + return false; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class399.java b/osrs/src/main/java/class399.java deleted file mode 100644 index 934b23d41..000000000 --- a/osrs/src/main/java/class399.java +++ /dev/null @@ -1,149 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("po") -public class class399 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lpt;" - ) - class395 field3698; - @ObfuscatedName("ay") - int field3697; - @ObfuscatedName("ar") - int field3696; - - @ObfuscatedSignature( - descriptor = "(Lpt;II)V" - ) - class399(class395 var1, int var2, int var3) { - this.field3697 = 0; - this.field3696 = 0; - this.field3698 = var1; - this.field3697 = var2; - this.field3696 = var3; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1809601354" - ) - public String method2074() { - if (this.method2076()) { - return ""; - } else { - StringBuilder var1 = new StringBuilder(this.method2077()); - - for (int var2 = this.field3697; var2 < this.field3696; ++var2) { - class397 var3 = this.field3698.method1995(var2); - var1.append(var3.field3671); - } - - return var1.toString(); - } - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1827126332" - ) - boolean method2075(int var1) { - return this.field3698.method2027() == 2 || this.field3698.method2027() == 1 && (!this.field3698.field3660 || this.field3696 - 1 != var1); - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-587840558" - ) - public boolean method2076() { - return this.field3697 == this.field3696; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "107" - ) - public int method2077() { - return this.field3696 - this.field3697; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lpz;I)Z", - garbageValue = "-1646717603" - ) - boolean method2078(class397 var1) { - if (this.field3698.field3665 == 2) { - return true; - } else if (this.field3698.field3665 == 0) { - return false; - } else { - return this.field3698.method1996() != var1; - } - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1502136655" - ) - int method2079() { - if (this.method2076()) { - return 0; - } else { - class397 var1 = this.field3698.method1995(this.field3696 - 1); - if (var1.field3671 == '\n') { - return 0; - } else if (this.method2078(var1)) { - return this.field3698.field3669.advances[42]; - } else { - int var2 = this.field3698.field3669.advances[var1.field3671]; - if (var2 == 0) { - return var1.field3671 == '\t' ? this.field3698.field3669.advances[32] * 3 : this.field3698.field3669.advances[32]; - } else { - return var2; - } - } - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)Lsf;", - garbageValue = "-631307887" - ) - public class486 method2080() { - if (this.method2076()) { - return new class486(0, 0); - } else { - class397 var1 = this.field3698.method1995(this.field3696 - 1); - return new class486(var1.field3673 + this.method2079(), var1.field3672); - } - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(II)Lpz;", - garbageValue = "-2132806837" - ) - public class397 method2081(int var1) { - return var1 >= 0 && var1 < this.method2077() ? this.field3698.method1995(this.field3697 + var1) : null; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "687406142" - ) - static int method2082(int var0, int var1, int var2) { - if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { - return 0; - } else { - return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; - } - } -} diff --git a/osrs/src/main/java/class4.java b/osrs/src/main/java/class4.java index 9ebdafdc6..428505050 100644 --- a/osrs/src/main/java/class4.java +++ b/osrs/src/main/java/class4.java @@ -1,22 +1,381 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("ac") public final class class4 { - @ObfuscatedName("ua") - static int field3; - @ObfuscatedName("ax") + @ObfuscatedName("gh") + @Export("currentPort") + static int currentPort; + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Luu;" + descriptor = "(IIILiw;Lis;Z[I[ILij;I)I", + garbageValue = "-375034258" ) - static IndexedSprite field4; + public static int method4(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7, class216 var8) { + var8.method1128(); + int var9 = var8.method1132(); + int var10 = var8.method1133(); + int[][] var11 = var8.method1135(); + int[][] var12 = var8.method1134(); + int[] var13 = var8.method1136(); + int[] var14 = var8.method1137(); + boolean var15; + int var17; + int var18; + int var23; + int var24; + int var25; + int var26; + int var27; + int var28; + int var29; + int var31; + int var33; + int var42; + if (var2 == 1) { + var17 = var8.method1132(); + var18 = var8.method1133(); + int[][] var19 = var8.method1135(); + int[][] var20 = var8.method1134(); + int[] var21 = var8.method1136(); + int[] var22 = var8.method1137(); + var23 = var8.method1138(); + var24 = var0; + var25 = var1; + var26 = var17 >> 1; + var27 = var18 >> 1; + var28 = var0 - var26; + var29 = var1 - var27; + var20[var26][var27] = 99; + var19[var26][var27] = 0; + byte var30 = 0; + var31 = 0; + var21[var30] = var0; + var42 = var30 + 1; + var22[var30] = var1; + int[][] var32 = var4.flags; + + boolean var16; + while (true) { + if (var42 == var31) { + var8.method1129(var24, var25); + var16 = false; + break; + } + + var24 = var21[var31]; + var25 = var22[var31]; + var31 = var31 + 1 & var23; + var26 = var24 - var28; + var27 = var25 - var29; + var33 = var24 - var4.xInset; + int var34 = var25 - var4.yInset; + if (var3.hasArrived(1, var24, var25, var4)) { + var8.method1129(var24, var25); + var16 = true; + break; + } + + int var35 = var19[var26][var27] + 1; + if (var26 > 0 && var20[var26 - 1][var27] == 0 && (var32[var33 - 1][var34] & 19136776) == 0) { + var21[var42] = var24 - 1; + var22[var42] = var25; + var42 = var42 + 1 & var23; + var20[var26 - 1][var27] = 2; + var19[var26 - 1][var27] = var35; + } + + if (var26 < var17 - 1 && var20[var26 + 1][var27] == 0 && (var32[var33 + 1][var34] & 19136896) == 0) { + var21[var42] = var24 + 1; + var22[var42] = var25; + var42 = var42 + 1 & var23; + var20[var26 + 1][var27] = 8; + var19[var26 + 1][var27] = var35; + } + + if (var27 > 0 && var20[var26][var27 - 1] == 0 && (var32[var33][var34 - 1] & 19136770) == 0) { + var21[var42] = var24; + var22[var42] = var25 - 1; + var42 = var42 + 1 & var23; + var20[var26][var27 - 1] = 1; + var19[var26][var27 - 1] = var35; + } + + if (var27 < var18 - 1 && var20[var26][var27 + 1] == 0 && (var32[var33][var34 + 1] & 19136800) == 0) { + var21[var42] = var24; + var22[var42] = var25 + 1; + var42 = var42 + 1 & var23; + var20[var26][var27 + 1] = 4; + var19[var26][var27 + 1] = var35; + } + + if (var26 > 0 && var27 > 0 && var20[var26 - 1][var27 - 1] == 0 && (var32[var33 - 1][var34 - 1] & 19136782) == 0 && (var32[var33 - 1][var34] & 19136776) == 0 && (var32[var33][var34 - 1] & 19136770) == 0) { + var21[var42] = var24 - 1; + var22[var42] = var25 - 1; + var42 = var42 + 1 & var23; + var20[var26 - 1][var27 - 1] = 3; + var19[var26 - 1][var27 - 1] = var35; + } + + if (var26 < var17 - 1 && var27 > 0 && var20[var26 + 1][var27 - 1] == 0 && (var32[var33 + 1][var34 - 1] & 19136899) == 0 && (var32[var33 + 1][var34] & 19136896) == 0 && (var32[var33][var34 - 1] & 19136770) == 0) { + var21[var42] = var24 + 1; + var22[var42] = var25 - 1; + var42 = var42 + 1 & var23; + var20[var26 + 1][var27 - 1] = 9; + var19[var26 + 1][var27 - 1] = var35; + } + + if (var26 > 0 && var27 < var18 - 1 && var20[var26 - 1][var27 + 1] == 0 && (var32[var33 - 1][var34 + 1] & 19136824) == 0 && (var32[var33 - 1][var34] & 19136776) == 0 && (var32[var33][var34 + 1] & 19136800) == 0) { + var21[var42] = var24 - 1; + var22[var42] = var25 + 1; + var42 = var42 + 1 & var23; + var20[var26 - 1][var27 + 1] = 6; + var19[var26 - 1][var27 + 1] = var35; + } + + if (var26 < var17 - 1 && var27 < var18 - 1 && var20[var26 + 1][var27 + 1] == 0 && (var32[var33 + 1][var34 + 1] & 19136992) == 0 && (var32[var33 + 1][var34] & 19136896) == 0 && (var32[var33][var34 + 1] & 19136800) == 0) { + var21[var42] = var24 + 1; + var22[var42] = var25 + 1; + var42 = var42 + 1 & var23; + var20[var26 + 1][var27 + 1] = 12; + var19[var26 + 1][var27 + 1] = var35; + } + } + + var15 = var16; + } else if (var2 == 2) { + var15 = LoginPacket.method1616(var0, var1, var3, var4, var8); + } else { + var15 = FontName.method2446(var0, var1, var2, var3, var4, var8); + } + + int var41 = var0 - (var9 >> 1); + var17 = var1 - (var10 >> 1); + var18 = var8.method1130(); + int var36 = var8.method1131(); + int var37; + int var38; + if (!var15) { + var37 = Integer.MAX_VALUE; + var38 = Integer.MAX_VALUE; + byte var39 = 10; + var23 = var3.approxDestinationX; + var24 = var3.approxDestinationY; + var25 = var3.approxDestinationSizeX; + var26 = var3.approxDestinationSizeY; + + for (var27 = var23 - var39; var27 <= var39 + var23; ++var27) { + for (var28 = var24 - var39; var28 <= var24 + var39; ++var28) { + var29 = var27 - var41; + var42 = var28 - var17; + if (var29 >= 0 && var42 >= 0 && var29 < var9 && var42 < var10 && var11[var29][var42] < 100) { + var31 = 0; + if (var27 < var23) { + var31 = var23 - var27; + } else if (var27 > var23 + var25 - 1) { + var31 = var27 - (var25 + var23 - 1); + } + + int var40 = 0; + if (var28 < var24) { + var40 = var24 - var28; + } else if (var28 > var26 + var24 - 1) { + var40 = var28 - (var26 + var24 - 1); + } + + var33 = var40 * var40 + var31 * var31; + if (var33 < var37 || var33 == var37 && var11[var29][var42] < var38) { + var37 = var33; + var38 = var11[var29][var42]; + var18 = var27; + var36 = var28; + } + } + } + } + + if (var37 == Integer.MAX_VALUE) { + return -1; + } + } + + if (var0 == var18 && var36 == var1) { + var6[0] = var18; + var7[0] = var36; + return 0; + } else { + byte var43 = 0; + var13[var43] = var18; + var37 = var43 + 1; + var14[var43] = var36; + + int var44; + for (var38 = var44 = var12[var18 - var41][var36 - var17]; var0 != var18 || var36 != var1; var38 = var12[var18 - var41][var36 - var17]) { + if (var38 != var44) { + var44 = var38; + var13[var37] = var18; + var14[var37++] = var36; + } + + if ((var38 & 2) != 0) { + ++var18; + } else if ((var38 & 8) != 0) { + --var18; + } + + if ((var38 & 1) != 0) { + ++var36; + } else if ((var38 & 4) != 0) { + --var36; + } + } - @ObfuscatedName("in") + var23 = 0; + + while (var37-- > 0) { + var6[var23] = var13[var37]; + var7[var23++] = var14[var37]; + if (var23 >= var6.length) { + break; + } + } + + return var23; + } + } + + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "67" + descriptor = "(IIIIIZI)Lui;", + garbageValue = "693042452" ) - static final int method5(int var0) { - return Math.abs(var0 - class456.cameraYaw) > 1024 ? 2048 * (var0 < class456.cameraYaw ? 1 : -1) + var0 : var0; + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { + var4 = 0; + } else if (var4 == 2 && var1 != 1) { + var4 = 1; + } + + long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); + SpritePixels var8; + if (!var5) { + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { + return var8; + } + } + + ItemComposition var9 = InvDefinition.ItemDefinition_get(var0); + if (var1 > 1 && var9.countobj != null) { + int var10 = -1; + + for (int var11 = 0; var11 < 10; ++var11) { + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { + var9 = InvDefinition.ItemDefinition_get(var10); + } + } + + Model var22 = var9.getModel(1); + if (var22 == null) { + return null; + } else { + SpritePixels var23 = null; + if (var9.noteTemplate != -1) { + var23 = getItemSprite(var9.note, 10, 1, 0, 0, true); + if (var23 == null) { + return null; + } + } else if (var9.notedId != -1) { + var23 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + if (var23 == null) { + return null; + } + } else if (var9.placeholderTemplate != -1) { + var23 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + if (var23 == null) { + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; + int var13 = Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_height; + float[] var15 = Rasterizer2D.field4217; + int[] var16 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var16); + var8 = new SpritePixels(36, 32); + Rasterizer3D.method1198(var8.pixels, 36, 32, (float[])null); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.method1199(); + Rasterizer3D.method1202(16, 16); + Rasterizer3D.clips.field2279 = false; + if (var9.placeholderTemplate != -1) { + var23.drawTransBgAt(0, 0); + } + + int var17 = var9.zoom2d; + if (var5) { + var17 = (int)((double)var17 * 1.5D); + } else if (var2 == 2) { + var17 = (int)((double)var17 * 1.04D); + } + + int var18 = var17 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; + int var19 = var17 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; + var22.calculateBoundsCylinder(); + var22.method1338(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var22.height / 2 + var18 + var9.offsetY2d, var19 + var9.offsetY2d); + if (var9.notedId != -1) { + var23.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { + var8.outline(1); + } + + if (var2 >= 2) { + var8.outline(16777215); + } + + if (var3 != 0) { + var8.shadow(var3); + } + + Rasterizer3D.method1198(var8.pixels, 36, 32, (float[])null); + if (var9.noteTemplate != -1) { + var23.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + Font var20 = class452.ItemDefinition_fontPlain11; + String var21; + if (var1 < 100000) { + var21 = "" + var1 + ""; + } else if (var1 < 10000000) { + var21 = "" + var1 / 1000 + "K" + ""; + } else { + var21 = "" + var1 / 1000000 + "M" + ""; + } + + var20.draw(var21, 0, 9, 16776960, 1); + } + + if (!var5) { + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer3D.method1198(var12, var13, var14, var15); + Rasterizer2D.Rasterizer2D_setClipArray(var16); + Rasterizer3D.method1199(); + Rasterizer3D.clips.field2279 = true; + return var8; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class401.java b/osrs/src/main/java/class401.java new file mode 100644 index 000000000..7bfe42a08 --- /dev/null +++ b/osrs/src/main/java/class401.java @@ -0,0 +1,73 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; +import java.util.Iterator; + +@ObfuscatedName("pv") +public class class401 extends SongTask { + @ObfuscatedName("au") + ArrayList field3711; + + @ObfuscatedSignature( + descriptor = "(Lpm;Ljava/util/ArrayList;)V" + ) + public class401(SongTask var1, ArrayList var2) { + super(var1); + super.field3722 = "ClearRequestTask"; + this.field3711 = var2; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1604030758" + ) + public boolean vmethod2142() { + if (this.field3711.isEmpty()) { + return true; + } else { + Iterator var1 = this.field3711.iterator(); + + while (var1.hasNext()) { + MusicSong var2 = (MusicSong)var1.next(); + + try { + if (class305.musicSongs.contains(var2)) { + if (var2 == null) { + class305.musicSongs.remove(var2); + } else { + if (var2.midiPcmStream.field2809 > 0) { + --var2.midiPcmStream.field2809; + } + + if (var2.midiPcmStream.field2809 == 0) { + var2.midiPcmStream.clear(); + var2.midiPcmStream.method1633(); + var2.midiPcmStream.setPcmStreamVolume(0); + } + + int var3 = var2.musicTrackGroupId; + int var4 = var2.musicTrackFileId; + Iterator var5 = class305.field2778.iterator(); + + while (var5.hasNext()) { + class311 var6 = (class311)var5.next(); + var6.vmethod1644(var3, var4); + } + + class305.musicSongs.remove(var2); + } + } + } catch (Exception var8) { + Messages.RunException_sendStackTrace((String)null, var8); + this.method2138(var8.getMessage()); + class305.musicSongs.clear(); + return true; + } + } + + return true; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class402.java b/osrs/src/main/java/class402.java deleted file mode 100644 index 9d9e553c4..000000000 --- a/osrs/src/main/java/class402.java +++ /dev/null @@ -1,61 +0,0 @@ -import java.util.ArrayList; -import java.util.Iterator; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pu") -public class class402 extends SongTask { - @ObfuscatedName("aw") - ArrayList field3699; - - @ObfuscatedSignature( - descriptor = "(Lpp;Ljava/util/ArrayList;)V" - ) - public class402(SongTask var1, ArrayList var2) { - super(var1); - super.field3712 = "ClearRequestTask"; - this.field3699 = var2; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "994462530" - ) - public boolean vmethod2107(int var1) { - if (this.field3699.isEmpty()) { - return true; - } else { - Iterator var2 = this.field3699.iterator(); - - while (var2.hasNext()) { - MusicSong var3 = (MusicSong)var2.next(); - - try { - if (class306.musicSongs.contains(var3)) { - if (var3 == null) { - class306.musicSongs.remove(var3); - } else { - --var3.midiPcmStream.field2795; - if (var3.midiPcmStream.field2795 == 0) { - var3.midiPcmStream.clear(); - var3.midiPcmStream.method1592(); - var3.midiPcmStream.setPcmStreamVolume(0); - } - - FloorOverlayDefinition.method1052(var3.musicTrackGroupId, var3.musicTrackFileId); - class306.musicSongs.remove(var3); - } - } - } catch (Exception var5) { - var5.printStackTrace(); - this.method2102(var5.getMessage()); - class306.musicSongs.clear(); - return true; - } - } - - return true; - } - } -} diff --git a/osrs/src/main/java/class403.java b/osrs/src/main/java/class403.java new file mode 100644 index 000000000..8299e08f5 --- /dev/null +++ b/osrs/src/main/java/class403.java @@ -0,0 +1,54 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("pd") +public class class403 extends SongTask { + @ObfuscatedName("ae") + @Export("clearLoginScreen") + static boolean clearLoginScreen; + + @ObfuscatedSignature( + descriptor = "(Lpm;)V" + ) + public class403(SongTask var1) { + super(var1); + super.field3722 = "StartSongTask"; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1604030758" + ) + public boolean vmethod2142() { + Iterator var1 = class305.musicSongs.iterator(); + + while (var1.hasNext()) { + MusicSong var2 = (MusicSong)var1.next(); + if (var2 != null && !var2.field2865 && var2.midiPcmStream != null) { + try { + var2.midiPcmStream.method1632(); + var2.midiPcmStream.setPcmStreamVolume(0); + if (var2.field2872 != null) { + var2.midiPcmStream.setMusicTrack(var2.field2872, var2.musicTrackBoolean); + } + + var2.field2872 = null; + var2.field2861 = null; + var2.musicTrackArchive = null; + var2.field2865 = true; + } catch (Exception var4) { + Messages.RunException_sendStackTrace((String)null, var4); + this.method2138(var4.getMessage()); + return true; + } + } + } + + super.field3721 = true; + return true; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class404.java b/osrs/src/main/java/class404.java deleted file mode 100644 index afde91f8a..000000000 --- a/osrs/src/main/java/class404.java +++ /dev/null @@ -1,57 +0,0 @@ -import java.util.Iterator; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pi") -public class class404 extends SongTask { - @ObfuscatedSignature( - descriptor = "(Lpp;)V" - ) - public class404(SongTask var1) { - super(var1); - super.field3712 = "StartSongTask"; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "994462530" - ) - public boolean vmethod2107(int var1) { - Iterator var2 = class306.musicSongs.iterator(); - - while (var2.hasNext()) { - MusicSong var3 = (MusicSong)var2.next(); - if (var3 != null && !var3.field2852 && var3.midiPcmStream != null) { - try { - var3.midiPcmStream.method1591(); - var3.midiPcmStream.setPcmStreamVolume(0); - if (var3.field2858 != null) { - var3.midiPcmStream.setMusicTrack(var3.field2858, var3.musicTrackBoolean); - } - - var3.field2858 = null; - var3.field2848 = null; - var3.musicTrackArchive = null; - var3.field2852 = true; - } catch (Exception var5) { - var5.printStackTrace(); - this.method2102(var5.getMessage()); - return true; - } - } - } - - super.field3711 = true; - return true; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lnd;B)V", - garbageValue = "108" - ) - public static void method2093(AbstractArchive var0) { - DbTableType.field4098 = var0; - } -} diff --git a/osrs/src/main/java/class408.java b/osrs/src/main/java/class408.java new file mode 100644 index 000000000..93f100987 --- /dev/null +++ b/osrs/src/main/java/class408.java @@ -0,0 +1,118 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("pp") +public class class408 extends SongTask { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + AbstractArchive field3728; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + AbstractArchive field3726; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + AbstractArchive field3727; + + @ObfuscatedSignature( + descriptor = "(Lpm;Lnu;Lnu;Lnu;)V" + ) + public class408(SongTask var1, AbstractArchive var2, AbstractArchive var3, AbstractArchive var4) { + super(var1); + this.field3728 = var2; + this.field3726 = var3; + this.field3727 = var4; + super.field3722 = "LoadSongTask"; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1604030758" + ) + public boolean vmethod2142() { + int var1 = 0; + Iterator var2 = class305.musicSongs.iterator(); + + while (true) { + while (var2.hasNext()) { + MusicSong var3 = (MusicSong)var2.next(); + if (var3 != null && var3.midiPcmStream.field2809 > 1 && var3.midiPcmStream.method1637()) { + this.method2138("Attempted to load patches of already loading midiplayer!"); + return true; + } + + if (var3 != null && !var3.field2866) { + try { + if (var3.musicTrackArchive != null && var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { + if (var3.field2872 == null) { + var3.field2872 = MusicTrack.readTrack(var3.musicTrackArchive, var3.musicTrackGroupId, var3.musicTrackFileId); + if (var3.field2872 == null) { + continue; + } + } + + if (var3.field2861 == null) { + var3.field2861 = new SoundCache(this.field3727, this.field3726); + } + + if (var3.midiPcmStream.method1630(var3.field2872, this.field3728, var3.field2861)) { + ++var1; + var3.field2866 = true; + var3.midiPcmStream.method1631(); + } + } else { + ++var1; + } + } catch (Exception var5) { + Messages.RunException_sendStackTrace((String)null, var5); + this.method2138(var5.getMessage()); + return true; + } + } else { + ++var1; + } + } + + if (var1 == class305.musicSongs.size()) { + return true; + } + + return false; + } + } + + @ObfuscatedName("nr") + @ObfuscatedSignature( + descriptor = "(IIIILui;Lme;I)V", + garbageValue = "-1567258086" + ) + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; + if (var6 > 4225 && var6 < 90000) { + int var7 = Client.camAngleY & 2047; + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; + int var10 = var3 * var8 + var9 * var2 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + double var12 = Math.atan2((double)var10, (double)var11); + int var14 = var5.width / 2 - 25; + int var15 = (int)(Math.sin(var12) * (double)var14); + int var16 = (int)(Math.cos(var12) * (double)var14); + byte var17 = 20; + class167.redHintArrowSprite.method2686(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + } else { + class210.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class409.java b/osrs/src/main/java/class409.java new file mode 100644 index 000000000..2c0f76cb8 --- /dev/null +++ b/osrs/src/main/java/class409.java @@ -0,0 +1,94 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +import java.util.Random; + +@ObfuscatedName("pg") +public class class409 { + @ObfuscatedName("au") + @Export("writeRandomDat") + public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { + if (var2 == var0) { + if (var3 == var1) { + return; + } + + if (var3 > var1 && var3 < var4 + var1) { + --var4; + var1 += var4; + var3 += var4; + var4 = var1 - var4; + + for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + } + + for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { + } + + return; + } + } + + var4 += var1; + + for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + } + + for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { + } + + } + + @ObfuscatedName("af") + @Export("clearIntArray") + public static void clearIntArray(int[] var0, int var1, int var2) { + for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + } + + for (var2 += 7; var1 < var2; var0[var1++] = 0) { + } + + } + + @ObfuscatedName("ad") + public static void method2146(int[] var0, int var1, int var2, int var3) { + if (var2 == 0 && var3 == 0) { + var2 = (int)(Math.random() * 2.147483647E9D); + var3 = (int)(Math.random() * 2.147483647E9D); + } + + long var4 = (long)var2 << 32 | (long)var3; + Random var6 = new Random(var4); + + for (int var7 = var1 - 1; var7 > 0; --var7) { + int var8 = var6.nextInt(var7 + 1); + if (var7 != var8) { + int var9 = var0[var7]; + var0[var7] = var0[var8]; + var0[var8] = var9; + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class410.java b/osrs/src/main/java/class410.java index c3ae622f2..803257c7c 100644 --- a/osrs/src/main/java/class410.java +++ b/osrs/src/main/java/class410.java @@ -1,71 +1,30 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("py") +@ObfuscatedName("ph") public class class410 { - @ObfuscatedName("aw") - @Export("writeRandomDat") - public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { - if (var2 == var0) { - if (var3 == var1) { - return; - } - - if (var3 > var1 && var3 < var4 + var1) { - --var4; - var1 += var4; - var3 += var4; - var4 = var1 - var4; - - for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - } - - for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { - } - - return; - } - } - - var4 += var1; - - for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - } - - for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { - } - - } - - @ObfuscatedName("ap") - @Export("clearIntArray") - public static void clearIntArray(int[] var0, int var1, int var2) { - for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - } - - for (var2 += 7; var1 < var2; var0[var1++] = 0) { - } - + @ObfuscatedName("ax") + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("au") + int field3733; + @ObfuscatedName("ae") + int field3730; + @ObfuscatedName("ao") + int field3731; + @ObfuscatedName("at") + int field3732; + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + boolean var1 = true; + int var2 = 10 - Integer.toString(this.field3733).length(); + int var3 = 10 - Integer.toString(this.field3731).length(); + int var4 = 10 - Integer.toString(this.field3730).length(); + String var5 = " ".substring(10 - var2); + String var6 = " ".substring(10 - var3); + String var7 = " ".substring(10 - var4); + return " Size: " + this.field3733 + var5 + "Created: " + this.field3730 + var7 + "Total used: " + this.field3731 + var6 + "Max-In-Use: " + this.field3732; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class411.java b/osrs/src/main/java/class411.java deleted file mode 100644 index 657e90937..000000000 --- a/osrs/src/main/java/class411.java +++ /dev/null @@ -1,27 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("pw") -public class class411 { - @ObfuscatedName("aw") - int field3721; - @ObfuscatedName("ay") - int field3722; - @ObfuscatedName("ar") - int field3720; - @ObfuscatedName("am") - int field3719; - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - boolean var1 = true; - int var2 = 10 - Integer.toString(this.field3721).length(); - int var3 = 10 - Integer.toString(this.field3720).length(); - int var4 = 10 - Integer.toString(this.field3722).length(); - String var5 = " ".substring(10 - var2); - String var6 = " ".substring(10 - var3); - String var7 = " ".substring(10 - var4); - return " Size: " + this.field3721 + var5 + "Created: " + this.field3722 + var7 + "Total used: " + this.field3720 + var6 + "Max-In-Use: " + this.field3719; - } -} diff --git a/osrs/src/main/java/class415.java b/osrs/src/main/java/class415.java index af7c5116f..c213ddefa 100644 --- a/osrs/src/main/java/class415.java +++ b/osrs/src/main/java/class415.java @@ -2,15 +2,269 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pr") +import java.io.IOException; + +@ObfuscatedName("pw") public class class415 { - @ObfuscatedName("ay") + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "66" + ) + @Export("reloadJS5") + static void reloadJS5() { + if (KeyHandler.varcs.hasUnwrittenChanges()) { + KeyHandler.varcs.write(); + } + + if (class126.mouseRecorder != null) { + class126.mouseRecorder.isRunning = false; + } + + class126.mouseRecorder = null; + Client.packetWriter.close(); + if (GameEngine.taskHandler != null) { + try { + GameEngine.taskHandler.close(); + } catch (Exception var3) { + } + } + + GameEngine.taskHandler = null; + Tiles.method461(); + class1.archive2.clearFiles(); + Player.archive13.clearFiles(); + class106.field1107.clearFiles(); + Tiles.field838.clearFiles(); + class10.field28.clearFiles(); + WorldMapElement.field1509.clearFiles(); + ClanChannelMember.field1339.clearFiles(); + class227.field2040.clearFiles(); + class72.method424(); + class130.scene.clear(); + + for (int var1 = 0; var1 < 4; ++var1) { + Client.collisionMaps[var1].clear(); + } + + Canvas.worldMap = null; + Script.method445(0, 0); + UrlRequester.method652(); + Client.playingJingle = false; + class388.method2029(); + if (AddRequestTask.pcmPlayer1 != null) { + AddRequestTask.pcmPlayer1.shutdown(); + } + + class308.field2819.method1940(); + class214.method1124(); + if (FriendsChat.urlRequester != null) { + FriendsChat.urlRequester.close(); + } + + class510.method2513(); + JagexCache.JagexCache_dat2File = null; + JagexCache.JagexCache_idx255File = null; + WallDecoration.JagexCache_idxFiles = null; + ItemContainer.method468(); + class6.masterDisk = null; + Client.archiveLoaders.clear(); + Client.field550 = 0; + class308.field2819 = new JagNetThread(); + FriendsChat.urlRequester = new class113(class219.client.field661, 216); + + try { + SecureRandomCallable.method462("oldschool", class30.field83, WorldMapLabelSize.field2323.name, 0, 22); + } catch (IOException var2) { + throw new RuntimeException(var2); + } + + class6.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + GameEngine.taskHandler = new TaskHandler(); + class219.client.method152(); + Client.field419 = class92.field940; + MusicSong.updateGameState(0); + } + + @ObfuscatedName("ix") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1913054619" + descriptor = "(I)V", + garbageValue = "-1762836764" ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - class213.addChatMessage(var0, var1, var2, (String)null); + static final void method2159() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { + var0 = VarbitComposition.localPlayer.x; + var1 = VarbitComposition.localPlayer.y; + if (FriendLoginUpdate.oculusOrbFocalPointX - var0 < -500 || FriendLoginUpdate.oculusOrbFocalPointX - var0 > 500 || HealthBar.oculusOrbFocalPointY - var1 < -500 || HealthBar.oculusOrbFocalPointY - var1 > 500) { + FriendLoginUpdate.oculusOrbFocalPointX = var0; + HealthBar.oculusOrbFocalPointY = var1; + } + + if (var0 != FriendLoginUpdate.oculusOrbFocalPointX) { + FriendLoginUpdate.oculusOrbFocalPointX += (var0 - FriendLoginUpdate.oculusOrbFocalPointX) / 16; + } + + if (var1 != HealthBar.oculusOrbFocalPointY) { + HealthBar.oculusOrbFocalPointY += (var1 - HealthBar.oculusOrbFocalPointY) / 16; + } + + var2 = FriendLoginUpdate.oculusOrbFocalPointX >> 7; + var3 = HealthBar.oculusOrbFocalPointY >> 7; + var4 = class18.getTileHeight(FriendLoginUpdate.oculusOrbFocalPointX, HealthBar.oculusOrbFocalPointY, HealthBar.Client_plane); + var5 = 0; + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { + int var8 = HealthBar.Client_plane; + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { + ++var8; + } + + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; + if (var9 > var5) { + var5 = var9; + } + } + } + } + + var6 = var5 * 192; + if (var6 > 98048) { + var6 = 98048; + } + + if (var6 < 32768) { + var6 = 32768; + } + + if (var6 > Client.field467) { + Client.field467 += (var6 - Client.field467) / 24; + } else if (var6 < Client.field467) { + Client.field467 += (var6 - Client.field467) / 80; + } + + class125.field1194 = class18.getTileHeight(VarbitComposition.localPlayer.x, VarbitComposition.localPlayer.y, HealthBar.Client_plane) - Client.camFollowHeight; + } else if (Client.oculusOrbState == 1) { + class28.method111(); + short var10 = -1; + if (Client.keyHandlerInstance.getKeyPressed(33)) { + var10 = 0; + } else if (Client.keyHandlerInstance.getKeyPressed(49)) { + var10 = 1024; + } + + if (Client.keyHandlerInstance.getKeyPressed(48)) { + if (var10 == 0) { + var10 = 1792; + } else if (var10 == 1024) { + var10 = 1280; + } else { + var10 = 1536; + } + } else if (Client.keyHandlerInstance.getKeyPressed(50)) { + if (var10 == 0) { + var10 = 256; + } else if (var10 == 1024) { + var10 = 768; + } else { + var10 = 512; + } + } + + byte var11 = 0; + if (Client.keyHandlerInstance.getKeyPressed(35)) { + var11 = -1; + } else if (Client.keyHandlerInstance.getKeyPressed(51)) { + var11 = 1; + } + + var2 = 0; + if (var10 >= 0 || var11 != 0) { + var2 = Client.keyHandlerInstance.getKeyPressed(81) ? Client.oculusOrbSlowedSpeed * 1039153205 * -557098467 : Client.oculusOrbNormalSpeed * -554086649 * 623963831; + var2 *= 16; + Client.field468 = var10; + Client.field471 = var11; + } + + if (Client.field480 < var2) { + Client.field480 += var2 / 8; + if (Client.field480 > var2) { + Client.field480 = var2; + } + } else if (Client.field480 > var2) { + Client.field480 = Client.field480 * 9 / 10; + } + + if (Client.field480 > 0) { + var3 = Client.field480 / 16; + if (Client.field468 >= 0) { + var0 = Client.field468 - UserComparator10.cameraYaw & 2047; + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; + FriendLoginUpdate.oculusOrbFocalPointX += var4 * var3 / 65536; + HealthBar.oculusOrbFocalPointY += var5 * var3 / 65536; + } + + if (Client.field471 != 0) { + class125.field1194 += var3 * Client.field471; + if (class125.field1194 > 0) { + class125.field1194 = 0; + } + } + } else { + Client.field468 = -1; + Client.field471 = -1; + } + + if (Client.keyHandlerInstance.getKeyPressed(13)) { + ObjectSound.method416(); + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && ObjTypeCustomisation.mouseCam) { + var0 = MouseHandler.MouseHandler_y - Client.field465; + Client.camAngleDX = var0 * 2; + Client.field465 = var0 != -1 && var0 != 1 ? (Client.field465 + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * 1545391541 * 1675983005; + var1 = Client.field473 - MouseHandler.MouseHandler_x; + Client.camAngleDY = var1 * 2; + Client.field473 = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.field473) / 2 : MouseHandler.MouseHandler_x * 72258787 * 2105757899; + } else { + if (Client.keyHandlerInstance.getKeyPressed(96)) { + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (Client.keyHandlerInstance.getKeyPressed(97)) { + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; + } + + if (Client.keyHandlerInstance.getKeyPressed(98)) { + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (Client.keyHandlerInstance.getKeyPressed(99)) { + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; + } + + Client.field465 = MouseHandler.MouseHandler_y; + Client.field473 = MouseHandler.MouseHandler_x; + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; + Client.camAngleX += Client.camAngleDX / 2; + if (Client.camAngleX < 128) { + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { + Client.camAngleX = 383; + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class416.java b/osrs/src/main/java/class416.java new file mode 100644 index 000000000..d29179b61 --- /dev/null +++ b/osrs/src/main/java/class416.java @@ -0,0 +1,82 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qe") +public class class416 { + @ObfuscatedName("ag") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-1333151916" + ) + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + if (var4 == null) { + var4 = new ChatChannel(); + Messages.Messages_channels.put(var0, var4); + } + + Message var5 = var4.addMessage(var0, var1, var2, var3); + Messages.Messages_hashTable.put(var5, (long)var5.count); + Messages.Messages_queue.add(var5); + Client.chatCycle = Client.cycleCntr; + } + + @ObfuscatedName("ia") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-2143808168" + ) + static final void method2161(int var0, int var1) { + if (var0 < 128) { + var0 = 128; + } else if (var0 > 383) { + var0 = 383; + } + + if (class129.cameraPitch < var0) { + class129.cameraPitch = (var0 - class129.cameraPitch) * WorldMapElement.cameraLookAtAcceleration / 1000 + class129.cameraPitch + class33.cameraLookAtSpeed; + if (class129.cameraPitch > var0) { + class129.cameraPitch = var0; + } + } else if (class129.cameraPitch > var0) { + class129.cameraPitch -= (class129.cameraPitch - var0) * WorldMapElement.cameraLookAtAcceleration / 1000 + class33.cameraLookAtSpeed; + if (class129.cameraPitch < var0) { + class129.cameraPitch = var0; + } + } + + var1 &= 2047; + int var2 = var1 - UserComparator10.cameraYaw; + if (var2 > 1024) { + var2 -= 2048; + } else if (var2 < -1024) { + var2 += 2048; + } + + if (var2 > 0) { + UserComparator10.cameraYaw = UserComparator10.cameraYaw + class33.cameraLookAtSpeed + var2 * WorldMapElement.cameraLookAtAcceleration / 1000; + UserComparator10.cameraYaw &= 2047; + } else if (var2 < 0) { + UserComparator10.cameraYaw -= -var2 * WorldMapElement.cameraLookAtAcceleration / 1000 + class33.cameraLookAtSpeed; + UserComparator10.cameraYaw &= 2047; + } + + int var3 = var1 - UserComparator10.cameraYaw; + if (var3 > 1024) { + var3 -= 2048; + } else if (var3 < -1024) { + var3 += 2048; + } + + if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { + UserComparator10.cameraYaw = var1; + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class417.java b/osrs/src/main/java/class417.java deleted file mode 100644 index 24e5d3382..000000000 --- a/osrs/src/main/java/class417.java +++ /dev/null @@ -1,17 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("qw") -public class class417 { - @ObfuscatedName("jo") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-8022" - ) - static void method2121() { - for (class212 var0 = (class212)Client.field625.last(); var0 != null; var0 = (class212)Client.field625.previous()) { - var0.remove(); - } - - } -} diff --git a/osrs/src/main/java/class418.java b/osrs/src/main/java/class418.java new file mode 100644 index 000000000..a68fecf0e --- /dev/null +++ b/osrs/src/main/java/class418.java @@ -0,0 +1,45 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qn") +public class class418 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lqn;" + ) + static final class418 field3759; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lqn;" + ) + static final class418 field3758; + @ObfuscatedName("ao") + final String field3760; + + static { + field3759 = new class418("Basic"); + field3758 = new class418("Bearer"); + } + + class418(String var1) { + this.field3760 = var1; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "75" + ) + String method2162() { + return this.field3760; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)[Lrq;", + garbageValue = "-2125486223" + ) + static class453[] method2163() { + return new class453[]{class453.field3896, class453.field3893, class453.field3894, class453.field3895}; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class419.java b/osrs/src/main/java/class419.java index b3ffefa7c..c91875c43 100644 --- a/osrs/src/main/java/class419.java +++ b/osrs/src/main/java/class419.java @@ -2,65 +2,181 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qc") +import javax.net.ssl.HttpsURLConnection; +import java.text.DecimalFormat; +import java.util.*; +import java.util.Map.Entry; + +@ObfuscatedName("qf") public class class419 { - @ObfuscatedName("aw") + @ObfuscatedName("nx") + @Export("menuY") + static int menuY; + @ObfuscatedName("at") + final Map field3764; + @ObfuscatedName("ac") + final Map field3763; + @ObfuscatedName("ai") + final DecimalFormat field3762; + + public class419() { + this.field3764 = new HashMap(); + this.field3763 = new HashMap(); + this.field3762 = new DecimalFormat(); + this.field3762.setMaximumFractionDigits(2); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljavax/net/ssl/HttpsURLConnection;B)V", + garbageValue = "14" + ) + public void method2164(HttpsURLConnection var1) { + Iterator var2 = this.field3764.entrySet().iterator(); + + while (var2.hasNext()) { + Entry var3 = (Entry)var2.next(); + var1.setRequestProperty((String)var3.getKey(), (String)var3.getValue()); + } + + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/Map;", + garbageValue = "1187497182" + ) + public Map method2165() { + return this.field3764; + } + + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lqc;" + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "2091196892" ) - static final class419 field3748; - @ObfuscatedName("ay") + public void method2166(String var1, String var2) { + if (var1 != null && !var1.isEmpty()) { + this.field3764.put(var1, var2 != null ? var2 : ""); + } + + } + + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lqc;" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-321106609" ) - static final class419 field3749; - @ObfuscatedName("ar") - final String field3750; + public void method2167(String var1) { + if (var1 != null && !var1.isEmpty()) { + this.field3764.remove(var1); + } - static { - field3748 = new class419("Basic"); - field3749 = new class419("Bearer"); } - class419(String var1) { - this.field3750 = var1; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lqn;Ljava/lang/String;B)V", + garbageValue = "19" + ) + void method2168(class418 var1, String var2) { + String var3 = String.format("%s %s", var1.method2162(), var2); + this.method2166("Authorization", var3); } - @ObfuscatedName("aw") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1786685713" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1710758973" ) - String method2122() { - return this.field3750; + public void method2169(String var1) { + this.method2168(class418.field3759, var1); } @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)Lcr;", - garbageValue = "1237545484" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-911338485" ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? class387.World_worlds[++World.World_listCount - 1] : null; + public void method2170(String var1) { + this.method2168(class418.field3758, var1); + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(Lre;I)V", + garbageValue = "858846638" + ) + public void method2171(class460 var1) { + this.field3764.put("Content-Type", var1.method2331()); } @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "18" + descriptor = "(B)V", + garbageValue = "10" + ) + public void method2172() { + this.field3764.remove("Content-Type"); + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(Lre;B)V", + garbageValue = "103" ) - static final int method2124(int var0, int var1, int var2) { - int var3 = var0 / var2; - int var4 = var0 & var2 - 1; - int var5 = var1 / var2; - int var6 = var1 & var2 - 1; - int var7 = WorldMapSprite.method1501(var3, var5); - int var8 = WorldMapSprite.method1501(var3 + 1, var5); - int var9 = WorldMapSprite.method1501(var3, var5 + 1); - int var10 = WorldMapSprite.method1501(var3 + 1, var5 + 1); - int var11 = class128.method706(var7, var8, var4, var2); - int var12 = class128.method706(var9, var10, var4, var2); - return class128.method706(var11, var12, var6, var2); + public void method2173(class460 var1) { + this.method2174(var1, 1.0F); + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(Lre;FI)V", + garbageValue = "-2080888931" + ) + void method2174(class460 var1, float var2) { + this.field3763.put(var1, Math.max(0.0F, Math.min(1.0F, var2))); + this.method2175(); + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-689194447" + ) + void method2175() { + this.field3764.remove("Accept"); + if (!this.field3763.isEmpty()) { + this.field3764.put("Accept", this.method2176()); + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "92" + ) + String method2176() { + ArrayList var1 = new ArrayList(this.field3763.entrySet()); + Collections.sort(var1, new class420(this)); + StringBuilder var2 = new StringBuilder(); + Iterator var3 = var1.iterator(); + + while (var3.hasNext()) { + Entry var4 = (Entry)var3.next(); + if (var2.length() > 0) { + var2.append(","); + } + + var2.append(((class460)var4.getKey()).method2331()); + float var5 = (Float)var4.getValue(); + if (var5 < 1.0F) { + String var6 = this.field3762.format((double)var5); + var2.append(";q=").append(var6); + } + } + + return var2.toString(); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class420.java b/osrs/src/main/java/class420.java index 9d0da3768..e5802f21b 100644 --- a/osrs/src/main/java/class420.java +++ b/osrs/src/main/java/class420.java @@ -1,229 +1,48 @@ -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import javax.net.ssl.HttpsURLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qb") -public class class420 { - @ObfuscatedName("am") - final Map field3752; - @ObfuscatedName("as") - final Map field3753; - @ObfuscatedName("aj") - final DecimalFormat field3751; - - public class420() { - this.field3752 = new HashMap(); - this.field3753 = new HashMap(); - this.field3751 = new DecimalFormat(); - this.field3751.setMaximumFractionDigits(2); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Ljavax/net/ssl/HttpsURLConnection;B)V", - garbageValue = "-29" - ) - public void method2125(HttpsURLConnection var1) { - Iterator var2 = this.field3752.entrySet().iterator(); - - while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); - var1.setRequestProperty((String)var3.getKey(), (String)var3.getValue()); - } - - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/Map;", - garbageValue = "1295921167" - ) - public Map method2126() { - return this.field3752; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1082085990" - ) - public void method2127(String var1, String var2) { - if (var1 != null && !var1.isEmpty()) { - this.field3752.put(var1, var2 != null ? var2 : ""); - } - - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "70" - ) - public void method2128(String var1) { - if (var1 != null && !var1.isEmpty()) { - this.field3752.remove(var1); - } - - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lqc;Ljava/lang/String;I)V", - garbageValue = "521425039" - ) - void method2129(class419 var1, String var2) { - String var3 = String.format("%s %s", var1.method2122(), var2); - this.method2127("Authorization", var3); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2096354513" - ) - public void method2130(String var1) { - this.method2129(class419.field3748, var1); - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-892969750" - ) - public void method2131(String var1) { - this.method2129(class419.field3749, var1); - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Lrs;I)V", - garbageValue = "-1926129301" - ) - public void method2132(class461 var1) { - this.field3752.put("Content-Type", var1.method2309()); - } +import java.util.Comparator; +import java.util.Map.Entry; - @ObfuscatedName("av") +@ObfuscatedName("qr") +class class420 implements Comparator { + @ObfuscatedName("ao") + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1661875858" + descriptor = "Lqf;" ) - public void method2133() { - this.field3752.remove("Content-Type"); - } + @Export("this$0") + @ObfuscatedName("this$0") + final class419 this$0; - @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lrs;B)V", - garbageValue = "11" + descriptor = "(Lqf;)V" ) - public void method2134(class461 var1) { - this.method2135(var1, 1.0F); + class420(class419 var1) { + this.this$0 = var1; } - @ObfuscatedName("aq") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lrs;FI)V", - garbageValue = "-1632504604" + descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;I)I", + garbageValue = "1962289219" ) - void method2135(class461 var1, float var2) { - this.field3753.put(var1, Math.max(0.0F, Math.min(1.0F, var2))); - this.method2136(); + int method2177(Entry var1, Entry var2) { + return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); } - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-65" - ) - void method2136() { - this.field3752.remove("Accept"); - if (!this.field3753.isEmpty()) { - this.field3752.put("Accept", this.method2137()); - } - + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method2177((Entry)var1, (Entry)var2); } - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-2113017491" - ) - String method2137() { - ArrayList var1 = new ArrayList(this.field3753.entrySet()); - Collections.sort(var1, new class421(this)); - StringBuilder var2 = new StringBuilder(); - Iterator var3 = var1.iterator(); - - while (var3.hasNext()) { - Entry var4 = (Entry)var3.next(); - if (var2.length() > 0) { - var2.append(","); - } - - var2.append(((class461)var4.getKey()).method2309()); - float var5 = (Float)var4.getValue(); - if (var5 < 1.0F) { - String var6 = this.field3751.format((double)var5); - var2.append(";q=").append(var6); - } - } - - return var2.toString(); - } - - @ObfuscatedName("mx") - @ObfuscatedSignature( - descriptor = "([Lmt;II)V", - garbageValue = "658485102" - ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null) { - if (var3.type == 0) { - if (var3.children != null) { - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - ChatChannel.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = VarbitComposition.getWidget(var3.id); - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { - continue; - } - } - - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onSubChange; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var5); - } - } - } - + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class421.java b/osrs/src/main/java/class421.java index 0c677a046..eb43a9331 100644 --- a/osrs/src/main/java/class421.java +++ b/osrs/src/main/java/class421.java @@ -1,83 +1,27 @@ -import java.util.Comparator; -import java.util.Map.Entry; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qd") -class class421 implements Comparator { - // $FF: synthetic field +@ObfuscatedName("qm") +public class class421 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lqb;" + descriptor = "Lqm;" ) - @Export("this$0") - @ObfuscatedName("this$0") - final class420 this$0; - + public static final class421 field3766; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lqb;)V" + descriptor = "Lqm;" ) - class421(class420 var1) { - this.this$0 = var1; - } + static final class421 field3767; + @ObfuscatedName("ao") + final int field3768; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;B)I", - garbageValue = "-85" - ) - int method2139(Entry var1, Entry var2) { - return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); + static { + field3766 = new class421(0); + field3767 = new class421(1); } - @Export("compare") - @ObfuscatedName("compare") - public int compare(Object var1, Object var2) { - return this.method2139((Entry)var1, (Entry)var2); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1455442062" - ) - static final int method2140(int var0, int var1) { - if (var0 == -1) { - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "8" - ) - static void method2141(int var0, int var1) { - int[] var2 = new int[9]; - - for (int var3 = 0; var3 < var2.length; ++var3) { - int var4 = var3 * 32 + 15 + 128; - int var5 = ClanMate.method2183(var4); - int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; - var5 = UserList.method2216(var5, var1); - var2[var3] = var6 * var5 >> 16; - } - - Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); + class421(int var1) { + this.field3768 = var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class422.java b/osrs/src/main/java/class422.java index 2059857bc..ce1ab0cc5 100644 --- a/osrs/src/main/java/class422.java +++ b/osrs/src/main/java/class422.java @@ -1,29 +1,53 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qu") -public class class422 { - @ObfuscatedName("aw") +import java.util.Comparator; + +@ObfuscatedName("qw") +class class422 implements Comparator { + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lqu;" + descriptor = "Lnu;" ) - public static final class422 field3754; - @ObfuscatedName("ay") + static AbstractArchive field3769; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lqu;" + descriptor = "Lqv;" ) - static final class422 field3756; - @ObfuscatedName("uf") - static int field3755; - @ObfuscatedName("ar") - final int field3757; + @Export("this$0") + @ObfuscatedName("this$0") + final class423 this$0; + + @ObfuscatedSignature( + descriptor = "(Lqv;)V" + ) + class422(class423 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lqj;Lqj;I)I", + garbageValue = "-1576026190" + ) + int method2178(class424 var1, class424 var2) { + if (var1.field3779 > var2.field3779) { + return 1; + } else { + return var1.field3779 < var2.field3779 ? -1 : 0; + } + } - static { - field3754 = new class422(1); - field3756 = new class422(0); + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method2178((class424)var1, (class424)var2); } - class422(int var1) { - this.field3757 = var1; + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class423.java b/osrs/src/main/java/class423.java index dafb59e38..a6a7aac61 100644 --- a/osrs/src/main/java/class423.java +++ b/osrs/src/main/java/class423.java @@ -1,199 +1,199 @@ -import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qo") -class class423 implements Comparator { - // $FF: synthetic field +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; + +@ObfuscatedName("qv") +public final class class423 { + @ObfuscatedName("au") + final Comparator field3771; + @ObfuscatedName("ae") + final Map field3772; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lpa;" + ) + final class392 field3774; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lpa;" + ) + final class392 field3775; + @ObfuscatedName("ac") + final long field3773; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lqm;" ) - @Export("this$0") - @ObfuscatedName("this$0") - final class424 this$0; + final class421 field3776; + @ObfuscatedName("az") + final int field3770; @ObfuscatedSignature( - descriptor = "(Lql;)V" + descriptor = "(JILqm;)V" ) - class423(class424 var1) { - this.this$0 = var1; + class423(long var1, int var3, class421 var4) { + this.field3771 = new class422(this); + this.field3773 = var1; + this.field3770 = var3; + this.field3776 = var4; + if (this.field3770 == -1) { + this.field3772 = new HashMap(64); + this.field3774 = new class392(64, this.field3771); + this.field3775 = null; + } else { + if (this.field3776 == null) { + throw new IllegalArgumentException(""); + } + + this.field3772 = new HashMap(this.field3770); + this.field3774 = new class392(this.field3770, this.field3771); + this.field3775 = new class392(this.field3770); + } + } - @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Lqr;Lqr;I)I", - garbageValue = "1927816429" + descriptor = "(ILqm;)V" ) - int method2142(class425 var1, class425 var2) { - if (var1.field3770 > var2.field3770) { - return 1; - } else { - return var1.field3770 < var2.field3770 ? -1 : 0; + public class423(int var1, class421 var2) { + this(-1L, var1, var2); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1594986015" + ) + boolean method2179() { + return this.field3770 != -1; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;B)Ljava/lang/Object;", + garbageValue = "-31" + ) + public Object method2180(Object var1) { + synchronized(this) { + if (this.field3773 != -1L) { + this.method2183(); + } + + class424 var3 = (class424)this.field3772.get(var1); + if (var3 == null) { + return null; + } else { + this.method2182(var3, false); + return var3.field3778; + } } } - @Export("compare") - @ObfuscatedName("compare") - public int compare(Object var1, Object var2) { - return this.method2142((class425)var1, (class425)var2); + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "-396691149" + ) + public Object method2181(Object var1, Object var2) { + synchronized(this) { + if (this.field3773 != -1L) { + this.method2183(); + } + + class424 var4 = (class424)this.field3772.get(var1); + if (var4 != null) { + Object var8 = var4.field3778; + var4.field3778 = var2; + this.method2182(var4, false); + return var8; + } else { + class424 var5; + if (this.method2179() && this.field3772.size() == this.field3770) { + var5 = (class424)this.field3775.remove(); + this.field3772.remove(var5.field3777); + this.field3774.remove(var5); + } + + var5 = new class424(var2, var1); + this.field3772.put(var1, var5); + this.method2182(var5, true); + return null; + } + } } - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - return super.equals(var1); + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lqj;ZB)V", + garbageValue = "16" + ) + void method2182(class424 var1, boolean var2) { + if (!var2) { + this.field3774.remove(var1); + if (this.method2179() && !this.field3775.remove(var1)) { + throw new IllegalStateException(""); + } + } + + var1.field3779 = System.currentTimeMillis(); + if (this.method2179()) { + switch(this.field3776.field3768) { + case 0: + var1.field3780 = var1.field3779; + break; + case 1: + ++var1.field3780; + } + + this.field3775.add(var1); + } + + this.field3774.add(var1); } - @ObfuscatedName("aa") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILdc;ZB)I", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "1791287945" ) - static int method2143(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - if (var0 == 1600) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == 1601) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; + void method2183() { + if (this.field3773 == -1L) { + throw new IllegalStateException(""); } else { - class330 var7; - if (var0 == 1602) { - if (var3.type == 12) { - var7 = var3.method1805(); - if (var7 != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.method1742().method2000(); - return 1; - } - } + long var1 = System.currentTimeMillis() - this.field3773; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == 1603) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == 1604) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == 1605) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == 1606) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == 1607) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == 1608) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == 1609) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 1610) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == 1611) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == 1612) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 1613) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == 1614) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else { - class325 var4; - if (var0 == 1617) { - var4 = var3.method1806(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2874 * 486674949 * -392959283 : 0; + while (!this.field3774.isEmpty()) { + class424 var3 = (class424)this.field3774.peek(); + if (var3.field3779 >= var1) { + return; } - if (var0 == 1618) { - var4 = var3.method1806(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2875 * 226510377 * 987280921 : 0; - return 1; - } else if (var0 == 1619) { - var7 = var3.method1805(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1743().method2000() : ""; - return 1; - } else if (var0 == 1620) { - var4 = var3.method1806(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2873 * 1386938305 * -1999040447 : 0; - return 1; - } else if (var0 == 1621) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1753() : 0; - return 1; - } else if (var0 == 1622) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1754() : 0; - return 1; - } else if (var0 == 1623) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1755() : 0; - return 1; - } else if (var0 == 1624) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1745() ? 1 : 0; - return 1; - } else if (var0 != 1625) { - if (var0 == 1626) { - var7 = var3.method1805(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1744().method2074() : ""; - return 1; - } else if (var0 == 1627) { - var7 = var3.method1805(); - int var5 = var7 != null ? var7.method1749() : 0; - int var6 = var7 != null ? var7.method1748() : 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.min(var5, var6); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.max(var5, var6); - return 1; - } else if (var0 == 1628) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1748() : 0; - return 1; - } else if (var0 == 1629) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1757() : 0; - return 1; - } else if (var0 == 1630) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1756() : 0; - return 1; - } else if (var0 == 1631) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1758() : 0; - return 1; - } else if (var0 == 1632) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1759() : 0; - return 1; - } else { - class27 var8; - if (var0 == 1633) { - var8 = var3.method1807(); - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method104(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; - return 1; - } else if (var0 == 1634) { - var8 = var3.method1807(); - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method105((char)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; - return 1; - } else { - return 2; - } - } - } else { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1746() ? 1 : 0; - return 1; + this.field3772.remove(var3.field3777); + this.field3774.remove(var3); + if (this.method2179()) { + this.field3775.remove(var3); } } + + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "33" + ) + public void method2184() { + synchronized(this) { + this.field3772.clear(); + this.field3774.clear(); + if (this.method2179()) { + this.field3775.clear(); + } + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class424.java b/osrs/src/main/java/class424.java index de2ec839e..9712a8953 100644 --- a/osrs/src/main/java/class424.java +++ b/osrs/src/main/java/class424.java @@ -1,221 +1,55 @@ -import java.util.Comparator; -import java.util.HashMap; -import java.util.Map; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ql") -public final class class424 { - @ObfuscatedName("ak") - static String field3759; - @ObfuscatedName("ci") - static int field3758; - @ObfuscatedName("aw") - final Comparator field3761; - @ObfuscatedName("ay") - final Map field3762; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lpd;" - ) - final class393 field3765; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lpd;" - ) - final class393 field3764; - @ObfuscatedName("as") - final long field3763; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lqu;" - ) - final class422 field3766; - @ObfuscatedName("ag") - final int field3760; - - @ObfuscatedSignature( - descriptor = "(JILqu;)V" - ) - class424(long var1, int var3, class422 var4) { - this.field3761 = new class423(this); - this.field3763 = var1; - this.field3760 = var3; - this.field3766 = var4; - if (this.field3760 == -1) { - this.field3762 = new HashMap(64); - this.field3765 = new class393(64, this.field3761); - this.field3764 = null; - } else { - if (this.field3766 == null) { - throw new IllegalArgumentException(""); - } - - this.field3762 = new HashMap(this.field3760); - this.field3765 = new class393(this.field3760, this.field3761); - this.field3764 = new class393(this.field3760); - } +@ObfuscatedName("qj") +public final class class424 implements Comparable { + @ObfuscatedName("au") + Object field3778; + @ObfuscatedName("ae") + Object field3777; + @ObfuscatedName("ao") + long field3779; + @ObfuscatedName("at") + long field3780; + class424(Object var1, Object var2) { + this.field3778 = var1; + this.field3777 = var2; } + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILqu;)V" + descriptor = "(Lqj;B)I", + garbageValue = "1" ) - public class424(int var1, class422 var2) { - this(-1L, var1, var2); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-61352900" - ) - boolean method2145() { - return this.field3760 != -1; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "2120370610" - ) - public Object method2146(Object var1) { - synchronized(this) { - if (-1L != this.field3763) { - this.method2149(); - } - - class425 var3 = (class425)this.field3762.get(var1); - if (var3 == null) { - return null; - } else { - this.method2148(var3, false); - return var3.field3767; - } - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "301709804" - ) - public Object method2147(Object var1, Object var2) { - synchronized(this) { - if (-1L != this.field3763) { - this.method2149(); - } - - class425 var4 = (class425)this.field3762.get(var1); - if (var4 != null) { - Object var8 = var4.field3767; - var4.field3767 = var2; - this.method2148(var4, false); - return var8; - } else { - class425 var5; - if (this.method2145() && this.field3762.size() == this.field3760) { - var5 = (class425)this.field3764.remove(); - this.field3762.remove(var5.field3768); - this.field3765.remove(var5); - } - - var5 = new class425(var2, var1); - this.field3762.put(var1, var5); - this.method2148(var5, true); - return null; - } - } - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lqr;ZI)V", - garbageValue = "-113992548" - ) - void method2148(class425 var1, boolean var2) { - if (!var2) { - this.field3765.remove(var1); - if (this.method2145()) { - } - } - - var1.field3770 = System.currentTimeMillis(); - if (this.method2145()) { - switch(this.field3766.field3757) { - case 0: - ++var1.field3769; - break; - case 1: - var1.field3769 = var1.field3770; - } - - this.field3764.add(var1); + int method2185(class424 var1) { + if (this.field3780 < var1.field3780) { + return -1; + } else { + return this.field3780 > var1.field3780 ? 1 : 0; } - - this.field3765.add(var1); } - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "54" - ) - void method2149() { - long var1 = System.currentTimeMillis() - this.field3763; - - while (!this.field3765.isEmpty()) { - class425 var3 = (class425)this.field3765.peek(); - if (var3.field3770 >= var1) { - return; - } - - this.field3762.remove(var3.field3768); - this.field3765.remove(var3); - if (this.method2145()) { - this.field3764.remove(var3); - } + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (var1 instanceof class424) { + return this.field3777.equals(((class424)var1).field3777); + } else { + throw new IllegalArgumentException(); } - } - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2134542094" - ) - public void method2150() { - synchronized(this) { - this.field3762.clear(); - this.field3765.clear(); - if (this.method2145()) { - this.field3764.clear(); - } - - } + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + return this.field3777.hashCode(); } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IB)Ltu;", - garbageValue = "78" - ) - @Export("getDbRowType") - public static DbRowType getDbRowType(int var0) { - DbRowType var1 = (DbRowType)DbRowType.DBRowType_cache.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = DbRowType.field4105.takeFile(38, var0); - var1 = new DbRowType(); - if (var2 != null) { - var1.method2487(new Buffer(var2)); - } - - var1.method2490(); - DbRowType.DBRowType_cache.put(var1, (long)var0); - return var1; - } + @Export("compareTo") + @ObfuscatedName("compareTo") + public int compareTo(Object var1) { + return this.method2185((class424)var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class425.java b/osrs/src/main/java/class425.java deleted file mode 100644 index 4932eeb8d..000000000 --- a/osrs/src/main/java/class425.java +++ /dev/null @@ -1,91 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("qr") -public final class class425 implements Comparable { - @ObfuscatedName("aw") - Object field3767; - @ObfuscatedName("ay") - Object field3768; - @ObfuscatedName("ar") - long field3770; - @ObfuscatedName("am") - long field3769; - - class425(Object var1, Object var2) { - this.field3767 = var1; - this.field3768 = var2; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lqr;I)I", - garbageValue = "1914660180" - ) - int method2152(class425 var1) { - if (this.field3769 < var1.field3769) { - return -1; - } else { - return this.field3769 > var1.field3769 ? 1 : 0; - } - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (var1 instanceof class425) { - return this.field3768.equals(((class425)var1).field3768); - } else { - throw new IllegalArgumentException(); - } - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - return this.field3768.hashCode(); - } - - @Export("compareTo") - @ObfuscatedName("compareTo") - public int compareTo(Object var1) { - return this.method2152((class425)var1); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "686402889" - ) - static int method2153() { - return ++Messages.Messages_count - 1; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(S)[Lhl;", - garbageValue = "215" - ) - static VerticalAlignment[] method2151() { - return new VerticalAlignment[]{VerticalAlignment.field1616, VerticalAlignment.field1615, VerticalAlignment.VerticalAlignment_centered}; - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Lnd;IB)V", - garbageValue = "-49" - ) - static void method2154(AbstractArchive var0, int var1) { - if ((var1 & 536870912) != 0) { - Login.logoSprite = class451.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); - } else if ((var1 & 1073741824) != 0) { - Login.logoSprite = class451.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); - } else if ((var1 & 256) != 0) { - Login.logoSprite = class451.SpriteBuffer_getIndexedSpriteByName(var0, "logo_speedrunning", ""); - } else { - Login.logoSprite = class451.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); - } - - } -} diff --git a/osrs/src/main/java/class448.java b/osrs/src/main/java/class448.java new file mode 100644 index 000000000..918dfd30b --- /dev/null +++ b/osrs/src/main/java/class448.java @@ -0,0 +1,138 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("rj") +public class class448 { + @ObfuscatedName("au") + float field3865; + @ObfuscatedName("ae") + float field3863; + @ObfuscatedName("ao") + float field3864; + + static { + new class448(0.0F, 0.0F, 0.0F); + new class448(1.0F, 1.0F, 1.0F); + new class448(1.0F, 0.0F, 0.0F); + new class448(0.0F, 1.0F, 0.0F); + new class448(0.0F, 0.0F, 1.0F); + WorldMapArea.method1413(100); + } + + class448(float var1, float var2, float var3) { + this.field3865 = var1; + this.field3863 = var2; + this.field3864 = var3; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)F", + garbageValue = "36" + ) + final float method2291() { + return (float)Math.sqrt((double)(this.field3865 * this.field3865 + this.field3863 * this.field3863 + this.field3864 * this.field3864)); + } + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + return this.field3865 + ", " + this.field3863 + ", " + this.field3864; + } + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "853635809" + ) + static int method2292(int var0, Script var1, boolean var2) { + if (var0 == 6200) { + SoundCache.Interpreter_intStackSize -= 2; + Client.field638 = (short)class155.method829(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); + if (Client.field638 <= 0) { + Client.field638 = 256; + } + + Client.field640 = (short)class155.method829(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + if (Client.field640 <= 0) { + Client.field640 = 256; + } + + return 1; + } else if (var0 == 6201) { + SoundCache.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } + + return 1; + } else if (var0 == 6202) { + SoundCache.Interpreter_intStackSize -= 4; + Client.field635 = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + if (Client.field635 <= 0) { + Client.field635 = 1; + } + + Client.field634 = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + if (Client.field634 <= 0) { + Client.field634 = 32767; + } else if (Client.field634 < Client.field635) { + Client.field634 = Client.field635; + } + + Client.field641 = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + if (Client.field641 <= 0) { + Client.field641 = 1; + } + + Client.field637 = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + if (Client.field637 <= 0) { + Client.field637 = 32767; + } else if (Client.field637 < Client.field641) { + Client.field637 = Client.field641; + } + + return 1; + } else if (var0 == 6203) { + if (Client.viewportWidget != null) { + GrandExchangeOfferOwnWorldComparator.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.viewportHeight; + } else { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } else if (var0 == 6204) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == 6205) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class332.method1850(Client.field638); + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class332.method1850(Client.field640); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class113.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class177.canvasHeight; + return 1; + } else { + return 2; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class449.java b/osrs/src/main/java/class449.java index 9145ec03e..3a13dca63 100644 --- a/osrs/src/main/java/class449.java +++ b/osrs/src/main/java/class449.java @@ -2,41 +2,127 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ri") -public class class449 { - @ObfuscatedName("aw") - float field3849; - @ObfuscatedName("ay") - float field3850; - @ObfuscatedName("ar") - float field3848; +@ObfuscatedName("ro") +public final class class449 { + @ObfuscatedName("wp") + @ObfuscatedSignature( + descriptor = "Ldp;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "[Lro;" + ) + static class449[] field3868; + @ObfuscatedName("ae") + static int field3867; + @ObfuscatedName("at") + float field3871; + @ObfuscatedName("ac") + float field3869; + @ObfuscatedName("ai") + float field3870; + @ObfuscatedName("az") + float field3872; static { - new class449(0.0F, 0.0F, 0.0F); - new class449(1.0F, 1.0F, 1.0F); - new class449(1.0F, 0.0F, 0.0F); - new class449(0.0F, 1.0F, 0.0F); - new class449(0.0F, 0.0F, 1.0F); + field3868 = new class449[0]; + GrandExchangeOffer.method1954(100); + new class449(); } - class449(float var1, float var2, float var3) { - this.field3849 = var1; - this.field3850 = var2; - this.field3848 = var3; + class449() { + this.method2296(); + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1516285968" + ) + public void method2293() { + synchronized(field3868) { + if (class338.field3112 < field3867 - 1) { + field3868[++class338.field3112 - 1] = this; + } + + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(FFFFI)V", + garbageValue = "-426853069" + ) + void method2294(float var1, float var2, float var3, float var4) { + this.field3871 = var1; + this.field3869 = var2; + this.field3870 = var3; + this.field3872 = var4; } - @ObfuscatedName("aw") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)F", - garbageValue = "-57" + descriptor = "(FFFFI)V", + garbageValue = "-49952444" ) - final float method2264() { - return (float)Math.sqrt((double)(this.field3849 * this.field3849 + this.field3850 * this.field3850 + this.field3848 * this.field3848)); + public void method2295(float var1, float var2, float var3, float var4) { + float var5 = (float)Math.sin((double)(var4 * 0.5F)); + float var6 = (float)Math.cos((double)(var4 * 0.5F)); + this.field3871 = var5 * var1; + this.field3869 = var2 * var5; + this.field3870 = var5 * var3; + this.field3872 = var6; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "61" + ) + final void method2296() { + this.field3870 = 0.0F; + this.field3869 = 0.0F; + this.field3871 = 0.0F; + this.field3872 = 1.0F; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Lro;B)V", + garbageValue = "-34" + ) + public final void method2297(class449 var1) { + this.method2294(this.field3871 * var1.field3872 + this.field3872 * var1.field3871 + this.field3870 * var1.field3869 - this.field3869 * var1.field3870, var1.field3870 * this.field3871 + this.field3872 * var1.field3869 + (var1.field3872 * this.field3869 - this.field3870 * var1.field3871), var1.field3870 * this.field3872 + (this.field3870 * var1.field3872 + this.field3869 * var1.field3871 - var1.field3869 * this.field3871), this.field3872 * var1.field3872 - this.field3871 * var1.field3871 - this.field3869 * var1.field3869 - var1.field3870 * this.field3870); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (!(var1 instanceof class449)) { + return false; + } else { + class449 var2 = (class449)var1; + return var2.field3871 == this.field3871 && var2.field3869 == this.field3869 && var2.field3870 == this.field3870 && this.field3872 == var2.field3872; + } + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + boolean var1 = true; + float var2 = 1.0F; + var2 = this.field3871 + var2 * 31.0F; + var2 = this.field3869 + var2 * 31.0F; + var2 = this.field3870 + 31.0F * var2; + var2 = this.field3872 + 31.0F * var2; + return (int)var2; } @Export("toString") @ObfuscatedName("toString") public String toString() { - return this.field3849 + ", " + this.field3850 + ", " + this.field3848; + return this.field3871 + "," + this.field3869 + "," + this.field3870 + "," + this.field3872; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class450.java b/osrs/src/main/java/class450.java index 7c1aa0de6..52ee2dad0 100644 --- a/osrs/src/main/java/class450.java +++ b/osrs/src/main/java/class450.java @@ -1,158 +1,447 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rj") +import java.util.Arrays; + +@ObfuscatedName("rz") public final class class450 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "[Lrj;" - ) - static class450[] field3852; - @ObfuscatedName("ay") - static int field3851; - @ObfuscatedName("am") - float field3855; - @ObfuscatedName("as") - float field3856; - @ObfuscatedName("aj") - float field3854; - @ObfuscatedName("ag") - float field3853; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "[Lrz;" + ) + public static class450[] field3873; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lrz;" + ) + public static final class450 field3874; + @ObfuscatedName("ac") + public float[] field3875; static { - field3852 = new class450[0]; - WorldMapManager.method1440(100); - new class450(); + field3873 = new class450[0]; + class272.method1544(100); + field3874 = new class450(); } - class450() { - this.method2268(); + public class450() { + this.field3875 = new float[16]; + this.method2302(); } - @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Lrz;)V" + ) + public class450(class450 var1) { + this.field3875 = new float[16]; + this.method2304(var1); + } + + @ObfuscatedSignature( + descriptor = "(Ltm;Z)V" + ) + public class450(Buffer var1, boolean var2) { + this.field3875 = new float[16]; + this.method2299(var1, var2); + } + + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "720031596" + garbageValue = "1723077119" ) - public void method2265() { - synchronized(field3852) { - if (class344.field3132 < field3851 - 1) { - field3852[++class344.field3132 - 1] = this; + public void method2298() { + synchronized(field3873) { + if (class462.field3904 < GrandExchangeOfferOwnWorldComparator.field361 - 1) { + field3873[++class462.field3904 - 1] = this; } } } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(FFFFI)V", - garbageValue = "646629181" + descriptor = "(Ltm;ZI)V", + garbageValue = "1560038466" ) - void method2266(float var1, float var2, float var3, float var4) { - this.field3855 = var1; - this.field3856 = var2; - this.field3854 = var3; - this.field3853 = var4; + void method2299(Buffer var1, boolean var2) { + if (var2) { + class451 var3 = new class451(); + int var6 = var1.readShort(); + var6 &= 16383; + float var5 = (float)(6.283185307179586D * (double)((float)var6 / 16384.0F)); + var3.method2315(var5); + int var9 = var1.readShort(); + var9 &= 16383; + float var8 = (float)((double)((float)var9 / 16384.0F) * 6.283185307179586D); + var3.method2316(var8); + int var12 = var1.readShort(); + var12 &= 16383; + float var11 = (float)((double)((float)var12 / 16384.0F) * 6.283185307179586D); + var3.method2317(var11); + var3.method2318((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); + this.method2310(var3); + } else { + for (int var13 = 0; var13 < 16; ++var13) { + this.field3875[var13] = var1.method2551(); + } + } + } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(FFFFI)V", - garbageValue = "-806476274" + descriptor = "(B)[F", + garbageValue = "-57" ) - public void method2267(float var1, float var2, float var3, float var4) { - float var5 = (float)Math.sin((double)(var4 * 0.5F)); - float var6 = (float)Math.cos((double)(var4 * 0.5F)); - this.field3855 = var5 * var1; - this.field3856 = var2 * var5; - this.field3854 = var3 * var5; - this.field3853 = var6; + float[] method2300() { + float[] var1 = new float[3]; + if ((double)this.field3875[2] < 0.999D && (double)this.field3875[2] > -0.999D) { + var1[1] = (float)(-Math.asin((double)this.field3875[2])); + double var2 = Math.cos((double)var1[1]); + var1[0] = (float)Math.atan2((double)this.field3875[6] / var2, (double)this.field3875[10] / var2); + var1[2] = (float)Math.atan2((double)this.field3875[1] / var2, (double)this.field3875[0] / var2); + } else { + var1[0] = 0.0F; + var1[1] = (float)Math.atan2((double)this.field3875[2], 0.0D); + var1[2] = (float)Math.atan2((double)(-this.field3875[9]), (double)this.field3875[5]); + } + + return var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "1952444493" + ) + public float[] method2301() { + float[] var1 = new float[]{(float)(-Math.asin((double)this.field3875[6])), 0.0F, 0.0F}; + double var2 = Math.cos((double)var1[0]); + double var4; + double var6; + if (Math.abs(var2) > 0.005D) { + var4 = (double)this.field3875[2]; + var6 = (double)this.field3875[10]; + double var8 = (double)this.field3875[4]; + double var10 = (double)this.field3875[5]; + var1[1] = (float)Math.atan2(var4, var6); + var1[2] = (float)Math.atan2(var8, var10); + } else { + var4 = (double)this.field3875[1]; + var6 = (double)this.field3875[0]; + if (this.field3875[6] < 0.0F) { + var1[1] = (float)Math.atan2(var4, var6); + } else { + var1[1] = (float)(-Math.atan2(var4, var6)); + } + + var1[2] = 0.0F; + } + + return var1; } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "407146638" + garbageValue = "-1131918254" ) - final void method2268() { - this.field3854 = 0.0F; - this.field3856 = 0.0F; - this.field3855 = 0.0F; - this.field3853 = 1.0F; + public void method2302() { + this.field3875[0] = 1.0F; + this.field3875[1] = 0.0F; + this.field3875[2] = 0.0F; + this.field3875[3] = 0.0F; + this.field3875[4] = 0.0F; + this.field3875[5] = 1.0F; + this.field3875[6] = 0.0F; + this.field3875[7] = 0.0F; + this.field3875[8] = 0.0F; + this.field3875[9] = 0.0F; + this.field3875[10] = 1.0F; + this.field3875[11] = 0.0F; + this.field3875[12] = 0.0F; + this.field3875[13] = 0.0F; + this.field3875[14] = 0.0F; + this.field3875[15] = 1.0F; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lrj;S)V", - garbageValue = "-7868" + descriptor = "(B)V", + garbageValue = "109" ) - public final void method2269(class450 var1) { - this.method2266(this.field3855 * var1.field3853 + this.field3853 * var1.field3855 + var1.field3856 * this.field3854 - this.field3856 * var1.field3854, this.field3853 * var1.field3856 + (var1.field3853 * this.field3856 - var1.field3855 * this.field3854) + this.field3855 * var1.field3854, var1.field3855 * this.field3856 + this.field3854 * var1.field3853 - var1.field3856 * this.field3855 + var1.field3854 * this.field3853, var1.field3853 * this.field3853 - this.field3855 * var1.field3855 - this.field3856 * var1.field3856 - this.field3854 * var1.field3854); + public void method2303() { + this.field3875[0] = 0.0F; + this.field3875[1] = 0.0F; + this.field3875[2] = 0.0F; + this.field3875[3] = 0.0F; + this.field3875[4] = 0.0F; + this.field3875[5] = 0.0F; + this.field3875[6] = 0.0F; + this.field3875[7] = 0.0F; + this.field3875[8] = 0.0F; + this.field3875[9] = 0.0F; + this.field3875[10] = 0.0F; + this.field3875[11] = 0.0F; + this.field3875[12] = 0.0F; + this.field3875[13] = 0.0F; + this.field3875[14] = 0.0F; + this.field3875[15] = 0.0F; } - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (!(var1 instanceof class450)) { - return false; - } else { - class450 var2 = (class450)var1; - return var2.field3855 == this.field3855 && this.field3856 == var2.field3856 && var2.field3854 == this.field3854 && var2.field3853 == this.field3853; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(Lrz;I)V", + garbageValue = "1658923125" + ) + public void method2304(class450 var1) { + System.arraycopy(var1.field3875, 0, this.field3875, 0, 16); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(FB)V", + garbageValue = "54" + ) + public void method2305(float var1) { + this.method2306(var1, var1, var1); + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(FFFB)V", + garbageValue = "0" + ) + public void method2306(float var1, float var2, float var3) { + this.method2302(); + this.field3875[0] = var1; + this.field3875[5] = var2; + this.field3875[10] = var3; + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(Lrz;I)V", + garbageValue = "1420506541" + ) + public void method2307(class450 var1) { + for (int var2 = 0; var2 < this.field3875.length; ++var2) { + float[] var10000 = this.field3875; + var10000[var2] += var1.field3875[var2]; } + } - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - boolean var1 = true; - float var2 = 1.0F; - var2 = this.field3855 + var2 * 31.0F; - var2 = this.field3856 + var2 * 31.0F; - var2 = this.field3854 + 31.0F * var2; - var2 = var2 * 31.0F + this.field3853; - return (int)var2; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(Lrz;I)V", + garbageValue = "2026698221" + ) + public void method2308(class450 var1) { + float var2 = this.field3875[2] * var1.field3875[8] + var1.field3875[0] * this.field3875[0] + var1.field3875[4] * this.field3875[1] + var1.field3875[12] * this.field3875[3]; + float var3 = this.field3875[0] * var1.field3875[1] + var1.field3875[5] * this.field3875[1] + var1.field3875[9] * this.field3875[2] + this.field3875[3] * var1.field3875[13]; + float var4 = var1.field3875[14] * this.field3875[3] + this.field3875[2] * var1.field3875[10] + var1.field3875[6] * this.field3875[1] + var1.field3875[2] * this.field3875[0]; + float var5 = this.field3875[0] * var1.field3875[3] + var1.field3875[7] * this.field3875[1] + this.field3875[2] * var1.field3875[11] + this.field3875[3] * var1.field3875[15]; + float var6 = this.field3875[7] * var1.field3875[12] + this.field3875[4] * var1.field3875[0] + this.field3875[5] * var1.field3875[4] + var1.field3875[8] * this.field3875[6]; + float var7 = this.field3875[6] * var1.field3875[9] + var1.field3875[1] * this.field3875[4] + var1.field3875[5] * this.field3875[5] + this.field3875[7] * var1.field3875[13]; + float var8 = this.field3875[7] * var1.field3875[14] + this.field3875[5] * var1.field3875[6] + this.field3875[4] * var1.field3875[2] + var1.field3875[10] * this.field3875[6]; + float var9 = var1.field3875[15] * this.field3875[7] + this.field3875[6] * var1.field3875[11] + this.field3875[4] * var1.field3875[3] + this.field3875[5] * var1.field3875[7]; + float var10 = var1.field3875[12] * this.field3875[11] + this.field3875[10] * var1.field3875[8] + var1.field3875[4] * this.field3875[9] + this.field3875[8] * var1.field3875[0]; + float var11 = this.field3875[11] * var1.field3875[13] + this.field3875[9] * var1.field3875[5] + var1.field3875[1] * this.field3875[8] + var1.field3875[9] * this.field3875[10]; + float var12 = var1.field3875[14] * this.field3875[11] + this.field3875[9] * var1.field3875[6] + var1.field3875[2] * this.field3875[8] + this.field3875[10] * var1.field3875[10]; + float var13 = var1.field3875[15] * this.field3875[11] + var1.field3875[11] * this.field3875[10] + var1.field3875[7] * this.field3875[9] + this.field3875[8] * var1.field3875[3]; + float var14 = this.field3875[14] * var1.field3875[8] + var1.field3875[0] * this.field3875[12] + this.field3875[13] * var1.field3875[4] + this.field3875[15] * var1.field3875[12]; + float var15 = var1.field3875[13] * this.field3875[15] + var1.field3875[5] * this.field3875[13] + this.field3875[12] * var1.field3875[1] + var1.field3875[9] * this.field3875[14]; + float var16 = this.field3875[14] * var1.field3875[10] + var1.field3875[6] * this.field3875[13] + this.field3875[12] * var1.field3875[2] + var1.field3875[14] * this.field3875[15]; + float var17 = var1.field3875[15] * this.field3875[15] + var1.field3875[3] * this.field3875[12] + this.field3875[13] * var1.field3875[7] + var1.field3875[11] * this.field3875[14]; + this.field3875[0] = var2; + this.field3875[1] = var3; + this.field3875[2] = var4; + this.field3875[3] = var5; + this.field3875[4] = var6; + this.field3875[5] = var7; + this.field3875[6] = var8; + this.field3875[7] = var9; + this.field3875[8] = var10; + this.field3875[9] = var11; + this.field3875[10] = var12; + this.field3875[11] = var13; + this.field3875[12] = var14; + this.field3875[13] = var15; + this.field3875[14] = var16; + this.field3875[15] = var17; } - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - return this.field3855 + "," + this.field3856 + "," + this.field3854 + "," + this.field3853; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lro;I)V", + garbageValue = "1037679755" + ) + public void method2309(class449 var1) { + float var2 = var1.field3872 * var1.field3872; + float var3 = var1.field3871 * var1.field3872; + float var4 = var1.field3872 * var1.field3869; + float var5 = var1.field3870 * var1.field3872; + float var6 = var1.field3871 * var1.field3871; + float var7 = var1.field3871 * var1.field3869; + float var8 = var1.field3870 * var1.field3871; + float var9 = var1.field3869 * var1.field3869; + float var10 = var1.field3869 * var1.field3870; + float var11 = var1.field3870 * var1.field3870; + this.field3875[0] = var6 + var2 - var11 - var9; + this.field3875[1] = var7 + var5 + var7 + var5; + this.field3875[2] = var8 - var4 - var4 + var8; + this.field3875[4] = var7 - var5 - var5 + var7; + this.field3875[5] = var2 + var9 - var6 - var11; + this.field3875[6] = var3 + var10 + var3 + var10; + this.field3875[8] = var8 + var4 + var8 + var4; + this.field3875[9] = var10 - var3 - var3 + var10; + this.field3875[10] = var11 + var2 - var9 - var6; } - @ObfuscatedName("ny") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "568233292" + descriptor = "(Lrm;I)V", + garbageValue = "-552331483" ) - static void method2270(String var0) { - class36.param9 = var0; + void method2310(class451 var1) { + this.field3875[0] = var1.field3887; + this.field3875[1] = var1.field3880; + this.field3875[2] = var1.field3883; + this.field3875[3] = 0.0F; + this.field3875[4] = var1.field3886; + this.field3875[5] = var1.field3878; + this.field3875[6] = var1.field3882; + this.field3875[7] = 0.0F; + this.field3875[8] = var1.field3888; + this.field3875[9] = var1.field3884; + this.field3875[10] = var1.field3877; + this.field3875[11] = 0.0F; + this.field3875[12] = var1.field3881; + this.field3875[13] = var1.field3879; + this.field3875[14] = var1.field3885; + this.field3875[15] = 1.0F; + } - try { - String var1 = TileItem.client.getParameter(Integer.toString(18)); - String var2 = TileItem.client.getParameter(Integer.toString(13)); - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; - if (var0.length() == 0) { - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - String var4 = var3 + "; Expires="; - long var6 = class113.clockNow() + 94608000000L; - Calendar.Calendar_calendar.setTime(new Date(var6)); - int var8 = Calendar.Calendar_calendar.get(7); - int var9 = Calendar.Calendar_calendar.get(5); - int var10 = Calendar.Calendar_calendar.get(2); - int var11 = Calendar.Calendar_calendar.get(1); - int var12 = Calendar.Calendar_calendar.get(11); - int var13 = Calendar.Calendar_calendar.get(12); - int var14 = Calendar.Calendar_calendar.get(13); - String var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; - var3 = var4 + var5 + "; Max-Age=" + 94608000L; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)F", + garbageValue = "-1874677140" + ) + float method2311() { + return this.field3875[12] * this.field3875[9] * this.field3875[6] * this.field3875[3] + (this.field3875[8] * this.field3875[7] * this.field3875[2] * this.field3875[13] + this.field3875[8] * this.field3875[1] * this.field3875[6] * this.field3875[15] + this.field3875[14] * this.field3875[11] * this.field3875[4] * this.field3875[1] + (this.field3875[0] * this.field3875[7] * this.field3875[9] * this.field3875[14] + this.field3875[15] * this.field3875[5] * this.field3875[0] * this.field3875[10] - this.field3875[0] * this.field3875[5] * this.field3875[11] * this.field3875[14] - this.field3875[15] * this.field3875[0] * this.field3875[6] * this.field3875[9] + this.field3875[13] * this.field3875[0] * this.field3875[6] * this.field3875[11] - this.field3875[10] * this.field3875[0] * this.field3875[7] * this.field3875[13] - this.field3875[15] * this.field3875[4] * this.field3875[1] * this.field3875[10]) - this.field3875[12] * this.field3875[1] * this.field3875[6] * this.field3875[11] - this.field3875[7] * this.field3875[1] * this.field3875[8] * this.field3875[14] + this.field3875[12] * this.field3875[10] * this.field3875[7] * this.field3875[1] + this.field3875[15] * this.field3875[4] * this.field3875[2] * this.field3875[9] - this.field3875[13] * this.field3875[11] * this.field3875[4] * this.field3875[2] - this.field3875[15] * this.field3875[8] * this.field3875[2] * this.field3875[5] + this.field3875[11] * this.field3875[2] * this.field3875[5] * this.field3875[12] - this.field3875[9] * this.field3875[7] * this.field3875[2] * this.field3875[12] - this.field3875[14] * this.field3875[3] * this.field3875[4] * this.field3875[9] + this.field3875[13] * this.field3875[10] * this.field3875[4] * this.field3875[3] + this.field3875[14] * this.field3875[8] * this.field3875[5] * this.field3875[3] - this.field3875[12] * this.field3875[3] * this.field3875[5] * this.field3875[10] - this.field3875[6] * this.field3875[3] * this.field3875[8] * this.field3875[13]); + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-93" + ) + public void method2312() { + float var1 = 1.0F / this.method2311(); + float var2 = (this.field3875[11] * this.field3875[6] * this.field3875[13] + (this.field3875[15] * this.field3875[5] * this.field3875[10] - this.field3875[14] * this.field3875[11] * this.field3875[5] - this.field3875[9] * this.field3875[6] * this.field3875[15]) + this.field3875[14] * this.field3875[7] * this.field3875[9] - this.field3875[7] * this.field3875[10] * this.field3875[13]) * var1; + float var3 = (this.field3875[13] * this.field3875[3] * this.field3875[10] + (this.field3875[15] * -this.field3875[1] * this.field3875[10] + this.field3875[14] * this.field3875[11] * this.field3875[1] + this.field3875[9] * this.field3875[2] * this.field3875[15] - this.field3875[11] * this.field3875[2] * this.field3875[13] - this.field3875[14] * this.field3875[9] * this.field3875[3])) * var1; + float var4 = (this.field3875[15] * this.field3875[6] * this.field3875[1] - this.field3875[1] * this.field3875[7] * this.field3875[14] - this.field3875[15] * this.field3875[2] * this.field3875[5] + this.field3875[2] * this.field3875[7] * this.field3875[13] + this.field3875[3] * this.field3875[5] * this.field3875[14] - this.field3875[13] * this.field3875[6] * this.field3875[3]) * var1; + float var5 = (this.field3875[9] * this.field3875[3] * this.field3875[6] + (this.field3875[7] * this.field3875[1] * this.field3875[10] + this.field3875[11] * -this.field3875[1] * this.field3875[6] + this.field3875[11] * this.field3875[2] * this.field3875[5] - this.field3875[7] * this.field3875[2] * this.field3875[9] - this.field3875[5] * this.field3875[3] * this.field3875[10])) * var1; + float var6 = (this.field3875[12] * this.field3875[10] * this.field3875[7] + (this.field3875[6] * this.field3875[8] * this.field3875[15] + this.field3875[15] * this.field3875[10] * -this.field3875[4] + this.field3875[4] * this.field3875[11] * this.field3875[14] - this.field3875[11] * this.field3875[6] * this.field3875[12] - this.field3875[14] * this.field3875[8] * this.field3875[7])) * var1; + float var7 = (this.field3875[2] * this.field3875[11] * this.field3875[12] + (this.field3875[0] * this.field3875[10] * this.field3875[15] - this.field3875[14] * this.field3875[0] * this.field3875[11] - this.field3875[15] * this.field3875[2] * this.field3875[8]) + this.field3875[14] * this.field3875[8] * this.field3875[3] - this.field3875[3] * this.field3875[10] * this.field3875[12]) * var1; + float var8 = (this.field3875[15] * this.field3875[2] * this.field3875[4] + this.field3875[15] * this.field3875[6] * -this.field3875[0] + this.field3875[0] * this.field3875[7] * this.field3875[14] - this.field3875[7] * this.field3875[2] * this.field3875[12] - this.field3875[3] * this.field3875[4] * this.field3875[14] + this.field3875[12] * this.field3875[3] * this.field3875[6]) * var1; + float var9 = (this.field3875[10] * this.field3875[4] * this.field3875[3] + this.field3875[0] * this.field3875[6] * this.field3875[11] - this.field3875[10] * this.field3875[0] * this.field3875[7] - this.field3875[2] * this.field3875[4] * this.field3875[11] + this.field3875[7] * this.field3875[2] * this.field3875[8] - this.field3875[8] * this.field3875[6] * this.field3875[3]) * var1; + float var10 = (this.field3875[15] * this.field3875[4] * this.field3875[9] - this.field3875[13] * this.field3875[4] * this.field3875[11] - this.field3875[15] * this.field3875[5] * this.field3875[8] + this.field3875[11] * this.field3875[5] * this.field3875[12] + this.field3875[13] * this.field3875[8] * this.field3875[7] - this.field3875[12] * this.field3875[9] * this.field3875[7]) * var1; + float var11 = var1 * (this.field3875[15] * this.field3875[9] * -this.field3875[0] + this.field3875[13] * this.field3875[0] * this.field3875[11] + this.field3875[1] * this.field3875[8] * this.field3875[15] - this.field3875[11] * this.field3875[1] * this.field3875[12] - this.field3875[8] * this.field3875[3] * this.field3875[13] + this.field3875[9] * this.field3875[3] * this.field3875[12]); + float var12 = (this.field3875[4] * this.field3875[3] * this.field3875[13] + this.field3875[12] * this.field3875[1] * this.field3875[7] + (this.field3875[15] * this.field3875[5] * this.field3875[0] - this.field3875[13] * this.field3875[0] * this.field3875[7] - this.field3875[1] * this.field3875[4] * this.field3875[15]) - this.field3875[12] * this.field3875[3] * this.field3875[5]) * var1; + float var13 = var1 * (this.field3875[8] * this.field3875[3] * this.field3875[5] + (-this.field3875[0] * this.field3875[5] * this.field3875[11] + this.field3875[9] * this.field3875[7] * this.field3875[0] + this.field3875[4] * this.field3875[1] * this.field3875[11] - this.field3875[8] * this.field3875[1] * this.field3875[7] - this.field3875[3] * this.field3875[4] * this.field3875[9])); + float var14 = (this.field3875[12] * this.field3875[6] * this.field3875[9] + (this.field3875[14] * this.field3875[9] * -this.field3875[4] + this.field3875[13] * this.field3875[10] * this.field3875[4] + this.field3875[8] * this.field3875[5] * this.field3875[14] - this.field3875[12] * this.field3875[10] * this.field3875[5] - this.field3875[8] * this.field3875[6] * this.field3875[13])) * var1; + float var15 = (this.field3875[13] * this.field3875[8] * this.field3875[2] + this.field3875[0] * this.field3875[9] * this.field3875[14] - this.field3875[13] * this.field3875[0] * this.field3875[10] - this.field3875[1] * this.field3875[8] * this.field3875[14] + this.field3875[1] * this.field3875[10] * this.field3875[12] - this.field3875[12] * this.field3875[2] * this.field3875[9]) * var1; + float var16 = var1 * (-this.field3875[0] * this.field3875[5] * this.field3875[14] + this.field3875[6] * this.field3875[0] * this.field3875[13] + this.field3875[14] * this.field3875[1] * this.field3875[4] - this.field3875[6] * this.field3875[1] * this.field3875[12] - this.field3875[4] * this.field3875[2] * this.field3875[13] + this.field3875[2] * this.field3875[5] * this.field3875[12]); + float var17 = (this.field3875[5] * this.field3875[0] * this.field3875[10] - this.field3875[0] * this.field3875[6] * this.field3875[9] - this.field3875[1] * this.field3875[4] * this.field3875[10] + this.field3875[1] * this.field3875[6] * this.field3875[8] + this.field3875[2] * this.field3875[4] * this.field3875[9] - this.field3875[8] * this.field3875[2] * this.field3875[5]) * var1; + this.field3875[0] = var2; + this.field3875[1] = var3; + this.field3875[2] = var4; + this.field3875[3] = var5; + this.field3875[4] = var6; + this.field3875[5] = var7; + this.field3875[6] = var8; + this.field3875[7] = var9; + this.field3875[8] = var10; + this.field3875[9] = var11; + this.field3875[10] = var12; + this.field3875[11] = var13; + this.field3875[12] = var14; + this.field3875[13] = var15; + this.field3875[14] = var16; + this.field3875[15] = var17; + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "6" + ) + public float[] method2313() { + float[] var1 = new float[3]; + class448 var2 = new class448(this.field3875[0], this.field3875[1], this.field3875[2]); + class448 var3 = new class448(this.field3875[4], this.field3875[5], this.field3875[6]); + class448 var4 = new class448(this.field3875[8], this.field3875[9], this.field3875[10]); + var1[0] = var2.method2291(); + var1[1] = var3.method2291(); + var1[2] = var4.method2291(); + return var1; + } + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + StringBuilder var1 = new StringBuilder(); + this.method2301(); + this.method2300(); + + for (int var2 = 0; var2 < 4; ++var2) { + for (int var3 = 0; var3 < 4; ++var3) { + if (var3 > 0) { + var1.append("\t"); + } + + float var4 = this.field3875[var3 + var2 * 4]; + if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { + var4 = 0.0F; + } + + var1.append(var4); } - class26.method100(TileItem.client, "document.cookie=\"" + var3 + "\""); - } catch (Throwable var15) { + var1.append("\n"); } + return var1.toString(); + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + boolean var1 = true; + byte var2 = 1; + int var3 = var2 * 31 + Arrays.hashCode(this.field3875); + return var3; + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (!(var1 instanceof class450)) { + return false; + } else { + class450 var2 = (class450)var1; + + for (int var3 = 0; var3 < 16; ++var3) { + if (this.field3875[var3] != var2.field3875[var3]) { + return false; + } + } + + return true; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class451.java b/osrs/src/main/java/class451.java index dcca697ec..9f7e29eb5 100644 --- a/osrs/src/main/java/class451.java +++ b/osrs/src/main/java/class451.java @@ -1,468 +1,147 @@ -import java.util.Arrays; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("rm") -public final class class451 { - @ObfuscatedName("ay") +public class class451 { + @ObfuscatedName("kf") @ObfuscatedSignature( - descriptor = "[Lrm;" + descriptor = "[Luk;" ) - static class451[] field3860; - @ObfuscatedName("ar") - static int field3859; - @ObfuscatedName("am") - static int field3858; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lrm;" - ) - public static final class451 field3857; - @ObfuscatedName("as") - public float[] field3861; + static IndexedSprite[] field3876; + @ObfuscatedName("au") + float field3887; + @ObfuscatedName("ae") + float field3880; + @ObfuscatedName("ao") + float field3883; + @ObfuscatedName("at") + float field3886; + @ObfuscatedName("ac") + float field3878; + @ObfuscatedName("ai") + float field3882; + @ObfuscatedName("az") + float field3888; + @ObfuscatedName("ap") + float field3884; + @ObfuscatedName("aa") + float field3877; + @ObfuscatedName("af") + float field3881; + @ObfuscatedName("ad") + float field3879; + @ObfuscatedName("aq") + float field3885; static { - field3860 = new class451[0]; - field3859 = 100; - field3860 = new class451[100]; - field3858 = 0; - field3857 = new class451(); - } - - public class451() { - this.field3861 = new float[16]; - this.method2275(); - } - - @ObfuscatedSignature( - descriptor = "(Lrm;)V" - ) - public class451(class451 var1) { - this.field3861 = new float[16]; - this.method2278(var1); - } - - @ObfuscatedSignature( - descriptor = "(Lty;Z)V" - ) - public class451(Buffer var1, boolean var2) { - this.field3861 = new float[16]; - this.method2272(var1, var2); - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1298935751" - ) - public void method2271() { - synchronized(field3860) { - if (field3858 < field3859 - 1) { - field3860[++field3858 - 1] = this; - } - - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Lty;ZI)V", - garbageValue = "-1389814144" - ) - void method2272(Buffer var1, boolean var2) { - if (var2) { - class452 var3 = new class452(); - int var6 = var1.readShort(); - var6 &= 16383; - float var5 = (float)(6.283185307179586D * (double)((float)var6 / 16384.0F)); - var3.method2289(var5); - int var9 = var1.readShort(); - var9 &= 16383; - float var8 = (float)((double)((float)var9 / 16384.0F) * 6.283185307179586D); - var3.method2290(var8); - int var12 = var1.readShort(); - var12 &= 16383; - float var11 = (float)((double)((float)var12 / 16384.0F) * 6.283185307179586D); - var3.method2291(var11); - var3.method2292((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); - this.method2284(var3); - } else { - for (int var13 = 0; var13 < 16; ++var13) { - this.field3861[var13] = var1.method2531(); - } - } - - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "737121810" - ) - float[] method2273() { - float[] var1 = new float[3]; - if ((double)this.field3861[2] < 0.999D && (double)this.field3861[2] > -0.999D) { - var1[1] = (float)(-Math.asin((double)this.field3861[2])); - double var2 = Math.cos((double)var1[1]); - var1[0] = (float)Math.atan2((double)this.field3861[6] / var2, (double)this.field3861[10] / var2); - var1[2] = (float)Math.atan2((double)this.field3861[1] / var2, (double)this.field3861[0] / var2); - } else { - var1[0] = 0.0F; - var1[1] = (float)Math.atan2((double)this.field3861[2], 0.0D); - var1[2] = (float)Math.atan2((double)(-this.field3861[9]), (double)this.field3861[5]); - } - - return var1; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "1036092257" - ) - public float[] method2274() { - float[] var1 = new float[]{(float)(-Math.asin((double)this.field3861[6])), 0.0F, 0.0F}; - double var2 = Math.cos((double)var1[0]); - double var4; - double var6; - if (Math.abs(var2) > 0.005D) { - var4 = (double)this.field3861[2]; - var6 = (double)this.field3861[10]; - double var8 = (double)this.field3861[4]; - double var10 = (double)this.field3861[5]; - var1[1] = (float)Math.atan2(var4, var6); - var1[2] = (float)Math.atan2(var8, var10); - } else { - var4 = (double)this.field3861[1]; - var6 = (double)this.field3861[0]; - if (this.field3861[6] < 0.0F) { - var1[1] = (float)Math.atan2(var4, var6); - } else { - var1[1] = (float)(-Math.atan2(var4, var6)); - } - - var1[2] = 0.0F; - } - - return var1; + new class451(); } - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-85" - ) - void method2275() { - this.field3861[0] = 1.0F; - this.field3861[1] = 0.0F; - this.field3861[2] = 0.0F; - this.field3861[3] = 0.0F; - this.field3861[4] = 0.0F; - this.field3861[5] = 1.0F; - this.field3861[6] = 0.0F; - this.field3861[7] = 0.0F; - this.field3861[8] = 0.0F; - this.field3861[9] = 0.0F; - this.field3861[10] = 1.0F; - this.field3861[11] = 0.0F; - this.field3861[12] = 0.0F; - this.field3861[13] = 0.0F; - this.field3861[14] = 0.0F; - this.field3861[15] = 1.0F; + class451() { + this.method2314(); } - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1783640512" - ) - public void method2276() { - this.field3861[0] = 0.0F; - this.field3861[1] = 0.0F; - this.field3861[2] = 0.0F; - this.field3861[3] = 0.0F; - this.field3861[4] = 0.0F; - this.field3861[5] = 0.0F; - this.field3861[6] = 0.0F; - this.field3861[7] = 0.0F; - this.field3861[8] = 0.0F; - this.field3861[9] = 0.0F; - this.field3861[10] = 0.0F; - this.field3861[11] = 0.0F; - this.field3861[12] = 0.0F; - this.field3861[13] = 0.0F; - this.field3861[14] = 0.0F; - this.field3861[15] = 0.0F; + garbageValue = "1136613952" + ) + void method2314() { + this.field3885 = 0.0F; + this.field3879 = 0.0F; + this.field3881 = 0.0F; + this.field3884 = 0.0F; + this.field3888 = 0.0F; + this.field3882 = 0.0F; + this.field3886 = 0.0F; + this.field3883 = 0.0F; + this.field3880 = 0.0F; + this.field3877 = 1.0F; + this.field3878 = 1.0F; + this.field3887 = 1.0F; } - @ObfuscatedName("az") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lrm;B)V", - garbageValue = "2" - ) - public void method2278(class451 var1) { - System.arraycopy(var1.field3861, 0, this.field3861, 0, 16); + descriptor = "(FB)V", + garbageValue = "-67" + ) + void method2315(float var1) { + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field3880; + float var5 = this.field3878; + float var6 = this.field3884; + float var7 = this.field3879; + this.field3880 = var4 * var2 - var3 * this.field3883; + this.field3883 = var2 * this.field3883 + var4 * var3; + this.field3878 = var5 * var2 - this.field3882 * var3; + this.field3882 = var5 * var3 + this.field3882 * var2; + this.field3884 = var2 * var6 - var3 * this.field3877; + this.field3877 = var6 * var3 + this.field3877 * var2; + this.field3879 = var2 * var7 - var3 * this.field3885; + this.field3885 = var7 * var3 + this.field3885 * var2; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(FB)V", + garbageValue = "0" + ) + void method2316(float var1) { + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field3887; + float var5 = this.field3886; + float var6 = this.field3888; + float var7 = this.field3881; + this.field3887 = var3 * this.field3883 + var2 * var4; + this.field3883 = this.field3883 * var2 - var4 * var3; + this.field3886 = var3 * this.field3882 + var2 * var5; + this.field3882 = this.field3882 * var2 - var3 * var5; + this.field3888 = var6 * var2 + this.field3877 * var3; + this.field3877 = this.field3877 * var2 - var3 * var6; + this.field3881 = var2 * var7 + this.field3885 * var3; + this.field3885 = this.field3885 * var2 - var7 * var3; } - @ObfuscatedName("av") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(FI)V", - garbageValue = "-1994849424" - ) - public void method2279(float var1) { - this.method2280(var1, var1, var1); - } - - @ObfuscatedName("ap") + garbageValue = "-2078210991" + ) + void method2317(float var1) { + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field3887; + float var5 = this.field3886; + float var6 = this.field3888; + float var7 = this.field3881; + this.field3887 = var2 * var4 - var3 * this.field3880; + this.field3880 = var2 * this.field3880 + var3 * var4; + this.field3886 = var5 * var2 - var3 * this.field3878; + this.field3878 = var3 * var5 + var2 * this.field3878; + this.field3888 = var2 * var6 - var3 * this.field3884; + this.field3884 = this.field3884 * var2 + var3 * var6; + this.field3881 = var2 * var7 - this.field3879 * var3; + this.field3879 = this.field3879 * var2 + var7 * var3; + } + + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(FFFI)V", - garbageValue = "1837928270" - ) - public void method2280(float var1, float var2, float var3) { - this.method2275(); - this.field3861[0] = var1; - this.field3861[5] = var2; - this.field3861[10] = var3; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(Lrm;S)V", - garbageValue = "28816" - ) - public void method2281(class451 var1) { - for (int var2 = 0; var2 < this.field3861.length; ++var2) { - float[] var10000 = this.field3861; - var10000[var2] += var1.field3861[var2]; - } - - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Lrm;S)V", - garbageValue = "255" - ) - public void method2282(class451 var1) { - float var2 = var1.field3861[12] * this.field3861[3] + this.field3861[0] * var1.field3861[0] + this.field3861[1] * var1.field3861[4] + this.field3861[2] * var1.field3861[8]; - float var3 = var1.field3861[13] * this.field3861[3] + this.field3861[2] * var1.field3861[9] + var1.field3861[5] * this.field3861[1] + var1.field3861[1] * this.field3861[0]; - float var4 = this.field3861[2] * var1.field3861[10] + this.field3861[0] * var1.field3861[2] + var1.field3861[6] * this.field3861[1] + var1.field3861[14] * this.field3861[3]; - float var5 = this.field3861[0] * var1.field3861[3] + var1.field3861[7] * this.field3861[1] + this.field3861[2] * var1.field3861[11] + this.field3861[3] * var1.field3861[15]; - float var6 = this.field3861[7] * var1.field3861[12] + var1.field3861[8] * this.field3861[6] + this.field3861[4] * var1.field3861[0] + var1.field3861[4] * this.field3861[5]; - float var7 = var1.field3861[1] * this.field3861[4] + this.field3861[5] * var1.field3861[5] + this.field3861[6] * var1.field3861[9] + this.field3861[7] * var1.field3861[13]; - float var8 = this.field3861[7] * var1.field3861[14] + this.field3861[4] * var1.field3861[2] + this.field3861[5] * var1.field3861[6] + this.field3861[6] * var1.field3861[10]; - float var9 = this.field3861[7] * var1.field3861[15] + this.field3861[6] * var1.field3861[11] + var1.field3861[7] * this.field3861[5] + var1.field3861[3] * this.field3861[4]; - float var10 = var1.field3861[12] * this.field3861[11] + this.field3861[10] * var1.field3861[8] + var1.field3861[4] * this.field3861[9] + this.field3861[8] * var1.field3861[0]; - float var11 = this.field3861[8] * var1.field3861[1] + var1.field3861[5] * this.field3861[9] + var1.field3861[9] * this.field3861[10] + var1.field3861[13] * this.field3861[11]; - float var12 = this.field3861[8] * var1.field3861[2] + var1.field3861[6] * this.field3861[9] + this.field3861[10] * var1.field3861[10] + this.field3861[11] * var1.field3861[14]; - float var13 = this.field3861[10] * var1.field3861[11] + var1.field3861[3] * this.field3861[8] + this.field3861[9] * var1.field3861[7] + this.field3861[11] * var1.field3861[15]; - float var14 = this.field3861[15] * var1.field3861[12] + this.field3861[13] * var1.field3861[4] + this.field3861[12] * var1.field3861[0] + this.field3861[14] * var1.field3861[8]; - float var15 = var1.field3861[13] * this.field3861[15] + var1.field3861[9] * this.field3861[14] + this.field3861[13] * var1.field3861[5] + this.field3861[12] * var1.field3861[1]; - float var16 = this.field3861[12] * var1.field3861[2] + var1.field3861[6] * this.field3861[13] + var1.field3861[10] * this.field3861[14] + var1.field3861[14] * this.field3861[15]; - float var17 = var1.field3861[11] * this.field3861[14] + this.field3861[13] * var1.field3861[7] + var1.field3861[3] * this.field3861[12] + var1.field3861[15] * this.field3861[15]; - this.field3861[0] = var2; - this.field3861[1] = var3; - this.field3861[2] = var4; - this.field3861[3] = var5; - this.field3861[4] = var6; - this.field3861[5] = var7; - this.field3861[6] = var8; - this.field3861[7] = var9; - this.field3861[8] = var10; - this.field3861[9] = var11; - this.field3861[10] = var12; - this.field3861[11] = var13; - this.field3861[12] = var14; - this.field3861[13] = var15; - this.field3861[14] = var16; - this.field3861[15] = var17; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Lrj;I)V", - garbageValue = "-2118656993" - ) - public void method2283(class450 var1) { - float var2 = var1.field3853 * var1.field3853; - float var3 = var1.field3855 * var1.field3853; - float var4 = var1.field3856 * var1.field3853; - float var5 = var1.field3853 * var1.field3854; - float var6 = var1.field3855 * var1.field3855; - float var7 = var1.field3855 * var1.field3856; - float var8 = var1.field3854 * var1.field3855; - float var9 = var1.field3856 * var1.field3856; - float var10 = var1.field3856 * var1.field3854; - float var11 = var1.field3854 * var1.field3854; - this.field3861[0] = var2 + var6 - var11 - var9; - this.field3861[1] = var5 + var5 + var7 + var7; - this.field3861[2] = var8 + (var8 - var4 - var4); - this.field3861[4] = var7 + (var7 - var5 - var5); - this.field3861[5] = var9 + var2 - var6 - var11; - this.field3861[6] = var3 + var10 + var10 + var3; - this.field3861[8] = var8 + var8 + var4 + var4; - this.field3861[9] = var10 - var3 - var3 + var10; - this.field3861[10] = var2 + var11 - var9 - var6; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Lrv;I)V", - garbageValue = "275615452" + garbageValue = "-586193895" ) - void method2284(class452 var1) { - this.field3861[0] = var1.field3871; - this.field3861[1] = var1.field3872; - this.field3861[2] = var1.field3867; - this.field3861[3] = 0.0F; - this.field3861[4] = var1.field3864; - this.field3861[5] = var1.field3868; - this.field3861[6] = var1.field3863; - this.field3861[7] = 0.0F; - this.field3861[8] = var1.field3862; - this.field3861[9] = var1.field3873; - this.field3861[10] = var1.field3870; - this.field3861[11] = 0.0F; - this.field3861[12] = var1.field3865; - this.field3861[13] = var1.field3866; - this.field3861[14] = var1.field3869; - this.field3861[15] = 1.0F; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(B)F", - garbageValue = "-6" - ) - float method2285() { - return this.field3861[12] * this.field3861[3] * this.field3861[6] * this.field3861[9] + (this.field3861[14] * this.field3861[5] * this.field3861[3] * this.field3861[8] + this.field3861[13] * this.field3861[10] * this.field3861[4] * this.field3861[3] + (this.field3861[8] * this.field3861[2] * this.field3861[7] * this.field3861[13] + this.field3861[2] * this.field3861[5] * this.field3861[11] * this.field3861[12] + (this.field3861[4] * this.field3861[2] * this.field3861[9] * this.field3861[15] + this.field3861[14] * this.field3861[9] * this.field3861[7] * this.field3861[0] + this.field3861[15] * this.field3861[10] * this.field3861[5] * this.field3861[0] - this.field3861[11] * this.field3861[0] * this.field3861[5] * this.field3861[14] - this.field3861[15] * this.field3861[9] * this.field3861[0] * this.field3861[6] + this.field3861[13] * this.field3861[0] * this.field3861[6] * this.field3861[11] - this.field3861[13] * this.field3861[0] * this.field3861[7] * this.field3861[10] - this.field3861[15] * this.field3861[10] * this.field3861[1] * this.field3861[4] + this.field3861[14] * this.field3861[11] * this.field3861[1] * this.field3861[4] + this.field3861[8] * this.field3861[1] * this.field3861[6] * this.field3861[15] - this.field3861[1] * this.field3861[6] * this.field3861[11] * this.field3861[12] - this.field3861[8] * this.field3861[1] * this.field3861[7] * this.field3861[14] + this.field3861[12] * this.field3861[10] * this.field3861[7] * this.field3861[1] - this.field3861[11] * this.field3861[2] * this.field3861[4] * this.field3861[13] - this.field3861[15] * this.field3861[8] * this.field3861[2] * this.field3861[5]) - this.field3861[12] * this.field3861[9] * this.field3861[7] * this.field3861[2] - this.field3861[9] * this.field3861[4] * this.field3861[3] * this.field3861[14]) - this.field3861[12] * this.field3861[10] * this.field3861[3] * this.field3861[5] - this.field3861[13] * this.field3861[3] * this.field3861[6] * this.field3861[8]); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-882996558" - ) - public void method2286() { - float var1 = 1.0F / this.method2285(); - float var2 = (this.field3861[7] * this.field3861[9] * this.field3861[14] + this.field3861[15] * this.field3861[5] * this.field3861[10] - this.field3861[11] * this.field3861[5] * this.field3861[14] - this.field3861[9] * this.field3861[6] * this.field3861[15] + this.field3861[13] * this.field3861[6] * this.field3861[11] - this.field3861[7] * this.field3861[10] * this.field3861[13]) * var1; - float var3 = var1 * (this.field3861[9] * this.field3861[2] * this.field3861[15] + this.field3861[14] * this.field3861[11] * this.field3861[1] + this.field3861[15] * -this.field3861[1] * this.field3861[10] - this.field3861[11] * this.field3861[2] * this.field3861[13] - this.field3861[3] * this.field3861[9] * this.field3861[14] + this.field3861[13] * this.field3861[10] * this.field3861[3]); - float var4 = var1 * (this.field3861[3] * this.field3861[5] * this.field3861[14] + this.field3861[13] * this.field3861[2] * this.field3861[7] + (this.field3861[1] * this.field3861[6] * this.field3861[15] - this.field3861[7] * this.field3861[1] * this.field3861[14] - this.field3861[2] * this.field3861[5] * this.field3861[15]) - this.field3861[13] * this.field3861[3] * this.field3861[6]); - float var5 = (this.field3861[9] * this.field3861[6] * this.field3861[3] + (this.field3861[10] * this.field3861[1] * this.field3861[7] + this.field3861[11] * this.field3861[6] * -this.field3861[1] + this.field3861[5] * this.field3861[2] * this.field3861[11] - this.field3861[2] * this.field3861[7] * this.field3861[9] - this.field3861[10] * this.field3861[5] * this.field3861[3])) * var1; - float var6 = var1 * (this.field3861[10] * this.field3861[7] * this.field3861[12] + (this.field3861[6] * this.field3861[8] * this.field3861[15] + this.field3861[15] * this.field3861[10] * -this.field3861[4] + this.field3861[11] * this.field3861[4] * this.field3861[14] - this.field3861[6] * this.field3861[11] * this.field3861[12] - this.field3861[14] * this.field3861[8] * this.field3861[7])); - float var7 = (this.field3861[3] * this.field3861[8] * this.field3861[14] + this.field3861[15] * this.field3861[10] * this.field3861[0] - this.field3861[14] * this.field3861[0] * this.field3861[11] - this.field3861[15] * this.field3861[8] * this.field3861[2] + this.field3861[2] * this.field3861[11] * this.field3861[12] - this.field3861[3] * this.field3861[10] * this.field3861[12]) * var1; - float var8 = (this.field3861[12] * this.field3861[3] * this.field3861[6] + (this.field3861[6] * -this.field3861[0] * this.field3861[15] + this.field3861[14] * this.field3861[0] * this.field3861[7] + this.field3861[15] * this.field3861[2] * this.field3861[4] - this.field3861[12] * this.field3861[7] * this.field3861[2] - this.field3861[14] * this.field3861[4] * this.field3861[3])) * var1; - float var9 = var1 * (this.field3861[0] * this.field3861[6] * this.field3861[11] - this.field3861[10] * this.field3861[7] * this.field3861[0] - this.field3861[11] * this.field3861[4] * this.field3861[2] + this.field3861[7] * this.field3861[2] * this.field3861[8] + this.field3861[4] * this.field3861[3] * this.field3861[10] - this.field3861[3] * this.field3861[6] * this.field3861[8]); - float var10 = var1 * (this.field3861[13] * this.field3861[7] * this.field3861[8] + this.field3861[15] * this.field3861[4] * this.field3861[9] - this.field3861[13] * this.field3861[11] * this.field3861[4] - this.field3861[15] * this.field3861[8] * this.field3861[5] + this.field3861[12] * this.field3861[11] * this.field3861[5] - this.field3861[7] * this.field3861[9] * this.field3861[12]); - float var11 = var1 * (this.field3861[9] * this.field3861[3] * this.field3861[12] + (this.field3861[15] * this.field3861[8] * this.field3861[1] + this.field3861[11] * this.field3861[0] * this.field3861[13] + this.field3861[15] * this.field3861[9] * -this.field3861[0] - this.field3861[12] * this.field3861[1] * this.field3861[11] - this.field3861[3] * this.field3861[8] * this.field3861[13])); - float var12 = (this.field3861[4] * this.field3861[3] * this.field3861[13] + this.field3861[7] * this.field3861[1] * this.field3861[12] + (this.field3861[15] * this.field3861[5] * this.field3861[0] - this.field3861[0] * this.field3861[7] * this.field3861[13] - this.field3861[15] * this.field3861[1] * this.field3861[4]) - this.field3861[12] * this.field3861[5] * this.field3861[3]) * var1; - float var13 = (this.field3861[8] * this.field3861[3] * this.field3861[5] + (this.field3861[4] * this.field3861[1] * this.field3861[11] + this.field3861[5] * -this.field3861[0] * this.field3861[11] + this.field3861[7] * this.field3861[0] * this.field3861[9] - this.field3861[7] * this.field3861[1] * this.field3861[8] - this.field3861[4] * this.field3861[3] * this.field3861[9])) * var1; - float var14 = (this.field3861[9] * this.field3861[6] * this.field3861[12] + (this.field3861[14] * this.field3861[8] * this.field3861[5] + this.field3861[13] * this.field3861[10] * this.field3861[4] + this.field3861[14] * -this.field3861[4] * this.field3861[9] - this.field3861[12] * this.field3861[10] * this.field3861[5] - this.field3861[6] * this.field3861[8] * this.field3861[13])) * var1; - float var15 = var1 * (this.field3861[1] * this.field3861[10] * this.field3861[12] + (this.field3861[14] * this.field3861[9] * this.field3861[0] - this.field3861[0] * this.field3861[10] * this.field3861[13] - this.field3861[14] * this.field3861[1] * this.field3861[8]) + this.field3861[13] * this.field3861[8] * this.field3861[2] - this.field3861[9] * this.field3861[2] * this.field3861[12]); - float var16 = var1 * (this.field3861[12] * this.field3861[2] * this.field3861[5] + (this.field3861[13] * this.field3861[6] * this.field3861[0] + -this.field3861[0] * this.field3861[5] * this.field3861[14] + this.field3861[4] * this.field3861[1] * this.field3861[14] - this.field3861[12] * this.field3861[1] * this.field3861[6] - this.field3861[13] * this.field3861[4] * this.field3861[2])); - float var17 = (this.field3861[9] * this.field3861[2] * this.field3861[4] + this.field3861[5] * this.field3861[0] * this.field3861[10] - this.field3861[9] * this.field3861[6] * this.field3861[0] - this.field3861[1] * this.field3861[4] * this.field3861[10] + this.field3861[6] * this.field3861[1] * this.field3861[8] - this.field3861[8] * this.field3861[2] * this.field3861[5]) * var1; - this.field3861[0] = var2; - this.field3861[1] = var3; - this.field3861[2] = var4; - this.field3861[3] = var5; - this.field3861[4] = var6; - this.field3861[5] = var7; - this.field3861[6] = var8; - this.field3861[7] = var9; - this.field3861[8] = var10; - this.field3861[9] = var11; - this.field3861[10] = var12; - this.field3861[11] = var13; - this.field3861[12] = var14; - this.field3861[13] = var15; - this.field3861[14] = var16; - this.field3861[15] = var17; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)[F", - garbageValue = "24" - ) - public float[] method2287() { - float[] var1 = new float[3]; - class449 var2 = new class449(this.field3861[0], this.field3861[1], this.field3861[2]); - class449 var3 = new class449(this.field3861[4], this.field3861[5], this.field3861[6]); - class449 var4 = new class449(this.field3861[8], this.field3861[9], this.field3861[10]); - var1[0] = var2.method2264(); - var1[1] = var3.method2264(); - var1[2] = var4.method2264(); - return var1; + void method2318(float var1, float var2, float var3) { + this.field3881 += var1; + this.field3879 += var2; + this.field3885 += var3; } @Export("toString") @ObfuscatedName("toString") public String toString() { - StringBuilder var1 = new StringBuilder(); - this.method2274(); - this.method2273(); - - for (int var2 = 0; var2 < 4; ++var2) { - for (int var3 = 0; var3 < 4; ++var3) { - if (var3 > 0) { - var1.append("\t"); - } - - float var4 = this.field3861[var3 + var2 * 4]; - if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { - var4 = 0.0F; - } - - var1.append(var4); - } - - var1.append("\n"); - } - - return var1.toString(); - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - boolean var1 = true; - byte var2 = 1; - int var3 = 31 * var2 + Arrays.hashCode(this.field3861); - return var3; - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (!(var1 instanceof class451)) { - return false; - } else { - class451 var2 = (class451)var1; - - for (int var3 = 0; var3 < 16; ++var3) { - if (this.field3861[var3] != var2.field3861[var3]) { - return false; - } - } - - return true; - } - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Lnd;Ljava/lang/String;Ljava/lang/String;I)Luu;", - garbageValue = "1008669226" - ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - if (!var0.isValidFileName(var1, var2)) { - return null; - } else { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - return MouseRecorder.method476(var0, var3, var4); - } + return this.field3887 + "," + this.field3886 + "," + this.field3888 + "," + this.field3881 + "\n" + this.field3880 + "," + this.field3878 + "," + this.field3884 + "," + this.field3879 + "\n" + this.field3883 + "," + this.field3882 + "," + this.field3877 + "," + this.field3885; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class452.java b/osrs/src/main/java/class452.java index 852db1f5e..42d11ae95 100644 --- a/osrs/src/main/java/class452.java +++ b/osrs/src/main/java/class452.java @@ -1,165 +1,25 @@ -import java.util.ArrayList; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rv") +@ObfuscatedName("rc") public class class452 { - @ObfuscatedName("aw") - float field3871; - @ObfuscatedName("ay") - float field3872; - @ObfuscatedName("ar") - float field3867; - @ObfuscatedName("am") - float field3864; - @ObfuscatedName("as") - float field3868; - @ObfuscatedName("aj") - float field3863; - @ObfuscatedName("ag") - float field3862; - @ObfuscatedName("az") - float field3873; - @ObfuscatedName("av") - float field3870; - @ObfuscatedName("ap") - float field3865; - @ObfuscatedName("aq") - float field3866; - @ObfuscatedName("at") - float field3869; - - static { - new class452(); - } - - class452() { - this.method2288(); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-112" - ) - void method2288() { - this.field3869 = 0.0F; - this.field3866 = 0.0F; - this.field3865 = 0.0F; - this.field3873 = 0.0F; - this.field3862 = 0.0F; - this.field3863 = 0.0F; - this.field3864 = 0.0F; - this.field3867 = 0.0F; - this.field3872 = 0.0F; - this.field3870 = 1.0F; - this.field3868 = 1.0F; - this.field3871 = 1.0F; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(FB)V", - garbageValue = "116" - ) - void method2289(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field3872; - float var5 = this.field3868; - float var6 = this.field3873; - float var7 = this.field3866; - this.field3872 = var2 * var4 - this.field3867 * var3; - this.field3867 = this.field3867 * var2 + var4 * var3; - this.field3868 = var5 * var2 - var3 * this.field3863; - this.field3863 = this.field3863 * var2 + var3 * var5; - this.field3873 = var6 * var2 - var3 * this.field3870; - this.field3870 = var3 * var6 + var2 * this.field3870; - this.field3866 = var2 * var7 - this.field3869 * var3; - this.field3869 = this.field3869 * var2 + var3 * var7; - } - - @ObfuscatedName("ar") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "851748256" + descriptor = "Lpi;" ) - void method2290(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field3871; - float var5 = this.field3864; - float var6 = this.field3862; - float var7 = this.field3865; - this.field3871 = var4 * var2 + this.field3867 * var3; - this.field3867 = var2 * this.field3867 - var3 * var4; - this.field3864 = var2 * var5 + this.field3863 * var3; - this.field3863 = this.field3863 * var2 - var5 * var3; - this.field3862 = this.field3870 * var3 + var2 * var6; - this.field3870 = var2 * this.field3870 - var3 * var6; - this.field3865 = var3 * this.field3869 + var7 * var2; - this.field3869 = var2 * this.field3869 - var3 * var7; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "415453075" - ) - void method2291(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field3871; - float var5 = this.field3864; - float var6 = this.field3862; - float var7 = this.field3865; - this.field3871 = var4 * var2 - this.field3872 * var3; - this.field3872 = var4 * var3 + var2 * this.field3872; - this.field3864 = var2 * var5 - this.field3868 * var3; - this.field3868 = this.field3868 * var2 + var5 * var3; - this.field3862 = var2 * var6 - this.field3873 * var3; - this.field3873 = var3 * var6 + var2 * this.field3873; - this.field3865 = var2 * var7 - this.field3866 * var3; - this.field3866 = var3 * var7 + var2 * this.field3866; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(FFFI)V", - garbageValue = "-1893116772" - ) - void method2292(float var1, float var2, float var3) { - this.field3865 += var1; - this.field3866 += var2; - this.field3869 += var3; - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - return this.field3871 + "," + this.field3864 + "," + this.field3862 + "," + this.field3865 + "\n" + this.field3872 + "," + this.field3868 + "," + this.field3873 + "," + this.field3866 + "\n" + this.field3867 + "," + this.field3863 + "," + this.field3870 + "," + this.field3869; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(IIIIS)V", - garbageValue = "128" - ) - public static void someMusicMethod(int var0, int var1, int var2, int var3) { - if (class306.musicSongs.size() > 1 && class306.musicSongs.get(0) != null && ((MusicSong)class306.musicSongs.get(0)).midiPcmStream.isReady() && class306.musicSongs.get(1) != null && ((MusicSong)class306.musicSongs.get(1)).midiPcmStream.isReady()) { - ArchiveLoader.method464(var0, var1, var2, var3); - class306.field2760.add(new SwapSongTask((SongTask)null)); - ArrayList var4 = new ArrayList(); - var4.add(new DelayFadeTask(new FadeInTask((SongTask)null, 1, false, class306.field2751), class306.field2754)); - var4.add(new DelayFadeTask(new FadeOutTask((SongTask)null, 0, false, class306.field2753), class306.musicPlayerStatus)); - class306.field2760.add(new ConcurrentMidiTask((SongTask)null, var4)); - if (class306.field2755.get(0) != null && class306.field2755.get(1) != null) { - MusicSong var5 = (MusicSong)class306.field2755.get(0); - class306.field2755.set(0, class306.musicSongs.get(1)); - class306.field2755.set(1, var5); - } - } - - } -} + @Export("ItemDefinition_fontPlain11") + public static Font ItemDefinition_fontPlain11; + @ObfuscatedName("aj") + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("au") + float[] field3891; + @ObfuscatedName("ae") + int field3892; + + class452(float[] var1, int var2) { + this.field3891 = var1; + this.field3892 = var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class453.java b/osrs/src/main/java/class453.java index d0663787f..88e60f939 100644 --- a/osrs/src/main/java/class453.java +++ b/osrs/src/main/java/class453.java @@ -1,70 +1,47 @@ -import java.util.Date; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rp") -public class class453 { - @ObfuscatedName("cp") - static int field3874; - @ObfuscatedName("aw") - float[] field3875; - @ObfuscatedName("ay") - int field3876; - - class453(float[] var1, int var2) { - this.field3875 = var1; - this.field3876 = var2; - } - - @ObfuscatedName("ay") +@ObfuscatedName("rq") +public enum class453 implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnd;III)[Lud;", - garbageValue = "-2024085770" + descriptor = "Lrq;" ) - public static SpritePixels[] method2294(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); - boolean var3; - if (var4 == null) { - var3 = false; - } else { - VarbitComposition.SpriteBuffer_decode(var4); - var3 = true; - } - - if (!var3) { - return null; - } else { - SpritePixels[] var5 = new SpritePixels[class528.SpriteBuffer_spriteCount]; - - for (int var6 = 0; var6 < class528.SpriteBuffer_spriteCount; ++var6) { - SpritePixels var7 = var5[var6] = new SpritePixels(); - var7.width = class528.SpriteBuffer_spriteWidth; - var7.height = class528.SpriteBuffer_spriteHeight; - var7.xOffset = class492.SpriteBuffer_xOffsets[var6]; - var7.yOffset = class134.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class172.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class528.SpriteBuffer_spriteHeights[var6]; - int var8 = var7.subWidth * var7.subHeight; - byte[] var9 = ArchiveDiskAction.SpriteBuffer_pixels[var6]; - var7.pixels = new int[var8]; + field3896(0, 1), + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lrq;" + ) + field3893(2, 2), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lrq;" + ) + field3894(3, 3), + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lrq;" + ) + field3895(1, 10); - for (int var10 = 0; var10 < var8; ++var10) { - var7.pixels[var10] = class528.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - } + @ObfuscatedName("ac") + final int field3897; + @ObfuscatedName("ai") + final int field3898; - DbTableType.method2483(); - return var5; - } + class453(int var3, int var4) { + this.field3897 = var3; + this.field3898 = var4; } - @ObfuscatedName("av") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/util/Date;I)Z", - garbageValue = "-2100779061" + descriptor = "(B)I", + garbageValue = "41" ) - static boolean method2295(Date var0) { - Date var1 = WorldMapElement.method939(); - return var0.after(var1); + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3898; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class454.java b/osrs/src/main/java/class454.java index 7d95dec60..8addb494d 100644 --- a/osrs/src/main/java/class454.java +++ b/osrs/src/main/java/class454.java @@ -1,47 +1,77 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rr") -public enum class454 implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("rs") +public class class454 implements class459 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lrr;" + descriptor = "Lsu;" ) - field3879(3, 1), - @ObfuscatedName("ay") + public final class489 field3899; + @ObfuscatedSignature( - descriptor = "Lrr;" + descriptor = "(Lsx;)V" ) - field3880(0, 2), - @ObfuscatedName("ar") + class454(class490 var1) { + this.field3899 = var1; + } + @ObfuscatedSignature( - descriptor = "Lrr;" + descriptor = "(Lrp;)V" ) - field3878(1, 3), - @ObfuscatedName("am") + public class454(class455 var1) { + this(new class490(var1)); + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lrr;" + descriptor = "(II)I", + garbageValue = "530420265" ) - field3877(2, 10); - - @ObfuscatedName("as") - final int field3882; - @ObfuscatedName("aj") - final int field3881; - - class454(int var3, int var4) { - this.field3882 = var3; - this.field3881 = var4; + public int method2320(int var1) { + return this.field3899.vmethod8144(var1); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(Lfh;FS)F", + garbageValue = "26313" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3881; + static float method2321(class130 var0, float var1) { + if (var0 == null) { + return 0.0F; + } else { + float var2; + if (var0.field1258 == var1) { + var2 = 0.0F; + } else if (var1 == var0.field1254) { + var2 = 1.0F; + } else { + var2 = (var1 - var0.field1258) / (var0.field1254 - var0.field1258); + } + + float var3; + if (var0.field1242) { + var3 = var2; + } else { + class126.field1206[3] = var0.field1255; + class126.field1206[2] = var0.field1249; + class126.field1206[1] = var0.field1250; + class126.field1206[0] = var0.field1247 - var2; + class126.field1207[0] = 0.0F; + class126.field1207[1] = 0.0F; + class126.field1207[2] = 0.0F; + class126.field1207[3] = 0.0F; + class126.field1207[4] = 0.0F; + int var4 = ModelData0.method1381(class126.field1206, 3, 0.0F, true, 1.0F, true, class126.field1207); + if (var4 == 1) { + var3 = class126.field1207[0]; + } else { + var3 = 0.0F; + } + } + + return var3 * (var0.field1253 + var3 * (var3 * var0.field1248 + var0.field1256)) + var0.field1252; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class455.java b/osrs/src/main/java/class455.java index 6c2ce263a..42b4002d4 100644 --- a/osrs/src/main/java/class455.java +++ b/osrs/src/main/java/class455.java @@ -1,34 +1,74 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rt") -public class class455 implements class460 { - @ObfuscatedName("aw") +@ObfuscatedName("rp") +public abstract class class455 extends class281 implements class522 { @ObfuscatedSignature( - descriptor = "Lse;" + descriptor = "(Lns;Lon;I)V" ) - public final class490 field3883; + protected class455(StudioGame var1, Language var2, int var3) { + super(var1, var2, var3); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IB)Lrv;", + garbageValue = "-32" + ) + @Export("vmethod8207") + protected abstract class457 vmethod8207(int var1); + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lsj;)V" + descriptor = "(I)I", + garbageValue = "-1119561049" ) - class455(class491 var1) { - this.field3883 = var1; + public int method2322() { + return super.field2482; } + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lrn;)V" + descriptor = "(IB)Ljava/lang/Object;", + garbageValue = "22" ) - public class455(class456 var1) { - this(new class491(var1)); + @Export("vmethod8697") + public Object vmethod8697(int var1) { + class457 var2 = this.vmethod8207(var1); + return var2 != null && var2.method2328() ? var2.method2329() : null; } - @ObfuscatedName("aw") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2097742109" + descriptor = "(Ltm;B)Lud;", + garbageValue = "-80" ) - public int method2297(int var1) { - return this.field3883.vmethod8144(var1); + public class523 method2324(Buffer var1) { + int var2 = var1.readUnsignedShort(); + class457 var3 = this.vmethod8207(var2); + class523 var4 = new class523(var2); + Class var5 = var3.field3900.field4105; + if (var5 == Integer.class) { + var4.field4215 = var1.readInt(); + } else if (var5 == Long.class) { + var4.field4215 = var1.readLong(); + } else if (var5 == String.class) { + var4.field4215 = var1.readStringCp1252NullCircumfixed(); + } else { + if (!class518.class.isAssignableFrom(var5)) { + throw new IllegalStateException(); + } + + try { + class518 var6 = (class518)var5.newInstance(); + var6.method2614(var1); + var4.field4215 = var6; + } catch (InstantiationException var7) { + } catch (IllegalAccessException var8) { + } + } + + return var4; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class456.java b/osrs/src/main/java/class456.java index be491b4c2..bcbbf7d77 100644 --- a/osrs/src/main/java/class456.java +++ b/osrs/src/main/java/class456.java @@ -2,155 +2,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rn") -public abstract class class456 extends class282 implements class521 { - @ObfuscatedName("kj") - @Export("cameraYaw") - static int cameraYaw; - - @ObfuscatedSignature( - descriptor = "(Lnu;Lot;I)V" - ) - protected class456(StudioGame var1, Language var2, int var3) { - super(var1, var2, var3); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Lrc;", - garbageValue = "-1481639468" - ) - @Export("vmethod8207") - protected abstract class458 vmethod8207(int var1); - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1877372338" - ) - public int method2298() { - return super.field2464; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-692946397" - ) - @Export("vmethod8697") - public Object vmethod8697(int var1) { - class458 var2 = this.vmethod8207(var1); - return var2 != null && var2.method2305() ? var2.method2306() : null; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lty;I)Luh;", - garbageValue = "-297164320" - ) - public class522 method2300(Buffer var1) { - int var2 = var1.readUnsignedShort(); - class458 var3 = this.vmethod8207(var2); - class522 var4 = new class522(var2); - Class var5 = var3.field3888.field4095; - if (var5 == Integer.class) { - var4.field4169 = var1.readInt(); - } else if (var5 == Long.class) { - var4.field4169 = var1.readLong(); - } else if (var5 == String.class) { - var4.field4169 = var1.readStringCp1252NullCircumfixed(); - } else { - if (!class517.class.isAssignableFrom(var5)) { - throw new IllegalStateException(); - } - - try { - class517 var6 = (class517)var5.newInstance(); - var6.method2595(var1); - var4.field4169 = var6; - } catch (InstantiationException var7) { - } catch (IllegalAccessException var8) { - } - } - - return var4; +@ObfuscatedName("rg") +public class class456 extends class457 { + public class456(int var1) { + super(var1); } - @ObfuscatedName("as") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-32" + descriptor = "(Ltm;II)V", + garbageValue = "362589282" ) - static void method2301(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { - int var5 = 0; - if (var1 > var4.maxX) { - var5 += var1 - var4.maxX; - } else if (var1 < var4.x) { - var5 += var4.x - var1; - } - - if (var2 > var4.maxY) { - var5 += var2 - var4.maxY; - } else if (var2 < var4.y) { - var5 += var4.y - var2; - } - - if (var5 - 64 <= var4.field687 && class150.clientPreferences.getAreaSoundEffectsVolume() != 0 && var0 == var4.plane) { - var5 -= 64; - if (var5 < 0) { - var5 = 0; - } - - int var6 = (var4.field687 - var5) * class150.clientPreferences.getAreaSoundEffectsVolume() / var4.field687; - if (var4.stream1 == null) { - if (var4.soundEffectId >= 0) { - SoundEffect var7 = SoundEffect.readSoundEffect(class149.field1340, var4.soundEffectId, 0); - if (var7 != null) { - RawSound var8 = var7.toRawSound().resample(SoundCache.decimator); - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); - var9.setNumLoops(-1); - SecureRandomCallable.pcmStreamMixer.addSubStream(var9); - var4.stream1 = var9; - } - } - } else { - var4.stream1.method243(var6); - } - - if (var4.stream2 == null) { - if (var4.soundEffectIds != null && (var4.field688 -= var3) <= 0) { - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); - SoundEffect var12 = SoundEffect.readSoundEffect(class149.field1340, var4.soundEffectIds[var11], 0); - if (var12 != null) { - RawSound var13 = var12.toRawSound().resample(SoundCache.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); - var10.setNumLoops(0); - SecureRandomCallable.pcmStreamMixer.addSubStream(var10); - var4.stream2 = var10; - var4.field688 = var4.field691 + (int)(Math.random() * (double)(var4.field692 - var4.field691)); - } - } - } else { - var4.stream2.method243(var6); - if (!var4.stream2.hasNext()) { - var4.stream2 = null; - } - } - } else { - if (var4.stream1 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(var4.stream1); - var4.stream1 = null; - } - - if (var4.stream2 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(var4.stream2); - var4.stream2 = null; - } - } - } - } - + @Export("vmethod7769") + void vmethod7769(Buffer var1, int var2) { } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class457.java b/osrs/src/main/java/class457.java index 45b0e9e59..4435517b9 100644 --- a/osrs/src/main/java/class457.java +++ b/osrs/src/main/java/class457.java @@ -2,31 +2,85 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rl") -public class class457 extends class458 { - @ObfuscatedName("cs") +@ObfuscatedName("rv") +public abstract class class457 implements class280 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Ltb;" ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("ib") + class502 field3900; + + class457(int var1) { + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ltm;II)V", + garbageValue = "362589282" + ) + @Export("vmethod7769") + abstract void vmethod7769(Buffer var1, int var2); + + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "(Ltm;B)V", + garbageValue = "-87" ) - @Export("socketTask") - static Task socketTask; + public void method2327(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; + } - public class457(int var1) { - super(var1); + class453 var3 = (class453)KeyHandler.findEnumerated(class418.method2163(), var2); + if (var3 != null) { + switch(var3.field3897) { + case 0: + int var4 = var1.readUnsignedByte(); + this.field3900 = SequenceDefinition.method1074(var4); + if (this.field3900 != null) { + break; + } + + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4); + case 1: + var1.readStringCp1252NullCircumfixed(); + break; + case 2: + class352[] var5 = new class352[]{class352.field3482, class352.field3480, class352.field3479, class352.field3481}; + KeyHandler.findEnumerated(var5, var1.readUnsignedByte()); + break; + default: + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); + } + } else { + this.vmethod7769(var1, var2); + } + } } - @ObfuscatedName("aw") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-546839154" + descriptor = "(I)Z", + garbageValue = "-2062851135" ) - @Export("vmethod7769") - void vmethod7769(Buffer var1, int var2) { + boolean method2328() { + return this.field3900 != null; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/Object;", + garbageValue = "-12" + ) + Object method2329() { + if (this.field3900 == class502.field4101) { + return 0; + } else if (this.field3900 == class502.field4099) { + return -1L; + } else { + return this.field3900 == class502.field4100 ? "" : null; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class458.java b/osrs/src/main/java/class458.java index 77aca823c..1053d207f 100644 --- a/osrs/src/main/java/class458.java +++ b/osrs/src/main/java/class458.java @@ -1,89 +1,5 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rc") -public abstract class class458 implements class281 { - @ObfuscatedName("tn") - static boolean field3887; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Ltm;" - ) - class503 field3888; - - class458(int var1) { - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lty;II)V", - garbageValue = "-546839154" - ) - @Export("vmethod7769") - abstract void vmethod7769(Buffer var1, int var2); - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lty;B)V", - garbageValue = "126" - ) - public void method2304(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; - } - - class454 var3 = (class454)ClientPreferences.findEnumerated(UrlRequester.method644(), var2); - if (var3 != null) { - switch(var3.field3882) { - case 0: - ClientPreferences.findEnumerated(Tiles.method459(), var1.readUnsignedByte()); - break; - case 1: - default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); - case 2: - var1.readStringCp1252NullCircumfixed(); - break; - case 3: - int var4 = var1.readUnsignedByte(); - this.field3888 = class395.method1994(var4); - } - } else { - this.vmethod7769(var1, var2); - } - } - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1079590565" - ) - boolean method2305() { - return this.field3888 != null; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/Object;", - garbageValue = "703790014" - ) - Object method2306() { - if (this.field3888 == class503.field4090) { - return 0; - } else if (this.field3888 == class503.field4091) { - return -1L; - } else { - return this.field3888 == class503.field4089 ? "" : null; - } - } - - @ObfuscatedName("aj") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); - } -} +@ObfuscatedName("ry") +public interface class458 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class459.java b/osrs/src/main/java/class459.java index fee56aa25..92b2fc10b 100644 --- a/osrs/src/main/java/class459.java +++ b/osrs/src/main/java/class459.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ro") -public interface class459 { -} +@ObfuscatedName("rk") +public interface class459 extends class458 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class46.java b/osrs/src/main/java/class46.java index 30526a3f9..0eee6e2fc 100644 --- a/osrs/src/main/java/class46.java +++ b/osrs/src/main/java/class46.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("bz") public class class46 { - @ObfuscatedName("aw") + @ObfuscatedName("au") int field224; - @ObfuscatedName("ay") - int field225; - @ObfuscatedName("ar") + @ObfuscatedName("ae") + int field220; + @ObfuscatedName("ao") int field222; - @ObfuscatedName("am") - int field221; - @ObfuscatedName("as") + @ObfuscatedName("at") int field223; - @ObfuscatedName("aj") - int field220; - @ObfuscatedName("ag") - int[] field226; + @ObfuscatedName("ac") + int field219; + @ObfuscatedName("ai") + int field221; + @ObfuscatedName("az") + int[] field225; class46() { class60 var1 = VorbisSample.field267; this.field224 = var1.method325(16); - this.field225 = var1.method325(24); + this.field220 = var1.method325(24); this.field222 = var1.method325(24); - this.field221 = var1.method325(24) + 1; - this.field223 = var1.method325(6) + 1; - this.field220 = var1.method325(8); - int[] var2 = new int[this.field223]; + this.field223 = var1.method325(24) + 1; + this.field219 = var1.method325(6) + 1; + this.field221 = var1.method325(8); + int[] var2 = new int[this.field219]; int var3; - for (var3 = 0; var3 < this.field223; ++var3) { + for (var3 = 0; var3 < this.field219; ++var3) { int var4 = 0; int var5 = var1.method325(3); boolean var6 = var1.method326() != 0; @@ -40,28 +40,28 @@ public class class46 { var2[var3] = var4 << 3 | var5; } - this.field226 = new int[this.field223 * 8]; + this.field225 = new int[this.field219 * 8]; - for (var3 = 0; var3 < this.field223 * 8; ++var3) { - this.field226[var3] = (var2[var3 >> 3] & 1 << (var3 & 7)) != 0 ? var1.method325(8) : -1; + for (var3 = 0; var3 < this.field219 * 8; ++var3) { + this.field225[var3] = (var2[var3 >> 3] & 1 << (var3 & 7)) != 0 ? var1.method325(8) : -1; } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "([FIZLce;)V" ) - void method232(float[] var1, int var2, boolean var3, class60 var4) { + void method229(float[] var1, int var2, boolean var3, class60 var4) { int var5; for (var5 = 0; var5 < var2; ++var5) { var1[var5] = 0.0F; } if (!var3) { - var5 = VorbisSample.field268[this.field220].field255; - int var6 = this.field222 - this.field225; - int var7 = var6 / this.field221; + var5 = VorbisSample.field268[this.field221].field257; + int var6 = this.field222 - this.field220; + int var7 = var6 / this.field223; int[] var8 = new int[var7]; for (int var9 = 0; var9 < 8; ++var9) { @@ -71,41 +71,41 @@ void method232(float[] var1, int var2, boolean var3, class60 var4) { int var11; int var12; if (var9 == 0) { - var11 = VorbisSample.field268[this.field220].method292(var4); + var11 = VorbisSample.field268[this.field221].method287(var4); for (var12 = var5 - 1; var12 >= 0; --var12) { if (var10 + var12 < var7) { - var8[var10 + var12] = var11 % this.field223; + var8[var10 + var12] = var11 % this.field219; } - var11 /= this.field223; + var11 /= this.field219; } } for (var11 = 0; var11 < var5; ++var11) { var12 = var8[var10]; - int var13 = this.field226[var9 + var12 * 8]; + int var13 = this.field225[var9 + var12 * 8]; if (var13 >= 0) { - int var14 = var10 * this.field221 + this.field225; + int var14 = var10 * this.field223 + this.field220; VorbisCodebook var15 = VorbisSample.field268[var13]; int var16; if (this.field224 == 0) { - var16 = this.field221 / var15.field255; + var16 = this.field223 / var15.field257; for (int var17 = 0; var17 < var16; ++var17) { - float[] var21 = var15.method293(var4); + float[] var21 = var15.method288(var4); - for (int var19 = 0; var19 < var15.field255; ++var19) { + for (int var19 = 0; var19 < var15.field257; ++var19) { var1[var14 + var17 + var19 * var16] += var21[var19]; } } } else { var16 = 0; - while (var16 < this.field221) { - float[] var20 = var15.method293(var4); + while (var16 < this.field223) { + float[] var20 = var15.method288(var4); - for (int var18 = 0; var18 < var15.field255; ++var18) { + for (int var18 = 0; var18 < var15.field257; ++var18) { var1[var14 + var16] += var20[var18]; ++var16; } @@ -123,4 +123,4 @@ void method232(float[] var1, int var2, boolean var3, class60 var4) { } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class460.java b/osrs/src/main/java/class460.java index 849b6abab..12e46a15e 100644 --- a/osrs/src/main/java/class460.java +++ b/osrs/src/main/java/class460.java @@ -1,5 +1,59 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rw") -public interface class460 extends class459 { -} +@ObfuscatedName("re") +public class class460 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lre;" + ) + public static final class460 field3901; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lre;" + ) + static final class460 field3902; + @ObfuscatedName("ao") + String field3903; + + static { + field3901 = new class460("application/json"); + field3902 = new class460("text/plain"); + } + + class460(String var1) { + this.field3903 = var1; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1631262328" + ) + public String method2331() { + return this.field3903; + } + + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "(IIIIII)Z", + garbageValue = "1329235005" + ) + static final boolean method2332(int var0, int var1, int var2, int var3, int var4) { + PendingSpawn var5 = null; + + for (PendingSpawn var6 = (PendingSpawn)Client.pendingSpawns.last(); var6 != null; var6 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var6.plane && var6.x == var1 && var2 == var6.y && var3 == var6.type) { + var5 = var6; + break; + } + } + + if (var5 != null) { + var5.field945 = var4; + return true; + } else { + return false; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class461.java b/osrs/src/main/java/class461.java index 9f53b6527..84c56e76b 100644 --- a/osrs/src/main/java/class461.java +++ b/osrs/src/main/java/class461.java @@ -1,36 +1,24 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rs") -public class class461 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lrs;" - ) - public static final class461 field3889; - @ObfuscatedName("ay") +import java.io.UnsupportedEncodingException; + +@ObfuscatedName("rf") +public interface class461 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lrs;" + descriptor = "(I)Lre;", + garbageValue = "1843960357" ) - static final class461 field3890; - @ObfuscatedName("ar") - String field3891; - - static { - field3889 = new class461("application/json"); - field3890 = new class461("text/plain"); - } - - class461(String var1) { - this.field3891 = var1; - } + @Export("vmethod2213") + class460 vmethod2213(); - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "15" + descriptor = "(I)[B", + garbageValue = "-2012768243" ) - public String method2309() { - return this.field3891; - } -} + @Export("vmethod7797") + byte[] vmethod7797() throws UnsupportedEncodingException; +} \ No newline at end of file diff --git a/osrs/src/main/java/class462.java b/osrs/src/main/java/class462.java index c50e282b5..c3a537700 100644 --- a/osrs/src/main/java/class462.java +++ b/osrs/src/main/java/class462.java @@ -1,23 +1,93 @@ -import java.io.UnsupportedEncodingException; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.UnsupportedEncodingException; + +@ObfuscatedName("rl") +public class class462 implements class461 { + @ObfuscatedName("at") + public static int field3904; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lorg/json/JSONObject;" + ) + JSONObject field3905; + + public class462(byte[] var1) throws UnsupportedEncodingException { + this.method2336(var1); + } + + public class462(JSONObject var1) { + this.field3905 = var1; + } -@ObfuscatedName("rq") -public interface class462 { - @ObfuscatedName("aw") + public class462(String var1) throws UnsupportedEncodingException { + this.method2337(var1); + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lrs;", - garbageValue = "186741716" + descriptor = "(I)Lre;", + garbageValue = "1843960357" ) - @Export("vmethod2213") - class461 vmethod2213(); + public class460 vmethod2213() { + return class460.field3901; + } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-587379873" + garbageValue = "-2012768243" ) @Export("vmethod7797") - byte[] vmethod7797() throws UnsupportedEncodingException; -} + public byte[] vmethod7797() throws UnsupportedEncodingException { + return this.field3905 == null ? new byte[0] : this.field3905.toString().getBytes("UTF-8"); + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "([BB)V", + garbageValue = "-68" + ) + void method2336(byte[] var1) throws UnsupportedEncodingException { + String var2 = new String(var1, "UTF-8"); + this.method2337(var2); + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-32" + ) + void method2337(String var1) throws UnsupportedEncodingException { + try { + if (var1.charAt(0) == '{') { + this.field3905 = new JSONObject(var1); + } else { + if (var1.charAt(0) != '[') { + throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); + } + + JSONArray var2 = new JSONArray(var1); + this.field3905 = new JSONObject(); + this.field3905.method2709("arrayValues", var2); + } + + } catch (JSONException var3) { + throw new UnsupportedEncodingException(var3.getMessage()); + } + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(B)Lorg/json/JSONObject;", + garbageValue = "-30" + ) + public JSONObject method2338() { + return this.field3905; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class463.java b/osrs/src/main/java/class463.java index 5d3377227..a623be4a3 100644 --- a/osrs/src/main/java/class463.java +++ b/osrs/src/main/java/class463.java @@ -1,90 +1,74 @@ -import java.io.UnsupportedEncodingException; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("re") -public class class463 implements class462 { - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lorg/json/JSONObject;" - ) - JSONObject field3892; - - public class463(byte[] var1) throws UnsupportedEncodingException { - this.method2313(var1); - } +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;)V" - ) - public class463(JSONObject var1) { - this.field3892 = var1; - } +@ObfuscatedName("rt") +public class class463 implements class461 { + @ObfuscatedName("au") + final Map field3906; - public class463(String var1) throws UnsupportedEncodingException { - this.method2314(var1); + public class463(Map var1) { + this.field3906 = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lrs;", - garbageValue = "186741716" + descriptor = "(I)Lre;", + garbageValue = "1843960357" ) - public class461 vmethod2213() { - return class461.field3889; + @Export("vmethod2213") + public class460 vmethod2213() { + return null; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-587379873" + garbageValue = "-2012768243" ) @Export("vmethod7797") public byte[] vmethod7797() throws UnsupportedEncodingException { - return this.field3892 == null ? new byte[0] : this.field3892.toString().getBytes("UTF-8"); + return this.method2342().getBytes("UTF-8"); } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-957035381" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-920677238" ) - void method2313(byte[] var1) throws UnsupportedEncodingException { - String var2 = new String(var1, "UTF-8"); - this.method2314(var2); - } + public String method2342() throws UnsupportedEncodingException { + StringBuilder var1 = new StringBuilder(); + Iterator var2 = this.field3906.entrySet().iterator(); - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "42" - ) - void method2314(String var1) throws UnsupportedEncodingException { - try { - if (var1.charAt(0) == '{') { - this.field3892 = new JSONObject(var1); - } else { - if (var1.charAt(0) != '[') { - throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); - } - - JSONArray var2 = new JSONArray(var1); - this.field3892 = new JSONObject(); - this.field3892.method2691("arrayValues", var2); - } + while (var2.hasNext()) { + Entry var3 = (Entry)var2.next(); + String var4 = URLEncoder.encode((String)var3.getKey(), "UTF-8"); + String var5 = URLEncoder.encode((String)var3.getValue(), "UTF-8"); + var1.append(var4).append("=").append(var5).append("&"); + } - } catch (JSONException var3) { - throw new UnsupportedEncodingException(var3.getMessage()); + if (var1.length() == 0) { + return ""; + } else { + var1.deleteCharAt(var1.length() - 1); + var1.insert(0, "?"); + return var1.toString(); } } - @ObfuscatedName("av") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Lorg/json/JSONObject;", - garbageValue = "0" + descriptor = "(B)V", + garbageValue = "67" ) - public JSONObject method2315() { - return this.field3892; + static void method2343() { + PcmPlayer.method212(24); + class318.setLoginResponseString("", "You were disconnected from the server.", ""); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class464.java b/osrs/src/main/java/class464.java index 40b7a751c..cf00d7541 100644 --- a/osrs/src/main/java/class464.java +++ b/osrs/src/main/java/class464.java @@ -1,63 +1,21 @@ -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("rx") -public class class464 implements class462 { - @ObfuscatedName("aw") - final Map field3893; +public class class464 { + @ObfuscatedName("ac") + static final int[] field3907; + @ObfuscatedName("ai") + static final int[] field3908; - public class464(Map var1) { - this.field3893 = var1; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)Lrs;", - garbageValue = "186741716" - ) - @Export("vmethod2213") - public class461 vmethod2213() { - return null; - } + static { + field3907 = new int[16384]; + field3908 = new int[16384]; + double var0 = 3.834951969714103E-4D; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-587379873" - ) - @Export("vmethod7797") - public byte[] vmethod7797() throws UnsupportedEncodingException { - return this.method2319().getBytes("UTF-8"); - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1821639668" - ) - public String method2319() throws UnsupportedEncodingException { - StringBuilder var1 = new StringBuilder(); - Iterator var2 = this.field3893.entrySet().iterator(); - - while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); - String var4 = URLEncoder.encode((String)var3.getKey(), "UTF-8"); - String var5 = URLEncoder.encode((String)var3.getValue(), "UTF-8"); - var1.append(var4).append("=").append(var5).append("&"); + for (int var2 = 0; var2 < 16384; ++var2) { + field3907[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); + field3908[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); } - if (var1.length() == 0) { - return ""; - } else { - var1.deleteCharAt(var1.length() - 1); - var1.insert(0, "?"); - return var1.toString(); - } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class465.java b/osrs/src/main/java/class465.java index d898791c2..04e8eb3b3 100644 --- a/osrs/src/main/java/class465.java +++ b/osrs/src/main/java/class465.java @@ -1,27 +1,21 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ry") +@ObfuscatedName("rw") public class class465 { - @ObfuscatedName("as") - static final int[] field3896; - @ObfuscatedName("aj") - static final int[] field3895; - @ObfuscatedName("di") - @ObfuscatedSignature( - descriptor = "Luu;" - ) - static IndexedSprite field3894; + @ObfuscatedName("al") + static final int[] field3909; + @ObfuscatedName("an") + static final int[] field3910; static { - field3896 = new int[16384]; - field3895 = new int[16384]; - double var0 = 3.834951969714103E-4D; + field3909 = new int[2048]; + field3910 = new int[2048]; + double var0 = 0.0030679615757712823D; - for (int var2 = 0; var2 < 16384; ++var2) { - field3896[var2] = (int)(16384.0D * Math.sin(var0 * (double)var2)); - field3895[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); + for (int var2 = 0; var2 < 2048; ++var2) { + field3909[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); + field3910[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class466.java b/osrs/src/main/java/class466.java index 59e0eddf7..d1fab3893 100644 --- a/osrs/src/main/java/class466.java +++ b/osrs/src/main/java/class466.java @@ -1,21 +1,650 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rd") +@ObfuscatedName("rn") public class class466 { - @ObfuscatedName("ah") - static final int[] field3897; - @ObfuscatedName("ax") - static final int[] field3898; + @ObfuscatedName("ai") + static int[] field3914; + @ObfuscatedName("az") + public static int[] field3911; + @ObfuscatedName("ad") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lfi;" + ) + static ClanSettings field3912; static { - field3897 = new int[2048]; - field3898 = new int[2048]; - double var0 = 0.0030679615757712823D; + field3914 = new int[32768]; - for (int var2 = 0; var2 < 2048; ++var2) { - field3897[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - field3898[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); + for (int var0 = 0; var0 < 32768; ++var0) { + field3914[var0] = method2344(var0); } + method2346(); } -} + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)[Lnv;", + garbageValue = "3" + ) + static class345[] method2345() { + return new class345[]{class345.field3151, class345.field3150}; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "2141889570" + ) + static final int method2344(int var0) { + double var1 = (double)(var0 >> 10 & 31) / 31.0D; + double var3 = (double)(var0 >> 5 & 31) / 31.0D; + double var5 = (double)(var0 & 31) / 31.0D; + double var7 = var1; + if (var3 < var1) { + var7 = var3; + } + + if (var5 < var7) { + var7 = var5; + } + + double var9 = var1; + if (var3 > var1) { + var9 = var3; + } + + if (var5 > var9) { + var9 = var5; + } + + double var11 = 0.0D; + double var13 = 0.0D; + double var15 = (var9 + var7) / 2.0D; + if (var7 != var9) { + if (var15 < 0.5D) { + var13 = (var9 - var7) / (var7 + var9); + } + + if (var15 >= 0.5D) { + var13 = (var9 - var7) / (2.0D - var9 - var7); + } + + if (var9 == var1) { + var11 = (var3 - var5) / (var9 - var7); + } else if (var3 == var9) { + var11 = 2.0D + (var5 - var1) / (var9 - var7); + } else if (var5 == var9) { + var11 = 4.0D + (var1 - var3) / (var9 - var7); + } + } + + int var17 = (int)(var11 * 256.0D / 6.0D); + var17 &= 255; + double var18 = 256.0D * var13; + if (var18 < 0.0D) { + var18 = 0.0D; + } else if (var18 > 255.0D) { + var18 = 255.0D; + } + + if (var15 > 0.7D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.75D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.85D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.95D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.995D) { + var15 = 0.995D; + } + + int var20 = (int)((double)(var17 / 4 * 8) + var18 / 32.0D); + return (var20 << 7) + (int)(var15 * 128.0D); + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "861588431" + ) + static void method2346() { + if (field3911 == null) { + field3911 = new int[65536]; + double var0 = 0.949999988079071D; + + for (int var2 = 0; var2 < 65536; ++var2) { + double var3 = 0.0078125D + (double)(var2 >> 10 & 63) / 64.0D; + double var5 = 0.0625D + (double)(var2 >> 7 & 7) / 8.0D; + double var7 = (double)(var2 & 127) / 128.0D; + double var9 = var7; + double var11 = var7; + double var13 = var7; + if (0.0D != var5) { + double var15; + if (var7 < 0.5D) { + var15 = var7 * (var5 + 1.0D); + } else { + var15 = var5 + var7 - var5 * var7; + } + + double var17 = 2.0D * var7 - var15; + double var19 = var3 + 0.3333333333333333D; + if (var19 > 1.0D) { + --var19; + } + + double var23 = var3 - 0.3333333333333333D; + if (var23 < 0.0D) { + ++var23; + } + + if (var19 * 6.0D < 1.0D) { + var9 = var19 * 6.0D * (var15 - var17) + var17; + } else if (2.0D * var19 < 1.0D) { + var9 = var15; + } else if (3.0D * var19 < 2.0D) { + var9 = var17 + (var15 - var17) * (0.6666666666666666D - var19) * 6.0D; + } else { + var9 = var17; + } + + if (6.0D * var3 < 1.0D) { + var11 = var17 + (var15 - var17) * 6.0D * var3; + } else if (2.0D * var3 < 1.0D) { + var11 = var15; + } else if (var3 * 3.0D < 2.0D) { + var11 = 6.0D * (var15 - var17) * (0.6666666666666666D - var3) + var17; + } else { + var11 = var17; + } + + if (6.0D * var23 < 1.0D) { + var13 = 6.0D * (var15 - var17) * var23 + var17; + } else if (var23 * 2.0D < 1.0D) { + var13 = var15; + } else if (var23 * 3.0D < 2.0D) { + var13 = var17 + (0.6666666666666666D - var23) * (var15 - var17) * 6.0D; + } else { + var13 = var17; + } + } + + var9 = Math.pow(var9, var0); + var11 = Math.pow(var11, var0); + var13 = Math.pow(var13, var0); + int var25 = (int)(256.0D * var9); + int var16 = (int)(256.0D * var11); + int var26 = (int)(256.0D * var13); + int var18 = var26 + (var16 << 8) + (var25 << 16); + field3911[var2] = var18 & 16777215; + } + + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "294804302" + ) + public static int method2347(int var0) { + return 255 - (var0 & 255); + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "66" + ) + static int method2350() { + return Login.loginIndex; + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "-734620102" + ) + static int method2349(int var0, Script var1, boolean var2) { + String var3; + if (var0 == 3100) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + MouseHandler.addGameMessage(0, "", var3); + return 1; + } else if (var0 == 3101) { + SoundCache.Interpreter_intStackSize -= 2; + LoginType.performPlayerAnimation(VarbitComposition.localPlayer, Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == 3103) { + if (!Interpreter.field704) { + Interpreter.field705 = true; + } + + return 1; + } else { + int var10; + if (var0 == 3104) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var10 = 0; + if (class218.isNumber(var3)) { + var10 = HealthBarUpdate.method524(var3); + } + + PacketBufferNode var12 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.RESUME_P_COUNTDIALOG, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var10); + Client.packetWriter.addNode(var12); + return 1; + } else { + PacketBufferNode var14; + if (var0 == 3105) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.RESUME_P_NAMEDIALOG, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == 3106) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.RESUME_P_STRINGDIALOG, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); + return 1; + } else { + String var7; + int var8; + if (var0 == 3107) { + var8 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + class14.method41(var8, var7); + return 1; + } else if (var0 == 3108) { + SoundCache.Interpreter_intStackSize -= 3; + var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + Widget var13 = class92.getWidget(var9); + class227.clickWidget(var13, var8, var10); + return 1; + } else if (var0 == 3109) { + SoundCache.Interpreter_intStackSize -= 2; + var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + Widget var11 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + class227.clickWidget(var11, var8, var10); + return 1; + } else if (var0 == 3110) { + ObjTypeCustomisation.mouseCam = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3111) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class449.clientPreferences.getRoofsHidden() ? 1 : 0; + return 1; + } else if (var0 == 3112) { + class449.clientPreferences.setRoofsHidden(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == 3113) { + var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class30.openURL(var3, var4, false); + return 1; + } else if (var0 == 3115) { + var8 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.RESUME_P_OBJDIALOG, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShort(var8); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == 3116) { + var8 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class137.Interpreter_stringStackSize -= 2; + var7 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; + if (var7.length() > 500) { + return 1; + } else if (var5.length() > 500) { + return 1; + } else { + PacketBufferNode var6 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.BUG_REPORT, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + AbstractSocket.stringCp1252NullTerminatedByteSize(var7) + AbstractSocket.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + var6.packetBuffer.writeByte(var8); + var6.packetBuffer.writeStringCp1252NullTerminated(var7); + Client.packetWriter.addNode(var6); + return 1; + } + } else if (var0 == 3117) { + --SoundCache.Interpreter_intStackSize; + return 1; + } else if (var0 == 3118) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3119) { + Client.field386 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; + } + + return 1; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; + } + + return 1; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; + } + + return 1; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; + } + + return 1; + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; + return 1; + } else if (var0 == 3125) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3126) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3127) { + class14.setTapToDrop(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == 3128) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class30.getTapToDrop() ? 1 : 0; + return 1; + } else if (var0 == 3129) { + SoundCache.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + return 1; + } else if (var0 == 3130) { + SoundCache.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3131) { + --SoundCache.Interpreter_intStackSize; + return 1; + } else if (var0 == 3132) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class113.canvasWidth; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class177.canvasHeight; + return 1; + } else if (var0 == 3133) { + --SoundCache.Interpreter_intStackSize; + return 1; + } else if (var0 == 3134) { + return 1; + } else if (var0 == 3135) { + SoundCache.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3136) { + Client.field505 = 3; + Client.field508 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3137) { + Client.field505 = 2; + Client.field508 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3138) { + Client.field505 = 0; + return 1; + } else if (var0 == 3139) { + Client.field505 = 1; + return 1; + } else if (var0 == 3140) { + Client.field505 = 3; + Client.field508 = var2 ? GameObject.scriptDotWidget.id * -198009563 * -802277715 : SceneTilePaint.scriptActiveWidget.id * -198009563 * -802277715; + return 1; + } else { + boolean var15; + if (var0 == 3141) { + var15 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class449.clientPreferences.setIsUsernameHidden(var15); + return 1; + } else if (var0 == 3142) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class449.clientPreferences.getIsUsernameHidden() ? 1 : 0; + return 1; + } else if (var0 == 3143) { + var15 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var15; + if (!var15) { + class449.clientPreferences.setUsernameToRemember(""); + } + + return 1; + } else if (var0 == 3144) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; + return 1; + } else if (var0 == 3145) { + return 1; + } else if (var0 == 3146) { + var15 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class449.clientPreferences.getTitleMusicDisabled(!var15); + return 1; + } else if (var0 == 3147) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class449.clientPreferences.getTitleMusicDisabled() ? 0 : 1; + return 1; + } else if (var0 == 3148) { + return 1; + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = FriendSystem.method412(); + return 1; + } else if (var0 == 3155) { + --class137.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3156) { + return 1; + } else if (var0 == 3157) { + SoundCache.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3161) { + --SoundCache.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3162) { + --SoundCache.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3163) { + --class137.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3164) { + --SoundCache.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3165) { + --SoundCache.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3166) { + SoundCache.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3167) { + SoundCache.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3168) { + SoundCache.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3169) { + return 1; + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3172) { + --SoundCache.Interpreter_intStackSize; + return 1; + } else if (var0 == 3173) { + --SoundCache.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3174) { + --SoundCache.Interpreter_intStackSize; + return 1; + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3176) { + return 1; + } else if (var0 == 3177) { + return 1; + } else if (var0 == 3178) { + --class137.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3179) { + return 1; + } else if (var0 == 3180) { + --class137.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3181) { + class20.method69(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + return 1; + } else if (var0 == 3182) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = PlayerType.method1883(); + return 1; + } else if (var0 == 3189) { + var8 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + FontName.method2447(var8); + return 1; + } else { + return 2; + } + } + } + } + } + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "1811966721" + ) + static int method2351(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 5504) { + SoundCache.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; + } + + return 1; + } else if (var0 == 5505) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == 5506) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == 5530) { + var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var3 < 0) { + var3 = 0; + } + + Client.camFollowHeight = var3; + return 1; + } else if (var0 == 5531) { + Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.camFollowHeight; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "(Lnk;Ljava/lang/String;I)V", + garbageValue = "88867976" + ) + static void method2348(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field550 += var2.groupCount; + } + + @ObfuscatedName("ls") + @ObfuscatedSignature( + descriptor = "(IIS)V", + garbageValue = "-2084" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CONTINUE, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeIntLE(var0); + var2.packetBuffer.writeIntME(var1); + Client.packetWriter.addNode(var2); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class467.java b/osrs/src/main/java/class467.java deleted file mode 100644 index e20dc99c5..000000000 --- a/osrs/src/main/java/class467.java +++ /dev/null @@ -1,289 +0,0 @@ -import java.awt.Image; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("rz") -public class class467 { - @ObfuscatedName("aj") - static int[] field3901; - @ObfuscatedName("ag") - public static int[] field3899; - @ObfuscatedName("bp") - static Image field3902; - @ObfuscatedName("lz") - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - - static { - field3901 = new int[32768]; - - for (int var0 = 0; var0 < 32768; ++var0) { - field3901[var0] = method2320(var0); - } - - method2322(); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "94" - ) - static final int method2320(int var0) { - double var1 = (double)(var0 >> 10 & 31) / 31.0D; - double var3 = (double)(var0 >> 5 & 31) / 31.0D; - double var5 = (double)(var0 & 31) / 31.0D; - double var7 = var1; - if (var3 < var1) { - var7 = var3; - } - - if (var5 < var7) { - var7 = var5; - } - - double var9 = var1; - if (var3 > var1) { - var9 = var3; - } - - if (var5 > var9) { - var9 = var5; - } - - double var11 = 0.0D; - double var13 = 0.0D; - double var15 = (var7 + var9) / 2.0D; - if (var7 != var9) { - if (var15 < 0.5D) { - var13 = (var9 - var7) / (var9 + var7); - } - - if (var15 >= 0.5D) { - var13 = (var9 - var7) / (2.0D - var9 - var7); - } - - if (var9 == var1) { - var11 = (var3 - var5) / (var9 - var7); - } else if (var3 == var9) { - var11 = (var5 - var1) / (var9 - var7) + 2.0D; - } else if (var9 == var5) { - var11 = 4.0D + (var1 - var3) / (var9 - var7); - } - } - - int var17 = (int)(var11 * 256.0D / 6.0D); - var17 &= 255; - double var18 = 256.0D * var13; - if (var18 < 0.0D) { - var18 = 0.0D; - } else if (var18 > 255.0D) { - var18 = 255.0D; - } - - if (var15 > 0.7D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.75D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.85D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.95D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.995D) { - var15 = 0.995D; - } - - int var20 = (int)((double)(var17 / 4 * 8) + var18 / 32.0D); - return (int)(128.0D * var15) + (var20 << 7); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "176921584" - ) - public static int method2321() { - return ViewportMouse.ViewportMouse_entityCount; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1544009428" - ) - static void method2322() { - if (field3899 == null) { - field3899 = new int[65536]; - double var0 = 0.949999988079071D; - - for (int var2 = 0; var2 < 65536; ++var2) { - double var3 = (double)(var2 >> 10 & 63) / 64.0D + 0.0078125D; - double var5 = (double)(var2 >> 7 & 7) / 8.0D + 0.0625D; - double var7 = (double)(var2 & 127) / 128.0D; - double var9 = var7; - double var11 = var7; - double var13 = var7; - if (0.0D != var5) { - double var15; - if (var7 < 0.5D) { - var15 = var7 * (1.0D + var5); - } else { - var15 = var5 + var7 - var7 * var5; - } - - double var17 = 2.0D * var7 - var15; - double var19 = 0.3333333333333333D + var3; - if (var19 > 1.0D) { - --var19; - } - - double var23 = var3 - 0.3333333333333333D; - if (var23 < 0.0D) { - ++var23; - } - - if (var19 * 6.0D < 1.0D) { - var9 = var17 + var19 * 6.0D * (var15 - var17); - } else if (2.0D * var19 < 1.0D) { - var9 = var15; - } else if (3.0D * var19 < 2.0D) { - var9 = var17 + 6.0D * (0.6666666666666666D - var19) * (var15 - var17); - } else { - var9 = var17; - } - - if (var3 * 6.0D < 1.0D) { - var11 = var17 + var3 * (var15 - var17) * 6.0D; - } else if (var3 * 2.0D < 1.0D) { - var11 = var15; - } else if (var3 * 3.0D < 2.0D) { - var11 = (var15 - var17) * (0.6666666666666666D - var3) * 6.0D + var17; - } else { - var11 = var17; - } - - if (var23 * 6.0D < 1.0D) { - var13 = 6.0D * (var15 - var17) * var23 + var17; - } else if (2.0D * var23 < 1.0D) { - var13 = var15; - } else if (3.0D * var23 < 2.0D) { - var13 = (var15 - var17) * (0.6666666666666666D - var23) * 6.0D + var17; - } else { - var13 = var17; - } - } - - var9 = Math.pow(var9, var0); - var11 = Math.pow(var11, var0); - var13 = Math.pow(var13, var0); - int var25 = (int)(var9 * 256.0D); - int var16 = (int)(256.0D * var11); - int var26 = (int)(256.0D * var13); - int var18 = var26 + (var16 << 8) + (var25 << 16); - field3899[var2] = var18 & 16777215; - } - - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "172911680" - ) - public static int method2323(int var0) { - return 255 - (var0 & 255); - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-17" - ) - public static void method2324() { - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - SequenceDefinition.SequenceDefinition_cachedModel.clear(); - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "1878130101" - ) - static int method2325(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3500) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.getKeyPressed(var3) ? 1 : 0; - return 1; - } else if (var0 == 3501) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1086(var3) ? 1 : 0; - return 1; - } else if (var0 == 3502) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1088(var3) ? 1 : 0; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("np") - @ObfuscatedSignature( - descriptor = "(Lmt;B)Z", - garbageValue = "0" - ) - static final boolean method2326(Widget var0) { - int var1 = var0.contentType; - if (var1 == 205) { - Client.logoutTimer = 250; - return true; - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { - var2 = (var1 - 300) / 2; - var3 = var1 & 1; - Client.playerAppearance.changeAppearance(var2, var3 == 1); - } - - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method1683(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.method1684(0); - } - - if (var1 == 325) { - Client.playerAppearance.method1684(1); - } - - if (var1 == 326) { - PacketBufferNode var4 = class503.getPacketBufferNode(ClientPacket.UPDATE_APPEARANCE, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; - } else { - return false; - } - } - } -} diff --git a/osrs/src/main/java/class47.java b/osrs/src/main/java/class47.java index cc2cae4bb..de745e757 100644 --- a/osrs/src/main/java/class47.java +++ b/osrs/src/main/java/class47.java @@ -1,1096 +1,158 @@ -import java.util.concurrent.locks.ReentrantLock; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bl") +import java.util.concurrent.locks.ReentrantLock; + +@ObfuscatedName("bx") public class class47 { - @ObfuscatedName("de") + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + public static AbstractArchive field226; + @ObfuscatedName("jr") + @Export("baseY") + static int baseY; + @ObfuscatedName("ra") @ObfuscatedSignature( - descriptor = "Luu;" + descriptor = "Lth;" ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("aw") + @Export("HitSplatDefinition_cachedSprites") + static class497 HitSplatDefinition_cachedSprites; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lcz;" + descriptor = "Lcm;" ) - VorbisSample field229; - @ObfuscatedName("ay") + VorbisSample field230; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lbi;" + descriptor = "Lbu;" ) - RawSound field228; - @ObfuscatedName("ar") - ReentrantLock field230; + RawSound field229; + @ObfuscatedName("ao") + ReentrantLock field231; @ObfuscatedSignature( - descriptor = "(Lcz;Lbi;)V" + descriptor = "(Lcm;Lbu;)V" ) class47(VorbisSample var1, RawSound var2) { - this.field229 = var1; - this.field228 = var2; - this.field230 = new ReentrantLock(); + this.field230 = var1; + this.field229 = var2; + this.field231 = new ReentrantLock(); } - @ObfuscatedName("ak") + @ObfuscatedName("ly") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "2017715384" + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "997098077" ) - static int method233(int var0, Script var1, boolean var2) { - Widget var3 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == 2600) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == 2601) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == 2602) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == 2603) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == 2604) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == 2605) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == 2606) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == 2607) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == 2608) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == 2609) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 2610) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == 2611) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == 2612) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 2613) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == 2614) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else { - class325 var4; - if (var0 == 2617) { - var4 = var3.method1806(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2874 * 486674949 * -392959283 : 0; + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = SoundCache.getWidgetChild(var1, var2); + if (var5 != null) { + if (var5.onOp != null) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var5; + var6.opIndex = var0; + var6.targetName = var4; + var6.args = var5.onOp; + WorldMapSection1.runScriptEvent(var6); } - if (var0 == 2618) { - var4 = var3.method1806(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2875 * 226510377 * 987280921 : 0; - return 1; - } else { - class330 var7; - if (var0 == 2619) { - var7 = var3.method1805(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1743().method2000() : ""; - return 1; - } else if (var0 == 2620) { - var4 = var3.method1806(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2873 * 1386938305 * -1999040447 : 0; - return 1; - } else if (var0 == 2621) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1753() : 0; - return 1; - } else if (var0 == 2622) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1754() : 0; - return 1; - } else if (var0 == 2623) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1755() : 0; - return 1; - } else if (var0 == 2624) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1745() ? 1 : 0; - return 1; - } else if (var0 != 2625) { - if (var0 == 2626) { - var7 = var3.method1805(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1744().method2074() : ""; - return 1; - } else if (var0 == 2627) { - var7 = var3.method1805(); - int var5 = var7 != null ? var7.method1749() : 0; - int var6 = var7 != null ? var7.method1748() : 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.min(var5, var6); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.max(var5, var6); - return 1; - } else if (var0 == 2628) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1748() : 0; - return 1; - } else if (var0 == 2629) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1757() : 0; - return 1; - } else if (var0 == 2630) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1756() : 0; - return 1; - } else if (var0 == 2631) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1758() : 0; - return 1; - } else if (var0 == 2632) { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1759() : 0; - return 1; - } else { - class27 var8; - if (var0 == 2633) { - var8 = var3.method1807(); - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method104(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; - return 1; - } else if (var0 == 2634) { - var8 = var3.method1807(); - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method105((char)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; - return 1; - } else { - return 2; - } - } - } else { - var7 = var3.method1805(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1746() ? 1 : 0; - return 1; - } + boolean var11 = true; + if (var5.contentType > 0) { + var11 = Bounds.method2290(var5); } - } - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "(Ldx;II)V", - garbageValue = "-1729917411" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - int var2; - int var3; - int var4; - SequenceDefinition var11; - if (var0.spotAnimation >= Client.cycle) { - var2 = Math.max(1, var0.spotAnimation - Client.cycle); - var3 = var0.field976 * 64 + var0.field1013 * 128; - var4 = var0.field976 * 64 + var0.field1007 * 128; - var0.x += (var3 - var0.x) / var2; - var0.y += (var4 - var0.y) / var2; - var0.field1020 = 0; - var0.orientation = var0.exactMoveDirection; - } else if (var0.exactMoveArrive1Cycle >= Client.cycle) { - class197.method981(var0); - } else { - var0.movementSequence = var0.idleSequence; - if (var0.pathLength == 0) { - var0.field1020 = 0; - } else { - label454: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var11 = class135.SequenceDefinition_get(var0.sequence); - if (var0.field1018 > 0 && var11.precedenceAnimating == 0) { - ++var0.field1020; - break label454; - } - if (var0.field1018 <= 0 && var11.priority == 0) { - ++var0.field1020; - break label454; - } + if (var11) { + int var8 = NewShit.getWidgetFlags(var5); + int var9 = var0 - 1; + boolean var7 = (var8 >> var9 + 1 & 1) != 0; + if (var7) { + PacketBufferNode var10; + if (var0 == 1) { + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON1, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - var2 = var0.x; - var3 = var0.y; - var4 = var0.field976 * 64 + var0.pathX[var0.pathLength - 1] * 128; - int var5 = var0.field976 * 64 + var0.pathY[var0.pathLength - 1] * 128; - if (var2 < var4) { - if (var3 < var5) { - var0.orientation = 1280; - } else if (var3 > var5) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var2 > var4) { - if (var3 < var5) { - var0.orientation = 768; - } else if (var3 > var5) { - var0.orientation = 256; - } else { - var0.orientation = 512; - } - } else if (var3 < var5) { - var0.orientation = 1024; - } else if (var3 > var5) { - var0.orientation = 0; + if (var0 == 2) { + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON2, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - MoveSpeed var6 = var0.pathTraversed[var0.pathLength - 1]; - if (var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { - int var7 = var0.orientation - var0.rotation & 2047; - if (var7 > 1024) { - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; - if (var7 >= -256 && var7 <= 256) { - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; - int var9 = 4; - boolean var10 = true; - if (var0 instanceof NPC) { - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { - if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1005 != 0) { - var9 = 2; - } - - if (var0.pathLength > 2) { - var9 = 6; - } - - if (var0.pathLength > 3) { - var9 = 8; - } - - if (var0.field1020 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1020; - } - } else { - if (var0.pathLength > 1) { - var9 = 6; - } - - if (var0.pathLength > 2) { - var9 = 8; - } - - if (var0.field1020 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1020; - } - } - - if (var6 == MoveSpeed.RUN) { - var9 <<= 1; - } else if (var6 == MoveSpeed.CRAWL) { - var9 >>= 1; - } - - if (var9 >= 8) { - if (var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } else if (var0.walkBackSequence == var0.movementSequence && var0.runBackSequence != -1) { - var0.movementSequence = var0.runBackSequence; - } else if (var0.movementSequence == var0.walkLeftSequence && var0.runLeftSequence != -1) { - var0.movementSequence = var0.runLeftSequence; - } else if (var0.walkRightSequence == var0.movementSequence && var0.runRightSequence != -1) { - var0.movementSequence = var0.runRightSequence; - } - } else if (var9 <= 2) { - if (var0.movementSequence == var0.walkSequence && var0.crawlSequence != -1) { - var0.movementSequence = var0.crawlSequence; - } else if (var0.movementSequence == var0.walkBackSequence && var0.crawlBackSequence != -1) { - var0.movementSequence = var0.crawlBackSequence; - } else if (var0.walkLeftSequence == var0.movementSequence && var0.crawlLeftSequence != -1) { - var0.movementSequence = var0.crawlLeftSequence; - } else if (var0.walkRightSequence == var0.movementSequence && var0.crawlRightSequence != -1) { - var0.movementSequence = var0.crawlRightSequence; - } - } - - if (var4 != var2 || var3 != var5) { - if (var2 < var4) { - var0.x += var9; - if (var0.x > var4) { - var0.x = var4; - } - } else if (var2 > var4) { - var0.x -= var9; - if (var0.x < var4) { - var0.x = var4; - } - } - - if (var3 < var5) { - var0.y += var9; - if (var0.y > var5) { - var0.y = var5; - } - } else if (var3 > var5) { - var0.y -= var9; - if (var0.y < var5) { - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { - --var0.pathLength; - if (var0.field1018 > 0) { - --var0.field1018; - } - } - } else { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if (var0.field1018 > 0) { - --var0.field1018; - } + if (var0 == 3) { + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON3, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - } - } - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = 0; - var0.exactMoveArrive1Cycle = 0; - var0.method524(); - var0.x = var0.pathX[0] * 128 + var0.field976 * 64; - var0.y = var0.field976 * 64 + var0.pathY[0] * 128; - var0.method517(); - } - - if (class136.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = 0; - var0.exactMoveArrive1Cycle = 0; - var0.method524(); - var0.x = var0.field976 * 64 + var0.pathX[0] * 128; - var0.y = var0.pathY[0] * 128 + var0.field976 * 64; - var0.method517(); - } - class389.method1986(var0); - var0.isWalking = false; - if (var0.movementSequence != -1) { - var11 = class135.SequenceDefinition_get(var0.movementSequence); - if (var11 != null) { - if (!var11.isCachedModelIdSet() && var11.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var11.frameIds.length && var0.movementFrameCycle > var11.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - FadeOutTask.method2096(var11, var0.movementFrame, var0.x, var0.y); + if (var0 == 4) { + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON4, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - if (var0.movementFrame >= var11.frameIds.length) { - if (var11.frameCount > 0) { - var0.movementFrame -= var11.frameCount; - if (var11.field1819) { - ++var0.field991; - } - - if (var0.movementFrame < 0 || var0.movementFrame >= var11.frameIds.length || var11.field1819 && var0.field991 >= var11.iterations) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - var0.field991 = 0; - } - } else { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - } - - FadeOutTask.method2096(var11, var0.movementFrame, var0.x, var0.y); + if (var0 == 5) { + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON5, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - } else if (var11.isCachedModelIdSet()) { - ++var0.movementFrame; - var3 = var11.method1067(); - if (var0.movementFrame < var3) { - class7.method19(var11, var0.movementFrame, var0.x, var0.y); - } else { - if (var11.frameCount > 0) { - var0.movementFrame -= var11.frameCount; - if (var11.field1819) { - ++var0.field991; - } - - if (var0.movementFrame < 0 || var0.movementFrame >= var3 || var11.field1819 && var0.field991 >= var11.iterations) { - var0.movementFrame = 0; - var0.movementFrameCycle = 0; - var0.field991 = 0; - } - } else { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - } - class7.method19(var11, var0.movementFrame, var0.x, var0.y); + if (var0 == 6) { + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON6, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - } else { - var0.movementSequence = -1; - } - } else { - var0.movementSequence = -1; - } - } - - IterableNodeHashTableIterator var15 = new IterableNodeHashTableIterator(var0.method523()); - for (SpotAnimation var12 = (SpotAnimation)var15.method2423(); var12 != null; var12 = (SpotAnimation)var15.next()) { - if (var12.field4238 != -1 && Client.cycle >= var12.field4235) { - var4 = NPCComposition.SpotAnimationDefinition_get(var12.field4238).sequence; - if (var4 == -1) { - var12.remove(); - --var0.field1017; - } else { - var12.field4239 = Math.max(var12.field4239, 0); - SequenceDefinition var13 = class135.SequenceDefinition_get(var4); - if (var13.frameIds != null && !var13.isCachedModelIdSet()) { - ++var12.field4236; - if (var12.field4239 < var13.frameIds.length && var12.field4236 > var13.frameLengths[var12.field4239]) { - var12.field4236 = 1; - ++var12.field4239; - FadeOutTask.method2096(var13, var12.field4239, var0.x, var0.y); - } - - if (var12.field4239 >= var13.frameIds.length) { - var12.remove(); - --var0.field1017; - } - } else if (var13.isCachedModelIdSet()) { - ++var12.field4239; - int var14 = var13.method1067(); - if (var12.field4239 < var14) { - class7.method19(var13, var12.field4239, var0.x, var0.y); - } else { - var12.remove(); - --var0.field1017; - } - } else { - var12.remove(); - --var0.field1017; + if (var0 == 7) { + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON7, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - } - } - } - - SequenceDefinition var16; - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var16 = class135.SequenceDefinition_get(var0.sequence); - if (var16.precedenceAnimating == 1 && var0.field1018 > 0 && var0.spotAnimation <= Client.cycle && var0.exactMoveArrive1Cycle < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var16 = class135.SequenceDefinition_get(var0.sequence); - if (var16 == null) { - var0.sequence = -1; - } else if (!var16.isCachedModelIdSet() && var16.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var16.frameIds.length && var0.sequenceFrameCycle > var16.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - FadeOutTask.method2096(var16, var0.sequenceFrame, var0.x, var0.y); - } - if (var0.sequenceFrame >= var16.frameIds.length) { - var0.sequenceFrame -= var16.frameCount; - ++var0.currentSequenceFrameIndex; - if (var0.currentSequenceFrameIndex >= var16.iterations) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var16.frameIds.length) { - FadeOutTask.method2096(var16, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; + if (var0 == 8) { + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON8, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - } - var0.isWalking = var16.stretches; - } else if (var16.isCachedModelIdSet()) { - ++var0.sequenceFrame; - var4 = var16.method1067(); - if (var0.sequenceFrame < var4) { - class7.method19(var16, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequenceFrame -= var16.frameCount; - ++var0.currentSequenceFrameIndex; - if (var0.currentSequenceFrameIndex >= var16.iterations) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var4) { - class7.method19(var16, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; + if (var0 == 9) { + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON9, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - } - } else { - var0.sequence = -1; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - - } - - @ObfuscatedName("ls") - @ObfuscatedSignature( - descriptor = "([Lmt;IIIIIIIII)V", - garbageValue = "1798184407" - ) - @Export("drawInterface") - static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.method1176(); - for (int var9 = 0; var9 < var0.length; ++var9) { - Widget var10 = var0[var9]; - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { - int var11; - if (var8 == -1) { - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; - var11 = ++Client.rootWidgetCount - 1; - } else { - var11 = var8; - } - - var10.rootIndex = var11; - var10.cycle = Client.cycle; - if (!var10.isIf3 || !WorldMapDecorationType.isComponentHidden(var10)) { - if (var10.contentType > 0) { - VarbitComposition.method996(var10); + if (var0 == 10) { + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON10, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - int var12 = var10.x + var6; - int var13 = var7 + var10.y; - int var14 = var10.transparencyTop; - int var15; - int var16; - if (var10 == Client.clickedWidget) { - if (var1 != -1412584499 && !var10.isScrollBar) { - WorldMapDecoration.field2419 = var0; - class300.field2731 = var6; - WorldMapIcon_0.field2371 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field391) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field500) { - var15 = Client.field500; - } - - if (var15 + var10.width > Client.field500 + Client.clickedWidgetParent.width) { - var15 = Client.field500 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field504) { - var16 = Client.field504; - } - - if (var16 + var10.height > Client.field504 + Client.clickedWidgetParent.height) { - var16 = Client.field504 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 9) { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if (var21 < var12) { - var19 = var21; - var21 = var12; - } - - if (var22 < var13) { - var20 = var22; - var22 = var13; - } - - ++var21; - ++var22; - var15 = var19 > var2 ? var19 : var2; - var16 = var20 > var3 ? var20 : var3; - var17 = var21 < var4 ? var21 : var4; - var18 = var22 < var5 ? var22 : var5; - } else { - var19 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var19 < var4 ? var19 : var4; - var18 = var20 < var5 ? var20 : var5; - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { - if (var10.contentType != 0) { - if (var10.contentType == 1336) { - if (class150.clientPreferences.method557()) { - var13 += 15; - class113.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); - var13 += 15; - Runtime var41 = Runtime.getRuntime(); - var20 = (int)((var41.totalMemory() - var41.freeMemory()) / 1024L); - var21 = 16776960; - if (var20 > 327680 && !Client.isLowDetail) { - var21 = 16711680; - } - - class113.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - class27.drawEntities(var12, var13, var10.width, var10.height); - Client.field403[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - WorldMapManager.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - DevicePcmPlayerProvider.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - class127.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - class127.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - class165.field1419.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && WorldMapDecorationType.isComponentHidden(var10) && var10 != WorldMapScaleHandler.mousedOverWidgetIf1) { - continue; - } - - if (!var10.isIf3) { - if (var10.scrollY > var10.scrollHeight - var10.height) { - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); - if (var28 != null) { - class7.drawWidgets(var28.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.method1176(); - } else if (var10.type == 11) { - if (WorldMapDecorationType.isComponentHidden(var10) && var10 != WorldMapScaleHandler.mousedOverWidgetIf1) { - continue; - } - - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.method1176(); - } - - if (Client.isResizable || Client.field405[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - class153.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { - if (var10.type == 3) { - if (GrandExchangeOfferOwnWorldComparator.runCs1(var10)) { - var19 = var10.color2; - if (var10 == WorldMapScaleHandler.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; - if (var10 == WorldMapScaleHandler.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.field4187) { - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); - break; - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); - break; - default: - if (var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } - } else if (var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } else if (var10.type == 4) { - Font var40 = var10.getFont(); - if (var40 == null) { - if (Widget.field2926) { - class200.invalidateWidget(var10); - } - } else { - String var42 = var10.text; - if (GrandExchangeOfferOwnWorldComparator.runCs1(var10)) { - var20 = var10.color2; - if (var10 == WorldMapScaleHandler.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var42 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == WorldMapScaleHandler.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemComposition var43 = class125.ItemDefinition_get(var10.itemId); - var42 = var43.name; - if (var42 == null) { - var42 = "null"; - } - - if ((var43.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var42 = MusicPatchPcmStream.colorStartTag(16748608) + var42 + "" + " " + 'x' + class191.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var42 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var42 = WorldMapRectangle.method1498(var42, var10); - } - - var40.method2054(var42, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, class467.method2323(var10.transparencyTop), var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); - } - } else { - int var23; - int var24; - int var25; - if (var10.type == 5) { - SpritePixels var38; - if (!var10.isIf3) { - var38 = var10.getSprite(GrandExchangeOfferOwnWorldComparator.runCs1(var10), WorldMapLabel.urlRequester); - if (var38 != null) { - var38.drawTransBgAt(var12, var13); - } else if (Widget.field2926) { - class200.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var38 = FaceNormal.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var38 = var10.getSprite(false, WorldMapLabel.urlRequester); - } - - if (var38 == null) { - if (Widget.field2926) { - class200.invalidateWidget(var10); - } - } else { - var20 = var38.width; - var21 = var38.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var38.method2668(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { - var38.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { - var38.drawTransBgAt(var12, var13); - } else { - var38.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); - var22 = (var20 - 1 + var10.width) / var20; - var23 = (var21 - 1 + var10.height) / var21; - - for (var24 = 0; var24 < var22; ++var24) { - for (var25 = 0; var25 < var23; ++var25) { - if (var10.spriteAngle != 0) { - var38.method2668(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var38.drawTransAt(var12 + var20 * var24, var13 + var25 * var21, 256 - (var14 & 255)); - } else { - var38.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - int var26; - if (var10.type == 6) { - boolean var36 = GrandExchangeOfferOwnWorldComparator.runCs1(var10); - if (var36) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var39 = null; - var22 = 0; - if (var10.itemId != -1) { - ItemComposition var44 = class125.ItemDefinition_get(var10.itemId); - if (var44 != null) { - var44 = var44.getCountObj(var10.itemQuantity); - var39 = var44.getModel(1); - if (var39 != null) { - var39.calculateBoundsCylinder(); - var22 = var39.height / 2; - } else { - class200.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var39 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var39 = class136.localPlayer.getModel(); - } - } else if (var10.modelType == 7) { - var39 = var10.field3081.getModel((SequenceDefinition)null, -1, class135.SequenceDefinition_get(class136.localPlayer.idleSequence), class136.localPlayer.movementFrame); - } else { - NPCComposition var45 = null; - NewShit var33 = null; - if (var10.modelType == 6) { - var25 = var10.modelId; - if (var25 >= 0 && var25 < Client.npcs.length) { - NPC var34 = Client.npcs[var25]; - if (var34 != null) { - var45 = var34.definition; - var33 = var34.method597(); - } - } - } - - SequenceDefinition var35 = null; - var26 = -1; - if (var20 != -1) { - var35 = class135.SequenceDefinition_get(var20); - var26 = var10.modelFrame; - } - - var39 = var10.getModel(var35, var26, var36, class136.localPlayer.appearance, var45, var33); - if (var39 == null && Widget.field2926) { - class200.invalidateWidget(var10); - } - } - - Rasterizer3D.method1179(var10.width / 2 + var12, var10.height / 2 + var13); - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; - if (var39 != null) { - if (!var10.isIf3) { - var39.method1309(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var39.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var39.method1310(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var39.method1309(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } - } - - Rasterizer3D.method1178(); - } else { - Font var29; - if (var10.type == 8 && var10 == DelayFadeTask.field3700 && Client.field493 == Client.field494) { - var19 = 0; - var20 = 0; - var29 = class113.fontPlain12; - String var30 = var10.text; - - String var31; - for (var30 = WorldMapRectangle.method1498(var30, var10); var30.length() > 0; var20 = var20 + var29.ascent + 1) { - var24 = var30.indexOf("
"); - if (var24 != -1) { - var31 = var30.substring(0, var24); - var30 = var30.substring(var24 + 4); - } else { - var31 = var30; - var30 = ""; - } - - var25 = var29.stringWidth(var31); - if (var25 > var19) { - var19 = var25; - } - } - - var19 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var19; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; - } - - if (var24 + var19 > var4) { - var24 = var4 - var19; - } - - if (var20 + var25 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); - var30 = var10.text; - var26 = var25 + var29.ascent + 2; - - for (var30 = WorldMapRectangle.method1498(var30, var10); var30.length() > 0; var26 = var26 + var29.ascent + 1) { - int var27 = var30.indexOf("
"); - if (var27 != -1) { - var31 = var30.substring(0, var27); - var30 = var30.substring(var27 + 4); - } else { - var31 = var30; - var30 = ""; - } - - var29.draw(var31, var24 + 3, var26, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field2943) { - var19 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; - } else { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - } - - if (var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); - } else { - KeyHandler.method99(var19, var20, var21, var22, var10.color, var10.lineWid); - } - } else if (var10.type == 12) { - class330 var37 = var10.method1805(); - class325 var32 = var10.method1806(); - if (var37 != null && var32 != null && var37.method1750()) { - var29 = var10.getFont(); - if (var29 != null) { - Client.field646.method2675(var12, var13, var10.width, var10.height, var37.method1751(), var37.method1752(), var37.method1748(), var37.method1749(), var37.method1747()); - var22 = var10.textShadowed ? var10.spriteShadow * -1608681345 * 1342850943 : -1; - if (!var37.method1745() && var37.method1742().method1997()) { - Client.field646.method2676(var32.field2873, var22, var32.field2874, var32.field2875); - Client.field646.method2677(var37.method1743(), var29); - } else { - Client.field646.method2676(var10.color, var22, var32.field2874, var32.field2875); - Client.field646.method2677(var37.method1742(), var29); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } - } - } - } - } - } } } } - } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class475.java b/osrs/src/main/java/class475.java new file mode 100644 index 000000000..d9a8bd375 --- /dev/null +++ b/osrs/src/main/java/class475.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("sv") +public interface class475 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(S)Lsm;", + garbageValue = "256" + ) + @Export("get") + PlatformInfo get(); +} \ No newline at end of file diff --git a/osrs/src/main/java/class476.java b/osrs/src/main/java/class476.java index 6c46a2e6f..a9a37a639 100644 --- a/osrs/src/main/java/class476.java +++ b/osrs/src/main/java/class476.java @@ -1,12 +1,89 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("so") -public interface class476 { - @ObfuscatedName("aw") +@ObfuscatedName("se") +public class class476 extends class479 { + @ObfuscatedName("au") + int field3961; + @ObfuscatedName("ae") + int field3960; + @ObfuscatedName("ao") + double field3957; + @ObfuscatedName("at") + double field3958; + @ObfuscatedName("ac") + double field3955; + @ObfuscatedName("ai") + double field3956; + @ObfuscatedName("az") + double field3959; + + public class476(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + super(var9, var10); + this.field3961 = 0; + this.field3960 = 0; + this.field3957 = 0.0D; + this.field3958 = 0.0D; + this.field3955 = 0.0D; + this.field3956 = 0.0D; + this.field3959 = 0.0D; + this.field3961 = var3; + this.field3960 = var6; + if ((var5 - var8) * (var7 - var1) == (var4 - var7) * (var8 - var2)) { + this.field3957 = (double)var4; + this.field3958 = (double)var5; + } else { + double var11 = (double)((float)(var7 + var1)) / 2.0D; + double var13 = (double)((float)(var8 + var2)) / 2.0D; + double var15 = (double)((float)(var4 + var7)) / 2.0D; + double var17 = (double)((float)(var5 + var8)) / 2.0D; + double var19 = -1.0D * (double)(var7 - var1) / (double)(var8 - var2); + double var21 = (double)(var4 - var7) * -1.0D / (double)(var5 - var8); + this.field3957 = (var19 * var11 - var21 * var15 + var17 - var13) / (var19 - var21); + this.field3958 = var13 + var19 * (this.field3957 - var11); + this.field3955 = Math.sqrt(Math.pow(this.field3957 - (double)var1, 2.0D) + Math.pow(this.field3958 - (double)var2, 2.0D)); + this.field3956 = Math.atan2((double)var2 - this.field3958, (double)var1 - this.field3957); + double var23 = Math.atan2((double)var8 - this.field3958, (double)var7 - this.field3957); + this.field3959 = Math.atan2((double)var5 - this.field3958, (double)var4 - this.field3957); + boolean var25 = this.field3956 <= var23 && var23 <= this.field3959 || this.field3959 <= var23 && var23 <= this.field3956; + if (!var25) { + this.field3959 += (double)(this.field3956 - this.field3959 > 0.0D ? 2 : -2) * 3.141592653589793D; + } + + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "818000115" + ) + public int vmethod2349() { + double var1 = this.method2377(); + double var3 = this.field3956 + (this.field3959 - this.field3956) * var1; + return (int)Math.round(this.field3957 + this.field3955 * Math.cos(var3)); + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "363084355" + ) + public int vmethod2347() { + double var1 = this.method2377(); + double var3 = this.field3956 + var1 * (this.field3959 - this.field3956); + return (int)Math.round(this.field3958 + this.field3955 * Math.sin(var3)); + } + + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Lsy;", - garbageValue = "1568411855" + descriptor = "(I)I", + garbageValue = "-1706544959" ) - PlatformInfo get(); -} + @Export("vmethod2320") + public int vmethod2320() { + double var1 = this.method2377(); + return (int)Math.round((double)this.field3961 + var1 * (double)(this.field3960 - this.field3961)); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class477.java b/osrs/src/main/java/class477.java index 2d5b2aec7..029c77eb0 100644 --- a/osrs/src/main/java/class477.java +++ b/osrs/src/main/java/class477.java @@ -1,104 +1,102 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sc") -public class class477 extends class480 { - @ObfuscatedName("aw") - int field3948; - @ObfuscatedName("ay") - int field3949; - @ObfuscatedName("ar") - double field3946; - @ObfuscatedName("am") - double field3945; - @ObfuscatedName("as") - double field3947; - @ObfuscatedName("aj") - double field3944; - @ObfuscatedName("ag") - double field3943; +@ObfuscatedName("sk") +public class class477 extends class479 { + @ObfuscatedName("au") + int field3967; + @ObfuscatedName("ae") + int field3963; + @ObfuscatedName("ao") + int field3965; + @ObfuscatedName("at") + int field3966; + @ObfuscatedName("ac") + int field3962; + @ObfuscatedName("ai") + int field3964; - public class477(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - super(var9, var10); - this.field3948 = 0; - this.field3949 = 0; - this.field3946 = 0.0D; - this.field3945 = 0.0D; - this.field3947 = 0.0D; - this.field3944 = 0.0D; - this.field3943 = 0.0D; - this.field3948 = var3; - this.field3949 = var6; - if ((var5 - var8) * (var7 - var1) == (var4 - var7) * (var8 - var2)) { - this.field3946 = (double)var4; - this.field3945 = (double)var5; - } else { - double var11 = (double)((float)(var7 + var1)) / 2.0D; - double var13 = (double)((float)(var8 + var2)) / 2.0D; - double var15 = (double)((float)(var4 + var7)) / 2.0D; - double var17 = (double)((float)(var5 + var8)) / 2.0D; - double var19 = (double)(var7 - var1) * -1.0D / (double)(var8 - var2); - double var21 = (double)(var4 - var7) * -1.0D / (double)(var5 - var8); - this.field3946 = (var11 * var19 - var15 * var21 + var17 - var13) / (var19 - var21); - this.field3945 = var13 + (this.field3946 - var11) * var19; - this.field3947 = Math.sqrt(Math.pow(this.field3946 - (double)var1, 2.0D) + Math.pow(this.field3945 - (double)var2, 2.0D)); - this.field3944 = Math.atan2((double)var2 - this.field3945, (double)var1 - this.field3946); - double var23 = Math.atan2((double)var8 - this.field3945, (double)var7 - this.field3946); - this.field3943 = Math.atan2((double)var5 - this.field3945, (double)var4 - this.field3946); - boolean var25 = this.field3944 <= var23 && var23 <= this.field3943 || this.field3943 <= var23 && var23 <= this.field3944; - if (!var25) { - this.field3943 += 3.141592653589793D * (double)(this.field3944 - this.field3943 > 0.0D ? 2 : -2); - } - - } + public class477(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + super(var7, var8); + this.field3967 = 0; + this.field3963 = 0; + this.field3965 = 0; + this.field3966 = 0; + this.field3962 = 0; + this.field3964 = 0; + this.field3967 = var1; + this.field3963 = var2; + this.field3965 = var3; + this.field3966 = var4; + this.field3962 = var5; + this.field3964 = var6; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "2587" + descriptor = "(I)I", + garbageValue = "818000115" ) public int vmethod2349() { - double var1 = this.method2352(); - double var3 = this.field3944 + (this.field3943 - this.field3944) * var1; - return (int)Math.round(this.field3946 + this.field3947 * Math.cos(var3)); + double var1 = this.method2377(); + return (int)Math.round((double)(this.field3966 - this.field3967) * var1 + (double)this.field3967); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1657628972" + garbageValue = "363084355" ) public int vmethod2347() { - double var1 = this.method2352(); - double var3 = (this.field3943 - this.field3944) * var1 + this.field3944; - return (int)Math.round(this.field3945 + this.field3947 * Math.sin(var3)); + double var1 = this.method2377(); + return (int)Math.round(var1 * (double)(this.field3962 - this.field3963) + (double)this.field3963); } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "10605" + descriptor = "(I)I", + garbageValue = "-1706544959" ) - @Export("vmethod2320") public int vmethod2320() { - double var1 = this.method2352(); - return (int)Math.round((double)this.field3948 + var1 * (double)(this.field3949 - this.field3948)); + double var1 = this.method2377(); + return (int)Math.round((double)this.field3965 + (double)(this.field3964 - this.field3965) * var1); } - @ObfuscatedName("oe") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)Ltx;", - garbageValue = "522363485" + descriptor = "([I[IIII)V", + garbageValue = "-1387907364" ) - static class507 method2342(int var0) { - class507 var1 = (class507)Client.Widget_cachedModels.get((long)var0); - if (var1 == null) { - var1 = new class507(class176.field1459, ViewportMouse.method1319(var0), Message.method337(var0)); - Client.Widget_cachedModels.put(var1, (long)var0); + public static void method2370(int[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + int var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + int var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + int var8 = var6 == Integer.MAX_VALUE ? 0 : 1; + + for (int var9 = var2; var9 < var3; ++var9) { + if (var0[var9] < (var9 & var8) + var6) { + int var10 = var0[var9]; + var0[var9] = var0[var5]; + var0[var5] = var10; + int var11 = var1[var9]; + var1[var9] = var1[var5]; + var1[var5++] = var11; + } + } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + method2370(var0, var1, var2, var5 - 1); + method2370(var0, var1, var5 + 1, var3); } - return var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class478.java b/osrs/src/main/java/class478.java index 5af4a15eb..ddf84d5ba 100644 --- a/osrs/src/main/java/class478.java +++ b/osrs/src/main/java/class478.java @@ -1,64 +1,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sd") +@ObfuscatedName("sy") public class class478 extends class480 { - @ObfuscatedName("aw") - int field3954; - @ObfuscatedName("ay") - int field3955; - @ObfuscatedName("ar") - int field3952; - @ObfuscatedName("am") - int field3951; - @ObfuscatedName("as") - int field3953; - @ObfuscatedName("aj") - int field3950; - - public class478(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - super(var7, var8); - this.field3954 = 0; - this.field3955 = 0; - this.field3952 = 0; - this.field3951 = 0; - this.field3953 = 0; - this.field3950 = 0; - this.field3954 = var1; - this.field3955 = var2; - this.field3952 = var3; - this.field3951 = var4; - this.field3953 = var5; - this.field3950 = var6; - } + @ObfuscatedName("au") + int field3969; + @ObfuscatedName("ae") + int field3968; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "2587" - ) - public int vmethod2349() { - double var1 = this.method2352(); - return (int)Math.round((double)this.field3954 + (double)(this.field3951 - this.field3954) * var1); + public class478(int var1, int var2, int var3, int var4) { + super(var3, var4); + this.field3969 = 0; + this.field3968 = 0; + this.field3969 = var1; + this.field3968 = var2; } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1657628972" + garbageValue = "-1901048798" ) - public int vmethod2347() { - double var1 = this.method2352(); - return (int)Math.round(var1 * (double)(this.field3953 - this.field3955) + (double)this.field3955); + public int method2371() { + double var1 = this.method2377(); + return (int)Math.round((double)this.field3969 + var1 * (double)(this.field3968 - this.field3969)); } - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "10605" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-2077618476" ) - public int vmethod2320() { - double var1 = this.method2352(); - return (int)Math.round(var1 * (double)(this.field3950 - this.field3952) + (double)this.field3952); + static void method2372(String var0) { + Login.field764 = HorizontalAlignment.method977(var0); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class479.java b/osrs/src/main/java/class479.java index 1b678263c..f6b82f187 100644 --- a/osrs/src/main/java/class479.java +++ b/osrs/src/main/java/class479.java @@ -1,28 +1,34 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ss") -public class class479 extends class481 { - @ObfuscatedName("aw") - int field3956; - @ObfuscatedName("ay") - int field3957; - - public class479(int var1, int var2, int var3, int var4) { - super(var3, var4); - this.field3956 = 0; - this.field3957 = 0; - this.field3956 = var1; - this.field3957 = var2; +@ObfuscatedName("sn") +public abstract class class479 extends class480 { + class479(int var1, int var2) { + super(var1, var2); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-84" + descriptor = "(I)I", + garbageValue = "818000115" ) - public int method2346() { - double var1 = this.method2352(); - return (int)Math.round(var1 * (double)(this.field3957 - this.field3956) + (double)this.field3956); - } -} + @Export("vmethod2349") + public abstract int vmethod2349(); + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "363084355" + ) + @Export("vmethod2347") + public abstract int vmethod2347(); + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1706544959" + ) + @Export("vmethod2320") + public abstract int vmethod2320(); +} \ No newline at end of file diff --git a/osrs/src/main/java/class480.java b/osrs/src/main/java/class480.java index 3d3cc7bab..2e48135e3 100644 --- a/osrs/src/main/java/class480.java +++ b/osrs/src/main/java/class480.java @@ -1,30 +1,51 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sl") -public abstract class class480 extends class481 { +@ObfuscatedName("sc") +public abstract class class480 { + @ObfuscatedName("gv") + @Export("worldPort") + static int worldPort; + @ObfuscatedName("ap") + int field3974; + @ObfuscatedName("aa") + int field3972; + @ObfuscatedName("af") + double field3971; + @ObfuscatedName("ad") + int field3973; + class480(int var1, int var2) { - super(var1, var2); + this.field3974 = 0; + this.field3972 = 0; + this.field3971 = 0.0D; + this.field3973 = 0; + this.field3974 = var1; + this.field3972 = 0; + this.field3973 = var2 >= 0 && var2 <= 27 ? var2 : 0; + this.field3971 = class302.method1623(this.field3972, this.field3974, this.field3973); } - @ObfuscatedName("aw") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "2587" + descriptor = "(I)V", + garbageValue = "-299202193" ) - public abstract int vmethod2349(); + public void method2376() { + if (this.field3972 < this.field3974) { + ++this.field3972; + this.field3971 = class302.method1623(this.field3972, this.field3974, this.field3973); + } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1657628972" - ) - public abstract int vmethod2347(); + } - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "10605" + descriptor = "(I)D", + garbageValue = "1467440127" ) - public abstract int vmethod2320(); -} + double method2377() { + return this.field3971; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class481.java b/osrs/src/main/java/class481.java deleted file mode 100644 index d0f5877dd..000000000 --- a/osrs/src/main/java/class481.java +++ /dev/null @@ -1,56 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("sk") -public abstract class class481 { - @ObfuscatedName("az") - int field3961; - @ObfuscatedName("av") - int field3960; - @ObfuscatedName("ap") - double field3958; - @ObfuscatedName("aq") - int field3959; - - class481(int var1, int var2) { - this.field3961 = 0; - this.field3960 = 0; - this.field3958 = 0.0D; - this.field3959 = 0; - this.field3961 = var1; - this.field3960 = 0; - this.field3959 = var2 >= 0 && var2 <= 27 ? var2 : 0; - this.field3958 = class339.method1823(this.field3960, this.field3961, this.field3959); - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1393993433" - ) - public void method2351() { - if (this.field3960 < this.field3961) { - ++this.field3960; - this.field3958 = class339.method1823(this.field3960, this.field3961, this.field3959); - } - - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)D", - garbageValue = "-116783534" - ) - double method2352() { - return this.field3958; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SB)V", - garbageValue = "7" - ) - public static void method2350(String[] var0, short[] var1) { - class215.sortItemsByName(var0, var1, 0, var0.length - 1); - } -} diff --git a/osrs/src/main/java/class485.java b/osrs/src/main/java/class485.java new file mode 100644 index 000000000..ed0f1f722 --- /dev/null +++ b/osrs/src/main/java/class485.java @@ -0,0 +1,70 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ss") +public class class485 { + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("SequenceDefinition_skeletonsArchive") + static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("au") + public final Object field4049; + @ObfuscatedName("ae") + public final Object field4048; + + public class485(Object var1, Object var2) { + this.field4049 = var1; + this.field4048 = var2; + } + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + return this.field4049 + ", " + this.field4048; + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (var1 != null && var1 instanceof class485) { + class485 var2 = (class485)var1; + if (this.field4049 == null) { + if (var2.field4049 != null) { + return false; + } + } else if (!this.field4049.equals(var2.field4049)) { + return false; + } + + if (this.field4048 == null) { + if (var2.field4048 != null) { + return false; + } + } else if (!this.field4048.equals(var2.field4048)) { + return false; + } + + return true; + } else { + return false; + } + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + int var1 = 0; + if (this.field4049 != null) { + var1 += this.field4049.hashCode(); + } + + if (this.field4048 != null) { + var1 += 31 * this.field4048.hashCode(); + } + + return var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class486.java b/osrs/src/main/java/class486.java deleted file mode 100644 index 1e6bd8f73..000000000 --- a/osrs/src/main/java/class486.java +++ /dev/null @@ -1,63 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("sf") -public class class486 { - @ObfuscatedName("aw") - public final Object field4036; - @ObfuscatedName("ay") - public final Object field4037; - - public class486(Object var1, Object var2) { - this.field4036 = var1; - this.field4037 = var2; - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - return this.field4036 + ", " + this.field4037; - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (var1 != null && var1 instanceof class486) { - class486 var2 = (class486)var1; - if (this.field4036 == null) { - if (var2.field4036 != null) { - return false; - } - } else if (!this.field4036.equals(var2.field4036)) { - return false; - } - - if (this.field4037 == null) { - if (var2.field4037 != null) { - return false; - } - } else if (!this.field4037.equals(var2.field4037)) { - return false; - } - - return true; - } else { - return false; - } - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - int var1 = 0; - if (this.field4036 != null) { - var1 += this.field4036.hashCode(); - } - - if (this.field4037 != null) { - var1 += 31 * this.field4037.hashCode(); - } - - return var1; - } -} diff --git a/osrs/src/main/java/class489.java b/osrs/src/main/java/class489.java new file mode 100644 index 000000000..00cdf1d82 --- /dev/null +++ b/osrs/src/main/java/class489.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("su") +public interface class489 extends Iterable { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IS)I", + garbageValue = "31516" + ) + int vmethod8144(int var1); + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;I)V", + garbageValue = "1797615972" + ) + void vmethod8143(int var1, Object var2); +} \ No newline at end of file diff --git a/osrs/src/main/java/class490.java b/osrs/src/main/java/class490.java index abbf7bcf8..cbce77685 100644 --- a/osrs/src/main/java/class490.java +++ b/osrs/src/main/java/class490.java @@ -1,19 +1,70 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("se") -public interface class490 extends Iterable { - @ObfuscatedName("aw") +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +@ObfuscatedName("sx") +public class class490 implements class489 { + @ObfuscatedName("au") + Map field4064; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Luu;" + ) + final class522 field4065; + + @ObfuscatedSignature( + descriptor = "(Luu;)V" + ) + public class490(class522 var1) { + this.field4065 = var1; + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2127277043" + descriptor = "(IS)I", + garbageValue = "31516" ) - int vmethod8144(int var1); + @Export("vmethod8144") + public int vmethod8144(int var1) { + if (this.field4064 != null) { + class523 var2 = (class523)this.field4064.get(var1); + if (var2 != null) { + return (Integer)var2.field4215; + } + } + + return (Integer)this.field4065.vmethod8697(var1); + } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "-1811511637" + garbageValue = "1797615972" ) - void vmethod8143(int var1, Object var2); -} + @Export("vmethod8143") + public void vmethod8143(int var1, Object var2) { + if (this.field4064 == null) { + this.field4064 = new HashMap(); + this.field4064.put(var1, new class523(var1, var2)); + } else { + class523 var3 = (class523)this.field4064.get(var1); + if (var3 == null) { + this.field4064.put(var1, new class523(var1, var2)); + } else { + var3.field4215 = var2; + } + } + + } + + @Export("iterator") + @ObfuscatedName("iterator") + public Iterator iterator() { + return this.field4064 == null ? Collections.emptyList().iterator() : this.field4064.values().iterator(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class491.java b/osrs/src/main/java/class491.java deleted file mode 100644 index 81dc02cc7..000000000 --- a/osrs/src/main/java/class491.java +++ /dev/null @@ -1,69 +0,0 @@ -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("sj") -public class class491 implements class490 { - @ObfuscatedName("aw") - Map field4052; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lul;" - ) - final class521 field4053; - - @ObfuscatedSignature( - descriptor = "(Lul;)V" - ) - public class491(class521 var1) { - this.field4053 = var1; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2127277043" - ) - @Export("vmethod8144") - public int vmethod8144(int var1) { - if (this.field4052 != null) { - class522 var2 = (class522)this.field4052.get(var1); - if (var2 != null) { - return (Integer)var2.field4169; - } - } - - return (Integer)this.field4053.vmethod8697(var1); - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "-1811511637" - ) - @Export("vmethod8143") - public void vmethod8143(int var1, Object var2) { - if (this.field4052 == null) { - this.field4052 = new HashMap(); - this.field4052.put(var1, new class522(var1, var2)); - } else { - class522 var3 = (class522)this.field4052.get(var1); - if (var3 == null) { - this.field4052.put(var1, new class522(var1, var2)); - } else { - var3.field4169 = var2; - } - } - - } - - @Export("iterator") - @ObfuscatedName("iterator") - public Iterator iterator() { - return this.field4052 == null ? Collections.emptyList().iterator() : this.field4052.values().iterator(); - } -} diff --git a/osrs/src/main/java/class492.java b/osrs/src/main/java/class492.java deleted file mode 100644 index 6d68d80f9..000000000 --- a/osrs/src/main/java/class492.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("sn") -public class class492 { - @ObfuscatedName("am") - @Export("SpriteBuffer_xOffsets") - public static int[] SpriteBuffer_xOffsets; - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "645086624" - ) - static int method2438(int var0, int var1, int var2) { - return var0 << 28 | var1 << 14 | var2; - } -} diff --git a/osrs/src/main/java/class493.java b/osrs/src/main/java/class493.java new file mode 100644 index 000000000..23ef9bff5 --- /dev/null +++ b/osrs/src/main/java/class493.java @@ -0,0 +1,94 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.io.*; + +@ObfuscatedName("sg") +public class class493 { + @ObfuscatedName("ao") + static final char[] field4077; + @ObfuscatedName("at") + static final char[] field4078; + + static { + field4077 = new char[]{' ', '\u00a0', '_', '-', '\u00e0', '\u00e1', '\u00e2', '\u00e4', '\u00e3', '\u00c0', '\u00c1', '\u00c2', '\u00c4', '\u00c3', '\u00e8', '\u00e9', '\u00ea', '\u00eb', '\u00c8', '\u00c9', '\u00ca', '\u00cb', '\u00ed', '\u00ee', '\u00ef', '\u00cd', '\u00ce', '\u00cf', '\u00f2', '\u00f3', '\u00f4', '\u00f6', '\u00f5', '\u00d2', '\u00d3', '\u00d4', '\u00d6', '\u00d5', '\u00f9', '\u00fa', '\u00fb', '\u00fc', '\u00d9', '\u00da', '\u00db', '\u00dc', '\u00e7', '\u00c7', '\u00ff', '\u0178', '\u00f1', '\u00d1', '\u00df'}; + field4078 = new char[]{'[', ']', '#'}; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", + garbageValue = "1089015752" + ) + static String method2465(Throwable var0) throws IOException { + String var1; + if (var0 instanceof RunException) { + RunException var2 = (RunException)var0; + var1 = var2.field4291 + " | "; + var0 = var2.parent; + } else { + var1 = ""; + } + + StringWriter var12 = new StringWriter(); + PrintWriter var3 = new PrintWriter(var12); + var0.printStackTrace(var3); + var3.close(); + String var4 = var12.toString(); + BufferedReader var5 = new BufferedReader(new StringReader(var4)); + String var6 = var5.readLine(); + + while (true) { + while (true) { + String var7 = var5.readLine(); + if (var7 == null) { + var1 = var1 + "| " + var6; + return var1; + } + + int var8 = var7.indexOf(40); + int var9 = var7.indexOf(41, var8 + 1); + if (var8 >= 0 && var9 >= 0) { + String var10 = var7.substring(var8 + 1, var9); + int var11 = var10.indexOf(".java:"); + if (var11 >= 0) { + var10 = var10.substring(0, var11) + var10.substring(var11 + 5); + var1 = var1 + var10 + ' '; + continue; + } + + var7 = var7.substring(0, var8); + } + + var7 = var7.trim(); + var7 = var7.substring(var7.lastIndexOf(32) + 1); + var7 = var7.substring(var7.lastIndexOf(9) + 1); + var1 = var1 + var7 + ' '; + } + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(B)Luk;", + garbageValue = "-94" + ) + public static IndexedSprite method2466() { + IndexedSprite var0 = new IndexedSprite(); + var0.width = class529.SpriteBuffer_spriteWidth; + var0.height = class420.SpriteBuffer_spriteHeight; + var0.xOffset = class529.SpriteBuffer_xOffsets[0]; + var0.yOffset = class152.SpriteBuffer_yOffsets[0]; + var0.subWidth = HealthBarUpdate.SpriteBuffer_spriteWidths[0]; + var0.subHeight = SpriteMask.SpriteBuffer_spriteHeights[0]; + var0.palette = DbTableType.SpriteBuffer_spritePalette; + var0.pixels = Coord.SpriteBuffer_pixels[0]; + class529.SpriteBuffer_xOffsets = null; + class152.SpriteBuffer_yOffsets = null; + HealthBarUpdate.SpriteBuffer_spriteWidths = null; + SpriteMask.SpriteBuffer_spriteHeights = null; + DbTableType.SpriteBuffer_spritePalette = null; + Coord.SpriteBuffer_pixels = null; + return var0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class494.java b/osrs/src/main/java/class494.java deleted file mode 100644 index a14c78d19..000000000 --- a/osrs/src/main/java/class494.java +++ /dev/null @@ -1,33 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ta") -public class class494 { - @ObfuscatedName("ar") - static final char[] field4067; - @ObfuscatedName("am") - static final char[] field4066; - - static { - field4067 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Ã', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Ã', 'ÃŽ', 'Ã', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ã’', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ãœ', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4066 = new char[]{'[', ']', '#'}; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Lnd;IB)Luu;", - garbageValue = "31" - ) - public static IndexedSprite method2440(AbstractArchive var0, int var1) { - byte[] var3 = var0.takeFileFlat(var1); - boolean var2; - if (var3 == null) { - var2 = false; - } else { - VarbitComposition.SpriteBuffer_decode(var3); - var2 = true; - } - - return !var2 ? null : Script.method451(); - } -} diff --git a/osrs/src/main/java/class496.java b/osrs/src/main/java/class496.java new file mode 100644 index 000000000..a228949db --- /dev/null +++ b/osrs/src/main/java/class496.java @@ -0,0 +1,45 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("tn") +class class496 implements Iterator { + @ObfuscatedName("au") + int field4093; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lth;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final class497 this$0; + + @ObfuscatedSignature( + descriptor = "(Lth;)V" + ) + class496(class497 var1) { + this.this$0 = var1; + } + + @Export("hasNext") + @ObfuscatedName("hasNext") + public boolean hasNext() { + return this.field4093 < this.this$0.method2322(); + } + + @Export("next") + @ObfuscatedName("next") + public Object next() { + int var1 = ++this.field4093 - 1; + class456 var2 = (class456)this.this$0.field4095.get((long)var1); + return var2 != null ? var2 : this.this$0.method2482(var1); + } + + @Export("remove") + @ObfuscatedName("remove") + public void remove() { + throw new UnsupportedOperationException(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class497.java b/osrs/src/main/java/class497.java index 6619aaf81..f53092acb 100644 --- a/osrs/src/main/java/class497.java +++ b/osrs/src/main/java/class497.java @@ -1,89 +1,81 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tt") -class class497 implements Iterator { - @ObfuscatedName("el") +import java.util.Iterator; + +@ObfuscatedName("th") +public class class497 extends class455 implements class283 { + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lde;" + descriptor = "Lnu;" ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("aw") - int field4083; - // $FF: synthetic field + final AbstractArchive field4096; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Lkg;" ) - @Export("this$0") - @ObfuscatedName("this$0") - final class498 this$0; + final DemotingHashTable field4095; + @ObfuscatedName("at") + final int field4094; @ObfuscatedSignature( - descriptor = "(Ltp;)V" + descriptor = "(Lns;ILon;Lnu;)V" ) - class497(class498 var1) { - this.this$0 = var1; - } - - @Export("hasNext") - @ObfuscatedName("hasNext") - public boolean hasNext() { - return this.field4083 < this.this$0.method2298(); + public class497(StudioGame var1, int var2, Language var3, AbstractArchive var4) { + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); + this.field4095 = new DemotingHashTable(64); + this.field4096 = var4; + this.field4094 = var2; } - @Export("next") - @ObfuscatedName("next") - public Object next() { - int var1 = ++this.field4083 - 1; - class457 var2 = (class457)this.this$0.field4085.get((long)var1); - return var2 != null ? var2 : this.this$0.method2457(var1); - } + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IB)Lrv;", + garbageValue = "-32" + ) + @Export("vmethod8207") + protected class457 vmethod8207(int var1) { + synchronized(this.field4095) { + class456 var2 = (class456)this.field4095.get((long)var1); + if (var2 == null) { + var2 = this.method2482(var1); + this.field4095.method1593(var2, (long)var1); + } - @Export("remove") - @ObfuscatedName("remove") - public void remove() { - throw new UnsupportedOperationException(); + return var2; + } } - @ObfuscatedName("aw") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "2111297623" + descriptor = "(IB)Lrg;", + garbageValue = "-117" ) - public static String method2455(CharSequence var0) { - int var1 = var0.length(); - StringBuilder var2 = new StringBuilder(var1); + class456 method2482(int var1) { + byte[] var2 = this.field4096.takeFile(this.field4094, var1); + class456 var3 = new class456(var1); + if (var2 != null) { + var3.method2327(new Buffer(var2)); + } - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { - if (var4 == ' ') { - var2.append('+'); - } else { - byte var5 = class313.charToByteCp1252(var4); - var2.append('%'); - int var6 = var5 >> 4 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } + return var3; + } - var6 = var5 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); - } + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "322447059" + ) + public void method2483() { + synchronized(this.field4095) { + this.field4095.clear(); } + } - return var2.toString(); + @Export("iterator") + @ObfuscatedName("iterator") + public Iterator iterator() { + return new class496(this); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class498.java b/osrs/src/main/java/class498.java index b77ae9c58..a6ed9d1bf 100644 --- a/osrs/src/main/java/class498.java +++ b/osrs/src/main/java/class498.java @@ -1,80 +1,21 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tp") -public class class498 extends class456 implements class284 { - @ObfuscatedName("ay") +@ObfuscatedName("tj") +public interface class498 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "(Ljava/lang/Object;Ltm;I)V", + garbageValue = "465506048" ) - final AbstractArchive field4086; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - final DemotingHashTable field4085; - @ObfuscatedName("am") - final int field4084; - - @ObfuscatedSignature( - descriptor = "(Lnu;ILot;Lnd;)V" - ) - public class498(StudioGame var1, int var2, Language var3, AbstractArchive var4) { - super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); - this.field4085 = new DemotingHashTable(64); - this.field4086 = var4; - this.field4084 = var2; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Lrc;", - garbageValue = "-1481639468" - ) - @Export("vmethod8207") - protected class458 vmethod8207(int var1) { - synchronized(this.field4085) { - class457 var2 = (class457)this.field4085.get((long)var1); - if (var2 == null) { - var2 = this.method2457(var1); - this.field4085.method1553(var2, (long)var1); - } - - return var2; - } - } + void vmethod8274(Object var1, Buffer var2); - @ObfuscatedName("ah") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IB)Lrl;", - garbageValue = "-53" + descriptor = "(Ltm;I)Ljava/lang/Object;", + garbageValue = "-295239457" ) - class457 method2457(int var1) { - byte[] var2 = this.field4086.takeFile(this.field4084, var1); - class457 var3 = new class457(var1); - if (var2 != null) { - var3.method2304(new Buffer(var2)); - } - - return var3; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "356849458" - ) - public void method2458() { - synchronized(this.field4085) { - this.field4085.clear(); - } - } - - @Export("iterator") - @ObfuscatedName("iterator") - public Iterator iterator() { - return new class497(this); - } -} + @Export("vmethod8273") + Object vmethod8273(Buffer var1); +} \ No newline at end of file diff --git a/osrs/src/main/java/class499.java b/osrs/src/main/java/class499.java index a56514fa2..cc3222894 100644 --- a/osrs/src/main/java/class499.java +++ b/osrs/src/main/java/class499.java @@ -2,21 +2,97 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("td") -public interface class499 { - @ObfuscatedName("aw") +@ObfuscatedName("tl") +final class class499 implements class498 { + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lty;I)V", - garbageValue = "-791895690" + descriptor = "Lnk;" + ) + @Export("archive9") + static Archive archive9; + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Ltm;I)V", + garbageValue = "465506048" ) @Export("vmethod8274") - void vmethod8274(Object var1, Buffer var2); + public void vmethod8274(Object var1, Buffer var2) { + this.method2486((Integer)var1, var2); + } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lty;I)Ljava/lang/Object;", - garbageValue = "1270618633" + descriptor = "(Ltm;I)Ljava/lang/Object;", + garbageValue = "-295239457" ) @Export("vmethod8273") - Object vmethod8273(Buffer var1); -} + public Object vmethod8273(Buffer var1) { + return var1.readInt(); + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Integer;Ltm;S)V", + garbageValue = "128" + ) + void method2486(Integer var1, Buffer var2) { + var2.writeInt(var1); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "1972049883" + ) + static int method2489(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 != 1927 && var0 != 2927) { + int var4; + if (var0 == 1928) { + var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var4 >= 1 && var4 <= 10) { + class102 var5 = new class102(var4, var3.id, var3.childIndex, var3.itemId); + Interpreter.field715.add(var5); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == 2928) { + SoundCache.Interpreter_intStackSize -= 3; + int var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + int var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + if (var8 >= 1 && var8 <= 10) { + class102 var6 = new class102(var8, var7, var4, class92.getWidget(var7).itemId); + Interpreter.field715.add(var6); + return 1; + } else { + throw new RuntimeException(); + } + } else { + return 2; + } + } else if (Interpreter.field708 >= 10) { + throw new RuntimeException(); + } else { + if (var0 >= 2000) { + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + } else { + var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + } + + if (var3.onResize == null) { + return 0; + } else { + ScriptEvent var9 = new ScriptEvent(); + var9.widget = var3; + var9.args = var3.onResize; + var9.field864 = Interpreter.field708 + 1; + Client.scriptEvents.addFirst(var9); + return 1; + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class5.java b/osrs/src/main/java/class5.java index a7598be2b..f75a95457 100644 --- a/osrs/src/main/java/class5.java +++ b/osrs/src/main/java/class5.java @@ -1,43 +1,44 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aj") +@ObfuscatedName("ai") public class class5 implements class2 { - @ObfuscatedName("aw") - final MessageDigest field5; + @ObfuscatedName("au") + final MessageDigest field4; @ObfuscatedSignature( - descriptor = "(Lav;)V" + descriptor = "(Laa;)V" ) class5(class8 var1) { - this.field5 = this.method10(); + this.field4 = this.method10(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") boolean method6(int var1, String var2, long var3) { byte[] var5 = this.method9(var2, var3); return method7(var5) >= var1; } - @ObfuscatedName("am") + @ObfuscatedName("at") byte[] method9(String var1, long var2) { StringBuilder var4 = new StringBuilder(); var4.append(var1).append(Long.toHexString(var2)); - this.field5.reset(); + this.field4.reset(); try { - this.field5.update(var4.toString().getBytes("UTF-8")); + this.field4.update(var4.toString().getBytes("UTF-8")); } catch (UnsupportedEncodingException var6) { var6.printStackTrace(); } - return this.field5.digest(); + return this.field4.digest(); } - @ObfuscatedName("as") + @ObfuscatedName("ac") MessageDigest method10() { try { return MessageDigest.getInstance("SHA-256"); @@ -47,7 +48,7 @@ MessageDigest method10() { } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") static int method7(byte[] var0) { int var1 = 0; byte[] var2 = var0; @@ -64,7 +65,7 @@ static int method7(byte[] var0) { return var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") static int method8(byte var0) { int var1 = 0; if (var0 == 0) { @@ -77,4 +78,4 @@ static int method8(byte var0) { return var1; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class500.java b/osrs/src/main/java/class500.java index a3649b6d0..1bf5ca0aa 100644 --- a/osrs/src/main/java/class500.java +++ b/osrs/src/main/java/class500.java @@ -1,35 +1,24 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("te") -final class class500 implements class499 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lty;I)V", - garbageValue = "-791895690" - ) - @Export("vmethod8274") - public void vmethod8274(Object var1, Buffer var2) { - this.method2461((Integer)var1, var2); - } +@ObfuscatedName("tq") +public class class500 { + @ObfuscatedName("ae") + static final int[] field4098; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Lty;I)Ljava/lang/Object;", - garbageValue = "1270618633" - ) - @Export("vmethod8273") - public Object vmethod8273(Buffer var1) { - return var1.readInt(); + static { + field4098 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } - @ObfuscatedName("av") + @ObfuscatedName("jy") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lty;I)V", - garbageValue = "-603205344" + descriptor = "(B)V", + garbageValue = "108" ) - void method2461(Integer var1, Buffer var2) { - var2.writeInt(var1); + static void method2490() { + for (class211 var0 = (class211)Client.field628.last(); var0 != null; var0 = (class211)Client.field628.previous()) { + var0.remove(); + } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class501.java b/osrs/src/main/java/class501.java index ece144132..346c330f6 100644 --- a/osrs/src/main/java/class501.java +++ b/osrs/src/main/java/class501.java @@ -2,22 +2,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tv") -public class class501 { - @ObfuscatedName("ay") - static final int[] field4087; +@ObfuscatedName("tg") +final class class501 implements class498 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Ltm;I)V", + garbageValue = "465506048" + ) + @Export("vmethod8274") + public void vmethod8274(Object var1, Buffer var2) { + this.method2491((Long)var1, var2); + } - static { - field4087 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Ltm;I)Ljava/lang/Object;", + garbageValue = "-295239457" + ) + @Export("vmethod8273") + public Object vmethod8273(Buffer var1) { + return var1.readLong(); } - @ObfuscatedName("bt") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "2140596796" + descriptor = "(Ljava/lang/Long;Ltm;B)V", + garbageValue = "-19" ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; + void method2491(Long var1, Buffer var2) { + var2.writeLong(var1); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class502.java b/osrs/src/main/java/class502.java index 9c45c9720..f1f96a793 100644 --- a/osrs/src/main/java/class502.java +++ b/osrs/src/main/java/class502.java @@ -2,38 +2,100 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ti") -final class class502 implements class499 { +@ObfuscatedName("tb") +public class class502 implements class371 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Ltb;" + ) + public static final class502 field4101; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Ltb;" + ) + public static final class502 field4099; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ltb;" + ) + public static final class502 field4100; + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "[Lui;" + ) + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; + @ObfuscatedName("at") + public final int field4104; + @ObfuscatedName("ac") + public final int field4103; + @ObfuscatedName("ai") + public final Class field4105; @ObfuscatedName("az") - @Export("ItemDefinition_inMembersWorld") - static boolean ItemDefinition_inMembersWorld; + @ObfuscatedSignature( + descriptor = "Ltj;" + ) + public final class498 field4106; + + static { + field4101 = new class502(1, 0, Integer.class, new class499()); + field4099 = new class502(0, 1, Long.class, new class501()); + field4100 = new class502(2, 2, String.class, new class503()); + } + + @ObfuscatedSignature( + descriptor = "(IILjava/lang/Class;Ltj;)V" + ) + class502(int var1, int var2, Class var3, class498 var4) { + this.field4104 = var1; + this.field4103 = var2; + this.field4105 = var3; + this.field4106 = var4; + } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lty;I)V", - garbageValue = "-791895690" + descriptor = "(B)I", + garbageValue = "41" ) - @Export("vmethod8274") - public void vmethod8274(Object var1, Buffer var2) { - this.method2465((Long)var1, var2); + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4103; } - @ObfuscatedName("ay") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lty;I)Ljava/lang/Object;", - garbageValue = "1270618633" + descriptor = "(Ltm;S)Ljava/lang/Object;", + garbageValue = "5018" ) - @Export("vmethod8273") - public Object vmethod8273(Buffer var1) { - return var1.readLong(); + public Object method2497(Buffer var1) { + return this.field4106.vmethod8273(var1); } - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lty;I)V", - garbageValue = "-338210683" + descriptor = "(B)[Ltb;", + garbageValue = "44" ) - void method2465(Long var1, Buffer var2) { - var2.writeLong(var1); + public static class502[] method2494() { + return new class502[]{field4101, field4100, field4099}; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;B)Ltb;", + garbageValue = "82" + ) + public static class502 method2495(Class var0) { + class502[] var1 = method2494(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + class502 var3 = var1[var2]; + if (var3.field4105 == var0) { + return var3; + } + } + + return null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class503.java b/osrs/src/main/java/class503.java index 4d7ca6360..110f6f3b9 100644 --- a/osrs/src/main/java/class503.java +++ b/osrs/src/main/java/class503.java @@ -2,162 +2,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tm") -public class class503 implements class372 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Ltm;" - ) - public static final class503 field4090; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Ltm;" - ) - public static final class503 field4091; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Ltm;" - ) - public static final class503 field4089; - @ObfuscatedName("am") - public final int field4093; - @ObfuscatedName("as") - public final int field4094; - @ObfuscatedName("aj") - public final Class field4095; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Ltd;" - ) - final class499 field4092; - - static { - field4090 = new class503(0, 0, Integer.class, new class500()); - field4091 = new class503(1, 1, Long.class, new class502()); - field4089 = new class503(2, 2, String.class, new class504()); - } - - @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Ltd;)V" - ) - class503(int var1, int var2, Class var3, class499 var4) { - this.field4093 = var1; - this.field4094 = var2; - this.field4095 = var3; - this.field4092 = var4; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4094; - } +@ObfuscatedName("tz") +final class class503 implements class498 { + @ObfuscatedName("cy") + static int field4107; - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;B)Ljava/lang/Object;", - garbageValue = "-37" + descriptor = "(Ljava/lang/Object;Ltm;I)V", + garbageValue = "465506048" ) - public Object method2474(Buffer var1) { - return this.field4092.vmethod8273(var1); + @Export("vmethod8274") + public void vmethod8274(Object var1, Buffer var2) { + this.method2498((String)var1, var2); } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)[Ltm;", - garbageValue = "-101" + descriptor = "(Ltm;I)Ljava/lang/Object;", + garbageValue = "-295239457" ) - public static class503[] method2469() { - return new class503[]{field4091, field4090, field4089}; + @Export("vmethod8273") + public Object vmethod8273(Buffer var1) { + return var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Llw;Luy;B)Llv;", - garbageValue = "52" + descriptor = "(Ljava/lang/String;Ltm;I)V", + garbageValue = "-1097671055" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = class130.method708(); - var2.clientPacket = var0; - var2.clientPacketLength = var0.length; - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); - } - - var2.packetBuffer.setIsaacCipher(var1); - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); - var2.index = 0; - return var2; + void method2498(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Class;I)Ltm;", - garbageValue = "-1095130595" - ) - public static class503 method2470(Class var0) { - class503[] var1 = method2469(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - class503 var3 = var1[var2]; - if (var3.field4095 == var0) { - return var3; - } - } - - return null; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lty;I)V", - garbageValue = "472817950" - ) - public static void method2472(Object var0, Buffer var1) { - Class var3 = var0.getClass(); - class503 var4 = method2470(var3); - if (var4 == null) { - throw new IllegalArgumentException(); - } else { - class499 var2 = var4.field4092; - var2.vmethod8274(var0, var1); - } - } - - @ObfuscatedName("as") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1510166958" - ) - public static void method2471() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); - } - - @ObfuscatedName("my") - @ObfuscatedSignature( - descriptor = "(Lmt;B)Lmt;", - garbageValue = "-69" + garbageValue = "2008641376" ) - static Widget method2475(Widget var0) { - Widget var1 = WorldMapEvent.method1547(var0); - if (var1 == null) { - var1 = var0.parent; - } - - return var1; + static final void method2501() { + UserComparator8.method673("You can't add yourself to your own ignore list"); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class504.java b/osrs/src/main/java/class504.java index ebc360e0e..a589fabc3 100644 --- a/osrs/src/main/java/class504.java +++ b/osrs/src/main/java/class504.java @@ -1,56 +1,20 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tw") -final class class504 implements class499 { - @ObfuscatedName("aw") +@ObfuscatedName("ti") +public final class class504 { + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lty;I)V", - garbageValue = "-791895690" + descriptor = "(IZII)V", + garbageValue = "-1433824975" ) - @Export("vmethod8274") - public void vmethod8274(Object var1, Buffer var2) { - this.method2476((String)var1, var2); - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Lty;I)Ljava/lang/Object;", - garbageValue = "1270618633" - ) - @Export("vmethod8273") - public Object vmethod8273(Buffer var1) { - return var1.readStringCp1252NullTerminated(); - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lty;I)V", - garbageValue = "-967451643" - ) - void method2476(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); - } - - @ObfuscatedName("nk") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "593676284" - ) - static final void method2479(int var0, int var1) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method851()) { - ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - if (var2.rank == -1) { - PacketBufferNode var3 = class503.getPacketBufferNode(ClientPacket.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(3 + class501.stringCp1252NullTerminatedByteSize(var2.username.getName())); - var3.packetBuffer.writeByte(var0); - var3.packetBuffer.writeShort(var1); - var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); - Client.packetWriter.addNode(var3); - } - } + public static final void method2502(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { + PcmPlayer.field181 = var0; + PcmPlayer.PcmPlayer_stereo = var1; + PcmPlayer.field182 = var2; + } else { + throw new IllegalArgumentException(); } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class505.java b/osrs/src/main/java/class505.java deleted file mode 100644 index 857269df7..000000000 --- a/osrs/src/main/java/class505.java +++ /dev/null @@ -1,9 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("tg") -public final class class505 { - @ObfuscatedName("ai") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; -} diff --git a/osrs/src/main/java/class506.java b/osrs/src/main/java/class506.java new file mode 100644 index 000000000..1caa990da --- /dev/null +++ b/osrs/src/main/java/class506.java @@ -0,0 +1,81 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@ObfuscatedName("tx") +public class class506 extends DualNode { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "[Ltb;" + ) + class502[] field4114; + @ObfuscatedName("ac") + List field4113; + + @ObfuscatedSignature( + descriptor = "(Lnu;I)V" + ) + public class506(AbstractArchive var1, int var2) { + byte[] var3 = var1.takeFile(var2, 0); + this.method2506(new Buffer(var3)); + } + + @ObfuscatedSignature( + descriptor = "(Lnu;II)V" + ) + public class506(AbstractArchive var1, int var2, int var3) { + byte[] var4 = var1.takeFile(var2, var3 + 1); + this.method2506(new Buffer(var4)); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ltm;I)V", + garbageValue = "1051210616" + ) + void method2506(Buffer var1) { + int var2 = var1.method2565(); + this.field4114 = new class502[var2]; + this.field4113 = new ArrayList(var2); + + for (int var3 = 0; var3 < var2; ++var3) { + this.field4114[var3] = (class502)KeyHandler.findEnumerated(class502.method2494(), var1.readUnsignedByte()); + int var4 = var1.method2565(); + HashMap var5 = new HashMap(var4); + + while (var4-- > 0) { + Object var6 = this.field4114[var3].method2497(var1); + int var7 = var1.method2565(); + ArrayList var8 = new ArrayList(); + + while (var7-- > 0) { + int var9 = var1.method2565(); + var8.add(var9); + } + + var5.put(var6, var8); + } + + this.field4113.add(var3, var5); + } + + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;IB)Ljava/util/List;", + garbageValue = "113" + ) + public List method2507(Object var1, int var2) { + if (var2 < 0) { + var2 = 0; + } + + Map var3 = (Map)this.field4113.get(var2); + return (List)var3.get(var1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class507.java b/osrs/src/main/java/class507.java deleted file mode 100644 index 8a68bde9f..000000000 --- a/osrs/src/main/java/class507.java +++ /dev/null @@ -1,80 +0,0 @@ -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("tx") -public class class507 extends DualNode { - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "[Ltm;" - ) - class503[] field4103; - @ObfuscatedName("as") - List field4102; - - @ObfuscatedSignature( - descriptor = "(Lnd;I)V" - ) - public class507(AbstractArchive var1, int var2) { - byte[] var3 = var1.takeFile(var2, 0); - this.method2484(new Buffer(var3)); - } - - @ObfuscatedSignature( - descriptor = "(Lnd;II)V" - ) - public class507(AbstractArchive var1, int var2, int var3) { - byte[] var4 = var1.takeFile(var2, var3 + 1); - this.method2484(new Buffer(var4)); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lty;I)V", - garbageValue = "702803819" - ) - void method2484(Buffer var1) { - int var2 = var1.method2545(); - this.field4103 = new class503[var2]; - this.field4102 = new ArrayList(var2); - - for (int var3 = 0; var3 < var2; ++var3) { - this.field4103[var3] = (class503)ClientPreferences.findEnumerated(class503.method2469(), var1.readUnsignedByte()); - int var4 = var1.method2545(); - HashMap var5 = new HashMap(var4); - - while (var4-- > 0) { - Object var6 = this.field4103[var3].method2474(var1); - int var7 = var1.method2545(); - ArrayList var8 = new ArrayList(); - - while (var7-- > 0) { - int var9 = var1.method2545(); - var8.add(var9); - } - - var5.put(var6, var8); - } - - this.field4102.add(var3, var5); - } - - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;IB)Ljava/util/List;", - garbageValue = "-17" - ) - public List method2485(Object var1, int var2) { - if (var2 < 0) { - var2 = 0; - } - - Map var3 = (Map)this.field4102.get(var2); - return (List)var3.get(var1); - } -} diff --git a/osrs/src/main/java/class508.java b/osrs/src/main/java/class508.java new file mode 100644 index 000000000..f285b456f --- /dev/null +++ b/osrs/src/main/java/class508.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("tr") +public class class508 { + @ObfuscatedName("ao") + static final int field4120; + @ObfuscatedName("at") + static final int field4121; + + static { + field4120 = (int)(Math.pow(2.0D, 4.0D) - 1.0D); + field4121 = (int)(Math.pow(2.0D, 8.0D) - 1.0D); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class509.java b/osrs/src/main/java/class509.java deleted file mode 100644 index 339e8d2e2..000000000 --- a/osrs/src/main/java/class509.java +++ /dev/null @@ -1,26 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("tq") -public class class509 { - @ObfuscatedName("ar") - static final int field4110; - @ObfuscatedName("am") - static final int field4109; - - static { - field4110 = (int)(Math.pow(2.0D, 4.0D) - 1.0D); - field4109 = (int)(Math.pow(2.0D, 8.0D) - 1.0D); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(IZB)Ljava/lang/String;", - garbageValue = "113" - ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - return var1 && var0 >= 0 ? class327.method1676(var0, 10, var1) : Integer.toString(var0); - } -} diff --git a/osrs/src/main/java/class51.java b/osrs/src/main/java/class51.java index 019f94d6b..6af387408 100644 --- a/osrs/src/main/java/class51.java +++ b/osrs/src/main/java/class51.java @@ -2,13 +2,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bj") +@ObfuscatedName("bg") public interface class51 { - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lbk;", - garbageValue = "415453075" + descriptor = "(B)Lbb;", + garbageValue = "74" ) @Export("player") PcmPlayer player(); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class510.java b/osrs/src/main/java/class510.java index f39a61ab6..479f078fe 100644 --- a/osrs/src/main/java/class510.java +++ b/osrs/src/main/java/class510.java @@ -2,35 +2,213 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("th") -public class class510 { - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "24" - ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { - NPC var2 = Client.npcs[Client.npcIndices[var1]]; - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { - int var3 = var2.x >> 7; - int var4 = var2.y >> 7; - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { - if (var2.field976 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; - } - - long var5 = BufferedNetSocket.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - UserComparator5.scene.drawEntity(class36.Client_plane, var2.x, var2.y, class306.getTileHeight(var2.field976 * 64 - 64 + var2.x, var2.field976 * 64 - 64 + var2.y, class36.Client_plane), var2.field976 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); - } +@ObfuscatedName("ty") +public enum class510 implements class371 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4129(1), + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4124(2), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4127(4), + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4128(8), + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4135(16), + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4138(32), + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4151(64, true), + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4143(128), + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4122(256, true), + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4136(512), + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4123(1024), + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4144(2048), + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4140(4096), + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4142(8192), + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4145(16384), + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4134(32768), + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4125(65536), + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4141(131072), + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4149(262144), + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4137(524288), + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4146(1048576), + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4150(2097152), + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4139(4194304), + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4147(8388608), + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4148(16777216), + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4126(33554432), + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4153(67108864, true), + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4130(134217728), + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4154(268435456), + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4132(536870912, true), + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4131(1073741824, true), + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lty;" + ) + field4152(Integer.MIN_VALUE); + + @ObfuscatedName("hu") + static String field4133; + @ObfuscatedName("by") + final int field4155; + + class510(int var3) { + this.field4155 = var3; + } + + @ObfuscatedSignature( + descriptor = "(IZ)V", + garbageValue = "1" + ) + class510(int var3, boolean var4) { + this.field4155 = var3; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "41" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4155; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "3331" + ) + public static void method2513() { + try { + JagexCache.JagexCache_dat2File.close(); + + for (int var0 = 0; var0 < JagexCache.field1461; ++var0) { + WallDecoration.JagexCache_idxFiles[var0].close(); } + + JagexCache.JagexCache_idx255File.close(); + JagexCache.JagexCache_randomDat.close(); + } catch (Exception var2) { } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class514.java b/osrs/src/main/java/class514.java deleted file mode 100644 index 23747a503..000000000 --- a/osrs/src/main/java/class514.java +++ /dev/null @@ -1,68 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("tr") -public class class514 { - @ObfuscatedName("aw") - int[] field4118; - @ObfuscatedName("ay") - short[] field4119; - - @ObfuscatedSignature( - descriptor = "(Lhi;)V" - ) - public class514(NPCComposition var1) { - this.field4118 = new int[8]; - this.field4119 = new short[8]; - int var2 = 0; - if (var1.method973()) { - var2 = var1.method974().length; - System.arraycopy(var1.method974(), 0, this.field4118, 0, var2); - System.arraycopy(var1.method976(), 0, this.field4119, 0, var2); - } - - for (int var3 = var2; var3 < 8; ++var3) { - this.field4118[var3] = -1; - this.field4119[var3] = -1; - } - - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(S)[I", - garbageValue = "128" - ) - public int[] method2583() { - return this.field4118; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)[S", - garbageValue = "-145680326" - ) - public short[] method2584() { - return this.field4119; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IISI)V", - garbageValue = "-467719790" - ) - public void method2585(int var1, int var2, short var3) { - this.field4118[var1] = var2; - this.field4119[var1] = var3; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "([I[SB)V", - garbageValue = "-45" - ) - public void method2586(int[] var1, short[] var2) { - this.field4118 = var1; - this.field4119 = var2; - } -} diff --git a/osrs/src/main/java/class515.java b/osrs/src/main/java/class515.java new file mode 100644 index 000000000..9495a7e46 --- /dev/null +++ b/osrs/src/main/java/class515.java @@ -0,0 +1,68 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("tw") +public class class515 { + @ObfuscatedName("au") + int[] field4163; + @ObfuscatedName("ae") + short[] field4164; + + @ObfuscatedSignature( + descriptor = "(Lhw;)V" + ) + public class515(NPCComposition var1) { + this.field4163 = new int[8]; + this.field4164 = new short[8]; + int var2 = 0; + if (var1.method992()) { + var2 = var1.method993().length; + System.arraycopy(var1.method993(), 0, this.field4163, 0, var2); + System.arraycopy(var1.method995(), 0, this.field4164, 0, var2); + } + + for (int var3 = var2; var3 < 8; ++var3) { + this.field4163[var3] = -1; + this.field4164[var3] = -1; + } + + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)[I", + garbageValue = "-122" + ) + public int[] method2602() { + return this.field4163; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)[S", + garbageValue = "80" + ) + public short[] method2603() { + return this.field4164; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IISI)V", + garbageValue = "-1005641077" + ) + public void method2604(int var1, int var2, short var3) { + this.field4163[var1] = var2; + this.field4164[var1] = var3; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "([I[SB)V", + garbageValue = "1" + ) + public void method2605(int[] var1, short[] var2) { + this.field4163 = var1; + this.field4164 = var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class517.java b/osrs/src/main/java/class517.java deleted file mode 100644 index 9a239681a..000000000 --- a/osrs/src/main/java/class517.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("tl") -public interface class517 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lty;S)V" - ) - void method2595(Buffer var1); -} diff --git a/osrs/src/main/java/class518.java b/osrs/src/main/java/class518.java index f37a64623..20153b3c7 100644 --- a/osrs/src/main/java/class518.java +++ b/osrs/src/main/java/class518.java @@ -1,74 +1,11 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("tf") -public class class518 implements class372 { - @ObfuscatedName("aw") +public interface class518 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "(Ltm;B)V" ) - public static final class518 field4159; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Ltf;" - ) - public static final class518 field4160; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Ltf;" - ) - static final class518 field4163; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Ltf;" - ) - static final class518 field4162; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Ltf;" - ) - static final class518 field4164; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Ltf;" - ) - static final class518 field4161; - @ObfuscatedName("ag") - final int field4165; - @ObfuscatedName("az") - final int field4166; - - static { - field4159 = new class518(4, 0); - field4160 = new class518(0, 2); - field4163 = new class518(2, 5); - field4162 = new class518(5, 6); - field4164 = new class518(3, 7); - field4161 = new class518(1, 8); - } - - class518(int var1, int var2) { - this.field4165 = var1; - this.field4166 = var2; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "748601950" - ) - public boolean method2597() { - return this == field4160; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4166; - } -} + void method2614(Buffer var1); +} \ No newline at end of file diff --git a/osrs/src/main/java/class519.java b/osrs/src/main/java/class519.java new file mode 100644 index 000000000..4bf40d972 --- /dev/null +++ b/osrs/src/main/java/class519.java @@ -0,0 +1,74 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("tv") +public class class519 implements class371 { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Ltv;" + ) + public static final class519 field4205; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Ltv;" + ) + public static final class519 field4204; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ltv;" + ) + static final class519 field4208; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Ltv;" + ) + static final class519 field4209; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Ltv;" + ) + static final class519 field4206; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Ltv;" + ) + static final class519 field4207; + @ObfuscatedName("az") + final int field4211; + @ObfuscatedName("ap") + final int field4210; + + static { + field4205 = new class519(1, 0); + field4204 = new class519(5, 2); + field4208 = new class519(2, 5); + field4209 = new class519(0, 6); + field4206 = new class519(4, 7); + field4207 = new class519(3, 8); + } + + class519(int var1, int var2) { + this.field4211 = var1; + this.field4210 = var2; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-664760154" + ) + public boolean method2616() { + return this == field4204; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "41" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4210; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class521.java b/osrs/src/main/java/class521.java deleted file mode 100644 index 8e1cfea0e..000000000 --- a/osrs/src/main/java/class521.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ul") -public interface class521 { - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-692946397" - ) - @Export("vmethod8697") - Object vmethod8697(int var1); -} diff --git a/osrs/src/main/java/class522.java b/osrs/src/main/java/class522.java index 3ee85668b..352169b3a 100644 --- a/osrs/src/main/java/class522.java +++ b/osrs/src/main/java/class522.java @@ -1,42 +1,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("uh") -public class class522 { - @ObfuscatedName("aw") - public final int field4170; - @ObfuscatedName("ay") - public Object field4169; - - public class522(int var1) { - this.field4170 = var1; - } - - public class522(int var1, Object var2) { - this.field4170 = var1; - this.field4169 = var2; - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - return super.hashCode(); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (!(var1 instanceof class522)) { - return false; - } else { - class522 var2 = (class522)var1; - if (var2.field4169 == null && this.field4169 != null) { - return false; - } else if (this.field4169 == null && var2.field4169 != null) { - return false; - } else { - return var2.field4170 == this.field4170 && var2.field4169.equals(this.field4169); - } - } - } -} +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("uu") +public interface class522 { + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/Object;", + garbageValue = "22" + ) + @Export("vmethod8697") + Object vmethod8697(int var1); +} \ No newline at end of file diff --git a/osrs/src/main/java/class523.java b/osrs/src/main/java/class523.java new file mode 100644 index 000000000..bde25889f --- /dev/null +++ b/osrs/src/main/java/class523.java @@ -0,0 +1,42 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ud") +public class class523 { + @ObfuscatedName("au") + public final int field4216; + @ObfuscatedName("ae") + public Object field4215; + + public class523(int var1) { + this.field4216 = var1; + } + + public class523(int var1, Object var2) { + this.field4216 = var1; + this.field4215 = var2; + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + return super.hashCode(); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (!(var1 instanceof class523)) { + return false; + } else { + class523 var2 = (class523)var1; + if (var2.field4215 == null && this.field4215 != null) { + return false; + } else if (this.field4215 == null && var2.field4215 != null) { + return false; + } else { + return var2.field4216 == this.field4216 && var2.field4215.equals(this.field4215); + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class528.java b/osrs/src/main/java/class528.java deleted file mode 100644 index 7950b6358..000000000 --- a/osrs/src/main/java/class528.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("uv") -public class class528 { - @ObfuscatedName("aw") - @Export("SpriteBuffer_spriteCount") - public static int SpriteBuffer_spriteCount; - @ObfuscatedName("ay") - @Export("SpriteBuffer_spriteWidth") - public static int SpriteBuffer_spriteWidth; - @ObfuscatedName("ar") - @Export("SpriteBuffer_spriteHeight") - public static int SpriteBuffer_spriteHeight; - @ObfuscatedName("ag") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("az") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; -} diff --git a/osrs/src/main/java/class529.java b/osrs/src/main/java/class529.java new file mode 100644 index 000000000..b8d084cc8 --- /dev/null +++ b/osrs/src/main/java/class529.java @@ -0,0 +1,15 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("uf") +public class class529 { + @ObfuscatedName("au") + @Export("SpriteBuffer_spriteCount") + static int SpriteBuffer_spriteCount; + @ObfuscatedName("ae") + @Export("SpriteBuffer_spriteWidth") + static int SpriteBuffer_spriteWidth; + @ObfuscatedName("at") + @Export("SpriteBuffer_xOffsets") + static int[] SpriteBuffer_xOffsets; +} \ No newline at end of file diff --git a/osrs/src/main/java/class53.java b/osrs/src/main/java/class53.java index 7411b2d09..1db51ccff 100644 --- a/osrs/src/main/java/class53.java +++ b/osrs/src/main/java/class53.java @@ -2,17 +2,14 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.ArrayList; +import java.util.Iterator; + @ObfuscatedName("cf") public class class53 extends Node { - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("SpotAnimationDefinition_modelArchive") - public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lbl;" + descriptor = "Lbx;" ) class47 field261; @@ -21,7 +18,7 @@ public class53() { } @ObfuscatedSignature( - descriptor = "(Lcz;)V" + descriptor = "(Lcm;)V" ) class53(VorbisSample var1) { if (var1 != null) { @@ -30,33 +27,33 @@ public class53() { } @ObfuscatedSignature( - descriptor = "(Lbi;)V" + descriptor = "(Lbu;)V" ) public class53(RawSound var1) { this.field261 = new class47((VorbisSample)null, var1); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-1" + garbageValue = "6" ) - public boolean method294() { + public boolean method289() { return this.field261 == null; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)Lbi;", - garbageValue = "7" + descriptor = "(I)Lbu;", + garbageValue = "2082518533" ) - public RawSound method295() { - if (this.field261 != null && this.field261.field230.tryLock()) { + public RawSound method290() { + if (this.field261 != null && this.field261.field231.tryLock()) { RawSound var1; try { - var1 = this.method297(); + var1 = this.method293(); } finally { - this.field261.field230.unlock(); + this.field261.field231.unlock(); } return var1; @@ -65,20 +62,20 @@ public RawSound method295() { } } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)Lbi;", - garbageValue = "49" + descriptor = "(I)Lbu;", + garbageValue = "2121230840" ) - public RawSound method296() { + public RawSound method292() { if (this.field261 != null) { - this.field261.field230.lock(); + this.field261.field231.lock(); RawSound var1; try { - var1 = this.method297(); + var1 = this.method293(); } finally { - this.field261.field230.unlock(); + this.field261.field231.unlock(); } return var1; @@ -87,89 +84,412 @@ public RawSound method296() { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lbi;", - garbageValue = "1214181090" + descriptor = "(I)Lbu;", + garbageValue = "-565305963" ) - RawSound method297() { - if (this.field261.field228 == null) { - this.field261.field228 = this.field261.field229.toRawSound((int[])null); - this.field261.field229 = null; + RawSound method293() { + if (this.field261.field229 == null) { + this.field261.field229 = this.field261.field230.toRawSound((int[])null); + this.field261.field230 = null; } - return this.field261.field228; + return this.field261.field229; } - @ObfuscatedName("ka") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ltc;B)V", - garbageValue = "102" + descriptor = "(Ljava/util/ArrayList;IIIIZI)V", + garbageValue = "-1757242477" ) - static final void method298(PacketBuffer var0) { - var0.importIndex(); - int var1 = var0.readBits(8); - int var2; - if (var1 < Client.npcCount) { - for (var2 = var1; var2 < Client.npcCount; ++var2) { - Client.field558[++Client.field488 - 1] = Client.npcIndices[var2]; + public static void method291(ArrayList var0, int var1, int var2, int var3, int var4, boolean var5) { + if (!var0.isEmpty()) { + class305.field2774.clear(); + class305.field2771.clear(); + class200.method1009(var5); + class270.method1536(var0, var5); + if (!class305.field2774.isEmpty()) { + class270.method1537(var1, var2, var3, var4); + class305.field2771.add(new AddRequestTask((SongTask)null)); + class305.field2771.add(new class408((SongTask)null, class305.field2777, class305.field2775, class305.field2776)); + ArrayList var6 = new ArrayList(); + var6.add(new class403(new FadeInTask((SongTask)null, 0, true, class305.field2768))); + if (!class305.musicSongs.isEmpty()) { + ArrayList var7 = new ArrayList(); + var7.add(new DelayFadeTask(new ConcurrentMidiTask((SongTask)null, var6), class305.field2769)); + ArrayList var9 = new ArrayList(); + Iterator var10 = class305.musicSongs.iterator(); + + while (var10.hasNext()) { + MusicSong var11 = (MusicSong)var10.next(); + var9.add(var11); + } + + var7.add(new DelayFadeTask(new FadeOutTask(new class401((SongTask)null, var9), 0, false, class305.field2766), class305.musicPlayerStatus)); + class305.field2771.add(new ConcurrentMidiTask((SongTask)null, var7)); + } else { + class305.field2771.add(new DelayFadeTask((SongTask)null, class305.field2769)); + class305.field2771.add(new ConcurrentMidiTask((SongTask)null, var6)); + } + } } + } - if (var1 > Client.npcCount) { - throw new RuntimeException(""); - } else { - Client.npcCount = 0; - - for (var2 = 0; var2 < var1; ++var2) { - int var3 = Client.npcIndices[var2]; - NPC var4 = Client.npcs[var3]; - int var5 = var0.readBits(1); - if (var5 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Lto;ILdf;II)V", + garbageValue = "-2132656914" + ) + static final void method294(PacketBuffer var0, int var1, Player var2, int var3) { + byte var4 = MoveSpeed.STATIONARY.speed; + int var5; + if ((var3 & 8) != 0) { + var5 = var0.readUnsignedByte(); + byte[] var6 = new byte[var5]; + Buffer var7 = new Buffer(var6); + var0.method2601(var6, 0, var5); + Players.cachedAppearanceBuffer[var1] = var7; + var2.read(var7); + } + + int var8; + int var9; + int var16; + int var17; + if ((var3 & 65536) != 0) { + var5 = var0.readUnsignedByte(); + + for (var16 = 0; var16 < var5; ++var16) { + var17 = var0.readUnsignedByteAdd(); + var8 = var0.method2587(); + var9 = var0.readInt(); + var2.updateSpotAnimation(var17, var8, var9 >> 16, var9 & 65535); + } + } + + if ((var3 & 64) != 0) { + var2.movingOrientation = var0.method2587(); + if (var2.pathLength == 0) { + var2.orientation = var2.movingOrientation; + var2.method521(); + } + } + + if ((var3 & 16) != 0) { + var2.targetIndex = var0.method2587(); + var2.targetIndex += var0.readUnsignedByteAdd() << 16; + var5 = 16777215; + if (var2.targetIndex == var5) { + var2.targetIndex = -1; + } + } + + int var10; + int var11; + if ((var3 & 4096) != 0) { + var5 = var0.method2587(); + var16 = var5 >> 8; + var17 = var16 >= 13 && var16 <= 20 ? var16 - 12 : 0; + PlayerType var18 = (PlayerType)KeyHandler.findEnumerated(MidiPcmStream.PlayerType_values(), var0.readUnsignedByteAdd()); + boolean var24 = var0.readUnsignedByte() == 1; + var10 = var0.readUnsignedByteNeg(); + var11 = var0.offset; + if (var2.username != null && var2.appearance != null) { + boolean var12 = false; + if (var18.isUser && class299.friendSystem.isIgnored(var2.username)) { + var12 = true; + } + + if (!var12 && Client.field486 == 0 && !var2.isHidden) { + Players.field1121.offset = 0; + var0.method2601(Players.field1121.array, 0, var10); + Players.field1121.offset = 0; + String var13 = AbstractFont.escapeBrackets(World.method385(DirectByteArrayCopier.readString(Players.field1121))); + var2.overheadText = var13.trim(); + var2.field995 = var5 >> 8; + var2.field996 = var5 & 255; + var2.overheadTextCyclesRemaining = 150; + byte[] var14 = null; + int var15; + if (var17 > 0 && var17 <= 8) { + var14 = new byte[var17]; + + for (var15 = 0; var15 < var17; ++var15) { + var14[var15] = var0.readSignedByteSub(); + } + } + + var2.field1028 = class164.method863(var14); + var2.isAutoChatting = var24; + var2.showPublicPlayerChat = var2 != VarbitComposition.localPlayer && var18.isUser && !Client.field602.isEmpty() && var13.toLowerCase().indexOf(Client.field602) == -1; + if (var18.isPrivileged) { + var15 = var24 ? 91 : 1; + } else { + var15 = var24 ? 90 : 2; + } + + if (var18.modIcon != -1) { + MouseHandler.addGameMessage(var15, Tile.addImageTag(var18.modIcon) + var2.username.getName(), var13); + } else { + MouseHandler.addGameMessage(var15, var2.username.getName(), var13); + } + } + } + + var0.offset = var17 + var10 + var11; + } + + int var26; + if ((var3 & 32) != 0) { + var5 = var0.readUnsignedShortLE(); + PlayerType var21 = (PlayerType)KeyHandler.findEnumerated(MidiPcmStream.PlayerType_values(), var0.readUnsignedByteNeg()); + boolean var27 = var0.readUnsignedByteNeg() == 1; + var8 = var0.readUnsignedByte(); + var9 = var0.offset; + if (var2.username != null && var2.appearance != null) { + boolean var25 = false; + if (var21.isUser && class299.friendSystem.isIgnored(var2.username)) { + var25 = true; + } + + if (!var25 && Client.field486 == 0 && !var2.isHidden) { + Players.field1121.offset = 0; + var0.method2601(Players.field1121.array, 0, var8); + Players.field1121.offset = 0; + String var19 = AbstractFont.escapeBrackets(World.method385(DirectByteArrayCopier.readString(Players.field1121))); + var2.overheadText = var19.trim(); + var2.field995 = var5 >> 8; + var2.field996 = var5 & 255; + var2.overheadTextCyclesRemaining = 150; + var2.field1028 = null; + var2.isAutoChatting = var27; + var2.showPublicPlayerChat = var2 != VarbitComposition.localPlayer && var21.isUser && !Client.field602.isEmpty() && var19.toLowerCase().indexOf(Client.field602) == -1; + if (var21.isPrivileged) { + var26 = var27 ? 91 : 1; + } else { + var26 = var27 ? 90 : 2; + } + + if (var21.modIcon != -1) { + MouseHandler.addGameMessage(var26, Tile.addImageTag(var21.modIcon) + var2.username.getName(), var19); + } else { + MouseHandler.addGameMessage(var26, var2.username.getName(), var19); + } + } + } + + var0.offset = var8 + var9; + } + + if ((var3 & 4) != 0) { + var5 = var0.readUnsignedByte(); + if (var5 > 0) { + for (var16 = 0; var16 < var5; ++var16) { + var8 = -1; + var9 = -1; + var10 = -1; + var17 = var0.readUShortSmart(); + if (var17 == 32767) { + var17 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var8 = var0.readUShortSmart(); + var10 = var0.readUShortSmart(); + } else if (var17 != 32766) { + var9 = var0.readUShortSmart(); + } else { + var17 = -1; + } + + var11 = var0.readUShortSmart(); + var2.addHitSplat(var17, var9, var8, var10, Client.cycle, var11); + } + } + + var16 = var0.readUnsignedByte(); + if (var16 > 0) { + for (var17 = 0; var17 < var16; ++var17) { + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + if (var9 != 32767) { + var10 = var0.readUShortSmart(); + var11 = var0.readUnsignedByteAdd(); + var26 = var9 > 0 ? var0.readUnsignedByte() : var11; + var2.addHealthBar(var8, Client.cycle, var9, var10, var11, var26); + } else { + var2.removeHealthBar(var8); + } + } + } + } + + if ((var3 & 512) != 0) { + var2.field1004 = var0.readSignedByteSub(); + var2.field1001 = var0.readByteAdd(); + var2.field1002 = var0.readByte(); + var2.field1014 = var0.readByte(); + var2.spotAnimation = var0.readUnsignedShortLE() + Client.cycle; + var2.exactMoveArrive1Cycle = var0.readUnsignedShortLE() + Client.cycle; + var2.exactMoveDirection = var0.method2587(); + if (var2.hasMovementPending) { + var2.field1004 += var2.tileX; + var2.field1001 += var2.tileY; + var2.field1002 += var2.tileX; + var2.field1014 += var2.tileY; + var2.pathLength = 0; + } else { + var2.field1004 += var2.pathX[0]; + var2.field1001 += var2.pathY[0]; + var2.field1002 += var2.pathX[0]; + var2.field1014 += var2.pathY[0]; + var2.pathLength = 1; + } + + var2.field1022 = 0; + } + + if ((var3 & 2048) != 0) { + MoveSpeed[] var20 = Players.playerMovementSpeeds; + MoveSpeed[] var23 = new MoveSpeed[]{MoveSpeed.STATIONARY, MoveSpeed.CRAWL, MoveSpeed.RUN, MoveSpeed.WALK}; + var20[var1] = (MoveSpeed)KeyHandler.findEnumerated(var23, var0.readByte()); + } + + if ((var3 & 128) != 0) { + var2.overheadText = var0.readStringCp1252NullTerminated(); + if (var2.overheadText.charAt(0) == '~') { + var2.overheadText = var2.overheadText.substring(1); + MouseHandler.addGameMessage(2, var2.username.getName(), var2.overheadText); + } else if (var2 == VarbitComposition.localPlayer) { + MouseHandler.addGameMessage(2, var2.username.getName(), var2.overheadText); + } + + var2.isAutoChatting = false; + var2.field995 = 0; + var2.field996 = 0; + var2.overheadTextCyclesRemaining = 150; + } + + if ((var3 & 16384) != 0) { + var2.recolourStartCycle = Client.cycle + var0.readIntME(); + var2.recolourEndCycle = Client.cycle + var0.readIntME(); + var2.recolourHue = var0.readSignedByteSub(); + var2.recolourSaturation = var0.readByteNeg(); + var2.recolourLuminance = var0.readByteAdd(); + var2.recolourAmount = (byte)var0.readUnsignedByteNeg(); + } + + if ((var3 & 8192) != 0) { + for (var5 = 0; var5 < 3; ++var5) { + var2.actions[var5] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var3 & 1024) != 0) { + var4 = var0.readByte(); + } + + if ((var3 & 2) != 0) { + var5 = var0.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; + } + + var16 = var0.readUnsignedByteAdd(); + LoginType.performPlayerAnimation(var2, var5, var16); + } + + if (var2.hasMovementPending) { + if (var4 == 127) { + var2.resetPath(var2.tileX, var2.tileY); + } else { + MoveSpeed var28; + if (var4 != MoveSpeed.STATIONARY.speed) { + MoveSpeed[] var22 = new MoveSpeed[]{MoveSpeed.STATIONARY, MoveSpeed.CRAWL, MoveSpeed.RUN, MoveSpeed.WALK}; + var28 = (MoveSpeed)KeyHandler.findEnumerated(var22, var4); } else { - int var6 = var0.readBits(2); - if (var6 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - Client.field549[++Client.field446 - 1] = var3; + var28 = Players.playerMovementSpeeds[var1]; + } + + var2.move(var2.tileX, var2.tileY, var28); + } + } + + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-28" + ) + static void method296() { + if (class125.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + + } + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "-1225390547" + ) + static int method297(int var0, Script var1, boolean var2) { + return 2; + } + + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "([BI)[B", + garbageValue = "959381861" + ) + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); + int var2 = var1.readUnsignedByte(); + int var3 = var1.readInt(); + if (var3 >= 0 && (AbstractArchive.maximumContainerSize == 0 || var3 <= AbstractArchive.maximumContainerSize)) { + if (var2 == 0) { + byte[] var4 = new byte[var3]; + var1.readBytes(var4, 0, var3); + return var4; + } else { + int var6 = var1.readInt(); + if (var6 < 0 || AbstractArchive.maximumContainerSize != 0 && var6 > AbstractArchive.maximumContainerSize) { + throw new RuntimeException(); + } else { + byte[] var5 = new byte[var6]; + if (var2 == 1) { + BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); } else { - int var7; - int var8; - if (var6 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.move(var7, MoveSpeed.WALK); - var8 = var0.readBits(1); - if (var8 == 1) { - Client.field549[++Client.field446 - 1] = var3; - } - } else if (var6 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - if (var0.readBits(1) == 1) { - var7 = var0.readBits(3); - var4.move(var7, MoveSpeed.RUN); - var8 = var0.readBits(3); - var4.move(var8, MoveSpeed.RUN); - } else { - var7 = var0.readBits(3); - var4.move(var7, MoveSpeed.CRAWL); - } - - var7 = var0.readBits(1); - if (var7 == 1) { - Client.field549[++Client.field446 - 1] = var3; - } - } else if (var6 == 3) { - Client.field558[++Client.field488 - 1] = var3; - } + AbstractArchive.gzipDecompressor.decompress(var1, var5); } + + return var5; } } + } else { + throw new RuntimeException(); + } + } + + @ObfuscatedName("ld") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "709896940" + ) + static final boolean method298(int var0) { + if (var0 < 0) { + return false; + } else { + int var1 = Client.menuOpcodes[var0]; + if (var1 >= 2000) { + var1 -= 2000; + } + return var1 == 1007; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class531.java b/osrs/src/main/java/class531.java deleted file mode 100644 index 120c806d3..000000000 --- a/osrs/src/main/java/class531.java +++ /dev/null @@ -1,132 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("um") -public class class531 { - @ObfuscatedName("ay") - int field4225; - @ObfuscatedName("ar") - int field4220; - @ObfuscatedName("am") - int field4218; - @ObfuscatedName("as") - int field4221; - @ObfuscatedName("aj") - int field4217; - @ObfuscatedName("ag") - int field4215; - @ObfuscatedName("az") - int field4226; - @ObfuscatedName("av") - int field4223; - @ObfuscatedName("ap") - boolean field4214; - @ObfuscatedName("aq") - int field4219; - @ObfuscatedName("at") - int field4222; - @ObfuscatedName("ah") - int field4216; - @ObfuscatedName("ax") - int field4224; - - public class531() { - this.field4226 = 0; - this.field4223 = 0; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIZI)V", - garbageValue = "-1361284824" - ) - public void method2675(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, boolean var9) { - this.field4225 = var1; - this.field4220 = var2; - this.field4218 = var3; - this.field4221 = var4; - this.field4217 = var5; - this.field4215 = var6; - this.field4226 = var7; - this.field4223 = var8; - this.field4214 = var9; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1931379058" - ) - public void method2676(int var1, int var2, int var3, int var4) { - this.field4219 = var1; - this.field4222 = var2; - this.field4216 = var3; - this.field4224 = var4; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Lpt;Lpc;I)V", - garbageValue = "-1345335842" - ) - public void method2677(class395 var1, Font var2) { - if (var2 != null) { - int var3 = var2.ascent; - int var4 = Math.min(this.field4221, (int)((float)var3 * 0.9F)); - int var5 = var1.method2028(this.field4218); - int var6 = var1.method2029(this.field4221); - int var7 = var5 + (this.field4225 - this.field4217); - int var8 = var3 + var6 + (this.field4220 - this.field4215); - Rasterizer2D.Rasterizer2D_setClip(this.field4225, this.field4220, this.field4225 + this.field4218, this.field4220 + this.field4221); - int var9 = this.field4223; - int var10 = this.field4226; - if (var9 > var10) { - int var11 = var9; - var9 = var10; - var10 = var11; - } - - class399 var21 = var1.method2008(0, var9); - class399 var12 = var1.method2008(var9, var10); - class399 var13 = var1.method2008(var10, var1.method1999()); - class399 var14 = var1.method2008(0, this.field4226); - int var16; - int var18; - if (!var12.method2076()) { - int var15 = var2.maxAscent + var2.maxDescent; - - for (var16 = 0; var16 < var12.method2077(); ++var16) { - class397 var17 = var12.method2081(var16); - var18 = var7 + var17.field3673; - int var19 = var2.charWidth(var17.field3671); - int var20 = var8 + var17.field3672 - var3; - Rasterizer2D.Rasterizer2D_fillRectangle(var18, var20, var19, var15, this.field4224); - } - } - - if (!var21.method2076()) { - var2.method2055(var21, var7, var8, this.field4219, this.field4222, -1); - } - - if (!var12.method2076()) { - var2.method2055(var12, var7, var8, this.field4216, this.field4222, -1); - } - - if (!var13.method2076()) { - var2.method2055(var13, var7, var8, this.field4219, this.field4222, -1); - } - - if (this.field4214) { - class486 var22 = var14.method2080(); - var16 = var7 + (Integer)var22.field4036; - int var23 = var8 + (Integer)var22.field4037; - var18 = var23 - var4; - Rasterizer2D.Rasterizer2D_drawLine(var16, var23, var16, var18, this.field4219); - if (this.field4222 != -1) { - Rasterizer2D.Rasterizer2D_drawLine(var16 + 1, var23 + 1, var16 + 1, var18 + 1, this.field4222); - } - } - - } - } -} diff --git a/osrs/src/main/java/class532.java b/osrs/src/main/java/class532.java new file mode 100644 index 000000000..d6509d0c5 --- /dev/null +++ b/osrs/src/main/java/class532.java @@ -0,0 +1,132 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("uo") +public class class532 { + @ObfuscatedName("ae") + int field4262; + @ObfuscatedName("ao") + int field4266; + @ObfuscatedName("at") + int field4269; + @ObfuscatedName("ac") + int field4260; + @ObfuscatedName("ai") + int field4263; + @ObfuscatedName("az") + int field4270; + @ObfuscatedName("ap") + int field4267; + @ObfuscatedName("aa") + int field4259; + @ObfuscatedName("af") + boolean field4258; + @ObfuscatedName("ad") + int field4261; + @ObfuscatedName("aq") + int field4268; + @ObfuscatedName("al") + int field4264; + @ObfuscatedName("an") + int field4265; + + public class532() { + this.field4267 = 0; + this.field4259 = 0; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIZB)V", + garbageValue = "115" + ) + public void method2694(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, boolean var9) { + this.field4262 = var1; + this.field4266 = var2; + this.field4269 = var3; + this.field4260 = var4; + this.field4263 = var5; + this.field4270 = var6; + this.field4267 = var7; + this.field4259 = var8; + this.field4258 = var9; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1659604987" + ) + public void method2695(int var1, int var2, int var3, int var4) { + this.field4261 = var1; + this.field4268 = var2; + this.field4264 = var3; + this.field4265 = var4; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Lpj;Lpi;B)V", + garbageValue = "-101" + ) + public void method2696(class394 var1, Font var2) { + if (var2 != null) { + int var3 = var2.ascent; + int var4 = Math.min(this.field4260, (int)((float)var3 * 0.9F)); + int var5 = var1.method2069(this.field4269); + int var6 = var1.method2070(this.field4260); + int var7 = var5 + (this.field4262 - this.field4263); + int var8 = var6 + var3 + (this.field4266 - this.field4270); + Rasterizer2D.Rasterizer2D_setClip(this.field4262, this.field4266, this.field4262 + this.field4269, this.field4260 + this.field4266); + int var9 = this.field4259; + int var10 = this.field4267; + if (var9 > var10) { + int var11 = var9; + var9 = var10; + var10 = var11; + } + + class398 var21 = var1.method2049(0, var9); + class398 var12 = var1.method2049(var9, var10); + class398 var13 = var1.method2049(var10, var1.method2040()); + class398 var14 = var1.method2049(0, this.field4267); + int var16; + int var18; + if (!var12.method2115()) { + int var15 = var2.maxAscent + var2.maxDescent; + + for (var16 = 0; var16 < var12.method2116(); ++var16) { + class396 var17 = var12.method2120(var16); + var18 = var7 + var17.field3681; + int var19 = var2.charWidth(var17.field3680); + int var20 = var8 + var17.field3682 - var3; + Rasterizer2D.Rasterizer2D_fillRectangle(var18, var20, var19, var15, this.field4265); + } + } + + if (!var21.method2115()) { + var2.method2094(var21, var7, var8, this.field4261, this.field4268, -1); + } + + if (!var12.method2115()) { + var2.method2094(var12, var7, var8, this.field4264, this.field4268, -1); + } + + if (!var13.method2115()) { + var2.method2094(var13, var7, var8, this.field4261, this.field4268, -1); + } + + if (this.field4258) { + class485 var22 = var14.method2119(); + var16 = var7 + (Integer)var22.field4049; + int var23 = var8 + (Integer)var22.field4048; + var18 = var23 - var4; + Rasterizer2D.Rasterizer2D_drawLine(var16, var23, var16, var18, this.field4261); + if (this.field4268 != -1) { + Rasterizer2D.Rasterizer2D_drawLine(var16 + 1, var23 + 1, var16 + 1, var18 + 1, this.field4268); + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class535.java b/osrs/src/main/java/class535.java deleted file mode 100644 index 689050df4..000000000 --- a/osrs/src/main/java/class535.java +++ /dev/null @@ -1,43 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ur") -public abstract class class535 { - @ObfuscatedName("at") - static final String[] field4234; - - static { - field4234 = new String[32]; - field4234[0] = "MEMBERS"; - field4234[1] = "QUICKCHAT"; - field4234[2] = "PVPWORLD"; - field4234[3] = "LOOTSHARE"; - field4234[4] = "DEDICATEDACTIVITY"; - field4234[5] = "BOUNTYWORLD"; - field4234[6] = "PVPARENA"; - field4234[7] = "HIGHLEVELONLY_1500"; - field4234[8] = "SPEEDRUN"; - field4234[9] = "EXISTINGPLAYERSONLY"; - field4234[10] = "EXTRAHARDWILDERNESS"; - field4234[11] = "DUNGEONEERING"; - field4234[12] = "INSTANCE_SHARD"; - field4234[13] = "RENTABLE"; - field4234[14] = "LASTMANSTANDING"; - field4234[15] = "NEW_PLAYERS"; - field4234[16] = "BETA_WORLD"; - field4234[17] = "STAFF_IP_ONLY"; - field4234[18] = "HIGHLEVELONLY_2000"; - field4234[19] = "HIGHLEVELONLY_2400"; - field4234[20] = "VIPS_ONLY"; - field4234[21] = "HIDDEN_WORLD"; - field4234[22] = "LEGACY_ONLY"; - field4234[23] = "EOC_ONLY"; - field4234[24] = "BEHIND_PROXY"; - field4234[25] = "NOSAVE_MODE"; - field4234[26] = "TOURNAMENT_WORLD"; - field4234[27] = "FRESHSTART"; - field4234[28] = "HIGHLEVELONLY_1750"; - field4234[29] = "DEADMAN"; - field4234[30] = "SEASONAL"; - field4234[31] = "EXTERNAL_PARTNER_ONLY"; - } -} diff --git a/osrs/src/main/java/class538.java b/osrs/src/main/java/class538.java index 30042d6af..8d9eda082 100644 --- a/osrs/src/main/java/class538.java +++ b/osrs/src/main/java/class538.java @@ -1,13 +1,11 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("up") +@ObfuscatedName("uv") public class class538 { - @ObfuscatedName("aw") - static final int[] field4243; - @ObfuscatedName("az") - static int field4242; + @ObfuscatedName("au") + static final int[] field4284; static { - field4243 = new int[]{16777215, 14942979, 16747520, 16772352, 32806, 2375822, 7547266, 16720268, 11884176, 5261772, 10724259, 13970688, 15693351, 16577588, 494960, 2208255, 10178454, 16756679, 13722276, 8105443, 16751190, 2543274, 7591918, 10246609, 10021057, 11894492, 2894892, 9699842, 6371605, 13680896, 4882723, 14504, 8388736, 14025328, 10682978, 4004472}; + field4284 = new int[]{16777215, 14942979, 16747520, 16772352, 32806, 2375822, 7547266, 16720268, 11884176, 5261772, 10724259, 13970688, 15693351, 16577588, 494960, 2208255, 10178454, 16756679, 13722276, 8105443, 16751190, 2543274, 7591918, 10246609, 10021057, 11894492, 2894892, 9699842, 6371605, 13680896, 4882723, 14504, 8388736, 14025328, 10682978, 4004472}; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class59.java b/osrs/src/main/java/class59.java index a0684fa85..60e879070 100644 --- a/osrs/src/main/java/class59.java +++ b/osrs/src/main/java/class59.java @@ -2,44 +2,59 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("cd") public class class59 { - @ObfuscatedName("aw") + @ObfuscatedName("fd") @ObfuscatedSignature( - descriptor = "Lbu;" + descriptor = "Lqi;" ) - VorbisFloor field309; - @ObfuscatedName("ay") - boolean field307; - @ObfuscatedName("ar") - int[] field311; - @ObfuscatedName("am") - int[] field310; - @ObfuscatedName("as") - boolean[] field308; + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("jt") + @ObfuscatedSignature( + descriptor = "Lpi;" + ) + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("js") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lbo;" + ) + VorbisFloor field311; + @ObfuscatedName("ae") + boolean field312; + @ObfuscatedName("ao") + int[] field314; + @ObfuscatedName("at") + int[] field315; + @ObfuscatedName("ac") + boolean[] field313; @ObfuscatedSignature( - descriptor = "(Lbu;Z[I[I[Z)V" + descriptor = "(Lbo;Z[I[I[Z)V" ) class59(VorbisFloor var1, boolean var2, int[] var3, int[] var4, boolean[] var5) { - this.field309 = var1; - this.field307 = var2; - this.field311 = var3; - this.field310 = var4; - this.field308 = var5; + this.field311 = var1; + this.field312 = var2; + this.field314 = var3; + this.field315 = var4; + this.field313 = var5; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "([FIS)V", - garbageValue = "-3681" + descriptor = "([FIB)V", + garbageValue = "44" ) - void method318(float[] var1, int var2) { - int var3 = this.field309.field177.length; - VorbisFloor var10000 = this.field309; - int var4 = VorbisFloor.field173[this.field309.multiplier - 1]; - boolean[] var5 = this.field308; - this.field308[1] = true; + void method321(float[] var1, int var2) { + int var3 = this.field311.field176.length; + VorbisFloor var10000 = this.field311; + int var4 = VorbisFloor.field172[this.field311.multiplier - 1]; + boolean[] var5 = this.field313; + this.field313[1] = true; var5[0] = true; int var6; @@ -48,37 +63,37 @@ void method318(float[] var1, int var2) { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { - var7 = this.field309.method194(this.field311, var6); - var8 = this.field309.method195(this.field311, var6); - var9 = this.field309.method196(this.field311[var7], this.field310[var7], this.field311[var8], this.field310[var8], this.field311[var6]); - var10 = this.field310[var6]; + var7 = this.field311.method192(this.field314, var6); + var8 = this.field311.method193(this.field314, var6); + var9 = this.field311.method194(this.field314[var7], this.field315[var7], this.field314[var8], this.field315[var8], this.field314[var6]); + var10 = this.field315[var6]; int var11 = var4 - var9; int var13 = (var11 < var9 ? var11 : var9) << 1; if (var10 != 0) { - boolean[] var14 = this.field308; - this.field308[var8] = true; + boolean[] var14 = this.field313; + this.field313[var8] = true; var14[var7] = true; - this.field308[var6] = true; + this.field313[var6] = true; if (var10 >= var13) { - this.field310[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + this.field315[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - this.field310[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + this.field315[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - this.field308[var6] = false; - this.field310[var6] = var9; + this.field313[var6] = false; + this.field315[var6] = var9; } } this.VarbisFloor_sort(0, var3 - 1); var6 = 0; - var7 = this.field309.multiplier * this.field310[0]; + var7 = this.field311.multiplier * this.field315[0]; for (var8 = 1; var8 < var3; ++var8) { - if (this.field308[var8]) { - var9 = this.field311[var8]; - var10 = this.field309.multiplier * this.field310[var8]; - this.field309.method197(var6, var7, var9, var10, var1, var2); + if (this.field313[var8]) { + var9 = this.field314[var8]; + var10 = this.field311.multiplier * this.field315[var8]; + this.field311.method195(var6, var7, var9, var10, var1, var2); if (var9 >= var2) { return; } @@ -88,7 +103,7 @@ void method318(float[] var1, int var2) { } } - var10000 = this.field309; + var10000 = this.field311; float var16 = VorbisFloor.VorbisFloor_decibelStatics[var7]; for (var9 = var6; var9 < var2; ++var9) { @@ -97,291 +112,66 @@ void method318(float[] var1, int var2) { } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "4" + garbageValue = "81" ) - boolean method319() { - return this.field307; + boolean method322() { + return this.field312; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-48" + descriptor = "(III)V", + garbageValue = "1743044108" ) @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { int var3 = var1; - int var4 = this.field311[var1]; - int var5 = this.field310[var1]; - boolean var6 = this.field308[var1]; + int var4 = this.field314[var1]; + int var5 = this.field315[var1]; + boolean var6 = this.field313[var1]; for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = this.field311[var7]; + int var8 = this.field314[var7]; if (var8 < var4) { - this.field311[var3] = var8; - this.field310[var3] = this.field310[var7]; - this.field308[var3] = this.field308[var7]; + this.field314[var3] = var8; + this.field315[var3] = this.field315[var7]; + this.field313[var3] = this.field313[var7]; ++var3; - this.field311[var7] = this.field311[var3]; - this.field310[var7] = this.field310[var3]; - this.field308[var7] = this.field308[var3]; + this.field314[var7] = this.field314[var3]; + this.field315[var7] = this.field315[var3]; + this.field313[var7] = this.field313[var3]; } } - this.field311[var3] = var4; - this.field310[var3] = var5; - this.field308[var3] = var6; + this.field314[var3] = var4; + this.field315[var3] = var5; + this.field313[var3] = var6; this.VarbisFloor_sort(var1, var3 - 1); this.VarbisFloor_sort(var3 + 1, var2); } } - @ObfuscatedName("aj") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-937523976" + descriptor = "(CLon;B)I", + garbageValue = "82" ) - static void method320(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-740402565" - ) - public static void method322() { - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); - } - - @ObfuscatedName("le") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "26" - ) - static final int method323() { - return Client.menuOptionsCount - 1; - } - - @ObfuscatedName("lh") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1812783002" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - JagexCache.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); - } - - long var4 = -1L; - long var6 = -1L; - - int var8; - for (var8 = 0; var8 < class467.method2321(); ++var8) { - long var9 = ViewportMouse.ViewportMouse_entityTags[var8]; - if (var6 != var9) { - var6 = var9; - int var13 = class365.method1917(var8); - int var14 = class197.method979(ViewportMouse.ViewportMouse_entityTags[var8]); - int var15 = var14; - int var16 = class6.method12(ViewportMouse.ViewportMouse_entityTags[var8]); - int var18 = class458.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); - int var19 = var18; - int var23; - if (var16 == 2 && UserComparator5.scene.getObjectFlags(class36.Client_plane, var13, var14, var9) >= 0) { - ObjectComposition var20 = class90.getObjectDefinition(var18); - if (var20.transforms != null) { - var20 = var20.transform(); - } - - if (var20 == null) { - continue; - } - - PendingSpawn var21 = null; - - for (PendingSpawn var22 = (PendingSpawn)Client.pendingSpawns.last(); var22 != null; var22 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var22.plane == class36.Client_plane && var13 == var22.x && var15 == var22.y && var19 == var22.id) { - var21 = var22; - break; - } - } - - if (Client.isItemSelected == 1) { - JagexCache.insertMenuItemNoShift("Use", Client.field595 + " " + "->" + " " + MusicPatchPcmStream.colorStartTag(65535) + var20.name, 1, var19, var13, var15); - } else if (Client.isSpellSelected) { - if ((PcmPlayer.selectedSpellFlags & 4) == 4) { - JagexCache.insertMenuItemNoShift(Client.field597, Client.field596 + " " + "->" + " " + MusicPatchPcmStream.colorStartTag(65535) + var20.name, 2, var19, var13, var15); - } - } else { - String[] var35 = var20.actions; - if (var35 != null) { - for (var23 = 4; var23 >= 0; --var23) { - if ((var21 == null || var21.method510(var23)) && var35[var23] != null) { - short var24 = 0; - if (var23 == 0) { - var24 = 3; - } - - if (var23 == 1) { - var24 = 4; - } - - if (var23 == 2) { - var24 = 5; - } - - if (var23 == 3) { - var24 = 6; - } - - if (var23 == 4) { - var24 = 1001; - } - - JagexCache.insertMenuItemNoShift(var35[var23], MusicPatchPcmStream.colorStartTag(65535) + var20.name, var24, var19, var13, var15); - } - } - } - - JagexCache.insertMenuItemNoShift("Examine", MusicPatchPcmStream.colorStartTag(65535) + var20.name, 1002, var20.id, var13, var15); - } - } - - int var26; - Player var27; - NPC var36; - int[] var37; - if (var16 == 1) { - NPC var31 = Client.npcs[var19]; - if (var31 == null) { - continue; - } - - if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { - for (var26 = 0; var26 < Client.npcCount; ++var26) { - var36 = Client.npcs[Client.npcIndices[var26]]; - if (var36 != null && var36 != var31 && var36.definition.size == 1 && var31.x == var36.x && var31.y == var36.y) { - VarpDefinition.addNpcToMenu(var36, Client.npcIndices[var26], var13, var15); - } - } - - var26 = Players.Players_count; - var37 = Players.Players_indices; - - for (var23 = 0; var23 < var26; ++var23) { - var27 = Client.players[var37[var23]]; - if (var27 != null && var31.x == var27.x && var31.y == var27.y) { - WorldMapAreaData.addPlayerToMenu(var27, var37[var23], var13, var15); - } - } - } - - VarpDefinition.addNpcToMenu(var31, var19, var13, var15); - } - - if (var16 == 0) { - Player var32 = Client.players[var19]; - if (var32 == null) { - continue; - } - - if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { - for (var26 = 0; var26 < Client.npcCount; ++var26) { - var36 = Client.npcs[Client.npcIndices[var26]]; - if (var36 != null && var36.definition.size == 1 && var32.x == var36.x && var36.y == var32.y) { - VarpDefinition.addNpcToMenu(var36, Client.npcIndices[var26], var13, var15); - } - } - - var26 = Players.Players_count; - var37 = Players.Players_indices; - - for (var23 = 0; var23 < var26; ++var23) { - var27 = Client.players[var37[var23]]; - if (var27 != null && var27 != var32 && var32.x == var27.x && var32.y == var27.y) { - WorldMapAreaData.addPlayerToMenu(var27, var37[var23], var13, var15); - } - } - } - - if (var19 != Client.combatTargetPlayerIndex) { - WorldMapAreaData.addPlayerToMenu(var32, var19, var13, var15); - } else { - var4 = var9; - } - } - - if (var16 == 3) { - NodeDeque var33 = Client.groundItems[class36.Client_plane][var13][var15]; - if (var33 != null) { - for (TileItem var34 = (TileItem)var33.first(); var34 != null; var34 = (TileItem)var33.next()) { - ItemComposition var38 = class125.ItemDefinition_get(var34.id); - if (Client.isItemSelected == 1) { - JagexCache.insertMenuItemNoShift("Use", Client.field595 + " " + "->" + " " + MusicPatchPcmStream.colorStartTag(16748608) + var38.name, 16, var34.id, var13, var15); - } else if (Client.isSpellSelected) { - if ((PcmPlayer.selectedSpellFlags & 1) == 1) { - JagexCache.insertMenuItemNoShift(Client.field597, Client.field596 + " " + "->" + " " + MusicPatchPcmStream.colorStartTag(16748608) + var38.name, 17, var34.id, var13, var15); - } - } else { - String[] var28 = var38.groundActions; - - for (int var39 = 4; var39 >= 0; --var39) { - if (var34.method614(var39)) { - if (var28 != null && var28[var39] != null) { - byte var25 = 0; - if (var39 == 0) { - var25 = 18; - } - - if (var39 == 1) { - var25 = 19; - } - - if (var39 == 2) { - var25 = 20; - } - - if (var39 == 3) { - var25 = 21; - } - - if (var39 == 4) { - var25 = 22; - } - - JagexCache.insertMenuItemNoShift(var28[var39], MusicPatchPcmStream.colorStartTag(16748608) + var38.name, var25, var34.id, var13, var15); - } else if (var39 == 2) { - JagexCache.insertMenuItemNoShift("Take", MusicPatchPcmStream.colorStartTag(16748608) + var38.name, 20, var34.id, var13, var15); - } - } - } - - JagexCache.insertMenuItemNoShift("Examine", MusicPatchPcmStream.colorStartTag(16748608) + var38.name, 1004, var34.id, var13, var15); - } - } - } - } - } + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { + var0 = Character.toLowerCase(var0); + var2 = (var0 << 4) + 1; } - if (-1L != var4) { - var8 = (int)(var4 >>> 0 & 127L); - int var10 = class197.method979(var4); - Player var30 = Client.players[Client.combatTargetPlayerIndex]; - WorldMapAreaData.addPlayerToMenu(var30, Client.combatTargetPlayerIndex, var8, var10); + if (var0 == 241 && var1 == Language.Language_ES) { + var2 = 1762; } + return var2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class6.java b/osrs/src/main/java/class6.java index 8192cbb89..eba6bf3f8 100644 --- a/osrs/src/main/java/class6.java +++ b/osrs/src/main/java/class6.java @@ -2,17 +2,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ag") -public enum class6 implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("az") +public enum class6 implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laz;" ) field6(0, 0); - @ObfuscatedName("ay") - final int field8; - @ObfuscatedName("ar") + @ObfuscatedName("wi") + @ObfuscatedSignature( + descriptor = "Lru;" + ) + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("ae") + public final int field8; + @ObfuscatedName("ao") final int field7; class6(int var3, int var4) { @@ -20,18 +26,142 @@ public enum class6 implements class372 { this.field7 = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { return this.field7; } - @ObfuscatedName("as") - public static int method12(long var0) { - return (int)(var0 >>> 14 & 3L); + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(ILdh;ZI)I", + garbageValue = "1893076970" + ) + static int method12(int var0, Script var1, boolean var2) { + return 2; + } + + @ObfuscatedName("ne") + @ObfuscatedSignature( + descriptor = "(Lmi;IIIB)V", + garbageValue = "32" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + class301.method1622(); + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); + if (Client.minimapState != 2 && Client.minimapState != 5) { + int var5 = Client.camAngleY & 2047; + int var6 = VarbitComposition.localPlayer.x / 32 + 48; + int var7 = 464 - VarbitComposition.localPlayer.y / 32; + AbstractUserComparator.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + + int var8; + int var9; + int var10; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { + var9 = Client.mapIconXs[var8] * 4 + 2 - VarbitComposition.localPlayer.x / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - VarbitComposition.localPlayer.y / 32; + class210.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { + for (var9 = 0; var9 < 104; ++var9) { + NodeDeque var14 = Client.groundItems[HealthBar.Client_plane][var8][var9]; + if (var14 != null) { + var11 = var8 * 4 + 2 - VarbitComposition.localPlayer.x / 32; + var12 = var9 * 4 + 2 - VarbitComposition.localPlayer.y / 32; + class210.drawSpriteOnMinimap(var1, var2, var11, var12, FloorOverlayDefinition.mapDotSprites[0], var4); + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { + NPC var15 = Client.npcs[Client.npcIndices[var8]]; + if (var15 != null && var15.isVisible()) { + NPCComposition var17 = var15.definition; + if (var17 != null && var17.transforms != null) { + var17 = var17.transform(); + } + + if (var17 != null && var17.drawMapDot && var17.isInteractable) { + var11 = var15.x / 32 - VarbitComposition.localPlayer.x / 32; + var12 = var15.y / 32 - VarbitComposition.localPlayer.y / 32; + class210.drawSpriteOnMinimap(var1, var2, var11, var12, FloorOverlayDefinition.mapDotSprites[1], var4); + } + } + } + + var8 = Players.Players_count; + int[] var18 = Players.Players_indices; + + for (var10 = 0; var10 < var8; ++var10) { + Player var16 = Client.players[var18[var10]]; + if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != VarbitComposition.localPlayer) { + var12 = var16.x / 32 - VarbitComposition.localPlayer.x / 32; + int var13 = var16.y / 32 - VarbitComposition.localPlayer.y / 32; + if (var16.isFriend()) { + class210.drawSpriteOnMinimap(var1, var2, var12, var13, FloorOverlayDefinition.mapDotSprites[3], var4); + } else if (VarbitComposition.localPlayer.team != 0 && var16.team != 0 && var16.team == VarbitComposition.localPlayer.team) { + class210.drawSpriteOnMinimap(var1, var2, var12, var13, FloorOverlayDefinition.mapDotSprites[4], var4); + } else if (var16.isFriendsChatMember()) { + class210.drawSpriteOnMinimap(var1, var2, var12, var13, FloorOverlayDefinition.mapDotSprites[5], var4); + } else if (var16.isClanMember()) { + class210.drawSpriteOnMinimap(var1, var2, var12, var13, FloorOverlayDefinition.mapDotSprites[6], var4); + } else { + class210.drawSpriteOnMinimap(var1, var2, var12, var13, FloorOverlayDefinition.mapDotSprites[2], var4); + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; + if (var19 != null) { + var11 = var19.x / 32 - VarbitComposition.localPlayer.x / 32; + var12 = var19.y / 32 - VarbitComposition.localPlayer.y / 32; + class408.worldToMinimap(var1, var2, var11, var12, Message.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - UrlRequester.baseX * 4 + 2 - VarbitComposition.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - class47.baseY * 4 + 2 - VarbitComposition.localPlayer.y / 32; + class408.worldToMinimap(var1, var2, var10, var11, Message.mapMarkerSprites[1], var4); + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { + Player var20 = Client.players[Client.hintArrowPlayerIndex]; + if (var20 != null) { + var11 = var20.x / 32 - VarbitComposition.localPlayer.x / 32; + var12 = var20.y / 32 - VarbitComposition.localPlayer.y / 32; + class408.worldToMinimap(var1, var2, var11, var12, Message.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - VarbitComposition.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - VarbitComposition.localPlayer.y / 32; + class210.drawSpriteOnMinimap(var1, var2, var10, var11, Message.mapMarkerSprites[0], var4); + } + + if (!VarbitComposition.localPlayer.isHidden) { + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + } + + Client.field408[var3] = true; + } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class60.java b/osrs/src/main/java/class60.java index 367bbbf4d..39dbfd5d4 100644 --- a/osrs/src/main/java/class60.java +++ b/osrs/src/main/java/class60.java @@ -4,888 +4,78 @@ @ObfuscatedName("ce") public class class60 { - @ObfuscatedName("aw") - byte[] field312; - @ObfuscatedName("ay") - int field314; - @ObfuscatedName("ar") - int field313; + @ObfuscatedName("au") + byte[] field316; + @ObfuscatedName("ae") + int field317; + @ObfuscatedName("ao") + int field318; class60() { - this.field312 = null; - this.field314 = 0; - this.field313 = 0; + this.field316 = null; + this.field317 = 0; + this.field318 = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2044027415" + descriptor = "(IB)I", + garbageValue = "-62" ) int method325(int var1) { int var2 = 0; int var3; int var4; - for (var3 = 0; var1 >= 8 - this.field313; var1 -= var4) { - var4 = 8 - this.field313; + for (var3 = 0; var1 >= 8 - this.field318; var1 -= var4) { + var4 = 8 - this.field318; int var5 = (1 << var4) - 1; - var2 += (this.field312[this.field314] >> this.field313 & var5) << var3; - this.field313 = 0; - ++this.field314; + var2 += (this.field316[this.field317] >> this.field318 & var5) << var3; + this.field318 = 0; + ++this.field317; var3 += var4; } if (var1 > 0) { var4 = (1 << var1) - 1; - var2 += (this.field312[this.field314] >> this.field313 & var4) << var3; - this.field313 += var1; + var2 += (this.field316[this.field317] >> this.field318 & var4) << var3; + this.field318 += var1; } return var2; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "92" + garbageValue = "-36" ) int method326() { - int var1 = this.field312[this.field314] >> this.field313 & 1; - ++this.field313; - this.field314 += this.field313 >> 3; - this.field313 &= 7; + int var1 = this.field316[this.field317] >> this.field318 & 1; + ++this.field318; + this.field317 += this.field318 >> 3; + this.field318 &= 7; return var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "([BII)V", - garbageValue = "706879560" + garbageValue = "1812215657" ) void method327(byte[] var1, int var2) { - this.field312 = var1; - this.field314 = var2; - this.field313 = 0; + this.field316 = var1; + this.field317 = var2; + this.field318 = 0; } - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-881348723" + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "-1921565351" ) - static int method328(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var3 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - } - - class200.invalidateWidget(var3); - int var4; - int var5; - if (var0 != 1200 && var0 != 1205 && var0 != 1212) { - if (var0 == 1201) { - var3.modelType = 2; - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 1202) { - var3.modelType = 3; - var3.modelId = class136.localPlayer.appearance.getChatHeadId(); - return 1; - } else if (var0 == 1207) { - boolean var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - WorldMapManager.method1453(var3, class136.localPlayer.appearance, var7); - return 1; - } else if (var0 == 1208) { - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3.field3081 == null) { - throw new RuntimeException(""); - } else { - UserComparator9.method679(var3, var4); - return 1; - } - } else if (var0 == 1209) { - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3.field3081 == null) { - throw new RuntimeException(""); - } else { - class310.method1641(var3, var4, var5); - return 1; - } - } else if (var0 == 1210) { - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3.field3081 == null) { - throw new RuntimeException(""); - } else { - TaskHandler.method898(var3, class136.localPlayer.appearance.field2900, var4); - return 1; - } - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemComposition var6 = class125.ItemDefinition_get(var4); - var3.modelAngleX = var6.xan2d; - var3.modelAngleY = var6.yan2d; - var3.modelAngleZ = var6.zan2d; - var3.modelOffsetX = var6.offsetX2d; - var3.modelOffsetY = var6.offsetY2d; - var3.modelZoom = var6.zoom2d; - if (var0 == 1205) { - var3.itemQuantityMode = 0; - } else if (var0 == 1212 | var6.isStackable == 1) { - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; - } - - if (var3.modelRotation > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.modelRotation; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; - } - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1862862390" - ) - static boolean method329(char var0) { - for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { - if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { - return true; - } - } - - return false; - } - - @ObfuscatedName("jw") - @ObfuscatedSignature( - descriptor = "(Ldf;I)Z", - garbageValue = "1187792462" - ) - static boolean method330(Player var0) { - if (Client.drawPlayerNames == 0) { - return false; - } else { - boolean var1; - if (class136.localPlayer != var0) { - var1 = (Client.drawPlayerNames & 4) != 0; - return var1 || WorldMapIcon_1.method1373() && var0.isFriend() || ModeWhere.method1946() && var0.isFriendsChatMember(); - } else { - var1 = (Client.drawPlayerNames & 8) != 0; - return var1; - } - } - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(IIIIILjava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "14" - ) - @Export("menuAction") - static final void menuAction(int param0, int param1, int var2, int var3_item_npc_index, int var4, String var5, String var6, int var7, int var8) { - if (var2 >= 2000) { - var2 -= 2000; - } - - NPC var9; - PacketBufferNode var11; - if (var2 == 1003) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var9 = Client.npcs[var3_item_npc_index]; - if (var9 != null) { - NPCComposition var10 = var9.definition; - if (var10.transforms != null) { - var10 = var10.transform(); - } - - if (var10 != null) { - var11 = class503.getPacketBufferNode(ClientPacket.OPNPC6, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShortAdd(var10.id); - Client.packetWriter.addNode(var11); - } - } - } - - PacketBufferNode var15; - if (var2 == 7) { - var9 = Client.npcs[var3_item_npc_index]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPNPCU, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortAdd(class301.field2732); - var15.packetBuffer.writeShortAddLE(SecureRandomCallable.field846); - var15.packetBuffer.writeIntIME(DirectByteArrayCopier.field3095); - var15.packetBuffer.writeShortAdd(var3_item_npc_index); - var15.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var15); - } - } - - Player var14; - if (var2 == 49) { - var14 = Client.players[var3_item_npc_index]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortAddLE(var3_item_npc_index); - var15.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 9) { - var9 = Client.npcs[var3_item_npc_index]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPNPC1, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var15.packetBuffer.writeShortAddLE(var3_item_npc_index); - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 45) { - var14 = Client.players[var3_item_npc_index]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPPLAYER2, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortAddLE(var3_item_npc_index); - var15.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 51) { - var14 = Client.players[var3_item_npc_index]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPPLAYER8, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortAddLE(var3_item_npc_index); - var15.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); // Movement - Client.packetWriter.addNode(var15); - } - } - - PacketBufferNode var16; - if (var2 == 1002) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var16 = class503.getPacketBufferNode(ClientPacket.OPOBJ6, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShort(var3_item_npc_index); - Client.packetWriter.addNode(var16); - } - - if (var2 == 48) { - var14 = Client.players[var3_item_npc_index]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPPLAYER5, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortAdd(var3_item_npc_index); - var15.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 1001) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPLOC5, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAddLE(var3_item_npc_index); - var16.packetBuffer.writeShortAddLE(class148.baseY + param1); - var16.packetBuffer.writeShortAddLE(param0 + AbstractArchive.baseX); - Client.packetWriter.addNode(var16); - } - - if (var2 == 12) { - var9 = Client.npcs[var3_item_npc_index]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPNPC4, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortLE(var3_item_npc_index); - var15.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var15); - } - } - - Widget var17; - if (var2 == 58) { - var17 = MouseRecorder.getWidgetChild(param1, param0); - if (var17 != null) { - if (var17.field3042 != null) { - ScriptEvent var18 = new ScriptEvent(); - var18.widget = var17; - var18.opIndex = var3_item_npc_index; - var18.targetName = var6; - var18.args = var17.field3042; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var18); - } - - var15 = class503.getPacketBufferNode(ClientPacket.IF_BUTTONT, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortAdd(Client.selectedSpellItemId); // fromItem - var15.packetBuffer.writeShortLE(param0); // toSlot - var15.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); // fromSlot - var15.packetBuffer.writeShortAddLE(var4); // toItem - var15.packetBuffer.writeIntME(class33.selectedSpellWidget); // from_component_hash - var15.packetBuffer.writeIntME(param1); // to_component_hash - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 8) { - var9 = Client.npcs[var3_item_npc_index]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPNPCT, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeIntIME(class33.selectedSpellWidget); // component hash - var15.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); // component Slot - var15.packetBuffer.writeShortLE(Client.selectedSpellItemId); // verify - var15.packetBuffer.writeShortLE(var3_item_npc_index); // npc index - var15.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); // movement - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 1) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPLOCU, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortLE(var3_item_npc_index); - var16.packetBuffer.writeShortLE(SecureRandomCallable.field846); - var16.packetBuffer.writeShortLE(class301.field2732); - var16.packetBuffer.writeShortLE(param0 + AbstractArchive.baseX); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeInt(DirectByteArrayCopier.field3095); - var16.packetBuffer.writeShortLE(class148.baseY + param1); - Client.packetWriter.addNode(var16); - } - - if (var2 == 47) { - var14 = Client.players[var3_item_npc_index]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortAdd(var3_item_npc_index); - var15.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 44) { - var14 = Client.players[var3_item_npc_index]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortAddLE(var3_item_npc_index); - var15.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 11) { - var9 = Client.npcs[var3_item_npc_index]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPNPC3, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShort(var3_item_npc_index); - var15.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var15); - } - } - - int var12; - Widget var19; - if (var2 == 29) { - var16 = class503.getPacketBufferNode(ClientPacket.BUTTON_CLICK, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeInt(param1); - Client.packetWriter.addNode(var16); - var19 = VarbitComposition.getWidget(param1); - if (var19 != null && var19.cs1Instructions != null && var19.cs1Instructions[0][0] == 5) { - var12 = var19.cs1Instructions[0][1]; - if (Varps.Varps_main[var12] != var19.cs1ComparisonValues[0]) { - Varps.Varps_main[var12] = var19.cs1ComparisonValues[0]; - MenuAction.changeGameOptions(var12); - } - } - } - - if (var2 == 22) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPOBJ5, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAdd(param0 + AbstractArchive.baseX); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAdd(var3_item_npc_index); - var16.packetBuffer.writeShortAdd(class148.baseY + param1); - Client.packetWriter.addNode(var16); - } - - if (var2 == 50) { - var14 = Client.players[var3_item_npc_index]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShort(var3_item_npc_index); - var15.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 14) { - var14 = Client.players[var3_item_npc_index]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPPLAYERU, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortAddLE(SecureRandomCallable.field846); - var15.packetBuffer.writeShortAddLE(class301.field2732); - var15.packetBuffer.writeIntLE(DirectByteArrayCopier.field3095); - var15.packetBuffer.writeShort(var3_item_npc_index); - var15.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 26) { - class390.method1987(); - } - - if (var2 == 23) { - if (Client.isMenuOpen) { - UserComparator5.scene.setViewportWalking(); - } else { - UserComparator5.scene.menuOpen(class36.Client_plane, param0, param1, true); - } - } - - if (var2 == 16) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPOBJU, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortLE(class301.field2732); - var16.packetBuffer.writeShortLE(SecureRandomCallable.field846); - var16.packetBuffer.writeShortLE(var3_item_npc_index); - var16.packetBuffer.writeShortLE(class148.baseY + param1); - var16.packetBuffer.writeShortAddLE(param0 + AbstractArchive.baseX); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeIntME(DirectByteArrayCopier.field3095); - Client.packetWriter.addNode(var16); - } - - if (var2 == 57 || var2 == 1007) { - var17 = MouseRecorder.getWidgetChild(param1, param0); - if (var17 != null) { - BufferedSource.widgetDefaultMenuAction(var3_item_npc_index, param1, param0, var4, var6); - } - } - - if (var2 == 25) { - var17 = MouseRecorder.getWidgetChild(param1, param0); - if (var17 != null) { - SoundCache.Widget_runOnTargetLeave(); - ArchiveDiskAction.selectSpell(param1, param0, class273.Widget_unpackTargetMask(UserComparator8.getWidgetFlags(var17)), var4); - Client.isItemSelected = 0; - Client.field597 = class13.Widget_getSpellActionName(var17); - if (Client.field597 == null) { - Client.field597 = "null"; - } - - if (var17.isIf3) { - Client.field596 = var17.dataText + MusicPatchPcmStream.colorStartTag(16777215); - } else { - Client.field596 = MusicPatchPcmStream.colorStartTag(65280) + var17.field3078 + MusicPatchPcmStream.colorStartTag(16777215); - } - } - - } else { - if (var2 == 1008 || var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1012) { - class127.worldMap.worldMapMenuAction(var2, var3_item_npc_index, new Coord(param0), new Coord(param1)); - } - - if (var2 == 46) { - var14 = Client.players[var3_item_npc_index]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPPLAYER3, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var15.packetBuffer.writeShort(var3_item_npc_index); - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 15) { - var14 = Client.players[var3_item_npc_index]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPPLAYERT, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeShortAdd(var3_item_npc_index); - var15.packetBuffer.writeIntME(class33.selectedSpellWidget); - var15.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var15.packetBuffer.writeShort(Client.selectedSpellItemId); - var15.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var15); - } - } - - if (var2 == 6) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPOBJ4, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAddLE(class148.baseY + param1); - var16.packetBuffer.writeShortLE(param0 + AbstractArchive.baseX); - var16.packetBuffer.writeShort(var3_item_npc_index); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var16); - - } - - if (var2 == 20) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPLOC3, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAdd(param0 + AbstractArchive.baseX); - var16.packetBuffer.writeShortAdd(var3_item_npc_index); - var16.packetBuffer.writeShortLE(class148.baseY + param1); - var16.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var16); - } - - if (var2 == 17) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPOBJT, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortLE(class148.baseY + param1); - var16.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); - var16.packetBuffer.writeShortAdd(var3_item_npc_index); - var16.packetBuffer.writeIntLE(class33.selectedSpellWidget); - var16.packetBuffer.writeShortAdd(Client.selectedSpellItemId); - var16.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShort(param0 + AbstractArchive.baseX); - Client.packetWriter.addNode(var16); - } - - if (var2 == 19) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPLOC2, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortLE(param0 + AbstractArchive.baseX); - var16.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortLE(var3_item_npc_index); - var16.packetBuffer.writeShortAddLE(class148.baseY + param1); - Client.packetWriter.addNode(var16); - } - - if (var2 == 10) { - var9 = Client.npcs[var3_item_npc_index]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPNPC2, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var15.packetBuffer.writeShortLE(var3_item_npc_index); - Client.packetWriter.addNode(var15); - - } - } - - if (var2 == 2) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPLOCT, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); // Movement - var16.packetBuffer.writeShort(Client.selectedSpellItemId); // Item - var16.packetBuffer.writeShort(var3_item_npc_index); // object - var16.packetBuffer.writeShort(class148.baseY + param1); // Z - var16.packetBuffer.writeShortAdd(param0 + AbstractArchive.baseX); // x - var16.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); // Slot - var16.packetBuffer.writeIntIME(class33.selectedSpellWidget); // hash - Client.packetWriter.addNode(var16); - } - - if (var2 == 3) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPOBJ1, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortLE(class148.baseY + param1); // z - var16.packetBuffer.writeShortLE(param0 + AbstractArchive.baseX); // x - var16.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); // movement - var16.packetBuffer.writeShort(var3_item_npc_index); // ObjectId - Client.packetWriter.addNode(var16); - } - - if (var2 == 24) { - var17 = VarbitComposition.getWidget(param1); - if (var17 != null) { - boolean var13 = true; - if (var17.contentType > 0) { - var13 = class467.method2326(var17); - } - - if (var13) { - var11 = class503.getPacketBufferNode(ClientPacket.BUTTON_CLICK, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeInt(param1); - Client.packetWriter.addNode(var11); - } - } - } - - if (var2 == 5) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPOBJ3, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAdd(param0 + AbstractArchive.baseX); // x - var16.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); // movement - var16.packetBuffer.writeShortAdd(class148.baseY + param1); // z - var16.packetBuffer.writeShortAddLE(var3_item_npc_index); // id - Client.packetWriter.addNode(var16); - } - - if (var2 == 21) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPLOC4, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortLE(var3_item_npc_index); - var16.packetBuffer.writeShortAddLE(class148.baseY + param1); - var16.packetBuffer.writeShortAddLE(param0 + AbstractArchive.baseX); - Client.packetWriter.addNode(var16); - } - - if (var2 == 18) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPLOC1, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAddLE(class148.baseY + param1); - var16.packetBuffer.writeShortAddLE(var3_item_npc_index); - var16.packetBuffer.writeShortAddLE(param0 + AbstractArchive.baseX); - Client.packetWriter.addNode(var16); - } - - if (var2 == 30 && Client.meslayerContinueWidget == null) { - WorldMapArea.resumePauseWidget(param1, param0); - Client.meslayerContinueWidget = MouseRecorder.getWidgetChild(param1, param0); - class200.invalidateWidget(Client.meslayerContinueWidget); - } - - if (var2 == 1004) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var16 = class503.getPacketBufferNode(ClientPacket.OPLOC6, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortLE(param0 + AbstractArchive.baseX); - var16.packetBuffer.writeShortAdd(var3_item_npc_index); - var16.packetBuffer.writeShortAddLE(class148.baseY + param1); - Client.packetWriter.addNode(var16); - } - - if (var2 == 4) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var16 = class503.getPacketBufferNode(ClientPacket.OPOBJ2, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortLE(class148.baseY + param1); - var16.packetBuffer.writeShortAddLE(var3_item_npc_index); - var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAdd(param0 + AbstractArchive.baseX); - Client.packetWriter.addNode(var16); - - } - - if (var2 == 28) { - var16 = class503.getPacketBufferNode(ClientPacket.BUTTON_CLICK, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeInt(param1); - Client.packetWriter.addNode(var16); - var19 = VarbitComposition.getWidget(param1); - if (var19 != null && var19.cs1Instructions != null && var19.cs1Instructions[0][0] == 5) { - var12 = var19.cs1Instructions[0][1]; - Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12]; - MenuAction.changeGameOptions(var12); - } - } - - if (var2 == 13) { - var9 = Client.npcs[var3_item_npc_index]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = param0; - Client.destinationY = param1; - var15 = class503.getPacketBufferNode(ClientPacket.OPNPC5, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var15.packetBuffer.writeShort(var3_item_npc_index); - Client.packetWriter.addNode(var15); - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - class200.invalidateWidget(VarbitComposition.getWidget(DirectByteArrayCopier.field3095)); - } - - if (Client.isSpellSelected) { - SoundCache.Widget_runOnTargetLeave(); - } - - } + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? class102.method605(var0, 10, var1) : Integer.toString(var0); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class7.java b/osrs/src/main/java/class7.java index 839a5d751..712bc1d36 100644 --- a/osrs/src/main/java/class7.java +++ b/osrs/src/main/java/class7.java @@ -1,38 +1,31 @@ -import java.io.File; -import java.io.RandomAccessFile; -import java.util.Iterator; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +@ObfuscatedName("ap") public class class7 { - @ObfuscatedName("fr") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("aw") + @ObfuscatedName("aq") + static int field9; + @ObfuscatedName("au") ExecutorService field10; - @ObfuscatedName("ay") + @ObfuscatedName("ae") Future field11; - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lty;" + descriptor = "Ltm;" ) final Buffer field13; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lam;" + descriptor = "Lat;" ) final class3 field12; @ObfuscatedSignature( - descriptor = "(Lty;Lam;)V" + descriptor = "(Ltm;Lat;)V" ) public class7(Buffer var1, class3 var2) { this.field10 = Executors.newSingleThreadExecutor(); @@ -41,29 +34,29 @@ public class7(Buffer var1, class3 var2) { this.method17(); } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1852017365" + garbageValue = "-1836441256" ) public boolean method14() { return this.field11.isDone(); } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "94" + descriptor = "(I)V", + garbageValue = "2092027940" ) public void method15() { this.field10.shutdown(); this.field10 = null; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Lty;", - garbageValue = "1875881919" + descriptor = "(B)Ltm;", + garbageValue = "-120" ) public Buffer method16() { try { @@ -73,146 +66,21 @@ public Buffer method16() { } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1250861800" + garbageValue = "-691162885" ) void method17() { this.field11 = this.field10.submit(new class1(this, this.field13, this.field12)); } - @ObfuscatedName("aw") + @ObfuscatedName("iy") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "-8386743" + descriptor = "(IB)I", + garbageValue = "1" ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; - - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); - int var5 = var3.read(); - var3.seek(0L); - var3.write(var5); - var3.seek(0L); - var3.close(); - FileSystem.FileSystem_cacheFiles.put(var0, var2); - return var2; - } - } catch (Exception var8) { - try { - if (var3 != null) { - var3.close(); - var3 = null; - } - } catch (Exception var7) { - } - - throw new RuntimeException(); - } - } - } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-89265387" - ) - public static void method18(int var0) { - if (!class306.musicSongs.isEmpty()) { - Iterator var1 = class306.musicSongs.iterator(); - - while (var1.hasNext()) { - MusicSong var2 = (MusicSong)var1.next(); - if (var2 != null) { - var2.musicTrackVolume = var0; - } - } - - MusicSong var3 = (MusicSong)class306.musicSongs.get(0); - if (var3 != null && var3.midiPcmStream != null && var3.midiPcmStream.isReady() && !var3.field2851) { - var3.midiPcmStream.setPcmStreamVolume(var0); - var3.field2853 = (float)var0; - } - } - - } - - @ObfuscatedName("hb") - @ObfuscatedSignature( - descriptor = "(Lig;IIII)V", - garbageValue = "-1636583906" - ) - static void method19(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && class150.clientPreferences.getAreaSoundEffectsVolume() != 0) { - if (var0.animMayaFrameSounds != null && var0.animMayaFrameSounds.containsKey(var1)) { - SoundSystem.method220((Integer)var0.animMayaFrameSounds.get(var1), var2, var3); - } - } - } - - @ObfuscatedName("lu") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIIZI)V", - garbageValue = "-670080014" - ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { - if (!Client.isMenuOpen) { - if (Client.menuOptionsCount < 500) { - Client.menuActions[Client.menuOptionsCount] = var0; - Client.menuTargets[Client.menuOptionsCount] = var1; - Client.menuOpcodes[Client.menuOptionsCount] = var2; - Client.menuIdentifiers[Client.menuOptionsCount] = var3; - Client.menuArguments1[Client.menuOptionsCount] = var4; - Client.menuArguments2[Client.menuOptionsCount] = var5; - Client.menuItemIds[Client.menuOptionsCount] = var6; - Client.menuShiftClick[Client.menuOptionsCount] = var7; - ++Client.menuOptionsCount; - } - - } - } - - @ObfuscatedName("lv") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "-59" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (Login.loadInterface(var0)) { - WorldMapDecoration.field2419 = null; - class47.drawInterface(ArchiveLoader.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (WorldMapDecoration.field2419 != null) { - class47.drawInterface(WorldMapDecoration.field2419, -1412584499, var1, var2, var3, var4, class300.field2731, WorldMapIcon_0.field2371, var7); - WorldMapDecoration.field2419 = null; - } - - } else { - if (var7 != -1) { - Client.field403[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field403[var8] = true; - } - } - - } + static final int method18(int var0) { + return Math.abs(var0 - UserComparator10.cameraYaw) > 1024 ? var0 + 2048 * (var0 < UserComparator10.cameraYaw ? 1 : -1) : var0; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class72.java b/osrs/src/main/java/class72.java index ffd18e1bc..ea0e33576 100644 --- a/osrs/src/main/java/class72.java +++ b/osrs/src/main/java/class72.java @@ -1,15 +1,38 @@ -import java.math.BigInteger; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.math.BigInteger; -@ObfuscatedName("cp") +@ObfuscatedName("cj") public class class72 { - @ObfuscatedName("as") - static final BigInteger field728; - @ObfuscatedName("aj") - static final BigInteger field727; + @ObfuscatedName("ac") + static final BigInteger field731; + @ObfuscatedName("ai") + static final BigInteger field732; + @ObfuscatedName("cd") + static int field730; static { - field728 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field727 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + field731 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field732 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + } + + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1604625566" + ) + static void method424() { + Client.compass = null; + class167.redHintArrowSprite = null; + class299.mapSceneSprites = null; + class178.headIconPkSprites = null; + class502.headIconPrayerSprites = null; + ArchiveLoader.headIconHintSprites = null; + Message.mapMarkerSprites = null; + class152.crossSprites = null; + FloorOverlayDefinition.mapDotSprites = null; + GrandExchangeOfferOwnWorldComparator.scrollBarSprites = null; + class451.field3876 = null; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class74.java b/osrs/src/main/java/class74.java index c2fd30bad..ca28c2541 100644 --- a/osrs/src/main/java/class74.java +++ b/osrs/src/main/java/class74.java @@ -1,92 +1,24 @@ -import java.math.BigInteger; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") -public class class74 { - @ObfuscatedName("aw") - static final BigInteger field736; - @ObfuscatedName("ay") - static final BigInteger field737; - - static { - field736 = new BigInteger("10001", 16); - field737 = new BigInteger("837aa9f02cc04c9b343d5266504f7fb5b16a966ed0c040361d86894e88a6f50d1fd0f1e7d8ab3c0d44eff369029a1e6e13a1f0890ba4ac0dc315e76e6f8c38fb9df4c6d04831f525e1dd4b7e1c38cc3c44888a7e9d3ae2120f12877bdd671dffcb137690ab80971e9af17d19644615b37eebd59b204317b2445bcebe6b66949d", 16); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Leu;", - garbageValue = "1051457224" - ) - static class128 method437(int var0) { - class128[] var1 = new class128[]{class128.field1217, class128.field1218, class128.field1215, class128.field1214, class128.field1216}; - class128 var2 = (class128)ClientPreferences.findEnumerated(var1, var0); - if (var2 == null) { - var2 = class128.field1217; - } - - return var2; - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "127" - ) - static final void method438(int var0, int var1, int var2) { - int var3; - for (var3 = 0; var3 < 8; ++var3) { - for (int var4 = 0; var4 < 8; ++var4) { - Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; - } - } - - if (var1 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; - } - } - - if (var2 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; - } - } - - if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; - } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; - } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; - } - - } +import java.math.BigInteger; +@ObfuscatedName("ct") +public class class74 { + @ObfuscatedName("au") + static final BigInteger field742; @ObfuscatedName("ae") + static final BigInteger field741; + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "(Lmt;I)I", - garbageValue = "-1427529511" + descriptor = "[Lui;" ) - static int method439(Widget var0) { - if (var0.type != 11) { - --Interpreter.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - String var1 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var0.method1796(var1); - return 1; - } - } + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "36" - ) - static final int method440(int var0) { - return Math.min(Math.max(var0, 128), 383); + static { + field742 = new BigInteger("10001", 16); + field741 = new BigInteger("9d65aa39691f5fadd6296eeee7726eab566ecc003adda321a1bf18f94cce90d5198fcdf30dca1deef73fa1deb8c1ed0731e3f4712b23ab9f180de4946043ea93a3fef2c0099f69c64d0be204a1415322032e6f60aca9aa2a420c696627b2ed49a7970bdfe1cdcf1446fa65530a3bb0b1573a3effc1086fa29016ff9cc35e8951", 16); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class8.java b/osrs/src/main/java/class8.java index 44806a248..a5d2d6fd3 100644 --- a/osrs/src/main/java/class8.java +++ b/osrs/src/main/java/class8.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("aa") public class class8 { - @ObfuscatedName("aw") - final int field14; - @ObfuscatedName("ay") + @ObfuscatedName("au") final int field15; - @ObfuscatedName("ar") + @ObfuscatedName("ae") + final int field14; + @ObfuscatedName("ao") final String field16; @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Ltm;)V" ) class8(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); } class8(int var1, int var2, String var3) { - this.field14 = var1; - this.field15 = var2; + this.field15 = var1; + this.field14 = var2; this.field16 = var3; } - @ObfuscatedName("aw") - String method22() { - return Integer.toHexString(this.field14) + Integer.toHexString(this.field15) + this.field16; + @ObfuscatedName("au") + String method19() { + return Integer.toHexString(this.field15) + Integer.toHexString(this.field14) + this.field16; } - @ObfuscatedName("ay") - int method23() { - return this.field15; + @ObfuscatedName("ae") + int method20() { + return this.field14; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class85.java b/osrs/src/main/java/class85.java index da65af49a..e1a3cfea7 100644 --- a/osrs/src/main/java/class85.java +++ b/osrs/src/main/java/class85.java @@ -2,160 +2,126 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +import java.awt.*; + +@ObfuscatedName("da") public class class85 { - @ObfuscatedName("ay") + @ObfuscatedName("bk") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("dt") @ObfuscatedSignature( - descriptor = "(Ltc;II)V", - garbageValue = "2138211638" + descriptor = "Luk;" ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - int var3 = 0; - var0.importIndex(); - - byte[] var10000; - int var4; - int var5; - int var6; - for (var4 = 0; var4 < Players.Players_count; ++var4) { - var5 = Players.Players_indices[var4]; - if ((Players.activityFlags[var5] & 1) == 0) { - if (var3 > 0) { - --var3; - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class141.method753(var0); - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - GrandExchangeOfferNameComparator.readPlayerUpdate(var0, var5); - } - } - } - } + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "0" + ) + public static int method470(int var0, int var1, int var2) { + var2 &= 3; + if (var2 == 0) { + return var0; + } else if (var2 == 1) { + return var1; } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_count; ++var4) { - var5 = Players.Players_indices[var4]; - if ((Players.activityFlags[var5] & 1) != 0) { - if (var3 > 0) { - --var3; - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class141.method753(var0); - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - GrandExchangeOfferNameComparator.readPlayerUpdate(var0, var5); - } - } - } + return var2 == 2 ? 7 - var0 : 7 - var1; + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Lto;B)V", + garbageValue = "82" + ) + static final void method471(PacketBuffer var0) { + for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { + int var2 = Players.Players_pendingUpdateIndices[var1]; + Player var3 = Client.players[var2]; + int var4 = var0.readUnsignedByte(); + if ((var4 & 1) != 0) { + var4 += var0.readUnsignedByte() << 8; } - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { - var5 = Players.Players_emptyIndices[var4]; - if ((Players.activityFlags[var5] & 1) != 0) { - if (var3 > 0) { - --var3; - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class141.method753(var0); - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (ObjTypeCustomisation.updateExternalPlayer(var0, var5)) { - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { - var5 = Players.Players_emptyIndices[var4]; - if ((Players.activityFlags[var5] & 1) == 0) { - if (var3 > 0) { - --var3; - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class141.method753(var0); - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (ObjTypeCustomisation.updateExternalPlayer(var0, var5)) { - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - for (var4 = 1; var4 < 2048; ++var4) { - var10000 = Players.activityFlags; - var10000[var4] = (byte)(var10000[var4] >> 1); - Player var7 = Client.players[var4]; - if (var7 != null) { - Players.Players_indices[++Players.Players_count - 1] = var4; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; - } - } - - KeyHandler.method98(var0); - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); - } - } - } + if ((var4 & 32768) != 0) { + var4 += var0.readUnsignedByte() << 16; } + + class53.method294(var0, var2, var3, var4); } + } - @ObfuscatedName("am") + @ObfuscatedName("ir") @ObfuscatedSignature( - descriptor = "(III)Lcx;", - garbageValue = "1077626874" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-67" ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { + class449.clientPreferences.setRoofsHidden(!class449.clientPreferences.getRoofsHidden()); + if (class449.clientPreferences.getRoofsHidden()) { + MouseHandler.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + MouseHandler.addGameMessage(99, "", "Roofs will only be removed selectively"); + } + } + + if (var0.startsWith("zbuf")) { + boolean var1 = HealthBarUpdate.method524(var0.substring(5).trim()) == 1; + class219.client.method149(var1); + Rasterizer3D.method1185(var1); + } + + if (var0.equalsIgnoreCase("z")) { + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("displayfps")) { + class449.clientPreferences.method549(); + } + + if (var0.equalsIgnoreCase("renderself")) { + Client.field386 = !Client.field386; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { + if (var0.equalsIgnoreCase("errortest")) { + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { + Canvas.worldMap.showCoord = !Canvas.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { + class449.clientPreferences.method548(true); + } + + if (var0.equalsIgnoreCase("fpsoff")) { + class449.clientPreferences.method548(false); + } + + if (var0.equalsIgnoreCase("gc")) { + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { + Renderable.method1291(); + } + } + + PacketBufferNode var2 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLIENT_CHEAT, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(var0.length() + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var2); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class89.java b/osrs/src/main/java/class89.java index ff6fa8bb6..07df32da4 100644 --- a/osrs/src/main/java/class89.java +++ b/osrs/src/main/java/class89.java @@ -2,134 +2,51 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") -public enum class89 implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("dl") +public enum class89 implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "Ldl;" ) - field882(0, -1), - @ObfuscatedName("ay") + field884(0, -1), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "Ldl;" ) - field883(1, 1), - @ObfuscatedName("ar") + field881(1, 1), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "Ldl;" ) - field880(2, 7), - @ObfuscatedName("am") + field882(2, 7), + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "Ldl;" ) - field879(3, 8), - @ObfuscatedName("as") + field883(3, 8), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "Ldl;" ) - field881(4, 9); + field880(4, 9); - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lgh;" - ) - static ClanChannel field878; - @ObfuscatedName("aj") + @ObfuscatedName("ai") final int field885; - @ObfuscatedName("ag") - final int field884; + @ObfuscatedName("az") + final int field886; class89(int var3, int var4) { this.field885 = var3; - this.field884 = var4; + this.field886 = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field884; - } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "0" - ) - static final void method482(int var0, int var1, int var2) { - if (class157.cameraX < var0) { - class157.cameraX = (var0 - class157.cameraX) * SecureRandomFuture.cameraMoveToAcceleration / 1000 + class157.cameraX + Client.cameraMoveToSpeed; - if (class157.cameraX > var0) { - class157.cameraX = var0; - } - } - - if (class157.cameraX > var0) { - class157.cameraX -= (class157.cameraX - var0) * SecureRandomFuture.cameraMoveToAcceleration / 1000 + Client.cameraMoveToSpeed; - if (class157.cameraX < var0) { - class157.cameraX = var0; - } - } - - if (class384.cameraY < var1) { - class384.cameraY = (var1 - class384.cameraY) * SecureRandomFuture.cameraMoveToAcceleration / 1000 + class384.cameraY + Client.cameraMoveToSpeed; - if (class384.cameraY > var1) { - class384.cameraY = var1; - } - } - - if (class384.cameraY > var1) { - class384.cameraY -= (class384.cameraY - var1) * SecureRandomFuture.cameraMoveToAcceleration / 1000 + Client.cameraMoveToSpeed; - if (class384.cameraY < var1) { - class384.cameraY = var1; - } - } - - if (SoundSystem.cameraZ < var2) { - SoundSystem.cameraZ = (var2 - SoundSystem.cameraZ) * SecureRandomFuture.cameraMoveToAcceleration / 1000 + SoundSystem.cameraZ + Client.cameraMoveToSpeed; - if (SoundSystem.cameraZ > var2) { - SoundSystem.cameraZ = var2; - } - } - - if (SoundSystem.cameraZ > var2) { - SoundSystem.cameraZ -= (SoundSystem.cameraZ - var2) * SecureRandomFuture.cameraMoveToAcceleration / 1000 + Client.cameraMoveToSpeed; - if (SoundSystem.cameraZ < var2) { - SoundSystem.cameraZ = var2; - } - } - - } - - @ObfuscatedName("it") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2092495072" - ) - static void method483() { - if (Client.field382) { - GrandExchangeOfferNameComparator.addPlayerToScene(class136.localPlayer, false); - } - - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1018323278" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; + return this.field886; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class9.java b/osrs/src/main/java/class9.java index 445a8ec80..2f2fc64d1 100644 --- a/osrs/src/main/java/class9.java +++ b/osrs/src/main/java/class9.java @@ -2,596 +2,721 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ap") -public class class9 implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("af") +public class class9 implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Laf;" ) - public static final class9 field17; - @ObfuscatedName("ay") + public static final class9 field18; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Laf;" ) - public static final class9 field18; - @ObfuscatedName("ar") + public static final class9 field17; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Laf;" ) - static final class9 field20; - @ObfuscatedName("am") + static final class9 field22; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Laf;" ) - static final class9 field19; - @ObfuscatedName("as") + static final class9 field23; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Laf;" ) static final class9 field21; - @ObfuscatedName("aj") - int field24; - @ObfuscatedName("ag") - String field25; + @ObfuscatedName("gq") + static String field20; + @ObfuscatedName("ox") + @ObfuscatedSignature( + descriptor = "Lcz;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("ai") + int field26; @ObfuscatedName("az") - boolean field23; - @ObfuscatedName("av") - boolean field22; + String field27; + @ObfuscatedName("ap") + boolean field25; + @ObfuscatedName("aa") + boolean field24; static { - field17 = new class9(0, "POST", true, true); - field18 = new class9(1, "GET", true, false); - field20 = new class9(2, "PUT", false, true); - field19 = new class9(3, "PATCH", false, true); + field18 = new class9(0, "POST", true, true); + field17 = new class9(1, "GET", true, false); + field22 = new class9(2, "PUT", false, true); + field23 = new class9(3, "PATCH", false, true); field21 = new class9(4, "DELETE", false, true); } class9(int var1, String var2, boolean var3, boolean var4) { - this.field24 = var1; - this.field25 = var2; - this.field23 = var3; - this.field22 = var4; + this.field26 = var1; + this.field27 = var2; + this.field25 = var3; + this.field24 = var4; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "-2119966021" ) - boolean method24() { - return this.field23; + boolean method21() { + return this.field25; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field24; + return this.field26; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "9" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1243672924" ) - public String method25() { - return this.field25; + public String method22() { + return this.field27; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-336603283" + garbageValue = "861678070" ) - boolean method26() { - return this.field22; + boolean method23() { + return this.field24; } - @ObfuscatedName("av") + @ObfuscatedName("ml") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-544781798" + descriptor = "([Lmi;IIIIIIIB)V", + garbageValue = "-33" ) - static int method28(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = VarbitComposition.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - } + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + for (int var8 = 0; var8 < var0.length; ++var8) { + Widget var9 = var0[var8]; + if (var9 != null && var9.parentId == var1 && (var9.method1826() || NewShit.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { + if (var9.isIf3) { + if (class143.isComponentHidden(var9)) { + continue; + } + } else if (var9.type == 0 && var9 != class146.mousedOverWidgetIf1 && class143.isComponentHidden(var9)) { + continue; + } - int var11; - if (var0 == 1300) { - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - return 1; - } else { - --Interpreter.Interpreter_stringStackSize; - return 1; - } - } else { - int var6; - if (var0 == 1301) { - Interpreter.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var4.parent = MouseRecorder.getWidgetChild(var11, var6); - return 1; - } else if (var0 == 1302) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1303) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 1304) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 1305) { - var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - return 1; - } else if (var0 == 1306) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - return 1; - } else if (var0 == 1307) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1309) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else { - int var7; - byte[] var9; - if (var0 != 1350) { - byte var5; - if (var0 == 1351) { - Interpreter.Interpreter_intStackSize -= 2; - var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; - AddRequestTask.Widget_setKey(var4, var5, var9, var10); - return 1; - } else if (var0 == 1352) { - Interpreter.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - Clock.Widget_setKeyRate(var4, var11, var6, var7); - return 1; - } else { - throw new RuntimeException(); + if (var9.type == 11) { + if (var9.method1841(FriendsChat.urlRequester)) { + if (var9.method1834()) { + class218.invalidateWidget(var9); + Login.revalidateWidgetScroll(var9.children, var9, true); } - } else if (var0 == 1353) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Clock.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } else if (var0 == 1354) { - --Interpreter.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - GraphicsObject.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); + + if (var9.field3088 != null) { + ScriptEvent var10 = new ScriptEvent(); + var10.widget = var9; + var10.args = var9.field3088; + Client.scriptEvents.addFirst(var10); } - } else if (var0 == 1355) { - var5 = 10; - GraphicsObject.Widget_setKeyIgnoreHeld(var4, var5); - return 1; - } else { - return 2; } + } else if (var9.type == 12 && var9.method1849()) { + class218.invalidateWidget(var9); + } + + int var26 = var9.x + var6; + int var11 = var7 + var9.y; + int var12; + int var13; + int var14; + int var15; + int var16; + int var17; + int var18; + if (var9.type == 9) { + var16 = var26; + var17 = var11; + var18 = var26 + var9.width; + int var19 = var11 + var9.height; + if (var18 < var26) { + var16 = var18; + var18 = var26; + } + + if (var19 < var11) { + var17 = var19; + var19 = var11; + } + + ++var18; + ++var19; + var12 = var16 > var2 ? var16 : var2; + var13 = var17 > var3 ? var17 : var3; + var14 = var18 < var4 ? var18 : var4; + var15 = var19 < var5 ? var19 : var5; } else { - byte[] var8 = null; - var9 = null; - if (var3) { - Interpreter.Interpreter_intStackSize -= 10; + var16 = var26 + var9.width; + var17 = var11 + var9.height; + var12 = var26 > var2 ? var26 : var2; + var13 = var11 > var3 ? var11 : var3; + var14 = var16 < var4 ? var16 : var4; + var15 = var17 < var5 ? var17 : var5; + } + + if (var9 == Client.clickedWidget) { + Client.field397 = true; + Client.field515 = var26; + Client.field521 = var11; + } - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { + boolean var34 = false; + if (var9.field2969) { + switch(Client.field505) { + case 0: + var34 = true; + case 1: + default: + break; + case 2: + if (Client.field508 == var9.id >>> 16) { + var34 = true; + } + break; + case 3: + if (var9.id == Client.field508) { + var34 = true; } + } + } - if (var7 > 0) { - var8 = new byte[var7 / 2]; - var9 = new byte[var7 / 2]; + if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { + if (var9.isIf3) { + ScriptEvent var27; + if (var9.noClickThrough) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var27.field861) { + var27.remove(); + var27.widget.field2975 = false; + } + } - for (var7 -= 2; var7 >= 0; var7 -= 2) { - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; + class500.method2490(); + if (class159.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + class349.addCancelMenuEntry(); + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var27.field861 && var27.widget.onScroll == var27.args) { + var27.remove(); + } } } - } else { - Interpreter.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; } - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - AddRequestTask.Widget_setKey(var4, var7, var8, var9); - return 1; - } else { - throw new RuntimeException(); + var17 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var17 = MouseHandler.MouseHandler_lastPressedX; + var18 = MouseHandler.MouseHandler_lastPressedY; } - } - } - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "193514493" - ) - static int method29(int var0, Script var1, boolean var2) { - String var3; - if (var0 == 3100) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class415.addGameMessage(0, "", var3); - return 1; - } else if (var0 == 3101) { - Interpreter.Interpreter_intStackSize -= 2; - WorldMapSectionType.performPlayerAnimation(class136.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == 3103) { - if (!Interpreter.field699) { - Interpreter.field698 = true; - } - - return 1; - } else { - int var10; - if (var0 == 3104) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var10 = 0; - if (Skeleton.isNumber(var3)) { - var10 = class306.method1584(var3); - } - PacketBufferNode var15 = class503.getPacketBufferNode(ClientPacket.RESUME_P_COUNTDIALOG, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeInt(var10); - Client.packetWriter.addNode(var15); - return 1; - } else { - PacketBufferNode var12; - if (var0 == 3105) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var12 = class503.getPacketBufferNode(ClientPacket.RESUME_P_NAMEDIALOG, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeByte(var3.length() + 1); - var12.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == 3106) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var12 = class503.getPacketBufferNode(ClientPacket.RESUME_P_STRINGDIALOG, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeByte(var3.length() + 1); - var12.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var12); - return 1; - } else { - String var7; - int var8; - if (var0 == 3107) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class28.method120(var8, var7); - return 1; - } else if (var0 == 3108) { - Interpreter.Interpreter_intStackSize -= 3; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Widget var11 = VarbitComposition.getWidget(var5); - class353.clickWidget(var11, var8, var10); - return 1; - } else if (var0 == 3109) { - Interpreter.Interpreter_intStackSize -= 2; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Widget var14 = var2 ? class36.scriptDotWidget : class351.scriptActiveWidget; - class353.clickWidget(var14, var8, var10); - return 1; - } else if (var0 == 3110) { - class28.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3111) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class150.clientPreferences.getRoofsHidden() ? 1 : 0; - return 1; - } else if (var0 == 3112) { - class150.clientPreferences.setRoofsHidden(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == 3113) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - NPC.openURL(var3, var4, false); - return 1; - } else if (var0 == 3115) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = class503.getPacketBufferNode(ClientPacket.RESUME_P_OBJDIALOG, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(var8); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == 3116) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStackSize -= 2; - var7 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - String var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - if (var7.length() > 500) { - return 1; - } else if (var9.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = class503.getPacketBufferNode(ClientPacket.BUG_REPORT, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + class501.stringCp1252NullTerminatedByteSize(var7) + class501.stringCp1252NullTerminatedByteSize(var9)); - var6.packetBuffer.writeStringCp1252NullTerminated(var9); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - var6.packetBuffer.writeByteNeg(var8); - Client.packetWriter.addNode(var6); - return 1; + boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var35) { + class134.addSceneMenuOptions(var17, var18, var12, var13); } - } else if (var0 == 3117) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3118) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3119) { - Client.field382 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; + } else if (var9.contentType == 1338) { + class348.checkIfMinimapClicked(var9, var26, var11); + } else { + if (var9.contentType == 1400) { + Canvas.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); } - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; + if (!Client.isMenuOpen && var35) { + if (var9.contentType == 1400) { + Canvas.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); + } else { + ClanChannelMember.method778(var9); + } } - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; + boolean var21; + int var23; + if (var34) { + for (int var20 = 0; var20 < var9.field2977.length; ++var20) { + var21 = false; + boolean var22 = false; + if (!var21 && var9.field2977[var20] != null) { + for (var23 = 0; var23 < var9.field2977[var20].length; ++var23) { + boolean var24 = false; + if (var9.field3055 != null) { + var24 = Client.keyHandlerInstance.getKeyPressed(var9.field2977[var20][var23]); + } + + if (class398.method2121(var9.field2977[var20][var23]) || var24) { + var21 = true; + if (var9.field3055 != null && var9.field3055[var20] > Client.cycle) { + break; + } + + byte var25 = var9.field2978[var20][var23]; + if (var25 == 0 || ((var25 & 8) == 0 || !Client.keyHandlerInstance.getKeyPressed(86) && !Client.keyHandlerInstance.getKeyPressed(82) && !Client.keyHandlerInstance.getKeyPressed(81)) && ((var25 & 2) == 0 || Client.keyHandlerInstance.getKeyPressed(86)) && ((var25 & 1) == 0 || Client.keyHandlerInstance.getKeyPressed(82)) && ((var25 & 4) == 0 || Client.keyHandlerInstance.getKeyPressed(81))) { + var22 = true; + break; + } + } + } + } + + if (var22) { + if (var20 < 10) { + class47.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { + InvDefinition.Widget_runOnTargetLeave(); + DirectByteArrayCopier.selectSpell(var9.id, var9.childIndex, HealthBarDefinition.Widget_unpackTargetMask(NewShit.getWidgetFlags(var9)), var9.itemId); + Client.field600 = class300.Widget_getSpellActionName(var9); + if (Client.field600 == null) { + Client.field600 = "null"; + } + + Client.field601 = var9.dataText + MoveSpeed.colorStartTag(16777215); + } + + var23 = var9.field3047[var20]; + if (var9.field3055 == null) { + var9.field3055 = new int[var9.field2977.length]; + } + + if (var9.field3046 == null) { + var9.field3046 = new int[var9.field2977.length]; + } + + if (var23 != 0) { + if (var9.field3055[var20] == 0) { + var9.field3055[var20] = var23 + Client.cycle + var9.field3046[var20]; + } else { + var9.field3055[var20] = var23 + Client.cycle; + } + } else { + var9.field3055[var20] = Integer.MAX_VALUE; + } + } + + if (!var21 && var9.field3055 != null) { + var9.field3055[var20] = 0; + } + } } - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; + if (var9.isIf3) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + var35 = true; + } else { + var35 = false; + } + + boolean var36 = false; + if ((MouseHandler.MouseHandler_currentButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { + var36 = true; + } + + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { + var21 = true; + } + + if (var21) { + class227.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.method1827()) { + if (var21) { + Client.field628.addFirst(new class211(0, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); + } + + if (var36) { + Client.field628.addFirst(new class211(1, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); + } + } + + if (var9.contentType == 1400) { + Canvas.worldMap.method2386(var17, var18, var35 & var36, var35 & var21); + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && class238.method1309(NewShit.getWidgetFlags(var9))) { + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { + Client.field395 = true; + Client.field514 = var26; + Client.field513 = var11; + } + + if (var9.hasListener) { + ScriptEvent var28; + if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseY = Client.mouseWheelRotation; + var28.args = var9.onScroll; + Client.scriptEvents.addFirst(var28); + } + + if (Client.clickedWidget != null || Client.isMenuOpen) { + var21 = false; + var36 = false; + var35 = false; + } + + if (!var9.field2974 && var21) { + var9.field2974 = true; + if (var9.onClick != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; + var28.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var28.args = var9.onClick; + Client.scriptEvents.addFirst(var28); + } + } + + if (var9.field2974 && var36 && var9.onClickRepeat != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onClickRepeat; + Client.scriptEvents.addFirst(var28); + } + + if (var9.field2974 && !var36) { + var9.field2974 = false; + if (var9.onRelease != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onRelease; + Client.field630.addFirst(var28); + } + } + + if (var36 && var9.onHold != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onHold; + Client.scriptEvents.addFirst(var28); + } + + if (!var9.field2975 && var35) { + var9.field2975 = true; + if (var9.onMouseOver != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onMouseOver; + Client.scriptEvents.addFirst(var28); + } + } + + if (var9.field2975 && var35 && var9.onMouseRepeat != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var28); + } + + if (var9.field2975 && !var35) { + var9.field2975 = false; + if (var9.onMouseLeave != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onMouseLeave; + Client.field630.addFirst(var28); + } + } + + if (var9.onTimer != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onTimer; + Client.field629.addFirst(var28); + } + + ScriptEvent var29; + int var37; + int var38; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3041) { + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3041 <= 32) { + label647: + for (var37 = var9.field3041; var37 < Client.changedVarpCount; ++var37) { + var23 = Client.changedVarps[var37 & 31]; + + for (var38 = 0; var38 < var9.varTransmitTriggers.length; ++var38) { + if (var23 == var9.varTransmitTriggers[var38]) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var29); + break label647; + } + } + } + } else { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3041 = Client.changedVarpCount; + } + + if (var9.onInvTransmit != null && Client.changedItemContainersCount > var9.field3042) { + if (var9.invTransmitTriggers != null && Client.changedItemContainersCount - var9.field3042 <= 32) { + label623: + for (var37 = var9.field3042; var37 < Client.changedItemContainersCount; ++var37) { + var23 = Client.changedItemContainers[var37 & 31]; + + for (var38 = 0; var38 < var9.invTransmitTriggers.length; ++var38) { + if (var23 == var9.invTransmitTriggers[var38]) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var29); + break label623; + } + } + } + } else { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3042 = Client.changedItemContainersCount; + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3040) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3040 <= 32) { + label599: + for (var37 = var9.field3040; var37 < Client.changedSkillsCount; ++var37) { + var23 = Client.changedSkills[var37 & 31]; + + for (var38 = 0; var38 < var9.statTransmitTriggers.length; ++var38) { + if (var23 == var9.statTransmitTriggers[var38]) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var29); + break label599; + } + } + } + } else { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3040 = Client.changedSkillsCount; + } + + if (Client.chatCycle > var9.field3043 && var9.onChatTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field518 > var9.field3043 && var9.onFriendTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field524 > var9.field3043 && var9.onClanTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field511 > var9.field3043 && var9.field3082 != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.field3082; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field517 > var9.field3043 && var9.field3090 != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.field3090; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field529 > var9.field3043 && var9.onStockTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field525 > var9.field3043 && var9.field3081 != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.field3081; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field528 > var9.field3043 && var9.onMiscTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3043 = Client.cycleCntr; + if (var9.onKey != null) { + for (var37 = 0; var37 < Client.field532; ++var37) { + ScriptEvent var30 = new ScriptEvent(); + var30.widget = var9; + var30.keyTyped = Client.field581[var37]; + var30.keyPressed = Client.field580[var37]; + var30.args = var9.onKey; + Client.scriptEvents.addFirst(var30); + } + } + + ScriptEvent var31; + int[] var39; + if (var9.field3089 != null) { + var39 = Client.keyHandlerInstance.method1109(); + + for (var23 = 0; var23 < var39.length; ++var23) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = var39[var23]; + var31.args = var9.field3089; + Client.scriptEvents.addFirst(var31); + } + } + + if (var9.field3079 != null) { + var39 = Client.keyHandlerInstance.method1110(); + + for (var23 = 0; var23 < var39.length; ++var23) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = var39[var23]; + var31.args = var9.field3079; + Client.scriptEvents.addFirst(var31); + } + } + } } - return 1; - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; - return 1; - } else if (var0 == 3125) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3126) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3127) { - class335.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == 3128) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class144.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == 3129) { - Interpreter.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3132) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.canvasWidth; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.canvasHeight; - return 1; - } else if (var0 == 3133) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3134) { - return 1; - } else if (var0 == 3135) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field503 = 3; - Client.field502 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field503 = 2; - Client.field502 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field503 = 0; - return 1; - } else if (var0 == 3139) { - Client.field503 = 1; - return 1; - } else if (var0 == 3140) { - Client.field503 = 3; - Client.field502 = var2 ? class36.scriptDotWidget.id * -232044627 * -1780632539 : class351.scriptActiveWidget.id * -232044627 * -1780632539; - return 1; - } else { - boolean var13; - if (var0 == 3141) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class150.clientPreferences.setIsUsernameHidden(var13); - return 1; - } else if (var0 == 3142) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class150.clientPreferences.getIsUsernameHidden() ? 1 : 0; - return 1; - } else if (var0 == 3143) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var13; - if (!var13) { - class150.clientPreferences.setUsernameToRemember(""); + if (!var9.isIf3) { + if (Client.clickedWidget != null || Client.isMenuOpen) { + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + if (var9.mouseOverRedirect >= 0) { + class146.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + class146.mousedOverWidgetIf1 = var9; + } } - return 1; - } else if (var0 == 3144) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; - return 1; - } else if (var0 == 3145) { - return 1; - } else if (var0 == 3146) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class150.clientPreferences.getTitleMusicDisabled(!var13); - return 1; - } else if (var0 == 3147) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class150.clientPreferences.getTitleMusicDisabled() ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanChannel.method855(); - return 1; - } else if (var0 == 3155) { - --Interpreter.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3156) { - return 1; - } else if (var0 == 3157) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3161) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3162) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3163) { - --Interpreter.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3165) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3166) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3167) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3168) { - Interpreter.Interpreter_intStackSize -= 2; - 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] = ""; - 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] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3169) { - return 1; - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3172) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3173) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3174) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --Interpreter.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --Interpreter.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3181) { - UrlRequester.method650(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 3182) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = JagexCache.method901(); - return 1; - } else if (var0 == 3189) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class11.method41(var8); - return 1; - } else { - return 2; + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + class343.field3147 = var9; + } + + if (var9.scrollHeight > var9.height) { + SongTask.method2139(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { + updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); + if (var9.children != null) { + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var32 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var32 != null) { + if (var32.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (ScriptEvent var33 = (ScriptEvent)Client.scriptEvents.last(); var33 != null; var33 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var33.field861) { + var33.remove(); + var33.widget.field2975 = false; + } + } + + if (class159.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + class349.addCancelMenuEntry(); + } + } + + LoginScreenAnimation.updateRootInterface(var32.group, var12, var13, var14, var15, var26, var11); + } } } } } } + + } + + @ObfuscatedName("ox") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-1162" + ) + static void method26() { + class449.clientPreferences.method563(Client.param21); } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class90.java b/osrs/src/main/java/class90.java index d49dedc1c..91c9893fc 100644 --- a/osrs/src/main/java/class90.java +++ b/osrs/src/main/java/class90.java @@ -2,89 +2,85 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") -public enum class90 implements class372 { - @ObfuscatedName("aw") +@ObfuscatedName("dk") +public enum class90 implements class371 { + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Ldk;" ) - field892(0, -1), - @ObfuscatedName("ay") + field893(0, -1), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Ldk;" ) - field893(1, 2), - @ObfuscatedName("ar") + field889(1, 2), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Ldk;" ) - field890(2, 3), - @ObfuscatedName("am") + field891(2, 3), + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Ldk;" ) - field889(3, 4), - @ObfuscatedName("as") + field892(3, 4), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Ldk;" ) - field891(4, 5), - @ObfuscatedName("aj") + field888(4, 5), + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Ldk;" ) - field888(5, 6); + field890(5, 6); - @ObfuscatedName("aq") - static int field886; - @ObfuscatedName("lu") - static int field887; - @ObfuscatedName("ag") - final int field894; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lrb;" + ) + static Bounds field887; @ObfuscatedName("az") final int field895; + @ObfuscatedName("ap") + final int field894; class90(int var3, int var4) { - this.field894 = var3; - this.field895 = var4; + this.field895 = var3; + this.field894 = var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1644350448" + descriptor = "(B)I", + garbageValue = "41" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field895; + return this.field894; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Lhb;", - garbageValue = "-1281408867" + descriptor = "(IB)Lhw;", + garbageValue = "0" ) - @Export("getObjectDefinition") - public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectComposition(); + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); + var1 = new NPCComposition(); var1.id = var0; if (var2 != null) { var1.decode(new Buffer(var2)); } var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); return var1; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class92.java b/osrs/src/main/java/class92.java index 6c5ec2419..ee3a9f5dd 100644 --- a/osrs/src/main/java/class92.java +++ b/osrs/src/main/java/class92.java @@ -2,501 +2,193 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("dz") public class class92 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Ldm;" - ) - static final class92 field937; - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field939; - @ObfuscatedName("ar") + static final class92 field940; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field932; - @ObfuscatedName("am") + static final class92 field930; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field929; - @ObfuscatedName("as") + static final class92 field935; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field933; - @ObfuscatedName("aj") + static final class92 field939; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) static final class92 field928; - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field926; + static final class92 field932; @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field940; - @ObfuscatedName("av") + static final class92 field941; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) static final class92 field936; - @ObfuscatedName("ap") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field930; - @ObfuscatedName("aq") + static final class92 field926; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) static final class92 field931; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field934; - @ObfuscatedName("ah") + static final class92 field929; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field927; - @ObfuscatedName("ax") + static final class92 field937; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field938; - @ObfuscatedName("aa") + static final class92 field933; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field925; - @ObfuscatedName("au") + static final class92 field934; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldz;" ) - static final class92 field935; + static final class92 field938; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Ldz;" + ) + static final class92 field927; static { - field937 = new class92(); + field940 = new class92(); + field930 = new class92(); + field935 = new class92(); field939 = new class92(); - field932 = new class92(); - field929 = new class92(); - field933 = new class92(); field928 = new class92(); - field926 = new class92(); - field940 = new class92(); + field932 = new class92(); + field941 = new class92(); field936 = new class92(); - field930 = new class92(); + field926 = new class92(); field931 = new class92(); + field929 = new class92(); + field937 = new class92(); + field933 = new class92(); field934 = new class92(); - field927 = new class92(); field938 = new class92(); - field925 = new class92(); - field935 = new class92(); + field927 = new class92(); } class92() { } - @ObfuscatedName("ba") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILdc;ZI)I", - garbageValue = "-1773939440" - ) - static int method505(int var0, Script var1, boolean var2) { - if (var0 == 3600) { - if (class177.friendSystem.friendListStatus == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; - } else if (class177.friendSystem.friendListStatus == 1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class177.friendSystem.friendsList.getSize(); + descriptor = "(II)Lmi;", + garbageValue = "412092455" + ) + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; + int var2 = var0 & 65535; + if (PacketBufferNode.Widget_interfaceComponents[var1] == null || PacketBufferNode.Widget_interfaceComponents[var1][var2] == null) { + boolean var3 = ModeWhere.loadInterface(var1); + if (!var3) { + return null; } + } - return 1; - } else { - int var3; - if (var0 == 3601) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class177.friendSystem.method406() && var3 >= 0 && var3 < class177.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)class177.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } + return PacketBufferNode.Widget_interfaceComponents[var1][var2]; + } - return 1; - } else if (var0 == 3602) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class177.friendSystem.method406() && var3 >= 0 && var3 < class177.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class177.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "(Ldf;ZB)V", + garbageValue = "1" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { + var0.isUnanimated = false; + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { + var0.isUnanimated = true; + } - return 1; - } else if (var0 == 3603) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class177.friendSystem.method406() && var3 >= 0 && var3 < class177.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class177.friendSystem.friendsList.get(var3)).rank; + int var2 = var0.x >> 7; + int var3 = var0.y >> 7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + long var4 = FontName.calculateTag(0, 0, 0, false, var0.index); + if (var0.attachedModel != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = class18.getTileHeight(var0.x, var0.y, HealthBar.Client_plane); + var0.playerCycle = Client.cycle; + class130.scene.addNullableObject(HealthBar.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - String var5; - if (var0 == 3604) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - int var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - WorldMapData_0.setFriendsRank(var5, var9); - return 1; - } else if (var0 == 3605) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class177.friendSystem.addFriend(var5); - return 1; - } else if (var0 == 3606) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class177.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == 3607) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class177.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == 3608) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - boolean var6 = true; - class177.friendSystem.removeIgnore(var5, var6); - return 1; - } else if (var0 == 3609) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var5 = ClanMate.method2185(var5); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class177.friendSystem.isFriended(new Username(var5, class457.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == 3611) { - if (Canvas.friendsChat != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Canvas.friendsChat.name; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3612) { - if (Canvas.friendsChat != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendsChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3613) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Canvas.friendsChat != null && var3 < Canvas.friendsChat.getSize()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Canvas.friendsChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3614) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Canvas.friendsChat != null && var3 < Canvas.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Canvas.friendsChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3615) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Canvas.friendsChat != null && var3 < Canvas.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Canvas.friendsChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3616) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendsChat != null ? Canvas.friendsChat.minKick : 0; - return 1; - } else if (var0 == 3617) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - PacketBufferNode.clanKickUser(var5); - return 1; - } else if (var0 == 3618) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendsChat != null ? Canvas.friendsChat.rank * -1577825767 * -1945538007 : 0; - return 1; - } else if (var0 == 3619) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class152.Clan_joinChat(var5); - return 1; - } else if (var0 == 3620) { - Skeleton.Clan_leaveChat(); - return 1; - } else if (var0 == 3621) { - if (!class177.friendSystem.method406()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class177.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == 3622) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class177.friendSystem.method406() && var3 >= 0 && var3 < class177.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)class177.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3623) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var5 = ClanMate.method2185(var5); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class177.friendSystem.isIgnored(new Username(var5, class457.loginType)) ? 1 : 0; - return 1; - } else if (var0 == 3624) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Canvas.friendsChat != null && var3 < Canvas.friendsChat.getSize() && Canvas.friendsChat.get(var3).getUsername().equals(class136.localPlayer.username)) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3625) { - if (Canvas.friendsChat != null && Canvas.friendsChat.owner != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Canvas.friendsChat.owner; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3626) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Canvas.friendsChat != null && var3 < Canvas.friendsChat.getSize() && ((ClanMate)Canvas.friendsChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != 3627) { - if (var0 == 3628) { - class177.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - class177.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - class177.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - class177.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (Canvas.friendsChat != null) { - Canvas.friendsChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (Canvas.friendsChat != null) { - Canvas.friendsChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class177.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Canvas.friendsChat != null) { - Canvas.friendsChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } else { - return 2; + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { + return; } - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Canvas.friendsChat != null && var3 < Canvas.friendsChat.getSize() && ((ClanMate)Canvas.friendsChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; } - return 1; + var0.tileHeight = class18.getTileHeight(var0.x, var0.y, HealthBar.Client_plane); + var0.playerCycle = Client.cycle; + class130.scene.drawEntity(HealthBar.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); } } } - } - @ObfuscatedName("gf") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1477325147" - ) - static final void method504() { - Scene.Scene_isLowDetail = false; - Client.isLowDetail = false; } - @ObfuscatedName("ms") + @ObfuscatedName("ns") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1637635386" + descriptor = "(Lds;ZI)V", + garbageValue = "-1838716449" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (Login.loadInterface(var0)) { - Widget[] var1 = ArchiveLoader.Widget_interfaceComponents[var0]; + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { + Skeleton.method1232(var2); + } - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } - } + class339.method1865(var2); + Widget var4 = getWidget(var3); + if (var4 != null) { + class218.invalidateWidget(var4); + } + if (Client.rootInterface != -1) { + class385.runIntfCloseListeners(Client.rootInterface, 1); } + } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/class93.java b/osrs/src/main/java/class93.java index 68390e73c..4a408e3f0 100644 --- a/osrs/src/main/java/class93.java +++ b/osrs/src/main/java/class93.java @@ -1,30 +1,398 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +@ObfuscatedName("dw") public class class93 { - @ObfuscatedName("an") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-263879451" + descriptor = "(ILdh;ZI)I", + garbageValue = "36436435" ) - static int method507() { - return Login.loginIndex; - } + static int method504(int var0, Script var1, boolean var2) { + int var4 = -1; + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + var3 = class92.getWidget(var4); + } else { + var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + } - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1274720283" - ) - static final void method508() { - if (Client.logoutTimer > 0) { - WorldMapScaleHandler.logOut(); + int var10; + if (var0 == 1100) { + SoundCache.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + int var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + if (var3.type == 12) { + class329 var7 = var3.method1844(); + if (var7 != null && var7.method1740(var10, var6)) { + class218.invalidateWidget(var3); + } + } else { + var3.scrollX = var10; + if (var3.scrollX > var3.scrollWidth - var3.width) { + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { + var3.scrollX = 0; + } + + var3.scrollY = var6; + if (var3.scrollY > var3.scrollHeight - var3.height) { + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { + var3.scrollY = 0; + } + + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1101) { + var3.color = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1102) { + var3.fill = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1103) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1104) { + var3.lineWid = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1105) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1106) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1107) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1108) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1109) { + SoundCache.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 5]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1110) { + var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var10 != var3.sequenceId) { + var3.sequenceId = var10; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1111) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1112) { + String var14 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + if (!var14.equals(var3.text)) { + var3.text = var14; + class218.invalidateWidget(var3); + } + + return 1; } else { - Client.timer.method2113(); - class129.updateGameState(40); - UserComparator5.field1175 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); + class329 var11; + if (var0 == 1113) { + var3.fontId = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + if (var3.type == 12) { + var11 = var3.method1844(); + if (var11 != null) { + var11.method1747(); + } + } + + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1114) { + SoundCache.Interpreter_intStackSize -= 3; + if (var3.type == 12) { + var11 = var3.method1844(); + if (var11 != null) { + var11.method1741(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + var11.method1742(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]); + } + } else { + var3.textXAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; + } + + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1115) { + var3.textShadowed = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1116) { + var3.outline = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1117) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1118) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1119) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1120) { + SoundCache.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; + class218.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { + Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; + } else if (var0 == 1121) { + class466.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1123) { + var3.color2 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1125) { + var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; + FillMode var12 = (FillMode)KeyHandler.findEnumerated(MidiPcmStream.FillMode_values(), var10); + if (var12 != null) { + var3.fillMode = var12; + class218.invalidateWidget(var3); + } + + return 1; + } else { + boolean var5; + if (var0 == 1126) { + var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + var3.field2962 = var5; + return 1; + } else if (var0 == 1127) { + var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else if (var0 == 1129) { + var3.field3091 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; + class218.invalidateWidget(var3); + return 1; + } else if (var0 == 1130) { + var3.method1828(Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize], FriendsChat.urlRequester, UrlRequester.method654()); + return 1; + } else if (var0 == 1131) { + SoundCache.Interpreter_intStackSize -= 2; + var3.method1831(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == 1132) { + var3.method1832(Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + return 1; + } else { + class324 var13; + if (var0 == 1133) { + --SoundCache.Interpreter_intStackSize; + var13 = var3.method1845(); + if (var13 != null) { + var13.field2892 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1134) { + --SoundCache.Interpreter_intStackSize; + var13 = var3.method1845(); + if (var13 != null) { + var13.field2890 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1135) { + --class137.Interpreter_stringStackSize; + var11 = var3.method1844(); + if (var11 != null) { + var3.text2 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; + } + + return 1; + } else if (var0 == 1136) { + --SoundCache.Interpreter_intStackSize; + var13 = var3.method1845(); + if (var13 != null) { + var13.field2891 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1137) { + --SoundCache.Interpreter_intStackSize; + var11 = var3.method1844(); + if (var11 != null && var11.method1737(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize])) { + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1138) { + --SoundCache.Interpreter_intStackSize; + var11 = var3.method1844(); + if (var11 != null && var11.method1738(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize])) { + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1139) { + --SoundCache.Interpreter_intStackSize; + var11 = var3.method1844(); + if (var11 != null && var11.method1739(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize])) { + class218.invalidateWidget(var3); + } + + return 1; + } else { + class329 var9; + if (var0 == 1140) { + var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + Client.field423.method1090(); + var9 = var3.method1844(); + if (var9 != null && var9.method1731(var5)) { + if (var5) { + Client.field423.method1088(var3); + } + + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1141) { + var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; + if (!var5 && Client.field423.method1089() == var3) { + Client.field423.method1090(); + class218.invalidateWidget(var3); + } + + var9 = var3.method1844(); + if (var9 != null) { + var9.method1732(var5); + } + + return 1; + } else if (var0 == 1142) { + SoundCache.Interpreter_intStackSize -= 2; + var11 = var3.method1844(); + if (var11 != null && var11.method1755(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1])) { + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1143) { + --SoundCache.Interpreter_intStackSize; + var11 = var3.method1844(); + if (var11 != null && var11.method1755(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize])) { + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1144) { + --SoundCache.Interpreter_intStackSize; + var11 = var3.method1844(); + if (var11 != null) { + var11.method1744(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); + class218.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1145) { + --SoundCache.Interpreter_intStackSize; + var11 = var3.method1844(); + if (var11 != null) { + var11.method1743(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); + } + + return 1; + } else if (var0 == 1146) { + --SoundCache.Interpreter_intStackSize; + var11 = var3.method1844(); + if (var11 != null) { + var11.method1746(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); + } + + return 1; + } else if (var0 == 1147) { + --SoundCache.Interpreter_intStackSize; + var11 = var3.method1844(); + if (var11 != null) { + var11.method1745(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); + class218.invalidateWidget(var3); + } + + return 1; + } else { + class27 var8; + if (var0 == 1148) { + SoundCache.Interpreter_intStackSize -= 2; + var8 = var3.method1846(); + if (var8 != null) { + var8.method96(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + } + + return 1; + } else if (var0 == 1149) { + SoundCache.Interpreter_intStackSize -= 2; + var8 = var3.method1846(); + if (var8 != null) { + var8.method97((char)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); + } + + return 1; + } else if (var0 == 1150) { + var3.method1829(Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize], FriendsChat.urlRequester); + return 1; + } else { + return 2; + } + } + } + } + } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/com/jagex/oldscape/pub/OAuthApi.java b/osrs/src/main/java/com/jagex/oldscape/pub/OAuthApi.java index 7fadf8a7f..110f817db 100644 --- a/osrs/src/main/java/com/jagex/oldscape/pub/OAuthApi.java +++ b/osrs/src/main/java/com/jagex/oldscape/pub/OAuthApi.java @@ -4,4 +4,4 @@ @Implements("OAuthApi") public interface OAuthApi { -} +} \ No newline at end of file diff --git a/osrs/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java b/osrs/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java index c632131e1..e0f13adeb 100644 --- a/osrs/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java +++ b/osrs/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java @@ -1,11 +1,17 @@ package com.jagex.oldscape.pub; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; + import java.net.URL; import java.util.Map; import java.util.concurrent.Future; -import net.runelite.mapping.Implements; -@Implements("OtlTokenRequester") +@Implements("com/jagex/oldscape/pub/OtlTokenRequester") +@ObfuscatedName("com/jagex/oldscape/pub/OtlTokenRequester") public interface OtlTokenRequester { + @Export("request") + @ObfuscatedName("request") Future request(String var1, URL var2, Map var3, String var4); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/com/jagex/oldscape/pub/RefreshAccessTokenRequester.java b/osrs/src/main/java/com/jagex/oldscape/pub/RefreshAccessTokenRequester.java index c0cd58fda..62c006bd3 100644 --- a/osrs/src/main/java/com/jagex/oldscape/pub/RefreshAccessTokenRequester.java +++ b/osrs/src/main/java/com/jagex/oldscape/pub/RefreshAccessTokenRequester.java @@ -1,13 +1,14 @@ package com.jagex.oldscape.pub; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; + import java.net.URL; import java.util.Map; import java.util.concurrent.Future; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; @Implements("com/jagex/oldscape/pub/RefreshAccessTokenRequester") @ObfuscatedName("com/jagex/oldscape/pub/RefreshAccessTokenRequester") public interface RefreshAccessTokenRequester { Future request(String var1, URL var2, Map var3, String var4); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/com/jagex/oldscape/pub/RefreshAccessTokenResponse.java b/osrs/src/main/java/com/jagex/oldscape/pub/RefreshAccessTokenResponse.java index 4dfa02bf4..a9e983a90 100644 --- a/osrs/src/main/java/com/jagex/oldscape/pub/RefreshAccessTokenResponse.java +++ b/osrs/src/main/java/com/jagex/oldscape/pub/RefreshAccessTokenResponse.java @@ -1,14 +1,21 @@ package com.jagex.oldscape.pub; +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @Implements("com/jagex/oldscape/pub/RefreshAccessTokenResponse") @ObfuscatedName("com/jagex/oldscape/pub/RefreshAccessTokenResponse") public interface RefreshAccessTokenResponse { + @Export("isSuccess") + @ObfuscatedName("isSuccess") boolean isSuccess(); + @Export("getAccessToken") + @ObfuscatedName("getAccessToken") String getAccessToken(); + @Export("getRefreshToken") + @ObfuscatedName("getRefreshToken") String getRefreshToken(); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java b/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java index 6e871de69..5eec54d38 100644 --- a/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java +++ b/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java @@ -5,543 +5,543 @@ public class ObfuscatedClassMap extends HashMap { public static ObfuscatedClassMap INSTANCE = new ObfuscatedClassMap(); static { - INSTANCE.put("AABB", "if"); - INSTANCE.put("AbstractArchive", "nd"); - INSTANCE.put("AbstractByteArrayCopier", "me"); - INSTANCE.put("AbstractFont", "pq"); - INSTANCE.put("AbstractRasterProvider", "uk"); - INSTANCE.put("AbstractSocket", "qh"); - INSTANCE.put("AbstractSound", "cm"); + INSTANCE.put("AABB", "ip"); + INSTANCE.put("AbstractArchive", "nu"); + INSTANCE.put("AbstractByteArrayCopier", "ma"); + INSTANCE.put("AbstractFont", "pk"); + INSTANCE.put("AbstractRasterProvider", "uq"); + INSTANCE.put("AbstractSocket", "qi"); + INSTANCE.put("AbstractSound", "cp"); INSTANCE.put("AbstractUserComparator", "qz"); - INSTANCE.put("AbstractWorldMapData", "km"); - INSTANCE.put("AbstractWorldMapIcon", "kv"); - INSTANCE.put("AccessFile", "tn"); - INSTANCE.put("Actor", "dx"); - INSTANCE.put("AddRequestTask", "pe"); - INSTANCE.put("Animation", "im"); - INSTANCE.put("ApproximateRouteStrategy", "co"); - INSTANCE.put("Archive", "ny"); - INSTANCE.put("ArchiveDisk", "rg"); - INSTANCE.put("ArchiveDiskAction", "nn"); - INSTANCE.put("ArchiveDiskActionHandler", "nl"); - INSTANCE.put("ArchiveLoader", "dr"); - INSTANCE.put("AttackOption", "dw"); - INSTANCE.put("AudioFilter", "cn"); - INSTANCE.put("BoundaryObject", "je"); - INSTANCE.put("Bounds", "rk"); - INSTANCE.put("Buddy", "qa"); - INSTANCE.put("BuddyRankComparator", "ea"); - INSTANCE.put("Buffer", "ty"); - INSTANCE.put("BufferedFile", "ts"); - INSTANCE.put("BufferedNetSocket", "qq"); - INSTANCE.put("BufferedSink", "rh"); - INSTANCE.put("BufferedSource", "qy"); - INSTANCE.put("ByteArrayPool", "pk"); - INSTANCE.put("BZip2Decompressor", "tj"); - INSTANCE.put("BZip2State", "tb"); - INSTANCE.put("Calendar", "md"); - INSTANCE.put("Canvas", "af"); - INSTANCE.put("ChatChannel", "dg"); - INSTANCE.put("ClanChannel", "gh"); - INSTANCE.put("ClanChannelMember", "fv"); - INSTANCE.put("ClanMate", "qg"); - INSTANCE.put("ClanSettings", "fx"); - INSTANCE.put("class0", "aw"); - INSTANCE.put("class1", "ay"); - INSTANCE.put("class10", "aq"); - INSTANCE.put("class101", "dl"); - INSTANCE.put("class102", "db"); - INSTANCE.put("class105", "em"); - INSTANCE.put("class106", "ec"); - INSTANCE.put("class108", "er"); - INSTANCE.put("class11", "at"); - INSTANCE.put("class113", "eh"); - INSTANCE.put("class12", "ah"); - INSTANCE.put("class124", "ef"); - INSTANCE.put("class125", "ev"); - INSTANCE.put("class126", "ez"); - INSTANCE.put("class127", "ek"); - INSTANCE.put("class128", "eu"); + INSTANCE.put("AbstractWorldMapData", "ke"); + INSTANCE.put("AbstractWorldMapIcon", "kp"); + INSTANCE.put("AccessFile", "tu"); + INSTANCE.put("Actor", "dr"); + INSTANCE.put("AddRequestTask", "pf"); + INSTANCE.put("Animation", "ia"); + INSTANCE.put("ApproximateRouteStrategy", "cl"); + INSTANCE.put("Archive", "nk"); + INSTANCE.put("ArchiveDisk", "ru"); + INSTANCE.put("ArchiveDiskAction", "nw"); + INSTANCE.put("ArchiveDiskActionHandler", "ny"); + INSTANCE.put("ArchiveLoader", "dg"); + INSTANCE.put("AttackOption", "dc"); + INSTANCE.put("AudioFilter", "cr"); + INSTANCE.put("BoundaryObject", "jo"); + INSTANCE.put("Bounds", "rb"); + INSTANCE.put("Buddy", "qb"); + INSTANCE.put("BuddyRankComparator", "ek"); + INSTANCE.put("Buffer", "tm"); + INSTANCE.put("BufferedFile", "td"); + INSTANCE.put("BufferedNetSocket", "qy"); + INSTANCE.put("BufferedSink", "qh"); + INSTANCE.put("BufferedSource", "qa"); + INSTANCE.put("ByteArrayPool", "pb"); + INSTANCE.put("BZip2Decompressor", "tt"); + INSTANCE.put("BZip2State", "te"); + INSTANCE.put("Calendar", "mo"); + INSTANCE.put("Canvas", "av"); + INSTANCE.put("ChatChannel", "di"); + INSTANCE.put("ClanChannel", "go"); + INSTANCE.put("ClanChannelMember", "fu"); + INSTANCE.put("ClanMate", "qx"); + INSTANCE.put("ClanSettings", "fi"); + INSTANCE.put("class0", "au"); + INSTANCE.put("class1", "ae"); + INSTANCE.put("class10", "ad"); + INSTANCE.put("class101", "dq"); + INSTANCE.put("class102", "de"); + INSTANCE.put("class105", "eh"); + INSTANCE.put("class106", "ey"); + INSTANCE.put("class108", "eq"); + INSTANCE.put("class11", "aq"); + INSTANCE.put("class113", "ez"); + INSTANCE.put("class12", "al"); + INSTANCE.put("class124", "eu"); + INSTANCE.put("class125", "eg"); + INSTANCE.put("class126", "ex"); + INSTANCE.put("class127", "eo"); + INSTANCE.put("class128", "ew"); INSTANCE.put("class129", "ep"); - INSTANCE.put("class13", "ax"); - INSTANCE.put("class130", "fm"); - INSTANCE.put("class131", "fa"); - INSTANCE.put("class132", "fg"); - INSTANCE.put("class133", "fq"); - INSTANCE.put("class134", "fy"); - INSTANCE.put("class135", "fw"); - INSTANCE.put("class136", "fp"); - INSTANCE.put("class137", "fz"); - INSTANCE.put("class138", "fj"); - INSTANCE.put("class139", "fb"); - INSTANCE.put("class14", "aa"); - INSTANCE.put("class140", "fl"); - INSTANCE.put("class141", "fd"); - INSTANCE.put("class142", "fh"); - INSTANCE.put("class143", "fc"); - INSTANCE.put("class144", "fu"); - INSTANCE.put("class146", "fr"); - INSTANCE.put("class147", "fs"); - INSTANCE.put("class148", "fn"); - INSTANCE.put("class149", "ff"); - INSTANCE.put("class15", "au"); + INSTANCE.put("class13", "an"); + INSTANCE.put("class130", "fh"); + INSTANCE.put("class131", "ft"); + INSTANCE.put("class132", "fs"); + INSTANCE.put("class133", "fl"); + INSTANCE.put("class134", "fe"); + INSTANCE.put("class135", "fd"); + INSTANCE.put("class136", "fj"); + INSTANCE.put("class137", "fv"); + INSTANCE.put("class138", "fb"); + INSTANCE.put("class139", "fr"); + INSTANCE.put("class14", "ar"); + INSTANCE.put("class140", "fq"); + INSTANCE.put("class141", "fp"); + INSTANCE.put("class142", "fg"); + INSTANCE.put("class143", "fo"); + INSTANCE.put("class144", "fz"); + INSTANCE.put("class146", "fn"); + INSTANCE.put("class147", "fx"); + INSTANCE.put("class148", "ff"); + INSTANCE.put("class149", "fc"); + INSTANCE.put("class15", "ab"); INSTANCE.put("class150", "fk"); - INSTANCE.put("class151", "ft"); - INSTANCE.put("class152", "fe"); - INSTANCE.put("class153", "fo"); - INSTANCE.put("class155", "fi"); - INSTANCE.put("class156", "gc"); - INSTANCE.put("class157", "gp"); - INSTANCE.put("class158", "ga"); - INSTANCE.put("class159", "gg"); - INSTANCE.put("class16", "ae"); - INSTANCE.put("class160", "gs"); - INSTANCE.put("class161", "ge"); - INSTANCE.put("class162", "go"); - INSTANCE.put("class164", "gj"); - INSTANCE.put("class165", "gm"); - INSTANCE.put("class166", "gx"); - INSTANCE.put("class167", "gr"); - INSTANCE.put("class169", "gt"); - INSTANCE.put("class17", "ab"); - INSTANCE.put("class170", "gq"); - INSTANCE.put("class172", "gl"); - INSTANCE.put("class174", "gf"); - INSTANCE.put("class176", "gz"); - INSTANCE.put("class177", "gi"); - INSTANCE.put("class178", "gb"); - INSTANCE.put("class18", "ad"); - INSTANCE.put("class181", "gw"); - INSTANCE.put("class184", "hp"); - INSTANCE.put("class19", "ao"); - INSTANCE.put("class191", "hr"); - INSTANCE.put("class197", "hd"); - INSTANCE.put("class2", "ar"); - INSTANCE.put("class20", "ac"); - INSTANCE.put("class200", "hy"); - INSTANCE.put("class203", "hu"); - INSTANCE.put("class210", "is"); - INSTANCE.put("class211", "iw"); - INSTANCE.put("class212", "iy"); - INSTANCE.put("class213", "ih"); - INSTANCE.put("class215", "ir"); - INSTANCE.put("class217", "iq"); - INSTANCE.put("class219", "ib"); - INSTANCE.put("class220", "id"); - INSTANCE.put("class228", "iv"); - INSTANCE.put("class229", "ii"); - INSTANCE.put("class239", "jh"); - INSTANCE.put("class244", "jw"); - INSTANCE.put("class246", "ji"); - INSTANCE.put("class253", "jz"); - INSTANCE.put("class26", "bd"); - INSTANCE.put("class261", "kd"); - INSTANCE.put("class27", "bb"); - INSTANCE.put("class271", "kx"); - INSTANCE.put("class272", "ku"); - INSTANCE.put("class273", "kq"); - INSTANCE.put("class28", "bn"); - INSTANCE.put("class281", "ks"); - INSTANCE.put("class282", "kj"); - INSTANCE.put("class283", "kc"); - INSTANCE.put("class284", "kb"); - INSTANCE.put("class285", "kh"); - INSTANCE.put("class29", "ba"); - INSTANCE.put("class292", "lu"); - INSTANCE.put("class293", "le"); - INSTANCE.put("class294", "lh"); - INSTANCE.put("class3", "am"); - INSTANCE.put("class30", "bf"); - INSTANCE.put("class300", "ln"); - INSTANCE.put("class301", "lt"); - INSTANCE.put("class302", "lp"); - INSTANCE.put("class303", "lf"); - INSTANCE.put("class304", "ly"); - INSTANCE.put("class306", "lq"); - INSTANCE.put("class309", "lg"); - INSTANCE.put("class31", "bs"); - INSTANCE.put("class310", "ll"); - INSTANCE.put("class312", "mn"); - INSTANCE.put("class313", "mf"); - INSTANCE.put("class317", "mh"); - INSTANCE.put("class319", "mx"); - INSTANCE.put("class324", "mv"); - INSTANCE.put("class325", "my"); - INSTANCE.put("class326", "ms"); - INSTANCE.put("class327", "mc"); - INSTANCE.put("class328", "mz"); - INSTANCE.put("class33", "bv"); - INSTANCE.put("class330", "mo"); - INSTANCE.put("class331", "mg"); - INSTANCE.put("class333", "mk"); - INSTANCE.put("class335", "ml"); - INSTANCE.put("class339", "nf"); - INSTANCE.put("class340", "nb"); - INSTANCE.put("class343", "nv"); - INSTANCE.put("class344", "na"); - INSTANCE.put("class345", "ns"); - INSTANCE.put("class346", "nc"); - INSTANCE.put("class350", "nm"); - INSTANCE.put("class351", "nt"); - INSTANCE.put("class353", "nr"); - INSTANCE.put("class358", "nx"); - INSTANCE.put("class36", "br"); - INSTANCE.put("class365", "ow"); - INSTANCE.put("class370", "oq"); - INSTANCE.put("class371", "oe"); - INSTANCE.put("class372", "os"); - INSTANCE.put("class373", "oi"); - INSTANCE.put("class384", "oh"); - INSTANCE.put("class385", "oy"); - INSTANCE.put("class386", "oo"); - INSTANCE.put("class387", "op"); - INSTANCE.put("class389", "oa"); - INSTANCE.put("class390", "pl"); - INSTANCE.put("class391", "pa"); - INSTANCE.put("class392", "pg"); - INSTANCE.put("class393", "pd"); - INSTANCE.put("class395", "pt"); - INSTANCE.put("class396", "ph"); - INSTANCE.put("class397", "pz"); - INSTANCE.put("class399", "po"); - INSTANCE.put("class4", "as"); - INSTANCE.put("class402", "pu"); - INSTANCE.put("class404", "pi"); - INSTANCE.put("class410", "py"); - INSTANCE.put("class411", "pw"); - INSTANCE.put("class415", "pr"); - INSTANCE.put("class417", "qw"); - INSTANCE.put("class419", "qc"); - INSTANCE.put("class420", "qb"); - INSTANCE.put("class421", "qd"); - INSTANCE.put("class422", "qu"); - INSTANCE.put("class423", "qo"); - INSTANCE.put("class424", "ql"); - INSTANCE.put("class425", "qr"); - INSTANCE.put("class449", "ri"); - INSTANCE.put("class450", "rj"); + INSTANCE.put("class151", "fm"); + INSTANCE.put("class152", "fy"); + INSTANCE.put("class153", "fw"); + INSTANCE.put("class155", "fa"); + INSTANCE.put("class156", "gu"); + INSTANCE.put("class157", "gc"); + INSTANCE.put("class158", "gd"); + INSTANCE.put("class159", "gm"); + INSTANCE.put("class16", "ag"); + INSTANCE.put("class160", "gg"); + INSTANCE.put("class161", "gw"); + INSTANCE.put("class162", "gi"); + INSTANCE.put("class164", "gl"); + INSTANCE.put("class165", "gb"); + INSTANCE.put("class166", "gj"); + INSTANCE.put("class167", "ge"); + INSTANCE.put("class169", "gv"); + INSTANCE.put("class17", "am"); + INSTANCE.put("class170", "gf"); + INSTANCE.put("class172", "gy"); + INSTANCE.put("class174", "gk"); + INSTANCE.put("class176", "gx"); + INSTANCE.put("class177", "gq"); + INSTANCE.put("class178", "gt"); + INSTANCE.put("class18", "ax"); + INSTANCE.put("class181", "gn"); + INSTANCE.put("class184", "hj"); + INSTANCE.put("class19", "ah"); + INSTANCE.put("class191", "hg"); + INSTANCE.put("class197", "hp"); + INSTANCE.put("class2", "ao"); + INSTANCE.put("class20", "as"); + INSTANCE.put("class200", "hf"); + INSTANCE.put("class209", "il"); + INSTANCE.put("class210", "ig"); + INSTANCE.put("class211", "ie"); + INSTANCE.put("class212", "iz"); + INSTANCE.put("class214", "io"); + INSTANCE.put("class216", "ij"); + INSTANCE.put("class218", "ih"); + INSTANCE.put("class219", "it"); + INSTANCE.put("class227", "im"); + INSTANCE.put("class228", "id"); + INSTANCE.put("class238", "je"); + INSTANCE.put("class243", "ji"); + INSTANCE.put("class245", "jj"); + INSTANCE.put("class26", "bh"); + INSTANCE.put("class260", "kb"); + INSTANCE.put("class261", "kt"); + INSTANCE.put("class27", "bj"); + INSTANCE.put("class270", "ka"); + INSTANCE.put("class271", "kf"); + INSTANCE.put("class272", "kx"); + INSTANCE.put("class28", "bk"); + INSTANCE.put("class280", "kk"); + INSTANCE.put("class281", "kc"); + INSTANCE.put("class282", "km"); + INSTANCE.put("class283", "kz"); + INSTANCE.put("class284", "kh"); + INSTANCE.put("class29", "bv"); + INSTANCE.put("class291", "lm"); + INSTANCE.put("class292", "lp"); + INSTANCE.put("class293", "la"); + INSTANCE.put("class299", "ln"); + INSTANCE.put("class3", "at"); + INSTANCE.put("class30", "bt"); + INSTANCE.put("class300", "lc"); + INSTANCE.put("class301", "lv"); + INSTANCE.put("class302", "lr"); + INSTANCE.put("class303", "lt"); + INSTANCE.put("class305", "lz"); + INSTANCE.put("class308", "lh"); + INSTANCE.put("class309", "li"); + INSTANCE.put("class31", "bd"); + INSTANCE.put("class311", "lb"); + INSTANCE.put("class312", "md"); + INSTANCE.put("class316", "mq"); + INSTANCE.put("class318", "mk"); + INSTANCE.put("class323", "mf"); + INSTANCE.put("class324", "ml"); + INSTANCE.put("class325", "mj"); + INSTANCE.put("class326", "mw"); + INSTANCE.put("class327", "mp"); + INSTANCE.put("class329", "mb"); + INSTANCE.put("class33", "bs"); + INSTANCE.put("class330", "mm"); + INSTANCE.put("class332", "mn"); + INSTANCE.put("class334", "my"); + INSTANCE.put("class338", "nq"); + INSTANCE.put("class339", "na"); + INSTANCE.put("class342", "nd"); + INSTANCE.put("class343", "ng"); + INSTANCE.put("class344", "nt"); + INSTANCE.put("class345", "nv"); + INSTANCE.put("class348", "nz"); + INSTANCE.put("class349", "ne"); + INSTANCE.put("class350", "ni"); + INSTANCE.put("class352", "np"); + INSTANCE.put("class357", "nj"); + INSTANCE.put("class36", "bq"); + INSTANCE.put("class369", "od"); + INSTANCE.put("class370", "og"); + INSTANCE.put("class371", "ob"); + INSTANCE.put("class372", "ok"); + INSTANCE.put("class383", "oi"); + INSTANCE.put("class384", "oq"); + INSTANCE.put("class385", "ov"); + INSTANCE.put("class386", "op"); + INSTANCE.put("class387", "or"); + INSTANCE.put("class388", "oo"); + INSTANCE.put("class390", "ps"); + INSTANCE.put("class391", "pr"); + INSTANCE.put("class392", "pa"); + INSTANCE.put("class394", "pj"); + INSTANCE.put("class395", "pu"); + INSTANCE.put("class396", "pz"); + INSTANCE.put("class398", "pl"); + INSTANCE.put("class4", "ac"); + INSTANCE.put("class401", "pv"); + INSTANCE.put("class403", "pd"); + INSTANCE.put("class408", "pp"); + INSTANCE.put("class409", "pg"); + INSTANCE.put("class410", "ph"); + INSTANCE.put("class415", "pw"); + INSTANCE.put("class416", "qe"); + INSTANCE.put("class418", "qn"); + INSTANCE.put("class419", "qf"); + INSTANCE.put("class420", "qr"); + INSTANCE.put("class421", "qm"); + INSTANCE.put("class422", "qw"); + INSTANCE.put("class423", "qv"); + INSTANCE.put("class424", "qj"); + INSTANCE.put("class448", "rj"); + INSTANCE.put("class449", "ro"); + INSTANCE.put("class450", "rz"); INSTANCE.put("class451", "rm"); - INSTANCE.put("class452", "rv"); - INSTANCE.put("class453", "rp"); - INSTANCE.put("class454", "rr"); - INSTANCE.put("class455", "rt"); - INSTANCE.put("class456", "rn"); - INSTANCE.put("class457", "rl"); - INSTANCE.put("class458", "rc"); - INSTANCE.put("class459", "ro"); - INSTANCE.put("class46", "bm"); - INSTANCE.put("class460", "rw"); - INSTANCE.put("class461", "rs"); - INSTANCE.put("class462", "rq"); - INSTANCE.put("class463", "re"); + INSTANCE.put("class452", "rc"); + INSTANCE.put("class453", "rq"); + INSTANCE.put("class454", "rs"); + INSTANCE.put("class455", "rp"); + INSTANCE.put("class456", "rg"); + INSTANCE.put("class457", "rv"); + INSTANCE.put("class458", "ry"); + INSTANCE.put("class459", "rk"); + INSTANCE.put("class46", "bz"); + INSTANCE.put("class460", "re"); + INSTANCE.put("class461", "rf"); + INSTANCE.put("class462", "rl"); + INSTANCE.put("class463", "rt"); INSTANCE.put("class464", "rx"); - INSTANCE.put("class465", "ry"); - INSTANCE.put("class466", "rd"); - INSTANCE.put("class467", "rz"); - INSTANCE.put("class47", "bl"); - INSTANCE.put("class476", "so"); - INSTANCE.put("class477", "sc"); - INSTANCE.put("class478", "sd"); - INSTANCE.put("class479", "ss"); - INSTANCE.put("class480", "sl"); - INSTANCE.put("class481", "sk"); - INSTANCE.put("class486", "sf"); - INSTANCE.put("class490", "se"); - INSTANCE.put("class491", "sj"); - INSTANCE.put("class492", "sn"); - INSTANCE.put("class494", "ta"); - INSTANCE.put("class497", "tt"); - INSTANCE.put("class498", "tp"); - INSTANCE.put("class499", "td"); - INSTANCE.put("class5", "aj"); - INSTANCE.put("class500", "te"); - INSTANCE.put("class501", "tv"); - INSTANCE.put("class502", "ti"); - INSTANCE.put("class503", "tm"); - INSTANCE.put("class504", "tw"); - INSTANCE.put("class505", "tg"); - INSTANCE.put("class507", "tx"); - INSTANCE.put("class509", "tq"); - INSTANCE.put("class51", "bj"); - INSTANCE.put("class510", "th"); - INSTANCE.put("class514", "tr"); - INSTANCE.put("class517", "tl"); + INSTANCE.put("class465", "rw"); + INSTANCE.put("class466", "rn"); + INSTANCE.put("class47", "bx"); + INSTANCE.put("class475", "sv"); + INSTANCE.put("class476", "se"); + INSTANCE.put("class477", "sk"); + INSTANCE.put("class478", "sy"); + INSTANCE.put("class479", "sn"); + INSTANCE.put("class480", "sc"); + INSTANCE.put("class485", "ss"); + INSTANCE.put("class489", "su"); + INSTANCE.put("class490", "sx"); + INSTANCE.put("class493", "sg"); + INSTANCE.put("class496", "tn"); + INSTANCE.put("class497", "th"); + INSTANCE.put("class498", "tj"); + INSTANCE.put("class499", "tl"); + INSTANCE.put("class5", "ai"); + INSTANCE.put("class500", "tq"); + INSTANCE.put("class501", "tg"); + INSTANCE.put("class502", "tb"); + INSTANCE.put("class503", "tz"); + INSTANCE.put("class504", "ti"); + INSTANCE.put("class506", "tx"); + INSTANCE.put("class508", "tr"); + INSTANCE.put("class51", "bg"); + INSTANCE.put("class510", "ty"); + INSTANCE.put("class515", "tw"); INSTANCE.put("class518", "tf"); - INSTANCE.put("class521", "ul"); - INSTANCE.put("class522", "uh"); - INSTANCE.put("class528", "uv"); + INSTANCE.put("class519", "tv"); + INSTANCE.put("class522", "uu"); + INSTANCE.put("class523", "ud"); + INSTANCE.put("class529", "uf"); INSTANCE.put("class53", "cf"); - INSTANCE.put("class531", "um"); - INSTANCE.put("class535", "ur"); - INSTANCE.put("class538", "up"); - INSTANCE.put("class59", "cw"); - INSTANCE.put("class6", "ag"); + INSTANCE.put("class532", "uo"); + INSTANCE.put("class538", "uv"); + INSTANCE.put("class59", "cd"); + INSTANCE.put("class6", "az"); INSTANCE.put("class60", "ce"); - INSTANCE.put("class7", "az"); - INSTANCE.put("class72", "cp"); - INSTANCE.put("class74", "cg"); - INSTANCE.put("class8", "av"); - INSTANCE.put("class85", "dk"); - INSTANCE.put("class89", "dd"); - INSTANCE.put("class9", "ap"); - INSTANCE.put("class90", "dt"); - INSTANCE.put("class92", "dm"); - INSTANCE.put("class93", "du"); + INSTANCE.put("class7", "ap"); + INSTANCE.put("class72", "cj"); + INSTANCE.put("class74", "ct"); + INSTANCE.put("class8", "aa"); + INSTANCE.put("class85", "da"); + INSTANCE.put("class89", "dl"); + INSTANCE.put("class9", "af"); + INSTANCE.put("class90", "dk"); + INSTANCE.put("class92", "dz"); + INSTANCE.put("class93", "dw"); INSTANCE.put("Client", "client"); INSTANCE.put("ClientPacket", "lw"); - INSTANCE.put("ClientPreferences", "da"); - INSTANCE.put("Clips", "jq"); - INSTANCE.put("Clock", "hf"); - INSTANCE.put("CollisionMap", "ij"); + INSTANCE.put("ClientPreferences", "dp"); + INSTANCE.put("Clips", "jl"); + INSTANCE.put("Clock", "ht"); + INSTANCE.put("CollisionMap", "is"); + INSTANCE.put("com/jagex/oldscape/pub/OtlTokenRequester", "com/jagex/oldscape/pub/OtlTokenRequester"); INSTANCE.put("com/jagex/oldscape/pub/RefreshAccessTokenRequester", "com/jagex/oldscape/pub/RefreshAccessTokenRequester"); INSTANCE.put("com/jagex/oldscape/pub/RefreshAccessTokenResponse", "com/jagex/oldscape/pub/RefreshAccessTokenResponse"); - INSTANCE.put("ConcurrentMidiTask", "pf"); - INSTANCE.put("Coord", "mr"); - INSTANCE.put("DbRowType", "tu"); + INSTANCE.put("ConcurrentMidiTask", "pe"); + INSTANCE.put("Coord", "mc"); + INSTANCE.put("DbRowType", "tc"); INSTANCE.put("DbTableType", "tk"); - INSTANCE.put("Decimator", "cj"); - INSTANCE.put("DefaultsGroup", "rf"); + INSTANCE.put("Decimator", "cx"); + INSTANCE.put("DefaultsGroup", "rh"); INSTANCE.put("DelayFadeTask", "pn"); - INSTANCE.put("DemotingHashTable", "lj"); - INSTANCE.put("DesktopPlatformInfoProvider", "su"); - INSTANCE.put("DevicePcmPlayer", "ai"); - INSTANCE.put("DevicePcmPlayerProvider", "an"); - INSTANCE.put("DirectByteArrayCopier", "np"); - INSTANCE.put("DirectWrapper", "li"); - INSTANCE.put("DualNode", "sh"); - INSTANCE.put("DualNodeDeque", "ob"); - INSTANCE.put("DynamicObject", "dq"); - INSTANCE.put("EnumComposition", "hm"); - INSTANCE.put("EvictingDualNodeHashTable", "ld"); - INSTANCE.put("FaceNormal", "jd"); - INSTANCE.put("FadeInTask", "pb"); + INSTANCE.put("DemotingHashTable", "kg"); + INSTANCE.put("DesktopPlatformInfoProvider", "sw"); + INSTANCE.put("DevicePcmPlayer", "aw"); + INSTANCE.put("DevicePcmPlayerProvider", "aj"); + INSTANCE.put("DirectByteArrayCopier", "ms"); + INSTANCE.put("DirectWrapper", "lu"); + INSTANCE.put("DualNode", "sq"); + INSTANCE.put("DualNodeDeque", "os"); + INSTANCE.put("DynamicObject", "dj"); + INSTANCE.put("EnumComposition", "hu"); + INSTANCE.put("EvictingDualNodeHashTable", "le"); + INSTANCE.put("FaceNormal", "iq"); + INSTANCE.put("FadeInTask", "pt"); INSTANCE.put("FadeOutTask", "px"); - INSTANCE.put("FileSystem", "gk"); - INSTANCE.put("FillMode", "uc"); - INSTANCE.put("FloorDecoration", "ip"); - INSTANCE.put("FloorOverlayDefinition", "ia"); - INSTANCE.put("FloorUnderlayDefinition", "hj"); - INSTANCE.put("Font", "pc"); - INSTANCE.put("FontName", "sg"); - INSTANCE.put("Fonts", "sz"); - INSTANCE.put("Frames", "jm"); - INSTANCE.put("Friend", "qi"); - INSTANCE.put("FriendLoginUpdate", "qt"); - INSTANCE.put("FriendsChat", "qk"); - INSTANCE.put("FriendsList", "qp"); - INSTANCE.put("FriendSystem", "cd"); - INSTANCE.put("GameBuild", "ni"); - INSTANCE.put("GameEngine", "bq"); - INSTANCE.put("GameObject", "jc"); - INSTANCE.put("GrandExchangeEvent", "ol"); - INSTANCE.put("GrandExchangeEvents", "ng"); - INSTANCE.put("GrandExchangeOffer", "oc"); - INSTANCE.put("GrandExchangeOfferAgeComparator", "ou"); - INSTANCE.put("GrandExchangeOfferNameComparator", "nj"); + INSTANCE.put("FileSystem", "ga"); + INSTANCE.put("FillMode", "um"); + INSTANCE.put("FloorDecoration", "iy"); + INSTANCE.put("FloorOverlayDefinition", "hr"); + INSTANCE.put("FloorUnderlayDefinition", "hs"); + INSTANCE.put("Font", "pi"); + INSTANCE.put("FontName", "sp"); + INSTANCE.put("Fonts", "sr"); + INSTANCE.put("Frames", "jt"); + INSTANCE.put("Friend", "qo"); + INSTANCE.put("FriendLoginUpdate", "qg"); + INSTANCE.put("FriendsChat", "qc"); + INSTANCE.put("FriendsList", "qk"); + INSTANCE.put("FriendSystem", "ci"); + INSTANCE.put("GameBuild", "nb"); + INSTANCE.put("GameEngine", "bm"); + INSTANCE.put("GameObject", "jy"); + INSTANCE.put("GrandExchangeEvent", "oz"); + INSTANCE.put("GrandExchangeEvents", "no"); + INSTANCE.put("GrandExchangeOffer", "oh"); + INSTANCE.put("GrandExchangeOfferAgeComparator", "nc"); + INSTANCE.put("GrandExchangeOfferNameComparator", "nh"); INSTANCE.put("GrandExchangeOfferOwnWorldComparator", "cu"); - INSTANCE.put("GrandExchangeOfferTotalQuantityComparator", "ne"); - INSTANCE.put("GrandExchangeOfferUnitPriceComparator", "ov"); - INSTANCE.put("GrandExchangeOfferWorldComparator", "ok"); - INSTANCE.put("GraphicsDefaults", "ru"); - INSTANCE.put("GraphicsObject", "cl"); - INSTANCE.put("GZipDecompressor", "un"); - INSTANCE.put("HealthBar", "dv"); - INSTANCE.put("HealthBarDefinition", "ha"); - INSTANCE.put("HealthBarUpdate", "dp"); - INSTANCE.put("HitSplatDefinition", "hk"); - INSTANCE.put("HorizontalAlignment", "hz"); - INSTANCE.put("Huffman", "ma"); - INSTANCE.put("Ignored", "qn"); - INSTANCE.put("IgnoreList", "qm"); - INSTANCE.put("IndexedSprite", "uu"); + INSTANCE.put("GrandExchangeOfferTotalQuantityComparator", "nx"); + INSTANCE.put("GrandExchangeOfferUnitPriceComparator", "oy"); + INSTANCE.put("GrandExchangeOfferWorldComparator", "om"); + INSTANCE.put("GraphicsDefaults", "rr"); + INSTANCE.put("GraphicsObject", "cg"); + INSTANCE.put("GZipDecompressor", "us"); + INSTANCE.put("HealthBar", "dm"); + INSTANCE.put("HealthBarDefinition", "hl"); + INSTANCE.put("HealthBarUpdate", "do"); + INSTANCE.put("HitSplatDefinition", "hm"); + INSTANCE.put("HorizontalAlignment", "he"); + INSTANCE.put("Huffman", "mx"); + INSTANCE.put("Ignored", "qu"); + INSTANCE.put("IgnoreList", "qq"); + INSTANCE.put("IndexedSprite", "uk"); INSTANCE.put("Instrument", "cq"); - INSTANCE.put("IntegerNode", "sx"); - INSTANCE.put("InterfaceParent", "dn"); - INSTANCE.put("Interpreter", "ck"); - INSTANCE.put("IntHashTable", "uj"); + INSTANCE.put("IntegerNode", "sz"); + INSTANCE.put("InterfaceParent", "ds"); + INSTANCE.put("Interpreter", "cb"); + INSTANCE.put("IntHashTable", "uz"); INSTANCE.put("InvDefinition", "hh"); - INSTANCE.put("IsaacCipher", "uy"); - INSTANCE.put("ItemComposition", "hc"); - INSTANCE.put("ItemContainer", "do"); - INSTANCE.put("ItemLayer", "ix"); - INSTANCE.put("IterableDualNodeQueue", "oz"); - INSTANCE.put("IterableDualNodeQueueIterator", "oj"); - INSTANCE.put("IterableNodeDeque", "or"); - INSTANCE.put("IterableNodeDequeDescendingIterator", "on"); - INSTANCE.put("IterableNodeHashTable", "sa"); - INSTANCE.put("IterableNodeHashTableIterator", "sw"); - INSTANCE.put("JagexCache", "gd"); - INSTANCE.put("JagNetThread", "nq"); - INSTANCE.put("JSONArray", "org/json/JSONArray"); - INSTANCE.put("JSONException", "org/json/JSONException"); - INSTANCE.put("JSONObject$Null", "org/json/JSONObject$Null"); - INSTANCE.put("JSONObject", "org/json/JSONObject"); - INSTANCE.put("JSONString", "org/json/JSONString"); - INSTANCE.put("JSONTokener", "org/json/JSONTokener"); - INSTANCE.put("KeyHandler", "al"); - INSTANCE.put("KitDefinition", "hx"); - INSTANCE.put("Language", "ot"); - INSTANCE.put("Link", "sp"); - INSTANCE.put("LinkDeque", "om"); - INSTANCE.put("LoadSongTask", "ps"); - INSTANCE.put("Login", "ci"); - INSTANCE.put("LoginPacket", "lx"); - INSTANCE.put("LoginScreenAnimation", "ds"); - INSTANCE.put("LoginType", "si"); - INSTANCE.put("LongNode", "sv"); - INSTANCE.put("MenuAction", "ch"); - INSTANCE.put("Message", "cx"); - INSTANCE.put("Messages", "eo"); - INSTANCE.put("MidiFileReader", "lb"); - INSTANCE.put("MidiPcmStream", "lc"); - INSTANCE.put("MilliClock", "gn"); - INSTANCE.put("Model", "jo"); - INSTANCE.put("ModelData", "ie"); - INSTANCE.put("ModelData0", "ja"); - INSTANCE.put("ModeWhere", "ox"); - INSTANCE.put("MouseHandler", "bo"); - INSTANCE.put("MouseRecorder", "de"); - INSTANCE.put("MouseWheelHandler", "ak"); - INSTANCE.put("MoveSpeed", "io"); - INSTANCE.put("MusicPatch", "lm"); - INSTANCE.put("MusicPatchNode", "mw"); - INSTANCE.put("MusicPatchNode2", "lk"); - INSTANCE.put("MusicPatchPcmStream", "mm"); - INSTANCE.put("MusicSong", "mj"); - INSTANCE.put("MusicTrack", "mp"); - INSTANCE.put("NanoClock", "gy"); - INSTANCE.put("net/runelite/rs/Opcodes", "net/runelite/rs/Opcodes"); - INSTANCE.put("net/runelite/rs/ScriptOpcodes", "net/runelite/rs/Opcodes"); - INSTANCE.put("NewShit", "hs"); - INSTANCE.put("Node", "sb"); - INSTANCE.put("NodeDeque", "od"); - INSTANCE.put("NodeHashTable", "sm"); - INSTANCE.put("NPC", "dh"); - INSTANCE.put("NPCComposition", "hi"); - INSTANCE.put("ObjectComposition", "hb"); - INSTANCE.put("ObjectNode", "sr"); - INSTANCE.put("ObjectSound", "cy"); - INSTANCE.put("ObjTypeCustomisation", "hv"); - INSTANCE.put("Occluder", "jp"); + INSTANCE.put("IsaacCipher", "ux"); + INSTANCE.put("ItemComposition", "hn"); + INSTANCE.put("ItemContainer", "dd"); + INSTANCE.put("ItemLayer", "ir"); + INSTANCE.put("IterableDualNodeQueue", "ou"); + INSTANCE.put("IterableDualNodeQueueIterator", "ol"); + INSTANCE.put("IterableNodeDeque", "oc"); + INSTANCE.put("IterableNodeDequeDescendingIterator", "ot"); + INSTANCE.put("IterableNodeHashTable", "sf"); + INSTANCE.put("IterableNodeHashTableIterator", "sa"); + INSTANCE.put("JagexCache", "gp"); + INSTANCE.put("JagNetThread", "nf"); + INSTANCE.put("KeyHandler", "ak"); + INSTANCE.put("KitDefinition", "hz"); + INSTANCE.put("Language", "on"); + INSTANCE.put("Link", "ri"); + INSTANCE.put("LinkDeque", "ox"); + INSTANCE.put("Login", "cy"); + INSTANCE.put("LoginPacket", "lk"); + INSTANCE.put("LoginScreenAnimation", "db"); + INSTANCE.put("LoginType", "sl"); + INSTANCE.put("LongNode", "st"); + INSTANCE.put("MenuAction", "cz"); + INSTANCE.put("Message", "co"); + INSTANCE.put("Messages", "ea"); + INSTANCE.put("MidiFileReader", "lq"); + INSTANCE.put("MidiPcmStream", "lf"); + INSTANCE.put("MilliClock", "gr"); + INSTANCE.put("Model", "jr"); + INSTANCE.put("ModelData", "ic"); + INSTANCE.put("ModelData0", "jq"); + INSTANCE.put("ModeWhere", "oe"); + INSTANCE.put("MouseHandler", "bf"); + INSTANCE.put("MouseRecorder", "dt"); + INSTANCE.put("MouseWheelHandler", "ay"); + INSTANCE.put("MoveSpeed", "in"); + INSTANCE.put("MusicPatch", "ll"); + INSTANCE.put("MusicPatchNode", "mg"); + INSTANCE.put("MusicPatchNode2", "lj"); + INSTANCE.put("MusicPatchPcmStream", "mh"); + INSTANCE.put("MusicSong", "mu"); + INSTANCE.put("MusicTrack", "mv"); + INSTANCE.put("NanoClock", "gs"); + INSTANCE.put("NewShit", "hq"); + INSTANCE.put("Node", "sj"); + INSTANCE.put("NodeDeque", "ow"); + INSTANCE.put("NodeHashTable", "so"); + INSTANCE.put("NPC", "dx"); + INSTANCE.put("NPCComposition", "hw"); + INSTANCE.put("Null", "org/json/JSONObject$Null"); + INSTANCE.put("ObjectComposition", "hv"); + INSTANCE.put("ObjectNode", "sd"); + INSTANCE.put("ObjectSound", "ca"); + INSTANCE.put("ObjTypeCustomisation", "ho"); + INSTANCE.put("Occluder", "jn"); + INSTANCE.put("org/json/JSONArray", "org/json/JSONArray"); + INSTANCE.put("org/json/JSONException", "org/json/JSONException"); + INSTANCE.put("org/json/JSONObject", "org/json/JSONObject"); + INSTANCE.put("org/json/JSONString", "org/json/JSONString"); + INSTANCE.put("org/json/JSONTokener", "org/json/JSONTokener"); + INSTANCE.put("org/json/Null", "org/json/JSONObject$Null"); + INSTANCE.put("OtlTokenRequester", "com/jagex/oldscape/pub/OtlTokenRequester"); INSTANCE.put("OtlTokenResponse", "com/jagex/oldscape/pub/OtlTokenResponse"); - INSTANCE.put("PacketBuffer", "tc"); - INSTANCE.put("PacketBufferNode", "lv"); - INSTANCE.put("PacketWriter", "eb"); - INSTANCE.put("ParamComposition", "hq"); - INSTANCE.put("PcmPlayer", "bk"); - INSTANCE.put("PcmStream", "by"); - INSTANCE.put("PcmStreamMixer", "be"); + INSTANCE.put("PacketBuffer", "to"); + INSTANCE.put("PacketBufferNode", "ly"); + INSTANCE.put("PacketWriter", "er"); + INSTANCE.put("ParamComposition", "hx"); + INSTANCE.put("PcmPlayer", "bb"); + INSTANCE.put("PcmStream", "bw"); + INSTANCE.put("PcmStreamMixer", "bl"); INSTANCE.put("PcmStreamMixerListener", "cs"); - INSTANCE.put("PendingSpawn", "dz"); - INSTANCE.put("PlatformInfo", "sy"); + INSTANCE.put("PendingSpawn", "dv"); + INSTANCE.put("PlatformInfo", "sm"); INSTANCE.put("Player", "df"); - INSTANCE.put("PlayerComposition", "mb"); - INSTANCE.put("Players", "el"); - INSTANCE.put("PlayerType", "nw"); - INSTANCE.put("PrivateChatMode", "ut"); - INSTANCE.put("Projectile", "cv"); - INSTANCE.put("Rasterizer2D", "us"); - INSTANCE.put("Rasterizer3D", "iu"); - INSTANCE.put("RasterProvider", "bp"); - INSTANCE.put("RawPcmStream", "bt"); - INSTANCE.put("RawSound", "bi"); - INSTANCE.put("ReflectionCheck", "bw"); - INSTANCE.put("Renderable", "it"); - INSTANCE.put("RouteStrategy", "in"); - INSTANCE.put("RunException", "uf"); - INSTANCE.put("Scene", "iz"); - INSTANCE.put("SceneTileModel", "ju"); - INSTANCE.put("SceneTilePaint", "jl"); - INSTANCE.put("Script", "dc"); - INSTANCE.put("ScriptEvent", "di"); - INSTANCE.put("ScriptFrame", "ca"); - INSTANCE.put("SecureRandomCallable", "dy"); + INSTANCE.put("PlayerComposition", "mt"); + INSTANCE.put("Players", "ee"); + INSTANCE.put("PlayerType", "nn"); + INSTANCE.put("PrivateChatMode", "ub"); + INSTANCE.put("Projectile", "ck"); + INSTANCE.put("Rasterizer2D", "ut"); + INSTANCE.put("Rasterizer3D", "ix"); + INSTANCE.put("RasterProvider", "by"); + INSTANCE.put("RawPcmStream", "bn"); + INSTANCE.put("RawSound", "bu"); + INSTANCE.put("ReflectionCheck", "ba"); + INSTANCE.put("RefreshAccessTokenRequester", "com/jagex/oldscape/pub/RefreshAccessTokenRequester"); + INSTANCE.put("RefreshAccessTokenResponse", "com/jagex/oldscape/pub/RefreshAccessTokenResponse"); + INSTANCE.put("Renderable", "ik"); + INSTANCE.put("RouteStrategy", "iw"); + INSTANCE.put("RunException", "uy"); + INSTANCE.put("Scene", "iv"); + INSTANCE.put("SceneTileModel", "jv"); + INSTANCE.put("SceneTilePaint", "jg"); + INSTANCE.put("Script", "dh"); + INSTANCE.put("ScriptEvent", "dy"); + INSTANCE.put("ScriptFrame", "cv"); + INSTANCE.put("SecureRandomCallable", "dn"); INSTANCE.put("SecureRandomFuture", "cc"); - INSTANCE.put("SequenceDefinition", "ig"); - INSTANCE.put("ServerPacket", "ls"); - INSTANCE.put("Skeleton", "ik"); - INSTANCE.put("Skills", "nh"); - INSTANCE.put("SoftWrapper", "lr"); - INSTANCE.put("SongTask", "pp"); - INSTANCE.put("SoundCache", "bh"); - INSTANCE.put("SoundEffect", "bc"); - INSTANCE.put("SoundEnvelope", "bz"); - INSTANCE.put("SoundSystem", "bx"); - INSTANCE.put("SpotAnimation", "ub"); - INSTANCE.put("SpotAnimationDefinition", "hw"); - INSTANCE.put("SpriteMask", "mi"); - INSTANCE.put("SpritePixels", "ud"); - INSTANCE.put("Strings", "nz"); - INSTANCE.put("StructComposition", "ht"); - INSTANCE.put("StudioGame", "nu"); - INSTANCE.put("SwapSongTask", "pj"); - INSTANCE.put("Task", "gu"); - INSTANCE.put("TaskHandler", "gv"); - INSTANCE.put("Texture", "ic"); - INSTANCE.put("TextureLoader", "jy"); - INSTANCE.put("TextureProvider", "jb"); - INSTANCE.put("Tile", "il"); - INSTANCE.put("TileItem", "et"); - INSTANCE.put("Tiles", "dj"); - INSTANCE.put("Timer", "pm"); - INSTANCE.put("TriBool", "qj"); - INSTANCE.put("UrlRequest", "ei"); - INSTANCE.put("UrlRequester", "ej"); - INSTANCE.put("User", "qe"); - INSTANCE.put("UserComparator1", "tz"); - INSTANCE.put("UserComparator10", "ed"); - INSTANCE.put("UserComparator2", "uw"); - INSTANCE.put("UserComparator3", "eg"); + INSTANCE.put("SequenceDefinition", "ib"); + INSTANCE.put("ServerPacket", "lg"); + INSTANCE.put("Skeleton", "iu"); + INSTANCE.put("Skills", "nl"); + INSTANCE.put("SoftWrapper", "lx"); + INSTANCE.put("SongTask", "pm"); + INSTANCE.put("SoundCache", "bi"); + INSTANCE.put("SoundEffect", "bp"); + INSTANCE.put("SoundEnvelope", "br"); + INSTANCE.put("SoundSystem", "be"); + INSTANCE.put("SpotAnimation", "un"); + INSTANCE.put("SpotAnimationDefinition", "ha"); + INSTANCE.put("SpriteMask", "me"); + INSTANCE.put("SpritePixels", "ui"); + INSTANCE.put("Strings", "nr"); + INSTANCE.put("StructComposition", "hc"); + INSTANCE.put("StudioGame", "ns"); + INSTANCE.put("SwapSongTask", "po"); + INSTANCE.put("Task", "gz"); + INSTANCE.put("TaskHandler", "gh"); + INSTANCE.put("Texture", "if"); + INSTANCE.put("TextureLoader", "js"); + INSTANCE.put("TextureProvider", "jk"); + INSTANCE.put("Tile", "ii"); + INSTANCE.put("TileItem", "ed"); + INSTANCE.put("Tiles", "du"); + INSTANCE.put("Timer", "py"); + INSTANCE.put("TriBool", "qp"); + INSTANCE.put("UrlRequest", "et"); + INSTANCE.put("UrlRequester", "ev"); + INSTANCE.put("User", "qs"); + INSTANCE.put("UserComparator1", "ua"); + INSTANCE.put("UserComparator10", "ef"); + INSTANCE.put("UserComparator2", "uj"); + INSTANCE.put("UserComparator3", "el"); INSTANCE.put("UserComparator4", "en"); - INSTANCE.put("UserComparator5", "ee"); - INSTANCE.put("UserComparator6", "ex"); - INSTANCE.put("UserComparator7", "eq"); - INSTANCE.put("UserComparator8", "es"); - INSTANCE.put("UserComparator9", "ey"); - INSTANCE.put("UserList", "qs"); - INSTANCE.put("Username", "ui"); - INSTANCE.put("Usernamed", "qv"); - INSTANCE.put("VarbitComposition", "hn"); - INSTANCE.put("VarcInt", "he"); - INSTANCE.put("Varcs", "ew"); - INSTANCE.put("VarpDefinition", "hg"); - INSTANCE.put("Varps", "mq"); - INSTANCE.put("VertexNormal", "jk"); - INSTANCE.put("VerticalAlignment", "hl"); - INSTANCE.put("ViewportMouse", "jr"); - INSTANCE.put("VorbisCodebook", "ct"); - INSTANCE.put("VorbisFloor", "bu"); - INSTANCE.put("VorbisMapping", "bg"); - INSTANCE.put("VorbisSample", "cz"); - INSTANCE.put("WallDecoration", "jt"); - INSTANCE.put("Widget", "mt"); - INSTANCE.put("World", "cr"); - INSTANCE.put("WorldMap", "sq"); - INSTANCE.put("WorldMapArchiveLoader", "st"); - INSTANCE.put("WorldMapArea", "js"); - INSTANCE.put("WorldMapAreaData", "ko"); - INSTANCE.put("WorldMapCacheName", "kp"); - INSTANCE.put("WorldMapData_0", "jn"); - INSTANCE.put("WorldMapData_1", "kt"); - INSTANCE.put("WorldMapDecoration", "kk"); - INSTANCE.put("WorldMapDecorationType", "no"); - INSTANCE.put("WorldMapElement", "ho"); + INSTANCE.put("UserComparator5", "es"); + INSTANCE.put("UserComparator6", "ec"); + INSTANCE.put("UserComparator7", "ei"); + INSTANCE.put("UserComparator8", "eb"); + INSTANCE.put("UserComparator9", "em"); + INSTANCE.put("UserList", "qt"); + INSTANCE.put("Username", "uc"); + INSTANCE.put("Usernamed", "ql"); + INSTANCE.put("VarbitComposition", "hb"); + INSTANCE.put("VarcInt", "hk"); + INSTANCE.put("Varcs", "ej"); + INSTANCE.put("VarpDefinition", "hi"); + INSTANCE.put("Varps", "mz"); + INSTANCE.put("VertexNormal", "ja"); + INSTANCE.put("VerticalAlignment", "hy"); + INSTANCE.put("ViewportMouse", "jc"); + INSTANCE.put("VorbisCodebook", "cw"); + INSTANCE.put("VorbisFloor", "bo"); + INSTANCE.put("VorbisMapping", "bc"); + INSTANCE.put("VorbisSample", "cm"); + INSTANCE.put("WallDecoration", "jw"); + INSTANCE.put("Widget", "mi"); + INSTANCE.put("World", "ch"); + INSTANCE.put("WorldMap", "si"); + INSTANCE.put("WorldMapArchiveLoader", "sb"); + INSTANCE.put("WorldMapArea", "jf"); + INSTANCE.put("WorldMapAreaData", "kv"); + INSTANCE.put("WorldMapCacheName", "kr"); + INSTANCE.put("WorldMapData_0", "jx"); + INSTANCE.put("WorldMapData_1", "jh"); + INSTANCE.put("WorldMapDecoration", "kn"); + INSTANCE.put("WorldMapDecorationType", "nm"); + INSTANCE.put("WorldMapElement", "hd"); INSTANCE.put("WorldMapEvent", "kl"); - INSTANCE.put("WorldMapIcon_0", "kf"); - INSTANCE.put("WorldMapIcon_1", "jg"); - INSTANCE.put("WorldMapLabel", "ka"); - INSTANCE.put("WorldMapLabelSize", "jj"); - INSTANCE.put("WorldMapManager", "jf"); - INSTANCE.put("WorldMapRectangle", "kn"); - INSTANCE.put("WorldMapRegion", "jv"); - INSTANCE.put("WorldMapScaleHandler", "ki"); - INSTANCE.put("WorldMapSection", "kz"); - INSTANCE.put("WorldMapSection0", "kg"); + INSTANCE.put("WorldMapIcon_0", "ki"); + INSTANCE.put("WorldMapIcon_1", "jz"); + INSTANCE.put("WorldMapLabel", "kq"); + INSTANCE.put("WorldMapLabelSize", "jb"); + INSTANCE.put("WorldMapManager", "jd"); + INSTANCE.put("WorldMapRectangle", "ks"); + INSTANCE.put("WorldMapRegion", "jm"); + INSTANCE.put("WorldMapScaleHandler", "ku"); + INSTANCE.put("WorldMapSection", "kw"); + INSTANCE.put("WorldMapSection0", "kj"); INSTANCE.put("WorldMapSection1", "ky"); - INSTANCE.put("WorldMapSection2", "jx"); - INSTANCE.put("WorldMapSectionType", "ke"); - INSTANCE.put("WorldMapSprite", "kw"); - INSTANCE.put("Wrapper", "la"); - INSTANCE.put("ZoneOperation", "lo"); + INSTANCE.put("WorldMapSection2", "jp"); + INSTANCE.put("WorldMapSectionType", "ko"); + INSTANCE.put("WorldMapSprite", "kd"); + INSTANCE.put("Wrapper", "lo"); + INSTANCE.put("ZoneOperation", "ls"); } } \ No newline at end of file diff --git a/osrs/src/main/java/net/runelite/rs/Opcodes.java b/osrs/src/main/java/net/runelite/rs/Opcodes.java deleted file mode 100644 index 420b7d968..000000000 --- a/osrs/src/main/java/net/runelite/rs/Opcodes.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.runelite.rs; - -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; - -@Implements("net/runelite/rs/Opcodes") -@ObfuscatedName("net/runelite/rs/Opcodes") -public class Opcodes { -} diff --git a/osrs/src/main/java/net/runelite/rs/Reflection.java b/osrs/src/main/java/net/runelite/rs/Reflection.java new file mode 100644 index 000000000..773d1b2f4 --- /dev/null +++ b/osrs/src/main/java/net/runelite/rs/Reflection.java @@ -0,0 +1,162 @@ +package net.runelite.rs; + +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.math.BigInteger; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +public class Reflection { + static Map> classes = new HashMap<>(); + + //These are mixed in + public static void reportFindClass(String className) {} + public static void reportFindField(Class className, String fieldName) {} + public static void reportInvoke(Method method, Object object, Object[] args) {} + + static { + ObfuscatedClassMap.INSTANCE.forEach((deobClassName, obfuscatedClassName) -> { + if (!deobClassName.contains("/") && !obfuscatedClassName.contains("/")) { + Class c = null; + try { + c = Class.forName(deobClassName); + } catch (Exception e) { + e.printStackTrace(); + } + classes.put(obfuscatedClassName, c); + } + }); + } + + public static Class findClass(String name) throws ClassNotFoundException { + Class clazz = classes.get(name); + if (clazz != null) { + reportFindClass(clazz.getName()); + return clazz; + } + return Class.forName(name); + } + + public static Field findField(Class clazz, String name) throws NoSuchFieldException { + reportFindField(clazz, name); + for (Field f : clazz.getDeclaredFields()) { + ObfuscatedName annotation = f.getAnnotation(ObfuscatedName.class); + if ((annotation != null) && annotation.value().equals(name)) { + return f; + } + } + return clazz.getDeclaredField(name); + } + + public static String getMethodName(Method method) { + ObfuscatedName annotation = method.getAnnotation(ObfuscatedName.class); + if (annotation != null) { + return annotation.value(); + } + return method.getName(); + } + + public static Class[] getParameterTypes(Method method) { + ObfuscatedSignature sig = method.getAnnotation(ObfuscatedSignature.class); + Class[] types = method.getParameterTypes(); + if (sig == null) { + return types; + } + String s = sig.descriptor(); + int i = s.lastIndexOf(')'); + char c = s.charAt(i - 1); + Class last; + switch (c) { + case 'B' : + last = byte.class; + break; + case 'I' : + last = int.class; + break; + case 'S' : + last = short.class; + break; + default : + throw new IllegalStateException();} + + types = Arrays.copyOf(types, types.length + 1); + types[types.length - 1] = last; + return types; + } + + public static int getInt(Field field, Object obj) throws IllegalArgumentException, IllegalAccessException { + boolean unset = false; + if ((field.getModifiers() & Modifier.PRIVATE) == 0) { + + + field.setAccessible(true); + unset = true; + } + int i; + try { + i = field.getInt(obj); + } catch (Exception ex) { + throw ex; + } finally { + if (unset) { + field.setAccessible(false); + } + } + ObfuscatedGetter og = field.getAnnotation(ObfuscatedGetter.class); + if (og != null) { + int getter = og.intValue(); + int setter = modInverse(getter); + + i *= setter; + } + return i; + } + + public static void setInt(Field field, Object obj, int value) throws IllegalArgumentException, IllegalAccessException { + ObfuscatedGetter og = field.getAnnotation(ObfuscatedGetter.class); + if (og != null) { + int getter = og.intValue(); + + value *= getter; + } + boolean unset = false; + if ((field.getModifiers() & Modifier.PRIVATE) == 0) { + + + field.setAccessible(true); + unset = true; + } + try { + field.setInt(obj, value); + } finally { + if (unset) { + field.setAccessible(false); + } + } + } + + public static BigInteger modInverse(BigInteger val, int bits) { + BigInteger shift = BigInteger.ONE.shiftLeft(bits); + return val.modInverse(shift); + } + + public static int modInverse(int val) { + return modInverse(BigInteger.valueOf(val), 32).intValue(); + } + + public static Object invoke(Method method, Object object, Object[] args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException { + reportInvoke(method, object, args); + try { + return method.invoke(object, args); + } catch (Throwable ex) { + throw ex; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/net/runelite/rs/ScriptOpcodes.java b/osrs/src/main/java/net/runelite/rs/ScriptOpcodes.java index 1f50537a4..de33a169a 100644 --- a/osrs/src/main/java/net/runelite/rs/ScriptOpcodes.java +++ b/osrs/src/main/java/net/runelite/rs/ScriptOpcodes.java @@ -1,10 +1,5 @@ package net.runelite.rs; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; - -@Implements("net/runelite/rs/ScriptOpcodes") -@ObfuscatedName("net/runelite/rs/Opcodes") public class ScriptOpcodes { public static final int RUNELITE_EXECUTE = 6599; -} +} \ No newline at end of file diff --git a/osrs/src/main/java/netscape/js/JSException.java b/osrs/src/main/java/netscape/js/JSException.java new file mode 100644 index 000000000..2687c3221 --- /dev/null +++ b/osrs/src/main/java/netscape/js/JSException.java @@ -0,0 +1,24 @@ + + + +package netscape.js; + + +public class JSException extends RuntimeException { + private static final long serialVersionUID = 2778103758223661489L; + + + public JSException() { + super(); + } + + + public JSException(String s) { + super(s); + } + + + public JSException(Throwable t) { + super(t); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/netscape/js/JSObject.java b/osrs/src/main/java/netscape/js/JSObject.java new file mode 100644 index 000000000..aaca02a84 --- /dev/null +++ b/osrs/src/main/java/netscape/js/JSObject.java @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + +package netscape.js; + +import java.applet.Applet; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Iterator; +import java.util.ServiceLoader; + + + + + + + + + + + + + + + + + + + +@SuppressWarnings("deprecation") +public abstract class JSObject { + + + + + protected JSObject() { + } + + + + + + + + + + + + + + + public abstract Object call(String methodName, Object... args) throws netscape.js.JSException; + + + + + + + + + + + + + + public abstract Object eval(String s) throws netscape.js.JSException; + + + + + + + + + + + + + public abstract Object getMember(String name) throws netscape.js.JSException; + + + + + + + + + + + + + + public abstract void setMember(String name, Object value) throws netscape.js.JSException; + + + + + + + + + + + + public abstract void removeMember(String name) throws netscape.js.JSException; + + + + + + + + + + + + + public abstract Object getSlot(int index) throws netscape.js.JSException; + + + + + + + + + + + + + + public abstract void setSlot(int index, Object value) throws netscape.js.JSException; + + + + + + + + + + + + + + + + + + @Deprecated(since = "9") + @SuppressWarnings("exports") + public static JSObject getWindow(Applet applet) throws JSException { + return ProviderLoader.callGetWindow(applet); + } + + private static class ProviderLoader { + private static final JSObjectProvider provider; + static + { + provider = AccessController.doPrivileged(new PrivilegedAction() { + @Override + public JSObjectProvider run() { + Iterator providers = ServiceLoader.loadInstalled(JSObjectProvider.class).iterator(); + if (providers.hasNext()) { + return providers.next(); + } + return null; + } + }); + } + + private static JSObject callGetWindow(Applet applet) { + if (provider != null) { + return provider.getWindow(applet); + } + return null; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/netscape/js/JSObjectProvider.java b/osrs/src/main/java/netscape/js/JSObjectProvider.java new file mode 100644 index 000000000..fb175bf88 --- /dev/null +++ b/osrs/src/main/java/netscape/js/JSObjectProvider.java @@ -0,0 +1,19 @@ +package netscape.js; + +import java.applet.Applet; + +@SuppressWarnings("deprecation") +public interface JSObjectProvider { + + + + + + + + + + + + + public JSObject getWindow(Applet applet) throws JSException;} \ No newline at end of file diff --git a/osrs/src/main/java/JSONArray.java b/osrs/src/main/java/org/json/JSONArray.java similarity index 89% rename from osrs/src/main/java/JSONArray.java rename to osrs/src/main/java/org/json/JSONArray.java index 354853bd3..de0d4e2ae 100644 --- a/osrs/src/main/java/JSONArray.java +++ b/osrs/src/main/java/org/json/JSONArray.java @@ -1,15 +1,17 @@ +package org.json; + +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; + import java.io.IOException; import java.io.Writer; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@Implements("JSONArray") +@Implements("org/json/JSONArray") @ObfuscatedName("org/json/JSONArray") public class JSONArray { @Export("myArrayList") @@ -20,9 +22,6 @@ public JSONArray() { this.myArrayList = new ArrayList(); } - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONTokener;)V" - ) public JSONArray(JSONTokener var1) throws JSONException { this(); char var2 = var1.nextClean(); @@ -89,7 +88,7 @@ public JSONArray(Object var1) throws JSONException { int var2 = Array.getLength(var1); for (int var3 = 0; var3 < var2; ++var3) { - this.method2687(Array.get(var1, var3)); + this.method2705(Array.get(var1, var3)); } } @@ -103,7 +102,7 @@ public JSONArray(Object var1, boolean var2) throws JSONException { int var3 = Array.getLength(var1); for (int var4 = 0; var4 < var3; ++var4) { - this.method2687(new JSONObject(Array.get(var1, var4), var2)); + this.method2705(new JSONObject(Array.get(var1, var4), var2)); } } @@ -122,13 +121,13 @@ public JSONArray(Collection var1, boolean var2) { } @ObfuscatedName("opt") - public Object method2686(int var1) { + public Object method2704(int var1) { return var1 >= 0 && var1 < this.length() ? this.myArrayList.get(var1) : null; } @ObfuscatedName("get") - public Object method2685(int var1) throws JSONException { - Object var2 = this.method2686(var1); + public Object method2703(int var1) throws JSONException { + Object var2 = this.method2704(var1); if (var2 == null) { throw new JSONException("JSONArray[" + var1 + "] not found."); } else { @@ -137,10 +136,7 @@ public Object method2685(int var1) throws JSONException { } @ObfuscatedName("put") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;)Lorg/json/JSONArray;" - ) - public JSONArray method2687(Object var1) { + public JSONArray method2705(Object var1) { this.myArrayList.add(var1); return this; } @@ -148,7 +144,7 @@ public JSONArray method2687(Object var1) { @Export("getBoolean") @ObfuscatedName("getBoolean") public boolean getBoolean(int var1) throws JSONException { - Object var2 = this.method2685(var1); + Object var2 = this.method2703(var1); if (var2.equals(Boolean.FALSE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("false")) { return false; } else if (var2.equals(Boolean.TRUE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("true")) { @@ -161,21 +157,21 @@ public boolean getBoolean(int var1) throws JSONException { @Export("getInt") @ObfuscatedName("getInt") public int getInt(int var1) throws JSONException { - Object var2 = this.method2685(var1); + Object var2 = this.method2703(var1); return var2 instanceof Number ? ((Number)var2).intValue() : (int)this.getDouble(var1); } @Export("getLong") @ObfuscatedName("getLong") public long getLong(int var1) throws JSONException { - Object var2 = this.method2685(var1); + Object var2 = this.method2703(var1); return var2 instanceof Number ? ((Number)var2).longValue() : (long)this.getDouble(var1); } @Export("getDouble") @ObfuscatedName("getDouble") public double getDouble(int var1) throws JSONException { - Object var2 = this.method2685(var1); + Object var2 = this.method2703(var1); try { return var2 instanceof Number ? ((Number)var2).doubleValue() : Double.valueOf((String)var2); @@ -219,11 +215,8 @@ public double optDouble(int var1, double var2) { @Export("getJSONObject") @ObfuscatedName("getJSONObject") - @ObfuscatedSignature( - descriptor = "(I)Lorg/json/JSONObject;" - ) public JSONObject getJSONObject(int var1) throws JSONException { - Object var2 = this.method2685(var1); + Object var2 = this.method2703(var1); if (var2 instanceof JSONObject) { return (JSONObject)var2; } else { @@ -315,7 +308,7 @@ public String toString() { @Export("getString") @ObfuscatedName("getString") public String getString(int var1) throws JSONException { - return this.method2685(var1).toString(); + return this.method2703(var1).toString(); } @Export("optBoolean") @@ -351,7 +344,7 @@ public long optLong(int var1, long var2) { @Export("optString") @ObfuscatedName("optString") public String optString(int var1, String var2) { - Object var3 = this.method2686(var1); + Object var3 = this.method2704(var1); return var3 != null ? var3.toString() : var2; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/JSONException.java b/osrs/src/main/java/org/json/JSONException.java similarity index 90% rename from osrs/src/main/java/JSONException.java rename to osrs/src/main/java/org/json/JSONException.java index 46a7b50f7..0846ea2ec 100644 --- a/osrs/src/main/java/JSONException.java +++ b/osrs/src/main/java/org/json/JSONException.java @@ -1,8 +1,10 @@ +package org.json; + import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@Implements("JSONException") +@Implements("org/json/JSONException") @ObfuscatedName("org/json/JSONException") public class JSONException extends Exception { @Export("cause") @@ -23,4 +25,4 @@ public JSONException(String var1) { public Throwable getCause() { return this.cause; } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/JSONObject.java b/osrs/src/main/java/org/json/JSONObject.java similarity index 85% rename from osrs/src/main/java/JSONObject.java rename to osrs/src/main/java/org/json/JSONObject.java index 860588b73..54905e261 100644 --- a/osrs/src/main/java/JSONObject.java +++ b/osrs/src/main/java/org/json/JSONObject.java @@ -1,33 +1,33 @@ +package org.json; + +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.rs.Reflection; + import java.io.IOException; import java.io.Writer; import java.lang.reflect.Method; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.TreeSet; +import java.util.*; import java.util.Map.Entry; -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@Implements("JSONObject") +@Implements("org/json/JSONObject") @ObfuscatedName("org/json/JSONObject") public class JSONObject { @Export("NULL") @ObfuscatedName("NULL") - public static final Object NULL = new JSONObject$Null(); + public static final Object NULL; @ObfuscatedName("map") - Map field4251; + Map field4293; + + static { + NULL = new Null(); + } public JSONObject() { - this.field4251 = new HashMap(); + this.field4293 = new HashMap(); } - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONTokener;)V" - ) public JSONObject(JSONTokener var1) throws JSONException { this(); if (var1.nextClean() != '{') { @@ -82,30 +82,30 @@ public JSONObject(Object var1, boolean var2) { } public JSONObject(Map var1) { - this.field4251 = (Map)(var1 == null ? new HashMap() : var1); + this.field4293 = (Map)(var1 == null ? new HashMap() : var1); } public JSONObject(Map var1, boolean var2) { - this.field4251 = new HashMap(); + this.field4293 = new HashMap(); if (var1 != null) { Iterator var3 = var1.entrySet().iterator(); while (var3.hasNext()) { Entry var4 = (Entry)var3.next(); - this.field4251.put(var4.getKey(), new JSONObject(var4.getValue(), var2)); + this.field4293.put(var4.getKey(), new JSONObject(var4.getValue(), var2)); } } } @ObfuscatedName("opt") - public Object method2690(String var1) { - return var1 == null ? null : this.field4251.get(var1); + public Object method2708(String var1) { + return var1 == null ? null : this.field4293.get(var1); } @ObfuscatedName("get") - public Object method2689(String var1) throws JSONException { - Object var2 = this.method2690(var1); + public Object method2707(String var1) throws JSONException { + Object var2 = this.method2708(var1); if (var2 == null) { throw new JSONException("JSONObject[" + quote(var1) + "] not found."); } else { @@ -114,16 +114,13 @@ public Object method2689(String var1) throws JSONException { } @ObfuscatedName("put") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;" - ) - public JSONObject method2691(String var1, Object var2) throws JSONException { + public JSONObject method2709(String var1, Object var2) throws JSONException { if (var1 == null) { throw new JSONException("Null key."); } else { if (var2 != null) { testValidity(var2); - this.field4251.put(var1, var2); + this.field4293.put(var1, var2); } else { this.remove(var1); } @@ -135,7 +132,7 @@ public JSONObject method2691(String var1, Object var2) throws JSONException { @Export("getBoolean") @ObfuscatedName("getBoolean") public boolean getBoolean(String var1) throws JSONException { - Object var2 = this.method2689(var1); + Object var2 = this.method2707(var1); if (var2.equals(Boolean.FALSE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("false")) { return false; } else if (var2.equals(Boolean.TRUE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("true")) { @@ -148,36 +145,33 @@ public boolean getBoolean(String var1) throws JSONException { @Export("getLong") @ObfuscatedName("getLong") public long getLong(String var1) throws JSONException { - Object var2 = this.method2689(var1); + Object var2 = this.method2707(var1); return var2 instanceof Number ? ((Number)var2).longValue() : (long)this.getDouble(var1); } @Export("keys") @ObfuscatedName("keys") public Iterator keys() { - return this.field4251.keySet().iterator(); - } - - @Export("length") - @ObfuscatedName("length") - public int length() { - return this.field4251.size(); + return this.field4293.keySet().iterator(); } @Export("getInt") @ObfuscatedName("getInt") public int getInt(String var1) throws JSONException { - Object var2 = this.method2689(var1); + Object var2 = this.method2707(var1); return var2 instanceof Number ? ((Number)var2).intValue() : (int)this.getDouble(var1); } + @Export("length") + @ObfuscatedName("length") + public int length() { + return this.field4293.size(); + } + @Export("getJSONArray") @ObfuscatedName("getJSONArray") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;)Lorg/json/JSONArray;" - ) public JSONArray getJSONArray(String var1) throws JSONException { - Object var2 = this.method2689(var1); + Object var2 = this.method2707(var1); if (var2 instanceof JSONArray) { return (JSONArray)var2; } else { @@ -215,19 +209,19 @@ void populateInternalMap(Object var1, boolean var2) { Object var9 = Reflection.invoke(var6, var1, (Object[])null); if (var9 == null) { - this.field4251.put(var8, NULL); + this.field4293.put(var8, NULL); } else if (var9.getClass().isArray()) { - this.field4251.put(var8, new JSONArray(var9, var2)); + this.field4293.put(var8, new JSONArray(var9, var2)); } else if (var9 instanceof Collection) { - this.field4251.put(var8, new JSONArray((Collection)var9, var2)); + this.field4293.put(var8, new JSONArray((Collection)var9, var2)); } else if (var9 instanceof Map) { - this.field4251.put(var8, new JSONObject((Map)var9, var2)); + this.field4293.put(var8, new JSONObject((Map)var9, var2)); } else if (this.isStandardProperty(var9.getClass())) { - this.field4251.put(var8, var9); + this.field4293.put(var8, var9); } else if (!var9.getClass().getPackage().getName().startsWith("java") && var9.getClass().getClassLoader() != null) { - this.field4251.put(var8, new JSONObject(var9, var2)); + this.field4293.put(var8, new JSONObject(var9, var2)); } else { - this.field4251.put(var8, var9.toString()); + this.field4293.put(var8, var9.toString()); } } } catch (Exception var10) { @@ -240,16 +234,13 @@ void populateInternalMap(Object var1, boolean var2) { @Export("remove") @ObfuscatedName("remove") public Object remove(String var1) { - return this.field4251.remove(var1); + return this.field4293.remove(var1); } @Export("getJSONObject") @ObfuscatedName("getJSONObject") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;)Lorg/json/JSONObject;" - ) public JSONObject getJSONObject(String var1) throws JSONException { - Object var2 = this.method2689(var1); + Object var2 = this.method2707(var1); if (var2 instanceof JSONObject) { return (JSONObject)var2; } else { @@ -260,13 +251,13 @@ public JSONObject getJSONObject(String var1) throws JSONException { @Export("sortedKeys") @ObfuscatedName("sortedKeys") public Iterator sortedKeys() { - return (new TreeSet(this.field4251.keySet())).iterator(); + return (new TreeSet(this.field4293.keySet())).iterator(); } @Export("getDouble") @ObfuscatedName("getDouble") public double getDouble(String var1) throws JSONException { - Object var2 = this.method2689(var1); + Object var2 = this.method2707(var1); try { return var2 instanceof Number ? ((Number)var2).doubleValue() : Double.valueOf((String)var2); @@ -290,7 +281,7 @@ String toString(int var1, int var2) throws JSONException { var8 = var5.next(); var6.append(quote(var8.toString())); var6.append(": "); - var6.append(valueToString(this.field4251.get(var8), var1, var2)); + var6.append(valueToString(this.field4293.get(var8), var1, var2)); } else { while (true) { int var3; @@ -318,7 +309,7 @@ String toString(int var1, int var2) throws JSONException { var6.append(quote(var8.toString())); var6.append(": "); - var6.append(valueToString(this.field4251.get(var8), var1, var7)); + var6.append(valueToString(this.field4293.get(var8), var1, var7)); } } @@ -343,7 +334,7 @@ public Writer write(Writer var1) throws JSONException { Object var4 = var3.next(); var1.write(quote(var4.toString())); var1.write(58); - Object var5 = this.field4251.get(var4); + Object var5 = this.field4293.get(var4); if (var5 instanceof JSONObject) { ((JSONObject)var5).write(var1); } else if (var5 instanceof JSONArray) { @@ -363,7 +354,7 @@ public Writer write(Writer var1) throws JSONException { @Export("getString") @ObfuscatedName("getString") public String getString(String var1) throws JSONException { - return this.method2689(var1).toString(); + return this.method2707(var1).toString(); } @Export("toString") @@ -381,7 +372,7 @@ public String toString() { Object var3 = var1.next(); var2.append(quote(var3.toString())); var2.append(':'); - var2.append(valueToString(this.field4251.get(var3))); + var2.append(valueToString(this.field4293.get(var3))); } var2.append('}'); @@ -393,16 +384,13 @@ public String toString() { @Export("putOnce") @ObfuscatedName("putOnce") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;" - ) public JSONObject putOnce(String var1, Object var2) throws JSONException { if (var1 != null && var2 != null) { - if (this.method2690(var1) != null) { + if (this.method2708(var1) != null) { throw new JSONException("Duplicate key \"" + var1 + "\""); } - this.method2691(var1, var2); + this.method2709(var1, var2); } return this; @@ -428,7 +416,7 @@ public boolean optBoolean(String var1, boolean var2) { @ObfuscatedName("optDouble") public double optDouble(String var1, double var2) { try { - Object var4 = this.method2690(var1); + Object var4 = this.method2708(var1); return var4 instanceof Number ? ((Number)var4).doubleValue() : new Double((String)var4); } catch (Exception var5) { return var2; @@ -458,18 +446,15 @@ public long optLong(String var1, long var2) { @Export("optString") @ObfuscatedName("optString") public String optString(String var1, String var2) { - Object var3 = this.method2690(var1); + Object var3 = this.method2708(var1); return var3 != null ? var3.toString() : var2; } @Export("putOpt") @ObfuscatedName("putOpt") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;" - ) public JSONObject putOpt(String var1, Object var2) throws JSONException { if (var1 != null && var2 != null) { - this.method2691(var1, var2); + this.method2709(var1, var2); } return this; @@ -477,9 +462,6 @@ public JSONObject putOpt(String var1, Object var2) throws JSONException { @Export("getNames") @ObfuscatedName("getNames") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;)[Ljava/lang/String;" - ) public static String[] getNames(JSONObject var0) { int var1 = var0.length(); if (var1 == 0) { @@ -704,4 +686,4 @@ public static Object stringToValue(String var0) { return var0; } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/JSONString.java b/osrs/src/main/java/org/json/JSONString.java similarity index 83% rename from osrs/src/main/java/JSONString.java rename to osrs/src/main/java/org/json/JSONString.java index e632b6878..14022d3bf 100644 --- a/osrs/src/main/java/JSONString.java +++ b/osrs/src/main/java/org/json/JSONString.java @@ -1,11 +1,13 @@ +package org.json; + import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@Implements("JSONString") +@Implements("org/json/JSONString") @ObfuscatedName("org/json/JSONString") public interface JSONString { @Export("toJSONString") @ObfuscatedName("toJSONString") String toJSONString(); -} +} \ No newline at end of file diff --git a/osrs/src/main/java/JSONTokener.java b/osrs/src/main/java/org/json/JSONTokener.java similarity index 96% rename from osrs/src/main/java/JSONTokener.java rename to osrs/src/main/java/org/json/JSONTokener.java index e5562dd33..7a215f34c 100644 --- a/osrs/src/main/java/JSONTokener.java +++ b/osrs/src/main/java/org/json/JSONTokener.java @@ -1,13 +1,15 @@ +package org.json; + +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; + import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; import java.io.StringReader; -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@Implements("JSONTokener") +@Implements("org/json/JSONTokener") @ObfuscatedName("org/json/JSONTokener") public class JSONTokener { @Export("useLastChar") @@ -158,9 +160,6 @@ public void back() throws JSONException { @Export("syntaxError") @ObfuscatedName("syntaxError") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;)Lorg/json/JSONException;" - ) public JSONException syntaxError(String var1) { return new JSONException(var1 + this.toString()); } @@ -228,4 +227,4 @@ public Object nextValue() throws JSONException { } } } -} +} \ No newline at end of file diff --git a/osrs/src/main/java/org/json/Null.java b/osrs/src/main/java/org/json/Null.java new file mode 100644 index 000000000..ba4ce6693 --- /dev/null +++ b/osrs/src/main/java/org/json/Null.java @@ -0,0 +1,27 @@ +package org.json; + +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; + +@Implements("org/json/JSONObject$Null") +@ObfuscatedName("org/json/JSONObject$Null") +final class Null { + + Null() { + } + + public final Object clone() { + return this; + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return var1 == null || this == var1; + } + + public String toString() { + return "null"; + } +} \ No newline at end of file diff --git a/versions.properties b/versions.properties index c473b17a2..eb05459ca 100644 --- a/versions.properties +++ b/versions.properties @@ -15,6 +15,10 @@ version.br.com.devsrsouza.compose.icons.jetbrains..tabler-icons=1.0.0 version.com.google.inject..guice=7.0.0 +version.io.github.microutils..kotlin-logging=3.0.5 +## # available=4.0.0-beta-1 +## # available=4.0.0-beta-2 + version.kotlin=1.9.0 ## # available=1.8.10 ## # available=1.8.20-Beta From f78dd76ba826ea2d65233ce10e415c4fdaa1ef9d Mon Sep 17 00:00:00 2001 From: Kaballist Date: Thu, 24 Aug 2023 01:10:23 -0700 Subject: [PATCH 05/17] - --- osrs/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/osrs/build.gradle.kts b/osrs/build.gradle.kts index 485b2795d..b9e0112fe 100644 --- a/osrs/build.gradle.kts +++ b/osrs/build.gradle.kts @@ -18,6 +18,7 @@ dependencies { with(libs) { implementation(bouncycastle) + implementation(json) testImplementation(junit.jupiter.api) testRuntimeOnly(junit.jupiter.api) implementation(gson) From ca6a7fa929118e482a6e7ff51f73c94db885b496 Mon Sep 17 00:00:00 2001 From: CloudS3c Date: Thu, 24 Aug 2023 18:15:30 +0200 Subject: [PATCH 06/17] Tyluurs way of coding --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b638f2511..8cf1ac33c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # meteor-client ![Kotlin](https://img.shields.io/badge/kotlin-%230095D5.svg?style=for-the-badge&logo=kotlin&logoColor=white) ![Java](https://img.shields.io/badge/java-%23ED8B00.svg?style=for-the-badge&logo=java&logoColor=white) ![IntelliJ IDEA](https://img.shields.io/badge/IntelliJIDEA-000000.svg?style=for-the-badge&logo=intellij-idea&logoColor=white) -![OSRS](https://img.shields.io/badge/osrs-215-blue.svg) ![Build Status](https://img.shields.io/github/actions/workflow/status/meteorlite/meteor-client/build.yml?branch=main) +![OSRS](https://img.shields.io/badge/osrs-216-blue.svg) ![Build Status](https://img.shields.io/github/actions/workflow/status/meteorlite/meteor-client/build.yml?branch=main) Join our Discord https://discord.gg/Y85d6NH6z3 A modern Old School Runescape client From 3c1e13831acbbf146120946ee9dcd086d3860a32 Mon Sep 17 00:00:00 2001 From: CloudS3c Date: Thu, 24 Aug 2023 18:21:41 +0200 Subject: [PATCH 07/17] Darwin fix no problem --- client/build.gradle.kts | 2 +- client/src/main/java/meteor/api/ClientPackets.kt | 11 +++++------ osrs/src/main/java/ClientPacket.java | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index ba4f11ef9..53100b1a9 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -53,7 +53,7 @@ dependencies { implementation(kotlin("stdlib-jdk8")) implementation(kotlin("reflect")) implementation(compose.desktop.currentOs) - + implementation(projects.osrs) with(projects) { implementation(apiRs) implementation(api) diff --git a/client/src/main/java/meteor/api/ClientPackets.kt b/client/src/main/java/meteor/api/ClientPackets.kt index 43e10e26f..33a924472 100644 --- a/client/src/main/java/meteor/api/ClientPackets.kt +++ b/client/src/main/java/meteor/api/ClientPackets.kt @@ -1,6 +1,7 @@ @file:Suppress("DEPRECATION") package meteor.api +import ClientPacket import dev.hoot.api.InteractionException import dev.hoot.api.events.AutomatedMenu import dev.hoot.api.game.Game.getClientPacket @@ -10,7 +11,6 @@ import meteor.Main import meteor.plugins.meteor.AutoInteractOverlay import meteor.rs.ClientThread.invoke import net.runelite.api.MenuAction -import net.runelite.api.packets.ClientPacket import net.runelite.api.packets.PacketBufferNode import net.runelite.api.widgets.Widget import net.runelite.api.widgets.WidgetType @@ -26,7 +26,7 @@ object ClientPackets { // param0: worldX // param1: worldY fun createGroundItemAction1Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPOBJ1()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON1) bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) bufferNode.packetBuffer.`writeShort$api`(worldY) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) @@ -38,7 +38,7 @@ object ClientPackets { // param0: worldX // param1: worldY fun createGroundItemAction2Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPOBJ2()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON2) bufferNode.packetBuffer.`writeShortAdd$api`(worldY) bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) @@ -50,7 +50,7 @@ object ClientPackets { // param0: worldX // param1: worldY fun createGroundItemAction3Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPOBJ3()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON3) bufferNode.packetBuffer.`writeShortAdd$api`(worldX) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) @@ -378,7 +378,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON1()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON1) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -560,7 +560,6 @@ object ClientPackets { ) } fun preparePacketBuffer(clientPacket: ClientPacket): PacketBufferNode { - val clientPacket = Main.client.createClientPacket(clientPacket.id, clientPacket.length) return Main.client.preparePacket( clientPacket, diff --git a/osrs/src/main/java/ClientPacket.java b/osrs/src/main/java/ClientPacket.java index 108adf756..613099845 100644 --- a/osrs/src/main/java/ClientPacket.java +++ b/osrs/src/main/java/ClientPacket.java @@ -572,10 +572,10 @@ public class ClientPacket implements class293 { public static final ClientPacket field2572; @ObfuscatedName("dp") @Export("id") - final int id; + public final int id; @ObfuscatedName("dm") @Export("length") - final int length; + public final int length; static { field2592 = new ClientPacket(0, 2); From 33e938cd095a293b3eab10a99bb971d5448d0eec Mon Sep 17 00:00:00 2001 From: Kaballist Date: Thu, 24 Aug 2023 10:05:13 -0700 Subject: [PATCH 08/17] uhh un needed interface methods just use deob as dependency --- .../net/runelite/rs/api/RSClientPacket.java | 214 ----------------- .../runelite/api/packets/ClientPacket.java | 222 ------------------ .../src/main/java/meteor/api/ClientPackets.kt | 75 +++--- osrs/src/main/java/ClientPacket.java | 12 +- osrs/src/main/java/IgnoreList.java | 4 +- 5 files changed, 45 insertions(+), 482 deletions(-) diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSClientPacket.java b/api-rs/src/main/java/net/runelite/rs/api/RSClientPacket.java index bf85a71bb..6da1b43cf 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSClientPacket.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSClientPacket.java @@ -13,219 +13,5 @@ public interface RSClientPacket extends ClientPacket @Override int getLength(); - @Import("RESUME_PAUSEBUTTON") - RSClientPacket RESUME_PAUSEBUTTON(); - @Import("RESUME_NAMEDIALOG") - RSClientPacket RESUME_NAMEDIALOG(); - - @Import("EVENT_KEYBOARD") - RSClientPacket EVENT_KEYBOARD(); - - @Import("EVENT_APPLET_FOCUS") - RSClientPacket EVENT_APPLET_FOCUS(); - -// @Import("CLICKWORLDMAP_TELEPORT") -// RSClientPacket CLICKWORLDMAP_TELEPORT(); - - @Import("IF_BUTTONT") - RSClientPacket IF_BUTTONT(); - - @Import("OPPLAYER6") - RSClientPacket OPPLAYER6(); - - @Import("OPNPC2") - RSClientPacket OPNPC2(); - - @Import("OPPLAYER7") - RSClientPacket OPPLAYER7(); - - @Import("OPNPC3") - RSClientPacket OPNPC3(); - - @Import("OPLOC2") - RSClientPacket OPLOC2(); - - @Import("OPPLAYER8") - RSClientPacket OPPLAYER8(); - - @Import("OPNPC1") - RSClientPacket OPNPC1(); - - @Import("OPLOC1") - RSClientPacket OPLOC1(); - - @Import("OPLOC4") - RSClientPacket OPLOC4(); - - @Import("FREECAM_EXIT") - RSClientPacket FREECAM_EXIT(); - - @Import("OPPLAYER2") - RSClientPacket OPPLAYER2(); - - @Import("OPLOC3") - RSClientPacket OPLOC3(); - - @Import("OPPLAYER3") - RSClientPacket OPPLAYER3(); - - @Import("OPPLAYER4") - RSClientPacket OPPLAYER4(); - - @Import("OPNPC4") - RSClientPacket OPNPC4(); - - @Import("LOGIN_TIMINGS") - RSClientPacket LOGIN_TIMINGS(); - - @Import("OPLOC5") - RSClientPacket OPLOC5(); - - @Import("OPPLAYER5") - RSClientPacket OPPLAYER5(); - - @Import("EVENT_MOUSE_IDLE") - RSClientPacket EVENT_MOUSE_IDLE(); - - @Import("OPNPC5") - RSClientPacket OPNPC5(); - - @Import("CHAT_SENDPRIVATE") - RSClientPacket CHAT_SENDPRIVATE(); - - @Import("CLOSE_MODAL") - RSClientPacket CLOSE_MODAL(); - - @Import("OPPLAYER1") - RSClientPacket OPPLAYER1(); - - @Import("CHAT_SENDABUSEREPORT") - RSClientPacket CHAT_SENDABUSEREPORT(); - - @Import("PING_STATISTICS") - RSClientPacket PING_STATISTICS(); - - @Import("EVENT_WINDOW_SETTING") - RSClientPacket EVENT_WINDOW_SETTING(); - - @Import("OPOBJ1") - RSClientPacket OPOBJ1(); - - @Import("FRIEND_ADDUSER") - RSClientPacket FRIEND_ADDUSER(); - - @Import("DOCHEAT") - RSClientPacket DOCHEAT(); - - @Import("IF_BUTTON9") - RSClientPacket IF_BUTTON9(); - - @Import("CLAN_KICKUSER") - RSClientPacket CLAN_KICKUSER(); - - @Import("IF_BUTTON8") - RSClientPacket IF_BUTTON8(); - - @Import("OPOBJ5") - RSClientPacket OPOBJ5(); - - @Import("IGNORE_DELUSER") - RSClientPacket IGNORE_DELUSER(); - - @Import("IF_BUTTON5") - RSClientPacket IF_BUTTON5(); - - @Import("IF_BUTTON4") - RSClientPacket IF_BUTTON4(); - - @Import("OPOBJ4") - RSClientPacket OPOBJ4(); - - @Import("OPOBJ3") - RSClientPacket OPOBJ3(); - - @Import("IF_BUTTON7") - RSClientPacket IF_BUTTON7(); - - @Import("CHAT_SETFILTER") - RSClientPacket CHAT_SETFILTER(); - - @Import("OPOBJ2") - RSClientPacket OPOBJ2(); - - @Import("IF_BUTTON6") - RSClientPacket IF_BUTTON6(); - - @Import("OPHELDD") - RSClientPacket OPHELDD(); - - @Import("RESUME_COUNTDIALOG") - RSClientPacket RESUME_COUNTDIALOG(); - - @Import("NO_TIMEOUT") - RSClientPacket NO_TIMEOUT(); - - @Import("OPLOCT") - RSClientPacket OPLOCT(); - - @Import("RESUME_OBJDIALOG") - RSClientPacket RESUME_OBJDIALOG(); - - @Import("OPPLAYERT") - RSClientPacket OPPLAYERT(); - - @Import("OPNPCT") - RSClientPacket OPNPCT(); - - @Import("FRIEND_DELUSER") - RSClientPacket FRIEND_DELUSER(); - - //@Import("IF_BUTTOND") - //RSClientPacket IF_BUTTOND(); - - @Import("OPLOCE") - RSClientPacket OPLOCE(); - - @Import("OPNPCE") - RSClientPacket OPNPCE(); - - @Import("EVENT_CAMERA_POSITION") - RSClientPacket EVENT_CAMERA_POSITION(); - - @Import("REFLECTION_CHECK_REPLY") - RSClientPacket REFLECTION_CHECK_REPLY(); - - @Import("OPOBJT") - RSClientPacket OPOBJT(); - - @Import("DETECT_MODIFIED_CLIENT") - RSClientPacket DETECT_MODIFIED_CLIENT(); - - @Import("OPOBJE") - RSClientPacket OPOBJE(); - - @Import("RESUME_STRINGDIALOG") - RSClientPacket RESUME_STRINGDIALOG(); - - @Import("IF_BUTTON1") - RSClientPacket IF_BUTTON1(); - - @Import("MOVE_GAMECLICK") - RSClientPacket MOVE_GAMECLICK(); - - @Import("IF_BUTTON3") - RSClientPacket IF_BUTTON3(); - - @Import("IF_BUTTON2") - RSClientPacket IF_BUTTON2(); - - @Import("EVENT_MOUSE_CLICK") - RSClientPacket EVENT_MOUSE_CLICK(); - - @Import("IF_BUTTON10") - RSClientPacket IF_BUTTON10(); - - @Import("WIDGET_TYPE") - RSClientPacket WIDGET_TYPE(); } \ No newline at end of file diff --git a/api/src/main/java/net/runelite/api/packets/ClientPacket.java b/api/src/main/java/net/runelite/api/packets/ClientPacket.java index 99062ab89..9f3b08c7f 100644 --- a/api/src/main/java/net/runelite/api/packets/ClientPacket.java +++ b/api/src/main/java/net/runelite/api/packets/ClientPacket.java @@ -8,226 +8,4 @@ public interface ClientPacket int getLength(); - ClientPacket RESUME_PAUSEBUTTON(); - - ClientPacket RESUME_NAMEDIALOG(); - - ClientPacket EVENT_KEYBOARD(); - - ClientPacket EVENT_APPLET_FOCUS(); - -// ClientPacket CLICKWORLDMAP_TELEPORT(); - - ClientPacket IF_BUTTONT(); - - ClientPacket OPPLAYER6(); - - ClientPacket OPNPC2(); - - ClientPacket OPPLAYER7(); - - ClientPacket OPNPC3(); - - ClientPacket OPLOC2(); - - ClientPacket OPPLAYER8(); - - ClientPacket OPNPC1(); - - ClientPacket OPLOC1(); - - ClientPacket OPLOC4(); - - ClientPacket FREECAM_EXIT(); - - ClientPacket OPPLAYER2(); - - ClientPacket OPLOC3(); - - ClientPacket OPPLAYER3(); - - ClientPacket OPPLAYER4(); - - ClientPacket OPNPC4(); - - ClientPacket LOGIN_TIMINGS(); - - ClientPacket OPLOC5(); - - ClientPacket OPPLAYER5(); - - ClientPacket EVENT_MOUSE_IDLE(); - - ClientPacket OPNPC5(); - - ClientPacket CHAT_SENDPRIVATE(); - - ClientPacket CLOSE_MODAL(); - - ClientPacket OPPLAYER1(); - - ClientPacket CHAT_SENDABUSEREPORT(); - - ClientPacket PING_STATISTICS(); - - ClientPacket EVENT_WINDOW_SETTING(); - - ClientPacket OPOBJ1(); - - ClientPacket FRIEND_ADDUSER(); - - ClientPacket DOCHEAT(); - - ClientPacket IF_BUTTON9(); - - ClientPacket CLAN_KICKUSER(); - - ClientPacket IF_BUTTON8(); - - ClientPacket OPOBJ5(); - - ClientPacket IGNORE_DELUSER(); - - ClientPacket IF_BUTTON5(); - - ClientPacket IF_BUTTON4(); - - ClientPacket OPOBJ4(); - - ClientPacket OPOBJ3(); - - ClientPacket IF_BUTTON7(); - - ClientPacket CHAT_SETFILTER(); - - ClientPacket OPOBJ2(); - - ClientPacket IF_BUTTON6(); - - ClientPacket OPHELDD(); - - ClientPacket RESUME_COUNTDIALOG(); - - ClientPacket NO_TIMEOUT(); - - ClientPacket OPLOCT(); - - ClientPacket RESUME_OBJDIALOG(); - - ClientPacket OPPLAYERT(); - - ClientPacket OPNPCT(); - - ClientPacket FRIEND_DELUSER(); - - //ClientPacket IF_BUTTOND(); - - ClientPacket OPLOCE(); - - ClientPacket OPNPCE(); - - ClientPacket EVENT_CAMERA_POSITION(); - - ClientPacket REFLECTION_CHECK_REPLY(); - - ClientPacket OPOBJT(); - - ClientPacket DETECT_MODIFIED_CLIENT(); - - ClientPacket OPOBJE(); - - ClientPacket RESUME_STRINGDIALOG(); - - ClientPacket IF_BUTTON1(); - - ClientPacket MOVE_GAMECLICK(); - - ClientPacket IF_BUTTON3(); - - ClientPacket IF_BUTTON2(); - - ClientPacket EVENT_MOUSE_CLICK(); - - ClientPacket IF_BUTTON10(); - - ClientPacket WIDGET_TYPE(); - - default Map getClientPackets() - { - //noinspection RedundantTypeArguments (explicit type arguments speedup compilation and analysis time) - return Map.ofEntries( - Map.entry(RESUME_PAUSEBUTTON(), "RESUME_PAUSEBUTTON"), - Map.entry(RESUME_NAMEDIALOG(), "RESUME_NAMEDIALOG"), - Map.entry(EVENT_KEYBOARD(), "EVENT_KEYBOARD"), - Map.entry(EVENT_APPLET_FOCUS(), "EVENT_APPLET_FOCUS"), -// Map.entry(CLICKWORLDMAP_TELEPORT(), "CLICKWORLDMAP_TELEPORT"), - Map.entry(IF_BUTTONT(), "IF_BUTTONT"), - Map.entry(OPPLAYER6(), "OPPLAYER6"), - Map.entry(OPNPC2(), "OPNPC2"), - Map.entry(OPPLAYER7(), "OPPLAYER7"), - Map.entry(OPNPC3(), "OPNPC3"), - Map.entry(OPLOC2(), "OPLOC2"), - Map.entry(OPPLAYER8(), "OPPLAYER8"), - Map.entry(OPNPC1(), "OPNPC1"), - Map.entry(OPLOC1(), "OPLOC1"), - Map.entry(OPLOC4(), "OPLOC4"), - Map.entry(FREECAM_EXIT(), "FREECAM_EXIT"), - Map.entry(OPPLAYER2(), "OPPLAYER2"), - Map.entry(OPLOC3(), "OPLOC3"), - Map.entry(OPPLAYER3(), "OPPLAYER3"), - Map.entry(OPPLAYER4(), "OPPLAYER4"), - Map.entry(OPNPC4(), "OPNPC4"), - Map.entry(LOGIN_TIMINGS(), "LOGIN_TIMINGS"), - Map.entry(OPLOC5(), "OPLOC5"), - Map.entry(OPPLAYER5(), "OPPLAYER5"), - Map.entry(EVENT_MOUSE_IDLE(), "EVENT_MOUSE_IDLE"), - Map.entry(OPNPC5(), "OPNPC5"), - Map.entry(CHAT_SENDPRIVATE(), "CHAT_SENDPRIVATE"), - Map.entry(CLOSE_MODAL(), "CLOSE_MODAL"), - Map.entry(OPPLAYER1(), "OPPLAYER1"), - Map.entry(CHAT_SENDABUSEREPORT(), "CHAT_SENDABUSEREPORT"), - Map.entry(PING_STATISTICS(), "PING_STATISTICS"), - Map.entry(EVENT_WINDOW_SETTING(), "EVENT_WINDOW_SETTING"), - Map.entry(OPOBJ1(), "OPOBJ1"), - Map.entry(FRIEND_ADDUSER(), "FRIEND_ADDUSER"), - Map.entry(DOCHEAT(), "DOCHEAT"), - Map.entry(IF_BUTTON9(), "IF_BUTTON9"), - Map.entry(CLAN_KICKUSER(), "CLAN_KICKUSER"), - Map.entry(IF_BUTTON8(), "IF_BUTTON8"), - Map.entry(OPOBJ5(), "OPOBJ5"), - Map.entry(IGNORE_DELUSER(), "IGNORE_DELUSER"), - Map.entry(IF_BUTTON5(), "IF_BUTTON5"), - Map.entry(IF_BUTTON4(), "IF_BUTTON4"), - Map.entry(OPOBJ4(), "OPOBJ4"), - Map.entry(OPOBJ3(), "OPOBJ3"), - Map.entry(IF_BUTTON7(), "IF_BUTTON7"), - Map.entry(CHAT_SETFILTER(), "CHAT_SETFILTER"), - Map.entry(OPOBJ2(), "OPOBJ2"), - Map.entry(IF_BUTTON6(), "IF_BUTTON6"), - Map.entry(OPHELDD(), "OPHELDD"), - Map.entry(RESUME_COUNTDIALOG(), "RESUME_COUNTDIALOG"), - Map.entry(NO_TIMEOUT(), "NO_TIMEOUT"), - Map.entry(OPLOCT(), "OPLOCT"), - Map.entry(RESUME_OBJDIALOG(), "RESUME_OBJDIALOG"), - Map.entry(OPPLAYERT(), "OPPLAYERT"), - Map.entry(OPNPCT(), "OPNPCT"), - Map.entry(FRIEND_DELUSER(), "FRIEND_DELUSER"), - //Map.entry(IF_BUTTOND(), "IF_BUTTOND"), - Map.entry(OPLOCE(), "OPLOCE"), - Map.entry(OPNPCE(), "OPNPCE"), - Map.entry(EVENT_CAMERA_POSITION(), "EVENT_CAMERA_POSITION"), - Map.entry(REFLECTION_CHECK_REPLY(), "REFLECTION_CHECK_REPLY"), - Map.entry(OPOBJT(), "OPOBJT"), - Map.entry(DETECT_MODIFIED_CLIENT(), "DETECT_MODIFIED_CLIENT"), - Map.entry(OPOBJE(), "OPOBJE"), - Map.entry(RESUME_STRINGDIALOG(), "RESUME_STRINGDIALOG"), - Map.entry(IF_BUTTON1(), "IF_BUTTON1"), - Map.entry(MOVE_GAMECLICK(), "MOVE_GAMECLICK"), - Map.entry(IF_BUTTON3(), "IF_BUTTON3"), - Map.entry(IF_BUTTON2(), "IF_BUTTON2"), - Map.entry(EVENT_MOUSE_CLICK(), "EVENT_MOUSE_CLICK"), - Map.entry(IF_BUTTON10(), "IF_BUTTON10"), - Map.entry(WIDGET_TYPE(), "WIDGET_TYPE") - ); - } } \ No newline at end of file diff --git a/client/src/main/java/meteor/api/ClientPackets.kt b/client/src/main/java/meteor/api/ClientPackets.kt index 33a924472..2c52cdd3c 100644 --- a/client/src/main/java/meteor/api/ClientPackets.kt +++ b/client/src/main/java/meteor/api/ClientPackets.kt @@ -4,7 +4,6 @@ package meteor.api import ClientPacket import dev.hoot.api.InteractionException import dev.hoot.api.events.AutomatedMenu -import dev.hoot.api.game.Game.getClientPacket import dev.hoot.api.packets.WidgetPackets import dev.hoot.api.widgets.Widgets import meteor.Main @@ -62,7 +61,7 @@ object ClientPackets { // param0: worldX // param1: worldY fun createGroundItemAction4Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPOBJ4()) + val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ4) bufferNode.packetBuffer.`writeShortAdd$api`(worldX) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) @@ -74,7 +73,7 @@ object ClientPackets { // param0: worldX // param1: worldY fun createGroundItemAction5Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPOBJ5()) + val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ5) bufferNode.packetBuffer.`writeShortLE$api`(worldY) bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShort$api`(worldX) @@ -91,7 +90,7 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPLOC1()) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC1) bufferNode.packetBuffer.`writeShort$api`(worldX) bufferNode.packetBuffer.`writeIntME$api`(worldY) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) @@ -108,7 +107,7 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPLOC2()) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC2) bufferNode.packetBuffer.`writeShort$api`(worldX) bufferNode.packetBuffer.`writeShort$api`(worldY) bufferNode.packetBuffer.`writeIntME$api`(objectID) @@ -125,7 +124,7 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPLOC3()) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC3) bufferNode.packetBuffer.`writeShort$api`(objectID) bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) @@ -142,7 +141,7 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPLOC4()) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC4) bufferNode.packetBuffer.`writeShortAdd$api`(objectID) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAdd$api`(worldY) @@ -159,7 +158,7 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPLOC5()) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC5) bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) bufferNode.packetBuffer.`writeIntME$api`(worldX) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) @@ -179,7 +178,7 @@ object ClientPackets { itemWidgetID: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPLOCT()) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOCT) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortLE$api`(objectID) bufferNode.packetBuffer.`writeShortLE$api`(itemId) @@ -198,7 +197,7 @@ object ClientPackets { itemSlot: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPNPCT()) + val bufferNode = preparePacketBuffer(ClientPacket.OPNPCT) bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) bufferNode.packetBuffer.`writeShortLE$api`(itemSlot) bufferNode.packetBuffer.`writeShortLE$api`(itemID) @@ -209,7 +208,7 @@ object ClientPackets { //OPNPC1 fun createNPCAction1Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPNPC1()) + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC1) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAdd$api`(npcIdx) return bufferNode @@ -217,7 +216,7 @@ object ClientPackets { //OPNPC2 fun createNPCAction2Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPNPC2()) + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC2) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeIntME$api`(npcIdx) return bufferNode @@ -225,7 +224,7 @@ object ClientPackets { //OPNPC3 fun createNPCAction3Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPNPC3()) + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC3) bufferNode.packetBuffer.`writeShort$api`(npcIdx) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) return bufferNode @@ -233,7 +232,7 @@ object ClientPackets { //OPNPC4 fun createNPCAction4Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPNPC4()) + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC4) bufferNode.packetBuffer.`writeByteAdd$api`(npcIdx) bufferNode.packetBuffer.`writeShort$api`(if (shiftPressed) 1 else 0) return bufferNode @@ -241,7 +240,7 @@ object ClientPackets { //OPNPC5 fun createNPCAction5Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPNPC5()) + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC5) bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeIntME$api`(npcIdx) return bufferNode @@ -255,7 +254,7 @@ object ClientPackets { itemWidgetID: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYERT()) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYERT) bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) bufferNode.packetBuffer.`writeIntME$api`(itemWidgetID) bufferNode.packetBuffer.`writeIntIME$api`(itemSlot) @@ -266,7 +265,7 @@ object ClientPackets { ///OPPLAYER1 fun createPlayerAction1Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER1()) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER1) bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode @@ -274,7 +273,7 @@ object ClientPackets { ///OPPLAYER2 fun createPlayerAction2Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER2()) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER2) bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) return bufferNode @@ -282,7 +281,7 @@ object ClientPackets { ///OPPLAYER3 fun createPlayerAction3Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER3()) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER3) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShort$api`(playerIdx) return bufferNode @@ -290,7 +289,7 @@ object ClientPackets { ///OPPLAYER4 fun createPlayerAction4Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER4()) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER4) bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) return bufferNode @@ -298,7 +297,7 @@ object ClientPackets { ///OPPLAYER5 fun createPlayerAction5Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER5()) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER5) bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode @@ -306,7 +305,7 @@ object ClientPackets { ///OPPLAYER6 fun createPlayerAction6Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER6()) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER6) bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode @@ -314,7 +313,7 @@ object ClientPackets { ///OPPLAYER7 fun createPlayerAction7Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER7()) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER7) bufferNode.packetBuffer.`writeIntME$api`(playerIdx) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) return bufferNode @@ -322,7 +321,7 @@ object ClientPackets { ///OPPLAYER8 fun createPlayerAction8Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPPLAYER8()) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER8) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) return bufferNode @@ -338,7 +337,7 @@ object ClientPackets { itemWidgetID: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().OPLOCT()) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOCT) bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) bufferNode.packetBuffer.`writeShort$api`(groundItemID) bufferNode.packetBuffer.`writeShort$api`(itemID) @@ -360,7 +359,7 @@ object ClientPackets { destinationSlot: Int, destinationItemId: Int ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTONT()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTONT) bufferNode.packetBuffer.`writeShort$api`(destinationItemId) bufferNode.packetBuffer.`writeIntME$api`(sourceWidgetId) bufferNode.packetBuffer.`writeShortLE$api`(destinationSlot) @@ -393,7 +392,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON2()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON2) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -408,7 +407,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON3()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON3) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -423,7 +422,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON4()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON4) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -438,7 +437,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON5()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON5) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -453,7 +452,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON6()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON6) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -468,7 +467,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON7()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON7) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -483,7 +482,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON8()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON8) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -498,7 +497,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON9()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON9) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -513,7 +512,7 @@ object ClientPackets { itemId: Int, childId: Int, ): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().IF_BUTTON10()) + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON10) bufferNode.packetBuffer.`writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) @@ -522,7 +521,7 @@ object ClientPackets { // CLICK fun createClickPacket(mouseInfo: Int, x: Int, y: Int): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().EVENT_MOUSE_CLICK()) + val bufferNode = preparePacketBuffer(ClientPacket.EVENT_MOUSE_CLICK) bufferNode.packetBuffer.`writeShort$api`(mouseInfo) bufferNode.packetBuffer.`writeShort$api`(y) bufferNode.packetBuffer.`writeShort$api`(x) @@ -532,7 +531,7 @@ object ClientPackets { // WALK fun createMovementPacket(worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().MOVE_GAMECLICK()) + val bufferNode = preparePacketBuffer(ClientPacket.MOVE_GAMECLICK) bufferNode.packetBuffer.`writeByte$api`(5) bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) bufferNode.packetBuffer.`writeShortAdd$api`(worldY) @@ -542,7 +541,7 @@ object ClientPackets { // CONTINUE fun createContinuePacket(widgetId: Int, childId: Int): PacketBufferNode { - val bufferNode = preparePacketBuffer(getClientPacket().RESUME_PAUSEBUTTON()) + val bufferNode = preparePacketBuffer(ClientPacket.CONTINUE) bufferNode.packetBuffer.`writeIntME$api`(widgetId) bufferNode.packetBuffer.`writeShortLE$api`(childId) return bufferNode diff --git a/osrs/src/main/java/ClientPacket.java b/osrs/src/main/java/ClientPacket.java index 613099845..6bb6d1198 100644 --- a/osrs/src/main/java/ClientPacket.java +++ b/osrs/src/main/java/ClientPacket.java @@ -273,7 +273,7 @@ public class ClientPacket implements class293 { descriptor = "Llw;" ) @Export("OPOBJ5") - static final ClientPacket OPOBJ5; + public static final ClientPacket OPOBJ5_; @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "Llw;" @@ -424,7 +424,7 @@ public class ClientPacket implements class293 { descriptor = "Llw;" ) @Export("OPOBJ6") - public static final ClientPacket OPOBJ6; + public static final ClientPacket OPOBJ5; @ObfuscatedName("cj") @ObfuscatedSignature( descriptor = "Llw;" @@ -461,7 +461,7 @@ public class ClientPacket implements class293 { @ObfuscatedSignature( descriptor = "Llw;" ) - public static final ClientPacket field2576; + public static final ClientPacket OPNPCT; @ObfuscatedName("dj") @ObfuscatedSignature( descriptor = "Llw;" @@ -623,7 +623,7 @@ public class ClientPacket implements class293 { OPOBJ3 = new ClientPacket(42, -1); REFLECTION_CHECK_REPLY = new ClientPacket(43, -1); OPOBJ4 = new ClientPacket(44, 7); - OPOBJ5 = new ClientPacket(45, 7); + OPOBJ5_ = new ClientPacket(45, 7); OPOBJE = new ClientPacket(46, 6); EVENT_APPLET_FOCUS = new ClientPacket(47, 1); OPPLAYER6 = new ClientPacket(48, 3); @@ -649,14 +649,14 @@ public class ClientPacket implements class293 { IF_BUTTON3 = new ClientPacket(68, 8); OPPLAYERU = new ClientPacket(69, 11); AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL = new ClientPacket(70, -1); - OPOBJ6 = new ClientPacket(71, 7); + OPOBJ5 = new ClientPacket(71, 7); notsure = new ClientPacket(72, -1); OPLOC4 = new ClientPacket(73, 7); FRIEND_SETRANK = new ClientPacket(74, -1); field2569 = new ClientPacket(75, 0); IF_BUTTON9 = new ClientPacket(76, 8); OPOBJT = new ClientPacket(77, 15); - field2576 = new ClientPacket(78, 11); + OPNPCT = new ClientPacket(78, 11); OPLOC1 = new ClientPacket(79, 7); SET_CHATFILTERSETTINGS = new ClientPacket(80, 3); OPNPC3 = new ClientPacket(81, 3); diff --git a/osrs/src/main/java/IgnoreList.java b/osrs/src/main/java/IgnoreList.java index c21b793ed..1e59d9aea 100644 --- a/osrs/src/main/java/IgnoreList.java +++ b/osrs/src/main/java/IgnoreList.java @@ -299,7 +299,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2576, Client.packetWriter.isaacCipher); + var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPCT, Client.packetWriter.isaacCipher); var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); var10.packetBuffer.writeShortAdd(var3); var10.packetBuffer.writeIntME(Client.selectedSpellItemId); @@ -606,7 +606,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJ6, Client.packetWriter.isaacCipher); + var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJ5, Client.packetWriter.isaacCipher); var16.packetBuffer.writeShortAddLE(var0 + UrlRequester.baseX); var16.packetBuffer.writeShort(class47.baseY + var1); var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); From decdbbb8090243f4f200ad4d4837ba840de6e390 Mon Sep 17 00:00:00 2001 From: Kaballist Date: Tue, 26 Sep 2023 00:20:08 -0700 Subject: [PATCH 09/17] mostly reved --- .../java/net/runelite/rs/api/RSWidget.java | 2 +- .../runelite/rs/api/RSWidgetDefinition.java | 30 + .../src/main/java/meteor/api/ClientPackets.kt | 174 +- .../src/main/java/mixins/RSArchiveMixin.java | 2 +- .../src/main/java/mixins/RSClientMixin.java | 22 +- .../src/main/java/mixins/ReflectionMixin.java | 16 +- .../main/java/mixins/WidgetSpriteMixin.java | 7 +- osrs/src/main/java/AABB.java | 20 +- osrs/src/main/java/AbstractArchive.java | 494 +- .../main/java/AbstractByteArrayCopier.java | 34 +- osrs/src/main/java/AbstractFont.java | 228 +- .../src/main/java/AbstractRasterProvider.java | 42 +- osrs/src/main/java/AbstractSocket.java | 71 +- osrs/src/main/java/AbstractSound.java | 4 +- .../src/main/java/AbstractUserComparator.java | 24 +- osrs/src/main/java/AbstractWorldMapData.java | 150 +- osrs/src/main/java/AbstractWorldMapIcon.java | 84 +- osrs/src/main/java/AccessFile.java | 36 +- osrs/src/main/java/Actor.java | 614 +- osrs/src/main/java/AddRequestTask.java | 85 +- osrs/src/main/java/Animation.java | 72 +- .../main/java/ApproximateRouteStrategy.java | 105 +- osrs/src/main/java/Archive.java | 276 +- osrs/src/main/java/ArchiveDisk.java | 141 +- osrs/src/main/java/ArchiveDiskAction.java | 25 +- .../main/java/ArchiveDiskActionHandler.java | 504 +- osrs/src/main/java/ArchiveLoader.java | 157 +- osrs/src/main/java/AttackOption.java | 213 +- osrs/src/main/java/AudioFilter.java | 114 +- osrs/src/main/java/BZip2Decompressor.java | 82 +- osrs/src/main/java/BZip2State.java | 106 +- osrs/src/main/java/BoundaryObject.java | 33 +- osrs/src/main/java/Bounds.java | 138 +- osrs/src/main/java/Buddy.java | 103 +- osrs/src/main/java/BuddyRankComparator.java | 50 +- osrs/src/main/java/Buffer.java | 622 +- osrs/src/main/java/BufferedFile.java | 104 +- osrs/src/main/java/BufferedNetSocket.java | 60 +- osrs/src/main/java/BufferedSink.java | 48 +- osrs/src/main/java/BufferedSource.java | 74 +- osrs/src/main/java/ByteArrayPool.java | 270 +- osrs/src/main/java/Calendar.java | 31 +- osrs/src/main/java/Canvas.java | 181 +- osrs/src/main/java/ChatChannel.java | 61 +- osrs/src/main/java/ClanChannel.java | 189 +- osrs/src/main/java/ClanChannelMember.java | 276 +- osrs/src/main/java/ClanMate.java | 42 +- osrs/src/main/java/ClanSettings.java | 353 +- osrs/src/main/java/Client.java | 6800 +++++++++-------- osrs/src/main/java/ClientPacket.java | 1016 +-- osrs/src/main/java/ClientPreferences.java | 426 +- osrs/src/main/java/Clips.java | 96 +- osrs/src/main/java/Clock.java | 45 +- osrs/src/main/java/CollisionMap.java | 236 +- osrs/src/main/java/ConcurrentMidiTask.java | 65 +- osrs/src/main/java/Coord.java | 35 +- osrs/src/main/java/DbRowType.java | 58 +- osrs/src/main/java/DbTableType.java | 43 +- osrs/src/main/java/Decimator.java | 406 +- osrs/src/main/java/DefaultsGroup.java | 108 +- osrs/src/main/java/DelayFadeTask.java | 30 +- osrs/src/main/java/DemotingHashTable.java | 42 +- .../java/DesktopPlatformInfoProvider.java | 70 +- osrs/src/main/java/DevicePcmPlayer.java | 52 +- .../main/java/DevicePcmPlayerProvider.java | 270 +- osrs/src/main/java/DirectByteArrayCopier.java | 100 +- osrs/src/main/java/DirectWrapper.java | 8 +- osrs/src/main/java/DualNode.java | 14 +- osrs/src/main/java/DualNodeDeque.java | 22 +- osrs/src/main/java/DynamicObject.java | 276 +- osrs/src/main/java/EnumComposition.java | 159 +- .../main/java/EvictingDualNodeHashTable.java | 30 +- osrs/src/main/java/FaceNormal.java | 19 +- osrs/src/main/java/FadeInTask.java | 112 +- osrs/src/main/java/FadeOutTask.java | 60 +- osrs/src/main/java/FileSystem.java | 112 +- osrs/src/main/java/FillMode.java | 43 - osrs/src/main/java/FloorDecoration.java | 161 +- .../src/main/java/FloorOverlayDefinition.java | 112 +- .../main/java/FloorUnderlayDefinition.java | 113 +- osrs/src/main/java/Font.java | 6 +- osrs/src/main/java/FontName.java | 282 +- osrs/src/main/java/Fonts.java | 42 +- osrs/src/main/java/Frames.java | 421 +- osrs/src/main/java/Friend.java | 111 +- osrs/src/main/java/FriendLoginUpdate.java | 19 +- osrs/src/main/java/FriendSystem.java | 249 +- osrs/src/main/java/FriendsChat.java | 291 +- osrs/src/main/java/FriendsList.java | 54 +- osrs/src/main/java/GZipDecompressor.java | 10 +- osrs/src/main/java/GameBuild.java | 174 +- osrs/src/main/java/GameEngine.java | 656 +- osrs/src/main/java/GameObject.java | 58 +- osrs/src/main/java/GrandExchangeEvent.java | 49 +- osrs/src/main/java/GrandExchangeEvents.java | 20 +- osrs/src/main/java/GrandExchangeOffer.java | 59 +- .../java/GrandExchangeOfferAgeComparator.java | 25 +- .../GrandExchangeOfferNameComparator.java | 411 +- .../GrandExchangeOfferOwnWorldComparator.java | 171 +- ...dExchangeOfferTotalQuantityComparator.java | 241 +- ...GrandExchangeOfferUnitPriceComparator.java | 29 +- .../GrandExchangeOfferWorldComparator.java | 906 +-- osrs/src/main/java/GraphicsDefaults.java | 109 +- osrs/src/main/java/GraphicsObject.java | 51 +- osrs/src/main/java/HealthBar.java | 129 +- osrs/src/main/java/HealthBarDefinition.java | 139 +- osrs/src/main/java/HealthBarUpdate.java | 110 +- osrs/src/main/java/HitSplatDefinition.java | 345 +- osrs/src/main/java/HorizontalAlignment.java | 97 +- osrs/src/main/java/Huffman.java | 35 +- osrs/src/main/java/IgnoreList.java | 744 +- osrs/src/main/java/Ignored.java | 89 +- osrs/src/main/java/IndexedSprite.java | 35 +- osrs/src/main/java/Instrument.java | 84 +- osrs/src/main/java/IntHashTable.java | 8 +- osrs/src/main/java/IntegerNode.java | 4 +- osrs/src/main/java/InterfaceParent.java | 163 +- osrs/src/main/java/Interpreter.java | 536 +- osrs/src/main/java/InvDefinition.java | 289 +- osrs/src/main/java/IsaacCipher.java | 54 +- osrs/src/main/java/ItemComposition.java | 413 +- osrs/src/main/java/ItemContainer.java | 45 +- osrs/src/main/java/ItemLayer.java | 145 +- osrs/src/main/java/IterableDualNodeQueue.java | 36 +- .../java/IterableDualNodeQueueIterator.java | 16 +- osrs/src/main/java/IterableNodeDeque.java | 62 +- .../IterableNodeDequeDescendingIterator.java | 30 +- osrs/src/main/java/IterableNodeHashTable.java | 22 +- .../java/IterableNodeHashTableIterator.java | 20 +- osrs/src/main/java/JSException.java | 36 + osrs/src/main/java/JagNetThread.java | 588 +- osrs/src/main/java/JagexCache.java | 157 +- osrs/src/main/java/KeyHandler.java | 281 +- osrs/src/main/java/KitDefinition.java | 417 +- osrs/src/main/java/Language.java | 244 +- osrs/src/main/java/Link.java | 12 +- osrs/src/main/java/LinkDeque.java | 22 +- osrs/src/main/java/Login.java | 207 +- osrs/src/main/java/LoginPacket.java | 268 +- osrs/src/main/java/LoginScreenAnimation.java | 314 +- osrs/src/main/java/LoginType.java | 122 +- osrs/src/main/java/LongNode.java | 4 +- osrs/src/main/java/MenuAction.java | 150 +- osrs/src/main/java/Message.java | 126 +- osrs/src/main/java/Messages.java | 78 +- osrs/src/main/java/MidiFileReader.java | 96 +- osrs/src/main/java/MidiPcmStream.java | 968 ++- osrs/src/main/java/MilliClock.java | 113 +- osrs/src/main/java/ModeWhere.java | 266 +- osrs/src/main/java/Model.java | 1277 ++-- osrs/src/main/java/ModelData.java | 368 +- osrs/src/main/java/ModelData0.java | 248 +- osrs/src/main/java/MouseHandler.java | 215 +- osrs/src/main/java/MouseRecorder.java | 398 +- osrs/src/main/java/MouseWheelHandler.java | 24 +- osrs/src/main/java/MoveSpeed.java | 92 +- osrs/src/main/java/MusicPatch.java | 223 +- osrs/src/main/java/MusicPatchNode.java | 90 +- osrs/src/main/java/MusicPatchNode2.java | 197 +- osrs/src/main/java/MusicPatchPcmStream.java | 148 +- osrs/src/main/java/MusicSong.java | 167 +- osrs/src/main/java/MusicTrack.java | 26 +- osrs/src/main/java/NPC.java | 265 +- osrs/src/main/java/NPCComposition.java | 418 +- osrs/src/main/java/NanoClock.java | 20 +- osrs/src/main/java/NewShit.java | 56 +- osrs/src/main/java/Node.java | 8 +- osrs/src/main/java/NodeDeque.java | 30 +- osrs/src/main/java/NodeHashTable.java | 24 +- osrs/src/main/java/Null.java | 26 - osrs/src/main/java/OAuthApi.java | 5 - osrs/src/main/java/ObfuscatedClassMap.java | 8 - osrs/src/main/java/ObjTypeCustomisation.java | 86 +- osrs/src/main/java/ObjectComposition.java | 278 +- osrs/src/main/java/ObjectNode.java | 4 +- osrs/src/main/java/ObjectSound.java | 313 +- osrs/src/main/java/Occluder.java | 351 +- osrs/src/main/java/OtlTokenRequester.java | 15 - osrs/src/main/java/PacketBuffer.java | 134 +- osrs/src/main/java/PacketBufferNode.java | 274 +- osrs/src/main/java/PacketWriter.java | 317 +- osrs/src/main/java/ParamComposition.java | 521 +- osrs/src/main/java/PcmPlayer.java | 989 +-- osrs/src/main/java/PcmStream.java | 34 +- osrs/src/main/java/PcmStreamMixer.java | 118 +- .../src/main/java/PcmStreamMixerListener.java | 12 +- osrs/src/main/java/PendingSpawn.java | 123 +- osrs/src/main/java/PlatformInfo.java | 230 +- osrs/src/main/java/Player.java | 285 +- osrs/src/main/java/PlayerComposition.java | 356 +- osrs/src/main/java/PlayerType.java | 150 +- osrs/src/main/java/Players.java | 95 +- osrs/src/main/java/PrivateChatMode.java | 28 +- osrs/src/main/java/Projectile.java | 415 +- osrs/src/main/java/RasterProvider.java | 34 +- osrs/src/main/java/Rasterizer2D.java | 150 +- osrs/src/main/java/Rasterizer3D.java | 196 +- osrs/src/main/java/RawPcmStream.java | 940 +-- osrs/src/main/java/RawSound.java | 20 +- osrs/src/main/java/ReflectionCheck.java | 395 +- .../java/RefreshAccessTokenRequester.java | 12 - .../main/java/RefreshAccessTokenResponse.java | 19 - osrs/src/main/java/Renderable.java | 37 +- osrs/src/main/java/RouteStrategy.java | 46 +- osrs/src/main/java/RunException.java | 31 +- osrs/src/main/java/RuneLiteMenuEntry.java | 18 +- osrs/src/main/java/Scene.java | 704 +- osrs/src/main/java/SceneTileModel.java | 80 +- osrs/src/main/java/SceneTilePaint.java | 156 +- osrs/src/main/java/Script.java | 99 +- osrs/src/main/java/ScriptEvent.java | 433 +- osrs/src/main/java/ScriptFrame.java | 38 +- osrs/src/main/java/ScriptOpcodes.java | 3 - osrs/src/main/java/SecureRandomCallable.java | 251 +- osrs/src/main/java/SecureRandomFuture.java | 285 +- osrs/src/main/java/SequenceDefinition.java | 253 +- osrs/src/main/java/ServerPacket.java | 1073 ++- osrs/src/main/java/Skeleton.java | 220 +- osrs/src/main/java/Skills.java | 31 +- osrs/src/main/java/SoftWrapper.java | 8 +- osrs/src/main/java/SongTask.java | 151 +- osrs/src/main/java/SoundCache.java | 346 +- osrs/src/main/java/SoundEffect.java | 24 +- osrs/src/main/java/SoundEnvelope.java | 36 +- osrs/src/main/java/SoundSystem.java | 52 +- osrs/src/main/java/SpotAnimation.java | 38 +- .../main/java/SpotAnimationDefinition.java | 120 +- osrs/src/main/java/SpriteMask.java | 32 +- osrs/src/main/java/SpritePixels.java | 128 +- osrs/src/main/java/Strings.java | 61 +- osrs/src/main/java/StructComposition.java | 151 +- osrs/src/main/java/StudioGame.java | 144 +- osrs/src/main/java/SwapSongTask.java | 28 +- osrs/src/main/java/Task.java | 16 +- osrs/src/main/java/TaskHandler.java | 84 +- osrs/src/main/java/Texture.java | 82 +- osrs/src/main/java/TextureLoader.java | 18 +- osrs/src/main/java/TextureProvider.java | 299 +- osrs/src/main/java/Tile.java | 642 +- osrs/src/main/java/TileItem.java | 185 +- osrs/src/main/java/Tiles.java | 520 +- osrs/src/main/java/Timer.java | 279 +- osrs/src/main/java/TriBool.java | 16 +- osrs/src/main/java/UrlRequest.java | 499 +- osrs/src/main/java/UrlRequester.java | 173 +- osrs/src/main/java/User.java | 49 +- osrs/src/main/java/UserComparator1.java | 10 +- osrs/src/main/java/UserComparator10.java | 88 +- osrs/src/main/java/UserComparator2.java | 14 +- osrs/src/main/java/UserComparator3.java | 31 +- osrs/src/main/java/UserComparator4.java | 115 +- osrs/src/main/java/UserComparator5.java | 278 +- osrs/src/main/java/UserComparator6.java | 98 +- osrs/src/main/java/UserComparator7.java | 30 +- osrs/src/main/java/UserComparator8.java | 252 +- osrs/src/main/java/UserComparator9.java | 235 +- osrs/src/main/java/UserList.java | 250 +- osrs/src/main/java/Username.java | 186 +- osrs/src/main/java/Usernamed.java | 8 +- osrs/src/main/java/VarbitComposition.java | 74 +- osrs/src/main/java/VarcInt.java | 262 +- osrs/src/main/java/Varcs.java | 200 +- osrs/src/main/java/VarpDefinition.java | 79 +- osrs/src/main/java/Varps.java | 70 +- osrs/src/main/java/VertexNormal.java | 50 +- osrs/src/main/java/VerticalAlignment.java | 111 +- osrs/src/main/java/ViewportMouse.java | 179 +- osrs/src/main/java/VorbisCodebook.java | 98 +- osrs/src/main/java/VorbisFloor.java | 132 +- osrs/src/main/java/VorbisMapping.java | 44 +- osrs/src/main/java/VorbisSample.java | 368 +- osrs/src/main/java/WallDecoration.java | 105 +- osrs/src/main/java/Widget.java | 1268 +-- osrs/src/main/java/WidgetDefinition.java | 245 + osrs/src/main/java/World.java | 558 +- osrs/src/main/java/WorldMap.java | 1026 +-- osrs/src/main/java/WorldMapArchiveLoader.java | 54 +- osrs/src/main/java/WorldMapArea.java | 265 +- osrs/src/main/java/WorldMapAreaData.java | 194 +- osrs/src/main/java/WorldMapCacheName.java | 73 +- osrs/src/main/java/WorldMapData_0.java | 93 +- osrs/src/main/java/WorldMapData_1.java | 194 +- osrs/src/main/java/WorldMapDecoration.java | 176 +- .../src/main/java/WorldMapDecorationType.java | 192 +- osrs/src/main/java/WorldMapElement.java | 254 +- osrs/src/main/java/WorldMapEvent.java | 81 +- osrs/src/main/java/WorldMapIcon_0.java | 41 +- osrs/src/main/java/WorldMapIcon_1.java | 91 +- osrs/src/main/java/WorldMapLabel.java | 69 +- osrs/src/main/java/WorldMapLabelSize.java | 105 +- osrs/src/main/java/WorldMapManager.java | 1227 ++- osrs/src/main/java/WorldMapRectangle.java | 179 +- osrs/src/main/java/WorldMapRegion.java | 600 +- osrs/src/main/java/WorldMapScaleHandler.java | 91 +- osrs/src/main/java/WorldMapSection.java | 34 +- osrs/src/main/java/WorldMapSection0.java | 100 +- osrs/src/main/java/WorldMapSection1.java | 425 +- osrs/src/main/java/WorldMapSection2.java | 147 +- osrs/src/main/java/WorldMapSectionType.java | 313 +- osrs/src/main/java/WorldMapSprite.java | 21 +- osrs/src/main/java/Wrapper.java | 8 +- osrs/src/main/java/ZoneOperation.java | 184 +- osrs/src/main/java/class0.java | 12 +- osrs/src/main/java/class1.java | 45 +- osrs/src/main/java/class10.java | 201 +- osrs/src/main/java/class101.java | 57 - osrs/src/main/java/class102.java | 261 - osrs/src/main/java/class103.java | 26 + osrs/src/main/java/class104.java | 227 + osrs/src/main/java/class105.java | 787 -- osrs/src/main/java/class106.java | 71 - osrs/src/main/java/class107.java | 33 + osrs/src/main/java/class108.java | 1034 ++- osrs/src/main/java/class11.java | 132 +- osrs/src/main/java/class110.java | 128 + osrs/src/main/java/class113.java | 168 - osrs/src/main/java/class115.java | 226 + osrs/src/main/java/class12.java | 246 +- osrs/src/main/java/class124.java | 5 - osrs/src/main/java/class125.java | 103 - osrs/src/main/java/class126.java | 133 +- osrs/src/main/java/class127.java | 258 +- osrs/src/main/java/class128.java | 434 +- osrs/src/main/java/class129.java | 740 +- osrs/src/main/java/class13.java | 316 +- osrs/src/main/java/class130.java | 251 +- osrs/src/main/java/class131.java | 217 +- osrs/src/main/java/class132.java | 865 +-- osrs/src/main/java/class133.java | 478 +- osrs/src/main/java/class134.java | 531 +- osrs/src/main/java/class135.java | 718 +- osrs/src/main/java/class136.java | 172 +- osrs/src/main/java/class137.java | 414 - osrs/src/main/java/class138.java | 131 +- osrs/src/main/java/class139.java | 678 +- osrs/src/main/java/class14.java | 190 +- osrs/src/main/java/class140.java | 248 +- osrs/src/main/java/class141.java | 298 +- osrs/src/main/java/class142.java | 108 +- osrs/src/main/java/class143.java | 80 +- osrs/src/main/java/class144.java | 68 +- osrs/src/main/java/class145.java | 48 + osrs/src/main/java/class146.java | 125 +- osrs/src/main/java/class147.java | 459 -- osrs/src/main/java/class148.java | 222 +- osrs/src/main/java/class149.java | 81 +- osrs/src/main/java/class15.java | 41 +- osrs/src/main/java/class150.java | 201 +- osrs/src/main/java/class151.java | 459 +- osrs/src/main/java/class152.java | 187 +- osrs/src/main/java/class153.java | 131 +- osrs/src/main/java/class154.java | 61 + osrs/src/main/java/class155.java | 107 +- osrs/src/main/java/class156.java | 60 - osrs/src/main/java/class157.java | 141 +- osrs/src/main/java/class158.java | 582 +- osrs/src/main/java/class159.java | 124 +- osrs/src/main/java/class16.java | 570 +- osrs/src/main/java/class160.java | 246 +- osrs/src/main/java/class161.java | 189 +- osrs/src/main/java/class162.java | 106 +- osrs/src/main/java/class163.java | 188 + osrs/src/main/java/class164.java | 204 +- osrs/src/main/java/class165.java | 94 - osrs/src/main/java/class166.java | 55 +- osrs/src/main/java/class167.java | 113 +- osrs/src/main/java/class168.java | 164 + osrs/src/main/java/class169.java | 201 +- osrs/src/main/java/class17.java | 512 +- osrs/src/main/java/class170.java | 448 -- osrs/src/main/java/class171.java | 49 + osrs/src/main/java/class172.java | 523 +- osrs/src/main/java/class174.java | 133 +- osrs/src/main/java/class176.java | 53 +- osrs/src/main/java/class177.java | 77 - osrs/src/main/java/class178.java | 185 +- osrs/src/main/java/class179.java | 50 + osrs/src/main/java/class18.java | 301 +- osrs/src/main/java/class180.java | 177 + osrs/src/main/java/class181.java | 74 - osrs/src/main/java/class183.java | 239 + osrs/src/main/java/class184.java | 13 - osrs/src/main/java/class186.java | 47 + osrs/src/main/java/class188.java | 32 + osrs/src/main/java/class189.java | 17 + osrs/src/main/java/class19.java | 108 +- osrs/src/main/java/class190.java | 141 + osrs/src/main/java/class191.java | 53 +- osrs/src/main/java/class193.java | 61 + osrs/src/main/java/class197.java | 61 - osrs/src/main/java/class198.java | 178 + osrs/src/main/java/class199.java | 75 + osrs/src/main/java/class2.java | 2 +- osrs/src/main/java/class20.java | 192 +- osrs/src/main/java/class200.java | 55 - osrs/src/main/java/class201.java | 19 + osrs/src/main/java/class202.java | 112 + osrs/src/main/java/class206.java | 42 + osrs/src/main/java/class208.java | 106 + osrs/src/main/java/class209.java | 138 +- osrs/src/main/java/class210.java | 360 - osrs/src/main/java/class211.java | 63 - osrs/src/main/java/class212.java | 285 +- osrs/src/main/java/class214.java | 338 +- osrs/src/main/java/class216.java | 165 +- osrs/src/main/java/class218.java | 76 - osrs/src/main/java/class219.java | 69 - osrs/src/main/java/class223.java | 177 + osrs/src/main/java/class224.java | 411 + osrs/src/main/java/class225.java | 29 + osrs/src/main/java/class226.java | 212 + osrs/src/main/java/class227.java | 184 - osrs/src/main/java/class228.java | 156 +- osrs/src/main/java/class230.java | 227 + osrs/src/main/java/class232.java | 1284 ++++ osrs/src/main/java/class233.java | 69 + osrs/src/main/java/class238.java | 56 - osrs/src/main/java/class241.java | 125 + osrs/src/main/java/class242.java | 97 + .../java/{class243.java => class257.java} | 356 +- .../java/{class245.java => class259.java} | 604 +- osrs/src/main/java/class26.java | 17 - osrs/src/main/java/class260.java | 252 - osrs/src/main/java/class261.java | 53 - osrs/src/main/java/class266.java | 407 + osrs/src/main/java/class27.java | 202 +- osrs/src/main/java/class270.java | 111 - osrs/src/main/java/class271.java | 214 - osrs/src/main/java/class272.java | 16 - osrs/src/main/java/class274.java | 149 + osrs/src/main/java/class275.java | 41 + osrs/src/main/java/class28.java | 62 +- osrs/src/main/java/class280.java | 5 - osrs/src/main/java/class281.java | 15 - osrs/src/main/java/class282.java | 5 - osrs/src/main/java/class283.java | 5 - osrs/src/main/java/class284.java | 50 +- osrs/src/main/java/class285.java | 27 + osrs/src/main/java/class286.java | 43 + osrs/src/main/java/class29.java | 20 +- osrs/src/main/java/class291.java | 7 - osrs/src/main/java/class292.java | 9 - osrs/src/main/java/class293.java | 5 - osrs/src/main/java/class294.java | 5 + osrs/src/main/java/class295.java | 27 + osrs/src/main/java/class296.java | 5 + osrs/src/main/java/class297.java | 5 + osrs/src/main/java/class298.java | 7 + osrs/src/main/java/class299.java | 143 - osrs/src/main/java/class3.java | 6 +- osrs/src/main/java/class30.java | 182 +- osrs/src/main/java/class300.java | 69 - osrs/src/main/java/class301.java | 20 - osrs/src/main/java/class302.java | 90 - osrs/src/main/java/class303.java | 30 - osrs/src/main/java/class304.java | 163 + osrs/src/main/java/class305.java | 203 +- osrs/src/main/java/class306.java | 25 + osrs/src/main/java/class307.java | 5 + osrs/src/main/java/class309.java | 21 - osrs/src/main/java/class31.java | 188 +- osrs/src/main/java/class311.java | 12 - osrs/src/main/java/class312.java | 75 - osrs/src/main/java/class313.java | 23 + osrs/src/main/java/class314.java | 1047 +++ osrs/src/main/java/class315.java | 35 + osrs/src/main/java/class316.java | 192 +- osrs/src/main/java/class317.java | 36 + osrs/src/main/java/class318.java | 426 -- osrs/src/main/java/class319.java | 359 + .../java/{class308.java => class322.java} | 15 +- osrs/src/main/java/class323.java | 23 +- osrs/src/main/java/class324.java | 14 - osrs/src/main/java/class325.java | 35 +- osrs/src/main/java/class326.java | 130 +- osrs/src/main/java/class327.java | 35 - osrs/src/main/java/class329.java | 1240 --- osrs/src/main/java/class33.java | 764 +- osrs/src/main/java/class330.java | 83 +- osrs/src/main/java/class332.java | 447 +- osrs/src/main/java/class334.java | 13 - osrs/src/main/java/class337.java | 14 + osrs/src/main/java/class338.java | 87 - osrs/src/main/java/class339.java | 92 +- osrs/src/main/java/class340.java | 9 + osrs/src/main/java/class341.java | 59 + osrs/src/main/java/class342.java | 70 +- osrs/src/main/java/class343.java | 16 - osrs/src/main/java/class344.java | 1244 ++- osrs/src/main/java/class345.java | 47 +- osrs/src/main/java/class347.java | 14 + osrs/src/main/java/class348.java | 129 - osrs/src/main/java/class349.java | 99 +- osrs/src/main/java/class350.java | 32 - osrs/src/main/java/class352.java | 276 - osrs/src/main/java/class353.java | 17 + osrs/src/main/java/class354.java | 62 + osrs/src/main/java/class357.java | 145 +- osrs/src/main/java/class358.java | 18 + osrs/src/main/java/class359.java | 8 + osrs/src/main/java/class36.java | 92 +- osrs/src/main/java/class360.java | 76 + osrs/src/main/java/class363.java | 9 + osrs/src/main/java/class364.java | 11 + osrs/src/main/java/class365.java | 29 + osrs/src/main/java/class367.java | 545 ++ osrs/src/main/java/class369.java | 231 - osrs/src/main/java/class370.java | 291 - osrs/src/main/java/class371.java | 14 - osrs/src/main/java/class372.java | 224 +- osrs/src/main/java/class379.java | 24 + osrs/src/main/java/class383.java | 24 - osrs/src/main/java/class384.java | 220 +- osrs/src/main/java/class385.java | 147 +- osrs/src/main/java/class386.java | 35 +- osrs/src/main/java/class387.java | 159 +- osrs/src/main/java/class388.java | 48 - osrs/src/main/java/class390.java | 36 - osrs/src/main/java/class391.java | 55 - osrs/src/main/java/class392.java | 229 - osrs/src/main/java/class394.java | 799 -- osrs/src/main/java/class395.java | 25 - osrs/src/main/java/class396.java | 22 - osrs/src/main/java/class398.java | 155 +- osrs/src/main/java/class399.java | 13 + osrs/src/main/java/class4.java | 540 +- osrs/src/main/java/class400.java | 89 + osrs/src/main/java/class401.java | 104 +- osrs/src/main/java/class403.java | 64 +- osrs/src/main/java/class405.java | 14 + osrs/src/main/java/class406.java | 108 + osrs/src/main/java/class407.java | 239 + osrs/src/main/java/class408.java | 118 - osrs/src/main/java/class409.java | 819 +- osrs/src/main/java/class410.java | 106 +- osrs/src/main/java/class411.java | 30 + osrs/src/main/java/class413.java | 136 + osrs/src/main/java/class415.java | 270 - osrs/src/main/java/class416.java | 125 +- osrs/src/main/java/class418.java | 72 +- osrs/src/main/java/class419.java | 182 - osrs/src/main/java/class421.java | 27 - osrs/src/main/java/class422.java | 53 - osrs/src/main/java/class423.java | 234 +- osrs/src/main/java/class424.java | 125 +- osrs/src/main/java/class425.java | 41 + osrs/src/main/java/class427.java | 41 + osrs/src/main/java/class429.java | 34 + osrs/src/main/java/class430.java | 63 + osrs/src/main/java/class432.java | 564 ++ osrs/src/main/java/class433.java | 38 + osrs/src/main/java/class434.java | 185 + .../java/{class420.java => class435.java} | 25 +- osrs/src/main/java/class436.java | 167 + osrs/src/main/java/class437.java | 65 + osrs/src/main/java/class438.java | 197 + osrs/src/main/java/class439.java | 55 + osrs/src/main/java/class448.java | 138 - osrs/src/main/java/class449.java | 128 - osrs/src/main/java/class450.java | 447 -- osrs/src/main/java/class451.java | 147 - osrs/src/main/java/class452.java | 25 - osrs/src/main/java/class453.java | 47 - osrs/src/main/java/class454.java | 77 - osrs/src/main/java/class455.java | 74 - osrs/src/main/java/class456.java | 19 - osrs/src/main/java/class457.java | 86 - osrs/src/main/java/class458.java | 5 - osrs/src/main/java/class459.java | 5 - osrs/src/main/java/class46.java | 86 +- osrs/src/main/java/class460.java | 59 - osrs/src/main/java/class461.java | 24 - osrs/src/main/java/class462.java | 136 +- osrs/src/main/java/class463.java | 100 +- osrs/src/main/java/class464.java | 125 +- osrs/src/main/java/class465.java | 472 +- osrs/src/main/java/class466.java | 722 +- osrs/src/main/java/class467.java | 16 + osrs/src/main/java/class468.java | 47 + osrs/src/main/java/class469.java | 39 + osrs/src/main/java/class47.java | 189 +- osrs/src/main/java/class470.java | 92 + osrs/src/main/java/class471.java | 85 + osrs/src/main/java/class472.java | 111 + osrs/src/main/java/class473.java | 5 + osrs/src/main/java/class474.java | 5 + osrs/src/main/java/class475.java | 38 +- osrs/src/main/java/class476.java | 91 +- osrs/src/main/java/class477.java | 139 +- osrs/src/main/java/class478.java | 107 +- osrs/src/main/java/class479.java | 43 +- osrs/src/main/java/class480.java | 54 +- osrs/src/main/java/class481.java | 714 ++ osrs/src/main/java/class485.java | 70 - osrs/src/main/java/class489.java | 19 - osrs/src/main/java/class490.java | 70 +- osrs/src/main/java/class491.java | 92 + osrs/src/main/java/class492.java | 87 + osrs/src/main/java/class493.java | 107 +- osrs/src/main/java/class494.java | 34 + osrs/src/main/java/class495.java | 67 + osrs/src/main/java/class496.java | 45 - osrs/src/main/java/class497.java | 81 - osrs/src/main/java/class499.java | 98 - osrs/src/main/java/class5.java | 42 +- osrs/src/main/java/class500.java | 75 +- osrs/src/main/java/class501.java | 35 - osrs/src/main/java/class502.java | 101 - osrs/src/main/java/class503.java | 47 - osrs/src/main/java/class504.java | 27 +- osrs/src/main/java/class505.java | 70 + osrs/src/main/java/class506.java | 81 - osrs/src/main/java/class508.java | 14 +- osrs/src/main/java/class51.java | 8 +- osrs/src/main/java/class510.java | 214 - osrs/src/main/java/class511.java | 57 + osrs/src/main/java/class512.java | 105 + .../java/{class498.java => class513.java} | 17 +- osrs/src/main/java/class514.java | 35 + osrs/src/main/java/class515.java | 67 +- osrs/src/main/java/class516.java | 35 + osrs/src/main/java/class517.java | 146 + osrs/src/main/java/class518.java | 34 +- osrs/src/main/java/class519.java | 71 +- osrs/src/main/java/class521.java | 81 + osrs/src/main/java/class523.java | 46 +- osrs/src/main/java/class525.java | 192 + osrs/src/main/java/class529.java | 15 - osrs/src/main/java/class53.java | 525 +- osrs/src/main/java/class530.java | 85 + osrs/src/main/java/class532.java | 132 - osrs/src/main/java/class533.java | 11 + osrs/src/main/java/class534.java | 80 + .../java/{class522.java => class537.java} | 10 +- osrs/src/main/java/class538.java | 103 +- osrs/src/main/java/class541.java | 43 + osrs/src/main/java/class544.java | 18 + osrs/src/main/java/class547.java | 132 + osrs/src/main/java/class553.java | 11 + osrs/src/main/java/class59.java | 170 +- osrs/src/main/java/class6.java | 756 +- osrs/src/main/java/class60.java | 76 +- osrs/src/main/java/class64.java | 88 + osrs/src/main/java/class7.java | 145 +- osrs/src/main/java/class72.java | 38 - osrs/src/main/java/class73.java | 145 + osrs/src/main/java/class74.java | 208 +- osrs/src/main/java/class76.java | 127 + osrs/src/main/java/class8.java | 34 +- osrs/src/main/java/class85.java | 127 - osrs/src/main/java/class87.java | 129 + osrs/src/main/java/class89.java | 52 - osrs/src/main/java/class9.java | 735 +- osrs/src/main/java/class90.java | 86 - osrs/src/main/java/class91.java | 124 + osrs/src/main/java/class92.java | 215 +- osrs/src/main/java/class93.java | 398 - osrs/src/main/java/class94.java | 112 + osrs/src/main/java/class95.java | 14 + .../net/runelite/rs/ObfuscatedClassMap.java | 1046 +-- osrs/src/main/java/netscape/js/JSObject.java | 14 +- osrs/src/main/java/org/json/JSONArray.java | 64 +- osrs/src/main/java/org/json/JSONObject.java | 160 +- osrs/src/main/java/org/json/JSONTokener.java | 23 +- osrs/src/main/java/org/json/Null.java | 4 +- 665 files changed, 59997 insertions(+), 59096 deletions(-) create mode 100644 api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java delete mode 100644 osrs/src/main/java/FillMode.java create mode 100644 osrs/src/main/java/JSException.java delete mode 100644 osrs/src/main/java/Null.java delete mode 100644 osrs/src/main/java/OAuthApi.java delete mode 100644 osrs/src/main/java/ObfuscatedClassMap.java delete mode 100644 osrs/src/main/java/OtlTokenRequester.java delete mode 100644 osrs/src/main/java/RefreshAccessTokenRequester.java delete mode 100644 osrs/src/main/java/RefreshAccessTokenResponse.java delete mode 100644 osrs/src/main/java/ScriptOpcodes.java create mode 100644 osrs/src/main/java/WidgetDefinition.java delete mode 100644 osrs/src/main/java/class101.java delete mode 100644 osrs/src/main/java/class102.java create mode 100644 osrs/src/main/java/class103.java create mode 100644 osrs/src/main/java/class104.java delete mode 100644 osrs/src/main/java/class105.java delete mode 100644 osrs/src/main/java/class106.java create mode 100644 osrs/src/main/java/class107.java create mode 100644 osrs/src/main/java/class110.java delete mode 100644 osrs/src/main/java/class113.java create mode 100644 osrs/src/main/java/class115.java delete mode 100644 osrs/src/main/java/class124.java delete mode 100644 osrs/src/main/java/class125.java delete mode 100644 osrs/src/main/java/class137.java create mode 100644 osrs/src/main/java/class145.java delete mode 100644 osrs/src/main/java/class147.java create mode 100644 osrs/src/main/java/class154.java delete mode 100644 osrs/src/main/java/class156.java create mode 100644 osrs/src/main/java/class163.java delete mode 100644 osrs/src/main/java/class165.java create mode 100644 osrs/src/main/java/class168.java delete mode 100644 osrs/src/main/java/class170.java create mode 100644 osrs/src/main/java/class171.java delete mode 100644 osrs/src/main/java/class177.java create mode 100644 osrs/src/main/java/class179.java create mode 100644 osrs/src/main/java/class180.java delete mode 100644 osrs/src/main/java/class181.java create mode 100644 osrs/src/main/java/class183.java delete mode 100644 osrs/src/main/java/class184.java create mode 100644 osrs/src/main/java/class186.java create mode 100644 osrs/src/main/java/class188.java create mode 100644 osrs/src/main/java/class189.java create mode 100644 osrs/src/main/java/class190.java create mode 100644 osrs/src/main/java/class193.java delete mode 100644 osrs/src/main/java/class197.java create mode 100644 osrs/src/main/java/class198.java create mode 100644 osrs/src/main/java/class199.java delete mode 100644 osrs/src/main/java/class200.java create mode 100644 osrs/src/main/java/class201.java create mode 100644 osrs/src/main/java/class202.java create mode 100644 osrs/src/main/java/class206.java create mode 100644 osrs/src/main/java/class208.java delete mode 100644 osrs/src/main/java/class210.java delete mode 100644 osrs/src/main/java/class211.java delete mode 100644 osrs/src/main/java/class218.java delete mode 100644 osrs/src/main/java/class219.java create mode 100644 osrs/src/main/java/class223.java create mode 100644 osrs/src/main/java/class224.java create mode 100644 osrs/src/main/java/class225.java create mode 100644 osrs/src/main/java/class226.java delete mode 100644 osrs/src/main/java/class227.java create mode 100644 osrs/src/main/java/class230.java create mode 100644 osrs/src/main/java/class232.java create mode 100644 osrs/src/main/java/class233.java delete mode 100644 osrs/src/main/java/class238.java create mode 100644 osrs/src/main/java/class241.java create mode 100644 osrs/src/main/java/class242.java rename osrs/src/main/java/{class243.java => class257.java} (88%) rename osrs/src/main/java/{class245.java => class259.java} (81%) delete mode 100644 osrs/src/main/java/class26.java delete mode 100644 osrs/src/main/java/class260.java delete mode 100644 osrs/src/main/java/class261.java create mode 100644 osrs/src/main/java/class266.java delete mode 100644 osrs/src/main/java/class270.java delete mode 100644 osrs/src/main/java/class271.java delete mode 100644 osrs/src/main/java/class272.java create mode 100644 osrs/src/main/java/class274.java create mode 100644 osrs/src/main/java/class275.java delete mode 100644 osrs/src/main/java/class280.java delete mode 100644 osrs/src/main/java/class281.java delete mode 100644 osrs/src/main/java/class282.java delete mode 100644 osrs/src/main/java/class283.java create mode 100644 osrs/src/main/java/class285.java create mode 100644 osrs/src/main/java/class286.java delete mode 100644 osrs/src/main/java/class291.java delete mode 100644 osrs/src/main/java/class292.java delete mode 100644 osrs/src/main/java/class293.java create mode 100644 osrs/src/main/java/class294.java create mode 100644 osrs/src/main/java/class295.java create mode 100644 osrs/src/main/java/class296.java create mode 100644 osrs/src/main/java/class297.java create mode 100644 osrs/src/main/java/class298.java delete mode 100644 osrs/src/main/java/class299.java delete mode 100644 osrs/src/main/java/class300.java delete mode 100644 osrs/src/main/java/class301.java delete mode 100644 osrs/src/main/java/class302.java delete mode 100644 osrs/src/main/java/class303.java create mode 100644 osrs/src/main/java/class304.java create mode 100644 osrs/src/main/java/class306.java create mode 100644 osrs/src/main/java/class307.java delete mode 100644 osrs/src/main/java/class309.java delete mode 100644 osrs/src/main/java/class311.java delete mode 100644 osrs/src/main/java/class312.java create mode 100644 osrs/src/main/java/class313.java create mode 100644 osrs/src/main/java/class314.java create mode 100644 osrs/src/main/java/class315.java create mode 100644 osrs/src/main/java/class317.java delete mode 100644 osrs/src/main/java/class318.java create mode 100644 osrs/src/main/java/class319.java rename osrs/src/main/java/{class308.java => class322.java} (66%) delete mode 100644 osrs/src/main/java/class324.java delete mode 100644 osrs/src/main/java/class327.java delete mode 100644 osrs/src/main/java/class329.java delete mode 100644 osrs/src/main/java/class334.java create mode 100644 osrs/src/main/java/class337.java delete mode 100644 osrs/src/main/java/class338.java create mode 100644 osrs/src/main/java/class340.java create mode 100644 osrs/src/main/java/class341.java delete mode 100644 osrs/src/main/java/class343.java create mode 100644 osrs/src/main/java/class347.java delete mode 100644 osrs/src/main/java/class348.java delete mode 100644 osrs/src/main/java/class350.java delete mode 100644 osrs/src/main/java/class352.java create mode 100644 osrs/src/main/java/class353.java create mode 100644 osrs/src/main/java/class354.java create mode 100644 osrs/src/main/java/class358.java create mode 100644 osrs/src/main/java/class359.java create mode 100644 osrs/src/main/java/class360.java create mode 100644 osrs/src/main/java/class363.java create mode 100644 osrs/src/main/java/class364.java create mode 100644 osrs/src/main/java/class365.java create mode 100644 osrs/src/main/java/class367.java delete mode 100644 osrs/src/main/java/class369.java delete mode 100644 osrs/src/main/java/class370.java delete mode 100644 osrs/src/main/java/class371.java create mode 100644 osrs/src/main/java/class379.java delete mode 100644 osrs/src/main/java/class383.java delete mode 100644 osrs/src/main/java/class388.java delete mode 100644 osrs/src/main/java/class390.java delete mode 100644 osrs/src/main/java/class391.java delete mode 100644 osrs/src/main/java/class392.java delete mode 100644 osrs/src/main/java/class394.java delete mode 100644 osrs/src/main/java/class395.java delete mode 100644 osrs/src/main/java/class396.java create mode 100644 osrs/src/main/java/class399.java create mode 100644 osrs/src/main/java/class400.java create mode 100644 osrs/src/main/java/class405.java create mode 100644 osrs/src/main/java/class406.java create mode 100644 osrs/src/main/java/class407.java delete mode 100644 osrs/src/main/java/class408.java create mode 100644 osrs/src/main/java/class411.java create mode 100644 osrs/src/main/java/class413.java delete mode 100644 osrs/src/main/java/class415.java delete mode 100644 osrs/src/main/java/class419.java delete mode 100644 osrs/src/main/java/class421.java delete mode 100644 osrs/src/main/java/class422.java create mode 100644 osrs/src/main/java/class425.java create mode 100644 osrs/src/main/java/class427.java create mode 100644 osrs/src/main/java/class429.java create mode 100644 osrs/src/main/java/class430.java create mode 100644 osrs/src/main/java/class432.java create mode 100644 osrs/src/main/java/class433.java create mode 100644 osrs/src/main/java/class434.java rename osrs/src/main/java/{class420.java => class435.java} (58%) create mode 100644 osrs/src/main/java/class436.java create mode 100644 osrs/src/main/java/class437.java create mode 100644 osrs/src/main/java/class438.java create mode 100644 osrs/src/main/java/class439.java delete mode 100644 osrs/src/main/java/class448.java delete mode 100644 osrs/src/main/java/class449.java delete mode 100644 osrs/src/main/java/class450.java delete mode 100644 osrs/src/main/java/class451.java delete mode 100644 osrs/src/main/java/class452.java delete mode 100644 osrs/src/main/java/class453.java delete mode 100644 osrs/src/main/java/class454.java delete mode 100644 osrs/src/main/java/class455.java delete mode 100644 osrs/src/main/java/class456.java delete mode 100644 osrs/src/main/java/class457.java delete mode 100644 osrs/src/main/java/class458.java delete mode 100644 osrs/src/main/java/class459.java delete mode 100644 osrs/src/main/java/class460.java delete mode 100644 osrs/src/main/java/class461.java create mode 100644 osrs/src/main/java/class467.java create mode 100644 osrs/src/main/java/class468.java create mode 100644 osrs/src/main/java/class469.java create mode 100644 osrs/src/main/java/class470.java create mode 100644 osrs/src/main/java/class471.java create mode 100644 osrs/src/main/java/class472.java create mode 100644 osrs/src/main/java/class473.java create mode 100644 osrs/src/main/java/class474.java create mode 100644 osrs/src/main/java/class481.java delete mode 100644 osrs/src/main/java/class485.java delete mode 100644 osrs/src/main/java/class489.java create mode 100644 osrs/src/main/java/class491.java create mode 100644 osrs/src/main/java/class492.java create mode 100644 osrs/src/main/java/class494.java create mode 100644 osrs/src/main/java/class495.java delete mode 100644 osrs/src/main/java/class496.java delete mode 100644 osrs/src/main/java/class497.java delete mode 100644 osrs/src/main/java/class499.java delete mode 100644 osrs/src/main/java/class501.java delete mode 100644 osrs/src/main/java/class502.java delete mode 100644 osrs/src/main/java/class503.java create mode 100644 osrs/src/main/java/class505.java delete mode 100644 osrs/src/main/java/class506.java delete mode 100644 osrs/src/main/java/class510.java create mode 100644 osrs/src/main/java/class511.java create mode 100644 osrs/src/main/java/class512.java rename osrs/src/main/java/{class498.java => class513.java} (51%) create mode 100644 osrs/src/main/java/class514.java create mode 100644 osrs/src/main/java/class516.java create mode 100644 osrs/src/main/java/class517.java create mode 100644 osrs/src/main/java/class521.java create mode 100644 osrs/src/main/java/class525.java delete mode 100644 osrs/src/main/java/class529.java create mode 100644 osrs/src/main/java/class530.java delete mode 100644 osrs/src/main/java/class532.java create mode 100644 osrs/src/main/java/class533.java create mode 100644 osrs/src/main/java/class534.java rename osrs/src/main/java/{class522.java => class537.java} (59%) create mode 100644 osrs/src/main/java/class541.java create mode 100644 osrs/src/main/java/class544.java create mode 100644 osrs/src/main/java/class547.java create mode 100644 osrs/src/main/java/class553.java create mode 100644 osrs/src/main/java/class64.java delete mode 100644 osrs/src/main/java/class72.java create mode 100644 osrs/src/main/java/class73.java create mode 100644 osrs/src/main/java/class76.java delete mode 100644 osrs/src/main/java/class85.java create mode 100644 osrs/src/main/java/class87.java delete mode 100644 osrs/src/main/java/class89.java delete mode 100644 osrs/src/main/java/class90.java create mode 100644 osrs/src/main/java/class91.java delete mode 100644 osrs/src/main/java/class93.java create mode 100644 osrs/src/main/java/class94.java create mode 100644 osrs/src/main/java/class95.java diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSWidget.java b/api-rs/src/main/java/net/runelite/rs/api/RSWidget.java index 9ee74abca..25bf381ac 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSWidget.java @@ -534,7 +534,7 @@ public interface RSWidget extends Widget Object[] getOnInvTransmitListener(); @Import("getSprite") - RSSpritePixels getSprite(boolean b, RSUrlRequester urlRequester); + RSSpritePixels getSprite(RSWidgetDefinition widgetDefinition,boolean b, RSUrlRequester urlRequester); @Import("onRelease") @Override diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java b/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java new file mode 100644 index 000000000..51766c346 --- /dev/null +++ b/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java @@ -0,0 +1,30 @@ +package net.runelite.rs.api; + +import net.runelite.mapping.Import; + +public interface RSWidgetDefinition +{ + @Import("Widget_interfaceComponents") + RSWidget[][] getWidgets(); + + @Import("loadInterface") + boolean loadInterface(int interfaceId); + + @Import("Widget_cachedSprites") + RSEvictingDualNodeHashTable getWidgetSpriteCache(); + + @Import("Widget_cachedModels") + RSEvictingDualNodeHashTable getModelsCache(); + + @Import("Widget_cachedFonts") + RSEvictingDualNodeHashTable getFontsCache(); + + @Import("Widget_cachedSpriteMasks") + RSEvictingDualNodeHashTable getSpriteMasksCache(); + + @Import("widgetArchive") + RSAbstractArchive getWidgetArchive(); + + @Import("getWidgetChild") + RSWidget getWidgetChild(int parent, int child); +} \ No newline at end of file diff --git a/client/src/main/java/meteor/api/ClientPackets.kt b/client/src/main/java/meteor/api/ClientPackets.kt index 2c52cdd3c..02e245a9c 100644 --- a/client/src/main/java/meteor/api/ClientPackets.kt +++ b/client/src/main/java/meteor/api/ClientPackets.kt @@ -25,11 +25,11 @@ object ClientPackets { // param0: worldX // param1: worldY fun createGroundItemAction1Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON1) - bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) - bufferNode.packetBuffer.`writeShort$api`(worldY) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortLE$api`(worldX) + val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ1) + bufferNode.packetBuffer.`writeShortAdd$api`(worldY) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + bufferNode.packetBuffer.`writeShort$api`(groundItemId) return bufferNode } @@ -37,11 +37,11 @@ object ClientPackets { // param0: worldX // param1: worldY fun createGroundItemAction2Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON2) - bufferNode.packetBuffer.`writeShortAdd$api`(worldY) - bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ2) bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) + bufferNode.packetBuffer.`writeShort$api`(worldY) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(groundItemId) return bufferNode } @@ -49,11 +49,11 @@ object ClientPackets { // param0: worldX // param1: worldY fun createGroundItemAction3Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON3) - bufferNode.packetBuffer.`writeShortAdd$api`(worldX) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ3) + bufferNode.packetBuffer.`writeShortLE$api`(worldY) bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) - bufferNode.packetBuffer.`writeShortAdd$api`(worldY) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) return bufferNode } @@ -62,10 +62,10 @@ object ClientPackets { // param1: worldY fun createGroundItemAction4Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ4) - bufferNode.packetBuffer.`writeShortAdd$api`(worldX) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) - bufferNode.packetBuffer.`writeShortLE$api`(groundItemId) + bufferNode.packetBuffer.`writeShortAdd$api`(groundItemId) + bufferNode.packetBuffer.`writeShort$api`(worldX) + bufferNode.packetBuffer.`writeShort$api`(worldY) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode } @@ -74,10 +74,10 @@ object ClientPackets { // param1: worldY fun createGroundItemAction5Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ5) - bufferNode.packetBuffer.`writeShortLE$api`(worldY) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShort$api`(worldX) - bufferNode.packetBuffer.`writeShortLE$api`(groundItemId) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(worldY) + bufferNode.packetBuffer.`writeShortLE$api`(worldX) + bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) return bufferNode } @@ -91,10 +91,10 @@ object ClientPackets { shiftPressed: Boolean ): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPLOC1) - bufferNode.packetBuffer.`writeShort$api`(worldX) - bufferNode.packetBuffer.`writeIntME$api`(worldY) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) bufferNode.packetBuffer.`writeShortAddLE$api`(objectID) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) return bufferNode } @@ -108,10 +108,10 @@ object ClientPackets { shiftPressed: Boolean ): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPLOC2) - bufferNode.packetBuffer.`writeShort$api`(worldX) - bufferNode.packetBuffer.`writeShort$api`(worldY) - bufferNode.packetBuffer.`writeIntME$api`(objectID) + bufferNode.packetBuffer.`writeShortAdd$api`(objectID) bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + bufferNode.packetBuffer.`writeShortLE$api`(worldY) return bufferNode } @@ -125,10 +125,10 @@ object ClientPackets { shiftPressed: Boolean ): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPLOC3) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) bufferNode.packetBuffer.`writeShort$api`(objectID) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShort$api`(worldY) + bufferNode.packetBuffer.`writeShortLE$api`(worldX) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) return bufferNode } @@ -142,10 +142,10 @@ object ClientPackets { shiftPressed: Boolean ): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPLOC4) - bufferNode.packetBuffer.`writeShortAdd$api`(objectID) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAdd$api`(worldY) - bufferNode.packetBuffer.`writeShortLE$api`(worldX) + bufferNode.packetBuffer.`writeShortLE$api`(worldY) + bufferNode.packetBuffer.`writeShortAddLE$api`(objectID) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode } @@ -159,10 +159,10 @@ object ClientPackets { shiftPressed: Boolean ): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPLOC5) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) - bufferNode.packetBuffer.`writeIntME$api`(worldX) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAdd$api`(objectID) + bufferNode.packetBuffer.`writeShortLE$api`(worldY) + bufferNode.packetBuffer.`writeShortAddLE$api`(objectID) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode } @@ -179,13 +179,13 @@ object ClientPackets { shiftPressed: Boolean ): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPLOCT) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortLE$api`(objectID) - bufferNode.packetBuffer.`writeShortLE$api`(itemId) - bufferNode.packetBuffer.`writeShortLE$api`(worldX) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAddLE$api`(itemSlot) + bufferNode.packetBuffer.`writeShort$api`(worldX) bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) + bufferNode.packetBuffer.`writeShortLE$api`(objectID) + bufferNode.packetBuffer.`writeShortLE$api`(worldY) + bufferNode.packetBuffer.`writeShortAdd$api`(itemId) return bufferNode } @@ -199,50 +199,50 @@ object ClientPackets { ): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPNPCT) bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) - bufferNode.packetBuffer.`writeShortLE$api`(itemSlot) - bufferNode.packetBuffer.`writeShortLE$api`(itemID) + bufferNode.packetBuffer.`writeShortAdd$api`(itemID) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortLE$api`(npcIdx) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAddLE$api`(itemSlot) return bufferNode } //OPNPC1 fun createNPCAction1Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPNPC1) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAdd$api`(npcIdx) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) return bufferNode } //OPNPC2 fun createNPCAction2Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPNPC2) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeIntME$api`(npcIdx) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(npcIdx) return bufferNode } //OPNPC3 fun createNPCAction3Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPNPC3) - bufferNode.packetBuffer.`writeShort$api`(npcIdx) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAddLE$api`(npcIdx) return bufferNode } //OPNPC4 fun createNPCAction4Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPNPC4) - bufferNode.packetBuffer.`writeByteAdd$api`(npcIdx) - bufferNode.packetBuffer.`writeShort$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(npcIdx) return bufferNode } //OPNPC5 fun createNPCAction5Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPNPC5) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeIntME$api`(npcIdx) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortLE$api`(npcIdx) return bufferNode } @@ -255,10 +255,10 @@ object ClientPackets { shiftPressed: Boolean ): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYERT) - bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) - bufferNode.packetBuffer.`writeIntME$api`(itemWidgetID) - bufferNode.packetBuffer.`writeIntIME$api`(itemSlot) - bufferNode.packetBuffer.`writeIntME$api`(itemId) + bufferNode.packetBuffer.`writeShort$api`(playerIdx) + bufferNode.packetBuffer.`writeShortAdd$api`(itemWidgetID) + bufferNode.packetBuffer.`writeIntLE$api`(itemSlot) + bufferNode.packetBuffer.`writeShortLE$api`(itemId) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) return bufferNode } @@ -266,31 +266,31 @@ object ClientPackets { ///OPPLAYER1 fun createPlayerAction1Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER1) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) return bufferNode } ///OPPLAYER2 fun createPlayerAction2Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER2) - bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(playerIdx) return bufferNode } ///OPPLAYER3 fun createPlayerAction3Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER3) + bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShort$api`(playerIdx) return bufferNode } ///OPPLAYER4 fun createPlayerAction4Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER4) - bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) + bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) return bufferNode } @@ -298,32 +298,32 @@ object ClientPackets { ///OPPLAYER5 fun createPlayerAction5Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER5) - bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortLE$api`(playerIdx) return bufferNode } ///OPPLAYER6 fun createPlayerAction6Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER6) - bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortLE$api`(playerIdx) return bufferNode } ///OPPLAYER7 fun createPlayerAction7Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER7) - bufferNode.packetBuffer.`writeIntME$api`(playerIdx) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(playerIdx) return bufferNode } ///OPPLAYER8 fun createPlayerAction8Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER8) + val bufferNode = preparePacketBuffer(ClientPacket.EVENT_KEYBOARD) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) + bufferNode.packetBuffer.`writeShortLE$api`(playerIdx) return bufferNode } @@ -337,14 +337,14 @@ object ClientPackets { itemWidgetID: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOCT) - bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) - bufferNode.packetBuffer.`writeShort$api`(groundItemID) - bufferNode.packetBuffer.`writeShort$api`(itemID) - bufferNode.packetBuffer.`writeShort$api`(worldY) - bufferNode.packetBuffer.`writeShortAdd$api`(worldX) - bufferNode.packetBuffer.`writeShortLE$api`(itemSlot) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOCE) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAddLE$api`(itemWidgetID) + bufferNode.packetBuffer.`writeShort$api`(worldX) + bufferNode.packetBuffer.`writeIntIME$api`(groundItemID) + bufferNode.packetBuffer.`writeShortLE$api`(itemID) + bufferNode.packetBuffer.`writeShortLE$api`(worldY) + bufferNode.packetBuffer.`writeShortAdd$api`(itemSlot) return bufferNode } @@ -360,12 +360,12 @@ object ClientPackets { destinationItemId: Int ): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTONT) - bufferNode.packetBuffer.`writeShort$api`(destinationItemId) - bufferNode.packetBuffer.`writeIntME$api`(sourceWidgetId) - bufferNode.packetBuffer.`writeShortLE$api`(destinationSlot) bufferNode.packetBuffer.`writeShortAddLE$api`(sourceSlot) - bufferNode.packetBuffer.`writeIntIME$api`(destinationWidgetId) - bufferNode.packetBuffer.`writeShortAdd$api`(sourceItemId) + bufferNode.packetBuffer.`writeInt$api`(destinationWidgetId) + bufferNode.packetBuffer.`writeShortAdd$api`(destinationItemId) + bufferNode.packetBuffer.`writeIntIME$api`(sourceWidgetId) + bufferNode.packetBuffer.`writeShortAddLE$api`(sourceItemId) + bufferNode.packetBuffer.`writeShortAddLE$api`(destinationSlot) return bufferNode } @@ -533,17 +533,17 @@ object ClientPackets { val bufferNode = preparePacketBuffer(ClientPacket.MOVE_GAMECLICK) bufferNode.packetBuffer.`writeByte$api`(5) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) bufferNode.packetBuffer.`writeShortAdd$api`(worldY) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) return bufferNode } // CONTINUE fun createContinuePacket(widgetId: Int, childId: Int): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.CONTINUE) + val bufferNode = preparePacketBuffer(ClientPacket.RESUME_PAUSEBUTTON) + bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeIntME$api`(widgetId) - bufferNode.packetBuffer.`writeShortLE$api`(childId) return bufferNode } diff --git a/mixins/src/main/java/mixins/RSArchiveMixin.java b/mixins/src/main/java/mixins/RSArchiveMixin.java index 16462c09b..79373ca2a 100644 --- a/mixins/src/main/java/mixins/RSArchiveMixin.java +++ b/mixins/src/main/java/mixins/RSArchiveMixin.java @@ -21,7 +21,7 @@ public abstract class RSArchiveMixin implements RSArchive @MethodHook(value = "", end = true) @Inject - private void rl$init(RSArchiveDisk var1, RSArchiveDisk var2, RSJagNetThread var3, int archive, boolean var4, boolean var5, boolean var6, boolean var7) + private void rl$init(RSArchiveDisk var1, RSArchiveDisk var2, RSJagNetThread var3, int archive, boolean var4, boolean var5, boolean var6, boolean var7, boolean var8) { if (archive >= 0 && archive < 21) { diff --git a/mixins/src/main/java/mixins/RSClientMixin.java b/mixins/src/main/java/mixins/RSClientMixin.java index e5934ba8d..5f28c81e2 100644 --- a/mixins/src/main/java/mixins/RSClientMixin.java +++ b/mixins/src/main/java/mixins/RSClientMixin.java @@ -519,7 +519,8 @@ public Widget[] getWidgetRoots() { @Inject @Override - public Widget getWidget(WidgetInfo widget) { + public Widget getWidget(WidgetInfo widget) + { int groupId = widget.getGroupId(); int childId = widget.getChildId(); @@ -528,16 +529,19 @@ public Widget getWidget(WidgetInfo widget) { @Inject @Override - public Widget getWidget(int id) { + public Widget getWidget(int id) + { return getWidget(WidgetInfo.TO_GROUP(id), WidgetInfo.TO_CHILD(id)); } @Inject @Override - public RSWidget[] getGroup(int groupId) { + public RSWidget[] getGroup(int groupId) + { RSWidget[][] widgets = getWidgets(); - if (widgets == null || groupId < 0 || groupId >= widgets.length || widgets[groupId] == null) { + if (widgets == null || groupId < 0 || groupId >= widgets.length || widgets[groupId] == null) + { return null; } @@ -546,21 +550,23 @@ public RSWidget[] getGroup(int groupId) { @Inject @Override - public Widget getWidget(int groupId, int childId) { + public Widget getWidget(int groupId, int childId) + { RSWidget[][] widgets = getWidgets(); - if (widgets == null || widgets.length <= groupId) { + if (widgets == null || widgets.length <= groupId) + { return null; } RSWidget[] childWidgets = widgets[groupId]; - if (childWidgets == null || childWidgets.length <= childId) { + if (childWidgets == null || childWidgets.length <= childId) + { return null; } return childWidgets[childId]; } - @Inject @Override public int getVar(VarPlayer varPlayer) { diff --git a/mixins/src/main/java/mixins/ReflectionMixin.java b/mixins/src/main/java/mixins/ReflectionMixin.java index ebbe5acfb..c474eb207 100644 --- a/mixins/src/main/java/mixins/ReflectionMixin.java +++ b/mixins/src/main/java/mixins/ReflectionMixin.java @@ -81,21 +81,21 @@ public static void reportFindField(Class clazz, String fieldName) { public static void reportInvoke(Method method, Object reference, Object[] args) { String className = method.getClass().getName(); int arg = 0; - client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - " + className + "." + method.getName()); + client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - " + className + "." + method.getName()); if (reference != null) - client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - reference - " + reference.getClass().getName()); + client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - reference - " + reference.getClass().getName()); for (Object o : args) { - client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - arg" + arg + " - " + o.getClass().getName()); + client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - arg" + arg + " - " + o.getClass().getName()); if (o instanceof Integer) - client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - intValue" + arg + " - " + o); + client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - intValue" + arg + " - " + o); if (o instanceof String) - client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - strValue" + arg + " - " + o); + client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - strValue" + arg + " - " + o); if (o instanceof Long) - client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - longValue" + arg + " - " + o); + client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - longValue" + arg + " - " + o); if (o instanceof Byte) - client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - byteValue" + arg + " - " + o); + client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - byteValue" + arg + " - " + o); if (o instanceof Boolean) - client.getLogger().error("net.runelite.net.runelite.rs.Reflection:INVOKE - boolValue" + arg + " - " + o); + client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - boolValue" + arg + " - " + o); arg++; } } diff --git a/mixins/src/main/java/mixins/WidgetSpriteMixin.java b/mixins/src/main/java/mixins/WidgetSpriteMixin.java index 1549e97ca..058da0480 100644 --- a/mixins/src/main/java/mixins/WidgetSpriteMixin.java +++ b/mixins/src/main/java/mixins/WidgetSpriteMixin.java @@ -10,6 +10,7 @@ import net.runelite.rs.api.RSSpritePixels; import net.runelite.rs.api.RSUrlRequester; import net.runelite.rs.api.RSWidget; +import net.runelite.rs.api.RSWidgetDefinition; @Mixin(RSWidget.class) public abstract class WidgetSpriteMixin implements RSWidget @@ -19,7 +20,7 @@ public abstract class WidgetSpriteMixin implements RSWidget @Copy("getSprite") @Replace("getSprite") - public RSSpritePixels copy$getWidgetSprite(boolean var1, RSUrlRequester var2) + public RSSpritePixels copy$getWidgetSprite(RSWidgetDefinition rsWidgetDefinition, boolean var1, RSUrlRequester var2) { if (getSpriteId() != -1) { @@ -31,13 +32,13 @@ public abstract class WidgetSpriteMixin implements RSWidget } } - return copy$getWidgetSprite(var1, var2); + return copy$getWidgetSprite(rsWidgetDefinition,var1, var2); } @Inject @Override public SpritePixels getSprite() { - return getSprite(false, null); + return getSprite(null,false, null); } } \ No newline at end of file diff --git a/osrs/src/main/java/AABB.java b/osrs/src/main/java/AABB.java index 2c50633b4..7028594a7 100644 --- a/osrs/src/main/java/AABB.java +++ b/osrs/src/main/java/AABB.java @@ -1,26 +1,32 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ip") +@ObfuscatedName("jl") @Implements("AABB") public class AABB { - @ObfuscatedName("au") + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field2123; + @ObfuscatedName("ac") @Export("xMid") int xMid; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("yMid") int yMid; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("zMid") int zMid; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("zMidOffset") int zMidOffset; diff --git a/osrs/src/main/java/AbstractArchive.java b/osrs/src/main/java/AbstractArchive.java index df0a9e38d..042533d1c 100644 --- a/osrs/src/main/java/AbstractArchive.java +++ b/osrs/src/main/java/AbstractArchive.java @@ -3,67 +3,67 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nu") +@ObfuscatedName("om") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("bt") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lus;" + descriptor = "Lvb;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("bm") + @ObfuscatedName("bo") @Export("maximumContainerSize") static int maximumContainerSize; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @Export("groupCount") int groupCount; - @ObfuscatedName("ah") + @ObfuscatedName("aw") @Export("groupIds") int[] groupIds; - @ObfuscatedName("as") + @ObfuscatedName("aq") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Luz;" + descriptor = "Lvr;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("aj") + @ObfuscatedName("at") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("av") + @ObfuscatedName("af") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("ak") + @ObfuscatedName("bn") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("bh") + @ObfuscatedName("bk") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("bj") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "[Luz;" + descriptor = "[Lvr;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("groups") Object[] groups; - @ObfuscatedName("bv") + @ObfuscatedName("be") @Export("files") Object[][] files; - @ObfuscatedName("bd") + @ObfuscatedName("ba") @Export("hash") public int hash; - @ObfuscatedName("by") + @ObfuscatedName("bz") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("bs") + @ObfuscatedName("bb") @Export("shallowFiles") boolean shallowFiles; @@ -77,63 +77,56 @@ public abstract class AbstractArchive { this.shallowFiles = var2; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1272707955" + garbageValue = "1737906888" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "402130956" + descriptor = "(IB)V", + garbageValue = "11" ) @Export("loadGroup") void loadGroup(int var1) { } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1917091652" + garbageValue = "177421131" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("be") + @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1178944062" + garbageValue = "269560048" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { int var3 = var1.length; - int var5 = -1; - - int var6; - for (var6 = 0; var6 < var3; ++var6) { - var5 = var5 >>> 8 ^ Buffer.crc32Table[(var5 ^ var1[var6]) & 255]; - } - - var5 = ~var5; - this.hash = var5; - Buffer var15 = new Buffer(class53.decompressBytes(var1)); - var5 = var15.readUnsignedByte(); + int var2 = ArchiveDisk.method2309(var1, 0, var3); + this.hash = var2; + Buffer var4 = new Buffer(class372.decompressBytes(var1)); + int var5 = var4.readUnsignedByte(); if (var5 >= 5 && var5 <= 7) { if (var5 >= 6) { - var15.readInt(); + var4.readInt(); } - var6 = var15.readUnsignedByte(); + int var6 = var4.readUnsignedByte(); if (var5 >= 7) { - this.groupCount = var15.method2562(); + this.groupCount = var4.readLargeSmart(); } else { - this.groupCount = var15.readUnsignedShort(); + this.groupCount = var4.readUnsignedShort(); } int var7 = 0; @@ -142,14 +135,14 @@ void decodeIndex(byte[] var1) { int var9; if (var5 >= 7) { for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupIds[var9] = var7 += var15.method2562(); + this.groupIds[var9] = var7 += var4.readLargeSmart(); if (this.groupIds[var9] > var8) { var8 = this.groupIds[var9]; } } } else { for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupIds[var9] = var7 += var15.readUnsignedShort(); + this.groupIds[var9] = var7 += var4.readUnsignedShort(); if (this.groupIds[var9] > var8) { var8 = this.groupIds[var9]; } @@ -166,22 +159,22 @@ void decodeIndex(byte[] var1) { this.groupNameHashes = new int[var8 + 1]; for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupNameHashes[this.groupIds[var9]] = var15.readInt(); + this.groupNameHashes[this.groupIds[var9]] = var4.readInt(); } this.groupNameHashTable = new IntHashTable(this.groupNameHashes); } for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupCrcs[this.groupIds[var9]] = var15.readInt(); + this.groupCrcs[this.groupIds[var9]] = var4.readInt(); } for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupVersions[this.groupIds[var9]] = var15.readInt(); + this.groupVersions[this.groupIds[var9]] = var4.readInt(); } for (var9 = 0; var9 < this.groupCount; ++var9) { - this.fileCounts[this.groupIds[var9]] = var15.readUnsignedShort(); + this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort(); } int var10; @@ -198,7 +191,7 @@ void decodeIndex(byte[] var1) { this.fileIds[var10] = new int[var11]; for (var13 = 0; var13 < var11; ++var13) { - var14 = this.fileIds[var10][var13] = var7 += var15.method2562(); + var14 = this.fileIds[var10][var13] = var7 += var4.readLargeSmart(); if (var14 > var12) { var12 = var14; } @@ -215,7 +208,7 @@ void decodeIndex(byte[] var1) { this.fileIds[var10] = new int[var11]; for (var13 = 0; var13 < var11; ++var13) { - var14 = this.fileIds[var10][var13] = var7 += var15.readUnsignedShort(); + var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); if (var14 > var12) { var12 = var14; } @@ -235,7 +228,7 @@ void decodeIndex(byte[] var1) { this.fileNameHashes[var10] = new int[this.files[var10].length]; for (var12 = 0; var12 < var11; ++var12) { - this.fileNameHashes[var10][this.fileIds[var10][var12]] = var15.readInt(); + this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt(); } this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); @@ -247,20 +240,20 @@ void decodeIndex(byte[] var1) { } } - @ObfuscatedName("bi") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(IIB)[B", - garbageValue = "-1" + descriptor = "(III)[B", + garbageValue = "1711310441" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("bz") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "1244530387" + garbageValue = "-1302021436" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -276,7 +269,7 @@ public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { } } - byte[] var5 = class126.method699(this.files[var1][var2], false); + byte[] var5 = class135.method726(this.files[var1][var2], false); if (this.shallowFiles) { this.files[var1][var2] = null; } @@ -287,10 +280,10 @@ public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { } } - @ObfuscatedName("bx") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "57" + descriptor = "(III)Z", + garbageValue = "-919359930" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -308,12 +301,12 @@ public boolean tryLoadFile(int var1, int var2) { } } - @ObfuscatedName("bn") + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-2143773006" + garbageValue = "-855081287" ) - public boolean method1906(int var1) { + public boolean method1937(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -323,10 +316,10 @@ public boolean method1906(int var1) { } } - @ObfuscatedName("bw") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1627595520" + garbageValue = "1482943907" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -338,10 +331,10 @@ public boolean tryLoadGroup(int var1) { } } - @ObfuscatedName("bc") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-796696946" + descriptor = "(B)Z", + garbageValue = "39" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -360,10 +353,10 @@ public boolean isFullyLoaded() { return var1; } - @ObfuscatedName("bg") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "-118859567" + garbageValue = "2123852000" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -376,10 +369,10 @@ public byte[] takeFileFlat(int var1) { } } - @ObfuscatedName("cw") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "-1922174985" + garbageValue = "1658357673" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -395,17 +388,17 @@ public byte[] getFile(int var1, int var2) { } } - byte[] var4 = class126.method699(this.files[var1][var2], false); + byte[] var4 = class135.method726(this.files[var1][var2], false); return var4; } else { return null; } } - @ObfuscatedName("cf") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "-893648028" + garbageValue = "-2100873000" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -418,40 +411,40 @@ public byte[] getFileFlat(int var1) { } } - @ObfuscatedName("cm") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(II)[I", - garbageValue = "76530715" + descriptor = "(IB)[I", + garbageValue = "114" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("cn") + @ObfuscatedName("cu") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "11" + garbageValue = "5" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files != null && var1 < this.files.length && this.files[var1] != null ? this.files[var1].length : 0; } - @ObfuscatedName("cs") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-92" + descriptor = "(I)I", + garbageValue = "325433573" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; } - @ObfuscatedName("cx") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "64500147" + descriptor = "(S)V", + garbageValue = "-28003" ) @Export("clearGroups") public void clearGroups() { @@ -461,10 +454,10 @@ public void clearGroups() { } - @ObfuscatedName("cr") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "-334571913" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -474,13 +467,12 @@ public void clearFilesGroup(int var1) { } - @ObfuscatedName("cd") + @ObfuscatedName("cg") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "68" + garbageValue = "-37" ) - @Export("clearFiles") - public void clearFiles() { + public void method1950() { for (int var1 = 0; var1 < this.files.length; ++var1) { if (this.files[var1] != null) { for (int var2 = 0; var2 < this.files[var1].length; ++var2) { @@ -491,10 +483,10 @@ public void clearFiles() { } - @ObfuscatedName("ce") + @ObfuscatedName("cq") @ObfuscatedSignature( descriptor = "(I[IB)Z", - garbageValue = "-93" + garbageValue = "4" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -518,14 +510,14 @@ boolean buildFiles(int var1, int[] var2) { } else { byte[] var21; if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) { - var21 = class126.method699(this.groups[var1], true); + var21 = class135.method726(this.groups[var1], true); Buffer var8 = new Buffer(var21); var8.xteaDecrypt(var2, 5, var8.array.length); } else { - var21 = class126.method699(this.groups[var1], false); + var21 = class135.method726(this.groups[var1], false); } - byte[] var25 = class53.decompressBytes(var21); + byte[] var25 = class372.decompressBytes(var21); if (this.releaseGroups) { this.groups[var1] = null; } @@ -616,344 +608,118 @@ boolean buildFiles(int var1, int[] var2) { } } - @ObfuscatedName("cq") + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1972103558" + descriptor = "(Ljava/lang/String;S)I", + garbageValue = "14942" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(WorldMapElement.hashString(var1)); + return this.groupNameHashTable.get(EnumComposition.hashString(var1)); } - @ObfuscatedName("cp") + @ObfuscatedName("cz") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)I", - garbageValue = "22201919" + garbageValue = "261034000" ) @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(WorldMapElement.hashString(var2)); + return this.fileNameHashTables[var1].get(EnumComposition.hashString(var2)); } - @ObfuscatedName("cv") + @ObfuscatedName("cp") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "978478615" + garbageValue = "873049159" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); + int var3 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(WorldMapElement.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(EnumComposition.hashString(var2)); return var4 >= 0; } } - @ObfuscatedName("co") + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "1446262093" + descriptor = "(Ljava/lang/String;Ljava/lang/String;S)[B", + garbageValue = "-22373" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(WorldMapElement.hashString(var2)); + int var3 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(EnumComposition.hashString(var2)); return this.takeFile(var3, var4); } - @ObfuscatedName("cl") + @ObfuscatedName("cn") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-254123457" + garbageValue = "-227874487" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(WorldMapElement.hashString(var2)); + int var3 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(EnumComposition.hashString(var2)); return this.tryLoadFile(var3, var4); } - @ObfuscatedName("cu") + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Z", - garbageValue = "64" + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "1792346501" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); + int var2 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); return this.tryLoadGroup(var2); } - @ObfuscatedName("ch") + @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2037127897" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-24" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); + int var2 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); if (var2 >= 0) { this.loadRegionFromGroup(var2); } } - @ObfuscatedName("ci") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1703515273" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "-108" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(WorldMapElement.hashString(var1)); + int var2 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); return this.groupLoadPercent(var2); } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)Lhh;", - garbageValue = "-2101462016" - ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class13.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("at") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lto;II)V", - garbageValue = "-312425420" + descriptor = "(II)I", + garbageValue = "1888101922" ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; - if (var2) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - int var3 = var0.readBits(2); - Player var4 = Client.players[var1]; - if (var3 == 0) { - if (var2) { - var4.hasMovementPending = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (class47.baseY + var4.pathY[0] >> 13) + (UrlRequester.baseX + var4.pathX[0] >> 13 << 14); - if (var4.movingOrientation != -1) { - Players.Players_orientations[var1] = var4.movingOrientation; - } else { - Players.Players_orientations[var1] = var4.orientation; - } - - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - KitDefinition.updateExternalPlayer(var0, var1); - } - - } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { - var5 = var0.readBits(3); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - --var6; - --var7; - } else if (var5 == 1) { - --var7; - } else if (var5 == 2) { - ++var6; - --var7; - } else if (var5 == 3) { - --var6; - } else if (var5 == 4) { - ++var6; - } else if (var5 == 5) { - --var6; - ++var7; - } else if (var5 == 6) { - ++var7; - } else if (var5 == 7) { - ++var6; - ++var7; - } - - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.hasMovementPending = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.hasMovementPending = false; - var4.move(var6, var7, Players.playerMovementSpeeds[var1]); - } - } else { - var4.resetPath(var6, var7); - var4.hasMovementPending = false; - } - - } else if (var3 == 2) { - var5 = var0.readBits(4); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - var6 -= 2; - var7 -= 2; - } else if (var5 == 1) { - --var6; - var7 -= 2; - } else if (var5 == 2) { - var7 -= 2; - } else if (var5 == 3) { - ++var6; - var7 -= 2; - } else if (var5 == 4) { - var6 += 2; - var7 -= 2; - } else if (var5 == 5) { - var6 -= 2; - --var7; - } else if (var5 == 6) { - var6 += 2; - --var7; - } else if (var5 == 7) { - var6 -= 2; - } else if (var5 == 8) { - var6 += 2; - } else if (var5 == 9) { - var6 -= 2; - ++var7; - } else if (var5 == 10) { - var6 += 2; - ++var7; - } else if (var5 == 11) { - var6 -= 2; - var7 += 2; - } else if (var5 == 12) { - --var6; - var7 += 2; - } else if (var5 == 13) { - var7 += 2; - } else if (var5 == 14) { - ++var6; - var7 += 2; - } else if (var5 == 15) { - var6 += 2; - var7 += 2; - } - - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.hasMovementPending = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.hasMovementPending = false; - var4.move(var6, var7, Players.playerMovementSpeeds[var1]); - } - } else { - var4.resetPath(var6, var7); - var4.hasMovementPending = false; - } - - } else { - var5 = var0.readBits(1); - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { - var6 = var0.readBits(12); - var7 = var6 >> 10; - var8 = var6 >> 5 & 31; - if (var8 > 15) { - var8 -= 32; - } - - var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; - var11 = var9 + var4.pathY[0]; - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.hasMovementPending = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.hasMovementPending = false; - var4.move(var10, var11, Players.playerMovementSpeeds[var1]); - } - } else { - var4.resetPath(var10, var11); - var4.hasMovementPending = false; - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - HealthBar.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (var8 + UrlRequester.baseX + var4.pathX[0] & 16383) - UrlRequester.baseX; - var11 = (var9 + class47.baseY + var4.pathY[0] & 16383) - class47.baseY; - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.hasMovementPending = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.hasMovementPending = false; - var4.move(var10, var11, Players.playerMovementSpeeds[var1]); - } - } else { - var4.resetPath(var10, var11); - var4.hasMovementPending = false; - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - HealthBar.Client_plane = var4.plane; - } - - } - } - } + public static int method1931(int var0) { + return var0 >>> 12; } } \ No newline at end of file diff --git a/osrs/src/main/java/AbstractByteArrayCopier.java b/osrs/src/main/java/AbstractByteArrayCopier.java index e23a753d3..27764fd7b 100644 --- a/osrs/src/main/java/AbstractByteArrayCopier.java +++ b/osrs/src/main/java/AbstractByteArrayCopier.java @@ -3,36 +3,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") +@ObfuscatedName("nn") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field3136; + AbstractByteArrayCopier() { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-962589916" + garbageValue = "1381422717" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1426025249" + garbageValue = "-2137536013" ) @Export("set") public abstract void set(byte[] var1); - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIB)Lco;", - garbageValue = "64" + descriptor = "(II)Lfy;", + garbageValue = "-1206517900" ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); + static class140 method1886(int var0) { + class140[] var1 = new class140[]{class140.field1301, class140.field1304, class140.field1303, class140.field1308, class140.field1306, class140.field1302, class140.field1307, class140.field1300, class140.field1305}; + class140 var2 = (class140)SequenceDefinition.findEnumerated(var1, var0); + if (var2 == null) { + var2 = class140.field1305; + } + + return var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/AbstractFont.java b/osrs/src/main/java/AbstractFont.java index 2c4941769..4665686f7 100644 --- a/osrs/src/main/java/AbstractFont.java +++ b/osrs/src/main/java/AbstractFont.java @@ -8,73 +8,73 @@ @ObfuscatedName("pk") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "[Luk;" + descriptor = "[Lun;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("pixels") byte[][] pixels; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("advances") int[] advances; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("widths") int[] widths; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("heights") int[] heights; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("topBearings") int[] topBearings; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("ascent") public int ascent; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("kerning") byte[] kerning; @@ -92,6 +92,12 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_lines = new String[100]; } + AbstractFont(byte[] var1) { + this.pixels = new byte[256][]; + this.ascent = 0; + this.readMetrics(var1); + } + AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { this.pixels = new byte[256][]; this.ascent = 0; @@ -118,21 +124,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.maxDescent = var9 - this.ascent; } - AbstractFont(byte[] var1) { - this.pixels = new byte[256][]; - this.ascent = 0; - this.readMetrics(var1); - } - - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("aa") + @ObfuscatedName("ab") @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; @@ -194,7 +194,7 @@ void readMetrics(byte[] var1) { if (var13 != 32 && var13 != 160) { for (var8 = 0; var8 < 256; ++var8) { if (var8 != 32 && var8 != 160) { - this.kerning[var8 + (var13 << 8)] = (byte)method2080(var11, var12, var4, this.advances, var10, var13, var8); + this.kerning[var8 + (var13 << 8)] = (byte)method2112(var11, var12, var4, this.advances, var10, var13, var8); } } } @@ -205,17 +205,17 @@ void readMetrics(byte[] var1) { } - @ObfuscatedName("ad") + @ObfuscatedName("av") @Export("charWidth") public int charWidth(char var1) { if (var1 == 160) { var1 = ' '; } - return this.advances[class348.charToByteCp1252(var1) & 255]; + return this.advances[Actor.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("aq") + @ObfuscatedName("ag") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { @@ -239,7 +239,7 @@ public int stringWidth(String var1) { if (!var7.equals("gt")) { if (var7.startsWith("img=")) { try { - int var8 = HealthBarUpdate.method524(var7.substring(4)); + int var8 = class36.method182(var7.substring(4)); var4 += AbstractFont_modIconSprites[var8].width; var3 = -1; } catch (Exception var10) { @@ -257,7 +257,7 @@ public int stringWidth(String var1) { } if (var2 == -1) { - var4 += this.advances[(char)(class348.charToByteCp1252(var6) & 255)]; + var4 += this.advances[(char)(Actor.charToByteCp1252(var6) & 255)]; if (this.kerning != null && var3 != -1) { var4 += this.kerning[var6 + (var3 << 8)]; } @@ -271,7 +271,7 @@ public int stringWidth(String var1) { } } - @ObfuscatedName("al") + @ObfuscatedName("aa") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { @@ -322,7 +322,7 @@ public int breakLines(String var1, int[] var2, String[] var3) { var11 = '>'; } else if (var16.startsWith("img=")) { try { - int var17 = HealthBarUpdate.method524(var16.substring(4)); + int var17 = class36.method182(var16.substring(4)); var4 += AbstractFont_modIconSprites[var17].width; var11 = 0; } catch (Exception var20) { @@ -376,7 +376,7 @@ public int breakLines(String var1, int[] var2, String[] var3) { } } - @ObfuscatedName("an") + @ObfuscatedName("ap") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); @@ -392,17 +392,17 @@ public int lineWidth(String var1, int var2) { return var4; } - @ObfuscatedName("ar") + @ObfuscatedName("ay") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;II)Lrb;" + descriptor = "(IILjava/lang/String;II)Lrx;" ) - public Bounds method2087(int var1, int var2, String var3, int var4, int var5) { + public Bounds method2119(int var1, int var2, String var3, int var4, int var5) { if (var3 != null && var3.length() >= var2 + var1) { int var6 = var4 - this.stringWidth(var3) / 2; var6 += this.stringWidth(var3.substring(0, var1)); @@ -415,7 +415,7 @@ public Bounds method2087(int var1, int var2, String var3, int var4, int var5) { } } - @ObfuscatedName("am") + @ObfuscatedName("an") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -424,7 +424,7 @@ public void draw(String var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("ax") + @ObfuscatedName("au") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -434,7 +434,7 @@ public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int v } } - @ObfuscatedName("ah") + @ObfuscatedName("ai") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -443,7 +443,7 @@ public void drawRightAligned(String var1, int var2, int var3, int var4, int var5 } } - @ObfuscatedName("as") + @ObfuscatedName("ae") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -452,14 +452,14 @@ public void drawCentered(String var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - return this.method2093(var1, var2, var3, var4, var5, var6, var7, 256, var8, var9, var10); + return this.method2125(var1, var2, var3, var4, var5, var6, var7, 256, var8, var9, var10); } - @ObfuscatedName("aj") - public int method2093(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { + @ObfuscatedName("aq") + public int method2125(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { if (var1 == null) { return 0; } else { @@ -523,24 +523,24 @@ public int method2093(String var1, int var2, int var3, int var4, int var5, int v } } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lpl;IIIII)Lss;" + descriptor = "(Lpr;IIIII)Ltw;" ) - public class485 method2094(class398 var1, int var2, int var3, int var4, int var5, int var6) { - if (!var1.method2115()) { + public class500 method2126(class413 var1, int var2, int var3, int var4, int var5, int var6) { + if (!var1.method2147()) { this.reset(var4, var5); var3 -= this.ascent; - for (int var7 = 0; var7 < var1.method2116(); ++var7) { - class396 var8 = var1.method2120(var7); - if (var6 != -1 && var8.field3682 > var6) { - return new class485(var8.field3681, var8.field3682); + for (int var7 = 0; var7 < var1.method2148(); ++var7) { + class411 var8 = var1.method2152(var7); + if (var6 != -1 && var8.field3714 > var6) { + return new class500(var8.field3715, var8.field3714); } - char var9 = var8.field3680; + char var9 = var8.field3713; if (var9 != '\n') { - if (var1.method2114(var7)) { + if (var1.method2146(var7)) { var9 = '*'; } @@ -549,8 +549,8 @@ public class485 method2094(class398 var1, int var2, int var3, int var4, int var5 var9 = ' '; } - int var10 = var2 + var8.field3681; - int var11 = var3 + var8.field3682; + int var10 = var2 + var8.field3715; + int var11 = var3 + var8.field3714; int var12 = this.widths[var9]; int var13 = this.heights[var9]; if (AbstractFont_shadow != -1) { @@ -563,16 +563,16 @@ public class485 method2094(class398 var1, int var2, int var3, int var4, int var5 } } - return var1.method2119(); + return var1.method2151(); } - @ObfuscatedName("aw") - public void method2095(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { + @ObfuscatedName("at") + public void method2127(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { if (var1 != null) { this.reset(var4, var5); int[] var8 = null; if (var7 != null) { - var8 = this.method2100(var7, var1.length()); + var8 = this.method2132(var7, var1.length()); } int[] var9 = new int[var1.length()]; @@ -581,17 +581,17 @@ public void method2095(String var1, int var2, int var3, int var4, int var5, int var9[var10] = (int)(Math.sin((double)var10 / 2.0D + (double)var6 / 5.0D) * 5.0D); } - this.method2106(var1, var2 - this.stringWidth(var1) / 2, var3, var8, (int[])null, var9); + this.method2138(var1, var2 - this.stringWidth(var1) / 2, var3, var8, (int[])null, var9); } } - @ObfuscatedName("ak") - public void method2096(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { + @ObfuscatedName("af") + public void method2128(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { if (var1 != null) { this.reset(var4, var5); int[] var8 = null; if (var7 != null) { - var8 = this.method2100(var7, var1.length()); + var8 = this.method2132(var7, var1.length()); } int[] var9 = new int[var1.length()]; @@ -602,17 +602,17 @@ public void method2096(String var1, int var2, int var3, int var4, int var5, int var10[var11] = (int)(Math.sin((double)var11 / 3.0D + (double)var6 / 5.0D) * 5.0D); } - this.method2106(var1, var2 - this.stringWidth(var1) / 2, var3, var8, var9, var10); + this.method2138(var1, var2 - this.stringWidth(var1) / 2, var3, var8, var9, var10); } } - @ObfuscatedName("bh") - public void method2097(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int[] var8) { + @ObfuscatedName("ad") + public void method2129(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int[] var8) { if (var1 != null) { this.reset(var4, var5); int[] var9 = null; if (var8 != null) { - var9 = this.method2100(var8, var1.length()); + var9 = this.method2132(var8, var1.length()); } double var10 = 7.0D - (double)var7 / 8.0D; @@ -626,38 +626,38 @@ public void method2097(String var1, int var2, int var3, int var4, int var5, int var12[var13] = (int)(Math.sin((double)var13 / 1.5D + (double)var6 / 1.0D) * var10); } - this.method2106(var1, var2 - this.stringWidth(var1) / 2, var3, var9, (int[])null, var12); + this.method2138(var1, var2 - this.stringWidth(var1) / 2, var3, var9, (int[])null, var12); } } - @ObfuscatedName("bj") - public void method2098(String var1, int var2, int var3, int var4, int var5, int[] var6) { + @ObfuscatedName("bn") + public void method2130(String var1, int var2, int var3, int var4, int var5, int[] var6) { if (var1 != null) { this.reset(var4, var5); int[] var7 = null; if (var6 != null) { - var7 = this.method2100(var6, var1.length()); + var7 = this.method2132(var6, var1.length()); } - this.method2106(var1, var2 - this.stringWidth(var1) / 2, var3, var7, (int[])null, (int[])null); + this.method2138(var1, var2 - this.stringWidth(var1) / 2, var3, var7, (int[])null, (int[])null); } } @ObfuscatedName("bk") - public void method2099(String var1, int var2, int var3, int var4, int var5, int[] var6) { + public void method2131(String var1, int var2, int var3, int var4, int var5, int[] var6) { if (var1 != null) { this.reset(var4, var5); int[] var7 = null; if (var6 != null) { - var7 = this.method2100(var6, var1.length()); + var7 = this.method2132(var6, var1.length()); } - this.method2106(var1, var2, var3, var7, (int[])null, (int[])null); + this.method2138(var1, var2, var3, var7, (int[])null, (int[])null); } } - @ObfuscatedName("bv") - int[] method2100(int[] var1, int var2) { + @ObfuscatedName("by") + int[] method2132(int[] var1, int var2) { if (var2 == 0) { return null; } else { @@ -672,7 +672,7 @@ int[] method2100(int[] var1, int var2) { } } - @ObfuscatedName("bt") + @ObfuscatedName("bd") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -689,11 +689,11 @@ public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, } } - this.method2106(var1, var2, var3, (int[])null, var7, (int[])null); + this.method2138(var1, var2, var3, (int[])null, var7, (int[])null); } } - @ObfuscatedName("bd") + @ObfuscatedName("be") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; @@ -707,7 +707,7 @@ void reset(int var1, int var2) { AbstractFont_justificationCurrent = 0; } - @ObfuscatedName("by") + @ObfuscatedName("bv") @Export("decodeTag") void decodeTag(String var1) { try { @@ -715,13 +715,13 @@ void decodeTag(String var1) { String var3; if (var1.startsWith("col=")) { var3 = var1.substring(4); - var2 = DevicePcmPlayerProvider.method75(var3, 16, true); + var2 = class230.method1184(var3, 16, true); AbstractFont_color = var2; } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { var3 = var1.substring(4); - var2 = DevicePcmPlayerProvider.method75(var3, 16, true); + var2 = class230.method1184(var3, 16, true); AbstractFont_strike = var2; } else if (var1.equals("str")) { AbstractFont_strike = 8388608; @@ -729,7 +729,7 @@ void decodeTag(String var1) { AbstractFont_strike = -1; } else if (var1.startsWith("u=")) { var3 = var1.substring(2); - var2 = DevicePcmPlayerProvider.method75(var3, 16, true); + var2 = class230.method1184(var3, 16, true); AbstractFont_underline = var2; } else if (var1.equals("u")) { AbstractFont_underline = 0; @@ -737,7 +737,7 @@ void decodeTag(String var1) { AbstractFont_underline = -1; } else if (var1.startsWith("shad=")) { var3 = var1.substring(5); - var2 = DevicePcmPlayerProvider.method75(var3, 16, true); + var2 = class230.method1184(var3, 16, true); AbstractFont_shadow = var2; } else if (var1.equals("shad")) { AbstractFont_shadow = 0; @@ -751,7 +751,7 @@ void decodeTag(String var1) { } - @ObfuscatedName("bs") + @ObfuscatedName("ba") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; @@ -774,7 +774,7 @@ void calculateLineJustification(String var1, int var2) { } - @ObfuscatedName("bm") + @ObfuscatedName("bz") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; @@ -783,7 +783,7 @@ void draw0(String var1, int var2, int var3) { for (int var6 = 0; var6 < var1.length(); ++var6) { if (var1.charAt(var6) != 0) { - char var7 = (char)(class348.charToByteCp1252(var1.charAt(var6)) & 255); + char var7 = (char)(Actor.charToByteCp1252(var1.charAt(var6)) & 255); if (var7 == '<') { var4 = var6; } else { @@ -797,7 +797,7 @@ void draw0(String var1, int var2, int var3) { if (!var8.equals("gt")) { if (var8.startsWith("img=")) { try { - var9 = HealthBarUpdate.method524(var8.substring(4)); + var9 = class36.method182(var8.substring(4)); IndexedSprite var10 = AbstractFont_modIconSprites[var9]; var10.drawAt(var2, var3 + this.ascent - var10.height); var2 += var10.width; @@ -847,11 +847,11 @@ void draw0(String var1, int var2, int var3) { int var13 = this.advances[var7]; if (AbstractFont_strike != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); + Rasterizer2D.method2675(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } if (AbstractFont_underline != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); + Rasterizer2D.method2675(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } var2 += var13; @@ -863,8 +863,8 @@ void draw0(String var1, int var2, int var3) { } - @ObfuscatedName("bf") - void method2106(String var1, int var2, int var3, int[] var4, int[] var5, int[] var6) { + @ObfuscatedName("bb") + void method2138(String var1, int var2, int var3, int[] var4, int[] var5, int[] var6) { var3 -= this.ascent; int var7 = -1; int var8 = -1; @@ -872,7 +872,7 @@ void method2106(String var1, int var2, int var3, int[] var4, int[] var5, int[] v for (int var10 = 0; var10 < var1.length(); ++var10) { if (var1.charAt(var10) != 0) { - char var11 = (char)(class348.charToByteCp1252(var1.charAt(var10)) & 255); + char var11 = (char)(Actor.charToByteCp1252(var1.charAt(var10)) & 255); if (var11 == '<') { var7 = var10; } else { @@ -901,7 +901,7 @@ void method2106(String var1, int var2, int var3, int[] var4, int[] var5, int[] v } ++var9; - var15 = HealthBarUpdate.method524(var12.substring(4)); + var15 = class36.method182(var12.substring(4)); IndexedSprite var16 = AbstractFont_modIconSprites[var15]; var16.drawAt(var13 + var2, var14 + (var3 + this.ascent - var16.height)); var2 += var16.width; @@ -971,11 +971,11 @@ void method2106(String var1, int var2, int var3, int[] var4, int[] var5, int[] v int var17 = this.advances[var11]; if (AbstractFont_strike != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var17, AbstractFont_strike); + Rasterizer2D.method2675(var2, var3 + (int)((double)this.ascent * 0.7D), var17, AbstractFont_strike); } if (AbstractFont_underline != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var17, AbstractFont_underline); + Rasterizer2D.method2675(var2, var3 + this.ascent, var17, AbstractFont_underline); } var2 += var17; @@ -987,8 +987,8 @@ void method2106(String var1, int var2, int var3, int[] var4, int[] var5, int[] v } - @ObfuscatedName("af") - static int method2080(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("am") + static int method2112(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { int var7 = var2[var5]; int var8 = var7 + var4[var5]; int var9 = var2[var6]; @@ -1023,7 +1023,7 @@ static int method2080(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[ return -var13; } - @ObfuscatedName("ab") + @ObfuscatedName("as") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); @@ -1052,7 +1052,7 @@ public static String escapeBrackets(String var0) { return var6.toString(); } - @ObfuscatedName("bq") + @ObfuscatedName("bo") @Export("AbstractFont_drawGlyph") static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -1094,7 +1094,7 @@ static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, in } } - @ObfuscatedName("ba") + @ObfuscatedName("bp") @Export("AbstractFont_placeGlyph") static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -1142,7 +1142,7 @@ static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, } - @ObfuscatedName("bl") + @ObfuscatedName("bt") @Export("AbstractFont_drawGlyphAlpha") static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -1184,7 +1184,7 @@ static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var } } - @ObfuscatedName("bp") + @ObfuscatedName("bm") @Export("AbstractFont_placeGlyphAlpha") static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; diff --git a/osrs/src/main/java/AbstractRasterProvider.java b/osrs/src/main/java/AbstractRasterProvider.java index b3862034f..b912acf8e 100644 --- a/osrs/src/main/java/AbstractRasterProvider.java +++ b/osrs/src/main/java/AbstractRasterProvider.java @@ -3,56 +3,56 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uq") +@ObfuscatedName("ui") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("pixels") public int[] pixels; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("width") public int width; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("height") public int height; - @ObfuscatedName("ai") - protected float[] field4225; + @ObfuscatedName("ah") + protected float[] field4252; protected AbstractRasterProvider() { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-46" + descriptor = "(III)V", + garbageValue = "-237304267" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1065945289" + descriptor = "(IIIIB)V", + garbageValue = "-3" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("as") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-109" + descriptor = "(I)V", + garbageValue = "1751275534" ) @Export("apply") public final void apply() { - Rasterizer2D.method2620(this.pixels, this.width, this.height, this.field4225); + Rasterizer2D.method2659(this.pixels, this.width, this.height, this.field4252); } - @ObfuscatedName("ay") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-37" + descriptor = "(ZI)V", + garbageValue = "952320023" ) - public final void method2646(boolean var1) { - this.field4225 = var1 ? new float[this.height * this.width + 1] : null; + public final void method2685(boolean var1) { + this.field4252 = var1 ? new float[this.width * this.height + 1] : null; } } \ No newline at end of file diff --git a/osrs/src/main/java/AbstractSocket.java b/osrs/src/main/java/AbstractSocket.java index ed862a179..776a43ba2 100644 --- a/osrs/src/main/java/AbstractSocket.java +++ b/osrs/src/main/java/AbstractSocket.java @@ -4,95 +4,58 @@ import net.runelite.mapping.ObfuscatedSignature; import java.io.IOException; -import java.util.Iterator; -@ObfuscatedName("qi") +@ObfuscatedName("re") @Implements("AbstractSocket") public abstract class AbstractSocket { - @ObfuscatedName("ii") - @ObfuscatedSignature( - descriptor = "Lqi;" - ) - static AbstractSocket field3819; - AbstractSocket() { } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-67" + descriptor = "(II)Z", + garbageValue = "2050917556" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1947351494" + garbageValue = "-111326055" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "969166986" + descriptor = "(B)I", + garbageValue = "-4" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "([BIIS)I", - garbageValue = "206" + descriptor = "([BIII)I", + garbageValue = "-2009008666" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1371855899" + garbageValue = "40171702" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1457160931" + descriptor = "(S)V", + garbageValue = "2421" ) @Export("close") public abstract void close(); - - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-148355488" - ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; - } - - @ObfuscatedName("nn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-99692388" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); - } - - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.invalidateIgnoreds(); - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/AbstractSound.java b/osrs/src/main/java/AbstractSound.java index 3bc0cb139..3e6ba4ded 100644 --- a/osrs/src/main/java/AbstractSound.java +++ b/osrs/src/main/java/AbstractSound.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("cp") +@ObfuscatedName("cb") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("position") int position; diff --git a/osrs/src/main/java/AbstractUserComparator.java b/osrs/src/main/java/AbstractUserComparator.java index bb0cc22ba..9007a4ec4 100644 --- a/osrs/src/main/java/AbstractUserComparator.java +++ b/osrs/src/main/java/AbstractUserComparator.java @@ -5,26 +5,24 @@ import java.util.Comparator; -@ObfuscatedName("qz") +@ObfuscatedName("rv") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("tk") - @ObfuscatedSignature( - descriptor = "Lui;" - ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("ae") + @ObfuscatedName("ar") + static boolean[] field3833; + @ObfuscatedName("uj") + static int field3834; + @ObfuscatedName("al") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-2074845369" + garbageValue = "1018649978" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -36,10 +34,10 @@ final void addComparator(Comparator var1) { } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lqs;Lqs;I)I", - garbageValue = "1850684132" + descriptor = "(Lrp;Lrp;B)I", + garbageValue = "-78" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { diff --git a/osrs/src/main/java/AbstractWorldMapData.java b/osrs/src/main/java/AbstractWorldMapData.java index 01d061942..0f066e01f 100644 --- a/osrs/src/main/java/AbstractWorldMapData.java +++ b/osrs/src/main/java/AbstractWorldMapData.java @@ -5,81 +5,84 @@ import java.util.LinkedList; -@ObfuscatedName("ke") +@ObfuscatedName("kv") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("ac") - int field2429; - @ObfuscatedName("ai") - int field2432; - @ObfuscatedName("az") + @ObfuscatedName("lo") + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("ao") + int field2445; + @ObfuscatedName("ah") + int field2443; + @ObfuscatedName("ar") @Export("regionX") int regionX; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("regionY") int regionY; - @ObfuscatedName("aa") - int field2428; - @ObfuscatedName("af") + @ObfuscatedName("am") + int field2444; + @ObfuscatedName("av") @Export("planes") int planes; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("groupId") int groupId; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("fileId") int fileId; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("ar") - byte[][][] field2427; - @ObfuscatedName("ab") - byte[][][] field2426; - @ObfuscatedName("ag") + @ObfuscatedName("as") + byte[][][] field2439; + @ObfuscatedName("aj") + byte[][][] field2438; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "[[[[Lkn;" + descriptor = "[[[[Lkt;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("am") - boolean field2424; - @ObfuscatedName("ax") - boolean field2425; + @ObfuscatedName("au") + boolean field2437; + @ObfuscatedName("ai") + boolean field2436; AbstractWorldMapData() { this.groupId = -1; this.fileId = -1; new LinkedList(); - this.field2424 = false; - this.field2425 = false; + this.field2437 = false; + this.field2436 = false; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "2049371979" + descriptor = "(Lul;I)V", + garbageValue = "2115325709" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("aw") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2138999943" + garbageValue = "780555008" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2424 && this.field2425; + return this.field2437 && this.field2436; } - @ObfuscatedName("ak") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1524601998" + descriptor = "(Lom;I)V", + garbageValue = "905694632" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -87,42 +90,42 @@ void loadGeography(AbstractArchive var1) { byte[] var2 = var1.takeFile(this.groupId, this.fileId); if (var2 != null) { this.readGeography(new Buffer(var2)); - this.field2424 = true; - this.field2425 = true; + this.field2437 = true; + this.field2436 = true; } } } - @ObfuscatedName("bh") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1792319302" + garbageValue = "-1430776643" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field2427 = null; - this.field2426 = null; + this.field2439 = null; + this.field2438 = null; this.decorations = null; - this.field2424 = false; - this.field2425 = false; + this.field2437 = false; + this.field2436 = false; } - @ObfuscatedName("bj") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(IILtm;I)V", - garbageValue = "-938397050" + descriptor = "(IILul;I)V", + garbageValue = "744133359" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); if (var4 != 0) { if ((var4 & 1) != 0) { - this.method1522(var1, var2, var3, var4); + this.method1561(var1, var2, var3, var4); } else { - this.method1523(var1, var2, var3, var4); + this.method1562(var1, var2, var3, var4); } } @@ -130,10 +133,10 @@ void readTile(int var1, int var2, Buffer var3) { @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(IILtm;IS)V", - garbageValue = "23970" + descriptor = "(IILul;II)V", + garbageValue = "1523871519" ) - void method1522(int var1, int var2, Buffer var3, int var4) { + void method1561(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; if (var5) { this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedShort(); @@ -142,12 +145,12 @@ void method1522(int var1, int var2, Buffer var3, int var4) { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedShort(); } - @ObfuscatedName("bv") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(IILtm;II)V", - garbageValue = "-835370941" + descriptor = "(IILul;II)V", + garbageValue = "1937265234" ) - void method1523(int var1, int var2, Buffer var3, int var4) { + void method1562(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; boolean var6 = (var4 & 2) != 0; boolean var7 = (var4 & 4) != 0; @@ -163,8 +166,8 @@ void method1523(int var1, int var2, Buffer var3, int var4) { if (var10 != 0) { this.floorOverlayIds[var9][var1][var2] = (short)var10; var11 = var3.readUnsignedByte(); - this.field2427[var9][var1][var2] = (byte)(var11 >> 2); - this.field2426[var9][var1][var2] = (byte)(var11 & 3); + this.field2439[var9][var1][var2] = (byte)(var11 >> 2); + this.field2438[var9][var1][var2] = (byte)(var11 & 3); } } } @@ -176,7 +179,7 @@ void method1523(int var1, int var2, Buffer var3, int var4) { WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method2563(); + int var12 = var3.readNullableLargeSmart(); int var13 = var3.readUnsignedByte(); var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } @@ -186,41 +189,42 @@ void method1523(int var1, int var2, Buffer var3, int var4) { } - @ObfuscatedName("bt") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1240357684" + descriptor = "(B)I", + garbageValue = "-66" ) @Export("getRegionX") int getRegionX() { return this.regionX; } - @ObfuscatedName("bd") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "65280" + garbageValue = "1500412713" ) @Export("getRegionY") int getRegionY() { return this.regionY; } - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)[Ldk;", - garbageValue = "-74962306" + descriptor = "(IIIIB)I", + garbageValue = "-91" ) - static class90[] method1517() { - return new class90[]{class90.field889, class90.field892, class90.field888, class90.field893, class90.field891, class90.field890}; + static final int method1556(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; } - @ObfuscatedName("ho") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Liz;", - garbageValue = "100" + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "-1780027636" ) - public static class212 method1526() { - return Client.keyHandlerInstance; + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? UserComparator5.method673(var0, 10, var1) : Integer.toString(var0); } } \ No newline at end of file diff --git a/osrs/src/main/java/AbstractWorldMapIcon.java b/osrs/src/main/java/AbstractWorldMapIcon.java index 4c872ba85..214664796 100644 --- a/osrs/src/main/java/AbstractWorldMapIcon.java +++ b/osrs/src/main/java/AbstractWorldMapIcon.java @@ -3,72 +3,78 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("ll") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("az") + @ObfuscatedName("id") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Len;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lmo;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmo;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("screenX") int screenX; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lmc;Lmc;)V" + descriptor = "(Lmo;Lmo;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2135662389" + garbageValue = "-1637535390" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Lkq;", - garbageValue = "-2114244458" + descriptor = "(B)Lkd;", + garbageValue = "5" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-655814171" + descriptor = "(B)I", + garbageValue = "65" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-816534170" + garbageValue = "1338001743" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("bh") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1870658726" + garbageValue = "1492661122" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -79,44 +85,44 @@ boolean fitsScreen(int var1, int var2) { } } - @ObfuscatedName("bj") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1935416179" + garbageValue = "898631117" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("bk") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1283166598" + descriptor = "(IIB)Z", + garbageValue = "-74" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = class138.WorldMapElement_get(this.getElement()); + WorldMapElement var3 = class148.WorldMapElement_get(this.getElement()); int var4 = this.getSubWidth(); int var5 = this.getSubHeight(); switch(var3.horizontalAlignment.value) { case 0: - if (var1 > this.screenX - var4 && var1 <= this.screenX) { + if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { break; } return false; case 1: - if (var1 >= this.screenX && var1 < var4 + this.screenX) { + if (var1 > this.screenX - var4 && var1 <= this.screenX) { break; } return false; case 2: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { + if (var1 < this.screenX || var1 >= var4 + this.screenX) { return false; } } @@ -143,10 +149,10 @@ boolean elementFitsScreen(int var1, int var2) { } } - @ObfuscatedName("bv") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-731770826" + descriptor = "(IIB)Z", + garbageValue = "7" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -160,13 +166,15 @@ boolean labelFitsScreen(int var1, int var2) { } } - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "1637064671" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-37607217" ) - static final float method1556(int var0) { - float var1 = 10075.0F - (float)var0; - return (1.0075567F * var1 - 75.56675F) / var1; + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/AccessFile.java b/osrs/src/main/java/AccessFile.java index d239e6b48..9ddc35b4a 100644 --- a/osrs/src/main/java/AccessFile.java +++ b/osrs/src/main/java/AccessFile.java @@ -5,21 +5,21 @@ import java.io.*; -@ObfuscatedName("tu") +@ObfuscatedName("to") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("file") RandomAccessFile file; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("maxSize") final long maxSize; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (var3 == -1L) { + if (-1L == var3) { var3 = Long.MAX_VALUE; } @@ -39,17 +39,17 @@ public AccessFile(File var1, String var2, long var3) throws IOException { this.file.seek(0L); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); this.offset = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-890583938" + garbageValue = "1199497051" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -63,20 +63,20 @@ public final void write(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "346425728" + garbageValue = "2118009691" ) @Export("close") public final void close() throws IOException { this.closeSync(false); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "26" + garbageValue = "8" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -94,20 +94,20 @@ public final void closeSync(boolean var1) throws IOException { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "330936146" + descriptor = "(B)J", + garbageValue = "-9" ) @Export("length") public final long length() throws IOException { return this.file.length(); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "-81" + descriptor = "([BIII)I", + garbageValue = "1856614206" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { diff --git a/osrs/src/main/java/Actor.java b/osrs/src/main/java/Actor.java index 2fb252cf9..d936b20a6 100644 --- a/osrs/src/main/java/Actor.java +++ b/osrs/src/main/java/Actor.java @@ -3,236 +3,240 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") +@ObfuscatedName("di") @Implements("Actor") public abstract class Actor extends Renderable { + @ObfuscatedName("hg") + static String field959; + @ObfuscatedName("or") + static int field958; @ObfuscatedName("an") @Export("isWalking") boolean isWalking; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("x") int x; - @ObfuscatedName("by") + @ObfuscatedName("ba") @Export("y") int y; - @ObfuscatedName("bs") + @ObfuscatedName("bz") @Export("rotation") int rotation; - @ObfuscatedName("bm") - int field976; - @ObfuscatedName("bf") + @ObfuscatedName("bb") + int field971; + @ObfuscatedName("bo") @Export("playerCycle") int playerCycle; - @ObfuscatedName("bq") + @ObfuscatedName("bp") @Export("idleSequence") int idleSequence; - @ObfuscatedName("ba") + @ObfuscatedName("bt") @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("bl") + @ObfuscatedName("bm") @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("bp") + @ObfuscatedName("br") @Export("walkSequence") int walkSequence; - @ObfuscatedName("bu") + @ObfuscatedName("bs") @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("bo") + @ObfuscatedName("bc") @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("br") + @ObfuscatedName("bf") @Export("runSequence") int runSequence; - @ObfuscatedName("be") + @ObfuscatedName("bh") @Export("runBackSequence") int runBackSequence; - @ObfuscatedName("bi") + @ObfuscatedName("bl") @Export("runLeftSequence") int runLeftSequence; - @ObfuscatedName("bz") + @ObfuscatedName("bg") @Export("runRightSequence") int runRightSequence; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @Export("crawlSequence") int crawlSequence; - @ObfuscatedName("bn") + @ObfuscatedName("bx") @Export("crawlBackSequence") int crawlBackSequence; - @ObfuscatedName("bw") + @ObfuscatedName("bi") @Export("crawlLeftSequence") int crawlLeftSequence; - @ObfuscatedName("bc") + @ObfuscatedName("bq") @Export("crawlRightSequence") int crawlRightSequence; - @ObfuscatedName("bg") + @ObfuscatedName("bw") @Export("overheadText") String overheadText; - @ObfuscatedName("cw") + @ObfuscatedName("ce") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("cf") + @ObfuscatedName("cu") @Export("showPublicPlayerChat") boolean showPublicPlayerChat; - @ObfuscatedName("cm") + @ObfuscatedName("cw") @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("cn") - int field995; - @ObfuscatedName("cs") - int field996; - @ObfuscatedName("cx") - int[] field1028; - @ObfuscatedName("cd") + @ObfuscatedName("co") + int field998; + @ObfuscatedName("cc") + int field991; + @ObfuscatedName("cg") + int[] field1026; + @ObfuscatedName("cy") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("ce") + @ObfuscatedName("cz") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("cq") + @ObfuscatedName("cp") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("cp") + @ObfuscatedName("cb") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("cv") + @ObfuscatedName("cn") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("co") + @ObfuscatedName("ck") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("cl") + @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "Loc;" + descriptor = "Lpy;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("cu") + @ObfuscatedName("cs") @Export("targetIndex") int targetIndex; - @ObfuscatedName("ch") + @ObfuscatedName("cm") @Export("false0") boolean false0; - @ObfuscatedName("ci") + @ObfuscatedName("cv") @Export("movingOrientation") int movingOrientation; - @ObfuscatedName("ca") - int field988; - @ObfuscatedName("cb") - int field989; - @ObfuscatedName("cg") - boolean field959; + @ObfuscatedName("ci") + int field995; @ObfuscatedName("cj") + int field996; + @ObfuscatedName("cx") + boolean field964; + @ObfuscatedName("ch") @Export("movementSequence") int movementSequence; - @ObfuscatedName("cz") + @ObfuscatedName("cd") @Export("movementFrame") int movementFrame; @ObfuscatedName("ct") @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("cy") - int field999; - @ObfuscatedName("ck") + @ObfuscatedName("cf") + int field993; + @ObfuscatedName("cl") @Export("sequence") int sequence; - @ObfuscatedName("cc") + @ObfuscatedName("ca") @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("dh") + @ObfuscatedName("dv") @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("dj") + @ObfuscatedName("dm") @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("di") + @ObfuscatedName("ds") @Export("currentSequenceFrameIndex") int currentSequenceFrameIndex; - @ObfuscatedName("du") + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "Lsf;" + descriptor = "Ltp;" ) @Export("spotAnimations") IterableNodeHashTable spotAnimations; - @ObfuscatedName("dn") - int field1011; @ObfuscatedName("dg") - int field1004; - @ObfuscatedName("dd") - int field1002; - @ObfuscatedName("da") - int field1001; - @ObfuscatedName("ds") - int field1014; - @ObfuscatedName("dy") + int field1007; + @ObfuscatedName("dq") + int field1016; + @ObfuscatedName("dz") + int field1021; + @ObfuscatedName("dn") + int field1013; + @ObfuscatedName("dk") + int field1010; + @ObfuscatedName("df") @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("dt") + @ObfuscatedName("de") @Export("exactMoveArrive1Cycle") int exactMoveArrive1Cycle; @ObfuscatedName("dl") @Export("exactMoveDirection") int exactMoveDirection; - @ObfuscatedName("dk") + @ObfuscatedName("dp") @Export("npcCycle") int npcCycle; - @ObfuscatedName("df") + @ObfuscatedName("do") @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("dz") + @ObfuscatedName("dh") @Export("recolourStartCycle") int recolourStartCycle; - @ObfuscatedName("dw") + @ObfuscatedName("dj") @Export("recolourEndCycle") int recolourEndCycle; - @ObfuscatedName("dv") + @ObfuscatedName("du") @Export("recolourHue") byte recolourHue; @ObfuscatedName("dr") @Export("recolourSaturation") byte recolourSaturation; - @ObfuscatedName("do") + @ObfuscatedName("dw") @Export("recolourLuminance") byte recolourLuminance; - @ObfuscatedName("db") + @ObfuscatedName("di") @Export("recolourAmount") byte recolourAmount; - @ObfuscatedName("dp") + @ObfuscatedName("dt") @Export("orientation") int orientation; - @ObfuscatedName("dm") - int field1010; - @ObfuscatedName("dx") - int field1017; - @ObfuscatedName("dq") + @ObfuscatedName("dd") + int field1004; + @ObfuscatedName("dy") + int field1020; + @ObfuscatedName("db") @Export("pathLength") int pathLength; - @ObfuscatedName("de") + @ObfuscatedName("dc") @Export("pathX") int[] pathX; - @ObfuscatedName("dc") + @ObfuscatedName("da") @Export("pathY") int[] pathY; - @ObfuscatedName("ed") + @ObfuscatedName("eo") @ObfuscatedSignature( - descriptor = "[Lin;" + descriptor = "[Lip;" ) @Export("pathTraversed") MoveSpeed[] pathTraversed; - @ObfuscatedName("eh") - int field1021; - @ObfuscatedName("ey") - int field1022; - @ObfuscatedName("ee") + @ObfuscatedName("em") + int field1024; + @ObfuscatedName("el") + int field1023; + @ObfuscatedName("ec") @Export("combatLevelChange") int combatLevelChange; Actor() { this.isWalking = false; - this.field976 = 1; + this.field971 = 1; this.idleSequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; @@ -251,9 +255,9 @@ public abstract class Actor extends Renderable { this.overheadText = null; this.showPublicPlayerChat = false; this.overheadTextCyclesRemaining = 100; - this.field995 = 0; - this.field996 = 0; - this.field1028 = null; + this.field998 = 0; + this.field991 = 0; + this.field1026 = null; this.hitSplatCount = 0; this.hitSplatTypes = new int[4]; this.hitSplatValues = new int[4]; @@ -264,58 +268,58 @@ public abstract class Actor extends Renderable { this.targetIndex = -1; this.false0 = false; this.movingOrientation = -1; - this.field988 = -1; - this.field989 = -1; + this.field995 = -1; + this.field996 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; - this.field999 = 0; + this.field993 = 0; this.sequence = -1; this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; this.currentSequenceFrameIndex = 0; this.spotAnimations = new IterableNodeHashTable(4); - this.field1011 = 0; + this.field1007 = 0; this.npcCycle = 0; this.defaultHeight = 200; this.recolourStartCycle = -1; this.recolourEndCycle = -1; - this.field1010 = 0; - this.field1017 = 32; + this.field1004 = 0; + this.field1020 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new MoveSpeed[10]; - this.field1021 = 0; - this.field1022 = 0; + this.field1024 = 0; + this.field1023 = 0; this.combatLevelChange = -1; } - @ObfuscatedName("am") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "381940201" + descriptor = "(B)Z", + garbageValue = "4" ) @Export("isVisible") boolean isVisible() { return false; } - @ObfuscatedName("bc") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-71" + descriptor = "(I)V", + garbageValue = "188506301" ) final void method512() { this.pathLength = 0; - this.field1022 = 0; + this.field1023 = 0; } - @ObfuscatedName("bg") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "1923884006" + garbageValue = "2011213643" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -335,9 +339,9 @@ final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var int var10 = -1; int var11 = 0; if (var1 >= 0) { - HitSplatDefinition var12 = WorldMapCacheName.method1564(var1); - var10 = var12.field1704; - var11 = var12.field1706; + HitSplatDefinition var12 = class191.method959(var1); + var10 = var12.field1716; + var11 = var12.field1715; } int var14; @@ -393,107 +397,75 @@ final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var } } - @ObfuscatedName("cw") + @ObfuscatedName("ce") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "1229115524" + garbageValue = "555870749" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); - HealthBarDefinition var7; - if (var8 != null) { - var7 = var8; - } else { - byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); - var8 = new HealthBarDefinition(); - var8.field1555 = var1; - if (var9 != null) { - var8.decode(new Buffer(var9)); - } - - HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); - var7 = var8; - } + HealthBarDefinition var7 = DefaultsGroup.method2315(var1); + HealthBar var8 = null; + HealthBar var9 = null; + int var10 = var7.int2; + int var11 = 0; - var8 = var7; - HealthBar var14 = null; - HealthBar var10 = null; - int var11 = var7.int2; - int var12 = 0; - - HealthBar var13; - for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { - ++var12; - if (var13.definition.field1555 == var8.field1555) { - var13.put(var2 + var4, var5, var6, var3); + HealthBar var12; + for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { + ++var11; + if (var12.definition.field1559 == var7.field1559) { + var12.put(var2 + var4, var5, var6, var3); return; } - if (var13.definition.int1 <= var8.int1) { - var14 = var13; + if (var12.definition.int1 <= var7.int1) { + var8 = var12; } - if (var13.definition.int2 > var11) { - var10 = var13; - var11 = var13.definition.int2; + if (var12.definition.int2 > var10) { + var9 = var12; + var10 = var12.definition.int2; } } - if (var10 != null || var12 < 4) { - var13 = new HealthBar(var8); - if (var14 == null) { - this.healthBars.addLast(var13); + if (var9 != null || var11 < 4) { + var12 = new HealthBar(var7); + if (var8 == null) { + this.healthBars.addLast(var12); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); + IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); } - var13.put(var2 + var4, var5, var6, var3); - if (var12 >= 4) { - var10.remove(); + var12.put(var2 + var4, var5, var6, var3); + if (var11 >= 4) { + var9.remove(); } } } - @ObfuscatedName("cf") + @ObfuscatedName("cu") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-711075108" + garbageValue = "1727929675" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); - HealthBarDefinition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); - var3 = new HealthBarDefinition(); - var3.field1555 = var1; - if (var4 != null) { - var3.decode(new Buffer(var4)); - } + HealthBarDefinition var2 = DefaultsGroup.method2315(var1); - HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); - var2 = var3; - } - - var3 = var2; - - for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { - if (var3 == var5.definition) { - var5.remove(); + for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { + if (var2 == var3.definition) { + var3.remove(); return; } } } - @ObfuscatedName("cm") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "0" + descriptor = "(IIIII)V", + garbageValue = "-1528136211" ) @Export("updateSpotAnimation") void updateSpotAnimation(int var1, int var2, int var3, int var4) { @@ -501,7 +473,7 @@ void updateSpotAnimation(int var1, int var2, int var3, int var4) { SpotAnimation var6 = (SpotAnimation)this.spotAnimations.get((long)var1); if (var6 != null) { var6.remove(); - --this.field1011; + --this.field1007; } if (var2 != 65535 && var2 != -1) { @@ -511,69 +483,69 @@ void updateSpotAnimation(int var1, int var2, int var3, int var4) { } this.spotAnimations.put(new SpotAnimation(var2, var3, var5, var7), (long)var1); - ++this.field1011; + ++this.field1007; } } - @ObfuscatedName("cn") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "(I)Lsf;", - garbageValue = "-343795604" + descriptor = "(B)Ltp;", + garbageValue = "-113" ) IterableNodeHashTable method518() { return this.spotAnimations; } - @ObfuscatedName("cs") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-28624" + descriptor = "(I)V", + garbageValue = "106644167" ) void method519() { IterableNodeHashTableIterator var1 = new IterableNodeHashTableIterator(this.spotAnimations); - for (SpotAnimation var2 = (SpotAnimation)var1.method2449(); var2 != null; var2 = (SpotAnimation)var1.next()) { + for (SpotAnimation var2 = (SpotAnimation)var1.method2484(); var2 != null; var2 = (SpotAnimation)var1.next()) { var2.remove(); } - this.field1011 = 0; + this.field1007 = 0; } - @ObfuscatedName("cx") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(Ljr;I)Ljr;", - garbageValue = "-787093925" + descriptor = "(Ljn;B)Ljn;", + garbageValue = "5" ) Model method520(Model var1) { - if (this.field1011 == 0) { + if (this.field1007 == 0) { return var1; } else { IterableNodeHashTableIterator var2 = new IterableNodeHashTableIterator(this.spotAnimations); int var3 = var1.verticesCount; int var4 = var1.indicesCount; - int var5 = var1.field2242; - byte var6 = var1.field2235; + int var5 = var1.field2254; + byte var6 = var1.field2247; - for (SpotAnimation var7 = (SpotAnimation)var2.method2449(); var7 != null; var7 = (SpotAnimation)var2.next()) { - if (var7.field4278 != -1) { - Model var8 = StructComposition.SpotAnimationDefinition_get(var7.field4281).method1002(); + for (SpotAnimation var7 = (SpotAnimation)var2.method2484(); var7 != null; var7 = (SpotAnimation)var2.next()) { + if (var7.field4306 != -1) { + Model var8 = class406.SpotAnimationDefinition_get(var7.field4304).method1037(); if (var8 != null) { var3 += var8.verticesCount; var4 += var8.indicesCount; - var5 += var8.field2242; + var5 += var8.field2254; } } } Model var10 = new Model(var3, var4, var5, var6); - var10.method1314(var1); + var10.method1355(var1); - for (SpotAnimation var11 = (SpotAnimation)var2.method2449(); var11 != null; var11 = (SpotAnimation)var2.next()) { - if (var11.field4278 != -1) { - Model var9 = StructComposition.SpotAnimationDefinition_get(var11.field4281).getModel(var11.field4278); + for (SpotAnimation var11 = (SpotAnimation)var2.method2484(); var11 != null; var11 = (SpotAnimation)var2.next()) { + if (var11.field4306 != -1) { + Model var9 = class406.SpotAnimationDefinition_get(var11.field4304).getModel(var11.field4306); if (var9 != null) { - var9.offsetBy(0, -var11.field4277, 0); - var10.method1314(var9); + var9.offsetBy(0, -var11.field4307, 0); + var10.method1355(var9); } } } @@ -582,171 +554,97 @@ Model method520(Model var1) { } } - @ObfuscatedName("cr") + @ObfuscatedName("cq") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-23" + garbageValue = "-57" ) void method521() { - this.field959 = false; + this.field964 = false; this.movingOrientation = -1; - this.field988 = -1; - this.field989 = -1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lto;I)V", - garbageValue = "-1660235487" - ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = VarbitComposition.localPlayer = Client.players[var1] = new Player(); - var2.index = var1; - int var3 = var0.readBits(30); - byte var4 = (byte)(var3 >> 28); - int var5 = var3 >> 14 & 16383; - int var6 = var3 & 16383; - var2.pathX[0] = var5 - UrlRequester.baseX; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - class47.baseY; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - HealthBar.Client_plane = var2.plane = var4; - if (Players.cachedAppearanceBuffer[var1] != null) { - var2.read(Players.cachedAppearanceBuffer[var1]); - } - - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.activityFlags[var1] = 0; - Players.Players_emptyIdxCount = 0; - - for (int var7 = 1; var7 < 2048; ++var7) { - if (var7 != var1) { - int var8 = var0.readBits(18); - int var9 = var8 >> 16; - int var10 = var8 >> 8 & 597; - int var11 = var8 & 597; - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); - Players.Players_orientations[var7] = 0; - Players.Players_targetIndices[var7] = -1; - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; - Players.activityFlags[var7] = 0; - } - } - - var0.exportIndex(); + this.field995 = -1; + this.field996 = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Lon;IB)Lly;", - garbageValue = "38" + descriptor = "(CI)B", + garbageValue = "-1751998077" ) - public static PacketBufferNode method510(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.MESSAGE_PUBLIC, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(0); - int var5 = var4.packetBuffer.offset; - var4.packetBuffer.writeByte(var0); - String var6 = var1.toLowerCase(); - int var7 = 0; - byte[] var8 = null; - if (var6.startsWith("yellow:")) { - var7 = 0; - var1 = var1.substring("yellow:".length()); - } else if (var6.startsWith("red:")) { - var7 = 1; - var1 = var1.substring("red:".length()); - } else if (var6.startsWith("green:")) { - var7 = 2; - var1 = var1.substring("green:".length()); - } else if (var6.startsWith("cyan:")) { - var7 = 3; - var1 = var1.substring("cyan:".length()); - } else if (var6.startsWith("purple:")) { - var7 = 4; - var1 = var1.substring("purple:".length()); - } else if (var6.startsWith("white:")) { - var7 = 5; - var1 = var1.substring("white:".length()); - } else if (var6.startsWith("flash1:")) { - var7 = 6; - var1 = var1.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var7 = 7; - var1 = var1.substring("flash2:".length()); - } else if (var6.startsWith("flash3:")) { - var7 = 8; - var1 = var1.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { - var7 = 9; - var1 = var1.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { - var7 = 10; - var1 = var1.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { - var7 = 11; - var1 = var1.substring("glow3:".length()); - } else if (var6.startsWith("rainbow:")) { - var7 = 12; - var1 = var1.substring("rainbow:".length()); - } else if (var6.startsWith("pattern")) { - var8 = Interpreter.method418(var6); - if (var8 != null) { - var7 = var8.length + 12; - var1 = var1.substring("pattern".length() + var8.length + 1); - } - } - - var6 = var1.toLowerCase(); - byte var9 = 0; - if (var6.startsWith("wave:")) { - var9 = 1; - var1 = var1.substring("wave:".length()); - } else if (var6.startsWith("wave2:")) { - var9 = 2; - var1 = var1.substring("wave2:".length()); - } else if (var6.startsWith("shake:")) { - var9 = 3; - var1 = var1.substring("shake:".length()); - } else if (var6.startsWith("scroll:")) { - var9 = 4; - var1 = var1.substring("scroll:".length()); - } else if (var6.startsWith("slide:")) { - var9 = 5; - var1 = var1.substring("slide:".length()); - } - - var4.packetBuffer.writeByte(var7); - var4.packetBuffer.writeByte(var9); - if (var8 != null && Client.param25 >= 214) { - for (int var10 = 0; var10 < var8.length; ++var10) { - var4.packetBuffer.writeByte(var8[var10]); + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + 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; } - class216.method1127(var4.packetBuffer, var1); - if (var0 == class339.field3113.rsOrdinal()) { - var4.packetBuffer.writeByte(var3); - } - - var4.packetBuffer.method2540(var4.packetBuffer.offset - var5); - return var4; + return var1; } - @ObfuscatedName("br") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lmt;I)Z", - garbageValue = "-1903392375" + descriptor = "(I)V", + garbageValue = "-1768262837" ) - static boolean method522(PlayerComposition var0) { - if (var0.equipment[0] < 512) { - return false; - } else { - ItemComposition var1 = InvDefinition.ItemDefinition_get(var0.equipment[0] - 512); - return var1.maleModel1 != class209.field1862.field1871 && var1.maleModel2 != class209.field1862.field1871; - } + public static void method511() { + StructComposition.StructDefinition_cached.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/AddRequestTask.java b/osrs/src/main/java/AddRequestTask.java index d4aa631ab..8721fcd0a 100644 --- a/osrs/src/main/java/AddRequestTask.java +++ b/osrs/src/main/java/AddRequestTask.java @@ -5,52 +5,50 @@ import java.util.Iterator; -@ObfuscatedName("pf") +@ObfuscatedName("pi") @Implements("AddRequestTask") public class AddRequestTask extends SongTask { - @ObfuscatedName("tw") - @ObfuscatedSignature( - descriptor = "Lbb;" - ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; + @ObfuscatedName("am") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; @ObfuscatedSignature( - descriptor = "(Lpm;)V" + descriptor = "(Lqm;)V" ) public AddRequestTask(SongTask var1) { super(var1); - super.field3722 = "AddRequestTask"; + super.field3753 = "AddRequestTask"; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1604030758" + descriptor = "(B)Z", + garbageValue = "-90" ) + @Export("vmethod2142") public boolean vmethod2142() { - while (!class305.field2774.isEmpty()) { - MusicSong var1 = (MusicSong)class305.field2774.peek(); + while (!class319.field2791.isEmpty()) { + MusicSong var1 = (MusicSong)class319.field2791.peek(); if (var1 == null) { - class305.field2774.pop(); + class319.field2791.pop(); } else { - var1.midiPcmStream = this.method2123(); - class305.musicSongs.add(var1); - class305.field2774.pop(); + var1.midiPcmStream = this.method2154(); + class319.musicSongs.add(var1); + class319.field2791.pop(); } } return true; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)Llf;", - garbageValue = "53" + descriptor = "(B)Lmt;", + garbageValue = "4" ) - MidiPcmStream method2123() { + MidiPcmStream method2154() { MidiPcmStream var1 = null; - Iterator var2 = class305.midiPcmStream.iterator(); + Iterator var2 = class319.midiPcmStream.iterator(); while (true) { MidiPcmStream var3; @@ -58,10 +56,10 @@ MidiPcmStream method2123() { do { if (!var2.hasNext()) { if (var1 != null) { - ++var1.field2809; - if (var1.method1629() == 0 && var1.isReady()) { + ++var1.field2833; + if (var1.method1662() == 0 && var1.isReady()) { var1.clear(); - var1.method1633(); + var1.method1666(); var1.setPcmStreamVolume(0); } } @@ -71,26 +69,37 @@ MidiPcmStream method2123() { var3 = (MidiPcmStream)var2.next(); } while(var3 == null); - } while(var1 != null && var1.field2809 <= var3.field2809 && (var3.method1629() != 0 || !var3.isReady())); + } while(var1 != null && var1.field2833 <= var3.field2833 && (var3.method1662() != 0 || !var3.isReady())); var1 = var3; } } - @ObfuscatedName("ij") + @ObfuscatedName("gs") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-71" + descriptor = "(I)V", + garbageValue = "1457106589" ) - static final void method2124() { - if (WorldMapIcon_0.field2397) { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsInClanChat(); - } + static final void method2155() { + Scene.Scene_isLowDetail = false; + Client.isLowDetail = false; + } - WorldMapIcon_0.field2397 = false; + @ObfuscatedName("la") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "19136899" + ) + static final void method2156(int var0) { + if (var0 >= 0) { + int var1 = Client.menuArguments1[var0]; + int var2 = Client.menuArguments2[var0]; + int var3 = Client.menuOpcodes[var0]; + int var4 = Client.menuIdentifiers[var0]; + int var5 = Client.menuItemIds[var0]; + String var6 = Client.menuActions[var0]; + String var7 = Client.menuTargets[var0]; + class33.menuAction(var1, var2, var3, var4, var5, var6, var7, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } - } } \ No newline at end of file diff --git a/osrs/src/main/java/Animation.java b/osrs/src/main/java/Animation.java index 74091b790..4bff3989b 100644 --- a/osrs/src/main/java/Animation.java +++ b/osrs/src/main/java/Animation.java @@ -3,51 +3,51 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("ji") @Implements("Animation") public class Animation { - @ObfuscatedName("au") - static int[] field2000; - @ObfuscatedName("ae") - static int[] field1997; - @ObfuscatedName("ao") - static int[] field1998; - @ObfuscatedName("at") - static int[] field1999; @ObfuscatedName("ac") + static int[] field2009; + @ObfuscatedName("al") + static int[] field2011; + @ObfuscatedName("ak") + static int[] field2010; + @ObfuscatedName("ax") + static int[] field2012; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lju;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("transformCount") int transformCount; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("transformXs") int[] transformXs; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("transformYs") int[] transformYs; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("transformZs") int[] transformZs; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field2000 = new int[500]; - field1997 = new int[500]; - field1998 = new int[500]; - field1999 = new int[500]; + field2009 = new int[500]; + field2011 = new int[500]; + field2010 = new int[500]; + field2012 = new int[500]; } @ObfuscatedSignature( - descriptor = "([BLiu;)V" + descriptor = "([BLju;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; @@ -69,38 +69,38 @@ public class Animation { if (this.skeleton.transformTypes[var8] != 0) { for (int var10 = var8 - 1; var10 > var6; --var10) { if (this.skeleton.transformTypes[var10] == 0) { - field2000[var7] = var10; - field1997[var7] = 0; - field1998[var7] = 0; - field1999[var7] = 0; + field2009[var7] = var10; + field2011[var7] = 0; + field2010[var7] = 0; + field2012[var7] = 0; ++var7; break; } } } - field2000[var7] = var8; + field2009[var7] = var8; short var11 = 0; if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } if ((var9 & 1) != 0) { - field1997[var7] = var4.readShortSmart(); + field2011[var7] = var4.readShortSmart(); } else { - field1997[var7] = var11; + field2011[var7] = var11; } if ((var9 & 2) != 0) { - field1998[var7] = var4.readShortSmart(); + field2010[var7] = var4.readShortSmart(); } else { - field1998[var7] = var11; + field2010[var7] = var11; } if ((var9 & 4) != 0) { - field1999[var7] = var4.readShortSmart(); + field2012[var7] = var4.readShortSmart(); } else { - field1999[var7] = var11; + field2012[var7] = var11; } var6 = var8; @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; for (var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = field2000[var8]; - this.transformXs[var8] = field1997[var8]; - this.transformYs[var8] = field1998[var8]; - this.transformZs[var8] = field1999[var8]; + this.transformSkeletonLabels[var8] = field2009[var8]; + this.transformXs[var8] = field2011[var8]; + this.transformYs[var8] = field2010[var8]; + this.transformZs[var8] = field2012[var8]; } } diff --git a/osrs/src/main/java/ApproximateRouteStrategy.java b/osrs/src/main/java/ApproximateRouteStrategy.java index df766c9b5..acb04476a 100644 --- a/osrs/src/main/java/ApproximateRouteStrategy.java +++ b/osrs/src/main/java/ApproximateRouteStrategy.java @@ -3,113 +3,22 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("cs") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { + @ObfuscatedName("gc") + static int field359; + ApproximateRouteStrategy() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIILis;B)Z", - garbageValue = "85" + descriptor = "(IIILih;B)Z", + garbageValue = "0" ) @Export("hasArrived") protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-11903000" - ) - static int method342(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 0) { - var1 = 0; - } else if (var1 > 127) { - var1 = 127; - } - - var1 = 127 - var1; - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Llw;Lux;I)Lly;", - garbageValue = "1633353192" - ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = class146.method779(); - var2.clientPacket = var0; - var2.clientPacketLength = var0.length; - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); - } - - var2.packetBuffer.setIsaacCipher(var1); - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); - var2.index = 0; - return var2; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)Lhi;", - garbageValue = "1872404275" - ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Lnu;IIB)Z", - garbageValue = "2" - ) - static boolean method345(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { - return false; - } else { - class137.SpriteBuffer_decode(var3); - return true; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/Archive.java b/osrs/src/main/java/Archive.java index 640ffc084..629add983 100644 --- a/osrs/src/main/java/Archive.java +++ b/osrs/src/main/java/Archive.java @@ -5,94 +5,98 @@ import java.util.zip.CRC32; -@ObfuscatedName("nk") +@ObfuscatedName("ok") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lru;" + descriptor = "Lrw;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lru;" + descriptor = "Lrw;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("index") int index; - @ObfuscatedName("aa") - volatile int field3525; - @ObfuscatedName("af") - boolean field3516; - @ObfuscatedName("ad") + @ObfuscatedName("am") + volatile int field3560; + @ObfuscatedName("av") + boolean field3551; + @ObfuscatedName("ag") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("indexCrc") int indexCrc; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("indexVersion") int indexVersion; - @ObfuscatedName("ar") - int field3520; - @ObfuscatedName("ab") - boolean field3515; - @ObfuscatedName("ag") + @ObfuscatedName("as") + int field3554; + @ObfuscatedName("aj") + boolean field3549; + @ObfuscatedName("an") + boolean field3550; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnf;" + descriptor = "Loo;" ) - JagNetThread field3521; + JagNetThread field3556; static { Archive_crc = new CRC32(); } @ObfuscatedSignature( - descriptor = "(Lru;Lru;Lnf;IZZZZ)V" + descriptor = "(Lrw;Lrw;Loo;IZZZZZ)V" ) - public Archive(ArchiveDisk var1, ArchiveDisk var2, JagNetThread var3, int var4, boolean var5, boolean var6, boolean var7, boolean var8) { + public Archive(ArchiveDisk var1, ArchiveDisk var2, JagNetThread var3, int var4, boolean var5, boolean var6, boolean var7, boolean var8, boolean var9) { super(var5, var6); - this.field3525 = 0; - this.field3516 = false; - this.field3520 = -1; - this.field3515 = false; + this.field3560 = 0; + this.field3551 = false; + this.field3554 = -1; + this.field3549 = false; + this.field3550 = false; this.archiveDisk = var1; this.masterDisk = var2; this.index = var4; - this.field3516 = var7; - this.field3515 = var8; - this.field3521 = var3; - this.field3521.method1934(this, this.index); + this.field3551 = var7; + this.field3549 = var8; + this.field3550 = var9; + this.field3556 = var3; + this.field3556.method1963(this, this.index); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-432364648" + garbageValue = "792420297" ) - public boolean method1887() { - return this.field3525 == 1; + public boolean method1915() { + return this.field3560 == 1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-60" + descriptor = "(I)I", + garbageValue = "-266993868" ) @Export("percentage") public int percentage() { - if (this.field3525 == 1 || this.field3515 && this.field3525 == 2) { + if (this.field3560 == 1 || this.field3549 && this.field3560 == 2) { return 100; } else if (super.groups != null) { return 99; } else { - int var1 = this.field3521.method1938(255, this.index); + int var1 = this.field3556.method1967(255, this.index); if (var1 >= 100) { var1 = 99; } @@ -101,20 +105,20 @@ public int percentage() { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1272707955" + garbageValue = "1737906888" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - this.field3521.method1937(this.index, var1); + this.field3556.method1966(this.index, var1); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "402130956" + descriptor = "(IB)V", + garbageValue = "11" ) @Export("loadGroup") void loadGroup(int var1) { @@ -123,7 +127,7 @@ void loadGroup(int var1) { byte[] var4 = null; synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if ((long)var1 == var6.key && var2 == var6.archiveDisk && var6.type == 0) { + if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { var4 = var6.data; break; } @@ -137,18 +141,18 @@ void loadGroup(int var1) { this.load(var2, var1, var5, true); } } else { - this.field3521.method1936(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + this.field3556.method1965(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-1649823621" ) - void method1891() { - this.field3525 = 2; + void method1919() { + this.field3560 = 2; super.groupIds = new int[0]; super.groupCrcs = new int[0]; super.groupVersions = new int[0]; @@ -158,10 +162,10 @@ void method1891() { super.files = new Object[0][]; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "18" + descriptor = "(IIS)V", + garbageValue = "-5167" ) @Export("loadIndex") void loadIndex(int var1, int var2) { @@ -173,7 +177,7 @@ void loadIndex(int var1, int var2) { byte[] var6 = null; synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { + if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { var6 = var8.data; break; } @@ -187,36 +191,25 @@ void loadIndex(int var1, int var2) { this.load(var4, var3, var7, true); } } else { - this.field3521.method1936(this, 255, this.index, this.indexCrc, (byte)0, true); + this.field3556.method1965(this, 255, this.index, this.indexCrc, (byte)0, true); } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I[BZZI)V", - garbageValue = "1578809524" + descriptor = "(I[BZZS)V", + garbageValue = "-22741" ) @Export("write") void write(int var1, byte[] var2, boolean var3, boolean var4) { if (var3) { - if (this.field3525 == 1) { + if (this.field3560 == 1) { throw new RuntimeException(); } if (this.masterDisk != null) { - int var5 = this.index; - ArchiveDisk var6 = this.masterDisk; - ArchiveDiskAction var7 = new ArchiveDiskAction(); - var7.type = 0; - var7.key = (long)var5; - var7.data = var2; - var7.archiveDisk = var6; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); - } - - UserComparator8.method671(); + WorldMapCacheName.method1592(this.index, var2, this.masterDisk); } this.decodeIndex(var2); @@ -225,60 +218,50 @@ void write(int var1, byte[] var2, boolean var3, boolean var4) { var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); var2[var2.length - 1] = (byte)super.groupVersions[var1]; if (this.archiveDisk != null) { - ArchiveDisk var11 = this.archiveDisk; - ArchiveDiskAction var16 = new ArchiveDiskAction(); - var16.type = 0; - var16.key = (long)var1; - var16.data = var2; - var16.archiveDisk = var11; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var16); - } - - UserComparator8.method671(); + WorldMapCacheName.method1592(var1, var2, this.archiveDisk); this.validGroups[var1] = true; } if (var4) { - Object[] var15 = super.groups; - Object var17; + Object[] var5 = super.groups; + Object var7; if (var2 == null) { - var17 = null; + var7 = null; } else if (var2.length > 136) { DirectByteArrayCopier var8 = new DirectByteArrayCopier(); var8.set(var2); - var17 = var8; + var7 = var8; } else { - var17 = var2; + var7 = var2; } - var15[var1] = var17; + var5[var1] = var7; } } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lru;I[BZI)V", - garbageValue = "-250323664" + descriptor = "(Lrw;I[BZB)V", + garbageValue = "61" ) @Export("load") - public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; if (var1 == this.masterDisk) { - if (this.field3525 == 1) { + if (this.field3560 == 1) { throw new RuntimeException(); } else if (var3 == null) { - this.field3521.method1936(this, 255, this.index, this.indexCrc, (byte)0, true); + this.field3556.method1965(this, 255, this.index, this.indexCrc, (byte)0, true); } else { Archive_crc.reset(); Archive_crc.update(var3, 0, var3.length); var5 = (int)Archive_crc.getValue(); if (var5 != this.indexCrc) { - this.field3521.method1936(this, 255, this.index, this.indexCrc, (byte)0, true); + this.field3556.method1965(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - Buffer var6 = new Buffer(class53.decompressBytes(var3)); + Buffer var6 = new Buffer(class372.decompressBytes(var3)); int var7 = var6.readUnsignedByte(); if (var7 != 5 && var7 != 6) { throw new RuntimeException(var7 + "," + this.index + "," + var2); @@ -289,7 +272,7 @@ public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { } if (var8 != this.indexVersion) { - this.field3521.method1936(this, 255, this.index, this.indexCrc, (byte)0, true); + this.field3556.method1965(this, 255, this.index, this.indexCrc, (byte)0, true); } else { this.decodeIndex(var3); this.loadAllLocal(); @@ -298,8 +281,8 @@ public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { } } } else { - if (!var4 && var2 == this.field3520) { - this.field3525 = 1; + if (!var4 && var2 == this.field3554) { + this.field3560 = 1; } if (var3 != null && var3.length > 2) { @@ -327,25 +310,25 @@ public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { } else { this.validGroups[var2] = false; - if (this.field3516 || var4) { - this.field3521.method1936(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3551 || var4) { + this.field3556.method1965(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } } else { this.validGroups[var2] = false; - if (this.field3516 || var4) { - this.field3521.method1936(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3551 || var4) { + this.field3556.method1965(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } } } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1319297597" + garbageValue = "-527981427" ) @Export("loadAllLocal") void loadAllLocal() { @@ -357,60 +340,60 @@ void loadAllLocal() { } if (this.archiveDisk == null) { - this.field3525 = 1; + this.field3560 = 1; } else { - this.field3520 = -1; + this.field3554 = -1; for (var1 = 0; var1 < this.validGroups.length; ++var1) { if (super.fileCounts[var1] > 0) { - SceneTilePaint.method1350(var1, this.archiveDisk, this); - this.field3520 = var1; + SecureRandomFuture.method444(var1, this.archiveDisk, this); + this.field3554 = var1; } } - if (this.field3520 == -1) { - this.field3525 = 1; + if (this.field3554 == -1) { + this.field3560 = 1; } } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1917091652" + garbageValue = "177421131" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { if (super.groups[var1] != null) { return 100; } else { - return this.validGroups[var1] ? 100 : this.field3521.method1938(this.index, var1); + return this.validGroups[var1] ? 100 : this.field3556.method1967(this.index, var1); } } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-354618855" + garbageValue = "1483404371" ) - public boolean method1897(int var1) { + public boolean method1926(int var1) { return this.validGroups[var1]; } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1031243198" + descriptor = "(IB)Z", + garbageValue = "-109" ) - public boolean method1898(int var1) { + public boolean method1927(int var1) { return this.getGroupFileIds(var1) != null; } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-91850240" + descriptor = "(B)I", + garbageValue = "115" ) @Export("loadPercent") public int loadPercent() { @@ -432,4 +415,43 @@ public int loadPercent() { return var3; } } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;Lom;B)I", + garbageValue = "8" + ) + static int method1922(AbstractArchive var0, AbstractArchive var1) { + int var2 = 0; + String[] var3 = Login.field769; + + int var4; + String var5; + for (var4 = 0; var4 < var3.length; ++var4) { + var5 = var3[var4]; + if (var0.tryLoadFileByNames(var5, "")) { + ++var2; + } + } + + var3 = Login.field767; + + for (var4 = 0; var4 < var3.length; ++var4) { + var5 = var3[var4]; + if (var1.tryLoadFileByNames(var5, "")) { + ++var2; + } + } + + var3 = Login.field768; + + for (var4 = 0; var4 < var3.length; ++var4) { + var5 = var3[var4]; + if (var1.getGroupId(var5) != -1 && var1.tryLoadFileByNames(var5, "")) { + ++var2; + } + } + + return var2; + } } \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveDisk.java b/osrs/src/main/java/ArchiveDisk.java index ceeb82c84..91931eca9 100644 --- a/osrs/src/main/java/ArchiveDisk.java +++ b/osrs/src/main/java/ArchiveDisk.java @@ -6,28 +6,28 @@ import java.io.EOFException; import java.io.IOException; -@ObfuscatedName("ru") +@ObfuscatedName("rw") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ltd;" + descriptor = "Ltl;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Ltd;" + descriptor = "Ltl;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("archive") int archive; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("maxEntrySize") int maxEntrySize; @@ -36,7 +36,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - descriptor = "(ILtd;Ltd;I)V" + descriptor = "(ILtl;Ltl;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; @@ -48,10 +48,10 @@ public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.maxEntrySize = var4; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "1248586811" + garbageValue = "896649257" ) @Export("read") public byte[] read(int var1) { @@ -83,7 +83,7 @@ public byte[] read(int var1) { return (byte[])var10000; } - this.datFile.seek(520L * (long)var4); + this.datFile.seek((long)var4 * 520L); int var8 = var3 - var6; int var9; int var10; @@ -107,7 +107,7 @@ public byte[] read(int var1) { } var13 = 8; - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); @@ -116,7 +116,7 @@ public byte[] read(int var1) { if (var9 == var1 && var7 == var10 && var12 == this.archive) { if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { - int var14 = var8 + var13; + int var14 = var13 + var8; for (int var15 = var13; var15 < var14; ++var15) { var5[var6++] = ArchiveDisk_buffer[var15]; @@ -148,10 +148,10 @@ public byte[] read(int var1) { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I[BIB)Z", - garbageValue = "-86" + descriptor = "(I[BII)Z", + garbageValue = "-473377734" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -169,10 +169,10 @@ public boolean write(int var1, byte[] var2, int var3) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I[BIZI)Z", - garbageValue = "-1401240217" + garbageValue = "1363704518" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -262,7 +262,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) { ++var9; } - if (var9 == var6) { + if (var6 == var9) { ++var9; } } @@ -282,7 +282,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) { ArchiveDisk_buffer[7] = (byte)(var9 >> 8); ArchiveDisk_buffer[8] = (byte)var9; ArchiveDisk_buffer[9] = (byte)this.archive; - this.datFile.seek((long)var6 * 520L); + this.datFile.seek(520L * (long)var6); this.datFile.write(ArchiveDisk_buffer, 0, 10); var10 = var3 - var7; if (var10 > 510) { @@ -336,27 +336,90 @@ public String toString() { return "" + this.archive; } - @ObfuscatedName("hs") + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Ldl;III)V", + garbageValue = "168519800" + ) + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; + Script var4; + if (SongTask.isWorldMapEvent(var0.type)) { + class230.worldMapEvent = (WorldMapEvent)var3[0]; + WorldMapElement var5 = class148.WorldMapElement_get(class230.worldMapEvent.mapElement); + var4 = class31.getWorldMapScript(var0.type, var5.objectId, var5.category); + } else { + int var6 = (Integer)var3[0]; + var4 = class28.getScript(var6); + } + + if (var4 != null) { + class158.runScriptLogic(var0, var4, var1, var2); + } + + } + + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1458737660" + descriptor = "([BIIB)I", + garbageValue = "125" ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); - Tiles.method461(); - class130.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); + public static int method2309(byte[] var0, int var1, int var2) { + int var3 = -1; + + for (int var4 = var1; var4 < var2; ++var4) { + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; + } + + var3 = ~var3; + return var3; + } + + @ObfuscatedName("nb") + @ObfuscatedSignature( + descriptor = "(Lde;ZI)V", + garbageValue = "-1659889087" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { + class33.field89.method1743(var2); + } + + class379.method1983(var2); + Widget var4 = class33.field89.method1740(var3); + if (var4 != null) { + ClanChannelMember.invalidateWidget(var4); } - Client.field423.method1090(); - System.gc(); - Script.method445(0, 0); - UrlRequester.method652(); - Client.playingJingle = false; - class388.method2029(); - MusicSong.updateGameState(10); + if (Client.rootInterface != -1) { + Interpreter.method418(Client.rootInterface, 1); + } + + } + + @ObfuscatedName("nr") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-54268811" + ) + static final void method2314(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : ClanChannelMember.guestClanChannel; + if (var2 != null && var1 >= 0 && var1 < var2.method868()) { + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); + if (var3.rank == -1) { + String var4 = var3.username.getName(); + PacketBufferNode var5 = ClanChannelMember.getPacketBufferNode(ClientPacket.f65, Client.packetWriter.isaacCipher); + var5.packetBuffer.writeByte(3 + class478.stringCp1252NullTerminatedByteSize(var4)); + var5.packetBuffer.writeByte(var0); + var5.packetBuffer.writeShort(var1); + var5.packetBuffer.writeStringCp1252NullTerminated(var4); + Client.packetWriter.addNode(var5); + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveDiskAction.java b/osrs/src/main/java/ArchiveDiskAction.java index e5ec05058..a3ec2df0a 100644 --- a/osrs/src/main/java/ArchiveDiskAction.java +++ b/osrs/src/main/java/ArchiveDiskAction.java @@ -3,27 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nw") +@ObfuscatedName("oe") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("au") + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field3538; + @ObfuscatedName("ac") @Export("type") int type; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("data") - public byte[] data; - @ObfuscatedName("ao") + byte[] data; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lru;" + descriptor = "Lrw;" ) @Export("archiveDisk") - public ArchiveDisk archiveDisk; - @ObfuscatedName("at") + ArchiveDisk archiveDisk; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lok;" ) @Export("archive") - public Archive archive; + Archive archive; ArchiveDiskAction() { } diff --git a/osrs/src/main/java/ArchiveDiskActionHandler.java b/osrs/src/main/java/ArchiveDiskActionHandler.java index f8c980713..491ed6d06 100644 --- a/osrs/src/main/java/ArchiveDiskActionHandler.java +++ b/osrs/src/main/java/ArchiveDiskActionHandler.java @@ -3,34 +3,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ny") +@ObfuscatedName("ob") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("ArchiveDiskActionHandler_requestQueue") - public static final NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("ae") + static final NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("ArchiveDiskActionHandler_responseQueue") - public static NodeDeque ArchiveDiskActionHandler_responseQueue; + static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("ak") + static int field3544; + @ObfuscatedName("ax") + static boolean field3543; @ObfuscatedName("ao") - static int field3512; - @ObfuscatedName("at") - static boolean field3511; - @ObfuscatedName("ac") - static Object field3513; + static Object field3545; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3512 = 0; - field3511 = false; - field3513 = new Object(); + field3544 = 0; + field3543 = false; + field3545 = new Object(); } ArchiveDiskActionHandler() { @@ -59,291 +59,263 @@ public void run() { } } - synchronized(field3513) { - if ((field3511 || field3512 <= 1) && ArchiveDiskActionHandler_requestQueue.method1997()) { - field3512 = 0; - field3513.notifyAll(); + synchronized(field3545) { + if ((field3543 || field3544 <= 1) && ArchiveDiskActionHandler_requestQueue.method2028()) { + field3544 = 0; + field3545.notifyAll(); return; } - field3512 = 600; + field3544 = 600; } } else { - PendingSpawn.method505(100L); - synchronized(field3513) { - if ((field3511 || field3512 <= 1) && ArchiveDiskActionHandler_requestQueue.method1997()) { - field3512 = 0; - field3513.notifyAll(); + Players.method623(100L); + synchronized(field3545) { + if ((field3543 || field3544 <= 1) && ArchiveDiskActionHandler_requestQueue.method2028()) { + field3544 = 0; + field3545.notifyAll(); return; } - --field3512; + --field3544; } } } } catch (Exception var13) { - Messages.RunException_sendStackTrace((String)null, var13); + class190.RunException_sendStackTrace((String)null, var13); } } - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-224365630" + descriptor = "(Lpu;Lpu;I)V", + garbageValue = "2109842428" ) - static void method1884() { - ItemComposition.field1768 = new int[2000]; - int var0 = 0; - int var1 = 240; - - int var3; - for (byte var2 = 12; var0 < 16; var1 -= var2) { - var3 = ArchiveLoader.method463((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F)); - ItemComposition.field1768[var0] = var3; - ++var0; + static void method1914(Font var0, Font var1) { + if (SecureRandomCallable.worldSelectBackSprites == null) { + SecureRandomCallable.worldSelectBackSprites = PacketWriter.method646(class199.archive8, "sl_back", ""); } - var1 = 48; + if (PendingSpawn.worldSelectFlagSprites == null) { + PendingSpawn.worldSelectFlagSprites = InvDefinition.method953(class199.archive8, "sl_flags", ""); + } - for (int var5 = var1 / 6; var0 < ItemComposition.field1768.length; var1 -= var5) { - var3 = var0 * 2; + if (ModelData0.worldSelectArrows == null) { + ModelData0.worldSelectArrows = InvDefinition.method953(class199.archive8, "sl_arrows", ""); + } - for (int var4 = ArchiveLoader.method463((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < ItemComposition.field1768.length; ++var0) { - ItemComposition.field1768[var0] = var4; - } + if (TaskHandler.worldSelectStars == null) { + TaskHandler.worldSelectStars = InvDefinition.method953(class199.archive8, "sl_stars", ""); } - } + if (class372.worldSelectLeftSprite == null) { + class372.worldSelectLeftSprite = class167.SpriteBuffer_getIndexedSpriteByName(class199.archive8, "leftarrow", ""); + } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "63" - ) - public static final boolean method1885(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; - } + if (class230.worldSelectRightSprite == null) { + class230.worldSelectRightSprite = class167.SpriteBuffer_getIndexedSpriteByName(class199.archive8, "rightarrow", ""); + } - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "5" - ) - static int method1886(int var0, Script var1, boolean var2) { - if (var0 == 5000) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } else if (var0 == 5001) { - SoundCache.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - class128.privateChatMode = DevicePcmPlayerProvider.method74(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - if (class128.privateChatMode == null) { - class128.privateChatMode = PrivateChatMode.field4271; + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); + if (TaskHandler.worldSelectStars != null) { + TaskHandler.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + TaskHandler.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + int var4; + int var5; + if (ModelData0.worldSelectArrows != null) { + int var2 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { + ModelData0.worldSelectArrows[2].drawAt(var2, 4); + } else { + ModelData0.worldSelectArrows[0].drawAt(var2, 4); } - Client.tradeChatMode = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - PacketBufferNode var11 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.SET_CHATFILTERSETTINGS, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeByte(Client.publicChatMode); - var11.packetBuffer.writeByte(class128.privateChatMode.id); - var11.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var11); - return 1; - } else { - String var3; - int var4; - int var5; - PacketBufferNode var6; - if (var0 == 5002) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - SoundCache.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var6 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.SEND_SNAPSHOT, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var3) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var3); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.addNode(var6); - return 1; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { + ModelData0.worldSelectArrows[3].drawAt(var2 + 15, 4); } else { - int var7; - Message var8; - if (var0 == 5003) { - SoundCache.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var8 = AbstractByteArrayCopier.Messages_getByChannelAndID(var7, var4); - if (var8 != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.count; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.cycle; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } + ModelData0.worldSelectArrows[1].drawAt(var2 + 15, 4); + } + + var0.draw("World", var2 + 32, 17, 16777215, -1); + int var3 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { + ModelData0.worldSelectArrows[2].drawAt(var3, 4); + } else { + ModelData0.worldSelectArrows[0].drawAt(var3, 4); + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { + ModelData0.worldSelectArrows[3].drawAt(var3 + 15, 4); + } else { + ModelData0.worldSelectArrows[1].drawAt(var3 + 15, 4); + } + + var0.draw("Players", var3 + 32, 17, 16777215, -1); + var4 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { + ModelData0.worldSelectArrows[2].drawAt(var4, 4); + } else { + ModelData0.worldSelectArrows[0].drawAt(var4, 4); + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { + ModelData0.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + ModelData0.worldSelectArrows[1].drawAt(var4 + 15, 4); + } + + var0.draw("Location", var4 + 32, 17, 16777215, -1); + var5 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { + ModelData0.worldSelectArrows[2].drawAt(var5, 4); + } else { + ModelData0.worldSelectArrows[0].drawAt(var5, 4); + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { + ModelData0.worldSelectArrows[3].drawAt(var5 + 15, 4); + } else { + ModelData0.worldSelectArrows[1].drawAt(var5 + 15, 4); + } - return 1; + var0.draw("Type", var5 + 32, 17, 16777215, -1); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if (SecureRandomCallable.worldSelectBackSprites != null) { + byte var23 = 88; + byte var24 = 19; + var4 = 765 / (var23 + 1) - 1; + var5 = 480 / (var24 + 1); + + int var6; + int var7; + do { + var6 = var5; + var7 = var4; + if (var5 * (var4 - 1) >= World.World_count) { + --var4; + } + + if (var4 * (var5 - 1) >= World.World_count) { + --var5; + } + + if (var4 * (var5 - 1) >= World.World_count) { + --var5; + } + } while(var6 != var5 || var7 != var4); + + var6 = (765 - var23 * var4) / (var4 + 1); + if (var6 > 5) { + var6 = 5; + } + + var7 = (480 - var5 * var24) / (var5 + 1); + if (var7 > 5) { + var7 = 5; + } + + int var8 = (765 - var23 * var4 - var6 * (var4 - 1)) / 2; + int var9 = (480 - var24 * var5 - var7 * (var5 - 1)) / 2; + int var10 = (var5 + World.World_count - 1) / var5; + Login.worldSelectPagesCount = var10 - var4; + if (class372.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + class372.worldSelectLeftSprite.drawAt(8, class491.canvasHeight / 2 - class372.worldSelectLeftSprite.subHeight / 2); + } + + if (class230.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + class230.worldSelectRightSprite.drawAt(class340.canvasWidth - class230.worldSelectRightSprite.subWidth - 8, class491.canvasHeight / 2 - class230.worldSelectRightSprite.subHeight / 2); + } + + int var11 = var9 + 23; + int var12 = var8 + Login.xPadding; + int var13 = 0; + boolean var14 = false; + int var15 = Login.worldSelectPage; + + int var16; + for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { + World var17 = UserComparator3.World_worlds[var16]; + boolean var18 = true; + String var19 = Integer.toString(var17.population); + if (var17.population == -1) { + var19 = "OFF"; + var18 = false; + } else if (var17.population > 1980) { + var19 = "FULL"; + var18 = false; + } + + class110 var20 = null; + int var21 = 0; + if (var17.isBeta()) { + var20 = var17.isMembersOnly() ? class110.field1122 : class110.field1132; + } else if (var17.isDeadman()) { + var20 = var17.isMembersOnly() ? class110.field1126 : class110.field1133; + } else if (var17.method393()) { + var21 = 16711680; + var20 = var17.isMembersOnly() ? class110.field1125 : class110.field1130; + } else if (var17.method395()) { + var20 = var17.isMembersOnly() ? class110.field1134 : class110.field1129; + } else if (var17.isPvp()) { + var20 = var17.isMembersOnly() ? class110.field1135 : class110.field1127; + } else if (var17.method396()) { + var20 = var17.isMembersOnly() ? class110.field1121 : class110.field1124; + } else if (var17.method397()) { + var20 = var17.isMembersOnly() ? class110.field1136 : class110.field1131; + } + + if (var20 == null || var20.field1137 >= SecureRandomCallable.worldSelectBackSprites.length) { + var20 = var17.isMembersOnly() ? class110.field1128 : class110.field1123; + } + + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var23 && MouseHandler.MouseHandler_y < var11 + var24 && var18) { + Login.hoveredWorldIndex = var16; + SecureRandomCallable.worldSelectBackSprites[var20.field1137].drawTransOverlayAt(var12, var11, 128, 16777215); + var14 = true; } else { - Message var9; - if (var0 == 5004) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var9 = class33.Messages_getMessage(var7); - if (var9 != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.type; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.cycle; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } + SecureRandomCallable.worldSelectBackSprites[var20.field1137].drawAt(var12, var11); + } - return 1; - } else if (var0 == 5005) { - if (class128.privateChatMode == null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class128.privateChatMode.id; - } + if (PendingSpawn.worldSelectFlagSprites != null) { + PendingSpawn.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); + } - return 1; - } else { - PacketBufferNode var12; - if (var0 == 5008) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var12 = Actor.method510(var4, var3, ClanChannelMember.clientLanguage, -1); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == 5009) { - class137.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; - String var13 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; - var12 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.MESSAGE_PRIVATE, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(0); - int var10 = var12.packetBuffer.offset; - var12.packetBuffer.writeStringCp1252NullTerminated(var3); - class216.method1127(var12.packetBuffer, var13); - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == 5010) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - SoundCache.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var6 = Actor.method510(var4, var3, ClanChannelMember.clientLanguage, var5); - Client.packetWriter.addNode(var6); - return 1; - } else if (var0 != 5015) { - if (var0 == 5016) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } else if (var0 == 5017) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = HorizontalAlignment.Messages_getHistorySize(var7); - return 1; - } else if (var0 == 5018) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ClientPacket.Messages_getLastChatID(var7); - return 1; - } else if (var0 == 5019) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ClanChannelMember.method776(var7); - return 1; - } else if (var0 == 5020) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - class85.doCheat(var3); - return 1; - } else if (var0 == 5021) { - Client.field602 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == 5022) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = Client.field602; - return 1; - } else if (var0 == 5023) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else if (var0 == 5030) { - SoundCache.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var8 = AbstractByteArrayCopier.Messages_getByChannelAndID(var7, var4); - if (var8 != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.count; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.cycle; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 5031) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var9 = class33.Messages_getMessage(var7); - if (var9 != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.type; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.cycle; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - if (VarbitComposition.localPlayer != null && VarbitComposition.localPlayer.username != null) { - var3 = VarbitComposition.localPlayer.username.getName(); - } else { - var3 = ""; - } - - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3; - return 1; - } - } + var0.drawCentered(Integer.toString(var17.id), var12 + 15, var24 / 2 + var11 + 5, var21, -1); + var1.drawCentered(var19, var12 + 60, var24 / 2 + var11 + 5, 268435455, -1); + var11 = var11 + var24 + var7; + ++var13; + if (var13 >= var5) { + var11 = var9 + 23; + var12 = var12 + var23 + var6; + var13 = 0; + ++var15; + } + } + + if (var14) { + var16 = var1.stringWidth(UserComparator3.World_worlds[Login.hoveredWorldIndex].activity) + 6; + int var22 = var1.ascent + 8; + int var25 = MouseHandler.MouseHandler_y + 25; + if (var25 + var22 > 480) { + var25 = MouseHandler.MouseHandler_y - 25 - var22; } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var22, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var22, 0); + var1.drawCentered(UserComparator3.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveLoader.java b/osrs/src/main/java/ArchiveLoader.java index f085eb7c5..82ad21852 100644 --- a/osrs/src/main/java/ArchiveLoader.java +++ b/osrs/src/main/java/ArchiveLoader.java @@ -3,30 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") +@ObfuscatedName("dn") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("ks") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lui;" - ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lok;" ) @Export("archive") final Archive archive; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("groupCount") final int groupCount; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Lnk;Ljava/lang/String;)V" + descriptor = "(Lok;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -34,154 +28,21 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-533040087" + garbageValue = "1549334673" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method1898(var1) || this.archive.method1897(var1)) { + if (!this.archive.method1927(var1) || this.archive.method1926(var1)) { ++this.loadedCount; } } return this.loadedCount >= this.groupCount; } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;IZB)Ljt;", - garbageValue = "14" - ) - public static Frames method464(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; - int[] var5 = var0.getGroupFileIds(var2); - - for (int var6 = 0; var6 < var5.length; ++var6) { - byte[] var7 = var0.getFile(var2, var5[var6]); - if (var7 == null) { - var4 = false; - } else { - int var8 = (var7[0] & 255) << 8 | var7[1] & 255; - byte[] var9; - if (var3) { - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); - } - - if (var9 == null) { - var4 = false; - } - } - } - - if (!var4) { - return null; - } else { - try { - return new Frames(var0, var1, var2, var3); - } catch (Exception var11) { - return null; - } - } - } - - @ObfuscatedName("au") - public static final int method463(double var0, double var2, double var4) { - double var6 = var4; - double var8 = var4; - double var10 = var4; - if (var2 != 0.0D) { - double var12; - if (var4 < 0.5D) { - var12 = var4 * (var2 + 1.0D); - } else { - var12 = var4 + var2 - var4 * var2; - } - - double var14 = var4 * 2.0D - var12; - double var16 = var0 + 0.3333333333333333D; - if (var16 > 1.0D) { - --var16; - } - - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } - - if (var16 * 6.0D < 1.0D) { - var6 = var16 * (var12 - var14) * 6.0D + var14; - } else if (var16 * 2.0D < 1.0D) { - var6 = var12; - } else if (var16 * 3.0D < 2.0D) { - var6 = 6.0D * (0.6666666666666666D - var16) * (var12 - var14) + var14; - } else { - var6 = var14; - } - - if (6.0D * var0 < 1.0D) { - var8 = var0 * 6.0D * (var12 - var14) + var14; - } else if (2.0D * var0 < 1.0D) { - var8 = var12; - } else if (3.0D * var0 < 2.0D) { - var8 = (var12 - var14) * (0.6666666666666666D - var0) * 6.0D + var14; - } else { - var8 = var14; - } - - if (var20 * 6.0D < 1.0D) { - var10 = var20 * 6.0D * (var12 - var14) + var14; - } else if (2.0D * var20 < 1.0D) { - var10 = var12; - } else if (var20 * 3.0D < 2.0D) { - var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14; - } else { - var10 = var14; - } - } - - int var22 = (int)(var6 * 256.0D); - int var13 = (int)(var8 * 256.0D); - int var23 = (int)(var10 * 256.0D); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(II)Lew;", - garbageValue = "-1390229612" - ) - static class128 method466(int var0) { - class128 var1 = (class128)KeyHandler.findEnumerated(FileSystem.method912(), var0); - if (var1 == null) { - var1 = class128.field1229; - } - - return var1; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(Lmi;II)V", - garbageValue = "468246736" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2977 == null) { - throw new RuntimeException(); - } else { - if (var0.field3055 == null) { - var0.field3055 = new int[var0.field2977.length]; - } - - var0.field3055[var1] = Integer.MAX_VALUE; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/AttackOption.java b/osrs/src/main/java/AttackOption.java index 288855654..61120d049 100644 --- a/osrs/src/main/java/AttackOption.java +++ b/osrs/src/main/java/AttackOption.java @@ -3,50 +3,41 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dc") +@ObfuscatedName("em") @Implements("AttackOption") -public enum AttackOption implements class371 { - @ObfuscatedName("au") +public enum AttackOption implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ldc;" + descriptor = "Lem;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ldc;" + descriptor = "Lem;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Ldc;" + descriptor = "Lem;" ) - field1099(2), - @ObfuscatedName("at") + field1100(2), + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Ldc;" + descriptor = "Lem;" ) @Export("AttackOption_hidden") AttackOption_hidden(3), - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ldc;" + descriptor = "Lem;" ) - field1097(4); + field1102(4); - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Luq;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("fr") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - static Archive field1096; - @ObfuscatedName("ai") + @ObfuscatedName("il") + static long field1098; + @ObfuscatedName("ah") @Export("id") final int id; @@ -54,158 +45,46 @@ public enum AttackOption implements class371 { this.id = var3; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("bf") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "-76" + descriptor = "(Ltp;III)I", + garbageValue = "1550710334" ) - static int method607(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 4200) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = InvDefinition.ItemDefinition_get(var3).name; - return 1; + static int method607(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { + return var2; } else { - int var4; - ItemComposition var5; - if (var0 == 4201) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = InvDefinition.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 4202) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = InvDefinition.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 4203) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).price; - return 1; - } else if (var0 == 4204) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemComposition var6; - if (var0 == 4205) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var6 = InvDefinition.ItemDefinition_get(var3); - if (var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == 4206) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var6 = InvDefinition.ItemDefinition_get(var3); - if (var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == 4207) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == 4208) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var6 = InvDefinition.ItemDefinition_get(var3); - if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == 4209) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var6 = InvDefinition.ItemDefinition_get(var3); - if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == 4210) { - String var7 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class161.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class28.foundItemIdCount; - return 1; - } else if (var0 != 4211) { - if (var0 == 4212) { - class372.foundItemIndex = 0; - return 1; - } else if (var0 == 4213) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var4 = InvDefinition.ItemDefinition_get(var3).getShiftClickIndex(); - if (var4 == -1) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 + 1; - } + IntegerNode var3 = (IntegerNode)var0.get((long)var1); + return var3 == null ? var2 : var3.integer; + } + } - return 1; - } else if (var0 == 4214) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).maleModel; - return 1; - } else if (var0 == 4215) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).maleModel1; - return 1; - } else if (var0 == 4216) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).maleModel2; - return 1; - } else if (var0 == 4217) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var6 = InvDefinition.ItemDefinition_get(var3); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.field1806; - return 1; - } else { - return 2; - } - } else { - if (class156.foundItemIds != null && class372.foundItemIndex < class28.foundItemIdCount) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class156.foundItemIds[++class372.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "1281251233" + ) + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return class135.method728(var0, 10, true); + } - return 1; - } - } - } + @ObfuscatedName("lv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-860429671" + ) + static final int method609() { + return Client.menuOptionsCount - 1; } } \ No newline at end of file diff --git a/osrs/src/main/java/AudioFilter.java b/osrs/src/main/java/AudioFilter.java index f84cfc0c3..c57cde813 100644 --- a/osrs/src/main/java/AudioFilter.java +++ b/osrs/src/main/java/AudioFilter.java @@ -3,154 +3,154 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("cq") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("ai") - static float[][] field301; - @ObfuscatedName("az") + @ObfuscatedName("ah") + static float[][] field298; + @ObfuscatedName("ar") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("ap") - static float field300; - @ObfuscatedName("aa") + @ObfuscatedName("ab") + static float field297; + @ObfuscatedName("am") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("pairs") int[] pairs; + @ObfuscatedName("ak") + int[][][] field303; + @ObfuscatedName("ax") + int[][][] field304; @ObfuscatedName("ao") - int[][][] field306; - @ObfuscatedName("at") - int[][][] field307; - @ObfuscatedName("ac") - int[] field304; + int[] field302; static { - field301 = new float[2][8]; + field298 = new float[2][8]; coefficients = new int[2][8]; } AudioFilter() { this.pairs = new int[2]; - this.field306 = new int[2][2][4]; - this.field307 = new int[2][2][4]; - this.field304 = new int[2]; + this.field303 = new int[2][2][4]; + this.field304 = new int[2][2][4]; + this.field302 = new int[2]; } - @ObfuscatedName("au") - float method316(int var1, int var2, float var3) { - float var4 = (float)this.field307[var1][0][var2] + var3 * (float)(this.field307[var1][1][var2] - this.field307[var1][0][var2]); + @ObfuscatedName("ac") + float method319(int var1, int var2, float var3) { + float var4 = (float)this.field304[var1][0][var2] + var3 * (float)(this.field304[var1][1][var2] - this.field304[var1][0][var2]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } - @ObfuscatedName("ao") - float method318(int var1, int var2, float var3) { - float var4 = (float)this.field306[var1][0][var2] + var3 * (float)(this.field306[var1][1][var2] - this.field306[var1][0][var2]); + @ObfuscatedName("ak") + float method321(int var1, int var2, float var3) { + float var4 = (float)this.field303[var1][0][var2] + var3 * (float)(this.field303[var1][1][var2] - this.field303[var1][0][var2]); var4 *= 1.2207031E-4F; return normalize(var4); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { - var3 = (float)this.field304[0] + (float)(this.field304[1] - this.field304[0]) * var2; + var3 = (float)this.field302[0] + (float)(this.field302[1] - this.field302[0]) * var2; var3 *= 0.0030517578F; - field300 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field300 * 65536.0F); + field297 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field297 * 65536.0F); } if (this.pairs[var1] == 0) { return 0; } else { - var3 = this.method316(var1, 0, var2); - field301[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method318(var1, 0, var2)); - field301[var1][1] = var3 * var3; + var3 = this.method319(var1, 0, var2); + field298[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method321(var1, 0, var2)); + field298[var1][1] = var3 * var3; float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method316(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method318(var1, var4, var2)); + var3 = this.method319(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method321(var1, var4, var2)); float var6 = var3 * var3; - field301[var1][var4 * 2 + 1] = field301[var1][var4 * 2 - 1] * var6; - field301[var1][var4 * 2] = field301[var1][var4 * 2 - 1] * var5 + field301[var1][var4 * 2 - 2] * var6; + field298[var1][var4 * 2 + 1] = field298[var1][var4 * 2 - 1] * var6; + field298[var1][var4 * 2] = field298[var1][var4 * 2 - 1] * var5 + field298[var1][var4 * 2 - 2] * var6; for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field301[var1]; - var10000[var7] += field301[var1][var7 - 1] * var5 + field301[var1][var7 - 2] * var6; + var10000 = field298[var1]; + var10000[var7] += field298[var1][var7 - 1] * var5 + field298[var1][var7 - 2] * var6; } - var10000 = field301[var1]; - var10000[1] += field301[var1][0] * var5 + var6; - var10000 = field301[var1]; + var10000 = field298[var1]; + var10000[1] += field298[var1][0] * var5 + var6; + var10000 = field298[var1]; var10000[0] += var5; } if (var1 == 0) { for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field301[0]; - var10000[var4] *= field300; + var10000 = field298[0]; + var10000[var4] *= field297; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field301[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field298[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltm;Lbr;)V" + descriptor = "(Lul;Lbf;)V" ) - final void method320(Buffer var1, SoundEnvelope var2) { + final void method323(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.pairs[0] = var3 >> 4; this.pairs[1] = var3 & 15; if (var3 != 0) { - this.field304[0] = var1.readUnsignedShort(); - this.field304[1] = var1.readUnsignedShort(); + this.field302[0] = var1.readUnsignedShort(); + this.field302[1] = var1.readUnsignedShort(); int var4 = var1.readUnsignedByte(); int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - this.field306[var5][0][var6] = var1.readUnsignedShort(); - this.field307[var5][0][var6] = var1.readUnsignedShort(); + this.field303[var5][0][var6] = var1.readUnsignedShort(); + this.field304[var5][0][var6] = var1.readUnsignedShort(); } } for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { if ((var4 & 1 << var5 * 4 << var6) != 0) { - this.field306[var5][1][var6] = var1.readUnsignedShort(); - this.field307[var5][1][var6] = var1.readUnsignedShort(); + this.field303[var5][1][var6] = var1.readUnsignedShort(); + this.field304[var5][1][var6] = var1.readUnsignedShort(); } else { - this.field306[var5][1][var6] = this.field306[var5][0][var6]; - this.field307[var5][1][var6] = this.field307[var5][0][var6]; + this.field303[var5][1][var6] = this.field303[var5][0][var6]; + this.field304[var5][1][var6] = this.field304[var5][0][var6]; } } } - if (var4 != 0 || this.field304[1] != this.field304[0]) { + if (var4 != 0 || this.field302[1] != this.field302[0]) { var2.decodeSegments(var1); } } else { - int[] var7 = this.field304; - this.field304[1] = 0; + int[] var7 = this.field302; + this.field302[1] = 0; var7[0] = 0; } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); diff --git a/osrs/src/main/java/BZip2Decompressor.java b/osrs/src/main/java/BZip2Decompressor.java index bb3d12e0f..730ae94a0 100644 --- a/osrs/src/main/java/BZip2Decompressor.java +++ b/osrs/src/main/java/BZip2Decompressor.java @@ -3,12 +3,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tt") +@ObfuscatedName("ur") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Luo;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { @@ -29,7 +29,7 @@ public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var BZip2Decompressor_state.bsLive = 0; BZip2Decompressor_state.bsBuff = 0; BZip2Decompressor_state.nextBit_unused = 0; - BZip2Decompressor_state.field4182 = 0; + BZip2Decompressor_state.field4211 = 0; BZip2Decompressor_decompress(BZip2Decompressor_state); var1 -= BZip2Decompressor_state.outputLength; BZip2Decompressor_state.inputArray = null; @@ -38,21 +38,21 @@ public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lte;)V" + descriptor = "(Luo;)V" ) - static void method2607(BZip2State var0) { + static void method2645(BZip2State var0) { byte var2 = var0.out_char; int var3 = var0.su_rNToGo; int var4 = var0.nblocks_used; int var5 = var0.su_ch2; - int[] var6 = class148.BZip2Decompressor_block; - int var7 = var0.field4179; + int[] var6 = class59.BZip2Decompressor_block; + int var7 = var0.field4205; byte[] var8 = var0.outputArray; int var9 = var0.next_out; int var10 = var0.outputLength; - int var12 = var0.field4189 + 1; + int var12 = var0.field4216 + 1; label62: while (true) { @@ -148,25 +148,25 @@ static void method2607(BZip2State var0) { break; } - int var13 = var0.field4182; - var0.field4182 += var10 - var10; - if (var0.field4182 < var13) { + int var13 = var0.field4211; + var0.field4211 += var10 - var10; + if (var0.field4211 < var13) { } var0.out_char = var2; var0.su_rNToGo = var3; var0.nblocks_used = var4; var0.su_ch2 = var5; - class148.BZip2Decompressor_block = var6; - var0.field4179 = var7; + class59.BZip2Decompressor_block = var6; + var0.field4205 = var7; var0.outputArray = var8; var0.next_out = var9; var0.outputLength = var10; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lte;)V" + descriptor = "(Luo;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ static void BZip2Decompressor_decompress(BZip2State var0) { int[] var23 = null; int[] var24 = null; int[] var25 = null; - var0.blockSize100k = -1562387581; - if (class148.BZip2Decompressor_block == null) { - class148.BZip2Decompressor_block = new int[var0.blockSize100k * 731544800]; + var0.blockSize100k = 1284764955; + if (class59.BZip2Decompressor_block == null) { + class59.BZip2Decompressor_block = new int[var0.blockSize100k * -1161486880]; } boolean var26 = true; @@ -430,7 +430,7 @@ static void BZip2Decompressor_decompress(BZip2State var0) { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; - class148.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + class59.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; ++var47; if (var45 == 0) { ++var43; @@ -489,7 +489,7 @@ static void BZip2Decompressor_decompress(BZip2State var0) { var10000 = var0.unzftab; for (var10000[var1 & 255] += var48; var48 > 0; --var48) { - class148.BZip2Decompressor_block[var47] = var1 & 255; + class59.BZip2Decompressor_block[var47] = var1 & 255; ++var47; } } @@ -509,22 +509,22 @@ static void BZip2Decompressor_decompress(BZip2State var0) { } for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(class148.BZip2Decompressor_block[var36] & 255); - var10000 = class148.BZip2Decompressor_block; + var1 = (byte)(class59.BZip2Decompressor_block[var36] & 255); + var10000 = class59.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; } - var0.field4179 = class148.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.field4205 = class59.BZip2Decompressor_block[var0.originalPointer] >> 8; var0.nblocks_used = 0; - var0.field4179 = class148.BZip2Decompressor_block[var0.field4179]; - var0.su_ch2 = (byte)(var0.field4179 & 255); - var0.field4179 >>= 8; + var0.field4205 = class59.BZip2Decompressor_block[var0.field4205]; + var0.su_ch2 = (byte)(var0.field4205 & 255); + var0.field4205 >>= 8; ++var0.nblocks_used; - var0.field4189 = var47; - method2607(var0); - if (var0.field4189 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field4216 = var47; + method2645(var0); + if (var0.field4216 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } @@ -538,27 +538,27 @@ static void BZip2Decompressor_decompress(BZip2State var0) { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lte;)B" + descriptor = "(Luo;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lte;)B" + descriptor = "(Luo;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(ILte;)I" + descriptor = "(ILuo;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ static int BZip2Decompressor_readBits(int var0, BZip2State var1) { return var2; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lte;)V" + descriptor = "(Luo;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ static void makeMaps(BZip2State var0) { } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; diff --git a/osrs/src/main/java/BZip2State.java b/osrs/src/main/java/BZip2State.java index 3d930ce08..d45ee1b80 100644 --- a/osrs/src/main/java/BZip2State.java +++ b/osrs/src/main/java/BZip2State.java @@ -2,122 +2,122 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("te") +@ObfuscatedName("uo") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("au") - final int field4202; - @ObfuscatedName("ae") - final int field4198; - @ObfuscatedName("ao") - final int field4200; - @ObfuscatedName("at") - final int field4201; @ObfuscatedName("ac") - final int field4197; - @ObfuscatedName("ai") - final int field4199; - @ObfuscatedName("az") + final int field4224; + @ObfuscatedName("al") + final int field4227; + @ObfuscatedName("ak") + final int field4226; + @ObfuscatedName("ax") + final int field4229; + @ObfuscatedName("ao") + final int field4228; + @ObfuscatedName("ah") + final int field4225; + @ObfuscatedName("ar") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("nextByte") int nextByte; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("next_out") int next_out; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("outputLength") int outputLength; - @ObfuscatedName("al") - int field4182; - @ObfuscatedName("an") + @ObfuscatedName("ap") + int field4211; + @ObfuscatedName("ay") @Export("out_char") byte out_char; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("bsBuff") int bsBuff; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("bsLive") int bsLive; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("originalPointer") int originalPointer; - @ObfuscatedName("ah") - int field4179; - @ObfuscatedName("as") + @ObfuscatedName("ae") + int field4205; + @ObfuscatedName("aw") @Export("su_ch2") int su_ch2; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("unzftab") int[] unzftab; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("cftab") int[] cftab; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("nInUse") int nInUse; - @ObfuscatedName("bh") + @ObfuscatedName("bn") @Export("inUse") boolean[] inUse; - @ObfuscatedName("bj") + @ObfuscatedName("bk") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("ll8") byte[] ll8; - @ObfuscatedName("bt") + @ObfuscatedName("be") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("selector") byte[] selector; - @ObfuscatedName("by") + @ObfuscatedName("ba") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("bs") + @ObfuscatedName("bz") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("bm") + @ObfuscatedName("bb") @Export("limit") int[][] limit; - @ObfuscatedName("bf") + @ObfuscatedName("bo") @Export("base") int[][] base; - @ObfuscatedName("bq") + @ObfuscatedName("bp") @Export("perm") int[][] perm; - @ObfuscatedName("ba") + @ObfuscatedName("bt") @Export("minLens") int[] minLens; - @ObfuscatedName("bl") - int field4189; + @ObfuscatedName("bm") + int field4216; BZip2State() { - this.field4202 = 4096; - this.field4198 = 16; - this.field4200 = 258; - this.field4201 = 6; - this.field4197 = 50; - this.field4199 = 18002; + this.field4224 = 4096; + this.field4227 = 16; + this.field4226 = 258; + this.field4229 = 6; + this.field4228 = 50; + this.field4225 = 18002; this.nextByte = 0; this.next_out = 0; this.unzftab = new int[256]; diff --git a/osrs/src/main/java/BoundaryObject.java b/osrs/src/main/java/BoundaryObject.java index 9aded7d30..0cb665648 100644 --- a/osrs/src/main/java/BoundaryObject.java +++ b/osrs/src/main/java/BoundaryObject.java @@ -3,40 +3,40 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jo") +@ObfuscatedName("kr") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("z") int z; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("x") int x; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("y") int y; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("orientationA") int orientationA; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("orientationB") int orientationB; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Ljy;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Ljy;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("tag") public long tag; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("flags") int flags; @@ -44,13 +44,4 @@ public final class BoundaryObject { this.tag = 0L; this.flags = 0; } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Z", - garbageValue = "1066903143" - ) - static boolean method1384(String var0, int var1) { - return class299.method1618(var0, var1, "openjs"); - } } \ No newline at end of file diff --git a/osrs/src/main/java/Bounds.java b/osrs/src/main/java/Bounds.java index b03499b6f..8c4b389c2 100644 --- a/osrs/src/main/java/Bounds.java +++ b/osrs/src/main/java/Bounds.java @@ -3,25 +3,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rb") +@ObfuscatedName("rx") @Implements("Bounds") public class Bounds { - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lui;" - ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("lowX") public int lowX; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("lowY") public int lowY; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("highX") public int highX; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("highY") public int highY; @@ -34,10 +28,10 @@ public Bounds(int var1, int var2) { this(0, 0, var1, var2); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "14" + descriptor = "(III)V", + garbageValue = "950647486" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -45,10 +39,10 @@ public void setLow(int var1, int var2) { this.lowY = var2; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "15" + descriptor = "(III)V", + garbageValue = "-260511510" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -56,40 +50,40 @@ public void setHigh(int var1, int var2) { this.highY = var2; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "-32" + garbageValue = "-8" ) - public boolean method2284(int var1, int var2) { - return var1 >= this.lowX && var1 < this.highX + this.lowX && var2 >= this.lowY && var2 < this.lowY + this.highY; + public boolean method2321(int var1, int var2) { + return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.lowY + this.highY; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lrb;Lrb;I)V", - garbageValue = "1929087402" + descriptor = "(Lrx;Lrx;I)V", + garbageValue = "1323786426" ) - public void method2285(Bounds var1, Bounds var2) { - this.method2286(var1, var2); - this.method2287(var1, var2); + public void method2322(Bounds var1, Bounds var2) { + this.method2323(var1, var2); + this.method2324(var1, var2); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lrb;Lrb;I)V", - garbageValue = "-270985515" + descriptor = "(Lrx;Lrx;B)V", + garbageValue = "-1" ) - void method2286(Bounds var1, Bounds var2) { + void method2323(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { - var2.highX = (var2.highX * 2133643001 - (var1.lowX * 2133643001 - this.lowX * 2133643001)) * -2074045623; + var2.highX = (var2.highX * 801752255 - (var1.lowX * 801752255 - this.lowX * 801752255)) * -1823233217; var2.lowX = var1.lowX; } - if (var2.method2288() > var1.method2288()) { - var2.highX -= var2.method2288() - var1.method2288(); + if (var2.method2325() > var1.method2325()) { + var2.highX -= var2.method2325() - var1.method2325(); } if (var2.highX < 0) { @@ -98,21 +92,21 @@ void method2286(Bounds var1, Bounds var2) { } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lrb;Lrb;B)V", - garbageValue = "32" + descriptor = "(Lrx;Lrx;I)V", + garbageValue = "1489153236" ) - void method2287(Bounds var1, Bounds var2) { + void method2324(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { - var2.highY = (var2.highY * -584535177 - (var1.lowY * -584535177 - this.lowY * -584535177)) * 377886279; + var2.highY = (var2.highY * 110199335 - (var1.lowY * 110199335 - this.lowY * 110199335)) * -61485673; var2.lowY = var1.lowY; } - if (var2.method2289() > var1.method2289()) { - var2.highY -= var2.method2289() - var1.method2289(); + if (var2.method2326() > var1.method2326()) { + var2.highY -= var2.method2326() - var1.method2326(); } if (var2.highY < 0) { @@ -121,22 +115,22 @@ void method2287(Bounds var1, Bounds var2) { } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "109" + descriptor = "(I)I", + garbageValue = "-2139192788" ) - int method2288() { + int method2325() { return this.highX + this.lowX; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1442366153" + descriptor = "(B)I", + garbageValue = "-49" ) - int method2289() { - return this.lowY + this.highY; + int method2326() { + return this.highY + this.lowY; } @Export("toString") @@ -144,48 +138,4 @@ int method2289() { public String toString() { return null; } - - @ObfuscatedName("nz") - @ObfuscatedSignature( - descriptor = "(Lmi;I)Z", - garbageValue = "703583258" - ) - static final boolean method2290(Widget var0) { - int var1 = var0.contentType; - if (var1 == 205) { - Client.logoutTimer = 250; - return true; - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { - var2 = (var1 - 300) / 2; - var3 = var1 & 1; - Client.playerAppearance.changeAppearance(var2, var3 == 1); - } - - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method1722(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.method1723(0); - } - - if (var1 == 325) { - Client.playerAppearance.method1723(1); - } - - if (var1 == 326) { - PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.UPDATE_APPEARANCE, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; - } else { - return false; - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/Buddy.java b/osrs/src/main/java/Buddy.java index ebff9e772..0dfe34ca0 100644 --- a/osrs/src/main/java/Buddy.java +++ b/osrs/src/main/java/Buddy.java @@ -3,16 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qb") +@ObfuscatedName("ri") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("world") public int world; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("int2") public int int2; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("rank") public int rank; @@ -20,10 +20,10 @@ public class Buddy extends User { this.world = -1; } - @ObfuscatedName("by") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2111367662" + garbageValue = "717087406" ) @Export("set") void set(int var1, int var2) { @@ -31,23 +31,104 @@ void set(int var1, int var2) { this.int2 = var2; } - @ObfuscatedName("bs") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-12" + garbageValue = "-83" ) @Export("getWorld") public int getWorld() { return this.world; } - @ObfuscatedName("bm") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-120" + descriptor = "(I)Z", + garbageValue = "-410640416" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "682390818" + ) + static int method2285(int var0, Script var1, boolean var2) { + int var3; + int var4; + int var6; + if (var0 == 3400) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + EnumComposition var5 = class73.getEnum(var3); + if (var5.outputType != 's') { + } + + for (var6 = 0; var6 < var5.outputCount; ++var6) { + if (var4 == var5.keys[var6]) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var5.strVals[var6]; + var5 = null; + break; + } + } + + if (var5 != null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var5.defaultStr; + } + + return 1; + } else if (var0 != 3408) { + if (var0 == 3411) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + EnumComposition var10 = class73.getEnum(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var10.size(); + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + EnumComposition var7 = class73.getEnum(var9); + if (var3 == var7.inputType && var4 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { + if (var6 == var7.keys[var8]) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; + } + + var7 = null; + break; + } + } + + if (var7 != null) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; + } + } + + return 1; + } else { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/BuddyRankComparator.java b/osrs/src/main/java/BuddyRankComparator.java index 873360fb8..26c2b3641 100644 --- a/osrs/src/main/java/BuddyRankComparator.java +++ b/osrs/src/main/java/BuddyRankComparator.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("eu") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public BuddyRankComparator(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;I)I", - garbageValue = "-1874488966" + descriptor = "(Lri;Lri;I)I", + garbageValue = "383953435" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -34,24 +34,32 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("oa") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lmi;I)Lmi;", - garbageValue = "915415331" + descriptor = "(I)V", + garbageValue = "1321294301" ) - static Widget method691(Widget var0) { - int var1 = SpriteMask.method1706(NewShit.getWidgetFlags(var0)); - if (var1 == 0) { - return null; - } else { - for (int var2 = 0; var2 < var1; ++var2) { - var0 = class92.getWidget(var0.parentId); - if (var0 == null) { - return null; - } - } + static void method687() { + World.Tiles_underlays = null; + VertexNormal.Tiles_overlays = null; + SecureRandomFuture.Tiles_shapes = null; + class199.field1563 = null; + UserComparator6.field1191 = null; + Tiles.field835 = null; + class158.field1387 = null; + SecureRandomFuture.Tiles_hue = null; + class135.Tiles_saturation = null; + Tiles.Tiles_lightness = null; + WorldMapSection2.Tiles_hueMultiplier = null; + Script.field812 = null; + } - return var0; - } + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "0" + ) + protected static final int method688() { + return GameEngine.keyHandler.getIdleCycles(); } } \ No newline at end of file diff --git a/osrs/src/main/java/Buffer.java b/osrs/src/main/java/Buffer.java index 1fdae79ae..1eab80465 100644 --- a/osrs/src/main/java/Buffer.java +++ b/osrs/src/main/java/Buffer.java @@ -5,19 +5,19 @@ import java.math.BigInteger; -@ObfuscatedName("tm") +@ObfuscatedName("ul") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("crc32Table") - public static int[] crc32Table; - @ObfuscatedName("aq") + static int[] crc32Table; + @ObfuscatedName("aa") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("array") public byte[] array; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("offset") public int offset; @@ -62,7 +62,7 @@ public Buffer(int var1, boolean var2) { } public Buffer(int var1) { - this.array = class125.ByteArrayPool_getArray(var1); + this.array = class148.ByteArrayPool_getArray(var1); this.offset = 0; } @@ -71,34 +71,34 @@ public Buffer(byte[] var1) { this.offset = 0; } - @ObfuscatedName("bb") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1801780173" + descriptor = "(B)V", + garbageValue = "-113" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { - PlayerType.ByteArrayPool_release(this.array); + MenuAction.ByteArrayPool_release(this.array); } this.array = null; } - @ObfuscatedName("br") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1656080005" + garbageValue = "-984499580" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("be") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1405457732" + descriptor = "(IS)V", + garbageValue = "-5002" ) @Export("writeShort") public void writeShort(int var1) { @@ -106,10 +106,10 @@ public void writeShort(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("bi") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-83" + descriptor = "(II)V", + garbageValue = "1065618714" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -118,10 +118,10 @@ public void writeMedium(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("bz") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "278729890" + descriptor = "(IB)V", + garbageValue = "-43" ) @Export("writeInt") public void writeInt(int var1) { @@ -131,7 +131,7 @@ public void writeInt(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("bx") + @ObfuscatedName("bl") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); @@ -142,7 +142,7 @@ public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bn") + @ObfuscatedName("bg") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); @@ -155,20 +155,20 @@ public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bw") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-80697695" + descriptor = "(ZB)V", + garbageValue = "16" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); } - @ObfuscatedName("bg") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "915346202" + garbageValue = "-960928092" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -176,15 +176,15 @@ public void writeStringCp1252NullTerminated(String var1) { if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.offset += LoginPacket.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += class16.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("cw") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2010597854" + garbageValue = "-511011778" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { @@ -193,28 +193,41 @@ public void writeStringCp1252NullCircumfixed(String var1) { throw new IllegalArgumentException(""); } else { this.array[++this.offset - 1] = 0; - this.offset += LoginPacket.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += class16.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("cf") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-2085392381" + descriptor = "(Ljava/lang/CharSequence;B)V", + garbageValue = "100" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { - int var2 = InvDefinition.method937(var1); + int var3 = var1.length(); + int var4 = 0; + + for (int var5 = 0; var5 < var3; ++var5) { + char var6 = var1.charAt(var5); + if (var6 <= 127) { + ++var4; + } else if (var6 <= 2047) { + var4 += 2; + } else { + var4 += 3; + } + } + this.array[++this.offset - 1] = 0; - this.writeVarInt(var2); - this.offset += FloorDecoration.method1179(this.array, this.offset, var1); + this.writeVarInt(var4); + this.offset += class465.method2335(this.array, this.offset, var1); } - @ObfuscatedName("cm") + @ObfuscatedName("ce") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1427589221" + garbageValue = "-1303601550" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { @@ -224,19 +237,19 @@ public void writeBytes(byte[] var1, int var2, int var3) { } - @ObfuscatedName("cn") + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "51362349" + descriptor = "(Lul;B)V", + garbageValue = "-116" ) - public void method2537(Buffer var1) { + public void writeBuffer(Buffer var1) { this.writeBytes(var1.array, 0, var1.offset); } - @ObfuscatedName("cs") + @ObfuscatedName("cw") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "82" + garbageValue = "-88" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { @@ -250,10 +263,10 @@ public void writeLengthInt(int var1) { } } - @ObfuscatedName("cx") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-44738618" + descriptor = "(IB)V", + garbageValue = "1" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { @@ -265,12 +278,13 @@ public void writeLengthShort(int var1) { } } - @ObfuscatedName("cr") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1799868177" + descriptor = "(IB)V", + garbageValue = "23" ) - public void method2540(int var1) { + @Export("writeLengthByte") + public void WriteLengthByte(int var1) { if (var1 >= 0 && var1 <= 255) { this.array[this.offset - var1 - 1] = (byte)var1; } else { @@ -278,10 +292,10 @@ public void method2540(int var1) { } } - @ObfuscatedName("cd") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "15989" + descriptor = "(IB)V", + garbageValue = "1" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { @@ -294,10 +308,10 @@ public void writeSmartByteShort(int var1) { } } - @ObfuscatedName("ce") + @ObfuscatedName("cq") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "26" + garbageValue = "33" ) @Export("writeVarInt") public void writeVarInt(int var1) { @@ -320,30 +334,30 @@ public void writeVarInt(int var1) { this.writeByte(var1 & 127); } - @ObfuscatedName("cq") + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "515674060" + descriptor = "(B)I", + garbageValue = "1" ) @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; } - @ObfuscatedName("cp") + @ObfuscatedName("cz") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "130364470" + garbageValue = "-24140714" ) @Export("readByte") public byte readByte() { return this.array[++this.offset - 1]; } - @ObfuscatedName("cv") + @ObfuscatedName("cp") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-85" + garbageValue = "-38" ) @Export("readUnsignedShort") public int readUnsignedShort() { @@ -351,10 +365,10 @@ public int readUnsignedShort() { return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("co") + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1858143695" + descriptor = "(B)I", + garbageValue = "-69" ) @Export("readShort") public int readShort() { @@ -367,10 +381,10 @@ public int readShort() { return var1; } - @ObfuscatedName("cl") + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "87" + descriptor = "(I)I", + garbageValue = "1904620263" ) @Export("readMedium") public int readMedium() { @@ -378,12 +392,12 @@ public int readMedium() { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("cu") + @ObfuscatedName("ck") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "618141055" + garbageValue = "2027677776" ) - public int method2548() { + public int method2583() { this.offset += 3; int var1 = ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 8388607) { @@ -393,10 +407,10 @@ public int method2548() { return var1; } - @ObfuscatedName("ch") + @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-85665102" + descriptor = "(S)I", + garbageValue = "255" ) @Export("readInt") public int readInt() { @@ -404,41 +418,41 @@ public int readInt() { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); } - @ObfuscatedName("ci") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-1147621862" + descriptor = "(B)J", + garbageValue = "95" ) @Export("readLong") public long readLong() { long var1 = (long)this.readInt() & 4294967295L; long var3 = (long)this.readInt() & 4294967295L; - return var3 + (var1 << 32); + return (var1 << 32) + var3; } - @ObfuscatedName("ca") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "(B)F", - garbageValue = "1" + descriptor = "(S)F", + garbageValue = "4005" ) - public float method2551() { + public float method2586() { return Float.intBitsToFloat(this.readInt()); } - @ObfuscatedName("cb") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "8" + descriptor = "(I)Z", + garbageValue = "-2117231513" ) @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; } - @ObfuscatedName("cg") + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1848740572" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "37" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { @@ -453,7 +467,7 @@ public String readStringCp1252NullTerminatedOrNull() { @ObfuscatedName("cj") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "262549745" + garbageValue = "1433848614" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { @@ -463,13 +477,13 @@ public String readStringCp1252NullTerminated() { } int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : class325.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : class92.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("cz") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1654554633" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "0" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { @@ -483,16 +497,17 @@ public String readStringCp1252NullCircumfixed() { } int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : class325.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : class92.decodeStringCp1252(this.array, var2, var3); } } - @ObfuscatedName("ct") + @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-935649711" + garbageValue = "1940899039" ) - public String method2556() { + @Export("readCESUB") + public String readCESUB() { byte var1 = this.array[++this.offset - 1]; if (var1 != 0) { throw new IllegalStateException(""); @@ -501,68 +516,17 @@ public String method2556() { if (var2 + this.offset > this.array.length) { throw new IllegalStateException(""); } else { - byte[] var4 = this.array; - int var5 = this.offset; - char[] var6 = new char[var2]; - int var7 = 0; - int var8 = var5; - - int var11; - for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { - int var10 = var4[var8++] & 255; - if (var10 < 128) { - if (var10 == 0) { - var11 = 65533; - } else { - var11 = var10; - } - } else if (var10 < 192) { - var11 = 65533; - } else if (var10 < 224) { - if (var8 < var9 && (var4[var8] & 192) == 128) { - var11 = (var10 & 31) << 6 | var4[var8++] & 63; - if (var11 < 128) { - var11 = 65533; - } - } else { - var11 = 65533; - } - } else if (var10 < 240) { - if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { - var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; - if (var11 < 2048) { - var11 = 65533; - } - } else { - var11 = 65533; - } - } else if (var10 < 248) { - if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { - var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; - if (var11 >= 65536 && var11 <= 1114111) { - var11 = 65533; - } else { - var11 = 65533; - } - } else { - var11 = 65533; - } - } else { - var11 = 65533; - } - } - - String var3 = new String(var6, 0, var7); + String var3 = class430.method2190(this.array, this.offset, var2); this.offset += var2; return var3; } } } - @ObfuscatedName("cy") + @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "37" + descriptor = "([BIII)V", + garbageValue = "-808602806" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { @@ -572,10 +536,10 @@ public void readBytes(byte[] var1, int var2, int var3) { } - @ObfuscatedName("ck") + @ObfuscatedName("ct") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "234174840" + garbageValue = "-15010737" ) @Export("readShortSmart") public int readShortSmart() { @@ -583,10 +547,10 @@ public int readShortSmart() { return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } - @ObfuscatedName("cc") + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1174509102" + descriptor = "(B)I", + garbageValue = "2" ) @Export("readUShortSmart") public int readUShortSmart() { @@ -594,22 +558,24 @@ public int readUShortSmart() { return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } - @ObfuscatedName("dh") + @ObfuscatedName("cl") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1553236934" + garbageValue = "1742442094" ) - public int method2560() { + @Export("readShortSmartSub") + public int readShortSmartSub() { int var1 = this.array[this.offset] & 255; return var1 < 128 ? this.readUnsignedByte() - 1 : this.readUnsignedShort() - 32769; } - @ObfuscatedName("dj") + @ObfuscatedName("ca") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-94" + garbageValue = "5" ) - public int method2561() { + @Export("readIncrSmallSmart") + public int readIncrSmallSmart() { int var1 = 0; int var2; @@ -621,21 +587,23 @@ public int method2561() { return var1; } - @ObfuscatedName("di") + @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "776176450" + descriptor = "(S)I", + garbageValue = "-5504" ) - public int method2562() { + @Export("readLargeSmart") + public int readLargeSmart() { return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } - @ObfuscatedName("du") + @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1431150361" + descriptor = "(B)I", + garbageValue = "-80" ) - public int method2563() { + @Export("readNullableLargeSmart") + public int readNullableLargeSmart() { if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { @@ -644,10 +612,10 @@ public int method2563() { } } - @ObfuscatedName("dn") + @ObfuscatedName("ds") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "1526409696" ) @Export("readVarInt") public int readVarInt() { @@ -661,12 +629,12 @@ public int readVarInt() { return var2 | var1; } - @ObfuscatedName("dg") + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-28338" + descriptor = "(B)I", + garbageValue = "-57" ) - public int method2565() { + public int packBytesToInt() { int var2 = 0; int var3 = 0; @@ -680,10 +648,10 @@ public int method2565() { return var2; } - @ObfuscatedName("dd") + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "([IB)V", - garbageValue = "2" + descriptor = "([II)V", + garbageValue = "98180298" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { @@ -708,10 +676,10 @@ public void xteaEncryptAll(int[] var1) { } - @ObfuscatedName("da") + @ObfuscatedName("dq") @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-1321598468" + descriptor = "([IB)V", + garbageValue = "-56" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { @@ -736,10 +704,10 @@ public void xteaDecryptAll(int[] var1) { } - @ObfuscatedName("ds") + @ObfuscatedName("dz") @ObfuscatedSignature( descriptor = "([IIII)V", - garbageValue = "1099130018" + garbageValue = "1472576240" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { @@ -766,10 +734,10 @@ public void xteaEncrypt(int[] var1, int var2, int var3) { this.offset = var4; } - @ObfuscatedName("dy") + @ObfuscatedName("dn") @ObfuscatedSignature( descriptor = "([IIIB)V", - garbageValue = "-14" + garbageValue = "121" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { @@ -796,10 +764,10 @@ public void xteaDecrypt(int[] var1, int var2, int var3) { this.offset = var4; } - @ObfuscatedName("dt") + @ObfuscatedName("dk") @ObfuscatedSignature( descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "849520517" + garbageValue = "-36777133" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { @@ -815,151 +783,136 @@ public void encryptRsa(BigInteger var1, BigInteger var2) { this.writeBytes(var7, 0, var7.length); } - @ObfuscatedName("dl") + @ObfuscatedName("df") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1394849822" + garbageValue = "-1093540006" ) @Export("writeCrc") public int writeCrc(int var1) { - byte[] var3 = this.array; - int var4 = this.offset; - int var5 = -1; - - for (int var6 = var1; var6 < var4; ++var6) { - var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; - } - - var5 = ~var5; - this.writeInt(var5); - return var5; + int var2 = ArchiveDisk.method2309(this.array, var1, this.offset); + this.writeInt(var2); + return var2; } - @ObfuscatedName("dk") + @ObfuscatedName("de") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1935079225" + descriptor = "(B)Z", + garbageValue = "103" ) @Export("checkCrc") public boolean checkCrc() { this.offset -= 4; - byte[] var2 = this.array; - int var3 = this.offset; - int var4 = -1; - - int var5; - for (var5 = 0; var5 < var3; ++var5) { - var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255]; - } - - var4 = ~var4; - var5 = this.readInt(); - return var5 == var4; + int var1 = ArchiveDisk.method2309(this.array, 0, this.offset); + int var2 = this.readInt(); + return var1 == var2; } - @ObfuscatedName("df") + @ObfuscatedName("dl") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1286227217" + garbageValue = "-1580399246" ) + @Export("writeByteAdd") public void writeByteAdd(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("dz") + @ObfuscatedName("dp") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "73" + descriptor = "(II)V", + garbageValue = "518186020" ) - @Export("writeMed0") + @Export("writeByteNeg") public void writeByteNeg(int var1) { this.array[++this.offset - 1] = (byte)(0 - var1); } - @ObfuscatedName("dw") + @ObfuscatedName("do") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1646305705" + garbageValue = "-751225274" ) @Export("writeByteSub") public void writeByteSub(int var1) { this.array[++this.offset - 1] = (byte)(128 - var1); } - @ObfuscatedName("dv") + @ObfuscatedName("dh") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "316083007" + garbageValue = "2038958991" ) @Export("readUnsignedByteAdd") public int readUnsignedByteAdd() { return this.array[++this.offset - 1] - 128 & 255; } - @ObfuscatedName("dr") + @ObfuscatedName("dj") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1007097777" + garbageValue = "2068421837" ) @Export("readUnsignedByteNeg") public int readUnsignedByteNeg() { return 0 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("do") + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1108822306" + descriptor = "(B)I", + garbageValue = "17" ) @Export("readUnsignedByteSub") public int readUnsignedByteSub() { return 128 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("db") + @ObfuscatedName("dr") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "-302199246" + garbageValue = "80020089" ) @Export("readByteAdd") public byte readByteAdd() { return (byte)(this.array[++this.offset - 1] - 128); } - @ObfuscatedName("dp") + @ObfuscatedName("dw") @ObfuscatedSignature( descriptor = "(B)B", - garbageValue = "-122" + garbageValue = "-29" ) + @Export("readByteNeg") public byte readByteNeg() { return (byte)(0 - this.array[++this.offset - 1]); } - @ObfuscatedName("dm") + @ObfuscatedName("di") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "1035435646" + garbageValue = "1972781971" ) - @Export("readSignedByteSub") - public byte readSignedByteSub() { + @Export("readByteSub") + public byte readByteSub() { return (byte)(128 - this.array[++this.offset - 1]); } - @ObfuscatedName("dx") + @ObfuscatedName("dt") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-792934648" + descriptor = "(IB)V", + garbageValue = "106" ) - @Export("writeIntME") - public void writeIntME(int var1) { + @Export("writeShortLE") + public void writeShortLE(int var1) { this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("dq") + @ObfuscatedName("dd") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1242931377" + garbageValue = "-1925557775" ) @Export("writeShortAddLE") public void writeShortAddLE(int var1) { @@ -967,10 +920,10 @@ public void writeShortAddLE(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("de") + @ObfuscatedName("dy") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1382454914" + descriptor = "(IB)V", + garbageValue = "18" ) @Export("writeShortAdd") public void writeShortAdd(int var1) { @@ -978,10 +931,10 @@ public void writeShortAdd(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("dc") + @ObfuscatedName("db") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1918488867" + descriptor = "(B)I", + garbageValue = "3" ) @Export("readIntME") public int readIntME() { @@ -989,33 +942,34 @@ public int readIntME() { return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); } - @ObfuscatedName("ed") + @ObfuscatedName("dc") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1798524926" + garbageValue = "1401197709" ) - @Export("readUnsignedShortLE") - public int readUnsignedShortLE() { + @Export("readUnsignedShortAdd") + public int readUnsignedShortAdd() { this.offset += 2; return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("eh") + @ObfuscatedName("da") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "73" + descriptor = "(I)I", + garbageValue = "-976069698" ) - public int method2587() { + @Export("readUnsignedShortAddLE") + public int readUnsignedShortAddLE() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); } - @ObfuscatedName("ey") + @ObfuscatedName("eo") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2113595632" + garbageValue = "1014937104" ) - public int method2588() { + public int method2623() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); if (var1 > 32767) { @@ -1025,13 +979,13 @@ public int method2588() { return var1; } - @ObfuscatedName("ee") + @ObfuscatedName("em") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1366788649" + descriptor = "(B)I", + garbageValue = "53" ) - @Export("readSignedShortAdd") - public int readSignedShortAdd() { + @Export("readShortLE") + public int readShortLE() { this.offset += 2; int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 32767) { @@ -1041,46 +995,61 @@ public int readSignedShortAdd() { return var1; } - @ObfuscatedName("eq") + @ObfuscatedName("el") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-614629253" + descriptor = "(I)I", + garbageValue = "-813012509" + ) + public int method2625() { + this.offset += 2; + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); + if (var1 > 32767) { + var1 -= 65536; + } + + return var1; + } + + @ObfuscatedName("ec") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "19" ) @Export("writeMediumLE") public void writeMediumLE(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 >> 16); } - @ObfuscatedName("ej") + @ObfuscatedName("eg") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-535659552" + garbageValue = "-2139060147" ) - public int method2591() { + public int method2627() { this.offset += 3; - return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); + return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); } - @ObfuscatedName("ea") + @ObfuscatedName("ei") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "784295122" ) - public int method2592() { + public int method2628() { this.offset += 3; return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); } - @ObfuscatedName("er") + @ObfuscatedName("ex") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "117" + descriptor = "(I)I", + garbageValue = "953463259" ) - public int method2593() { + public int method2629() { this.offset += 3; - int var1 = (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); + int var1 = ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); if (var1 > 8388607) { var1 -= 16777216; } @@ -1088,14 +1057,14 @@ public int method2593() { return var1; } - @ObfuscatedName("ev") + @ObfuscatedName("ek") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-73" + descriptor = "(I)I", + garbageValue = "-927007563" ) - public int method2594() { + public int method2630() { this.offset += 3; - int var1 = ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); if (var1 > 8388607) { var1 -= 16777216; } @@ -1103,10 +1072,10 @@ public int method2594() { return var1; } - @ObfuscatedName("ez") + @ObfuscatedName("er") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1615991822" + descriptor = "(IB)V", + garbageValue = "-40" ) @Export("writeIntLE") public void writeIntLE(int var1) { @@ -1116,13 +1085,13 @@ public void writeIntLE(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 24); } - @ObfuscatedName("et") + @ObfuscatedName("ez") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "46" + descriptor = "(II)V", + garbageValue = "759646108" ) - - public void writeIntIME_(int var1) { + @Export("writeIntME") + public void writeIntME(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 24); @@ -1132,7 +1101,7 @@ public void writeIntIME_(int var1) { @ObfuscatedName("en") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2112145568" + garbageValue = "-1723404491" ) @Export("writeIntIME") public void writeIntIME(int var1) { @@ -1142,44 +1111,57 @@ public void writeIntIME(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("eb") + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "10" + descriptor = "(I)I", + garbageValue = "1509017356" ) - public int method2598() { + @Export("readUnsignedIntLE") + public int readUnsignedIntLE() { this.offset += 4; return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); } - @ObfuscatedName("ei") + @ObfuscatedName("eq") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2095905136" + garbageValue = "-743264140" ) - @Export("readUnsignedByteNeg") + @Export("readUnsignedIntIME") public int readUnsignedIntIME() { this.offset += 4; return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); } - @ObfuscatedName("es") + @ObfuscatedName("ej") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-119646435" ) - @Export("readUnsignedShortAddLE") - public int readIntIME() { + @Export("readUnsignedIntME") + public int readUnsignedIntME() { this.offset += 4; return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); } - @ObfuscatedName("el") + @ObfuscatedName("et") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "265273731" + ) + public void method2637(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { + var1[var4] = this.array[++this.offset - 1]; + } + + } + + @ObfuscatedName("eh") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1107296257" + garbageValue = "157152103" ) - public void method2601(byte[] var1, int var2, int var3) { + public void method2638(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } diff --git a/osrs/src/main/java/BufferedFile.java b/osrs/src/main/java/BufferedFile.java index 6ac6a3269..ccc330481 100644 --- a/osrs/src/main/java/BufferedFile.java +++ b/osrs/src/main/java/BufferedFile.java @@ -6,48 +6,48 @@ import java.io.EOFException; import java.io.IOException; -@ObfuscatedName("td") +@ObfuscatedName("tl") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ltu;" + descriptor = "Lto;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("offset") long offset; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("fileLength") long fileLength; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("length") long length; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Ltu;II)V" + descriptor = "(Lto;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; @@ -60,10 +60,10 @@ public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.offset = 0L; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "22" + descriptor = "(I)V", + garbageValue = "1702864120" ) @Export("close") public void close() throws IOException { @@ -71,7 +71,7 @@ public void close() throws IOException { this.accessFile.close(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { @@ -81,30 +81,30 @@ public void seek(long var1) throws IOException { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "109" + descriptor = "(S)J", + garbageValue = "-9181" ) @Export("length") public long length() { return this.length; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-560983071" + descriptor = "([BB)V", + garbageValue = "90" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-639853271" + descriptor = "([BIIS)V", + garbageValue = "9117" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -113,7 +113,7 @@ public void read(byte[] var1, int var2, int var3) throws IOException { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) { + if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) { System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); this.offset += (long)var3; return; @@ -176,16 +176,16 @@ public void read(byte[] var1, int var2, int var3) throws IOException { long var13 = -1L; long var10 = -1L; - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { var13 = this.writeBufferOffset; } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { var13 = var4; } - if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= (long)var7 + var4) { - var10 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { - var10 = (long)var7 + var4; + if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= var4 + (long)var7) { + var10 = (long)this.writeBufferLength + this.writeBufferOffset; + } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { + var10 = var4 + (long)var7; } if (var13 > -1L && var10 > var13) { @@ -207,15 +207,15 @@ public void read(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-960197049" + descriptor = "(B)V", + garbageValue = "-63" ) @Export("load") void load() throws IOException { this.readBufferLength = 0; - if (this.offset != this.fileOffset) { + if (this.fileOffset != this.offset) { this.accessFile.seek(this.offset); this.fileOffset = this.offset; } @@ -237,23 +237,23 @@ void load() throws IOException { } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "480897367" + descriptor = "([BIIB)V", + garbageValue = "61" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if ((long)var3 + this.offset > this.length) { - this.length = this.offset + (long)var3; + if (this.offset + (long)var3 > this.length) { + this.length = (long)var3 + this.offset; } - if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { + if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { this.flush(); } - if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { + if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); this.offset += (long)var4; @@ -277,7 +277,7 @@ public void write(byte[] var1, int var2, int var3) throws IOException { } } else { - if (this.offset != this.fileOffset) { + if (this.fileOffset != this.offset) { this.accessFile.seek(this.offset); this.fileOffset = this.offset; } @@ -296,9 +296,9 @@ public void write(byte[] var1, int var2, int var3) throws IOException { var9 = this.readBufferOffset; } - if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) { + if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { var6 = this.offset + (long)var3; - } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { var6 = this.readBufferOffset + (long)this.readBufferLength; } @@ -315,14 +315,14 @@ public void write(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1104225308" + garbageValue = "-503112387" ) @Export("flush") void flush() throws IOException { - if (this.writeBufferOffset != -1L) { + if (-1L != this.writeBufferOffset) { if (this.writeBufferOffset != this.fileOffset) { this.accessFile.seek(this.writeBufferOffset); this.fileOffset = this.writeBufferOffset; @@ -342,9 +342,9 @@ void flush() throws IOException { var1 = this.readBufferOffset; } - if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { + if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) { var3 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= this.writeBufferOffset + (long)this.writeBufferLength) { + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { var3 = this.readBufferOffset + (long)this.readBufferLength; } diff --git a/osrs/src/main/java/BufferedNetSocket.java b/osrs/src/main/java/BufferedNetSocket.java index 2e572fd9f..4aab498bf 100644 --- a/osrs/src/main/java/BufferedNetSocket.java +++ b/osrs/src/main/java/BufferedNetSocket.java @@ -6,28 +6,29 @@ import java.io.IOException; import java.net.Socket; -@ObfuscatedName("qy") +@ObfuscatedName("rc") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("ar") - static int[][][] field3820; - @ObfuscatedName("au") + @ObfuscatedName("uv") + @Export("cameraLookAtY") + static int cameraLookAtY; + @ObfuscatedName("ac") @Export("socket") Socket socket; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lqa;" + descriptor = "Lrj;" ) @Export("source") BufferedSource source; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lqh;" + descriptor = "Lrs;" ) @Export("sink") BufferedSink sink; - public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { + BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { this.socket = var1; this.socket.setSoTimeout(30000); this.socket.setTcpNoDelay(true); @@ -37,60 +38,60 @@ public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-67" + descriptor = "(II)Z", + garbageValue = "2050917556" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1947351494" + garbageValue = "-111326055" ) @Export("available") public int available() throws IOException { return this.source.available(); } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "969166986" + descriptor = "(B)I", + garbageValue = "-4" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "([BIIS)I", - garbageValue = "206" + descriptor = "([BIII)I", + garbageValue = "-2009008666" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1371855899" + garbageValue = "40171702" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1457160931" + descriptor = "(S)V", + garbageValue = "2421" ) @Export("close") public void close() { @@ -109,13 +110,4 @@ public void close() { protected void finalize() { this.close(); } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)[Lub;", - garbageValue = "-1" - ) - static PrivateChatMode[] method2261() { - return new PrivateChatMode[]{PrivateChatMode.field4273, PrivateChatMode.field4272, PrivateChatMode.field4271}; - } } \ No newline at end of file diff --git a/osrs/src/main/java/BufferedSink.java b/osrs/src/main/java/BufferedSink.java index 979ed2d82..6978b408e 100644 --- a/osrs/src/main/java/BufferedSink.java +++ b/osrs/src/main/java/BufferedSink.java @@ -6,31 +6,31 @@ import java.io.IOException; import java.io.OutputStream; -@ObfuscatedName("qh") +@ObfuscatedName("net/runelite/rs") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("thread") Thread thread; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("capacity") int capacity; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("buffer") byte[] buffer; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("position") int position; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("limit") int limit; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("exception") IOException exception; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("closed") boolean closed; @@ -45,10 +45,10 @@ public class BufferedSink implements Runnable { this.thread.start(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "8226" + descriptor = "(I)Z", + garbageValue = "-2138016913" ) @Export("isClosed") boolean isClosed() { @@ -70,10 +70,10 @@ boolean isClosed() { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "37" + descriptor = "([BIII)V", + garbageValue = "-939344469" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -110,10 +110,10 @@ void write(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-210183735" + garbageValue = "792661080" ) @Export("close") void close() { @@ -190,4 +190,18 @@ public void run() { } while(!this.isClosed()); } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-100" + ) + public static void method2304() { + if (MouseHandler.MouseHandler_instance != null) { + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_instance = null; + } + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/BufferedSource.java b/osrs/src/main/java/BufferedSource.java index e77f799b6..9c0888f10 100644 --- a/osrs/src/main/java/BufferedSource.java +++ b/osrs/src/main/java/BufferedSource.java @@ -7,28 +7,28 @@ import java.io.IOException; import java.io.InputStream; -@ObfuscatedName("qa") +@ObfuscatedName("rj") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("thread") Thread thread; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("capacity") int capacity; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("buffer") byte[] buffer; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("position") int position; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("limit") int limit; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("exception") IOException exception; @@ -43,10 +43,10 @@ public class BufferedSource implements Runnable { this.thread.start(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "23" + garbageValue = "0" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -77,10 +77,10 @@ boolean isAvailable(int var1) throws IOException { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "719652359" + garbageValue = "1929996335" ) @Export("available") int available() throws IOException { @@ -101,10 +101,10 @@ int available() throws IOException { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "102" + descriptor = "(I)I", + garbageValue = "-1702106506" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { @@ -124,10 +124,10 @@ int readUnsignedByte() throws IOException { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "360959196" + garbageValue = "171624144" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -165,10 +165,10 @@ int read(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-20258" + descriptor = "(I)V", + garbageValue = "-189717411" ) @Export("close") void close() { @@ -237,12 +237,36 @@ public void run() { } } - @ObfuscatedName("au") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "-122" + descriptor = "([BIIII[Lih;I)V", + garbageValue = "-2138792122" ) - public static void method2268(AbstractArchive var0) { - DbTableType.field4110 = var0; + static final void method2298(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var7; + int var8; + for (int var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 64; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { + int[] var10000 = var5[var6].flags[var7 + var1]; + var10000[var2 + var8] &= -16777217; + } + } + } + } + + Buffer var12 = new Buffer(var0); + + for (var7 = 0; var7 < 4; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + for (int var9 = 0; var9 < 64; ++var9) { + int var10 = var8 + var1; + int var11 = var9 + var2; + class104.loadTerrain(var12, var7, var10, var11, var3 + var10, var11 + var4, 0); + } + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/ByteArrayPool.java b/osrs/src/main/java/ByteArrayPool.java index 0d8d95a03..c449ecfc4 100644 --- a/osrs/src/main/java/ByteArrayPool.java +++ b/osrs/src/main/java/ByteArrayPool.java @@ -5,66 +5,72 @@ import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; -@ObfuscatedName("pb") +@ObfuscatedName("qo") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("ap") - static int field3743; + @ObfuscatedName("ab") + static int field3772; + @ObfuscatedName("am") + static int field3775; + @ObfuscatedName("av") + static int field3778; + @ObfuscatedName("ag") + static int field3773; @ObfuscatedName("aa") - static int field3738; - @ObfuscatedName("af") - static int field3741; - @ObfuscatedName("ad") - static int field3740; - @ObfuscatedName("aq") - static int field3744; - @ObfuscatedName("al") + static int field3771; + @ObfuscatedName("ap") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("ab") - static byte[][] field3734; - @ObfuscatedName("ah") - static ArrayList field3746; + @ObfuscatedName("aj") + static byte[][] field3767; + @ObfuscatedName("an") + @Export("ByteArrayPool_alternativeSizes") + public static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("ae") + public static ArrayList field3766; static { ByteArrayPool_smallCount = 0; ByteArrayPool_mediumCount = 0; ByteArrayPool_largeCount = 0; - field3743 = 0; - field3738 = 1000; - field3741 = 250; - field3740 = 100; - field3744 = 50; + field3772 = 0; + field3775 = 1000; + field3778 = 250; + field3773 = 100; + field3771 = 50; ByteArrayPool_small = new byte[1000][]; ByteArrayPool_medium = new byte[250][]; ByteArrayPool_large = new byte[100][]; - field3734 = new byte[50][]; - field3746 = new ArrayList(); - class101.method599(); + field3767 = new byte[50][]; + field3766 = new ArrayList(); + field3766.clear(); + field3766.add(100); + field3766.add(5000); + field3766.add(10000); + field3766.add(30000); new HashMap(); } - @ObfuscatedName("ao") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(IZI)[B", - garbageValue = "1767173651" + garbageValue = "664601398" ) @Export("ByteArrayPool_getArrayBool") public static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -81,26 +87,26 @@ public static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean v var2 = ByteArrayPool_large[--ByteArrayPool_largeCount]; ByteArrayPool_large[ByteArrayPool_largeCount] = null; return var2; - } else if ((var0 == 30000 || var0 < 30000 && var1) && field3743 > 0) { - var2 = field3734[--field3743]; - field3734[field3743] = null; + } else if ((var0 == 30000 || var0 < 30000 && var1) && field3772 > 0) { + var2 = field3767[--field3772]; + field3767[field3772] = null; return var2; } else { int var4; - if (class410.ByteArrayPool_arrays != null) { - for (var4 = 0; var4 < class416.ByteArrayPool_alternativeSizes.length; ++var4) { - if ((class416.ByteArrayPool_alternativeSizes[var4] == var0 || var0 < class416.ByteArrayPool_alternativeSizes[var4] && var1) && StructComposition.ByteArrayPool_altSizeArrayCounts[var4] > 0) { - byte[] var3 = class410.ByteArrayPool_arrays[var4][--StructComposition.ByteArrayPool_altSizeArrayCounts[var4]]; - class410.ByteArrayPool_arrays[var4][StructComposition.ByteArrayPool_altSizeArrayCounts[var4]] = null; + if (class28.ByteArrayPool_arrays != null) { + for (var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) { + if ((ByteArrayPool_alternativeSizes[var4] == var0 || var0 < ByteArrayPool_alternativeSizes[var4] && var1) && class425.ByteArrayPool_altSizeArrayCounts[var4] > 0) { + byte[] var3 = class28.ByteArrayPool_arrays[var4][--class425.ByteArrayPool_altSizeArrayCounts[var4]]; + class28.ByteArrayPool_arrays[var4][class425.ByteArrayPool_altSizeArrayCounts[var4]] = null; return var3; } } } - if (var1 && class416.ByteArrayPool_alternativeSizes != null) { - for (var4 = 0; var4 < class416.ByteArrayPool_alternativeSizes.length; ++var4) { - if (var0 <= class416.ByteArrayPool_alternativeSizes[var4] && StructComposition.ByteArrayPool_altSizeArrayCounts[var4] < class410.ByteArrayPool_arrays[var4].length) { - return new byte[class416.ByteArrayPool_alternativeSizes[var4]]; + if (var1 && ByteArrayPool_alternativeSizes != null) { + for (var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) { + if (var0 <= ByteArrayPool_alternativeSizes[var4] && class425.ByteArrayPool_altSizeArrayCounts[var4] < class28.ByteArrayPool_arrays[var4].length) { + return new byte[ByteArrayPool_alternativeSizes[var4]]; } } } @@ -108,182 +114,4 @@ public static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean v return new byte[var0]; } } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-8" - ) - static void method2148() { - Iterator var0 = class305.musicSongs.iterator(); - - while (true) { - MusicSong var1; - do { - if (!var0.hasNext()) { - class305.musicSongs.clear(); - return; - } - - var1 = (MusicSong)var0.next(); - } while(var1 == null); - - var1.midiPcmStream.clear(); - var1.midiPcmStream.method1633(); - var1.midiPcmStream.setPcmStreamVolume(0); - var1.midiPcmStream.field2809 = 0; - int var2 = var1.musicTrackGroupId; - int var3 = var1.musicTrackFileId; - Iterator var4 = class305.field2778.iterator(); - - while (var4.hasNext()) { - class311 var5 = (class311)var4.next(); - var5.vmethod1644(var2, var3); - } - } - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-2055623953" - ) - static int method2149(int var0, Script var1, boolean var2) { - Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - if (var0 == 2600) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == 2601) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == 2602) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == 2603) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == 2604) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == 2605) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == 2606) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == 2607) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == 2608) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == 2609) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 2610) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == 2611) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == 2612) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 2613) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == 2614) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else { - class324 var4; - if (var0 == 2617) { - var4 = var3.method1845(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2892 * -1007608077 * 1891510843 : 0; - } - - if (var0 == 2618) { - var4 = var3.method1845(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2890 * -113152143 * 439316881 : 0; - return 1; - } else { - class329 var7; - if (var0 == 2619) { - var7 = var3.method1844(); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1780().method2041() : ""; - return 1; - } else if (var0 == 2620) { - var4 = var3.method1845(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2891 * 1092445257 * -767308295 : 0; - return 1; - } else if (var0 == 2621) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1790() : 0; - return 1; - } else if (var0 == 2622) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1791() : 0; - return 1; - } else if (var0 == 2623) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1792() : 0; - return 1; - } else if (var0 == 2624) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null && var7.method1782() ? 1 : 0; - return 1; - } else if (var0 != 2625) { - if (var0 == 2626) { - var7 = var3.method1844(); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1781().method2113() : ""; - return 1; - } else if (var0 == 2627) { - var7 = var3.method1844(); - int var5 = var7 != null ? var7.method1786() : 0; - int var6 = var7 != null ? var7.method1785() : 0; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Math.min(var5, var6); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Math.max(var5, var6); - return 1; - } else if (var0 == 2628) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1785() : 0; - return 1; - } else if (var0 == 2629) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1794() : 0; - return 1; - } else if (var0 == 2630) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1793() : 0; - return 1; - } else if (var0 == 2631) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1795() : 0; - return 1; - } else if (var0 == 2632) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1796() : 0; - return 1; - } else { - class27 var8; - if (var0 == 2633) { - var8 = var3.method1846(); - Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = var8 != null ? var8.method98(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]) : 0; - return 1; - } else if (var0 == 2634) { - var8 = var3.method1846(); - Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = var8 != null ? var8.method99((char)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]) : 0; - return 1; - } else { - return 2; - } - } - } else { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null && var7.method1783() ? 1 : 0; - return 1; - } - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/Calendar.java b/osrs/src/main/java/Calendar.java index dca6510c1..af510fbde 100644 --- a/osrs/src/main/java/Calendar.java +++ b/osrs/src/main/java/Calendar.java @@ -1,19 +1,20 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; import java.util.TimeZone; -@ObfuscatedName("mo") +@ObfuscatedName("na") @Implements("Calendar") public class Calendar { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("MONTH_NAMES_ENGLISH_GERMAN") public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("DAYS_OF_THE_WEEK") public static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("Calendar_calendar") public static java.util.Calendar Calendar_calendar; @@ -23,4 +24,26 @@ public class Calendar { java.util.Calendar.getInstance(); Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)[Lnp;", + garbageValue = "1714112630" + ) + public static StudioGame[] method1889() { + return new StudioGame[]{StudioGame.game3, StudioGame.game5, StudioGame.runescape, StudioGame.stellardawn, StudioGame.oldscape, StudioGame.game4}; + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1782569305" + ) + public static void method1890(boolean var0) { + if (var0 != HealthBarUpdate.ItemDefinition_inMembersWorld) { + class315.method1655(); + HealthBarUpdate.ItemDefinition_inMembersWorld = var0; + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/Canvas.java b/osrs/src/main/java/Canvas.java index 57ff334b9..e3be655f1 100644 --- a/osrs/src/main/java/Canvas.java +++ b/osrs/src/main/java/Canvas.java @@ -4,30 +4,18 @@ import net.runelite.mapping.ObfuscatedSignature; import java.awt.*; -import java.util.ArrayList; -import java.util.Iterator; +import java.net.URL; -@ObfuscatedName("av") +@ObfuscatedName("at") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("wb") + @ObfuscatedName("sa") @ObfuscatedSignature( - descriptor = "Lsi;" + descriptor = "Lva;" ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("ae") - static long field61; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lbe;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("pr") - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("au") + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("ac") @Export("component") Component component; @@ -43,124 +31,59 @@ public final void paint(Graphics var1) { this.component.paint(var1); } - @ObfuscatedName("hr") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1772266899" + descriptor = "(I)Z", + garbageValue = "-1694208579" ) - static final void method77() { - int var3; - for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { - int var10002 = Client.queuedSoundEffectDelays[var0]--; - if (Client.queuedSoundEffectDelays[var0] >= -10) { - SoundEffect var9 = Client.soundEffects[var0]; - if (var9 == null) { - Object var10000 = null; - var9 = SoundEffect.readSoundEffect(class28.field81, Client.soundEffectIds[var0], 0); - if (var9 == null) { - continue; - } - - int[] var18 = Client.queuedSoundEffectDelays; - var18[var0] += var9.calculateDelay(); - Client.soundEffects[var0] = var9; + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (class91.World_request == null) { + class91.World_request = AbstractWorldMapIcon.urlRequester.request(new URL(class59.field307)); + } else if (class91.World_request.isDone()) { + byte[] var0 = class91.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + UserComparator3.World_worlds = new World[World.World_count]; + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = UserComparator3.World_worlds[var2] = new World(); + var3.id = var1.readUnsignedShort(); + var3.properties = var1.readInt(); + var3.host = var1.readStringCp1252NullTerminated(); + var3.activity = var1.readStringCp1252NullTerminated(); + var3.location = var1.readUnsignedByte(); + var3.population = var1.readShort(); } - if (Client.queuedSoundEffectDelays[var0] < 0) { - int var2; - if (Client.soundLocations[var0] != 0) { - var3 = (Client.soundLocations[var0] & 255) * 128; - int var4 = Client.soundLocations[var0] >> 16 & 255; - int var5 = var4 * 128 + 64 - VarbitComposition.localPlayer.x; - if (var5 < 0) { - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - VarbitComposition.localPlayer.y; - if (var7 < 0) { - var7 = -var7; - } - - int var8 = var7 + var5 - 128; - if (var8 > var3) { - Client.queuedSoundEffectDelays[var0] = -100; - continue; - } - - if (var8 < 0) { - var8 = 0; - } - - var2 = (var3 - var8) * class449.clientPreferences.getAreaSoundEffectsVolume() / var3; - } else { - var2 = class449.clientPreferences.getCurrentSoundEffectsVolume(); - } - - if (var2 > 0) { - RawSound var10 = var9.toRawSound().resample(class330.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); - var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - class162.pcmStreamMixer.addSubStream(var11); - } - - Client.queuedSoundEffectDelays[var0] = -100; - } - } else { - --Client.soundEffectCount; - - for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { - Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; - Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; - Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; - Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; - Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; - } - - --var0; + class12.sortWorlds(UserComparator3.World_worlds, 0, UserComparator3.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + class91.World_request = null; + return true; } + } catch (Exception var4) { + var4.printStackTrace(); + class91.World_request = null; } - if (Client.playingJingle) { - boolean var15; - if (!class305.field2771.isEmpty()) { - var15 = true; - } else if (!class305.musicSongs.isEmpty() && class305.musicSongs.get(0) != null && ((MusicSong)class305.musicSongs.get(0)).midiPcmStream != null) { - var15 = ((MusicSong)class305.musicSongs.get(0)).midiPcmStream.isReady(); - } else { - var15 = false; - } - - if (!var15) { - if (class449.clientPreferences.getCurrentMusicVolume() != 0) { - boolean var16 = !class305.field2773.isEmpty(); - if (var16) { - Archive var12 = class385.archive6; - var3 = class449.clientPreferences.getCurrentMusicVolume(); - if (!class305.field2773.isEmpty()) { - ArrayList var17 = new ArrayList(); - Iterator var13 = class305.field2773.iterator(); - - while (var13.hasNext()) { - MusicSong var14 = (MusicSong)var13.next(); - var14.field2865 = false; - var14.field2866 = false; - var14.field2862 = false; - var14.field2863 = false; - var14.musicTrackArchive = var12; - var14.musicTrackVolume = var3; - var14.field2867 = 0.0F; - var17.add(var14); - } - - class53.method291(var17, class305.musicPlayerStatus, class305.field2766, class305.field2769, class305.field2768, false); - } - } - } + return false; + } - Client.playingJingle = false; - } + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lnm;I)I", + garbageValue = "-907105353" + ) + static int method88(Widget var0) { + if (var0.type != 11) { + Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize - 1] = ""; + return 1; + } else { + String var1 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var0.method1869(var1); + return 1; } - } } \ No newline at end of file diff --git a/osrs/src/main/java/ChatChannel.java b/osrs/src/main/java/ChatChannel.java index bf3d34cdc..8b9c71d9f 100644 --- a/osrs/src/main/java/ChatChannel.java +++ b/osrs/src/main/java/ChatChannel.java @@ -3,16 +3,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +@ObfuscatedName("dg") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("ae") + @ObfuscatedName("lv") + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lco;" + descriptor = "[Lcr;" ) @Export("messages") Message[] messages; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("count") int count; @@ -20,10 +23,10 @@ public class ChatChannel { this.messages = new Message[100]; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lco;", - garbageValue = "100" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lcr;", + garbageValue = "-1" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { @@ -51,57 +54,23 @@ Message addMessage(int var1, String var2, String var3, String var4) { return var5; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II)Lco;", - garbageValue = "-1297953730" + descriptor = "(II)Lcr;", + garbageValue = "-1861075879" ) @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1659980687" + garbageValue = "-1856127113" ) @Export("size") int size() { return this.count; } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "818523875" - ) - static void method451() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - } - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "130826002" - ) - static boolean method455() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var0.isLoaded()) { - return false; - } - - ++Client.archiveLoadersDone; - } - - return true; - } else { - return true; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/ClanChannel.java b/osrs/src/main/java/ClanChannel.java index 7bb0f931d..4f59d6db9 100644 --- a/osrs/src/main/java/ClanChannel.java +++ b/osrs/src/main/java/ClanChannel.java @@ -7,46 +7,51 @@ import java.util.BitSet; import java.util.List; -@ObfuscatedName("go") +@ObfuscatedName("gb") @Implements("ClanChannel") public class ClanChannel extends Node { - @ObfuscatedName("au") - boolean field1423; - @ObfuscatedName("ae") - boolean field1422; - @ObfuscatedName("ao") + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lun;" + ) + static IndexedSprite field1409; + @ObfuscatedName("ac") + boolean field1410; + @ObfuscatedName("al") + boolean field1411; + @ObfuscatedName("ak") @Export("members") public List members; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("ac") - public long field1429; - @ObfuscatedName("ai") + @ObfuscatedName("ao") + public long field1417; + @ObfuscatedName("ah") @Export("name") public String name; - @ObfuscatedName("az") - public byte field1426; - @ObfuscatedName("ap") - public byte field1425; + @ObfuscatedName("ar") + public byte field1414; + @ObfuscatedName("ab") + public byte field1413; static { new BitSet(65536); } @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;)V" ) public ClanChannel(Buffer var1) { - this.field1422 = true; + this.field1411 = true; this.name = null; - this.method861(var1); + this.method870(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(B)[I", - garbageValue = "74" + garbageValue = "-35" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -55,20 +60,20 @@ public int[] getSortedMembers() { this.sortedMembers = new int[this.members.size()]; for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { - var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method2700(); + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method2740(); } int[] var3 = this.sortedMembers; - VerticalAlignment.method998(var1, var3, 0, var1.length - 1); + class161.method846(var1, var3, 0, var1.length - 1); } return this.sortedMembers; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfu;I)V", - garbageValue = "2089443829" + descriptor = "(Lfv;B)V", + garbageValue = "0" ) @Export("addMember") void addMember(ClanChannelMember var1) { @@ -76,10 +81,10 @@ void addMember(ClanChannelMember var1) { this.sortedMembers = null; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-753870503" + descriptor = "(IB)V", + garbageValue = "-32" ) @Export("removeMember") void removeMember(int var1) { @@ -87,22 +92,22 @@ void removeMember(int var1) { this.sortedMembers = null; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "65" + descriptor = "(I)I", + garbageValue = "-1630727140" ) - public int method859() { + public int method868() { return this.members.size(); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)I", - garbageValue = "179" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-1421976889" ) - public int method860(String var1) { - if (!this.field1422) { + public int method869(String var1) { + if (!this.field1411) { throw new RuntimeException("Displaynames not available"); } else { for (int var2 = 0; var2 < this.members.size(); ++var2) { @@ -115,19 +120,19 @@ public int method860(String var1) { } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "-1748777408" + descriptor = "(Lul;I)V", + garbageValue = "446907071" ) - void method861(Buffer var1) { + void method870(Buffer var1) { int var2 = var1.readUnsignedByte(); if ((var2 & 1) != 0) { - this.field1423 = true; + this.field1410 = true; } if ((var2 & 2) != 0) { - this.field1422 = true; + this.field1411 = true; } int var3 = 2; @@ -136,22 +141,22 @@ void method861(Buffer var1) { } super.key = var1.readLong(); - this.field1429 = var1.readLong(); + this.field1417 = var1.readLong(); this.name = var1.readStringCp1252NullTerminated(); var1.readBoolean(); - this.field1425 = var1.readByte(); - this.field1426 = var1.readByte(); + this.field1413 = var1.readByte(); + this.field1414 = var1.readByte(); int var4 = var1.readUnsignedShort(); if (var4 > 0) { this.members = new ArrayList(var4); for (int var5 = 0; var5 < var4; ++var5) { ClanChannelMember var6 = new ClanChannelMember(); - if (this.field1423) { + if (this.field1410) { var1.readLong(); } - if (this.field1422) { + if (this.field1411) { var6.username = new Username(var1.readStringCp1252NullTerminated()); } @@ -167,81 +172,53 @@ void method861(Buffer var1) { } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II)Lhz;", - garbageValue = "1042028592" + descriptor = "(IB)Lhm;", + garbageValue = "77" ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); + var1 = new InvDefinition(); if (var2 != null) { var1.decode(new Buffer(var2)); } - KitDefinition.KitDefinition_cached.put(var1, (long)var0); + InvDefinition.InvDefinition_cached.put(var1, (long)var0); return var1; } } - @ObfuscatedName("jx") + @ObfuscatedName("nz") @ObfuscatedSignature( - descriptor = "(Lie;S)V", - garbageValue = "12208" + descriptor = "(IIII)Lde;", + garbageValue = "203333818" ) - static void method862(class211 var0) { - if (var0 != null && var0.field1878 != null) { - if (var0.field1878.childIndex >= 0) { - Widget var1 = class92.getWidget(var0.field1878.parentId); - if (var1 == null || var1.children == null || var1.children.length == 0 || var0.field1878.childIndex >= var1.children.length || var0.field1878 != var1.children[var0.field1878.childIndex]) { - return; - } - } - - if (var0.field1878.type == 11 && var0.field1875 == 0) { - if (var0.field1878.method1833(var0.field1876, var0.field1877, 0, 0)) { - switch(var0.field1878.method1837()) { - case 0: - class30.openURL(var0.field1878.method1839(), true, false); - break; - case 1: - int var2 = NewShit.getWidgetFlags(var0.field1878); - boolean var5 = (var2 >> 22 & 1) != 0; - if (var5) { - int[] var3 = var0.field1878.method1840(); - if (var3 != null) { - PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2583, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeIntIME_(var3[1]); - var4.packetBuffer.writeIntIME(var0.field1878.id); - var4.packetBuffer.writeIntME(var0.field1878.childIndex); - var4.packetBuffer.writeInt(var0.field1878.method1838()); - var4.packetBuffer.writeIntIME(var3[2]); - var4.packetBuffer.writeIntIME(var3[0]); - Client.packetWriter.addNode(var4); - } - } - } - } - } else if (var0.field1878.type == 12) { - class329 var6 = var0.field1878.method1844(); - if (var6 != null && var6.method1783()) { - switch(var0.field1875) { - case 0: - Client.field423.method1088(var0.field1878); - var6.method1731(true); - var6.method1770(var0.field1876, var0.field1877, Client.keyHandlerInstance.getKeyPressed(82), Client.keyHandlerInstance.getKeyPressed(81)); - break; - case 1: - var6.method1771(var0.field1876, var0.field1877); - } - } - } + @Export("ifOpenSub") + static final InterfaceParent ifOpenSub(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + class357.method1901(var1); + Widget var4 = class33.field89.method1740(var0); + ClanChannelMember.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + ClanChannelMember.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var0 >> 16], var4, false); + VerticalAlignment.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { + Interpreter.method418(Client.rootInterface, 1); } + + return var3; } } \ No newline at end of file diff --git a/osrs/src/main/java/ClanChannelMember.java b/osrs/src/main/java/ClanChannelMember.java index 28628609a..3ea704bab 100644 --- a/osrs/src/main/java/ClanChannelMember.java +++ b/osrs/src/main/java/ClanChannelMember.java @@ -3,29 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fv") @Implements("ClanChannelMember") public class ClanChannelMember { - @ObfuscatedName("cd") + @ObfuscatedName("tt") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lgb;" ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("fa") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - static Archive field1339; - @ObfuscatedName("au") + @Export("guestClanChannel") + static ClanChannel guestClanChannel; + @ObfuscatedName("ac") @Export("rank") public byte rank; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("world") public int world; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Luc;" + descriptor = "Lvf;" ) @Export("username") public Username username; @@ -33,236 +28,59 @@ public class ClanChannelMember { ClanChannelMember() { } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIII)I", - garbageValue = "-485826730" + descriptor = "(IIII)I", + garbageValue = "1441597193" ) - static final int method775(int var0, int var1, int var2, int var3) { - return var3 * var0 + var2 * var1 >> 16; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "2" - ) - static int method776(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; + public static int method771(int var0, int var1, int var2) { + var2 &= 3; + if (var2 == 0) { + return var1; + } else if (var2 == 1) { + return 7 - var0; } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; + return var2 == 2 ? 7 - var1 : var0; } } - @ObfuscatedName("iu") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ldr;I)V", - garbageValue = "-973066355" + descriptor = "(Lln;Lvd;I)Llx;", + garbageValue = "2045853930" ) - static final void method777(Actor var0) { - int var2; - int var3; - int var4; - int var6; - if (var0.targetIndex != -1) { - Object var1 = null; - var2 = 65536; - if (var0.targetIndex < var2) { - var1 = Client.npcs[var0.targetIndex]; - } else { - var1 = Client.players[var0.targetIndex - var2]; - } - - if (var1 != null) { - var3 = var0.x - ((Actor)var1).x; - var4 = var0.y - ((Actor)var1).y; - if (var3 != 0 || var4 != 0) { - var6 = (int)(Math.atan2((double)var3, (double)var4) * 325.94932345220167D) & 2047; - var0.orientation = var6; - } - } else if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - } - - int var7; - if (var0.pathLength == 0 || var0.field1021 > 0) { - var7 = -1; - if (var0.field988 != -1 && var0.field989 != -1) { - var2 = var0.field988 * 128 - UrlRequester.baseX * 128 + 64; - var3 = var0.field989 * 128 - class47.baseY * 128 + 64; - var4 = var0.x - var2; - int var8 = var0.y - var3; - if (var4 != 0 || var8 != 0) { - var6 = (int)(Math.atan2((double)var4, (double)var8) * 325.94932345220167D) & 2047; - var7 = var6; - } - } else if (var0.movingOrientation != -1) { - var7 = var0.movingOrientation; - } - - if (var7 != -1) { - var0.orientation = var7; - if (var0.field959) { - var0.rotation = var0.orientation; - } - } - - var0.method521(); - } - - var7 = var0.orientation - var0.rotation & 2047; - if (var7 != 0) { - boolean var10 = true; - boolean var11 = true; - ++var0.field1010; - var4 = var7 > 1024 ? -1 : 1; - var0.rotation += var0.field1017 * var4; - boolean var12 = true; - if (var7 < var0.field1017 || var7 > 2048 - var0.field1017) { - var0.rotation = var0.orientation; - var12 = false; - } - - if (var0.field1017 > 0 && var0.movementSequence == var0.idleSequence && (var0.field1010 > 25 || var12)) { - if (var4 == -1 && var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else if (var4 == 1 && var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - - var0.rotation &= 2047; + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = class306.method1639(); + var2.clientPacket = var0; + var2.clientPacketLength = var0.length; + if (var2.clientPacketLength == -1) { + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); + } else if (var2.clientPacketLength <= 18) { + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { + var2.packetBuffer = new PacketBuffer(100); } else { - if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - var0.field1010 = 0; + var2.packetBuffer = new PacketBuffer(260); } + var2.packetBuffer.setIsaacCipher(var1); + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); + var2.index = 0; + return var2; } - @ObfuscatedName("me") + @ObfuscatedName("ms") @ObfuscatedSignature( - descriptor = "(Lmi;B)V", - garbageValue = "70" + descriptor = "(Lnm;I)V", + garbageValue = "1124709425" ) - static final void method778(Widget var0) { - String var1; - int var2; - int var3; - if (var0.buttonType == 1) { - var1 = var0.buttonText; - var2 = var0.id; - var3 = var0.itemId; - UserComparator8.insertMenuItem(var1, "", 24, 0, 0, var2, var3, false); - } - - int var4; - String var9; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var1 = class300.Widget_getSpellActionName(var0); - if (var1 != null) { - var9 = MoveSpeed.colorStartTag(65280) + var0.field3097; - var3 = var0.id; - var4 = var0.itemId; - UserComparator8.insertMenuItem(var1, var9, 25, 0, -1, var3, var4, false); - } - } - - if (var0.buttonType == 3) { - class385.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - class385.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - class385.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - class385.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - if (var0.isIf3) { - int var5; - int var6; - int var7; - String var11; - String var12; - if (Client.isSpellSelected) { - var2 = NewShit.getWidgetFlags(var0); - boolean var10 = (var2 >> 21 & 1) != 0; - if (var10 && (Canvas.selectedSpellFlags & 32) == 32) { - var11 = Client.field600; - var12 = Client.field601 + " " + "->" + " " + var0.dataText; - var5 = var0.childIndex; - var6 = var0.id; - var7 = var0.itemId; - UserComparator8.insertMenuItem(var11, var12, 58, 0, var5, var6, var7, false); - } - } else { - for (int var16 = 9; var16 >= 5; --var16) { - var4 = NewShit.getWidgetFlags(var0); - boolean var14 = (var4 >> var16 + 1 & 1) != 0; - if (!var14 && var0.onOp == null) { - var9 = null; - } else if (var0.actions != null && var0.actions.length > var16 && var0.actions[var16] != null && var0.actions[var16].trim().length() != 0) { - var9 = var0.actions[var16]; - } else { - var9 = null; - } - - if (var9 != null) { - var12 = var0.dataText; - var5 = var16 + 1; - var6 = var0.childIndex; - var7 = var0.id; - int var8 = var0.itemId; - UserComparator8.insertMenuItem(var9, var12, 1007, var5, var6, var7, var8, false); - } - } - - var1 = class300.Widget_getSpellActionName(var0); - if (var1 != null) { - var9 = var0.dataText; - var3 = var0.childIndex; - var4 = var0.id; - var5 = var0.itemId; - UserComparator8.insertMenuItem(var1, var9, 25, 0, var3, var4, var5, false); - } - - for (var2 = 4; var2 >= 0; --var2) { - var5 = NewShit.getWidgetFlags(var0); - boolean var15 = (var5 >> var2 + 1 & 1) != 0; - if (!var15 && var0.onOp == null) { - var11 = null; - } else if (var0.actions != null && var0.actions.length > var2 && var0.actions[var2] != null && var0.actions[var2].trim().length() != 0) { - var11 = var0.actions[var2]; - } else { - var11 = null; - } - - if (var11 != null) { - UserComparator8.insertMenuItem(var11, var0.dataText, 57, var2 + 1, var0.childIndex, var0.id, var0.itemId, var0.prioritizeMenuEntry); - } - } - - var3 = NewShit.getWidgetFlags(var0); - boolean var13 = (var3 & 1) != 0; - if (var13) { - class385.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } - } + @Export("invalidateWidget") + public static void invalidateWidget(Widget var0) { + if (var0 != null && var0.cycle == Client.field523) { + Client.field408[var0.rootIndex] = true; } } diff --git a/osrs/src/main/java/ClanMate.java b/osrs/src/main/java/ClanMate.java index 62c1b2b9c..d19254b30 100644 --- a/osrs/src/main/java/ClanMate.java +++ b/osrs/src/main/java/ClanMate.java @@ -3,18 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qx") +@ObfuscatedName("rm") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lra;" ) @Export("friend") TriBool friend; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lra;" ) @Export("ignored") TriBool ignored; @@ -24,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "298547326" + garbageValue = "-1815552840" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1361963631" + garbageValue = "-709167908" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public final boolean isFriend() { return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("at") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "9" + descriptor = "(I)V", + garbageValue = "-1239857697" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = class299.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.friend = InvDefinition.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "678229771" + garbageValue = "-1599253716" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("ap") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "166606102" ) @Export("isIgnored") public final boolean isIgnored() { @@ -84,11 +84,11 @@ public final boolean isIgnored() { @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-63" + descriptor = "(I)V", + garbageValue = "-1341614247" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = class299.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.ignored = InvDefinition.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } } \ No newline at end of file diff --git a/osrs/src/main/java/ClanSettings.java b/osrs/src/main/java/ClanSettings.java index 6d96f8087..b2b385840 100644 --- a/osrs/src/main/java/ClanSettings.java +++ b/osrs/src/main/java/ClanSettings.java @@ -3,95 +3,95 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("gi") @Implements("ClanSettings") public class ClanSettings { - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("useHashes") boolean useHashes; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("useNames") boolean useNames; - @ObfuscatedName("at") - long field1377; - @ObfuscatedName("ac") - public int field1388; - @ObfuscatedName("ai") + @ObfuscatedName("ax") + long field1363; + @ObfuscatedName("ao") + public int field1375; + @ObfuscatedName("ah") @Export("name") public String name; - @ObfuscatedName("az") - int field1374; - @ObfuscatedName("ap") + @ObfuscatedName("ar") + int field1360; + @ObfuscatedName("ab") @Export("allowGuests") public boolean allowGuests; + @ObfuscatedName("am") + public byte field1371; + @ObfuscatedName("av") + public byte field1372; + @ObfuscatedName("ag") + public byte field1370; @ObfuscatedName("aa") - public byte field1383; - @ObfuscatedName("af") - public byte field1385; - @ObfuscatedName("ad") - public byte field1384; - @ObfuscatedName("aq") - public byte field1386; - @ObfuscatedName("al") + public byte field1369; + @ObfuscatedName("ap") @Export("memberCount") public int memberCount; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("memberHashes") long[] memberHashes; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("memberRanks") public byte[] memberRanks; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("ag") - int[] field1376; - @ObfuscatedName("am") - public int[] field1393; - @ObfuscatedName("ax") - public boolean[] field1382; - @ObfuscatedName("ah") + @ObfuscatedName("an") + int[] field1362; + @ObfuscatedName("au") + public int[] field1379; + @ObfuscatedName("ai") + public boolean[] field1368; + @ObfuscatedName("ae") @Export("currentOwner") public int currentOwner; - @ObfuscatedName("as") - public int field1391; - @ObfuscatedName("ay") + @ObfuscatedName("aw") + public int field1378; + @ObfuscatedName("aq") @Export("bannedMemberCount") public int bannedMemberCount; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("bannedMemberHashes") long[] bannedMemberHashes; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("memberNames") public String[] memberNames; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("bannedMemberNames") public String[] bannedMemberNames; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lsf;" + descriptor = "Ltp;" ) @Export("parameters") IterableNodeHashTable parameters; @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;)V" ) public ClanSettings(Buffer var1) { - this.field1388 = 0; + this.field1375 = 0; this.name = null; - this.field1374 = 0; + this.field1360 = 0; this.currentOwner = -1; - this.field1391 = -1; - this.method825(var1); + this.field1378 = -1; + this.method831(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1511272498" + descriptor = "(IB)V", + garbageValue = "-22" ) - void method806(int var1) { + void method811(int var1) { if (this.useHashes) { if (this.memberHashes != null) { System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); @@ -114,32 +114,32 @@ void method806(int var1) { this.memberRanks = new byte[var1]; } - if (this.field1376 != null) { - System.arraycopy(this.field1376, 0, this.field1376 = new int[var1], 0, this.memberCount); + if (this.field1362 != null) { + System.arraycopy(this.field1362, 0, this.field1362 = new int[var1], 0, this.memberCount); } else { - this.field1376 = new int[var1]; + this.field1362 = new int[var1]; } - if (this.field1393 != null) { - System.arraycopy(this.field1393, 0, this.field1393 = new int[var1], 0, this.memberCount); + if (this.field1379 != null) { + System.arraycopy(this.field1379, 0, this.field1379 = new int[var1], 0, this.memberCount); } else { - this.field1393 = new int[var1]; + this.field1379 = new int[var1]; } - if (this.field1382 != null) { - System.arraycopy(this.field1382, 0, this.field1382 = new boolean[var1], 0, this.memberCount); + if (this.field1368 != null) { + System.arraycopy(this.field1368, 0, this.field1368 = new boolean[var1], 0, this.memberCount); } else { - this.field1382 = new boolean[var1]; + this.field1368 = new boolean[var1]; } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "7" + garbageValue = "25" ) - void method807(int var1) { + void method812(int var1) { if (this.useHashes) { if (this.bannedMemberHashes != null) { System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); @@ -158,12 +158,12 @@ void method807(int var1) { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-849658856" + garbageValue = "-288941295" ) - public int method808(String var1) { + public int method813(String var1) { if (var1 != null && var1.length() != 0) { for (int var2 = 0; var2 < this.memberCount; ++var2) { if (this.memberNames[var2].equals(var1)) { @@ -177,20 +177,20 @@ public int method808(String var1) { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "1158045265" + garbageValue = "1759031552" ) - public int method809(int var1, int var2, int var3) { + public int method814(int var1, int var2, int var3) { int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; - return (this.field1376[var1] & var4) >>> var2; + return (this.field1362[var1] & var4) >>> var2; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/Integer;", - garbageValue = "1038796157" + garbageValue = "1853842367" ) @Export("getTitleGroupValue") public Integer getTitleGroupValue(int var1) { @@ -202,10 +202,10 @@ public Integer getTitleGroupValue(int var1) { } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "-521962752" + garbageValue = "1632099437" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -221,29 +221,29 @@ public int[] getSortedMembers() { } int[] var3 = this.sortedMembers; - VerticalAlignment.method998(var1, var3, 0, var1.length - 1); + class161.method846(var1, var3, 0, var1.length - 1); } return this.sortedMembers; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;IB)V", - garbageValue = "-21" + descriptor = "(JLjava/lang/String;II)V", + garbageValue = "597392143" ) - void method812(long var1, String var3, int var4) { + void method817(long var1, String var3, int var4) { if (var3 != null && var3.length() == 0) { var3 = null; } - if (this.useHashes != var1 > 0L) { + if (var1 > 0L != this.useHashes) { throw new RuntimeException(""); } else if (this.useNames != (var3 != null)) { throw new RuntimeException(""); } else { if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { - this.method806(this.memberCount + 5); + this.method811(this.memberCount + 5); } if (this.memberHashes != null) { @@ -261,20 +261,20 @@ void method812(long var1, String var3, int var4) { this.memberRanks[this.memberCount] = 0; } - this.field1376[this.memberCount] = 0; - this.field1393[this.memberCount] = var4; - this.field1382[this.memberCount] = false; + this.field1362[this.memberCount] = 0; + this.field1379[this.memberCount] = var4; + this.field1368[this.memberCount] = false; ++this.memberCount; this.sortedMembers = null; } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-22" + garbageValue = "45" ) - void method813(int var1) { + void method818(int var1) { if (var1 >= 0 && var1 < this.memberCount) { --this.memberCount; this.sortedMembers = null; @@ -282,16 +282,16 @@ void method813(int var1) { this.memberHashes = null; this.memberNames = null; this.memberRanks = null; - this.field1376 = null; - this.field1393 = null; - this.field1382 = null; + this.field1362 = null; + this.field1379 = null; + this.field1368 = null; this.currentOwner = -1; - this.field1391 = -1; + this.field1378 = -1; } else { System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); - System.arraycopy(this.field1376, var1 + 1, this.field1376, var1, this.memberCount - var1); - System.arraycopy(this.field1393, var1 + 1, this.field1393, var1, this.memberCount - var1); - System.arraycopy(this.field1382, var1 + 1, this.field1382, var1, this.memberCount - var1); + System.arraycopy(this.field1362, var1 + 1, this.field1362, var1, this.memberCount - var1); + System.arraycopy(this.field1379, var1 + 1, this.field1379, var1, this.memberCount - var1); + System.arraycopy(this.field1368, var1 + 1, this.field1368, var1, this.memberCount - var1); if (this.memberHashes != null) { System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); } @@ -308,32 +308,32 @@ void method813(int var1) { } } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1152334560" + garbageValue = "-645370304" ) @Export("updateOwner") void updateOwner() { if (this.memberCount == 0) { this.currentOwner = -1; - this.field1391 = -1; + this.field1378 = -1; } else { this.currentOwner = -1; - this.field1391 = -1; + this.field1378 = -1; int var1 = 0; byte var2 = this.memberRanks[0]; for (int var3 = 1; var3 < this.memberCount; ++var3) { if (this.memberRanks[var3] > var2) { if (var2 == 125) { - this.field1391 = var1; + this.field1378 = var1; } var1 = var3; var2 = this.memberRanks[var3]; - } else if (this.field1391 == -1 && this.memberRanks[var3] == 125) { - this.field1391 = var3; + } else if (this.field1378 == -1 && this.memberRanks[var3] == 125) { + this.field1378 = var3; } } @@ -345,23 +345,23 @@ void updateOwner() { } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;I)V", - garbageValue = "-1457470912" + garbageValue = "1288611513" ) - void method815(long var1, String var3) { + void method820(long var1, String var3) { if (var3 != null && var3.length() == 0) { var3 = null; } if (this.useHashes != var1 > 0L) { throw new RuntimeException(""); - } else if (var3 != null != this.useNames) { + } else if (this.useNames != (var3 != null)) { throw new RuntimeException(""); } else { if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { - this.method807(this.bannedMemberCount + 5); + this.method812(this.bannedMemberCount + 5); } if (this.bannedMemberHashes != null) { @@ -376,12 +376,12 @@ void method815(long var1, String var3) { } } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "509826850" + garbageValue = "-1133861013" ) - void method816(int var1) { + void method821(int var1) { --this.bannedMemberCount; if (this.bannedMemberCount == 0) { this.bannedMemberHashes = null; @@ -398,14 +398,14 @@ void method816(int var1) { } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(IBB)I", - garbageValue = "91" + garbageValue = "110" ) - int method817(int var1, byte var2) { + int method822(int var1, byte var2) { if (var2 != 126 && var2 != 127) { - if (this.currentOwner == var1 && (this.field1391 == -1 || this.memberRanks[this.field1391] < 125)) { + if (this.currentOwner == var1 && (this.field1378 == -1 || this.memberRanks[this.field1378] < 125)) { return -1; } else if (this.memberRanks[var1] == var2) { return -1; @@ -419,15 +419,15 @@ int method817(int var1, byte var2) { } } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1652565060" + garbageValue = "848193095" ) - boolean method818(int var1) { + boolean method823(int var1) { if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { this.memberRanks[this.currentOwner] = 125; - this.field1391 = this.currentOwner; + this.field1378 = this.currentOwner; this.memberRanks[var1] = 126; this.currentOwner = var1; return true; @@ -436,47 +436,47 @@ boolean method818(int var1) { } } - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(IZI)I", - garbageValue = "-1953931812" + garbageValue = "345939318" ) - int method819(int var1, boolean var2) { - if (this.field1382[var1] == var2) { + int method824(int var1, boolean var2) { + if (this.field1368[var1] == var2) { return -1; } else { - this.field1382[var1] = var2; + this.field1368[var1] = var2; return var1; } } - @ObfuscatedName("ar") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IIIII)I", - garbageValue = "-637099928" + descriptor = "(IIIIB)I", + garbageValue = "-29" ) - int method820(int var1, int var2, int var3, int var4) { + int method825(int var1, int var2, int var3, int var4) { int var5 = (1 << var3) - 1; int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; int var7 = var6 ^ var5; var2 <<= var3; var2 &= var7; - int var8 = this.field1376[var1]; + int var8 = this.field1362[var1]; if ((var8 & var7) == var2) { return -1; } else { var8 &= ~var7; - this.field1376[var1] = var8 | var2; + this.field1362[var1] = var8 | var2; return var1; } } - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-2075021651" + garbageValue = "585633360" ) - boolean method821(int var1, int var2) { + boolean method826(int var1, int var2) { if (this.parameters != null) { Node var3 = this.parameters.get((long)var1); if (var3 != null) { @@ -500,12 +500,12 @@ boolean method821(int var1, int var2) { return true; } - @ObfuscatedName("ag") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IIIIB)Z", - garbageValue = "0" + descriptor = "(IIIII)Z", + garbageValue = "-420623843" ) - boolean method822(int var1, int var2, int var3, int var4) { + boolean method827(int var1, int var2, int var3, int var4) { int var5 = (1 << var3) - 1; int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; int var7 = var6 ^ var5; @@ -535,8 +535,8 @@ boolean method822(int var1, int var2, int var3, int var4) { return true; } - @ObfuscatedName("am") - boolean method823(int var1, long var2) { + @ObfuscatedName("au") + boolean method829(int var1, long var2) { if (this.parameters != null) { Node var4 = this.parameters.get((long)var1); if (var4 != null) { @@ -560,12 +560,12 @@ boolean method823(int var1, long var2) { return true; } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Z", - garbageValue = "-713995944" + descriptor = "(ILjava/lang/String;B)Z", + garbageValue = "0" ) - boolean method824(int var1, String var2) { + boolean method830(int var1, String var2) { if (var2 == null) { var2 = ""; } else if (var2.length() > 80) { @@ -598,12 +598,12 @@ boolean method824(int var1, String var2) { return true; } - @ObfuscatedName("ah") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "633008304" + descriptor = "(Lul;I)V", + garbageValue = "1254240423" ) - void method825(Buffer var1) { + void method831(Buffer var1) { int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 6) { int var3 = var1.readUnsignedByte(); @@ -625,10 +625,10 @@ void method825(Buffer var1) { this.bannedMemberNames = null; } - this.field1388 = var1.readInt(); - this.field1374 = var1.readInt(); - if (var2 <= 3 && this.field1374 != 0) { - this.field1374 += 16912800; + this.field1375 = var1.readInt(); + this.field1360 = var1.readInt(); + if (var2 <= 3 && this.field1360 != 0) { + this.field1360 += 16912800; } this.memberCount = var1.readUnsignedShort(); @@ -639,10 +639,10 @@ void method825(Buffer var1) { } this.allowGuests = var1.readUnsignedByte() == 1; - this.field1383 = var1.readByte(); - this.field1385 = var1.readByte(); - this.field1384 = var1.readByte(); - this.field1386 = var1.readByte(); + this.field1371 = var1.readByte(); + this.field1372 = var1.readByte(); + this.field1370 = var1.readByte(); + this.field1369 = var1.readByte(); int var4; if (this.memberCount > 0) { if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { @@ -657,16 +657,16 @@ void method825(Buffer var1) { this.memberRanks = new byte[this.memberCount]; } - if (this.field1376 == null || this.field1376.length < this.memberCount) { - this.field1376 = new int[this.memberCount]; + if (this.field1362 == null || this.field1362.length < this.memberCount) { + this.field1362 = new int[this.memberCount]; } - if (this.field1393 == null || this.field1393.length < this.memberCount) { - this.field1393 = new int[this.memberCount]; + if (this.field1379 == null || this.field1379.length < this.memberCount) { + this.field1379 = new int[this.memberCount]; } - if (this.field1382 == null || this.field1382.length < this.memberCount) { - this.field1382 = new boolean[this.memberCount]; + if (this.field1368 == null || this.field1368.length < this.memberCount) { + this.field1368 = new boolean[this.memberCount]; } for (var4 = 0; var4 < this.memberCount; ++var4) { @@ -680,19 +680,19 @@ void method825(Buffer var1) { this.memberRanks[var4] = var1.readByte(); if (var2 >= 2) { - this.field1376[var4] = var1.readInt(); + this.field1362[var4] = var1.readInt(); } if (var2 >= 5) { - this.field1393[var4] = var1.readUnsignedShort(); + this.field1379[var4] = var1.readUnsignedShort(); } else { - this.field1393[var4] = 0; + this.field1379[var4] = 0; } if (var2 >= 6) { - this.field1382[var4] = var1.readUnsignedByte() == 1; + this.field1368[var4] = var1.readUnsignedByte() == 1; } else { - this.field1382[var4] = false; + this.field1368[var4] = false; } } @@ -722,7 +722,7 @@ void method825(Buffer var1) { if (var2 >= 3) { var4 = var1.readUnsignedShort(); if (var4 > 0) { - this.parameters = new IterableNodeHashTable(var4 < 16 ? WorldMapIcon_1.method1401(var4) : 16); + this.parameters = new IterableNodeHashTable(var4 < 16 ? EnumComposition.method999(var4) : 16); while (var4-- > 0) { int var5 = var1.readInt(); @@ -746,4 +746,37 @@ void method825(Buffer var1) { throw new RuntimeException("" + var2); } } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(ZZI)Lun;", + garbageValue = "-1436227031" + ) + static IndexedSprite method828(boolean var0, boolean var1) { + return var0 ? (var1 ? ClanChannel.field1409 : class534.options_buttons_2Sprite) : (var1 ? class305.field2513 : class519.options_buttons_0Sprite); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "116" + ) + static int method810(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else if (var1 == -1) { + return 0; + } else { + int var3 = 0; + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; + } + } + + return var3; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Client.java b/osrs/src/main/java/Client.java index 71b681489..2cf14f4a1 100644 --- a/osrs/src/main/java/Client.java +++ b/osrs/src/main/java/Client.java @@ -6,7 +6,6 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.api.RSClient; import netscape.js.JSObject; import org.json.JSONException; import org.json.JSONObject; @@ -14,972 +13,981 @@ import java.io.IOException; import java.net.Socket; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Future; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; @Implements("Client") @ObfuscatedName("client") -public final class Client extends GameEngine implements Usernamed, OAuthApi, class311 { - boolean shouldProcessClick() { +public final class Client extends GameEngine implements Usernamed, OAuthApi, class325 { + + boolean shouldProcessClick(){ return false; } - @ObfuscatedName("vd") + @ObfuscatedName("vg") @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("vc") + @ObfuscatedName("vp") @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("wd") - public static int field369; - @ObfuscatedName("xy") - static int[] field593; - @ObfuscatedName("uh") - static boolean field400; - @ObfuscatedName("xf") - static int[] field592; - @ObfuscatedName("xm") - @ObfuscatedSignature( - descriptor = "Lcl;" - ) - static final ApproximateRouteStrategy field652; - @ObfuscatedName("vb") - static int field542; - @ObfuscatedName("vw") - @Export("cameraShaking") - static boolean[] cameraShaking; - @ObfuscatedName("vy") + @ObfuscatedName("wp") + public static int field368; + @ObfuscatedName("wk") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lia;" ) - @Export("playerAppearance") - static PlayerComposition playerAppearance; - @ObfuscatedName("vs") - static int field547; - @ObfuscatedName("wx") + static final class232 field651; + @ObfuscatedName("xx") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lcs;" ) - @Export("Widget_cachedModels") - static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("wj") + static final ApproximateRouteStrategy field650; + @ObfuscatedName("xo") + static int[] field592; + @ObfuscatedName("xu") + static int[] field593; + @ObfuscatedName("wu") + static int field548; + @ObfuscatedName("vi") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lni;" ) - @Export("Widget_cachedFonts") - static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("wv") + @Export("playerAppearance") + static PlayerComposition playerAppearance; + @ObfuscatedName("ww") + static int field549; + @ObfuscatedName("wc") @Export("archiveLoaders") static ArrayList archiveLoaders; - @ObfuscatedName("wk") + @ObfuscatedName("xp") @Export("archiveLoadersDone") static int archiveLoadersDone; - @ObfuscatedName("ws") + @ObfuscatedName("vt") + @Export("cameraShakeCycle") + static int[] cameraShakeCycle; + @ObfuscatedName("wa") @ObfuscatedSignature( - descriptor = "Lqv;" + descriptor = "[Log;" ) - @Export("archive5") - static class423 archive5; - @ObfuscatedName("wo") + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("xy") + static int field551; + @ObfuscatedName("wy") @ObfuscatedSignature( - descriptor = "Lsv;" + descriptor = "Lsk;" ) - static class475 field645; - @ObfuscatedName("vl") + static class490 field641; + @ObfuscatedName("vm") + static short field634; + @ObfuscatedName("vc") + static short field633; + @ObfuscatedName("vv") static short field638; - @ObfuscatedName("vp") + @ObfuscatedName("vo") + static short field635; + @ObfuscatedName("vy") static short field640; - @ObfuscatedName("vu") - static short field641; - @ObfuscatedName("vj") - static short field637; - @ObfuscatedName("ve") - static short field634; @ObfuscatedName("vx") @Export("viewportZoom") static int viewportZoom; - @ObfuscatedName("vf") - static short field635; - @ObfuscatedName("vo") + @ObfuscatedName("vw") + static short field639; + @ObfuscatedName("vn") @Export("viewportWidth") static int viewportWidth; - @ObfuscatedName("we") - static int field550; - @ObfuscatedName("vn") + @ObfuscatedName("vl") @Export("viewportHeight") static int viewportHeight; - @ObfuscatedName("vm") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("vi") + @ObfuscatedName("vq") @Export("zoomWidth") static short zoomWidth; - @ObfuscatedName("vq") - @Export("cameraMoveIntensity") - static int[] cameraMoveIntensity; - @ObfuscatedName("vh") - @Export("cameraShakeIntensity") - static int[] cameraShakeIntensity; - @ObfuscatedName("vk") - @Export("cameraShakeSpeed") - static int[] cameraShakeSpeed; - @ObfuscatedName("vz") - @Export("cameraShakeCycle") - static int[] cameraShakeCycle; - @ObfuscatedName("wf") - @ObfuscatedSignature( - descriptor = "[Loh;" - ) - @Export("grandExchangeOffers") - static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("wy") + @ObfuscatedName("vs") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("wg") @ObfuscatedSignature( - descriptor = "Lcu;" + descriptor = "Lcm;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; - @ObfuscatedName("wa") - static int field549; + @ObfuscatedName("wq") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + @Export("archive11") + static EvictingDualNodeHashTable archive11; @ObfuscatedName("wt") - static List field609; - @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + @Export("Widget_cachedModels") + static EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("ws") + static int field547; + @ObfuscatedName("wz") + static List field608; + @ObfuscatedName("wi") + @ObfuscatedSignature( + descriptor = "Lqe;" + ) + static class438 field631; + @ObfuscatedName("bq") @Export("lockMouseRecorder") static boolean lockMouseRecorder; - @ObfuscatedName("bg") + @ObfuscatedName("bw") @Export("worldId") public static int worldId; - @ObfuscatedName("cw") + @ObfuscatedName("ce") @Export("worldProperties") static int worldProperties; - @ObfuscatedName("cm") + @ObfuscatedName("cw") @Export("gameBuild") static int gameBuild; - @ObfuscatedName("cx") + @ObfuscatedName("cg") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("cr") + @ObfuscatedName("cq") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("cv") + @ObfuscatedName("cn") @Export("param21") static int param21; - @ObfuscatedName("co") + @ObfuscatedName("ck") @Export("clientType") static int clientType; - @ObfuscatedName("cl") - static int field424; - @ObfuscatedName("cu") + @ObfuscatedName("cr") + static int field427; + @ObfuscatedName("cs") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("ch") + @ObfuscatedName("cm") @Export("param25") public static int param25; - @ObfuscatedName("dj") + @ObfuscatedName("dm") @Export("gameState") static int gameState; - @ObfuscatedName("di") + @ObfuscatedName("ds") @Export("reloadJS5") static boolean reloadJS5; - @ObfuscatedName("ed") + @ObfuscatedName("eo") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("eh") + @ObfuscatedName("em") @Export("cycle") static int cycle; - @ObfuscatedName("ey") + @ObfuscatedName("el") @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("eq") + @ObfuscatedName("eg") @Export("lastMouseRecordX") static int lastMouseRecordX; - @ObfuscatedName("ej") + @ObfuscatedName("ei") @Export("lastMouseRecordY") static int lastMouseRecordY; - @ObfuscatedName("ea") - static long field612; - @ObfuscatedName("er") + @ObfuscatedName("ex") + static long field610; + @ObfuscatedName("ek") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("ev") + @ObfuscatedName("er") @Export("rebootTimer") static int rebootTimer; @ObfuscatedName("ez") @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("et") + @ObfuscatedName("en") @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("en") + @ObfuscatedName("es") @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("eb") + @ObfuscatedName("eq") @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("ei") + @ObfuscatedName("ej") @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("es") + @ObfuscatedName("et") @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("el") + @ObfuscatedName("eh") @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("em") + @ObfuscatedName("eb") @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("ek") + @ObfuscatedName("ee") @ObfuscatedSignature( - descriptor = "Ldc;" + descriptor = "Lem;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("ec") + @ObfuscatedName("ea") @ObfuscatedSignature( - descriptor = "Ldc;" + descriptor = "Lem;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("eu") + @ObfuscatedName("ey") @Export("renderSelf") static boolean renderSelf; @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldu;" ) - static class92 field419; - @ObfuscatedName("fj") + static class94 field416; + @ObfuscatedName("fd") @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("fv") + @ObfuscatedName("fi") @Export("js5Cycles") static int js5Cycles; - @ObfuscatedName("gg") + @ObfuscatedName("gf") @Export("js5Errors") static int js5Errors; - @ObfuscatedName("gi") + @ObfuscatedName("gm") @Export("loginState") static int loginState; - @ObfuscatedName("go") - static int field448; - @ObfuscatedName("gl") - static int field447; @ObfuscatedName("gb") static int field444; - @ObfuscatedName("gj") + @ObfuscatedName("gx") + static int field448; + @ObfuscatedName("gp") + static int field447; + @ObfuscatedName("gd") @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfn;" ) - static class139 field421; - @ObfuscatedName("ge") + static class141 field419; + @ObfuscatedName("gz") @ObfuscatedSignature( - descriptor = "Ltv;" + descriptor = "Luh;" ) - static class519 field648; - @ObfuscatedName("hl") - static final String field656; - @ObfuscatedName("hg") + static class534 field648; + @ObfuscatedName("ha") + static final String field654; + @ObfuscatedName("hh") static final String field655; - @ObfuscatedName("hm") + @ObfuscatedName("hr") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("hv") + @ObfuscatedName("iv") @ObfuscatedSignature( - descriptor = "Lcc;" + descriptor = "Ldm;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("ie") + @ObfuscatedName("im") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("ij") + @ObfuscatedName("iy") @ObfuscatedSignature( - descriptor = "[Ldx;" + descriptor = "[Ldc;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("in") + @ObfuscatedName("io") @Export("npcCount") static int npcCount; - @ObfuscatedName("ih") + @ObfuscatedName("if") @Export("npcIndices") static int[] npcIndices; + @ObfuscatedName("ij") + static int field450; + @ObfuscatedName("ib") + static int[] field552; @ObfuscatedName("it") - static String field599; - @ObfuscatedName("ir") - static int field451; + static String field598; @ObfuscatedName("ic") - static int[] field552; - @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Lez;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("im") + @ObfuscatedName("ig") @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("id") + @ObfuscatedName("ip") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("iu") + @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lqq;" ) @Export("timer") static Timer timer; - @ObfuscatedName("jn") + @ObfuscatedName("ji") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("jg") - static int field452; - @ObfuscatedName("ji") - static int field453; @ObfuscatedName("jl") - static int field455; - @ObfuscatedName("jj") static int field454; - @ObfuscatedName("jq") + @ObfuscatedName("jy") static int field456; - @ObfuscatedName("jz") + @ObfuscatedName("jv") + static int field455; + @ObfuscatedName("ja") + static int field452; + @ObfuscatedName("je") + static int field453; + @ObfuscatedName("jm") @ObfuscatedSignature( - descriptor = "[Lis;" + descriptor = "[Lih;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("jp") + @ObfuscatedName("jb") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("jf") + @ObfuscatedName("jg") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("jm") - static final int[] field653; - @ObfuscatedName("kb") - static int field457; - @ObfuscatedName("kt") - @ObfuscatedSignature( - descriptor = "Lui;" - ) - @Export("compass") - static SpritePixels compass; - @ObfuscatedName("kx") - static int field462; - @ObfuscatedName("ky") - static int field463; + @ObfuscatedName("km") + static final int[] field652; + @ObfuscatedName("kq") + static int field460; @ObfuscatedName("kp") static int field459; - @ObfuscatedName("kr") - static int field460; + @ObfuscatedName("kf") + static int field458; @ObfuscatedName("kw") - static boolean field382; + static int field461; + @ObfuscatedName("ky") + static int field463; @ObfuscatedName("kv") + static boolean field381; + @ObfuscatedName("kx") @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("kg") + @ObfuscatedName("kd") + @Export("cameraX") + static int cameraX; + @ObfuscatedName("ll") @Export("camAngleX") static int camAngleX; - @ObfuscatedName("lx") + @ObfuscatedName("lh") @Export("camAngleY") static int camAngleY; - @ObfuscatedName("le") + @ObfuscatedName("lm") @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("lu") + @ObfuscatedName("lj") @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("lo") - static int field473; - @ObfuscatedName("ld") - static int field465; - @ObfuscatedName("lm") + @ObfuscatedName("lf") + static int field467; + @ObfuscatedName("li") + static int field470; + @ObfuscatedName("lc") @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("lp") + @ObfuscatedName("lk") @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("ly") - static int field480; - @ObfuscatedName("lg") - static int field468; - @ObfuscatedName("lk") - static int field471; - @ObfuscatedName("lc") + @ObfuscatedName("ls") + static int field478; + @ObfuscatedName("ld") + static int field466; + @ObfuscatedName("lr") + static int field477; + @ObfuscatedName("lb") @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("lv") + @ObfuscatedName("lp") @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("lr") - static int field476; @ObfuscatedName("lt") + public static int field366; + @ObfuscatedName("le") @Export("oculusOrbOnLocalPlayer") static boolean oculusOrbOnLocalPlayer; - @ObfuscatedName("lj") + @ObfuscatedName("lg") @Export("packetIndicator") static int packetIndicator; - @ObfuscatedName("lz") + @ObfuscatedName("ln") @Export("emitPackets") static boolean emitPackets; - @ObfuscatedName("lf") - static int field467; @ObfuscatedName("lq") + static int field476; + @ObfuscatedName("lx") @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("lh") + @ObfuscatedName("lu") @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("li") + @ObfuscatedName("mi") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("ll") + @ObfuscatedName("ma") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("lb") + @ObfuscatedName("mj") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("md") + @ObfuscatedName("mm") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("mh") + @ObfuscatedName("mc") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("mv") + @ObfuscatedName("mw") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("mg") - static int[][] field594; - @ObfuscatedName("mq") + @ObfuscatedName("mx") + static int[][] field595; + @ObfuscatedName("mr") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("mu") - static String[] field603; - @ObfuscatedName("mk") + @ObfuscatedName("mt") + static String[] field602; + @ObfuscatedName("mf") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("mr") + @ObfuscatedName("mz") @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("me") + @ObfuscatedName("mu") @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("mz") + @ObfuscatedName("mq") @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("mc") + @ObfuscatedName("mh") @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("mf") + @ObfuscatedName("ml") @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("ml") + @ObfuscatedName("mn") @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("mj") + @ObfuscatedName("mk") @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("mw") + @ObfuscatedName("ms") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("mp") - static int field486; - @ObfuscatedName("mb") + @ObfuscatedName("me") + static int field481; + @ObfuscatedName("my") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("mi") + @ObfuscatedName("mp") @ObfuscatedSignature( - descriptor = "[Ldf;" + descriptor = "[Ldj;" ) @Export("players") static Player[] players; - @ObfuscatedName("mx") + @ObfuscatedName("mo") @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("my") + @ObfuscatedName("mg") @Export("isMembers") static int isMembers; - @ObfuscatedName("ma") + @ObfuscatedName("nt") @Export("playerUUID") static long playerUUID; - @ObfuscatedName("ms") - static boolean field386; - @ObfuscatedName("nd") + @ObfuscatedName("nv") + static boolean field388; + @ObfuscatedName("nb") @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("ng") + @ObfuscatedName("nm") static int field492; - @ObfuscatedName("nt") - static int[] field564; - @ObfuscatedName("nb") + @ObfuscatedName("nc") + static int[] field561; + @ObfuscatedName("nk") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("ns") + @ObfuscatedName("nn") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("nz") + @ObfuscatedName("na") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("ne") - static int[] field561; - @ObfuscatedName("ni") + @ObfuscatedName("nh") + static int[] field563; + @ObfuscatedName("nw") @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("nr") + @ObfuscatedName("ny") @ObfuscatedSignature( - descriptor = "[[[Low;" + descriptor = "[[[Lpf;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("np") + @ObfuscatedName("nl") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("nn") + @ObfuscatedName("nu") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("nw") + @ObfuscatedName("nj") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("ny") + @ObfuscatedName("nr") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("nk") + @ObfuscatedName("ne") @Export("levels") static int[] levels; - @ObfuscatedName("nj") + @ObfuscatedName("nq") @Export("experience") static int[] experience; - @ObfuscatedName("nu") + @ObfuscatedName("ng") @Export("leftClickOpensMenu") static boolean leftClickOpensMenu; - @ObfuscatedName("nf") + @ObfuscatedName("np") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("om") + @ObfuscatedName("ol") @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("oz") + @ObfuscatedName("oe") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("oh") + @ObfuscatedName("ob") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("oy") + @ObfuscatedName("ok") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("od") + @ObfuscatedName("ou") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("og") + @ObfuscatedName("om") @Export("menuItemIds") static int[] menuItemIds; - @ObfuscatedName("ob") + @ObfuscatedName("oo") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("ok") + @ObfuscatedName("ox") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("on") + @ObfuscatedName("oc") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("oe") + @ObfuscatedName("oz") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("os") + @ObfuscatedName("op") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("ow") + @ObfuscatedName("ov") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("ot") + @ObfuscatedName("od") @Export("viewportX") static int viewportX; - @ObfuscatedName("oc") + @ObfuscatedName("og") @Export("viewportY") static int viewportY; - @ObfuscatedName("oi") - static int field496; - @ObfuscatedName("oq") + @ObfuscatedName("on") static int field498; - @ObfuscatedName("ov") + @ObfuscatedName("ot") + static int field499; + @ObfuscatedName("oa") @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("or") + @ObfuscatedName("pc") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("of") + @ObfuscatedName("pf") @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; + @ObfuscatedName("pj") + static int field503; + @ObfuscatedName("ph") + static String field599; @ObfuscatedName("ps") - @Export("selectedSpellItemId") - static int selectedSpellItemId; - @ObfuscatedName("pa") static String field600; - @ObfuscatedName("pi") - static String field601; - @ObfuscatedName("pj") + @ObfuscatedName("pt") @Export("rootInterface") static int rootInterface; - @ObfuscatedName("pu") + @ObfuscatedName("pw") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Ltf;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("po") - static int field505; - @ObfuscatedName("pv") + @ObfuscatedName("px") static int field508; - @ObfuscatedName("pn") + @ObfuscatedName("pq") + static int field505; + @ObfuscatedName("pd") @Export("chatEffects") static int chatEffects; - @ObfuscatedName("pd") + @ObfuscatedName("pm") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnm;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("px") + @ObfuscatedName("pn") @Export("runEnergy") static int runEnergy; - @ObfuscatedName("pt") + @ObfuscatedName("pu") @Export("weight") static int weight; - @ObfuscatedName("pm") + @ObfuscatedName("pp") @Export("staffModLevel") public static int staffModLevel; - @ObfuscatedName("pe") + @ObfuscatedName("pb") @Export("followerIndex") static int followerIndex; - @ObfuscatedName("pp") + @ObfuscatedName("pe") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("pg") + @ObfuscatedName("pk") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnm;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("ph") + @ObfuscatedName("pr") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnm;" ) @Export("clickedWidget") public static Widget clickedWidget; - @ObfuscatedName("pb") + @ObfuscatedName("pi") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnm;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("pc") + @ObfuscatedName("pz") @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("py") + @ObfuscatedName("qi") @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("pq") + @ObfuscatedName("qb") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnm;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("pw") - static boolean field395; - @ObfuscatedName("qe") + @ObfuscatedName("qw") + static boolean field396; + @ObfuscatedName("qk") + static int field516; + @ObfuscatedName("qg") static int field514; - @ObfuscatedName("qd") - static int field513; - @ObfuscatedName("qn") - static boolean field397; - @ObfuscatedName("qf") - static int field515; - @ObfuscatedName("qr") - static int field521; @ObfuscatedName("qm") + static boolean field394; + @ObfuscatedName("qz") + static int field521; + @ObfuscatedName("ql") + static int field517; + @ObfuscatedName("qn") @Export("isDraggingWidget") static boolean isDraggingWidget; - @ObfuscatedName("ql") + @ObfuscatedName("qr") @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("qo") + @ObfuscatedName("qy") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("qg") + @ObfuscatedName("qf") @Export("changedVarpCount") static int changedVarpCount; - @ObfuscatedName("qx") + @ObfuscatedName("qv") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("qs") + @ObfuscatedName("qa") @Export("changedItemContainersCount") static int changedItemContainersCount; - @ObfuscatedName("qz") + @ObfuscatedName("qs") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("qt") + @ObfuscatedName("qp") @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("qu") - static int[] field572; - @ObfuscatedName("qb") + @ObfuscatedName("qe") + static int[] field571; + @ObfuscatedName("qd") static int field512; - @ObfuscatedName("qp") + @ObfuscatedName("qu") @Export("chatCycle") static int chatCycle; - @ObfuscatedName("qi") - static int field518; - @ObfuscatedName("qy") - static int field524; - @ObfuscatedName("qa") + @ObfuscatedName("qc") static int field511; - @ObfuscatedName("qh") - static int field517; - @ObfuscatedName("ru") - static int field529; - @ObfuscatedName("rh") + @ObfuscatedName("rt") + static int field530; + @ObfuscatedName("rl") static int field525; - @ObfuscatedName("rr") + @ObfuscatedName("rq") static int field528; - @ObfuscatedName("rz") + @ObfuscatedName("rr") + static int field529; + @ObfuscatedName("rm") + static int field526; + @ObfuscatedName("rp") + static int field527; + @ObfuscatedName("re") @Export("mouseWheelRotation") static int mouseWheelRotation; - @ObfuscatedName("rm") + @ObfuscatedName("rc") @ObfuscatedSignature( - descriptor = "Luo;" + descriptor = "Lvz;" ) - static class532 field651; - @ObfuscatedName("rc") + static class547 field649; + @ObfuscatedName("rj") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("rq") + @ObfuscatedName("net/runelite/rs") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) - static NodeDeque field629; - @ObfuscatedName("rs") + static NodeDeque field628; + @ObfuscatedName("rw") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) - static NodeDeque field630; - @ObfuscatedName("rp") + static NodeDeque field629; + @ObfuscatedName("rh") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) - static NodeDeque field628; - @ObfuscatedName("rg") + static NodeDeque field626; + @ObfuscatedName("ru") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Ltf;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("ry") + @ObfuscatedName("rk") @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("rk") - static int field527; - @ObfuscatedName("re") - static boolean[] field407; @ObfuscatedName("rf") + static int field523; + @ObfuscatedName("ro") static boolean[] field408; - @ObfuscatedName("rl") - static boolean[] field409; - @ObfuscatedName("rt") + @ObfuscatedName("rd") + static boolean[] field407; + @ObfuscatedName("rb") + static boolean[] field406; + @ObfuscatedName("rz") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("rx") + @ObfuscatedName("rg") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("rw") + @ObfuscatedName("sz") @Export("rootWidgetWidths") static int[] rootWidgetWidths; - @ObfuscatedName("rn") + @ObfuscatedName("sr") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("ri") + @ObfuscatedName("sm") @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("sq") - static long field615; - @ObfuscatedName("sd") + @ObfuscatedName("sw") + static long field613; + @ObfuscatedName("sl") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("se") - static int[] field579; - @ObfuscatedName("sk") + @ObfuscatedName("sy") + static int[] field580; + @ObfuscatedName("sf") @Export("publicChatMode") static int publicChatMode; - @ObfuscatedName("sn") + @ObfuscatedName("sg") @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("sc") - static String field602; - @ObfuscatedName("si") + @ObfuscatedName("sb") + static String field601; + @ObfuscatedName("se") + @Export("crossWorldMessageIds") static long[] crossWorldMessageIds; - @ObfuscatedName("sr") + @ObfuscatedName("ss") + @Export("crossWorldMessageIdsIndex") static int crossWorldMessageIdsIndex; - @ObfuscatedName("sp") + @ObfuscatedName("sj") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lit;" ) @Export("keyHandlerInstance") - static class212 keyHandlerInstance; - @ObfuscatedName("ss") + static class226 keyHandlerInstance; + @ObfuscatedName("sn") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lib;" ) - static class210 field423; - @ObfuscatedName("sf") - static int field532; + static class224 field422; + @ObfuscatedName("sk") + static int field533; @ObfuscatedName("so") - static int[] field580; - @ObfuscatedName("su") - static int[] field581; - @ObfuscatedName("sx") + static int[] field578; + @ObfuscatedName("sc") + static int[] field577; + @ObfuscatedName("sp") @Export("timeOfPreviousKeyPress") static long timeOfPreviousKeyPress; @ObfuscatedName("tu") @ObfuscatedSignature( - descriptor = "[Lfi;" + descriptor = "[Lgi;" ) @Export("currentClanSettings") static ClanSettings[] currentClanSettings; - @ObfuscatedName("tn") + @ObfuscatedName("tc") @ObfuscatedSignature( - descriptor = "[Lgo;" + descriptor = "[Lgb;" ) @Export("currentClanChannels") static ClanChannel[] currentClanChannels; - @ObfuscatedName("tj") - static int field538; - @ObfuscatedName("tl") + @ObfuscatedName("tm") + static int field539; + @ObfuscatedName("tp") @Export("mapIconCount") static int mapIconCount; - @ObfuscatedName("tq") + @ObfuscatedName("tf") @Export("mapIconXs") static int[] mapIconXs; - @ObfuscatedName("tg") + @ObfuscatedName("ts") @Export("mapIconYs") static int[] mapIconYs; - @ObfuscatedName("tb") + @ObfuscatedName("ty") @ObfuscatedSignature( - descriptor = "[Lui;" + descriptor = "[Lud;" ) @Export("mapIcons") static SpritePixels[] mapIcons; - @ObfuscatedName("tz") + @ObfuscatedName("ta") @Export("destinationX") static int destinationX; - @ObfuscatedName("ti") + @ObfuscatedName("te") @Export("destinationY") static int destinationY; - @ObfuscatedName("ta") + @ObfuscatedName("tg") @Export("minimapState") static int minimapState; - @ObfuscatedName("tp") + @ObfuscatedName("tk") @Export("playingJingle") static boolean playingJingle; - @ObfuscatedName("tt") + @ObfuscatedName("uz") @Export("soundEffectCount") static int soundEffectCount; - @ObfuscatedName("tf") + @ObfuscatedName("uq") @Export("soundEffectIds") static int[] soundEffectIds; - @ObfuscatedName("tv") + @ObfuscatedName("ug") @Export("queuedSoundEffectLoops") static int[] queuedSoundEffectLoops; - @ObfuscatedName("ua") + @ObfuscatedName("uu") @Export("queuedSoundEffectDelays") static int[] queuedSoundEffectDelays; - @ObfuscatedName("uj") + @ObfuscatedName("ua") @Export("soundLocations") static int[] soundLocations; - @ObfuscatedName("uu") + @ObfuscatedName("um") @ObfuscatedSignature( - descriptor = "[Lbp;" + descriptor = "[Lbr;" ) @Export("soundEffects") static SoundEffect[] soundEffects; - @ObfuscatedName("ut") + @ObfuscatedName("ub") @Export("isCameraLocked") static boolean isCameraLocked; - @ObfuscatedName("ur") + @ObfuscatedName("uk") static boolean field402; - @ObfuscatedName("ux") - static boolean field404; - @ObfuscatedName("uo") + @ObfuscatedName("uh") static boolean field401; - @ObfuscatedName("uv") + @ObfuscatedName("uw") + static boolean field403; + @ObfuscatedName("uf") @ObfuscatedSignature( - descriptor = "Lsn;" + descriptor = "Lth;" ) - static class479 field642; - @ObfuscatedName("ue") + static class494 field646; + @ObfuscatedName("un") @ObfuscatedSignature( - descriptor = "Lsy;" + descriptor = "Lsp;" ) - static class478 field646; - @ObfuscatedName("uy") + static class493 field643; + @ObfuscatedName("ud") @ObfuscatedSignature( - descriptor = "Lsy;" + descriptor = "Lsp;" ) - static class478 field647; - @ObfuscatedName("gz") - String field665; - @ObfuscatedName("gn") + static class493 field642; + @ObfuscatedName("ue") + static boolean field400; + @ObfuscatedName("vf") + @Export("cameraShaking") + static boolean[] cameraShaking; + @ObfuscatedName("vj") + @Export("cameraShakeIntensity") + static int[] cameraShakeIntensity; + @ObfuscatedName("vu") + @Export("cameraMoveIntensity") + static int[] cameraMoveIntensity; + @ObfuscatedName("ve") + @Export("cameraShakeSpeed") + static int[] cameraShakeSpeed; + @ObfuscatedName("hi") + String field664; + @ObfuscatedName("hf") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Las;" ) - class14 field658; - @ObfuscatedName("ht") + class14 field659; + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "Lax;" + descriptor = "Lai;" ) - class18 field660; - @ObfuscatedName("ho") + class18 field658; + @ObfuscatedName("hy") @ObfuscatedSignature( descriptor = "Lcom/jagex/oldscape/pub/OtlTokenRequester;" ) - OtlTokenRequester field662; - @ObfuscatedName("hj") - Future field666; - @ObfuscatedName("hh") - boolean field661; - @ObfuscatedName("hi") - int field664; + OtlTokenRequester field661; + @ObfuscatedName("hl") + Future field665; + @ObfuscatedName("hm") + boolean field660; @ObfuscatedName("hd") + int field663; + @ObfuscatedName("hs") @ObfuscatedSignature( - descriptor = "Lax;" + descriptor = "Lai;" ) - class18 field659; + class18 field657; @ObfuscatedName("hk") @ObfuscatedSignature( descriptor = "Lcom/jagex/oldscape/pub/RefreshAccessTokenRequester;" ) - RefreshAccessTokenRequester field663; - @ObfuscatedName("hz") - Future field667; - @ObfuscatedName("ib") + RefreshAccessTokenRequester field662; + @ObfuscatedName("hn") + Future field666; + @ObfuscatedName("ie") @ObfuscatedSignature( - descriptor = "Ltm;" + descriptor = "Lul;" ) - Buffer field669; - @ObfuscatedName("il") + Buffer field668; + @ObfuscatedName("in") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Lab;" ) - class7 field657; - @ObfuscatedName("ig") - long field668; + class7 field656; + @ObfuscatedName("is") + long field667; static { lockMouseRecorder = true; @@ -990,9 +998,9 @@ boolean shouldProcessClick() { isLowDetail = false; param21 = -1; clientType = -1; - field424 = -1; + field427 = -1; onMobile = false; - param25 = 216; + param25 = 217; gameState = 0; reloadJS5 = false; isLoading = true; @@ -1000,7 +1008,7 @@ boolean shouldProcessClick() { mouseLastLastPressedTimeMillis = -1L; lastMouseRecordX = -1; lastMouseRecordY = -1; - field612 = -1L; + field610 = -1L; hadFocus = true; rebootTimer = 0; hintArrowType = 0; @@ -1014,93 +1022,77 @@ boolean shouldProcessClick() { playerAttackOption = AttackOption.AttackOption_hidden; npcAttackOption = AttackOption.AttackOption_hidden; renderSelf = false; - field419 = class92.field940; + field416 = class94.field929; js5ConnectState = 0; js5Cycles = 0; js5Errors = 0; loginState = 0; + field444 = 0; field448 = 0; field447 = 0; - field444 = 0; - field421 = class139.field1320; - field648 = class519.field4205; - int var2 = "com_jagex_auth_desktop_osrs:public".length(); - byte[] var3 = new byte[var2]; - - int var4; - char var5; - for (var4 = 0; var4 < var2; ++var4) { - var5 = "com_jagex_auth_desktop_osrs:public".charAt(var4); - if (var5 > 127) { - var3[var4] = 63; - } else { - var3[var4] = (byte)var5; - } - } - - String var0 = class11.method32(var3, 0, var3.length); - field656 = var0; - var2 = "com_jagex_auth_desktop_runelite:public".length(); - var3 = new byte[var2]; - - for (var4 = 0; var4 < var2; ++var4) { - var5 = "com_jagex_auth_desktop_runelite:public".charAt(var4); - if (var5 > 127) { - var3[var4] = 63; + field419 = class141.field1312; + field648 = class534.field4231; + int var1 = "com_jagex_auth_desktop_osrs:public".length(); + byte[] var2 = new byte[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = "com_jagex_auth_desktop_osrs:public".charAt(var3); + if (var4 > 127) { + var2[var3] = 63; } else { - var3[var4] = (byte)var5; + var2[var3] = (byte)var4; } } - var0 = class11.method32(var3, 0, var3.length); - field655 = var0; + field654 = class233.method1199(var2); + field655 = class233.method1199(FriendSystem.method399("com_jagex_auth_desktop_runelite:public")); Login_isUsernameRemembered = false; secureRandomFuture = new SecureRandomFuture(); randomDatData = null; npcs = new NPC[65536]; npcCount = 0; npcIndices = new int[65536]; - field451 = 0; + field450 = 0; field552 = new int[250]; packetWriter = new PacketWriter(); logoutTimer = 0; hadNetworkError = false; timer = new Timer(); fontsMap = new HashMap(); - field452 = 0; - field453 = 1; + field454 = 0; + field456 = 1; field455 = 0; - field454 = 1; - field456 = 0; + field452 = 1; + field453 = 0; collisionMaps = new CollisionMap[4]; isInInstance = false; instanceChunkTemplates = new int[4][13][13]; - field653 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; - field457 = 0; - field462 = 2301979; - field463 = 5063219; - field459 = 3353893; - field460 = 7759444; - field382 = false; + field652 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; + field460 = 0; + field459 = 2301979; + field458 = 5063219; + field461 = 3353893; + field463 = 7759444; + field381 = false; alternativeScrollbarWidth = 0; camAngleX = 128; camAngleY = 0; camAngleDY = 0; camAngleDX = 0; - field473 = 0; - field465 = 0; + field467 = 0; + field470 = 0; oculusOrbState = 0; camFollowHeight = 50; - field480 = 0; - field468 = 0; - field471 = 0; + field478 = 0; + field466 = 0; + field477 = 0; oculusOrbNormalSpeed = 12; oculusOrbSlowedSpeed = 6; - field476 = 0; + field366 = 0; oculusOrbOnLocalPlayer = false; packetIndicator = 0; emitPackets = false; - field467 = 0; + field476 = 0; overheadTextLimit = 0; overheadTextCount = 50; overheadTextXs = new int[overheadTextCount]; @@ -1109,9 +1101,9 @@ boolean shouldProcessClick() { overheadTextXOffsets = new int[overheadTextCount]; overheadTextColors = new int[overheadTextCount]; overheadTextEffects = new int[overheadTextCount]; - field594 = new int[overheadTextCount][]; + field595 = new int[overheadTextCount][]; overheadTextCyclesRemaining = new int[overheadTextCount]; - field603 = new String[overheadTextCount]; + field602 = new String[overheadTextCount]; tileLastDrawnActor = new int[104][104]; viewportDrawCount = 0; viewportTempX = -1; @@ -1121,20 +1113,20 @@ boolean shouldProcessClick() { mouseCrossState = 0; mouseCrossColor = 0; showMouseCross = true; - field486 = 0; + field481 = 0; showLoadingMessages = true; players = new Player[2048]; localPlayerIndex = -1; isMembers = 0; playerUUID = -1L; - field386 = true; + field388 = true; drawPlayerNames = 0; field492 = 0; - field564 = new int[1000]; + field561 = new int[1000]; playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; playerMenuActions = new String[8]; playerOptionsPriorities = new boolean[8]; - field561 = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; + field563 = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; combatTargetPlayerIndex = -1; groundItems = new NodeDeque[4][104][104]; pendingSpawns = new NodeDeque(); @@ -1159,19 +1151,19 @@ boolean shouldProcessClick() { showMouseOverText = true; viewportX = -1; viewportY = -1; - field496 = 0; - field498 = 50; + field498 = 0; + field499 = 50; isItemSelected = 0; - field599 = null; + field598 = null; isSpellSelected = false; selectedSpellChildIndex = -1; - selectedSpellItemId = -1; + field503 = -1; + field599 = null; field600 = null; - field601 = null; rootInterface = -1; interfaceParents = new NodeHashTable(8); - field505 = 0; - field508 = -1; + field508 = 0; + field505 = -1; chatEffects = 0; meslayerContinueWidget = null; runEnergy = 0; @@ -1185,12 +1177,12 @@ boolean shouldProcessClick() { widgetClickX = 0; widgetClickY = 0; draggedOnWidget = null; - field395 = false; + field396 = false; + field516 = -1; field514 = -1; - field513 = -1; - field397 = false; - field515 = -1; + field394 = false; field521 = -1; + field517 = -1; isDraggingWidget = false; cycleCntr = 1; changedVarps = new int[32]; @@ -1199,50 +1191,50 @@ boolean shouldProcessClick() { changedItemContainersCount = 0; changedSkills = new int[32]; changedSkillsCount = 0; - field572 = new int[32]; + field571 = new int[32]; field512 = 0; chatCycle = 0; - field518 = 0; - field524 = 0; field511 = 0; - field517 = 0; - field529 = 0; + field530 = 0; field525 = 0; field528 = 0; + field529 = 0; + field526 = 0; + field527 = 0; mouseWheelRotation = 0; - field651 = new class532(); + field649 = new class547(); scriptEvents = new NodeDeque(); - field629 = new NodeDeque(); - field630 = new NodeDeque(); field628 = new NodeDeque(); + field629 = new NodeDeque(); + field626 = new NodeDeque(); widgetFlags = new NodeHashTable(512); rootWidgetCount = 0; - field527 = -2; - field407 = new boolean[100]; + field523 = -2; field408 = new boolean[100]; - field409 = new boolean[100]; + field407 = new boolean[100]; + field406 = new boolean[100]; rootWidgetXs = new int[100]; rootWidgetYs = new int[100]; rootWidgetWidths = new int[100]; rootWidgetHeights = new int[100]; gameDrawingMode = 0; - field615 = 0L; + field613 = 0L; isResizable = true; - field579 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + field580 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field602 = ""; + field601 = ""; crossWorldMessageIds = new long[100]; crossWorldMessageIdsIndex = 0; - keyHandlerInstance = new class212(); - field423 = new class210(); - field532 = 0; - field580 = new int[128]; - field581 = new int[128]; + keyHandlerInstance = new class226(); + field422 = new class224(); + field533 = 0; + field578 = new int[128]; + field577 = new int[128]; timeOfPreviousKeyPress = -1L; currentClanSettings = new ClanSettings[4]; currentClanChannels = new ClanChannel[4]; - field538 = -1; + field539 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; @@ -1259,522 +1251,496 @@ boolean shouldProcessClick() { soundEffects = new SoundEffect[50]; isCameraLocked = false; field402 = false; - field404 = false; field401 = false; - field642 = null; + field403 = false; field646 = null; - field647 = null; + field643 = null; + field642 = null; field400 = false; cameraShaking = new boolean[5]; cameraShakeIntensity = new int[5]; cameraMoveIntensity = new int[5]; cameraShakeSpeed = new int[5]; cameraShakeCycle = new int[5]; - field638 = 256; - field640 = 205; + field634 = 256; + field633 = 205; zoomHeight = 256; zoomWidth = 320; - field635 = 1; - field634 = 32767; - field641 = 1; - field637 = 32767; + field639 = 1; + field640 = 32767; + field638 = 1; + field635 = 32767; viewportOffsetX = 0; viewportOffsetY = 0; viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; playerAppearance = new PlayerComposition(); - field542 = -1; - field547 = -1; - field645 = new DesktopPlatformInfoProvider(); + field548 = -1; + field549 = -1; + field641 = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - archive5 = new class423(8, class421.field3766); + field631 = new class438(8, class436.field3797); Widget_cachedModels = new EvictingDualNodeHashTable(64); - Widget_cachedFonts = new EvictingDualNodeHashTable(64); - field549 = -1; - field369 = -1; - field609 = new ArrayList(); + archive11 = new EvictingDualNodeHashTable(64); + field547 = -1; + field368 = -1; + field608 = new ArrayList(); + field651 = new class232(); archiveLoaders = new ArrayList(10); archiveLoadersDone = 0; - field550 = 0; - field652 = new ApproximateRouteStrategy(); - field593 = new int[50]; + field551 = 0; + field650 = new ApproximateRouteStrategy(); field592 = new int[50]; + field593 = new int[50]; } public Client() { - this.field661 = false; - this.field664 = 0; - this.field668 = -1L; + this.field660 = false; + this.field663 = 0; + this.field667 = -1L; } - @ObfuscatedName("ar") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "59" + descriptor = "(I)V", + garbageValue = "-953371865" ) @Export("resizeGame") protected final void resizeGame() { - field615 = GameEngine.clockNow() + 500L; + field613 = GrandExchangeOfferTotalQuantityComparator.method1971() + 500L; this.resizeJS(); if (rootInterface != -1) { - this.resizeRoot(true); + this.method382(true); } } - @ObfuscatedName("by") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "208117174" + descriptor = "(B)V", + garbageValue = "-84" ) @Export("setUp") protected final void setUp() { - PacketBufferNode.method1611(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); - class480.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; - class129.js5Port = gameBuild == 0 ? 443 : worldId + 50000; - class4.currentPort = class480.worldPort; - UrlRequest.field1174 = class330.field2941; - class140.field1328 = class330.field2942; - PlayerComposition.field2904 = class330.field2940; - PlayerComposition.field2905 = class330.field2943; - FriendsChat.urlRequester = new class113(this.field661, 216); - this.setUpKeyboard(); - this.method143(); - class12.mouseWheel = this.mouseWheel(); - this.method142(field423, 0); - this.method142(keyHandlerInstance, 1); - class6.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - AccessFile var2 = null; - ClientPreferences var3 = new ClientPreferences(); - - try { - var2 = Decimator.getPreferencesFile("", WorldMapSectionType.field2417.name, false); - byte[] var4 = new byte[(int)var2.length()]; - - int var6; - for (int var5 = 0; var5 < var4.length; var5 += var6) { - var6 = var2.read(var4, var5, var4.length - var5); - if (var6 == -1) { - throw new IOException(); - } + int[] var1 = new int[]{20, 260, 10000}; + int[] var2 = new int[]{1000, 100, 500}; + if (var1 != null && var2 != null) { + ByteArrayPool.ByteArrayPool_alternativeSizes = var1; + class425.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; + class28.ByteArrayPool_arrays = new byte[var1.length][][]; + + for (int var3 = 0; var3 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var3) { + class28.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; + ByteArrayPool.field3766.add(var1[var3]); } - var3 = new ClientPreferences(new Buffer(var4)); - } catch (Exception var8) { - } - - try { - if (var2 != null) { - var2.close(); - } - } catch (Exception var7) { + Collections.sort(ByteArrayPool.field3766); + } else { + ByteArrayPool.ByteArrayPool_alternativeSizes = null; + class425.ByteArrayPool_altSizeArrayCounts = null; + class28.ByteArrayPool_arrays = null; + ByteArrayPool.field3766.clear(); + ByteArrayPool.field3766.add(100); + ByteArrayPool.field3766.add(5000); + ByteArrayPool.field3766.add(10000); + ByteArrayPool.field3766.add(30000); } - class449.clientPreferences = var3; + ObjectComposition.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; + class363.js5Port = gameBuild == 0 ? 443 : worldId + 50000; + class164.currentPort = ObjectComposition.worldPort; + PlayerComposition.field2940 = class345.field2973; + class104.field1093 = class345.field2975; + Coord.field2906 = class345.field2974; + class33.field87 = class345.field2976; + AbstractWorldMapIcon.urlRequester = new class115(this.field660, 217); + this.setUpKeyboard(); + this.method146(); + class493.mouseWheel = this.mouseWheel(); + this.method145(field422, 0); + this.method145(keyHandlerInstance, 1); this.setUpClipboard(); - KeyHandler.method85(this, class18.field50); - class270.setWindowedMode(class449.clientPreferences.method566()); - class299.friendSystem = new FriendSystem(Language.loginType); - this.field658 = new class14("tokenRequest", 1, 1); - if (!class305.field2778.contains(this)) { - class305.field2778.add(this); - } - - class218.field1926 = new class216[1]; - class214 var9 = class214.field1898; - class218.field1926[0] = new class216(var9.field1907, var9.field1908); + UserComparator10.field1188 = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + class91.clientPreferences = FadeInTask.method2164(); + class416.method2159(this, GraphicsObject.field717); + NPCComposition.setWindowedMode(class91.clientPreferences.method562()); + InvDefinition.friendSystem = new FriendSystem(class166.loginType); + this.field659 = new class14("tokenRequest", 1, 1); + WorldMapIcon_1.method1439(this); + field651.method1189(); } - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1753601126" + garbageValue = "-800201684" ) @Export("doCycle") protected final void doCycle() { ++cycle; this.doCycleJs5(); + Skills.method1899(); + boolean var1 = CollisionMap.method1157(); + if (var1 && playingJingle && class171.pcmPlayer1 != null) { + class171.pcmPlayer1.tryDiscard(); + } - while (true) { - ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); - } - - if (var1 == null) { - boolean var5 = WorldMapArea.method1425(); - if (var5 && playingJingle && AddRequestTask.pcmPlayer1 != null) { - AddRequestTask.pcmPlayer1.tryDiscard(); - } - - class301.method1622(); - keyHandlerInstance.method1104(); - this.method141(); - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; - MouseHandler.MouseHandler_lastButtonVolatile = 0; - } - - if (class12.mouseWheel != null) { - int var6 = class12.mouseWheel.useRotation(); - mouseWheelRotation = var6; - } - - if (gameState == 0) { - ParamComposition.method1017(); - PacketWriter.method645(); - } else if (gameState == 5) { - GrandExchangeOfferWorldComparator.method1950(this, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); - ParamComposition.method1017(); - PacketWriter.method645(); - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - GrandExchangeOfferWorldComparator.method1950(this, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); - this.doCycleLoggedOut(); - } else if (gameState == 50) { - GrandExchangeOfferWorldComparator.method1950(this, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); - this.doCycleLoggedOut(); - } else if (gameState == 25) { - class370.method1968(); - } - } else { - GrandExchangeOfferWorldComparator.method1950(this, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); - } + class313.method1648(); + keyHandlerInstance.method1147(); + this.method144(); + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; + MouseHandler.MouseHandler_lastButtonVolatile = 0; + } - if (gameState == 30) { - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { - this.doCycleLoggedOut(); - } + if (class493.mouseWheel != null) { + int var4 = class493.mouseWheel.useRotation(); + mouseWheelRotation = var4; + } - return; + if (gameState == 0) { + class314.method1653(); + class19.method66(); + } else if (gameState == 5) { + WorldMapManager.method1521(this, class14.fontPlain11, UserComparator6.fontPlain12); + class314.method1653(); + class19.method66(); + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { + WorldMapManager.method1521(this, class14.fontPlain11, UserComparator6.fontPlain12); + this.doCycleLoggedOut(); + } else if (gameState == 50) { + WorldMapManager.method1521(this, class14.fontPlain11, UserComparator6.fontPlain12); + this.doCycleLoggedOut(); + } else if (gameState == 25) { + Occluder.method1341(); } + } else { + WorldMapManager.method1521(this, class14.fontPlain11, UserComparator6.fontPlain12); + } - var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); + if (gameState == 30) { + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { + this.doCycleLoggedOut(); } + } - @ObfuscatedName("bm") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1944984067" + descriptor = "(ZB)V", + garbageValue = "40" ) @Export("draw") protected final void draw(boolean var1) { - if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field615 && GameEngine.clockNow() > field615) { - class270.setWindowedMode(class218.getWindowedMode()); + if ((gameState == 10 || gameState == 20 || gameState == 30) && field613 != 0L && GrandExchangeOfferTotalQuantityComparator.method1971() > field613) { + NPCComposition.setWindowedMode(class178.getWindowedMode()); } int var2; if (var1) { for (var2 = 0; var2 < 100; ++var2) { - field407[var2] = true; + field408[var2] = true; } } if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - class105.drawTitle(class59.fontBold12, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); + class367.drawTitle(SoundCache.fontBold12, class14.fontPlain11, UserComparator6.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - class105.drawTitle(class59.fontBold12, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); + class367.drawTitle(SoundCache.fontBold12, class14.fontPlain11, UserComparator6.fontPlain12); } else if (gameState == 50) { - class105.drawTitle(class59.fontBold12, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); + class367.drawTitle(SoundCache.fontBold12, class14.fontPlain11, UserComparator6.fontPlain12); } else if (gameState == 25) { - if (field456 == 1) { - if (field452 > field453) { - field453 = field452; + if (field453 == 1) { + if (field454 > field456) { + field456 = field454; } - var2 = (field453 * 50 - field452 * 50) / field453; - FadeInTask.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); - } else if (field456 == 2) { - if (field455 > field454) { - field454 = field455; + var2 = (field456 * 50 - field454 * 50) / field456; + class427.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); + } else if (field453 == 2) { + if (field455 > field452) { + field452 = field455; } - var2 = (field454 * 50 - field455 * 50) / field454 + 50; - FadeInTask.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); + var2 = (field452 * 50 - field455 * 50) / field452 + 50; + class427.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); } else { - FadeInTask.drawLoadingMessage("Loading - please wait.", false); + class427.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - FadeInTask.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + class427.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); } else if (gameState == 45) { - FadeInTask.drawLoadingMessage("Please wait...", false); + class427.drawLoadingMessage("Please wait...", false); } } else { - class105.drawTitle(class59.fontBold12, HealthBarUpdate.fontPlain11, SecureRandomCallable.fontPlain12); + class367.drawTitle(SoundCache.fontBold12, class14.fontPlain11, UserComparator6.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { for (var2 = 0; var2 < rootWidgetCount; ++var2) { - if (field408[var2]) { - AttackOption.rasterProvider.draw(rootWidgetXs[var2], rootWidgetYs[var2], rootWidgetWidths[var2], rootWidgetHeights[var2]); - field408[var2] = false; + if (field407[var2]) { + class223.rasterProvider.draw(rootWidgetXs[var2], rootWidgetYs[var2], rootWidgetWidths[var2], rootWidgetHeights[var2]); + field407[var2] = false; } } } else if (gameState > 0) { - AttackOption.rasterProvider.drawFull(0, 0); + class223.rasterProvider.drawFull(0, 0); for (var2 = 0; var2 < rootWidgetCount; ++var2) { - field408[var2] = false; + field407[var2] = false; } } } - @ObfuscatedName("bf") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1298916795" + garbageValue = "1875481219" ) @Export("kill0") protected final void kill0() { - if (KeyHandler.varcs.hasUnwrittenChanges()) { - KeyHandler.varcs.write(); + if (class33.varcs.hasUnwrittenChanges()) { + class33.varcs.write(); } - if (class126.mouseRecorder != null) { - class126.mouseRecorder.isRunning = false; + if (class233.mouseRecorder != null) { + class233.mouseRecorder.isRunning = false; } - class126.mouseRecorder = null; + class233.mouseRecorder = null; packetWriter.close(); - if (MouseHandler.MouseHandler_instance != null) { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_instance = null; - } - } - - class12.mouseWheel = null; - if (AddRequestTask.pcmPlayer1 != null) { - AddRequestTask.pcmPlayer1.shutdown(); + BufferedSink.method2304(); + class493.mouseWheel = null; + if (class171.pcmPlayer1 != null) { + class171.pcmPlayer1.shutdown(); } - class308.field2819.method1940(); - class214.method1124(); - if (FriendsChat.urlRequester != null) { - FriendsChat.urlRequester.close(); - FriendsChat.urlRequester = null; + class59.field309.method1969(); + WorldMapDecorationType.method1898(); + if (AbstractWorldMapIcon.urlRequester != null) { + AbstractWorldMapIcon.urlRequester.close(); + AbstractWorldMapIcon.urlRequester = null; } - class510.method2513(); - this.field658.method40(); + HealthBar.method577(); + this.field659.method48(); } - @ObfuscatedName("br") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1929688897" + garbageValue = "390692392" ) @Export("vmethod1485") protected final void vmethod1485() { } - @ObfuscatedName("gx") + @ObfuscatedName("gc") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "920896355" + descriptor = "(S)Z", + garbageValue = "28669" ) - boolean method351() { - return this.field664 == 1; + boolean method356() { + return this.field663 == 1; } - @ObfuscatedName("gq") + @ObfuscatedName("ga") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1597201922" + descriptor = "(B)Z", + garbageValue = "-83" ) - boolean method352() { - return class27.field76 != null && !class27.field76.trim().isEmpty() && class9.field20 != null && !class9.field20.trim().isEmpty(); + boolean method357() { + return class467.field3921 != null && !class467.field3921.trim().isEmpty() && class191.field1499 != null && !class191.field1499.trim().isEmpty(); } - @ObfuscatedName("gt") + @ObfuscatedName("gh") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "106" + descriptor = "(I)Z", + garbageValue = "-1137874919" ) - boolean method353() { - return class157.field1407 != null && !class157.field1407.trim().isEmpty() && Varcs.field1140 != null && !Varcs.field1140.trim().isEmpty(); + boolean method358() { + return LoginScreenAnimation.field1042 != null && !LoginScreenAnimation.field1042.trim().isEmpty() && class155.field1355 != null && !class155.field1355.trim().isEmpty(); } - @ObfuscatedName("gr") + @ObfuscatedName("gg") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "13" + garbageValue = "2" ) - boolean method354() { - return this.field662 != null; + boolean method359() { + return this.field661 != null; } - @ObfuscatedName("gz") + @ObfuscatedName("gu") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1881627729" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-10" ) - void method355(String var1) throws IOException { + void method360(String var1) throws IOException { HashMap var2 = new HashMap(); var2.put("grant_type", "refresh_token"); var2.put("scope", "gamesso.token.create"); var2.put("refresh_token", var1); - URL var3 = new URL(class510.field4133 + "shield/oauth/token" + (new class463(var2)).method2342()); - class419 var4 = new class419(); - if (this.method351()) { - var4.method2169(field655); + URL var3 = new URL(class59.field308 + "shield/oauth/token" + (new class478(var2)).method2383()); + class434 var4 = new class434(); + if (this.method356()) { + var4.method2201(field655); } else { - var4.method2169(field656); + var4.method2201(field654); } - var4.method2166("Host", (new URL(class510.field4133)).getHost()); - var4.method2173(class460.field3901); - class9 var5 = class9.field18; - RefreshAccessTokenRequester var6 = this.field663; + var4.method2198("Host", (new URL(class59.field308)).getHost()); + var4.method2205(class475.field3933); + class9 var5 = class9.field14; + RefreshAccessTokenRequester var6 = this.field662; if (var6 != null) { - this.field667 = var6.request(var5.method22(), var3, var4.method2165(), ""); + this.field666 = var6.request(var5.method27(), var3, var4.method2197(), ""); } else { - class10 var7 = new class10(var3, var5, var4, this.field661); - this.field659 = this.field658.method38(var7); + class10 var7 = new class10(var3, var5, var4, this.field660); + this.field657 = this.field659.method47(var7); } } - @ObfuscatedName("gn") + @ObfuscatedName("go") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "1" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-2007713791" ) - void method356(String var1) throws IOException { - URL var2 = new URL(class510.field4133 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); - class419 var3 = new class419(); - var3.method2170(var1); - class9 var4 = class9.field17; - OtlTokenRequester var5 = this.field662; + void method361(String var1) throws IOException { + URL var2 = new URL(class59.field308 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); + class434 var3 = new class434(); + var3.method2202(var1); + class9 var4 = class9.field15; + OtlTokenRequester var5 = this.field661; if (var5 != null) { - this.field666 = var5.request(var4.method22(), var2, var3.method2165(), ""); + this.field665 = var5.request(var4.method27(), var2, var3.method2197(), ""); } else { - class10 var6 = new class10(var2, var4, var3, this.field661); - this.field660 = this.field658.method38(var6); + class10 var6 = new class10(var2, var4, var3, this.field660); + this.field658 = this.field659.method47(var6); } } - @ObfuscatedName("ht") + @ObfuscatedName("hi") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1347426796" + garbageValue = "-259118253" ) - void method358(String var1, String var2) throws IOException, JSONException { - URL var3 = new URL(class510.field4133 + "game-session/v1/tokens"); - class10 var4 = new class10(var3, class9.field18, this.field661); - var4.method27().method2170(var1); - var4.method27().method2173(class460.field3901); + void method362(String var1, String var2) throws IOException, JSONException { + URL var3 = new URL(Actor.field959 + "game-session/v1/tokens"); + class10 var4 = new class10(var3, class9.field14, this.field660); + var4.method31().method2202(var1); + var4.method31().method2205(class475.field3933); JSONObject var5 = new JSONObject(); - var5.method2709("accountId", var2); - var4.method28(new class462(var5)); - this.field660 = this.field658.method38(var4); + var5.method2750("accountId", var2); + var4.method32(new class477(var5)); + this.field658 = this.field659.method47(var4); } - @ObfuscatedName("hd") + @ObfuscatedName("hm") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "286321361" + descriptor = "(S)V", + garbageValue = "-19583" ) @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { - boolean var1 = class308.field2819.method1930(); + boolean var1 = class59.field309.method1960(); if (!var1) { - this.method364(); + this.method368(); } } } - @ObfuscatedName("hk") + @ObfuscatedName("hd") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "375037576" + garbageValue = "1822852781" ) - void method364() { - if (class308.field2819.field3570 >= 4) { + void method368() { + if (class59.field309.field3607 >= 4) { this.error("js5crc"); - MusicSong.updateGameState(1000); + DefaultsGroup.updateGameState(1000); } else { - if (class308.field2819.field3569 >= 4) { + if (class59.field309.field3606 >= 4) { if (gameState <= 5) { this.error("js5io"); - MusicSong.updateGameState(1000); + DefaultsGroup.updateGameState(1000); return; } js5Cycles = 3000; - class308.field2819.field3569 = 3; + class59.field309.field3606 = 3; } if (--js5Cycles + 1 <= 0) { try { if (js5ConnectState == 0) { - class126.js5SocketTask = GameEngine.taskHandler.newSocketTask(class292.worldHost, class4.currentPort); + class199.js5SocketTask = GameEngine.taskHandler.newSocketTask(MouseHandler.worldHost, class164.currentPort); ++js5ConnectState; } if (js5ConnectState == 1) { - if (class126.js5SocketTask.status == 2) { + if (class199.js5SocketTask.status == 2) { this.js5Error(-1); return; } - if (class126.js5SocketTask.status == 1) { + if (class199.js5SocketTask.status == 1) { ++js5ConnectState; } } if (js5ConnectState == 2) { - Socket var2 = (Socket)class126.js5SocketTask.result; - BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); - class59.js5Socket = var1; - Buffer var3 = new Buffer(5); - var3.writeByte(15); - var3.writeInt(216); - class59.js5Socket.write(var3.array, 0, 5); + class162.js5Socket = WorldMapData_1.method1522((Socket)class199.js5SocketTask.result, 40000, 5000); + Buffer var1 = new Buffer(5); + var1.writeByte(15); + var1.writeInt(217); + class162.js5Socket.write(var1.array, 0, 5); ++js5ConnectState; - class270.field2451 = GameEngine.clockNow(); + FloorDecoration.field1991 = GrandExchangeOfferTotalQuantityComparator.method1971(); } if (js5ConnectState == 3) { - if (class59.js5Socket.available() > 0) { - int var4 = class59.js5Socket.readUnsignedByte(); - if (var4 != 0) { - this.js5Error(var4); + if (class162.js5Socket.available() > 0) { + int var2 = class162.js5Socket.readUnsignedByte(); + if (var2 != 0) { + this.js5Error(var2); return; } ++js5ConnectState; - } else if (GameEngine.clockNow() - class270.field2451 > 30000L) { + } else if (GrandExchangeOfferTotalQuantityComparator.method1971() - FloorDecoration.field1991 > 30000L) { this.js5Error(-2); return; } } if (js5ConnectState == 4) { - class308.field2819.method1933(class59.js5Socket, gameState > 20); - class126.js5SocketTask = null; - class59.js5Socket = null; + class59.field309.method1962(class162.js5Socket, gameState > 20); + class199.js5SocketTask = null; + class162.js5Socket = null; js5ConnectState = 0; js5Errors = 0; } - } catch (IOException var5) { + } catch (IOException var3) { this.js5Error(-3); } @@ -1782,828 +1748,713 @@ void method364() { } } - @ObfuscatedName("hz") + @ObfuscatedName("hs") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "17" + garbageValue = "5" ) @Export("js5Error") void js5Error(int var1) { - class126.js5SocketTask = null; - class59.js5Socket = null; + class199.js5SocketTask = null; + class162.js5Socket = null; js5ConnectState = 0; - if (class4.currentPort == class480.worldPort) { - class4.currentPort = class129.js5Port; + if (class164.currentPort == ObjectComposition.worldPort) { + class164.currentPort = class363.js5Port; } else { - class4.currentPort = class480.worldPort; + class164.currentPort = ObjectComposition.worldPort; } ++js5Errors; if (js5Errors < 2 || var1 != 7 && var1 != 9) { if (js5Errors >= 2 && var1 == 6) { this.error("js5connect_outofdate"); - MusicSong.updateGameState(1000); + DefaultsGroup.updateGameState(1000); } else if (js5Errors >= 4) { if (gameState <= 5) { this.error("js5connect"); - MusicSong.updateGameState(1000); + DefaultsGroup.updateGameState(1000); } else { js5Cycles = 3000; } } } else if (gameState <= 5) { this.error("js5connect_full"); - MusicSong.updateGameState(1000); + DefaultsGroup.updateGameState(1000); } else { js5Cycles = 3000; } } - @ObfuscatedName("hy") + @ObfuscatedName("hg") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "70" + garbageValue = "1" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); + AbstractSocket var1 = packetWriter.getSocket(); PacketBuffer var2 = packetWriter.packetBuffer; try { if (loginState == 0) { - if (GraphicsObject.secureRandom == null && (secureRandomFuture.isDone() || field448 > 250)) { - GraphicsObject.secureRandom = secureRandomFuture.get(); + if (class224.secureRandom == null && (secureRandomFuture.isDone() || field444 > 250)) { + class224.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if (GraphicsObject.secureRandom != null) { + if (class224.secureRandom != null) { if (var1 != null) { - ((AbstractSocket)var1).close(); + var1.close(); var1 = null; } - VarcInt.socketTask = null; + MouseHandler.socketTask = null; hadNetworkError = false; - field448 = 0; - if (field648.method2616()) { - if (this.method352()) { + field444 = 0; + if (field648.method2654()) { + if (this.method357()) { try { - this.method355(class9.field20); - class316.method1700(21); - } catch (Throwable var25) { - Messages.RunException_sendStackTrace((String)null, var25); - class387.getLoginError(65); + this.method360(class191.field1499); + class409.method2106(21); + } catch (Throwable var24) { + class190.RunException_sendStackTrace((String)null, var24); + class198.getLoginError(65); return; } } else { - if (!this.method353()) { - class387.getLoginError(65); + if (!this.method358()) { + class198.getLoginError(65); return; } try { - this.method358(class157.field1407, Varcs.field1140); - class316.method1700(20); - } catch (Exception var24) { - Messages.RunException_sendStackTrace((String)null, var24); - class387.getLoginError(65); + this.method362(LoginScreenAnimation.field1042, class155.field1355); + class409.method2106(20); + } catch (Exception var23) { + class190.RunException_sendStackTrace((String)null, var23); + class198.getLoginError(65); return; } } } else { - class316.method1700(1); + class409.method2106(1); } } } - class20 var27; + class20 var26; if (loginState == 21) { - if (this.field667 != null) { - if (!this.field667.isDone()) { + if (this.field666 != null) { + if (!this.field666.isDone()) { return; } - if (this.field667.isCancelled()) { - class387.getLoginError(65); - this.field667 = null; + if (this.field666.isCancelled()) { + class198.getLoginError(65); + this.field666 = null; return; } try { - RefreshAccessTokenResponse var3 = (RefreshAccessTokenResponse)this.field667.get(); + RefreshAccessTokenResponse var3 = (RefreshAccessTokenResponse)this.field666.get(); if (!var3.isSuccess()) { - class387.getLoginError(65); - this.field667 = null; + class198.getLoginError(65); + this.field666 = null; return; } - class27.field76 = var3.getAccessToken(); - class9.field20 = var3.getRefreshToken(); - this.field667 = null; - } catch (Exception var23) { - Messages.RunException_sendStackTrace((String)null, var23); - class387.getLoginError(65); - this.field667 = null; + class467.field3921 = var3.getAccessToken(); + class191.field1499 = var3.getRefreshToken(); + this.field666 = null; + } catch (Exception var22) { + class190.RunException_sendStackTrace((String)null, var22); + class198.getLoginError(65); + this.field666 = null; return; } } else { - if (this.field659 == null) { - class387.getLoginError(65); + if (this.field657 == null) { + class198.getLoginError(65); return; } - if (!this.field659.method54()) { + if (!this.field657.method61()) { return; } - if (this.field659.method53()) { - Messages.RunException_sendStackTrace(this.field659.method52(), (Throwable)null); - class387.getLoginError(65); - this.field659 = null; + if (this.field657.method60()) { + class190.RunException_sendStackTrace(this.field657.method59(), (Throwable)null); + class198.getLoginError(65); + this.field657 = null; return; } - var27 = this.field659.method55(); - if (var27.method63() != 200) { - class387.getLoginError(65); - this.field659 = null; + var26 = this.field657.method62(); + if (var26.method71() != 200) { + class198.getLoginError(65); + this.field657 = null; return; } - field448 = 0; - class462 var4 = new class462(var27.method66()); + field444 = 0; + class477 var4 = new class477(var26.method73()); try { - class27.field76 = var4.method2338().getString("access_token"); - class9.field20 = var4.method2338().getString("refresh_token"); - } catch (Exception var22) { - Messages.RunException_sendStackTrace("Error parsing tokens", var22); - class387.getLoginError(65); - this.field659 = null; + class467.field3921 = var4.method2379().getString("access_token"); + class191.field1499 = var4.method2379().getString("refresh_token"); + } catch (Exception var21) { + class190.RunException_sendStackTrace("Error parsing tokens", var21); + class198.getLoginError(65); + this.field657 = null; return; } } - this.method356(class27.field76); - class316.method1700(20); + this.method361(class467.field3921); + class409.method2106(20); } if (loginState == 20) { - if (this.field666 != null) { - if (!this.field666.isDone()) { + if (this.field665 != null) { + if (!this.field665.isDone()) { return; } - if (this.field666.isCancelled()) { - class387.getLoginError(65); - this.field666 = null; + if (this.field665.isCancelled()) { + class198.getLoginError(65); + this.field665 = null; return; } try { - OtlTokenResponse var28 = (OtlTokenResponse)this.field666.get(); - if (!var28.isSuccess()) { - class387.getLoginError(65); - this.field666 = null; + OtlTokenResponse var27 = (OtlTokenResponse)this.field665.get(); + if (!var27.isSuccess()) { + class198.getLoginError(65); + this.field665 = null; return; } - this.field665 = var28.getToken(); - this.field666 = null; - } catch (Exception var21) { - Messages.RunException_sendStackTrace((String)null, var21); - class387.getLoginError(65); - this.field666 = null; + this.field664 = var27.getToken(); + this.field665 = null; + } catch (Exception var20) { + class190.RunException_sendStackTrace((String)null, var20); + class198.getLoginError(65); + this.field665 = null; return; } } else { - if (this.field660 == null) { - class387.getLoginError(65); + if (this.field658 == null) { + class198.getLoginError(65); return; } - if (!this.field660.method54()) { + if (!this.field658.method61()) { return; } - if (this.field660.method53()) { - Messages.RunException_sendStackTrace(this.field660.method52(), (Throwable)null); - class387.getLoginError(65); - this.field660 = null; + if (this.field658.method60()) { + class190.RunException_sendStackTrace(this.field658.method59(), (Throwable)null); + class198.getLoginError(65); + this.field658 = null; return; } - var27 = this.field660.method55(); - if (var27.method63() != 200) { - Messages.RunException_sendStackTrace("Response code: " + var27.method63() + "Response body: " + var27.method66(), (Throwable)null); - class387.getLoginError(65); - this.field660 = null; + var26 = this.field658.method62(); + if (var26.method71() != 200) { + class190.RunException_sendStackTrace("Response code: " + var26.method71() + "Response body: " + var26.method73(), (Throwable)null); + class198.getLoginError(65); + this.field658 = null; return; } - List var30 = (List)var27.method65().get("Content-Type"); - if (var30 != null && var30.contains(class460.field3901.method2331())) { + List var29 = (List)var26.method72().get("Content-Type"); + if (var29 != null && var29.contains(class475.field3933.method2373())) { try { - JSONObject var5 = new JSONObject(var27.method66()); - this.field665 = var5.getString("token"); - } catch (JSONException var20) { - Messages.RunException_sendStackTrace((String)null, var20); - class387.getLoginError(65); - this.field660 = null; + JSONObject var5 = new JSONObject(var26.method73()); + this.field664 = var5.getString("token"); + } catch (JSONException var19) { + class190.RunException_sendStackTrace((String)null, var19); + class198.getLoginError(65); + this.field658 = null; return; } } else { - this.field665 = var27.method66(); + this.field664 = var26.method73(); } - this.field660 = null; + this.field658 = null; } - field448 = 0; - class316.method1700(1); + field444 = 0; + class409.method2106(1); } if (loginState == 1) { - if (VarcInt.socketTask == null) { - VarcInt.socketTask = GameEngine.taskHandler.newSocketTask(class292.worldHost, class4.currentPort); + if (MouseHandler.socketTask == null) { + MouseHandler.socketTask = GameEngine.taskHandler.newSocketTask(MouseHandler.worldHost, class164.currentPort); } - if (VarcInt.socketTask.status == 2) { + if (MouseHandler.socketTask.status == 2) { throw new IOException(); } - if (VarcInt.socketTask.status == 1) { - Socket var31 = (Socket)VarcInt.socketTask.result; - BufferedNetSocket var29 = new BufferedNetSocket(var31, 40000, 5000); - var1 = var29; - packetWriter.setSocket(var29); - VarcInt.socketTask = null; - class316.method1700(2); + if (MouseHandler.socketTask.status == 1) { + var1 = WorldMapData_1.method1522((Socket)MouseHandler.socketTask.result, 40000, 5000); + packetWriter.setSocket(var1); + MouseHandler.socketTask = null; + class409.method2106(2); } } - PacketBufferNode var33; + PacketBufferNode var28; if (loginState == 2) { packetWriter.clearBuffer(); - var33 = class146.method779(); - var33.clientPacket = null; - var33.clientPacketLength = 0; - var33.packetBuffer = new PacketBuffer(5000); - var33.packetBuffer.writeByte(LoginPacket.field2746.id); - packetWriter.addNode(var33); + var28 = class103.method599(); + var28.packetBuffer.writeByte(LoginPacket.field2762.id); + packetWriter.addNode(var28); packetWriter.flush(); var2.offset = 0; - class316.method1700(3); + class409.method2106(3); } int var13; if (loginState == 3) { - if (AddRequestTask.pcmPlayer1 != null) { - AddRequestTask.pcmPlayer1.method200(); + if (class171.pcmPlayer1 != null) { + class171.pcmPlayer1.method209(); } - if (((AbstractSocket)var1).isAvailable(1)) { - var13 = ((AbstractSocket)var1).readUnsignedByte(); - if (AddRequestTask.pcmPlayer1 != null) { - AddRequestTask.pcmPlayer1.method200(); + if (var1.isAvailable(1)) { + var13 = var1.readUnsignedByte(); + if (class171.pcmPlayer1 != null) { + class171.pcmPlayer1.method209(); } if (var13 != 0) { - class387.getLoginError(var13); + class198.getLoginError(var13); return; } var2.offset = 0; - class316.method1700(4); + class409.method2106(4); } } if (loginState == 4) { if (var2.offset < 8) { - var13 = ((AbstractSocket)var1).available(); + var13 = var1.available(); if (var13 > 8 - var2.offset) { var13 = 8 - var2.offset; } if (var13 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var13); + var1.read(var2.array, var2.offset, var13); var2.offset += var13; } } if (var2.offset == 8) { var2.offset = 0; - class125.field1195 = var2.readLong(); - class316.method1700(5); + AttackOption.field1098 = var2.readLong(); + class409.method2106(5); } } + int var6; if (loginState == 5) { packetWriter.packetBuffer.offset = 0; packetWriter.clearBuffer(); - PacketBuffer var32 = new PacketBuffer(500); - int[] var35 = new int[]{GraphicsObject.secureRandom.nextInt(), GraphicsObject.secureRandom.nextInt(), GraphicsObject.secureRandom.nextInt(), GraphicsObject.secureRandom.nextInt()}; - var32.offset = 0; - var32.writeByte(1); - var32.writeInt(var35[0]); - var32.writeInt(var35[1]); - var32.writeInt(var35[2]); - var32.writeInt(var35[3]); - var32.writeLong(class125.field1195); + PacketBuffer var30 = new PacketBuffer(500); + int[] var31 = new int[]{class224.secureRandom.nextInt(), class224.secureRandom.nextInt(), class224.secureRandom.nextInt(), class224.secureRandom.nextInt()}; + var30.offset = 0; + var30.writeByte(1); + var30.writeInt(var31[0]); + var30.writeInt(var31[1]); + var30.writeInt(var31[2]); + var30.writeInt(var31[3]); + var30.writeLong(AttackOption.field1098); if (gameState == 40) { - var32.writeInt(NewShit.field1577[0]); - var32.writeInt(NewShit.field1577[1]); - var32.writeInt(NewShit.field1577[2]); - var32.writeInt(NewShit.field1577[3]); + var30.writeInt(SecureRandomFuture.field809[0]); + var30.writeInt(SecureRandomFuture.field809[1]); + var30.writeInt(SecureRandomFuture.field809[2]); + var30.writeInt(SecureRandomFuture.field809[3]); } else { if (gameState == 50) { - var32.writeByte(class139.field1318.rsOrdinal()); - var32.writeInt(class72.field730); + var30.writeByte(class141.field1314.rsOrdinal()); + var30.writeInt(class153.field1352); } else { - var32.writeByte(field421.rsOrdinal()); - switch(field421.field1327) { - case 0: - var32.writeInt(class449.clientPreferences.method569(Login.Login_username)); + var30.writeByte(field419.rsOrdinal()); + switch(field419.field1317) { case 1: - default: + var30.offset += 4; break; case 2: - case 4: - var32.writeMedium(class503.field4107); - ++var32.offset; + var30.writeInt(class91.clientPreferences.method565(Login.Login_username)); break; case 3: - var32.offset += 4; + case 4: + var30.writeMedium(ClientPreferences.field1059); + ++var30.offset; } } - if (field648.method2616()) { - var32.writeByte(class519.field4204.rsOrdinal()); - var32.writeStringCp1252NullTerminated(this.field665); + if (field648.method2654()) { + var30.writeByte(class534.field4232.rsOrdinal()); + var30.writeStringCp1252NullTerminated(this.field664); } else { - var32.writeByte(class519.field4205.rsOrdinal()); - var32.writeStringCp1252NullTerminated(Login.Login_password); + var30.writeByte(class534.field4231.rsOrdinal()); + var30.writeStringCp1252NullTerminated(Login.Login_password); } } - var32.encryptRsa(class74.field742, class74.field741); - NewShit.field1577 = var35; - PacketBufferNode var6 = class146.method779(); - var6.clientPacket = null; - var6.clientPacketLength = 0; - var6.packetBuffer = new PacketBuffer(5000); - var6.packetBuffer.offset = 0; + var30.encryptRsa(class76.field738, class76.field739); + SecureRandomFuture.field809 = var31; + PacketBufferNode var34 = class103.method599(); + var34.packetBuffer.offset = 0; if (gameState == 40) { - var6.packetBuffer.writeByte(LoginPacket.RECONNECT_LOGIN_CONNECTION.id); + var34.packetBuffer.writeByte(LoginPacket.RECONNECT_LOGIN_CONNECTION.id); } else { - var6.packetBuffer.writeByte(LoginPacket.NEW_LOGIN_CONNECTION.id); - } - - var6.packetBuffer.writeShort(0); - int var7 = var6.packetBuffer.offset; - var6.packetBuffer.writeInt(216); - var6.packetBuffer.writeInt(1); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeByte(field424); - byte var8 = 0; - var6.packetBuffer.writeByte(var8); - var6.packetBuffer.writeBytes(var32.array, 0, var32.offset); - int var9 = var6.packetBuffer.offset; - var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var6.packetBuffer.writeShort(class113.canvasWidth); - var6.packetBuffer.writeShort(class177.canvasHeight); - class177.method919(var6.packetBuffer); - var6.packetBuffer.writeStringCp1252NullTerminated(MusicPatchPcmStream.param9); - var6.packetBuffer.writeInt(WorldMapSectionType.field2416); + var34.packetBuffer.writeByte(LoginPacket.NEW_LOGIN_CONNECTION.id); + } + + var34.packetBuffer.writeShort(0); + var6 = var34.packetBuffer.offset; + var34.packetBuffer.writeInt(217); + var34.packetBuffer.writeInt(1); + var34.packetBuffer.writeByte(clientType); + var34.packetBuffer.writeByte(field427); + byte var7 = 0; + var34.packetBuffer.writeByte(var7); + var34.packetBuffer.writeBytes(var30.array, 0, var30.offset); + int var8 = var34.packetBuffer.offset; + var34.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var34.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var34.packetBuffer.writeShort(class340.canvasWidth); + var34.packetBuffer.writeShort(class491.canvasHeight); + PacketBuffer var9 = var34.packetBuffer; + if (randomDatData != null) { + var9.writeBytes(randomDatData, 0, randomDatData.length); + } else { + byte[] var10 = class131.method706(); + var9.writeBytes(var10, 0, var10.length); + } + + var34.packetBuffer.writeStringCp1252NullTerminated(HealthBarDefinition.param9); + var34.packetBuffer.writeInt(WorldMapIcon_1.field2337); if (param25 > 213) { - var6.packetBuffer.writeByte(0); - } - - Buffer var10 = new Buffer(class18.field51.size()); - class18.field51.write(var10); - var6.packetBuffer.writeBytes(var10.array, 0, var10.array.length); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.writeIntLE(class499.archive9.hash); - var6.packetBuffer.writeIntLE(Tiles.field838.hash); - var6.packetBuffer.writeIntLE(class106.field1107.hash); - var6.packetBuffer.writeIntLE(class147.field1348.hash); - var6.packetBuffer.writeIntLE(class388.field3655.hash); - var6.packetBuffer.writeIntIME(ObjectSound.archive4.hash); - var6.packetBuffer.writeInt(class227.field2040.hash); - var6.packetBuffer.writeIntIME_(class28.field81.hash); - var6.packetBuffer.writeInt(AttackOption.field1096.hash); - var6.packetBuffer.writeIntLE(class10.field28.hash); - var6.packetBuffer.writeIntLE(0); - var6.packetBuffer.writeIntIME(ClanChannelMember.field1339.hash); - var6.packetBuffer.writeIntLE(Player.archive13.hash); - var6.packetBuffer.writeIntIME_(class141.archive10.hash); - var6.packetBuffer.writeIntLE(class1.archive2.hash); - var6.packetBuffer.writeIntIME(class318.archive7.hash); - var6.packetBuffer.writeIntIME_(class385.archive6.hash); - var6.packetBuffer.writeInt(WorldMapElement.field1509.hash); - var6.packetBuffer.writeIntIME_(Message.archive11.hash); - var6.packetBuffer.writeIntIME(PcmPlayer.archive8.hash); - var6.packetBuffer.writeInt(GrandExchangeOffer.archive12.hash); - var6.packetBuffer.xteaEncrypt(var35, var9, var6.packetBuffer.offset); - var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var7); - packetWriter.addNode(var6); + var34.packetBuffer.writeByte(0); + } + + Buffer var40 = new Buffer(Skeleton.field2060.size()); + Skeleton.field2060.write(var40); + var34.packetBuffer.writeBytes(var40.array, 0, var40.array.length); + var34.packetBuffer.writeByte(clientType); + var34.packetBuffer.writeInt(0); + var34.packetBuffer.writeInt(WorldMapDecorationType.field3154.hash); + var34.packetBuffer.writeInt(class199.field1567.hash); + var34.packetBuffer.writeIntIME(class199.archive8.hash); + var34.packetBuffer.writeIntME(class241.field2052.hash); + var34.packetBuffer.writeIntLE(class27.archive13.hash); + var34.packetBuffer.writeIntLE(class469.field3930.hash); + var34.packetBuffer.writeIntLE(SoundSystem.archive2.hash); + var34.packetBuffer.writeIntME(class190.archive10.hash); + var34.packetBuffer.writeIntIME(HorizontalAlignment.field1584.hash); + var34.packetBuffer.writeIntME(GrandExchangeOfferOwnWorldComparator.field361.hash); + var34.packetBuffer.writeInt(class358.field3177.hash); + var34.packetBuffer.writeIntME(Language.field3643.hash); + var34.packetBuffer.writeIntME(0); + var34.packetBuffer.writeIntLE(AbstractByteArrayCopier.field3136.hash); + var34.packetBuffer.writeIntLE(class198.archive9.hash); + var34.packetBuffer.writeIntLE(AABB.field2123.hash); + var34.packetBuffer.writeInt(ArchiveDiskAction.field3538.hash); + var34.packetBuffer.writeIntLE(CollisionMap.archive6.hash); + var34.packetBuffer.writeInt(SongTask.archive12.hash); + var34.packetBuffer.writeIntLE(class317.field2776.hash); + var34.packetBuffer.writeIntIME(class92.field888.hash); + var34.packetBuffer.xteaEncrypt(var31, var8, var34.packetBuffer.offset); + var34.packetBuffer.writeLengthShort(var34.packetBuffer.offset - var6); + packetWriter.addNode(var34); packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var35); + packetWriter.isaacCipher = new IsaacCipher(var31); int[] var11 = new int[4]; for (int var12 = 0; var12 < 4; ++var12) { - var11[var12] = var35[var12] + 50; + var11[var12] = var31[var12] + 50; } var2.newIsaacCipher(var11); - class316.method1700(6); + class409.method2106(6); } int var14; - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var13 = ((AbstractSocket)var1).readUnsignedByte(); + if (loginState == 6 && var1.available() > 0) { + var13 = var1.readUnsignedByte(); if (var13 == 61) { - var14 = ((AbstractSocket)var1).available(); - ModeWhere.field3613 = var14 == 1 && ((AbstractSocket)var1).readUnsignedByte() == 1; - class316.method1700(5); + var14 = var1.available(); + MusicPatchNode2.field2778 = var14 == 1 && var1.readUnsignedByte() == 1; + class409.method2106(5); } if (var13 == 21 && gameState == 20) { - class316.method1700(12); + class409.method2106(12); } else if (var13 == 2) { - class316.method1700(14); + class409.method2106(14); } else if (var13 == 15 && gameState == 40) { packetWriter.serverPacketLength = -1; - class316.method1700(19); + class409.method2106(19); } else if (var13 == 64) { - class316.method1700(10); - } else if (var13 == 23 && field447 < 1) { - ++field447; - class316.method1700(0); + class409.method2106(10); + } else if (var13 == 23 && field448 < 1) { + ++field448; + class409.method2106(0); } else if (var13 == 29) { - class316.method1700(17); + class409.method2106(17); } else { if (var13 != 69) { - class387.getLoginError(var13); + class198.getLoginError(var13); return; } - class316.method1700(7); + class409.method2106(7); } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { - ((AbstractSocket)var1).read(var2.array, 0, 2); + if (loginState == 7 && var1.available() >= 2) { + var1.read(var2.array, 0, 2); var2.offset = 0; - class12.field37 = var2.readUnsignedShort(); - class316.method1700(8); + class13.field35 = var2.readUnsignedShort(); + class409.method2106(8); } - if (loginState == 8 && ((AbstractSocket)var1).available() >= class12.field37) { + if (loginState == 8 && var1.available() >= class13.field35) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, var2.offset, class12.field37); - class6 var34 = class303.method1624()[var2.readUnsignedByte()]; + var1.read(var2.array, var2.offset, class13.field35); + class6[] var32 = new class6[]{class6.field4}; + class6 var33 = var32[var2.readUnsignedByte()]; try { - switch(var34.field8) { + switch(var33.field6) { case 0: - class0 var38 = new class0(); - this.field657 = new class7(var2, var38); - class316.method1700(9); + class0 var36 = new class0(); + this.field656 = new class7(var2, var36); + class409.method2106(9); break; default: throw new IllegalArgumentException(); } - } catch (Exception var19) { - class387.getLoginError(22); + } catch (Exception var18) { + class198.getLoginError(22); return; } } - if (loginState == 9 && this.field657.method14()) { - this.field669 = this.field657.method16(); - this.field657.method15(); - this.field657 = null; - if (this.field669 == null) { - class387.getLoginError(22); + if (loginState == 9 && this.field656.method17()) { + this.field668 = this.field656.method19(); + this.field656.method18(); + this.field656 = null; + if (this.field668 == null) { + class198.getLoginError(22); return; } packetWriter.clearBuffer(); - var33 = class146.method779(); - var33.clientPacket = null; - var33.clientPacketLength = 0; - var33.packetBuffer = new PacketBuffer(5000); - var33.packetBuffer.writeByte(LoginPacket.field2743.id); - var33.packetBuffer.writeShort(this.field669.offset); - var33.packetBuffer.method2537(this.field669); - packetWriter.addNode(var33); + var28 = class103.method599(); + var28.packetBuffer.writeByte(LoginPacket.field2764.id); + var28.packetBuffer.writeShort(this.field668.offset); + var28.packetBuffer.writeBuffer(this.field668); + packetWriter.addNode(var28); packetWriter.flush(); - this.field669 = null; - class316.method1700(6); + this.field668 = null; + class409.method2106(6); } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { - KeyHandler.field69 = ((AbstractSocket)var1).readUnsignedByte(); - class316.method1700(11); + if (loginState == 10 && var1.available() > 0) { + class174.field1446 = var1.readUnsignedByte(); + class409.method2106(11); } - if (loginState == 11 && ((AbstractSocket)var1).available() >= KeyHandler.field69) { - ((AbstractSocket)var1).read(var2.array, 0, KeyHandler.field69); + if (loginState == 11 && var1.available() >= class174.field1446) { + var1.read(var2.array, 0, class174.field1446); var2.offset = 0; - class316.method1700(6); + class409.method2106(6); } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { - field444 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; - class316.method1700(13); + if (loginState == 12 && var1.available() > 0) { + field447 = (var1.readUnsignedByte() + 3) * 60; + class409.method2106(13); } if (loginState == 13) { - field448 = 0; - class318.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field444 / 60 + " seconds."); - if (--field444 <= 0) { - class316.method1700(0); + field444 = 0; + AbstractWorldMapIcon.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field447 / 60 + " seconds."); + if (--field447 <= 0) { + class409.method2106(0); } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { - class398.playerUUIDLength = ((AbstractSocket)var1).readUnsignedByte(); - class316.method1700(15); + if (loginState == 14 && var1.available() >= 1) { + Tiles.playerUUIDLength = var1.readUnsignedByte(); + class409.method2106(15); } - if (loginState == 15 && ((AbstractSocket)var1).available() >= class398.playerUUIDLength) { - boolean var44 = ((AbstractSocket)var1).readUnsignedByte() == 1; - ((AbstractSocket)var1).read(var2.array, 0, 4); + if (loginState == 15 && var1.available() >= Tiles.playerUUIDLength) { + boolean var42 = var1.readUnsignedByte() == 1; + var1.read(var2.array, 0, 4); var2.offset = 0; - boolean var43 = false; - if (var44) { + boolean var41 = false; + if (var42) { var14 = var2.readByteIsaac() << 24; var14 |= var2.readByteIsaac() << 16; var14 |= var2.readByteIsaac() << 8; var14 |= var2.readByteIsaac(); - class449.clientPreferences.method567(Login.Login_username, var14); + class91.clientPreferences.method563(Login.Login_username, var14); } if (Login_isUsernameRemembered) { - class449.clientPreferences.setUsernameToRemember(Login.Login_username); + class91.clientPreferences.setUsernameToRemember(Login.Login_username); } else { - class449.clientPreferences.setUsernameToRemember((String)null); + class91.clientPreferences.setUsernameToRemember((String)null); } - class338.savePreferences(); - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); + class144.savePreferences(); + staffModLevel = var1.readUnsignedByte(); + playerMod = var1.readUnsignedByte() == 1; + localPlayerIndex = var1.readUnsignedByte(); localPlayerIndex <<= 8; - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - isMembers = ((AbstractSocket)var1).readUnsignedByte(); - ((AbstractSocket)var1).read(var2.array, 0, 8); + localPlayerIndex += var1.readUnsignedByte(); + isMembers = var1.readUnsignedByte(); + var1.read(var2.array, 0, 8); var2.offset = 0; - this.field668 = var2.readLong(); - ((AbstractSocket)var1).read(var2.array, 0, 8); + this.field667 = var2.readLong(); + var1.read(var2.array, 0, 8); var2.offset = 0; playerUUID = var2.readLong(); if (param25 >= 214) { - ((AbstractSocket)var1).read(var2.array, 0, 8); + var1.read(var2.array, 0, 8); var2.offset = 0; var2.readLong(); } - ((AbstractSocket)var1).read(var2.array, 0, 1); + var1.read(var2.array, 0, 1); var2.offset = 0; - ServerPacket[] var36 = class176.method916(); - int var15 = var2.readSmartByteShortIsaac(); - if (var15 < 0 || var15 >= var36.length) { - throw new IOException(var15 + " " + var2.offset); + ServerPacket[] var38 = class209.method1033(); + var6 = var2.readSmartByteShortIsaac(); + if (var6 < 0 || var6 >= var38.length) { + throw new IOException(var6 + " " + var2.offset); } - packetWriter.serverPacket = var36[var15]; + packetWriter.serverPacket = var38[var6]; packetWriter.serverPacketLength = packetWriter.serverPacket.length; - ((AbstractSocket)var1).read(var2.array, 0, 2); + var1.read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - Client var16 = class219.client; + Client var16 = class159.client; JSObject.getWindow(var16).call("zap", (Object[])null); - } catch (Throwable var18) { + } catch (Throwable var17) { } - class316.method1700(16); + class409.method2106(16); } - if (loginState != 16) { - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { + if (loginState == 16) { + if (var1.available() >= packetWriter.serverPacketLength) { + var2.offset = 0; + var1.read(var2.array, 0, packetWriter.serverPacketLength); + timer.method2185(); + MusicPatchNode2.method1658(); + class180.updatePlayer(var2); + class94.timeOfPreviousKeyPress = -1; + class151.loadRegions(false, var2); + packetWriter.serverPacket = null; + } + + } else { + if (loginState == 17 && var1.available() >= 2) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, 2); + var1.read(var2.array, 0, 2); var2.offset = 0; - class342.field3146 = var2.readUnsignedShort(); - class316.method1700(18); + ApproximateRouteStrategy.field359 = var2.readUnsignedShort(); + class409.method2106(18); } - if (loginState == 18 && ((AbstractSocket)var1).available() >= class342.field3146) { + if (loginState == 18 && var1.available() >= ApproximateRouteStrategy.field359) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, class342.field3146); + var1.read(var2.array, 0, ApproximateRouteStrategy.field359); var2.offset = 0; - String var40 = var2.readStringCp1252NullTerminated(); - String var42 = var2.readStringCp1252NullTerminated(); + String var37 = var2.readStringCp1252NullTerminated(); + String var35 = var2.readStringCp1252NullTerminated(); String var39 = var2.readStringCp1252NullTerminated(); - class318.setLoginResponseString(var40, var42, var39); - MusicSong.updateGameState(10); - if (field648.method2616()) { - PcmPlayer.method212(9); + AbstractWorldMapIcon.setLoginResponseString(var37, var35, var39); + DefaultsGroup.updateGameState(10); + if (field648.method2654()) { + GameEngine.method166(9); } } if (loginState == 19) { if (packetWriter.serverPacketLength == -1) { - if (((AbstractSocket)var1).available() < 2) { + if (var1.available() < 2) { return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); + var1.read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + if (var1.available() >= packetWriter.serverPacketLength) { + var1.read(var2.array, 0, packetWriter.serverPacketLength); var2.offset = 0; var13 = packetWriter.serverPacketLength; - timer.method2155(); - class105.method615(); - Actor.updatePlayer(var2); + timer.method2187(); + MouseHandler.method178(); + class180.updatePlayer(var2); if (var13 != var2.offset) { throw new RuntimeException(); } } } else { - ++field448; - if (field448 > 2000) { - if (field447 < 1) { - if (class480.worldPort == class4.currentPort) { - class4.currentPort = class129.js5Port; + ++field444; + if (field444 > 2000) { + if (field448 < 1) { + if (ObjectComposition.worldPort == class164.currentPort) { + class164.currentPort = class363.js5Port; } else { - class4.currentPort = class480.worldPort; + class164.currentPort = ObjectComposition.worldPort; } - ++field447; - class316.method1700(0); + ++field448; + class409.method2106(0); } else { - class387.getLoginError(-3); - } - } - } - } else { - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method2153(); - mouseLastLastPressedTimeMillis = -1L; - class126.mouseRecorder.index = 0; - class370.hasFocus = true; - hadFocus = true; - timeOfPreviousKeyPress = -1L; - GrandExchangeOfferTotalQuantityComparator.method1943(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1159 = null; - packetWriter.field1157 = null; - packetWriter.field1158 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1154 = 0; - rebootTimer = 0; - logoutTimer = 0; - hintArrowType = 0; - Frames.method1297(); - class20.method64(0); - ChatChannel.method451(); - isItemSelected = 0; - isSpellSelected = false; - soundEffectCount = 0; - camAngleY = 0; - oculusOrbState = 0; - class390.field3656 = null; - minimapState = 0; - field538 = -1; - destinationX = 0; - destinationY = 0; - playerAttackOption = AttackOption.AttackOption_hidden; - npcAttackOption = AttackOption.AttackOption_hidden; - npcCount = 0; - Players.Players_count = 0; - - for (var13 = 0; var13 < 2048; ++var13) { - Players.cachedAppearanceBuffer[var13] = null; - Players.playerMovementSpeeds[var13] = MoveSpeed.WALK; - } - - for (var13 = 0; var13 < 2048; ++var13) { - players[var13] = null; - } - - for (var13 = 0; var13 < 65536; ++var13) { - npcs[var13] = null; - } - - combatTargetPlayerIndex = -1; - projectiles.clear(); - graphicsObjects.clear(); - - for (var13 = 0; var13 < 4; ++var13) { - for (var14 = 0; var14 < 104; ++var14) { - for (int var17 = 0; var17 < 104; ++var17) { - groundItems[var13][var14][var17] = null; - } - } - } - - pendingSpawns = new NodeDeque(); - class299.friendSystem.clear(); - - for (var13 = 0; var13 < VarpDefinition.field1498; ++var13) { - VarpDefinition var41 = ApproximateRouteStrategy.VarpDefinition_get(var13); - if (var41 != null) { - Varps.Varps_temp[var13] = 0; - Varps.Varps_main[var13] = 0; + class198.getLoginError(-3); } } - - KeyHandler.varcs.clearTransient(); - followerIndex = -1; - if (rootInterface != -1) { - Skeleton.method1232(rootInterface); - } - - for (InterfaceParent var37 = (InterfaceParent)interfaceParents.first(); var37 != null; var37 = (InterfaceParent)interfaceParents.next()) { - class92.closeInterface(var37, true); - } - - rootInterface = -1; - interfaceParents = new NodeHashTable(8); - meslayerContinueWidget = null; - Frames.method1297(); - playerAppearance.method1718((int[])null, (int[])null, new int[]{0, 0, 0, 0, 0}, 0, -1); - - for (var13 = 0; var13 < 8; ++var13) { - playerMenuActions[var13] = null; - playerOptionsPriorities[var13] = false; - } - - LoginPacket.method1614(); - isLoading = true; - - for (var13 = 0; var13 < 100; ++var13) { - field407[var13] = true; - } - - Message.method341(); - ReflectionCheck.friendsChat = null; - Players.guestClanSettings = null; - Arrays.fill(currentClanSettings, (Object)null); - VerticalAlignment.guestClanChannel = null; - Arrays.fill(currentClanChannels, (Object)null); - - for (var13 = 0; var13 < 8; ++var13) { - grandExchangeOffers[var13] = new GrandExchangeOffer(); - } - - class392.grandExchangeEvents = null; - reloadJS5 = false; - Actor.updatePlayer(var2); - Tiles.timeOfPreviousKeyPress = -1; - class271.loadRegions(false, var2); - packetWriter.serverPacket = null; } - } } - } catch (IOException var26) { - if (field447 < 1) { - if (class480.worldPort == class4.currentPort) { - class4.currentPort = class129.js5Port; + } catch (IOException var25) { + if (field448 < 1) { + if (ObjectComposition.worldPort == class164.currentPort) { + class164.currentPort = class363.js5Port; } else { - class4.currentPort = class480.worldPort; + class164.currentPort = ObjectComposition.worldPort; } - ++field447; - class316.method1700(0); + ++field448; + class409.method2106(0); } else { - class387.getLoginError(-2); + class198.getLoginError(-2); } } } - @ObfuscatedName("hv") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1704146678" + descriptor = "(B)V", + garbageValue = "1" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { @@ -2617,64 +2468,70 @@ final void doCycleLoggedIn() { if (hadNetworkError) { hadNetworkError = false; - Renderable.method1291(); + class148.method781(); } else { if (!isMenuOpen) { - class349.addCancelMenuEntry(); + StudioGame.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method374(packetWriter); ++var1) { + for (var1 = 0; var1 < 100 && this.method378(packetWriter); ++var1) { } if (gameState == 30) { while (true) { ReflectionCheck var2 = (ReflectionCheck)class36.reflectionChecks.last(); - boolean var29; + boolean var41; if (var2 == null) { - var29 = false; + var41 = false; } else { - var29 = true; + var41 = true; } int var3; - PacketBufferNode var30; - if (!var29) { - PacketBufferNode var14; - int var15; - if (timer.field3756) { - var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.LOGIN_STATISTICS, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - var15 = var14.packetBuffer.offset; - timer.write(var14.packetBuffer); - var14.packetBuffer.method2540(var14.packetBuffer.offset - var15); - packetWriter.addNode(var14); - timer.method2154(); + PacketBufferNode var42; + if (!var41) { + PacketBufferNode var20; + int var21; + if (timer.field3788) { + var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.LOGIN_TIMINGS, packetWriter.isaacCipher); + var20.packetBuffer.writeByte(0); + var21 = var20.packetBuffer.offset; + timer.write(var20.packetBuffer); + var20.packetBuffer.WriteLengthByte(var20.packetBuffer.offset - var21); + packetWriter.addNode(var20); + timer.method2186(); } int var4; int var5; - synchronized(class126.mouseRecorder.lock) { + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + synchronized(class233.mouseRecorder.lock) { if (!lockMouseRecorder) { - class126.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || class126.mouseRecorder.index >= 40) { - var30 = null; + class233.mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || class233.mouseRecorder.index >= 40) { + var42 = null; var3 = 0; var4 = 0; var5 = 0; - int var6 = 0; + var6 = 0; - int var7; - for (var7 = 0; var7 < class126.mouseRecorder.index && (var30 == null || var30.packetBuffer.offset - var3 < 246); ++var7) { + for (var7 = 0; var7 < class233.mouseRecorder.index && (var42 == null || var42.packetBuffer.offset - var3 < 246); ++var7) { var4 = var7; - int var8 = class126.mouseRecorder.ys[var7]; + var8 = class233.mouseRecorder.ys[var7]; if (var8 < -1) { var8 = -1; } else if (var8 > 65534) { var8 = 65534; } - int var9 = class126.mouseRecorder.xs[var7]; + var9 = class233.mouseRecorder.xs[var7]; if (var9 < -1) { var9 = -1; } else if (var9 > 65534) { @@ -2682,24 +2539,21 @@ final void doCycleLoggedIn() { } if (var9 != lastMouseRecordX || var8 != lastMouseRecordY) { - if (var30 == null) { - var30 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.notsure, packetWriter.isaacCipher); - var30.packetBuffer.writeByte(0); - var3 = var30.packetBuffer.offset; - PacketBuffer var10000 = var30.packetBuffer; + if (var42 == null) { + var42 = ClanChannelMember.getPacketBufferNode(ClientPacket.f52, packetWriter.isaacCipher); + var42.packetBuffer.writeByte(0); + var3 = var42.packetBuffer.offset; + PacketBuffer var10000 = var42.packetBuffer; var10000.offset += 2; var5 = 0; var6 = 0; } - int var10; - int var11; - int var12; - if (field612 != -1L) { + if (-1L != field610) { var10 = var9 - lastMouseRecordX; var11 = var8 - lastMouseRecordY; - var12 = (int)((class126.mouseRecorder.millis[var7] - field612) / 20L); - var5 = (int)((long)var5 + (class126.mouseRecorder.millis[var7] - field612) % 20L); + var12 = (int)((class233.mouseRecorder.millis[var7] - field610) / 20L); + var5 = (int)((long)var5 + (class233.mouseRecorder.millis[var7] - field610) % 20L); } else { var10 = var9; var11 = var8; @@ -2711,112 +2565,112 @@ final void doCycleLoggedIn() { if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { var10 += 32; var11 += 32; - var30.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); + var42.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { var10 += 128; var11 += 128; - var30.packetBuffer.writeByte(var12 + 128); - var30.packetBuffer.writeShort(var11 + (var10 << 8)); + var42.packetBuffer.writeByte(var12 + 128); + var42.packetBuffer.writeShort(var11 + (var10 << 8)); } else if (var12 < 32) { - var30.packetBuffer.writeByte(var12 + 192); + var42.packetBuffer.writeByte(var12 + 192); if (var9 != -1 && var8 != -1) { - var30.packetBuffer.writeInt(var9 | var8 << 16); + var42.packetBuffer.writeInt(var9 | var8 << 16); } else { - var30.packetBuffer.writeInt(Integer.MIN_VALUE); + var42.packetBuffer.writeInt(Integer.MIN_VALUE); } } else { - var30.packetBuffer.writeShort((var12 & 8191) + 57344); + var42.packetBuffer.writeShort((var12 & 8191) + 57344); if (var9 != -1 && var8 != -1) { - var30.packetBuffer.writeInt(var9 | var8 << 16); + var42.packetBuffer.writeInt(var9 | var8 << 16); } else { - var30.packetBuffer.writeInt(Integer.MIN_VALUE); + var42.packetBuffer.writeInt(Integer.MIN_VALUE); } } ++var6; - field612 = class126.mouseRecorder.millis[var7]; + field610 = class233.mouseRecorder.millis[var7]; } } - if (var30 != null) { - var30.packetBuffer.method2540(var30.packetBuffer.offset - var3); - var7 = var30.packetBuffer.offset; - var30.packetBuffer.offset = var3; - var30.packetBuffer.writeByte(var5 / var6); - var30.packetBuffer.writeByte(var5 % var6); - var30.packetBuffer.offset = var7; - packetWriter.addNode(var30); + if (var42 != null) { + var42.packetBuffer.WriteLengthByte(var42.packetBuffer.offset - var3); + var7 = var42.packetBuffer.offset; + var42.packetBuffer.offset = var3; + var42.packetBuffer.writeByte(var5 / var6); + var42.packetBuffer.writeByte(var5 % var6); + var42.packetBuffer.offset = var7; + packetWriter.addNode(var42); } - if (var4 >= class126.mouseRecorder.index) { - class126.mouseRecorder.index = 0; + if (var4 >= class233.mouseRecorder.index) { + class233.mouseRecorder.index = 0; } else { - MouseRecorder var43 = class126.mouseRecorder; - var43.index -= var4; - System.arraycopy(class126.mouseRecorder.xs, var4, class126.mouseRecorder.xs, 0, class126.mouseRecorder.index); - System.arraycopy(class126.mouseRecorder.ys, var4, class126.mouseRecorder.ys, 0, class126.mouseRecorder.index); - System.arraycopy(class126.mouseRecorder.millis, var4, class126.mouseRecorder.millis, 0, class126.mouseRecorder.index); + MouseRecorder var58 = class233.mouseRecorder; + var58.index -= var4; + System.arraycopy(class233.mouseRecorder.xs, var4, class233.mouseRecorder.xs, 0, class233.mouseRecorder.index); + System.arraycopy(class233.mouseRecorder.ys, var4, class233.mouseRecorder.ys, 0, class233.mouseRecorder.index); + System.arraycopy(class233.mouseRecorder.millis, var4, class233.mouseRecorder.millis, 0, class233.mouseRecorder.index); } } } - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; - if (var16 > 32767L) { - var16 = 32767L; + PacketBufferNode var24; + if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + long var22 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; + if (var22 > 32767L) { + var22 = 32767L; } mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; var3 = MouseHandler.MouseHandler_lastPressedY; if (var3 < 0) { var3 = 0; - } else if (var3 > class177.canvasHeight) { - var3 = class177.canvasHeight; + } else if (var3 > class491.canvasHeight) { + var3 = class491.canvasHeight; } var4 = MouseHandler.MouseHandler_lastPressedX; if (var4 < 0) { var4 = 0; - } else if (var4 > class113.canvasWidth) { - var4 = class113.canvasWidth; + } else if (var4 > class340.canvasWidth) { + var4 = class340.canvasWidth; } - var5 = (int)var16; - if (shouldProcessClick()) { - var18 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_MOUSE_CLICK, packetWriter.isaacCipher); - var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); - var18.packetBuffer.writeShort(var4); - var18.packetBuffer.writeShort(var3); - packetWriter.addNode(var18); + var5 = (int)var22; + if(shouldProcessClick()) { + var24 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_MOUSE_CLICK, packetWriter.isaacCipher); + var24.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); + var24.packetBuffer.writeShort(var4); + var24.packetBuffer.writeShort(var3); + packetWriter.addNode(var24); } } if (mouseWheelRotation != 0) { - var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_MOUSE_SCROLl, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(mouseWheelRotation); - packetWriter.addNode(var14); + var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.f17, packetWriter.isaacCipher); + var20.packetBuffer.writeShort(mouseWheelRotation); + packetWriter.addNode(var20); } if (keyHandlerInstance.pressedKeysCount > 0) { - var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_KEYBOARD, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(0); - var15 = var14.packetBuffer.offset; - long var19 = GameEngine.clockNow(); + var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_KEYBOARD, packetWriter.isaacCipher); + var20.packetBuffer.writeShort(0); + var21 = var20.packetBuffer.offset; + long var25 = GrandExchangeOfferTotalQuantityComparator.method1971(); for (var5 = 0; var5 < keyHandlerInstance.pressedKeysCount; ++var5) { - long var21 = var19 - timeOfPreviousKeyPress; - if (var21 > 16777215L) { - var21 = 16777215L; + long var27 = var25 - timeOfPreviousKeyPress; + if (var27 > 16777215L) { + var27 = 16777215L; } - timeOfPreviousKeyPress = var19; - var14.packetBuffer.writeByteNeg(keyHandlerInstance.field1892[var5]); - var14.packetBuffer.writeMediumLE((int)var21); + timeOfPreviousKeyPress = var25; + var20.packetBuffer.writeByte(keyHandlerInstance.field1902[var5]); + var20.packetBuffer.writeMediumLE((int)var27); } - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); - packetWriter.addNode(var14); + var20.packetBuffer.writeLengthShort(var20.packetBuffer.offset - var21); + packetWriter.addNode(var20); } if (packetIndicator > 0) { @@ -2830,77 +2684,91 @@ final void doCycleLoggedIn() { if (emitPackets && packetIndicator <= 0) { packetIndicator = 20; emitPackets = false; - var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_CAMERA_POSITION, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(camAngleY); - var14.packetBuffer.writeShortAddLE(camAngleX); - packetWriter.addNode(var14); + var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_CAMERA_FOCUS, packetWriter.isaacCipher); + var20.packetBuffer.writeShortLE(camAngleY); + var20.packetBuffer.writeShortAddLE(camAngleX); + packetWriter.addNode(var20); } - if (class370.hasFocus && !hadFocus) { + if (KeyHandler.hasFocus && !hadFocus) { hadFocus = true; - var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(1); - packetWriter.addNode(var14); + var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); + var20.packetBuffer.writeByte(1); + packetWriter.addNode(var20); } - if (!class370.hasFocus && hadFocus) { + if (!KeyHandler.hasFocus && hadFocus) { hadFocus = false; - var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - packetWriter.addNode(var14); + var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); + var20.packetBuffer.writeByte(0); + packetWriter.addNode(var20); } - if (Canvas.worldMap != null) { - Canvas.worldMap.method2384(); + if (class434.worldMap != null) { + class434.worldMap.method2422(); } - if (SpotAnimationDefinition.ClanChat_inClanChat) { - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.sort(); - } - + class143.method759(); + if (PcmPlayer.field180) { for (var1 = 0; var1 < Players.Players_count; ++var1) { - Player var31 = players[Players.Players_indices[var1]]; - var31.clearIsInFriendsChat(); + Player var43 = players[Players.Players_indices[var1]]; + var43.clearIsInClanChat(); } - SpotAnimationDefinition.ClanChat_inClanChat = false; + PcmPlayer.field180 = false; + } + + if (field539 != class87.Client_plane) { + field539 = class87.Client_plane; + class87.method463(class87.Client_plane); } - AddRequestTask.method2124(); - class164.method864(); if (gameState != 30) { return; } - Ignored.method2249(); - Canvas.method77(); - ++packetWriter.field1154; - if (packetWriter.field1154 > 750) { - Renderable.method1291(); + UserComparator8.method669(); + class73.method423(); + ++packetWriter.field1152; + if (packetWriter.field1152 > 750) { + class148.method781(); return; } - var1 = Players.Players_count; - int[] var32 = Players.Players_indices; + class139.method745(); - for (var3 = 0; var3 < var1; ++var3) { - Player var23 = players[var32[var3]]; - if (var23 != null) { - class318.updateActorSequence(var23, 1); + for (var1 = 0; var1 < npcCount; ++var1) { + var21 = npcIndices[var1]; + NPC var29 = npcs[var21]; + if (var29 != null) { + class6.updateActorSequence(var29, var29.definition.size); } } - for (var1 = 0; var1 < npcCount; ++var1) { - var15 = npcIndices[var1]; - NPC var24 = npcs[var15]; - if (var24 != null) { - class318.updateActorSequence(var24, var24.definition.size); + int[] var49 = Players.Players_indices; + + for (var21 = 0; var21 < Players.Players_count; ++var21) { + Player var52 = players[var49[var21]]; + if (var52 != null && var52.overheadTextCyclesRemaining > 0) { + --var52.overheadTextCyclesRemaining; + if (var52.overheadTextCyclesRemaining == 0) { + var52.overheadText = null; + } + } + } + + for (var21 = 0; var21 < npcCount; ++var21) { + var3 = npcIndices[var21]; + NPC var30 = npcs[var3]; + if (var30 != null && var30.overheadTextCyclesRemaining > 0) { + --var30.overheadTextCyclesRemaining; + if (var30.overheadTextCyclesRemaining == 0) { + var30.overheadText = null; + } } } - WorldMapManager.method1482(); - ++field457; + ++field460; if (mouseCrossColor != 0) { mouseCrossState += 20; if (mouseCrossState >= 400) { @@ -2908,255 +2776,541 @@ final void doCycleLoggedIn() { } } - Widget var35 = class146.mousedOverWidgetIf1; - Widget var33 = class343.field3147; - class146.mousedOverWidgetIf1 = null; - class343.field3147 = null; + Widget var50 = class64.mousedOverWidgetIf1; + Widget var44 = GrandExchangeOfferNameComparator.field3615; + class64.mousedOverWidgetIf1 = null; + GrandExchangeOfferNameComparator.field3615 = null; draggedOnWidget = null; - field397 = false; - field395 = false; - field532 = 0; - - while (keyHandlerInstance.method1105() && field532 < 128) { - if (staffModLevel >= 2 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.field1890 == 66) { - StringBuilder var38 = new StringBuilder(); - - Message var36; - for (Iterator var25 = Messages.Messages_hashTable.iterator(); var25.hasNext(); var38.append(var36.text).append('\n')) { - var36 = (Message)var25.next(); - if (var36.sender != null && !var36.sender.isEmpty()) { - var38.append(var36.sender).append(':'); - } - } - - String var40 = var38.toString(); - class219.client.method138(var40); - } else if (oculusOrbState != 1 || keyHandlerInstance.field1889 <= 0) { - field581[field532] = keyHandlerInstance.field1890; - field580[field532] = keyHandlerInstance.field1889; - ++field532; + field394 = false; + field396 = false; + field533 = 0; + + while (keyHandlerInstance.method1148() && field533 < 128) { + if (staffModLevel >= 2 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.field1901 == 66) { + String var53 = RouteStrategy.method1170(); + class159.client.method141(var53); + } else if (oculusOrbState != 1 || keyHandlerInstance.field1899 <= 0) { + field577[field533] = keyHandlerInstance.field1901; + field578[field533] = keyHandlerInstance.field1899; + ++field533; } } - boolean var34 = staffModLevel >= 2; - if (var34 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.getKeyPressed(81) && mouseWheelRotation != 0) { - var4 = VarbitComposition.localPlayer.plane - mouseWheelRotation; + boolean var45 = staffModLevel >= 2; + PacketBufferNode var31; + if (var45 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.getKeyPressed(81) && mouseWheelRotation != 0) { + var4 = TextureProvider.localPlayer.plane - mouseWheelRotation; if (var4 < 0) { var4 = 0; } else if (var4 > 3) { var4 = 3; } - if (var4 != VarbitComposition.localPlayer.plane) { - NPC.method597(VarbitComposition.localPlayer.pathX[0] + UrlRequester.baseX, VarbitComposition.localPlayer.pathY[0] + class47.baseY, var4, false); + if (var4 != TextureProvider.localPlayer.plane) { + var5 = TextureProvider.localPlayer.pathX[0] + class20.baseX; + var6 = TextureProvider.localPlayer.pathY[0] + class19.baseY; + var31 = ClanChannelMember.getPacketBufferNode(ClientPacket.f20, packetWriter.isaacCipher); + var31.packetBuffer.writeShortAddLE(var5); + var31.packetBuffer.writeShortLE(var6); + var31.packetBuffer.writeInt(0); + var31.packetBuffer.writeByteAdd(var4); + packetWriter.addNode(var31); } mouseWheelRotation = 0; } if (MouseHandler.MouseHandler_lastButton == 1) { - field423.method1090(); + field422.method1134(); } if (rootInterface != -1) { - LoginScreenAnimation.updateRootInterface(rootInterface, 0, 0, class113.canvasWidth, class177.canvasHeight, 0, 0); + class511.updateRootInterface(rootInterface, 0, 0, class340.canvasWidth, class491.canvasHeight, 0, 0); } ++cycleCntr; while (true) { - Widget var37; - ScriptEvent var39; - Widget var42; + Widget var32; + Widget var51; + ScriptEvent var54; do { - var39 = (ScriptEvent)field629.removeLast(); - if (var39 == null) { + var54 = (ScriptEvent)field628.removeLast(); + if (var54 == null) { while (true) { do { - var39 = (ScriptEvent)field630.removeLast(); - if (var39 == null) { + var54 = (ScriptEvent)field629.removeLast(); + if (var54 == null) { while (true) { do { - var39 = (ScriptEvent)scriptEvents.removeLast(); - if (var39 == null) { + var54 = (ScriptEvent)scriptEvents.removeLast(); + if (var54 == null) { while (true) { - class211 var41 = (class211)field628.removeLast(); - if (var41 == null) { - this.menu(); - WorldMapRectangle.method1529(); - if (clickedWidget != null) { - this.method380(); - } - - if (Scene.shouldSendWalk()) { - var4 = Scene.Scene_selectedX; - var5 = Scene.Scene_selectedY; - var18 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.MOVE_GAMECLICK, packetWriter.isaacCipher); - var18.packetBuffer.writeByte(5); - var18.packetBuffer.writeShortAddLE(var4 + UrlRequester.baseX); - var18.packetBuffer.writeShortAdd(var5 + class47.baseY); - var18.packetBuffer.writeByteSub(keyHandlerInstance.getKeyPressed(82) ? (keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); - packetWriter.addNode(var18); - Scene.method1275(); - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; - mouseCrossColor = 1; - mouseCrossState = 0; - destinationX = var4; - destinationY = var5; - } - - if (var35 != class146.mousedOverWidgetIf1) { - if (var35 != null) { - class218.invalidateWidget(var35); - } - - if (class146.mousedOverWidgetIf1 != null) { - class218.invalidateWidget(class146.mousedOverWidgetIf1); - } - } - - if (var33 != class343.field3147 && field496 == field498) { - if (var33 != null) { - class218.invalidateWidget(var33); - } - - if (class343.field3147 != null) { - class218.invalidateWidget(class343.field3147); + while (true) { + class225 var55; + do { + do { + do { + var55 = (class225)field626.removeLast(); + if (var55 == null) { + this.menu(); + class30.method124(); + if (clickedWidget != null) { + this.method384(); + } + + if (Scene.shouldSendWalk()) { + var4 = Scene.Scene_selectedX; + var5 = Scene.Scene_selectedY; + var24 = ClanChannelMember.getPacketBufferNode(ClientPacket.MOVE_GAMECLICK, packetWriter.isaacCipher); + var24.packetBuffer.writeByte(5); + var24.packetBuffer.writeShortAdd(var5 + class19.baseY); + var24.packetBuffer.writeByte(keyHandlerInstance.getKeyPressed(82) ? (keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); + var24.packetBuffer.writeShortAdd(var4 + class20.baseX); + packetWriter.addNode(var24); + Scene.method1319(); + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; + mouseCrossColor = 1; + mouseCrossState = 0; + destinationX = var4; + destinationY = var5; + } + + if (var50 != class64.mousedOverWidgetIf1) { + if (var50 != null) { + ClanChannelMember.invalidateWidget(var50); + } + + if (class64.mousedOverWidgetIf1 != null) { + ClanChannelMember.invalidateWidget(class64.mousedOverWidgetIf1); + } + } + + if (var44 != GrandExchangeOfferNameComparator.field3615 && field498 == field499) { + if (var44 != null) { + ClanChannelMember.invalidateWidget(var44); + } + + if (GrandExchangeOfferNameComparator.field3615 != null) { + ClanChannelMember.invalidateWidget(GrandExchangeOfferNameComparator.field3615); + } + } + + if (GrandExchangeOfferNameComparator.field3615 != null) { + if (field498 < field499) { + ++field498; + if (field498 == field499) { + ClanChannelMember.invalidateWidget(GrandExchangeOfferNameComparator.field3615); + } + } + } else if (field498 > 0) { + --field498; + } + + if (oculusOrbState == 0) { + var4 = TextureProvider.localPlayer.x; + var5 = TextureProvider.localPlayer.y; + if (ChatChannel.oculusOrbFocalPointX - var4 < -500 || ChatChannel.oculusOrbFocalPointX - var4 > 500 || AbstractWorldMapData.oculusOrbFocalPointY - var5 < -500 || AbstractWorldMapData.oculusOrbFocalPointY - var5 > 500) { + ChatChannel.oculusOrbFocalPointX = var4; + AbstractWorldMapData.oculusOrbFocalPointY = var5; + } + + if (var4 != ChatChannel.oculusOrbFocalPointX) { + ChatChannel.oculusOrbFocalPointX += (var4 - ChatChannel.oculusOrbFocalPointX) / 16; + } + + if (var5 != AbstractWorldMapData.oculusOrbFocalPointY) { + AbstractWorldMapData.oculusOrbFocalPointY += (var5 - AbstractWorldMapData.oculusOrbFocalPointY) / 16; + } + + var6 = ChatChannel.oculusOrbFocalPointX >> 7; + var7 = AbstractWorldMapData.oculusOrbFocalPointY >> 7; + var8 = class115.getTileHeight(ChatChannel.oculusOrbFocalPointX, AbstractWorldMapData.oculusOrbFocalPointY, class87.Client_plane); + var9 = 0; + if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { + for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { + for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { + var12 = class87.Client_plane; + if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { + ++var12; + } + + int var34 = var8 - Tiles.Tiles_heights[var12][var10][var11]; + if (var34 > var9) { + var9 = var34; + } + } + } + } + + var10 = var9 * 192; + if (var10 > 98048) { + var10 = 98048; + } + + if (var10 < 32768) { + var10 = 32768; + } + + if (var10 > field476) { + field476 += (var10 - field476) / 24; + } else if (var10 < field476) { + field476 += (var10 - field476) / 80; + } + + class433.field3789 = class115.getTileHeight(TextureProvider.localPlayer.x, TextureProvider.localPlayer.y, class87.Client_plane) - camFollowHeight; + } else if (oculusOrbState == 1) { + if (oculusOrbOnLocalPlayer && TextureProvider.localPlayer != null) { + var4 = TextureProvider.localPlayer.pathX[0]; + var5 = TextureProvider.localPlayer.pathY[0]; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + ChatChannel.oculusOrbFocalPointX = TextureProvider.localPlayer.x; + var6 = class115.getTileHeight(TextureProvider.localPlayer.x, TextureProvider.localPlayer.y, class87.Client_plane) - camFollowHeight; + if (var6 < class433.field3789) { + class433.field3789 = var6; + } + + AbstractWorldMapData.oculusOrbFocalPointY = TextureProvider.localPlayer.y; + oculusOrbOnLocalPlayer = false; + } + } + + short var47 = -1; + if (keyHandlerInstance.getKeyPressed(33)) { + var47 = 0; + } else if (keyHandlerInstance.getKeyPressed(49)) { + var47 = 1024; + } + + if (keyHandlerInstance.getKeyPressed(48)) { + if (var47 == 0) { + var47 = 1792; + } else if (var47 == 1024) { + var47 = 1280; + } else { + var47 = 1536; + } + } else if (keyHandlerInstance.getKeyPressed(50)) { + if (var47 == 0) { + var47 = 256; + } else if (var47 == 1024) { + var47 = 768; + } else { + var47 = 512; + } + } + + byte var48 = 0; + if (keyHandlerInstance.getKeyPressed(35)) { + var48 = -1; + } else if (keyHandlerInstance.getKeyPressed(51)) { + var48 = 1; + } + + var6 = 0; + if (var47 >= 0 || var48 != 0) { + var6 = keyHandlerInstance.getKeyPressed(81) ? oculusOrbSlowedSpeed * -872637063 * -4178743 : oculusOrbNormalSpeed * -199987921 * -2029520433; + var6 *= 16; + field466 = var47; + field477 = var48; + } + + if (field478 < var6) { + field478 += var6 / 8; + if (field478 > var6) { + field478 = var6; + } + } else if (field478 > var6) { + field478 = field478 * 9 / 10; + } + + if (field478 > 0) { + var7 = field478 / 16; + if (field466 >= 0) { + var4 = field466 - WallDecoration.cameraYaw & 2047; + var8 = Rasterizer3D.Rasterizer3D_sine[var4]; + var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; + ChatChannel.oculusOrbFocalPointX += var7 * var8 / 65536; + AbstractWorldMapData.oculusOrbFocalPointY += var9 * var7 / 65536; + } + + if (field477 != 0) { + class433.field3789 += var7 * field477; + if (class433.field3789 > 0) { + class433.field3789 = 0; + } + } + } else { + field466 = -1; + field477 = -1; + } + + if (keyHandlerInstance.getKeyPressed(13)) { + class425.method2178(); + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && UserComparator8.mouseCam) { + var4 = MouseHandler.MouseHandler_y - field470; + camAngleDX = var4 * 2; + field470 = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_y + field470) / 2 : MouseHandler.MouseHandler_y * 397181729 * -167198495; + var5 = field467 - MouseHandler.MouseHandler_x; + camAngleDY = var5 * 2; + field467 = var5 != -1 && var5 != 1 ? (field467 + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -963425685 * 44569155; + } else { + if (keyHandlerInstance.getKeyPressed(96)) { + camAngleDY += (-24 - camAngleDY) / 2; + } else if (keyHandlerInstance.getKeyPressed(97)) { + camAngleDY += (24 - camAngleDY) / 2; + } else { + camAngleDY /= 2; + } + + if (keyHandlerInstance.getKeyPressed(98)) { + camAngleDX += (12 - camAngleDX) / 2; + } else if (keyHandlerInstance.getKeyPressed(99)) { + camAngleDX += (-12 - camAngleDX) / 2; + } else { + camAngleDX /= 2; + } + + field470 = MouseHandler.MouseHandler_y; + field467 = MouseHandler.MouseHandler_x; + } + + camAngleY = camAngleDY / 2 + camAngleY & 2047; + camAngleX += camAngleDX / 2; + if (camAngleX < 128) { + camAngleX = 128; + } + + if (camAngleX > 383) { + camAngleX = 383; + } + + if (field400) { + WorldMapSectionType.method1555(AbstractUserComparator.field3834, TriBool.field3849, JagexCache.field1450); + Projectile.method438(class14.field36, GrandExchangeOfferOwnWorldComparator.field360); + if (AbstractUserComparator.field3834 == cameraX && class17.cameraY == TriBool.field3849 && JagexCache.field1450 == WorldMapArea.cameraZ && class14.field36 == class365.cameraPitch && WallDecoration.cameraYaw == GrandExchangeOfferOwnWorldComparator.field360) { + field400 = false; + isCameraLocked = false; + field402 = false; + field401 = false; + class148.cameraLookAtX = 0; + BufferedNetSocket.cameraLookAtY = 0; + class161.cameraLookAtHeight = 0; + class232.cameraLookAtSpeed = 0; + class465.cameraLookAtAcceleration = 0; + class131.cameraMoveToAcceleration = 0; + SecureRandomCallable.cameraMoveToSpeed = 0; + class191.cameraMoveToX = 0; + MouseHandler.cameraMoveToY = 0; + SoundSystem.cameraMoveToHeight = 0; + field646 = null; + field642 = null; + field643 = null; + } + } else if (isCameraLocked) { + PcmPlayer.method221(); + } + + for (var4 = 0; var4 < 5; ++var4) { + int var10002 = cameraShakeCycle[var4]++; + } + + class33.varcs.tryWrite(); + var4 = ++MouseHandler.MouseHandler_idleCycles - 1; + var6 = BuddyRankComparator.method688(); + if (var4 > 15000 && var6 > 15000) { + logoutTimer = 250; + class138.method733(14500); + var31 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_MOUSE_IDLE, packetWriter.isaacCipher); + packetWriter.addNode(var31); + } + + InvDefinition.friendSystem.processFriendUpdates(); + + for (var7 = 0; var7 < field608.size(); ++var7) { + var9 = (Integer)field608.get(var7); + class139 var35 = (class139)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var9); + class139 var36; + if (var35 != null) { + var36 = var35; + } else { + AbstractArchive var13 = SequenceDefinition.SequenceDefinition_animationsArchive; + AbstractArchive var14 = SequenceDefinition.SequenceDefinition_skeletonsArchive; + boolean var15 = true; + byte[] var16 = var13.getFile(var9 >> 16 & 65535, var9 & 65535); + class139 var37; + if (var16 == null) { + var15 = false; + var37 = null; + } else { + int var17 = (var16[1] & 255) << 8 | var16[2] & 255; + byte[] var18 = var14.getFile(var17, 0); + if (var18 == null) { + var15 = false; + } + + if (!var15) { + var37 = null; + } else { + if (SoundCache.field214 == null) { + MusicPatchPcmStream.field2855 = Runtime.getRuntime().availableProcessors(); + SoundCache.field214 = new ThreadPoolExecutor(0, MusicPatchPcmStream.field2855, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(MusicPatchPcmStream.field2855 * 100 + 100), new class64(this)); + } + + try { + var37 = new class139(var13, var14, var9, false); + } catch (Exception var39) { + var37 = null; + } + } + } + + if (var37 != null) { + SequenceDefinition.SequenceDefinition_cachedModel.put(var37, (long)var9); + } + + var36 = var37; + } + + if (var36 == null) { + var8 = 2; + } else { + var8 = var36.method738() ? 0 : 1; + } + + if (var8 != 2) { + field608.remove(var7); + --var7; + } + } + + ++packetWriter.pendingWrites; + if (packetWriter.pendingWrites > 50) { + var31 = ClanChannelMember.getPacketBufferNode(ClientPacket.NO_TIMEOUT, packetWriter.isaacCipher); + packetWriter.addNode(var31); + } + + try { + packetWriter.flush(); + } catch (IOException var38) { + class148.method781(); + } + + return; + } + } while(var55 == null); + } while(var55.field1888 == null); + + if (var55.field1888.childIndex < 0) { + break; } - } - if (class343.field3147 != null) { - if (field496 < field498) { - ++field496; - if (field496 == field498) { - class218.invalidateWidget(class343.field3147); + var32 = class33.field89.method1740(var55.field1888.parentId); + } while(var32 == null || var32.children == null || var32.children.length == 0 || var55.field1888.childIndex >= var32.children.length || var55.field1888 != var32.children[var55.field1888.childIndex]); + + if (var55.field1888.type == 11 && var55.field1886 == 0) { + if (var55.field1888.method1866(var55.field1885, var55.field1887, 0, 0)) { + switch(var55.field1888.method1870()) { + case 0: + VertexNormal.openURL(var55.field1888.method1872(), true, false); + break; + case 1: + var6 = MouseRecorder.getWidgetFlags(var55.field1888); + boolean var46 = (var6 >> 22 & 1) != 0; + if (var46) { + int[] var56 = var55.field1888.method1873(); + if (var56 != null) { + PacketBufferNode var33 = ClanChannelMember.getPacketBufferNode(ClientPacket.f11, packetWriter.isaacCipher); + var33.packetBuffer.writeShortLE(var55.field1888.childIndex); + var33.packetBuffer.writeInt(var55.field1888.method1871()); + var33.packetBuffer.writeIntLE(var55.field1888.id); + var33.packetBuffer.writeIntIME(var56[1]); + var33.packetBuffer.writeIntME(var56[0]); + var33.packetBuffer.writeIntME(var56[2]); + packetWriter.addNode(var33); + } + } } } - } else if (field496 > 0) { - --field496; - } - - class415.method2159(); - if (field400) { - class126.method702(FontName.field4045, KeyHandler.field70, class31.field84); - class416.method2161(UserComparator4.field1180, VertexNormal.field2255); - if (NPCComposition.cameraX == FontName.field4045 && class133.cameraY == KeyHandler.field70 && class139.cameraZ == class31.field84 && class129.cameraPitch == UserComparator4.field1180 && UserComparator10.cameraYaw == VertexNormal.field2255) { - field400 = false; - isCameraLocked = false; - field402 = false; - field404 = false; - PendingSpawn.cameraLookAtX = 0; - VarbitComposition.cameraLookAtY = 0; - MusicPatchNode2.cameraLookAtHeight = 0; - class33.cameraLookAtSpeed = 0; - WorldMapElement.cameraLookAtAcceleration = 0; - MouseHandler.cameraMoveToAcceleration = 0; - class344.cameraMoveToSpeed = 0; - Players.cameraMoveToX = 0; - class33.cameraMoveToY = 0; - VarpDefinition.cameraMoveToHeight = 0; - field642 = null; - field647 = null; - field646 = null; + } else if (var55.field1888.type == 12) { + class344 var57 = var55.field1888.method1877(); + if (var57 != null && var57.method1815()) { + switch(var55.field1886) { + case 0: + field422.method1132(var55.field1888); + var57.method1763(true); + var57.method1802(var55.field1885, var55.field1887, keyHandlerInstance.getKeyPressed(82), keyHandlerInstance.getKeyPressed(81)); + break; + case 1: + var57.method1803(var55.field1885, var55.field1887); + } } - } else if (isCameraLocked) { - class140.method762(); - } - - for (var4 = 0; var4 < 5; ++var4) { - int var10002 = cameraShakeCycle[var4]++; - } - - KeyHandler.varcs.tryWrite(); - var4 = MusicPatchPcmStream.method1690(); - var5 = GameEngine.keyHandler.getIdleCycles(); - PacketBufferNode var26; - if (var4 > 15000 && var5 > 15000) { - logoutTimer = 250; - class20.method64(14500); - var26 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IDLE_LOGOUT, packetWriter.isaacCipher); - packetWriter.addNode(var26); - } - - class299.friendSystem.processFriendUpdates(); - FileSystem.method915(); - ++packetWriter.pendingWrites; - if (packetWriter.pendingWrites > 50) { - var26 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.NO_TIMEOUT, packetWriter.isaacCipher); - packetWriter.addNode(var26); - } - - try { - packetWriter.flush(); - } catch (IOException var27) { - Renderable.method1291(); } - - return; } - - ClanChannel.method862(var41); } } - var42 = var39.widget; - if (var42.childIndex < 0) { + var32 = var54.widget; + if (var32.childIndex < 0) { break; } - var37 = class92.getWidget(var42.parentId); - } while(var37 == null || var37.children == null || var42.childIndex >= var37.children.length || var42 != var37.children[var42.childIndex]); + var51 = class33.field89.method1740(var32.parentId); + } while(var51 == null || var51.children == null || var32.childIndex >= var51.children.length || var32 != var51.children[var32.childIndex]); - WorldMapSection1.runScriptEvent(var39); + Interpreter.runScriptEvent(var54); } } - var42 = var39.widget; - if (var42.childIndex < 0) { + var32 = var54.widget; + if (var32.childIndex < 0) { break; } - var37 = class92.getWidget(var42.parentId); - } while(var37 == null || var37.children == null || var42.childIndex >= var37.children.length || var42 != var37.children[var42.childIndex]); + var51 = class33.field89.method1740(var32.parentId); + } while(var51 == null || var51.children == null || var32.childIndex >= var51.children.length || var32 != var51.children[var32.childIndex]); - WorldMapSection1.runScriptEvent(var39); + Interpreter.runScriptEvent(var54); } } - var42 = var39.widget; - if (var42.childIndex < 0) { + var32 = var54.widget; + if (var32.childIndex < 0) { break; } - var37 = class92.getWidget(var42.parentId); - } while(var37 == null || var37.children == null || var42.childIndex >= var37.children.length || var42 != var37.children[var42.childIndex]); + var51 = class33.field89.method1740(var32.parentId); + } while(var51 == null || var51.children == null || var32.childIndex >= var51.children.length || var32 != var51.children[var32.childIndex]); - WorldMapSection1.runScriptEvent(var39); + Interpreter.runScriptEvent(var54); } } - var30 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.REFLECTION_CHECK_REPLY, packetWriter.isaacCipher); - var30.packetBuffer.writeByte(0); - var3 = var30.packetBuffer.offset; - SceneTilePaint.performReflectionCheck(var30.packetBuffer); - var30.packetBuffer.method2540(var30.packetBuffer.offset - var3); - packetWriter.addNode(var30); + var42 = ClanChannelMember.getPacketBufferNode(ClientPacket.REFLECTION_CHECK_REPLY, packetWriter.isaacCipher); + var42.packetBuffer.writeByte(0); + var3 = var42.packetBuffer.offset; + class305.performReflectionCheck(var42.packetBuffer); + var42.packetBuffer.WriteLengthByte(var42.packetBuffer.offset - var3); + packetWriter.addNode(var42); } } } } - @ObfuscatedName("iw") + @ObfuscatedName("ix") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-9429" + descriptor = "(III)V", + garbageValue = "328818380" ) @Export("vmethod1644") public void vmethod1644(int var1, int var2) { if (packetWriter != null && packetWriter.isaacCipher != null) { - if (var1 > -1 && class449.clientPreferences.getCurrentMusicVolume() > 0 && !playingJingle) { - PacketBufferNode var3 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.SOUND_SONGEND, packetWriter.isaacCipher); + if (var1 > -1 && class91.clientPreferences.getCurrentMusicVolume() > 0 && !playingJingle) { + PacketBufferNode var3 = ClanChannelMember.getPacketBufferNode(ClientPacket.SOUND_SONGEND, packetWriter.isaacCipher); var3.packetBuffer.writeInt(var1); packetWriter.addNode(var3); } @@ -3164,15 +3318,15 @@ public void vmethod1644(int var1, int var2) { } } - @ObfuscatedName("jk") + @ObfuscatedName("ia") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "347895574" + garbageValue = "-1844765006" ) @Export("resizeJS") void resizeJS() { - int var1 = class113.canvasWidth; - int var2 = class177.canvasHeight; + int var1 = class340.canvasWidth; + int var2 = class491.canvasHeight; if (super.contentWidth < var1) { var1 = super.contentWidth; } @@ -3181,207 +3335,269 @@ void resizeJS() { var2 = super.contentHeight; } - if (class449.clientPreferences != null) { + if (class91.clientPreferences != null) { try { - class26.method95(class219.client, "resize", new Object[]{class218.getWindowedMode()}); - } catch (Throwable var4) { + Client var3 = class159.client; + Object[] var4 = new Object[]{class178.getWindowedMode()}; + JSObject.getWindow(var3).call("resize", var4); + } catch (Throwable var5) { } } } - @ObfuscatedName("jv") + @ObfuscatedName("id") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "1" + garbageValue = "4" ) @Export("drawLoggedIn") final void drawLoggedIn() { if (rootInterface != -1) { - class316.method1699(rootInterface); + class178.method926(rootInterface); } int var1; for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field407[var1]) { - field408[var1] = true; + if (field408[var1]) { + field407[var1] = true; } - field409[var1] = field407[var1]; - field407[var1] = false; + field406[var1] = field408[var1]; + field408[var1] = false; } - field527 = cycle; + field523 = cycle; viewportX = -1; viewportY = -1; if (rootInterface != -1) { rootWidgetCount = 0; - class36.drawWidgets(rootInterface, 0, 0, class113.canvasWidth, class177.canvasHeight, 0, 0, -1); + class410.drawWidgets(rootInterface, 0, 0, class340.canvasWidth, class491.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); if (showMouseCross) { if (mouseCrossColor == 1) { - class152.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + EnumComposition.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } if (mouseCrossColor == 2) { - class152.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + EnumComposition.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } int var2; int var3; + int var4; + int var6; + int var7; + int var8; if (!isMenuOpen) { if (viewportX != -1) { - var1 = viewportX; - var2 = viewportY; - if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { - var3 = menuOptionsCount - 1; - String var5; - if (isItemSelected == 1 && menuOptionsCount < 2) { - var5 = "Use" + " " + field599 + " " + "->"; - } else if (isSpellSelected && menuOptionsCount < 2) { - var5 = field600 + " " + field601 + " " + "->"; - } else { - var5 = class181.method928(var3); - } - - if (menuOptionsCount > 2) { - var5 = var5 + MoveSpeed.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; - } - - class59.fontBold12.drawRandomAlphaAndSpacing(var5, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); - } + class135.method730(viewportX, viewportY); } } else { - var1 = class12.menuX; - var2 = class419.menuY; - var3 = class316.menuWidth; - int var4 = Occluder.menuHeight; - int var13 = 6116423; - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var13); + var1 = class28.menuX; + var2 = class463.menuY; + var3 = class341.menuWidth; + var4 = Language.menuHeight; + int var5 = 6116423; + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); - class59.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var13, -1); - int var6 = MouseHandler.MouseHandler_x; - int var7 = MouseHandler.MouseHandler_y; + SoundCache.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); + var6 = MouseHandler.MouseHandler_x; + var7 = MouseHandler.MouseHandler_y; - int var8; int var9; int var10; for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; + var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; var10 = 16777215; if (var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { var10 = 16776960; } - class59.fontBold12.draw(class181.method928(var8), var1 + 3, var9, var10, 0); + SoundCache.fontBold12.draw(class169.method882(var8), var1 + 3, var9, var10, 0); } - var8 = class12.menuX; - var9 = class419.menuY; - var10 = class316.menuWidth; - int var11 = Occluder.menuHeight; + var8 = class28.menuX; + var9 = class463.menuY; + var10 = class341.menuWidth; + int var11 = Language.menuHeight; for (int var12 = 0; var12 < rootWidgetCount; ++var12) { - if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var8 && rootWidgetXs[var12] < var8 + var10 && rootWidgetYs[var12] + rootWidgetHeights[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { - field408[var12] = true; + if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var10 + var8 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { + field407[var12] = true; } } } if (gameDrawingMode == 3) { for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field409[var1]) { + if (field406[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field408[var1]) { + } else if (field407[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - class131.method729(HealthBar.Client_plane, VarbitComposition.localPlayer.x, VarbitComposition.localPlayer.y, field457); - field457 = 0; + var1 = class87.Client_plane; + var2 = TextureProvider.localPlayer.x; + var3 = TextureProvider.localPlayer.y; + var4 = field460; + + for (ObjectSound var13 = (ObjectSound)ObjectSound.objectSounds.last(); var13 != null; var13 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var13.soundEffectId != -1 || var13.soundEffectIds != null) { + var6 = 0; + if (var2 > var13.maxX) { + var6 += var2 - var13.maxX; + } else if (var2 < var13.x) { + var6 += var13.x - var2; + } + + if (var3 > var13.maxY) { + var6 += var3 - var13.maxY; + } else if (var3 < var13.y) { + var6 += var13.y - var3; + } + + if (var6 - 64 <= var13.field696 && class91.clientPreferences.getAreaSoundEffectsVolume() != 0 && var1 == var13.plane) { + var6 -= 64; + if (var6 < 0) { + var6 = 0; + } + + var7 = (var13.field696 - var6) * class91.clientPreferences.getAreaSoundEffectsVolume() / var13.field696; + Object var10000; + if (var13.stream1 == null) { + if (var13.soundEffectId >= 0) { + var10000 = null; + SoundEffect var14 = SoundEffect.readSoundEffect(class469.field3930, var13.soundEffectId, 0); + if (var14 != null) { + RawSound var15 = var14.toRawSound().resample(class136.decimator); + RawPcmStream var16 = RawPcmStream.createRawPcmStream(var15, 100, var7); + var16.setNumLoops(-1); + class140.pcmStreamMixer.addSubStream(var16); + var13.stream1 = var16; + } + } + } else { + var13.stream1.method247(var7); + } + + if (var13.stream2 == null) { + if (var13.soundEffectIds != null && (var13.field695 -= var4) <= 0) { + var8 = (int)(Math.random() * (double)var13.soundEffectIds.length); + var10000 = null; + SoundEffect var18 = SoundEffect.readSoundEffect(class469.field3930, var13.soundEffectIds[var8], 0); + if (var18 != null) { + RawSound var19 = var18.toRawSound().resample(class136.decimator); + RawPcmStream var17 = RawPcmStream.createRawPcmStream(var19, 100, var7); + var17.setNumLoops(0); + class140.pcmStreamMixer.addSubStream(var17); + var13.stream2 = var17; + var13.field695 = var13.field697 + (int)(Math.random() * (double)(var13.field690 - var13.field697)); + } + } + } else { + var13.stream2.method247(var7); + if (!var13.stream2.hasNext()) { + var13.stream2 = null; + } + } + } else { + if (var13.stream1 != null) { + class140.pcmStreamMixer.removeSubStream(var13.stream1); + var13.stream1 = null; + } + + if (var13.stream2 != null) { + class140.pcmStreamMixer.removeSubStream(var13.stream2); + var13.stream2 = null; + } + } + } + } + + field460 = 0; } - @ObfuscatedName("ks") + @ObfuscatedName("kr") @ObfuscatedSignature( - descriptor = "(Ler;II)Z", - garbageValue = "692591213" + descriptor = "(Lez;IS)Z", + garbageValue = "-3136" ) - boolean method372(PacketWriter var1, int var2) { + boolean method376(PacketWriter var1, int var2) { if (var1.serverPacketLength == 0) { - ReflectionCheck.friendsChat = null; + class358.friendsChat = null; } else { - if (ReflectionCheck.friendsChat == null) { - ReflectionCheck.friendsChat = new FriendsChat(Language.loginType, class219.client); + if (class358.friendsChat == null) { + class358.friendsChat = new FriendsChat(class166.loginType, class159.client); } - ReflectionCheck.friendsChat.method2201(var1.packetBuffer, var2); + class358.friendsChat.method2234(var1.packetBuffer, var2); } - field524 = cycleCntr; - SpotAnimationDefinition.ClanChat_inClanChat = true; + UserComparator10.method685(); var1.serverPacket = null; return true; } - @ObfuscatedName("kn") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(Ler;I)Z", - garbageValue = "-1865308830" + descriptor = "(Lez;I)Z", + garbageValue = "-1216543487" ) - boolean method373(PacketWriter var1) { - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.method2202(var1.packetBuffer); + boolean method377(PacketWriter var1) { + if (class358.friendsChat != null) { + class358.friendsChat.method2235(var1.packetBuffer); } - field524 = cycleCntr; - SpotAnimationDefinition.ClanChat_inClanChat = true; + UserComparator10.method685(); var1.serverPacket = null; return true; } - @ObfuscatedName("kd") + @ObfuscatedName("kq") @ObfuscatedSignature( - descriptor = "(Ler;I)Z", - garbageValue = "-1722622027" + descriptor = "(Lez;I)Z", + garbageValue = "1463612350" ) - final boolean method374(PacketWriter var1) { + final boolean method378(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; } else { - int var6; String var21; + int var22; try { int var5; if (var1.serverPacket == null) { - if (var1.field1152) { + if (var1.field1148) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 0, 1); - var1.field1154 = 0; - var1.field1152 = false; + var1.field1152 = 0; + var1.field1148 = false; } var3.offset = 0; - if (var3.method2518()) { + if (var3.method2552()) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 1, 1); - var1.field1154 = 0; + var1.field1152 = 0; } - var1.field1152 = true; - ServerPacket[] var4 = class176.method916(); + var1.field1148 = true; + ServerPacket[] var4 = class209.method1033(); var5 = var3.readSmartByteShortIsaac(); if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); @@ -3416,357 +3632,233 @@ final boolean method374(PacketWriter var1) { var3.offset = 0; var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1154 = 0; - timer.method2150(); - var1.field1158 = var1.field1157; - var1.field1157 = var1.field1159; - var1.field1159 = var1.serverPacket; + var1.field1152 = 0; + timer.method2182(); + var1.field1156 = var1.field1154; + var1.field1154 = var1.field1153; + var1.field1153 = var1.serverPacket; if (ServerPacket.UPDATE_UID192 == var1.serverPacket) { - class128.privateChatMode = DevicePcmPlayerProvider.method74(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; + return this.method376(var1, 1); } - int var7; - int var8; - int var9; - int var10; - int var13; - int var15; - int var56; - int var59; - int var68; + byte var72; if (ServerPacket.IF_SETMODEL == var1.serverPacket) { - var6 = var3.method2591(); - var68 = var6 >> 16; - var5 = var6 >> 8 & 255; - var7 = var68 + (var6 >> 4 & 7); - var8 = var5 + (var6 & 7); - var9 = var3.readUnsignedByteSub(); - var10 = var9 >> 2; - var56 = var9 & 3; - var59 = field653[var10]; - var13 = var3.readUnsignedShort(); - if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { - if (var59 == 0) { - BoundaryObject var67 = class130.scene.method1255(HealthBar.Client_plane, var7, var8); - if (var67 != null) { - var15 = InvDefinition.Entity_unpackID(var67.tag); - if (var10 == 2) { - var67.renderable1 = new DynamicObject(var15, 2, var56 + 4, HealthBar.Client_plane, var7, var8, var13, false, var67.renderable1); - var67.renderable2 = new DynamicObject(var15, 2, var56 + 1 & 3, HealthBar.Client_plane, var7, var8, var13, false, var67.renderable2); - } else { - var67.renderable1 = new DynamicObject(var15, var10, var56, HealthBar.Client_plane, var7, var8, var13, false, var67.renderable1); - } - } - } else if (var59 == 1) { - WallDecoration var66 = class130.scene.method1256(HealthBar.Client_plane, var7, var8); - if (var66 != null) { - var15 = InvDefinition.Entity_unpackID(var66.tag); - if (var10 != 4 && var10 != 5) { - if (var10 == 6) { - var66.renderable1 = new DynamicObject(var15, 4, var56 + 4, HealthBar.Client_plane, var7, var8, var13, false, var66.renderable1); - } else if (var10 == 7) { - var66.renderable1 = new DynamicObject(var15, 4, (var56 + 2 & 3) + 4, HealthBar.Client_plane, var7, var8, var13, false, var66.renderable1); - } else if (var10 == 8) { - var66.renderable1 = new DynamicObject(var15, 4, var56 + 4, HealthBar.Client_plane, var7, var8, var13, false, var66.renderable1); - var66.renderable2 = new DynamicObject(var15, 4, (var56 + 2 & 3) + 4, HealthBar.Client_plane, var7, var8, var13, false, var66.renderable2); - } - } else { - var66.renderable1 = new DynamicObject(var15, 4, var56, HealthBar.Client_plane, var7, var8, var13, false, var66.renderable1); - } - } - } else if (var59 == 2) { - GameObject var64 = class130.scene.getGameObject(HealthBar.Client_plane, var7, var8); - if (var10 == 11) { - var10 = 10; - } + class172.method908(); + var72 = var3.readByte(); + class148 var83 = new class148(var3); + ClanSettings var67; + if (var72 >= 0) { + var67 = currentClanSettings[var72]; + } else { + var67 = VerticalAlignment.guestClanSettings; + } - if (var64 != null) { - var64.renderable = new DynamicObject(InvDefinition.Entity_unpackID(var64.tag), var10, var56, HealthBar.Client_plane, var7, var8, var13, false, var64.renderable); - } - } else if (var59 == 3) { - FloorDecoration var65 = class130.scene.getFloorDecoration(HealthBar.Client_plane, var7, var8); - if (var65 != null) { - var65.renderable = new DynamicObject(InvDefinition.Entity_unpackID(var65.tag), 22, var56, HealthBar.Client_plane, var7, var8, var13, false, var65.renderable); - } - } + if (var67 == null) { + this.method387(var72); + var1.serverPacket = null; + return true; + } + + if (var83.field1335 > var67.field1375) { + this.method387(var72); + var1.serverPacket = null; + return true; + } + + if (var83.field1335 < var67.field1375) { + var1.serverPacket = null; + return true; } + var83.method777(var67); var1.serverPacket = null; return true; } - Widget var76; if (ServerPacket.IF_SETANIM == var1.serverPacket) { - var68 = var3.readInt(); - var76 = class92.getWidget(var68); - var76.modelType = 3; - var76.modelId = VarbitComposition.localPlayer.appearance.getChatHeadId(); - class218.invalidateWidget(var76); - var1.serverPacket = null; - return true; - } + class172.method908(); + var72 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var72 >= 0) { + currentClanSettings[var72] = null; + } else { + VerticalAlignment.guestClanSettings = null; + } - if (ServerPacket.CAM_LOOKAT == var1.serverPacket) { - field400 = false; - isCameraLocked = false; - field402 = false; - field404 = false; - PendingSpawn.cameraLookAtX = 0; - VarbitComposition.cameraLookAtY = 0; - MusicPatchNode2.cameraLookAtHeight = 0; - field401 = false; - class33.cameraLookAtSpeed = 0; - WorldMapElement.cameraLookAtAcceleration = 0; - MouseHandler.cameraMoveToAcceleration = 0; - class344.cameraMoveToSpeed = 0; - Players.cameraMoveToX = 0; - class33.cameraMoveToY = 0; - VarpDefinition.cameraMoveToHeight = 0; - field642 = null; - field647 = null; - field646 = null; + var1.serverPacket = null; + return true; + } - for (var68 = 0; var68 < 5; ++var68) { - cameraShaking[var68] = false; + if (var72 >= 0) { + currentClanSettings[var72] = new ClanSettings(var3); + } else { + VerticalAlignment.guestClanSettings = new ClanSettings(var3); } var1.serverPacket = null; return true; } - if (ServerPacket.SET_PLAYER_OP == var1.serverPacket) { - class139.varclan = null; + if (ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.field2623); var1.serverPacket = null; return true; } - if (ServerPacket.LOC_DEL == var1.serverPacket) { - var68 = var3.readInt(); - var5 = var3.readInt(); - var6 = WorldMapManager.getGcDuration(); - PacketBufferNode var79 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2581, packetWriter.isaacCipher); - var79.packetBuffer.writeByte(GameEngine.fps); - var79.packetBuffer.writeIntLE(var68); - var79.packetBuffer.writeIntIME(var5); - var79.packetBuffer.writeByteAdd(var6); - packetWriter.addNode(var79); + if (ServerPacket.field2675 == var1.serverPacket) { + class332.updateNpcs(true, var3); var1.serverPacket = null; return true; } - if (ServerPacket.VARCLAN_ENABLE == var1.serverPacket) { - class113.process(); - weight = var3.readShort(); - field528 = cycleCntr; - var1.serverPacket = null; - return true; - } + int var7; + int var8; + int var20; + if (ServerPacket.LOC_DEL == var1.serverPacket) { + var22 = var3.readUnsignedShortAdd(); + var7 = var3.readIntME(); + var8 = var3.readUnsignedShortAdd(); + var5 = var3.readUnsignedShort(); + var20 = var3.readUnsignedShortAdd(); + if (var20 == 65535) { + var20 = -1; + } - if (ServerPacket.OBJ_COUNT == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.LOC_ANIM); + ArrayList var56 = new ArrayList(); + var56.add(var20); + class202.method1006(var56, var5, var22, var7, var8); var1.serverPacket = null; return true; } - if (ServerPacket.OBJ_ADD == var1.serverPacket) { - var68 = var3.readIntME(); - KeyHandler.method93(var68); - changedItemContainers[++changedItemContainersCount - 1 & 31] = var68 & 32767; + if (ServerPacket.field2649 == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field401 = true; + var20 = NPC.method597(var3.readShort() & 2027); + var5 = class153.method800(var3.readShort() & 2027); + var22 = var3.readUnsignedShort(); + var7 = var3.readUnsignedByte(); + field642 = new class493(class365.cameraPitch, var5, var22, var7); + field643 = new class493(WallDecoration.cameraYaw, var20, var22, var7); var1.serverPacket = null; return true; } - if (ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.AREA_SOUND); + if (ServerPacket.OBJ_COUNT == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.LOC_ANIM); var1.serverPacket = null; return true; } - boolean var11; - byte var20; - long var23; - long var25; - long var27; - String var30; - int var85; - if (ServerPacket.LOGOUT_FULL == var1.serverPacket) { - var20 = var3.readByte(); - var23 = (long)var3.readUnsignedShort(); - var25 = (long)var3.readMedium(); - var27 = (var23 << 32) + var25; - var11 = false; - ClanChannel var81 = var20 >= 0 ? currentClanChannels[var20] : VerticalAlignment.guestClanChannel; - if (var81 == null) { - var11 = true; - } else { - for (var13 = 0; var13 < 100; ++var13) { - if (crossWorldMessageIds[var13] == var27) { - var11 = true; - break; - } - } - } - - if (!var11) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var27; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var30 = DirectByteArrayCopier.readString(var3); - var85 = var20 >= 0 ? 43 : 46; - class416.addChatMessage(var85, "", var30, var81.name); + Widget var6; + if (ServerPacket.RESET_CLIENT_VARCACHE == var1.serverPacket) { + var20 = var3.readInt(); + var21 = var3.readStringCp1252NullTerminated(); + var6 = class33.field89.method1740(var20); + if (!var21.equals(var6.text)) { + var6.text = var21; + ClanChannelMember.invalidateWidget(var6); } var1.serverPacket = null; return true; } - if (ServerPacket.MAP_ANIM == var1.serverPacket) { - UserComparator8.updatePlayers(var3, var1.serverPacketLength); - class383.method2021(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.SYNTH_SOUND == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field404 = true; - PendingSpawn.cameraLookAtX = var3.readUnsignedByte(); - VarbitComposition.cameraLookAtY = var3.readUnsignedByte(); - MusicPatchNode2.cameraLookAtHeight = var3.readUnsignedShort(); - var68 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = PendingSpawn.cameraLookAtX * 128 + 64; - var7 = VarbitComposition.cameraLookAtY * 128 + 64; - var8 = class18.getTileHeight(var6, var7, HealthBar.Client_plane) - MusicPatchNode2.cameraLookAtHeight; - var9 = var6 - NPCComposition.cameraX; - var10 = var8 - class133.cameraY; - var56 = var7 - class139.cameraZ; - double var84 = Math.sqrt((double)(var56 * var56 + var9 * var9)); - var85 = UserComparator8.method674((int)(Math.atan2((double)var10, var84) * 325.9490051269531D) & 2047); - var15 = class7.method18((int)(Math.atan2((double)var9, (double)var56) * -325.9490051269531D) & 2047); - field647 = new class478(class129.cameraPitch, var85, var68, var5); - field646 = new class478(UserComparator10.cameraYaw, var15, var68, var5); - var1.serverPacket = null; - return true; - } - - long var32; - InterfaceParent var74; - if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 == var1.serverPacket) { - var68 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); + if (ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE == var1.serverPacket) { + var22 = var3.readUnsignedByteNeg(); + var5 = var3.readIntME(); + var20 = var3.readUnsignedShortAdd(); if (var5 == 65535) { var5 = -1; } - var6 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - class19.Widget_resetModelFrames(rootInterface); - MoveSpeed.runWidgetOnLoadListener(rootInterface); - - for (var7 = 0; var7 < 100; ++var7) { - field407[var7] = true; + NPC var86 = npcs[var20]; + if (var86 != null) { + if (var5 == var86.sequence && var5 != -1) { + var8 = class36.SequenceDefinition_get(var5).replyMode; + if (var8 == 1) { + var86.sequenceFrame = 0; + var86.sequenceFrameCycle = 0; + var86.sequenceDelay = var22; + var86.currentSequenceFrameIndex = 0; + } else if (var8 == 2) { + var86.currentSequenceFrameIndex = 0; + } + } else if (var5 == -1 || var86.sequence == -1 || class36.SequenceDefinition_get(var5).forcedPriority >= class36.SequenceDefinition_get(var86.sequence).forcedPriority) { + var86.sequence = var5; + var86.sequenceFrame = 0; + var86.sequenceFrameCycle = 0; + var86.sequenceDelay = var22; + var86.currentSequenceFrameIndex = 0; + var86.field1023 = var86.pathLength; } } - InterfaceParent var88; - for (; var6-- > 0; var88.field858 = true) { - var7 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var88 = (InterfaceParent)interfaceParents.get((long)var7); - if (var88 != null && var8 != var88.group) { - class92.closeInterface(var88, true); - var88 = null; - } + var1.serverPacket = null; + return true; + } - if (var88 == null) { - var88 = class339.ifOpenSub(var7, var8, var9); - } - } + if (ServerPacket.LOGOUT_FULL == var1.serverPacket) { + var20 = var3.readIntME(); + GrandExchangeOfferUnitPriceComparator.method1994(var20); + changedItemContainers[++changedItemContainersCount - 1 & 31] = var20 & 32767; + var1.serverPacket = null; + return true; + } - for (var74 = (InterfaceParent)interfaceParents.first(); var74 != null; var74 = (InterfaceParent)interfaceParents.next()) { - if (var74.field858) { - var74.field858 = false; - } else { - class92.closeInterface(var74, true); + if (ServerPacket.CAM_MOVETO_EASED == var1.serverPacket) { + for (var20 = 0; var20 < VarpDefinition.field1501; ++var20) { + VarpDefinition var82 = class150.VarpDefinition_get(var20); + if (var82 != null) { + Varps.Varps_temp[var20] = 0; + Varps.Varps_main[var20] = 0; } } - widgetFlags = new NodeHashTable(512); - - while (var3.offset < var68) { - var7 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var10 = var3.readInt(); + class304.method1636(); + changedVarpCount += 32; + var1.serverPacket = null; + return true; + } - for (var56 = var8; var56 <= var9; ++var56) { - var32 = ((long)var7 << 32) + (long)var56; - widgetFlags.put(new IntegerNode(var10), var32); - } - } + if (ServerPacket.SYNTH_SOUND == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.field2619); + var1.serverPacket = null; + return true; + } + String var55; + if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 == var1.serverPacket) { + byte[] var54 = new byte[var1.serverPacketLength]; + var3.method2554(var54, 0, var54.length); + Buffer var80 = new Buffer(var54); + var55 = var80.readStringCp1252NullTerminated(); + VertexNormal.openURL(var55, true, false); var1.serverPacket = null; return true; } - Widget var93; if (ServerPacket.TOGGLE_OCULUS_ORB == var1.serverPacket) { - var68 = var3.readInt(); - var5 = var3.method2598(); - InterfaceParent var97 = (InterfaceParent)interfaceParents.get((long)var5); - var74 = (InterfaceParent)interfaceParents.get((long)var68); - if (var74 != null) { - class92.closeInterface(var74, var97 == null || var74.group != var97.group); - } - - if (var97 != null) { - var97.remove(); - interfaceParents.put(var97, (long)var68); - } - - var93 = class92.getWidget(var5); - if (var93 != null) { - class218.invalidateWidget(var93); - } - - var93 = class92.getWidget(var68); - if (var93 != null) { - class218.invalidateWidget(var93); - Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var93.id >>> 16], var93, true); - } - - if (rootInterface != -1) { - class385.runIntfCloseListeners(rootInterface, 1); + var20 = var3.readUnsignedByteSub(); + var5 = var3.readUnsignedShortAddLE(); + if (var5 == 65535) { + var5 = -1; } + WorldMapEvent.performPlayerAnimation(TextureProvider.localPlayer, var5, var20); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_INV_FULL == var1.serverPacket) { - WorldMapSection2.method1410(); - var20 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var20 >= 0) { - currentClanSettings[var20] = null; - } else { - Players.guestClanSettings = null; - } - - var1.serverPacket = null; - return true; - } - - if (var20 >= 0) { - currentClanSettings[var20] = new ClanSettings(var3); - } else { - Players.guestClanSettings = new ClanSettings(var3); + if (ServerPacket.CAM_MOVETO == var1.serverPacket) { + var20 = var3.readUnsignedIntME(); + var5 = var3.readIntME(); + var6 = class33.field89.method1740(var20); + if (var6.modelType != 1 || var5 != var6.modelId) { + var6.modelType = 1; + var6.modelId = var5; + ClanChannelMember.invalidateWidget(var6); } var1.serverPacket = null; @@ -3774,35 +3866,41 @@ final boolean method374(PacketWriter var1) { } if (ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT == var1.serverPacket) { - var68 = var3.readInt(); - InterfaceParent var78 = (InterfaceParent)interfaceParents.get((long)var68); - if (var78 != null) { - class92.closeInterface(var78, true); - } - - if (meslayerContinueWidget != null) { - class218.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - + var20 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var22 = var3.readUnsignedByte(); + var7 = var3.readUnsignedByte(); + cameraShaking[var20] = true; + cameraShakeIntensity[var20] = var5; + cameraMoveIntensity[var20] = var22; + cameraShakeSpeed[var20] = var7; + cameraShakeCycle[var20] = 0; var1.serverPacket = null; return true; } if (ServerPacket.LOGOUT == var1.serverPacket) { - var9 = var3.readUnsignedShort(); - var6 = var3.method2591(); - var68 = var6 >> 16; - var5 = var6 >> 8 & 255; - var7 = var68 + (var6 >> 4 & 7); - var8 = var5 + (var6 & 7); - var10 = var3.readUnsignedByteAdd(); - var56 = var3.readUnsignedShortLE(); - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - var7 = var7 * 128 + 64; - var8 = var8 * 128 + 64; - GraphicsObject var29 = new GraphicsObject(var9, HealthBar.Client_plane, var7, var8, class18.getTileHeight(var7, var8, HealthBar.Client_plane) - var10, var56, cycle); - graphicsObjects.addFirst(var29); + field400 = false; + isCameraLocked = false; + field402 = false; + field401 = false; + class148.cameraLookAtX = 0; + BufferedNetSocket.cameraLookAtY = 0; + class161.cameraLookAtHeight = 0; + field403 = false; + class232.cameraLookAtSpeed = 0; + class465.cameraLookAtAcceleration = 0; + class131.cameraMoveToAcceleration = 0; + SecureRandomCallable.cameraMoveToSpeed = 0; + class191.cameraMoveToX = 0; + MouseHandler.cameraMoveToY = 0; + SoundSystem.cameraMoveToHeight = 0; + field646 = null; + field642 = null; + field643 = null; + + for (var20 = 0; var20 < 5; ++var20) { + cameraShaking[var20] = false; } var1.serverPacket = null; @@ -3810,641 +3908,772 @@ final boolean method374(PacketWriter var1) { } if (ServerPacket.CAM_RESET == var1.serverPacket) { - field517 = cycleCntr; - var20 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var20 >= 0) { - currentClanChannels[var20] = null; - } else { - VerticalAlignment.guestClanChannel = null; - } - - var1.serverPacket = null; - return true; - } - - if (var20 >= 0) { - currentClanChannels[var20] = new ClanChannel(var3); - } else { - VerticalAlignment.guestClanChannel = new ClanChannel(var3); + if (rootInterface != -1) { + Interpreter.method418(rootInterface, 0); } var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_INV_PARTIAL == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.PREFETCH_GAMEOBJECTS); + if (ServerPacket.IF_SETPLAYERHEAD == var1.serverPacket) { + class304.method1636(); + runEnergy = var3.readUnsignedShort(); + field527 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.RESET_CLIENT_VARCACHE == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.LOC_ADD_CHANGE); + if (ServerPacket.OBJ_DEL == var1.serverPacket) { + var20 = var3.readUnsignedIntLE(); + var5 = var3.readUnsignedByteAdd(); + var6 = class33.field89.method1740(var20); + UrlRequester.method653(var6, TextureProvider.localPlayer.appearance.field2950, var5); + ClanChannelMember.invalidateWidget(var6); var1.serverPacket = null; return true; } if (ServerPacket.IF_SETPLAYERMODEL_SELF == var1.serverPacket) { - var68 = var3.readIntME(); - var5 = var3.readUnsignedByteSub(); - if (var68 == 65535) { - var68 = -1; - } - - LoginType.performPlayerAnimation(VarbitComposition.localPlayer, var68, var5); + var20 = var3.readInt(); + var5 = var3.readInt(); + var22 = TileItem.getGcDuration(); + PacketBufferNode var84 = ClanChannelMember.getPacketBufferNode(ClientPacket.PING_STATS, packetWriter.isaacCipher); + var84.packetBuffer.writeIntME(var20); + var84.packetBuffer.writeIntIME(var5); + var84.packetBuffer.writeByte(var22); + var84.packetBuffer.writeByteNeg(GameEngine.fps); + packetWriter.addNode(var84); var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SWAP == var1.serverPacket) { - class271.loadRegions(true, var1.packetBuffer); + if (ServerPacket.NPC_ANIM_SPECIFIC == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.PREFETCH_GAMEOBJECTS); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_RUNWEIGHT == var1.serverPacket) { - if (rootInterface != -1) { - class385.runIntfCloseListeners(rootInterface, 0); + int var10; + int var24; + if (ServerPacket.field2744 == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field401 = false; + class148.cameraLookAtX = var3.readUnsignedByte(); + BufferedNetSocket.cameraLookAtY = var3.readUnsignedByte(); + class161.cameraLookAtHeight = var3.readUnsignedShort(); + class232.cameraLookAtSpeed = var3.readUnsignedByte(); + class465.cameraLookAtAcceleration = var3.readUnsignedByte(); + if (class465.cameraLookAtAcceleration >= 100) { + var20 = class148.cameraLookAtX * 128 + 64; + var5 = BufferedNetSocket.cameraLookAtY * 128 + 64; + var22 = class115.getTileHeight(var20, var5, class87.Client_plane) - class161.cameraLookAtHeight; + var7 = var20 - cameraX; + var8 = var22 - class17.cameraY; + var24 = var5 - WorldMapArea.cameraZ; + var10 = (int)Math.sqrt((double)(var24 * var24 + var7 * var7)); + class365.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.9490051269531D) & 2047; + WallDecoration.cameraYaw = (int)(Math.atan2((double)var7, (double)var24) * -325.9490051269531D) & 2047; + if (class365.cameraPitch < 128) { + class365.cameraPitch = 128; + } + + if (class365.cameraPitch > 383) { + class365.cameraPitch = 383; + } } var1.serverPacket = null; return true; } - Widget var71; if (ServerPacket.HEAT_MAP == var1.serverPacket) { - var68 = var3.readIntIME(); - var5 = var3.method2587(); - var6 = var3.readUnsignedShortLE(); - var71 = class92.getWidget(var68); - var71.rotationKey = var6 + (var5 << 16); + var20 = var3.readUnsignedShortAdd(); + var5 = var3.readUnsignedIntIME(); + var6 = class33.field89.method1740(var5); + if (var6.modelType != 6 || var20 != var6.modelId) { + var6.modelType = 6; + var6.modelId = var20; + ClanChannelMember.invalidateWidget(var6); + } + var1.serverPacket = null; return true; } if (ServerPacket.CAM_MOVETO_EASED_CIRCULAR == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); + var20 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var20] = new GrandExchangeOffer(); + var3.offset += 18; + } else { + --var3.offset; + grandExchangeOffers[var20] = new GrandExchangeOffer(var3, false); + } + + field529 = cycleCntr; var1.serverPacket = null; return true; } - int var16; - String var43; if (ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED == var1.serverPacket) { - var20 = var3.readByte(); - var21 = var3.readStringCp1252NullTerminated(); - long var37 = (long)var3.readUnsignedShort(); - long var39 = (long)var3.readMedium(); - PlayerType var87 = (PlayerType)KeyHandler.findEnumerated(MidiPcmStream.PlayerType_values(), var3.readUnsignedByte()); - long var41 = (var37 << 32) + var39; - boolean var63 = false; - ClanChannel var14 = null; - var14 = var20 >= 0 ? currentClanChannels[var20] : VerticalAlignment.guestClanChannel; - if (var14 == null) { - var63 = true; - } else { - var15 = 0; + class304.method1636(); + weight = var3.readShort(); + field527 = cycleCntr; + var1.serverPacket = null; + return true; + } - while (true) { - if (var15 >= 100) { - if (var87.isUser && class299.friendSystem.isIgnored(new Username(var21, Language.loginType))) { - var63 = true; - } - break; - } + Widget var79; + if (ServerPacket.VARCLAN == var1.serverPacket) { + var20 = var3.readUnsignedIntLE(); + var79 = class33.field89.method1740(var20); + var79.modelType = 3; + var79.modelId = TextureProvider.localPlayer.appearance.getChatHeadId(); + ClanChannelMember.invalidateWidget(var79); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.MIDI_SWAP == var1.serverPacket) { + tradeChatMode = var3.readUnsignedByte(); + publicChatMode = var3.readUnsignedByteNeg(); + var1.serverPacket = null; + return true; + } - if (crossWorldMessageIds[var15] == var41) { - var63 = true; + boolean var11; + long var25; + long var27; + long var29; + String var31; + int var68; + int var69; + if (ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR == var1.serverPacket) { + var72 = var3.readByte(); + var25 = (long)var3.readUnsignedShort(); + var27 = (long)var3.readMedium(); + var29 = var27 + (var25 << 32); + var11 = false; + ClanChannel var63 = var72 >= 0 ? currentClanChannels[var72] : ClanChannelMember.guestClanChannel; + if (var63 == null) { + var11 = true; + } else { + for (var68 = 0; var68 < 100; ++var68) { + if (crossWorldMessageIds[var68] == var29) { + var11 = true; break; } - - ++var15; } } - if (!var63) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; + if (!var11) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var29; crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var43 = AbstractFont.escapeBrackets(DirectByteArrayCopier.readString(var3)); - var16 = var20 >= 0 ? 41 : 44; - if (var87.modIcon != -1) { - class416.addChatMessage(var16, Tile.addImageTag(var87.modIcon) + var21, var43, var14.name); - } else { - class416.addChatMessage(var16, var21, var43, var14.name); - } + var31 = class172.readString(var3); + var69 = var72 >= 0 ? 43 : 46; + class164.addChatMessage(var69, "", var31, var63.name); } var1.serverPacket = null; return true; } - if (ServerPacket.VARCLAN == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - class27.method109(var3, var3.offset - 28); - } - + if (ServerPacket.UPDATE_FRIENDLIST == var1.serverPacket) { var1.serverPacket = null; return true; } - String var51; - if (ServerPacket.CAM_MOVETO == var1.serverPacket) { - var51 = var3.readStringCp1252NullTerminated(); - var5 = var3.readUnsignedByteAdd(); - var6 = var3.readUnsignedByteSub(); - if (var6 >= 1 && var6 <= 8) { - if (var51.equalsIgnoreCase("null")) { - var51 = null; - } - - playerMenuActions[var6 - 1] = var51; - playerOptionsPriorities[var6 - 1] = var5 == 0; + int var15; + int var16; + int var17; + int var18; + Projectile var19; + int var60; + byte var62; + byte var85; + int var87; + if (ServerPacket.field2730 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + var60 = var3.method2629(); + var62 = var3.readByte(); + var69 = var3.readUnsignedByteAdd() * 4; + var18 = var3.readUnsignedByte(); + var68 = var3.readUnsignedByteNeg() * 4; + var87 = var3.readUnsignedShortAddLE(); + var22 = var3.method2628(); + var20 = var22 >> 16; + var5 = var22 >> 8 & 255; + var7 = var20 + (var22 >> 4 & 7); + var8 = var5 + (var22 & 7); + var16 = var3.readIntME(); + var15 = var3.readUnsignedShortAddLE(); + var85 = var3.readByte(); + var24 = var85 + var7; + var10 = var62 + var8; + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var24 >= 0 && var10 >= 0 && var24 < 104 && var10 < 104 && var87 != 65535) { + var7 = var7 * 128 + 64; + var8 = var8 * 128 + 64; + var24 = var24 * 128 + 64; + var10 = var10 * 128 + 64; + var19 = new Projectile(var87, class87.Client_plane, var7, var8, class115.getTileHeight(var7, var8, class87.Client_plane) - var68, var15 + cycle, var16 + cycle, var17, var18, var60, var69); + var19.setDestination(var24, var10, class115.getTileHeight(var24, var10, class87.Client_plane) - var69, var15 + cycle); + projectiles.addFirst(var19); } var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR == var1.serverPacket) { - var68 = var3.readUnsignedShort(); - if (var68 == 65535) { - var68 = -1; - } - - WorldMapSection1.playSong(var68); + if (ServerPacket.MIDI_SONG_WITH_SECONDARY == var1.serverPacket) { + class151.loadRegions(true, var1.packetBuffer); var1.serverPacket = null; return true; } - if (ServerPacket.NPC_ANIM_SPECIFIC == var1.serverPacket) { - var68 = var3.method2587(); - if (var68 == 65535) { - var68 = -1; - } - - var5 = var3.method2592(); - Login.playJingle(var68, var5); + if (ServerPacket.LOC_ANIM_SPECIFIC == var1.serverPacket) { + InvDefinition.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + class492.FriendSystem_invalidateIgnoreds(); + field511 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_STAT == var1.serverPacket) { - ArchiveDisk.logOut(); + if (ServerPacket.IF_SETEVENTS == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.OBJ_COUNT); var1.serverPacket = null; - return false; + return true; } - if (ServerPacket.MIDI_SONG_WITH_SECONDARY == var1.serverPacket) { - var68 = var3.readUnsignedIntIME(); - var5 = var3.readUnsignedByteSub(); - var6 = var3.method2587(); - var74 = (InterfaceParent)interfaceParents.get((long)var68); - if (var74 != null) { - class92.closeInterface(var74, var6 != var74.group); + Widget var23; + if (ServerPacket.REFLECTIONCHECK_FRIENDLIST == var1.serverPacket) { + var20 = var3.readInt(); + var5 = var3.readIntME(); + if (var5 == 65535) { + var5 = -1; } - class339.ifOpenSub(var68, var6, var5); - var1.serverPacket = null; - return true; - } + var22 = var3.readUnsignedIntIME(); + var23 = class33.field89.method1740(var22); + ItemComposition var92; + if (!var23.isIf3) { + if (var5 == -1) { + var23.modelType = 0; + var1.serverPacket = null; + return true; + } - boolean var80; - Widget var89; - if (ServerPacket.LOC_ANIM_SPECIFIC == var1.serverPacket) { - var80 = var3.readUnsignedByteNeg() == 1; - var5 = var3.readInt(); - var89 = class92.getWidget(var5); - if (var80 != var89.isHidden) { - var89.isHidden = var80; - class218.invalidateWidget(var89); + var92 = class214.ItemDefinition_get(var5).getCountObj(var20); + var23.modelType = 4; + var23.modelId = var5; + var23.modelAngleX = var92.xan2d; + var23.modelAngleY = var92.yan2d; + var23.modelZoom = var92.zoom2d * 100 / var20; + ClanChannelMember.invalidateWidget(var23); + } else { + var23.itemId = var5; + var23.itemQuantity = var20; + var92 = class214.ItemDefinition_get(var5).getCountObj(var20); + var23.modelAngleX = var92.xan2d; + var23.modelAngleY = var92.yan2d; + var23.modelAngleZ = var92.zan2d; + var23.modelOffsetX = var92.offsetX2d; + var23.modelOffsetY = var92.offsetY2d; + var23.modelZoom = var92.zoom2d; + if (var92.isStackable == 1) { + var23.itemQuantityMode = 1; + } else { + var23.itemQuantityMode = 2; + } + + if (var23.modelRotation > 0) { + var23.modelZoom = var23.modelZoom * 32 / var23.modelRotation; + } else if (var23.rawWidth > 0) { + var23.modelZoom = var23.modelZoom * 32 / var23.rawWidth; + } + + ClanChannelMember.invalidateWidget(var23); } var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETEVENTS == var1.serverPacket) { - var68 = var3.method2587(); - var5 = var3.readUnsignedShort(); - var6 = var3.readIntIME(); - var7 = var3.readUnsignedShort(); - var93 = class92.getWidget(var6); - if (var7 != var93.modelAngleX || var68 != var93.modelAngleY || var5 != var93.modelZoom) { - var93.modelAngleX = var7; - var93.modelAngleY = var68; - var93.modelZoom = var5; - class218.invalidateWidget(var93); - } - + if (ServerPacket.field2755 == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.MAPPROJ_ANIM); var1.serverPacket = null; return true; } - if (ServerPacket.REFLECTIONCHECK_FRIENDLIST == var1.serverPacket) { - var68 = var3.readUnsignedShortLE(); + Widget var33; + InterfaceParent var78; + if (ServerPacket.MIDI_SONG == var1.serverPacket) { + var20 = var3.readInt(); var5 = var3.readUnsignedIntIME(); - var89 = class92.getWidget(var5); - if (var89.modelType != 1 || var68 != var89.modelId) { - var89.modelType = 1; - var89.modelId = var68; - class218.invalidateWidget(var89); + InterfaceParent var65 = (InterfaceParent)interfaceParents.get((long)var20); + var78 = (InterfaceParent)interfaceParents.get((long)var5); + if (var78 != null) { + ArchiveDisk.closeInterface(var78, var65 == null || var65.group != var78.group); + } + + if (var65 != null) { + var65.remove(); + interfaceParents.put(var65, (long)var5); + } + + var33 = class33.field89.method1740(var20); + if (var33 != null) { + ClanChannelMember.invalidateWidget(var33); + } + + var33 = class33.field89.method1740(var5); + if (var33 != null) { + ClanChannelMember.invalidateWidget(var33); + PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var33.id >>> 16], var33, true); + } + + if (rootInterface != -1) { + Interpreter.method418(rootInterface, 1); } var1.serverPacket = null; return true; } - if (ServerPacket.CLANSETTINGS_DELTA == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.MAPPROJ_ANIM); - var1.serverPacket = null; - return true; - } + if (ServerPacket.MESSAGE_PRIVATE == var1.serverPacket) { + field528 = cycleCntr; + var72 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var72 >= 0) { + currentClanChannels[var72] = null; + } else { + ClanChannelMember.guestClanChannel = null; + } - if (ServerPacket.IF1_MODELROTATE == var1.serverPacket) { - var8 = var3.readUnsignedShortLE(); - var6 = var3.readIntME(); - var7 = var3.readIntME(); - var68 = var3.method2587(); - var5 = var3.method2587(); - if (var68 == 65535) { - var68 = -1; + var1.serverPacket = null; + return true; } - ArrayList var98 = new ArrayList(); - var98.add(var68); - class157.method836(var98, var5, var6, var7, var8); - var1.serverPacket = null; - return true; - } + if (var72 >= 0) { + currentClanChannels[var72] = new ClanChannel(var3); + } else { + ClanChannelMember.guestClanChannel = new ClanChannel(var3); + } - if (ServerPacket.MAPPROJ_ANIM_SPECIFIC == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.LOC_DEL); var1.serverPacket = null; return true; } if (ServerPacket.RUN_CLIENTSCRIPT == var1.serverPacket) { - class299.friendSystem.method399(); - field518 = cycleCntr; + var20 = var3.readUnsignedShortAdd(); + var5 = var3.readUnsignedByteNeg(); + var22 = var3.readUnsignedIntLE(); + var78 = (InterfaceParent)interfaceParents.get((long)var22); + if (var78 != null) { + ArchiveDisk.closeInterface(var78, var20 != var78.group); + } + + ClanChannel.ifOpenSub(var22, var20, var5); var1.serverPacket = null; return true; } - String var94; if (ServerPacket.NPC_HEADICON_SPECIFIC == var1.serverPacket) { - byte[] var54 = new byte[var1.serverPacketLength]; - var3.method2520(var54, 0, var54.length); - Buffer var77 = new Buffer(var54); - var94 = var77.readStringCp1252NullTerminated(); - class30.openURL(var94, true, false); + minimapState = var3.readUnsignedByte(); var1.serverPacket = null; return true; } if (ServerPacket.IF_SETPLAYERMODEL_BODYTYPE == var1.serverPacket) { - World var53 = new World(); - var53.host = var3.readStringCp1252NullTerminated(); - var53.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var53.properties = var5; - if (var53.isDeadman()) { - var53.field679 = "beta"; - } - - MusicSong.updateGameState(45); - var2.close(); - var2 = null; - ModeWhere.changeWorld(var53); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.MIDI_JINGLE == var1.serverPacket) { - rebootTimer = var3.readUnsignedShortLE() * 30; - field528 = cycleCntr; + SequenceDefinition.varclan = new class469(class53.Widget_cachedFonts); var1.serverPacket = null; return true; } - if (ServerPacket.CHAT_FILTER_SETTINGS == var1.serverPacket) { - var68 = var3.readUnsignedShort(); - if (var68 == 65535) { - var68 = -1; - } - - rootInterface = var68; - this.resizeRoot(false); - class19.Widget_resetModelFrames(var68); - MoveSpeed.runWidgetOnLoadListener(rootInterface); + if (ServerPacket.MIDI_JINGLE == var1.serverPacket) { + var20 = var3.readUnsignedIntIME(); + var79 = class33.field89.method1740(var20); - for (var5 = 0; var5 < 100; ++var5) { - field407[var5] = true; + for (var22 = 0; var22 < var79.field3082.length; ++var22) { + var79.field3082[var22] = -1; + var79.field3082[var22] = 0; } + ClanChannelMember.invalidateWidget(var79); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETCOLOUR == var1.serverPacket) { + if (ServerPacket.SET_PLAYER_OP == var1.serverPacket) { isCameraLocked = true; field400 = false; - field402 = true; - Players.cameraMoveToX = var3.readUnsignedByte(); - class33.cameraMoveToY = var3.readUnsignedByte(); - var68 = var3.readUnsignedShort(); - var5 = var3.readUnsignedShort(); - field401 = var3.readBoolean(); - var6 = var3.readUnsignedByte(); - var7 = Players.cameraMoveToX * 128 + 64; - var8 = class33.cameraMoveToY * 128 + 64; - boolean var62 = false; - boolean var60 = false; - if (field401) { - var9 = class133.cameraY; - var10 = class18.getTileHeight(var7, var8, HealthBar.Client_plane) - var68; - } else { - var9 = class18.getTileHeight(NPCComposition.cameraX, class139.cameraZ, HealthBar.Client_plane) - class133.cameraY; - var10 = var68; - } + field401 = true; + class148.cameraLookAtX = var3.readUnsignedByte(); + BufferedNetSocket.cameraLookAtY = var3.readUnsignedByte(); + class161.cameraLookAtHeight = var3.readUnsignedShort(); + var20 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var22 = class148.cameraLookAtX * 128 + 64; + var7 = BufferedNetSocket.cameraLookAtY * 128 + 64; + var8 = class115.getTileHeight(var22, var7, class87.Client_plane) - class161.cameraLookAtHeight; + var24 = var22 - cameraX; + var10 = var8 - class17.cameraY; + var60 = var7 - WorldMapArea.cameraZ; + double var91 = Math.sqrt((double)(var60 * var60 + var24 * var24)); + var69 = class153.method800((int)(Math.atan2((double)var10, var91) * 325.9490051269531D) & 2047); + var15 = NPC.method597((int)(Math.atan2((double)var24, (double)var60) * -325.9490051269531D) & 2047); + field642 = new class493(class365.cameraPitch, var69, var20, var5); + field643 = new class493(WallDecoration.cameraYaw, var15, var20, var5); + var1.serverPacket = null; + return true; + } - field642 = new class477(NPCComposition.cameraX, class139.cameraZ, var9, var7, var8, var10, var5, var6); + if (ServerPacket.LOGIN_SCREEN_PACKET == var1.serverPacket) { + var5 = var3.readUnsignedShortAddLE(); + var20 = var3.readIntME(); + ItemComposition.method1088(var20, var5); var1.serverPacket = null; return true; } if (ServerPacket.PLAYER_SPOTANIM_SPECIFIC == var1.serverPacket) { - class271.loadRegions(false, var1.packetBuffer); + class332.updateNpcs(false, var3); var1.serverPacket = null; return true; } if (ServerPacket.IF_OPENTOP == var1.serverPacket) { - var68 = var3.method2598(); - var76 = class92.getWidget(var68); - - for (var6 = 0; var6 < var76.itemIds.length; ++var6) { - var76.itemIds[var6] = -1; - var76.itemIds[var6] = 0; + var24 = var3.readUnsignedShortAddLE(); + var10 = var3.readUnsignedByteNeg(); + var22 = var3.method2628(); + var20 = var22 >> 16; + var5 = var22 >> 8 & 255; + var7 = var20 + (var22 >> 4 & 7); + var8 = var5 + (var22 & 7); + var60 = var3.readUnsignedShortAdd(); + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + var7 = var7 * 128 + 64; + var8 = var8 * 128 + 64; + GraphicsObject var12 = new GraphicsObject(var24, class87.Client_plane, var7, var8, class115.getTileHeight(var7, var8, class87.Client_plane) - var10, var60, cycle); + graphicsObjects.addFirst(var12); } - class218.invalidateWidget(var76); var1.serverPacket = null; return true; } - if (ServerPacket.MINIMAP_TOGGLE == var1.serverPacket) { - var68 = var3.readIntME(); - var5 = var3.method2598(); - var89 = class92.getWidget(var5); - if (var89 != null && var89.type == 0) { - if (var68 > var89.scrollHeight - var89.height) { - var68 = var89.scrollHeight - var89.height; - } + if (ServerPacket.VARCLAN_ENABLE == var1.serverPacket) { + var20 = var3.readUnsignedByte(); + class180.method934(var20); + var1.serverPacket = null; + return true; + } - if (var68 < 0) { - var68 = 0; - } + String var50; + if (ServerPacket.UPDATE_REBOOT_TIMER == var1.serverPacket) { + var50 = var3.readStringCp1252NullTerminated(); + Object[] var77 = new Object[var50.length() + 1]; - if (var68 != var89.scrollY) { - var89.scrollY = var68; - class218.invalidateWidget(var89); + for (var22 = var50.length() - 1; var22 >= 0; --var22) { + if (var50.charAt(var22) == 's') { + var77[var22 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var77[var22 + 1] = new Integer(var3.readInt()); } } + var77[0] = new Integer(var3.readInt()); + ScriptEvent var64 = new ScriptEvent(); + var64.args = var77; + Interpreter.runScriptEvent(var64); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_REBOOT_TIMER == var1.serverPacket) { - tradeChatMode = var3.readUnsignedByte(); - publicChatMode = var3.readUnsignedByteAdd(); - var1.serverPacket = null; - return true; - } + if (ServerPacket.SET_MAP_FLAG == var1.serverPacket) { + field528 = cycleCntr; + var72 = var3.readByte(); + class162 var76 = new class162(var3); + ClanChannel var59; + if (var72 >= 0) { + var59 = currentClanChannels[var72]; + } else { + var59 = ClanChannelMember.guestClanChannel; + } - if (ServerPacket.CLANCHANNEL_FULL == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field404 = false; - PendingSpawn.cameraLookAtX = var3.readUnsignedByte(); - VarbitComposition.cameraLookAtY = var3.readUnsignedByte(); - MusicPatchNode2.cameraLookAtHeight = var3.readUnsignedShort(); - class33.cameraLookAtSpeed = var3.readUnsignedByte(); - WorldMapElement.cameraLookAtAcceleration = var3.readUnsignedByte(); - if (WorldMapElement.cameraLookAtAcceleration >= 100) { - var68 = PendingSpawn.cameraLookAtX * 128 + 64; - var5 = VarbitComposition.cameraLookAtY * 128 + 64; - var6 = class18.getTileHeight(var68, var5, HealthBar.Client_plane) - MusicPatchNode2.cameraLookAtHeight; - var7 = var68 - NPCComposition.cameraX; - var8 = var6 - class133.cameraY; - var9 = var5 - class139.cameraZ; - var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); - class129.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.9490051269531D) & 2047; - UserComparator10.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; - if (class129.cameraPitch < 128) { - class129.cameraPitch = 128; - } + if (var59 == null) { + this.method386(var72); + var1.serverPacket = null; + return true; + } - if (class129.cameraPitch > 383) { - class129.cameraPitch = 383; - } + if (var76.field1404 > var59.field1417) { + this.method386(var72); + var1.serverPacket = null; + return true; + } + + if (var76.field1404 < var59.field1417) { + var1.serverPacket = null; + return true; } + var76.method851(var59); var1.serverPacket = null; return true; } if (ServerPacket.IF_SETANGLE == var1.serverPacket) { - return this.method372(var1, 1); - } + var20 = var3.readUnsignedShortAdd(); + if (var20 == 65535) { + var20 = -1; + } - if (ServerPacket.IF_OPENSUB == var1.serverPacket) { - hintArrowType = var3.readUnsignedByte(); - if (hintArrowType == 1) { - hintArrowNpcIndex = var3.readUnsignedShort(); + rootInterface = var20; + this.method382(false); + class357.method1901(var20); + VerticalAlignment.runWidgetOnLoadListener(rootInterface); + + for (var5 = 0; var5 < 100; ++var5) { + field408[var5] = true; } - if (hintArrowType >= 2 && hintArrowType <= 6) { - if (hintArrowType == 2) { - hintArrowSubX = 64; - hintArrowSubY = 64; - } + var1.serverPacket = null; + return true; + } - if (hintArrowType == 3) { - hintArrowSubX = 0; - hintArrowSubY = 64; - } + boolean var32; + if (ServerPacket.UPDATE_IGNORELIST == var1.serverPacket) { + var50 = var3.readStringCp1252NullTerminated(); + var25 = (long)var3.readUnsignedShort(); + var27 = (long)var3.readMedium(); + PlayerType var9 = (PlayerType)SequenceDefinition.findEnumerated(class183.PlayerType_values(), var3.readUnsignedByte()); + long var36 = var27 + (var25 << 32); + var32 = false; - if (hintArrowType == 4) { - hintArrowSubX = 128; - hintArrowSubY = 64; + for (var68 = 0; var68 < 100; ++var68) { + if (var36 == crossWorldMessageIds[var68]) { + var32 = true; + break; } + } - if (hintArrowType == 5) { - hintArrowSubX = 64; - hintArrowSubY = 0; - } + if (InvDefinition.friendSystem.isIgnored(new Username(var50, class166.loginType))) { + var32 = true; + } - if (hintArrowType == 6) { - hintArrowSubX = 64; - hintArrowSubY = 128; + if (!var32 && field481 == 0) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var36; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var31 = AbstractFont.escapeBrackets(HealthBarUpdate.method523(class172.readString(var3))); + byte var70; + if (var9.isPrivileged) { + var70 = 7; + } else { + var70 = 3; } - hintArrowType = 2; - hintArrowX = var3.readUnsignedShort(); - hintArrowY = var3.readUnsignedShort(); - hintArrowHeight = var3.readUnsignedByte(); + if (var9.modIcon != -1) { + class411.addGameMessage(var70, class436.addImageTag(var9.modIcon) + var50, var31); + } else { + class411.addGameMessage(var70, var50, var31); + } } - if (hintArrowType == 10) { - hintArrowPlayerIndex = var3.readUnsignedShort(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.HINT_ARROW == var1.serverPacket) { + var20 = var3.readShort(); + var5 = var3.readUnsignedIntLE(); + var22 = var3.method2625(); + var23 = class33.field89.method1740(var5); + if (var20 != var23.rawX || var22 != var23.rawY || var23.xAlignment != 0 || var23.yAlignment != 0) { + var23.rawX = var20; + var23.rawY = var22; + var23.xAlignment = 0; + var23.yAlignment = 0; + ClanChannelMember.invalidateWidget(var23); + this.alignWidget(var23); + if (var23.type == 0) { + PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var5 >> 16], var23, false); + } } var1.serverPacket = null; return true; } - if (ServerPacket.GAMEFRAME_FULL == var1.serverPacket) { - WorldMapSection2.method1410(); - var20 = var3.readByte(); - class146 var75 = new class146(var3); - ClanSettings var96; - if (var20 >= 0) { - var96 = currentClanSettings[var20]; - } else { - var96 = Players.guestClanSettings; - } + if (ServerPacket.MESSAGE_FRIENDCHANNEL == var1.serverPacket) { + var20 = var3.readInt(); + var5 = var3.readUnsignedByteSub(); + var22 = var3.readUnsignedByte(); + var23 = class33.field89.method1740(var20); + UrlRequest.method664(var23, var22, var5); + ClanChannelMember.invalidateWidget(var23); + var1.serverPacket = null; + return true; + } - if (var96 == null) { - this.method384(var20); - var1.serverPacket = null; - return true; + if (ServerPacket.NEW_PACK_215 == var1.serverPacket) { + var20 = var3.readUnsignedShortAdd(); + var5 = var3.readInt(); + var22 = var20 >> 10 & 31; + var7 = var20 >> 5 & 31; + var8 = var20 & 31; + var24 = (var7 << 11) + (var22 << 19) + (var8 << 3); + Widget var97 = class33.field89.method1740(var5); + if (var24 != var97.color) { + var97.color = var24; + ClanChannelMember.invalidateWidget(var97); } - if (var75.field1347 > var96.field1388) { - this.method384(var20); - var1.serverPacket = null; - return true; - } + var1.serverPacket = null; + return true; + } - if (var75.field1347 < var96.field1388) { - var1.serverPacket = null; - return true; + if (ServerPacket.field2683 == var1.serverPacket) { + var20 = var3.readIntME(); + byte var71 = var3.readByte(); + Varps.Varps_temp[var20] = var71; + if (Varps.Varps_main[var20] != var71) { + Varps.Varps_main[var20] = var71; } - var75.method781(var96); + ScriptEvent.changeGameOptions(var20); + changedVarps[++changedVarpCount - 1 & 31] = var20; var1.serverPacket = null; return true; } - if (ServerPacket.LOC_ANIM == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.OBJ_DEL_LEGACY); + boolean var61; + if (ServerPacket.NEW_PACKET_CAM_RESET_V2 == var1.serverPacket) { + var20 = var3.readUnsignedIntIME(); + var61 = var3.readUnsignedByte() == 1; + var6 = class33.field89.method1740(var20); + Strings.method1908(var6, TextureProvider.localPlayer.appearance, var61); + ClanChannelMember.invalidateWidget(var6); var1.serverPacket = null; return true; } - if (ServerPacket.CAM_LOOKAT_EASED_ANGLE_ABSOLUTE == var1.serverPacket) { - var68 = var3.method2588(); - var5 = var3.readInt(); - var6 = var3.readShort(); - var71 = class92.getWidget(var5); - if (var6 != var71.rawX || var68 != var71.rawY || var71.xAlignment != 0 || var71.yAlignment != 0) { - var71.rawX = var6; - var71.rawY = var68; - var71.xAlignment = 0; - var71.yAlignment = 0; - class218.invalidateWidget(var71); - this.alignWidget(var71); - if (var71.type == 0) { - Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var5 >> 16], var71, false); - } + if (ServerPacket.field2720 == var1.serverPacket) { + var20 = var3.readUnsignedShortAdd(); + if (var20 == 65535) { + var20 = -1; + } + + var24 = var3.readUnsignedShort(); + var7 = var3.readUnsignedShortAdd(); + var8 = var3.readUnsignedShortAddLE(); + var22 = var3.readUnsignedShortAdd(); + var5 = var3.readUnsignedShortAddLE(); + if (var5 == 65535) { + var5 = -1; } + ArrayList var95 = new ArrayList(); + var95.add(var20); + var95.add(var5); + class202.method1006(var95, var22, var7, var8, var24); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPLAYERHEAD == var1.serverPacket) { - var68 = var3.readIntIME(); - var5 = var3.readUnsignedIntIME(); - var89 = class92.getWidget(var5); - ReflectionCheck.method174(var89, var68); - class218.invalidateWidget(var89); + if (ServerPacket.field2714 == var1.serverPacket) { + return this.method377(var1); + } + + if (ServerPacket.OBJ_ADD == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.OBJ_ADD); var1.serverPacket = null; return true; } - if (ServerPacket.NEW_PACKET_CAM_RESET_V2 == var1.serverPacket) { - var68 = var3.readUnsignedShort(); - var5 = var3.method2598(); - var89 = class92.getWidget(var5); - if (var89.modelType != 6 || var68 != var89.modelId) { - var89.modelType = 6; - var89.modelId = var68; - class218.invalidateWidget(var89); - } - + if (ServerPacket.MIDI_SONG_STOP == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.LOC_DEL); var1.serverPacket = null; return true; } - if (ServerPacket.SEND_PING == var1.serverPacket) { - byte var58 = var3.readByteAdd(); - var85 = var3.readUnsignedByteNeg() * 4; - byte var57 = var3.readByteAdd(); - var59 = var3.readUnsignedShortLE(); - var56 = var3.method2548(); - var16 = var3.readIntME(); - var13 = var3.readUnsignedByteAdd() * 4; - var15 = var3.method2587(); - var6 = var3.method2591(); - var68 = var6 >> 16; - var5 = var6 >> 8 & 255; - var7 = var68 + (var6 >> 4 & 7); - var8 = var5 + (var6 & 7); - int var18 = var3.readUnsignedByte(); - int var17 = var3.readUnsignedByteSub(); - var9 = var58 + var7; - var10 = var57 + var8; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var59 != 65535) { - var7 = var7 * 128 + 64; - var8 = var8 * 128 + 64; - var9 = var9 * 128 + 64; - var10 = var10 * 128 + 64; - Projectile var19 = new Projectile(var59, HealthBar.Client_plane, var7, var8, class18.getTileHeight(var7, var8, HealthBar.Client_plane) - var13, var15 + cycle, var16 + cycle, var17, var18, var56, var85); - var19.setDestination(var9, var10, class18.getTileHeight(var9, var10, HealthBar.Client_plane) - var85, var15 + cycle); - projectiles.addFirst(var19); - } - + if (ServerPacket.REBUILD_REGION == var1.serverPacket) { + SequenceDefinition.varclan = null; var1.serverPacket = null; return true; } - if (ServerPacket.VARCLAN_DISABLE == var1.serverPacket) { - class139.varclan = new class454(SwapSongTask.HitSplatDefinition_cached); + if (ServerPacket.SPOTANIM_SPECIFIC == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.field2624); var1.serverPacket = null; return true; } - if (ServerPacket.FRIENDLIST_LOADED == var1.serverPacket) { - ObjectSound.field686 = var3.readUnsignedByteNeg(); - class125.field1193 = var3.readUnsignedByteSub(); + if (ServerPacket.REFLECTION_CHECK == var1.serverPacket) { + var20 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var22 = var3.readUnsignedShort(); + GraphicsDefaults.queueSoundEffect(var20, var5, var22); var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SONG_STOP == var1.serverPacket) { - for (var68 = 0; var68 < players.length; ++var68) { - if (players[var68] != null) { - players[var68].sequence = -1; + long var34; + if (ServerPacket.VARP_SMALL == var1.serverPacket) { + var20 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; + } + + var22 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.method382(false); + class357.method1901(rootInterface); + VerticalAlignment.runWidgetOnLoadListener(rootInterface); + + for (var7 = 0; var7 < 100; ++var7) { + field408[var7] = true; + } + } + + InterfaceParent var93; + for (; var22-- > 0; var93.field858 = true) { + var7 = var3.readInt(); + var8 = var3.readUnsignedShort(); + var24 = var3.readUnsignedByte(); + var93 = (InterfaceParent)interfaceParents.get((long)var7); + if (var93 != null && var8 != var93.group) { + ArchiveDisk.closeInterface(var93, true); + var93 = null; + } + + if (var93 == null) { + var93 = ClanChannel.ifOpenSub(var7, var8, var24); + } + } + + for (var78 = (InterfaceParent)interfaceParents.first(); var78 != null; var78 = (InterfaceParent)interfaceParents.next()) { + if (var78.field858) { + var78.field858 = false; + } else { + ArchiveDisk.closeInterface(var78, true); } } - for (var68 = 0; var68 < npcs.length; ++var68) { - if (npcs[var68] != null) { - npcs[var68].sequence = -1; + widgetFlags = new NodeHashTable(512); + + while (var3.offset < var20) { + var7 = var3.readInt(); + var8 = var3.readUnsignedShort(); + var24 = var3.readUnsignedShort(); + var10 = var3.readInt(); + + for (var60 = var8; var60 <= var24; ++var60) { + var34 = ((long)var7 << 32) + (long)var60; + widgetFlags.put(new IntegerNode(var10), var34); } } @@ -4452,292 +4681,320 @@ final boolean method374(PacketWriter var1) { return true; } - if (ServerPacket.REBUILD_REGION == var1.serverPacket) { - Frames.updateNpcs(false, var3); + if (ServerPacket.UPDATE_INV_CLEAR == var1.serverPacket) { + Tiles.updatePlayers(var3, var1.serverPacketLength); + SecureRandomCallable.method458(); var1.serverPacket = null; return true; } - if (ServerPacket.SPOTANIM_SPECIFIC == var1.serverPacket) { - NPCComposition.readReflectionCheck(var3, var1.serverPacketLength); + boolean var74; + if (ServerPacket.UPDATE_INV_FULL == var1.serverPacket) { + var74 = var3.readUnsignedByte() == 1; + if (var74) { + class411.field3712 = GrandExchangeOfferTotalQuantityComparator.method1971() - var3.readLong(); + Varps.grandExchangeEvents = new GrandExchangeEvents(var3, true); + } else { + Varps.grandExchangeEvents = null; + } + + field526 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.REFLECTION_CHECK == var1.serverPacket) { - Frames.updateNpcs(true, var3); + if (ServerPacket.MIDI_SONG_LEGACY == var1.serverPacket) { + Clock.field1484 = var3.readUnsignedByte(); + class354.field3144 = var3.readUnsignedByte(); var1.serverPacket = null; return true; } - if (ServerPacket.VARP_SMALL == var1.serverPacket) { - var68 = var3.readUnsignedByteAdd(); - var5 = var3.readUnsignedByteAdd(); - var6 = var3.method2598(); - var71 = class92.getWidget(var6); - Tiles.method460(var71, var5, var68); - class218.invalidateWidget(var71); + if (ServerPacket.TRADING_POST_RESULTS == var1.serverPacket) { + var20 = var3.readInt(); + var5 = var3.readInt(); + var6 = class33.field89.method1740(var5); + ZoneOperation.method1645(var6, var20); + ClanChannelMember.invalidateWidget(var6); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_INV_CLEAR == var1.serverPacket) { - var5 = var3.readUnsignedShort(); - var68 = var3.readIntME(); - Script.method445(var68, var5); + if (ServerPacket.VARP_LARGE == var1.serverPacket) { + var24 = var3.readUnsignedByteNeg(); + var10 = var24 >> 2; + var60 = var24 & 3; + var87 = field652[var10]; + var22 = var3.method2627(); + var20 = var22 >> 16; + var5 = var22 >> 8 & 255; + var7 = var20 + (var22 >> 4 & 7); + var8 = var5 + (var22 & 7); + var68 = var3.readUnsignedShortAddLE(); + if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { + if (var87 == 0) { + BoundaryObject var100 = class10.scene.method1299(class87.Client_plane, var7, var8); + if (var100 != null) { + var15 = SecureRandomFuture.Entity_unpackID(var100.tag); + if (var10 == 2) { + var100.renderable1 = new DynamicObject(var15, 2, var60 + 4, class87.Client_plane, var7, var8, var68, false, var100.renderable1); + var100.renderable2 = new DynamicObject(var15, 2, var60 + 1 & 3, class87.Client_plane, var7, var8, var68, false, var100.renderable2); + } else { + var100.renderable1 = new DynamicObject(var15, var10, var60, class87.Client_plane, var7, var8, var68, false, var100.renderable1); + } + } + } else if (var87 == 1) { + WallDecoration var98 = class10.scene.method1300(class87.Client_plane, var7, var8); + if (var98 != null) { + var15 = SecureRandomFuture.Entity_unpackID(var98.tag); + if (var10 != 4 && var10 != 5) { + if (var10 == 6) { + var98.renderable1 = new DynamicObject(var15, 4, var60 + 4, class87.Client_plane, var7, var8, var68, false, var98.renderable1); + } else if (var10 == 7) { + var98.renderable1 = new DynamicObject(var15, 4, (var60 + 2 & 3) + 4, class87.Client_plane, var7, var8, var68, false, var98.renderable1); + } else if (var10 == 8) { + var98.renderable1 = new DynamicObject(var15, 4, var60 + 4, class87.Client_plane, var7, var8, var68, false, var98.renderable1); + var98.renderable2 = new DynamicObject(var15, 4, (var60 + 2 & 3) + 4, class87.Client_plane, var7, var8, var68, false, var98.renderable2); + } + } else { + var98.renderable1 = new DynamicObject(var15, 4, var60, class87.Client_plane, var7, var8, var68, false, var98.renderable1); + } + } + } else if (var87 == 2) { + GameObject var94 = class10.scene.getGameObject(class87.Client_plane, var7, var8); + if (var10 == 11) { + var10 = 10; + } + + if (var94 != null) { + var94.renderable = new DynamicObject(SecureRandomFuture.Entity_unpackID(var94.tag), var10, var60, class87.Client_plane, var7, var8, var68, false, var94.renderable); + } + } else if (var87 == 3) { + FloorDecoration var96 = class10.scene.getFloorDecoration(class87.Client_plane, var7, var8); + if (var96 != null) { + var96.renderable = new DynamicObject(SecureRandomFuture.Entity_unpackID(var96.tag), 22, var60, class87.Client_plane, var7, var8, var68, false, var96.renderable); + } + } + } + var1.serverPacket = null; return true; } - if (ServerPacket.SET_MAP_FLAG == var1.serverPacket) { - var80 = var3.readBoolean(); - if (var80) { - if (class390.field3656 == null) { - class390.field3656 = new class369(); - } + if (ServerPacket.IF_SETNPCHEAD == var1.serverPacket) { + var5 = var3.readIntME(); + var7 = var3.readUnsignedByteNeg(); + var20 = var3.readUnsignedShortAdd(); + Player var90; + if (var20 == localPlayerIndex) { + var90 = TextureProvider.localPlayer; } else { - class390.field3656 = null; + var90 = players[var20]; + } + + var22 = var3.readInt(); + if (var90 != null) { + var90.updateSpotAnimation(var7, var5, var22 >> 16, var22 & 65535); } var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SONG_LEGACY == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field404 = true; - var68 = class7.method18(var3.readShort() & 2027); - var5 = UserComparator8.method674(var3.readShort() & 2027); - var6 = var3.readUnsignedShort(); - var7 = var3.readUnsignedByte(); - field647 = new class478(class129.cameraPitch, var5, var6, var7); - field646 = new class478(UserComparator10.cameraYaw, var68, var6, var7); + if (ServerPacket.PREFETCH_GAMEOBJECTS == var1.serverPacket) { + var20 = var3.readInt(); + var61 = var3.readUnsignedByte() == 1; + var6 = class33.field89.method1740(var20); + if (var61 != var6.isHidden) { + var6.isHidden = var61; + ClanChannelMember.invalidateWidget(var6); + } + var1.serverPacket = null; return true; } - if (ServerPacket.TRADING_POST_RESULTS == var1.serverPacket) { - return this.method373(var1); + if (ServerPacket.IF1_MODELROTATE == var1.serverPacket) { + var20 = var3.readUnsignedShortAdd(); + var5 = var3.readUnsignedShort(); + var22 = var3.readUnsignedShortAddLE(); + var7 = var3.readUnsignedShortAdd(); + class206.someMusicMethod(var20, var5, var22, var7); + var1.serverPacket = null; + return true; } - if (ServerPacket.VARP_LARGE == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.OBJ_COUNT); + if (ServerPacket.UPDATE_SITESETTINGS == var1.serverPacket) { + rebootTimer = var3.readIntME() * 30; + field527 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETNPCHEAD == var1.serverPacket) { - var68 = var3.readUnsignedIntIME(); - var5 = var3.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var3.readIntIME(); - var7 = var3.method2587(); - if (var7 == 65535) { - var7 = -1; - } + if (ServerPacket.VARCLAN_DISABLE == var1.serverPacket) { + var20 = var3.readUnsignedIntLE(); + var5 = var3.readUnsignedShortAddLE(); + var6 = class33.field89.method1740(var20); + if (var6 != null && var6.type == 0) { + if (var5 > var6.scrollHeight - var6.height) { + var5 = var6.scrollHeight - var6.height; + } - for (var8 = var7; var8 <= var5; ++var8) { - var27 = ((long)var6 << 32) + (long)var8; - Node var99 = widgetFlags.get(var27); - if (var99 != null) { - var99.remove(); + if (var5 < 0) { + var5 = 0; } - widgetFlags.put(new IntegerNode(var68), var27); + if (var5 != var6.scrollY) { + var6.scrollY = var5; + ClanChannelMember.invalidateWidget(var6); + } } var1.serverPacket = null; return true; } - if (ServerPacket.PREFETCH_GAMEOBJECTS == var1.serverPacket) { - var7 = var3.readUnsignedShortLE(); - var5 = var3.method2587(); + if (ServerPacket.NPC_SPOTANIM_SPECIFIC == var1.serverPacket) { + var20 = var3.readUnsignedIntLE(); + var5 = var3.readUnsignedShortAddLE(); if (var5 == 65535) { var5 = -1; } - var8 = var3.method2587(); - var6 = var3.readIntME(); - var9 = var3.readIntME(); - var68 = var3.readUnsignedShortLE(); - if (var68 == 65535) { - var68 = -1; + var22 = var3.readUnsignedShort(); + if (var22 == 65535) { + var22 = -1; } - ArrayList var86 = new ArrayList(); - var86.add(var68); - var86.add(var5); - class157.method836(var86, var6, var7, var8, var9); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.HINT_ARROW == var1.serverPacket) { - class113.process(); - var68 = var3.readUnsignedByteSub(); - var5 = var3.readUnsignedByteAdd(); - var6 = var3.method2598(); - experience[var5] = var6; - currentLevels[var5] = var68; - levels[var5] = 1; + var7 = var3.readUnsignedIntIME(); - for (var7 = 0; var7 < 98; ++var7) { - if (var6 >= Skills.Skills_experienceTable[var7]) { - levels[var5] = var7 + 2; + for (var8 = var22; var8 <= var5; ++var8) { + var29 = ((long)var7 << 32) + (long)var8; + Node var99 = widgetFlags.get(var29); + if (var99 != null) { + var99.remove(); } + + widgetFlags.put(new IntegerNode(var20), var29); } - changedSkills[++changedSkillsCount - 1 & 31] = var5; var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_SITESETTINGS == var1.serverPacket) { - var68 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedShort(); - class27.queueSoundEffect(var68, var5, var6); - var1.serverPacket = null; - return true; - } + if (ServerPacket.field2652 == var1.serverPacket) { + var20 = var3.readIntME(); + if (var20 == 65535) { + var20 = -1; + } - if (ServerPacket.CLANSETTINGS_FULL == var1.serverPacket) { - var68 = var3.readUnsignedByte(); - var5 = var3.readIntIME(); - var89 = class92.getWidget(var5); - class135.method742(var89, VarbitComposition.localPlayer.appearance.field2916, var68); - class218.invalidateWidget(var89); + MusicPatch.playSong(var20); var1.serverPacket = null; return true; } - if (ServerPacket.NPC_SPOTANIM_SPECIFIC == var1.serverPacket) { - var68 = var3.readIntIME(); - var5 = var3.readUnsignedShort(); - var89 = class92.getWidget(var68); - if (var89.modelType != 2 || var5 != var89.modelId) { - var89.modelType = 2; - var89.modelId = var5; - class218.invalidateWidget(var89); + if (ServerPacket.UPDATE_INV_STOP_TRANSMIT == var1.serverPacket) { + var20 = var3.readUnsignedShortAdd(); + if (var20 == 65535) { + var20 = -1; } + var5 = var3.method2627(); + class437.playJingle(var20, var5); var1.serverPacket = null; return true; } - if (ServerPacket.TRADING_POST_UPDATE == var1.serverPacket) { - var68 = var3.readUnsignedByte(); - Script.forceDisconnect(var68); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.UPDATE_INV_STOP_TRANSMIT == var1.serverPacket) { - class113.process(); - runEnergy = var3.readUnsignedShort(); - field528 = cycleCntr; - var1.serverPacket = null; - return true; - } + if (ServerPacket.MESSAGE_CLANCHANNEL == var1.serverPacket) { + World var53 = new World(); + var53.host = var3.readStringCp1252NullTerminated(); + var53.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var53.properties = var5; + if (var53.isDeadman()) { + var53.field680 = "beta"; + } - boolean var61; - if (ServerPacket.LOGIN_SCREEN_PACKET == var1.serverPacket) { - var68 = var3.readIntIME(); - var61 = var3.readUnsignedByte() == 1; - var89 = class92.getWidget(var68); - class160.method846(var89, VarbitComposition.localPlayer.appearance, var61); - class218.invalidateWidget(var89); + DefaultsGroup.updateGameState(45); + var2.close(); + var2 = null; + Language.changeWorld(var53); var1.serverPacket = null; - return true; + return false; } + NPC var89; if (ServerPacket.RESET_ANIMS == var1.serverPacket) { - var20 = var3.readByteNeg(); - var5 = var3.readUnsignedShortLE(); - Varps.Varps_temp[var5] = var20; - if (Varps.Varps_main[var5] != var20) { - Varps.Varps_main[var5] = var20; + var20 = var3.readUnsignedShortAdd(); + short var66 = (short)var3.readShortLE(); + var22 = var3.readUnsignedIntLE(); + var7 = var3.readUnsignedByteNeg(); + var89 = npcs[var20]; + if (var89 != null) { + var89.method589(var7, var22, var66); } - WorldMapDecoration.changeGameOptions(var5); - changedVarps[++changedVarpCount - 1 & 31] = var5; var1.serverPacket = null; return true; } - boolean var12; if (ServerPacket.CAM_SHAKE == var1.serverPacket) { - var51 = var3.readStringCp1252NullTerminated(); - var23 = (long)var3.readUnsignedShort(); - var25 = (long)var3.readMedium(); - PlayerType var44 = (PlayerType)KeyHandler.findEnumerated(MidiPcmStream.PlayerType_values(), var3.readUnsignedByte()); - long var46 = (var23 << 32) + var25; - var12 = false; - - for (var13 = 0; var13 < 100; ++var13) { - if (var46 == crossWorldMessageIds[var13]) { - var12 = true; - break; - } - } - - if (class299.friendSystem.isIgnored(new Username(var51, Language.loginType))) { - var12 = true; - } - - if (!var12 && field486 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var46; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var30 = AbstractFont.escapeBrackets(World.method385(DirectByteArrayCopier.readString(var3))); - byte var83; - if (var44.isPrivileged) { - var83 = 7; - } else { - var83 = 3; + var50 = var3.readStringCp1252NullTerminated(); + var5 = var3.readUnsignedByte(); + var22 = var3.readUnsignedByteNeg(); + if (var5 >= 1 && var5 <= 8) { + if (var50.equalsIgnoreCase("null")) { + var50 = null; } - if (var44.modIcon != -1) { - MouseHandler.addGameMessage(var83, Tile.addImageTag(var44.modIcon) + var51, var30); - } else { - MouseHandler.addGameMessage(var83, var51, var30); - } + playerMenuActions[var5 - 1] = var50; + playerOptionsPriorities[var5 - 1] = var22 == 0; } var1.serverPacket = null; return true; } - if (ServerPacket.NEW_PACK_215 == var1.serverPacket) { - if (class139.varclan == null) { - class139.varclan = new class454(SwapSongTask.HitSplatDefinition_cached); + if (ServerPacket.UPDATE_RUNWEIGHT == var1.serverPacket) { + var5 = var3.readUnsignedIntLE(); + var22 = var3.readIntME(); + var7 = var3.readUnsignedByte(); + var20 = var3.readUnsignedShort(); + var89 = npcs[var20]; + if (var89 != null) { + var89.updateSpotAnimation(var7, var22, var5 >> 16, var5 & 65535); } - class523 var52 = SwapSongTask.HitSplatDefinition_cached.method2324(var3); - class139.varclan.field3899.vmethod8143(var52.field4216, var52.field4215); - field572[++field512 - 1 & 31] = var52.field4216; var1.serverPacket = null; return true; } if (ServerPacket.SYNC_CLIENT_VARCACHE == var1.serverPacket) { + for (var20 = 0; var20 < players.length; ++var20) { + if (players[var20] != null) { + players[var20].sequence = -1; + } + } + + for (var20 = 0; var20 < npcs.length; ++var20) { + if (npcs[var20] != null) { + npcs[var20].sequence = -1; + } + } + var1.serverPacket = null; return true; } - NPC var91; if (ServerPacket.IF_CLOSESUB == var1.serverPacket) { - short var82 = (short)var3.method2588(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedShort(); - var7 = var3.readUnsignedIntIME(); - var91 = npcs[var6]; - if (var91 != null) { - var91.method589(var5, var7, var82); + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { + destinationY = 0; } var1.serverPacket = null; @@ -4745,110 +5002,123 @@ final boolean method374(PacketWriter var1) { } if (ServerPacket.REBUILD_REGION_NORMAL == var1.serverPacket) { - var68 = var3.readInt(); - if (var68 != field476) { - field476 = var68; - WorldMapSection2.method1411(); + if (SequenceDefinition.varclan == null) { + SequenceDefinition.varclan = new class469(class53.Widget_cachedFonts); } + class538 var52 = class53.Widget_cachedFonts.method2361(var3); + SequenceDefinition.varclan.field3931.vmethod8143(var52.field4243, var52.field4242); + field571[++field512 - 1 & 31] = var52.field4243; var1.serverPacket = null; return true; } if (ServerPacket.IF_SETPOSITION == var1.serverPacket) { - for (var68 = 0; var68 < VarpDefinition.field1498; ++var68) { - VarpDefinition var73 = ApproximateRouteStrategy.VarpDefinition_get(var68); - if (var73 != null) { - Varps.Varps_temp[var68] = 0; - Varps.Varps_main[var68] = 0; + var20 = var3.readUShortSmart(); + var61 = var3.readUnsignedByte() == 1; + var55 = ""; + boolean var58 = false; + if (var61) { + var55 = var3.readStringCp1252NullTerminated(); + if (InvDefinition.friendSystem.isIgnored(new Username(var55, class166.loginType))) { + var58 = true; } } - class113.process(); - changedVarpCount += 32; + String var88 = var3.readStringCp1252NullTerminated(); + if (!var58) { + class411.addGameMessage(var20, var55, var88); + } + var1.serverPacket = null; return true; } if (ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS == var1.serverPacket) { - var51 = var3.readStringCp1252NullTerminated(); - Object[] var72 = new Object[var51.length() + 1]; + Clock.field1484 = var3.readUnsignedByte(); + class354.field3144 = var3.readUnsignedByteSub(); - for (var6 = var51.length() - 1; var6 >= 0; --var6) { - if (var51.charAt(var6) == 's') { - var72[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var72[var6 + 1] = new Integer(var3.readInt()); - } + while (var3.offset < var1.serverPacketLength) { + var20 = var3.readUnsignedByte(); + ZoneOperation var75 = JSException.method2055()[var20]; + UrlRequest.processZoneOperation(var75); } - var72[0] = new Integer(var3.readInt()); - ScriptEvent var95 = new ScriptEvent(); - var95.args = var72; - WorldMapSection1.runScriptEvent(var95); var1.serverPacket = null; return true; } if (ServerPacket.PLAYER_INFO == var1.serverPacket) { - var51 = var3.readStringCp1252NullTerminated(); - var21 = AbstractFont.escapeBrackets(World.method385(DirectByteArrayCopier.readString(var3))); - MouseHandler.addGameMessage(6, var51, var21); + var20 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var20 < -70000) { + var5 += 32768; + } + + if (var20 >= 0) { + var6 = class33.field89.method1740(var20); + } else { + var6 = null; + } + + for (; var3.offset < var1.serverPacketLength; SecureRandomFuture.itemContainerSetItem(var5, var7, var8 - 1, var24)) { + var7 = var3.readUShortSmart(); + var8 = var3.readUnsignedShort(); + var24 = 0; + if (var8 != 0) { + var24 = var3.readUnsignedByte(); + if (var24 == 255) { + var24 = var3.readInt(); + } + } + + if (var6 != null && var7 >= 0 && var7 < var6.field3082.length) { + var6.field3082[var7] = var8; + var6.field3079[var7] = var24; + } + } + + if (var6 != null) { + ClanChannelMember.invalidateWidget(var6); + } + + class304.method1636(); + changedItemContainers[++changedItemContainersCount - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETHIDE == var1.serverPacket) { - class299.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - AbstractSocket.FriendSystem_invalidateIgnoreds(); - field518 = cycleCntr; + if (ServerPacket.CLANSETTINGS_FULL == var1.serverPacket) { + InvDefinition.friendSystem.method401(); + field511 = cycleCntr; var1.serverPacket = null; return true; } if (ServerPacket.UPDATE_RUNENERGY == var1.serverPacket) { - var68 = var3.readUShortSmart(); - var61 = var3.readUnsignedByte() == 1; - var94 = ""; - boolean var55 = false; - if (var61) { - var94 = var3.readStringCp1252NullTerminated(); - if (class299.friendSystem.isIgnored(new Username(var94, Language.loginType))) { - var55 = true; - } - } - - String var92 = var3.readStringCp1252NullTerminated(); - if (!var55) { - MouseHandler.addGameMessage(var68, var94, var92); - } - + UrlRequest.processZoneOperation(ZoneOperation.AREA_SOUND); var1.serverPacket = null; return true; } - if (ServerPacket.MAPPROJ_ANIM == var1.serverPacket) { - var80 = var3.readUnsignedByte() == 1; - if (var80) { - class132.field1272 = GameEngine.clockNow() - var3.readLong(); - class392.grandExchangeEvents = new GrandExchangeEvents(var3, true); - } else { - class392.grandExchangeEvents = null; + if (ServerPacket.TRADING_POST_UPDATE == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + NPC.method598(var3, var3.offset - 28); } - field525 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.CAM_MOVETO_EASED == var1.serverPacket) { - var68 = var3.readUnsignedShortLE(); - var91 = npcs[var68]; - var7 = var3.readUnsignedByteAdd(); - var6 = var3.readUnsignedShortLE(); - var5 = var3.readUnsignedIntIME(); - if (var91 != null) { - var91.updateSpotAnimation(var7, var6, var5 >> 16, var5 & 65535); + if (ServerPacket.IF_OPENSUB == var1.serverPacket) { + var20 = var3.readInt(); + var5 = var3.readUnsignedShortAdd(); + var6 = class33.field89.method1740(var20); + if (var6.modelType != 2 || var5 != var6.modelId) { + var6.modelType = 2; + var6.modelId = var5; + ClanChannelMember.invalidateWidget(var6); } var1.serverPacket = null; @@ -4856,230 +5126,215 @@ final boolean method374(PacketWriter var1) { } if (ServerPacket.MESSAGE_PRIVATE_ECHO == var1.serverPacket) { - var68 = var3.readIntME(); - if (var68 == 65535) { - var68 = -1; + var20 = var3.readUnsignedIntME(); + var5 = var3.readIntME(); + var22 = var3.readUnsignedShort(); + var23 = class33.field89.method1740(var20); + var23.rotationKey = var5 + (var22 << 16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.PLAYER_ANIM_SPECIFIC == var1.serverPacket) { + var20 = var3.readInt(); + if (var20 != field366) { + field366 = var20; + class174.method917(); } - var5 = var3.readInt(); - var6 = var3.readIntIME(); - var71 = class92.getWidget(var5); - ItemComposition var90; - if (!var71.isIf3) { - if (var68 == -1) { - var71.modelType = 0; - var1.serverPacket = null; - return true; - } + var1.serverPacket = null; + return true; + } - var90 = InvDefinition.ItemDefinition_get(var68).getCountObj(var6); - var71.modelType = 4; - var71.modelId = var68; - var71.modelAngleX = var90.xan2d; - var71.modelAngleY = var90.yan2d; - var71.modelZoom = var90.zoom2d * 100 / var6; - class218.invalidateWidget(var71); - } else { - var71.itemId = var68; - var71.itemQuantity = var6; - var90 = InvDefinition.ItemDefinition_get(var68).getCountObj(var6); - var71.modelAngleX = var90.xan2d; - var71.modelAngleY = var90.yan2d; - var71.modelAngleZ = var90.zan2d; - var71.modelOffsetX = var90.offsetX2d; - var71.modelOffsetY = var90.offsetY2d; - var71.modelZoom = var90.zoom2d; - if (var90.isStackable == 1) { - var71.itemQuantityMode = 1; - } else { - var71.itemQuantityMode = 2; - } + if (ServerPacket.IF_SETTEXT == var1.serverPacket) { + class357.readReflectionCheck(var3, var1.serverPacketLength); + var1.serverPacket = null; + return true; + } - if (var71.modelRotation > 0) { - var71.modelZoom = var71.modelZoom * 32 / var71.modelRotation; - } else if (var71.rawWidth > 0) { - var71.modelZoom = var71.modelZoom * 32 / var71.rawWidth; - } + if (ServerPacket.IF_SETPLAYERMODEL_OBJ == var1.serverPacket) { + var20 = var3.readInt(); + InterfaceParent var73 = (InterfaceParent)interfaceParents.get((long)var20); + if (var73 != null) { + ArchiveDisk.closeInterface(var73, true); + } - class218.invalidateWidget(var71); + if (meslayerContinueWidget != null) { + ClanChannelMember.invalidateWidget(meslayerContinueWidget); + meslayerContinueWidget = null; } var1.serverPacket = null; return true; } - if (ServerPacket.PLAYER_ANIM_SPECIFIC == var1.serverPacket) { - var5 = var3.method2587(); - var6 = var3.readUnsignedByteAdd(); - var68 = var3.readIntME(); - if (var5 == 65535) { - var5 = -1; + if (ServerPacket.CLANCHANNEL_DELTA == var1.serverPacket) { + var20 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var20 < -70000) { + var5 += 32768; } - NPC var22 = npcs[var68]; - if (var22 != null) { - if (var5 == var22.sequence && var5 != -1) { - var8 = EnumComposition.SequenceDefinition_get(var5).replyMode; - if (var8 == 1) { - var22.sequenceFrame = 0; - var22.sequenceFrameCycle = 0; - var22.sequenceDelay = var6; - var22.currentSequenceFrameIndex = 0; - } else if (var8 == 2) { - var22.currentSequenceFrameIndex = 0; - } - } else if (var5 == -1 || var22.sequence == -1 || EnumComposition.SequenceDefinition_get(var5).forcedPriority >= EnumComposition.SequenceDefinition_get(var22.sequence).forcedPriority) { - var22.sequence = var5; - var22.sequenceFrame = 0; - var22.sequenceFrameCycle = 0; - var22.sequenceDelay = var6; - var22.currentSequenceFrameIndex = 0; - var22.field1022 = var22.pathLength; + if (var20 >= 0) { + var6 = class33.field89.method1740(var20); + } else { + var6 = null; + } + + if (var6 != null) { + for (var7 = 0; var7 < var6.field3082.length; ++var7) { + var6.field3082[var7] = 0; + var6.field3079[var7] = 0; } } - var1.serverPacket = null; - return true; - } + class155.clearItemContainer(var5); + var7 = var3.readUnsignedShort(); - if (ServerPacket.IF_SETTEXT == var1.serverPacket) { - var51 = var3.readStringCp1252NullTerminated(); - var23 = var3.readLong(); - var25 = (long)var3.readUnsignedShort(); - var27 = (long)var3.readMedium(); - PlayerType var45 = (PlayerType)KeyHandler.findEnumerated(MidiPcmStream.PlayerType_values(), var3.readUnsignedByte()); - var32 = var27 + (var25 << 32); - boolean var31 = false; + for (var8 = 0; var8 < var7; ++var8) { + var24 = var3.readUnsignedByte(); + if (var24 == 255) { + var24 = var3.readUnsignedIntIME(); + } - for (var15 = 0; var15 < 100; ++var15) { - if (crossWorldMessageIds[var15] == var32) { - var31 = true; - break; + var10 = var3.readUnsignedShort(); + if (var6 != null && var8 < var6.field3082.length) { + var6.field3082[var8] = var10; + var6.field3079[var8] = var24; } - } - if (var45.isUser && class299.friendSystem.isIgnored(new Username(var51, Language.loginType))) { - var31 = true; + SecureRandomFuture.itemContainerSetItem(var5, var8, var10 - 1, var24); } - if (!var31 && field486 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var32; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var43 = AbstractFont.escapeBrackets(World.method385(DirectByteArrayCopier.readString(var3))); - if (var45.modIcon != -1) { - class416.addChatMessage(9, Tile.addImageTag(var45.modIcon) + var51, var43, class211.base37DecodeLong(var23)); - } else { - class416.addChatMessage(9, var51, var43, class211.base37DecodeLong(var23)); - } + if (var6 != null) { + ClanChannelMember.invalidateWidget(var6); } + class304.method1636(); + changedItemContainers[++changedItemContainersCount - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPLAYERMODEL_OBJ == var1.serverPacket) { - var68 = var3.readUnsignedByte(); - MusicPatchNode2.method1625(var68); + if (ServerPacket.UPDATE_STAT == var1.serverPacket) { + class304.method1636(); + var20 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByteSub(); + var22 = var3.readUnsignedIntIME(); + experience[var20] = var22; + currentLevels[var20] = var5; + levels[var20] = 1; + + for (var7 = 0; var7 < 98; ++var7) { + if (var22 >= Skills.Skills_experienceTable[var7]) { + levels[var20] = var7 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var20; var1.serverPacket = null; return true; } - if (ServerPacket.CLANCHANNEL_DELTA == var1.serverPacket) { - var68 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedByte(); - var7 = var3.readUnsignedByte(); - cameraShaking[var68] = true; - cameraShakeIntensity[var68] = var5; - cameraMoveIntensity[var68] = var6; - cameraShakeSpeed[var68] = var7; - cameraShakeCycle[var68] = 0; + if (ServerPacket.IF_SETOBJECT == var1.serverPacket) { + return this.method376(var1, 2); + } + + if (ServerPacket.NPC_INFO_LARGE == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.OBJ_DEL); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_FRIENDLIST == var1.serverPacket) { - var68 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var68 < -70000) { - var5 += 32768; + if (ServerPacket.ENTER_FREECAM == var1.serverPacket) { + hintArrowType = var3.readUnsignedByte(); + if (hintArrowType == 1) { + hintArrowNpcIndex = var3.readUnsignedShort(); } - if (var68 >= 0) { - var89 = class92.getWidget(var68); - } else { - var89 = null; - } + if (hintArrowType >= 2 && hintArrowType <= 6) { + if (hintArrowType == 2) { + hintArrowSubX = 64; + hintArrowSubY = 64; + } + + if (hintArrowType == 3) { + hintArrowSubX = 0; + hintArrowSubY = 64; + } + + if (hintArrowType == 4) { + hintArrowSubX = 128; + hintArrowSubY = 64; + } - for (; var3.offset < var1.serverPacketLength; FriendsChat.itemContainerSetItem(var5, var7, var8 - 1, var9)) { - var7 = var3.readUShortSmart(); - var8 = var3.readUnsignedShort(); - var9 = 0; - if (var8 != 0) { - var9 = var3.readUnsignedByte(); - if (var9 == 255) { - var9 = var3.readInt(); - } + if (hintArrowType == 5) { + hintArrowSubX = 64; + hintArrowSubY = 0; } - if (var89 != null && var7 >= 0 && var7 < var89.itemIds.length) { - var89.itemIds[var7] = var8; - var89.field3054[var7] = var9; + if (hintArrowType == 6) { + hintArrowSubX = 64; + hintArrowSubY = 128; } + + hintArrowType = 2; + hintArrowX = var3.readUnsignedShort(); + hintArrowY = var3.readUnsignedShort(); + hintArrowHeight = var3.readUnsignedByte(); } - if (var89 != null) { - class218.invalidateWidget(var89); + if (hintArrowType == 10) { + hintArrowPlayerIndex = var3.readUnsignedShort(); } - class113.process(); - changedItemContainers[++changedItemContainersCount - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETOBJECT == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field404 = true; - var68 = var3.readShort(); - var5 = var3.readShort(); - var6 = UserComparator8.method674(var5 + class129.cameraPitch & 2027); - var7 = var68 + UserComparator10.cameraYaw; - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - field647 = new class478(class129.cameraPitch, var6, var8, var9); - field646 = new class478(UserComparator10.cameraYaw, var7, var8, var9); + if (ServerPacket.field2672 == var1.serverPacket) { + InvDefinition.friendSystem.readUpdate(var3, var1.serverPacketLength); + field511 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.NPC_INFO_LARGE == var1.serverPacket) { - var7 = var3.readUnsignedByteAdd(); - var6 = var3.readUnsignedIntIME(); - var5 = var3.readUnsignedShort(); - var68 = var3.readIntME(); - Player var36; - if (var68 == localPlayerIndex) { - var36 = VarbitComposition.localPlayer; - } else { - var36 = players[var68]; + if (ServerPacket.FRIENDLIST_LOADED == var1.serverPacket) { + var20 = var3.readUnsignedIntIME(); + var5 = var3.readIntME(); + Varps.Varps_temp[var5] = var20; + if (Varps.Varps_main[var5] != var20) { + Varps.Varps_main[var5] = var20; } - if (var36 != null) { - var36.updateSpotAnimation(var7, var5, var6 >> 16, var6 & 65535); - } + ScriptEvent.changeGameOptions(var5); + changedVarps[++changedVarpCount - 1 & 31] = var5; + var1.serverPacket = null; + return true; + } + if (ServerPacket.UPDATE_INV_PARTIAL == var1.serverPacket) { + class151.loadRegions(false, var1.packetBuffer); var1.serverPacket = null; return true; } - if (ServerPacket.ENTER_FREECAM == var1.serverPacket) { - for (var68 = 0; var68 < Varps.Varps_main.length; ++var68) { - if (Varps.Varps_main[var68] != Varps.Varps_temp[var68]) { - Varps.Varps_main[var68] = Varps.Varps_temp[var68]; - WorldMapDecoration.changeGameOptions(var68); - changedVarps[++changedVarpCount - 1 & 31] = var68; + if (ServerPacket.IF_SETSCROLLPOS == var1.serverPacket) { + Clock.field1484 = var3.readUnsignedByte(); + class354.field3144 = var3.readUnsignedByteNeg(); + + for (var20 = Clock.field1484; var20 < Clock.field1484 + 8; ++var20) { + for (var5 = class354.field3144; var5 < class354.field3144 + 8; ++var5) { + if (groundItems[class87.Client_plane][var20][var5] != null) { + groundItems[class87.Client_plane][var20][var5] = null; + class30.updateItemPile(var20, var5); + } + } + } + + for (PendingSpawn var51 = (PendingSpawn)pendingSpawns.last(); var51 != null; var51 = (PendingSpawn)pendingSpawns.previous()) { + if (var51.x >= Clock.field1484 && var51.x < Clock.field1484 + 8 && var51.y >= class354.field3144 && var51.y < class354.field3144 + 8 && var51.plane == class87.Client_plane) { + var51.endCycle = 0; } } @@ -5087,348 +5342,353 @@ final boolean method374(PacketWriter var1) { return true; } - if (ServerPacket.field2725 == var1.serverPacket) { - Interpreter.method421(var3.readStringCp1252NullTerminated()); + if (ServerPacket.MINIMAP_TOGGLE == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field401 = true; + var20 = var3.readShort(); + var5 = var3.readShort(); + var22 = class153.method800(var5 + class365.cameraPitch & 2027); + var7 = var20 + WallDecoration.cameraYaw; + var8 = var3.readUnsignedShort(); + var24 = var3.readUnsignedByte(); + field642 = new class493(class365.cameraPitch, var22, var8, var24); + field643 = new class493(WallDecoration.cameraYaw, var7, var8, var24); var1.serverPacket = null; return true; } - if (ServerPacket.AREA_SOUND == var1.serverPacket) { - var68 = var3.readIntIME(); - var5 = var3.readSignedShortAdd(); - var89 = class92.getWidget(var68); - if (var5 != var89.sequenceId || var5 == -1) { - var89.sequenceId = var5; - var89.modelFrame = 0; - var89.modelFrameCycle = 0; - class218.invalidateWidget(var89); - } - + if (ServerPacket.OPEN_URL == var1.serverPacket) { + Canvas.privateChatMode = UserComparator9.method679(var3.readUnsignedByte()); var1.serverPacket = null; return true; } - if (ServerPacket.TRIGGER_ONDIALOGABORT == var1.serverPacket) { - ObjectSound.field686 = var3.readUnsignedByte(); - class125.field1193 = var3.readUnsignedByteSub(); - - while (var3.offset < var1.serverPacketLength) { - var68 = var3.readUnsignedByte(); - ZoneOperation var70 = WorldMapSection0.method1506()[var68]; - World.processZoneOperation(var70); + if (ServerPacket.field2738 == var1.serverPacket) { + var87 = var3.readUnsignedShortAdd(); + var22 = var3.method2627(); + var20 = var22 >> 16; + var5 = var22 >> 8 & 255; + var7 = var20 + (var22 >> 4 & 7); + var8 = var5 + (var22 & 7); + var18 = var3.readUnsignedShortAddLE(); + var68 = var3.readUnsignedByteNeg() * 4; + var85 = var3.readByteNeg(); + var62 = var3.readByteAdd(); + var16 = var3.readUnsignedShortAdd(); + var15 = var3.readUnsignedShortAddLE(); + var60 = var3.method2583(); + var17 = var3.readUnsignedByteSub(); + var69 = var3.readUnsignedByteAdd() * 4; + var24 = var85 + var7; + var10 = var62 + var8; + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var24 >= 0 && var10 >= 0 && var24 < 104 && var10 < 104 && var87 != 65535) { + var7 = var7 * 128 + 64; + var8 = var8 * 128 + 64; + var24 = var24 * 128 + 64; + var10 = var10 * 128 + 64; + var19 = new Projectile(var87, class87.Client_plane, var7, var8, class115.getTileHeight(var7, var8, class87.Client_plane) - var68, var15 + cycle, var16 + cycle, var17, var18, var60, var69); + var19.setDestination(var24, var10, class115.getTileHeight(var24, var10, class87.Client_plane) - var69, var15 + cycle); + projectiles.addFirst(var19); } var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETSCROLLPOS == var1.serverPacket) { - var68 = var3.readUnsignedShortLE(); - var5 = var3.method2587(); - var7 = var3.method2587(); - var6 = var3.readIntME(); - PacketWriter.someMusicMethod(var68, var5, var6, var7); - var1.serverPacket = null; - return true; - } + String var41; + if (ServerPacket.OBJ_DEL_LEGACY == var1.serverPacket) { + var50 = var3.readStringCp1252NullTerminated(); + var25 = var3.readLong(); + var27 = (long)var3.readUnsignedShort(); + var29 = (long)var3.readMedium(); + PlayerType var40 = (PlayerType)SequenceDefinition.findEnumerated(class183.PlayerType_values(), var3.readUnsignedByte()); + var34 = (var27 << 32) + var29; + boolean var14 = false; - if (ServerPacket.MESSAGE_PRIVATE == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field402 = true; - Players.cameraMoveToX = var3.readUnsignedByte(); - class33.cameraMoveToY = var3.readUnsignedByte(); - var68 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte() * 128 + 64; - var6 = var3.readUnsignedByte() * 128 + 64; - var7 = var3.readUnsignedShort(); - field401 = var3.readBoolean(); - var8 = var3.readUnsignedByte(); - var9 = Players.cameraMoveToX * 128 + 64; - var10 = class33.cameraMoveToY * 128 + 64; - var11 = false; - var12 = false; - if (field401) { - var56 = class133.cameraY; - var59 = class18.getTileHeight(var9, var10, HealthBar.Client_plane) - var68; - } else { - var56 = class18.getTileHeight(NPCComposition.cameraX, class139.cameraZ, HealthBar.Client_plane) - class133.cameraY; - var59 = var68; + for (var15 = 0; var15 < 100; ++var15) { + if (var34 == crossWorldMessageIds[var15]) { + var14 = true; + break; + } } - field642 = new class476(NPCComposition.cameraX, class139.cameraZ, var56, var9, var10, var59, var5, var6, var7, var8); - var1.serverPacket = null; - return true; - } + if (var40.isUser && InvDefinition.friendSystem.isIgnored(new Username(var50, class166.loginType))) { + var14 = true; + } + + if (!var14 && field481 == 0) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var34; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var41 = AbstractFont.escapeBrackets(HealthBarUpdate.method523(class172.readString(var3))); + if (var40.modIcon != -1) { + class164.addChatMessage(9, class436.addImageTag(var40.modIcon) + var50, var41, class163.base37DecodeLong(var25)); + } else { + class164.addChatMessage(9, var50, var41, class163.base37DecodeLong(var25)); + } + } - if (ServerPacket.OPEN_URL == var1.serverPacket) { - class299.friendSystem.readUpdate(var3, var1.serverPacketLength); - field518 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.NPC_INFO_SMALL == var1.serverPacket) { - isCameraLocked = true; - field400 = false; + if (ServerPacket.MESSAGE_GAME == var1.serverPacket && isCameraLocked) { + field400 = true; + field401 = false; field402 = false; - Players.cameraMoveToX = var3.readUnsignedByte(); - class33.cameraMoveToY = var3.readUnsignedByte(); - VarpDefinition.cameraMoveToHeight = var3.readUnsignedShort(); - class344.cameraMoveToSpeed = var3.readUnsignedByte(); - MouseHandler.cameraMoveToAcceleration = var3.readUnsignedByte(); - if (MouseHandler.cameraMoveToAcceleration >= 100) { - NPCComposition.cameraX = Players.cameraMoveToX * 128 + 64; - class139.cameraZ = class33.cameraMoveToY * 128 + 64; - class133.cameraY = class18.getTileHeight(NPCComposition.cameraX, class139.cameraZ, HealthBar.Client_plane) - VarpDefinition.cameraMoveToHeight; + + for (var20 = 0; var20 < 5; ++var20) { + cameraShaking[var20] = false; } var1.serverPacket = null; return true; } - if (ServerPacket.OBJ_DEL_LEGACY == var1.serverPacket) { - var68 = var3.readIntIME(); - var5 = var3.readUnsignedShortLE(); - var6 = var5 >> 10 & 31; - var7 = var5 >> 5 & 31; - var8 = var5 & 31; - var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); - Widget var34 = class92.getWidget(var68); - if (var9 != var34.color) { - var34.color = var9; - class218.invalidateWidget(var34); + if (ServerPacket.LOC_ADD_CHANGE == var1.serverPacket) { + var20 = var3.method2623(); + var5 = var3.readUnsignedIntIME(); + var6 = class33.field89.method1740(var5); + if (var20 != var6.sequenceId || var20 == -1) { + var6.sequenceId = var20; + var6.modelFrame = 0; + var6.modelFrameCycle = 0; + ClanChannelMember.invalidateWidget(var6); } var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_GAME == var1.serverPacket) { - var51 = var3.readStringCp1252NullTerminated(); - var5 = var3.method2598(); - var89 = class92.getWidget(var5); - if (!var51.equals(var89.text)) { - var89.text = var51; - class218.invalidateWidget(var89); + if (ServerPacket.field2643 == var1.serverPacket) { + var74 = var3.readBoolean(); + if (var74) { + if (WallDecoration.field2303 == null) { + WallDecoration.field2303 = new class384(); + } + } else { + WallDecoration.field2303 = null; } var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_FRIENDCHANNEL == var1.serverPacket) { - var68 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var68 < -70000) { - var5 += 32768; - } - - if (var68 >= 0) { - var89 = class92.getWidget(var68); + if (ServerPacket.NPC_INFO_SMALL == var1.serverPacket) { + var72 = var3.readByte(); + var21 = var3.readStringCp1252NullTerminated(); + long var42 = (long)var3.readUnsignedShort(); + long var44 = (long)var3.readMedium(); + PlayerType var38 = (PlayerType)SequenceDefinition.findEnumerated(class183.PlayerType_values(), var3.readUnsignedByte()); + long var46 = (var42 << 32) + var44; + boolean var13 = false; + ClanChannel var39 = null; + var39 = var72 >= 0 ? currentClanChannels[var72] : ClanChannelMember.guestClanChannel; + if (var39 == null) { + var13 = true; } else { - var89 = null; - } - - if (var89 != null) { - for (var7 = 0; var7 < var89.itemIds.length; ++var7) { - var89.itemIds[var7] = 0; - var89.field3054[var7] = 0; - } - } + var15 = 0; - SoundCache.clearItemContainer(var5); - var7 = var3.readUnsignedShort(); + while (true) { + if (var15 >= 100) { + if (var38.isUser && InvDefinition.friendSystem.isIgnored(new Username(var21, class166.loginType))) { + var13 = true; + } + break; + } - for (var8 = 0; var8 < var7; ++var8) { - var9 = var3.readUnsignedShort(); - var10 = var3.readUnsignedByteSub(); - if (var10 == 255) { - var10 = var3.method2598(); - } + if (crossWorldMessageIds[var15] == var46) { + var13 = true; + break; + } - if (var89 != null && var8 < var89.itemIds.length) { - var89.itemIds[var8] = var9; - var89.field3054[var8] = var10; + ++var15; } - - FriendsChat.itemContainerSetItem(var5, var8, var9 - 1, var10); } - if (var89 != null) { - class218.invalidateWidget(var89); + if (!var13) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var46; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var41 = AbstractFont.escapeBrackets(class172.readString(var3)); + var16 = var72 >= 0 ? 41 : 44; + if (var38.modIcon != -1) { + class164.addChatMessage(var16, class436.addImageTag(var38.modIcon) + var21, var41, var39.name); + } else { + class164.addChatMessage(var16, var21, var41, var39.name); + } } - class113.process(); - changedItemContainers[++changedItemContainersCount - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_CLANCHANNEL == var1.serverPacket) { - var68 = var3.readIntME(); - var5 = var3.method2598(); - Varps.Varps_temp[var68] = var5; - if (Varps.Varps_main[var68] != var5) { - Varps.Varps_main[var68] = var5; + if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field402 = true; + class191.cameraMoveToX = var3.readUnsignedByte(); + MouseHandler.cameraMoveToY = var3.readUnsignedByte(); + var20 = var3.readUnsignedShort(); + var5 = var3.readUnsignedShort(); + field403 = var3.readBoolean(); + var22 = var3.readUnsignedByte(); + var7 = class191.cameraMoveToX * 128 + 64; + var8 = MouseHandler.cameraMoveToY * 128 + 64; + boolean var81 = false; + boolean var57 = false; + if (field403) { + var24 = class17.cameraY; + var10 = class115.getTileHeight(var7, var8, class87.Client_plane) - var20; + } else { + var24 = class115.getTileHeight(cameraX, WorldMapArea.cameraZ, class87.Client_plane) - class17.cameraY; + var10 = var20; } - WorldMapDecoration.changeGameOptions(var68); - changedVarps[++changedVarpCount - 1 & 31] = var68; + field646 = new class492(cameraX, WorldMapArea.cameraZ, var24, var7, var8, var10, var5, var22); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_IGNORELIST == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.field2607); - var1.serverPacket = null; - return true; - } + if (ServerPacket.UPDATE_ZONE_FULL_FOLLOWS == var1.serverPacket) { + for (var20 = 0; var20 < Varps.Varps_main.length; ++var20) { + if (Varps.Varps_temp[var20] != Varps.Varps_main[var20]) { + Varps.Varps_main[var20] = Varps.Varps_temp[var20]; + ScriptEvent.changeGameOptions(var20); + changedVarps[++changedVarpCount - 1 & 31] = var20; + } + } - if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.MAP_ANIM); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_ZONE_FULL_FOLLOWS == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.OBJ_ADD); + if (ServerPacket.MAP_ANIM == var1.serverPacket) { + var20 = var3.readUnsignedByte(); + class7.forceDisconnect(var20); var1.serverPacket = null; - return true; + return false; } - if (ServerPacket.EMPTY_PACKET == var1.serverPacket) { - var68 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var68] = new GrandExchangeOffer(); - var3.offset += 18; + if (ServerPacket.TRIGGER_ONDIALOGABORT == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field402 = true; + class191.cameraMoveToX = var3.readUnsignedByte(); + MouseHandler.cameraMoveToY = var3.readUnsignedByte(); + var20 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte() * 128 + 64; + var22 = var3.readUnsignedByte() * 128 + 64; + var7 = var3.readUnsignedShort(); + field403 = var3.readBoolean(); + var8 = var3.readUnsignedByte(); + var24 = class191.cameraMoveToX * 128 + 64; + var10 = MouseHandler.cameraMoveToY * 128 + 64; + var11 = false; + var32 = false; + if (field403) { + var60 = class17.cameraY; + var87 = class115.getTileHeight(var24, var10, class87.Client_plane) - var20; } else { - --var3.offset; - grandExchangeOffers[var68] = new GrandExchangeOffer(var3, false); + var60 = class115.getTileHeight(cameraX, WorldMapArea.cameraZ, class87.Client_plane) - class17.cameraY; + var87 = var20; } - field529 = cycleCntr; + field646 = new class491(cameraX, WorldMapArea.cameraZ, var60, var24, var10, var87, var5, var22, var7, var8); var1.serverPacket = null; return true; } - if (ServerPacket.OBJ_DEL == var1.serverPacket && isCameraLocked) { - field400 = true; - field404 = false; - field402 = false; + if (ServerPacket.SEND_PING == var1.serverPacket) { + CollisionMap.method1166(); + var1.serverPacket = null; + return false; + } - for (var68 = 0; var68 < 5; ++var68) { - cameraShaking[var68] = false; + if (ServerPacket.IF_SETHIDE == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field402 = false; + class191.cameraMoveToX = var3.readUnsignedByte(); + MouseHandler.cameraMoveToY = var3.readUnsignedByte(); + SoundSystem.cameraMoveToHeight = var3.readUnsignedShort(); + SecureRandomCallable.cameraMoveToSpeed = var3.readUnsignedByte(); + class131.cameraMoveToAcceleration = var3.readUnsignedByte(); + if (class131.cameraMoveToAcceleration >= 100) { + cameraX = class191.cameraMoveToX * 128 + 64; + WorldMapArea.cameraZ = MouseHandler.cameraMoveToY * 128 + 64; + class17.cameraY = class115.getTileHeight(cameraX, WorldMapArea.cameraZ, class87.Client_plane) - SoundSystem.cameraMoveToHeight; } var1.serverPacket = null; return true; } - if (ServerPacket.IF_MOVESUB == var1.serverPacket) { - ObjectSound.field686 = var3.readUnsignedByteNeg(); - class125.field1193 = var3.readUnsignedByteSub(); - - for (var68 = ObjectSound.field686; var68 < ObjectSound.field686 + 8; ++var68) { - for (var5 = class125.field1193; var5 < class125.field1193 + 8; ++var5) { - if (groundItems[HealthBar.Client_plane][var68][var5] != null) { - groundItems[HealthBar.Client_plane][var68][var5] = null; - class135.updateItemPile(var68, var5); - } - } - } - - for (PendingSpawn var50 = (PendingSpawn)pendingSpawns.last(); var50 != null; var50 = (PendingSpawn)pendingSpawns.previous()) { - if (var50.x >= ObjectSound.field686 && var50.x < ObjectSound.field686 + 8 && var50.y >= class125.field1193 && var50.y < class125.field1193 + 8 && var50.plane == HealthBar.Client_plane) { - var50.endCycle = 0; - } - } - + if (ServerPacket.CAM_LOOKAT_EASED_COORD == var1.serverPacket) { + var50 = var3.readStringCp1252NullTerminated(); + var21 = AbstractFont.escapeBrackets(HealthBarUpdate.method523(class172.readString(var3))); + class411.addGameMessage(6, var50, var21); var1.serverPacket = null; return true; } - if (ServerPacket.LOC_ADD_CHANGE == var1.serverPacket) { - return this.method372(var1, 2); + if (ServerPacket.EMPTY_PACKET == var1.serverPacket) { + World.method398(var3.readStringCp1252NullTerminated()); + var1.serverPacket = null; + return true; } - if (ServerPacket.CAM_LOOKAT_EASED_COORD == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { - destinationY = 0; + if (ServerPacket.field2715 == var1.serverPacket) { + var20 = var3.readUnsignedShort(); + var5 = var3.readUnsignedIntLE(); + var22 = var3.readUnsignedShort(); + var7 = var3.readUnsignedShortAddLE(); + var33 = class33.field89.method1740(var5); + if (var20 != var33.modelAngleX || var7 != var33.modelAngleY || var22 != var33.modelZoom) { + var33.modelAngleX = var20; + var33.modelAngleY = var7; + var33.modelZoom = var22; + ClanChannelMember.invalidateWidget(var33); } var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM == var1.serverPacket) { - field517 = cycleCntr; - var20 = var3.readByte(); - class160 var69 = new class160(var3); - ClanChannel var35; - if (var20 >= 0) { - var35 = currentClanChannels[var20]; - } else { - var35 = VerticalAlignment.guestClanChannel; - } - - if (var35 == null) { - this.method383(var20); - var1.serverPacket = null; - return true; - } - - if (var69.field1415 > var35.field1429) { - this.method383(var20); - var1.serverPacket = null; - return true; - } - - if (var69.field1415 < var35.field1429) { - var1.serverPacket = null; - return true; - } - - var69.method844(var35); + if (ServerPacket.field2736 == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.field2617); var1.serverPacket = null; return true; } - if (ServerPacket.field2730 == var1.serverPacket) { - World.processZoneOperation(ZoneOperation.OBJ_DEL); + if (ServerPacket.MAPPROJ_ANIM == var1.serverPacket) { + UrlRequest.processZoneOperation(ZoneOperation.LOC_ADD_CHANGE); var1.serverPacket = null; return true; } - Messages.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -908169793 * 1400406591 : -1) + "," + (var1.field1157 != null ? var1.field1157.id * -908169793 * 1400406591 : -1) + "," + (var1.field1158 != null ? var1.field1158.id * -908169793 * 1400406591 : -1) + "," + var1.serverPacketLength, (Throwable)null); - ArchiveDisk.logOut(); + class190.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1495788863 * -800816449 : -1) + "," + (var1.field1154 != null ? var1.field1154.id * 1495788863 * -800816449 : -1) + "," + (var1.field1156 != null ? var1.field1156.id * 1495788863 * -800816449 : -1) + "," + var1.serverPacketLength, (Throwable)null); + CollisionMap.method1166(); } catch (IOException var48) { - Renderable.method1291(); + class148.method781(); } catch (Exception var49) { - var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -908169793 * 1400406591 : -1) + "," + (var1.field1157 != null ? var1.field1157.id * -908169793 * 1400406591 : -1) + "," + (var1.field1158 != null ? var1.field1158.id * -908169793 * 1400406591 : -1) + "," + var1.serverPacketLength + "," + (VarbitComposition.localPlayer.pathX[0] + UrlRequester.baseX) + "," + (VarbitComposition.localPlayer.pathY[0] + class47.baseY) + ","; + var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1495788863 * -800816449 : -1) + "," + (var1.field1154 != null ? var1.field1154.id * 1495788863 * -800816449 : -1) + "," + (var1.field1156 != null ? var1.field1156.id * 1495788863 * -800816449 : -1) + "," + var1.serverPacketLength + "," + (TextureProvider.localPlayer.pathX[0] + class20.baseX) + "," + (TextureProvider.localPlayer.pathY[0] + class19.baseY) + ","; - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { - var21 = var21 + var3.array[var6] + ","; + for (var22 = 0; var22 < var1.serverPacketLength && var22 < 50; ++var22) { + var21 = var21 + var3.array[var22] + ","; } - Messages.RunException_sendStackTrace(var21, var49); - ArchiveDisk.logOut(); + class190.RunException_sendStackTrace(var21, var49); + CollisionMap.method1166(); } return true; } } - @ObfuscatedName("lx") + @ObfuscatedName("kt") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-90" + garbageValue = "33" ) @Export("menu") final void menu() { @@ -5471,91 +5731,51 @@ final void menu() { } if (clickedWidget == null) { - int var19 = MouseHandler.MouseHandler_lastButton; - int var7; - int var8; - int var16; - int var20; + int var12 = MouseHandler.MouseHandler_lastButton; if (isMenuOpen) { - int var15; - if (var19 != 1 && (ObjTypeCustomisation.mouseCam || var19 != 4)) { + int var10; + if (var12 != 1 && (UserComparator8.mouseCam || var12 != 4)) { var2 = MouseHandler.MouseHandler_x; - var15 = MouseHandler.MouseHandler_y; - if (var2 < class12.menuX - 10 || var2 > class12.menuX + class316.menuWidth + 10 || var15 < class419.menuY - 10 || var15 > class419.menuY + Occluder.menuHeight + 10) { + var10 = MouseHandler.MouseHandler_y; + if (var2 < class28.menuX - 10 || var2 > class341.menuWidth + class28.menuX + 10 || var10 < class463.menuY - 10 || var10 > class463.menuY + Language.menuHeight + 10) { isMenuOpen = false; - var16 = class12.menuX; - var5 = class419.menuY; - var20 = class316.menuWidth; - var7 = Occluder.menuHeight; - - for (var8 = 0; var8 < rootWidgetCount; ++var8) { - if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var16 && rootWidgetXs[var8] < var16 + var20 && rootWidgetYs[var8] + rootWidgetHeights[var8] > var5 && rootWidgetYs[var8] < var5 + var7) { - field407[var8] = true; - } - } + class19.method69(class28.menuX, class463.menuY, class341.menuWidth, Language.menuHeight); } } - if (var19 == 1 || !ObjTypeCustomisation.mouseCam && var19 == 4) { - var2 = class12.menuX; - var15 = class419.menuY; - var16 = class316.menuWidth; + if (var12 == 1 || !UserComparator8.mouseCam && var12 == 4) { + var2 = class28.menuX; + var10 = class463.menuY; + int var11 = class341.menuWidth; var5 = MouseHandler.MouseHandler_lastPressedX; - var20 = MouseHandler.MouseHandler_lastPressedY; - var7 = -1; + int var13 = MouseHandler.MouseHandler_lastPressedY; + int var7 = -1; - int var9; - for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var9 = (menuOptionsCount - 1 - var8) * 15 + var15 + 31; - if (var5 > var2 && var5 < var16 + var2 && var20 > var9 - 13 && var20 < var9 + 3) { + for (int var8 = 0; var8 < menuOptionsCount; ++var8) { + int var9 = var10 + (menuOptionsCount - 1 - var8) * 15 + 31; + if (var5 > var2 && var5 < var2 + var11 && var13 > var9 - 13 && var13 < var9 + 3) { var7 = var8; } } - int var10; - int var11; - int var12; - if (var7 != -1 && var7 >= 0) { - var8 = menuArguments1[var7]; - var9 = menuArguments2[var7]; - var10 = menuOpcodes[var7]; - var11 = menuIdentifiers[var7]; - var12 = menuItemIds[var7]; - String var13 = menuActions[var7]; - String var14 = menuTargets[var7]; - IgnoreList.menuAction(var8, var9, var10, var11, var12, var13, var14, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + if (var7 != -1) { + AddRequestTask.method2156(var7); } isMenuOpen = false; - var8 = class12.menuX; - var9 = class419.menuY; - var10 = class316.menuWidth; - var11 = Occluder.menuHeight; - - for (var12 = 0; var12 < rootWidgetCount; ++var12) { - if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var8 + var10 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { - field407[var12] = true; - } - } + class19.method69(class28.menuX, class463.menuY, class341.menuWidth, Language.menuHeight); } } else { - var2 = menuOptionsCount - 1; - if ((var19 == 1 || !ObjTypeCustomisation.mouseCam && var19 == 4) && this.shouldLeftClickOpenMenu()) { - var19 = 2; + var2 = AttackOption.method609(); + if ((var12 == 1 || !UserComparator8.mouseCam && var12 == 4) && this.shouldLeftClickOpenMenu()) { + var12 = 2; } - if ((var19 == 1 || !ObjTypeCustomisation.mouseCam && var19 == 4) && menuOptionsCount > 0 && var2 >= 0) { - var16 = menuArguments1[var2]; - var5 = menuArguments2[var2]; - var20 = menuOpcodes[var2]; - var7 = menuIdentifiers[var2]; - var8 = menuItemIds[var2]; - String var17 = menuActions[var2]; - String var18 = menuTargets[var2]; - IgnoreList.menuAction(var16, var5, var20, var7, var8, var17, var18, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + if ((var12 == 1 || !UserComparator8.mouseCam && var12 == 4) && menuOptionsCount > 0) { + AddRequestTask.method2156(var2); } - if (var19 == 2 && menuOptionsCount > 0) { + if (var12 == 2 && menuOptionsCount > 0) { this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } } @@ -5563,109 +5783,106 @@ final void menu() { } } - @ObfuscatedName("le") + @ObfuscatedName("kc") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-84" + descriptor = "(S)Z", + garbageValue = "29401" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = menuOptionsCount - 1; - return (leftClickOpensMenu && menuOptionsCount > 2 || class53.method298(var1)) && !menuShiftClick[var1]; + int var1 = AttackOption.method609(); + return (leftClickOpensMenu && menuOptionsCount > 2 || WallDecoration.method1425(var1)) && !menuShiftClick[var1]; } - @ObfuscatedName("lu") + @ObfuscatedName("kd") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1301595463" + descriptor = "(IIS)V", + garbageValue = "-2675" ) @Export("openMenu") final void openMenu(int var1, int var2) { - class342.method1867(var1, var2); + class481.method2390(var1, var2); var1 -= viewportOffsetX; var2 -= viewportOffsetY; - class130.scene.menuOpen(HealthBar.Client_plane, var1, var2, false); + class10.scene.menuOpen(class87.Client_plane, var1, var2, false); isMenuOpen = true; } - @ObfuscatedName("li") + @ObfuscatedName("lg") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "571828087" + garbageValue = "-758466559" ) - @Export("resizeRoot") - final void resizeRoot(boolean var1) { + final void method382(boolean var1) { int var2 = rootInterface; - int var3 = class113.canvasWidth; - int var4 = class177.canvasHeight; - if (ModeWhere.loadInterface(var2)) { - PcmPlayer.resizeInterface(PacketBufferNode.Widget_interfaceComponents[var2], -1, var3, var4, var1); + int var3 = class340.canvasWidth; + int var4 = class491.canvasHeight; + if (class33.field89.method1742(var2)) { + class360.resizeInterface(class33.field89.Widget_interfaceComponents[var2], -1, var3, var4, var1); } } - @ObfuscatedName("ll") + @ObfuscatedName("ln") @ObfuscatedSignature( - descriptor = "(Lmi;I)V", - garbageValue = "649704501" + descriptor = "(Lnm;B)V", + garbageValue = "0" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : class92.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : class33.field89.method1740(var1.parentId); int var3; int var4; if (var2 == null) { - var3 = class113.canvasWidth; - var4 = class177.canvasHeight; + var3 = class340.canvasWidth; + var4 = class491.canvasHeight; } else { var3 = var2.width; var4 = var2.height; } - class369.alignWidgetSize(var1, var3, var4, false); - WorldMapArea.alignWidgetPosition(var1, var3, var4); + class140.alignWidgetSize(var1, var3, var4, false); + Username.alignWidgetPosition(var1, var3, var4); } - @ObfuscatedName("mb") + @ObfuscatedName("mn") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-332488970" + garbageValue = "-2017777407" ) - final void method380() { - class218.invalidateWidget(clickedWidget); - ++class159.widgetDragDuration; - int var1; - int var2; - if (field397 && field395) { - var1 = MouseHandler.MouseHandler_x; - var2 = MouseHandler.MouseHandler_y; + final void method384() { + ClanChannelMember.invalidateWidget(clickedWidget); + ++FriendsChat.widgetDragDuration; + if (field394 && field396) { + int var1 = MouseHandler.MouseHandler_x; + int var2 = MouseHandler.MouseHandler_y; var1 -= widgetClickX; var2 -= widgetClickY; - if (var1 < field514) { - var1 = field514; + if (var1 < field516) { + var1 = field516; } - if (var1 + clickedWidget.width > field514 + clickedWidgetParent.width) { - var1 = field514 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field516 + clickedWidgetParent.width) { + var1 = field516 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field513) { - var2 = field513; + if (var2 < field514) { + var2 = field514; } - if (var2 + clickedWidget.height > field513 + clickedWidgetParent.height) { - var2 = field513 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field514 + clickedWidgetParent.height) { + var2 = field514 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field515; - int var4 = var2 - field521; + int var3 = var1 - field521; + int var4 = var2 - field517; int var5 = clickedWidget.dragZoneSize; - if (class159.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + if (FriendsChat.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { isDraggingWidget = true; } - int var6 = var1 - field514 + clickedWidgetParent.scrollX; - int var7 = var2 - field513 + clickedWidgetParent.scrollY; + int var6 = var1 - field516 + clickedWidgetParent.scrollX; + int var7 = var2 - field514 + clickedWidgetParent.scrollY; ScriptEvent var8; if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); @@ -5673,7 +5890,7 @@ final void method380() { var8.mouseX = var6; var8.mouseY = var7; var8.args = clickedWidget.onDrag; - WorldMapSection1.runScriptEvent(var8); + Interpreter.runScriptEvent(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -5685,39 +5902,32 @@ final void method380() { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args = clickedWidget.onDragComplete; - WorldMapSection1.runScriptEvent(var8); + Interpreter.runScriptEvent(var8); } - if (draggedOnWidget != null && BuddyRankComparator.method691(clickedWidget) != null) { - PacketBufferNode var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTOND, packetWriter.isaacCipher); - var10.packetBuffer.writeIntIME_(clickedWidget.id); - var10.packetBuffer.writeIntLE(draggedOnWidget.id); - var10.packetBuffer.writeShort(clickedWidget.childIndex); - var10.packetBuffer.writeShort(draggedOnWidget.itemId); - var10.packetBuffer.writeShortAdd(draggedOnWidget.childIndex); - var10.packetBuffer.writeShortAdd(clickedWidget.itemId); - packetWriter.addNode(var10); + if (draggedOnWidget != null && class212.method1045(clickedWidget) != null) { + PacketBufferNode var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPHELDD, packetWriter.isaacCipher); + var9.packetBuffer.writeIntLE(clickedWidget.id); + var9.packetBuffer.writeShort(draggedOnWidget.childIndex); + var9.packetBuffer.writeShort(clickedWidget.childIndex); + var9.packetBuffer.writeInt(draggedOnWidget.id); + var9.packetBuffer.writeShortAddLE(clickedWidget.itemId); + var9.packetBuffer.writeShort(draggedOnWidget.itemId); + packetWriter.addNode(var9); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field515 + widgetClickX, field521 + widgetClickY); + this.openMenu(field521 + widgetClickX, field517 + widgetClickY); } else if (menuOptionsCount > 0) { - method381(widgetClickX + field515, widgetClickY + field521); + VarbitComposition.method1049(widgetClickX + field521, widgetClickY + field517); } clickedWidget = null; } } else { - if (class159.widgetDragDuration > 1) { + if (FriendsChat.widgetDragDuration > 1) { if (!isDraggingWidget && menuOptionsCount > 0) { - var1 = widgetClickX + field515; - var2 = widgetClickY + field521; - MenuAction var9 = class9.tempMenuAction; - if (var9 != null) { - IgnoreList.menuAction(var9.param0, var9.param1, var9.opcode, var9.identifier, var9.itemId, var9.action, var9.target, var1, var2); - } - - class9.tempMenuAction = null; + VarbitComposition.method1049(field521 + widgetClickX, field517 + widgetClickY); } clickedWidget = null; @@ -5726,38 +5936,38 @@ final void method380() { } } - @ObfuscatedName("ok") + @ObfuscatedName("ou") @ObfuscatedSignature( - descriptor = "(S)Luc;", - garbageValue = "-775" + descriptor = "(I)Lvf;", + garbageValue = "-1440888763" ) @Export("username") public Username username() { - return VarbitComposition.localPlayer != null ? VarbitComposition.localPlayer.username : null; + return TextureProvider.localPlayer != null ? TextureProvider.localPlayer.username : null; } - @ObfuscatedName("of") + @ObfuscatedName("on") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "516" + descriptor = "(IB)V", + garbageValue = "95" ) - void method383(int var1) { + void method386(int var1) { if (param25 >= 216) { - PacketBufferNode var2 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2582, packetWriter.isaacCipher); + PacketBufferNode var2 = ClanChannelMember.getPacketBufferNode(ClientPacket.f3, packetWriter.isaacCipher); var2.packetBuffer.writeByte(var1); packetWriter.addNode(var2); } } - @ObfuscatedName("ps") + @ObfuscatedName("ot") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1345860990" + garbageValue = "-859215777" ) - void method384(int var1) { + void method387(int var1) { if (param25 >= 216) { - PacketBufferNode var2 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2572, packetWriter.isaacCipher); + PacketBufferNode var2 = ClanChannelMember.getPacketBufferNode(ClientPacket.f50, packetWriter.isaacCipher); var2.packetBuffer.writeByte(var1); packetWriter.addNode(var2); } @@ -5789,49 +5999,28 @@ public final void init() { worldProperties = Integer.parseInt(var2); break; case 6: - ClanChannelMember.clientLanguage = Language.method1976(Integer.parseInt(var2)); + WorldMapLabelSize.clientLanguage = Language.method2007(Integer.parseInt(var2)); break; case 7: - int var4 = Integer.parseInt(var2); - GameBuild[] var5 = UrlRequest.method664(); - int var6 = 0; - - GameBuild var13; - while (true) { - if (var6 >= var5.length) { - var13 = null; - break; - } - - GameBuild var7 = var5[var6]; - if (var4 == var7.buildId) { - var13 = var7; - break; - } - - ++var6; - } - - WorldMapLabelSize.field2323 = var13; + SoundSystem.field211 = class432.method2191(Integer.parseInt(var2)); break; case 8: if (var2.equalsIgnoreCase("true")) { } break; case 9: - MusicPatchPcmStream.param9 = var2; + HealthBarDefinition.param9 = var2; break; case 10: - StudioGame[] var3 = new StudioGame[]{StudioGame.stellardawn, StudioGame.game5, StudioGame.game4, StudioGame.runescape, StudioGame.game3, StudioGame.oldscape}; - WorldMapSectionType.field2417 = (StudioGame)KeyHandler.findEnumerated(var3, Integer.parseInt(var2)); - if (StudioGame.oldscape == WorldMapSectionType.field2417) { - Language.loginType = LoginType.oldscape; + UrlRequester.field1163 = (StudioGame)SequenceDefinition.findEnumerated(Calendar.method1889(), Integer.parseInt(var2)); + if (UrlRequester.field1163 == StudioGame.oldscape) { + class166.loginType = LoginType.oldscape; } else { - Language.loginType = LoginType.field4066; + class166.loginType = LoginType.field4098; } break; case 11: - class510.field4133 = var2; + class59.field308 = var2; break; case 12: worldId = Integer.parseInt(var2); @@ -5840,120 +6029,109 @@ public final void init() { case 18: case 19: case 20: - case 22: case 23: case 24: default: break; case 14: - WorldMapSectionType.field2416 = Integer.parseInt(var2); + WorldMapIcon_1.field2337 = Integer.parseInt(var2); break; case 15: gameBuild = Integer.parseInt(var2); break; case 17: - class200.field1669 = var2; + class59.field307 = var2; break; case 21: param21 = Integer.parseInt(var2); break; + case 22: + Actor.field959 = var2; + break; case 25: - int var8 = var2.indexOf("."); - if (var8 == -1) { + int var3 = var2.indexOf("."); + if (var3 == -1) { param25 = Integer.parseInt(var2); } else { - param25 = Integer.parseInt(var2.substring(0, var8)); - Integer.parseInt(var2.substring(var8 + 1)); + param25 = Integer.parseInt(var2.substring(0, var3)); + Integer.parseInt(var2.substring(var3 + 1)); } } } } - Scene.Scene_isLowDetail = false; - isLowDetail = false; - class292.worldHost = this.getCodeBase().getHost(); - class308.field2819 = new JagNetThread(); - String var9 = WorldMapLabelSize.field2323.name; - byte var10 = 0; - if ((worldProperties & class510.field4125.rsOrdinal()) != 0) { - class30.field83 = "beta"; + AddRequestTask.method2155(); + MouseHandler.worldHost = this.getCodeBase().getHost(); + class59.field309 = new JagNetThread(); + String var4 = SoundSystem.field211.name; + byte var5 = 0; + if ((worldProperties & class525.field4156.rsOrdinal()) != 0) { + UserComparator3.field1184 = "beta"; } try { - SecureRandomCallable.method462("oldschool", class30.field83, var9, var10, 22); - } catch (Exception var11) { - Messages.RunException_sendStackTrace((String)null, var11); + class139.method735("oldschool", UserComparator3.field1184, var4, var5, 23); + } catch (Exception var7) { + class190.RunException_sendStackTrace((String)null, var7); } - class219.client = this; - RuneLiteMenuEntry.client = (RSClient) (Object) this; - RunException.field4285 = clientType; - class18.method58(); + class159.client = this; + class189.field1493 = clientType; + class223.method1129(); if (Boolean.parseBoolean(System.getProperty("jagex.disableBouncyCastle"))) { - this.field661 = true; + this.field660 = true; } - if (field424 == -1) { - if (!this.method352() && !this.method353()) { - field424 = 0; + if (field427 == -1) { + if (!this.method357() && !this.method358()) { + field427 = 0; } else { - field424 = 5; + field427 = 5; } } - this.startThread(765, 503, 216, 1); + this.startThread(765, 503, 217, 1); } - } catch (RuntimeException var12) { - throw SecureRandomFuture.method438(var12, "client.init(" + ')'); + } catch (RuntimeException var8) { + throw GrandExchangeOfferTotalQuantityComparator.method1973(var8, "client.init(" + ')'); } } @Export("finalize") @ObfuscatedName("finalize") protected void finalize() throws Throwable { - HorizontalAlignment.method975(this); + class319.field2792.remove(this); super.finalize(); } - @ObfuscatedName("ax") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "24" + descriptor = "(II)Lhg;", + garbageValue = "-1459620271" ) - static final int method357(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - + public static VarcInt method353(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); + if (var1 != null) { return var1; } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; + byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); + var1 = new VarcInt(); + if (var2 != null) { + var1.method972(new Buffer(var2)); } - return (var0 & 65408) + var1; + VarcInt.VarcInt_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("mm") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "18" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1915022124" ) - static void method381(int var0, int var1) { - MenuAction var2 = class9.tempMenuAction; - if (var2 != null) { - IgnoreList.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.itemId, var2.action, var2.target, var0, var1); - } - - class9.tempMenuAction = null; + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; } } \ No newline at end of file diff --git a/osrs/src/main/java/ClientPacket.java b/osrs/src/main/java/ClientPacket.java index 6bb6d1198..2d45b3654 100644 --- a/osrs/src/main/java/ClientPacket.java +++ b/osrs/src/main/java/ClientPacket.java @@ -3,679 +3,678 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("ln") @Implements("ClientPacket") -public class ClientPacket implements class293 { - @ObfuscatedName("au") +public class ClientPacket implements class307 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - static final ClientPacket field2592; - @ObfuscatedName("ae") + public static final ClientPacket EVENT_MOUSE_IDLE; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("IF_BUTTON8") - public static final ClientPacket IF_BUTTON8; - @ObfuscatedName("ao") + static final ClientPacket f1; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("RESUME_P_NAMEDIALOG") - public static final ClientPacket RESUME_P_NAMEDIALOG; - @ObfuscatedName("at") + @Export("FRIEND_SETRANK") + public static final ClientPacket f2; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("NATIVE_PACKET3") - public static final ClientPacket OPLOC2; - @ObfuscatedName("ac") + public static final ClientPacket f3; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("IGNORELIST_ADD") - public static final ClientPacket IGNORELIST_ADD; - @ObfuscatedName("ai") + public static final ClientPacket OPOBJE; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("IF_BUTTON4") - public static final ClientPacket IF_BUTTON4; - @ObfuscatedName("az") + @Export("OPPLAYERU") + public static final ClientPacket OPNPCT; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("IF_BUTTON6") - public static final ClientPacket IF_BUTTON6; - @ObfuscatedName("ap") + public static final ClientPacket f5; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("CLICKWORLDMAP") - public static final ClientPacket CLICKWORLDMAP; - @ObfuscatedName("aa") + @Export("UPDATE_APPEARANCE") + public static final ClientPacket f9; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("CLOSE_MODAL") - public static final ClientPacket CLOSE_MODAL; - @ObfuscatedName("af") + @Export("AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL") + public static final ClientPacket f10; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPOBJ2") - static final ClientPacket OPOBJ2_; - @ObfuscatedName("ad") + @Export("OPOBJ2_") + public static final ClientPacket f11; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPPLAYER1") - public static final ClientPacket OPPLAYER1; - @ObfuscatedName("aq") + public static final ClientPacket PING_STATS; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("CLIENT_CHEAT") - public static final ClientPacket CLIENT_CHEAT; - @ObfuscatedName("al") + public static final ClientPacket OPNPC2; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPLOC6") - public static final ClientPacket OPLOC6; - @ObfuscatedName("an") + @Export("REFLECTION_CHECK_REPLY") + public static final ClientPacket REFLECTION_CHECK_REPLY; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPPLAYER5; - @ObfuscatedName("ar") + @Export("FRIENDLIST_DEL") + public static final ClientPacket FRIEND_DELETE_USER; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket IF_BUTTONT; - @ObfuscatedName("ab") + @Export("IF_BUTTONT") + static final ClientPacket f6; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("LOGIN_STATISTICS") - public static final ClientPacket LOGIN_STATISTICS; - @ObfuscatedName("ag") + @Export("CLICKWORLDMAP") + public static final ClientPacket f16; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("IF_BUTTON2") - public static final ClientPacket IF_BUTTON2; - @ObfuscatedName("am") + public static final ClientPacket f17; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("MAP_BUILD_COMPLETE") - public static final ClientPacket MAP_BUILD_COMPLETE; - @ObfuscatedName("ax") + static final ClientPacket f18; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPLOCT; - @ObfuscatedName("ah") + @Export("OPLOCT") + public static final ClientPacket OPLOCE; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("FRIENDLIST_ADD") - public static final ClientPacket FRIENDLIST_ADD; - @ObfuscatedName("as") + public static final ClientPacket IF_BUTTON5; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPPLAYER7") - public static final ClientPacket OPPLAYER7; - @ObfuscatedName("ay") + public static final ClientPacket field2534; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL") - public static final ClientPacket AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL; - @ObfuscatedName("aj") + @Export("TELEPORT") + public static final ClientPacket f20; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("BUG_REPORT") - public static final ClientPacket BUG_REPORT; - @ObfuscatedName("av") + @Export("EVENT_CAMERA_POSITION") + public static final ClientPacket EVENT_CAMERA_FOCUS; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("EVENT_CAMERA_POSITION") - public static final ClientPacket EVENT_CAMERA_POSITION; - @ObfuscatedName("aw") + @Export("CLAN_JOINCHAT_LEAVECHAT") + public static final ClientPacket f22; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("IDLE_LOGOUT") - public static final ClientPacket IDLE_LOGOUT; - @ObfuscatedName("ak") + public static final ClientPacket OPLOC5; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("OPNPC6") - public static final ClientPacket OPNPC6; - @ObfuscatedName("bh") + public static final ClientPacket IF_BUTTONT; + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("IF_BUTTON1") - public static final ClientPacket IF_BUTTON1; - @ObfuscatedName("bj") + public static final ClientPacket OPPLAYER3; + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("TELEPORT") - public static final ClientPacket TELEPORT; - @ObfuscatedName("bk") + public static final ClientPacket IF_BUTTON9; + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPOBJ1; - @ObfuscatedName("bv") + @Export("OPOBJ1") + public static final ClientPacket IF_BUTTON3; + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("EVENT_KEYBOARD") - public static final ClientPacket EVENT_KEYBOARD; - @ObfuscatedName("bt") + @Export("OPOBJ1") + public static final ClientPacket OPOBJ1; + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPNPC5") - static final ClientPacket OPNPC5_; - @ObfuscatedName("bd") + @Export("NO_TIMEOUT") + public static final ClientPacket NO_TIMEOUT; + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPNPC1") - public static final ClientPacket OPPLAYER2; - @ObfuscatedName("by") + @Export("OPPLAYER2") + public static final ClientPacket OPPLAYER8; + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("IF_BUTTON10") - public static final ClientPacket IF_BUTTON10; - @ObfuscatedName("bs") + @Export("RESUME_PAUSEBUTTON") + public static final ClientPacket RESUME_PAUSEBUTTON; + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("SEND_PING_REPLY") - public static final ClientPacket EVENT_MOUSE_CLICK; - @ObfuscatedName("bm") + @Export("EXIT_FREECAM") + public static final ClientPacket OPOBJ4; + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPNPC1; - @ObfuscatedName("bf") + @Export("OPNPC1") + public static final ClientPacket WIDGET_TYPE; + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPOBJU") - public static final ClientPacket OPNPC5; - @ObfuscatedName("bq") + @Export("OPPLAYERT") + public static final ClientPacket OPNPC4; + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPLOCU") - public static final ClientPacket OPLOC5; - @ObfuscatedName("ba") + @Export("RESUME_P_OBJDIALOG") + public static final ClientPacket RESUME_OBJDIALOG; + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("MESSAGE_PUBLIC") - public static final ClientPacket MESSAGE_PUBLIC; - @ObfuscatedName("bl") + @Export("EVENT_APPLET_FOCUS") + public static final ClientPacket EVENT_APPLET_FOCUS; + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("MOVE_GAMECLICK") - public static final ClientPacket MOVE_GAMECLICK; - @ObfuscatedName("bp") + public static final ClientPacket OPLOC1; + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPLOC3; - @ObfuscatedName("bu") + @Export("OPLOC3") + public static final ClientPacket OPLOC2; + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("NO_TIMEOUT") - public static final ClientPacket NO_TIMEOUT; - @ObfuscatedName("bo") + public static final ClientPacket OPPLAYERT; + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("MOVE_MINIMAPCLICK") - public static final ClientPacket MOVE_MINIMAPCLICK; - @ObfuscatedName("bb") + @Export("MAP_BUILD_COMPLETE") + public static final ClientPacket f49; + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("OPOBJ3") - static final ClientPacket OPOBJ3; - @ObfuscatedName("br") + public static final ClientPacket f50; + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("REFLECTION_CHECK_REPLY") - public static final ClientPacket REFLECTION_CHECK_REPLY; - @ObfuscatedName("be") + public static final ClientPacket f51; + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPOBJ4; - @ObfuscatedName("bi") + @Export("notsure") + public static final ClientPacket f52; + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPOBJ5") - public static final ClientPacket OPOBJ5_; - @ObfuscatedName("bz") + @Export("OPOBJ5_") + static final ClientPacket f53; + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPOBJE; + @Export("OPOBJE") + public static final ClientPacket f4; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + public static final ClientPacket OPNPC3; @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("EVENT_APPLET_FOCUS") - public static final ClientPacket EVENT_APPLET_FOCUS; - @ObfuscatedName("bn") + @Export("WINDOW_STATUS") + public static final ClientPacket EVENT_WINDOW_SETTING; + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("OPPLAYER6") public static final ClientPacket OPPLAYER6; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Llw;" - ) - @Export("RESUME_P_STRINGDIALOG") - public static final ClientPacket RESUME_P_STRINGDIALOG; - @ObfuscatedName("bc") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPOBJ2; - @ObfuscatedName("bg") + @Export("OPOBJ2") + public static final ClientPacket IF_BUTTON1; + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPNPC4") - public static final ClientPacket OPNPCU; - @ObfuscatedName("cw") + @Export("OPNPCU") + public static final ClientPacket IF_BUTTON8; + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket field2567; - @ObfuscatedName("cf") + @Export("RESUME_P_STRINGDIALOG") + public static final ClientPacket RESUME_STRINGDIALOG; + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPNPCT") - public static final ClientPacket OPNPC2; - @ObfuscatedName("cm") + @Export("OPPLAYER3") + public static final ClientPacket OPPLAYER2; + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("EXIT_FREECAM") - public static final ClientPacket EXIT_FREECAM; - @ObfuscatedName("cn") + @Export("CLIENT_CHEAT") + public static final ClientPacket DOCHEAT; + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("IF_BUTTON7") - public static final ClientPacket IF_BUTTON7; - @ObfuscatedName("cs") + @Export("CLOSE_MODAL") + public static final ClientPacket CLOSE_MODAL; + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("CONTINUE") - public static final ClientPacket CONTINUE; - @ObfuscatedName("cx") + @Export("RESUME_P_COUNTDIALOG") + public static final ClientPacket RESUME_COUNTDIALOG; + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("IGNORELIST_DEL") - public static final ClientPacket IGNORELIST_DEL; - @ObfuscatedName("cr") + @Export("RESUME_P_NAMEDIALOG") + public static final ClientPacket RESUME_NAMEDIALOG; + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPLOC2") - public static final ClientPacket OPPLAYERT; - @ObfuscatedName("cd") + @Export("CLANCHANNEL_KICKUSER") + public static final ClientPacket f65; + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPNPCU") - public static final ClientPacket OPNPC4; - @ObfuscatedName("ce") + @Export("BUG_REPORT") + public static final ClientPacket f66; + @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("UPDATE_APPEARANCE") - public static final ClientPacket UPDATE_APPEARANCE; - @ObfuscatedName("cq") + public static final ClientPacket IF_BUTTON7; + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPPLAYER5") - public static final ClientPacket OPPLAYER8; - @ObfuscatedName("cp") + @Export("OPPLAYER8") + public static final ClientPacket EVENT_KEYBOARD; + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("EVENT_MOUSE_SCROLl") - public static final ClientPacket EVENT_MOUSE_SCROLl; - @ObfuscatedName("cv") + public static final ClientPacket f69; + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("NATIVE_PACKET2") - public static final ClientPacket OPPLAYER3; - @ObfuscatedName("co") + @Export("CLAN_KICKUSER") + public static final ClientPacket CLAN_KICKUSER; + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPLOCE; - @ObfuscatedName("cl") + @Export("OPLOCE") + public static final ClientPacket OPLOC3; + @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPNPCE; - @ObfuscatedName("cu") + @Export("OPNPCE") + public static final ClientPacket OPPLAYER5; + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("OPPLAYER4") public static final ClientPacket OPPLAYER4; - @ObfuscatedName("ch") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("CLAN_JOINCHAT_LEAVECHAT") - public static final ClientPacket CLAN_JOINCHAT_LEAVECHAT; - @ObfuscatedName("ci") + public static final ClientPacket OPNPCE; + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("IF_BUTTON3") - public static final ClientPacket IF_BUTTON3; - @ObfuscatedName("ca") + @Export("IGNORELIST_DEL") + public static final ClientPacket IGNORE_DELUSER; + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPPLAYERU") - public static final ClientPacket OPPLAYERU; - @ObfuscatedName("cb") + @Export("OPLOC2") + public static final ClientPacket OPOBJ2; + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL") - public static final ClientPacket AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL; - @ObfuscatedName("cg") + public static final ClientPacket OPNPC1; + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("OPOBJ6") - public static final ClientPacket OPOBJ5; - @ObfuscatedName("cj") + @Export("OPPLAYER1") + public static final ClientPacket OPPLAYER1; + @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket notsure; - @ObfuscatedName("cz") + @Export("SET_CHATFILTERSETTINGS") + public static final ClientPacket CHAT_SETFILTER; + @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPLOC4; + @Export("EVENT_MOUSE_CLICK") + public static final ClientPacket EVENT_MOUSE_CLICK; @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("FRIEND_SETRANK") - public static final ClientPacket FRIEND_SETRANK; - @ObfuscatedName("cy") + @Export("MESSAGE_PRIVATE") + public static final ClientPacket CHAT_SENDPRIVATE; + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket field2569; - @ObfuscatedName("ck") + public static final ClientPacket IF_BUTTON4; + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("IF_BUTTON9") - public static final ClientPacket IF_BUTTON9; - @ObfuscatedName("cc") + @Export("AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL") + public static final ClientPacket f83; + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPOBJT; - @ObfuscatedName("dh") + @Export("OPPLAYER7") + public static final ClientPacket OPPLAYER7; + @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPNPCT; - @ObfuscatedName("dj") + @Export("LOGIN_STATISTICS") + public static final ClientPacket LOGIN_TIMINGS; + @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPLOC1; - @ObfuscatedName("di") + @Export("OPLOC1") + public static final ClientPacket OPLOC4; + @ObfuscatedName("ds") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("SET_CHATFILTERSETTINGS") - public static final ClientPacket SET_CHATFILTERSETTINGS; - @ObfuscatedName("du") + @Export("DETECT_MODIFIED_CLIENT") + public static final ClientPacket DETECT_MODIFIED_CLIENT; + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket OPNPC3; - @ObfuscatedName("dn") + @Export("FRIENDLIST_ADD") + public static final ClientPacket f88; + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket field2581; - @ObfuscatedName("dg") + public static final ClientPacket IF_BUTTON10; + @ObfuscatedName("dq") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("CLANCHANNEL_KICKUSER") - public static final ClientPacket CLANCHANNEL_KICKUSER; - @ObfuscatedName("dd") + public static final ClientPacket FREECAM_EXIT; + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("SEND_SNAPSHOT") - public static final ClientPacket SEND_SNAPSHOT; - @ObfuscatedName("da") + public static final ClientPacket IF_BUTTON2; + @ObfuscatedName("dn") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("MESSAGE_PRIVATE") - public static final ClientPacket MESSAGE_PRIVATE; - @ObfuscatedName("ds") + @Export("OPNPC3") + public static final ClientPacket OPNPC5; + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("FRIENDLIST_DEL") - public static final ClientPacket FRIENDLIST_DEL; - @ObfuscatedName("dy") + public static final ClientPacket OPOBJ5; + @ObfuscatedName("df") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("CLAN_KICKUSER") - public static final ClientPacket CLAN_KICKUSER; - @ObfuscatedName("dt") + public static final ClientPacket IF_BUTTON6; + @ObfuscatedName("de") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("DETECT_MODIFIED_CLIENT") - public static final ClientPacket DETECT_MODIFIED_CLIENT; + @Export("MOVE_GAMECLICK") + public static final ClientPacket MOVE_GAMECLICK; @ObfuscatedName("dl") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("IF_BUTTON5") - public static final ClientPacket IF_BUTTON5; - @ObfuscatedName("dk") + public static final ClientPacket OPOBJ3; + @ObfuscatedName("dp") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("WINDOW_STATUS") - public static final ClientPacket WINDOW_STATUS; - @ObfuscatedName("df") + @Export("OPOBJ4") + public static final ClientPacket OPLOCT; + @ObfuscatedName("do") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("RESUME_P_OBJDIALOG") - public static final ClientPacket RESUME_P_OBJDIALOG; - @ObfuscatedName("dz") + @Export("MESSAGE_PUBLIC") + public static final ClientPacket f96; + @ObfuscatedName("dh") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("SOUND_SONGEND") - public static final ClientPacket SOUND_SONGEND; - @ObfuscatedName("dw") + public static final ClientPacket f97; + @ObfuscatedName("dj") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("IF_BUTTOND") - public static final ClientPacket IF_BUTTOND; - @ObfuscatedName("dv") + @Export("SEND_SNAPSHOT") + public static final ClientPacket CHAT_SEND_ABUSE_REPORT; + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - @Export("RESUME_P_COUNTDIALOG") - public static final ClientPacket RESUME_P_COUNTDIALOG; + @Export("SOUND_SONGEND") + public static final ClientPacket SOUND_SONGEND; @ObfuscatedName("dr") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket field2583; - @ObfuscatedName("do") + public static final ClientPacket OPOBJT; + @ObfuscatedName("dw") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket field2582; - @ObfuscatedName("db") + @Export("IF_BUTTOND") + public static final ClientPacket OPHELDD; + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) - public static final ClientPacket field2572; - @ObfuscatedName("dp") + @Export("IGNORELIST_ADD") + public static final ClientPacket FIREND_ADDUSER; + @ObfuscatedName("dt") @Export("id") public final int id; - @ObfuscatedName("dm") + @ObfuscatedName("dd") @Export("length") public final int length; static { - field2592 = new ClientPacket(0, 2); - IF_BUTTON8 = new ClientPacket(1, 8); - RESUME_P_NAMEDIALOG = new ClientPacket(2, -1); - OPLOC2 = new ClientPacket(3, 7); - IGNORELIST_ADD = new ClientPacket(4, -1); - IF_BUTTON4 = new ClientPacket(5, 8); - IF_BUTTON6 = new ClientPacket(6, 8); - CLICKWORLDMAP = new ClientPacket(7, 4); - CLOSE_MODAL = new ClientPacket(8, 0); - OPOBJ2_ = new ClientPacket(9, -1); - OPPLAYER1 = new ClientPacket(10, 3); - CLIENT_CHEAT = new ClientPacket(11, -1); - OPLOC6 = new ClientPacket(12, 15); - OPPLAYER5 = new ClientPacket(13, 3); - IF_BUTTONT = new ClientPacket(14, 16); - LOGIN_STATISTICS = new ClientPacket(15, -1); - IF_BUTTON2 = new ClientPacket(16, 8); - MAP_BUILD_COMPLETE = new ClientPacket(17, 0); - OPLOCT = new ClientPacket(18, 15); - FRIENDLIST_ADD = new ClientPacket(19, -1); - OPPLAYER7 = new ClientPacket(20, 3); - AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL = new ClientPacket(21, -1); - BUG_REPORT = new ClientPacket(22, -2); - EVENT_CAMERA_POSITION = new ClientPacket(23, 4); - IDLE_LOGOUT = new ClientPacket(24, 0); - OPNPC6 = new ClientPacket(25, 7); - IF_BUTTON1 = new ClientPacket(26, 8); - TELEPORT = new ClientPacket(27, 9); - OPOBJ1 = new ClientPacket(28, 7); - EVENT_KEYBOARD = new ClientPacket(29, -2); - OPNPC5_ = new ClientPacket(30, 2); - OPPLAYER2 = new ClientPacket(31, 3); - IF_BUTTON10 = new ClientPacket(32, 8); - EVENT_MOUSE_CLICK = new ClientPacket(33, 6); - OPNPC1 = new ClientPacket(34, 3); - OPNPC5 = new ClientPacket(35, 3); - OPLOC5 = new ClientPacket(36, 7); - MESSAGE_PUBLIC = new ClientPacket(37, -1); - MOVE_GAMECLICK = new ClientPacket(38, -1); - OPLOC3 = new ClientPacket(39, 7); - NO_TIMEOUT = new ClientPacket(40, 0); - MOVE_MINIMAPCLICK = new ClientPacket(41, -1); - OPOBJ3 = new ClientPacket(42, -1); - REFLECTION_CHECK_REPLY = new ClientPacket(43, -1); - OPOBJ4 = new ClientPacket(44, 7); - OPOBJ5_ = new ClientPacket(45, 7); - OPOBJE = new ClientPacket(46, 6); - EVENT_APPLET_FOCUS = new ClientPacket(47, 1); - OPPLAYER6 = new ClientPacket(48, 3); - RESUME_P_STRINGDIALOG = new ClientPacket(49, -1); - OPOBJ2 = new ClientPacket(50, 7); - OPNPCU = new ClientPacket(51, 11); - field2567 = new ClientPacket(52, 4); - OPNPC2 = new ClientPacket(53, 3); - EXIT_FREECAM = new ClientPacket(54, 15); - IF_BUTTON7 = new ClientPacket(55, 8); - CONTINUE = new ClientPacket(56, 6); - IGNORELIST_DEL = new ClientPacket(57, -1); - OPPLAYERT = new ClientPacket(58, 11); - OPNPC4 = new ClientPacket(59, 3); - UPDATE_APPEARANCE = new ClientPacket(60, 13); - OPPLAYER8 = new ClientPacket(61, 3); - EVENT_MOUSE_SCROLl = new ClientPacket(62, 2); - OPPLAYER3 = new ClientPacket(63, 3); - OPLOCE = new ClientPacket(64, 2); - OPNPCE = new ClientPacket(65, 2); + EVENT_MOUSE_IDLE = new ClientPacket(0, 0); + f1 = new ClientPacket(1, 7); + f2 = new ClientPacket(2, -1); + f3 = new ClientPacket(3, 1); + OPOBJE = new ClientPacket(4, 6); + OPNPCT = new ClientPacket(5, 11); + f5 = new ClientPacket(6, -1); + f9 = new ClientPacket(7, 13); + f10 = new ClientPacket(8, -1); + f11 = new ClientPacket(9, 22); + PING_STATS = new ClientPacket(10, 10); + OPNPC2 = new ClientPacket(11, 3); + REFLECTION_CHECK_REPLY = new ClientPacket(12, -1); + FRIEND_DELETE_USER = new ClientPacket(13, -1); + f6 = new ClientPacket(14, -1); + f16 = new ClientPacket(15, 4); + f17 = new ClientPacket(16, 2); + f18 = new ClientPacket(17, 2); + OPLOCE = new ClientPacket(18, 2); + IF_BUTTON5 = new ClientPacket(19, 8); + field2534 = new ClientPacket(20, 15); + f20 = new ClientPacket(21, 9); + EVENT_CAMERA_FOCUS = new ClientPacket(22, 4); + f22 = new ClientPacket(23, -1); + OPLOC5 = new ClientPacket(24, 7); + IF_BUTTONT = new ClientPacket(25, 16); + OPPLAYER3 = new ClientPacket(26, 3); + IF_BUTTON9 = new ClientPacket(27, 8); + IF_BUTTON3 = new ClientPacket(28, 8); + OPOBJ1 = new ClientPacket(29, 7); + NO_TIMEOUT = new ClientPacket(30, 0); + OPPLAYER8 = new ClientPacket(31, 3); + RESUME_PAUSEBUTTON = new ClientPacket(32, 6); + OPOBJ4 = new ClientPacket(33, 7); + WIDGET_TYPE = new ClientPacket(34, 4); + OPNPC4 = new ClientPacket(35, 3); + RESUME_OBJDIALOG = new ClientPacket(36, 2); + EVENT_APPLET_FOCUS = new ClientPacket(37, 1); + OPLOC1 = new ClientPacket(38, 7); + OPLOC2 = new ClientPacket(39, 7); + OPPLAYERT = new ClientPacket(40, 11); + f49 = new ClientPacket(41, 0); + f50 = new ClientPacket(42, 1); + f51 = new ClientPacket(43, -1); + f52 = new ClientPacket(44, -1); + f53 = new ClientPacket(45, 2); + f4 = new ClientPacket(46, 11); + OPNPC3 = new ClientPacket(47, 3); + EVENT_WINDOW_SETTING = new ClientPacket(48, 5); + OPPLAYER6 = new ClientPacket(49, 3); + IF_BUTTON1 = new ClientPacket(50, 8); + IF_BUTTON8 = new ClientPacket(51, 8); + RESUME_STRINGDIALOG = new ClientPacket(52, -1); + OPPLAYER2 = new ClientPacket(53, 3); + DOCHEAT = new ClientPacket(54, -1); + CLOSE_MODAL = new ClientPacket(55, 0); + RESUME_COUNTDIALOG = new ClientPacket(56, 4); + RESUME_NAMEDIALOG = new ClientPacket(57, -1); + f65 = new ClientPacket(58, -1); + f66 = new ClientPacket(59, -2); + IF_BUTTON7 = new ClientPacket(60, 8); + EVENT_KEYBOARD = new ClientPacket(61, -2); + f69 = new ClientPacket(62, 11); + CLAN_KICKUSER = new ClientPacket(63, -1); + OPLOC3 = new ClientPacket(64, 7); + OPPLAYER5 = new ClientPacket(65, 3); OPPLAYER4 = new ClientPacket(66, 3); - CLAN_JOINCHAT_LEAVECHAT = new ClientPacket(67, -1); - IF_BUTTON3 = new ClientPacket(68, 8); - OPPLAYERU = new ClientPacket(69, 11); - AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL = new ClientPacket(70, -1); - OPOBJ5 = new ClientPacket(71, 7); - notsure = new ClientPacket(72, -1); - OPLOC4 = new ClientPacket(73, 7); - FRIEND_SETRANK = new ClientPacket(74, -1); - field2569 = new ClientPacket(75, 0); - IF_BUTTON9 = new ClientPacket(76, 8); - OPOBJT = new ClientPacket(77, 15); - OPNPCT = new ClientPacket(78, 11); - OPLOC1 = new ClientPacket(79, 7); - SET_CHATFILTERSETTINGS = new ClientPacket(80, 3); - OPNPC3 = new ClientPacket(81, 3); - field2581 = new ClientPacket(82, 10); - CLANCHANNEL_KICKUSER = new ClientPacket(83, -1); - SEND_SNAPSHOT = new ClientPacket(84, -1); - MESSAGE_PRIVATE = new ClientPacket(85, -2); - FRIENDLIST_DEL = new ClientPacket(86, -1); - CLAN_KICKUSER = new ClientPacket(87, -1); - DETECT_MODIFIED_CLIENT = new ClientPacket(88, 4); - IF_BUTTON5 = new ClientPacket(89, 8); - WINDOW_STATUS = new ClientPacket(90, 5); - RESUME_P_OBJDIALOG = new ClientPacket(91, 2); - SOUND_SONGEND = new ClientPacket(92, 4); - IF_BUTTOND = new ClientPacket(93, 16); - RESUME_P_COUNTDIALOG = new ClientPacket(94, 4); - field2583 = new ClientPacket(95, 22); - field2582 = new ClientPacket(96, 1); - field2572 = new ClientPacket(97, 1); + OPNPCE = new ClientPacket(67, 2); + IGNORE_DELUSER = new ClientPacket(68, -1); + OPOBJ2 = new ClientPacket(69, 7); + OPNPC1 = new ClientPacket(70, 3); + OPPLAYER1 = new ClientPacket(71, 3); + CHAT_SETFILTER = new ClientPacket(72, 3); + EVENT_MOUSE_CLICK = new ClientPacket(73, 6); + CHAT_SENDPRIVATE = new ClientPacket(74, -2); + IF_BUTTON4 = new ClientPacket(75, 8); + f83 = new ClientPacket(76, -1); + OPPLAYER7 = new ClientPacket(77, 3); + LOGIN_TIMINGS = new ClientPacket(78, -1); + OPLOC4 = new ClientPacket(79, 7); + DETECT_MODIFIED_CLIENT = new ClientPacket(80, 4); + f88 = new ClientPacket(81, -1); + IF_BUTTON10 = new ClientPacket(82, 8); + FREECAM_EXIT = new ClientPacket(83, 0); + IF_BUTTON2 = new ClientPacket(84, 8); + OPNPC5 = new ClientPacket(85, 3); + OPOBJ5 = new ClientPacket(86, 7); + IF_BUTTON6 = new ClientPacket(87, 8); + MOVE_GAMECLICK = new ClientPacket(88, -1); + OPOBJ3 = new ClientPacket(89, 7); + OPLOCT = new ClientPacket(90, 15); + f96 = new ClientPacket(91, -1); + f97 = new ClientPacket(92, 15); + CHAT_SEND_ABUSE_REPORT = new ClientPacket(93, -1); + SOUND_SONGEND = new ClientPacket(94, 4); + OPOBJT = new ClientPacket(95, 15); + OPHELDD = new ClientPacket(96, 16); + FIREND_ADDUSER = new ClientPacket(97, -1); } ClientPacket(int var1, int var2) { @@ -683,52 +682,85 @@ public class ClientPacket implements class293 { this.length = var2; } - @ObfuscatedName("ap") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-712911733" - ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; + descriptor = "(ILds;ZI)I", + garbageValue = "1044263127" + ) + static int method1640(int var0, Script var1, boolean var2) { + Widget var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var0 == 2800) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var3)); + return 1; + } else if (var0 != 2801) { + if (var0 == 2802) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; } } - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(B)[Lui;", - garbageValue = "14" - ) - static SpritePixels[] method1608() { - SpritePixels[] var0 = new SpritePixels[class529.SpriteBuffer_spriteCount]; + @ObfuscatedName("mh") + @ObfuscatedSignature( + descriptor = "([Lnm;IB)V", + garbageValue = "5" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null) { + if (var3.type == 0) { + if (var3.children != null) { + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + Interpreter.method418(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + Interpreter.runScriptEvent(var5); + } - for (int var1 = 0; var1 < class529.SpriteBuffer_spriteCount; ++var1) { - SpritePixels var2 = var0[var1] = new SpritePixels(); - var2.width = class529.SpriteBuffer_spriteWidth; - var2.height = class420.SpriteBuffer_spriteHeight; - var2.xOffset = class529.SpriteBuffer_xOffsets[var1]; - var2.yOffset = class152.SpriteBuffer_yOffsets[var1]; - var2.subWidth = HealthBarUpdate.SpriteBuffer_spriteWidths[var1]; - var2.subHeight = SpriteMask.SpriteBuffer_spriteHeights[var1]; - int var3 = var2.subWidth * var2.subHeight; - byte[] var4 = Coord.SpriteBuffer_pixels[var1]; - var2.pixels = new int[var3]; + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = class33.field89.method1740(var3.id); + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { + continue; + } + } - for (int var5 = 0; var5 < var3; ++var5) { - var2.pixels[var5] = DbTableType.SpriteBuffer_spritePalette[var4[var5] & 255]; + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onSubChange; + Interpreter.runScriptEvent(var5); + } } } - class529.SpriteBuffer_xOffsets = null; - class152.SpriteBuffer_yOffsets = null; - HealthBarUpdate.SpriteBuffer_spriteWidths = null; - SpriteMask.SpriteBuffer_spriteHeights = null; - DbTableType.SpriteBuffer_spritePalette = null; - Coord.SpriteBuffer_pixels = null; - return var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/ClientPreferences.java b/osrs/src/main/java/ClientPreferences.java index ff00dfd6a..4668c635d 100644 --- a/osrs/src/main/java/ClientPreferences.java +++ b/osrs/src/main/java/ClientPreferences.java @@ -8,44 +8,46 @@ import java.util.Map; import java.util.Map.Entry; -@ObfuscatedName("dp") +@ObfuscatedName("dy") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("ac") + @ObfuscatedName("cf") + static int field1059; + @ObfuscatedName("ao") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("displayFps") boolean displayFps; - @ObfuscatedName("aa") - int field1061; - @ObfuscatedName("af") + @ObfuscatedName("am") + int field1068; + @ObfuscatedName("av") @Export("brightness") double brightness; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("musicVolume") int musicVolume; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("an") - int field1065; - @ObfuscatedName("ar") + @ObfuscatedName("ay") + int field1070; + @ObfuscatedName("as") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("windowMode") int windowMode; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("parameters") final Map parameters; @@ -56,15 +58,15 @@ public class ClientPreferences { this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1065 = -1; + this.field1070 = -1; this.rememberedUsername = null; this.windowMode = 1; this.parameters = new LinkedHashMap(); - this.method540(true); + this.method536(true); } @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;)V" ) ClientPreferences(Buffer var1) { this.hideUsername = false; @@ -73,7 +75,7 @@ public class ClientPreferences { this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1065 = -1; + this.field1070 = -1; this.rememberedUsername = null; this.windowMode = 1; this.parameters = new LinkedHashMap(); @@ -118,7 +120,7 @@ public class ClientPreferences { } if (var2 > 7) { - this.field1065 = var1.readUnsignedByte(); + this.field1070 = var1.readUnsignedByte(); } if (var2 > 8) { @@ -126,29 +128,29 @@ public class ClientPreferences { } if (var2 > 9) { - this.field1061 = var1.readInt(); + this.field1068 = var1.readInt(); } } else { - this.method540(true); + this.method536(true); } } else { - this.method540(true); + this.method536(true); } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "-35" + garbageValue = "12" ) - void method540(boolean var1) { + void method536(boolean var1) { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ltm;", - garbageValue = "1941143653" + descriptor = "(I)Lul;", + garbageValue = "2143107784" ) @Export("toBuffer") Buffer toBuffer() { @@ -172,268 +174,268 @@ Buffer toBuffer() { var1.writeByte(this.musicVolume); var1.writeByte(this.soundEffectsVolume); var1.writeByte(this.areaSoundEffectsVolume); - var1.writeByte(this.field1065); + var1.writeByte(this.field1070); var1.writeByte(this.displayFps ? 1 : 0); - var1.writeInt(this.field1061); + var1.writeInt(this.field1068); return var1; } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "932955968" + descriptor = "(ZS)V", + garbageValue = "5523" ) @Export("setRoofsHidden") void setRoofsHidden(boolean var1) { this.roofsHidden = var1; - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-767626364" + garbageValue = "-16777216" ) @Export("getRoofsHidden") boolean getRoofsHidden() { return this.roofsHidden; } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-211242200" + descriptor = "(ZB)V", + garbageValue = "-118" ) @Export("setIsUsernameHidden") void setIsUsernameHidden(boolean var1) { this.hideUsername = var1; - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("az") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1977526319" + garbageValue = "2079873029" ) @Export("getIsUsernameHidden") boolean getIsUsernameHidden() { return this.hideUsername; } - @ObfuscatedName("ap") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-973658923" + garbageValue = "-1738158187" ) @Export("getTitleMusicDisabled") void getTitleMusicDisabled(boolean var1) { this.titleMusicDisabled = var1; - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "120" + garbageValue = "-76" ) @Export("getTitleMusicDisabled") boolean getTitleMusicDisabled() { return this.titleMusicDisabled; } - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "534613668" + garbageValue = "-1239790948" ) - void method548(boolean var1) { + void method544(boolean var1) { this.displayFps = var1; - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("ad") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1847880996" + garbageValue = "-448178452" ) - void method549() { - this.method548(!this.displayFps); + void method545() { + this.method544(!this.displayFps); } - @ObfuscatedName("aq") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1017741261" + garbageValue = "1788161752" ) - boolean method550() { + boolean method546() { return this.displayFps; } - @ObfuscatedName("al") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-11" + garbageValue = "34" ) - void method551(int var1) { - this.field1061 = var1; - class338.savePreferences(); + void method547(int var1) { + this.field1068 = var1; + class144.savePreferences(); } - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1963125343" + descriptor = "(B)I", + garbageValue = "-67" ) - int method552() { - return this.field1061; + int method548() { + return this.field1068; } - @ObfuscatedName("ar") + @ObfuscatedName("aj") @Export("setBrightness") void setBrightness(double var1) { this.brightness = var1; - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(I)D", - garbageValue = "-1673173244" + garbageValue = "579802004" ) @Export("getBrightness") double getBrightness() { return this.brightness; } - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-631794357" + garbageValue = "428446104" ) @Export("setCurrentMusicVolume") void setCurrentMusicVolume(int var1) { this.musicVolume = var1; - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("am") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "121" + descriptor = "(I)I", + garbageValue = "813225298" ) @Export("getCurrentMusicVolume") int getCurrentMusicVolume() { return this.musicVolume; } - @ObfuscatedName("ax") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-18" + descriptor = "(II)V", + garbageValue = "1930056928" ) @Export("setCurrentSoundEffectVolume") void setCurrentSoundEffectVolume(int var1) { this.soundEffectsVolume = var1; - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("ah") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1509566185" + garbageValue = "440195040" ) @Export("getCurrentSoundEffectsVolume") int getCurrentSoundEffectsVolume() { return this.soundEffectsVolume; } - @ObfuscatedName("as") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "291571755" + garbageValue = "-1563658200" ) @Export("setAreaSoundEffectsVolume") void setAreaSoundEffectsVolume(int var1) { this.areaSoundEffectsVolume = var1; - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-76" + garbageValue = "-40" ) @Export("getAreaSoundEffectsVolume") int getAreaSoundEffectsVolume() { return this.areaSoundEffectsVolume; } - @ObfuscatedName("aj") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1859632471" + descriptor = "(Ljava/lang/String;S)V", + garbageValue = "8224" ) @Export("setUsernameToRemember") void setUsernameToRemember(String var1) { this.rememberedUsername = var1; - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "63" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "222957667" ) @Export("getUsernameToRemember") String getUsernameToRemember() { return this.rememberedUsername; } - @ObfuscatedName("aw") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1109709806" + garbageValue = "305556660" ) - void method563(int var1) { - this.field1065 = var1; - class338.savePreferences(); + void method559(int var1) { + this.field1070 = var1; + class144.savePreferences(); } - @ObfuscatedName("ak") + @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1749033471" + garbageValue = "2047489929" ) - int method564() { - return this.field1065; + int method560() { + return this.field1070; } - @ObfuscatedName("bh") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "23" + descriptor = "(II)V", + garbageValue = "1603412139" ) - void method565(int var1) { + void method561(int var1) { this.windowMode = var1; - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("bj") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1232255249" + garbageValue = "-453513391" ) - int method566() { + int method562() { return this.windowMode; } - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;II)V", - garbageValue = "-867564338" + garbageValue = "1984702450" ) - void method567(String var1, int var2) { - int var3 = this.method570(var1); + void method563(String var1, int var2) { + int var3 = this.method566(var1); if (this.parameters.size() >= 10 && !this.parameters.containsKey(var3)) { Iterator var4 = this.parameters.entrySet().iterator(); var4.next(); @@ -441,149 +443,117 @@ void method567(String var1, int var2) { } this.parameters.put(var3, var2); - class338.savePreferences(); + class144.savePreferences(); } - @ObfuscatedName("bv") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-1796045546" + garbageValue = "-754165935" ) - boolean method568(String var1) { - int var2 = this.method570(var1); + boolean method564(String var1) { + int var2 = this.method566(var1); return this.parameters.containsKey(var2); } - @ObfuscatedName("bt") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)I", - garbageValue = "-25926" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-558374148" ) - int method569(String var1) { - int var2 = this.method570(var1); + int method565(String var1) { + int var2 = this.method566(var1); return !this.parameters.containsKey(var2) ? 0 : (Integer)this.parameters.get(var2); } - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "-112" - ) - int method570(String var1) { - return VarbitComposition.method1012(var1.toLowerCase()); - } - - @ObfuscatedName("au") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1544580715" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1498275662" ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var1 = class384.method2022(var0); - int var2 = var1.baseVar; - int var3 = var1.startBit; - int var4 = var1.endBit; - int var5 = Varps.Varps_masks[var4 - var3]; - return Varps.Varps_main[var2] >> var3 & var5; + int method566(String var1) { + return PacketWriter.method647(var1.toLowerCase()); } - @ObfuscatedName("au") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "31" + descriptor = "(ILds;ZS)I", + garbageValue = "-14036" ) - public static final boolean method537(char var0) { - if (Character.isISOControl(var0)) { - return false; - } else if (WorldMapLabel.isAlphaNumeric(var0)) { - return true; + static int method567(int var0, Script var1, boolean var2) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = class33.field89.method1740(var3); } else { - char[] var1 = class493.field4077; - - int var2; - char var3; - for (var2 = 0; var2 < var1.length; ++var2) { - var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } + var4 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + } - var1 = class493.field4078; + if (var0 == 1000) { + Interpreter.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + ClanChannelMember.invalidateWidget(var4); + class159.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var3 >> 16], var4, false); + } - for (var2 = 0; var2 < var1.length; ++var2) { - var3 = var1[var2]; - if (var0 == var3) { - return true; - } + return 1; + } else if (var0 == 1001) { + Interpreter.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + ClanChannelMember.invalidateWidget(var4); + class159.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var3 >> 16], var4, false); } - return false; - } - } + return 1; + } else if (var0 == 1003) { + boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + ClanChannelMember.invalidateWidget(var4); + } - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Ltm;J)V" - ) - static void method539(Buffer var0, long var1) { - var1 /= 10L; - if (var1 < 0L) { - var1 = 0L; - } else if (var1 > 65535L) { - var1 = 65535L; + return 1; + } else if (var0 == 1005) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1006) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; } - - var0.writeShort((int)var1); } @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-51" + descriptor = "(I)[Lem;", + garbageValue = "1083227717" ) - public static int method571(int var0) { - class137 var1 = class338.method1862(var0); - if (var1 == null) { - return 2; - } else { - return var1.method746() ? 0 : 1; - } + static AttackOption[] method569() { + return new AttackOption[]{AttackOption.field1100, AttackOption.field1102, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick}; } - @ObfuscatedName("ka") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IIIIIIIIIIS)V", - garbageValue = "10324" + descriptor = "(IIB)I", + garbageValue = "-29" ) - @Export("updatePendingSpawn") - static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - PendingSpawn var10 = null; - - for (PendingSpawn var11 = (PendingSpawn)Client.pendingSpawns.last(); var11 != null; var11 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var11.plane && var11.x == var1 && var2 == var11.y && var3 == var11.type) { - var10 = var11; - break; - } - } - - if (var10 == null) { - var10 = new PendingSpawn(); - var10.plane = var0; - var10.type = var3; - var10.x = var1; - var10.y = var2; - var10.field945 = -1; - PacketWriter.method646(var10); - Client.pendingSpawns.addFirst(var10); - } - - var10.id = var4; - var10.objectType = var5; - var10.rotation = var6; - var10.startCycle = var8; - var10.endCycle = var9; - var10.method506(var7); + static final int method568(int var0, int var1) { + int var2 = var1 * 57 + var0; + var2 ^= var2 << 13; + int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; + return var3 >> 19 & 255; } } \ No newline at end of file diff --git a/osrs/src/main/java/Clips.java b/osrs/src/main/java/Clips.java index 4250f0242..95f1984f9 100644 --- a/osrs/src/main/java/Clips.java +++ b/osrs/src/main/java/Clips.java @@ -3,75 +3,75 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("jb") @Implements("Clips") public class Clips { - @ObfuscatedName("au") - boolean field2268; - @ObfuscatedName("ae") - public boolean field2279; - @ObfuscatedName("ao") - int field2275; - @ObfuscatedName("ai") - public int field2280; - @ObfuscatedName("az") + @ObfuscatedName("ac") + boolean field2278; + @ObfuscatedName("al") + public boolean field2289; + @ObfuscatedName("ak") + int field2282; + @ObfuscatedName("ah") + public int field2290; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lkg;" ) @Export("Rasterizer3D_textureLoader") public TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("al") - int field2272; + @ObfuscatedName("ap") + int field2284; + @ObfuscatedName("ay") + int field2287; + @ObfuscatedName("as") + int field2285; + @ObfuscatedName("aj") + int field2281; @ObfuscatedName("an") - int field2274; - @ObfuscatedName("ar") - int field2276; - @ObfuscatedName("ab") - int field2269; - @ObfuscatedName("ag") @Export("clipNegativeMidX") int clipNegativeMidX; - @ObfuscatedName("am") - int field2273; - @ObfuscatedName("ax") + @ObfuscatedName("au") + int field2286; + @ObfuscatedName("ai") @Export("clipNegativeMidY") int clipNegativeMidY; - @ObfuscatedName("ah") - int field2271; - @ObfuscatedName("as") + @ObfuscatedName("ae") + int field2279; + @ObfuscatedName("aw") @Export("Rasterizer3D_rowOffsets") int[] Rasterizer3D_rowOffsets; Clips() { - this.field2268 = false; - this.field2279 = true; - this.field2275 = 0; - this.field2280 = 512; + this.field2278 = false; + this.field2289 = true; + this.field2282 = 0; + this.field2290 = 512; this.Rasterizer3D_rowOffsets = new int[1024]; } - @ObfuscatedName("au") - void method1361() { - this.field2272 = this.field2276 / 2; - this.field2274 = this.field2269 / 2; - this.clipNegativeMidX = -this.field2272; - this.field2273 = this.field2276 - this.field2272; - this.clipNegativeMidY = -this.field2274; - this.field2271 = this.field2269 - this.field2274; + @ObfuscatedName("ac") + void method1400() { + this.field2284 = this.field2285 / 2; + this.field2287 = this.field2281 / 2; + this.clipNegativeMidX = -this.field2284; + this.field2286 = this.field2285 - this.field2284; + this.clipNegativeMidY = -this.field2287; + this.field2279 = this.field2281 - this.field2287; } - @ObfuscatedName("ae") - void method1362(int var1, int var2, int var3, int var4) { - this.field2272 = var1 - var2; - this.field2274 = var3 - var4; - this.clipNegativeMidX = -this.field2272; - this.field2273 = this.field2276 - this.field2272; - this.clipNegativeMidY = -this.field2274; - this.field2271 = this.field2269 - this.field2274; + @ObfuscatedName("al") + void method1401(int var1, int var2, int var3, int var4) { + this.field2284 = var1 - var2; + this.field2287 = var3 - var4; + this.clipNegativeMidX = -this.field2284; + this.field2286 = this.field2285 - this.field2284; + this.clipNegativeMidY = -this.field2287; + this.field2279 = this.field2281 - this.field2287; } - @ObfuscatedName("ao") - void method1363(int var1, int var2, int var3) { - this.field2268 = var1 < 0 || var1 > this.field2276 || var2 < 0 || var2 > this.field2276 || var3 < 0 || var3 > this.field2276; + @ObfuscatedName("ak") + void method1402(int var1, int var2, int var3) { + this.field2278 = var1 < 0 || var1 > this.field2285 || var2 < 0 || var2 > this.field2285 || var3 < 0 || var3 > this.field2285; } } \ No newline at end of file diff --git a/osrs/src/main/java/Clock.java b/osrs/src/main/java/Clock.java index 17fc338b6..7b53f6dae 100644 --- a/osrs/src/main/java/Clock.java +++ b/osrs/src/main/java/Clock.java @@ -3,55 +3,40 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("hu") @Implements("Clock") public abstract class Clock { + @ObfuscatedName("kr") + static int field1484; + Clock() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1021685028" + garbageValue = "436321701" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "20" + descriptor = "(III)I", + garbageValue = "712947185" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("au") + @ObfuscatedName("jl") @ObfuscatedSignature( - descriptor = "(DDII)[D", - garbageValue = "1988860737" + descriptor = "(I)V", + garbageValue = "1548584577" ) - public static double[] method930(double var0, double var2, int var4) { - int var5 = var4 * 2 + 1; - double[] var6 = new double[var5]; - int var7 = -var4; - - for (int var8 = 0; var7 <= var4; ++var8) { - double var15 = ((double)var7 - var0) / var2; - double var13 = Math.exp(-var15 * var15 / 2.0D) / Math.sqrt(6.283185307179586D); - double var11 = var13 / var2; - var6[var8] = var11; - ++var7; + static void method944() { + for (class225 var0 = (class225)Client.field626.last(); var0 != null; var0 = (class225)Client.field626.previous()) { + var0.remove(); } - return var6; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-322311297" - ) - static final void method931() { - UserComparator8.method673("You can't add yourself to your own friend list"); } } \ No newline at end of file diff --git a/osrs/src/main/java/CollisionMap.java b/osrs/src/main/java/CollisionMap.java index 260605987..249fae130 100644 --- a/osrs/src/main/java/CollisionMap.java +++ b/osrs/src/main/java/CollisionMap.java @@ -3,22 +3,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("ih") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("bs") + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("bz") @Export("xInset") int xInset; - @ObfuscatedName("bm") + @ObfuscatedName("bb") @Export("yInset") int yInset; - @ObfuscatedName("bf") + @ObfuscatedName("bo") @Export("xSize") int xSize; - @ObfuscatedName("bq") + @ObfuscatedName("bp") @Export("ySize") int ySize; - @ObfuscatedName("ba") + @ObfuscatedName("bt") @Export("flags") public int[][] flags; @@ -31,10 +37,10 @@ public CollisionMap(int var1, int var2) { this.clear(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "594753621" + garbageValue = "1112127553" ) @Export("clear") public void clear() { @@ -50,12 +56,12 @@ public void clear() { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "927391421" + descriptor = "(IIIIZB)V", + garbageValue = "22" ) - public void method1113(int var1, int var2, int var3, int var4, boolean var5) { + public void method1156(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -202,10 +208,10 @@ public void method1113(int var1, int var2, int var3, int var4, boolean var5) { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(IIIIZB)V", - garbageValue = "-55" + garbageValue = "-29" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -229,10 +235,10 @@ public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-52" + descriptor = "(III)V", + garbageValue = "404851372" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -242,10 +248,10 @@ public void setBlockedByFloor(int var1, int var2) { var10000[var2] |= 2097152; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "952149721" + descriptor = "(IIB)V", + garbageValue = "43" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -255,10 +261,10 @@ public void setBlockedByFloorDec(int var1, int var2) { var10000[var2] |= 262144; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-70" + descriptor = "(IIII)V", + garbageValue = "1437518268" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -266,12 +272,12 @@ void setFlag(int var1, int var2, int var3) { var10000[var2] |= var3; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-191479302" + garbageValue = "1303990924" ) - public void method1118(int var1, int var2, int var3, int var4, boolean var5) { + public void method1162(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -418,10 +424,10 @@ public void method1118(int var1, int var2, int var3, int var4, boolean var5) { } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(IIIIIZI)V", - garbageValue = "-320113584" + garbageValue = "-1836775904" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -451,10 +457,10 @@ public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5 } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-675298247" + garbageValue = "-1412347367" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -462,24 +468,178 @@ void setFlagOff(int var1, int var2, int var3) { var10000[var2] &= ~var3; } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2112024151" + garbageValue = "-278708003" ) - public void method1121(int var1, int var2) { + public void method1165(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; int[] var10000 = this.flags[var1]; var10000[var2] &= -262145; } - @ObfuscatedName("oo") + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Loa;B)I", + garbageValue = "-53" + ) + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); + int var4 = var1.length(); + int var5 = 0; + int var6 = 0; + char var7 = 0; + char var8 = 0; + + while (var5 - var7 < var3 || var6 - var8 < var4) { + if (var5 - var7 >= var3) { + return -1; + } + + if (var6 - var8 >= var4) { + return 1; + } + + char var9; + if (var7 != 0) { + var9 = var7; + boolean var14 = false; + } else { + var9 = var0.charAt(var5++); + } + + char var10; + if (var8 != 0) { + var10 = var8; + boolean var15 = false; + } else { + var10 = var1.charAt(var6++); + } + + var7 = class216.method1058(var9); + var8 = class216.method1058(var10); + var9 = class319.standardizeChar(var9, var2); + var10 = class319.standardizeChar(var10, var2); + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var9 != var10) { + return class11.lowercaseChar(var9, var2) - class11.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); + + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { + if (var2 == Language.Language_FR) { + var5 = var3 - 1 - var17; + var6 = var4 - 1 - var17; + } else { + var6 = var17; + var5 = var17; + } + + char var11 = var0.charAt(var5); + var12 = var1.charAt(var6); + if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { + var11 = Character.toLowerCase(var11); + var12 = Character.toLowerCase(var12); + if (var12 != var11) { + return class11.lowercaseChar(var11, var2) - class11.lowercaseChar(var12, var2); + } + } + } + + var17 = var3 - var4; + if (var17 != 0) { + return var17; + } else { + for (int var18 = 0; var18 < var16; ++var18) { + var12 = var0.charAt(var18); + char var13 = var1.charAt(var18); + if (var13 != var12) { + return class11.lowercaseChar(var12, var2) - class11.lowercaseChar(var13, var2); + } + } + + return 0; + } + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "10" + ) + public static boolean method1157() { + boolean var0 = false; + boolean var1 = false; + if (!class319.field2798.isEmpty()) { + SongTask var2 = (SongTask)class319.field2798.get(0); + if (var2 == null) { + class319.field2798.remove(0); + } else if (var2.vmethod2142()) { + if (var2.method2165()) { + System.out.println("Error in midimanager.service: " + var2.method2168()); + var0 = true; + } else { + if (var2.method2169() != null) { + class319.field2798.add(1, var2.method2169()); + } + + var1 = var2.method2167(); + } + + class319.field2798.remove(0); + } else { + var1 = var2.method2167(); + } + } + + if (var0) { + class319.field2798.clear(); + class74.method426(); + } + + return var1; + } + + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "856561238" + ) + static final void method1166() { + Client.packetWriter.close(); + class214.method1052(); + class10.scene.clear(); + + for (int var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0].clear(); + } + + Client.field422.method1134(); + System.gc(); + ItemComposition.method1088(0, 0); + class470.method2362(); + Client.playingJingle = false; + SoundCache.method228(); + DefaultsGroup.updateGameState(10); + } + + @ObfuscatedName("oh") @ObfuscatedSignature( - descriptor = "(B)Lnf;", - garbageValue = "-74" + descriptor = "(Lnm;I)Z", + garbageValue = "1332044592" ) - static JagNetThread method1122() { - return class308.field2819; + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; } } \ No newline at end of file diff --git a/osrs/src/main/java/ConcurrentMidiTask.java b/osrs/src/main/java/ConcurrentMidiTask.java index 7b72e5f5f..a18550e05 100644 --- a/osrs/src/main/java/ConcurrentMidiTask.java +++ b/osrs/src/main/java/ConcurrentMidiTask.java @@ -1,56 +1,81 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import java.util.ArrayList; -@ObfuscatedName("pe") +@ObfuscatedName("qz") @Implements("ConcurrentMidiTask") public class ConcurrentMidiTask extends SongTask { - @ObfuscatedName("au") - ArrayList field3725; + @ObfuscatedName("ac") + ArrayList field3756; @ObfuscatedSignature( - descriptor = "(Lpm;Ljava/util/ArrayList;)V" + descriptor = "(Lqm;Ljava/util/ArrayList;)V" ) public ConcurrentMidiTask(SongTask var1, ArrayList var2) { super(var1); - this.field3725 = var2; - super.field3722 = "ConcurrentMidiTask"; + this.field3756 = var2; + super.field3753 = "ConcurrentMidiTask"; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1604030758" + descriptor = "(B)Z", + garbageValue = "-90" ) + @Export("vmethod2142") public boolean vmethod2142() { - for (int var1 = 0; var1 < this.field3725.size(); ++var1) { - SongTask var2 = (SongTask)this.field3725.get(var1); + for (int var1 = 0; var1 < this.field3756.size(); ++var1) { + SongTask var2 = (SongTask)this.field3756.get(var1); if (var2 == null) { - this.field3725.remove(var1); + this.field3756.remove(var1); --var1; } else if (var2.vmethod2142()) { - if (var2.method2132()) { - this.method2138(var2.method2135()); - this.field3725.clear(); + if (var2.method2165()) { + this.method2170(var2.method2168()); + this.field3756.clear(); return true; } - if (var2.method2136() != null) { - this.field3725.add(var2.method2136()); + if (var2.method2169() != null) { + this.field3756.add(var2.method2169()); } - super.field3721 = var2.field3721; - this.field3725.remove(var1); + super.field3752 = var2.field3752; + this.field3756.remove(var1); --var1; } } - if (this.field3725.isEmpty()) { + if (this.field3756.isEmpty()) { return true; } else { return false; } } + + @ObfuscatedName("jf") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-495331166" + ) + static final void method2173() { + Client.field481 = 0; + int var0 = (TextureProvider.localPlayer.x >> 7) + class20.baseX; + int var1 = (TextureProvider.localPlayer.y >> 7) + class19.baseY; + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { + Client.field481 = 1; + } + + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { + Client.field481 = 1; + } + + if (Client.field481 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { + Client.field481 = 0; + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/Coord.java b/osrs/src/main/java/Coord.java index 3e2e09955..9801a5596 100644 --- a/osrs/src/main/java/Coord.java +++ b/osrs/src/main/java/Coord.java @@ -3,24 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("mo") @Implements("Coord") public class Coord { - @ObfuscatedName("aa") - @Export("SpriteBuffer_pixels") - static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("au") + @ObfuscatedName("ap") + public static short[] field2906; + @ObfuscatedName("ac") @Export("plane") public int plane; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("x") public int x; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lmc;)V" + descriptor = "(Lmo;)V" ) public Coord(Coord var1) { this.plane = var1.plane; @@ -45,24 +44,20 @@ public Coord(int var1) { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1852623783" + garbageValue = "2125169401" ) @Export("packed") public int packed() { - int var2 = this.plane; - int var3 = this.x; - int var4 = this.y; - int var1 = var2 << 28 | var3 << 14 | var4; - return var1; + return Player.method488(this.plane, this.x, this.y); } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lmc;B)Z", - garbageValue = "-109" + descriptor = "(Lmo;I)Z", + garbageValue = "467966647" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -75,10 +70,10 @@ boolean equalsCoord(Coord var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "1357161194" + garbageValue = "-211582088" ) @Export("toString") String toString(String var1) { diff --git a/osrs/src/main/java/DbRowType.java b/osrs/src/main/java/DbRowType.java index c2a9af279..4c01a3ad8 100644 --- a/osrs/src/main/java/DbRowType.java +++ b/osrs/src/main/java/DbRowType.java @@ -3,26 +3,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tc") +@ObfuscatedName("ug") @Implements("DbRowType") public class DbRowType extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) - static AbstractArchive field4116; - @ObfuscatedName("ae") + static AbstractArchive field4144; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("DBRowType_cache") static EvictingDualNodeHashTable DBRowType_cache; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("columnTypes") Object[][] columnTypes; - @ObfuscatedName("at") - int[][] field4117; - @ObfuscatedName("ac") + @ObfuscatedName("ax") + int[][] field4145; + @ObfuscatedName("ao") @Export("tableId") public int tableId; @@ -34,43 +34,43 @@ public class DbRowType extends DualNode { this.tableId = -1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "-1552202999" + descriptor = "(Lul;I)V", + garbageValue = "333466413" ) - void method2508(Buffer var1) { + void method2543(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method2510(var1, var2); + this.method2545(var1, var2); } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(II)[Ljava/lang/Object;", - garbageValue = "1717778174" + garbageValue = "-2125245982" ) @Export("getColumnType") public Object[] getColumnType(int var1) { return this.columnTypes == null ? null : this.columnTypes[var1]; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1262873215" + descriptor = "(Lul;IB)V", + garbageValue = "-103" ) - void method2510(Buffer var1, int var2) { + void method2545(Buffer var1, int var2) { if (var2 == 3) { int var3 = var1.readUnsignedByte(); if (this.columnTypes == null) { this.columnTypes = new Object[var3][]; - this.field4117 = new int[var3][]; + this.field4145 = new int[var3][]; } for (int var4 = var1.readUnsignedByte(); var4 != 255; var4 = var1.readUnsignedByte()) { @@ -81,20 +81,20 @@ void method2510(Buffer var1, int var2) { var6[var7] = var1.readUShortSmart(); } - this.columnTypes[var4] = KeyHandler.method88(var1, var6); - this.field4117[var4] = var6; + this.columnTypes[var4] = class495.method2415(var1, var6); + this.field4145[var4] = var6; } } else if (var2 == 4) { - this.tableId = var1.method2565(); + this.tableId = var1.packBytesToInt(); } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-55" + descriptor = "(I)V", + garbageValue = "1273272100" ) - void method2511() { + void method2546() { } } \ No newline at end of file diff --git a/osrs/src/main/java/DbTableType.java b/osrs/src/main/java/DbTableType.java index 26836e8c2..452c3b986 100644 --- a/osrs/src/main/java/DbTableType.java +++ b/osrs/src/main/java/DbTableType.java @@ -3,27 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tk") +@ObfuscatedName("uz") @Implements("DbTableType") public class DbTableType extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) - static AbstractArchive field4110; - @ObfuscatedName("ae") + static AbstractArchive field4138; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("DBTableType_cache") static EvictingDualNodeHashTable DBTableType_cache; - @ObfuscatedName("ap") - @Export("SpriteBuffer_spritePalette") - static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("types") public int[][] types; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("defaultValues") public Object[][] defaultValues; @@ -34,28 +31,28 @@ public class DbTableType extends DualNode { DbTableType() { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", + descriptor = "(Lul;B)V", garbageValue = "2" ) - void method2503(Buffer var1) { + void method2538(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method2504(var1, var2); + this.method2539(var1, var2); } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "-1215696705" + descriptor = "(Lul;II)V", + garbageValue = "-1635084839" ) - void method2504(Buffer var1, int var2) { + void method2539(Buffer var1, int var2) { if (var2 == 1) { int var3 = var1.readUnsignedByte(); if (this.types == null) { @@ -77,18 +74,18 @@ void method2504(Buffer var1, int var2) { this.defaultValues = new Object[this.types.length][]; } - this.defaultValues[var5] = KeyHandler.method88(var1, var7); + this.defaultValues[var5] = class495.method2415(var1, var7); } } } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2013883832" + garbageValue = "-1223582453" ) - void method2505() { + void method2540() { } } \ No newline at end of file diff --git a/osrs/src/main/java/Decimator.java b/osrs/src/main/java/Decimator.java index ab3e4457a..f218f46ee 100644 --- a/osrs/src/main/java/Decimator.java +++ b/osrs/src/main/java/Decimator.java @@ -3,90 +3,65 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.File; -import java.io.IOException; -import java.util.Date; -import java.util.Iterator; - -@ObfuscatedName("cx") +@ObfuscatedName("cg") @Implements("Decimator") public class Decimator { - @ObfuscatedName("wm") - static Iterator field296; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - @Export("Widget_archive") - public static AbstractArchive Widget_archive; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("inputRate") int inputRate; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("outputRate") int outputRate; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { - int var4 = var1; - int var5 = var2; - if (var2 > var1) { - var4 = var2; - var5 = var1; - } - - while (var5 != 0) { - int var6 = var4 % var5; - var4 = var5; - var5 = var6; - } - - var1 /= var4; - var2 /= var4; + int var3 = ModeWhere.method2011(var1, var2); + var1 /= var3; + var2 /= var3; this.inputRate = var1; this.outputRate = var2; this.table = new int[var1][14]; - for (int var7 = 0; var7 < var1; ++var7) { - int[] var8 = this.table[var7]; - double var9 = 6.0D + (double)var7 / (double)var1; - int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); - if (var11 < 0) { - var11 = 0; + for (int var4 = 0; var4 < var1; ++var4) { + int[] var5 = this.table[var4]; + double var6 = 6.0D + (double)var4 / (double)var1; + int var8 = (int)Math.floor(var6 - 7.0D + 1.0D); + if (var8 < 0) { + var8 = 0; } - int var12 = (int)Math.ceil(var9 + 7.0D); - if (var12 > 14) { - var12 = 14; + int var9 = (int)Math.ceil(var6 + 7.0D); + if (var9 > 14) { + var9 = 14; } - for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { - double var15 = ((double)var11 - var9) * 3.141592653589793D; - double var17 = var13; - if (var15 < -1.0E-4D || var15 > 1.0E-4D) { - var17 = var13 * (Math.sin(var15) / var15); + for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { + double var12 = 3.141592653589793D * ((double)var8 - var6); + double var14 = var10; + if (var12 < -1.0E-4D || var12 > 1.0E-4D) { + var14 = var10 * (Math.sin(var12) / var12); } - var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); - var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D); + var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); + var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D); } } } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([BS)[B", - garbageValue = "31853" + descriptor = "([BI)[B", + garbageValue = "-668170179" ) @Export("resample") byte[] resample(byte[] var1) { if (this.table != null) { - int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; + int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; int[] var3 = new int[var2]; int var4 = 0; int var5 = 0; @@ -98,7 +73,7 @@ byte[] resample(byte[] var1) { int var9; for (var9 = 0; var9 < 14; ++var9) { - var3[var9 + var4] += var7 * var8[var9]; + var3[var4 + var9] += var7 * var8[var9]; } var5 += this.outputRate; @@ -124,328 +99,81 @@ byte[] resample(byte[] var1) { return var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" + descriptor = "(II)I", + garbageValue = "470837923" ) @Export("scaleRate") int scaleRate(int var1) { if (this.table != null) { - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); + var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); } return var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "429071526" + garbageValue = "551468970" ) @Export("scalePosition") int scalePosition(int var1) { if (this.table != null) { - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; + var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; } return var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;Lsf;I)Lsf;", - garbageValue = "-738926216" + descriptor = "(Lom;I)V", + garbageValue = "1896465710" ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); - int var3; - if (var1 == null) { - var3 = WorldMapIcon_1.method1401(var2); - var1 = new IterableNodeHashTable(var3); - } - - for (var3 = 0; var3 < var2; ++var3) { - boolean var4 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); - } - - var1.put((Node)var6, (long)var5); - } - - return var1; + public static void method313(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; } - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Ltu;", - garbageValue = "1734618555" + descriptor = "(IIIII)V", + garbageValue = "-262215336" ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); - if (var3.exists()) { - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { - } - } + static final void method317(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { + for (int var5 = var0; var5 <= var0 + var2; ++var5) { + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { + Tiles.field835[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } - String var4 = ""; - if (JagexCache.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (JagexCache.cacheGamebuild == 34) { - var4 = "_wip"; - } + if (var0 + var2 == var5 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } - File var5 = new File(class36.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); - AccessFile var6; - if (!var2 && var5.exists()) { - try { - var6 = new AccessFile(var5, "rw", 10000L); - return var6; - } catch (IOException var8) { + if (var4 == var1 && var4 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } + + if (var3 + var1 == var4 && var4 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } + } } } - try { - var6 = new AccessFile(var3, "rw", 10000L); - return var6; - } catch (IOException var7) { - throw new RuntimeException(); - } } @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "88" - ) - static final boolean method312() { - return ViewportMouse.ViewportMouse_isInViewport; - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(Lnu;IB)Z", - garbageValue = "0" - ) - public static boolean method313(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - if (var2 == null) { - return false; - } else { - class137.SpriteBuffer_decode(var2); - return true; - } - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "-94" + descriptor = "(CI)Z", + garbageValue = "1378992941" ) - static int method315(int var0, Script var1, boolean var2) { - String var3; - int var4; - if (var0 == 4100) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } else { - String var9; - if (var0 == 4101) { - class137.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else if (var0 == 4102) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3 + class60.intToString(var4, true); - return 1; - } else if (var0 == 4103) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; - } else { - int var6; - int var10; - if (var0 == 4104) { - var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - long var11 = 86400000L * ((long)var10 + 11745L); - Interpreter.Interpreter_calendar.setTime(new Date(var11)); - var6 = Interpreter.Interpreter_calendar.get(5); - int var17 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; - return 1; - } else if (var0 != 4105) { - if (var0 == 4106) { - var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == 4107) { - class137.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ItemComposition.method1054(StudioGame.compareStrings(Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1], ClanChannelMember.clientLanguage)); - return 1; - } else { - int var5; - byte[] var13; - Font var14; - if (var0 == 4108) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - SoundCache.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var13 = Player.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); - return 1; - } else if (var0 == 4109) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - SoundCache.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var13 = Player.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); - return 1; - } else if (var0 == 4110) { - class137.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9; - } - - return 1; - } else if (var0 == 4111) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == 4112) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3 + (char)var4; - return 1; - } else if (var0 == 4113) { - var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4114) { - var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = WorldMapLabel.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4115) { - var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class200.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4116) { - var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class330.isDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4117) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 4118) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - SoundCache.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); - return 1; - } else if (var0 == 4119) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - StringBuilder var18 = new StringBuilder(var3.length()); - boolean var16 = false; - - for (var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if (var7 == '<') { - var16 = true; - } else if (var7 == '>') { - var16 = false; - } else if (!var16) { - var18.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var18.toString(); - return 1; - } else if (var0 == 4120) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.indexOf(var4); - return 1; - } else if (var0 == 4121) { - class137.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); - return 1; - } else if (var0 == 4122) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else if (var0 == 4123) { - class137.Interpreter_stringStackSize -= 3; - var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; - String var15 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 2]; - if (VarbitComposition.localPlayer.appearance == null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var15; - return 1; - } else { - switch(VarbitComposition.localPlayer.appearance.field2918) { - case 0: - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3; - break; - case 1: - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9; - break; - case 2: - default: - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var15; - } - - return 1; - } - } else { - return 2; - } - } - } else { - class137.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; - if (VarbitComposition.localPlayer.appearance != null && VarbitComposition.localPlayer.appearance.field2916 != 0) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var9; - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3; - } - - return 1; - } - } - } + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } } \ No newline at end of file diff --git a/osrs/src/main/java/DefaultsGroup.java b/osrs/src/main/java/DefaultsGroup.java index 38b93dfc9..15d00e73d 100644 --- a/osrs/src/main/java/DefaultsGroup.java +++ b/osrs/src/main/java/DefaultsGroup.java @@ -6,20 +6,120 @@ @ObfuscatedName("rh") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "Lrh;" ) - static final DefaultsGroup field3844; - @ObfuscatedName("ae") + static final DefaultsGroup field3874; + @ObfuscatedName("al") @Export("group") final int group; static { - field3844 = new DefaultsGroup(3); + field3874 = new DefaultsGroup(3); } DefaultsGroup(int var1) { this.group = var1; } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IB)Lhj;", + garbageValue = "-1" + ) + public static HealthBarDefinition method2315(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.NpcDefinition_cachedModels.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); + var1 = new HealthBarDefinition(); + var1.field1559 = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.NpcDefinition_cachedModels.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1882017485" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 30) { + Client.field422.method1134(); + } + + if (Client.gameState == 0) { + class159.client.method161(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { + class409.method2106(0); + Client.field444 = 0; + Client.field448 = 0; + Client.timer.method2184(var0); + if (var0 != 20) { + UserComparator6.method690(false); + } + } + + if (var0 != 20 && var0 != 40 && class11.field33 != null) { + class11.field33.close(); + class11.field33 = null; + } + + if (Client.gameState == 25) { + Client.field453 = 0; + Client.field454 = 0; + Client.field456 = 1; + Client.field455 = 0; + Client.field452 = 1; + } + + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + int var3 = Client.gameState == 11 ? 4 : 0; + ScriptEvent.method471(class190.archive10, class199.archive8, false, var3); + } else if (var0 == 11) { + ScriptEvent.method471(class190.archive10, class199.archive8, false, 4); + } else if (var0 == 50) { + AbstractWorldMapIcon.setLoginResponseString("", "Updating date of birth...", ""); + ScriptEvent.method471(class190.archive10, class199.archive8, false, 7); + } else if (Login.clearLoginScreen) { + Login.titleboxSprite = null; + VarcInt.titlebuttonSprite = null; + Login.runesSprite = null; + PcmPlayer.leftTitleSprite = null; + Login.rightTitleSprite = null; + Login.logoSprite = null; + Login.title_muteSprite = null; + class519.options_buttons_0Sprite = null; + class534.options_buttons_2Sprite = null; + SecureRandomCallable.worldSelectBackSprites = null; + PendingSpawn.worldSelectFlagSprites = null; + ModelData0.worldSelectArrows = null; + TaskHandler.worldSelectStars = null; + Varcs.field1138 = null; + class544.field4278.method527(); + ItemComposition.method1088(0, 100); + class13.method45().method1961(true); + Login.clearLoginScreen = false; + } + } else { + boolean var1 = class91.clientPreferences.method560() >= Client.param21; + int var2 = var1 ? 0 : 12; + ScriptEvent.method471(class190.archive10, class199.archive8, true, var2); + } + + Client.gameState = var0; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/DelayFadeTask.java b/osrs/src/main/java/DelayFadeTask.java index ef894cfce..4a6935942 100644 --- a/osrs/src/main/java/DelayFadeTask.java +++ b/osrs/src/main/java/DelayFadeTask.java @@ -1,34 +1,34 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pn") +@ObfuscatedName("qb") @Implements("DelayFadeTask") public class DelayFadeTask extends SongTask { - @ObfuscatedName("ag") - static String[] field3712; - @ObfuscatedName("au") - long field3714; - @ObfuscatedName("ae") - int field3713; + @ObfuscatedName("ac") + long field3745; + @ObfuscatedName("al") + int field3744; @ObfuscatedSignature( - descriptor = "(Lpm;I)V" + descriptor = "(Lqm;I)V" ) public DelayFadeTask(SongTask var1, int var2) { super(var1); - this.field3713 = var2; - super.field3722 = "DelayFadeTask"; + this.field3744 = var2; + super.field3753 = "DelayFadeTask"; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1604030758" + descriptor = "(B)Z", + garbageValue = "-90" ) + @Export("vmethod2142") public boolean vmethod2142() { - if (this.field3714 < (long)this.field3713) { - ++this.field3714; + if (this.field3745 < (long)this.field3744) { + ++this.field3745; return false; } else { return true; diff --git a/osrs/src/main/java/DemotingHashTable.java b/osrs/src/main/java/DemotingHashTable.java index 7889f4673..00a11d904 100644 --- a/osrs/src/main/java/DemotingHashTable.java +++ b/osrs/src/main/java/DemotingHashTable.java @@ -3,32 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("ls") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("capacity") int capacity; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("remaining") int remaining; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lsf;" + descriptor = "Ltp;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lou;" + descriptor = "Lpt;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Llo;" ) - class284 field2485; + class298 field2501; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); @@ -46,7 +46,7 @@ public DemotingHashTable(int var1) { this(var1, var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); @@ -77,16 +77,16 @@ public Object get(long var1) { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); this.removeWrapper(var3); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Llo;)V" + descriptor = "(Llb;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -98,12 +98,12 @@ void removeWrapper(Wrapper var1) { } - @ObfuscatedName("at") - public void method1593(Object var1, long var2) { + @ObfuscatedName("ax") + public void method1620(Object var1, long var2) { this.put(var1, var2, 1); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("put") public void put(Object var1, long var2, int var4) { this.remove(var2); @@ -119,8 +119,8 @@ public void put(Object var1, long var2, int var4) { } this.removeWrapper(var5); - if (this.field2485 != null) { - this.field2485.method1589(var5.get()); + if (this.field2501 != null) { + this.field2501.method1616(var5.get()); } } @@ -130,7 +130,7 @@ public void put(Object var1, long var2, int var4) { var6.keyDual = 0L; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { @@ -151,7 +151,7 @@ public void demote(int var1) { } - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("clear") public void clear() { this.queue.clear(); diff --git a/osrs/src/main/java/DesktopPlatformInfoProvider.java b/osrs/src/main/java/DesktopPlatformInfoProvider.java index a07796a9a..c786292c9 100644 --- a/osrs/src/main/java/DesktopPlatformInfoProvider.java +++ b/osrs/src/main/java/DesktopPlatformInfoProvider.java @@ -3,29 +3,29 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sw") +@ObfuscatedName("sn") @Implements("DesktopPlatformInfoProvider") -public class DesktopPlatformInfoProvider implements class475 { - @ObfuscatedName("at") - int field3928; - @ObfuscatedName("ac") - int field3926; - @ObfuscatedName("ai") - int field3927; +public class DesktopPlatformInfoProvider implements class490 { + @ObfuscatedName("ax") + int field3959; + @ObfuscatedName("ao") + int field3958; + @ObfuscatedName("ah") + int field3957; - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(S)Lsm;", - garbageValue = "256" + descriptor = "(I)Lsx;", + garbageValue = "-2060739021" ) @Export("get") public PlatformInfo get() { byte var1; - if (Messages.field1146.startsWith("win")) { + if (class223.field1863.startsWith("win")) { var1 = 1; - } else if (Messages.field1146.startsWith("mac")) { + } else if (class223.field1863.startsWith("mac")) { var1 = 2; - } else if (Messages.field1146.startsWith("linux")) { + } else if (class223.field1863.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -123,11 +123,11 @@ public PlatformInfo get() { var8 = 4; } - this.method2358(var5); + this.method2396(var5); boolean var9 = false; int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; int var11; - if (this.field3928 > 3) { + if (this.field3959 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; @@ -149,53 +149,53 @@ public PlatformInfo get() { String var25 = ""; String var26 = ""; boolean var27 = false; - return new PlatformInfo(var1, var28, var7, var8, this.field3928, this.field3926, this.field3927, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "", ""); + return new PlatformInfo(var1, var28, var7, var8, this.field3959, this.field3958, this.field3957, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "", ""); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "10" + garbageValue = "39" ) - void method2358(String var1) { + void method2396(String var1) { if (var1.startsWith("1.")) { - this.method2359(var1); + this.method2397(var1); } else { - this.method2360(var1); + this.method2398(var1); } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "133401339" + garbageValue = "-982803931" ) - void method2359(String var1) { + void method2397(String var1) { String[] var2 = var1.split("\\."); try { - this.field3928 = Integer.parseInt(var2[1]); + this.field3959 = Integer.parseInt(var2[1]); var2 = var2[2].split("_"); - this.field3926 = Integer.parseInt(var2[0]); - this.field3927 = Integer.parseInt(var2[1]); + this.field3958 = Integer.parseInt(var2[0]); + this.field3957 = Integer.parseInt(var2[1]); } catch (Exception var4) { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1874487348" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "86" ) - void method2360(String var1) { + void method2398(String var1) { String[] var2 = var1.split("\\."); try { - this.field3928 = Integer.parseInt(var2[0]); - this.field3926 = Integer.parseInt(var2[1]); - this.field3927 = Integer.parseInt(var2[2]); + this.field3959 = Integer.parseInt(var2[0]); + this.field3958 = Integer.parseInt(var2[1]); + this.field3957 = Integer.parseInt(var2[2]); } catch (Exception var4) { } diff --git a/osrs/src/main/java/DevicePcmPlayer.java b/osrs/src/main/java/DevicePcmPlayer.java index d25121fd9..efacc7bf5 100644 --- a/osrs/src/main/java/DevicePcmPlayer.java +++ b/osrs/src/main/java/DevicePcmPlayer.java @@ -9,52 +9,52 @@ import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; -@ObfuscatedName("aw") +@ObfuscatedName("af") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("format") AudioFormat format; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("line") SourceDataLine line; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("capacity2") int capacity2; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1766369380" + garbageValue = "1058566109" ) @Export("init") - protected void init() { - this.format = new AudioFormat((float)PcmPlayer.field181, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); - this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; + public void init() { + this.format = new AudioFormat((float)PcmPlayer.field179, 16, class306.PcmPlayer_stereo ? 2 : 1, true, false); + this.byteSamples = new byte[256 << (class306.PcmPlayer_stereo ? 2 : 1)]; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-83" + garbageValue = "1" ) @Export("open") - protected void open(int var1) throws LineUnavailableException { + public void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (class306.PcmPlayer_stereo ? 2 : 1)); this.line = (SourceDataLine)AudioSystem.getLine(var2); this.line.open(); this.line.start(); this.capacity2 = var1; } catch (LineUnavailableException var3) { - if (PacketBufferNode.method1609(var1) != 1) { - this.open(WorldMapIcon_1.method1401(var1)); + if (WorldMapLabel.method1569(var1) != 1) { + this.open(EnumComposition.method999(var1)); } else { this.line = null; throw var3; @@ -62,21 +62,21 @@ protected void open(int var1) throws LineUnavailableException { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1982834691" + garbageValue = "-325041005" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); + return this.capacity2 - (this.line.available() >> (class306.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("write") protected void write() { int var1 = 256; - if (PcmPlayer.PcmPlayer_stereo) { + if (class306.PcmPlayer_stereo) { var1 <<= 1; } @@ -93,10 +93,10 @@ protected void write() { this.line.write(this.byteSamples, 0, var1 << 1); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1874015336" + descriptor = "(S)V", + garbageValue = "3331" ) @Export("close") protected void close() { @@ -107,10 +107,10 @@ protected void close() { } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "54" + garbageValue = "0" ) @Export("discard") protected void discard() { diff --git a/osrs/src/main/java/DevicePcmPlayerProvider.java b/osrs/src/main/java/DevicePcmPlayerProvider.java index 2224c693b..2ab108f24 100644 --- a/osrs/src/main/java/DevicePcmPlayerProvider.java +++ b/osrs/src/main/java/DevicePcmPlayerProvider.java @@ -3,116 +3,220 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aj") +@ObfuscatedName("az") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements class51 { + @ObfuscatedName("ak") + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("az") + @Export("userHomeDirectory") + static String userHomeDirectory; + DevicePcmPlayerProvider() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)Lbb;", - garbageValue = "74" + descriptor = "(S)Lbu;", + garbageValue = "25906" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II)Lub;", - garbageValue = "13212181" + descriptor = "(CI)Z", + garbageValue = "-2139426983" ) - public static PrivateChatMode method74(int var0) { - PrivateChatMode[] var1 = BufferedNetSocket.method2261(); + static final boolean method82(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; + } - for (int var2 = 0; var2 < var1.length; ++var2) { - PrivateChatMode var3 = var1[var2]; - if (var0 == var3.id) { - return var3; - } + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lfz;FB)F", + garbageValue = "-61" + ) + static float method84(class132 var0, float var1) { + if (var0 == null) { + return 0.0F; + } else { + float var2 = var1 - var0.field1247; + return var2 * (var2 * (var0.field1249 + var2 * var0.field1244) + var0.field1242) + var0.field1240; } - - return null; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZB)I", - garbageValue = "-2" + descriptor = "(Lcv;Lcv;IZIZI)I", + garbageValue = "-1939338222" ) - public static int method75(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - throw new NumberFormatException(); - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - throw new NumberFormatException(); - } - - if (var3) { - var10 = -var10; - } - - int var9 = var10 + var5 * var1; - if (var9 / var1 != var5) { - throw new NumberFormatException(); - } - - var5 = var9; - var4 = true; - } - - if (!var4) { - throw new NumberFormatException(); - } else { - return var5; - } + static int method83(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = class64.compareWorlds(var0, var1, var2, var3); + if (var6 != 0) { + return var3 ? -var6 : var6; + } else if (var4 == -1) { + return 0; } else { - throw new IllegalArgumentException("" + var1); + int var7 = class64.compareWorlds(var0, var1, var4, var5); + return var5 ? -var7 : var7; } } - @ObfuscatedName("kg") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "41" + descriptor = "(I)Lcv;", + garbageValue = "-784805347" ) - static final void method76(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field408[var4] = true; + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? UserComparator3.World_worlds[++World.World_listCount - 1] : null; + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(ILds;ZB)I", + garbageValue = "124" + ) + static int method86(int var0, Script var1, boolean var2) { + Widget var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var0 == 2600) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == 2601) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == 2602) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == 2603) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == 2604) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == 2605) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == 2606) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == 2607) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == 2608) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == 2609) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 2610) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == 2611) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == 2612) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 2613) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == 2614) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + class339 var4; + if (var0 == 2617) { + var4 = var3.method1878(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2923 * -1501316877 * 383918139 : 0; } - } + if (var0 == 2618) { + var4 = var3.method1878(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2925 * 1245217763 * 1917639115 : 0; + return 1; + } else { + class344 var7; + if (var0 == 2619) { + var7 = var3.method1877(); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1812().method2070() : ""; + return 1; + } else if (var0 == 2620) { + var4 = var3.method1878(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2924 * 1697101243 * 2044708723 : 0; + return 1; + } else if (var0 == 2621) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1822() : 0; + return 1; + } else if (var0 == 2622) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1823() : 0; + return 1; + } else if (var0 == 2623) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1824() : 0; + return 1; + } else if (var0 == 2624) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1814() ? 1 : 0; + return 1; + } else if (var0 != 2625) { + if (var0 == 2626) { + var7 = var3.method1877(); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1813().method2145() : ""; + return 1; + } else if (var0 == 2627) { + var7 = var3.method1877(); + int var5 = var7 != null ? var7.method1818() : 0; + int var6 = var7 != null ? var7.method1817() : 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.min(var5, var6); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.max(var5, var6); + return 1; + } else if (var0 == 2628) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1817() : 0; + return 1; + } else if (var0 == 2629) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1826() : 0; + return 1; + } else if (var0 == 2630) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1825() : 0; + return 1; + } else if (var0 == 2631) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1827() : 0; + return 1; + } else if (var0 == 2632) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1828() : 0; + return 1; + } else { + class27 var8; + if (var0 == 2633) { + var8 = var3.method1879(); + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method105(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; + return 1; + } else if (var0 == 2634) { + var8 = var3.method1879(); + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method106((char)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; + return 1; + } else { + return 2; + } + } + } else { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1815() ? 1 : 0; + return 1; + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/DirectByteArrayCopier.java b/osrs/src/main/java/DirectByteArrayCopier.java index 55cfde764..cc8ebd525 100644 --- a/osrs/src/main/java/DirectByteArrayCopier.java +++ b/osrs/src/main/java/DirectByteArrayCopier.java @@ -5,17 +5,17 @@ import java.nio.ByteBuffer; -@ObfuscatedName("ms") +@ObfuscatedName("nh") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-962589916" + garbageValue = "1381422717" ) @Export("get") byte[] get() { @@ -25,10 +25,10 @@ byte[] get() { return var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1426025249" + garbageValue = "-2137536013" ) @Export("set") public void set(byte[] var1) { @@ -37,36 +37,70 @@ public void set(byte[] var1) { this.directBuffer.put(var1); } - @ObfuscatedName("ao") + @ObfuscatedName("ld") @ObfuscatedSignature( - descriptor = "(Ltm;I)Ljava/lang/String;", - garbageValue = "1088330937" + descriptor = "(Ldj;IIIB)V", + garbageValue = "8" ) - @Export("readString") - public static String readString(Buffer var0) { - return class155.method826(var0, 32767); - } + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (TextureProvider.localPlayer != var0) { + if (Client.menuOptionsCount < 400) { + String var4; + if (var0.skillLevel == 0) { + var4 = var0.actions[0] + var0.username + var0.actions[1] + WidgetDefinition.method1745(var0.combatLevel, TextureProvider.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; + } - @ObfuscatedName("la") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "625731844" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = SoundCache.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - WorldMapSection1.runScriptEvent(var5); - } + int var5; + if (Client.isItemSelected == 1) { + class153.insertMenuItemNoShift("Use", Client.field598 + " " + "->" + " " + Client.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((class31.field82 & 8) == 8) { + class153.insertMenuItemNoShift(Client.field599, Client.field600 + " " + "->" + " " + Client.colorStartTag(16777215) + var4, 15, var1, var2, var3); + } + } else { + for (var5 = 7; var5 >= 0; --var5) { + if (Client.playerMenuActions[var5] != null) { + short var6 = 0; + if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { + continue; + } + + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > TextureProvider.localPlayer.combatLevel) { + var6 = 2000; + } - Client.selectedSpellItemId = var3; - Client.isSpellSelected = true; - ModeWhere.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - Canvas.selectedSpellFlags = var2; - class218.invalidateWidget(var4); + if (TextureProvider.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == TextureProvider.localPlayer.team) { + var6 = 2000; + } else { + var6 = 0; + } + } else if (Client.playerAttackOption == AttackOption.field1102 && var0.isClanMember()) { + var6 = 2000; + } + } else if (Client.playerOptionsPriorities[var5]) { + var6 = 2000; + } + + boolean var7 = false; + int var8 = Client.playerMenuOpcodes[var5] + var6; + class153.insertMenuItemNoShift(Client.playerMenuActions[var5], Client.colorStartTag(16777215) + var4, var8, var1, var2, var3); + } + } + } + + for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (Client.menuOpcodes[var5] == 23) { + Client.menuTargets[var5] = Client.colorStartTag(16777215) + var4; + break; + } + } + + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/DirectWrapper.java b/osrs/src/main/java/DirectWrapper.java index 15bb5f6df..8079941ac 100644 --- a/osrs/src/main/java/DirectWrapper.java +++ b/osrs/src/main/java/DirectWrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lu") +@ObfuscatedName("lz") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("get") Object get() { return this.obj; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("isSoft") boolean isSoft() { return false; diff --git a/osrs/src/main/java/DualNode.java b/osrs/src/main/java/DualNode.java index dbd473d6d..b7fe0a804 100644 --- a/osrs/src/main/java/DualNode.java +++ b/osrs/src/main/java/DualNode.java @@ -3,26 +3,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sq") +@ObfuscatedName("sb") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("ej") + @ObfuscatedName("ei") @Export("keyDual") public long keyDual; - @ObfuscatedName("ea") + @ObfuscatedName("ex") @ObfuscatedSignature( - descriptor = "Lsq;" + descriptor = "Lsb;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("er") + @ObfuscatedName("ek") @ObfuscatedSignature( - descriptor = "Lsq;" + descriptor = "Lsb;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("ex") + @ObfuscatedName("fs") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { diff --git a/osrs/src/main/java/DualNodeDeque.java b/osrs/src/main/java/DualNodeDeque.java index 9abd5539d..262a42991 100644 --- a/osrs/src/main/java/DualNodeDeque.java +++ b/osrs/src/main/java/DualNodeDeque.java @@ -3,12 +3,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("os") +@ObfuscatedName("pl") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lsq;" + descriptor = "Lsb;" ) @Export("sentinel") DualNode sentinel; @@ -19,11 +19,11 @@ public DualNodeDeque() { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lsq;)V" + descriptor = "(Lsb;)V" ) - public void method1984(DualNode var1) { + public void method2015(DualNode var1) { if (var1.nextDual != null) { var1.removeDual(); } @@ -34,11 +34,11 @@ public void method1984(DualNode var1) { var1.previousDual.nextDual = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lsq;)V" + descriptor = "(Lsb;)V" ) - public void method1985(DualNode var1) { + public void method2016(DualNode var1) { if (var1.nextDual != null) { var1.removeDual(); } @@ -49,9 +49,9 @@ public void method1985(DualNode var1) { var1.previousDual.nextDual = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "()Lsq;" + descriptor = "()Lsb;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/osrs/src/main/java/DynamicObject.java b/osrs/src/main/java/DynamicObject.java index 77df1db7e..fb91fbca3 100644 --- a/osrs/src/main/java/DynamicObject.java +++ b/osrs/src/main/java/DynamicObject.java @@ -3,42 +3,45 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dj") +import java.util.LinkedList; +import java.util.List; + +@ObfuscatedName("dx") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("id") int id; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("type") int type; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("orientation") int orientation; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("plane") int plane; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("x") int x; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("y") int y; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "Lif;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("frame") int frame; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLik;)V" + descriptor = "(IIIIIIIZLjy;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; @@ -48,7 +51,7 @@ public class DynamicObject extends Renderable { this.x = var5; this.y = var6; if (var7 != -1) { - this.sequenceDefinition = EnumComposition.SequenceDefinition_get(var7); + this.sequenceDefinition = class36.SequenceDefinition_get(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; if (this.sequenceDefinition.replyMode == 0 && var9 != null && var9 instanceof DynamicObject) { @@ -65,17 +68,17 @@ public class DynamicObject extends Renderable { this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); } else { - this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method1085()); + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method1127()); } } } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljr;", - garbageValue = "798227647" + descriptor = "(B)Ljn;", + garbageValue = "0" ) @Export("getModel") protected final Model getModel() { @@ -87,7 +90,7 @@ protected final Model getModel() { } if (this.sequenceDefinition.isCachedModelIdSet()) { - var2 = this.sequenceDefinition.method1085(); + var2 = this.sequenceDefinition.method1127(); this.frame += var1; var1 = 0; if (this.frame >= var2) { @@ -97,11 +100,11 @@ protected final Model getModel() { } } } else { - label70: { + label69: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { - break label70; + break label69; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; @@ -118,7 +121,7 @@ protected final Model getModel() { this.cycleStart = Client.cycle - var1; } - ObjectComposition var12 = WorldMapElement.getObjectDefinition(this.id); + ObjectComposition var12 = class91.getObjectDefinition(this.id); if (var12.transforms != null) { var12 = var12.transform(); } @@ -140,56 +143,211 @@ protected final Model getModel() { int var6 = (var3 >> 1) + this.y; int var7 = (var3 + 1 >> 1) + this.y; int[][] var8 = Tiles.Tiles_heights[this.plane]; - int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2; + int var9 = var8[var5][var7] + var8[var5][var6] + var8[var4][var6] + var8[var4][var7] >> 2; int var10 = (this.x << 7) + (var2 << 6); int var11 = (this.y << 7) + (var3 << 6); return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } } - @ObfuscatedName("ae") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "43" + descriptor = "(ILds;ZI)I", + garbageValue = "-1342712165" ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; - } - } + static int method451(int var0, Script var1, boolean var2) { + int var3; + int var5; + int var7; + Object var21; + class521 var22; + if (var0 != 7500 && var0 != 7508) { + if (var0 != 7501) { + int var4; + int var6; + if (var0 == 7502) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = AbstractArchive.method1931(var4); + var7 = VarbitComposition.method1046(var4); + int var8 = HealthBar.method571(var4); + DbRowType var23 = class180.getDbRowType(var3); + DbTableType var24 = ZoneOperation.getDbTableType(var6); + int[] var25 = var24.types[var7]; + int var12 = 0; + int var13 = var25.length; + if (var8 >= 0) { + if (var8 >= var13) { + throw new RuntimeException("Tuple index out-of-bounds. Requested: " + var8 + ", Max: " + var13); + } - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-173700764" - ) - static int method450(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - if (var0 == 1700) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == 1701) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.itemQuantity; + var12 = var8; + var13 = var8 + 1; + } + + Object[] var14 = var23.getColumnType(var7); + if (var14 == null && var24.defaultValues != null) { + var14 = var24.defaultValues[var7]; + } + + int var15; + int var16; + if (var14 == null) { + for (var15 = var12; var15 < var13; ++var15) { + var16 = var25[var15]; + class517 var17 = Tile.method1230(var16); + if (var17 == class517.field4130) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class360.method1902(var16); + } + } + + return 1; + } else { + var15 = var14.length / var25.length; + if (var5 >= 0 && var5 < var15) { + for (var16 = var12; var16 < var13; ++var16) { + int var19 = var16 + var25.length * var5; + class517 var18 = Tile.method1230(var25[var16]); + if (var18 == class517.field4130) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = (String)var14[var19]; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (Integer)var14[var19]; + } + } + + return 1; + } else { + throw new RuntimeException(); + } + } + } else if (var0 == 7503) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = 0; + var6 = AbstractArchive.method1931(var4); + var7 = VarbitComposition.method1046(var4); + DbRowType var26 = class180.getDbRowType(var3); + DbTableType var9 = ZoneOperation.getDbTableType(var6); + int[] var10 = var9.types[var7]; + Object[] var11 = var26.getColumnType(var7); + if (var11 == null && var9.defaultValues != null) { + var11 = var9.defaultValues[var7]; + } + + if (var11 != null) { + var5 = var11.length / var10.length; + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; + return 1; + } else if (var0 != 7504 && var0 != 7510) { + if (var0 == 7505) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + DbRowType var28 = class180.getDbRowType(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var28.tableId; + return 1; + } else if (var0 == 7506) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = -1; + if (class130.field1220 != null && var3 >= 0 && var3 < class130.field1220.size()) { + var4 = (Integer)class130.field1220.get(var3); + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; + return 1; + } else if (var0 != 7507 && var0 != 7509) { + return 2; + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var21 = GrandExchangeOfferOwnWorldComparator.method349(var3); + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var22 = SoundCache.method235(var5); + if (var22 == null) { + throw new RuntimeException(); + } else if (AbstractArchive.method1931(var5) != Client.field547) { + throw new RuntimeException(); + } else if (class130.field1220 == null && class130.field1220.isEmpty()) { + throw new RuntimeException(); + } else { + var7 = HealthBar.method571(var5); + List var20 = var22.method2542(var21, var7); + class130.field1220 = new LinkedList(class130.field1220); + if (var20 != null) { + class130.field1220.retainAll(var20); + } else { + class130.field1220.clear(); + } + + class481.field3944 = class130.field1220.iterator(); + if (var0 == 7507) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class130.field1220.size(); + } + + return 1; + } + } + } else { + --Interpreter.Interpreter_intStackSize; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + class521 var27 = class223.method1131(var3); + if (var27 == null) { + throw new RuntimeException(); + } else { + class130.field1220 = var27.method2542(0, 0); + var5 = 0; + if (class130.field1220 != null) { + Client.field547 = var3; + class481.field3944 = class130.field1220.iterator(); + var5 = class130.field1220.size(); + } + + if (var0 == 7504) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; + } + + return 1; + } + } } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } + if (class481.field3944 != null && class481.field3944.hasNext()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (Integer)class481.field3944.next(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } - return 1; - } else if (var0 == 1702) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; - } else if (var0 == 1707) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.method1834() ? 1 : 0; - return 1; - } else if (var0 == 1708) { - return WorldMapDecoration.method1530(var3); + return 1; + } } else { - return var0 == 1709 ? class390.method2030(var3) : 2; + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var21 = GrandExchangeOfferOwnWorldComparator.method349(var3); + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var22 = SoundCache.method235(var5); + if (var22 == null) { + throw new RuntimeException(); + } else { + var7 = HealthBar.method571(var5); + class130.field1220 = var22.method2542(var21, var7); + if (class130.field1220 != null) { + Client.field547 = AbstractArchive.method1931(var5); + class481.field3944 = class130.field1220.iterator(); + if (var0 == 7500) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class130.field1220.size(); + } + } else { + Client.field547 = -1; + class481.field3944 = null; + if (var0 == 7500) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + } + + return 1; + } } } } \ No newline at end of file diff --git a/osrs/src/main/java/EnumComposition.java b/osrs/src/main/java/EnumComposition.java index bcf02ba58..777432e78 100644 --- a/osrs/src/main/java/EnumComposition.java +++ b/osrs/src/main/java/EnumComposition.java @@ -3,43 +3,49 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("ht") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("EnumDefinition_archive") - public static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("ae") + static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("EnumDefinition_cached") - static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("ao") + public static EvictingDualNodeHashTable EnumDefinition_cached; + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "[Lud;" + ) + @Export("crossSprites") + static SpritePixels[] crossSprites; + @ObfuscatedName("ak") @Export("inputType") public char inputType; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("outputType") public char outputType; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("defaultInt") public int defaultInt; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("outputCount") public int outputCount; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("keys") public int[] keys; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("intVals") public int[] intVals; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("strVals") public String[] strVals; @@ -52,10 +58,10 @@ public class EnumComposition extends DualNode { this.outputCount = 0; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "-388021324" + descriptor = "(Lul;B)V", + garbageValue = "72" ) @Export("decode") void decode(Buffer var1) { @@ -69,10 +75,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "-227336783" + descriptor = "(Lul;IB)V", + garbageValue = "101" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -109,36 +115,115 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "55" + garbageValue = "0" ) @Export("size") public int size() { return this.outputCount; } + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "164767930" + ) + public static int method999(int var0) { + --var0; + var0 |= var0 >>> 1; + var0 |= var0 >>> 2; + var0 |= var0 >>> 4; + var0 |= var0 >>> 8; + var0 |= var0 >>> 16; + return var0 + 1; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;B)I", + garbageValue = "-124" + ) + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + Actor.charToByteCp1252(var0.charAt(var3)); + } + + return var2; + } + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)Lib;", - garbageValue = "2100193586" + descriptor = "(IIII)I", + garbageValue = "-1375573031" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static final int method1001(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; + } + + if (var2 > 192) { + var1 /= 2; + } + + if (var2 > 217) { + var1 /= 2; + } + + if (var2 > 243) { + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; + } + + @ObfuscatedName("nm") + @ObfuscatedSignature( + descriptor = "(Lnm;B)Z", + garbageValue = "1" + ) + static final boolean method1002(Widget var0) { + int var1 = var0.contentType; + if (var1 == 205) { + Client.logoutTimer = 250; + return true; } else { - byte[] var2 = UserComparator2.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { + var2 = (var1 - 300) / 2; + var3 = var1 & 1; + Client.playerAppearance.changeAppearance(var2, var3 == 1); + } + + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method1753(var2, var3 == 1); } - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; + if (var1 == 324) { + Client.playerAppearance.method1754(0); + } + + if (var1 == 325) { + Client.playerAppearance.method1754(1); + } + + if (var1 == 326) { + PacketBufferNode var4 = ClanChannelMember.getPacketBufferNode(ClientPacket.f9, Client.packetWriter.isaacCipher); + Client.playerAppearance.write(var4.packetBuffer); + Client.packetWriter.addNode(var4); + return true; + } else { + return false; + } } } } \ No newline at end of file diff --git a/osrs/src/main/java/EvictingDualNodeHashTable.java b/osrs/src/main/java/EvictingDualNodeHashTable.java index bc56c154a..20e913c20 100644 --- a/osrs/src/main/java/EvictingDualNodeHashTable.java +++ b/osrs/src/main/java/EvictingDualNodeHashTable.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("lr") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lsq;" + descriptor = "Lsb;" ) @Export("dualNode") DualNode dualNode; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("capacity") int capacity; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lsf;" + descriptor = "Ltp;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lou;" + descriptor = "Lpt;" ) @Export("deque") IterableDualNodeQueue deque; @@ -44,9 +44,9 @@ public EvictingDualNodeHashTable(int var1) { this.hashTable = new IterableNodeHashTable(var2); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(J)Lsq;" + descriptor = "(J)Lsb;" ) @Export("get") public DualNode get(long var1) { @@ -58,7 +58,7 @@ public DualNode get(long var1) { return var3; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); @@ -70,9 +70,9 @@ public void remove(long var1) { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lsq;J)V" + descriptor = "(Lsb;J)V" ) @Export("put") public void put(DualNode var1, long var2) { @@ -93,7 +93,7 @@ public void put(DualNode var1, long var2) { this.deque.add(var1); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("clear") public void clear() { this.deque.clear(); diff --git a/osrs/src/main/java/FaceNormal.java b/osrs/src/main/java/FaceNormal.java index d3bfed12c..124a4cdcd 100644 --- a/osrs/src/main/java/FaceNormal.java +++ b/osrs/src/main/java/FaceNormal.java @@ -1,20 +1,31 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("jv") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("x") int x; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("y") int y; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("z") int z; FaceNormal() { } + + @ObfuscatedName("mo") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2079902231" + ) + static final int method1334() { + float var0 = 200.0F * ((float)class91.clientPreferences.getBrightness() - 0.5F); + return 100 - Math.round(var0); + } } \ No newline at end of file diff --git a/osrs/src/main/java/FadeInTask.java b/osrs/src/main/java/FadeInTask.java index 01c622a4e..32b8089eb 100644 --- a/osrs/src/main/java/FadeInTask.java +++ b/osrs/src/main/java/FadeInTask.java @@ -3,102 +3,104 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pt") +import java.io.IOException; + +@ObfuscatedName("qg") @Implements("FadeInTask") public class FadeInTask extends SongTask { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmv;" ) - MusicSong field3719; - @ObfuscatedName("ae") - int field3718; + MusicSong field3749; + @ObfuscatedName("al") + int field3748; @ObfuscatedSignature( - descriptor = "(Lpm;IZI)V" + descriptor = "(Lqm;IZI)V" ) public FadeInTask(SongTask var1, int var2, boolean var3, int var4) { super(var1); - this.field3719 = null; - this.field3718 = 0; - super.field3722 = "FadeInTask"; + this.field3749 = null; + this.field3748 = 0; + super.field3753 = "FadeInTask"; if (var2 >= 0) { - if (var3 && var2 < class305.field2774.size()) { - this.field3719 = (MusicSong)class305.field2774.get(var2); - } else if (!var3 && var2 < class305.musicSongs.size()) { - this.field3719 = (MusicSong)class305.musicSongs.get(var2); + if (var3 && var2 < class319.field2791.size()) { + this.field3749 = (MusicSong)class319.field2791.get(var2); + } else if (!var3 && var2 < class319.musicSongs.size()) { + this.field3749 = (MusicSong)class319.musicSongs.get(var2); } - this.field3718 = var4; + this.field3748 = var4; } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1604030758" + descriptor = "(B)Z", + garbageValue = "-90" ) + @Export("vmethod2142") public boolean vmethod2142() { - if (this.field3719 != null && this.field3719.midiPcmStream != null) { - this.field3719.field2862 = true; + if (this.field3749 != null && this.field3749.midiPcmStream != null) { + this.field3749.field2886 = true; try { - if (this.field3719.field2867 < (float)this.field3719.musicTrackVolume && this.field3719.midiPcmStream.isReady()) { - float var1 = this.field3718 == 0 ? (float)this.field3718 : (float)this.field3719.musicTrackVolume / (float)this.field3718; - MusicSong var10000 = this.field3719; - var10000.field2867 += 0.0F == var1 ? (float)this.field3719.musicTrackVolume : var1; - if (this.field3719.field2867 > (float)this.field3719.musicTrackVolume) { - this.field3719.field2867 = (float)this.field3719.musicTrackVolume; + if (this.field3749.field2888 < (float)this.field3749.musicTrackVolume && this.field3749.midiPcmStream.isReady()) { + float var1 = this.field3748 == 0 ? (float)this.field3748 : (float)this.field3749.musicTrackVolume / (float)this.field3748; + MusicSong var10000 = this.field3749; + var10000.field2888 += 0.0F == var1 ? (float)this.field3749.musicTrackVolume : var1; + if (this.field3749.field2888 > (float)this.field3749.musicTrackVolume) { + this.field3749.field2888 = (float)this.field3749.musicTrackVolume; } - this.field3719.midiPcmStream.setPcmStreamVolume((int)this.field3719.field2867); + this.field3749.midiPcmStream.setPcmStreamVolume((int)this.field3749.field2888); return false; } } catch (Exception var3) { - this.method2138(var3.getMessage()); + this.method2170(var3.getMessage()); return true; } - this.field3719.field2862 = false; + this.field3749.field2886 = false; return true; } else { return true; } } - @ObfuscatedName("je") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)V", - garbageValue = "0" + descriptor = "(I)Ldy;", + garbageValue = "1147627487" ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { - byte var2 = 4; - int var3 = var2 + 6; - int var4 = var2 + 6; - int var5 = SecureRandomCallable.fontPlain12.lineWidth(var0, 250); - int var6 = SecureRandomCallable.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 16777215); - SecureRandomCallable.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - int var7 = var3 - var2; - int var8 = var4 - var2; - int var9 = var2 + var5 + var2; - int var10 = var2 + var6 + var2; + static ClientPreferences method2164() { + AccessFile var0 = null; + ClientPreferences var1 = new ClientPreferences(); + + try { + var0 = class17.getPreferencesFile("", UrlRequester.field1163.name, false); + byte[] var2 = new byte[(int)var0.length()]; - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { - Client.field407[var11] = true; + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { + var4 = var0.read(var2, var3, var2.length - var3); + if (var4 == -1) { + throw new IOException(); } } - if (var1) { - AttackOption.rasterProvider.drawFull(0, 0); - } else { - DevicePcmPlayerProvider.method76(var3, var4, var5, var6); - } + var1 = new ClientPreferences(new Buffer(var2)); + } catch (Exception var6) { + } + try { + if (var0 != null) { + var0.close(); + } + } catch (Exception var5) { } + + return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/FadeOutTask.java b/osrs/src/main/java/FadeOutTask.java index 86ef5681c..67460e7a3 100644 --- a/osrs/src/main/java/FadeOutTask.java +++ b/osrs/src/main/java/FadeOutTask.java @@ -1,64 +1,66 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("px") +@ObfuscatedName("qk") @Implements("FadeOutTask") public class FadeOutTask extends SongTask { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmv;" ) - MusicSong field3717; - @ObfuscatedName("ae") - int field3716; + MusicSong field3747; + @ObfuscatedName("al") + int field3746; @ObfuscatedSignature( - descriptor = "(Lpm;IZI)V" + descriptor = "(Lqm;IZI)V" ) public FadeOutTask(SongTask var1, int var2, boolean var3, int var4) { super(var1); - this.field3717 = null; - this.field3716 = 0; - super.field3722 = "FadeOutTask"; + this.field3747 = null; + this.field3746 = 0; + super.field3753 = "FadeOutTask"; if (var2 >= 0) { - if (var3 && var2 < class305.field2774.size()) { - this.field3717 = (MusicSong)class305.field2774.get(var2); - } else if (!var3 && var2 < class305.musicSongs.size()) { - this.field3717 = (MusicSong)class305.musicSongs.get(var2); + if (var3 && var2 < class319.field2791.size()) { + this.field3747 = (MusicSong)class319.field2791.get(var2); + } else if (!var3 && var2 < class319.musicSongs.size()) { + this.field3747 = (MusicSong)class319.musicSongs.get(var2); } - this.field3716 = var4; + this.field3746 = var4; } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1604030758" + descriptor = "(B)Z", + garbageValue = "-90" ) + @Export("vmethod2142") public boolean vmethod2142() { - if (this.field3717 != null && this.field3717.midiPcmStream != null) { - this.field3717.field2862 = true; + if (this.field3747 != null && this.field3747.midiPcmStream != null) { + this.field3747.field2886 = true; try { - if (this.field3717.field2867 > 0.0F && this.field3717.midiPcmStream.isReady()) { - float var1 = this.field3716 == 0 ? (float)this.field3716 : (float)this.field3717.musicTrackVolume / (float)this.field3716; - MusicSong var10000 = this.field3717; - var10000.field2867 -= var1 == 0.0F ? (float)this.field3717.musicTrackVolume : var1; - if (this.field3717.field2867 < 0.0F) { - this.field3717.field2867 = 0.0F; + if (this.field3747.field2888 > 0.0F && this.field3747.midiPcmStream.isReady()) { + float var1 = this.field3746 == 0 ? (float)this.field3746 : (float)this.field3747.musicTrackVolume / (float)this.field3746; + MusicSong var10000 = this.field3747; + var10000.field2888 -= var1 == 0.0F ? (float)this.field3747.musicTrackVolume : var1; + if (this.field3747.field2888 < 0.0F) { + this.field3747.field2888 = 0.0F; } - this.field3717.midiPcmStream.setPcmStreamVolume((int)this.field3717.field2867); + this.field3747.midiPcmStream.setPcmStreamVolume((int)this.field3747.field2888); return false; } } catch (Exception var3) { - this.method2138(var3.getMessage()); + this.method2170(var3.getMessage()); return true; } - this.field3717.field2862 = false; + this.field3747.field2886 = false; return true; } else { return true; diff --git a/osrs/src/main/java/FileSystem.java b/osrs/src/main/java/FileSystem.java index 0d3b32991..de84db3c9 100644 --- a/osrs/src/main/java/FileSystem.java +++ b/osrs/src/main/java/FileSystem.java @@ -4,110 +4,72 @@ import net.runelite.mapping.ObfuscatedSignature; import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import java.util.Hashtable; @ObfuscatedName("ga") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("FileSystem_cacheDir") static File FileSystem_cacheDir; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; + @ObfuscatedName("aj") + @Export("cacheGamebuild") + static int cacheGamebuild; static { FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); } - @ObfuscatedName("au") + @ObfuscatedName("oe") @ObfuscatedSignature( - descriptor = "(B)[Lew;", - garbageValue = "-66" + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "1782754354" ) - static class128[] method912() { - return new class128[]{class128.field1229, class128.field1226, class128.field1227, class128.field1228, class128.field1225}; - } + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); + short[] var2 = new short[16]; + int var3 = 0; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "1743339101" - ) - public static void method911(AbstractArchive var0) { - VarpDefinition.VarpDefinition_archive = var0; - VarpDefinition.field1498 = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - } + for (int var4 = 0; var4 < class284.ItemDefinition_fileCount; ++var4) { + ItemComposition var5 = class214.ItemDefinition_get(var4); + if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + SoundSystem.foundItemIdCount = -1; + class138.foundItemIds = null; + return; + } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-1" - ) - static void method913() { - try { - File var0 = new File(class36.userHomeDirectory, "random.dat"); - int var2; - if (var0.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); - } else { - label34: - for (int var1 = 0; var1 < JagexCache.field1464.length; ++var1) { - for (var2 = 0; var2 < DelayFadeTask.field3712.length; ++var2) { - File var3 = new File(DelayFadeTask.field3712[var2] + JagexCache.field1464[var1] + File.separatorChar + "random.dat"); - if (var3.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); - break label34; - } + if (var3 >= var2.length) { + short[] var6 = new short[var2.length * 2]; + + for (int var7 = 0; var7 < var3; ++var7) { + var6[var7] = var2[var7]; } + + var2 = var6; } - } - if (JagexCache.JagexCache_randomDat == null) { - RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); - var2 = var4.read(); - var4.seek(0L); - var4.write(var2); - var4.seek(0L); - var4.close(); - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + var2[var3++] = (short)var4; } - } catch (IOException var5) { } - } + class138.foundItemIds = var2; + class317.foundItemIndex = 0; + SoundSystem.foundItemIdCount = var3; + String[] var8 = new String[SoundSystem.foundItemIdCount]; - @ObfuscatedName("ib") - @ObfuscatedSignature( - descriptor = "(Lib;IIII)V", - garbageValue = "-1577193721" - ) - static void method914(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && class449.clientPreferences.getAreaSoundEffectsVolume() != 0) { - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { - MouseHandler.method172(var0.soundEffects[var1], var2, var3); - } - } - } - - @ObfuscatedName("or") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1893759044" - ) - static void method915() { - for (int var0 = 0; var0 < Client.field609.size(); ++var0) { - if (ClientPreferences.method571((Integer)Client.field609.get(var0)) != 2) { - Client.field609.remove(var0); - --var0; - } + for (int var9 = 0; var9 < SoundSystem.foundItemIdCount; ++var9) { + var8[var9] = class214.ItemDefinition_get(var2[var9]).name; } + GameObject.method1426(var8, class138.foundItemIds); } } \ No newline at end of file diff --git a/osrs/src/main/java/FillMode.java b/osrs/src/main/java/FillMode.java deleted file mode 100644 index 0e272fbcc..000000000 --- a/osrs/src/main/java/FillMode.java +++ /dev/null @@ -1,43 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("um") -public enum FillMode implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lum;" - ) - @Export("SOLID") - SOLID(0, 0), - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lum;" - ) - field4230(1, 1), - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lum;" - ) - field4231(2, 2); - - @ObfuscatedName("at") - public final int field4233; - @ObfuscatedName("ac") - final int field4232; - - FillMode(int var3, int var4) { - this.field4233 = var3; - this.field4232 = var4; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4232; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/FloorDecoration.java b/osrs/src/main/java/FloorDecoration.java index f9f5ee009..52cb6af31 100644 --- a/osrs/src/main/java/FloorDecoration.java +++ b/osrs/src/main/java/FloorDecoration.java @@ -3,63 +3,160 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") +@ObfuscatedName("jd") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lbg;" - ) - @Export("pcmPlayerProvider") - public static class51 pcmPlayerProvider; - @ObfuscatedName("au") + @ObfuscatedName("fk") + static long field1991; + @ObfuscatedName("ac") @Export("z") int z; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("x") int x; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("y") int y; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Ljy;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("tag") public long tag; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("flags") int flags; FloorDecoration() { } - @ObfuscatedName("ae") + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIIZIZI)V", + garbageValue = "759565724" + ) + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { + int var6 = (var0 + var1) / 2; + int var7 = var0; + World var8 = UserComparator3.World_worlds[var6]; + UserComparator3.World_worlds[var6] = UserComparator3.World_worlds[var1]; + UserComparator3.World_worlds[var1] = var8; + + for (int var9 = var0; var9 < var1; ++var9) { + if (DevicePcmPlayerProvider.method83(UserComparator3.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { + World var10 = UserComparator3.World_worlds[var9]; + UserComparator3.World_worlds[var9] = UserComparator3.World_worlds[var7]; + UserComparator3.World_worlds[var7++] = var10; + } + } + + UserComparator3.World_worlds[var1] = UserComparator3.World_worlds[var7]; + UserComparator3.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + } + + } + + @ObfuscatedName("mx") @ObfuscatedSignature( - descriptor = "([BILjava/lang/CharSequence;I)I", - garbageValue = "-2024995343" + descriptor = "(Lnm;B)V", + garbageValue = "0" ) - public static int method1179(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); - int var4 = var1; - - for (int var5 = 0; var5 < var3; ++var5) { - char var6 = var2.charAt(var5); - if (var6 <= 127) { - var0[var4++] = (byte)var6; - } else if (var6 <= 2047) { - var0[var4++] = (byte)(192 | var6 >> 6); - var0[var4++] = (byte)(128 | var6 & '?'); + static final void method1226(Widget var0) { + String var1; + int var2; + int var3; + if (var0.buttonType == 1) { + var1 = var0.buttonText; + var2 = var0.id; + var3 = var0.itemId; + class208.insertMenuItem(var1, "", 24, 0, 0, var2, var3, false); + } + + int var4; + String var8; + if (var0.buttonType == 2 && !Client.isSpellSelected) { + var1 = class155.Widget_getSpellActionName(var0); + if (var1 != null) { + var8 = Client.colorStartTag(65280) + var0.field3124; + var3 = var0.id; + var4 = var0.itemId; + class208.insertMenuItem(var1, var8, 25, 0, -1, var3, var4, false); + } + } + + if (var0.buttonType == 3) { + class153.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); + } + + if (var0.buttonType == 4) { + class153.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + } + + if (var0.buttonType == 5) { + class153.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { + class153.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + } + + if (var0.isIf3) { + int var5; + int var6; + int var7; + String var10; + if (Client.isSpellSelected) { + var2 = MouseRecorder.getWidgetFlags(var0); + boolean var9 = (var2 >> 21 & 1) != 0; + if (var9 && (class31.field82 & 32) == 32) { + var10 = Client.field599; + String var11 = Client.field600 + " " + "->" + " " + var0.dataText; + var5 = var0.childIndex; + var6 = var0.id; + var7 = var0.itemId; + class208.insertMenuItem(var10, var11, 58, 0, var5, var6, var7, false); + } } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); - var0[var4++] = (byte)(128 | var6 >> 6 & 63); - var0[var4++] = (byte)(128 | var6 & '?'); + for (int var12 = 9; var12 >= 5; --var12) { + var8 = MoveSpeed.method1188(var0, var12); + if (var8 != null) { + var10 = var0.dataText; + var4 = var12 + 1; + var5 = var0.childIndex; + var6 = var0.id; + var7 = var0.itemId; + class208.insertMenuItem(var8, var10, 1007, var4, var5, var6, var7, false); + } + } + + var1 = class155.Widget_getSpellActionName(var0); + if (var1 != null) { + var8 = var0.dataText; + var3 = var0.childIndex; + var4 = var0.id; + var5 = var0.itemId; + class208.insertMenuItem(var1, var8, 25, 0, var3, var4, var5, false); + } + + for (var2 = 4; var2 >= 0; --var2) { + var10 = MoveSpeed.method1188(var0, var2); + if (var10 != null) { + class208.insertMenuItem(var10, var0.dataText, 57, var2 + 1, var0.childIndex, var0.id, var0.itemId, var0.prioritizeMenuEntry); + } + } + + if (class146.method767(MouseRecorder.getWidgetFlags(var0))) { + class153.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + } } } - return var4 - var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/FloorOverlayDefinition.java b/osrs/src/main/java/FloorOverlayDefinition.java index b85c290dd..ecd6746ad 100644 --- a/osrs/src/main/java/FloorOverlayDefinition.java +++ b/osrs/src/main/java/FloorOverlayDefinition.java @@ -3,55 +3,43 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("io") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnu;" - ) - @Export("FloorOverlayDefinition_archive") - public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("FloorOverlayDefinition_cached") public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("kq") - @ObfuscatedSignature( - descriptor = "[Lui;" - ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("texture") public int texture; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("hue") public int hue; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("saturation") public int saturation; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("lightness") public int lightness; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("secondaryLightness") public int secondaryLightness; @@ -59,20 +47,20 @@ public class FloorOverlayDefinition extends DualNode { FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); } - public FloorOverlayDefinition() { + FloorOverlayDefinition() { this.primaryRgb = 0; this.texture = -1; this.hideUnderlay = true; this.secondaryRgb = -1; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "32" + descriptor = "(I)V", + garbageValue = "-178426447" ) @Export("postDecode") - public void postDecode() { + void postDecode() { if (this.secondaryRgb != -1) { this.setHsl(this.secondaryRgb); this.secondaryHue = this.hue; @@ -83,13 +71,13 @@ public void postDecode() { this.setHsl(this.primaryRgb); } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;IB)V", - garbageValue = "7" + descriptor = "(Lul;IB)V", + garbageValue = "-33" ) @Export("decode") - public void decode(Buffer var1, int var2) { + void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { @@ -100,10 +88,10 @@ public void decode(Buffer var1, int var2) { } } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltm;IIB)V", - garbageValue = "42" + descriptor = "(Lul;III)V", + garbageValue = "1318940948" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -120,10 +108,10 @@ void decodeNext(Buffer var1, int var2, int var3) { } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-718150791" + descriptor = "(IB)V", + garbageValue = "2" ) @Export("setHsl") void setHsl(int var1) { @@ -151,9 +139,9 @@ void setHsl(int var1) { double var12 = 0.0D; double var14 = 0.0D; double var16 = (var8 + var10) / 2.0D; - if (var10 != var8) { + if (var8 != var10) { if (var16 < 0.5D) { - var14 = (var10 - var8) / (var10 + var8); + var14 = (var10 - var8) / (var8 + var10); } if (var16 >= 0.5D) { @@ -163,16 +151,16 @@ void setHsl(int var1) { if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); } else if (var10 == var4) { - var12 = 2.0D + (var6 - var2) / (var10 - var8); - } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; + var12 = (var6 - var2) / (var10 - var8) + 2.0D; + } else if (var6 == var10) { + var12 = 4.0D + (var2 - var4) / (var10 - var8); } } var12 /= 6.0D; - this.hue = (int)(var12 * 256.0D); - this.saturation = (int)(256.0D * var14); - this.lightness = (int)(256.0D * var16); + this.hue = (int)(256.0D * var12); + this.saturation = (int)(var14 * 256.0D); + this.lightness = (int)(var16 * 256.0D); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -186,4 +174,32 @@ void setHsl(int var1) { } } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)[Lmi;", + garbageValue = "-1928270491" + ) + static LoginPacket[] method1109() { + return new LoginPacket[]{LoginPacket.field2766, LoginPacket.NEW_LOGIN_CONNECTION, LoginPacket.field2762, LoginPacket.field2767, LoginPacket.RECONNECT_LOGIN_CONNECTION, LoginPacket.field2764}; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;I)V", + garbageValue = "490485615" + ) + public static void method1108(AbstractArchive var0) { + ParamComposition.ParamDefinition_archive = var0; + } + + @ObfuscatedName("nx") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1802192770" + ) + static final void method1114(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); + class91.clientPreferences.setCurrentSoundEffectVolume(var0); + } } \ No newline at end of file diff --git a/osrs/src/main/java/FloorUnderlayDefinition.java b/osrs/src/main/java/FloorUnderlayDefinition.java index 16dcd393a..b504588aa 100644 --- a/osrs/src/main/java/FloorUnderlayDefinition.java +++ b/osrs/src/main/java/FloorUnderlayDefinition.java @@ -2,35 +2,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("hs") +@ObfuscatedName("ie") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("rgb") int rgb; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("hue") public int hue; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("saturation") public int saturation; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("lightness") public int lightness; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("hueMultiplier") public int hueMultiplier; @@ -38,27 +41,27 @@ public class FloorUnderlayDefinition extends DualNode { FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); } - public FloorUnderlayDefinition() { + FloorUnderlayDefinition() { this.rgb = 0; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-525788142" + garbageValue = "-1890021577" ) @Export("postDecode") - public void postDecode() { + void postDecode() { this.setHsl(this.rgb); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1362647388" + descriptor = "(Lul;II)V", + garbageValue = "1012239262" ) @Export("decode") - public void decode(Buffer var1, int var2) { + void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { @@ -69,10 +72,10 @@ public void decode(Buffer var1, int var2) { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;IIB)V", - garbageValue = "34" + descriptor = "(Lul;III)V", + garbageValue = "2138795593" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -82,10 +85,10 @@ void decodeNext(Buffer var1, int var2, int var3) { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-628456834" + garbageValue = "1881157581" ) @Export("setHsl") void setHsl(int var1) { @@ -112,7 +115,7 @@ void setHsl(int var1) { double var12 = 0.0D; double var14 = 0.0D; - double var16 = (var8 + var10) / 2.0D; + double var16 = (var10 + var8) / 2.0D; if (var10 != var8) { if (var16 < 0.5D) { var14 = (var10 - var8) / (var8 + var10); @@ -122,18 +125,18 @@ void setHsl(int var1) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { + if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { + } else if (var4 == var10) { var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var10 == var6) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + var12 = (var2 - var4) / (var10 - var8) + 4.0D; } } var12 /= 6.0D; this.saturation = (int)(var14 * 256.0D); - this.lightness = (int)(256.0D * var16); + this.lightness = (int)(var16 * 256.0D); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -149,7 +152,7 @@ void setHsl(int var1) { if (var16 > 0.5D) { this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); } else { - this.hueMultiplier = (int)(var14 * var16 * 512.0D); + this.hueMultiplier = (int)(var16 * var14 * 512.0D); } if (this.hueMultiplier < 1) { @@ -158,4 +161,56 @@ void setHsl(int var1) { this.hue = (int)(var12 * (double)this.hueMultiplier); } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "65" + ) + static final int method1044(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;I)[F", + garbageValue = "508880574" + ) + static float[] method1043(JSONObject var0, String var1) throws JSONException { + float[] var2 = new float[4]; + + try { + JSONArray var3 = var0.getJSONArray(var1); + var2[0] = (float)var3.optDouble(0, 0.0D); + var2[1] = (float)var3.optDouble(1, 0.0D); + var2[2] = (float)var3.optDouble(2, 1.0D); + var2[3] = (float)var3.optDouble(3, 1.0D); + } catch (JSONException var4) { + var2[0] = 0.0F; + var2[1] = 0.0F; + var2[2] = 1.0F; + var2[3] = 1.0F; + } + + return var2; + } } \ No newline at end of file diff --git a/osrs/src/main/java/Font.java b/osrs/src/main/java/Font.java index 8626f2ccf..9d53d9527 100644 --- a/osrs/src/main/java/Font.java +++ b/osrs/src/main/java/Font.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("pi") +@ObfuscatedName("pu") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { @@ -13,7 +13,7 @@ public Font(byte[] var1) { super(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; @@ -55,7 +55,7 @@ final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; diff --git a/osrs/src/main/java/FontName.java b/osrs/src/main/java/FontName.java index e3ada27b5..7d1ef917c 100644 --- a/osrs/src/main/java/FontName.java +++ b/osrs/src/main/java/FontName.java @@ -3,48 +3,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sp") +@ObfuscatedName("tc") @Implements("FontName") public class FontName { - @ObfuscatedName("up") - static int field4045; - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Ltc;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Ltc;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Ltc;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Ltc;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Ltc;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Ltc;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("name") String name; @@ -61,250 +59,28 @@ public class FontName { this.name = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("iv") @ObfuscatedSignature( - descriptor = "(IIILiw;Lis;Lij;I)Z", - garbageValue = "-287593620" + descriptor = "(Lif;IIII)V", + garbageValue = "-1051855910" ) - static final boolean method2446(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, class216 var5) { - int var6 = var5.method1132(); - int var7 = var5.method1133(); - int[][] var8 = var5.method1135(); - int[][] var9 = var5.method1134(); - int[] var10 = var5.method1136(); - int[] var11 = var5.method1137(); - int var12 = var5.method1138(); - int var13 = var0; - int var14 = var1; - int var15 = var6 >> 1; - int var16 = var7 >> 1; - int var17 = var0 - var15; - int var18 = var1 - var16; - var9[var15][var16] = 99; - var8[var15][var16] = 0; - byte var19 = 0; - int var20 = 0; - var10[var19] = var0; - int var26 = var19 + 1; - var11[var19] = var1; - int[][] var21 = var4.flags; - - while (true) { - label265: - while (true) { - int var22; - int var23; - int var24; - int var25; - do { - do { - do { - label242: - do { - if (var20 == var26) { - var5.method1129(var13, var14); - return false; - } - - var13 = var10[var20]; - var14 = var11[var20]; - var20 = var20 + 1 & var12; - var15 = var13 - var17; - var16 = var14 - var18; - var22 = var13 - var4.xInset; - var23 = var14 - var4.yInset; - if (var3.hasArrived(var2, var13, var14, var4)) { - var5.method1129(var13, var14); - return true; - } - - var24 = var8[var15][var16] + 1; - if (var15 > 0 && var9[var15 - 1][var16] == 0 && (var21[var22 - 1][var23] & 19136782) == 0 && (var21[var22 - 1][var23 + var2 - 1] & 19136824) == 0) { - var25 = 1; - - while (true) { - if (var25 >= var2 - 1) { - var10[var26] = var13 - 1; - var11[var26] = var14; - var26 = var26 + 1 & var12; - var9[var15 - 1][var16] = 2; - var8[var15 - 1][var16] = var24; - break; - } - - if ((var21[var22 - 1][var25 + var23] & 19136830) != 0) { - break; - } - - ++var25; - } - } - - if (var15 < var6 - var2 && var9[var15 + 1][var16] == 0 && (var21[var22 + var2][var23] & 19136899) == 0 && (var21[var22 + var2][var23 + var2 - 1] & 19136992) == 0) { - var25 = 1; - - while (true) { - if (var25 >= var2 - 1) { - var10[var26] = var13 + 1; - var11[var26] = var14; - var26 = var26 + 1 & var12; - var9[var15 + 1][var16] = 8; - var8[var15 + 1][var16] = var24; - break; - } - - if ((var21[var22 + var2][var25 + var23] & 19136995) != 0) { - break; - } - - ++var25; - } - } - - if (var16 > 0 && var9[var15][var16 - 1] == 0 && (var21[var22][var23 - 1] & 19136782) == 0 && (var21[var22 + var2 - 1][var23 - 1] & 19136899) == 0) { - var25 = 1; - - while (true) { - if (var25 >= var2 - 1) { - var10[var26] = var13; - var11[var26] = var14 - 1; - var26 = var26 + 1 & var12; - var9[var15][var16 - 1] = 1; - var8[var15][var16 - 1] = var24; - break; - } - - if ((var21[var22 + var25][var23 - 1] & 19136911) != 0) { - break; - } - - ++var25; - } - } - - if (var16 < var7 - var2 && var9[var15][var16 + 1] == 0 && (var21[var22][var23 + var2] & 19136824) == 0 && (var21[var22 + var2 - 1][var23 + var2] & 19136992) == 0) { - var25 = 1; - - while (true) { - if (var25 >= var2 - 1) { - var10[var26] = var13; - var11[var26] = var14 + 1; - var26 = var26 + 1 & var12; - var9[var15][var16 + 1] = 4; - var8[var15][var16 + 1] = var24; - break; - } - - if ((var21[var25 + var22][var23 + var2] & 19137016) != 0) { - break; - } - - ++var25; - } - } - - if (var15 > 0 && var16 > 0 && var9[var15 - 1][var16 - 1] == 0 && (var21[var22 - 1][var23 - 1] & 19136782) == 0) { - var25 = 1; - - while (true) { - if (var25 >= var2) { - var10[var26] = var13 - 1; - var11[var26] = var14 - 1; - var26 = var26 + 1 & var12; - var9[var15 - 1][var16 - 1] = 3; - var8[var15 - 1][var16 - 1] = var24; - break; - } - - if ((var21[var22 - 1][var25 + (var23 - 1)] & 19136830) != 0 || (var21[var25 + (var22 - 1)][var23 - 1] & 19136911) != 0) { - break; - } - - ++var25; - } - } - - if (var15 < var6 - var2 && var16 > 0 && var9[var15 + 1][var16 - 1] == 0 && (var21[var22 + var2][var23 - 1] & 19136899) == 0) { - var25 = 1; - - while (true) { - if (var25 >= var2) { - var10[var26] = var13 + 1; - var11[var26] = var14 - 1; - var26 = var26 + 1 & var12; - var9[var15 + 1][var16 - 1] = 9; - var8[var15 + 1][var16 - 1] = var24; - break; - } - - if ((var21[var22 + var2][var25 + (var23 - 1)] & 19136995) != 0 || (var21[var22 + var25][var23 - 1] & 19136911) != 0) { - break; - } - - ++var25; - } - } - - if (var15 > 0 && var16 < var7 - var2 && var9[var15 - 1][var16 + 1] == 0 && (var21[var22 - 1][var23 + var2] & 19136824) == 0) { - for (var25 = 1; var25 < var2; ++var25) { - if ((var21[var22 - 1][var23 + var25] & 19136830) != 0 || (var21[var25 + (var22 - 1)][var23 + var2] & 19137016) != 0) { - continue label242; - } - } - - var10[var26] = var13 - 1; - var11[var26] = var14 + 1; - var26 = var26 + 1 & var12; - var9[var15 - 1][var16 + 1] = 6; - var8[var15 - 1][var16 + 1] = var24; - } - } while(var15 >= var6 - var2); - } while(var16 >= var7 - var2); - } while(var9[var15 + 1][var16 + 1] != 0); - } while((var21[var22 + var2][var23 + var2] & 19136992) != 0); - - for (var25 = 1; var25 < var2; ++var25) { - if ((var21[var22 + var25][var23 + var2] & 19137016) != 0 || (var21[var22 + var2][var23 + var25] & 19136995) != 0) { - continue label265; - } - } - - var10[var26] = var13 + 1; - var11[var26] = var14 + 1; - var26 = var26 + 1 & var12; - var9[var15 + 1][var16 + 1] = 12; - var8[var15 + 1][var16 + 1] = var24; + static void method2481(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class91.clientPreferences.getAreaSoundEffectsVolume() != 0) { + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { + class91.method482(var0.soundEffects[var1], var2, var3); } } } - @ObfuscatedName("ai") + @ObfuscatedName("md") @ObfuscatedSignature( - descriptor = "(IIIZIB)J", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "-1514156294" ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; - if (var3) { - var5 |= 65536L; - } - - return var5; - } - - @ObfuscatedName("op") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-80" - ) - static void method2447(int var0) { - SequenceDefinition var1 = EnumComposition.SequenceDefinition_get(var0); - if (var1.isCachedModelIdSet()) { - if (ClientPreferences.method571(var1.SequenceDefinition_cachedModelId) == 2) { - Client.field609.add(var1.SequenceDefinition_cachedModelId); - } - - } + static final void method2482(int var0) { + var0 = Math.max(Math.min(var0, 100), 0); + var0 = 100 - var0; + float var1 = 0.5F + (float)var0 / 200.0F; + JagexCache.method920((double)var1); } } \ No newline at end of file diff --git a/osrs/src/main/java/Fonts.java b/osrs/src/main/java/Fonts.java index 6732fd4ac..7772ac1fa 100644 --- a/osrs/src/main/java/Fonts.java +++ b/osrs/src/main/java/Fonts.java @@ -5,30 +5,27 @@ import java.util.HashMap; -@ObfuscatedName("sr") +@ObfuscatedName("tt") @Implements("Fonts") public class Fonts { - @ObfuscatedName("af") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;)V" + descriptor = "(Lom;Lom;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; @@ -36,10 +33,10 @@ public Fonts(AbstractArchive var1, AbstractArchive var2) { this.map = new HashMap(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([Lsp;I)Ljava/util/HashMap;", - garbageValue = "-537170056" + descriptor = "([Ltc;I)Ljava/util/HashMap;", + garbageValue = "932595648" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -60,7 +57,24 @@ public HashMap createMap(FontName[] var1) { } else { int var10 = var7.getGroupId(var9); int var11 = var7.getFileId(var10, ""); - var6 = LoginPacket.method1613(var7, var8, var10, var11); + Font var12; + if (!class164.method862(var7, var10, var11)) { + var12 = null; + } else { + byte[] var14 = var8.takeFile(var10, var11); + Font var13; + if (var14 == null) { + var13 = null; + } else { + Font var15 = new Font(var14, class326.SpriteBuffer_xOffsets, ModelData0.SpriteBuffer_yOffsets, class59.SpriteBuffer_spriteWidths, class544.SpriteBuffer_spriteHeights, class372.SpriteBuffer_spritePalette, AddRequestTask.SpriteBuffer_pixels); + class407.method2062(); + var13 = var15; + } + + var12 = var13; + } + + var6 = var12; } if (var6 != null) { diff --git a/osrs/src/main/java/Frames.java b/osrs/src/main/java/Frames.java index ca60cda53..f62dd62f1 100644 --- a/osrs/src/main/java/Frames.java +++ b/osrs/src/main/java/Frames.java @@ -3,20 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; + +@ObfuscatedName("ja") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("af") - static int field2121; - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Lia;" + descriptor = "[Lji;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;IZ)V" + descriptor = "(Lom;Lom;IZ)V" ) Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); @@ -53,255 +57,238 @@ public class Frames extends DualNode { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-8394863" + garbageValue = "1567177600" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-292158439" + descriptor = "([BI)Lud;", + garbageValue = "-1476934708" ) - public static void method1293(int var0, int var1) { - VarbitComposition var2 = class384.method2022(var0); - int var3 = var2.baseVar; - int var4 = var2.startBit; - int var5 = var2.endBit; - int var6 = Varps.Varps_masks[var5 - var4]; - if (var1 < 0 || var1 > var6) { - var1 = 0; + public static final SpritePixels method1335(byte[] var0) { + BufferedImage var1 = null; + + try { + Class var2 = ImageIO.class; + synchronized(ImageIO.class) { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); + } + + int var6 = var1.getWidth(); + int var7 = var1.getHeight(); + int[] var4 = new int[var6 * var7]; + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var6, var7, var4, 0, var6); + var5.grabPixels(); + return new SpritePixels(var4, var6, var7); + } catch (IOException var9) { + } catch (InterruptedException var10) { } - var6 <<= var4; - Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; + return new SpritePixels(0, 0); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1760053534" + descriptor = "([FIFI)F", + garbageValue = "-2051781010" ) - public static int method1292(int var0) { - return class464.field3907[var0 & 16383]; + static float method1338(float[] var0, int var1, float var2) { + float var3 = var0[var1]; + + for (int var4 = var1 - 1; var4 >= 0; --var4) { + var3 = var2 * var3 + var0[var4]; + } + + return var3; } - @ObfuscatedName("ac") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "-8" + descriptor = "([I[IIIB)V", + garbageValue = "-27" ) - static int method1295(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == 100) { - SoundCache.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = class92.getWidget(var3); - if (var6.children == null) { - var6.children = new Widget[var5 + 1]; - } - - if (var6.children.length <= var5) { - Widget[] var7 = new Widget[var5 + 1]; - - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; - } + public static void method1337(int[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + int var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + int var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + int var8 = var6 == Integer.MAX_VALUE ? 0 : 1; - var6.children = var7; + for (int var9 = var2; var9 < var3; ++var9) { + if (var0[var9] < (var9 & var8) + var6) { + int var10 = var0[var9]; + var0[var9] = var0[var5]; + var0[var5] = var10; + int var11 = var1[var9]; + var1[var9] = var1[var5]; + var1[var5++] = var11; } + } - if (var5 > 0 && var6.children[var5 - 1] == null) { - throw new RuntimeException("" + (var5 - 1)); - } else { - Widget var12 = new Widget(); - var12.type = var4; - var12.parentId = var12.id = var6.id; - var12.childIndex = var5; - var12.isIf3 = true; - if (var4 == 12) { - var12.method1843(); - var12.method1844().method1778(new class105(var12)); - var12.method1844().method1777(new class106(var12)); - } + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + method1337(var0, var1, var2, var5 - 1); + method1337(var0, var1, var5 + 1, var3); + } - var6.children[var5] = var12; - if (var2) { - GameObject.scriptDotWidget = var12; - } else { - SceneTilePaint.scriptActiveWidget = var12; - } + } - class218.invalidateWidget(var6); - return 1; - } - } + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "-1515461469" + ) + static int method1339(int var0, Script var1, boolean var2) { + if (var0 == 3300) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; + return 1; } else { - Widget var9; - if (var0 == 101) { - var9 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - Widget var10 = class92.getWidget(var9.id); - var10.children[var9.childIndex] = null; - class218.invalidateWidget(var10); + int var3; + int var4; + if (var0 == 3301) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.method2003(var3, var4); + return 1; + } else if (var0 == 3302) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class27.ItemContainer_getCount(var3, var4); return 1; - } else if (var0 == 102) { - var9 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - var9.children = null; - class218.invalidateWidget(var9); + } else if (var0 == 3303) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.method810(var3, var4); return 1; - } else if (var0 != 200) { - if (var0 == 201) { - var9 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - if (var2) { - GameObject.scriptDotWidget = var9; - } else { - SceneTilePaint.scriptActiveWidget = var9; - } + } else if (var0 == 3304) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanChannel.getInvDefinition(var3).size; + return 1; + } else if (var0 == 3305) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } else if (var0 == 3306) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } else if (var0 == 3307) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; + } else { + int var5; + if (var0 == 3308) { + var3 = class87.Client_plane; + var4 = (TextureProvider.localPlayer.x >> 7) + class20.baseX; + var5 = (TextureProvider.localPlayer.y >> 7) + class19.baseY; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } else if (var0 == 3309) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } else if (var0 == 3310) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } else if (var0 == 3311) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } else if (var0 == 3312) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } else if (var0 == 3313) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.method2003(var3, var4); + return 1; + } else if (var0 == 3314) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class27.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == 3315) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.method810(var3, var4); + return 1; + } else if (var0 == 3316) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; } return 1; - } else { - return 2; - } - } else { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Widget var11 = SoundCache.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - if (var2) { - GameObject.scriptDotWidget = var11; + } else if (var0 == 3317) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } else if (var0 == 3318) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } else if (var0 == 3321) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy / 100; + return 1; + } else if (var0 == 3322) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; + return 1; + } else if (var0 == 3323) { + if (Client.playerMod) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; } else { - SceneTilePaint.scriptActiveWidget = var11; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; } - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } - } - - @ObfuscatedName("kv") - @ObfuscatedSignature( - descriptor = "(ZLto;I)V", - garbageValue = "101109035" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field492 = 0; - Client.field451 = 0; - var1.importIndex(); - int var2 = var1.readBits(8); - int var3; - if (var2 < Client.npcCount) { - for (var3 = var2; var3 < Client.npcCount; ++var3) { - Client.field564[++Client.field492 - 1] = Client.npcIndices[var3]; - } - } - if (var2 > Client.npcCount) { - throw new RuntimeException(""); - } else { - Client.npcCount = 0; - - for (var3 = 0; var3 < var2; ++var3) { - int var4 = Client.npcIndices[var3]; - NPC var5 = Client.npcs[var4]; - int var6 = var1.readBits(1); - if (var6 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var4; - var5.npcCycle = Client.cycle; + return 1; + } else if (var0 == 3324) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } else if (var0 == 3325) { + Interpreter.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == 3326) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.lastMouseRecordX; + return 1; + } else if (var0 == 3327) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.lastMouseRecordY; + return 1; + } else if (var0 == 3331) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; } else { - int var7 = var1.readBits(2); - if (var7 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var4; - var5.npcCycle = Client.cycle; - Client.field552[++Client.field451 - 1] = var4; - } else { - int var8; - int var9; - if (var7 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var4; - var5.npcCycle = Client.cycle; - var8 = var1.readBits(3); - var5.move(var8, MoveSpeed.WALK); - var9 = var1.readBits(1); - if (var9 == 1) { - Client.field552[++Client.field451 - 1] = var4; - } - } else if (var7 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var4; - var5.npcCycle = Client.cycle; - if (var1.readBits(1) == 1) { - var8 = var1.readBits(3); - var5.move(var8, MoveSpeed.RUN); - var9 = var1.readBits(3); - var5.move(var9, MoveSpeed.RUN); - } else { - var8 = var1.readBits(3); - var5.move(var8, MoveSpeed.CRAWL); - } - - var8 = var1.readBits(1); - if (var8 == 1) { - Client.field552[++Client.field451 - 1] = var4; - } - } else if (var7 == 3) { - Client.field564[++Client.field492 - 1] = var4; - } - } - } - } - - class349.method1874(var0, var1); - class151.method795(var1); - - for (var2 = 0; var2 < Client.field492; ++var2) { - var3 = Client.field564[var2]; - if (Client.npcs[var3].npcCycle != Client.cycle) { - Client.npcs[var3].definition = null; - Client.npcs[var3] = null; - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var2 = 0; var2 < Client.npcCount; ++var2) { - if (Client.npcs[Client.npcIndices[var2]] == null) { - throw new RuntimeException(var2 + "," + Client.npcCount); - } + return 2; } - } } } - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1066961664" - ) - static void method1297() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - } } \ No newline at end of file diff --git a/osrs/src/main/java/Friend.java b/osrs/src/main/java/Friend.java index 5dae40e82..1bf889d02 100644 --- a/osrs/src/main/java/Friend.java +++ b/osrs/src/main/java/Friend.java @@ -2,22 +2,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.js.JSObject; -@ObfuscatedName("qo") +import java.applet.Applet; +import java.net.URL; + +@ObfuscatedName("rq") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("au") - boolean field3794; - @ObfuscatedName("ae") - boolean field3793; + @ObfuscatedName("ac") + boolean field3824; + @ObfuscatedName("al") + boolean field3825; Friend() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqo;I)I", - garbageValue = "-1434956269" + descriptor = "(Lrq;B)I", + garbageValue = "0" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -29,23 +33,23 @@ int compareToFriend(Friend var1) { return -1; } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field3794 && !var1.field3794) { + } else if (this.field3824 && !var1.field3824) { return -1; - } else if (!this.field3794 && var1.field3794) { + } else if (!this.field3824 && var1.field3824) { return 1; - } else if (this.field3793 && !var1.field3793) { + } else if (this.field3825 && !var1.field3825) { return -1; - } else if (!this.field3793 && var1.field3793) { + } else if (!this.field3825 && var1.field3825) { return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lqs;I)I", - garbageValue = "1756748027" + descriptor = "(Lrp;I)I", + garbageValue = "762888653" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -56,4 +60,81 @@ public int compareTo_user(User var1) { public int compareTo(Object var1) { return this.compareToFriend((Friend)var1); } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)Lrd;", + garbageValue = "-67" + ) + public static class464 method2240() { + synchronized(class464.field3898) { + if (class464.field3896 == 0) { + return new class464(); + } else { + class464.field3898[--class464.field3896].method2333(); + return class464.field3898[class464.field3896]; + } + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "2116973766" + ) + static boolean method2242(String var0, int var1, String var2) { + if (var1 == 0) { + try { + if (!class31.field84.startsWith("win")) { + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { + throw new Exception(); + } else { + String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var14.indexOf(var0.charAt(var4)) == -1) { + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); + return true; + } + } catch (Throwable var8) { + return false; + } + } else if (var1 == 1) { + try { + Applet var7 = class31.field83; + Object[] var5 = new Object[]{(new URL(class31.field83.getCodeBase(), var0)).toString()}; + Object var13 = JSObject.getWindow(var7).call(var2, var5); + return var13 != null; + } catch (Throwable var9) { + return false; + } + } else if (var1 == 2) { + try { + class31.field83.getAppletContext().showDocument(new URL(class31.field83.getCodeBase(), var0), "_blank"); + return true; + } catch (Exception var10) { + return false; + } + } else if (var1 == 3) { + try { + Applet var3 = class31.field83; + JSObject.getWindow(var3).call("loggedout", (Object[])null); + } catch (Throwable var12) { + } + + try { + class31.field83.getAppletContext().showDocument(new URL(class31.field83.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var11) { + return false; + } + } else { + throw new IllegalArgumentException(); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/FriendLoginUpdate.java b/osrs/src/main/java/FriendLoginUpdate.java index 7db9f27df..03f254aad 100644 --- a/osrs/src/main/java/FriendLoginUpdate.java +++ b/osrs/src/main/java/FriendLoginUpdate.java @@ -3,29 +3,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qg") +@ObfuscatedName("rr") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("la") - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("au") - public int field3796; - @ObfuscatedName("ae") + @ObfuscatedName("ac") + public int field3826; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Luc;" + descriptor = "Lvf;" ) @Export("friendUsername") public Username friendUsername; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("worldId") public short worldId; @ObfuscatedSignature( - descriptor = "(Luc;I)V" + descriptor = "(Lvf;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3796 = (int)(GameEngine.clockNow() / 1000L); + this.field3826 = (int)(GrandExchangeOfferTotalQuantityComparator.method1971() / 1000L); this.friendUsername = var1; this.worldId = (short)var2; } diff --git a/osrs/src/main/java/FriendSystem.java b/osrs/src/main/java/FriendSystem.java index b7aff205d..901bd1396 100644 --- a/osrs/src/main/java/FriendSystem.java +++ b/osrs/src/main/java/FriendSystem.java @@ -3,35 +3,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Iterator; - @ObfuscatedName("ci") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lqk;" + descriptor = "Lrt;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lqq;" + descriptor = "Lqu;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("friendListStatus") int friendListStatus; @ObfuscatedSignature( - descriptor = "(Lsl;)V" + descriptor = "(Lte;)V" ) FriendSystem(LoginType var1) { this.friendListStatus = 0; @@ -40,67 +38,51 @@ public class FriendSystem { this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1751365649" + garbageValue = "1564644877" ) - boolean method398() { + boolean method400() { return this.friendListStatus == 2; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-641955560" + descriptor = "(B)V", + garbageValue = "1" ) - final void method399() { + final void method401() { this.friendListStatus = 1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "-479200024" + descriptor = "(Lul;IB)V", + garbageValue = "-47" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); this.friendListStatus = 2; - - for (int var3 = 0; var3 < Players.Players_count; ++var3) { - Player var4 = Client.players[Players.Players_indices[var3]]; - var4.clearIsFriend(); - } - - Iterator var5 = Messages.Messages_hashTable.iterator(); - - while (var5.hasNext()) { - Message var6 = (Message)var5.next(); - var6.clearIsFromFriend(); - } - - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.clearFriends(); - } - + VerticalAlignment.method1027(); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-676446193" + garbageValue = "-592111602" ) @Export("processFriendUpdates") final void processFriendUpdates() { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3796 < GameEngine.clockNow() / 1000L - 5L) { + if ((long)var1.field3826 < GrandExchangeOfferTotalQuantityComparator.method1971() / 1000L - 5L) { if (var1.worldId > 0) { - MouseHandler.addGameMessage(5, "", var1.friendUsername + " has logged in."); + class411.addGameMessage(5, "", var1.friendUsername + " has logged in."); } if (var1.worldId == 0) { - MouseHandler.addGameMessage(5, "", var1.friendUsername + " has logged out."); + class411.addGameMessage(5, "", var1.friendUsername + " has logged out."); } var1.remove(); @@ -109,10 +91,10 @@ final void processFriendUpdates() { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "60" + descriptor = "(I)V", + garbageValue = "-1144489465" ) @Export("clear") final void clear() { @@ -121,26 +103,26 @@ final void clear() { this.ignoreList.clear(); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Luc;ZI)Z", - garbageValue = "496878304" + descriptor = "(Lvf;ZB)Z", + garbageValue = "32" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } else if (var1.equals(VarbitComposition.localPlayer.username)) { + } else if (var1.equals(TextureProvider.localPlayer.username)) { return true; } else { return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Luc;I)Z", - garbageValue = "-1644388901" + descriptor = "(Lvf;I)Z", + garbageValue = "1117529753" ) @Export("isIgnored") final boolean isIgnored(Username var1) { @@ -151,10 +133,10 @@ final boolean isIgnored(Username var1) { } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "76" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2080092876" ) @Export("addFriend") final void addFriend(String var1) { @@ -162,34 +144,37 @@ final void addFriend(String var1) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsListIsFull()) { - UserComparator8.method673("Your friend list is full. Max of 200 for free users, and 400 for members"); - } else if (VarbitComposition.localPlayer.username.equals(var2)) { - Clock.method931(); + class436.method2211("Your friend list is full. Max of 200 for free users, and 400 for members"); + } else if (TextureProvider.localPlayer.username.equals(var2)) { + class436.method2211("You can't add yourself to your own friend list"); } else if (this.isFriended(var2, false)) { - Strings.method1877(var1); + PendingSpawn.method508(var1); } else if (this.isIgnored(var2)) { - UserComparator8.method673("Please remove " + var1 + " from your ignore list first"); + class436.method2211("Please remove " + var1 + " from your ignore list first"); } else { - MouseHandler.method171(var1); + PacketBufferNode var3 = ClanChannelMember.getPacketBufferNode(ClientPacket.f88, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); } } } } - @ObfuscatedName("al") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1246160052" + descriptor = "(B)Z", + garbageValue = "19" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.isMembers != 1; } - @ObfuscatedName("an") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "541901649" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "0" ) @Export("addIgnore") final void addIgnore(String var1) { @@ -197,37 +182,34 @@ final void addIgnore(String var1) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.canAddIgnore()) { - UserComparator8.method673("Your ignore list is full. Max of 100 for free users, and 400 for members"); - } else if (VarbitComposition.localPlayer.username.equals(var2)) { - class503.method2501(); + class284.method1572(); + } else if (TextureProvider.localPlayer.username.equals(var2)) { + RouteStrategy.method1171(); } else if (this.isIgnored(var2)) { - class31.method121(var1); + class436.method2211(var1 + " is already on your ignore list"); } else if (this.isFriended(var2, false)) { - UserComparator8.method673("Please remove " + var1 + " from your friend list first"); + class436.method2211("Please remove " + var1 + " from your friend list first"); } else { - PacketBufferNode var3 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IGNORELIST_ADD, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); + class145.method764(var1); } } } } - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "203788977" + garbageValue = "592853895" ) @Export("canAddIgnore") final boolean canAddIgnore() { return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.isMembers != 1; } - @ObfuscatedName("am") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2045043911" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-16" ) @Export("removeFriend") final void removeFriend(String var1) { @@ -235,37 +217,22 @@ final void removeFriend(String var1) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { - class113.method663(); - PacketBufferNode var3 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.FRIENDLIST_DEL, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var1)); + Client.field511 = Client.cycleCntr; + PacketBufferNode var3 = ClanChannelMember.getPacketBufferNode(ClientPacket.FRIEND_DELETE_USER, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - for (int var5 = 0; var5 < Players.Players_count; ++var5) { - Player var4 = Client.players[Players.Players_indices[var5]]; - var4.clearIsFriend(); - } - - Iterator var6 = Messages.Messages_hashTable.iterator(); - - while (var6.hasNext()) { - Message var7 = (Message)var6.next(); - var7.clearIsFromFriend(); - } - - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.clearFriends(); - } - + VerticalAlignment.method1027(); } } } - @ObfuscatedName("ax") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "81642025" + garbageValue = "-2065988446" ) @Export("removeIgnore") public final void removeIgnore(String var1, boolean var2) { @@ -273,24 +240,24 @@ public final void removeIgnore(String var1, boolean var2) { Username var3 = new Username(var1, this.loginType); if (var3.hasCleanName()) { if (this.ignoreList.removeByUsername(var3)) { - class113.method663(); + Client.field511 = Client.cycleCntr; if (var2) { - PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IGNORELIST_DEL, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var1)); + PacketBufferNode var4 = ClanChannelMember.getPacketBufferNode(ClientPacket.IGNORE_DELUSER, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var1)); var4.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var4); } } - AbstractSocket.FriendSystem_invalidateIgnoreds(); + class492.FriendSystem_invalidateIgnoreds(); } } } - @ObfuscatedName("as") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Luc;I)Z", - garbageValue = "1021453892" + descriptor = "(Lvf;B)Z", + garbageValue = "-15" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { @@ -298,60 +265,24 @@ final boolean isFriendAndHasWorld(Username var1) { return var2 != null && var2.hasWorld(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIIB)V", - garbageValue = "108" + descriptor = "(Ljava/lang/CharSequence;I)[B", + garbageValue = "1223769236" ) - @Export("sortItemsByName") - public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - short var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - short var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } + public static byte[] method399(CharSequence var0) { + int var1 = var0.length(); + byte[] var2 = new byte[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if (var4 > 127) { + var2[var3] = 63; + } else { + var2[var3] = (byte)var4; } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - sortItemsByName(var0, var1, var2, var5 - 1); - sortItemsByName(var0, var1, var5 + 1, var3); } - } - - @ObfuscatedName("hu") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "284694724" - ) - static int method412() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - int var0 = 0; - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; - } - - return var0 * 10000 / Client.field550; - } else { - return 10000; - } + return var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/FriendsChat.java b/osrs/src/main/java/FriendsChat.java index 51e95480c..44d3603ac 100644 --- a/osrs/src/main/java/FriendsChat.java +++ b/osrs/src/main/java/FriendsChat.java @@ -3,45 +3,42 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qc") +@ObfuscatedName("rl") @Implements("FriendsChat") public class FriendsChat extends UserList { - @ObfuscatedName("iv") + @ObfuscatedName("qj") + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lev;" - ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lqc;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("name") public String name; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("owner") public String owner; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("minKick") public byte minKick; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("rank") public int rank; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("memberCount") int memberCount; @ObfuscatedSignature( - descriptor = "(Lsl;Lql;)V" + descriptor = "(Lte;Lqc;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { super(500); @@ -52,116 +49,146 @@ public FriendsChat(LoginType var1, Usernamed var2) { this.localUser = var2; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Lqs;", - garbageValue = "-1997275235" + descriptor = "(I)Lrp;", + garbageValue = "1002915738" ) @Export("newInstance") User newInstance() { return new ClanMate(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)[Lqs;", - garbageValue = "99" + descriptor = "(II)[Lrp;", + garbageValue = "-1086220070" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1793987000" + garbageValue = "1282030500" ) - final void method2198(String var1) { - this.name = class385.method2023(var1); - } + final void method2232(String var1) { + long var5 = 0L; + int var7 = var1.length(); + + for (int var8 = 0; var8 < var7; ++var8) { + var5 *= 37L; + char var9 = var1.charAt(var8); + if (var9 >= 'A' && var9 <= 'Z') { + var5 += (long)(var9 + 1 - 65); + } else if (var9 >= 'a' && var9 <= 'z') { + var5 += (long)(var9 + 1 - 97); + } else if (var9 >= '0' && var9 <= '9') { + var5 += (long)(var9 + 27 - 48); + } - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1839249281" - ) - final void method2199(String var1) { - this.owner = class385.method2023(var1); + if (var5 >= 177917621779460413L) { + break; + } + } + + while (0L == var5 % 37L && var5 != 0L) { + var5 /= 37L; + } + + String var10 = class163.base37DecodeLong(var5); + if (var10 == null) { + var10 = ""; + } + + this.name = var10; } - @ObfuscatedName("ap") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1203512341" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "121" ) - public final void method2201(Buffer var1, int var2) { - this.method2199(var1.readStringCp1252NullTerminated()); - long var3 = var1.readLong(); - long var6 = var3; - String var5; - int var8; - if (var3 > 0L && var3 < 6582952005840035281L) { - if (var3 % 37L == 0L) { - var5 = null; - } else { - var8 = 0; - - for (long var9 = var3; 0L != var9; var9 /= 37L) { - ++var8; - } + final void method2233(String var1) { + long var5 = 0L; + int var7 = var1.length(); + + for (int var8 = 0; var8 < var7; ++var8) { + var5 *= 37L; + char var9 = var1.charAt(var8); + if (var9 >= 'A' && var9 <= 'Z') { + var5 += (long)(var9 + 1 - 65); + } else if (var9 >= 'a' && var9 <= 'z') { + var5 += (long)(var9 + 1 - 97); + } else if (var9 >= '0' && var9 <= '9') { + var5 += (long)(var9 + 27 - 48); + } - StringBuilder var11 = new StringBuilder(var8); + if (var5 >= 177917621779460413L) { + break; + } + } - while (var6 != 0L) { - long var12 = var6; - var6 /= 37L; - var11.append(class388.base37Table[(int)(var12 - var6 * 37L)]); - } + while (0L == var5 % 37L && var5 != 0L) { + var5 /= 37L; + } - var5 = var11.reverse().toString(); - } - } else { - var5 = null; + String var10 = class163.base37DecodeLong(var5); + if (var10 == null) { + var10 = ""; } - this.method2198(var5); + this.owner = var10; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lul;II)V", + garbageValue = "795527291" + ) + public final void method2234(Buffer var1, int var2) { + this.method2233(var1.readStringCp1252NullTerminated()); + long var3 = var1.readLong(); + this.method2232(class160.method841(var3)); this.minKick = var1.readByte(); - short var14; + int var5; + short var6; if (var2 == 1) { - var8 = var1.readUnsignedByte(); - var14 = 255; + var5 = var1.readUnsignedByte(); + var6 = 255; } else { if (var2 != 2) { throw new IllegalArgumentException("Invalid friend chat full update version: " + var2); } - var8 = var1.method2560(); - var14 = -1; + var5 = var1.readShortSmartSub(); + var6 = -1; } - if (var14 != var8) { - int var10 = var8; + if (var5 != var6) { + int var7 = var5; this.clear(); - for (int var15 = 0; var15 < var10; ++var15) { - ClanMate var16 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var13 = var1.readUnsignedShort(); - var16.set(var13, ++this.memberCount - 1); - var16.rank = var1.readByte(); + for (int var8 = 0; var8 < var7; ++var8) { + ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); + int var10 = var1.readUnsignedShort(); + var9.set(var10, ++this.memberCount - 1); + var9.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); - this.isLocalPlayer(var16); + this.isLocalPlayer(var9); } } } - @ObfuscatedName("aa") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-59" + descriptor = "(Lul;I)V", + garbageValue = "1748337091" ) - public final void method2202(Buffer var1) { + public final void method2235(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); @@ -198,10 +225,10 @@ public final void method2202(Buffer var1) { } - @ObfuscatedName("af") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-39" + garbageValue = "-6" ) @Export("clearFriends") public final void clearFriends() { @@ -211,10 +238,10 @@ public final void clearFriends() { } - @ObfuscatedName("ad") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-1" + descriptor = "(I)V", + garbageValue = "-450328361" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { @@ -224,10 +251,10 @@ public final void invalidateIgnoreds() { } - @ObfuscatedName("aq") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Lqx;I)V", - garbageValue = "-617315153" + descriptor = "(Lrm;B)V", + garbageValue = "0" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { @@ -236,90 +263,4 @@ final void isLocalPlayer(ClanMate var1) { } } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-652647003" - ) - @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var4 == null) { - var4 = new ItemContainer(); - ItemContainer.itemContainers.put(var4, (long)var0); - } - - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; - - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { - var5[var7] = var4.ids[var7]; - var6[var7] = var4.quantities[var7]; - } - - for (var7 = var4.ids.length; var7 < var1; ++var7) { - var5[var7] = -1; - var6[var7] = 0; - } - - var4.ids = var5; - var4.quantities = var6; - } - - var4.ids[var1] = var2; - var4.quantities[var1] = var3; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "([BIILiv;[Lis;I)V", - garbageValue = "420755705" - ) - static final void method2206(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); - int var6 = -1; - - while (true) { - int var7 = var5.method2561(); - if (var7 == 0) { - return; - } - - var6 += var7; - int var8 = 0; - - while (true) { - int var9 = var5.readUShortSmart(); - if (var9 == 0) { - break; - } - - var8 += var9 - 1; - int var10 = var8 & 63; - int var11 = var8 >> 6 & 63; - int var12 = var8 >> 12; - int var13 = var5.readUnsignedByte(); - int var14 = var13 >> 2; - int var15 = var13 & 3; - int var16 = var11 + var1; - int var17 = var10 + var2; - if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { - int var18 = var12; - if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { - var18 = var12 - 1; - } - - CollisionMap var19 = null; - if (var18 >= 0) { - var19 = var4[var18]; - } - - class128.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); - } - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/FriendsList.java b/osrs/src/main/java/FriendsList.java index e8d70f44b..5da8facf3 100644 --- a/osrs/src/main/java/FriendsList.java +++ b/osrs/src/main/java/FriendsList.java @@ -3,58 +3,60 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qk") +@ObfuscatedName("rt") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("ao") + @ObfuscatedName("an") + static String[] field3812; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("at") - int field3782; - @ObfuscatedName("ac") + @ObfuscatedName("ax") + int field3813; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Lph;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lsl;)V" + descriptor = "(Lte;)V" ) public FriendsList(LoginType var1) { super(400); - this.field3782 = 1; + this.field3813 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Lqs;", - garbageValue = "-1997275235" + descriptor = "(I)Lrp;", + garbageValue = "1002915738" ) @Export("newInstance") User newInstance() { return new Friend(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)[Lqs;", - garbageValue = "99" + descriptor = "(II)[Lrp;", + garbageValue = "-1086220070" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Luc;ZI)Z", - garbageValue = "-1577740414" + descriptor = "(Lvf;ZI)Z", + garbageValue = "-2020456802" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -66,10 +68,10 @@ public boolean isFriended(Username var1, boolean var2) { } } - @ObfuscatedName("az") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Ltm;IB)V", - garbageValue = "-1" + descriptor = "(Lul;IB)V", + garbageValue = "121" ) @Export("read") public void read(Buffer var1, int var2) { @@ -94,7 +96,7 @@ public void read(Buffer var1, int var2) { Friend var11 = (Friend)this.getByCurrentUsername(var4); if (var3) { Friend var12 = (Friend)this.getByCurrentUsername(var5); - if (var12 != null && var12 != var11) { + if (var12 != null && var11 != var12) { if (var11 != null) { this.remove(var12); } else { @@ -133,17 +135,17 @@ public void read(Buffer var1, int var2) { } if (var6 != var11.world) { - var11.int2 = ++this.field3782 - 1; + var11.int2 = ++this.field3813 - 1; if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * -1297576351) * -585067103; + var11.int2 = -(var11.int2 * 1199192167) * 885089111; } var11.world = var6; } var11.rank = var7; - var11.field3794 = var9; - var11.field3793 = var10; + var11.field3824 = var9; + var11.field3825 = var10; continue; } diff --git a/osrs/src/main/java/GZipDecompressor.java b/osrs/src/main/java/GZipDecompressor.java index fd537682a..6f2a8fd36 100644 --- a/osrs/src/main/java/GZipDecompressor.java +++ b/osrs/src/main/java/GZipDecompressor.java @@ -5,10 +5,10 @@ import java.util.zip.Inflater; -@ObfuscatedName("us") +@ObfuscatedName("vb") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("inflater") Inflater inflater; @@ -23,10 +23,10 @@ public GZipDecompressor() { GZipDecompressor(int var1, int var2, int var3) { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;[BI)V", - garbageValue = "1223236718" + descriptor = "(Lul;[BI)V", + garbageValue = "-684526708" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { diff --git a/osrs/src/main/java/GameBuild.java b/osrs/src/main/java/GameBuild.java index 060329983..d67ff8307 100644 --- a/osrs/src/main/java/GameBuild.java +++ b/osrs/src/main/java/GameBuild.java @@ -3,39 +3,39 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nb") +@ObfuscatedName("ng") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lng;" ) @Export("LIVE") static final GameBuild LIVE; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lng;" ) @Export("BUILDLIVE") static final GameBuild BUILDLIVE; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lng;" ) @Export("RC") static final GameBuild RC; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lng;" ) @Export("WIP") static final GameBuild WIP; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("name") public final String name; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("buildId") - public final int buildId; + final int buildId; static { LIVE = new GameBuild("LIVE", 0); @@ -48,154 +48,4 @@ public class GameBuild { this.name = var1; this.buildId = var2; } - - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-1216130805" - ) - static int method1869(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3903) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == 3904) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == 3905) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == 3906) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == 3907) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == 3908) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; - } else { - int var12; - if (var0 == 3910) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; - return 1; - } else if (var0 == 3911) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; - return 1; - } else if (var0 == 3912) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; - return 1; - } else if (var0 == 3913) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; - return 1; - } else { - boolean var13; - if (var0 == 3914) { - var13 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (class392.grandExchangeEvents != null) { - class392.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } - - return 1; - } else if (var0 == 3915) { - var13 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (class392.grandExchangeEvents != null) { - class392.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); - } - - return 1; - } else if (var0 == 3916) { - SoundCache.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1] == 1; - if (class392.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - class392.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } - - return 1; - } else if (var0 == 3917) { - var13 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (class392.grandExchangeEvents != null) { - class392.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } - - return 1; - } else if (var0 == 3918) { - var13 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (class392.grandExchangeEvents != null) { - class392.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } - - return 1; - } else if (var0 == 3919) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class392.grandExchangeEvents == null ? 0 : class392.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var11; - if (var0 == 3920) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var11.world; - return 1; - } else if (var0 == 3921) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var11.getOfferName(); - return 1; - } else if (var0 == 3922) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); - return 1; - } else if (var0 == 3923) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); - long var5 = GameEngine.clockNow() - class132.field1272 - var11.age; - int var7 = (int)(var5 / 3600000L); - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == 3924) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == 3925) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == 3926) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class392.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } else if (var0 == 3939) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var3).isTradable ? 1 : 0; - return 1; - } else { - return 2; - } - } - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/GameEngine.java b/osrs/src/main/java/GameEngine.java index 3d4d7ee3c..e92607c5c 100644 --- a/osrs/src/main/java/GameEngine.java +++ b/osrs/src/main/java/GameEngine.java @@ -12,121 +12,118 @@ import java.awt.image.ImageObserver; import java.net.URL; -@ObfuscatedName("bm") +@ObfuscatedName("bb") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lgw;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lbm;" + descriptor = "Lbb;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("az") - @Export("gameCyclesToDo") - static int gameCyclesToDo; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("fps") protected static int fps; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("graphicsTickTimes") static long[] graphicsTickTimes; - @ObfuscatedName("ar") + @ObfuscatedName("ay") + static int field100; + @ObfuscatedName("as") @Export("clientTickTimes") static long[] clientTickTimes; - @ObfuscatedName("by") - static Image field103; - @ObfuscatedName("bs") - static int field102; - @ObfuscatedName("bb") + @ObfuscatedName("bz") + static int field101; + @ObfuscatedName("bu") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("be") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lak;" + descriptor = "Lad;" ) @Export("keyHandler") - protected static KeyHandler keyHandler; - @ObfuscatedName("bz") + static KeyHandler keyHandler; + @ObfuscatedName("bg") @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("canvasX") int canvasX; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("canvasY") int canvasY; - @ObfuscatedName("aj") - int field114; - @ObfuscatedName("av") + @ObfuscatedName("az") int field116; - @ObfuscatedName("aw") + @ObfuscatedName("at") + int field115; + @ObfuscatedName("af") @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("bh") - protected boolean field123; - @ObfuscatedName("bv") + @ObfuscatedName("bn") + protected boolean field121; + @ObfuscatedName("bd") @Export("frame") Frame frame; - @ObfuscatedName("bt") + @ObfuscatedName("be") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("bm") + @ObfuscatedName("bb") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("bf") + @ObfuscatedName("bo") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("bq") - volatile long field128; @ObfuscatedName("bp") + volatile long field126; + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lay;" + descriptor = "Laq;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("bu") + @ObfuscatedName("bs") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("bo") + @ObfuscatedName("bc") @Export("eventQueue") final EventQueue eventQueue; @@ -140,7 +137,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen fps = 0; graphicsTickTimes = new long[32]; clientTickTimes = new long[32]; - field102 = 500; + field101 = 500; volatileFocus = true; keyHandler = new KeyHandler(); garbageCollectorLastCollectionTime = -1L; @@ -151,11 +148,11 @@ protected GameEngine() { this.hasErrored = false; this.canvasX = 0; this.canvasY = 0; - this.field123 = false; + this.field121 = false; this.fullRedraw = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; - this.field128 = 0L; + this.field126 = 0L; EventQueue var1 = null; try { @@ -164,35 +161,34 @@ protected GameEngine() { } this.eventQueue = var1; - DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); - FloorDecoration.pcmPlayerProvider = var2; + class403.method2054(new DevicePcmPlayerProvider()); } - @ObfuscatedName("at") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1343076745" + descriptor = "(IIB)V", + garbageValue = "119" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method155(); + this.method158(); } this.maxCanvasWidth = var1; this.maxCanvasHeight = var2; } - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "-272604069" + descriptor = "(Ljava/lang/Object;B)V", + garbageValue = "-34" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - PendingSpawn.method505(1L); + Players.method623(1L); } if (var1 != null) { @@ -202,13 +198,13 @@ final void post(Object var1) { } } - @ObfuscatedName("ai") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(B)Lgk;", - garbageValue = "24" + descriptor = "(I)Lgc;", + garbageValue = "643109691" ) @Export("mouseWheel") - protected class174 mouseWheel() { + protected class176 mouseWheel() { if (this.mouseWheelHandler == null) { this.mouseWheelHandler = new MouseWheelHandler(); this.mouseWheelHandler.addTo(this.canvas); @@ -217,115 +213,85 @@ protected class174 mouseWheel() { return this.mouseWheelHandler; } - @ObfuscatedName("az") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-84" + descriptor = "(I)V", + garbageValue = "-97772302" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); } - @ObfuscatedName("ap") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "255" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1746840557" ) - protected void method138(String var1) { + protected void method141(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); } @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)Ljava/awt/datatransfer/Clipboard;", - garbageValue = "-1215097022" + garbageValue = "-375508984" ) @Export("getClipboard") - protected Clipboard getClipboard() { + public Clipboard getClipboard() { return this.clipboard; } - @ObfuscatedName("af") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "216188058" + descriptor = "(B)V", + garbageValue = "84" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { - class28.KeyHandler_keyCodes[186] = 57; - class28.KeyHandler_keyCodes[187] = 27; - class28.KeyHandler_keyCodes[188] = 71; - class28.KeyHandler_keyCodes[189] = 26; - class28.KeyHandler_keyCodes[190] = 72; - class28.KeyHandler_keyCodes[191] = 73; - class28.KeyHandler_keyCodes[192] = 58; - class28.KeyHandler_keyCodes[219] = 42; - class28.KeyHandler_keyCodes[220] = 74; - class28.KeyHandler_keyCodes[221] = 43; - class28.KeyHandler_keyCodes[222] = 59; - class28.KeyHandler_keyCodes[223] = 28; - } else { - class28.KeyHandler_keyCodes[44] = 71; - class28.KeyHandler_keyCodes[45] = 26; - class28.KeyHandler_keyCodes[46] = 72; - class28.KeyHandler_keyCodes[47] = 73; - class28.KeyHandler_keyCodes[59] = 57; - class28.KeyHandler_keyCodes[61] = 27; - class28.KeyHandler_keyCodes[91] = 42; - class28.KeyHandler_keyCodes[92] = 74; - class28.KeyHandler_keyCodes[93] = 43; - class28.KeyHandler_keyCodes[192] = 28; - class28.KeyHandler_keyCodes[222] = 58; - class28.KeyHandler_keyCodes[520] = 59; - } - - keyHandler.method89(this.canvas); + WorldMapSection2.method1451(); + keyHandler.method98(this.canvas); } - @ObfuscatedName("ad") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "61" + descriptor = "(I)V", + garbageValue = "-1343543797" ) - protected final void method141() { - keyHandler.method92(); + protected final void method144() { + keyHandler.method100(); } - @ObfuscatedName("aq") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lbv;II)V", - garbageValue = "178768313" + descriptor = "(Lbd;IS)V", + garbageValue = "-1458" ) - protected void method142(class29 var1, int var2) { - keyHandler.method86(var1, var2); + protected void method145(class29 var1, int var2) { + keyHandler.method96(var1, var2); } - @ObfuscatedName("al") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1089439044" + garbageValue = "1316323394" ) - protected final void method143() { - java.awt.Canvas var1 = this.canvas; - var1.addMouseListener(MouseHandler.MouseHandler_instance); - var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var1.addFocusListener(MouseHandler.MouseHandler_instance); + protected final void method146() { + Tiles.method455(this.canvas); } - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "122" + descriptor = "(I)V", + garbageValue = "-845812181" ) @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); if (var1 != null) { Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field114); - this.contentHeight = Math.max(var2.highY, this.field116); + this.contentWidth = Math.max(var2.highX, this.field116); + this.contentHeight = Math.max(var2.highY, this.field115); if (this.contentWidth <= 0) { this.contentWidth = 1; } @@ -334,12 +300,12 @@ final void resizeCanvas() { this.contentHeight = 1; } - class113.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - class177.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - class113.canvasWidth) / 2; + class340.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + class491.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - class340.canvasWidth) / 2; this.canvasY = 0; - this.canvas.setSize(class113.canvasWidth, class177.canvasHeight); - AttackOption.rasterProvider = new RasterProvider(class113.canvasWidth, class177.canvasHeight, this.canvas, this.field123); + this.canvas.setSize(class340.canvasWidth, class491.canvasHeight); + class223.rasterProvider = new RasterProvider(class340.canvasWidth, class491.canvasHeight, this.canvas, this.field121); if (var1 == this.frame) { Insets var3 = this.frame.getInsets(); this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); @@ -352,25 +318,25 @@ final void resizeCanvas() { } } - @ObfuscatedName("ar") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "59" + descriptor = "(I)V", + garbageValue = "-953371865" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("ab") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1724529603" + garbageValue = "175147715" ) @Export("clearBackground") void clearBackground() { int var1 = this.canvasX; int var2 = this.canvasY; - int var3 = this.contentWidth - class113.canvasWidth - var1; - int var4 = this.contentHeight - class177.canvasHeight - var2; + int var3 = this.contentWidth - class340.canvasWidth - var1; + int var4 = this.contentHeight - class491.canvasHeight - var2; if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); @@ -405,40 +371,37 @@ void clearBackground() { } - @ObfuscatedName("ag") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "239" + descriptor = "(I)V", + garbageValue = "-1884885221" ) @Export("replaceCanvas") final void replaceCanvas() { - keyHandler.method90(this.canvas); + keyHandler.method99(this.canvas); java.awt.Canvas var1 = this.canvas; var1.removeMouseListener(MouseHandler.MouseHandler_instance); var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); var1.removeFocusListener(MouseHandler.MouseHandler_instance); MouseHandler.MouseHandler_currentButtonVolatile = 0; if (this.mouseWheelHandler != null) { - this.mouseWheelHandler.method71(this.canvas); + this.mouseWheelHandler.method79(this.canvas); } this.addCanvas(); - keyHandler.method89(this.canvas); - java.awt.Canvas var2 = this.canvas; - var2.addMouseListener(MouseHandler.MouseHandler_instance); - var2.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var2.addFocusListener(MouseHandler.MouseHandler_instance); + keyHandler.method98(this.canvas); + Tiles.method455(this.canvas); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method155(); + this.method158(); } - @ObfuscatedName("am") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1491001696" + garbageValue = "-749120852" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3, int var4) { @@ -455,27 +418,27 @@ protected final void startThread(int var1, int var2, int var3, int var4) { } gameEngine = this; - class113.canvasWidth = var1; - class177.canvasHeight = var2; + class340.canvasWidth = var1; + class491.canvasHeight = var2; RunException.RunException_revision = var3; - RunException.field4287 = var4; - RunException.RunException_applet = this; + RunException.field4313 = var4; + class462.RunException_applet = this; if (taskHandler == null) { taskHandler = new TaskHandler(); } taskHandler.newThreadTask(this, 1); } catch (Exception var6) { - Messages.RunException_sendStackTrace((String)null, var6); + class190.RunException_sendStackTrace((String)null, var6); this.error("crash"); } } - @ObfuscatedName("ax") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "3" + descriptor = "(I)V", + garbageValue = "-2110760887" ) @Export("addCanvas") final synchronized void addCanvas() { @@ -485,20 +448,20 @@ final synchronized void addCanvas() { var1.remove(this.canvas); } - class113.canvasWidth = Math.max(var1.getWidth(), this.field114); - class177.canvasHeight = Math.max(var1.getHeight(), this.field116); + class340.canvasWidth = Math.max(var1.getWidth(), this.field116); + class491.canvasHeight = Math.max(var1.getHeight(), this.field115); Insets var2; if (this.frame != null) { var2 = this.frame.getInsets(); - class113.canvasWidth -= var2.right + var2.left; - class177.canvasHeight -= var2.bottom + var2.top; + class340.canvasWidth -= var2.right + var2.left; + class491.canvasHeight -= var2.top + var2.bottom; } this.canvas = new Canvas(this); var1.setBackground(Color.BLACK); var1.setLayout((LayoutManager)null); var1.add(this.canvas); - this.canvas.setSize(class113.canvasWidth, class177.canvasHeight); + this.canvas.setSize(class340.canvasWidth, class491.canvasHeight); this.canvas.setVisible(true); this.canvas.setBackground(Color.BLACK); if (var1 == this.frame) { @@ -511,35 +474,35 @@ final synchronized void addCanvas() { this.canvas.addFocusListener(this); this.canvas.requestFocus(); this.fullRedraw = true; - if (AttackOption.rasterProvider != null && class113.canvasWidth == AttackOption.rasterProvider.width && class177.canvasHeight == AttackOption.rasterProvider.height) { - ((RasterProvider)AttackOption.rasterProvider).setComponent(this.canvas); - AttackOption.rasterProvider.drawFull(0, 0); + if (class223.rasterProvider != null && class340.canvasWidth == class223.rasterProvider.width && class491.canvasHeight == class223.rasterProvider.height) { + ((RasterProvider)class223.rasterProvider).setComponent(this.canvas); + class223.rasterProvider.drawFull(0, 0); } else { - AttackOption.rasterProvider = new RasterProvider(class113.canvasWidth, class177.canvasHeight, this.canvas, this.field123); + class223.rasterProvider = new RasterProvider(class340.canvasWidth, class491.canvasHeight, this.canvas, this.field121); } this.isCanvasInvalid = false; - this.field128 = clockNow(); + this.field126 = GrandExchangeOfferTotalQuantityComparator.method1971(); } - @ObfuscatedName("ah") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "366742" + garbageValue = "2016311208" ) - protected void method149(boolean var1) { - if (this.field123 != var1) { - this.field123 = var1; - AttackOption.rasterProvider.method2646(var1); - AttackOption.rasterProvider.apply(); + protected void method152(boolean var1) { + if (this.field121 != var1) { + this.field121 = var1; + class223.rasterProvider.method2685(var1); + class223.rasterProvider.apply(); } } - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "805251619" + garbageValue = "-1592501950" ) @Export("checkHost") protected final boolean checkHost() { @@ -568,57 +531,57 @@ protected final boolean checkHost() { } } - @ObfuscatedName("ay") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1721255354" + descriptor = "(B)V", + garbageValue = "-73" ) @Export("clientTick") void clientTick() { - long var1 = clockNow(); - long var3 = clientTickTimes[PacketWriter.field1151]; - clientTickTimes[PacketWriter.field1151] = var1; - PacketWriter.field1151 = PacketWriter.field1151 + 1 & 31; - if (0L != var3 && var1 > var3) { + long var1 = GrandExchangeOfferTotalQuantityComparator.method1971(); + long var3 = clientTickTimes[class178.field1457]; + clientTickTimes[class178.field1457] = var1; + class178.field1457 = class178.field1457 + 1 & 31; + if (var3 != 0L && var1 > var3) { } synchronized(this) { - class370.hasFocus = volatileFocus; + KeyHandler.hasFocus = volatileFocus; } this.doCycle(); } - @ObfuscatedName("aj") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1251903818" + descriptor = "(B)V", + garbageValue = "68" ) - protected final void method152() { + protected final void method155() { this.fullRedraw = true; } - @ObfuscatedName("av") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "543987991" + garbageValue = "1944967760" ) @Export("graphicsTick") void graphicsTick() { Container var1 = this.container(); - long var2 = clockNow(); - long var4 = graphicsTickTimes[ParamComposition.field1678]; - graphicsTickTimes[ParamComposition.field1678] = var2; - ParamComposition.field1678 = ParamComposition.field1678 + 1 & 31; + long var2 = GrandExchangeOfferTotalQuantityComparator.method1971(); + long var4 = graphicsTickTimes[field100]; + graphicsTickTimes[field100] = var2; + field100 = field100 + 1 & 31; if (var4 != 0L && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if (++field102 - 1 > 50) { - field102 -= 50; + if (++field101 - 1 > 50) { + field101 -= 50; this.fullRedraw = true; - this.canvas.setSize(class113.canvasWidth, class177.canvasHeight); + this.canvas.setSize(class340.canvasWidth, class491.canvasHeight); this.canvas.setVisible(true); if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); @@ -632,7 +595,7 @@ void graphicsTick() { this.replaceCanvas(); } - this.method154(); + this.method157(); this.draw(this.fullRedraw); if (this.fullRedraw) { this.clearBackground(); @@ -641,33 +604,33 @@ void graphicsTick() { this.fullRedraw = false; } - @ObfuscatedName("aw") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1664691529" + descriptor = "(B)V", + garbageValue = "3" ) - final void method154() { + final void method157() { Bounds var1 = this.getFrameContentBounds(); - if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { + if (var1.highX != this.contentWidth || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { this.resizeCanvas(); this.resizeCanvasNextFrame = false; } } - @ObfuscatedName("ak") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-351835050" ) - final void method155() { + final void method158() { this.resizeCanvasNextFrame = true; } - @ObfuscatedName("bh") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(S)V", + garbageValue = "17082" ) @Export("kill") final synchronized void kill() { @@ -702,87 +665,87 @@ final synchronized void kill() { } } - @ObfuscatedName("by") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "208117174" + descriptor = "(B)V", + garbageValue = "-84" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1753601126" + garbageValue = "-800201684" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("bm") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1944984067" + descriptor = "(ZB)V", + garbageValue = "40" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("bf") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1298916795" + garbageValue = "1875481219" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;ZB)V", - garbageValue = "-97" + descriptor = "(ILjava/lang/String;ZI)V", + garbageValue = "234034519" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (ObjectSound.fontHelvetica13 == null) { - ObjectSound.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - class85.loginScreenFontMetrics = this.canvas.getFontMetrics(ObjectSound.fontHelvetica13); + if (class14.fontHelvetica13 == null) { + class14.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + class14.loginScreenFontMetrics = this.canvas.getFontMetrics(class14.fontHelvetica13); } if (var3) { var4.setColor(Color.black); - var4.fillRect(0, 0, class113.canvasWidth, class177.canvasHeight); + var4.fillRect(0, 0, class340.canvasWidth, class491.canvasHeight); } Color var5 = new Color(140, 17, 17); try { - if (field103 == null) { - field103 = this.canvas.createImage(304, 34); + if (class319.field2797 == null) { + class319.field2797 = this.canvas.createImage(304, 34); } - Graphics var6 = field103.getGraphics(); + Graphics var6 = class319.field2797.getGraphics(); var6.setColor(var5); var6.drawRect(0, 0, 303, 33); var6.fillRect(2, 2, var1 * 3, 30); var6.setColor(Color.black); var6.drawRect(1, 1, 301, 31); var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); - var6.setFont(ObjectSound.fontHelvetica13); + var6.setFont(class14.fontHelvetica13); var6.setColor(Color.white); - var6.drawString(var2, (304 - class85.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(field103, class113.canvasWidth / 2 - 152, class177.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - class14.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(class319.field2797, class340.canvasWidth / 2 - 152, class491.canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { - int var7 = class113.canvasWidth / 2 - 152; - int var8 = class177.canvasHeight / 2 - 18; + int var7 = class340.canvasWidth / 2 - 152; + int var8 = class491.canvasHeight / 2 - 18; var4.setColor(var5); var4.drawRect(var7, var8, 303, 33); var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); var4.setColor(Color.black); var4.drawRect(var7 + 1, var8 + 1, 301, 31); - var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(ObjectSound.fontHelvetica13); + var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); + var4.setFont(class14.fontHelvetica13); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - class85.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - class14.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -790,21 +753,21 @@ protected final void drawInitial(int var1, String var2, boolean var3) { } - @ObfuscatedName("ba") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-146638494" + garbageValue = "403874015" ) - protected final void method158() { - field103 = null; - ObjectSound.fontHelvetica13 = null; - class85.loginScreenFontMetrics = null; + protected final void method161() { + class319.field2797 = null; + class14.fontHelvetica13 = null; + class14.loginScreenFontMetrics = null; } - @ObfuscatedName("bl") + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "305949479" + garbageValue = "1574795554" ) @Export("error") protected void error(String var1) { @@ -820,10 +783,10 @@ protected void error(String var1) { } } - @ObfuscatedName("bp") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/Container;", - garbageValue = "-1637240751" + descriptor = "(B)Ljava/awt/Container;", + garbageValue = "91" ) @Export("container") Container container() { @@ -832,37 +795,37 @@ Container container() { @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(I)Lrb;", - garbageValue = "790707673" + descriptor = "(I)Lrx;", + garbageValue = "-138440448" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field114); - int var3 = Math.max(var1.getHeight(), this.field116); + int var2 = Math.max(var1.getWidth(), this.field116); + int var3 = Math.max(var1.getHeight(), this.field115); if (this.frame != null) { Insets var4 = this.frame.getInsets(); var2 -= var4.right + var4.left; - var3 -= var4.top + var4.bottom; + var3 -= var4.bottom + var4.top; } return new Bounds(var2, var3); } - @ObfuscatedName("bo") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1032464717" + garbageValue = "1209134026" ) @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; } - @ObfuscatedName("br") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1929688897" + garbageValue = "390692392" ) @Export("vmethod1485") protected abstract void vmethod1485(); @@ -871,8 +834,8 @@ protected final boolean hasFrame() { @ObfuscatedName("destroy") public final void destroy() { if (this == gameEngine && !isKilled) { - stopTimeMs = clockNow(); - PendingSpawn.method505(5000L); + stopTimeMs = GrandExchangeOfferTotalQuantityComparator.method1971(); + Players.method623(5000L); this.kill(); } } @@ -882,9 +845,9 @@ public final void destroy() { public final synchronized void paint(Graphics var1) { if (this == gameEngine && !isKilled) { this.fullRedraw = true; - if (clockNow() - this.field128 > 1000L) { + if (GrandExchangeOfferTotalQuantityComparator.method1971() - this.field126 > 1000L) { Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= class113.canvasWidth && var2.height >= class177.canvasHeight) { + if (var2 == null || var2.width >= class340.canvasWidth && var2.height >= class491.canvasHeight) { this.isCanvasInvalid = true; } } @@ -899,7 +862,7 @@ public void run() { if (TaskHandler.javaVendor != null) { String var1 = TaskHandler.javaVendor.toLowerCase(); if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { - String var2 = class106.javaVersion; + String var2 = TaskHandler.javaVersion; if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { this.error("wrongjava"); return; @@ -907,11 +870,11 @@ public void run() { if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && class330.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && IsaacCipher.isDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if (class218.isNumber(var4) && HealthBarUpdate.method524(var4) < 10) { + if (AttackOption.isNumber(var4) && class36.method182(var4) < 10) { this.error("wrongjava"); return; } @@ -924,28 +887,20 @@ public void run() { this.setFocusCycleRoot(true); this.addCanvas(); this.setUp(); + class314.clock = WorldMapScaleHandler.method1602(); - Object var8; - try { - var8 = new NanoClock(); - } catch (Throwable var6) { - var8 = new MilliClock(); - } - - class332.clock = (Clock)var8; - - while (0L == stopTimeMs || clockNow() < stopTimeMs) { - gameCyclesToDo = class332.clock.wait(cycleDurationMillis, fiveOrOne); + while (0L == stopTimeMs || GrandExchangeOfferTotalQuantityComparator.method1971() < stopTimeMs) { + class160.gameCyclesToDo = class314.clock.wait(cycleDurationMillis, fiveOrOne); - for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { + for (int var5 = 0; var5 < class160.gameCyclesToDo; ++var5) { this.clientTick(); } this.graphicsTick(); this.post(this.canvas); } - } catch (Exception var7) { - Messages.RunException_sendStackTrace((String)null, var7); + } catch (Exception var6) { + class190.RunException_sendStackTrace((String)null, var6); this.error("crash"); } @@ -960,11 +915,9 @@ public final void start() { } } - @Export("stop") - @ObfuscatedName("stop") public final void stop() { if (this == gameEngine && !isKilled) { - stopTimeMs = clockNow() + 4000L; + stopTimeMs = GrandExchangeOfferTotalQuantityComparator.method1971() + 4000L; } } @@ -1012,131 +965,14 @@ public final void windowOpened(WindowEvent var1) { @ObfuscatedName("init") public abstract void init(); - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "1742672473" - ) - @Export("clockNow") - public static final synchronized long clockNow() { - long var0 = System.currentTimeMillis(); - if (var0 < class301.field2754) { - Canvas.field61 += class301.field2754 - var0; - } - - class301.field2754 = var0; - return var0 + Canvas.field61; - } - - @ObfuscatedName("ao") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "([Lch;II[I[II)V", - garbageValue = "1909898083" + descriptor = "(II)V", + garbageValue = "-1887479417" ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { - int var5 = var1 - 1; - int var6 = var2 + 1; - int var7 = (var2 + var1) / 2; - World var8 = var0[var7]; - var0[var7] = var0[var1]; - var0[var1] = var8; - - while (var5 < var6) { - boolean var9 = true; - - int var10; - int var11; - int var12; - do { - --var6; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var6].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var6].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var6].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var6].id; - var12 = var8.id; - } - - if (var11 != var12) { - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - var9 = true; - - do { - ++var5; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var5].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var5].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var5].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var5].id; - var12 = var8.id; - } - - if (var11 != var12) { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; - } - } - - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); + static void method166(int var0) { + if (var0 != Login.loginIndex) { + Login.loginIndex = var0; } - } } \ No newline at end of file diff --git a/osrs/src/main/java/GameObject.java b/osrs/src/main/java/GameObject.java index d00a184ea..0906f1ef4 100644 --- a/osrs/src/main/java/GameObject.java +++ b/osrs/src/main/java/GameObject.java @@ -3,57 +3,51 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("kl") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lmi;" - ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("plane") int plane; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("z") int z; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("centerX") int centerX; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("centerY") int centerY; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Ljy;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("orientation") int orientation; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("startX") int startX; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("endX") int endX; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("startY") int startY; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("endY") int endY; - @ObfuscatedName("ad") - int field2306; - @ObfuscatedName("aq") + @ObfuscatedName("ag") + int field2319; + @ObfuscatedName("aa") @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("tag") public long tag; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("flags") int flags; @@ -61,4 +55,22 @@ public final class GameObject { this.tag = 0L; this.flags = 0; } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SB)V", + garbageValue = "84" + ) + public static void method1426(String[] var0, short[] var1) { + VarpDefinition.sortItemsByName(var0, var1, 0, var0.length - 1); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "2128713491" + ) + public static int method1427(int var0) { + return class479.field3939[var0 & 16383]; + } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeEvent.java b/osrs/src/main/java/GrandExchangeEvent.java index 572131270..2d5d6c37a 100644 --- a/osrs/src/main/java/GrandExchangeEvent.java +++ b/osrs/src/main/java/GrandExchangeEvent.java @@ -3,30 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oz") +@ObfuscatedName("od") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("au") + @ObfuscatedName("qt") + static int field3617; + @ObfuscatedName("ac") @Export("world") public final int world; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("age") public final long age; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Log;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("offerName") String offerName; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Ltm;BI)V" + descriptor = "(Lul;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -36,8 +38,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method1958(2); - this.grandExchangeOffer.method1959(var2); + this.grandExchangeOffer.method1990(2); + this.grandExchangeOffer.method1991(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -45,38 +47,23 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "366933810" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "-12823" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "7" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "407762879" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "([FIFI)F", - garbageValue = "-1423774644" - ) - static float method1953(float[] var0, int var1, float var2) { - float var3 = var0[var1]; - - for (int var4 = var1 - 1; var4 >= 0; --var4) { - var3 = var3 * var2 + var0[var4]; - } - - return var3; - } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeEvents.java b/osrs/src/main/java/GrandExchangeEvents.java index f079535d1..99ba83dd9 100644 --- a/osrs/src/main/java/GrandExchangeEvents.java +++ b/osrs/src/main/java/GrandExchangeEvents.java @@ -8,22 +8,22 @@ import java.util.Comparator; import java.util.List; -@ObfuscatedName("no") +@ObfuscatedName("ox") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("events") public final List events; @@ -36,7 +36,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - descriptor = "(Ltm;Z)V", + descriptor = "(Lul;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -58,10 +58,10 @@ public GrandExchangeEvents(Buffer var1, boolean var2) { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;ZI)V", - garbageValue = "2032347624" + descriptor = "(Ljava/util/Comparator;ZB)V", + garbageValue = "0" ) @Export("sort") public void sort(Comparator var1, boolean var2) { diff --git a/osrs/src/main/java/GrandExchangeOffer.java b/osrs/src/main/java/GrandExchangeOffer.java index 641679895..f5081d929 100644 --- a/osrs/src/main/java/GrandExchangeOffer.java +++ b/osrs/src/main/java/GrandExchangeOffer.java @@ -3,31 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oh") +@ObfuscatedName("og") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("state") byte state; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("id") public int id; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("unitPrice") public int unitPrice; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("currentPrice") public int currentPrice; @@ -35,7 +29,7 @@ public GrandExchangeOffer() { } @ObfuscatedSignature( - descriptor = "(Ltm;Z)V", + descriptor = "(Lul;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -47,57 +41,46 @@ public GrandExchangeOffer(Buffer var1, boolean var2) { this.currentPrice = var1.readInt(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-104" + descriptor = "(I)I", + garbageValue = "1707206023" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-247945963" + descriptor = "(B)I", + garbageValue = "1" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-847011160" + garbageValue = "-1662902257" ) - void method1958(int var1) { + void method1990(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-48" + descriptor = "(II)V", + garbageValue = "-1720563334" ) - void method1959(int var1) { + void method1991(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); } } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "11520" - ) - static void method1954(int var0) { - class449.field3867 = var0; - class449.field3868 = new class449[var0]; - class338.field3112 = 0; - } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferAgeComparator.java b/osrs/src/main/java/GrandExchangeOfferAgeComparator.java index 6f06cd79f..87bab934e 100644 --- a/osrs/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferAgeComparator.java @@ -5,17 +5,17 @@ import java.util.Comparator; -@ObfuscatedName("nc") +@ObfuscatedName("oy") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Loz;Loz;I)I", - garbageValue = "1942939549" + descriptor = "(Lod;Lod;I)I", + garbageValue = "-684725239" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); + return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); } @Export("compare") @@ -29,4 +29,19 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIIZII)J", + garbageValue = "-2118619289" + ) + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; + if (var3) { + var5 |= 65536L; + } + + return var5; + } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferNameComparator.java b/osrs/src/main/java/GrandExchangeOfferNameComparator.java index d04d98dba..98ad8b4d9 100644 --- a/osrs/src/main/java/GrandExchangeOfferNameComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferNameComparator.java @@ -3,15 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.ArrayList; import java.util.Comparator; +import java.util.Iterator; -@ObfuscatedName("nh") +@ObfuscatedName("oz") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("au") + @ObfuscatedName("aq") + static String field3614; + @ObfuscatedName("oi") @ObfuscatedSignature( - descriptor = "(Loz;Loz;I)I", - garbageValue = "1380948435" + descriptor = "Lnm;" + ) + static Widget field3615; + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lod;Lod;B)I", + garbageValue = "59" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -29,4 +39,397 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "1" + ) + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Ljava/util/ArrayList;ZI)V", + garbageValue = "-1254192693" + ) + static void method1979(ArrayList var0, boolean var1) { + if (!var1) { + class319.field2789.clear(); + } + + Iterator var2 = var0.iterator(); + + while (var2.hasNext()) { + MusicSong var3 = (MusicSong)var2.next(); + if (var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { + if (!var1) { + class319.field2789.add(var3); + } + + class319.field2791.add(var3); + } + } + + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "-33084570" + ) + static int method1980(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { + var3 = class87.Client_plane; + int var9 = (TextureProvider.localPlayer.x >> 7) + class20.baseX; + int var5 = (TextureProvider.localPlayer.y >> 7) + class19.baseY; + class153.getWorldMap().method2432(var3, var9, var5, true); + return 1; + } else { + WorldMapArea var11; + if (var0 == 6601) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + String var16 = ""; + var11 = class153.getWorldMap().getMapArea(var3); + if (var11 != null) { + var16 = var11.getExternalName(); + } + + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == 6602) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + class153.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == 6603) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == 6604) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + class153.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == 6605) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; + } else { + Coord var15; + if (var0 == 6606) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + class153.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); + return 1; + } else if (var0 == 6607) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + class153.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); + return 1; + } else if (var0 == 6608) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + class153.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == 6609) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + class153.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == 6610) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getDisplayY(); + return 1; + } else { + WorldMapArea var13; + if (var0 == 6611) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = class153.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); + } + + return 1; + } else if (var0 == 6612) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = class153.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; + } + + return 1; + } else if (var0 == 6613) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = class153.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } else if (var0 == 6614) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = class153.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getZoom(); + } + + return 1; + } else if (var0 == 6615) { + var15 = class153.getWorldMap().getDisplayCoord(); + if (var15 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.x; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.y; + } + + return 1; + } else if (var0 == 6616) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == 6617) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var13 = class153.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + int[] var14 = var13.position(var15.plane, var15.x, var15.y); + if (var14 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[0]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[1]; + } + + return 1; + } + } else { + Coord var7; + if (var0 == 6618) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var13 = class153.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + var7 = var13.coord(var15.x, var15.y); + if (var7 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } + } else { + Coord var12; + if (var0 == 6619) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + UrlRequest.method665(var3, var12, false); + return 1; + } else if (var0 == 6620) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + UrlRequest.method665(var3, var12, true); + return 1; + } else if (var0 == 6621) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + var11 = class153.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; + return 1; + } + } else if (var0 == 6622) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var13 = class153.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getId(); + } + + return 1; + } else if (var0 == 6624) { + class153.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + class153.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + class153.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + class153.getWorldMap().resetCyclesPerFlash(); + return 1; + } else { + boolean var10; + if (var0 == 6628) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class153.getWorldMap().setPerpetualFlash(var10); + return 1; + } else if (var0 == 6629) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + class153.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == 6630) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + class153.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == 6631) { + class153.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == 6632) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class153.getWorldMap().setElementsDisabled(var10); + return 1; + } else { + boolean var4; + if (var0 == 6633) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + class153.getWorldMap().disableElement(var3, var4); + return 1; + } else if (var0 == 6634) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + class153.getWorldMap().setCategoryDisabled(var3, var4); + return 1; + } else if (var0 == 6635) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == 6636) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6637) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + var7 = class153.getWorldMap().method2476(var3, var12); + if (var7 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } else { + AbstractWorldMapIcon var8; + if (var0 == 6639) { + var8 = class153.getWorldMap().iconStart(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else if (var0 == 6640) { + var8 = class153.getWorldMap().iconNext(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else { + WorldMapElement var6; + if (var0 == 6693) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = class148.WorldMapElement_get(var3); + if (var6.name == null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var6.name; + } + + return 1; + } else if (var0 == 6694) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = class148.WorldMapElement_get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.textSize; + return 1; + } else if (var0 == 6695) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = class148.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.category; + } + + return 1; + } else if (var0 == 6696) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = class148.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.sprite1; + } + + return 1; + } else if (var0 == 6697) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class230.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class230.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == 6699) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class230.worldMapEvent.coord2.packed(); + return 1; + } else { + return 2; + } + } + } + } + } + } + } + } + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 787a6501f..cd79cbc24 100644 --- a/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -5,34 +5,27 @@ import java.util.Comparator; -@ObfuscatedName("cu") +@ObfuscatedName("cm") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("ao") - static int field361; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("ka") + @ObfuscatedName("fv") @ObfuscatedSignature( - descriptor = "[Luk;" + descriptor = "Lok;" ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("au") + static Archive field361; + @ObfuscatedName("va") + static int field360; + @ObfuscatedName("ac") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Loz;Loz;I)I", - garbageValue = "117695478" + descriptor = "(Lod;Lod;S)I", + garbageValue = "255" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -65,111 +58,83 @@ public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("ab") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "126" + descriptor = "(II)I", + garbageValue = "-2097816691" ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; - } + public static int method348(int var0) { + return SecureRandomFuture.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); } - @ObfuscatedName("jc") + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "-1589346294" + descriptor = "(IB)Ljava/lang/Object;", + garbageValue = "29" ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; - } + static Object method349(int var0) { + return ItemContainer.method460((class517)SequenceDefinition.findEnumerated(class517.method2528(), var0)); + } - if (var3 < 1) { - var3 = 1; + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "(Ldw;I)V", + garbageValue = "-1344994052" + ) + static final void method350(PendingSpawn var0) { + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { + var1 = class10.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); } - int var5 = var3 - 334; - int var6; - if (var5 < 0) { - var6 = Client.field638; - } else if (var5 >= 100) { - var6 = Client.field640; - } else { - var6 = (Client.field640 - Client.field638) * var5 / 100 + Client.field638; + if (var0.type == 1) { + var1 = class10.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); } - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var17; - if (var7 < Client.field641) { - var17 = Client.field641; - var6 = var17 * var2 * 334 / (var3 * 512); - if (var6 > Client.field634) { - var6 = Client.field634; - var8 = var3 * var6 * 512 / (var17 * 334); - var9 = (var2 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); - } + if (var0.type == 2) { + var1 = class10.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } - var0 += var9; - var2 -= var9 * 2; - } - } else if (var7 > Client.field637) { - var17 = Client.field637; - var6 = var17 * var2 * 334 / (var3 * 512); - if (var6 < Client.field635) { - var6 = Client.field635; - var8 = var17 * var2 * 334 / (var6 * 512); - var9 = (var3 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); - } + if (var0.type == 3) { + var1 = class10.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } - var1 += var9; - var3 -= var9 * 2; - } + if (var1 != 0L) { + int var6 = class10.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = SecureRandomFuture.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; } - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - int[] var16 = new int[9]; - - for (var9 = 0; var9 < var16.length; ++var9) { - int var10 = var9 * 32 + 15 + 128; - int var11 = class172.method907(var10); - int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; - int var14 = var3 - 334; - if (var14 < 0) { - var14 = 0; - } else if (var14 > 100) { - var14 = 100; - } + var0.objectId = var3; + var0.field953 = var4; + var0.field947 = var5; + } - int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; - int var13 = var15 * var11 / 256; - var16[var9] = var13 * var12 >> 16; + @ObfuscatedName("ni") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-17" + ) + static final void method351() { + PacketBufferNode var0 = ClanChannelMember.getPacketBufferNode(ClientPacket.CLOSE_MODAL, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var0); + Interpreter.field702 = true; + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { + if (var1.type == 0 || var1.type == 3) { + ArchiveDisk.closeInterface(var1, true); } + } - Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); + if (Client.meslayerContinueWidget != null) { + ClanChannelMember.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; } - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; + Interpreter.field702 = false; } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 9118b7b18..cceadc868 100644 --- a/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -3,16 +3,20 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.awt.datatransfer.Clipboard; +import java.lang.management.GarbageCollectorMXBean; import java.util.Comparator; -@ObfuscatedName("nx") +@ObfuscatedName("oc") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("au") + @ObfuscatedName("bl") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Loz;Loz;I)I", - garbageValue = "1689920131" + descriptor = "(Lod;Lod;I)I", + garbageValue = "1700442227" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -31,21 +35,228 @@ public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "-784623811" + ) + public static final synchronized long method1971() { + long var0 = System.currentTimeMillis(); + if (var0 < class135.field1287) { + class315.field2773 += class135.field1287 - var0; + } + + class135.field1287 = var0; + return var0 + class315.field2773; + } + + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "957509190" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lve;" ) - public static void method1943() { - class36.reflectionChecks = new IterableNodeDeque(); + public static RunException method1973(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { + var2 = (RunException)var0; + var2.field4315 = var2.field4315 + ' ' + var1; + } else { + var2 = new RunException(var0, var1); + } + + return var2; } - @ObfuscatedName("ov") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/datatransfer/Clipboard;", - garbageValue = "1573357466" + descriptor = "(Luy;B)V", + garbageValue = "-47" ) - public static Clipboard method1945() { - return class219.client.getClipboard(); + static final void method1975(PacketBuffer var0) { + int var1 = 0; + var0.importIndex(); + + byte[] var10000; + int var2; + int var3; + int var4; + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var3 = Players.Players_indices[var2]; + if ((Players.activityFlags[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class108.method619(var0); + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + WorldMapSectionType.readPlayerUpdate(var0, var3); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var3 = Players.Players_indices[var2]; + if ((Players.activityFlags[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class108.method619(var0); + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + WorldMapSectionType.readPlayerUpdate(var0, var3); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var3 = Players.Players_emptyIndices[var2]; + if ((Players.activityFlags[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class108.method619(var0); + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (class304.updateExternalPlayer(var0, var3)) { + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var3 = Players.Players_emptyIndices[var2]; + if ((Players.activityFlags[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class108.method619(var0); + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (class304.updateExternalPlayer(var0, var3)) { + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; + + for (var2 = 1; var2 < 2048; ++var2) { + var10000 = Players.activityFlags; + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var5 = Client.players[var2]; + if (var5 != null) { + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; + } + } + + } + } + } + } + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-29" + ) + static final boolean method1974() { + return ViewportMouse.ViewportMouse_isInViewport; + } + + @ObfuscatedName("lh") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "1235379718" + ) + static void method1976(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, class166.loginType); + + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != TextureProvider.localPlayer && var7.username != null && var7.username.equals(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByteAdd(0); + var8.packetBuffer.writeShortAddLE(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortAddLE(var3[var6]); + var8.packetBuffer.writeByteNeg(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByteNeg(0); + var8.packetBuffer.writeShortLE(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + var8.packetBuffer.writeShort(var3[var6]); + Client.packetWriter.addNode(var8); + } + + var4 = true; + break; + } + } + + if (!var4) { + class411.addGameMessage(4, "", "Unable to find " + var1); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java index c0d5abfba..0cdc15c90 100644 --- a/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -5,13 +5,13 @@ import java.util.Comparator; -@ObfuscatedName("oy") +@ObfuscatedName("oj") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Loz;Loz;I)I", - garbageValue = "-370241365" + descriptor = "(Lod;Lod;I)I", + garbageValue = "-1207503699" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -29,4 +29,25 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIIIB)I", + garbageValue = "73" + ) + static final int method1992(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-21" + ) + static void method1994(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferWorldComparator.java b/osrs/src/main/java/GrandExchangeOfferWorldComparator.java index 4ca7332d7..f921c937a 100644 --- a/osrs/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferWorldComparator.java @@ -3,22 +3,15 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.awt.*; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; -import java.util.ArrayList; import java.util.Comparator; -@ObfuscatedName("om") +@ObfuscatedName("ov") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Loz;Loz;I)I", - garbageValue = "456180240" + descriptor = "(Lod;Lod;I)I", + garbageValue = "-600778902" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -36,895 +29,4 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IIII)Ldh;", - garbageValue = "1291618963" - ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = (var1 << 8) + var0; - Script var5 = ModeWhere.method1981(var3, var0); - if (var5 != null) { - return var5; - } else { - int var6 = (-3 - var2 << 8) + var0; - var5 = ModeWhere.method1981(var6, var0); - if (var5 != null) { - return var5; - } else { - int var7 = var0 + -512; - var5 = ModeWhere.method1981(var7, var0); - return var5 != null ? var5 : null; - } - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Lbm;Lpi;Lpi;I)V", - garbageValue = "-567709199" - ) - static void method1950(GameEngine var0, Font var1, Font var2) { - int var5; - boolean var11; - int var35; - int var36; - boolean var45; - if (Login.worldSelectOpen) { - class212 var34 = AbstractWorldMapData.method1526(); - - while (true) { - if (!var34.method1105()) { - if (MouseHandler.MouseHandler_lastButton != 1 && (ObjTypeCustomisation.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { - break; - } - - int var4 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class153.changeWorldSelectSorting(0, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class153.changeWorldSelectSorting(0, 1); - break; - } - - var5 = Login.xPadding + 390; - if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class153.changeWorldSelectSorting(1, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class153.changeWorldSelectSorting(1, 1); - break; - } - - var35 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var35 && MouseHandler.MouseHandler_lastPressedX <= var35 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class153.changeWorldSelectSorting(2, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var35 + 15 && MouseHandler.MouseHandler_lastPressedX <= var35 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class153.changeWorldSelectSorting(2, 1); - break; - } - - var36 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var36 && MouseHandler.MouseHandler_lastPressedX <= var36 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class153.changeWorldSelectSorting(3, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var36 + 15 && MouseHandler.MouseHandler_lastPressedX <= var36 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class153.changeWorldSelectSorting(3, 1); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - WorldMapData_1.method1491(); - break; - } - - if (Login.hoveredWorldIndex != -1) { - World var37 = class176.World_worlds[Login.hoveredWorldIndex]; - if (var37.isDeadman()) { - var37.field679 = "beta"; - } - - var45 = false; - if (var37.properties != Client.worldProperties) { - boolean var46 = (Client.worldProperties & class510.field4125.rsOrdinal()) != 0; - var11 = var37.isDeadman(); - if (var46 && !var11 || !var46 && var11) { - var45 = true; - } - } - - ModeWhere.changeWorld(var37); - WorldMapData_1.method1491(); - if (var45) { - class415.reloadJS5(); - } - } else { - if (Login.worldSelectPage > 0 && class85.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class85.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class177.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class177.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && Skeleton.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= class113.canvasWidth - Skeleton.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= class113.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class177.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class177.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } - break; - } - - if (var34.field1890 == 13) { - WorldMapData_1.method1491(); - break; - } - - if (var34.field1890 == 96) { - if (Login.worldSelectPage > 0 && class85.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (var34.field1890 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && Skeleton.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } - } - - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - class449.clientPreferences.getTitleMusicDisabled(!class449.clientPreferences.getTitleMusicDisabled()); - if (!class449.clientPreferences.getTitleMusicDisabled()) { - ArrayList var3 = new ArrayList(); - var3.add(new MusicSong(class385.archive6, "scape main", "", 255, false)); - class53.method291(var3, 0, 0, 0, 100, false); - } else { - Script.method445(0, 0); - } - - UrlRequester.method652(); - } - - if (Client.gameState != 5) { - if (-1L == Login.field773) { - Login.field773 = GameEngine.clockNow() + 1000L; - } - - long var23 = GameEngine.clockNow(); - if (ChatChannel.method455() && -1L == Login.field772) { - Login.field772 = var23; - if (Login.field772 > Login.field773) { - Login.field773 = Login.field772; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - if (ClanChannelMember.clientLanguage == Language.Language_EN) { - if (MouseHandler.MouseHandler_lastButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var5 = Login.xPadding + 5; - short var6 = 463; - byte var7 = 100; - byte var25 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var7 + var5 && MouseHandler.MouseHandler_lastPressedY >= var6 && MouseHandler.MouseHandler_lastPressedY <= var25 + var6) { - if (class125.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - - return; - } - } - - if (WorldMapLabelSize.World_request != null) { - class53.method296(); - } - } - - var5 = MouseHandler.MouseHandler_lastButton; - var35 = MouseHandler.MouseHandler_lastPressedX; - var36 = MouseHandler.MouseHandler_lastPressedY; - if (var5 == 0) { - var35 = MouseHandler.MouseHandler_x; - var36 = MouseHandler.MouseHandler_y; - } - - if (!ObjTypeCustomisation.mouseCam && var5 == 4) { - var5 = 1; - } - - class212 var8 = AbstractWorldMapData.method1526(); - short var39; - int var40; - if (Login.loginIndex == 0) { - var45 = false; - - while (var8.method1105()) { - if (var8.field1890 == 84) { - var45 = true; - } - } - - var40 = class452.loginBoxCenter - 80; - var39 = 291; - if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { - class30.openURL(HorizontalAlignment.method978("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var40 = class452.loginBoxCenter + 80; - if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20 || var45) { - if ((Client.worldProperties & class510.field4126.rsOrdinal()) != 0) { - Login.Login_response0 = ""; - Login.Login_response1 = "This is a Beta world."; - Login.Login_response2 = "Your normal account will not be affected."; - Login.Login_response3 = ""; - PcmPlayer.method212(1); - ObjectComposition.method1042(); - } else if ((Client.worldProperties & class510.field4127.rsOrdinal()) != 0) { - if ((Client.worldProperties & class510.field4123.rsOrdinal()) != 0) { - Login.Login_response1 = "This is a High Risk PvP world."; - Login.Login_response2 = "Players can attack each other almost everywhere"; - Login.Login_response3 = "and the Protect Item prayer won't work."; - } else { - Login.Login_response1 = "This is a PvP world."; - Login.Login_response2 = "Players can attack each other"; - Login.Login_response3 = "almost everywhere."; - } - - Login.Login_response0 = "Warning!"; - PcmPlayer.method212(1); - ObjectComposition.method1042(); - } else if ((Client.worldProperties & class510.field4123.rsOrdinal()) != 0) { - Login.Login_response1 = "This is a High Risk world."; - Login.Login_response2 = "The Protect Item prayer will"; - Login.Login_response3 = "not work on this world."; - Login.Login_response0 = "Warning!"; - PcmPlayer.method212(1); - ObjectComposition.method1042(); - } else { - WorldMapAreaData.Login_promptCredentials(false); - } - } - } else { - int var9; - short var10; - if (Login.loginIndex == 1) { - while (true) { - if (!var8.method1105()) { - var9 = class452.loginBoxCenter - 80; - var10 = 321; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - WorldMapAreaData.Login_promptCredentials(false); - } - - var9 = class452.loginBoxCenter + 80; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - PcmPlayer.method212(0); - } - break; - } - - if (var8.field1890 == 84) { - WorldMapAreaData.Login_promptCredentials(false); - } else if (var8.field1890 == 13) { - PcmPlayer.method212(0); - } - } - } else { - int var14; - int var29; - short var38; - boolean var47; - if (Login.loginIndex == 2) { - var38 = 201; - var9 = var38 + 52; - if (var5 == 1 && var36 >= var9 - 12 && var36 < var9 + 2) { - Login.currentLoginField = 0; - } - - var9 += 15; - if (var5 == 1 && var36 >= var9 - 12 && var36 < var9 + 2) { - Login.currentLoginField = 1; - } - - var9 += 15; - var38 = 361; - if (class102.field1090 != null) { - var40 = class102.field1090.highX / 2; - if (var5 == 1 && var35 >= class102.field1090.lowX - var40 && var35 <= var40 + class102.field1090.lowX && var36 >= var38 - 15 && var36 < var38) { - switch(Login.field751) { - case 1: - class30.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); - return; - case 2: - class30.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var40 = class452.loginBoxCenter - 80; - var39 = 321; - if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class318.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - class318.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - class318.setLoginResponseString("", "Connecting to server...", ""); - PendingSpawn.method509(false); - MusicSong.updateGameState(20); - return; - } - - var40 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { - PcmPlayer.method212(0); - Login.Login_username = ""; - Login.Login_password = ""; - class503.field4107 = 0; - class369.otp = ""; - Login.field743 = true; - } - - var40 = class452.loginBoxCenter + -117; - var39 = 277; - Login.field745 = var35 >= var40 && var35 < var40 + class136.field1295 && var36 >= var39 && var36 < var39 + User.field3801; - if (var5 == 1 && Login.field745) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && class449.clientPreferences.getUsernameToRemember() != null) { - class449.clientPreferences.setUsernameToRemember((String)null); - } - } - - var40 = class452.loginBoxCenter + 24; - var39 = 277; - Login.field744 = var35 >= var40 && var35 < var40 + class136.field1295 && var36 >= var39 && var36 < var39 + User.field3801; - if (var5 == 1 && Login.field744) { - class449.clientPreferences.setIsUsernameHidden(!class449.clientPreferences.getIsUsernameHidden()); - if (!class449.clientPreferences.getIsUsernameHidden()) { - Login.Login_username = ""; - class449.clientPreferences.setUsernameToRemember((String)null); - ObjectComposition.method1042(); - } - } - - while (true) { - Transferable var42; - do { - while (true) { - label1169: - do { - while (true) { - while (var8.method1105()) { - if (var8.field1890 != 13) { - if (Login.currentLoginField != 0) { - continue label1169; - } - - class148.method788(var8.field1889); - if (var8.field1890 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (var8.field1890 == 84 || var8.field1890 == 80) { - Login.currentLoginField = 1; - } - - if (class157.method835(var8.field1889) && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + var8.field1889; - } - } else { - PcmPlayer.method212(0); - Login.Login_username = ""; - Login.Login_password = ""; - class503.field4107 = 0; - class369.otp = ""; - Login.field743 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (var8.field1890 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (var8.field1890 == 84 || var8.field1890 == 80) { - Login.currentLoginField = 0; - if (var8.field1890 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class318.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - class318.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - class318.setLoginResponseString("", "Connecting to server...", ""); - PendingSpawn.method509(false); - MusicSong.updateGameState(20); - return; - } - } - - if ((var8.getKeyPressed(82) || var8.getKeyPressed(87)) && var8.field1890 == 67) { - Clipboard var41 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var42 = var41.getContents(class219.client); - var14 = 20 - Login.Login_password.length(); - break; - } - - char var48 = var8.field1889; - if (var48 >= ' ' && var48 < 127 || var48 > 127 && var48 < 160 || var48 > 160 && var48 <= 255) { - var47 = true; - } else { - label1408: { - if (var48 != 0) { - char[] var49 = class384.cp1252AsciiExtension; - - for (var29 = 0; var29 < var49.length; ++var29) { - char var16 = var49[var29]; - if (var16 == var48) { - var47 = true; - break label1408; - } - } - } - - var47 = false; - } - } - - if (var47 && class157.method835(var8.field1889) && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + var8.field1889; - } - } - } while(var14 <= 0); - - try { - String var15 = (String)var42.getTransferData(DataFlavor.stringFlavor); - int var44 = Math.min(var14, var15.length()); - - for (int var17 = 0; var17 < var44; ++var17) { - char var19 = var15.charAt(var17); - boolean var18; - if ((var19 < ' ' || var19 >= 127) && (var19 <= 127 || var19 >= 160) && (var19 <= 160 || var19 > 255)) { - label1392: { - if (var19 != 0) { - char[] var20 = class384.cp1252AsciiExtension; - - for (int var21 = 0; var21 < var20.length; ++var21) { - char var22 = var20[var21]; - if (var22 == var19) { - var18 = true; - break label1392; - } - } - } - - var18 = false; - } - } else { - var18 = true; - } - - if (!var18 || !class157.method835(var15.charAt(var17))) { - PcmPlayer.method212(3); - return; - } - } - - Login.Login_password = Login.Login_password + var15.substring(0, var44); - } catch (UnsupportedFlavorException var32) { - } catch (IOException var33) { - } - } - } else { - Bounds var30; - if (Login.loginIndex == 3) { - var9 = Login.loginBoxX + 180; - var10 = 241; - var30 = var1.method2087(25, "need to log in using the Jagex Launcher instead.".length() - 34, "need to log in using the Jagex Launcher instead.", var9, var10); - if (var5 == 1 && var30.method2284(var35, var36)) { - class30.openURL("https://oldschool.runescape.com/launcher", true, false); - } - - var9 = Login.loginBoxX + 180; - var10 = 276; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - WorldMapAreaData.method1574(false); - } - - var9 = Login.loginBoxX + 180; - var10 = 326; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - class30.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); - return; - } - } else { - int var27; - if (Login.loginIndex == 4) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - class369.otp.trim(); - if (class369.otp.length() != 6) { - class318.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class503.field4107 = Integer.parseInt(class369.otp); - class369.otp = ""; - PendingSpawn.method509(true); - class318.setLoginResponseString("", "Connecting to server...", ""); - MusicSong.updateGameState(20); - return; - } - - if (var5 == 1 && var35 >= Login.loginBoxX + 180 - 9 && var35 <= Login.loginBoxX + 180 + 130 && var36 >= 263 && var36 <= 296) { - Login.field743 = !Login.field743; - } - - if (var5 == 1 && var35 >= Login.loginBoxX + 180 - 34 && var35 <= Login.loginBoxX + 34 + 180 && var36 >= 351 && var36 <= 363) { - class30.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - PcmPlayer.method212(0); - Login.Login_username = ""; - Login.Login_password = ""; - class503.field4107 = 0; - class369.otp = ""; - } - - while (var8.method1105()) { - var11 = false; - - for (var27 = 0; var27 < "1234567890".length(); ++var27) { - if (var8.field1889 == "1234567890".charAt(var27)) { - var11 = true; - break; - } - } - - if (var8.field1890 == 13) { - PcmPlayer.method212(0); - Login.Login_username = ""; - Login.Login_password = ""; - class503.field4107 = 0; - class369.otp = ""; - } else { - if (var8.field1890 == 85 && class369.otp.length() > 0) { - class369.otp = class369.otp.substring(0, class369.otp.length() - 1); - } - - if (var8.field1890 == 84) { - class369.otp.trim(); - if (class369.otp.length() != 6) { - class318.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class503.field4107 = Integer.parseInt(class369.otp); - class369.otp = ""; - PendingSpawn.method509(true); - class318.setLoginResponseString("", "Connecting to server...", ""); - MusicSong.updateGameState(20); - return; - } - - if (var11 && class369.otp.length() < 6) { - class369.otp = class369.otp + var8.field1889; - } - } - } - } else { - int var26; - if (Login.loginIndex == 5) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - class108.method620(); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - WorldMapAreaData.Login_promptCredentials(true); - } - - var39 = 361; - if (class90.field887 != null) { - var27 = class90.field887.highX / 2; - if (var5 == 1 && var35 >= class90.field887.lowX - var27 && var35 <= var27 + class90.field887.lowX && var36 >= var39 - 15 && var36 < var39) { - class30.openURL(HorizontalAlignment.method978("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (var8.method1105()) { - var47 = false; - - for (var26 = 0; var26 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var26) { - if (var8.field1889 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var26)) { - var47 = true; - break; - } - } - - if (var8.field1890 == 13) { - WorldMapAreaData.Login_promptCredentials(true); - } else { - if (var8.field1890 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (var8.field1890 == 84) { - class108.method620(); - return; - } - - if (var47 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + var8.field1889; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - if (ModeWhere.field3613 && !Client.onMobile) { - var9 = class452.loginBoxCenter - 150; - var40 = var9 + 40 + 240 + 25; - var39 = 231; - var27 = var39 + 40; - if (var5 == 1 && var35 >= var9 && var35 <= var40 && var36 >= var39 && var36 <= var27) { - var14 = var9; - var29 = 0; - - while (true) { - if (var29 >= 8) { - var26 = 0; - break; - } - - if (var35 <= var14 + 30) { - var26 = var29; - break; - } - - var14 += 30; - var14 += var29 != 1 && var29 != 3 ? 5 : 20; - ++var29; - } - - Login.field752 = var26; - } - - var26 = Login.loginBoxX + 180 - 80; - short var43 = 321; - boolean var50; - if (var5 == 1 && var35 >= var26 - 75 && var35 <= var26 + 75 && var36 >= var43 - 20 && var36 <= var43 + 20) { - var50 = UserComparator6.method694(); - if (var50) { - MusicSong.updateGameState(50); - return; - } - } - - var26 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var35 >= var26 - 75 && var35 <= var26 + 75 && var36 >= var43 - 20 && var36 <= var43 + 20) { - Login.field768 = new String[8]; - WorldMapAreaData.Login_promptCredentials(true); - } - - while (var8.method1105()) { - if (var8.field1890 == 101) { - Login.field768[Login.field752] = null; - } - - if (var8.field1890 == 85) { - if (Login.field768[Login.field752] == null && Login.field752 > 0) { - --Login.field752; - } - - Login.field768[Login.field752] = null; - } - - if (var8.field1889 >= '0' && var8.field1889 <= '9') { - Login.field768[Login.field752] = "" + var8.field1889; - if (Login.field752 < 7) { - ++Login.field752; - } - } - - if (var8.field1890 == 84) { - var50 = UserComparator6.method694(); - if (var50) { - MusicSong.updateGameState(50); - } - - return; - } - } - } else { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - class30.openURL(HorizontalAlignment.method978("secure", true) + "m=dob/set_dob.ws", true, false); - class318.setLoginResponseString("", "Page has opened in the browser.", ""); - PcmPlayer.method212(6); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - WorldMapAreaData.Login_promptCredentials(true); - } - } - } else if (Login.loginIndex == 8) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - class30.openURL("https://www.jagex.com/terms/privacy", true, false); - class318.setLoginResponseString("", "Page has opened in the browser.", ""); - PcmPlayer.method212(6); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - WorldMapAreaData.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 9) { - var9 = Login.loginBoxX + 180; - var10 = 311; - if (var8.field1890 == 84 || var8.field1890 == 13 || var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - WorldMapAreaData.method1574(false); - } - } else if (Login.loginIndex == 10) { - var9 = Login.loginBoxX + 180; - var10 = 209; - if (var8.field1890 == 84 || var5 == 1 && var35 >= var9 - 109 && var35 <= var9 + 109 && var36 >= var10 && var36 <= var10 + 68) { - class318.setLoginResponseString("", "Connecting to server...", ""); - Client.field648 = class519.field4204; - PendingSpawn.method509(false); - MusicSong.updateGameState(20); - } - } else if (Login.loginIndex == 12) { - var9 = class452.loginBoxCenter; - var10 = 233; - var30 = var2.method2087(0, 30, "terms of use, privacy policy, and end user licence", var9, var10); - Bounds var12 = var2.method2087(32, 32, "terms of use, privacy policy, and end user licence", var9, var10); - Bounds var13 = var2.method2087(70, 34, "terms of use, privacy policy, and end user licence", var9, var10); - var40 = var10 + 17; - Bounds var28 = var2.method2087(0, 34, "agreement (EULA).", var9, var40); - if (var5 == 1) { - if (var30.method2284(var35, var36)) { - class30.openURL("https://www.jagex.com/terms", true, false); - } else if (var12.method2284(var35, var36)) { - class30.openURL("https://www.jagex.com/terms/privacy", true, false); - } else if (var13.method2284(var35, var36) || var28.method2284(var35, var36)) { - class30.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); - } - } - - var9 = class452.loginBoxCenter - 80; - var10 = 311; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - class9.method26(); - WorldMapAreaData.method1574(true); - } - - var9 = class452.loginBoxCenter + 80; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - Login.loginIndex = 13; - } - } else if (Login.loginIndex == 13) { - var9 = class452.loginBoxCenter; - var10 = 321; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - WorldMapAreaData.method1574(true); - } - } else if (Login.loginIndex == 14) { - String var31 = ""; - switch(Login.field750) { - case 0: - var31 = "https://secure.runescape.com/m=offence-appeal/account-history"; - break; - case 1: - var31 = "https://secure.runescape.com/m=accountappeal/passwordrecovery"; - break; - case 2: - var31 = "https://support.runescape.com/hc/en-gb/articles/207256855-Settle-an-Unpaid-Balance"; - break; - default: - WorldMapAreaData.Login_promptCredentials(false); - } - - var40 = Login.loginBoxX + 180; - var39 = 276; - if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { - class30.openURL(var31, true, false); - class318.setLoginResponseString("", "Page has opened in the browser.", ""); - PcmPlayer.method212(6); - return; - } - - var40 = Login.loginBoxX + 180; - var39 = 326; - if (var5 == 1 && var35 >= var40 - 75 && var35 <= var40 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { - WorldMapAreaData.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var9 = Login.loginBoxX + 180; - var10 = 301; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - WorldMapAreaData.method1574(false); - } - } else if (Login.loginIndex == 32) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - class30.openURL(HorizontalAlignment.method978("secure", true) + "m=dob/set_dob.ws", true, false); - class318.setLoginResponseString("", "Page has opened in the browser.", ""); - PcmPlayer.method212(6); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - WorldMapAreaData.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 33) { - var9 = Login.loginBoxX + 180; - var10 = 276; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - class30.openURL("https://oldschool.runescape.com/launcher", true, false); - } - - var9 = Login.loginBoxX + 180; - var10 = 326; - if (var5 == 1 && var35 >= var9 - 75 && var35 <= var9 + 75 && var36 >= var10 - 20 && var36 <= var10 + 20) { - WorldMapAreaData.Login_promptCredentials(true); - } - } - } else { - while (true) { - do { - if (!var8.method1105()) { - var38 = 321; - if (var5 == 1 && var36 >= var38 - 20 && var36 <= var38 + 20) { - WorldMapAreaData.Login_promptCredentials(true); - } - - return; - } - } while(var8.field1890 != 84 && var8.field1890 != 13); - - WorldMapAreaData.Login_promptCredentials(true); - } - } - } - } - } - } - } - - } - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/GraphicsDefaults.java b/osrs/src/main/java/GraphicsDefaults.java index b353f7697..37f2f816d 100644 --- a/osrs/src/main/java/GraphicsDefaults.java +++ b/osrs/src/main/java/GraphicsDefaults.java @@ -3,62 +3,57 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.lang.management.GarbageCollectorMXBean; - -@ObfuscatedName("rr") +@ObfuscatedName("ru") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("bi") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("compass") public int compass; - @ObfuscatedName("ae") - public int field3850; - @ObfuscatedName("ao") + @ObfuscatedName("al") + public int field3881; + @ObfuscatedName("ak") @Export("mapScenes") public int mapScenes; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("ac") - public int field3848; - @ObfuscatedName("ai") - public int field3852; - @ObfuscatedName("az") - public int field3857; - @ObfuscatedName("ap") - public int field3854; - @ObfuscatedName("aa") - public int field3847; - @ObfuscatedName("af") - public int field3851; - @ObfuscatedName("ad") - public int field3849; + @ObfuscatedName("ao") + public int field3883; + @ObfuscatedName("ah") + public int field3879; + @ObfuscatedName("ar") + public int field3884; + @ObfuscatedName("ab") + public int field3876; + @ObfuscatedName("am") + public int field3882; + @ObfuscatedName("av") + public int field3885; + @ObfuscatedName("ag") + public int field3878; public GraphicsDefaults() { this.compass = -1; - this.field3850 = -1; + this.field3881 = -1; this.mapScenes = -1; this.headIconsPk = -1; - this.field3848 = -1; - this.field3852 = -1; - this.field3857 = -1; - this.field3854 = -1; - this.field3847 = -1; - this.field3851 = -1; - this.field3849 = -1; + this.field3883 = -1; + this.field3879 = -1; + this.field3884 = -1; + this.field3876 = -1; + this.field3882 = -1; + this.field3885 = -1; + this.field3878 = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "497895580" + descriptor = "(Lom;B)V", + garbageValue = "5" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3844.group); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3874.group); Buffer var3 = new Buffer(var2); while (true) { @@ -72,18 +67,36 @@ public void decode(AbstractArchive var1) { var3.readMedium(); break; case 2: - this.compass = var3.method2563(); - this.field3850 = var3.method2563(); - this.mapScenes = var3.method2563(); - this.headIconsPk = var3.method2563(); - this.field3848 = var3.method2563(); - this.field3852 = var3.method2563(); - this.field3857 = var3.method2563(); - this.field3854 = var3.method2563(); - this.field3847 = var3.method2563(); - this.field3851 = var3.method2563(); - this.field3849 = var3.method2563(); + this.compass = var3.readNullableLargeSmart(); + this.field3881 = var3.readNullableLargeSmart(); + this.mapScenes = var3.readNullableLargeSmart(); + this.headIconsPk = var3.readNullableLargeSmart(); + this.field3883 = var3.readNullableLargeSmart(); + this.field3879 = var3.readNullableLargeSmart(); + this.field3884 = var3.readNullableLargeSmart(); + this.field3876 = var3.readNullableLargeSmart(); + this.field3882 = var3.readNullableLargeSmart(); + this.field3885 = var3.readNullableLargeSmart(); + this.field3878 = var3.readNullableLargeSmart(); } } } + + @ObfuscatedName("ie") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1779911274" + ) + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (class91.clientPreferences.getCurrentSoundEffectsVolume() != 0 && var1 != 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var0; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = 0; + ++Client.soundEffectCount; + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/GraphicsObject.java b/osrs/src/main/java/GraphicsObject.java index d93418b28..a4b2aae6f 100644 --- a/osrs/src/main/java/GraphicsObject.java +++ b/osrs/src/main/java/GraphicsObject.java @@ -3,45 +3,44 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.security.SecureRandom; - -@ObfuscatedName("cg") +@ObfuscatedName("ch") @Implements("GraphicsObject") public class GraphicsObject extends Renderable { - @ObfuscatedName("hn") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("au") + @ObfuscatedName("aa") + static int field718; + @ObfuscatedName("bt") + protected static String field717; + @ObfuscatedName("ac") @Export("id") int id; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("cycleStart") int cycleStart; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("plane") int plane; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("x") int x; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("y") int y; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("z") int z; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "Lif;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("frame") int frame; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("frameCycle") int frameCycle; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("isFinished") boolean isFinished; @@ -55,20 +54,20 @@ public class GraphicsObject extends Renderable { this.y = var4; this.z = var5; this.cycleStart = var7 + var6; - int var8 = StructComposition.SpotAnimationDefinition_get(this.id).sequence; + int var8 = class406.SpotAnimationDefinition_get(this.id).sequence; if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = EnumComposition.SequenceDefinition_get(var8); + this.sequenceDefinition = class36.SequenceDefinition_get(var8); } else { this.isFinished = true; } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "47" + garbageValue = "108" ) @Export("advance") final void advance(int var1) { @@ -85,7 +84,7 @@ final void advance(int var1) { } } else { this.frame += var1; - if (this.frame >= this.sequenceDefinition.method1085()) { + if (this.frame >= this.sequenceDefinition.method1127()) { this.isFinished = true; } } @@ -93,14 +92,14 @@ final void advance(int var1) { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljr;", - garbageValue = "798227647" + descriptor = "(B)Ljn;", + garbageValue = "0" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = StructComposition.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = class406.SpotAnimationDefinition_get(this.id); Model var2; if (!this.isFinished) { var2 = var1.getModel(this.frame); diff --git a/osrs/src/main/java/HealthBar.java b/osrs/src/main/java/HealthBar.java index d559b5b7e..213592ebb 100644 --- a/osrs/src/main/java/HealthBar.java +++ b/osrs/src/main/java/HealthBar.java @@ -3,43 +3,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("db") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("aa") - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("ls") - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("mn") - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("ao") + @ObfuscatedName("ap") + static int field1073; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhj;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Loc;" + descriptor = "Lpy;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lhl;)V" + descriptor = "(Lhj;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); this.definition = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "0" + descriptor = "(IIIII)V", + garbageValue = "-495031119" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -72,10 +65,10 @@ void put(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)Ldo;", - garbageValue = "-93" + descriptor = "(IB)Ldt;", + garbageValue = "-24" ) @Export("get") HealthBarUpdate get(int var1) { @@ -97,48 +90,78 @@ HealthBarUpdate get(int var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-45" + descriptor = "(I)Z", + garbageValue = "-1212431293" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method2008(); + return this.updates.method2039(); } - @ObfuscatedName("jd") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1142010157" + descriptor = "(IIS)I", + garbageValue = "-21237" ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = class18.getTileHeight(var0, var1, Client_plane) - var2; - var0 -= NPCComposition.cameraX; - var3 -= class133.cameraY; - var1 -= class139.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[class129.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[class129.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[UserComparator10.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[UserComparator10.cameraYaw]; - int var8 = var6 * var1 + var0 * var7 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var5 * var3 - var4 * var1 >> 16; - var1 = var5 * var1 + var3 * var4 >> 16; - if (var1 >= 50) { - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; - Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + public static int method572(int var0, int var1) { + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1762849549" + ) + public static int method575(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 0 & 127L); + return var1; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(IS)I", + garbageValue = "28917" + ) + public static int method571(int var0) { + return (var0 & class523.field4148) - 1; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lul;IB)V", + garbageValue = "1" + ) + public static void method576(Buffer var0, int var1) { + if (JagexCache.JagexCache_randomDat != null) { + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); + } catch (Exception var3) { } + } - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "516067263" + ) + public static void method577() { + try { + JagexCache.JagexCache_dat2File.close(); + + for (int var0 = 0; var0 < UrlRequester.field1162; ++var0) { + UserComparator8.JagexCache_idxFiles[var0].close(); + } + + JagexCache.JagexCache_idx255File.close(); + JagexCache.JagexCache_randomDat.close(); + } catch (Exception var2) { } + } } \ No newline at end of file diff --git a/osrs/src/main/java/HealthBarDefinition.java b/osrs/src/main/java/HealthBarDefinition.java index a8902311d..3504ac1d2 100644 --- a/osrs/src/main/java/HealthBarDefinition.java +++ b/osrs/src/main/java/HealthBarDefinition.java @@ -3,62 +3,76 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("hj") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("ao") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lom;" ) - @Export("HealthBarDefinition_cached") - public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("at") + public static AbstractArchive field1549; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) - @Export("HealthBarDefinition_cachedSprites") - public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("ac") - public int field1555; - @ObfuscatedName("ap") + @Export("NpcDefinition_cachedModels") + public static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + @Export("ItemDefinition_cachedModels") + public static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("cp") + @Export("param9") + static String param9; + @ObfuscatedName("rn") + @ObfuscatedSignature( + descriptor = "Ltx;" + ) + @Export("Widget_cachedModels") + static class512 Widget_cachedModels; + @ObfuscatedName("ao") + public int field1559; + @ObfuscatedName("ab") @Export("int1") public int int1; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("int2") public int int2; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("int3") public int int3; - @ObfuscatedName("ad") + @ObfuscatedName("ag") public int field1556; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("int5") public int int5; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("width") public int width; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("widthPadding") public int widthPadding; static { - HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); - HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); + NpcDefinition_cachedModels = new EvictingDualNodeHashTable(64); + ItemDefinition_cachedModels = new EvictingDualNodeHashTable(64); } - public HealthBarDefinition() { + HealthBarDefinition() { this.int1 = 255; this.int2 = 255; this.int3 = -1; @@ -70,13 +84,13 @@ public HealthBarDefinition() { this.widthPadding = 0; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-25" + descriptor = "(Lul;B)V", + garbageValue = "-15" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -87,10 +101,10 @@ public void decode(Buffer var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1395373315" + descriptor = "(Lul;II)V", + garbageValue = "1665332626" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -107,9 +121,9 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { - this.frontSpriteID = var1.method2563(); + this.frontSpriteID = var1.readNullableLargeSmart(); } else if (var2 == 8) { - this.backSpriteID = var1.method2563(); + this.backSpriteID = var1.readNullableLargeSmart(); } else if (var2 == 11) { this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { @@ -120,23 +134,23 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)Lui;", - garbageValue = "26" + descriptor = "(I)Lud;", + garbageValue = "-1762701574" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { if (this.frontSpriteID < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); + SpritePixels var1 = (SpritePixels)ItemDefinition_cachedModels.get((long)this.frontSpriteID); if (var1 != null) { return var1; } else { - var1 = Tiles.SpriteBuffer_getSprite(class422.field3769, this.frontSpriteID, 0); + var1 = class47.SpriteBuffer_getSprite(field1549, this.frontSpriteID, 0); if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); + ItemDefinition_cachedModels.put(var1, (long)this.frontSpriteID); } return var1; @@ -144,23 +158,23 @@ public SpritePixels getFrontSprite() { } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Lui;", - garbageValue = "314676722" + descriptor = "(I)Lud;", + garbageValue = "665921612" ) @Export("getBackSprite") public SpritePixels getBackSprite() { if (this.backSpriteID < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); + SpritePixels var1 = (SpritePixels)ItemDefinition_cachedModels.get((long)this.backSpriteID); if (var1 != null) { return var1; } else { - var1 = Tiles.SpriteBuffer_getSprite(class422.field3769, this.backSpriteID, 0); + var1 = class47.SpriteBuffer_getSprite(field1549, this.backSpriteID, 0); if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); + ItemDefinition_cachedModels.put(var1, (long)this.backSpriteID); } return var1; @@ -168,33 +182,18 @@ public SpritePixels getBackSprite() { } } - @ObfuscatedName("au") + @ObfuscatedName("ju") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-293165010" + descriptor = "(IIB)V", + garbageValue = "-17" ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; - } + static final void method991(int var0, int var1) { + if (Client.hintArrowType == 2) { + class150.worldToScreen((Client.hintArrowX - class20.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class19.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + UserComparator8.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "([BI)Lpi;", - garbageValue = "-1270824804" - ) - static Font method969(byte[] var0) { - if (var0 == null) { - return null; - } else { - Font var1 = new Font(var0, class529.SpriteBuffer_xOffsets, class152.SpriteBuffer_yOffsets, HealthBarUpdate.SpriteBuffer_spriteWidths, SpriteMask.SpriteBuffer_spriteHeights, DbTableType.SpriteBuffer_spritePalette, Coord.SpriteBuffer_pixels); - class529.SpriteBuffer_xOffsets = null; - class152.SpriteBuffer_yOffsets = null; - HealthBarUpdate.SpriteBuffer_spriteWidths = null; - SpriteMask.SpriteBuffer_spriteHeights = null; - DbTableType.SpriteBuffer_spritePalette = null; - Coord.SpriteBuffer_pixels = null; - return var1; } } } \ No newline at end of file diff --git a/osrs/src/main/java/HealthBarUpdate.java b/osrs/src/main/java/HealthBarUpdate.java index 46ae4a991..848ea34e4 100644 --- a/osrs/src/main/java/HealthBarUpdate.java +++ b/osrs/src/main/java/HealthBarUpdate.java @@ -3,28 +3,22 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("dt") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("ai") - @Export("SpriteBuffer_spriteWidths") - static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "Lpi;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("au") + @ObfuscatedName("ab") + @Export("ItemDefinition_inMembersWorld") + static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("ac") @Export("cycle") int cycle; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("health") int health; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("health2") int health2; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("cycleOffset") int cycleOffset; @@ -35,10 +29,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "75" + descriptor = "(IIIII)V", + garbageValue = "-104835898" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -48,37 +42,75 @@ void set(int var1, int var2, int var3, int var4) { this.cycleOffset = var4; } - @ObfuscatedName("at") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-2006181389" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-53586823" ) - public static int method524(CharSequence var0) { - return DevicePcmPlayerProvider.method75(var0, 10, true); + public static String method523(String var0) { + int var1 = var0.length(); + char[] var2 = new char[var1]; + byte var3 = 2; + + for (int var4 = 0; var4 < var1; ++var4) { + char var5 = var0.charAt(var4); + if (var3 == 0) { + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { + var5 = StudioGame.method1905(var5); + } + + if (Character.isLetter(var5)) { + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { + if (Character.isSpaceChar(var5)) { + if (var3 != 2) { + var3 = 1; + } + } else { + var3 = 1; + } + } else { + var3 = 2; + } + + var2[var4] = var5; + } + + return new String(var2); } - @ObfuscatedName("ai") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(Lch;Lch;IZIZI)I", - garbageValue = "1278568965" + descriptor = "(ILds;ZI)I", + garbageValue = "-2085144575" ) - static int method525(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = class139.compareWorlds(var0, var1, var2, var3); - if (var6 != 0) { - return var3 ? -var6 : var6; - } else if (var4 == -1) { - return 0; + static int method524(int var0, Script var1, boolean var2) { + if (var0 == 5630) { + Client.logoutTimer = 250; + return 1; } else { - int var7 = class139.compareWorlds(var0, var1, var4, var5); - return var5 ? -var7 : var7; + return 2; } } - @ObfuscatedName("na") - static final void method526(double var0) { - Rasterizer3D.method1187(var0); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(var0); - UrlRequester.method653(); - class449.clientPreferences.setBrightness(var0); + @ObfuscatedName("nq") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "2104594196" + ) + static final void method525(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method868()) { + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + PacketBufferNode var4 = ClanChannelMember.getPacketBufferNode(ClientPacket.f10, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(4 + class478.stringCp1252NullTerminatedByteSize(var3.username.getName())); + var4.packetBuffer.writeByte(var0); + var4.packetBuffer.writeShort(var1); + var4.packetBuffer.writeBoolean(var2); + var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); + Client.packetWriter.addNode(var4); + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/HitSplatDefinition.java b/osrs/src/main/java/HitSplatDefinition.java index 617346da1..5152e1725 100644 --- a/osrs/src/main/java/HitSplatDefinition.java +++ b/osrs/src/main/java/HitSplatDefinition.java @@ -3,110 +3,103 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("iw") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("HitSplatDefinition_archive") - public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - public static AbstractArchive field1689; - @ObfuscatedName("ao") + static AbstractArchive HitSplatDefinition_archive; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) - @Export("HitSplatDefinition_fontsArchive") - public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("at") + static AbstractArchive field1701; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("HitSplatDefinition_cached") - static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("ac") + public static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("HitSplatDefinition_cachedSprites") - static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("ai") + public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) - @Export("HitSplatDefinition_cachedFonts") - static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("aq") + public static EvictingDualNodeHashTable field1697; + @ObfuscatedName("aa") @Export("fontId") int fontId; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("textColor") public int textColor; - @ObfuscatedName("an") - public int field1706; - @ObfuscatedName("ar") - int field1700; - @ObfuscatedName("ab") - int field1695; - @ObfuscatedName("ag") - int field1696; - @ObfuscatedName("am") - int field1698; - @ObfuscatedName("ax") - public int field1709; - @ObfuscatedName("ah") - public int field1703; - @ObfuscatedName("as") - public int field1707; @ObfuscatedName("ay") - String field1702; + public int field1715; + @ObfuscatedName("as") + int field1706; @ObfuscatedName("aj") - public int field1704; - @ObfuscatedName("av") - public int field1708; + int field1704; + @ObfuscatedName("an") + int field1705; + @ObfuscatedName("au") + int field1707; + @ObfuscatedName("ai") + public int field1711; + @ObfuscatedName("ae") + public int field1710; @ObfuscatedName("aw") + public int field1714; + @ObfuscatedName("aq") + String field1709; + @ObfuscatedName("az") + public int field1716; + @ObfuscatedName("at") + public int field1713; + @ObfuscatedName("af") @Export("transforms") public int[] transforms; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("bh") + @ObfuscatedName("bn") @Export("transformVarp") int transformVarp; static { HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); - HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); + field1697 = new EvictingDualNodeHashTable(20); } HitSplatDefinition() { this.fontId = -1; this.textColor = 16777215; - this.field1706 = 70; - this.field1700 = -1; - this.field1695 = -1; - this.field1696 = -1; - this.field1698 = -1; - this.field1709 = 0; - this.field1703 = 0; - this.field1707 = -1; - this.field1702 = ""; + this.field1715 = 70; + this.field1706 = -1; this.field1704 = -1; - this.field1708 = 0; + this.field1705 = -1; + this.field1707 = -1; + this.field1711 = 0; + this.field1710 = 0; + this.field1714 = -1; + this.field1709 = ""; + this.field1716 = -1; + this.field1713 = 0; this.transformVarbit = -1; this.transformVarp = -1; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-96" + descriptor = "(Lul;S)V", + garbageValue = "7501" ) @Export("decode") void decode(Buffer var1) { @@ -120,41 +113,41 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;IB)V", - garbageValue = "-17" + descriptor = "(Lul;II)V", + garbageValue = "1630340273" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.fontId = var1.method2563(); + this.fontId = var1.readNullableLargeSmart(); } else if (var2 == 2) { this.textColor = var1.readMedium(); } else if (var2 == 3) { - this.field1700 = var1.method2563(); + this.field1706 = var1.readNullableLargeSmart(); } else if (var2 == 4) { - this.field1696 = var1.method2563(); + this.field1705 = var1.readNullableLargeSmart(); } else if (var2 == 5) { - this.field1695 = var1.method2563(); + this.field1704 = var1.readNullableLargeSmart(); } else if (var2 == 6) { - this.field1698 = var1.method2563(); + this.field1707 = var1.readNullableLargeSmart(); } else if (var2 == 7) { - this.field1709 = var1.readShort(); + this.field1711 = var1.readShort(); } else if (var2 == 8) { - this.field1702 = var1.readStringCp1252NullCircumfixed(); + this.field1709 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field1706 = var1.readUnsignedShort(); + this.field1715 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field1703 = var1.readShort(); + this.field1710 = var1.readShort(); } else if (var2 == 11) { - this.field1707 = 0; + this.field1714 = 0; } else if (var2 == 12) { - this.field1704 = var1.readUnsignedByte(); + this.field1716 = var1.readUnsignedByte(); } else if (var2 == 13) { - this.field1708 = var1.readShort(); + this.field1713 = var1.readShort(); } else if (var2 == 14) { - this.field1707 = var1.readUnsignedShort(); + this.field1714 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { @@ -189,16 +182,16 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Lhm;", - garbageValue = "-478851441" + descriptor = "(I)Liw;", + garbageValue = "-588472147" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = ClientPreferences.getVarbit(this.transformVarbit); + var1 = class36.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -210,17 +203,17 @@ public final HitSplatDefinition transform() { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? WorldMapCacheName.method1564(var2) : null; + return var2 != -1 ? class191.method959(var2) : null; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "85" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1312743018" ) @Export("getString") public String getString(int var1) { - String var2 = this.field1702; + String var2 = this.field1709; while (true) { int var3 = var2.indexOf("%1"); @@ -228,26 +221,26 @@ public String getString(int var1) { return var2; } - var2 = var2.substring(0, var3) + class60.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + AbstractWorldMapData.intToString(var1, false) + var2.substring(var3 + 2); } } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Lui;", - garbageValue = "2088271438" + descriptor = "(I)Lud;", + garbageValue = "-580598117" ) - public SpritePixels method1032() { - if (this.field1700 < 0) { + public SpritePixels method1070() { + if (this.field1706 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1700); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1706); if (var1 != null) { return var1; } else { - var1 = Tiles.SpriteBuffer_getSprite(field1689, this.field1700, 0); + var1 = class47.SpriteBuffer_getSprite(field1701, this.field1706, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1700); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1706); } return var1; @@ -255,22 +248,22 @@ public SpritePixels method1032() { } } - @ObfuscatedName("az") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)Lui;", - garbageValue = "1718225131" + descriptor = "(I)Lud;", + garbageValue = "1894874204" ) - public SpritePixels method1033() { - if (this.field1695 < 0) { + public SpritePixels method1071() { + if (this.field1704 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1695); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1704); if (var1 != null) { return var1; } else { - var1 = Tiles.SpriteBuffer_getSprite(field1689, this.field1695, 0); + var1 = class47.SpriteBuffer_getSprite(field1701, this.field1704, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1695); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1704); } return var1; @@ -278,22 +271,22 @@ public SpritePixels method1033() { } } - @ObfuscatedName("ap") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)Lui;", - garbageValue = "-816789070" + descriptor = "(B)Lud;", + garbageValue = "-3" ) - public SpritePixels method1034() { - if (this.field1696 < 0) { + public SpritePixels method1072() { + if (this.field1705 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1696); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1705); if (var1 != null) { return var1; } else { - var1 = Tiles.SpriteBuffer_getSprite(field1689, this.field1696, 0); + var1 = class47.SpriteBuffer_getSprite(field1701, this.field1705, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1696); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1705); } return var1; @@ -301,22 +294,22 @@ public SpritePixels method1034() { } } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)Lui;", - garbageValue = "3" + descriptor = "(I)Lud;", + garbageValue = "-1859973859" ) - public SpritePixels method1035() { - if (this.field1698 < 0) { + public SpritePixels method1073() { + if (this.field1707 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1698); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1707); if (var1 != null) { return var1; } else { - var1 = Tiles.SpriteBuffer_getSprite(field1689, this.field1698, 0); + var1 = class47.SpriteBuffer_getSprite(field1701, this.field1707, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1698); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1707); } return var1; @@ -324,110 +317,46 @@ public SpritePixels method1035() { } } - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)Lpi;", - garbageValue = "1628284483" + descriptor = "(B)Lpu;", + garbageValue = "36" ) @Export("getFont") public Font getFont() { if (this.fontId == -1) { return null; } else { - Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); + Font var1 = (Font)field1697.get((long)this.fontId); if (var1 != null) { return var1; } else { - var1 = LoginPacket.method1613(field1689, HitSplatDefinition_fontsArchive, this.fontId, 0); - if (var1 != null) { - HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); + AbstractArchive var3 = field1701; + AbstractArchive var4 = class135.HitSplatDefinition_fontsArchive; + int var5 = this.fontId; + Font var2; + if (!class164.method862(var3, var5, 0)) { + var2 = null; + } else { + byte[] var7 = var4.takeFile(var5, 0); + Font var6; + if (var7 == null) { + var6 = null; + } else { + Font var8 = new Font(var7, class326.SpriteBuffer_xOffsets, ModelData0.SpriteBuffer_yOffsets, class59.SpriteBuffer_spriteWidths, class544.SpriteBuffer_spriteHeights, class372.SpriteBuffer_spritePalette, AddRequestTask.SpriteBuffer_pixels); + class407.method2062(); + var6 = var8; + } + + var2 = var6; } - return var1; - } - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "731414958" - ) - static int method1026(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "([BB)Ldh;", - garbageValue = "10" - ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); - Buffer var2 = new Buffer(var0); - var2.offset = var2.array.length - 2; - int var3 = var2.readUnsignedShort(); - int var4 = var2.array.length - 2 - var3 - 12; - var2.offset = var4; - int var5 = var2.readInt(); - var1.localIntCount = var2.readUnsignedShort(); - var1.localStringCount = var2.readUnsignedShort(); - var1.intArgumentCount = var2.readUnsignedShort(); - var1.stringArgumentCount = var2.readUnsignedShort(); - int var6 = var2.readUnsignedByte(); - int var7; - int var8; - if (var6 > 0) { - var1.switches = var1.newIterableNodeHashTable(var6); - - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? WorldMapIcon_1.method1401(var8) : 1); - var1.switches[var7] = var9; - - while (var8-- > 0) { - int var10 = var2.readInt(); - int var11 = var2.readInt(); - var9.put(new IntegerNode(var11), (long)var10); + if (var2 != null) { + field1697.put(var2, (long)this.fontId); } - } - } - - var2.offset = 0; - var1.field817 = var2.readStringCp1252NullTerminatedOrNull(); - var1.opcodes = new int[var5]; - var1.intOperands = new int[var5]; - var1.stringOperands = new String[var5]; - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { - var8 = var2.readUnsignedShort(); - if (var8 == 3) { - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); + return var2; } } - - return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/HorizontalAlignment.java b/osrs/src/main/java/HorizontalAlignment.java index 0a56bc7b9..75d5bb55b 100644 --- a/osrs/src/main/java/HorizontalAlignment.java +++ b/osrs/src/main/java/HorizontalAlignment.java @@ -3,30 +3,38 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +@ObfuscatedName("hb") @Implements("HorizontalAlignment") -public enum HorizontalAlignment implements class371 { - @ObfuscatedName("au") +public enum HorizontalAlignment implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhb;" ) - field1574(0, 0), - @ObfuscatedName("ae") + field1585(1, 0), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhb;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(2, 1), - @ObfuscatedName("ao") + HorizontalAlignment_centered(0, 1), + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhb;" ) - field1573(1, 2); + field1586(2, 2); - @ObfuscatedName("at") + @ObfuscatedName("gj") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field1584; + @ObfuscatedName("jf") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("ax") @Export("value") public final int value; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("id") final int id; @@ -35,70 +43,13 @@ public enum HorizontalAlignment implements class371 { this.id = var4; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Llb;I)V", - garbageValue = "819955380" - ) - public static void method975(class311 var0) { - class305.field2778.remove(var0); - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "2133819886" - ) - public static String method977(String var0) { - return var0 != null && !var0.isEmpty() && var0.charAt(0) != '#' ? var0 : ""; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "36" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); - } - - @ObfuscatedName("oh") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", - garbageValue = "2" - ) - static String method978(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (Client.gameBuild == 1) { - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { - var0 = "local"; - } - - String var3 = ""; - if (MusicPatchPcmStream.param9 != null) { - var3 = "/p=" + MusicPatchPcmStream.param9; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + ClanChannelMember.clientLanguage + "/a=" + WorldMapSectionType.field2416 + var3 + "/"; - } } \ No newline at end of file diff --git a/osrs/src/main/java/Huffman.java b/osrs/src/main/java/Huffman.java index 05fdec341..783421a53 100644 --- a/osrs/src/main/java/Huffman.java +++ b/osrs/src/main/java/Huffman.java @@ -3,16 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mx") +@ObfuscatedName("ns") @Implements("Huffman") public class Huffman { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("masks") int[] masks; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("bits") byte[] bits; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("keys") int[] keys; @@ -41,7 +41,7 @@ public Huffman(byte[] var1) { for (var10 = var6 - 1; var10 >= 1; --var10) { var11 = var3[var10]; - if (var11 != var8) { + if (var8 != var11) { break; } @@ -99,10 +99,10 @@ public Huffman(byte[] var1) { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "-2112188877" + garbageValue = "1960932844" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -150,10 +150,10 @@ int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "([BI[BIIB)I", - garbageValue = "23" + descriptor = "([BI[BIII)I", + garbageValue = "-1820686670" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -293,19 +293,4 @@ int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { return var7 + 1 - var2; } } - - @ObfuscatedName("id") - @ObfuscatedSignature( - descriptor = "(Ldr;I)V", - garbageValue = "-652382825" - ) - static final void method1853(Actor var0) { - int var1 = Math.max(1, var0.spotAnimation - Client.cycle); - int var2 = var0.field976 * 64 + var0.field1004 * 128; - int var3 = var0.field976 * 64 + var0.field1001 * 128; - var0.x += (var2 - var0.x) / var1; - var0.y += (var3 - var0.y) / var1; - var0.field1021 = 0; - var0.orientation = var0.exactMoveDirection; - } } \ No newline at end of file diff --git a/osrs/src/main/java/IgnoreList.java b/osrs/src/main/java/IgnoreList.java index 1e59d9aea..309b43565 100644 --- a/osrs/src/main/java/IgnoreList.java +++ b/osrs/src/main/java/IgnoreList.java @@ -3,64 +3,64 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qq") +@ObfuscatedName("qu") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) - final LoginType field3781; + final LoginType field3811; @ObfuscatedSignature( - descriptor = "(Lsl;)V" + descriptor = "(Lte;)V" ) public IgnoreList(LoginType var1) { super(400); - this.field3781 = var1; + this.field3811 = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Lqs;", - garbageValue = "-1997275235" + descriptor = "(I)Lrp;", + garbageValue = "1002915738" ) @Export("newInstance") User newInstance() { return new Ignored(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)[Lqs;", - garbageValue = "99" + descriptor = "(II)[Lrp;", + garbageValue = "-1086220070" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "974375681" + descriptor = "(Lul;IB)V", + garbageValue = "2" ) @Export("read") public void read(Buffer var1, int var2) { while (var1.offset < var2) { int var3 = var1.readUnsignedByte(); if (var3 == 4) { - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.field3781); + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.field3811); if (!var4.hasCleanName()) { throw new IllegalStateException(); } boolean var5 = false; - class299.friendSystem.removeIgnore(var4.getName(), var5); + InvDefinition.friendSystem.removeIgnore(var4.getName(), var5); } else { boolean var9 = (var3 & 1) != 0; - Username var10 = new Username(var1.readStringCp1252NullTerminated(), this.field3781); - Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.field3781); + Username var10 = new Username(var1.readStringCp1252NullTerminated(), this.field3811); + Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.field3811); var1.readStringCp1252NullTerminated(); if (!var10.hasCleanName()) { throw new IllegalStateException(); @@ -89,710 +89,4 @@ public void read(Buffer var1, int var2) { } } - - @ObfuscatedName("lm") - @ObfuscatedSignature( - descriptor = "(IIIIILjava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "5" - ) - @Export("menuAction") - static final void menuAction(int var0, int var1, int var2, int var3, int var4, String var5, String var6, int var7, int var8) { - if (var2 >= 2000) { - var2 -= 2000; - } - - NPC var9; - PacketBufferNode var10; - if (var2 == 9) { - var9 = Client.npcs[var3]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC1, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var10.packetBuffer.writeShortAdd(var3); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 12) { - var9 = Client.npcs[var3]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC4, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - } - - Player var14; - if (var2 == 45) { - var14 = Client.players[var3]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER2, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeShortAddLE(var3); - var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 47) { - var14 = Client.players[var3]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeShortAdd(var3); - var10.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - Widget var15; - if (var2 == 57 || var2 == 1007) { - var15 = SoundCache.getWidgetChild(var1, var0); - if (var15 != null) { - class47.widgetDefaultMenuAction(var3, var1, var0, var4, var6); - } - } - - PacketBufferNode var16; - if (var2 == 19) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJ2, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShort(class47.baseY + var1); - var16.packetBuffer.writeShortAddLE(var0 + UrlRequester.baseX); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var16); - } - - if (var2 == 1) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOCT, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAdd(class157.field1406); - var16.packetBuffer.writeInt(class138.field1306); - var16.packetBuffer.writeShort(WorldMapArea.field2343); - var16.packetBuffer.writeShortAddLE(var3); - var16.packetBuffer.writeShortAdd(class47.baseY + var1); - var16.packetBuffer.writeShortAdd(var0 + UrlRequester.baseX); - var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var16); - } - - if (var2 == 13) { - var9 = Client.npcs[var3]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC5, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var10.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 14) { - var14 = Client.players[var3]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPCU, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeIntLE(class138.field1306); - var10.packetBuffer.writeShortAdd(class157.field1406); - var10.packetBuffer.writeShortAdd(WorldMapArea.field2343); - var10.packetBuffer.writeShortAdd(var3); - var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 1002) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOCE, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAddLE(var3); - Client.packetWriter.addNode(var16); - } - - if (var2 == 10) { - var9 = Client.npcs[var3]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC2, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var10.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 1001) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC5, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAddLE(class47.baseY + var1); - var16.packetBuffer.writeIntME(var0 + UrlRequester.baseX); - var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAdd(var3); - Client.packetWriter.addNode(var16); - } - - if (var2 == 26) { - WorldMapIcon_1.method1402(); - } - - if (var2 == 8) { - var9 = Client.npcs[var3]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPCT, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var10.packetBuffer.writeShortAdd(var3); - var10.packetBuffer.writeIntME(Client.selectedSpellItemId); - var10.packetBuffer.writeIntIME(ModeWhere.selectedSpellWidget); - var10.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 18) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJ1, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAdd(var3); - var16.packetBuffer.writeShortAddLE(var0 + UrlRequester.baseX); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShort(class47.baseY + var1); - Client.packetWriter.addNode(var16); - } - - if (var2 == 23) { - if (Client.isMenuOpen) { - class130.scene.setViewportWalking(); - } else { - class130.scene.menuOpen(HealthBar.Client_plane, var0, var1, true); - } - } - - PacketBufferNode var11; - if (var2 == 24) { - var15 = class92.getWidget(var1); - if (var15 != null) { - boolean var12 = true; - if (var15.contentType > 0) { - var12 = Bounds.method2290(var15); - } - - if (var12) { - var11 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2567, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var11); - } - } - } - - if (var2 == 11) { - var9 = Client.npcs[var3]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC3, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeShortAddLE(var3); - var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 49) { - var14 = Client.players[var3]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeShortAdd(var3); - var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 16) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.EXIT_FREECAM, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAddLE(class157.field1406); - var16.packetBuffer.writeIntME(var3); - var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAdd(WorldMapArea.field2343); - var16.packetBuffer.writeIntME(var0 + UrlRequester.baseX); - var16.packetBuffer.writeShortAdd(class47.baseY + var1); - var16.packetBuffer.writeIntIME_(class138.field1306); - Client.packetWriter.addNode(var16); - } - - if (var2 == 2) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC6, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAddLE(var3); - var16.packetBuffer.writeShortAdd(var0 + UrlRequester.baseX); - var16.packetBuffer.writeShort(class47.baseY + var1); - var16.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); - var16.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAddLE(Client.selectedSpellItemId); - var16.packetBuffer.writeIntLE(ModeWhere.selectedSpellWidget); - Client.packetWriter.addNode(var16); - } - - if (var2 == 1008 || var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1012) { - Canvas.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - - if (var2 == 6) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC4, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAdd(var3); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAdd(class47.baseY + var1); - var16.packetBuffer.writeIntLE(var0 + UrlRequester.baseX); - Client.packetWriter.addNode(var16); - } - - if (var2 == 21) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJ4, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeIntME(var0 + UrlRequester.baseX); - var16.packetBuffer.writeShortAdd(class47.baseY + var1); - var16.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var16); - } - - if (var2 == 30 && Client.meslayerContinueWidget == null) { - class466.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = SoundCache.getWidgetChild(var1, var0); - class218.invalidateWidget(Client.meslayerContinueWidget); - } - - if (var2 == 15) { - var14 = Client.players[var3]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYERT, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); - var10.packetBuffer.writeIntME(Client.selectedSpellItemId); - var10.packetBuffer.writeIntIME(ModeWhere.selectedSpellWidget); - var10.packetBuffer.writeIntME(var3); - var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - int var13; - Widget var17; - if (var2 == 28) { - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2567, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var16); - var17 = class92.getWidget(var1); - if (var17 != null && var17.cs1Instructions != null && var17.cs1Instructions[0][0] == 5) { - var13 = var17.cs1Instructions[0][1]; - Varps.Varps_main[var13] = 1 - Varps.Varps_main[var13]; - WorldMapDecoration.changeGameOptions(var13); - } - } - - if (var2 == 48) { - var14 = Client.players[var3]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER5, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeShortAdd(var3); - var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 4) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC2, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShort(var0 + UrlRequester.baseX); - var16.packetBuffer.writeShort(class47.baseY + var1); - var16.packetBuffer.writeIntME(var3); - var16.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var16); - } - - if (var2 == 29) { - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2567, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var16); - var17 = class92.getWidget(var1); - if (var17 != null && var17.cs1Instructions != null && var17.cs1Instructions[0][0] == 5) { - var13 = var17.cs1Instructions[0][1]; - if (Varps.Varps_main[var13] != var17.cs1ComparisonValues[0]) { - Varps.Varps_main[var13] = var17.cs1ComparisonValues[0]; - WorldMapDecoration.changeGameOptions(var13); - } - } - } - - if (var2 == 1003) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var9 = Client.npcs[var3]; - if (var9 != null) { - NPCComposition var18 = var9.definition; - if (var18.transforms != null) { - var18 = var18.transform(); - } - - if (var18 != null) { - var11 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPCE, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShortAdd(var18.id); - Client.packetWriter.addNode(var11); - } - } - } - - if (var2 == 44) { - var14 = Client.players[var3]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeShortAddLE(var3); - var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 1004) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJE, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShort(var0 + UrlRequester.baseX); - var16.packetBuffer.writeShortAddLE(var3); - var16.packetBuffer.writeIntME(class47.baseY + var1); - Client.packetWriter.addNode(var16); - } - - if (var2 == 46) { - var14 = Client.players[var3]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER3, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeByte(var3); - var10.packetBuffer.writeShort(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 22) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJ5, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShortAddLE(var0 + UrlRequester.baseX); - var16.packetBuffer.writeShort(class47.baseY + var1); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var16); - } - - if (var2 == 58) { - var15 = SoundCache.getWidgetChild(var1, var0); - if (var15 != null) { - if (var15.field3076 != null) { - ScriptEvent var19 = new ScriptEvent(); - var19.widget = var15; - var19.opIndex = var3; - var19.targetName = var6; - var19.args = var15.field3076; - WorldMapSection1.runScriptEvent(var19); - } - - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTONT, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeShortAdd(Client.selectedSpellItemId); - var10.packetBuffer.writeShort(var0); - var10.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); - var10.packetBuffer.writeShort(var4); - var10.packetBuffer.writeIntIME(ModeWhere.selectedSpellWidget); - var10.packetBuffer.writeIntIME_(var1); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 5) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC3, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShort(var3); - var16.packetBuffer.writeShortAddLE(var0 + UrlRequester.baseX); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShort(class47.baseY + var1); - Client.packetWriter.addNode(var16); - } - - if (var2 == 50) { - var14 = Client.players[var3]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeIntME(var3); - var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 25) { - var15 = SoundCache.getWidgetChild(var1, var0); - if (var15 != null) { - InvDefinition.Widget_runOnTargetLeave(); - DirectByteArrayCopier.selectSpell(var1, var0, HealthBarDefinition.Widget_unpackTargetMask(NewShit.getWidgetFlags(var15)), var4); - Client.isItemSelected = 0; - Client.field600 = class300.Widget_getSpellActionName(var15); - if (Client.field600 == null) { - Client.field600 = "null"; - } - - if (var15.isIf3) { - Client.field601 = var15.dataText + MoveSpeed.colorStartTag(16777215); - } else { - Client.field601 = MoveSpeed.colorStartTag(65280) + var15.field3097 + MoveSpeed.colorStartTag(16777215); - } - } - - } else { - if (var2 == 17) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPOBJT, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeIntME(var0 + UrlRequester.baseX); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAdd(Client.selectedSpellItemId); - var16.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); - var16.packetBuffer.writeIntIME(ModeWhere.selectedSpellWidget); - var16.packetBuffer.writeShortAdd(class47.baseY + var1); - var16.packetBuffer.writeShortAdd(var3); - Client.packetWriter.addNode(var16); - } - - if (var2 == 20) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPNPC6, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeIntME(class47.baseY + var1); - var16.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAddLE(var3); - var16.packetBuffer.writeIntME(var0 + UrlRequester.baseX); - Client.packetWriter.addNode(var16); - } - - if (var2 == 3) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var16 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPLOC1, Client.packetWriter.isaacCipher); - var16.packetBuffer.writeShort(var0 + UrlRequester.baseX); - var16.packetBuffer.writeIntME(class47.baseY + var1); - var16.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var16.packetBuffer.writeShortAddLE(var3); - Client.packetWriter.addNode(var16); - } - - if (var2 == 51) { - var14 = Client.players[var3]; - if (var14 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER8, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var10.packetBuffer.writeShortAdd(var3); - Client.packetWriter.addNode(var10); - } - } - - if (var2 == 7) { - var9 = Client.npcs[var3]; - if (var9 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYERU, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeIntME(WorldMapArea.field2343); - var10.packetBuffer.writeIntME(class157.field1406); - var10.packetBuffer.writeIntLE(class138.field1306); - var10.packetBuffer.writeIntME(var3); - var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var10); - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - class218.invalidateWidget(class92.getWidget(class138.field1306)); - } - - if (Client.isSpellSelected) { - InvDefinition.Widget_runOnTargetLeave(); - } - - } - } - - @ObfuscatedName("oq") - @ObfuscatedSignature( - descriptor = "(IS)Ltx;", - garbageValue = "-11165" - ) - static class506 method2190(int var0) { - class506 var1 = (class506)Client.Widget_cachedFonts.get((long)var0); - if (var1 == null) { - var1 = new class506(class343.field3148, var0); - } - - return var1; - } } \ No newline at end of file diff --git a/osrs/src/main/java/Ignored.java b/osrs/src/main/java/Ignored.java index fac65f9c5..f29f7f2da 100644 --- a/osrs/src/main/java/Ignored.java +++ b/osrs/src/main/java/Ignored.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qu") +@ObfuscatedName("ry") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("id") int id; Ignored() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqu;I)I", - garbageValue = "-1019476190" + descriptor = "(Lry;B)I", + garbageValue = "16" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lqs;I)I", - garbageValue = "1756748027" + descriptor = "(Lrp;I)I", + garbageValue = "762888653" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -37,77 +37,4 @@ public int compareTo_user(User var1) { public int compareTo(Object var1) { return this.compareTo_ignored((Ignored)var1); } - - @ObfuscatedName("kp") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "44" - ) - static final void method2249() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.endCycle > 0) { - --var0.endCycle; - } - - boolean var1; - int var2; - int var3; - ObjectComposition var4; - if (var0.endCycle == 0) { - if (var0.objectId >= 0) { - var2 = var0.objectId; - var3 = var0.field956; - var4 = WorldMapElement.getObjectDefinition(var2); - if (var3 == 11) { - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { - var3 = 4; - } - - var1 = var4.method1040(var3); - if (!var1) { - continue; - } - } - - WorldMap.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field948, var0.field956, var0.field945); - var0.remove(); - } else { - if (var0.startCycle > 0) { - --var0.startCycle; - } - - if (var0.startCycle == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { - if (var0.id >= 0) { - var2 = var0.id; - var3 = var0.objectType; - var4 = WorldMapElement.getObjectDefinition(var2); - if (var3 == 11) { - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { - var3 = 4; - } - - var1 = var4.method1040(var3); - if (!var1) { - continue; - } - } - - WorldMap.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.rotation, var0.objectType, var0.field945); - var0.startCycle = -1; - if (var0.id == var0.objectId && var0.objectId == -1) { - var0.remove(); - } else if (var0.id == var0.objectId && var0.rotation == var0.field948 && var0.field956 == var0.objectType) { - var0.remove(); - } - } - } - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/IndexedSprite.java b/osrs/src/main/java/IndexedSprite.java index 2aabed072..4abc638ca 100644 --- a/osrs/src/main/java/IndexedSprite.java +++ b/osrs/src/main/java/IndexedSprite.java @@ -2,38 +2,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("uk") +@ObfuscatedName("un") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("pixels") public byte[] pixels; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("palette") public int[] palette; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("subWidth") public int subWidth; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("subHeight") public int subHeight; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("xOffset") public int xOffset; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("yOffset") public int yOffset; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("width") public int width; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("height") public int height; - IndexedSprite() { - } - - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -54,7 +51,7 @@ public void normalize() { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { @@ -87,7 +84,7 @@ public void shiftColors(int var1, int var2, int var3) { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -133,8 +130,8 @@ public void drawAt(int var1, int var2) { } } - @ObfuscatedName("ac") - public void method2654(int var1, int var2, int var3, int var4) { + @ObfuscatedName("ao") + public void method2693(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -195,7 +192,7 @@ public void method2654(int var1, int var2, int var3, int var4) { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -249,7 +246,7 @@ static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("IndexedSprite_something") static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; diff --git a/osrs/src/main/java/Instrument.java b/osrs/src/main/java/Instrument.java index 9bdcc6fcf..5b6b7f03f 100644 --- a/osrs/src/main/java/Instrument.java +++ b/osrs/src/main/java/Instrument.java @@ -5,112 +5,112 @@ import java.util.Random; -@ObfuscatedName("cq") +@ObfuscatedName("cp") @Implements("Instrument") public class Instrument { - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbf;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbf;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbf;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbf;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbf;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbf;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbf;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbf;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("delayTime") int delayTime; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("delayDecay") int delayDecay; - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lcr;" + descriptor = "Lcq;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("ar") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbf;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("duration") int duration; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("offset") int offset; @@ -147,10 +147,10 @@ public class Instrument { this.offset = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class409.clearIntArray(Instrument_samples, 0, var1); + class424.clearIntArray(Instrument_samples, 0, var1); if (var2 < 10) { return Instrument_samples; } else { @@ -355,7 +355,7 @@ final int[] synthesize(int var1, int var2) { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { @@ -369,9 +369,9 @@ final int evaluateWave(int var1, int var2, int var3) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -423,6 +423,6 @@ final void decode(Buffer var1) { this.offset = var1.readUnsignedShort(); this.filter = new AudioFilter(); this.filterEnvelope = new SoundEnvelope(); - this.filter.method320(var1, this.filterEnvelope); + this.filter.method323(var1, this.filterEnvelope); } } \ No newline at end of file diff --git a/osrs/src/main/java/IntHashTable.java b/osrs/src/main/java/IntHashTable.java index e8b46fae8..7147789f2 100644 --- a/osrs/src/main/java/IntHashTable.java +++ b/osrs/src/main/java/IntHashTable.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uz") +@ObfuscatedName("vr") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("array") int[] array; @@ -32,10 +32,10 @@ public IntHashTable(int[] var1) { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1742890609" + garbageValue = "-1585226443" ) @Export("get") public int get(int var1) { diff --git a/osrs/src/main/java/IntegerNode.java b/osrs/src/main/java/IntegerNode.java index 504fe53a4..74428348f 100644 --- a/osrs/src/main/java/IntegerNode.java +++ b/osrs/src/main/java/IntegerNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("sz") +@ObfuscatedName("ss") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("integer") public int integer; diff --git a/osrs/src/main/java/InterfaceParent.java b/osrs/src/main/java/InterfaceParent.java index 5adf6d30b..f5f7b549b 100644 --- a/osrs/src/main/java/InterfaceParent.java +++ b/osrs/src/main/java/InterfaceParent.java @@ -3,158 +3,73 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("de") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("group") int group; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("type") int type; - @ObfuscatedName("ao") + @ObfuscatedName("ak") boolean field858; InterfaceParent() { this.field858 = false; } - @ObfuscatedName("ao") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(IIIIIII)I", - garbageValue = "1893248685" + descriptor = "(Lnm;I[B[BI)V", + garbageValue = "101462872" ) - public static int method473(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { - int var6 = var3; - var3 = var4; - var4 = var6; - } + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field3006 == null) { + if (var2 == null) { + return; + } - var2 &= 3; - if (var2 == 0) { - return var1; - } else if (var2 == 1) { - return 7 - var0 - (var3 - 1); - } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; + var0.field3006 = new byte[11][]; + var0.field3005 = new byte[11][]; + var0.field3074 = new int[11]; + var0.field3075 = new int[11]; } - } - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-612957518" - ) - static int method474(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); + var0.field3006[var1] = var2; + if (var2 != null) { + var0.field2998 = true; } else { - var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - } + var0.field2998 = false; - class218.invalidateWidget(var3); - int var4; - int var5; - if (var0 != 1200 && var0 != 1205 && var0 != 1212) { - if (var0 == 1201) { - var3.modelType = 2; - var3.modelId = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - return 1; - } else if (var0 == 1202) { - var3.modelType = 3; - var3.modelId = VarbitComposition.localPlayer.appearance.getChatHeadId(); - return 1; - } else if (var0 == 1207) { - boolean var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class160.method846(var3, VarbitComposition.localPlayer.appearance, var7); - return 1; - } else if (var0 == 1208) { - var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var3.field3101 == null) { - throw new RuntimeException(""); - } else { - ReflectionCheck.method174(var3, var4); - return 1; - } - } else if (var0 == 1209) { - SoundCache.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - if (var3.field3101 == null) { - throw new RuntimeException(""); - } else { - Tiles.method460(var3, var4, var5); - return 1; - } - } else if (var0 == 1210) { - var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var3.field3101 == null) { - throw new RuntimeException(""); - } else { - class135.method742(var3, VarbitComposition.localPlayer.appearance.field2916, var4); - return 1; + for (int var4 = 0; var4 < var0.field3006.length; ++var4) { + if (var0.field3006[var4] != null) { + var0.field2998 = true; + break; } - } else { - return 2; - } - } else { - SoundCache.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemComposition var6 = InvDefinition.ItemDefinition_get(var4); - var3.modelAngleX = var6.xan2d; - var3.modelAngleY = var6.yan2d; - var3.modelAngleZ = var6.zan2d; - var3.modelOffsetX = var6.offsetX2d; - var3.modelOffsetY = var6.offsetY2d; - var3.modelZoom = var6.zoom2d; - if (var0 == 1205) { - var3.itemQuantityMode = 0; - } else if (var0 == 1212 | var6.isStackable == 1) { - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; } - - if (var3.modelRotation > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.modelRotation; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; } - } - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "-104" - ) - static int method476(int var0, Script var1, boolean var2) { - if (var0 == 7463) { - boolean var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - SecureRandomFuture.method444(var3); - return 1; - } else { - return 2; - } + var0.field3005[var1] = var3; } - @ObfuscatedName("jg") + @ObfuscatedName("oz") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-59" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "554905289" ) - static void method475() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - class92.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + static String method465(String var0) { + PlayerType[] var1 = class183.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon != -1 && var0.startsWith(class436.addImageTag(var3.modIcon))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); + break; + } } + return var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/Interpreter.java b/osrs/src/main/java/Interpreter.java index 7db486ee0..e12e8b28b 100644 --- a/osrs/src/main/java/Interpreter.java +++ b/osrs/src/main/java/Interpreter.java @@ -2,56 +2,60 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.js.JSObject; import java.util.ArrayList; -import java.util.Date; -@ObfuscatedName("cb") +@ObfuscatedName("cx") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("ac") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("ai") + @ObfuscatedName("ax") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("ah") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("af") + @ObfuscatedName("am") + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("av") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Lcv;" + descriptor = "[Lcn;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; @ObfuscatedName("an") - static int[] field710; - @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lgb;" + ) + static ClanChannel field704; + @ObfuscatedName("ai") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("ay") - static boolean field705; - @ObfuscatedName("aj") - static boolean field704; - @ObfuscatedName("av") - static ArrayList field715; - @ObfuscatedName("aw") - static int field708; - @ObfuscatedName("bk") - static final double field717; + @ObfuscatedName("aq") + static boolean field701; + @ObfuscatedName("az") + static boolean field702; + @ObfuscatedName("at") + static ArrayList field713; + @ObfuscatedName("af") + static int field706; + @ObfuscatedName("by") + static final double field715; static { Interpreter_arrayLengths = new int[5]; @@ -62,477 +66,31 @@ public class Interpreter { Interpreter_frames = new ScriptFrame[50]; Interpreter_calendar = java.util.Calendar.getInstance(); Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - field705 = false; - field704 = false; - field715 = new ArrayList(); - field708 = 0; - field717 = Math.log(2.0D); + field701 = false; + field702 = false; + field713 = new ArrayList(); + field706 = 0; + field715 = Math.log(2.0D); } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)[B", - garbageValue = "-1581379999" - ) - static byte[] method418(String var0) { - boolean var1 = true; - boolean var2 = true; - int var3 = "pattern".length(); - int var4 = 0; - byte[] var5 = new byte[8]; - - while (true) { - int var6 = var4 + var3; - if (var6 >= var0.length()) { - return null; - } - - char var7 = var0.charAt(var6); - if (var7 == ':') { - if (var4 == 0) { - return null; - } - - byte[] var8 = new byte[var4]; - System.arraycopy(var5, 0, var8, 0, var4); - return var8; - } - - if (var5.length == var4) { - return null; - } - - if (var7 >= '0' && var7 <= '9') { - var7 = (char)(var7 - '0'); - } else { - if (var7 < 'a' || var7 > 'z') { - return null; - } - - var7 = (char)(var7 - 'W'); - } - - var5[var4++] = (byte)var7; - } - } - - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-4" + descriptor = "(Ldl;I)V", + garbageValue = "1932379586" ) - public static int method417(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 0 & 127L); - return var1; + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + ArchiveDisk.runScript(var0, 500000, 475000); } - @ObfuscatedName("bp") + @ObfuscatedName("mq") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-86107696" + descriptor = "(III)V", + garbageValue = "1205286290" ) - static int method419(int var0, Script var1, boolean var2) { - if (var0 == 5630) { - Client.logoutTimer = 250; - return 1; - } else { - return 2; + static final void method418(int var0, int var1) { + if (class33.field89.method1742(var0)) { + ClientPacket.runComponentCloseListeners(class33.field89.Widget_interfaceComponents[var0], var1); } } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-752327040" - ) - static int method420(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = HealthBar.Client_plane; - int var9 = (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX; - int var5 = (VarbitComposition.localPlayer.y >> 7) + class47.baseY; - class227.getWorldMap().method2394(var3, var9, var5, true); - return 1; - } else { - WorldMapArea var11; - if (var0 == 6601) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - String var16 = ""; - var11 = class227.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); - } - - Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == 6602) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class227.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == 6603) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == 6604) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class227.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == 6605) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var15; - if (var0 == 6606) { - var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - class227.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); - return 1; - } else if (var0 == 6607) { - var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - class227.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); - return 1; - } else if (var0 == 6608) { - var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - class227.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == 6609) { - var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - class227.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == 6610) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getDisplayX(); - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var13; - if (var0 == 6611) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var13 = class227.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); - } - - return 1; - } else if (var0 == 6612) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var13 = class227.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == 6613) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var13 = class227.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == 6614) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var13 = class227.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var15 = class227.getWorldMap().getDisplayCoord(); - if (var15 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var15.x; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var15.y; - } - - return 1; - } else if (var0 == 6616) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == 6617) { - var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - var13 = class227.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var14 = var13.position(var15.plane, var15.x, var15.y); - if (var14 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var14[0]; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var14[1]; - } - - return 1; - } - } else { - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - var13 = class227.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var7 = var13.coord(var15.x, var15.y); - if (var7 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } - } else { - Coord var12; - if (var0 == 6619) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var12 = new Coord(Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - class162.method854(var3, var12, false); - return 1; - } else if (var0 == 6620) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var12 = new Coord(Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - class162.method854(var3, var12, true); - return 1; - } else if (var0 == 6621) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var12 = new Coord(Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - var11 = class227.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; - return 1; - } - } else if (var0 == 6622) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getDisplayWith(); - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var15 = new Coord(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - var13 = class227.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if (var13 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var13.getId(); - } - - return 1; - } else if (var0 == 6624) { - class227.getWorldMap().setMaxFlashCount(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - class227.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - class227.getWorldMap().setCyclesPerFlash(Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - class227.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var10; - if (var0 == 6628) { - var10 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class227.getWorldMap().setPerpetualFlash(var10); - return 1; - } else if (var0 == 6629) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class227.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == 6630) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class227.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == 6631) { - class227.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == 6632) { - var10 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class227.getWorldMap().setElementsDisabled(var10); - return 1; - } else { - boolean var4; - if (var0 == 6633) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1] == 1; - class227.getWorldMap().disableElement(var3, var4); - return 1; - } else if (var0 == 6634) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1] == 1; - class227.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } else if (var0 == 6635) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == 6636) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6637) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class227.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var12 = new Coord(Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - var7 = class227.getWorldMap().method2438(var3, var12); - if (var7 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var8; - if (var0 == 6639) { - var8 = class227.getWorldMap().iconStart(); - if (var8 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else if (var0 == 6640) { - var8 = class227.getWorldMap().iconNext(); - if (var8 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var6; - if (var0 == 6693) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var6 = class138.WorldMapElement_get(var3); - if (var6.name == null) { - Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var6.name; - } - - return 1; - } else if (var0 == 6694) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var6 = class138.WorldMapElement_get(var3); - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.textSize; - return 1; - } else if (var0 == 6695) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var6 = class138.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.category; - } - - return 1; - } else if (var0 == 6696) { - var3 = Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var6 = class138.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6.sprite1; - } - - return 1; - } else if (var0 == 6697) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == 6699) { - Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } - } - } - } - } - } - } - - @ObfuscatedName("oy") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1076140788" - ) - static void method421(String var0) { - MusicPatchPcmStream.param9 = var0; - - try { - String var1 = class219.client.getParameter(Integer.toString(18)); - String var2 = class219.client.getParameter(Integer.toString(13)); - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; - String var5; - if (var0.length() == 0) { - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - String var4 = var3 + "; Expires="; - long var6 = GameEngine.clockNow() + 94608000000L; - Calendar.Calendar_calendar.setTime(new Date(var6)); - int var8 = Calendar.Calendar_calendar.get(7); - int var9 = Calendar.Calendar_calendar.get(5); - int var10 = Calendar.Calendar_calendar.get(2); - int var11 = Calendar.Calendar_calendar.get(1); - int var12 = Calendar.Calendar_calendar.get(11); - int var13 = Calendar.Calendar_calendar.get(12); - int var14 = Calendar.Calendar_calendar.get(13); - var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; - var3 = var4 + var5 + "; Max-Age=" + 94608000L; - } - - Client var16 = class219.client; - var5 = "document.cookie=\"" + var3 + "\""; - JSObject.getWindow(var16).eval(var5); - } catch (Throwable var15) { - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/InvDefinition.java b/osrs/src/main/java/InvDefinition.java index 8971c2791..b90cb8ee2 100644 --- a/osrs/src/main/java/InvDefinition.java +++ b/osrs/src/main/java/InvDefinition.java @@ -3,16 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; + +@ObfuscatedName("hm") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("ae") + @ObfuscatedName("vh") + @ObfuscatedSignature( + descriptor = "Lci;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("InvDefinition_archive") + static AbstractArchive InvDefinition_archive; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("size") public int size; @@ -24,10 +40,10 @@ public class InvDefinition extends DualNode { this.size = 0; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-4" + descriptor = "(Lul;I)V", + garbageValue = "1869609284" ) @Export("decode") void decode(Buffer var1) { @@ -41,10 +57,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1263853199" + descriptor = "(Lul;II)V", + garbageValue = "-570859961" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -54,139 +70,194 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-329385926" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IB)Ljava/io/File;", + garbageValue = "116" ) - public static int method937(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if (var4 <= 127) { - ++var2; - } else if (var4 <= 2047) { - var2 += 2; - } else { - var2 += 3; - } - } + static File method954(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; + JagexCache.field1451 = new File(DevicePcmPlayerProvider.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); + String var4 = null; + String var5 = null; + boolean var6 = false; + Buffer var8; + int var11; + File var27; + if (JagexCache.field1451.exists()) { + try { + AccessFile var7 = new AccessFile(JagexCache.field1451, "rw", 10000L); - return var2; - } + int var9; + for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { + var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); + if (var9 == -1) { + throw new IOException(); + } + } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)Lhn;", - garbageValue = "1028115024" - ) - @Export("ItemDefinition_get") - public static ItemComposition ItemDefinition_get(int var0) { - ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class384.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + var8.offset = 0; + var9 = var8.readUnsignedByte(); + if (var9 < 1 || var9 > 3) { + throw new IOException("" + var9); + } - var1.post(); - if (var1.noteTemplate != -1) { - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } + int var10 = 0; + if (var9 > 1) { + var10 = var8.readUnsignedByte(); + } - if (var1.notedId != -1) { - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } + if (var9 <= 2) { + var4 = var8.readStringCp1252NullCircumfixed(); + if (var10 == 1) { + var5 = var8.readStringCp1252NullCircumfixed(); + } + } else { + var4 = var8.readCESUB(); + if (var10 == 1) { + var5 = var8.readCESUB(); + } + } - if (var1.placeholderTemplate != -1) { - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + var7.close(); + } catch (IOException var25) { + var25.printStackTrace(); } - if (!ItemComposition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { - if (var1.noteTemplate == -1 && var1.notedId == -1 && var1.placeholderTemplate == -1) { - var1.name = var1.name + " (Members)"; + if (var4 != null) { + var27 = new File(var4); + if (!var27.exists()) { + var4 = null; } + } - var1.isTradable = false; + if (var4 != null) { + var27 = new File(var4, "test.dat"); - int var3; - for (var3 = 0; var3 < var1.groundActions.length; ++var3) { - var1.groundActions[var3] = null; + boolean var28; + try { + RandomAccessFile var15 = new RandomAccessFile(var27, "rw"); + var11 = var15.read(); + var15.seek(0L); + var15.write(var11); + var15.seek(0L); + var15.close(); + var27.delete(); + var28 = true; + } catch (Exception var23) { + var28 = false; } - for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { - if (var3 != 4) { - var1.inventoryActions[var3] = null; - } + if (!var28) { + var4 = null; } + } + } - var1.shiftClickIndex = -2; - var1.team = 0; - if (var1.params != null) { - boolean var6 = false; + if (var4 == null && var2 == 0) { + label134: + for (int var16 = 0; var16 < class27.field74.length; ++var16) { + for (int var17 = 0; var17 < FriendsList.field3812.length; ++var17) { + File var18 = new File(FriendsList.field3812[var17] + class27.field74[var16] + File.separatorChar + var0 + File.separatorChar); + if (var18.exists()) { + File var19 = new File(var18, "test.dat"); - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamComposition var5 = ObjTypeCustomisation.getParamDefinition((int)var4.key); - if (var5.autoDisable) { - var4.remove(); - } else { + boolean var29; + try { + RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); + int var13 = var12.read(); + var12.seek(0L); + var12.write(var13); + var12.seek(0L); + var12.close(); + var19.delete(); + var29 = true; + } catch (Exception var22) { + var29 = false; + } + + if (var29) { + var4 = var18.toString(); var6 = true; + break label134; } } + } + } + } + + if (var4 == null) { + var4 = DevicePcmPlayerProvider.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; + var6 = true; + } + + File var26; + if (var5 != null) { + var26 = new File(var5); + var27 = new File(var4); + + try { + File[] var33 = var26.listFiles(); + File[] var31 = var33; - if (!var6) { - var1.params = null; + for (var11 = 0; var11 < var31.length; ++var11) { + File var30 = var31[var11]; + File var20 = new File(var27, var30.getName()); + boolean var14 = var30.renameTo(var20); + if (!var14) { + throw new IOException(); } } + } catch (Exception var24) { + var24.printStackTrace(); } - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); - return var1; + var6 = true; } - } - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-115" - ) - public static int method940(int var0, int var1, int var2) { - int var3 = Projectile.method430(var2 - var1 + 1); - var3 <<= var1; - return var0 & ~var3; - } + if (var6) { + var26 = new File(var4); + var8 = null; - @ObfuscatedName("ac") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); + try { + AccessFile var34 = new AccessFile(JagexCache.field1451, "rw", 10000L); + Buffer var32 = new Buffer(500); + var32.writeByte(3); + var32.writeByte(var8 != null ? 1 : 0); + var32.writeCESU8(var26.getPath()); + if (var8 != null) { + var32.writeCESU8(""); + } + + var34.write(var32.array, 0, var32.offset); + var34.close(); + } catch (IOException var21) { + var21.printStackTrace(); + } + } + + return new File(var4); } - @ObfuscatedName("lw") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-95" + descriptor = "(Lom;Ljava/lang/String;Ljava/lang/String;S)[Lun;", + garbageValue = "20693" ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { - Widget var0 = SoundCache.getWidgetChild(ModeWhere.selectedSpellWidget, Client.selectedSpellChildIndex); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - WorldMapSection1.runScriptEvent(var1); + public static IndexedSprite[] method953(AbstractArchive var0, String var1, String var2) { + if (!var0.isValidFileName(var1, var2)) { + return null; + } else { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + IndexedSprite[] var5; + if (!class164.method862(var0, var3, var4)) { + var5 = null; + } else { + var5 = class512.method2517(); } - Client.selectedSpellItemId = -1; - Client.isSpellSelected = false; - class218.invalidateWidget(var0); + return var5; } } } \ No newline at end of file diff --git a/osrs/src/main/java/IsaacCipher.java b/osrs/src/main/java/IsaacCipher.java index c8fea7524..8f0433e1a 100644 --- a/osrs/src/main/java/IsaacCipher.java +++ b/osrs/src/main/java/IsaacCipher.java @@ -3,25 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ux") +@ObfuscatedName("vd") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("results") int[] results; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("mm") int[] mm; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("aa") int aa; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("bb") int bb; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("cc") int cc; @@ -33,13 +33,13 @@ public IsaacCipher(int[] var1) { this.results[var2] = var1[var2]; } - this.method2693(); + this.method2732(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-66287514" + garbageValue = "65535" ) @Export("nextInt") public final int nextInt() { @@ -51,12 +51,12 @@ public final int nextInt() { return this.results[--this.valuesRemaining]; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1374032282" + garbageValue = "1348213836" ) - public final int method2691() { + public final int method2730() { if (this.valuesRemaining == 0) { this.generateMoreResults(); this.valuesRemaining = 256; @@ -65,10 +65,10 @@ public final int method2691() { return this.results[this.valuesRemaining - 1]; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1084555952" + descriptor = "(B)V", + garbageValue = "-14" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -88,20 +88,20 @@ final void generateMoreResults() { this.aa ^= this.aa >>> 16; } - this.aa += this.mm[var1 + 128 & 255]; + this.aa += this.mm[128 + var1 & 255]; int var3; - this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "4" + descriptor = "(I)V", + garbageValue = "-999291280" ) - final void method2693() { + final void method2732() { int var9 = -1640531527; int var8 = -1640531527; int var7 = -1640531527; @@ -228,4 +228,14 @@ final void method2693() { this.generateMoreResults(); this.valuesRemaining = 256; } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "526630296" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; + } } \ No newline at end of file diff --git a/osrs/src/main/java/ItemComposition.java b/osrs/src/main/java/ItemComposition.java index 3c54b952e..dc78c60ff 100644 --- a/osrs/src/main/java/ItemComposition.java +++ b/osrs/src/main/java/ItemComposition.java @@ -3,191 +3,185 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Iterator; + +@ObfuscatedName("iy") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - @Export("ItemDefinition_modelArchive") - public static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("ap") - @Export("ItemDefinition_inMembersWorld") - public static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("aa") - static int[] field1768; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("ItemDefinition_cached") - public static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("ad") + static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) - @Export("ItemDefinition_cachedModels") - public static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("aq") + @Export("HealthBarDefinition_cachedSprites") + static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("id") int id; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("model") int model; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("name") public String name; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("zoom2d") public int zoom2d; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("xan2d") public int xan2d; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("yan2d") public int yan2d; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("zan2d") public int zan2d; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("isStackable") public int isStackable; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("price") public int price; - @ObfuscatedName("bt") + @ObfuscatedName("be") @Export("maleModel") public int maleModel; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("maleModel1") public int maleModel1; - @ObfuscatedName("by") + @ObfuscatedName("ba") @Export("maleModel2") public int maleModel2; - @ObfuscatedName("bs") + @ObfuscatedName("bz") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("bm") + @ObfuscatedName("bb") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("bf") + @ObfuscatedName("bo") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("ba") + @ObfuscatedName("bt") @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("bl") + @ObfuscatedName("bm") @Export("femaleModel") int femaleModel; - @ObfuscatedName("bp") + @ObfuscatedName("br") @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("bu") + @ObfuscatedName("bs") @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("bo") + @ObfuscatedName("bc") @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("br") - int field1779; - @ObfuscatedName("be") + @ObfuscatedName("bf") + int field1777; + @ObfuscatedName("bh") @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("bi") + @ObfuscatedName("bl") @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("bz") + @ObfuscatedName("bg") @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("bx") - int field1782; - @ObfuscatedName("bn") - int field1776; - @ObfuscatedName("bw") + @ObfuscatedName("bj") int field1781; - @ObfuscatedName("bc") + @ObfuscatedName("bx") + int field1788; + @ObfuscatedName("bi") + int field1780; + @ObfuscatedName("bq") @Export("countobj") int[] countobj; - @ObfuscatedName("bg") + @ObfuscatedName("bw") @Export("countco") int[] countco; - @ObfuscatedName("cw") + @ObfuscatedName("ce") @Export("note") public int note; - @ObfuscatedName("cf") + @ObfuscatedName("cu") @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("cm") + @ObfuscatedName("cw") @Export("resizeX") int resizeX; - @ObfuscatedName("cn") + @ObfuscatedName("co") @Export("resizeY") int resizeY; - @ObfuscatedName("cs") + @ObfuscatedName("cc") @Export("resizeZ") int resizeZ; - @ObfuscatedName("cx") + @ObfuscatedName("cg") + public int field1811; + @ObfuscatedName("cq") public int field1812; - @ObfuscatedName("cr") - public int field1809; - @ObfuscatedName("cd") + @ObfuscatedName("cy") @Export("team") public int team; - @ObfuscatedName("ce") - public int field1806; - @ObfuscatedName("cq") + @ObfuscatedName("cz") + public int field1817; + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Lsf;" + descriptor = "Ltp;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("cp") + @ObfuscatedName("cb") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("cv") + @ObfuscatedName("cn") @Export("unnotedId") int unnotedId; - @ObfuscatedName("co") + @ObfuscatedName("ck") @Export("notedId") int notedId; - @ObfuscatedName("cl") + @ObfuscatedName("cr") @Export("placeholder") public int placeholder; - @ObfuscatedName("cu") + @ObfuscatedName("cs") @Export("placeholderTemplate") public int placeholderTemplate; static { ItemDefinition_cached = new EvictingDualNodeHashTable(64); - ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); + HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(50); ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); } @@ -213,22 +207,22 @@ public class ItemComposition extends DualNode { this.femaleOffset = 0; this.maleHeadModel = -1; this.maleHeadModel2 = -1; - this.field1779 = 0; + this.field1777 = 0; this.femaleModel2 = -1; this.femaleHeadModel = -1; this.femaleHeadModel2 = -1; - this.field1782 = -1; - this.field1776 = -1; this.field1781 = -1; + this.field1788 = -1; + this.field1780 = -1; this.note = -1; this.noteTemplate = -1; this.resizeX = 128; this.resizeY = 128; this.resizeZ = 128; + this.field1811 = 0; this.field1812 = 0; - this.field1809 = 0; this.team = 0; - this.field1806 = 0; + this.field1817 = 0; this.isTradable = false; this.unnotedId = -1; this.notedId = -1; @@ -236,23 +230,23 @@ public class ItemComposition extends DualNode { this.placeholderTemplate = -1; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "864940411" + garbageValue = "1200594754" ) @Export("post") void post() { if (this.isStackable == 1) { - this.field1806 = 0; + this.field1817 = 0; } } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "3" + descriptor = "(Lul;I)V", + garbageValue = "-1772742303" ) @Export("decode") void decode(Buffer var1) { @@ -266,10 +260,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "628173380" + descriptor = "(Lul;II)V", + garbageValue = "215649893" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -312,7 +306,7 @@ void decodeNext(Buffer var1, int var2) { this.femaleModel1 = var1.readUnsignedShort(); } else if (var2 == 25) { this.maleHeadModel = var1.readUnsignedShort(); - this.field1779 = var1.readUnsignedByte(); + this.field1777 = var1.readUnsignedByte(); } else if (var2 == 26) { this.maleHeadModel2 = var1.readUnsignedShort(); } else if (var2 == 27) { @@ -350,7 +344,7 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 65) { this.isTradable = true; } else if (var2 == 75) { - this.field1806 = var1.readShort(); + this.field1817 = var1.readShort(); } else if (var2 == 78) { this.femaleModel2 = var1.readUnsignedShort(); } else if (var2 == 79) { @@ -358,11 +352,11 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 90) { this.femaleHeadModel2 = var1.readUnsignedShort(); } else if (var2 == 91) { - this.field1776 = var1.readUnsignedShort(); + this.field1788 = var1.readUnsignedShort(); } else if (var2 == 92) { - this.field1782 = var1.readUnsignedShort(); - } else if (var2 == 93) { this.field1781 = var1.readUnsignedShort(); + } else if (var2 == 93) { + this.field1780 = var1.readUnsignedShort(); } else if (var2 == 94) { var1.readUnsignedShort(); } else if (var2 == 95) { @@ -386,9 +380,9 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 112) { this.resizeZ = var1.readUnsignedShort(); } else if (var2 == 113) { - this.field1812 = var1.readByte(); + this.field1811 = var1.readByte(); } else if (var2 == 114) { - this.field1809 = var1.readByte() * 5; + this.field1812 = var1.readByte() * 5; } else if (var2 == 115) { this.team = var1.readUnsignedByte(); } else if (var2 == 139) { @@ -400,16 +394,16 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = Decimator.readStringIntParameters(var1, this.params); + this.params = class167.readStringIntParameters(var1, this.params); } } } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lhn;Lhn;B)V", - garbageValue = "-46" + descriptor = "(Liy;Liy;B)V", + garbageValue = "-75" ) @Export("genCert") void genCert(ItemComposition var1, ItemComposition var2) { @@ -430,10 +424,10 @@ void genCert(ItemComposition var1, ItemComposition var2) { this.isStackable = 1; } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lhn;Lhn;B)V", - garbageValue = "-88" + descriptor = "(Liy;Liy;I)V", + garbageValue = "2123004115" ) @Export("genBought") void genBought(ItemComposition var1, ItemComposition var2) { @@ -461,12 +455,12 @@ void genBought(ItemComposition var1, ItemComposition var2) { this.maleHeadModel2 = var2.maleHeadModel2; this.femaleHeadModel = var2.femaleHeadModel; this.femaleHeadModel2 = var2.femaleHeadModel2; - this.field1782 = var2.field1782; - this.field1776 = var2.field1776; this.field1781 = var2.field1781; + this.field1788 = var2.field1788; + this.field1780 = var2.field1780; this.team = var2.team; this.groundActions = var2.groundActions; - this.field1806 = var2.field1806; + this.field1817 = var2.field1817; this.inventoryActions = new String[5]; if (var2.inventoryActions != null) { for (int var3 = 0; var3 < 4; ++var3) { @@ -478,10 +472,10 @@ void genBought(ItemComposition var1, ItemComposition var2) { this.price = 0; } - @ObfuscatedName("az") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lhn;Lhn;I)V", - garbageValue = "-490617872" + descriptor = "(Liy;Liy;S)V", + garbageValue = "29021" ) @Export("genPlaceholder") void genPlaceholder(ItemComposition var1, ItemComposition var2) { @@ -503,10 +497,10 @@ void genPlaceholder(ItemComposition var1, ItemComposition var2) { this.isTradable = false; } - @ObfuscatedName("ap") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IB)Lic;", - garbageValue = "0" + descriptor = "(IB)Ljw;", + garbageValue = "37" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -521,11 +515,11 @@ public final ModelData getModelData(int var1) { } if (var2 != -1) { - return InvDefinition.ItemDefinition_get(var2).getModelData(1); + return class214.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); + ModelData var4 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; } else { @@ -549,10 +543,10 @@ public final ModelData getModelData(int var1) { } } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(II)Ljr;", - garbageValue = "220465503" + descriptor = "(IB)Ljn;", + garbageValue = "108" ) @Export("getModel") public final Model getModel(int var1) { @@ -566,15 +560,15 @@ public final Model getModel(int var1) { } if (var2 != -1) { - return InvDefinition.ItemDefinition_get(var2).getModel(1); + return class214.ItemDefinition_get(var2).getModel(1); } } - Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); + Model var5 = (Model)HealthBarDefinition_cachedSprites.get((long)this.id); if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); + ModelData var6 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, this.model, 0); if (var6 == null) { return null; } else { @@ -595,18 +589,18 @@ public final Model getModel(int var1) { } } - var5 = var6.toModel(this.field1812 + 64, this.field1809 + 768, -50, -10, -50); + var5 = var6.toModel(this.field1811 + 64, this.field1812 + 768, -50, -10, -50); var5.isSingleTile = true; - ItemDefinition_cachedModels.put(var5, (long)this.id); + HealthBarDefinition_cachedSprites.put(var5, (long)this.id); return var5; } } } - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(II)Lhn;", - garbageValue = "-257318968" + descriptor = "(II)Liy;", + garbageValue = "587694924" ) @Export("getCountObj") public ItemComposition getCountObj(int var1) { @@ -620,19 +614,19 @@ public ItemComposition getCountObj(int var1) { } if (var2 != -1) { - return InvDefinition.ItemDefinition_get(var2); + return class214.ItemDefinition_get(var2); } } return this; } - @ObfuscatedName("aq") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-106" + descriptor = "(II)Z", + garbageValue = "-274386962" ) - public final boolean method1061(int var1) { + public final boolean method1099(int var1) { int var2 = this.femaleModel; int var3 = this.femaleModel1; int var4 = this.femaleModel2; @@ -646,15 +640,15 @@ public final boolean method1061(int var1) { return true; } else { boolean var5 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!class349.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !class349.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + if (var4 != -1 && !class349.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -662,12 +656,12 @@ public final boolean method1061(int var1) { } } - @ObfuscatedName("al") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(II)Lic;", - garbageValue = "768545854" + descriptor = "(IB)Ljw;", + garbageValue = "122" ) - public final ModelData method1062(int var1) { + public final ModelData method1100(int var1) { int var2 = this.femaleModel; int var3 = this.femaleModel1; int var4 = this.femaleModel2; @@ -680,11 +674,11 @@ public final ModelData method1062(int var1) { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); + ModelData var5 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); + ModelData var6 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); + ModelData var7 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); } else { @@ -697,8 +691,8 @@ public final ModelData method1062(int var1) { var5.changeOffset(0, this.femaleOffset, 0); } - if (var1 == 1 && this.field1779 != 0) { - var5.changeOffset(0, this.field1779, 0); + if (var1 == 1 && this.field1777 != 0) { + var5.changeOffset(0, this.field1777, 0); } int var9; @@ -718,28 +712,28 @@ public final ModelData method1062(int var1) { } } - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-594458202" + garbageValue = "1156430655" ) - public final boolean method1063(int var1) { + public final boolean method1101(int var1) { int var2 = this.femaleHeadModel2; - int var3 = this.field1782; + int var3 = this.field1781; if (var1 == 1) { - var2 = this.field1776; - var3 = this.field1781; + var2 = this.field1788; + var3 = this.field1780; } if (var2 == -1) { return true; } else { boolean var4 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!class349.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !class349.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -747,25 +741,25 @@ public final boolean method1063(int var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(II)Lic;", - garbageValue = "1601057747" + descriptor = "(IB)Ljw;", + garbageValue = "1" ) - public final ModelData method1064(int var1) { + public final ModelData method1102(int var1) { int var2 = this.femaleHeadModel2; - int var3 = this.field1782; + int var3 = this.field1781; if (var1 == 1) { - var2 = this.field1776; - var3 = this.field1781; + var2 = this.field1788; + var3 = this.field1780; } if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); + ModelData var4 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); + ModelData var5 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } @@ -787,49 +781,36 @@ public final ModelData method1064(int var1) { } } - @ObfuscatedName("ab") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "6798" + descriptor = "(III)I", + garbageValue = "1786847682" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class14.method39(this.params, var1, var2); + return AttackOption.method607(this.params, var1, var2); } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "693488201" + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "2" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; - } - } - - return var3; + return class30.method122(this.params, var1, var2); } - @ObfuscatedName("am") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-702688256" + garbageValue = "-2124438684" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { if (this.shiftClickIndex != -1 && this.inventoryActions != null) { if (this.shiftClickIndex >= 0) { - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -947919987 * -252831931 : -1; + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 970785649 * 1579244945 : -1; } else { return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } @@ -838,36 +819,68 @@ public int getShiftClickIndex() { } } - @ObfuscatedName("ah") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2125931156" + descriptor = "(B)Z", + garbageValue = "32" ) @Export("hasRecolor") boolean hasRecolor() { return this.recolorTo != null; } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-889947333" + descriptor = "(B)Z", + garbageValue = "1" ) @Export("hasRetexture") boolean hasRetexture() { return this.retextureTo != null; } - @ObfuscatedName("ag") + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;S)Z", + garbageValue = "5119" + ) + static boolean method1092(String var0) { + if (var0 == null) { + return false; + } else { + try { + new URL(var0); + return true; + } catch (MalformedURLException var2) { + return false; + } + } + } + + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1033906298" + descriptor = "(III)V", + garbageValue = "1262407240" ) - public static int method1054(int var0) { - if (var0 > 0) { - return 1; + public static void method1088(int var0, int var1) { + MouseHandler.method177(var0, var1, 0, 0); + class319.field2789.clear(); + class319.field2798.clear(); + if (class319.musicSongs.isEmpty() || var0 == 0 && var1 == 0) { + class74.method426(); } else { - return var0 < 0 ? -1 : 0; + class319.field2798.add(new DelayFadeTask((SongTask)null, class319.musicPlayerStatus)); + class319.field2798.add(new FadeOutTask((SongTask)null, 0, false, class319.field2794)); + ArrayList var3 = new ArrayList(); + Iterator var4 = class319.musicSongs.iterator(); + + while (var4.hasNext()) { + MusicSong var5 = (MusicSong)var4.next(); + var3.add(var5); + } + + class319.field2798.add(new class416((SongTask)null, var3)); } + } } \ No newline at end of file diff --git a/osrs/src/main/java/ItemContainer.java b/osrs/src/main/java/ItemContainer.java index 3f5629bc6..a245f1d4b 100644 --- a/osrs/src/main/java/ItemContainer.java +++ b/osrs/src/main/java/ItemContainer.java @@ -3,24 +3,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("dk") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Ltf;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Luk;" - ) - static IndexedSprite field853; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("ids") int[] ids; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("quantities") int[] quantities; @@ -33,27 +28,19 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; } - @ObfuscatedName("ae") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-96469770" + descriptor = "(Ltr;I)Ljava/lang/Object;", + garbageValue = "1234966456" ) - public static void method468() { - FileSystem.FileSystem_cacheFiles.clear(); - } - - @ObfuscatedName("js") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2139499432" - ) - static final void method469(int var0, int var1) { - if (Client.hintArrowType == 2) { - HealthBar.worldToScreen((Client.hintArrowX - UrlRequester.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class47.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - ArchiveLoader.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - + static Object method460(class517 var0) { + switch(var0.field4133) { + case 0: + return Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + case 2: + return Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + default: + throw new IllegalStateException("popValueOfType() failure - unsupported type"); } } } \ No newline at end of file diff --git a/osrs/src/main/java/ItemLayer.java b/osrs/src/main/java/ItemLayer.java index 740d11815..d4a98e803 100644 --- a/osrs/src/main/java/ItemLayer.java +++ b/osrs/src/main/java/ItemLayer.java @@ -2,165 +2,44 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("ir") +@ObfuscatedName("jc") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("z") int z; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("x") int x; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("y") int y; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Ljy;" ) @Export("first") Renderable first; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Ljy;" ) @Export("second") Renderable second; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Ljy;" ) @Export("third") Renderable third; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("tag") long tag; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("height") int height; ItemLayer() { } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "1457055781" - ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { - return Byte.TYPE; - } else if (var0.equals("I")) { - return Integer.TYPE; - } else if (var0.equals("S")) { - return Short.TYPE; - } else if (var0.equals("J")) { - return Long.TYPE; - } else if (var0.equals("Z")) { - return Boolean.TYPE; - } else if (var0.equals("F")) { - return Float.TYPE; - } else if (var0.equals("D")) { - return Double.TYPE; - } else if (var0.equals("C")) { - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); - } - } - - @ObfuscatedName("kk") - @ObfuscatedSignature( - descriptor = "(Ldx;B)V", - garbageValue = "-52" - ) - static void method1152(NPC var0) { - var0.field976 = var0.definition.size; - var0.field1017 = var0.definition.rotation; - var0.walkSequence = var0.definition.walkSequence; - var0.walkBackSequence = var0.definition.walkBackSequence; - var0.walkLeftSequence = var0.definition.walkLeftSequence; - var0.walkRightSequence = var0.definition.walkRightSequence; - var0.idleSequence = var0.definition.idleSequence; - var0.turnLeftSequence = var0.definition.turnLeftSequence; - var0.turnRightSequence = var0.definition.turnRightSequence; - var0.runSequence = var0.definition.runSequence; - var0.runBackSequence = var0.definition.runBackSequence; - var0.runLeftSequence = var0.definition.runLeftSequence; - var0.runRightSequence = var0.definition.runRightSequence; - var0.crawlSequence = var0.definition.crawlSequence; - var0.crawlBackSequence = var0.definition.crawlBackSequence; - var0.crawlLeftSequence = var0.definition.crawlLeftSequence; - var0.crawlRightSequence = var0.definition.crawlRightSequence; - } - - @ObfuscatedName("lr") - @ObfuscatedSignature( - descriptor = "(Ldf;IIII)V", - garbageValue = "-836252773" - ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (VarbitComposition.localPlayer != var0) { - if (Client.menuOptionsCount < 400) { - String var4; - if (var0.skillLevel == 0) { - var4 = var0.actions[0] + var0.username + var0.actions[1] + class14.method42(var0.combatLevel, VarbitComposition.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; - } - - int var5; - if (Client.isItemSelected == 1) { - class385.insertMenuItemNoShift("Use", Client.field599 + " " + "->" + " " + MoveSpeed.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((Canvas.selectedSpellFlags & 8) == 8) { - class385.insertMenuItemNoShift(Client.field600, Client.field601 + " " + "->" + " " + MoveSpeed.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } - } else { - for (var5 = 7; var5 >= 0; --var5) { - if (Client.playerMenuActions[var5] != null) { - short var6 = 0; - if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { - if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { - continue; - } - - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > VarbitComposition.localPlayer.combatLevel) { - var6 = 2000; - } - - if (VarbitComposition.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == VarbitComposition.localPlayer.team) { - var6 = 2000; - } else { - var6 = 0; - } - } else if (Client.playerAttackOption == AttackOption.field1097 && var0.isClanMember()) { - var6 = 2000; - } - } else if (Client.playerOptionsPriorities[var5]) { - var6 = 2000; - } - - boolean var7 = false; - int var8 = Client.playerMenuOpcodes[var5] + var6; - class385.insertMenuItemNoShift(Client.playerMenuActions[var5], MoveSpeed.colorStartTag(16777215) + var4, var8, var1, var2, var3); - } - } - } - - for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (Client.menuOpcodes[var5] == 23) { - Client.menuTargets[var5] = MoveSpeed.colorStartTag(16777215) + var4; - break; - } - } - - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/IterableDualNodeQueue.java b/osrs/src/main/java/IterableDualNodeQueue.java index 7b11ac9d9..4fd6da562 100644 --- a/osrs/src/main/java/IterableDualNodeQueue.java +++ b/osrs/src/main/java/IterableDualNodeQueue.java @@ -5,18 +5,18 @@ import java.util.Iterator; -@ObfuscatedName("ou") +@ObfuscatedName("pt") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lsq;" + descriptor = "Lsb;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lsq;" + descriptor = "Lsb;" ) @Export("head") DualNode head; @@ -27,7 +27,7 @@ public IterableDualNodeQueue() { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { @@ -36,9 +36,9 @@ public void clear() { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lsq;)V" + descriptor = "(Lsb;)V" ) @Export("add") public void add(DualNode var1) { @@ -52,9 +52,9 @@ public void add(DualNode var1) { var1.previousDual.nextDual = var1; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "()Lsq;" + descriptor = "()Lsb;" ) @Export("removeLast") public DualNode removeLast() { @@ -67,18 +67,18 @@ public DualNode removeLast() { } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "()Lsq;" + descriptor = "()Lsb;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lsq;)Lsq;" + descriptor = "(Lsb;)Lsb;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -98,9 +98,9 @@ DualNode previousOrLast(DualNode var1) { } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "()Lsq;" + descriptor = "()Lsb;" ) @Export("previous") public DualNode previous() { @@ -120,9 +120,9 @@ public Iterator iterator() { return new IterableDualNodeQueueIterator(this); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lsq;Lsq;)V" + descriptor = "(Lsb;Lsb;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { diff --git a/osrs/src/main/java/IterableDualNodeQueueIterator.java b/osrs/src/main/java/IterableDualNodeQueueIterator.java index 2ac5466bb..5fc343073 100644 --- a/osrs/src/main/java/IterableDualNodeQueueIterator.java +++ b/osrs/src/main/java/IterableDualNodeQueueIterator.java @@ -5,30 +5,30 @@ import java.util.Iterator; -@ObfuscatedName("ol") +@ObfuscatedName("ps") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lou;" + descriptor = "Lpt;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lsq;" + descriptor = "Lsb;" ) @Export("head") DualNode head; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lsq;" + descriptor = "Lsb;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Lou;)V" + descriptor = "(Lpt;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; diff --git a/osrs/src/main/java/IterableNodeDeque.java b/osrs/src/main/java/IterableNodeDeque.java index 8d84bfe26..47c157842 100644 --- a/osrs/src/main/java/IterableNodeDeque.java +++ b/osrs/src/main/java/IterableNodeDeque.java @@ -6,20 +6,20 @@ import java.util.Collection; import java.util.Iterator; -@ObfuscatedName("oc") +@ObfuscatedName("py") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "Lsj;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "Lsj;" ) - Node field3636; + Node field3674; public IterableNodeDeque() { this.sentinel = new Node(); @@ -27,7 +27,7 @@ public IterableNodeDeque() { this.sentinel.next = this.sentinel; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { @@ -36,7 +36,7 @@ public void rsClear() { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(Lsj;)V" ) @@ -52,7 +52,7 @@ public void addFirst(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(Lsj;)V" ) @@ -68,20 +68,20 @@ public void addLast(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "()Lsj;" ) @Export("last") public Node last() { - return this.method2005((Node)null); + return this.method2036((Node)null); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(Lsj;)Lsj;" ) - Node method2005(Node var1) { + Node method2036(Node var1) { Node var2; if (var1 == null) { var2 = this.sentinel.previous; @@ -90,32 +90,32 @@ Node method2005(Node var1) { } if (var2 == this.sentinel) { - this.field3636 = null; + this.field3674 = null; return null; } else { - this.field3636 = var2.previous; + this.field3674 = var2.previous; return var2; } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "()Lsj;" ) @Export("previous") public Node previous() { - Node var1 = this.field3636; + Node var1 = this.field3674; if (var1 == this.sentinel) { - this.field3636 = null; + this.field3674 = null; return null; } else { - this.field3636 = var1.previous; + this.field3674 = var1.previous; return var1; } } - @ObfuscatedName("ap") - int method2007() { + @ObfuscatedName("ab") + int method2038() { int var1 = 0; for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { @@ -125,17 +125,17 @@ int method2007() { return var1; } - @ObfuscatedName("aa") - public boolean method2008() { + @ObfuscatedName("am") + public boolean method2039() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "()[Lsj;" ) - Node[] method2009() { - Node[] var1 = new Node[this.method2007()]; + Node[] method2040() { + Node[] var1 = new Node[this.method2038()]; int var2 = 0; for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { @@ -145,11 +145,11 @@ Node[] method2009() { return var1; } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(Lsj;)Z" ) - boolean method2010(Node var1) { + boolean method2041(Node var1) { this.addFirst(var1); return true; } @@ -163,13 +163,13 @@ public Iterator iterator() { @Export("size") @ObfuscatedName("size") public int size() { - return this.method2007(); + return this.method2038(); } @Export("isEmpty") @ObfuscatedName("isEmpty") public boolean isEmpty() { - return this.method2008(); + return this.method2039(); } public boolean contains(Object var1) { @@ -179,7 +179,7 @@ public boolean contains(Object var1) { @Export("toArray") @ObfuscatedName("toArray") public Object[] toArray() { - return this.method2009(); + return this.method2040(); } @Export("toArray") @@ -223,7 +223,7 @@ public void clear() { @Export("add") @ObfuscatedName("add") public boolean add(Object var1) { - return this.method2010((Node)var1); + return this.method2041((Node)var1); } @Export("equals") @@ -238,7 +238,7 @@ public int hashCode() { return super.hashCode(); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(Lsj;Lsj;)V" ) diff --git a/osrs/src/main/java/IterableNodeDequeDescendingIterator.java b/osrs/src/main/java/IterableNodeDequeDescendingIterator.java index 550cb087b..c13a2e977 100644 --- a/osrs/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/osrs/src/main/java/IterableNodeDequeDescendingIterator.java @@ -5,21 +5,21 @@ import java.util.Iterator; -@ObfuscatedName("ot") +@ObfuscatedName("pj") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Loc;" + descriptor = "Lpy;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "Lsj;" ) - Node field3634; - @ObfuscatedName("ao") + Node field3672; + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "Lsj;" ) @@ -27,16 +27,16 @@ public class IterableNodeDequeDescendingIterator implements Iterator { Node last; @ObfuscatedSignature( - descriptor = "(Loc;)V" + descriptor = "(Lpy;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; this.setDeque(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Loc;)V" + descriptor = "(Lpy;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -44,22 +44,22 @@ void setDeque(IterableNodeDeque var1) { this.start(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("start") void start() { - this.field3634 = this.deque != null ? this.deque.sentinel.previous : null; + this.field3672 = this.deque != null ? this.deque.sentinel.previous : null; this.last = null; } @Export("next") @ObfuscatedName("next") public Object next() { - Node var1 = this.field3634; + Node var1 = this.field3672; if (var1 == this.deque.sentinel) { var1 = null; - this.field3634 = null; + this.field3672 = null; } else { - this.field3634 = var1.previous; + this.field3672 = var1.previous; } this.last = var1; @@ -69,7 +69,7 @@ public Object next() { @Export("hasNext") @ObfuscatedName("hasNext") public boolean hasNext() { - return this.deque.sentinel != this.field3634 && this.field3634 != null; + return this.deque.sentinel != this.field3672 && this.field3672 != null; } @Export("remove") diff --git a/osrs/src/main/java/IterableNodeHashTable.java b/osrs/src/main/java/IterableNodeHashTable.java index 66ab609d5..f718bee33 100644 --- a/osrs/src/main/java/IterableNodeHashTable.java +++ b/osrs/src/main/java/IterableNodeHashTable.java @@ -5,31 +5,31 @@ import java.util.Iterator; -@ObfuscatedName("sf") +@ObfuscatedName("tp") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("size") int size; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "[Lsj;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "Lsj;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "Lsj;" ) @Export("current") Node current; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("index") int index; @@ -46,7 +46,7 @@ public IterableNodeHashTable(int var1) { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(J)Lsj;" ) @@ -66,7 +66,7 @@ public Node get(long var1) { return null; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(Lsj;J)V" ) @@ -84,7 +84,7 @@ public void put(Node var1, long var2) { var1.key = var2; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { @@ -104,7 +104,7 @@ public void clear() { this.current = null; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "()Lsj;" ) @@ -114,7 +114,7 @@ public Node first() { return this.next(); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "()Lsj;" ) diff --git a/osrs/src/main/java/IterableNodeHashTableIterator.java b/osrs/src/main/java/IterableNodeHashTableIterator.java index 3dfc64603..45a14d707 100644 --- a/osrs/src/main/java/IterableNodeHashTableIterator.java +++ b/osrs/src/main/java/IterableNodeHashTableIterator.java @@ -5,25 +5,25 @@ import java.util.Iterator; -@ObfuscatedName("sa") +@ObfuscatedName("tm") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lsf;" + descriptor = "Ltp;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "Lsj;" ) @Export("head") Node head; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("index") int index; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "Lsj;" ) @@ -31,7 +31,7 @@ public class IterableNodeHashTableIterator implements Iterator { Node last; @ObfuscatedSignature( - descriptor = "(Lsf;)V" + descriptor = "(Ltp;)V" ) public IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; @@ -39,7 +39,7 @@ public IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.start(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; @@ -47,11 +47,11 @@ void start() { this.last = null; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "()Lsj;" ) - public Node method2449() { + public Node method2484() { this.start(); return (Node)this.next(); } diff --git a/osrs/src/main/java/JSException.java b/osrs/src/main/java/JSException.java new file mode 100644 index 000000000..fa730d487 --- /dev/null +++ b/osrs/src/main/java/JSException.java @@ -0,0 +1,36 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pq") +@Implements("netscape/js/JSException") +public class JSException extends RuntimeException { + @ObfuscatedName("kl") + @ObfuscatedSignature( + descriptor = "Lud;" + ) + @Export("compass") + static SpritePixels compass; + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)[Llq;", + garbageValue = "1413170050" + ) + public static ZoneOperation[] method2055() { + return new ZoneOperation[]{ZoneOperation.LOC_ADD_CHANGE, + ZoneOperation.LOC_ANIM, + ZoneOperation.LOC_DEL, + ZoneOperation.OBJ_DEL, + ZoneOperation.field2624, + ZoneOperation.OBJ_COUNT, + ZoneOperation.PREFETCH_GAMEOBJECTS, + ZoneOperation.field2617, + ZoneOperation.field2623, + ZoneOperation.OBJ_ADD, + ZoneOperation.field2619, + ZoneOperation.AREA_SOUND, + ZoneOperation.MAPPROJ_ANIM}; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/JagNetThread.java b/osrs/src/main/java/JagNetThread.java index 2157a63ce..0f8112111 100644 --- a/osrs/src/main/java/JagNetThread.java +++ b/osrs/src/main/java/JagNetThread.java @@ -5,165 +5,165 @@ import java.io.IOException; import java.util.zip.CRC32; -@ObfuscatedName("nf") +@ObfuscatedName("oo") @Implements("JagNetThread") public class JagNetThread { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lqi;" + descriptor = "Lre;" ) - AbstractSocket field3561; - @ObfuscatedName("ae") - int field3549; - @ObfuscatedName("ao") - long field3557; - @ObfuscatedName("at") + AbstractSocket field3598; + @ObfuscatedName("al") + int field3586; + @ObfuscatedName("ak") + long field3594; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Ltf;" ) - NodeHashTable field3565; - @ObfuscatedName("ac") - int field3548; - @ObfuscatedName("ai") + NodeHashTable field3602; + @ObfuscatedName("ao") + int field3588; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Ltf;" ) - NodeHashTable field3564; - @ObfuscatedName("az") - int field3555; - @ObfuscatedName("ap") + NodeHashTable field3600; + @ObfuscatedName("ar") + int field3590; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Los;" + descriptor = "Lpl;" ) - DualNodeDeque field3560; - @ObfuscatedName("aa") + DualNodeDeque field3597; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Ltf;" ) - NodeHashTable field3562; - @ObfuscatedName("af") - int field3550; - @ObfuscatedName("ad") + NodeHashTable field3601; + @ObfuscatedName("av") + int field3591; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Ltf;" ) - NodeHashTable field3563; - @ObfuscatedName("aq") - int field3553; - @ObfuscatedName("al") - boolean field3546; - @ObfuscatedName("an") + NodeHashTable field3599; + @ObfuscatedName("aa") + int field3585; + @ObfuscatedName("ap") + boolean field3583; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lou;" ) - class357 field3558; - @ObfuscatedName("ar") + class372 field3596; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Ltm;" + descriptor = "Lul;" ) - Buffer field3568; - @ObfuscatedName("ab") + Buffer field3605; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Ltm;" + descriptor = "Lul;" ) - Buffer field3566; - @ObfuscatedName("ag") - int field3551; - @ObfuscatedName("ax") - CRC32 field3556; - @ObfuscatedName("ah") + Buffer field3604; + @ObfuscatedName("an") + int field3587; + @ObfuscatedName("ai") + CRC32 field3593; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ltm;" + descriptor = "Lul;" ) - Buffer field3567; - @ObfuscatedName("as") + Buffer field3603; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "[Lnk;" + descriptor = "[Lok;" ) - Archive[] field3559; - @ObfuscatedName("ay") - int field3554; - @ObfuscatedName("aj") - int field3552; - @ObfuscatedName("av") - byte field3547; - @ObfuscatedName("aw") - public int field3570; - @ObfuscatedName("ak") - public int field3569; + Archive[] field3595; + @ObfuscatedName("aq") + int field3589; + @ObfuscatedName("az") + int field3592; + @ObfuscatedName("at") + byte field3584; + @ObfuscatedName("af") + public int field3607; + @ObfuscatedName("ad") + public int field3606; public JagNetThread() { - this.field3549 = 0; - this.field3565 = new NodeHashTable(4096); - this.field3548 = 0; - this.field3564 = new NodeHashTable(32); - this.field3555 = 0; - this.field3560 = new DualNodeDeque(); - this.field3562 = new NodeHashTable(4096); - this.field3550 = 0; - this.field3563 = new NodeHashTable(4096); - this.field3553 = 0; - this.field3568 = new Buffer(8); - this.field3551 = 0; - this.field3556 = new CRC32(); - this.field3559 = new Archive[256]; - this.field3554 = -1; - this.field3552 = 255; - this.field3547 = 0; - this.field3570 = 0; - this.field3569 = 0; + this.field3586 = 0; + this.field3602 = new NodeHashTable(4096); + this.field3588 = 0; + this.field3600 = new NodeHashTable(32); + this.field3590 = 0; + this.field3597 = new DualNodeDeque(); + this.field3601 = new NodeHashTable(4096); + this.field3591 = 0; + this.field3599 = new NodeHashTable(4096); + this.field3585 = 0; + this.field3605 = new Buffer(8); + this.field3587 = 0; + this.field3593 = new CRC32(); + this.field3595 = new Archive[256]; + this.field3589 = -1; + this.field3592 = 255; + this.field3584 = 0; + this.field3607 = 0; + this.field3606 = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "935597926" + garbageValue = "877525740" ) - public boolean method1930() { - long var1 = GameEngine.clockNow(); - int var3 = (int)(var1 - this.field3557); - this.field3557 = var1; + public boolean method1960() { + long var1 = GrandExchangeOfferTotalQuantityComparator.method1971(); + int var3 = (int)(var1 - this.field3594); + this.field3594 = var1; if (var3 > 200) { var3 = 200; } - this.field3549 += var3; - if (this.field3553 == 0 && this.field3555 == 0 && this.field3550 == 0 && this.field3548 == 0) { + this.field3586 += var3; + if (this.field3585 == 0 && this.field3590 == 0 && this.field3591 == 0 && this.field3588 == 0) { return true; - } else if (this.field3561 == null) { + } else if (this.field3598 == null) { return false; } else { try { - if (this.field3549 > 30000) { + if (this.field3586 > 30000) { throw new IOException(); } else { - class357 var4; + class372 var4; Buffer var5; - while (this.field3555 < 200 && this.field3548 > 0) { - var4 = (class357)this.field3565.first(); + while (this.field3590 < 200 && this.field3588 > 0) { + var4 = (class372)this.field3602.first(); var5 = new Buffer(4); var5.writeByte(1); var5.writeMedium((int)var4.key); - this.field3561.write(var5.array, 0, 4); - this.field3564.put(var4, var4.key); - --this.field3548; - ++this.field3555; + this.field3598.write(var5.array, 0, 4); + this.field3600.put(var4, var4.key); + --this.field3588; + ++this.field3590; } - while (this.field3553 < 200 && this.field3550 > 0) { - var4 = (class357)this.field3560.removeLast(); + while (this.field3585 < 200 && this.field3591 > 0) { + var4 = (class372)this.field3597.removeLast(); var5 = new Buffer(4); var5.writeByte(0); var5.writeMedium((int)var4.key); - this.field3561.write(var5.array, 0, 4); + this.field3598.write(var5.array, 0, 4); var4.removeDual(); - this.field3563.put(var4, var4.key); - --this.field3550; - ++this.field3553; + this.field3599.put(var4, var4.key); + --this.field3591; + ++this.field3585; } for (int var16 = 0; var16 < 100; ++var16) { - int var17 = this.field3561.available(); + int var17 = this.field3598.available(); if (var17 < 0) { throw new IOException(); } @@ -172,11 +172,11 @@ public boolean method1930() { break; } - this.field3549 = 0; + this.field3586 = 0; byte var6 = 0; - if (this.field3558 == null) { + if (this.field3596 == null) { var6 = 8; - } else if (this.field3551 == 0) { + } else if (this.field3587 == 0) { var6 = 1; } @@ -187,38 +187,38 @@ public boolean method1930() { int var10001; Buffer var22; if (var6 > 0) { - var7 = var6 - this.field3568.offset; + var7 = var6 - this.field3605.offset; if (var7 > var17) { var7 = var17; } - this.field3561.read(this.field3568.array, this.field3568.offset, var7); - if (this.field3547 != 0) { + this.field3598.read(this.field3605.array, this.field3605.offset, var7); + if (this.field3584 != 0) { for (var8 = 0; var8 < var7; ++var8) { - var10000 = this.field3568.array; - var10001 = var8 + this.field3568.offset; - var10000[var10001] ^= this.field3547; + var10000 = this.field3605.array; + var10001 = var8 + this.field3605.offset; + var10000[var10001] ^= this.field3584; } } - var22 = this.field3568; + var22 = this.field3605; var22.offset += var7; - if (this.field3568.offset < var6) { + if (this.field3605.offset < var6) { break; } - if (this.field3558 == null) { - this.field3568.offset = 0; - var8 = this.field3568.readUnsignedByte(); - var9 = this.field3568.readUnsignedShort(); - int var10 = this.field3568.readUnsignedByte(); - int var11 = this.field3568.readInt(); + if (this.field3596 == null) { + this.field3605.offset = 0; + var8 = this.field3605.readUnsignedByte(); + var9 = this.field3605.readUnsignedShort(); + int var10 = this.field3605.readUnsignedByte(); + int var11 = this.field3605.readInt(); long var12 = (long)(var9 + (var8 << 16)); - class357 var14 = (class357)this.field3564.get(var12); - this.field3546 = true; + class372 var14 = (class372)this.field3600.get(var12); + this.field3583 = true; if (var14 == null) { - var14 = (class357)this.field3563.get(var12); - this.field3546 = false; + var14 = (class372)this.field3599.get(var12); + this.field3583 = false; } if (var14 == null) { @@ -226,90 +226,90 @@ public boolean method1930() { } int var15 = var10 == 0 ? 5 : 9; - this.field3558 = var14; - this.field3566 = new Buffer(this.field3558.field3526 + var11 + var15); - this.field3566.writeByte(var10); - this.field3566.writeInt(var11); - this.field3551 = 8; - this.field3568.offset = 0; - } else if (this.field3551 == 0) { - if (this.field3568.array[0] == -1) { - this.field3551 = 1; - this.field3568.offset = 0; + this.field3596 = var14; + this.field3604 = new Buffer(this.field3596.field3563 + var15 + var11); + this.field3604.writeByte(var10); + this.field3604.writeInt(var11); + this.field3587 = 8; + this.field3605.offset = 0; + } else if (this.field3587 == 0) { + if (this.field3605.array[0] == -1) { + this.field3587 = 1; + this.field3605.offset = 0; } else { - this.field3558 = null; + this.field3596 = null; } } } else { - var7 = this.field3566.array.length - this.field3558.field3526; - var8 = 512 - this.field3551; - if (var8 > var7 - this.field3566.offset) { - var8 = var7 - this.field3566.offset; + var7 = this.field3604.array.length - this.field3596.field3563; + var8 = 512 - this.field3587; + if (var8 > var7 - this.field3604.offset) { + var8 = var7 - this.field3604.offset; } if (var8 > var17) { var8 = var17; } - this.field3561.read(this.field3566.array, this.field3566.offset, var8); - if (this.field3547 != 0) { + this.field3598.read(this.field3604.array, this.field3604.offset, var8); + if (this.field3584 != 0) { for (var9 = 0; var9 < var8; ++var9) { - var10000 = this.field3566.array; - var10001 = var9 + this.field3566.offset; - var10000[var10001] ^= this.field3547; + var10000 = this.field3604.array; + var10001 = var9 + this.field3604.offset; + var10000[var10001] ^= this.field3584; } } - var22 = this.field3566; + var22 = this.field3604; var22.offset += var8; - this.field3551 += var8; - if (this.field3566.offset == var7) { - if (16711935L == this.field3558.key) { - this.field3567 = this.field3566; + this.field3587 += var8; + if (this.field3604.offset == var7) { + if (16711935L == this.field3596.key) { + this.field3603 = this.field3604; for (var9 = 0; var9 < 256; ++var9) { - Archive var18 = this.field3559[var9]; + Archive var18 = this.field3595[var9]; if (var18 != null) { - this.method1935(var18, var9); + this.method1964(var18, var9); } } } else { - this.field3556.reset(); - this.field3556.update(this.field3566.array, 0, var7); - var9 = (int)this.field3556.getValue(); - if (this.field3558.field3527 != var9) { + this.field3593.reset(); + this.field3593.update(this.field3604.array, 0, var7); + var9 = (int)this.field3593.getValue(); + if (this.field3596.field3564 != var9) { try { - this.field3561.close(); + this.field3598.close(); } catch (Exception var20) { } - ++this.field3570; - this.field3561 = null; - this.field3547 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + ++this.field3607; + this.field3598 = null; + this.field3584 = (byte)((int)(Math.random() * 255.0D + 1.0D)); return false; } - this.field3570 = 0; - this.field3569 = 0; - this.field3558.field3528.write((int)(this.field3558.key & 65535L), this.field3566.array, 16711680L == (this.field3558.key & 16711680L), this.field3546); + this.field3607 = 0; + this.field3606 = 0; + this.field3596.field3565.write((int)(this.field3596.key & 65535L), this.field3604.array, (this.field3596.key & 16711680L) == 16711680L, this.field3583); } - this.field3558.remove(); - if (this.field3546) { - --this.field3555; + this.field3596.remove(); + if (this.field3583) { + --this.field3590; } else { - --this.field3553; + --this.field3585; } - this.field3551 = 0; - this.field3558 = null; - this.field3566 = null; + this.field3587 = 0; + this.field3596 = null; + this.field3604 = null; } else { - if (this.field3551 != 512) { + if (this.field3587 != 512) { break; } - this.field3551 = 0; + this.field3587 = 0; } } } @@ -318,197 +318,197 @@ public boolean method1930() { } } catch (IOException var21) { try { - this.field3561.close(); + this.field3598.close(); } catch (Exception var19) { } - ++this.field3569; - this.field3561 = null; + ++this.field3606; + this.field3598 = null; return false; } } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-2147075944" + descriptor = "(ZB)V", + garbageValue = "1" ) - public void method1932(boolean var1) { - if (this.field3561 != null) { + public void method1961(boolean var1) { + if (this.field3598 != null) { try { Buffer var2 = new Buffer(4); var2.writeByte(var1 ? 2 : 3); var2.writeMedium(0); - this.field3561.write(var2.array, 0, 4); + this.field3598.write(var2.array, 0, 4); } catch (IOException var5) { try { - this.field3561.close(); + this.field3598.close(); } catch (Exception var4) { } - ++this.field3569; - this.field3561 = null; + ++this.field3606; + this.field3598 = null; } } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lqi;ZI)V", - garbageValue = "-1755212969" + descriptor = "(Lre;ZB)V", + garbageValue = "-76" ) - public void method1933(AbstractSocket var1, boolean var2) { - if (this.field3561 != null) { + public void method1962(AbstractSocket var1, boolean var2) { + if (this.field3598 != null) { try { - this.field3561.close(); + this.field3598.close(); } catch (Exception var7) { } - this.field3561 = null; + this.field3598 = null; } - this.field3561 = var1; - this.method1932(var2); - this.field3568.offset = 0; - this.field3558 = null; - this.field3566 = null; - this.field3551 = 0; + this.field3598 = var1; + this.method1961(var2); + this.field3605.offset = 0; + this.field3596 = null; + this.field3604 = null; + this.field3587 = 0; while (true) { - class357 var3 = (class357)this.field3564.first(); + class372 var3 = (class372)this.field3600.first(); if (var3 == null) { while (true) { - var3 = (class357)this.field3563.first(); + var3 = (class372)this.field3599.first(); if (var3 == null) { - if (this.field3547 != 0) { + if (this.field3584 != 0) { try { Buffer var8 = new Buffer(4); var8.writeByte(4); - var8.writeByte(this.field3547); + var8.writeByte(this.field3584); var8.writeShort(0); - this.field3561.write(var8.array, 0, 4); + this.field3598.write(var8.array, 0, 4); } catch (IOException var6) { try { - this.field3561.close(); + this.field3598.close(); } catch (Exception var5) { } - ++this.field3569; - this.field3561 = null; + ++this.field3606; + this.field3598 = null; } } - this.field3549 = 0; - this.field3557 = GameEngine.clockNow(); + this.field3586 = 0; + this.field3594 = GrandExchangeOfferTotalQuantityComparator.method1971(); return; } - this.field3560.method1985(var3); - this.field3562.put(var3, var3.key); - ++this.field3550; - --this.field3553; + this.field3597.method2016(var3); + this.field3601.put(var3, var3.key); + ++this.field3591; + --this.field3585; } } - this.field3565.put(var3, var3.key); - ++this.field3548; - --this.field3555; + this.field3602.put(var3, var3.key); + ++this.field3588; + --this.field3590; } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "1859946409" + descriptor = "(Lok;II)V", + garbageValue = "-699589985" ) - void method1934(Archive var1, int var2) { - if (var1.field3515) { - if (var2 <= this.field3554) { + void method1963(Archive var1, int var2) { + if (var1.field3549 && !var1.field3550) { + if (var2 <= this.field3589) { throw new RuntimeException(""); } - if (var2 < this.field3552) { - this.field3552 = var2; + if (var2 < this.field3592) { + this.field3592 = var2; } } else { - if (var2 >= this.field3552) { + if (var2 >= this.field3592) { throw new RuntimeException(""); } - if (var2 > this.field3554) { - this.field3554 = var2; + if (var2 > this.field3589) { + this.field3589 = var2; } } - if (this.field3567 != null) { - this.method1935(var1, var2); + if (this.field3603 != null) { + this.method1964(var1, var2); } else { - this.method1936((Archive)null, 255, 255, 0, (byte)0, true); - this.field3559[var2] = var1; + this.method1965((Archive)null, 255, 255, 0, (byte)0, true); + this.field3595[var2] = var1; } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "-1785545796" + descriptor = "(Lok;II)V", + garbageValue = "-1352429107" ) - void method1935(Archive var1, int var2) { - this.field3567.offset = var2 * 8 + 5; - if (this.field3567.offset >= this.field3567.array.length) { - if (var1.field3515) { - var1.method1891(); + void method1964(Archive var1, int var2) { + this.field3603.offset = var2 * 8 + 5; + if (this.field3603.offset >= this.field3603.array.length) { + if (var1.field3549) { + var1.method1919(); } else { throw new RuntimeException(""); } } else { - int var3 = this.field3567.readInt(); - int var4 = this.field3567.readInt(); + int var3 = this.field3603.readInt(); + int var4 = this.field3603.readInt(); var1.loadIndex(var3, var4); } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lnk;IIIBZB)V", - garbageValue = "-83" + descriptor = "(Lok;IIIBZI)V", + garbageValue = "-1546984161" ) - void method1936(Archive var1, int var2, int var3, int var4, byte var5, boolean var6) { + void method1965(Archive var1, int var2, int var3, int var4, byte var5, boolean var6) { long var7 = (long)(var3 + (var2 << 16)); - class357 var9 = (class357)this.field3565.get(var7); + class372 var9 = (class372)this.field3602.get(var7); if (var9 == null) { - var9 = (class357)this.field3564.get(var7); + var9 = (class372)this.field3600.get(var7); if (var9 == null) { - var9 = (class357)this.field3562.get(var7); + var9 = (class372)this.field3601.get(var7); if (var9 != null) { if (var6) { var9.removeDual(); - this.field3565.put(var9, var7); - --this.field3550; - ++this.field3548; + this.field3602.put(var9, var7); + --this.field3591; + ++this.field3588; } } else { if (!var6) { - var9 = (class357)this.field3563.get(var7); + var9 = (class372)this.field3599.get(var7); if (var9 != null) { return; } } - var9 = new class357(); - var9.field3528 = var1; - var9.field3527 = var4; - var9.field3526 = var5; + var9 = new class372(); + var9.field3565 = var1; + var9.field3564 = var4; + var9.field3563 = var5; if (var6) { - this.field3565.put(var9, var7); - ++this.field3548; + this.field3602.put(var9, var7); + ++this.field3588; } else { - this.field3560.method1984(var9); - this.field3562.put(var9, var7); - ++this.field3550; + this.field3597.method2015(var9); + this.field3601.put(var9, var7); + ++this.field3591; } } @@ -516,77 +516,49 @@ void method1936(Archive var1, int var2, int var3, int var4, byte var5, boolean v } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1960227475" + garbageValue = "223399065" ) - void method1937(int var1, int var2) { + void method1966(int var1, int var2) { long var3 = (long)((var1 << 16) + var2); - class357 var5 = (class357)this.field3562.get(var3); + class372 var5 = (class372)this.field3601.get(var3); if (var5 != null) { - this.field3560.method1985(var5); + this.field3597.method2016(var5); } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1437295059" + garbageValue = "823173998" ) - int method1938(int var1, int var2) { + int method1967(int var1, int var2) { long var3 = (long)((var1 << 16) + var2); - return this.field3558 != null && var3 == this.field3558.key ? this.field3566.offset * 99 / (this.field3566.array.length - this.field3558.field3526) + 1 : 0; + return this.field3596 != null && var3 == this.field3596.key ? this.field3604.offset * 99 / (this.field3604.array.length - this.field3596.field3563) + 1 : 0; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(ZZS)I", - garbageValue = "-10235" + descriptor = "(ZZB)I", + garbageValue = "-84" ) - public int method1939(boolean var1, boolean var2) { + public int method1968(boolean var1, boolean var2) { byte var3 = 0; - int var4 = var3 + this.field3555 + this.field3548; + int var4 = var3 + this.field3590 + this.field3588; return var4; } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1866561588" + descriptor = "(B)V", + garbageValue = "45" ) - public void method1940() { - if (this.field3561 != null) { - this.field3561.close(); + public void method1969() { + if (this.field3598 != null) { + this.field3598.close(); } } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)[Ldc;", - garbageValue = "569243283" - ) - static AttackOption[] method1941() { - return new AttackOption[]{AttackOption.field1099, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1097}; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "-162809884" - ) - static char method1931(char var0) { - if (var0 == 198) { - return 'E'; - } else if (var0 == 230) { - return 'e'; - } else if (var0 == 223) { - return 's'; - } else if (var0 == 338) { - return 'E'; - } else { - return (char)(var0 == 339 ? 'e' : '\u0000'); - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/JagexCache.java b/osrs/src/main/java/JagexCache.java index 0180ee5ce..0575288f6 100644 --- a/osrs/src/main/java/JagexCache.java +++ b/osrs/src/main/java/JagexCache.java @@ -4,40 +4,35 @@ import net.runelite.mapping.ObfuscatedSignature; import java.io.File; +import java.util.Iterator; -@ObfuscatedName("gp") +@ObfuscatedName("gv") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("at") - static File field1463; - @ObfuscatedName("ac") - @Export("cacheDir") - static File cacheDir; - @ObfuscatedName("ai") - static int field1461; - @ObfuscatedName("aq") + @ObfuscatedName("ax") + static File field1451; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Ltd;" + descriptor = "Ltl;" ) @Export("JagexCache_randomDat") - public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("al") + static BufferedFile JagexCache_randomDat; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Ltd;" + descriptor = "Ltl;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Ltd;" + descriptor = "Ltl;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("ab") - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("am") - static String[] field1464; + @ObfuscatedName("pl") + static int field1449; + @ObfuscatedName("vz") + static int field1450; static { JagexCache_randomDat = null; @@ -45,12 +40,124 @@ public class JagexCache { JagexCache_idx255File = null; } - @ObfuscatedName("au") + @ObfuscatedName("it") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-812306716" + descriptor = "(Ldi;I)V", + garbageValue = "-1922065040" ) - static int method909(int var0) { - return class28.KeyHandler_keyCodes[var0]; + static final void method918(Actor var0) { + boolean var1 = var0.exactMoveArrive1Cycle == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0; + if (!var1) { + SequenceDefinition var2 = class36.SequenceDefinition_get(var0.sequence); + if (var2 != null && !var2.isCachedModelIdSet()) { + var1 = var0.sequenceFrameCycle + 1 > var2.frameLengths[var0.sequenceFrame]; + } else { + var1 = true; + } + } + + if (var1) { + int var8 = var0.exactMoveArrive1Cycle - var0.spotAnimation; + int var3 = Client.cycle - var0.spotAnimation; + int var4 = var0.field971 * 64 + var0.field1016 * 128; + int var5 = var0.field971 * 64 + var0.field1013 * 128; + int var6 = var0.field971 * 64 + var0.field1021 * 128; + int var7 = var0.field971 * 64 + var0.field1010 * 128; + var0.x = (var3 * var6 + var4 * (var8 - var3)) / var8; + var0.y = (var3 * var7 + var5 * (var8 - var3)) / var8; + } + + var0.field1024 = 0; + var0.orientation = var0.exactMoveDirection; + var0.rotation = var0.orientation; + } + + @ObfuscatedName("lp") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "1000434204" + ) + static final void method919(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; + int var7 = var3 - var1; + int var8 = var6 >= 0 ? var6 : -var6; + int var9 = var7 >= 0 ? var7 : -var7; + int var10 = var8; + if (var8 < var9) { + var10 = var9; + } + + if (var10 != 0) { + int var11 = (var6 << 16) / var10; + int var12 = (var7 << 16) / var10; + if (var12 <= var11) { + var11 = -var11; + } else { + var12 = -var12; + } + + int var13 = var5 * var12 >> 17; + int var14 = var5 * var12 + 1 >> 17; + int var15 = var5 * var11 >> 17; + int var16 = var5 * var11 + 1 >> 17; + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; + int var17 = var0 + var13; + int var18 = var0 - var14; + int var19 = var0 + var6 - var14; + int var20 = var0 + var6 + var13; + int var21 = var15 + var1; + int var22 = var1 - var16; + int var23 = var7 + var1 - var16; + int var24 = var7 + var15 + var1; + Rasterizer3D.method1252(var17, var18, var19); + Rasterizer3D.method1254(var21, var22, var23, var17, var18, var19, 0.0F, 0.0F, 0.0F, var4); + Rasterizer3D.method1252(var17, var19, var20); + Rasterizer3D.method1254(var21, var23, var24, var17, var19, var20, 0.0F, 0.0F, 0.0F, var4); + } + } + + @ObfuscatedName("mg") + static final void method920(double var0) { + Rasterizer3D.method1236(var0); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(var0); + ItemComposition.ItemDefinition_cachedSprites.clear(); + class91.clientPreferences.setBrightness(var0); + } + + @ObfuscatedName("nt") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "-10864" + ) + static final void method921(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); + if (var0 != class91.clientPreferences.getCurrentMusicVolume()) { + if (class91.clientPreferences.getCurrentMusicVolume() == 0 && ScriptFrame.method334()) { + VarcInt.method975(CollisionMap.archive6, var0); + Client.playingJingle = false; + } else if (var0 == 0) { + ItemComposition.method1088(0, 0); + Client.playingJingle = false; + } else if (!class319.musicSongs.isEmpty()) { + Iterator var1 = class319.musicSongs.iterator(); + + while (var1.hasNext()) { + MusicSong var2 = (MusicSong)var1.next(); + if (var2 != null) { + var2.musicTrackVolume = var0; + } + } + + MusicSong var3 = (MusicSong)class319.musicSongs.get(0); + if (var3 != null && var3.midiPcmStream != null && var3.midiPcmStream.isReady() && !var3.field2886) { + var3.midiPcmStream.setPcmStreamVolume(var0); + var3.field2888 = (float)var0; + } + } + + class91.clientPreferences.setCurrentMusicVolume(var0); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/KeyHandler.java b/osrs/src/main/java/KeyHandler.java index 9d3a7b3d5..6ba143ca2 100644 --- a/osrs/src/main/java/KeyHandler.java +++ b/osrs/src/main/java/KeyHandler.java @@ -3,7 +3,6 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.applet.Applet; import java.awt.*; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; @@ -13,134 +12,134 @@ import java.util.Collection; import java.util.Iterator; -@ObfuscatedName("ak") +@ObfuscatedName("ad") @Implements("KeyHandler") public class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("uw") - static int field70; - @ObfuscatedName("gp") - static int field69; - @ObfuscatedName("rb") + @ObfuscatedName("bf") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("al") + Collection field72; + @ObfuscatedName("ak") + Collection field71; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lej;" + descriptor = "[Lbd;" ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("ae") - Collection field73; + class29[] field69; @ObfuscatedName("ao") - Collection field74; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "[Lbv;" - ) - class29[] field72; - @ObfuscatedName("ac") @Export("KeyHandler_pressedKeys") boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("KeyHandler_idleCycles") volatile int KeyHandler_idleCycles; KeyHandler() { - this.field72 = new class29[3]; + this.field69 = new class29[3]; this.KeyHandler_pressedKeys = new boolean[112]; this.KeyHandler_idleCycles = 0; - this.field73 = new ArrayList(100); - this.field74 = new ArrayList(100); + this.field72 = new ArrayList(100); + this.field71 = new ArrayList(100); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lbv;II)V", - garbageValue = "226491014" + descriptor = "(Lbd;IB)V", + garbageValue = "14" ) - void method86(class29 var1, int var2) { - this.field72[var2] = var1; + void method96(class29 var1, int var2) { + this.field69[var2] = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2034769800" + descriptor = "(B)I", + garbageValue = "82" ) @Export("getIdleCycles") - public int getIdleCycles() { + int getIdleCycles() { return this.KeyHandler_idleCycles; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "77" + garbageValue = "-86" ) - void method89(Component var1) { + void method98(Component var1) { var1.setFocusTraversalKeysEnabled(false); var1.addKeyListener(this); var1.addFocusListener(this); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "70" + garbageValue = "28" ) - synchronized void method90(Component var1) { + synchronized void method99(Component var1) { var1.removeKeyListener(this); var1.removeFocusListener(this); synchronized(this) { - this.field73.add(new class33(4, 0)); + this.field72.add(new class33(4, 0)); } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2096534148" + garbageValue = "-2131622455" ) - void method92() { + void method100() { ++this.KeyHandler_idleCycles; - this.method94(); - Iterator var1 = this.field74.iterator(); + this.method101(); + Iterator var1 = this.field71.iterator(); while (var1.hasNext()) { class33 var2 = (class33)var1.next(); - for (int var3 = 0; var3 < this.field72.length && !var2.method130(this.field72[var3]); ++var3) { + for (int var3 = 0; var3 < this.field69.length && !var2.method133(this.field69[var3]); ++var3) { } } - this.field74.clear(); + this.field71.clear(); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1568153203" + descriptor = "(B)V", + garbageValue = "-30" ) - synchronized void method94() { - Collection var1 = this.field74; - this.field74 = this.field73; - this.field73 = var1; + synchronized void method101() { + Collection var1 = this.field71; + this.field71 = this.field72; + this.field72 = var1; } @Export("keyPressed") @ObfuscatedName("keyPressed") public final synchronized void keyPressed(KeyEvent var1) { - int var2 = var1.getKeyCode(); - if (var2 >= 0 && var2 < class1.method2()) { - var2 = JagexCache.method909(var2); - boolean var3 = (var2 & 128) != 0; - if (var3) { - var2 = -1; + int var2; + label23: { + var2 = var1.getKeyCode(); + if (var2 >= 0) { + int var4 = class28.KeyHandler_keyCodes.length; + if (var2 < var4) { + var2 = MouseRecorder.method476(var2); + boolean var5 = (var2 & 128) != 0; + if (var5) { + var2 = -1; + } + break label23; + } } - } else { + var2 = -1; } if (var2 >= 0) { this.KeyHandler_pressedKeys[var2] = true; - this.field73.add(new class33(1, var2)); + this.field72.add(new class33(1, var2)); this.KeyHandler_idleCycles = 0; } @@ -156,7 +155,7 @@ public final synchronized void keyReleased(KeyEvent var1) { if (var2 >= 0) { int var4 = class28.KeyHandler_keyCodes.length; if (var2 < var4) { - var2 = JagexCache.method909(var2) & -129; + var2 = MouseRecorder.method476(var2) & -129; break label16; } } @@ -166,7 +165,7 @@ public final synchronized void keyReleased(KeyEvent var1) { if (var2 >= 0) { this.KeyHandler_pressedKeys[var2] = false; - this.field73.add(new class33(2, var2)); + this.field72.add(new class33(2, var2)); } var1.consume(); @@ -181,11 +180,11 @@ public final synchronized void keyTyped(KeyEvent var1) { if ((var2 <= 0 || var2 >= 128) && (var2 < 160 || var2 > 255)) { label47: { if (var2 != 0) { - char[] var4 = class384.cp1252AsciiExtension; + char[] var4 = class399.cp1252AsciiExtension; for (int var5 = 0; var5 < var4.length; ++var5) { char var6 = var4[var5]; - if (var6 == var2) { + if (var2 == var6) { var3 = true; break label47; } @@ -199,7 +198,7 @@ public final synchronized void keyTyped(KeyEvent var1) { } if (var3) { - this.field73.add(new class33(3, var2)); + this.field72.add(new class33(3, var2)); } } @@ -207,7 +206,7 @@ public final synchronized void keyTyped(KeyEvent var1) { } public final synchronized void focusGained(FocusEvent var1) { - this.field73.add(new class33(4, 1)); + this.field72.add(new class33(4, 1)); } @Export("focusLost") @@ -216,153 +215,19 @@ public final synchronized void focusLost(FocusEvent var1) { for (int var2 = 0; var2 < 112; ++var2) { if (this.KeyHandler_pressedKeys[var2]) { this.KeyHandler_pressedKeys[var2] = false; - this.field73.add(new class33(2, var2)); - } - } - - this.field73.add(new class33(4, 0)); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "([Lob;II)Lob;", - garbageValue = "-1278288180" - ) - @Export("findEnumerated") - public static class371 findEnumerated(class371[] var0, int var1) { - class371[] var2 = var0; - - for (int var3 = 0; var3 < var2.length; ++var3) { - class371 var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { - return var4; - } - } - - return null; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "-2016250661" - ) - public static void method85(Applet var0, String var1) { - class31.field85 = var0; - if (var1 != null) { - class31.field86 = var1; - } - - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "-1543892590" - ) - public static char method91(char var0) { - switch(var0) { - case ' ': - case '-': - case '_': - case '\u00a0': - return '_'; - case '#': - case '[': - case ']': - return var0; - case '\u00c0': - case '\u00c1': - case '\u00c2': - case '\u00c3': - case '\u00c4': - case '\u00e0': - case '\u00e1': - case '\u00e2': - case '\u00e3': - case '\u00e4': - return 'a'; - case '\u00c7': - case '\u00e7': - return 'c'; - case '\u00c8': - case '\u00c9': - case '\u00ca': - case '\u00cb': - case '\u00e8': - case '\u00e9': - case '\u00ea': - case '\u00eb': - return 'e'; - case '\u00cd': - case '\u00ce': - case '\u00cf': - case '\u00ed': - case '\u00ee': - case '\u00ef': - return 'i'; - case '\u00d1': - case '\u00f1': - return 'n'; - case '\u00d2': - case '\u00d3': - case '\u00d4': - case '\u00d5': - case '\u00d6': - case '\u00f2': - case '\u00f3': - case '\u00f4': - case '\u00f5': - case '\u00f6': - return 'o'; - case '\u00d9': - case '\u00da': - case '\u00db': - case '\u00dc': - case '\u00f9': - case '\u00fa': - case '\u00fb': - case '\u00fc': - return 'u'; - case '\u00df': - return 'b'; - case '\u00ff': - case '\u0178': - return 'y'; - default: - return Character.toLowerCase(var0); - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ltm;[II)[Ljava/lang/Object;", - garbageValue = "-165535984" - ) - static Object[] method88(Buffer var0, int[] var1) { - int var2 = var0.readUShortSmart(); - Object[] var3 = new Object[var1.length * var2]; - - for (int var4 = 0; var4 < var2; ++var4) { - for (int var5 = 0; var5 < var1.length; ++var5) { - int var6 = var1.length * var4 + var5; - class502 var7 = SequenceDefinition.method1074(var1[var5]); - var3[var6] = var7.method2497(var0); + this.field72.add(new class33(2, var2)); } } - return var3; + this.field72.add(new class33(4, 0)); } - @ObfuscatedName("ai") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "24" + descriptor = "(I)V", + garbageValue = "-1253121225" ) - static void method93(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); - } + public static void method95() { + class214.archive4.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/KitDefinition.java b/osrs/src/main/java/KitDefinition.java index 8f548b24d..86b1239b5 100644 --- a/osrs/src/main/java/KitDefinition.java +++ b/osrs/src/main/java/KitDefinition.java @@ -6,49 +6,52 @@ @ObfuscatedName("hz") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("KitDefinition_archive") - public static AbstractArchive KitDefinition_archive; - @ObfuscatedName("ae") + static AbstractArchive KitDefinition_archive; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("KitDefinition_modelsArchive") - public static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("ao") - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - @ObfuscatedName("at") + static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("KitDefinition_cached") - static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("ac") + public static EvictingDualNodeHashTable KitDefinition_cached; + @ObfuscatedName("ko") + @ObfuscatedSignature( + descriptor = "[Lun;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("ao") @Export("bodypartID") public int bodypartID; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("models2") int[] models2; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("models") int[] models; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("nonSelectable") public boolean nonSelectable; @@ -62,10 +65,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-6" + descriptor = "(Lul;B)V", + garbageValue = "-80" ) @Export("decode") void decode(Buffer var1) { @@ -79,10 +82,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "-1997251998" + descriptor = "(Lul;IB)V", + garbageValue = "4" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -125,10 +128,10 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1590063702" + garbageValue = "699085118" ) @Export("ready") public boolean ready() { @@ -147,10 +150,10 @@ public boolean ready() { } } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Lic;", - garbageValue = "-23" + descriptor = "(I)Ljw;", + garbageValue = "1587109036" ) @Export("getModelData") public ModelData getModelData() { @@ -187,12 +190,12 @@ public ModelData getModelData() { } } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2117319302" + descriptor = "(B)Z", + garbageValue = "-9" ) - public boolean method961() { + public boolean method984() { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { @@ -204,10 +207,10 @@ public boolean method961() { return var1; } - @ObfuscatedName("az") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)Lic;", - garbageValue = "-1595711476" + descriptor = "(S)Ljw;", + garbageValue = "2504" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -239,116 +242,264 @@ public ModelData getKitDefinitionModels() { @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lto;IB)Z", - garbageValue = "-108" + descriptor = "(II)Lie;", + garbageValue = "-765907227" ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { - if (var0.readBits(1) != 0) { - updateExternalPlayer(var0, var1); + public static FloorUnderlayDefinition method979(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); + var1 = new FloorUnderlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); } - var3 = var0.readBits(13); - var4 = var0.readBits(13); - boolean var12 = var0.readBits(1) == 1; - if (var12) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } + var1.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); + return var1; + } + } - if (Client.players[var1] != null) { - throw new RuntimeException(); - } else { - Player var6 = Client.players[var1] = new Player(); - var6.index = var1; - if (Players.cachedAppearanceBuffer[var1] != null) { - var6.read(Players.cachedAppearanceBuffer[var1]); - } + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "769007597" + ) + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; + } - var6.orientation = Players.Players_orientations[var1]; - var6.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var6.pathTraversed[0] = Players.playerMovementSpeeds[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - UrlRequester.baseX, (var10 << 13) + var4 - class47.baseY); - var6.hasMovementPending = false; - return true; - } - } else if (var2 == 1) { - var3 = var0.readBits(2); - var4 = Players.Players_regions[var1]; - Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); - return false; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(ILds;ZS)I", + garbageValue = "9029" + ) + static int method986(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == 4000) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + var3; + return 1; + } else if (var0 == 4001) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == 4002) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 * var4; + return 1; + } else if (var0 == 4003) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == 4004) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == 4005) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; } else { int var5; - int var11; - if (var2 == 2) { - var3 = var0.readBits(5); - var4 = var3 >> 3; - var5 = var3 & 7; - var11 = Players.Players_regions[var1]; - var7 = (var11 >> 28) + var4 & 3; - var8 = var11 >> 14 & 255; - var9 = var11 & 255; - if (var5 == 0) { - --var8; - --var9; - } - - if (var5 == 1) { - --var9; - } - - if (var5 == 2) { - ++var8; - --var9; + int var6; + int var7; + if (var0 == 4006) { + Interpreter.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); + return 1; + } else if (var0 == 4007) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; + return 1; + } else if (var0 == 4008) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == 4009) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == 4010) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == 4011) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == 4012) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); } - if (var5 == 3) { - --var8; + return 1; + } else if (var0 == 4013) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + switch(var4) { + case 0: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; + case 1: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + break; + case 2: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; + case 3: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + break; + case 4: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + break; + default: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); + } + + return 1; } - - if (var5 == 4) { - ++var8; - } - - if (var5 == 5) { - --var8; - ++var9; - } - - if (var5 == 6) { - ++var9; + } else if (var0 == 4014) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & var4; + return 1; + } else if (var0 == 4015) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4; + return 1; + } else if (var0 == 4016) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 < var4 ? var3 : var4; + return 1; + } else if (var0 == 4017) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 > var4 ? var3 : var4; + return 1; + } else if (var0 == 4018) { + Interpreter.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); + return 1; + } else if (var0 == 4025) { + var3 = WorldMapLabel.method1569(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == 4026) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; + return 1; + } else if (var0 == 4027) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class345.method1843(var3, var4, var5); + return 1; + } else if (var0 == 4028) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class164.method859(var3, var4, var5); + return 1; + } else if (var0 == 4029) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = 31 - var5; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; + return 1; + } else if (var0 == 4030) { + Interpreter.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var3 = class164.method859(var3, var5, var6); + var7 = class76.method431(var6 - var5 + 1); + if (var4 > var7) { + var4 = var7; } - if (var5 == 7) { - ++var8; - ++var9; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4 << var5; + return 1; + } else if (var0 == 4032) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = GameObject.method1427(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4033) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = WorldMapLabelSize.method1435(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4034) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = HealthBar.method572(var3, var4); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; + return 1; + } else if (var0 == 4035) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4036) { + String var15 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var4 = -1; + if (AttackOption.isNumber(var15)) { + var4 = class36.method182(var15); } - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); - return false; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; + return 1; } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var11 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var7 + var11 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); - return false; + return 2; } } } diff --git a/osrs/src/main/java/Language.java b/osrs/src/main/java/Language.java index b70ecb3c5..7e93ef8a1 100644 --- a/osrs/src/main/java/Language.java +++ b/osrs/src/main/java/Language.java @@ -7,97 +7,93 @@ -@ObfuscatedName("on") +@ObfuscatedName("oa") @Implements("Language") -public class Language implements class371 { - @ObfuscatedName("au") +public class Language implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loa;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loa;" ) - static final Language field3606; - @ObfuscatedName("ao") + static final Language field3644; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loa;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loa;" ) - static final Language field3607; - @ObfuscatedName("ac") + static final Language field3647; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loa;" ) - static final Language field3605; - @ObfuscatedName("ai") + static final Language field3645; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loa;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lon;" - ) - static final Language field3608; - @ObfuscatedName("ad") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "[Lon;" + descriptor = "Loa;" ) - static final Language[] field3609; - @ObfuscatedName("bv") + static final Language field3646; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "[Loa;" ) - @Export("Widget_spritesArchive") - public static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("cs") + static final Language[] field3648; + @ObfuscatedName("fr") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lok;" ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("ap") - final String field3612; - @ObfuscatedName("aa") + static Archive field3643; + @ObfuscatedName("oq") + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("ab") + final String field3650; + @ObfuscatedName("am") @Export("language") final String language; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field3626, 0, "GB"); - field3606 = new Language("DE", "de", "German", ModeWhere.field3626, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", ModeWhere.field3626, 2, "FR"); - field3607 = new Language("PT", "pt", "Portuguese", ModeWhere.field3626, 3, "BR"); - field3605 = new Language("NL", "nl", "Dutch", ModeWhere.field3625, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3625, 5, "ES"); - field3608 = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3626, 6, "MX"); - Language[] var0 = method1972(); - field3609 = new Language[var0.length]; + Language_EN = new Language("EN", "en", "English", ModeWhere.field3654, 0, "GB"); + field3644 = new Language("DE", "de", "German", ModeWhere.field3654, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3654, 2, "FR"); + field3647 = new Language("PT", "pt", "Portuguese", ModeWhere.field3654, 3, "BR"); + field3645 = new Language("NL", "nl", "Dutch", ModeWhere.field3664, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3664, 5, "ES"); + field3646 = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3654, 6, "MX"); + Language[] var0 = method2004(); + field3648 = new Language[var0.length]; Language[] var1 = var0; for (int var2 = 0; var2 < var1.length; ++var2) { Language var3 = var1[var2]; - field3609[var3.id] = var3; + field3648[var3.id] = var3; } } @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Loe;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lor;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field3612 = var1; + this.field3650 = var1; this.language = var2; this.id = var5; if (var6 != null) { @@ -108,20 +104,20 @@ public class Language implements class371 { } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "82" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-351070004" ) @Export("getLanguage") String getLanguage() { @@ -134,87 +130,95 @@ public String toString() { return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)[Lon;", - garbageValue = "-905836833" + descriptor = "(III)I", + garbageValue = "-1873739638" ) - static Language[] method1972() { - return new Language[]{Language_ES, field3606, Language_FR, field3608, field3605, Language_EN, field3607}; + static int method2003(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; + } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "66381547" - ) - static void method1973() { - Tiles.Tiles_minPlane = 99; - Tiles.Tiles_underlays = new short[4][104][104]; - class227.Tiles_overlays = new short[4][104][104]; - class172.Tiles_shapes = new byte[4][104][104]; - ModelData0.field2282 = new byte[4][104][104]; - BufferedNetSocket.field3820 = new int[4][105][105]; - MoveSpeed.field1924 = new byte[4][105][105]; - class162.field1419 = new int[105][105]; - Fonts.Tiles_hue = new int[104]; - class466.Tiles_saturation = new int[104]; - Tiles.Tiles_lightness = new int[104]; - class128.Tiles_hueMultiplier = new int[104]; - Interpreter.field710 = new int[104]; + garbageValue = "1596579775" + ) + public static void method2002() { + class191.archive7.clear(); } - @ObfuscatedName("at") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(II)Lon;", - garbageValue = "-695535703" + descriptor = "(S)[Loa;", + garbageValue = "-24301" ) - public static Language method1976(int var0) { - return var0 >= 0 && var0 < field3609.length ? field3609[var0] : null; + static Language[] method2004() { + return new Language[]{Language_ES, field3647, Language_FR, field3645, Language_EN, field3644, field3646}; } - @ObfuscatedName("lf") + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(II)Loa;", + garbageValue = "1742943694" + ) + public static Language method2007(int var0) { + return var0 >= 0 && var0 < field3648.length ? field3648[var0] : null; + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "56" + descriptor = "(Lcv;B)V", + garbageValue = "0" ) - static final void method1977(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; - int var7 = var3 - var1; - int var8 = var6 >= 0 ? var6 : -var6; - int var9 = var7 >= 0 ? var7 : -var7; - int var10 = var8; - if (var8 < var9) { - var10 = var9; + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + Calendar.method1890(var0.isMembersOnly()); } - if (var10 != 0) { - int var11 = (var6 << 16) / var10; - int var12 = (var7 << 16) / var10; - if (var12 <= var11) { - var11 = -var11; - } else { - var12 = -var12; - } - - int var13 = var5 * var12 >> 17; - int var14 = var5 * var12 + 1 >> 17; - int var15 = var5 * var11 >> 17; - int var16 = var5 * var11 + 1 >> 17; - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; - int var17 = var0 + var13; - int var18 = var0 - var14; - int var19 = var0 + var6 - var14; - int var20 = var0 + var13 + var6; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var15 + var7 + var1; - Rasterizer3D.method1203(var17, var18, var19); - Rasterizer3D.method1205(var21, var22, var23, var17, var18, var19, 0.0F, 0.0F, 0.0F, var4); - Rasterizer3D.method1203(var17, var19, var20); - Rasterizer3D.method1205(var21, var23, var24, var17, var19, var20, 0.0F, 0.0F, 0.0F, var4); + if (var0.properties != Client.worldProperties) { + TextureProvider.method1351(class199.archive8, var0.properties); } + + MouseHandler.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + UserComparator3.field1184 = var0.field680; + ObjectComposition.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + class363.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; + class164.currentPort = ObjectComposition.worldPort; + } + + @ObfuscatedName("nk") + @ObfuscatedSignature( + descriptor = "(IIIILud;Lmp;B)V", + garbageValue = "81" + ) + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; + if (var6 > 4225 && var6 < 90000) { + int var7 = Client.camAngleY & 2047; + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; + int var10 = var3 * var8 + var9 * var2 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + double var12 = Math.atan2((double)var10, (double)var11); + int var14 = var5.width / 2 - 25; + int var15 = (int)(Math.sin(var12) * (double)var14); + int var16 = (int)(Math.cos(var12) * (double)var14); + byte var17 = 20; + ParamComposition.redHintArrowSprite.method2725(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + } else { + SecureRandomFuture.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Link.java b/osrs/src/main/java/Link.java index b2c81581a..0a3f3a16d 100644 --- a/osrs/src/main/java/Link.java +++ b/osrs/src/main/java/Link.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ri") +@ObfuscatedName("sg") @Implements("Link") public class Link { - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lri;" + descriptor = "Lsg;" ) @Export("previous") public Link previous; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lri;" + descriptor = "Lsg;" ) @Export("next") public Link next; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("remove") public void remove() { if (this.next != null) { diff --git a/osrs/src/main/java/LinkDeque.java b/osrs/src/main/java/LinkDeque.java index 45089972d..2e27f8105 100644 --- a/osrs/src/main/java/LinkDeque.java +++ b/osrs/src/main/java/LinkDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ox") +@ObfuscatedName("ph") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lri;" + descriptor = "Lsg;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lri;" + descriptor = "Lsg;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public LinkDeque() { this.sentinel.next = this.sentinel; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lri;)V" + descriptor = "(Lsg;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public void addFirst(Link var1) { var1.previous.next = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "()Lri;" + descriptor = "()Lsg;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public Link last() { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "()Lri;" + descriptor = "()Lsg;" ) @Export("previous") public Link previous() { diff --git a/osrs/src/main/java/Login.java b/osrs/src/main/java/Login.java index 43e62c887..4223e0af5 100644 --- a/osrs/src/main/java/Login.java +++ b/osrs/src/main/java/Login.java @@ -4,122 +4,130 @@ import net.runelite.mapping.ObfuscatedSignature; import java.text.DecimalFormat; -import java.util.ArrayList; -@ObfuscatedName("cy") +@ObfuscatedName("ca") @Implements("Login") public class Login { - @ObfuscatedName("ao") + @ObfuscatedName("al") + @Export("clearLoginScreen") + static boolean clearLoginScreen; + @ObfuscatedName("ak") @Export("xPadding") static int xPadding; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "[Luk;" + descriptor = "[Lun;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Luk;" + descriptor = "Lun;" ) @Export("titleboxSprite") static IndexedSprite titleboxSprite; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Luk;" + descriptor = "Lun;" ) - static IndexedSprite field777; - @ObfuscatedName("aa") + static IndexedSprite field775; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lui;" + descriptor = "Lud;" ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; - @ObfuscatedName("al") + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lun;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Luk;" + descriptor = "[Lun;" ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("ay") + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("aq") @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("bi") - static int field750; - @ObfuscatedName("bn") - static int field751; - @ObfuscatedName("cw") + @ObfuscatedName("bl") + static int field748; + @ObfuscatedName("bx") + static int field749; + @ObfuscatedName("ce") @Export("loginIndex") static int loginIndex; - @ObfuscatedName("cf") + @ObfuscatedName("cu") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("cm") + @ObfuscatedName("cw") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("cn") + @ObfuscatedName("co") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("cs") + @ObfuscatedName("cc") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("cx") + @ObfuscatedName("cg") @Export("Login_username") static String Login_username; - @ObfuscatedName("cr") + @ObfuscatedName("cq") @Export("Login_password") static String Login_password; - @ObfuscatedName("ce") - static int field752; - @ObfuscatedName("cq") - static String[] field768; - @ObfuscatedName("cu") - static String field764; @ObfuscatedName("cz") - static boolean field745; + static int field751; + @ObfuscatedName("cp") + static String[] field766; + @ObfuscatedName("cs") + static String field761; + @ObfuscatedName("cd") + static boolean field742; @ObfuscatedName("ct") - static boolean field744; - @ObfuscatedName("cc") static boolean field743; - @ObfuscatedName("dh") + @ObfuscatedName("ca") + static boolean field741; + @ObfuscatedName("dv") @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("dn") + @ObfuscatedName("dg") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("dk") + @ObfuscatedName("dp") @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("df") + @ObfuscatedName("do") @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("dz") + @ObfuscatedName("dh") @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("dv") - static long field773; + @ObfuscatedName("du") + static long field771; @ObfuscatedName("dr") - static long field772; - @ObfuscatedName("do") - static String[] field770; - @ObfuscatedName("db") + static long field770; + @ObfuscatedName("dw") static String[] field769; - @ObfuscatedName("dp") - static String[] field771; + @ObfuscatedName("di") + static String[] field767; + @ObfuscatedName("dt") + static String[] field768; static { xPadding = 0; loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; - field750 = -1; - field751 = 1; + field748 = -1; + field749 = 1; loginIndex = 0; Login_response0 = ""; Login_response1 = ""; @@ -127,82 +135,35 @@ public class Login { Login_response3 = ""; Login_username = ""; Login_password = ""; - field752 = 0; - field768 = new String[8]; - field764 = ""; - field745 = false; - field744 = false; - field743 = true; + field751 = 0; + field766 = new String[8]; + field761 = ""; + field742 = false; + field743 = false; + field741 = true; currentLoginField = 0; worldSelectOpen = false; hoveredWorldIndex = -1; worldSelectPage = 0; worldSelectPagesCount = 0; new DecimalFormat("##0.00"); - new class133(); - field773 = -1L; - field772 = -1L; - field770 = new String[]{"title.jpg"}; - field769 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; - field771 = new String[]{"logo_speedrunning"}; + new class135(); + field771 = -1L; + field770 = -1L; + field769 = new String[]{"title.jpg"}; + field767 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; + field768 = new String[]{"logo_speedrunning"}; } - @ObfuscatedName("ae") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(I)Lro;", - garbageValue = "1233302527" + descriptor = "(III)I", + garbageValue = "85678974" ) - public static class449 method427() { - synchronized(class449.field3868) { - if (class338.field3112 == 0) { - return new class449(); - } else { - class449.field3868[--class338.field3112].method2296(); - return class449.field3868[class338.field3112]; - } - } - } - - @ObfuscatedName("io") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1609122082" - ) - @Export("playJingle") - static void playJingle(int var0, int var1) { - if (class449.clientPreferences.getCurrentMusicVolume() != 0 && var0 != -1) { - ArrayList var2 = new ArrayList(); - var2.add(new MusicSong(class388.field3655, var0, 0, class449.clientPreferences.getCurrentMusicVolume(), false)); - class53.method291(var2, 0, 0, 0, 0, true); - Client.playingJingle = true; - } - - } - - @ObfuscatedName("lb") - @ObfuscatedSignature( - descriptor = "([Lmi;Lmi;ZI)V", - garbageValue = "1287151342" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -1561222175 * -568991711 : var1.width * 501302871 * 2076902759; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 917378589 * 1251957813 : var1.height * -556278153 * 1553685319; - PcmPlayer.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - PcmPlayer.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - int var6 = var5.group; - if (ModeWhere.loadInterface(var6)) { - PcmPlayer.resizeInterface(PacketBufferNode.Widget_interfaceComponents[var6], -1, var3, var4, var2); - } - } - - if (var1.contentType == 1337) { - } - + static final int method433(int var0, int var1) { + int var2 = ClientPreferences.method568(var0 - 1, var1 - 1) + ClientPreferences.method568(var0 + 1, var1 - 1) + ClientPreferences.method568(var0 - 1, var1 + 1) + ClientPreferences.method568(var0 + 1, var1 + 1); + int var3 = ClientPreferences.method568(var0 - 1, var1) + ClientPreferences.method568(var0 + 1, var1) + ClientPreferences.method568(var0, var1 - 1) + ClientPreferences.method568(var0, 1 + var1); + int var4 = ClientPreferences.method568(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; } } \ No newline at end of file diff --git a/osrs/src/main/java/LoginPacket.java b/osrs/src/main/java/LoginPacket.java index bddd72d30..f79cdb4ba 100644 --- a/osrs/src/main/java/LoginPacket.java +++ b/osrs/src/main/java/LoginPacket.java @@ -3,63 +3,62 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("mi") @Implements("LoginPacket") -public class LoginPacket implements class293 { - @ObfuscatedName("au") +public class LoginPacket implements class307 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Lmi;" ) - public static final LoginPacket field2746; - @ObfuscatedName("ae") + public static final LoginPacket field2762; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Lmi;" ) - static final LoginPacket field2747; - @ObfuscatedName("ao") + static final LoginPacket field2767; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Lmi;" ) @Export("NEW_LOGIN_CONNECTION") public static final LoginPacket NEW_LOGIN_CONNECTION; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Lmi;" ) @Export("RECONNECT_LOGIN_CONNECTION") public static final LoginPacket RECONNECT_LOGIN_CONNECTION; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Lmi;" ) - public static final LoginPacket field2743; - @ObfuscatedName("ai") + public static final LoginPacket field2764; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Lmi;" ) - static final LoginPacket field2748; - @ObfuscatedName("ap") + static final LoginPacket field2766; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Llk;" + descriptor = "[Lmi;" ) - static final LoginPacket[] field2749; - @ObfuscatedName("az") + static final LoginPacket[] field2768; + @ObfuscatedName("ar") @Export("id") public final int id; static { - field2746 = new LoginPacket(14, 0); - field2747 = new LoginPacket(15, 4); + field2762 = new LoginPacket(14, 0); + field2767 = new LoginPacket(15, 4); NEW_LOGIN_CONNECTION = new LoginPacket(16, -2); RECONNECT_LOGIN_CONNECTION = new LoginPacket(18, -2); - field2743 = new LoginPacket(19, -2); - field2748 = new LoginPacket(27, 0); - field2749 = new LoginPacket[32]; - LoginPacket[] var0 = new LoginPacket[]{field2746, field2747, RECONNECT_LOGIN_CONNECTION, field2748, field2743, NEW_LOGIN_CONNECTION}; - LoginPacket[] var1 = var0; + field2764 = new LoginPacket(19, -2); + field2766 = new LoginPacket(27, 0); + field2768 = new LoginPacket[32]; + LoginPacket[] var0 = FloorOverlayDefinition.method1109(); - for (int var2 = 0; var2 < var1.length; ++var2) { - field2749[var1[var2].id] = var1[var2]; + for (int var1 = 0; var1 < var0.length; ++var1) { + field2768[var0[var1].id] = var0[var1]; } } @@ -71,211 +70,4 @@ public class LoginPacket implements class293 { LoginPacket(int var1, int var2) { this.id = var1; } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IILiw;Lis;Lij;S)Z", - garbageValue = "24346" - ) - static final boolean method1616(int var0, int var1, RouteStrategy var2, CollisionMap var3, class216 var4) { - int var5 = var4.method1132(); - int var6 = var4.method1133(); - int[][] var7 = var4.method1135(); - int[][] var8 = var4.method1134(); - int[] var9 = var4.method1136(); - int[] var10 = var4.method1137(); - int var11 = var4.method1138(); - int var12 = var0; - int var13 = var1; - int var14 = var5 >> 1; - int var15 = var6 >> 1; - int var16 = var0 - var14; - int var17 = var1 - var15; - var8[var14][var15] = 99; - var7[var14][var15] = 0; - byte var18 = 0; - int var19 = 0; - var9[var18] = var0; - byte var10001 = var18; - int var24 = var18 + 1; - var10[var10001] = var1; - int[][] var20 = var3.flags; - - while (var19 != var24) { - var12 = var9[var19]; - var13 = var10[var19]; - var19 = var19 + 1 & var11; - var14 = var12 - var16; - var15 = var13 - var17; - int var21 = var12 - var3.xInset; - int var22 = var13 - var3.yInset; - if (var2.hasArrived(2, var12, var13, var3)) { - var4.method1129(var12, var13); - return true; - } - - int var23 = var7[var14][var15] + 1; - if (var14 > 0 && var8[var14 - 1][var15] == 0 && (var20[var21 - 1][var22] & 19136782) == 0 && (var20[var21 - 1][var22 + 1] & 19136824) == 0) { - var9[var24] = var12 - 1; - var10[var24] = var13; - var24 = var24 + 1 & var11; - var8[var14 - 1][var15] = 2; - var7[var14 - 1][var15] = var23; - } - - if (var14 < var5 - 2 && var8[var14 + 1][var15] == 0 && (var20[var21 + 2][var22] & 19136899) == 0 && (var20[var21 + 2][var22 + 1] & 19136992) == 0) { - var9[var24] = var12 + 1; - var10[var24] = var13; - var24 = var24 + 1 & var11; - var8[var14 + 1][var15] = 8; - var7[var14 + 1][var15] = var23; - } - - if (var15 > 0 && var8[var14][var15 - 1] == 0 && (var20[var21][var22 - 1] & 19136782) == 0 && (var20[var21 + 1][var22 - 1] & 19136899) == 0) { - var9[var24] = var12; - var10[var24] = var13 - 1; - var24 = var24 + 1 & var11; - var8[var14][var15 - 1] = 1; - var7[var14][var15 - 1] = var23; - } - - if (var15 < var6 - 2 && var8[var14][var15 + 1] == 0 && (var20[var21][var22 + 2] & 19136824) == 0 && (var20[var21 + 1][var22 + 2] & 19136992) == 0) { - var9[var24] = var12; - var10[var24] = var13 + 1; - var24 = var24 + 1 & var11; - var8[var14][var15 + 1] = 4; - var7[var14][var15 + 1] = var23; - } - - if (var14 > 0 && var15 > 0 && var8[var14 - 1][var15 - 1] == 0 && (var20[var21 - 1][var22] & 19136830) == 0 && (var20[var21 - 1][var22 - 1] & 19136782) == 0 && (var20[var21][var22 - 1] & 19136911) == 0) { - var9[var24] = var12 - 1; - var10[var24] = var13 - 1; - var24 = var24 + 1 & var11; - var8[var14 - 1][var15 - 1] = 3; - var7[var14 - 1][var15 - 1] = var23; - } - - if (var14 < var5 - 2 && var15 > 0 && var8[var14 + 1][var15 - 1] == 0 && (var20[var21 + 1][var22 - 1] & 19136911) == 0 && (var20[var21 + 2][var22 - 1] & 19136899) == 0 && (var20[var21 + 2][var22] & 19136995) == 0) { - var9[var24] = var12 + 1; - var10[var24] = var13 - 1; - var24 = var24 + 1 & var11; - var8[var14 + 1][var15 - 1] = 9; - var7[var14 + 1][var15 - 1] = var23; - } - - if (var14 > 0 && var15 < var6 - 2 && var8[var14 - 1][var15 + 1] == 0 && (var20[var21 - 1][var22 + 1] & 19136830) == 0 && (var20[var21 - 1][var22 + 2] & 19136824) == 0 && (var20[var21][var22 + 2] & 19137016) == 0) { - var9[var24] = var12 - 1; - var10[var24] = var13 + 1; - var24 = var24 + 1 & var11; - var8[var14 - 1][var15 + 1] = 6; - var7[var14 - 1][var15 + 1] = var23; - } - - if (var14 < var5 - 2 && var15 < var6 - 2 && var8[var14 + 1][var15 + 1] == 0 && (var20[var21 + 1][var22 + 2] & 19137016) == 0 && (var20[var21 + 2][var22 + 2] & 19136992) == 0 && (var20[var21 + 2][var22 + 1] & 19136995) == 0) { - var9[var24] = var12 + 1; - var10[var24] = var13 + 1; - var24 = var24 + 1 & var11; - var8[var14 + 1][var15 + 1] = 12; - var7[var14 + 1][var15 + 1] = var23; - } - } - - var4.method1129(var12, var13); - return false; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;IIB)Lpi;", - garbageValue = "69" - ) - public static Font method1613(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - return !ApproximateRouteStrategy.method345(var0, var2, var3) ? null : HealthBarDefinition.method969(var1.takeFile(var2, var3)); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BIB)I", - garbageValue = "88" - ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; - - for (int var6 = 0; var6 < var5; ++var6) { - char var7 = var0.charAt(var6 + var1); - if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { - if (var7 == 8364) { - var3[var6 + var4] = -128; - } else if (var7 == 8218) { - var3[var6 + var4] = -126; - } else if (var7 == 402) { - var3[var6 + var4] = -125; - } else if (var7 == 8222) { - var3[var6 + var4] = -124; - } else if (var7 == 8230) { - var3[var6 + var4] = -123; - } else if (var7 == 8224) { - var3[var6 + var4] = -122; - } else if (var7 == 8225) { - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; - } else if (var7 == 8240) { - var3[var6 + var4] = -119; - } else if (var7 == 352) { - var3[var6 + var4] = -118; - } else if (var7 == 8249) { - var3[var6 + var4] = -117; - } else if (var7 == 338) { - var3[var6 + var4] = -116; - } else if (var7 == 381) { - var3[var6 + var4] = -114; - } else if (var7 == 8216) { - var3[var6 + var4] = -111; - } else if (var7 == 8217) { - var3[var6 + var4] = -110; - } else if (var7 == 8220) { - var3[var6 + var4] = -109; - } else if (var7 == 8221) { - var3[var6 + var4] = -108; - } else if (var7 == 8226) { - var3[var6 + var4] = -107; - } else if (var7 == 8211) { - var3[var6 + var4] = -106; - } else if (var7 == 8212) { - var3[var6 + var4] = -105; - } else if (var7 == 732) { - var3[var6 + var4] = -104; - } else if (var7 == 8482) { - var3[var6 + var4] = -103; - } else if (var7 == 353) { - var3[var6 + var4] = -102; - } else if (var7 == 8250) { - var3[var6 + var4] = -101; - } else if (var7 == 339) { - var3[var6 + var4] = -100; - } else if (var7 == 382) { - var3[var6 + var4] = -98; - } else if (var7 == 376) { - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; - } - } else { - var3[var6 + var4] = (byte)var7; - } - } - - return var5; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-245858333" - ) - static void method1614() { - ItemContainer.itemContainers = new NodeHashTable(32); - } } \ No newline at end of file diff --git a/osrs/src/main/java/LoginScreenAnimation.java b/osrs/src/main/java/LoginScreenAnimation.java index 0ba0b5a79..aad811e36 100644 --- a/osrs/src/main/java/LoginScreenAnimation.java +++ b/osrs/src/main/java/LoginScreenAnimation.java @@ -3,170 +3,172 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("db") +@ObfuscatedName("dd") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("au") + @ObfuscatedName("gu") + static String field1042; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Luk;" + descriptor = "[Lun;" ) - IndexedSprite[] field1055; - @ObfuscatedName("az") + IndexedSprite[] field1058; + @ObfuscatedName("ar") int[] field1054; - @ObfuscatedName("ap") + @ObfuscatedName("ab") int field1043; - @ObfuscatedName("aa") - int[] field1046; - @ObfuscatedName("af") - int[] field1049; - @ObfuscatedName("ad") - int[] field1048; - @ObfuscatedName("aq") + @ObfuscatedName("am") int[] field1052; - @ObfuscatedName("al") - int field1041; - @ObfuscatedName("an") - int field1042; - @ObfuscatedName("ar") - int[] field1053; - @ObfuscatedName("ab") - int[] field1047; + @ObfuscatedName("av") + int[] field1057; @ObfuscatedName("ag") int[] field1050; - @ObfuscatedName("am") + @ObfuscatedName("aa") + int[] field1049; + @ObfuscatedName("ap") + int field1046; + @ObfuscatedName("ay") + int field1048; + @ObfuscatedName("as") + int[] field1055; + @ObfuscatedName("aj") int[] field1051; - @ObfuscatedName("ax") + @ObfuscatedName("an") + int[] field1053; + @ObfuscatedName("au") + int[] field1056; + @ObfuscatedName("ai") int field1045; - @ObfuscatedName("ah") - int field1040; - @ObfuscatedName("as") + @ObfuscatedName("ae") int field1044; + @ObfuscatedName("aw") + int field1047; @ObfuscatedSignature( - descriptor = "([Luk;)V" + descriptor = "([Lun;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { this.field1054 = new int[256]; this.field1043 = 0; - this.field1041 = 0; - this.field1042 = 0; + this.field1046 = 0; + this.field1048 = 0; this.field1045 = 0; - this.field1040 = 0; this.field1044 = 0; - this.field1055 = var1; + this.field1047 = 0; + this.field1058 = var1; this.initColors(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-111" + garbageValue = "75" ) @Export("initColors") void initColors() { - this.field1049 = new int[256]; + this.field1057 = new int[256]; int var1; for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1] = var1 * 262144; + this.field1057[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1 + 64] = var1 * 1024 + 16711680; + this.field1057[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1 + 128] = var1 * 4 + 16776960; + this.field1057[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1 + 192] = 16777215; + this.field1057[var1 + 192] = 16777215; } - this.field1048 = new int[256]; + this.field1050 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1048[var1] = var1 * 1024; + this.field1050[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { - this.field1048[var1 + 64] = var1 * 4 + 65280; + this.field1050[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { - this.field1048[var1 + 128] = var1 * 262144 + 65535; + this.field1050[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { - this.field1048[var1 + 192] = 16777215; + this.field1050[var1 + 192] = 16777215; } - this.field1052 = new int[256]; + this.field1049 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1052[var1] = var1 * 4; + this.field1049[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1052[var1 + 64] = var1 * 262144 + 255; + this.field1049[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1052[var1 + 128] = var1 * 1024 + 16711935; + this.field1049[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1052[var1 + 192] = 16777215; + this.field1049[var1 + 192] = 16777215; } - this.field1046 = new int[256]; + this.field1052 = new int[256]; this.field1045 = 0; - this.field1050 = new int[32768]; - this.field1051 = new int[32768]; - this.method535((IndexedSprite)null); this.field1053 = new int[32768]; - this.field1047 = new int[32768]; + this.field1056 = new int[32768]; + this.method535((IndexedSprite)null); + this.field1055 = new int[32768]; + this.field1051 = new int[32768]; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1799116765" + garbageValue = "-6404822" ) - void method528() { + void method527() { + this.field1057 = null; + this.field1050 = null; this.field1049 = null; - this.field1048 = null; this.field1052 = null; - this.field1046 = null; - this.field1050 = null; - this.field1051 = null; this.field1053 = null; - this.field1047 = null; + this.field1056 = null; + this.field1055 = null; + this.field1051 = null; this.field1045 = 0; - this.field1040 = 0; + this.field1044 = 0; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-48" + descriptor = "(III)V", + garbageValue = "1382576663" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1053 == null) { + if (this.field1055 == null) { this.initColors(); } - if (this.field1044 == 0) { - this.field1044 = var2; + if (this.field1047 == 0) { + this.field1047 = var2; } - int var3 = var2 - this.field1044; + int var3 = var2 - this.field1047; if (var3 >= 256) { var3 = 0; } - this.field1044 = var2; + this.field1047 = var2; if (var3 > 0) { this.method530(var3); } @@ -174,18 +176,18 @@ void draw(int var1, int var2) { this.method532(var1); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "1766870241" ) final void method530(int var1) { - this.field1045 += var1 * 128; + this.field1045 += 128 * var1; int var2; - if (this.field1045 > this.field1050.length) { - this.field1045 -= this.field1050.length; + if (this.field1045 > this.field1053.length) { + this.field1045 -= this.field1053.length; var2 = (int)(Math.random() * 12.0D); - this.method535(this.field1055[var2]); + this.method535(this.field1058[var2]); } var2 = 0; @@ -194,12 +196,12 @@ final void method530(int var1) { int var6; for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1053[var3 + var2] - this.field1050[var2 + this.field1045 & this.field1050.length - 1] * var1 / 6; + var6 = this.field1055[var2 + var3] - this.field1053[var2 + this.field1045 & this.field1053.length - 1] * var1 / 6; if (var6 < 0) { var6 = 0; } - this.field1053[var2++] = var6; + this.field1055[var2++] = var6; } byte var15 = 10; @@ -213,29 +215,29 @@ final void method530(int var1) { for (int var9 = 0; var9 < 128; ++var9) { var10 = (int)(Math.random() * 100.0D); if (var10 < 50 && var9 > var15 && var9 < var6) { - this.field1053[var9 + var8] = 255; + this.field1055[var8 + var9] = 255; } else { - this.field1053[var9 + var8] = 0; + this.field1055[var8 + var9] = 0; } } } - if (this.field1041 > 0) { - this.field1041 -= var1 * 4; + if (this.field1046 > 0) { + this.field1046 -= var1 * 4; } - if (this.field1042 > 0) { - this.field1042 -= var1 * 4; + if (this.field1048 > 0) { + this.field1048 -= var1 * 4; } - if (this.field1041 == 0 && this.field1042 == 0) { + if (this.field1046 == 0 && this.field1048 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); if (var7 == 0) { - this.field1041 = 1024; + this.field1046 = 1024; } if (var7 == 1) { - this.field1042 = 1024; + this.field1048 = 1024; } } @@ -248,7 +250,7 @@ final void method530(int var1) { ++this.field1043; } - this.field1040 += var1; + this.field1044 += var1; var7 = ((Client.cycle & 1) + var1) / 2; if (var7 > 0) { short var16 = 128; @@ -258,13 +260,13 @@ final void method530(int var1) { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1040 * 100; ++var11) { + for (var11 = 0; var11 < this.field1044 * 100; ++var11) { var12 = (int)(Math.random() * (double)var10) + var17; var13 = (int)(Math.random() * (double)var16) + var16; - this.field1053[var12 + (var13 << 7)] = 192; + this.field1055[var12 + (var13 << 7)] = 192; } - this.field1040 = 0; + this.field1044 = 0; int var14; for (var11 = 0; var11 < 256; ++var11) { @@ -272,16 +274,16 @@ final void method530(int var1) { var13 = var11 * 128; for (var14 = -var7; var14 < 128; ++var14) { - if (var7 + var14 < 128) { - var12 += this.field1053[var7 + var14 + var13]; + if (var14 + var7 < 128) { + var12 += this.field1055[var13 + var14 + var7]; } if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1053[var13 + var14 - (var7 + 1)]; + var12 -= this.field1055[var13 + var14 - (var7 + 1)]; } if (var14 >= 0) { - this.field1047[var14 + var13] = var12 / (var7 * 2 + 1); + this.field1051[var13 + var14] = var12 / (var7 * 2 + 1); } } } @@ -292,15 +294,15 @@ final void method530(int var1) { for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; if (var7 + var13 < 256) { - var12 += this.field1047[var7 * 128 + var14 + var11]; + var12 += this.field1051[var7 * 128 + var11 + var14]; } if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1047[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1051[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1053[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1055[var14 + var11] = var12 / (var7 * 2 + 1); } } } @@ -308,60 +310,60 @@ final void method530(int var1) { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIIS)I", - garbageValue = "1630" + descriptor = "(IIIB)I", + garbageValue = "92" ) final int method531(int var1, int var2, int var3) { int var4 = 256 - var3; return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1503103603" + garbageValue = "-527981427" ) final void method532(int var1) { - int var2 = this.field1046.length; - if (this.field1041 > 0) { - this.method533(this.field1041, this.field1048); - } else if (this.field1042 > 0) { - this.method533(this.field1042, this.field1052); + int var2 = this.field1052.length; + if (this.field1046 > 0) { + this.method533(this.field1046, this.field1050); + } else if (this.field1048 > 0) { + this.method533(this.field1048, this.field1049); } else { for (int var3 = 0; var3 < var2; ++var3) { - this.field1046[var3] = this.field1049[var3]; + this.field1052[var3] = this.field1057[var3]; } } this.method534(var1); } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I[IB)V", - garbageValue = "106" + descriptor = "(I[II)V", + garbageValue = "-1793969695" ) final void method533(int var1, int[] var2) { - int var3 = this.field1046.length; + int var3 = this.field1052.length; for (int var4 = 0; var4 < var3; ++var4) { if (var1 > 768) { - this.field1046[var4] = this.method531(this.field1049[var4], var2[var4], 1024 - var1); + this.field1052[var4] = this.method531(this.field1057[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1046[var4] = var2[var4]; + this.field1052[var4] = var2[var4]; } else { - this.field1046[var4] = this.method531(var2[var4], this.field1049[var4], 256 - var1); + this.field1052[var4] = this.method531(var2[var4], this.field1057[var4], 256 - var1); } } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1021290032" + garbageValue = "1816590027" ) final void method534(int var1) { int var2 = 0; @@ -376,22 +378,22 @@ final void method534(int var1) { var5 = 0; } - if (var5 + 128 >= AttackOption.rasterProvider.width) { - var7 = AttackOption.rasterProvider.width - var5; + if (var5 + 128 >= class223.rasterProvider.width) { + var7 = class223.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * AttackOption.rasterProvider.width; + int var8 = var5 + (var3 + 8) * class223.rasterProvider.width; var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1053[var2++]; + int var10 = this.field1055[var2++]; int var11 = var8 % Rasterizer2D.Rasterizer2D_width; if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { int var12 = var10; int var13 = 256 - var10; - var10 = this.field1046[var10]; - int var14 = AttackOption.rasterProvider.pixels[var8]; - AttackOption.rasterProvider.pixels[var8++] = -16777216 | ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) + (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) >> 8; + var10 = this.field1052[var10]; + int var14 = class223.rasterProvider.pixels[var8]; + class223.rasterProvider.pixels[var8++] = -16777216 | ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; } else { ++var8; } @@ -402,21 +404,21 @@ final void method534(int var1) { } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Luk;I)V", - garbageValue = "-1981831992" + descriptor = "(Lun;I)V", + garbageValue = "129400298" ) final void method535(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1050.length; ++var2) { - this.field1050[var2] = 0; + for (var2 = 0; var2 < this.field1053.length; ++var2) { + this.field1053[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1050[var3] = (int)(Math.random() * 256.0D); + this.field1053[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -425,13 +427,13 @@ final void method535(IndexedSprite var1) { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); - this.field1051[var5] = (this.field1050[var5 + 128] + this.field1050[var5 - 128] + this.field1050[var5 + 1] + this.field1050[var5 - 1]) / 4; + this.field1056[var5] = (this.field1053[var5 + 128] + this.field1053[var5 - 128] + this.field1053[var5 + 1] + this.field1053[var5 - 1]) / 4; } } - int[] var8 = this.field1050; - this.field1050 = this.field1051; - this.field1051 = var8; + int[] var8 = this.field1053; + this.field1053 = this.field1056; + this.field1056 = var8; } if (var1 != null) { @@ -443,7 +445,7 @@ final void method535(IndexedSprite var1) { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1050[var7] = 0; + this.field1053[var7] = 0; } } } @@ -451,15 +453,39 @@ final void method535(IndexedSprite var1) { } - @ObfuscatedName("mf") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "1528651927" + descriptor = "(IIILiz;IB)V", + garbageValue = "-106" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (ModeWhere.loadInterface(var0)) { - class9.updateInterface(PacketBufferNode.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + static void method529(int var0, int var1, int var2, ObjectComposition var3, int var4) { + ObjectSound var5 = new ObjectSound(); + var5.plane = var0; + var5.x = var1 * 128; + var5.y = var2 * 128; + int var6 = var3.sizeX; + int var7 = var3.sizeY; + if (var4 == 1 || var4 == 3) { + var6 = var3.sizeY; + var7 = var3.sizeX; + } + + var5.maxX = (var6 + var1) * 128; + var5.maxY = (var7 + var2) * 128; + var5.soundEffectId = var3.ambientSoundId; + var5.field696 = var3.int7 * 128; + var5.field697 = var3.int5; + var5.field690 = var3.int6; + var5.soundEffectIds = var3.soundEffectIds; + if (var3.transforms != null) { + var5.obj = var3; + var5.set(); + } + + ObjectSound.objectSounds.addFirst(var5); + if (var5.soundEffectIds != null) { + var5.field695 = var5.field697 + (int)(Math.random() * (double)(var5.field690 - var5.field697)); } + } } \ No newline at end of file diff --git a/osrs/src/main/java/LoginType.java b/osrs/src/main/java/LoginType.java index 2397b6b77..b5c7ba9b9 100644 --- a/osrs/src/main/java/LoginType.java +++ b/osrs/src/main/java/LoginType.java @@ -3,118 +3,88 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sl") +@ObfuscatedName("te") @Implements("LoginType") public class LoginType { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) - static final LoginType field4069; - @ObfuscatedName("ao") + static final LoginType field4102; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) - static final LoginType field4071; - @ObfuscatedName("at") + static final LoginType field4101; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) - static final LoginType field4073; - @ObfuscatedName("ac") + static final LoginType field4105; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) - static final LoginType field4068; - @ObfuscatedName("ai") + static final LoginType field4103; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) - static final LoginType field4070; - @ObfuscatedName("az") + static final LoginType field4100; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) - static final LoginType field4074; - @ObfuscatedName("ap") + static final LoginType field4104; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) - static final LoginType field4072; - @ObfuscatedName("aa") + static final LoginType field4099; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lsl;" + descriptor = "Lte;" ) - public static final LoginType field4066; - @ObfuscatedName("af") - public final int field4076; - @ObfuscatedName("ad") - final String field4075; + public static final LoginType field4098; + @ObfuscatedName("av") + final int field4106; + @ObfuscatedName("ag") + final String field4107; static { - oldscape = new LoginType(8, 0, "", ""); - field4069 = new LoginType(4, 1, "", ""); - field4071 = new LoginType(1, 2, "", ""); - field4073 = new LoginType(6, 3, "", ""); - field4068 = new LoginType(2, 4, "", ""); - field4070 = new LoginType(0, 5, "", ""); - field4074 = new LoginType(5, 6, "", ""); - field4072 = new LoginType(7, 7, "", ""); - field4066 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4069, field4071, field4068, field4073}); + oldscape = new LoginType(4, 0, "", ""); + field4102 = new LoginType(6, 1, "", ""); + field4101 = new LoginType(3, 2, "", ""); + field4105 = new LoginType(5, 3, "", ""); + field4103 = new LoginType(7, 4, "", ""); + field4100 = new LoginType(8, 5, "", ""); + field4104 = new LoginType(2, 6, "", ""); + field4099 = new LoginType(0, 7, "", ""); + field4098 = new LoginType(1, -1, "", "", true, new LoginType[]{oldscape, field4102, field4101, field4103, field4105}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4076 = var1; - this.field4075 = var4; + this.field4106 = var1; + this.field4107 = var4; } @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lsl;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lte;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4076 = var1; - this.field4075 = var4; + this.field4106 = var1; + this.field4107 = var4; } @Export("toString") @ObfuscatedName("toString") public String toString() { - return this.field4075; - } - - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "(Ldf;III)V", - garbageValue = "-1416218434" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = EnumComposition.SequenceDefinition_get(var1).replyMode; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.currentSequenceFrameIndex = 0; - } - - if (var3 == 2) { - var0.currentSequenceFrameIndex = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || EnumComposition.SequenceDefinition_get(var1).forcedPriority >= EnumComposition.SequenceDefinition_get(var0.sequence).forcedPriority) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.currentSequenceFrameIndex = 0; - var0.field1022 = var0.pathLength; - } - + return this.field4107; } } \ No newline at end of file diff --git a/osrs/src/main/java/LongNode.java b/osrs/src/main/java/LongNode.java index c2faf27dc..6e97399b4 100644 --- a/osrs/src/main/java/LongNode.java +++ b/osrs/src/main/java/LongNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("st") +@ObfuscatedName("se") @Implements("LongNode") public class LongNode extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("longValue") public long longValue; diff --git a/osrs/src/main/java/MenuAction.java b/osrs/src/main/java/MenuAction.java index dd839cec7..597664088 100644 --- a/osrs/src/main/java/MenuAction.java +++ b/osrs/src/main/java/MenuAction.java @@ -3,74 +3,144 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cz") +@ObfuscatedName("cf") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("param0") int param0; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("param1") int param1; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("opcode") int opcode; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("identifier") int identifier; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("itemId") int itemId; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("action") String action; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("target") String target; MenuAction() { } - @ObfuscatedName("az") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1991089185" + descriptor = "([BB)V", + garbageValue = "-3" ) - public static final void method425(int var0, int var1) { - ViewportMouse.ViewportMouse_x = var0; - ViewportMouse.ViewportMouse_y = var1; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field3775) { + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field3778) { + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; + } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field3773) { + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; + } else if (var0.length == 30000 && ByteArrayPool.field3772 < ByteArrayPool.field3771) { + ByteArrayPool.field3767[++ByteArrayPool.field3772 - 1] = var0; + } else { + if (class28.ByteArrayPool_arrays != null) { + for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { + if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && class425.ByteArrayPool_altSizeArrayCounts[var1] < class28.ByteArrayPool_arrays[var1].length) { + class28.ByteArrayPool_arrays[var1][class425.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; + return; + } + } + } + + } } @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "64" + descriptor = "(IIII)D", + garbageValue = "-2018326069" ) - static int method426(int var0, Script var1, boolean var2) { - Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - if (var0 == 2500) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == 2501) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == 2502) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == 2503) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == 2504) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == 2505) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.parentId; - return 1; + static double method428(int var0, int var1, int var2) { + double var3 = var1 > 0 ? (double)Math.max(0.0F, Math.min(1.0F, (float)var0 / (float)var1)) : 1.0D; + if (var3 > 0.0D && var3 < 1.0D) { + double var5; + double var7; + switch(var2) { + case 0: + return var3; + case 1: + return 1.0D - Math.cos(3.141592653589793D * var3 / 2.0D); + case 2: + return Math.sin(3.141592653589793D * var3 / 2.0D); + case 3: + return -(Math.cos(3.141592653589793D * var3) - 1.0D) / 2.0D; + case 4: + return var3 * var3; + case 5: + return 1.0D - (1.0D - var3) * (1.0D - var3); + case 6: + return var3 < 0.5D ? var3 * 2.0D * var3 : 1.0D - Math.pow(2.0D + var3 * -2.0D, 2.0D) / 2.0D; + case 7: + return var3 * var3 * var3; + case 8: + return 1.0D - Math.pow(1.0D - var3, 3.0D); + case 9: + return var3 < 0.5D ? var3 * 4.0D * var3 * var3 : 1.0D - Math.pow(var3 * -2.0D + 2.0D, 3.0D) / 2.0D; + case 10: + return var3 * var3 * var3 * var3; + case 11: + return 1.0D - Math.pow(1.0D - var3, 4.0D); + case 12: + return var3 < 0.5D ? var3 * var3 * var3 * 8.0D * var3 : 1.0D - Math.pow(var3 * -2.0D + 2.0D, 4.0D) / 2.0D; + case 13: + return var3 * var3 * var3 * var3 * var3; + case 14: + return 1.0D - Math.pow(1.0D - var3, 5.0D); + case 15: + return var3 < 0.5D ? var3 * 8.0D * var3 * var3 * var3 * var3 : 1.0D - Math.pow(-2.0D * var3 + 2.0D, 5.0D) / 2.0D; + case 16: + return Math.pow(2.0D, var3 * 10.0D - 10.0D); + case 17: + return 1.0D - Math.pow(2.0D, var3 * -10.0D); + case 18: + return var3 < 0.5D ? Math.pow(2.0D, 10.0D + var3 * 20.0D) / 2.0D : (2.0D - Math.pow(2.0D, 10.0D + var3 * -20.0D)) / 2.0D; + case 19: + return 1.0D - Math.sqrt(1.0D - Math.pow(var3, 2.0D)); + case 20: + return Math.sqrt(1.0D - Math.pow(var3 - 1.0D, 2.0D)); + case 21: + return var3 < 0.5D ? (1.0D - Math.sqrt(1.0D - Math.pow(2.0D * var3, 2.0D))) / 2.0D : (Math.sqrt(1.0D - Math.pow(-2.0D * var3 + 2.0D, 2.0D)) + 1.0D) / 2.0D; + case 22: + var5 = 1.70158D; + var7 = 2.70158D; + return var3 * var3 * 2.70158D * var3 - 1.70158D * var3 * var3; + case 23: + var5 = 1.70158D; + var7 = 2.70158D; + return 1.0D + 2.70158D * Math.pow(var3 - 1.0D, 3.0D) + 1.70158D * Math.pow(var3 - 1.0D, 2.0D); + case 24: + var5 = 1.70158D; + var7 = 2.5949095D; + return var3 < 0.5D ? Math.pow(var3 * 2.0D, 2.0D) * (var3 * 7.189819D - 2.5949095D) / 2.0D : (Math.pow(var3 * 2.0D - 2.0D, 2.0D) * (3.5949095D * (2.0D * var3 - 2.0D) + 2.5949095D) + 2.0D) / 2.0D; + case 25: + var5 = 2.0943951023931953D; + return -Math.pow(2.0D, 10.0D * var3 - 10.0D) * Math.sin((var3 * 10.0D - 10.75D) * 2.0943951023931953D); + case 26: + var5 = 2.0943951023931953D; + return Math.pow(2.0D, var3 * -10.0D) * Math.sin(2.0943951023931953D * (10.0D * var3 - 0.75D)) + 1.0D; + case 27: + var5 = 1.3962634015954636D; + var7 = Math.sin(1.3962634015954636D * (var3 * 20.0D - 11.125D)); + return var3 < 0.5D ? -(Math.pow(2.0D, 20.0D * var3 - 10.0D) * var7) / 2.0D : Math.pow(2.0D, 10.0D + var3 * -20.0D) * var7 / 2.0D + 1.0D; + default: + return var3; + } } else { - return 2; + return var3 <= 0.0D ? 0.0D : 1.0D; } } } \ No newline at end of file diff --git a/osrs/src/main/java/Message.java b/osrs/src/main/java/Message.java index 9c84ae39f..cc5959dd1 100644 --- a/osrs/src/main/java/Message.java +++ b/osrs/src/main/java/Message.java @@ -3,58 +3,48 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.File; -import java.io.RandomAccessFile; - -@ObfuscatedName("co") +@ObfuscatedName("cr") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("fn") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("kn") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "[Lui;" + descriptor = "Lrx;" ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; - @ObfuscatedName("au") + static Bounds field349; + @ObfuscatedName("ac") @Export("count") int count; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("cycle") int cycle; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("type") int type; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("sender") String sender; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Luc;" + descriptor = "Lvf;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lra;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lra;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("prefix") String prefix; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("text") String text; @@ -64,10 +54,10 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "80" + garbageValue = "88" ) @Export("set") void set(int var1, String var2, String var3, String var4) { @@ -83,20 +73,20 @@ void set(int var1, String var2, String var3, String var4) { this.clearIsFromIgnored(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "963763449" + garbageValue = "1192879818" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "10" + descriptor = "(I)Z", + garbageValue = "-2133471128" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -107,30 +97,30 @@ final boolean isFromFriend() { return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-35" + descriptor = "(I)V", + garbageValue = "1787046526" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = class299.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromFriend0 = InvDefinition.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "1" + garbageValue = "32" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1755097600" + descriptor = "(B)Z", + garbageValue = "-67" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -141,64 +131,36 @@ final boolean isFromIgnored() { return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1656305683" + descriptor = "(B)V", + garbageValue = "0" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = class299.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = InvDefinition.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "70" + descriptor = "(I)V", + garbageValue = "-1525431428" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(ObjTypeCustomisation.method936(this.sender), Language.loginType); + this.senderUsername = new Username(InterfaceParent.method465(this.sender), class166.loginType); } else { this.senderUsername = null; } } - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;ZI)Z", - garbageValue = "1803169793" - ) - static boolean method340(File var0, boolean var1) { - try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); - int var3 = var2.read(); - var2.seek(0L); - var2.write(var3); - var2.seek(0L); - var2.close(); - if (var1) { - var0.delete(); - } - - return true; - } catch (Exception var4) { - return false; - } - } - - @ObfuscatedName("jn") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-103" + descriptor = "(Lom;B)V", + garbageValue = "-50" ) - static void method341() { - PacketBufferNode var0 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.WINDOW_STATUS, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(class218.getWindowedMode()); - var0.packetBuffer.writeShort(class113.canvasWidth); - var0.packetBuffer.writeShort(class177.canvasHeight); - Client.packetWriter.addNode(var0); + public static void method338(AbstractArchive var0) { } } \ No newline at end of file diff --git a/osrs/src/main/java/Messages.java b/osrs/src/main/java/Messages.java index 6185a9a0c..c0a1d2638 100644 --- a/osrs/src/main/java/Messages.java +++ b/osrs/src/main/java/Messages.java @@ -3,34 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.DataInputStream; -import java.net.URL; import java.util.HashMap; import java.util.Map; -@ObfuscatedName("ea") +@ObfuscatedName("er") @Implements("Messages") public class Messages { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lsf;" + descriptor = "Ltp;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lou;" + descriptor = "Lpt;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("Messages_count") static int Messages_count; - @ObfuscatedName("as") - public static String field1146; static { Messages_channels = new HashMap(); @@ -39,60 +35,24 @@ public class Messages { Messages_count = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "886881488" + descriptor = "(II)Lis;", + garbageValue = "517783557" ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { + public static VarbitComposition method638(int var0) { + VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); if (var1 != null) { - var1.printStackTrace(); + return var1; } else { - try { - String var2 = ""; - if (var1 != null) { - var2 = class493.method2465(var1); - } - - if (var0 != null) { - if (var1 != null) { - var2 = var2 + " | "; - } - - var2 = var2 + var0; - } - - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (RunException.RunException_applet == null) { - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?cv=" + RunException.RunException_revision + "&cs=" + RunException.field4287 + "&u=" + RunException.field4289 + "&v1=" + TaskHandler.javaVendor + "&v2=" + class106.javaVersion + "&ct=" + RunException.field4285 + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { + byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); + var1 = new VarbitComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - } - } - - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "1446947589" - ) - static int method635(int var0, Script var1, boolean var2) { - if (var0 == 7108) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = UserList.method2244() ? 1 : 0; - return 1; - } else { - return 2; + VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); + return var1; } } } \ No newline at end of file diff --git a/osrs/src/main/java/MidiFileReader.java b/osrs/src/main/java/MidiFileReader.java index 08d144050..51f778324 100644 --- a/osrs/src/main/java/MidiFileReader.java +++ b/osrs/src/main/java/MidiFileReader.java @@ -3,52 +3,52 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("mf") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("af") - static final byte[] field2810; - @ObfuscatedName("au") + @ObfuscatedName("av") + static final byte[] field2834; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ltm;" + descriptor = "Lul;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("division") int division; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("ai") - int[] field2814; - @ObfuscatedName("az") - int field2812; - @ObfuscatedName("aa") - long field2817; + @ObfuscatedName("ah") + int[] field2837; + @ObfuscatedName("ar") + int field2836; + @ObfuscatedName("am") + long field2841; static { - field2810 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + field2834 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; } MidiFileReader() { this.buffer = new Buffer((byte[])null); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("parse") void parse(byte[] var1) { this.buffer.array = var1; this.buffer.offset = 10; int var2 = this.buffer.readUnsignedShort(); this.division = this.buffer.readUnsignedShort(); - this.field2812 = 500000; + this.field2836 = 500000; this.trackStarts = new int[var2]; Buffer var10000; @@ -65,7 +65,7 @@ void parse(byte[] var1) { var10000 = this.buffer; } - this.field2817 = 0L; + this.field2841 = 0L; this.trackPositions = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { @@ -73,50 +73,50 @@ void parse(byte[] var1) { } this.trackLengths = new int[var2]; - this.field2814 = new int[var2]; + this.field2837 = new int[var2]; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("clear") void clear() { this.buffer.array = null; this.trackStarts = null; this.trackPositions = null; this.trackLengths = null; - this.field2814 = null; + this.field2837 = null; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("isReady") boolean isReady() { return this.buffer.array != null; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("trackCount") int trackCount() { return this.trackPositions.length; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); @@ -124,36 +124,36 @@ void readTrackLength(int var1) { var10000[var1] += var2; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); return var2; } - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; int var5; if (var2 < 0) { var5 = var2 & 255; - this.field2814[var1] = var5; + this.field2837[var1] = var5; ++this.buffer.offset; } else { - var5 = this.field2814[var1]; + var5 = this.field2837[var1]; } if (var5 != 240 && var5 != 247) { - return this.method1677(var1, var5); + return this.method1709(var1, var5); } else { int var3 = this.buffer.readVarInt(); if (var5 == 247 && var3 > 0) { int var4 = this.buffer.array[this.buffer.offset] & 255; if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { ++this.buffer.offset; - this.field2814[var1] = var4; - return this.method1677(var1, var4); + this.field2837[var1] = var4; + return this.method1709(var1, var4); } } @@ -163,8 +163,8 @@ int readMessage0(int var1) { } } - @ObfuscatedName("ad") - int method1677(int var1, int var2) { + @ObfuscatedName("ag") + int method1709(int var1, int var2) { int var4; if (var2 == 255) { int var7 = this.buffer.readUnsignedByte(); @@ -178,8 +178,8 @@ int method1677(int var1, int var2) { int var5 = this.buffer.readMedium(); var4 -= 3; int var6 = this.trackLengths[var1]; - this.field2817 += (long)var6 * (long)(this.field2812 - var5); - this.field2812 = var5; + this.field2841 += (long)var6 * (long)(this.field2836 - var5); + this.field2836 = var5; var10000 = this.buffer; var10000.offset += var4; return 2; @@ -189,7 +189,7 @@ int method1677(int var1, int var2) { return 3; } } else { - byte var3 = field2810[var2 - 128]; + byte var3 = field2834[var2 - 128]; var4 = var2; if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -203,12 +203,12 @@ int method1677(int var1, int var2) { } } - @ObfuscatedName("aq") - long method1678(int var1) { - return this.field2817 + (long)var1 * (long)this.field2812; + @ObfuscatedName("aa") + long method1710(int var1) { + return this.field2841 + (long)var1 * (long)this.field2836; } - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; @@ -225,7 +225,7 @@ int getPrioritizedTrack() { return var2; } - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; @@ -239,15 +239,15 @@ boolean isDone() { return true; } - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("reset") void reset(long var1) { - this.field2817 = var1; + this.field2841 = var1; int var3 = this.trackPositions.length; for (int var4 = 0; var4 < var3; ++var4) { this.trackLengths[var4] = 0; - this.field2814[var4] = 0; + this.field2837[var4] = 0; this.buffer.offset = this.trackStarts[var4]; this.readTrackLength(var4); this.trackPositions[var4] = this.buffer.offset; diff --git a/osrs/src/main/java/MidiPcmStream.java b/osrs/src/main/java/MidiPcmStream.java index 324055532..6ca300633 100644 --- a/osrs/src/main/java/MidiPcmStream.java +++ b/osrs/src/main/java/MidiPcmStream.java @@ -10,185 +10,177 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -@ObfuscatedName("lf") +@ObfuscatedName("mt") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("bf") - static AtomicBoolean field2780; - @ObfuscatedName("bq") - static ThreadPoolExecutor field2779; - @ObfuscatedName("au") + @ObfuscatedName("bo") + static AtomicBoolean field2804; + @ObfuscatedName("bp") + static ThreadPoolExecutor field2803; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Ltf;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("ae") - int field2782; + @ObfuscatedName("al") + int field2807; + @ObfuscatedName("ak") + int field2806; + @ObfuscatedName("ax") + int[] field2823; @ObfuscatedName("ao") - int field2783; - @ObfuscatedName("at") - int[] field2796; - @ObfuscatedName("ac") - int[] field2787; - @ObfuscatedName("ai") - int[] field2791; - @ObfuscatedName("az") - int[] field2800; - @ObfuscatedName("ap") - int[] field2793; - @ObfuscatedName("aa") - int[] field2786; - @ObfuscatedName("af") - int[] field2789; - @ObfuscatedName("ad") - int[] field2788; - @ObfuscatedName("aq") - int[] field2794; + int[] field2817; @ObfuscatedName("ah") - int[] field2790; - @ObfuscatedName("as") - int[] field2795; - @ObfuscatedName("ay") - int[] field2799; - @ObfuscatedName("aj") - int[] field2792; + int[] field2815; + @ObfuscatedName("ar") + int[] field2819; + @ObfuscatedName("ab") + int[] field2811; + @ObfuscatedName("am") + int[] field2816; @ObfuscatedName("av") - int[] field2797; + int[] field2821; + @ObfuscatedName("ag") + int[] field2814; + @ObfuscatedName("aa") + int[] field2810; + @ObfuscatedName("ae") + int[] field2812; @ObfuscatedName("aw") - int[] field2798; - @ObfuscatedName("ak") + int[] field2822; + @ObfuscatedName("aq") + int[] field2818; + @ObfuscatedName("az") + int[] field2824; + @ObfuscatedName("at") + int[] field2820; + @ObfuscatedName("af") + int[] field2813; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "[[Lmg;" + descriptor = "[[Lms;" ) - MusicPatchNode[][] field2805; - @ObfuscatedName("bh") + MusicPatchNode[][] field2830; + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "[[Lmg;" + descriptor = "[[Lms;" ) - MusicPatchNode[][] field2806; - @ObfuscatedName("bj") + MusicPatchNode[][] field2831; + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmf;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("bk") - boolean field2781; - @ObfuscatedName("bv") + @ObfuscatedName("by") + boolean field2805; + @ObfuscatedName("bd") @Export("track") int track; - @ObfuscatedName("bt") + @ObfuscatedName("be") @Export("trackLength") int trackLength; - @ObfuscatedName("bd") - long field2802; - @ObfuscatedName("by") - long field2803; - @ObfuscatedName("bs") + @ObfuscatedName("bv") + long field2827; + @ObfuscatedName("ba") + long field2826; + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmn;" ) @Export("patchStream") MusicPatchPcmStream patchStream; - @ObfuscatedName("bm") - PriorityQueue field2801; - @ObfuscatedName("ba") - public int field2809; + @ObfuscatedName("bb") + PriorityQueue field2825; + @ObfuscatedName("bt") + public int field2833; static { - field2780 = null; - field2779 = null; + field2804 = null; + field2803 = null; } public MidiPcmStream() { - this.field2782 = 256; - this.field2783 = 1000000; - this.field2796 = new int[16]; - this.field2787 = new int[16]; - this.field2791 = new int[16]; - this.field2800 = new int[16]; - this.field2793 = new int[16]; - this.field2786 = new int[16]; - this.field2789 = new int[16]; - this.field2788 = new int[16]; - this.field2794 = new int[16]; - this.field2790 = new int[16]; - this.field2795 = new int[16]; - this.field2799 = new int[16]; - this.field2792 = new int[16]; - this.field2797 = new int[16]; - this.field2798 = new int[16]; - this.field2805 = new MusicPatchNode[16][128]; - this.field2806 = new MusicPatchNode[16][128]; + this.field2807 = 256; + this.field2806 = 1000000; + this.field2823 = new int[16]; + this.field2817 = new int[16]; + this.field2815 = new int[16]; + this.field2819 = new int[16]; + this.field2811 = new int[16]; + this.field2816 = new int[16]; + this.field2821 = new int[16]; + this.field2814 = new int[16]; + this.field2810 = new int[16]; + this.field2812 = new int[16]; + this.field2822 = new int[16]; + this.field2818 = new int[16]; + this.field2824 = new int[16]; + this.field2820 = new int[16]; + this.field2813 = new int[16]; + this.field2830 = new MusicPatchNode[16][128]; + this.field2831 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); - this.field2801 = new PriorityQueue(5, new class316()); - this.field2809 = 0; + this.field2825 = new PriorityQueue(5, new class330()); + this.field2833 = 0; this.musicPatches = new NodeHashTable(128); - this.method1650(); + this.method1683(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "178339919" + descriptor = "(IB)V", + garbageValue = "109" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field2782 = var1; + this.field2807 = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1304608444" + descriptor = "(B)I", + garbageValue = "-13" ) - public int method1629() { - return this.field2782; + public int method1662() { + return this.field2807; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lmv;Lnu;Lbi;I)Z", - garbageValue = "2146420949" + descriptor = "(Lmk;Lom;Lbl;I)Z", + garbageValue = "-1830159532" ) - public synchronized boolean method1630(MusicTrack var1, AbstractArchive var2, SoundCache var3) { + public synchronized boolean method1663(MusicTrack var1, AbstractArchive var2, SoundCache var3) { boolean var4 = true; - synchronized(this.field2801) { - this.field2801.clear(); + synchronized(this.field2825) { + this.field2825.clear(); } - for (class318 var5 = (class318)var1.field2837.first(); var5 != null; var5 = (class318)var1.field2837.next()) { + for (class332 var5 = (class332)var1.field2860.first(); var5 != null; var5 = (class332)var1.field2860.next()) { int var12 = (int)var5.key; MusicPatch var7 = (MusicPatch)this.musicPatches.get((long)var12); if (var7 == null) { - byte[] var9 = var2.takeFileFlat(var12); - MusicPatch var8; - if (var9 == null) { - var8 = null; - } else { - var8 = new MusicPatch(var9); - } - - var7 = var8; - if (var8 == null) { + var7 = ZoneOperation.method1643(var2, var12); + if (var7 == null) { var4 = false; continue; } - this.musicPatches.put(var8, (long)var12); + this.musicPatches.put(var7, (long)var12); } - if (!var7.method1682(var3, var5.field2876)) { + if (!var7.method1714(var3, var5.field2896)) { var4 = false; - } else if (this.field2801 != null) { - synchronized(this.field2801) { - Iterator var15 = var7.field2828.iterator(); + } else if (this.field2825 != null) { + synchronized(this.field2825) { + Iterator var9 = var7.field2851.iterator(); - while (var15.hasNext()) { - class53 var10 = (class53)var15.next(); - this.field2801.add(new class309(var5.field2875, var10)); + while (var9.hasNext()) { + class53 var10 = (class53)var9.next(); + this.field2825.add(new class323(var5.field2895, var10)); } } } @@ -197,135 +189,135 @@ public synchronized boolean method1630(MusicTrack var1, AbstractArchive var2, So return var4; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-932325376" + descriptor = "(B)V", + garbageValue = "-38" ) - public void method1631() { - if (this.field2801 != null) { - if (field2780 != null) { - field2780.set(true); + public void method1664() { + if (this.field2825 != null) { + if (field2804 != null) { + field2804.set(true); } - field2780 = new AtomicBoolean(false); - AtomicBoolean var1 = field2780; - if (field2779 == null) { + field2804 = new AtomicBoolean(false); + AtomicBoolean var1 = field2804; + if (field2803 == null) { int var2 = Runtime.getRuntime().availableProcessors(); - field2779 = new ThreadPoolExecutor(0, var2, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), new class308(this)); + field2803 = new ThreadPoolExecutor(0, var2, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), new class322(this)); } - field2779.submit(new class312(this, var1)); + field2803.submit(new class326(this, var1)); } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2076204033" + garbageValue = "356838086" ) - public synchronized void method1632() { + public synchronized void method1665() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.clear(); } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "()Lbw;" + descriptor = "()Lbi;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "()Lbw;" + descriptor = "()Lbi;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") protected synchronized int vmethod5648() { return 0; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2783 / PcmPlayer.field181; + int var4 = this.midiFile.division * this.field2806 / PcmPlayer.field179; do { - long var5 = (long)var4 * (long)var3 + this.field2802; - if (this.field2803 - var5 >= 0L) { - this.field2802 = var5; + long var5 = this.field2827 + (long)var3 * (long)var4; + if (this.field2826 - var5 >= 0L) { + this.field2827 = var5; break; } - int var7 = (int)(((long)var4 + (this.field2803 - this.field2802) - 1L) / (long)var4); - this.field2802 += (long)var4 * (long)var7; + int var7 = (int)((this.field2826 - this.field2827 + (long)var4 - 1L) / (long)var4); + this.field2827 += (long)var7 * (long)var4; this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; - this.method1664(); + this.method1696(); } while(this.midiFile.isReady()); } this.patchStream.fill(var1, var2, var3); } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1876288055" + descriptor = "(B)V", + garbageValue = "64" ) - public synchronized void method1633() { + public synchronized void method1666() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.remove(); } } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2783 / PcmPlayer.field181; + int var2 = this.midiFile.division * this.field2806 / PcmPlayer.field179; do { - long var3 = this.field2802 + (long)var1 * (long)var2; - if (this.field2803 - var3 >= 0L) { - this.field2802 = var3; + long var3 = this.field2827 + (long)var1 * (long)var2; + if (this.field2826 - var3 >= 0L) { + this.field2827 = var3; break; } - int var5 = (int)(((long)var2 + (this.field2803 - this.field2802) - 1L) / (long)var2); - this.field2802 += (long)var2 * (long)var5; + int var5 = (int)((this.field2826 - this.field2827 + (long)var2 - 1L) / (long)var2); + this.field2827 += (long)var5 * (long)var2; this.patchStream.skip(var5); var1 -= var5; - this.method1664(); + this.method1696(); } while(this.midiFile.isReady()); } this.patchStream.skip(var1); } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lmv;ZI)V", - garbageValue = "718932503" + descriptor = "(Lmk;ZI)V", + garbageValue = "-1812900871" ) @Export("setMusicTrack") public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.field2781 = var2; - this.field2802 = 0L; + this.field2805 = var2; + this.field2827 = 0L; int var3 = this.midiFile.trackCount(); for (int var4 = 0; var4 < var3; ++var4) { @@ -336,235 +328,235 @@ public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2803 = this.midiFile.method1678(this.trackLength); + this.field2826 = this.midiFile.method1710(this.trackLength); } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "965115955" + garbageValue = "-1705880184" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); - this.method1650(); + this.method1683(); } - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-12" + descriptor = "(I)Z", + garbageValue = "1826603097" ) @Export("isReady") public synchronized boolean isReady() { return this.midiFile.isReady(); } - @ObfuscatedName("ar") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "8" + descriptor = "(I)Z", + garbageValue = "-1035642858" ) - public synchronized boolean method1637() { - return this.musicPatches.method2456() > 0; + public synchronized boolean method1670() { + return this.musicPatches.method2491() > 0; } - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1830042203" + descriptor = "(IIB)V", + garbageValue = "1" ) - public synchronized void method1638(int var1, int var2) { - this.method1639(var1, var2); + public synchronized void method1671(int var1, int var2) { + this.method1672(var1, var2); } - @ObfuscatedName("ag") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-22" + descriptor = "(IIS)V", + garbageValue = "160" ) - void method1639(int var1, int var2) { - this.field2800[var1] = var2; - this.field2786[var1] = var2 & -128; - this.method1640(var1, var2); + void method1672(int var1, int var2) { + this.field2819[var1] = var2; + this.field2816[var1] = var2 & -128; + this.method1673(var1, var2); } - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "71" + descriptor = "(III)V", + garbageValue = "2093622252" ) - void method1640(int var1, int var2) { - if (var2 != this.field2793[var1]) { - this.field2793[var1] = var2; + void method1673(int var1, int var2) { + if (var2 != this.field2811[var1]) { + this.field2811[var1] = var2; for (int var3 = 0; var3 < 128; ++var3) { - this.field2806[var1][var3] = null; + this.field2831[var1][var3] = null; } } } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "896950696" + garbageValue = "-1932106886" ) - void method1641(int var1, int var2, int var3) { - this.method1643(var1, var2, 64); - if ((this.field2790[var1] & 2) != 0) { + void method1674(int var1, int var2, int var3) { + this.method1676(var1, var2, 64); + if ((this.field2812[var1] & 2) != 0) { for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2854 == var1 && var4.field2853 < 0) { - this.field2805[var1][var4.field2847] = null; - this.field2805[var1][var2] = var4; - int var5 = (var4.field2844 * var4.field2843 >> 12) + var4.field2840; - var4.field2840 += var2 - var4.field2847 << 8; - var4.field2844 = var5 - var4.field2840; - var4.field2843 = 4096; - var4.field2847 = var2; + if (var4.field2865 == var1 && var4.field2876 < 0) { + this.field2830[var1][var4.field2868] = null; + this.field2830[var1][var2] = var4; + int var5 = (var4.field2867 * var4.field2878 >> 12) + var4.field2870; + var4.field2870 += var2 - var4.field2868 << 8; + var4.field2878 = var5 - var4.field2870; + var4.field2867 = 4096; + var4.field2868 = var2; return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2793[var1]); + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2811[var1]); if (var9 != null) { if (var9.rawSounds[var2] != null) { - RawSound var8 = var9.rawSounds[var2].method292(); + RawSound var8 = var9.rawSounds[var2].method300(); if (var8 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.field2854 = var1; + var6.field2865 = var1; var6.table = var9; var6.rawSound = var8; - var6.field2857 = var9.field2829[var2]; - var6.field2842 = var9.field2824[var2]; - var6.field2847 = var2; - var6.field2856 = var3 * var3 * var9.field2822[var2] * var9.field2826 + 1024 >> 11; - var6.field2851 = var9.field2823[var2] & 255; - var6.field2840 = (var2 << 8) - (var9.field2830[var2] & 32767); - var6.field2852 = 0; - var6.field2848 = 0; - var6.field2850 = 0; - var6.field2853 = -1; - var6.field2841 = 0; - if (this.field2792[var1] == 0) { - var6.stream = RawPcmStream.method235(var8, this.method1656(var6), this.method1657(var6), this.method1658(var6)); + var6.field2881 = var9.field2852[var2]; + var6.field2872 = var9.field2845[var2]; + var6.field2868 = var2; + var6.field2875 = var3 * var3 * var9.field2847[var2] * var9.field2849 + 1024 >> 11; + var6.field2864 = var9.field2846[var2] & 255; + var6.field2870 = (var2 << 8) - (var9.field2853[var2] & 32767); + var6.field2863 = 0; + var6.field2873 = 0; + var6.field2879 = 0; + var6.field2876 = -1; + var6.field2869 = 0; + if (this.field2824[var1] == 0) { + var6.stream = RawPcmStream.method244(var8, this.method1688(var6), this.method1689(var6), this.method1690(var6)); } else { - var6.stream = RawPcmStream.method235(var8, this.method1656(var6), 0, this.method1658(var6)); - this.method1642(var6, var9.field2830[var2] < 0); + var6.stream = RawPcmStream.method244(var8, this.method1688(var6), 0, this.method1690(var6)); + this.method1675(var6, var9.field2853[var2] < 0); } - if (var9.field2830[var2] < 0) { + if (var9.field2853[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field2842 >= 0) { - MusicPatchNode var7 = this.field2806[var1][var6.field2842]; - if (var7 != null && var7.field2853 < 0) { - this.field2805[var1][var7.field2847] = null; - var7.field2853 = 0; + if (var6.field2872 >= 0) { + MusicPatchNode var7 = this.field2831[var1][var6.field2872]; + if (var7 != null && var7.field2876 < 0) { + this.field2830[var1][var7.field2868] = null; + var7.field2876 = 0; } - this.field2806[var1][var6.field2842] = var6; + this.field2831[var1][var6.field2872] = var6; } this.patchStream.queue.addFirst(var6); - this.field2805[var1][var2] = var6; + this.field2830[var1][var2] = var6; } } } } - @ObfuscatedName("ah") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lmg;ZS)V", - garbageValue = "5717" + descriptor = "(Lms;ZI)V", + garbageValue = "240911451" ) - void method1642(MusicPatchNode var1, boolean var2) { + void method1675(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; int var4; - if (var2 && var1.rawSound.field167) { + if (var2 && var1.rawSound.field166) { int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)var5 * (long)this.field2792[var1.field2854] >> 6); + var4 = (int)((long)this.field2824[var1.field2865] * (long)var5 >> 6); var3 <<= 8; if (var4 >= var3) { var4 = var3 + var3 - 1 - var4; - var1.stream.method244(); + var1.stream.method253(); } } else { - var4 = (int)((long)var3 * (long)this.field2792[var1.field2854] >> 6); + var4 = (int)((long)var3 * (long)this.field2824[var1.field2865] >> 6); } - var1.stream.method243(var4); + var1.stream.method252(var4); } - @ObfuscatedName("as") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "1002745448" + garbageValue = "-1358549088" ) - void method1643(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2805[var1][var2]; + void method1676(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2830[var1][var2]; if (var4 != null) { - this.field2805[var1][var2] = null; - if ((this.field2790[var1] & 2) != 0) { + this.field2830[var1][var2] = null; + if ((this.field2812[var1] & 2) != 0) { for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var5.field2854 == var4.field2854 && var5.field2853 < 0 && var4 != var5) { - var4.field2853 = 0; + if (var5.field2865 == var4.field2865 && var5.field2876 < 0 && var5 != var4) { + var4.field2876 = 0; break; } } } else { - var4.field2853 = 0; + var4.field2876 = 0; } } } - @ObfuscatedName("ay") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1830352831" + garbageValue = "714069724" ) - void method1644(int var1, int var2, int var3) { + void method1677(int var1, int var2, int var3) { } - @ObfuscatedName("aj") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1399006127" + garbageValue = "-454645454" ) - void method1645(int var1, int var2) { + void method1678(int var1, int var2) { } - @ObfuscatedName("av") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1713272694" + garbageValue = "-2005247777" ) - void method1646(int var1, int var2) { - this.field2789[var1] = var2; + void method1679(int var1, int var2) { + this.field2821[var1] = var2; } - @ObfuscatedName("aw") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "405588365" + descriptor = "(IB)V", + garbageValue = "7" ) - void method1647(int var1) { + void method1680(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2854 == var1) { + if (var1 < 0 || var2.field2865 == var1) { if (var2.stream != null) { - var2.stream.method248(PcmPlayer.field181 / 100); - if (var2.stream.method252()) { + var2.stream.method257(PcmPlayer.field179 / 100); + if (var2.stream.method261()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method1696(); + var2.method1727(); } - if (var2.field2853 < 0) { - this.field2805[var2.field2854][var2.field2847] = null; + if (var2.field2876 < 0) { + this.field2830[var2.field2865][var2.field2868] = null; } var2.remove(); @@ -573,107 +565,107 @@ void method1647(int var1) { } - @ObfuscatedName("ak") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "11" + garbageValue = "-58" ) - void method1648(int var1) { + void method1681(int var1) { if (var1 >= 0) { - this.field2796[var1] = 12800; - this.field2787[var1] = 8192; - this.field2791[var1] = 16383; - this.field2789[var1] = 8192; - this.field2788[var1] = 0; - this.field2794[var1] = 8192; - this.method1652(var1); - this.method1653(var1); - this.field2790[var1] = 0; - this.field2795[var1] = 32767; - this.field2799[var1] = 256; - this.field2792[var1] = 0; - this.method1655(var1, 8192); + this.field2823[var1] = 12800; + this.field2817[var1] = 8192; + this.field2815[var1] = 16383; + this.field2821[var1] = 8192; + this.field2814[var1] = 0; + this.field2810[var1] = 8192; + this.method1684(var1); + this.method1685(var1); + this.field2812[var1] = 0; + this.field2822[var1] = 32767; + this.field2818[var1] = 256; + this.field2824[var1] = 0; + this.method1687(var1, 8192); } else { for (var1 = 0; var1 < 16; ++var1) { - this.method1648(var1); + this.method1681(var1); } } } - @ObfuscatedName("bh") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "2" + descriptor = "(II)V", + garbageValue = "1157620765" ) - void method1649(int var1) { + void method1682(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2854 == var1) && var2.field2853 < 0) { - this.field2805[var2.field2854][var2.field2847] = null; - var2.field2853 = 0; + if ((var1 < 0 || var2.field2865 == var1) && var2.field2876 < 0) { + this.field2830[var2.field2865][var2.field2868] = null; + var2.field2876 = 0; } } } - @ObfuscatedName("bm") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1873768041" + garbageValue = "421748536" ) - void method1650() { - this.method1647(-1); - this.method1648(-1); + void method1683() { + this.method1680(-1); + this.method1681(-1); int var1; for (var1 = 0; var1 < 16; ++var1) { - this.field2793[var1] = this.field2800[var1]; + this.field2811[var1] = this.field2819[var1]; } for (var1 = 0; var1 < 16; ++var1) { - this.field2786[var1] = this.field2800[var1] & -128; + this.field2816[var1] = this.field2819[var1] & -128; } } - @ObfuscatedName("bf") + @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1931071556" + garbageValue = "666381709" ) - void method1652(int var1) { - if ((this.field2790[var1] & 2) != 0) { + void method1684(int var1) { + if ((this.field2812[var1] & 2) != 0) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2854 == var1 && this.field2805[var1][var2.field2847] == null && var2.field2853 < 0) { - var2.field2853 = 0; + if (var2.field2865 == var1 && this.field2830[var1][var2.field2868] == null && var2.field2876 < 0) { + var2.field2876 = 0; } } } } - @ObfuscatedName("bq") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1591565057" + descriptor = "(IB)V", + garbageValue = "3" ) - void method1653(int var1) { - if ((this.field2790[var1] & 4) != 0) { + void method1685(int var1) { + if ((this.field2812[var1] & 4) != 0) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2854 == var1) { - var2.field2855 = 0; + if (var2.field2865 == var1) { + var2.field2874 = 0; } } } } - @ObfuscatedName("ba") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-60" + descriptor = "(II)V", + garbageValue = "1231976764" ) - void method1654(int var1) { + void method1686(int var1) { int var2 = var1 & 240; int var3; int var4; @@ -682,182 +674,182 @@ void method1654(int var1) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method1643(var3, var4, var5); + this.method1676(var3, var4, var5); } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var5 > 0) { - this.method1641(var3, var4, var5); + this.method1674(var3, var4, var5); } else { - this.method1643(var3, var4, 64); + this.method1676(var3, var4, 64); } } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method1644(var3, var4, var5); + this.method1677(var3, var4, var5); } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var4 == 0) { - this.field2786[var3] = (var5 << 14) + (this.field2786[var3] & -2080769); + this.field2816[var3] = (var5 << 14) + (this.field2816[var3] & -2080769); } if (var4 == 32) { - this.field2786[var3] = (var5 << 7) + (this.field2786[var3] & -16257); + this.field2816[var3] = (var5 << 7) + (this.field2816[var3] & -16257); } if (var4 == 1) { - this.field2788[var3] = (var5 << 7) + (this.field2788[var3] & -16257); + this.field2814[var3] = (var5 << 7) + (this.field2814[var3] & -16257); } if (var4 == 33) { - this.field2788[var3] = var5 + (this.field2788[var3] & -128); + this.field2814[var3] = var5 + (this.field2814[var3] & -128); } if (var4 == 5) { - this.field2794[var3] = (var5 << 7) + (this.field2794[var3] & -16257); + this.field2810[var3] = (var5 << 7) + (this.field2810[var3] & -16257); } if (var4 == 37) { - this.field2794[var3] = var5 + (this.field2794[var3] & -128); + this.field2810[var3] = var5 + (this.field2810[var3] & -128); } if (var4 == 7) { - this.field2796[var3] = (var5 << 7) + (this.field2796[var3] & -16257); + this.field2823[var3] = (var5 << 7) + (this.field2823[var3] & -16257); } if (var4 == 39) { - this.field2796[var3] = var5 + (this.field2796[var3] & -128); + this.field2823[var3] = var5 + (this.field2823[var3] & -128); } if (var4 == 10) { - this.field2787[var3] = (var5 << 7) + (this.field2787[var3] & -16257); + this.field2817[var3] = (var5 << 7) + (this.field2817[var3] & -16257); } if (var4 == 42) { - this.field2787[var3] = var5 + (this.field2787[var3] & -128); + this.field2817[var3] = var5 + (this.field2817[var3] & -128); } if (var4 == 11) { - this.field2791[var3] = (var5 << 7) + (this.field2791[var3] & -16257); + this.field2815[var3] = (var5 << 7) + (this.field2815[var3] & -16257); } if (var4 == 43) { - this.field2791[var3] = var5 + (this.field2791[var3] & -128); + this.field2815[var3] = var5 + (this.field2815[var3] & -128); } int[] var10000; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field2790; + var10000 = this.field2812; var10000[var3] |= 1; } else { - var10000 = this.field2790; + var10000 = this.field2812; var10000[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field2790; + var10000 = this.field2812; var10000[var3] |= 2; } else { - this.method1652(var3); - var10000 = this.field2790; + this.method1684(var3); + var10000 = this.field2812; var10000[var3] &= -3; } } if (var4 == 99) { - this.field2795[var3] = (var5 << 7) + (this.field2795[var3] & 127); + this.field2822[var3] = (var5 << 7) + (this.field2822[var3] & 127); } if (var4 == 98) { - this.field2795[var3] = (this.field2795[var3] & 16256) + var5; + this.field2822[var3] = (this.field2822[var3] & 16256) + var5; } if (var4 == 101) { - this.field2795[var3] = (var5 << 7) + (this.field2795[var3] & 127) + 16384; + this.field2822[var3] = (var5 << 7) + (this.field2822[var3] & 127) + 16384; } if (var4 == 100) { - this.field2795[var3] = (this.field2795[var3] & 16256) + var5 + 16384; + this.field2822[var3] = (this.field2822[var3] & 16256) + var5 + 16384; } if (var4 == 120) { - this.method1647(var3); + this.method1680(var3); } if (var4 == 121) { - this.method1648(var3); + this.method1681(var3); } if (var4 == 123) { - this.method1649(var3); + this.method1682(var3); } int var6; if (var4 == 6) { - var6 = this.field2795[var3]; + var6 = this.field2822[var3]; if (var6 == 16384) { - this.field2799[var3] = (var5 << 7) + (this.field2799[var3] & -16257); + this.field2818[var3] = (var5 << 7) + (this.field2818[var3] & -16257); } } if (var4 == 38) { - var6 = this.field2795[var3]; + var6 = this.field2822[var3]; if (var6 == 16384) { - this.field2799[var3] = var5 + (this.field2799[var3] & -128); + this.field2818[var3] = var5 + (this.field2818[var3] & -128); } } if (var4 == 16) { - this.field2792[var3] = (var5 << 7) + (this.field2792[var3] & -16257); + this.field2824[var3] = (var5 << 7) + (this.field2824[var3] & -16257); } if (var4 == 48) { - this.field2792[var3] = var5 + (this.field2792[var3] & -128); + this.field2824[var3] = var5 + (this.field2824[var3] & -128); } if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field2790; + var10000 = this.field2812; var10000[var3] |= 4; } else { - this.method1653(var3); - var10000 = this.field2790; + this.method1685(var3); + var10000 = this.field2812; var10000[var3] &= -5; } } if (var4 == 17) { - this.method1655(var3, (var5 << 7) + (this.field2797[var3] & -16257)); + this.method1687(var3, (var5 << 7) + (this.field2820[var3] & -16257)); } if (var4 == 49) { - this.method1655(var3, var5 + (this.field2797[var3] & -128)); + this.method1687(var3, var5 + (this.field2820[var3] & -128)); } } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method1640(var3, var4 + this.field2786[var3]); + this.method1673(var3, var4 + this.field2816[var3]); } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method1645(var3, var4); + this.method1678(var3, var4); } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method1646(var3, var4); + this.method1679(var3, var4); } else { var2 = var1 & 255; if (var2 == 255) { - this.method1650(); + this.method1683(); } } } @@ -865,106 +857,106 @@ void method1654(int var1) { @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "943957578" + garbageValue = "-1065588896" ) - void method1655(int var1, int var2) { - this.field2797[var1] = var2; - this.field2798[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); + void method1687(int var1, int var2) { + this.field2820[var1] = var2; + this.field2813[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); } - @ObfuscatedName("be") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(Lmg;B)I", - garbageValue = "-57" + descriptor = "(Lms;S)I", + garbageValue = "2001" ) - int method1656(MusicPatchNode var1) { - int var2 = (var1.field2843 * var1.field2844 >> 12) + var1.field2840; - var2 += (this.field2789[var1.field2854] - 8192) * this.field2799[var1.field2854] >> 12; - MusicPatchNode2 var3 = var1.field2857; + int method1688(MusicPatchNode var1) { + int var2 = (var1.field2878 * var1.field2867 >> 12) + var1.field2870; + var2 += (this.field2821[var1.field2865] - 8192) * this.field2818[var1.field2865] >> 12; + MusicPatchNode2 var3 = var1.field2881; int var4; - if (var3.field2763 > 0 && (var3.field2765 > 0 || this.field2788[var1.field2854] > 0)) { - var4 = var3.field2765 << 2; - int var5 = var3.field2759 << 1; - if (var1.field2845 < var5) { - var4 = var4 * var1.field2845 / var5; + if (var3.field2781 > 0 && (var3.field2786 > 0 || this.field2814[var1.field2865] > 0)) { + var4 = var3.field2786 << 2; + int var5 = var3.field2784 << 1; + if (var1.field2871 < var5) { + var4 = var4 * var1.field2871 / var5; } - var4 += this.field2788[var1.field2854] >> 7; - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2849 & 511)); + var4 += this.field2814[var1.field2865] >> 7; + double var6 = Math.sin((double)(var1.field2877 & 511) * 0.01227184630308513D); var2 += (int)((double)var4 * var6); } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field181 + 0.5D); + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)PcmPlayer.field179 + 0.5D); return var4 < 1 ? 1 : var4; } - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(Lmg;I)I", - garbageValue = "-1224155709" + descriptor = "(Lms;B)I", + garbageValue = "59" ) - int method1657(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2857; - int var3 = this.field2796[var1.field2854] * this.field2791[var1.field2854] + 4096 >> 13; + int method1689(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2881; + int var3 = this.field2815[var1.field2865] * this.field2823[var1.field2865] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2856 + 16384 >> 15; - var3 = var3 * this.field2782 + 128 >> 8; - if (var2.field2762 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2852 * (double)var2.field2762) + 0.5D); + var3 = var3 * var1.field2875 + 16384 >> 15; + var3 = var3 * this.field2807 + 128 >> 8; + if (var2.field2783 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2783 * (double)var1.field2863 * 1.953125E-5D) + 0.5D); } int var4; int var5; int var6; int var7; - if (var2.field2758 != null) { - var4 = var1.field2848; - var5 = var2.field2758[var1.field2850 + 1]; - if (var1.field2850 < var2.field2758.length - 2) { - var6 = (var2.field2758[var1.field2850] & 255) << 8; - var7 = (var2.field2758[var1.field2850 + 2] & 255) << 8; - var5 += (var2.field2758[var1.field2850 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var2.field2779 != null) { + var4 = var1.field2873; + var5 = var2.field2779[var1.field2879 + 1]; + if (var1.field2879 < var2.field2779.length - 2) { + var6 = (var2.field2779[var1.field2879] & 255) << 8; + var7 = (var2.field2779[var1.field2879 + 2] & 255) << 8; + var5 += (var4 - var6) * (var2.field2779[var1.field2879 + 3] - var5) / (var7 - var6); } var3 = var5 * var3 + 32 >> 6; } - if (var1.field2853 > 0 && var2.field2757 != null) { - var4 = var1.field2853; - var5 = var2.field2757[var1.field2841 + 1]; - if (var1.field2841 < var2.field2757.length - 2) { - var6 = (var2.field2757[var1.field2841] & 255) << 8; - var7 = (var2.field2757[var1.field2841 + 2] & 255) << 8; - var5 += (var2.field2757[var1.field2841 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var1.field2876 > 0 && var2.field2780 != null) { + var4 = var1.field2876; + var5 = var2.field2780[var1.field2869 + 1]; + if (var1.field2869 < var2.field2780.length - 2) { + var6 = (var2.field2780[var1.field2869] & 255) << 8; + var7 = (var2.field2780[var1.field2869 + 2] & 255) << 8; + var5 += (var2.field2780[var1.field2869 + 3] - var5) * (var4 - var6) / (var7 - var6); } - var3 = var3 * var5 + 32 >> 6; + var3 = var5 * var3 + 32 >> 6; } return var3; } - @ObfuscatedName("bz") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(Lmg;I)I", - garbageValue = "-1781769455" + descriptor = "(Lms;B)I", + garbageValue = "2" ) - int method1658(MusicPatchNode var1) { - int var2 = this.field2787[var1.field2854]; - return var2 < 8192 ? var2 * var1.field2851 + 32 >> 6 : 16384 - ((128 - var1.field2851) * (16384 - var2) + 32 >> 6); + int method1690(MusicPatchNode var1) { + int var2 = this.field2817[var1.field2865]; + return var2 < 8192 ? var2 * var1.field2864 + 32 >> 6 : 16384 - ((128 - var1.field2864) * (16384 - var2) + 32 >> 6); } - @ObfuscatedName("bx") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-25" + descriptor = "(I)V", + garbageValue = "-2129137394" ) - void method1664() { + void method1696() { int var1 = this.track; int var2 = this.trackLength; long var3; - for (var3 = this.field2803; var2 == this.trackLength; var3 = this.midiFile.method1678(var2)) { + for (var3 = this.field2826; var2 == this.trackLength; var3 = this.midiFile.method1710(var2)) { while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); @@ -972,8 +964,8 @@ void method1664() { this.midiFile.setTrackDone(); this.midiFile.markTrackPosition(var1); if (this.midiFile.isDone()) { - if (!this.field2781 || var2 == 0) { - this.method1650(); + if (!this.field2805 || var2 == 0) { + this.method1683(); this.midiFile.clear(); return; } @@ -984,7 +976,7 @@ void method1664() { } if ((var5 & 128) != 0) { - this.method1654(var5); + this.method1686(var5); } this.midiFile.readTrackLength(var1); @@ -997,20 +989,20 @@ void method1664() { this.track = var1; this.trackLength = var2; - this.field2803 = var3; + this.field2826 = var3; } - @ObfuscatedName("bn") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(Lmg;I)Z", - garbageValue = "845643756" + descriptor = "(Lms;B)Z", + garbageValue = "-28" ) - boolean method1665(MusicPatchNode var1) { + boolean method1697(MusicPatchNode var1) { if (var1.stream == null) { - if (var1.field2853 >= 0) { + if (var1.field2876 >= 0) { var1.remove(); - if (var1.field2842 > 0 && var1 == this.field2806[var1.field2854][var1.field2842]) { - this.field2806[var1.field2854][var1.field2842] = null; + if (var1.field2872 > 0 && var1 == this.field2831[var1.field2865][var1.field2872]) { + this.field2831[var1.field2865][var1.field2872] = null; } } @@ -1022,141 +1014,101 @@ boolean method1665(MusicPatchNode var1) { @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(Lmg;[IIII)Z", - garbageValue = "1875808849" + descriptor = "(Lms;[IIIS)Z", + garbageValue = "27530" ) - boolean method1666(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2846 = PcmPlayer.field181 / 100; - if (var1.field2853 < 0 || var1.stream != null && !var1.stream.method251()) { - int var5 = var1.field2843; + boolean method1698(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2866 = PcmPlayer.field179 / 100; + if (var1.field2876 < 0 || var1.stream != null && !var1.stream.method260()) { + int var5 = var1.field2867; if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2794[var1.field2854]) + 0.5D); + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2810[var1.field2865] * 4.921259842519685E-4D) + 0.5D); if (var5 < 0) { var5 = 0; } - var1.field2843 = var5; + var1.field2867 = var5; } - var1.stream.method249(this.method1656(var1)); - MusicPatchNode2 var6 = var1.field2857; + var1.stream.method258(this.method1688(var1)); + MusicPatchNode2 var6 = var1.field2881; boolean var7 = false; - ++var1.field2845; - var1.field2849 += var6.field2763; - double var8 = 5.086263020833333E-6D * (double)((var1.field2847 - 60 << 8) + (var1.field2844 * var1.field2843 >> 12)); - if (var6.field2762 > 0) { - if (var6.field2761 > 0) { - var1.field2852 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2761 * var8) + 0.5D); + ++var1.field2871; + var1.field2877 += var6.field2781; + double var8 = (double)((var1.field2868 - 60 << 8) + (var1.field2878 * var1.field2867 >> 12)) * 5.086263020833333E-6D; + if (var6.field2783 > 0) { + if (var6.field2782 > 0) { + var1.field2863 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2782 * var8) + 0.5D); } else { - var1.field2852 += 128; + var1.field2863 += 128; } } - if (var6.field2758 != null) { - if (var6.field2764 > 0) { - var1.field2848 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2764) + 0.5D); + if (var6.field2779 != null) { + if (var6.field2787 > 0) { + var1.field2873 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2787 * var8) + 0.5D); } else { - var1.field2848 += 128; + var1.field2873 += 128; } - while (var1.field2850 < var6.field2758.length - 2 && var1.field2848 > (var6.field2758[var1.field2850 + 2] & 255) << 8) { - var1.field2850 += 2; + while (var1.field2879 < var6.field2779.length - 2 && var1.field2873 > (var6.field2779[var1.field2879 + 2] & 255) << 8) { + var1.field2879 += 2; } - if (var6.field2758.length - 2 == var1.field2850 && var6.field2758[var1.field2850 + 1] == 0) { + if (var6.field2779.length - 2 == var1.field2879 && var6.field2779[var1.field2879 + 1] == 0) { var7 = true; } } - if (var1.field2853 >= 0 && var6.field2757 != null && (this.field2790[var1.field2854] & 1) == 0 && (var1.field2842 < 0 || var1 != this.field2806[var1.field2854][var1.field2842])) { - if (var6.field2760 > 0) { - var1.field2853 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2760) + 0.5D); + if (var1.field2876 >= 0 && var6.field2780 != null && (this.field2812[var1.field2865] & 1) == 0 && (var1.field2872 < 0 || var1 != this.field2831[var1.field2865][var1.field2872])) { + if (var6.field2785 > 0) { + var1.field2876 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2785 * var8) + 0.5D); } else { - var1.field2853 += 128; + var1.field2876 += 128; } - while (var1.field2841 < var6.field2757.length - 2 && var1.field2853 > (var6.field2757[var1.field2841 + 2] & 255) << 8) { - var1.field2841 += 2; + while (var1.field2869 < var6.field2780.length - 2 && var1.field2876 > (var6.field2780[var1.field2869 + 2] & 255) << 8) { + var1.field2869 += 2; } - if (var6.field2757.length - 2 == var1.field2841) { + if (var6.field2780.length - 2 == var1.field2869) { var7 = true; } } if (var7) { - var1.stream.method248(var1.field2846); + var1.stream.method257(var1.field2866); if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); } - if (var1.stream.method252()) { + if (var1.stream.method261()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method1696(); - if (var1.field2853 >= 0) { + var1.method1727(); + if (var1.field2876 >= 0) { var1.remove(); - if (var1.field2842 > 0 && var1 == this.field2806[var1.field2854][var1.field2842]) { - this.field2806[var1.field2854][var1.field2842] = null; + if (var1.field2872 > 0 && var1 == this.field2831[var1.field2865][var1.field2872]) { + this.field2831[var1.field2865][var1.field2872] = null; } } return true; } else { - var1.stream.method247(var1.field2846, this.method1657(var1), this.method1658(var1)); + var1.stream.method256(var1.field2866, this.method1689(var1), this.method1690(var1)); return false; } } else { - var1.method1696(); + var1.method1727(); var1.remove(); - if (var1.field2842 > 0 && var1 == this.field2806[var1.field2854][var1.field2842]) { - this.field2806[var1.field2854][var1.field2842] = null; + if (var1.field2872 > 0 && var1 == this.field2831[var1.field2865][var1.field2872]) { + this.field2831[var1.field2865][var1.field2872] = null; } return true; } } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)[Lnn;", - garbageValue = "1169137618" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.field3487, PlayerType.PlayerType_ultimateIronman, PlayerType.field3493, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_playerModerator, PlayerType.field3496, PlayerType.field3489, PlayerType.PlayerType_ironman, PlayerType.PlayerType_normal, PlayerType.field3490, PlayerType.field3485, PlayerType.field3497, PlayerType.PlayerType_hardcoreIronman, PlayerType.field3492, PlayerType.field3500, PlayerType.field3495, PlayerType.field3484}; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)[Lum;", - garbageValue = "37" - ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field4230, FillMode.field4231, FillMode.SOLID}; - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(II)Ljt;", - garbageValue = "2017214624" - ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; - } else { - var1 = ArchiveLoader.method464(VarpDefinition.SequenceDefinition_animationsArchive, class485.SequenceDefinition_skeletonsArchive, var0, false); - if (var1 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); - } - - return var1; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/MilliClock.java b/osrs/src/main/java/MilliClock.java index b45957e20..a4509e141 100644 --- a/osrs/src/main/java/MilliClock.java +++ b/osrs/src/main/java/MilliClock.java @@ -3,102 +3,111 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("go") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("au") - long[] field1484; - @ObfuscatedName("ae") - int field1480; - @ObfuscatedName("ao") - int field1482; - @ObfuscatedName("at") - long field1483; @ObfuscatedName("ac") - int field1479; - @ObfuscatedName("ai") - int field1481; + long[] field1475; + @ObfuscatedName("al") + int field1472; + @ObfuscatedName("ak") + int field1471; + @ObfuscatedName("ax") + long field1474; + @ObfuscatedName("ao") + int field1473; + @ObfuscatedName("ah") + int field1470; - public MilliClock() { - this.field1484 = new long[10]; - this.field1480 = 256; - this.field1482 = 1; - this.field1479 = 0; - this.field1483 = GameEngine.clockNow(); + MilliClock() { + this.field1475 = new long[10]; + this.field1472 = 256; + this.field1471 = 1; + this.field1473 = 0; + this.field1474 = GrandExchangeOfferTotalQuantityComparator.method1971(); for (int var1 = 0; var1 < 10; ++var1) { - this.field1484[var1] = this.field1483; + this.field1475[var1] = this.field1474; } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1021685028" + garbageValue = "436321701" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { - this.field1484[var1] = 0L; + this.field1475[var1] = 0L; } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "20" + descriptor = "(III)I", + garbageValue = "712947185" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1480; - int var4 = this.field1482; - this.field1480 = 300; - this.field1482 = 1; - this.field1483 = GameEngine.clockNow(); - if (0L == this.field1484[this.field1481]) { - this.field1480 = var3; - this.field1482 = var4; - } else if (this.field1483 > this.field1484[this.field1481]) { - this.field1480 = (int)((long)(var1 * 2560) / (this.field1483 - this.field1484[this.field1481])); + int var3 = this.field1472; + int var4 = this.field1471; + this.field1472 = 300; + this.field1471 = 1; + this.field1474 = GrandExchangeOfferTotalQuantityComparator.method1971(); + if (this.field1475[this.field1470] == 0L) { + this.field1472 = var3; + this.field1471 = var4; + } else if (this.field1474 > this.field1475[this.field1470]) { + this.field1472 = (int)((long)(var1 * 2560) / (this.field1474 - this.field1475[this.field1470])); } - if (this.field1480 < 25) { - this.field1480 = 25; + if (this.field1472 < 25) { + this.field1472 = 25; } - if (this.field1480 > 256) { - this.field1480 = 256; - this.field1482 = (int)((long)var1 - (this.field1483 - this.field1484[this.field1481]) / 10L); + if (this.field1472 > 256) { + this.field1472 = 256; + this.field1471 = (int)((long)var1 - (this.field1474 - this.field1475[this.field1470]) / 10L); } - if (this.field1482 > var1) { - this.field1482 = var1; + if (this.field1471 > var1) { + this.field1471 = var1; } - this.field1484[this.field1481] = this.field1483; - this.field1481 = (this.field1481 + 1) % 10; + this.field1475[this.field1470] = this.field1474; + this.field1470 = (this.field1470 + 1) % 10; int var5; - if (this.field1482 > 1) { + if (this.field1471 > 1) { for (var5 = 0; var5 < 10; ++var5) { - if (0L != this.field1484[var5]) { - this.field1484[var5] += (long)this.field1482; + if (this.field1475[var5] != 0L) { + this.field1475[var5] += (long)this.field1471; } } } - if (this.field1482 < var2) { - this.field1482 = var2; + if (this.field1471 < var2) { + this.field1471 = var2; } - PendingSpawn.method505((long)this.field1482); + Players.method623((long)this.field1471); - for (var5 = 0; this.field1479 < 256; this.field1479 += this.field1480) { + for (var5 = 0; this.field1473 < 256; this.field1473 += this.field1472) { ++var5; } - this.field1479 &= 255; + this.field1473 &= 255; return var5; } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;I)V", + garbageValue = "2111970758" + ) + public static void method935(AbstractArchive var0) { + DbTableType.field4138 = var0; + } } \ No newline at end of file diff --git a/osrs/src/main/java/ModeWhere.java b/osrs/src/main/java/ModeWhere.java index 41cfe09f6..f2b5e583b 100644 --- a/osrs/src/main/java/ModeWhere.java +++ b/osrs/src/main/java/ModeWhere.java @@ -6,252 +6,166 @@ import java.util.HashSet; import java.util.Set; -@ObfuscatedName("oe") +@ObfuscatedName("or") @Implements("ModeWhere") -public enum ModeWhere implements class371 { - @ObfuscatedName("au") +public enum ModeWhere implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3626("", 0, new class370[]{class370.field3597, class370.field3598}), - @ObfuscatedName("ae") + field3654("", 0, new class385[]{class385.field3638, class385.field3635}), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3618("", 1, new class370[]{class370.field3596, class370.field3597, class370.field3598}), - @ObfuscatedName("ao") + field3658("", 1, new class385[]{class385.field3636, class385.field3638, class385.field3635}), + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3622("", 2, new class370[]{class370.field3596, class370.field3595, class370.field3597}), - @ObfuscatedName("at") + field3657("", 2, new class385[]{class385.field3636, class385.field3637, class385.field3638}), + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3625("", 3, new class370[]{class370.field3596}), - @ObfuscatedName("ac") + field3664("", 3, new class385[]{class385.field3636}), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3616("", 4), - @ObfuscatedName("ai") + field3660("", 4), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3620("", 5, new class370[]{class370.field3596, class370.field3597}), - @ObfuscatedName("az") + field3656("", 5, new class385[]{class385.field3636, class385.field3638}), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3627("", 6, new class370[]{class370.field3597}), - @ObfuscatedName("ap") + field3662("", 6, new class385[]{class385.field3638}), + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3623("", 8, new class370[]{class370.field3596, class370.field3597}), - @ObfuscatedName("aa") + field3653("", 8, new class385[]{class385.field3636, class385.field3638}), + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3615("", 9, new class370[]{class370.field3596, class370.field3595}), - @ObfuscatedName("af") + field3659("", 9, new class385[]{class385.field3636, class385.field3637}), + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3619("", 10, new class370[]{class370.field3596}), - @ObfuscatedName("ad") + field3663("", 10, new class385[]{class385.field3636}), + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3617("", 11, new class370[]{class370.field3596}), - @ObfuscatedName("aq") + field3655("", 11, new class385[]{class385.field3636}), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3624("", 12, new class370[]{class370.field3596, class370.field3597}), - @ObfuscatedName("al") + field3652("", 12, new class385[]{class385.field3636, class385.field3638}), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lor;" ) - field3621("", 13, new class370[]{class370.field3596}); + field3661("", 13, new class385[]{class385.field3636}); - @ObfuscatedName("dc") - static boolean field3613; - @ObfuscatedName("oo") - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("id") final int id; - @ObfuscatedName("ar") - final Set field3629; + @ObfuscatedName("as") + final Set field3666; static { - $values(); + $values$(); } @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Log;)V" + descriptor = "(Ljava/lang/String;I[Loi;)V" ) - ModeWhere(String var3, int var4, class370[] var5) { - this.field3629 = new HashSet(); + ModeWhere(String var3, int var4, class385[] var5) { + this.field3666 = new HashSet(); this.id = var4; - class370[] var6 = var5; + class385[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { - class370 var8 = var6[var7]; - this.field3629.add(var8); + class385 var8 = var6[var7]; + this.field3666.add(var8); } } ModeWhere(String var3, int var4) { - this.field3629 = new HashSet(); + this.field3666 = new HashSet(); this.id = var4; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)[Loe;", - garbageValue = "-1302821718" + descriptor = "(III)I", + garbageValue = "-1022385277" ) - @Export("$values") - static ModeWhere[] $values() { - return new ModeWhere[]{field3617, field3621, field3616, field3615, field3623, field3625, field3619, field3624, field3620, field3618, field3627, field3622, field3626}; - } + public static int method2011(int var0, int var1) { + int var2; + if (var1 > var0) { + var2 = var0; + var0 = var1; + var1 = var2; + } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1598349673" - ) - public static void method1978(AbstractArchive var0) { - class13.InvDefinition_archive = var0; + while (var1 != 0) { + var2 = var0 % var1; + var0 = var1; + var1 = var2; + } + + return var0; } - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "1" + descriptor = "(B)[Lor;", + garbageValue = "28" ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (class316.Widget_loadedInterfaces[var0]) { - return true; - } else if (!Decimator.Widget_archive.tryLoadGroup(var0)) { - return false; - } else { - int var1 = Decimator.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - class316.Widget_loadedInterfaces[var0] = true; - return true; - } else { - if (PacketBufferNode.Widget_interfaceComponents[var0] == null) { - PacketBufferNode.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { - if (PacketBufferNode.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = Decimator.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - PacketBufferNode.Widget_interfaceComponents[var0][var2] = new Widget(); - PacketBufferNode.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - PacketBufferNode.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - PacketBufferNode.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } - } - } - } - - class316.Widget_loadedInterfaces[var0] = true; - return true; - } - } + @Export("$values$") + static ModeWhere[] $values$() { + return new ModeWhere[]{field3652, field3653, field3658, field3660, field3657, field3659, field3664, field3655, field3663, field3662, field3661, field3654, field3656}; } - @ObfuscatedName("ao") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "(III)Ldh;", - garbageValue = "-305798584" + descriptor = "(Lif;IIIS)V", + garbageValue = "-16278" ) - static Script method1981(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); - if (var2 != null) { - return var2; - } else { - String var3 = String.valueOf(var0); - int var4 = GrandExchangeOffer.archive12.getGroupId(var3); - if (var4 == -1) { - return null; - } else { - byte[] var5 = GrandExchangeOffer.archive12.takeFileFlat(var4); - if (var5 != null) { - if (var5.length <= 1) { - return null; - } - - var2 = HitSplatDefinition.newScript(var5); - if (var2 != null) { - Script.Script_cached.put(var2, (long)(var0 << 16)); - return var2; - } - } - - return null; + static void method2013(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class91.clientPreferences.getAreaSoundEffectsVolume() != 0) { + if (var0.animMayaFrameSounds != null && var0.animMayaFrameSounds.containsKey(var1)) { + class91.method482((Integer)var0.animMayaFrameSounds.get(var1), var2, var3); } } } - @ObfuscatedName("ag") + @ObfuscatedName("jv") @ObfuscatedSignature( - descriptor = "(Lch;I)V", - garbageValue = "516890386" + descriptor = "(I)Z", + garbageValue = "-2030592343" ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - boolean var1 = var0.isMembersOnly(); - if (var1 != ItemComposition.ItemDefinition_inMembersWorld) { - ItemComposition.ItemDefinition_cached.clear(); - ItemComposition.ItemDefinition_cachedModels.clear(); - ItemComposition.ItemDefinition_cachedSprites.clear(); - ItemComposition.ItemDefinition_inMembersWorld = var1; - } - } - - if (var0.properties != Client.worldProperties) { - Archive var3 = PcmPlayer.archive8; - int var2 = var0.properties; - if ((var2 & class510.field4132.rsOrdinal()) != 0) { - SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var3, "logo_deadman_mode", ""); - } else if ((var2 & class510.field4131.rsOrdinal()) != 0) { - SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var3, "logo_seasonal_mode", ""); - } else if ((var2 & class510.field4122.rsOrdinal()) != 0) { - SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var3, "logo_speedrunning", ""); - } else { - SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var3, "logo", ""); - } - } - - class292.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - class30.field83 = var0.field679; - class480.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - class129.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; - class4.currentPort = class480.worldPort; + static boolean method2014() { + return (Client.drawPlayerNames & 1) != 0; } } \ No newline at end of file diff --git a/osrs/src/main/java/Model.java b/osrs/src/main/java/Model.java index a5a5e0b51..cb28a0d30 100644 --- a/osrs/src/main/java/Model.java +++ b/osrs/src/main/java/Model.java @@ -6,246 +6,246 @@ import java.util.Arrays; import java.util.HashMap; -@ObfuscatedName("jr") +@ObfuscatedName("jn") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Ljn;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Ljn;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lrz;" + descriptor = "Lrb;" ) - static class450 field2204; - @ObfuscatedName("ai") + static class465 field2217; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lrz;" + descriptor = "Lrb;" ) - static class450 field2205; - @ObfuscatedName("az") + static class465 field2216; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lrz;" + descriptor = "Lrb;" ) - static class450 field2206; - @ObfuscatedName("bp") - static boolean[] field2173; - @ObfuscatedName("bu") - static boolean[] field2174; - @ObfuscatedName("bo") + static class465 field2218; + @ObfuscatedName("br") + static boolean[] field2185; + @ObfuscatedName("bs") + static boolean[] field2186; + @ObfuscatedName("bc") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("br") - static float[] field2179; - @ObfuscatedName("be") - static int[] field2185; - @ObfuscatedName("bi") - static int[] field2187; - @ObfuscatedName("bz") - static int[] field2190; - @ObfuscatedName("bx") - static int[] field2189; - @ObfuscatedName("bw") - static char[] field2177; - @ObfuscatedName("bc") - static char[][] field2178; - @ObfuscatedName("bg") - static int[] field2186; - @ObfuscatedName("cw") - static int[][] field2201; - @ObfuscatedName("cf") - static int[] field2192; - @ObfuscatedName("cm") - static int[] field2195; - @ObfuscatedName("cn") - static int[] field2196; - @ObfuscatedName("cs") + @ObfuscatedName("bf") + static float[] field2191; + @ObfuscatedName("bh") static int[] field2198; - @ObfuscatedName("cx") + @ObfuscatedName("bl") static int[] field2200; - @ObfuscatedName("cr") + @ObfuscatedName("bg") static int[] field2197; - @ObfuscatedName("cd") - static float[] field2180; + @ObfuscatedName("bj") + static int[] field2199; + @ObfuscatedName("bi") + static char[] field2189; + @ObfuscatedName("bq") + static char[][] field2190; + @ObfuscatedName("bw") + static int[] field2202; @ObfuscatedName("ce") + static int[][] field2213; + @ObfuscatedName("cu") + static int[] field2210; + @ObfuscatedName("cw") + static int[] field2212; + @ObfuscatedName("co") + static int[] field2207; + @ObfuscatedName("cc") + static int[] field2203; + @ObfuscatedName("cg") + static int[] field2204; + @ObfuscatedName("cq") + static int[] field2208; + @ObfuscatedName("cy") + static float[] field2192; + @ObfuscatedName("cz") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("cq") + @ObfuscatedName("cp") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("cp") + @ObfuscatedName("cb") @Export("Model_transformTempZ") static int Model_transformTempZ; + @ObfuscatedName("cn") + static boolean field2184; + @ObfuscatedName("cs") + static int[] field2209; + @ObfuscatedName("cm") + static int[] field2206; @ObfuscatedName("cv") - static boolean field2172; - @ObfuscatedName("cu") - static int[] field2199; - @ObfuscatedName("ch") - static int[] field2193; + static int[] field2211; @ObfuscatedName("ci") - static int[] field2194; - @ObfuscatedName("ca") - static int[] field2191; - @ObfuscatedName("cj") - static final float field2207; - @ObfuscatedName("ap") + static int[] field2205; + @ObfuscatedName("ch") + static final float field2219; + @ObfuscatedName("ab") @Export("verticesCount") public int verticesCount; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("verticesX") int[] verticesX; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("verticesY") int[] verticesY; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("indicesCount") public int indicesCount; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("indices1") int[] indices1; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("indices2") int[] indices2; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("indices3") int[] indices3; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("as") - byte[] field2209; - @ObfuscatedName("ay") + @ObfuscatedName("aw") + byte[] field2222; + @ObfuscatedName("aq") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("aj") - public byte field2235; - @ObfuscatedName("av") - public int field2242; - @ObfuscatedName("aw") - int[] field2226; - @ObfuscatedName("ak") - int[] field2221; - @ObfuscatedName("bh") - int[] field2227; - @ObfuscatedName("bj") + @ObfuscatedName("az") + public byte field2247; + @ObfuscatedName("at") + public int field2254; + @ObfuscatedName("af") + int[] field2229; + @ObfuscatedName("ad") + int[] field2228; + @ObfuscatedName("bn") + int[] field2239; + @ObfuscatedName("bk") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("bv") - int[][] field2231; - @ObfuscatedName("bt") - int[][] field2230; @ObfuscatedName("bd") + int[][] field2240; + @ObfuscatedName("be") + int[][] field2241; + @ObfuscatedName("bv") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("by") + @ObfuscatedName("ba") @Export("boundsType") int boundsType; - @ObfuscatedName("bs") + @ObfuscatedName("bz") @Export("bottomY") int bottomY; - @ObfuscatedName("bm") + @ObfuscatedName("bb") @Export("xzRadius") int xzRadius; - @ObfuscatedName("bf") + @ObfuscatedName("bo") @Export("diameter") int diameter; - @ObfuscatedName("bq") + @ObfuscatedName("bp") @Export("radius") int radius; - @ObfuscatedName("ba") + @ObfuscatedName("bt") @Export("aabb") HashMap aabb; - @ObfuscatedName("cz") + @ObfuscatedName("cd") @Export("overrideHue") public byte overrideHue; @ObfuscatedName("ct") @Export("overrideSaturation") public byte overrideSaturation; - @ObfuscatedName("cy") + @ObfuscatedName("cf") @Export("overrideLuminance") public byte overrideLuminance; - @ObfuscatedName("ck") + @ObfuscatedName("cl") @Export("overrideAmount") public byte overrideAmount; - @ObfuscatedName("cc") - public short field2243; + @ObfuscatedName("ca") + public short field2255; static { Model_sharedSequenceModel = new Model(); Model_sharedSequenceModelFaceAlphas = new byte[1]; Model_sharedSpotAnimationModel = new Model(); Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; - field2204 = new class450(); - field2205 = new class450(); - field2206 = new class450(); - field2173 = new boolean[6500]; - field2174 = new boolean[6500]; + field2217 = new class465(); + field2216 = new class465(); + field2218 = new class465(); + field2185 = new boolean[6500]; + field2186 = new boolean[6500]; modelViewportXs = new int[6500]; modelViewportYs = new int[6500]; - field2179 = new float[6500]; - field2185 = new int[6500]; - field2187 = new int[6500]; - field2190 = new int[6500]; - field2189 = new int[6500]; - field2177 = new char[6000]; - field2178 = new char[6000][512]; - field2186 = new int[12]; - field2201 = new int[12][2000]; - field2192 = new int[2000]; - field2195 = new int[2000]; - field2196 = new int[12]; - field2198 = new int[10]; - field2200 = new int[10]; - field2197 = new int[10]; - field2180 = new float[10]; - field2172 = true; - field2199 = Rasterizer3D.Rasterizer3D_sine; - field2193 = Rasterizer3D.Rasterizer3D_cosine; - field2194 = Rasterizer3D.Rasterizer3D_colorPalette; - field2191 = Rasterizer3D.field2037; - field2207 = AbstractWorldMapIcon.method1556(50); + field2191 = new float[6500]; + field2198 = new int[6500]; + field2200 = new int[6500]; + field2197 = new int[6500]; + field2199 = new int[6500]; + field2189 = new char[6000]; + field2190 = new char[6000][512]; + field2202 = new int[12]; + field2213 = new int[12][2000]; + field2210 = new int[2000]; + field2212 = new int[2000]; + field2207 = new int[12]; + field2203 = new int[10]; + field2204 = new int[10]; + field2208 = new int[10]; + field2192 = new float[10]; + field2184 = true; + field2209 = Rasterizer3D.Rasterizer3D_sine; + field2206 = Rasterizer3D.Rasterizer3D_cosine; + field2211 = Rasterizer3D.Rasterizer3D_colorPalette; + field2205 = Rasterizer3D.field2047; + field2219 = SecureRandomFuture.method443(50); } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2235 = 0; - this.field2242 = 0; + this.field2247 = 0; + this.field2254 = 0; this.isSingleTile = false; this.aabb = new HashMap(); } @@ -253,31 +253,31 @@ public class Model extends Renderable { public Model(int var1, int var2, int var3, byte var4) { this.verticesCount = 0; this.indicesCount = 0; - this.field2235 = 0; - this.field2242 = 0; + this.field2247 = 0; + this.field2254 = 0; this.isSingleTile = false; this.aabb = new HashMap(); - this.method1312(var1, var2, var3); - this.field2235 = var4; + this.method1353(var1, var2, var3); + this.field2247 = var4; this.verticesCount = 0; this.indicesCount = 0; - this.field2242 = 0; + this.field2254 = 0; } @ObfuscatedSignature( - descriptor = "([Ljr;I)V" + descriptor = "([Ljn;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; - this.field2235 = 0; - this.field2242 = 0; + this.field2247 = 0; + this.field2254 = 0; this.isSingleTile = false; this.aabb = new HashMap(); this.verticesCount = 0; this.indicesCount = 0; - this.field2242 = 0; - this.field2235 = -1; + this.field2254 = 0; + this.field2247 = -1; int var3; for (var3 = 0; var3 < var2; ++var3) { @@ -285,26 +285,26 @@ public Model(Model[] var1, int var2) { if (var4 != null) { this.verticesCount += var4.verticesCount; this.indicesCount += var4.indicesCount; - this.field2242 += var4.field2242; - if (this.field2235 == -1) { - this.field2235 = var4.field2235; + this.field2254 += var4.field2254; + if (this.field2247 == -1) { + this.field2247 = var4.field2247; } } } - this.method1312(this.verticesCount, this.indicesCount, this.field2242); + this.method1353(this.verticesCount, this.indicesCount, this.field2254); this.verticesCount = 0; this.indicesCount = 0; - this.field2242 = 0; + this.field2254 = 0; for (var3 = 0; var3 < var2; ++var3) { - this.method1314(var1[var3]); + this.method1355(var1[var3]); } } - @ObfuscatedName("au") - void method1312(int var1, int var2, int var3) { + @ObfuscatedName("ac") + void method1353(int var1, int var2, int var3) { this.verticesX = new int[var1]; this.verticesY = new int[var1]; this.verticesZ = new int[var1]; @@ -315,22 +315,22 @@ void method1312(int var1, int var2, int var3) { this.faceColors2 = new int[var2]; this.faceColors3 = new int[var2]; if (var3 > 0) { - this.field2226 = new int[var3]; - this.field2221 = new int[var3]; - this.field2227 = new int[var3]; + this.field2229 = new int[var3]; + this.field2228 = new int[var3]; + this.field2239 = new int[var3]; } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ljr;)V" + descriptor = "(Ljn;)V" ) - void method1313(Model var1) { + void method1354(Model var1) { int var2 = this.indices1.length; - if (this.faceRenderPriorities == null && (var1.faceRenderPriorities != null || this.field2235 != var1.field2235)) { + if (this.faceRenderPriorities == null && (var1.faceRenderPriorities != null || this.field2247 != var1.field2247)) { this.faceRenderPriorities = new byte[var2]; - Arrays.fill(this.faceRenderPriorities, this.field2235); + Arrays.fill(this.faceRenderPriorities, this.field2247); } if (this.faceAlphas == null && var1.faceAlphas != null) { @@ -343,20 +343,20 @@ void method1313(Model var1) { Arrays.fill(this.faceTextures, (short)-1); } - if (this.field2209 == null && var1.field2209 != null) { - this.field2209 = new byte[var2]; - Arrays.fill(this.field2209, (byte)-1); + if (this.field2222 == null && var1.field2222 != null) { + this.field2222 = new byte[var2]; + Arrays.fill(this.field2222, (byte)-1); } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljr;)V" + descriptor = "(Ljn;)V" ) - public void method1314(Model var1) { + public void method1355(Model var1) { if (var1 != null) { - this.method1313(var1); + this.method1354(var1); int var2; for (var2 = 0; var2 < var1.indicesCount; ++var2) { @@ -367,7 +367,7 @@ public void method1314(Model var1) { this.faceColors2[this.indicesCount] = var1.faceColors2[var2]; this.faceColors3[this.indicesCount] = var1.faceColors3[var2]; if (this.faceRenderPriorities != null) { - this.faceRenderPriorities[this.indicesCount] = var1.faceRenderPriorities != null ? var1.faceRenderPriorities[var2] : var1.field2235; + this.faceRenderPriorities[this.indicesCount] = var1.faceRenderPriorities != null ? var1.faceRenderPriorities[var2] : var1.field2247; } if (this.faceAlphas != null && var1.faceAlphas != null) { @@ -378,22 +378,22 @@ public void method1314(Model var1) { this.faceTextures[this.indicesCount] = var1.faceTextures != null ? var1.faceTextures[var2] : -1; } - if (this.field2209 != null) { - if (var1.field2209 != null && var1.field2209[var2] != -1) { - this.field2209[this.indicesCount] = (byte)(var1.field2209[var2] + this.field2242); + if (this.field2222 != null) { + if (var1.field2222 != null && var1.field2222[var2] != -1) { + this.field2222[this.indicesCount] = (byte)(var1.field2222[var2] + this.field2254); } else { - this.field2209[this.indicesCount] = -1; + this.field2222[this.indicesCount] = -1; } } ++this.indicesCount; } - for (var2 = 0; var2 < var1.field2242; ++var2) { - this.field2226[this.field2242] = this.verticesCount + var1.field2226[var2]; - this.field2221[this.field2242] = this.verticesCount + var1.field2221[var2]; - this.field2227[this.field2242] = this.verticesCount + var1.field2227[var2]; - ++this.field2242; + for (var2 = 0; var2 < var1.field2254; ++var2) { + this.field2229[this.field2254] = this.verticesCount + var1.field2229[var2]; + this.field2228[this.field2254] = this.verticesCount + var1.field2228[var2]; + this.field2239[this.field2254] = this.verticesCount + var1.field2239[var2]; + ++this.field2254; } for (var2 = 0; var2 < var1.verticesCount; ++var2) { @@ -406,9 +406,9 @@ public void method1314(Model var1) { } } - @ObfuscatedName("az") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Ljr;" + descriptor = "([[IIIIZI)Ljn;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -430,7 +430,7 @@ public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean v var11 = new Model(); var11.verticesCount = this.verticesCount; var11.indicesCount = this.indicesCount; - var11.field2242 = this.field2242; + var11.field2254 = this.field2254; var11.verticesX = this.verticesX; var11.verticesZ = this.verticesZ; var11.indices1 = this.indices1; @@ -441,12 +441,12 @@ public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean v var11.faceColors3 = this.faceColors3; var11.faceRenderPriorities = this.faceRenderPriorities; var11.faceAlphas = this.faceAlphas; - var11.field2209 = this.field2209; + var11.field2222 = this.field2222; var11.faceTextures = this.faceTextures; - var11.field2235 = this.field2235; - var11.field2226 = this.field2226; - var11.field2221 = this.field2221; - var11.field2227 = this.field2227; + var11.field2247 = this.field2247; + var11.field2229 = this.field2229; + var11.field2228 = this.field2228; + var11.field2239 = this.field2239; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; var11.isSingleTile = this.isSingleTile; @@ -504,9 +504,9 @@ public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean v } } - @ObfuscatedName("ap") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Z)Ljr;" + descriptor = "(Z)Ljn;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -517,9 +517,9 @@ public Model toSharedSequenceModel(boolean var1) { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Z)Ljr;" + descriptor = "(Z)Ljn;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -530,15 +530,15 @@ public Model toSharedSpotAnimationModel(boolean var1) { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); } - @ObfuscatedName("af") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(ZLjr;[B)Ljr;" + descriptor = "(ZLjn;[B)Ljn;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.field2242 = this.field2242; + var2.field2254 = this.field2254; if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { var2.verticesX = new int[this.verticesCount + 100]; var2.verticesY = new int[this.verticesCount + 100]; @@ -574,23 +574,23 @@ Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.faceColors2 = this.faceColors2; var2.faceColors3 = this.faceColors3; var2.faceRenderPriorities = this.faceRenderPriorities; - var2.field2209 = this.field2209; + var2.field2222 = this.field2222; var2.faceTextures = this.faceTextures; - var2.field2235 = this.field2235; - var2.field2226 = this.field2226; - var2.field2221 = this.field2221; - var2.field2227 = this.field2227; + var2.field2247 = this.field2247; + var2.field2229 = this.field2229; + var2.field2228 = this.field2228; + var2.field2239 = this.field2239; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; - var2.field2231 = this.field2231; - var2.field2230 = this.field2230; + var2.field2240 = this.field2240; + var2.field2241 = this.field2241; var2.isSingleTile = this.isSingleTile; var2.resetBounds(); var2.overrideAmount = 0; return var2; } - @ObfuscatedName("ad") + @ObfuscatedName("av") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (!this.aabb.containsKey(var1)) { @@ -600,17 +600,13 @@ void calculateBoundingBox(int var1) { int var5 = 0; int var6 = 0; int var7 = 0; - int var8 = field2193[var1]; - int var9 = field2199[var1]; + int var8 = field2206[var1]; + int var9 = field2209[var1]; for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var12 = this.verticesX[var10]; - int var13 = this.verticesZ[var10]; - int var11 = var12 * var8 + var13 * var9 >> 16; - int var15 = this.verticesY[var10]; - int var17 = this.verticesX[var10]; - int var18 = this.verticesZ[var10]; - int var16 = var18 * var8 - var9 * var17 >> 16; + int var11 = PlayerComposition.method1748(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var12 = this.verticesY[var10]; + int var13 = class74.method424(this.verticesX[var10], this.verticesZ[var10], var8, var9); if (var11 < var2) { var2 = var11; } @@ -619,44 +615,44 @@ void calculateBoundingBox(int var1) { var5 = var11; } - if (var15 < var3) { - var3 = var15; + if (var12 < var3) { + var3 = var12; } - if (var15 > var6) { - var6 = var15; + if (var12 > var6) { + var6 = var12; } - if (var16 < var4) { - var4 = var16; + if (var13 < var4) { + var4 = var13; } - if (var16 > var7) { - var7 = var16; + if (var13 > var7) { + var7 = var13; } } - AABB var20 = new AABB((var5 + var2) / 2, (var6 + var3) / 2, (var7 + var4) / 2, (var5 - var2 + 1) / 2, (var6 - var3 + 1) / 2, (var7 - var4 + 1) / 2); - boolean var21 = true; - if (var20.xMidOffset < 32) { - var20.xMidOffset = 32; + AABB var14 = new AABB((var5 + var2) / 2, (var6 + var3) / 2, (var7 + var4) / 2, (var5 - var2 + 1) / 2, (var6 - var3 + 1) / 2, (var7 - var4 + 1) / 2); + boolean var15 = true; + if (var14.xMidOffset < 32) { + var14.xMidOffset = 32; } - if (var20.zMidOffset < 32) { - var20.zMidOffset = 32; + if (var14.zMidOffset < 32) { + var14.zMidOffset = 32; } if (this.isSingleTile) { - boolean var22 = true; - var20.xMidOffset += 8; - var20.zMidOffset += 8; + boolean var16 = true; + var14.xMidOffset += 8; + var14.zMidOffset += 8; } - this.aabb.put(var1, var20); + this.aabb.put(var1, var14); } } - @ObfuscatedName("aq") + @ObfuscatedName("ag") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { @@ -689,8 +685,8 @@ public void calculateBoundsCylinder() { } } - @ObfuscatedName("al") - void method1321() { + @ObfuscatedName("aa") + void method1362() { if (this.boundsType != 2) { this.boundsType = 2; this.xzRadius = 0; @@ -711,22 +707,22 @@ void method1321() { } } - @ObfuscatedName("an") - public int method1322() { + @ObfuscatedName("ap") + public int method1363() { this.calculateBoundsCylinder(); return this.xzRadius; } - @ObfuscatedName("ar") + @ObfuscatedName("ay") @Export("resetBounds") public void resetBounds() { this.boundsType = 0; this.aabb.clear(); } - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Ljt;I)V" + descriptor = "(Lja;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -748,36 +744,36 @@ public void animate(Frames var1, int var2) { } } - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lfv;I)V" + descriptor = "(Lfk;I)V" ) - public void method1325(class137 var1, int var2) { - Skeleton var3 = var1.field1305; - class227 var4 = var3.method1231(); + public void method1366(class139 var1, int var2) { + Skeleton var3 = var1.field1298; + class241 var4 = var3.method1276(); if (var4 != null) { - var3.method1231().method1216(var1, var2); - this.method1327(var3.method1231(), var1.method747()); + var3.method1276().method1263(var1, var2); + this.method1368(var3.method1276(), var1.method739()); } - if (var1.method748()) { - this.method1326(var1, var2); + if (var1.method740()) { + this.method1367(var1, var2); } this.resetBounds(); } - @ObfuscatedName("am") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lfv;I)V" + descriptor = "(Lfk;I)V" ) - void method1326(class137 var1, int var2) { - Skeleton var3 = var1.field1305; + void method1367(class139 var1, int var2) { + Skeleton var3 = var1.field1298; for (int var4 = 0; var4 < var3.count; ++var4) { int var5 = var3.transformTypes[var4]; - if (var5 == 5 && var1.field1304 != null && var1.field1304[var4] != null && var1.field1304[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { - class130 var6 = var1.field1304[var4][0]; + if (var5 == 5 && var1.field1297 != null && var1.field1297[var4] != null && var1.field1297[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { + class132 var6 = var1.field1297[var4][0]; int[] var7 = var3.labels[var4]; int var8 = var7.length; @@ -788,7 +784,7 @@ void method1326(class137 var1, int var2) { for (int var12 = 0; var12 < var11.length; ++var12) { int var13 = var11[var12]; - int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method720(var2) * 255.0F); + int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method711(var2) * 255.0F); if (var14 < 0) { var14 = 0; } else if (var14 > 255) { @@ -804,17 +800,17 @@ void method1326(class137 var1, int var2) { } - @ObfuscatedName("ax") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lim;I)V" + descriptor = "(Ljr;I)V" ) - void method1327(class227 var1, int var2) { - this.method1347(var1, var2); + void method1368(class241 var1, int var2) { + this.method1388(var1, var2); } - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ljt;ILjt;I[I)V" + descriptor = "(Lja;ILja;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -864,30 +860,30 @@ public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { } } - @ObfuscatedName("as") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Liu;Lfv;I[ZZZ)V" + descriptor = "(Lju;Lfk;I[ZZZ)V" ) - public void method1329(Skeleton var1, class137 var2, int var3, boolean[] var4, boolean var5, boolean var6) { - class227 var7 = var1.method1231(); + public void method1370(Skeleton var1, class139 var2, int var3, boolean[] var4, boolean var5, boolean var6) { + class241 var7 = var1.method1276(); if (var7 != null) { - var7.method1217(var2, var3, var4, var5); + var7.method1264(var2, var3, var4, var5); if (var6) { - this.method1327(var7, var2.method747()); + this.method1368(var7, var2.method739()); } } - if (!var5 && var2.method748()) { - this.method1326(var2, var3); + if (!var5 && var2.method740()) { + this.method1367(var2, var3); } } - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Ljt;I[IZ)V" + descriptor = "(Lja;I[IZ)V" ) - public void method1330(Frames var1, int var2, int[] var3, boolean var4) { + public void method1371(Frames var1, int var2, int[] var3, boolean var4) { if (var3 == null) { this.animate(var1, var2); } else { @@ -917,7 +913,7 @@ public void method1330(Frames var1, int var2, int[] var3, boolean var4) { } } - @ObfuscatedName("aj") + @ObfuscatedName("aq") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; @@ -999,24 +995,24 @@ void transform(int var1, int[] var2, int var3, int var4, int var5) { int var16; int var17; if (var14 != 0) { - var15 = field2199[var14]; - var16 = field2193[var14]; + var15 = field2209[var14]; + var16 = field2206[var14]; var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; this.verticesX[var11] = var17; } if (var12 != 0) { - var15 = field2199[var12]; - var16 = field2193[var12]; + var15 = field2209[var12]; + var16 = field2206[var12]; var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; this.verticesY[var11] = var17; } if (var13 != 0) { - var15 = field2199[var13]; - var16 = field2193[var13]; + var15 = field2209[var13]; + var16 = field2206[var13]; var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; this.verticesX[var11] = var17; @@ -1085,7 +1081,7 @@ void transform(int var1, int[] var2, int var3, int var4, int var5) { } } - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -1097,7 +1093,7 @@ public void rotateY90Ccw() { this.resetBounds(); } - @ObfuscatedName("aw") + @ObfuscatedName("at") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -1108,7 +1104,7 @@ public void rotateY180() { this.resetBounds(); } - @ObfuscatedName("ak") + @ObfuscatedName("af") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -1120,11 +1116,11 @@ public void rotateY270Ccw() { this.resetBounds(); } - @ObfuscatedName("bh") + @ObfuscatedName("ad") @Export("rotateZ") public void rotateZ(int var1) { - int var2 = field2199[var1]; - int var3 = field2193[var1]; + int var2 = field2209[var1]; + int var3 = field2206[var1]; for (int var4 = 0; var4 < this.verticesCount; ++var4) { int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; @@ -1135,7 +1131,7 @@ public void rotateZ(int var1) { this.resetBounds(); } - @ObfuscatedName("bj") + @ObfuscatedName("bn") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1162,22 +1158,22 @@ public void scale(int var1, int var2, int var3) { this.resetBounds(); } - @ObfuscatedName("bv") - public final void method1338(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + @ObfuscatedName("by") + public final void method1379(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (this.boundsType != 2 && this.boundsType != 1) { - this.method1321(); + this.method1362(); } int var8 = Rasterizer3D.getClipMidX(); int var9 = Rasterizer3D.getClipMidY(); - int var10 = field2199[var1]; - int var11 = field2193[var1]; - int var12 = field2199[var2]; - int var13 = field2193[var2]; - int var14 = field2199[var3]; - int var15 = field2193[var3]; - int var16 = field2199[var4]; - int var17 = field2193[var4]; + int var10 = field2209[var1]; + int var11 = field2206[var1]; + int var12 = field2209[var2]; + int var13 = field2206[var2]; + int var14 = field2209[var3]; + int var15 = field2206[var3]; + int var16 = field2209[var4]; + int var17 = field2206[var4]; int var18 = var16 * var6 + var17 * var7 >> 16; for (int var19 = 0; var19 < this.verticesCount; ++var19) { @@ -1208,14 +1204,14 @@ public final void method1338(int var1, int var2, int var3, int var4, int var5, i var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - field2185[var19] = var22 - var18; + field2198[var19] = var22 - var18; modelViewportXs[var19] = var8 + var20 * Rasterizer3D.get3dZoom() / var22; modelViewportYs[var19] = var9 + var23 * Rasterizer3D.get3dZoom() / var22; - field2179[var19] = AbstractWorldMapIcon.method1556(var22); - if (this.field2242 > 0) { - field2187[var19] = var20; - field2190[var19] = var23; - field2189[var19] = var22; + field2191[var19] = SecureRandomFuture.method443(var22); + if (this.field2254 > 0) { + field2200[var19] = var20; + field2197[var19] = var23; + field2199[var19] = var22; } } @@ -1226,22 +1222,22 @@ public final void method1338(int var1, int var2, int var3, int var4, int var5, i } - @ObfuscatedName("bt") - public final void method1339(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("bd") + public final void method1380(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (this.boundsType != 2 && this.boundsType != 1) { - this.method1321(); + this.method1362(); } int var9 = Rasterizer3D.getClipMidX(); int var10 = Rasterizer3D.getClipMidY(); - int var11 = field2199[var1]; - int var12 = field2193[var1]; - int var13 = field2199[var2]; - int var14 = field2193[var2]; - int var15 = field2199[var3]; - int var16 = field2193[var3]; - int var17 = field2199[var4]; - int var18 = field2193[var4]; + int var11 = field2209[var1]; + int var12 = field2206[var1]; + int var13 = field2209[var2]; + int var14 = field2206[var2]; + int var15 = field2209[var3]; + int var16 = field2206[var3]; + int var17 = field2209[var4]; + int var18 = field2206[var4]; int var19 = var17 * var6 + var18 * var7 >> 16; for (int var20 = 0; var20 < this.verticesCount; ++var20) { @@ -1272,14 +1268,14 @@ public final void method1339(int var1, int var2, int var3, int var4, int var5, i var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - field2185[var20] = var23 - var19; + field2198[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.get3dZoom() / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.get3dZoom() / var8; - field2179[var20] = AbstractWorldMapIcon.method1556(var8); - if (this.field2242 > 0) { - field2187[var20] = var21; - field2190[var20] = var24; - field2189[var20] = var23; + field2191[var20] = SecureRandomFuture.method443(var8); + if (this.field2254 > 0) { + field2200[var20] = var21; + field2197[var20] = var24; + field2199[var20] = var23; } } @@ -1290,13 +1286,13 @@ public final void method1339(int var1, int var2, int var3, int var4, int var5, i } - @ObfuscatedName("bd") + @ObfuscatedName("be") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { if (this.diameter < 6000) { int var6; for (var6 = 0; var6 < this.diameter; ++var6) { - field2177[var6] = 0; + field2189[var6] = 0; } var6 = var3 ? 20 : 5; @@ -1319,63 +1315,34 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { var12 = modelViewportXs[var9]; var13 = modelViewportXs[var10]; int var14; - int var17; if (!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) { - if (var2) { - var15 = modelViewportYs[var8]; - var16 = modelViewportYs[var9]; - var17 = modelViewportYs[var10]; - var18 = var6 + ViewportMouse.ViewportMouse_y; - boolean var37; - if (var18 < var15 && var18 < var16 && var18 < var17) { - var37 = false; - } else { - var18 = ViewportMouse.ViewportMouse_y - var6; - if (var18 > var15 && var18 > var16 && var18 > var17) { - var37 = false; - } else { - var18 = var6 + ViewportMouse.ViewportMouse_x; - if (var18 < var11 && var18 < var12 && var18 < var13) { - var37 = false; - } else { - var18 = ViewportMouse.ViewportMouse_x - var6; - if (var18 > var11 && var18 > var12 && var18 > var13) { - var37 = false; - } else { - var37 = true; - } - } - } - } - - if (var37) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; - var2 = false; - } + if (var2 && class133.method721(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var13, var6)) { + class160.method845(var4); + var2 = false; } if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { - field2174[var7] = false; - var14 = Rasterizer3D.method1197(); + field2186[var7] = false; + var14 = Rasterizer3D.method1246(); if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= var14 && var12 <= var14 && var13 <= var14) { - field2173[var7] = false; + field2185[var7] = false; } else { - field2173[var7] = true; + field2185[var7] = true; } - var15 = (field2185[var8] + field2185[var9] + field2185[var10]) / 3 + this.radius; - field2178[var15][field2177[var15]++] = var7; + var15 = (field2198[var8] + field2198[var9] + field2198[var10]) / 3 + this.radius; + field2190[var15][field2189[var15]++] = var7; } } else { - var14 = field2187[var8]; - var15 = field2187[var9]; - var16 = field2187[var10]; - var17 = field2190[var8]; - var18 = field2190[var9]; - int var19 = field2190[var10]; - int var20 = field2189[var8]; - int var21 = field2189[var9]; - int var22 = field2189[var10]; + var14 = field2200[var8]; + var15 = field2200[var9]; + var16 = field2200[var10]; + int var17 = field2197[var8]; + var18 = field2197[var9]; + int var19 = field2197[var10]; + int var20 = field2199[var8]; + int var21 = field2199[var9]; + int var22 = field2199[var10]; var14 -= var15; var16 -= var15; var17 -= var18; @@ -1386,157 +1353,157 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { int var24 = var20 * var16 - var14 * var22; int var25 = var14 * var19 - var17 * var16; if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field2174[var7] = true; - int var26 = (field2185[var8] + field2185[var9] + field2185[var10]) / 3 + this.radius; - field2178[var26][field2177[var26]++] = var7; + field2186[var7] = true; + int var26 = (field2198[var8] + field2198[var9] + field2198[var10]) / 3 + this.radius; + field2190[var26][field2189[var26]++] = var7; } } } } - char[] var29; - int var33; - char var34; + char[] var27; + int var31; + char var32; if (this.faceRenderPriorities == null) { - for (var33 = this.diameter - 1; var33 >= 0; --var33) { - var34 = field2177[var33]; - if (var34 > 0) { - var29 = field2178[var33]; + for (var31 = this.diameter - 1; var31 >= 0; --var31) { + var32 = field2189[var31]; + if (var32 > 0) { + var27 = field2190[var31]; - for (var10 = 0; var10 < var34; ++var10) { - this.drawFace(var29[var10]); + for (var10 = 0; var10 < var32; ++var10) { + this.drawFace(var27[var10]); } } } } else { - for (var33 = 0; var33 < 12; ++var33) { - field2186[var33] = 0; - field2196[var33] = 0; + for (var31 = 0; var31 < 12; ++var31) { + field2202[var31] = 0; + field2207[var31] = 0; } - for (var33 = this.diameter - 1; var33 >= 0; --var33) { - var34 = field2177[var33]; - if (var34 > 0) { - var29 = field2178[var33]; - - for (var10 = 0; var10 < var34; ++var10) { - char var35 = var29[var10]; - byte var36 = this.faceRenderPriorities[var35]; - var13 = field2186[var36]++; - field2201[var36][var13] = var35; - if (var36 < 10) { - int[] var38 = field2196; - var38[var36] += var33; - } else if (var36 == 10) { - field2192[var13] = var33; + for (var31 = this.diameter - 1; var31 >= 0; --var31) { + var32 = field2189[var31]; + if (var32 > 0) { + var27 = field2190[var31]; + + for (var10 = 0; var10 < var32; ++var10) { + char var33 = var27[var10]; + byte var34 = this.faceRenderPriorities[var33]; + var13 = field2202[var34]++; + field2213[var34][var13] = var33; + if (var34 < 10) { + int[] var35 = field2207; + var35[var34] += var31; + } else if (var34 == 10) { + field2210[var13] = var31; } else { - field2195[var13] = var33; + field2212[var13] = var31; } } } } - var33 = 0; - if (field2186[1] > 0 || field2186[2] > 0) { - var33 = (field2196[1] + field2196[2]) / (field2186[1] + field2186[2]); + var31 = 0; + if (field2202[1] > 0 || field2202[2] > 0) { + var31 = (field2207[1] + field2207[2]) / (field2202[1] + field2202[2]); } var8 = 0; - if (field2186[3] > 0 || field2186[4] > 0) { - var8 = (field2196[3] + field2196[4]) / (field2186[3] + field2186[4]); + if (field2202[3] > 0 || field2202[4] > 0) { + var8 = (field2207[3] + field2207[4]) / (field2202[3] + field2202[4]); } var9 = 0; - if (field2186[6] > 0 || field2186[8] > 0) { - var9 = (field2196[8] + field2196[6]) / (field2186[8] + field2186[6]); + if (field2202[6] > 0 || field2202[8] > 0) { + var9 = (field2207[8] + field2207[6]) / (field2202[8] + field2202[6]); } var11 = 0; - var12 = field2186[10]; - int[] var30 = field2201[10]; - int[] var31 = field2192; + var12 = field2202[10]; + int[] var28 = field2213[10]; + int[] var29 = field2210; if (var11 == var12) { var11 = 0; - var12 = field2186[11]; - var30 = field2201[11]; - var31 = field2195; + var12 = field2202[11]; + var28 = field2213[11]; + var29 = field2212; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } for (var15 = 0; var15 < 10; ++var15) { - while (var15 == 0 && var10 > var33) { - this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field2201[11]) { + while (var15 == 0 && var10 > var31) { + this.drawFace(var28[var11++]); + if (var11 == var12 && var28 != field2213[11]) { var11 = 0; - var12 = field2186[11]; - var30 = field2201[11]; - var31 = field2195; + var12 = field2202[11]; + var28 = field2213[11]; + var29 = field2212; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } } while (var15 == 3 && var10 > var8) { - this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field2201[11]) { + this.drawFace(var28[var11++]); + if (var11 == var12 && var28 != field2213[11]) { var11 = 0; - var12 = field2186[11]; - var30 = field2201[11]; - var31 = field2195; + var12 = field2202[11]; + var28 = field2213[11]; + var29 = field2212; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } } while (var15 == 5 && var10 > var9) { - this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field2201[11]) { + this.drawFace(var28[var11++]); + if (var11 == var12 && var28 != field2213[11]) { var11 = 0; - var12 = field2186[11]; - var30 = field2201[11]; - var31 = field2195; + var12 = field2202[11]; + var28 = field2213[11]; + var29 = field2212; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } } - var16 = field2186[var15]; - int[] var32 = field2201[var15]; + var16 = field2202[var15]; + int[] var30 = field2213[var15]; for (var18 = 0; var18 < var16; ++var18) { - this.drawFace(var32[var18]); + this.drawFace(var30[var18]); } } while (var10 != -1000) { - this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field2201[11]) { + this.drawFace(var28[var11++]); + if (var11 == var12 && var28 != field2213[11]) { var11 = 0; - var30 = field2201[11]; - var12 = field2186[11]; - var31 = field2195; + var28 = field2213[11]; + var12 = field2202[11]; + var29 = field2212; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } @@ -1546,42 +1513,42 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { } } - @ObfuscatedName("by") + @ObfuscatedName("bv") @Export("drawFace") final void drawFace(int var1) { - if (field2174[var1]) { - this.method1345(var1); + if (field2186[var1]) { + this.method1386(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.clips.field2268 = field2173[var1]; + Rasterizer3D.clips.field2278 = field2185[var1]; if (this.faceAlphas == null) { - Rasterizer3D.clips.field2275 = 0; + Rasterizer3D.clips.field2282 = 0; } else { - Rasterizer3D.clips.field2275 = (this.faceAlphas[var1] == -1 ? 253 : this.faceAlphas[var1]) & 255; + Rasterizer3D.clips.field2282 = (this.faceAlphas[var1] == -1 ? 253 : this.faceAlphas[var1]) & 255; } - this.method1344(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2179[var2], field2179[var3], field2179[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + this.method1385(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2191[var2], field2191[var3], field2191[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } - @ObfuscatedName("bs") - boolean method1343(int var1) { - return this.overrideAmount > 0 && var1 < this.field2243; + @ObfuscatedName("ba") + boolean method1384(int var1) { + return this.overrideAmount > 0 && var1 < this.field2255; } - @ObfuscatedName("bm") - final void method1344(int var1, int var2, int var3, int var4, int var5, int var6, int var7, float var8, float var9, float var10, int var11, int var12, int var13) { + @ObfuscatedName("bz") + final void method1385(int var1, int var2, int var3, int var4, int var5, int var6, int var7, float var8, float var9, float var10, int var11, int var12, int var13) { if (this.faceTextures != null && this.faceTextures[var1] != -1) { int var15; int var16; int var18; - if (this.field2209 != null && this.field2209[var1] != -1) { - int var17 = this.field2209[var1] & 255; - var18 = this.field2226[var17]; - var15 = this.field2221[var17]; - var16 = this.field2227[var17]; + if (this.field2222 != null && this.field2222[var1] != -1) { + int var17 = this.field2222[var1] & 255; + var18 = this.field2229[var17]; + var15 = this.field2228[var17]; + var16 = this.field2239[var17]; } else { var18 = this.indices1[var1]; var15 = this.indices2[var1]; @@ -1589,40 +1556,40 @@ final void method1344(int var1, int var2, int var3, int var4, int var5, int var6 } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method1206(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var11, var11, field2187[var18], field2187[var15], field2187[var16], field2190[var18], field2190[var15], field2190[var16], field2189[var18], field2189[var15], field2189[var16], this.faceTextures[var1]); + Rasterizer3D.method1255(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var11, var11, field2200[var18], field2200[var15], field2200[var16], field2197[var18], field2197[var15], field2197[var16], field2199[var18], field2199[var15], field2199[var16], this.faceTextures[var1]); } else { - Rasterizer3D.method1206(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, field2187[var18], field2187[var15], field2187[var16], field2190[var18], field2190[var15], field2190[var16], field2189[var18], field2189[var15], field2189[var16], this.faceTextures[var1]); + Rasterizer3D.method1255(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, field2200[var18], field2200[var15], field2200[var16], field2197[var18], field2197[var15], field2197[var16], field2199[var18], field2199[var15], field2199[var16], this.faceTextures[var1]); } } else { - boolean var14 = this.method1343(var1); + boolean var14 = this.method1384(var1); if (this.faceColors3[var1] == -1 && var14) { - Rasterizer3D.method1209(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2194[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + Rasterizer3D.method1258(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2211[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method1205(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2194[this.faceColors1[var1]]); + Rasterizer3D.method1254(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2211[this.faceColors1[var1]]); } else if (var14) { - Rasterizer3D.method1208(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + Rasterizer3D.method1257(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); } else { - Rasterizer3D.method1204(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); + Rasterizer3D.method1253(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); } } } - @ObfuscatedName("bf") - final void method1345(int var1) { + @ObfuscatedName("bb") + final void method1386(int var1) { int var2 = Rasterizer3D.getClipMidX(); int var3 = Rasterizer3D.getClipMidY(); int var4 = 0; int var5 = this.indices1[var1]; int var6 = this.indices2[var1]; int var7 = this.indices3[var1]; - int var8 = field2189[var5]; - int var9 = field2189[var6]; - int var10 = field2189[var7]; + int var8 = field2199[var5]; + int var9 = field2199[var6]; + int var10 = field2199[var7]; if (this.faceAlphas == null) { - Rasterizer3D.clips.field2275 = 0; + Rasterizer3D.clips.field2282 = 0; } else { - Rasterizer3D.clips.field2275 = this.faceAlphas[var1] & 255; + Rasterizer3D.clips.field2282 = this.faceAlphas[var1] & 255; } int var11; @@ -1630,115 +1597,115 @@ final void method1345(int var1) { int var13; int var14; if (var8 >= 50) { - field2198[var4] = modelViewportXs[var5]; - field2200[var4] = modelViewportYs[var5]; - field2180[var4] = field2179[var7]; - field2197[var4++] = this.faceColors1[var1]; + field2203[var4] = modelViewportXs[var5]; + field2204[var4] = modelViewportYs[var5]; + field2192[var4] = field2191[var7]; + field2208[var4++] = this.faceColors1[var1]; } else { - var11 = field2187[var5]; - var12 = field2190[var5]; + var11 = field2200[var5]; + var12 = field2197[var5]; var13 = this.faceColors1[var1]; if (var10 >= 50) { - var14 = field2191[var10 - var8] * (50 - var8); - field2198[var4] = var2 + (var11 + ((field2187[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2200[var4] = var3 + (var12 + ((field2190[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2180[var4] = field2207; - field2197[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field2205[var10 - var8] * (50 - var8); + field2203[var4] = var2 + (var11 + ((field2200[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2204[var4] = var3 + (var12 + ((field2197[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2192[var4] = field2219; + field2208[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } if (var9 >= 50) { - var14 = field2191[var9 - var8] * (50 - var8); - field2198[var4] = var2 + (var11 + ((field2187[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2200[var4] = var3 + (var12 + ((field2190[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2180[var4] = field2207; - field2197[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field2205[var9 - var8] * (50 - var8); + field2203[var4] = var2 + (var11 + ((field2200[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2204[var4] = var3 + (var12 + ((field2197[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2192[var4] = field2219; + field2208[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } if (var9 >= 50) { - field2198[var4] = modelViewportXs[var6]; - field2200[var4] = modelViewportYs[var6]; - field2180[var4] = field2179[var7]; - field2197[var4++] = this.faceColors2[var1]; + field2203[var4] = modelViewportXs[var6]; + field2204[var4] = modelViewportYs[var6]; + field2192[var4] = field2191[var7]; + field2208[var4++] = this.faceColors2[var1]; } else { - var11 = field2187[var6]; - var12 = field2190[var6]; + var11 = field2200[var6]; + var12 = field2197[var6]; var13 = this.faceColors2[var1]; if (var8 >= 50) { - var14 = field2191[var8 - var9] * (50 - var9); - field2198[var4] = var2 + (var11 + ((field2187[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2200[var4] = var3 + (var12 + ((field2190[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2180[var4] = field2207; - field2197[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field2205[var8 - var9] * (50 - var9); + field2203[var4] = var2 + (var11 + ((field2200[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2204[var4] = var3 + (var12 + ((field2197[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2192[var4] = field2219; + field2208[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } if (var10 >= 50) { - var14 = field2191[var10 - var9] * (50 - var9); - field2198[var4] = var2 + (var11 + ((field2187[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2200[var4] = var3 + (var12 + ((field2190[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2197[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field2205[var10 - var9] * (50 - var9); + field2203[var4] = var2 + (var11 + ((field2200[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2204[var4] = var3 + (var12 + ((field2197[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2208[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } if (var10 >= 50) { - field2198[var4] = modelViewportXs[var7]; - field2200[var4] = modelViewportYs[var7]; - field2180[var4] = field2179[var7]; - field2197[var4++] = this.faceColors3[var1]; + field2203[var4] = modelViewportXs[var7]; + field2204[var4] = modelViewportYs[var7]; + field2192[var4] = field2191[var7]; + field2208[var4++] = this.faceColors3[var1]; } else { - var11 = field2187[var7]; - var12 = field2190[var7]; + var11 = field2200[var7]; + var12 = field2197[var7]; var13 = this.faceColors3[var1]; if (var9 >= 50) { - var14 = field2191[var9 - var10] * (50 - var10); - field2198[var4] = var2 + (var11 + ((field2187[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2200[var4] = var3 + (var12 + ((field2190[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2180[var4] = field2207; - field2197[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field2205[var9 - var10] * (50 - var10); + field2203[var4] = var2 + (var11 + ((field2200[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2204[var4] = var3 + (var12 + ((field2197[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2192[var4] = field2219; + field2208[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } if (var8 >= 50) { - var14 = field2191[var8 - var10] * (50 - var10); - field2198[var4] = var2 + (var11 + ((field2187[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2200[var4] = var3 + (var12 + ((field2190[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2180[var4] = field2207; - field2197[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field2205[var8 - var10] * (50 - var10); + field2203[var4] = var2 + (var11 + ((field2200[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2204[var4] = var3 + (var12 + ((field2197[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2192[var4] = field2219; + field2208[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field2198[0]; - var12 = field2198[1]; - var13 = field2198[2]; - var14 = field2200[0]; - int var15 = field2200[1]; - int var16 = field2200[2]; - float var17 = field2180[0]; - float var18 = field2180[1]; - float var19 = field2180[2]; - Rasterizer3D.clips.field2268 = false; - int var20 = Rasterizer3D.method1197(); + var11 = field2203[0]; + var12 = field2203[1]; + var13 = field2203[2]; + var14 = field2204[0]; + int var15 = field2204[1]; + int var16 = field2204[2]; + float var17 = field2192[0]; + float var18 = field2192[1]; + float var19 = field2192[2]; + Rasterizer3D.clips.field2278 = false; + int var20 = Rasterizer3D.method1246(); if (var4 == 3) { if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > var20 || var12 > var20 || var13 > var20) { - Rasterizer3D.clips.field2268 = true; + Rasterizer3D.clips.field2278 = true; } - this.method1344(var1, var14, var15, var16, var11, var12, var13, var17, var18, var19, field2197[0], field2197[1], field2197[2]); + this.method1385(var1, var14, var15, var16, var11, var12, var13, var17, var18, var19, field2208[0], field2208[1], field2208[2]); } if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > var20 || var12 > var20 || var13 > var20 || field2198[3] < 0 || field2198[3] > var20) { - Rasterizer3D.clips.field2268 = true; + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > var20 || var12 > var20 || var13 > var20 || field2203[3] < 0 || field2203[3] > var20) { + Rasterizer3D.clips.field2278 = true; } int var22; if (this.faceTextures != null && this.faceTextures[var1] != -1) { int var23; int var25; - if (this.field2209 != null && this.field2209[var1] != -1) { - int var24 = this.field2209[var1] & 255; - var25 = this.field2226[var24]; - var22 = this.field2221[var24]; - var23 = this.field2227[var24]; + if (this.field2222 != null && this.field2222[var1] != -1) { + int var24 = this.field2222[var1] & 255; + var25 = this.field2229[var24]; + var22 = this.field2228[var24]; + var23 = this.field2239[var24]; } else { var25 = var5; var22 = var6; @@ -1747,79 +1714,79 @@ final void method1345(int var1) { short var26 = this.faceTextures[var1]; if (this.faceColors3[var1] == -1) { - Rasterizer3D.method1206(var14, var15, var16, var11, var12, var13, var17, var18, var19, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2187[var25], field2187[var22], field2187[var23], field2190[var25], field2190[var22], field2190[var23], field2189[var25], field2189[var22], field2189[var23], var26); - Rasterizer3D.method1206(var14, var16, field2200[3], var11, var13, field2198[3], var17, var19, field2180[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2187[var25], field2187[var22], field2187[var23], field2190[var25], field2190[var22], field2190[var23], field2189[var25], field2189[var22], field2189[var23], var26); + Rasterizer3D.method1255(var14, var15, var16, var11, var12, var13, var17, var18, var19, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2200[var25], field2200[var22], field2200[var23], field2197[var25], field2197[var22], field2197[var23], field2199[var25], field2199[var22], field2199[var23], var26); + Rasterizer3D.method1255(var14, var16, field2204[3], var11, var13, field2203[3], var17, var19, field2192[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2200[var25], field2200[var22], field2200[var23], field2197[var25], field2197[var22], field2197[var23], field2199[var25], field2199[var22], field2199[var23], var26); } else { - Rasterizer3D.method1206(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2197[0], field2197[1], field2197[2], field2187[var25], field2187[var22], field2187[var23], field2190[var25], field2190[var22], field2190[var23], field2189[var25], field2189[var22], field2189[var23], var26); - Rasterizer3D.method1206(var14, var16, field2200[3], var11, var13, field2198[3], var17, var19, field2180[3], field2197[0], field2197[2], field2197[3], field2187[var25], field2187[var22], field2187[var23], field2190[var25], field2190[var22], field2190[var23], field2189[var25], field2189[var22], field2189[var23], var26); + Rasterizer3D.method1255(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2208[0], field2208[1], field2208[2], field2200[var25], field2200[var22], field2200[var23], field2197[var25], field2197[var22], field2197[var23], field2199[var25], field2199[var22], field2199[var23], var26); + Rasterizer3D.method1255(var14, var16, field2204[3], var11, var13, field2203[3], var17, var19, field2192[3], field2208[0], field2208[2], field2208[3], field2200[var25], field2200[var22], field2200[var23], field2197[var25], field2197[var22], field2197[var23], field2199[var25], field2199[var22], field2199[var23], var26); } } else { - boolean var21 = this.method1343(var1); + boolean var21 = this.method1384(var1); if (this.faceColors3[var1] == -1 && var21) { - var22 = field2194[this.faceColors1[var1]]; - Rasterizer3D.method1209(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); - Rasterizer3D.method1209(var14, var16, field2200[3], var11, var13, field2198[3], var17, var19, field2180[3], var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + var22 = field2211[this.faceColors1[var1]]; + Rasterizer3D.method1258(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + Rasterizer3D.method1258(var14, var16, field2204[3], var11, var13, field2203[3], var17, var19, field2192[3], var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); } else if (this.faceColors3[var1] == -1) { - var22 = field2194[this.faceColors1[var1]]; - Rasterizer3D.method1205(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22); - Rasterizer3D.method1205(var14, var16, field2200[3], var11, var13, field2198[3], var17, var19, field2180[3], var22); + var22 = field2211[this.faceColors1[var1]]; + Rasterizer3D.method1254(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22); + Rasterizer3D.method1254(var14, var16, field2204[3], var11, var13, field2203[3], var17, var19, field2192[3], var22); } else if (var21) { - Rasterizer3D.method1208(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2197[0], field2197[1], field2197[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); - Rasterizer3D.method1208(var14, var16, field2200[3], var11, var13, field2198[3], 0.0F, 0.0F, 0.0F, field2197[0], field2197[2], field2197[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); + Rasterizer3D.method1257(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2208[0], field2208[1], field2208[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); + Rasterizer3D.method1257(var14, var16, field2204[3], var11, var13, field2203[3], 0.0F, 0.0F, 0.0F, field2208[0], field2208[2], field2208[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); } else { - Rasterizer3D.method1204(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2197[0], field2197[1], field2197[2]); - Rasterizer3D.method1204(var14, var16, field2200[3], var11, var13, field2198[3], var17, var19, field2180[3], field2197[0], field2197[2], field2197[3]); + Rasterizer3D.method1253(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2208[0], field2208[1], field2208[2]); + Rasterizer3D.method1253(var14, var16, field2204[3], var11, var13, field2203[3], var17, var19, field2192[3], field2208[0], field2208[2], field2208[3]); } } } } - @ObfuscatedName("bq") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(ILrz;)V" + descriptor = "(ILrb;)V" ) - void method1346(int var1, class450 var2) { + void method1387(int var1, class465 var2) { float var3 = (float)this.verticesX[var1]; float var4 = (float)(-this.verticesY[var1]); float var5 = (float)(-this.verticesZ[var1]); float var6 = 1.0F; - this.verticesX[var1] = (int)(var2.field3875[0] * var3 + var2.field3875[4] * var4 + var2.field3875[8] * var5 + var2.field3875[12] * var6); - this.verticesY[var1] = -((int)(var2.field3875[1] * var3 + var2.field3875[5] * var4 + var2.field3875[9] * var5 + var2.field3875[13] * var6)); - this.verticesZ[var1] = -((int)(var2.field3875[2] * var3 + var2.field3875[6] * var4 + var2.field3875[10] * var5 + var2.field3875[14] * var6)); + this.verticesX[var1] = (int)(var2.field3908[0] * var3 + var2.field3908[4] * var4 + var2.field3908[8] * var5 + var2.field3908[12] * var6); + this.verticesY[var1] = -((int)(var2.field3908[1] * var3 + var2.field3908[5] * var4 + var2.field3908[9] * var5 + var2.field3908[13] * var6)); + this.verticesZ[var1] = -((int)(var2.field3908[2] * var3 + var2.field3908[6] * var4 + var2.field3908[10] * var5 + var2.field3908[14] * var6)); } - @ObfuscatedName("ba") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(Lim;I)V" + descriptor = "(Ljr;I)V" ) - void method1347(class227 var1, int var2) { - if (this.field2231 != null) { + void method1388(class241 var1, int var2) { + if (this.field2240 != null) { for (int var3 = 0; var3 < this.verticesCount; ++var3) { - int[] var4 = this.field2231[var3]; + int[] var4 = this.field2240[var3]; if (var4 != null && var4.length != 0) { - int[] var5 = this.field2230[var3]; - field2204.method2303(); + int[] var5 = this.field2241[var3]; + field2217.method2341(); for (int var6 = 0; var6 < var4.length; ++var6) { int var7 = var4[var6]; - class127 var8 = var1.method1213(var7); + class129 var8 = var1.method1261(var7); if (var8 != null) { - field2205.method2305((float)var5[var6] / 255.0F); - field2206.method2304(var8.method711(var2)); - field2206.method2308(field2205); - field2204.method2307(field2206); + field2216.method2343((float)var5[var6] / 255.0F); + field2218.method2342(var8.method700(var2)); + field2218.method2346(field2216); + field2217.method2345(field2218); } } - this.method1346(var3, field2204); + this.method1387(var3, field2217); } } } } - @ObfuscatedName("db") + @ObfuscatedName("du") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { if (this.boundsType != 1) { @@ -1836,12 +1803,12 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var16 = (var15 - this.xzRadius) * Rasterizer3D.get3dZoom(); if (var16 / var14 < Rasterizer3D.getClipMidX2()) { int var17 = (var15 + this.xzRadius) * Rasterizer3D.get3dZoom(); - if (var17 / var14 > Rasterizer3D.method1192()) { + if (var17 / var14 > Rasterizer3D.method1241()) { int var18 = var3 * var7 - var11 * var2 >> 16; int var19 = var2 * this.xzRadius >> 16; int var20 = (var3 * this.bottomY >> 16) + var19; int var21 = (var18 + var20) * Rasterizer3D.get3dZoom(); - if (var21 / var14 > Rasterizer3D.method1195()) { + if (var21 / var14 > Rasterizer3D.method1244()) { int var22 = (var3 * super.height >> 16) + var19; int var23 = (var18 - var22) * Rasterizer3D.get3dZoom(); if (var23 / var14 < Rasterizer3D.getClipMidY2()) { @@ -1852,147 +1819,105 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, var26 = true; } - boolean var27 = var26 || this.field2242 > 0; - int var28 = ViewportMouse.ViewportMouse_x; - int var30 = ViewportMouse.ViewportMouse_y; - boolean var32 = Decimator.method312(); - boolean var34 = 0L != var9; - boolean var35; - if (var34) { - var35 = (int)(var9 >>> 16 & 1L) == 1; - var34 = !var35; - } - - var35 = false; - int var40; - int var41; - int var42; - int var43; - int var44; - int var49; - int var50; - int var56; - if (var34 && var32) { - boolean var36 = false; - if (field2172) { - boolean var37; - if (!Decimator.method312()) { - var37 = false; - } else { - class11.method33(); - AABB var39 = (AABB)this.aabb.get(var1); - var40 = var39.xMid + var6; - var41 = var7 + var39.yMid; - var42 = var8 + var39.zMid; - var43 = var39.xMidOffset; - var44 = var39.yMidOffset; - int var45 = var39.zMidOffset; - int var46 = ViewportMouse.field2249 - var40; - int var47 = ViewportMouse.field2252 - var41; - int var48 = ViewportMouse.field2254 - var42; - if (Math.abs(var46) > var43 + ViewportMouse.field2250) { - var37 = false; - } else if (Math.abs(var47) > var44 + class7.field9) { - var37 = false; - } else if (Math.abs(var48) > var45 + class30.field82) { - var37 = false; - } else if (Math.abs(var48 * ViewportMouse.field2248 - var47 * Frames.field2121) > var44 * class30.field82 + var45 * class7.field9) { - var37 = false; - } else if (Math.abs(var46 * Frames.field2121 - var48 * class261.field2396) > var43 * class30.field82 + var45 * ViewportMouse.field2250) { - var37 = false; - } else if (Math.abs(var47 * class261.field2396 - var46 * ViewportMouse.field2248) > var43 * class7.field9 + var44 * ViewportMouse.field2250) { - var37 = false; - } else { - var37 = true; - } - } - - var36 = var37; + boolean var27 = var26 || this.field2254 > 0; + int var28 = class64.method336(); + int var29 = WorldMapLabelSize.method1436(); + boolean var30 = GrandExchangeOfferTotalQuantityComparator.method1974(); + boolean var31 = class372.method1929(var9); + boolean var32 = false; + int var34; + int var35; + int var36; + if (var31 && var30) { + boolean var33 = false; + if (field2184) { + var33 = class11.method38(this, var1, var6, var7, var8); } else { - var56 = var12 - var13; - if (var56 <= 50) { - var56 = 50; + var34 = var12 - var13; + if (var34 <= 50) { + var34 = 50; } if (var15 > 0) { var16 /= var14; - var17 /= var56; + var17 /= var34; } else { var17 /= var14; - var16 /= var56; + var16 /= var34; } if (var18 > 0) { var23 /= var14; - var21 /= var56; + var21 /= var34; } else { var21 /= var14; - var23 /= var56; + var23 /= var34; } - var49 = var28 - Rasterizer3D.getClipMidX(); - var50 = var30 - Rasterizer3D.getClipMidY(); - if (var49 > var16 && var49 < var17 && var50 > var23 && var50 < var21) { - var36 = true; + var35 = var28 - Rasterizer3D.getClipMidX(); + var36 = var29 - Rasterizer3D.getClipMidY(); + if (var35 > var16 && var35 < var17 && var36 > var23 && var36 < var21) { + var33 = true; } } - if (var36) { + if (var33) { if (this.isSingleTile) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; + class160.method845(var9); } else { - var35 = true; + var32 = true; } } } - int var55 = Rasterizer3D.getClipMidX(); - var56 = Rasterizer3D.getClipMidY(); - var49 = 0; - var50 = 0; + int var44 = Rasterizer3D.getClipMidX(); + var34 = Rasterizer3D.getClipMidY(); + var35 = 0; + var36 = 0; if (var1 != 0) { - var49 = field2199[var1]; - var50 = field2193[var1]; + var35 = field2209[var1]; + var36 = field2206[var1]; } - for (var40 = 0; var40 < this.verticesCount; ++var40) { - var41 = this.verticesX[var40]; - var42 = this.verticesY[var40]; - var43 = this.verticesZ[var40]; + for (int var37 = 0; var37 < this.verticesCount; ++var37) { + int var38 = this.verticesX[var37]; + int var39 = this.verticesY[var37]; + int var40 = this.verticesZ[var37]; + int var41; if (var1 != 0) { - var44 = var43 * var49 + var41 * var50 >> 16; - var43 = var43 * var50 - var41 * var49 >> 16; - var41 = var44; + var41 = var40 * var35 + var38 * var36 >> 16; + var40 = var40 * var36 - var38 * var35 >> 16; + var38 = var41; } - var41 += var6; - var42 += var7; - var43 += var8; - var44 = var43 * var4 + var5 * var41 >> 16; - var43 = var5 * var43 - var41 * var4 >> 16; - var41 = var44; - var44 = var3 * var42 - var43 * var2 >> 16; - var43 = var42 * var2 + var3 * var43 >> 16; - field2185[var40] = var43 - var12; - if (var43 >= 50) { - modelViewportXs[var40] = var55 + var41 * Rasterizer3D.get3dZoom() / var43; - modelViewportYs[var40] = var56 + var44 * Rasterizer3D.get3dZoom() / var43; - field2179[var40] = AbstractWorldMapIcon.method1556(var43); + var38 += var6; + var39 += var7; + var40 += var8; + var41 = var40 * var4 + var5 * var38 >> 16; + var40 = var5 * var40 - var38 * var4 >> 16; + var38 = var41; + var41 = var3 * var39 - var40 * var2 >> 16; + var40 = var39 * var2 + var3 * var40 >> 16; + field2198[var37] = var40 - var12; + if (var40 >= 50) { + modelViewportXs[var37] = var44 + var38 * Rasterizer3D.get3dZoom() / var40; + modelViewportYs[var37] = var34 + var41 * Rasterizer3D.get3dZoom() / var40; + field2191[var37] = SecureRandomFuture.method443(var40); } else { - modelViewportXs[var40] = -5000; + modelViewportXs[var37] = -5000; var25 = true; } if (var27) { - field2187[var40] = var41; - field2190[var40] = var44; - field2189[var40] = var43; + field2200[var37] = var38; + field2197[var37] = var41; + field2199[var37] = var40; } } try { - this.draw0(var25, var35, this.isSingleTile, var9); - } catch (Exception var54) { + this.draw0(var25, var32, this.isSingleTile, var9); + } catch (Exception var43) { } } diff --git a/osrs/src/main/java/ModelData.java b/osrs/src/main/java/ModelData.java index e0efd2f48..7dc96d6b4 100644 --- a/osrs/src/main/java/ModelData.java +++ b/osrs/src/main/java/ModelData.java @@ -3,139 +3,139 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("jw") @Implements("ModelData") public class ModelData extends Renderable { + @ObfuscatedName("bs") + static int[] field1953; + @ObfuscatedName("bc") + static int[] field1950; @ObfuscatedName("bu") - static int[] field1941; - @ObfuscatedName("bo") - static int[] field1939; - @ObfuscatedName("bb") - static int field1937; - @ObfuscatedName("br") + static int field1949; + @ObfuscatedName("bf") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("be") + @ObfuscatedName("bh") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("verticesCount") int verticesCount; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("verticesX") int[] verticesX; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("verticesY") int[] verticesY; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("faceCount") int faceCount; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("indices1") int[] indices1; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("indices2") int[] indices2; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("indices3") int[] indices3; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("faceColors") short[] faceColors; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("priority") byte priority; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("bh") + @ObfuscatedName("bn") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("bj") - int[][] field1967; @ObfuscatedName("bk") - int[][] field1968; - @ObfuscatedName("bv") + int[][] field1978; + @ObfuscatedName("by") + int[][] field1980; + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "[Liq;" + descriptor = "[Ljv;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("bt") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "[Lja;" + descriptor = "[Ljp;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "[Lja;" + descriptor = "[Ljp;" ) @Export("vertexVertices") VertexNormal[] vertexVertices; - @ObfuscatedName("by") + @ObfuscatedName("ba") @Export("ambient") public short ambient; - @ObfuscatedName("bs") + @ObfuscatedName("bz") @Export("contrast") public short contrast; - @ObfuscatedName("bm") + @ObfuscatedName("bb") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("bf") - int field1953; - @ObfuscatedName("bq") - int field1956; - @ObfuscatedName("ba") - int field1952; - @ObfuscatedName("bl") - int field1954; + @ObfuscatedName("bo") + int field1965; @ObfuscatedName("bp") - int field1955; + int field1966; + @ObfuscatedName("bt") + int field1968; + @ObfuscatedName("bm") + int field1964; + @ObfuscatedName("br") + int field1967; static { - field1941 = new int[10000]; - field1939 = new int[10000]; - field1937 = 0; + field1953 = new int[10000]; + field1950 = new int[10000]; + field1949 = 0; ModelData_sine = Rasterizer3D.Rasterizer3D_sine; ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } @@ -148,7 +148,7 @@ public class ModelData extends Renderable { } @ObfuscatedSignature( - descriptor = "([Lic;I)V" + descriptor = "([Ljw;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -192,7 +192,7 @@ public ModelData(ModelData[] var1, int var2) { var6 |= var11.faceSkins != null; var7 |= var11.faceTextures != null; var8 |= var11.textureCoords != null; - var9 |= var11.field1967 != null; + var9 |= var11.field1978 != null; } } @@ -228,8 +228,8 @@ public ModelData(ModelData[] var1, int var2) { } if (var9) { - this.field1967 = new int[this.verticesCount][]; - this.field1968 = new int[this.verticesCount][]; + this.field1978 = new int[this.verticesCount][]; + this.field1980 = new int[this.verticesCount][]; } this.faceColors = new short[this.faceCount]; @@ -286,18 +286,18 @@ public ModelData(ModelData[] var1, int var2) { } this.faceColors[this.faceCount] = var11.faceColors[var12]; - this.indices1[this.faceCount] = this.method1159(var11, var11.indices1[var12]); - this.indices2[this.faceCount] = this.method1159(var11, var11.indices2[var12]); - this.indices3[this.faceCount] = this.method1159(var11, var11.indices3[var12]); + this.indices1[this.faceCount] = this.method1205(var11, var11.indices1[var12]); + this.indices2[this.faceCount] = this.method1205(var11, var11.indices2[var12]); + this.indices3[this.faceCount] = this.method1205(var11, var11.indices3[var12]); ++this.faceCount; } for (var12 = 0; var12 < var11.textureTriangleCount; ++var12) { byte var13 = this.textureRenderTypes[this.textureTriangleCount] = var11.textureRenderTypes[var12]; if (var13 == 0) { - this.texTriangleX[this.textureTriangleCount] = (short)this.method1159(var11, var11.texTriangleX[var12]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method1159(var11, var11.texTriangleY[var12]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method1159(var11, var11.texTriangleZ[var12]); + this.texTriangleX[this.textureTriangleCount] = (short)this.method1205(var11, var11.texTriangleX[var12]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method1205(var11, var11.texTriangleY[var12]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method1205(var11, var11.texTriangleZ[var12]); } ++this.textureTriangleCount; @@ -315,19 +315,19 @@ public ModelData(ModelData[] var1, int var2) { Buffer var2 = new Buffer(10); var2.writeShort(-2); if (var1[var1.length - 1] == -3 && var1[var1.length - 2] == -1) { - this.method1155(var1); + this.method1201(var1); } else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { - this.method1156(var1); + this.method1202(var1); } else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { - this.method1157(var1); + this.method1203(var1); } else { - this.method1158(var1); + this.method1204(var1); } } @ObfuscatedSignature( - descriptor = "(Lic;ZZZZ)V", + descriptor = "(Ljw;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -394,14 +394,14 @@ public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boole this.vertexNormals = var1.vertexNormals; this.faceNormals = var1.faceNormals; this.vertexVertices = var1.vertexVertices; - this.field1967 = var1.field1967; - this.field1968 = var1.field1968; + this.field1978 = var1.field1978; + this.field1980 = var1.field1980; this.ambient = var1.ambient; this.contrast = var1.contrast; } - @ObfuscatedName("ao") - void method1155(byte[] var1) { + @ObfuscatedName("ak") + void method1201(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -544,8 +544,8 @@ void method1155(byte[] var1) { } if (var18 == 1) { - this.field1967 = new int[var9][]; - this.field1968 = new int[var9][]; + this.field1978 = new int[var9][]; + this.field1980 = new int[var9][]; } this.faceColors = new short[var10]; @@ -600,12 +600,12 @@ void method1155(byte[] var1) { if (var18 == 1) { for (var53 = 0; var53 < var9; ++var53) { var54 = var6.readUnsignedByte(); - this.field1967[var53] = new int[var54]; - this.field1968[var53] = new int[var54]; + this.field1978[var53] = new int[var54]; + this.field1980[var53] = new int[var54]; for (var55 = 0; var55 < var54; ++var55) { - this.field1967[var53][var55] = var6.readUnsignedByte(); - this.field1968[var53][var55] = var6.readUnsignedByte(); + this.field1978[var53][var55] = var6.readUnsignedByte(); + this.field1980[var53][var55] = var6.readUnsignedByte(); } } } @@ -723,8 +723,8 @@ void method1155(byte[] var1) { } - @ObfuscatedName("at") - void method1156(byte[] var1) { + @ObfuscatedName("ax") + void method1202(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -825,8 +825,8 @@ void method1156(byte[] var1) { } if (var17 == 1) { - this.field1967 = new int[var9][]; - this.field1968 = new int[var9][]; + this.field1978 = new int[var9][]; + this.field1980 = new int[var9][]; } this.faceColors = new short[var10]; @@ -875,12 +875,12 @@ void method1156(byte[] var1) { if (var17 == 1) { for (var40 = 0; var40 < var9; ++var40) { var41 = var8.readUnsignedByte(); - this.field1967[var40] = new int[var41]; - this.field1968[var40] = new int[var41]; + this.field1978[var40] = new int[var41]; + this.field1980[var40] = new int[var41]; for (var42 = 0; var42 < var41; ++var42) { - this.field1967[var40][var42] = var8.readUnsignedByte(); - this.field1968[var40][var42] = var8.readUnsignedByte(); + this.field1978[var40][var42] = var8.readUnsignedByte(); + this.field1980[var40][var42] = var8.readUnsignedByte(); } } } @@ -1017,8 +1017,8 @@ void method1156(byte[] var1) { } - @ObfuscatedName("az") - void method1157(byte[] var1) { + @ObfuscatedName("ao") + void method1203(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -1323,8 +1323,8 @@ void method1157(byte[] var1) { } - @ObfuscatedName("ap") - void method1158(byte[] var1) { + @ObfuscatedName("ar") + void method1204(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -1600,11 +1600,11 @@ void method1158(byte[] var1) { } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lic;I)I" + descriptor = "(Ljw;I)I" ) - final int method1159(ModelData var1, int var2) { + final int method1205(ModelData var1, int var2) { int var3 = -1; int var4 = var1.verticesX[var2]; int var5 = var1.verticesY[var2]; @@ -1625,9 +1625,9 @@ final int method1159(ModelData var1, int var2) { this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; } - if (var1.field1967 != null) { - this.field1967[this.verticesCount] = var1.field1967[var2]; - this.field1968[this.verticesCount] = var1.field1968[var2]; + if (var1.field1978 != null) { + this.field1978[this.verticesCount] = var1.field1978[var2]; + this.field1980[this.verticesCount] = var1.field1980[var2]; } var3 = this.verticesCount++; @@ -1636,9 +1636,9 @@ final int method1159(ModelData var1, int var2) { return var3; } - @ObfuscatedName("af") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "()Lic;" + descriptor = "()Ljw;" ) @Export("copyModelData") public ModelData copyModelData() { @@ -1681,16 +1681,16 @@ public ModelData copyModelData() { return var1; } - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lic;" + descriptor = "([[IIIIZI)Ljw;" ) - public ModelData method1161(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method1207(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); - int var7 = var2 + this.field1956; - int var8 = var2 + this.field1952; - int var9 = var4 + this.field1955; - int var10 = var4 + this.field1954; + int var7 = var2 + this.field1966; + int var8 = var2 + this.field1968; + int var9 = var4 + this.field1967; + int var10 = var4 + this.field1964; if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { var7 >>= 7; var8 = var8 + 127 >> 7; @@ -1775,8 +1775,8 @@ public ModelData method1161(int[][] var1, int var2, int var3, int var4, boolean } } - @ObfuscatedName("aq") - void method1162() { + @ObfuscatedName("ag") + void method1208() { int[] var1; int var2; int var10002; @@ -1836,8 +1836,8 @@ void method1162() { } - @ObfuscatedName("al") - public void method1163() { + @ObfuscatedName("aa") + public void method1209() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; this.verticesX[var1] = this.verticesZ[var1]; @@ -1847,8 +1847,8 @@ public void method1163() { this.invalidate(); } - @ObfuscatedName("an") - public void method1164() { + @ObfuscatedName("ap") + public void method1210() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesX[var1] = -this.verticesX[var1]; this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1857,8 +1857,8 @@ public void method1164() { this.invalidate(); } - @ObfuscatedName("ar") - public void method1165() { + @ObfuscatedName("ay") + public void method1211() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesZ[var1]; this.verticesZ[var1] = this.verticesX[var1]; @@ -1868,8 +1868,8 @@ public void method1165() { this.invalidate(); } - @ObfuscatedName("ab") - public void method1166(int var1) { + @ObfuscatedName("as") + public void method1212(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1882,7 +1882,7 @@ public void method1166(int var1) { this.invalidate(); } - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1897,7 +1897,7 @@ public void changeOffset(int var1, int var2, int var3) { this.invalidate(); } - @ObfuscatedName("am") + @ObfuscatedName("an") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { @@ -1908,7 +1908,7 @@ public void recolor(short var1, short var2) { } - @ObfuscatedName("ax") + @ObfuscatedName("au") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { @@ -1921,8 +1921,8 @@ public void retexture(short var1, short var2) { } } - @ObfuscatedName("ah") - public void method1170() { + @ObfuscatedName("ai") + public void method1216() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1937,7 +1937,7 @@ public void method1170() { this.invalidate(); } - @ObfuscatedName("as") + @ObfuscatedName("ae") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1949,7 +1949,7 @@ public void resize(int var1, int var2, int var3) { this.invalidate(); } - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { @@ -2025,7 +2025,7 @@ public void calculateVertexNormals() { } } - @ObfuscatedName("aj") + @ObfuscatedName("aq") @Export("invalidate") void invalidate() { this.vertexNormals = null; @@ -2034,43 +2034,43 @@ void invalidate() { this.isBoundsCalculated = false; } - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { super.height = 0; - this.field1953 = 0; - this.field1956 = 999999; - this.field1952 = -999999; - this.field1954 = -99999; - this.field1955 = 99999; + this.field1965 = 0; + this.field1966 = 999999; + this.field1968 = -999999; + this.field1964 = -99999; + this.field1967 = 99999; for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; int var3 = this.verticesY[var1]; int var4 = this.verticesZ[var1]; - if (var2 < this.field1956) { - this.field1956 = var2; + if (var2 < this.field1966) { + this.field1966 = var2; } - if (var2 > this.field1952) { - this.field1952 = var2; + if (var2 > this.field1968) { + this.field1968 = var2; } - if (var4 < this.field1955) { - this.field1955 = var4; + if (var4 < this.field1967) { + this.field1967 = var4; } - if (var4 > this.field1954) { - this.field1954 = var4; + if (var4 > this.field1964) { + this.field1964 = var4; } if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field1953) { - this.field1953 = var3; + if (var3 > this.field1965) { + this.field1965 = var3; } } @@ -2078,9 +2078,9 @@ void calculateBounds() { } } - @ObfuscatedName("ak") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(IIIII)Ljr;" + descriptor = "(IIIII)Ljn;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -2101,38 +2101,38 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } } - var8.field2242 = 0; + var8.field2254 = 0; for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field2242; + ++var8.field2254; } } - var8.field2226 = new int[var8.field2242]; - var8.field2221 = new int[var8.field2242]; - var8.field2227 = new int[var8.field2242]; + var8.field2229 = new int[var8.field2254]; + var8.field2228 = new int[var8.field2254]; + var8.field2239 = new int[var8.field2254]; var10 = 0; int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field2226[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field2221[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field2227[var10] = this.texTriangleZ[var11] & '\uffff'; + var8.field2229[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field2228[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field2239[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.field2209 = new byte[this.faceCount]; + var8.field2222 = new byte[this.faceCount]; for (var11 = 0; var11 < this.faceCount; ++var11) { if (this.textureCoords[var11] != -1) { - var8.field2209[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field2222[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2209[var11] = -1; + var8.field2222[var11] = -1; } } } @@ -2175,7 +2175,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method1177(this.faceColors[var16] & '\uffff', var14); + var8.faceColors1[var16] = method1223(this.faceColors[var16] & '\uffff', var14); var8.faceColors3[var16] = -1; } else if (var17 == 3) { var8.faceColors1[var16] = 128; @@ -2192,7 +2192,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method1177(var15, var14); + var8.faceColors1[var16] = method1223(var15, var14); if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2200,7 +2200,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method1177(var15, var14); + var8.faceColors2[var16] = method1223(var15, var14); if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { var13 = this.vertexVertices[this.indices3[var16]]; } else { @@ -2208,13 +2208,13 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method1177(var15, var14); + var8.faceColors3[var16] = method1223(var15, var14); } } else if (var17 != 0) { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method1178(var14); + var8.faceColors1[var16] = method1224(var14); var8.faceColors3[var16] = -1; } else { var8.faceColors3[var16] = -2; @@ -2227,7 +2227,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method1178(var14); + var8.faceColors1[var16] = method1224(var14); if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2235,7 +2235,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method1178(var14); + var8.faceColors2[var16] = method1224(var14); if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { var13 = this.vertexVertices[this.indices3[var16]]; } else { @@ -2243,11 +2243,11 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method1178(var14); + var8.faceColors3[var16] = method1224(var14); } } - this.method1162(); + this.method1208(); var8.verticesCount = this.verticesCount; var8.verticesX = this.verticesX; var8.verticesY = this.verticesY; @@ -2258,18 +2258,18 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { var8.indices3 = this.indices3; var8.faceRenderPriorities = this.faceRenderPriorities; var8.faceAlphas = this.faceAlphas; - var8.field2235 = this.priority; + var8.field2247 = this.priority; var8.vertexLabels = this.vertexLabels; var8.faceLabelsAlpha = this.faceLabelsAlpha; var8.faceTextures = this.faceTextures; - var8.field2231 = this.field1967; - var8.field2230 = this.field1968; + var8.field2240 = this.field1978; + var8.field2241 = this.field1980; return var8; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lnu;II)Lic;" + descriptor = "(Lom;II)Ljw;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -2277,16 +2277,16 @@ public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) return var3 == null ? null : new ModelData(var3); } - @ObfuscatedName("aw") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lic;Lic;IIIZ)V" + descriptor = "(Ljw;Ljw;IIIZ)V" ) - static void method1175(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method1221(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); var0.calculateVertexNormals(); var1.calculateBounds(); var1.calculateVertexNormals(); - ++field1937; + ++field1949; int var6 = 0; int[] var7 = var1.verticesX; int var8 = var1.verticesCount; @@ -2296,11 +2296,11 @@ static void method1175(ModelData var0, ModelData var1, int var2, int var3, int v VertexNormal var10 = var0.vertexNormals[var9]; if (var10.magnitude != 0) { int var11 = var0.verticesY[var9] - var3; - if (var11 <= var1.field1953) { + if (var11 <= var1.field1965) { int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field1956 && var12 <= var1.field1952) { + if (var12 >= var1.field1966 && var12 <= var1.field1968) { int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field1955 && var13 <= var1.field1954) { + if (var13 >= var1.field1967 && var13 <= var1.field1964) { for (int var14 = 0; var14 < var8; ++var14) { VertexNormal var15 = var1.vertexNormals[var14]; if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { @@ -2331,8 +2331,8 @@ static void method1175(ModelData var0, ModelData var1, int var2, int var3, int v var17.z += var10.z; var17.magnitude += var10.magnitude; ++var6; - field1941[var9] = field1937; - field1939[var14] = field1937; + field1953[var9] = field1949; + field1950[var14] = field1949; } } } @@ -2343,7 +2343,7 @@ static void method1175(ModelData var0, ModelData var1, int var2, int var3, int v if (var6 >= 3 && var5) { for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field1941[var0.indices1[var9]] == field1937 && field1941[var0.indices2[var9]] == field1937 && field1941[var0.indices3[var9]] == field1937) { + if (field1953[var0.indices1[var9]] == field1949 && field1953[var0.indices2[var9]] == field1949 && field1953[var0.indices3[var9]] == field1949) { if (var0.faceRenderTypes == null) { var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -2353,7 +2353,7 @@ static void method1175(ModelData var0, ModelData var1, int var2, int var3, int v } for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field1937 == field1939[var1.indices1[var9]] && field1937 == field1939[var1.indices2[var9]] && field1937 == field1939[var1.indices3[var9]]) { + if (field1949 == field1950[var1.indices1[var9]] && field1949 == field1950[var1.indices2[var9]] && field1949 == field1950[var1.indices3[var9]]) { if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -2365,8 +2365,8 @@ static void method1175(ModelData var0, ModelData var1, int var2, int var3, int v } } - @ObfuscatedName("bh") - static final int method1177(int var0, int var1) { + @ObfuscatedName("ad") + static final int method1223(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2377,8 +2377,8 @@ static final int method1177(int var0, int var1) { return (var0 & 65408) + var1; } - @ObfuscatedName("bj") - static final int method1178(int var0) { + @ObfuscatedName("bn") + static final int method1224(int var0) { if (var0 < 2) { var0 = 2; } else if (var0 > 126) { diff --git a/osrs/src/main/java/ModelData0.java b/osrs/src/main/java/ModelData0.java index e7c0d7815..ca61955a6 100644 --- a/osrs/src/main/java/ModelData0.java +++ b/osrs/src/main/java/ModelData0.java @@ -1,249 +1,21 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Date; - -@ObfuscatedName("jq") +@ObfuscatedName("km") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("az") - static byte[][][] field2282; - - ModelData0() { - } - - @ObfuscatedName("au") + @ObfuscatedName("ao") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("dn") @ObfuscatedSignature( - descriptor = "([FIFZFZ[FI)I", - garbageValue = "1909003343" + descriptor = "[Lun;" ) - public static int method1381(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { - float var7 = 0.0F; - - for (int var8 = 0; var8 < var1 + 1; ++var8) { - var7 += Math.abs(var0[var8]); - } - - float var44 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class126.field1204; - if (var7 <= var44) { - return -1; - } else { - float[] var9 = new float[var1 + 1]; - - int var10; - for (var10 = 0; var10 < var1 + 1; ++var10) { - var9[var10] = 1.0F / var7 * var0[var10]; - } - - while (Math.abs(var9[var1]) < var44) { - --var1; - } - - var10 = 0; - if (var1 == 0) { - return var10; - } else if (var1 == 1) { - var6[0] = -var9[0] / var9[1]; - boolean var11 = var3 ? var2 < var6[0] + var44 : var2 < var6[0] - var44; - boolean var12 = var5 ? var4 > var6[0] - var44 : var4 > var6[0] + var44; - var10 = var11 && var12 ? 1 : 0; - if (var10 > 0) { - if (var3 && var6[0] < var2) { - var6[0] = var2; - } else if (var5 && var6[0] > var4) { - var6[0] = var4; - } - } - - return var10; - } else { - class452 var41 = new class452(var9, var1); - float[] var42 = new float[var1 + 1]; - - for (int var13 = 1; var13 <= var1; ++var13) { - var42[var13 - 1] = (float)var13 * var9[var13]; - } - - float[] var43 = new float[var1 + 1]; - int var14 = method1381(var42, var1 - 1, var2, false, var4, false, var43); - if (var14 == -1) { - return 0; - } else { - boolean var15 = false; - float var17 = 0.0F; - float var18 = 0.0F; - float var19 = 0.0F; - - for (int var20 = 0; var20 <= var14; ++var20) { - if (var10 > var1) { - return var10; - } - - float var16; - if (var20 == 0) { - var16 = var2; - var18 = GrandExchangeEvent.method1953(var9, var1, var2); - if (Math.abs(var18) <= var44 && var3) { - var6[var10++] = var2; - } - } else { - var16 = var19; - var18 = var17; - } - - if (var14 == var20) { - var19 = var4; - var15 = false; - } else { - var19 = var43[var20]; - } - - var17 = GrandExchangeEvent.method1953(var9, var1, var19); - if (var15) { - var15 = false; - } else if (Math.abs(var17) < var44) { - if (var14 != var20 || var5) { - var6[var10++] = var19; - var15 = true; - } - } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { - int var22 = var10++; - float var24 = var16; - float var25 = var19; - float var26 = GrandExchangeEvent.method1953(var41.field3891, var41.field3892, var16); - float var23; - if (Math.abs(var26) < class126.field1204) { - var23 = var16; - } else { - float var27 = GrandExchangeEvent.method1953(var41.field3891, var41.field3892, var19); - if (Math.abs(var27) < class126.field1204) { - var23 = var19; - } else { - float var28 = 0.0F; - float var29 = 0.0F; - float var30 = 0.0F; - float var35 = 0.0F; - boolean var36 = true; - boolean var37 = false; - - do { - var37 = false; - if (var36) { - var28 = var24; - var35 = var26; - var29 = var25 - var24; - var30 = var29; - var36 = false; - } + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; - if (Math.abs(var35) < Math.abs(var27)) { - var24 = var25; - var25 = var28; - var28 = var24; - var26 = var27; - var27 = var35; - var35 = var26; - } - - float var38 = class126.field1203 * Math.abs(var25) + 0.0F; - float var39 = 0.5F * (var28 - var25); - boolean var40 = Math.abs(var39) > var38 && var27 != 0.0F; - if (var40) { - if (Math.abs(var30) >= var38 && Math.abs(var26) > Math.abs(var27)) { - float var34 = var27 / var26; - float var31; - float var32; - if (var24 == var28) { - var31 = var39 * 2.0F * var34; - var32 = 1.0F - var34; - } else { - var32 = var26 / var35; - float var33 = var27 / var35; - var31 = var34 * (var39 * 2.0F * var32 * (var32 - var33) - (var33 - 1.0F) * (var25 - var24)); - var32 = (var33 - 1.0F) * (var32 - 1.0F) * (var34 - 1.0F); - } - - if ((double)var31 > 0.0D) { - var32 = -var32; - } else { - var31 = -var31; - } - - var34 = var30; - var30 = var29; - if (2.0F * var31 < 3.0F * var39 * var32 - Math.abs(var32 * var38) && var31 < Math.abs(var32 * var34 * 0.5F)) { - var29 = var31 / var32; - } else { - var29 = var39; - var30 = var39; - } - } else { - var29 = var39; - var30 = var39; - } - - var24 = var25; - var26 = var27; - if (Math.abs(var29) > var38) { - var25 += var29; - } else if ((double)var39 > 0.0D) { - var25 += var38; - } else { - var25 -= var38; - } - - var27 = GrandExchangeEvent.method1953(var41.field3891, var41.field3892, var25); - if ((double)(var27 * (var35 / Math.abs(var35))) > 0.0D) { - var36 = true; - var37 = true; - } else { - var37 = true; - } - } - } while(var37); - - var23 = var25; - } - } - - var6[var22] = var23; - if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var44) { - var6[var10 - 2] = 0.5F * (var6[var10 - 2] + var6[var10 - 1]); - --var10; - } - } - } - - return var10; - } - } - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "48" - ) - public static void method1382(AbstractArchive var0) { - DbRowType.field4116 = var0; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Ljava/util/Date;I)Z", - garbageValue = "-1268034054" - ) - static boolean method1383(Date var0) { - java.util.Calendar var1 = java.util.Calendar.getInstance(); - var1.set(1, var1.get(1) - 13); - var1.set(5, var1.get(5) + 1); - var1.set(11, 0); - var1.set(12, 0); - var1.set(13, 0); - var1.set(14, 0); - Date var2 = var1.getTime(); - return var0.before(var2); + ModelData0() { } } \ No newline at end of file diff --git a/osrs/src/main/java/MouseHandler.java b/osrs/src/main/java/MouseHandler.java index 655c79267..c8f45ecba 100644 --- a/osrs/src/main/java/MouseHandler.java +++ b/osrs/src/main/java/MouseHandler.java @@ -5,69 +5,78 @@ import java.awt.event.*; -@ObfuscatedName("bf") +@ObfuscatedName("bo") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbo;" ) @Export("MouseHandler_instance") public static MouseHandler MouseHandler_instance; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("MouseHandler_idleCycles") - static volatile int MouseHandler_idleCycles; - @ObfuscatedName("ai") + public static volatile int MouseHandler_idleCycles; + @ObfuscatedName("ah") @Export("MouseHandler_currentButtonVolatile") public static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("MouseHandler_xVolatile") public static volatile int MouseHandler_xVolatile; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("MouseHandler_yVolatile") public static volatile int MouseHandler_yVolatile; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("MouseHandler_lastMovedVolatile") public static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("MouseHandler_x") public static int MouseHandler_x; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("MouseHandler_y") public static int MouseHandler_y; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("MouseHandler_lastButtonVolatile") public static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("MouseHandler_lastPressedXVolatile") public static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("MouseHandler_lastPressedYVolatile") public static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("MouseHandler_lastPressedTimeMillisVolatile") public static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("uf") - @Export("cameraMoveToAcceleration") - static int cameraMoveToAcceleration; + @ObfuscatedName("gy") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("ih") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("ul") + @Export("cameraMoveToY") + static int cameraMoveToY; static { MouseHandler_instance = new MouseHandler(); @@ -93,10 +102,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "-343088867" + descriptor = "(Ljava/awt/event/MouseEvent;B)I", + garbageValue = "29" ) @Export("getButton") final int getButton(MouseEvent var1) { @@ -125,7 +134,7 @@ public final synchronized void mousePressed(MouseEvent var1) { MouseHandler_idleCycles = 0; MouseHandler_lastPressedXVolatile = var1.getX(); MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = GameEngine.clockNow(); + MouseHandler_lastPressedTimeMillisVolatile = GrandExchangeOfferTotalQuantityComparator.method1971(); MouseHandler_lastButtonVolatile = this.getButton(var1); if (MouseHandler_lastButtonVolatile != 0) { MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; @@ -189,46 +198,136 @@ public final synchronized void focusLost(FocusEvent var1) { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-463307133" + descriptor = "(I)V", + garbageValue = "1381957040" ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - class416.addChatMessage(var0, var1, var2, (String)null); + public static void method173() { + class189.field1494.clear(); } - @ObfuscatedName("aq") + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-948962256" + ) + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; + int[] var3 = new int[4]; + var2[0] = var0; + var3[0] = var1; + int var4 = 1; + + for (int var5 = 0; var5 < 4; ++var5) { + if (World.World_sortOption1[var5] != var0) { + var2[var4] = World.World_sortOption1[var5]; + var3[var4] = World.World_sortOption2[var5]; + ++var4; + } + } + + World.World_sortOption1 = var2; + World.World_sortOption2 = var3; + class12.sortWorlds(UserComparator3.World_worlds, 0, UserComparator3.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(III)Lds;", + garbageValue = "332721621" + ) + static Script method175(int var0, int var1) { + Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); + if (var2 != null) { + return var2; + } else { + String var3 = String.valueOf(var0); + int var4 = SongTask.archive12.getGroupId(var3); + if (var4 == -1) { + return null; + } else { + byte[] var5 = SongTask.archive12.takeFileFlat(var4); + if (var5 != null) { + if (var5.length <= 1) { + return null; + } + + var2 = class224.newScript(var5); + if (var2 != null) { + Script.Script_cached.put(var2, (long)(var0 << 16)); + return var2; + } + } + + return null; + } + } + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "65" + ) + static void method177(int var0, int var1, int var2, int var3) { + class319.musicPlayerStatus = var0; + class319.field2794 = var1; + class319.field2793 = var2; + class319.field2795 = var3; + } + + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "412937353" + descriptor = "(ILds;ZI)I", + garbageValue = "671130802" ) - static final void method171(String var0) { - PacketBufferNode var1 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.FRIENDLIST_ADD, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + static int method179(int var0, Script var1, boolean var2) { + return 2; } - @ObfuscatedName("ig") + @ObfuscatedName("hj") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1731210540" + descriptor = "(I)V", + garbageValue = "-1315584412" ) - static void method172(int var0, int var1, int var2) { - if (var0 != 0) { - int var3 = var0 >> 8; - int var4 = var0 >> 4 & 7; - int var5 = var0 & 15; - Client.soundEffectIds[Client.soundEffectCount] = var3; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; - Client.soundEffects[Client.soundEffectCount] = null; - int var6 = (var1 - 64) / 128; - int var7 = (var2 - 64) / 128; - Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); - ++Client.soundEffectCount; + static void method178() { + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1153 = null; + Client.packetWriter.field1154 = null; + Client.packetWriter.field1156 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1152 = 0; + Client.rebootTimer = 0; + class91.method483(); + Client.minimapState = 0; + Client.destinationX = 0; + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; } + + TextureProvider.localPlayer = null; + + for (var0 = 0; var0 < Client.npcs.length; ++var0) { + NPC var1 = Client.npcs[var0]; + if (var1 != null) { + var1.targetIndex = -1; + var1.false0 = false; + } + } + + Tile.method1231(); + DefaultsGroup.updateGameState(30); + + for (var0 = 0; var0 < 100; ++var0) { + Client.field408[var0] = true; + } + + class517.method2533(); } } \ No newline at end of file diff --git a/osrs/src/main/java/MouseRecorder.java b/osrs/src/main/java/MouseRecorder.java index 90c650b6c..3f070070a 100644 --- a/osrs/src/main/java/MouseRecorder.java +++ b/osrs/src/main/java/MouseRecorder.java @@ -1,28 +1,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("dp") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("ja") - static int field873; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("isRunning") boolean isRunning; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("lock") Object lock; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("index") int index; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("xs") int[] xs; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("ys") int[] ys; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("millis") long[] millis; @@ -38,7 +37,7 @@ public class MouseRecorder implements Runnable { @Export("run") @ObfuscatedName("run") public void run() { - for (; this.isRunning; PendingSpawn.method505(50L)) { + for (; this.isRunning; Players.method623(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; @@ -50,4 +49,383 @@ public void run() { } } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-2055845886" + ) + static int method476(int var0) { + return class28.KeyHandler_keyCodes[var0]; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "258753092" + ) + static int method475(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; + } else { + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; + } + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(IIIIIIIILjt;Lih;I)V", + garbageValue = "-737190520" + ) + static final void method477(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap var9) { + ObjectComposition var10 = class91.getObjectDefinition(var4); + int var11 = var7 >= 0 ? var7 : var10.animationId * -1053143457 * 1992396191; + int var12; + int var13; + if (var5 != 1 && var5 != 3) { + var12 = var10.sizeX; + var13 = var10.sizeY; + } else { + var12 = var10.sizeY; + var13 = var10.sizeX; + } + + int var14; + int var15; + if (var12 + var2 <= 104) { + var14 = (var12 >> 1) + var2; + var15 = var2 + (var12 + 1 >> 1); + } else { + var14 = var2; + var15 = var2 + 1; + } + + int var16; + int var17; + if (var3 + var13 <= 104) { + var16 = var3 + (var13 >> 1); + var17 = var3 + (var13 + 1 >> 1); + } else { + var16 = var3; + var17 = var3 + 1; + } + + int[][] var18 = Tiles.Tiles_heights[var1]; + int var19 = var18[var15][var17] + var18[var14][var16] + var18[var15][var16] + var18[var14][var17] >> 2; + int var20 = (var2 << 7) + (var12 << 6); + int var21 = (var3 << 7) + (var13 << 6); + long var22 = GrandExchangeOfferAgeComparator.calculateTag(var2, var3, 2, var10.int1 == 0, var4); + int var24 = (var5 << 6) + var6; + if (var10.int3 == 1) { + var24 += 256; + } + + Object var25; + if (var6 == 22) { + if (var11 == -1 && var10.transforms == null) { + var25 = var10.getModel(22, var5, var18, var20, var19, var21); + } else { + var25 = new DynamicObject(var4, 22, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.newFloorDecoration(var0, var2, var3, var19, (Renderable)var25, var22, var24); + if (var10.interactType == 1) { + var9.setBlockedByFloorDec(var2, var3); + } + + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var11 == -1 && var10.transforms == null) { + var25 = var10.getModel(var6, var5, var18, var20, var19, var21); + } else { + var25 = new DynamicObject(var4, var6, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.method1287(var0, var2, var3, var19, 1, 1, (Renderable)var25, 0, var22, var24); + if (var10.interactType != 0) { + var9.addGameObject(var2, var3, var12, var13, var10.boolean1); + } + + } else if (var6 == 0) { + if (var11 == -1 && var10.transforms == null) { + var25 = var10.getModel(0, var5, var18, var20, var19, var21); + } else { + var25 = new DynamicObject(var4, 0, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.newBoundaryObject(var0, var2, var3, var19, (Renderable)var25, (Renderable)null, Tiles.field844[var5], 0, var22, var24); + if (var10.interactType != 0) { + var9.method1156(var2, var3, var6, var5, var10.boolean1); + } + + } else if (var6 == 1) { + if (var11 == -1 && var10.transforms == null) { + var25 = var10.getModel(1, var5, var18, var20, var19, var21); + } else { + var25 = new DynamicObject(var4, 1, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.newBoundaryObject(var0, var2, var3, var19, (Renderable)var25, (Renderable)null, Tiles.field843[var5], 0, var22, var24); + if (var10.interactType != 0) { + var9.method1156(var2, var3, var6, var5, var10.boolean1); + } + + } else { + int var31; + if (var6 == 2) { + var31 = var5 + 1 & 3; + Object var26; + Object var27; + if (var11 == -1 && var10.transforms == null) { + var26 = var10.getModel(2, var5 + 4, var18, var20, var19, var21); + var27 = var10.getModel(2, var31, var18, var20, var19, var21); + } else { + var26 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + var27 = new DynamicObject(var4, 2, var31, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.newBoundaryObject(var0, var2, var3, var19, (Renderable)var26, (Renderable)var27, Tiles.field844[var5], Tiles.field844[var31], var22, var24); + if (var10.interactType != 0) { + var9.method1156(var2, var3, var6, var5, var10.boolean1); + } + + } else if (var6 == 3) { + if (var11 == -1 && var10.transforms == null) { + var25 = var10.getModel(3, var5, var18, var20, var19, var21); + } else { + var25 = new DynamicObject(var4, 3, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.newBoundaryObject(var0, var2, var3, var19, (Renderable)var25, (Renderable)null, Tiles.field843[var5], 0, var22, var24); + if (var10.interactType != 0) { + var9.method1156(var2, var3, var6, var5, var10.boolean1); + } + + } else if (var6 == 9) { + if (var11 == -1 && var10.transforms == null) { + var25 = var10.getModel(var6, var5, var18, var20, var19, var21); + } else { + var25 = new DynamicObject(var4, var6, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.method1287(var0, var2, var3, var19, 1, 1, (Renderable)var25, 0, var22, var24); + if (var10.interactType != 0) { + var9.addGameObject(var2, var3, var12, var13, var10.boolean1); + } + + } else if (var6 == 4) { + if (var11 == -1 && var10.transforms == null) { + var25 = var10.getModel(4, var5, var18, var20, var19, var21); + } else { + var25 = new DynamicObject(var4, 4, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.newWallDecoration(var0, var2, var3, var19, (Renderable)var25, (Renderable)null, Tiles.field844[var5], 0, 0, 0, var22, var24); + } else { + Object var28; + long var32; + if (var6 == 5) { + var31 = 16; + var32 = var8.getBoundaryObjectTag(var0, var2, var3); + if (0L != var32) { + var31 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var32)).int2; + } + + if (var11 == -1 && var10.transforms == null) { + var28 = var10.getModel(4, var5, var18, var20, var19, var21); + } else { + var28 = new DynamicObject(var4, 4, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.newWallDecoration(var0, var2, var3, var19, (Renderable)var28, (Renderable)null, Tiles.field844[var5], 0, var31 * Tiles.field847[var5], var31 * Tiles.field845[var5], var22, var24); + } else if (var6 == 6) { + var31 = 8; + var32 = var8.getBoundaryObjectTag(var0, var2, var3); + if (0L != var32) { + var31 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var32)).int2 / 2; + } + + if (var11 == -1 && var10.transforms == null) { + var28 = var10.getModel(4, var5 + 4, var18, var20, var19, var21); + } else { + var28 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.newWallDecoration(var0, var2, var3, var19, (Renderable)var28, (Renderable)null, 256, var5, var31 * Tiles.field848[var5], var31 * Tiles.field846[var5], var22, var24); + } else if (var6 == 7) { + int var34 = var5 + 2 & 3; + if (var11 == -1 && var10.transforms == null) { + var25 = var10.getModel(4, var34 + 4, var18, var20, var19, var21); + } else { + var25 = new DynamicObject(var4, 4, var34 + 4, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.newWallDecoration(var0, var2, var3, var19, (Renderable)var25, (Renderable)null, 256, var34, 0, 0, var22, var24); + } else if (var6 == 8) { + var31 = 8; + var32 = var8.getBoundaryObjectTag(var0, var2, var3); + if (0L != var32) { + var31 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var32)).int2 / 2; + } + + int var30 = var5 + 2 & 3; + Object var29; + if (var11 == -1 && var10.transforms == null) { + var28 = var10.getModel(4, var5 + 4, var18, var20, var19, var21); + var29 = var10.getModel(4, var30 + 4, var18, var20, var19, var21); + } else { + var28 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + var29 = new DynamicObject(var4, 4, var30 + 4, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + var8.newWallDecoration(var0, var2, var3, var19, (Renderable)var28, (Renderable)var29, 256, var5, var31 * Tiles.field848[var5], var31 * Tiles.field846[var5], var22, var24); + } + } + } + } else { + if (var11 == -1 && var10.transforms == null) { + var25 = var10.getModel(10, var5, var18, var20, var19, var21); + } else { + var25 = new DynamicObject(var4, 10, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); + } + + if (var25 != null) { + var8.method1287(var0, var2, var3, var19, var12, var13, (Renderable)var25, var6 == 11 ? 256 : 0, var22, var24); + } + + if (var10.interactType != 0) { + var9.addGameObject(var2, var3, var12, var13, var10.boolean1); + } + + } + } + + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "-1742769560" + ) + static final void method478(int var0, int var1, boolean var2) { + if (!var2 || var0 != class94.timeOfPreviousKeyPress || class365.field3199 != var1) { + class94.timeOfPreviousKeyPress = var0; + class365.field3199 = var1; + DefaultsGroup.updateGameState(25); + class427.drawLoadingMessage("Loading - please wait.", true); + int var3 = class20.baseX; + int var4 = class19.baseY; + class20.baseX = (var0 - 6) * 8; + class19.baseY = (var1 - 6) * 8; + int var5 = class20.baseX - var3; + int var6 = class19.baseY - var4; + var3 = class20.baseX; + var4 = class19.baseY; + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 65536; ++var7) { + NPC var8 = Client.npcs[var7]; + if (var8 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var8.pathX; + var10000[var9] -= var5; + var10000 = var8.pathY; + var10000[var9] -= var6; + } + + var8.x -= var5 * 128; + var8.y -= var6 * 128; + } + } + + for (var7 = 0; var7 < 2048; ++var7) { + Player var21 = Client.players[var7]; + if (var21 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var21.pathX; + var10000[var9] -= var5; + var10000 = var21.pathY; + var10000[var9] -= var6; + } + + var21.x -= var5 * 128; + var21.y -= var6 * 128; + } + } + + byte var20 = 0; + byte var18 = 104; + byte var22 = 1; + if (var5 < 0) { + var20 = 103; + var18 = -1; + var22 = -1; + } + + byte var10 = 0; + byte var11 = 104; + byte var12 = 1; + if (var6 < 0) { + var10 = 103; + var11 = -1; + var12 = -1; + } + + int var14; + for (int var13 = var20; var18 != var13; var13 += var22) { + for (var14 = var10; var14 != var11; var14 += var12) { + int var15 = var5 + var13; + int var16 = var6 + var14; + + for (int var17 = 0; var17 < 4; ++var17) { + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + } else { + Client.groundItems[var17][var13][var14] = null; + } + } + } + } + + for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { + var19.x -= var5; + var19.y -= var6; + if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { + var19.remove(); + } + } + + if (Client.destinationX != 0) { + Client.destinationX -= var5; + Client.destinationY -= var6; + } + + Client.soundEffectCount = 0; + Client.isCameraLocked = false; + Client.cameraX -= var5 << 7; + WorldMapArea.cameraZ -= var6 << 7; + ChatChannel.oculusOrbFocalPointX -= var5 << 7; + AbstractWorldMapData.oculusOrbFocalPointY -= var6 << 7; + Client.field539 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14].clear(); + } + + } + } + + @ObfuscatedName("np") + @ObfuscatedSignature( + descriptor = "(Lnm;I)I", + garbageValue = "-1186602538" + ) + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); + return var1 != null ? var1.integer : var0.flags; + } } \ No newline at end of file diff --git a/osrs/src/main/java/MouseWheelHandler.java b/osrs/src/main/java/MouseWheelHandler.java index 6c62cb0cd..8bcc01c94 100644 --- a/osrs/src/main/java/MouseWheelHandler.java +++ b/osrs/src/main/java/MouseWheelHandler.java @@ -7,10 +7,10 @@ import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; -@ObfuscatedName("ay") +@ObfuscatedName("aq") @Implements("MouseWheelHandler") -public final class MouseWheelHandler implements class174, MouseWheelListener { - @ObfuscatedName("au") +public final class MouseWheelHandler implements class176, MouseWheelListener { + @ObfuscatedName("ac") @Export("rotation") int rotation; @@ -18,29 +18,29 @@ public final class MouseWheelHandler implements class174, MouseWheelListener { this.rotation = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;S)V", - garbageValue = "-260" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "1378624213" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "0" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-65029558" ) - void method71(Component var1) { + void method79(Component var1) { var1.removeMouseWheelListener(this); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2061400252" + garbageValue = "1993578896" ) @Export("useRotation") public synchronized int useRotation() { diff --git a/osrs/src/main/java/MoveSpeed.java b/osrs/src/main/java/MoveSpeed.java index a8b731909..53c2b2344 100644 --- a/osrs/src/main/java/MoveSpeed.java +++ b/osrs/src/main/java/MoveSpeed.java @@ -3,37 +3,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +import java.util.Date; + +@ObfuscatedName("ip") @Implements("MoveSpeed") -public enum MoveSpeed implements class371 { - @ObfuscatedName("au") +public enum MoveSpeed implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lip;" ) @Export("STATIONARY") STATIONARY((byte)-1), - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lip;" ) @Export("CRAWL") CRAWL((byte)0), - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lip;" ) @Export("WALK") WALK((byte)1), - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lip;" ) @Export("RUN") RUN((byte)2); - @ObfuscatedName("ap") - static byte[][][] field1924; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("speed") public byte speed; @@ -41,66 +41,38 @@ public enum MoveSpeed implements class371 { this.speed = var3; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { return this.speed; } - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "-51" + descriptor = "(Ljava/util/Date;B)Z", + garbageValue = "-81" ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; + static boolean method1187(Date var0) { + Date var1 = class314.method1652(); + return var0.after(var1); } - @ObfuscatedName("ao") + @ObfuscatedName("of") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1754323091" + descriptor = "(Lnm;IB)Ljava/lang/String;", + garbageValue = "-29" ) - public static int method1141(int var0) { - return (var0 & class508.field4120) - 1; - } - - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-4242" - ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (ModeWhere.loadInterface(var0)) { - Widget[] var1 = PacketBufferNode.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3.onLoad != null) { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onLoad; - NPC.runScript(var4, 5000000, 0); - } - } - - } + static String method1188(Widget var0, int var1) { + int var3 = MouseRecorder.getWidgetFlags(var0); + boolean var2 = (var3 >> var1 + 1 & 1) != 0; + if (!var2 && var0.onOp == null) { + return null; + } else { + return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; } } - - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "-77" - ) - static Object method1143(int var0) { - return class172.method908((class502)KeyHandler.findEnumerated(class502.method2494(), var0)); - } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatch.java b/osrs/src/main/java/MusicPatch.java index 0b430eaf4..69d2c6c74 100644 --- a/osrs/src/main/java/MusicPatch.java +++ b/osrs/src/main/java/MusicPatch.java @@ -6,44 +6,44 @@ import java.util.ArrayList; import java.util.BitSet; -@ObfuscatedName("ll") +@ObfuscatedName("mq") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("au") - int field2826; - @ObfuscatedName("ao") + @ObfuscatedName("ac") + int field2849; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "[Lcf;" + descriptor = "[Lcu;" ) @Export("rawSounds") class53[] rawSounds; - @ObfuscatedName("at") - short[] field2830; - @ObfuscatedName("ac") - byte[] field2822; - @ObfuscatedName("ai") - byte[] field2823; - @ObfuscatedName("az") + @ObfuscatedName("ax") + short[] field2853; + @ObfuscatedName("ao") + byte[] field2847; + @ObfuscatedName("ah") + byte[] field2846; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "[Llj;" + descriptor = "[Lmx;" ) - MusicPatchNode2[] field2829; - @ObfuscatedName("ap") - byte[] field2824; - @ObfuscatedName("aa") - ArrayList field2828; - @ObfuscatedName("af") - int[] field2827; + MusicPatchNode2[] field2852; + @ObfuscatedName("ab") + byte[] field2845; + @ObfuscatedName("am") + ArrayList field2851; + @ObfuscatedName("av") + int[] field2850; MusicPatch(byte[] var1) { - this.field2828 = new ArrayList(8); + this.field2851 = new ArrayList(8); this.rawSounds = new class53[128]; - this.field2830 = new short[128]; - this.field2822 = new byte[128]; - this.field2823 = new byte[128]; - this.field2829 = new MusicPatchNode2[128]; - this.field2824 = new byte[128]; - this.field2827 = new int[128]; + this.field2853 = new short[128]; + this.field2847 = new byte[128]; + this.field2846 = new byte[128]; + this.field2852 = new MusicPatchNode2[128]; + this.field2845 = new byte[128]; + this.field2850 = new int[128]; Buffer var2 = new Buffer(var1); int var3; @@ -123,13 +123,13 @@ public class MusicPatch extends Node { var38 = var37[var14] = new MusicPatchNode2(); int var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2758 = new byte[var16 * 2]; + var38.field2779 = new byte[var16 * 2]; } var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2757 = new byte[var16 * 2 + 2]; - var38.field2757[1] = 64; + var38.field2780 = new byte[var16 * 2 + 2]; + var38.field2780[1] = 64; } } @@ -156,7 +156,7 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - this.field2830[var20] = (short)var19; + this.field2853[var20] = (short)var19; } var19 = 0; @@ -164,7 +164,7 @@ public class MusicPatch extends Node { short[] var48; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - var48 = this.field2830; + var48 = this.field2853; var48[var20] = (short)(var48[var20] + (var19 << 8)); } @@ -184,9 +184,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); } - var48 = this.field2830; + var48 = this.field2853; var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field2827[var23] = var22; + this.field2850[var23] = var22; --var20; } @@ -196,7 +196,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { - if (this.field2827[var24] != 0) { + if (this.field2850[var24] != 0) { if (var20 == 0) { if (var21 < var4.length) { var20 = var4[var21++]; @@ -207,7 +207,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; } - this.field2824[var24] = (byte)var23; + this.field2845[var24] = (byte)var23; --var20; } } @@ -217,7 +217,7 @@ public class MusicPatch extends Node { var24 = 0; for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2827[var25] != 0) { + if (this.field2850[var25] != 0) { if (var20 == 0) { if (var21 < var7.length) { var20 = var7[var21++]; @@ -228,7 +228,7 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; } - this.field2823[var25] = (byte)var24; + this.field2846[var25] = (byte)var24; --var20; } } @@ -239,7 +239,7 @@ public class MusicPatch extends Node { int var26; for (var26 = 0; var26 < 128; ++var26) { - if (this.field2827[var26] != 0) { + if (this.field2850[var26] != 0) { if (var20 == 0) { var40 = var37[var36[var21]]; if (var21 < var10.length) { @@ -249,7 +249,7 @@ public class MusicPatch extends Node { } } - this.field2829[var26] = var40; + this.field2852[var26] = var40; --var20; } } @@ -267,30 +267,30 @@ public class MusicPatch extends Node { var20 = -1; } - if (this.field2827[var27] > 0) { + if (this.field2850[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field2822[var27] = (byte)var26; + this.field2847[var27] = (byte)var26; --var20; } - this.field2826 = var2.readUnsignedByte() + 1; + this.field2849 = var2.readUnsignedByte() + 1; MusicPatchNode2 var28; int var29; for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2758 != null) { - for (var29 = 1; var29 < var28.field2758.length; var29 += 2) { - var28.field2758[var29] = var2.readByte(); + if (var28.field2779 != null) { + for (var29 = 1; var29 < var28.field2779.length; var29 += 2) { + var28.field2779[var29] = var2.readByte(); } } - if (var28.field2757 != null) { - for (var29 = 3; var29 < var28.field2757.length - 2; var29 += 2) { - var28.field2757[var29] = var2.readByte(); + if (var28.field2780 != null) { + for (var29 = 3; var29 < var28.field2780.length - 2; var29 += 2) { + var28.field2780[var29] = var2.readByte(); } } } @@ -309,24 +309,24 @@ public class MusicPatch extends Node { for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2757 != null) { + if (var28.field2780 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2757.length; var29 += 2) { + for (var29 = 2; var29 < var28.field2780.length; var29 += 2) { var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2757[var29] = (byte)var19; + var28.field2780[var29] = (byte)var19; } } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2758 != null) { + if (var28.field2779 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2758.length; var29 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2758[var29] = (byte)var19; + for (var29 = 2; var29 < var28.field2779.length; var29 += 2) { + var19 = 1 + var19 + var2.readUnsignedByte(); + var28.field2779[var29] = (byte)var19; } } } @@ -350,7 +350,7 @@ public class MusicPatch extends Node { byte var41 = var45[1]; for (var29 = 0; var29 < var44; ++var29) { - this.field2822[var29] = (byte)(var41 * this.field2822[var29] + 32 >> 6); + this.field2847[var29] = (byte)(var41 * this.field2847[var29] + 32 >> 6); } for (var29 = 2; var29 < var45.length; var29 += 2) { @@ -359,8 +359,8 @@ public class MusicPatch extends Node { var32 = var41 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = SecureRandomFuture.method439(var32, var30 - var44); - this.field2822[var33] = (byte)(var34 * this.field2822[var33] + 32 >> 6); + var34 = VarcInt.method974(var32, var30 - var44); + this.field2847[var33] = (byte)(var34 * this.field2847[var33] + 32 >> 6); var32 += var31 - var41; } @@ -369,7 +369,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - this.field2822[var42] = (byte)(var41 * this.field2822[var42] + 32 >> 6); + this.field2847[var42] = (byte)(var41 * this.field2847[var42] + 32 >> 6); } var38 = null; @@ -380,7 +380,7 @@ public class MusicPatch extends Node { var39[0] = (byte)var19; for (var27 = 2; var27 < var39.length; var27 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); + var19 = 1 + var19 + var2.readUnsignedByte(); var39[var27] = (byte)var19; } @@ -388,7 +388,7 @@ public class MusicPatch extends Node { int var47 = var39[1] << 1; for (var29 = 0; var29 < var44; ++var29) { - var42 = var47 + (this.field2823[var29] & 255); + var42 = var47 + (this.field2846[var29] & 255); if (var42 < 0) { var42 = 0; } @@ -397,7 +397,7 @@ public class MusicPatch extends Node { var42 = 128; } - this.field2823[var29] = (byte)var42; + this.field2846[var29] = (byte)var42; } int var43; @@ -407,8 +407,8 @@ public class MusicPatch extends Node { var32 = var47 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = SecureRandomFuture.method439(var32, var30 - var44); - int var35 = var34 + (this.field2823[var33] & 255); + var34 = VarcInt.method974(var32, var30 - var44); + int var35 = var34 + (this.field2846[var33] & 255); if (var35 < 0) { var35 = 0; } @@ -417,7 +417,7 @@ public class MusicPatch extends Node { var35 = 128; } - this.field2823[var33] = (byte)var35; + this.field2846[var33] = (byte)var35; var32 += var43 - var47; } @@ -426,7 +426,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - var43 = var47 + (this.field2823[var42] & 255); + var43 = var47 + (this.field2846[var42] & 255); if (var43 < 0) { var43 = 0; } @@ -435,57 +435,57 @@ public class MusicPatch extends Node { var43 = 128; } - this.field2823[var42] = (byte)var43; + this.field2846[var42] = (byte)var43; } Object var46 = null; } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2762 = var2.readUnsignedByte(); + var37[var27].field2783 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2758 != null) { - var28.field2764 = var2.readUnsignedByte(); + if (var28.field2779 != null) { + var28.field2787 = var2.readUnsignedByte(); } - if (var28.field2757 != null) { - var28.field2760 = var2.readUnsignedByte(); + if (var28.field2780 != null) { + var28.field2785 = var2.readUnsignedByte(); } - if (var28.field2762 > 0) { - var28.field2761 = var2.readUnsignedByte(); + if (var28.field2783 > 0) { + var28.field2782 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2763 = var2.readUnsignedByte(); + var37[var27].field2781 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2763 > 0) { - var28.field2765 = var2.readUnsignedByte(); + if (var28.field2781 > 0) { + var28.field2786 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2765 > 0) { - var28.field2759 = var2.readUnsignedByte(); + if (var28.field2786 > 0) { + var28.field2784 = var2.readUnsignedByte(); } } } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lbi;Ljava/util/BitSet;I)Z", - garbageValue = "-1836403783" + descriptor = "(Lbl;Ljava/util/BitSet;I)Z", + garbageValue = "-461548778" ) - boolean method1682(SoundCache var1, BitSet var2) { + boolean method1714(SoundCache var1, BitSet var2) { boolean var3 = true; int var4 = 0; class53 var5 = new class53(); @@ -496,26 +496,26 @@ boolean method1682(SoundCache var1, BitSet var2) { for (int var8 = var6; var8 < var7; ++var8) { if (var2.get(var8)) { - int var9 = this.field2827[var8]; + int var9 = this.field2850[var8]; if (var9 != 0) { - if (var9 != var4) { + if (var4 != var9) { var4 = var9--; if ((var9 & 1) == 0) { - var5 = new class53(var1.method225(var9 >> 2)); + var5 = new class53(var1.method233(var9 >> 2)); } else { - var5 = var1.method223(var9 >> 2); + var5 = var1.method232(var9 >> 2); } - if (var5.method289()) { + if (var5.method298()) { var3 = false; } else { - this.field2828.add(this.field2828.size(), var5); + this.field2851.add(this.field2851.size(), var5); } } - if (!var5.method289()) { + if (!var5.method298()) { this.rawSounds[var8] = var5; - this.field2827[var8] = 0; + this.field2850[var8] = 0; } } } @@ -525,13 +525,44 @@ boolean method1682(SoundCache var1, BitSet var2) { return var3; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1286940116" + descriptor = "(B)V", + garbageValue = "-14" ) @Export("clear") void clear() { - this.field2827 = null; + this.field2850 = null; + } + + @ObfuscatedName("in") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1601039867" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.playingJingle) { + ItemComposition.method1088(0, 0); + } else if (var0 != -1) { + boolean var1; + if (class319.field2789.isEmpty()) { + var1 = false; + } else { + MusicSong var2 = (MusicSong)class319.field2789.get(0); + var1 = var2 != null && var0 == var2.musicTrackGroupId; + } + + if (!var1 && class91.clientPreferences.getCurrentMusicVolume() != 0) { + ArrayList var3 = new ArrayList(); + var3.add(new MusicSong(CollisionMap.archive6, var0, 0, class91.clientPreferences.getCurrentMusicVolume(), false)); + if (Client.playingJingle) { + class275.method1538(var3, 0, 100, 100, 0); + } else { + class148.method776(var3, 0, 100, 100, 0, false); + } + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatchNode.java b/osrs/src/main/java/MusicPatchNode.java index 3cbdcdd23..b6f0e7f79 100644 --- a/osrs/src/main/java/MusicPatchNode.java +++ b/osrs/src/main/java/MusicPatchNode.java @@ -3,79 +3,79 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mg") +@ObfuscatedName("ms") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("au") - int field2854; - @ObfuscatedName("ae") + @ObfuscatedName("ac") + int field2865; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lll;" + descriptor = "Lmq;" ) @Export("table") MusicPatch table; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lbu;" + descriptor = "Lbs;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Llj;" + descriptor = "Lmx;" ) - MusicPatchNode2 field2857; - @ObfuscatedName("ac") - int field2842; - @ObfuscatedName("ai") - int field2847; - @ObfuscatedName("az") - int field2856; - @ObfuscatedName("ap") - int field2851; - @ObfuscatedName("aa") - int field2840; - @ObfuscatedName("af") - int field2844; - @ObfuscatedName("ad") - int field2843; - @ObfuscatedName("aq") - int field2852; - @ObfuscatedName("al") - int field2848; - @ObfuscatedName("an") - int field2850; + MusicPatchNode2 field2881; + @ObfuscatedName("ao") + int field2872; + @ObfuscatedName("ah") + int field2868; @ObfuscatedName("ar") - int field2853; + int field2875; @ObfuscatedName("ab") - int field2841; - @ObfuscatedName("ag") - int field2845; + int field2864; @ObfuscatedName("am") - int field2849; - @ObfuscatedName("ax") + int field2870; + @ObfuscatedName("av") + int field2878; + @ObfuscatedName("ag") + int field2867; + @ObfuscatedName("aa") + int field2863; + @ObfuscatedName("ap") + int field2873; + @ObfuscatedName("ay") + int field2879; + @ObfuscatedName("as") + int field2876; + @ObfuscatedName("aj") + int field2869; + @ObfuscatedName("an") + int field2871; + @ObfuscatedName("au") + int field2877; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lbn;" + descriptor = "Lbx;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("ah") - int field2846; - @ObfuscatedName("ay") - int field2855; + @ObfuscatedName("ae") + int field2866; + @ObfuscatedName("aq") + int field2874; MusicPatchNode() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-26" + garbageValue = "60" ) - void method1696() { + void method1727() { this.table = null; this.rawSound = null; - this.field2857 = null; + this.field2881 = null; this.stream = null; } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatchNode2.java b/osrs/src/main/java/MusicPatchNode2.java index 89684235c..1080bc9d5 100644 --- a/osrs/src/main/java/MusicPatchNode2.java +++ b/osrs/src/main/java/MusicPatchNode2.java @@ -1,42 +1,185 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +import java.util.Arrays; + +@ObfuscatedName("mx") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("uz") - @Export("cameraLookAtHeight") - static int cameraLookAtHeight; - @ObfuscatedName("au") - byte[] field2758; - @ObfuscatedName("ae") - byte[] field2757; - @ObfuscatedName("ao") - int field2762; - @ObfuscatedName("at") - int field2764; + @ObfuscatedName("da") + static boolean field2778; @ObfuscatedName("ac") - int field2760; - @ObfuscatedName("ai") - int field2761; - @ObfuscatedName("az") - int field2765; - @ObfuscatedName("ap") - int field2763; - @ObfuscatedName("aa") - int field2759; + byte[] field2779; + @ObfuscatedName("al") + byte[] field2780; + @ObfuscatedName("ak") + int field2783; + @ObfuscatedName("ax") + int field2787; + @ObfuscatedName("ao") + int field2785; + @ObfuscatedName("ah") + int field2782; + @ObfuscatedName("ar") + int field2786; + @ObfuscatedName("ab") + int field2781; + @ObfuscatedName("am") + int field2784; MusicPatchNode2() { } - @ObfuscatedName("oe") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "31198036" + descriptor = "(ZB)V", + garbageValue = "15" ) - static void method1625(int var0) { - Client.oculusOrbState = var0; + static void method1657(boolean var0) { + byte var1 = 0; + boolean var2 = class91.clientPreferences.method560() >= Client.param21; + if (!var2) { + var1 = 12; + } else if (class159.client.method357() || class159.client.method359() || class159.client.method358()) { + var1 = 10; + } + + GameEngine.method166(var1); + if (var0) { + Login.Login_username = ""; + Login.Login_password = ""; + ClientPreferences.field1059 = 0; + class186.otp = ""; + } + + class188.method955(); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + + } + + @ObfuscatedName("hz") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static void method1658() { + Client.mouseLastLastPressedTimeMillis = -1L; + class233.mouseRecorder.index = 0; + KeyHandler.hasFocus = true; + Client.hadFocus = true; + Client.timeOfPreviousKeyPress = -1L; + class36.reflectionChecks = new IterableNodeDeque(); + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1153 = null; + Client.packetWriter.field1154 = null; + Client.packetWriter.field1156 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1152 = 0; + Client.rebootTimer = 0; + Client.logoutTimer = 0; + Client.hintArrowType = 0; + class91.method483(); + class138.method733(0); + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; + Client.isItemSelected = 0; + Client.isSpellSelected = false; + Client.soundEffectCount = 0; + Client.camAngleY = 0; + Client.oculusOrbState = 0; + WallDecoration.field2303 = null; + Client.minimapState = 0; + Client.field539 = -1; + Client.destinationX = 0; + Client.destinationY = 0; + Client.playerAttackOption = AttackOption.AttackOption_hidden; + Client.npcAttackOption = AttackOption.AttackOption_hidden; + Client.npcCount = 0; + class11.method39(); + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; + } + + for (var0 = 0; var0 < 65536; ++var0) { + Client.npcs[var0] = null; + } + + Client.combatTargetPlayerIndex = -1; + Client.projectiles.clear(); + Client.graphicsObjects.clear(); + + for (var0 = 0; var0 < 4; ++var0) { + for (int var1 = 0; var1 < 104; ++var1) { + for (int var2 = 0; var2 < 104; ++var2) { + Client.groundItems[var0][var1][var2] = null; + } + } + } + + Client.pendingSpawns = new NodeDeque(); + InvDefinition.friendSystem.clear(); + if (VarpDefinition.field1501 > 5000) { + } + + for (var0 = 0; var0 < VarpDefinition.field1501; ++var0) { + VarpDefinition var3 = class150.VarpDefinition_get(var0); + if (var3 != null) { + Varps.Varps_temp[var0] = 0; + Varps.Varps_main[var0] = 0; + } + } + + class33.varcs.clearTransient(); + Client.followerIndex = -1; + if (Client.rootInterface != -1) { + class33.field89.method1743(Client.rootInterface); + } + + for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { + ArchiveDisk.closeInterface(var4, true); + } + + Client.rootInterface = -1; + Client.interfaceParents = new NodeHashTable(8); + Client.meslayerContinueWidget = null; + class91.method483(); + Client.playerAppearance.method1750((int[])null, (int[])null, new int[]{0, 0, 0, 0, 0}, 0, -1); + + for (var0 = 0; var0 < 8; ++var0) { + Client.playerMenuActions[var0] = null; + Client.playerOptionsPriorities[var0] = false; + } + + Tile.method1231(); + Client.isLoading = true; + + for (var0 = 0; var0 < 100; ++var0) { + Client.field408[var0] = true; + } + + class517.method2533(); + class358.friendsChat = null; + VerticalAlignment.guestClanSettings = null; + Arrays.fill(Client.currentClanSettings, (Object)null); + ClanChannelMember.guestClanChannel = null; + Arrays.fill(Client.currentClanChannels, (Object)null); + + for (var0 = 0; var0 < 8; ++var0) { + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + Varps.grandExchangeEvents = null; + Client.reloadJS5 = false; } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatchPcmStream.java b/osrs/src/main/java/MusicPatchPcmStream.java index f2e13bcf7..6463dd65a 100644 --- a/osrs/src/main/java/MusicPatchPcmStream.java +++ b/osrs/src/main/java/MusicPatchPcmStream.java @@ -3,39 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mh") +@ObfuscatedName("mn") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("cq") - @Export("param9") - static String param9; - @ObfuscatedName("da") + @ObfuscatedName("ar") + public static int field2855; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Luk;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Lmt;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lbl;" + descriptor = "Lbm;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Llf;)V" + descriptor = "(Lmt;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -43,48 +36,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lmg;[IIIII)V", - garbageValue = "-1470888543" + descriptor = "(Lms;[IIIII)V", + garbageValue = "1027988933" ) - void method1693(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2790[var1.field2854] & 4) != 0 && var1.field2853 < 0) { - int var6 = this.superStream.field2798[var1.field2854] / PcmPlayer.field181; + void method1723(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2812[var1.field2865] & 4) != 0 && var1.field2876 < 0) { + int var6 = this.superStream.field2813[var1.field2865] / PcmPlayer.field179; while (true) { - int var7 = (var6 + 1048575 - var1.field2855) / var6; + int var7 = (var6 + 1048575 - var1.field2874) / var6; if (var7 > var4) { - var1.field2855 += var6 * var4; + var1.field2874 += var4 * var6; break; } var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; - var1.field2855 += var7 * var6 - 1048576; - int var8 = PcmPlayer.field181 / 100; + var1.field2874 += var7 * var6 - 1048576; + int var8 = PcmPlayer.field179 / 100; int var9 = 262144 / var6; if (var9 < var8) { var8 = var9; } RawPcmStream var10 = var1.stream; - if (this.superStream.field2792[var1.field2854] == 0) { - var1.stream = RawPcmStream.method235(var1.rawSound, var10.method250(), var10.method241(), var10.method242()); + if (this.superStream.field2824[var1.field2865] == 0) { + var1.stream = RawPcmStream.method244(var1.rawSound, var10.method259(), var10.method250(), var10.method251()); } else { - var1.stream = RawPcmStream.method235(var1.rawSound, var10.method250(), 0, var10.method242()); - this.superStream.method1642(var1, var1.table.field2830[var1.field2847] < 0); - var1.stream.method246(var8, var10.method241()); + var1.stream = RawPcmStream.method244(var1.rawSound, var10.method259(), 0, var10.method251()); + this.superStream.method1675(var1, var1.table.field2853[var1.field2868] < 0); + var1.stream.method255(var8, var10.method250()); } - if (var1.table.field2830[var1.field2847] < 0) { + if (var1.table.field2853[var1.field2868] < 0) { var1.stream.setNumLoops(-1); } - var10.method248(var8); + var10.method257(var8); var10.fill(var2, var3, var5 - var3); - if (var10.method252()) { + if (var10.method261()) { this.mixer.addSubStream(var10); } } @@ -93,38 +86,38 @@ void method1693(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { var1.stream.fill(var2, var3, var4); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lmg;II)V", - garbageValue = "-2042371851" + descriptor = "(Lms;II)V", + garbageValue = "1919662235" ) - void method1694(MusicPatchNode var1, int var2) { - if ((this.superStream.field2790[var1.field2854] & 4) != 0 && var1.field2853 < 0) { - int var3 = this.superStream.field2798[var1.field2854] / PcmPlayer.field181; - int var4 = (var3 + 1048575 - var1.field2855) / var3; - var1.field2855 = var3 * var2 + var1.field2855 & 1048575; + void method1724(MusicPatchNode var1, int var2) { + if ((this.superStream.field2812[var1.field2865] & 4) != 0 && var1.field2876 < 0) { + int var3 = this.superStream.field2813[var1.field2865] / PcmPlayer.field179; + int var4 = (var3 + 1048575 - var1.field2874) / var3; + var1.field2874 = var3 * var2 + var1.field2874 & 1048575; if (var4 <= var2) { - if (this.superStream.field2792[var1.field2854] == 0) { - var1.stream = RawPcmStream.method235(var1.rawSound, var1.stream.method250(), var1.stream.method241(), var1.stream.method242()); + if (this.superStream.field2824[var1.field2865] == 0) { + var1.stream = RawPcmStream.method244(var1.rawSound, var1.stream.method259(), var1.stream.method250(), var1.stream.method251()); } else { - var1.stream = RawPcmStream.method235(var1.rawSound, var1.stream.method250(), 0, var1.stream.method242()); - this.superStream.method1642(var1, var1.table.field2830[var1.field2847] < 0); + var1.stream = RawPcmStream.method244(var1.rawSound, var1.stream.method259(), 0, var1.stream.method251()); + this.superStream.method1675(var1, var1.table.field2853[var1.field2868] < 0); } - if (var1.table.field2830[var1.field2847] < 0) { + if (var1.table.field2853[var1.field2868] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2855 / var3; + var2 = var1.field2874 / var3; } } var1.stream.skip(var2); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "()Lbw;" + descriptor = "()Lbi;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -136,9 +129,9 @@ protected PcmStream firstSubStream() { } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "()Lbw;" + descriptor = "()Lbi;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -153,68 +146,71 @@ protected PcmStream nextSubStream() { return var1.stream; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("vmethod5648") protected int vmethod5648() { return 0; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method1665(var6)) { + if (!this.superStream.method1697(var6)) { int var4 = var2; int var5 = var3; do { - if (var5 <= var6.field2846) { - this.method1693(var6, var1, var4, var5, var5 + var4); - var6.field2846 -= var5; + if (var5 <= var6.field2866) { + this.method1723(var6, var1, var4, var5, var5 + var4); + var6.field2866 -= var5; break; } - this.method1693(var6, var1, var4, var6.field2846, var4 + var5); - var4 += var6.field2846; - var5 -= var6.field2846; - } while(!this.superStream.method1666(var6, var1, var4, var5)); + this.method1723(var6, var1, var4, var6.field2866, var4 + var5); + var4 += var6.field2866; + var5 -= var6.field2866; + } while(!this.superStream.method1698(var6, var1, var4, var5)); } } } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method1665(var3)) { + if (!this.superStream.method1697(var3)) { int var2 = var1; do { - if (var2 <= var3.field2846) { - this.method1694(var3, var2); - var3.field2846 -= var2; + if (var2 <= var3.field2866) { + this.method1724(var3, var2); + var3.field2866 -= var2; break; } - this.method1694(var3, var3.field2846); - var2 -= var3.field2846; - } while(!this.superStream.method1666(var3, (int[])null, 0, var2)); + this.method1724(var3, var3.field2866); + var2 -= var3.field2866; + } while(!this.superStream.method1698(var3, (int[])null, 0, var2)); } } } - @ObfuscatedName("au") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "8192" + descriptor = "(I)V", + garbageValue = "120235827" ) - public static int method1690() { - return ++MouseHandler.MouseHandler_idleCycles - 1; + public static void method1725() { + ObjectComposition.ObjectDefinition_cached.clear(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + ObjectComposition.ObjectDefinition_cachedEntities.clear(); + ObjectComposition.HitSplatDefinition_cachedSprites.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicSong.java b/osrs/src/main/java/MusicSong.java index cab615059..e5fb95d3a 100644 --- a/osrs/src/main/java/MusicSong.java +++ b/osrs/src/main/java/MusicSong.java @@ -3,90 +3,90 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mu") +@ObfuscatedName("mv") @Implements("MusicSong") public class MusicSong { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("musicTrackArchive") public AbstractArchive musicTrackArchive; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("musicTrackGroupId") public int musicTrackGroupId; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("musicTrackFileId") public int musicTrackFileId; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("musicTrackVolume") public int musicTrackVolume; - @ObfuscatedName("ac") - public float field2867; - @ObfuscatedName("ai") + @ObfuscatedName("ao") + public float field2888; + @ObfuscatedName("ah") @Export("musicTrackBoolean") public boolean musicTrackBoolean; - @ObfuscatedName("az") - public boolean field2866; - @ObfuscatedName("ap") - public boolean field2865; - @ObfuscatedName("aa") - public boolean field2862; - @ObfuscatedName("af") - public boolean field2863; - @ObfuscatedName("ad") + @ObfuscatedName("ar") + public boolean field2887; + @ObfuscatedName("ab") + public boolean field2884; + @ObfuscatedName("am") + public boolean field2886; + @ObfuscatedName("av") + boolean field2882; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Lmt;" ) @Export("midiPcmStream") public MidiPcmStream midiPcmStream; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lbi;" + descriptor = "Lbl;" ) - public SoundCache field2861; - @ObfuscatedName("al") + public SoundCache field2883; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmk;" ) - public MusicTrack field2872; + public MusicTrack field2892; @ObfuscatedSignature( - descriptor = "(Lnu;Ljava/lang/String;Ljava/lang/String;IZ)V" + descriptor = "(Lom;IIIZ)V" ) - public MusicSong(AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + public MusicSong(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { this.musicTrackGroupId = -1; this.musicTrackFileId = -1; this.musicTrackVolume = 0; - this.field2867 = 0.0F; + this.field2888 = 0.0F; this.musicTrackBoolean = false; - this.field2862 = false; - this.field2863 = false; - this.musicTrackGroupId = var1.getGroupId(var2); - this.musicTrackFileId = var1.getFileId(this.musicTrackGroupId, var3); - this.method1701(var1, this.musicTrackGroupId, this.musicTrackFileId, var4, var5); + this.field2886 = false; + this.field2882 = false; + this.method1731(var1, var2, var3, var4, var5); } @ObfuscatedSignature( - descriptor = "(Lnu;IIIZ)V" + descriptor = "(Lom;Ljava/lang/String;Ljava/lang/String;IZ)V" ) - public MusicSong(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + public MusicSong(AbstractArchive var1, String var2, String var3, int var4, boolean var5) { this.musicTrackGroupId = -1; this.musicTrackFileId = -1; this.musicTrackVolume = 0; - this.field2867 = 0.0F; + this.field2888 = 0.0F; this.musicTrackBoolean = false; - this.field2862 = false; - this.field2863 = false; - this.method1701(var1, var2, var3, var4, var5); + this.field2886 = false; + this.field2882 = false; + this.musicTrackGroupId = var1.getGroupId(var2); + this.musicTrackFileId = var1.getFileId(this.musicTrackGroupId, var3); + this.method1731(var1, this.musicTrackGroupId, this.musicTrackFileId, var4, var5); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lnu;IIIZB)V", - garbageValue = "28" + descriptor = "(Lom;IIIZB)V", + garbageValue = "-90" ) - void method1701(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + void method1731(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { this.musicTrackArchive = var1; this.musicTrackGroupId = var2; this.musicTrackFileId = var3; @@ -94,81 +94,14 @@ void method1701(AbstractArchive var1, int var2, int var3, int var4, boolean var5 this.musicTrackBoolean = var5; } - @ObfuscatedName("hi") + @ObfuscatedName("hk") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-79" + descriptor = "(Lok;Ljava/lang/String;B)V", + garbageValue = "-43" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 30) { - Client.field423.method1090(); - } - - if (Client.gameState == 0) { - class219.client.method158(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { - class316.method1700(0); - Client.field448 = 0; - Client.field447 = 0; - Client.timer.method2152(var0); - if (var0 != 20) { - PendingSpawn.method509(false); - } - } - - if (var0 != 20 && var0 != 40 && AbstractSocket.field3819 != null) { - AbstractSocket.field3819.close(); - AbstractSocket.field3819 = null; - } - - if (Client.gameState == 25) { - Client.field456 = 0; - Client.field452 = 0; - Client.field453 = 1; - Client.field455 = 0; - Client.field454 = 1; - } - - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - int var3 = Client.gameState == 11 ? 4 : 0; - Timer.method2157(class141.archive10, PcmPlayer.archive8, false, var3); - } else if (var0 == 11) { - Timer.method2157(class141.archive10, PcmPlayer.archive8, false, 4); - } else if (var0 == 50) { - class318.setLoginResponseString("", "Updating date of birth...", ""); - Timer.method2157(class141.archive10, PcmPlayer.archive8, false, 7); - } else if (class403.clearLoginScreen) { - Login.titleboxSprite = null; - class219.titlebuttonSprite = null; - Login.runesSprite = null; - Login.leftTitleSprite = null; - Bounds.rightTitleSprite = null; - SoundSystem.logoSprite = null; - class13.title_muteSprite = null; - Login.options_buttons_0Sprite = null; - UserComparator6.options_buttons_2Sprite = null; - class74.worldSelectBackSprites = null; - SoundCache.worldSelectFlagSprites = null; - MusicPatchPcmStream.worldSelectArrows = null; - SecureRandomCallable.worldSelectStars = null; - VarcInt.field1534 = null; - class139.field1323.method528(); - Script.method445(0, 100); - CollisionMap.method1122().method1932(true); - class403.clearLoginScreen = false; - } - } else { - boolean var1 = class449.clientPreferences.method564() >= Client.param21; - int var2 = var1 ? 0 : 12; - Timer.method2157(class141.archive10, PcmPlayer.archive8, true, var2); - } - - Client.gameState = var0; - } + static void method1732(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field551 += var2.groupCount; } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicTrack.java b/osrs/src/main/java/MusicTrack.java index bab2fb74e..814c66275 100644 --- a/osrs/src/main/java/MusicTrack.java +++ b/osrs/src/main/java/MusicTrack.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mv") +@ObfuscatedName("mk") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Ltf;" ) - NodeHashTable field2837; - @ObfuscatedName("ae") + NodeHashTable field2860; + @ObfuscatedName("al") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;)V" ) MusicTrack(Buffer var1) { - this.field2837 = new NodeHashTable(16); + this.field2860 = new NodeHashTable(16); var1.offset = var1.array.length - 3; int var2 = var1.readUnsignedByte(); int var3 = var1.readUnsignedShort(); @@ -254,13 +254,13 @@ public class MusicTrack extends Node { var51.writeByte(var71); if (var71 > 0) { int var72 = var61[var52]; - class318 var73 = (class318)this.field2837.get((long)var72); + class332 var73 = (class332)this.field2860.get((long)var72); if (var73 == null) { - var73 = new class318(var65); - this.field2837.put(var73, (long)var72); + var73 = new class332(var65); + this.field2860.put(var73, (long)var72); } - var73.field2876.set(var74); + var73.field2896.set(var74); } } else if (var66 == 1) { if (var69) { @@ -367,9 +367,9 @@ public class MusicTrack extends Node { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lnu;II)Lmv;" + descriptor = "(Lom;II)Lmk;" ) @Export("readTrack") public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { diff --git a/osrs/src/main/java/NPC.java b/osrs/src/main/java/NPC.java index ff1993a9b..ec9b83329 100644 --- a/osrs/src/main/java/NPC.java +++ b/osrs/src/main/java/NPC.java @@ -3,76 +3,76 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") +@ObfuscatedName("dc") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("az") - static int field1075; - @ObfuscatedName("aa") - static int field1074; - @ObfuscatedName("au") + @ObfuscatedName("ar") + static int field1077; + @ObfuscatedName("am") + static int field1076; + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "Lhw;" ) @Export("definition") NPCComposition definition; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("nameChange") String nameChange; - @ObfuscatedName("at") - int field1079; - @ObfuscatedName("ac") + @ObfuscatedName("ax") + int field1081; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ltw;" + descriptor = "Lup;" ) - class515 field1081; - @ObfuscatedName("ai") + class530 field1083; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lhq;" + descriptor = "Lhe;" ) - NewShit field1076; - @ObfuscatedName("ap") + NewShit field1079; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lhq;" + descriptor = "Lhe;" ) - NewShit field1077; + NewShit field1078; static { - field1075 = 1; - field1074 = 1; + field1077 = 1; + field1076 = 1; } NPC() { this.nameChange = ""; - this.field1079 = 31; + this.field1081 = 31; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1576222812" + garbageValue = "218528952" ) - void method577(String var1) { + void method578(String var1) { this.nameChange = var1 == null ? "" : var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljr;", - garbageValue = "798227647" + descriptor = "(B)Ljn;", + garbageValue = "0" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? EnumComposition.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : EnumComposition.SequenceDefinition_get(super.movementSequence); + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class36.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : class36.SequenceDefinition_get(super.movementSequence); Model var3 = null; - if (this.field1076 != null && this.field1076.field1581) { - var3 = VarbitComposition.localPlayer.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); + if (this.field1079 != null && this.field1079.field1593) { + var3 = TextureProvider.localPlayer.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); } else { - var3 = this.definition.method985(var1, super.sequenceFrame, var2, super.movementFrame, this.field1076); + var3 = this.definition.method1011(var1, super.sequenceFrame, var2, super.movementFrame, this.field1079); } if (var3 == null) { @@ -91,7 +91,7 @@ protected final Model getModel() { var3.overrideSaturation = super.recolourSaturation; var3.overrideLuminance = super.recolourLuminance; var3.overrideAmount = super.recolourAmount; - var3.field2243 = (short)var4; + var3.field2255 = (short)var4; } else { var3.overrideAmount = 0; } @@ -101,34 +101,34 @@ protected final Model getModel() { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-979887943" + garbageValue = "1833659778" ) void method579(int var1) { - this.field1079 = var1; + this.field1081 = var1; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1723224473" + garbageValue = "113824049" ) boolean method580(int var1) { if (var1 >= 0 && var1 <= 4) { - return (this.field1079 & 1 << var1) != 0; + return (this.field1081 & 1 << var1) != 0; } else { return true; } } - @ObfuscatedName("az") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1406418583" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-29" ) - final String method581() { + final String method582() { if (!this.nameChange.isEmpty()) { return this.nameChange; } else { @@ -144,10 +144,10 @@ final String method581() { } } - @ObfuscatedName("ap") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(ILin;I)V", - garbageValue = "1389933188" + descriptor = "(ILip;B)V", + garbageValue = "-1" ) @Export("move") final void move(int var1, MoveSpeed var2) { @@ -189,7 +189,7 @@ final void move(int var1, MoveSpeed var2) { --var4; } - if (super.sequence != -1 && EnumComposition.SequenceDefinition_get(super.sequence).priority == 1) { + if (super.sequence != -1 && class36.SequenceDefinition_get(super.sequence).priority == 1) { super.sequence = -1; } @@ -208,13 +208,13 @@ final void move(int var1, MoveSpeed var2) { super.pathTraversed[0] = var2; } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "-2120679358" + garbageValue = "-358090235" ) - final void method583(int var1, int var2, boolean var3) { - if (super.sequence != -1 && EnumComposition.SequenceDefinition_get(super.sequence).priority == 1) { + final void method584(int var1, int var2, boolean var3) { + if (super.sequence != -1 && class36.SequenceDefinition_get(super.sequence).priority == 1) { super.sequence = -1; } @@ -240,179 +240,146 @@ final void method583(int var1, int var2, boolean var3) { } super.pathLength = 0; - super.field1022 = 0; - super.field1021 = 0; + super.field1023 = 0; + super.field1024 = 0; super.pathX[0] = var1; super.pathY[0] = var2; - super.x = super.field976 * 64 + super.pathX[0] * 128; - super.y = super.pathY[0] * 128 + super.field976 * 64; + super.x = super.field971 * 64 + super.pathX[0] * 128; + super.y = super.field971 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("af") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "2108949560" + descriptor = "(B)[I", + garbageValue = "0" ) int[] method587() { - return this.field1081 != null ? this.field1081.method2602() : this.definition.method993(); + return this.field1083 != null ? this.field1083.method2639() : this.definition.method1019(); } - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(S)[S", - garbageValue = "17216" + descriptor = "(I)[S", + garbageValue = "-288846359" ) short[] method588() { - return this.field1081 != null ? this.field1081.method2603() : this.definition.method995(); + return this.field1083 != null ? this.field1083.method2640() : this.definition.method1021(); } - @ObfuscatedName("aq") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IISI)V", - garbageValue = "-1331637163" + descriptor = "(IISS)V", + garbageValue = "-15144" ) void method589(int var1, int var2, short var3) { - if (this.field1081 == null) { - this.field1081 = new class515(this.definition); + if (this.field1083 == null) { + this.field1083 = new class530(this.definition); } - this.field1081.method2604(var1, var2, var3); + this.field1083.method2641(var1, var2, var3); } - @ObfuscatedName("al") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "([I[SI)V", - garbageValue = "1783936038" + descriptor = "([I[SB)V", + garbageValue = "8" ) void method590(int[] var1, short[] var2) { - if (this.field1081 == null) { - this.field1081 = new class515(this.definition); + if (this.field1083 == null) { + this.field1083 = new class530(this.definition); } - this.field1081.method2605(var1, var2); + this.field1083.method2642(var1, var2); } - @ObfuscatedName("an") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "707622194" + garbageValue = "-432488525" ) void method591() { - this.field1081 = null; + this.field1083 = null; } - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Lhq;I)V", - garbageValue = "244947071" + descriptor = "(Lhe;I)V", + garbageValue = "-1403637183" ) void method592(NewShit var1) { - this.field1077 = var1; + this.field1078 = var1; } - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)Lhq;", - garbageValue = "1386769503" + descriptor = "(I)Lhe;", + garbageValue = "905115149" ) NewShit method593() { - return this.field1077; + return this.field1078; } - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lhq;B)V", - garbageValue = "-37" + descriptor = "(Lhe;I)V", + garbageValue = "463654606" ) void method594(NewShit var1) { - this.field1076 = var1; + this.field1079 = var1; } - @ObfuscatedName("am") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "381940201" + descriptor = "(B)Z", + garbageValue = "4" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; } - @ObfuscatedName("ax") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1283231682" + descriptor = "(B)V", + garbageValue = "-64" ) void method595() { - this.field1077 = null; + this.field1078 = null; } - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "58" + descriptor = "(I)V", + garbageValue = "257879915" ) void method596() { - this.field1076 = null; + this.field1079 = null; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1698780109" + descriptor = "(II)V", + garbageValue = "-965276822" ) - public static int method578(int var0, int var1) { - int var2; - for (var2 = 1; var1 > 1; var1 >>= 1) { - if ((var1 & 1) != 0) { - var2 = var0 * var2; - } - - var0 *= var0; - } - - if (var1 == 1) { - return var0 * var2; - } else { - return var2; - } + static void method581(int var0) { } - @ObfuscatedName("ae") + @ObfuscatedName("iy") @ObfuscatedSignature( - descriptor = "(Ldy;IIB)V", - garbageValue = "-51" + descriptor = "(IB)I", + garbageValue = "0" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; - Script var4; - if (SongTask.isWorldMapEvent(var0.type)) { - GrandExchangeOfferOwnWorldComparator.worldMapEvent = (WorldMapEvent)var3[0]; - WorldMapElement var5 = class138.WorldMapElement_get(GrandExchangeOfferOwnWorldComparator.worldMapEvent.mapElement); - var4 = GrandExchangeOfferWorldComparator.getWorldMapScript(var0.type, var5.objectId, var5.category); - } else { - int var6 = (Integer)var3[0]; - var4 = class133.getScript(var6); - } - - if (var4 != null) { - class147.runScriptLogic(var0, var4, var1, var2); - } - + static final int method597(int var0) { + return Math.abs(var0 - WallDecoration.cameraYaw) > 1024 ? 2048 * (var0 < WallDecoration.cameraYaw ? 1 : -1) + var0 : var0; } - @ObfuscatedName("on") + @ObfuscatedName("ok") @ObfuscatedSignature( - descriptor = "(IIIZB)V", - garbageValue = "-59" + descriptor = "(Lul;II)V", + garbageValue = "101752739" ) - public static void method597(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.TELEPORT, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByteNeg(var2); - var4.packetBuffer.writeShort(var1); - var4.packetBuffer.writeIntIME(var3 ? Client.field476 * -1700661189 * -770825997 : 0); - var4.packetBuffer.writeShortAdd(var0); - Client.packetWriter.addNode(var4); + static void method598(Buffer var0, int var1) { + class266.method1432(var0.array, var1); + HealthBar.method576(var0, var1); } } \ No newline at end of file diff --git a/osrs/src/main/java/NPCComposition.java b/osrs/src/main/java/NPCComposition.java index e0bed69a0..4c275859a 100644 --- a/osrs/src/main/java/NPCComposition.java +++ b/osrs/src/main/java/NPCComposition.java @@ -2,172 +2,165 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; @ObfuscatedName("hw") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) - public static AbstractArchive field1586; - @ObfuscatedName("at") + public static AbstractArchive field1595; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("NpcDefinition_cached") - public static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("ac") + static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) - @Export("NpcDefinition_cachedModels") - public static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("kk") - @Export("cameraX") - static int cameraX; - @ObfuscatedName("ai") + @Export("HitSplatDefinition_cachedFonts") + static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; + @ObfuscatedName("ah") @Export("id") public int id; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("name") public String name; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("size") public int size; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("models") int[] models; - @ObfuscatedName("af") - int[] field1595; - @ObfuscatedName("ad") + @ObfuscatedName("av") + int[] field1606; + @ObfuscatedName("ag") @Export("idleSequence") public int idleSequence; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("walkSequence") public int walkSequence; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("runSequence") public int runSequence; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("runBackSequence") public int runBackSequence; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("runLeftSequence") public int runLeftSequence; - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("runRightSequence") public int runRightSequence; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("crawlSequence") public int crawlSequence; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("crawlBackSequence") public int crawlBackSequence; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("crawlLeftSequence") public int crawlLeftSequence; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("crawlRightSequence") public int crawlRightSequence; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("bh") + @ObfuscatedName("bn") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("bj") + @ObfuscatedName("bk") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("actions") public String[] actions; - @ObfuscatedName("bt") + @ObfuscatedName("be") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("combatLevel") public int combatLevel; - @ObfuscatedName("by") + @ObfuscatedName("ba") @Export("widthScale") int widthScale; - @ObfuscatedName("bs") + @ObfuscatedName("bz") @Export("heightScale") int heightScale; - @ObfuscatedName("bm") + @ObfuscatedName("bb") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("bf") + @ObfuscatedName("bo") @Export("ambient") int ambient; - @ObfuscatedName("bq") + @ObfuscatedName("bp") @Export("contrast") int contrast; - @ObfuscatedName("ba") + @ObfuscatedName("bt") @Export("rotation") public int rotation; - @ObfuscatedName("bl") + @ObfuscatedName("bm") @Export("transforms") public int[] transforms; - @ObfuscatedName("bp") + @ObfuscatedName("br") @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("bu") + @ObfuscatedName("bs") @Export("transformVarp") int transformVarp; - @ObfuscatedName("bo") + @ObfuscatedName("bc") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("br") + @ObfuscatedName("bf") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("be") + @ObfuscatedName("bh") @Export("headIconArchiveIds") int[] headIconArchiveIds; - @ObfuscatedName("bi") + @ObfuscatedName("bl") @Export("headIconSpriteIndexes") short[] headIconSpriteIndexes; - @ObfuscatedName("bz") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lsf;" + descriptor = "Ltp;" ) @Export("params") IterableNodeHashTable params; static { NpcDefinition_cached = new EvictingDualNodeHashTable(64); - NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); + HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(50); } NPCComposition() { @@ -206,19 +199,19 @@ public class NPCComposition extends DualNode { this.headIconSpriteIndexes = null; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1327356589" + descriptor = "(B)V", + garbageValue = "3" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "61" + descriptor = "(Lul;B)V", + garbageValue = "2" ) @Export("decode") void decode(Buffer var1) { @@ -232,10 +225,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "-394380179" + descriptor = "(Lul;IB)V", + garbageValue = "0" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -292,10 +285,10 @@ void decodeNext(Buffer var1, int var2) { } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.field1595 = new int[var3]; + this.field1606 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field1595[var4] = var1.readUnsignedShort(); + this.field1606[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; @@ -329,8 +322,8 @@ void decodeNext(Buffer var1, int var2) { this.headIconArchiveIds[var6] = -1; this.headIconSpriteIndexes[var6] = -1; } else { - this.headIconArchiveIds[var6] = var1.method2563(); - this.headIconSpriteIndexes[var6] = (short)var1.method2560(); + this.headIconArchiveIds[var6] = var1.readNullableLargeSmart(); + this.headIconSpriteIndexes[var6] = (short)var1.readShortSmartSub(); } } } else if (var2 == 103) { @@ -357,7 +350,7 @@ void decodeNext(Buffer var1, int var2) { this.crawlLeftSequence = var1.readUnsignedShort(); this.crawlRightSequence = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = Decimator.readStringIntParameters(var1, this.params); + this.params = class167.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -394,30 +387,30 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lib;ILib;ILhq;I)Ljr;", - garbageValue = "209230471" + descriptor = "(Lif;ILif;ILhe;B)Ljn;", + garbageValue = "0" ) - public final Model method985(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4, NewShit var5) { + public final Model method1011(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4, NewShit var5) { if (this.transforms != null) { NPCComposition var6 = this.transform(); - return var6 == null ? null : var6.method985(var1, var2, var3, var4, var5); + return var6 == null ? null : var6.method1011(var1, var2, var3, var4, var5); } else { long var10 = (long)this.id; if (var5 != null) { - var10 |= var5.field1582 << 16; + var10 |= var5.field1594 << 16; } - Model var8 = (Model)NpcDefinition_cachedModels.get(var10); + Model var8 = (Model)HitSplatDefinition_cachedFonts.get(var10); if (var8 == null) { - ModelData var9 = this.method987(this.models, var5); + ModelData var9 = this.method1013(this.models, var5); if (var9 == null) { return null; } var8 = var9.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); - NpcDefinition_cachedModels.put(var8, var10); + HitSplatDefinition_cachedFonts.put(var8, var10); } Model var12; @@ -439,29 +432,29 @@ public final Model method985(SequenceDefinition var1, int var2, SequenceDefiniti } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lhq;I)Lic;", - garbageValue = "-539413854" + descriptor = "(Lhe;I)Ljw;", + garbageValue = "-1925302214" ) - public final ModelData method986(NewShit var1) { + public final ModelData method1012(NewShit var1) { if (this.transforms != null) { NPCComposition var2 = this.transform(); - return var2 == null ? null : var2.method986(var1); + return var2 == null ? null : var2.method1012(var1); } else { - return this.method987(this.field1595, var1); + return this.method1013(this.field1606, var1); } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "([ILhq;I)Lic;", - garbageValue = "-1668692143" + descriptor = "([ILhe;I)Ljw;", + garbageValue = "817549267" ) - ModelData method987(int[] var1, NewShit var2) { + ModelData method1013(int[] var1, NewShit var2) { int[] var3 = var1; - if (var2 != null && var2.field1578 != null) { - var3 = var2.field1578; + if (var2 != null && var2.field1590 != null) { + var3 = var2.field1590; } if (var3 == null) { @@ -470,7 +463,7 @@ ModelData method987(int[] var1, NewShit var2) { boolean var4 = false; for (int var5 = 0; var5 < var3.length; ++var5) { - if (var3[var5] != -1 && !field1586.tryLoadFile(var3[var5], 0)) { + if (var3[var5] != -1 && !field1595.tryLoadFile(var3[var5], 0)) { var4 = true; } } @@ -481,7 +474,7 @@ ModelData method987(int[] var1, NewShit var2) { ModelData[] var9 = new ModelData[var3.length]; for (int var6 = 0; var6 < var3.length; ++var6) { - var9[var6] = ModelData.ModelData_get(field1586, var3[var6], 0); + var9[var6] = ModelData.ModelData_get(field1595, var3[var6], 0); } ModelData var10; @@ -498,8 +491,8 @@ ModelData method987(int[] var1, NewShit var2) { int var8; if (this.recolorFrom != null) { var7 = this.recolorTo; - if (var2 != null && var2.field1579 != null) { - var7 = var2.field1579; + if (var2 != null && var2.field1591 != null) { + var7 = var2.field1591; } for (var8 = 0; var8 < this.recolorFrom.length; ++var8) { @@ -509,8 +502,8 @@ ModelData method987(int[] var1, NewShit var2) { if (this.retextureFrom != null) { var7 = this.retextureTo; - if (var2 != null && var2.field1580 != null) { - var7 = var2.field1580; + if (var2 != null && var2.field1592 != null) { + var7 = var2.field1592; } for (var8 = 0; var8 < this.retextureFrom.length; ++var8) { @@ -523,16 +516,16 @@ ModelData method987(int[] var1, NewShit var2) { } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)Lhw;", - garbageValue = "601463714" + garbageValue = "637485229" ) @Export("transform") public final NPCComposition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = ClientPreferences.getVarbit(this.transformVarbit); + var1 = class36.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -544,13 +537,13 @@ public final NPCComposition transform() { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class90.getNpcDefinition(var2) : null; + return var2 != -1 ? class190.getNpcDefinition(var2) : null; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1759835926" + garbageValue = "-329950655" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -559,7 +552,7 @@ public boolean transformIsVisible() { } else { int var1 = -1; if (this.transformVarbit != -1) { - var1 = ClientPreferences.getVarbit(this.transformVarbit); + var1 = class36.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -572,209 +565,94 @@ public boolean transformIsVisible() { } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "666148564" + descriptor = "(IIS)I", + garbageValue = "-28498" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return AttackOption.method607(this.params, var1, var2); } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", - garbageValue = "18686" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-210955753" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; - } - } - - return var3; + return class30.method122(this.params, var1, var2); } - @ObfuscatedName("aq") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1337566276" + garbageValue = "-1901854799" ) - public boolean method992() { + public boolean method1018() { return this.headIconArchiveIds != null && this.headIconSpriteIndexes != null; } - @ObfuscatedName("al") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "44298877" + descriptor = "(B)[I", + garbageValue = "71" ) - public int[] method993() { + public int[] method1019() { return this.headIconArchiveIds; } - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1762616246" + garbageValue = "438787459" ) - public int method994(int var1) { + public int method1020(int var1) { return this.headIconArchiveIds != null && var1 < this.headIconArchiveIds.length ? this.headIconArchiveIds[var1] : -1; } - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)[S", - garbageValue = "1594332022" + garbageValue = "1864289740" ) - public short[] method995() { + public short[] method1021() { return this.headIconSpriteIndexes; } - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IB)S", - garbageValue = "-67" + descriptor = "(II)S", + garbageValue = "628204446" ) - public short method996(int var1) { + public short method1022(int var1) { return this.headIconSpriteIndexes != null && var1 < this.headIconSpriteIndexes.length ? this.headIconSpriteIndexes[var1] : -1; } - @ObfuscatedName("ao") + @ObfuscatedName("ig") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1881602206" + descriptor = "(II)V", + garbageValue = "-1885012369" ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); - var2.size = var0.readUnsignedByte(); - var2.id = var0.readInt(); - var2.operations = new int[var2.size]; - var2.creationErrors = new int[var2.size]; - var2.fields = new Field[var2.size]; - var2.intReplaceValues = new int[var2.size]; - var2.methods = new Method[var2.size]; - var2.arguments = new byte[var2.size][][]; - - for (int var3 = 0; var3 < var2.size; ++var3) { - try { - int var4 = var0.readUnsignedByte(); - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { - if (var4 == 3 || var4 == 4) { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = var0.readUnsignedByte(); - String[] var8 = new String[var7]; - - for (int var9 = 0; var9 < var7; ++var9) { - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); - byte[][] var10 = new byte[var7][]; - int var12; - if (var4 == 3) { - for (int var11 = 0; var11 < var7; ++var11) { - var12 = var0.readInt(); - var10[var11] = new byte[var12]; - var0.readBytes(var10[var11], 0, var12); - } - } - - var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; - - for (var12 = 0; var12 < var7; ++var12) { - var21[var12] = ItemLayer.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = ItemLayer.loadClassFromDescriptor(var20); - if (ItemLayer.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = ItemLayer.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if (var17.length == var21.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var21[var19] != var17[var19]) { - var18 = false; - break; - } - } - - if (var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; - } - } - } - } - - var2.arguments[var3] = var10; - } - } else { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); - } + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field613 = 0L; + if (var0 >= 2) { + Client.isResizable = true; + } else { + Client.isResizable = false; + } - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (ItemLayer.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } + if (class178.getWindowedMode() == 1) { + class159.client.setMaxCanvasSize(765, 503); + } else { + class159.client.setMaxCanvasSize(7680, 2160); + } - var2.fields[var3] = Reflection.findField(ItemLayer.loadClassFromDescriptor(var5), var6); - } - } catch (ClassNotFoundException var24) { - var2.creationErrors[var3] = -1; - } catch (SecurityException var25) { - var2.creationErrors[var3] = -2; - } catch (NullPointerException var26) { - var2.creationErrors[var3] = -3; - } catch (Exception var27) { - var2.creationErrors[var3] = -4; - } catch (Throwable var28) { - var2.creationErrors[var3] = -5; - } + if (Client.gameState >= 25) { + class517.method2533(); } - class36.reflectionChecks.addFirst(var2); } } \ No newline at end of file diff --git a/osrs/src/main/java/NanoClock.java b/osrs/src/main/java/NanoClock.java index 3569396a0..7e71ec6d4 100644 --- a/osrs/src/main/java/NanoClock.java +++ b/osrs/src/main/java/NanoClock.java @@ -3,31 +3,31 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("gy") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("lastTimeNano") long lastTimeNano; - public NanoClock() { + NanoClock() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1021685028" + garbageValue = "436321701" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "20" + descriptor = "(III)I", + garbageValue = "712947185" ) @Export("wait") public int wait(int var1, int var2) { @@ -37,11 +37,11 @@ public int wait(int var1, int var2) { var5 = var3; } - PendingSpawn.method505(var5 / 1000000L); + Players.method623(var5 / 1000000L); long var7 = System.nanoTime(); int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) { ++var9; } diff --git a/osrs/src/main/java/NewShit.java b/osrs/src/main/java/NewShit.java index d3cbae177..12264e5df 100644 --- a/osrs/src/main/java/NewShit.java +++ b/osrs/src/main/java/NewShit.java @@ -1,50 +1,26 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +@ObfuscatedName("he") @Implements("NewShit") public class NewShit { - @ObfuscatedName("hr") - static int[] field1577; - @ObfuscatedName("au") - public long field1582; - @ObfuscatedName("ae") - int[] field1578; - @ObfuscatedName("ao") - short[] field1579; - @ObfuscatedName("at") - short[] field1580; @ObfuscatedName("ac") - public boolean field1581; + public long field1594; + @ObfuscatedName("al") + int[] field1590; + @ObfuscatedName("ak") + short[] field1591; + @ObfuscatedName("ax") + short[] field1592; + @ObfuscatedName("ao") + public boolean field1593; public NewShit(long var1, int[] var3, short[] var4, short[] var5, boolean var6) { - this.field1581 = false; - this.field1582 = var1; - this.field1578 = var3; - this.field1579 = var4; - this.field1580 = var5; - this.field1581 = var6; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "29" - ) - public static int method979(int var0) { - return var0 >>> 4 & class508.field4121; - } - - @ObfuscatedName("nc") - @ObfuscatedSignature( - descriptor = "(Lmi;I)I", - garbageValue = "-282927864" - ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); - return var1 != null ? var1.integer : var0.flags; + this.field1593 = false; + this.field1594 = var1; + this.field1590 = var3; + this.field1591 = var4; + this.field1592 = var5; + this.field1593 = var6; } } \ No newline at end of file diff --git a/osrs/src/main/java/Node.java b/osrs/src/main/java/Node.java index 7b7f7a394..847fddaaa 100644 --- a/osrs/src/main/java/Node.java +++ b/osrs/src/main/java/Node.java @@ -6,10 +6,10 @@ @ObfuscatedName("sj") @Implements("Node") public class Node { - @ObfuscatedName("hq") + @ObfuscatedName("hf") @Export("key") public long key; - @ObfuscatedName("hw") + @ObfuscatedName("hu") @ObfuscatedSignature( descriptor = "Lsj;" ) @@ -22,7 +22,7 @@ public class Node { @Export("next") public Node next; - @ObfuscatedName("gg") + @ObfuscatedName("gx") @Export("remove") public void remove() { if (this.next != null) { @@ -33,7 +33,7 @@ public void remove() { } } - @ObfuscatedName("gw") + @ObfuscatedName("gp") @Export("hasNext") public boolean hasNext() { return this.next != null; diff --git a/osrs/src/main/java/NodeDeque.java b/osrs/src/main/java/NodeDeque.java index 10dcfc715..f6c106ccc 100644 --- a/osrs/src/main/java/NodeDeque.java +++ b/osrs/src/main/java/NodeDeque.java @@ -3,16 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ow") +@ObfuscatedName("pf") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "Lsj;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "Lsj;" ) @@ -25,7 +25,7 @@ public NodeDeque() { this.sentinel.next = this.sentinel; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("clear") public void clear() { while (true) { @@ -39,7 +39,7 @@ public void clear() { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(Lsj;)V" ) @@ -55,7 +55,7 @@ public void addFirst(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(Lsj;)V" ) @@ -71,7 +71,7 @@ public void addLast(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "()Lsj;" ) @@ -86,7 +86,7 @@ public Node removeLast() { } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "()Lsj;" ) @@ -101,7 +101,7 @@ public Node removeFirst() { } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "()Lsj;" ) @@ -117,7 +117,7 @@ public Node last() { } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "()Lsj;" ) @@ -133,7 +133,7 @@ public Node first() { } } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "()Lsj;" ) @@ -149,7 +149,7 @@ public Node previous() { } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "()Lsj;" ) @@ -165,12 +165,12 @@ public Node next() { } } - @ObfuscatedName("ad") - public boolean method1997() { + @ObfuscatedName("ag") + public boolean method2028() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(Lsj;Lsj;)V" ) diff --git a/osrs/src/main/java/NodeHashTable.java b/osrs/src/main/java/NodeHashTable.java index 74a687646..227272775 100644 --- a/osrs/src/main/java/NodeHashTable.java +++ b/osrs/src/main/java/NodeHashTable.java @@ -3,31 +3,31 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("so") +@ObfuscatedName("tf") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("size") int size; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "[Lsj;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "Lsj;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "Lsj;" ) @Export("current") Node current; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("index") int index; @@ -44,7 +44,7 @@ public NodeHashTable(int var1) { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(J)Lsj;" ) @@ -64,8 +64,8 @@ public Node get(long var1) { return null; } - @ObfuscatedName("ae") - public int method2456() { + @ObfuscatedName("al") + public int method2491() { int var1 = 0; for (int var2 = 0; var2 < this.size; ++var2) { @@ -79,7 +79,7 @@ public int method2456() { return var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(Lsj;J)V" ) @@ -97,7 +97,7 @@ public void put(Node var1, long var2) { var1.key = var2; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "()Lsj;" ) @@ -107,7 +107,7 @@ public Node first() { return this.next(); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "()Lsj;" ) diff --git a/osrs/src/main/java/Null.java b/osrs/src/main/java/Null.java deleted file mode 100644 index 4905f7268..000000000 --- a/osrs/src/main/java/Null.java +++ /dev/null @@ -1,26 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; - -@Implements("org/json/JSONObject$Null") -@ObfuscatedName("org/json/JSONObject$Null") -final class Null { - - - Null() { - } - - public final Object clone() { - return this; - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - return var1 == null || this == var1; - } - - public String toString() { - return "null"; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/OAuthApi.java b/osrs/src/main/java/OAuthApi.java deleted file mode 100644 index a0c704f6f..000000000 --- a/osrs/src/main/java/OAuthApi.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.Implements; - -@Implements("OAuthApi") -public interface OAuthApi { -} \ No newline at end of file diff --git a/osrs/src/main/java/ObfuscatedClassMap.java b/osrs/src/main/java/ObfuscatedClassMap.java deleted file mode 100644 index 65aafe687..000000000 --- a/osrs/src/main/java/ObfuscatedClassMap.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.HashMap; - -public class ObfuscatedClassMap extends HashMap { - public static ObfuscatedClassMap INSTANCE = new ObfuscatedClassMap(); - static { - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/ObjTypeCustomisation.java b/osrs/src/main/java/ObjTypeCustomisation.java index 3be82be48..444910384 100644 --- a/osrs/src/main/java/ObjTypeCustomisation.java +++ b/osrs/src/main/java/ObjTypeCustomisation.java @@ -3,24 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hy") @Implements("ObjTypeCustomisation") public class ObjTypeCustomisation { - @ObfuscatedName("ef") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("jw") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("recol") public short[] recol; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("retex") public short[] retex; public ObjTypeCustomisation(int var1) { - ItemComposition var2 = InvDefinition.ItemDefinition_get(var1); + ItemComposition var2 = class214.ItemDefinition_get(var1); if (var2.hasRecolor()) { this.recol = new short[var2.recolorTo.length]; System.arraycopy(var2.recolorTo, 0, this.recol, 0, this.recol.length); @@ -33,61 +27,33 @@ public ObjTypeCustomisation(int var1) { } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)Lhx;", - garbageValue = "1562515394" - ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("bz") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-1153015817" + descriptor = "(I)V", + garbageValue = "466779098" ) - static int method935(int var0, Script var1, boolean var2) { - if (var0 == 6809) { - int var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - ObjectComposition var4 = WorldMapElement.getObjectDefinition(var3); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; - return 1; - } else { - return 2; - } + static void method948() { + Tiles.Tiles_minPlane = 99; + World.Tiles_underlays = new short[4][104][104]; + VertexNormal.Tiles_overlays = new short[4][104][104]; + SecureRandomFuture.Tiles_shapes = new byte[4][104][104]; + class199.field1563 = new byte[4][104][104]; + UserComparator6.field1191 = new int[4][105][105]; + Tiles.field835 = new byte[4][105][105]; + class158.field1387 = new int[105][105]; + SecureRandomFuture.Tiles_hue = new int[104]; + class135.Tiles_saturation = new int[104]; + Tiles.Tiles_lightness = new int[104]; + WorldMapSection2.Tiles_hueMultiplier = new int[104]; + Script.field812 = new int[104]; } - @ObfuscatedName("ot") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1860309613" + descriptor = "(I)V", + garbageValue = "841575506" ) - static String method936(String var0) { - PlayerType[] var1 = MidiPcmStream.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(Tile.addImageTag(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; - } - } - - return var0; + public static void method947() { + InvDefinition.InvDefinition_cached.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/ObjectComposition.java b/osrs/src/main/java/ObjectComposition.java index ae1ce2517..7075e4557 100644 --- a/osrs/src/main/java/ObjectComposition.java +++ b/osrs/src/main/java/ObjectComposition.java @@ -3,185 +3,188 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("iz") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("ObjectDefinition_isLowDetail") - public static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("ae") + static boolean ObjectDefinition_isLowDetail; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("ObjectDefinition_archive") - public static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("ao") + static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("ObjectDefinition_modelsArchive") - public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("at") + static AbstractArchive ObjectDefinition_modelsArchive; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("ObjectDefinition_cached") static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("ObjectDefinition_cachedEntities") static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) - @Export("ObjectDefinition_cachedModels") - static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("ap") + @Export("HitSplatDefinition_cachedSprites") + static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Lic;" + descriptor = "[Ljw;" ) - static ModelData[] field1715; - @ObfuscatedName("aa") + static ModelData[] field1721; + @ObfuscatedName("gn") + @Export("worldPort") + static int worldPort; + @ObfuscatedName("am") @Export("id") public int id; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("modelIds") int[] modelIds; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("models") int[] models; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("name") public String name; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("sizeX") public int sizeX; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("sizeY") public int sizeY; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("interactType") public int interactType; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("int1") public int int1; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("clipType") int clipType; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("animationId") public int animationId; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("int2") public int int2; - @ObfuscatedName("bh") + @ObfuscatedName("bn") @Export("ambient") int ambient; - @ObfuscatedName("bj") + @ObfuscatedName("bk") @Export("contrast") int contrast; - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("actions") public String[] actions; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("mapIconId") public int mapIconId; - @ObfuscatedName("bt") + @ObfuscatedName("be") @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("isRotated") boolean isRotated; - @ObfuscatedName("by") + @ObfuscatedName("ba") @Export("clipped") public boolean clipped; - @ObfuscatedName("bs") + @ObfuscatedName("bz") @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("bm") + @ObfuscatedName("bb") @Export("modelHeight") int modelHeight; - @ObfuscatedName("bf") + @ObfuscatedName("bo") @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("bq") + @ObfuscatedName("bp") @Export("offsetX") int offsetX; - @ObfuscatedName("ba") + @ObfuscatedName("bt") @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("bl") + @ObfuscatedName("bm") @Export("offsetY") int offsetY; - @ObfuscatedName("bp") + @ObfuscatedName("br") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("bu") + @ObfuscatedName("bs") @Export("isSolid") boolean isSolid; - @ObfuscatedName("bo") + @ObfuscatedName("bc") @Export("int3") public int int3; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @Export("transforms") public int[] transforms; - @ObfuscatedName("br") + @ObfuscatedName("bf") @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("be") + @ObfuscatedName("bh") @Export("transformVarp") int transformVarp; - @ObfuscatedName("bi") + @ObfuscatedName("bl") @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("bz") + @ObfuscatedName("bg") @Export("int7") public int int7; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @Export("int5") public int int5; - @ObfuscatedName("bn") + @ObfuscatedName("bx") @Export("int6") public int int6; - @ObfuscatedName("bw") + @ObfuscatedName("bi") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("bc") + @ObfuscatedName("bq") @Export("boolean3") public boolean boolean3; - @ObfuscatedName("bg") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Lsf;" + descriptor = "Ltp;" ) @Export("params") IterableNodeHashTable params; @@ -191,8 +194,8 @@ public class ObjectComposition extends DualNode { ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); - ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field1715 = new ModelData[4]; + HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(30); + field1721 = new ModelData[4]; } ObjectComposition() { @@ -232,10 +235,10 @@ public class ObjectComposition extends DualNode { this.boolean3 = true; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1533225250" + garbageValue = "-867726910" ) @Export("postDecode") void postDecode() { @@ -258,10 +261,10 @@ void postDecode() { } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "814995396" + descriptor = "(Lul;I)V", + garbageValue = "-461427986" ) @Export("decode") void decode(Buffer var1) { @@ -275,10 +278,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltm;IB)V", - garbageValue = "-24" + descriptor = "(Lul;IB)V", + garbageValue = "14" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -305,7 +308,7 @@ void decodeNext(Buffer var1, int var2) { var3 = var1.readUnsignedByte(); if (var3 > 0) { if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += var3 * 2; + var1.offset += 2 * var3; } else { this.models = null; this.modelIds = new int[var3]; @@ -417,7 +420,7 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 89) { this.boolean3 = false; } else if (var2 == 249) { - this.params = Decimator.readStringIntParameters(var1, this.params); + this.params = class167.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -453,12 +456,12 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-972773688" + garbageValue = "-1803901225" ) - public final boolean method1040(int var1) { + public final boolean method1078(int var1) { if (this.models != null) { for (int var4 = 0; var4 < this.models.length; ++var4) { if (this.models[var4] == var1) { @@ -482,10 +485,10 @@ public final boolean method1040(int var1) { } } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-559148506" + descriptor = "(B)Z", + garbageValue = "0" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -502,10 +505,10 @@ public final boolean needsModelFiles() { } } - @ObfuscatedName("az") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lik;", - garbageValue = "1807425281" + descriptor = "(II[[IIIII)Ljy;", + garbageValue = "2012346986" ) @Export("getEntity") public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -543,17 +546,17 @@ public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, in if (var9 instanceof Model) { var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method1161(var3, var4, var5, var6, true, this.clipType); + var9 = ((ModelData)var9).method1207(var3, var4, var5, var6, true, this.clipType); } } return (Renderable)var9; } - @ObfuscatedName("ap") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Ljr;", - garbageValue = "186697514" + descriptor = "(II[[IIIII)Ljn;", + garbageValue = "2069936324" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -564,7 +567,7 @@ public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5 var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); } - Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); + Model var9 = (Model)HitSplatDefinition_cachedSprites.get(var7); if (var9 == null) { ModelData var10 = this.getModelData(var1, var2); if (var10 == null) { @@ -572,7 +575,7 @@ public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5 } var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - ObjectDefinition_cachedModels.put(var9, var7); + HitSplatDefinition_cachedSprites.put(var9, var7); } if (this.clipType >= 0) { @@ -582,10 +585,10 @@ public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5 return var9; } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(II[[IIIILib;II)Ljr;", - garbageValue = "-749242095" + descriptor = "(II[[IIIILif;II)Ljn;", + garbageValue = "-715890668" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -596,7 +599,7 @@ public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, i var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); } - Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); + Model var11 = (Model)HitSplatDefinition_cachedSprites.get(var9); if (var11 == null) { ModelData var12 = this.getModelData(var1, var2); if (var12 == null) { @@ -604,7 +607,7 @@ public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, i } var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - ObjectDefinition_cachedModels.put(var11, var9); + HitSplatDefinition_cachedSprites.put(var11, var9); } if (var7 == null && this.clipType == -1) { @@ -624,10 +627,10 @@ public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, i } } - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IIB)Lic;", - garbageValue = "54" + descriptor = "(IIB)Ljw;", + garbageValue = "-106" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -665,19 +668,19 @@ final ModelData getModelData(int var1, int var2) { } if (var4) { - var3.method1170(); + var3.method1216(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); } if (var5 > 1) { - field1715[var6] = var3; + field1721[var6] = var3; } } if (var5 > 1) { - var3 = new ModelData(field1715, var5); + var3 = new ModelData(field1721, var5); } } else { int var9 = -1; @@ -707,7 +710,7 @@ final ModelData getModelData(int var1, int var2) { } if (var10) { - var3.method1170(); + var3.method1216(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); @@ -729,17 +732,17 @@ final ModelData getModelData(int var1, int var2) { ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true); if (var1 == 4 && var2 > 3) { - var8.method1166(256); + var8.method1212(256); var8.changeOffset(45, 0, -45); } var2 &= 3; if (var2 == 1) { - var8.method1163(); + var8.method1209(); } else if (var2 == 2) { - var8.method1164(); + var8.method1210(); } else if (var2 == 3) { - var8.method1165(); + var8.method1211(); } if (this.recolorFrom != null) { @@ -765,16 +768,16 @@ final ModelData getModelData(int var1, int var2) { return var8; } - @ObfuscatedName("ad") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)Lhv;", - garbageValue = "1529858789" + descriptor = "(B)Liz;", + garbageValue = "18" ) @Export("transform") public final ObjectComposition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = ClientPreferences.getVarbit(this.transformVarbit); + var1 = class36.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -786,46 +789,33 @@ public final ObjectComposition transform() { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? WorldMapElement.getObjectDefinition(var2) : null; + return var2 != -1 ? class91.getObjectDefinition(var2) : null; } - @ObfuscatedName("aq") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-545468094" + garbageValue = "149195300" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class14.method39(this.params, var1, var2); + return AttackOption.method607(this.params, var1, var2); } - @ObfuscatedName("al") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "-40" + garbageValue = "62" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; - } - } - - return var3; + return class30.method122(this.params, var1, var2); } - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1618181755" + garbageValue = "-1339827330" ) @Export("hasSound") public boolean hasSound() { @@ -834,7 +824,7 @@ public boolean hasSound() { } else { for (int var1 = 0; var1 < this.transforms.length; ++var1) { if (this.transforms[var1] != -1) { - ObjectComposition var2 = WorldMapElement.getObjectDefinition(this.transforms[var1]); + ObjectComposition var2 = class91.getObjectDefinition(this.transforms[var1]); if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { return true; } @@ -844,18 +834,4 @@ public boolean hasSound() { return false; } } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1838195729" - ) - static void method1042() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/ObjectNode.java b/osrs/src/main/java/ObjectNode.java index 718e396be..6079f9ede 100644 --- a/osrs/src/main/java/ObjectNode.java +++ b/osrs/src/main/java/ObjectNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("sd") +@ObfuscatedName("sv") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("obj") public final Object obj; diff --git a/osrs/src/main/java/ObjectSound.java b/osrs/src/main/java/ObjectSound.java index fd29bc816..673fe59e4 100644 --- a/osrs/src/main/java/ObjectSound.java +++ b/osrs/src/main/java/ObjectSound.java @@ -3,70 +3,59 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("cj") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("bj") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("jd") - static int field686; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("plane") int plane; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("x") int x; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("y") int y; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("maxX") int maxX; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("maxY") int maxY; - @ObfuscatedName("az") - int field702; - @ObfuscatedName("ap") + @ObfuscatedName("ar") + int field696; + @ObfuscatedName("ab") @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lbn;" + descriptor = "Lbx;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("af") - int field696; - @ObfuscatedName("ad") - int field694; - @ObfuscatedName("aq") + @ObfuscatedName("av") + int field697; + @ObfuscatedName("ag") + int field690; + @ObfuscatedName("aa") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("al") - int field698; - @ObfuscatedName("an") + @ObfuscatedName("ap") + int field695; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lbn;" + descriptor = "Lbx;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("ar") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lhv;" + descriptor = "Liz;" ) @Export("obj") ObjectComposition obj; @@ -78,10 +67,10 @@ public final class ObjectSound extends Node { ObjectSound() { } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1805200159" + descriptor = "(B)V", + garbageValue = "1" ) @Export("set") void set() { @@ -89,225 +78,83 @@ void set() { ObjectComposition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field702 = var2.int7 * 128; - this.field696 = var2.int5; - this.field694 = var2.int6; + this.field696 = var2.int7 * 128; + this.field697 = var2.int5; + this.field690 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field702 = 0; this.field696 = 0; - this.field694 = 0; + this.field697 = 0; + this.field690 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - class162.pcmStreamMixer.removeSubStream(this.stream1); + class140.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } - @ObfuscatedName("ae") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-42" + descriptor = "(ILds;ZB)I", + garbageValue = "5" ) - static void method414() { - Tiles.Tiles_underlays = null; - class227.Tiles_overlays = null; - class172.Tiles_shapes = null; - ModelData0.field2282 = null; - BufferedNetSocket.field3820 = null; - MoveSpeed.field1924 = null; - class162.field1419 = null; - Fonts.Tiles_hue = null; - class466.Tiles_saturation = null; - Tiles.Tiles_lightness = null; - class128.Tiles_hueMultiplier = null; - Interpreter.field710 = null; - } + static int method416(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 5504) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; + } - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "449179665" - ) - static int method415(int var0, Script var1, boolean var2) { - if (var0 == 3800) { - if (Players.guestClanSettings != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - class466.field3912 = Players.guestClanSettings; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 5505) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == 5506) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == 5530) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 < 0) { + var3 = 0; } + Client.camFollowHeight = var3; + return 1; + } else if (var0 == 5531) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; return 1; } else { - int var3; - if (var0 == 3801) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (Client.currentClanSettings[var3] != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - class466.field3912 = Client.currentClanSettings[var3]; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3802) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = class466.field3912.name; - return 1; - } else if (var0 == 3803) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.allowGuests ? 1 : 0; - return 1; - } else if (var0 == 3804) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1383; - return 1; - } else if (var0 == 3805) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1385; - return 1; - } else if (var0 == 3806) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1384; - return 1; - } else if (var0 == 3807) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1386; - return 1; - } else if (var0 == 3809) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.memberCount; - return 1; - } else if (var0 == 3810) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = class466.field3912.memberNames[var3]; - return 1; - } else if (var0 == 3811) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.memberRanks[var3]; - return 1; - } else if (var0 == 3812) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.bannedMemberCount; - return 1; - } else if (var0 == 3813) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = class466.field3912.bannedMemberNames[var3]; - return 1; - } else { - int var5; - int var6; - if (var0 == 3814) { - SoundCache.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.method809(var3, var6, var5); - return 1; - } else if (var0 == 3815) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.currentOwner; - return 1; - } else if (var0 == 3816) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1391; - return 1; - } else if (var0 == 3817) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.method808(Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]); - return 1; - } else if (var0 == 3818) { - Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = class466.field3912.getSortedMembers()[Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == 3819) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - class386.method2027(var6, var3); - return 1; - } else if (var0 == 3820) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1393[var3]; - return 1; - } else { - if (var0 == 3821) { - SoundCache.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - SoundSystem.method219(var5, var3, var4); - } - - if (var0 == 3822) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class466.field3912.field1382[var3] ? 1 : 0; - return 1; - } else if (var0 == 3850) { - if (VerticalAlignment.guestClanChannel != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - class396.field3679 = VerticalAlignment.guestClanChannel; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3851) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (Client.currentClanChannels[var3] != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - class396.field3679 = Client.currentClanChannels[var3]; - class113.field1172 = var3; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3852) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = class396.field3679.name; - return 1; - } else if (var0 == 3853) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class396.field3679.field1425; - return 1; - } else if (var0 == 3854) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class396.field3679.field1426; - return 1; - } else if (var0 == 3855) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class396.field3679.method859(); - return 1; - } else if (var0 == 3856) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class396.field3679.members.get(var3)).username.getName(); - return 1; - } else if (var0 == 3857) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((ClanChannelMember)class396.field3679.members.get(var3)).rank; - return 1; - } else if (var0 == 3858) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((ClanChannelMember)class396.field3679.members.get(var3)).world; - return 1; - } else if (var0 == 3859) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - UserComparator10.method689(class113.field1172, var3); - return 1; - } else if (var0 == 3860) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class396.field3679.method860(Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]); - return 1; - } else if (var0 == 3861) { - Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = class396.field3679.getSortedMembers()[Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == 3890) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class139.varclan != null ? 1 : 0; - return 1; - } else { - return 2; - } - } - } + return 2; } } - @ObfuscatedName("oj") + @ObfuscatedName("hn") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-24646" + descriptor = "(B)Z", + garbageValue = "1" ) - static void method416() { - Client.packetWriter.addNode(ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.field2569, Client.packetWriter.isaacCipher)); - Client.oculusOrbState = 0; + static boolean method415() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); + if (!var0.isLoaded()) { + return false; + } + + ++Client.archiveLoadersDone; + } + + return true; + } else { + return true; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/Occluder.java b/osrs/src/main/java/Occluder.java index 6076cfc1e..1083c9b17 100644 --- a/osrs/src/main/java/Occluder.java +++ b/osrs/src/main/java/Occluder.java @@ -3,114 +3,333 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("je") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("nc") - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("minTileX") int minTileX; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("maxTileX") int maxTileX; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("minTileY") int minTileY; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("maxTileY") int maxTileY; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("type") int type; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("minX") int minX; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("maxX") int maxX; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("minZ") int minZ; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("maxZ") int maxZ; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("minY") int minY; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("maxY") int maxY; - @ObfuscatedName("aq") - int field2137; - @ObfuscatedName("al") - int field2132; + @ObfuscatedName("aa") + int field2135; + @ObfuscatedName("ap") + int field2146; + @ObfuscatedName("ay") + int field2152; + @ObfuscatedName("as") + int field2148; + @ObfuscatedName("aj") + int field2140; @ObfuscatedName("an") - int field2134; - @ObfuscatedName("ar") - int field2138; - @ObfuscatedName("ab") - int field2125; - @ObfuscatedName("ag") - int field2130; - @ObfuscatedName("am") - int field2133; + int field2144; + @ObfuscatedName("au") + int field2149; Occluder() { } - @ObfuscatedName("ac") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIIZIZI)V", - garbageValue = "124948705" + descriptor = "(IIIB)I", + garbageValue = "-104" ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { - int var6 = (var0 + var1) / 2; - int var7 = var0; - World var8 = class176.World_worlds[var6]; - class176.World_worlds[var6] = class176.World_worlds[var1]; - class176.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - if (HealthBarUpdate.method525(class176.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { - World var10 = class176.World_worlds[var9]; - class176.World_worlds[var9] = class176.World_worlds[var7]; - class176.World_worlds[var7++] = var10; - } - } + static int method1340(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; + } + + if (var2 > 192) { + var1 /= 2; + } + + if (var2 > 217) { + var1 /= 2; + } - class176.World_worlds[var1] = class176.World_worlds[var7]; - class176.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + if (var2 > 243) { + var1 /= 2; } + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; } - @ObfuscatedName("jz") + @ObfuscatedName("jb") @ObfuscatedSignature( - descriptor = "(Ldf;I)Z", - garbageValue = "-1141977008" + descriptor = "(I)V", + garbageValue = "-1093816432" ) - static boolean method1299(Player var0) { - if (Client.drawPlayerNames == 0) { - return false; + static final void method1341() { + class193.method964(false); + Client.field454 = 0; + boolean var0 = true; + + int var1; + for (var1 = 0; var1 < class345.regionLandArchives.length; ++var1) { + if (HorizontalAlignment.regionMapArchiveIds[var1] != -1 && class345.regionLandArchives[var1] == null) { + class345.regionLandArchives[var1] = class198.archive9.takeFile(HorizontalAlignment.regionMapArchiveIds[var1], 0); + if (class345.regionLandArchives[var1] == null) { + var0 = false; + ++Client.field454; + } + } + + if (WorldMapIcon_0.regionLandArchiveIds[var1] != -1 && class201.regionMapArchives[var1] == null) { + class201.regionMapArchives[var1] = class198.archive9.takeFileEncrypted(WorldMapIcon_0.regionLandArchiveIds[var1], 0, class178.xteaKeys[var1]); + if (class201.regionMapArchives[var1] == null) { + var0 = false; + ++Client.field454; + } + } + } + + if (!var0) { + Client.field453 = 1; } else { - boolean var1; - if (VarbitComposition.localPlayer == var0) { - var1 = (Client.drawPlayerNames & 8) != 0; - return var1; + Client.field455 = 0; + var0 = true; + + int var3; + int var4; + for (var1 = 0; var1 < class345.regionLandArchives.length; ++var1) { + byte[] var2 = class201.regionMapArchives[var1]; + if (var2 != null) { + var3 = (class152.regions[var1] >> 8) * 64 - class20.baseX; + var4 = (class152.regions[var1] & 255) * 64 - class19.baseY; + if (Client.isInInstance) { + var3 = 10; + var4 = 10; + } + + var0 &= class208.method1028(var2, var3, var4); + } + } + + if (!var0) { + Client.field453 = 2; } else { - var1 = UserComparator6.method695(); - if (!var1) { - boolean var2 = (Client.drawPlayerNames & 1) != 0; - var1 = var2 && var0.isFriend(); + if (Client.field453 != 0) { + class427.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + class313.method1648(); + class10.scene.clear(); + + for (var1 = 0; var1 < 4; ++var1) { + Client.collisionMaps[var1].clear(); + } + + int var15; + for (var1 = 0; var1 < 4; ++var1) { + for (var15 = 0; var15 < 104; ++var15) { + for (var3 = 0; var3 < 104; ++var3) { + Tiles.Tiles_renderFlags[var1][var15][var3] = 0; + } + } + } + + class313.method1648(); + ObjTypeCustomisation.method948(); + var1 = class345.regionLandArchives.length; + SoundCache.method228(); + class193.method964(true); + int var17; + if (!Client.isInInstance) { + byte[] var5; + for (var15 = 0; var15 < var1; ++var15) { + var3 = (class152.regions[var15] >> 8) * 64 - class20.baseX; + var4 = (class152.regions[var15] & 255) * 64 - class19.baseY; + var5 = class345.regionLandArchives[var15]; + if (var5 != null) { + class313.method1648(); + BufferedSource.method2298(var5, var3, var4, class94.timeOfPreviousKeyPress * 8 - 48, class365.field3199 * 8 - 48, Client.collisionMaps); + } + } + + for (var15 = 0; var15 < var1; ++var15) { + var3 = (class152.regions[var15] >> 8) * 64 - class20.baseX; + var4 = (class152.regions[var15] & 255) * 64 - class19.baseY; + var5 = class345.regionLandArchives[var15]; + if (var5 == null && class365.field3199 < 800) { + class313.method1648(); + Decimator.method317(var3, var4, 64, 64); + } + } + + class193.method964(true); + + for (var15 = 0; var15 < var1; ++var15) { + byte[] var16 = class201.regionMapArchives[var15]; + if (var16 != null) { + var4 = (class152.regions[var15] >> 8) * 64 - class20.baseX; + var17 = (class152.regions[var15] & 255) * 64 - class19.baseY; + class313.method1648(); + PacketBuffer.method2559(var16, var4, var17, class10.scene, Client.collisionMaps); + } + } + } + + int var6; + int var7; + int var8; + if (Client.isInInstance) { + int var9; + int var10; + int var11; + for (var15 = 0; var15 < 4; ++var15) { + class313.method1648(); + + for (var3 = 0; var3 < 13; ++var3) { + for (var4 = 0; var4 < 13; ++var4) { + boolean var19 = false; + var6 = Client.instanceChunkTemplates[var15][var3][var4]; + if (var6 != -1) { + var7 = var6 >> 24 & 3; + var8 = var6 >> 1 & 3; + var9 = var6 >> 14 & 1023; + var10 = var6 >> 3 & 2047; + var11 = (var9 / 8 << 8) + var10 / 8; + + for (int var12 = 0; var12 < class152.regions.length; ++var12) { + if (class152.regions[var12] == var11 && class345.regionLandArchives[var12] != null) { + int var13 = (var9 - var3) * 8; + int var14 = (var10 - var4) * 8; + UserComparator5.method672(class345.regionLandArchives[var12], var15, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, var13, var14, Client.collisionMaps); + var19 = true; + break; + } + } + } + + if (!var19) { + class4.method5(var15, var3 * 8, var4 * 8); + } + } + } + } + + for (var15 = 0; var15 < 13; ++var15) { + for (var3 = 0; var3 < 13; ++var3) { + var4 = Client.instanceChunkTemplates[0][var15][var3]; + if (var4 == -1) { + Decimator.method317(var15 * 8, var3 * 8, 8, 8); + } + } + } + + class193.method964(true); + + for (var15 = 0; var15 < 4; ++var15) { + class313.method1648(); + + for (var3 = 0; var3 < 13; ++var3) { + for (var4 = 0; var4 < 13; ++var4) { + var17 = Client.instanceChunkTemplates[var15][var3][var4]; + if (var17 != -1) { + var6 = var17 >> 24 & 3; + var7 = var17 >> 1 & 3; + var8 = var17 >> 14 & 1023; + var9 = var17 >> 3 & 2047; + var10 = (var8 / 8 << 8) + var9 / 8; + + for (var11 = 0; var11 < class152.regions.length; ++var11) { + if (class152.regions[var11] == var10 && class201.regionMapArchives[var11] != null) { + Tiles.method457(class201.regionMapArchives[var11], var15, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, class10.scene, Client.collisionMaps); + break; + } + } + } + } + } + } + } + + class193.method964(true); + class313.method1648(); + class481.method2389(class10.scene, Client.collisionMaps); + class193.method964(true); + var15 = Tiles.Tiles_minPlane; + if (var15 > class87.Client_plane) { + var15 = class87.Client_plane; + } + + if (var15 < class87.Client_plane - 1) { + var15 = class87.Client_plane - 1; + } + + if (Client.isLowDetail) { + class10.scene.init(Tiles.Tiles_minPlane); + } else { + class10.scene.init(0); + } + + for (var3 = 0; var3 < 104; ++var3) { + for (var4 = 0; var4 < 104; ++var4) { + class30.updateItemPile(var3, var4); + } + } + + class313.method1648(); + WorldMapDecoration.method1567(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + PacketBufferNode var18; + if (class159.client.hasFrame()) { + var18 = ClanChannelMember.getPacketBufferNode(ClientPacket.DETECT_MODIFIED_CLIENT, Client.packetWriter.isaacCipher); + var18.packetBuffer.writeInt(1057001181); + Client.packetWriter.addNode(var18); + } + + if (!Client.isInInstance) { + var3 = (class94.timeOfPreviousKeyPress - 6) / 8; + var4 = (class94.timeOfPreviousKeyPress + 6) / 8; + var17 = (class365.field3199 - 6) / 8; + var6 = (class365.field3199 + 6) / 8; + + for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { + for (var8 = var17 - 1; var8 <= var6 + 1; ++var8) { + if (var7 < var3 || var7 > var4 || var8 < var17 || var8 > var6) { + class198.archive9.loadRegionFromName("m" + var7 + "_" + var8); + class198.archive9.loadRegionFromName("l" + var7 + "_" + var8); + } + } + } } - return var1 || UrlRequester.method655() && var0.isFriendsChatMember(); + DefaultsGroup.updateGameState(30); + class313.method1648(); + BuddyRankComparator.method687(); + var18 = ClanChannelMember.getPacketBufferNode(ClientPacket.f49, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var18); + class19.method66(); } } } diff --git a/osrs/src/main/java/OtlTokenRequester.java b/osrs/src/main/java/OtlTokenRequester.java deleted file mode 100644 index 3eb5c8e93..000000000 --- a/osrs/src/main/java/OtlTokenRequester.java +++ /dev/null @@ -1,15 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; - -import java.net.URL; -import java.util.Map; -import java.util.concurrent.Future; - -@Implements("com/jagex/oldscape/pub/OtlTokenRequester") -@ObfuscatedName("com/jagex/oldscape/pub/OtlTokenRequester") -public interface OtlTokenRequester { - @Export("request") - @ObfuscatedName("request") - Future request(String var1, URL var2, Map var3, String var4); -} \ No newline at end of file diff --git a/osrs/src/main/java/PacketBuffer.java b/osrs/src/main/java/PacketBuffer.java index ee51caefa..5aa8cb471 100644 --- a/osrs/src/main/java/PacketBuffer.java +++ b/osrs/src/main/java/PacketBuffer.java @@ -3,83 +3,83 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("to") +@ObfuscatedName("uy") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("ae") - static final int[] field4156; - @ObfuscatedName("au") + @ObfuscatedName("al") + static final int[] field4183; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lux;" + descriptor = "Lvd;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("bitIndex") int bitIndex; static { - field4156 = 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}; + field4183 = 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) { super(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([IB)V", - garbageValue = "4" + descriptor = "([II)V", + garbageValue = "696462538" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lux;I)V", - garbageValue = "-1893850673" + descriptor = "(Lvd;I)V", + garbageValue = "-542273738" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-500862184" + garbageValue = "1739155677" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2096542528" + descriptor = "(B)I", + garbageValue = "126" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "10238360" ) - public boolean method2518() { - int var1 = super.array[super.offset] - this.isaacCipher.method2691() & 255; + public boolean method2552() { + int var1 = super.array[super.offset] - this.isaacCipher.method2730() & 255; return var1 >= 128; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1524220690" + descriptor = "(B)I", + garbageValue = "38" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -87,32 +87,32 @@ public int readSmartByteShortIsaac() { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1401941730" + garbageValue = "-1046012809" ) - public void method2520(byte[] var1, int var2, int var3) { + public void method2554(byte[] var1, int var2, int var3) { for (int var4 = 0; var4 < var3; ++var4) { var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "859542429" + garbageValue = "-1508899013" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "49" + descriptor = "(II)I", + garbageValue = "-2142636526" ) @Export("readBits") public int readBits(int var1) { @@ -121,36 +121,86 @@ public int readBits(int var1) { int var4 = 0; for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field4156[var3]) << var1 - var3; + var4 += (super.array[var2++] & field4183[var3]) << var1 - var3; var1 -= var3; } if (var3 == var1) { - var4 += super.array[var2] & field4156[var3]; + var4 += super.array[var2] & field4183[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4156[var1]; + var4 += super.array[var2] >> var3 - var1 & field4183[var1]; } return var4; } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-512119498" + descriptor = "(B)V", + garbageValue = "59" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "2109529499" + garbageValue = "1292401715" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "([BIILjt;[Lih;I)V", + garbageValue = "-1538039820" + ) + static final void method2559(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); + int var6 = -1; + + while (true) { + int var7 = var5.readIncrSmallSmart(); + if (var7 == 0) { + return; + } + + var6 += var7; + int var8 = 0; + + while (true) { + int var9 = var5.readUShortSmart(); + if (var9 == 0) { + break; + } + + var8 += var9 - 1; + int var10 = var8 & 63; + int var11 = var8 >> 6 & 63; + int var12 = var8 >> 12; + int var13 = var5.readUnsignedByte(); + int var14 = var13 >> 2; + int var15 = var13 & 3; + int var16 = var11 + var1; + int var17 = var10 + var2; + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { + int var18 = var12; + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { + var18 = var12 - 1; + } + + CollisionMap var19 = null; + if (var18 >= 0) { + var19 = var4[var18]; + } + + class314.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); + } + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/PacketBufferNode.java b/osrs/src/main/java/PacketBufferNode.java index 71f591053..f5d8223b7 100644 --- a/osrs/src/main/java/PacketBufferNode.java +++ b/osrs/src/main/java/PacketBufferNode.java @@ -3,47 +3,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Collections; - -@ObfuscatedName("ly") +@ObfuscatedName("lx") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "[Lly;" + descriptor = "[Llx;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "[[Lmi;" - ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "Lsr;" - ) - static Fonts field2613; - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lln;" ) @Export("clientPacket") - public ClientPacket clientPacket; - @ObfuscatedName("ae") + ClientPacket clientPacket; + @ObfuscatedName("al") @Export("clientPacketLength") - public int clientPacketLength; - @ObfuscatedName("ao") + int clientPacketLength; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lto;" + descriptor = "Luy;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("index") public int index; @@ -55,10 +42,10 @@ public class PacketBufferNode extends Node { PacketBufferNode() { } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1268899261" + garbageValue = "1253397804" ) @Export("release") public void release() { @@ -67,42 +54,211 @@ public void release() { } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([I[II)V", - garbageValue = "-469977275" + descriptor = "([FIFZFZ[FB)I", + garbageValue = "88" ) - public static void method1611(int[] var0, int[] var1) { - if (var0 != null && var1 != null) { - class416.ByteArrayPool_alternativeSizes = var0; - StructComposition.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; - class410.ByteArrayPool_arrays = new byte[var0.length][][]; - - for (int var2 = 0; var2 < class416.ByteArrayPool_alternativeSizes.length; ++var2) { - class410.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; - ByteArrayPool.field3746.add(var0[var2]); - } + public static int method1646(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { + float var7 = 0.0F; - Collections.sort(ByteArrayPool.field3746); - } else { - class416.ByteArrayPool_alternativeSizes = null; - StructComposition.ByteArrayPool_altSizeArrayCounts = null; - class410.ByteArrayPool_arrays = null; - class101.method599(); + for (int var8 = 0; var8 < var1 + 1; ++var8) { + var7 += Math.abs(var0[var8]); } - } - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1208755601" - ) - public static int method1609(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); - var0 = var0 + (var0 >>> 4) & 252645135; - var0 += var0 >>> 8; - var0 += var0 >>> 16; - return var0 & 255; + float var44 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class128.field1202; + if (var7 <= var44) { + return -1; + } else { + float[] var9 = new float[var1 + 1]; + + int var10; + for (var10 = 0; var10 < var1 + 1; ++var10) { + var9[var10] = var0[var10] * (1.0F / var7); + } + + while (Math.abs(var9[var1]) < var44) { + --var1; + } + + var10 = 0; + if (var1 == 0) { + return var10; + } else if (var1 == 1) { + var6[0] = -var9[0] / var9[1]; + boolean var11 = var3 ? var2 < var6[0] + var44 : var2 < var6[0] - var44; + boolean var12 = var5 ? var4 > var6[0] - var44 : var4 > var6[0] + var44; + var10 = var11 && var12 ? 1 : 0; + if (var10 > 0) { + if (var3 && var6[0] < var2) { + var6[0] = var2; + } else if (var5 && var6[0] > var4) { + var6[0] = var4; + } + } + + return var10; + } else { + class467 var41 = new class467(var9, var1); + float[] var42 = new float[var1 + 1]; + + for (int var13 = 1; var13 <= var1; ++var13) { + var42[var13 - 1] = (float)var13 * var9[var13]; + } + + float[] var43 = new float[var1 + 1]; + int var14 = method1646(var42, var1 - 1, var2, false, var4, false, var43); + if (var14 == -1) { + return 0; + } else { + boolean var15 = false; + float var17 = 0.0F; + float var18 = 0.0F; + float var19 = 0.0F; + + for (int var20 = 0; var20 <= var14; ++var20) { + if (var10 > var1) { + return var10; + } + + float var16; + if (var20 == 0) { + var16 = var2; + var18 = Frames.method1338(var9, var1, var2); + if (Math.abs(var18) <= var44 && var3) { + var6[var10++] = var2; + } + } else { + var16 = var19; + var18 = var17; + } + + if (var20 == var14) { + var19 = var4; + var15 = false; + } else { + var19 = var43[var20]; + } + + var17 = Frames.method1338(var9, var1, var19); + if (var15) { + var15 = false; + } else if (Math.abs(var17) < var44) { + if (var14 != var20 || var5) { + var6[var10++] = var19; + var15 = true; + } + } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { + int var22 = var10++; + float var24 = var16; + float var25 = var19; + float var26 = Frames.method1338(var41.field3922, var41.field3923, var16); + float var23; + if (Math.abs(var26) < class128.field1202) { + var23 = var16; + } else { + float var27 = Frames.method1338(var41.field3922, var41.field3923, var19); + if (Math.abs(var27) < class128.field1202) { + var23 = var19; + } else { + float var28 = 0.0F; + float var29 = 0.0F; + float var30 = 0.0F; + float var35 = 0.0F; + boolean var36 = true; + boolean var37 = false; + + do { + var37 = false; + if (var36) { + var28 = var24; + var35 = var26; + var29 = var25 - var24; + var30 = var29; + var36 = false; + } + + if (Math.abs(var35) < Math.abs(var27)) { + var24 = var25; + var25 = var28; + var28 = var24; + var26 = var27; + var27 = var35; + var35 = var26; + } + + float var38 = class128.field1201 * Math.abs(var25) + 0.0F; + float var39 = 0.5F * (var28 - var25); + boolean var40 = Math.abs(var39) > var38 && 0.0F != var27; + if (var40) { + if (Math.abs(var30) >= var38 && Math.abs(var26) > Math.abs(var27)) { + float var34 = var27 / var26; + float var31; + float var32; + if (var24 == var28) { + var31 = var34 * 2.0F * var39; + var32 = 1.0F - var34; + } else { + var32 = var26 / var35; + float var33 = var27 / var35; + var31 = var34 * ((var32 - var33) * 2.0F * var39 * var32 - (var33 - 1.0F) * (var25 - var24)); + var32 = (var32 - 1.0F) * (var33 - 1.0F) * (var34 - 1.0F); + } + + if ((double)var31 > 0.0D) { + var32 = -var32; + } else { + var31 = -var31; + } + + var34 = var30; + var30 = var29; + if (var31 * 2.0F < var39 * 3.0F * var32 - Math.abs(var38 * var32) && var31 < Math.abs(var32 * 0.5F * var34)) { + var29 = var31 / var32; + } else { + var29 = var39; + var30 = var39; + } + } else { + var29 = var39; + var30 = var39; + } + + var24 = var25; + var26 = var27; + if (Math.abs(var29) > var38) { + var25 += var29; + } else if ((double)var39 > 0.0D) { + var25 += var38; + } else { + var25 -= var38; + } + + var27 = Frames.method1338(var41.field3922, var41.field3923, var25); + if ((double)(var27 * (var35 / Math.abs(var35))) > 0.0D) { + var36 = true; + var37 = true; + } else { + var37 = true; + } + } + } while(var37); + + var23 = var25; + } + } + + var6[var22] = var23; + if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var44) { + var6[var10 - 2] = (var6[var10 - 1] + var6[var10 - 2]) * 0.5F; + --var10; + } + } + } + + return var10; + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/PacketWriter.java b/osrs/src/main/java/PacketWriter.java index 6b6343810..6dff6431a 100644 --- a/osrs/src/main/java/PacketWriter.java +++ b/osrs/src/main/java/PacketWriter.java @@ -4,77 +4,74 @@ import net.runelite.mapping.ObfuscatedSignature; import java.io.IOException; -import java.util.ArrayList; -@ObfuscatedName("er") +@ObfuscatedName("ez") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("ab") - static int field1151; - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lqi;" + descriptor = "Lre;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Loc;" + descriptor = "Lpy;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("bufferSize") int bufferSize; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Ltm;" + descriptor = "Lul;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lux;" + descriptor = "Lvd;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lto;" + descriptor = "Luy;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("aa") - boolean field1152; - @ObfuscatedName("af") - int field1154; - @ObfuscatedName("ad") + @ObfuscatedName("am") + boolean field1148; + @ObfuscatedName("av") + int field1152; + @ObfuscatedName("ag") @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - ServerPacket field1159; - @ObfuscatedName("al") + ServerPacket field1153; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - ServerPacket field1157; - @ObfuscatedName("an") + ServerPacket field1154; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - ServerPacket field1158; + ServerPacket field1156; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); @@ -83,15 +80,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); this.serverPacket = null; this.serverPacketLength = 0; - this.field1152 = true; - this.field1154 = 0; + this.field1148 = true; + this.field1152 = 0; this.pendingWrites = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1375263214" + garbageValue = "-633870649" ) @Export("clearBuffer") final void clearBuffer() { @@ -99,10 +96,10 @@ final void clearBuffer() { this.bufferSize = 0; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-55" + descriptor = "(I)V", + garbageValue = "-1725575924" ) @Export("flush") final void flush() throws IOException { @@ -127,10 +124,10 @@ final void flush() throws IOException { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lly;B)V", - garbageValue = "17" + descriptor = "(Llx;B)V", + garbageValue = "22" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -140,20 +137,20 @@ public final void addNode(PacketBufferNode var1) { this.bufferSize += var1.index; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lqi;B)V", - garbageValue = "-68" + descriptor = "(Lre;I)V", + garbageValue = "-584011742" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "272973129" + garbageValue = "-2087446789" ) @Export("close") void close() { @@ -164,213 +161,81 @@ void close() { } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1646741588" + garbageValue = "-669241034" ) @Export("removeSocket") void removeSocket() { this.socket = null; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Lqi;", - garbageValue = "-972291242" + descriptor = "(I)Lre;", + garbageValue = "-1314055794" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "899578863" + descriptor = "(Lom;Ljava/lang/String;Ljava/lang/String;I)[Lud;", + garbageValue = "1067620942" ) - static int method644(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return Frames.method1295(var0, var1, var2); - } else if (var0 < 1100) { - return SecureRandomFuture.method441(var0, var1, var2); - } else if (var0 < 1200) { - return class93.method504(var0, var1, var2); - } else if (var0 < 1300) { - return InterfaceParent.method474(var0, var1, var2); - } else if (var0 < 1400) { - return class12.method35(var0, var1, var2); - } else if (var0 < 1500) { - return class169.method879(var0, var1, var2); - } else if (var0 < 1600) { - return class132.method735(var0, var1, var2); - } else if (var0 < 1700) { - return WorldMapRectangle.method1528(var0, var1, var2); - } else if (var0 < 1800) { - return DynamicObject.method450(var0, var1, var2); - } else if (var0 < 1900) { - return SecureRandomFuture.method442(var0, var1, var2); - } else if (var0 < 2000) { - return class499.method2489(var0, var1, var2); - } else if (var0 < 2100) { - return SecureRandomFuture.method441(var0, var1, var2); - } else if (var0 < 2200) { - return class93.method504(var0, var1, var2); - } else if (var0 < 2300) { - return InterfaceParent.method474(var0, var1, var2); - } else if (var0 < 2400) { - return class12.method35(var0, var1, var2); - } else if (var0 < 2500) { - return class169.method879(var0, var1, var2); - } else if (var0 < 2600) { - return MenuAction.method426(var0, var1, var2); - } else if (var0 < 2700) { - return ByteArrayPool.method2149(var0, var1, var2); - } else if (var0 < 2800) { - return class326.method1716(var0, var1, var2); - } else if (var0 < 2900) { - return Player.method499(var0, var1, var2); - } else if (var0 < 3000) { - return class499.method2489(var0, var1, var2); - } else if (var0 < 3200) { - return class466.method2349(var0, var1, var2); - } else if (var0 < 3300) { - return WorldMapSection1.method1553(var0, var1, var2); - } else if (var0 < 3400) { - return class372.method1971(var0, var1, var2); - } else if (var0 < 3500) { - return UserList.method2243(var0, var1, var2); - } else if (var0 < 3600) { - return class238.method1311(var0, var1, var2); - } else if (var0 < 3700) { - return class16.method48(var0, var1, var2); - } else if (var0 < 3800) { - return class31.method123(var0, var1, var2); - } else if (var0 < 3900) { - return ObjectSound.method415(var0, var1, var2); - } else if (var0 < 4000) { - return GameBuild.method1869(var0, var1, var2); - } else if (var0 < 4100) { - return class352.method1880(var0, var1, var2); - } else if (var0 < 4200) { - return Decimator.method315(var0, var1, var2); - } else if (var0 < 4300) { - return AttackOption.method607(var0, var1, var2); - } else if (var0 < 5100) { - return ArchiveDiskActionHandler.method1886(var0, var1, var2); - } else if (var0 < 5400) { - return class161.method850(var0, var1, var2); - } else if (var0 < 5600) { - return class466.method2351(var0, var1, var2); - } else if (var0 < 5700) { - return Interpreter.method419(var0, var1, var2); - } else if (var0 < 6300) { - return class448.method2292(var0, var1, var2); - } else if (var0 < 6600) { - return class139.method759(var0, var1, var2); - } else if (var0 < 6700) { - return Interpreter.method420(var0, var1, var2); - } else if (var0 < 6800) { - return class101.method600(var0, var1, var2); - } else if (var0 < 6900) { - return ObjTypeCustomisation.method935(var0, var1, var2); - } else if (var0 < 7000) { - return class53.method297(var0, var1, var2); - } else if (var0 < 7100) { - return class6.method12(var0, var1, var2); - } else if (var0 < 7200) { - return Messages.method635(var0, var1, var2); - } else if (var0 < 7300) { - return class170.method900(var0, var1, var2); - } else if (var0 < 7500) { - return InterfaceParent.method476(var0, var1, var2); - } else if (var0 < 7600) { - return SoundCache.method228(var0, var1, var2); - } else if (var0 < 7700) { - return class178.method922(var0, var1, var2); + public static SpritePixels[] method646(AbstractArchive var0, String var1, String var2) { + if (!var0.isValidFileName(var1, var2)) { + return null; } else { - return var0 < 8100 ? class218.method1146(var0, var1, var2) : 2; - } - } + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + SpritePixels[] var5; + if (!class164.method862(var0, var3, var4)) { + var5 = null; + } else { + SpritePixels[] var7 = new SpritePixels[class544.SpriteBuffer_spriteCount]; + + for (int var8 = 0; var8 < class544.SpriteBuffer_spriteCount; ++var8) { + SpritePixels var9 = var7[var8] = new SpritePixels(); + var9.width = class159.SpriteBuffer_spriteWidth; + var9.height = class500.SpriteBuffer_spriteHeight; + var9.xOffset = class326.SpriteBuffer_xOffsets[var8]; + var9.yOffset = ModelData0.SpriteBuffer_yOffsets[var8]; + var9.subWidth = class59.SpriteBuffer_spriteWidths[var8]; + var9.subHeight = class544.SpriteBuffer_spriteHeights[var8]; + int var10 = var9.subWidth * var9.subHeight; + byte[] var11 = AddRequestTask.SpriteBuffer_pixels[var8]; + var9.pixels = new int[var10]; + + for (int var12 = 0; var12 < var10; ++var12) { + var9.pixels[var12] = class372.SpriteBuffer_spritePalette[var11[var12] & 255]; + } + } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "49" - ) - @Export("someMusicMethod") - public static void someMusicMethod(int var0, int var1, int var2, int var3) { - if (class305.musicSongs.size() > 1 && class305.musicSongs.get(0) != null && ((MusicSong)class305.musicSongs.get(0)).midiPcmStream.isReady() && class305.musicSongs.get(1) != null && ((MusicSong)class305.musicSongs.get(1)).midiPcmStream.isReady()) { - class270.method1537(var0, var1, var2, var3); - class305.field2771.add(new SwapSongTask((SongTask)null)); - ArrayList var4 = new ArrayList(); - var4.add(new DelayFadeTask(new FadeInTask((SongTask)null, 1, false, class305.field2768), class305.field2769)); - var4.add(new DelayFadeTask(new FadeOutTask((SongTask)null, 0, false, class305.field2766), class305.musicPlayerStatus)); - class305.field2771.add(new ConcurrentMidiTask((SongTask)null, var4)); - if (class305.field2773.get(0) != null && class305.field2773.get(1) != null) { - MusicSong var5 = (MusicSong)class305.field2773.get(0); - class305.field2773.set(0, class305.musicSongs.get(1)); - class305.field2773.set(1, var5); + class407.method2062(); + var5 = var7; } - } - - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-581625069" - ) - protected static final void method645() { - class332.clock.mark(); - int var0; - for (var0 = 0; var0 < 32; ++var0) { - GameEngine.graphicsTickTimes[var0] = 0L; + return var5; } - - for (var0 = 0; var0 < 32; ++var0) { - GameEngine.clientTickTimes[var0] = 0L; - } - - GameEngine.gameCyclesToDo = 0; } - @ObfuscatedName("ky") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Ldv;I)V", - garbageValue = "-932722306" + descriptor = "(Ljava/lang/CharSequence;B)I", + garbageValue = "-63" ) - static final void method646(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = class130.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { - var1 = class130.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = class130.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = class130.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } + public static int method647(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; - if (var1 != 0L) { - int var6 = class130.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = InvDefinition.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + var0.charAt(var3); } - var0.objectId = var3; - var0.field956 = var4; - var0.field948 = var5; + return var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/ParamComposition.java b/osrs/src/main/java/ParamComposition.java index c53c6b224..c0aee0ad1 100644 --- a/osrs/src/main/java/ParamComposition.java +++ b/osrs/src/main/java/ParamComposition.java @@ -3,35 +3,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; - -@ObfuscatedName("hx") +@ObfuscatedName("ix") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("ParamDefinition_archive") static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("ParamDefinition_cached") static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("an") - static int field1678; - @ObfuscatedName("ao") + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "Lud;" + ) + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; + @ObfuscatedName("ak") @Export("type") char type; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("defaultInt") public int defaultInt; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("autoDisable") boolean autoDisable; @@ -43,19 +45,19 @@ public class ParamComposition extends DualNode { this.autoDisable = true; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-990843992" + garbageValue = "-560254991" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-59" + descriptor = "(Lul;I)V", + garbageValue = "-721387460" ) @Export("decode") void decode(Buffer var1) { @@ -69,15 +71,15 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "-1461368185" + descriptor = "(Lul;II)V", + garbageValue = "-1665298229" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.type = ViewportMouse.method1348(var1.readByte()); + this.type = class149.method782(var1.readByte()); } else if (var2 == 2) { this.defaultInt = var1.readInt(); } else if (var2 == 4) { @@ -88,479 +90,28 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-785538560" + descriptor = "(B)Z", + garbageValue = "-19" ) @Export("isString") public boolean isString() { return this.type == 's'; } - @ObfuscatedName("hq") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-50" + descriptor = "(I)Lrb;", + garbageValue = "-91337538" ) - static void method1017() { - int var0; - if (Client.field419 == class92.field940) { - class130.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0] = new CollisionMap(104, 104); - } - - AbstractUserComparator.sceneMinimapSprite = new SpritePixels(512, 512); - Login.Login_loadingText = "Starting game engine..."; - Login.Login_loadingPercent = 5; - Client.field419 = class92.field930; - } else if (class92.field930 == Client.field419) { - Login.Login_loadingText = "Prepared visibility map"; - Login.Login_loadingPercent = 10; - Client.field419 = class92.field935; - } else if (class92.field935 == Client.field419) { - AttackOption.field1096 = class133.newArchive(0, false, true, true, false); - class318.archive7 = class133.newArchive(1, false, true, true, false); - class1.archive2 = class133.newArchive(2, true, false, true, false); - ObjectSound.archive4 = class133.newArchive(3, false, true, true, false); - class28.field81 = class133.newArchive(4, false, true, true, false); - class499.archive9 = class133.newArchive(5, true, true, true, false); - class385.archive6 = class133.newArchive(6, true, true, true, false); - Message.archive11 = class133.newArchive(7, false, true, true, false); - PcmPlayer.archive8 = class133.newArchive(8, false, true, true, false); - class147.field1348 = class133.newArchive(9, false, true, true, false); - class141.archive10 = class133.newArchive(10, false, true, true, false); - class388.field3655 = class133.newArchive(11, false, true, true, false); - GrandExchangeOffer.archive12 = class133.newArchive(12, false, true, true, false); - Player.archive13 = class133.newArchive(13, true, false, true, false); - class106.field1107 = class133.newArchive(14, false, true, true, false); - Tiles.field838 = class133.newArchive(15, false, true, true, false); - class10.field28 = class133.newArchive(17, true, true, true, false); - WorldMapElement.field1509 = class133.newArchive(18, false, true, true, false); - ClanChannelMember.field1339 = class133.newArchive(19, false, true, true, false); - class227.field2040 = class133.newArchive(20, false, true, true, false); - class343.field3148 = class133.newArchive(21, false, true, true, true); - Login.Login_loadingText = "Connecting to update server"; - Login.Login_loadingPercent = 20; - Client.field419 = class92.field939; - } else if (class92.field939 == Client.field419) { - byte var43 = 0; - var0 = var43 + AttackOption.field1096.percentage() * 4 / 100; - var0 += class318.archive7.percentage() * 4 / 100; - var0 += class1.archive2.percentage() * 2 / 100; - var0 += ObjectSound.archive4.percentage() * 2 / 100; - var0 += class28.field81.percentage() * 6 / 100; - var0 += class499.archive9.percentage() * 4 / 100; - var0 += class385.archive6.percentage() * 2 / 100; - var0 += Message.archive11.percentage() * 55 / 100; - var0 += PcmPlayer.archive8.percentage() * 2 / 100; - var0 += class147.field1348.percentage() * 2 / 100; - var0 += class141.archive10.percentage() * 2 / 100; - var0 += class388.field3655.percentage() * 2 / 100; - var0 += GrandExchangeOffer.archive12.percentage() * 2 / 100; - var0 += Player.archive13.percentage() * 2 / 100; - var0 += class106.field1107.percentage() * 2 / 100; - var0 += Tiles.field838.percentage() * 2 / 100; - var0 += ClanChannelMember.field1339.percentage() / 100; - var0 += WorldMapElement.field1509.percentage() / 100; - var0 += class227.field2040.percentage() / 100; - var0 += class343.field3148.percentage() / 100; - var0 += class10.field28.method1887() && class10.field28.isFullyLoaded() ? 1 : 0; - if (var0 != 100) { - if (var0 != 0) { - Login.Login_loadingText = "Checking for updates - " + var0 + "%"; - } - - Login.Login_loadingPercent = 30; + public static class465 method1053() { + synchronized(class465.field3907) { + if (class465.field3905 == 0) { + return new class465(); } else { - class466.method2348(AttackOption.field1096, "Animations"); - class466.method2348(class318.archive7, "Skeletons"); - class466.method2348(class28.field81, "Sound FX"); - class466.method2348(class499.archive9, "Maps"); - class466.method2348(class385.archive6, "Music Tracks"); - class466.method2348(Message.archive11, "Models"); - class466.method2348(PcmPlayer.archive8, "Sprites"); - class466.method2348(class388.field3655, "Music Jingles"); - class466.method2348(class106.field1107, "Music Samples"); - class466.method2348(Tiles.field838, "Music Patches"); - class466.method2348(ClanChannelMember.field1339, "World Map"); - class466.method2348(WorldMapElement.field1509, "World Map Geography"); - class466.method2348(class227.field2040, "World Map Ground"); - class387.field3652 = new GraphicsDefaults(); - class387.field3652.decode(class10.field28); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.field419 = class92.field928; - } - } else { - int var2; - Archive var3; - Archive var29; - if (class92.field928 == Client.field419) { - class504.method2502(22050, !Client.isLowDetail, 2); - ArrayList var48 = new ArrayList(3); - AddRequestTask.pcmPlayer1 = TileItem.method612(GameEngine.taskHandler, 0, 2048); - class162.pcmStreamMixer = new PcmStreamMixer(); - PcmStreamMixer var37 = new PcmStreamMixer(); - var37.addSubStream(class162.pcmStreamMixer); - - for (var2 = 0; var2 < 3; ++var2) { - MidiPcmStream var39 = new MidiPcmStream(); - var39.method1638(9, 128); - var37.addSubStream(var39); - var48.add(var39); - } - - AddRequestTask.pcmPlayer1.setStream(var37); - var29 = Tiles.field838; - var3 = class106.field1107; - Archive var40 = class28.field81; - class305.field2777 = var29; - class305.field2775 = var3; - class305.field2776 = var40; - class305.midiPcmStream = var48; - class330.decimator = new Decimator(22050, PcmPlayer.field181); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.field419 = class92.field932; - PacketBufferNode.field2613 = new Fonts(PcmPlayer.archive8, Player.archive13); - } else { - int var30; - if (Client.field419 == class92.field932) { - FontName[] var47 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_plain12}; - var30 = var47.length; - Fonts var49 = PacketBufferNode.field2613; - FontName[] var38 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_plain12}; - Client.fontsMap = var49.createMap(var38); - if (Client.fontsMap.size() < var30) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var30 + "%"; - Login.Login_loadingPercent = 40; - } else { - HealthBarUpdate.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - SecureRandomCallable.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - class59.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - class18.field51 = Client.field645.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.field419 = class92.field941; - } - } else { - Archive var1; - int var31; - Archive var32; - if (Client.field419 == class92.field941) { - var1 = class141.archive10; - var29 = PcmPlayer.archive8; - var31 = 0; - String[] var4 = Login.field770; - - int var5; - String var41; - for (var5 = 0; var5 < var4.length; ++var5) { - var41 = var4[var5]; - if (var1.tryLoadFileByNames(var41, "")) { - ++var31; - } - } - - var4 = Login.field769; - - for (var5 = 0; var5 < var4.length; ++var5) { - var41 = var4[var5]; - if (var29.tryLoadFileByNames(var41, "")) { - ++var31; - } - } - - var4 = Login.field771; - - for (var5 = 0; var5 < var4.length; ++var5) { - var41 = var4[var5]; - if (var29.getGroupId(var41) != -1 && var29.tryLoadFileByNames(var41, "")) { - ++var31; - } - } - - var32 = PcmPlayer.archive8; - int var33 = Login.field770.length + Login.field769.length; - String[] var42 = Login.field771; - - for (int var8 = 0; var8 < var42.length; ++var8) { - String var44 = var42[var8]; - if (var32.getGroupId(var44) != -1) { - ++var33; - } - } - - if (var31 < var33) { - Login.Login_loadingText = "Loading title screen - " + var31 * 100 / var33 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - MusicSong.updateGameState(5); - Client.field419 = class92.field936; - } - } else if (class92.field936 == Client.field419) { - if (!class1.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + class1.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else if (!class343.field3148.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + (80 + GrandExchangeOffer.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 60; - } else { - class326.method1714(class1.archive2); - SecureRandomFuture.method435(class1.archive2); - Archive var46 = class1.archive2; - var1 = Message.archive11; - KitDefinition.KitDefinition_archive = var46; - KitDefinition.KitDefinition_modelsArchive = var1; - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); - var29 = class1.archive2; - var3 = Message.archive11; - boolean var50 = Client.isLowDetail; - ObjectComposition.ObjectDefinition_archive = var29; - ObjectComposition.ObjectDefinition_modelsArchive = var3; - ObjectComposition.ObjectDefinition_isLowDetail = var50; - var32 = class1.archive2; - Archive var6 = Message.archive11; - NPCComposition.NpcDefinition_archive = var32; - NPCComposition.field1586 = var6; - Archive var7 = class1.archive2; - StructComposition.StructDefinition_archive = var7; - Archive var35 = class1.archive2; - Archive var9 = Message.archive11; - boolean var10 = Client.isMembersWorld; - Font var11 = HealthBarUpdate.fontPlain11; - class384.ItemDefinition_archive = var35; - ItemComposition.ItemDefinition_modelArchive = var9; - ItemComposition.ItemDefinition_inMembersWorld = var10; - HealthBar.ItemDefinition_fileCount = class384.ItemDefinition_archive.getGroupFileCount(10); - class452.ItemDefinition_fontPlain11 = var11; - class227.method1215(class1.archive2, AttackOption.field1096, class318.archive7); - Archive var12 = class1.archive2; - Archive var13 = Message.archive11; - SpotAnimationDefinition.SpotAnimationDefinition_archive = var12; - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var13; - ServerPacket.method1612(class1.archive2); - FileSystem.method911(class1.archive2); - Archive var14 = ObjectSound.archive4; - Archive var15 = Message.archive11; - Archive var16 = PcmPlayer.archive8; - Archive var17 = Player.archive13; - int var18 = 0; - if (var14 != null) { - Decimator.Widget_archive = var14; - class47.field226 = var15; - Language.Widget_spritesArchive = var16; - class155.Widget_fontsArchive = var17; - var18 = Decimator.Widget_archive.getGroupCount(); - } - - PacketBufferNode.Widget_interfaceComponents = new Widget[var18][]; - class316.Widget_loadedInterfaces = new boolean[var18]; - ModeWhere.method1978(class1.archive2); - Archive var36 = class1.archive2; - EnumComposition.EnumDefinition_archive = var36; - Archive var19 = class1.archive2; - VarcInt.VarcInt_archive = var19; - Archive var20 = class1.archive2; - class139.method756(class1.archive2); - BufferedSource.method2268(class1.archive2); - ModelData0.method1382(class1.archive2); - class47.HitSplatDefinition_cachedSprites = new class497(WorldMapSectionType.field2417, 54, ClanChannelMember.clientLanguage, class1.archive2); - SwapSongTask.HitSplatDefinition_cached = new class497(WorldMapSectionType.field2417, 47, ClanChannelMember.clientLanguage, class1.archive2); - KeyHandler.varcs = new Varcs(); - Archive var21 = class1.archive2; - Archive var22 = PcmPlayer.archive8; - Archive var23 = Player.archive13; - HitSplatDefinition.HitSplatDefinition_archive = var21; - HitSplatDefinition.field1689 = var22; - HitSplatDefinition.HitSplatDefinition_fontsArchive = var23; - class152.method796(class1.archive2, PcmPlayer.archive8); - Archive var24 = class1.archive2; - Archive var25 = PcmPlayer.archive8; - WorldMapElement.WorldMapElement_archive = var25; - if (var24.isFullyLoaded()) { - WorldMapElement.WorldMapElement_count = var24.getGroupFileCount(35); - WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; - - for (int var26 = 0; var26 < WorldMapElement.WorldMapElement_count; ++var26) { - byte[] var27 = var24.takeFile(35, var26); - WorldMapElement.WorldMapElement_cached[var26] = new WorldMapElement(var26); - if (var27 != null) { - WorldMapElement.WorldMapElement_cached[var26].decode(new Buffer(var27)); - WorldMapElement.WorldMapElement_cached[var26].method949(); - } - } - } - - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.field419 = class92.field926; - } - } else if (Client.field419 == class92.field926) { - var0 = 0; - if (Client.compass == null) { - Client.compass = Tiles.SpriteBuffer_getSprite(PcmPlayer.archive8, class387.field3652.compass, 0); - } else { - ++var0; - } - - if (class167.redHintArrowSprite == null) { - class167.redHintArrowSprite = Tiles.SpriteBuffer_getSprite(PcmPlayer.archive8, class387.field3652.field3850, 0); - } else { - ++var0; - } - - if (class299.mapSceneSprites == null) { - class299.mapSceneSprites = class28.method110(PcmPlayer.archive8, class387.field3652.mapScenes, 0); - } else { - ++var0; - } - - if (class178.headIconPkSprites == null) { - class178.headIconPkSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.headIconsPk, 0); - } else { - ++var0; - } - - if (class502.headIconPrayerSprites == null) { - class502.headIconPrayerSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.field3848, 0); - } else { - ++var0; - } - - if (ArchiveLoader.headIconHintSprites == null) { - ArchiveLoader.headIconHintSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.field3852, 0); - } else { - ++var0; - } - - if (Message.mapMarkerSprites == null) { - Message.mapMarkerSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.field3857, 0); - } else { - ++var0; - } - - if (class152.crossSprites == null) { - class152.crossSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.field3854, 0); - } else { - ++var0; - } - - if (FloorOverlayDefinition.mapDotSprites == null) { - FloorOverlayDefinition.mapDotSprites = WorldMapArchiveLoader.method2379(PcmPlayer.archive8, class387.field3652.field3847, 0); - } else { - ++var0; - } - - if (GrandExchangeOfferOwnWorldComparator.scrollBarSprites == null) { - GrandExchangeOfferOwnWorldComparator.scrollBarSprites = class28.method110(PcmPlayer.archive8, class387.field3652.field3851, 0); - } else { - ++var0; - } - - if (class451.field3876 == null) { - class451.field3876 = class28.method110(PcmPlayer.archive8, class387.field3652.field3849, 0); - } else { - ++var0; - } - - if (var0 < 11) { - Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = class451.field3876; - class167.redHintArrowSprite.normalize(); - var30 = (int)(Math.random() * 21.0D) - 10; - var2 = (int)(Math.random() * 21.0D) - 10; - var31 = (int)(Math.random() * 21.0D) - 10; - int var34 = (int)(Math.random() * 41.0D) - 20; - class299.mapSceneSprites[0].shiftColors(var34 + var30, var2 + var34, var34 + var31); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.field419 = class92.field931; - } - } else if (Client.field419 == class92.field931) { - if (!class147.field1348.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - class129.textureProvider = new TextureProvider(class147.field1348, PcmPlayer.archive8, 20, class449.clientPreferences.getBrightness(), Client.isLowDetail ? 64 : 128); - Rasterizer3D.method1186(class129.textureProvider); - Rasterizer3D.method1187(class449.clientPreferences.getBrightness()); - Client.field419 = class92.field929; - } - } else if (class92.field929 == Client.field419) { - var0 = class129.textureProvider.getLoadedPercentage(); - if (var0 < 100) { - Login.Login_loadingText = "Loading textures - " + var0 + "%"; - Login.Login_loadingPercent = 90; - } else { - Login.Login_loadingText = "Loaded textures"; - Login.Login_loadingPercent = 90; - Client.field419 = class92.field937; - } - } else if (Client.field419 == class92.field937) { - class126.mouseRecorder = new MouseRecorder(); - GameEngine.taskHandler.newThreadTask(class126.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.field419 = class92.field933; - } else if (class92.field933 == Client.field419) { - if (!class141.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var45 = new Huffman(class141.archive10.takeFileByNames("huffman", "")); - UserComparator9.method683(var45); - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.field419 = class92.field934; - } - } else if (class92.field934 == Client.field419) { - if (!ObjectSound.archive4.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + ObjectSound.archive4.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!GrandExchangeOffer.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + GrandExchangeOffer.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!Player.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + Player.archive13.loadPercent() / 50) + "%"; - Login.Login_loadingPercent = 96; - } else { - Login.Login_loadingText = "Loaded interfaces"; - Login.Login_loadingPercent = 98; - if (GrandExchangeOffer.archive12.isValidFileName("version.dat", "")) { - Buffer var28 = new Buffer(GrandExchangeOffer.archive12.takeFileByNames("version.dat", "")); - var28.readUnsignedShort(); - } - - Client.field419 = class92.field938; - } - } else if (Client.field419 == class92.field938) { - Login.Login_loadingPercent = 100; - if (ClanChannelMember.field1339.getGroupCount() > 0 && !ClanChannelMember.field1339.tryLoadGroupByName(WorldMapCacheName.field2471.name)) { - Login.Login_loadingText = "Loading world map - " + ClanChannelMember.field1339.groupLoadPercentByName(WorldMapCacheName.field2471.name) / 10 + "%"; - } else { - if (Canvas.worldMap == null) { - Canvas.worldMap = new WorldMap(); - Canvas.worldMap.init(ClanChannelMember.field1339, WorldMapElement.field1509, class227.field2040, class59.fontBold12, Client.fontsMap, class299.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.field419 = class92.field927; - } - } else { - if (class92.field927 == Client.field419) { - MusicSong.updateGameState(10); - } - - } - } + class465.field3907[--class465.field3905].method2340(); + return class465.field3907[class465.field3905]; } } } diff --git a/osrs/src/main/java/PcmPlayer.java b/osrs/src/main/java/PcmPlayer.java index 0b296c83d..9896cd888 100644 --- a/osrs/src/main/java/PcmPlayer.java +++ b/osrs/src/main/java/PcmPlayer.java @@ -3,175 +3,167 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.concurrent.ScheduledExecutorService; - -@ObfuscatedName("bb") +@ObfuscatedName("bu") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("ac") - public static int field181; - @ObfuscatedName("ai") - @Export("PcmPlayer_stereo") - protected static boolean PcmPlayer_stereo; - @ObfuscatedName("ap") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("aa") - static int field182; - @ObfuscatedName("fx") + @ObfuscatedName("ao") + public static int field179; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lud;" ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("an") + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("tw") + static boolean field180; + @ObfuscatedName("ay") @Export("samples") - protected int[] samples; - @ObfuscatedName("ar") + public int[] samples; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbi;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("ab") - int field189; - @ObfuscatedName("ag") + @ObfuscatedName("aj") + int field187; + @ObfuscatedName("an") @Export("timeMs") long timeMs; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("capacity") - int capacity; - @ObfuscatedName("ax") - int field194; - @ObfuscatedName("ah") - int field190; - @ObfuscatedName("as") - long field198; - @ObfuscatedName("ay") - int field195; - @ObfuscatedName("aj") - int field191; - @ObfuscatedName("av") - int field193; + public int capacity; + @ObfuscatedName("ai") + public int field195; + @ObfuscatedName("ae") + int field186; @ObfuscatedName("aw") - long field199; - @ObfuscatedName("ak") + long field194; + @ObfuscatedName("aq") + int field188; + @ObfuscatedName("az") + int field190; + @ObfuscatedName("at") + int field189; + @ObfuscatedName("af") + long field192; + @ObfuscatedName("ad") boolean field185; - @ObfuscatedName("bd") - int field196; - @ObfuscatedName("by") + @ObfuscatedName("bv") + int field191; + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "[Lbw;" + descriptor = "[Lbi;" ) - PcmStream[] field188; - @ObfuscatedName("bs") + PcmStream[] field183; + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "[Lbw;" + descriptor = "[Lbi;" ) - PcmStream[] field187; - - protected PcmPlayer() { - this.field189 = 32; - this.timeMs = GameEngine.clockNow(); - this.field198 = 0L; - this.field195 = 0; - this.field191 = 0; - this.field193 = 0; - this.field199 = 0L; + PcmStream[] field184; + + public PcmPlayer() { + this.field187 = 32; + this.timeMs = GrandExchangeOfferTotalQuantityComparator.method1971(); + this.field194 = 0L; + this.field188 = 0; + this.field190 = 0; + this.field189 = 0; + this.field192 = 0L; this.field185 = true; - this.field196 = 0; - this.field188 = new PcmStream[8]; - this.field187 = new PcmStream[8]; + this.field191 = 0; + this.field183 = new PcmStream[8]; + this.field184 = new PcmStream[8]; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1766369380" + garbageValue = "1058566109" ) @Export("init") - protected void init() throws Exception { + public void init() throws Exception { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-83" + garbageValue = "1" ) @Export("open") - protected void open(int var1) throws Exception { + public void open(int var1) throws Exception { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1982834691" + garbageValue = "-325041005" ) @Export("position") protected int position() throws Exception { return this.capacity; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("write") protected void write() throws Exception { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1874015336" + descriptor = "(S)V", + garbageValue = "3331" ) @Export("close") protected void close() { } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "54" + garbageValue = "0" ) @Export("discard") protected void discard() throws Exception { } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lbw;I)V", - garbageValue = "-828545471" + descriptor = "(Lbi;I)V", + garbageValue = "-1717479669" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-1281644299" ) @Export("run") public final synchronized void run() { if (this.samples != null) { - long var1 = GameEngine.clockNow(); + long var1 = GrandExchangeOfferTotalQuantityComparator.method1971(); try { - if (0L != this.field198) { - if (var1 < this.field198) { + if (this.field194 != 0L) { + if (var1 < this.field194) { return; } this.open(this.capacity); - this.field198 = 0L; + this.field194 = 0L; this.field185 = true; } int var3 = this.position(); - if (this.field193 - var3 > this.field195) { - this.field195 = this.field193 - var3; + if (this.field189 - var3 > this.field188) { + this.field188 = this.field189 - var3; } - int var4 = this.field190 + this.field194; + int var4 = this.field186 + this.field195; if (var4 + 256 > 16384) { var4 = 16128; } @@ -188,7 +180,7 @@ public final synchronized void run() { this.field185 = true; if (var4 + 256 > this.capacity) { var4 = this.capacity - 256; - this.field190 = var4 - this.field194; + this.field186 = var4 - this.field195; } } @@ -198,28 +190,28 @@ public final synchronized void run() { var3 += 256; } - if (var1 > this.field199) { + if (var1 > this.field192) { if (!this.field185) { - if (this.field195 == 0 && this.field191 == 0) { + if (this.field188 == 0 && this.field190 == 0) { this.close(); - this.field198 = var1 + 2000L; + this.field194 = var1 + 2000L; return; } - this.field190 = Math.min(this.field191, this.field195); - this.field191 = this.field195; + this.field186 = Math.min(this.field190, this.field188); + this.field190 = this.field188; } else { this.field185 = false; } - this.field195 = 0; - this.field199 = var1 + 2000L; + this.field188 = 0; + this.field192 = 2000L + var1; } - this.field193 = var3; + this.field189 = var3; } catch (Exception var7) { this.close(); - this.field198 = 2000L + var1; + this.field194 = var1 + 2000L; } try { @@ -227,9 +219,9 @@ public final synchronized void run() { var1 = this.timeMs; } - while (var1 > this.timeMs + 5000L) { + while (var1 > 5000L + this.timeMs) { this.skip(256); - this.timeMs += (long)(256000 / field181); + this.timeMs += (long)(256000 / field179); } } catch (Exception var6) { this.timeMs = var1; @@ -238,19 +230,19 @@ public final synchronized void run() { } } - @ObfuscatedName("aj") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1331437422" + garbageValue = "233937978" ) - public final void method200() { + public final void method209() { this.field185 = true; } - @ObfuscatedName("av") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "30" + descriptor = "(I)V", + garbageValue = "-1063946921" ) @Export("tryDiscard") public final synchronized void tryDiscard() { @@ -260,35 +252,35 @@ public final synchronized void tryDiscard() { this.discard(); } catch (Exception var2) { this.close(); - this.field198 = GameEngine.clockNow() + 2000L; + this.field194 = GrandExchangeOfferTotalQuantityComparator.method1971() + 2000L; } } - @ObfuscatedName("aw") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-35" + descriptor = "(I)V", + garbageValue = "-1490878758" ) @Export("shutdown") public final synchronized void shutdown() { - if (Canvas.soundSystem != null) { + if (UserComparator4.soundSystem != null) { boolean var1 = true; for (int var2 = 0; var2 < 2; ++var2) { - if (this == Canvas.soundSystem.players[var2]) { - Canvas.soundSystem.players[var2] = null; + if (this == UserComparator4.soundSystem.players[var2]) { + UserComparator4.soundSystem.players[var2] = null; } - if (Canvas.soundSystem.players[var2] != null) { + if (UserComparator4.soundSystem.players[var2] != null) { var1 = false; } } if (var1) { - soundSystemExecutor.shutdownNow(); - soundSystemExecutor = null; - Canvas.soundSystem = null; + class353.soundSystemExecutor.shutdownNow(); + class353.soundSystemExecutor = null; + UserComparator4.soundSystem = null; } } @@ -296,16 +288,16 @@ public final synchronized void shutdown() { this.samples = null; } - @ObfuscatedName("ak") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "9" + descriptor = "(II)V", + garbageValue = "-1697605758" ) @Export("skip") final void skip(int var1) { - this.field196 -= var1; - if (this.field196 < 0) { - this.field196 = 0; + this.field191 -= var1; + if (this.field191 < 0) { + this.field191 = 0; } if (this.stream != null) { @@ -314,20 +306,20 @@ final void skip(int var1) { } - @ObfuscatedName("bh") + @ObfuscatedName("bd") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; - if (PcmPlayer_stereo) { + if (class306.PcmPlayer_stereo) { var3 = var2 << 1; } - class409.clearIntArray(var1, 0, var3); - this.field196 -= var2; - if (this.stream != null && this.field196 <= 0) { - this.field196 += field181 >> 4; - class31.PcmStream_disable(this.stream); - this.method205(this.stream, this.stream.vmethod1019()); + class424.clearIntArray(var1, 0, var3); + this.field191 -= var2; + if (this.stream != null && this.field191 <= 0) { + this.field191 += field179 >> 4; + class193.PcmStream_disable(this.stream); + this.method214(this.stream, this.stream.vmethod1019()); int var4 = 0; int var5 = 255; @@ -349,7 +341,7 @@ final void fill(int[] var1, int var2) { if ((var9 & 1) != 0) { var5 &= ~(1 << var7); var10 = null; - PcmStream var11 = this.field188[var7]; + PcmStream var11 = this.field183[var7]; label99: while (true) { @@ -371,27 +363,27 @@ final void fill(int[] var1, int var2) { var12.position += var13; } - if (var4 >= this.field189) { + if (var4 >= this.field187) { break label105; } PcmStream var14 = var11.firstSubStream(); if (var14 != null) { - for (int var15 = var11.field249; var14 != null; var14 = var11.nextSubStream()) { - this.method205(var14, var15 * var14.vmethod1019() >> 8); + for (int var15 = var11.field247; var14 != null; var14 = var11.nextSubStream()) { + this.method214(var14, var15 * var14.vmethod1019() >> 8); } } PcmStream var16 = var11.after; var11.after = null; if (var10 == null) { - this.field188[var7] = var16; + this.field183[var7] = var16; } else { var10.after = var16; } if (var16 == null) { - this.field187[var7] = var10; + this.field184[var7] = var10; } var11 = var16; @@ -406,9 +398,9 @@ final void fill(int[] var1, int var2) { } for (var6 = 0; var6 < 8; ++var6) { - PcmStream var17 = this.field188[var6]; - PcmStream[] var18 = this.field188; - this.field187[var6] = null; + PcmStream var17 = this.field183[var6]; + PcmStream[] var18 = this.field183; + this.field184[var6] = null; for (var18[var6] = null; var17 != null; var17 = var10) { var10 = var17.after; @@ -417,701 +409,82 @@ final void fill(int[] var1, int var2) { } } - if (this.field196 < 0) { - this.field196 = 0; + if (this.field191 < 0) { + this.field191 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = GameEngine.clockNow(); + this.timeMs = GrandExchangeOfferTotalQuantityComparator.method1971(); } - @ObfuscatedName("bk") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(Lbw;II)V", - garbageValue = "1754087851" + descriptor = "(Lbi;IB)V", + garbageValue = "-119" ) - final void method205(PcmStream var1, int var2) { + final void method214(PcmStream var1, int var2) { int var3 = var2 >> 5; - PcmStream var4 = this.field187[var3]; + PcmStream var4 = this.field184[var3]; if (var4 == null) { - this.field188[var3] = var1; + this.field183[var3] = var1; } else { var4.after = var1; } - this.field187[var3] = var1; - var1.field249 = var2; + this.field184[var3] = var1; + var1.field247 = var2; } - @ObfuscatedName("ao") + @ObfuscatedName("ij") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "125" - ) - public static int method197(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 7 & 127L); - return var1; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2108015149" - ) - static void method212(int var0) { - if (var0 != Login.loginIndex) { - Login.loginIndex = var0; - } - } - - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "(Ldr;IIIIIB)V", - garbageValue = "1" + descriptor = "(B)V", + garbageValue = "13" ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCComposition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } - - if (var6 == null) { - return; - } - } - - int var75 = Players.Players_count; - int[] var7 = Players.Players_indices; - boolean var8 = var1 < var75; - int var9 = -2; - if (var0.overheadText != null && (!var8 || !var0.showPublicPlayerChat && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - SecureRandomFuture.method443(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextLimit < Client.overheadTextCount) { - Client.overheadTextXOffsets[Client.overheadTextLimit] = class59.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextLimit] = class59.fontBold12.ascent; - Client.overheadTextXs[Client.overheadTextLimit] = Client.viewportTempX; - Client.overheadTextYs[Client.overheadTextLimit] = Client.viewportTempY - var9; - Client.overheadTextColors[Client.overheadTextLimit] = var0.field995; - Client.overheadTextEffects[Client.overheadTextLimit] = var0.field996; - Client.overheadTextCyclesRemaining[Client.overheadTextLimit] = var0.overheadTextCyclesRemaining; - Client.field594[Client.overheadTextLimit] = var0.field1028; - Client.field603[Client.overheadTextLimit] = var0.overheadText; - ++Client.overheadTextLimit; - var9 += 12; - } - } - - int var15; - int var22; - int var23; - if (!var0.healthBars.method2008()) { - SecureRandomFuture.method443(var0, var0.defaultHeight + 15); - - for (HealthBar var10 = (HealthBar)var0.healthBars.last(); var10 != null; var10 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var11 = var10.get(Client.cycle); - if (var11 == null) { - if (var10.isEmpty()) { - var10.remove(); - } - } else { - HealthBarDefinition var12 = var10.definition; - SpritePixels var13 = var12.getBackSprite(); - SpritePixels var14 = var12.getFrontSprite(); - int var16 = 0; - if (var13 != null && var14 != null) { - if (var12.widthPadding * 2 < var14.subWidth) { - var16 = var12.widthPadding; - } - - var15 = var14.subWidth - var16 * 2; - } else { - var15 = var12.width; - } - - int var17 = 255; - boolean var18 = true; - int var19 = Client.cycle - var11.cycle; - int var20 = var15 * var11.health2 / var12.width; - int var21; - int var97; - if (var11.cycleOffset > var19) { - var21 = var12.field1556 == 0 ? 0 : var12.field1556 * (var19 / var12.field1556); - var22 = var15 * var11.health / var12.width; - var97 = var21 * (var20 - var22) / var11.cycleOffset + var22; - } else { - var97 = var20; - var21 = var11.cycleOffset + var12.int5 - var19; - if (var12.int3 >= 0) { - var17 = (var21 << 8) / (var12.int5 - var12.int3); - } - } - - if (var11.health2 > 0 && var97 < 1) { - var97 = 1; - } - - if (var13 != null && var14 != null) { - if (var15 == var97) { - var97 += var16 * 2; - } else { - var97 += var16; - } - - var21 = var13.subHeight; - var9 += var21; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var9; - var22 -= var16; - if (var17 >= 0 && var17 < 255) { - var13.drawTransAt(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var23 + var21); - var14.drawTransAt(var22, var23, var17); - } else { - var13.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var21 + var23); - var14.drawTransBgAt(var22, var23); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var9 += 2; - } else { - var9 += 5; - if (Client.viewportTempX > -1) { - var21 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var9; - Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var97, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var97 + var21, var22, var15 - var97, 5, 16711680); - } - - var9 += 2; - } - } - } - } - - if (var9 == -2) { - var9 += 7; - } - - Player var90; - if (var8 && var0.playerCycle == Client.cycle && Occluder.method1299((Player)var0)) { - var90 = (Player)var0; - if (var8) { - SecureRandomFuture.method443(var0, var0.defaultHeight + 15); - AbstractFont var91 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - var9 += 4; - var91.drawCentered(var90.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var9, 16777215, 0); - var9 += 18; - } - } - - if (var8) { - var90 = (Player)var0; - if (var90.isHidden) { - return; - } - - if (var90.headIconPk != -1 || var90.headIconPrayer != -1) { - SecureRandomFuture.method443(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var90.headIconPk != -1) { - var9 += 25; - class178.headIconPkSprites[var90.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); - } - - if (var90.headIconPrayer != -1) { - var9 += 25; - class502.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - SecureRandomFuture.method443(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var9 += ArchiveLoader.headIconHintSprites[1].subHeight; - ArchiveLoader.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); - } - } + static final void method221() { + int var0; + int var1; + int var2; + if (!Client.field402) { + var0 = class191.cameraMoveToX * 128 + 64; + var1 = MouseHandler.cameraMoveToY * 128 + 64; + var2 = class115.getTileHeight(var0, var1, class87.Client_plane) - SoundSystem.cameraMoveToHeight; + WorldMapSectionType.method1555(var0, var2, var1); + } else if (Client.field646 != null) { + Client.cameraX = Client.field646.vmethod2349(); + WorldMapArea.cameraZ = Client.field646.vmethod2347(); + if (Client.field403) { + class17.cameraY = Client.field646.vmethod2320(); } else { - NPC var92 = (NPC)var0; - int[] var93 = var92.method587(); - short[] var94 = var92.method588(); - if (var94 != null && var93 != null) { - for (int var76 = 0; var76 < var94.length; ++var76) { - if (var94[var76] >= 0 && var93[var76] >= 0) { - long var77 = (long)var93[var76] << 8 | (long)var94[var76]; - SpritePixels var79 = (SpritePixels)Client.archive5.method2180(var77); - if (var79 == null) { - SpritePixels[] var80 = WorldMapArchiveLoader.method2379(archive8, var93[var76], 0); - if (var80 != null && var94[var76] < var80.length) { - var79 = var80[var94[var76]]; - Client.archive5.method2181(var77, var79); - } - } - - if (var79 != null) { - SecureRandomFuture.method443(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var79.drawTransBgAt(var2 + Client.viewportTempX - (var79.subWidth >> 1), Client.viewportTempY + (var3 - var79.subHeight) - 4); - } - } - } - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - SecureRandomFuture.method443(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - ArchiveLoader.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - for (int var81 = 0; var81 < 4; ++var81) { - int var82 = var0.hitSplatCycles[var81]; - int var83 = var0.hitSplatTypes[var81]; - HitSplatDefinition var95 = null; - int var84 = 0; - if (var83 >= 0) { - if (var82 <= Client.cycle) { - continue; - } - - var95 = WorldMapCacheName.method1564(var0.hitSplatTypes[var81]); - var84 = var95.field1706; - if (var95 != null && var95.transforms != null) { - var95 = var95.transform(); - if (var95 == null) { - var0.hitSplatCycles[var81] = -1; - continue; - } - } - } else if (var82 < 0) { - continue; - } - - var15 = var0.hitSplatTypes2[var81]; - HitSplatDefinition var99 = null; - if (var15 >= 0) { - var99 = WorldMapCacheName.method1564(var15); - if (var99 != null && var99.transforms != null) { - var99 = var99.transform(); - } - } - - if (var82 - var84 <= Client.cycle) { - if (var95 == null) { - var0.hitSplatCycles[var81] = -1; - } else { - SecureRandomFuture.method443(var0, var0.defaultHeight / 2); - if (Client.viewportTempX > -1) { - boolean var96 = true; - if (var81 == 1) { - Client.viewportTempY -= 20; - } - - if (var81 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var81 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - SpritePixels var85 = null; - SpritePixels var86 = null; - SpritePixels var87 = null; - SpritePixels var88 = null; - var22 = 0; - var23 = 0; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - int var28 = 0; - int var29 = 0; - SpritePixels var30 = null; - SpritePixels var31 = null; - SpritePixels var32 = null; - SpritePixels var33 = null; - int var34 = 0; - int var35 = 0; - int var36 = 0; - int var37 = 0; - int var38 = 0; - int var39 = 0; - int var40 = 0; - int var41 = 0; - int var42 = 0; - var85 = var95.method1032(); - int var43; - if (var85 != null) { - var22 = var85.subWidth; - var43 = var85.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var85.xOffset; - } - - var86 = var95.method1033(); - if (var86 != null) { - var23 = var86.subWidth; - var43 = var86.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var86.xOffset; - } - - var87 = var95.method1034(); - if (var87 != null) { - var24 = var87.subWidth; - var43 = var87.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var87.xOffset; - } - - var88 = var95.method1035(); - if (var88 != null) { - var25 = var88.subWidth; - var43 = var88.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var88.xOffset; - } - - if (var99 != null) { - var30 = var99.method1032(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var99.method1033(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var99.method1034(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var40 = var32.xOffset; - } - - var33 = var99.method1035(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var89 = var95.getFont(); - if (var89 == null) { - var89 = HealthBarUpdate.fontPlain11; - } - - Font var44; - if (var99 != null) { - var44 = var99.getFont(); - if (var44 == null) { - var44 = HealthBarUpdate.fontPlain11; - } - } else { - var44 = HealthBarUpdate.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var95.getString(var0.hitSplatValues[var81]); - int var98 = var89.stringWidth(var45); - if (var99 != null) { - var46 = var99.getString(var0.hitSplatValues2[var81]); - var48 = var44.stringWidth(var46); - } - - int var49 = 0; - int var50 = 0; - if (var23 > 0) { - if (var87 == null && var88 == null) { - var49 = 1; - } else { - var49 = var98 / var23 + 1; - } - } - - if (var99 != null && var35 > 0) { - if (var32 == null && var33 == null) { - var50 = 1; - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; - int var52 = var51; - if (var22 > 0) { - var51 += var22; - } - - var51 += 2; - int var53 = var51; - if (var24 > 0) { - var51 += var24; - } - - int var54 = var51; - int var55 = var51; - int var56; - if (var23 > 0) { - var56 = var23 * var49; - var51 += var56; - var55 += (var56 - var98) / 2; - } else { - var51 += var98; - } - - var56 = var51; - if (var25 > 0) { - var51 += var25; - } - - int var57 = 0; - int var58 = 0; - int var59 = 0; - int var60 = 0; - int var61 = 0; - int var62; - if (var99 != null) { - var51 += 2; - var57 = var51; - if (var34 > 0) { - var51 += var34; - } - - var51 += 2; - var58 = var51; - if (var36 > 0) { - var51 += var36; - } - - var59 = var51; - var61 = var51; - if (var35 > 0) { - var62 = var50 * var35; - var51 += var62; - var61 += (var62 - var48) / 2; - } else { - var51 += var48; - } - - var60 = var51; - if (var37 > 0) { - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var81] - Client.cycle; - int var63 = var95.field1709 - var62 * var95.field1709 / var95.field1706; - int var64 = var62 * var95.field1703 / var95.field1706 + -var95.field1703; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var3 + Client.viewportTempY - 12 + var64; - int var67 = var66; - int var68 = var42 + var66; - int var69 = var66 + var95.field1708 + 15; - int var70 = var69 - var89.maxAscent; - int var71 = var69 + var89.maxDescent; - if (var70 < var66) { - var67 = var70; - } - - if (var71 > var68) { - var68 = var71; - } - - int var72 = 0; - int var73; - int var74; - if (var99 != null) { - var72 = var66 + var99.field1708 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } - - if (var74 > var68) { - ; - } - } - - var73 = 255; - if (var95.field1707 >= 0) { - var73 = (var62 << 8) / (var95.field1706 - var95.field1707); - } - - if (var73 >= 0 && var73 < 255) { - if (var85 != null) { - var85.drawTransAt(var65 + var52 - var26, var66, var73); - } - - if (var87 != null) { - var87.drawTransAt(var65 + var53 - var28, var66, var73); - } - - if (var86 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var86.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); - } - } - - if (var88 != null) { - var88.drawTransAt(var65 + var56 - var29, var66, var73); - } - - var89.drawAlpha(var45, var65 + var55, var69, var95.textColor, 0, var73); - if (var99 != null) { - if (var30 != null) { - var30.drawTransAt(var57 + var65 - var38, var66, var73); - } - - if (var32 != null) { - var32.drawTransAt(var58 + var65 - var40, var66, var73); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); - } - } - - if (var33 != null) { - var33.drawTransAt(var65 + var60 - var41, var66, var73); - } - - var44.drawAlpha(var46, var61 + var65, var72, var99.textColor, 0, var73); - } - } else { - if (var85 != null) { - var85.drawTransBgAt(var65 + var52 - var26, var66); - } - - if (var87 != null) { - var87.drawTransBgAt(var65 + var53 - var28, var66); - } - - if (var86 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var86.drawTransBgAt(var23 * var74 + (var65 + var54 - var27), var66); - } - } - - if (var88 != null) { - var88.drawTransBgAt(var56 + var65 - var29, var66); - } - - var89.draw(var45, var65 + var55, var69, var95.textColor | -16777216, 0); - if (var99 != null) { - if (var30 != null) { - var30.drawTransBgAt(var57 + var65 - var38, var66); - } - - if (var32 != null) { - var32.drawTransBgAt(var58 + var65 - var40, var66); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); - } - } - - if (var33 != null) { - var33.drawTransBgAt(var65 + var60 - var41, var66); - } - - var44.draw(var46, var65 + var61, var72, var99.textColor | -16777216, 0); - } - } - } - } - } + class17.cameraY = class115.getTileHeight(Client.cameraX, WorldMapArea.cameraZ, class87.Client_plane) - Client.field646.vmethod2320(); } + Client.field646.method2413(); } - } - - @ObfuscatedName("md") - @ObfuscatedSignature( - descriptor = "([Lmi;IIIZI)V", - garbageValue = "-166664235" - ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { - Widget var6 = var0[var5]; - if (var6 != null && var6.parentId == var1) { - class369.alignWidgetSize(var6, var2, var3, var4); - WorldMapArea.alignWidgetPosition(var6, var2, var3); - if (var6.scrollX > var6.scrollWidth - var6.width) { - var6.scrollX = var6.scrollWidth - var6.width; - } - if (var6.scrollX < 0) { - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { - var6.scrollY = 0; - } + if (!Client.field401) { + var0 = class148.cameraLookAtX * 128 + 64; + var1 = BufferedNetSocket.cameraLookAtY * 128 + 64; + var2 = class115.getTileHeight(var0, var1, class87.Client_plane) - class161.cameraLookAtHeight; + int var3 = var0 - Client.cameraX; + int var4 = var2 - class17.cameraY; + int var5 = var1 - WorldMapArea.cameraZ; + int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); + int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; + int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; + Projectile.method438(var7, var8); + } else { + if (Client.field642 != null) { + class365.cameraPitch = Client.field642.method2409(); + class365.cameraPitch = Math.min(Math.max(class365.cameraPitch, 128), 383); + Client.field642.method2413(); + } - if (var6.type == 0) { - Login.revalidateWidgetScroll(var0, var6, var4); - } + if (Client.field643 != null) { + WallDecoration.cameraYaw = Client.field643.method2409() & 2047; + Client.field643.method2413(); } } diff --git a/osrs/src/main/java/PcmStream.java b/osrs/src/main/java/PcmStream.java index 39ade77d6..25d9d1eb9 100644 --- a/osrs/src/main/java/PcmStream.java +++ b/osrs/src/main/java/PcmStream.java @@ -3,24 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bi") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbi;" ) @Export("after") PcmStream after; - @ObfuscatedName("ag") - int field249; - @ObfuscatedName("am") + @ObfuscatedName("an") + int field247; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lcp;" + descriptor = "Lcb;" ) @Export("sound") AbstractSound sound; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("active") volatile boolean active; @@ -28,39 +28,39 @@ protected PcmStream() { this.active = true; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "()Lbw;" + descriptor = "()Lbi;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "()Lbw;" + descriptor = "()Lbi;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("vmethod5648") protected abstract int vmethod5648(); - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("br") + @ObfuscatedName("bs") @Export("vmethod1019") int vmethod1019() { return 255; } - @ObfuscatedName("fq") + @ObfuscatedName("gm") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { diff --git a/osrs/src/main/java/PcmStreamMixer.java b/osrs/src/main/java/PcmStreamMixer.java index 392119a22..4fc138a9a 100644 --- a/osrs/src/main/java/PcmStreamMixer.java +++ b/osrs/src/main/java/PcmStreamMixer.java @@ -3,153 +3,153 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bl") +@ObfuscatedName("bm") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) NodeDeque field161; - @ObfuscatedName("ao") + @ObfuscatedName("ak") + int field158; + @ObfuscatedName("ax") int field159; - @ObfuscatedName("at") - int field160; public PcmStreamMixer() { this.subStreams = new NodeDeque(); this.field161 = new NodeDeque(); - this.field159 = 0; - this.field160 = -1; + this.field158 = 0; + this.field159 = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lbw;)V" + descriptor = "(Lbi;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lbw;)V" + descriptor = "(Lbi;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); } - @ObfuscatedName("ao") - void method177() { - if (this.field159 > 0) { + @ObfuscatedName("ak") + void method187() { + if (this.field158 > 0) { for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field161.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field161.previous()) { - var1.field294 -= this.field159; + var1.field293 -= this.field158; } - this.field160 -= this.field159; - this.field159 = 0; + this.field159 -= this.field158; + this.field158 = 0; } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lsj;Lcs;)V" + descriptor = "(Lsj;Lcc;)V" ) - void method178(Node var1, PcmStreamMixerListener var2) { - while (this.field161.sentinel != var1 && ((PcmStreamMixerListener)var1).field294 <= var2.field294) { + void method188(Node var1, PcmStreamMixerListener var2) { + while (this.field161.sentinel != var1 && ((PcmStreamMixerListener)var1).field293 <= var2.field293) { var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); - this.field160 = ((PcmStreamMixerListener)this.field161.sentinel.previous).field294; + this.field159 = ((PcmStreamMixerListener)this.field161.sentinel.previous).field293; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lcs;)V" + descriptor = "(Lcc;)V" ) - void method179(PcmStreamMixerListener var1) { + void method189(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); Node var2 = this.field161.sentinel.previous; if (var2 == this.field161.sentinel) { - this.field160 = -1; + this.field159 = -1; } else { - this.field160 = ((PcmStreamMixerListener)var2).field294; + this.field159 = ((PcmStreamMixerListener)var2).field293; } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "()Lbw;" + descriptor = "()Lbi;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "()Lbw;" + descriptor = "()Lbi;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("vmethod5648") protected int vmethod5648() { return 0; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field160 < 0) { + if (this.field159 < 0) { this.updateSubStreams(var1, var2, var3); return; } - if (var3 + this.field159 < this.field160) { - this.field159 += var3; + if (var3 + this.field158 < this.field159) { + this.field158 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.field160 - this.field159; + int var4 = this.field159 - this.field158; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; - this.field159 += var4; - this.method177(); + this.field158 += var4; + this.method187(); PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field161.last(); synchronized(var5) { int var7 = var5.update(); if (var7 < 0) { - var5.field294 = 0; - this.method179(var5); + var5.field293 = 0; + this.method189(var5); } else { - var5.field294 = var7; - this.method178(var5.previous, var5); + var5.field293 = var7; + this.method188(var5.previous, var5); } } } while(var3 != 0); } - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { @@ -158,42 +158,42 @@ void updateSubStreams(int[] var1, int var2, int var3) { } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field160 < 0) { + if (this.field159 < 0) { this.skipSubStreams(var1); return; } - if (this.field159 + var1 < this.field160) { - this.field159 += var1; + if (this.field158 + var1 < this.field159) { + this.field158 += var1; this.skipSubStreams(var1); return; } - int var2 = this.field160 - this.field159; + int var2 = this.field159 - this.field158; this.skipSubStreams(var2); var1 -= var2; - this.field159 += var2; - this.method177(); + this.field158 += var2; + this.method187(); PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field161.last(); synchronized(var3) { int var5 = var3.update(); if (var5 < 0) { - var3.field294 = 0; - this.method179(var3); + var3.field293 = 0; + this.method189(var3); } else { - var3.field294 = var5; - this.method178(var3.previous, var3); + var3.field293 = var5; + this.method188(var3.previous, var3); } } } while(var1 != 0); } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { diff --git a/osrs/src/main/java/PcmStreamMixerListener.java b/osrs/src/main/java/PcmStreamMixerListener.java index ef6604295..7982c2be8 100644 --- a/osrs/src/main/java/PcmStreamMixerListener.java +++ b/osrs/src/main/java/PcmStreamMixerListener.java @@ -3,19 +3,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("cc") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("au") - int field294; + @ObfuscatedName("ac") + int field293; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("remove2") abstract void remove2(); - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lbl;)I" + descriptor = "(Lbm;)I" ) @Export("update") abstract int update(); diff --git a/osrs/src/main/java/PendingSpawn.java b/osrs/src/main/java/PendingSpawn.java index 49550de63..377a4d2d1 100644 --- a/osrs/src/main/java/PendingSpawn.java +++ b/osrs/src/main/java/PendingSpawn.java @@ -3,123 +3,114 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.net.MalformedURLException; -import java.net.URL; - -@ObfuscatedName("dv") +@ObfuscatedName("dw") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("ub") - @Export("cameraLookAtX") - static int cameraLookAtX; - @ObfuscatedName("au") + @ObfuscatedName("dz") + @ObfuscatedSignature( + descriptor = "[Lun;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("ac") @Export("plane") int plane; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("type") int type; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("x") int x; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("y") int y; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("objectId") int objectId; - @ObfuscatedName("ai") - int field948; - @ObfuscatedName("az") - int field956; - @ObfuscatedName("ap") + @ObfuscatedName("ah") + int field947; + @ObfuscatedName("ar") + int field953; + @ObfuscatedName("ab") @Export("id") int id; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("rotation") int rotation; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("objectType") int objectType; - @ObfuscatedName("ad") - int field945; - @ObfuscatedName("al") - int field949; - @ObfuscatedName("an") + @ObfuscatedName("ag") + int field946; + @ObfuscatedName("ap") + int field952; + @ObfuscatedName("ay") @Export("startCycle") int startCycle; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("endCycle") int endCycle; PendingSpawn() { - this.field949 = 31; + this.field952 = 31; this.startCycle = 0; this.endCycle = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-390756021" + garbageValue = "1554580645" ) void method506(int var1) { - this.field949 = var1; + this.field952 = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1725061454" + garbageValue = "585710320" ) boolean method507(int var1) { if (var1 >= 0 && var1 <= 4) { - return (this.field949 & 1 << var1) != 0; + return (this.field952 & 1 << var1) != 0; } else { return true; } } - @ObfuscatedName("au") - public static final void method505(long var0) { - if (var0 > 0L) { - if (0L == var0 % 10L) { - WorldMapData_0.method1390(var0 - 1L); - WorldMapData_0.method1390(1L); - } else { - WorldMapData_0.method1390(var0); - } - - } + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-121" + ) + static final void method508(String var0) { + class436.method2211(var0 + " is already on your friend list"); } - @ObfuscatedName("ae") + @ObfuscatedName("lq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "1525376195" + descriptor = "([Lnm;Lnm;ZB)V", + garbageValue = "-37" ) - static boolean method508(String var0) { - if (var0 == null) { - return false; - } else { - try { - new URL(var0); - return true; - } catch (MalformedURLException var2) { - return false; + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -935068743 * -231105911 : var1.width * -2052421073 * -1523778353; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -356890711 * -111326055 : var1.height * -2112445931 * -503112387; + class360.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { + class360.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); + if (var5 != null) { + int var6 = var5.group; + if (class33.field89.method1742(var6)) { + class360.resizeInterface(class33.field89.Widget_interfaceComponents[var6], -1, var3, var4, var2); } } - } - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1915855915" - ) - static final void method509(boolean var0) { - if (var0) { - Client.field421 = Login.field743 ? class139.field1319 : class139.field1321; - } else { - Client.field421 = class449.clientPreferences.method568(Login.Login_username) ? class139.field1322 : class139.field1320; + if (var1.contentType == 1337) { } } diff --git a/osrs/src/main/java/PlatformInfo.java b/osrs/src/main/java/PlatformInfo.java index b66e8f1cf..c42034506 100644 --- a/osrs/src/main/java/PlatformInfo.java +++ b/osrs/src/main/java/PlatformInfo.java @@ -3,162 +3,162 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sm") +@ObfuscatedName("sx") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("by") - int field3943; - @ObfuscatedName("bs") - boolean field3930; - @ObfuscatedName("bm") - int field3937; - @ObfuscatedName("bf") - int field3934; - @ObfuscatedName("bq") - int field3939; @ObfuscatedName("ba") - int field3931; - @ObfuscatedName("bl") - int field3936; - @ObfuscatedName("bp") - boolean field3929; - @ObfuscatedName("bu") - int field3941; + int field3962; + @ObfuscatedName("bz") + boolean field3961; + @ObfuscatedName("bb") + int field3963; @ObfuscatedName("bo") - int field3938; + int field3969; + @ObfuscatedName("bp") + int field3970; + @ObfuscatedName("bt") + int field3973; + @ObfuscatedName("bm") + int field3968; @ObfuscatedName("br") - int field3940; - @ObfuscatedName("be") - int field3933; - @ObfuscatedName("bi") - String field3947; - @ObfuscatedName("bz") - String field3950; - @ObfuscatedName("bx") - String field3949; - @ObfuscatedName("bn") - String field3948; - @ObfuscatedName("bw") - int field3942; + boolean field3960; + @ObfuscatedName("bs") + int field3972; @ObfuscatedName("bc") - int field3932; + int field3964; + @ObfuscatedName("bf") + int field3965; + @ObfuscatedName("bh") + int field3966; + @ObfuscatedName("bl") + String field3980; @ObfuscatedName("bg") - int field3935; + String field3978; + @ObfuscatedName("bj") + String field3979; + @ObfuscatedName("bx") + String field3981; + @ObfuscatedName("bi") + int field3967; + @ObfuscatedName("bq") + int field3971; + @ObfuscatedName("bw") + int field3974; + @ObfuscatedName("ce") + int field3976; + @ObfuscatedName("cu") + String field3984; @ObfuscatedName("cw") - int field3945; - @ObfuscatedName("cf") - String field3951; - @ObfuscatedName("cm") - String field3952; - @ObfuscatedName("cn") - int[] field3946; - @ObfuscatedName("cs") - int field3944; - @ObfuscatedName("cx") - String field3954; - @ObfuscatedName("cr") - String field3953; + String field3985; + @ObfuscatedName("co") + int[] field3977; + @ObfuscatedName("cc") + int field3975; + @ObfuscatedName("cg") + String field3982; + @ObfuscatedName("cq") + String field3983; PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25, String var26) { - this.field3946 = new int[3]; - this.field3943 = var1; - this.field3930 = var2; - this.field3937 = var3; - this.field3934 = var4; - this.field3939 = var5; - this.field3931 = var6; - this.field3936 = var7; - this.field3929 = var8; - this.field3941 = var9; - this.field3938 = var10; - this.field3940 = var11; - this.field3933 = var12; - this.field3947 = var13; - this.field3950 = var14; - this.field3949 = var15; - this.field3948 = var16; - this.field3942 = var17; - this.field3932 = var18; - this.field3935 = var19; - this.field3945 = var20; - this.field3951 = var21; - this.field3952 = var22; - this.field3946 = var23; - this.field3944 = var24; - this.field3954 = var25; - this.field3953 = var26; + this.field3977 = new int[3]; + this.field3962 = var1; + this.field3961 = var2; + this.field3963 = var3; + this.field3969 = var4; + this.field3970 = var5; + this.field3973 = var6; + this.field3968 = var7; + this.field3960 = var8; + this.field3972 = var9; + this.field3964 = var10; + this.field3965 = var11; + this.field3966 = var12; + this.field3980 = var13; + this.field3978 = var14; + this.field3979 = var15; + this.field3981 = var16; + this.field3967 = var17; + this.field3971 = var18; + this.field3974 = var19; + this.field3976 = var20; + this.field3984 = var21; + this.field3985 = var22; + this.field3977 = var23; + this.field3975 = var24; + this.field3982 = var25; + this.field3983 = var26; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "77" + descriptor = "(Lul;I)V", + garbageValue = "1684641716" ) @Export("write") public void write(Buffer var1) { var1.writeByte(9); - var1.writeByte(this.field3943); - var1.writeByte(this.field3930 ? 1 : 0); - var1.writeShort(this.field3937); - var1.writeByte(this.field3934); - var1.writeByte(this.field3939); - var1.writeByte(this.field3931); - var1.writeByte(this.field3936); - var1.writeByte(this.field3929 ? 1 : 0); - var1.writeShort(this.field3941); - var1.writeByte(this.field3938); - var1.writeMedium(this.field3940); - var1.writeShort(this.field3933); - var1.writeStringCp1252NullCircumfixed(this.field3947); - var1.writeStringCp1252NullCircumfixed(this.field3950); - var1.writeStringCp1252NullCircumfixed(this.field3949); - var1.writeStringCp1252NullCircumfixed(this.field3948); - var1.writeByte(this.field3932); - var1.writeShort(this.field3942); - var1.writeStringCp1252NullCircumfixed(this.field3951); - var1.writeStringCp1252NullCircumfixed(this.field3952); - var1.writeByte(this.field3935); - var1.writeByte(this.field3945); + var1.writeByte(this.field3962); + var1.writeByte(this.field3961 ? 1 : 0); + var1.writeShort(this.field3963); + var1.writeByte(this.field3969); + var1.writeByte(this.field3970); + var1.writeByte(this.field3973); + var1.writeByte(this.field3968); + var1.writeByte(this.field3960 ? 1 : 0); + var1.writeShort(this.field3972); + var1.writeByte(this.field3964); + var1.writeMedium(this.field3965); + var1.writeShort(this.field3966); + var1.writeStringCp1252NullCircumfixed(this.field3980); + var1.writeStringCp1252NullCircumfixed(this.field3978); + var1.writeStringCp1252NullCircumfixed(this.field3979); + var1.writeStringCp1252NullCircumfixed(this.field3981); + var1.writeByte(this.field3971); + var1.writeShort(this.field3967); + var1.writeStringCp1252NullCircumfixed(this.field3984); + var1.writeStringCp1252NullCircumfixed(this.field3985); + var1.writeByte(this.field3974); + var1.writeByte(this.field3976); - for (int var2 = 0; var2 < this.field3946.length; ++var2) { - var1.writeInt(this.field3946[var2]); + for (int var2 = 0; var2 < this.field3977.length; ++var2) { + var1.writeInt(this.field3977[var2]); } - var1.writeInt(this.field3944); - var1.writeStringCp1252NullCircumfixed(this.field3954); - var1.writeStringCp1252NullCircumfixed(this.field3953); + var1.writeInt(this.field3975); + var1.writeStringCp1252NullCircumfixed(this.field3982); + var1.writeStringCp1252NullCircumfixed(this.field3983); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1863641013" + garbageValue = "725870581" ) @Export("size") public int size() { byte var1 = 39; - String var4 = this.field3947; + String var4 = this.field3980; int var3 = var4.length() + 2; - int var26 = var3 + var1; - String var7 = this.field3950; + int var26 = var1 + var3; + String var7 = this.field3978; int var6 = var7.length() + 2; var26 += var6; - String var10 = this.field3949; + String var10 = this.field3979; int var9 = var10.length() + 2; var26 += var9; - String var13 = this.field3948; + String var13 = this.field3981; int var12 = var13.length() + 2; var26 += var12; - String var16 = this.field3951; + String var16 = this.field3984; int var15 = var16.length() + 2; var26 += var15; - String var19 = this.field3952; + String var19 = this.field3985; int var18 = var19.length() + 2; var26 += var18; - String var22 = this.field3954; + String var22 = this.field3982; int var21 = var22.length() + 2; var26 += var21; - String var25 = this.field3953; + String var25 = this.field3983; int var24 = var25.length() + 2; var26 += var24; return var26; diff --git a/osrs/src/main/java/Player.java b/osrs/src/main/java/Player.java index f4ce32849..b4e17f3ae 100644 --- a/osrs/src/main/java/Player.java +++ b/osrs/src/main/java/Player.java @@ -3,116 +3,110 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("df") +@ObfuscatedName("dj") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("fy") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnk;" - ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Luc;" + descriptor = "Lvf;" ) @Export("username") Username username; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lni;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("headIconPk") int headIconPk; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("actions") String[] actions; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("combatLevel") int combatLevel; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("skillLevel") int skillLevel; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("tileHeight") int tileHeight; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("aq") - int field909; - @ObfuscatedName("al") + @ObfuscatedName("aa") + int field900; + @ObfuscatedName("ap") @Export("baseTileHeight") int baseTileHeight; - @ObfuscatedName("ar") - int field910; - @ObfuscatedName("ab") + @ObfuscatedName("ay") + int field916; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Ljn;" ) @Export("attachedModel") Model attachedModel; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("minX") int minX; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("minY") int minY; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("maxX") int maxX; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("maxY") int maxY; - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("team") int team; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("isHidden") boolean isHidden; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("plane") int plane; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("index") int index; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lra;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("bh") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lra;" ) @Export("isInFriendsChat") TriBool isInFriendsChat; - @ObfuscatedName("bj") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lra;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("hasMovementPending") boolean hasMovementPending; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("tileX") int tileX; - @ObfuscatedName("bt") + @ObfuscatedName("be") @Export("tileY") int tileY; @@ -138,10 +132,10 @@ public final class Player extends Actor { this.hasMovementPending = false; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "-1203582421" + descriptor = "(Lul;B)V", + garbageValue = "16" ) @Export("read") final void read(Buffer var1) { @@ -170,7 +164,7 @@ final void read(Buffer var1) { } if (var5[var6] >= 512) { - var9 = InvDefinition.ItemDefinition_get(var5[var6] - 512).team; + var9 = class214.ItemDefinition_get(var5[var6] - 512).team; if (var9 != 0) { this.team = var9; } @@ -197,7 +191,7 @@ final void read(Buffer var1) { for (var8 = 0; var8 < 5; ++var8) { var9 = var1.readUnsignedByte(); - if (var9 < 0 || var9 >= class140.field1328[var8].length) { + if (var9 < 0 || var9 >= class104.field1093[var8].length) { var9 = 0; } @@ -240,12 +234,12 @@ final void read(Buffer var1) { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), Language.loginType); + this.username = new Username(var1.readStringCp1252NullTerminated(), class166.loginType); this.clearIsFriend(); this.clearIsInFriendsChat(); this.clearIsInClanChat(); - if (this == VarbitComposition.localPlayer) { - RunException.field4289 = this.username.getName(); + if (this == TextureProvider.localPlayer) { + RunException.field4314 = this.username.getName(); } this.combatLevel = var1.readUnsignedByte(); @@ -320,21 +314,21 @@ final void read(Buffer var1) { this.appearance = new PlayerComposition(); } - this.appearance.method1717(var26, var5, var28, var30, var27, var2, var4, var29); + this.appearance.method1749(var26, var5, var28, var30, var27, var2, var4, var29); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljr;", - garbageValue = "798227647" + descriptor = "(B)Ljn;", + garbageValue = "0" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? EnumComposition.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : EnumComposition.SequenceDefinition_get(super.movementSequence); + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class36.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : class36.SequenceDefinition_get(super.movementSequence); Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -353,7 +347,7 @@ protected final Model getModel() { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { Model var5 = this.attachedModel; - var5.offsetBy(this.field909 - super.x, this.baseTileHeight - this.tileHeight, this.field910 - super.y); + var5.offsetBy(this.field900 - super.x, this.baseTileHeight - this.tileHeight, this.field916 - super.y); if (super.orientation == 512) { var5.rotateY90Ccw(); var5.rotateY90Ccw(); @@ -378,7 +372,7 @@ protected final Model getModel() { var5.rotateY90Ccw(); } - var5.offsetBy(super.x - this.field909, this.tileHeight - this.baseTileHeight, super.y - this.field910); + var5.offsetBy(super.x - this.field900, this.tileHeight - this.baseTileHeight, super.y - this.field916); } } @@ -388,7 +382,7 @@ protected final Model getModel() { var3.overrideSaturation = super.recolourSaturation; var3.overrideLuminance = super.recolourLuminance; var3.overrideAmount = super.recolourAmount; - var3.field2243 = (short)var4; + var3.field2255 = (short)var4; } else { var3.overrideAmount = 0; } @@ -398,10 +392,10 @@ protected final Model getModel() { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-458663829" + garbageValue = "-1468374152" ) @Export("isFriend") boolean isFriend() { @@ -412,33 +406,32 @@ boolean isFriend() { return this.isFriendTriBool == TriBool.TriBool_true; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1612741711" + descriptor = "(B)V", + garbageValue = "-7" ) @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; } - @ObfuscatedName("az") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1885104280" + descriptor = "(S)V", + garbageValue = "-16283" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = class299.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriendTriBool = InvDefinition.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ap") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-563231680" + descriptor = "(B)Z", + garbageValue = "1" ) - @Export("isFriendsChatMember") - boolean isFriendsChatMember() { + boolean method493() { if (this.isInFriendsChat == TriBool.TriBool_unknown) { this.updateIsInFriendsChat(); } @@ -446,35 +439,35 @@ boolean isFriendsChatMember() { return this.isInFriendsChat == TriBool.TriBool_true; } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2081555377" + descriptor = "(B)V", + garbageValue = "58" ) @Export("clearIsInFriendsChat") void clearIsInFriendsChat() { this.isInFriendsChat = TriBool.TriBool_unknown; } - @ObfuscatedName("af") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-690843287" + descriptor = "(S)V", + garbageValue = "180" ) @Export("updateIsInFriendsChat") void updateIsInFriendsChat() { - this.isInFriendsChat = ReflectionCheck.friendsChat != null && ReflectionCheck.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isInFriendsChat = class358.friendsChat != null && class358.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "816626450" + garbageValue = "1325607421" ) @Export("updateIsInClanChat") void updateIsInClanChat() { for (int var1 = 0; var1 < 4; ++var1) { - if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method808(this.username.getName()) != -1 && var1 != 2) { + if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method813(this.username.getName()) != -1 && var1 != 2) { this.isInClanChat = TriBool.TriBool_true; return; } @@ -483,20 +476,20 @@ void updateIsInClanChat() { this.isInClanChat = TriBool.TriBool_false; } - @ObfuscatedName("aq") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1097598998" + descriptor = "(B)V", + garbageValue = "62" ) @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; } - @ObfuscatedName("al") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1383064946" + descriptor = "(B)Z", + garbageValue = "28" ) @Export("isClanMember") boolean isClanMember() { @@ -507,24 +500,24 @@ boolean isClanMember() { return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("an") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1884466033" + garbageValue = "-149597751" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? class90.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? class190.getNpcDefinition(this.appearance.npcTransformId).size : 1; } - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IILin;I)V", - garbageValue = "-1206182432" + descriptor = "(IILip;I)V", + garbageValue = "877591570" ) @Export("move") final void move(int var1, int var2, MoveSpeed var3) { - if (super.sequence != -1 && EnumComposition.SequenceDefinition_get(super.sequence).priority == 1) { + if (super.sequence != -1 && class36.SequenceDefinition_get(super.sequence).priority == 1) { super.sequence = -1; } @@ -532,28 +525,10 @@ final void move(int var1, int var2, MoveSpeed var3) { if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { if (var3 == MoveSpeed.RUN) { - Player var4 = this; - MoveSpeed var5 = MoveSpeed.RUN; - int var6 = super.pathX[0]; - int var7 = super.pathY[0]; - int var8 = this.transformedSize(); - if (var6 >= var8 && var6 < 104 - var8 && var7 >= var8 && var7 < 104 - var8 && var1 >= var8 && var1 < 104 - var8 && var2 >= var8 && var2 < 104 - var8) { - int var10 = this.transformedSize(); - RouteStrategy var11 = class299.method1619(var1, var2); - CollisionMap var12 = Client.collisionMaps[this.plane]; - int[] var13 = Client.field593; - int[] var14 = Client.field592; - int var9 = class4.method4(var6, var7, var10, var11, var12, true, var13, var14, class218.field1926[0]); - int var15 = var9; - if (var9 >= 1) { - for (int var16 = 0; var16 < var15 - 1; ++var16) { - var4.method497(Client.field593[var16], Client.field592[var16], var5); - } - } - } + class180.method933(this, var1, var2, MoveSpeed.RUN); } - this.method497(var1, var2, var3); + this.method503(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -563,29 +538,29 @@ final void move(int var1, int var2, MoveSpeed var3) { } - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1786168705" + descriptor = "(IIB)V", + garbageValue = "-57" ) @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.field1022 = 0; - super.field1021 = 0; + super.field1023 = 0; + super.field1024 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); super.x = var3 * 64 + super.pathX[0] * 128; - super.y = var3 * 64 + super.pathY[0] * 128; + super.y = super.pathY[0] * 128 + var3 * 64; } - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IILin;I)V", - garbageValue = "112065194" + descriptor = "(IILip;B)V", + garbageValue = "-120" ) - final void method497(int var1, int var2, MoveSpeed var3) { + final void method503(int var1, int var2, MoveSpeed var3) { if (super.pathLength < 9) { ++super.pathLength; } @@ -601,60 +576,22 @@ final void method497(int var1, int var2, MoveSpeed var3) { super.pathTraversed[0] = var3; } - @ObfuscatedName("am") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "381940201" + descriptor = "(B)Z", + garbageValue = "4" ) @Export("isVisible") final boolean isVisible() { return this.appearance != null; } - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-1849336655" - ) - static int method499(int var0, Script var1, boolean var2) { - Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - if (var0 == 2800) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = HealthBarDefinition.Widget_unpackTargetMask(NewShit.getWidgetFlags(var3)); - return 1; - } else if (var0 != 2801) { - if (var0 == 2802) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - } - - @ObfuscatedName("nu") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1159741420" + descriptor = "(IIII)I", + garbageValue = "1479868908" ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLAN_JOINCHAT_LEAVECHAT, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); + static int method488(int var0, int var1, int var2) { + return var0 << 28 | var1 << 14 | var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/PlayerComposition.java b/osrs/src/main/java/PlayerComposition.java index 97d2ca3f5..299cc4a14 100644 --- a/osrs/src/main/java/PlayerComposition.java +++ b/osrs/src/main/java/PlayerComposition.java @@ -5,131 +5,129 @@ import java.util.Arrays; -@ObfuscatedName("mt") +@ObfuscatedName("ni") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("al") - public static short[] field2904; - @ObfuscatedName("an") - public static short[][] field2905; - @ObfuscatedName("ar") + @ObfuscatedName("ag") + public static short[] field2940; + @ObfuscatedName("as") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("PlayerAppearance_cachedModels") public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lqv;" + descriptor = "Lqe;" ) - static class423 field2907; - @ObfuscatedName("ah") - static int field2906; - @ObfuscatedName("au") - int[] field2913; + public static class438 field2939; @ObfuscatedName("ae") + public static int field2937; + @ObfuscatedName("ac") + int[] field2944; + @ObfuscatedName("al") @Export("equipment") int[] equipment; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("at") - public int field2918; - @ObfuscatedName("ac") - public int field2916; - @ObfuscatedName("ai") + @ObfuscatedName("ax") + public int field2951; + @ObfuscatedName("ao") + public int field2950; + @ObfuscatedName("ah") @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("hash") long hash; - @ObfuscatedName("ap") - long field2914; - @ObfuscatedName("aa") + @ObfuscatedName("ab") + long field2947; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "[Lho;" + descriptor = "[Lhy;" ) @Export("customisations") ObjTypeCustomisation[] customisations; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("isFemale") boolean isFemale; static { - equipmentIndices = new int[]{class209.field1857.field1871, class209.field1862.field1871, class209.field1858.field1871, class209.field1863.field1871, class209.field1860.field1871, class209.field1861.field1871, class209.field1859.field1871}; + equipmentIndices = new int[]{class223.field1868.field1879, class223.field1865.field1879, class223.field1869.field1879, class223.field1870.field1879, class223.field1871.field1879, class223.field1866.field1879, class223.field1867.field1879}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); - field2907 = new class423(16, class421.field3766); - field2906 = 0; + field2939 = new class438(16, class436.field3797); + field2937 = 0; } public PlayerComposition() { - this.field2918 = -1; - this.field2916 = 0; + this.field2951 = -1; + this.field2950 = 0; this.isFemale = false; } @ObfuscatedSignature( - descriptor = "(Lmt;)V" + descriptor = "(Lni;)V" ) PlayerComposition(PlayerComposition var1) { - this.field2918 = -1; - this.field2916 = 0; + this.field2951 = -1; + this.field2950 = 0; this.isFemale = false; int[] var2 = Arrays.copyOf(var1.equipment, var1.equipment.length); - int[] var3 = Arrays.copyOf(var1.field2913, var1.field2913.length); + int[] var3 = Arrays.copyOf(var1.field2944, var1.field2944.length); ObjTypeCustomisation[] var4 = (ObjTypeCustomisation[])(var1.customisations != null ? (ObjTypeCustomisation[])Arrays.copyOf(var1.customisations, var1.customisations.length) : null); int[] var5 = Arrays.copyOf(var1.bodyColors, var1.bodyColors.length); - this.method1717(var3, var2, var4, false, var5, var1.field2916, var1.npcTransformId, var1.field2918); + this.method1749(var3, var2, var4, false, var5, var1.field2950, var1.npcTransformId, var1.field2951); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([I[I[Lho;Z[IIIII)V", - garbageValue = "-1866336930" + descriptor = "([I[I[Lhy;Z[IIIII)V", + garbageValue = "-106574907" ) - public void method1717(int[] var1, int[] var2, ObjTypeCustomisation[] var3, boolean var4, int[] var5, int var6, int var7, int var8) { + public void method1749(int[] var1, int[] var2, ObjTypeCustomisation[] var3, boolean var4, int[] var5, int var6, int var7, int var8) { this.customisations = var3; this.isFemale = var4; - this.field2918 = var8; - this.method1718(var1, var2, var5, var6, var7); + this.field2951 = var8; + this.method1750(var1, var2, var5, var6, var7); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "([I[I[IIII)V", - garbageValue = "1458257561" + descriptor = "([I[I[IIIB)V", + garbageValue = "108" ) - public void method1718(int[] var1, int[] var2, int[] var3, int var4, int var5) { + public void method1750(int[] var1, int[] var2, int[] var3, int var4, int var5) { if (var1 == null) { - var1 = this.method1720(var4); + var1 = this.method1751(var4); } if (var2 == null) { - var2 = this.method1720(var4); + var2 = this.method1751(var4); } - this.field2913 = var1; + this.field2944 = var1; this.equipment = var2; this.bodyColors = var3; - this.field2916 = var4; + this.field2950 = var4; this.npcTransformId = var5; this.setHash(); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(IB)[I", - garbageValue = "67" + garbageValue = "1" ) - int[] method1720(int var1) { + int[] method1751(int var1) { int[] var2 = new int[12]; for (int var3 = 0; var3 < 7; ++var3) { - for (int var4 = 0; var4 < KitDefinition.KitDefinition_fileCount; ++var4) { - KitDefinition var5 = ClanChannel.KitDefinition_get(var4); + for (int var4 = 0; var4 < class403.KitDefinition_fileCount; ++var4) { + KitDefinition var5 = class73.KitDefinition_get(var4); if (var5 != null && !var5.nonSelectable && var3 + (var1 == 1 ? 7 : 0) == var5.bodypartID) { var2[equipmentIndices[var3]] = var4 + 256; break; @@ -140,10 +138,10 @@ int[] method1720(int var1) { return var2; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "-1083968287" + garbageValue = "-151201208" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -156,36 +154,36 @@ public void changeAppearance(int var1, boolean var2) { if (!var2) { --var3; if (var3 < 0) { - var3 = KitDefinition.KitDefinition_fileCount - 1; + var3 = class403.KitDefinition_fileCount - 1; } } else { ++var3; - if (var3 >= KitDefinition.KitDefinition_fileCount) { + if (var3 >= class403.KitDefinition_fileCount) { var3 = 0; } } - var4 = ClanChannel.KitDefinition_get(var3); - } while(var4 == null || var4.nonSelectable || (this.field2916 == 1 ? 7 : 0) + var1 != var4.bodypartID); + var4 = class73.KitDefinition_get(var3); + } while(var4 == null || var4.nonSelectable || (this.field2950 == 1 ? 7 : 0) + var1 != var4.bodypartID); this.equipment[equipmentIndices[var1]] = var3 + 256; this.setHash(); } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IZB)V", - garbageValue = "8" + descriptor = "(IZI)V", + garbageValue = "1880856093" ) - public void method1722(int var1, boolean var2) { + public void method1753(int var1, boolean var2) { int var3 = this.bodyColors[var1]; boolean var4; if (!var2) { do { --var3; if (var3 < 0) { - var3 = class140.field1328[var1].length - 1; + var3 = class104.field1093[var1].length - 1; } if (var1 == 4 && var3 >= 8) { @@ -197,7 +195,7 @@ public void method1722(int var1, boolean var2) { } else { do { ++var3; - if (var3 >= class140.field1328[var1].length) { + if (var3 >= class104.field1093[var1].length) { var3 = 0; } @@ -213,25 +211,25 @@ public void method1722(int var1, boolean var2) { this.setHash(); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-782377094" + garbageValue = "-554597133" ) - public void method1723(int var1) { - if (this.field2916 != var1) { - this.method1718((int[])null, (int[])null, this.bodyColors, var1, -1); + public void method1754(int var1) { + if (this.field2950 != var1) { + this.method1750((int[])null, (int[])null, this.bodyColors, var1, -1); } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "-544852329" + descriptor = "(Lul;B)V", + garbageValue = "28" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.field2916); + var1.writeByte(this.field2950); int var2; for (var2 = 0; var2 < 7; ++var2) { @@ -249,10 +247,10 @@ public void write(Buffer var1) { } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "12" + garbageValue = "89" ) @Export("setHash") void setHash() { @@ -285,7 +283,7 @@ void setHash() { } this.hash <<= 1; - this.hash += (long)this.field2916; + this.hash += (long)this.field2950; this.equipment[5] = var3; this.equipment[9] = var4; if (var1 != 0L && var1 != this.hash || this.isFemale) { @@ -294,15 +292,15 @@ void setHash() { } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lib;ILib;II)Ljr;", - garbageValue = "-616726225" + descriptor = "(Lif;ILif;II)Ljn;", + garbageValue = "745471626" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return class90.getNpcDefinition(this.npcTransformId).method985(var1, var2, var3, var4, (NewShit)null); + return class190.getNpcDefinition(this.npcTransformId).method1011(var1, var2, var3, var4, (NewShit)null); } else { long var5 = this.hash; int[] var7 = this.equipment; @@ -331,18 +329,18 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 int var11; for (int var10 = 0; var10 < 12; ++var10) { var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !ClanChannel.KitDefinition_get(var11 - 256).ready()) { + if (var11 >= 256 && var11 < 512 && !class73.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !InvDefinition.ItemDefinition_get(var11 - 512).method1061(this.field2916)) { + if (var11 >= 512 && !class214.ItemDefinition_get(var11 - 512).method1099(this.field2950)) { var9 = true; } } if (var9) { - if (-1L != this.field2914) { - var18 = (Model)PlayerAppearance_cachedModels.get(this.field2914); + if (this.field2947 != -1L) { + var18 = (Model)PlayerAppearance_cachedModels.get(this.field2947); } if (var18 == null) { @@ -358,15 +356,15 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 for (int var12 = 0; var12 < 12; ++var12) { var13 = var7[var12]; if (var13 >= 256 && var13 < 512) { - ModelData var14 = ClanChannel.KitDefinition_get(var13 - 256).getModelData(); + ModelData var14 = class73.KitDefinition_get(var13 - 256).getModelData(); if (var14 != null) { var19[var11++] = var14; } } if (var13 >= 512) { - ItemComposition var22 = InvDefinition.ItemDefinition_get(var13 - 512); - ModelData var15 = var22.method1062(this.field2916); + ItemComposition var22 = class214.ItemDefinition_get(var13 - 512); + ModelData var15 = var22.method1100(this.field2950); if (var15 != null) { if (this.customisations != null) { ObjTypeCustomisation var16 = this.customisations[var12]; @@ -378,7 +376,7 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 } } - if (var16.retex != null && var22.retextureFrom != null && var16.retex.length == var22.retextureTo.length) { + if (var16.retex != null && var22.retextureFrom != null && var22.retextureTo.length == var16.retex.length) { for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { var15.retexture(var22.retextureTo[var17], var16.retex[var17]); } @@ -394,18 +392,18 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 ModelData var20 = new ModelData(var19, var11); for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < class140.field1328[var13].length) { - var20.recolor(UrlRequest.field1174[var13], class140.field1328[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < class104.field1093[var13].length) { + var20.recolor(field2940[var13], class104.field1093[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < field2905[var13].length) { - var20.recolor(field2904[var13], field2905[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < class33.field87[var13].length) { + var20.recolor(Coord.field2906[var13], class33.field87[var13][this.bodyColors[var13]]); } } var18 = var20.toModel(64, 850, -30, -50, -30); PlayerAppearance_cachedModels.put(var18, var5); - this.field2914 = var5; + this.field2947 = var5; } } @@ -424,26 +422,26 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)Lic;", - garbageValue = "-812517450" + descriptor = "(I)Ljw;", + garbageValue = "-578216920" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { - return class90.getNpcDefinition(this.npcTransformId).method986((NewShit)null); + return class190.getNpcDefinition(this.npcTransformId).method1012((NewShit)null); } else { boolean var1 = false; int var3; for (int var2 = 0; var2 < 12; ++var2) { var3 = this.equipment[var2]; - if (var3 >= 256 && var3 < 512 && !ClanChannel.KitDefinition_get(var3 - 256).method961()) { + if (var3 >= 256 && var3 < 512 && !class73.KitDefinition_get(var3 - 256).method984()) { var1 = true; } - if (var3 >= 512 && !InvDefinition.ItemDefinition_get(var3 - 512).method1063(this.field2916)) { + if (var3 >= 512 && !class214.ItemDefinition_get(var3 - 512).method1101(this.field2950)) { var1 = true; } } @@ -459,14 +457,14 @@ ModelData getModelData() { var5 = this.equipment[var4]; ModelData var6; if (var5 >= 256 && var5 < 512) { - var6 = ClanChannel.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + var6 = class73.KitDefinition_get(var5 - 256).getKitDefinitionModels(); if (var6 != null) { var7[var3++] = var6; } } if (var5 >= 512) { - var6 = InvDefinition.ItemDefinition_get(var5 - 512).method1064(this.field2916); + var6 = class214.ItemDefinition_get(var5 - 512).method1102(this.field2950); if (var6 != null) { var7[var3++] = var6; } @@ -476,12 +474,12 @@ ModelData getModelData() { ModelData var8 = new ModelData(var7, var3); for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < class140.field1328[var5].length) { - var8.recolor(UrlRequest.field1174[var5], class140.field1328[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < class104.field1093[var5].length) { + var8.recolor(field2940[var5], class104.field1093[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < field2905[var5].length) { - var8.recolor(field2904[var5], field2905[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < class33.field87[var5].length) { + var8.recolor(Coord.field2906[var5], class33.field87[var5][this.bodyColors[var5]]); } } @@ -490,10 +488,10 @@ ModelData getModelData() { } } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "14" + descriptor = "(I)I", + garbageValue = "-1292206549" ) @Export("getChatHeadId") public int getChatHeadId() { @@ -502,108 +500,70 @@ public int getChatHeadId() { var1 = -65536L | (long)this.npcTransformId; } - Integer var3 = (Integer)field2907.method2180(var1); + Integer var3 = (Integer)field2939.method2216(var1); if (var3 == null) { - var3 = ++field2906 - 1; - field2907.method2181(var1, var3); - field2906 %= 65535; + var3 = ++field2937 - 1; + field2939.method2217(var1, var3); + field2937 %= 65535; } return var3; } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1158771729" + descriptor = "(B)V", + garbageValue = "0" ) - void method1729() { - this.method1718(this.field2913, this.equipment, this.bodyColors, this.field2916, this.npcTransformId); + void method1760() { + this.method1750(this.field2944, this.equipment, this.bodyColors, this.field2950, this.npcTransformId); } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(CLon;B)C", - garbageValue = "1" + descriptor = "(IIIIB)I", + garbageValue = "20" ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { - if (var0 >= 192 && var0 <= 198) { - return 'A'; - } - - if (var0 == 199) { - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { - return 'U'; - } - - if (var0 == 221) { - return 'Y'; - } - - if (var0 == 223) { - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { - return 'a'; - } - - if (var0 == 231) { - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { - return 'n'; - } + static final int method1748(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; + } - if (var0 >= 242 && var0 <= 246) { - return 'o'; - } + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(ILds;ZB)I", + garbageValue = "63" + ) + static int method1761(int var0, Script var1, boolean var2) { + if (var0 == 5306) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class178.getWindowedMode(); + return 1; + } else { + int var3; + if (var0 == 5307) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + NPCComposition.setWindowedMode(var3); + } - if (var0 >= 249 && var0 <= 252) { - return 'u'; - } + return 1; + } else if (var0 == 5308) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class91.clientPreferences.method562(); + return 1; + } else if (var0 != 5309) { + if (var0 == 5310) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + class91.clientPreferences.method561(var3); + } - if (var0 == 253 || var0 == 255) { - return 'y'; + return 1; } } - - if (var0 == 338) { - return 'O'; - } else if (var0 == 339) { - return 'o'; - } else { - return var0 == 376 ? 'Y' : var0; - } } } \ No newline at end of file diff --git a/osrs/src/main/java/PlayerType.java b/osrs/src/main/java/PlayerType.java index 68c13d2d3..66c5e3fa4 100644 --- a/osrs/src/main/java/PlayerType.java +++ b/osrs/src/main/java/PlayerType.java @@ -3,111 +3,111 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nn") +@ObfuscatedName("ol") @Implements("PlayerType") -public enum PlayerType implements class371 { - @ObfuscatedName("au") +public enum PlayerType implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3500(6, 22, false, false, true), - @ObfuscatedName("ap") + field3529(6, 22, false, false, true), + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3495(7, 41, false, false, true), - @ObfuscatedName("aa") + field3518(7, 41, false, false, true), + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3484(8, 42, false, false, true), - @ObfuscatedName("af") + field3525(8, 42, false, false, true), + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3489(9, 43, false, false, true), - @ObfuscatedName("ad") + field3531(9, 43, false, false, true), + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3487(10, 44, false, false, true), - @ObfuscatedName("aq") + field3520(10, 44, false, false, true), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3496(11, 45, false, false, true), - @ObfuscatedName("al") + field3517(11, 45, false, false, true), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3492(12, 46, false, false, true), - @ObfuscatedName("an") + field3528(12, 46, false, false, true), + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3493(13, 47, false, false, true), - @ObfuscatedName("ar") + field3533(13, 47, false, false, true), + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3497(14, 48, false, false, true), - @ObfuscatedName("ab") + field3530(14, 48, false, false, true), + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3485(15, 49, false, false, true), - @ObfuscatedName("ag") + field3522(15, 49, false, false, true), + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lol;" ) - field3490(16, 52, false, false, true); + field3526(16, 52, false, false, true); - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("id") final int id; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("modIcon") public final int modIcon; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("isUser") public final boolean isUser; @@ -118,51 +118,31 @@ public enum PlayerType implements class371 { this.isUser = var7; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "414749289" - ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field3738) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field3741) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field3740) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.field3743 < ByteArrayPool.field3744) { - ByteArrayPool.field3734[++ByteArrayPool.field3743 - 1] = var0; - } else { - if (class410.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < class416.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == class416.ByteArrayPool_alternativeSizes[var1] && StructComposition.ByteArrayPool_altSizeArrayCounts[var1] < class410.ByteArrayPool_arrays[var1].length) { - class410.ByteArrayPool_arrays[var1][StructComposition.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } - } - } - - } + descriptor = "(I)V", + garbageValue = "1861309020" + ) + public static void method1912() { + DbTableType.DBTableType_cache.clear(); } - @ObfuscatedName("nq") + @ObfuscatedName("jk") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-72" + descriptor = "(Ldi;II)V", + garbageValue = "-1410811311" ) - static final int method1883() { - float var0 = 200.0F * ((float)class449.clientPreferences.getBrightness() - 0.5F); - return 100 - Math.round(var0); + static final void method1913(Actor var0, int var1) { + class150.worldToScreen(var0.x, var0.y, var1); } } \ No newline at end of file diff --git a/osrs/src/main/java/Players.java b/osrs/src/main/java/Players.java index a371055f0..5f91d577a 100644 --- a/osrs/src/main/java/Players.java +++ b/osrs/src/main/java/Players.java @@ -3,65 +3,56 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("ei") @Implements("Players") public class Players { - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("activityFlags") static byte[] activityFlags; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "[Lin;" + descriptor = "[Lip;" ) @Export("playerMovementSpeeds") static MoveSpeed[] playerMovementSpeeds; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "[Ltm;" + descriptor = "[Lul;" ) @Export("cachedAppearanceBuffer") static Buffer[] cachedAppearanceBuffer; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("Players_count") static int Players_count; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Ltm;" - ) - static Buffer field1121; - @ObfuscatedName("sg") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lul;" ) - @Export("guestClanSettings") - static ClanSettings guestClanSettings; - @ObfuscatedName("uq") - @Export("cameraMoveToX") - static int cameraMoveToX; + static Buffer field1119; static { activityFlags = new byte[2048]; @@ -76,39 +67,31 @@ public class Players { Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1121 = new Buffer(new byte[5000]); + field1119 = new Buffer(new byte[5000]); } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)Lhc;", - garbageValue = "-1692851000" - ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); - var1 = new StructComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + @ObfuscatedName("ac") + public static final void method623(long var0) { + if (var0 > 0L) { + if (0L == var0 % 10L) { + long var2 = var0 - 1L; + + try { + Thread.sleep(var2); + } catch (InterruptedException var8) { + } + + try { + Thread.sleep(1L); + } catch (InterruptedException var7) { + } + } else { + try { + Thread.sleep(var0); + } catch (InterruptedException var6) { + } } - var1.postDecode(); - StructComposition.StructDefinition_cached.put(var1, (long)var0); - return var1; } } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-831991142" - ) - public static final void method619() { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; - } } \ No newline at end of file diff --git a/osrs/src/main/java/PrivateChatMode.java b/osrs/src/main/java/PrivateChatMode.java index ede5ce3eb..93ab4b5fa 100644 --- a/osrs/src/main/java/PrivateChatMode.java +++ b/osrs/src/main/java/PrivateChatMode.java @@ -3,32 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ub") +@ObfuscatedName("va") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lub;" + descriptor = "Lva;" ) - static final PrivateChatMode field4273; - @ObfuscatedName("ae") + static final PrivateChatMode field4299; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lub;" + descriptor = "Lva;" ) - public static final PrivateChatMode field4271; - @ObfuscatedName("ao") + public static final PrivateChatMode field4298; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lub;" + descriptor = "Lva;" ) - static final PrivateChatMode field4272; - @ObfuscatedName("at") + static final PrivateChatMode field4300; + @ObfuscatedName("ax") @Export("id") public final int id; static { - field4273 = new PrivateChatMode(0); - field4271 = new PrivateChatMode(1); - field4272 = new PrivateChatMode(2); + field4299 = new PrivateChatMode(0); + field4298 = new PrivateChatMode(1); + field4300 = new PrivateChatMode(2); } PrivateChatMode(int var1) { diff --git a/osrs/src/main/java/Projectile.java b/osrs/src/main/java/Projectile.java index 5e3cf9b54..c2cfea43d 100644 --- a/osrs/src/main/java/Projectile.java +++ b/osrs/src/main/java/Projectile.java @@ -3,89 +3,92 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ck") +@ObfuscatedName("dv") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("id") int id; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("plane") int plane; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("sourceX") int sourceX; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("sourceY") int sourceY; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("sourceZ") int sourceZ; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("endHeight") int endHeight; - @ObfuscatedName("az") - int field805; - @ObfuscatedName("ap") - int field799; - @ObfuscatedName("aa") + @ObfuscatedName("ar") + int field800; + @ObfuscatedName("ab") int field789; - @ObfuscatedName("af") + @ObfuscatedName("am") + int field797; + @ObfuscatedName("av") @Export("cycleStart") int cycleStart; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("slope") int slope; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("startHeight") int startHeight; - @ObfuscatedName("an") - int field797; - @ObfuscatedName("ar") + @ObfuscatedName("ay") + int field804; + @ObfuscatedName("as") @Export("targetIndex") int targetIndex; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("isMoving") boolean isMoving; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("x") double x; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("y") double y; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("z") double z; - @ObfuscatedName("ah") + @ObfuscatedName("ae") + @Export("speedY") double speedY; - @ObfuscatedName("as") + @ObfuscatedName("aw") + @Export("speedX") double speedX; - @ObfuscatedName("ay") + @ObfuscatedName("aq") + @Export("speed") double speed; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("speedZ") double speedZ; - @ObfuscatedName("av") - double field785; - @ObfuscatedName("aw") + @ObfuscatedName("at") + double field783; + @ObfuscatedName("af") @Export("yaw") int yaw; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("pitch") int pitch; - @ObfuscatedName("bh") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "Lif;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("bj") + @ObfuscatedName("bk") @Export("frame") int frame; - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("frameCycle") int frameCycle; @@ -105,9 +108,9 @@ public final class Projectile extends Renderable { this.targetIndex = var10; this.endHeight = var11; this.isMoving = false; - int var12 = StructComposition.SpotAnimationDefinition_get(this.id).sequence; + int var12 = class406.SpotAnimationDefinition_get(this.id).sequence; if (var12 != -1) { - this.sequenceDefinition = EnumComposition.SequenceDefinition_get(var12); + this.sequenceDefinition = class36.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; } @@ -116,48 +119,48 @@ public final class Projectile extends Renderable { Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { this(var1, var2, var3, var4, var5, var6, var7, var8, var9, var11, var12); - this.field797 = var10; + this.field804 = var10; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-912424366" + garbageValue = "715135572" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { - this.field805 = var1; - this.field799 = var2; - this.field789 = var3; + this.field800 = var1; + this.field789 = var2; + this.field797 = var3; double var5; if (!this.isMoving) { - var5 = (double)(this.field805 - this.sourceX); - double var7 = (double)(this.field799 - this.sourceY); + var5 = (double)(this.field800 - this.sourceX); + double var7 = (double)(this.field789 - this.sourceY); double var9 = Math.sqrt(var5 * var5 + var7 * var7); - this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; - this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; + this.x = var5 * (double)this.startHeight / var9 + (double)this.sourceX; + this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; this.z = (double)this.sourceZ; } var5 = (double)(this.cycleEnd + 1 - var4); - this.speedY = ((double)this.field805 - this.x) / var5; - this.speedX = ((double)this.field799 - this.y) / var5; + this.speedY = ((double)this.field800 - this.x) / var5; + this.speedX = ((double)this.field789 - this.y) / var5; this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); if (!this.isMoving) { this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); } - this.field785 = ((double)this.field789 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); + this.field783 = ((double)this.field797 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljr;", - garbageValue = "798227647" + descriptor = "(B)Ljn;", + garbageValue = "0" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = StructComposition.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = class406.SpotAnimationDefinition_get(this.id); Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; @@ -167,18 +170,18 @@ protected final Model getModel() { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "30" + descriptor = "(II)V", + garbageValue = "-952040923" ) @Export("advance") final void advance(int var1) { this.isMoving = true; - this.x += this.speedY * (double)var1; + this.x += (double)var1 * this.speedY; this.y += (double)var1 * this.speedX; - this.z += 0.5D * this.field785 * (double)var1 * (double)var1 + (double)var1 * this.speedZ; - this.speedZ += this.field785 * (double)var1; + this.z += (double)var1 * this.field783 * 0.5D * (double)var1 + (double)var1 * this.speedZ; + this.speedZ += (double)var1 * this.field783; this.yaw = (int)(Math.atan2(this.speedY, this.speedX) * 325.949D) + 1024 & 2047; this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; if (this.sequenceDefinition != null) { @@ -203,7 +206,7 @@ final void advance(int var1) { } } else { this.frame += var1; - int var2 = this.sequenceDefinition.method1085(); + int var2 = this.sequenceDefinition.method1127(); if (this.frame >= var2) { this.frame = var2 - this.sequenceDefinition.frameCount; } @@ -212,12 +215,292 @@ final void advance(int var1) { } - @ObfuscatedName("ae") + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;Lom;ZLpu;I)V", + garbageValue = "1662908547" + ) + public static void method436(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + class317.ItemDefinition_archive = var0; + class349.ItemDefinition_modelArchive = var1; + HealthBarUpdate.ItemDefinition_inMembersWorld = var2; + class284.ItemDefinition_fileCount = class317.ItemDefinition_archive.getGroupFileCount(10); + class142.ItemDefinition_fontPlain11 = var3; + } + + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "-1524962913" + ) + static int method439(int var0, Script var1, boolean var2) { + if (var0 == 5000) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == 5001) { + Interpreter.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + Canvas.privateChatMode = UserComparator9.method679(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + if (Canvas.privateChatMode == null) { + Canvas.privateChatMode = PrivateChatMode.field4298; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + PacketBufferNode var11 = ClanChannelMember.getPacketBufferNode(ClientPacket.CHAT_SETFILTER, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeByte(Client.publicChatMode); + var11.packetBuffer.writeByte(Canvas.privateChatMode.id); + var11.packetBuffer.writeByte(Client.tradeChatMode); + Client.packetWriter.addNode(var11); + return 1; + } else { + String var3; + int var4; + int var5; + PacketBufferNode var6; + if (var0 == 5002) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var6 = ClanChannelMember.getPacketBufferNode(ClientPacket.CHAT_SEND_ABUSE_REPORT, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var3) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var3); + var6.packetBuffer.writeByte(var4 - 1); + var6.packetBuffer.writeByte(var5); + Client.packetWriter.addNode(var6); + return 1; + } else { + int var7; + Message var8; + if (var0 == 5003) { + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var8 = SoundCache.Messages_getByChannelAndID(var7, var4); + if (var8 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.count; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.cycle; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + Message var9; + if (var0 == 5004) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var9 = WorldMapRegion.Messages_getMessage(var7); + if (var9 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.type; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.cycle; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 5005) { + if (Canvas.privateChatMode == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.privateChatMode.id; + } + + return 1; + } else { + PacketBufferNode var12; + if (var0 == 5008) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = class160.method842(var4, var3, WorldMapLabelSize.clientLanguage, -1); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == 5009) { + class180.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; + String var13 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; + var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.CHAT_SENDPRIVATE, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShort(0); + int var10 = var12.packetBuffer.offset; + var12.packetBuffer.writeStringCp1252NullTerminated(var3); + class150.method785(var12.packetBuffer, var13); + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == 5010) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var6 = class160.method842(var4, var3, WorldMapLabelSize.clientLanguage, var5); + Client.packetWriter.addNode(var6); + return 1; + } else if (var0 != 5015) { + if (var0 == 5016) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == 5017) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferNameComparator.Messages_getHistorySize(var7); + return 1; + } else if (var0 == 5018) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UrlRequest.Messages_getLastChatID(var7); + return 1; + } else if (var0 == 5019) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.method475(var7); + return 1; + } else if (var0 == 5020) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + class163.doCheat(var3); + return 1; + } else if (var0 == 5021) { + Client.field601 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == 5022) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = Client.field601; + return 1; + } else if (var0 == 5023) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + System.out.println(var3); + return 1; + } else if (var0 == 5030) { + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var8 = SoundCache.Messages_getByChannelAndID(var7, var4); + if (var8 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.count; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.cycle; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 5031) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var9 = WorldMapRegion.Messages_getMessage(var7); + if (var9 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.type; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.cycle; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + if (TextureProvider.localPlayer != null && TextureProvider.localPlayer.username != null) { + var3 = TextureProvider.localPlayer.username.getName(); + } else { + var3 = ""; + } + + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3; + return 1; + } + } + } + } + } + } + + @ObfuscatedName("if") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "992783271" + descriptor = "(III)V", + garbageValue = "-1050765779" ) - public static int method430(int var0) { - return class303.field2755[var0]; + static final void method438(int var0, int var1) { + if (var0 < 128) { + var0 = 128; + } else if (var0 > 383) { + var0 = 383; + } + + if (class365.cameraPitch < var0) { + class365.cameraPitch = (var0 - class365.cameraPitch) * class465.cameraLookAtAcceleration / 1000 + class365.cameraPitch + class232.cameraLookAtSpeed; + if (class365.cameraPitch > var0) { + class365.cameraPitch = var0; + } + } else if (class365.cameraPitch > var0) { + class365.cameraPitch -= (class365.cameraPitch - var0) * class465.cameraLookAtAcceleration / 1000 + class232.cameraLookAtSpeed; + if (class365.cameraPitch < var0) { + class365.cameraPitch = var0; + } + } + + var1 &= 2047; + int var2 = var1 - WallDecoration.cameraYaw; + if (var2 > 1024) { + var2 -= 2048; + } else if (var2 < -1024) { + var2 += 2048; + } + + if (var2 > 0) { + WallDecoration.cameraYaw = WallDecoration.cameraYaw + class232.cameraLookAtSpeed + var2 * class465.cameraLookAtAcceleration / 1000; + WallDecoration.cameraYaw &= 2047; + } else if (var2 < 0) { + WallDecoration.cameraYaw -= -var2 * class465.cameraLookAtAcceleration / 1000 + class232.cameraLookAtSpeed; + WallDecoration.cameraYaw &= 2047; + } + + int var3 = var1 - WallDecoration.cameraYaw; + if (var3 > 1024) { + var3 -= 2048; + } else if (var3 < -1024) { + var3 += 2048; + } + + if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { + WallDecoration.cameraYaw = var1; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/RasterProvider.java b/osrs/src/main/java/RasterProvider.java index ad92b3815..ffaba9956 100644 --- a/osrs/src/main/java/RasterProvider.java +++ b/osrs/src/main/java/RasterProvider.java @@ -7,13 +7,13 @@ import java.awt.image.*; import java.util.Hashtable; -@ObfuscatedName("by") +@ObfuscatedName("ba") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("component") Component component; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("image") Image image; @@ -22,7 +22,7 @@ public final class RasterProvider extends AbstractRasterProvider { super.height = var2; super.pixels = new int[var2 * var1 + 1]; if (var4) { - super.field4225 = new float[var2 * var1 + 1]; + super.field4252 = new float[var2 * var1 + 1]; } DataBufferInt var5 = new DataBufferInt(super.pixels, super.pixels.length); @@ -33,40 +33,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;S)V", - garbageValue = "10944" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-2046056671" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-46" + descriptor = "(III)V", + garbageValue = "-237304267" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1065945289" + descriptor = "(IIIIB)V", + garbageValue = "-3" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;III)V", - garbageValue = "-1661158948" + garbageValue = "-887938586" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -78,10 +78,10 @@ final void drawFull0(Graphics var1, int var2, int var3) { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "1529858789" + garbageValue = "1460118678" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { diff --git a/osrs/src/main/java/Rasterizer2D.java b/osrs/src/main/java/Rasterizer2D.java index bde97209a..dc51babc6 100644 --- a/osrs/src/main/java/Rasterizer2D.java +++ b/osrs/src/main/java/Rasterizer2D.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ut") +@ObfuscatedName("uc") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("bh") - public static float[] field4217; - @ObfuscatedName("bk") + @ObfuscatedName("bn") + public static float[] field4244; + @ObfuscatedName("by") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("bt") + @ObfuscatedName("be") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -40,16 +40,16 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } - @ObfuscatedName("em") - protected static void method2620(int[] var0, int var1, int var2, float[] var3) { + @ObfuscatedName("dr") + protected static void method2659(int[] var0, int var1, int var2, float[] var3) { Rasterizer2D_pixels = var0; Rasterizer2D_width = var1; Rasterizer2D_height = var2; - field4217 = var3; + field4244 = var3; Rasterizer2D_setClip(0, 0, var1, var2); } - @ObfuscatedName("ef") + @ObfuscatedName("dw") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; @@ -58,7 +58,7 @@ public static void Rasterizer2D_resetClip() { Rasterizer2D_yClipEnd = Rasterizer2D_height; } - @ObfuscatedName("ek") + @ObfuscatedName("di") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { @@ -83,7 +83,7 @@ public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) Rasterizer2D_yClipEnd = var3; } - @ObfuscatedName("ec") + @ObfuscatedName("dt") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { @@ -104,7 +104,7 @@ public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var } - @ObfuscatedName("eu") + @ObfuscatedName("dd") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; @@ -113,7 +113,7 @@ public static void Rasterizer2D_getClipArray(int[] var0) { var0[3] = Rasterizer2D_yClipEnd; } - @ObfuscatedName("eg") + @ObfuscatedName("dy") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; @@ -122,7 +122,7 @@ public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_yClipEnd = var0[3]; } - @ObfuscatedName("ft") + @ObfuscatedName("db") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; @@ -141,10 +141,10 @@ public static void Rasterizer2D_clear() { for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { } - method2643(); + method2682(); } - @ObfuscatedName("fs") + @ObfuscatedName("dc") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { @@ -239,7 +239,7 @@ static void drawCircle(int var0, int var1, int var2, int var3) { } } - @ObfuscatedName("fl") + @ObfuscatedName("da") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { @@ -352,7 +352,7 @@ public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, in } } - @ObfuscatedName("fe") + @ObfuscatedName("eo") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { @@ -390,7 +390,7 @@ public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, } - @ObfuscatedName("fd") + @ObfuscatedName("em") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { @@ -424,7 +424,7 @@ public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int } - @ObfuscatedName("fj") + @ObfuscatedName("el") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { @@ -468,7 +468,7 @@ public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int va } } - @ObfuscatedName("fv") + @ObfuscatedName("ec") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var2 > 0 && var3 > 0) { @@ -526,7 +526,7 @@ public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, i } } - @ObfuscatedName("fb") + @ObfuscatedName("eg") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" @@ -607,16 +607,16 @@ public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, } } - @ObfuscatedName("fr") + @ObfuscatedName("ei") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { - Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); - Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); - Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); - Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); + method2675(var0, var1, var2, var4); + method2675(var0, var3 + var1 - 1, var2, var4); + method2677(var0, var1, var3, var4); + method2677(var0 + var2 - 1, var1, var3, var4); } - @ObfuscatedName("fq") + @ObfuscatedName("ex") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); @@ -628,8 +628,8 @@ public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, } - @ObfuscatedName("fp") - public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { + @ObfuscatedName("ek") + public static void method2675(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { if (var0 < Rasterizer2D_xClipStart) { var2 -= Rasterizer2D_xClipStart - var0; @@ -649,7 +649,7 @@ public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, } } - @ObfuscatedName("fg") + @ObfuscatedName("er") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -679,8 +679,8 @@ static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, i } } - @ObfuscatedName("fo") - public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { + @ObfuscatedName("ez") + public static void method2677(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { if (var1 < Rasterizer2D_yClipStart) { var2 -= Rasterizer2D_yClipStart - var1; @@ -700,7 +700,7 @@ public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, i } } - @ObfuscatedName("fz") + @ObfuscatedName("en") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -731,23 +731,23 @@ static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int } } - @ObfuscatedName("fu") + @ObfuscatedName("es") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; var3 -= var1; if (var3 == 0) { if (var2 >= 0) { - Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4); + method2675(var0, var1, var2 + 1, var4); } else { - Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); + method2675(var0 + var2, var1, -var2 + 1, var4); } } else if (var2 == 0) { if (var3 >= 0) { - Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4); + method2677(var0, var1, var3 + 1, var4); } else { - Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); + method2677(var0, var3 + var1, -var3 + 1, var4); } } else { @@ -813,7 +813,7 @@ public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, } } - @ObfuscatedName("fn") + @ObfuscatedName("eq") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { @@ -821,7 +821,7 @@ static void Rasterizer2D_setPixel(int var0, int var1, int var2) { } } - @ObfuscatedName("fx") + @ObfuscatedName("ej") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; @@ -838,28 +838,28 @@ public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2 } - @ObfuscatedName("ff") - public static void method2643() { - if (field4217 != null) { + @ObfuscatedName("et") + public static void method2682() { + if (field4244 != null) { int var0; int var1; int var2; if (Rasterizer2D_xClipStart == 0 && Rasterizer2D_xClipEnd == Rasterizer2D_width && Rasterizer2D_yClipStart == 0 && Rasterizer2D_yClipEnd == Rasterizer2D_height) { - var0 = field4217.length; + var0 = field4244.length; var1 = var0 - (var0 & 7); - for (var2 = 0; var2 < var1; field4217[var2++] = 0.0F) { - field4217[var2++] = 0.0F; - field4217[var2++] = 0.0F; - field4217[var2++] = 0.0F; - field4217[var2++] = 0.0F; - field4217[var2++] = 0.0F; - field4217[var2++] = 0.0F; - field4217[var2++] = 0.0F; + for (var2 = 0; var2 < var1; field4244[var2++] = 0.0F) { + field4244[var2++] = 0.0F; + field4244[var2++] = 0.0F; + field4244[var2++] = 0.0F; + field4244[var2++] = 0.0F; + field4244[var2++] = 0.0F; + field4244[var2++] = 0.0F; + field4244[var2++] = 0.0F; } while (var2 < var0) { - field4217[var2++] = 0.0F; + field4244[var2++] = 0.0F; } } else { var0 = Rasterizer2D_xClipEnd - Rasterizer2D_xClipStart; @@ -877,21 +877,21 @@ public static void method2643() { do { ++var0; - field4217[var0] = 0.0F; + field4244[var0] = 0.0F; ++var0; - field4217[var0] = 0.0F; + field4244[var0] = 0.0F; ++var0; - field4217[var0] = 0.0F; + field4244[var0] = 0.0F; ++var0; - field4217[var0] = 0.0F; + field4244[var0] = 0.0F; ++var0; - field4217[var0] = 0.0F; + field4244[var0] = 0.0F; ++var0; - field4217[var0] = 0.0F; + field4244[var0] = 0.0F; ++var0; - field4217[var0] = 0.0F; + field4244[var0] = 0.0F; ++var0; - field4217[var0] = 0.0F; + field4244[var0] = 0.0F; --var6; } while(var6 > 0); } @@ -901,7 +901,7 @@ public static void method2643() { do { ++var0; - field4217[var0] = 0.0F; + field4244[var0] = 0.0F; --var6; } while(var6 > 0); } @@ -913,17 +913,17 @@ public static void method2643() { } } - @ObfuscatedName("fc") - public static void method2644() { - if (field4217 != null) { - int var0 = field4217.length; + @ObfuscatedName("eh") + public static void method2683() { + if (field4244 != null) { + int var0 = field4244.length; for (int var1 = 0; var1 < var0; ++var1) { - if (var1 % Rasterizer2D_width < Rasterizer2D_width / 2 && field4217[var1] > 0.0F) { - float var3 = field4217[var1]; + if (var1 % Rasterizer2D_width < Rasterizer2D_width / 2 && field4244[var1] > 0.0F) { + float var3 = field4244[var1]; float var4 = 75.0F; float var5 = 10000.0F; - float var6 = 750000.0F / (10000.0F - 9925.0F * var3); + float var6 = 750000.0F / (10000.0F - var3 * 9925.0F); float var2 = (var6 - 75.0F) / 9925.0F; int var7 = (int)(255.0F * var2); Rasterizer2D_pixels[var1] = var7 << 16 | var7 << 8 | var7; diff --git a/osrs/src/main/java/Rasterizer3D.java b/osrs/src/main/java/Rasterizer3D.java index 9febe31bf..dd30e74be 100644 --- a/osrs/src/main/java/Rasterizer3D.java +++ b/osrs/src/main/java/Rasterizer3D.java @@ -3,58 +3,58 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("jx") @Implements("Rasterizer3D") public class Rasterizer3D { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("ae") - static int[] field2036; - @ObfuscatedName("ao") - static int[] field2037; - @ObfuscatedName("at") + @ObfuscatedName("al") + static int[] field2048; + @ObfuscatedName("ak") + static int[] field2047; + @ObfuscatedName("ax") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljb;" ) @Export("clips") public static Clips clips; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lid;" + descriptor = "Ljj;" ) - static class228 field2035; - @ObfuscatedName("ap") + static class242 field2049; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lid;" + descriptor = "Ljj;" ) - static final class228 field2039; - @ObfuscatedName("aa") + static final class242 field2050; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lid;" + descriptor = "Ljj;" ) - static final class228 field2038; + static final class242 field2051; static { Rasterizer3D_colorPalette = new int[65536]; - field2036 = new int[512]; - field2037 = new int[2048]; + field2048 = new int[512]; + field2047 = new int[2048]; Rasterizer3D_sine = new int[2048]; Rasterizer3D_cosine = new int[2048]; int var0; for (var0 = 1; var0 < 512; ++var0) { - field2036[var0] = 32768 / var0; + field2048[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { - field2037[var0] = 65536 / var0; + field2047[var0] = 65536 / var0; } for (var0 = 0; var0 < 2048; ++var0) { @@ -63,35 +63,35 @@ public class Rasterizer3D { } clips = new Clips(); - field2039 = new class243(clips); - field2038 = new class245(clips); - field2035 = field2039; + field2050 = new class257(clips); + field2051 = new class259(clips); + field2049 = field2050; } - @ObfuscatedName("au") - public static void method1185(boolean var0) { - if (var0 && Rasterizer2D.field4217 != null) { - field2035 = field2038; + @ObfuscatedName("ac") + public static void method1234(boolean var0) { + if (var0 && Rasterizer2D.field4244 != null) { + field2049 = field2051; } else { - field2035 = field2039; + field2049 = field2050; } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljs;)V" + descriptor = "(Lkg;)V" ) - public static void method1186(TextureLoader var0) { + public static void method1235(TextureLoader var0) { clips.Rasterizer3D_textureLoader = var0; } - @ObfuscatedName("ao") - public static void method1187(double var0) { + @ObfuscatedName("ak") + public static void method1236(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("Rasterizer3D_buildPalette") static void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; @@ -170,7 +170,7 @@ static void Rasterizer3D_buildPalette(double var0, int var2, int var3) { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; @@ -185,128 +185,128 @@ static int Rasterizer3D_brighten(int var0, double var1) { return var11 + (var10 << 8) + (var9 << 16); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("getClipMidX") static int getClipMidX() { - return clips.field2272; + return clips.field2284; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("getClipMidY") static int getClipMidY() { - return clips.field2274; + return clips.field2287; } - @ObfuscatedName("ap") - static int method1192() { + @ObfuscatedName("ab") + static int method1241() { return clips.clipNegativeMidX; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("getClipMidX2") static int getClipMidX2() { - return clips.field2273; + return clips.field2286; } - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("getClipMidY2") static int getClipMidY2() { - return clips.field2271; + return clips.field2279; } - @ObfuscatedName("ad") - static int method1195() { + @ObfuscatedName("ag") + static int method1244() { return clips.clipNegativeMidY; } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("get3dZoom") public static int get3dZoom() { - return clips.field2280; + return clips.field2290; } - @ObfuscatedName("al") - static int method1197() { - return clips.field2276; + @ObfuscatedName("ap") + static int method1246() { + return clips.field2285; } - @ObfuscatedName("an") - public static void method1198(int[] var0, int var1, int var2, float[] var3) { - if (var3 == null && field2035 == field2038) { - field2035 = field2039; + @ObfuscatedName("ay") + public static void method1247(int[] var0, int var1, int var2, float[] var3) { + if (var3 == null && field2049 == field2051) { + field2049 = field2050; } - field2035.method1220(var0, var1, var2, var3); + field2049.method1266(var0, var1, var2, var3); } - @ObfuscatedName("ar") - public static void method1199() { - method1200(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); + @ObfuscatedName("as") + public static void method1248() { + method1249(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } - @ObfuscatedName("ab") - static void method1200(int var0, int var1, int var2, int var3) { - clips.field2276 = var2 - var0; - clips.field2269 = var3 - var1; - method1201(); - if (clips.Rasterizer3D_rowOffsets.length < clips.field2269) { - clips.Rasterizer3D_rowOffsets = new int[WorldMapIcon_1.method1401(clips.field2269)]; + @ObfuscatedName("aj") + static void method1249(int var0, int var1, int var2, int var3) { + clips.field2285 = var2 - var0; + clips.field2281 = var3 - var1; + method1250(); + if (clips.Rasterizer3D_rowOffsets.length < clips.field2281) { + clips.Rasterizer3D_rowOffsets = new int[EnumComposition.method999(clips.field2281)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; - for (int var5 = 0; var5 < clips.field2269; ++var5) { + for (int var5 = 0; var5 < clips.field2281; ++var5) { clips.Rasterizer3D_rowOffsets[var5] = var4; var4 += Rasterizer2D.Rasterizer2D_width; } } - @ObfuscatedName("ag") - public static void method1201() { - clips.method1361(); + @ObfuscatedName("an") + public static void method1250() { + clips.method1400(); } - @ObfuscatedName("am") - public static void method1202(int var0, int var1) { + @ObfuscatedName("au") + public static void method1251(int var0, int var1) { int var2 = clips.Rasterizer3D_rowOffsets[0]; int var3 = var2 / Rasterizer2D.Rasterizer2D_width; int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; - clips.method1362(var0, var4, var1, var3); + clips.method1401(var0, var4, var1, var3); } - @ObfuscatedName("ax") - public static void method1203(int var0, int var1, int var2) { - clips.method1363(var0, var1, var2); + @ObfuscatedName("ai") + public static void method1252(int var0, int var1, int var2) { + clips.method1402(var0, var1, var2); } - @ObfuscatedName("ah") - static void method1204(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11) { - field2035.vmethod1374(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11); + @ObfuscatedName("ae") + static void method1253(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11) { + field2049.vmethod1374(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11); } - @ObfuscatedName("as") - public static void method1205(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9) { - field2035.vmethod1366(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9); + @ObfuscatedName("aw") + public static void method1254(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9) { + field2049.vmethod1366(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9); } - @ObfuscatedName("ay") - static void method1206(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { - field2035.vmethod1378(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); + @ObfuscatedName("aq") + static void method1255(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { + field2049.vmethod1378(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); } - @ObfuscatedName("aj") - static void method1207(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { - field2035.vmethod1362(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); + @ObfuscatedName("az") + static void method1256(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { + field2049.vmethod1362(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); } - @ObfuscatedName("av") - static void method1208(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, byte var12, byte var13, byte var14, byte var15) { - field2035.method1223(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15); + @ObfuscatedName("at") + static void method1257(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, byte var12, byte var13, byte var14, byte var15) { + field2049.method1269(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15); } - @ObfuscatedName("aw") - static void method1209(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, byte var10, byte var11, byte var12, byte var13) { - field2035.method1224(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); + @ObfuscatedName("af") + static void method1258(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, byte var10, byte var11, byte var12, byte var13) { + field2049.method1270(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); } } \ No newline at end of file diff --git a/osrs/src/main/java/RawPcmStream.java b/osrs/src/main/java/RawPcmStream.java index 0095ecb4b..95a6f1b20 100644 --- a/osrs/src/main/java/RawPcmStream.java +++ b/osrs/src/main/java/RawPcmStream.java @@ -3,108 +3,108 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bn") +@ObfuscatedName("bx") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("au") - int field245; - @ObfuscatedName("ae") + @ObfuscatedName("ac") + int field233; + @ObfuscatedName("al") + int field236; + @ObfuscatedName("ak") int field235; + @ObfuscatedName("ax") + int field243; @ObfuscatedName("ao") - int field240; - @ObfuscatedName("at") - int field244; - @ObfuscatedName("ac") + int field238; + @ObfuscatedName("ah") int field234; - @ObfuscatedName("ai") - int field237; - @ObfuscatedName("az") - int field246; - @ObfuscatedName("ap") + @ObfuscatedName("ar") + int field240; + @ObfuscatedName("ab") @Export("numLoops") int numLoops; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("start") int start; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("end") int end; - @ObfuscatedName("ad") - boolean field232; - @ObfuscatedName("aq") - int field242; - @ObfuscatedName("al") - int field238; - @ObfuscatedName("an") + @ObfuscatedName("ag") + boolean field230; + @ObfuscatedName("aa") + int field231; + @ObfuscatedName("ap") int field239; - @ObfuscatedName("ar") - int field243; + @ObfuscatedName("ay") + int field244; + @ObfuscatedName("as") + int field241; @ObfuscatedSignature( - descriptor = "(Lbu;III)V" + descriptor = "(Lbs;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field232 = var1.field167; - this.field235 = var2; - this.field240 = var3; - this.field244 = var4; - this.field245 = 0; - this.method236(); + this.field230 = var1.field166; + this.field236 = var2; + this.field235 = var3; + this.field243 = var4; + this.field233 = 0; + this.method245(); } @ObfuscatedSignature( - descriptor = "(Lbu;II)V" + descriptor = "(Lbs;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field232 = var1.field167; - this.field235 = var2; - this.field240 = var3; - this.field244 = 8192; - this.field245 = 0; - this.method236(); + this.field230 = var1.field166; + this.field236 = var2; + this.field235 = var3; + this.field243 = 8192; + this.field233 = 0; + this.method245(); } - @ObfuscatedName("ac") - void method236() { - this.field234 = this.field240; - this.field237 = method231(this.field240, this.field244); - this.field246 = method232(this.field240, this.field244); + @ObfuscatedName("ao") + void method245() { + this.field238 = this.field235; + this.field234 = method240(this.field235, this.field243); + this.field240 = method241(this.field235, this.field243); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "()Lbw;" + descriptor = "()Lbi;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "()Lbw;" + descriptor = "()Lbi;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("vmethod5648") protected int vmethod5648() { - return this.field240 == 0 && this.field242 == 0 ? 0 : 1; + return this.field235 == 0 && this.field231 == 0 ? 0 : 1; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field240 == 0 && this.field242 == 0) { + if (this.field235 == 0 && this.field231 == 0) { this.skip(var3); } else { RawSound var4 = (RawSound)super.sound; @@ -118,163 +118,163 @@ public synchronized void fill(int[] var1, int var2, int var3) { int var9 = var2; var3 += var2; - if (this.field245 < 0) { - if (this.field235 <= 0) { - this.method245(); + if (this.field233 < 0) { + if (this.field236 <= 0) { + this.method254(); this.remove(); return; } - this.field245 = 0; + this.field233 = 0; } - if (this.field245 >= var7) { - if (this.field235 >= 0) { - this.method245(); + if (this.field233 >= var7) { + if (this.field236 >= 0) { + this.method254(); this.remove(); return; } - this.field245 = var7 - 1; + this.field233 = var7 - 1; } if (this.numLoops < 0) { - if (this.field232) { - if (this.field235 < 0) { - var9 = this.method259(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field245 >= var5) { + if (this.field230) { + if (this.field236 < 0) { + var9 = this.method268(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field233 >= var5) { return; } - this.field245 = var5 + var5 - 1 - this.field245; - this.field235 = -this.field235; + this.field233 = var5 + var5 - 1 - this.field233; + this.field236 = -this.field236; } while (true) { - var9 = this.method258(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field245 < var6) { + var9 = this.method267(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field233 < var6) { return; } - this.field245 = var6 + var6 - 1 - this.field245; - this.field235 = -this.field235; - var9 = this.method259(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field245 >= var5) { + this.field233 = var6 + var6 - 1 - this.field233; + this.field236 = -this.field236; + var9 = this.method268(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field233 >= var5) { return; } - this.field245 = var5 + var5 - 1 - this.field245; - this.field235 = -this.field235; + this.field233 = var5 + var5 - 1 - this.field233; + this.field236 = -this.field236; } - } else if (this.field235 < 0) { + } else if (this.field236 < 0) { while (true) { - var9 = this.method259(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field245 >= var5) { + var9 = this.method268(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field233 >= var5) { return; } - this.field245 = var6 - 1 - (var6 - 1 - this.field245) % var8; + this.field233 = var6 - 1 - (var6 - 1 - this.field233) % var8; } } else { while (true) { - var9 = this.method258(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field245 < var6) { + var9 = this.method267(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field233 < var6) { return; } - this.field245 = var5 + (this.field245 - var5) % var8; + this.field233 = var5 + (this.field233 - var5) % var8; } } } else { if (this.numLoops > 0) { - if (this.field232) { + if (this.field230) { label133: { - if (this.field235 < 0) { - var9 = this.method259(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field245 >= var5) { + if (this.field236 < 0) { + var9 = this.method268(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field233 >= var5) { return; } - this.field245 = var5 + var5 - 1 - this.field245; - this.field235 = -this.field235; + this.field233 = var5 + var5 - 1 - this.field233; + this.field236 = -this.field236; if (--this.numLoops == 0) { break label133; } } do { - var9 = this.method258(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field245 < var6) { + var9 = this.method267(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field233 < var6) { return; } - this.field245 = var6 + var6 - 1 - this.field245; - this.field235 = -this.field235; + this.field233 = var6 + var6 - 1 - this.field233; + this.field236 = -this.field236; if (--this.numLoops == 0) { break; } - var9 = this.method259(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field245 >= var5) { + var9 = this.method268(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field233 >= var5) { return; } - this.field245 = var5 + var5 - 1 - this.field245; - this.field235 = -this.field235; + this.field233 = var5 + var5 - 1 - this.field233; + this.field236 = -this.field236; } while(--this.numLoops != 0); } } else { int var10; - if (this.field235 < 0) { + if (this.field236 < 0) { while (true) { - var9 = this.method259(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field245 >= var5) { + var9 = this.method268(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field233 >= var5) { return; } - var10 = (var6 - 1 - this.field245) / var8; + var10 = (var6 - 1 - this.field233) / var8; if (var10 >= this.numLoops) { - this.field245 += var8 * this.numLoops; + this.field233 += var8 * this.numLoops; this.numLoops = 0; break; } - this.field245 += var8 * var10; + this.field233 += var8 * var10; this.numLoops -= var10; } } else { while (true) { - var9 = this.method258(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field245 < var6) { + var9 = this.method267(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field233 < var6) { return; } - var10 = (this.field245 - var5) / var8; + var10 = (this.field233 - var5) / var8; if (var10 >= this.numLoops) { - this.field245 -= var8 * this.numLoops; + this.field233 -= var8 * this.numLoops; this.numLoops = 0; break; } - this.field245 -= var8 * var10; + this.field233 -= var8 * var10; this.numLoops -= var10; } } } } - if (this.field235 < 0) { - this.method259(var1, var9, 0, var3, 0); - if (this.field245 < 0) { - this.field245 = -1; - this.method245(); + if (this.field236 < 0) { + this.method268(var1, var9, 0, var3, 0); + if (this.field233 < 0) { + this.field233 = -1; + this.method254(); this.remove(); } } else { - this.method258(var1, var9, var7, var3, 0); - if (this.field245 >= var7) { - this.field245 = var7; - this.method245(); + this.method267(var1, var9, var7, var3, 0); + if (this.field233 >= var7) { + this.field233 = var7; + this.method254(); this.remove(); } } @@ -283,33 +283,33 @@ public synchronized void fill(int[] var1, int var2, int var3) { } } - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("skip") public synchronized void skip(int var1) { - if (this.field242 > 0) { - if (var1 >= this.field242) { - if (this.field240 == Integer.MIN_VALUE) { + if (this.field231 > 0) { + if (var1 >= this.field231) { + if (this.field235 == Integer.MIN_VALUE) { + this.field235 = 0; this.field240 = 0; - this.field246 = 0; - this.field237 = 0; this.field234 = 0; + this.field238 = 0; this.remove(); - var1 = this.field242; + var1 = this.field231; } - this.field242 = 0; - this.method236(); + this.field231 = 0; + this.method245(); } else { - this.field234 += this.field238 * var1; - this.field237 += this.field239 * var1; - this.field246 += this.field243 * var1; - this.field242 -= var1; + this.field238 += this.field239 * var1; + this.field234 += this.field244 * var1; + this.field240 += this.field241 * var1; + this.field231 -= var1; } } @@ -322,130 +322,130 @@ public synchronized void skip(int var1) { this.numLoops = 0; } - if (this.field245 < 0) { - if (this.field235 <= 0) { - this.method245(); + if (this.field233 < 0) { + if (this.field236 <= 0) { + this.method254(); this.remove(); return; } - this.field245 = 0; + this.field233 = 0; } - if (this.field245 >= var5) { - if (this.field235 >= 0) { - this.method245(); + if (this.field233 >= var5) { + if (this.field236 >= 0) { + this.method254(); this.remove(); return; } - this.field245 = var5 - 1; + this.field233 = var5 - 1; } - this.field245 += this.field235 * var1; + this.field233 += this.field236 * var1; if (this.numLoops < 0) { - if (!this.field232) { - if (this.field235 < 0) { - if (this.field245 >= var3) { + if (!this.field230) { + if (this.field236 < 0) { + if (this.field233 >= var3) { return; } - this.field245 = var4 - 1 - (var4 - 1 - this.field245) % var6; + this.field233 = var4 - 1 - (var4 - 1 - this.field233) % var6; } else { - if (this.field245 < var4) { + if (this.field233 < var4) { return; } - this.field245 = var3 + (this.field245 - var3) % var6; + this.field233 = var3 + (this.field233 - var3) % var6; } } else { - if (this.field235 < 0) { - if (this.field245 >= var3) { + if (this.field236 < 0) { + if (this.field233 >= var3) { return; } - this.field245 = var3 + var3 - 1 - this.field245; - this.field235 = -this.field235; + this.field233 = var3 + var3 - 1 - this.field233; + this.field236 = -this.field236; } - while (this.field245 >= var4) { - this.field245 = var4 + var4 - 1 - this.field245; - this.field235 = -this.field235; - if (this.field245 >= var3) { + while (this.field233 >= var4) { + this.field233 = var4 + var4 - 1 - this.field233; + this.field236 = -this.field236; + if (this.field233 >= var3) { return; } - this.field245 = var3 + var3 - 1 - this.field245; - this.field235 = -this.field235; + this.field233 = var3 + var3 - 1 - this.field233; + this.field236 = -this.field236; } } } else { if (this.numLoops > 0) { - if (this.field232) { + if (this.field230) { label121: { - if (this.field235 < 0) { - if (this.field245 >= var3) { + if (this.field236 < 0) { + if (this.field233 >= var3) { return; } - this.field245 = var3 + var3 - 1 - this.field245; - this.field235 = -this.field235; + this.field233 = var3 + var3 - 1 - this.field233; + this.field236 = -this.field236; if (--this.numLoops == 0) { break label121; } } do { - if (this.field245 < var4) { + if (this.field233 < var4) { return; } - this.field245 = var4 + var4 - 1 - this.field245; - this.field235 = -this.field235; + this.field233 = var4 + var4 - 1 - this.field233; + this.field236 = -this.field236; if (--this.numLoops == 0) { break; } - if (this.field245 >= var3) { + if (this.field233 >= var3) { return; } - this.field245 = var3 + var3 - 1 - this.field245; - this.field235 = -this.field235; + this.field233 = var3 + var3 - 1 - this.field233; + this.field236 = -this.field236; } while(--this.numLoops != 0); } } else { label153: { int var7; - if (this.field235 < 0) { - if (this.field245 >= var3) { + if (this.field236 < 0) { + if (this.field233 >= var3) { return; } - var7 = (var4 - 1 - this.field245) / var6; + var7 = (var4 - 1 - this.field233) / var6; if (var7 >= this.numLoops) { - this.field245 += var6 * this.numLoops; + this.field233 += var6 * this.numLoops; this.numLoops = 0; break label153; } - this.field245 += var6 * var7; + this.field233 += var6 * var7; this.numLoops -= var7; } else { - if (this.field245 < var4) { + if (this.field233 < var4) { return; } - var7 = (this.field245 - var3) / var6; + var7 = (this.field233 - var3) / var6; if (var7 >= this.numLoops) { - this.field245 -= var6 * this.numLoops; + this.field233 -= var6 * this.numLoops; this.numLoops = 0; break label153; } - this.field245 -= var6 * var7; + this.field233 -= var6 * var7; this.numLoops -= var7; } @@ -454,51 +454,51 @@ public synchronized void skip(int var1) { } } - if (this.field235 < 0) { - if (this.field245 < 0) { - this.field245 = -1; - this.method245(); + if (this.field236 < 0) { + if (this.field233 < 0) { + this.field233 = -1; + this.method254(); this.remove(); } - } else if (this.field245 >= var5) { - this.field245 = var5; - this.method245(); + } else if (this.field233 >= var5) { + this.field233 = var5; + this.method254(); this.remove(); } } } - @ObfuscatedName("aq") - public synchronized void method238(int var1) { - this.method240(var1 << 6, this.method242()); + @ObfuscatedName("aa") + public synchronized void method247(int var1) { + this.method249(var1 << 6, this.method251()); } - @ObfuscatedName("al") - synchronized void method239(int var1) { - this.method240(var1, this.method242()); + @ObfuscatedName("ap") + synchronized void method248(int var1) { + this.method249(var1, this.method251()); } - @ObfuscatedName("an") - synchronized void method240(int var1, int var2) { - this.field240 = var1; - this.field244 = var2; - this.field242 = 0; - this.method236(); + @ObfuscatedName("ay") + synchronized void method249(int var1, int var2) { + this.field235 = var1; + this.field243 = var2; + this.field231 = 0; + this.method245(); } - @ObfuscatedName("ar") - public synchronized int method241() { - return this.field240 == Integer.MIN_VALUE ? 0 : this.field240; + @ObfuscatedName("as") + public synchronized int method250() { + return this.field235 == Integer.MIN_VALUE ? 0 : this.field235; } - @ObfuscatedName("ab") - public synchronized int method242() { - return this.field244 < 0 ? -1 : this.field244; + @ObfuscatedName("aj") + public synchronized int method251() { + return this.field243 < 0 ? -1 : this.field243; } - @ObfuscatedName("ag") - public synchronized void method243(int var1) { + @ObfuscatedName("an") + public synchronized void method252(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if (var1 < -1) { var1 = -1; @@ -508,254 +508,268 @@ public synchronized void method243(int var1) { var1 = var2; } - this.field245 = var1; + this.field233 = var1; } - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method244() { - this.field235 = (this.field235 ^ this.field235 >> 31) + (this.field235 >>> 31); - this.field235 = -this.field235; + public synchronized void method253() { + this.field236 = (this.field236 ^ this.field236 >> 31) + (this.field236 >>> 31); + this.field236 = -this.field236; } - @ObfuscatedName("ax") - void method245() { - if (this.field242 != 0) { - if (this.field240 == Integer.MIN_VALUE) { - this.field240 = 0; + @ObfuscatedName("ai") + void method254() { + if (this.field231 != 0) { + if (this.field235 == Integer.MIN_VALUE) { + this.field235 = 0; } - this.field242 = 0; - this.method236(); + this.field231 = 0; + this.method245(); } } - @ObfuscatedName("ah") - public synchronized void method246(int var1, int var2) { - this.method247(var1, var2, this.method242()); + @ObfuscatedName("ae") + public synchronized void method255(int var1, int var2) { + this.method256(var1, var2, this.method251()); } - @ObfuscatedName("as") - public synchronized void method247(int var1, int var2, int var3) { + @ObfuscatedName("aw") + public synchronized void method256(int var1, int var2, int var3) { if (var1 == 0) { - this.method240(var2, var3); + this.method249(var2, var3); } else { - int var4 = method231(var2, var3); - int var5 = method232(var2, var3); - if (var4 == this.field237 && var5 == this.field246) { - this.field242 = 0; + int var4 = method240(var2, var3); + int var5 = method241(var2, var3); + if (var4 == this.field234 && var5 == this.field240) { + this.field231 = 0; } else { - int var6 = var2 - this.field234; - if (this.field234 - var2 > var6) { - var6 = this.field234 - var2; + int var6 = var2 - this.field238; + if (this.field238 - var2 > var6) { + var6 = this.field238 - var2; } - if (var4 - this.field237 > var6) { - var6 = var4 - this.field237; + if (var4 - this.field234 > var6) { + var6 = var4 - this.field234; } - if (this.field237 - var4 > var6) { - var6 = this.field237 - var4; + if (this.field234 - var4 > var6) { + var6 = this.field234 - var4; } - if (var5 - this.field246 > var6) { - var6 = var5 - this.field246; + if (var5 - this.field240 > var6) { + var6 = var5 - this.field240; } - if (this.field246 - var5 > var6) { - var6 = this.field246 - var5; + if (this.field240 - var5 > var6) { + var6 = this.field240 - var5; } if (var1 > var6) { var1 = var6; } - this.field242 = var1; - this.field240 = var2; - this.field244 = var3; - this.field238 = (var2 - this.field234) / var1; - this.field239 = (var4 - this.field237) / var1; - this.field243 = (var5 - this.field246) / var1; + this.field231 = var1; + this.field235 = var2; + this.field243 = var3; + this.field239 = (var2 - this.field238) / var1; + this.field244 = (var4 - this.field234) / var1; + this.field241 = (var5 - this.field240) / var1; } } } - @ObfuscatedName("ay") - public synchronized void method248(int var1) { + @ObfuscatedName("aq") + public synchronized void method257(int var1) { if (var1 == 0) { - this.method239(0); + this.method248(0); this.remove(); - } else if (this.field237 == 0 && this.field246 == 0) { - this.field242 = 0; - this.field240 = 0; - this.field234 = 0; + } else if (this.field234 == 0 && this.field240 == 0) { + this.field231 = 0; + this.field235 = 0; + this.field238 = 0; this.remove(); } else { - int var2 = -this.field234; - if (this.field234 > var2) { - var2 = this.field234; + int var2 = -this.field238; + if (this.field238 > var2) { + var2 = this.field238; } - if (-this.field237 > var2) { - var2 = -this.field237; + if (-this.field234 > var2) { + var2 = -this.field234; } - if (this.field237 > var2) { - var2 = this.field237; + if (this.field234 > var2) { + var2 = this.field234; } - if (-this.field246 > var2) { - var2 = -this.field246; + if (-this.field240 > var2) { + var2 = -this.field240; } - if (this.field246 > var2) { - var2 = this.field246; + if (this.field240 > var2) { + var2 = this.field240; } if (var1 > var2) { var1 = var2; } - this.field242 = var1; - this.field240 = Integer.MIN_VALUE; - this.field238 = -this.field234 / var1; - this.field239 = -this.field237 / var1; - this.field243 = -this.field246 / var1; + this.field231 = var1; + this.field235 = Integer.MIN_VALUE; + this.field239 = -this.field238 / var1; + this.field244 = -this.field234 / var1; + this.field241 = -this.field240 / var1; } } - @ObfuscatedName("aj") - public synchronized void method249(int var1) { - if (this.field235 < 0) { - this.field235 = -var1; + @ObfuscatedName("bb") + public synchronized void method258(int var1) { + if (this.field236 < 0) { + this.field236 = -var1; } else { - this.field235 = var1; + this.field236 = var1; } } - @ObfuscatedName("av") - public synchronized int method250() { - return this.field235 < 0 ? -this.field235 : this.field235; + @ObfuscatedName("bo") + public synchronized int method259() { + return this.field236 < 0 ? -this.field236 : this.field236; } - @ObfuscatedName("aw") - public boolean method251() { - return this.field245 < 0 || this.field245 >= ((RawSound)super.sound).samples.length << 8; + @ObfuscatedName("bp") + public boolean method260() { + return this.field233 < 0 || this.field233 >= ((RawSound)super.sound).samples.length << 8; } - @ObfuscatedName("ak") - public boolean method252() { - return this.field242 != 0; + @ObfuscatedName("bm") + public boolean method261() { + return this.field231 != 0; } - @ObfuscatedName("bh") - int method258(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("br") + int method267(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field242 > 0) { - int var6 = var2 + this.field242; + if (this.field231 > 0) { + int var6 = var2 + this.field231; if (var6 > var4) { var6 = var4; } - this.field242 += var2; - if (this.field235 == 256 && (this.field245 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method270(0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, this.field239, this.field243, 0, var6, var3, this); + this.field231 += var2; + if (this.field236 == 256 && (this.field233 & 255) == 0) { + if (class306.PcmPlayer_stereo) { + var2 = method279(0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, this.field244, this.field241, 0, var6, var3, this); } else { - var2 = method269(((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, this.field238, 0, var6, var3, this); + var2 = method278(((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, this.field239, 0, var6, var3, this); } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method274(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, this.field239, this.field243, 0, var6, var3, this, this.field235, var5); + } else if (class306.PcmPlayer_stereo) { + var2 = method283(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, this.field244, this.field241, 0, var6, var3, this, this.field236, var5); } else { - var2 = method273(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, this.field238, 0, var6, var3, this, this.field235, var5); + var2 = method282(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, this.field239, 0, var6, var3, this, this.field236, var5); } - this.field242 -= var2; - if (this.field242 != 0) { + this.field231 -= var2; + if (this.field231 != 0) { return var2; } - if (!this.method260()) { + if (!this.method269()) { continue; } return var4; } - if (this.field235 == 256 && (this.field245 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method262(0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, 0, var4, var3, this); + if (this.field236 == 256 && (this.field233 & 255) == 0) { + if (class306.PcmPlayer_stereo) { + return method271(0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, 0, var4, var3, this); } - return method261(((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, 0, var4, var3, this); + return method270(((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, 0, var4, var3, this); } - if (PcmPlayer.PcmPlayer_stereo) { - return method266(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, 0, var4, var3, this, this.field235, var5); + if (class306.PcmPlayer_stereo) { + return method275(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, 0, var4, var3, this, this.field236, var5); } - return method265(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, 0, var4, var3, this, this.field235, var5); + return method274(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, 0, var4, var3, this, this.field236, var5); } } - @ObfuscatedName("bm") - int method259(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("bs") + @Export("vmethod1019") + int vmethod1019() { + int var1 = this.field238 * 3 >> 6; + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); + if (this.numLoops == 0) { + var1 -= var1 * this.field233 / (((RawSound)super.sound).samples.length << 8); + } else if (this.numLoops >= 0) { + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; + } + + return var1 > 255 ? 255 : var1; + } + + @ObfuscatedName("bc") + int method268(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field242 > 0) { - int var6 = var2 + this.field242; + if (this.field231 > 0) { + int var6 = var2 + this.field231; if (var6 > var4) { var6 = var4; } - this.field242 += var2; - if (this.field235 == -256 && (this.field245 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method272(0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, this.field239, this.field243, 0, var6, var3, this); + this.field231 += var2; + if (this.field236 == -256 && (this.field233 & 255) == 0) { + if (class306.PcmPlayer_stereo) { + var2 = method281(0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, this.field244, this.field241, 0, var6, var3, this); } else { - var2 = method271(((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, this.field238, 0, var6, var3, this); + var2 = method280(((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, this.field239, 0, var6, var3, this); } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method276(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, this.field239, this.field243, 0, var6, var3, this, this.field235, var5); + } else if (class306.PcmPlayer_stereo) { + var2 = method285(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, this.field244, this.field241, 0, var6, var3, this, this.field236, var5); } else { - var2 = method275(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, this.field238, 0, var6, var3, this, this.field235, var5); + var2 = method284(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, this.field239, 0, var6, var3, this, this.field236, var5); } - this.field242 -= var2; - if (this.field242 != 0) { + this.field231 -= var2; + if (this.field231 != 0) { return var2; } - if (!this.method260()) { + if (!this.method269()) { continue; } return var4; } - if (this.field235 == -256 && (this.field245 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method264(0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, 0, var4, var3, this); + if (this.field236 == -256 && (this.field233 & 255) == 0) { + if (class306.PcmPlayer_stereo) { + return method273(0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, 0, var4, var3, this); } - return method263(((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, 0, var4, var3, this); + return method272(((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, 0, var4, var3, this); } - if (PcmPlayer.PcmPlayer_stereo) { - return method268(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field237, this.field246, 0, var4, var3, this, this.field235, var5); + if (class306.PcmPlayer_stereo) { + return method277(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, 0, var4, var3, this, this.field236, var5); } - return method267(0, 0, ((RawSound)super.sound).samples, var1, this.field245, var2, this.field234, 0, var4, var3, this, this.field235, var5); + return method276(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, 0, var4, var3, this, this.field236, var5); } } - @ObfuscatedName("bf") - boolean method260() { - int var1 = this.field240; + @ObfuscatedName("bu") + boolean method269() { + int var1 = this.field235; int var2; int var3; if (var1 == Integer.MIN_VALUE) { @@ -763,111 +777,97 @@ boolean method260() { var2 = 0; var1 = 0; } else { - var2 = method231(var1, this.field244); - var3 = method232(var1, this.field244); + var2 = method240(var1, this.field243); + var3 = method241(var1, this.field243); } - if (var1 == this.field234 && var2 == this.field237 && var3 == this.field246) { - if (this.field240 == Integer.MIN_VALUE) { + if (var1 == this.field238 && var2 == this.field234 && var3 == this.field240) { + if (this.field235 == Integer.MIN_VALUE) { + this.field235 = 0; this.field240 = 0; - this.field246 = 0; - this.field237 = 0; this.field234 = 0; + this.field238 = 0; this.remove(); return true; } else { - this.method236(); + this.method245(); return false; } } else { - if (this.field234 < var1) { - this.field238 = 1; - this.field242 = var1 - this.field234; - } else if (this.field234 > var1) { - this.field238 = -1; - this.field242 = this.field234 - var1; + if (this.field238 < var1) { + this.field239 = 1; + this.field231 = var1 - this.field238; + } else if (this.field238 > var1) { + this.field239 = -1; + this.field231 = this.field238 - var1; } else { - this.field238 = 0; + this.field239 = 0; } - if (this.field237 < var2) { - this.field239 = 1; - if (this.field242 == 0 || this.field242 > var2 - this.field237) { - this.field242 = var2 - this.field237; + if (this.field234 < var2) { + this.field244 = 1; + if (this.field231 == 0 || this.field231 > var2 - this.field234) { + this.field231 = var2 - this.field234; } - } else if (this.field237 > var2) { - this.field239 = -1; - if (this.field242 == 0 || this.field242 > this.field237 - var2) { - this.field242 = this.field237 - var2; + } else if (this.field234 > var2) { + this.field244 = -1; + if (this.field231 == 0 || this.field231 > this.field234 - var2) { + this.field231 = this.field234 - var2; } } else { - this.field239 = 0; + this.field244 = 0; } - if (this.field246 < var3) { - this.field243 = 1; - if (this.field242 == 0 || this.field242 > var3 - this.field246) { - this.field242 = var3 - this.field246; + if (this.field240 < var3) { + this.field241 = 1; + if (this.field231 == 0 || this.field231 > var3 - this.field240) { + this.field231 = var3 - this.field240; } - } else if (this.field246 > var3) { - this.field243 = -1; - if (this.field242 == 0 || this.field242 > this.field246 - var3) { - this.field242 = this.field246 - var3; + } else if (this.field240 > var3) { + this.field241 = -1; + if (this.field231 == 0 || this.field231 > this.field240 - var3) { + this.field231 = this.field240 - var3; } } else { - this.field243 = 0; + this.field241 = 0; } return false; } } - @ObfuscatedName("br") - @Export("vmethod1019") - int vmethod1019() { - int var1 = this.field234 * 3 >> 6; - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); - if (this.numLoops == 0) { - var1 -= var1 * this.field245 / (((RawSound)super.sound).samples.length << 8); - } else if (this.numLoops >= 0) { - var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; - } - - return var1 > 255 ? 255 : var1; - } - - @ObfuscatedName("au") - static int method231(int var0, int var1) { + @ObfuscatedName("ac") + static int method240(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("ae") - static int method232(int var0, int var1) { + @ObfuscatedName("al") + static int method241(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lbu;II)Lbn;" + descriptor = "(Lbs;II)Lbx;" ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field181 * 100)), var2 << 6) : null; + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field179 * 100)), var2 << 6) : null; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lbu;III)Lbn;" + descriptor = "(Lbs;III)Lbx;" ) - public static RawPcmStream method235(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method244(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } - @ObfuscatedName("bq") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILbn;)I" + descriptor = "([B[IIIIIIILbx;)I" ) - static int method261(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method270(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -890,15 +890,15 @@ static int method261(byte[] var0, int[] var1, int var2, int var3, int var4, int var10001 = var3++; } - var8.field245 = var2 << 8; + var8.field233 = var2 << 8; return var3; } - @ObfuscatedName("ba") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILbn;)I" + descriptor = "(I[B[IIIIIIIILbx;)I" ) - static int method262(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method271(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -941,15 +941,15 @@ static int method262(int var0, byte[] var1, int[] var2, int var3, int var4, int var10001 = var4++; } - var10.field245 = var3 << 8; + var10.field233 = var3 << 8; return var4 >> 1; } @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILbn;)I" + descriptor = "([B[IIIIIIILbx;)I" ) - static int method263(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method272(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -972,15 +972,15 @@ static int method263(byte[] var0, int[] var1, int var2, int var3, int var4, int var10001 = var3++; } - var8.field245 = var2 << 8; + var8.field233 = var2 << 8; return var3; } - @ObfuscatedName("be") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILbn;)I" + descriptor = "(I[B[IIIIIIIILbx;)I" ) - static int method264(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method273(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -1023,15 +1023,15 @@ static int method264(int var0, byte[] var1, int[] var2, int var3, int var4, int var10001 = var4++; } - var10.field245 = var3 << 8; + var10.field233 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILbn;II)I" + descriptor = "(II[B[IIIIIIILbx;II)I" ) - static int method265(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method274(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { var7 = var8; } @@ -1056,15 +1056,15 @@ static int method265(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field245 = var4; + var10.field233 = var4; return var5; } - @ObfuscatedName("bz") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbn;II)I" + descriptor = "(II[B[IIIIIIIILbx;II)I" ) - static int method266(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method275(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1098,15 +1098,15 @@ static int method266(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += var0 * var7 >> 6; } - var11.field245 = var4; + var11.field233 = var4; return var5 >> 1; } - @ObfuscatedName("bx") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILbn;II)I" + descriptor = "(II[B[IIIIIIILbx;II)I" ) - static int method267(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method276(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { var7 = var8; } @@ -1131,15 +1131,15 @@ static int method267(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field245 = var4; + var10.field233 = var4; return var5; } - @ObfuscatedName("bn") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbn;II)I" + descriptor = "(II[B[IIIIIIIILbx;II)I" ) - static int method268(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method277(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1171,15 +1171,15 @@ static int method268(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += var0 * var7 >> 6; } - var11.field245 = var4; + var11.field233 = var4; return var5 >> 1; } @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILbn;)I" + descriptor = "([B[IIIIIIIILbx;)I" ) - static int method269(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method278(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1188,8 +1188,8 @@ static int method269(byte[] var0, int[] var1, int var2, int var3, int var4, int var6 = var7; } - var9.field237 += var9.field239 * (var6 - var3); - var9.field246 += var9.field243 * (var6 - var3); + var9.field234 += var9.field244 * (var6 - var3); + var9.field240 += var9.field241 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1211,16 +1211,16 @@ static int method269(byte[] var0, int[] var1, int var2, int var3, int var4, int var1[var10001] += var0[var2++] * var4; } - var9.field234 = var4 >> 2; - var9.field245 = var2 << 8; + var9.field238 = var4 >> 2; + var9.field233 = var2 << 8; return var3; } - @ObfuscatedName("bc") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILbn;)I" + descriptor = "(I[B[IIIIIIIIIILbx;)I" ) - static int method270(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method279(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1231,7 +1231,7 @@ static int method270(int var0, byte[] var1, int[] var2, int var3, int var4, int var9 = var10; } - var12.field234 += var12.field238 * (var9 - var4); + var12.field238 += var12.field239 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1276,17 +1276,17 @@ static int method270(int var0, byte[] var1, int[] var2, int var3, int var4, int var2[var10001] += var13 * var6; } - var12.field237 = var5 >> 2; - var12.field246 = var6 >> 2; - var12.field245 = var3 << 8; + var12.field234 = var5 >> 2; + var12.field240 = var6 >> 2; + var12.field233 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bg") + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILbn;)I" + descriptor = "([B[IIIIIIIILbx;)I" ) - static int method271(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method280(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1295,8 +1295,8 @@ static int method271(byte[] var0, int[] var1, int var2, int var3, int var4, int var6 = var7; } - var9.field237 += var9.field239 * (var6 - var3); - var9.field246 += var9.field243 * (var6 - var3); + var9.field234 += var9.field244 * (var6 - var3); + var9.field240 += var9.field241 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1318,16 +1318,16 @@ static int method271(byte[] var0, int[] var1, int var2, int var3, int var4, int var1[var10001] += var0[var2--] * var4; } - var9.field234 = var4 >> 2; - var9.field245 = var2 << 8; + var9.field238 = var4 >> 2; + var9.field233 = var2 << 8; return var3; } @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILbn;)I" + descriptor = "(I[B[IIIIIIIIIILbx;)I" ) - static int method272(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method281(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1338,7 +1338,7 @@ static int method272(int var0, byte[] var1, int[] var2, int var3, int var4, int var9 = var10; } - var12.field234 += var12.field238 * (var9 - var4); + var12.field238 += var12.field239 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1383,19 +1383,19 @@ static int method272(int var0, byte[] var1, int[] var2, int var3, int var4, int var2[var10001] += var13 * var6; } - var12.field237 = var5 >> 2; - var12.field246 = var6 >> 2; - var12.field245 = var3 << 8; + var12.field234 = var5 >> 2; + var12.field240 = var6 >> 2; + var12.field233 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("cf") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbn;II)I" + descriptor = "(II[B[IIIIIIIILbx;II)I" ) - static int method273(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field237 -= var11.field239 * var5; - var11.field246 -= var11.field243 * var5; + static int method282(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field234 -= var11.field244 * var5; + var11.field240 -= var11.field241 * var5; if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1422,19 +1422,19 @@ static int method273(int var0, int var1, byte[] var2, int[] var3, int var4, int var6 += var7; } - var11.field237 += var11.field239 * var5; - var11.field246 += var11.field243 * var5; - var11.field234 = var6; - var11.field245 = var4; + var11.field234 += var11.field244 * var5; + var11.field240 += var11.field241 * var5; + var11.field238 = var6; + var11.field233 = var4; return var5; } - @ObfuscatedName("cm") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILbn;II)I" + descriptor = "(II[B[IIIIIIIIIILbx;II)I" ) - static int method274(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field234 -= var5 * var13.field238; + static int method283(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field238 -= var5 * var13.field239; if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } @@ -1473,20 +1473,20 @@ static int method274(int var0, int var1, byte[] var2, int[] var3, int var4, int } var5 >>= 1; - var13.field234 += var13.field238 * var5; - var13.field237 = var6; - var13.field246 = var7; - var13.field245 = var4; + var13.field238 += var13.field239 * var5; + var13.field234 = var6; + var13.field240 = var7; + var13.field233 = var4; return var5; } - @ObfuscatedName("cn") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbn;II)I" + descriptor = "(II[B[IIIIIIIILbx;II)I" ) - static int method275(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field237 -= var11.field239 * var5; - var11.field246 -= var11.field243 * var5; + static int method284(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field234 -= var11.field244 * var5; + var11.field240 -= var11.field241 * var5; if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1513,19 +1513,19 @@ static int method275(int var0, int var1, byte[] var2, int[] var3, int var4, int var6 += var7; } - var11.field237 += var11.field239 * var5; - var11.field246 += var11.field243 * var5; - var11.field234 = var6; - var11.field245 = var4; + var11.field234 += var11.field244 * var5; + var11.field240 += var11.field241 * var5; + var11.field238 = var6; + var11.field233 = var4; return var5; } - @ObfuscatedName("cs") + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILbn;II)I" + descriptor = "(II[B[IIIIIIIIIILbx;II)I" ) - static int method276(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field234 -= var5 * var13.field238; + static int method285(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field238 -= var5 * var13.field239; if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } @@ -1562,10 +1562,10 @@ static int method276(int var0, int var1, byte[] var2, int[] var3, int var4, int } var5 >>= 1; - var13.field234 += var13.field238 * var5; - var13.field237 = var6; - var13.field246 = var7; - var13.field245 = var4; + var13.field238 += var13.field239 * var5; + var13.field234 = var6; + var13.field240 = var7; + var13.field233 = var4; return var5; } } \ No newline at end of file diff --git a/osrs/src/main/java/RawSound.java b/osrs/src/main/java/RawSound.java index 9b6989313..477ec386d 100644 --- a/osrs/src/main/java/RawSound.java +++ b/osrs/src/main/java/RawSound.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("bs") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("samples") public byte[] samples; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("start") public int start; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("end") int end; - @ObfuscatedName("ac") - public boolean field167; + @ObfuscatedName("ao") + public boolean field166; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; this.start = var3; this.end = var4; - this.field167 = var5; + this.field166 = var5; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lcx;)Lbu;" + descriptor = "(Lcg;)Lbs;" ) @Export("resample") public RawSound resample(Decimator var1) { diff --git a/osrs/src/main/java/ReflectionCheck.java b/osrs/src/main/java/ReflectionCheck.java index 05347ae42..9789e1a8c 100644 --- a/osrs/src/main/java/ReflectionCheck.java +++ b/osrs/src/main/java/ReflectionCheck.java @@ -6,58 +6,395 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -@ObfuscatedName("ba") +@ObfuscatedName("bt") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("sh") - @ObfuscatedSignature( - descriptor = "Lqc;" - ) - @Export("friendsChat") - static FriendsChat friendsChat; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("id") int id; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("size") int size; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("operations") int[] operations; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("ac") - Field[] fields; - @ObfuscatedName("ai") + @ObfuscatedName("ao") + Field[] field156; + @ObfuscatedName("ah") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("methods") Method[] methods; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("arguments") byte[][][] arguments; ReflectionCheck() { } - @ObfuscatedName("bi") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(Lmi;II)V", - garbageValue = "-1454269975" + descriptor = "(ILds;ZI)I", + garbageValue = "215917133" ) - public static void method174(Widget var0, int var1) { - ItemComposition var2 = InvDefinition.ItemDefinition_get(var1); - var0.field3101.equipment[var2.maleModel] = var1 + 512; - if (var2.maleModel1 != -1) { - var0.field3101.equipment[var2.maleModel1] = 0; - } + static int method184(int var0, Script var1, boolean var2) { + if (var0 == 3600) { + if (InvDefinition.friendSystem.friendListStatus == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; + } else if (InvDefinition.friendSystem.friendListStatus == 1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.friendSystem.friendsList.getSize(); + } - if (var2.maleModel2 != -1) { - var0.field3101.equipment[var2.maleModel2] = 0; - } + return 1; + } else { + int var3; + if (var0 == 3601) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (InvDefinition.friendSystem.method400() && var3 >= 0 && var3 < InvDefinition.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)InvDefinition.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3602) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (InvDefinition.friendSystem.method400() && var3 >= 0 && var3 < InvDefinition.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)InvDefinition.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3603) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (InvDefinition.friendSystem.method400() && var3 >= 0 && var3 < InvDefinition.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)InvDefinition.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + String var5; + if (var0 == 3604) { + var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + int var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + class148.setFriendsRank(var5, var9); + return 1; + } else if (var0 == 3605) { + var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + InvDefinition.friendSystem.addFriend(var5); + return 1; + } else if (var0 == 3606) { + var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + InvDefinition.friendSystem.removeFriend(var5); + return 1; + } else if (var0 == 3607) { + var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + InvDefinition.friendSystem.addIgnore(var5); + return 1; + } else if (var0 == 3608) { + var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + boolean var6 = true; + InvDefinition.friendSystem.removeIgnore(var5, var6); + return 1; + } else if (var0 == 3609) { + var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var5 = InterfaceParent.method465(var5); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.friendSystem.isFriended(new Username(var5, class166.loginType), false) ? 1 : 0; + return 1; + } else if (var0 == 3611) { + if (class358.friendsChat != null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class358.friendsChat.name; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3612) { + if (class358.friendsChat != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class358.friendsChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3613) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (class358.friendsChat != null && var3 < class358.friendsChat.getSize()) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class358.friendsChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3614) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (class358.friendsChat != null && var3 < class358.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class358.friendsChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3615) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (class358.friendsChat != null && var3 < class358.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class358.friendsChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3616) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class358.friendsChat != null ? class358.friendsChat.minKick : 0; + return 1; + } else if (var0 == 3617) { + var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + class14.clanKickUser(var5); + return 1; + } else if (var0 == 3618) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class358.friendsChat != null ? class358.friendsChat.rank * -1160213393 * 2144490127 : 0; + return 1; + } else if (var0 == 3619) { + var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + class216.Clan_joinChat(var5); + return 1; + } else if (var0 == 3620) { + WorldMapSection0.Clan_leaveChat(); + return 1; + } else if (var0 == 3621) { + if (!InvDefinition.friendSystem.method400()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.friendSystem.ignoreList.getSize(); + } + + return 1; + } else if (var0 == 3622) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (InvDefinition.friendSystem.method400() && var3 >= 0 && var3 < InvDefinition.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)InvDefinition.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3623) { + var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var5 = InterfaceParent.method465(var5); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.friendSystem.isIgnored(new Username(var5, class166.loginType)) ? 1 : 0; + return 1; + } else if (var0 == 3624) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (class358.friendsChat != null && var3 < class358.friendsChat.getSize() && class358.friendsChat.get(var3).getUsername().equals(TextureProvider.localPlayer.username)) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } - var0.field3101.method1729(); + return 1; + } else if (var0 == 3625) { + if (class358.friendsChat != null && class358.friendsChat.owner != null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class358.friendsChat.owner; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3626) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (class358.friendsChat != null && var3 < class358.friendsChat.getSize() && ((ClanMate)class358.friendsChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 != 3627) { + if (var0 == 3628) { + InvDefinition.friendSystem.friendsList.removeComparator(); + return 1; + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } else if (var0 == 3639) { + InvDefinition.friendSystem.friendsList.sort(); + return 1; + } else if (var0 == 3640) { + InvDefinition.friendSystem.ignoreList.removeComparator(); + return 1; + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3643) { + InvDefinition.friendSystem.ignoreList.sort(); + return 1; + } else if (var0 == 3644) { + if (class358.friendsChat != null) { + class358.friendsChat.removeComparator(); + } + + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } else if (var0 == 3655) { + if (class358.friendsChat != null) { + class358.friendsChat.sort(); + } + + return 1; + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class358.friendsChat != null) { + class358.friendsChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (class358.friendsChat != null && var3 < class358.friendsChat.getSize() && ((ClanMate)class358.friendsChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/RefreshAccessTokenRequester.java b/osrs/src/main/java/RefreshAccessTokenRequester.java deleted file mode 100644 index 6c0f51bb8..000000000 --- a/osrs/src/main/java/RefreshAccessTokenRequester.java +++ /dev/null @@ -1,12 +0,0 @@ -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; - -import java.net.URL; -import java.util.Map; -import java.util.concurrent.Future; - -@Implements("com/jagex/oldscape/pub/RefreshAccessTokenRequester") -@ObfuscatedName("com/jagex/oldscape/pub/RefreshAccessTokenRequester") -public interface RefreshAccessTokenRequester { - Future request(String var1, URL var2, Map var3, String var4); -} \ No newline at end of file diff --git a/osrs/src/main/java/RefreshAccessTokenResponse.java b/osrs/src/main/java/RefreshAccessTokenResponse.java deleted file mode 100644 index 82833cb94..000000000 --- a/osrs/src/main/java/RefreshAccessTokenResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; - -@Implements("com/jagex/oldscape/pub/RefreshAccessTokenResponse") -@ObfuscatedName("com/jagex/oldscape/pub/RefreshAccessTokenResponse") -public interface RefreshAccessTokenResponse { - @Export("isSuccess") - @ObfuscatedName("isSuccess") - boolean isSuccess(); - - @Export("getAccessToken") - @ObfuscatedName("getAccessToken") - String getAccessToken(); - - @Export("getRefreshToken") - @ObfuscatedName("getRefreshToken") - String getRefreshToken(); -} \ No newline at end of file diff --git a/osrs/src/main/java/Renderable.java b/osrs/src/main/java/Renderable.java index 2cbfc8b55..9cd7ef7a6 100644 --- a/osrs/src/main/java/Renderable.java +++ b/osrs/src/main/java/Renderable.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("jy") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("eq") + @ObfuscatedName("eg") @Export("height") public int height; @@ -14,17 +14,17 @@ protected Renderable() { this.height = 1000; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljr;", - garbageValue = "798227647" + descriptor = "(B)Ljn;", + garbageValue = "0" ) @Export("getModel") protected Model getModel() { return null; } - @ObfuscatedName("db") + @ObfuscatedName("du") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); @@ -34,29 +34,4 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, } } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-109873503" - ) - public static void method1290() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); - } - - @ObfuscatedName("hc") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-597035474" - ) - static final void method1291() { - if (Client.logoutTimer > 0) { - ArchiveDisk.logOut(); - } else { - Client.timer.method2151(); - MusicSong.updateGameState(40); - AbstractSocket.field3819 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/RouteStrategy.java b/osrs/src/main/java/RouteStrategy.java index cdba866f6..a97dc3351 100644 --- a/osrs/src/main/java/RouteStrategy.java +++ b/osrs/src/main/java/RouteStrategy.java @@ -3,42 +3,60 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") +import java.util.Iterator; + +@ObfuscatedName("iq") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("approxDestinationSizeY") public int approxDestinationSizeY; protected RouteStrategy() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIILis;B)Z", - garbageValue = "85" + descriptor = "(IIILih;B)Z", + garbageValue = "0" ) @Export("hasArrived") protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("ja") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1131670989" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "517814479" ) - static void method1125() { - if (Client.field386) { - class92.addPlayerToScene(VarbitComposition.localPlayer, false); + static String method1170() { + StringBuilder var0 = new StringBuilder(); + + Message var2; + for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0.append(var2.text).append('\n')) { + var2 = (Message)var1.next(); + if (var2.sender != null && !var2.sender.isEmpty()) { + var0.append(var2.sender).append(':'); + } } + return var0.toString(); + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "972272925" + ) + static final void method1171() { + class436.method2211("You can't add yourself to your own ignore list"); } } \ No newline at end of file diff --git a/osrs/src/main/java/RunException.java b/osrs/src/main/java/RunException.java index 2d33c007c..f35db556e 100644 --- a/osrs/src/main/java/RunException.java +++ b/osrs/src/main/java/RunException.java @@ -2,33 +2,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import java.applet.Applet; - -@ObfuscatedName("uy") +@ObfuscatedName("ve") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("au") - @Export("RunException_applet") - public static Applet RunException_applet; - @ObfuscatedName("ae") - public static String field4289; - @ObfuscatedName("ao") + @ObfuscatedName("al") + public static String field4314; + @ObfuscatedName("ak") @Export("RunException_revision") public static int RunException_revision; - @ObfuscatedName("at") - public static int field4287; - @ObfuscatedName("ac") - public static int field4285; - @ObfuscatedName("jy") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("ai") - String field4291; - @ObfuscatedName("az") + @ObfuscatedName("ax") + public static int field4313; + @ObfuscatedName("ah") + String field4315; + @ObfuscatedName("ar") + @Export("parent") Throwable parent; RunException(Throwable var1, String var2) { - this.field4291 = var2; + this.field4315 = var2; this.parent = var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/RuneLiteMenuEntry.java b/osrs/src/main/java/RuneLiteMenuEntry.java index 8e475bd27..76d2fc9d6 100644 --- a/osrs/src/main/java/RuneLiteMenuEntry.java +++ b/osrs/src/main/java/RuneLiteMenuEntry.java @@ -443,31 +443,23 @@ public void setItemId(int itemId) { itemIdOverride = itemId; } @Override - public Widget getWidget() - { + public Widget getWidget() { int param1 = this.getParam1(); int param0 = this.getParam0(); - Widget widget = client.getWidget(param1); - - if (widget == null) - { + if (widget == null) { return null; } - - if (param0 != -1) - { + if (param0 != -1) { Widget child = widget.getChild(param0); - - if (child != null) - { + if (child != null) { return child; } } - return widget; } + @Override public NPC getNpc() { diff --git a/osrs/src/main/java/Scene.java b/osrs/src/main/java/Scene.java index 7f928e4b4..b76f74cb5 100644 --- a/osrs/src/main/java/Scene.java +++ b/osrs/src/main/java/Scene.java @@ -3,188 +3,188 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iv") +@ObfuscatedName("jt") @Implements("Scene") public class Scene { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("bh") + @ObfuscatedName("bn") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("bj") + @ObfuscatedName("bk") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("bt") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "[Ljy;" + descriptor = "[Lkl;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("by") + @ObfuscatedName("ba") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("bs") + @ObfuscatedName("bz") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("bm") + @ObfuscatedName("bb") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("bf") + @ObfuscatedName("bo") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("bq") + @ObfuscatedName("bp") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("ba") + @ObfuscatedName("bt") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("bu") + @ObfuscatedName("bs") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("bo") + @ObfuscatedName("bc") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "[[Ljn;" + descriptor = "[[Lje;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("br") + @ObfuscatedName("bf") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("be") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "[Ljn;" + descriptor = "[Lje;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("bi") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("bz") - static final int[] field2098; + @ObfuscatedName("bg") + static final int[] field2105; + @ObfuscatedName("bj") + static final int[] field2107; @ObfuscatedName("bx") - static final int[] field2097; - @ObfuscatedName("bn") - static final int[] field2095; + static final int[] field2110; + @ObfuscatedName("bi") + static final int[] field2106; + @ObfuscatedName("bq") + static final int[] field2108; @ObfuscatedName("bw") - static final int[] field2096; - @ObfuscatedName("bc") - static final int[] field2093; - @ObfuscatedName("bg") - static final int[] field2094; - @ObfuscatedName("cw") - static final int[] field2099; - @ObfuscatedName("cd") + static final int[] field2109; + @ObfuscatedName("ce") + static final int[] field2111; + @ObfuscatedName("cy") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("ce") + @ObfuscatedName("cz") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("cq") + @ObfuscatedName("cp") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("cp") + @ObfuscatedName("cb") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("cv") + @ObfuscatedName("cn") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("co") + @ObfuscatedName("ck") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("cl") + @ObfuscatedName("cr") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("cu") + @ObfuscatedName("cs") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("planes") int planes; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("xSize") int xSize; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("ySize") int ySize; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[[[Lii;" + descriptor = "[[[Ljh;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("minPlane") int minPlane; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "[Ljy;" + descriptor = "[Lkl;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("af") - int[][][] field2109; - @ObfuscatedName("cx") + @ObfuscatedName("av") + int[][][] field2120; + @ObfuscatedName("cg") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("cr") + @ObfuscatedName("cq") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; Scene_currentOccluders = new Occluder[500]; Scene_tilesDeque = new NodeDeque(); - field2098 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field2097 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field2095 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field2096 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field2093 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field2094 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field2099 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + field2105 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field2107 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field2110 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field2106 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field2108 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field2109 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field2111 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; visibilityMap = new boolean[8][32][51][51]; } @@ -226,12 +226,12 @@ public Scene(int var1, int var2, int var3, int[][][] var4) { this.xSize = var2; this.ySize = var3; this.tiles = new Tile[var1][var2][var3]; - this.field2109 = new int[var1][var2 + 1][var3 + 1]; + this.field2120 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public void clear() { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("init") public void init(int var1) { this.minPlane = var1; @@ -279,7 +279,7 @@ public void init(int var1) { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; @@ -291,9 +291,7 @@ public void setLinkBelow(int var1, int var2) { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { GameObject var7 = var5.gameObjects[var6]; - long var9 = var7.tag; - boolean var8 = class177.method918(var9) == 2; - if (var8 && var7.startX == var1 && var2 == var7.startY) { + if (SequenceDefinition.method1116(var7.tag) && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } } @@ -308,7 +306,7 @@ public void setLinkBelow(int var1, int var2) { this.tiles[3][var1][var2] = null; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; @@ -317,7 +315,7 @@ public void setTileMinPlane(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { SceneTilePaint var21; @@ -355,9 +353,9 @@ public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIIILik;JI)V" + descriptor = "(IIIILjy;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { @@ -377,9 +375,9 @@ public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderabl } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIIILik;JLik;Lik;)V" + descriptor = "(IIIILjy;JLjy;Ljy;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) { @@ -413,9 +411,9 @@ public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable this.tiles[var1][var2][var3].itemLayer = var10; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IIIILik;Lik;IIJI)V" + descriptor = "(IIIILjy;Ljy;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) { @@ -441,9 +439,9 @@ public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(IIIILik;Lik;IIIIJI)V" + descriptor = "(IIIILjy;Ljy;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) { @@ -471,11 +469,11 @@ public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable } } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IIIIIILik;IJI)Z" + descriptor = "(IIIIIILjy;IJI)Z" ) - public boolean method1243(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + public boolean method1287(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { if (var7 == null) { return true; } else { @@ -485,9 +483,9 @@ public boolean method1243(int var1, int var2, int var3, int var4, int var5, int } } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IIIIILik;IJZ)Z" + descriptor = "(IIIIILjy;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) { @@ -524,18 +522,18 @@ public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Rend } } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIIIILik;IJIIII)Z" + descriptor = "(IIIIILjy;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) { return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); } - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IIIIIIIILik;IZJI)Z" + descriptor = "(IIIIIIIILjy;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) { @@ -607,7 +605,7 @@ boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6 return true; } - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { @@ -619,9 +617,9 @@ public void clearTempGameObjects() { this.tempGameObjectsCount = 0; } - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Ljy;)V" + descriptor = "(Lkl;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -655,8 +653,8 @@ void removeGameObject(GameObject var1) { } - @ObfuscatedName("ag") - public void method1249(int var1, int var2, int var3, int var4) { + @ObfuscatedName("an") + public void method1293(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; if (var5 != null) { WallDecoration var6 = var5.wallDecoration; @@ -667,7 +665,7 @@ public void method1249(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -676,7 +674,7 @@ public void removeBoundaryObject(int var1, int var2, int var3) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -685,16 +683,14 @@ public void removeWallDecoration(int var1, int var2, int var3) { } } - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = class177.method918(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { + if (SequenceDefinition.method1116(var6.tag) && var2 == var6.startX && var3 == var6.startY) { this.removeGameObject(var6); return; } @@ -703,7 +699,7 @@ public void removeGameObject(int var1, int var2, int var3) { } } - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -712,7 +708,7 @@ public void removeFloorDecoration(int var1, int var2, int var3) { } } - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -721,27 +717,27 @@ public void removeGroundItemPile(int var1, int var2, int var3) { } } - @ObfuscatedName("aj") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(III)Ljo;" + descriptor = "(III)Lkr;" ) - public BoundaryObject method1255(int var1, int var2, int var3) { + public BoundaryObject method1299(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.boundaryObject; } - @ObfuscatedName("av") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(III)Ljw;" + descriptor = "(III)Lkq;" ) - public WallDecoration method1256(int var1, int var2, int var3) { + public WallDecoration method1300(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.wallDecoration; } - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(III)Ljy;" + descriptor = "(III)Lkl;" ) @Export("getGameObject") public GameObject getGameObject(int var1, int var2, int var3) { @@ -751,9 +747,7 @@ public GameObject getGameObject(int var1, int var2, int var3) { } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = class177.method918(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { + if (SequenceDefinition.method1116(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6; } } @@ -762,9 +756,9 @@ public GameObject getGameObject(int var1, int var2, int var3) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(III)Liy;" + descriptor = "(III)Ljd;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { @@ -772,21 +766,21 @@ public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } - @ObfuscatedName("bh") + @ObfuscatedName("bn") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; } - @ObfuscatedName("bj") + @ObfuscatedName("bk") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; } - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -795,9 +789,7 @@ public long getGameObjectTag(int var1, int var2, int var3) { } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = class177.method918(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { + if (SequenceDefinition.method1116(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } } @@ -806,14 +798,14 @@ public long getGameObjectTag(int var1, int var2, int var3) { } } - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } - @ObfuscatedName("bt") + @ObfuscatedName("be") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; @@ -836,8 +828,8 @@ public int getObjectFlags(int var1, int var2, int var3, long var4) { } } - @ObfuscatedName("bd") - public void method1264(int var1, int var2, int var3) { + @ObfuscatedName("bv") + public void method1308(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.planes; ++var4) { for (int var5 = 0; var5 < this.xSize; ++var5) { for (int var6 = 0; var6 < this.ySize; ++var6) { @@ -847,11 +839,11 @@ public void method1264(int var1, int var2, int var3) { ModelData var10; if (var8 != null && var8.renderable1 instanceof ModelData) { ModelData var9 = (ModelData)var8.renderable1; - this.method1266(var9, var4, var5, var6, 1, 1); + this.method1310(var9, var4, var5, var6, 1, 1); if (var8.renderable2 instanceof ModelData) { var10 = (ModelData)var8.renderable2; - this.method1266(var10, var4, var5, var6, 1, 1); - ModelData.method1175(var9, var10, 0, 0, 0, false); + this.method1310(var10, var4, var5, var6, 1, 1); + ModelData.method1221(var9, var10, 0, 0, 0, false); var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } @@ -862,7 +854,7 @@ public void method1264(int var1, int var2, int var3) { GameObject var14 = var7.gameObjects[var12]; if (var14 != null && var14.renderable instanceof ModelData) { ModelData var11 = (ModelData)var14.renderable; - this.method1266(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + this.method1310(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); } } @@ -870,7 +862,7 @@ public void method1264(int var1, int var2, int var3) { FloorDecoration var13 = var7.floorDecoration; if (var13 != null && var13.renderable instanceof ModelData) { var10 = (ModelData)var13.renderable; - this.method1265(var10, var4, var5, var6); + this.method1309(var10, var4, var5, var6); var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } @@ -880,11 +872,11 @@ public void method1264(int var1, int var2, int var3) { } - @ObfuscatedName("by") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(Lic;III)V" + descriptor = "(Ljw;III)V" ) - void method1265(ModelData var1, int var2, int var3, int var4) { + void method1309(ModelData var1, int var2, int var3, int var4) { int var6 = var3 + 1; int var7 = var4 - 1; int var8 = var4 + 1; @@ -895,9 +887,9 @@ void method1265(ModelData var1, int var2, int var3, int var4) { if (var10 >= 0 && var10 < this.ySize && (var9 >= var6 || var10 >= var8)) { Tile var11 = this.tiles[var2][var9][var10]; if (var11 != null && var11.floorDecoration != null && var11.floorDecoration.renderable instanceof ModelData) { - int var12 = this.method1267(var2, var9, var10, var2, var3, var4); + int var12 = this.method1311(var2, var9, var10, var2, var3, var4); ModelData var13 = (ModelData)var11.floorDecoration.renderable; - ModelData.method1175(var1, var13, (var9 - var3) * 128, var12, (var10 - var4) * 128, true); + ModelData.method1221(var1, var13, (var9 - var3) * 128, var12, (var10 - var4) * 128, true); } } } @@ -906,11 +898,11 @@ void method1265(ModelData var1, int var2, int var3, int var4) { } - @ObfuscatedName("bs") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(Lic;IIIII)V" + descriptor = "(Ljw;IIIII)V" ) - void method1266(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method1310(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; @@ -925,18 +917,18 @@ void method1266(ModelData var1, int var2, int var3, int var4, int var5, int var6 if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { Tile var15 = this.tiles[var12][var13][var14]; if (var15 != null) { - int var16 = this.method1267(var12, var13, var14, var2, var3, var4); + int var16 = this.method1311(var12, var13, var14, var2, var3, var4); BoundaryObject var17 = var15.boundaryObject; if (var17 != null) { ModelData var18; if (var17.renderable1 instanceof ModelData) { var18 = (ModelData)var17.renderable1; - ModelData.method1175(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method1221(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } if (var17.renderable2 instanceof ModelData) { var18 = (ModelData)var17.renderable2; - ModelData.method1175(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method1221(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } @@ -946,7 +938,7 @@ void method1266(ModelData var1, int var2, int var3, int var4, int var5, int var6 ModelData var20 = (ModelData)var19.renderable; int var21 = var19.endX - var19.startX + 1; int var22 = var19.endY - var19.startY + 1; - ModelData.method1175(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + ModelData.method1221(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -962,17 +954,17 @@ void method1266(ModelData var1, int var2, int var3, int var4, int var5, int var6 } - @ObfuscatedName("bm") - int method1267(int var1, int var2, int var3, int var4, int var5, int var6) { - return this.method1268(var1, var2, var3) - this.method1268(var4, var5, var6); + @ObfuscatedName("bb") + int method1311(int var1, int var2, int var3, int var4, int var5, int var6) { + return this.method1312(var1, var2, var3) - this.method1312(var4, var5, var6); } - @ObfuscatedName("bf") - int method1268(int var1, int var2, int var3) { + @ObfuscatedName("bo") + int method1312(int var1, int var2, int var3) { return (this.tileHeights[var1][var2 + 1][var3 + 1] + this.tileHeights[var1][var2][var3] + this.tileHeights[var1][var2][var3 + 1] + this.tileHeights[var1][var2 + 1][var3]) / 4; } - @ObfuscatedName("bq") + @ObfuscatedName("bp") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; @@ -1037,7 +1029,7 @@ public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, } } - @ObfuscatedName("bp") + @ObfuscatedName("br") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { if (!shouldSendWalk() || var4) { @@ -1051,13 +1043,13 @@ public void menuOpen(int var1, int var2, int var3, boolean var4) { } } - @ObfuscatedName("bu") + @ObfuscatedName("bs") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; } - @ObfuscatedName("br") + @ObfuscatedName("bf") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { @@ -1124,7 +1116,11 @@ public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { Tile var16 = var8[var9][var10]; if (var16 != null) { - if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { + if (var16.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { + var16.drawPrimary = false; + var16.drawSecondary = false; + var16.drawGameObjectEdges = 0; + } else { var16.drawPrimary = true; var16.drawSecondary = true; if (var16.gameObjectsCount > 0) { @@ -1134,10 +1130,6 @@ public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { } ++tileUpdateCount; - } else { - var16.drawPrimary = false; - var16.drawSecondary = false; - var16.drawGameObjectEdges = 0; } } } @@ -1254,9 +1246,9 @@ public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { checkClick = false; } - @ObfuscatedName("be") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(Lii;Z)V" + descriptor = "(Ljh;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1350,10 +1342,10 @@ void drawTile(Tile var1, boolean var2) { if (var3.linkedBelowTile != null) { var9 = var3.linkedBelowTile; if (var9.paint != null) { - if (!this.method1283(0, var4, var5)) { + if (!this.method1327(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method1283(0, var4, var5)) { + } else if (var9.model != null && !this.method1327(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1372,13 +1364,13 @@ void drawTile(Tile var1, boolean var2) { var20 = false; if (var3.paint != null) { - if (!this.method1283(var7, var4, var5)) { + if (!this.method1327(var7, var4, var5)) { var20 = true; if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method1283(var7, var4, var5)) { + } else if (var3.model != null && !this.method1327(var7, var4, var5)) { var20 = true; this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1400,43 +1392,43 @@ void drawTile(Tile var1, boolean var2) { var21 += 6; } - var11 = field2098[var21]; - var3.field2022 = field2095[var21]; + var11 = field2105[var21]; + var3.field2029 = field2110[var21]; } if (var31 != null) { - if ((var31.orientationA & field2097[var21]) != 0) { + if ((var31.orientationA & field2107[var21]) != 0) { if (var31.orientationA == 16) { var3.drawGameObjectEdges = 3; - var3.field2014 = field2096[var21]; - var3.field2018 = 3 - var3.field2014; + var3.field2024 = field2106[var21]; + var3.field2031 = 3 - var3.field2024; } else if (var31.orientationA == 32) { var3.drawGameObjectEdges = 6; - var3.field2014 = field2093[var21]; - var3.field2018 = 6 - var3.field2014; + var3.field2024 = field2108[var21]; + var3.field2031 = 6 - var3.field2024; } else if (var31.orientationA == 64) { var3.drawGameObjectEdges = 12; - var3.field2014 = field2094[var21]; - var3.field2018 = 12 - var3.field2014; + var3.field2024 = field2109[var21]; + var3.field2031 = 12 - var3.field2024; } else { var3.drawGameObjectEdges = 9; - var3.field2014 = field2099[var21]; - var3.field2018 = 9 - var3.field2014; + var3.field2024 = field2111[var21]; + var3.field2031 = 9 - var3.field2024; } } else { var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method1284(var7, var4, var5, var31.orientationA)) { + if ((var31.orientationA & var11) != 0 && !this.method1328(var7, var4, var5, var31.orientationA)) { var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method1284(var7, var4, var5, var31.orientationB)) { + if ((var31.orientationB & var11) != 0 && !this.method1328(var7, var4, var5, var31.orientationB)) { var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method1285(var7, var4, var5, var13.renderable1.height)) { + if (var13 != null && !this.method1329(var7, var4, var5, var13.renderable1.height)) { if ((var13.orientation & var11) != 0) { var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.z - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); } else if (var13.orientation == 256) { @@ -1524,7 +1516,7 @@ void drawTile(Tile var1, boolean var2) { var20 = true; for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2014) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2024) { var20 = false; break; } @@ -1532,7 +1524,7 @@ void drawTile(Tile var1, boolean var2) { if (var20) { var10 = var3.boundaryObject; - if (!this.method1284(var7, var4, var5, var10.orientationA)) { + if (!this.method1328(var7, var4, var5, var10.orientationA)) { var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.z - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } @@ -1579,7 +1571,7 @@ void drawTile(Tile var1, boolean var2) { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2018) { + if ((var16 & var36.drawGameObjectEdges) == var3.field2031) { var3.drawGameObjects = true; continue label563; } @@ -1597,9 +1589,9 @@ void drawTile(Tile var1, boolean var2) { var15 = Scene_cameraYTile - var12.startY; var16 = var12.endY - Scene_cameraYTile; if (var16 > var15) { - var12.field2306 = var24 + var16; + var12.field2319 = var24 + var16; } else { - var12.field2306 = var24 + var15; + var12.field2319 = var24 + var15; } } } @@ -1611,10 +1603,10 @@ void drawTile(Tile var1, boolean var2) { for (var24 = 0; var24 < var21; ++var24) { GameObject var35 = gameObjects[var24]; if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field2306 > var11) { - var11 = var35.field2306; + if (var35.field2319 > var11) { + var11 = var35.field2319; var25 = var24; - } else if (var11 == var35.field2306) { + } else if (var11 == var35.field2319) { var15 = var35.centerX - Scene_cameraX; var16 = var35.centerY - Scene_cameraZ; var17 = gameObjects[var25].centerX - Scene_cameraX; @@ -1632,7 +1624,7 @@ void drawTile(Tile var1, boolean var2) { GameObject var33 = gameObjects[var25]; var33.lastDrawn = Scene_drawnCount; - if (!this.method1286(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { + if (!this.method1330(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } @@ -1704,10 +1696,10 @@ void drawTile(Tile var1, boolean var2) { } } - if (var3.field2022 != 0) { + if (var3.field2029 != 0) { WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method1285(var7, var4, var5, var29.renderable1.height)) { - if ((var29.orientation & var3.field2022) != 0) { + if (var29 != null && !this.method1329(var7, var4, var5, var29.renderable1.height)) { + if ((var29.orientation & var3.field2029) != 0) { var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.z - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); } else if (var29.orientation == 256) { var11 = var29.x - Scene_cameraX; @@ -1736,11 +1728,11 @@ void drawTile(Tile var1, boolean var2) { BoundaryObject var27 = var3.boundaryObject; if (var27 != null) { - if ((var27.orientationB & var3.field2022) != 0 && !this.method1284(var7, var4, var5, var27.orientationB)) { + if ((var27.orientationB & var3.field2029) != 0 && !this.method1328(var7, var4, var5, var27.orientationB)) { var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field2022) != 0 && !this.method1284(var7, var4, var5, var27.orientationA)) { + if ((var27.orientationA & var3.field2029) != 0 && !this.method1328(var7, var4, var5, var27.orientationA)) { var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } @@ -1784,9 +1776,9 @@ void drawTile(Tile var1, boolean var2) { } } - @ObfuscatedName("bi") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(Ljg;IIIIIII)V" + descriptor = "(Ljz;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -1837,18 +1829,18 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var int var27 = Rasterizer3D.getClipMidY() + var19 * Rasterizer3D.get3dZoom() / var16; int var28 = Rasterizer3D.getClipMidX() + var9 * Rasterizer3D.get3dZoom() / var15; int var29 = Rasterizer3D.getClipMidY() + var21 * Rasterizer3D.get3dZoom() / var15; - float var30 = AbstractWorldMapIcon.method1556(var12); - float var31 = AbstractWorldMapIcon.method1556(var11); - float var32 = AbstractWorldMapIcon.method1556(var16); - float var33 = AbstractWorldMapIcon.method1556(var15); - Rasterizer3D.clips.field2275 = 0; + float var30 = SecureRandomFuture.method443(var12); + float var31 = SecureRandomFuture.method443(var11); + float var32 = SecureRandomFuture.method443(var16); + float var33 = SecureRandomFuture.method443(var15); + Rasterizer3D.clips.field2282 = 0; int var34; int var35; if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.clips.field2268 = false; - var34 = Rasterizer3D.method1197(); + Rasterizer3D.clips.field2278 = false; + var34 = Rasterizer3D.method1246(); if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > var34 || var28 > var34 || var24 > var34) { - Rasterizer3D.clips.field2268 = true; + Rasterizer3D.clips.field2278 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { @@ -1858,25 +1850,25 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var if (var1.texture == -1) { if (var1.neColor != 12345678) { - Rasterizer3D.method1204(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor); + Rasterizer3D.method1253(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor); } } else if (!Scene_isLowDetail) { if (var1.isFlat) { - Rasterizer3D.method1207(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); + Rasterizer3D.method1256(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - Rasterizer3D.method1207(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); + Rasterizer3D.method1256(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); } } else { var35 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method1204(var27, var29, var25, var26, var28, var24, var32, var33, var31, method1280(var35, var1.neColor), method1280(var35, var1.nwColor), method1280(var35, var1.seColor)); + Rasterizer3D.method1253(var27, var29, var25, var26, var28, var24, var32, var33, var31, method1324(var35, var1.neColor), method1324(var35, var1.nwColor), method1324(var35, var1.seColor)); } } if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.clips.field2268 = false; - var34 = Rasterizer3D.method1197(); + Rasterizer3D.clips.field2278 = false; + var34 = Rasterizer3D.method1246(); if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > var34 || var24 > var34 || var28 > var34) { - Rasterizer3D.clips.field2268 = true; + Rasterizer3D.clips.field2278 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { @@ -1886,13 +1878,13 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var if (var1.texture == -1) { if (var1.swColor != 12345678) { - Rasterizer3D.method1204(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor); + Rasterizer3D.method1253(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor); } } else if (!Scene_isLowDetail) { - Rasterizer3D.method1207(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); + Rasterizer3D.method1256(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { var35 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method1204(var23, var25, var29, var22, var24, var28, var30, var31, var33, method1280(var35, var1.swColor), method1280(var35, var1.seColor), method1280(var35, var1.nwColor)); + Rasterizer3D.method1253(var23, var25, var29, var22, var24, var28, var30, var31, var33, method1324(var35, var1.swColor), method1324(var35, var1.seColor), method1324(var35, var1.nwColor)); } } @@ -1902,9 +1894,9 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var } } - @ObfuscatedName("bz") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(Ljv;IIIIII)V" + descriptor = "(Ljf;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -1929,37 +1921,37 @@ void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5 } if (var1.triangleTextureId != null) { - SceneTileModel.field2154[var9] = var10; - SceneTileModel.field2152[var9] = var13; - SceneTileModel.field2153[var9] = var12; + SceneTileModel.field2163[var9] = var10; + SceneTileModel.field2162[var9] = var13; + SceneTileModel.field2166[var9] = var12; } - SceneTileModel.field2150[var9] = Rasterizer3D.getClipMidX() + var10 * Rasterizer3D.get3dZoom() / var12; - SceneTileModel.field2151[var9] = Rasterizer3D.getClipMidY() + var13 * Rasterizer3D.get3dZoom() / var12; - SceneTileModel.field2149[var9] = AbstractWorldMapIcon.method1556(var12); + SceneTileModel.field2164[var9] = Rasterizer3D.getClipMidX() + var10 * Rasterizer3D.get3dZoom() / var12; + SceneTileModel.field2165[var9] = Rasterizer3D.getClipMidY() + var13 * Rasterizer3D.get3dZoom() / var12; + SceneTileModel.field2161[var9] = SecureRandomFuture.method443(var12); } - Rasterizer3D.clips.field2275 = 0; + Rasterizer3D.clips.field2282 = 0; var8 = var1.faceX.length; for (var9 = 0; var9 < var8; ++var9) { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = SceneTileModel.field2150[var10]; - int var14 = SceneTileModel.field2150[var11]; - int var15 = SceneTileModel.field2150[var12]; - int var16 = SceneTileModel.field2151[var10]; - int var17 = SceneTileModel.field2151[var11]; - int var18 = SceneTileModel.field2151[var12]; - float var19 = SceneTileModel.field2149[var10]; - float var20 = SceneTileModel.field2149[var11]; - float var21 = SceneTileModel.field2149[var12]; + var13 = SceneTileModel.field2164[var10]; + int var14 = SceneTileModel.field2164[var11]; + int var15 = SceneTileModel.field2164[var12]; + int var16 = SceneTileModel.field2165[var10]; + int var17 = SceneTileModel.field2165[var11]; + int var18 = SceneTileModel.field2165[var12]; + float var19 = SceneTileModel.field2161[var10]; + float var20 = SceneTileModel.field2161[var11]; + float var21 = SceneTileModel.field2161[var12]; if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.clips.field2268 = false; - int var22 = Rasterizer3D.method1197(); + Rasterizer3D.clips.field2278 = false; + int var22 = Rasterizer3D.method1246(); if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > var22 || var14 > var22 || var15 > var22) { - Rasterizer3D.clips.field2268 = true; + Rasterizer3D.clips.field2278 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { @@ -1970,23 +1962,23 @@ void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5 if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { if (!Scene_isLowDetail) { if (var1.isFlat) { - Rasterizer3D.method1207(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2154[0], SceneTileModel.field2154[1], SceneTileModel.field2154[3], SceneTileModel.field2152[0], SceneTileModel.field2152[1], SceneTileModel.field2152[3], SceneTileModel.field2153[0], SceneTileModel.field2153[1], SceneTileModel.field2153[3], var1.triangleTextureId[var9]); + Rasterizer3D.method1256(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2163[0], SceneTileModel.field2163[1], SceneTileModel.field2163[3], SceneTileModel.field2162[0], SceneTileModel.field2162[1], SceneTileModel.field2162[3], SceneTileModel.field2166[0], SceneTileModel.field2166[1], SceneTileModel.field2166[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.method1207(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2154[var10], SceneTileModel.field2154[var11], SceneTileModel.field2154[var12], SceneTileModel.field2152[var10], SceneTileModel.field2152[var11], SceneTileModel.field2152[var12], SceneTileModel.field2153[var10], SceneTileModel.field2153[var11], SceneTileModel.field2153[var12], var1.triangleTextureId[var9]); + Rasterizer3D.method1256(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2163[var10], SceneTileModel.field2163[var11], SceneTileModel.field2163[var12], SceneTileModel.field2162[var10], SceneTileModel.field2162[var11], SceneTileModel.field2162[var12], SceneTileModel.field2166[var10], SceneTileModel.field2166[var11], SceneTileModel.field2166[var12], var1.triangleTextureId[var9]); } } else { int var23 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method1204(var16, var17, var18, var13, var14, var15, var19, var20, var21, method1280(var23, var1.triangleColorA[var9]), method1280(var23, var1.triangleColorB[var9]), method1280(var23, var1.triangleColorC[var9])); + Rasterizer3D.method1253(var16, var17, var18, var13, var14, var15, var19, var20, var21, method1324(var23, var1.triangleColorA[var9]), method1324(var23, var1.triangleColorB[var9]), method1324(var23, var1.triangleColorC[var9])); } } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method1204(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + Rasterizer3D.method1253(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } } - @ObfuscatedName("bw") + @ObfuscatedName("bi") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; @@ -2025,20 +2017,20 @@ void occlude() { if (var13) { var9 = Scene_cameraX - var4.minX; if (var9 > 32) { - var4.field2137 = 1; + var4.field2135 = 1; } else { if (var9 >= -32) { continue; } - var4.field2137 = 2; + var4.field2135 = 2; var9 = -var9; } - var4.field2138 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field2125 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field2130 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2133 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field2148 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field2140 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field2144 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2149 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2067,20 +2059,20 @@ void occlude() { if (var13) { var9 = Scene_cameraZ - var4.minZ; if (var9 > 32) { - var4.field2137 = 3; + var4.field2135 = 3; } else { if (var9 >= -32) { continue; } - var4.field2137 = 4; + var4.field2135 = 4; var9 = -var9; } - var4.field2132 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field2134 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field2130 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2133 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field2146 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field2152 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field2144 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2149 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2121,11 +2113,11 @@ void occlude() { } if (var10) { - var4.field2137 = 5; - var4.field2132 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field2134 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field2138 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field2125 = (var4.maxZ - Scene_cameraZ << 8) / var5; + var4.field2135 = 5; + var4.field2146 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field2152 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field2148 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field2140 = (var4.maxZ - Scene_cameraZ << 8) / var5; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2135,9 +2127,9 @@ void occlude() { } - @ObfuscatedName("bc") - boolean method1283(int var1, int var2, int var3) { - int var4 = this.field2109[var1][var2][var3]; + @ObfuscatedName("bq") + boolean method1327(int var1, int var2, int var3) { + int var4 = this.field2120[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; } else if (var4 == Scene_drawnCount) { @@ -2145,19 +2137,19 @@ boolean method1283(int var1, int var2, int var3) { } else { int var5 = var2 << 7; int var6 = var3 << 7; - if (this.method1287(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method1287(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method1287(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method1287(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field2109[var1][var2][var3] = Scene_drawnCount; + if (this.method1331(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method1331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method1331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method1331(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field2120[var1][var2][var3] = Scene_drawnCount; return true; } else { - this.field2109[var1][var2][var3] = -Scene_drawnCount; + this.field2120[var1][var2][var3] = -Scene_drawnCount; return false; } } } - @ObfuscatedName("bg") - boolean method1284(int var1, int var2, int var3, int var4) { - if (!this.method1283(var1, var2, var3)) { + @ObfuscatedName("bw") + boolean method1328(int var1, int var2, int var3, int var4) { + if (!this.method1327(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; @@ -2169,30 +2161,30 @@ boolean method1284(int var1, int var2, int var3, int var4) { if (var4 < 16) { if (var4 == 1) { if (var5 > Scene_cameraX) { - if (!this.method1287(var5, var7, var6)) { + if (!this.method1331(var5, var7, var6)) { return false; } - if (!this.method1287(var5, var7, var6 + 128)) { + if (!this.method1331(var5, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method1287(var5, var8, var6)) { + if (!this.method1331(var5, var8, var6)) { return false; } - if (!this.method1287(var5, var8, var6 + 128)) { + if (!this.method1331(var5, var8, var6 + 128)) { return false; } } - if (!this.method1287(var5, var9, var6)) { + if (!this.method1331(var5, var9, var6)) { return false; } - if (!this.method1287(var5, var9, var6 + 128)) { + if (!this.method1331(var5, var9, var6 + 128)) { return false; } @@ -2201,30 +2193,30 @@ boolean method1284(int var1, int var2, int var3, int var4) { if (var4 == 2) { if (var6 < Scene_cameraZ) { - if (!this.method1287(var5, var7, var6 + 128)) { + if (!this.method1331(var5, var7, var6 + 128)) { return false; } - if (!this.method1287(var5 + 128, var7, var6 + 128)) { + if (!this.method1331(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method1287(var5, var8, var6 + 128)) { + if (!this.method1331(var5, var8, var6 + 128)) { return false; } - if (!this.method1287(var5 + 128, var8, var6 + 128)) { + if (!this.method1331(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method1287(var5, var9, var6 + 128)) { + if (!this.method1331(var5, var9, var6 + 128)) { return false; } - if (!this.method1287(var5 + 128, var9, var6 + 128)) { + if (!this.method1331(var5 + 128, var9, var6 + 128)) { return false; } @@ -2233,30 +2225,30 @@ boolean method1284(int var1, int var2, int var3, int var4) { if (var4 == 4) { if (var5 < Scene_cameraX) { - if (!this.method1287(var5 + 128, var7, var6)) { + if (!this.method1331(var5 + 128, var7, var6)) { return false; } - if (!this.method1287(var5 + 128, var7, var6 + 128)) { + if (!this.method1331(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method1287(var5 + 128, var8, var6)) { + if (!this.method1331(var5 + 128, var8, var6)) { return false; } - if (!this.method1287(var5 + 128, var8, var6 + 128)) { + if (!this.method1331(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method1287(var5 + 128, var9, var6)) { + if (!this.method1331(var5 + 128, var9, var6)) { return false; } - if (!this.method1287(var5 + 128, var9, var6 + 128)) { + if (!this.method1331(var5 + 128, var9, var6 + 128)) { return false; } @@ -2265,30 +2257,30 @@ boolean method1284(int var1, int var2, int var3, int var4) { if (var4 == 8) { if (var6 > Scene_cameraZ) { - if (!this.method1287(var5, var7, var6)) { + if (!this.method1331(var5, var7, var6)) { return false; } - if (!this.method1287(var5 + 128, var7, var6)) { + if (!this.method1331(var5 + 128, var7, var6)) { return false; } } if (var1 > 0) { - if (!this.method1287(var5, var8, var6)) { + if (!this.method1331(var5, var8, var6)) { return false; } - if (!this.method1287(var5 + 128, var8, var6)) { + if (!this.method1331(var5 + 128, var8, var6)) { return false; } } - if (!this.method1287(var5, var9, var6)) { + if (!this.method1331(var5, var9, var6)) { return false; } - if (!this.method1287(var5 + 128, var9, var6)) { + if (!this.method1331(var5 + 128, var9, var6)) { return false; } @@ -2296,49 +2288,49 @@ boolean method1284(int var1, int var2, int var3, int var4) { } } - if (!this.method1287(var5 + 64, var10, var6 + 64)) { + if (!this.method1331(var5 + 64, var10, var6 + 64)) { return false; } else if (var4 == 16) { - return this.method1287(var5, var9, var6 + 128); + return this.method1331(var5, var9, var6 + 128); } else if (var4 == 32) { - return this.method1287(var5 + 128, var9, var6 + 128); + return this.method1331(var5 + 128, var9, var6 + 128); } else if (var4 == 64) { - return this.method1287(var5 + 128, var9, var6); + return this.method1331(var5 + 128, var9, var6); } else if (var4 == 128) { - return this.method1287(var5, var9, var6); + return this.method1331(var5, var9, var6); } else { return true; } } } - @ObfuscatedName("cw") - boolean method1285(int var1, int var2, int var3, int var4) { - if (!this.method1283(var1, var2, var3)) { + @ObfuscatedName("ce") + boolean method1329(int var1, int var2, int var3, int var4) { + if (!this.method1327(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; int var6 = var3 << 7; - return this.method1287(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method1287(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method1287(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method1287(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + return this.method1331(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method1331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method1331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method1331(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } } - @ObfuscatedName("cf") - boolean method1286(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("cu") + boolean method1330(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; if (var3 == var2 && var5 == var4) { - if (!this.method1283(var1, var2, var4)) { + if (!this.method1327(var1, var2, var4)) { return false; } else { var7 = var2 << 7; var8 = var4 << 7; - return this.method1287(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method1287(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method1287(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method1287(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + return this.method1331(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method1331(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method1331(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method1331(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); } } else { for (var7 = var2; var7 <= var3; ++var7) { for (var8 = var4; var8 <= var5; ++var8) { - if (this.field2109[var1][var7][var8] == -Scene_drawnCount) { + if (this.field2120[var1][var7][var8] == -Scene_drawnCount) { return false; } } @@ -2347,17 +2339,17 @@ boolean method1286(int var1, int var2, int var3, int var4, int var5, int var6) { var7 = (var2 << 7) + 1; var8 = (var4 << 7) + 2; int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method1287(var7, var9, var8)) { + if (!this.method1331(var7, var9, var8)) { return false; } else { int var10 = (var3 << 7) - 1; - if (!this.method1287(var10, var9, var8)) { + if (!this.method1331(var10, var9, var8)) { return false; } else { int var11 = (var5 << 7) - 1; - if (!this.method1287(var7, var9, var11)) { + if (!this.method1331(var7, var9, var11)) { return false; - } else if (!this.method1287(var10, var9, var11)) { + } else if (!this.method1331(var10, var9, var11)) { return false; } else { return true; @@ -2367,8 +2359,8 @@ boolean method1286(int var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("cm") - boolean method1287(int var1, int var2, int var3) { + @ObfuscatedName("cw") + boolean method1331(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; int var6; @@ -2376,57 +2368,57 @@ boolean method1287(int var1, int var2, int var3) { int var8; int var9; int var10; - if (var5.field2137 == 1) { + if (var5.field2135 == 1) { var6 = var5.minX - var1; if (var6 > 0) { - var7 = (var6 * var5.field2138 >> 8) + var5.minZ; - var8 = (var6 * var5.field2125 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2130 >> 8) + var5.minY; - var10 = (var6 * var5.field2133 >> 8) + var5.maxY; + var7 = (var6 * var5.field2148 >> 8) + var5.minZ; + var8 = (var6 * var5.field2140 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2144 >> 8) + var5.minY; + var10 = (var6 * var5.field2149 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2137 == 2) { + } else if (var5.field2135 == 2) { var6 = var1 - var5.minX; if (var6 > 0) { - var7 = (var6 * var5.field2138 >> 8) + var5.minZ; - var8 = (var6 * var5.field2125 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2130 >> 8) + var5.minY; - var10 = (var6 * var5.field2133 >> 8) + var5.maxY; + var7 = (var6 * var5.field2148 >> 8) + var5.minZ; + var8 = (var6 * var5.field2140 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2144 >> 8) + var5.minY; + var10 = (var6 * var5.field2149 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2137 == 3) { + } else if (var5.field2135 == 3) { var6 = var5.minZ - var3; if (var6 > 0) { - var7 = (var6 * var5.field2132 >> 8) + var5.minX; - var8 = (var6 * var5.field2134 >> 8) + var5.maxX; - var9 = (var6 * var5.field2130 >> 8) + var5.minY; - var10 = (var6 * var5.field2133 >> 8) + var5.maxY; + var7 = (var6 * var5.field2146 >> 8) + var5.minX; + var8 = (var6 * var5.field2152 >> 8) + var5.maxX; + var9 = (var6 * var5.field2144 >> 8) + var5.minY; + var10 = (var6 * var5.field2149 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2137 == 4) { + } else if (var5.field2135 == 4) { var6 = var3 - var5.minZ; if (var6 > 0) { - var7 = (var6 * var5.field2132 >> 8) + var5.minX; - var8 = (var6 * var5.field2134 >> 8) + var5.maxX; - var9 = (var6 * var5.field2130 >> 8) + var5.minY; - var10 = (var6 * var5.field2133 >> 8) + var5.maxY; + var7 = (var6 * var5.field2146 >> 8) + var5.minX; + var8 = (var6 * var5.field2152 >> 8) + var5.maxX; + var9 = (var6 * var5.field2144 >> 8) + var5.minY; + var10 = (var6 * var5.field2149 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2137 == 5) { + } else if (var5.field2135 == 5) { var6 = var2 - var5.minY; if (var6 > 0) { - var7 = (var6 * var5.field2132 >> 8) + var5.minX; - var8 = (var6 * var5.field2134 >> 8) + var5.maxX; - var9 = (var6 * var5.field2138 >> 8) + var5.minZ; - var10 = (var6 * var5.field2125 >> 8) + var5.maxZ; + var7 = (var6 * var5.field2146 >> 8) + var5.minX; + var8 = (var6 * var5.field2152 >> 8) + var5.maxX; + var9 = (var6 * var5.field2148 >> 8) + var5.minZ; + var10 = (var6 * var5.field2140 >> 8) + var5.maxZ; if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } @@ -2437,7 +2429,7 @@ boolean method1287(int var1, int var2, int var3) { return false; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { Occluder var8 = new Occluder(); @@ -2455,7 +2447,7 @@ public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; } - @ObfuscatedName("ba") + @ObfuscatedName("bt") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; @@ -2488,7 +2480,7 @@ public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int v boolean var14 = false; for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method1271(var12, var0[var8] + var15, var13)) { + if (method1315(var12, var0[var8] + var15, var13)) { var14 = true; break; } @@ -2539,8 +2531,8 @@ public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int v } - @ObfuscatedName("bl") - static boolean method1271(int var0, int var1, int var2) { + @ObfuscatedName("bm") + static boolean method1315(int var0, int var1, int var2) { int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; @@ -2554,20 +2546,20 @@ static boolean method1271(int var0, int var1, int var2) { } } - @ObfuscatedName("bo") + @ObfuscatedName("bc") @Export("shouldSendWalk") public static boolean shouldSendWalk() { return viewportWalking && Scene_selectedX != -1; } - @ObfuscatedName("bb") - public static void method1275() { + @ObfuscatedName("bu") + public static void method1319() { Scene_selectedX = -1; viewportWalking = false; } - @ObfuscatedName("bx") - static final int method1280(int var0, int var1) { + @ObfuscatedName("bj") + static final int method1324(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2578,7 +2570,7 @@ static final int method1280(int var0, int var1) { return (var0 & 65408) + var1; } - @ObfuscatedName("bn") + @ObfuscatedName("bx") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 < var2 && var1 < var3 && var1 < var4) { diff --git a/osrs/src/main/java/SceneTileModel.java b/osrs/src/main/java/SceneTileModel.java index 402ecdafa..b0759c5e3 100644 --- a/osrs/src/main/java/SceneTileModel.java +++ b/osrs/src/main/java/SceneTileModel.java @@ -2,80 +2,80 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("jv") +@ObfuscatedName("jf") @Implements("SceneTileModel") public final class SceneTileModel { - @ObfuscatedName("ab") - static int[] field2150; - @ObfuscatedName("ag") - static int[] field2151; - @ObfuscatedName("am") - static float[] field2149; - @ObfuscatedName("ax") - static int[] field2154; - @ObfuscatedName("ah") - static int[] field2152; - @ObfuscatedName("as") - static int[] field2153; - @ObfuscatedName("ay") - static final int[][] field2156; @ObfuscatedName("aj") - static final int[][] field2155; + static int[] field2164; + @ObfuscatedName("an") + static int[] field2165; @ObfuscatedName("au") + static float[] field2161; + @ObfuscatedName("ai") + static int[] field2163; + @ObfuscatedName("ae") + static int[] field2162; + @ObfuscatedName("aw") + static int[] field2166; + @ObfuscatedName("aq") + static final int[][] field2167; + @ObfuscatedName("az") + static final int[][] field2168; + @ObfuscatedName("ac") @Export("vertexX") int[] vertexX; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("vertexY") int[] vertexY; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("faceX") int[] faceX; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("faceY") int[] faceY; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("faceZ") int[] faceZ; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("isFlat") boolean isFlat; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("shape") int shape; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("rotation") int rotation; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("overlayRgb") int overlayRgb; static { - field2150 = new int[6]; - field2151 = new int[6]; - field2149 = new float[6]; - field2154 = new int[6]; - field2152 = new int[6]; - field2153 = new int[6]; - field2156 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; - field2155 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; + field2164 = new int[6]; + field2165 = new int[6]; + field2161 = new float[6]; + field2163 = new int[6]; + field2162 = new int[6]; + field2166 = new int[6]; + field2167 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; + field2168 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -92,7 +92,7 @@ public final class SceneTileModel { int var21 = var20 / 2; int var22 = var20 / 4; int var23 = var20 * 3 / 4; - int[] var24 = field2156[var1]; + int[] var24 = field2167[var1]; int var25 = var24.length; this.vertexX = new int[var25]; this.vertexY = new int[var25]; @@ -227,7 +227,7 @@ public final class SceneTileModel { var27[var30] = var36; } - int[] var38 = field2155[var1]; + int[] var38 = field2168[var1]; var31 = var38.length / 4; this.faceX = new int[var31]; this.faceY = new int[var31]; diff --git a/osrs/src/main/java/SceneTilePaint.java b/osrs/src/main/java/SceneTilePaint.java index 62d7f0745..d7a2077ec 100644 --- a/osrs/src/main/java/SceneTilePaint.java +++ b/osrs/src/main/java/SceneTilePaint.java @@ -1,42 +1,29 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -import java.io.*; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -@ObfuscatedName("jg") +@ObfuscatedName("jz") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lmi;" - ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("swColor") int swColor; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("seColor") int seColor; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("neColor") int neColor; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("nwColor") int nwColor; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("texture") int texture; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("isFlat") boolean isFlat; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("rgb") int rgb; @@ -50,131 +37,4 @@ public final class SceneTilePaint { this.rgb = var6; this.isFlat = var7; } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(ILru;Lnk;B)V", - garbageValue = "7" - ) - static void method1350(int var0, ArchiveDisk var1, Archive var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 1; - var3.key = (long)var0; - var3.archiveDisk = var1; - var3.archive = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); - } - - UserComparator8.method671(); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lto;I)V", - garbageValue = "1309449245" - ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class36.reflectionChecks.last(); - if (var1 != null) { - int var2 = var0.offset; - var0.writeInt(var1.id); - - for (int var3 = 0; var3 < var1.size; ++var3) { - if (var1.creationErrors[var3] != 0) { - var0.writeByte(var1.creationErrors[var3]); - } else { - try { - int var4 = var1.operations[var3]; - Field var5; - int var6; - if (var4 == 0) { - var5 = var1.fields[var3]; - var6 = Reflection.getInt(var5, (Object)null); - var0.writeByte(0); - var0.writeInt(var6); - } else if (var4 == 1) { - var5 = var1.fields[var3]; - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); - var0.writeByte(0); - } else if (var4 == 2) { - var5 = var1.fields[var3]; - var6 = var5.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - - Method var25; - if (var4 != 3) { - if (var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - } else { - var25 = var1.methods[var3]; - byte[][] var10 = var1.arguments[var3]; - Object[] var7 = new Object[var10.length]; - - for (int var8 = 0; var8 < var10.length; ++var8) { - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); - var7[var8] = var9.readObject(); - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); - if (var11 == null) { - var0.writeByte(0); - } else if (var11 instanceof Number) { - var0.writeByte(1); - var0.writeLong(((Number)var11).longValue()); - } else if (var11 instanceof String) { - var0.writeByte(2); - var0.writeStringCp1252NullTerminated((String)var11); - } else { - var0.writeByte(4); - } - } - } catch (ClassNotFoundException var13) { - var0.writeByte(-10); - } catch (InvalidClassException var14) { - var0.writeByte(-11); - } catch (StreamCorruptedException var15) { - var0.writeByte(-12); - } catch (OptionalDataException var16) { - var0.writeByte(-13); - } catch (IllegalAccessException var17) { - var0.writeByte(-14); - } catch (IllegalArgumentException var18) { - var0.writeByte(-15); - } catch (InvocationTargetException var19) { - var0.writeByte(-16); - } catch (SecurityException var20) { - var0.writeByte(-17); - } catch (IOException var21) { - var0.writeByte(-18); - } catch (NullPointerException var22) { - var0.writeByte(-19); - } catch (Exception var23) { - var0.writeByte(-20); - } catch (Throwable var24) { - var0.writeByte(-21); - } - } - } - - var0.writeCrc(var2); - var1.remove(); - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "1859445774" - ) - static char method1352(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; - } } \ No newline at end of file diff --git a/osrs/src/main/java/Script.java b/osrs/src/main/java/Script.java index 1a592e071..decec63fe 100644 --- a/osrs/src/main/java/Script.java +++ b/osrs/src/main/java/Script.java @@ -3,44 +3,43 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; -import java.util.Iterator; - -@ObfuscatedName("dh") +@ObfuscatedName("ds") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("ae") - String field817; - @ObfuscatedName("ao") + @ObfuscatedName("ay") + static int[] field812; + @ObfuscatedName("al") + String field820; + @ObfuscatedName("ak") @Export("opcodes") int[] opcodes; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("intOperands") int[] intOperands; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("localIntCount") int localIntCount; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("localStringCount") int localStringCount; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "[Lsf;" + descriptor = "[Ltp;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -52,58 +51,44 @@ public class Script extends DualNode { Script() { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)[Lsf;", - garbageValue = "-723912201" + descriptor = "(II)[Ltp;", + garbageValue = "-902364502" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; } - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "0" + descriptor = "(ZI)V", + garbageValue = "-1816632175" ) - public static void method445(int var0, int var1) { - class270.method1537(var0, var1, 0, 0); - class305.field2773.clear(); - class305.field2771.clear(); - if (class305.musicSongs.isEmpty() || var0 == 0 && var1 == 0) { - ByteArrayPool.method2148(); + static void method449(boolean var0) { + if (var0) { + class74.method426(); } else { - class305.field2771.add(new DelayFadeTask((SongTask)null, class305.musicPlayerStatus)); - class305.field2771.add(new FadeOutTask((SongTask)null, 0, false, class305.field2766)); - ArrayList var3 = new ArrayList(); - Iterator var4 = class305.musicSongs.iterator(); + for (int var1 = 0; var1 < class319.musicSongs.size(); ++var1) { + MusicSong var2 = (MusicSong)class319.musicSongs.get(var1); + if (var2 == null) { + class319.musicSongs.remove(var1); + --var1; + } else if (var2.field2882) { + if (var2.midiPcmStream.field2833 > 0) { + --var2.midiPcmStream.field2833; + } - while (var4.hasNext()) { - MusicSong var5 = (MusicSong)var4.next(); - var3.add(var5); + var2.midiPcmStream.clear(); + var2.midiPcmStream.method1666(); + var2.midiPcmStream.setPcmStreamVolume(0); + class319.musicSongs.remove(var1); + --var1; + } else { + var2.field2882 = true; + } } - - class305.field2771.add(new class401((SongTask)null, var3)); - } - - } - - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-69260226" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - ArchiveDisk.logOut(); - switch(var0) { - case 1: - class463.method2343(); - break; - case 2: - PcmPlayer.method212(24); - class318.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); } } diff --git a/osrs/src/main/java/ScriptEvent.java b/osrs/src/main/java/ScriptEvent.java index 7b64b9fd6..9134e88c9 100644 --- a/osrs/src/main/java/ScriptEvent.java +++ b/osrs/src/main/java/ScriptEvent.java @@ -3,47 +3,49 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") +import java.util.ArrayList; + +@ObfuscatedName("dl") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("args") Object[] args; - @ObfuscatedName("ae") + @ObfuscatedName("al") boolean field861; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnm;" ) @Export("widget") Widget widget; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("mouseX") int mouseX; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("mouseY") int mouseY; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("opIndex") int opIndex; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnm;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("keyTyped") int keyTyped; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("keyPressed") int keyPressed; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("targetName") String targetName; - @ObfuscatedName("ad") + @ObfuscatedName("ag") int field864; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("type") int type; @@ -51,32 +53,415 @@ public ScriptEvent() { this.type = 76; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "-1709292397" + descriptor = "([Ljava/lang/Object;B)V", + garbageValue = "-8" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "693110805" + garbageValue = "1815349260" ) @Export("setType") public void setType(int var1) { this.type = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lmi;B)V", - garbageValue = "-48" + descriptor = "(Lnm;B)V", + garbageValue = "-116" ) - public void method479(Widget var1) { + public void method470(Widget var1) { this.widget = var1; } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "-119" + ) + static int method466(int var0, int var1) { + FloorOverlayDefinition var2 = class4.method4(var0); + if (var2 == null) { + return var1; + } else { + int var3; + int var4; + byte var5; + int var7; + if (var2.secondaryRgb >= 0) { + var3 = Occluder.method1340(var2.secondaryHue, var2.secondarySaturation, var2.secondaryLightness); + var5 = 96; + if (var3 == -2) { + var4 = 12345678; + } else if (var3 == -1) { + if (var5 < 0) { + var5 = 0; + } else if (var5 > 127) { + var5 = 127; + } + + var7 = 127 - var5; + var4 = var7; + } else { + var7 = var5 * (var3 & 127) / 128; + if (var7 < 2) { + var7 = 2; + } else if (var7 > 126) { + var7 = 126; + } + + var4 = var7 + (var3 & 65408); + } + + return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; + } else if (var2.texture >= 0) { + var4 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); + var5 = 96; + if (var4 == -2) { + var3 = 12345678; + } else if (var4 == -1) { + if (var5 < 0) { + var5 = 0; + } else if (var5 > 127) { + var5 = 127; + } + + var7 = 127 - var5; + var3 = var7; + } else { + var7 = var5 * (var4 & 127) / 128; + if (var7 < 2) { + var7 = 2; + } else if (var7 > 126) { + var7 = 126; + } + + var3 = var7 + (var4 & 65408); + } + + return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; + } else if (var2.primaryRgb == 16711935) { + return var1; + } else { + var3 = Occluder.method1340(var2.hue, var2.saturation, var2.lightness); + var5 = 96; + if (var3 == -2) { + var4 = 12345678; + } else if (var3 == -1) { + if (var5 < 0) { + var5 = 0; + } else if (var5 > 127) { + var5 = 127; + } + + var7 = 127 - var5; + var4 = var7; + } else { + var7 = var5 * (var3 & 127) / 128; + if (var7 < 2) { + var7 = 2; + } else if (var7 > 126) { + var7 = 126; + } + + var4 = var7 + (var3 & 65408); + } + + return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; + } + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;III)[Lud;", + garbageValue = "-1840423911" + ) + public static SpritePixels[] method468(AbstractArchive var0, int var1, int var2) { + if (!class164.method862(var0, var1, var2)) { + return null; + } else { + SpritePixels[] var4 = new SpritePixels[class544.SpriteBuffer_spriteCount]; + + for (int var5 = 0; var5 < class544.SpriteBuffer_spriteCount; ++var5) { + SpritePixels var6 = var4[var5] = new SpritePixels(); + var6.width = class159.SpriteBuffer_spriteWidth; + var6.height = class500.SpriteBuffer_spriteHeight; + var6.xOffset = class326.SpriteBuffer_xOffsets[var5]; + var6.yOffset = ModelData0.SpriteBuffer_yOffsets[var5]; + var6.subWidth = class59.SpriteBuffer_spriteWidths[var5]; + var6.subHeight = class544.SpriteBuffer_spriteHeights[var5]; + int var7 = var6.subWidth * var6.subHeight; + byte[] var8 = AddRequestTask.SpriteBuffer_pixels[var5]; + var6.pixels = new int[var7]; + + for (int var9 = 0; var9 < var7; ++var9) { + var6.pixels[var9] = class372.SpriteBuffer_spritePalette[var8[var9] & 255]; + } + } + + class407.method2062(); + return var4; + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lom;Lom;ZIB)V", + garbageValue = "-22" + ) + static void method471(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { + if (var3 == 4) { + GameEngine.method166(4); + } + + } else { + if (var3 == 0) { + MusicPatchNode2.method1657(var2); + } else { + GameEngine.method166(var3); + } + + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + PcmPlayer.leftTitleSprite = Frames.method1335(var4); + Login.rightTitleSprite = PcmPlayer.leftTitleSprite.mirrorHorizontally(); + TextureProvider.method1351(var1, Client.worldProperties); + Login.titleboxSprite = class167.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + VarcInt.titlebuttonSprite = class167.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + Login.field775 = class167.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); + class364.field3198 = class167.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); + class167.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); + Login.runesSprite = InvDefinition.method953(var1, "runes", ""); + Login.title_muteSprite = InvDefinition.method953(var1, "title_mute", ""); + class519.options_buttons_0Sprite = class167.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + class305.field2513 = class167.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + class534.options_buttons_2Sprite = class167.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + ClanChannel.field1409 = class167.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + class274.field2399 = class519.options_buttons_0Sprite.subWidth; + class202.field1581 = class519.options_buttons_0Sprite.subHeight; + class544.field4278 = new LoginScreenAnimation(Login.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; + Login.field766 = new String[8]; + Login.field751 = 0; + } + + ClientPreferences.field1059 = 0; + class186.otp = ""; + Login.field741 = true; + Login.worldSelectOpen = false; + if (!class91.clientPreferences.getTitleMusicDisabled()) { + ArrayList var5 = new ArrayList(); + var5.add(new MusicSong(CollisionMap.archive6, "scape main", "", 255, false)); + class148.method776(var5, 0, 0, 0, 100, false); + } else { + ItemComposition.method1088(0, 0); + } + + class470.method2362(); + class13.method45().method1961(false); + Login.clearLoginScreen = true; + Login.xPadding = (class340.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class379.loginBoxCenter = Login.loginBoxX + 180; + PcmPlayer.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "77" + ) + static final int method472(int var0, int var1) { + if (var0 == -1) { + return 12345678; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("nd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1310629797" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + class304.method1636(); + ZoneOperation.method1644(); + int var1 = class150.VarpDefinition_get(var0).type; + if (var1 != 0) { + int var2 = Varps.Varps_main[var0]; + if (var1 == 1) { + if (var2 == 1) { + JagexCache.method920(0.9D); + } + + if (var2 == 2) { + JagexCache.method920(0.8D); + } + + if (var2 == 3) { + JagexCache.method920(0.7D); + } + + if (var2 == 4) { + JagexCache.method920(0.6D); + } + } + + if (var1 == 3) { + if (var2 == 0) { + JagexCache.method921(255); + } + + if (var2 == 1) { + JagexCache.method921(192); + } + + if (var2 == 2) { + JagexCache.method921(128); + } + + if (var2 == 3) { + JagexCache.method921(64); + } + + if (var2 == 4) { + JagexCache.method921(0); + } + } + + if (var1 == 4) { + if (var2 == 0) { + FloorOverlayDefinition.method1114(127); + } + + if (var2 == 1) { + FloorOverlayDefinition.method1114(96); + } + + if (var2 == 2) { + FloorOverlayDefinition.method1114(64); + } + + if (var2 == 3) { + FloorOverlayDefinition.method1114(32); + } + + if (var2 == 4) { + FloorOverlayDefinition.method1114(0); + } + } + + if (var1 == 5) { + Client.leftClickOpensMenu = var2 == 1; + } + + if (var1 == 6) { + Client.chatEffects = var2; + } + + if (var1 == 9) { + } + + if (var1 == 10) { + if (var2 == 0) { + class198.method994(127); + } + + if (var2 == 1) { + class198.method994(96); + } + + if (var2 == 2) { + class198.method994(64); + } + + if (var2 == 3) { + class198.method994(32); + } + + if (var2 == 4) { + class198.method994(0); + } + } + + if (var1 == 17) { + Client.followerIndex = var2 & 65535; + } + + if (var1 == 18) { + Client.playerAttackOption = (AttackOption)SequenceDefinition.findEnumerated(ClientPreferences.method569(), var2); + if (Client.playerAttackOption == null) { + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var1 == 19) { + if (var2 == -1) { + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; + } + } + + if (var1 == 22) { + Client.npcAttackOption = (AttackOption)SequenceDefinition.findEnumerated(ClientPreferences.method569(), var2); + if (Client.npcAttackOption == null) { + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } + + @ObfuscatedName("os") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", + garbageValue = "-1009991511" + ) + static String method474(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; + if (Client.gameBuild == 1) { + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { + var0 = "local"; + } + + String var3 = ""; + if (HealthBarDefinition.param9 != null) { + var3 = "/p=" + HealthBarDefinition.param9; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + WorldMapLabelSize.clientLanguage + "/a=" + WorldMapIcon_1.field2337 + var3 + "/"; + } } \ No newline at end of file diff --git a/osrs/src/main/java/ScriptFrame.java b/osrs/src/main/java/ScriptFrame.java index ee67dabe6..0e9124e37 100644 --- a/osrs/src/main/java/ScriptFrame.java +++ b/osrs/src/main/java/ScriptFrame.java @@ -3,28 +3,50 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cv") +@ObfuscatedName("cn") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("ay") - static String field345; - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lds;" ) @Export("script") Script script; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("pc") int pc; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("intLocals") int[] intLocals; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("stringLocals") String[] stringLocals; ScriptFrame() { this.pc = -1; } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1603981165" + ) + public static boolean method334() { + return !class319.field2789.isEmpty(); + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Lnm;IIII)V", + garbageValue = "1957450993" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3074 == null) { + throw new RuntimeException(); + } else { + var0.field3074[var1] = var2; + var0.field3075[var1] = var3; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/ScriptOpcodes.java b/osrs/src/main/java/ScriptOpcodes.java deleted file mode 100644 index a91a3cebd..000000000 --- a/osrs/src/main/java/ScriptOpcodes.java +++ /dev/null @@ -1,3 +0,0 @@ -public class ScriptOpcodes { - public static final int RUNELITE_EXECUTE = 6599; -} \ No newline at end of file diff --git a/osrs/src/main/java/SecureRandomCallable.java b/osrs/src/main/java/SecureRandomCallable.java index 9da41a22f..a8cba02f1 100644 --- a/osrs/src/main/java/SecureRandomCallable.java +++ b/osrs/src/main/java/SecureRandomCallable.java @@ -3,27 +3,21 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import java.security.SecureRandom; import java.util.concurrent.Callable; -@ObfuscatedName("dn") +@ObfuscatedName("dz") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("ds") + @ObfuscatedName("dq") @ObfuscatedSignature( - descriptor = "[Luk;" + descriptor = "[Lud;" ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "Lpi;" - ) - @Export("fontPlain12") - static Font fontPlain12; + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; + @ObfuscatedName("uo") + @Export("cameraMoveToSpeed") + static int cameraMoveToSpeed; SecureRandomCallable() { } @@ -36,229 +30,22 @@ public Object call() { return var2; } - @ObfuscatedName("au") + @ObfuscatedName("oy") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;III)V", - garbageValue = "297617664" + descriptor = "(I)V", + garbageValue = "-2097515012" ) - public static void method462(String var0, String var1, String var2, int var3, int var4) throws IOException { - if (var1 != null && !var1.isEmpty()) { - var0 = var0 + "-" + var1; - } - - JagexCache.field1461 = var4; - JagexCache.cacheGamebuild = var3; - - try { - ScriptFrame.field345 = System.getProperty("os.name"); - } catch (Exception var31) { - ScriptFrame.field345 = "Unknown"; - } - - Messages.field1146 = ScriptFrame.field345.toLowerCase(); - class36.userHomeDirectory = null; - - try { - class36.userHomeDirectory = System.getProperty("jagex.userhome"); - } catch (Exception var30) { - } - - if (class36.userHomeDirectory == null) { - try { - class36.userHomeDirectory = System.getProperty("user.home"); - } catch (Exception var29) { - } - } - - if (class36.userHomeDirectory != null) { - class36.userHomeDirectory = class36.userHomeDirectory + "/"; - } - - try { - if (Messages.field1146.startsWith("win")) { - if (class36.userHomeDirectory == null) { - class36.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (class36.userHomeDirectory == null) { - class36.userHomeDirectory = System.getenv("HOME"); - } - - if (class36.userHomeDirectory != null) { - class36.userHomeDirectory = class36.userHomeDirectory + "/"; - } - } catch (Exception var28) { - } - - if (class36.userHomeDirectory == null) { - class36.userHomeDirectory = "~/"; - } - - DelayFadeTask.field3712 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class36.userHomeDirectory, "/tmp/", ""}; - JagexCache.field1464 = new String[]{".jagex_cache_" + JagexCache.cacheGamebuild, ".file_store_" + JagexCache.cacheGamebuild}; - int var19 = 0; - - label233: - while (var19 < 4) { - String var7 = var19 == 0 ? "" : "" + var19; - JagexCache.field1463 = new File(class36.userHomeDirectory, "jagex_cl_" + var0 + "_" + var2 + var7 + ".dat"); - String var8 = null; - String var9 = null; - boolean var10 = false; - int var15; - File var36; - if (JagexCache.field1463.exists()) { - try { - AccessFile var11 = new AccessFile(JagexCache.field1463, "rw", 10000L); - - Buffer var12; - int var13; - for (var12 = new Buffer((int)var11.length()); var12.offset < var12.array.length; var12.offset += var13) { - var13 = var11.read(var12.array, var12.offset, var12.array.length - var12.offset); - if (var13 == -1) { - throw new IOException(); - } - } - - var12.offset = 0; - var13 = var12.readUnsignedByte(); - if (var13 < 1 || var13 > 3) { - throw new IOException("" + var13); - } - - int var14 = 0; - if (var13 > 1) { - var14 = var12.readUnsignedByte(); - } - - if (var13 <= 2) { - var8 = var12.readStringCp1252NullCircumfixed(); - if (var14 == 1) { - var9 = var12.readStringCp1252NullCircumfixed(); - } - } else { - var8 = var12.method2556(); - if (var14 == 1) { - var9 = var12.method2556(); - } - } - - var11.close(); - } catch (IOException var33) { - var33.printStackTrace(); - } - - if (var8 != null) { - var36 = new File(var8); - if (!var36.exists()) { - var8 = null; - } - } - - if (var8 != null) { - var36 = new File(var8, "test.dat"); - - boolean var38; - try { - RandomAccessFile var20 = new RandomAccessFile(var36, "rw"); - var15 = var20.read(); - var20.seek(0L); - var20.write(var15); - var20.seek(0L); - var20.close(); - var36.delete(); - var38 = true; - } catch (Exception var27) { - var38 = false; - } - - if (!var38) { - var8 = null; - } + static void method458() { + if (WallDecoration.field2303 != null) { + Client.field368 = Client.cycle; + WallDecoration.field2303.method1998(); + + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { + WallDecoration.field2303.method1997((Client.players[var0].x >> 7) + class20.baseX, (Client.players[var0].y >> 7) + class19.baseY); } } - - if (var8 == null && var19 == 0) { - label208: - for (int var21 = 0; var21 < JagexCache.field1464.length; ++var21) { - for (int var22 = 0; var22 < DelayFadeTask.field3712.length; ++var22) { - File var23 = new File(DelayFadeTask.field3712[var22] + JagexCache.field1464[var21] + File.separatorChar + var0 + File.separatorChar); - if (var23.exists() && Message.method340(new File(var23, "test.dat"), true)) { - var8 = var23.toString(); - var10 = true; - break label208; - } - } - } - } - - if (var8 == null) { - var8 = class36.userHomeDirectory + File.separatorChar + "jagexcache" + var7 + File.separatorChar + var0 + File.separatorChar + var2 + File.separatorChar; - var10 = true; - } - - if (var9 != null) { - File var35 = new File(var9); - var36 = new File(var8); - - try { - File[] var40 = var35.listFiles(); - File[] var39 = var40; - - for (var15 = 0; var15 < var39.length; ++var15) { - File var16 = var39[var15]; - File var17 = new File(var36, var16.getName()); - boolean var18 = var16.renameTo(var17); - if (!var18) { - throw new IOException(); - } - } - } catch (Exception var32) { - var32.printStackTrace(); - } - - var10 = true; - } - - if (var10) { - class165.method868(new File(var8), (File)null); - } - - File var6 = new File(var8); - JagexCache.cacheDir = var6; - if (!JagexCache.cacheDir.exists()) { - JagexCache.cacheDir.mkdirs(); - } - - File[] var34 = JagexCache.cacheDir.listFiles(); - if (var34 != null) { - File[] var37 = var34; - - for (int var24 = 0; var24 < var37.length; ++var24) { - File var25 = var37[var24]; - if (!Message.method340(var25, false)) { - ++var19; - continue label233; - } - } - } - break; } - File var5 = JagexCache.cacheDir; - FileSystem.FileSystem_cacheDir = var5; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; - FileSystem.method913(); - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class299.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class299.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - WallDecoration.JagexCache_idxFiles = new BufferedFile[JagexCache.field1461]; - - for (int var26 = 0; var26 < JagexCache.field1461; ++var26) { - WallDecoration.JagexCache_idxFiles[var26] = new BufferedFile(new AccessFile(class299.getFile("main_file_cache.idx" + var26), "rw", 1048576L), 6000, 0); - } - - } } } \ No newline at end of file diff --git a/osrs/src/main/java/SecureRandomFuture.java b/osrs/src/main/java/SecureRandomFuture.java index f68f3e275..7651e290e 100644 --- a/osrs/src/main/java/SecureRandomFuture.java +++ b/osrs/src/main/java/SecureRandomFuture.java @@ -8,13 +8,21 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -@ObfuscatedName("cc") +@ObfuscatedName("dm") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("au") + @ObfuscatedName("ah") + @Export("Tiles_shapes") + static byte[][][] Tiles_shapes; + @ObfuscatedName("av") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("ir") + static int[] field809; + @ObfuscatedName("ac") @Export("executor") ExecutorService executor; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("future") Future future; @@ -23,10 +31,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2045980697" + descriptor = "(B)V", + garbageValue = "75" ) @Export("shutdown") void shutdown() { @@ -34,20 +42,20 @@ void shutdown() { this.executor = null; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1770543009" + garbageValue = "1952225914" ) @Export("isDone") boolean isDone() { return this.future.isDone(); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)Ljava/security/SecureRandom;", - garbageValue = "-53" + descriptor = "(I)Ljava/security/SecureRandom;", + garbageValue = "862228801" ) @Export("get") SecureRandom get() { @@ -60,229 +68,98 @@ SecureRandom get() { } } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1197212946" + descriptor = "(ILrw;Lok;I)V", + garbageValue = "-1154223283" ) - public static void method435(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Luy;" - ) - public static RunException method438(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.field4291 = var2.field4291 + ' ' + var1; - } else { - var2 = new RunException(var0, var1); + static void method444(int var0, ArchiveDisk var1, Archive var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 1; + var3.key = (long)var0; + var3.archiveDisk = var1; + var3.archive = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); } - return var2; + class87.method461(); } - @ObfuscatedName("ai") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(ILdh;ZS)I", - garbageValue = "-1442" + descriptor = "(IIIII)V", + garbageValue = "1191570763" ) - static int method441(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var4 = class92.getWidget(var3); - } else { - var4 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var4 == null) { + var4 = new ItemContainer(); + ItemContainer.itemContainers.put(var4, (long)var0); } - if (var0 == 1000) { - SoundCache.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - class218.invalidateWidget(var4); - class219.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var3 >> 16], var4, false); - } + if (var4.ids.length <= var1) { + int[] var5 = new int[var1 + 1]; + int[] var6 = new int[var1 + 1]; - return 1; - } else if (var0 == 1001) { - SoundCache.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - class218.invalidateWidget(var4); - class219.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var3 >> 16], var4, false); + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { + var5[var7] = var4.ids[var7]; + var6[var7] = var4.quantities[var7]; } - return 1; - } else if (var0 == 1003) { - boolean var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - class218.invalidateWidget(var4); + for (var7 = var4.ids.length; var7 < var1; ++var7) { + var5[var7] = -1; + var6[var7] = 0; } - return 1; - } else if (var0 == 1005) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1006) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - return 1; - } else { - return 2; + var4.ids = var5; + var4.quantities = var6; } + + var4.ids[var1] = var2; + var4.quantities[var1] = var3; } - @ObfuscatedName("az") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ltm;IIIIIII)V", - garbageValue = "-1694412552" + descriptor = "(II)F", + garbageValue = "469992378" ) - @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7; - if (class30.method116(var1, var2, var3)) { - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - - while (true) { - var7 = var0.readUnsignedShort(); - if (var7 == 0) { - if (var1 == 0) { - int[] var8 = Tiles.Tiles_heights[0][var2]; - int var11 = var4 + 932731; - int var12 = var5 + 556238; - int var13 = class141.method765(var11 + 45365, 91923 + var12, 4) - 128 + (class141.method765(10294 + var11, var12 + 37821, 2) - 128 >> 1) + (class141.method765(var11, var12, 1) - 128 >> 2); - var13 = (int)((double)var13 * 0.3D) + 35; - if (var13 < 10) { - var13 = 10; - } else if (var13 > 60) { - var13 = 60; - } - - var8[var3] = -var13 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; - } - break; - } - - if (var7 == 1) { - int var14 = var0.readUnsignedByte(); - if (var14 == 1) { - var14 = 0; - } - - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var14 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var14 * 8; - } - break; - } - - if (var7 <= 49) { - class227.Tiles_overlays[var1][var2][var3] = (short)var0.readShort(); - class172.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); - ModelData0.field2282[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); - } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); - } else { - Tiles.Tiles_underlays[var1][var2][var3] = (short)(var7 - 81); - } - } - } else { - while (true) { - var7 = var0.readUnsignedShort(); - if (var7 == 0) { - break; - } - - if (var7 == 1) { - var0.readUnsignedByte(); - break; - } - - if (var7 <= 49) { - var0.readShort(); - } - } - } - + static final float method443(int var0) { + float var1 = 10075.0F - (float)var0; + return (1.0075567F * var1 - 75.56675F) / var1; } - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-760322108" - ) - public static int method439(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; + @ObfuscatedName("ah") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); } - @ObfuscatedName("ax") + @ObfuscatedName("nn") @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "-52" + descriptor = "(IIIILud;Lmp;B)V", + garbageValue = "23" ) - static int method442(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - if (var0 == 1800) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = HealthBarDefinition.Widget_unpackTargetMask(NewShit.getWidgetFlags(var3)); - return 1; - } else if (var0 != 1801) { - if (var0 == 1802) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { + int var6 = Client.camAngleY & 2047; + int var7 = var3 * var3 + var2 * var2; + if (var7 <= 6400) { + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var10 = var9 * var2 + var3 * var8 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + if (var7 > 2500) { + var4.method2723(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.dataText; + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); } - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; } - - return 1; } } - - @ObfuscatedName("jm") - @ObfuscatedSignature( - descriptor = "(Ldr;II)V", - garbageValue = "1880526861" - ) - static final void method443(Actor var0, int var1) { - HealthBar.worldToScreen(var0.x, var0.y, var1); - } - - @ObfuscatedName("ou") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1763932419" - ) - static void method444(boolean var0) { - Client.leftClickOpensMenu = var0; - } } \ No newline at end of file diff --git a/osrs/src/main/java/SequenceDefinition.java b/osrs/src/main/java/SequenceDefinition.java index 9a73ef756..1237bac04 100644 --- a/osrs/src/main/java/SequenceDefinition.java +++ b/osrs/src/main/java/SequenceDefinition.java @@ -6,91 +6,109 @@ import java.util.HashMap; import java.util.Map; -@ObfuscatedName("ib") +@ObfuscatedName("if") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("au") - static boolean field1836; - @ObfuscatedName("ap") + @ObfuscatedName("ac") + static boolean field1841; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lom;" + ) + @Export("SequenceDefinition_animationsArchive") + public static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("SequenceDefinition_skeletonsArchive") + public static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Llr;" ) @Export("SequenceDefinition_cached") public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("SequenceDefinition_cachedFrames") public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("SequenceDefinition_cachedModel") public static EvictingDualNodeHashTable SequenceDefinition_cachedModel; - @ObfuscatedName("ad") + @ObfuscatedName("ri") + @ObfuscatedSignature( + descriptor = "Lsr;" + ) + @Export("varclan") + static class469 varclan; + @ObfuscatedName("ag") @Export("SequenceDefinition_cachedModelId") public int SequenceDefinition_cachedModelId; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("animMayaFrameSounds") public Map animMayaFrameSounds; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("animMayaStart") int animMayaStart; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("animMayaEnd") int animMayaEnd; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("frameCount") public int frameCount; - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("mergedBoneGroups") int[] mergedBoneGroups; - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("animMayaMasks") boolean[] animMayaMasks; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("stretches") public boolean stretches; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("forcedPriority") public int forcedPriority; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("shield") public int shield; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("weapon") public int weapon; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("iterations") public int iterations; - @ObfuscatedName("bh") - public boolean field1843; - @ObfuscatedName("bj") + @ObfuscatedName("bn") + public boolean field1849; + @ObfuscatedName("bk") @Export("precedenceAnimating") public int precedenceAnimating; - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("priority") public int priority; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("replyMode") public int replyMode; static { - field1836 = false; + field1841 = false; SequenceDefinition_cached = new EvictingDualNodeHashTable(64); SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); SequenceDefinition_cachedModel = new EvictingDualNodeHashTable(100); @@ -106,16 +124,16 @@ public class SequenceDefinition extends DualNode { this.shield = -1; this.weapon = -1; this.iterations = 99; - this.field1843 = false; + this.field1849 = false; this.precedenceAnimating = -1; this.priority = -1; this.replyMode = 2; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "-1228314075" + descriptor = "(Lul;B)V", + garbageValue = "-79" ) @Export("decode") void decode(Buffer var1) { @@ -129,10 +147,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "-998572107" + descriptor = "(Lul;II)V", + garbageValue = "839529749" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -176,7 +194,7 @@ void decodeNext(Buffer var1, int var2) { this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { this.iterations = var1.readUnsignedByte(); - this.field1843 = true; + this.field1849 = true; } else if (var2 == 9) { this.precedenceAnimating = var1.readUnsignedByte(); } else if (var2 == 10) { @@ -231,10 +249,10 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "968421208" + descriptor = "(S)V", + garbageValue = "12569" ) @Export("postDecode") void postDecode() { @@ -256,17 +274,17 @@ void postDecode() { } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljr;II)Ljr;", - garbageValue = "-2024092599" + descriptor = "(Ljn;II)Ljn;", + garbageValue = "119029641" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { Model var4; if (!this.isCachedModelIdSet()) { var2 = this.frameIds[var2]; - Frames var5 = MidiPcmStream.getFrames(var2 >> 16); + Frames var5 = class14.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var1.toSharedSequenceModel(true); @@ -276,28 +294,28 @@ public Model transformActorModel(Model var1, int var2) { return var4; } } else { - class137 var3 = Tile.method1184(this.SequenceDefinition_cachedModelId); + class139 var3 = class214.method1051(this.SequenceDefinition_cachedModelId); if (var3 == null) { return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var3.method748()); - var4.method1325(var3, var2); + var4 = var1.toSharedSequenceModel(!var3.method740()); + var4.method1366(var3, var2); return var4; } } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljr;IIB)Ljr;", - garbageValue = "93" + descriptor = "(Ljn;III)Ljn;", + garbageValue = "2034057429" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { Model var5; if (!this.isCachedModelIdSet()) { var2 = this.frameIds[var2]; - Frames var6 = MidiPcmStream.getFrames(var2 >> 16); + Frames var6 = class14.getFrames(var2 >> 16); var2 &= 65535; if (var6 == null) { return var1.toSharedSequenceModel(true); @@ -324,11 +342,11 @@ Model transformObjectModel(Model var1, int var2, int var3) { return var5; } } else { - class137 var4 = Tile.method1184(this.SequenceDefinition_cachedModelId); + class139 var4 = class214.method1051(this.SequenceDefinition_cachedModelId); if (var4 == null) { return var1.toSharedSequenceModel(true); } else { - var5 = var1.toSharedSequenceModel(!var4.method748()); + var5 = var1.toSharedSequenceModel(!var4.method740()); var3 &= 3; if (var3 == 1) { var5.rotateY270Ccw(); @@ -338,7 +356,7 @@ Model transformObjectModel(Model var1, int var2, int var3) { var5.rotateY90Ccw(); } - var5.method1325(var4, var2); + var5.method1366(var4, var2); if (var3 == 1) { var5.rotateY90Ccw(); } else if (var3 == 2) { @@ -352,17 +370,17 @@ Model transformObjectModel(Model var1, int var2, int var3) { } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljr;II)Ljr;", - garbageValue = "1650193615" + descriptor = "(Ljn;IB)Ljn;", + garbageValue = "58" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { Model var4; if (!this.isCachedModelIdSet()) { var2 = this.frameIds[var2]; - Frames var5 = MidiPcmStream.getFrames(var2 >> 16); + Frames var5 = class14.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var1.toSharedSpotAnimationModel(true); @@ -372,48 +390,48 @@ Model transformSpotAnimationModel(Model var1, int var2) { return var4; } } else { - class137 var3 = Tile.method1184(this.SequenceDefinition_cachedModelId); + class139 var3 = class214.method1051(this.SequenceDefinition_cachedModelId); if (var3 == null) { return var1.toSharedSpotAnimationModel(true); } else { - var4 = var1.toSharedSpotAnimationModel(!var3.method748()); - var4.method1325(var3, var2); + var4 = var1.toSharedSpotAnimationModel(!var3.method740()); + var4.method1366(var3, var2); return var4; } } } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Ljr;ILib;II)Ljr;", - garbageValue = "-587997563" + descriptor = "(Ljn;ILif;II)Ljn;", + garbageValue = "-130759845" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - if (field1836 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { - return this.method1082(var1, var2, var3, var4); + if (field1841 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { + return this.method1124(var1, var2, var3, var4); } else { Model var5 = var1.toSharedSequenceModel(false); boolean var6 = false; Frames var7 = null; Skeleton var8 = null; - class137 var9; + class139 var9; if (this.isCachedModelIdSet()) { - var9 = this.method1086(); + var9 = this.method1128(); if (var9 == null) { return var5; } if (var3.isCachedModelIdSet() && this.animMayaMasks == null) { - var5.method1325(var9, var2); + var5.method1366(var9, var2); return var5; } - var8 = var9.field1305; - var5.method1329(var8, var9, var2, this.animMayaMasks, false, !var3.isCachedModelIdSet()); + var8 = var9.field1298; + var5.method1370(var8, var9, var2, this.animMayaMasks, false, !var3.isCachedModelIdSet()); } else { var2 = this.frameIds[var2]; - var7 = MidiPcmStream.getFrames(var2 >> 16); + var7 = class14.getFrames(var2 >> 16); var2 &= 65535; if (var7 == null) { return var3.transformActorModel(var1, var4); @@ -431,34 +449,34 @@ public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, var6 = var3.isCachedModelIdSet(); if (!var6) { - var5.method1330(var7, var2, this.mergedBoneGroups, false); + var5.method1371(var7, var2, this.mergedBoneGroups, false); } } if (var3.isCachedModelIdSet()) { - var9 = var3.method1086(); + var9 = var3.method1128(); if (var9 == null) { return var5; } if (var8 == null) { - var8 = var9.field1305; + var8 = var9.field1298; } - var5.method1329(var8, var9, var4, this.animMayaMasks, true, true); + var5.method1370(var8, var9, var4, this.animMayaMasks, true, true); } else { var4 = var3.frameIds[var4]; - Frames var10 = MidiPcmStream.getFrames(var4 >> 16); + Frames var10 = class14.getFrames(var4 >> 16); var4 &= 65535; if (var10 == null) { return this.transformActorModel(var1, var2); } - var5.method1330(var10, var4, this.mergedBoneGroups, true); + var5.method1371(var10, var4, this.mergedBoneGroups, true); } if (var6 && var7 != null) { - var5.method1330(var7, var2, this.mergedBoneGroups, false); + var5.method1371(var7, var2, this.mergedBoneGroups, false); } var5.resetBounds(); @@ -466,20 +484,20 @@ public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Ljr;ILib;II)Ljr;", - garbageValue = "-2128259101" + descriptor = "(Ljn;ILif;II)Ljn;", + garbageValue = "-561327832" ) - Model method1082(Model var1, int var2, SequenceDefinition var3, int var4) { + Model method1124(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; - Frames var5 = MidiPcmStream.getFrames(var2 >> 16); + Frames var5 = class14.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; - Frames var6 = MidiPcmStream.getFrames(var4 >> 16); + Frames var6 = class14.getFrames(var4 >> 16); var4 &= 65535; Model var7; if (var6 == null) { @@ -494,16 +512,16 @@ Model method1082(Model var1, int var2, SequenceDefinition var3, int var4) { } } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Ljr;II)Ljr;", - garbageValue = "-1580674405" + descriptor = "(Ljn;IS)Ljn;", + garbageValue = "6000" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { if (!this.isCachedModelIdSet()) { int var3 = this.frameIds[var2]; - Frames var4 = MidiPcmStream.getFrames(var3 >> 16); + Frames var4 = class14.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -512,7 +530,7 @@ public Model transformWidgetModel(Model var1, int var2) { int var6 = 0; if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { var6 = this.chatFrameIds[var2]; - var5 = MidiPcmStream.getFrames(var6 >> 16); + var5 = class14.getFrames(var6 >> 16); var6 &= 65535; } @@ -533,47 +551,56 @@ public Model transformWidgetModel(Model var1, int var2) { } } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1169271782" + garbageValue = "-1797639917" ) @Export("isCachedModelIdSet") public boolean isCachedModelIdSet() { return this.SequenceDefinition_cachedModelId >= 0; } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2010728570" + garbageValue = "-1128031722" ) - public int method1085() { + public int method1127() { return this.animMayaEnd - this.animMayaStart; } - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)Lfv;", - garbageValue = "-46871670" + descriptor = "(I)Lfk;", + garbageValue = "-585395726" ) - class137 method1086() { - return this.isCachedModelIdSet() ? Tile.method1184(this.SequenceDefinition_cachedModelId) : null; + class139 method1128() { + return this.isCachedModelIdSet() ? class214.method1051(this.SequenceDefinition_cachedModelId) : null; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") + static boolean method1116(long var0) { + int var2 = (int)(var0 >>> 14 & 3L); + return var2 == 2; + } + + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)Ltb;", - garbageValue = "1250355259" + descriptor = "([Lon;II)Lon;", + garbageValue = "-805987290" ) - public static class502 method1074(int var0) { - int var1 = class500.field4098[var0]; - if (var1 == 1) { - return class502.field4101; - } else if (var1 == 2) { - return class502.field4100; - } else { - return var1 == 3 ? class502.field4099 : null; + @Export("findEnumerated") + public static class386 findEnumerated(class386[] var0, int var1) { + class386[] var2 = var0; + + for (int var3 = 0; var3 < var2.length; ++var3) { + class386 var4 = var2[var3]; + if (var1 == var4.rsOrdinal()) { + return var4; + } } + + return null; } } \ No newline at end of file diff --git a/osrs/src/main/java/ServerPacket.java b/osrs/src/main/java/ServerPacket.java index 5098070ad..8bfd5f115 100644 --- a/osrs/src/main/java/ServerPacket.java +++ b/osrs/src/main/java/ServerPacket.java @@ -3,889 +3,882 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("lu") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("NPC_ANIM_SPECIFIC") public static final ServerPacket NPC_ANIM_SPECIFIC; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("AREA_SOUND") - public static final ServerPacket AREA_SOUND; - @ObfuscatedName("ao") + @Export("REFLECTIONCHECK_FRIENDLIST") + public static final ServerPacket REFLECTIONCHECK_FRIENDLIST; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("TRADING_POST_UPDATE") public static final ServerPacket TRADING_POST_UPDATE; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("SEND_PING") public static final ServerPacket SEND_PING; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_REBOOT_TIMER") - public static final ServerPacket UPDATE_REBOOT_TIMER; - @ObfuscatedName("ai") + public static final ServerPacket field2649; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETEVENTS") - public static final ServerPacket IF_SETEVENTS; - @ObfuscatedName("az") + @Export("IF_SETNPCHEAD") + public static final ServerPacket IF_SETNPCHEAD; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("NEW_PACKET_CAM_RESET_V2") - public static final ServerPacket NEW_PACKET_CAM_RESET_V2; - @ObfuscatedName("ap") + public static final ServerPacket field2652; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("SET_PLAYER_OP") public static final ServerPacket SET_PLAYER_OP; - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("VARP_LARGE") - public static final ServerPacket VARP_LARGE; - @ObfuscatedName("af") + @Export("OBJ_COUNT") + public static final ServerPacket OBJ_COUNT; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETOBJECT") - public static final ServerPacket IF_SETOBJECT; - @ObfuscatedName("ad") + @Export("UPDATE_UID192") + public static final ServerPacket UPDATE_UID192; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("OPEN_URL") - public static final ServerPacket OPEN_URL; - @ObfuscatedName("aq") + @Export("OBJ_DEL_LEGACY") + public static final ServerPacket OBJ_DEL_LEGACY; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_MOVESUB") - public static final ServerPacket IF_MOVESUB; - @ObfuscatedName("al") + @Export("MIDI_SONG_LEGACY") + public static final ServerPacket MIDI_SONG_LEGACY; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CAM_LOOKAT_EASED_ANGLE_ABSOLUTE") - public static final ServerPacket CAM_LOOKAT_EASED_ANGLE_ABSOLUTE; - @ObfuscatedName("an") + @Export("RESET_ANIMS") + public static final ServerPacket RESET_ANIMS; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CAM_MOVETO_EASED_CIRCULAR") - public static final ServerPacket CAM_MOVETO_EASED_CIRCULAR; - @ObfuscatedName("ar") + @Export("IF_OPENTOP") + public static final ServerPacket IF_OPENTOP; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETTEXT") - public static final ServerPacket IF_SETTEXT; - @ObfuscatedName("ab") + @Export("UPDATE_INV_STOP_TRANSMIT") + public static final ServerPacket UPDATE_INV_STOP_TRANSMIT; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("REFLECTIONCHECK_FRIENDLIST") - public static final ServerPacket REFLECTIONCHECK_FRIENDLIST; - @ObfuscatedName("ag") + @Export("MIDI_SONG_WITH_SECONDARY") + public static final ServerPacket MIDI_SONG_WITH_SECONDARY; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("MAPPROJ_ANIM") public static final ServerPacket MAPPROJ_ANIM; - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("GAMEFRAME_FULL") - public static final ServerPacket GAMEFRAME_FULL; - @ObfuscatedName("ax") + @Export("OPEN_URL") + public static final ServerPacket OPEN_URL; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_INV_STOP_TRANSMIT") - public static final ServerPacket UPDATE_INV_STOP_TRANSMIT; - @ObfuscatedName("ah") + public static final ServerPacket field2643; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("MESSAGE_PRIVATE_ECHO") - public static final ServerPacket MESSAGE_PRIVATE_ECHO; - @ObfuscatedName("as") + @Export("IF_CLOSESUB") + public static final ServerPacket IF_CLOSESUB; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("RUN_CLIENTSCRIPT") - public static final ServerPacket RUN_CLIENTSCRIPT; - @ObfuscatedName("ay") + @Export("UPDATE_ZONE_PARTIAL_ENCLOSED") + public static final ServerPacket UPDATE_ZONE_PARTIAL_ENCLOSED; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("VARCLAN_ENABLE") public static final ServerPacket VARCLAN_ENABLE; - @ObfuscatedName("aj") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("MAPPROJ_ANIM_SPECIFIC") - public static final ServerPacket MAPPROJ_ANIM_SPECIFIC; - @ObfuscatedName("av") + @Export("UPDATE_REBOOT_TIMER") + public static final ServerPacket UPDATE_REBOOT_TIMER; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_RUNENERGY") - public static final ServerPacket UPDATE_RUNENERGY; - @ObfuscatedName("aw") + @Export("VARP_LARGE") + public static final ServerPacket VARP_LARGE; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CAM_SHAKE") - public static final ServerPacket CAM_SHAKE; - @ObfuscatedName("ak") + @Export("TRADING_POST_RESULTS") + public static final ServerPacket TRADING_POST_RESULTS; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("MESSAGE_CLANCHANNEL") public static final ServerPacket MESSAGE_CLANCHANNEL; - @ObfuscatedName("bh") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETNPCHEAD") - public static final ServerPacket IF_SETNPCHEAD; - @ObfuscatedName("bj") + @Export("NPC_SPOTANIM_SPECIFIC") + public static final ServerPacket NPC_SPOTANIM_SPECIFIC; + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_CLOSESUB") - public static final ServerPacket IF_CLOSESUB; - @ObfuscatedName("bk") + @Export("IF_SETTEXT") + public static final ServerPacket IF_SETTEXT; + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("UPDATE_STAT") public static final ServerPacket UPDATE_STAT; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("UPDATE_IGNORELIST") public static final ServerPacket UPDATE_IGNORELIST; - @ObfuscatedName("bt") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETCOLOUR") - public static final ServerPacket IF_SETCOLOUR; - @ObfuscatedName("bd") + @Export("IF_SETMODEL") + public static final ServerPacket IF_SETMODEL; + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("MAP_ANIM") public static final ServerPacket MAP_ANIM; - @ObfuscatedName("by") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("NPC_SPOTANIM_SPECIFIC") - public static final ServerPacket NPC_SPOTANIM_SPECIFIC; - @ObfuscatedName("bs") + @Export("IF_SETEVENTS") + public static final ServerPacket IF_SETEVENTS; + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("HEAT_MAP") - public static final ServerPacket HEAT_MAP; - @ObfuscatedName("bm") + @Export("MIDI_SONG_STOP") + public static final ServerPacket MIDI_SONG_STOP; + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("LOC_ADD_CHANGE") public static final ServerPacket LOC_ADD_CHANGE; - @ObfuscatedName("bf") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("PLAYER_ANIM_SPECIFIC") - public static final ServerPacket PLAYER_ANIM_SPECIFIC; - @ObfuscatedName("bq") + public static final ServerPacket field2675; + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("OBJ_ADD") public static final ServerPacket OBJ_ADD; - @ObfuscatedName("ba") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("TRADING_POST_RESULTS") - public static final ServerPacket TRADING_POST_RESULTS; - @ObfuscatedName("bl") + @Export("LOC_ANIM_SPECIFIC") + public static final ServerPacket LOC_ANIM_SPECIFIC; + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("SPOTANIM_SPECIFIC") - public static final ServerPacket SPOTANIM_SPECIFIC; - @ObfuscatedName("bp") + @Export("UPDATE_ZONE_PARTIAL_FOLLOWS") + public static final ServerPacket UPDATE_ZONE_PARTIAL_FOLLOWS; + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("VARP_SMALL") - public static final ServerPacket VARP_SMALL; - @ObfuscatedName("bu") + @Export("PLAYER_INFO") + public static final ServerPacket PLAYER_INFO; + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CHAT_FILTER_SETTINGS") - public static final ServerPacket CHAT_FILTER_SETTINGS; - @ObfuscatedName("bo") + @Export("MESSAGE_PRIVATE_ECHO") + public static final ServerPacket MESSAGE_PRIVATE_ECHO; + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("UPDATE_RUNWEIGHT") public static final ServerPacket UPDATE_RUNWEIGHT; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_ZONE_PARTIAL_FOLLOWS") - public static final ServerPacket UPDATE_ZONE_PARTIAL_FOLLOWS; - @ObfuscatedName("br") + @Export("CAM_LOOKAT_EASED_ANGLE_RELATIVE") + public static final ServerPacket CAM_LOOKAT_EASED_ANGLE_RELATIVE; + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("RESET_ANIMS") - public static final ServerPacket RESET_ANIMS; - @ObfuscatedName("be") + @Export("VARP_SMALL") + public static final ServerPacket VARP_SMALL; + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("SYNTH_SOUND") - public static final ServerPacket SYNTH_SOUND; - @ObfuscatedName("bi") + @Export("PLAYER_SPOTANIM_SPECIFIC") + public static final ServerPacket PLAYER_SPOTANIM_SPECIFIC; + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("MIDI_JINGLE") - public static final ServerPacket MIDI_JINGLE; - @ObfuscatedName("bz") + public static final ServerPacket field2672; + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("IF1_MODELROTATE") public static final ServerPacket IF1_MODELROTATE; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("HINT_ARROW") public static final ServerPacket HINT_ARROW; - @ObfuscatedName("bn") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("NEW_PACK_215") public static final ServerPacket NEW_PACK_215; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Llg;" - ) - @Export("IF_SETPLAYERMODEL_BASECOLOUR") - public static final ServerPacket IF_SETPLAYERMODEL_BASECOLOUR; - @ObfuscatedName("bc") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("IF_SETANGLE") public static final ServerPacket IF_SETANGLE; - @ObfuscatedName("bg") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("NPC_HEADICON_SPECIFIC") - public static final ServerPacket NPC_HEADICON_SPECIFIC; - @ObfuscatedName("cw") + @Export("IF_SETPLAYERMODEL_OBJ") + public static final ServerPacket IF_SETPLAYERMODEL_OBJ; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + public static final ServerPacket field2683; + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("MESSAGE_PRIVATE") public static final ServerPacket MESSAGE_PRIVATE; - @ObfuscatedName("cf") + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETSCROLLPOS") - public static final ServerPacket IF_SETSCROLLPOS; - @ObfuscatedName("cm") + @Export("IF_SETOBJECT") + public static final ServerPacket IF_SETOBJECT; + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("REBUILD_REGION") - public static final ServerPacket REBUILD_REGION; - @ObfuscatedName("cn") + @Export("CAM_MOVETO_EASED_CIRCULAR") + public static final ServerPacket CAM_MOVETO_EASED_CIRCULAR; + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("LOC_ANIM_SPECIFIC") - public static final ServerPacket LOC_ANIM_SPECIFIC; - @ObfuscatedName("cs") + @Export("CLANCHANNEL_DELTA") + public static final ServerPacket CLANCHANNEL_DELTA; + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("MESSAGE_GAME") - public static final ServerPacket MESSAGE_GAME; - @ObfuscatedName("cx") + @Export("IF_SETPLAYERMODEL_SELF") + public static final ServerPacket IF_SETPLAYERMODEL_SELF; + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("UPDATE_INV_FULL") public static final ServerPacket UPDATE_INV_FULL; - @ObfuscatedName("cr") + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETANIM") - public static final ServerPacket IF_SETANIM; - @ObfuscatedName("cd") + @Export("CHAT_FILTER_SETTINGS_PRIVATECHAT") + public static final ServerPacket CHAT_FILTER_SETTINGS_PRIVATECHAT; + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("IF_OPENSUB") public static final ServerPacket IF_OPENSUB; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Llg;" - ) - @Export("IF_SETMODEL") - public static final ServerPacket IF_SETMODEL; - @ObfuscatedName("cq") + @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_UID192") - public static final ServerPacket UPDATE_UID192; + @Export("IF_SETPOSITION") + public static final ServerPacket IF_SETPOSITION; @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("SYNC_CLIENT_VARCACHE") - public static final ServerPacket SYNC_CLIENT_VARCACHE; - @ObfuscatedName("cv") + @Export("CAM_RESET") + public static final ServerPacket CAM_RESET; + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" + ) + @Export("UPDATE_FRIENDCHAT_CHANNEL_FULL_V2") + public static final ServerPacket UPDATE_FRIENDCHAT_CHANNEL_FULL_V2; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Llu;" ) @Export("CLANSETTINGS_FULL") public static final ServerPacket CLANSETTINGS_FULL; - @ObfuscatedName("co") + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CAM_LOOKAT") - public static final ServerPacket CAM_LOOKAT; - @ObfuscatedName("cl") + @Export("CAM_SHAKE") + public static final ServerPacket CAM_SHAKE; + @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("SET_MAP_FLAG") public static final ServerPacket SET_MAP_FLAG; - @ObfuscatedName("cu") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("MINIMAP_TOGGLE") public static final ServerPacket MINIMAP_TOGGLE; - @ObfuscatedName("ch") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("UPDATE_FRIENDLIST") public static final ServerPacket UPDATE_FRIENDLIST; - @ObfuscatedName("ci") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("TRIGGER_ONDIALOGABORT") public static final ServerPacket TRIGGER_ONDIALOGABORT; - @ObfuscatedName("ca") + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETPLAYERMODEL_OBJ") - public static final ServerPacket IF_SETPLAYERMODEL_OBJ; - @ObfuscatedName("cb") + @Export("MIDI_JINGLE") + public static final ServerPacket MIDI_JINGLE; + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("PLAYER_SPOTANIM_SPECIFIC") - public static final ServerPacket PLAYER_SPOTANIM_SPECIFIC; - @ObfuscatedName("cg") + @Export("REBUILD_REGION") + public static final ServerPacket REBUILD_REGION; + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("OBJ_COUNT") - public static final ServerPacket OBJ_COUNT; - @ObfuscatedName("cj") + @Export("IF_SETPLAYERMODEL_BODYTYPE") + public static final ServerPacket IF_SETPLAYERMODEL_BODYTYPE; + @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETPOSITION") - public static final ServerPacket IF_SETPOSITION; - @ObfuscatedName("cz") + @Export("NPC_HEADICON_SPECIFIC") + public static final ServerPacket NPC_HEADICON_SPECIFIC; + @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("UPDATE_INV_PARTIAL") public static final ServerPacket UPDATE_INV_PARTIAL; @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("RESET_CLIENT_VARCACHE") public static final ServerPacket RESET_CLIENT_VARCACHE; - @ObfuscatedName("cy") + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("FRIENDLIST_LOADED") public static final ServerPacket FRIENDLIST_LOADED; - @ObfuscatedName("ck") + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("NPC_INFO_SMALL") public static final ServerPacket NPC_INFO_SMALL; - @ObfuscatedName("cc") + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("MESSAGE_FRIENDCHANNEL") public static final ServerPacket MESSAGE_FRIENDCHANNEL; - @ObfuscatedName("dh") + @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CHAT_FILTER_SETTINGS_PRIVATECHAT") - public static final ServerPacket CHAT_FILTER_SETTINGS_PRIVATECHAT; - @ObfuscatedName("dj") + @Export("REFLECTION_CHECK") + public static final ServerPacket REFLECTION_CHECK; + @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("PLAYER_INFO") - public static final ServerPacket PLAYER_INFO; - @ObfuscatedName("di") + @Export("VARCLAN") + public static final ServerPacket VARCLAN; + @ObfuscatedName("ds") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETPLAYERMODEL_BODYTYPE") - public static final ServerPacket IF_SETPLAYERMODEL_BODYTYPE; - @ObfuscatedName("du") + public static final ServerPacket field2730; + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("TOGGLE_OCULUS_ORB") - public static final ServerPacket TOGGLE_OCULUS_ORB; - @ObfuscatedName("dn") + @Export("MESSAGE_GAME") + public static final ServerPacket MESSAGE_GAME; + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("CAM_MOVETO_EASED") public static final ServerPacket CAM_MOVETO_EASED; - @ObfuscatedName("dg") + @ObfuscatedName("dq") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("VARCLAN") - public static final ServerPacket VARCLAN; - @ObfuscatedName("dd") + @Export("PREFETCH_GAMEOBJECTS") + public static final ServerPacket PREFETCH_GAMEOBJECTS; + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("LOC_DEL") - public static final ServerPacket LOC_DEL; - @ObfuscatedName("da") + @Export("IF_SETPLAYERMODEL_BASECOLOUR") + public static final ServerPacket IF_SETPLAYERMODEL_BASECOLOUR; + @ObfuscatedName("dn") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("REFLECTION_CHECK") - public static final ServerPacket REFLECTION_CHECK; - @ObfuscatedName("ds") + @Export("SYNC_CLIENT_VARCACHE") + public static final ServerPacket SYNC_CLIENT_VARCACHE; + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("VARCLAN_DISABLE") public static final ServerPacket VARCLAN_DISABLE; - @ObfuscatedName("dy") + @ObfuscatedName("df") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("ENTER_FREECAM") - public static final ServerPacket ENTER_FREECAM; - @ObfuscatedName("dt") + @Export("UPDATE_RUNENERGY") + public static final ServerPacket UPDATE_RUNENERGY; + @ObfuscatedName("de") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CLANCHANNEL_FULL") - public static final ServerPacket CLANCHANNEL_FULL; + @Export("IF_SETANIM") + public static final ServerPacket IF_SETANIM; @ObfuscatedName("dl") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("MIDI_SONG_LEGACY") - public static final ServerPacket MIDI_SONG_LEGACY; - @ObfuscatedName("dk") + @Export("NPC_INFO_LARGE") + public static final ServerPacket NPC_INFO_LARGE; + @ObfuscatedName("dp") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("IF_SETHIDE") public static final ServerPacket IF_SETHIDE; - @ObfuscatedName("df") + @ObfuscatedName("do") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("MESSAGE_CLANCHANNEL_SYSTEM") public static final ServerPacket MESSAGE_CLANCHANNEL_SYSTEM; - @ObfuscatedName("dz") + @ObfuscatedName("dh") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("OBJ_DEL_LEGACY") - public static final ServerPacket OBJ_DEL_LEGACY; - @ObfuscatedName("dw") + public static final ServerPacket field2720; + @ObfuscatedName("dj") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("CLANSETTINGS_DELTA") - public static final ServerPacket CLANSETTINGS_DELTA; - @ObfuscatedName("dv") + static final ServerPacket CLANSETTINGS_DELTA; + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_ZONE_FULL_FOLLOWS") - public static final ServerPacket UPDATE_ZONE_FULL_FOLLOWS; + @Export("RUN_CLIENTSCRIPT") + public static final ServerPacket RUN_CLIENTSCRIPT; @ObfuscatedName("dr") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_INV_CLEAR") - public static final ServerPacket UPDATE_INV_CLEAR; - @ObfuscatedName("do") + @Export("UPDATE_SITESETTINGS") + public static final ServerPacket UPDATE_SITESETTINGS; + @ObfuscatedName("dw") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CLANCHANNEL_DELTA") - public static final ServerPacket CLANCHANNEL_DELTA; - @ObfuscatedName("db") + @Export("UPDATE_ZONE_FULL_FOLLOWS") + public static final ServerPacket UPDATE_ZONE_FULL_FOLLOWS; + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CAM_RESET") - public static final ServerPacket CAM_RESET; - @ObfuscatedName("dp") + @Export("LOGOUT_FULL") + public static final ServerPacket LOGOUT_FULL; + @ObfuscatedName("dt") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("EMPTY_PACKET") public static final ServerPacket EMPTY_PACKET; - @ObfuscatedName("dm") + @ObfuscatedName("dd") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("REBUILD_REGION_NORMAL") - public static final ServerPacket REBUILD_REGION_NORMAL; - @ObfuscatedName("dx") + @Export("HEAT_MAP") + public static final ServerPacket HEAT_MAP; + @ObfuscatedName("dy") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("LOGOUT") - public static final ServerPacket LOGOUT; - @ObfuscatedName("dq") + public static final ServerPacket field2736; + @ObfuscatedName("db") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("LOGOUT_FULL") - public static final ServerPacket LOGOUT_FULL; - @ObfuscatedName("de") + public static final ServerPacket field2714; + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_ZONE_PARTIAL_ENCLOSED") - public static final ServerPacket UPDATE_ZONE_PARTIAL_ENCLOSED; - @ObfuscatedName("dc") + public static final ServerPacket field2715; + @ObfuscatedName("da") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CAM_LOOKAT_EASED_COORD") - public static final ServerPacket CAM_LOOKAT_EASED_COORD; - @ObfuscatedName("ed") + @Export("SPOTANIM_SPECIFIC") + public static final ServerPacket SPOTANIM_SPECIFIC; + @ObfuscatedName("eo") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("CAM_LOOKAT_EASED_ANGLE_RELATIVE") - public static final ServerPacket CAM_LOOKAT_EASED_ANGLE_RELATIVE; - @ObfuscatedName("eh") + @Export("IF_SETSCROLLPOS") + public static final ServerPacket IF_SETSCROLLPOS; + @ObfuscatedName("em") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_FRIENDCHAT_CHANNEL_FULL_V2") - public static final ServerPacket UPDATE_FRIENDCHAT_CHANNEL_FULL_V2; - @ObfuscatedName("ey") + @Export("UPDATE_FRIENDCHAT_CHANNEL_FULL") + public static final ServerPacket UPDATE_FRIENDCHAT_CHANNEL_FULL; + @ObfuscatedName("el") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_OPENTOP") - public static final ServerPacket IF_OPENTOP; - @ObfuscatedName("ee") + @Export("CAM_LOOKAT_EASED_COORD") + public static final ServerPacket CAM_LOOKAT_EASED_COORD; + @ObfuscatedName("ec") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - public static final ServerPacket field2725; - @ObfuscatedName("eq") + @Export("LOGOUT") + public static final ServerPacket LOGOUT; + @ObfuscatedName("eg") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("CAM_MOVETO") public static final ServerPacket CAM_MOVETO; - @ObfuscatedName("ej") + @ObfuscatedName("ei") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_SITESETTINGS") - public static final ServerPacket UPDATE_SITESETTINGS; - @ObfuscatedName("ea") + public static final ServerPacket field2744; + @ObfuscatedName("ex") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("PREFETCH_GAMEOBJECTS") - public static final ServerPacket PREFETCH_GAMEOBJECTS; - @ObfuscatedName("er") + @Export("NEW_PACKET_CAM_RESET_V2") + public static final ServerPacket NEW_PACKET_CAM_RESET_V2; + @ObfuscatedName("ek") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("IF_SETPLAYERHEAD") public static final ServerPacket IF_SETPLAYERHEAD; - @ObfuscatedName("ev") + @ObfuscatedName("er") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("LOC_ANIM") - public static final ServerPacket LOC_ANIM; + @Export("UPDATE_INV_CLEAR") + public static final ServerPacket UPDATE_INV_CLEAR; @ObfuscatedName("ez") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("OBJ_DEL") public static final ServerPacket OBJ_DEL; - @ObfuscatedName("et") + @ObfuscatedName("en") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("LOGIN_SCREEN_PACKET") public static final ServerPacket LOGIN_SCREEN_PACKET; - @ObfuscatedName("en") + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("NPC_INFO_LARGE") - public static final ServerPacket NPC_INFO_LARGE; - @ObfuscatedName("eb") + @Export("REBUILD_REGION_NORMAL") + public static final ServerPacket REBUILD_REGION_NORMAL; + @ObfuscatedName("eq") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("IF_SETPLAYERMODEL_SELF") - public static final ServerPacket IF_SETPLAYERMODEL_SELF; - @ObfuscatedName("ei") + @Export("TOGGLE_OCULUS_ORB") + public static final ServerPacket TOGGLE_OCULUS_ORB; + @ObfuscatedName("ej") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("UPDATE_FRIENDCHAT_CHANNEL_FULL") - public static final ServerPacket UPDATE_FRIENDCHAT_CHANNEL_FULL; - @ObfuscatedName("es") + @Export("LOC_DEL") + public static final ServerPacket LOC_DEL; + @ObfuscatedName("et") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("MIDI_SONG") - static final ServerPacket MIDI_SONG; - @ObfuscatedName("el") + public static final ServerPacket MIDI_SONG; + @ObfuscatedName("eh") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("MIDI_SONG_STOP") - public static final ServerPacket MIDI_SONG_STOP; - @ObfuscatedName("em") + @Export("ENTER_FREECAM") + public static final ServerPacket ENTER_FREECAM; + @ObfuscatedName("eb") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - @Export("MIDI_SONG_WITH_SECONDARY") - public static final ServerPacket MIDI_SONG_WITH_SECONDARY; - @ObfuscatedName("ef") + @Export("SYNTH_SOUND") + public static final ServerPacket SYNTH_SOUND; + @ObfuscatedName("ev") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) @Export("MIDI_SWAP") public static final ServerPacket MIDI_SWAP; - @ObfuscatedName("ek") + @ObfuscatedName("ee") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Llu;" ) - public static final ServerPacket field2730; - @ObfuscatedName("ec") + @Export("PLAYER_ANIM_SPECIFIC") + public static final ServerPacket PLAYER_ANIM_SPECIFIC; + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + public static final ServerPacket field2738; + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + public static final ServerPacket field2755; + @ObfuscatedName("ey") @Export("id") public final int id; - @ObfuscatedName("eu") + @ObfuscatedName("ep") @Export("length") public final int length; static { - NPC_ANIM_SPECIFIC = new ServerPacket(0, 5); - AREA_SOUND = new ServerPacket(1, 6); - TRADING_POST_UPDATE = new ServerPacket(2, 1); - SEND_PING = new ServerPacket(3, 17); - UPDATE_REBOOT_TIMER = new ServerPacket(4, 2); - IF_SETEVENTS = new ServerPacket(5, 10); - NEW_PACKET_CAM_RESET_V2 = new ServerPacket(6, 6); - SET_PLAYER_OP = new ServerPacket(7, 0); - VARP_LARGE = new ServerPacket(8, 4); - IF_SETOBJECT = new ServerPacket(9, 7); - OPEN_URL = new ServerPacket(10, -2); - IF_MOVESUB = new ServerPacket(11, 2); - CAM_LOOKAT_EASED_ANGLE_ABSOLUTE = new ServerPacket(12, 8); - CAM_MOVETO_EASED_CIRCULAR = new ServerPacket(13, 1); - IF_SETTEXT = new ServerPacket(14, -1); - REFLECTIONCHECK_FRIENDLIST = new ServerPacket(15, 6); - MAPPROJ_ANIM = new ServerPacket(16, -2); - GAMEFRAME_FULL = new ServerPacket(17, -2); - UPDATE_INV_STOP_TRANSMIT = new ServerPacket(18, 2); - MESSAGE_PRIVATE_ECHO = new ServerPacket(19, 10); - RUN_CLIENTSCRIPT = new ServerPacket(20, 0); - VARCLAN_ENABLE = new ServerPacket(21, 2); - MAPPROJ_ANIM_SPECIFIC = new ServerPacket(22, 16); - UPDATE_RUNENERGY = new ServerPacket(23, -1); - CAM_SHAKE = new ServerPacket(24, -2); - MESSAGE_CLANCHANNEL = new ServerPacket(25, 6); - IF_SETNPCHEAD = new ServerPacket(26, 12); - IF_CLOSESUB = new ServerPacket(27, 9); - UPDATE_STAT = new ServerPacket(28, 0); - UPDATE_IGNORELIST = new ServerPacket(29, 4); - IF_SETCOLOUR = new ServerPacket(30, 8); - MAP_ANIM = new ServerPacket(31, -2); - NPC_SPOTANIM_SPECIFIC = new ServerPacket(32, 6); - HEAT_MAP = new ServerPacket(33, 8); - LOC_ADD_CHANGE = new ServerPacket(34, -2); - PLAYER_ANIM_SPECIFIC = new ServerPacket(35, 5); - OBJ_ADD = new ServerPacket(36, 2); - TRADING_POST_RESULTS = new ServerPacket(37, -1); - SPOTANIM_SPECIFIC = new ServerPacket(38, -2); - VARP_SMALL = new ServerPacket(39, 6); - CHAT_FILTER_SETTINGS = new ServerPacket(40, 2); - UPDATE_RUNWEIGHT = new ServerPacket(41, 0); - UPDATE_ZONE_PARTIAL_FOLLOWS = new ServerPacket(42, -2); - RESET_ANIMS = new ServerPacket(43, 3); - SYNTH_SOUND = new ServerPacket(44, 7); - MIDI_JINGLE = new ServerPacket(45, 2); - IF1_MODELROTATE = new ServerPacket(46, 10); - HINT_ARROW = new ServerPacket(47, 6); - NEW_PACK_215 = new ServerPacket(48, -1); - IF_SETPLAYERMODEL_BASECOLOUR = new ServerPacket(49, 2); - IF_SETANGLE = new ServerPacket(50, -2); - NPC_HEADICON_SPECIFIC = new ServerPacket(51, -2); - MESSAGE_PRIVATE = new ServerPacket(52, 10); - IF_SETSCROLLPOS = new ServerPacket(53, 8); - REBUILD_REGION = new ServerPacket(54, -2); - LOC_ANIM_SPECIFIC = new ServerPacket(55, 5); - MESSAGE_GAME = new ServerPacket(56, -2); + NPC_ANIM_SPECIFIC = new ServerPacket(0, 14); + REFLECTIONCHECK_FRIENDLIST = new ServerPacket(1, 10); + TRADING_POST_UPDATE = new ServerPacket(2, 28); + SEND_PING = new ServerPacket(3, 0); + field2649 = new ServerPacket(4, 7); + IF_SETNPCHEAD = new ServerPacket(5, 9); + field2652 = new ServerPacket(6, 2); + SET_PLAYER_OP = new ServerPacket(7, 7); + OBJ_COUNT = new ServerPacket(8, 4); + UPDATE_UID192 = new ServerPacket(9, -2); + OBJ_DEL_LEGACY = new ServerPacket(10, -1); + MIDI_SONG_LEGACY = new ServerPacket(11, 2); + RESET_ANIMS = new ServerPacket(12, 9); + IF_OPENTOP = new ServerPacket(13, 8); + UPDATE_INV_STOP_TRANSMIT = new ServerPacket(14, 5); + MIDI_SONG_WITH_SECONDARY = new ServerPacket(15, -2); + MAPPROJ_ANIM = new ServerPacket(16, 5); + OPEN_URL = new ServerPacket(17, 1); + field2643 = new ServerPacket(18, 1); + IF_CLOSESUB = new ServerPacket(19, 2); + UPDATE_ZONE_PARTIAL_ENCLOSED = new ServerPacket(20, 2); + VARCLAN_ENABLE = new ServerPacket(21, 1); + UPDATE_REBOOT_TIMER = new ServerPacket(22, -2); + VARP_LARGE = new ServerPacket(23, 6); + TRADING_POST_RESULTS = new ServerPacket(24, 8); + MESSAGE_CLANCHANNEL = new ServerPacket(25, -1); + NPC_SPOTANIM_SPECIFIC = new ServerPacket(26, 12); + IF_SETTEXT = new ServerPacket(27, -2); + UPDATE_STAT = new ServerPacket(28, 6); + UPDATE_IGNORELIST = new ServerPacket(29, -2); + IF_SETMODEL = new ServerPacket(30, -2); + MAP_ANIM = new ServerPacket(31, 1); + IF_SETEVENTS = new ServerPacket(32, 16); + MIDI_SONG_STOP = new ServerPacket(33, 7); + LOC_ADD_CHANGE = new ServerPacket(34, 6); + field2675 = new ServerPacket(35, -2); + OBJ_ADD = new ServerPacket(36, 19); + LOC_ANIM_SPECIFIC = new ServerPacket(37, -2); + UPDATE_ZONE_PARTIAL_FOLLOWS = new ServerPacket(38, -2); + PLAYER_INFO = new ServerPacket(39, -2); + MESSAGE_PRIVATE_ECHO = new ServerPacket(40, 8); + UPDATE_RUNWEIGHT = new ServerPacket(41, 9); + CAM_LOOKAT_EASED_ANGLE_RELATIVE = new ServerPacket(42, 5); + VARP_SMALL = new ServerPacket(43, -2); + PLAYER_SPOTANIM_SPECIFIC = new ServerPacket(44, -2); + field2672 = new ServerPacket(45, -2); + IF1_MODELROTATE = new ServerPacket(46, 8); + HINT_ARROW = new ServerPacket(47, 8); + NEW_PACK_215 = new ServerPacket(48, 6); + IF_SETANGLE = new ServerPacket(49, 2); + IF_SETPLAYERMODEL_OBJ = new ServerPacket(50, 4); + field2683 = new ServerPacket(51, 3); + MESSAGE_PRIVATE = new ServerPacket(52, -2); + IF_SETOBJECT = new ServerPacket(53, -2); + CAM_MOVETO_EASED_CIRCULAR = new ServerPacket(54, 20); + CLANCHANNEL_DELTA = new ServerPacket(55, -2); + IF_SETPLAYERMODEL_SELF = new ServerPacket(56, 8); UPDATE_INV_FULL = new ServerPacket(57, -2); - IF_SETANIM = new ServerPacket(58, 4); + CHAT_FILTER_SETTINGS_PRIVATECHAT = new ServerPacket(58, 4); IF_OPENSUB = new ServerPacket(59, 6); - IF_SETMODEL = new ServerPacket(60, 6); - UPDATE_UID192 = new ServerPacket(61, 1); - SYNC_CLIENT_VARCACHE = new ServerPacket(62, 0); - CLANSETTINGS_FULL = new ServerPacket(63, 5); - CAM_LOOKAT = new ServerPacket(64, 0); - SET_MAP_FLAG = new ServerPacket(65, 1); - MINIMAP_TOGGLE = new ServerPacket(66, 6); - UPDATE_FRIENDLIST = new ServerPacket(67, -2); - TRIGGER_ONDIALOGABORT = new ServerPacket(68, -2); - IF_SETPLAYERMODEL_OBJ = new ServerPacket(69, 1); - PLAYER_SPOTANIM_SPECIFIC = new ServerPacket(70, -2); - OBJ_COUNT = new ServerPacket(71, 6); - IF_SETPOSITION = new ServerPacket(72, 0); - UPDATE_INV_PARTIAL = new ServerPacket(73, 7); - RESET_CLIENT_VARCACHE = new ServerPacket(74, 2); - FRIENDLIST_LOADED = new ServerPacket(75, 2); - NPC_INFO_SMALL = new ServerPacket(76, 6); - MESSAGE_FRIENDCHANNEL = new ServerPacket(77, -2); - CHAT_FILTER_SETTINGS_PRIVATECHAT = new ServerPacket(78, 4); - PLAYER_INFO = new ServerPacket(79, -2); - IF_SETPLAYERMODEL_BODYTYPE = new ServerPacket(80, -1); - TOGGLE_OCULUS_ORB = new ServerPacket(81, 8); - CAM_MOVETO_EASED = new ServerPacket(82, 9); - VARCLAN = new ServerPacket(83, 28); - LOC_DEL = new ServerPacket(84, 8); - REFLECTION_CHECK = new ServerPacket(85, -2); - VARCLAN_DISABLE = new ServerPacket(86, 0); - ENTER_FREECAM = new ServerPacket(87, 0); - CLANCHANNEL_FULL = new ServerPacket(88, 6); - MIDI_SONG_LEGACY = new ServerPacket(89, 7); - IF_SETHIDE = new ServerPacket(90, -2); - MESSAGE_CLANCHANNEL_SYSTEM = new ServerPacket(91, -2); - OBJ_DEL_LEGACY = new ServerPacket(92, 6); - CLANSETTINGS_DELTA = new ServerPacket(93, 5); - UPDATE_ZONE_FULL_FOLLOWS = new ServerPacket(94, 14); - UPDATE_INV_CLEAR = new ServerPacket(95, 4); - CLANCHANNEL_DELTA = new ServerPacket(96, 4); - CAM_RESET = new ServerPacket(97, -2); - EMPTY_PACKET = new ServerPacket(98, 20); - REBUILD_REGION_NORMAL = new ServerPacket(99, 4); - LOGOUT = new ServerPacket(100, 8); - LOGOUT_FULL = new ServerPacket(101, -1); - UPDATE_ZONE_PARTIAL_ENCLOSED = new ServerPacket(102, -1); - CAM_LOOKAT_EASED_COORD = new ServerPacket(103, 2); - CAM_LOOKAT_EASED_ANGLE_RELATIVE = new ServerPacket(104, 11); - UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 = new ServerPacket(105, -2); - IF_OPENTOP = new ServerPacket(106, 4); - field2725 = new ServerPacket(107, -1); - CAM_MOVETO = new ServerPacket(108, -1); - UPDATE_SITESETTINGS = new ServerPacket(109, 5); - PREFETCH_GAMEOBJECTS = new ServerPacket(110, 12); - IF_SETPLAYERHEAD = new ServerPacket(111, 8); - LOC_ANIM = new ServerPacket(112, 14); - OBJ_DEL = new ServerPacket(113, 4); - LOGIN_SCREEN_PACKET = new ServerPacket(114, 5); - NPC_INFO_LARGE = new ServerPacket(115, 9); - IF_SETPLAYERMODEL_SELF = new ServerPacket(116, 3); - UPDATE_FRIENDCHAT_CHANNEL_FULL = new ServerPacket(117, 5); - MIDI_SONG = new ServerPacket(118, -2); - MIDI_SONG_STOP = new ServerPacket(119, 0); - MIDI_SONG_WITH_SECONDARY = new ServerPacket(120, 7); - MIDI_SWAP = new ServerPacket(121, -2); - field2730 = new ServerPacket(122, 19); + IF_SETPOSITION = new ServerPacket(60, -1); + CAM_RESET = new ServerPacket(61, 0); + UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 = new ServerPacket(62, -2); + CLANSETTINGS_FULL = new ServerPacket(63, 0); + CAM_SHAKE = new ServerPacket(64, -1); + SET_MAP_FLAG = new ServerPacket(65, -2); + MINIMAP_TOGGLE = new ServerPacket(66, 7); + UPDATE_FRIENDLIST = new ServerPacket(67, 0); + TRIGGER_ONDIALOGABORT = new ServerPacket(68, 10); + MIDI_JINGLE = new ServerPacket(69, 4); + REBUILD_REGION = new ServerPacket(70, 0); + IF_SETPLAYERMODEL_BODYTYPE = new ServerPacket(71, 0); + NPC_HEADICON_SPECIFIC = new ServerPacket(72, 1); + UPDATE_INV_PARTIAL = new ServerPacket(73, -2); + RESET_CLIENT_VARCACHE = new ServerPacket(74, -2); + FRIENDLIST_LOADED = new ServerPacket(75, 6); + NPC_INFO_SMALL = new ServerPacket(76, -1); + MESSAGE_FRIENDCHANNEL = new ServerPacket(77, 6); + REFLECTION_CHECK = new ServerPacket(78, 5); + VARCLAN = new ServerPacket(79, 4); + field2730 = new ServerPacket(80, 17); + MESSAGE_GAME = new ServerPacket(81, 4); + CAM_MOVETO_EASED = new ServerPacket(82, 0); + PREFETCH_GAMEOBJECTS = new ServerPacket(83, 5); + IF_SETPLAYERMODEL_BASECOLOUR = new ServerPacket(84, -1); + SYNC_CLIENT_VARCACHE = new ServerPacket(85, 0); + VARCLAN_DISABLE = new ServerPacket(86, 6); + UPDATE_RUNENERGY = new ServerPacket(87, 2); + IF_SETANIM = new ServerPacket(88, -2); + NPC_INFO_LARGE = new ServerPacket(89, 4); + IF_SETHIDE = new ServerPacket(90, 6); + MESSAGE_CLANCHANNEL_SYSTEM = new ServerPacket(91, 5); + field2720 = new ServerPacket(92, 12); + CLANSETTINGS_DELTA = new ServerPacket(93, -2); + RUN_CLIENTSCRIPT = new ServerPacket(94, 7); + UPDATE_SITESETTINGS = new ServerPacket(95, 2); + UPDATE_ZONE_FULL_FOLLOWS = new ServerPacket(96, 0); + LOGOUT_FULL = new ServerPacket(97, 2); + EMPTY_PACKET = new ServerPacket(98, -1); + HEAT_MAP = new ServerPacket(99, 6); + field2736 = new ServerPacket(100, 6); + field2714 = new ServerPacket(101, -1); + field2715 = new ServerPacket(102, 10); + SPOTANIM_SPECIFIC = new ServerPacket(103, 14); + IF_SETSCROLLPOS = new ServerPacket(104, 2); + UPDATE_FRIENDCHAT_CHANNEL_FULL = new ServerPacket(105, 8); + CAM_LOOKAT_EASED_COORD = new ServerPacket(106, -2); + LOGOUT = new ServerPacket(107, 0); + CAM_MOVETO = new ServerPacket(108, 6); + field2744 = new ServerPacket(109, 6); + NEW_PACKET_CAM_RESET_V2 = new ServerPacket(110, 5); + IF_SETPLAYERHEAD = new ServerPacket(111, 2); + UPDATE_INV_CLEAR = new ServerPacket(112, -2); + OBJ_DEL = new ServerPacket(113, 5); + LOGIN_SCREEN_PACKET = new ServerPacket(114, 4); + REBUILD_REGION_NORMAL = new ServerPacket(115, -1); + TOGGLE_OCULUS_ORB = new ServerPacket(116, 3); + LOC_DEL = new ServerPacket(117, 10); + MIDI_SONG = new ServerPacket(118, 8); + ENTER_FREECAM = new ServerPacket(119, 6); + SYNTH_SOUND = new ServerPacket(120, 11); + MIDI_SWAP = new ServerPacket(121, 2); + PLAYER_ANIM_SPECIFIC = new ServerPacket(122, 4); + field2738 = new ServerPacket(123, 19); + field2755 = new ServerPacket(124, 20); } ServerPacket(int var1, int var2) { this.id = var1; this.length = var2; } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-76771490" - ) - public static void method1612(AbstractArchive var0) { - VarbitComposition.VarbitDefinition_archive = var0; - } } \ No newline at end of file diff --git a/osrs/src/main/java/Skeleton.java b/osrs/src/main/java/Skeleton.java index d146e3c1a..faf79a060 100644 --- a/osrs/src/main/java/Skeleton.java +++ b/osrs/src/main/java/Skeleton.java @@ -3,32 +3,31 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("ju") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("dl") + @ObfuscatedName("wr") @ObfuscatedSignature( - descriptor = "Luk;" + descriptor = "Lsx;" ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("ai") + static PlatformInfo field2060; + @ObfuscatedName("ah") @Export("id") int id; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("count") int count; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("labels") int[][] labels; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Ljr;" ) - class227 field2049; + class241 field2065; public Skeleton(int var1, byte[] var2) { this.id = var1; @@ -55,206 +54,27 @@ public Skeleton(int var1, byte[] var2) { if (var3.offset < var3.array.length) { var4 = var3.readUnsignedShort(); if (var4 > 0) { - this.field2049 = new class227(var3, var4); + this.field2065 = new class241(var3, var4); } } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "657439907" + garbageValue = "-1245812999" ) - public int method1230() { + public int method1275() { return this.count; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Lim;", - garbageValue = "-896390577" + descriptor = "(B)Ljr;", + garbageValue = "-13" ) - public class227 method1231() { - return this.field2049; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lfh;FB)F", - garbageValue = "0" - ) - static float method1229(class130 var0, float var1) { - if (var0 != null && var0.method726() != 0) { - if (var1 < (float)var0.field1244[0].field1202) { - return var0.field1245 == class128.field1229 ? var0.field1244[0].field1198 : UserComparator4.method669(var0, var1, true); - } else if (var1 > (float)var0.field1244[var0.method726() - 1].field1202) { - return var0.field1246 == class128.field1229 ? var0.field1244[var0.method726() - 1].field1198 : UserComparator4.method669(var0, var1, false); - } else if (var0.field1240) { - return var0.field1244[0].field1198; - } else { - class125 var2 = var0.method725(var1); - boolean var3 = false; - boolean var4 = false; - if (var2 == null) { - return 0.0F; - } else { - float var5; - float var6; - if (0.0D == (double)var2.field1197 && (double)var2.field1199 == 0.0D) { - var3 = true; - } else if (Float.MAX_VALUE == var2.field1197 && Float.MAX_VALUE == var2.field1199) { - var4 = true; - } else if (var2.field1196 != null) { - if (var0.field1241) { - var5 = (float)var2.field1202; - float var9 = var2.field1198; - var6 = 0.33333334F * var2.field1197 + var5; - float var10 = var2.field1199 * 0.33333334F + var9; - float var8 = (float)var2.field1196.field1202; - float var12 = var2.field1196.field1198; - float var7 = var8 - var2.field1196.field1200 * 0.33333334F; - float var11 = var12 - var2.field1196.field1201 * 0.33333334F; - float var15; - float var16; - float var17; - float var18; - float var19; - if (var0.field1243) { - var15 = var10; - var16 = var11; - if (var0 != null) { - var17 = var8 - var5; - if ((double)var17 != 0.0D) { - var18 = var6 - var5; - var19 = var7 - var5; - float[] var20 = new float[]{var18 / var17, var19 / var17}; - var0.field1242 = 0.33333334F == var20[0] && var20[1] == 0.6666667F; - float var21 = var20[0]; - float var22 = var20[1]; - if ((double)var20[0] < 0.0D) { - var20[0] = 0.0F; - } - - if ((double)var20[1] > 1.0D) { - var20[1] = 1.0F; - } - - if ((double)var20[0] > 1.0D || var20[1] < -1.0F) { - class160.method845(var20); - } - - float var10000; - if (var20[0] != var21) { - var10000 = var5 + var17 * var20[0]; - if (0.0D != (double)var21) { - var15 = (var10 - var9) * var20[0] / var21 + var9; - } - } - - if (var22 != var20[1]) { - var10000 = var5 + var17 * var20[1]; - if (1.0D != (double)var22) { - var16 = (float)((double)var12 - (1.0D - (double)var20[1]) * (double)(var12 - var11) / (1.0D - (double)var22)); - } - } - - var0.field1258 = var5; - var0.field1254 = var8; - float var23 = var20[0]; - float var24 = var20[1]; - float var25 = var23 - 0.0F; - float var26 = var24 - var23; - float var27 = 1.0F - var24; - float var28 = var26 - var25; - var0.field1255 = var27 - var26 - var28; - var0.field1249 = var28 + var28 + var28; - var0.field1250 = var25 + var25 + var25; - var0.field1247 = 0.0F; - var25 = var15 - var9; - var26 = var16 - var15; - var27 = var12 - var16; - var28 = var26 - var25; - var0.field1248 = var27 - var26 - var28; - var0.field1256 = var28 + var28 + var28; - var0.field1253 = var25 + var25 + var25; - var0.field1252 = var9; - } - } - } else if (var0 != null) { - var0.field1258 = var5; - float var13 = var8 - var5; - float var14 = var12 - var9; - var15 = var6 - var5; - var16 = 0.0F; - var17 = 0.0F; - if ((double)var15 != 0.0D) { - var16 = (var10 - var9) / var15; - } - - var15 = var8 - var7; - if ((double)var15 != 0.0D) { - var17 = (var12 - var11) / var15; - } - - var18 = 1.0F / (var13 * var13); - var19 = var16 * var13; - float var29 = var17 * var13; - var0.field1247 = var18 * (var19 + var29 - var14 - var14) / var13; - var0.field1250 = var18 * (var14 + var14 + var14 - var19 - var19 - var29); - var0.field1249 = var16; - var0.field1255 = var9; - } - - var0.field1241 = false; - } - } else { - var3 = true; - } - - if (var3) { - return var2.field1198; - } else if (var4) { - return (float)var2.field1202 != var1 && var2.field1196 != null ? var2.field1196.field1198 : var2.field1198; - } else if (var0.field1243) { - return class454.method2321(var0, var1); - } else { - if (var0 == null) { - var5 = 0.0F; - } else { - var6 = var1 - var0.field1258; - var5 = var0.field1255 + var6 * ((var6 * var0.field1247 + var0.field1250) * var6 + var0.field1249); - } - - return var5; - } - } - } - } else { - return 0.0F; - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1406508387" - ) - public static void method1232(int var0) { - if (var0 != -1) { - if (class316.Widget_loadedInterfaces[var0]) { - Decimator.Widget_archive.clearFilesGroup(var0); - if (PacketBufferNode.Widget_interfaceComponents[var0] != null) { - for (int var1 = 0; var1 < PacketBufferNode.Widget_interfaceComponents[var0].length; ++var1) { - if (PacketBufferNode.Widget_interfaceComponents[var0][var1] != null) { - PacketBufferNode.Widget_interfaceComponents[var0][var1] = null; - } - } - - PacketBufferNode.Widget_interfaceComponents[var0] = null; - class316.Widget_loadedInterfaces[var0] = false; - } - } - } + public class241 method1276() { + return this.field2065; } } \ No newline at end of file diff --git a/osrs/src/main/java/Skills.java b/osrs/src/main/java/Skills.java index 1a9495ae3..d64fcbf41 100644 --- a/osrs/src/main/java/Skills.java +++ b/osrs/src/main/java/Skills.java @@ -3,20 +3,15 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nl") +@ObfuscatedName("nu") @Implements("Skills") public class Skills { - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Luk;" - ) - static IndexedSprite field3145; static { Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; @@ -31,4 +26,24 @@ public class Skills { } } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "75" + ) + public static void method1899() { + while (true) { + ArchiveDiskAction var0; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + } + + if (var0 == null) { + return; + } + + var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/SoftWrapper.java b/osrs/src/main/java/SoftWrapper.java index 9f0851468..e0507114f 100644 --- a/osrs/src/main/java/SoftWrapper.java +++ b/osrs/src/main/java/SoftWrapper.java @@ -4,10 +4,10 @@ import java.lang.ref.SoftReference; -@ObfuscatedName("lx") +@ObfuscatedName("ld") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("ref") SoftReference ref; @@ -16,13 +16,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("get") Object get() { return this.ref.get(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("isSoft") boolean isSoft() { return true; diff --git a/osrs/src/main/java/SongTask.java b/osrs/src/main/java/SongTask.java index 5ee7a8307..90ebd909d 100644 --- a/osrs/src/main/java/SongTask.java +++ b/osrs/src/main/java/SongTask.java @@ -3,144 +3,97 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pm") +@ObfuscatedName("qm") @Implements("SongTask") public abstract class SongTask { - @ObfuscatedName("ao") + @ObfuscatedName("fq") @ObfuscatedSignature( - descriptor = "Lpm;" + descriptor = "Lok;" ) - SongTask field3724; - @ObfuscatedName("at") - String field3723; - @ObfuscatedName("ac") - String field3722; - @ObfuscatedName("ai") - boolean field3720; - @ObfuscatedName("az") - boolean field3721; + @Export("archive12") + static Archive archive12; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lqm;" + ) + SongTask field3755; + @ObfuscatedName("ax") + String field3754; + @ObfuscatedName("ao") + String field3753; + @ObfuscatedName("ah") + boolean field3751; + @ObfuscatedName("ar") + boolean field3752; @ObfuscatedSignature( - descriptor = "(Lpm;)V" + descriptor = "(Lqm;)V" ) SongTask(SongTask var1) { - this.field3724 = var1; + this.field3755 = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1604030758" + descriptor = "(B)Z", + garbageValue = "-90" ) + @Export("vmethod2142") public abstract boolean vmethod2142(); - @ObfuscatedName("ai") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "3" + descriptor = "(I)Z", + garbageValue = "1050307233" ) - public boolean method2132() { - return this.field3720; + public boolean method2165() { + return this.field3751; } - @ObfuscatedName("az") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1850076782" + descriptor = "(B)Z", + garbageValue = "45" ) - public boolean method2134() { - return this.field3721; + public boolean method2167() { + return this.field3752; } - @ObfuscatedName("ap") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "2126528347" + garbageValue = "-1522187493" ) - public String method2135() { - return "Error in task: " + this.field3722 + ", Error message: " + this.field3723; + public String method2168() { + return "Error in task: " + this.field3753 + ", Error message: " + this.field3754; } - @ObfuscatedName("aa") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(S)Lpm;", - garbageValue = "255" + descriptor = "(I)Lqm;", + garbageValue = "-1213560262" ) - public SongTask method2136() { - return this.field3724; + public SongTask method2169() { + return this.field3755; } - @ObfuscatedName("af") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "14" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "225620137" ) - void method2138(String var1) { - this.field3720 = true; - this.field3723 = var1; + void method2170(String var1) { + this.field3751 = true; + this.field3754 = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-7" + descriptor = "(II)Z", + garbageValue = "1674491330" ) @Export("isWorldMapEvent") public static boolean isWorldMapEvent(int var0) { return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1563316878" - ) - public static int method2137(int var0) { - return class464.field3908[var0 & 16383]; - } - - @ObfuscatedName("mg") - @ObfuscatedSignature( - descriptor = "(Lmi;IIIIIIB)V", - garbageValue = "-68" - ) - static final void method2139(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field382) { - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; - } - - Client.field382 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - class218.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - class218.invalidateWidget(var0); - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { - var7 = var3 * (var3 - 32) / var4; - if (var7 < 8) { - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - class218.invalidateWidget(var0); - Client.field382 = true; - } - } - - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { - var0.scrollY += Client.mouseWheelRotation * 45; - class218.invalidateWidget(var0); - } - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/SoundCache.java b/osrs/src/main/java/SoundCache.java index 5e27e3c56..7df6ae1c7 100644 --- a/osrs/src/main/java/SoundCache.java +++ b/osrs/src/main/java/SoundCache.java @@ -3,59 +3,57 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.LinkedList; -import java.util.List; +import java.util.concurrent.ThreadPoolExecutor; -@ObfuscatedName("bi") +@ObfuscatedName("bl") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("aa") - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("dd") + @ObfuscatedName("ab") + public static ThreadPoolExecutor field214; + @ObfuscatedName("jo") @ObfuscatedSignature( - descriptor = "[Luk;" + descriptor = "Lpu;" ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("au") + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) - AbstractArchive field216; - @ObfuscatedName("ao") + AbstractArchive field217; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lso;" + descriptor = "Ltf;" ) NodeHashTable field218; @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;)V" + descriptor = "(Lom;Lom;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { new NodeHashTable(256); this.field218 = new NodeHashTable(256); this.soundEffectIndex = var1; - this.field216 = var2; + this.field217 = var2; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II[II)Lbu;", - garbageValue = "-1861641707" + descriptor = "(II[II)Lbs;", + garbageValue = "804068595" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { - long var4 = this.method226(var1, var2, false); + long var4 = this.method234(var1, var2, false); class53 var6 = (class53)this.field218.get(var4); if (var6 != null) { - return var6.method292(); + return var6.method300(); } else if (var3 != null && var3[0] <= 0) { return null; } else { @@ -74,18 +72,18 @@ RawSound getSoundEffect0(int var1, int var2, int[] var3) { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)Lcf;", - garbageValue = "-98" + descriptor = "(III)Lcu;", + garbageValue = "941566921" ) - class53 method221(int var1, int var2) { - long var3 = this.method226(var1, var2, true); + class53 method229(int var1, int var2) { + long var3 = this.method234(var1, var2, true); class53 var5 = (class53)this.field218.get(var3); if (var5 != null) { return var5; } else { - VorbisSample var6 = VorbisSample.readMusicSample(this.field216, var1, var2); + VorbisSample var6 = VorbisSample.readMusicSample(this.field217, var1, var2); if (var6 == null) { return new class53(); } else { @@ -96,10 +94,10 @@ class53 method221(int var1, int var2) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I[II)Lbu;", - garbageValue = "88728645" + descriptor = "(I[IB)Lbs;", + garbageValue = "-23" ) @Export("getSoundEffect") RawSound getSoundEffect(int var1, int[] var2) { @@ -112,271 +110,85 @@ RawSound getSoundEffect(int var1, int[] var2) { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(II)Lcf;", - garbageValue = "134889372" + descriptor = "(IB)Lcu;", + garbageValue = "0" ) - public class53 method223(int var1) { - if (this.field216.getGroupCount() == 1) { - return this.method221(0, var1); - } else if (this.field216.getGroupFileCount(var1) == 1) { - return this.method221(var1, 0); + public class53 method232(int var1) { + if (this.field217.getGroupCount() == 1) { + return this.method229(0, var1); + } else if (this.field217.getGroupFileCount(var1) == 1) { + return this.method229(var1, 0); } else { throw new RuntimeException(); } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)Lbu;", - garbageValue = "1913686453" + descriptor = "(IS)Lbs;", + garbageValue = "11636" ) - public RawSound method225(int var1) { + public RawSound method233(int var1) { return this.getSoundEffect(var1, (int[])null); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(IIZI)J", - garbageValue = "1190461425" + garbageValue = "1435261523" ) - long method226(int var1, int var2, boolean var3) { + long method234(int var1, int var2, boolean var3) { int var4 = var2 ^ (var1 << 4 & 65535 | var1 >> 12); var4 |= var1 << 16; return var3 ? (long)var4 ^ 4294967296L : (long)var4; } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(III)Lmi;", - garbageValue = "139540914" - ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = class92.getWidget(var0); - if (var1 == -1) { - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; - } - } - @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1117171488" + descriptor = "(B)V", + garbageValue = "74" ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - for (int var2 = 0; var2 < var1.ids.length; ++var2) { - var1.ids[var2] = -1; - var1.quantities[var2] = 0; + static void method228() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.stream1 != null) { + class140.pcmStreamMixer.removeSubStream(var0.stream1); + var0.stream1 = null; } + if (var0.stream2 != null) { + class140.pcmStreamMixer.removeSubStream(var0.stream2); + var0.stream2 = null; + } } + + ObjectSound.objectSounds.clear(); } - @ObfuscatedName("cw") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-1164645966" + descriptor = "(III)Lcr;", + garbageValue = "1668135160" ) - static int method228(int var0, Script var1, boolean var2) { - int var3; - int var5; - int var7; - Object var21; - class506 var22; - if (var0 != 7500 && var0 != 7508) { - if (var0 != 7501) { - int var4; - int var6; - if (var0 == 7502) { - Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; - var6 = UserComparator3.method682(var4); - var7 = NewShit.method979(var4); - int var8 = MoveSpeed.method1141(var4); - DbRowType var23 = class159.getDbRowType(var3); - DbTableType var24 = class159.getDbTableType(var6); - int[] var25 = var24.types[var7]; - int var12 = 0; - int var13 = var25.length; - if (var8 >= 0) { - if (var8 >= var13) { - throw new RuntimeException("Tuple index out-of-bounds. Requested: " + var8 + ", Max: " + var13); - } - - var12 = var8; - var13 = var8 + 1; - } - - Object[] var14 = var23.getColumnType(var7); - if (var14 == null && var24.defaultValues != null) { - var14 = var24.defaultValues[var7]; - } - - int var15; - int var16; - if (var14 == null) { - for (var15 = var12; var15 < var13; ++var15) { - var16 = var25[var15]; - class502 var17 = SequenceDefinition.method1074(var16); - if (var17 == class502.field4100) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = class127.method703(var16); - } - } - - return 1; - } else { - var15 = var14.length / var25.length; - if (var5 >= 0 && var5 < var15) { - for (var16 = var12; var16 < var13; ++var16) { - int var19 = var16 + var25.length * var5; - class502 var18 = SequenceDefinition.method1074(var25[var16]); - if (var18 == class502.field4100) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = (String)var14[var19]; - } else { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (Integer)var14[var19]; - } - } - - return 1; - } else { - throw new RuntimeException(); - } - } - } else if (var0 == 7503) { - Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; - var5 = 0; - var6 = UserComparator3.method682(var4); - var7 = NewShit.method979(var4); - DbRowType var26 = class159.getDbRowType(var3); - DbTableType var9 = class159.getDbTableType(var6); - int[] var10 = var9.types[var7]; - Object[] var11 = var26.getColumnType(var7); - if (var11 == null && var9.defaultValues != null) { - var11 = var9.defaultValues[var7]; - } - - if (var11 != null) { - var5 = var11.length / var10.length; - } - - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var5; - return 1; - } else if (var0 != 7504 && var0 != 7510) { - if (var0 == 7505) { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - DbRowType var28 = class159.getDbRowType(var3); - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var28.tableId; - return 1; - } else if (var0 == 7506) { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - var4 = -1; - if (VarcInt.field1532 != null && var3 >= 0 && var3 < VarcInt.field1532.size()) { - var4 = (Integer)VarcInt.field1532.get(var3); - } - - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var4; - return 1; - } else if (var0 != 7507 && var0 != 7509) { - return 2; - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - var21 = MoveSpeed.method1143(var3); - var5 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - var22 = class344.method1868(var5); - if (var22 == null) { - throw new RuntimeException(); - } else if (UserComparator3.method682(var5) != Client.field549) { - throw new RuntimeException(); - } else if (VarcInt.field1532 == null && VarcInt.field1532.isEmpty()) { - throw new RuntimeException(); - } else { - var7 = MoveSpeed.method1141(var5); - List var20 = var22.method2507(var21, var7); - VarcInt.field1532 = new LinkedList(VarcInt.field1532); - if (var20 != null) { - VarcInt.field1532.retainAll(var20); - } else { - VarcInt.field1532.clear(); - } - - Decimator.field296 = VarcInt.field1532.iterator(); - if (var0 == 7507) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = VarcInt.field1532.size(); - } - - return 1; - } - } - } else { - --Interpreter_intStackSize; - var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; - class506 var27 = IgnoreList.method2190(var3); - if (var27 == null) { - throw new RuntimeException(); - } else { - VarcInt.field1532 = var27.method2507(0, 0); - var5 = 0; - if (VarcInt.field1532 != null) { - Client.field549 = var3; - Decimator.field296 = VarcInt.field1532.iterator(); - var5 = VarcInt.field1532.size(); - } - - if (var0 == 7504) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var5; - } - - return 1; - } - } - } else { - if (Decimator.field296 != null && Decimator.field296.hasNext()) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (Integer)Decimator.field296.next(); - } else { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = -1; - } - - return 1; - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - var21 = MoveSpeed.method1143(var3); - var5 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - var22 = class344.method1868(var5); - if (var22 == null) { - throw new RuntimeException(); - } else { - var7 = MoveSpeed.method1141(var5); - VarcInt.field1532 = var22.method2507(var21, var7); - if (VarcInt.field1532 != null) { - Client.field549 = UserComparator3.method682(var5); - Decimator.field296 = VarcInt.field1532.iterator(); - if (var0 == 7500) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = VarcInt.field1532.size(); - } - } else { - Client.field549 = -1; - Decimator.field296 = null; - if (var0 == 7500) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 0; - } - } + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); + } - return 1; - } + @ObfuscatedName("og") + @ObfuscatedSignature( + descriptor = "(IB)Luq;", + garbageValue = "-5" + ) + static class521 method235(int var0) { + class521 var1 = (class521)Client.Widget_cachedModels.get((long)var0); + if (var1 == null) { + var1 = new class521(class313.field2770, AbstractArchive.method1931(var0), VarbitComposition.method1046(var0)); + Client.Widget_cachedModels.put(var1, (long)var0); } + + return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/SoundEffect.java b/osrs/src/main/java/SoundEffect.java index aa01b3be8..6d7d9cfbd 100644 --- a/osrs/src/main/java/SoundEffect.java +++ b/osrs/src/main/java/SoundEffect.java @@ -3,24 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("br") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lcq;" + descriptor = "[Lcp;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("start") int start; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "()Lbu;" + descriptor = "()Lbs;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public RawSound toRawSound() { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; @@ -83,7 +83,7 @@ public final int calculateDelay() { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("mix") final byte[] mix() { int var1 = 0; @@ -122,9 +122,9 @@ final byte[] mix() { } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lnu;II)Lbp;" + descriptor = "(Lom;II)Lbr;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { diff --git a/osrs/src/main/java/SoundEnvelope.java b/osrs/src/main/java/SoundEnvelope.java index b5f50238b..da0b36b73 100644 --- a/osrs/src/main/java/SoundEnvelope.java +++ b/osrs/src/main/java/SoundEnvelope.java @@ -3,40 +3,40 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bf") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("segments") int segments; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("durations") int[] durations; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("phases") int[] phases; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("start") int start; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("end") int end; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("form") int form; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("ticks") int ticks; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("step") int step; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("amplitude") int amplitude; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("max") int max; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ final void decode(Buffer var1) { this.decodeSegments(var1); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ final void decodeSegments(Buffer var1) { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("reset") final void reset() { this.ticks = 0; @@ -89,7 +89,7 @@ final void reset() { this.max = 0; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { diff --git a/osrs/src/main/java/SoundSystem.java b/osrs/src/main/java/SoundSystem.java index 11b89467f..c48ec4bf1 100644 --- a/osrs/src/main/java/SoundSystem.java +++ b/osrs/src/main/java/SoundSystem.java @@ -3,23 +3,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("be") +@ObfuscatedName("bh") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("ad") + @ObfuscatedName("wh") + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "Luk;" + descriptor = "Lng;" ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("au") + static GameBuild field211; + @ObfuscatedName("fb") @ObfuscatedSignature( - descriptor = "[Lbb;" + descriptor = "Lok;" + ) + @Export("archive2") + static Archive archive2; + @ObfuscatedName("up") + @Export("cameraMoveToHeight") + static int cameraMoveToHeight; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "[Lbu;" ) @Export("players") - volatile PcmPlayer[] players; + public volatile PcmPlayer[] players; - SoundSystem() { + public SoundSystem() { this.players = new PcmPlayer[2]; } @@ -34,28 +45,17 @@ public void run() { } } } catch (Exception var4) { - Messages.RunException_sendStackTrace((String)null, var4); + class190.RunException_sendStackTrace((String)null, var4); } } - @ObfuscatedName("nx") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "0" + descriptor = "(S)V", + garbageValue = "13012" ) - static final void method219(int var0, int var1, boolean var2) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method859()) { - ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - PacketBufferNode var4 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(4 + AbstractSocket.stringCp1252NullTerminatedByteSize(var3.username.getName())); - var4.packetBuffer.writeByte(var0); - var4.packetBuffer.writeShort(var1); - var4.packetBuffer.writeBoolean(var2); - var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); - Client.packetWriter.addNode(var4); - } - } + public static void method226() { + class201.field1580.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/SpotAnimation.java b/osrs/src/main/java/SpotAnimation.java index c3d8fdb9f..79f5970ca 100644 --- a/osrs/src/main/java/SpotAnimation.java +++ b/osrs/src/main/java/SpotAnimation.java @@ -1,29 +1,29 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("un") +@ObfuscatedName("vk") @Implements("SpotAnimation") public class SpotAnimation extends Node { - @ObfuscatedName("au") - public int field4281; - @ObfuscatedName("ae") - public int field4278; - @ObfuscatedName("ao") - public int field4279; - @ObfuscatedName("at") - public int field4280; @ObfuscatedName("ac") - public int field4277; + public int field4304; + @ObfuscatedName("al") + public int field4306; + @ObfuscatedName("ak") + public int field4305; + @ObfuscatedName("ax") + public int field4308; + @ObfuscatedName("ao") + public int field4307; public SpotAnimation(int var1, int var2, int var3, int var4) { - this.field4281 = -1; - this.field4278 = 0; - this.field4279 = 0; - this.field4280 = 0; - this.field4277 = 0; - this.field4281 = var1; - this.field4277 = var2; - this.field4280 = var3; - this.field4278 = var4; + this.field4304 = -1; + this.field4306 = 0; + this.field4305 = 0; + this.field4308 = 0; + this.field4307 = 0; + this.field4304 = var1; + this.field4307 = var2; + this.field4308 = var3; + this.field4306 = var4; } } \ No newline at end of file diff --git a/osrs/src/main/java/SpotAnimationDefinition.java b/osrs/src/main/java/SpotAnimationDefinition.java index 5daec246a..a72ddf127 100644 --- a/osrs/src/main/java/SpotAnimationDefinition.java +++ b/osrs/src/main/java/SpotAnimationDefinition.java @@ -3,81 +3,73 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -@ObfuscatedName("ha") +@ObfuscatedName("ir") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("SpotAnimationDefinition_archive") public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("SpotAnimationDefinition_modelArchive") public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("SpotAnimationDefinition_cached") - public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("at") + static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) - @Export("SpotAnimationDefinition_cachedModels") - public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("sl") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("ac") + @Export("Widget_cachedFonts") + static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("ao") @Export("id") int id; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("archive") int archive; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("sequence") public int sequence; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("widthScale") int widthScale; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("heightScale") int heightScale; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("orientation") int orientation; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("ambient") int ambient; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("contrast") int contrast; static { SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); - SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); + Widget_cachedFonts = new EvictingDualNodeHashTable(30); } SpotAnimationDefinition() { @@ -89,10 +81,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "127" + descriptor = "(Lul;I)V", + garbageValue = "-1113058920" ) @Export("decode") void decode(Buffer var1) { @@ -106,10 +98,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;IB)V", - garbageValue = "83" + descriptor = "(Lul;II)V", + garbageValue = "2121319025" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -153,17 +145,17 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(II)Ljr;", - garbageValue = "620606809" + descriptor = "(II)Ljn;", + garbageValue = "1896803273" ) @Export("getModel") public final Model getModel(int var1) { - Model var2 = this.method1002(); + Model var2 = this.method1037(); Model var3; if (this.sequence != -1 && var1 != -1) { - var3 = EnumComposition.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var3 = class36.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var3 = var2.toSharedSpotAnimationModel(true); } @@ -192,13 +184,13 @@ public final Model getModel(int var1) { return var3; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)Ljr;", - garbageValue = "-10" + descriptor = "(B)Ljn;", + garbageValue = "6" ) - public final Model method1002() { - Model var1 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); + public final Model method1037() { + Model var1 = (Model)Widget_cachedFonts.get((long)this.id); if (var1 == null) { ModelData var2 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); if (var2 == null) { @@ -219,35 +211,19 @@ public final Model method1002() { } var1 = var2.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); - SpotAnimationDefinition_cachedModels.put(var1, (long)this.id); + Widget_cachedFonts.put(var1, (long)this.id); } return var1; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/Date;", - garbageValue = "1382100876" + descriptor = "(B)V", + garbageValue = "-113" ) - static Date method1003() throws ParseException { - SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); - var0.setLenient(false); - StringBuilder var1 = new StringBuilder(); - String[] var2 = Login.field768; - - for (int var3 = 0; var3 < var2.length; ++var3) { - String var4 = var2[var3]; - if (var4 == null) { - PcmPlayer.method212(7); - class318.setLoginResponseString("Date not valid.", "Please ensure all characters are populated.", ""); - return null; - } - - var1.append(var4); - } - - var1.append("12"); - return var0.parse(var1.toString()); + public static final void method1038() { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; } } \ No newline at end of file diff --git a/osrs/src/main/java/SpriteMask.java b/osrs/src/main/java/SpriteMask.java index c5fc33b4f..baa01d1c0 100644 --- a/osrs/src/main/java/SpriteMask.java +++ b/osrs/src/main/java/SpriteMask.java @@ -3,22 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("me") +@ObfuscatedName("mp") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("az") - @Export("SpriteBuffer_spriteHeights") - static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("au") + @ObfuscatedName("tv") + @ObfuscatedSignature( + descriptor = "Lud;" + ) + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("ac") @Export("width") public final int width; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("height") public final int height; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("xStarts") public final int[] xStarts; @@ -29,10 +32,10 @@ public class SpriteMask extends DualNode { this.xStarts = var4; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "152224212" + garbageValue = "1677893354" ) @Export("contains") public boolean contains(int var1, int var2) { @@ -45,13 +48,4 @@ public boolean contains(int var1, int var2) { return false; } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1301851589" - ) - public static int method1706(int var0) { - return var0 >> 17 & 7; - } } \ No newline at end of file diff --git a/osrs/src/main/java/SpritePixels.java b/osrs/src/main/java/SpritePixels.java index 5a81c5f67..b0e6d6c3e 100644 --- a/osrs/src/main/java/SpritePixels.java +++ b/osrs/src/main/java/SpritePixels.java @@ -3,28 +3,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ui") +@ObfuscatedName("ud") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("pixels") public int[] pixels; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("subWidth") public int subWidth; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("subHeight") public int subHeight; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("xOffset") public int xOffset; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("yOffset") - int yOffset; - @ObfuscatedName("ai") + public int yOffset; + @ObfuscatedName("ah") @Export("width") public int width; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("height") public int height; @@ -40,12 +40,12 @@ public SpritePixels(int var1, int var2) { this(new int[var2 * var1], var1, var2); } - SpritePixels() { + public SpritePixels() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "()Lui;" + descriptor = "()Lud;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { @@ -64,11 +64,11 @@ public SpritePixels mirrorHorizontally() { return var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "()Lui;" + descriptor = "()Lud;" ) - public SpritePixels method2657() { + public SpritePixels method2696() { SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); var1.width = this.width; var1.height = this.height; @@ -83,9 +83,9 @@ public SpritePixels method2657() { return var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "()Lui;" + descriptor = "()Lud;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { @@ -100,13 +100,13 @@ public SpritePixels copyNormalized() { return var1; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("setRaster") public void setRaster() { - Rasterizer2D.method2620(this.pixels, this.subWidth, this.subHeight, (float[])null); + Rasterizer2D.method2659(this.pixels, this.subWidth, this.subHeight, (float[])null); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -126,7 +126,7 @@ public void normalize() { } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -168,7 +168,7 @@ public void pad(int var1) { } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -184,7 +184,7 @@ public void flipHorizontally() { this.xOffset = this.width - this.subWidth - this.xOffset; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -200,7 +200,7 @@ public void flipVertically() { this.yOffset = this.height - this.subHeight - this.yOffset; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; @@ -228,7 +228,7 @@ public void outline(int var1) { this.pixels = var2; } - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { @@ -243,7 +243,7 @@ public void shadow(int var1) { } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -289,7 +289,7 @@ public void drawAt(int var1, int var2) { } } - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; @@ -335,7 +335,7 @@ public void drawTransBgAt(int var1, int var2) { } } - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { @@ -400,7 +400,7 @@ public void drawScaledAt(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { @@ -450,7 +450,7 @@ public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; @@ -496,7 +496,7 @@ public void drawTransAt(int var1, int var2, int var3) { } } - @ObfuscatedName("as") + @ObfuscatedName("aw") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { @@ -561,8 +561,8 @@ public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) } } - @ObfuscatedName("aj") - public void method2678(int var1, int var2, int var3) { + @ObfuscatedName("az") + public void method2717(int var1, int var2, int var3) { var1 += this.xOffset; var2 += this.yOffset; int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -603,16 +603,16 @@ public void method2678(int var1, int var2, int var3) { if (var7 > 0 && var6 > 0) { if (var3 == 256) { - method2679(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method2718(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method2680(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method2719(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } } - @ObfuscatedName("ak") - public void method2681(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ad") + public void method2720(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { int var6 = this.subWidth; int var7 = this.subHeight; @@ -672,16 +672,16 @@ public void method2681(int var1, int var2, int var3, int var4, int var5) { } if (var5 == 256) { - method2682(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method2721(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method2683(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method2722(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } } - @ObfuscatedName("bk") - public void method2684(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("by") + public void method2723(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0 ? -var2 : 0; int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; int var11 = var1 < 0 ? -var1 : 0; @@ -728,7 +728,7 @@ public void method2684(int var1, int var2, int var3, int var4, int var5, int var } - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { @@ -763,8 +763,8 @@ public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int va } - @ObfuscatedName("bt") - public void method2686(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("be") + public void method2725(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; int var11 = -var4 / 2; @@ -802,13 +802,13 @@ public void method2686(int var1, int var2, int var3, int var4, int var5, int var } - @ObfuscatedName("bd") - public void method2687(int var1, int var2, int var3, int var4) { - this.method2688(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + @ObfuscatedName("bv") + public void method2726(int var1, int var2, int var3, int var4) { + this.method2727(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } - @ObfuscatedName("by") - void method2688(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("ba") + void method2727(int var1, int var2, int var3, int var4, int var5, int var6) { if (var6 != 0) { var1 -= this.xOffset << 4; var2 -= this.yOffset << 4; @@ -1276,7 +1276,7 @@ void method2688(int var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("bs") + @ObfuscatedName("bz") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { @@ -1399,7 +1399,7 @@ public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { @@ -1419,7 +1419,7 @@ static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, in } - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -1472,7 +1472,7 @@ static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int v } - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; @@ -1498,7 +1498,7 @@ static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int va } - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { int var11 = 256 - var9; @@ -1524,7 +1524,7 @@ static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, } - @ObfuscatedName("ah") + @ObfuscatedName("ae") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; @@ -1546,7 +1546,7 @@ static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, i } - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { int var13 = 256 - var12; @@ -1574,8 +1574,8 @@ static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, i } - @ObfuscatedName("av") - static void method2679(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + @ObfuscatedName("at") + static void method2718(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1596,8 +1596,8 @@ static void method2679(int var0, int var1, int var2, int[] var3, int[] var4, int } - @ObfuscatedName("aw") - static void method2680(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + @ObfuscatedName("af") + static void method2719(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1620,8 +1620,8 @@ static void method2680(int var0, int var1, int var2, int[] var3, int[] var4, int } - @ObfuscatedName("bh") - static void method2682(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + @ObfuscatedName("bn") + static void method2721(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { for (int var16 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); @@ -1647,8 +1647,8 @@ static void method2682(int var0, int var1, int var2, int var3, int[] var4, int[] } - @ObfuscatedName("bj") - static void method2683(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { + @ObfuscatedName("bk") + static void method2722(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { for (int var17 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); diff --git a/osrs/src/main/java/Strings.java b/osrs/src/main/java/Strings.java index c12154aa1..e722c0c59 100644 --- a/osrs/src/main/java/Strings.java +++ b/osrs/src/main/java/Strings.java @@ -2,43 +2,52 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nr") +import java.util.Arrays; + +@ObfuscatedName("oq") @Implements("Strings") public class Strings { - @ObfuscatedName("fs") - public static String field3315; - @ObfuscatedName("kl") - public static String field3423; - @ObfuscatedName("kk") - public static String field3422; - @ObfuscatedName("kc") - public static String field3414; + @ObfuscatedName("fz") + public static String field3355; + @ObfuscatedName("kv") + public static String field3466; + @ObfuscatedName("kx") + public static String field3468; + @ObfuscatedName("kt") + public static String field3464; static { - field3315 = "Please visit the support page for assistance."; - field3423 = ""; - field3422 = "Page has opened in the browser."; - field3414 = ""; + field3355 = "Please visit the support page for assistance."; + field3466 = ""; + field3468 = "Page has opened in the browser."; + field3464 = ""; } - @ObfuscatedName("af") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "64" + descriptor = "(I)Z", + garbageValue = "5563087" ) - static final void method1877(String var0) { - UserComparator8.method673(var0 + " is already on your friend list"); + public static boolean method1907() { + if (!class319.field2798.isEmpty()) { + return true; + } else { + return !class319.musicSongs.isEmpty() && class319.musicSongs.get(0) != null && ((MusicSong)class319.musicSongs.get(0)).midiPcmStream != null ? ((MusicSong)class319.musicSongs.get(0)).midiPcmStream.isReady() : false; + } } - @ObfuscatedName("ag") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-116" + descriptor = "(Lnm;Lni;ZB)V", + garbageValue = "-63" ) - static final int method1878(int var0, int var1) { - int var2 = var1 * 57 + var0; - var2 ^= var2 << 13; - int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; + public static void method1908(Widget var0, PlayerComposition var1, boolean var2) { + var0.modelType = 7; + var0.field3127 = new PlayerComposition(var1); + if (!var2) { + var0.field3127.equipment = Arrays.copyOf(var0.field3127.field2944, var0.field3127.field2944.length); + var0.field3127.method1760(); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/StructComposition.java b/osrs/src/main/java/StructComposition.java index e4c7bcc19..6f949ea9b 100644 --- a/osrs/src/main/java/StructComposition.java +++ b/osrs/src/main/java/StructComposition.java @@ -3,27 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("ii") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("StructDefinition_archive") - public static AbstractArchive StructDefinition_archive; - @ObfuscatedName("ae") + static AbstractArchive StructDefinition_archive; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("StructDefinition_cached") - public static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("am") - @Export("ByteArrayPool_altSizeArrayCounts") - static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("ao") + static EvictingDualNodeHashTable StructDefinition_cached; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lsf;" + descriptor = "Ltp;" ) @Export("params") IterableNodeHashTable params; @@ -35,19 +32,19 @@ public class StructComposition extends DualNode { StructComposition() { } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1093103177" + garbageValue = "-2078749719" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-50" + descriptor = "(Lul;I)V", + garbageValue = "-1812478277" ) @Export("decode") void decode(Buffer var1) { @@ -61,130 +58,52 @@ void decode(Buffer var1) { } } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1817135134" + descriptor = "(Lul;II)V", + garbageValue = "586234796" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = Decimator.readStringIntParameters(var1, this.params); + this.params = class167.readStringIntParameters(var1, this.params); } } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1339358564" + descriptor = "(IIS)I", + garbageValue = "-32631" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class14.method39(this.params, var1, var2); + return AttackOption.method607(this.params, var1, var2); } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "792481447" + garbageValue = "1837160520" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; - } - } - - return var3; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IS)Lha;", - garbageValue = "-32325" - ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; - } + return class30.method122(this.params, var1, var2); } - @ObfuscatedName("jo") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1529858789" + descriptor = "(CI)Z", + garbageValue = "1128755492" ) - static final int method1024() { - if (class449.clientPreferences.getRoofsHidden()) { - return HealthBar.Client_plane; + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; } else { - int var0 = class18.getTileHeight(NPCComposition.cameraX, class139.cameraZ, HealthBar.Client_plane); - return var0 - class133.cameraY < 800 && (Tiles.Tiles_renderFlags[HealthBar.Client_plane][NPCComposition.cameraX >> 7][class139.cameraZ >> 7] & 4) != 0 ? HealthBar.Client_plane : 3; - } - } - - @ObfuscatedName("nt") - @ObfuscatedSignature( - descriptor = "(Lmi;B)V", - garbageValue = "-126" - ) - static final void method1025(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field542 == -1) { - Client.field542 = var0.spriteId2; - Client.field547 = var0.spriteId; - } - - if (Client.playerAppearance.field2916 == 1) { - var0.spriteId2 = Client.field542; - } else { - var0.spriteId2 = Client.field547; - } - - } else if (var1 == 325) { - if (Client.field542 == -1) { - Client.field542 = var0.spriteId2; - Client.field547 = var0.spriteId; - } - - if (Client.playerAppearance.field2916 == 1) { - var0.spriteId2 = Client.field547; - } else { - var0.spriteId2 = Client.field542; - } - - } else if (var1 == 327) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 0; - } else if (var1 == 328) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 1; + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } } } \ No newline at end of file diff --git a/osrs/src/main/java/StudioGame.java b/osrs/src/main/java/StudioGame.java index 12d650fbd..7f0c11138 100644 --- a/osrs/src/main/java/StudioGame.java +++ b/osrs/src/main/java/StudioGame.java @@ -3,50 +3,50 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ns") +@ObfuscatedName("np") @Implements("StudioGame") -public enum StudioGame implements class371 { - @ObfuscatedName("au") +public enum StudioGame implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lns;" + descriptor = "Lnp;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lns;" + descriptor = "Lnp;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lns;" + descriptor = "Lnp;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lns;" + descriptor = "Lnp;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lns;" + descriptor = "Lnp;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lns;" + descriptor = "Lnp;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("name") public final String name; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("id") final int id; @@ -55,105 +55,37 @@ public enum StudioGame implements class371 { this.id = var5; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lon;I)I", - garbageValue = "-1695354605" + descriptor = "(CI)C", + garbageValue = "-444646790" ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); - int var4 = var1.length(); - int var5 = 0; - int var6 = 0; - char var7 = 0; - char var8 = 0; - - while (var5 - var7 < var3 || var6 - var8 < var4) { - if (var5 - var7 >= var3) { - return -1; - } - - if (var6 - var8 >= var4) { - return 1; - } - - char var9; - if (var7 != 0) { - var9 = var7; - boolean var14 = false; - } else { - var9 = var0.charAt(var5++); - } - - char var10; - if (var8 != 0) { - var10 = var8; - boolean var15 = false; - } else { - var10 = var1.charAt(var6++); - } - - var7 = JagNetThread.method1931(var9); - var8 = JagNetThread.method1931(var10); - var9 = PlayerComposition.standardizeChar(var9, var2); - var10 = PlayerComposition.standardizeChar(var10, var2); - if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var9 != var10) { - return class59.lowercaseChar(var9, var2) - class59.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); - - char var12; - int var17; - for (var17 = 0; var17 < var16; ++var17) { - if (var2 == Language.Language_FR) { - var5 = var3 - 1 - var17; - var6 = var4 - 1 - var17; - } else { - var6 = var17; - var5 = var17; - } - - char var11 = var0.charAt(var5); - var12 = var1.charAt(var6); - if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { - var11 = Character.toLowerCase(var11); - var12 = Character.toLowerCase(var12); - if (var11 != var12) { - return class59.lowercaseChar(var11, var2) - class59.lowercaseChar(var12, var2); - } - } - } - - var17 = var3 - var4; - if (var17 != 0) { - return var17; - } else { - for (int var18 = 0; var18 < var16; ++var18) { - var12 = var0.charAt(var18); - char var13 = var1.charAt(var18); - if (var13 != var12) { - return class59.lowercaseChar(var12, var2) - class59.lowercaseChar(var13, var2); - } - } + static char method1905(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; + } - return 0; - } + @ObfuscatedName("kw") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "6526" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + class91.method483(); + Client.menuActions[0] = "Cancel"; + Client.menuTargets[0] = ""; + Client.menuOpcodes[0] = 1006; + Client.menuShiftClick[0] = false; + Client.menuOptionsCount = 1; } } \ No newline at end of file diff --git a/osrs/src/main/java/SwapSongTask.java b/osrs/src/main/java/SwapSongTask.java index 521a72cb9..09e4a283c 100644 --- a/osrs/src/main/java/SwapSongTask.java +++ b/osrs/src/main/java/SwapSongTask.java @@ -3,34 +3,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("po") +@ObfuscatedName("pz") @Implements("SwapSongTask") public class SwapSongTask extends SongTask { - @ObfuscatedName("rd") @ObfuscatedSignature( - descriptor = "Lth;" - ) - @Export("HitSplatDefinition_cached") - static class497 HitSplatDefinition_cached; - - @ObfuscatedSignature( - descriptor = "(Lpm;)V" + descriptor = "(Lqm;)V" ) public SwapSongTask(SongTask var1) { super(var1); - super.field3722 = "SwapSongTask"; + super.field3753 = "SwapSongTask"; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1604030758" + descriptor = "(B)Z", + garbageValue = "-90" ) + @Export("vmethod2142") public boolean vmethod2142() { - if (class305.musicSongs.size() > 1 && class305.musicSongs.get(0) != null && ((MusicSong)class305.musicSongs.get(0)).midiPcmStream.isReady() && class305.musicSongs.get(1) != null && ((MusicSong)class305.musicSongs.get(1)).midiPcmStream.isReady()) { - MusicSong var1 = (MusicSong)class305.musicSongs.get(0); - class305.musicSongs.set(0, class305.musicSongs.get(1)); - class305.musicSongs.set(1, var1); + if (class319.musicSongs.size() > 1 && class319.musicSongs.get(0) != null && ((MusicSong)class319.musicSongs.get(0)).midiPcmStream.isReady() && class319.musicSongs.get(1) != null && ((MusicSong)class319.musicSongs.get(1)).midiPcmStream.isReady()) { + MusicSong var1 = (MusicSong)class319.musicSongs.get(0); + class319.musicSongs.set(0, class319.musicSongs.get(1)); + class319.musicSongs.set(1, var1); } return true; diff --git a/osrs/src/main/java/Task.java b/osrs/src/main/java/Task.java index ae230de5d..1fb0329c2 100644 --- a/osrs/src/main/java/Task.java +++ b/osrs/src/main/java/Task.java @@ -3,28 +3,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gz") +@ObfuscatedName("hi") @Implements("Task") public class Task { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lhi;" ) @Export("next") Task next; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("status") public volatile int status; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("type") int type; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("intArgument") public int intArgument; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("result") public volatile Object result; diff --git a/osrs/src/main/java/TaskHandler.java b/osrs/src/main/java/TaskHandler.java index 626f1b8f1..865a9bdd4 100644 --- a/osrs/src/main/java/TaskHandler.java +++ b/osrs/src/main/java/TaskHandler.java @@ -8,28 +8,37 @@ import java.net.Socket; import java.net.URL; -@ObfuscatedName("gh") +@ObfuscatedName("gw") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("ao") + @ObfuscatedName("al") + @Export("javaVersion") + public static String javaVersion; + @ObfuscatedName("dk") + @ObfuscatedSignature( + descriptor = "[Lun;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lhi;" ) @Export("current") Task current; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lhi;" ) @Export("task") Task task; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("thread") Thread thread; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("isClosed") boolean isClosed; @@ -38,11 +47,11 @@ public TaskHandler() { this.task = null; this.isClosed = false; javaVendor = "Unknown"; - class106.javaVersion = "1.6"; + javaVersion = "1.6"; try { javaVendor = System.getProperty("java.vendor"); - class106.javaVersion = System.getProperty("java.version"); + javaVersion = System.getProperty("java.version"); } catch (Exception var2) { } @@ -53,10 +62,10 @@ public TaskHandler() { this.thread.start(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "629286454" + descriptor = "(B)V", + garbageValue = "0" ) @Export("close") public final void close() { @@ -72,10 +81,10 @@ public final void close() { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;B)Lgz;", - garbageValue = "-15" + descriptor = "(IIILjava/lang/Object;B)Lhi;", + garbageValue = "99" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -96,20 +105,20 @@ final Task newTask(int var1, int var2, int var3, Object var4) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lgz;", - garbageValue = "1426154941" + descriptor = "(Ljava/lang/String;IS)Lhi;", + garbageValue = "-20310" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lgz;", - garbageValue = "1501831193" + descriptor = "(Ljava/lang/Runnable;II)Lhi;", + garbageValue = "-1310826122" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -165,4 +174,35 @@ public final void run() { } } } + + @ObfuscatedName("ml") + @ObfuscatedSignature( + descriptor = "(Lnm;III)V", + garbageValue = "-23690326" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null && class275.method1539(var0) != null) { + Client.clickedWidget = var0; + Client.clickedWidgetParent = class275.method1539(var0); + Client.widgetClickX = var1; + Client.widgetClickY = var2; + FriendsChat.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var3 = AttackOption.method609(); + if (var3 != -1) { + class133.tempMenuAction = new MenuAction(); + class133.tempMenuAction.param0 = Client.menuArguments1[var3]; + class133.tempMenuAction.param1 = Client.menuArguments2[var3]; + class133.tempMenuAction.opcode = Client.menuOpcodes[var3]; + class133.tempMenuAction.identifier = Client.menuIdentifiers[var3]; + class133.tempMenuAction.itemId = Client.menuItemIds[var3]; + class133.tempMenuAction.action = Client.menuActions[var3]; + class133.tempMenuAction.target = Client.menuTargets[var3]; + } + + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Texture.java b/osrs/src/main/java/Texture.java index 6e3c63e86..8a8ebb583 100644 --- a/osrs/src/main/java/Texture.java +++ b/osrs/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") +@ObfuscatedName("jo") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("averageRGB") int averageRGB; - @ObfuscatedName("ai") - boolean field1987; - @ObfuscatedName("az") + @ObfuscatedName("ah") + boolean field1999; + @ObfuscatedName("ar") @Export("fileIds") int[] fileIds; - @ObfuscatedName("ap") - int[] field1995; - @ObfuscatedName("aa") - int[] field1992; - @ObfuscatedName("af") - int[] field1993; - @ObfuscatedName("ad") + @ObfuscatedName("ab") + int[] field2004; + @ObfuscatedName("am") + int[] field2005; + @ObfuscatedName("av") + int[] field2008; + @ObfuscatedName("ag") @Export("animationDirection") int animationDirection; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("pixels") int[] pixels; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;)V" ) Texture(Buffer var1) { this.isLoaded = false; this.averageRGB = var1.readUnsignedShort(); - this.field1987 = var1.readUnsignedByte() == 1; + this.field1999 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 4) { this.fileIds = new int[var2]; @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { - this.field1995 = new int[var2 - 1]; + this.field2004 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1995[var3] = var1.readUnsignedByte(); + this.field2004[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { - this.field1992 = new int[var2 - 1]; + this.field2005 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1992[var3] = var1.readUnsignedByte(); + this.field2005[var3] = var1.readUnsignedByte(); } } - this.field1993 = new int[var2]; + this.field2008 = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.field1993[var3] = var1.readInt(); + this.field2008[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); @@ -82,9 +82,9 @@ public class Texture extends Node { } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(DILnu;)Z" + descriptor = "(DILom;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -101,16 +101,26 @@ boolean load(double var1, int var3, AbstractArchive var4) { for (int var6 = 0; var6 < this.fileIds.length; ++var6) { int var8 = this.fileIds[var6]; IndexedSprite var7; - if (!Decimator.method313(var4, var8)) { + if (!class406.method2058(var4, var8)) { var7 = null; } else { - var7 = class493.method2466(); + IndexedSprite var10 = new IndexedSprite(); + var10.width = class159.SpriteBuffer_spriteWidth; + var10.height = class500.SpriteBuffer_spriteHeight; + var10.xOffset = class326.SpriteBuffer_xOffsets[0]; + var10.yOffset = ModelData0.SpriteBuffer_yOffsets[0]; + var10.subWidth = class59.SpriteBuffer_spriteWidths[0]; + var10.subHeight = class544.SpriteBuffer_spriteHeights[0]; + var10.palette = class372.SpriteBuffer_spritePalette; + var10.pixels = AddRequestTask.SpriteBuffer_pixels[0]; + class407.method2062(); + var7 = var10; } var7.normalize(); - byte[] var10 = var7.pixels; + byte[] var17 = var7.pixels; int[] var11 = var7.palette; - int var12 = this.field1993[var6]; + int var12 = this.field2008[var6]; if ((var12 & -16777216) == 16777216) { } @@ -141,20 +151,20 @@ boolean load(double var1, int var3, AbstractArchive var4) { if (var6 == 0) { var13 = 0; } else { - var13 = this.field1995[var6 - 1]; + var13 = this.field2004[var6 - 1]; } if (var13 == 0) { if (var3 == var7.subWidth) { for (var14 = 0; var14 < var5; ++var14) { - this.pixels[var14] = var11[var10[var14] & 255]; + this.pixels[var14] = var11[var17[var14] & 255]; } } else if (var7.subWidth == 64 && var3 == 128) { var14 = 0; for (var15 = 0; var15 < var3; ++var15) { for (var16 = 0; var16 < var3; ++var16) { - this.pixels[var14++] = var11[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; + this.pixels[var14++] = var11[var17[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; } } } else { @@ -166,7 +176,7 @@ boolean load(double var1, int var3, AbstractArchive var4) { for (var15 = 0; var15 < var3; ++var15) { for (var16 = 0; var16 < var3; ++var16) { - this.pixels[var14++] = var11[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; + this.pixels[var14++] = var11[var17[(var16 << 1) + (var15 << 1 << 7)] & 255]; } } } @@ -185,13 +195,13 @@ boolean load(double var1, int var3, AbstractArchive var4) { return true; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("reset") void reset() { this.pixels = null; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("animate") void animate(int var1) { if (this.pixels != null) { diff --git a/osrs/src/main/java/TextureLoader.java b/osrs/src/main/java/TextureLoader.java index 4125a000c..8f16b7547 100644 --- a/osrs/src/main/java/TextureLoader.java +++ b/osrs/src/main/java/TextureLoader.java @@ -3,37 +3,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +@ObfuscatedName("kg") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-1284455059" + garbageValue = "-1910207818" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1228029354" + garbageValue = "958373665" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "89" + garbageValue = "-20" ) @Export("vmethod3989") boolean vmethod3989(int var1); - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1328264692" + garbageValue = "21443457" ) @Export("isLowDetail") boolean isLowDetail(int var1); diff --git a/osrs/src/main/java/TextureProvider.java b/osrs/src/main/java/TextureProvider.java index fe0f16322..21dd11db1 100644 --- a/osrs/src/main/java/TextureProvider.java +++ b/osrs/src/main/java/TextureProvider.java @@ -3,42 +3,48 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("jq") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("au") + @ObfuscatedName("nx") @ObfuscatedSignature( - descriptor = "[Lif;" + descriptor = "Ldj;" + ) + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "[Ljo;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpf;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("capacity") int capacity; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("remaining") int remaining; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("brightness") double brightness; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("textureSize") int textureSize; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;IDI)V" + descriptor = "(Lom;Lom;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); @@ -65,10 +71,10 @@ public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, dou } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -87,7 +93,7 @@ public int getLoadedPercentage() { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.archive.method1906(var8)) { + if (this.archive.method1937(var8)) { ++var2; } } @@ -102,17 +108,17 @@ public int getLoadedPercentage() { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; this.clear(); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-1284455059" + garbageValue = "-1910207818" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -142,40 +148,40 @@ public int[] getTexturePixels(int var1) { return null; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1228029354" + garbageValue = "958373665" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "89" + garbageValue = "-20" ) @Export("vmethod3989") public boolean vmethod3989(int var1) { - return this.textures[var1].field1987; + return this.textures[var1].field1999; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1328264692" + garbageValue = "21443457" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1655781551" + garbageValue = "-1815480398" ) @Export("clear") public void clear() { @@ -189,10 +195,10 @@ public void clear() { this.remaining = this.capacity; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2107237619" + garbageValue = "-2088818432" ) @Export("animate") public void animate(int var1) { @@ -206,78 +212,175 @@ public void animate(int var1) { } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)[B", - garbageValue = "1" + descriptor = "(Lom;IB)V", + garbageValue = "32" ) - public static byte[] method1301(CharSequence var0) { - int var1 = var0.length(); - byte[] var2 = new byte[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { - var2[var3] = (byte)var4; - } else if (var4 == 8364) { - var2[var3] = -128; - } else if (var4 == 8218) { - var2[var3] = -126; - } else if (var4 == 402) { - var2[var3] = -125; - } else if (var4 == 8222) { - var2[var3] = -124; - } else if (var4 == 8230) { - var2[var3] = -123; - } else if (var4 == 8224) { - var2[var3] = -122; - } else if (var4 == 8225) { - var2[var3] = -121; - } else if (var4 == 710) { - var2[var3] = -120; - } else if (var4 == 8240) { - var2[var3] = -119; - } else if (var4 == 352) { - var2[var3] = -118; - } else if (var4 == 8249) { - var2[var3] = -117; - } else if (var4 == 338) { - var2[var3] = -116; - } else if (var4 == 381) { - var2[var3] = -114; - } else if (var4 == 8216) { - var2[var3] = -111; - } else if (var4 == 8217) { - var2[var3] = -110; - } else if (var4 == 8220) { - var2[var3] = -109; - } else if (var4 == 8221) { - var2[var3] = -108; - } else if (var4 == 8226) { - var2[var3] = -107; - } else if (var4 == 8211) { - var2[var3] = -106; - } else if (var4 == 8212) { - var2[var3] = -105; - } else if (var4 == 732) { - var2[var3] = -104; - } else if (var4 == 8482) { - var2[var3] = -103; - } else if (var4 == 353) { - var2[var3] = -102; - } else if (var4 == 8250) { - var2[var3] = -101; - } else if (var4 == 339) { - var2[var3] = -100; - } else if (var4 == 382) { - var2[var3] = -98; - } else if (var4 == 376) { - var2[var3] = -97; - } else { - var2[var3] = 63; - } + static void method1351(AbstractArchive var0, int var1) { + if ((var1 & class525.field4158.rsOrdinal()) != 0) { + Login.logoSprite = class167.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); + } else if ((var1 & class525.field4159.rsOrdinal()) != 0) { + Login.logoSprite = class167.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); + } else if ((var1 & class525.field4155.rsOrdinal()) != 0) { + Login.logoSprite = class167.SpriteBuffer_getIndexedSpriteByName(var0, "logo_speedrunning", ""); + } else { + Login.logoSprite = class167.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); + } + + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-32" + ) + static final void method1350() { + if (!ViewportMouse.ViewportMouse_false0) { + int var0 = Scene.Scene_cameraPitchSine; + int var1 = Scene.Scene_cameraPitchCosine; + int var2 = Scene.Scene_cameraYawSine; + int var3 = Scene.Scene_cameraYawCosine; + byte var4 = 50; + short var5 = 3500; + int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.getClipMidX()) * var4 / Rasterizer3D.get3dZoom(); + int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.getClipMidY()) * var4 / Rasterizer3D.get3dZoom(); + int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.getClipMidX()) * var5 / Rasterizer3D.get3dZoom(); + int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.getClipMidY()) * var5 / Rasterizer3D.get3dZoom(); + int var10 = class10.method30(var7, var4, var1, var0); + int var13 = GrandExchangeOfferUnitPriceComparator.method1992(var7, var4, var1, var0); + var7 = var10; + var10 = class10.method30(var9, var5, var1, var0); + int var14 = GrandExchangeOfferUnitPriceComparator.method1992(var9, var5, var1, var0); + var9 = var10; + var10 = AbstractWorldMapData.method1556(var6, var13, var3, var2); + int var11 = var6 * var2 + var13 * var3 >> 16; + var6 = var10; + var10 = AbstractWorldMapData.method1556(var8, var14, var3, var2); + int var12 = var3 * var14 + var8 * var2 >> 16; + ViewportMouse.field2264 = (var6 + var10) / 2; + ViewportMouse.field2260 = (var9 + var7) / 2; + class286.field2470 = (var12 + var11) / 2; + class180.field1467 = (var10 - var6) / 2; + ViewportMouse.field2263 = (var9 - var7) / 2; + ViewportMouse.field2265 = (var12 - var11) / 2; + class190.field1495 = Math.abs(class180.field1467); + GraphicsObject.field718 = Math.abs(ViewportMouse.field2263); + HealthBar.field1073 = Math.abs(ViewportMouse.field2265); } + } + + @ObfuscatedName("li") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "-2147134009" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = class33.field89.getWidgetChild(var1, var2); + if (var5 != null) { + if (var5.onOp != null) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var5; + var6.opIndex = var0; + var6.targetName = var4; + var6.args = var5.onOp; + Interpreter.runScriptEvent(var6); + } - return var2; + boolean var11 = true; + if (var5.contentType > 0) { + var11 = EnumComposition.method1002(var5); + } + + if (var11) { + int var8 = MouseRecorder.getWidgetFlags(var5); + int var9 = var0 - 1; + boolean var7 = (var8 >> var9 + 1 & 1) != 0; + if (var7) { + PacketBufferNode var10; + if (var0 == 1) { + var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON1, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 2) { + var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON2, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 3) { + var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON3, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 4) { + var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON4, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 5) { + var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON5, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 6) { + var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON6, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 7) { + var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON7, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 8) { + var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON8, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 9) { + var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON9, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 10) { + var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON10, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/Tile.java b/osrs/src/main/java/Tile.java index 5c13ee528..d15a8b000 100644 --- a/osrs/src/main/java/Tile.java +++ b/osrs/src/main/java/Tile.java @@ -3,96 +3,96 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("jh") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("plane") int plane; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("x") int x; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("y") int y; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("originalPlane") int originalPlane; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ljg;" + descriptor = "Ljz;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljf;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ljo;" + descriptor = "Lkr;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Ljw;" + descriptor = "Lkq;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Liy;" + descriptor = "Ljd;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljc;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "[Ljy;" + descriptor = "[Lkl;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("minPlane") int minPlane; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("ah") - int field2014; - @ObfuscatedName("as") - int field2018; - @ObfuscatedName("ay") - int field2022; - @ObfuscatedName("aj") + @ObfuscatedName("ae") + int field2024; + @ObfuscatedName("aw") + int field2031; + @ObfuscatedName("aq") + int field2029; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Ljh;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -106,22 +106,572 @@ public final class Tile extends Node { this.y = var3; } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1321170330" + descriptor = "(II)Ltr;", + garbageValue = "1668422636" ) - @Export("addImageTag") - static String addImageTag(int var0) { - return ""; + public static class517 method1230(int var0) { + int var1 = class515.field4128[var0]; + if (var1 == 1) { + return class517.field4129; + } else if (var1 == 2) { + return class517.field4130; + } else { + return var1 == 3 ? class517.field4131 : null; + } } - @ObfuscatedName("ag") + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1270571298" + ) + static void method1231() { + ItemContainer.itemContainers = new NodeHashTable(32); + } + + @ObfuscatedName("lb") + @ObfuscatedSignature( + descriptor = "([Lnm;IIIIIIIII)V", + garbageValue = "-1800705740" + ) + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.method1248(); + + for (int var9 = 0; var9 < var0.length; ++var9) { + Widget var10 = var0[var9]; + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { + int var11; + if (var8 == -1) { + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; + var11 = ++Client.rootWidgetCount - 1; + } else { + var11 = var8; + } + + var10.rootIndex = var11; + var10.cycle = Client.cycle; + if (!var10.isIf3 || !CollisionMap.isComponentHidden(var10)) { + if (var10.contentType > 0) { + class6.method16(var10); + } + + int var12 = var10.x + var6; + int var13 = var7 + var10.y; + int var14 = var10.transparencyTop; + int var15; + int var16; + if (var10 == Client.clickedWidget) { + if (var1 != -1412584499 && !var10.isScrollBar) { + class9.field16 = var0; + GrandExchangeEvent.field3617 = var6; + class10.field24 = var7; + continue; + } + + if (Client.isDraggingWidget && Client.field396) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field516) { + var15 = Client.field516; + } + + if (var15 + var10.width > Client.field516 + Client.clickedWidgetParent.width) { + var15 = Client.field516 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field514) { + var16 = Client.field514; + } + + if (var16 + var10.height > Client.field514 + Client.clickedWidgetParent.height) { + var16 = Client.field514 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; + var13 = var16; + } + + if (!var10.isScrollBar) { + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 9) { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + if (var21 < var12) { + var19 = var21; + var21 = var12; + } + + if (var22 < var13) { + var20 = var22; + var22 = var13; + } + + ++var21; + ++var22; + var15 = var19 > var2 ? var19 : var2; + var16 = var20 > var3 ? var20 : var3; + var17 = var21 < var4 ? var21 : var4; + var18 = var22 < var5 ? var22 : var5; + } else { + var19 = var12 + var10.width; + var20 = var13 + var10.height; + var15 = var12 > var2 ? var12 : var2; + var16 = var13 > var3 ? var13 : var3; + var17 = var19 < var4 ? var19 : var4; + var18 = var20 < var5 ? var20 : var5; + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { + if (var10.contentType != 0) { + if (var10.contentType == 1336) { + if (class91.clientPreferences.method546()) { + var13 += 15; + UserComparator6.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); + var13 += 15; + Runtime var41 = Runtime.getRuntime(); + var20 = (int)((var41.totalMemory() - var41.freeMemory()) / 1024L); + var21 = 16776960; + if (var20 > 327680 && !Client.isLowDetail) { + var21 = 16711680; + } + + UserComparator6.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; + } + continue; + } + + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + class432.drawEntities(var12, var13, var10.width, var10.height); + Client.field408[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1338) { + class436.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1339) { + class127.method692(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1400) { + class434.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); + } + + if (var10.contentType == 1401) { + class434.worldMap.drawOverview(var12, var13, var10.width, var10.height); + } + + if (var10.contentType == 1402) { + class544.field4278.draw(var12, Client.cycle); + } + } + + if (var10.type == 0) { + if (!var10.isIf3 && CollisionMap.isComponentHidden(var10) && var10 != class64.mousedOverWidgetIf1) { + continue; + } + + if (!var10.isIf3) { + if (var10.scrollY > var10.scrollHeight - var10.height) { + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + if (var10.children != null) { + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); + if (var28 != null) { + class410.drawWidgets(var28.group, var15, var16, var17, var18, var12, var13, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.method1248(); + } else if (var10.type == 11) { + if (CollisionMap.isComponentHidden(var10) && var10 != class64.mousedOverWidgetIf1) { + continue; + } + + if (var10.children != null) { + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.method1248(); + } + + if (Client.isResizable || Client.field406[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + class223.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { + if (var10.type == 3) { + if (UserComparator9.runCs1(var10)) { + var19 = var10.color2; + if (var10 == class64.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; + if (var10 == class64.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { + switch(var10.fillMode.field4260) { + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); + break; + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); + break; + default: + if (var14 == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } + } else if (var14 == 0) { + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } else if (var10.type == 4) { + Font var40 = var10.getFont(class33.field89); + if (var40 == null) { + if (Widget.field2978) { + ClanChannelMember.invalidateWidget(var10); + } + } else { + String var42 = var10.text; + if (UserComparator9.runCs1(var10)) { + var20 = var10.color2; + if (var10 == class64.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { + var42 = var10.text2; + } + } else { + var20 = var10.color; + if (var10 == class64.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { + ItemComposition var43 = class214.ItemDefinition_get(var10.itemId); + var42 = var43.name; + if (var42 == null) { + var42 = "null"; + } + + if ((var43.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var42 = Client.colorStartTag(16748608) + var42 + "" + " " + 'x' + class174.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { + var42 = "Please wait..."; + var20 = var10.color; + } + + if (!var10.isIf3) { + var42 = class463.method2329(var42, var10); + } + + var40.method2125(var42, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, class481.method2387(var10.transparencyTop), var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); + } + } else { + int var23; + int var24; + int var25; + if (var10.type == 5) { + SpritePixels var38; + if (!var10.isIf3) { + var38 = var10.getSprite(class33.field89, UserComparator9.runCs1(var10), AbstractWorldMapIcon.urlRequester); + if (var38 != null) { + var38.drawTransBgAt(var12, var13); + } else if (Widget.field2978) { + ClanChannelMember.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { + var38 = class158.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var38 = var10.getSprite(class33.field89, false, AbstractWorldMapIcon.urlRequester); + } + + if (var38 == null) { + if (Widget.field2978) { + ClanChannelMember.invalidateWidget(var10); + } + } else { + var20 = var38.width; + var21 = var38.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { + var38.method2726(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { + var38.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { + var38.drawTransBgAt(var12, var13); + } else { + var38.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); + var22 = (var20 - 1 + var10.width) / var20; + var23 = (var21 - 1 + var10.height) / var21; + + for (var24 = 0; var24 < var22; ++var24) { + for (var25 = 0; var25 < var23; ++var25) { + if (var10.spriteAngle != 0) { + var38.method2726(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); + } else if (var14 != 0) { + var38.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var38.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } else { + int var34; + if (var10.type == 6) { + boolean var36 = UserComparator9.runCs1(var10); + if (var36) { + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; + } + + Model var39 = null; + var22 = 0; + if (var10.itemId != -1) { + ItemComposition var44 = class214.ItemDefinition_get(var10.itemId); + if (var44 != null) { + var44 = var44.getCountObj(var10.itemQuantity); + var39 = var44.getModel(1); + if (var39 != null) { + var39.calculateBoundsCylinder(); + var22 = var39.height / 2; + } else { + ClanChannelMember.invalidateWidget(var10); + } + } + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var39 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var39 = TextureProvider.localPlayer.getModel(); + } + } else if (var10.modelType == 7) { + var39 = var10.field3127.getModel((SequenceDefinition)null, -1, class36.SequenceDefinition_get(TextureProvider.localPlayer.idleSequence), TextureProvider.localPlayer.movementFrame); + } else { + NPCComposition var45 = null; + NewShit var32 = null; + if (var10.modelType == 6) { + var25 = var10.modelId; + if (var25 >= 0 && var25 < Client.npcs.length) { + NPC var26 = Client.npcs[var25]; + if (var26 != null) { + var45 = var26.definition; + var32 = var26.method593(); + } + } + } + + SequenceDefinition var33 = null; + var34 = -1; + if (var20 != -1) { + var33 = class36.SequenceDefinition_get(var20); + var34 = var10.modelFrame; + } + + var39 = var10.getModel(class33.field89, var33, var34, var36, TextureProvider.localPlayer.appearance, var45, var32); + if (var39 == null && Widget.field2978) { + ClanChannelMember.invalidateWidget(var10); + } + } + + Rasterizer3D.method1251(var10.width / 2 + var12, var10.height / 2 + var13); + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; + if (var39 != null) { + if (!var10.isIf3) { + var39.method1379(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var39.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var39.method1380(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var39.method1379(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); + } + } + } + + Rasterizer3D.method1250(); + } else { + Font var29; + if (var10.type == 8 && var10 == GrandExchangeOfferNameComparator.field3615 && Client.field499 == Client.field498) { + var19 = 0; + var20 = 0; + var29 = UserComparator6.fontPlain12; + String var30 = var10.text; + + String var31; + for (var30 = class463.method2329(var30, var10); var30.length() > 0; var20 = var20 + var29.ascent + 1) { + var24 = var30.indexOf("
"); + if (var24 != -1) { + var31 = var30.substring(0, var24); + var30 = var30.substring(var24 + 4); + } else { + var31 = var30; + var30 = ""; + } + + var25 = var29.stringWidth(var31); + if (var25 > var19) { + var19 = var25; + } + } + + var19 += 6; + var20 += 7; + var24 = var12 + var10.width - 5 - var19; + var25 = var13 + var10.height + 5; + if (var24 < var12 + 5) { + var24 = var12 + 5; + } + + if (var24 + var19 > var4) { + var24 = var4 - var19; + } + + if (var25 + var20 > var5) { + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); + var30 = var10.text; + var34 = var25 + var29.ascent + 2; + + for (var30 = class463.method2329(var30, var10); var30.length() > 0; var34 = var34 + var29.ascent + 1) { + int var27 = var30.indexOf("
"); + if (var27 != -1) { + var31 = var30.substring(0, var27); + var30 = var30.substring(var27 + 4); + } else { + var31 = var30; + var30 = ""; + } + + var29.draw(var31, var24 + 3, var34, 0, -1); + } + } + + if (var10.type == 9) { + if (var10.field2989) { + var19 = var12; + var20 = var13 + var10.height; + var21 = var12 + var10.width; + var22 = var13; + } else { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + } + + if (var10.lineWid == 1) { + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); + } else { + JagexCache.method919(var19, var20, var21, var22, var10.color, var10.lineWid); + } + } else if (var10.type == 12) { + class344 var37 = var10.method1877(); + class339 var35 = var10.method1878(); + if (var37 != null && var35 != null && var37.method1819()) { + var29 = var10.getFont(class33.field89); + if (var29 != null) { + Client.field649.method2734(var12, var13, var10.width, var10.height, var37.method1820(), var37.method1821(), var37.method1817(), var37.method1818(), var37.method1816()); + var22 = var10.textShadowed ? var10.spriteShadow * -2035927347 * 1142466053 : -1; + if (!var37.method1814() && var37.method1811().method2067()) { + Client.field649.method2735(var35.field2924, var22, var35.field2923, var35.field2925); + Client.field649.method2736(var37.method1812(), var29); + } else { + Client.field649.method2735(var10.color, var22, var35.field2923, var35.field2925); + Client.field649.method2736(var37.method1811(), var29); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } + } + } + } + } + } + } + } + } + + } + + @ObfuscatedName("op") @ObfuscatedSignature( - descriptor = "(II)Lfv;", - garbageValue = "-1875628936" + descriptor = "(I)V", + garbageValue = "-1817325777" ) - static class137 method1184(int var0) { - return ClientPreferences.method571(var0) != 0 ? null : class338.method1862(var0); + static void method1233() { + class91.clientPreferences.method559(Client.param21); } } \ No newline at end of file diff --git a/osrs/src/main/java/TileItem.java b/osrs/src/main/java/TileItem.java index 3e8a4a2ad..cabd85889 100644 --- a/osrs/src/main/java/TileItem.java +++ b/osrs/src/main/java/TileItem.java @@ -3,99 +3,182 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; -@ObfuscatedName("ed") +@ObfuscatedName("el") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("id") int id; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("quantity") int quantity; - @ObfuscatedName("at") - int field1104; + @ObfuscatedName("ax") + int field1107; TileItem() { - this.field1104 = 31; + this.field1107 = 31; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "11584" + descriptor = "(IB)V", + garbageValue = "0" ) - void method609(int var1) { - this.field1104 = var1; + void method611(int var1) { + this.field1107 = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljr;", - garbageValue = "798227647" + descriptor = "(B)Ljn;", + garbageValue = "0" ) @Export("getModel") protected final Model getModel() { - return InvDefinition.ItemDefinition_get(this.id).getModel(this.quantity); + return class214.ItemDefinition_get(this.id).getModel(this.quantity); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1782436453" + descriptor = "(IB)Z", + garbageValue = "60" ) - boolean method610(int var1) { + boolean method612(int var1) { if (var1 >= 0 && var1 <= 4) { - return (this.field1104 & 1 << var1) != 0; + return (this.field1107 & 1 << var1) != 0; } else { return true; } } - @ObfuscatedName("ah") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lgh;III)Lbb;", - garbageValue = "881365546" + descriptor = "(Lfz;FFFFFFFFI)V", + garbageValue = "262393745" ) - public static final PcmPlayer method612(TaskHandler var0, int var1, int var2) { - if (var1 >= 0 && var1 < 2) { - if (var2 < 256) { - var2 = 256; + static void method614(class132 var0, float var1, float var2, float var3, float var4, float var5, float var6, float var7, float var8) { + if (var0 != null) { + var0.field1247 = var1; + float var9 = var4 - var1; + float var10 = var8 - var5; + float var11 = var2 - var1; + float var12 = 0.0F; + float var13 = 0.0F; + if ((double)var11 != 0.0D) { + var12 = (var6 - var5) / var11; } + var11 = var4 - var3; + if (0.0D != (double)var11) { + var13 = (var8 - var7) / var11; + } + + float var14 = 1.0F / (var9 * var9); + float var15 = var12 * var9; + float var16 = var9 * var13; + var0.field1244 = var14 * (var15 + var16 - var10 - var10) / var9; + var0.field1249 = (var10 + var10 + var10 - var15 - var15 - var16) * var14; + var0.field1242 = var12; + var0.field1240 = var5; + } + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(Liz;I)Z", + garbageValue = "-966132551" + ) + static boolean method615(ObjectComposition var0) { + if (var0.transforms != null) { + int[] var1 = var0.transforms; + + for (int var2 = 0; var2 < var1.length; ++var2) { + int var3 = var1[var2]; + ObjectComposition var4 = class91.getObjectDefinition(var3); + if (var4.mapIconId != -1) { + return true; + } + } + } else if (var0.mapIconId != -1) { + return true; + } + + return false; + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "667275397" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; + if (GrandExchangeOfferTotalQuantityComparator.garbageCollector == null || !GrandExchangeOfferTotalQuantityComparator.garbageCollector.isValid()) { try { - PcmPlayer var3 = FloorDecoration.pcmPlayerProvider.player(); - var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; - var3.field194 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + GrandExchangeOfferTotalQuantityComparator.garbageCollector = var2; + GameEngine.garbageCollectorLastCheckTimeMs = -1L; + GameEngine.garbageCollectorLastCollectionTime = -1L; + } } + } catch (Throwable var11) { + } + } - var3.open(var3.capacity); - if (PcmPlayer.field182 > 0 && Canvas.soundSystem == null) { - Canvas.soundSystem = new SoundSystem(); - PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); - PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(Canvas.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + if (GrandExchangeOfferTotalQuantityComparator.garbageCollector != null) { + long var9 = GrandExchangeOfferTotalQuantityComparator.method1971(); + long var3 = GrandExchangeOfferTotalQuantityComparator.garbageCollector.getCollectionTime(); + if (GameEngine.garbageCollectorLastCollectionTime != -1L) { + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; + if (0L != var7) { + var0 = (int)(var5 * 100L / var7); } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; + GameEngine.garbageCollectorLastCheckTimeMs = var9; + } - if (Canvas.soundSystem != null) { - if (Canvas.soundSystem.players[var1] != null) { - throw new IllegalArgumentException(); + return var0; + } + + @ObfuscatedName("jh") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "901755520" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { + NPC var2 = Client.npcs[Client.npcIndices[var1]]; + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { + int var3 = var2.x >> 7; + int var4 = var2.y >> 7; + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { + if (var2.field971 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; } - Canvas.soundSystem.players[var1] = var3; + long var5 = GrandExchangeOfferAgeComparator.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + class10.scene.drawEntity(class87.Client_plane, var2.x, var2.y, class115.getTileHeight(var2.field971 * 64 - 64 + var2.x, var2.field971 * 64 - 64 + var2.y, class87.Client_plane), var2.field971 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); } - - return var3; - } catch (Throwable var4) { - return new PcmPlayer(); } - } else { - throw new IllegalArgumentException(); } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Tiles.java b/osrs/src/main/java/Tiles.java index e8bf2f70b..9a9e2ac4c 100644 --- a/osrs/src/main/java/Tiles.java +++ b/osrs/src/main/java/Tiles.java @@ -3,103 +3,407 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +import java.awt.*; + +@ObfuscatedName("dq") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("at") - @Export("Tiles_underlays") - static short[][][] Tiles_underlays; - @ObfuscatedName("aq") + @ObfuscatedName("ab") + static byte[][][] field835; + @ObfuscatedName("aa") @Export("Tiles_lightness") static int[] Tiles_lightness; - @ObfuscatedName("ax") + @ObfuscatedName("ai") static final int[] field844; - @ObfuscatedName("ah") - static final int[] field840; - @ObfuscatedName("as") - static final int[] field842; - @ObfuscatedName("ay") - static final int[] field845; - @ObfuscatedName("aj") - static final int[] field841; - @ObfuscatedName("av") + @ObfuscatedName("ae") static final int[] field843; @ObfuscatedName("aw") + static final int[] field847; + @ObfuscatedName("aq") + static final int[] field845; + @ObfuscatedName("az") + static final int[] field848; + @ObfuscatedName("at") + static final int[] field846; + @ObfuscatedName("af") @Export("rndHue") static int rndHue; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("rndLightness") static int rndLightness; - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - static Archive field838; - @ObfuscatedName("jc") - @Export("timeOfPreviousKeyPress") - static int timeOfPreviousKeyPress; + @ObfuscatedName("gs") + @Export("playerUUIDLength") + static int playerUUIDLength; static { Tiles_heights = new int[4][105][105]; Tiles_renderFlags = new byte[4][104][104]; Tiles_minPlane = 99; field844 = new int[]{1, 2, 4, 8}; - field840 = new int[]{16, 32, 64, 128}; - field842 = new int[]{1, 0, -1, 0}; + field843 = new int[]{16, 32, 64, 128}; + field847 = new int[]{1, 0, -1, 0}; field845 = new int[]{0, -1, 0, 1}; - field841 = new int[]{1, -1, -1, 1}; - field843 = new int[]{-1, -1, 1, 1}; + field848 = new int[]{1, -1, -1, 1}; + field846 = new int[]{-1, -1, 1, 1}; rndHue = (int)(Math.random() * 17.0D) - 8; rndLightness = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)[Lhy;", - garbageValue = "1" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-1109073895" ) - static VerticalAlignment[] method457() { - return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1634, VerticalAlignment.field1633}; + static void method455(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.addFocusListener(MouseHandler.MouseHandler_instance); } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIIII)I", - garbageValue = "-360252292" + descriptor = "(Luy;II)V", + garbageValue = "90907201" ) - static final int method456(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; - } + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + GrandExchangeOfferTotalQuantityComparator.method1975(var0); - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Lnu;III)Lui;", - garbageValue = "1499324687" - ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - return !ApproximateRouteStrategy.method345(var0, var1, var2) ? null : UserComparator6.method693(); + for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { + int var4 = Players.Players_pendingUpdateIndices[var3]; + Player var5 = Client.players[var4]; + int var6 = var0.readUnsignedByte(); + if ((var6 & 1) != 0) { + var6 += var0.readUnsignedByte() << 8; + } + + if ((var6 & 4096) != 0) { + var6 += var0.readUnsignedByte() << 16; + } + + byte var7 = MoveSpeed.STATIONARY.speed; + int var8; + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + if ((var6 & 128) != 0) { + var8 = var0.readUnsignedByteAdd(); + if (var8 > 0) { + for (var9 = 0; var9 < var8; ++var9) { + var11 = -1; + var12 = -1; + var13 = -1; + var10 = var0.readUShortSmart(); + if (var10 == 32767) { + var10 = var0.readUShortSmart(); + var12 = var0.readUShortSmart(); + var11 = var0.readUShortSmart(); + var13 = var0.readUShortSmart(); + } else if (var10 != 32766) { + var12 = var0.readUShortSmart(); + } else { + var10 = -1; + } + + var14 = var0.readUShortSmart(); + var5.addHitSplat(var10, var12, var11, var13, Client.cycle, var14); + } + } + + var9 = var0.readUnsignedByte(); + if (var9 > 0) { + for (var10 = 0; var10 < var9; ++var10) { + var11 = var0.readUShortSmart(); + var12 = var0.readUShortSmart(); + if (var12 != 32767) { + var13 = var0.readUShortSmart(); + var14 = var0.readUnsignedByte(); + var15 = var12 > 0 ? var0.readUnsignedByteNeg() : var14; + var5.addHealthBar(var11, Client.cycle, var12, var13, var14, var15); + } else { + var5.removeHealthBar(var11); + } + } + } + } + + if ((var6 & 65536) != 0) { + var8 = var0.readUnsignedByteAdd(); + + for (var9 = 0; var9 < var8; ++var9) { + var10 = var0.readUnsignedByte(); + var11 = var0.readIntME(); + var12 = var0.readUnsignedIntLE(); + var5.updateSpotAnimation(var10, var11, var12 >> 16, var12 & 65535); + } + } + + if ((var6 & 16) != 0) { + var5.targetIndex = var0.readUnsignedShortAdd(); + var5.targetIndex += var0.readUnsignedByteNeg() << 16; + var8 = 16777215; + if (var8 == var5.targetIndex) { + var5.targetIndex = -1; + } + } + + if ((var6 & 1024) != 0) { + MoveSpeed[] var23 = Players.playerMovementSpeeds; + MoveSpeed[] var24 = new MoveSpeed[]{MoveSpeed.CRAWL, MoveSpeed.STATIONARY, MoveSpeed.WALK, MoveSpeed.RUN}; + var23[var4] = (MoveSpeed)SequenceDefinition.findEnumerated(var24, var0.readByte()); + } + + if ((var6 & 256) != 0) { + var5.recolourStartCycle = Client.cycle + var0.readIntME(); + var5.recolourEndCycle = Client.cycle + var0.readUnsignedShortAdd(); + var5.recolourHue = var0.readByteNeg(); + var5.recolourSaturation = var0.readByteAdd(); + var5.recolourLuminance = var0.readByteSub(); + var5.recolourAmount = (byte)var0.readUnsignedByteNeg(); + } + + if ((var6 & 2) != 0) { + var5.overheadText = var0.readStringCp1252NullTerminated(); + if (var5.overheadText.charAt(0) == '~') { + var5.overheadText = var5.overheadText.substring(1); + class411.addGameMessage(2, var5.username.getName(), var5.overheadText); + } else if (var5 == TextureProvider.localPlayer) { + class411.addGameMessage(2, var5.username.getName(), var5.overheadText); + } + + var5.isAutoChatting = false; + var5.field998 = 0; + var5.field991 = 0; + var5.overheadTextCyclesRemaining = 150; + } + + if ((var6 & 16384) != 0) { + var5.field1016 = var0.readByteAdd(); + var5.field1013 = var0.readByteSub(); + var5.field1021 = var0.readByte(); + var5.field1010 = var0.readByteAdd(); + var5.spotAnimation = var0.readIntME() + Client.cycle; + var5.exactMoveArrive1Cycle = var0.readUnsignedShort() + Client.cycle; + var5.exactMoveDirection = var0.readUnsignedShortAdd(); + if (var5.hasMovementPending) { + var5.field1016 += var5.tileX; + var5.field1013 += var5.tileY; + var5.field1021 += var5.tileX; + var5.field1010 += var5.tileY; + var5.pathLength = 0; + } else { + var5.field1016 += var5.pathX[0]; + var5.field1013 += var5.pathY[0]; + var5.field1021 += var5.pathX[0]; + var5.field1010 += var5.pathY[0]; + var5.pathLength = 1; + } + + var5.field1023 = 0; + } + + if ((var6 & 4) != 0) { + var8 = var0.readUnsignedShortAdd(); + if (var8 == 65535) { + var8 = -1; + } + + var9 = var0.readUnsignedByteAdd(); + WorldMapEvent.performPlayerAnimation(var5, var8, var9); + } + + if ((var6 & 2048) != 0) { + for (var8 = 0; var8 < 3; ++var8) { + var5.actions[var8] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var6 & 32) != 0) { + var5.movingOrientation = var0.readUnsignedShortAddLE(); + if (var5.pathLength == 0) { + var5.orientation = var5.movingOrientation; + var5.method521(); + } + } + + if ((var6 & 8) != 0) { + var8 = var0.readUnsignedShortAddLE(); + PlayerType var25 = (PlayerType)SequenceDefinition.findEnumerated(class183.PlayerType_values(), var0.readUnsignedByte()); + boolean var30 = var0.readUnsignedByteSub() == 1; + var11 = var0.readUnsignedByteNeg(); + var12 = var0.offset; + if (var5.username != null && var5.appearance != null) { + boolean var31 = false; + if (var25.isUser && InvDefinition.friendSystem.isIgnored(var5.username)) { + var31 = true; + } + + if (!var31 && Client.field481 == 0 && !var5.isHidden) { + Players.field1119.offset = 0; + var0.method2638(Players.field1119.array, 0, var11); + Players.field1119.offset = 0; + String var26 = AbstractFont.escapeBrackets(HealthBarUpdate.method523(class172.readString(Players.field1119))); + var5.overheadText = var26.trim(); + var5.field998 = var8 >> 8; + var5.field991 = var8 & 255; + var5.overheadTextCyclesRemaining = 150; + var5.field1026 = null; + var5.isAutoChatting = var30; + var5.showPublicPlayerChat = var5 != TextureProvider.localPlayer && var25.isUser && !Client.field601.isEmpty() && var26.toLowerCase().indexOf(Client.field601) == -1; + if (var25.isPrivileged) { + var15 = var30 ? 91 : 1; + } else { + var15 = var30 ? 90 : 2; + } + + if (var25.modIcon != -1) { + class411.addGameMessage(var15, class436.addImageTag(var25.modIcon) + var5.username.getName(), var26); + } else { + class411.addGameMessage(var15, var5.username.getName(), var26); + } + } + } + + var0.offset = var11 + var12; + } + + if ((var6 & 512) != 0) { + var8 = var0.readUnsignedShortAdd(); + var9 = var8 >> 8; + var10 = var9 >= 13 && var9 <= 20 ? var9 - 12 : 0; + PlayerType var27 = (PlayerType)SequenceDefinition.findEnumerated(class183.PlayerType_values(), var0.readUnsignedByte()); + boolean var32 = var0.readUnsignedByteSub() == 1; + var13 = var0.readUnsignedByte(); + var14 = var0.offset; + if (var5.username != null && var5.appearance != null) { + boolean var33 = false; + if (var27.isUser && InvDefinition.friendSystem.isIgnored(var5.username)) { + var33 = true; + } + + if (!var33 && Client.field481 == 0 && !var5.isHidden) { + Players.field1119.offset = 0; + var0.readBytes(Players.field1119.array, 0, var13); + Players.field1119.offset = 0; + String var16 = AbstractFont.escapeBrackets(HealthBarUpdate.method523(class172.readString(Players.field1119))); + var5.overheadText = var16.trim(); + var5.field998 = var8 >> 8; + var5.field991 = var8 & 255; + var5.overheadTextCyclesRemaining = 150; + byte[] var17 = null; + if (var10 > 0 && var10 <= 8) { + var17 = new byte[var10]; + + for (int var18 = 0; var18 < var10; ++var18) { + var17[var18] = var0.readByteAdd(); + } + } + + byte[] var20 = var17; + int[] var19; + if (var17 != null && var17.length != 0 && var17.length <= 8) { + int[] var21 = new int[var17.length]; + int var22 = 0; + + while (true) { + if (var22 >= var20.length) { + var19 = var21; + break; + } + + if (var20[var22] < 0 || var20[var22] > class553.field4311.length) { + var19 = null; + break; + } + + var21[var22] = class553.field4311[var20[var22]]; + ++var22; + } + } else { + var19 = null; + } + + var5.field1026 = var19; + var5.isAutoChatting = var32; + var5.showPublicPlayerChat = var5 != TextureProvider.localPlayer && var27.isUser && !Client.field601.isEmpty() && var16.toLowerCase().indexOf(Client.field601) == -1; + int var29; + if (var27.isPrivileged) { + var29 = var32 ? 91 : 1; + } else { + var29 = var32 ? 90 : 2; + } + + if (var27.modIcon != -1) { + class411.addGameMessage(var29, class436.addImageTag(var27.modIcon) + var5.username.getName(), var16); + } else { + class411.addGameMessage(var29, var5.username.getName(), var16); + } + } + } + + var0.offset = var13 + var14 + var10; + } + + if ((var6 & 64) != 0) { + var8 = var0.readUnsignedByteNeg(); + byte[] var36 = new byte[var8]; + Buffer var35 = new Buffer(var36); + var0.method2637(var36, 0, var8); + Players.cachedAppearanceBuffer[var4] = var35; + var5.read(var35); + } + + if ((var6 & 8192) != 0) { + var7 = var0.readByte(); + } + + if (var5.hasMovementPending) { + if (var7 == 127) { + var5.resetPath(var5.tileX, var5.tileY); + } else { + MoveSpeed var34; + if (var7 != MoveSpeed.STATIONARY.speed) { + MoveSpeed[] var37 = new MoveSpeed[]{MoveSpeed.CRAWL, MoveSpeed.STATIONARY, MoveSpeed.WALK, MoveSpeed.RUN}; + var34 = (MoveSpeed)SequenceDefinition.findEnumerated(var37, var7); + } else { + var34 = Players.playerMovementSpeeds[var4]; + } + + var5.move(var5.tileX, var5.tileY, var34); + } + } + } + + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); + } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "([BIIIIIIILiv;[Lis;)V" + descriptor = "([BIIIIIIILjt;[Lih;)V" ) - static final void method459(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { + static final void method457(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { Buffer var10 = new Buffer(var0); int var11 = -1; while (true) { - int var12 = var10.method2561(); + int var12 = var10.readIncrSmallSmart(); if (var12 == 0) { return; } @@ -121,35 +425,35 @@ static final void method459(byte[] var0, int var1, int var2, int var3, int var4, int var19 = var18 >> 2; int var20 = var18 & 3; if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { - ObjectComposition var21 = WorldMapElement.getObjectDefinition(var11); - int var24 = var16 & 7; - int var25 = var15 & 7; - int var27 = var21.sizeX; - int var28 = var21.sizeY; - int var29; + ObjectComposition var21 = class91.getObjectDefinition(var11); + int var22 = var2 + class153.method796(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); + int var25 = var16 & 7; + int var26 = var15 & 7; + int var28 = var21.sizeX; + int var29 = var21.sizeY; + int var30; if ((var20 & 1) == 1) { - var29 = var27; - var27 = var28; + var30 = var28; var28 = var29; + var29 = var30; } - int var26 = var7 & 3; - int var23; - if (var26 == 0) { - var23 = var24; - } else if (var26 == 1) { - var23 = var25; - } else if (var26 == 2) { - var23 = 7 - var24 - (var27 - 1); + int var27 = var7 & 3; + int var24; + if (var27 == 0) { + var24 = var26; + } else if (var27 == 1) { + var24 = 7 - var25 - (var28 - 1); + } else if (var27 == 2) { + var24 = 7 - var26 - (var29 - 1); } else { - var23 = 7 - var25 - (var28 - 1); + var24 = var25; } - var29 = var2 + var23; - int var30 = var3 + InterfaceParent.method473(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); - if (var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { + var30 = var24 + var3; + if (var22 > 0 && var30 > 0 && var22 < 103 && var30 < 103) { int var31 = var1; - if ((Tiles_renderFlags[1][var29][var30] & 2) == 2) { + if ((Tiles_renderFlags[1][var22][var30] & 2) == 2) { var31 = var1 - 1; } @@ -158,74 +462,10 @@ static final void method459(byte[] var0, int var1, int var2, int var3, int var4, var32 = var9[var31]; } - class128.addObjects(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); + class314.addObjects(var1, var22, var30, var11, var20 + var7 & 3, var19, var8, var32); } } } } } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(Lmi;III)V", - garbageValue = "2062613871" - ) - public static void method460(Widget var0, int var1, int var2) { - var0.field3101.bodyColors[var1] = var2; - var0.field3101.method1729(); - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "645111513" - ) - static final void method461() { - Renderable.method1290(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - class153.method802(); - UserComparator9.method685(); - NPCComposition.NpcDefinition_cached.clear(); - NPCComposition.NpcDefinition_cachedModels.clear(); - ItemComposition.ItemDefinition_cached.clear(); - ItemComposition.ItemDefinition_cachedModels.clear(); - ItemComposition.ItemDefinition_cachedSprites.clear(); - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - SequenceDefinition.SequenceDefinition_cachedModel.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); - VarbitComposition.VarbitDefinition_cached.clear(); - VarpDefinition.VarpDefinition_cached.clear(); - class47.HitSplatDefinition_cachedSprites.method2483(); - SwapSongTask.HitSplatDefinition_cached.method2483(); - class394.method2053(); - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); - StructComposition.StructDefinition_cached.clear(); - class126.method700(); - WorldMapElement.WorldMapElement_cachedSprites.clear(); - class219.method1150(); - class19.method60(); - Client.Widget_cachedModels.clear(); - Client.Widget_cachedFonts.clear(); - PlayerComposition.PlayerAppearance_cachedModels.clear(); - class261.method1501(); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - Client.archive5.method2184(); - AttackOption.field1096.clearFiles(); - class318.archive7.clearFiles(); - ObjectSound.archive4.clearFiles(); - class28.field81.clearFiles(); - class499.archive9.clearFiles(); - class385.archive6.clearFiles(); - Message.archive11.clearFiles(); - PcmPlayer.archive8.clearFiles(); - class147.field1348.clearFiles(); - class141.archive10.clearFiles(); - class388.field3655.clearFiles(); - GrandExchangeOffer.archive12.clearFiles(); - class343.field3148.clearFiles(); - } } \ No newline at end of file diff --git a/osrs/src/main/java/Timer.java b/osrs/src/main/java/Timer.java index d338ce442..4af350270 100644 --- a/osrs/src/main/java/Timer.java +++ b/osrs/src/main/java/Timer.java @@ -3,202 +3,185 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; - -@ObfuscatedName("py") +@ObfuscatedName("qq") @Implements("Timer") public class Timer { - @ObfuscatedName("au") - long field3755; - @ObfuscatedName("ae") - long field3752; - @ObfuscatedName("ao") - public boolean field3756; - @ObfuscatedName("at") - long field3754; @ObfuscatedName("ac") - long field3751; - @ObfuscatedName("ai") - long field3753; - @ObfuscatedName("az") - int field3750; - @ObfuscatedName("ap") - int field3749; - @ObfuscatedName("aa") - int field3747; - @ObfuscatedName("af") - int field3748; + long field3783; + @ObfuscatedName("al") + long field3785; + @ObfuscatedName("ak") + public boolean field3788; + @ObfuscatedName("ax") + long field3787; + @ObfuscatedName("ao") + long field3786; + @ObfuscatedName("ah") + long field3784; + @ObfuscatedName("ar") + int field3781; + @ObfuscatedName("ab") + int field3779; + @ObfuscatedName("am") + int field3780; + @ObfuscatedName("av") + int field3782; public Timer() { - this.field3755 = -1L; - this.field3752 = -1L; - this.field3756 = false; - this.field3754 = 0L; - this.field3751 = 0L; - this.field3753 = 0L; - this.field3750 = 0; - this.field3749 = 0; - this.field3747 = 0; - this.field3748 = 0; + this.field3783 = -1L; + this.field3785 = -1L; + this.field3788 = false; + this.field3787 = 0L; + this.field3786 = 0L; + this.field3784 = 0L; + this.field3781 = 0; + this.field3779 = 0; + this.field3780 = 0; + this.field3782 = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "8457" + descriptor = "(I)V", + garbageValue = "281982191" ) - public void method2150() { - this.field3755 = GameEngine.clockNow(); + public void method2182() { + this.field3783 = GrandExchangeOfferTotalQuantityComparator.method1971(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1934849344" + descriptor = "(B)V", + garbageValue = "8" ) - public void method2151() { - if (-1L != this.field3755) { - this.field3751 = GameEngine.clockNow() - this.field3755; - this.field3755 = -1L; + public void method2183() { + if (-1L != this.field3783) { + this.field3786 = GrandExchangeOfferTotalQuantityComparator.method1971() - this.field3783; + this.field3783 = -1L; } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-350362388" + descriptor = "(IB)V", + garbageValue = "49" ) - public void method2152(int var1) { - this.field3752 = GameEngine.clockNow(); - this.field3750 = var1; + public void method2184(int var1) { + this.field3785 = GrandExchangeOfferTotalQuantityComparator.method1971(); + this.field3781 = var1; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1654604746" + garbageValue = "-1876587712" ) - public void method2153() { - if (-1L != this.field3752) { - this.field3754 = GameEngine.clockNow() - this.field3752; - this.field3752 = -1L; + public void method2185() { + if (-1L != this.field3785) { + this.field3787 = GrandExchangeOfferTotalQuantityComparator.method1971() - this.field3785; + this.field3785 = -1L; } - ++this.field3747; - this.field3756 = true; + ++this.field3780; + this.field3788 = true; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1332700570" + garbageValue = "-699557437" ) - public void method2154() { - this.field3756 = false; - this.field3749 = 0; + public void method2186() { + this.field3788 = false; + this.field3779 = 0; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1203645178" + garbageValue = "-1309820962" ) - public void method2155() { - this.method2153(); + public void method2187() { + this.method2185(); } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "-1131300040" + descriptor = "(Lul;I)V", + garbageValue = "1951350671" ) @Export("write") public void write(Buffer var1) { - ClientPreferences.method539(var1, this.field3751); - ClientPreferences.method539(var1, this.field3754); - ClientPreferences.method539(var1, this.field3753); - var1.writeShort(this.field3750); - var1.writeShort(this.field3749); - var1.writeShort(this.field3747); - var1.writeShort(this.field3748); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;ZII)V", - garbageValue = "-1307965199" - ) - static void method2157(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (class403.clearLoginScreen) { - if (var3 == 4) { - PcmPlayer.method212(4); - } + long var2 = this.field3786; + var2 /= 10L; + if (var2 < 0L) { + var2 = 0L; + } else if (var2 > 65535L) { + var2 = 65535L; + } - } else { - if (var3 == 0) { - WorldMapAreaData.method1574(var2); - } else { - PcmPlayer.method212(var3); - } + var1.writeShort((int)var2); + long var4 = this.field3787; + var4 /= 10L; + if (var4 < 0L) { + var4 = 0L; + } else if (var4 > 65535L) { + var4 = 65535L; + } - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - Login.leftTitleSprite = WorldMapData_1.method1484(var4); - Bounds.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); - int var5 = Client.worldProperties; - if ((var5 & class510.field4132.rsOrdinal()) != 0) { - SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((var5 & class510.field4131.rsOrdinal()) != 0) { - SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else if ((var5 & class510.field4122.rsOrdinal()) != 0) { - SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "logo_speedrunning", ""); - } else { - SoundSystem.logoSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } + var1.writeShort((int)var4); + long var6 = this.field3784; + var6 /= 10L; + if (var6 < 0L) { + var6 = 0L; + } else if (var6 > 65535L) { + var6 = 65535L; + } - Login.titleboxSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - class219.titlebuttonSprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - Login.field777 = class172.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); - ItemContainer.field853 = class172.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); - class172.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); - Login.runesSprite = class219.method1149(var1, "runes", ""); - class13.title_muteSprite = class219.method1149(var1, "title_mute", ""); - Login.options_buttons_0Sprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - Skills.field3145 = class172.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - UserComparator6.options_buttons_2Sprite = class172.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - VerticalAlignment.field1631 = class172.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - class136.field1295 = Login.options_buttons_0Sprite.subWidth; - User.field3801 = Login.options_buttons_0Sprite.subHeight; - class139.field1323 = new LoginScreenAnimation(Login.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - Login.field768 = new String[8]; - Login.field752 = 0; - } + var1.writeShort((int)var6); + var1.writeShort(this.field3781); + var1.writeShort(this.field3779); + var1.writeShort(this.field3780); + var1.writeShort(this.field3782); + } - class503.field4107 = 0; - class369.otp = ""; - Login.field743 = true; - Login.worldSelectOpen = false; - if (!class449.clientPreferences.getTitleMusicDisabled()) { - ArrayList var6 = new ArrayList(); - var6.add(new MusicSong(class385.archive6, "scape main", "", 255, false)); - class53.method291(var6, 0, 0, 0, 100, false); + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-2042986049" + ) + public static String method2181(CharSequence var0) { + int var1 = var0.length(); + StringBuilder var2 = new StringBuilder(var1); + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { + if (var4 == ' ') { + var2.append('+'); + } else { + byte var5 = Actor.charToByteCp1252(var4); + var2.append('%'); + int var6 = var5 >> 4 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + + var6 = var5 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + } } else { - Script.method445(0, 0); + var2.append(var4); } - - UrlRequester.method652(); - CollisionMap.method1122().method1932(false); - class403.clearLoginScreen = true; - Login.xPadding = (class113.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - class452.loginBoxCenter = Login.loginBoxX + 180; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Bounds.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - SoundSystem.logoSprite.drawAt(Login.xPadding + 382 - SoundSystem.logoSprite.subWidth / 2, 18); } + + return var2.toString(); } } \ No newline at end of file diff --git a/osrs/src/main/java/TriBool.java b/osrs/src/main/java/TriBool.java index d6fe9b27c..9bf51f824 100644 --- a/osrs/src/main/java/TriBool.java +++ b/osrs/src/main/java/TriBool.java @@ -3,27 +3,29 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qp") +@ObfuscatedName("ra") @Implements("TriBool") public class TriBool { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lra;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lra;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lqp;" + descriptor = "Lra;" ) @Export("TriBool_false") public static final TriBool TriBool_false; + @ObfuscatedName("vd") + static int field3849; static { TriBool_unknown = new TriBool(); diff --git a/osrs/src/main/java/UrlRequest.java b/osrs/src/main/java/UrlRequest.java index 6627c7dc6..6ce6412c5 100644 --- a/osrs/src/main/java/UrlRequest.java +++ b/osrs/src/main/java/UrlRequest.java @@ -5,68 +5,507 @@ import java.net.URL; -@ObfuscatedName("et") +@ObfuscatedName("eq") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("ae") - static int field1175; - @ObfuscatedName("ao") - static int field1176; - @ObfuscatedName("ad") - public static short[] field1174; - @ObfuscatedName("au") - final URL field1177; - @ObfuscatedName("at") - volatile int field1179; + @ObfuscatedName("al") + static int field1170; + @ObfuscatedName("ak") + static int field1169; @ObfuscatedName("ac") + final URL field1171; + @ObfuscatedName("ax") + volatile int field1173; + @ObfuscatedName("ao") @Export("response0") volatile byte[] response0; static { - field1175 = -1; - field1176 = -2; + field1170 = -1; + field1169 = -2; } UrlRequest(URL var1) { - this.field1179 = field1175; - this.field1177 = var1; + this.field1173 = field1170; + this.field1171 = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1941771443" + descriptor = "(B)Z", + garbageValue = "53" ) @Export("isDone") public boolean isDone() { - return this.field1179 != field1175; + return this.field1173 != field1170; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-90219734" + garbageValue = "365015590" ) @Export("getResponse") public byte[] getResponse() { return this.response0; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "79865594" + garbageValue = "-570806933" + ) + public String method663() { + return this.field1171.toString(); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1964306071" + ) + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; + } + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(Lnm;III)V", + garbageValue = "-1837392633" + ) + public static void method664(Widget var0, int var1, int var2) { + var0.field3127.bodyColors[var1] = var2; + var0.field3127.method1760(); + } + + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "(ILmo;ZI)V", + garbageValue = "-2002889011" ) - public String method667() { - return this.field1177.toString(); + static void method665(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = class153.getWorldMap().getMapArea(var0); + int var4 = TextureProvider.localPlayer.plane; + int var5 = (TextureProvider.localPlayer.x >> 7) + class20.baseX; + int var6 = (TextureProvider.localPlayer.y >> 7) + class19.baseY; + Coord var7 = new Coord(var4, var5, var6); + class153.getWorldMap().method2438(var3, var7, var1, var2); } - @ObfuscatedName("au") + @ObfuscatedName("kl") @ObfuscatedSignature( - descriptor = "(I)[Lnb;", - garbageValue = "2139207855" + descriptor = "(Llq;I)V", + garbageValue = "-1816644009" ) - public static GameBuild[] method664() { - return new GameBuild[]{GameBuild.LIVE, GameBuild.RC, GameBuild.WIP, GameBuild.BUILDLIVE}; + @Export("processZoneOperation") + static final void processZoneOperation(ZoneOperation var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + if (ZoneOperation.AREA_SOUND == var0) { + var2 = var1.readUnsignedByte(); + var3 = (var2 >> 4 & 7) + Clock.field1484; + var4 = (var2 & 7) + class354.field3144; + var5 = var1.readUnsignedByteSub(); + var6 = var5 >> 2; + var7 = var5 & 3; + var8 = Client.field652[var6]; + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + class19.updatePendingSpawn(class87.Client_plane, var3, var4, var8, -1, var6, var7, 31, 0, -1); + } + + } else { + int var9; + int var10; + int var11; + int var12; + int var13; + Projectile var16; + byte var37; + int var41; + int var42; + if (ZoneOperation.OBJ_ADD == var0) { + var2 = var1.readUnsignedByteAdd() * 4; + var3 = var1.readUnsignedByteAdd(); + byte var38 = var1.readByteAdd(); + var5 = var1.readIntME(); + var37 = var1.readByteNeg(); + var7 = var1.readUnsignedByteNeg(); + var8 = (var7 >> 4 & 7) + Clock.field1484; + var9 = (var7 & 7) + class354.field3144; + var10 = var1.method2629(); + var11 = var1.readUnsignedShort(); + var12 = var1.method2630(); + var13 = var1.readUnsignedByteNeg(); + var41 = var1.readIntME(); + var42 = var1.readUnsignedByteSub() * 4; + var6 = var37 + var8; + var4 = var38 + var9; + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104 && var6 >= 0 && var4 >= 0 && var6 < 104 && var4 < 104 && var11 != 65535) { + var8 = var8 * 128 + 64; + var9 = var9 * 128 + 64; + var6 = var6 * 128 + 64; + var4 = var4 * 128 + 64; + var16 = new Projectile(var11, class87.Client_plane, var8, var9, class115.getTileHeight(var8, var9, class87.Client_plane) - var42, var5 + Client.cycle, var41 + Client.cycle, var3, var13, var12, var10, var2); + var16.setDestination(var6, var4, class115.getTileHeight(var6, var4, class87.Client_plane) - var2, var5 + Client.cycle); + Client.projectiles.addFirst(var16); + } + + } else if (ZoneOperation.field2619 == var0) { + var2 = var1.readUnsignedShortAddLE(); + var3 = var1.readUnsignedByteSub(); + var4 = (var3 >> 4 & 7) + Clock.field1484; + var5 = (var3 & 7) + class354.field3144; + var6 = var1.readUnsignedIntLE(); + var7 = var1.readUnsignedIntIME(); + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + NodeDeque var44 = Client.groundItems[class87.Client_plane][var4][var5]; + if (var44 != null) { + for (TileItem var32 = (TileItem)var44.last(); var32 != null; var32 = (TileItem)var44.previous()) { + if ((var2 & 32767) == var32.id && var7 == var32.quantity) { + var32.quantity = var6; + break; + } + } + + class30.updateItemPile(var4, var5); + } + } + + } else { + byte var14; + if (ZoneOperation.MAPPROJ_ANIM == var0) { + var2 = var1.readUnsignedByte() * 4; + var3 = var1.readIntME(); + var4 = var1.method2629(); + var5 = var1.readUnsignedByte() * 4; + var6 = var1.readUnsignedShortAddLE(); + var7 = var1.method2629(); + var8 = var1.readIntME(); + var9 = var1.readUnsignedShortAdd(); + var10 = var1.readUnsignedByteSub(); + var11 = (var10 >> 4 & 7) + Clock.field1484; + var12 = (var10 & 7) + class354.field3144; + byte var40 = var1.readByteAdd(); + var14 = var1.readByte(); + var42 = var1.readUnsignedByteSub(); + var13 = var40 + var11; + var41 = var14 + var12; + if (var11 >= 0 && var12 >= 0 && var11 < 104 && var12 < 104 && var13 >= 0 && var41 >= 0 && var13 < 104 && var41 < 104 && var8 != 65535) { + var11 = var11 * 128 + 64; + var12 = var12 * 128 + 64; + var13 = var13 * 128 + 64; + var41 = var41 * 128 + 64; + var16 = new Projectile(var8, class87.Client_plane, var11, var12, class115.getTileHeight(var11, var12, class87.Client_plane) - var5, var6 + Client.cycle, var3 + Client.cycle, var42, var9, var4, var7, var2); + var16.setDestination(var13, var41, class115.getTileHeight(var13, var41, class87.Client_plane) - var2, var6 + Client.cycle); + Client.projectiles.addFirst(var16); + } + + } else if (ZoneOperation.OBJ_COUNT == var0) { + var2 = var1.readUnsignedByteNeg(); + var3 = var1.readIntME(); + var4 = var1.readUnsignedByteSub(); + var5 = (var4 >> 4 & 7) + Clock.field1484; + var6 = (var4 & 7) + class354.field3144; + var7 = var1.readUnsignedByte() * 4; + var8 = var1.readIntME(); + var9 = var1.method2583(); + var10 = var1.readUnsignedByteNeg() * 4; + var11 = var1.readUnsignedShortAdd(); + byte var39 = var1.readByte(); + var13 = var1.readUnsignedByteNeg(); + var14 = var1.readByteSub(); + var12 = var39 + var5; + var41 = var14 + var6; + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104 && var12 >= 0 && var41 >= 0 && var12 < 104 && var41 < 104 && var3 != 65535) { + var5 = var5 * 128 + 64; + var6 = var6 * 128 + 64; + var12 = var12 * 128 + 64; + var41 = var41 * 128 + 64; + Projectile var33 = new Projectile(var3, class87.Client_plane, var5, var6, class115.getTileHeight(var5, var6, class87.Client_plane) - var7, var11 + Client.cycle, var8 + Client.cycle, var2, var13, var9, var10); + var33.setDestination(var12, var41, class115.getTileHeight(var12, var41, class87.Client_plane) - var10, var11 + Client.cycle); + Client.projectiles.addFirst(var33); + } + + } else if (ZoneOperation.LOC_ANIM == var0) { + var2 = var1.readUnsignedShortAddLE(); + var3 = var1.readUnsignedByteSub(); + var4 = (var3 >> 4 & 7) + Clock.field1484; + var5 = (var3 & 7) + class354.field3144; + var6 = var1.readUnsignedByteAdd(); + var7 = var6 >> 2; + var8 = var6 & 3; + var9 = Client.field652[var7]; + if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) { + if (var9 == 0) { + BoundaryObject var34 = class10.scene.method1299(class87.Client_plane, var4, var5); + if (var34 != null) { + var11 = SecureRandomFuture.Entity_unpackID(var34.tag); + if (var7 == 2) { + var34.renderable1 = new DynamicObject(var11, 2, var8 + 4, class87.Client_plane, var4, var5, var2, false, var34.renderable1); + var34.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, class87.Client_plane, var4, var5, var2, false, var34.renderable2); + } else { + var34.renderable1 = new DynamicObject(var11, var7, var8, class87.Client_plane, var4, var5, var2, false, var34.renderable1); + } + + return; + } + } + + if (var9 == 1) { + WallDecoration var45 = class10.scene.method1300(class87.Client_plane, var4, var5); + if (var45 != null) { + var11 = SecureRandomFuture.Entity_unpackID(var45.tag); + if (var7 != 4 && var7 != 5) { + if (var7 == 6) { + var45.renderable1 = new DynamicObject(var11, 4, var8 + 4, class87.Client_plane, var4, var5, var2, false, var45.renderable1); + } else if (var7 == 7) { + var45.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class87.Client_plane, var4, var5, var2, false, var45.renderable1); + } else if (var7 == 8) { + var45.renderable1 = new DynamicObject(var11, 4, var8 + 4, class87.Client_plane, var4, var5, var2, false, var45.renderable1); + var45.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class87.Client_plane, var4, var5, var2, false, var45.renderable2); + } + } else { + var45.renderable1 = new DynamicObject(var11, 4, var8, class87.Client_plane, var4, var5, var2, false, var45.renderable1); + } + + return; + } + } + + if (var9 == 2) { + GameObject var46 = class10.scene.getGameObject(class87.Client_plane, var4, var5); + if (var7 == 11) { + var7 = 10; + } + + if (var46 != null) { + var46.renderable = new DynamicObject(SecureRandomFuture.Entity_unpackID(var46.tag), var7, var8, class87.Client_plane, var4, var5, var2, false, var46.renderable); + return; + } + } + + if (var9 == 3) { + FloorDecoration var47 = class10.scene.getFloorDecoration(class87.Client_plane, var4, var5); + if (var47 != null) { + var47.renderable = new DynamicObject(SecureRandomFuture.Entity_unpackID(var47.tag), 22, var8, class87.Client_plane, var4, var5, var2, false, var47.renderable); + return; + } + } + + class266.method1431(class87.Client_plane, var4, var5, var9, var2); + } + + } else { + if (ZoneOperation.LOC_ADD_CHANGE == var0) { + var2 = var1.readUnsignedByteAdd(); + var3 = var1.readIntME(); + var4 = var1.readUnsignedByteSub(); + var5 = var4 >> 4 & 15; + var6 = var4 & 7; + var7 = var1.readUnsignedByteAdd(); + var8 = (var7 >> 4 & 7) + Clock.field1484; + var9 = (var7 & 7) + class354.field3144; + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { + var10 = var5 + 1; + if (TextureProvider.localPlayer.pathX[0] >= var8 - var10 && TextureProvider.localPlayer.pathX[0] <= var10 + var8 && TextureProvider.localPlayer.pathY[0] >= var9 - var10 && TextureProvider.localPlayer.pathY[0] <= var10 + var9 && class91.clientPreferences.getAreaSoundEffectsVolume() != 0 && var6 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var3; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var5 + (var9 << 8) + (var8 << 16); + ++Client.soundEffectCount; + } + } + } + + if (ZoneOperation.PREFETCH_GAMEOBJECTS == var0) { + var2 = var1.readUnsignedShortAddLE(); + var3 = var1.readUnsignedByte(); + var4 = (var3 >> 4 & 7) + Clock.field1484; + var5 = (var3 & 7) + class354.field3144; + var37 = var1.readByteSub(); + var7 = var1.readIntME(); + var8 = var1.readUnsignedShort(); + var9 = var1.readUnsignedShortAdd(); + var10 = var1.readUnsignedByteNeg(); + var11 = var10 >> 2; + var12 = var10 & 3; + var13 = Client.field652[var11]; + var14 = var1.readByteNeg(); + byte var15 = var1.readByteSub(); + byte var35 = var1.readByteAdd(); + Player var17; + if (var7 == Client.localPlayerIndex) { + var17 = TextureProvider.localPlayer; + } else { + var17 = Client.players[var7]; + } + + if (var17 != null) { + ObjectComposition var18 = class91.getObjectDefinition(var8); + int var19; + int var20; + if (var12 != 1 && var12 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; + } else { + var19 = var18.sizeY; + var20 = var18.sizeX; + } + + int var21 = var4 + (var19 >> 1); + int var22 = var4 + (var19 + 1 >> 1); + int var23 = var5 + (var20 >> 1); + int var24 = var5 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[class87.Client_plane]; + int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2; + int var27 = (var4 << 7) + (var19 << 6); + int var28 = (var5 << 7) + (var20 << 6); + Model var29 = var18.getModel(var11, var12, var25, var27, var26, var28); + if (var29 != null) { + class19.updatePendingSpawn(class87.Client_plane, var4, var5, var13, -1, 0, 0, 31, var2 + 1, var9 + 1); + var17.animationCycleStart = var2 + Client.cycle; + var17.animationCycleEnd = var9 + Client.cycle; + var17.attachedModel = var29; + var17.field900 = var19 * 64 + var4 * 128; + var17.field916 = var20 * 64 + var5 * 128; + var17.baseTileHeight = var26; + byte var30; + if (var35 > var37) { + var30 = var35; + var35 = var37; + var37 = var30; + } + + if (var14 > var15) { + var30 = var14; + var14 = var15; + var15 = var30; + } + + var17.minX = var35 + var4; + var17.maxX = var37 + var4; + var17.minY = var14 + var5; + var17.maxY = var15 + var5; + } + } + } + + TileItem var31; + if (ZoneOperation.field2624 == var0) { + var2 = var1.readUnsignedByteAdd(); + var3 = var1.readUnsignedIntME(); + var4 = var1.readUnsignedByteAdd(); + var5 = (var4 >> 4 & 7) + Clock.field1484; + var6 = (var4 & 7) + class354.field3144; + var1.readUnsignedByteAdd(); + var1.readUnsignedShortAddLE(); + var1.readUnsignedByteSub(); + var7 = var1.readUnsignedShort(); + var1.readUnsignedShort(); + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var31 = new TileItem(); + var31.id = var7; + var31.quantity = var3; + var31.method611(var2); + if (Client.groundItems[class87.Client_plane][var5][var6] == null) { + Client.groundItems[class87.Client_plane][var5][var6] = new NodeDeque(); + } + + Client.groundItems[class87.Client_plane][var5][var6].addFirst(var31); + class30.updateItemPile(var5, var6); + } + + } else { + NodeDeque var36; + if (ZoneOperation.OBJ_DEL == var0) { + var2 = var1.readUnsignedByteAdd(); + var3 = (var2 >> 4 & 7) + Clock.field1484; + var4 = (var2 & 7) + class354.field3144; + var5 = var1.readUnsignedShort(); + var6 = var1.readUnsignedByteSub(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + var36 = Client.groundItems[class87.Client_plane][var3][var4]; + if (var36 != null) { + for (var31 = (TileItem)var36.last(); var31 != null; var31 = (TileItem)var36.previous()) { + if ((var5 & 32767) == var31.id) { + var31.method611(var6); + break; + } + } + } + } + + } else if (ZoneOperation.LOC_DEL != var0) { + if (ZoneOperation.field2617 == var0) { + var2 = var1.readUnsignedShort(); + var3 = var1.readUnsignedShort(); + var4 = var1.readUnsignedByte(); + var5 = (var4 >> 4 & 7) + Clock.field1484; + var6 = (var4 & 7) + class354.field3144; + var7 = var1.readUnsignedByteNeg(); + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var5 = var5 * 128 + 64; + var6 = var6 * 128 + 64; + GraphicsObject var43 = new GraphicsObject(var3, class87.Client_plane, var5, var6, class115.getTileHeight(var5, var6, class87.Client_plane) - var7, var2, Client.cycle); + Client.graphicsObjects.addFirst(var43); + } + + } else if (ZoneOperation.field2623 == var0) { + var2 = var1.readUnsignedByte(); + var3 = var1.readUnsignedByteAdd(); + var4 = var3 >> 2; + var5 = var3 & 3; + var6 = Client.field652[var4]; + var7 = var1.readUnsignedByteAdd(); + var8 = (var7 >> 4 & 7) + Clock.field1484; + var9 = (var7 & 7) + class354.field3144; + var10 = var1.readUnsignedShortAdd(); + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { + class19.updatePendingSpawn(class87.Client_plane, var8, var9, var6, var10, var4, var5, var2, 0, -1); + } + + } + } else { + var2 = var1.readUnsignedIntLE(); + var3 = var1.readUnsignedByteAdd(); + var4 = (var3 >> 4 & 7) + Clock.field1484; + var5 = (var3 & 7) + class354.field3144; + var6 = var1.readUnsignedShortAddLE(); + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + var36 = Client.groundItems[class87.Client_plane][var4][var5]; + if (var36 != null) { + for (var31 = (TileItem)var36.last(); var31 != null; var31 = (TileItem)var36.previous()) { + if ((var6 & 32767) == var31.id && var2 == var31.quantity) { + var31.remove(); + break; + } + } + + if (var36.last() == null) { + Client.groundItems[class87.Client_plane][var4][var5] = null; + } + + class30.updateItemPile(var4, var5); + } + } + + } + } + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/UrlRequester.java b/osrs/src/main/java/UrlRequester.java index fccb81eaf..bd048e092 100644 --- a/osrs/src/main/java/UrlRequester.java +++ b/osrs/src/main/java/UrlRequester.java @@ -11,46 +11,50 @@ import java.util.LinkedList; import java.util.Queue; -@ObfuscatedName("ev") +@ObfuscatedName("en") @Implements("UrlRequester") public abstract class UrlRequester implements Runnable { - @ObfuscatedName("je") - @Export("baseX") - static int baseX; - @ObfuscatedName("au") - final Thread field1169; - @ObfuscatedName("ae") + @ObfuscatedName("ah") + static int field1162; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lnp;" + ) + static StudioGame field1163; + @ObfuscatedName("ac") + final Thread field1166; + @ObfuscatedName("al") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("requests") Queue requests; - @ObfuscatedName("at") - int field1167; + @ObfuscatedName("ax") + int field1164; UrlRequester(int var1) { this.requests = new LinkedList(); - this.field1169 = new Thread(this); - this.field1169.setPriority(1); - this.field1169.start(); - this.field1167 = var1; + this.field1166 = new Thread(this); + this.field1166.setPriority(1); + this.field1166.start(); + this.field1164 = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Let;B)V", - garbageValue = "-114" + descriptor = "(Leq;I)V", + garbageValue = "1796222901" ) @Export("vmethod2700") abstract void vmethod2700(UrlRequest var1) throws IOException; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(Ljava/net/URLConnection;B)I", - garbageValue = "20" + garbageValue = "127" ) - int method647(URLConnection var1) { - int var2 = UrlRequest.field1176; + int method648(URLConnection var1) { + int var2 = UrlRequest.field1169; if (var1 != null) { try { if (var1 instanceof HttpURLConnection) { @@ -63,25 +67,25 @@ int method647(URLConnection var1) { return var2; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ljava/net/URLConnection;B)V", - garbageValue = "61" + descriptor = "(Ljava/net/URLConnection;I)V", + garbageValue = "204362010" ) - void method648(URLConnection var1) { + void method649(URLConnection var1) { var1.setConnectTimeout(5000); var1.setReadTimeout(5000); var1.setUseCaches(false); var1.setRequestProperty("Connection", "close"); - var1.setRequestProperty("User-Agent", "OldSchoolRuneScape/" + this.field1167); + var1.setRequestProperty("User-Agent", "OldSchoolRuneScape/" + this.field1164); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/net/URLConnection;Let;I)V", - garbageValue = "-703916602" + descriptor = "(Ljava/net/URLConnection;Leq;S)V", + garbageValue = "32767" ) - void method649(URLConnection var1, UrlRequest var2) { + void method650(URLConnection var1, UrlRequest var2) { DataInputStream var3 = null; try { @@ -93,23 +97,23 @@ void method649(URLConnection var1, UrlRequest var2) { var3.readFully(var4); } else { var4 = new byte[0]; - byte[] var6 = class125.ByteArrayPool_getArray(5000); + byte[] var6 = class148.ByteArrayPool_getArray(5000); - byte[] var8; - for (int var7 = var3.read(var6, 0, var6.length); var7 > -1; var4 = var8) { - var8 = new byte[var4.length + var7]; + for (int var7 = var3.read(var6); var7 > -1; var7 = var3.read(var6)) { + byte[] var8 = new byte[var4.length + var7]; System.arraycopy(var4, 0, var8, 0, var4.length); System.arraycopy(var6, 0, var8, var4.length, var7); + var4 = var8; } - PlayerType.ByteArrayPool_release(var6); + MenuAction.ByteArrayPool_release(var6); } var2.response0 = var4; } catch (IOException var14) { var2.response0 = null; } finally { - var2.field1179 = this.method647(var1); + var2.field1173 = this.method648(var1); } if (var3 != null) { @@ -121,10 +125,10 @@ void method649(URLConnection var1, UrlRequest var2) { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;B)Let;", - garbageValue = "95" + descriptor = "(Ljava/net/URL;I)Leq;", + garbageValue = "511979680" ) @Export("request") public UrlRequest request(URL var1) { @@ -136,10 +140,10 @@ public UrlRequest request(URL var1) { } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-710296298" + garbageValue = "-1319494381" ) @Export("close") public void close() { @@ -150,7 +154,7 @@ public void close() { this.notify(); } - this.field1169.join(); + this.field1166.join(); } catch (InterruptedException var4) { } @@ -175,60 +179,53 @@ public void run() { this.vmethod2700(var1); } catch (Exception var7) { - Messages.RunException_sendStackTrace((String)null, var7); + class190.RunException_sendStackTrace((String)null, var7); } } } - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2153026" - ) - public static void method652() { - class305.field2773.clear(); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-85" - ) - public static void method653() { - ItemComposition.ItemDefinition_cachedSprites.clear(); - } - - @ObfuscatedName("hb") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "286684178" - ) - static long method654() { - return Client.playerUUID; - } - - @ObfuscatedName("jb") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1352739934" + descriptor = "(Lnm;III)V", + garbageValue = "1281314063" ) - static boolean method655() { - return (Client.drawPlayerNames & 2) != 0; - } + public static void method653(Widget var0, int var1, int var2) { + PlayerComposition var3 = var0.field3127; + boolean var4 = var2 != var3.field2950; + var3.field2950 = var2; + if (var4) { + int var5; + int var6; + if (var3.field2950 == var1) { + for (var5 = 0; var5 < PlayerComposition.equipmentIndices.length; ++var5) { + var6 = PlayerComposition.equipmentIndices[var5]; + if (var3.equipment[var6] > 0 && var3.equipment[var6] < 512) { + var3.equipment[var6] = var3.field2944[var6]; + } + } + } else { + if (var3.equipment[0] < 512 || class286.method1574(var3)) { + var3.equipment[class223.field1865.field1879] = 1; + } - @ObfuscatedName("nj") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1224778546" - ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLAN_JOINCHAT_LEAVECHAT, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + for (var5 = 0; var5 < 7; ++var5) { + var6 = PlayerComposition.equipmentIndices[var5]; + if (var3.equipment[var6] > 0 && var3.equipment[var6] < 512) { + int[] var7 = var3.equipment; + + for (int var8 = 0; var8 < class403.KitDefinition_fileCount; ++var8) { + KitDefinition var9 = class73.KitDefinition_get(var8); + if (var9 != null && !var9.nonSelectable && var9.bodypartID == (var2 == 1 ? 7 : 0) + var5) { + var7[PlayerComposition.equipmentIndices[var5]] = var8 + 256; + break; + } + } + } + } + } } + + var3.method1760(); } } \ No newline at end of file diff --git a/osrs/src/main/java/User.java b/osrs/src/main/java/User.java index a6614c8ea..02173aa8e 100644 --- a/osrs/src/main/java/User.java +++ b/osrs/src/main/java/User.java @@ -3,20 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qs") +@ObfuscatedName("rp") @Implements("User") public class User implements Comparable { - @ObfuscatedName("cj") - static int field3801; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Luc;" + descriptor = "Lvf;" ) @Export("username") Username username; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Luc;" + descriptor = "Lvf;" ) @Export("previousUsername") Username previousUsername; @@ -24,50 +22,50 @@ public class User implements Comparable { User() { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lqs;I)I", - garbageValue = "1756748027" + descriptor = "(Lrp;I)I", + garbageValue = "762888653" ) @Export("compareTo_user") public int compareTo_user(User var1) { return this.username.compareToTyped(var1.username); } - @ObfuscatedName("as") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)Luc;", - garbageValue = "807179111" + descriptor = "(B)Lvf;", + garbageValue = "-16" ) @Export("getUsername") public Username getUsername() { return this.username; } - @ObfuscatedName("ay") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-346787089" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "-1070" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("aj") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1703373764" + garbageValue = "725290011" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("av") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Luc;Luc;I)V", - garbageValue = "-733820505" + descriptor = "(Lvf;Lvf;I)V", + garbageValue = "-184606185" ) @Export("set") void set(Username var1, Username var2) { @@ -84,4 +82,13 @@ void set(Username var1, Username var2) { public int compareTo(Object var1) { return this.compareTo_user((User)var1); } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "([BI)Lkc;", + garbageValue = "-1515763175" + ) + static WorldMapSprite method2251(byte[] var0) { + return var0 == null ? new WorldMapSprite() : new WorldMapSprite(Frames.method1335(var0).pixels); + } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator1.java b/osrs/src/main/java/UserComparator1.java index b1bbae3e3..f3a92f0be 100644 --- a/osrs/src/main/java/UserComparator1.java +++ b/osrs/src/main/java/UserComparator1.java @@ -5,10 +5,10 @@ import java.util.Comparator; -@ObfuscatedName("ua") +@ObfuscatedName("uw") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("reversed") final boolean reversed; @@ -16,10 +16,10 @@ public UserComparator1(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqs;Lqs;B)I", - garbageValue = "2" + descriptor = "(Lrp;Lrp;I)I", + garbageValue = "1358473518" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/osrs/src/main/java/UserComparator10.java b/osrs/src/main/java/UserComparator10.java index 0fb1352ce..3e692c747 100644 --- a/osrs/src/main/java/UserComparator10.java +++ b/osrs/src/main/java/UserComparator10.java @@ -3,13 +3,15 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ef") +@ObfuscatedName("ea") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("kh") - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("au") + @ObfuscatedName("wm") + @ObfuscatedSignature( + descriptor = "Lrw;" + ) + static ArchiveDisk field1188; + @ObfuscatedName("ac") @Export("reversed") final boolean reversed; @@ -17,10 +19,10 @@ public UserComparator10(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;I)I", - garbageValue = "-1110862870" + descriptor = "(Lri;Lri;B)I", + garbageValue = "0" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -37,63 +39,31 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "74" + descriptor = "(I)V", + garbageValue = "1153152060" ) - public static String method687(CharSequence var0) { - int var1 = var0.length(); - StringBuilder var2 = new StringBuilder(var1); - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { - if (var4 == ' ') { - var2.append('+'); - } else { - byte var5 = class348.charToByteCp1252(var4); - var2.append('%'); - int var6 = var5 >> 4 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - - var6 = var5 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); - } - } + public static void method682() { + class199.field1565.clear(); + } - return var2.toString(); + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-61" + ) + public static void method684() { + VarpDefinition.VarpDefinition_cached.clear(); } - @ObfuscatedName("nf") + @ObfuscatedName("nw") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1771624140" + descriptor = "(I)V", + garbageValue = "-205905443" ) - static final void method689(int var0, int var1) { - ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : VerticalAlignment.guestClanChannel; - if (var2 != null && var1 >= 0 && var1 < var2.method859()) { - ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); - if (var3.rank == -1) { - String var4 = var3.username.getName(); - PacketBufferNode var5 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLANCHANNEL_KICKUSER, Client.packetWriter.isaacCipher); - var5.packetBuffer.writeByte(3 + AbstractSocket.stringCp1252NullTerminatedByteSize(var4)); - var5.packetBuffer.writeByte(var0); - var5.packetBuffer.writeShort(var1); - var5.packetBuffer.writeStringCp1252NullTerminated(var4); - Client.packetWriter.addNode(var5); - } - } + static final void method685() { + Client.field530 = Client.cycleCntr; + class183.ClanChat_inClanChat = true; } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator2.java b/osrs/src/main/java/UserComparator2.java index 8211cc0e2..74529c4dc 100644 --- a/osrs/src/main/java/UserComparator2.java +++ b/osrs/src/main/java/UserComparator2.java @@ -5,16 +5,10 @@ import java.util.Comparator; -@ObfuscatedName("uj") +@ObfuscatedName("ux") @Implements("UserComparator2") public class UserComparator2 implements Comparator { @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - @Export("SequenceDefinition_archive") - static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("au") @Export("reversed") final boolean reversed; @@ -22,10 +16,10 @@ public UserComparator2(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqs;Lqs;I)I", - garbageValue = "-732761109" + descriptor = "(Lrp;Lrp;B)I", + garbageValue = "-19" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/osrs/src/main/java/UserComparator3.java b/osrs/src/main/java/UserComparator3.java index b81c02c79..587a7f915 100644 --- a/osrs/src/main/java/UserComparator3.java +++ b/osrs/src/main/java/UserComparator3.java @@ -3,10 +3,21 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("ev") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("au") + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "[Lcv;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("ah") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("hz") + static String field1184; + @ObfuscatedName("ac") @Export("reversed") final boolean reversed; @@ -14,10 +25,10 @@ public UserComparator3(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;I)I", - garbageValue = "1524706236" + descriptor = "(Lri;Lri;B)I", + garbageValue = "85" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -34,12 +45,12 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("au") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1521964885" + descriptor = "(I)V", + garbageValue = "1193478763" ) - public static int method682(int var0) { - return var0 >>> 12; + public static void method676() { + VarbitComposition.VarbitDefinition_cached.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator4.java b/osrs/src/main/java/UserComparator4.java index 7ac51bff7..a245e76b4 100644 --- a/osrs/src/main/java/UserComparator4.java +++ b/osrs/src/main/java/UserComparator4.java @@ -5,12 +5,22 @@ import java.util.Comparator; -@ObfuscatedName("en") +@ObfuscatedName("ej") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("vv") - static int field1180; - @ObfuscatedName("au") + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lbh;" + ) + @Export("soundSystem") + public static SoundSystem soundSystem; + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "[Lud;" + ) + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("ac") @Export("reversed") final boolean reversed; @@ -18,10 +28,10 @@ public UserComparator4(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;I)I", - garbageValue = "-1072568679" + descriptor = "(Lri;Lri;B)I", + garbageValue = "2" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { @@ -39,95 +49,4 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Lfh;FZI)F", - garbageValue = "-229947551" - ) - static float method669(class130 var0, float var1, boolean var2) { - float var3 = 0.0F; - if (var0 != null && var0.method726() != 0) { - float var4 = (float)var0.field1244[0].field1202; - float var5 = (float)var0.field1244[var0.method726() - 1].field1202; - float var6 = var5 - var4; - if ((double)var6 == 0.0D) { - return var0.field1244[0].field1198; - } else { - float var7 = 0.0F; - if (var1 > var5) { - var7 = (var1 - var5) / var6; - } else { - var7 = (var1 - var4) / var6; - } - - double var8 = (double)((int)var7); - float var10 = Math.abs((float)((double)var7 - var8)); - float var11 = var10 * var6; - var8 = Math.abs(1.0D + var8); - double var12 = var8 / 2.0D; - double var14 = (double)((int)var12); - var10 = (float)(var12 - var14); - float var16; - float var17; - if (var2) { - if (var0.field1245 == class128.field1225) { - if ((double)var10 != 0.0D) { - var11 += var4; - } else { - var11 = var5 - var11; - } - } else if (var0.field1245 != class128.field1227 && var0.field1245 != class128.field1228) { - if (var0.field1245 == class128.field1226) { - var11 = var4 - var1; - var16 = var0.field1244[0].field1200; - var17 = var0.field1244[0].field1201; - var3 = var0.field1244[0].field1198; - if (0.0D != (double)var16) { - var3 -= var11 * var17 / var16; - } - - return var3; - } - } else { - var11 = var5 - var11; - } - } else if (var0.field1246 == class128.field1225) { - if ((double)var10 != 0.0D) { - var11 = var5 - var11; - } else { - var11 += var4; - } - } else if (var0.field1246 != class128.field1227 && var0.field1246 != class128.field1228) { - if (var0.field1246 == class128.field1226) { - var11 = var1 - var5; - var16 = var0.field1244[var0.method726() - 1].field1197; - var17 = var0.field1244[var0.method726() - 1].field1199; - var3 = var0.field1244[var0.method726() - 1].field1198; - if (0.0D != (double)var16) { - var3 += var17 * var11 / var16; - } - - return var3; - } - } else { - var11 += var4; - } - - var3 = Skeleton.method1229(var0, var11); - float var18; - if (var2 && var0.field1245 == class128.field1228) { - var18 = var0.field1244[var0.method726() - 1].field1198 - var0.field1244[0].field1198; - var3 = (float)((double)var3 - (double)var18 * var8); - } else if (!var2 && var0.field1246 == class128.field1228) { - var18 = var0.field1244[var0.method726() - 1].field1198 - var0.field1244[0].field1198; - var3 = (float)((double)var3 + (double)var18 * var8); - } - - return var3; - } - } else { - return var3; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator5.java b/osrs/src/main/java/UserComparator5.java index 75b19d675..2041be1a7 100644 --- a/osrs/src/main/java/UserComparator5.java +++ b/osrs/src/main/java/UserComparator5.java @@ -2,17 +2,15 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -@ObfuscatedName("es") +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; + +@ObfuscatedName("eb") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("jx") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("reversed") final boolean reversed; @@ -20,10 +18,10 @@ public UserComparator5(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;B)I", - garbageValue = "-73" + descriptor = "(Lri;Lri;B)I", + garbageValue = "29" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -44,200 +42,128 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ah") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;S)[F", - garbageValue = "21147" + descriptor = "(B)V", + garbageValue = "-128" ) - static float[] method679(JSONObject var0, String var1) throws JSONException { - float[] var2 = new float[4]; - + static void method674() { try { - JSONArray var3 = var0.getJSONArray(var1); - var2[0] = (float)var3.optDouble(0, 0.0D); - var2[1] = (float)var3.optDouble(1, 0.0D); - var2[2] = (float)var3.optDouble(2, 1.0D); - var2[3] = (float)var3.optDouble(3, 1.0D); - } catch (JSONException var4) { - var2[0] = 0.0F; - var2[1] = 0.0F; - var2[2] = 1.0F; - var2[3] = 1.0F; + File var0 = new File(DevicePcmPlayerProvider.userHomeDirectory, "random.dat"); + int var2; + if (var0.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + } else { + label34: + for (int var1 = 0; var1 < class27.field74.length; ++var1) { + for (var2 = 0; var2 < FriendsList.field3812.length; ++var2) { + File var3 = new File(FriendsList.field3812[var2] + class27.field74[var1] + File.separatorChar + "random.dat"); + if (var3.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); + break label34; + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); + var2 = var4.read(); + var4.seek(0L); + var4.write(var2); + var4.seek(0L); + var4.close(); + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + } + } catch (IOException var5) { } - return var2; } - @ObfuscatedName("iv") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ldr;I)V", - garbageValue = "-316834748" + descriptor = "([BIIIIIIIII[Lih;B)V", + garbageValue = "-89" ) - static final void method680(Actor var0) { - var0.isWalking = false; - if (var0.movementSequence != -1) { - SequenceDefinition var1 = EnumComposition.SequenceDefinition_get(var0.movementSequence); - if (var1 != null) { - if (!var1.isCachedModelIdSet() && var1.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - FileSystem.method914(var1, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var1.frameIds.length) { - if (var1.frameCount > 0) { - var0.movementFrame -= var1.frameCount; - if (var1.field1843) { - ++var0.field999; - } - - if (var0.movementFrame < 0 || var0.movementFrame >= var1.frameIds.length || var1.field1843 && var0.field999 >= var1.iterations) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - var0.field999 = 0; - } - } else { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - } - - FileSystem.method914(var1, var0.movementFrame, var0.x, var0.y); - } - } else if (var1.isCachedModelIdSet()) { - ++var0.movementFrame; - int var2 = var1.method1085(); - if (var0.movementFrame < var2) { - class169.method880(var1, var0.movementFrame, var0.x, var0.y); - } else { - if (var1.frameCount > 0) { - var0.movementFrame -= var1.frameCount; - if (var1.field1843) { - ++var0.field999; - } - - if (var0.movementFrame < 0 || var0.movementFrame >= var2 || var1.field1843 && var0.field999 >= var1.iterations) { - var0.movementFrame = 0; - var0.movementFrameCycle = 0; - var0.field999 = 0; - } - } else { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - } - - class169.method880(var1, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; + static final void method672(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, CollisionMap[] var10) { + int var12; + for (int var11 = 0; var11 < 8; ++var11) { + for (var12 = 0; var12 < 8; ++var12) { + if (var11 + var2 > 0 && var11 + var2 < 103 && var3 + var12 > 0 && var3 + var12 < 103) { + int[] var10000 = var10[var1].flags[var11 + var2]; + var10000[var3 + var12] &= -16777217; } - } else { - var0.movementSequence = -1; } } - IterableNodeHashTableIterator var7 = new IterableNodeHashTableIterator(var0.method518()); - - int var3; - for (SpotAnimation var6 = (SpotAnimation)var7.method2449(); var6 != null; var6 = (SpotAnimation)var7.next()) { - if (var6.field4281 != -1 && Client.cycle >= var6.field4280) { - var3 = StructComposition.SpotAnimationDefinition_get(var6.field4281).sequence; - if (var3 == -1) { - var6.remove(); - --var0.field1011; - } else { - var6.field4278 = Math.max(var6.field4278, 0); - SequenceDefinition var4 = EnumComposition.SequenceDefinition_get(var3); - if (var4.frameIds != null && !var4.isCachedModelIdSet()) { - ++var6.field4279; - if (var6.field4278 < var4.frameIds.length && var6.field4279 > var4.frameLengths[var6.field4278]) { - var6.field4279 = 1; - ++var6.field4278; - FileSystem.method914(var4, var6.field4278, var0.x, var0.y); - } - - if (var6.field4278 >= var4.frameIds.length) { - var6.remove(); - --var0.field1011; - } - } else if (var4.isCachedModelIdSet()) { - ++var6.field4278; - int var5 = var4.method1085(); - if (var6.field4278 < var5) { - class169.method880(var4, var6.field4278, var0.x, var0.y); + Buffer var24 = new Buffer(var0); + + for (var12 = 0; var12 < 4; ++var12) { + for (int var13 = 0; var13 < 64; ++var13) { + for (int var14 = 0; var14 < 64; ++var14) { + if (var12 == var4 && var13 >= var5 && var13 < var5 + 8 && var14 >= var6 && var14 < var6 + 8) { + int var17 = var13 & 7; + int var18 = var14 & 7; + int var19 = var7 & 3; + int var16; + if (var19 == 0) { + var16 = var17; + } else if (var19 == 1) { + var16 = var18; + } else if (var19 == 2) { + var16 = 7 - var17; } else { - var6.remove(); - --var0.field1011; + var16 = 7 - var18; } + + int var20 = var16 + var2; + int var21 = var3 + ClanChannelMember.method771(var13 & 7, var14 & 7, var7); + int var22 = (var13 & 7) + var8 + var2; + int var23 = var3 + (var14 & 7) + var9; + class104.loadTerrain(var24, var1, var20, var21, var22, var23, var7); } else { - var6.remove(); - --var0.field1011; + class104.loadTerrain(var24, 0, -1, -1, 0, 0, 0); } } } } - SequenceDefinition var8; - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var8 = EnumComposition.SequenceDefinition_get(var0.sequence); - if (var8.precedenceAnimating == 1 && var0.field1022 > 0 && var0.spotAnimation <= Client.cycle && var0.exactMoveArrive1Cycle < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } + } - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var8 = EnumComposition.SequenceDefinition_get(var0.sequence); - if (var8 != null) { - if (!var8.isCachedModelIdSet() && var8.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var8.frameIds.length && var0.sequenceFrameCycle > var8.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - FileSystem.method914(var8, var0.sequenceFrame, var0.x, var0.y); - } + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIZI)Ljava/lang/String;", + garbageValue = "-18328048" + ) + static String method673(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + if (var2 && var0 >= 0) { + int var3 = 2; - if (var0.sequenceFrame >= var8.frameIds.length) { - var0.sequenceFrame -= var8.frameCount; - ++var0.currentSequenceFrameIndex; - if (var0.currentSequenceFrameIndex >= var8.iterations) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var8.frameIds.length) { - FileSystem.method914(var8, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } + for (int var4 = var0 / var1; var4 != 0; ++var3) { + var4 /= var1; + } - var0.isWalking = var8.stretches; - } else if (var8.isCachedModelIdSet()) { - ++var0.sequenceFrame; - var3 = var8.method1085(); - if (var0.sequenceFrame < var3) { - class169.method880(var8, var0.sequenceFrame, var0.x, var0.y); + char[] var5 = new char[var3]; + var5[0] = '+'; + + for (int var6 = var3 - 1; var6 > 0; --var6) { + int var7 = var0; + var0 /= var1; + int var8 = var7 - var0 * var1; + if (var8 >= 10) { + var5[var6] = (char)(var8 + 87); } else { - var0.sequenceFrame -= var8.frameCount; - ++var0.currentSequenceFrameIndex; - if (var0.currentSequenceFrameIndex >= var8.iterations) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var3) { - class169.method880(var8, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } + var5[var6] = (char)(var8 + 48); } - } else { - var0.sequence = -1; } + + return new String(var5); } else { - var0.sequence = -1; + return Integer.toString(var0, var1); } + } else { + throw new IllegalArgumentException("" + var1); } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator6.java b/osrs/src/main/java/UserComparator6.java index 4cf224be5..e1b93e700 100644 --- a/osrs/src/main/java/UserComparator6.java +++ b/osrs/src/main/java/UserComparator6.java @@ -3,19 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.text.ParseException; -import java.util.Date; - -@ObfuscatedName("ec") +@ObfuscatedName("ey") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("ar") + @ObfuscatedName("as") + static int[][][] field1191; + @ObfuscatedName("jd") @ObfuscatedSignature( - descriptor = "Luk;" + descriptor = "Lpu;" ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("au") + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("ac") @Export("reversed") final boolean reversed; @@ -23,10 +22,10 @@ public UserComparator6(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;I)I", - garbageValue = "-110280632" + descriptor = "(Lri;Lri;B)I", + garbageValue = "1" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -43,78 +42,17 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ac") + @ObfuscatedName("he") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1944121723" + descriptor = "(ZB)V", + garbageValue = "97" ) - static boolean method694() { - Date var0; - try { - var0 = SpotAnimationDefinition.method1003(); - } catch (ParseException var6) { - WorldMapScaleHandler.method1587("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); - return false; - } - - if (var0 == null) { - return false; + static final void method690(boolean var0) { + if (var0) { + Client.field419 = Login.field741 ? class141.field1313 : class141.field1315; } else { - boolean var4 = ModelData0.method1383(var0); - Date var3 = class312.method1686(); - boolean var2 = var0.after(var3); - if (!var2) { - PcmPlayer.method212(7); - class318.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); - return false; - } else { - if (!var4) { - class72.field730 = 8388607; - } else { - class72.field730 = (int)(var0.getTime() / 86400000L - 11745L); - } - - return true; - } + Client.field419 = class91.clientPreferences.method564(Login.Login_username) ? class141.field1311 : class141.field1312; } - } - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(B)Lui;", - garbageValue = "111" - ) - static SpritePixels method693() { - SpritePixels var0 = new SpritePixels(); - var0.width = class529.SpriteBuffer_spriteWidth; - var0.height = class420.SpriteBuffer_spriteHeight; - var0.xOffset = class529.SpriteBuffer_xOffsets[0]; - var0.yOffset = class152.SpriteBuffer_yOffsets[0]; - var0.subWidth = HealthBarUpdate.SpriteBuffer_spriteWidths[0]; - var0.subHeight = SpriteMask.SpriteBuffer_spriteHeights[0]; - int var1 = var0.subHeight * var0.subWidth; - byte[] var2 = Coord.SpriteBuffer_pixels[0]; - var0.pixels = new int[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var0.pixels[var3] = DbTableType.SpriteBuffer_spritePalette[var2[var3] & 255]; - } - - class529.SpriteBuffer_xOffsets = null; - class152.SpriteBuffer_yOffsets = null; - HealthBarUpdate.SpriteBuffer_spriteWidths = null; - SpriteMask.SpriteBuffer_spriteHeights = null; - DbTableType.SpriteBuffer_spritePalette = null; - Coord.SpriteBuffer_pixels = null; - return var0; - } - - @ObfuscatedName("ju") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-11" - ) - static boolean method695() { - return (Client.drawPlayerNames & 4) != 0; } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator7.java b/osrs/src/main/java/UserComparator7.java index 08b9c390f..7971f6302 100644 --- a/osrs/src/main/java/UserComparator7.java +++ b/osrs/src/main/java/UserComparator7.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +@ObfuscatedName("eh") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public UserComparator7(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;I)I", - garbageValue = "-2147158295" + descriptor = "(Lri;Lri;I)I", + garbageValue = "-577121058" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -33,24 +33,4 @@ int compareBuddy(Buddy var1, Buddy var2) { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1608362555" - ) - static final int method677(int var0, int var1) { - if (var0 == -1) { - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator8.java b/osrs/src/main/java/UserComparator8.java index 8aebdeb29..e6b2ae460 100644 --- a/osrs/src/main/java/UserComparator8.java +++ b/osrs/src/main/java/UserComparator8.java @@ -3,10 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("et") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("au") + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "[Ltl;" + ) + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("ev") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("kn") + @ObfuscatedSignature( + descriptor = "[Lud;" + ) + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + @ObfuscatedName("ac") @Export("reversed") final boolean reversed; @@ -14,10 +29,10 @@ public UserComparator8(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;I)I", - garbageValue = "-1255726150" + descriptor = "(Lri;Lri;B)I", + garbageValue = "0" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,207 +53,76 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ae") + @ObfuscatedName("kn") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-334645983" + descriptor = "(B)V", + garbageValue = "0" ) - static void method671() { - synchronized(ArchiveDiskActionHandler.field3513) { - if (ArchiveDiskActionHandler.field3512 == 0) { - class167.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - class167.ArchiveDiskActionHandler_thread.setDaemon(true); - class167.ArchiveDiskActionHandler_thread.start(); - class167.ArchiveDiskActionHandler_thread.setPriority(5); + static final void method669() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.endCycle > 0) { + --var0.endCycle; } - ArchiveDiskActionHandler.field3512 = 600; - ArchiveDiskActionHandler.field3511 = false; - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lto;II)V", - garbageValue = "-32046829" - ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - int var3 = 0; - var0.importIndex(); - - byte[] var10000; - int var4; - int var5; - int var6; - for (var4 = 0; var4 < Players.Players_count; ++var4) { - var5 = Players.Players_indices[var4]; - if ((Players.activityFlags[var5] & 1) == 0) { - if (var3 > 0) { - --var3; - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class20.method68(var0); - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - AbstractArchive.readPlayerUpdate(var0, var5); + boolean var1; + int var2; + int var3; + ObjectComposition var4; + if (var0.endCycle == 0) { + if (var0.objectId >= 0) { + var2 = var0.objectId; + var3 = var0.field953; + var4 = class91.getObjectDefinition(var2); + if (var3 == 11) { + var3 = 10; } - } - } - } - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); + if (var3 >= 5 && var3 <= 8) { + var3 = 4; + } - for (var4 = 0; var4 < Players.Players_count; ++var4) { - var5 = Players.Players_indices[var4]; - if ((Players.activityFlags[var5] & 1) != 0) { - if (var3 > 0) { - --var3; - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class20.method68(var0); - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - AbstractArchive.readPlayerUpdate(var0, var5); - } + var1 = var4.method1078(var3); + if (!var1) { + continue; } } - } - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); + class115.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field947, var0.field953, var0.field946); + var0.remove(); } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { - var5 = Players.Players_emptyIndices[var4]; - if ((Players.activityFlags[var5] & 1) != 0) { - if (var3 > 0) { - --var3; - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class20.method68(var0); - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (KitDefinition.updateExternalPlayer(var0, var5)) { - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } + if (var0.startCycle > 0) { + --var0.startCycle; } - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { - var5 = Players.Players_emptyIndices[var4]; - if ((Players.activityFlags[var5] & 1) == 0) { - if (var3 > 0) { - --var3; - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class20.method68(var0); - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (KitDefinition.updateExternalPlayer(var0, var5)) { - var10000 = Players.activityFlags; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } + if (var0.startCycle == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { + if (var0.id >= 0) { + var2 = var0.id; + var3 = var0.objectType; + var4 = class91.getObjectDefinition(var2); + if (var3 == 11) { + var3 = 10; } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - for (var4 = 1; var4 < 2048; ++var4) { - var10000 = Players.activityFlags; - var10000[var4] = (byte)(var10000[var4] >> 1); - Player var7 = Client.players[var4]; - if (var7 != null) { - Players.Players_indices[++Players.Players_count - 1] = var4; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; - } + if (var3 >= 5 && var3 <= 8) { + var3 = 4; } - class85.method471(var0); - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); + var1 = var4.method1078(var3); + if (!var1) { + continue; } } + + class115.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.rotation, var0.objectType, var0.field946); + var0.startCycle = -1; + if (var0.objectId == var0.id && var0.objectId == -1) { + var0.remove(); + } else if (var0.objectId == var0.id && var0.rotation == var0.field947 && var0.objectType == var0.field953) { + var0.remove(); + } } } } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "1" - ) - static final void method673(String var0) { - MouseHandler.addGameMessage(30, "", var0); - } - @ObfuscatedName("ic") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-33" - ) - static final int method674(int var0) { - return Math.min(Math.max(var0, 128), 383); - } - - @ObfuscatedName("lk") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIIZI)V", - garbageValue = "-1798702842" - ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { - if (!Client.isMenuOpen) { - if (Client.menuOptionsCount < 500) { - Client.menuActions[Client.menuOptionsCount] = var0; - Client.menuTargets[Client.menuOptionsCount] = var1; - Client.menuOpcodes[Client.menuOptionsCount] = var2; - Client.menuIdentifiers[Client.menuOptionsCount] = var3; - Client.menuArguments1[Client.menuOptionsCount] = var4; - Client.menuArguments2[Client.menuOptionsCount] = var5; - Client.menuItemIds[Client.menuOptionsCount] = var6; - Client.menuShiftClick[Client.menuOptionsCount] = var7; - ++Client.menuOptionsCount; - } - - } } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator9.java b/osrs/src/main/java/UserComparator9.java index 2ead907af..f16a67dca 100644 --- a/osrs/src/main/java/UserComparator9.java +++ b/osrs/src/main/java/UserComparator9.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") +@ObfuscatedName("ee") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public UserComparator9(boolean var1) { this.reversed = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;I)I", - garbageValue = "-38492655" + descriptor = "(Lri;Lri;I)I", + garbageValue = "1813564346" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -34,187 +34,76 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lmx;I)V", - garbageValue = "2064536991" + descriptor = "(Lom;Lom;Lom;I)V", + garbageValue = "-1363426561" ) - public static void method683(Huffman var0) { - class334.huffman = var0; + public static void method680(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + HitSplatDefinition.HitSplatDefinition_archive = var0; + HitSplatDefinition.field1701 = var1; + class135.HitSplatDefinition_fontsArchive = var2; } - @ObfuscatedName("an") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-273787824" + descriptor = "(II)Lva;", + garbageValue = "1793860244" ) - public static void method685() { - ObjectComposition.ObjectDefinition_cached.clear(); - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - ObjectComposition.ObjectDefinition_cachedEntities.clear(); - ObjectComposition.ObjectDefinition_cachedModels.clear(); + public static PrivateChatMode method679(int var0) { + PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4299, PrivateChatMode.field4300, PrivateChatMode.field4298}; + PrivateChatMode[] var2 = var1; + + for (int var3 = 0; var3 < var2.length; ++var3) { + PrivateChatMode var4 = var2[var3]; + if (var0 == var4.id) { + return var4; + } + } + + return null; } - @ObfuscatedName("mr") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lmi;IB)I", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "1897883590" ) - static final int method686(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { - try { - int[] var2 = var0.cs1Instructions[var1]; - int var3 = 0; - int var4 = 0; - byte var5 = 0; - - while (true) { - int var6 = var2[var4++]; - int var7 = 0; - byte var8 = 0; - if (var6 == 0) { - return var3; - } - - if (var6 == 1) { - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = class92.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!InvDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 += var10.field3054[var12]; - } - } - } - } - - if (var6 == 5) { - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { - var7 = VarbitComposition.localPlayer.combatLevel; - } - - if (var6 == 9) { - for (var9 = 0; var9 < 25; ++var9) { - if (Skills.Skills_enabled[var9]) { - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = class92.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!InvDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 = 999999999; - break; - } - } - } - } - - if (var6 == 11) { - var7 = Client.runEnergy; - } - - if (var6 == 12) { - var7 = Client.weight; - } - - if (var6 == 13) { - var9 = Varps.Varps_main[var2[var4++]]; - int var13 = var2[var4++]; - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; - } - - if (var6 == 14) { - var9 = var2[var4++]; - var7 = ClientPreferences.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX; - } - - if (var6 == 19) { - var7 = (VarbitComposition.localPlayer.y >> 7) + class47.baseY; - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 == 0) { - if (var5 == 0) { - var3 += var7; - } - - if (var5 == 1) { - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { - var3 /= var7; - } - - if (var5 == 3) { - var3 *= var7; - } + public static void method678() { + class212.field1679.clear(); + } - var5 = 0; - } else { - var5 = var8; - } + @ObfuscatedName("mc") + @ObfuscatedSignature( + descriptor = "(Lnm;I)Z", + garbageValue = "1578685634" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { + int var2 = VarcInt.method977(var0, var1); + int var3 = var0.cs1ComparisonValues[var1]; + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { + if (var2 == var3) { + return false; + } + } else if (var3 != var2) { + return false; } - } catch (Exception var14) { - return -1; } - } else { - return -2; + + return true; } } } \ No newline at end of file diff --git a/osrs/src/main/java/UserList.java b/osrs/src/main/java/UserList.java index bfbc2921c..a5a4d635b 100644 --- a/osrs/src/main/java/UserList.java +++ b/osrs/src/main/java/UserList.java @@ -7,28 +7,28 @@ import java.util.Comparator; import java.util.HashMap; -@ObfuscatedName("qt") +@ObfuscatedName("rn") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("capacity") final int capacity; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("size") int size; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "[Lqs;" + descriptor = "[Lrp;" ) @Export("array") User[] array; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("comparator") Comparator comparator; @@ -41,26 +41,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Lqs;", - garbageValue = "-1997275235" + descriptor = "(I)Lrp;", + garbageValue = "1002915738" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)[Lqs;", - garbageValue = "99" + descriptor = "(II)[Lrp;", + garbageValue = "-1086220070" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("bk") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "501302871" + descriptor = "(B)V", + garbageValue = "-43" ) @Export("clear") public void clear() { @@ -70,30 +70,30 @@ public void clear() { this.previousUsernamesMap.clear(); } - @ObfuscatedName("bv") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "899062224" + garbageValue = "-246674667" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("bt") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "31" + descriptor = "(I)Z", + garbageValue = "-1551209369" ) @Export("isFull") public boolean isFull() { return this.capacity == this.size; } - @ObfuscatedName("bd") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Luc;I)Z", - garbageValue = "-2059645334" + descriptor = "(Lvf;I)Z", + garbageValue = "630041153" ) @Export("contains") public boolean contains(Username var1) { @@ -104,10 +104,10 @@ public boolean contains(Username var1) { } } - @ObfuscatedName("by") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(Luc;I)Lqs;", - garbageValue = "1337477510" + descriptor = "(Lvf;I)Lrp;", + garbageValue = "1492153372" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -115,30 +115,30 @@ public User getByUsername(Username var1) { return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("bs") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(Luc;I)Lqs;", - garbageValue = "1463265876" + descriptor = "(Lvf;I)Lrp;", + garbageValue = "-1842958661" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } - @ObfuscatedName("bm") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(Luc;S)Lqs;", - garbageValue = "24556" + descriptor = "(Lvf;B)Lrp;", + garbageValue = "2" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } - @ObfuscatedName("bf") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(Luc;I)Z", - garbageValue = "-810573248" + descriptor = "(Lvf;I)Z", + garbageValue = "-1004850002" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -151,10 +151,10 @@ public final boolean removeByUsername(Username var1) { } } - @ObfuscatedName("bq") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(Lqs;I)V", - garbageValue = "1938550187" + descriptor = "(Lrp;B)V", + garbageValue = "-65" ) @Export("remove") final void remove(User var1) { @@ -165,20 +165,20 @@ final void remove(User var1) { } } - @ObfuscatedName("ba") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(Luc;B)Lqs;", - garbageValue = "118" + descriptor = "(Lvf;B)Lrp;", + garbageValue = "-54" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); } - @ObfuscatedName("bl") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(Luc;Luc;B)Lqs;", - garbageValue = "0" + descriptor = "(Lvf;Lvf;I)Lrp;", + garbageValue = "-274589503" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -193,10 +193,10 @@ User addLast(Username var1, Username var2) { } } - @ObfuscatedName("bp") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(IB)Lqs;", - garbageValue = "20" + descriptor = "(IB)Lrp;", + garbageValue = "-47" ) @Export("get") public final User get(int var1) { @@ -207,10 +207,10 @@ public final User get(int var1) { } } - @ObfuscatedName("bu") + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1136384662" + garbageValue = "1844239177" ) @Export("sort") public final void sort() { @@ -222,10 +222,10 @@ public final void sort() { } - @ObfuscatedName("bo") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(Lqs;Luc;Luc;I)V", - garbageValue = "1687018867" + descriptor = "(Lrp;Lvf;Lvf;B)V", + garbageValue = "0" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -234,10 +234,10 @@ final void changeName(User var1, Username var2, Username var3) { this.mapPut(var1); } - @ObfuscatedName("bb") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(Lqs;B)I", - garbageValue = "2" + descriptor = "(Lrp;I)I", + garbageValue = "2089243961" ) @Export("indexOf") final int indexOf(User var1) { @@ -250,37 +250,33 @@ final int indexOf(User var1) { return -1; } - @ObfuscatedName("br") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(Lqs;I)V", - garbageValue = "-1136381607" + descriptor = "(Lrp;B)V", + garbageValue = "53" ) @Export("mapRemove") final void mapRemove(User var1) { - if (this.usernamesMap.remove(var1.username) == null) { - throw new IllegalStateException(); - } else { - if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); - } - + if (var1.previousUsername != null) { + this.previousUsernamesMap.remove(var1.previousUsername); } + } - @ObfuscatedName("be") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(Lqs;I)V", - garbageValue = "-633410463" + descriptor = "(Lrp;I)V", + garbageValue = "-1328367592" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; } - @ObfuscatedName("bi") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(Lqs;B)V", - garbageValue = "-26" + descriptor = "(Lrp;S)V", + garbageValue = "4323" ) @Export("mapPut") final void mapPut(User var1) { @@ -294,10 +290,10 @@ final void mapPut(User var1) { } - @ObfuscatedName("bz") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-87" + descriptor = "(II)V", + garbageValue = "-818952963" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -308,20 +304,20 @@ final void arrayRemove(int var1) { } - @ObfuscatedName("bx") + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "85" + descriptor = "(I)V", + garbageValue = "-456856178" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; } - @ObfuscatedName("bn") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;B)V", - garbageValue = "68" + descriptor = "(Ljava/util/Comparator;I)V", + garbageValue = "764754614" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -332,94 +328,4 @@ public final void addComparator(Comparator var1) { } } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "1913527870" - ) - static int method2243(int var0, Script var1, boolean var2) { - int var3; - int var4; - int var6; - if (var0 == 3400) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - EnumComposition var5 = class271.getEnum(var3); - if (var5.outputType != 's') { - } - - for (var6 = 0; var6 < var5.outputCount; ++var6) { - if (var4 == var5.keys[var6]) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var5.strVals[var6]; - var5 = null; - break; - } - } - - if (var5 != null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var5.defaultStr; - } - - return 1; - } else if (var0 != 3408) { - if (var0 == 3411) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - EnumComposition var10 = class271.getEnum(var3); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var10.size(); - return 1; - } else { - return 2; - } - } else { - SoundCache.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - EnumComposition var7 = class271.getEnum(var9); - if (var3 == var7.inputType && var4 == var7.outputType) { - for (int var8 = 0; var8 < var7.outputCount; ++var8) { - if (var6 == var7.keys[var8]) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7.intVals[var8]; - } - - var7 = null; - break; - } - } - - if (var7 != null) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7.defaultInt; - } - } - - return 1; - } else { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } - } - - @ObfuscatedName("kh") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-587387192" - ) - static final boolean method2244() { - return Client.isMenuOpen; - } } \ No newline at end of file diff --git a/osrs/src/main/java/Username.java b/osrs/src/main/java/Username.java index 27ae8c40b..cbd4cb53e 100644 --- a/osrs/src/main/java/Username.java +++ b/osrs/src/main/java/Username.java @@ -3,175 +3,62 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uc") +@ObfuscatedName("vf") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("name") String name; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lsl;)V" + descriptor = "(Ljava/lang/String;Lte;)V" ) public Username(String var1, LoginType var2) { this.name = var1; - String var4; - if (var1 == null) { - var4 = null; - } else { - label67: { - int var5 = 0; - - int var6; - for (var6 = var1.length(); var5 < var6 && ArchiveDiskActionHandler.method1885(var1.charAt(var5)); ++var5) { - } - - while (var6 > var5 && ArchiveDiskActionHandler.method1885(var1.charAt(var6 - 1))) { - --var6; - } - - int var7 = var6 - var5; - if (var7 >= 1) { - byte var9; - if (var2 == null) { - var9 = 12; - } else { - switch(var2.field4076) { - case 0: - var9 = 20; - break; - default: - var9 = 12; - } - } - - if (var7 <= var9) { - StringBuilder var12 = new StringBuilder(var7); - - for (int var13 = var5; var13 < var6; ++var13) { - char var10 = var1.charAt(var13); - if (ClientPreferences.method537(var10)) { - char var11 = KeyHandler.method91(var10); - if (var11 != 0) { - var12.append(var11); - } - } - } - - if (var12.length() == 0) { - var4 = null; - } else { - var4 = var12.toString(); - } - break label67; - } - } - - var4 = null; - } - } - - this.cleanName = var4; + this.cleanName = class432.method2192(var1, var2); } public Username(String var1) { this.name = var1; - LoginType var4 = LoginType.oldscape; - String var3; - if (var1 == null) { - var3 = null; - } else { - label67: { - int var5 = 0; - - int var6; - for (var6 = var1.length(); var5 < var6 && ArchiveDiskActionHandler.method1885(var1.charAt(var5)); ++var5) { - } - - while (var6 > var5 && ArchiveDiskActionHandler.method1885(var1.charAt(var6 - 1))) { - --var6; - } - - int var7 = var6 - var5; - if (var7 >= 1) { - byte var9; - if (var4 == null) { - var9 = 12; - } else { - switch(var4.field4076) { - case 0: - var9 = 20; - break; - default: - var9 = 12; - } - } - - if (var7 <= var9) { - StringBuilder var12 = new StringBuilder(var7); - - for (int var13 = var5; var13 < var6; ++var13) { - char var10 = var1.charAt(var13); - if (ClientPreferences.method537(var10)) { - char var11 = KeyHandler.method91(var10); - if (var11 != 0) { - var12.append(var11); - } - } - } - - if (var12.length() == 0) { - var3 = null; - } else { - var3 = var12.toString(); - } - break label67; - } - } - - var3 = null; - } - } - - this.cleanName = var3; + this.cleanName = class432.method2192(var1, LoginType.oldscape); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1021488493" + garbageValue = "-1870950849" ) @Export("getName") public String getName() { return this.name; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "28" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "641761865" ) - public String method2700() { + public String method2740() { return this.cleanName; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-911492900" + descriptor = "(B)Z", + garbageValue = "-46" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; } - @ObfuscatedName("at") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Luc;I)I", - garbageValue = "-2077400310" + descriptor = "(Lvf;I)I", + garbageValue = "585813874" ) @Export("compareToTyped") public int compareToTyped(Username var1) { @@ -216,4 +103,41 @@ public String toString() { public int compareTo(Object var1) { return this.compareToTyped((Username)var1); } + + @ObfuscatedName("mi") + @ObfuscatedSignature( + descriptor = "(Lnm;III)V", + garbageValue = "-2147237579" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { + var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + } + + if (var0.yAlignment == 0) { + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; + } else if (var0.yAlignment == 4) { + var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/Usernamed.java b/osrs/src/main/java/Usernamed.java index b3b7c9b17..17b0a567b 100644 --- a/osrs/src/main/java/Usernamed.java +++ b/osrs/src/main/java/Usernamed.java @@ -3,13 +3,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ql") +@ObfuscatedName("qc") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("ok") + @ObfuscatedName("ou") @ObfuscatedSignature( - descriptor = "(S)Luc;", - garbageValue = "-775" + descriptor = "(I)Lvf;", + garbageValue = "-1440888763" ) @Export("username") Username username(); diff --git a/osrs/src/main/java/VarbitComposition.java b/osrs/src/main/java/VarbitComposition.java index b4b4fe12a..d311366cf 100644 --- a/osrs/src/main/java/VarbitComposition.java +++ b/osrs/src/main/java/VarbitComposition.java @@ -3,49 +3,40 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("is") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("VarbitDefinition_archive") - static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("ae") + public static AbstractArchive VarbitDefinition_archive; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("VarbitDefinition_cached") - public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("ai") - static final int[] field1674; - @ObfuscatedName("mo") - @ObfuscatedSignature( - descriptor = "Ldf;" - ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("us") - @Export("cameraLookAtY") - static int cameraLookAtY; - @ObfuscatedName("ao") + static EvictingDualNodeHashTable VarbitDefinition_cached; + @ObfuscatedName("ah") + static final int[] field1682; + @ObfuscatedName("ak") @Export("baseVar") public int baseVar; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("startBit") public int startBit; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); - field1674 = new int[32]; + field1682 = new int[32]; int var0 = 2; for (int var1 = 0; var1 < 32; ++var1) { - field1674[var1] = var0 - 1; + field1682[var1] = var0 - 1; var0 += var0; } @@ -54,10 +45,10 @@ public class VarbitComposition extends DualNode { VarbitComposition() { } - @ObfuscatedName("ao") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "1889164320" + descriptor = "(Lul;I)V", + garbageValue = "-1759643857" ) @Export("decode") void decode(Buffer var1) { @@ -71,10 +62,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1344279898" + descriptor = "(Lul;II)V", + garbageValue = "649154016" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -86,19 +77,22 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("aa") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "14" + descriptor = "(II)I", + garbageValue = "-1812761064" ) - public static int method1012(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + var0.charAt(var3); - } + public static int method1046(int var0) { + return var0 >>> 4 & class523.field4149; + } - return var2; + @ObfuscatedName("mk") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1743166576" + ) + static void method1049(int var0, int var1) { + class12.method41(class133.tempMenuAction, var0, var1); + class133.tempMenuAction = null; } } \ No newline at end of file diff --git a/osrs/src/main/java/VarcInt.java b/osrs/src/main/java/VarcInt.java index a63292aa1..cd8a6b20b 100644 --- a/osrs/src/main/java/VarcInt.java +++ b/osrs/src/main/java/VarcInt.java @@ -3,37 +3,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.List; +import java.util.ArrayList; +import java.util.Iterator; -@ObfuscatedName("hk") +@ObfuscatedName("hg") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("wz") - static List field1532; - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("VarcInt_archive") - public static AbstractArchive VarcInt_archive; - @ObfuscatedName("ae") + static AbstractArchive VarcInt_archive; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("VarcInt_cached") static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("dy") - @ObfuscatedSignature( - descriptor = "Luk;" - ) - static IndexedSprite field1534; - @ObfuscatedName("if") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lun;" ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("ao") + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("au") + static int field1529; + @ObfuscatedName("ak") @Export("persist") public boolean persist; @@ -45,41 +41,239 @@ public class VarcInt extends DualNode { this.persist = false; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "-2131192855" + descriptor = "(Lul;I)V", + garbageValue = "-1749757315" ) - void method954(Buffer var1) { + void method972(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method955(var1, var2); + this.method973(var1, var2); } } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;IB)V", - garbageValue = "-12" + descriptor = "(Lul;IB)V", + garbageValue = "7" ) - void method955(Buffer var1, int var2) { + void method973(Buffer var1, int var2) { if (var2 == 2) { this.persist = true; } } - @ObfuscatedName("aa") + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1764742883" + ) + public static int method974(int var0, int var1) { + int var2 = var0 >>> 31; + return (var0 + var2) / var1 - var2; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lom;II)V", + garbageValue = "-1876796577" + ) + public static void method975(AbstractArchive var0, int var1) { + if (!class319.field2789.isEmpty()) { + ArrayList var2 = new ArrayList(); + Iterator var3 = class319.field2789.iterator(); + + while (var3.hasNext()) { + MusicSong var4 = (MusicSong)var3.next(); + var4.field2884 = false; + var4.field2887 = false; + var4.field2886 = false; + var4.field2882 = false; + var4.musicTrackArchive = var0; + var4.musicTrackVolume = var1; + var4.field2888 = 0.0F; + var2.add(var4); + } + + class148.method776(var2, class319.musicPlayerStatus, class319.field2794, class319.field2793, class319.field2795, false); + } + } + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1597661026" + ) + static final boolean method976() { + return Client.isMenuOpen; + } + + @ObfuscatedName("mw") @ObfuscatedSignature( - descriptor = "(I)Lch;", - garbageValue = "-580226644" + descriptor = "(Lnm;II)I", + garbageValue = "-599828632" ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? class176.World_worlds[++World.World_listCount - 1] : null; + static final int method977(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { + try { + int[] var2 = var0.cs1Instructions[var1]; + int var3 = 0; + int var4 = 0; + byte var5 = 0; + + while (true) { + int var6 = var2[var4++]; + int var7 = 0; + byte var8 = 0; + if (var6 == 0) { + return var3; + } + + if (var6 == 1) { + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = class33.field89.method1740(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!class214.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.field3082.length; ++var12) { + if (var11 + 1 == var10.field3082[var12]) { + var7 += var10.field3079[var12]; + } + } + } + } + + if (var6 == 5) { + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { + var7 = TextureProvider.localPlayer.combatLevel; + } + + if (var6 == 9) { + for (var9 = 0; var9 < 25; ++var9) { + if (Skills.Skills_enabled[var9]) { + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = class33.field89.method1740(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!class214.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.field3082.length; ++var12) { + if (var11 + 1 == var10.field3082[var12]) { + var7 = 999999999; + break; + } + } + } + } + + if (var6 == 11) { + var7 = Client.runEnergy; + } + + if (var6 == 12) { + var7 = Client.weight; + } + + if (var6 == 13) { + var9 = Varps.Varps_main[var2[var4++]]; + int var13 = var2[var4++]; + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; + } + + if (var6 == 14) { + var9 = var2[var4++]; + var7 = class36.getVarbit(var9); + } + + if (var6 == 15) { + var8 = 1; + } + + if (var6 == 16) { + var8 = 2; + } + + if (var6 == 17) { + var8 = 3; + } + + if (var6 == 18) { + var7 = (TextureProvider.localPlayer.x >> 7) + class20.baseX; + } + + if (var6 == 19) { + var7 = (TextureProvider.localPlayer.y >> 7) + class19.baseY; + } + + if (var6 == 20) { + var7 = var2[var4++]; + } + + if (var8 == 0) { + if (var5 == 0) { + var3 += var7; + } + + if (var5 == 1) { + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { + var3 /= var7; + } + + if (var5 == 3) { + var3 *= var7; + } + + var5 = 0; + } else { + var5 = var8; + } + } + } catch (Exception var14) { + return -1; + } + } else { + return -2; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/Varcs.java b/osrs/src/main/java/Varcs.java index 44e590e05..78b88ec55 100644 --- a/osrs/src/main/java/Varcs.java +++ b/osrs/src/main/java/Varcs.java @@ -9,53 +9,56 @@ import java.util.Map; import java.util.Map.Entry; -@ObfuscatedName("ej") +@ObfuscatedName("ek") @Implements("Varcs") public class Varcs { - @ObfuscatedName("gr") - static String field1140; - @ObfuscatedName("ao") + @ObfuscatedName("df") + @ObfuscatedSignature( + descriptor = "Lun;" + ) + static IndexedSprite field1138; + @ObfuscatedName("ak") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("map") Map map; /** @deprecated */ @Deprecated - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("strings") String[] strings; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("az") - long field1145; + @ObfuscatedName("ar") + long field1143; Varcs() { this.unwrittenChanges = false; - int var1 = class1.archive2.getGroupFileCount(19); + int var1 = SoundSystem.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; int var2; for (var2 = 0; var2 < var1; ++var2) { - VarcInt var3 = class227.method1210(var2); + VarcInt var3 = Client.method353(var2); this.intsPersistence[var2] = var3.persist; } var2 = 0; - if (class1.archive2.method1898(15)) { - var2 = class1.archive2.getGroupFileCount(15); + if (SoundSystem.archive2.method1927(15)) { + var2 = SoundSystem.archive2.getGroupFileCount(15); } this.strings = new String[var2]; this.read(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1506039349" + garbageValue = "122334652" ) @Export("setInt") void setInt(int var1, int var2) { @@ -66,10 +69,10 @@ void setInt(int var1, int var2) { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "2" + garbageValue = "-72" ) @Export("getInt") int getInt(int var1) { @@ -77,20 +80,20 @@ int getInt(int var1) { return var2 instanceof Integer ? (Integer)var2 : -1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-1902210814" + garbageValue = "-1655952111" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "2" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1561446610" ) @Export("getString") String getString(int var1) { @@ -100,10 +103,10 @@ String getString(int var1) { /** @deprecated */ @Deprecated - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "544618073" + garbageValue = "1584969503" ) @Export("setStringOld") void setStringOld(int var1, String var2) { @@ -112,20 +115,20 @@ void setStringOld(int var1, String var2) { /** @deprecated */ @Deprecated - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(IB)Ljava/lang/String;", - garbageValue = "-128" + garbageValue = "12" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-54" + garbageValue = "-109" ) @Export("clearTransient") void clearTransient() { @@ -142,20 +145,20 @@ void clearTransient() { } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(ZI)Ltu;", - garbageValue = "-924681157" + descriptor = "(ZI)Lto;", + garbageValue = "-1600709615" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return Decimator.getPreferencesFile("2", WorldMapSectionType.field2417.name, var1); + return class17.getPreferencesFile("2", UrlRequester.field1163.name, var1); } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "25" + descriptor = "(I)V", + garbageValue = "-1883242657" ) @Export("write") void write() { @@ -175,7 +178,7 @@ void write() { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += AbstractSocket.stringCp1252NullTerminatedByteSize((String)var7); + var2 += class478.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; @@ -193,15 +196,15 @@ void write() { if (this.intsPersistence[var16]) { var26.writeShort(var16); Object var8 = var15.getValue(); - class502 var9 = class502.method2495(var8.getClass()); - var26.writeByte(var9.field4103); + class517 var9 = class517.method2529(var8.getClass()); + var26.writeByte(var9.field4132); Class var11 = var8.getClass(); - class502 var12 = class502.method2495(var11); + class517 var12 = class517.method2529(var11); if (var12 == null) { throw new IllegalArgumentException(); } - class498 var10 = var12.field4106; + class513 var10 = var12.field4135; var10.vmethod8274(var8, var26); } } @@ -217,19 +220,19 @@ void write() { } this.unwrittenChanges = false; - this.field1145 = GameEngine.clockNow(); + this.field1143 = GrandExchangeOfferTotalQuantityComparator.method1971(); } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-137734629" + garbageValue = "-16884896" ) @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); - label220: { + label234: { try { byte[] var2 = new byte[(int)var1.length()]; @@ -244,60 +247,60 @@ void read() { Buffer var14 = new Buffer(var2); if (var14.array.length - var14.offset >= 1) { int var15 = var14.readUnsignedByte(); - if (var15 < 0 || var15 > 2) { - return; - } - - int var7; - int var8; - int var9; - int var16; - if (var15 >= 2) { - var16 = var14.readUnsignedShort(); - var7 = 0; - - while (true) { - if (var7 >= var16) { - break label220; + if (var15 >= 0 && var15 <= 2) { + int var7; + int var8; + int var9; + int var16; + if (var15 >= 2) { + var16 = var14.readUnsignedShort(); + var7 = 0; + + while (true) { + if (var7 >= var16) { + break label234; + } + + var8 = var14.readUnsignedShort(); + var9 = var14.readUnsignedByte(); + class517 var10 = (class517)SequenceDefinition.findEnumerated(class517.method2528(), var9); + Object var11 = var10.method2532(var14); + if (var8 >= 0 && var8 < this.intsPersistence.length && this.intsPersistence[var8]) { + this.map.put(var8, var11); + } + + ++var7; } - - var8 = var14.readUnsignedShort(); - var9 = var14.readUnsignedByte(); - class502 var10 = (class502)KeyHandler.findEnumerated(class502.method2494(), var9); - Object var11 = var10.method2497(var14); - if (var8 >= 0 && var8 < this.intsPersistence.length && this.intsPersistence[var8]) { - this.map.put(var8, var11); + } else { + var16 = var14.readUnsignedShort(); + + for (var7 = 0; var7 < var16; ++var7) { + var8 = var14.readUnsignedShort(); + var9 = var14.readInt(); + if (var8 >= 0 && var8 < this.intsPersistence.length && this.intsPersistence[var8]) { + this.map.put(var8, var9); + } } - ++var7; - } - } else { - var16 = var14.readUnsignedShort(); - - for (var7 = 0; var7 < var16; ++var7) { - var8 = var14.readUnsignedShort(); - var9 = var14.readInt(); - if (var8 >= 0 && var8 < this.intsPersistence.length && this.intsPersistence[var8]) { - this.map.put(var8, var9); - } - } + var7 = var14.readUnsignedShort(); + var8 = 0; - var7 = var14.readUnsignedShort(); - var8 = 0; + while (true) { + if (var8 >= var7) { + break label234; + } - while (true) { - if (var8 >= var7) { - break label220; + var14.readUnsignedShort(); + var14.readStringCp1252NullTerminated(); + ++var8; } - - var14.readUnsignedShort(); - var14.readStringCp1252NullTerminated(); - ++var8; } } + + return; } } catch (Exception var25) { - break label220; + break label234; } finally { try { var1.close(); @@ -312,26 +315,35 @@ void read() { this.unwrittenChanges = false; } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1824287438" + garbageValue = "-409824509" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1145 < GameEngine.clockNow() - 60000L) { + if (this.unwrittenChanges && this.field1143 < GrandExchangeOfferTotalQuantityComparator.method1971() - 60000L) { this.write(); } } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "7" + descriptor = "(I)Z", + garbageValue = "-1882993315" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;I)V", + garbageValue = "-1336759241" + ) + public static void method625(AbstractArchive var0) { + DbRowType.field4144 = var0; + } } \ No newline at end of file diff --git a/osrs/src/main/java/VarpDefinition.java b/osrs/src/main/java/VarpDefinition.java index 541dc47be..3389a7689 100644 --- a/osrs/src/main/java/VarpDefinition.java +++ b/osrs/src/main/java/VarpDefinition.java @@ -3,33 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") +@ObfuscatedName("ha") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("VarpDefinition_archive") - static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("ae") - public static int field1498; - @ObfuscatedName("ao") + public static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("al") + public static int field1501; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llr;" ) @Export("VarpDefinition_cached") - public static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - @Export("SequenceDefinition_animationsArchive") - static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("uk") - @Export("cameraMoveToHeight") - static int cameraMoveToHeight; - @ObfuscatedName("at") + static EvictingDualNodeHashTable VarpDefinition_cached; + @ObfuscatedName("ax") @Export("type") public int type; @@ -41,10 +32,10 @@ public class VarpDefinition extends DualNode { this.type = 0; } - @ObfuscatedName("ao") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-2" + descriptor = "(Lul;I)V", + garbageValue = "1806040188" ) @Export("decode") void decode(Buffer var1) { @@ -58,10 +49,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1878082130" + descriptor = "(Lul;IS)V", + garbageValue = "4095" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -70,4 +61,42 @@ void decodeNext(Buffer var1, int var2) { } } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "445766054" + ) + @Export("sortItemsByName") + static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + short var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + short var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } + } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + sortItemsByName(var0, var1, var2, var5 - 1); + sortItemsByName(var0, var1, var5 + 1, var3); + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/Varps.java b/osrs/src/main/java/Varps.java index bc26c0d53..67f68683b 100644 --- a/osrs/src/main/java/Varps.java +++ b/osrs/src/main/java/Varps.java @@ -3,21 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mz") +@ObfuscatedName("md") @Implements("Varps") public class Varps { - @ObfuscatedName("au") + @ObfuscatedName("wl") + @ObfuscatedSignature( + descriptor = "Lox;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("ac") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("ao") + @ObfuscatedName("ax") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("at") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; static { Varps_masks = new int[32]; @@ -28,16 +31,55 @@ public class Varps { var0 += var0; } - Varps_temp = new int[4000]; - Varps_main = new int[4000]; + Varps_temp = new int[5000]; + Varps_main = new int[5000]; } - @ObfuscatedName("au") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)[Ldl;", - garbageValue = "-195730682" + descriptor = "(ILds;ZB)I", + garbageValue = "-62" ) - static class89[] method1708() { - return new class89[]{class89.field881, class89.field883, class89.field882, class89.field880, class89.field884}; + static int method1735(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == 2700) { + var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == 2701) { + var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 2702) { + int var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); + if (var4 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 2706) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; + return 1; + } else if (var0 == 2707) { + var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method1867() ? 1 : 0; + return 1; + } else if (var0 == 2708) { + var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return class110.method624(var3); + } else if (var0 == 2709) { + var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return Canvas.method88(var3); + } else { + return 2; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/VertexNormal.java b/osrs/src/main/java/VertexNormal.java index 3ea0c450d..d61983e8a 100644 --- a/osrs/src/main/java/VertexNormal.java +++ b/osrs/src/main/java/VertexNormal.java @@ -3,21 +3,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ja") +import java.awt.*; +import java.awt.Desktop.Action; +import java.net.URI; + +@ObfuscatedName("jp") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("ul") - static int field2255; - @ObfuscatedName("au") + @ObfuscatedName("ao") + @Export("Tiles_overlays") + static short[][][] Tiles_overlays; + @ObfuscatedName("ac") @Export("x") int x; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("y") int y; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("z") int z; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("magnitude") int magnitude; @@ -25,7 +30,7 @@ public class VertexNormal { } @ObfuscatedSignature( - descriptor = "(Lja;)V" + descriptor = "(Ljp;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; @@ -33,4 +38,33 @@ public class VertexNormal { this.z = var1.z; this.magnitude = var1.magnitude; } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "-2141219999" + ) + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + if (var1) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + try { + Desktop.getDesktop().browse(new URI(var0)); + return; + } catch (Exception var4) { + } + } + + if (class31.field84.startsWith("win")) { + Friend.method2242(var0, 0, "openjs"); + } else if (class31.field84.startsWith("mac")) { + Friend.method2242(var0, 1, "openjs"); + } else { + Friend.method2242(var0, 2, "openjs"); + } + } else { + Friend.method2242(var0, 3, "openjs"); + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/VerticalAlignment.java b/osrs/src/main/java/VerticalAlignment.java index a786fbfba..7adb79db6 100644 --- a/osrs/src/main/java/VerticalAlignment.java +++ b/osrs/src/main/java/VerticalAlignment.java @@ -3,41 +3,38 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +import java.util.Iterator; + +@ObfuscatedName("hr") @Implements("VerticalAlignment") -public enum VerticalAlignment implements class371 { - @ObfuscatedName("au") +public enum VerticalAlignment implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lhy;" + descriptor = "Lhr;" ) - field1634(1, 0), - @ObfuscatedName("ae") + field1643(1, 0), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lhy;" + descriptor = "Lhr;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(0, 1), - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lhy;" + descriptor = "Lhr;" ) - field1633(2, 2); + field1644(2, 2); - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Luk;" - ) - static IndexedSprite field1631; - @ObfuscatedName("td") + @ObfuscatedName("tb") @ObfuscatedSignature( - descriptor = "Lgo;" + descriptor = "Lgi;" ) - @Export("guestClanChannel") - static ClanChannel guestClanChannel; - @ObfuscatedName("at") + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + @ObfuscatedName("ax") @Export("value") public final int value; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("id") final int id; @@ -46,49 +43,61 @@ public enum VerticalAlignment implements class371 { this.id = var4; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("ae") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIII)V", - garbageValue = "807517970" + descriptor = "(II)V", + garbageValue = "900742897" ) - public static void method998(String[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - int var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { + if (class33.field89.method1742(var0)) { + Widget[] var1 = class33.field89.Widget_interfaceComponents[var0]; - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - int var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3.onLoad != null) { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onLoad; + ArchiveDisk.runScript(var4, 5000000, 0); + } } + } + } + } + + @ObfuscatedName("na") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1054734987" + ) + static final void method1027() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsFriend(); + } + + Iterator var2 = Messages.Messages_hashTable.iterator(); + + while (var2.hasNext()) { + Message var3 = (Message)var2.next(); + var3.clearIsFromFriend(); + } - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - method998(var0, var1, var2, var5 - 1); - method998(var0, var1, var5 + 1, var3); + if (class358.friendsChat != null) { + class358.friendsChat.clearFriends(); } } diff --git a/osrs/src/main/java/ViewportMouse.java b/osrs/src/main/java/ViewportMouse.java index 77a421f81..b9c2c9fa5 100644 --- a/osrs/src/main/java/ViewportMouse.java +++ b/osrs/src/main/java/ViewportMouse.java @@ -3,35 +3,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("netscape/js") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("ViewportMouse_isInViewport") static boolean ViewportMouse_isInViewport; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("ViewportMouse_x") static int ViewportMouse_x; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("ViewportMouse_y") static int ViewportMouse_y; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("ViewportMouse_false0") static boolean ViewportMouse_false0; - @ObfuscatedName("ac") - static int field2249; - @ObfuscatedName("ai") - static int field2252; - @ObfuscatedName("az") - static int field2254; - @ObfuscatedName("aa") - static int field2248; - @ObfuscatedName("ad") - static int field2250; - @ObfuscatedName("an") + @ObfuscatedName("ao") + static int field2264; + @ObfuscatedName("ah") + static int field2260; + @ObfuscatedName("am") + static int field2263; + @ObfuscatedName("av") + static int field2265; + @ObfuscatedName("ay") @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; @@ -44,39 +42,134 @@ public class ViewportMouse { ViewportMouse_entityTags = new long[1000]; } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(BI)C", - garbageValue = "-1224781915" + descriptor = "(ILds;ZI)I", + garbageValue = "-527981427" ) - public static char method1348(byte var0) { - int var1 = var0 & 255; - if (var1 == 0) { - throw new IllegalArgumentException("" + Integer.toString(var1, 16)); + static int method1389(int var0, Script var1, boolean var2) { + if (var0 < 1000) { + return class168.method878(var0, var1, var2); + } else if (var0 < 1100) { + return ClientPreferences.method567(var0, var1, var2); + } else if (var0 < 1200) { + return class17.method56(var0, var1, var2); + } else if (var0 < 1300) { + return class76.method432(var0, var1, var2); + } else if (var0 < 1400) { + return class4.method6(var0, var1, var2); + } else if (var0 < 1500) { + return class31.method127(var0, var1, var2); + } else if (var0 < 1600) { + return class87.method462(var0, var1, var2); + } else if (var0 < 1700) { + return class134.method725(var0, var1, var2); + } else if (var0 < 1800) { + return class202.method1004(var0, var1, var2); + } else if (var0 < 1900) { + return class13.method42(var0, var1, var2); + } else if (var0 < 2000) { + return class20.method77(var0, var1, var2); + } else if (var0 < 2100) { + return ClientPreferences.method567(var0, var1, var2); + } else if (var0 < 2200) { + return class17.method56(var0, var1, var2); + } else if (var0 < 2300) { + return class76.method432(var0, var1, var2); + } else if (var0 < 2400) { + return class4.method6(var0, var1, var2); + } else if (var0 < 2500) { + return class31.method127(var0, var1, var2); + } else if (var0 < 2600) { + return class30.method123(var0, var1, var2); + } else if (var0 < 2700) { + return DevicePcmPlayerProvider.method86(var0, var1, var2); + } else if (var0 < 2800) { + return Varps.method1735(var0, var1, var2); + } else if (var0 < 2900) { + return ClientPacket.method1640(var0, var1, var2); + } else if (var0 < 3000) { + return class20.method77(var0, var1, var2); + } else if (var0 < 3200) { + return class266.method1430(var0, var1, var2); + } else if (var0 < 3300) { + return class133.method722(var0, var1, var2); + } else if (var0 < 3400) { + return Frames.method1339(var0, var1, var2); + } else if (var0 < 3500) { + return Buddy.method2285(var0, var1, var2); + } else if (var0 < 3600) { + return WorldMapElement.method971(var0, var1, var2); + } else if (var0 < 3700) { + return ReflectionCheck.method184(var0, var1, var2); + } else if (var0 < 3800) { + return class470.method2363(var0, var1, var2); + } else if (var0 < 3900) { + return class13.method43(var0, var1, var2); + } else if (var0 < 4000) { + return class74.method427(var0, var1, var2); + } else if (var0 < 4100) { + return KitDefinition.method986(var0, var1, var2); + } else if (var0 < 4200) { + return class141.method752(var0, var1, var2); + } else if (var0 < 4300) { + return class18.method65(var0, var1, var2); + } else if (var0 < 5100) { + return Projectile.method439(var0, var1, var2); + } else if (var0 < 5400) { + return PlayerComposition.method1761(var0, var1, var2); + } else if (var0 < 5600) { + return ObjectSound.method416(var0, var1, var2); + } else if (var0 < 5700) { + return HealthBarUpdate.method524(var0, var1, var2); + } else if (var0 < 6300) { + return WorldMapAreaData.method1601(var0, var1, var2); + } else if (var0 < 6600) { + return class319.method1660(var0, var1, var2); + } else if (var0 < 6700) { + return GrandExchangeOfferNameComparator.method1980(var0, var1, var2); + } else if (var0 < 6800) { + return class330.method1729(var0, var1, var2); + } else if (var0 < 6900) { + return class169.method881(var0, var1, var2); + } else if (var0 < 7000) { + return class104.method606(var0, var1, var2); + } else if (var0 < 7100) { + return class224.method1141(var0, var1, var2); + } else if (var0 < 7200) { + return class17.method57(var0, var1, var2); + } else if (var0 < 7300) { + return MouseHandler.method179(var0, var1, var2); + } else if (var0 < 7500) { + return class472.method2371(var0, var1, var2); + } else if (var0 < 7600) { + return DynamicObject.method451(var0, var1, var2); + } else if (var0 < 7700) { + return class150.method789(var0, var1, var2); } else { - if (var1 >= 128 && var1 < 160) { - char var2 = class384.cp1252AsciiExtension[var1 - 128]; - if (var2 == 0) { - var2 = '?'; - } - - var1 = var2; - } - - return (char)var1; + return var0 < 8100 ? class4.method7(var0, var1, var2) : 2; } } - @ObfuscatedName("al") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "759776126" + descriptor = "(ILnm;IIIII[FI)Lnm;", + garbageValue = "-357368567" ) - static int method1349(int var0, int var1, int var2) { - if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { - return 0; - } else { - return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; - } + static Widget method1390(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) { + Widget var8 = new Widget(); + var8.type = var0; + var8.parentId = var1.id; + var8.childIndex = var2; + var8.isIf3 = true; + var8.xAlignment = var3; + var8.yAlignment = var4; + var8.widthAlignment = var5; + var8.heightAlignment = var6; + var8.rawX = (int)(var7[0] * (float)var1.width); + var8.rawY = (int)((float)var1.height * var7[1]); + var8.rawWidth = (int)(var7[2] * (float)var1.width); + var8.rawHeight = (int)((float)var1.height * var7[3]); + return var8; } } \ No newline at end of file diff --git a/osrs/src/main/java/VorbisCodebook.java b/osrs/src/main/java/VorbisCodebook.java index 4b3f537af..89594614e 100644 --- a/osrs/src/main/java/VorbisCodebook.java +++ b/osrs/src/main/java/VorbisCodebook.java @@ -3,79 +3,79 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("ce") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("au") - int field257; - @ObfuscatedName("ae") + @ObfuscatedName("ac") + int field254; + @ObfuscatedName("al") @Export("entries") int entries; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("at") - int[] field260; - @ObfuscatedName("ac") - float[][] field255; - @ObfuscatedName("ai") + @ObfuscatedName("ax") + int[] field258; + @ObfuscatedName("ao") + float[][] field253; + @ObfuscatedName("ah") @Export("keys") int[] keys; VorbisCodebook() { class60 var1 = VorbisSample.field267; - var1.method325(24); - this.field257 = var1.method325(16); - this.entries = var1.method325(24); + var1.method327(24); + this.field254 = var1.method327(16); + this.entries = var1.method327(24); this.lengthMap = new int[this.entries]; - boolean var2 = var1.method326() != 0; + boolean var2 = var1.method328() != 0; int var3; int var4; int var6; if (var2) { var3 = 0; - for (var4 = var1.method325(5) + 1; var3 < this.entries; ++var4) { - int var5 = var1.method325(class16.iLog(this.entries - var3)); + for (var4 = var1.method327(5) + 1; var3 < this.entries; ++var4) { + int var5 = var1.method327(class172.iLog(this.entries - var3)); for (var6 = 0; var6 < var5; ++var6) { this.lengthMap[var3++] = var4; } } } else { - boolean var15 = var1.method326() != 0; + boolean var15 = var1.method328() != 0; for (var4 = 0; var4 < this.entries; ++var4) { - if (var15 && var1.method326() == 0) { + if (var15 && var1.method328() == 0) { this.lengthMap[var4] = 0; } else { - this.lengthMap[var4] = var1.method325(5) + 1; + this.lengthMap[var4] = var1.method327(5) + 1; } } } - this.method286(); - var3 = var1.method325(4); + this.method295(); + var3 = var1.method327(4); if (var3 > 0) { - float var16 = VorbisSample.float32Unpack(var1.method325(32)); - float var17 = VorbisSample.float32Unpack(var1.method325(32)); - var6 = var1.method325(4) + 1; - boolean var7 = var1.method326() != 0; + float var16 = VorbisSample.float32Unpack(var1.method327(32)); + float var17 = VorbisSample.float32Unpack(var1.method327(32)); + var6 = var1.method327(4) + 1; + boolean var7 = var1.method328() != 0; int var8; if (var3 == 1) { - var8 = mapType1QuantValues(this.entries, this.field257); + var8 = mapType1QuantValues(this.entries, this.field254); } else { - var8 = this.entries * this.field257; + var8 = this.entries * this.field254; } - this.field260 = new int[var8]; + this.field258 = new int[var8]; int var9; for (var9 = 0; var9 < var8; ++var9) { - this.field260[var9] = var1.method325(var6); + this.field258[var9] = var1.method327(var6); } - this.field255 = new float[this.entries][this.field257]; + this.field253 = new float[this.entries][this.field254]; float var10; int var11; int var12; @@ -84,10 +84,10 @@ public class VorbisCodebook { var10 = 0.0F; var11 = 1; - for (var12 = 0; var12 < this.field257; ++var12) { + for (var12 = 0; var12 < this.field254; ++var12) { int var13 = var9 / var11 % var8; - float var14 = (float)this.field260[var13] * var17 + var16 + var10; - this.field255[var9][var12] = var14; + float var14 = (float)this.field258[var13] * var17 + var16 + var10; + this.field253[var9][var12] = var14; if (var7) { var10 = var14; } @@ -98,11 +98,11 @@ public class VorbisCodebook { } else { for (var9 = 0; var9 < this.entries; ++var9) { var10 = 0.0F; - var11 = var9 * this.field257; + var11 = var9 * this.field254; - for (var12 = 0; var12 < this.field257; ++var12) { - float var18 = (float)this.field260[var11] * var17 + var16 + var10; - this.field255[var9][var12] = var18; + for (var12 = 0; var12 < this.field254; ++var12) { + float var18 = (float)this.field258[var11] * var17 + var16 + var10; + this.field253[var9][var12] = var18; if (var7) { var10 = var18; } @@ -115,8 +115,8 @@ public class VorbisCodebook { } - @ObfuscatedName("ae") - void method286() { + @ObfuscatedName("al") + void method295() { int[] var1 = new int[this.entries]; int[] var2 = new int[33]; @@ -209,31 +209,31 @@ void method286() { } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lce;)I" + descriptor = "(Lcz;)I" ) - int method287(class60 var1) { + int method296(class60 var1) { int var2; - for (var2 = 0; this.keys[var2] >= 0; var2 = var1.method326() != 0 ? this.keys[var2] : var2 + 1) { + for (var2 = 0; this.keys[var2] >= 0; var2 = var1.method328() != 0 ? this.keys[var2] : var2 + 1) { } return ~this.keys[var2]; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lce;)[F" + descriptor = "(Lcz;)[F" ) - float[] method288(class60 var1) { - return this.field255[this.method287(var1)]; + float[] method297(class60 var1) { + return this.field253[this.method296(var1)]; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; NPC.method578(var2, var1) > var0; --var2) { + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; class186.method949(var2, var1) > var0; --var2) { } return var2; diff --git a/osrs/src/main/java/VorbisFloor.java b/osrs/src/main/java/VorbisFloor.java index f004abbe6..1717aeeae 100644 --- a/osrs/src/main/java/VorbisFloor.java +++ b/osrs/src/main/java/VorbisFloor.java @@ -3,104 +3,104 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bo") +@ObfuscatedName("bc") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("au") - static final int[] field172; - @ObfuscatedName("ae") + @ObfuscatedName("ac") + static final int[] field171; + @ObfuscatedName("al") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("ao") - int[] field176; - @ObfuscatedName("at") + @ObfuscatedName("ak") + int[] field175; + @ObfuscatedName("ax") @Export("multiplier") int multiplier; - @ObfuscatedName("ac") + @ObfuscatedName("ao") + int[] field176; + @ObfuscatedName("ah") int[] field174; - @ObfuscatedName("ai") - int[] field175; - @ObfuscatedName("az") - int[] field178; - @ObfuscatedName("ap") + @ObfuscatedName("ar") int[] field177; - @ObfuscatedName("aa") - int[][] field179; + @ObfuscatedName("ab") + int[] field173; + @ObfuscatedName("am") + int[][] field178; static { - field172 = new int[]{256, 128, 86, 64}; + field171 = new int[]{256, 128, 86, 64}; VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; } VorbisFloor() { class60 var1 = VorbisSample.field267; - int var2 = var1.method325(16); + int var2 = var1.method327(16); if (var2 != 1) { throw new RuntimeException(); } else { - int var3 = var1.method325(5); + int var3 = var1.method327(5); int var4 = 0; - this.field174 = new int[var3]; + this.field176 = new int[var3]; int var5; int var6; for (var5 = 0; var5 < var3; ++var5) { - var6 = var1.method325(4); - this.field174[var5] = var6; + var6 = var1.method327(4); + this.field176[var5] = var6; if (var6 >= var4) { var4 = var6 + 1; } } - this.field175 = new int[var4]; - this.field178 = new int[var4]; + this.field174 = new int[var4]; this.field177 = new int[var4]; - this.field179 = new int[var4][]; + this.field173 = new int[var4]; + this.field178 = new int[var4][]; int var8; for (var5 = 0; var5 < var4; ++var5) { - this.field175[var5] = var1.method325(3) + 1; - var6 = this.field178[var5] = var1.method325(2); + this.field174[var5] = var1.method327(3) + 1; + var6 = this.field177[var5] = var1.method327(2); if (var6 != 0) { - this.field177[var5] = var1.method325(8); + this.field173[var5] = var1.method327(8); } var6 = 1 << var6; int[] var10 = new int[var6]; - this.field179[var5] = var10; + this.field178[var5] = var10; for (var8 = 0; var8 < var6; ++var8) { - var10[var8] = var1.method325(8) - 1; + var10[var8] = var1.method327(8) - 1; } } - this.multiplier = var1.method325(2) + 1; - var5 = var1.method325(4); + this.multiplier = var1.method327(2) + 1; + var5 = var1.method327(4); var6 = 2; int var7; for (var7 = 0; var7 < var3; ++var7) { - var6 += this.field175[this.field174[var7]]; + var6 += this.field174[this.field176[var7]]; } - this.field176 = new int[var6]; - this.field176[0] = 0; - this.field176[1] = 1 << var5; + this.field175 = new int[var6]; + this.field175[0] = 0; + this.field175[1] = 1 << var5; var6 = 2; for (var7 = 0; var7 < var3; ++var7) { - var8 = this.field174[var7]; + var8 = this.field176[var7]; - for (int var9 = 0; var9 < this.field175[var8]; ++var9) { - this.field176[var6++] = var1.method325(var5); + for (int var9 = 0; var9 < this.field174[var8]; ++var9) { + this.field175[var6++] = var1.method327(var5); } } } } - @ObfuscatedName("au") - int method192(int[] var1, int var2) { + @ObfuscatedName("ac") + int method202(int[] var1, int var2) { int var3 = var1[var2]; int var4 = -1; int var5 = Integer.MIN_VALUE; @@ -116,8 +116,8 @@ int method192(int[] var1, int var2) { return var4; } - @ObfuscatedName("ae") - int method193(int[] var1, int var2) { + @ObfuscatedName("al") + int method203(int[] var1, int var2) { int var3 = var1[var2]; int var4 = -1; int var5 = Integer.MAX_VALUE; @@ -133,8 +133,8 @@ int method193(int[] var1, int var2) { return var4; } - @ObfuscatedName("ao") - int method194(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ak") + int method204(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; int var7 = var3 - var1; int var8 = var6 < 0 ? -var6 : var6; @@ -143,8 +143,8 @@ int method194(int var1, int var2, int var3, int var4, int var5) { return var6 < 0 ? var2 - var10 : var10 + var2; } - @ObfuscatedName("at") - void method195(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("ax") + void method205(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; int var8 = var3 - var1; int var9 = var7 < 0 ? -var7 : var7; @@ -172,48 +172,48 @@ void method195(int var1, int var2, int var3, int var4, float[] var5, int var6) { } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lce;)Lcd;" + descriptor = "(Lcz;)Lcy;" ) - class59 method196(class60 var1) { - boolean var2 = var1.method326() != 0; + class59 method206(class60 var1) { + boolean var2 = var1.method328() != 0; if (!var2) { return new class59(this, false, (int[])null, (int[])null, (boolean[])null); } else { class59 var3 = new class59(this, true, (int[])null, (int[])null, (boolean[])null); - int var4 = this.field176.length; - if (var3.field314 == null || var3.field314.length < var4) { + int var4 = this.field175.length; + if (var3.field313 == null || var3.field313.length < var4) { + var3.field313 = new int[var4]; var3.field314 = new int[var4]; - var3.field315 = new int[var4]; - var3.field313 = new boolean[var4]; + var3.field312 = new boolean[var4]; } int var5; for (var5 = 0; var5 < var4; ++var5) { - var3.field314[var5] = this.field176[var5]; + var3.field313[var5] = this.field175[var5]; } - var5 = field172[this.multiplier - 1]; - int var6 = class16.iLog(var5 - 1); - var3.field315[0] = var1.method325(var6); - var3.field315[1] = var1.method325(var6); + var5 = field171[this.multiplier - 1]; + int var6 = class172.iLog(var5 - 1); + var3.field314[0] = var1.method327(var6); + var3.field314[1] = var1.method327(var6); int var7 = 2; - for (int var8 = 0; var8 < this.field174.length; ++var8) { - int var9 = this.field174[var8]; - int var10 = this.field175[var9]; - int var11 = this.field178[var9]; + for (int var8 = 0; var8 < this.field176.length; ++var8) { + int var9 = this.field176[var8]; + int var10 = this.field174[var9]; + int var11 = this.field177[var9]; int var12 = (1 << var11) - 1; int var13 = 0; if (var11 > 0) { - var13 = VorbisSample.field268[this.field177[var9]].method287(var1); + var13 = VorbisSample.field266[this.field173[var9]].method296(var1); } for (int var14 = 0; var14 < var10; ++var14) { - int var15 = this.field179[var9][var13 & var12]; + int var15 = this.field178[var9][var13 & var12]; var13 >>>= var11; - var3.field315[var7++] = var15 >= 0 ? VorbisSample.field268[var15].method287(var1) : 0; + var3.field314[var7++] = var15 >= 0 ? VorbisSample.field266[var15].method296(var1) : 0; } } diff --git a/osrs/src/main/java/VorbisMapping.java b/osrs/src/main/java/VorbisMapping.java index 7b9fcf64b..088db9f16 100644 --- a/osrs/src/main/java/VorbisMapping.java +++ b/osrs/src/main/java/VorbisMapping.java @@ -1,38 +1,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bc") +@ObfuscatedName("bq") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("au") - int field252; - @ObfuscatedName("ae") - int field251; - @ObfuscatedName("ao") - int[] field253; - @ObfuscatedName("at") - int[] field254; + @ObfuscatedName("ac") + int field249; + @ObfuscatedName("al") + int field250; + @ObfuscatedName("ak") + int[] field251; + @ObfuscatedName("ax") + int[] field252; VorbisMapping() { class60 var1 = VorbisSample.field267; - var1.method325(16); - this.field252 = var1.method326() != 0 ? var1.method325(4) + 1 : 1; - if (var1.method326() != 0) { - var1.method325(8); + var1.method327(16); + this.field249 = var1.method328() != 0 ? var1.method327(4) + 1 : 1; + if (var1.method328() != 0) { + var1.method327(8); } - var1.method325(2); - if (this.field252 > 1) { - this.field251 = var1.method325(4); + var1.method327(2); + if (this.field249 > 1) { + this.field250 = var1.method327(4); } - this.field253 = new int[this.field252]; - this.field254 = new int[this.field252]; + this.field251 = new int[this.field249]; + this.field252 = new int[this.field249]; - for (int var2 = 0; var2 < this.field252; ++var2) { - var1.method325(8); - this.field253[var2] = var1.method325(8); - this.field254[var2] = var1.method325(8); + for (int var2 = 0; var2 < this.field249; ++var2) { + var1.method327(8); + this.field251[var2] = var1.method327(8); + this.field252[var2] = var1.method327(8); } } diff --git a/osrs/src/main/java/VorbisSample.java b/osrs/src/main/java/VorbisSample.java index 52703f2e2..81e132285 100644 --- a/osrs/src/main/java/VorbisSample.java +++ b/osrs/src/main/java/VorbisSample.java @@ -3,104 +3,104 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cm") +@ObfuscatedName("cw") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lce;" + descriptor = "Lcz;" ) static class60 field267; - @ObfuscatedName("ap") - static int field276; - @ObfuscatedName("aa") + @ObfuscatedName("ab") + static int field274; + @ObfuscatedName("am") static int field275; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "[Lcw;" + descriptor = "[Lce;" ) - static VorbisCodebook[] field268; - @ObfuscatedName("ad") + static VorbisCodebook[] field266; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "[Lbo;" + descriptor = "[Lbc;" ) - static VorbisFloor[] field263; - @ObfuscatedName("aq") + static VorbisFloor[] field261; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "[Lbz;" + descriptor = "[Lbg;" ) - static class46[] field266; - @ObfuscatedName("al") + static class46[] field262; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Lbc;" + descriptor = "[Lbq;" ) - static VorbisMapping[] field262; - @ObfuscatedName("an") - static boolean[] field265; - @ObfuscatedName("ar") - static int[] field277; - @ObfuscatedName("ab") - static boolean field264; + static VorbisMapping[] field265; @ObfuscatedName("ay") - static float[] field273; + static boolean[] field264; + @ObfuscatedName("as") + static int[] field276; @ObfuscatedName("aj") - static float[] field269; - @ObfuscatedName("av") - static float[] field271; - @ObfuscatedName("aw") - static float[] field272; - @ObfuscatedName("ak") + static boolean field263; + @ObfuscatedName("aq") static float[] field270; - @ObfuscatedName("bh") - static float[] field274; - @ObfuscatedName("bj") - static int[] field278; + @ObfuscatedName("az") + static float[] field272; + @ObfuscatedName("at") + static float[] field271; + @ObfuscatedName("af") + static float[] field269; + @ObfuscatedName("ad") + static float[] field268; + @ObfuscatedName("bn") + static float[] field273; @ObfuscatedName("bk") - static int[] field279; - @ObfuscatedName("au") - byte[][] field283; - @ObfuscatedName("ae") + static int[] field277; + @ObfuscatedName("by") + static int[] field278; + @ObfuscatedName("ac") + byte[][] field282; + @ObfuscatedName("al") @Export("sampleRate") int sampleRate; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("sampleCount") int sampleCount; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("start") int start; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("end") int end; - @ObfuscatedName("ai") - boolean field281; - @ObfuscatedName("ag") - float[] field284; - @ObfuscatedName("am") - int field288; - @ObfuscatedName("ax") - int field291; @ObfuscatedName("ah") boolean field280; - @ObfuscatedName("as") - float[] field285; - @ObfuscatedName("bv") + @ObfuscatedName("an") + float[] field283; + @ObfuscatedName("au") + int field289; + @ObfuscatedName("ai") + int field285; + @ObfuscatedName("ae") + boolean field279; + @ObfuscatedName("aw") + float[] field284; + @ObfuscatedName("bd") @Export("samples") byte[] samples; - @ObfuscatedName("bt") - int field293; - @ObfuscatedName("bd") + @ObfuscatedName("be") + int field291; + @ObfuscatedName("bv") int field292; static { field267 = new class60(); - field264 = false; + field263 = false; } VorbisSample(byte[] var1) { this.read(var1); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); @@ -110,11 +110,11 @@ void read(byte[] var1) { this.end = var2.readInt(); if (this.end < 0) { this.end = ~this.end; - this.field281 = true; + this.field280 = true; } int var3 = var2.readInt(); - this.field283 = new byte[var3][]; + this.field282 = new byte[var3][]; for (int var4 = 0; var4 < var3; ++var4) { int var5 = 0; @@ -127,25 +127,25 @@ void read(byte[] var1) { byte[] var7 = new byte[var5]; var2.readBytes(var7, 0, var5); - this.field283[var4] = var7; + this.field282[var4] = var7; } } - @ObfuscatedName("at") - float[] method302(int var1) { + @ObfuscatedName("ax") + float[] method307(int var1) { class60 var2 = new class60(); - var2.method327(this.field283[var1], 0); - this.field285 = new float[field275]; - var2.method326(); - int var3 = var2.method325(class16.iLog(field277.length - 1)); - boolean var4 = field265[var3]; - int var5 = var4 ? field275 : field276; + var2.method329(this.field282[var1], 0); + this.field284 = new float[field275]; + var2.method328(); + int var3 = var2.method327(class172.iLog(field276.length - 1)); + boolean var4 = field264[var3]; + int var5 = var4 ? field275 : field274; boolean var6 = false; boolean var7 = false; if (var4) { - var6 = var2.method326() != 0; - var7 = var2.method326() != 0; + var6 = var2.method328() != 0; + var7 = var2.method328() != 0; } int var8 = var5 >> 1; @@ -153,9 +153,9 @@ float[] method302(int var1) { int var10; int var11; if (var4 && !var6) { - var9 = (var5 >> 2) - (field276 >> 2); - var10 = (field276 >> 2) + (var5 >> 2); - var11 = field276 >> 1; + var9 = (var5 >> 2) - (field274 >> 2); + var10 = (field274 >> 2) + (var5 >> 2); + var11 = field274 >> 1; } else { var9 = 0; var10 = var8; @@ -166,45 +166,45 @@ float[] method302(int var1) { int var13; int var14; if (var4 && !var7) { - var12 = var5 - (var5 >> 2) - (field276 >> 2); - var13 = (field276 >> 2) + (var5 - (var5 >> 2)); - var14 = field276 >> 1; + var12 = var5 - (var5 >> 2) - (field274 >> 2); + var13 = (field274 >> 2) + (var5 - (var5 >> 2)); + var14 = field274 >> 1; } else { var12 = var8; var13 = var5; var14 = var5 >> 1; } - VorbisMapping var15 = field262[field277[var3]]; - int var16 = var15.field251; - int var17 = var15.field253[var16]; - class59 var18 = field263[var17].method196(var2); - boolean var19 = !var18.method322(); + VorbisMapping var15 = field265[field276[var3]]; + int var16 = var15.field250; + int var17 = var15.field251[var16]; + class59 var18 = field261[var17].method206(var2); + boolean var19 = !var18.method325(); int var20; - for (var20 = 0; var20 < var15.field252; ++var20) { - class46 var21 = field266[var15.field254[var20]]; - float[] var22 = this.field285; - var21.method229(var22, var5 >> 1, var19, var2); + for (var20 = 0; var20 < var15.field249; ++var20) { + class46 var21 = field262[var15.field252[var20]]; + float[] var22 = this.field284; + var21.method236(var22, var5 >> 1, var19, var2); } - if (var18.method322()) { - var16 = var15.field251; - int var10000 = var15.field253[var16]; - var18.method321(this.field285, var5 >> 1); + if (var18.method325()) { + var16 = var15.field250; + int var10000 = var15.field251[var16]; + var18.method324(this.field284, var5 >> 1); } int var43; int var44; - if (!var18.method322()) { + if (!var18.method325()) { for (var20 = var5 >> 1; var20 < var5; ++var20) { - this.field285[var20] = 0.0F; + this.field284[var20] = 0.0F; } } else { var20 = var5 >> 1; var43 = var5 >> 2; var44 = var5 >> 3; - float[] var23 = this.field285; + float[] var23 = this.field284; int var24; for (var24 = 0; var24 < var20; ++var24) { @@ -215,10 +215,10 @@ float[] method302(int var1) { var23[var24] = -var23[var5 - var24 - 1]; } - float[] var45 = var4 ? field272 : field273; - float[] var25 = var4 ? field270 : field269; - float[] var26 = var4 ? field274 : field271; - int[] var27 = var4 ? field279 : field278; + float[] var45 = var4 ? field269 : field270; + float[] var25 = var4 ? field268 : field272; + float[] var26 = var4 ? field273 : field271; + int[] var27 = var4 ? field278 : field277; int var28; float var29; @@ -249,7 +249,7 @@ float[] method302(int var1) { var23[var28 * 4 + 1] = (var30 - var32) * var33 + (var29 - var31) * var34; } - var28 = class16.iLog(var5 - 1); + var28 = class172.iLog(var5 - 1); int var49; int var50; @@ -349,49 +349,49 @@ float[] method302(int var1) { float[] var57; for (var49 = var9; var49 < var10; ++var49) { var30 = (float)Math.sin(((double)(var49 - var9) + 0.5D) / (double)var11 * 0.5D * 3.141592653589793D); - var57 = this.field285; + var57 = this.field284; var57[var49] *= (float)Math.sin(1.5707963267948966D * (double)var30 * (double)var30); } for (var49 = var12; var49 < var13; ++var49) { var30 = (float)Math.sin(((double)(var49 - var12) + 0.5D) / (double)var14 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var57 = this.field285; + var57 = this.field284; var57[var49] *= (float)Math.sin(1.5707963267948966D * (double)var30 * (double)var30); } } float[] var46 = null; - if (this.field288 > 0) { - var43 = var5 + this.field288 >> 2; + if (this.field289 > 0) { + var43 = var5 + this.field289 >> 2; var46 = new float[var43]; int var47; - if (!this.field280) { - for (var44 = 0; var44 < this.field291; ++var44) { - var47 = var44 + (this.field288 >> 1); - var46[var44] += this.field284[var47]; + if (!this.field279) { + for (var44 = 0; var44 < this.field285; ++var44) { + var47 = var44 + (this.field289 >> 1); + var46[var44] += this.field283[var47]; } } - if (var18.method322()) { + if (var18.method325()) { for (var44 = var9; var44 < var5 >> 1; ++var44) { var47 = var46.length - (var5 >> 1) + var44; - var46[var47] += this.field285[var44]; + var46[var47] += this.field284[var44]; } } } - float[] var48 = this.field284; - this.field284 = this.field285; - this.field285 = var48; - this.field288 = var5; - this.field291 = var13 - (var5 >> 1); - this.field280 = !var18.method322(); + float[] var48 = this.field283; + this.field283 = this.field284; + this.field284 = var48; + this.field289 = var5; + this.field285 = var13 - (var5 >> 1); + this.field279 = !var18.method325(); return var46; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "([I)Lbu;" + descriptor = "([I)Lbs;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -399,21 +399,21 @@ RawSound toRawSound(int[] var1) { return null; } else { if (this.samples == null) { - this.field288 = 0; - this.field284 = new float[field275]; + this.field289 = 0; + this.field283 = new float[field275]; this.samples = new byte[this.sampleCount]; - this.field293 = 0; + this.field291 = 0; this.field292 = 0; } - for (; this.field292 < this.field283.length; ++this.field292) { + for (; this.field292 < this.field282.length; ++this.field292) { if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method302(this.field292); + float[] var2 = this.method307(this.field292); if (var2 != null) { - int var3 = this.field293; + int var3 = this.field291; int var4 = var2.length; if (var4 > this.sampleCount - var3) { var4 = this.sampleCount - var3; @@ -429,21 +429,21 @@ RawSound toRawSound(int[] var1) { } if (var1 != null) { - var1[0] -= var3 - this.field293; + var1[0] -= var3 - this.field291; } - this.field293 = var3; + this.field291 = var3; } } - this.field284 = null; + this.field283 = null; byte[] var7 = this.samples; this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field281); + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field280); } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; @@ -456,12 +456,12 @@ static float float32Unpack(int var0) { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); } - @ObfuscatedName("ao") - static void method301(byte[] var0) { + @ObfuscatedName("ak") + static void method306(byte[] var0) { class60 var1 = field267; - var1.method327(var0, 0); - field276 = 1 << var1.method325(4); - field275 = 1 << var1.method325(4); + var1.method329(var0, 0); + field274 = 1 << var1.method327(4); + field275 = 1 << var1.method327(4); int var2; int var3; @@ -469,33 +469,33 @@ static void method301(byte[] var0) { int var5; int var6; for (var2 = 0; var2 < 2; ++var2) { - var3 = var2 != 0 ? field275 : field276; + var3 = var2 != 0 ? field275 : field274; var4 = var3 >> 1; var5 = var3 >> 2; var6 = var3 >> 3; - float[] var19 = new float[var4]; + float[] var7 = new float[var4]; for (int var8 = 0; var8 < var5; ++var8) { - var19[var8 * 2] = (float)Math.cos((double)(var8 * 4) * 3.141592653589793D / (double)var3); - var19[var8 * 2 + 1] = -((float)Math.sin((double)(var8 * 4) * 3.141592653589793D / (double)var3)); + var7[var8 * 2] = (float)Math.cos((double)(var8 * 4) * 3.141592653589793D / (double)var3); + var7[var8 * 2 + 1] = -((float)Math.sin((double)(var8 * 4) * 3.141592653589793D / (double)var3)); } - float[] var20 = new float[var4]; + float[] var19 = new float[var4]; for (int var9 = 0; var9 < var5; ++var9) { - var20[var9 * 2] = (float)Math.cos((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); - var20[var9 * 2 + 1] = (float)Math.sin((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); + var19[var9 * 2] = (float)Math.cos((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); + var19[var9 * 2 + 1] = (float)Math.sin((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); } - float[] var21 = new float[var5]; + float[] var20 = new float[var5]; for (int var10 = 0; var10 < var6; ++var10) { - var21[var10 * 2] = (float)Math.cos((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3); - var21[var10 * 2 + 1] = -((float)Math.sin((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3)); + var20[var10 * 2] = (float)Math.cos((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3); + var20[var10 * 2 + 1] = -((float)Math.sin((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3)); } - int[] var22 = new int[var6]; - int var11 = class16.iLog(var6 - 1); + int[] var21 = new int[var6]; + int var11 = class172.iLog(var6 - 1); for (int var12 = 0; var12 < var6; ++var12) { int var16 = var12; @@ -507,94 +507,94 @@ static void method301(byte[] var0) { var16 >>>= 1; } - var22[var12] = var18; + var21[var12] = var18; } if (var2 != 0) { - field272 = var19; - field270 = var20; - field274 = var21; - field279 = var22; + field269 = var7; + field268 = var19; + field273 = var20; + field278 = var21; } else { - field273 = var19; - field269 = var20; - field271 = var21; - field278 = var22; + field270 = var7; + field272 = var19; + field271 = var20; + field277 = var21; } } - var2 = var1.method325(8) + 1; - field268 = new VorbisCodebook[var2]; + var2 = var1.method327(8) + 1; + field266 = new VorbisCodebook[var2]; for (var3 = 0; var3 < var2; ++var3) { - field268[var3] = new VorbisCodebook(); + field266[var3] = new VorbisCodebook(); } - var3 = var1.method325(6) + 1; + var3 = var1.method327(6) + 1; for (var4 = 0; var4 < var3; ++var4) { - var1.method325(16); + var1.method327(16); } - var3 = var1.method325(6) + 1; - field263 = new VorbisFloor[var3]; + var3 = var1.method327(6) + 1; + field261 = new VorbisFloor[var3]; for (var4 = 0; var4 < var3; ++var4) { - field263[var4] = new VorbisFloor(); + field261[var4] = new VorbisFloor(); } - var4 = var1.method325(6) + 1; - field266 = new class46[var4]; + var4 = var1.method327(6) + 1; + field262 = new class46[var4]; for (var5 = 0; var5 < var4; ++var5) { - field266[var5] = new class46(); + field262[var5] = new class46(); } - var5 = var1.method325(6) + 1; - field262 = new VorbisMapping[var5]; + var5 = var1.method327(6) + 1; + field265 = new VorbisMapping[var5]; for (var6 = 0; var6 < var5; ++var6) { - field262[var6] = new VorbisMapping(); + field265[var6] = new VorbisMapping(); } - var6 = var1.method325(6) + 1; - field265 = new boolean[var6]; - field277 = new int[var6]; + var6 = var1.method327(6) + 1; + field264 = new boolean[var6]; + field276 = new int[var6]; - for (int var7 = 0; var7 < var6; ++var7) { - field265[var7] = var1.method326() != 0; - var1.method325(16); - var1.method325(16); - field277[var7] = var1.method325(8); + for (int var22 = 0; var22 < var6; ++var22) { + field264[var22] = var1.method328() != 0; + var1.method327(16); + var1.method327(16); + field276[var22] = var1.method327(8); } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lnu;)Z" + descriptor = "(Lom;)Z" ) - static boolean method303(AbstractArchive var0) { - if (!field264) { + static boolean method308(AbstractArchive var0) { + if (!field263) { byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } - method301(var1); - field264 = true; + method306(var1); + field263 = true; } return true; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lnu;II)Lcm;" + descriptor = "(Lom;II)Lcw;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method303(var0)) { + if (!method308(var0)) { var0.tryLoadFile(var1, var2); return null; } else { diff --git a/osrs/src/main/java/WallDecoration.java b/osrs/src/main/java/WallDecoration.java index f43916f5f..caf0b08ec 100644 --- a/osrs/src/main/java/WallDecoration.java +++ b/osrs/src/main/java/WallDecoration.java @@ -3,52 +3,57 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jw") +import java.io.File; +import java.io.RandomAccessFile; + +@ObfuscatedName("kq") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("ar") + @ObfuscatedName("wv") @ObfuscatedSignature( - descriptor = "[Ltd;" + descriptor = "Low;" ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("au") + public static class384 field2303; + @ObfuscatedName("ly") + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("ac") @Export("z") int z; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("x") int x; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("y") int y; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("orientation") int orientation; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("orientation2") int orientation2; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("xOffset") int xOffset; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("yOffset") int yOffset; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Ljy;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Ljy;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("tag") public long tag; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("flags") int flags; @@ -56,4 +61,68 @@ public final class WallDecoration { this.tag = 0L; this.flags = 0; } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/io/File;", + garbageValue = "97" + ) + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); + RandomAccessFile var3 = null; + + try { + File var4 = new File(var2.getParent()); + if (!var4.exists()) { + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); + int var5 = var3.read(); + var3.seek(0L); + var3.write(var5); + var3.seek(0L); + var3.close(); + FileSystem.FileSystem_cacheFiles.put(var0, var2); + return var2; + } + } catch (Exception var8) { + try { + if (var3 != null) { + var3.close(); + var3 = null; + } + } catch (Exception var7) { + } + + throw new RuntimeException(); + } + } + } + } + + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "16" + ) + static final boolean method1425(int var0) { + if (var0 < 0) { + return false; + } else { + int var1 = Client.menuOpcodes[var0]; + if (var1 >= 2000) { + var1 -= 2000; + } + + return var1 == 1007; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Widget.java b/osrs/src/main/java/Widget.java index 8a05663de..f8bf49d91 100644 --- a/osrs/src/main/java/Widget.java +++ b/osrs/src/main/java/Widget.java @@ -7,494 +7,455 @@ import java.util.HashMap; import java.util.Iterator; -@ObfuscatedName("mi") +@ObfuscatedName("nm") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lle;" - ) - @Export("Widget_cachedSprites") - static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lle;" - ) - @Export("Widget_cachedModels") - static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lle;" - ) - @Export("Widget_cachedFonts") - static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lle;" - ) - @Export("Widget_cachedSpriteMasks") - static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lqv;" - ) - static class423 field2950; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lqv;" - ) - static class423 field2951; - @ObfuscatedName("ba") - public static boolean field2945; - @ObfuscatedName("bl") + @ObfuscatedName("ad") + public static boolean field2978; + @ObfuscatedName("bn") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("bp") + @ObfuscatedName("bk") @Export("id") public int id; - @ObfuscatedName("bu") + @ObfuscatedName("by") @Export("childIndex") public int childIndex; - @ObfuscatedName("bo") + @ObfuscatedName("bd") + String field2983; + @ObfuscatedName("be") @Export("type") public int type; - @ObfuscatedName("bb") + @ObfuscatedName("bv") @Export("buttonType") public int buttonType; - @ObfuscatedName("br") + @ObfuscatedName("ba") @Export("contentType") public int contentType; - @ObfuscatedName("be") + @ObfuscatedName("bz") @Export("xAlignment") public int xAlignment; - @ObfuscatedName("bi") + @ObfuscatedName("bb") @Export("yAlignment") public int yAlignment; - @ObfuscatedName("bz") + @ObfuscatedName("bo") @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("bx") + @ObfuscatedName("bp") @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("bn") + @ObfuscatedName("bt") @Export("rawX") public int rawX; - @ObfuscatedName("bw") + @ObfuscatedName("bm") @Export("rawY") public int rawY; - @ObfuscatedName("bc") + @ObfuscatedName("br") @Export("rawWidth") public int rawWidth; - @ObfuscatedName("bg") + @ObfuscatedName("bs") @Export("rawHeight") public int rawHeight; - @ObfuscatedName("cw") + @ObfuscatedName("bc") @Export("x") public int x; - @ObfuscatedName("cf") + @ObfuscatedName("bu") @Export("y") public int y; - @ObfuscatedName("cm") + @ObfuscatedName("bf") @Export("width") public int width; - @ObfuscatedName("cn") + @ObfuscatedName("bh") @Export("height") public int height; - @ObfuscatedName("cs") - public int field3006; - @ObfuscatedName("cx") - public int field3011; - @ObfuscatedName("cr") + @ObfuscatedName("bl") + public int field3017; + @ObfuscatedName("bg") + public int field3012; + @ObfuscatedName("bj") @Export("parentId") public int parentId; - @ObfuscatedName("cd") + @ObfuscatedName("bx") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ce") + @ObfuscatedName("bi") @Export("scrollX") public int scrollX; - @ObfuscatedName("cq") + @ObfuscatedName("bq") @Export("scrollY") public int scrollY; - @ObfuscatedName("cp") + @ObfuscatedName("bw") @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("cv") + @ObfuscatedName("ce") @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("co") + @ObfuscatedName("cu") @Export("color") public int color; - @ObfuscatedName("cl") + @ObfuscatedName("cw") @Export("color2") public int color2; - @ObfuscatedName("cu") + @ObfuscatedName("co") @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("ch") + @ObfuscatedName("cc") @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("ci") + @ObfuscatedName("cg") @Export("fill") public boolean fill; - @ObfuscatedName("ca") + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Luf;" ) @Export("fillMode") - public FillMode fillMode; - @ObfuscatedName("cb") + public class541 fillMode; + @ObfuscatedName("cy") @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("cg") + @ObfuscatedName("cz") @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("cj") + @ObfuscatedName("cp") @Export("lineWid") public int lineWid; - @ObfuscatedName("cz") - public boolean field2962; - @ObfuscatedName("ct") + @ObfuscatedName("cb") + public boolean field2989; + @ObfuscatedName("cn") @Export("spriteId2") public int spriteId2; - @ObfuscatedName("cy") + @ObfuscatedName("ck") @Export("spriteId") public int spriteId; - @ObfuscatedName("ck") - public String field3091; - @ObfuscatedName("cc") + @ObfuscatedName("cr") + public String field3119; + @ObfuscatedName("cs") @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("dh") + @ObfuscatedName("cm") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("dj") + @ObfuscatedName("cv") @Export("outline") public int outline; - @ObfuscatedName("di") + @ObfuscatedName("ci") @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("du") + @ObfuscatedName("cj") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("dn") + @ObfuscatedName("cx") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("dg") + @ObfuscatedName("ch") @Export("modelType") public int modelType; - @ObfuscatedName("dd") + @ObfuscatedName("cd") @Export("modelId") public int modelId; - @ObfuscatedName("da") + @ObfuscatedName("ct") @Export("modelType2") int modelType2; - @ObfuscatedName("ds") + @ObfuscatedName("cf") @Export("modelId2") int modelId2; - @ObfuscatedName("dy") + @ObfuscatedName("cl") @Export("sequenceId") public int sequenceId; - @ObfuscatedName("dt") + @ObfuscatedName("ca") @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("dl") + @ObfuscatedName("dv") @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("dk") + @ObfuscatedName("dm") @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("df") + @ObfuscatedName("ds") @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("dz") + @ObfuscatedName("dx") @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("dw") + @ObfuscatedName("dg") @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("dv") + @ObfuscatedName("dq") @Export("modelZoom") public int modelZoom; - @ObfuscatedName("dr") + @ObfuscatedName("dz") @Export("modelRotation") public int modelRotation; - @ObfuscatedName("do") + @ObfuscatedName("dn") @Export("rotationKey") public int rotationKey; - @ObfuscatedName("db") + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lni;" ) - public PlayerComposition field3101; - @ObfuscatedName("dp") + public PlayerComposition field3127; + @ObfuscatedName("df") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("dm") + @ObfuscatedName("de") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("dx") + @ObfuscatedName("dl") @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("dq") + @ObfuscatedName("dp") @Export("fontId") public int fontId; - @ObfuscatedName("de") + @ObfuscatedName("do") @Export("text") public String text; - @ObfuscatedName("dc") + @ObfuscatedName("dh") @Export("text2") public String text2; - @ObfuscatedName("ed") + @ObfuscatedName("dj") @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("eh") + @ObfuscatedName("du") @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("ey") + @ObfuscatedName("dr") @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("ee") + @ObfuscatedName("dw") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("eq") + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgr;" ) - class170 field2952; - @ObfuscatedName("ej") - int field2955; - @ObfuscatedName("ea") - HashMap field2956; - @ObfuscatedName("er") - HashMap field2957; - @ObfuscatedName("ez") + class172 field2979; + @ObfuscatedName("dt") + int field2982; + @ObfuscatedName("dd") + HashMap field2984; + @ObfuscatedName("dy") + HashMap field2985; + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "Lmp;" + descriptor = "Lno;" ) - class327 field2958; - @ObfuscatedName("et") + class342 field2986; + @ObfuscatedName("da") @Export("flags") public int flags; - @ObfuscatedName("en") - public boolean field2969; - @ObfuscatedName("eb") - public byte[][] field2977; - @ObfuscatedName("ei") - public byte[][] field2978; - @ObfuscatedName("es") - public int[] field3047; + @ObfuscatedName("eo") + public boolean field2998; + @ObfuscatedName("em") + public byte[][] field3006; @ObfuscatedName("el") - public int[] field3046; - @ObfuscatedName("eu") + public byte[][] field3005; + @ObfuscatedName("ec") + public int[] field3074; + @ObfuscatedName("eg") + public int[] field3075; + @ObfuscatedName("ez") @Export("dataText") public String dataText; - @ObfuscatedName("eg") + @ObfuscatedName("en") @Export("actions") public String[] actions; - @ObfuscatedName("ex") + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnm;" ) @Export("parent") public Widget parent; - @ObfuscatedName("eo") + @ObfuscatedName("eq") @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("ew") + @ObfuscatedName("ej") @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("ep") + @ObfuscatedName("et") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("fh") + @ObfuscatedName("eh") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("ft") + @ObfuscatedName("eb") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("fs") + @ObfuscatedName("ev") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("fl") + @ObfuscatedName("ee") @Export("onClick") public Object[] onClick; - @ObfuscatedName("fe") + @ObfuscatedName("ea") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("fd") + @ObfuscatedName("eu") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("fj") + @ObfuscatedName("ey") @Export("onHold") public Object[] onHold; - @ObfuscatedName("fv") + @ObfuscatedName("ep") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("fb") + @ObfuscatedName("ef") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("fr") + @ObfuscatedName("ew") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("fq") + @ObfuscatedName("ed") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("fp") + @ObfuscatedName("fj") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("fg") + @ObfuscatedName("fh") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("fo") + @ObfuscatedName("fz") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("fz") + @ObfuscatedName("fs") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("fu") + @ObfuscatedName("fl") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("fn") + @ObfuscatedName("fe") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("fx") + @ObfuscatedName("fo") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("ff") + @ObfuscatedName("fd") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("fc") + @ObfuscatedName("fi") @Export("statTransmitTriggers") public int[] statTransmitTriggers; @ObfuscatedName("fk") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("fm") + @ObfuscatedName("fy") @Export("onOp") public Object[] onOp; - @ObfuscatedName("fy") - public Object[] field3076; - @ObfuscatedName("fw") + @ObfuscatedName("fn") + public Object[] field3105; + @ObfuscatedName("fb") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("fi") + @ObfuscatedName("ft") @Export("onChatTransmit") public Object[] onChatTransmit; @ObfuscatedName("fa") @Export("onKey") public Object[] onKey; - @ObfuscatedName("gu") - public Object[] field3089; - @ObfuscatedName("gc") - public Object[] field3079; - @ObfuscatedName("gd") + @ObfuscatedName("fg") + public Object[] field3100; + @ObfuscatedName("fm") + public Object[] field3104; + @ObfuscatedName("fv") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("gm") + @ObfuscatedName("ff") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("gg") - public Object[] field3082; - @ObfuscatedName("gw") - public Object[] field3090; - @ObfuscatedName("gi") + @ObfuscatedName("fw") + public Object[] field3113; + @ObfuscatedName("fc") + public Object[] field3096; + @ObfuscatedName("fr") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("go") + @ObfuscatedName("fq") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("gl") + @ObfuscatedName("fp") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("gb") + @ObfuscatedName("fu") @Export("onResize") public Object[] onResize; - @ObfuscatedName("gj") + @ObfuscatedName("fx") @Export("onStockTransmit") public Object[] onStockTransmit; + @ObfuscatedName("gi") + public Object[] field3118; @ObfuscatedName("ge") - public Object[] field3081; - @ObfuscatedName("gs") - public Object[] field3088; - @ObfuscatedName("gv") + public Object[] field3117; + @ObfuscatedName("gj") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("gf") + @ObfuscatedName("gl") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("gh") + @ObfuscatedName("gq") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("gy") + @ObfuscatedName("gt") @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("gp") - public String field3097; + @ObfuscatedName("gf") + public String field3124; @ObfuscatedName("gk") @Export("buttonText") public String buttonText; - @ObfuscatedName("ga") - @Export("itemIds") - public int[] itemIds; + @ObfuscatedName("gm") + public int[] field3082; + @ObfuscatedName("gb") + public int[] field3079; @ObfuscatedName("gx") - public int[] field3054; - @ObfuscatedName("gq") @Export("itemId") public int itemId; - @ObfuscatedName("gt") + @ObfuscatedName("gp") @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("gr") + @ObfuscatedName("gd") @Export("modelFrame") public int modelFrame; @ObfuscatedName("gz") @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("gn") + @ObfuscatedName("gy") @ObfuscatedSignature( - descriptor = "[Lmi;" + descriptor = "[Lnm;" ) @Export("children") public Widget[] children; - @ObfuscatedName("ht") - public boolean field2975; - @ObfuscatedName("ho") - public boolean field2974; - @ObfuscatedName("hj") - public int field3043; - @ObfuscatedName("hh") - public int field3041; - @ObfuscatedName("hi") - public int field3042; - @ObfuscatedName("hd") - public int field3040; - @ObfuscatedName("hk") + @ObfuscatedName("gn") + public boolean field3000; + @ObfuscatedName("gr") + public boolean field3002; + @ObfuscatedName("gw") + public int field3071; + @ObfuscatedName("gs") + public int field3068; + @ObfuscatedName("gv") + public int field3070; + @ObfuscatedName("gc") + public int field3064; + @ObfuscatedName("ga") @Export("rootIndex") public int rootIndex; - @ObfuscatedName("hz") + @ObfuscatedName("gh") @Export("cycle") public int cycle; - @ObfuscatedName("hl") - public int[] field3055; - @ObfuscatedName("hg") + @ObfuscatedName("gg") + public int[] field3080; + @ObfuscatedName("gu") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("hu") + @ObfuscatedName("go") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("he") + @ObfuscatedName("hi") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; static { - Widget_cachedSprites = new EvictingDualNodeHashTable(200); - Widget_cachedModels = new EvictingDualNodeHashTable(50); - Widget_cachedFonts = new EvictingDualNodeHashTable(20); - Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field2950 = new class423(10, class421.field3766); - field2951 = new class423(10, class421.field3766); - field2945 = false; + field2978 = false; } public Widget() { @@ -515,8 +476,8 @@ public Widget() { this.y = 0; this.width = 0; this.height = 0; - this.field3006 = 1; - this.field3011 = 1; + this.field3017 = 1; + this.field3012 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -528,11 +489,11 @@ public Widget() { this.mouseOverColor = 0; this.mouseOverColor2 = 0; this.fill = false; - this.fillMode = FillMode.SOLID; + this.fillMode = class541.SOLID; this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; - this.field2962 = false; + this.field2989 = false; this.spriteId2 = -1; this.spriteId = -1; this.spriteAngle = 0; @@ -563,9 +524,9 @@ public Widget() { this.textXAlignment = 0; this.textYAlignment = 0; this.textShadowed = false; - this.field2955 = -1; + this.field2982 = -1; this.flags = 0; - this.field2969 = false; + this.field2998 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -574,18 +535,18 @@ public Widget() { this.spellActionName = ""; this.hasListener = false; this.mouseOverRedirect = -1; - this.field3097 = ""; + this.field3124 = ""; this.buttonText = "Ok"; this.itemId = -1; this.itemQuantity = 0; this.modelFrame = 0; this.modelFrameCycle = 0; - this.field2975 = false; - this.field2974 = false; - this.field3043 = -1; - this.field3041 = 0; - this.field3042 = 0; - this.field3040 = 0; + this.field3000 = false; + this.field3002 = false; + this.field3071 = -1; + this.field3068 = 0; + this.field3070 = 0; + this.field3064 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; @@ -595,8 +556,8 @@ public Widget() { @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-122" + descriptor = "(Lul;I)V", + garbageValue = "256698557" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { @@ -731,7 +692,7 @@ void decodeLegacy(Buffer var1) { if (this.buttonType == 2) { this.spellActionName = var1.readStringCp1252NullTerminated(); - this.field3097 = var1.readStringCp1252NullTerminated(); + this.field3124 = var1.readStringCp1252NullTerminated(); var4 = var1.readUnsignedShort() & 63; this.flags |= var4 << 11; } @@ -767,10 +728,10 @@ void decodeLegacy(Buffer var1) { } - @ObfuscatedName("ai") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "-1617832353" + descriptor = "(Lul;I)V", + garbageValue = "1307379688" ) @Export("decode") void decode(Buffer var1) { @@ -868,7 +829,7 @@ void decode(Buffer var1) { if (this.type == 9) { this.lineWid = var1.readUnsignedByte(); this.color = var1.readInt(); - this.field2962 = var1.readUnsignedByte() == 1; + this.field2989 = var1.readUnsignedByte() == 1; } this.flags = var1.readMedium(); @@ -909,10 +870,19 @@ void decode(Buffer var1) { this.statTransmitTriggers = this.readListenerTriggers(var1); } - @ObfuscatedName("az") + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Lul;I)V", + garbageValue = "-474340220" + ) + void method1847(Buffer var1) { + this.field2983 = var1.readStringCp1252NullTerminated(); + } + + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ltm;I)[Ljava/lang/Object;", - garbageValue = "-631733803" + descriptor = "(Lul;I)[Ljava/lang/Object;", + garbageValue = "1937096505" ) @Export("readListener") Object[] readListener(Buffer var1) { @@ -936,10 +906,10 @@ Object[] readListener(Buffer var1) { } } - @ObfuscatedName("ap") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltm;I)[I", - garbageValue = "132481992" + descriptor = "(Lul;I)[I", + garbageValue = "-1309902668" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { @@ -957,107 +927,107 @@ int[] readListenerTriggers(Buffer var1) { } } - @ObfuscatedName("aa") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(ZLev;I)Lui;", - garbageValue = "1752459087" + descriptor = "(Lnt;ZLen;B)Lud;", + garbageValue = "-70" ) @Export("getSprite") - public SpritePixels getSprite(boolean var1, UrlRequester var2) { - field2945 = false; - if (this.field3091 != null) { - SpritePixels var3 = this.method1818(var2); - if (var3 != null) { - return var3; + public SpritePixels getSprite(WidgetDefinition var1, boolean var2, UrlRequester var3) { + field2978 = false; + if (this.field3119 != null) { + SpritePixels var4 = this.method1851(var1, var3); + if (var4 != null) { + return var4; } } - int var7; - if (var1) { - var7 = this.spriteId; + int var8; + if (var2) { + var8 = this.spriteId; } else { - var7 = this.spriteId2; + var8 = this.spriteId2; } - if (var7 == -1) { + if (var8 == -1) { return null; } else { - long var4 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var7 + ((this.spriteFlipH ? 1L : 0L) << 39); - SpritePixels var6 = (SpritePixels)Widget_cachedSprites.get(var4); - if (var6 != null) { - return var6; + long var5 = (long)var8 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); + SpritePixels var7 = (SpritePixels)var1.Widget_cachedSprites.get(var5); + if (var7 != null) { + return var7; } else { - var6 = Tiles.SpriteBuffer_getSprite(Language.Widget_spritesArchive, var7, 0); - if (var6 == null) { - field2945 = true; + var7 = class47.SpriteBuffer_getSprite(var1.field2919, var8, 0); + if (var7 == null) { + field2978 = true; return null; } else { - this.method1821(var6); - Widget_cachedSprites.put(var6, var4); - return var6; + this.method1854(var7); + var1.Widget_cachedSprites.put(var7, var5); + return var7; } } } } - @ObfuscatedName("af") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lev;B)Lui;", - garbageValue = "24" + descriptor = "(Lnt;Len;I)Lud;", + garbageValue = "19328064" ) - SpritePixels method1818(UrlRequester var1) { - if (!this.method1820()) { - return this.method1819(var1); + SpritePixels method1851(WidgetDefinition var1, UrlRequester var2) { + if (!this.method1853()) { + return this.method1852(var1, var2); } else { - String var2 = this.field3091 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; - SpritePixels var3 = (SpritePixels)field2951.method2180(var2); - if (var3 == null) { - SpritePixels var4 = this.method1819(var1); - if (var4 != null) { - var3 = var4.method2657(); - this.method1821(var3); - field2951.method2181(var2, var3); + String var3 = this.field3119 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; + SpritePixels var4 = (SpritePixels)var1.field2921.method2216(var3); + if (var4 == null) { + SpritePixels var5 = this.method1852(var1, var2); + if (var5 != null) { + var4 = var5.method2696(); + this.method1854(var4); + var1.field2921.method2217(var3, var4); } } - return var3; + return var4; } } - @ObfuscatedName("ad") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lev;I)Lui;", - garbageValue = "-853434695" + descriptor = "(Lnt;Len;S)Lud;", + garbageValue = "9140" ) - SpritePixels method1819(UrlRequester var1) { - if (this.field3091 != null && var1 != null) { - class326 var2 = (class326)field2950.method2180(this.field3091); - if (var2 == null) { - var2 = new class326(this.field3091, var1); - field2950.method2181(this.field3091, var2); + SpritePixels method1852(WidgetDefinition var1, UrlRequester var2) { + if (this.field3119 != null && var2 != null) { + class341 var3 = (class341)var1.field2920.method2216(this.field3119); + if (var3 == null) { + var3 = new class341(this.field3119, var2); + var1.field2920.method2217(this.field3119, var3); } - return var2.method1715(); + return var3.method1747(); } else { return null; } } - @ObfuscatedName("aq") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-32" + descriptor = "(I)Z", + garbageValue = "1213670035" ) - boolean method1820() { + boolean method1853() { return this.spriteFlipV || this.spriteFlipH || this.outline != 0 || this.spriteShadow != 0; } - @ObfuscatedName("al") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lui;B)V", - garbageValue = "-60" + descriptor = "(Lud;B)V", + garbageValue = "12" ) - void method1821(SpritePixels var1) { + void method1854(SpritePixels var1) { if (this.spriteFlipV) { var1.flipVertically(); } @@ -1084,180 +1054,198 @@ void method1821(SpritePixels var1) { } - @ObfuscatedName("an") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)Lpi;", - garbageValue = "1973823248" + descriptor = "(Lnt;I)Lpu;", + garbageValue = "-729897431" ) @Export("getFont") - public Font getFont() { - field2945 = false; + public Font getFont(WidgetDefinition var1) { + field2978 = false; if (this.fontId == -1) { return null; } else { - Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); - if (var1 != null) { - return var1; + Font var2 = (Font)var1.Widget_cachedFonts.get((long)this.fontId); + if (var2 != null) { + return var2; } else { - var1 = LoginPacket.method1613(Language.Widget_spritesArchive, class155.Widget_fontsArchive, this.fontId, 0); - if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); + AbstractArchive var4 = var1.field2919; + AbstractArchive var5 = var1.field2918; + int var6 = this.fontId; + Font var3; + if (!class164.method862(var4, var6, 0)) { + var3 = null; + } else { + byte[] var8 = var5.takeFile(var6, 0); + Font var7; + if (var8 == null) { + var7 = null; + } else { + Font var9 = new Font(var8, class326.SpriteBuffer_xOffsets, ModelData0.SpriteBuffer_yOffsets, class59.SpriteBuffer_spriteWidths, class544.SpriteBuffer_spriteHeights, class372.SpriteBuffer_spritePalette, AddRequestTask.SpriteBuffer_pixels); + class407.method2062(); + var7 = var9; + } + + var3 = var7; + } + + if (var3 != null) { + var1.Widget_cachedFonts.put(var3, (long)this.fontId); } else { - field2945 = true; + field2978 = true; } - return var1; + return var3; } } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lib;IZLmt;Lhw;Lhq;B)Ljr;", - garbageValue = "-43" + descriptor = "(Lnt;Lif;IZLni;Lhw;Lhe;B)Ljn;", + garbageValue = "-104" ) - @Export("getModel") - public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4, NPCComposition var5, NewShit var6) { - field2945 = false; - int var7; + @Export("getModel" ) + public Model getModel(WidgetDefinition var1, SequenceDefinition var2, int var3, boolean var4, PlayerComposition var5, NPCComposition var6, NewShit var7) { + field2978 = false; int var8; - if (var3) { - var7 = this.modelType2; - var8 = this.modelId2; + int var9; + if (var4) { + var8 = this.modelType2; + var9 = this.modelId2; } else { - var7 = this.modelType; - var8 = this.modelId; + var8 = this.modelType; + var9 = this.modelId; } - if (var7 == 6) { - if (var5 == null) { + if (var8 == 6) { + if (var6 == null) { return null; } - var8 = var5.id; + var9 = var6.id; } - if (var7 == 0) { + if (var8 == 0) { return null; - } else if (var7 == 1 && var8 == -1) { + } else if (var8 == 1 && var9 == -1) { return null; } else { - if (var6 != null && var6.field1581 && var7 == 6) { - var7 = 3; + if (var7 != null && var7.field1593 && var8 == 6) { + var8 = 3; } - long var9 = (long)(var8 + (var7 << 16)); - if (var6 != null) { - var9 |= var6.field1582 << 20; + long var10 = (long)(var9 + (var8 << 16)); + if (var7 != null) { + var10 |= var7.field1594 << 20; } - Model var11 = (Model)Widget_cachedModels.get(var9); - if (var11 == null) { - ModelData var12 = null; - int var13 = 64; - int var14 = 768; - switch(var7) { + Model var12 = (Model)var1.Widget_cachedModels.get(var10); + if (var12 == null) { + ModelData var13 = null; + int var14 = 64; + int var15 = 768; + switch(var8) { case 1: - var12 = ModelData.ModelData_get(class47.field226, var8, 0); + var13 = ModelData.ModelData_get(var1.field2916, var9, 0); break; case 2: - var12 = class90.getNpcDefinition(var8).method986((NewShit)null); + var13 = class190.getNpcDefinition(var9).method1012((NewShit)null); break; case 3: - var12 = var4 != null ? var4.getModelData() : null; + var13 = var5 != null ? var5.getModelData() : null; break; case 4: - ItemComposition var15 = InvDefinition.ItemDefinition_get(var8); - var12 = var15.getModelData(10); - var13 += var15.field1812; - var14 += var15.field1809; + ItemComposition var16 = class214.ItemDefinition_get(var9); + var13 = var16.getModelData(10); + var14 += var16.field1811; + var15 += var16.field1812; case 5: default: break; case 6: - var12 = class90.getNpcDefinition(var8).method986(var6); + var13 = class190.getNpcDefinition(var9).method1012(var7); } - if (var12 == null) { - field2945 = true; + if (var13 == null) { + field2978 = true; return null; } - var11 = var12.toModel(var13, var14, -50, -10, -50); - Widget_cachedModels.put(var11, var9); + var12 = var13.toModel(var14, var15, -50, -10, -50); + var1.Widget_cachedModels.put(var12, var10); } - if (var1 != null) { - var11 = var1.transformWidgetModel(var11, var2); + if (var2 != null) { + var12 = var2.transformWidgetModel(var12, var3); } - return var11; + return var12; } } - @ObfuscatedName("ab") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ZI)Lme;", - garbageValue = "1022020243" + descriptor = "(Lnt;ZI)Lmp;", + garbageValue = "1153974487" ) - @Export("getSpriteMask") - public SpriteMask getSpriteMask(boolean var1) { + public SpriteMask method1857(WidgetDefinition var1, boolean var2) { if (this.spriteId == -1) { - var1 = false; + var2 = false; } - int var2 = var1 ? this.spriteId * -329704335 * -243850095 : this.spriteId2 * 1694560891 * -1390207821; - if (var2 == -1) { + int var3 = var2 ? this.spriteId * -1637135593 * -742351705 : this.spriteId2 * 1406466773 * -514691459; + if (var3 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); - SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); - if (var5 != null) { - return var5; + long var4 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var3 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); + SpriteMask var6 = (SpriteMask)var1.Widget_cachedSpriteMasks.get(var4); + if (var6 != null) { + return var6; } else { - SpritePixels var6 = this.getSprite(var1, (UrlRequester)null); - if (var6 == null) { + SpritePixels var7 = this.getSprite(var1, var2, (UrlRequester)null); + if (var7 == null) { return null; } else { - SpritePixels var7 = var6.copyNormalized(); - int[] var8 = new int[var7.subHeight]; - int[] var9 = new int[var7.subHeight]; - - for (int var10 = 0; var10 < var7.subHeight; ++var10) { - int var11 = 0; - int var12 = var7.subWidth; - - int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { - var11 = var13; + SpritePixels var8 = var7.copyNormalized(); + int[] var9 = new int[var8.subHeight]; + int[] var10 = new int[var8.subHeight]; + + for (int var11 = 0; var11 < var8.subHeight; ++var11) { + int var12 = 0; + int var13 = var8.subWidth; + + int var14; + for (var14 = 0; var14 < var8.subWidth; ++var14) { + if (var8.pixels[var14 + var11 * var8.subWidth] == 0) { + var12 = var14; break; } } - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { - var12 = var13 + 1; + for (var14 = var8.subWidth - 1; var14 >= var12; --var14) { + if (var8.pixels[var14 + var11 * var8.subWidth] == 0) { + var13 = var14 + 1; break; } } - var8[var10] = var11; - var9[var10] = var12 - var11; + var9[var11] = var12; + var10[var11] = var13 - var12; } - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); - Widget_cachedSpriteMasks.put(var5, var3); - return var5; + var6 = new SpriteMask(var8.subWidth, var8.subHeight, var10, var9, var3); + var1.Widget_cachedSpriteMasks.put(var6, var4); + return var6; } } } } - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-1578890937" + garbageValue = "-1879897053" ) @Export("setAction") public void setAction(int var1, String var2) { @@ -1275,177 +1263,177 @@ public void setAction(int var1, String var2) { this.actions[var1] = var2; } - @ObfuscatedName("ax") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "10" + descriptor = "(I)Z", + garbageValue = "1501160732" ) - public boolean method1826() { + public boolean method1859() { return !this.isIf3 || this.type == 0 || this.type == 11 || this.hasListener || this.contentType == 1338 || this.type == 12; } - @ObfuscatedName("ah") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "13293" + descriptor = "(I)Z", + garbageValue = "-1474529826" ) - public boolean method1827() { + public boolean method1860() { return this.type == 11 || this.type == 12; } - @ObfuscatedName("as") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lev;J)V" + descriptor = "(Ljava/lang/String;Len;J)V" ) - public void method1828(String var1, UrlRequester var2, long var3) { + public void method1861(String var1, UrlRequester var2, long var3) { if (this.type == 11 && var3 != -1L) { var1 = var1.replaceAll("%userid%", Long.toString(var3)); - this.field2952 = new class170(); - if (!this.field2952.method881(var1, var2)) { - this.field2952 = null; + this.field2979 = new class172(); + if (!this.field2979.method887(var1, var2)) { + this.field2979 = null; } else { - if (this.field2956 == null || this.field2957 == null) { - this.method1830(); + if (this.field2984 == null || this.field2985 == null) { + this.method1863(); } } } } - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lev;I)V", - garbageValue = "1047552277" + descriptor = "(Ljava/lang/String;Len;I)V", + garbageValue = "2097031968" ) - public void method1829(String var1, UrlRequester var2) { + public void method1862(String var1, UrlRequester var2) { if (this.type == 11 && var1 != null) { - this.field2952 = new class170(); - this.field2952.method899(var1, var2); + this.field2979 = new class172(); + this.field2979.method907(var1, var2); } } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-11260" + descriptor = "(I)V", + garbageValue = "-296601660" ) - void method1830() { - this.field2956 = new HashMap(); - this.field2957 = new HashMap(); + void method1863() { + this.field2984 = new HashMap(); + this.field2985 = new HashMap(); } - @ObfuscatedName("av") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1873888023" + garbageValue = "-652704759" ) - public void method1831(int var1, int var2) { + public void method1864(int var1, int var2) { if (this.type == 11) { - if (this.field2956 == null) { - this.method1830(); + if (this.field2984 == null) { + this.method1863(); } - this.field2956.put(var1, var2); + this.field2984.put(var1, var2); } } @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;II)V", - garbageValue = "1531233902" + garbageValue = "-304469184" ) - public void method1832(String var1, int var2) { + public void method1865(String var1, int var2) { if (this.type == 11) { - if (this.field2957 == null) { - this.method1830(); + if (this.field2985 == null) { + this.method1863(); } - this.field2957.put(var1, var2); + this.field2985.put(var1, var2); } } - @ObfuscatedName("ak") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(IIIII)Z", - garbageValue = "182136505" + garbageValue = "-282270797" ) - public boolean method1833(int var1, int var2, int var3, int var4) { - if (this.type == 11 && this.field2952 != null && this.method1834()) { + public boolean method1866(int var1, int var2, int var3, int var4) { + if (this.type == 11 && this.field2979 != null && this.method1867()) { var1 -= var3; var2 -= var4; - int var5 = (int)(this.field2952.method889()[0] * (float)this.width); - int var6 = (int)(this.field2952.method889()[1] * (float)this.height); - int var7 = var5 + (int)(this.field2952.method889()[2] * (float)this.width); - int var8 = var6 + (int)(this.field2952.method889()[3] * (float)this.height); + int var5 = (int)(this.field2979.method897()[0] * (float)this.width); + int var6 = (int)(this.field2979.method897()[1] * (float)this.height); + int var7 = var5 + (int)(this.field2979.method897()[2] * (float)this.width); + int var8 = var6 + (int)(this.field2979.method897()[3] * (float)this.height); return var1 >= var5 && var2 >= var6 && var1 < var7 && var2 < var8; } else { return false; } } - @ObfuscatedName("bh") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1140949643" + garbageValue = "-1033886288" ) - public boolean method1834() { - return this.field2955 == 2; + public boolean method1867() { + return this.field2982 == 2; } - @ObfuscatedName("bj") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-2121469782" + garbageValue = "2104948044" ) - public int method1835(String var1) { - return this.type == 11 && this.field2952 != null && this.method1834() ? this.field2952.method884(var1) : -1; + public int method1868(String var1) { + return this.type == 11 && this.field2979 != null && this.method1867() ? this.field2979.method891(var1) : -1; } - @ObfuscatedName("bk") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1095190564" + garbageValue = "-1855282224" ) - public String method1836(String var1) { - return this.type == 11 && this.field2952 != null && this.method1834() ? this.field2952.method885(var1) : null; + public String method1869(String var1) { + return this.type == 11 && this.field2979 != null && this.method1867() ? this.field2979.method892(var1) : null; } - @ObfuscatedName("bv") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "44" + descriptor = "(I)I", + garbageValue = "-1779226653" ) - public int method1837() { - return this.field2957 != null && this.field2957.size() > 0 ? 1 : 0; + public int method1870() { + return this.field2985 != null && this.field2985.size() > 0 ? 1 : 0; } - @ObfuscatedName("bt") + @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "47" + garbageValue = "1" ) - public int method1838() { - if (this.type == 11 && this.field2952 != null && this.field2957 != null && !this.field2957.isEmpty()) { - String var1 = this.field2952.method888(); - return var1 != null && this.field2957.containsKey(this.field2952.method888()) ? (Integer)this.field2957.get(var1) : -1; + public int method1871() { + if (this.type == 11 && this.field2979 != null && this.field2985 != null && !this.field2985.isEmpty()) { + String var1 = this.field2979.method896(); + return var1 != null && this.field2985.containsKey(this.field2979.method896()) ? (Integer)this.field2985.get(var1) : -1; } else { return -1; } } - @ObfuscatedName("bd") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "11076" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-80" ) - public String method1839() { - if (this.type == 11 && this.field2952 != null) { - String var1 = this.field2952.method888(); - Iterator var2 = this.field2952.method890().iterator(); + public String method1872() { + if (this.type == 11 && this.field2979 != null) { + String var1 = this.field2979.method896(); + Iterator var2 = this.field2979.method898().iterator(); while (var2.hasNext()) { - class181 var3 = (class181)var2.next(); - String var4 = String.format("%%%S%%", var3.method925()); + class183 var3 = (class183)var2.next(); + String var4 = String.format("%%%S%%", var3.method940()); if (var3.vmethod3379() == 0) { var1.replaceAll(var4, Integer.toString(var3.vmethod3378())); } else { @@ -1462,17 +1450,17 @@ public String method1839() { @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "-2142205826" + garbageValue = "1962423370" ) - public int[] method1840() { - if (this.type == 11 && this.field2952 != null) { + public int[] method1873() { + if (this.type == 11 && this.field2979 != null) { int[] var1 = new int[3]; int var2 = 0; - Iterator var3 = this.field2952.method890().iterator(); + Iterator var3 = this.field2979.method898().iterator(); while (var3.hasNext()) { - class181 var4 = (class181)var3.next(); - if (!var4.method925().equals("user_id")) { + class183 var4 = (class183)var3.next(); + if (!var4.method940().equals("user_id")) { if (var4.vmethod3379() != 0) { return null; } @@ -1490,22 +1478,22 @@ public int[] method1840() { } } - @ObfuscatedName("bs") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(Lev;B)Z", - garbageValue = "84" + descriptor = "(Lnt;Len;I)Z", + garbageValue = "-1209602899" ) - public boolean method1841(UrlRequester var1) { - if (this.type == 11 && this.field2952 != null) { - this.field2952.method882(var1); - if (this.field2952.method883() != this.field2955) { - this.field2955 = this.field2952.method883(); - if (this.field2955 >= 100) { + public boolean method1874(WidgetDefinition var1, UrlRequester var2) { + if (this.type == 11 && this.field2979 != null) { + this.field2979.method888(var2); + if (this.field2979.method890() != this.field2982) { + this.field2982 = this.field2979.method890(); + if (this.field2982 >= 100) { return true; } - if (this.field2955 == 2) { - this.method1842(); + if (this.field2982 == 2) { + this.method1875(var1); return true; } } @@ -1516,186 +1504,234 @@ public boolean method1841(UrlRequester var1) { } } - @ObfuscatedName("bm") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "757418391" + descriptor = "(Lnt;I)V", + garbageValue = "2132169674" ) - void method1842() { + void method1875(WidgetDefinition var1) { this.noClickThrough = true; - ArrayList var1 = this.field2952.method886(); - ArrayList var2 = this.field2952.method887(); - int var3 = var1.size() + var2.size(); - this.children = new Widget[var3]; - int var4 = 0; - - Iterator var5; - float[] var9; - Widget var10; - for (var5 = var1.iterator(); var5.hasNext(); this.children[var4++] = var10) { - class176 var6 = (class176)var5.next(); - var9 = var6.field1470; - var10 = new Widget(); - var10.type = 5; - var10.parentId = this.id; - var10.childIndex = var4; - var10.isIf3 = true; - var10.xAlignment = 0; - var10.yAlignment = 0; - var10.widthAlignment = 0; - var10.heightAlignment = 0; - var10.rawX = (int)(var9[0] * (float)this.width); - var10.rawY = (int)(var9[1] * (float)this.height); - var10.rawWidth = (int)(var9[2] * (float)this.width); - var10.rawHeight = (int)((float)this.height * var9[3]); - var10.field3091 = var6.field1469.method667(); - class326 var11 = new class326(var6.field1469); - field2950.method2181(var10.field3091, var11); + ArrayList var2 = this.field2979.method893(); + ArrayList var3 = this.field2979.method894(); + int var4 = var2.size() + var3.size(); + this.children = new Widget[var4]; + int var5 = 0; + + Iterator var6; + Widget var8; + for (var6 = var2.iterator(); var6.hasNext(); this.children[var5++] = var8) { + class178 var7 = (class178)var6.next(); + var8 = ViewportMouse.method1390(5, this, var5, 0, 0, 0, 0, var7.field1461); + var8.field3119 = var7.field1460.method663(); + class341 var9 = new class341(var7.field1460); + var1.field2920.method2217(var8.field3119, var9); } - for (var5 = var2.iterator(); var5.hasNext(); this.children[var4++] = var10) { - class177 var12 = (class177)var5.next(); - var9 = var12.field1472; - var10 = new Widget(); - var10.type = 4; - var10.parentId = this.id; - var10.childIndex = var4; - var10.isIf3 = true; - var10.xAlignment = 0; - var10.yAlignment = 0; - var10.widthAlignment = 0; - var10.heightAlignment = 0; - var10.rawX = (int)(var9[0] * (float)this.width); - var10.rawY = (int)(var9[1] * (float)this.height); - var10.rawWidth = (int)((float)this.width * var9[2]); - var10.rawHeight = (int)(var9[3] * (float)this.height); - var10.text = var12.field1476; - var10.fontId = (Integer)this.field2956.get(var12.field1474); - var10.textXAlignment = var12.field1473; - var10.textYAlignment = var12.field1475; + for (var6 = var3.iterator(); var6.hasNext(); this.children[var5++] = var8) { + class179 var10 = (class179)var6.next(); + var8 = ViewportMouse.method1390(4, this, var5, 0, 0, 0, 0, var10.field1462); + var8.text = var10.field1466; + var8.fontId = (Integer)this.field2984.get(var10.field1463); + var8.textXAlignment = var10.field1464; + var8.textYAlignment = var10.field1465; } } - @ObfuscatedName("bf") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-109" + descriptor = "(I)V", + garbageValue = "101274851" ) - public void method1843() { - this.field2958 = new class327(); + public void method1876() { + this.field2986 = new class342(); for (int var1 = 1; var1 <= 12; ++var1) { - this.field2958.field2896.method96(var1, 0); + this.field2986.field2930.method102(var1, 0); } for (char var2 = 0; var2 < ' '; ++var2) { - this.field2958.field2896.method97(var2, 0); + this.field2986.field2930.method104(var2, 0); } - this.field2958.field2896.method97('\u0080', 0); - this.field2958.field2896.method96(82, 2); - this.field2958.field2896.method96(81, 2); - this.field2958.field2896.method96(86, 2); + this.field2986.field2930.method104('\u0080', 0); + this.field2986.field2930.method102(82, 2); + this.field2986.field2930.method102(81, 2); + this.field2986.field2930.method102(86, 2); } - @ObfuscatedName("bq") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(B)Lmb;", - garbageValue = "-14" + descriptor = "(B)Lnz;", + garbageValue = "5" ) - public class329 method1844() { - return this.field2958 != null ? this.field2958.field2902 : null; + public class344 method1877() { + return this.field2986 != null ? this.field2986.field2936 : null; } - @ObfuscatedName("ba") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(B)Lml;", - garbageValue = "25" + descriptor = "(S)Lnx;", + garbageValue = "4477" ) - public class324 method1845() { - return this.field2958 != null ? this.field2958.field2897 : null; + public class339 method1878() { + return this.field2986 != null ? this.field2986.field2931 : null; } - @ObfuscatedName("bl") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(I)Lbj;", - garbageValue = "1077698230" + descriptor = "(I)Lbk;", + garbageValue = "-1397060242" ) - public class27 method1846() { - return this.field2958 != null ? this.field2958.field2896 : null; + public class27 method1879() { + return this.field2986 != null ? this.field2986.field2930 : null; } @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(I)Lmp;", - garbageValue = "-1932900136" + descriptor = "(I)Lno;", + garbageValue = "-280848154" ) - public class327 method1847() { - return this.field2958; + public class342 method1880() { + return this.field2986; } - @ObfuscatedName("bu") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Lmb;B)Z", - garbageValue = "1" + descriptor = "(Lnz;I)Z", + garbageValue = "2067973032" ) - boolean method1848(class329 var1) { + boolean method1881(class344 var1) { boolean var2 = false; + String var5; + String var6; + StringBuilder var7; + int var8; + int var9; + int var10; + char var11; + String var12; if (this.text != null && !this.text.isEmpty()) { - var2 |= var1.method1733(class157.method832(this.text)); + var6 = this.text; + var7 = new StringBuilder(var6.length()); + var8 = 0; + var9 = -1; + + for (var10 = 0; var10 < var6.length(); ++var10) { + var11 = var6.charAt(var10); + if (var11 == '<') { + var7.append(var6.substring(var8, var10)); + var9 = var10; + } else if (var11 == '>' && var9 != -1) { + var12 = var6.substring(var9 + 1, var10); + var9 = -1; + if (var12.equals("lt")) { + var7.append("<"); + } else if (var12.equals("gt")) { + var7.append(">"); + } else if (var12.equals("br")) { + var7.append("\n"); + } + + var8 = var10 + 1; + } + } + + if (var8 < var6.length()) { + var7.append(var6.substring(var8, var6.length())); + } + + var5 = var7.toString(); + var2 |= var1.method1765(var5); this.text = ""; } if (this.text2 != null && !this.text2.isEmpty()) { - var2 |= var1.method1734(class157.method832(this.text2)); + var6 = this.text2; + var7 = new StringBuilder(var6.length()); + var8 = 0; + var9 = -1; + + for (var10 = 0; var10 < var6.length(); ++var10) { + var11 = var6.charAt(var10); + if (var11 == '<') { + var7.append(var6.substring(var8, var10)); + var9 = var10; + } else if (var11 == '>' && var9 != -1) { + var12 = var6.substring(var9 + 1, var10); + var9 = -1; + if (var12.equals("lt")) { + var7.append("<"); + } else if (var12.equals("gt")) { + var7.append(">"); + } else if (var12.equals("br")) { + var7.append("\n"); + } + + var8 = var10 + 1; + } + } + + if (var8 < var6.length()) { + var7.append(var6.substring(var8, var6.length())); + } + + var5 = var7.toString(); + var2 |= var1.method1766(var5); this.text2 = ""; } return var2; } - @ObfuscatedName("bo") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1006338343" + descriptor = "(Lnt;I)Z", + garbageValue = "-636872431" ) - public boolean method1849() { - class329 var1 = this.method1844(); - if (var1 == null) { + public boolean method1882(WidgetDefinition var1) { + class344 var2 = this.method1877(); + if (var2 == null) { return false; } else { - boolean var2 = false; - if (!var1.method1787() && this.fontId != -1) { - int var3 = var1.method1788(); - int var4 = var1.method1789(); - int var5 = var1.method1786(); - int var6 = var1.method1785(); - Font var7 = this.getFont(); - if (var7 != null) { - var2 |= var1.method1735(var7); - var2 |= this.method1848(var1); - var2 |= var1.method1740(var3, var4); - var2 |= var1.method1755(var5, var6); + boolean var3 = false; + if (!var2.method1819() && this.fontId != -1) { + int var4 = var2.method1820(); + int var5 = var2.method1821(); + int var6 = var2.method1818(); + int var7 = var2.method1817(); + Font var8 = this.getFont(var1); + if (var8 != null) { + var3 |= var2.method1767(var8); + var3 |= this.method1881(var2); + var3 |= var2.method1772(var4, var5); + var3 |= var2.method1787(var6, var7); } - } else if (var1.method1787()) { - var2 |= this.method1848(var1); + } else if (var2.method1819()) { + var3 |= this.method1881(var2); } - var1.method1730(); - return var2; + var2.method1762(); + return var3; } } - @ObfuscatedName("ac") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1138526298" + descriptor = "(B)Lun;", + garbageValue = "5" ) - public static int method1812(int var0, int var1, int var2) { - int var3 = Projectile.method430(var2 - var1 + 1); - var3 <<= var1; - var0 |= var3; + static IndexedSprite method1844() { + IndexedSprite var0 = new IndexedSprite(); + var0.width = class159.SpriteBuffer_spriteWidth; + var0.height = class500.SpriteBuffer_spriteHeight; + var0.xOffset = class326.SpriteBuffer_xOffsets[0]; + var0.yOffset = ModelData0.SpriteBuffer_yOffsets[0]; + var0.subWidth = class59.SpriteBuffer_spriteWidths[0]; + var0.subHeight = class544.SpriteBuffer_spriteHeights[0]; + var0.palette = class372.SpriteBuffer_spritePalette; + var0.pixels = AddRequestTask.SpriteBuffer_pixels[0]; + class407.method2062(); return var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/WidgetDefinition.java b/osrs/src/main/java/WidgetDefinition.java new file mode 100644 index 000000000..c010243b3 --- /dev/null +++ b/osrs/src/main/java/WidgetDefinition.java @@ -0,0 +1,245 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.HashMap; +import java.util.Map; + +@ObfuscatedName("nt") +public class WidgetDefinition { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("widgetArchive") + AbstractArchive widgetArchive; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + AbstractArchive field2917; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + AbstractArchive field2916; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + AbstractArchive field2919; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + AbstractArchive field2918; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "[[Lnm;" + ) + public Widget[][] Widget_interfaceComponents; + @ObfuscatedName("ab") + Map field2910; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + @Export("Widget_cachedSprites") + EvictingDualNodeHashTable Widget_cachedSprites; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + @Export("Widget_cachedModels") + EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + @Export("Widget_cachedFonts") + EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + @Export("Widget_cachedSpriteMasks") + EvictingDualNodeHashTable Widget_cachedSpriteMasks; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lqe;" + ) + class438 field2920; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lqe;" + ) + class438 field2921; + + @ObfuscatedSignature( + descriptor = "(Lom;Lom;Lom;Lom;Lom;)V" + ) + public WidgetDefinition(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, AbstractArchive var4, AbstractArchive var5) { + this.field2910 = new HashMap(); + this.Widget_cachedSprites = new EvictingDualNodeHashTable(200); + this.Widget_cachedModels = new EvictingDualNodeHashTable(50); + this.Widget_cachedFonts = new EvictingDualNodeHashTable(20); + this.Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); + this.field2920 = new class438(10, class436.field3797); + this.field2921 = new class438(10, class436.field3797); + int var6 = 0; + if (var1 != null) { + this.widgetArchive = var1; + this.field2916 = var2; + this.field2919 = var3; + this.field2918 = var4; + this.field2917 = var5; + var6 = this.widgetArchive.getGroupCount(); + } + + this.Widget_interfaceComponents = new Widget[var6][]; + AbstractUserComparator.field3833 = new boolean[var6]; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)Lnm;", + garbageValue = "-836235004" + ) + public Widget method1740(int var1) { + int var2 = var1 >> 16; + int var3 = var1 & 65535; + if (this.Widget_interfaceComponents[var2] == null || this.Widget_interfaceComponents[var2][var3] == null) { + boolean var4 = this.method1742(var2); + if (!var4) { + return null; + } + } + + return this.Widget_interfaceComponents[var2][var3]; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(III)Lnm;", + garbageValue = "-1175209184" + ) + @Export("getWidgetChild") + public Widget getWidgetChild(int var1, int var2) { + Widget var3 = this.method1740(var1); + if (var2 == -1) { + return var3; + } else { + return var3 != null && var3.children != null && var2 < var3.children.length ? var3.children[var2] : null; + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "-8971" + ) + public boolean method1742(int var1) { + if (AbstractUserComparator.field3833[var1]) { + return true; + } else if (!this.widgetArchive.tryLoadGroup(var1)) { + return false; + } else { + int var2 = this.widgetArchive.getGroupFileCount(var1); + if (var2 == 0) { + AbstractUserComparator.field3833[var1] = true; + return true; + } else { + if (this.Widget_interfaceComponents[var1] == null) { + this.Widget_interfaceComponents[var1] = new Widget[var2]; + } + + for (int var3 = 0; var3 < var2; ++var3) { + if (this.Widget_interfaceComponents[var1][var3] == null) { + byte[] var4 = this.widgetArchive.takeFile(var1, var3); + if (var4 != null) { + this.Widget_interfaceComponents[var1][var3] = new Widget(); + this.Widget_interfaceComponents[var1][var3].id = var3 + (var1 << 16); + if (var4[0] == -1) { + this.Widget_interfaceComponents[var1][var3].decode(new Buffer(var4)); + } else { + this.Widget_interfaceComponents[var1][var3].decodeLegacy(new Buffer(var4)); + } + + if (this.field2917 != null) { + byte[] var5 = this.field2917.takeFile(var1, var3); + if (var5 != null && var5.length > 0) { + this.Widget_interfaceComponents[var1][var3].method1847(new Buffer(var5)); + this.field2910.put(this.Widget_interfaceComponents[var1][var3].field2983, var1); + } + } + } + } + } + + AbstractUserComparator.field3833[var1] = true; + return true; + } + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1200843852" + ) + public void method1743(int var1) { + if (var1 != -1) { + if (AbstractUserComparator.field3833[var1]) { + this.widgetArchive.clearFilesGroup(var1); + if (this.Widget_interfaceComponents[var1] != null) { + for (int var2 = 0; var2 < this.Widget_interfaceComponents[var1].length; ++var2) { + if (this.Widget_interfaceComponents[var1][var2] != null) { + this.Widget_interfaceComponents[var1][var2] = null; + } + } + + this.Widget_interfaceComponents[var1] = null; + AbstractUserComparator.field3833[var1] = false; + } + } + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-17" + ) + public void method1744() { + this.Widget_cachedSprites.clear(); + this.Widget_cachedModels.clear(); + this.Widget_cachedFonts.clear(); + this.Widget_cachedSpriteMasks.clear(); + } + + @ObfuscatedName("lr") + @ObfuscatedSignature( + descriptor = "(III)Ljava/lang/String;", + garbageValue = "-1362915838" + ) + static final String method1745(int var0, int var1) { + int var2 = var1 - var0; + if (var2 < -9) { + return Client.colorStartTag(16711680); + } else if (var2 < -6) { + return Client.colorStartTag(16723968); + } else if (var2 < -3) { + return Client.colorStartTag(16740352); + } else if (var2 < 0) { + return Client.colorStartTag(16756736); + } else if (var2 > 9) { + return Client.colorStartTag(65280); + } else if (var2 > 6) { + return Client.colorStartTag(4259584); + } else if (var2 > 3) { + return Client.colorStartTag(8453888); + } else { + return var2 > 0 ? Client.colorStartTag(12648192) : Client.colorStartTag(16776960); + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/World.java b/osrs/src/main/java/World.java index db7b1a548..8c68e09d2 100644 --- a/osrs/src/main/java/World.java +++ b/osrs/src/main/java/World.java @@ -2,45 +2,52 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.js.JSObject; -@ObfuscatedName("ch") +import java.util.Date; + + +@ObfuscatedName("cv") @Implements("World") public class World { - @ObfuscatedName("ai") + @ObfuscatedName("ax") + @Export("Tiles_underlays") + static short[][][] Tiles_underlays; + @ObfuscatedName("ah") @Export("World_count") static int World_count; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("World_listCount") static int World_listCount; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("id") int id; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("properties") int properties; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("population") int population; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("host") String host; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("activity") String activity; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("location") int location; - @ObfuscatedName("ag") + @ObfuscatedName("an") @Export("index") int index; - @ObfuscatedName("am") - String field679; + @ObfuscatedName("au") + String field680; static { World_count = 0; @@ -52,518 +59,135 @@ public class World { World() { } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "2" + descriptor = "(I)Z", + garbageValue = "844978616" ) @Export("isMembersOnly") boolean isMembersOnly() { - return (class510.field4129.rsOrdinal() & this.properties) != 0; + return (class525.field4150.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1342373424" + garbageValue = "-249260285" ) @Export("isDeadman") boolean isDeadman() { - return (class510.field4125.rsOrdinal() & this.properties) != 0; + return (class525.field4156.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1471748283" + garbageValue = "1975874921" ) - boolean method388() { - return (class510.field4124.rsOrdinal() & this.properties) != 0; + boolean method390() { + return (class525.field4154.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-87" + garbageValue = "32" ) @Export("isPvp") boolean isPvp() { - return (class510.field4127.rsOrdinal() & this.properties) != 0; + return (class525.field4153.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1678180347" + descriptor = "(B)Z", + garbageValue = "0" ) - boolean method390() { - return (class510.field4128.rsOrdinal() & this.properties) != 0; + boolean method392() { + return (class525.field4157.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ar") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1233565973" + descriptor = "(B)Z", + garbageValue = "42" ) - boolean method391() { - return (class510.field4132.rsOrdinal() & this.properties) != 0; + boolean method393() { + return (class525.field4158.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "879753429" + garbageValue = "-1488383834" ) @Export("isBeta") boolean isBeta() { - return (class510.field4126.rsOrdinal() & this.properties) != 0; + return (class525.field4151.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ag") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-6" + descriptor = "(I)Z", + garbageValue = "-1132976200" ) - boolean method393() { - return (class510.field4131.rsOrdinal() & this.properties) != 0; + boolean method395() { + return (class525.field4159.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "2" + garbageValue = "-43" ) - boolean method394() { - return (class510.field4122.rsOrdinal() & this.properties) != 0; + boolean method396() { + return (class525.field4155.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "8" + descriptor = "(I)Z", + garbageValue = "165086370" ) - boolean method395() { - return (class510.field4130.rsOrdinal() & this.properties) != 0; + boolean method397() { + return (class525.field4160.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("an") + @ObfuscatedName("ol") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-2141322867" + descriptor = "(Ljava/lang/String;S)V", + garbageValue = "-14910" ) - public static String method385(String var0) { - int var1 = var0.length(); - char[] var2 = new char[var1]; - byte var3 = 2; - - for (int var4 = 0; var4 < var1; ++var4) { - char var5 = var0.charAt(var4); - if (var3 == 0) { - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { - var5 = SceneTilePaint.method1352(var5); - } - - if (Character.isLetter(var5)) { - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { - if (Character.isSpaceChar(var5)) { - if (var3 != 2) { - var3 = 1; - } - } else { - var3 = 1; - } + static void method398(String var0) { + HealthBarDefinition.param9 = var0; + + try { + String var1 = class159.client.getParameter(Integer.toString(18)); + String var2 = class159.client.getParameter(Integer.toString(13)); + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; + String var5; + if (var0.length() == 0) { + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; } else { - var3 = 2; + String var4 = var3 + "; Expires="; + long var6 = GrandExchangeOfferTotalQuantityComparator.method1971() + 94608000000L; + Calendar.Calendar_calendar.setTime(new Date(var6)); + int var8 = Calendar.Calendar_calendar.get(7); + int var9 = Calendar.Calendar_calendar.get(5); + int var10 = Calendar.Calendar_calendar.get(2); + int var11 = Calendar.Calendar_calendar.get(1); + int var12 = Calendar.Calendar_calendar.get(11); + int var13 = Calendar.Calendar_calendar.get(12); + int var14 = Calendar.Calendar_calendar.get(13); + var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; + var3 = var4 + var5 + "; Max-Age=" + 94608000L; } - var2[var4] = var5; + Client var16 = class159.client; + var5 = "document.cookie=\"" + var3 + "\""; + JSObject.getWindow(var16).eval(var5); + } catch (Throwable var15) { } - return new String(var2); - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - descriptor = "(Lls;I)V", - garbageValue = "681545140" - ) - @Export("processZoneOperation") - static final void processZoneOperation(ZoneOperation var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var2; - int var3; - int var4; - int var5; - int var6; - int var7; - if (ZoneOperation.AREA_SOUND == var0) { - var2 = var1.readUnsignedIntIME(); - var3 = var1.readIntIME(); - var4 = var1.readUnsignedByte(); - var5 = (var4 >> 4 & 7) + ObjectSound.field686; - var6 = (var4 & 7) + class125.field1193; - var7 = var1.readUnsignedShortLE(); - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - NodeDeque var41 = Client.groundItems[HealthBar.Client_plane][var5][var6]; - if (var41 != null) { - for (TileItem var9 = (TileItem)var41.last(); var9 != null; var9 = (TileItem)var41.previous()) { - if ((var7 & 32767) == var9.id && var3 == var9.quantity) { - var9.quantity = var2; - break; - } - } - - class135.updateItemPile(var5, var6); - } - } - - } else { - byte var10; - int var12; - int var13; - int var31; - int var32; - if (ZoneOperation.OBJ_ADD == var0) { - var2 = var1.readUnsignedByteAdd(); - var3 = var2 >> 2; - var4 = var2 & 3; - var5 = Client.field653[var3]; - var6 = var1.readUnsignedByteNeg(); - var7 = (var6 >> 4 & 7) + ObjectSound.field686; - var31 = (var6 & 7) + class125.field1193; - var32 = var1.method2587(); - var10 = var1.readByteAdd(); - byte var11 = var1.readByteNeg(); - var12 = var1.readIntME(); - var13 = var1.readIntME(); - byte var14 = var1.readSignedByteSub(); - byte var15 = var1.readByte(); - int var16 = var1.method2587(); - Player var17; - if (var32 == Client.localPlayerIndex) { - var17 = VarbitComposition.localPlayer; - } else { - var17 = Client.players[var32]; - } - - if (var17 != null) { - ObjectComposition var18 = WorldMapElement.getObjectDefinition(var13); - int var19; - int var20; - if (var4 != 1 && var4 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } - - int var21 = var7 + (var19 >> 1); - int var22 = var7 + (var19 + 1 >> 1); - int var23 = var31 + (var20 >> 1); - int var24 = var31 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[HealthBar.Client_plane]; - int var26 = var25[var22][var24] + var25[var21][var24] + var25[var22][var23] + var25[var21][var23] >> 2; - int var27 = (var7 << 7) + (var19 << 6); - int var28 = (var31 << 7) + (var20 << 6); - Model var29 = var18.getModel(var3, var4, var25, var27, var26, var28); - if (var29 != null) { - ClientPreferences.updatePendingSpawn(HealthBar.Client_plane, var7, var31, var5, -1, 0, 0, 31, var12 + 1, var16 + 1); - var17.animationCycleStart = var12 + Client.cycle; - var17.animationCycleEnd = var16 + Client.cycle; - var17.attachedModel = var29; - var17.field909 = var19 * 64 + var7 * 128; - var17.field910 = var20 * 64 + var31 * 128; - var17.baseTileHeight = var26; - byte var30; - if (var14 > var10) { - var30 = var14; - var14 = var10; - var10 = var30; - } - - if (var11 > var15) { - var30 = var11; - var11 = var15; - var15 = var30; - } - - var17.minX = var7 + var14; - var17.maxX = var10 + var7; - var17.minY = var11 + var31; - var17.maxY = var15 + var31; - } - } - } - - if (ZoneOperation.LOC_ANIM == var0) { - var2 = var1.readUnsignedByteNeg(); - var3 = (var2 >> 4 & 7) + ObjectSound.field686; - var4 = (var2 & 7) + class125.field1193; - var5 = var1.readUnsignedShort(); - var6 = var1.readUnsignedByteNeg(); - var7 = var1.readUnsignedShortLE(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - var3 = var3 * 128 + 64; - var4 = var4 * 128 + 64; - GraphicsObject var40 = new GraphicsObject(var7, HealthBar.Client_plane, var3, var4, class18.getTileHeight(var3, var4, HealthBar.Client_plane) - var6, var5, Client.cycle); - Client.graphicsObjects.addFirst(var40); - } - - } else { - int var42; - if (ZoneOperation.MAP_ANIM == var0) { - var2 = var1.readUnsignedByteAdd(); - var3 = var1.readUnsignedByteNeg(); - var4 = var3 >> 2; - var5 = var3 & 3; - var6 = Client.field653[var4]; - var7 = var1.method2587(); - var31 = var1.readUnsignedByteSub(); - var32 = (var31 >> 4 & 7) + ObjectSound.field686; - var42 = (var31 & 7) + class125.field1193; - if (var32 >= 0 && var42 >= 0 && var32 < 104 && var42 < 104) { - ClientPreferences.updatePendingSpawn(HealthBar.Client_plane, var32, var42, var6, var7, var4, var5, var2, 0, -1); - } - - } else { - int var43; - if (ZoneOperation.OBJ_COUNT == var0) { - var2 = var1.readUnsignedByteNeg(); - var3 = var2 >> 2; - var4 = var2 & 3; - var5 = Client.field653[var3]; - var6 = var1.readIntME(); - var7 = var1.readUnsignedByteNeg(); - var31 = (var7 >> 4 & 7) + ObjectSound.field686; - var32 = (var7 & 7) + class125.field1193; - if (var31 >= 0 && var32 >= 0 && var31 < 103 && var32 < 103) { - if (var5 == 0) { - BoundaryObject var33 = class130.scene.method1255(HealthBar.Client_plane, var31, var32); - if (var33 != null) { - var43 = InvDefinition.Entity_unpackID(var33.tag); - if (var3 == 2) { - var33.renderable1 = new DynamicObject(var43, 2, var4 + 4, HealthBar.Client_plane, var31, var32, var6, false, var33.renderable1); - var33.renderable2 = new DynamicObject(var43, 2, var4 + 1 & 3, HealthBar.Client_plane, var31, var32, var6, false, var33.renderable2); - } else { - var33.renderable1 = new DynamicObject(var43, var3, var4, HealthBar.Client_plane, var31, var32, var6, false, var33.renderable1); - } - - return; - } - } - - if (var5 == 1) { - WallDecoration var46 = class130.scene.method1256(HealthBar.Client_plane, var31, var32); - if (var46 != null) { - var43 = InvDefinition.Entity_unpackID(var46.tag); - if (var3 != 4 && var3 != 5) { - if (var3 == 6) { - var46.renderable1 = new DynamicObject(var43, 4, var4 + 4, HealthBar.Client_plane, var31, var32, var6, false, var46.renderable1); - } else if (var3 == 7) { - var46.renderable1 = new DynamicObject(var43, 4, (var4 + 2 & 3) + 4, HealthBar.Client_plane, var31, var32, var6, false, var46.renderable1); - } else if (var3 == 8) { - var46.renderable1 = new DynamicObject(var43, 4, var4 + 4, HealthBar.Client_plane, var31, var32, var6, false, var46.renderable1); - var46.renderable2 = new DynamicObject(var43, 4, (var4 + 2 & 3) + 4, HealthBar.Client_plane, var31, var32, var6, false, var46.renderable2); - } - } else { - var46.renderable1 = new DynamicObject(var43, 4, var4, HealthBar.Client_plane, var31, var32, var6, false, var46.renderable1); - } - - return; - } - } - - if (var5 == 2) { - GameObject var47 = class130.scene.getGameObject(HealthBar.Client_plane, var31, var32); - if (var3 == 11) { - var3 = 10; - } - - if (var47 != null) { - var47.renderable = new DynamicObject(InvDefinition.Entity_unpackID(var47.tag), var3, var4, HealthBar.Client_plane, var31, var32, var6, false, var47.renderable); - return; - } - } - - if (var5 == 3) { - FloorDecoration var48 = class130.scene.getFloorDecoration(HealthBar.Client_plane, var31, var32); - if (var48 != null) { - var48.renderable = new DynamicObject(InvDefinition.Entity_unpackID(var48.tag), 22, var4, HealthBar.Client_plane, var31, var32, var6, false, var48.renderable); - return; - } - } - - class460.method2332(HealthBar.Client_plane, var31, var32, var5, var6); - } - - } else { - TileItem var8; - if (ZoneOperation.OBJ_DEL_LEGACY == var0) { - var1.readUnsignedByteAdd(); - var2 = var1.readUnsignedByteAdd(); - var3 = (var2 >> 4 & 7) + ObjectSound.field686; - var4 = (var2 & 7) + class125.field1193; - var5 = var1.readUnsignedByte(); - var6 = var1.readInt(); - var1.method2587(); - var1.readIntME(); - var1.readUnsignedByteAdd(); - var7 = var1.readUnsignedShort(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - var8 = new TileItem(); - var8.id = var7; - var8.quantity = var6; - var8.method609(var5); - if (Client.groundItems[HealthBar.Client_plane][var3][var4] == null) { - Client.groundItems[HealthBar.Client_plane][var3][var4] = new NodeDeque(); - } - - Client.groundItems[HealthBar.Client_plane][var3][var4].addFirst(var8); - class135.updateItemPile(var3, var4); - } - - } else if (ZoneOperation.LOC_ADD_CHANGE == var0) { - var2 = var1.readUnsignedByte(); - var3 = (var2 >> 4 & 7) + ObjectSound.field686; - var4 = (var2 & 7) + class125.field1193; - var5 = var1.readUnsignedByteNeg(); - var6 = var5 >> 2; - var7 = var5 & 3; - var31 = Client.field653[var6]; - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - ClientPreferences.updatePendingSpawn(HealthBar.Client_plane, var3, var4, var31, -1, var6, var7, 31, 0, -1); - } - - } else { - NodeDeque var34; - if (ZoneOperation.PREFETCH_GAMEOBJECTS == var0) { - var2 = var1.method2587(); - var3 = var1.readUnsignedIntIME(); - var4 = var1.readUnsignedByte(); - var5 = (var4 >> 4 & 7) + ObjectSound.field686; - var6 = (var4 & 7) + class125.field1193; - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var34 = Client.groundItems[HealthBar.Client_plane][var5][var6]; - if (var34 != null) { - for (var8 = (TileItem)var34.last(); var8 != null; var8 = (TileItem)var34.previous()) { - if ((var2 & 32767) == var8.id && var3 == var8.quantity) { - var8.remove(); - break; - } - } - - if (var34.last() == null) { - Client.groundItems[HealthBar.Client_plane][var5][var6] = null; - } - - class135.updateItemPile(var5, var6); - } - } - - } else { - if (ZoneOperation.MAPPROJ_ANIM == var0) { - var2 = var1.readUnsignedByteAdd(); - var3 = (var2 >> 4 & 7) + ObjectSound.field686; - var4 = (var2 & 7) + class125.field1193; - var5 = var1.readUnsignedByteSub(); - var6 = var5 >> 4 & 15; - var7 = var5 & 7; - var31 = var1.readUnsignedByte(); - var32 = var1.method2587(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - var42 = var6 + 1; - if (VarbitComposition.localPlayer.pathX[0] >= var3 - var42 && VarbitComposition.localPlayer.pathX[0] <= var42 + var3 && VarbitComposition.localPlayer.pathY[0] >= var4 - var42 && VarbitComposition.localPlayer.pathY[0] <= var42 + var4 && class449.clientPreferences.getAreaSoundEffectsVolume() != 0 && var7 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var32; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var7; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var31; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var6 + (var4 << 8) + (var3 << 16); - ++Client.soundEffectCount; - } - } - } - - int var44; - if (ZoneOperation.OBJ_DEL == var0) { - var2 = var1.readUnsignedShortLE(); - var3 = var1.readUnsignedShort(); - byte var37 = var1.readSignedByteSub(); - var5 = var1.readUnsignedByteNeg(); - var6 = var1.method2593(); - byte var39 = var1.readByte(); - var31 = var1.readUnsignedByteAdd() * 4; - var32 = var1.readUnsignedByteNeg(); - var42 = var1.readUnsignedByteSub() * 4; - var43 = var1.method2594(); - var12 = var1.readUnsignedByte(); - var13 = (var12 >> 4 & 7) + ObjectSound.field686; - var44 = (var12 & 7) + class125.field1193; - int var45 = var1.method2587(); - var4 = var37 + var13; - var7 = var39 + var44; - if (var13 >= 0 && var44 >= 0 && var13 < 104 && var44 < 104 && var4 >= 0 && var7 >= 0 && var4 < 104 && var7 < 104 && var45 != 65535) { - var13 = var13 * 128 + 64; - var44 = var44 * 128 + 64; - var4 = var4 * 128 + 64; - var7 = var7 * 128 + 64; - Projectile var35 = new Projectile(var45, HealthBar.Client_plane, var13, var44, class18.getTileHeight(var13, var44, HealthBar.Client_plane) - var31, var2 + Client.cycle, var3 + Client.cycle, var5, var32, var43, var6, var42); - var35.setDestination(var4, var7, class18.getTileHeight(var4, var7, HealthBar.Client_plane) - var42, var2 + Client.cycle); - Client.projectiles.addFirst(var35); - } - - } else if (ZoneOperation.LOC_DEL == var0) { - var2 = var1.readIntME(); - var3 = var1.readUnsignedByteAdd(); - var4 = (var3 >> 4 & 7) + ObjectSound.field686; - var5 = (var3 & 7) + class125.field1193; - byte var38 = var1.readSignedByteSub(); - var7 = var1.method2594(); - var31 = var1.readUnsignedByteAdd(); - var32 = var1.method2587(); - var10 = var1.readByteAdd(); - var43 = var1.readUnsignedByteNeg() * 4; - var12 = var1.readUnsignedByteAdd(); - var13 = var1.readUnsignedByteAdd() * 4; - var44 = var1.readUnsignedShort(); - var42 = var10 + var4; - var6 = var38 + var5; - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104 && var42 >= 0 && var6 >= 0 && var42 < 104 && var6 < 104 && var2 != 65535) { - var4 = var4 * 128 + 64; - var5 = var5 * 128 + 64; - var42 = var42 * 128 + 64; - var6 = var6 * 128 + 64; - Projectile var36 = new Projectile(var2, HealthBar.Client_plane, var4, var5, class18.getTileHeight(var4, var5, HealthBar.Client_plane) - var13, var44 + Client.cycle, var32 + Client.cycle, var31, var12, var7, var43); - var36.setDestination(var42, var6, class18.getTileHeight(var42, var6, HealthBar.Client_plane) - var43, var44 + Client.cycle); - Client.projectiles.addFirst(var36); - } - - } else if (ZoneOperation.field2607 == var0) { - var2 = var1.readUnsignedByte(); - var3 = (var2 >> 4 & 7) + ObjectSound.field686; - var4 = (var2 & 7) + class125.field1193; - var5 = var1.readUnsignedByteSub(); - var6 = var1.readIntME(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - var34 = Client.groundItems[HealthBar.Client_plane][var3][var4]; - if (var34 != null) { - for (var8 = (TileItem)var34.last(); var8 != null; var8 = (TileItem)var34.previous()) { - if ((var6 & 32767) == var8.id) { - var8.method609(var5); - break; - } - } - } - } - - } - } - } - } - } - } - } } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMap.java b/osrs/src/main/java/WorldMap.java index 850e1e780..b7e207408 100644 --- a/osrs/src/main/java/WorldMap.java +++ b/osrs/src/main/java/WorldMap.java @@ -5,208 +5,208 @@ import java.util.*; -@ObfuscatedName("si") +@ObfuscatedName("tu") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Ltc;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Ltc;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Ltc;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lpu;" ) @Export("font") Font font; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("fonts") HashMap fonts; - @ObfuscatedName("ar") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "[Luk;" + descriptor = "[Lun;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("details") HashMap details; - @ObfuscatedName("ag") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Lkz;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Lkz;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Lkz;" ) - WorldMapArea field4023; - @ObfuscatedName("ah") + WorldMapArea field4053; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Lkk;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("as") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Ltb;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @Export("centerTileX") int centerTileX; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("centerTileY") int centerTileY; - @ObfuscatedName("av") + @ObfuscatedName("at") @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("zoom") float zoom; - @ObfuscatedName("bh") + @ObfuscatedName("bn") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("bj") + @ObfuscatedName("bk") @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("bk") + @ObfuscatedName("by") @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("bt") + @ObfuscatedName("be") @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("by") + @ObfuscatedName("ba") @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("bs") + @ObfuscatedName("bz") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("bm") + @ObfuscatedName("bb") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("bf") + @ObfuscatedName("bo") @Export("flashCount") int flashCount; - @ObfuscatedName("bq") + @ObfuscatedName("bp") @Export("flashCycle") int flashCycle; - @ObfuscatedName("ba") - int field3991; - @ObfuscatedName("bl") - int field3997; - @ObfuscatedName("bp") - int field3998; - @ObfuscatedName("bu") - int field4002; - @ObfuscatedName("bo") - long field4024; - @ObfuscatedName("bb") - int field3992; + @ObfuscatedName("bt") + int field4033; + @ObfuscatedName("bm") + int field4028; @ObfuscatedName("br") - int field4000; - @ObfuscatedName("be") - boolean field3982; - @ObfuscatedName("bx") + int field4031; + @ObfuscatedName("bs") + int field4032; + @ObfuscatedName("bc") + long field4056; + @ObfuscatedName("bu") + int field4034; + @ObfuscatedName("bf") + int field4026; + @ObfuscatedName("bh") + boolean field4014; + @ObfuscatedName("bj") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("bn") + @ObfuscatedName("bx") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("bw") + @ObfuscatedName("bi") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("bc") - HashSet field4012; - @ObfuscatedName("bg") + @ObfuscatedName("bq") + HashSet field4047; + @ObfuscatedName("bw") @Export("elementsDisabled") boolean elementsDisabled; + @ObfuscatedName("ce") + int field4038; @ObfuscatedName("cw") - int field4009; - @ObfuscatedName("cm") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("cn") - List field4019; - @ObfuscatedName("cs") + @ObfuscatedName("co") + List field4051; + @ObfuscatedName("cc") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("cx") - HashSet field4017; - @ObfuscatedName("cr") + @ObfuscatedName("cg") + HashSet field4049; + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmo;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("cd") + @ObfuscatedName("cy") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("ce") + @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "Lui;" + descriptor = "Lud;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("cq") + @ObfuscatedName("cp") @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("cp") + @ObfuscatedName("cb") @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("cv") + @ObfuscatedName("cn") @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("co") - int field4005; + @ObfuscatedName("ck") + int field4039; static { fontNameVerdana11 = FontName.FontName_verdana11; @@ -227,30 +227,30 @@ public WorldMap() { this.flashingElements = null; this.flashCount = -1; this.flashCycle = -1; - this.field3991 = -1; - this.field3997 = -1; - this.field3998 = -1; - this.field4002 = -1; - this.field3982 = true; + this.field4033 = -1; + this.field4028 = -1; + this.field4031 = -1; + this.field4032 = -1; + this.field4014 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); this.enabledElementIds = new HashSet(); - this.field4012 = new HashSet(); + this.field4047 = new HashSet(); this.elementsDisabled = false; - this.field4009 = 0; + this.field4038 = 0; this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field4017 = new HashSet(); + this.field4049 = new HashSet(); this.mouseCoord = null; this.showCoord = false; this.minCachedTileX = -1; this.minCachedTileY = -1; - this.field4005 = -1; + this.field4039 = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;Lnu;Lpi;Ljava/util/HashMap;[Luk;I)V", - garbageValue = "98819926" + descriptor = "(Lom;Lom;Lom;Lpu;Ljava/util/HashMap;[Lun;B)V", + garbageValue = "-35" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { @@ -264,7 +264,7 @@ public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); this.cacheLoader = new WorldMapArchiveLoader(var1); - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2471.name); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2482.name); int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); int var9 = var8 == null ? 0 : var8.length; this.details = new HashMap(var9); @@ -272,7 +272,7 @@ public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var for (int var10 = 0; var10 < var9; ++var10) { Buffer var11 = new Buffer(this.WorldMap_archive.takeFile(var7, var8[var10])); WorldMapArea var12 = new WorldMapArea(); - var12.read(var11, var8[var10]); + var12.method1452(var11, var8[var10], Client.param25 >= 217); this.details.put(var12.getInternalName(), var12); if (var12.getIsMain()) { this.mainMapArea = var12; @@ -280,22 +280,22 @@ public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var } this.setCurrentMapArea(this.mainMapArea); - this.field4023 = null; + this.field4053 = null; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "58" + descriptor = "(I)V", + garbageValue = "400049492" ) - public void method2384() { - class18.method56(); + public void method2422() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIZIIIIB)V", - garbageValue = "10" + descriptor = "(IIZIIIII)V", + garbageValue = "217069528" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { @@ -305,27 +305,27 @@ public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int va if (var3) { int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); - List var10 = this.worldMapManager.method1475(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); + List var10 = this.worldMapManager.method1514(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); HashSet var11 = new HashSet(); Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); WorldMapSection1.runScriptEvent(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); Interpreter.runScriptEvent(var14)) { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); - if (this.field4017.contains(var13)) { + if (this.field4049.contains(var13)) { var14.setType(17); } else { var14.setType(15); } } - var12 = this.field4017.iterator(); + var12 = this.field4049.iterator(); while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); @@ -334,81 +334,91 @@ public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int va var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - WorldMapSection1.runScriptEvent(var14); + Interpreter.runScriptEvent(var14); } } - this.field4017 = var11; + this.field4049 = var11; } } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IIZZI)V", - garbageValue = "1934928050" + garbageValue = "1429275185" ) - public void method2386(int var1, int var2, boolean var3, boolean var4) { + public void method2424(int var1, int var2, boolean var3, boolean var4) { long var5; label33: { - var5 = GameEngine.clockNow(); - this.method2387(var1, var2, var4, var5); + var5 = GrandExchangeOfferTotalQuantityComparator.method1971(); + this.method2425(var1, var2, var4, var5); if (!this.hasTarget() && (var4 || var3)) { boolean var7 = Client.clickedWidget != null; if (!var7) { if (var4) { - this.field3998 = var1; - this.field4002 = var2; - this.field3991 = this.centerTileX; - this.field3997 = this.centerTileY; + this.field4031 = var1; + this.field4032 = var2; + this.field4033 = this.centerTileX; + this.field4028 = this.centerTileY; } - if (this.field3991 != -1) { - int var8 = var1 - this.field3998; - int var9 = var2 - this.field4002; - this.setWorldMapPosition(this.field3991 - (int)((float)var8 / this.zoomTarget), (int)((float)var9 / this.zoomTarget) + this.field3997, false); + if (this.field4033 != -1) { + int var8 = var1 - this.field4031; + int var9 = var2 - this.field4032; + this.setWorldMapPosition(this.field4033 - (int)((float)var8 / this.zoomTarget), (int)((float)var9 / this.zoomTarget) + this.field4028, false); } break label33; } } - this.method2391(); + this.method2429(); } if (var4) { - this.field4024 = var5; - this.field3992 = var1; - this.field4000 = var2; + this.field4056 = var5; + this.field4034 = var1; + this.field4026 = var2; } } - @ObfuscatedName("ac") - void method2387(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("ao") + void method2425(int var1, int var2, boolean var3, long var4) { if (this.currentMapArea != null) { int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); if (this.mouseCoord != null && var3) { - class212 var8 = AbstractWorldMapData.method1526(); + class226 var8 = class284.method1573(); boolean var9 = Client.staffModLevel >= 2; + int var11; + int var12; if (var9 && var8.getKeyPressed(82) && var8.getKeyPressed(81)) { - NPC.method597(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); + int var15 = this.mouseCoord.x; + var11 = this.mouseCoord.y; + var12 = this.mouseCoord.plane; + PacketBufferNode var13 = ClanChannelMember.getPacketBufferNode(ClientPacket.f20, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeShortAddLE(var15); + var13.packetBuffer.writeShortLE(var11); + var13.packetBuffer.writeInt(0); + var13.packetBuffer.writeByteAdd(var12); + Client.packetWriter.addNode(var13); } else { boolean var10 = true; - if (this.field3982) { - int var11 = var1 - this.field3992; - int var12 = var2 - this.field4000; - if (var4 - this.field4024 > 500L || var11 < -25 || var11 > 25 || var12 < -25 || var12 > 25) { + if (this.field4014) { + var11 = var1 - this.field4034; + var12 = var2 - this.field4026; + if (var4 - this.field4056 > 500L || var11 < -25 || var11 > 25 || var12 < -25 || var12 > 25) { var10 = false; } } if (var10) { - PacketBufferNode var13 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLICKWORLDMAP, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeInt(this.mouseCoord.packed()); - Client.packetWriter.addNode(var13); - this.field4024 = 0L; + PacketBufferNode var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.f16, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeInt(this.mouseCoord.packed()); + Client.packetWriter.addNode(var14); + this.field4056 = 0L; } } } @@ -418,14 +428,14 @@ void method2387(int var1, int var2, boolean var3, long var4) { } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-12314" + descriptor = "(I)V", + garbageValue = "-2036397007" ) @Export("smoothZoom") void smoothZoom() { - if (class390.field3656 != null) { + if (WallDecoration.field2303 != null) { this.zoom = this.zoomTarget; } else { if (this.zoom < this.zoomTarget) { @@ -439,10 +449,10 @@ void smoothZoom() { } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "55" + garbageValue = "6" ) @Export("scrollToTarget") void scrollToTarget() { @@ -458,7 +468,7 @@ void scrollToTarget() { } this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); - if (this.worldMapTargetX == this.centerTileX && this.worldMapTargetY == this.centerTileY) { + if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -466,48 +476,48 @@ void scrollToTarget() { } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "0" + descriptor = "(IIZI)V", + garbageValue = "118256723" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; this.centerTileY = var2; - GameEngine.clockNow(); + GrandExchangeOfferTotalQuantityComparator.method1971(); if (var3) { - this.method2391(); + this.method2429(); } } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "828394242" + descriptor = "(B)V", + garbageValue = "-36" ) - final void method2391() { - this.field4002 = -1; - this.field3998 = -1; - this.field3997 = -1; - this.field3991 = -1; + final void method2429() { + this.field4032 = -1; + this.field4031 = -1; + this.field4028 = -1; + this.field4033 = -1; } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-778313072" + garbageValue = "412429797" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IIII)Ljf;", - garbageValue = "442093441" + descriptor = "(IIIB)Lkz;", + garbageValue = "117" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { @@ -525,12 +535,12 @@ public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { return var5; } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(IIIZB)V", - garbageValue = "88" + garbageValue = "30" ) - public void method2394(int var1, int var2, int var3, boolean var4) { + public void method2432(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if (var5 == null) { if (!var4) { @@ -541,8 +551,8 @@ public void method2394(int var1, int var2, int var3, boolean var4) { } boolean var6 = false; - if (var5 != this.field4023 || var4) { - this.field4023 = var5; + if (var5 != this.field4053 || var4) { + this.field4053 = var5; this.setCurrentMapArea(var5); var6 = true; } @@ -553,10 +563,10 @@ public void method2394(int var1, int var2, int var3, boolean var4) { } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "114" + garbageValue = "5" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -567,30 +577,30 @@ public void setCurrentMapAreaId(int var1) { } - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2135473352" + descriptor = "(B)I", + garbageValue = "0" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } - @ObfuscatedName("ar") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)Ljf;", - garbageValue = "122" + descriptor = "(I)Lkz;", + garbageValue = "-221227669" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; } - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Ljf;I)V", - garbageValue = "-824827052" + descriptor = "(Lkz;B)V", + garbageValue = "1" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -600,10 +610,10 @@ void setCurrentMapArea(WorldMapArea var1) { } } - @ObfuscatedName("ag") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljf;I)V", - garbageValue = "1970114808" + descriptor = "(Lkz;B)V", + garbageValue = "111" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -612,12 +622,12 @@ void initializeWorldMapManager(WorldMapArea var1) { this.cacheLoader.reset(this.currentMapArea == null ? null : this.currentMapArea.getInternalName()); } - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljf;Lmc;Lmc;ZI)V", - garbageValue = "137024863" + descriptor = "(Lkz;Lmo;Lmo;ZI)V", + garbageValue = "1877422890" ) - public void method2400(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method2438(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMapManager(var1); @@ -632,10 +642,10 @@ public void method2400(WorldMapArea var1, Coord var2, Coord var3, boolean var4) } } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "1" + descriptor = "(IIII)V", + garbageValue = "758116550" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -650,34 +660,34 @@ void jump(int var1, int var2, int var3) { this.worldMapTargetY = -1; this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); this.zoomTarget = this.zoom; - this.field4019 = null; + this.field4051 = null; this.iconIterator = null; this.worldMapManager.clearIcons(); } } - @ObfuscatedName("ah") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "-27" + descriptor = "(IIIIII)V", + garbageValue = "372049411" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { int[] var6 = new int[4]; Rasterizer2D.Rasterizer2D_getClipArray(var6); Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); int var7 = this.cacheLoader.getPercentLoaded(); if (var7 < 100) { this.drawLoading(var1, var2, var3, var4, var7); } else { if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); + this.worldMapManager.method1509(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld, Client.param25 >= 217); if (!this.worldMapManager.isLoaded()) { return; } } + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, this.worldMapManager.method1517()); if (this.flashingElements != null) { ++this.flashCycle; if (this.flashCycle % this.cyclesPerFlash == 0) { @@ -693,20 +703,18 @@ public void draw(int var1, int var2, int var3, int var4, int var5) { int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); - boolean var10; if (!this.elementsDisabled) { - var10 = false; - if (var5 - this.field4009 > 100) { - this.field4009 = var5; + boolean var10 = false; + if (var5 - this.field4038 > 100) { + this.field4038 = var5; var10 = true; } - this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4012, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); + this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4047, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); } - this.method2404(var1, var2, var3, var4, var8, var9); - var10 = Client.staffModLevel >= 2; - if (var10 && this.showCoord && this.mouseCoord != null) { + this.method2442(var1, var2, var3, var4, var8, var9); + if (class92.method487() && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } @@ -718,18 +726,18 @@ public void draw(int var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("as") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(IIIIIII)Z", - garbageValue = "1770915871" + descriptor = "(IIIIIIB)Z", + garbageValue = "-107" ) - boolean method2403(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method2441(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.sprite == null) { return true; } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { return true; - } else if (this.field4005 != Client.field369) { + } else if (this.field4039 != Client.field368) { return true; } else if (var3 <= 0 && var4 <= 0) { return var3 + var1 < var5 || var2 + var4 < var6; @@ -741,13 +749,13 @@ boolean method2403(int var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("ay") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IIIIIIS)V", - garbageValue = "512" + descriptor = "(IIIIIII)V", + garbageValue = "105561208" ) - void method2404(int var1, int var2, int var3, int var4, int var5, int var6) { - if (class390.field3656 != null) { + void method2442(int var1, int var2, int var3, int var4, int var5, int var6) { + if (WallDecoration.field2303 != null) { int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); int var8 = var3 + 512; int var9 = var4 + 512; @@ -758,7 +766,7 @@ void method2404(int var1, int var2, int var3, int var4, int var5, int var6) { int var12 = this.getDisplayY() - var6 / 2 - var7; int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - if (this.method2403(var8, var9, var13, var14, var3, var4)) { + if (this.method2441(var8, var9, var13, var14, var3, var4)) { if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { Arrays.fill(this.sprite.pixels, 0); } else { @@ -768,32 +776,32 @@ void method2404(int var1, int var2, int var3, int var4, int var5, int var6) { this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - class390.field3656.method1965(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field4005 = Client.field369; + WallDecoration.field2303.method1999(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field4039 = Client.field368; var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); } Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); if (var10 == 1.0F) { - this.sprite.method2678(var13, var14, 192); + this.sprite.method2717(var13, var14, 192); } else { - this.sprite.method2681(var13, var14, (int)((float)var8 * var10), (int)(var10 * (float)var9), 192); + this.sprite.method2720(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); } } } - @ObfuscatedName("aj") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "1287385022" + garbageValue = "1890990429" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { if (this.cacheLoader.isLoaded()) { if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); + this.worldMapManager.method1509(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld, Client.param25 >= 217); if (!this.worldMapManager.isLoaded()) { return; } @@ -803,20 +811,20 @@ public void drawOverview(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("av") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2033911390" + garbageValue = "-91789765" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "4" + descriptor = "(IIIIII)V", + garbageValue = "76184385" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { @@ -829,10 +837,10 @@ void drawLoading(int var1, int var2, int var3, int var4, int var5) { this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); } - @ObfuscatedName("ak") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "818777880" + descriptor = "(IB)F", + garbageValue = "5" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { @@ -849,50 +857,50 @@ float getZoomFromPercentage(int var1) { } } - @ObfuscatedName("bh") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2077099147" + descriptor = "(B)I", + garbageValue = "-52" ) @Export("getZoomLevel") public int getZoomLevel() { - if ((double)this.zoomTarget == 1.0D) { + if (1.0D == (double)this.zoomTarget) { return 25; } else if (1.5D == (double)this.zoomTarget) { return 37; - } else if ((double)this.zoomTarget == 2.0D) { + } else if (2.0D == (double)this.zoomTarget) { return 50; - } else if (3.0D == (double)this.zoomTarget) { + } else if ((double)this.zoomTarget == 3.0D) { return 75; } else { return 4.0D == (double)this.zoomTarget ? 100 : 200; } } - @ObfuscatedName("bj") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "25" + descriptor = "(I)V", + garbageValue = "-1930237841" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); } - @ObfuscatedName("bk") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-9" + descriptor = "(S)Z", + garbageValue = "19517" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); } - @ObfuscatedName("bv") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(IB)Ljf;", - garbageValue = "-2" + descriptor = "(IB)Lkz;", + garbageValue = "73" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { @@ -910,10 +918,10 @@ public WorldMapArea getMapArea(int var1) { return var3; } - @ObfuscatedName("bt") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-48" + descriptor = "(III)V", + garbageValue = "-1843882941" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -923,10 +931,10 @@ public void setWorldMapPositionTarget(int var1, int var2) { } } - @ObfuscatedName("bd") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2049902032" + descriptor = "(IIB)V", + garbageValue = "-31" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -937,10 +945,10 @@ public void setWorldMapPositionTargetInstant(int var1, int var2) { } } - @ObfuscatedName("by") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-2060098285" + descriptor = "(IIIB)V", + garbageValue = "107" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -953,10 +961,10 @@ public void jumpToSourceCoord(int var1, int var2, int var3) { } } - @ObfuscatedName("bs") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-843499026" + descriptor = "(IIIB)V", + garbageValue = "30" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -969,60 +977,60 @@ public void jumpToSourceCoordInstant(int var1, int var2, int var3) { } } - @ObfuscatedName("bm") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "825863248" + garbageValue = "-696270991" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } - @ObfuscatedName("bf") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "388146570" + descriptor = "(B)I", + garbageValue = "1" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } - @ObfuscatedName("bq") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(I)Lmc;", - garbageValue = "1721090019" + descriptor = "(I)Lmo;", + garbageValue = "635022283" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } - @ObfuscatedName("ba") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-866759946" + garbageValue = "-350169881" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; } - @ObfuscatedName("bl") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1144156363" + garbageValue = "-756132894" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; } - @ObfuscatedName("bp") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "368918336" + descriptor = "(IS)V", + garbageValue = "-15167" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1032,20 +1040,20 @@ public void setMaxFlashCount(int var1) { } - @ObfuscatedName("bu") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "74" + descriptor = "(I)V", + garbageValue = "2080903444" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; } - @ObfuscatedName("bo") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-30765" + descriptor = "(II)V", + garbageValue = "-629779711" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1055,30 +1063,30 @@ public void setCyclesPerFlash(int var1) { } - @ObfuscatedName("bb") + @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1849662360" + garbageValue = "970345063" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; } - @ObfuscatedName("br") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "21297146" + garbageValue = "-685582392" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; } - @ObfuscatedName("be") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1601393714" + garbageValue = "94114012" ) @Export("flashElement") public void flashElement(int var1) { @@ -1088,10 +1096,10 @@ public void flashElement(int var1) { this.flashCycle = 0; } - @ObfuscatedName("bi") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1527059240" + garbageValue = "-230402435" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1099,38 +1107,38 @@ public void flashCategory(int var1) { this.flashCount = 0; this.flashCycle = 0; - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { - if (class138.WorldMapElement_get(var2) != null && class138.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(class138.WorldMapElement_get(var2).objectId); + for (int var2 = 0; var2 < DevicePcmPlayerProvider.WorldMapElement_count; ++var2) { + if (class148.WorldMapElement_get(var2) != null && class148.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(class148.WorldMapElement_get(var2).objectId); } } } - @ObfuscatedName("bz") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2116976270" + descriptor = "(B)V", + garbageValue = "102" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; } - @ObfuscatedName("bx") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1671616581" + descriptor = "(ZB)V", + garbageValue = "-8" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; } - @ObfuscatedName("bn") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(IZB)V", - garbageValue = "123" + descriptor = "(IZI)V", + garbageValue = "-769968427" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1140,13 +1148,13 @@ public void disableElement(int var1, boolean var2) { this.enabledElements.remove(var1); } - this.method2436(); + this.method2474(); } - @ObfuscatedName("bw") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "-9" + garbageValue = "41" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1156,9 +1164,9 @@ public void setCategoryDisabled(int var1, boolean var2) { this.enabledCategories.remove(var1); } - for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { - if (class138.WorldMapElement_get(var3) != null && class138.WorldMapElement_get(var3).category == var1) { - int var4 = class138.WorldMapElement_get(var3).objectId; + for (int var3 = 0; var3 < DevicePcmPlayerProvider.WorldMapElement_count; ++var3) { + if (class148.WorldMapElement_get(var3) != null && class148.WorldMapElement_get(var3).category == var1) { + int var4 = class148.WorldMapElement_get(var3).objectId; if (!var2) { this.enabledElementIds.add(var4); } else { @@ -1167,61 +1175,61 @@ public void setCategoryDisabled(int var1, boolean var2) { } } - this.method2436(); + this.method2474(); } - @ObfuscatedName("bc") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-441970496" + garbageValue = "-1516672500" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; } - @ObfuscatedName("bg") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "115" + garbageValue = "-12" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); } - @ObfuscatedName("cw") + @ObfuscatedName("ce") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-638712237" + garbageValue = "2114625315" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); } - @ObfuscatedName("cf") + @ObfuscatedName("cu") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-444126949" + garbageValue = "1459658126" ) - void method2436() { - this.field4012.clear(); - this.field4012.addAll(this.enabledElements); - this.field4012.addAll(this.enabledElementIds); + void method2474() { + this.field4047.clear(); + this.field4047.addAll(this.enabledElements); + this.field4047.addAll(this.enabledElementIds); } - @ObfuscatedName("cm") + @ObfuscatedName("cw") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "2039788697" + garbageValue = "331775866" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.cacheLoader.isLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); - List var9 = this.worldMapManager.method1475(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); + List var9 = this.worldMapManager.method1514(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); @@ -1232,12 +1240,12 @@ public void addElementMenuOptions(int var1, int var2, int var3, int var4, int va } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = class138.WorldMapElement_get(var11.getElement()); + WorldMapElement var12 = class148.WorldMapElement_get(var11.getElement()); var13 = false; for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { if (var12.menuActions[var14] != null) { - class385.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + class153.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); var13 = true; } } @@ -1247,12 +1255,12 @@ public void addElementMenuOptions(int var1, int var2, int var3, int var4, int va } } - @ObfuscatedName("cn") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "(ILmc;I)Lmc;", - garbageValue = "501302871" + descriptor = "(ILmo;I)Lmo;", + garbageValue = "1156685308" ) - public Coord method2438(int var1, Coord var2) { + public Coord method2476(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { @@ -1278,7 +1286,7 @@ public Coord method2438(int var1, Coord var2) { var8 = (AbstractWorldMapIcon)var7.next(); int var9 = var8.coord2.x - var2.x; int var10 = var8.coord2.y - var2.y; - var11 = var9 * var9 + var10 * var10; + var11 = var10 * var10 + var9 * var9; if (var11 == 0) { return var8.coord2; } @@ -1293,10 +1301,10 @@ public Coord method2438(int var1, Coord var2) { } } - @ObfuscatedName("cs") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(IILmc;Lmc;I)V", - garbageValue = "-634310433" + descriptor = "(IILmo;Lmo;I)V", + garbageValue = "-559043995" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1320,13 +1328,13 @@ public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { var5.setType(14); } - WorldMapSection1.runScriptEvent(var5); + Interpreter.runScriptEvent(var5); } - @ObfuscatedName("cx") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(I)Lkp;", - garbageValue = "1868927893" + descriptor = "(I)Lll;", + garbageValue = "-1734759912" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { @@ -1336,23 +1344,23 @@ public AbstractWorldMapIcon iconStart() { return null; } else { HashMap var1 = this.worldMapManager.buildIcons(); - this.field4019 = new LinkedList(); + this.field4051 = new LinkedList(); Iterator var2 = var1.values().iterator(); while (var2.hasNext()) { List var3 = (List)var2.next(); - this.field4019.addAll(var3); + this.field4051.addAll(var3); } - this.iconIterator = this.field4019.iterator(); + this.iconIterator = this.field4051.iterator(); return this.iconNext(); } } - @ObfuscatedName("cr") + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "(I)Lkp;", - garbageValue = "-4783763" + descriptor = "(S)Lll;", + garbageValue = "21797" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { @@ -1371,336 +1379,4 @@ public AbstractWorldMapIcon iconNext() { return var1; } } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(Lmi;I[B[BI)V", - garbageValue = "359324490" - ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2977 == null) { - if (var2 == null) { - return; - } - - var0.field2977 = new byte[11][]; - var0.field2978 = new byte[11][]; - var0.field3047 = new int[11]; - var0.field3046 = new int[11]; - } - - var0.field2977[var1] = var2; - if (var2 != null) { - var0.field2969 = true; - } else { - var0.field2969 = false; - - for (int var4 = 0; var4 < var0.field2977.length; ++var4) { - if (var0.field2977[var4] != null) { - var0.field2969 = true; - break; - } - } - } - - var0.field2978[var1] = var3; - } - - @ObfuscatedName("kr") - @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-1305820605" - ) - @Export("addPendingSpawnToScene") - static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if (Client.isLowDetail && var0 != HealthBar.Client_plane) { - return; - } - - long var8 = 0L; - boolean var10 = true; - boolean var11 = false; - boolean var12 = false; - if (var1 == 0) { - var8 = class130.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var8 = class130.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var8 = class130.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var8 = class130.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var13; - if (var8 != 0L) { - var13 = class130.scene.getObjectFlags(var0, var2, var3, var8); - int var41 = InvDefinition.Entity_unpackID(var8); - int var42 = var13 & 31; - int var43 = var13 >> 6 & 3; - ObjectComposition var14; - if (var1 == 0) { - class130.scene.removeBoundaryObject(var0, var2, var3); - var14 = WorldMapElement.getObjectDefinition(var41); - if (var14.interactType != 0) { - Client.collisionMaps[var0].method1118(var2, var3, var42, var43, var14.boolean1); - } - } - - if (var1 == 1) { - class130.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - class130.scene.removeGameObject(var0, var2, var3); - var14 = WorldMapElement.getObjectDefinition(var41); - if (var2 + var14.sizeX > 103 || var3 + var14.sizeX > 103 || var2 + var14.sizeY > 103 || var3 + var14.sizeY > 103) { - return; - } - - if (var14.interactType != 0) { - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var14.sizeX, var14.sizeY, var43, var14.boolean1); - } - } - - if (var1 == 3) { - class130.scene.removeFloorDecoration(var0, var2, var3); - var14 = WorldMapElement.getObjectDefinition(var41); - if (var14.interactType == 1) { - Client.collisionMaps[var0].method1121(var2, var3); - } - } - } - - if (var4 >= 0) { - var13 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var13 = var0 + 1; - } - - Scene var44 = class130.scene; - CollisionMap var15 = Client.collisionMaps[var0]; - ObjectComposition var16 = WorldMapElement.getObjectDefinition(var4); - int var17 = var7 >= 0 ? var7 : var16.animationId * -888756473 * -671344969; - int var18; - int var19; - if (var5 != 1 && var5 != 3) { - var18 = var16.sizeX; - var19 = var16.sizeY; - } else { - var18 = var16.sizeY; - var19 = var16.sizeX; - } - - int var20; - int var21; - if (var18 + var2 <= 104) { - var20 = (var18 >> 1) + var2; - var21 = var2 + (var18 + 1 >> 1); - } else { - var20 = var2; - var21 = var2 + 1; - } - - int var22; - int var23; - if (var3 + var19 <= 104) { - var22 = var3 + (var19 >> 1); - var23 = var3 + (var19 + 1 >> 1); - } else { - var22 = var3; - var23 = var3 + 1; - } - - int[][] var24 = Tiles.Tiles_heights[var13]; - int var25 = var24[var21][var22] + var24[var20][var22] + var24[var20][var23] + var24[var21][var23] >> 2; - int var26 = (var2 << 7) + (var18 << 6); - int var27 = (var3 << 7) + (var19 << 6); - long var28 = FontName.calculateTag(var2, var3, 2, var16.int1 == 0, var4); - int var30 = (var5 << 6) + var6; - if (var16.int3 == 1) { - var30 += 256; - } - - Object var31; - if (var6 == 22) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(22, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 22, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newFloorDecoration(var0, var2, var3, var25, (Renderable)var31, var28, var30); - if (var16.interactType == 1) { - var15.setBlockedByFloorDec(var2, var3); - } - } else if (var6 != 10 && var6 != 11) { - if (var6 >= 12) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(var6, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, var6, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.method1243(var0, var2, var3, var25, 1, 1, (Renderable)var31, 0, var28, var30); - if (var16.interactType != 0) { - var15.addGameObject(var2, var3, var18, var19, var16.boolean1); - } - } else if (var6 == 0) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(0, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 0, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field844[var5], 0, var28, var30); - if (var16.interactType != 0) { - var15.method1113(var2, var3, var6, var5, var16.boolean1); - } - } else if (var6 == 1) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(1, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 1, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field840[var5], 0, var28, var30); - if (var16.interactType != 0) { - var15.method1113(var2, var3, var6, var5, var16.boolean1); - } - } else { - int var37; - if (var6 == 2) { - var37 = var5 + 1 & 3; - Object var32; - Object var33; - if (var17 == -1 && var16.transforms == null) { - var32 = var16.getModel(2, var5 + 4, var24, var26, var25, var27); - var33 = var16.getModel(2, var37, var24, var26, var25, var27); - } else { - var32 = new DynamicObject(var4, 2, var5 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - var33 = new DynamicObject(var4, 2, var37, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var32, (Renderable)var33, Tiles.field844[var5], Tiles.field844[var37], var28, var30); - if (var16.interactType != 0) { - var15.method1113(var2, var3, var6, var5, var16.boolean1); - } - } else if (var6 == 3) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(3, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 3, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field840[var5], 0, var28, var30); - if (var16.interactType != 0) { - var15.method1113(var2, var3, var6, var5, var16.boolean1); - } - } else if (var6 == 9) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(var6, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, var6, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.method1243(var0, var2, var3, var25, 1, 1, (Renderable)var31, 0, var28, var30); - if (var16.interactType != 0) { - var15.addGameObject(var2, var3, var18, var19, var16.boolean1); - } - } else if (var6 == 4) { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(4, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 4, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field844[var5], 0, 0, 0, var28, var30); - } else { - Object var34; - long var38; - if (var6 == 5) { - var37 = 16; - var38 = var44.getBoundaryObjectTag(var0, var2, var3); - if (var38 != 0L) { - var37 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var38)).int2; - } - - if (var17 == -1 && var16.transforms == null) { - var34 = var16.getModel(4, var5, var24, var26, var25, var27); - } else { - var34 = new DynamicObject(var4, 4, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)null, Tiles.field844[var5], 0, var37 * Tiles.field842[var5], var37 * Tiles.field845[var5], var28, var30); - } else if (var6 == 6) { - var37 = 8; - var38 = var44.getBoundaryObjectTag(var0, var2, var3); - if (var38 != 0L) { - var37 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var38)).int2 / 2; - } - - if (var17 == -1 && var16.transforms == null) { - var34 = var16.getModel(4, var5 + 4, var24, var26, var25, var27); - } else { - var34 = new DynamicObject(var4, 4, var5 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)null, 256, var5, var37 * Tiles.field841[var5], var37 * Tiles.field843[var5], var28, var30); - } else if (var6 == 7) { - int var40 = var5 + 2 & 3; - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(4, var40 + 4, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 4, var40 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, 256, var40, 0, 0, var28, var30); - } else if (var6 == 8) { - var37 = 8; - var38 = var44.getBoundaryObjectTag(var0, var2, var3); - if (0L != var38) { - var37 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var38)).int2 / 2; - } - - int var36 = var5 + 2 & 3; - Object var35; - if (var17 == -1 && var16.transforms == null) { - var34 = var16.getModel(4, var5 + 4, var24, var26, var25, var27); - var35 = var16.getModel(4, var36 + 4, var24, var26, var25, var27); - } else { - var34 = new DynamicObject(var4, 4, var5 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - var35 = new DynamicObject(var4, 4, var36 + 4, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - var44.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)var35, 256, var5, var37 * Tiles.field841[var5], var37 * Tiles.field843[var5], var28, var30); - } - } - } - } else { - if (var17 == -1 && var16.transforms == null) { - var31 = var16.getModel(10, var5, var24, var26, var25, var27); - } else { - var31 = new DynamicObject(var4, 10, var5, var13, var2, var3, var17, var16.boolean3, (Renderable)null); - } - - if (var31 != null) { - var44.method1243(var0, var2, var3, var25, var18, var19, (Renderable)var31, var6 == 11 ? 256 : 0, var28, var30); - } - - if (var16.interactType != 0) { - var15.addGameObject(var2, var3, var18, var19, var16.boolean1); - } - } - } - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapArchiveLoader.java b/osrs/src/main/java/WorldMapArchiveLoader.java index 77edf91d0..a6327cc25 100644 --- a/osrs/src/main/java/WorldMapArchiveLoader.java +++ b/osrs/src/main/java/WorldMapArchiveLoader.java @@ -3,27 +3,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sb") +@ObfuscatedName("tb") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("cacheName") String cacheName; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lom;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; @@ -31,10 +31,10 @@ public class WorldMapArchiveLoader { this.archive = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1398397545" + garbageValue = "211979079" ) @Export("reset") void reset(String var1) { @@ -48,10 +48,10 @@ void reset(String var1) { } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "252910623" + garbageValue = "-1289967643" ) @Export("load") int load() { @@ -60,7 +60,7 @@ int load() { this.loaded = true; } else { if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2469.name, this.cacheName)) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2484.name, this.cacheName)) { return this.percentLoaded; } @@ -68,7 +68,7 @@ int load() { } if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field2470.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2470.name, this.cacheName)) { + if (this.archive.isValidFileName(WorldMapCacheName.field2483.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2483.name, this.cacheName)) { return this.percentLoaded; } @@ -76,7 +76,7 @@ int load() { } if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2468.name)) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2485.name)) { return this.percentLoaded; } @@ -88,32 +88,40 @@ int load() { return this.percentLoaded; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "103" + garbageValue = "0" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1879178762" + garbageValue = "835132926" ) @Export("getPercentLoaded") int getPercentLoaded() { return this.percentLoaded; } - @ObfuscatedName("ae") + @ObfuscatedName("jo") @ObfuscatedSignature( - descriptor = "(Lnu;IIB)[Lui;", - garbageValue = "-50" + descriptor = "(I)V", + garbageValue = "-2054343870" ) - public static SpritePixels[] method2379(AbstractArchive var0, int var1, int var2) { - return !ApproximateRouteStrategy.method345(var0, var1, var2) ? null : ClientPacket.method1608(); + static void method2420() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; + + for (int var2 = 0; var2 < var0; ++var2) { + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { + class199.addPlayerToScene(Client.players[var1[var2]], true); + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapArea.java b/osrs/src/main/java/WorldMapArea.java index 05ed179b3..a2b122876 100644 --- a/osrs/src/main/java/WorldMapArea.java +++ b/osrs/src/main/java/WorldMapArea.java @@ -6,54 +6,57 @@ import java.util.Iterator; import java.util.LinkedList; -@ObfuscatedName("jf") +@ObfuscatedName("kz") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("op") - static int field2343; - @ObfuscatedName("au") + @ObfuscatedName("ki") + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("ac") @Export("id") int id; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("internalName") String internalName; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("externalName") String externalName; - @ObfuscatedName("at") - @Export("backGroundColor") - int backGroundColor; - @ObfuscatedName("ac") + @ObfuscatedName("ax") + int field2364; + @ObfuscatedName("ao") + int field2362; + @ObfuscatedName("ah") @Export("zoom") int zoom; - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmo;" ) @Export("origin") Coord origin; - @ObfuscatedName("az") + @ObfuscatedName("ab") @Export("regionLowX") int regionLowX; - @ObfuscatedName("ap") + @ObfuscatedName("am") @Export("regionHighX") int regionHighX; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("regionLowY") int regionLowY; - @ObfuscatedName("af") + @ObfuscatedName("ag") @Export("regionHighY") int regionHighY; - @ObfuscatedName("ad") + @ObfuscatedName("aa") @Export("isMain") boolean isMain; - @ObfuscatedName("aq") + @ObfuscatedName("ap") @Export("sections") LinkedList sections; public WorldMapArea() { this.id = -1; - this.backGroundColor = -1; + this.field2364 = -1; + this.field2362 = -16777216; this.zoom = -1; this.origin = null; this.regionLowX = Integer.MAX_VALUE; @@ -63,54 +66,57 @@ public WorldMapArea() { this.isMain = false; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;IB)V", - garbageValue = "-21" + descriptor = "(Lul;IZI)V", + garbageValue = "1729868446" ) - @Export("read") - public void read(Buffer var1, int var2) { + public void method1452(Buffer var1, int var2, boolean var3) { this.id = var2; this.internalName = var1.readStringCp1252NullTerminated(); this.externalName = var1.readStringCp1252NullTerminated(); this.origin = new Coord(var1.readInt()); - this.backGroundColor = var1.readInt(); + this.field2364 = var1.readInt(); + if (var3) { + this.field2362 = var1.readInt(); + } + var1.readUnsignedByte(); this.isMain = var1.readUnsignedByte() == 1; this.zoom = var1.readUnsignedByte(); - int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); this.sections = new LinkedList(); - for (int var4 = 0; var4 < var3; ++var4) { + for (int var5 = 0; var5 < var4; ++var5) { this.sections.add(this.readWorldMapSection(var1)); } this.setBounds(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;I)Lkw;", - garbageValue = "2096840833" + descriptor = "(Lul;I)Llm;", + garbageValue = "-358116235" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE3}; - WorldMapSectionType var4 = (WorldMapSectionType)KeyHandler.findEnumerated(var3, var2); + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; + WorldMapSectionType var4 = (WorldMapSectionType)SequenceDefinition.findEnumerated(var3, var2); Object var5 = null; switch(var4.type) { case 0: - var5 = new class260(); + var5 = new WorldMapSection2(); break; case 1: var5 = new WorldMapSection0(); break; case 2: - var5 = new WorldMapSection2(); + var5 = new WorldMapSection1(); break; case 3: - var5 = new WorldMapSection1(); + var5 = new class274(); break; default: throw new IllegalStateException(""); @@ -120,10 +126,10 @@ WorldMapSection readWorldMapSection(Buffer var1) { return (WorldMapSection)var5; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "367578160" + descriptor = "(IIIS)Z", + garbageValue = "18238" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -141,10 +147,10 @@ public boolean containsCoord(int var1, int var2, int var3) { return true; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "770144654" + garbageValue = "-1010823945" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -172,10 +178,10 @@ public boolean containsPosition(int var1, int var2) { } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "-1546478082" + garbageValue = "150153753" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -193,10 +199,10 @@ public int[] position(int var1, int var2, int var3) { return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(III)Lmc;", - garbageValue = "1756558235" + descriptor = "(III)Lmo;", + garbageValue = "-1645849130" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -214,10 +220,10 @@ public Coord coord(int var1, int var2) { return var4.coord(var1, var2); } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-338264651" + garbageValue = "834208858" ) @Export("setBounds") void setBounds() { @@ -230,226 +236,151 @@ void setBounds() { } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-846319025" + descriptor = "(S)I", + garbageValue = "-20045" ) @Export("getId") public int getId() { return this.id; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1901446023" + descriptor = "(B)Z", + garbageValue = "-105" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "22" + garbageValue = "47" ) @Export("getInternalName") public String getInternalName() { return this.internalName; } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1846298842" + garbageValue = "1404403293" ) @Export("getExternalName") public String getExternalName() { return this.externalName; } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-797170066" + garbageValue = "2113761361" ) - @Export("getBackGroundColor") - int getBackGroundColor() { - return this.backGroundColor; + int method1463() { + return this.field2364; } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "69" + descriptor = "(I)I", + garbageValue = "-293473033" + ) + int method1464() { + return this.field2362; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "220732046" ) @Export("getZoom") public int getZoom() { return this.zoom; } - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1630610237" + descriptor = "(B)I", + garbageValue = "112" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; } - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "7" + garbageValue = "77" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; } - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-96" + garbageValue = "61" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-439375988" + descriptor = "(B)I", + garbageValue = "-90" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; } - @ObfuscatedName("am") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2074797827" + garbageValue = "-23241120" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("ax") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "123" + garbageValue = "-12" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; } - @ObfuscatedName("ah") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "0" + garbageValue = "-23" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("as") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(I)Lmc;", - garbageValue = "-1932226468" + descriptor = "(I)Lmo;", + garbageValue = "1687888353" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1197510480" - ) - static void method1413(int var0) { - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-41" - ) - public static boolean method1425() { - boolean var0 = false; - boolean var1 = false; - if (!class305.field2771.isEmpty()) { - SongTask var2 = (SongTask)class305.field2771.get(0); - if (var2 == null) { - class305.field2771.remove(0); - } else if (var2.vmethod2142()) { - if (var2.method2132()) { - System.out.println("Error in midimanager.service: " + var2.method2135()); - var0 = true; - } else { - if (var2.method2136() != null) { - class305.field2771.add(1, var2.method2136()); - } - - var1 = var2.method2134(); - } - - class305.field2771.remove(0); - } else { - var1 = var2.method2134(); - } - } - - if (var0) { - class305.field2771.clear(); - ByteArrayPool.method2148(); - } - - return var1; - } - - @ObfuscatedName("mv") - @ObfuscatedSignature( - descriptor = "(Lmi;IIB)V", - garbageValue = "116" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { - var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); - } - - if (var0.yAlignment == 0) { - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; - } else if (var0.yAlignment == 4) { - var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapAreaData.java b/osrs/src/main/java/WorldMapAreaData.java index 770d0dd3b..f4be04f6f 100644 --- a/osrs/src/main/java/WorldMapAreaData.java +++ b/osrs/src/main/java/WorldMapAreaData.java @@ -7,59 +7,56 @@ import java.util.LinkedList; import java.util.List; -@ObfuscatedName("kv") +@ObfuscatedName("lj") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("al") - @Export("worldMapData0Set") - HashSet worldMapData0Set; - @ObfuscatedName("an") - @Export("worldMapData1Set") - HashSet worldMapData1Set; - @ObfuscatedName("ar") + @ObfuscatedName("ay") + HashSet field2489; + @ObfuscatedName("as") + HashSet field2488; + @ObfuscatedName("aj") @Export("iconList") List iconList; WorldMapAreaData() { } - @ObfuscatedName("cu") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(Ltm;Ltm;IZI)V", - garbageValue = "1963374909" + descriptor = "(Lul;Lul;IZZI)V", + garbageValue = "-940833039" ) - @Export("init") - void init(Buffer var1, Buffer var2, int var3, boolean var4) { - this.read(var1, var3); - int var5 = var2.readUnsignedShort(); - this.worldMapData0Set = new HashSet(var5); + void method1599(Buffer var1, Buffer var2, int var3, boolean var4, boolean var5) { + this.method1452(var1, var3, var5); + int var6 = var2.readUnsignedShort(); + this.field2489 = new HashSet(var6); - int var6; - for (var6 = 0; var6 < var5; ++var6) { - WorldMapData_0 var7 = new WorldMapData_0(); + int var7; + for (var7 = 0; var7 < var6; ++var7) { + WorldMapData_0 var8 = new WorldMapData_0(); try { - var7.init(var2); - } catch (IllegalStateException var12) { + var8.init(var2); + } catch (IllegalStateException var13) { continue; } - this.worldMapData0Set.add(var7); + this.field2489.add(var8); } - var6 = var2.readUnsignedShort(); - this.worldMapData1Set = new HashSet(var6); + var7 = var2.readUnsignedShort(); + this.field2488 = new HashSet(var7); - for (int var10 = 0; var10 < var6; ++var10) { - WorldMapData_1 var8 = new WorldMapData_1(); + for (int var11 = 0; var11 < var7; ++var11) { + WorldMapData_1 var9 = new WorldMapData_1(); try { - var8.init(var2); - } catch (IllegalStateException var11) { + var9.init(var2); + } catch (IllegalStateException var12) { continue; } - this.worldMapData1Set.add(var8); + this.field2488.add(var9); } this.initIconsList(var2, var4); @@ -67,8 +64,8 @@ void init(Buffer var1, Buffer var2, int var3, boolean var4) { @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "(Ltm;ZB)V", - garbageValue = "-123" + descriptor = "(Lul;ZB)V", + garbageValue = "0" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -76,7 +73,7 @@ void initIconsList(Buffer var1, boolean var2) { int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method2563(); + int var5 = var1.readNullableLargeSmart(); Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { @@ -86,73 +83,98 @@ void initIconsList(Buffer var1, boolean var2) { } - @ObfuscatedName("aq") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "2073842388" + descriptor = "(ILds;ZI)I", + garbageValue = "1112250156" ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - if (!class219.client.method352() && !class219.client.method354() && !class219.client.method353()) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - PcmPlayer.method212(2); - if (var0) { - Login.Login_password = ""; + static int method1601(int var0, Script var1, boolean var2) { + if (var0 == 6200) { + Interpreter.Interpreter_intStackSize -= 2; + Client.field634 = (short)class274.method1536(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); + if (Client.field634 <= 0) { + Client.field634 = 256; } - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (class449.clientPreferences.getUsernameToRemember() != null) { - Login.Login_username = class449.clientPreferences.getUsernameToRemember(); - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; - } + Client.field633 = (short)class274.method1536(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + if (Client.field633 <= 0) { + Client.field633 = 256; } - ObjectComposition.method1042(); - } else { - PcmPlayer.method212(10); - } - } + return 1; + } else if (var0 == 6201) { + Interpreter.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "54" - ) - static void method1574(boolean var0) { - byte var1 = 0; - boolean var2 = class449.clientPreferences.method564() >= Client.param21; - if (!var2) { - var1 = 12; - } else if (class219.client.method352() || class219.client.method354() || class219.client.method353()) { - var1 = 10; - } + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } - PcmPlayer.method212(var1); - if (var0) { - Login.Login_username = ""; - Login.Login_password = ""; - class503.field4107 = 0; - class369.otp = ""; - } + return 1; + } else if (var0 == 6202) { + Interpreter.Interpreter_intStackSize -= 4; + Client.field639 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (Client.field639 <= 0) { + Client.field639 = 1; + } - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (class449.clientPreferences.getUsernameToRemember() != null) { - Login.Login_username = class449.clientPreferences.getUsernameToRemember(); - Client.Login_isUsernameRemembered = true; + Client.field640 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (Client.field640 <= 0) { + Client.field640 = 32767; + } else if (Client.field640 < Client.field639) { + Client.field640 = Client.field639; + } + + Client.field638 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (Client.field638 <= 0) { + Client.field638 = 1; + } + + Client.field635 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + if (Client.field635 <= 0) { + Client.field635 = 32767; + } else if (Client.field635 < Client.field638) { + Client.field635 = Client.field638; + } + + return 1; + } else if (var0 == 6203) { + if (Client.viewportWidget != null) { + class53.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; } else { - Client.Login_isUsernameRemembered = false; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; } - } - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; + return 1; + } else if (var0 == 6204) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == 6205) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class398.method2052(Client.field634); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class398.method2052(Client.field633); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class340.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class491.canvasHeight; + return 1; } else { - Login.currentLoginField = 0; + return 2; } - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapCacheName.java b/osrs/src/main/java/WorldMapCacheName.java index da8893bd4..babb6dc1f 100644 --- a/osrs/src/main/java/WorldMapCacheName.java +++ b/osrs/src/main/java/WorldMapCacheName.java @@ -3,68 +3,65 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") +@ObfuscatedName("lh") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Llh;" ) - public static final WorldMapCacheName field2471; - @ObfuscatedName("ae") + public static final WorldMapCacheName field2482; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Llh;" ) - public static final WorldMapCacheName field2469; - @ObfuscatedName("ao") + public static final WorldMapCacheName field2484; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Llh;" ) - public static final WorldMapCacheName field2470; - @ObfuscatedName("at") + public static final WorldMapCacheName field2483; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Llh;" ) - static final WorldMapCacheName field2472; - @ObfuscatedName("ac") + static final WorldMapCacheName field2486; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Llh;" ) - public static final WorldMapCacheName field2468; - @ObfuscatedName("ai") + public static final WorldMapCacheName field2485; + @ObfuscatedName("ah") @Export("name") public final String name; static { - field2471 = new WorldMapCacheName("details"); - field2469 = new WorldMapCacheName("compositemap"); - field2470 = new WorldMapCacheName("compositetexture"); - field2472 = new WorldMapCacheName("area"); - field2468 = new WorldMapCacheName("labels"); + field2482 = new WorldMapCacheName("details"); + field2484 = new WorldMapCacheName("compositemap"); + field2483 = new WorldMapCacheName("compositetexture"); + field2486 = new WorldMapCacheName("area"); + field2485 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { this.name = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IB)Lhm;", - garbageValue = "101" + descriptor = "(I[BLrw;B)V", + garbageValue = "21" ) - public static HitSplatDefinition method1564(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); - var1 = new HitSplatDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; + static void method1592(int var0, byte[] var1, ArchiveDisk var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 0; + var3.key = (long)var0; + var3.data = var1; + var3.archiveDisk = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); } + + class87.method461(); } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapData_0.java b/osrs/src/main/java/WorldMapData_0.java index 61da40e0e..8c13f1944 100644 --- a/osrs/src/main/java/WorldMapData_0.java +++ b/osrs/src/main/java/WorldMapData_0.java @@ -3,49 +3,49 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("kj") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { WorldMapData_0() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "0" + descriptor = "(Lul;B)V", + garbageValue = "15" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != class271.field2456.field2457) { + if (var2 != class285.field2467.field2469) { throw new IllegalStateException(""); } else { - super.field2428 = var1.readUnsignedByte(); + super.field2444 = var1.readUnsignedByte(); super.planes = var1.readUnsignedByte(); - super.field2429 = var1.readUnsignedShort(); - super.field2432 = var1.readUnsignedShort(); + super.field2445 = var1.readUnsignedShort(); + super.field2443 = var1.readUnsignedShort(); super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method2563(); - super.fileId = var1.method2563(); + super.groupId = var1.readNullableLargeSmart(); + super.fileId = var1.readNullableLargeSmart(); } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "2049371979" + descriptor = "(Lul;I)V", + garbageValue = "2115325709" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field2427 = new byte[super.planes][64][64]; - super.field2426 = new byte[super.planes][64][64]; + super.field2439 = new byte[super.planes][64][64]; + super.field2438 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class270.field2453.field2454) { + if (var2 != class284.field2464.field2466) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -70,7 +70,7 @@ public boolean equals(Object var1) { return false; } else { WorldMapData_0 var2 = (WorldMapData_0)var1; - return super.regionX == var2.regionX && super.regionY == var2.regionY; + return var2.regionX == super.regionX && var2.regionY == super.regionY; } } @@ -79,63 +79,4 @@ public boolean equals(Object var1) { public int hashCode() { return super.regionX | super.regionY << 8; } - - @ObfuscatedName("ae") - static final void method1390(long var0) { - try { - Thread.sleep(var0); - } catch (InterruptedException var3) { - } - - } - - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-100" - ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { - NPC var2 = Client.npcs[Client.npcIndices[var1]]; - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { - int var3 = var2.x >> 7; - int var4 = var2.y >> 7; - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { - if (var2.field976 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; - } - - long var5 = FontName.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - class130.scene.drawEntity(HealthBar.Client_plane, var2.x, var2.y, class18.getTileHeight(var2.field976 * 64 - 64 + var2.x, var2.field976 * 64 - 64 + var2.y, HealthBar.Client_plane), var2.field976 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); - } - } - } - - } - - @ObfuscatedName("lh") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "20" - ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { - var1 = var1.substring(0, var2) + "," + var1.substring(var2); - } - - if (var1.length() > 9) { - return " " + MoveSpeed.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + MoveSpeed.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + MoveSpeed.colorStartTag(16776960) + var1 + ""; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapData_1.java b/osrs/src/main/java/WorldMapData_1.java index e3a225214..8ba9acf8d 100644 --- a/osrs/src/main/java/WorldMapData_1.java +++ b/osrs/src/main/java/WorldMapData_1.java @@ -3,121 +3,122 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; import java.io.IOException; +import java.net.Socket; -@ObfuscatedName("jh") +@ObfuscatedName("kh") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("chunkX") int chunkX; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("chunkY") int chunkY; WorldMapData_1() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "10" + descriptor = "(Lul;I)V", + garbageValue = "152954151" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != class271.field2455.field2457) { + if (var2 != class285.field2468.field2469) { throw new IllegalStateException(""); } else { - super.field2428 = var1.readUnsignedByte(); + super.field2444 = var1.readUnsignedByte(); super.planes = var1.readUnsignedByte(); - super.field2429 = var1.readUnsignedShort(); - super.field2432 = var1.readUnsignedShort(); + super.field2445 = var1.readUnsignedShort(); + super.field2443 = var1.readUnsignedShort(); this.chunkXLow = var1.readUnsignedByte(); this.chunkYLow = var1.readUnsignedByte(); super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); this.chunkX = var1.readUnsignedByte(); this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method2563(); - super.fileId = var1.method2563(); + super.groupId = var1.readNullableLargeSmart(); + super.fileId = var1.readNullableLargeSmart(); } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "2049371979" + descriptor = "(Lul;I)V", + garbageValue = "2115325709" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field2427 = new byte[super.planes][64][64]; - super.field2426 = new byte[super.planes][64][64]; + super.field2439 = new byte[super.planes][64][64]; + super.field2438 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - int var3 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); - int var5 = var1.readUnsignedByte(); - int var6 = var1.readUnsignedByte(); - if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { - for (int var7 = 0; var7 < 8; ++var7) { - for (int var8 = 0; var8 < 8; ++var8) { - this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); + if (var2 != class284.field2465.field2466) { + throw new IllegalStateException(""); + } else { + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + int var5 = var1.readUnsignedByte(); + int var6 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { + for (int var7 = 0; var7 < 8; ++var7) { + for (int var8 = 0; var8 < 8; ++var8) { + this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); + } } - } - } else { - throw new IllegalStateException(""); + } else { + throw new IllegalStateException(""); + } } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2024763677" + garbageValue = "1995830791" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; } - @ObfuscatedName("at") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1047328997" + descriptor = "(S)I", + garbageValue = "-101" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; } - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "127" + descriptor = "(I)I", + garbageValue = "-1442893967" ) @Export("getChunkX") int getChunkX() { return this.chunkX; } - @ObfuscatedName("ai") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1777174100" + garbageValue = "-510892913" ) @Export("getChunkY") int getChunkY() { @@ -131,8 +132,8 @@ public boolean equals(Object var1) { return false; } else { WorldMapData_1 var2 = (WorldMapData_1)var1; - if (super.regionX == var2.regionX && var2.regionY == super.regionY) { - return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; + if (var2.regionX == super.regionX && var2.regionY == super.regionY) { + return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; } else { return false; } @@ -143,103 +144,12 @@ public int hashCode() { return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "([BI)Lui;", - garbageValue = "-2044426638" - ) - public static final SpritePixels method1484(byte[] var0) { - BufferedImage var1 = null; - - try { - Class var2 = ImageIO.class; - synchronized(ImageIO.class) { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); - } - - int var6 = var1.getWidth(); - int var7 = var1.getHeight(); - int[] var4 = new int[var7 * var6]; - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var6, var7, var4, 0, var6); - var5.grabPixels(); - return new SpritePixels(var4, var6, var7); - } catch (IOException var9) { - } catch (InterruptedException var10) { - } - - return new SpritePixels(0, 0); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)Z", - garbageValue = "-1629994488" - ) - static boolean method1486(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - return false; - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - return false; - } - - if (var3) { - var10 = -var10; - } - - int var9 = var5 * var1 + var10; - if (var9 / var1 != var5) { - return false; - } - - var5 = var9; - var4 = true; - } - - return var4; - } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("ax") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "90675667" + descriptor = "(Ljava/net/Socket;IIS)Lre;", + garbageValue = "-24237" ) - static void method1491() { - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Bounds.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - SoundSystem.logoSprite.drawAt(Login.xPadding + 382 - SoundSystem.logoSprite.subWidth / 2, 18); + public static AbstractSocket method1522(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapDecoration.java b/osrs/src/main/java/WorldMapDecoration.java index 641d68842..2f92dae5e 100644 --- a/osrs/src/main/java/WorldMapDecoration.java +++ b/osrs/src/main/java/WorldMapDecoration.java @@ -3,16 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("kt") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("decoration") final int decoration; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("rotation") final int rotation; @@ -22,168 +22,20 @@ public class WorldMapDecoration { this.rotation = var3; } - @ObfuscatedName("ag") + @ObfuscatedName("ka") @ObfuscatedSignature( - descriptor = "(Lmi;I)I", - garbageValue = "1522435265" + descriptor = "(I)V", + garbageValue = "-1531578947" ) - static int method1530(Widget var0) { - if (var0.type != 11) { - --class137.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - String var1 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var0.method1835(var1); - return 1; - } - } - - @ObfuscatedName("ng") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "14" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - class113.process(); - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var1.obj != null) { - var1.set(); + static final void method1567() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.endCycle == -1) { + var0.startCycle = 0; + GrandExchangeOfferOwnWorldComparator.method350(var0); + } else { + var0.remove(); } } - int var3 = ApproximateRouteStrategy.VarpDefinition_get(var0).type; - if (var3 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var3 == 1) { - if (var2 == 1) { - Rasterizer3D.method1187(0.9D); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.9D); - UrlRequester.method653(); - class449.clientPreferences.setBrightness(0.9D); - } - - if (var2 == 2) { - Rasterizer3D.method1187(0.8D); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.8D); - UrlRequester.method653(); - class449.clientPreferences.setBrightness(0.8D); - } - - if (var2 == 3) { - HealthBarUpdate.method526(0.7D); - } - - if (var2 == 4) { - HealthBarUpdate.method526(0.6D); - } - } - - if (var3 == 3) { - if (var2 == 0) { - WorldMapEvent.method1588(255); - } - - if (var2 == 1) { - WorldMapEvent.method1588(192); - } - - if (var2 == 2) { - WorldMapEvent.method1588(128); - } - - if (var2 == 3) { - WorldMapEvent.method1588(64); - } - - if (var2 == 4) { - WorldMapEvent.method1588(0); - } - } - - if (var3 == 4) { - if (var2 == 0) { - class385.method2026(127); - } - - if (var2 == 1) { - class385.method2026(96); - } - - if (var2 == 2) { - class385.method2026(64); - } - - if (var2 == 3) { - class385.method2026(32); - } - - if (var2 == 4) { - class385.method2026(0); - } - } - - if (var3 == 5) { - Client.leftClickOpensMenu = var2 == 1; - } - - if (var3 == 6) { - Client.chatEffects = var2; - } - - if (var3 == 9) { - } - - if (var3 == 10) { - if (var2 == 0) { - class14.method44(127); - } - - if (var2 == 1) { - class14.method44(96); - } - - if (var2 == 2) { - class14.method44(64); - } - - if (var2 == 3) { - class14.method44(32); - } - - if (var2 == 4) { - class14.method44(0); - } - } - - if (var3 == 17) { - Client.followerIndex = var2 & 65535; - } - - if (var3 == 18) { - Client.playerAttackOption = (AttackOption)KeyHandler.findEnumerated(JagNetThread.method1941(), var2); - if (Client.playerAttackOption == null) { - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var3 == 19) { - if (var2 == -1) { - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; - } - } - - if (var3 == 22) { - Client.npcAttackOption = (AttackOption)KeyHandler.findEnumerated(JagNetThread.method1941(), var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapDecorationType.java b/osrs/src/main/java/WorldMapDecorationType.java index 4381196ff..1f9d2163e 100644 --- a/osrs/src/main/java/WorldMapDecorationType.java +++ b/osrs/src/main/java/WorldMapDecorationType.java @@ -3,126 +3,133 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nm") +import java.util.Iterator; + +@ObfuscatedName("nl") @Implements("WorldMapDecorationType") -public enum WorldMapDecorationType implements class371 { - @ObfuscatedName("au") +public enum WorldMapDecorationType implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3123(0, 0), - @ObfuscatedName("ae") + field3150(0, 0), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3127(1, 0), - @ObfuscatedName("ao") + field3162(1, 0), + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3121(2, 0), - @ObfuscatedName("at") + field3151(2, 0), + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3122(3, 0), - @ObfuscatedName("ac") + field3153(3, 0), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3119(9, 2), - @ObfuscatedName("ai") + field3152(9, 2), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3131(4, 1), - @ObfuscatedName("az") + field3159(4, 1), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3141(5, 1), - @ObfuscatedName("ap") + field3167(5, 1), + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3135(6, 1), - @ObfuscatedName("aa") + field3156(6, 1), + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3124(7, 1), - @ObfuscatedName("af") + field3163(7, 1), + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3128(8, 1), - @ObfuscatedName("ad") + field3170(8, 1), + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3126(12, 2), - @ObfuscatedName("aq") + field3158(12, 2), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3136(13, 2), - @ObfuscatedName("al") + field3155(13, 2), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3132(14, 2), - @ObfuscatedName("an") + field3165(14, 2), + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3134(15, 2), - @ObfuscatedName("ar") + field3172(15, 2), + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3137(16, 2), - @ObfuscatedName("ab") + field3168(16, 2), + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3125(17, 2), - @ObfuscatedName("ag") + field3161(17, 2), + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3129(18, 2), - @ObfuscatedName("am") + field3164(18, 2), + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3133(19, 2), - @ObfuscatedName("ax") + field3169(19, 2), + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3139(20, 2), - @ObfuscatedName("ah") + field3160(20, 2), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3130(21, 2), - @ObfuscatedName("as") + field3157(21, 2), + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3138(10, 2), - @ObfuscatedName("ay") + field3171(10, 2), + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3140(11, 2), - @ObfuscatedName("aj") + field3166(11, 2), + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnl;" ) - field3120(22, 3); + field3173(22, 3); - @ObfuscatedName("av") + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field3154; + @ObfuscatedName("at") @Export("id") public final int id; @@ -134,13 +141,48 @@ public enum WorldMapDecorationType implements class371 { this.id = var3; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "0" + ) + public static void method1897(int var0, int var1) { + Iterator var2 = class319.field2792.iterator(); + + while (var2.hasNext()) { + class325 var3 = (class325)var2.next(); + var3.vmethod1644(var0, var1); + } + + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1905325743" + ) + public static void method1898() { + synchronized(ArchiveDiskActionHandler.field3545) { + if (ArchiveDiskActionHandler.field3544 != 0) { + ArchiveDiskActionHandler.field3544 = 1; + ArchiveDiskActionHandler.field3543 = true; + + try { + ArchiveDiskActionHandler.field3545.wait(); + } catch (InterruptedException var3) { + } + } + + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapElement.java b/osrs/src/main/java/WorldMapElement.java index 0e6cf7847..d1f349edb 100644 --- a/osrs/src/main/java/WorldMapElement.java +++ b/osrs/src/main/java/WorldMapElement.java @@ -3,120 +3,109 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("hp") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lhd;" + descriptor = "[Lhp;" ) @Export("WorldMapElement_cached") public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("ao") - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lle;" - ) - @Export("WorldMapElement_cachedSprites") - public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("gu") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Llr;" ) - static Archive field1509; - @ObfuscatedName("uc") - @Export("cameraLookAtAcceleration") - static int cameraLookAtAcceleration; - @ObfuscatedName("ac") + @Export("HitSplatDefinition_cached") + static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("ao") @Export("objectId") public final int objectId; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("sprite1") public int sprite1; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("sprite2") int sprite2; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("name") public String name; - @ObfuscatedName("aa") - public int field1522; - @ObfuscatedName("af") + @ObfuscatedName("am") + public int field1523; + @ObfuscatedName("av") @Export("textSize") public int textSize; - @ObfuscatedName("aq") - public boolean field1519; - @ObfuscatedName("al") + @ObfuscatedName("aa") + public boolean field1517; + @ObfuscatedName("ap") public boolean field1518; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("ab") - int[] field1516; - @ObfuscatedName("ag") - int field1511; - @ObfuscatedName("am") - int field1513; - @ObfuscatedName("ax") - int field1514; - @ObfuscatedName("ah") + @ObfuscatedName("aj") + int[] field1515; + @ObfuscatedName("an") int field1512; - @ObfuscatedName("as") + @ObfuscatedName("au") + int field1514; + @ObfuscatedName("ai") + int field1511; + @ObfuscatedName("ae") + int field1510; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhb;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("ay") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lhy;" + descriptor = "Lhr;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("aj") - int[] field1517; - @ObfuscatedName("av") - byte[] field1510; - @ObfuscatedName("aw") + @ObfuscatedName("az") + int[] field1516; + @ObfuscatedName("at") + byte[] field1509; + @ObfuscatedName("af") @Export("category") public int category; static { - WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); + HitSplatDefinition_cached = new EvictingDualNodeHashTable(256); } public WorldMapElement(int var1) { this.sprite1 = -1; this.sprite2 = -1; this.textSize = 0; - this.field1519 = true; + this.field1517 = true; this.field1518 = false; this.menuActions = new String[5]; - this.field1511 = Integer.MAX_VALUE; - this.field1513 = Integer.MAX_VALUE; - this.field1514 = Integer.MIN_VALUE; - this.field1512 = Integer.MIN_VALUE; + this.field1512 = Integer.MAX_VALUE; + this.field1514 = Integer.MAX_VALUE; + this.field1511 = Integer.MIN_VALUE; + this.field1510 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "332990063" + descriptor = "(Lul;B)V", + garbageValue = "7" ) @Export("decode") public void decode(Buffer var1) { @@ -130,21 +119,21 @@ public void decode(Buffer var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "675267888" + descriptor = "(Lul;IB)V", + garbageValue = "-63" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.sprite1 = var1.method2563(); + this.sprite1 = var1.readNullableLargeSmart(); } else if (var2 == 2) { - this.sprite2 = var1.method2563(); + this.sprite2 = var1.readNullableLargeSmart(); } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.field1522 = var1.readMedium(); + this.field1523 = var1.readMedium(); } else if (var2 == 5) { var1.readMedium(); } else if (var2 == 6) { @@ -154,7 +143,7 @@ void decodeNext(Buffer var1, int var2) { if (var2 == 7) { var3 = var1.readUnsignedByte(); if ((var3 & 1) == 0) { - this.field1519 = false; + this.field1517 = false; } if ((var3 & 2) == 2) { @@ -166,32 +155,32 @@ void decodeNext(Buffer var1, int var2) { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); } else if (var2 == 15) { var3 = var1.readUnsignedByte(); - this.field1516 = new int[var3 * 2]; + this.field1515 = new int[var3 * 2]; int var4; for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field1516[var4] = var1.readShort(); + this.field1515[var4] = var1.readShort(); } var1.readInt(); var4 = var1.readUnsignedByte(); - this.field1517 = new int[var4]; + this.field1516 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field1517.length; ++var5) { - this.field1517[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1516.length; ++var5) { + this.field1516[var5] = var1.readInt(); } - this.field1510 = new byte[var3]; + this.field1509 = new byte[var3]; for (var5 = 0; var5 < var3; ++var5) { - this.field1510[var5] = var1.readByte(); + this.field1509[var5] = var1.readByte(); } } else if (var2 != 16) { if (var2 == 17) { this.menuTargetName = var1.readStringCp1252NullTerminated(); } else if (var2 == 18) { - var1.method2563(); + var1.readNullableLargeSmart(); } else if (var2 == 19) { this.category = var1.readUnsignedShort(); } else if (var2 == 21) { @@ -206,71 +195,72 @@ void decodeNext(Buffer var1, int var2) { var1.readShort(); var1.readShort(); } else if (var2 == 25) { - var1.method2563(); + var1.readNullableLargeSmart(); } else if (var2 == 28) { var1.readUnsignedByte(); } else if (var2 == 29) { - this.horizontalAlignment = (HorizontalAlignment)KeyHandler.findEnumerated(class113.method658(), var1.readUnsignedByte()); + this.horizontalAlignment = (HorizontalAlignment)SequenceDefinition.findEnumerated(class202.method1003(), var1.readUnsignedByte()); } else if (var2 == 30) { - this.verticalAlignment = (VerticalAlignment)KeyHandler.findEnumerated(Tiles.method457(), var1.readUnsignedByte()); + VerticalAlignment[] var6 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1643, VerticalAlignment.field1644}; + this.verticalAlignment = (VerticalAlignment)SequenceDefinition.findEnumerated(var6, var1.readUnsignedByte()); } } } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-79" + garbageValue = "-4" ) - public void method949() { - if (this.field1516 != null) { - for (int var1 = 0; var1 < this.field1516.length; var1 += 2) { - if (this.field1516[var1] < this.field1511) { - this.field1511 = this.field1516[var1]; - } else if (this.field1516[var1] > this.field1514) { - this.field1514 = this.field1516[var1]; + public void method967() { + if (this.field1515 != null) { + for (int var1 = 0; var1 < this.field1515.length; var1 += 2) { + if (this.field1515[var1] < this.field1512) { + this.field1512 = this.field1515[var1]; + } else if (this.field1515[var1] > this.field1511) { + this.field1511 = this.field1515[var1]; } - if (this.field1516[var1 + 1] < this.field1513) { - this.field1513 = this.field1516[var1 + 1]; - } else if (this.field1516[var1 + 1] > this.field1512) { - this.field1512 = this.field1516[var1 + 1]; + if (this.field1515[var1 + 1] < this.field1514) { + this.field1514 = this.field1515[var1 + 1]; + } else if (this.field1515[var1 + 1] > this.field1510) { + this.field1510 = this.field1515[var1 + 1]; } } } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ZB)Lui;", - garbageValue = "0" + descriptor = "(ZI)Lud;", + garbageValue = "794347545" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1 * 1744805107 * -479011781; + int var2 = this.sprite1 * 1563781855 * -155660001; return this.getSprite(var2); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)Lui;", - garbageValue = "-54" + descriptor = "(IB)Lud;", + garbageValue = "-97" ) @Export("getSprite") SpritePixels getSprite(int var1) { if (var1 < 0) { return null; } else { - SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); + SpritePixels var2 = (SpritePixels)HitSplatDefinition_cached.get((long)var1); if (var2 != null) { return var2; } else { - var2 = Tiles.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + var2 = class47.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { - WorldMapElement_cachedSprites.put(var2, (long)var1); + HitSplatDefinition_cached.put(var2, (long)var1); } return var2; @@ -278,59 +268,37 @@ SpritePixels getSprite(int var1) { } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1172107767" + descriptor = "(B)I", + garbageValue = "1" ) @Export("getObjectId") public int getObjectId() { return this.objectId; } - @ObfuscatedName("au") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(IB)Lhv;", - garbageValue = "-69" + descriptor = "(ILds;ZI)I", + garbageValue = "2010949873" ) - @Export("getObjectDefinition") - public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static int method971(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3500) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.getKeyPressed(var3) ? 1 : 0; + return 1; + } else if (var0 == 3501) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1149(var3) ? 1 : 0; + return 1; + } else if (var0 == 3502) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1151(var3) ? 1 : 0; + return 1; } else { - byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); - return var1; + return 2; } } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1376332394" - ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + class348.charToByteCp1252(var0.charAt(var3)); - } - - return var2; - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapEvent.java b/osrs/src/main/java/WorldMapEvent.java index 4fb72d7ad..9fea2690b 100644 --- a/osrs/src/main/java/WorldMapEvent.java +++ b/osrs/src/main/java/WorldMapEvent.java @@ -3,30 +3,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; -import java.util.Iterator; - -@ObfuscatedName("kl") +@ObfuscatedName("li") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("mapElement") public int mapElement; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmo;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmo;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILmc;Lmc;)V" + descriptor = "(ILmo;Lmo;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; @@ -34,52 +31,32 @@ public WorldMapEvent(int var1, Coord var2, Coord var3) { this.coord2 = var3; } - @ObfuscatedName("nm") + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "307364041" + descriptor = "(Ldj;IIB)V", + garbageValue = "124" ) - static final void method1588(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); - if (var0 != class449.clientPreferences.getCurrentMusicVolume()) { - label36: { - if (class449.clientPreferences.getCurrentMusicVolume() == 0) { - boolean var1 = !class305.field2773.isEmpty(); - if (var1) { - Archive var2 = class385.archive6; - if (!class305.field2773.isEmpty()) { - ArrayList var3 = new ArrayList(); - Iterator var4 = class305.field2773.iterator(); - - while (var4.hasNext()) { - MusicSong var5 = (MusicSong)var4.next(); - var5.field2865 = false; - var5.field2866 = false; - var5.field2862 = false; - var5.field2863 = false; - var5.musicTrackArchive = var2; - var5.musicTrackVolume = var0; - var5.field2867 = 0.0F; - var3.add(var5); - } - - class53.method291(var3, class305.musicPlayerStatus, class305.field2766, class305.field2769, class305.field2768, false); - } - - Client.playingJingle = false; - break label36; - } - } - - if (var0 == 0) { - Script.method445(0, 0); - Client.playingJingle = false; - } else { - class300.method1620(var0); - } + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = class36.SequenceDefinition_get(var1).replyMode; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.currentSequenceFrameIndex = 0; } - class449.clientPreferences.setCurrentMusicVolume(var0); + if (var3 == 2) { + var0.currentSequenceFrameIndex = 0; + } + } else if (var1 == -1 || var0.sequence == -1 || class36.SequenceDefinition_get(var1).forcedPriority >= class36.SequenceDefinition_get(var0.sequence).forcedPriority) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.currentSequenceFrameIndex = 0; + var0.field1023 = var0.pathLength; } } diff --git a/osrs/src/main/java/WorldMapIcon_0.java b/osrs/src/main/java/WorldMapIcon_0.java index 9483f6842..94097e3c5 100644 --- a/osrs/src/main/java/WorldMapIcon_0.java +++ b/osrs/src/main/java/WorldMapIcon_0.java @@ -3,35 +3,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("kf") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("th") - static boolean field2397; - @ObfuscatedName("au") + @ObfuscatedName("jk") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("ac") @Export("element") final int element; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lkd;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("subWidth") final int subWidth; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lmc;Lmc;ILkq;)V" + descriptor = "(Lmo;Lmo;ILkd;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.element = var3; this.label = var4; - WorldMapElement var5 = class138.WorldMapElement_get(this.getElement()); + WorldMapElement var5 = class148.WorldMapElement_get(this.getElement()); SpritePixels var6 = var5.getSpriteBool(false); if (var6 != null) { this.subWidth = var6.subWidth; @@ -43,40 +44,40 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2135662389" + garbageValue = "-1637535390" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Lkq;", - garbageValue = "-2114244458" + descriptor = "(B)Lkd;", + garbageValue = "5" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-655814171" + descriptor = "(B)I", + garbageValue = "65" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-816534170" + garbageValue = "1338001743" ) @Export("getSubHeight") int getSubHeight() { diff --git a/osrs/src/main/java/WorldMapIcon_1.java b/osrs/src/main/java/WorldMapIcon_1.java index cdb5c022d..0e11841ed 100644 --- a/osrs/src/main/java/WorldMapIcon_1.java +++ b/osrs/src/main/java/WorldMapIcon_1.java @@ -3,36 +3,38 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jz") +@ObfuscatedName("kb") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("au") + @ObfuscatedName("cb") + static int field2337; + @ObfuscatedName("ac") @Export("objectDefId") final int objectDefId; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Lke;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("element") int element; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lkd;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("subWidth") int subWidth; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lmc;Lmc;ILjm;)V" + descriptor = "(Lmo;Lmo;ILke;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -41,16 +43,16 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-10" + garbageValue = "-19" ) @Export("init") void init() { - this.element = WorldMapElement.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(class138.WorldMapElement_get(this.element)); - WorldMapElement var1 = class138.WorldMapElement_get(this.getElement()); + this.element = class91.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(class148.WorldMapElement_get(this.element)); + WorldMapElement var1 = class148.WorldMapElement_get(this.getElement()); SpritePixels var2 = var1.getSpriteBool(false); if (var2 != null) { this.subWidth = var2.subWidth; @@ -62,82 +64,55 @@ void init() { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2135662389" + garbageValue = "-1637535390" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Lkq;", - garbageValue = "-2114244458" + descriptor = "(B)Lkd;", + garbageValue = "5" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-655814171" + descriptor = "(B)I", + garbageValue = "65" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-816534170" + garbageValue = "1338001743" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("ai") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "22" + descriptor = "(Lmh;I)V", + garbageValue = "-866715691" ) - public static int method1401(int var0) { - --var0; - var0 |= var0 >>> 1; - var0 |= var0 >>> 2; - var0 |= var0 >>> 4; - var0 |= var0 >>> 8; - var0 |= var0 >>> 16; - return var0 + 1; - } - - @ObfuscatedName("nv") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-16" - ) - static final void method1402() { - PacketBufferNode var0 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLOSE_MODAL, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var0); - Interpreter.field704 = true; - - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { - if (var1.type == 0 || var1.type == 3) { - class92.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { - class218.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; + public static void method1439(class325 var0) { + if (!class319.field2792.contains(var0)) { + class319.field2792.add(var0); } - Interpreter.field704 = false; } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapLabel.java b/osrs/src/main/java/WorldMapLabel.java index 03b35f2ce..22d608841 100644 --- a/osrs/src/main/java/WorldMapLabel.java +++ b/osrs/src/main/java/WorldMapLabel.java @@ -3,27 +3,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kq") +@ObfuscatedName("kd") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("text") String text; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("width") int width; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("height") int height; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lka;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILjb;)V" + descriptor = "(Ljava/lang/String;IILka;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -32,22 +32,55 @@ public class WorldMapLabel { this.size = var4; } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "39" + descriptor = "(II)I", + garbageValue = "1591685204" ) - public static boolean method1534(int var0) { - return var0 >= WorldMapDecorationType.field3138.id && var0 <= WorldMapDecorationType.field3140.id; + public static int method1569(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); + var0 = var0 + (var0 >>> 4) & 252645135; + var0 += var0 >>> 8; + var0 += var0 >>> 16; + return var0 & 255; } - @ObfuscatedName("aq") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(CS)Z", - garbageValue = "256" + descriptor = "(IIIB)I", + garbageValue = "-26" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + static int method1570(int var0, int var1, int var2) { + if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { + return 0; + } else { + return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; + } + } + + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "(Ldc;I)V", + garbageValue = "-1071136907" + ) + static void method1571(NPC var0) { + var0.field971 = var0.definition.size; + var0.field1020 = var0.definition.rotation; + var0.walkSequence = var0.definition.walkSequence; + var0.walkBackSequence = var0.definition.walkBackSequence; + var0.walkLeftSequence = var0.definition.walkLeftSequence; + var0.walkRightSequence = var0.definition.walkRightSequence; + var0.idleSequence = var0.definition.idleSequence; + var0.turnLeftSequence = var0.definition.turnLeftSequence; + var0.turnRightSequence = var0.definition.turnRightSequence; + var0.runSequence = var0.definition.runSequence; + var0.runBackSequence = var0.definition.runBackSequence; + var0.runLeftSequence = var0.definition.runLeftSequence; + var0.runRightSequence = var0.definition.runRightSequence; + var0.crawlSequence = var0.definition.crawlSequence; + var0.crawlBackSequence = var0.definition.crawlBackSequence; + var0.crawlLeftSequence = var0.definition.crawlLeftSequence; + var0.crawlRightSequence = var0.definition.crawlRightSequence; } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapLabelSize.java b/osrs/src/main/java/WorldMapLabelSize.java index eb06541df..26dd6cb9e 100644 --- a/osrs/src/main/java/WorldMapLabelSize.java +++ b/osrs/src/main/java/WorldMapLabelSize.java @@ -3,77 +3,104 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("ka") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lka;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lka;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lka;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("af") + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "Let;" + descriptor = "Loa;" ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - static GameBuild field2323; - @ObfuscatedName("at") - final int field2326; - @ObfuscatedName("ac") - final int field2324; - @ObfuscatedName("ai") - final int field2325; + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("ax") + final int field2336; + @ObfuscatedName("ao") + final int field2335; + @ObfuscatedName("ah") + final int field2334; static { - WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); + WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); WorldMapLabelSize_medium = new WorldMapLabelSize(0, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); + WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field2326 = var1; - this.field2324 = var2; - this.field2325 = var3; + this.field2336 = var1; + this.field2335 = var2; + this.field2334 = var3; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(FI)Z", - garbageValue = "-122455389" + garbageValue = "-198292177" ) - boolean method1394(float var1) { - return var1 >= (float)this.field2325; + boolean method1433(float var1) { + return var1 >= (float)this.field2334; } - @ObfuscatedName("mx") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lmi;I)Lmi;", - garbageValue = "1356224559" + descriptor = "(IB)Lka;", + garbageValue = "108" ) - static Widget method1395(Widget var0) { - Widget var1 = BuddyRankComparator.method691(var0); - if (var1 == null) { - var1 = var0.parent; + static WorldMapLabelSize method1434(int var0) { + WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_medium, WorldMapLabelSize_large, WorldMapLabelSize_small}; + WorldMapLabelSize[] var2 = var1; + + for (int var3 = 0; var3 < var2.length; ++var3) { + WorldMapLabelSize var4 = var2[var3]; + if (var0 == var4.field2335) { + return var4; + } } - return var1; + return null; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1105487530" + ) + public static int method1435(int var0) { + return class479.field3938[var0 & 16383]; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1216862596" + ) + static final int method1436() { + return ViewportMouse.ViewportMouse_y; + } + + @ObfuscatedName("je") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-13" + ) + static boolean method1437() { + return (Client.drawPlayerNames & 8) != 0; } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapManager.java b/osrs/src/main/java/WorldMapManager.java index 5f72f9e18..2e1434f28 100644 --- a/osrs/src/main/java/WorldMapManager.java +++ b/osrs/src/main/java/WorldMapManager.java @@ -3,86 +3,90 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; +import java.awt.*; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.util.List; import java.util.*; -@ObfuscatedName("jd") +@ObfuscatedName("kk") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("loaded") boolean loaded; - @ObfuscatedName("ae") - @Export("loadStarted") - boolean loadStarted; - @ObfuscatedName("ao") + @ObfuscatedName("al") + boolean field2380; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lkv;" + descriptor = "Llj;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lui;" + descriptor = "Lud;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("icons") HashMap icons; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[[Ljm;" + descriptor = "[[Lke;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Luk;" + descriptor = "[Lun;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lom;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("fonts") final HashMap fonts; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("tileX") int tileX; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("tileY") int tileY; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("tileWidth") int tileWidth; - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("tileHeight") int tileHeight; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Luk;Ljava/util/HashMap;Lnu;Lnu;)V" + descriptor = "([Lun;Ljava/util/HashMap;Lom;Lom;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; - this.loadStarted = false; + this.field2380 = false; this.scaleHandlers = new HashMap(); this.pixelsPerTile = 0; this.mapSceneSprites = var1; @@ -91,28 +95,27 @@ public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, this.groundArchive = var4; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lnu;Ljava/lang/String;ZI)V", - garbageValue = "948733359" + descriptor = "(Lom;Ljava/lang/String;ZZB)V", + garbageValue = "121" ) - @Export("load") - public void load(AbstractArchive var1, String var2, boolean var3) { - if (!this.loadStarted) { + public void method1509(AbstractArchive var1, String var2, boolean var3, boolean var4) { + if (!this.field2380) { this.loaded = false; - this.loadStarted = true; + this.field2380 = true; System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.field2471.name); - int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2471.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2469.name, var2)); + int var5 = var1.getGroupId(WorldMapCacheName.field2482.name); + int var6 = var1.getFileId(var5, var2); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2482.name, var2)); + Buffer var8 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2484.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); try { - this.mapAreaData.init(var6, var7, var5, var3); - } catch (IllegalStateException var19) { + this.mapAreaData.method1599(var7, var8, var6, var3, var4); + } catch (IllegalStateException var20) { return; } @@ -123,68 +126,68 @@ public void load(AbstractArchive var1, String var2, boolean var3) { this.tileY = this.mapAreaData.getRegionLowY() * 64; this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; - int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; - int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; + int var17 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; + int var10 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; System.nanoTime(); System.nanoTime(); - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); - this.regions = new WorldMapRegion[var16][var9]; - Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); - - while (var10.hasNext()) { - WorldMapData_0 var11 = (WorldMapData_0)var10.next(); - int var12 = var11.regionX; - int var13 = var11.regionY; - int var14 = var12 - this.mapAreaData.getRegionLowX(); - int var15 = var13 - this.mapAreaData.getRegionLowY(); - this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); - this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); + class139.method737(); + this.regions = new WorldMapRegion[var17][var10]; + Iterator var11 = this.mapAreaData.field2489.iterator(); + + while (var11.hasNext()) { + WorldMapData_0 var12 = (WorldMapData_0)var11.next(); + int var13 = var12.regionX; + int var14 = var12.regionY; + int var15 = var13 - this.mapAreaData.getRegionLowX(); + int var16 = var14 - this.mapAreaData.getRegionLowY(); + this.regions[var15][var16] = new WorldMapRegion(var13, var14, this.mapAreaData.method1463(), this.fonts); + this.regions[var15][var16].initWorldMapData0(var12, this.mapAreaData.iconList); } - for (int var17 = 0; var17 < var16; ++var17) { - for (int var18 = 0; var18 < var9; ++var18) { - if (this.regions[var17][var18] == null) { - this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); - this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); + for (int var18 = 0; var18 < var17; ++var18) { + for (int var19 = 0; var19 < var10; ++var19) { + if (this.regions[var18][var19] == null) { + this.regions[var18][var19] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var18, this.mapAreaData.getRegionLowY() + var19, this.mapAreaData.method1463(), this.fonts); + this.regions[var18][var19].initWorldMapData1(this.mapAreaData.field2488, this.mapAreaData.iconList); } } } System.nanoTime(); System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field2470.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2470.name, var2); - this.compositeTextureSprite = WorldMapData_1.method1484(var20); + if (var1.isValidFileName(WorldMapCacheName.field2483.name, var2)) { + byte[] var21 = var1.takeFileByNames(WorldMapCacheName.field2483.name, var2); + this.compositeTextureSprite = Frames.method1335(var21); } System.nanoTime(); var1.clearGroups(); - var1.clearFiles(); + var1.method1950(); this.loaded = true; } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1337729553" + garbageValue = "-236187865" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "-78" + descriptor = "(IIIIIIIII)V", + garbageValue = "909385403" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int[] var9 = Rasterizer2D.Rasterizer2D_pixels; int var10 = Rasterizer2D.Rasterizer2D_width; int var11 = Rasterizer2D.Rasterizer2D_height; - float[] var12 = Rasterizer2D.field4217; + float[] var12 = Rasterizer2D.field4244; int[] var13 = new int[4]; Rasterizer2D.Rasterizer2D_getClipArray(var13); WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); @@ -197,7 +200,7 @@ public final void drawTiles(int var1, int var2, int var3, int var4, int var5, in this.scaleHandlers.put(var16, var17); } - int var24 = var14.x + var14.width - 1; + int var24 = var14.width + var14.x - 1; int var18 = var14.y + var14.height - 1; int var19; @@ -208,30 +211,30 @@ public final void drawTiles(int var1, int var2, int var3, int var4, int var5, in } } - Rasterizer3D.method1198(var9, var10, var11, var12); + Rasterizer3D.method1247(var9, var10, var11, var12); Rasterizer2D.Rasterizer2D_setClipArray(var13); - var19 = (int)(64.0F * var15); + var19 = (int)(var15 * 64.0F); var20 = this.tileX + var1; int var21 = var2 + this.tileY; - for (int var22 = var14.x; var22 < var14.width + var14.x; ++var22) { - for (int var23 = var14.y; var23 < var14.y + var14.height; ++var23) { - this.regions[var22][var23].method1436(var5 + (this.regions[var22][var23].regionX * 64 - var20) * var19 / 64, var8 - (this.regions[var22][var23].regionY * 64 - var21 + 64) * var19 / 64, var19); + for (int var22 = var14.x; var22 < var14.x + var14.width; ++var22) { + for (int var23 = var14.y; var23 < var14.height + var14.y; ++var23) { + this.regions[var22][var23].method1475(var5 + (this.regions[var22][var23].regionX * 64 - var20) * var19 / 64, var8 - (this.regions[var22][var23].regionY * 64 - var21 + 64) * var19 / 64, var19); } } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-1410241110" + garbageValue = "-1519783799" ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); - int var16 = (int)(64.0F * var15); + int var16 = (int)(var15 * 64.0F); int var17 = this.tileX + var1; int var18 = var2 + this.tileY; @@ -243,7 +246,7 @@ public final void drawElements(int var1, int var2, int var3, int var4, int var5, this.regions[var19][var20].initWorldMapIcon1s(); } - this.regions[var19][var20].method1446(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); + this.regions[var19][var20].method1485(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); } } @@ -257,10 +260,10 @@ public final void drawElements(int var1, int var2, int var3, int var4, int var5, } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "28" + garbageValue = "65" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -297,25 +300,25 @@ public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, i } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "790077229" + descriptor = "(IIIIIIIIIIB)Ljava/util/List;", + garbageValue = "13" ) - public List method1475(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method1514(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); if (!this.loaded) { return var11; } else { WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); float var13 = this.getPixelsPerTile(var7, var3 - var1); - int var14 = (int)(var13 * 64.0F); + int var14 = (int)(64.0F * var13); int var15 = this.tileX + var1; int var16 = var2 + this.tileY; for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { - List var19 = this.regions[var17][var18].method1467(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); + List var19 = this.regions[var17][var18].method1506(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); if (!var19.isEmpty()) { var11.addAll(var19); } @@ -326,10 +329,10 @@ public List method1475(int var1, int var2, int var3, int var4, int var5, int var } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIIIB)Lks;", - garbageValue = "97" + descriptor = "(IIIII)Lkx;", + garbageValue = "-1144444981" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { @@ -369,20 +372,29 @@ WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4 return var5; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-50" + descriptor = "(I)Z", + garbageValue = "1564953955" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; } - @ObfuscatedName("aa") + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1360371503" + ) + public int method1517() { + return this.mapAreaData.method1464(); + } + + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)Ljava/util/HashMap;", - garbageValue = "1183884840" + garbageValue = "-868447675" ) @Export("buildIcons") public HashMap buildIcons() { @@ -390,10 +402,10 @@ public HashMap buildIcons() { return this.icons; } - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1440528600" + descriptor = "(B)V", + garbageValue = "76" ) @Export("buildIcons0") void buildIcons0() { @@ -427,10 +439,10 @@ void buildIcons0() { } - @ObfuscatedName("ad") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IIB)F", - garbageValue = "0" + descriptor = "(III)F", + garbageValue = "-56693416" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { @@ -445,77 +457,972 @@ float getPixelsPerTile(int var1, int var2) { } } - @ObfuscatedName("bb") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1998929548" + descriptor = "(Lbb;Lpu;Lpu;B)V", + garbageValue = "77" ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (GraphicsDefaults.garbageCollector == null || !GraphicsDefaults.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - GraphicsDefaults.garbageCollector = var2; - GameEngine.garbageCollectorLastCheckTimeMs = -1L; - GameEngine.garbageCollectorLastCollectionTime = -1L; + static void method1521(GameEngine var0, Font var1, Font var2) { + int var5; + boolean var11; + int var40; + int var41; + boolean var55; + if (Login.worldSelectOpen) { + class226 var39 = class284.method1573(); + + while (true) { + if (!var39.method1148()) { + if (MouseHandler.MouseHandler_lastButton != 1 && (UserComparator8.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { + break; + } + + int var4 = Login.xPadding + 280; + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + MouseHandler.changeWorldSelectSorting(0, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + MouseHandler.changeWorldSelectSorting(0, 1); + break; + } + + var5 = Login.xPadding + 390; + if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + MouseHandler.changeWorldSelectSorting(1, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + MouseHandler.changeWorldSelectSorting(1, 1); + break; + } + + var40 = Login.xPadding + 500; + if (MouseHandler.MouseHandler_lastPressedX >= var40 && MouseHandler.MouseHandler_lastPressedX <= var40 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + MouseHandler.changeWorldSelectSorting(2, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var40 + 15 && MouseHandler.MouseHandler_lastPressedX <= var40 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + MouseHandler.changeWorldSelectSorting(2, 1); + break; + } + + var41 = Login.xPadding + 610; + if (MouseHandler.MouseHandler_lastPressedX >= var41 && MouseHandler.MouseHandler_lastPressedX <= var41 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + MouseHandler.changeWorldSelectSorting(3, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var41 + 15 && MouseHandler.MouseHandler_lastPressedX <= var41 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + MouseHandler.changeWorldSelectSorting(3, 1); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { + Login.worldSelectOpen = false; + PcmPlayer.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + break; } + + if (Login.hoveredWorldIndex != -1) { + World var42 = UserComparator3.World_worlds[Login.hoveredWorldIndex]; + if (var42.isDeadman()) { + var42.field680 = "beta"; + } + + var55 = false; + if (var42.properties != Client.worldProperties) { + boolean var56 = (Client.worldProperties & class525.field4156.rsOrdinal()) != 0; + var11 = var42.isDeadman(); + if (var56 && !var11 || !var56 && var11) { + var55 = true; + } + } + + Language.changeWorld(var42); + Login.worldSelectOpen = false; + PcmPlayer.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + if (var55) { + class140.reloadJS5(); + } + } else { + if (Login.worldSelectPage > 0 && class372.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class372.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class491.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class491.canvasHeight / 2 + 50) { + --Login.worldSelectPage; + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && class230.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= class340.canvasWidth - class230.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= class340.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class491.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class491.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; + } + } + break; } - } catch (Throwable var11) { - } - } - if (GraphicsDefaults.garbageCollector != null) { - long var9 = GameEngine.clockNow(); - long var3 = GraphicsDefaults.garbageCollector.getCollectionTime(); - if (GameEngine.garbageCollectorLastCollectionTime != -1L) { - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; - if (var7 != 0L) { - var0 = (int)(100L * var5 / var7); + if (var39.field1901 == 13) { + Login.worldSelectOpen = false; + PcmPlayer.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + break; + } + + if (var39.field1901 == 96) { + if (Login.worldSelectPage > 0 && class372.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (var39.field1901 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class230.worldSelectRightSprite != null) { + ++Login.worldSelectPage; } } - GameEngine.garbageCollectorLastCollectionTime = var3; - GameEngine.garbageCollectorLastCheckTimeMs = var9; - } + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + class91.clientPreferences.getTitleMusicDisabled(!class91.clientPreferences.getTitleMusicDisabled()); + if (!class91.clientPreferences.getTitleMusicDisabled()) { + ArrayList var3 = new ArrayList(); + var3.add(new MusicSong(CollisionMap.archive6, "scape main", "", 255, false)); + class148.method776(var3, 0, 0, 0, 100, false); + } else { + ItemComposition.method1088(0, 0); + } - return var0; - } + class470.method2362(); + } - @ObfuscatedName("it") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "549476469" - ) - static final void method1482() { - int[] var0 = Players.Players_indices; - - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { - Player var2 = Client.players[var0[var1]]; - if (var2 != null && var2.overheadTextCyclesRemaining > 0) { - --var2.overheadTextCyclesRemaining; - if (var2.overheadTextCyclesRemaining == 0) { - var2.overheadText = null; + if (Client.gameState != 5) { + if (Login.field771 == -1L) { + Login.field771 = GrandExchangeOfferTotalQuantityComparator.method1971() + 1000L; } - } - } - for (var1 = 0; var1 < Client.npcCount; ++var1) { - int var4 = Client.npcIndices[var1]; - NPC var3 = Client.npcs[var4]; - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { - --var3.overheadTextCyclesRemaining; - if (var3.overheadTextCyclesRemaining == 0) { - var3.overheadText = null; + long var23 = GrandExchangeOfferTotalQuantityComparator.method1971(); + if (ObjectSound.method415() && Login.field770 == -1L) { + Login.field770 = var23; + if (Login.field770 > Login.field771) { + Login.field771 = Login.field770; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + if (WorldMapLabelSize.clientLanguage == Language.Language_EN) { + if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var5 = Login.xPadding + 5; + short var6 = 463; + byte var7 = 100; + byte var25 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + var7 && MouseHandler.MouseHandler_lastPressedY >= var6 && MouseHandler.MouseHandler_lastPressedY <= var6 + var25) { + if (Canvas.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + + return; + } + } + + if (class91.World_request != null && Canvas.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + } + + var5 = MouseHandler.MouseHandler_lastButton; + var40 = MouseHandler.MouseHandler_lastPressedX; + var41 = MouseHandler.MouseHandler_lastPressedY; + if (var5 == 0) { + var40 = MouseHandler.MouseHandler_x; + var41 = MouseHandler.MouseHandler_y; + } + + if (!UserComparator8.mouseCam && var5 == 4) { + var5 = 1; + } + + class226 var8 = class284.method1573(); + short var44; + int var45; + if (Login.loginIndex == 0) { + var55 = false; + + while (var8.method1148()) { + if (var8.field1901 == 84) { + var55 = true; + } + } + + var45 = class379.loginBoxCenter - 80; + var44 = 291; + if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20) { + VertexNormal.openURL(ScriptEvent.method474("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + } + + var45 = class379.loginBoxCenter + 80; + if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20 || var55) { + if ((Client.worldProperties & class525.field4151.rsOrdinal()) != 0) { + Login.Login_response0 = ""; + Login.Login_response1 = "This is a Beta world."; + Login.Login_response2 = "Your normal account will not be affected."; + Login.Login_response3 = ""; + GameEngine.method166(1); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } else if ((Client.worldProperties & class525.field4153.rsOrdinal()) != 0) { + if ((Client.worldProperties & class525.field4152.rsOrdinal()) != 0) { + Login.Login_response1 = "This is a High Risk PvP world."; + Login.Login_response2 = "Players can attack each other almost everywhere"; + Login.Login_response3 = "and the Protect Item prayer won't work."; + } else { + Login.Login_response1 = "This is a PvP world."; + Login.Login_response2 = "Players can attack each other"; + Login.Login_response3 = "almost everywhere."; + } + + Login.Login_response0 = "Warning!"; + GameEngine.method166(1); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } else if ((Client.worldProperties & class525.field4152.rsOrdinal()) != 0) { + Login.Login_response1 = "This is a High Risk world."; + Login.Login_response2 = "The Protect Item prayer will"; + Login.Login_response3 = "not work on this world."; + Login.Login_response0 = "Warning!"; + GameEngine.method166(1); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } else { + class429.Login_promptCredentials(false); + } + } + } else { + int var9; + short var10; + if (Login.loginIndex == 1) { + while (true) { + if (!var8.method1148()) { + var9 = class379.loginBoxCenter - 80; + var10 = 321; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + class429.Login_promptCredentials(false); + } + + var9 = class379.loginBoxCenter + 80; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + GameEngine.method166(0); + } + break; + } + + if (var8.field1901 == 84) { + class429.Login_promptCredentials(false); + } else if (var8.field1901 == 13) { + GameEngine.method166(0); + } + } + } else { + int var13; + int var14; + int var30; + short var43; + boolean var47; + if (Login.loginIndex == 2) { + var43 = 201; + var9 = var43 + 52; + if (var5 == 1 && var41 >= var9 - 12 && var41 < var9 + 2) { + Login.currentLoginField = 0; + } + + var9 += 15; + if (var5 == 1 && var41 >= var9 - 12 && var41 < var9 + 2) { + Login.currentLoginField = 1; + } + + var9 += 15; + var43 = 361; + if (class481.field3945 != null) { + var45 = class481.field3945.highX / 2; + if (var5 == 1 && var40 >= class481.field3945.lowX - var45 && var40 <= var45 + class481.field3945.lowX && var41 >= var43 - 15 && var41 < var43) { + switch(Login.field749) { + case 1: + VertexNormal.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); + return; + case 2: + VertexNormal.openURL("https://support.runescape.com/hc/en-gb", true, false); + } + } + } + + var45 = class379.loginBoxCenter - 80; + var44 = 321; + if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20) { + class148.method780(); + return; + } + + var45 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20) { + GameEngine.method166(0); + Login.Login_username = ""; + Login.Login_password = ""; + ClientPreferences.field1059 = 0; + class186.otp = ""; + Login.field741 = true; + } + + var45 = class379.loginBoxCenter + -117; + var44 = 277; + Login.field742 = var40 >= var45 && var40 < var45 + class274.field2399 && var41 >= var44 && var41 < var44 + class202.field1581; + if (var5 == 1 && Login.field742) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && class91.clientPreferences.getUsernameToRemember() != null) { + class91.clientPreferences.setUsernameToRemember((String)null); + } + } + + var45 = class379.loginBoxCenter + 24; + var44 = 277; + Login.field743 = var40 >= var45 && var40 < var45 + class274.field2399 && var41 >= var44 && var41 < var44 + class202.field1581; + if (var5 == 1 && Login.field743) { + class91.clientPreferences.setIsUsernameHidden(!class91.clientPreferences.getIsUsernameHidden()); + if (!class91.clientPreferences.getIsUsernameHidden()) { + Login.Login_username = ""; + class91.clientPreferences.setUsernameToRemember((String)null); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } + } + + label1341: + while (true) { + Transferable var59; + do { + while (true) { + label1257: + do { + while (true) { + while (var8.method1148()) { + if (var8.field1901 != 13) { + if (Login.currentLoginField != 0) { + continue label1257; + } + + char var48 = var8.field1899; + + for (var13 = 0; var13 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var48 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var13); ++var13) { + } + + if (var8.field1901 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (var8.field1901 == 84 || var8.field1901 == 80) { + Login.currentLoginField = 1; + } + + char var50 = var8.field1899; + boolean var53 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var50) != -1; + if (var53 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + var8.field1899; + } + } else { + GameEngine.method166(0); + Login.Login_username = ""; + Login.Login_password = ""; + ClientPreferences.field1059 = 0; + class186.otp = ""; + Login.field741 = true; + } + } + + return; + } + } while(Login.currentLoginField != 1); + + if (var8.field1901 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } else if (var8.field1901 == 84 || var8.field1901 == 80) { + Login.currentLoginField = 0; + if (var8.field1901 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + AbstractWorldMapIcon.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + AbstractWorldMapIcon.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + AbstractWorldMapIcon.setLoginResponseString("", "Connecting to server...", ""); + UserComparator6.method690(false); + DefaultsGroup.updateGameState(20); + return; + } + } + + if ((var8.getKeyPressed(82) || var8.getKeyPressed(87)) && var8.field1901 == 67) { + Clipboard var58 = Toolkit.getDefaultToolkit().getSystemClipboard(); + var59 = var58.getContents(class159.client); + var14 = 20 - Login.Login_password.length(); + break; + } + + char var54 = var8.field1899; + if ((var54 < ' ' || var54 >= 127) && (var54 <= 127 || var54 >= 160) && (var54 <= 160 || var54 > 255)) { + label1495: { + if (var54 != 0) { + char[] var60 = class399.cp1252AsciiExtension; + + for (var30 = 0; var30 < var60.length; ++var30) { + char var16 = var60[var30]; + if (var16 == var54) { + var47 = true; + break label1495; + } + } + } + + var47 = false; + } + } else { + var47 = true; + } + + if (var47) { + char var62 = var8.field1899; + boolean var51 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var62) != -1; + if (var51 && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + var8.field1899; + } + } + } + } while(var14 <= 0); + + try { + String var15 = (String)var59.getTransferData(DataFlavor.stringFlavor); + int var52 = Math.min(var14, var15.length()); + int var17 = 0; + + while (true) { + if (var17 >= var52) { + Login.Login_password = Login.Login_password + var15.substring(0, var52); + continue label1341; + } + + char var19 = var15.charAt(var17); + boolean var18; + if (var19 >= ' ' && var19 < 127 || var19 > 127 && var19 < 160 || var19 > 160 && var19 <= 255) { + var18 = true; + } else { + label1513: { + if (var19 != 0) { + char[] var20 = class399.cp1252AsciiExtension; + + for (int var21 = 0; var21 < var20.length; ++var21) { + char var22 = var20[var21]; + if (var19 == var22) { + var18 = true; + break label1513; + } + } + } + + var18 = false; + } + } + + if (!var18) { + break; + } + + char var57 = var15.charAt(var17); + boolean var28 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var57) != -1; + if (!var28) { + break; + } + + ++var17; + } + + GameEngine.method166(3); + return; + } catch (UnsupportedFlavorException var37) { + } catch (IOException var38) { + } + } + } else { + Bounds var31; + if (Login.loginIndex == 3) { + var9 = Login.loginBoxX + 180; + var10 = 241; + var31 = var1.method2119(25, "need to log in using the Jagex Launcher instead.".length() - 34, "need to log in using the Jagex Launcher instead.", var9, var10); + if (var5 == 1 && var31.method2321(var40, var41)) { + VertexNormal.openURL("https://oldschool.runescape.com/launcher", true, false); + } + + var9 = Login.loginBoxX + 180; + var10 = 276; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + MusicPatchNode2.method1657(false); + } + + var9 = Login.loginBoxX + 180; + var10 = 326; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + VertexNormal.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); + return; + } + } else { + int var12; + if (Login.loginIndex == 4) { + var9 = Login.loginBoxX + 180 - 80; + var10 = 321; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + class186.otp.trim(); + if (class186.otp.length() != 6) { + AbstractWorldMapIcon.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + ClientPreferences.field1059 = Integer.parseInt(class186.otp); + class186.otp = ""; + UserComparator6.method690(true); + AbstractWorldMapIcon.setLoginResponseString("", "Connecting to server...", ""); + DefaultsGroup.updateGameState(20); + return; + } + + if (var5 == 1 && var40 >= Login.loginBoxX + 180 - 9 && var40 <= Login.loginBoxX + 180 + 130 && var41 >= 263 && var41 <= 296) { + Login.field741 = !Login.field741; + } + + if (var5 == 1 && var40 >= Login.loginBoxX + 180 - 34 && var40 <= Login.loginBoxX + 34 + 180 && var41 >= 351 && var41 <= 363) { + VertexNormal.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); + } + + var9 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + GameEngine.method166(0); + Login.Login_username = ""; + Login.Login_password = ""; + ClientPreferences.field1059 = 0; + class186.otp = ""; + } + + while (var8.method1148()) { + var11 = false; + + for (var12 = 0; var12 < "1234567890".length(); ++var12) { + if (var8.field1899 == "1234567890".charAt(var12)) { + var11 = true; + break; + } + } + + if (var8.field1901 == 13) { + GameEngine.method166(0); + Login.Login_username = ""; + Login.Login_password = ""; + ClientPreferences.field1059 = 0; + class186.otp = ""; + } else { + if (var8.field1901 == 85 && class186.otp.length() > 0) { + class186.otp = class186.otp.substring(0, class186.otp.length() - 1); + } + + if (var8.field1901 == 84) { + class186.otp.trim(); + if (class186.otp.length() != 6) { + AbstractWorldMapIcon.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + ClientPreferences.field1059 = Integer.parseInt(class186.otp); + class186.otp = ""; + UserComparator6.method690(true); + AbstractWorldMapIcon.setLoginResponseString("", "Connecting to server...", ""); + DefaultsGroup.updateGameState(20); + return; + } + + if (var11 && class186.otp.length() < 6) { + class186.otp = class186.otp + var8.field1899; + } + } + } + } else if (Login.loginIndex == 5) { + var9 = Login.loginBoxX + 180 - 80; + var10 = 321; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + AbstractWorldMapIcon.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var32 = class7.method20(); + int var46; + if (0L == var32) { + var46 = 5; + } else { + var46 = class178.method924(var32, Login.Login_username); + } + + switch(var46) { + case 2: + AbstractWorldMapIcon.setLoginResponseString(Strings.field3466, Strings.field3468, Strings.field3464); + GameEngine.method166(6); + break; + case 3: + AbstractWorldMapIcon.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + AbstractWorldMapIcon.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + AbstractWorldMapIcon.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + AbstractWorldMapIcon.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + AbstractWorldMapIcon.setLoginResponseString("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."); + } + } + + return; + } + + var9 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + class429.Login_promptCredentials(true); + } + + var44 = 361; + if (Message.field349 != null) { + var12 = Message.field349.highX / 2; + if (var5 == 1 && var40 >= Message.field349.lowX - var12 && var40 <= var12 + Message.field349.lowX && var41 >= var44 - 15 && var41 < var44) { + VertexNormal.openURL(ScriptEvent.method474("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + } + } + + while (var8.method1148()) { + var47 = false; + + for (var13 = 0; var13 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var13) { + if (var8.field1899 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var13)) { + var47 = true; + break; + } + } + + if (var8.field1901 == 13) { + class429.Login_promptCredentials(true); + } else { + if (var8.field1901 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (var8.field1901 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + AbstractWorldMapIcon.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var34 = class7.method20(); + if (0L == var34) { + var13 = 5; + } else { + var13 = class178.method924(var34, Login.Login_username); + } + + switch(var13) { + case 2: + AbstractWorldMapIcon.setLoginResponseString(Strings.field3466, Strings.field3468, Strings.field3464); + GameEngine.method166(6); + break; + case 3: + AbstractWorldMapIcon.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + AbstractWorldMapIcon.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + AbstractWorldMapIcon.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + AbstractWorldMapIcon.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + AbstractWorldMapIcon.setLoginResponseString("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."); + } + } + + return; + } + + if (var47 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + var8.field1899; + } + } + } + } else if (Login.loginIndex != 6) { + if (Login.loginIndex == 7) { + if (MusicPatchNode2.field2778 && !Client.onMobile) { + var9 = class379.loginBoxCenter - 150; + var45 = var9 + 40 + 240 + 25; + var44 = 231; + var12 = var44 + 40; + if (var5 == 1 && var40 >= var9 && var40 <= var45 && var41 >= var44 && var41 <= var12) { + var14 = var9; + var30 = 0; + + while (true) { + if (var30 >= 8) { + var13 = 0; + break; + } + + if (var40 <= var14 + 30) { + var13 = var30; + break; + } + + var14 += 30; + var14 += var30 != 1 && var30 != 3 ? 5 : 20; + ++var30; + } + + Login.field751 = var13; + } + + var13 = Login.loginBoxX + 180 - 80; + short var49 = 321; + boolean var61; + if (var5 == 1 && var40 >= var13 - 75 && var40 <= var13 + 75 && var41 >= var49 - 20 && var41 <= var49 + 20) { + var61 = class159.method840(); + if (var61) { + DefaultsGroup.updateGameState(50); + return; + } + } + + var13 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var40 >= var13 - 75 && var40 <= var13 + 75 && var41 >= var49 - 20 && var41 <= var49 + 20) { + Login.field766 = new String[8]; + class429.Login_promptCredentials(true); + } + + while (var8.method1148()) { + if (var8.field1901 == 101) { + Login.field766[Login.field751] = null; + } + + if (var8.field1901 == 85) { + if (Login.field766[Login.field751] == null && Login.field751 > 0) { + --Login.field751; + } + + Login.field766[Login.field751] = null; + } + + if (var8.field1899 >= '0' && var8.field1899 <= '9') { + Login.field766[Login.field751] = "" + var8.field1899; + if (Login.field751 < 7) { + ++Login.field751; + } + } + + if (var8.field1901 == 84) { + var61 = class159.method840(); + if (var61) { + DefaultsGroup.updateGameState(50); + } + + return; + } + } + } else { + var9 = Login.loginBoxX + 180 - 80; + var10 = 321; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + VertexNormal.openURL(ScriptEvent.method474("secure", true) + "m=dob/set_dob.ws", true, false); + AbstractWorldMapIcon.setLoginResponseString("", "Page has opened in the browser.", ""); + GameEngine.method166(6); + return; + } + + var9 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + class429.Login_promptCredentials(true); + } + } + } else if (Login.loginIndex == 8) { + var9 = Login.loginBoxX + 180 - 80; + var10 = 321; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + VertexNormal.openURL("https://www.jagex.com/terms/privacy", true, false); + AbstractWorldMapIcon.setLoginResponseString("", "Page has opened in the browser.", ""); + GameEngine.method166(6); + return; + } + + var9 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + class429.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 9) { + var9 = Login.loginBoxX + 180; + var10 = 311; + if (var8.field1901 == 84 || var8.field1901 == 13 || var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + MusicPatchNode2.method1657(false); + } + } else if (Login.loginIndex == 10) { + var9 = Login.loginBoxX + 180; + var10 = 209; + if (var8.field1901 == 84 || var5 == 1 && var40 >= var9 - 109 && var40 <= var9 + 109 && var41 >= var10 && var41 <= var10 + 68) { + AbstractWorldMapIcon.setLoginResponseString("", "Connecting to server...", ""); + Client.field648 = class534.field4232; + UserComparator6.method690(false); + DefaultsGroup.updateGameState(20); + } + } else if (Login.loginIndex == 12) { + var9 = class379.loginBoxCenter; + var10 = 233; + var31 = var2.method2119(0, 30, "terms of use, privacy policy, and end user licence", var9, var10); + Bounds var26 = var2.method2119(32, 32, "terms of use, privacy policy, and end user licence", var9, var10); + Bounds var27 = var2.method2119(70, 34, "terms of use, privacy policy, and end user licence", var9, var10); + var45 = var10 + 17; + Bounds var29 = var2.method2119(0, 34, "agreement (EULA).", var9, var45); + if (var5 == 1) { + if (var31.method2321(var40, var41)) { + VertexNormal.openURL("https://www.jagex.com/terms", true, false); + } else if (var26.method2321(var40, var41)) { + VertexNormal.openURL("https://www.jagex.com/terms/privacy", true, false); + } else if (var27.method2321(var40, var41) || var29.method2321(var40, var41)) { + VertexNormal.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); + } + } + + var9 = class379.loginBoxCenter - 80; + var10 = 311; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + Tile.method1233(); + MusicPatchNode2.method1657(true); + } + + var9 = class379.loginBoxCenter + 80; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + Login.loginIndex = 13; + } + } else if (Login.loginIndex == 13) { + var9 = class379.loginBoxCenter; + var10 = 321; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + MusicPatchNode2.method1657(true); + } + } else if (Login.loginIndex == 14) { + String var36 = ""; + switch(Login.field748) { + case 0: + var36 = "https://secure.runescape.com/m=offence-appeal/account-history"; + break; + case 1: + var36 = "https://secure.runescape.com/m=accountappeal/passwordrecovery"; + break; + case 2: + var36 = "https://support.runescape.com/hc/en-gb/articles/207256855-Settle-an-Unpaid-Balance"; + break; + default: + class429.Login_promptCredentials(false); + } + + var45 = Login.loginBoxX + 180; + var44 = 276; + if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20) { + VertexNormal.openURL(var36, true, false); + AbstractWorldMapIcon.setLoginResponseString("", "Page has opened in the browser.", ""); + GameEngine.method166(6); + return; + } + + var45 = Login.loginBoxX + 180; + var44 = 326; + if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20) { + class429.Login_promptCredentials(false); + } + } else if (Login.loginIndex == 24) { + var9 = Login.loginBoxX + 180; + var10 = 301; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + MusicPatchNode2.method1657(false); + } + } else if (Login.loginIndex == 32) { + var9 = Login.loginBoxX + 180 - 80; + var10 = 321; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + VertexNormal.openURL(ScriptEvent.method474("secure", true) + "m=dob/set_dob.ws", true, false); + AbstractWorldMapIcon.setLoginResponseString("", "Page has opened in the browser.", ""); + GameEngine.method166(6); + return; + } + + var9 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + class429.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 33) { + var9 = Login.loginBoxX + 180; + var10 = 276; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + VertexNormal.openURL("https://oldschool.runescape.com/launcher", true, false); + } + + var9 = Login.loginBoxX + 180; + var10 = 326; + if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { + class429.Login_promptCredentials(true); + } + } + } else { + while (true) { + do { + if (!var8.method1148()) { + var43 = 321; + if (var5 == 1 && var41 >= var43 - 20 && var41 <= var43 + 20) { + class429.Login_promptCredentials(true); + } + + return; + } + } while(var8.field1901 != 84 && var8.field1901 != 13); + + class429.Login_promptCredentials(true); + } + } + } + } + } + } + } } } - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapRectangle.java b/osrs/src/main/java/WorldMapRectangle.java index 622f2693d..6bd248e8c 100644 --- a/osrs/src/main/java/WorldMapRectangle.java +++ b/osrs/src/main/java/WorldMapRectangle.java @@ -3,198 +3,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") +@ObfuscatedName("kx") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("width") int width; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("height") int height; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("x") int x; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Lkk;" ) @Export("this$0") @ObfuscatedName("this$0") final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Ljd;)V" + descriptor = "(Lkk;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-213889891" - ) - static int method1528(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - if (var0 == 1600) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == 1601) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else { - class329 var7; - if (var0 == 1602) { - if (var3.type == 12) { - var7 = var3.method1844(); - if (var7 != null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7.method1779().method2041(); - return 1; - } - } - - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == 1603) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == 1604) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == 1605) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == 1606) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == 1607) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == 1608) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == 1609) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 1610) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == 1611) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == 1612) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 1613) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == 1614) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else { - class324 var4; - if (var0 == 1617) { - var4 = var3.method1845(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2892 * -1007608077 * 1891510843 : 0; - } - - if (var0 == 1618) { - var4 = var3.method1845(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2890 * -113152143 * 439316881 : 0; - return 1; - } else if (var0 == 1619) { - var7 = var3.method1844(); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1780().method2041() : ""; - return 1; - } else if (var0 == 1620) { - var4 = var3.method1845(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4 != null ? var4.field2891 * 1092445257 * -767308295 : 0; - return 1; - } else if (var0 == 1621) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1790() : 0; - return 1; - } else if (var0 == 1622) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1791() : 0; - return 1; - } else if (var0 == 1623) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1792() : 0; - return 1; - } else if (var0 == 1624) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null && var7.method1782() ? 1 : 0; - return 1; - } else if (var0 != 1625) { - if (var0 == 1626) { - var7 = var3.method1844(); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1781().method2113() : ""; - return 1; - } else if (var0 == 1627) { - var7 = var3.method1844(); - int var5 = var7 != null ? var7.method1786() : 0; - int var6 = var7 != null ? var7.method1785() : 0; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Math.min(var5, var6); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Math.max(var5, var6); - return 1; - } else if (var0 == 1628) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1785() : 0; - return 1; - } else if (var0 == 1629) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1794() : 0; - return 1; - } else if (var0 == 1630) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1793() : 0; - return 1; - } else if (var0 == 1631) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1795() : 0; - return 1; - } else if (var0 == 1632) { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null ? var7.method1796() : 0; - return 1; - } else { - class27 var8; - if (var0 == 1633) { - var8 = var3.method1846(); - Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = var8 != null ? var8.method98(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]) : 0; - return 1; - } else if (var0 == 1634) { - var8 = var3.method1846(); - Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = var8 != null ? var8.method99((char)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]) : 0; - return 1; - } else { - return 2; - } - } - } else { - var7 = var3.method1844(); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7 != null && var7.method1783() ? 1 : 0; - return 1; - } - } - } - } - - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "853160118" - ) - static void method1529() { - if (Canvas.worldMap != null) { - Canvas.worldMap.method2394(HealthBar.Client_plane, (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX, (VarbitComposition.localPlayer.y >> 7) + class47.baseY, false); - Canvas.worldMap.loadCache(); - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapRegion.java b/osrs/src/main/java/WorldMapRegion.java index e5502a046..17ecb792b 100644 --- a/osrs/src/main/java/WorldMapRegion.java +++ b/osrs/src/main/java/WorldMapRegion.java @@ -6,43 +6,43 @@ import java.util.*; import java.util.Map.Entry; -@ObfuscatedName("jm") +@ObfuscatedName("ke") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lls;" ) @Export("WorldMapRegion_cachedSprites") - static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("ai") + public static DemotingHashTable WorldMapRegion_cachedSprites; + @ObfuscatedName("ah") @Export("regionX") int regionX; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("regionY") int regionY; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Lkj;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("icon0List") List icon0List; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("fonts") final HashMap fonts; @@ -60,13 +60,13 @@ public class WorldMapRegion { this.fonts = var4; } - @ObfuscatedName("ao") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1536160939" + descriptor = "(IIIB)V", + garbageValue = "-15" ) - void method1436(int var1, int var2, int var3) { - SpritePixels var4 = class135.method741(this.regionX, this.regionY, this.pixelsPerTile); + void method1475(int var1, int var2, int var3) { + SpritePixels var4 = class33.method134(this.regionX, this.regionY, this.pixelsPerTile); if (var4 != null) { if (var3 == this.pixelsPerTile * 64) { var4.drawAt(var1, var2); @@ -77,10 +77,10 @@ void method1436(int var1, int var2, int var3) { } } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljx;Ljava/util/List;I)V", - garbageValue = "-2004305210" + descriptor = "(Lkj;Ljava/util/List;S)V", + garbageValue = "-25171" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -89,10 +89,10 @@ void initWorldMapData0(WorldMapData_0 var1, List var2) { this.addAllToIconList(var2); } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "-1161990566" + garbageValue = "-121213257" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -109,15 +109,15 @@ void initWorldMapData1(HashSet var1, List var2) { this.addAllToIconList(var2); } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIIILke;I)V", - garbageValue = "-1191453077" + descriptor = "(IIIILkv;S)V", + garbageValue = "29922" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { for (int var6 = var1; var6 < var3 + var1; ++var6) { - label66: + label45: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.planes; ++var8) { WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; @@ -125,33 +125,11 @@ void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapDa WorldMapDecoration[] var10 = var9; for (int var11 = 0; var11 < var10.length; ++var11) { - ObjectComposition var13; - boolean var14; - label57: { - WorldMapDecoration var12 = var10[var11]; - var13 = WorldMapElement.getObjectDefinition(var12.objectDefinitionId); - if (var13.transforms != null) { - int[] var15 = var13.transforms; - - for (int var16 = 0; var16 < var15.length; ++var16) { - int var17 = var15[var16]; - ObjectComposition var18 = WorldMapElement.getObjectDefinition(var17); - if (var18.mapIconId != -1) { - var14 = true; - break label57; - } - } - } else if (var13.mapIconId != -1) { - var14 = true; - break label57; - } - - var14 = false; - } - - if (var14) { + WorldMapDecoration var12 = var10[var11]; + ObjectComposition var13 = class91.getObjectDefinition(var12.objectDefinitionId); + if (TileItem.method615(var13)) { this.getIcon(var13, var8, var6, var7, var5); - continue label66; + continue label45; } } } @@ -161,20 +139,20 @@ void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapDa } - @ObfuscatedName("az") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lhv;IIILke;I)V", - garbageValue = "882689979" + descriptor = "(Liz;IIILkv;I)V", + garbageValue = "1079014997" ) @Export("getIcon") void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); Coord var7 = null; if (this.worldMapData_0 != null) { - var7 = new Coord(this.worldMapData_0.field2428 + var2, var3 + this.worldMapData_0.field2429 * 64, var4 + this.worldMapData_0.field2432 * 64); + var7 = new Coord(this.worldMapData_0.field2444 + var2, var3 + this.worldMapData_0.field2445 * 64, var4 + this.worldMapData_0.field2443 * 64); } else { WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.field2428, var3 + var8.field2429 * 64 + var8.getChunkXLow() * 8, var4 + var8.field2432 * 64 + var8.getChunkYLow() * 8); + var7 = new Coord(var2 + var8.field2444, var8.field2445 * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.field2443 * 64 + var8.getChunkYLow() * 8); } WorldMapElement var9; @@ -182,21 +160,21 @@ void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorld if (var1.transforms != null) { var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - var9 = class138.WorldMapElement_get(var1.mapIconId); + var9 = class148.WorldMapElement_get(var1.mapIconId); var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); } - var9 = class138.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); - if (var9.field1519) { + var9 = class148.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); + if (var9.field1517) { this.iconMap.put(new Coord(0, var3, var4), var10); } } - @ObfuscatedName("ap") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1774548488" + descriptor = "(B)V", + garbageValue = "1" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { @@ -211,10 +189,10 @@ void initWorldMapIcon1s() { } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Ljava/util/List;B)V", - garbageValue = "67" + descriptor = "(Ljava/util/List;I)V", + garbageValue = "-1862948896" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -222,20 +200,20 @@ void addAllToIconList(List var1) { while (var2.hasNext()) { WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); - if (class138.WorldMapElement_get(var3.element).field1519 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method1465(var3.element)); + if (class148.WorldMapElement_get(var3.element).field1517 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method1504(var3.element)); this.icon0List.add(var4); } } } - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2029792015" + garbageValue = "-2032089595" ) - void method1443() { + void method1482() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { @@ -249,10 +227,10 @@ void method1443() { } - @ObfuscatedName("ad") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lnu;B)Z", - garbageValue = "0" + descriptor = "(Lom;B)Z", + garbageValue = "24" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { @@ -288,16 +266,16 @@ boolean loadGeography(AbstractArchive var1) { } } - @ObfuscatedName("aq") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ILku;[Luk;Lnu;Lnu;I)V", - garbageValue = "-2013967337" + descriptor = "(ILlf;[Lun;Lom;Lom;B)V", + garbageValue = "127" ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.pixelsPerTile = var1; if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - if (class135.method741(this.regionX, this.regionY, var1) == null) { + if (class33.method134(this.regionX, this.regionY, var1) == null) { boolean var6 = true; var6 &= this.loadGeography(var4); int var8; @@ -310,39 +288,28 @@ void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, Abstrac var6 &= var5.tryLoadGroup(var8); if (var6) { byte[] var7 = var5.takeFileFlat(var8); - WorldMapSprite var9; - if (var7 == null) { - var9 = new WorldMapSprite(); - } else { - var9 = new WorldMapSprite(WorldMapData_1.method1484(var7).pixels); - } - - SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); - var11.setRaster(); + WorldMapSprite var9 = User.method2251(var7); + SpritePixels var10 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); + var10.setRaster(); if (this.worldMapData_0 != null) { - this.method1448(var2, var3, var9); + this.method1487(var2, var3, var9); } else { - this.method1449(var2, var3, var9); + this.method1488(var2, var3, var9); } - int var12 = this.regionX; - int var13 = this.regionY; - int var14 = this.pixelsPerTile; - DemotingHashTable var15 = WorldMapRegion_cachedSprites; - long var17 = (long)(var14 << 16 | var12 << 8 | var13); - var15.put(var11, var17, var11.pixels.length * 4); - this.method1443(); + class354.method1895(var10, this.regionX, this.regionY, this.pixelsPerTile); + this.method1482(); } } } } - @ObfuscatedName("al") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IIILjava/util/HashSet;I)V", - garbageValue = "-949668643" + descriptor = "(IIILjava/util/HashSet;B)V", + garbageValue = "0" ) - void method1446(int var1, int var2, int var3, HashSet var4) { + void method1485(int var1, int var2, int var3, HashSet var4) { if (var4 == null) { var4 = new HashSet(); } @@ -351,10 +318,10 @@ void method1446(int var1, int var2, int var3, HashSet var4) { this.drawMapLinks(var1, var2, var4, var3); } - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "808374140" + garbageValue = "28125091" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { @@ -365,44 +332,44 @@ void flashElements(HashSet var1, int var2, int var3) { if (var5.hasValidElement()) { int var6 = var5.getElement(); if (var1.contains(var6)) { - WorldMapElement var7 = class138.WorldMapElement_get(var6); + WorldMapElement var7 = class148.WorldMapElement_get(var6); this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method1457(var1, var2, var3); + this.method1496(var1, var2, var3); } - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lku;[Luk;Lkd;B)V", - garbageValue = "-44" + descriptor = "(Llf;[Lun;Lkc;I)V", + garbageValue = "-1042706129" ) - void method1448(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method1487(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); - this.method1452(var4, var5, this.worldMapData_0, var1); + this.method1491(var4, var5, this.worldMapData_0, var1); } } for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { - this.method1450(var4, var5, this.worldMapData_0, var1, var2); + this.method1489(var4, var5, this.worldMapData_0, var1, var2); } } } - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lku;[Luk;Lkd;I)V", - garbageValue = "-2115982333" + descriptor = "(Llf;[Lun;Lkc;I)V", + garbageValue = "1664111804" ) - void method1449(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method1488(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -414,7 +381,7 @@ void method1449(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { this.drawTileGround(var6, var7, var5, var1, var3); - this.method1452(var6, var7, var5, var1); + this.method1491(var6, var7, var5, var1); } } } @@ -426,27 +393,27 @@ void method1449(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { - this.method1450(var6, var7, var5, var1, var2); + this.method1489(var6, var7, var5, var1, var2); } } } } - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IILke;Lku;[Luk;B)V", - garbageValue = "32" + descriptor = "(IILkv;Llf;[Lun;I)V", + garbageValue = "560650516" ) - void method1450(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method1455(var1, var2, var3); - this.method1454(var1, var2, var3, var5); + void method1489(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method1494(var1, var2, var3); + this.method1493(var1, var2, var3, var5); } - @ObfuscatedName("am") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(IILke;Lku;Lkd;I)V", - garbageValue = "-1336656209" + descriptor = "(IILkv;Llf;Lkc;B)V", + garbageValue = "120" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { @@ -457,134 +424,57 @@ void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScale } int var8 = 16711935; - int var9; if (var7 != -1) { - int var10 = this.backgroundColor; - FloorOverlayDefinition var12 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); - FloorOverlayDefinition var11; - if (var12 != null) { - var11 = var12; - } else { - byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); - var12 = new FloorOverlayDefinition(); - if (var13 != null) { - var12.decode(new Buffer(var13), var7); - } - - var12.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var12, (long)var7); - var11 = var12; - } - - if (var11 == null) { - var9 = var10; - } else { - int var14; - int var15; - if (var11.secondaryRgb >= 0) { - var15 = HitSplatDefinition.method1026(var11.secondaryHue, var11.secondarySaturation, var11.secondaryLightness); - var14 = ApproximateRouteStrategy.method342(var15, 96); - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var14] | -16777216; - } else if (var11.texture >= 0) { - var15 = ApproximateRouteStrategy.method342(Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; - } else if (var11.primaryRgb == 16711935) { - var9 = var10; - } else { - var15 = HitSplatDefinition.method1026(var11.hue, var11.saturation, var11.lightness); - var14 = ApproximateRouteStrategy.method342(var15, 96); - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var14] | -16777216; - } - } - - var8 = var9; + var8 = ScriptEvent.method466(var7, this.backgroundColor); } - if (var7 > -1 && var3.field2427[0][var1][var2] == 0) { + if (var7 > -1 && var3.field2439[0][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - var9 = this.method1453(var1, var2, var3, var5); + int var9 = this.method1492(var1, var2, var3, var5); if (var7 == -1) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method1575(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2427[0][var1][var2], var3.field2426[0][var1][var2]); + var4.method1603(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2439[0][var1][var2], var3.field2438[0][var1][var2]); } } } - @ObfuscatedName("ax") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IILke;Lku;I)V", - garbageValue = "-1187093526" + descriptor = "(IILkv;Llf;S)V", + garbageValue = "-16059" ) - void method1452(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + void method1491(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { for (int var5 = 1; var5 < var3.planes; ++var5) { int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; if (var6 > -1) { - int var8 = this.backgroundColor; - FloorOverlayDefinition var10 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6); - FloorOverlayDefinition var9; - if (var10 != null) { - var9 = var10; - } else { - byte[] var11 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); - var10 = new FloorOverlayDefinition(); - if (var11 != null) { - var10.decode(new Buffer(var11), var6); - } - - var10.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var10, (long)var6); - var9 = var10; - } - - int var7; - if (var9 == null) { - var7 = var8; - } else { - int var12; - int var13; - if (var9.secondaryRgb >= 0) { - var13 = HitSplatDefinition.method1026(var9.secondaryHue, var9.secondarySaturation, var9.secondaryLightness); - var12 = ApproximateRouteStrategy.method342(var13, 96); - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; - } else if (var9.texture >= 0) { - var13 = ApproximateRouteStrategy.method342(Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var13] | -16777216; - } else if (var9.primaryRgb == 16711935) { - var7 = var8; - } else { - var13 = HitSplatDefinition.method1026(var9.hue, var9.saturation, var9.lightness); - var12 = ApproximateRouteStrategy.method342(var13, 96); - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; - } - } - - if (var3.field2427[var5][var1][var2] == 0) { + int var7 = ScriptEvent.method466(var6, this.backgroundColor); + if (var3.field2439[var5][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var4.method1575(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2427[var5][var1][var2], var3.field2426[var5][var1][var2]); + var4.method1603(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2439[var5][var1][var2], var3.field2438[var5][var1][var2]); } } } } - @ObfuscatedName("ah") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(IILke;Lkd;I)I", - garbageValue = "-1267425507" + descriptor = "(IILkv;Lkc;I)I", + garbageValue = "-453973498" ) - int method1453(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + int method1492(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } - @ObfuscatedName("as") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IILke;[Luk;I)V", - garbageValue = "-2109687749" + descriptor = "(IILkv;[Lun;B)V", + garbageValue = "-100" ) - void method1454(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + void method1493(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { for (int var5 = 0; var5 < var3.planes; ++var5) { WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; if (var6 != null && var6.length != 0) { @@ -592,20 +482,14 @@ void method1454(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] v for (int var8 = 0; var8 < var7.length; ++var8) { WorldMapDecoration var9 = var7[var8]; - if (!WorldMapLabel.method1534(var9.decoration)) { - int var11 = var9.decoration; - boolean var10 = var11 == WorldMapDecorationType.field3120.id; - if (!var10) { - continue; - } - } - - ObjectComposition var12 = WorldMapElement.getObjectDefinition(var9.objectDefinitionId); - if (var12.mapSceneId != -1) { - if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { - var4[var12.mapSceneId].method2654(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); - } else { - var4[var12.mapSceneId].method2654(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + if (class314.method1650(var9.decoration) || class209.method1032(var9.decoration)) { + ObjectComposition var10 = class91.getObjectDefinition(var9.objectDefinitionId); + if (var10.mapSceneId != -1) { + if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { + var4[var10.mapSceneId].method2693(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + } else { + var4[var10.mapSceneId].method2693(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + } } } } @@ -614,12 +498,12 @@ void method1454(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] v } - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IILke;I)V", - garbageValue = "-1752874267" + descriptor = "(IILkv;I)V", + garbageValue = "-428310467" ) - void method1455(int var1, int var2, AbstractWorldMapData var3) { + void method1494(int var1, int var2, AbstractWorldMapData var3) { for (int var4 = 0; var4 < var3.planes; ++var4) { WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; if (var5 != null && var5.length != 0) { @@ -627,46 +511,46 @@ void method1455(int var1, int var2, AbstractWorldMapData var3) { for (int var7 = 0; var7 < var6.length; ++var7) { WorldMapDecoration var8 = var6[var7]; - if (class101.method598(var8.decoration)) { - ObjectComposition var9 = WorldMapElement.getObjectDefinition(var8.objectDefinitionId); + if (class60.method330(var8.decoration)) { + ObjectComposition var9 = class91.getObjectDefinition(var8.objectDefinitionId); int var10 = var9.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field3123.id) { - this.method1469(var1, var2, var8.rotation, var10); + if (var8.decoration == WorldMapDecorationType.field3150.id) { + this.method1508(var1, var2, var8.rotation, var10); } - if (var8.decoration == WorldMapDecorationType.field3121.id) { - this.method1469(var1, var2, var8.rotation, -3355444); - this.method1469(var1, var2, var8.rotation + 1, var10); + if (var8.decoration == WorldMapDecorationType.field3151.id) { + this.method1508(var1, var2, var8.rotation, -3355444); + this.method1508(var1, var2, var8.rotation + 1, var10); } - if (var8.decoration == WorldMapDecorationType.field3122.id) { + if (var8.decoration == WorldMapDecorationType.field3153.id) { if (var8.rotation == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.method2675(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.method2675(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.method2675(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } if (var8.rotation == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.method2675(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } - if (var8.decoration == WorldMapDecorationType.field3119.id) { + if (var8.decoration == WorldMapDecorationType.field3152.id) { int var11 = var8.rotation % 2; int var12; if (var11 == 0) { for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); + Rasterizer2D.method2675(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); } } else { for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.method2675(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); } } } @@ -677,10 +561,10 @@ void method1455(int var1, int var2, AbstractWorldMapData var3) { } - @ObfuscatedName("aj") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;IB)V", - garbageValue = "-13" + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "1490709112" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { @@ -691,33 +575,33 @@ void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { while (var7.hasNext()) { Entry var8 = (Entry)var7.next(); Coord var9 = (Coord)var8.getKey(); - int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); - int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); + int var10 = (int)((float)var9.x * var5 + (float)var1 - var6); + int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); if (var12 != null && var12.hasValidElement()) { var12.screenX = var10; var12.screenY = var11; - WorldMapElement var13 = class138.WorldMapElement_get(var12.getElement()); + WorldMapElement var13 = class148.WorldMapElement_get(var12.getElement()); if (!var3.contains(var13.getObjectId())) { - this.method1459(var12, var10, var11, var5); + this.method1498(var12, var10, var11, var5); } } } } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "1452687017" + garbageValue = "1547039881" ) - void method1457(HashSet var1, int var2, int var3) { + void method1496(HashSet var1, int var2, int var3) { Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.hasValidElement()) { - WorldMapElement var6 = class138.WorldMapElement_get(var5.getElement()); + WorldMapElement var6 = class148.WorldMapElement_get(var5.getElement()); if (var6 != null && var1.contains(var6.getObjectId())) { this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } @@ -726,10 +610,10 @@ void method1457(HashSet var1, int var2, int var3) { } - @ObfuscatedName("aw") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lhd;IIIII)V", - garbageValue = "-54232319" + descriptor = "(Lhp;IIIII)V", + garbageValue = "-1967099559" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { @@ -744,51 +628,51 @@ void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, in } } - @ObfuscatedName("ak") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(Lkp;IIFB)V", - garbageValue = "-45" + descriptor = "(Lll;IIFI)V", + garbageValue = "543653437" ) - void method1459(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = class138.WorldMapElement_get(var1.getElement()); - this.method1460(var5, var2, var3); - this.method1461(var1, var5, var2, var3, var4); + void method1498(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = class148.WorldMapElement_get(var1.getElement()); + this.method1499(var5, var2, var3); + this.method1500(var1, var5, var2, var3, var4); } - @ObfuscatedName("bh") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(Lhd;III)V", - garbageValue = "1788573667" + descriptor = "(Lhp;IIS)V", + garbageValue = "18184" ) - void method1460(WorldMapElement var1, int var2, int var3) { + void method1499(WorldMapElement var1, int var2, int var3) { SpritePixels var4 = var1.getSpriteBool(false); if (var4 != null) { - int var5 = this.method1463(var4, var1.horizontalAlignment); - int var6 = this.method1464(var4, var1.verticalAlignment); + int var5 = this.method1502(var4, var1.horizontalAlignment); + int var6 = this.method1503(var4, var1.verticalAlignment); var4.drawTransBgAt(var5 + var2, var3 + var6); } } - @ObfuscatedName("bj") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(Lkp;Lhd;IIFI)V", - garbageValue = "1203085844" + descriptor = "(Lll;Lhp;IIFB)V", + garbageValue = "-110" ) - void method1461(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + void method1500(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.getLabel(); if (var6 != null) { - if (var6.size.method1394(var5)) { + if (var6.size.method1433(var5)) { Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1522, 0, 1, 0, var7.ascent / 2); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1523, 0, 1, 0, var7.ascent / 2); } } } - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(IILjava/util/HashSet;IB)V", - garbageValue = "-21" + garbageValue = "105" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { @@ -800,38 +684,38 @@ void drawMapLinks(int var1, int var2, HashSet var3, int var4) { if (var7.hasValidElement()) { int var8 = var7.coord2.x % 64; int var9 = var7.coord2.y % 64; - var7.screenX = (int)((float)var1 + var5 * (float)var8); - var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); + var7.screenX = (int)((float)var8 * var5 + (float)var1); + var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); if (!var3.contains(var7.getElement())) { - this.method1459(var7, var7.screenX, var7.screenY, var5); + this.method1498(var7, var7.screenX, var7.screenY, var5); } } } } - @ObfuscatedName("bv") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(Lui;Lhe;I)I", - garbageValue = "2074198968" + descriptor = "(Lud;Lhb;B)I", + garbageValue = "0" ) - int method1463(SpritePixels var1, HorizontalAlignment var2) { + int method1502(SpritePixels var1, HorizontalAlignment var2) { switch(var2.value) { case 0: - return 0; - case 2: return -var1.subWidth / 2; + case 1: + return 0; default: return -var1.subWidth; } } - @ObfuscatedName("bt") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(Lui;Lhy;I)I", - garbageValue = "693958436" + descriptor = "(Lud;Lhr;I)I", + garbageValue = "1581572144" ) - int method1464(SpritePixels var1, VerticalAlignment var2) { + int method1503(SpritePixels var1, VerticalAlignment var2) { switch(var2.value) { case 0: return -var1.subHeight / 2; @@ -842,68 +726,48 @@ int method1464(SpritePixels var1, VerticalAlignment var2) { } } - @ObfuscatedName("bd") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(IB)Lkq;", - garbageValue = "-90" + descriptor = "(IB)Lkd;", + garbageValue = "91" ) - WorldMapLabel method1465(int var1) { - WorldMapElement var2 = class138.WorldMapElement_get(var1); + WorldMapLabel method1504(int var1) { + WorldMapElement var2 = class148.WorldMapElement_get(var1); return this.createMapLabel(var2); } - @ObfuscatedName("by") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(Lhd;I)Lkq;", - garbageValue = "-1839741951" + descriptor = "(Lhp;I)Lkd;", + garbageValue = "273104668" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { - int var3 = var1.textSize; - WorldMapLabelSize[] var4 = new WorldMapLabelSize[]{WorldMapLabelSize.WorldMapLabelSize_small, WorldMapLabelSize.WorldMapLabelSize_medium, WorldMapLabelSize.WorldMapLabelSize_large}; - WorldMapLabelSize[] var5 = var4; - int var6 = 0; - - WorldMapLabelSize var2; - while (true) { - if (var6 >= var5.length) { - var2 = null; - break; - } - - WorldMapLabelSize var7 = var5[var6]; - if (var3 == var7.field2324) { - var2 = var7; - break; - } - - ++var6; - } - + WorldMapLabelSize var2 = WorldMapLabelSize.method1434(var1.textSize); if (var2 == null) { return null; } else { - Font var14 = (Font)this.fonts.get(var2); - if (var14 == null) { + Font var3 = (Font)this.fonts.get(var2); + if (var3 == null) { return null; } else { - var6 = var14.lineCount(var1.name, 1000000); - String[] var15 = new String[var6]; - var14.breakLines(var1.name, (int[])null, var15); - int var8 = var15.length * var14.ascent / 2; - int var9 = 0; - String[] var10 = var15; - - for (int var11 = 0; var11 < var10.length; ++var11) { - String var12 = var10[var11]; - int var13 = var14.stringWidth(var12); - if (var13 > var9) { - var9 = var13; + int var4 = var3.lineCount(var1.name, 1000000); + String[] var5 = new String[var4]; + var3.breakLines(var1.name, (int[])null, var5); + int var6 = var5.length * var3.ascent / 2; + int var7 = 0; + String[] var8 = var5; + + for (int var9 = 0; var9 < var8.length; ++var9) { + String var10 = var8[var9]; + int var11 = var3.stringWidth(var10); + if (var11 > var7) { + var7 = var11; } } - return new WorldMapLabel(var1.name, var9, var8, var2); + return new WorldMapLabel(var1.name, var7, var6, var2); } } } else { @@ -911,12 +775,12 @@ WorldMapLabel createMapLabel(WorldMapElement var1) { } } - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(IIIIIB)Ljava/util/List;", - garbageValue = "4" + descriptor = "(IIIIII)Ljava/util/List;", + garbageValue = "217734504" ) - List method1467(int var1, int var2, int var3, int var4, int var5) { + List method1506(int var1, int var2, int var3, int var4, int var5) { LinkedList var6 = new LinkedList(); if (var4 >= var1 && var5 >= var2) { if (var4 < var3 + var1 && var5 < var3 + var2) { @@ -948,10 +812,10 @@ List method1467(int var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("bm") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(B)Ljava/util/List;", - garbageValue = "4" + descriptor = "(I)Ljava/util/List;", + garbageValue = "-1898009311" ) @Export("icons") List icons() { @@ -961,28 +825,38 @@ List icons() { return var1; } - @ObfuscatedName("bf") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-29" + descriptor = "(IIIII)V", + garbageValue = "-1887311417" ) - void method1469(int var1, int var2, int var3, int var4) { + void method1508(int var1, int var2, int var3, int var4) { var3 %= 4; if (var3 == 0) { - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + Rasterizer2D.method2677(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + Rasterizer2D.method2675(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 2) { - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + Rasterizer2D.method2677(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); + Rasterizer2D.method2675(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); } } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(II)Lcr;", + garbageValue = "-1821344982" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); + } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapScaleHandler.java b/osrs/src/main/java/WorldMapScaleHandler.java index 8a363c151..0a300aef9 100644 --- a/osrs/src/main/java/WorldMapScaleHandler.java +++ b/osrs/src/main/java/WorldMapScaleHandler.java @@ -3,13 +3,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("lf") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("tileTemplates") byte[][][] tileTemplates; @@ -17,25 +17,25 @@ public class WorldMapScaleHandler { this.pixelsPerTile = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIIIIIIS)V", - garbageValue = "-18273" + descriptor = "(IIIIIIIII)V", + garbageValue = "2135415394" ) - void method1575(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method1603(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { - var8 = this.method1576(var8, var7); - var7 = this.method1577(var7); + var8 = this.method1604(var8, var7); + var7 = this.method1605(var7); Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-45" + descriptor = "(III)I", + garbageValue = "-1861454757" ) - int method1576(int var1, int var2) { + int method1604(int var1, int var2) { if (var2 == 9) { var1 = var1 + 1 & 3; } @@ -51,12 +51,12 @@ int method1576(int var1, int var2) { return var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1563527321" + garbageValue = "1575077587" ) - int method1577(int var1) { + int method1605(int var1) { if (var1 != 9 && var1 != 10) { return var1 == 11 ? 8 : var1; } else { @@ -64,10 +64,10 @@ int method1577(int var1) { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "785325219" + garbageValue = "1584291418" ) @Export("init") void init() { @@ -84,10 +84,10 @@ void init() { } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2061815829" + descriptor = "(B)V", + garbageValue = "14" ) @Export("init0") void init0() { @@ -151,10 +151,10 @@ void init0() { this.tileTemplates[0][3] = var1; } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-555393212" + garbageValue = "-826599457" ) @Export("init1") void init1() { @@ -222,10 +222,10 @@ void init1() { this.tileTemplates[1][3] = var1; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-58" + descriptor = "(I)V", + garbageValue = "1845734656" ) @Export("init2") void init2() { @@ -289,10 +289,10 @@ void init2() { this.tileTemplates[2][3] = var1; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1088178192" + garbageValue = "16711935" ) @Export("init3") void init3() { @@ -356,10 +356,10 @@ void init3() { this.tileTemplates[3][3] = var1; } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1688541699" + garbageValue = "723161545" ) @Export("init4") void init4() { @@ -423,10 +423,10 @@ void init4() { this.tileTemplates[4][3] = var1; } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1023862061" + garbageValue = "-1015422631" ) @Export("init5") void init5() { @@ -492,10 +492,10 @@ void init5() { this.tileTemplates[5][3] = var1; } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "18020" + descriptor = "(I)V", + garbageValue = "2137801556" ) @Export("init6") void init6() { @@ -561,10 +561,10 @@ void init6() { this.tileTemplates[6][3] = var1; } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-68" + descriptor = "(I)V", + garbageValue = "-1430870503" ) @Export("init7") void init7() { @@ -630,13 +630,16 @@ void init7() { this.tileTemplates[7][3] = var1; } - @ObfuscatedName("ap") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "718957128" + descriptor = "(I)Lhu;", + garbageValue = "2088927693" ) - static void method1587(String var0, String var1, String var2) { - PcmPlayer.method212(7); - class318.setLoginResponseString(var0, var1, var2); + public static Clock method1602() { + try { + return new NanoClock(); + } catch (Throwable var1) { + return new MilliClock(); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSection.java b/osrs/src/main/java/WorldMapSection.java index 57e6a893b..8a35e451a 100644 --- a/osrs/src/main/java/WorldMapSection.java +++ b/osrs/src/main/java/WorldMapSection.java @@ -3,53 +3,53 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kw") +@ObfuscatedName("lm") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljf;I)V", - garbageValue = "-474032336" + descriptor = "(Lkz;I)V", + garbageValue = "1844466074" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "509257779" + garbageValue = "-1135530948" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-94" + descriptor = "(III)Z", + garbageValue = "1124460333" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1978048199" + garbageValue = "557011185" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)Lmc;", - garbageValue = "-1281040923" + descriptor = "(III)Lmo;", + garbageValue = "-1670709360" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "47" + descriptor = "(Lul;I)V", + garbageValue = "-801073373" ) @Export("read") void read(Buffer var1); diff --git a/osrs/src/main/java/WorldMapSection0.java b/osrs/src/main/java/WorldMapSection0.java index efce79174..7469e2216 100644 --- a/osrs/src/main/java/WorldMapSection0.java +++ b/osrs/src/main/java/WorldMapSection0.java @@ -3,59 +3,59 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +@ObfuscatedName("kw") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("oldZ") int oldZ; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("newZ") int newZ; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("oldX") int oldX; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("oldY") int oldY; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("newX") int newX; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("newY") int newY; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("al") + @ObfuscatedName("ap") @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("newChunkYHigh") int newChunkYHigh; WorldMapSection0() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljf;I)V", - garbageValue = "-474032336" + descriptor = "(Lkz;I)V", + garbageValue = "1844466074" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -77,10 +77,10 @@ public void expandBounds(WorldMapArea var1) { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "509257779" + garbageValue = "-1135530948" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -91,20 +91,20 @@ public boolean containsCoord(int var1, int var2, int var3) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-94" + descriptor = "(III)Z", + garbageValue = "1124460333" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1978048199" + garbageValue = "557011185" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -116,10 +116,10 @@ public int[] getBorderTileLengths(int var1, int var2, int var3) { } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)Lmc;", - garbageValue = "-1281040923" + descriptor = "(III)Lmo;", + garbageValue = "-1670709360" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -132,10 +132,10 @@ public Coord coord(int var1, int var2) { } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "47" + descriptor = "(Lul;I)V", + garbageValue = "-801073373" ) @Export("read") public void read(Buffer var1) { @@ -156,21 +156,43 @@ public void read(Buffer var1) { this.postRead(); } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1295172600" + descriptor = "(B)V", + garbageValue = "-15" ) @Export("postRead") void postRead() { } - @ObfuscatedName("au") + @ObfuscatedName("hy") @ObfuscatedSignature( - descriptor = "(B)[Lls;", - garbageValue = "14" + descriptor = "(I)V", + garbageValue = "-1252747607" + ) + static void method1551() { + JSException.compass = null; + ParamComposition.redHintArrowSprite = null; + KitDefinition.mapSceneSprites = null; + UserComparator4.headIconPkSprites = null; + class157.headIconPrayerSprites = null; + UserComparator8.headIconHintSprites = null; + class47.mapMarkerSprites = null; + EnumComposition.crossSprites = null; + class103.mapDotSprites = null; + class36.scrollBarSprites = null; + class178.field1459 = null; + } + + @ObfuscatedName("nj") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "47" ) - public static ZoneOperation[] method1506() { - return new ZoneOperation[]{ZoneOperation.MAPPROJ_ANIM, ZoneOperation.LOC_DEL, ZoneOperation.OBJ_COUNT, ZoneOperation.field2607, ZoneOperation.LOC_ADD_CHANGE, ZoneOperation.AREA_SOUND, ZoneOperation.LOC_ANIM, ZoneOperation.OBJ_ADD, ZoneOperation.OBJ_DEL_LEGACY, ZoneOperation.MAP_ANIM, ZoneOperation.PREFETCH_GAMEOBJECTS, ZoneOperation.OBJ_DEL}; + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = ClanChannelMember.getPacketBufferNode(ClientPacket.f22, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSection1.java b/osrs/src/main/java/WorldMapSection1.java index 2ab4216d2..cadbf55be 100644 --- a/osrs/src/main/java/WorldMapSection1.java +++ b/osrs/src/main/java/WorldMapSection1.java @@ -3,37 +3,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; - -@ObfuscatedName("ky") +@ObfuscatedName("ly") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("minPlane") int minPlane; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("planes") int planes; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("regionStartX") int regionStartX; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("regionStartY") int regionStartY; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("regionEndX") int regionEndX; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("regionEndY") int regionEndY; WorldMapSection1() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljf;I)V", - garbageValue = "-474032336" + descriptor = "(Lkz;I)V", + garbageValue = "1844466074" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -55,10 +53,10 @@ public void expandBounds(WorldMapArea var1) { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "509257779" + garbageValue = "-1135530948" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -69,20 +67,20 @@ public boolean containsCoord(int var1, int var2, int var3) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-94" + descriptor = "(III)Z", + garbageValue = "1124460333" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1978048199" + garbageValue = "557011185" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -94,10 +92,10 @@ public int[] getBorderTileLengths(int var1, int var2, int var3) { } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)Lmc;", - garbageValue = "-1281040923" + descriptor = "(III)Lmo;", + garbageValue = "-1670709360" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -110,10 +108,10 @@ public Coord coord(int var1, int var2) { } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "47" + descriptor = "(Lul;I)V", + garbageValue = "-801073373" ) @Export("read") public void read(Buffer var1) { @@ -126,383 +124,12 @@ public void read(Buffer var1) { this.postRead(); } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-6" + descriptor = "(I)V", + garbageValue = "477600139" ) @Export("postRead") void postRead() { } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ldy;B)V", - garbageValue = "21" - ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - NPC.runScript(var0, 500000, 475000); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "-20" - ) - static int method1553(int var0, Script var1, boolean var2) { - if (var0 == 3200) { - SoundCache.Interpreter_intStackSize -= 3; - class27.queueSoundEffect(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]); - return 1; - } else { - int var3; - int var4; - int var5; - int var6; - int var7; - if (var0 == 3201) { - SoundCache.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 4]; - ArrayList var8 = new ArrayList(); - var8.add(var3); - class157.method836(var8, var4, var5, var6, var7); - return 1; - } else if (var0 == 3202) { - SoundCache.Interpreter_intStackSize -= 2; - Login.playJingle(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - return 1; - } else { - class90 var12; - class89 var13; - String var15; - if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { - boolean var16; - if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { - if (var0 == 3211) { - return 1; - } else if (var0 == 3216) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var4 = 0; - class90 var18 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var3); - if (var18 != null) { - var4 = var18 != class90.field893 ? 1 : 0; - } - - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4; - return 1; - } else if (var0 == 3218) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var4 = 0; - class89 var10 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var3); - if (var10 != null) { - var4 = var10 != class89.field884 ? 1 : 0; - } - - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4; - return 1; - } else if (var0 != 3217 && var0 != 3219) { - if (var0 == 3220) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Script.method445(var3, var4); - return 1; - } else if (var0 == 3221) { - SoundCache.Interpreter_intStackSize -= 6; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 4]; - int var11 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 5]; - ArrayList var9 = new ArrayList(); - var9.add(var3); - var9.add(var4); - class157.method836(var9, var5, var6, var7, var11); - return 1; - } else if (var0 == 3222) { - SoundCache.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - PacketWriter.someMusicMethod(var3, var4, var5, var6); - return 1; - } else { - return 2; - } - } else { - var12 = class90.field893; - var13 = class89.field884; - var16 = true; - boolean var17 = true; - if (var0 == 3217) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var12 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var7); - if (var12 == null) { - throw new RuntimeException(String.format("Unrecognized device option %d", var7)); - } - } - - if (var0 == 3219) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var13 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var7); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized game option %d", var7)); - } - } - - String var14; - byte var19; - if (var13 == class89.field884) { - switch(var12.field895) { - case 1: - case 2: - case 3: - var19 = 0; - var6 = 1; - break; - case 4: - var19 = 0; - var6 = Integer.MAX_VALUE; - break; - case 5: - var19 = 0; - var6 = 100; - break; - default: - var14 = String.format("Unkown device option: %s.", var12.toString()); - throw new RuntimeException(var14); - } - } else { - switch(var13.field885) { - case 1: - var19 = 0; - var6 = 1; - break; - case 2: - case 3: - case 4: - var19 = 0; - var6 = 100; - break; - default: - var14 = String.format("Unkown game option: %s.", var13.toString()); - throw new RuntimeException(var14); - } - } - - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var19; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var6; - return 1; - } - } else { - var12 = class90.field893; - var13 = class89.field884; - var16 = false; - if (var0 == 3214) { - var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var12 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var6); - if (var12 == null) { - throw new RuntimeException(String.format("Unrecognized device option %d", var6)); - } - } - - if (var0 == 3215) { - var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var13 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized game option %d", var6)); - } - } - - if (var0 == 3210) { - var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var12 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var6); - if (var12 == null) { - var13 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized client option %d", var6)); - } - } - } else if (var0 == 3182) { - var12 = class90.field890; - } else if (var0 == 3204) { - var13 = class89.field882; - } else if (var0 == 3206) { - var13 = class89.field883; - } else if (var0 == 3208) { - var13 = class89.field880; - } - - if (var13 == class89.field884) { - switch(var12.field895) { - case 1: - var5 = class449.clientPreferences.getIsUsernameHidden() ? 1 : 0; - break; - case 2: - var5 = class449.clientPreferences.getTitleMusicDisabled() ? 1 : 0; - break; - case 3: - var5 = class449.clientPreferences.method550() ? 1 : 0; - break; - case 4: - var5 = class449.clientPreferences.method552(); - break; - case 5: - var5 = PlayerType.method1883(); - break; - default: - var15 = String.format("Unkown device option: %s.", var12.toString()); - throw new RuntimeException(var15); - } - } else { - switch(var13.field885) { - case 1: - var5 = class449.clientPreferences.getRoofsHidden() ? 1 : 0; - break; - case 2: - var6 = class449.clientPreferences.getCurrentMusicVolume(); - var5 = Math.round((float)(var6 * 100) / 255.0F); - break; - case 3: - var6 = class449.clientPreferences.getCurrentSoundEffectsVolume(); - var5 = Math.round((float)(var6 * 100) / 127.0F); - break; - case 4: - var6 = class449.clientPreferences.getAreaSoundEffectsVolume(); - var5 = Math.round((float)(var6 * 100) / 127.0F); - break; - default: - var15 = String.format("Unkown game option: %s.", var13.toString()); - throw new RuntimeException(var15); - } - } - - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var5; - return 1; - } - } else { - var12 = class90.field893; - var13 = class89.field884; - var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var0 == 3212) { - var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var12 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var6); - if (var12 == null) { - throw new RuntimeException(String.format("Unrecognized device option %d", var6)); - } - } - - if (var0 == 3213) { - var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var13 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized game option %d", var6)); - } - } - - if (var0 == 3209) { - var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var12 = (class90)KeyHandler.findEnumerated(AbstractWorldMapData.method1517(), var6); - if (var12 == null) { - var13 = (class89)KeyHandler.findEnumerated(Varps.method1708(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized client option %d", var6)); - } - } - } else if (var0 == 3181) { - var12 = class90.field890; - } else if (var0 == 3203) { - var13 = class89.field882; - } else if (var0 == 3205) { - var13 = class89.field883; - } else if (var0 == 3207) { - var13 = class89.field880; - } - - if (var13 == class89.field884) { - switch(var12.field895) { - case 1: - class449.clientPreferences.setIsUsernameHidden(var5 == 1); - break; - case 2: - class449.clientPreferences.getTitleMusicDisabled(var5 == 1); - break; - case 3: - class449.clientPreferences.method548(var5 == 1); - break; - case 4: - if (var5 < 0) { - var5 = 0; - } - - class449.clientPreferences.method551(var5); - break; - case 5: - class20.method69(var5); - break; - default: - var15 = String.format("Unkown device option: %s.", var12.toString()); - throw new RuntimeException(var15); - } - } else { - switch(var13.field885) { - case 1: - class449.clientPreferences.setRoofsHidden(var5 == 1); - break; - case 2: - var5 = Math.min(Math.max(var5, 0), 100); - var6 = Math.round((float)(var5 * 255) / 100.0F); - WorldMapEvent.method1588(var6); - break; - case 3: - var5 = Math.min(Math.max(var5, 0), 100); - var6 = Math.round((float)(var5 * 127) / 100.0F); - class385.method2026(var6); - break; - case 4: - var5 = Math.min(Math.max(var5, 0), 100); - var6 = Math.round((float)(var5 * 127) / 100.0F); - class14.method44(var6); - break; - default: - var15 = String.format("Unkown game option: %s.", var13.toString()); - throw new RuntimeException(var15); - } - } - - return 1; - } - } - } - } - - @ObfuscatedName("iz") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1870954980" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.playingJingle) { - Script.method445(0, 0); - } else if (var0 != -1 && !class172.method906(var0) && class449.clientPreferences.getCurrentMusicVolume() != 0) { - ArrayList var1 = new ArrayList(); - var1.add(new MusicSong(class385.archive6, var0, 0, class449.clientPreferences.getCurrentMusicVolume(), false)); - if (Client.playingJingle) { - class305.field2773.clear(); - class305.field2773.addAll(var1); - class270.method1537(0, 100, 100, 0); - } else { - class53.method291(var1, 0, 100, 100, 0, false); - } - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSection2.java b/osrs/src/main/java/WorldMapSection2.java index 62d477956..3fdfd26f3 100644 --- a/osrs/src/main/java/WorldMapSection2.java +++ b/osrs/src/main/java/WorldMapSection2.java @@ -3,68 +3,71 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("kn") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("au") + @ObfuscatedName("ap") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("ac") @Export("minPlane") int minPlane; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("planes") int planes; - @ObfuscatedName("ao") + @ObfuscatedName("ak") @Export("regionStartX") int regionStartX; - @ObfuscatedName("at") + @ObfuscatedName("ax") @Export("regionStartY") int regionStartY; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("regionEndX") int regionEndX; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("regionEndY") int regionEndY; - @ObfuscatedName("az") - int field2342; - @ObfuscatedName("ap") - int field2339; - @ObfuscatedName("aa") - int field2333; - @ObfuscatedName("af") - int field2336; + @ObfuscatedName("ar") + int field2352; + @ObfuscatedName("ab") + int field2345; + @ObfuscatedName("am") + int field2350; + @ObfuscatedName("av") + int field2353; WorldMapSection2() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljf;I)V", - garbageValue = "-474032336" + descriptor = "(Lkz;I)V", + garbageValue = "1844466074" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2342) { - var1.regionLowX = this.field2342; + if (var1.regionLowX > this.field2352) { + var1.regionLowX = this.field2352; } - if (var1.regionHighX < this.field2333) { - var1.regionHighX = this.field2333; + if (var1.regionHighX < this.field2350) { + var1.regionHighX = this.field2350; } - if (var1.regionLowY > this.field2339) { - var1.regionLowY = this.field2339; + if (var1.regionLowY > this.field2345) { + var1.regionLowY = this.field2345; } - if (var1.regionHighY < this.field2336) { - var1.regionHighY = this.field2336; + if (var1.regionHighY < this.field2353) { + var1.regionHighY = this.field2353; } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "509257779" + garbageValue = "-1135530948" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -75,51 +78,51 @@ public boolean containsCoord(int var1, int var2, int var3) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-94" + descriptor = "(III)Z", + garbageValue = "1124460333" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field2342 && var1 >> 6 <= this.field2333 && var2 >> 6 >= this.field2339 && var2 >> 6 <= this.field2336; + return var1 >> 6 >= this.field2352 && var1 >> 6 <= this.field2350 && var2 >> 6 >= this.field2345 && var2 >> 6 <= this.field2353; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1978048199" + garbageValue = "557011185" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{var2 + (this.field2342 * 64 - this.regionStartX * 64), var3 + (this.field2339 * 64 - this.regionStartY * 64)}; + int[] var4 = new int[]{var2 + (this.field2352 * 64 - this.regionStartX * 64), var3 + (this.field2345 * 64 - this.regionStartY * 64)}; return var4; } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)Lmc;", - garbageValue = "-1281040923" + descriptor = "(III)Lmo;", + garbageValue = "-1670709360" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.regionStartX * 64 - this.field2342 * 64 + var1; - int var4 = var2 + (this.regionStartY * 64 - this.field2339 * 64); + int var3 = this.regionStartX * 64 - this.field2352 * 64 + var1; + int var4 = var2 + (this.regionStartY * 64 - this.field2345 * 64); return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "47" + descriptor = "(Lul;I)V", + garbageValue = "-801073373" ) @Export("read") public void read(Buffer var1) { @@ -129,40 +132,54 @@ public void read(Buffer var1) { this.regionStartY = var1.readUnsignedShort(); this.regionEndX = var1.readUnsignedShort(); this.regionEndY = var1.readUnsignedShort(); - this.field2342 = var1.readUnsignedShort(); - this.field2339 = var1.readUnsignedShort(); - this.field2333 = var1.readUnsignedShort(); - this.field2336 = var1.readUnsignedShort(); + this.field2352 = var1.readUnsignedShort(); + this.field2345 = var1.readUnsignedShort(); + this.field2350 = var1.readUnsignedShort(); + this.field2353 = var1.readUnsignedShort(); this.postRead(); } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(S)V", + garbageValue = "20489" ) @Export("postRead") void postRead() { } - @ObfuscatedName("ny") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "120" - ) - static final void method1410() { - Client.field511 = Client.cycleCntr; - WorldMapIcon_0.field2397 = true; - } - - @ObfuscatedName("os") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2063894036" + garbageValue = "-1323346942" ) - static void method1411() { - if (Client.oculusOrbState == 1) { - Client.oculusOrbOnLocalPlayer = true; + static void method1451() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { + class28.KeyHandler_keyCodes[186] = 57; + class28.KeyHandler_keyCodes[187] = 27; + class28.KeyHandler_keyCodes[188] = 71; + class28.KeyHandler_keyCodes[189] = 26; + class28.KeyHandler_keyCodes[190] = 72; + class28.KeyHandler_keyCodes[191] = 73; + class28.KeyHandler_keyCodes[192] = 58; + class28.KeyHandler_keyCodes[219] = 42; + class28.KeyHandler_keyCodes[220] = 74; + class28.KeyHandler_keyCodes[221] = 43; + class28.KeyHandler_keyCodes[222] = 59; + class28.KeyHandler_keyCodes[223] = 28; + } else { + class28.KeyHandler_keyCodes[44] = 71; + class28.KeyHandler_keyCodes[45] = 26; + class28.KeyHandler_keyCodes[46] = 72; + class28.KeyHandler_keyCodes[47] = 73; + class28.KeyHandler_keyCodes[59] = 57; + class28.KeyHandler_keyCodes[61] = 27; + class28.KeyHandler_keyCodes[91] = 42; + class28.KeyHandler_keyCodes[92] = 74; + class28.KeyHandler_keyCodes[93] = 43; + class28.KeyHandler_keyCodes[192] = 28; + class28.KeyHandler_keyCodes[222] = 58; + class28.KeyHandler_keyCodes[520] = 59; } } diff --git a/osrs/src/main/java/WorldMapSectionType.java b/osrs/src/main/java/WorldMapSectionType.java index 06de7610b..77f1a2349 100644 --- a/osrs/src/main/java/WorldMapSectionType.java +++ b/osrs/src/main/java/WorldMapSectionType.java @@ -3,45 +3,38 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +@ObfuscatedName("ky") @Implements("WorldMapSectionType") -public enum WorldMapSectionType implements class371 { - @ObfuscatedName("au") +public enum WorldMapSectionType implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lky;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(2, (byte)0), - @ObfuscatedName("ae") + WORLDMAPSECTIONTYPE0(0, (byte)0), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lky;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(3, (byte)1), - @ObfuscatedName("ao") + WORLDMAPSECTIONTYPE1(2, (byte)1), + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lky;" ) @Export("WORLDMAPSECTIONTYPE2") WORLDMAPSECTIONTYPE2(1, (byte)2), - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lky;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(0, (byte)3); + WORLDMAPSECTIONTYPE3(3, (byte)3); - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "Lns;" - ) - static StudioGame field2417; - @ObfuscatedName("cp") - static int field2416; - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("type") final int type; - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("id") final byte id; @@ -50,44 +43,276 @@ public enum WorldMapSectionType implements class371 { this.id = var4; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("au") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)J", - garbageValue = "-44" + descriptor = "(Luy;II)V", + garbageValue = "2004765344" ) - public static long method1515(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; + if (var2) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); + Player var4 = Client.players[var1]; + if (var3 == 0) { + if (var2) { + var4.hasMovementPending = false; + } else if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (class19.baseY + var4.pathY[0] >> 13) + (class20.baseX + var4.pathX[0] >> 13 << 14); + if (var4.movingOrientation != -1) { + Players.Players_orientations[var1] = var4.movingOrientation; + } else { + Players.Players_orientations[var1] = var4.orientation; + } + + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { + class304.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { + var5 = var0.readBits(3); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + --var6; + --var7; + } else if (var5 == 1) { + --var7; + } else if (var5 == 2) { + ++var6; + --var7; + } else if (var5 == 3) { + --var6; + } else if (var5 == 4) { + ++var6; + } else if (var5 == 5) { + --var6; + ++var7; + } else if (var5 == 6) { + ++var7; + } else if (var5 == 7) { + ++var6; + ++var7; + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.hasMovementPending = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.hasMovementPending = false; + var4.move(var6, var7, Players.playerMovementSpeeds[var1]); + } + } else { + var4.resetPath(var6, var7); + var4.hasMovementPending = false; + } + + } else if (var3 == 2) { + var5 = var0.readBits(4); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + var6 -= 2; + var7 -= 2; + } else if (var5 == 1) { + --var6; + var7 -= 2; + } else if (var5 == 2) { + var7 -= 2; + } else if (var5 == 3) { + ++var6; + var7 -= 2; + } else if (var5 == 4) { + var6 += 2; + var7 -= 2; + } else if (var5 == 5) { + var6 -= 2; + --var7; + } else if (var5 == 6) { + var6 += 2; + --var7; + } else if (var5 == 7) { + var6 -= 2; + } else if (var5 == 8) { + var6 += 2; + } else if (var5 == 9) { + var6 -= 2; + ++var7; + } else if (var5 == 10) { + var6 += 2; + ++var7; + } else if (var5 == 11) { + var6 -= 2; + var7 += 2; + } else if (var5 == 12) { + --var6; + var7 += 2; + } else if (var5 == 13) { + var7 += 2; + } else if (var5 == 14) { + ++var6; + var7 += 2; + } else if (var5 == 15) { + var6 += 2; + var7 += 2; + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.hasMovementPending = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.hasMovementPending = false; + var4.move(var6, var7, Players.playerMovementSpeeds[var1]); + } + } else { + var4.resetPath(var6, var7); + var4.hasMovementPending = false; + } + + } else { + var5 = var0.readBits(1); + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { + var6 = var0.readBits(12); + var7 = var6 >> 10; + var8 = var6 >> 5 & 31; + if (var8 > 15) { + var8 -= 32; + } + + var9 = var6 & 31; + if (var9 > 15) { + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; + var11 = var9 + var4.pathY[0]; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.hasMovementPending = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.hasMovementPending = false; + var4.move(var10, var11, Players.playerMovementSpeeds[var1]); + } + } else { + var4.resetPath(var10, var11); + var4.hasMovementPending = false; + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + class87.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (var8 + class20.baseX + var4.pathX[0] & 16383) - class20.baseX; + var11 = (var9 + class19.baseY + var4.pathY[0] & 16383) - class19.baseY; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.hasMovementPending = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.hasMovementPending = false; + var4.move(var10, var11, Players.playerMovementSpeeds[var1]); + } + } else { + var4.resetPath(var10, var11); + var4.hasMovementPending = false; + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + class87.Client_plane = var4.plane; + } + + } + } + } } - @ObfuscatedName("lq") + @ObfuscatedName("io") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lmi;B)Ljava/lang/String;", - garbageValue = "-26" + descriptor = "(IIII)V", + garbageValue = "-1356138757" ) - static String method1516(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; - } + static final void method1555(int var0, int var1, int var2) { + if (Client.cameraX < var0) { + Client.cameraX = (var0 - Client.cameraX) * class131.cameraMoveToAcceleration / 1000 + Client.cameraX + SecureRandomCallable.cameraMoveToSpeed; + if (Client.cameraX > var0) { + Client.cameraX = var0; + } + } - var0 = var0.substring(0, var3) + class176.method917(UserComparator9.method686(var1, var2 - 1)) + var0.substring(var3 + 2); - } + if (Client.cameraX > var0) { + Client.cameraX -= (Client.cameraX - var0) * class131.cameraMoveToAcceleration / 1000 + SecureRandomCallable.cameraMoveToSpeed; + if (Client.cameraX < var0) { + Client.cameraX = var0; + } + } + + if (class17.cameraY < var1) { + class17.cameraY = (var1 - class17.cameraY) * class131.cameraMoveToAcceleration / 1000 + class17.cameraY + SecureRandomCallable.cameraMoveToSpeed; + if (class17.cameraY > var1) { + class17.cameraY = var1; + } + } + + if (class17.cameraY > var1) { + class17.cameraY -= (class17.cameraY - var1) * class131.cameraMoveToAcceleration / 1000 + SecureRandomCallable.cameraMoveToSpeed; + if (class17.cameraY < var1) { + class17.cameraY = var1; + } + } + + if (WorldMapArea.cameraZ < var2) { + WorldMapArea.cameraZ = (var2 - WorldMapArea.cameraZ) * class131.cameraMoveToAcceleration / 1000 + WorldMapArea.cameraZ + SecureRandomCallable.cameraMoveToSpeed; + if (WorldMapArea.cameraZ > var2) { + WorldMapArea.cameraZ = var2; + } + } + + if (WorldMapArea.cameraZ > var2) { + WorldMapArea.cameraZ -= (WorldMapArea.cameraZ - var2) * class131.cameraMoveToAcceleration / 1000 + SecureRandomCallable.cameraMoveToSpeed; + if (WorldMapArea.cameraZ < var2) { + WorldMapArea.cameraZ = var2; } } - return var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSprite.java b/osrs/src/main/java/WorldMapSprite.java index 3425e3a82..d8259a8a1 100644 --- a/osrs/src/main/java/WorldMapSprite.java +++ b/osrs/src/main/java/WorldMapSprite.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kd") +@ObfuscatedName("kc") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("tileColors") final int[] tileColors; @@ -18,22 +18,13 @@ public final class WorldMapSprite { this.tileColors = var1; } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "0" + descriptor = "(IIS)I", + garbageValue = "156" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var2 * 64 + var1]; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)[Lft;", - garbageValue = "-331325439" - ) - static class131[] method1533() { - return new class131[]{class131.field1268, class131.field1264, class131.field1266, class131.field1267, class131.field1263, class131.field1265}; + return this.tileColors[var1 + var2 * 64]; } } \ No newline at end of file diff --git a/osrs/src/main/java/Wrapper.java b/osrs/src/main/java/Wrapper.java index b96480f06..256b66620 100644 --- a/osrs/src/main/java/Wrapper.java +++ b/osrs/src/main/java/Wrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lo") +@ObfuscatedName("lb") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("get") abstract Object get(); - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("isSoft") abstract boolean isSoft(); } \ No newline at end of file diff --git a/osrs/src/main/java/ZoneOperation.java b/osrs/src/main/java/ZoneOperation.java index 2a4c50b86..a18297b25 100644 --- a/osrs/src/main/java/ZoneOperation.java +++ b/osrs/src/main/java/ZoneOperation.java @@ -3,94 +3,98 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("lq") @Implements("ZoneOperation") public class ZoneOperation { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) - @Export("MAPPROJ_ANIM") - public static final ZoneOperation MAPPROJ_ANIM; - @ObfuscatedName("ae") + @Export("LOC_ADD_CHANGE") + public static final ZoneOperation LOC_ADD_CHANGE; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("LOC_ANIM") + public static final ZoneOperation LOC_ANIM; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) @Export("LOC_DEL") public static final ZoneOperation LOC_DEL; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("OBJ_DEL") + public static final ZoneOperation OBJ_DEL; @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) - @Export("OBJ_COUNT") - public static final ZoneOperation OBJ_COUNT; - @ObfuscatedName("at") + public static final ZoneOperation field2624; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) - public static final ZoneOperation field2607; - @ObfuscatedName("ac") + @Export("OBJ_COUNT") + public static final ZoneOperation OBJ_COUNT; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) - @Export("LOC_ADD_CHANGE") - public static final ZoneOperation LOC_ADD_CHANGE; - @ObfuscatedName("ai") + @Export("PREFETCH_GAMEOBJECTS") + public static final ZoneOperation PREFETCH_GAMEOBJECTS; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) - @Export("AREA_SOUND") - public static final ZoneOperation AREA_SOUND; - @ObfuscatedName("az") + public static final ZoneOperation field2617; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) - @Export("LOC_ANIM") - public static final ZoneOperation LOC_ANIM; - @ObfuscatedName("ap") + public static final ZoneOperation field2623; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) @Export("OBJ_ADD") public static final ZoneOperation OBJ_ADD; - @ObfuscatedName("aa") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) - @Export("OBJ_DEL_LEGACY") - public static final ZoneOperation OBJ_DEL_LEGACY; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - @Export("MAP_ANIM") - public static final ZoneOperation MAP_ANIM; - @ObfuscatedName("ad") + public static final ZoneOperation field2619; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) - @Export("PREFETCH_GAMEOBJECTS") - public static final ZoneOperation PREFETCH_GAMEOBJECTS; - @ObfuscatedName("aq") + @Export("AREA_SOUND") + public static final ZoneOperation AREA_SOUND; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llq;" ) - @Export("OBJ_DEL") - public static final ZoneOperation OBJ_DEL; + @Export("MAPPROJ_ANIM") + public static final ZoneOperation MAPPROJ_ANIM; static { - MAPPROJ_ANIM = new ZoneOperation(5); - LOC_DEL = new ZoneOperation(16); - OBJ_COUNT = new ZoneOperation(4); - field2607 = new ZoneOperation(4); - LOC_ADD_CHANGE = new ZoneOperation(2); - AREA_SOUND = new ZoneOperation(11); - LOC_ANIM = new ZoneOperation(6); - OBJ_ADD = new ZoneOperation(14); - OBJ_DEL_LEGACY = new ZoneOperation(14); - MAP_ANIM = new ZoneOperation(5); - PREFETCH_GAMEOBJECTS = new ZoneOperation(7); - OBJ_DEL = new ZoneOperation(19); + LOC_ADD_CHANGE = new ZoneOperation(5); + LOC_ANIM = new ZoneOperation(4); + LOC_DEL = new ZoneOperation(7); + OBJ_DEL = new ZoneOperation(4); + field2624 = new ZoneOperation(14); + OBJ_COUNT = new ZoneOperation(16); + PREFETCH_GAMEOBJECTS = new ZoneOperation(14); + field2617 = new ZoneOperation(6); + field2623 = new ZoneOperation(5); + OBJ_ADD = new ZoneOperation(19); + field2619 = new ZoneOperation(11); + AREA_SOUND = new ZoneOperation(2); + MAPPROJ_ANIM = new ZoneOperation(20); } @ObfuscatedSignature( @@ -99,4 +103,70 @@ public class ZoneOperation { ) ZoneOperation(int var1) { } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;II)Lmq;", + garbageValue = "-1598987475" + ) + static MusicPatch method1643(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + return var2 == null ? null : new MusicPatch(var2); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-191003094" + ) + static void method1644() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.obj != null) { + var0.set(); + } + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Luz;", + garbageValue = "-108536845" + ) + @Export("getDbTableType") + public static DbTableType getDbTableType(int var0) { + DbTableType var1 = (DbTableType)DbTableType.DBTableType_cache.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = DbTableType.field4138.takeFile(39, var0); + var1 = new DbTableType(); + if (var2 != null) { + var1.method2538(new Buffer(var2)); + } + + var1.method2540(); + DbTableType.DBTableType_cache.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(Lnm;II)V", + garbageValue = "-1795308286" + ) + public static void method1645(Widget var0, int var1) { + ItemComposition var2 = class214.ItemDefinition_get(var1); + var0.field3127.equipment[var2.maleModel] = var1 + 512; + if (var2.maleModel1 != -1) { + var0.field3127.equipment[var2.maleModel1] = 0; + } + + if (var2.maleModel2 != -1) { + var0.field3127.equipment[var2.maleModel2] = 0; + } + + var0.field3127.method1760(); + } } \ No newline at end of file diff --git a/osrs/src/main/java/class0.java b/osrs/src/main/java/class0.java index 54b330fbd..9e62e6b6c 100644 --- a/osrs/src/main/java/class0.java +++ b/osrs/src/main/java/class0.java @@ -2,11 +2,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("au") +@ObfuscatedName("ac") public class class0 implements class3 { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;)Ltm;" + descriptor = "(Lul;)Lul;" ) @Export("vmethod12") public Buffer vmethod12(Buffer var1) { @@ -15,16 +15,16 @@ public Buffer vmethod12(Buffer var1) { return var2; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;Ltm;)V" + descriptor = "(Lul;Lul;)V" ) void method1(Buffer var1, Buffer var2) { class8 var3 = new class8(var1); class5 var4 = new class5(var3); long var5; - for (var5 = 0L; !var4.method6(var3.method20(), var3.method19(), var5); ++var5) { + for (var5 = 0L; !var4.method8(var3.method25(), var3.method24(), var5); ++var5) { } var2.writeLong(var5); diff --git a/osrs/src/main/java/class1.java b/osrs/src/main/java/class1.java index 2c3c23360..07c0e3562 100644 --- a/osrs/src/main/java/class1.java +++ b/osrs/src/main/java/class1.java @@ -2,55 +2,54 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.ArrayList; import java.util.concurrent.Callable; -@ObfuscatedName("ae") +@ObfuscatedName("al") public class class1 implements Callable { - @ObfuscatedName("fp") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lul;" ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("au") + final Buffer field1; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ltm;" + descriptor = "Lax;" ) - final Buffer field2; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lat;" - ) - final class3 field1; + final class3 field0; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Lab;" ) @Export("this$0") @ObfuscatedName("this$0") final class7 this$0; @ObfuscatedSignature( - descriptor = "(Lap;Ltm;Lat;)V" + descriptor = "(Lab;Lul;Lax;)V" ) class1(class7 var1, Buffer var2, class3 var3) { this.this$0 = var1; - this.field2 = var2; - this.field1 = var3; + this.field1 = var2; + this.field0 = var3; } @Export("call") @ObfuscatedName("call") public Object call() { - return this.field1.vmethod12(this.field2); + return this.field0.vmethod12(this.field1); } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-262419719" + descriptor = "(Lom;Lom;Lom;Ljava/util/ArrayList;B)Z", + garbageValue = "-86" ) - static int method2() { - return class28.KeyHandler_keyCodes.length; + public static boolean method2(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, ArrayList var3) { + class319.field2800 = var0; + class319.field2802 = var1; + class319.field2801 = var2; + class319.midiPcmStream = var3; + return true; } } \ No newline at end of file diff --git a/osrs/src/main/java/class10.java b/osrs/src/main/java/class10.java index a9a093cbe..a6894658b 100644 --- a/osrs/src/main/java/class10.java +++ b/osrs/src/main/java/class10.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,111 +9,120 @@ import java.net.ProtocolException; import java.net.URL; -@ObfuscatedName("ad") +@ObfuscatedName("ag") public class class10 { - @ObfuscatedName("gd") + @ObfuscatedName("jz") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Ljt;" ) - static Archive field28; - @ObfuscatedName("au") - final HttpsURLConnection field34; - @ObfuscatedName("ae") + @Export("scene") + static Scene scene; + @ObfuscatedName("qq") + static int field24; + @ObfuscatedName("ac") + final HttpsURLConnection field31; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lqf;" + descriptor = "Lqv;" ) - final class419 field35; - @ObfuscatedName("ao") + final class434 field32; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lav;" ) - final class9 field33; - @ObfuscatedName("at") + final class9 field30; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lrf;" + descriptor = "Lsd;" ) - class461 field32; - @ObfuscatedName("ac") - boolean field29; - @ObfuscatedName("ai") - boolean field30; - @ObfuscatedName("az") - int field31; + class476 field29; + @ObfuscatedName("ao") + boolean field27; + @ObfuscatedName("ah") + boolean field26; + @ObfuscatedName("ar") + int field28; @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;Laf;Lqf;Z)V" + descriptor = "(Ljava/net/URL;Lav;Lqv;Z)V" ) - public class10(URL var1, class9 var2, class419 var3, boolean var4) throws IOException { - this.field29 = false; - this.field30 = false; - this.field31 = 300000; - if (!var2.method21()) { - throw new UnsupportedEncodingException("Unsupported request method used " + var2.method22()); + public class10(URL var1, class9 var2, class434 var3, boolean var4) throws IOException { + this.field27 = false; + this.field26 = false; + this.field28 = 300000; + if (!var2.method26()) { + throw new UnsupportedEncodingException("Unsupported request method used " + var2.method27()); } else { - this.field34 = (HttpsURLConnection)var1.openConnection(); + this.field31 = (HttpsURLConnection)var1.openConnection(); if (!var4) { - this.field34.setSSLSocketFactory(class15.method45()); + HttpsURLConnection var5 = this.field31; + if (class15.field44 == null) { + class15.field44 = new class15(); + } + + class15 var6 = class15.field44; + var5.setSSLSocketFactory(var6); } - this.field33 = var2; - this.field35 = var3 != null ? var3 : new class419(); + this.field30 = var2; + this.field32 = var3 != null ? var3 : new class434(); } } @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;Laf;Z)V" + descriptor = "(Ljava/net/URL;Lav;Z)V" ) public class10(URL var1, class9 var2, boolean var3) throws IOException { - this(var1, var2, new class419(), var3); + this(var1, var2, new class434(), var3); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)Lqf;", - garbageValue = "106" + descriptor = "(I)Lqv;", + garbageValue = "1852518909" ) - public class419 method27() { - return this.field35; + public class434 method31() { + return this.field32; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lrf;B)V", - garbageValue = "2" + descriptor = "(Lsd;I)V", + garbageValue = "-1455589333" ) - public void method28(class461 var1) { - if (!this.field29) { + public void method32(class476 var1) { + if (!this.field27) { if (var1 == null) { - this.field35.method2167("Content-Type"); - this.field32 = null; + this.field32.method2199("Content-Type"); + this.field29 = null; } else { - this.field32 = var1; - if (this.field32.vmethod2213() != null) { - this.field35.method2171(this.field32.vmethod2213()); + this.field29 = var1; + if (this.field29.vmethod2213() != null) { + this.field32.method2203(this.field29.vmethod2213()); } else { - this.field35.method2172(); + this.field32.method2204(); } } } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2080187114" + garbageValue = "937101739" ) - void method29() throws ProtocolException { - if (!this.field29) { - this.field34.setRequestMethod(this.field33.method22()); - this.field35.method2164(this.field34); - if (this.field33.method23() && this.field32 != null) { - this.field34.setDoOutput(true); + void method33() throws ProtocolException { + if (!this.field27) { + this.field31.setRequestMethod(this.field30.method27()); + this.field32.method2196(this.field31); + if (this.field30.method28() && this.field29 != null) { + this.field31.setDoOutput(true); ByteArrayOutputStream var1 = new ByteArrayOutputStream(); try { - var1.write(this.field32.vmethod7797()); - var1.writeTo(this.field34.getOutputStream()); + var1.write(this.field29.vmethod7797()); + var1.writeTo(this.field31.getOutputStream()); } catch (IOException var11) { var11.printStackTrace(); } finally { @@ -125,51 +135,86 @@ void method29() throws ProtocolException { } } - this.field34.setConnectTimeout(this.field31); - this.field34.setInstanceFollowRedirects(this.field30); - this.field29 = true; + this.field31.setConnectTimeout(this.field28); + this.field31.setInstanceFollowRedirects(this.field26); + this.field27 = true; } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-170543381" + garbageValue = "2097496739" ) - boolean method30() throws IOException { - if (!this.field29) { - this.method29(); + boolean method34() throws IOException { + if (!this.field27) { + this.method33(); } - this.field34.connect(); - return this.field34.getResponseCode() == -1; + this.field31.connect(); + return this.field31.getResponseCode() == -1; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Las;", - garbageValue = "-1418069243" + descriptor = "(I)Law;", + garbageValue = "1182023619" ) - class20 method31() { + class20 method35() { try { - if (!this.field29 || this.field34.getResponseCode() == -1) { + if (!this.field27 || this.field31.getResponseCode() == -1) { return new class20("No REST response has been received yet."); } } catch (IOException var10) { - this.field34.disconnect(); + this.field31.disconnect(); return new class20("Error decoding REST response code: " + var10.getMessage()); } class20 var3; try { - class20 var1 = new class20(this.field34); + class20 var1 = new class20(this.field31); return var1; } catch (IOException var8) { var3 = new class20("Error decoding REST response: " + var8.getMessage()); } finally { - this.field34.disconnect(); + this.field31.disconnect(); } return var3; } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(IIIII)I", + garbageValue = "-1751398414" + ) + static final int method30(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "([FI)V", + garbageValue = "-1762235426" + ) + static void method36(float[] var0) { + if (class128.field1202 + var0[0] < 1.3333334F) { + float var1 = var0[0] - 2.0F; + float var2 = var0[0] - 1.0F; + float var3 = (float)Math.sqrt((double)(var1 * var1 - var2 * var2 * 4.0F)); + float var4 = (var3 + -var1) * 0.5F; + if (var0[1] + class128.field1202 > var4) { + var0[1] = var4 - class128.field1202; + } else { + var4 = (-var1 - var3) * 0.5F; + if (var0[1] < class128.field1202 + var4) { + var0[1] = var4 + class128.field1202; + } + } + } else { + var0[0] = 1.3333334F - class128.field1202; + var0[1] = 0.33333334F - class128.field1202; + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/class101.java b/osrs/src/main/java/class101.java deleted file mode 100644 index b21fbaecb..000000000 --- a/osrs/src/main/java/class101.java +++ /dev/null @@ -1,57 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dq") -public class class101 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1873768041" - ) - public static boolean method598(int var0) { - return var0 >= WorldMapDecorationType.field3123.id && var0 <= WorldMapDecorationType.field3122.id || var0 == WorldMapDecorationType.field3119.id; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2030205668" - ) - static void method599() { - ByteArrayPool.field3746.clear(); - ByteArrayPool.field3746.add(100); - ByteArrayPool.field3746.add(5000); - ByteArrayPool.field3746.add(10000); - ByteArrayPool.field3746.add(30000); - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-1662859603" - ) - static int method600(int var0, Script var1, boolean var2) { - if (var0 == 6754) { - int var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - NPCComposition var4 = class90.getNpcDefinition(var3); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; - return 1; - } else { - NPCComposition var5; - if (var0 == 6764) { - SoundCache.Interpreter_intStackSize -= 2; - var5 = class90.getNpcDefinition(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); - int var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var5.method994(var6); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var5.method996(var6); - return 1; - } else if (var0 == 6765) { - var5 = class90.getNpcDefinition(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var5 != null ? var5.combatLevel * 989486243 * 599602955 : 0; - return 1; - } else { - return 2; - } - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class102.java b/osrs/src/main/java/class102.java deleted file mode 100644 index 692368cb2..000000000 --- a/osrs/src/main/java/class102.java +++ /dev/null @@ -1,261 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("de") -public class class102 { - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lrb;" - ) - static Bounds field1090; - @ObfuscatedName("au") - int field1094; - @ObfuscatedName("ae") - int field1091; - @ObfuscatedName("ao") - int field1092; - @ObfuscatedName("at") - int field1093; - - class102(int var1, int var2, int var3, int var4) { - this.field1094 = var1; - this.field1091 = var2; - this.field1092 = var3; - this.field1093 = var4; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-92" - ) - int method601() { - return this.field1094; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "93" - ) - int method602() { - return this.field1091; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-806640725" - ) - int method603() { - return this.field1092; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1075721841" - ) - int method604() { - return this.field1093; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(IIZI)Ljava/lang/String;", - garbageValue = "-880794678" - ) - static String method605(int var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - if (var2 && var0 >= 0) { - int var3 = 2; - - for (int var4 = var0 / var1; var4 != 0; ++var3) { - var4 /= var1; - } - - char[] var5 = new char[var3]; - var5[0] = '+'; - - for (int var6 = var3 - 1; var6 > 0; --var6) { - int var7 = var0; - var0 /= var1; - int var8 = var7 - var0 * var1; - if (var8 >= 10) { - var5[var6] = (char)(var8 + 87); - } else { - var5[var6] = (char)(var8 + 48); - } - } - - return new String(var5); - } else { - return Integer.toString(var0, var1); - } - } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-2114213929" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = class130.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var14; - int var26; - if (0L != var5) { - var7 = class130.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - boolean var12 = 0L != var5; - if (var12) { - boolean var13 = (int)(var5 >>> 16 & 1L) == 1; - var12 = !var13; - } - - if (var12) { - var10 = var4; - } - - int[] var19 = AbstractUserComparator.sceneMinimapSprite.pixels; - var26 = var1 * 4 + (103 - var2) * 2048 + 24624; - var14 = InvDefinition.Entity_unpackID(var5); - ObjectComposition var15 = WorldMapElement.getObjectDefinition(var14); - if (var15.mapSceneId != -1) { - IndexedSprite var16 = class299.mapSceneSprites[var15.mapSceneId]; - if (var16 != null) { - int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; - var16.drawAt(var17 + var1 * 4 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); - } - } else { - if (var9 == 0 || var9 == 2) { - if (var8 == 0) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if (var8 == 1) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; - } - } - - if (var9 == 3) { - if (var8 == 0) { - var19[var26] = var10; - } else if (var8 == 1) { - var19[var26 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { - var19[var26 + 1536] = var10; - } - } - - if (var9 == 2) { - if (var8 == 3) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if (var8 == 0) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if (var8 == 1) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; - } - } - } - } - - var5 = class130.scene.getGameObjectTag(var0, var1, var2); - if (var5 != 0L) { - var7 = class130.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = InvDefinition.Entity_unpackID(var5); - ObjectComposition var20 = WorldMapElement.getObjectDefinition(var10); - if (var20.mapSceneId != -1) { - IndexedSprite var28 = class299.mapSceneSprites[var20.mapSceneId]; - if (var28 != null) { - var26 = (var20.sizeX * 4 - var28.subWidth) / 2; - var14 = (var20.sizeY * 4 - var28.subHeight) / 2; - var28.drawAt(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); - } - } else if (var9 == 9) { - int var25 = 15658734; - boolean var27 = 0L != var5; - if (var27) { - boolean var21 = (int)(var5 >>> 16 & 1L) == 1; - var27 = !var21; - } - - if (var27) { - var25 = 15597568; - } - - int[] var22 = AbstractUserComparator.sceneMinimapSprite.pixels; - int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; - if (var8 != 0 && var8 != 2) { - var22[var29] = var25; - var22[var29 + 1 + 512] = var25; - var22[var29 + 1024 + 2] = var25; - var22[var29 + 1536 + 3] = var25; - } else { - var22[var29 + 1536] = var25; - var22[var29 + 1 + 1024] = var25; - var22[var29 + 512 + 2] = var25; - var22[var29 + 3] = var25; - } - } - } - - var5 = class130.scene.getFloorDecorationTag(var0, var1, var2); - if (var5 != 0L) { - var7 = InvDefinition.Entity_unpackID(var5); - ObjectComposition var23 = WorldMapElement.getObjectDefinition(var7); - if (var23.mapSceneId != -1) { - IndexedSprite var24 = class299.mapSceneSprites[var23.mapSceneId]; - if (var24 != null) { - var10 = (var23.sizeX * 4 - var24.subWidth) / 2; - int var11 = (var23.sizeY * 4 - var24.subHeight) / 2; - var24.drawAt(var1 * 4 + var10 + 48, (104 - var2 - var23.sizeY) * 4 + var11 + 48); - } - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class103.java b/osrs/src/main/java/class103.java new file mode 100644 index 000000000..3aaaeacdf --- /dev/null +++ b/osrs/src/main/java/class103.java @@ -0,0 +1,26 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("da") +public class class103 { + @ObfuscatedName("kk") + @ObfuscatedSignature( + descriptor = "[Lud;" + ) + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)Llx;", + garbageValue = "-1015037603" + ) + public static PacketBufferNode method599() { + PacketBufferNode var0 = class306.method1639(); + var0.clientPacket = null; + var0.clientPacketLength = 0; + var0.packetBuffer = new PacketBuffer(5000); + return var0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class104.java b/osrs/src/main/java/class104.java new file mode 100644 index 000000000..c433ca357 --- /dev/null +++ b/osrs/src/main/java/class104.java @@ -0,0 +1,227 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("eo") +public class class104 { + @ObfuscatedName("aa") + public static short[][] field1093; + @ObfuscatedName("ac") + int field1094; + @ObfuscatedName("al") + int field1096; + @ObfuscatedName("ak") + int field1095; + @ObfuscatedName("ax") + int field1097; + + class104(int var1, int var2, int var3, int var4) { + this.field1094 = var1; + this.field1096 = var2; + this.field1095 = var3; + this.field1097 = var4; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "86" + ) + int method600() { + return this.field1094; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "433721125" + ) + int method601() { + return this.field1096; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1676197536" + ) + int method602() { + return this.field1095; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-1" + ) + int method603() { + return this.field1097; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Lfz;FZI)F", + garbageValue = "-1944566118" + ) + static float method605(class132 var0, float var1, boolean var2) { + float var3 = 0.0F; + if (var0 != null && var0.method717() != 0) { + float var4 = (float)var0.field1237[0].field1200; + float var5 = (float)var0.field1237[var0.method717() - 1].field1200; + float var6 = var5 - var4; + if (0.0D == (double)var6) { + return var0.field1237[0].field1197; + } else { + float var7 = 0.0F; + if (var1 > var5) { + var7 = (var1 - var5) / var6; + } else { + var7 = (var1 - var4) / var6; + } + + double var8 = (double)((int)var7); + float var10 = Math.abs((float)((double)var7 - var8)); + float var11 = var10 * var6; + var8 = Math.abs(var8 + 1.0D); + double var12 = var8 / 2.0D; + double var14 = (double)((int)var12); + var10 = (float)(var12 - var14); + float var16; + float var17; + if (var2) { + if (var0.field1238 == class130.field1224) { + if ((double)var10 != 0.0D) { + var11 += var4; + } else { + var11 = var5 - var11; + } + } else if (var0.field1238 != class130.field1222 && var0.field1238 != class130.field1225) { + if (var0.field1238 == class130.field1223) { + var11 = var4 - var1; + var16 = var0.field1237[0].field1196; + var17 = var0.field1237[0].field1199; + var3 = var0.field1237[0].field1197; + if ((double)var16 != 0.0D) { + var3 -= var17 * var11 / var16; + } + + return var3; + } + } else { + var11 = var5 - var11; + } + } else if (var0.field1239 == class130.field1224) { + if ((double)var10 != 0.0D) { + var11 = var5 - var11; + } else { + var11 += var4; + } + } else if (var0.field1239 != class130.field1222 && var0.field1239 != class130.field1225) { + if (var0.field1239 == class130.field1223) { + var11 = var1 - var5; + var16 = var0.field1237[var0.method717() - 1].field1198; + var17 = var0.field1237[var0.method717() - 1].field1195; + var3 = var0.field1237[var0.method717() - 1].field1197; + if ((double)var16 != 0.0D) { + var3 += var11 * var17 / var16; + } + + return var3; + } + } else { + var11 += var4; + } + + var3 = class183.method938(var0, var11); + float var18; + if (var2 && var0.field1238 == class130.field1225) { + var18 = var0.field1237[var0.method717() - 1].field1197 - var0.field1237[0].field1197; + var3 = (float)((double)var3 - (double)var18 * var8); + } else if (!var2 && var0.field1239 == class130.field1225) { + var18 = var0.field1237[var0.method717() - 1].field1197 - var0.field1237[0].field1197; + var3 = (float)((double)var3 + (double)var18 * var8); + } + + return var3; + } + } else { + return var3; + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Lul;IIIIIIB)V", + garbageValue = "76" + ) + @Export("loadTerrain") + static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = var1 >= 0 && var1 < 4 && var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104; + int var8; + if (var7) { + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; + + while (true) { + var8 = var0.readUnsignedShort(); + if (var8 == 0) { + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -class530.method2643(932731 + var4, var5 + 556238) * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; + } + break; + } + + if (var8 == 1) { + int var9 = var0.readUnsignedByte(); + if (var9 == 1) { + var9 = 0; + } + + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -var9 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var9 * 8; + } + break; + } + + if (var8 <= 49) { + VertexNormal.Tiles_overlays[var1][var2][var3] = (short)var0.readShort(); + SecureRandomFuture.Tiles_shapes[var1][var2][var3] = (byte)((var8 - 2) / 4); + class199.field1563[var1][var2][var3] = (byte)(var8 - 2 + var6 & 3); + } else if (var8 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var8 - 49); + } else { + World.Tiles_underlays[var1][var2][var3] = (short)(var8 - 81); + } + } + } else { + while (true) { + var8 = var0.readUnsignedShort(); + if (var8 == 0) { + break; + } + + if (var8 == 1) { + var0.readUnsignedByte(); + break; + } + + if (var8 <= 49) { + var0.readShort(); + } + } + } + + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "-1642041169" + ) + static int method606(int var0, Script var1, boolean var2) { + return 2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class105.java b/osrs/src/main/java/class105.java deleted file mode 100644 index 5e57ea6f3..000000000 --- a/osrs/src/main/java/class105.java +++ /dev/null @@ -1,787 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("eh") -final class class105 implements class323 { - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lmi;" - ) - @Export("val$cc") - @ObfuscatedName("val$cc") - final Widget val$cc; - - @ObfuscatedSignature( - descriptor = "(Lmi;)V" - ) - class105(Widget var1) { - this.val$cc = var1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "17" - ) - @Export("vmethod5708") - public void vmethod5708() { - if (this.val$cc != null && this.val$cc.method1847().field2899 != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.method479(this.val$cc); - var1.setArgs(this.val$cc.method1847().field2899); - class30.getScriptEvents().addFirst(var1); - } - - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Lpi;Lpi;Lpi;B)V", - garbageValue = "-46" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (class113.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - class452.loginBoxCenter = Login.loginBoxX + 180; - byte var3; - int var4; - int var9; - boolean var15; - int var17; - int var25; - int var26; - int var34; - int var36; - int var43; - int var48; - if (Login.worldSelectOpen) { - if (class74.worldSelectBackSprites == null) { - class74.worldSelectBackSprites = class20.method67(PcmPlayer.archive8, "sl_back", ""); - } - - if (SoundCache.worldSelectFlagSprites == null) { - SoundCache.worldSelectFlagSprites = class219.method1149(PcmPlayer.archive8, "sl_flags", ""); - } - - if (MusicPatchPcmStream.worldSelectArrows == null) { - MusicPatchPcmStream.worldSelectArrows = class219.method1149(PcmPlayer.archive8, "sl_arrows", ""); - } - - if (SecureRandomCallable.worldSelectStars == null) { - SecureRandomCallable.worldSelectStars = class219.method1149(PcmPlayer.archive8, "sl_stars", ""); - } - - if (class85.worldSelectLeftSprite == null) { - class85.worldSelectLeftSprite = class172.SpriteBuffer_getIndexedSpriteByName(PcmPlayer.archive8, "leftarrow", ""); - } - - if (Skeleton.worldSelectRightSprite == null) { - Skeleton.worldSelectRightSprite = class172.SpriteBuffer_getIndexedSpriteByName(PcmPlayer.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); - if (SecureRandomCallable.worldSelectStars != null) { - SecureRandomCallable.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - SecureRandomCallable.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (MusicPatchPcmStream.worldSelectArrows != null) { - var34 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - MusicPatchPcmStream.worldSelectArrows[2].drawAt(var34, 4); - } else { - MusicPatchPcmStream.worldSelectArrows[0].drawAt(var34, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - MusicPatchPcmStream.worldSelectArrows[3].drawAt(var34 + 15, 4); - } else { - MusicPatchPcmStream.worldSelectArrows[1].drawAt(var34 + 15, 4); - } - - var0.draw("World", var34 + 32, 17, 16777215, -1); - var4 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - MusicPatchPcmStream.worldSelectArrows[2].drawAt(var4, 4); - } else { - MusicPatchPcmStream.worldSelectArrows[0].drawAt(var4, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - MusicPatchPcmStream.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - MusicPatchPcmStream.worldSelectArrows[1].drawAt(var4 + 15, 4); - } - - var0.draw("Players", var4 + 32, 17, 16777215, -1); - var43 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - MusicPatchPcmStream.worldSelectArrows[2].drawAt(var43, 4); - } else { - MusicPatchPcmStream.worldSelectArrows[0].drawAt(var43, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - MusicPatchPcmStream.worldSelectArrows[3].drawAt(var43 + 15, 4); - } else { - MusicPatchPcmStream.worldSelectArrows[1].drawAt(var43 + 15, 4); - } - - var0.draw("Location", var43 + 32, 17, 16777215, -1); - var26 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - MusicPatchPcmStream.worldSelectArrows[2].drawAt(var26, 4); - } else { - MusicPatchPcmStream.worldSelectArrows[0].drawAt(var26, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - MusicPatchPcmStream.worldSelectArrows[3].drawAt(var26 + 15, 4); - } else { - MusicPatchPcmStream.worldSelectArrows[1].drawAt(var26 + 15, 4); - } - - var0.draw("Type", var26 + 32, 17, 16777215, -1); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); - Login.hoveredWorldIndex = -1; - if (class74.worldSelectBackSprites != null) { - var3 = 88; - byte var39 = 19; - var43 = 765 / (var3 + 1) - 1; - var26 = 480 / (var39 + 1); - - do { - var48 = var26; - var25 = var43; - if (var26 * (var43 - 1) >= World.World_count) { - --var43; - } - - if (var43 * (var26 - 1) >= World.World_count) { - --var26; - } - - if (var43 * (var26 - 1) >= World.World_count) { - --var26; - } - } while(var48 != var26 || var25 != var43); - - var48 = (765 - var3 * var43) / (var43 + 1); - if (var48 > 5) { - var48 = 5; - } - - var25 = (480 - var39 * var26) / (var26 + 1); - if (var25 > 5) { - var25 = 5; - } - - var9 = (765 - var43 * var3 - var48 * (var43 - 1)) / 2; - int var29 = (480 - var26 * var39 - var25 * (var26 - 1)) / 2; - var36 = (var26 + World.World_count - 1) / var26; - Login.worldSelectPagesCount = var36 - var43; - if (class85.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - class85.worldSelectLeftSprite.drawAt(8, class177.canvasHeight / 2 - class85.worldSelectLeftSprite.subHeight / 2); - } - - if (Skeleton.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - Skeleton.worldSelectRightSprite.drawAt(class113.canvasWidth - Skeleton.worldSelectRightSprite.subWidth - 8, class177.canvasHeight / 2 - Skeleton.worldSelectRightSprite.subHeight / 2); - } - - int var38 = var29 + 23; - int var30 = var9 + Login.xPadding; - int var31 = 0; - var15 = false; - int var40 = Login.worldSelectPage; - - for (var17 = var26 * var40; var17 < World.World_count && var40 - Login.worldSelectPage < var43; ++var17) { - World var32 = class176.World_worlds[var17]; - boolean var19 = true; - String var20 = Integer.toString(var32.population); - if (var32.population == -1) { - var20 = "OFF"; - var19 = false; - } else if (var32.population > 1980) { - var20 = "FULL"; - var19 = false; - } - - class108 var21 = null; - int var22 = 0; - if (var32.isBeta()) { - var21 = var32.isMembersOnly() ? class108.field1133 : class108.field1138; - } else if (var32.isDeadman()) { - var21 = var32.isMembersOnly() ? class108.field1124 : class108.field1135; - } else if (var32.method391()) { - var22 = 16711680; - var21 = var32.isMembersOnly() ? class108.field1129 : class108.field1125; - } else if (var32.method393()) { - var21 = var32.isMembersOnly() ? class108.field1128 : class108.field1123; - } else if (var32.isPvp()) { - var21 = var32.isMembersOnly() ? class108.field1136 : class108.field1132; - } else if (var32.method394()) { - var21 = var32.isMembersOnly() ? class108.field1134 : class108.field1126; - } else if (var32.method395()) { - var21 = var32.isMembersOnly() ? class108.field1131 : class108.field1130; - } - - if (var21 == null || var21.field1139 >= class74.worldSelectBackSprites.length) { - var21 = var32.isMembersOnly() ? class108.field1127 : class108.field1137; - } - - if (MouseHandler.MouseHandler_x >= var30 && MouseHandler.MouseHandler_y >= var38 && MouseHandler.MouseHandler_x < var30 + var3 && MouseHandler.MouseHandler_y < var38 + var39 && var19) { - Login.hoveredWorldIndex = var17; - class74.worldSelectBackSprites[var21.field1139].drawTransOverlayAt(var30, var38, 128, 16777215); - var15 = true; - } else { - class74.worldSelectBackSprites[var21.field1139].drawAt(var30, var38); - } - - if (SoundCache.worldSelectFlagSprites != null) { - SoundCache.worldSelectFlagSprites[(var32.isMembersOnly() ? 8 : 0) + var32.location].drawAt(var30 + 29, var38); - } - - var0.drawCentered(Integer.toString(var32.id), var30 + 15, var39 / 2 + var38 + 5, var22, -1); - var1.drawCentered(var20, var30 + 60, var39 / 2 + var38 + 5, 268435455, -1); - var38 = var38 + var39 + var25; - ++var31; - if (var31 >= var26) { - var38 = var29 + 23; - var30 = var30 + var3 + var48; - var31 = 0; - ++var40; - } - } - - if (var15) { - var17 = var1.stringWidth(class176.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var41 = var1.ascent + 8; - int var42 = MouseHandler.MouseHandler_y + 25; - if (var41 + var42 > 480) { - var42 = MouseHandler.MouseHandler_y - 25 - var41; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var42, var17, var41, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var42, var17, var41, 0); - var1.drawCentered(class176.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var42 + var1.ascent + 4, 0, -1); - } - } - - } else { - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Bounds.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - SoundSystem.logoSprite.drawAt(Login.xPadding + 382 - SoundSystem.logoSprite.subWidth / 2, 18); - if (Client.gameState == 0 || Client.gameState == 5) { - var3 = 20; - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); - var4 = 253 - var3; - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); - } - - String var5; - String var6; - String var7; - String var8; - short var33; - short var35; - if (Client.gameState == 20) { - Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); - var33 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var34 += 7; - if (Login.loginIndex != 4 && Login.loginIndex != 10) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var34, 16777215, 0); - var35 = 200; - - for (var5 = class238.method1310(); var0.stringWidth(var5) > var35; var5 = var5.substring(0, var5.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var34, 16777215, 0); - var34 += 15; - var7 = Login.Login_password; - var6 = class270.method1538('*', var7.length()); - - for (var8 = var6; var0.stringWidth(var8) > var35; var8 = var8.substring(1)) { - } - - var0.draw("Password: " + var8, Login.loginBoxX + 180 - 108, var34, 16777215, 0); - var34 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { - Login.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var23; - if (Login.loginIndex == 0) { - var33 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 30; - var4 = Login.loginBoxX + 180 - 80; - var23 = 291; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var4 = Login.loginBoxX + 180 + 80; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var33 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var4 = Login.loginBoxX + 180 - 80; - var23 = 321; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); - } else { - IndexedSprite var10; - if (Login.loginIndex == 2) { - var33 = 201; - var0.drawCentered(Login.Login_response1, class452.loginBoxCenter, var33, 16776960, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, class452.loginBoxCenter, var34, 16776960, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, class452.loginBoxCenter, var34, 16776960, 0); - var34 += 15; - var34 += 7; - var0.draw("Login: ", class452.loginBoxCenter - 110, var34, 16777215, 0); - var35 = 200; - - for (var5 = class238.method1310(); var0.stringWidth(var5) > var35; var5 = var5.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? MoveSpeed.colorStartTag(16776960) + "|" : ""), class452.loginBoxCenter - 70, var34, 16777215, 0); - var34 += 15; - var7 = Login.Login_password; - var6 = class270.method1538('*', var7.length()); - - for (var8 = var6; var0.stringWidth(var8) > var35; var8 = var8.substring(1)) { - } - - var0.draw("Password: " + var8 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? MoveSpeed.colorStartTag(16776960) + "|" : ""), class452.loginBoxCenter - 108, var34, 16777215, 0); - var34 += 15; - var33 = 277; - var9 = class452.loginBoxCenter + -117; - boolean var11 = Client.Login_isUsernameRemembered; - boolean var12 = Login.field745; - var10 = var11 ? (var12 ? VerticalAlignment.field1631 : UserComparator6.options_buttons_2Sprite) : (var12 ? Skills.field3145 : Login.options_buttons_0Sprite); - var10.drawAt(var9, var33); - var9 = var9 + var10.subWidth + 5; - var1.draw("Remember username", var9, var33 + 13, 16776960, 0); - var9 = class452.loginBoxCenter + 24; - var15 = class449.clientPreferences.getIsUsernameHidden(); - boolean var16 = Login.field744; - IndexedSprite var14 = var15 ? (var16 ? VerticalAlignment.field1631 : UserComparator6.options_buttons_2Sprite) : (var16 ? Skills.field3145 : Login.options_buttons_0Sprite); - var14.drawAt(var9, var33); - var9 = var9 + var14.subWidth + 5; - var1.draw("Hide username", var9, var33 + 13, 16776960, 0); - var34 = var33 + 15; - var17 = class452.loginBoxCenter - 80; - short var18 = 321; - class219.titlebuttonSprite.drawAt(var17 - 73, var18 - 20); - var0.drawCentered("Login", var17, var18 + 5, 16777215, 0); - var17 = class452.loginBoxCenter + 80; - class219.titlebuttonSprite.drawAt(var17 - 73, var18 - 20); - var0.drawCentered("Cancel", var17, var18 + 5, 16777215, 0); - var33 = 357; - switch(Login.field751) { - case 2: - class151.field1365 = "Having trouble logging in?"; - break; - default: - class151.field1365 = "Can't login? Click here."; - } - - class102.field1090 = new Bounds(class452.loginBoxCenter, var33, var1.stringWidth(class151.field1365), 11); - class90.field887 = new Bounds(class452.loginBoxCenter, var33, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(class151.field1365, class452.loginBoxCenter, var33, 16777215, 0); - } else if (Login.loginIndex == 3) { - var33 = 201; - var0.drawCentered("Incorrect username or password.", Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 20; - var1.drawCentered("If you have upgraded to a Jagex Account, you", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 20; - var1.drawCentered("need to log in using the Jagex Launcher instead.", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var4 = Login.loginBoxX + 180; - var23 = 276; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var23 = 326; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var33 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var5 = "PIN: "; - var7 = class369.otp; - var6 = class270.method1538('*', var7.length()); - var0.draw(var5 + var6 + (Client.cycle % 40 < 20 ? MoveSpeed.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var34, 16777215, 0); - var34 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var34, 16776960, 0); - var34 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var34, 16776960, 0); - var25 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; - var9 = var34 - var0.ascent; - if (Login.field743) { - var10 = UserComparator6.options_buttons_2Sprite; - } else { - var10 = Login.options_buttons_0Sprite; - } - - var10.drawAt(var25, var9); - var34 += 15; - var36 = Login.loginBoxX + 180 - 80; - short var37 = 321; - class219.titlebuttonSprite.drawAt(var36 - 73, var37 - 20); - var0.drawCentered("Continue", var36, var37 + 5, 16777215, 0); - var36 = Login.loginBoxX + 180 + 80; - class219.titlebuttonSprite.drawAt(var36 - 73, var37 - 20); - var0.drawCentered("Cancel", var36, var37 + 5, 16777215, 0); - var1.drawCentered("Can't login? Click here.", Login.loginBoxX + 180, var37 + 36, 16777215, 0); - } else if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var33 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var34 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var34, 16777215, 0); - var35 = 174; - - for (var5 = class238.method1310(); var0.stringWidth(var5) > var35; var5 = var5.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? MoveSpeed.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var34, 16777215, 0); - var34 += 15; - var26 = Login.loginBoxX + 180 - 80; - short var27 = 321; - class219.titlebuttonSprite.drawAt(var26 - 73, var27 - 20); - var0.drawCentered("Recover", var26, var27 + 5, 16777215, 0); - var26 = Login.loginBoxX + 180 + 80; - class219.titlebuttonSprite.drawAt(var26 - 73, var27 - 20); - var0.drawCentered("Back", var26, var27 + 5, 16777215, 0); - var27 = 356; - var1.drawCentered("Still having trouble logging in?", class452.loginBoxCenter, var27, 268435455, 0); - } else if (Login.loginIndex == 6) { - var33 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var4 = Login.loginBoxX + 180; - var23 = 321; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - if (ModeWhere.field3613 && !Client.onMobile) { - var33 = 201; - var0.drawCentered(Login.Login_response1, class452.loginBoxCenter, var33, 16776960, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, class452.loginBoxCenter, var34, 16776960, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, class452.loginBoxCenter, var34, 16776960, 0); - var4 = class452.loginBoxCenter - 150; - var34 += 10; - - for (var43 = 0; var43 < 8; ++var43) { - class219.titlebuttonSprite.method2654(var4, var34, 30, 40); - boolean var45 = var43 == Login.field752 & Client.cycle % 40 < 20; - var0.draw((Login.field768[var43] == null ? "" : Login.field768[var43]) + (var45 ? MoveSpeed.colorStartTag(16776960) + "|" : ""), var4 + 10, var34 + 27, 16777215, 0); - if (var43 != 1 && var43 != 3) { - var4 += 35; - } else { - var4 += 50; - var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var34 + 27, 16777215, 0); - } - } - - var43 = class452.loginBoxCenter - 80; - short var46 = 321; - class219.titlebuttonSprite.drawAt(var43 - 73, var46 - 20); - var0.drawCentered("Submit", var43, var46 + 5, 16777215, 0); - var43 = class452.loginBoxCenter + 80; - class219.titlebuttonSprite.drawAt(var43 - 73, var46 - 20); - var0.drawCentered("Cancel", var43, var46 + 5, 16777215, 0); - } else { - var33 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var4 = Login.loginBoxX + 180 - 80; - var23 = 321; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); - } - } else if (Login.loginIndex == 8) { - var33 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var4 = Login.loginBoxX + 180 - 80; - var23 = 321; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 9) { - var33 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 25; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 25; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); - var4 = Login.loginBoxX + 180; - var23 = 311; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 10) { - var34 = Login.loginBoxX + 180; - var35 = 209; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var35, 16776960, 0); - var4 = var35 + 20; - Login.field777.drawAt(var34 - 109, var4); - if (Login.field764.isEmpty()) { - ItemContainer.field853.drawAt(var34 - 48, var4 + 18); - } else { - ItemContainer.field853.drawAt(var34 - 48, var4 + 5); - var0.drawCentered(Login.field764, var34, var4 + 68 - 15, 16776960, 0); - } - } else if (Login.loginIndex == 12) { - var34 = class452.loginBoxCenter; - var35 = 216; - var2.drawCentered("Before using this app, please read and accept our", var34, var35, 16777215, 0); - var4 = var35 + 17; - var2.drawCentered("terms of use, privacy policy, and end user licence", var34, var4, 16777215, 0); - var4 += 17; - var2.drawCentered("agreement (EULA).", var34, var4, 16777215, 0); - var4 += 17; - var2.drawCentered("By accepting, you agree to these documents.", var34, var4, 16777215, 0); - var34 = class452.loginBoxCenter - 80; - var35 = 311; - class219.titlebuttonSprite.drawAt(var34 - 73, var35 - 20); - var0.drawCentered("Accept", var34, var35 + 5, 16777215, 0); - var34 = class452.loginBoxCenter + 80; - class219.titlebuttonSprite.drawAt(var34 - 73, var35 - 20); - var0.drawCentered("Decline", var34, var35 + 5, 16777215, 0); - } else if (Login.loginIndex == 13) { - var33 = 231; - var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var33, 16777215, 0); - var34 = var33 + 20; - var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var34, 16777215, 0); - var4 = Login.loginBoxX + 180; - var33 = 311; - class219.titlebuttonSprite.drawAt(var4 - 73, var33 - 20); - var0.drawCentered("Back", var4, var33 + 5, 16777215, 0); - } else if (Login.loginIndex == 14) { - var33 = 201; - String var24 = ""; - var5 = ""; - var6 = ""; - switch(Login.field750) { - case 0: - var24 = "Your account has been involved"; - var5 = "in serious rule breaking."; - var6 = ""; - break; - case 1: - var24 = "Your account has been locked due to"; - var5 = "suspicious activity."; - var6 = "Please recover your account."; - break; - case 2: - var24 = "The unpaid balance on your account needs"; - var5 = "to be resolved before you can play."; - var6 = Strings.field3315; - break; - default: - WorldMapAreaData.Login_promptCredentials(false); - } - - var0.drawCentered(var24, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 20; - var0.drawCentered(var5, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 20; - var0.drawCentered(var6, Login.loginBoxX + 180, var34, 16776960, 0); - var48 = Login.loginBoxX + 180; - short var44 = 276; - class219.titlebuttonSprite.drawAt(var48 - 73, var44 - 20); - if (Login.field750 == 1) { - var0.drawCentered("Recover Account", var48, var44 + 5, 16777215, 0); - } else { - var0.drawCentered("View Appeal Options", var48, var44 + 5, 16777215, 0); - } - - var48 = Login.loginBoxX + 180; - var44 = 326; - class219.titlebuttonSprite.drawAt(var48 - 73, var44 - 20); - var0.drawCentered("Back", var48, var44 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var33 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var4 = Login.loginBoxX + 180; - var23 = 301; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 32) { - var33 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var4 = Login.loginBoxX + 180 - 80; - var23 = 321; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 33) { - var33 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 20; - var1.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 20; - var1.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var4 = Login.loginBoxX + 180; - var23 = 276; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var2.drawCentered("Download Launcher", var4, var23 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var23 = 326; - class219.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var2.drawCentered("Back", var4, var23 + 5, 16777215, 0); - } - } - } - - if (Client.gameState >= 10) { - int[] var28 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var28); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class177.canvasHeight); - class139.field1323.draw(Login.xPadding - 22, Client.cycle); - class139.field1323.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var28); - } - - class13.title_muteSprite[class449.clientPreferences.getTitleMusicDisabled() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && Language.Language_EN == ClanChannelMember.clientLanguage) { - if (VarcInt.field1534 != null) { - var34 = Login.xPadding + 5; - var35 = 463; - byte var49 = 100; - byte var47 = 35; - VarcInt.field1534.drawAt(var34, var35); - var0.drawCentered("World" + " " + Client.worldId, var49 / 2 + var34, var47 / 2 + var35 - 2, 16777215, 0); - if (WorldMapLabelSize.World_request != null) { - var1.drawCentered("Loading...", var49 / 2 + var34, var47 / 2 + var35 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var49 / 2 + var34, var47 / 2 + var35 + 12, 16777215, 0); - } - } else { - VarcInt.field1534 = class172.SpriteBuffer_getIndexedSpriteByName(PcmPlayer.archive8, "sl_button", ""); - } - } - - } - } - - @ObfuscatedName("hp") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "163402086" - ) - static void method615() { - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1159 = null; - Client.packetWriter.field1157 = null; - Client.packetWriter.field1158 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1154 = 0; - Client.rebootTimer = 0; - Frames.method1297(); - Client.minimapState = 0; - Client.destinationX = 0; - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; - } - - VarbitComposition.localPlayer = null; - - for (var0 = 0; var0 < Client.npcs.length; ++var0) { - NPC var1 = Client.npcs[var0]; - if (var1 != null) { - var1.targetIndex = -1; - var1.false0 = false; - } - } - - LoginPacket.method1614(); - MusicSong.updateGameState(30); - - for (var0 = 0; var0 < 100; ++var0) { - Client.field407[var0] = true; - } - - Message.method341(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class106.java b/osrs/src/main/java/class106.java deleted file mode 100644 index c94e6b7d0..000000000 --- a/osrs/src/main/java/class106.java +++ /dev/null @@ -1,71 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ey") -final class class106 implements class323 { - @ObfuscatedName("ae") - @Export("javaVersion") - public static String javaVersion; - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - static Archive field1107; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lmi;" - ) - @Export("val$cc") - @ObfuscatedName("val$cc") - final Widget val$cc; - - @ObfuscatedSignature( - descriptor = "(Lmi;)V" - ) - class106(Widget var1) { - this.val$cc = var1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "17" - ) - @Export("vmethod5708") - public void vmethod5708() { - if (this.val$cc != null && this.val$cc.method1847().field2900 != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.method479(this.val$cc); - var1.setArgs(this.val$cc.method1847().field2900); - class30.getScriptEvents().addFirst(var1); - } - - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-47" - ) - static final int method617(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class107.java b/osrs/src/main/java/class107.java new file mode 100644 index 000000000..7ef0f9a0c --- /dev/null +++ b/osrs/src/main/java/class107.java @@ -0,0 +1,33 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ec") +final class class107 implements class337 { + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + final Widget val$cc; + + @ObfuscatedSignature( + descriptor = "(Lnm;)V" + ) + class107(Widget var1) { + this.val$cc = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-118" + ) + public void vmethod5708() { + if (this.val$cc != null && this.val$cc.method1880().field2932 != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.method470(this.val$cc); + var1.setArgs(this.val$cc.method1880().field2932); + class7.getScriptEvents().addFirst(var1); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class108.java b/osrs/src/main/java/class108.java index c2cad4172..1b840c392 100644 --- a/osrs/src/main/java/class108.java +++ b/osrs/src/main/java/class108.java @@ -1,215 +1,887 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; - -@ObfuscatedName("eq") -public class class108 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1137; - @ObfuscatedName("ae") +@ObfuscatedName("eg") +final class class108 implements class337 { + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "Lnm;" ) - static final class108 field1127; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1132; - @ObfuscatedName("at") + final Widget val$cc; + @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "(Lnm;)V" ) - static final class108 field1136; + class108(Widget var1) { + this.val$cc = var1; + } + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1125; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1129; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1138; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1133; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1123; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1128; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1126; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1134; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1130; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - static final class108 field1131; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "(B)V", + garbageValue = "-118" ) - static final class108 field1135; - @ObfuscatedName("ab") + public void vmethod5708() { + if (this.val$cc != null && this.val$cc.method1880().field2935 != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.method470(this.val$cc); + var1.setArgs(this.val$cc.method1880().field2935); + class7.getScriptEvents().addFirst(var1); + } + + } + + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "(Luy;B)I", + garbageValue = "0" ) - static final class108 field1124; - @ObfuscatedName("ag") - int field1139; - - static { - field1137 = new class108(0); - field1127 = new class108(1); - field1132 = new class108(2); - field1136 = new class108(3); - field1125 = new class108(4); - field1129 = new class108(5); - field1138 = new class108(6); - field1133 = new class108(7); - field1123 = new class108(8); - field1128 = new class108(9); - field1126 = new class108(10); - field1134 = new class108(11); - field1130 = new class108(12); - field1131 = new class108(13); - field1135 = new class108(14); - field1124 = new class108(15); - } + static int method619(PacketBuffer var0) { + int var1 = var0.readBits(2); + int var2; + if (var1 == 0) { + var2 = 0; + } else if (var1 == 1) { + var2 = var0.readBits(5); + } else if (var1 == 2) { + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); + } - class108(int var1) { - this.field1139 = var1; + return var2; } - @ObfuscatedName("an") + @ObfuscatedName("lo") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "69" + descriptor = "(IIIII)V", + garbageValue = "-957149443" ) - static void method620() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class318.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var1; - try { - URL var3 = new URL(HorizontalAlignment.method978("services", false) + "m=accountappeal/login.ws"); - URLConnection var4 = var3.openConnection(); - var4.setRequestProperty("connection", "close"); - var4.setDoInput(true); - var4.setDoOutput(true); - var4.setConnectTimeout(5000); - OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); - var5.write("data1=req"); - var5.flush(); - InputStream var6 = var4.getInputStream(); - Buffer var7 = new Buffer(new byte[1000]); - - while (true) { - int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); - if (var8 == -1) { - var7.offset = 0; - long var10 = var7.readLong(); - var1 = var10; - break; - } + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + class153.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + } - var7.offset += var8; - if (var7.offset >= 1000) { - var1 = 0L; - break; - } + long var4 = -1L; + long var6 = -1L; + int var8 = 0; + + while (true) { + int var10 = ViewportMouse.ViewportMouse_entityCount; + if (var8 >= var10) { + if (var4 != -1L) { + var8 = (int)(var4 >>> 0 & 127L); + var10 = (int)(var4 >>> 7 & 127L); + Player var12 = Client.players[Client.combatTargetPlayerIndex]; + DirectByteArrayCopier.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); } - } catch (Exception var14) { - var1 = 0L; - } - int var0; - if (var1 == 0L) { - var0 = 5; - } else { - var0 = class318.method1703(var1, Login.Login_username); + return; } - switch(var0) { - case 2: - class318.setLoginResponseString(Strings.field3423, Strings.field3422, Strings.field3414); - PcmPlayer.method212(6); - break; - case 3: - class318.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - class318.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - class318.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - class318.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - class318.setLoginResponseString("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."); + long var26 = ViewportMouse.ViewportMouse_entityTags[var8]; + if (var6 != var26) { + label309: { + var6 = var26; + int var15 = HealthBar.method575(var8); + int var16 = class228.method1169(var8); + long var19 = ViewportMouse.ViewportMouse_entityTags[var8]; + int var18 = (int)(var19 >>> 14 & 3L); + int var28 = GrandExchangeOfferOwnWorldComparator.method348(var8); + int var23; + if (var18 == 2 && class10.scene.getObjectFlags(class87.Client_plane, var15, var16, var26) >= 0) { + ObjectComposition var20 = class91.getObjectDefinition(var28); + if (var20.transforms != null) { + var20 = var20.transform(); + } + + if (var20 == null) { + break label309; + } + + PendingSpawn var21 = null; + + for (PendingSpawn var22 = (PendingSpawn)Client.pendingSpawns.last(); var22 != null; var22 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var22.plane == class87.Client_plane && var15 == var22.x && var16 == var22.y && var28 == var22.id) { + var21 = var22; + break; + } + } + + if (Client.isItemSelected == 1) { + class153.insertMenuItemNoShift("Use", Client.field598 + " " + "->" + " " + Client.colorStartTag(65535) + var20.name, 1, var28, var15, var16); + } else if (Client.isSpellSelected) { + if ((class31.field82 & 4) == 4) { + class153.insertMenuItemNoShift(Client.field599, Client.field600 + " " + "->" + " " + Client.colorStartTag(65535) + var20.name, 2, var28, var15, var16); + } + } else { + String[] var36 = var20.actions; + if (var36 != null) { + for (var23 = 4; var23 >= 0; --var23) { + if ((var21 == null || var21.method507(var23)) && var36[var23] != null) { + short var24 = 0; + if (var23 == 0) { + var24 = 3; + } + + if (var23 == 1) { + var24 = 4; + } + + if (var23 == 2) { + var24 = 5; + } + + if (var23 == 3) { + var24 = 6; + } + + if (var23 == 4) { + var24 = 1001; + } + + class153.insertMenuItemNoShift(var36[var23], Client.colorStartTag(65535) + var20.name, var24, var28, var15, var16); + } + } + } + + class153.insertMenuItemNoShift("Examine", Client.colorStartTag(65535) + var20.name, 1002, var20.id, var15, var16); + } + } + + int var29; + Player var30; + NPC var37; + int[] var38; + if (var18 == 1) { + NPC var32 = Client.npcs[var28]; + if (var32 == null) { + break label309; + } + + if (var32.definition.size == 1 && (var32.x & 127) == 64 && (var32.y & 127) == 64) { + for (var29 = 0; var29 < Client.npcCount; ++var29) { + var37 = Client.npcs[Client.npcIndices[var29]]; + if (var37 != null && var32 != var37 && var37.definition.size == 1 && var37.x == var32.x && var37.y == var32.y) { + class16.addNpcToMenu(var37, Client.npcIndices[var29], var15, var16); + } + } + + var29 = Players.Players_count; + var38 = Players.Players_indices; + + for (var23 = 0; var23 < var29; ++var23) { + var30 = Client.players[var38[var23]]; + if (var30 != null && var30.x == var32.x && var32.y == var30.y) { + DirectByteArrayCopier.addPlayerToMenu(var30, var38[var23], var15, var16); + } + } + } + + class16.addNpcToMenu(var32, var28, var15, var16); + } + + if (var18 == 0) { + Player var33 = Client.players[var28]; + if (var33 == null) { + break label309; + } + + if ((var33.x & 127) == 64 && (var33.y & 127) == 64) { + for (var29 = 0; var29 < Client.npcCount; ++var29) { + var37 = Client.npcs[Client.npcIndices[var29]]; + if (var37 != null && var37.definition.size == 1 && var37.x == var33.x && var33.y == var37.y) { + class16.addNpcToMenu(var37, Client.npcIndices[var29], var15, var16); + } + } + + var29 = Players.Players_count; + var38 = Players.Players_indices; + + for (var23 = 0; var23 < var29; ++var23) { + var30 = Client.players[var38[var23]]; + if (var30 != null && var30 != var33 && var30.x == var33.x && var33.y == var30.y) { + DirectByteArrayCopier.addPlayerToMenu(var30, var38[var23], var15, var16); + } + } + } + + if (var28 != Client.combatTargetPlayerIndex) { + DirectByteArrayCopier.addPlayerToMenu(var33, var28, var15, var16); + } else { + var4 = var26; + } + } + + if (var18 == 3) { + NodeDeque var34 = Client.groundItems[class87.Client_plane][var15][var16]; + if (var34 != null) { + for (TileItem var35 = (TileItem)var34.first(); var35 != null; var35 = (TileItem)var34.next()) { + ItemComposition var39 = class214.ItemDefinition_get(var35.id); + if (Client.isItemSelected == 1) { + class153.insertMenuItemNoShift("Use", Client.field598 + " " + "->" + " " + Client.colorStartTag(16748608) + var39.name, 16, var35.id, var15, var16); + } else if (Client.isSpellSelected) { + if ((class31.field82 & 1) == 1) { + class153.insertMenuItemNoShift(Client.field599, Client.field600 + " " + "->" + " " + Client.colorStartTag(16748608) + var39.name, 17, var35.id, var15, var16); + } + } else { + String[] var31 = var39.groundActions; + + for (int var40 = 4; var40 >= 0; --var40) { + if (var35.method612(var40)) { + if (var31 != null && var31[var40] != null) { + byte var25 = 0; + if (var40 == 0) { + var25 = 18; + } + + if (var40 == 1) { + var25 = 19; + } + + if (var40 == 2) { + var25 = 20; + } + + if (var40 == 3) { + var25 = 21; + } + + if (var40 == 4) { + var25 = 22; + } + + class153.insertMenuItemNoShift(var31[var40], Client.colorStartTag(16748608) + var39.name, var25, var35.id, var15, var16); + } else if (var40 == 2) { + class153.insertMenuItemNoShift("Take", Client.colorStartTag(16748608) + var39.name, 20, var35.id, var15, var16); + } + } + } + + class153.insertMenuItemNoShift("Examine", Client.colorStartTag(16748608) + var39.name, 1004, var35.id, var15, var16); + } + } + } + } + } } + ++var8; } } - @ObfuscatedName("ki") + @ObfuscatedName("mz") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-154699452" + descriptor = "([Lnm;IIIIIIIB)V", + garbageValue = "13" ) - static final void method621(boolean var0) { - class301.method1622(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.NO_TIMEOUT, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.hadNetworkError = true; + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + for (int var8 = 0; var8 < var0.length; ++var8) { + Widget var9 = var0[var8]; + if (var9 != null && var9.parentId == var1 && (var9.method1859() || MouseRecorder.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { + if (var9.isIf3) { + if (CollisionMap.isComponentHidden(var9)) { + continue; + } + } else if (var9.type == 0 && var9 != class64.mousedOverWidgetIf1 && CollisionMap.isComponentHidden(var9)) { + continue; + } + + if (var9.type == 11) { + if (var9.method1874(class33.field89, AbstractWorldMapIcon.urlRequester)) { + if (var9.method1867()) { + ClanChannelMember.invalidateWidget(var9); + PendingSpawn.revalidateWidgetScroll(var9.children, var9, true); + } + + if (var9.field3117 != null) { + ScriptEvent var10 = new ScriptEvent(); + var10.widget = var9; + var10.args = var9.field3117; + Client.scriptEvents.addFirst(var10); + } + } + } else if (var9.type == 12 && var9.method1882(class33.field89)) { + ClanChannelMember.invalidateWidget(var9); } - } + int var26 = var9.x + var6; + int var11 = var7 + var9.y; + int var12; + int var13; + int var14; + int var15; + int var16; + int var17; + int var18; + if (var9.type == 9) { + var16 = var26; + var17 = var11; + var18 = var26 + var9.width; + int var19 = var11 + var9.height; + if (var18 < var26) { + var16 = var18; + var18 = var26; + } + + if (var19 < var11) { + var17 = var19; + var19 = var11; + } + + ++var18; + ++var19; + var12 = var16 > var2 ? var16 : var2; + var13 = var17 > var3 ? var17 : var3; + var14 = var18 < var4 ? var18 : var4; + var15 = var19 < var5 ? var19 : var5; + } else { + var16 = var26 + var9.width; + var17 = var11 + var9.height; + var12 = var26 > var2 ? var26 : var2; + var13 = var11 > var3 ? var11 : var3; + var14 = var16 < var4 ? var16 : var4; + var15 = var17 < var5 ? var17 : var5; + } + + if (var9 == Client.clickedWidget) { + Client.field394 = true; + Client.field521 = var26; + Client.field517 = var11; + } + + boolean var34 = false; + if (var9.field2998) { + switch(Client.field508) { + case 0: + var34 = true; + case 1: + default: + break; + case 2: + if (Client.field505 == var9.id >>> 16) { + var34 = true; + } + break; + case 3: + if (var9.id == Client.field505) { + var34 = true; + } + } + } + + if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { + if (var9.isIf3) { + ScriptEvent var27; + if (var9.noClickThrough) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var27.field861) { + var27.remove(); + var27.widget.field3000 = false; + } + } + + Clock.method944(); + if (FriendsChat.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + StudioGame.addCancelMenuEntry(); + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var27.field861 && var27.widget.onScroll == var27.args) { + var27.remove(); + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var17 = MouseHandler.MouseHandler_lastPressedX; + var18 = MouseHandler.MouseHandler_lastPressedY; + } + + boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var35) { + addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { + class401.checkIfMinimapClicked(var9, var26, var11); + } else { + if (var9.contentType == 1400) { + class434.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); + } + + if (!Client.isMenuOpen && var35) { + if (var9.contentType == 1400) { + class434.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); + } else { + FloorDecoration.method1226(var9); + } + } + + boolean var21; + int var23; + if (var34) { + for (int var20 = 0; var20 < var9.field3006.length; ++var20) { + var21 = false; + boolean var22 = false; + if (!var21 && var9.field3006[var20] != null) { + for (var23 = 0; var23 < var9.field3006[var20].length; ++var23) { + boolean var24 = false; + if (var9.field3080 != null) { + var24 = Client.keyHandlerInstance.getKeyPressed(var9.field3006[var20][var23]); + } + + if (class131.method707(var9.field3006[var20][var23]) || var24) { + var21 = true; + if (var9.field3080 != null && var9.field3080[var20] > Client.cycle) { + break; + } + + byte var25 = var9.field3005[var20][var23]; + if (var25 == 0 || ((var25 & 8) == 0 || !Client.keyHandlerInstance.getKeyPressed(86) && !Client.keyHandlerInstance.getKeyPressed(82) && !Client.keyHandlerInstance.getKeyPressed(81)) && ((var25 & 2) == 0 || Client.keyHandlerInstance.getKeyPressed(86)) && ((var25 & 1) == 0 || Client.keyHandlerInstance.getKeyPressed(82)) && ((var25 & 4) == 0 || Client.keyHandlerInstance.getKeyPressed(81))) { + var22 = true; + break; + } + } + } + } + + if (var22) { + if (var20 < 10) { + TextureProvider.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { + class286.method1575(); + class478.method2385(var9.id, var9.childIndex, KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var9)), var9.itemId); + Client.field599 = class155.Widget_getSpellActionName(var9); + if (Client.field599 == null) { + Client.field599 = "null"; + } + + Client.field600 = var9.dataText + Client.colorStartTag(16777215); + } + + var23 = var9.field3074[var20]; + if (var9.field3080 == null) { + var9.field3080 = new int[var9.field3006.length]; + } + + if (var9.field3075 == null) { + var9.field3075 = new int[var9.field3006.length]; + } + + if (var23 != 0) { + if (var9.field3080[var20] == 0) { + var9.field3080[var20] = var23 + Client.cycle + var9.field3075[var20]; + } else { + var9.field3080[var20] = var23 + Client.cycle; + } + } else { + var9.field3080[var20] = Integer.MAX_VALUE; + } + } + + if (!var21 && var9.field3080 != null) { + var9.field3080[var20] = 0; + } + } + } + + if (var9.isIf3) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + var35 = true; + } else { + var35 = false; + } + + boolean var36 = false; + if ((MouseHandler.MouseHandler_currentButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { + var36 = true; + } + + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { + var21 = true; + } + + if (var21) { + TaskHandler.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.method1860()) { + if (var21) { + Client.field626.addFirst(new class225(0, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); + } + + if (var36) { + Client.field626.addFirst(new class225(1, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); + } + } + + if (var9.contentType == 1400) { + class434.worldMap.method2424(var17, var18, var35 & var36, var35 & var21); + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && class517.method2527(MouseRecorder.getWidgetFlags(var9))) { + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { + Client.field396 = true; + Client.field516 = var26; + Client.field514 = var11; + } + + if (var9.hasListener) { + ScriptEvent var28; + if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseY = Client.mouseWheelRotation; + var28.args = var9.onScroll; + Client.scriptEvents.addFirst(var28); + } + + if (Client.clickedWidget != null || Client.isMenuOpen) { + var21 = false; + var36 = false; + var35 = false; + } + + if (!var9.field3002 && var21) { + var9.field3002 = true; + if (var9.onClick != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; + var28.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var28.args = var9.onClick; + Client.scriptEvents.addFirst(var28); + } + } + + if (var9.field3002 && var36 && var9.onClickRepeat != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onClickRepeat; + Client.scriptEvents.addFirst(var28); + } + + if (var9.field3002 && !var36) { + var9.field3002 = false; + if (var9.onRelease != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onRelease; + Client.field629.addFirst(var28); + } + } + + if (var36 && var9.onHold != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onHold; + Client.scriptEvents.addFirst(var28); + } + + if (!var9.field3000 && var35) { + var9.field3000 = true; + if (var9.onMouseOver != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onMouseOver; + Client.scriptEvents.addFirst(var28); + } + } + + if (var9.field3000 && var35 && var9.onMouseRepeat != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var28); + } + + if (var9.field3000 && !var35) { + var9.field3000 = false; + if (var9.onMouseLeave != null) { + var28 = new ScriptEvent(); + var28.field861 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onMouseLeave; + Client.field629.addFirst(var28); + } + } + + if (var9.onTimer != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onTimer; + Client.field628.addFirst(var28); + } + + ScriptEvent var29; + int var37; + int var38; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3068) { + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3068 <= 32) { + label647: + for (var37 = var9.field3068; var37 < Client.changedVarpCount; ++var37) { + var23 = Client.changedVarps[var37 & 31]; + + for (var38 = 0; var38 < var9.varTransmitTriggers.length; ++var38) { + if (var23 == var9.varTransmitTriggers[var38]) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var29); + break label647; + } + } + } + } else { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3068 = Client.changedVarpCount; + } + + if (var9.onInvTransmit != null && Client.changedItemContainersCount > var9.field3070) { + if (var9.invTransmitTriggers != null && Client.changedItemContainersCount - var9.field3070 <= 32) { + label623: + for (var37 = var9.field3070; var37 < Client.changedItemContainersCount; ++var37) { + var23 = Client.changedItemContainers[var37 & 31]; + + for (var38 = 0; var38 < var9.invTransmitTriggers.length; ++var38) { + if (var23 == var9.invTransmitTriggers[var38]) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var29); + break label623; + } + } + } + } else { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3070 = Client.changedItemContainersCount; + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3064) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3064 <= 32) { + label599: + for (var37 = var9.field3064; var37 < Client.changedSkillsCount; ++var37) { + var23 = Client.changedSkills[var37 & 31]; + + for (var38 = 0; var38 < var9.statTransmitTriggers.length; ++var38) { + if (var23 == var9.statTransmitTriggers[var38]) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var29); + break label599; + } + } + } + } else { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3064 = Client.changedSkillsCount; + } + + if (Client.chatCycle > var9.field3071 && var9.onChatTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field511 > var9.field3071 && var9.onFriendTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field530 > var9.field3071 && var9.onClanTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field525 > var9.field3071 && var9.field3113 != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.field3113; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field528 > var9.field3071 && var9.field3096 != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.field3096; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field529 > var9.field3071 && var9.onStockTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field526 > var9.field3071 && var9.field3118 != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.field3118; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field527 > var9.field3071 && var9.onMiscTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3071 = Client.cycleCntr; + if (var9.onKey != null) { + for (var37 = 0; var37 < Client.field533; ++var37) { + ScriptEvent var30 = new ScriptEvent(); + var30.widget = var9; + var30.keyTyped = Client.field577[var37]; + var30.keyPressed = Client.field578[var37]; + var30.args = var9.onKey; + Client.scriptEvents.addFirst(var30); + } + } + + ScriptEvent var31; + int[] var39; + if (var9.field3100 != null) { + var39 = Client.keyHandlerInstance.method1152(); + + for (var23 = 0; var23 < var39.length; ++var23) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = var39[var23]; + var31.args = var9.field3100; + Client.scriptEvents.addFirst(var31); + } + } + + if (var9.field3104 != null) { + var39 = Client.keyHandlerInstance.method1153(); + + for (var23 = 0; var23 < var39.length; ++var23) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = var39[var23]; + var31.args = var9.field3104; + Client.scriptEvents.addFirst(var31); + } + } + } + } + + if (!var9.isIf3) { + if (Client.clickedWidget != null || Client.isMenuOpen) { + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + if (var9.mouseOverRedirect >= 0) { + class64.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + class64.mousedOverWidgetIf1 = var9; + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + GrandExchangeOfferNameComparator.field3615 = var9; + } + + if (var9.scrollHeight > var9.height) { + class305.method1638(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { + updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); + if (var9.children != null) { + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var32 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var32 != null) { + if (var32.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (ScriptEvent var33 = (ScriptEvent)Client.scriptEvents.last(); var33 != null; var33 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var33.field861) { + var33.remove(); + var33.widget.field3000 = false; + } + } + + if (FriendsChat.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + StudioGame.addCancelMenuEntry(); + } + } + + class511.updateRootInterface(var32.group, var12, var13, var14, var15, var26, var11); + } + } + } + } + } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class11.java b/osrs/src/main/java/class11.java index 518e5e762..6e8bd9719 100644 --- a/osrs/src/main/java/class11.java +++ b/osrs/src/main/java/class11.java @@ -12,18 +12,23 @@ import java.security.cert.CertificateFactory; import java.util.LinkedList; -@ObfuscatedName("aq") +@ObfuscatedName("aa") class class11 implements TlsAuthentication { + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "Lre;" + ) + static AbstractSocket field33; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lay;" ) @Export("this$2") @ObfuscatedName("this$2") final class13 this$2; @ObfuscatedSignature( - descriptor = "(Lan;)V" + descriptor = "(Lay;)V" ) class11(class13 var1) { this.this$2 = var1; @@ -42,7 +47,7 @@ public void notifyServerCertificate(Certificate var1) throws IOException { var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); } - this.this$2.this$1.field39 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); + this.this$2.this$1.field34 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); } catch (CertificateException var7) { throw new IOException(var7); } @@ -54,89 +59,74 @@ public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOExc return null; } - @ObfuscatedName("au") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "591994113" + descriptor = "(CLoa;I)I", + garbageValue = "832566677" ) - public static String method32(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { + var0 = Character.toLowerCase(var0); + var2 = (var0 << 4) + 1; + } - for (int var4 = var1; var4 < var2 + var1; var4 += 3) { - int var5 = var0[var4] & 255; - var3.append(class385.field3649[var5 >>> 2]); - if (var4 < var2 - 1) { - int var6 = var0[var4 + 1] & 255; - var3.append(class385.field3649[(var5 & 3) << 4 | var6 >>> 4]); - if (var4 < var2 - 2) { - int var7 = var0[var4 + 2] & 255; - var3.append(class385.field3649[(var6 & 15) << 2 | var7 >>> 6]).append(class385.field3649[var7 & 63]); - } else { - var3.append(class385.field3649[(var6 & 15) << 2]).append("="); - } - } else { - var3.append(class385.field3649[(var5 & 3) << 4]).append("=="); - } + if (var0 == 241 && var1 == Language.Language_ES) { + var2 = 1762; } - return var3.toString(); + return var2; } - @ObfuscatedName("af") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "18671" + descriptor = "(I)V", + garbageValue = "610139414" ) - static final void method33() { - if (!ViewportMouse.ViewportMouse_false0) { - int var0 = Scene.Scene_cameraPitchSine; - int var1 = Scene.Scene_cameraPitchCosine; - int var2 = Scene.Scene_cameraYawSine; - int var3 = Scene.Scene_cameraYawCosine; - byte var4 = 50; - short var5 = 3500; - int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.getClipMidX()) * var4 / Rasterizer3D.get3dZoom(); - int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.getClipMidY()) * var4 / Rasterizer3D.get3dZoom(); - int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.getClipMidX()) * var5 / Rasterizer3D.get3dZoom(); - int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.getClipMidY()) * var5 / Rasterizer3D.get3dZoom(); - int var10 = class33.method129(var7, var4, var1, var0); - int var11 = var4 * var1 - var0 * var7 >> 16; - var7 = var10; - var10 = class33.method129(var9, var5, var1, var0); - int var12 = var5 * var1 - var0 * var9 >> 16; - var9 = var10; - var10 = Tiles.method456(var6, var11, var3, var2); - int var13 = ClanChannelMember.method775(var6, var11, var3, var2); - var6 = var10; - var10 = Tiles.method456(var8, var12, var3, var2); - int var14 = ClanChannelMember.method775(var8, var12, var3, var2); - ViewportMouse.field2249 = (var10 + var6) / 2; - ViewportMouse.field2252 = (var7 + var9) / 2; - ViewportMouse.field2254 = (var13 + var14) / 2; - class261.field2396 = (var10 - var6) / 2; - ViewportMouse.field2248 = (var9 - var7) / 2; - Frames.field2121 = (var14 - var13) / 2; - ViewportMouse.field2250 = Math.abs(class261.field2396); - class7.field9 = Math.abs(ViewportMouse.field2248); - class30.field82 = Math.abs(Frames.field2121); + static void method39() { + Players.Players_count = 0; + + for (int var0 = 0; var0 < 2048; ++var0) { + Players.cachedAppearanceBuffer[var0] = null; + Players.playerMovementSpeeds[var0] = MoveSpeed.WALK; } + } - @ObfuscatedName("ni") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lmi;IIII)V", - garbageValue = "1018529135" + descriptor = "(Ljn;IIIII)Z", + garbageValue = "-916093529" ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - if (Client.minimapState < 3) { - Client.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + static final boolean method38(Model var0, int var1, int var2, int var3, int var4) { + if (!GrandExchangeOfferTotalQuantityComparator.method1974()) { + return false; + } else { + TextureProvider.method1350(); + AABB var5 = (AABB)var0.aabb.get(var1); + int var6 = var2 + var5.xMid; + int var7 = var3 + var5.yMid; + int var8 = var4 + var5.zMid; + int var9 = var5.xMidOffset; + int var10 = var5.yMidOffset; + int var11 = var5.zMidOffset; + int var12 = ViewportMouse.field2264 - var6; + int var13 = ViewportMouse.field2260 - var7; + int var14 = class286.field2470 - var8; + if (Math.abs(var12) > var9 + class190.field1495) { + return false; + } else if (Math.abs(var13) > var10 + GraphicsObject.field718) { + return false; + } else if (Math.abs(var14) > var11 + HealthBar.field1073) { + return false; + } else if (Math.abs(var14 * ViewportMouse.field2263 - var13 * ViewportMouse.field2265) > var11 * GraphicsObject.field718 + var10 * HealthBar.field1073) { + return false; + } else if (Math.abs(var12 * ViewportMouse.field2265 - var14 * class180.field1467) > var11 * class190.field1495 + var9 * HealthBar.field1073) { + return false; } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + return Math.abs(var13 * class180.field1467 - var12 * ViewportMouse.field2263) <= var9 * GraphicsObject.field718 + var10 * class190.field1495; } - } } } \ No newline at end of file diff --git a/osrs/src/main/java/class110.java b/osrs/src/main/java/class110.java new file mode 100644 index 000000000..7fbfa1e91 --- /dev/null +++ b/osrs/src/main/java/class110.java @@ -0,0 +1,128 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ex") +public class class110 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1123; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1128; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1127; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1135; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1130; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1125; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1132; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1122; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1129; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1134; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1124; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1121; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1131; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1136; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1133; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static final class110 field1126; + @ObfuscatedName("an") + int field1137; + + static { + field1123 = new class110(0); + field1128 = new class110(1); + field1127 = new class110(2); + field1135 = new class110(3); + field1130 = new class110(4); + field1125 = new class110(5); + field1132 = new class110(6); + field1122 = new class110(7); + field1129 = new class110(8); + field1134 = new class110(9); + field1124 = new class110(10); + field1121 = new class110(11); + field1131 = new class110(12); + field1136 = new class110(13); + field1133 = new class110(14); + field1126 = new class110(15); + } + + class110(int var1) { + this.field1137 = var1; + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(Lnm;I)I", + garbageValue = "48072594" + ) + static int method624(Widget var0) { + if (var0.type != 11) { + --class180.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + String var1 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var0.method1868(var1); + return 1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class113.java b/osrs/src/main/java/class113.java deleted file mode 100644 index 0a6bd2434..000000000 --- a/osrs/src/main/java/class113.java +++ /dev/null @@ -1,168 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import javax.net.ssl.HttpsURLConnection; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URLConnection; - -@ObfuscatedName("ez") -public class class113 extends UrlRequester { - @ObfuscatedName("am") - static int field1172; - @ObfuscatedName("as") - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("ac") - final boolean field1173; - - public class113(boolean var1, int var2) { - super(var2); - this.field1173 = var1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Let;B)V", - garbageValue = "-114" - ) - @Export("vmethod2700") - void vmethod2700(UrlRequest var1) throws IOException { - URLConnection var2 = null; - boolean var9 = false; - - label124: { - HttpURLConnection var12; - label125: { - try { - var9 = true; - String var3 = var1.field1177.getProtocol(); - if (var3.equals("http")) { - var2 = this.method660(var1); - } else { - if (!var3.equals("https")) { - var1.field1179 = UrlRequest.field1176; - var9 = false; - break label124; - } - - var2 = this.method661(var1); - } - - this.method649(var2, var1); - var9 = false; - break label125; - } catch (IOException var10) { - var1.field1179 = UrlRequest.field1176; - var9 = false; - } finally { - if (var9) { - if (var2 != null && var2 instanceof HttpURLConnection) { - HttpURLConnection var6 = (HttpURLConnection)var2; - var6.disconnect(); - } - - } - } - - if (var2 != null && var2 instanceof HttpURLConnection) { - var12 = (HttpURLConnection)var2; - var12.disconnect(); - } - - return; - } - - if (var2 != null && var2 instanceof HttpURLConnection) { - var12 = (HttpURLConnection)var2; - var12.disconnect(); - } - - return; - } - - if (var2 != null && var2 instanceof HttpURLConnection) { - HttpURLConnection var4 = (HttpURLConnection)var2; - var4.disconnect(); - } - - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Let;B)Ljava/net/URLConnection;", - garbageValue = "46" - ) - URLConnection method660(UrlRequest var1) throws IOException { - URLConnection var2 = var1.field1177.openConnection(); - this.method648(var2); - return var2; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Let;B)Ljava/net/URLConnection;", - garbageValue = "-94" - ) - URLConnection method661(UrlRequest var1) throws IOException { - HttpsURLConnection var2 = (HttpsURLConnection)var1.field1177.openConnection(); - if (!this.field1173) { - var2.setSSLSocketFactory(class15.method45()); - } - - this.method648(var2); - return var2; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)[Lhe;", - garbageValue = "-242071193" - ) - static HorizontalAlignment[] method658() { - return new HorizontalAlignment[]{HorizontalAlignment.field1574, HorizontalAlignment.field1573, HorizontalAlignment.HorizontalAlignment_centered}; - } - - @ObfuscatedName("mn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1761588634" - ) - @Export("process") - static void process() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (ModeWhere.loadInterface(var1)) { - boolean var2 = true; - Widget[] var3 = PacketBufferNode.Widget_interfaceComponents[var1]; - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { - if (var3[var4] != null) { - var2 = var3[var4].isIf3; - break; - } - } - - if (!var2) { - var4 = (int)var0.key; - Widget var5 = class92.getWidget(var4); - if (var5 != null) { - class218.invalidateWidget(var5); - } - } - } - } - - } - - @ObfuscatedName("nw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1946244652" - ) - static final void method663() { - Client.field518 = Client.cycleCntr; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class115.java b/osrs/src/main/java/class115.java new file mode 100644 index 000000000..6bad378c1 --- /dev/null +++ b/osrs/src/main/java/class115.java @@ -0,0 +1,226 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import javax.net.ssl.HttpsURLConnection; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URLConnection; + +@ObfuscatedName("es") +public class class115 extends UrlRequester { + @ObfuscatedName("ao") + final boolean field1168; + + public class115(boolean var1, int var2) { + super(var2); + this.field1168 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Leq;I)V", + garbageValue = "1796222901" + ) + @Export("vmethod2700") + void vmethod2700(UrlRequest var1) throws IOException { + URLConnection var2 = null; + boolean var9 = false; + + label124: { + HttpURLConnection var12; + label125: { + try { + var9 = true; + String var3 = var1.field1171.getProtocol(); + if (var3.equals("http")) { + var2 = this.method656(var1); + } else { + if (!var3.equals("https")) { + var1.field1173 = UrlRequest.field1169; + var9 = false; + break label124; + } + + var2 = this.method657(var1); + } + + this.method650(var2, var1); + var9 = false; + break label125; + } catch (IOException var10) { + var1.field1173 = UrlRequest.field1169; + var9 = false; + } finally { + if (var9) { + if (var2 != null && var2 instanceof HttpURLConnection) { + HttpURLConnection var6 = (HttpURLConnection)var2; + var6.disconnect(); + } + + } + } + + if (var2 != null && var2 instanceof HttpURLConnection) { + var12 = (HttpURLConnection)var2; + var12.disconnect(); + } + + return; + } + + if (var2 != null && var2 instanceof HttpURLConnection) { + var12 = (HttpURLConnection)var2; + var12.disconnect(); + } + + return; + } + + if (var2 != null && var2 instanceof HttpURLConnection) { + HttpURLConnection var4 = (HttpURLConnection)var2; + var4.disconnect(); + } + + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Leq;I)Ljava/net/URLConnection;", + garbageValue = "-188799571" + ) + URLConnection method656(UrlRequest var1) throws IOException { + URLConnection var2 = var1.field1171.openConnection(); + this.method649(var2); + return var2; + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(Leq;I)Ljava/net/URLConnection;", + garbageValue = "-1796104931" + ) + URLConnection method657(UrlRequest var1) throws IOException { + HttpsURLConnection var2 = (HttpsURLConnection)var1.field1171.openConnection(); + if (!this.field1168) { + if (class15.field44 == null) { + class15.field44 = new class15(); + } + + class15 var4 = class15.field44; + var2.setSSLSocketFactory(var4); + } + + this.method649(var2); + return var2; + } + + @ObfuscatedName("netscape/js") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "-57" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; + int var4 = var1 >> 7; + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + int var5 = var2; + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 + 1; + } + + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 + (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] >> 7; + int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; + return var7 * var9 + var8 * (128 - var7) >> 7; + } else { + return 0; + } + } + + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIB)V", + garbageValue = "-12" + ) + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { + if (Client.isLowDetail && var0 != class87.Client_plane) { + return; + } + + long var8 = 0L; + boolean var10 = true; + boolean var11 = false; + boolean var12 = false; + if (var1 == 0) { + var8 = class10.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { + var8 = class10.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { + var8 = class10.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { + var8 = class10.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var13; + if (var8 != 0L) { + var13 = class10.scene.getObjectFlags(var0, var2, var3, var8); + int var15 = SecureRandomFuture.Entity_unpackID(var8); + int var16 = var13 & 31; + int var17 = var13 >> 6 & 3; + ObjectComposition var14; + if (var1 == 0) { + class10.scene.removeBoundaryObject(var0, var2, var3); + var14 = class91.getObjectDefinition(var15); + if (var14.interactType != 0) { + Client.collisionMaps[var0].method1162(var2, var3, var16, var17, var14.boolean1); + } + } + + if (var1 == 1) { + class10.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { + class10.scene.removeGameObject(var0, var2, var3); + var14 = class91.getObjectDefinition(var15); + if (var2 + var14.sizeX > 103 || var3 + var14.sizeX > 103 || var2 + var14.sizeY > 103 || var3 + var14.sizeY > 103) { + return; + } + + if (var14.interactType != 0) { + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var14.sizeX, var14.sizeY, var17, var14.boolean1); + } + } + + if (var1 == 3) { + class10.scene.removeFloorDecoration(var0, var2, var3); + var14 = class91.getObjectDefinition(var15); + if (var14.interactType == 1) { + Client.collisionMaps[var0].method1165(var2, var3); + } + } + } + + if (var4 >= 0) { + var13 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var13 = var0 + 1; + } + + MouseRecorder.method477(var0, var13, var2, var3, var4, var5, var6, var7, class10.scene, Client.collisionMaps[var0]); + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class12.java b/osrs/src/main/java/class12.java index cedb398ff..73c094bce 100644 --- a/osrs/src/main/java/class12.java +++ b/osrs/src/main/java/class12.java @@ -11,24 +11,13 @@ import java.io.OutputStream; import java.security.cert.Certificate; -@ObfuscatedName("al") +@ObfuscatedName("ap") class class12 extends SSLSocket { - @ObfuscatedName("ga") - static int field37; - @ObfuscatedName("no") - @Export("menuX") - static int menuX; - @ObfuscatedName("ro") - @ObfuscatedSignature( - descriptor = "Lgk;" - ) - @Export("mouseWheel") - static class174 mouseWheel; - @ObfuscatedName("au") - Certificate[] field39; + @ObfuscatedName("ac") + Certificate[] field34; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lab;" + descriptor = "Laj;" ) @Export("this$0") @ObfuscatedName("this$0") @@ -43,7 +32,7 @@ class class12 extends SSLSocket { final String val$host; @ObfuscatedSignature( - descriptor = "(Lab;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" + descriptor = "(Laj;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" ) class12(class15 var1, TlsClientProtocol var2, String var3) { this.this$0 = var1; @@ -133,142 +122,127 @@ public void startHandshake() throws IOException { this.val$tlsClientProtocol.connect(new class13(this)); } - @ObfuscatedName("aa") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "1596734724" + descriptor = "([Lcv;II[I[II)V", + garbageValue = "-1654835319" ) - static int method35(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - } + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { + int var5 = var1 - 1; + int var6 = var2 + 1; + int var7 = (var2 + var1) / 2; + World var8 = var0[var7]; + var0[var7] = var0[var1]; + var0[var1] = var8; + + while (var5 < var6) { + boolean var9 = true; + + int var10; + int var11; + int var12; + do { + --var6; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var6].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var6].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } - int var11; - if (var0 == 1300) { - var11 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]); - return 1; - } else { - --class137.Interpreter_stringStackSize; - return 1; - } - } else { - int var6; - if (var0 == 1301) { - SoundCache.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var4.parent = SoundCache.getWidgetChild(var11, var6); - return 1; - } else if (var0 == 1302) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1303) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - return 1; - } else if (var0 == 1304) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - return 1; - } else if (var0 == 1305) { - var4.dataText = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - return 1; - } else if (var0 == 1306) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - return 1; - } else if (var0 == 1307) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1309) { - --SoundCache.Interpreter_intStackSize; - return 1; - } else { - int var7; - byte[] var9; - if (var0 != 1350) { - byte var5; - if (var0 == 1351) { - SoundCache.Interpreter_intStackSize -= 2; - var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]}; - WorldMap.Widget_setKey(var4, var5, var9, var10); - return 1; - } else if (var0 == 1352) { - SoundCache.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - class126.Widget_setKeyRate(var4, var11, var6, var7); - return 1; + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var6].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; } else { - throw new RuntimeException(); + var11 = var0[var6].id; + var12 = var8.id; } - } else if (var0 == 1353) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class126.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } else if (var0 == 1354) { - --SoundCache.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - ArchiveLoader.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); + + if (var11 != var12) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + var9 = false; + } + break; } - } else if (var0 == 1355) { - var5 = 10; - ArchiveLoader.Widget_setKeyIgnoreHeld(var4, var5); - return 1; - } else { - return 2; - } - } else { - byte[] var8 = null; - var9 = null; - if (var3) { - SoundCache.Interpreter_intStackSize -= 10; - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + SoundCache.Interpreter_intStackSize] >= 0; var7 += 2) { + if (var10 == 3) { + var9 = false; } + } + } while(var9); + + var9 = true; + + do { + ++var5; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var5].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var5].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } - if (var7 > 0) { - var8 = new byte[var7 / 2]; - var9 = new byte[var7 / 2]; + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var5].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var5].id; + var12 = var8.id; + } - for (var7 -= 2; var7 >= 0; var7 -= 2) { - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + SoundCache.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + SoundCache.Interpreter_intStackSize + 1]; + if (var11 != var12) { + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + var9 = false; } + break; } - } else { - SoundCache.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]}; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]}; - } - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - WorldMap.Widget_setKey(var4, var7, var8, var9); - return 1; - } else { - throw new RuntimeException(); + if (var10 == 3) { + var9 = false; + } } + } while(var9); + + if (var5 < var6) { + World var13 = var0[var5]; + var0[var5] = var0[var6]; + var0[var6] = var13; } } + + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); } + + } + + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "(Lcf;III)V", + garbageValue = "-1330448420" + ) + static final void method41(MenuAction var0, int var1, int var2) { + if (var0 != null) { + class33.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.itemId, var0.action, var0.target, var1, var2); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class124.java b/osrs/src/main/java/class124.java deleted file mode 100644 index 4c5217c16..000000000 --- a/osrs/src/main/java/class124.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("eu") -public interface class124 { -} \ No newline at end of file diff --git a/osrs/src/main/java/class125.java b/osrs/src/main/java/class125.java deleted file mode 100644 index ea2d9fb38..000000000 --- a/osrs/src/main/java/class125.java +++ /dev/null @@ -1,103 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.net.URL; - -@ObfuscatedName("eg") -public class class125 { - @ObfuscatedName("iy") - static long field1195; - @ObfuscatedName("jh") - static int field1193; - @ObfuscatedName("lw") - static int field1194; - @ObfuscatedName("au") - int field1202; - @ObfuscatedName("ae") - float field1198; - @ObfuscatedName("ao") - float field1200; - @ObfuscatedName("at") - float field1201; - @ObfuscatedName("ac") - float field1197; - @ObfuscatedName("ai") - float field1199; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Leg;" - ) - class125 field1196; - - class125() { - this.field1200 = Float.MAX_VALUE; - this.field1201 = Float.MAX_VALUE; - this.field1197 = Float.MAX_VALUE; - this.field1199 = Float.MAX_VALUE; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;IS)V", - garbageValue = "249" - ) - void method696(Buffer var1, int var2) { - this.field1202 = var1.readShort(); - this.field1198 = var1.method2551(); - this.field1200 = var1.method2551(); - this.field1201 = var1.method2551(); - this.field1197 = var1.method2551(); - this.field1199 = var1.method2551(); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1201510681" - ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (WorldMapLabelSize.World_request == null) { - WorldMapLabelSize.World_request = FriendsChat.urlRequester.request(new URL(class200.field1669)); - } else if (WorldMapLabelSize.World_request.isDone()) { - byte[] var0 = WorldMapLabelSize.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - class176.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = class176.World_worlds[var2] = new World(); - var3.id = var1.readUnsignedShort(); - var3.properties = var1.readInt(); - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); - var3.location = var1.readUnsignedByte(); - var3.population = var1.readShort(); - } - - GameEngine.sortWorlds(class176.World_worlds, 0, class176.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - WorldMapLabelSize.World_request = null; - return true; - } - } catch (Exception var4) { - var4.printStackTrace(); - WorldMapLabelSize.World_request = null; - } - - return false; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "-47" - ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class126.java b/osrs/src/main/java/class126.java index ed22842d0..464d37017 100644 --- a/osrs/src/main/java/class126.java +++ b/osrs/src/main/java/class126.java @@ -1,134 +1,5 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") -public class class126 { - @ObfuscatedName("at") - public static final float field1204; - @ObfuscatedName("ac") - public static final float field1203; - @ObfuscatedName("ai") - static float[] field1206; - @ObfuscatedName("az") - static float[] field1207; - @ObfuscatedName("ee") - @ObfuscatedSignature( - descriptor = "Ldt;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("fe") - @ObfuscatedSignature( - descriptor = "Lgz;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - - static { - field1204 = Math.ulp(1.0F); - field1203 = field1204 * 2.0F; - field1206 = new float[4]; - field1207 = new float[5]; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "-1457731236" - ) - public static byte[] method699(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var6 = (byte[])((byte[])var0); - if (var1) { - int var4 = var6.length; - byte[] var5 = new byte[var4]; - System.arraycopy(var6, 0, var5, 0, var4); - return var5; - } else { - return var6; - } - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1320879691" - ) - public static void method700() { - ParamComposition.ParamDefinition_cached.clear(); - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(Lmi;IIIB)V", - garbageValue = "-45" - ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field3047 == null) { - throw new RuntimeException(); - } else { - var0.field3047[var1] = var2; - var0.field3046[var1] = var3; - } - } - - @ObfuscatedName("if") - @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "158" - ) - static final void method702(int var0, int var1, int var2) { - if (NPCComposition.cameraX < var0) { - NPCComposition.cameraX = (var0 - NPCComposition.cameraX) * MouseHandler.cameraMoveToAcceleration / 1000 + NPCComposition.cameraX + class344.cameraMoveToSpeed; - if (NPCComposition.cameraX > var0) { - NPCComposition.cameraX = var0; - } - } - - if (NPCComposition.cameraX > var0) { - NPCComposition.cameraX -= (NPCComposition.cameraX - var0) * MouseHandler.cameraMoveToAcceleration / 1000 + class344.cameraMoveToSpeed; - if (NPCComposition.cameraX < var0) { - NPCComposition.cameraX = var0; - } - } - - if (class133.cameraY < var1) { - class133.cameraY = (var1 - class133.cameraY) * MouseHandler.cameraMoveToAcceleration / 1000 + class133.cameraY + class344.cameraMoveToSpeed; - if (class133.cameraY > var1) { - class133.cameraY = var1; - } - } - - if (class133.cameraY > var1) { - class133.cameraY -= (class133.cameraY - var1) * MouseHandler.cameraMoveToAcceleration / 1000 + class344.cameraMoveToSpeed; - if (class133.cameraY < var1) { - class133.cameraY = var1; - } - } - - if (class139.cameraZ < var2) { - class139.cameraZ = (var2 - class139.cameraZ) * MouseHandler.cameraMoveToAcceleration / 1000 + class139.cameraZ + class344.cameraMoveToSpeed; - if (class139.cameraZ > var2) { - class139.cameraZ = var2; - } - } - - if (class139.cameraZ > var2) { - class139.cameraZ -= (class139.cameraZ - var2) * MouseHandler.cameraMoveToAcceleration / 1000 + class344.cameraMoveToSpeed; - if (class139.cameraZ < var2) { - class139.cameraZ = var2; - } - } - - } +@ObfuscatedName("ep") +public interface class126 { } \ No newline at end of file diff --git a/osrs/src/main/java/class127.java b/osrs/src/main/java/class127.java index 9a84b5133..2b34ffc70 100644 --- a/osrs/src/main/java/class127.java +++ b/osrs/src/main/java/class127.java @@ -1,245 +1,61 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eo") +@ObfuscatedName("ef") public class class127 { - @ObfuscatedName("au") - public final int field1222; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Leo;" - ) - public class127 field1221; - @ObfuscatedName("ao") - float[][] field1213; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "[Lrz;" - ) - final class450[] field1220; @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "[Lrz;" - ) - class450[] field1218; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "[Lrz;" - ) - class450[] field1219; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lrz;" - ) - class450 field1217; - @ObfuscatedName("ap") - boolean field1210; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lrz;" - ) - class450 field1215; - @ObfuscatedName("af") - boolean field1209; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lrz;" - ) - class450 field1216; - @ObfuscatedName("aq") - float[][] field1214; + int field1200; @ObfuscatedName("al") - float[][] field1211; - @ObfuscatedName("an") - float[][] field1212; - - @ObfuscatedSignature( - descriptor = "(ILtm;Z)V" - ) - public class127(int var1, Buffer var2, boolean var3) { - this.field1217 = new class450(); - this.field1210 = true; - this.field1215 = new class450(); - this.field1209 = true; - this.field1216 = new class450(); - this.field1222 = var2.readShort(); - this.field1220 = new class450[var1]; - this.field1218 = new class450[this.field1220.length]; - this.field1219 = new class450[this.field1220.length]; - this.field1213 = new float[this.field1220.length][3]; - - for (int var4 = 0; var4 < this.field1220.length; ++var4) { - this.field1220[var4] = new class450(var2, var3); - this.field1213[var4][0] = var2.method2551(); - this.field1213[var4][1] = var2.method2551(); - this.field1213[var4][2] = var2.method2551(); - } - - this.method704(); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-431712200" - ) - void method704() { - this.field1214 = new float[this.field1220.length][3]; - this.field1211 = new float[this.field1220.length][3]; - this.field1212 = new float[this.field1220.length][3]; - class450 var1; - synchronized(class450.field3873) { - if (class462.field3904 == 0) { - var1 = new class450(); - } else { - class450.field3873[--class462.field3904].method2302(); - var1 = class450.field3873[class462.field3904]; - } - } - - class450 var2 = var1; - - for (int var5 = 0; var5 < this.field1220.length; ++var5) { - class450 var4 = this.method705(var5); - var2.method2304(var4); - var2.method2312(); - this.field1214[var5] = var2.method2301(); - this.field1211[var5][0] = var4.field3875[12]; - this.field1211[var5][1] = var4.field3875[13]; - this.field1211[var5][2] = var4.field3875[14]; - this.field1212[var5] = var4.method2313(); - } - - var2.method2298(); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IB)Lrz;", - garbageValue = "1" - ) - class450 method705(int var1) { - return this.field1220[var1]; - } - + float field1197; + @ObfuscatedName("ak") + float field1196; + @ObfuscatedName("ax") + float field1199; @ObfuscatedName("ao") + float field1198; + @ObfuscatedName("ah") + float field1195; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IS)Lrz;", - garbageValue = "18304" + descriptor = "Lef;" ) - class450 method706(int var1) { - if (this.field1218[var1] == null) { - this.field1218[var1] = new class450(this.method705(var1)); - if (this.field1221 != null) { - this.field1218[var1].method2308(this.field1221.method706(var1)); - } else { - this.field1218[var1].method2308(class450.field3874); - } - } - - return this.field1218[var1]; - } + class127 field1194; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II)Lrz;", - garbageValue = "1066264654" - ) - class450 method707(int var1) { - if (this.field1219[var1] == null) { - this.field1219[var1] = new class450(this.method706(var1)); - this.field1219[var1].method2312(); - } - - return this.field1219[var1]; + class127() { + this.field1196 = Float.MAX_VALUE; + this.field1199 = Float.MAX_VALUE; + this.field1198 = Float.MAX_VALUE; + this.field1195 = Float.MAX_VALUE; } @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lrz;I)V", - garbageValue = "-799671526" + descriptor = "(Lul;II)V", + garbageValue = "1810575829" ) - void method708(class450 var1) { - this.field1217.method2304(var1); - this.field1210 = true; - this.field1209 = true; + void method691(Buffer var1, int var2) { + this.field1200 = var1.readShort(); + this.field1197 = var1.method2586(); + this.field1196 = var1.method2586(); + this.field1199 = var1.method2586(); + this.field1198 = var1.method2586(); + this.field1195 = var1.method2586(); } - @ObfuscatedName("ai") + @ObfuscatedName("ns") @ObfuscatedSignature( - descriptor = "(B)Lrz;", - garbageValue = "-23" + descriptor = "(Lnm;IIIB)V", + garbageValue = "-59" ) - class450 method709() { - return this.field1217; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(I)Lrz;", - garbageValue = "1930419113" - ) - class450 method710() { - if (this.field1210) { - this.field1215.method2304(this.method709()); - if (this.field1221 != null) { - this.field1215.method2308(this.field1221.method710()); + static final void method692(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.method1857(class33.field89, false); + if (var4 != null) { + if (Client.minimapState < 3) { + JSException.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } - this.field1210 = false; } - - return this.field1215; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(II)Lrz;", - garbageValue = "1508889675" - ) - public class450 method711(int var1) { - if (this.field1209) { - this.field1216.method2304(this.method707(var1)); - this.field1216.method2308(this.method710()); - this.field1209 = false; - } - - return this.field1216; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "1706055895" - ) - float[] method712(int var1) { - return this.field1214[var1]; - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(IB)[F", - garbageValue = "12" - ) - float[] method713(int var1) { - return this.field1211[var1]; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "1605437767" - ) - float[] method714(int var1) { - return this.field1212[var1]; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "0" - ) - public static int method703(int var0) { - return var0 != 0 && var0 != 1 ? -1 : 0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class128.java b/osrs/src/main/java/class128.java index a9112c490..396810666 100644 --- a/osrs/src/main/java/class128.java +++ b/osrs/src/main/java/class128.java @@ -1,426 +1,20 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ew") -public enum class128 implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lew;" - ) - field1229(0, 0), - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lew;" - ) - field1226(1, 1), +public class class128 { + @ObfuscatedName("ax") + public static final float field1202; @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lew;" - ) - field1227(2, 2), - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lew;" - ) - field1228(3, 3), - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lew;" - ) - field1225(4, 4); - - @ObfuscatedName("al") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("sy") - @ObfuscatedSignature( - descriptor = "Lub;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("ai") - final int field1230; - @ObfuscatedName("az") - final int field1231; - - class128(int var3, int var4) { - this.field1230 = var3; - this.field1231 = var4; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1231; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(IIIIIILiv;Lis;I)V", - garbageValue = "2027076041" - ) - @Export("addObjects") - static final void addObjects(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { - if (var0 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var0; - } - - ObjectComposition var8 = WorldMapElement.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; - } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; - } - - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var11][var14] + var15[var11][var13] + var15[var12][var13] + var15[var12][var14] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = FontName.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - if (var8.hasSound()) { - class152.method797(var0, var1, var2, var8, var4); - } - - Object var22; - if (var5 == 22) { - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var22, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else { - int var31; - if (var5 != 10 && var5 != 11) { - int[] var10000; - if (var5 >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.method1243(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = BufferedNetSocket.field3820[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field844[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - MoveSpeed.field1924[var0][var1][var2] = 50; - MoveSpeed.field1924[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = BufferedNetSocket.field3820[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - MoveSpeed.field1924[var0][var1][var2 + 1] = 50; - MoveSpeed.field1924[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = BufferedNetSocket.field3820[var0][var1]; - var10000[var2 + 1] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - MoveSpeed.field1924[var0][var1 + 1][var2] = 50; - MoveSpeed.field1924[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = BufferedNetSocket.field3820[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - MoveSpeed.field1924[var0][var1][var2] = 50; - MoveSpeed.field1924[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = BufferedNetSocket.field3820[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1113(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method1249(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field840[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - MoveSpeed.field1924[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - MoveSpeed.field1924[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - MoveSpeed.field1924[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - MoveSpeed.field1924[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1113(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { - var28 = var4 + 1 & 3; - Object var23; - Object var24; - if (var8.animationId == -1 && var8.transforms == null) { - var23 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); - var24 = var8.getEntity(2, var28, var15, var17, var16, var18); - } else { - var23 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - var24 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var23, (Renderable)var24, Tiles.field844[var4], Tiles.field844[var28], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = BufferedNetSocket.field3820[var0][var1]; - var10000[var2] |= 585; - var10000 = BufferedNetSocket.field3820[var0][var1]; - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { - var10000 = BufferedNetSocket.field3820[var0][var1]; - var10000[var2 + 1] |= 1170; - var10000 = BufferedNetSocket.field3820[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = BufferedNetSocket.field3820[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = BufferedNetSocket.field3820[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = BufferedNetSocket.field3820[var0][var1]; - var10000[var2] |= 1170; - var10000 = BufferedNetSocket.field3820[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1113(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method1249(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field840[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - MoveSpeed.field1924[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - MoveSpeed.field1924[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - MoveSpeed.field1924[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - MoveSpeed.field1924[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1113(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.method1243(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method1249(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field844[var4], 0, 0, 0, var19, var21); - } else { - Object var25; - long var29; - if (var5 == 5) { - var28 = 16; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var29 != 0L) { - var28 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var29)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field844[var4], 0, var28 * Tiles.field842[var4], var28 * Tiles.field845[var4], var19, var21); - } else if (var5 == 6) { - var28 = 8; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var29 != 0L) { - var28 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var29)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field841[var4], var28 * Tiles.field843[var4], var19, var21); - } else if (var5 == 7) { - var31 = var4 + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var31 + 4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 4, var31 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, 256, var31, 0, 0, var19, var21); - } else if (var5 == 8) { - var28 = 8; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var29) { - var28 = WorldMapElement.getObjectDefinition(InvDefinition.Entity_unpackID(var29)).int2 / 2; - } - - int var27 = var4 + 2 & 3; - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field841[var4], var28 * Tiles.field843[var4], var19, var21); - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - if (var22 != null && var6.method1243(var0, var1, var2, var16, var9, var10, (Renderable)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { - var31 = 15; - if (var22 instanceof Model) { - var31 = ((Model)var22).method1322() / 4; - if (var31 > 30) { - var31 = 30; - } - } - - for (int var32 = 0; var32 <= var9; ++var32) { - for (int var33 = 0; var33 <= var10; ++var33) { - if (var31 > MoveSpeed.field1924[var0][var32 + var1][var33 + var2]) { - MoveSpeed.field1924[var0][var32 + var1][var33 + var2] = (byte)var31; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } + public static final float field1201; + @ObfuscatedName("ah") + static float[] field1203; + @ObfuscatedName("ar") + static float[] field1204; + + static { + field1202 = Math.ulp(1.0F); + field1201 = 2.0F * field1202; + field1203 = new float[4]; + field1204 = new float[5]; } } \ No newline at end of file diff --git a/osrs/src/main/java/class129.java b/osrs/src/main/java/class129.java index 71c0f3924..cc4e84ae1 100644 --- a/osrs/src/main/java/class129.java +++ b/osrs/src/main/java/class129.java @@ -1,604 +1,228 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.concurrent.Callable; - -@ObfuscatedName("ep") -public class class129 implements Callable { - @ObfuscatedName("gf") - @Export("js5Port") - static int js5Port; - @ObfuscatedName("kz") - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("mt") +@ObfuscatedName("ed") +public class class129 { + @ObfuscatedName("iz") + static int field1205; + @ObfuscatedName("ac") + public final int field1219; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ljk;" + descriptor = "Led;" ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("au") + public class129 field1218; + @ObfuscatedName("ak") + float[][] field1209; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lfh;" + descriptor = "[Lrb;" ) - final class130 field1235; - @ObfuscatedName("ae") + final class465[] field1217; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lft;" + descriptor = "[Lrb;" ) - final class131 field1237; - @ObfuscatedName("ao") + class465[] field1216; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "[Lrb;" + ) + class465[] field1215; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lrb;" + ) + class465 field1214; + @ObfuscatedName("ab") + boolean field1206; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lrb;" ) - final class132 field1236; - @ObfuscatedName("at") - final int field1238; - // $FF: synthetic field + class465 field1213; + @ObfuscatedName("av") + boolean field1207; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lfv;" + descriptor = "Lrb;" ) - @Export("this$0") - @ObfuscatedName("this$0") - final class137 this$0; + class465 field1212; + @ObfuscatedName("aa") + float[][] field1208; + @ObfuscatedName("ap") + float[][] field1210; + @ObfuscatedName("ay") + float[][] field1211; @ObfuscatedSignature( - descriptor = "(Lfv;Lfh;Lft;Lfs;I)V" + descriptor = "(ILul;Z)V" ) - class129(class137 var1, class130 var2, class131 var3, class132 var4, int var5) { - this.this$0 = var1; - this.field1235 = var2; - this.field1237 = var3; - this.field1236 = var4; - this.field1238 = var5; + public class129(int var1, Buffer var2, boolean var3) { + this.field1214 = new class465(); + this.field1206 = true; + this.field1213 = new class465(); + this.field1207 = true; + this.field1212 = new class465(); + this.field1219 = var2.readShort(); + this.field1217 = new class465[var1]; + this.field1216 = new class465[this.field1217.length]; + this.field1215 = new class465[this.field1217.length]; + this.field1209 = new float[this.field1217.length][3]; + + for (int var4 = 0; var4 < this.field1217.length; ++var4) { + this.field1217[var4] = new class465(var2, var3); + this.field1209[var4][0] = var2.method2586(); + this.field1209[var4][1] = var2.method2586(); + this.field1209[var4][2] = var2.method2586(); + } + + this.method693(); } - @Export("call") - @ObfuscatedName("call") - public Object call() { - this.field1235.method719(); - class130[][] var1; - if (this.field1237 == class131.field1264) { - var1 = this.this$0.field1299; - } else { - var1 = this.this$0.field1304; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-13" + ) + void method693() { + this.field1208 = new float[this.field1217.length][3]; + this.field1210 = new float[this.field1217.length][3]; + this.field1211 = new float[this.field1217.length][3]; + class465 var1 = ParamComposition.method1053(); + + for (int var2 = 0; var2 < this.field1217.length; ++var2) { + class465 var3 = this.method694(var2); + var1.method2342(var3); + var1.method2350(); + this.field1208[var2] = var1.method2339(); + this.field1210[var2][0] = var3.field3908[12]; + this.field1210[var2][1] = var3.field3908[13]; + this.field1210[var2][2] = var3.field3908[14]; + this.field1211[var2] = var3.method2351(); } - var1[this.field1238][this.field1236.method733()] = this.field1235; - return null; + var1.method2336(); } - @ObfuscatedName("aq") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Liv;[Lis;I)V", - garbageValue = "2010483961" + descriptor = "(II)Lrb;", + garbageValue = "-1380153125" ) - static final void method717(Scene var0, CollisionMap[] var1) { - int var2; - int var3; - int var4; - int var5; - for (var2 = 0; var2 < 4; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { - var5 = var2; - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 - 1; - } + class465 method694(int var1) { + return this.field1217[var1]; + } - if (var5 >= 0) { - var1[var5].setBlockedByFloor(var3, var4); - } - } - } + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)Lrb;", + garbageValue = "-1405133305" + ) + class465 method695(int var1) { + if (this.field1216[var1] == null) { + this.field1216[var1] = new class465(this.method694(var1)); + if (this.field1218 != null) { + this.field1216[var1].method2346(this.field1218.method695(var1)); + } else { + this.field1216[var1].method2346(class465.field3903); } } - Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; - if (Tiles.rndHue < -8) { - Tiles.rndHue = -8; - } - - if (Tiles.rndHue > 8) { - Tiles.rndHue = 8; - } - - Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; - if (Tiles.rndLightness < -16) { - Tiles.rndLightness = -16; - } + return this.field1216[var1]; + } - if (Tiles.rndLightness > 16) { - Tiles.rndLightness = 16; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(II)Lrb;", + garbageValue = "-1214410602" + ) + class465 method696(int var1) { + if (this.field1215[var1] == null) { + this.field1215[var1] = new class465(this.method695(var1)); + this.field1215[var1].method2350(); } - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int[] var10000; - int var17; - int var18; - for (var2 = 0; var2 < 4; ++var2) { - byte[][] var47 = MoveSpeed.field1924[var2]; - boolean var61 = true; - boolean var62 = true; - boolean var6 = true; - boolean var7 = true; - boolean var8 = true; - var9 = (int)Math.sqrt(5100.0D); - var10 = var9 * 768 >> 8; - - int var19; - int var20; - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; - var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); - var16 = (var13 << 8) / var15; - var17 = 65536 / var15; - var18 = (var14 << 8) / var15; - var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; - var20 = (var47[var12 - 1][var11] >> 2) + (var47[var12][var11 - 1] >> 2) + (var47[var12 + 1][var11] >> 3) + (var47[var12][var11 + 1] >> 3) + (var47[var12][var11] >> 1); - class162.field1419[var12][var11] = var19 - var20; - } - } - - for (var11 = 0; var11 < 104; ++var11) { - Fonts.Tiles_hue[var11] = 0; - class466.Tiles_saturation[var11] = 0; - Tiles.Tiles_lightness[var11] = 0; - class128.Tiles_hueMultiplier[var11] = 0; - Interpreter.field710[var11] = 0; - } - - for (var11 = -5; var11 < 109; ++var11) { - for (var12 = 0; var12 < 104; ++var12) { - var13 = var11 + 5; - int var10002; - if (var13 >= 0 && var13 < 104) { - long var48 = (long)Math.pow(2.0D, 15.0D) - 1L; - var16 = (int)var48; - var17 = Tiles.Tiles_underlays[var2][var13][var12] & var16; - if (var17 > 0) { - var19 = var17 - 1; - FloorUnderlayDefinition var50 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var19); - FloorUnderlayDefinition var51; - if (var50 != null) { - var51 = var50; - } else { - byte[] var21 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var19); - var50 = new FloorUnderlayDefinition(); - if (var21 != null) { - var50.decode(new Buffer(var21), var19); - } - - var50.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var50, (long)var19); - var51 = var50; - } - - var10000 = Fonts.Tiles_hue; - var10000[var12] += var51.hue; - var10000 = class466.Tiles_saturation; - var10000[var12] += var51.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var12] += var51.lightness; - var10000 = class128.Tiles_hueMultiplier; - var10000[var12] += var51.hueMultiplier; - var10002 = Interpreter.field710[var12]++; - } - } - - var14 = var11 - 5; - if (var14 >= 0 && var14 < 104) { - long var52 = (long)Math.pow(2.0D, 15.0D) - 1L; - var17 = (int)var52; - var18 = Tiles.Tiles_underlays[var2][var14][var12] & var17; - if (var18 > 0) { - var20 = var18 - 1; - FloorUnderlayDefinition var67 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var20); - FloorUnderlayDefinition var54; - if (var67 != null) { - var54 = var67; - } else { - byte[] var22 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var20); - var67 = new FloorUnderlayDefinition(); - if (var22 != null) { - var67.decode(new Buffer(var22), var20); - } - - var67.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var67, (long)var20); - var54 = var67; - } - - var10000 = Fonts.Tiles_hue; - var10000[var12] -= var54.hue; - var10000 = class466.Tiles_saturation; - var10000[var12] -= var54.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var12] -= var54.lightness; - var10000 = class128.Tiles_hueMultiplier; - var10000[var12] -= var54.hueMultiplier; - var10002 = Interpreter.field710[var12]--; - } - } - } - - if (var11 >= 1 && var11 < 103) { - var12 = 0; - var13 = 0; - var14 = 0; - var15 = 0; - var16 = 0; - - for (var17 = -5; var17 < 109; ++var17) { - var18 = var17 + 5; - if (var18 >= 0 && var18 < 104) { - var12 += Fonts.Tiles_hue[var18]; - var13 += class466.Tiles_saturation[var18]; - var14 += Tiles.Tiles_lightness[var18]; - var15 += class128.Tiles_hueMultiplier[var18]; - var16 += Interpreter.field710[var18]; - } - - var19 = var17 - 5; - if (var19 >= 0 && var19 < 104) { - var12 -= Fonts.Tiles_hue[var19]; - var13 -= class466.Tiles_saturation[var19]; - var14 -= Tiles.Tiles_lightness[var19]; - var15 -= class128.Tiles_hueMultiplier[var19]; - var16 -= Interpreter.field710[var19]; - } - - if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { - if (var2 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var2; - } - - long var55 = (long)Math.pow(2.0D, 15.0D) - 1L; - int var57 = (int)var55; - int var23 = Tiles.Tiles_underlays[var2][var11][var17] & var57; - int var24 = class227.Tiles_overlays[var2][var11][var17] & var57; - if (var23 > 0 || var24 > 0) { - int var25 = Tiles.Tiles_heights[var2][var11][var17]; - int var26 = Tiles.Tiles_heights[var2][var11 + 1][var17]; - int var27 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; - int var28 = Tiles.Tiles_heights[var2][var11][var17 + 1]; - int var29 = class162.field1419[var11][var17]; - int var30 = class162.field1419[var11 + 1][var17]; - int var31 = class162.field1419[var11 + 1][var17 + 1]; - int var32 = class162.field1419[var11][var17 + 1]; - int var33 = -1; - int var34 = -1; - int var35; - int var36; - int var37; - if (var23 > 0) { - var35 = var12 * 256 / var15; - var36 = var13 / var16; - var37 = var14 / var16; - var33 = class106.method617(var35, var36, var37); - var35 = var35 + Tiles.rndHue & 255; - var37 += Tiles.rndLightness; - if (var37 < 0) { - var37 = 0; - } else if (var37 > 255) { - var37 = 255; - } - - var34 = class106.method617(var35, var36, var37); - } - - FloorOverlayDefinition var38; - if (var2 > 0) { - boolean var68 = true; - if (var23 == 0 && class172.Tiles_shapes[var2][var11][var17] != 0) { - var68 = false; - } - - if (var24 > 0) { - var37 = var24 - 1; - var38 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var37); - FloorOverlayDefinition var58; - if (var38 != null) { - var58 = var38; - } else { - byte[] var39 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var37); - var38 = new FloorOverlayDefinition(); - if (var39 != null) { - var38.decode(new Buffer(var39), var37); - } - - var38.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var38, (long)var37); - var58 = var38; - } - - if (!var58.hideUnderlay) { - var68 = false; - } - } - - if (var68 && var26 == var25 && var27 == var25 && var25 == var28) { - var10000 = BufferedNetSocket.field3820[var2][var11]; - var10000[var17] |= 2340; - } - } - - var35 = 0; - if (var34 != -1) { - var35 = Rasterizer3D.Rasterizer3D_colorPalette[UserComparator7.method677(var34, 96)]; - } - - if (var24 == 0) { - var0.addTile(var2, var11, var17, 0, 0, -1, var25, var26, var27, var28, UserComparator7.method677(var33, var29), UserComparator7.method677(var33, var30), UserComparator7.method677(var33, var31), UserComparator7.method677(var33, var32), 0, 0, 0, 0, var35, 0); - } else { - var36 = class172.Tiles_shapes[var2][var11][var17] + 1; - byte var69 = ModelData0.field2282[var2][var11][var17]; - int var59 = var24 - 1; - FloorOverlayDefinition var40 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var59); - if (var40 != null) { - var38 = var40; - } else { - byte[] var41 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var59); - var40 = new FloorOverlayDefinition(); - if (var41 != null) { - var40.decode(new Buffer(var41), var59); - } - - var40.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var40, (long)var59); - var38 = var40; - } - - int var60 = var38.texture; - int var42; - int var43; - int var44; - int var45; - if (var60 >= 0) { - var43 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var60); - var42 = -1; - } else if (var38.primaryRgb == 16711935) { - var42 = -2; - var60 = -1; - var43 = -2; - } else { - var42 = class106.method617(var38.hue, var38.saturation, var38.lightness); - var44 = var38.hue + Tiles.rndHue & 255; - var45 = var38.lightness + Tiles.rndLightness; - if (var45 < 0) { - var45 = 0; - } else if (var45 > 255) { - var45 = 255; - } - - var43 = class106.method617(var44, var38.saturation, var45); - } - - var44 = 0; - if (var43 != -2) { - var44 = Rasterizer3D.Rasterizer3D_colorPalette[Client.method357(var43, 96)]; - } - - if (var38.secondaryRgb != -1) { - var45 = var38.secondaryHue + Tiles.rndHue & 255; - int var46 = var38.secondaryLightness + Tiles.rndLightness; - if (var46 < 0) { - var46 = 0; - } else if (var46 > 255) { - var46 = 255; - } + return this.field1215[var1]; + } - var43 = class106.method617(var45, var38.secondarySaturation, var46); - var44 = Rasterizer3D.Rasterizer3D_colorPalette[Client.method357(var43, 96)]; - } + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Lrb;I)V", + garbageValue = "2009872809" + ) + void method697(class465 var1) { + this.field1214.method2342(var1); + this.field1206 = true; + this.field1207 = true; + } - var0.addTile(var2, var11, var17, var36, var69, var60, var25, var26, var27, var28, UserComparator7.method677(var33, var29), UserComparator7.method677(var33, var30), UserComparator7.method677(var33, var31), UserComparator7.method677(var33, var32), Client.method357(var42, var29), Client.method357(var42, var30), Client.method357(var42, var31), Client.method357(var42, var32), var35, var44); - } - } - } - } - } - } + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)Lrb;", + garbageValue = "1" + ) + class465 method698() { + return this.field1214; + } - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var0.setTileMinPlane(var2, var12, var11, ViewportMouse.method1349(var2, var12, var11)); - } + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)Lrb;", + garbageValue = "-1187043704" + ) + class465 method699() { + if (this.field1206) { + this.field1213.method2342(this.method698()); + if (this.field1218 != null) { + this.field1213.method2346(this.field1218.method699()); } - Tiles.Tiles_underlays[var2] = null; - class227.Tiles_overlays[var2] = null; - class172.Tiles_shapes[var2] = null; - ModelData0.field2282[var2] = null; - MoveSpeed.field1924[var2] = null; + this.field1206 = false; } - var0.method1264(-50, -10, -50); + return this.field1213; + } - for (var2 = 0; var2 < 104; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var0.setLinkBelow(var2, var3); - } - } + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(II)Lrb;", + garbageValue = "295548775" + ) + public class465 method700(int var1) { + if (this.field1207) { + this.field1212.method2342(this.method696(var1)); + this.field1212.method2346(this.method699()); + this.field1207 = false; } - var2 = 1; - var3 = 2; - var4 = 4; - - for (var5 = 0; var5 < 4; ++var5) { - if (var5 > 0) { - var2 <<= 3; - var3 <<= 3; - var4 <<= 3; - } - - for (int var63 = 0; var63 <= var5; ++var63) { - for (int var64 = 0; var64 <= 104; ++var64) { - for (int var65 = 0; var65 <= 104; ++var65) { - short var66; - if ((BufferedNetSocket.field3820[var63][var65][var64] & var2) != 0) { - var9 = var64; - var10 = var64; - var11 = var63; - - for (var12 = var63; var9 > 0 && (BufferedNetSocket.field3820[var63][var65][var9 - 1] & var2) != 0; --var9) { - } - - while (var10 < 104 && (BufferedNetSocket.field3820[var63][var65][var10 + 1] & var2) != 0) { - ++var10; - } - - label372: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((BufferedNetSocket.field3820[var11 - 1][var65][var13] & var2) == 0) { - break label372; - } - } - - --var11; - } - - label361: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((BufferedNetSocket.field3820[var12 + 1][var65][var13] & var2) == 0) { - break label361; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - if (var13 >= 8) { - var66 = 240; - var15 = Tiles.Tiles_heights[var12][var65][var9] - var66; - var16 = Tiles.Tiles_heights[var11][var65][var9]; - Scene.Scene_addOccluder(var5, 1, var65 * 128, var65 * 128, var9 * 128, var10 * 128 + 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = BufferedNetSocket.field3820[var17][var65]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((BufferedNetSocket.field3820[var63][var65][var64] & var3) != 0) { - var9 = var65; - var10 = var65; - var11 = var63; - - for (var12 = var63; var9 > 0 && (BufferedNetSocket.field3820[var63][var9 - 1][var64] & var3) != 0; --var9) { - } - - while (var10 < 104 && (BufferedNetSocket.field3820[var63][var10 + 1][var64] & var3) != 0) { - ++var10; - } - - label425: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((BufferedNetSocket.field3820[var11 - 1][var13][var64] & var3) == 0) { - break label425; - } - } - - --var11; - } - - label414: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((BufferedNetSocket.field3820[var12 + 1][var13][var64] & var3) == 0) { - break label414; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - if (var13 >= 8) { - var66 = 240; - var15 = Tiles.Tiles_heights[var12][var9][var64] - var66; - var16 = Tiles.Tiles_heights[var11][var9][var64]; - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var64 * 128, var64 * 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = BufferedNetSocket.field3820[var17][var18]; - var10000[var64] &= ~var3; - } - } - } - } - - if ((BufferedNetSocket.field3820[var63][var65][var64] & var4) != 0) { - var9 = var65; - var10 = var65; - var11 = var64; - - for (var12 = var64; var11 > 0 && (BufferedNetSocket.field3820[var63][var65][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (BufferedNetSocket.field3820[var63][var65][var12 + 1] & var4) != 0) { - ++var12; - } - - label478: - while (var9 > 0) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((BufferedNetSocket.field3820[var63][var9 - 1][var13] & var4) == 0) { - break label478; - } - } - - --var9; - } - - label467: - while (var10 < 104) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((BufferedNetSocket.field3820[var63][var10 + 1][var13] & var4) == 0) { - break label467; - } - } - - ++var10; - } + return this.field1212; + } - if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { - var13 = Tiles.Tiles_heights[var63][var9][var11]; - Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(II)[F", + garbageValue = "1329468643" + ) + float[] method701(int var1) { + return this.field1208[var1]; + } - for (var14 = var9; var14 <= var10; ++var14) { - for (var15 = var11; var15 <= var12; ++var15) { - var10000 = BufferedNetSocket.field3820[var63][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } - } + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(II)[F", + garbageValue = "-1277196406" + ) + float[] method702(int var1) { + return this.field1210[var1]; + } + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(II)[F", + garbageValue = "996106282" + ) + float[] method703(int var1) { + return this.field1211[var1]; } } \ No newline at end of file diff --git a/osrs/src/main/java/class13.java b/osrs/src/main/java/class13.java index 8ad06597c..3dca9c64b 100644 --- a/osrs/src/main/java/class13.java +++ b/osrs/src/main/java/class13.java @@ -9,28 +9,18 @@ import java.io.IOException; import java.util.Hashtable; -@ObfuscatedName("an") +@ObfuscatedName("ay") class class13 extends DefaultTlsClient { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - @Export("InvDefinition_archive") - static AbstractArchive InvDefinition_archive; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "[Luk;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; + @ObfuscatedName("ga") + static int field35; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Lap;" ) final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lal;)V" + descriptor = "(Lap;)V" ) class13(class12 var1) { this.this$1 = var1; @@ -64,17 +54,297 @@ public TlsAuthentication getAuthentication() throws IOException { @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1477731180" + descriptor = "(ILds;ZB)I", + garbageValue = "-21" + ) + static int method42(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + if (var0 == 1800) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var3)); + return 1; + } else if (var0 != 1801) { + if (var0 == 1802) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } + } else { + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "751094160" + ) + static int method43(int var0, Script var1, boolean var2) { + if (var0 == 3800) { + if (VerticalAlignment.guestClanSettings != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + class295.field2496 = VerticalAlignment.guestClanSettings; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + int var3; + if (var0 == 3801) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Client.currentClanSettings[var3] != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + class295.field2496 = Client.currentClanSettings[var3]; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3802) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class295.field2496.name; + return 1; + } else if (var0 == 3803) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.allowGuests ? 1 : 0; + return 1; + } else if (var0 == 3804) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1371; + return 1; + } else if (var0 == 3805) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1372; + return 1; + } else if (var0 == 3806) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1370; + return 1; + } else if (var0 == 3807) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1369; + return 1; + } else if (var0 == 3809) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.memberCount; + return 1; + } else if (var0 == 3810) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class295.field2496.memberNames[var3]; + return 1; + } else if (var0 == 3811) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.memberRanks[var3]; + return 1; + } else if (var0 == 3812) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.bannedMemberCount; + return 1; + } else if (var0 == 3813) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class295.field2496.bannedMemberNames[var3]; + return 1; + } else { + int var5; + int var6; + if (var0 == 3814) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.method814(var3, var6, var5); + return 1; + } else if (var0 == 3815) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.currentOwner; + return 1; + } else if (var0 == 3816) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1378; + return 1; + } else if (var0 == 3817) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.method813(Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]); + return 1; + } else if (var0 == 3818) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = class295.field2496.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == 3819) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + class36.method183(var6, var3); + return 1; + } else if (var0 == 3820) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1379[var3]; + return 1; + } else { + if (var0 == 3821) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + HealthBarUpdate.method525(var5, var3, var4); + } + + if (var0 == 3822) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1368[var3] ? 1 : 0; + return 1; + } else if (var0 == 3850) { + if (ClanChannelMember.guestClanChannel != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + Interpreter.field704 = ClanChannelMember.guestClanChannel; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3851) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Client.currentClanChannels[var3] != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + Interpreter.field704 = Client.currentClanChannels[var3]; + VarcInt.field1529 = var3; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3852) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = Interpreter.field704.name; + return 1; + } else if (var0 == 3853) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.field704.field1413; + return 1; + } else if (var0 == 3854) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.field704.field1414; + return 1; + } else if (var0 == 3855) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.field704.method868(); + return 1; + } else if (var0 == 3856) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ((ClanChannelMember)Interpreter.field704.members.get(var3)).username.getName(); + return 1; + } else if (var0 == 3857) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)Interpreter.field704.members.get(var3)).rank; + return 1; + } else if (var0 == 3858) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)Interpreter.field704.members.get(var3)).world; + return 1; + } else if (var0 == 3859) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ArchiveDisk.method2314(VarcInt.field1529, var3); + return 1; + } else if (var0 == 3860) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.field704.method869(Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]); + return 1; + } else if (var0 == 3861) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Interpreter.field704.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == 3890) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SequenceDefinition.varclan != null ? 1 : 0; + return 1; + } else { + return 2; + } + } + } + } + } + + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "(ZLuy;B)V", + garbageValue = "15" ) - public static void method36(Buffer var0, int var1) { - if (JagexCache.JagexCache_randomDat != null) { - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); - } catch (Exception var3) { + static final void method44(boolean var0, PacketBuffer var1) { + while (true) { + byte var2 = 16; + int var3 = 1 << var2; + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= var2 + 12) { + int var4 = var1.readBits(var2); + if (var4 != var3 - 1) { + boolean var5 = false; + if (Client.npcs[var4] == null) { + Client.npcs[var4] = new NPC(); + var5 = true; + } + + NPC var6 = Client.npcs[var4]; + Client.npcIndices[++Client.npcCount - 1] = var4; + var6.npcCycle = Client.cycle; + int var10 = var1.readBits(1); + if (var10 == 1) { + Client.field552[++Client.field450 - 1] = var4; + } + + int var7 = var1.readBits(1); + var6.definition = class190.getNpcDefinition(var1.readBits(14)); + int var11 = Client.field563[var1.readBits(3)]; + if (var5) { + var6.orientation = var6.rotation = var11; + } + + int var8; + if (var0) { + var8 = var1.readBits(8); + if (var8 > 127) { + var8 -= 256; + } + } else { + var8 = var1.readBits(5); + if (var8 > 15) { + var8 -= 32; + } + } + + int var9; + if (var0) { + var9 = var1.readBits(8); + if (var9 > 127) { + var9 -= 256; + } + } else { + var9 = var1.readBits(5); + if (var9 > 15) { + var9 -= 32; + } + } + + boolean var12 = var1.readBits(1) == 1; + if (var12) { + var1.readBits(32); + } + + WorldMapLabel.method1571(var6); + if (var6.field1020 == 0) { + var6.rotation = 0; + } + + var6.method584(TextureProvider.localPlayer.pathX[0] + var8, TextureProvider.localPlayer.pathY[0] + var9, var7 == 1); + continue; + } } + + var1.exportIndex(); + return; } + } + @ObfuscatedName("oi") + @ObfuscatedSignature( + descriptor = "(B)Loo;", + garbageValue = "-81" + ) + static JagNetThread method45() { + return class59.field309; } } \ No newline at end of file diff --git a/osrs/src/main/java/class130.java b/osrs/src/main/java/class130.java index e87542aef..81c25470c 100644 --- a/osrs/src/main/java/class130.java +++ b/osrs/src/main/java/class130.java @@ -2,237 +2,74 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") -public class class130 { - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "Liv;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("au") - boolean field1243; - @ObfuscatedName("ae") - boolean field1240; - @ObfuscatedName("ao") +import java.util.List; + +@ObfuscatedName("fj") +public enum class130 implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lew;" + descriptor = "Lfj;" ) - class128 field1245; - @ObfuscatedName("at") + field1221(0, 0), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lew;" + descriptor = "Lfj;" ) - class128 field1246; - @ObfuscatedName("ac") + field1223(1, 1), + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "[Leg;" + descriptor = "Lfj;" ) - class125[] field1244; - @ObfuscatedName("ai") - boolean field1242; - @ObfuscatedName("az") - float field1258; - @ObfuscatedName("ap") - float field1254; - @ObfuscatedName("aa") - float field1247; - @ObfuscatedName("af") - float field1250; - @ObfuscatedName("ad") - float field1249; - @ObfuscatedName("aq") - float field1255; - @ObfuscatedName("al") - float field1252; - @ObfuscatedName("an") - float field1253; - @ObfuscatedName("ar") - float field1256; - @ObfuscatedName("ab") - float field1248; - @ObfuscatedName("ag") - boolean field1241; - @ObfuscatedName("am") - int field1261; + field1222(2, 2), @ObfuscatedName("ax") - float[] field1259; - @ObfuscatedName("ah") - int field1260; - @ObfuscatedName("as") - int field1262; - @ObfuscatedName("ay") - float field1257; - @ObfuscatedName("aj") - float field1251; - - class130() { - this.field1241 = true; - this.field1261 = 0; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;IB)I", - garbageValue = "-47" - ) - int method718(Buffer var1, int var2) { - int var3 = var1.readUnsignedShort(); - int var4 = var1.readUnsignedByte(); - class138[] var5 = new class138[]{class138.field1314, class138.field1309, class138.field1311, class138.field1313, class138.field1308, class138.field1310, class138.field1315, class138.field1312, class138.field1307}; - class138 var6 = (class138)KeyHandler.findEnumerated(var5, var4); - if (var6 == null) { - var6 = class138.field1307; - } - - this.field1245 = ArchiveLoader.method466(var1.readUnsignedByte()); - this.field1246 = ArchiveLoader.method466(var1.readUnsignedByte()); - this.field1243 = var1.readUnsignedByte() != 0; - this.field1244 = new class125[var3]; - class125 var9 = null; - - for (int var8 = 0; var8 < var3; ++var8) { - class125 var7 = new class125(); - var7.method696(var1, var2); - this.field1244[var8] = var7; - if (var9 != null) { - var9.field1196 = var7; - } - - var9 = var7; - } - - return var3; - } - - @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-1069" + descriptor = "Lfj;" ) - void method719() { - this.field1260 = this.field1244[0].field1202; - this.field1262 = this.field1244[this.method726() - 1].field1202; - this.field1259 = new float[this.method723() + 1]; - - for (int var1 = this.method721(); var1 <= this.method722(); ++var1) { - this.field1259[var1 - this.method721()] = Skeleton.method1229(this, (float)var1); - } - - this.field1244 = null; - this.field1257 = Skeleton.method1229(this, (float)(this.method721() - 1)); - this.field1251 = Skeleton.method1229(this, (float)(this.method722() + 1)); - } - + field1225(3, 3), @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)F", - garbageValue = "-13" + descriptor = "Lfj;" ) - public float method720(int var1) { - if (var1 < this.method721()) { - return this.field1257; - } else { - return var1 > this.method722() ? this.field1251 : this.field1259[var1 - this.method721()]; - } - } + field1224(4, 4); - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1409378084" - ) - int method721() { - return this.field1260; - } + @ObfuscatedName("wd") + static List field1220; + @ObfuscatedName("ah") + final int field1226; + @ObfuscatedName("ar") + final int field1227; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1371661145" - ) - int method722() { - return this.field1262; + class130(int var3, int var4) { + this.field1226 = var3; + this.field1227 = var4; } - @ObfuscatedName("ai") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1808269392" + garbageValue = "-1243971674" ) - int method723() { - return this.method722() - this.method721(); + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1227; } - @ObfuscatedName("az") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(FB)I", - garbageValue = "116" + descriptor = "(III)V", + garbageValue = "861803654" ) - int method724(float var1) { - if (this.field1261 < 0 || (float)this.field1244[this.field1261].field1202 > var1 || this.field1244[this.field1261].field1196 != null && (float)this.field1244[this.field1261].field1196.field1202 <= var1) { - if (var1 >= (float)this.method721() && var1 <= (float)this.method722()) { - int var2 = this.method726(); - int var3 = this.field1261; - if (var2 > 0) { - int var4 = 0; - int var5 = var2 - 1; - - do { - int var6 = var5 + var4 >> 1; - if (var1 < (float)this.field1244[var6].field1202) { - if (var1 > (float)this.field1244[var6 - 1].field1202) { - var3 = var6 - 1; - break; - } - - var5 = var6 - 1; - } else { - if (var1 <= (float)this.field1244[var6].field1202) { - var3 = var6; - break; - } - - if (var1 < (float)this.field1244[var6 + 1].field1202) { - var3 = var6; - break; - } - - var4 = var6 + 1; - } - } while(var4 <= var5); - } - - if (var3 != this.field1261) { - this.field1261 = var3; - this.field1241 = true; - } - - return this.field1261; - } else { - return -1; - } - } else { - return this.field1261; + public static void method704(int var0, int var1) { + VarbitComposition var2 = Messages.method638(var0); + int var3 = var2.baseVar; + int var4 = var2.startBit; + int var5 = var2.endBit; + int var6 = Varps.Varps_masks[var5 - var4]; + if (var1 < 0 || var1 > var6) { + var1 = 0; } - } - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(FI)Leg;", - garbageValue = "1942643085" - ) - class125 method725(float var1) { - int var2 = this.method724(var1); - return var2 >= 0 && var2 < this.field1244.length ? this.field1244[var2] : null; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1392526079" - ) - int method726() { - return this.field1244 == null ? 0 : this.field1244.length; + var6 <<= var4; + Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; } } \ No newline at end of file diff --git a/osrs/src/main/java/class131.java b/osrs/src/main/java/class131.java index b7f836d5b..a5aa7f28f 100644 --- a/osrs/src/main/java/class131.java +++ b/osrs/src/main/java/class131.java @@ -2,182 +2,105 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") -public class class131 implements class371 { - @ObfuscatedName("au") +import java.io.IOException; +import java.util.concurrent.Callable; + +@ObfuscatedName("fh") +public class class131 implements Callable { + @ObfuscatedName("ur") + @Export("cameraMoveToAcceleration") + static int cameraMoveToAcceleration; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lft;" + descriptor = "Lfz;" ) - static final class131 field1268; - @ObfuscatedName("ae") + final class132 field1231; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lft;" + descriptor = "Lfs;" ) - static final class131 field1264; - @ObfuscatedName("ao") + final class133 field1230; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lft;" + descriptor = "Lfl;" ) - static final class131 field1266; - @ObfuscatedName("at") + final class134 field1229; + @ObfuscatedName("ax") + final int field1232; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lft;" + descriptor = "Lfk;" ) - static final class131 field1267; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lft;" - ) - static final class131 field1263; - @ObfuscatedName("ai") + @Export("this$0") + @ObfuscatedName("this$0") + final class139 this$0; + @ObfuscatedSignature( - descriptor = "Lft;" + descriptor = "(Lfk;Lfz;Lfs;Lfl;I)V" ) - static final class131 field1265; - @ObfuscatedName("az") - final int field1271; - @ObfuscatedName("ap") - final int field1270; - @ObfuscatedName("aa") - final int field1269; - - static { - field1268 = new class131(0, 0, (String)null, 0); - field1264 = new class131(1, 1, (String)null, 9); - field1266 = new class131(2, 2, (String)null, 3); - field1267 = new class131(3, 3, (String)null, 6); - field1263 = new class131(4, 4, (String)null, 1); - field1265 = new class131(5, 5, (String)null, 3); + class131(class139 var1, class132 var2, class133 var3, class134 var4, int var5) { + this.this$0 = var1; + this.field1231 = var2; + this.field1230 = var3; + this.field1229 = var4; + this.field1232 = var5; } - class131(int var1, int var2, String var3, int var4) { - this.field1271 = var1; - this.field1270 = var2; - this.field1269 = var4; - } + @Export("call") + @ObfuscatedName("call") + public Object call() { + this.field1231.method710(); + class132[][] var1; + if (this.field1230 == class133.field1260) { + var1 = this.this$0.field1292; + } else { + var1 = this.this$0.field1297; + } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1270; + var1[this.field1232][this.field1229.method724()] = this.field1231; + return null; } @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "149385670" - ) - int method727() { - return this.field1269; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "50" + descriptor = "(B)[B", + garbageValue = "1" ) - static void method729(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { - int var5 = 0; - if (var1 > var4.maxX) { - var5 += var1 - var4.maxX; - } else if (var1 < var4.x) { - var5 += var4.x - var1; - } - - if (var2 > var4.maxY) { - var5 += var2 - var4.maxY; - } else if (var2 < var4.y) { - var5 += var4.y - var2; - } + public static byte[] method706() { + byte[] var0 = new byte[24]; - if (var5 - 64 <= var4.field702 && class449.clientPreferences.getAreaSoundEffectsVolume() != 0 && var0 == var4.plane) { - var5 -= 64; - if (var5 < 0) { - var5 = 0; - } + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var0); - int var6 = (var4.field702 - var5) * class449.clientPreferences.getAreaSoundEffectsVolume() / var4.field702; - if (var4.stream1 == null) { - if (var4.soundEffectId >= 0) { - SoundEffect var7 = SoundEffect.readSoundEffect(class28.field81, var4.soundEffectId, 0); - if (var7 != null) { - RawSound var8 = var7.toRawSound().resample(class330.decimator); - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); - var9.setNumLoops(-1); - class162.pcmStreamMixer.addSubStream(var9); - var4.stream1 = var9; - } - } - } else { - var4.stream1.method238(var6); - } - - if (var4.stream2 == null) { - if (var4.soundEffectIds != null && (var4.field698 -= var3) <= 0) { - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); - SoundEffect var12 = SoundEffect.readSoundEffect(class28.field81, var4.soundEffectIds[var11], 0); - if (var12 != null) { - RawSound var13 = var12.toRawSound().resample(class330.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); - var10.setNumLoops(0); - class162.pcmStreamMixer.addSubStream(var10); - var4.stream2 = var10; - var4.field698 = var4.field696 + (int)(Math.random() * (double)(var4.field694 - var4.field696)); - } - } - } else { - var4.stream2.method238(var6); - if (!var4.stream2.hasNext()) { - var4.stream2 = null; - } - } - } else { - if (var4.stream1 != null) { - class162.pcmStreamMixer.removeSubStream(var4.stream1); - var4.stream1 = null; - } + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { + } - if (var4.stream2 != null) { - class162.pcmStreamMixer.removeSubStream(var4.stream2); - var4.stream2 = null; - } - } + if (var1 >= 24) { + throw new IOException(); + } + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { + var0[var2] = -1; } } + return var0; } - @ObfuscatedName("at") + @ObfuscatedName("mu") @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "-761761706" + descriptor = "(II)Z", + garbageValue = "1460663579" ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (class176.World_worlds != null) { - Occluder.doWorldSorting(0, class176.World_worlds.length - 1, var0, var1, var2, var3); + static boolean method707(int var0) { + for (int var1 = 0; var1 < Client.field533; ++var1) { + if (Client.field577[var1] == var0) { + return true; + } } - } - - @ObfuscatedName("nk") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-87" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (ReflectionCheck.friendsChat != null) { - PacketBufferNode var1 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLAN_KICKUSER, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } + return false; } } \ No newline at end of file diff --git a/osrs/src/main/java/class132.java b/osrs/src/main/java/class132.java index c455e3013..26695863a 100644 --- a/osrs/src/main/java/class132.java +++ b/osrs/src/main/java/class132.java @@ -1,739 +1,246 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") -public class class132 implements class371 { - @ObfuscatedName("wu") - static long field1272; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1288; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1277; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1283; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1287; +@ObfuscatedName("fz") +public class class132 { @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1275; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1280; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1289; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1284; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1273; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1278; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1276; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1285; + boolean field1233; @ObfuscatedName("al") + boolean field1235; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfj;" ) - static final class132 field1281; - @ObfuscatedName("an") + class130 field1238; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfj;" ) - static final class132 field1282; - @ObfuscatedName("ar") + class130 field1239; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "[Lef;" ) - static final class132 field1286; + class127[] field1237; + @ObfuscatedName("ah") + boolean field1234; + @ObfuscatedName("ar") + float field1247; @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1274; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lfs;" - ) - static final class132 field1279; + float field1241; @ObfuscatedName("am") - final int field1291; - @ObfuscatedName("ax") - final int field1292; - @ObfuscatedName("ah") - final int field1290; - - static { - field1288 = new class132(0, 0, (String)null, -1, -1); - field1277 = new class132(1, 1, (String)null, 0, 2); - field1283 = new class132(2, 2, (String)null, 1, 2); - field1287 = new class132(3, 3, (String)null, 2, 2); - field1275 = new class132(4, 4, (String)null, 3, 1); - field1280 = new class132(5, 5, (String)null, 4, 1); - field1289 = new class132(6, 6, (String)null, 5, 1); - field1284 = new class132(7, 7, (String)null, 6, 3); - field1273 = new class132(8, 8, (String)null, 7, 3); - field1278 = new class132(9, 9, (String)null, 8, 3); - field1276 = new class132(10, 10, (String)null, 0, 7); - field1285 = new class132(11, 11, (String)null, 1, 7); - field1281 = new class132(12, 12, (String)null, 2, 7); - field1282 = new class132(13, 13, (String)null, 3, 7); - field1286 = new class132(14, 14, (String)null, 4, 7); - field1274 = new class132(15, 15, (String)null, 5, 7); - field1279 = new class132(16, 16, (String)null, 0, 5); - } - - @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;II)V", - garbageValue = "-1" - ) - class132(int var1, int var2, String var3, int var4, int var5) { - this.field1291 = var1; - this.field1292 = var2; - this.field1290 = var4; - } - + float field1244; + @ObfuscatedName("av") + float field1249; + @ObfuscatedName("ag") + float field1242; + @ObfuscatedName("aa") + float field1240; + @ObfuscatedName("ap") + float field1245; + @ObfuscatedName("ay") + float field1250; + @ObfuscatedName("as") + float field1248; + @ObfuscatedName("aj") + float field1243; + @ObfuscatedName("an") + boolean field1236; @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1552695494" - ) - int method733() { - return this.field1290; - } - + int field1254; + @ObfuscatedName("ai") + float[] field1252; @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1292; + int field1253; + @ObfuscatedName("aw") + int field1255; + @ObfuscatedName("aq") + float field1246; + @ObfuscatedName("az") + float field1251; + + class132() { + this.field1236 = true; + this.field1254 = 0; } @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([BIIIIIIIII[Lis;I)V", - garbageValue = "388906105" + descriptor = "(Lul;II)I", + garbageValue = "-1968596819" ) - static final void method734(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, CollisionMap[] var10) { - int var12; - for (int var11 = 0; var11 < 8; ++var11) { - for (var12 = 0; var12 < 8; ++var12) { - if (var11 + var2 > 0 && var11 + var2 < 103 && var3 + var12 > 0 && var3 + var12 < 103) { - int[] var10000 = var10[var1].flags[var11 + var2]; - var10000[var12 + var3] &= -16777217; - } - } + int method709(Buffer var1, int var2) { + int var3 = var1.readUnsignedShort(); + AbstractByteArrayCopier.method1886(var1.readUnsignedByte()); + int var5 = var1.readUnsignedByte(); + class130 var6 = (class130)SequenceDefinition.findEnumerated(class186.method950(), var5); + if (var6 == null) { + var6 = class130.field1221; } - Buffer var19 = new Buffer(var0); + this.field1238 = var6; + int var7 = var1.readUnsignedByte(); + class130 var8 = (class130)SequenceDefinition.findEnumerated(class186.method950(), var7); + if (var8 == null) { + var8 = class130.field1221; + } - for (var12 = 0; var12 < 4; ++var12) { - for (int var13 = 0; var13 < 64; ++var13) { - for (int var14 = 0; var14 < 64; ++var14) { - if (var12 == var4 && var13 >= var5 && var13 < var5 + 8 && var14 >= var6 && var14 < var6 + 8) { - int var15 = var2 + class85.method470(var13 & 7, var14 & 7, var7); - int var16 = var3 + class144.method772(var13 & 7, var14 & 7, var7); - int var17 = (var13 & 7) + var8 + var2; - int var18 = var3 + (var14 & 7) + var9; - SecureRandomFuture.loadTerrain(var19, var1, var15, var16, var17, var18, var7); - } else { - SecureRandomFuture.loadTerrain(var19, 0, -1, -1, 0, 0, 0); - } - } + this.field1239 = var8; + this.field1233 = var1.readUnsignedByte() != 0; + this.field1237 = new class127[var3]; + class127 var11 = null; + + for (int var9 = 0; var9 < var3; ++var9) { + class127 var10 = new class127(); + var10.method691(var1, var2); + this.field1237[var9] = var10; + if (var11 != null) { + var11.field1194 = var10; } + + var11 = var10; } + return var3; } - @ObfuscatedName("an") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-1398962204" + descriptor = "(I)V", + garbageValue = "25701091" ) - static int method735(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - if (var0 == 1500) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == 1501) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == 1502) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == 1503) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == 1504) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == 1505) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; + void method710() { + this.field1253 = this.field1237[0].field1200; + this.field1255 = this.field1237[this.method717() - 1].field1200; + this.field1252 = new float[this.method714() + 1]; + + for (int var1 = this.method712(); var1 <= this.method713(); ++var1) { + this.field1252[var1 - this.method712()] = class183.method938(this, (float)var1); } + + this.field1237 = null; + this.field1246 = class183.method938(this, (float)(this.method712() - 1)); + this.field1251 = class183.method938(this, (float)(this.method713() + 1)); } - @ObfuscatedName("jr") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-124816622" + descriptor = "(II)F", + garbageValue = "-1862749488" ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - if (VarbitComposition.localPlayer.x >> 7 == Client.destinationX && VarbitComposition.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - RouteStrategy.method1125(); - InterfaceParent.method475(); - WorldMapData_0.addNpcsToScene(true); - class147.method785(); - WorldMapData_0.addNpcsToScene(false); - - int var6; - for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { - if (var4.plane == HealthBar.Client_plane && Client.cycle <= var4.cycleEnd) { - if (Client.cycle >= var4.cycleStart) { - NPC var5; - Player var40; - if (!var4.isMoving && var4.field797 != 0) { - if (var4.field797 > 0) { - var5 = Client.npcs[var4.field797 - 1]; - if (var5 != null && var5.x >= 0 && var5.x < 13312 && var5.y >= 0 && var5.y < 13312) { - var4.sourceX = var5.x; - var4.sourceY = var5.y; - var4.setDestination(var4.field805, var4.field799, var4.field789, Client.cycle); - } - } else { - var6 = -var4.field797 - 1; - if (var6 == Client.localPlayerIndex) { - var40 = VarbitComposition.localPlayer; - } else { - var40 = Client.players[var6]; - } - - if (var40 != null && var40.x >= 0 && var40.x < 13312 && var40.y >= 0 && var40.y < 13312) { - var4.sourceX = var40.x; - var4.sourceY = var40.y; - var4.setDestination(var4.field805, var4.field799, var4.field789, Client.cycle); - } - } - } - - if (var4.targetIndex > 0) { - var5 = Client.npcs[var4.targetIndex - 1]; - if (var5 != null && var5.x >= 0 && var5.x < 13312 && var5.y >= 0 && var5.y < 13312) { - var4.setDestination(var5.x, var5.y, class18.getTileHeight(var5.x, var5.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - if (var4.targetIndex < 0) { - var6 = -var4.targetIndex - 1; - if (var6 == Client.localPlayerIndex) { - var40 = VarbitComposition.localPlayer; - } else { - var40 = Client.players[var6]; - } - - if (var40 != null && var40.x >= 0 && var40.x < 13312 && var40.y >= 0 && var40.y < 13312) { - var4.setDestination(var40.x, var40.y, class18.getTileHeight(var40.x, var40.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - var4.advance(Client.field457); - class130.scene.drawEntity(HealthBar.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); - } - } else { - var4.remove(); - } - } - - class167.method874(); - GrandExchangeOfferOwnWorldComparator.setViewportShape(var0, var1, var2, var3, true); - var0 = Client.viewportOffsetX; - var1 = Client.viewportOffsetY; - var2 = Client.viewportWidth; - var3 = Client.viewportHeight; - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - Rasterizer3D.method1199(); - Rasterizer2D.method2643(); - int var36 = Client.camAngleX; - if (Client.field467 / 256 > var36) { - var36 = Client.field467 / 256; - } - - if (Client.cameraShaking[4] && Client.cameraMoveIntensity[4] + 128 > var36) { - var36 = Client.cameraMoveIntensity[4] + 128; - } - - int var37 = Client.camAngleY & 2047; - var6 = FriendLoginUpdate.oculusOrbFocalPointX; - int var7 = class125.field1194; - int var8 = HealthBar.oculusOrbFocalPointY; - int var9 = class172.method907(var36); - int var11 = var3 - 334; - if (var11 < 0) { - var11 = 0; - } else if (var11 > 100) { - var11 = 100; - } - - int var12 = (Client.zoomWidth - Client.zoomHeight) * var11 / 100 + Client.zoomHeight; - int var10 = var12 * var9 / 256; - var11 = 2048 - var36 & 2047; - var12 = 2048 - var37 & 2047; - int var13 = 0; - int var14 = 0; - int var15 = var10; - int var16; - int var17; - int var18; - if (var11 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var11]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; - var18 = var17 * var14 - var16 * var10 >> 16; - var15 = var17 * var10 + var16 * var14 >> 16; - var14 = var18; - } - - if (var12 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var12]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var18 = var16 * var15 + var13 * var17 >> 16; - var15 = var17 * var15 - var13 * var16 >> 16; - var13 = var18; - } - - if (Client.isCameraLocked) { - FontName.field4045 = var6 - var13; - KeyHandler.field70 = var7 - var14; - class31.field84 = var8 - var15; - UserComparator4.field1180 = var36; - VertexNormal.field2255 = var37; + public float method711(int var1) { + if (var1 < this.method712()) { + return this.field1246; } else { - NPCComposition.cameraX = var6 - var13; - class133.cameraY = var7 - var14; - class139.cameraZ = var8 - var15; - class129.cameraPitch = var36; - UserComparator10.cameraYaw = var37; - } - - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (FriendLoginUpdate.oculusOrbFocalPointX >> 7 != VarbitComposition.localPlayer.x >> 7 || HealthBar.oculusOrbFocalPointY >> 7 != VarbitComposition.localPlayer.y >> 7)) { - var16 = VarbitComposition.localPlayer.plane; - var17 = (FriendLoginUpdate.oculusOrbFocalPointX >> 7) + UrlRequester.baseX; - var18 = (HealthBar.oculusOrbFocalPointY >> 7) + class47.baseY; - NPC.method597(var17, var18, var16, true); + return var1 > this.method713() ? this.field1251 : this.field1252[var1 - this.method712()]; } + } - int var20; - if (!Client.isCameraLocked) { - if (class449.clientPreferences.getRoofsHidden()) { - var11 = HealthBar.Client_plane; - } else { - label577: { - var12 = 3; - if (class129.cameraPitch < 310) { - if (Client.oculusOrbState == 1) { - var13 = FriendLoginUpdate.oculusOrbFocalPointX >> 7; - var14 = HealthBar.oculusOrbFocalPointY >> 7; - } else { - var13 = VarbitComposition.localPlayer.x >> 7; - var14 = VarbitComposition.localPlayer.y >> 7; - } - - var15 = NPCComposition.cameraX >> 7; - var16 = class139.cameraZ >> 7; - if (var15 < 0 || var16 < 0 || var15 >= 104 || var16 >= 104) { - var11 = HealthBar.Client_plane; - break label577; - } + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "103" + ) + int method712() { + return this.field1253; + } - if (var13 < 0 || var14 < 0 || var13 >= 104 || var14 >= 104) { - var11 = HealthBar.Client_plane; - break label577; - } + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "115" + ) + int method713() { + return this.field1255; + } - if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][var15][var16] & 4) != 0) { - var12 = HealthBar.Client_plane; - } + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-11" + ) + int method714() { + return this.method713() - this.method712(); + } - if (var13 > var15) { - var17 = var13 - var15; - } else { - var17 = var15 - var13; - } + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(FI)I", + garbageValue = "1249933275" + ) + int method715(float var1) { + if (this.field1254 < 0 || (float)this.field1237[this.field1254].field1200 > var1 || this.field1237[this.field1254].field1194 != null && (float)this.field1237[this.field1254].field1194.field1200 <= var1) { + if (var1 >= (float)this.method712() && var1 <= (float)this.method713()) { + int var2 = this.method717(); + int var3 = this.field1254; + if (var2 > 0) { + int var4 = 0; + int var5 = var2 - 1; + + do { + int var6 = var5 + var4 >> 1; + if (var1 < (float)this.field1237[var6].field1200) { + if (var1 > (float)this.field1237[var6 - 1].field1200) { + var3 = var6 - 1; + break; + } - if (var14 > var16) { - var18 = var14 - var16; + var5 = var6 - 1; } else { - var18 = var16 - var14; - } - - int var19; - if (var17 > var18) { - var19 = var18 * 65536 / var17; - var20 = 32768; - - while (var15 != var13) { - if (var15 < var13) { - ++var15; - } else if (var15 > var13) { - --var15; - } - - if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][var15][var16] & 4) != 0) { - var12 = HealthBar.Client_plane; - } - - var20 += var19; - if (var20 >= 65536) { - var20 -= 65536; - if (var16 < var14) { - ++var16; - } else if (var16 > var14) { - --var16; - } - - if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][var15][var16] & 4) != 0) { - var12 = HealthBar.Client_plane; - } - } + if (var1 <= (float)this.field1237[var6].field1200) { + var3 = var6; + break; } - } else if (var18 > 0) { - var19 = var17 * 65536 / var18; - var20 = 32768; - - while (var14 != var16) { - if (var16 < var14) { - ++var16; - } else if (var16 > var14) { - --var16; - } - - if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][var15][var16] & 4) != 0) { - var12 = HealthBar.Client_plane; - } - var20 += var19; - if (var20 >= 65536) { - var20 -= 65536; - if (var15 < var13) { - ++var15; - } else if (var15 > var13) { - --var15; - } - - if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][var15][var16] & 4) != 0) { - var12 = HealthBar.Client_plane; - } - } + if (var1 < (float)this.field1237[var6 + 1].field1200) { + var3 = var6; + break; } - } - } - if (VarbitComposition.localPlayer.x >= 0 && VarbitComposition.localPlayer.y >= 0 && VarbitComposition.localPlayer.x < 13312 && VarbitComposition.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[HealthBar.Client_plane][VarbitComposition.localPlayer.x >> 7][VarbitComposition.localPlayer.y >> 7] & 4) != 0) { - var12 = HealthBar.Client_plane; + var4 = var6 + 1; } - - var11 = var12; - } else { - var11 = HealthBar.Client_plane; - } - } - } - - var10 = var11; - } else { - var10 = StructComposition.method1024(); - } - - var11 = NPCComposition.cameraX; - var12 = class133.cameraY; - var13 = class139.cameraZ; - var14 = class129.cameraPitch; - var15 = UserComparator10.cameraYaw; - - for (var16 = 0; var16 < 5; ++var16) { - if (Client.cameraShaking[var16]) { - var17 = (int)(Math.random() * (double)(Client.cameraShakeIntensity[var16] * 2 + 1) - (double)Client.cameraShakeIntensity[var16] + Math.sin((double)Client.cameraShakeSpeed[var16] / 100.0D * (double)Client.cameraShakeCycle[var16]) * (double)Client.cameraMoveIntensity[var16]); - if (var16 == 0) { - NPCComposition.cameraX += var17; - } - - if (var16 == 1) { - class133.cameraY += var17; - } - - if (var16 == 2) { - class139.cameraZ += var17; - } - - if (var16 == 3) { - UserComparator10.cameraYaw = var17 + UserComparator10.cameraYaw & 2047; + } while(var4 <= var5); } - if (var16 == 4) { - class129.cameraPitch += var17; - if (class129.cameraPitch < 128) { - class129.cameraPitch = 128; - } - - if (class129.cameraPitch > 383) { - class129.cameraPitch = 383; - } + if (var3 != this.field1254) { + this.field1254 = var3; + this.field1236 = true; } - } - } - var16 = MouseHandler.MouseHandler_x; - var17 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var16 = MouseHandler.MouseHandler_lastPressedX; - var17 = MouseHandler.MouseHandler_lastPressedY; - } - - if (var16 >= var0 && var16 < var0 + var2 && var17 >= var1 && var17 < var3 + var1) { - MenuAction.method425(var16 - var0, var17 - var1); - } else { - Players.method619(); - } - - class301.method1622(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class301.method1622(); - var18 = Rasterizer3D.get3dZoom(); - Rasterizer3D.method1185(class219.client.field123); - Rasterizer3D.clips.field2280 = Client.viewportZoom; - class130.scene.draw(NPCComposition.cameraX, class133.cameraY, class139.cameraZ, class129.cameraPitch, UserComparator10.cameraYaw, var10); - Rasterizer3D.method1185(false); - if (Client.renderSelf) { - Rasterizer2D.method2644(); - } - - Rasterizer3D.clips.field2280 = var18; - class301.method1622(); - class130.scene.clearTempGameObjects(); - Client.overheadTextLimit = 0; - boolean var41 = false; - var20 = -1; - int var21 = -1; - int var22 = Players.Players_count; - int[] var23 = Players.Players_indices; - - int var24; - for (var24 = 0; var24 < var22 + Client.npcCount; ++var24) { - Object var25; - if (var24 < var22) { - var25 = Client.players[var23[var24]]; - if (var23[var24] == Client.combatTargetPlayerIndex) { - var41 = true; - var20 = var24; - continue; - } - - if (var25 == VarbitComposition.localPlayer) { - var21 = var24; - continue; - } + return this.field1254; } else { - var25 = Client.npcs[Client.npcIndices[var24 - var22]]; - } - - PcmPlayer.drawActor2d((Actor)var25, var24, var0, var1, var2, var3); - } - - if (Client.field386 && var21 != -1) { - PcmPlayer.drawActor2d(VarbitComposition.localPlayer, var21, var0, var1, var2, var3); - } - - if (var41) { - PcmPlayer.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var20, var0, var1, var2, var3); - } - - for (var24 = 0; var24 < Client.overheadTextLimit; ++var24) { - int var38 = Client.overheadTextXs[var24]; - int var26 = Client.overheadTextYs[var24]; - int var27 = Client.overheadTextXOffsets[var24]; - int var28 = Client.overheadTextAscents[var24]; - boolean var29 = true; - - while (var29) { - var29 = false; - - for (int var30 = 0; var30 < var24; ++var30) { - if (var26 + 2 > Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] && var26 - var28 < Client.overheadTextYs[var30] + 2 && var38 - var27 < Client.overheadTextXOffsets[var30] + Client.overheadTextXs[var30] && var38 + var27 > Client.overheadTextXs[var30] - Client.overheadTextXOffsets[var30] && Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] < var26) { - var26 = Client.overheadTextYs[var30] - Client.overheadTextAscents[var30]; - var29 = true; - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var24]; - Client.viewportTempY = Client.overheadTextYs[var24] = var26; - String var39 = Client.field603[var24]; - if (Client.chatEffects == 0) { - int var31 = 16776960; - if (Client.overheadTextColors[var24] < 6) { - var31 = Client.field579[Client.overheadTextColors[var24]]; - } - - if (Client.overheadTextColors[var24] == 6) { - var31 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var24] == 7) { - var31 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var24] == 8) { - var31 = Client.viewportDrawCount % 20 < 10 ? '\ub000' : 8454016; - } - - int var32; - if (Client.overheadTextColors[var24] == 9) { - var32 = 150 - Client.overheadTextCyclesRemaining[var24]; - if (var32 < 50) { - var31 = var32 * 1280 + 16711680; - } else if (var32 < 100) { - var31 = 16776960 - (var32 - 50) * 327680; - } else if (var32 < 150) { - var31 = (var32 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var24] == 10) { - var32 = 150 - Client.overheadTextCyclesRemaining[var24]; - if (var32 < 50) { - var31 = var32 * 5 + 16711680; - } else if (var32 < 100) { - var31 = 16711935 - (var32 - 50) * 327680; - } else if (var32 < 150) { - var31 = (var32 - 100) * 327680 + 255 - (var32 - 100) * 5; - } - } - - if (Client.overheadTextColors[var24] == 11) { - var32 = 150 - Client.overheadTextCyclesRemaining[var24]; - if (var32 < 50) { - var31 = 16777215 - var32 * 327685; - } else if (var32 < 100) { - var31 = (var32 - 50) * 327685 + 65280; - } else if (var32 < 150) { - var31 = 16777215 - (var32 - 100) * 327680; - } - } - - int var33; - if (Client.overheadTextColors[var24] == 12 && Client.field594[var24] == null) { - var32 = var39.length(); - Client.field594[var24] = new int[var32]; - - for (var33 = 0; var33 < var32; ++var33) { - int var34 = (int)(64.0F * ((float)var33 / (float)var32)); - int var35 = var34 << 10 | 896 | 64; - Client.field594[var24][var33] = class466.field3911[var35]; - } - } - - if (Client.overheadTextEffects[var24] == 0) { - class59.fontBold12.method2098(var39, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.field594[var24]); - } - - if (Client.overheadTextEffects[var24] == 1) { - class59.fontBold12.method2095(var39, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.viewportDrawCount, Client.field594[var24]); - } - - if (Client.overheadTextEffects[var24] == 2) { - class59.fontBold12.method2096(var39, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.viewportDrawCount, Client.field594[var24]); - } - - if (Client.overheadTextEffects[var24] == 3) { - class59.fontBold12.method2097(var39, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var24], Client.field594[var24]); - } - - if (Client.overheadTextEffects[var24] == 4) { - var32 = (150 - Client.overheadTextCyclesRemaining[var24]) * (class59.fontBold12.stringWidth(var39) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - class59.fontBold12.method2099(var39, var0 + Client.viewportTempX + 50 - var32, Client.viewportTempY + var1, var31, 0, Client.field594[var24]); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - - if (Client.overheadTextEffects[var24] == 5) { - var32 = 150 - Client.overheadTextCyclesRemaining[var24]; - var33 = 0; - if (var32 < 25) { - var33 = var32 - 25; - } else if (var32 > 125) { - var33 = var32 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class59.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - class59.fontBold12.method2098(var39, var0 + Client.viewportTempX, var33 + Client.viewportTempY + var1, var31, 0, Client.field594[var24]); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - class59.fontBold12.drawCentered(var39, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); + return -1; } + } else { + return this.field1254; } + } - ItemContainer.method469(var0, var1); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).animate(Client.field457); - class153.method805(var0, var1, var2, var3); - NPCComposition.cameraX = var11; - class133.cameraY = var12; - class139.cameraZ = var13; - class129.cameraPitch = var14; - UserComparator10.cameraYaw = var15; - if (Client.isLoading && class308.field2819.method1939(true, false) == 0) { - Client.isLoading = false; - } + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(FB)Lef;", + garbageValue = "6" + ) + class127 method716(float var1) { + int var2 = this.method715(var1); + return var2 >= 0 && var2 < this.field1237.length ? this.field1237[var2] : null; + } - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - FadeInTask.drawLoadingMessage("Loading - please wait.", false); - } + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2119570978" + ) + int method717() { + return this.field1237 == null ? 0 : this.field1237.length; + } + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1742739576" + ) + public static int method708(int var0, int var1) { + return (var0 << 8) + var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class133.java b/osrs/src/main/java/class133.java index 186345d5f..1b7036fea 100644 --- a/osrs/src/main/java/class133.java +++ b/osrs/src/main/java/class133.java @@ -2,46 +2,462 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") -public class class133 implements class124 { - @ObfuscatedName("kc") - @Export("cameraY") - static int cameraY; - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IB)Ldh;", - garbageValue = "47" - ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); - if (var1 != null) { - return var1; +import java.util.ArrayList; + +@ObfuscatedName("fs") +public class class133 implements class386 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lfs;" + ) + static final class133 field1257; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lfs;" + ) + static final class133 field1260; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lfs;" + ) + static final class133 field1259; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lfs;" + ) + static final class133 field1262; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lfs;" + ) + static final class133 field1261; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lfs;" + ) + static final class133 field1258; + @ObfuscatedName("oj") + @ObfuscatedSignature( + descriptor = "Lcf;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("ar") + final int field1265; + @ObfuscatedName("ab") + final int field1263; + @ObfuscatedName("am") + final int field1264; + + static { + field1257 = new class133(0, 0, (String)null, 0); + field1260 = new class133(1, 1, (String)null, 9); + field1259 = new class133(2, 2, (String)null, 3); + field1262 = new class133(3, 3, (String)null, 6); + field1261 = new class133(4, 4, (String)null, 1); + field1258 = new class133(5, 5, (String)null, 3); + } + + class133(int var1, int var2, String var3, int var4) { + this.field1265 = var1; + this.field1263 = var2; + this.field1264 = var4; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1243971674" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1263; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2025897930" + ) + int method718() { + return this.field1264; + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)Z", + garbageValue = "-1116623065" + ) + static final boolean method721(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = ViewportMouse.ViewportMouse_y + var6; + if (var7 < var0 && var7 < var1 && var7 < var2) { + return false; } else { - byte[] var2 = GrandExchangeOffer.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; + var7 = ViewportMouse.ViewportMouse_y - var6; + if (var7 > var0 && var7 > var1 && var7 > var2) { + return false; } else { - var1 = HitSplatDefinition.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; + var7 = ViewportMouse.ViewportMouse_x + var6; + if (var7 < var3 && var7 < var4 && var7 < var5) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; + return var7 <= var3 || var7 <= var4 || var7 <= var5; + } } } } - @ObfuscatedName("hw") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IZZZZI)Lnk;", - garbageValue = "1423183196" + descriptor = "(IZII)V", + garbageValue = "-605983244" ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3, boolean var4) { - ArchiveDisk var5 = null; - if (JagexCache.JagexCache_dat2File != null) { - var5 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, WallDecoration.JagexCache_idxFiles[var0], 1000000); + public static final void method720(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { + PcmPlayer.field179 = var0; + class306.PcmPlayer_stereo = var1; + class225.field1884 = var2; + } else { + throw new IllegalArgumentException(); } + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "941581685" + ) + static int method722(int var0, Script var1, boolean var2) { + if (var0 == 3200) { + Interpreter.Interpreter_intStackSize -= 3; + GraphicsDefaults.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); + return 1; + } else { + int var3; + int var4; + int var5; + int var6; + int var7; + if (var0 == 3201) { + Interpreter.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; + ArrayList var8 = new ArrayList(); + var8.add(var3); + class202.method1006(var8, var4, var5, var6, var7); + return 1; + } else if (var0 == 3202) { + Interpreter.Interpreter_intStackSize -= 2; + class437.playJingle(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + return 1; + } else { + class92 var12; + class91 var13; + String var15; + if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { + boolean var16; + if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { + if (var0 == 3211) { + return 1; + } else if (var0 == 3216) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = 0; + class92 var18 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var3); + if (var18 != null) { + var4 = var18 != class92.field889 ? 1 : 0; + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; + return 1; + } else if (var0 == 3218) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = 0; + class91 var10 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var3); + if (var10 != null) { + var4 = var10 != class91.field881 ? 1 : 0; + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; + return 1; + } else if (var0 != 3217 && var0 != 3219) { + if (var0 == 3220) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + ItemComposition.method1088(var3, var4); + return 1; + } else if (var0 == 3221) { + Interpreter.Interpreter_intStackSize -= 6; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; + int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; + ArrayList var9 = new ArrayList(); + var9.add(var3); + var9.add(var4); + class202.method1006(var9, var5, var6, var7, var11); + return 1; + } else if (var0 == 3222) { + Interpreter.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + class206.someMusicMethod(var3, var4, var5, var6); + return 1; + } else { + return 2; + } + } else { + var12 = class92.field889; + var13 = class91.field881; + var16 = true; + boolean var17 = true; + if (var0 == 3217) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var7); + if (var12 == null) { + throw new RuntimeException(String.format("Unrecognized device option %d", var7)); + } + } - return new Archive(var5, class6.masterDisk, class308.field2819, var0, var1, var2, var3, var4); + if (var0 == 3219) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var7); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized game option %d", var7)); + } + } + + String var14; + byte var19; + if (var13 == class91.field881) { + switch(var12.field896) { + case 1: + case 2: + case 3: + var19 = 0; + var6 = 1; + break; + case 4: + var19 = 0; + var6 = Integer.MAX_VALUE; + break; + case 5: + var19 = 0; + var6 = 100; + break; + default: + var14 = String.format("Unkown device option: %s.", var12.toString()); + throw new RuntimeException(var14); + } + } else { + switch(var13.field886) { + case 1: + var19 = 0; + var6 = 1; + break; + case 2: + case 3: + case 4: + var19 = 0; + var6 = 100; + break; + default: + var14 = String.format("Unkown game option: %s.", var13.toString()); + throw new RuntimeException(var14); + } + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var19; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; + return 1; + } + } else { + var12 = class92.field889; + var13 = class91.field881; + var16 = false; + if (var0 == 3214) { + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var6); + if (var12 == null) { + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); + } + } + + if (var0 == 3215) { + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); + } + } + + if (var0 == 3210) { + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var6); + if (var12 == null) { + var13 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); + } + } + } else if (var0 == 3182) { + var12 = class92.field890; + } else if (var0 == 3204) { + var13 = class91.field882; + } else if (var0 == 3206) { + var13 = class91.field885; + } else if (var0 == 3208) { + var13 = class91.field884; + } + + if (var13 == class91.field881) { + switch(var12.field896) { + case 1: + var5 = class91.clientPreferences.getIsUsernameHidden() ? 1 : 0; + break; + case 2: + var5 = class91.clientPreferences.getTitleMusicDisabled() ? 1 : 0; + break; + case 3: + var5 = class91.clientPreferences.method546() ? 1 : 0; + break; + case 4: + var5 = class91.clientPreferences.method548(); + break; + case 5: + var5 = FaceNormal.method1334(); + break; + default: + var15 = String.format("Unkown device option: %s.", var12.toString()); + throw new RuntimeException(var15); + } + } else { + switch(var13.field886) { + case 1: + var5 = class91.clientPreferences.getRoofsHidden() ? 1 : 0; + break; + case 2: + var6 = class91.clientPreferences.getCurrentMusicVolume(); + var5 = Math.round((float)(var6 * 100) / 255.0F); + break; + case 3: + var6 = class91.clientPreferences.getCurrentSoundEffectsVolume(); + var5 = Math.round((float)(var6 * 100) / 127.0F); + break; + case 4: + var6 = class91.clientPreferences.getAreaSoundEffectsVolume(); + var5 = Math.round((float)(var6 * 100) / 127.0F); + break; + default: + var15 = String.format("Unkown game option: %s.", var13.toString()); + throw new RuntimeException(var15); + } + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; + return 1; + } + } else { + var12 = class92.field889; + var13 = class91.field881; + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var0 == 3212) { + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var6); + if (var12 == null) { + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); + } + } + + if (var0 == 3213) { + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); + } + } + + if (var0 == 3209) { + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var6); + if (var12 == null) { + var13 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); + } + } + } else if (var0 == 3181) { + var12 = class92.field890; + } else if (var0 == 3203) { + var13 = class91.field882; + } else if (var0 == 3205) { + var13 = class91.field885; + } else if (var0 == 3207) { + var13 = class91.field884; + } + + if (var13 == class91.field881) { + switch(var12.field896) { + case 1: + class91.clientPreferences.setIsUsernameHidden(var5 == 1); + break; + case 2: + class91.clientPreferences.getTitleMusicDisabled(var5 == 1); + break; + case 3: + class91.clientPreferences.method544(var5 == 1); + break; + case 4: + if (var5 < 0) { + var5 = 0; + } + + class91.clientPreferences.method547(var5); + break; + case 5: + FontName.method2482(var5); + break; + default: + var15 = String.format("Unkown device option: %s.", var12.toString()); + throw new RuntimeException(var15); + } + } else { + switch(var13.field886) { + case 1: + class91.clientPreferences.setRoofsHidden(var5 == 1); + break; + case 2: + var5 = Math.min(Math.max(var5, 0), 100); + var6 = Math.round((float)(var5 * 255) / 100.0F); + JagexCache.method921(var6); + break; + case 3: + var5 = Math.min(Math.max(var5, 0), 100); + var6 = Math.round((float)(var5 * 127) / 100.0F); + FloorOverlayDefinition.method1114(var6); + break; + case 4: + var5 = Math.min(Math.max(var5, 0), 100); + var6 = Math.round((float)(var5 * 127) / 100.0F); + class198.method994(var6); + break; + default: + var15 = String.format("Unkown game option: %s.", var13.toString()); + throw new RuntimeException(var15); + } + } + + return 1; + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class134.java b/osrs/src/main/java/class134.java index 6c419c90b..49b73706e 100644 --- a/osrs/src/main/java/class134.java +++ b/osrs/src/main/java/class134.java @@ -2,295 +2,298 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.concurrent.Callable; - -@ObfuscatedName("fe") -class class134 implements Callable { - @ObfuscatedName("qj") - static int field1294; - // $FF: synthetic field +@ObfuscatedName("fl") +public class class134 implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lfv;" + descriptor = "Lfl;" ) - @Export("this$0") - @ObfuscatedName("this$0") - final class137 this$0; - // $FF: synthetic field + static final class134 field1268; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ltm;" + descriptor = "Lfl;" ) - @Export("val$p") - @ObfuscatedName("val$p") - final Buffer val$p; - // $FF: synthetic field - @Export("val$version") - @ObfuscatedName("val$version") - final int val$version; - + static final class134 field1273; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1272; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1281; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1276; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1270; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1278; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1267; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1274; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1280; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1269; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1266; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1277; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1282; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1279; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + static final class134 field1271; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lfv;Ltm;I)V" + descriptor = "Lfl;" ) - class134(class137 var1, Buffer var2, int var3) { - this.this$0 = var1; - this.val$p = var2; - this.val$version = var3; + static final class134 field1275; + @ObfuscatedName("au") + final int field1285; + @ObfuscatedName("ai") + final int field1284; + @ObfuscatedName("ae") + final int field1283; + + static { + field1268 = new class134(0, 0, (String)null, -1, -1); + field1273 = new class134(1, 1, (String)null, 0, 2); + field1272 = new class134(2, 2, (String)null, 1, 2); + field1281 = new class134(3, 3, (String)null, 2, 2); + field1276 = new class134(4, 4, (String)null, 3, 1); + field1270 = new class134(5, 5, (String)null, 4, 1); + field1278 = new class134(6, 6, (String)null, 5, 1); + field1267 = new class134(7, 7, (String)null, 6, 3); + field1274 = new class134(8, 8, (String)null, 7, 3); + field1280 = new class134(9, 9, (String)null, 8, 3); + field1269 = new class134(10, 10, (String)null, 0, 7); + field1266 = new class134(11, 11, (String)null, 1, 7); + field1277 = new class134(12, 12, (String)null, 2, 7); + field1282 = new class134(13, 13, (String)null, 3, 7); + field1279 = new class134(14, 14, (String)null, 4, 7); + field1271 = new class134(15, 15, (String)null, 5, 7); + field1275 = new class134(16, 16, (String)null, 0, 5); } - @Export("call") - @ObfuscatedName("call") - public Object call() { - this.this$0.method745(this.val$p, this.val$version); - return null; + @ObfuscatedSignature( + descriptor = "(IILjava/lang/String;II)V", + garbageValue = "-1" + ) + class134(int var1, int var2, String var3, int var4, int var5) { + this.field1285 = var1; + this.field1284 = var2; + this.field1283 = var4; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)J", - garbageValue = "-41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) - static long method739(CharSequence var0) { - long var1 = 0L; - int var3 = var0.length(); - - for (int var4 = 0; var4 < var3; ++var4) { - var1 *= 37L; - char var5 = var0.charAt(var4); - if (var5 >= 'A' && var5 <= 'Z') { - var1 += (long)(var5 + 1 - 65); - } else if (var5 >= 'a' && var5 <= 'z') { - var1 += (long)(var5 + 1 - 97); - } else if (var5 >= '0' && var5 <= '9') { - var1 += (long)(var5 + 27 - 48); - } - - if (var1 >= 177917621779460413L) { - break; - } - } - - while (var1 % 37L == 0L && var1 != 0L) { - var1 /= 37L; - } - - return var1; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1284; } - @ObfuscatedName("lc") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "3" + descriptor = "(I)I", + garbageValue = "-232140937" ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - class385.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); - } - - long var4 = -1L; - long var6 = -1L; - int var8 = 0; - - while (true) { - int var10 = ViewportMouse.ViewportMouse_entityCount; - if (var8 >= var10) { - if (var4 != -1L) { - var8 = (int)(var4 >>> 0 & 127L); - var10 = (int)(var4 >>> 7 & 127L); - Player var12 = Client.players[Client.combatTargetPlayerIndex]; - ItemLayer.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); - } - - return; - } - - long var25 = WorldMapSectionType.method1515(var8); - if (var6 != var25) { - label309: { - var6 = var25; - int var13 = Interpreter.method417(var8); - int var14 = PcmPlayer.method197(var8); - int var15 = class177.method918(ViewportMouse.ViewportMouse_entityTags[var8]); - int var17 = InvDefinition.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); - int var18 = var17; - int var22; - if (var15 == 2 && class130.scene.getObjectFlags(HealthBar.Client_plane, var13, var14, var25) >= 0) { - ObjectComposition var19 = WorldMapElement.getObjectDefinition(var17); - if (var19.transforms != null) { - var19 = var19.transform(); - } - - if (var19 == null) { - break label309; - } - - PendingSpawn var20 = null; - - for (PendingSpawn var21 = (PendingSpawn)Client.pendingSpawns.last(); var21 != null; var21 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var21.plane == HealthBar.Client_plane && var13 == var21.x && var14 == var21.y && var18 == var21.id) { - var20 = var21; - break; - } - } - - if (Client.isItemSelected == 1) { - class385.insertMenuItemNoShift("Use", Client.field599 + " " + "->" + " " + MoveSpeed.colorStartTag(65535) + var19.name, 1, var18, var13, var14); - } else if (Client.isSpellSelected) { - if ((Canvas.selectedSpellFlags & 4) == 4) { - class385.insertMenuItemNoShift(Client.field600, Client.field601 + " " + "->" + " " + MoveSpeed.colorStartTag(65535) + var19.name, 2, var18, var13, var14); - } - } else { - String[] var34 = var19.actions; - if (var34 != null) { - for (var22 = 4; var22 >= 0; --var22) { - if ((var20 == null || var20.method507(var22)) && var34[var22] != null) { - short var23 = 0; - if (var22 == 0) { - var23 = 3; - } - - if (var22 == 1) { - var23 = 4; - } - - if (var22 == 2) { - var23 = 5; - } - - if (var22 == 3) { - var23 = 6; - } - - if (var22 == 4) { - var23 = 1001; - } - - class385.insertMenuItemNoShift(var34[var22], MoveSpeed.colorStartTag(65535) + var19.name, var23, var18, var13, var14); - } - } - } - - class385.insertMenuItemNoShift("Examine", MoveSpeed.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var14); - } - } - - int var27; - Player var28; - NPC var35; - int[] var36; - if (var15 == 1) { - NPC var30 = Client.npcs[var18]; - if (var30 == null) { - break label309; - } - - if (var30.definition.size == 1 && (var30.x & 127) == 64 && (var30.y & 127) == 64) { - for (var27 = 0; var27 < Client.npcCount; ++var27) { - var35 = Client.npcs[Client.npcIndices[var27]]; - if (var35 != null && var30 != var35 && var35.definition.size == 1 && var30.x == var35.x && var35.y == var30.y) { - class260.addNpcToMenu(var35, Client.npcIndices[var27], var13, var14); - } - } - - var27 = Players.Players_count; - var36 = Players.Players_indices; - - for (var22 = 0; var22 < var27; ++var22) { - var28 = Client.players[var36[var22]]; - if (var28 != null && var30.x == var28.x && var28.y == var30.y) { - ItemLayer.addPlayerToMenu(var28, var36[var22], var13, var14); - } - } - } + int method724() { + return this.field1283; + } - class260.addNpcToMenu(var30, var18, var13, var14); + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "385720754" + ) + static int method725(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + if (var0 == 1600) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == 1601) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else { + class344 var7; + if (var0 == 1602) { + if (var3.type == 12) { + var7 = var3.method1877(); + if (var7 != null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7.method1811().method2070(); + return 1; } + } - if (var15 == 0) { - Player var31 = Client.players[var18]; - if (var31 == null) { - break label309; - } - - if ((var31.x & 127) == 64 && (var31.y & 127) == 64) { - for (var27 = 0; var27 < Client.npcCount; ++var27) { - var35 = Client.npcs[Client.npcIndices[var27]]; - if (var35 != null && var35.definition.size == 1 && var35.x == var31.x && var35.y == var31.y) { - class260.addNpcToMenu(var35, Client.npcIndices[var27], var13, var14); - } - } - - var27 = Players.Players_count; - var36 = Players.Players_indices; - - for (var22 = 0; var22 < var27; ++var22) { - var28 = Client.players[var36[var22]]; - if (var28 != null && var31 != var28 && var31.x == var28.x && var28.y == var31.y) { - ItemLayer.addPlayerToMenu(var28, var36[var22], var13, var14); - } - } - } + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == 1603) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == 1604) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == 1605) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == 1606) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == 1607) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == 1608) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == 1609) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 1610) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == 1611) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == 1612) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 1613) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == 1614) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + class339 var4; + if (var0 == 1617) { + var4 = var3.method1878(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2923 * -1501316877 * 383918139 : 0; + } - if (var18 != Client.combatTargetPlayerIndex) { - ItemLayer.addPlayerToMenu(var31, var18, var13, var14); + if (var0 == 1618) { + var4 = var3.method1878(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2925 * 1245217763 * 1917639115 : 0; + return 1; + } else if (var0 == 1619) { + var7 = var3.method1877(); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1812().method2070() : ""; + return 1; + } else if (var0 == 1620) { + var4 = var3.method1878(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2924 * 1697101243 * 2044708723 : 0; + return 1; + } else if (var0 == 1621) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1822() : 0; + return 1; + } else if (var0 == 1622) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1823() : 0; + return 1; + } else if (var0 == 1623) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1824() : 0; + return 1; + } else if (var0 == 1624) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1814() ? 1 : 0; + return 1; + } else if (var0 != 1625) { + if (var0 == 1626) { + var7 = var3.method1877(); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1813().method2145() : ""; + return 1; + } else if (var0 == 1627) { + var7 = var3.method1877(); + int var5 = var7 != null ? var7.method1818() : 0; + int var6 = var7 != null ? var7.method1817() : 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.min(var5, var6); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.max(var5, var6); + return 1; + } else if (var0 == 1628) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1817() : 0; + return 1; + } else if (var0 == 1629) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1826() : 0; + return 1; + } else if (var0 == 1630) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1825() : 0; + return 1; + } else if (var0 == 1631) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1827() : 0; + return 1; + } else if (var0 == 1632) { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1828() : 0; + return 1; + } else { + class27 var8; + if (var0 == 1633) { + var8 = var3.method1879(); + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method105(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; + return 1; + } else if (var0 == 1634) { + var8 = var3.method1879(); + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method106((char)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; + return 1; } else { - var4 = var25; - } - } - - if (var15 == 3) { - NodeDeque var32 = Client.groundItems[HealthBar.Client_plane][var13][var14]; - if (var32 != null) { - for (TileItem var33 = (TileItem)var32.first(); var33 != null; var33 = (TileItem)var32.next()) { - ItemComposition var37 = InvDefinition.ItemDefinition_get(var33.id); - if (Client.isItemSelected == 1) { - class385.insertMenuItemNoShift("Use", Client.field599 + " " + "->" + " " + MoveSpeed.colorStartTag(16748608) + var37.name, 16, var33.id, var13, var14); - } else if (Client.isSpellSelected) { - if ((Canvas.selectedSpellFlags & 1) == 1) { - class385.insertMenuItemNoShift(Client.field600, Client.field601 + " " + "->" + " " + MoveSpeed.colorStartTag(16748608) + var37.name, 17, var33.id, var13, var14); - } - } else { - String[] var29 = var37.groundActions; - - for (int var38 = 4; var38 >= 0; --var38) { - if (var33.method610(var38)) { - if (var29 != null && var29[var38] != null) { - byte var24 = 0; - if (var38 == 0) { - var24 = 18; - } - - if (var38 == 1) { - var24 = 19; - } - - if (var38 == 2) { - var24 = 20; - } - - if (var38 == 3) { - var24 = 21; - } - - if (var38 == 4) { - var24 = 22; - } - - class385.insertMenuItemNoShift(var29[var38], MoveSpeed.colorStartTag(16748608) + var37.name, var24, var33.id, var13, var14); - } else if (var38 == 2) { - class385.insertMenuItemNoShift("Take", MoveSpeed.colorStartTag(16748608) + var37.name, 20, var33.id, var13, var14); - } - } - } - - class385.insertMenuItemNoShift("Examine", MoveSpeed.colorStartTag(16748608) + var37.name, 1004, var33.id, var13, var14); - } - } + return 2; } } + } else { + var7 = var3.method1877(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1815() ? 1 : 0; + return 1; } } - - ++var8; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class135.java b/osrs/src/main/java/class135.java index 08c184ed1..ee9023574 100644 --- a/osrs/src/main/java/class135.java +++ b/osrs/src/main/java/class135.java @@ -2,648 +2,150 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") -public class class135 { - @ObfuscatedName("au") +@ObfuscatedName("fe") +public class class135 implements class126 { + @ObfuscatedName("ac") + static long field1287; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIIB)Lui;", - garbageValue = "108" + descriptor = "Lom;" ) - static SpritePixels method741(int var0, int var1, int var2) { - DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; - long var4 = (long)(var2 << 16 | var0 << 8 | var1); - return (SpritePixels)var3.get(var4); - } + @Export("HitSplatDefinition_fontsArchive") + static AbstractArchive HitSplatDefinition_fontsArchive; + @ObfuscatedName("ag") + @Export("Tiles_saturation") + static int[] Tiles_saturation; - @ObfuscatedName("bb") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lmi;III)V", - garbageValue = "-1092198621" + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "-338736773" ) - public static void method742(Widget var0, int var1, int var2) { - PlayerComposition var3 = var0.field3101; - boolean var4 = var2 != var3.field2916; - var3.field2916 = var2; - if (var4) { - int var5; - int var6; - if (var3.field2916 == var1) { - for (var5 = 0; var5 < PlayerComposition.equipmentIndices.length; ++var5) { - var6 = PlayerComposition.equipmentIndices[var5]; - if (var3.equipment[var6] > 0 && var3.equipment[var6] < 512) { - var3.equipment[var6] = var3.field2913[var6]; - } - } + public static byte[] method726(Object var0, boolean var1) { + if (var0 == null) { + return null; + } else if (var0 instanceof byte[]) { + byte[] var6 = (byte[])((byte[])var0); + if (var1) { + int var4 = var6.length; + byte[] var5 = new byte[var4]; + System.arraycopy(var6, 0, var5, 0, var4); + return var5; } else { - if (var3.equipment[0] < 512 || Actor.method522(var3)) { - var3.equipment[class209.field1862.field1871] = 1; - } - - for (var5 = 0; var5 < 7; ++var5) { - var6 = PlayerComposition.equipmentIndices[var5]; - if (var3.equipment[var6] > 0 && var3.equipment[var6] < 512) { - int[] var7 = var3.equipment; - - for (int var8 = 0; var8 < KitDefinition.KitDefinition_fileCount; ++var8) { - KitDefinition var9 = ClanChannel.KitDefinition_get(var8); - if (var9 != null && !var9.nonSelectable && var5 + (var2 == 1 ? 7 : 0) == var9.bodypartID) { - var7[PlayerComposition.equipmentIndices[var5]] = var8 + 256; - break; - } - } - } - } + return var6; } + } else if (var0 instanceof AbstractByteArrayCopier) { + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; + return var2.get(); + } else { + throw new IllegalArgumentException(); } + } - var3.method1729(); + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;I)V", + garbageValue = "-1763952071" + ) + public static void method727(AbstractArchive var0) { + VarcInt.VarcInt_archive = var0; } - @ObfuscatedName("kw") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1108375870" + descriptor = "(Ljava/lang/CharSequence;IZB)Z", + garbageValue = "-89" ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[HealthBar.Client_plane][var0][var1]; - if (var2 == null) { - class130.scene.removeGroundItemPile(HealthBar.Client_plane, var0, var1); - } else { - long var3 = -99999999L; - TileItem var5 = null; + static boolean method728(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); + + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemComposition var7 = InvDefinition.ItemDefinition_get(var6.id); - long var8 = (long)var7.price; - if (var7.isStackable == 1) { - var8 *= var6.quantity < Integer.MAX_VALUE ? (long)(var6.quantity + 1) : (long)var6.quantity; + if (var8 == '+') { + continue; + } } - if (var8 > var3) { - var3 = var8; - var5 = var6; + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + return false; + } + + var10 = var8 - 'W'; } - } - if (var5 == null) { - class130.scene.removeGroundItemPile(HealthBar.Client_plane, var0, var1); - } else { - var2.addLast(var5); - TileItem var12 = null; - TileItem var11 = null; + if (var10 >= var1) { + return false; + } - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var6.id != var5.id) { - if (var12 == null) { - var12 = var6; - } + if (var3) { + var10 = -var10; + } - if (var6.id != var12.id && var11 == null) { - var11 = var6; - } - } + int var9 = var10 + var5 * var1; + if (var9 / var1 != var5) { + return false; } - long var9 = FontName.calculateTag(var0, var1, 3, false, 0); - class130.scene.newGroundItemPile(HealthBar.Client_plane, var0, var1, class18.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, HealthBar.Client_plane), var5, var9, var12, var11); + var5 = var9; + var4 = true; } + + return var4; + } else { + throw new IllegalArgumentException("" + var1); } } - @ObfuscatedName("lz") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "([Lmi;IIIIIIIII)V", - garbageValue = "-1671360760" + descriptor = "(CB)Z", + garbageValue = "-9" ) - @Export("drawInterface") - static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.method1199(); + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } - for (int var9 = 0; var9 < var0.length; ++var9) { - Widget var10 = var0[var9]; - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { - int var11; - if (var8 == -1) { - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; - var11 = ++Client.rootWidgetCount - 1; + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "30" + ) + static final void method730(int var0, int var1) { + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { + if (Client.showMouseOverText) { + int var2 = AttackOption.method609(); + String var3; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { + var3 = "Use" + " " + Client.field598 + " " + "->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { + var3 = Client.field599 + " " + Client.field600 + " " + "->"; } else { - var11 = var8; + var3 = class169.method882(var2); } - var10.rootIndex = var11; - var10.cycle = Client.cycle; - if (!var10.isIf3 || !class143.isComponentHidden(var10)) { - if (var10.contentType > 0) { - StructComposition.method1025(var10); - } - - int var12 = var10.x + var6; - int var13 = var7 + var10.y; - int var14 = var10.transparencyTop; - int var15; - int var16; - if (var10 == Client.clickedWidget) { - if (var1 != -1412584499 && !var10.isScrollBar) { - class162.field1420 = var0; - class134.field1294 = var6; - class326.field2893 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field395) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field514) { - var15 = Client.field514; - } - - if (var15 + var10.width > Client.field514 + Client.clickedWidgetParent.width) { - var15 = Client.field514 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field513) { - var16 = Client.field513; - } - - if (var16 + var10.height > Client.field513 + Client.clickedWidgetParent.height) { - var16 = Client.field513 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 9) { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if (var21 < var12) { - var19 = var21; - var21 = var12; - } - - if (var22 < var13) { - var20 = var22; - var22 = var13; - } - - ++var21; - ++var22; - var15 = var19 > var2 ? var19 : var2; - var16 = var20 > var3 ? var20 : var3; - var17 = var21 < var4 ? var21 : var4; - var18 = var22 < var5 ? var22 : var5; - } else { - var19 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var19 < var4 ? var19 : var4; - var18 = var20 < var5 ? var20 : var5; - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { - if (var10.contentType != 0) { - if (var10.contentType == 1336) { - if (class449.clientPreferences.method550()) { - var13 += 15; - SecureRandomCallable.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); - var13 += 15; - Runtime var41 = Runtime.getRuntime(); - var20 = (int)((var41.totalMemory() - var41.freeMemory()) / 1024L); - var21 = 16776960; - if (var20 > 327680 && !Client.isLowDetail) { - var21 = 16711680; - } - - SecureRandomCallable.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - class132.drawEntities(var12, var13, var10.width, var10.height); - Client.field407[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - class6.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - class11.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - Canvas.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - Canvas.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - class139.field1323.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && class143.isComponentHidden(var10) && var10 != class146.mousedOverWidgetIf1) { - continue; - } - - if (!var10.isIf3) { - if (var10.scrollY > var10.scrollHeight - var10.height) { - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); - if (var28 != null) { - class36.drawWidgets(var28.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.method1199(); - } else if (var10.type == 11) { - if (class143.isComponentHidden(var10) && var10 != class146.mousedOverWidgetIf1) { - continue; - } - - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.method1199(); - } - - if (Client.isResizable || Client.field409[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - class164.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { - if (var10.type == 3) { - if (class27.runCs1(var10)) { - var19 = var10.color2; - if (var10 == class146.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; - if (var10 == class146.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.field4233) { - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); - break; - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); - break; - default: - if (var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } - } else if (var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } else if (var10.type == 4) { - Font var40 = var10.getFont(); - if (var40 == null) { - if (Widget.field2945) { - class218.invalidateWidget(var10); - } - } else { - String var42 = var10.text; - if (class27.runCs1(var10)) { - var20 = var10.color2; - if (var10 == class146.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var42 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == class146.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemComposition var43 = InvDefinition.ItemDefinition_get(var10.itemId); - var42 = var43.name; - if (var42 == null) { - var42 = "null"; - } - - if ((var43.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var42 = MoveSpeed.colorStartTag(16748608) + var42 + "" + " " + 'x' + WorldMapData_0.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var42 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var42 = WorldMapSectionType.method1516(var42, var10); - } - - var40.method2093(var42, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, class466.method2347(var10.transparencyTop), var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); - } - } else { - int var23; - int var24; - int var25; - if (var10.type == 5) { - SpritePixels var38; - if (!var10.isIf3) { - var38 = var10.getSprite(class27.runCs1(var10), FriendsChat.urlRequester); - if (var38 != null) { - var38.drawTransBgAt(var12, var13); - } else if (Widget.field2945) { - class218.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var38 = class4.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var38 = var10.getSprite(false, FriendsChat.urlRequester); - } - - if (var38 == null) { - if (Widget.field2945) { - class218.invalidateWidget(var10); - } - } else { - var20 = var38.width; - var21 = var38.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var38.method2687(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { - var38.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { - var38.drawTransBgAt(var12, var13); - } else { - var38.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); - var22 = (var20 - 1 + var10.width) / var20; - var23 = (var21 - 1 + var10.height) / var21; - - for (var24 = 0; var24 < var22; ++var24) { - for (var25 = 0; var25 < var23; ++var25) { - if (var10.spriteAngle != 0) { - var38.method2687(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var38.drawTransAt(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255)); - } else { - var38.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - int var34; - if (var10.type == 6) { - boolean var36 = class27.runCs1(var10); - if (var36) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var39 = null; - var22 = 0; - if (var10.itemId != -1) { - ItemComposition var44 = InvDefinition.ItemDefinition_get(var10.itemId); - if (var44 != null) { - var44 = var44.getCountObj(var10.itemQuantity); - var39 = var44.getModel(1); - if (var39 != null) { - var39.calculateBoundsCylinder(); - var22 = var39.height / 2; - } else { - class218.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var39 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var39 = VarbitComposition.localPlayer.getModel(); - } - } else if (var10.modelType == 7) { - var39 = var10.field3101.getModel((SequenceDefinition)null, -1, EnumComposition.SequenceDefinition_get(VarbitComposition.localPlayer.idleSequence), VarbitComposition.localPlayer.movementFrame); - } else { - NPCComposition var45 = null; - NewShit var32 = null; - if (var10.modelType == 6) { - var25 = var10.modelId; - if (var25 >= 0 && var25 < Client.npcs.length) { - NPC var26 = Client.npcs[var25]; - if (var26 != null) { - var45 = var26.definition; - var32 = var26.method593(); - } - } - } - - SequenceDefinition var33 = null; - var34 = -1; - if (var20 != -1) { - var33 = EnumComposition.SequenceDefinition_get(var20); - var34 = var10.modelFrame; - } - - var39 = var10.getModel(var33, var34, var36, VarbitComposition.localPlayer.appearance, var45, var32); - if (var39 == null && Widget.field2945) { - class218.invalidateWidget(var10); - } - } - - Rasterizer3D.method1202(var10.width / 2 + var12, var10.height / 2 + var13); - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; - if (var39 != null) { - if (!var10.isIf3) { - var39.method1338(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var39.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var39.method1339(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var39.method1338(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } - } - - Rasterizer3D.method1201(); - } else { - Font var29; - if (var10.type == 8 && var10 == class343.field3147 && Client.field498 == Client.field496) { - var19 = 0; - var20 = 0; - var29 = SecureRandomCallable.fontPlain12; - String var30 = var10.text; - - String var31; - for (var30 = WorldMapSectionType.method1516(var30, var10); var30.length() > 0; var20 = var20 + var29.ascent + 1) { - var24 = var30.indexOf("
"); - if (var24 != -1) { - var31 = var30.substring(0, var24); - var30 = var30.substring(var24 + 4); - } else { - var31 = var30; - var30 = ""; - } - - var25 = var29.stringWidth(var31); - if (var25 > var19) { - var19 = var25; - } - } - - var19 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var19; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; - } - - if (var19 + var24 > var4) { - var24 = var4 - var19; - } - - if (var20 + var25 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); - var30 = var10.text; - var34 = var25 + var29.ascent + 2; - - for (var30 = WorldMapSectionType.method1516(var30, var10); var30.length() > 0; var34 = var34 + var29.ascent + 1) { - int var27 = var30.indexOf("
"); - if (var27 != -1) { - var31 = var30.substring(0, var27); - var30 = var30.substring(var27 + 4); - } else { - var31 = var30; - var30 = ""; - } - - var29.draw(var31, var24 + 3, var34, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field2962) { - var19 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; - } else { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - } - - if (var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); - } else { - Language.method1977(var19, var20, var21, var22, var10.color, var10.lineWid); - } - } else if (var10.type == 12) { - class329 var37 = var10.method1844(); - class324 var35 = var10.method1845(); - if (var37 != null && var35 != null && var37.method1787()) { - var29 = var10.getFont(); - if (var29 != null) { - Client.field651.method2694(var12, var13, var10.width, var10.height, var37.method1788(), var37.method1789(), var37.method1785(), var37.method1786(), var37.method1784()); - var22 = var10.textShadowed ? var10.spriteShadow * -2076930741 * -1858431901 : -1; - if (!var37.method1782() && var37.method1779().method2038()) { - Client.field651.method2695(var35.field2891, var22, var35.field2892, var35.field2890); - Client.field651.method2696(var37.method1780(), var29); - } else { - Client.field651.method2695(var10.color, var22, var35.field2892, var35.field2890); - Client.field651.method2696(var37.method1779(), var29); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } - } - } - } - } - } + if (Client.menuOptionsCount > 2) { + var3 = var3 + Client.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; } + + SoundCache.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); } } - } } \ No newline at end of file diff --git a/osrs/src/main/java/class136.java b/osrs/src/main/java/class136.java index e02d03735..de31e084c 100644 --- a/osrs/src/main/java/class136.java +++ b/osrs/src/main/java/class136.java @@ -4,50 +4,170 @@ import java.util.concurrent.Callable; -@ObfuscatedName("fj") +@ObfuscatedName("fo") class class136 implements Callable { - @ObfuscatedName("cg") - static int field1295; + @ObfuscatedName("us") + @ObfuscatedSignature( + descriptor = "Lcg;" + ) + @Export("decimator") + static Decimator decimator; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfv;" + descriptor = "Lfk;" ) @Export("this$0") @ObfuscatedName("this$0") - final class137 this$0; - // $FF: synthetic field - @Export("val$workStart") - @ObfuscatedName("val$workStart") - final int val$workStart; - // $FF: synthetic field - @Export("val$workEnd") - @ObfuscatedName("val$workEnd") - final int val$workEnd; + final class139 this$0; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "[Lep;" + descriptor = "Lul;" ) - @Export("val$curveLoadJobs") - @ObfuscatedName("val$curveLoadJobs") - final class129[] val$curveLoadJobs; + @Export("val$p") + @ObfuscatedName("val$p") + final Buffer val$p; + // $FF: synthetic field + @Export("val$version") + @ObfuscatedName("val$version") + final int val$version; @ObfuscatedSignature( - descriptor = "(Lfv;II[Lep;)V" + descriptor = "(Lfk;Lul;I)V" ) - class136(class137 var1, int var2, int var3, class129[] var4) { + class136(class139 var1, Buffer var2, int var3) { this.this$0 = var1; - this.val$workStart = var2; - this.val$workEnd = var3; - this.val$curveLoadJobs = var4; + this.val$p = var2; + this.val$version = var3; } @Export("call") @ObfuscatedName("call") public Object call() { - for (int var1 = this.val$workStart; var1 < this.val$workEnd; ++var1) { - this.val$curveLoadJobs[var1].call(); - } - + this.this$0.method736(this.val$p, this.val$version); return null; } + + @ObfuscatedName("jr") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1884389430" + ) + static final int method731() { + if (class91.clientPreferences.getRoofsHidden()) { + return class87.Client_plane; + } else { + int var0 = 3; + if (class365.cameraPitch < 310) { + int var1; + int var2; + if (Client.oculusOrbState == 1) { + var1 = ChatChannel.oculusOrbFocalPointX >> 7; + var2 = AbstractWorldMapData.oculusOrbFocalPointY >> 7; + } else { + var1 = TextureProvider.localPlayer.x >> 7; + var2 = TextureProvider.localPlayer.y >> 7; + } + + int var3 = Client.cameraX >> 7; + int var4 = WorldMapArea.cameraZ >> 7; + if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { + return class87.Client_plane; + } + + if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { + return class87.Client_plane; + } + + if ((Tiles.Tiles_renderFlags[class87.Client_plane][var3][var4] & 4) != 0) { + var0 = class87.Client_plane; + } + + int var5; + if (var1 > var3) { + var5 = var1 - var3; + } else { + var5 = var3 - var1; + } + + int var6; + if (var2 > var4) { + var6 = var2 - var4; + } else { + var6 = var4 - var2; + } + + int var7; + int var8; + if (var5 > var6) { + var7 = var6 * 65536 / var5; + var8 = 32768; + + while (var1 != var3) { + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[class87.Client_plane][var3][var4] & 4) != 0) { + var0 = class87.Client_plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[class87.Client_plane][var3][var4] & 4) != 0) { + var0 = class87.Client_plane; + } + } + } + } else if (var6 > 0) { + var7 = var5 * 65536 / var6; + var8 = 32768; + + while (var4 != var2) { + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[class87.Client_plane][var3][var4] & 4) != 0) { + var0 = class87.Client_plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[class87.Client_plane][var3][var4] & 4) != 0) { + var0 = class87.Client_plane; + } + } + } + } + } + + if (TextureProvider.localPlayer.x >= 0 && TextureProvider.localPlayer.y >= 0 && TextureProvider.localPlayer.x < 13312 && TextureProvider.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[class87.Client_plane][TextureProvider.localPlayer.x >> 7][TextureProvider.localPlayer.y >> 7] & 4) != 0) { + var0 = class87.Client_plane; + } + + return var0; + } else { + return class87.Client_plane; + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class137.java b/osrs/src/main/java/class137.java deleted file mode 100644 index 117f34f74..000000000 --- a/osrs/src/main/java/class137.java +++ /dev/null @@ -1,414 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadPoolExecutor; - -@ObfuscatedName("fv") -public class class137 extends DualNode { - @ObfuscatedName("ap") - public static ThreadPoolExecutor field1296; - @ObfuscatedName("ad") - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("au") - int field1301; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "[[Lfh;" - ) - public class130[][] field1304; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "[[Lfh;" - ) - class130[][] field1299; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public Skeleton field1305; - @ObfuscatedName("ac") - int field1300; - @ObfuscatedName("ai") - boolean field1298; - @ObfuscatedName("aa") - Future field1303; - @ObfuscatedName("af") - List field1302; - - @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;IZ)V", - garbageValue = "0" - ) - public class137(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - this.field1304 = null; - this.field1299 = null; - this.field1300 = 0; - this.field1301 = var3; - byte[] var5 = var1.takeFile(this.field1301 >> 16 & 65535, this.field1301 & 65535); - Buffer var6 = new Buffer(var5); - int var7 = var6.readUnsignedByte(); - int var8 = var6.readUnsignedShort(); - byte[] var9 = var2.getFile(var8, 0); - this.field1305 = new Skeleton(var8, var9); - this.field1302 = new ArrayList(); - this.field1303 = field1296.submit(new class134(this, var6, var7)); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;IB)V", - garbageValue = "100" - ) - void method745(Buffer var1, int var2) { - var1.readUnsignedShort(); - var1.readUnsignedShort(); - this.field1300 = var1.readUnsignedByte(); - int var3 = var1.readUnsignedShort(); - this.field1299 = new class130[this.field1305.method1231().method1212()][]; - this.field1304 = new class130[this.field1305.method1230()][]; - class129[] var4 = new class129[var3]; - - int var5; - int var7; - int var9; - for (var5 = 0; var5 < var3; ++var5) { - var7 = var1.readUnsignedByte(); - class131 var8 = (class131)KeyHandler.findEnumerated(WorldMapSprite.method1533(), var7); - if (var8 == null) { - var8 = class131.field1268; - } - - var9 = var1.readShortSmart(); - int var11 = var1.readUnsignedByte(); - class132[] var12 = new class132[]{class132.field1288, class132.field1277, class132.field1283, class132.field1287, class132.field1275, class132.field1280, class132.field1289, class132.field1284, class132.field1273, class132.field1278, class132.field1276, class132.field1285, class132.field1281, class132.field1282, class132.field1286, class132.field1274, class132.field1279}; - class132 var13 = (class132)KeyHandler.findEnumerated(var12, var11); - if (var13 == null) { - var13 = class132.field1288; - } - - class130 var20 = new class130(); - var20.method718(var1, var2); - var4[var5] = new class129(this, var20, var8, var13, var9); - int var14 = var8.method727(); - class130[][] var15; - if (var8 == class131.field1264) { - var15 = this.field1299; - } else { - var15 = this.field1304; - } - - if (var15[var9] == null) { - var15[var9] = new class130[var14]; - } - - if (var8 == class131.field1263) { - this.field1298 = true; - } - } - - var5 = var3 / class291.field2496; - int var16 = var3 % class291.field2496; - int var17 = 0; - - for (var9 = 0; var9 < class291.field2496; ++var9) { - var7 = var17; - var17 += var5; - if (var16 > 0) { - ++var17; - --var16; - } - - if (var17 == var7) { - break; - } - - this.field1302.add(field1296.submit(new class136(this, var7, var17, var4))); - } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1948814782" - ) - public boolean method746() { - if (this.field1303 == null && this.field1302 == null) { - return true; - } else { - if (this.field1303 != null) { - if (!this.field1303.isDone()) { - return false; - } - - this.field1303 = null; - } - - boolean var1 = true; - - for (int var2 = 0; var2 < this.field1302.size(); ++var2) { - if (!((Future)this.field1302.get(var2)).isDone()) { - var1 = false; - } else { - this.field1302.remove(var2); - --var2; - } - } - - if (!var1) { - return false; - } else { - this.field1302 = null; - return true; - } - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1976853081" - ) - public int method747() { - return this.field1300; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1397730419" - ) - public boolean method748() { - return this.field1298; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(ILeo;IIB)V", - garbageValue = "-98" - ) - public void method749(int var1, class127 var2, int var3, int var4) { - class450 var5; - synchronized(class450.field3873) { - if (class462.field3904 == 0) { - var5 = new class450(); - } else { - class450.field3873[--class462.field3904].method2302(); - var5 = class450.field3873[class462.field3904]; - } - } - - this.method750(var5, var3, var2, var1); - this.method753(var5, var3, var2, var1); - this.method752(var5, var3, var2, var1); - var2.method708(var5); - var5.method2298(); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Lrz;ILeo;II)V", - garbageValue = "1937438486" - ) - void method750(class450 var1, int var2, class127 var3, int var4) { - float[] var5 = var3.method712(this.field1300); - float var6 = var5[0]; - float var7 = var5[1]; - float var8 = var5[2]; - if (this.field1299[var2] != null) { - class130 var9 = this.field1299[var2][0]; - class130 var10 = this.field1299[var2][1]; - class130 var11 = this.field1299[var2][2]; - if (var9 != null) { - var6 = var9.method720(var4); - } - - if (var10 != null) { - var7 = var10.method720(var4); - } - - if (var11 != null) { - var8 = var11.method720(var4); - } - } - - class449 var17 = Login.method427(); - var17.method2295(1.0F, 0.0F, 0.0F, var6); - class449 var18 = Login.method427(); - var18.method2295(0.0F, 1.0F, 0.0F, var7); - class449 var19 = Login.method427(); - var19.method2295(0.0F, 0.0F, 1.0F, var8); - class449 var12 = Login.method427(); - var12.method2297(var19); - var12.method2297(var17); - var12.method2297(var18); - class450 var13; - synchronized(class450.field3873) { - if (class462.field3904 == 0) { - var13 = new class450(); - } else { - class450.field3873[--class462.field3904].method2302(); - var13 = class450.field3873[class462.field3904]; - } - } - - var13.method2309(var12); - var1.method2308(var13); - var17.method2293(); - var18.method2293(); - var19.method2293(); - var12.method2293(); - var13.method2298(); - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Lrz;ILeo;II)V", - garbageValue = "1689339528" - ) - void method752(class450 var1, int var2, class127 var3, int var4) { - float[] var5 = var3.method713(this.field1300); - float var6 = var5[0]; - float var7 = var5[1]; - float var8 = var5[2]; - if (this.field1299[var2] != null) { - class130 var9 = this.field1299[var2][3]; - class130 var10 = this.field1299[var2][4]; - class130 var11 = this.field1299[var2][5]; - if (var9 != null) { - var6 = var9.method720(var4); - } - - if (var10 != null) { - var7 = var10.method720(var4); - } - - if (var11 != null) { - var8 = var11.method720(var4); - } - } - - var1.field3875[12] = var6; - var1.field3875[13] = var7; - var1.field3875[14] = var8; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Lrz;ILeo;II)V", - garbageValue = "-2003285459" - ) - void method753(class450 var1, int var2, class127 var3, int var4) { - float[] var5 = var3.method714(this.field1300); - float var6 = var5[0]; - float var7 = var5[1]; - float var8 = var5[2]; - if (this.field1299[var2] != null) { - class130 var9 = this.field1299[var2][6]; - class130 var10 = this.field1299[var2][7]; - class130 var11 = this.field1299[var2][8]; - if (var9 != null) { - var6 = var9.method720(var4); - } - - if (var10 != null) { - var7 = var10.method720(var4); - } - - if (var11 != null) { - var8 = var11.method720(var4); - } - } - - class450 var14; - synchronized(class450.field3873) { - if (class462.field3904 == 0) { - var14 = new class450(); - } else { - class450.field3873[--class462.field3904].method2302(); - var14 = class450.field3873[class462.field3904]; - } - } - - var14.method2306(var6, var7, var8); - var1.method2308(var14); - var14.method2298(); - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-7280279" - ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class529.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - class529.SpriteBuffer_xOffsets = new int[class529.SpriteBuffer_spriteCount]; - class152.SpriteBuffer_yOffsets = new int[class529.SpriteBuffer_spriteCount]; - HealthBarUpdate.SpriteBuffer_spriteWidths = new int[class529.SpriteBuffer_spriteCount]; - SpriteMask.SpriteBuffer_spriteHeights = new int[class529.SpriteBuffer_spriteCount]; - Coord.SpriteBuffer_pixels = new byte[class529.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class529.SpriteBuffer_spriteCount * 8; - class529.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class420.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class529.SpriteBuffer_spriteCount; ++var3) { - class529.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class529.SpriteBuffer_spriteCount; ++var3) { - class152.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class529.SpriteBuffer_spriteCount; ++var3) { - HealthBarUpdate.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class529.SpriteBuffer_spriteCount; ++var3) { - SpriteMask.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class529.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - DbTableType.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - DbTableType.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (DbTableType.SpriteBuffer_spritePalette[var3] == 0) { - DbTableType.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; - - for (var3 = 0; var3 < class529.SpriteBuffer_spriteCount; ++var3) { - int var4 = HealthBarUpdate.SpriteBuffer_spriteWidths[var3]; - int var5 = SpriteMask.SpriteBuffer_spriteHeights[var3]; - int var6 = var4 * var5; - byte[] var7 = new byte[var6]; - Coord.SpriteBuffer_pixels[var3] = var7; - int var8 = var1.readUnsignedByte(); - int var9; - if (var8 == 0) { - for (var9 = 0; var9 < var6; ++var9) { - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { - for (var9 = 0; var9 < var4; ++var9) { - for (int var10 = 0; var10 < var5; ++var10) { - var7[var9 + var4 * var10] = var1.readByte(); - } - } - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class138.java b/osrs/src/main/java/class138.java index 94fe53267..2ba7bd84f 100644 --- a/osrs/src/main/java/class138.java +++ b/osrs/src/main/java/class138.java @@ -2,83 +2,92 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") -public enum class138 implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lfb;" - ) - field1314(0, 0), - @ObfuscatedName("ae") +import java.util.concurrent.Callable; + +@ObfuscatedName("fi") +class class138 implements Callable { + @ObfuscatedName("we") + @Export("foundItemIds") + static short[] foundItemIds; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfk;" ) - field1309(1, 1), - @ObfuscatedName("ao") + @Export("this$0") + @ObfuscatedName("this$0") + final class139 this$0; + // $FF: synthetic field + @Export("val$workStart") + @ObfuscatedName("val$workStart") + final int val$workStart; + // $FF: synthetic field + @Export("val$workEnd") + @ObfuscatedName("val$workEnd") + final int val$workEnd; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "[Lfh;" ) - field1311(2, 2), - @ObfuscatedName("at") + @Export("val$curveLoadJobs") + @ObfuscatedName("val$curveLoadJobs") + final class131[] val$curveLoadJobs; + @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "(Lfk;II[Lfh;)V" ) - field1313(3, 3), + class138(class139 var1, int var2, int var3, class131[] var4) { + this.this$0 = var1; + this.val$workStart = var2; + this.val$workEnd = var3; + this.val$curveLoadJobs = var4; + } + + @Export("call") + @ObfuscatedName("call") + public Object call() { + for (int var1 = this.val$workStart; var1 < this.val$workEnd; ++var1) { + this.val$curveLoadJobs[var1].call(); + } + + return null; + } + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lfb;" - ) - field1308(4, 4), - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "(Lom;Lom;Lom;I)V", + garbageValue = "1994646383" ) - field1310(5, 5), - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lfb;" - ) - field1315(6, 6), - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lfb;" - ) - field1312(7, 7), - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lfb;" - ) - field1307(8, 8); - - @ObfuscatedName("ix") - static int field1306; - @ObfuscatedName("af") - final int field1317; - @ObfuscatedName("ad") - final int field1316; - - class138(int var3, int var4) { - this.field1317 = var3; - this.field1316 = var4; + public static void method732(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + class295.SequenceDefinition_archive = var0; + SequenceDefinition.SequenceDefinition_animationsArchive = var1; + SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(II)V", + garbageValue = "1830136563" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1316; + public static void method733(int var0) { + MouseHandler.MouseHandler_idleCycles = var0; } - @ObfuscatedName("au") + @ObfuscatedName("ha") @ObfuscatedSignature( - descriptor = "(II)Lhd;", - garbageValue = "-2092352148" + descriptor = "(I)I", + garbageValue = "-1629606373" ) - @Export("WorldMapElement_get") - public static WorldMapElement WorldMapElement_get(int var0) { - return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); + static int method734() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + int var0 = 0; + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + } + + return var0 * 10000 / Client.field551; + } else { + return 10000; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class139.java b/osrs/src/main/java/class139.java index a86ef256e..2e8b11ff9 100644 --- a/osrs/src/main/java/class139.java +++ b/osrs/src/main/java/class139.java @@ -1,327 +1,449 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") -public enum class139 implements class371 { - @ObfuscatedName("au") +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Future; + +@ObfuscatedName("fk") +public class class139 extends DualNode { + @ObfuscatedName("ac") + int field1293; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "[[Lfz;" ) - field1322(0, 0), - @ObfuscatedName("ae") + public class132[][] field1297; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "[[Lfz;" ) - field1319(2, 1), - @ObfuscatedName("ao") + class132[][] field1292; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lju;" ) - field1320(3, 2), - @ObfuscatedName("at") + public Skeleton field1298; + @ObfuscatedName("ao") + int field1294; + @ObfuscatedName("ah") + boolean field1291; + @ObfuscatedName("am") + Future field1296; + @ObfuscatedName("av") + List field1295; + @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "(Lom;Lom;IZ)V", + garbageValue = "0" ) - field1321(4, 3), + public class139(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + this.field1297 = null; + this.field1292 = null; + this.field1294 = 0; + this.field1293 = var3; + byte[] var5 = var1.takeFile(this.field1293 >> 16 & 65535, this.field1293 & 65535); + Buffer var6 = new Buffer(var5); + int var7 = var6.readUnsignedByte(); + int var8 = var6.readUnsignedShort(); + byte[] var9 = var2.getFile(var8, 0); + this.field1298 = new Skeleton(var8, var9); + this.field1295 = new ArrayList(); + this.field1296 = SoundCache.field214.submit(new class136(this, var6, var7)); + } + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "(Lul;II)V", + garbageValue = "2000104113" ) - field1318(1, 4); + void method736(Buffer var1, int var2) { + var1.readUnsignedShort(); + var1.readUnsignedShort(); + this.field1294 = var1.readUnsignedByte(); + int var3 = var1.readUnsignedShort(); + this.field1292 = new class132[this.field1298.method1276().method1260()][]; + this.field1297 = new class132[this.field1298.method1275()][]; + class131[] var4 = new class131[var3]; + + int var5; + int var7; + for (var5 = 0; var5 < var3; ++var5) { + class133 var6 = class406.method2057(var1.readUnsignedByte()); + var7 = var1.readShortSmart(); + class134 var8 = class179.method927(var1.readUnsignedByte()); + class132 var9 = new class132(); + var9.method709(var1, var2); + var4[var5] = new class131(this, var9, var6, var8, var7); + int var10 = var6.method718(); + class132[][] var11; + if (var6 == class133.field1260) { + var11 = this.field1292; + } else { + var11 = this.field1297; + } + + if (var11[var7] == null) { + var11[var7] = new class132[var10]; + } + + if (var6 == class133.field1261) { + this.field1291 = true; + } + } + + var5 = var3 / MusicPatchPcmStream.field2855; + int var12 = var3 % MusicPatchPcmStream.field2855; + int var13 = 0; - @ObfuscatedName("ag") + for (int var14 = 0; var14 < MusicPatchPcmStream.field2855; ++var14) { + var7 = var13; + var13 += var5; + if (var12 > 0) { + ++var13; + --var12; + } + + if (var13 == var7) { + break; + } + + this.field1295.add(SoundCache.field214.submit(new class138(this, var7, var13, var4))); + } + + } + + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ldb;" + descriptor = "(B)Z", + garbageValue = "2" ) - static LoginScreenAnimation field1323; - @ObfuscatedName("km") - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("rj") + public boolean method738() { + if (this.field1296 == null && this.field1295 == null) { + return true; + } else { + if (this.field1296 != null) { + if (!this.field1296.isDone()) { + return false; + } + + this.field1296 = null; + } + + boolean var1 = true; + + for (int var2 = 0; var2 < this.field1295.size(); ++var2) { + if (!((Future)this.field1295.get(var2)).isDone()) { + var1 = false; + } else { + this.field1295.remove(var2); + --var2; + } + } + + if (!var1) { + return false; + } else { + this.field1295 = null; + return true; + } + } + } + + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lrs;" + descriptor = "(B)I", + garbageValue = "-17" ) - @Export("varclan") - static class454 varclan; - @ObfuscatedName("ai") - public final int field1327; - @ObfuscatedName("az") - @Export("id") - final int id; - - class139(int var3, int var4) { - this.field1327 = var3; - this.id = var4; + public int method739() { + return this.field1294; } - @ObfuscatedName("ae") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(B)Z", + garbageValue = "-19" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; + public boolean method740() { + return this.field1291; } - @ObfuscatedName("au") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1677394683" + descriptor = "(ILed;III)V", + garbageValue = "2056920821" ) - public static void method756(AbstractArchive var0) { - ParamComposition.ParamDefinition_archive = var0; + public void method741(int var1, class129 var2, int var3, int var4) { + class465 var5 = ParamComposition.method1053(); + this.method742(var5, var3, var2, var1); + this.method744(var5, var3, var2, var1); + this.method743(var5, var3, var2, var1); + var2.method697(var5); + var5.method2336(); } - @ObfuscatedName("az") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lch;Lch;IZI)I", - garbageValue = "548586770" + descriptor = "(Lrb;ILed;II)V", + garbageValue = "8414091" ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { - int var4 = var0.population; - int var5 = var1.population; - if (!var3) { - if (var4 == -1) { - var4 = 2001; - } + void method742(class465 var1, int var2, class129 var3, int var4) { + float[] var5 = var3.method701(this.field1294); + float var6 = var5[0]; + float var7 = var5[1]; + float var8 = var5[2]; + if (this.field1292[var2] != null) { + class132 var9 = this.field1292[var2][0]; + class132 var10 = this.field1292[var2][1]; + class132 var11 = this.field1292[var2][2]; + if (var9 != null) { + var6 = var9.method711(var4); + } - if (var5 == -1) { - var5 = 2001; - } + if (var10 != null) { + var7 = var10.method711(var4); } - return var4 - var5; - } else if (var2 == 2) { - return var0.location - var1.location; - } else if (var2 == 3) { - if (var0.activity.equals("-")) { - if (var1.activity.equals("-")) { - return 0; - } else { - return var3 ? -1 : 1; - } - } else if (var1.activity.equals("-")) { - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); + if (var11 != null) { + var8 = var11.method711(var4); } - } else if (var2 == 4) { - return var0.method390() ? (var1.method390() ? 0 : 1) : (var1.method390() ? -1 : 0); - } else if (var2 == 5) { - return var0.method388() ? (var1.method388() ? 0 : 1) : (var1.method388() ? -1 : 0); - } else if (var2 == 6) { - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } else { - return var0.id - var1.id; } + + class464 var16 = Friend.method2240(); + var16.method2332(1.0F, 0.0F, 0.0F, var6); + class464 var14 = Friend.method2240(); + var14.method2332(0.0F, 1.0F, 0.0F, var7); + class464 var15 = Friend.method2240(); + var15.method2332(0.0F, 0.0F, 1.0F, var8); + class464 var12 = Friend.method2240(); + var12.method2334(var15); + var12.method2334(var16); + var12.method2334(var14); + class465 var13 = ParamComposition.method1053(); + var13.method2347(var12); + var1.method2346(var13); + var16.method2330(); + var14.method2330(); + var15.method2330(); + var12.method2330(); + var13.method2336(); } - @ObfuscatedName("br") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-808541663" + descriptor = "(Lrb;ILed;II)V", + garbageValue = "1859229364" ) - static int method759(int var0, Script var1, boolean var2) { - if (var0 == 6500) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class125.loadWorlds() ? 1 : 0; - return 1; - } else { - World var3; - if (var0 == 6501) { - var3 = class18.worldListStart(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + void method743(class465 var1, int var2, class129 var3, int var4) { + float[] var5 = var3.method702(this.field1294); + float var6 = var5[0]; + float var7 = var5[1]; + float var8 = var5[2]; + if (this.field1292[var2] != null) { + class132 var9 = this.field1292[var2][3]; + class132 var10 = this.field1292[var2][4]; + class132 var11 = this.field1292[var2][5]; + if (var9 != null) { + var6 = var9.method711(var4); + } + + if (var10 != null) { + var7 = var10.method711(var4); + } + + if (var11 != null) { + var8 = var11.method711(var4); + } + } + + var1.field3908[12] = var6; + var1.field3908[13] = var7; + var1.field3908[14] = var8; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Lrb;ILed;IB)V", + garbageValue = "2" + ) + void method744(class465 var1, int var2, class129 var3, int var4) { + float[] var5 = var3.method703(this.field1294); + float var6 = var5[0]; + float var7 = var5[1]; + float var8 = var5[2]; + if (this.field1292[var2] != null) { + class132 var9 = this.field1292[var2][6]; + class132 var10 = this.field1292[var2][7]; + class132 var11 = this.field1292[var2][8]; + if (var9 != null) { + var6 = var9.method711(var4); + } + + if (var10 != null) { + var7 = var10.method711(var4); + } + + if (var11 != null) { + var8 = var11.method711(var4); + } + } + + class465 var12 = ParamComposition.method1053(); + var12.method2344(var6, var7, var8); + var1.method2346(var12); + var12.method2336(); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "8" + ) + public static void method735(String var0, String var1, String var2, int var3, int var4) throws IOException { + if (var1 != null && !var1.isEmpty()) { + var0 = var0 + "-" + var1; + } + + UrlRequester.field1162 = var4; + FileSystem.cacheGamebuild = var3; + + try { + GrandExchangeOfferNameComparator.field3614 = System.getProperty("os.name"); + } catch (Exception var19) { + GrandExchangeOfferNameComparator.field3614 = "Unknown"; + } + + class223.field1863 = GrandExchangeOfferNameComparator.field3614.toLowerCase(); + DevicePcmPlayerProvider.userHomeDirectory = null; + + try { + DevicePcmPlayerProvider.userHomeDirectory = System.getProperty("jagex.userhome"); + } catch (Exception var18) { + } + + if (DevicePcmPlayerProvider.userHomeDirectory == null) { + try { + DevicePcmPlayerProvider.userHomeDirectory = System.getProperty("user.home"); + } catch (Exception var17) { + } + } + + if (DevicePcmPlayerProvider.userHomeDirectory != null) { + DevicePcmPlayerProvider.userHomeDirectory = DevicePcmPlayerProvider.userHomeDirectory + "/"; + } + + try { + if (class223.field1863.startsWith("win")) { + if (DevicePcmPlayerProvider.userHomeDirectory == null) { + DevicePcmPlayerProvider.userHomeDirectory = System.getenv("USERPROFILE"); } + } else if (DevicePcmPlayerProvider.userHomeDirectory == null) { + DevicePcmPlayerProvider.userHomeDirectory = System.getenv("HOME"); + } - return 1; - } else if (var0 == 6502) { - var3 = VarcInt.getNextWorldListWorld(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; + if (DevicePcmPlayerProvider.userHomeDirectory != null) { + DevicePcmPlayerProvider.userHomeDirectory = DevicePcmPlayerProvider.userHomeDirectory + "/"; + } + } catch (Exception var16) { + } + + if (DevicePcmPlayerProvider.userHomeDirectory == null) { + DevicePcmPlayerProvider.userHomeDirectory = "~/"; + } + + FriendsList.field3812 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", DevicePcmPlayerProvider.userHomeDirectory, "/tmp/", ""}; + class27.field74 = new String[]{".jagex_cache_" + FileSystem.cacheGamebuild, ".file_store_" + FileSystem.cacheGamebuild}; + int var13 = 0; + + label107: + while (var13 < 4) { + class500.cacheDir = InvDefinition.method954(var0, var2, var13); + if (!class500.cacheDir.exists()) { + class500.cacheDir.mkdirs(); + } + + File[] var6 = class500.cacheDir.listFiles(); + if (var6 == null) { + break; + } + + File[] var7 = var6; + int var8 = 0; + + while (true) { + if (var8 >= var7.length) { + break label107; } - return 1; - } else { - World var4; - int var5; - int var7; - if (var0 == 6506) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var4 = null; - - for (var5 = 0; var5 < World.World_count; ++var5) { - if (var7 == class176.World_worlds[var5].id) { - var4 = class176.World_worlds[var5]; - break; - } - } - - if (var4 != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 6507) { - SoundCache.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3] == 1; - class131.sortWorldList(var7, var10, var5, var6); - return 1; - } else if (var0 != 6511) { - if (var0 == 6512) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - return 1; - } else { - int var8; - ParamComposition var9; - if (var0 == 6513) { - SoundCache.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var9 = ObjTypeCustomisation.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = class90.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class90.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6514) { - SoundCache.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var9 = ObjTypeCustomisation.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = WorldMapElement.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = WorldMapElement.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6515) { - SoundCache.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var9 = ObjTypeCustomisation.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = InvDefinition.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6516) { - SoundCache.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var9 = ObjTypeCustomisation.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = Players.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Players.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6518) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == 6519) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.clientType; - return 1; - } else if (var0 == 6520) { - return 1; - } else if (var0 == 6521) { - return 1; - } else if (var0 == 6522) { - --class137.Interpreter_stringStackSize; - --SoundCache.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --class137.Interpreter_stringStackSize; - --SoundCache.Interpreter_intStackSize; - return 1; - } else if (var0 == 6524) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 6525) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == 6526) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == 6527) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.field424; - return 1; - } else { - return 2; - } - } - } else { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var7 >= 0 && var7 < World.World_count) { - var4 = class176.World_worlds[var7]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + File var9 = var7[var8]; + + boolean var10; + try { + RandomAccessFile var11 = new RandomAccessFile(var9, "rw"); + int var12 = var11.read(); + var11.seek(0L); + var11.write(var12); + var11.seek(0L); + var11.close(); + var10 = true; + } catch (Exception var15) { + var10 = false; + } + + if (!var10) { + ++var13; + break; } + + ++var8; } } + + File var5 = class500.cacheDir; + FileSystem.FileSystem_cacheDir = var5; + if (!FileSystem.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; + UserComparator5.method674(); + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(WallDecoration.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(WallDecoration.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + UserComparator8.JagexCache_idxFiles = new BufferedFile[UrlRequester.field1162]; + + for (int var14 = 0; var14 < UrlRequester.field1162; ++var14) { + UserComparator8.JagexCache_idxFiles[var14] = new BufferedFile(new AccessFile(WallDecoration.getFile("main_file_cache.idx" + var14), "rw", 1048576L), 6000, 0); + } + + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1287194553" + ) + static void method737() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + } + + @ObfuscatedName("ib") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "16777215" + ) + static final void method745() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; + + for (int var2 = 0; var2 < var0; ++var2) { + Player var3 = Client.players[var1[var2]]; + if (var3 != null) { + class6.updateActorSequence(var3, 1); + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class14.java b/osrs/src/main/java/class14.java index 5cf0edac4..5012ad187 100644 --- a/osrs/src/main/java/class14.java +++ b/osrs/src/main/java/class14.java @@ -2,172 +2,114 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.awt.*; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -@ObfuscatedName("ar") +@ObfuscatedName("as") public class class14 { - @ObfuscatedName("au") - final int field42; - @ObfuscatedName("ae") - final String field43; - @ObfuscatedName("ao") - final ThreadFactory field44; - @ObfuscatedName("at") - final ThreadPoolExecutor field45; + @ObfuscatedName("bk") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("by") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "Lpu;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("vb") + static int field36; + @ObfuscatedName("ac") + final int field40; + @ObfuscatedName("al") + final String field41; + @ObfuscatedName("ak") + final ThreadFactory field42; + @ObfuscatedName("ax") + final ThreadPoolExecutor field43; public class14(String var1, int var2, int var3) { - this.field43 = var1; - this.field42 = var2; - this.field44 = new class16(this); - this.field45 = this.method37(var3); + this.field41 = var1; + this.field40 = var2; + this.field42 = new class16(this); + this.field43 = this.method46(var3); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IB)Ljava/util/concurrent/ThreadPoolExecutor;", - garbageValue = "-56" + descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;", + garbageValue = "-1100148281" ) - final ThreadPoolExecutor method37(int var1) { - return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field42), this.field44); + final ThreadPoolExecutor method46(int var1) { + return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field40), this.field42); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lad;B)Lax;", - garbageValue = "19" + descriptor = "(Lag;B)Lai;", + garbageValue = "26" ) - public class18 method38(class10 var1) { - if (this.field45.getQueue().remainingCapacity() <= 0) { - System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field45.getCorePoolSize() + " Queue capacity " + this.field42); + public class18 method47(class10 var1) { + if (this.field43.getQueue().remainingCapacity() <= 0) { + System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field43.getCorePoolSize() + " Queue capacity " + this.field40); return new class18("Queue full"); } else { - class18 var2 = new class18(this.field45.submit(new class19(this, var1))); + class18 var2 = new class18(this.field43.submit(new class19(this, var1))); return var2; } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2032063402" + garbageValue = "-1393067878" ) - public final void method40() { + public final void method48() { try { - this.field45.shutdown(); + this.field43.shutdown(); } catch (Exception var2) { System.err.println("Error shutting down RestRequestService\r\n" + var2); } } - @ObfuscatedName("ae") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Lsf;III)I", - garbageValue = "-1229342893" + descriptor = "(II)Lja;", + garbageValue = "1251737533" ) - static int method39(IterableNodeHashTable var0, int var1, int var2) { - if (var0 == null) { - return var2; + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; } else { - IntegerNode var3 = (IntegerNode)var0.get((long)var1); - return var3 == null ? var2 : var3.integer; - } - } - - @ObfuscatedName("lp") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-525651527" - ) - static void method41(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, Language.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != VarbitComposition.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortAddLE(var3[var6]); - var8.packetBuffer.writeByteSub(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortAdd(var3[var6]); - var8.packetBuffer.writeByteNeg(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortAdd(var3[var6]); - var8.packetBuffer.writeByteSub(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var3[var6]); - var8.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var8); - } - - var4 = true; - break; + var1 = class163.method852(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); + if (var1 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); } - } - if (!var4) { - MouseHandler.addGameMessage(4, "", "Unable to find " + var1); + return var1; } - } - @ObfuscatedName("lt") + @ObfuscatedName("nl") @ObfuscatedSignature( - descriptor = "(III)Ljava/lang/String;", - garbageValue = "-539103842" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-63" ) - static final String method42(int var0, int var1) { - int var2 = var1 - var0; - if (var2 < -9) { - return MoveSpeed.colorStartTag(16711680); - } else if (var2 < -6) { - return MoveSpeed.colorStartTag(16723968); - } else if (var2 < -3) { - return MoveSpeed.colorStartTag(16740352); - } else if (var2 < 0) { - return MoveSpeed.colorStartTag(16756736); - } else if (var2 > 9) { - return MoveSpeed.colorStartTag(65280); - } else if (var2 > 6) { - return MoveSpeed.colorStartTag(4259584); - } else if (var2 > 3) { - return MoveSpeed.colorStartTag(8453888); - } else { - return var2 > 0 ? MoveSpeed.colorStartTag(12648192) : MoveSpeed.colorStartTag(16776960); + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (class358.friendsChat != null) { + PacketBufferNode var1 = ClanChannelMember.getPacketBufferNode(ClientPacket.CLAN_KICKUSER, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } - - @ObfuscatedName("mz") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-26" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; - } - - @ObfuscatedName("nd") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-361779527" - ) - static final void method44(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - class449.clientPreferences.setAreaSoundEffectsVolume(var0); - } } \ No newline at end of file diff --git a/osrs/src/main/java/class140.java b/osrs/src/main/java/class140.java index 71129adc9..23d13d60c 100644 --- a/osrs/src/main/java/class140.java +++ b/osrs/src/main/java/class140.java @@ -2,103 +2,201 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") -public class class140 extends class143 { - @ObfuscatedName("aq") - public static short[][] field1328; - @ObfuscatedName("au") - int field1332; - @ObfuscatedName("ae") - int field1329; +import java.io.IOException; + +@ObfuscatedName("fy") +public enum class140 implements class386 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lfy;" + ) + field1301(0, 0), + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lfy;" + ) + field1304(1, 1), + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lfy;" + ) + field1303(2, 2), + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lfy;" + ) + field1308(3, 3), @ObfuscatedName("ao") - int field1330; - @ObfuscatedName("at") - int field1331; - // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lfy;" ) - final class146 this$0; - + field1306(4, 4), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "Lfy;" ) - class140(class146 var1) { - this.this$0 = var1; - this.field1332 = -1; - } + field1302(5, 5), + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lfy;" + ) + field1307(6, 6), + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lfy;" + ) + field1300(7, 7), + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lfy;" + ) + field1305(8, 8); - @ObfuscatedName("au") + @ObfuscatedName("tr") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "Lbm;" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1332 = var1.readUnsignedShort(); - this.field1329 = var1.readInt(); - this.field1330 = var1.readUnsignedByte(); - this.field1331 = var1.readUnsignedByte(); + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("av") + final int field1310; + @ObfuscatedName("ag") + final int field1309; + + class140(int var3, int var4) { + this.field1310 = var3; + this.field1309 = var4; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(I)I", + garbageValue = "-1243971674" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method820(this.field1332, this.field1329, this.field1330, this.field1331); + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1309; } - @ObfuscatedName("ii") + @ObfuscatedName("hu") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-64" + garbageValue = "71" ) - static final void method762() { - int var0; - int var1; - int var2; - if (!Client.field402) { - var0 = Players.cameraMoveToX * 128 + 64; - var1 = class33.cameraMoveToY * 128 + 64; - var2 = class18.getTileHeight(var0, var1, HealthBar.Client_plane) - VarpDefinition.cameraMoveToHeight; - class126.method702(var0, var2, var1); - } else if (Client.field642 != null) { - NPCComposition.cameraX = Client.field642.vmethod2349(); - class139.cameraZ = Client.field642.vmethod2347(); - if (Client.field401) { - class133.cameraY = Client.field642.vmethod2320(); - } else { - class133.cameraY = class18.getTileHeight(NPCComposition.cameraX, class139.cameraZ, HealthBar.Client_plane) - Client.field642.vmethod2320(); - } + @Export("reloadJS5") + static void reloadJS5() { + if (class33.varcs.hasUnwrittenChanges()) { + class33.varcs.write(); + } - Client.field642.method2376(); + MusicPatchNode2.method1658(); + if (class233.mouseRecorder != null) { + class233.mouseRecorder.isRunning = false; } - if (!Client.field404) { - var0 = PendingSpawn.cameraLookAtX * 128 + 64; - var1 = VarbitComposition.cameraLookAtY * 128 + 64; - var2 = class18.getTileHeight(var0, var1, HealthBar.Client_plane) - MusicPatchNode2.cameraLookAtHeight; - int var3 = var0 - NPCComposition.cameraX; - int var4 = var2 - class133.cameraY; - int var5 = var1 - class139.cameraZ; - int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); - int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; - int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; - class416.method2161(var7, var8); - } else { - if (Client.field647 != null) { - class129.cameraPitch = Client.field647.method2371(); - class129.cameraPitch = Math.min(Math.max(class129.cameraPitch, 128), 383); - Client.field647.method2376(); + class233.mouseRecorder = null; + Client.packetWriter.close(); + if (GameEngine.taskHandler != null) { + try { + GameEngine.taskHandler.close(); + } catch (Exception var3) { } + } - if (Client.field646 != null) { - UserComparator10.cameraYaw = Client.field646.method2371() & 2047; - Client.field646.method2376(); - } + GameEngine.taskHandler = null; + class214.method1052(); + WorldMapSection0.method1551(); + class10.scene.clear(); + + for (int var1 = 0; var1 < 4; ++var1) { + Client.collisionMaps[var1].clear(); + } + + class434.worldMap = null; + ItemComposition.method1088(0, 0); + class470.method2362(); + Client.playingJingle = false; + SoundCache.method228(); + if (class171.pcmPlayer1 != null) { + class171.pcmPlayer1.shutdown(); + } + + class59.field309.method1969(); + WorldMapDecorationType.method1898(); + if (AbstractWorldMapIcon.urlRequester != null) { + AbstractWorldMapIcon.urlRequester.close(); + } + + HealthBar.method577(); + JagexCache.JagexCache_dat2File = null; + JagexCache.JagexCache_idx255File = null; + UserComparator8.JagexCache_idxFiles = null; + class232.method1192(); + UserComparator10.field1188 = null; + Client.archiveLoaders.clear(); + Client.field551 = 0; + class59.field309 = new JagNetThread(); + AbstractWorldMapIcon.urlRequester = new class115(class159.client.field660, 217); + + try { + class139.method735("oldschool", UserComparator3.field1184, SoundSystem.field211.name, 0, 23); + } catch (IOException var2) { + throw new RuntimeException(var2); + } + + UserComparator10.field1188 = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + GameEngine.taskHandler = new TaskHandler(); + class159.client.method155(); + Client.field416 = class94.field929; + DefaultsGroup.updateGameState(0); + } + + @ObfuscatedName("lu") + @ObfuscatedSignature( + descriptor = "(Lnm;IIZI)V", + garbageValue = "1653848905" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; + int var5 = var0.height; + if (var0.widthAlignment == 0) { + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { + var0.width = var0.height * var0.field3017 / var0.field3012; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.field3012 * var0.width / var0.field3017; + } + + if (var0.contentType == 1337) { + Client.viewportWidget = var0; + } + + if (var0.type == 12) { + var0.method1877().method1768(var0.width, var0.height); + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var0; + var6.args = var0.onResize; + Client.scriptEvents.addFirst(var6); } } diff --git a/osrs/src/main/java/class141.java b/osrs/src/main/java/class141.java index d3183c22f..7cfff140a 100644 --- a/osrs/src/main/java/class141.java +++ b/osrs/src/main/java/class141.java @@ -2,74 +2,274 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") -public class class141 extends class143 { - @ObfuscatedName("fc") +import java.util.Date; + +@ObfuscatedName("fn") +public enum class141 implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lfn;" ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("au") - long field1335; - @ObfuscatedName("ae") - String field1334; - // $FF: synthetic field + field1311(2, 0), + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "Lfn;" ) - final class146 this$0; - + field1313(3, 1), + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lfn;" + ) + field1312(1, 2), + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "Lfn;" + ) + field1315(4, 3), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lfn;" ) - class141(class146 var1) { - this.this$0 = var1; - this.field1335 = -1L; - this.field1334 = null; + field1314(0, 4); + + @ObfuscatedName("ah") + public final int field1317; + @ObfuscatedName("ar") + @Export("id") + final int id; + + class141(int var3, int var4) { + this.field1317 = var3; + this.id = var4; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(I)I", + garbageValue = "-1243971674" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1335 = var1.readLong(); - } + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } - this.field1334 = var1.readStringCp1252NullTerminatedOrNull(); + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1592727780" + ) + public static void method749() { + class202.field1582.clear(); } - @ObfuscatedName("ae") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(I)[Ldh;", + garbageValue = "-2108098513" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method812(this.field1335, this.field1334, 0); + static class92[] method750() { + return new class92[]{class92.field891, class92.field889, class92.field892, class92.field890, class92.field893, class92.field894}; } - @ObfuscatedName("an") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "49" + descriptor = "(ILds;ZI)I", + garbageValue = "1466228430" ) - static final int method765(int var0, int var1, int var2) { - int var3 = var0 / var2; - int var4 = var0 & var2 - 1; - int var5 = var1 / var2; - int var6 = var1 & var2 - 1; - int var7 = class312.method1685(var3, var5); - int var8 = class312.method1685(var3 + 1, var5); - int var9 = class312.method1685(var3, var5 + 1); - int var10 = class312.method1685(var3 + 1, var5 + 1); - int var11 = class19.method61(var7, var8, var4, var2); - int var12 = class19.method61(var9, var10, var4, var2); - return class19.method61(var11, var12, var6, var2); + static int method752(int var0, Script var1, boolean var2) { + String var3; + int var4; + if (var0 == 4100) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3 + var4; + return 1; + } else { + String var9; + if (var0 == 4101) { + class180.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } else if (var0 == 4102) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3 + AbstractWorldMapData.intToString(var4, true); + return 1; + } else if (var0 == 4103) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } else { + int var6; + int var10; + if (var0 == 4104) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + long var11 = (11745L + (long)var10) * 86400000L; + Interpreter.Interpreter_calendar.setTime(new Date(var11)); + var6 = Interpreter.Interpreter_calendar.get(5); + int var17 = Interpreter.Interpreter_calendar.get(2); + int var8 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; + return 1; + } else if (var0 != 4105) { + if (var0 == 4106) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == 4107) { + class180.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class241.method1265(CollisionMap.compareStrings(Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1], WorldMapLabelSize.clientLanguage)); + return 1; + } else { + int var5; + byte[] var13; + Font var14; + if (var0 == 4108) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var13 = class27.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + return 1; + } else if (var0 == 4109) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var13 = class27.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + return 1; + } else if (var0 == 4110) { + class180.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9; + } + + return 1; + } else if (var0 == 4111) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == 4112) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3 + (char)var4; + return 1; + } else if (var0 == 4113) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = StructComposition.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4114) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4115) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class135.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4116) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = IsaacCipher.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4117) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 4118) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); + return 1; + } else if (var0 == 4119) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + StringBuilder var18 = new StringBuilder(var3.length()); + boolean var16 = false; + + for (var6 = 0; var6 < var3.length(); ++var6) { + char var7 = var3.charAt(var6); + if (var7 == '<') { + var16 = true; + } else if (var7 == '>') { + var16 = false; + } else if (!var16) { + var18.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var18.toString(); + return 1; + } else if (var0 == 4120) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4); + return 1; + } else if (var0 == 4121) { + class180.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + return 1; + } else if (var0 == 4122) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } else if (var0 == 4123) { + class180.Interpreter_stringStackSize -= 3; + var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; + String var15 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 2]; + if (TextureProvider.localPlayer.appearance == null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var15; + return 1; + } else { + switch(TextureProvider.localPlayer.appearance.field2951) { + case 0: + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3; + break; + case 1: + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9; + break; + case 2: + default: + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var15; + } + + return 1; + } + } else { + return 2; + } + } + } else { + class180.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; + if (TextureProvider.localPlayer.appearance != null && TextureProvider.localPlayer.appearance.field2950 != 0) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3; + } + + return 1; + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class142.java b/osrs/src/main/java/class142.java index 1907df076..d16de69f9 100644 --- a/osrs/src/main/java/class142.java +++ b/osrs/src/main/java/class142.java @@ -2,99 +2,65 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") -public class class142 extends class143 { - @ObfuscatedName("au") - int field1336; +@ObfuscatedName("fb") +public class class142 extends class145 { + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lpu;" + ) + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("ac") + int field1319; + @ObfuscatedName("al") + int field1321; + @ObfuscatedName("ak") + int field1320; + @ObfuscatedName("ax") + int field1322; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lff;" ) - final class146 this$0; + final class148 this$0; @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "(Lff;)V" ) - class142(class146 var1) { + class142(class148 var1) { this.this$0 = var1; - this.field1336 = -1; + this.field1319 = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1336 = var1.readUnsignedShort(); + this.field1319 = var1.readUnsignedShort(); + this.field1321 = var1.readInt(); + this.field1320 = var1.readUnsignedByte(); + this.field1322 = var1.readUnsignedByte(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method813(this.field1336); + var1.method825(this.field1319, this.field1321, this.field1320, this.field1322); } - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([BIII)Z", - garbageValue = "1391970820" + descriptor = "(Lom;I)V", + garbageValue = "1595932932" ) - static final boolean method768(byte[] var0, int var1, int var2) { - boolean var3 = true; - Buffer var4 = new Buffer(var0); - int var5 = -1; - - label57: - while (true) { - int var6 = var4.method2561(); - if (var6 == 0) { - return var3; - } - - var5 += var6; - int var7 = 0; - boolean var8 = false; - - while (true) { - int var9; - while (!var8) { - var9 = var4.readUShortSmart(); - if (var9 == 0) { - continue label57; - } - - var7 += var9 - 1; - int var10 = var7 & 63; - int var11 = var7 >> 6 & 63; - int var12 = var4.readUnsignedByte() >> 2; - int var13 = var11 + var1; - int var14 = var10 + var2; - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { - ObjectComposition var15 = WorldMapElement.getObjectDefinition(var5); - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { - if (!var15.needsModelFiles()) { - ++Client.field455; - var3 = false; - } - - var8 = true; - } - } - } - - var9 = var4.readUShortSmart(); - if (var9 == 0) { - break; - } - - var4.readUnsignedByte(); - } - } + public static void method753(AbstractArchive var0) { + StructComposition.StructDefinition_archive = var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class143.java b/osrs/src/main/java/class143.java index c8649da0c..847f065c3 100644 --- a/osrs/src/main/java/class143.java +++ b/osrs/src/main/java/class143.java @@ -2,34 +2,80 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") -public abstract class class143 extends Node { - class143() { +@ObfuscatedName("ft") +public class class143 extends class145 { + @ObfuscatedName("ac") + long field1324; + @ObfuscatedName("al") + String field1323; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lff;" + ) + final class148 this$0; + + @ObfuscatedSignature( + descriptor = "(Lff;)V" + ) + class143(class148 var1) { + this.this$0 = var1; + this.field1324 = -1L; + this.field1323 = null; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) @Export("vmethod3254") - abstract void vmethod3254(Buffer var1); + void vmethod3254(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1324 = var1.readLong(); + } + + this.field1323 = var1.readStringCp1252NullTerminatedOrNull(); + } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) @Export("vmethod3248") - abstract void vmethod3248(ClanSettings var1); + void vmethod3248(ClanSettings var1) { + var1.method817(this.field1324, this.field1323, 0); + } - @ObfuscatedName("om") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lmi;B)Z", - garbageValue = "-83" + descriptor = "(II)F", + garbageValue = "1171307082" ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; + public static float method756(int var0) { + var0 &= 16383; + return (float)(6.283185307179586D * (double)((float)var0 / 16384.0F)); + } + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "83" + ) + static final void method759() { + if (class183.ClanChat_inClanChat) { + if (class358.friendsChat != null) { + class358.friendsChat.sort(); + } + + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsInFriendsChat(); + } + + class183.ClanChat_inClanChat = false; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class144.java b/osrs/src/main/java/class144.java index e0f4af6f2..1ee73118a 100644 --- a/osrs/src/main/java/class144.java +++ b/osrs/src/main/java/class144.java @@ -2,60 +2,66 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") -public class class144 extends class143 { - @ObfuscatedName("au") - int field1338; - @ObfuscatedName("ae") - boolean field1337; +@ObfuscatedName("fa") +public class class144 extends class145 { + @ObfuscatedName("ac") + int field1325; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lff;" ) - final class146 this$0; + final class148 this$0; @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "(Lff;)V" ) - class144(class146 var1) { + class144(class148 var1) { this.this$0 = var1; - this.field1338 = -1; + this.field1325 = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1338 = var1.readUnsignedShort(); - this.field1337 = var1.readUnsignedByte() == 1; + this.field1325 = var1.readUnsignedShort(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method819(this.field1338, this.field1337); + var1.method818(this.field1325); } - @ObfuscatedName("ae") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-2136715015" + descriptor = "(I)V", + garbageValue = "1547227801" ) - public static int method772(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var1; - } else if (var2 == 1) { - return 7 - var0; - } else { - return var2 == 2 ? 7 - var1 : var0; + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; + + try { + var0 = class17.getPreferencesFile("", UrlRequester.field1163.name, true); + Buffer var1 = class91.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { + } + + try { + if (var0 != null) { + var0.closeSync(true); + } + } catch (Exception var2) { } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class145.java b/osrs/src/main/java/class145.java new file mode 100644 index 000000000..058f50271 --- /dev/null +++ b/osrs/src/main/java/class145.java @@ -0,0 +1,48 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fg") +public abstract class class145 extends Node { + class145() { + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lul;I)V", + garbageValue = "-11659242" + ) + @Export("vmethod3254") + abstract void vmethod3254(Buffer var1); + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lgi;I)V", + garbageValue = "21847466" + ) + @Export("vmethod3248") + abstract void vmethod3248(ClanSettings var1); + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;Lom;I)V", + garbageValue = "1295708638" + ) + public static void method763(AbstractArchive var0, AbstractArchive var1) { + KitDefinition.KitDefinition_archive = var0; + KitDefinition.KitDefinition_modelsArchive = var1; + class403.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "245688537" + ) + static final void method764(String var0) { + PacketBufferNode var1 = ClanChannelMember.getPacketBufferNode(ClientPacket.FIREND_ADDUSER, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class146.java b/osrs/src/main/java/class146.java index cbdd16214..afb63b5ee 100644 --- a/osrs/src/main/java/class146.java +++ b/osrs/src/main/java/class146.java @@ -2,109 +2,64 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") -public class class146 { - @ObfuscatedName("ol") +@ObfuscatedName("fm") +public class class146 extends class145 { + @ObfuscatedName("ac") + int field1327; + @ObfuscatedName("al") + boolean field1326; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lff;" ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("au") - long field1345; - @ObfuscatedName("ae") - public int field1347; - @ObfuscatedName("ao") + final class148 this$0; + @ObfuscatedSignature( - descriptor = "Loc;" + descriptor = "(Lff;)V" ) - IterableNodeDeque field1346; + class146(class148 var1) { + this.this$0 = var1; + this.field1327 = -1; + } + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) - public class146(Buffer var1) { - this.field1347 = -1; - this.field1346 = new IterableNodeDeque(); - this.method780(var1); + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1327 = var1.readUnsignedShort(); + this.field1326 = var1.readUnsignedByte() == 1; } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-82" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) - void method780(Buffer var1) { - this.field1345 = var1.readLong(); - this.field1347 = var1.readInt(); - - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { - Object var3; - if (var2 == 3) { - var3 = new class165(this); - } else if (var2 == 1) { - var3 = new class141(this); - } else if (var2 == 13) { - var3 = new class158(this); - } else if (var2 == 4) { - var3 = new class150(this); - } else if (var2 == 6) { - var3 = new class157(this); - } else if (var2 == 5) { - var3 = new class142(this); - } else if (var2 == 2) { - var3 = new class147(this); - } else if (var2 == 7) { - var3 = new class140(this); - } else if (var2 == 14) { - var3 = new class144(this); - } else if (var2 == 8) { - var3 = new class161(this); - } else if (var2 == 9) { - var3 = new class167(this); - } else if (var2 == 10) { - var3 = new class153(this); - } else if (var2 == 11) { - var3 = new class148(this); - } else if (var2 == 12) { - var3 = new class152(this); - } else { - if (var2 != 15) { - throw new RuntimeException(""); - } - - var3 = new class162(this); - } - - ((class143)var3).vmethod3254(var1); - this.field1346.addFirst((Node)var3); - } - + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method824(this.field1327, this.field1326); } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lfi;I)V", - garbageValue = "192399010" + descriptor = "(II)V", + garbageValue = "1923763150" ) - public void method781(ClanSettings var1) { - if (var1.field1377 == this.field1345 && this.field1347 == var1.field1388) { - for (class143 var2 = (class143)this.field1346.last(); var2 != null; var2 = (class143)this.field1346.previous()) { - var2.vmethod3248(var1); - } - - ++var1.field1388; - } else { - throw new RuntimeException(""); - } + static void method768(int var0) { + class464.field3897 = var0; + class464.field3898 = new class464[var0]; + class464.field3896 = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)Lly;", - garbageValue = "-1" + descriptor = "(II)Z", + garbageValue = "1925208332" ) - public static PacketBufferNode method779() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + public static boolean method767(int var0) { + return (var0 & 1) != 0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class147.java b/osrs/src/main/java/class147.java deleted file mode 100644 index 550f9eeca..000000000 --- a/osrs/src/main/java/class147.java +++ /dev/null @@ -1,459 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fx") -public class class147 extends class143 { - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - static Archive field1348; - @ObfuscatedName("au") - int field1350; - @ObfuscatedName("ae") - byte field1349; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - final class146 this$0; - - @ObfuscatedSignature( - descriptor = "(Lfn;)V" - ) - class147(class146 var1) { - this.this$0 = var1; - this.field1350 = -1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" - ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1350 = var1.readUnsignedShort(); - this.field1349 = var1.readByte(); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" - ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method817(this.field1350, this.field1349); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ldy;Ldh;III)V", - garbageValue = "1066790817" - ) - @Export("runScriptLogic") - static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { - Object[] var4 = var0.args; - SoundCache.Interpreter_intStackSize = 0; - class137.Interpreter_stringStackSize = 0; - int var5 = -1; - int[] var6 = var1.opcodes; - int[] var7 = var1.intOperands; - byte var8 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field705 = false; - boolean var9 = false; - int var10 = 0; - boolean var29 = false; - - label860: { - label861: { - try { - int var13; - try { - var29 = true; - Varps.Interpreter_intLocals = new int[var1.localIntCount]; - int var11 = 0; - Interpreter.Interpreter_stringLocals = new String[var1.localStringCount]; - int var12 = 0; - - int var14; - String var20; - for (var13 = 1; var13 < var4.length; ++var13) { - if (var4[var13] instanceof Integer) { - var14 = (Integer)var4[var13]; - if (var14 == -2147483647) { - var14 = var0.mouseX; - } - - if (var14 == -2147483646) { - var14 = var0.mouseY; - } - - if (var14 == -2147483645) { - var14 = var0.widget != null ? var0.widget.id * -198009563 * -802277715 : -1; - } - - if (var14 == -2147483644) { - var14 = var0.opIndex; - } - - if (var14 == -2147483643) { - var14 = var0.widget != null ? var0.widget.childIndex * 1628260767 * -1714711969 : -1; - } - - if (var14 == -2147483642) { - var14 = var0.dragTarget != null ? var0.dragTarget.id * -198009563 * -802277715 : -1; - } - - if (var14 == -2147483641) { - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1628260767 * -1714711969 : -1; - } - - if (var14 == -2147483640) { - var14 = var0.keyTyped; - } - - if (var14 == -2147483639) { - var14 = var0.keyPressed; - } - - Varps.Interpreter_intLocals[var11++] = var14; - } else if (var4[var13] instanceof String) { - var20 = (String)var4[var13]; - if (var20.equals("event_opbase")) { - var20 = var0.targetName; - } - - Interpreter.Interpreter_stringLocals[var12++] = var20; - } - } - - Interpreter.field708 = var0.field864; - - label841: - while (true) { - ++var10; - if (var10 > var2) { - throw new RuntimeException(); - } - - ++var5; - int var32 = var6[var5]; - if (var32 >= 100) { - boolean var34; - if (var1.intOperands[var5] == 1) { - var34 = true; - } else { - var34 = false; - } - - var14 = PacketWriter.method644(var32, var1, var34); - switch(var14) { - case 0: - var29 = false; - break label841; - case 1: - default: - break; - case 2: - //throw new IllegalStateException(); - } - } else if (var32 == 0) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var7[var5]; - } else if (var32 == 1) { - var13 = var7[var5]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; - } else if (var32 == 2) { - var13 = var7[var5]; - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - WorldMapDecoration.changeGameOptions(var13); - } else if (var32 == 3) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var1.stringOperands[var5]; - } else if (var32 == 6) { - var5 += var7[var5]; - } else if (var32 == 7) { - SoundCache.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 8) { - SoundCache.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 9) { - SoundCache.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 10) { - SoundCache.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 21) { - if (Interpreter.Interpreter_frameDepth == 0) { - var29 = false; - break label861; - } - - ScriptFrame var39 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; - var1 = var39.script; - var6 = var1.opcodes; - var7 = var1.intOperands; - var5 = var39.pc; - Varps.Interpreter_intLocals = var39.intLocals; - Interpreter.Interpreter_stringLocals = var39.stringLocals; - } else if (var32 == 25) { - var13 = var7[var5]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ClientPreferences.getVarbit(var13); - } else if (var32 == 27) { - var13 = var7[var5]; - Frames.method1293(var13, Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - } else if (var32 == 31) { - SoundCache.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 32) { - SoundCache.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 33) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Varps.Interpreter_intLocals[var7[var5]]; - } else if (var32 == 34) { - Varps.Interpreter_intLocals[var7[var5]] = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - } else if (var32 == 35) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var5]]; - } else if (var32 == 36) { - Interpreter.Interpreter_stringLocals[var7[var5]] = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - } else if (var32 == 37) { - var13 = var7[var5]; - class137.Interpreter_stringStackSize -= var13; - var20 = class271.method1540(Interpreter.Interpreter_stringStack, class137.Interpreter_stringStackSize, var13); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var20; - } else if (var32 == 38) { - --SoundCache.Interpreter_intStackSize; - } else if (var32 == 39) { - --class137.Interpreter_stringStackSize; - } else { - int var17; - if (var32 != 40) { - if (var32 == 42) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = KeyHandler.varcs.getInt(var7[var5]); - } else if (var32 == 43) { - KeyHandler.varcs.setInt(var7[var5], Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - } else if (var32 == 44) { - var13 = var7[var5] >> 16; - var14 = var7[var5] & 65535; - int var23 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var23 < 0 || var23 > 5000) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrayLengths[var13] = var23; - byte var24 = -1; - if (var14 == 105) { - var24 = 0; - } - - for (var17 = 0; var17 < var23; ++var17) { - Interpreter.Interpreter_arrays[var13][var17] = var24; - } - } else if (var32 == 45) { - var13 = var7[var5]; - var14 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; - } else if (var32 == 46) { - var13 = var7[var5]; - SoundCache.Interpreter_intStackSize -= 2; - var14 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - } else { - String var21; - if (var32 == 47) { - var21 = KeyHandler.varcs.getStringOld(var7[var5]); - if (var21 == null) { - var21 = "null"; - } - - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var21; - } else if (var32 == 48) { - KeyHandler.varcs.setStringOld(var7[var5], Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]); - } else if (var32 == 49) { - var21 = KeyHandler.varcs.getString(var7[var5]); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var21; - } else if (var32 == 50) { - KeyHandler.varcs.setString(var7[var5], Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]); - } else if (var32 == 60) { - IterableNodeHashTable var37 = var1.switches[var7[var5]]; - IntegerNode var36 = (IntegerNode)var37.get((long)Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - if (var36 != null) { - var5 += var36.integer; - } - } else { - Integer var38; - if (var32 == 74) { - var38 = class466.field3912.getTitleGroupValue(var7[var5]); - if (var38 == null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var38; - } - } else { - if (var32 != 76) { - throw new IllegalStateException(); - } - - var38 = class139.varclan.method2320(var7[var5]); - if (var38 == null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var38; - } - } - } - } - } else { - var13 = var7[var5]; - Script var35 = class133.getScript(var13); - int[] var15 = new int[var35.localIntCount]; - String[] var16 = new String[var35.localStringCount]; - - for (var17 = 0; var17 < var35.intArgumentCount; ++var17) { - var15[var17] = Interpreter.Interpreter_intStack[var17 + (SoundCache.Interpreter_intStackSize - var35.intArgumentCount)]; - } - - for (var17 = 0; var17 < var35.stringArgumentCount; ++var17) { - var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class137.Interpreter_stringStackSize - var35.stringArgumentCount)]; - } - - SoundCache.Interpreter_intStackSize -= var35.intArgumentCount; - class137.Interpreter_stringStackSize -= var35.stringArgumentCount; - ScriptFrame var22 = new ScriptFrame(); - var22.script = var1; - var22.pc = var5; - var22.intLocals = Varps.Interpreter_intLocals; - var22.stringLocals = Interpreter.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; - var1 = var35; - var6 = var35.opcodes; - var7 = var35.intOperands; - var5 = -1; - Varps.Interpreter_intLocals = var15; - Interpreter.Interpreter_stringLocals = var16; - } - } - } - } catch (Exception var30) { - var9 = true; - StringBuilder var26 = new StringBuilder(30); - var26.append("").append(var1.key).append(" "); - - for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { - var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); - } - - var26.append("").append(var8); - Messages.RunException_sendStackTrace(var26.toString(), var30); - var29 = false; - break label860; - } - } finally { - if (var29) { - while (Interpreter.field715.size() > 0) { - class102 var19 = (class102)Interpreter.field715.remove(0); - class47.widgetDefaultMenuAction(var19.method601(), var19.method602(), var19.method603(), var19.method604(), ""); - } - - if (Interpreter.field705) { - Interpreter.field705 = false; - WorldMapIcon_1.method1402(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - Messages.RunException_sendStackTrace("Warning: Script " + var1.field817 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - - } - } - - while (Interpreter.field715.size() > 0) { - class102 var33 = (class102)Interpreter.field715.remove(0); - class47.widgetDefaultMenuAction(var33.method601(), var33.method602(), var33.method603(), var33.method604(), ""); - } - - if (Interpreter.field705) { - Interpreter.field705 = false; - WorldMapIcon_1.method1402(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - Messages.RunException_sendStackTrace("Warning: Script " + var1.field817 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - - return; - } - - while (Interpreter.field715.size() > 0) { - class102 var40 = (class102)Interpreter.field715.remove(0); - class47.widgetDefaultMenuAction(var40.method601(), var40.method602(), var40.method603(), var40.method604(), ""); - } - - if (Interpreter.field705) { - Interpreter.field705 = false; - WorldMapIcon_1.method1402(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - Messages.RunException_sendStackTrace("Warning: Script " + var1.field817 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - - return; - } - - while (Interpreter.field715.size() > 0) { - class102 var25 = (class102)Interpreter.field715.remove(0); - class47.widgetDefaultMenuAction(var25.method601(), var25.method602(), var25.method603(), var25.method604(), ""); - } - - if (Interpreter.field705) { - Interpreter.field705 = false; - WorldMapIcon_1.method1402(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - Messages.RunException_sendStackTrace("Warning: Script " + var1.field817 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - - } - - @ObfuscatedName("ji") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-531661874" - ) - static void method785() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; - - for (int var2 = 0; var2 < var0; ++var2) { - if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { - class92.addPlayerToScene(Client.players[var1[var2]], true); - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class148.java b/osrs/src/main/java/class148.java index 63985acf9..6410023e1 100644 --- a/osrs/src/main/java/class148.java +++ b/osrs/src/main/java/class148.java @@ -2,67 +2,207 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.util.ArrayList; +import java.util.Iterator; + @ObfuscatedName("ff") -public class class148 extends class143 { - @ObfuscatedName("aw") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("au") - int field1355; - @ObfuscatedName("ae") - int field1352; - @ObfuscatedName("ao") - int field1353; - @ObfuscatedName("at") - int field1354; - // $FF: synthetic field +public class class148 { + @ObfuscatedName("ux") + @Export("cameraLookAtX") + static int cameraLookAtX; + @ObfuscatedName("ac") + long field1333; + @ObfuscatedName("al") + public int field1335; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lpy;" ) - final class146 this$0; + IterableNodeDeque field1334; + + @ObfuscatedSignature( + descriptor = "(Lul;)V" + ) + public class148(Buffer var1) { + this.field1335 = -1; + this.field1334 = new IterableNodeDeque(); + this.method774(var1); + } + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "(Lul;I)V", + garbageValue = "-2147364614" ) - class148(class146 var1) { - this.this$0 = var1; + void method774(Buffer var1) { + this.field1333 = var1.readLong(); + this.field1335 = var1.readInt(); + + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + Object var3; + if (var2 == 3) { + var3 = new class167(this); + } else if (var2 == 1) { + var3 = new class143(this); + } else if (var2 == 13) { + var3 = new class160(this); + } else if (var2 == 4) { + var3 = new class152(this); + } else if (var2 == 6) { + var3 = new class159(this); + } else if (var2 == 5) { + var3 = new class144(this); + } else if (var2 == 2) { + var3 = new class149(this); + } else if (var2 == 7) { + var3 = new class142(this); + } else if (var2 == 14) { + var3 = new class146(this); + } else if (var2 == 8) { + var3 = new class163(this); + } else if (var2 == 9) { + var3 = new class169(this); + } else if (var2 == 10) { + var3 = new class155(this); + } else if (var2 == 11) { + var3 = new class150(this); + } else if (var2 == 12) { + var3 = new class154(this); + } else { + if (var2 != 15) { + throw new RuntimeException(""); + } + + var3 = new class164(this); + } + + ((class145)var3).vmethod3254(var1); + this.field1334.addFirst((Node)var3); + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lgi;I)V", + garbageValue = "-170736557" + ) + public void method777(ClanSettings var1) { + if (this.field1333 == var1.field1363 && this.field1335 == var1.field1375) { + for (class145 var2 = (class145)this.field1334.last(); var2 != null; var2 = (class145)this.field1334.previous()) { + var2.vmethod3248(var1); + } + + ++var1.field1375; + } else { + throw new RuntimeException(""); + } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(II)Lhp;", + garbageValue = "-1776229004" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1355 = var1.readInt(); - this.field1354 = var1.readInt(); - this.field1352 = var1.readUnsignedByte(); - this.field1353 = var1.readUnsignedByte(); + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(II)[B", + garbageValue = "-2128582813" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method822(this.field1355, this.field1354, this.field1352, this.field1353); + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); } - @ObfuscatedName("af") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "236426958" + descriptor = "(Ljava/util/ArrayList;IIIIZB)V", + garbageValue = "7" ) - static boolean method788(char var0) { - for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { - if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { - return true; + public static void method776(ArrayList var0, int var1, int var2, int var3, int var4, boolean var5) { + if (!var0.isEmpty()) { + class319.field2791.clear(); + class319.field2798.clear(); + Script.method449(var5); + GrandExchangeOfferNameComparator.method1979(var0, var5); + if (!class319.field2791.isEmpty()) { + MouseHandler.method177(var1, var2, var3, var4); + class319.field2798.add(new AddRequestTask((SongTask)null)); + class319.field2798.add(new class423((SongTask)null, class319.field2800, class319.field2802, class319.field2801)); + ArrayList var6 = new ArrayList(); + var6.add(new class418(new FadeInTask((SongTask)null, 0, true, class319.field2795))); + if (!class319.musicSongs.isEmpty()) { + ArrayList var7 = new ArrayList(); + var7.add(new DelayFadeTask(new ConcurrentMidiTask((SongTask)null, var6), class319.field2793)); + ArrayList var9 = new ArrayList(); + Iterator var10 = class319.musicSongs.iterator(); + + while (var10.hasNext()) { + MusicSong var11 = (MusicSong)var10.next(); + var9.add(var11); + } + + var7.add(new DelayFadeTask(new FadeOutTask(new class416((SongTask)null, var9), 0, false, class319.field2794), class319.musicPlayerStatus)); + class319.field2798.add(new ConcurrentMidiTask((SongTask)null, var7)); + } else { + class319.field2798.add(new DelayFadeTask((SongTask)null, class319.field2793)); + class319.field2798.add(new ConcurrentMidiTask((SongTask)null, var6)); + } + } } + } - return false; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1919662235" + ) + static void method780() { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + AbstractWorldMapIcon.setLoginResponseString("", "Please enter your username/email address.", ""); + } else if (Login.Login_password.length() == 0) { + AbstractWorldMapIcon.setLoginResponseString("", "Please enter your password.", ""); + } else { + AbstractWorldMapIcon.setLoginResponseString("", "Connecting to server...", ""); + UserComparator6.method690(false); + DefaultsGroup.updateGameState(20); + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;IB)V", + garbageValue = "49" + ) + @Export("setFriendsRank") + static final void setFriendsRank(String var0, int var1) { + PacketBufferNode var2 = ClanChannelMember.getPacketBufferNode(ClientPacket.f2, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var0) + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + var2.packetBuffer.writeByteNeg(var1); + Client.packetWriter.addNode(var2); + } + + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-54" + ) + static final void method781() { + if (Client.logoutTimer > 0) { + CollisionMap.method1166(); + } else { + Client.timer.method2183(); + DefaultsGroup.updateGameState(40); + class11.field33 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class149.java b/osrs/src/main/java/class149.java index 7d19cd919..380d3c1af 100644 --- a/osrs/src/main/java/class149.java +++ b/osrs/src/main/java/class149.java @@ -2,54 +2,67 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") -public class class149 extends class159 { - @ObfuscatedName("au") - int field1358; - @ObfuscatedName("ae") - byte field1356; - @ObfuscatedName("ao") - int field1357; - @ObfuscatedName("at") - String field1359; +@ObfuscatedName("fw") +public class class149 extends class145 { + @ObfuscatedName("ac") + int field1337; + @ObfuscatedName("al") + byte field1336; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lff;" ) - final class160 this$0; + final class148 this$0; @ObfuscatedSignature( - descriptor = "(Lgg;)V" + descriptor = "(Lff;)V" ) - class149(class160 var1) { + class149(class148 var1) { this.this$0 = var1; - this.field1358 = -1; + this.field1337 = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "1" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) - @Export("vmethod3238") - void vmethod3238(Buffer var1) { - this.field1358 = var1.readUnsignedShort(); - this.field1356 = var1.readByte(); - this.field1357 = var1.readUnsignedShort(); - var1.readLong(); - this.field1359 = var1.readStringCp1252NullTerminated(); + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1337 = var1.readUnsignedShort(); + this.field1336 = var1.readByte(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lgo;I)V", - garbageValue = "831405774" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) - @Export("vmethod3239") - void vmethod3239(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1358); - var2.rank = this.field1356; - var2.world = this.field1357; - var2.username = new Username(this.field1359); + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method822(this.field1337, this.field1336); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(BI)C", + garbageValue = "-1818830164" + ) + public static char method782(byte var0) { + int var1 = var0 & 255; + if (var1 == 0) { + throw new IllegalArgumentException("" + Integer.toString(var1, 16)); + } else { + if (var1 >= 128 && var1 < 160) { + char var2 = class399.cp1252AsciiExtension[var1 - 128]; + if (var2 == 0) { + var2 = '?'; + } + + var1 = var2; + } + + return (char)var1; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class15.java b/osrs/src/main/java/class15.java index b32c7dd74..2441bb528 100644 --- a/osrs/src/main/java/class15.java +++ b/osrs/src/main/java/class15.java @@ -14,15 +14,15 @@ import java.security.SecureRandom; import java.security.Security; -@ObfuscatedName("ab") +@ObfuscatedName("aj") public class class15 extends SSLSocketFactory { - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lab;" + descriptor = "Laj;" ) - static class15 field46; - @ObfuscatedName("au") - SecureRandom field47; + public static class15 field44; + @ObfuscatedName("ac") + SecureRandom field45; static { if (Security.getProvider("BC") == null) { @@ -31,16 +31,16 @@ public class class15 extends SSLSocketFactory { } - class15() { - this.field47 = new SecureRandom(); + public class15() { + this.field45 = new SecureRandom(); } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;B)Ljavax/net/ssl/SSLSocket;", - garbageValue = "59" + descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;S)Ljavax/net/ssl/SSLSocket;", + garbageValue = "-369" ) - SSLSocket method46(String var1, TlsClientProtocol var2) { + SSLSocket method51(String var1, TlsClientProtocol var2) { return new class12(this, var2, var1); } @@ -55,8 +55,8 @@ public Socket createSocket(Socket var1, String var2, int var3, boolean var4) thr var1.connect(new InetSocketAddress(var2, var3)); } - TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field47); - return this.method46(var2, var5); + TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field45); + return this.method51(var2, var5); } public String[] getDefaultCipherSuites() { @@ -82,17 +82,4 @@ public Socket createSocket(String var1, int var2, InetAddress var3, int var4) th public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { return null; } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Lab;", - garbageValue = "1970056082" - ) - public static class15 method45() { - if (field46 == null) { - field46 = new class15(); - } - - return field46; - } } \ No newline at end of file diff --git a/osrs/src/main/java/class150.java b/osrs/src/main/java/class150.java index c975ca307..2069e6427 100644 --- a/osrs/src/main/java/class150.java +++ b/osrs/src/main/java/class150.java @@ -2,56 +2,195 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fk") -public class class150 extends class143 { - @ObfuscatedName("au") - boolean field1360; - @ObfuscatedName("ae") - byte field1362; - @ObfuscatedName("ao") - byte field1363; - @ObfuscatedName("at") - byte field1364; +@ObfuscatedName("fc") +public class class150 extends class145 { @ObfuscatedName("ac") - byte field1361; + int field1338; + @ObfuscatedName("al") + int field1340; + @ObfuscatedName("ak") + int field1339; + @ObfuscatedName("ax") + int field1341; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lff;" ) - final class146 this$0; + final class148 this$0; @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "(Lff;)V" ) - class150(class146 var1) { + class150(class148 var1) { this.this$0 = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1360 = var1.readUnsignedByte() == 1; - this.field1362 = var1.readByte(); - this.field1363 = var1.readByte(); - this.field1364 = var1.readByte(); - this.field1361 = var1.readByte(); + this.field1338 = var1.readInt(); + this.field1341 = var1.readInt(); + this.field1340 = var1.readUnsignedByte(); + this.field1339 = var1.readUnsignedByte(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.allowGuests = this.field1360; - var1.field1383 = this.field1362; - var1.field1385 = this.field1363; - var1.field1384 = this.field1364; - var1.field1386 = this.field1361; + var1.method827(this.field1338, this.field1341, this.field1340, this.field1339); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IB)Lha;", + garbageValue = "84" + ) + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); + var1 = new VarpDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lul;Ljava/lang/String;I)I", + garbageValue = "-1376508948" + ) + public static int method785(Buffer var0, String var1) { + int var2 = var0.offset; + int var4 = var1.length(); + byte[] var5 = new byte[var4]; + + for (int var6 = 0; var6 < var4; ++var6) { + char var7 = var1.charAt(var6); + if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { + if (var7 == 8364) { + var5[var6] = -128; + } else if (var7 == 8218) { + var5[var6] = -126; + } else if (var7 == 402) { + var5[var6] = -125; + } else if (var7 == 8222) { + var5[var6] = -124; + } else if (var7 == 8230) { + var5[var6] = -123; + } else if (var7 == 8224) { + var5[var6] = -122; + } else if (var7 == 8225) { + var5[var6] = -121; + } else if (var7 == 710) { + var5[var6] = -120; + } else if (var7 == 8240) { + var5[var6] = -119; + } else if (var7 == 352) { + var5[var6] = -118; + } else if (var7 == 8249) { + var5[var6] = -117; + } else if (var7 == 338) { + var5[var6] = -116; + } else if (var7 == 381) { + var5[var6] = -114; + } else if (var7 == 8216) { + var5[var6] = -111; + } else if (var7 == 8217) { + var5[var6] = -110; + } else if (var7 == 8220) { + var5[var6] = -109; + } else if (var7 == 8221) { + var5[var6] = -108; + } else if (var7 == 8226) { + var5[var6] = -107; + } else if (var7 == 8211) { + var5[var6] = -106; + } else if (var7 == 8212) { + var5[var6] = -105; + } else if (var7 == 732) { + var5[var6] = -104; + } else if (var7 == 8482) { + var5[var6] = -103; + } else if (var7 == 353) { + var5[var6] = -102; + } else if (var7 == 8250) { + var5[var6] = -101; + } else if (var7 == 339) { + var5[var6] = -100; + } else if (var7 == 382) { + var5[var6] = -98; + } else if (var7 == 376) { + var5[var6] = -97; + } else { + var5[var6] = 63; + } + } else { + var5[var6] = (byte)var7; + } + } + + var0.writeSmartByteShort(var5.length); + var0.offset += class349.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); + return var0.offset - var2; + } + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "-1670051292" + ) + static int method789(int var0, Script var1, boolean var2) { + return 2; + } + + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-405650921" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = class115.getTileHeight(var0, var1, class87.Client_plane) - var2; + var0 -= Client.cameraX; + var3 -= class17.cameraY; + var1 -= WorldMapArea.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[class365.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[class365.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[WallDecoration.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[WallDecoration.cameraYaw]; + int var8 = var6 * var1 + var0 * var7 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var5 * var3 - var4 * var1 >> 16; + var1 = var3 * var4 + var5 * var1 >> 16; + if (var1 >= 50) { + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class151.java b/osrs/src/main/java/class151.java index 071084b9d..07b949827 100644 --- a/osrs/src/main/java/class151.java +++ b/osrs/src/main/java/class151.java @@ -2,390 +2,169 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") -public class class151 extends class159 { - @ObfuscatedName("bw") - static String field1365; - @ObfuscatedName("au") - int field1366; +@ObfuscatedName("fr") +public class class151 extends class161 { + @ObfuscatedName("ac") + int field1343; + @ObfuscatedName("al") + byte field1342; + @ObfuscatedName("ak") + int field1344; + @ObfuscatedName("ax") + String field1345; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lgf;" ) - final class160 this$0; + final class162 this$0; @ObfuscatedSignature( - descriptor = "(Lgg;)V" + descriptor = "(Lgf;)V" ) - class151(class160 var1) { + class151(class162 var1) { this.this$0 = var1; - this.field1366 = -1; + this.field1343 = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "1" + descriptor = "(Lul;B)V", + garbageValue = "0" ) @Export("vmethod3238") void vmethod3238(Buffer var1) { - this.field1366 = var1.readUnsignedShort(); - var1.readUnsignedByte(); - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); - } - + this.field1343 = var1.readUnsignedShort(); + this.field1342 = var1.readByte(); + this.field1344 = var1.readUnsignedShort(); + var1.readLong(); + this.field1345 = var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lgo;I)V", - garbageValue = "831405774" + descriptor = "(Lgb;B)V", + garbageValue = "0" ) @Export("vmethod3239") void vmethod3239(ClanChannel var1) { - var1.removeMember(this.field1366); + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1343); + var2.rank = this.field1342; + var2.world = this.field1344; + var2.username = new Username(this.field1345); } - @ObfuscatedName("kl") + @ObfuscatedName("jp") @ObfuscatedSignature( - descriptor = "(Lto;I)V", - garbageValue = "-619616137" + descriptor = "(ZLuy;B)V", + garbageValue = "43" ) - static final void method795(PacketBuffer var0) { - for (int var1 = 0; var1 < Client.field451; ++var1) { - int var2 = Client.field552[var1]; - NPC var3 = Client.npcs[var2]; - int var4 = var0.readUnsignedByte(); - int var5; - if ((var4 & 8) != 0) { - var5 = var0.readUnsignedByte(); - var4 += var5 << 8; + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; + int var2; + int var4; + int var5; + int var6; + int var7; + if (!Client.isInInstance) { + var2 = var1.readUnsignedShort(); + int var3 = var1.readUnsignedShortAdd(); + var4 = var1.readUnsignedShort(); + class178.xteaKeys = new int[var4][4]; + + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { + class178.xteaKeys[var5][var6] = var1.readInt(); + } } - if ((var4 & 2048) != 0) { - var5 = var0.readUnsignedByte(); - var4 += var5 << 16; + class152.regions = new int[var4]; + HorizontalAlignment.regionMapArchiveIds = new int[var4]; + WorldMapIcon_0.regionLandArchiveIds = new int[var4]; + class345.regionLandArchives = new byte[var4][]; + class201.regionMapArchives = new byte[var4][]; + var4 = 0; + + for (var5 = (var3 - 6) / 8; var5 <= (var3 + 6) / 8; ++var5) { + for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { + var7 = var6 + (var5 << 8); + class152.regions[var4] = var7; + HorizontalAlignment.regionMapArchiveIds[var4] = class198.archive9.getGroupId("m" + var5 + "_" + var6); + WorldMapIcon_0.regionLandArchiveIds[var4] = class198.archive9.getGroupId("l" + var5 + "_" + var6); + ++var4; + } } - int var6; - int var7; + MouseRecorder.method478(var3, var2, true); + } else { + var2 = var1.readUnsignedShortAddLE(); + boolean var15 = var1.readUnsignedByteNeg() == 1; + var4 = var1.readIntME(); + var5 = var1.readUnsignedShort(); + var1.importIndex(); + int var8; int var9; - int var10; - if ((var4 & 128) != 0) { - var5 = var0.readUnsignedByteNeg(); - int var11; - if (var5 > 0) { - for (var6 = 0; var6 < var5; ++var6) { - var8 = -1; - var9 = -1; - var10 = -1; - var7 = var0.readUShortSmart(); - if (var7 == 32767) { - var7 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var8 = var0.readUShortSmart(); - var10 = var0.readUShortSmart(); - } else if (var7 != 32766) { - var9 = var0.readUShortSmart(); - } else { - var7 = -1; - } - - var11 = var0.readUShortSmart(); - var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); - } - } - - var6 = var0.readUnsignedByteSub(); - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var11 = var0.readUnsignedByteNeg(); - int var12 = var9 > 0 ? var0.readUnsignedByteNeg() : var11; - var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = var1.readBits(1); + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); } else { - var3.removeHealthBar(var8); + Client.instanceChunkTemplates[var6][var7][var8] = -1; } } } } - int[] var13; - short[] var14; - short[] var15; - long var16; - boolean var19; - if ((var4 & 512) != 0) { - var5 = var0.readUnsignedByte(); - if ((var5 & 1) == 1) { - var3.method595(); - } else { - var13 = null; - if ((var5 & 2) == 2) { - var7 = var0.readUnsignedByteAdd(); - var13 = new int[var7]; - - for (var8 = 0; var8 < var7; ++var8) { - var9 = var0.method2587(); - var9 = var9 == 65535 ? -1 : var9; - var13[var8] = var9; - } - } - - var14 = null; - if ((var5 & 4) == 4) { - var8 = 0; - if (var3.definition.recolorTo != null) { - var8 = var3.definition.recolorTo.length; - } - - var14 = new short[var8]; - - for (var9 = 0; var9 < var8; ++var9) { - var14[var9] = (short)var0.readUnsignedShortLE(); - } - } - - var15 = null; - if ((var5 & 8) == 8) { - var9 = 0; - if (var3.definition.retextureTo != null) { - var9 = var3.definition.retextureTo.length; - } - - var15 = new short[var9]; - - for (var10 = 0; var10 < var9; ++var10) { - var15[var10] = (short)var0.readUnsignedShortLE(); - } - } - - var19 = false; - if ((var5 & 16) != 0) { - var19 = var0.readUnsignedByteSub() == 1; - } - - var16 = (long)(++NPC.field1074 - 1); - var3.method592(new NewShit(var16, var13, var14, var15, var19)); - } - } - - if ((var4 & 32) != 0) { - var5 = var0.readUnsignedShortLE(); - var6 = var0.readUnsignedShort(); - var3.field959 = var0.readUnsignedByteNeg() == 1; - if (Client.param25 >= 212) { - var3.field988 = var5; - var3.field989 = var6; - } else { - var7 = var3.x - (var5 - UrlRequester.baseX - UrlRequester.baseX) * 64; - var8 = var3.y - (var6 - class47.baseY - class47.baseY) * 64; - if (var7 != 0 || var8 != 0) { - var10 = (int)(Math.atan2((double)var7, (double)var8) * 325.94932345220167D) & 2047; - var3.movingOrientation = var10; - } - } - } - - if ((var4 & 64) != 0) { - var5 = var0.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var0.readUnsignedByteSub(); - if (var5 == var3.sequence && var5 != -1) { - var7 = EnumComposition.SequenceDefinition_get(var5).replyMode; - if (var7 == 1) { - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.currentSequenceFrameIndex = 0; - } - - if (var7 == 2) { - var3.currentSequenceFrameIndex = 0; - } - } else if (var5 == -1 || var3.sequence == -1 || EnumComposition.SequenceDefinition_get(var5).forcedPriority >= EnumComposition.SequenceDefinition_get(var3.sequence).forcedPriority) { - var3.sequence = var5; - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.currentSequenceFrameIndex = 0; - var3.field1022 = var3.pathLength; - } - } - - if ((var4 & 131072) != 0) { - var5 = var0.readUnsignedByteNeg(); - - for (var6 = 0; var6 < var5; ++var6) { - var7 = var0.readUnsignedByteSub(); - var8 = var0.method2587(); - var9 = var0.method2598(); - var3.updateSpotAnimation(var7, var8, var9 >> 16, var9 & 65535); - } - } - - if ((var4 & 4) != 0) { - var3.definition = class90.getNpcDefinition(var0.readUnsignedShort()); - ItemLayer.method1152(var3); - var3.method591(); - } - - if ((var4 & 16) != 0) { - var3.targetIndex = var0.readIntME(); - var3.targetIndex += var0.readUnsignedByteSub() << 16; - var5 = 16777215; - if (var5 == var3.targetIndex) { - var3.targetIndex = -1; - } - } - - if ((var4 & 4096) != 0) { - var3.field1004 = var0.readSignedByteSub(); - var3.field1001 = var0.readSignedByteSub(); - var3.field1002 = var0.readByteNeg(); - var3.field1014 = var0.readByteAdd(); - var3.spotAnimation = var0.readIntME() + Client.cycle; - var3.exactMoveArrive1Cycle = var0.readUnsignedShort() + Client.cycle; - var3.exactMoveDirection = var0.method2587(); - var3.pathLength = 1; - var3.field1022 = 0; - var3.field1004 += var3.pathX[0]; - var3.field1001 += var3.pathY[0]; - var3.field1002 += var3.pathX[0]; - var3.field1014 += var3.pathY[0]; - } - - if ((var4 & 65536) != 0) { - var5 = var0.readIntIME(); - var3.turnLeftSequence = (var5 & 1) != 0 ? var0.method2587() : var3.definition.turnLeftSequence * -1670226789 * 1686120851; - var3.turnRightSequence = (var5 & 2) != 0 ? var0.readUnsignedShortLE() : var3.definition.turnRightSequence * -1405323159 * 821598169; - var3.walkSequence = (var5 & 4) != 0 ? var0.readIntME() : var3.definition.walkSequence * 636917019 * 934984979; - var3.walkBackSequence = (var5 & 8) != 0 ? var0.method2587() : var3.definition.walkBackSequence * 129510829 * 1271381541; - var3.walkLeftSequence = (var5 & 16) != 0 ? var0.readUnsignedShortLE() : var3.definition.walkLeftSequence * 799501513 * -1909691015; - var3.walkRightSequence = (var5 & 32) != 0 ? var0.readUnsignedShortLE() : var3.definition.walkRightSequence * 1831978023 * 749693847; - var3.runSequence = (var5 & 64) != 0 ? var0.method2587() : var3.definition.runSequence * -1380991387 * -725499027; - var3.runBackSequence = (var5 & 128) != 0 ? var0.method2587() : var3.definition.runBackSequence * -797891459 * 1726248149; - var3.runLeftSequence = (var5 & 256) != 0 ? var0.readIntME() : var3.definition.runLeftSequence * -1089844195 * 1675023925; - var3.runRightSequence = (var5 & 512) != 0 ? var0.method2587() : var3.definition.runRightSequence * -581873653 * -1635337309; - var3.crawlSequence = (var5 & 1024) != 0 ? var0.readIntME() : var3.definition.crawlSequence * 1002809145 * -448850167; - var3.crawlBackSequence = (var5 & 2048) != 0 ? var0.method2587() : var3.definition.crawlBackSequence * -1708442501 * -2089336141; - var3.crawlLeftSequence = (var5 & 4096) != 0 ? var0.readIntME() : var3.definition.crawlLeftSequence * 2098030227 * -1815894117; - var3.crawlRightSequence = (var5 & 8192) != 0 ? var0.readUnsignedShortLE() : var3.definition.crawlRightSequence * 1404008677 * -1427405587; - var3.idleSequence = (var5 & 16384) != 0 ? var0.readIntME() : var3.definition.idleSequence * 403001363 * 260766235; - } - - if ((var4 & 262144) != 0) { - var5 = var0.readUnsignedByte(); - var13 = new int[8]; - var14 = new short[8]; + var1.exportIndex(); + class178.xteaKeys = new int[var5][4]; - for (var8 = 0; var8 < 8; ++var8) { - if ((var5 & 1 << var8) != 0) { - var13[var8] = var0.method2563(); - var14[var8] = (short)var0.method2560(); - } else { - var13[var8] = -1; - var14[var8] = -1; - } + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + class178.xteaKeys[var6][var7] = var1.readInt(); } - - var3.method590(var13, var14); - } - - if ((var4 & 32768) != 0) { - var3.method577(var0.readStringCp1252NullTerminated()); - } - - if ((var4 & 2) != 0) { - var0.readUnsignedShort(); - var0.readInt(); - } - - if ((var4 & 1) != 0) { - var3.overheadText = var0.readStringCp1252NullTerminated(); - var3.overheadTextCyclesRemaining = 100; } - if ((var4 & 8192) != 0) { - var3.recolourStartCycle = Client.cycle + var0.readUnsignedShort(); - var3.recolourEndCycle = Client.cycle + var0.readUnsignedShort(); - var3.recolourHue = var0.readByteNeg(); - var3.recolourSaturation = var0.readByteNeg(); - var3.recolourLuminance = var0.readByteNeg(); - var3.recolourAmount = (byte)var0.readUnsignedByte(); - } - - if ((var4 & 256) != 0) { - var5 = var0.readUnsignedByteAdd(); - if ((var5 & 1) == 1) { - var3.method596(); - } else { - var13 = null; - if ((var5 & 2) == 2) { - var7 = var0.readUnsignedByteAdd(); - var13 = new int[var7]; - - for (var8 = 0; var8 < var7; ++var8) { - var9 = var0.readUnsignedShortLE(); - var9 = var9 == 65535 ? -1 : var9; - var13[var8] = var9; + class152.regions = new int[var5]; + HorizontalAlignment.regionMapArchiveIds = new int[var5]; + WorldMapIcon_0.regionLandArchiveIds = new int[var5]; + class345.regionLandArchives = new byte[var5][]; + class201.regionMapArchives = new byte[var5][]; + var5 = 0; + + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = Client.instanceChunkTemplates[var6][var7][var8]; + if (var9 != -1) { + int var10 = var9 >> 14 & 1023; + int var11 = var9 >> 3 & 2047; + int var12 = (var10 / 8 << 8) + var11 / 8; + + int var13; + for (var13 = 0; var13 < var5; ++var13) { + if (class152.regions[var13] == var12) { + var12 = -1; + break; + } + } + + if (var12 != -1) { + class152.regions[var5] = var12; + var13 = var12 >> 8 & 255; + int var14 = var12 & 255; + HorizontalAlignment.regionMapArchiveIds[var5] = class198.archive9.getGroupId("m" + var13 + "_" + var14); + WorldMapIcon_0.regionLandArchiveIds[var5] = class198.archive9.getGroupId("l" + var13 + "_" + var14); + ++var5; + } } } - - var14 = null; - if ((var5 & 4) == 4) { - var8 = 0; - if (var3.definition.recolorTo != null) { - var8 = var3.definition.recolorTo.length; - } - - var14 = new short[var8]; - - for (var9 = 0; var9 < var8; ++var9) { - var14[var9] = (short)var0.readUnsignedShortLE(); - } - } - - var15 = null; - if ((var5 & 8) == 8) { - var9 = 0; - if (var3.definition.retextureTo != null) { - var9 = var3.definition.retextureTo.length; - } - - var15 = new short[var9]; - - for (var10 = 0; var10 < var9; ++var10) { - var15[var10] = (short)var0.readIntME(); - } - } - - var19 = false; - if ((var5 & 16) != 0) { - var19 = var0.readUnsignedByteSub() == 1; - } - - var16 = (long)(++NPC.field1075 - 1); - var3.method594(new NewShit(var16, var13, var14, var15, var19)); } } - if ((var4 & 16384) != 0) { - var3.method579(var0.readUnsignedByteAdd()); - } - - if ((var4 & 1024) != 0) { - var3.combatLevelChange = var0.readInt(); - } + MouseRecorder.method478(var4, var2, !var15); } } diff --git a/osrs/src/main/java/class152.java b/osrs/src/main/java/class152.java index 6c93fe413..d9286cc63 100644 --- a/osrs/src/main/java/class152.java +++ b/osrs/src/main/java/class152.java @@ -2,178 +2,59 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") -public class class152 extends class143 { +@ObfuscatedName("fq") +public class class152 extends class145 { + @ObfuscatedName("jq") + @Export("regions") + static int[] regions; @ObfuscatedName("ac") - @Export("SpriteBuffer_yOffsets") - static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("kd") - @ObfuscatedSignature( - descriptor = "[Lui;" - ) - @Export("crossSprites") - static SpritePixels[] crossSprites; - @ObfuscatedName("au") - String field1369; + boolean field1347; + @ObfuscatedName("al") + byte field1349; + @ObfuscatedName("ak") + byte field1348; + @ObfuscatedName("ax") + byte field1351; + @ObfuscatedName("ao") + byte field1350; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lff;" ) - final class146 this$0; + final class148 this$0; @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "(Lff;)V" ) - class152(class146 var1) { + class152(class148 var1) { this.this$0 = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1369 = var1.readStringCp1252NullTerminated(); - var1.readInt(); + this.field1347 = var1.readUnsignedByte() == 1; + this.field1349 = var1.readByte(); + this.field1348 = var1.readByte(); + this.field1351 = var1.readByte(); + this.field1350 = var1.readByte(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.name = this.field1369; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;I)V", - garbageValue = "185699180" - ) - public static void method796(AbstractArchive var0, AbstractArchive var1) { - HealthBarDefinition.HealthBarDefinition_archive = var0; - class422.field3769 = var1; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IIILhv;II)V", - garbageValue = "1173683624" - ) - static void method797(int var0, int var1, int var2, ObjectComposition var3, int var4) { - ObjectSound var5 = new ObjectSound(); - var5.plane = var0; - var5.x = var1 * 128; - var5.y = var2 * 128; - int var6 = var3.sizeX; - int var7 = var3.sizeY; - if (var4 == 1 || var4 == 3) { - var6 = var3.sizeY; - var7 = var3.sizeX; - } - - var5.maxX = (var6 + var1) * 128; - var5.maxY = (var7 + var2) * 128; - var5.soundEffectId = var3.ambientSoundId; - var5.field702 = var3.int7 * 128; - var5.field696 = var3.int5; - var5.field694 = var3.int6; - var5.soundEffectIds = var3.soundEffectIds; - if (var3.transforms != null) { - var5.obj = var3; - var5.set(); - } - - ObjectSound.objectSounds.addFirst(var5); - if (var5.soundEffectIds != null) { - var5.field698 = var5.field696 + (int)(Math.random() * (double)(var5.field694 - var5.field696)); - } - - } - - @ObfuscatedName("mo") - @ObfuscatedSignature( - descriptor = "([Lmi;II)V", - garbageValue = "-73715708" - ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class143.isComponentHidden(var3))) { - int var5; - if (var3.type == 0) { - if (!var3.isIf3 && class143.isComponentHidden(var3) && var3 != class146.mousedOverWidgetIf1) { - continue; - } - - drawModelComponents(var0, var3.id); - if (var3.children != null) { - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - var5 = var4.group; - if (ModeWhere.loadInterface(var5)) { - drawModelComponents(PacketBufferNode.Widget_interfaceComponents[var5], -1); - } - } - } - - if (var3.type == 6) { - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var8 = class27.runCs1(var3); - if (var8) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } - - if (var5 != -1) { - SequenceDefinition var6 = EnumComposition.SequenceDefinition_get(var5); - if (!var6.isCachedModelIdSet()) { - for (var3.modelFrameCycle += Client.field457; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class218.invalidateWidget(var3)) { - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; - ++var3.modelFrame; - if (var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame = 0; - } - } - } - } else { - var3.modelFrame += Client.field457; - int var7 = var6.method1085(); - if (var3.modelFrame >= var7) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var7) { - var3.modelFrame = 0; - } - } - - class218.invalidateWidget(var3); - } - } - } - - if (var3.rotationKey != 0 && !var3.isIf3) { - int var9 = var3.rotationKey >> 16; - var5 = var3.rotationKey << 16 >> 16; - var9 *= Client.field457; - var5 *= Client.field457; - var3.modelAngleX = var9 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - class218.invalidateWidget(var3); - } - } - } - } - + var1.allowGuests = this.field1347; + var1.field1371 = this.field1349; + var1.field1372 = this.field1348; + var1.field1370 = this.field1351; + var1.field1369 = this.field1350; } } \ No newline at end of file diff --git a/osrs/src/main/java/class153.java b/osrs/src/main/java/class153.java index b720ba5c9..8050e2a04 100644 --- a/osrs/src/main/java/class153.java +++ b/osrs/src/main/java/class153.java @@ -2,101 +2,100 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") -public class class153 extends class143 { - @ObfuscatedName("au") - int field1370; - @ObfuscatedName("ae") - String field1371; +@ObfuscatedName("fp") +public class class153 extends class161 { + @ObfuscatedName("cy") + static int field1352; + @ObfuscatedName("ac") + int field1353; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lgf;" ) - final class146 this$0; + final class162 this$0; @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "(Lgf;)V" ) - class153(class146 var1) { + class153(class162 var1) { this.this$0 = var1; + this.field1353 = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(Lul;B)V", + garbageValue = "0" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1370 = var1.readInt(); - this.field1371 = var1.readStringCp1252NullTerminated(); + @Export("vmethod3238") + void vmethod3238(Buffer var1) { + this.field1353 = var1.readUnsignedShort(); + var1.readUnsignedByte(); + if (var1.readUnsignedByte() != 255) { + --var1.offset; + var1.readLong(); + } + } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(Lgb;B)V", + garbageValue = "0" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method824(this.field1370, this.field1371); + @Export("vmethod3239") + void vmethod3239(ClanChannel var1) { + var1.removeMember(this.field1353); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1017445786" + descriptor = "(IIIIIIB)I", + garbageValue = "125" ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; - int[] var3 = new int[4]; - var2[0] = var0; - var3[0] = var1; - int var4 = 1; - - for (int var5 = 0; var5 < 4; ++var5) { - if (World.World_sortOption1[var5] != var0) { - var2[var4] = World.World_sortOption1[var5]; - var3[var4] = World.World_sortOption2[var5]; - ++var4; - } + public static int method796(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { + int var6 = var3; + var3 = var4; + var4 = var6; } - World.World_sortOption1 = var2; - World.World_sortOption2 = var3; - GameEngine.sortWorlds(class176.World_worlds, 0, class176.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + var2 &= 3; + if (var2 == 0) { + return var0; + } else if (var2 == 1) { + return var1; + } else { + return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); + } } - @ObfuscatedName("ap") + @ObfuscatedName("gr") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "17" + descriptor = "(I)Ltu;", + garbageValue = "-496192767" ) - public static void method802() { - KitDefinition.KitDefinition_cached.clear(); + @Export("getWorldMap") + static WorldMap getWorldMap() { + return class434.worldMap; } - @ObfuscatedName("jf") + @ObfuscatedName("iz") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1977866275" + descriptor = "(IB)I", + garbageValue = "107" ) - static final void method805(int var0, int var1, int var2, int var3) { - Client.field486 = 0; - int var4 = (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX; - int var5 = (VarbitComposition.localPlayer.y >> 7) + class47.baseY; - if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { - Client.field486 = 1; - } - - if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { - Client.field486 = 1; - } - - if (Client.field486 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { - Client.field486 = 0; - } + static final int method800(int var0) { + return Math.min(Math.max(var0, 128), 383); + } + @ObfuscatedName("lc") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "1681206525" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + class208.insertMenuItem(var0, var1, var2, var3, var4, var5, -1, false); } } \ No newline at end of file diff --git a/osrs/src/main/java/class154.java b/osrs/src/main/java/class154.java new file mode 100644 index 000000000..384444807 --- /dev/null +++ b/osrs/src/main/java/class154.java @@ -0,0 +1,61 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fu") +public class class154 extends class145 { + @ObfuscatedName("ac") + String field1354; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lff;" + ) + final class148 this$0; + + @ObfuscatedSignature( + descriptor = "(Lff;)V" + ) + class154(class148 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lul;I)V", + garbageValue = "-11659242" + ) + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1354 = var1.readStringCp1252NullTerminated(); + var1.readInt(); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lgi;I)V", + garbageValue = "21847466" + ) + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.name = this.field1354; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "21538" + ) + public static void method802() { + VarcInt.VarcInt_cached.clear(); + } + + @ObfuscatedName("mr") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "354037944" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class155.java b/osrs/src/main/java/class155.java index 48d6c49f7..3ae7431bb 100644 --- a/osrs/src/main/java/class155.java +++ b/osrs/src/main/java/class155.java @@ -2,93 +2,76 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fa") -public class class155 extends class159 { - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - @Export("Widget_fontsArchive") - public static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("au") - String field1400; - @ObfuscatedName("ae") - int field1399; - @ObfuscatedName("ao") - byte field1398; +@ObfuscatedName("fx") +public class class155 extends class145 { + @ObfuscatedName("go") + static String field1355; + @ObfuscatedName("ac") + int field1356; + @ObfuscatedName("al") + String field1357; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lff;" ) - final class160 this$0; + final class148 this$0; @ObfuscatedSignature( - descriptor = "(Lgg;)V" + descriptor = "(Lff;)V" ) - class155(class160 var1) { + class155(class148 var1) { this.this$0 = var1; - this.field1400 = null; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "1" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) - @Export("vmethod3238") - void vmethod3238(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); - } - - this.field1400 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1399 = var1.readUnsignedShort(); - this.field1398 = var1.readByte(); - var1.readLong(); + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1356 = var1.readInt(); + this.field1357 = var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lgo;I)V", - garbageValue = "831405774" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) - @Export("vmethod3239") - void vmethod3239(ClanChannel var1) { - ClanChannelMember var2 = new ClanChannelMember(); - var2.username = new Username(this.field1400); - var2.world = this.field1399; - var2.rank = this.field1398; - var1.addMember(var2); + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method830(this.field1356, this.field1357); } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ltm;IB)Ljava/lang/String;", - garbageValue = "-80" + descriptor = "(IB)V", + garbageValue = "32" ) - static String method826(Buffer var0, int var1) { - try { - int var2 = var0.readUShortSmart(); - if (var2 > var1) { - var2 = var1; + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + for (int var2 = 0; var2 < var1.ids.length; ++var2) { + var1.ids[var2] = -1; + var1.quantities[var2] = 0; } - byte[] var3 = new byte[var2]; - var0.offset += class334.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = class325.decodeStringCp1252(var3, 0, var2); - return var4; - } catch (Exception var6) { - return "Cabbage"; } } - @ObfuscatedName("bu") + @ObfuscatedName("oq") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-692209680" + descriptor = "(Lnm;I)Ljava/lang/String;", + garbageValue = "-1055476214" ) - static int method829(int var0) { - return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var0)) == 0) { + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class156.java b/osrs/src/main/java/class156.java deleted file mode 100644 index 67462428b..000000000 --- a/osrs/src/main/java/class156.java +++ /dev/null @@ -1,60 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gu") -public class class156 extends class159 { - @ObfuscatedName("wl") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("au") - int field1404; - @ObfuscatedName("ae") - byte field1402; - @ObfuscatedName("ao") - int field1403; - @ObfuscatedName("at") - String field1405; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - final class160 this$0; - - @ObfuscatedSignature( - descriptor = "(Lgg;)V" - ) - class156(class160 var1) { - this.this$0 = var1; - this.field1404 = -1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "1" - ) - @Export("vmethod3238") - void vmethod3238(Buffer var1) { - var1.readUnsignedByte(); - this.field1404 = var1.readUnsignedShort(); - this.field1402 = var1.readByte(); - this.field1403 = var1.readUnsignedShort(); - var1.readLong(); - this.field1405 = var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lgo;I)V", - garbageValue = "831405774" - ) - @Export("vmethod3239") - void vmethod3239(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1404); - var2.rank = this.field1402; - var2.world = this.field1403; - var2.username = new Username(this.field1405); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class157.java b/osrs/src/main/java/class157.java index 353b1eaf3..7cf5b21fa 100644 --- a/osrs/src/main/java/class157.java +++ b/osrs/src/main/java/class157.java @@ -2,122 +2,63 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; - -@ObfuscatedName("gc") -public class class157 extends class143 { - @ObfuscatedName("gt") - static String field1407; - @ObfuscatedName("iz") - static int field1406; - @ObfuscatedName("au") - int field1408; - // $FF: synthetic field +@ObfuscatedName("ge") +public class class157 extends class161 { + @ObfuscatedName("kb") @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "[Lud;" ) - final class146 this$0; - - @ObfuscatedSignature( - descriptor = "(Lfn;)V" - ) - class157(class146 var1) { - this.this$0 = var1; - this.field1408 = -1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" - ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1408 = var1.readUnsignedShort(); - } - - @ObfuscatedName("ae") + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; + @ObfuscatedName("ac") + String field1386; + @ObfuscatedName("al") + int field1385; + @ObfuscatedName("ak") + byte field1384; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "Lgf;" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method816(this.field1408); - } + final class162 this$0; - @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(CS)Z", - garbageValue = "255" + descriptor = "(Lgf;)V" ) - static boolean method835(char var0) { - return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; + class157(class162 var1) { + this.this$0 = var1; + this.field1386 = null; } - @ObfuscatedName("al") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-858591877" + descriptor = "(Lul;B)V", + garbageValue = "0" ) - public static String method832(String var0) { - StringBuilder var1 = new StringBuilder(var0.length()); - int var2 = 0; - int var3 = -1; - - for (int var4 = 0; var4 < var0.length(); ++var4) { - char var5 = var0.charAt(var4); - if (var5 == '<') { - var1.append(var0.substring(var2, var4)); - var3 = var4; - } else if (var5 == '>' && var3 != -1) { - String var6 = var0.substring(var3 + 1, var4); - var3 = -1; - if (var6.equals("lt")) { - var1.append("<"); - } else if (var6.equals("gt")) { - var1.append(">"); - } else if (var6.equals("br")) { - var1.append("\n"); - } - - var2 = var4 + 1; - } + @Export("vmethod3238") + void vmethod3238(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + var1.readLong(); } - if (var2 < var0.length()) { - var1.append(var0.substring(var2, var0.length())); - } - - return var1.toString(); + this.field1386 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1385 = var1.readUnsignedShort(); + this.field1384 = var1.readByte(); + var1.readLong(); } - @ObfuscatedName("is") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljava/util/ArrayList;IIIIB)V", - garbageValue = "6" + descriptor = "(Lgb;B)V", + garbageValue = "0" ) - static void method836(ArrayList var0, int var1, int var2, int var3, int var4) { - if (!var0.isEmpty()) { - int var5 = (Integer)var0.get(0); - if (var5 == -1 && !Client.playingJingle) { - Script.method445(0, 0); - } else if (var5 != -1 && !class172.method906(var5) && class449.clientPreferences.getCurrentMusicVolume() != 0) { - ArrayList var6 = new ArrayList(); - - for (int var7 = 0; var7 < var0.size(); ++var7) { - var6.add(new MusicSong(class385.archive6, (Integer)var0.get(var7), 0, class449.clientPreferences.getCurrentMusicVolume(), false)); - } - - if (Client.playingJingle) { - class305.field2773.clear(); - class305.field2773.addAll(var6); - class270.method1537(var1, var2, var3, var4); - } else { - class53.method291(var6, var1, var2, var3, var4, false); - } - } - - } + @Export("vmethod3239") + void vmethod3239(ClanChannel var1) { + ClanChannelMember var2 = new ClanChannelMember(); + var2.username = new Username(this.field1386); + var2.world = this.field1385; + var2.rank = this.field1384; + var1.addMember(var2); } } \ No newline at end of file diff --git a/osrs/src/main/java/class158.java b/osrs/src/main/java/class158.java index a20608553..4b784a972 100644 --- a/osrs/src/main/java/class158.java +++ b/osrs/src/main/java/class158.java @@ -2,53 +2,573 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") -public class class158 extends class143 { - @ObfuscatedName("au") - long field1411; - @ObfuscatedName("ae") - String field1410; - @ObfuscatedName("ao") - int field1409; +@ObfuscatedName("gj") +public class class158 extends class161 { + @ObfuscatedName("am") + static int[][] field1387; + @ObfuscatedName("ac") + int field1389; + @ObfuscatedName("al") + byte field1388; + @ObfuscatedName("ak") + int field1390; + @ObfuscatedName("ax") + String field1391; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lgf;" ) - final class146 this$0; + final class162 this$0; @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "(Lgf;)V" ) - class158(class146 var1) { + class158(class162 var1) { this.this$0 = var1; - this.field1411 = -1L; - this.field1410 = null; - this.field1409 = 0; + this.field1389 = -1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(Lul;B)V", + garbageValue = "0" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1411 = var1.readLong(); + @Export("vmethod3238") + void vmethod3238(Buffer var1) { + var1.readUnsignedByte(); + this.field1389 = var1.readUnsignedShort(); + this.field1388 = var1.readByte(); + this.field1390 = var1.readUnsignedShort(); + var1.readLong(); + this.field1391 = var1.readStringCp1252NullTerminated(); + var1.readUnsignedByte(); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lgb;B)V", + garbageValue = "0" + ) + @Export("vmethod3239") + void vmethod3239(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1389); + var2.rank = this.field1388; + var2.world = this.field1390; + var2.username = new Username(this.field1391); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Ldl;Lds;III)V", + garbageValue = "-1880567886" + ) + @Export("runScriptLogic") + static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { + Object[] var4 = var0.args; + Interpreter.Interpreter_intStackSize = 0; + class180.Interpreter_stringStackSize = 0; + int var5 = -1; + int[] var6 = var1.opcodes; + int[] var7 = var1.intOperands; + byte var8 = -1; + Interpreter.Interpreter_frameDepth = 0; + Interpreter.field701 = false; + boolean var9 = false; + int var10 = 0; + boolean var29 = false; + + label860: { + label861: { + try { + int var13; + try { + var29 = true; + Interpreter.Interpreter_intLocals = new int[var1.localIntCount]; + int var11 = 0; + class160.Interpreter_stringLocals = new String[var1.localStringCount]; + int var12 = 0; + + int var14; + String var20; + for (var13 = 1; var13 < var4.length; ++var13) { + if (var4[var13] instanceof Integer) { + var14 = (Integer)var4[var13]; + if (var14 == -2147483647) { + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { + var14 = var0.widget != null ? var0.widget.id * 41171959 * -749799993 : -1; + } + + if (var14 == -2147483644) { + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { + var14 = var0.widget != null ? var0.widget.childIndex * 125148757 * 1641180925 : -1; + } + + if (var14 == -2147483642) { + var14 = var0.dragTarget != null ? var0.dragTarget.id * 41171959 * -749799993 : -1; + } + + if (var14 == -2147483641) { + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 125148757 * 1641180925 : -1; + } + + if (var14 == -2147483640) { + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { + var14 = var0.keyPressed; + } + + Interpreter.Interpreter_intLocals[var11++] = var14; + } else if (var4[var13] instanceof String) { + var20 = (String)var4[var13]; + if (var20.equals("event_opbase")) { + var20 = var0.targetName; + } + + class160.Interpreter_stringLocals[var12++] = var20; + } + } + + Interpreter.field706 = var0.field864; + + label841: + while (true) { + ++var10; + if (var10 > var2) { + throw new RuntimeException(); + } + + ++var5; + int var32 = var6[var5]; + if (var32 >= 100) { + boolean var34; + if (var1.intOperands[var5] == 1) { + var34 = true; + } else { + var34 = false; + } + + var14 = ViewportMouse.method1389(var32, var1, var34); + switch(var14) { + case 0: + var29 = false; + break label841; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); + } + } else if (var32 == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7[var5]; + } else if (var32 == 1) { + var13 = var7[var5]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; + } else if (var32 == 2) { + var13 = var7[var5]; + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ScriptEvent.changeGameOptions(var13); + } else if (var32 == 3) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var1.stringOperands[var5]; + } else if (var32 == 6) { + var5 += var7[var5]; + } else if (var32 == 7) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 8) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 9) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 10) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 21) { + if (Interpreter.Interpreter_frameDepth == 0) { + var29 = false; + break label861; + } + + ScriptFrame var39 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; + var1 = var39.script; + var6 = var1.opcodes; + var7 = var1.intOperands; + var5 = var39.pc; + Interpreter.Interpreter_intLocals = var39.intLocals; + class160.Interpreter_stringLocals = var39.stringLocals; + } else if (var32 == 25) { + var13 = var7[var5]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class36.getVarbit(var13); + } else if (var32 == 27) { + var13 = var7[var5]; + class130.method704(var13, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else if (var32 == 31) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 32) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 33) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var7[var5]]; + } else if (var32 == 34) { + Interpreter.Interpreter_intLocals[var7[var5]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + } else if (var32 == 35) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class160.Interpreter_stringLocals[var7[var5]]; + } else if (var32 == 36) { + class160.Interpreter_stringLocals[var7[var5]] = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + } else if (var32 == 37) { + var13 = var7[var5]; + class180.Interpreter_stringStackSize -= var13; + var20 = class316.method1656(Interpreter.Interpreter_stringStack, class180.Interpreter_stringStackSize, var13); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var20; + } else if (var32 == 38) { + --Interpreter.Interpreter_intStackSize; + } else if (var32 == 39) { + --class180.Interpreter_stringStackSize; + } else { + int var17; + if (var32 != 40) { + if (var32 == 42) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class33.varcs.getInt(var7[var5]); + } else if (var32 == 43) { + class33.varcs.setInt(var7[var5], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else if (var32 == 44) { + var13 = var7[var5] >> 16; + var14 = var7[var5] & 65535; + int var23 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var23 < 0 || var23 > 5000) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrayLengths[var13] = var23; + byte var24 = -1; + if (var14 == 105) { + var24 = 0; + } + + for (var17 = 0; var17 < var23; ++var17) { + Interpreter.Interpreter_arrays[var13][var17] = var24; + } + } else if (var32 == 45) { + var13 = var7[var5]; + var14 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; + } else if (var32 == 46) { + var13 = var7[var5]; + Interpreter.Interpreter_intStackSize -= 2; + var14 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + } else { + String var21; + if (var32 == 47) { + var21 = class33.varcs.getStringOld(var7[var5]); + if (var21 == null) { + var21 = "null"; + } + + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var21; + } else if (var32 == 48) { + class33.varcs.setStringOld(var7[var5], Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]); + } else if (var32 == 49) { + var21 = class33.varcs.getString(var7[var5]); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var21; + } else if (var32 == 50) { + class33.varcs.setString(var7[var5], Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]); + } else if (var32 == 60) { + IterableNodeHashTable var37 = var1.switches[var7[var5]]; + IntegerNode var36 = (IntegerNode)var37.get((long)Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var36 != null) { + var5 += var36.integer; + } + } else { + Integer var38; + if (var32 == 74) { + var38 = class295.field2496.getTitleGroupValue(var7[var5]); + if (var38 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var38; + } + } else { + if (var32 != 76) { + throw new IllegalStateException(); + } + + var38 = SequenceDefinition.varclan.method2358(var7[var5]); + if (var38 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var38; + } + } + } + } + } else { + var13 = var7[var5]; + Script var35 = class28.getScript(var13); + int[] var15 = new int[var35.localIntCount]; + String[] var16 = new String[var35.localStringCount]; + + for (var17 = 0; var17 < var35.intArgumentCount; ++var17) { + var15[var17] = Interpreter.Interpreter_intStack[var17 + (Interpreter.Interpreter_intStackSize - var35.intArgumentCount)]; + } + + for (var17 = 0; var17 < var35.stringArgumentCount; ++var17) { + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class180.Interpreter_stringStackSize - var35.stringArgumentCount)]; + } + + Interpreter.Interpreter_intStackSize -= var35.intArgumentCount; + class180.Interpreter_stringStackSize -= var35.stringArgumentCount; + ScriptFrame var22 = new ScriptFrame(); + var22.script = var1; + var22.pc = var5; + var22.intLocals = Interpreter.Interpreter_intLocals; + var22.stringLocals = class160.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; + var1 = var35; + var6 = var35.opcodes; + var7 = var35.intOperands; + var5 = -1; + Interpreter.Interpreter_intLocals = var15; + class160.Interpreter_stringLocals = var16; + } + } + } + } catch (Exception var30) { + var9 = true; + StringBuilder var26 = new StringBuilder(30); + var26.append("").append(var1.key).append(" "); + + for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { + var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + } + + var26.append("").append(var8); + class190.RunException_sendStackTrace(var26.toString(), var30); + var29 = false; + break label860; + } + } finally { + if (var29) { + while (Interpreter.field713.size() > 0) { + class104 var19 = (class104)Interpreter.field713.remove(0); + TextureProvider.widgetDefaultMenuAction(var19.method600(), var19.method601(), var19.method602(), var19.method603(), ""); + } + + if (Interpreter.field701) { + Interpreter.field701 = false; + GrandExchangeOfferOwnWorldComparator.method351(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + class190.RunException_sendStackTrace("Warning: Script " + var1.field820 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + } + } + + while (Interpreter.field713.size() > 0) { + class104 var33 = (class104)Interpreter.field713.remove(0); + TextureProvider.widgetDefaultMenuAction(var33.method600(), var33.method601(), var33.method602(), var33.method603(), ""); + } + + if (Interpreter.field701) { + Interpreter.field701 = false; + GrandExchangeOfferOwnWorldComparator.method351(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + class190.RunException_sendStackTrace("Warning: Script " + var1.field820 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + return; + } + + while (Interpreter.field713.size() > 0) { + class104 var40 = (class104)Interpreter.field713.remove(0); + TextureProvider.widgetDefaultMenuAction(var40.method600(), var40.method601(), var40.method602(), var40.method603(), ""); + } + + if (Interpreter.field701) { + Interpreter.field701 = false; + GrandExchangeOfferOwnWorldComparator.method351(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + class190.RunException_sendStackTrace("Warning: Script " + var1.field820 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + return; + } + + while (Interpreter.field713.size() > 0) { + class104 var25 = (class104)Interpreter.field713.remove(0); + TextureProvider.widgetDefaultMenuAction(var25.method600(), var25.method601(), var25.method602(), var25.method603(), ""); + } + + if (Interpreter.field701) { + Interpreter.field701 = false; + GrandExchangeOfferOwnWorldComparator.method351(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + class190.RunException_sendStackTrace("Warning: Script " + var1.field820 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); } - this.field1410 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1409 = var1.readUnsignedShort(); } - @ObfuscatedName("ae") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(IIIIIZI)Lud;", + garbageValue = "2006480609" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method812(this.field1411, this.field1410, this.field1409); + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { + var4 = 0; + } else if (var4 == 2 && var1 != 1) { + var4 = 1; + } + + long var6 = ((long)var4 << 40) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var3 << 42); + SpritePixels var8; + if (!var5) { + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { + return var8; + } + } + + ItemComposition var9 = class214.ItemDefinition_get(var0); + if (var1 > 1 && var9.countobj != null) { + int var10 = -1; + + for (int var11 = 0; var11 < 10; ++var11) { + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { + var9 = class214.ItemDefinition_get(var10); + } + } + + Model var20 = var9.getModel(1); + if (var20 == null) { + return null; + } else { + SpritePixels var21 = null; + if (var9.noteTemplate != -1) { + var21 = getItemSprite(var9.note, 10, 1, 0, 0, true); + if (var21 == null) { + return null; + } + } else if (var9.notedId != -1) { + var21 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + if (var21 == null) { + return null; + } + } else if (var9.placeholderTemplate != -1) { + var21 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + if (var21 == null) { + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; + int var13 = Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_height; + float[] var15 = Rasterizer2D.field4244; + int[] var16 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var16); + var8 = new SpritePixels(36, 32); + Rasterizer3D.method1247(var8.pixels, 36, 32, (float[])null); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.method1248(); + Rasterizer3D.method1251(16, 16); + Rasterizer3D.clips.field2289 = false; + if (var9.placeholderTemplate != -1) { + var21.drawTransBgAt(0, 0); + } + + int var17 = var9.zoom2d; + if (var5) { + var17 = (int)(1.5D * (double)var17); + } else if (var2 == 2) { + var17 = (int)(1.04D * (double)var17); + } + + int var18 = var17 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; + int var19 = var17 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; + var20.calculateBoundsCylinder(); + var20.method1379(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var20.height / 2 + var18 + var9.offsetY2d, var19 + var9.offsetY2d); + if (var9.notedId != -1) { + var21.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { + var8.outline(1); + } + + if (var2 >= 2) { + var8.outline(16777215); + } + + if (var3 != 0) { + var8.shadow(var3); + } + + Rasterizer3D.method1247(var8.pixels, 36, 32, (float[])null); + if (var9.noteTemplate != -1) { + var21.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + class142.ItemDefinition_fontPlain11.draw(class481.method2388(var1), 0, 9, 16776960, 1); + } + + if (!var5) { + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer3D.method1247(var12, var13, var14, var15); + Rasterizer2D.Rasterizer2D_setClipArray(var16); + Rasterizer3D.method1248(); + Rasterizer3D.clips.field2289 = true; + return var8; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class159.java b/osrs/src/main/java/class159.java index 25c7b94bf..01b49a7da 100644 --- a/osrs/src/main/java/class159.java +++ b/osrs/src/main/java/class159.java @@ -2,73 +2,95 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") -public abstract class class159 extends Node { - @ObfuscatedName("qw") - @Export("widgetDragDuration") - static int widgetDragDuration; +import java.text.ParseException; +import java.util.Date; - class159() { - } - - @ObfuscatedName("au") +@ObfuscatedName("gl") +public class class159 extends class145 { + @ObfuscatedName("al") + @Export("SpriteBuffer_spriteWidth") + public static int SpriteBuffer_spriteWidth; + @ObfuscatedName("bi") + @Export("client") + @ObfuscatedSignature( + descriptor = "Lclient;" + ) + public static Client client; + @ObfuscatedName("ac") + int field1394; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "1" + descriptor = "Lff;" ) - @Export("vmethod3238") - abstract void vmethod3238(Buffer var1); + final class148 this$0; - @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgo;I)V", - garbageValue = "831405774" + descriptor = "(Lff;)V" ) - abstract void vmethod3239(ClanChannel var1); + class159(class148 var1) { + this.this$0 = var1; + this.field1394 = -1; + } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)Ltc;", - garbageValue = "-2141629898" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) - @Export("getDbRowType") - public static DbRowType getDbRowType(int var0) { - DbRowType var1 = (DbRowType)DbRowType.DBRowType_cache.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = DbRowType.field4116.takeFile(38, var0); - var1 = new DbRowType(); - if (var2 != null) { - var1.method2508(new Buffer(var2)); - } + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1394 = var1.readUnsignedShort(); + } - var1.method2511(); - DbRowType.DBRowType_cache.put(var1, (long)var0); - return var1; - } + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lgi;I)V", + garbageValue = "21847466" + ) + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method821(this.field1394); } - @ObfuscatedName("ae") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IB)Ltk;", - garbageValue = "44" + descriptor = "(I)Z", + garbageValue = "-914201451" ) - @Export("getDbTableType") - public static DbTableType getDbTableType(int var0) { - DbTableType var1 = (DbTableType)DbTableType.DBTableType_cache.get((long)var0); - if (var1 != null) { - return var1; + static boolean method840() { + Date var0; + try { + var0 = class20.method76(); + } catch (ParseException var7) { + class19.method67("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); + return false; + } + + if (var0 == null) { + return false; } else { - byte[] var2 = DbTableType.field4110.takeFile(39, var0); - var1 = new DbTableType(); - if (var2 != null) { - var1.method2503(new Buffer(var2)); - } + java.util.Calendar var2 = java.util.Calendar.getInstance(); + var2.set(1, var2.get(1) - 13); + var2.set(5, var2.get(5) + 1); + var2.set(11, 0); + var2.set(12, 0); + var2.set(13, 0); + var2.set(14, 0); + Date var3 = var2.getTime(); + boolean var4 = var0.before(var3); + boolean var6 = MoveSpeed.method1187(var0); + if (!var6) { + class19.method67("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); + return false; + } else { + if (!var4) { + class153.field1352 = 8388607; + } else { + class153.field1352 = (int)(var0.getTime() / 86400000L - 11745L); + } - var1.method2505(); - DbTableType.DBTableType_cache.put(var1, (long)var0); - return var1; + return true; + } } } } \ No newline at end of file diff --git a/osrs/src/main/java/class16.java b/osrs/src/main/java/class16.java index 68e72cdf9..3c4bd51cd 100644 --- a/osrs/src/main/java/class16.java +++ b/osrs/src/main/java/class16.java @@ -5,22 +5,30 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; -@ObfuscatedName("ag") +@ObfuscatedName("an") public class class16 implements ThreadFactory { - @ObfuscatedName("au") + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lbw;" + ) + @Export("pcmPlayerProvider") + public static class51 pcmPlayerProvider; + @ObfuscatedName("bi") + static String field47; + @ObfuscatedName("ac") final ThreadGroup field48; - @ObfuscatedName("ae") + @ObfuscatedName("al") final AtomicInteger field49; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Las;" ) @Export("this$0") @ObfuscatedName("this$0") final class14 this$0; @ObfuscatedSignature( - descriptor = "(Lar;)V" + descriptor = "(Las;)V" ) class16(class14 var1) { this.this$0 = var1; @@ -32,405 +40,211 @@ public class class16 implements ThreadFactory { @Export("newThread") @ObfuscatedName("newThread") public Thread newThread(Runnable var1) { - Thread var2 = new Thread(this.field48, var1, this.this$0.field43 + "-rest-request-" + this.field49.getAndIncrement(), 0L); + Thread var2 = new Thread(this.field48, var1, this.this$0.field41 + "-rest-request-" + this.field49.getAndIncrement(), 0L); var2.setDaemon(true); var2.setPriority(5); return var2; } - @ObfuscatedName("az") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-192145795" + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-718248289" ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; - if (var0 < 0 || var0 >= 65536) { - var0 >>>= 16; - var1 += 16; - } - - if (var0 >= 256) { - var0 >>>= 8; - var1 += 8; - } - - if (var0 >= 16) { - var0 >>>= 4; - var1 += 4; - } - - if (var0 >= 4) { - var0 >>>= 2; - var1 += 2; + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; + + for (int var6 = 0; var6 < var5; ++var6) { + char var7 = var0.charAt(var6 + var1); + if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { + if (var7 == 8364) { + var3[var6 + var4] = -128; + } else if (var7 == 8218) { + var3[var6 + var4] = -126; + } else if (var7 == 402) { + var3[var6 + var4] = -125; + } else if (var7 == 8222) { + var3[var6 + var4] = -124; + } else if (var7 == 8230) { + var3[var6 + var4] = -123; + } else if (var7 == 8224) { + var3[var6 + var4] = -122; + } else if (var7 == 8225) { + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; + } else if (var7 == 8240) { + var3[var6 + var4] = -119; + } else if (var7 == 352) { + var3[var6 + var4] = -118; + } else if (var7 == 8249) { + var3[var6 + var4] = -117; + } else if (var7 == 338) { + var3[var6 + var4] = -116; + } else if (var7 == 381) { + var3[var6 + var4] = -114; + } else if (var7 == 8216) { + var3[var6 + var4] = -111; + } else if (var7 == 8217) { + var3[var6 + var4] = -110; + } else if (var7 == 8220) { + var3[var6 + var4] = -109; + } else if (var7 == 8221) { + var3[var6 + var4] = -108; + } else if (var7 == 8226) { + var3[var6 + var4] = -107; + } else if (var7 == 8211) { + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; + } else if (var7 == 732) { + var3[var6 + var4] = -104; + } else if (var7 == 8482) { + var3[var6 + var4] = -103; + } else if (var7 == 353) { + var3[var6 + var4] = -102; + } else if (var7 == 8250) { + var3[var6 + var4] = -101; + } else if (var7 == 339) { + var3[var6 + var4] = -100; + } else if (var7 == 382) { + var3[var6 + var4] = -98; + } else if (var7 == 376) { + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; + } + } else { + var3[var6 + var4] = (byte)var7; + } } - if (var0 >= 1) { - var0 >>>= 1; - ++var1; - } + return var5; + } - return var0 + var1; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-70585586" + ) + public static final void method53(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; + ViewportMouse.ViewportMouse_y = var1; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; } - @ObfuscatedName("bv") + @ObfuscatedName("ls") @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "2" + descriptor = "(Ldc;IIII)V", + garbageValue = "184545664" ) - static int method48(int var0, Script var1, boolean var2) { - if (var0 == 3600) { - if (class299.friendSystem.friendListStatus == 0) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -2; - } else if (class299.friendSystem.friendListStatus == 1) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class299.friendSystem.friendsList.getSize(); + @Export("addNpcToMenu") + static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { + NPCComposition var4 = var0.definition; + if (Client.menuOptionsCount < 400) { + if (var4.transforms != null) { + var4 = var4.transform(); } - return 1; - } else { - int var3; - if (var0 == 3601) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (class299.friendSystem.method398() && var3 >= 0 && var3 < class299.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)class299.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3602) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (class299.friendSystem.method398() && var3 >= 0 && var3 < class299.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((Buddy)class299.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3603) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (class299.friendSystem.method398() && var3 >= 0 && var3 < class299.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((Buddy)class299.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - String var5; - if (var0 == 3604) { - var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - int var9 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class161.setFriendsRank(var5, var9); - return 1; - } else if (var0 == 3605) { - var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - class299.friendSystem.addFriend(var5); - return 1; - } else if (var0 == 3606) { - var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - class299.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == 3607) { - var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - class299.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == 3608) { - var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - boolean var6 = true; - class299.friendSystem.removeIgnore(var5, var6); - return 1; - } else if (var0 == 3609) { - var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var5 = ObjTypeCustomisation.method936(var5); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class299.friendSystem.isFriended(new Username(var5, Language.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == 3611) { - if (ReflectionCheck.friendsChat != null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ReflectionCheck.friendsChat.name; - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3612) { - if (ReflectionCheck.friendsChat != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ReflectionCheck.friendsChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3613) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize()) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ReflectionCheck.friendsChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3614) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((Buddy)ReflectionCheck.friendsChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3615) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ((Buddy)ReflectionCheck.friendsChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3616) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ReflectionCheck.friendsChat != null ? ReflectionCheck.friendsChat.minKick : 0; - return 1; - } else if (var0 == 3617) { - var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - class131.clanKickUser(var5); - return 1; - } else if (var0 == 3618) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = ReflectionCheck.friendsChat != null ? ReflectionCheck.friendsChat.rank * 1868713607 * 106239799 : 0; - return 1; - } else if (var0 == 3619) { - var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - UrlRequester.Clan_joinChat(var5); - return 1; - } else if (var0 == 3620) { - Player.Clan_leaveChat(); - return 1; - } else if (var0 == 3621) { - if (!class299.friendSystem.method398()) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class299.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == 3622) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (class299.friendSystem.method398() && var3 >= 0 && var3 < class299.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)class299.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3623) { - var5 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var5 = ObjTypeCustomisation.method936(var5); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class299.friendSystem.isIgnored(new Username(var5, Language.loginType)) ? 1 : 0; - return 1; - } else if (var0 == 3624) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize() && ReflectionCheck.friendsChat.get(var3).getUsername().equals(VarbitComposition.localPlayer.username)) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3625) { - if (ReflectionCheck.friendsChat != null && ReflectionCheck.friendsChat.owner != null) { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ReflectionCheck.friendsChat.owner; - } else { - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3626) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize() && ((ClanMate)ReflectionCheck.friendsChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != 3627) { - if (var0 == 3628) { - class299.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - class299.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - class299.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - class299.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new UserComparator7(var7)); - } + if (var4 != null) { + if (var4.isInteractable) { + if (!var4.isFollower || Client.followerIndex == var1) { + String var5 = var0.method582(); + int var6; + if (var4.combatLevel != 0 && var0.combatLevelChange != 0) { + var6 = var0.combatLevelChange != -1 ? var0.combatLevelChange * -537106585 * -893205417 : var4.combatLevel * -1524379573 * 1597602147; + var5 = var5 + WidgetDefinition.method1745(var6, TextureProvider.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; + } - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new UserComparator8(var7)); - } + if (var4.isFollower && Client.followerOpsLowPriority) { + class153.insertMenuItemNoShift("Examine", Client.colorStartTag(16776960) + var5, 1003, var1, var2, var3); + } - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new UserComparator9(var7)); + if (Client.isItemSelected == 1) { + class153.insertMenuItemNoShift("Use", Client.field598 + " " + "->" + " " + Client.colorStartTag(16776960) + var5, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((class31.field82 & 2) == 2) { + class153.insertMenuItemNoShift(Client.field599, Client.field600 + " " + "->" + " " + Client.colorStartTag(16776960) + var5, 8, var1, var2, var3); } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new UserComparator10(var7)); + } else { + var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var7 = var4.actions; + int var8; + int var9; + if (var7 != null) { + for (var8 = 4; var8 >= 0; --var8) { + if (var0.method580(var8) && var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { + var9 = 0; + if (var8 == 0) { + var9 = var6 + 9; + } + + if (var8 == 1) { + var9 = var6 + 10; + } + + if (var8 == 2) { + var9 = var6 + 11; + } + + if (var8 == 3) { + var9 = var6 + 12; + } + + if (var8 == 4) { + var9 = var6 + 13; + } + + class153.insertMenuItemNoShift(var7[var8], Client.colorStartTag(16776960) + var5, var9, var1, var2, var3); + } + } } - return 1; - } else if (var0 == 3655) { - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.sort(); + if (var7 != null) { + for (var8 = 4; var8 >= 0; --var8) { + if (var0.method580(var8) && var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { + short var10 = 0; + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > TextureProvider.localPlayer.combatLevel) { + var10 = 2000; + } + + var9 = 0; + if (var8 == 0) { + var9 = var10 + 9; + } + + if (var8 == 1) { + var9 = var10 + 10; + } + + if (var8 == 2) { + var9 = var10 + 11; + } + + if (var8 == 3) { + var9 = var10 + 12; + } + + if (var8 == 4) { + var9 = var10 + 13; + } + + class153.insertMenuItemNoShift(var7[var8], Client.colorStartTag(16776960) + var5, var9, var1, var2, var3); + } + } + } } - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class299.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (ReflectionCheck.friendsChat != null) { - ReflectionCheck.friendsChat.addComparator(new BuddyRankComparator(var7)); + if (!var4.isFollower || !Client.followerOpsLowPriority) { + class153.insertMenuItemNoShift("Examine", Client.colorStartTag(16776960) + var5, 1003, var1, var2, var3); } - - return 1; - } else { - return 2; } - } - } else { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (ReflectionCheck.friendsChat != null && var3 < ReflectionCheck.friendsChat.getSize() && ((ClanMate)ReflectionCheck.friendsChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - return 1; + } } } } diff --git a/osrs/src/main/java/class160.java b/osrs/src/main/java/class160.java index 36772dad9..680057837 100644 --- a/osrs/src/main/java/class160.java +++ b/osrs/src/main/java/class160.java @@ -1,132 +1,188 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Arrays; - -@ObfuscatedName("gg") -public class class160 { - @ObfuscatedName("au") - long field1413; - @ObfuscatedName("ae") - public long field1415; +@ObfuscatedName("gq") +public class class160 extends class145 { @ObfuscatedName("ao") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("ar") + @Export("gameCyclesToDo") + static int gameCyclesToDo; + @ObfuscatedName("ac") + long field1399; + @ObfuscatedName("al") + String field1398; + @ObfuscatedName("ak") + int field1397; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Loc;" + descriptor = "Lff;" ) - IterableNodeDeque field1414; + final class148 this$0; @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lff;)V" ) - public class160(Buffer var1) { - this.field1415 = -1L; - this.field1414 = new IterableNodeDeque(); - this.method843(var1); + class160(class148 var1) { + this.this$0 = var1; + this.field1399 = -1L; + this.field1398 = null; + this.field1397 = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "-2067216516" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) - void method843(Buffer var1) { - this.field1413 = var1.readLong(); - this.field1415 = var1.readLong(); - - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { - Object var3; - if (var2 == 1) { - var3 = new class155(this); - } else if (var2 == 4) { - var3 = new class166(this); - } else if (var2 == 3) { - var3 = new class151(this); - } else if (var2 == 2) { - var3 = new class149(this); - } else { - if (var2 != 5) { - throw new RuntimeException(""); - } - - var3 = new class156(this); - } - - ((class159)var3).vmethod3238(var1); - this.field1414.addFirst((Node)var3); + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1399 = var1.readLong(); } + this.field1398 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1397 = var1.readUnsignedShort(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lgo;B)V", - garbageValue = "-40" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) - public void method844(ClanChannel var1) { - if (var1.key == this.field1413 && var1.field1429 == this.field1415) { - for (class159 var2 = (class159)this.field1414.last(); var2 != null; var2 = (class159)this.field1414.previous()) { - var2.vmethod3239(var1); - } + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method817(this.field1399, this.field1398, this.field1397); + } + + @ObfuscatedName("ac") + public static String method841(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (var0 % 37L == 0L) { + return null; + } else { + int var2 = 0; + + for (long var3 = var0; 0L != var3; var3 /= 37L) { + ++var2; + } - ++var1.field1429; + StringBuilder var5 = new StringBuilder(var2); + + while (var0 != 0L) { + long var6 = var0; + var0 /= 37L; + var5.append(class403.base37Table[(int)(var6 - var0 * 37L)]); + } + + return var5.reverse().toString(); + } } else { - throw new RuntimeException(""); + return null; } } - @ObfuscatedName("at") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([FI)V", - garbageValue = "-753212760" + descriptor = "(ILjava/lang/String;Loa;II)Llx;", + garbageValue = "1083227717" ) - static void method845(float[] var0) { - var0[1] = 1.0F - var0[1]; - if (var0[0] < 0.0F) { - var0[0] = 0.0F; + public static PacketBufferNode method842(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = ClanChannelMember.getPacketBufferNode(ClientPacket.f96, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(0); + int var5 = var4.packetBuffer.offset; + var4.packetBuffer.writeByte(var0); + String var6 = var1.toLowerCase(); + int var7 = 0; + byte[] var8 = null; + if (var6.startsWith("yellow:")) { + var7 = 0; + var1 = var1.substring("yellow:".length()); + } else if (var6.startsWith("red:")) { + var7 = 1; + var1 = var1.substring("red:".length()); + } else if (var6.startsWith("green:")) { + var7 = 2; + var1 = var1.substring("green:".length()); + } else if (var6.startsWith("cyan:")) { + var7 = 3; + var1 = var1.substring("cyan:".length()); + } else if (var6.startsWith("purple:")) { + var7 = 4; + var1 = var1.substring("purple:".length()); + } else if (var6.startsWith("white:")) { + var7 = 5; + var1 = var1.substring("white:".length()); + } else if (var6.startsWith("flash1:")) { + var7 = 6; + var1 = var1.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var7 = 7; + var1 = var1.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { + var7 = 8; + var1 = var1.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { + var7 = 9; + var1 = var1.substring("glow1:".length()); + } else if (var6.startsWith("glow2:")) { + var7 = 10; + var1 = var1.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { + var7 = 11; + var1 = var1.substring("glow3:".length()); + } else if (var6.startsWith("rainbow:")) { + var7 = 12; + var1 = var1.substring("rainbow:".length()); + } else if (var6.startsWith("pattern")) { + var8 = class161.method847(var6); + if (var8 != null) { + var7 = var8.length + 12; + var1 = var1.substring("pattern".length() + var8.length + 1); + } } - if (var0[1] < 0.0F) { - var0[1] = 0.0F; + var6 = var1.toLowerCase(); + byte var9 = 0; + if (var6.startsWith("wave:")) { + var9 = 1; + var1 = var1.substring("wave:".length()); + } else if (var6.startsWith("wave2:")) { + var9 = 2; + var1 = var1.substring("wave2:".length()); + } else if (var6.startsWith("shake:")) { + var9 = 3; + var1 = var1.substring("shake:".length()); + } else if (var6.startsWith("scroll:")) { + var9 = 4; + var1 = var1.substring("scroll:".length()); + } else if (var6.startsWith("slide:")) { + var9 = 5; + var1 = var1.substring("slide:".length()); } - if (var0[0] > 1.0F || var0[1] > 1.0F) { - float var1 = (float)(1.0D + (double)(var0[0] * (var0[0] - 2.0F + var0[1])) + ((double)var0[1] - 2.0D) * (double)var0[1]); - if (var1 + class126.field1204 > 0.0F) { - if (class126.field1204 + var0[0] < 1.3333334F) { - float var2 = var0[0] - 2.0F; - float var3 = var0[0] - 1.0F; - float var4 = (float)Math.sqrt((double)(var2 * var2 - 4.0F * var3 * var3)); - float var5 = 0.5F * (var4 + -var2); - if (var0[1] + class126.field1204 > var5) { - var0[1] = var5 - class126.field1204; - } else { - var5 = (-var2 - var4) * 0.5F; - if (var0[1] < var5 + class126.field1204) { - var0[1] = class126.field1204 + var5; - } - } - } else { - var0[0] = 1.3333334F - class126.field1204; - var0[1] = 0.33333334F - class126.field1204; - } + var4.packetBuffer.writeByte(var7); + var4.packetBuffer.writeByte(var9); + if (var8 != null && Client.param25 >= 214) { + for (int var10 = 0; var10 < var8.length; ++var10) { + var4.packetBuffer.writeByte(var8[var10]); } } - var0[1] = 1.0F - var0[1]; - } - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(Lmi;Lmt;ZB)V", - garbageValue = "0" - ) - public static void method846(Widget var0, PlayerComposition var1, boolean var2) { - var0.modelType = 7; - var0.field3101 = new PlayerComposition(var1); - if (!var2) { - var0.field3101.equipment = Arrays.copyOf(var0.field3101.field2913, var0.field3101.field2913.length); - var0.field3101.method1729(); + class150.method785(var4.packetBuffer, var1); + if (var0 == class354.field3143.rsOrdinal()) { + var4.packetBuffer.writeByte(var3); } + var4.packetBuffer.WriteLengthByte(var4.packetBuffer.offset - var5); + return var4; + } + + @ObfuscatedName("av") + static final void method845(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class161.java b/osrs/src/main/java/class161.java index 77485f667..136df4ec0 100644 --- a/osrs/src/main/java/class161.java +++ b/osrs/src/main/java/class161.java @@ -2,143 +2,112 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") -public class class161 extends class143 { - @ObfuscatedName("au") - int field1417; - @ObfuscatedName("ae") - int field1416; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - final class146 this$0; +@ObfuscatedName("gt") +public abstract class class161 extends Node { + @ObfuscatedName("ut") + @Export("cameraLookAtHeight") + static int cameraLookAtHeight; - @ObfuscatedSignature( - descriptor = "(Lfn;)V" - ) - class161(class146 var1) { - this.this$0 = var1; + class161() { } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(Lul;B)V", + garbageValue = "0" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1417 = var1.readInt(); - this.field1416 = var1.readInt(); - } + @Export("vmethod3238") + abstract void vmethod3238(Buffer var1); - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(Lgb;B)V", + garbageValue = "0" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method821(this.field1417, this.field1416); - } + @Export("vmethod3239") + abstract void vmethod3239(ClanChannel var1); - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "-577871422" + descriptor = "(Ljava/lang/String;I)[B", + garbageValue = "95848814" ) - @Export("setFriendsRank") - static final void setFriendsRank(String var0, int var1) { - PacketBufferNode var2 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.FRIEND_SETRANK, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(AbstractSocket.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeByte(var1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var2); - } + static byte[] method847(String var0) { + boolean var1 = true; + boolean var2 = true; + int var3 = "pattern".length(); + int var4 = 0; + byte[] var5 = new byte[8]; + + while (true) { + int var6 = var3 + var4; + if (var6 >= var0.length()) { + return null; + } - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-1877408335" - ) - static int method850(int var0, Script var1, boolean var2) { - if (var0 == 5306) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class218.getWindowedMode(); - return 1; - } else { - int var3; - if (var0 == 5307) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - class270.setWindowedMode(var3); + char var7 = var0.charAt(var6); + if (var7 == ':') { + if (var4 == 0) { + return null; } - return 1; - } else if (var0 == 5308) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class449.clientPreferences.method566(); - return 1; - } else if (var0 != 5309) { - if (var0 == 5310) { - --SoundCache.Interpreter_intStackSize; - return 1; - } else { - return 2; - } + byte[] var8 = new byte[var4]; + System.arraycopy(var5, 0, var8, 0, var4); + return var8; + } + + if (var5.length == var4) { + return null; + } + + if (var7 >= '0' && var7 <= '9') { + var7 = (char)(var7 - '0'); } else { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - class449.clientPreferences.method565(var3); + if (var7 < 'a' || var7 > 'z') { + return null; } - return 1; + var7 = (char)(var7 - 'W'); } + + var5[var4++] = (byte)var7; } } - @ObfuscatedName("od") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "229621192" + descriptor = "([Ljava/lang/String;[IIIS)V", + garbageValue = "-11714" ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); - short[] var2 = new short[16]; - int var3 = 0; - - for (int var4 = 0; var4 < HealthBar.ItemDefinition_fileCount; ++var4) { - ItemComposition var5 = InvDefinition.ItemDefinition_get(var4); - if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - class28.foundItemIdCount = -1; - class156.foundItemIds = null; - return; + public static void method846(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + int var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + int var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; } - - if (var3 >= var2.length) { - short[] var6 = new short[var2.length * 2]; - - for (int var7 = 0; var7 < var3; ++var7) { - var6[var7] = var2[var7]; - } - - var2 = var6; - } - - var2[var3++] = (short)var4; } - } - - class156.foundItemIds = var2; - class372.foundItemIndex = 0; - class28.foundItemIdCount = var3; - String[] var8 = new String[class28.foundItemIdCount]; - for (int var9 = 0; var9 < class28.foundItemIdCount; ++var9) { - var8[var9] = InvDefinition.ItemDefinition_get(var2[var9]).name; + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + method846(var0, var1, var2, var5 - 1); + method846(var0, var1, var5 + 1, var3); } - short[] var10 = class156.foundItemIds; - FriendSystem.sortItemsByName(var8, var10, 0, var8.length - 1); } } \ No newline at end of file diff --git a/osrs/src/main/java/class162.java b/osrs/src/main/java/class162.java index d09e838b7..29f482c65 100644 --- a/osrs/src/main/java/class162.java +++ b/osrs/src/main/java/class162.java @@ -2,68 +2,80 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") -public class class162 extends class143 { - @ObfuscatedName("aa") - static int[][] field1419; - @ObfuscatedName("qv") +@ObfuscatedName("gf") +public class class162 { + @ObfuscatedName("fo") @ObfuscatedSignature( - descriptor = "[Lmi;" + descriptor = "Lre;" ) - static Widget[] field1420; - @ObfuscatedName("tm") + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("ac") + long field1402; + @ObfuscatedName("al") + public long field1404; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lbl;" + descriptor = "Lpy;" ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("au") - int field1421; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - final class146 this$0; + IterableNodeDeque field1403; @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "(Lul;)V" ) - class162(class146 var1) { - this.this$0 = var1; - this.field1421 = -1; + public class162(Buffer var1) { + this.field1404 = -1L; + this.field1403 = new IterableNodeDeque(); + this.method850(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(Lul;B)V", + garbageValue = "90" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1421 = var1.readUnsignedShort(); - } + void method850(Buffer var1) { + this.field1402 = var1.readLong(); + this.field1404 = var1.readLong(); + + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + Object var3; + if (var2 == 1) { + var3 = new class157(this); + } else if (var2 == 4) { + var3 = new class168(this); + } else if (var2 == 3) { + var3 = new class153(this); + } else if (var2 == 2) { + var3 = new class151(this); + } else { + if (var2 != 5) { + throw new RuntimeException(""); + } + + var3 = new class158(this); + } + + ((class161)var3).vmethod3238(var1); + this.field1403.addFirst((Node)var3); + } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" - ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method818(this.field1421); } - @ObfuscatedName("cs") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(ILmc;ZI)V", - garbageValue = "-1867605195" + descriptor = "(Lgb;I)V", + garbageValue = "-913420137" ) - static void method854(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = class227.getWorldMap().getMapArea(var0); - int var4 = VarbitComposition.localPlayer.plane; - int var5 = (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX; - int var6 = (VarbitComposition.localPlayer.y >> 7) + class47.baseY; - Coord var7 = new Coord(var4, var5, var6); - class227.getWorldMap().method2400(var3, var7, var1, var2); + public void method851(ClanChannel var1) { + if (this.field1402 == var1.key && var1.field1417 == this.field1404) { + for (class161 var2 = (class161)this.field1403.last(); var2 != null; var2 = (class161)this.field1403.previous()) { + var2.vmethod3239(var1); + } + + ++var1.field1417; + } else { + throw new RuntimeException(""); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class163.java b/osrs/src/main/java/class163.java new file mode 100644 index 000000000..c43f7c609 --- /dev/null +++ b/osrs/src/main/java/class163.java @@ -0,0 +1,188 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gk") +public class class163 extends class145 { + @ObfuscatedName("ac") + int field1405; + @ObfuscatedName("al") + int field1406; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lff;" + ) + final class148 this$0; + + @ObfuscatedSignature( + descriptor = "(Lff;)V" + ) + class163(class148 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lul;I)V", + garbageValue = "-11659242" + ) + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1405 = var1.readInt(); + this.field1406 = var1.readInt(); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lgi;I)V", + garbageValue = "21847466" + ) + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method826(this.field1405, this.field1406); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;Lom;IZB)Lja;", + garbageValue = "0" + ) + public static Frames method852(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; + int[] var5 = var0.getGroupFileIds(var2); + + for (int var6 = 0; var6 < var5.length; ++var6) { + byte[] var7 = var0.getFile(var2, var5[var6]); + if (var7 == null) { + var4 = false; + } else { + int var8 = (var7[0] & 255) << 8 | var7[1] & 255; + byte[] var9; + if (var3) { + var9 = var1.getFile(0, var8); + } else { + var9 = var1.getFile(var8, 0); + } + + if (var9 == null) { + var4 = false; + } + } + } + + if (!var4) { + return null; + } else { + try { + return new Frames(var0, var1, var2, var3); + } catch (Exception var11) { + return null; + } + } + } + + @ObfuscatedName("al") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (0L == var0 % 37L) { + return null; + } else { + int var2 = 0; + + for (long var3 = var0; 0L != var3; var3 /= 37L) { + ++var2; + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { + long var6 = var0; + var0 /= 37L; + var8 = class403.base37Table[(int)(var6 - var0 * 37L)]; + if (var8 == '_') { + int var9 = var5.length() - 1; + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); + var8 = 160; + } + } + + var5.reverse(); + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); + return var5.toString(); + } + } else { + return null; + } + } + + @ObfuscatedName("iw") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "93" + ) + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { + class91.clientPreferences.setRoofsHidden(!class91.clientPreferences.getRoofsHidden()); + if (class91.clientPreferences.getRoofsHidden()) { + class411.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + class411.addGameMessage(99, "", "Roofs will only be removed selectively"); + } + } + + if (var0.startsWith("zbuf")) { + boolean var1 = class36.method182(var0.substring(5).trim()) == 1; + class159.client.method152(var1); + Rasterizer3D.method1234(var1); + } + + if (var0.equalsIgnoreCase("z")) { + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("displayfps")) { + class91.clientPreferences.method545(); + } + + if (var0.equalsIgnoreCase("renderself")) { + Client.field388 = !Client.field388; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { + if (var0.equalsIgnoreCase("errortest")) { + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { + class434.worldMap.showCoord = !class434.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { + class91.clientPreferences.method544(true); + } + + if (var0.equalsIgnoreCase("fpsoff")) { + class91.clientPreferences.method544(false); + } + + if (var0.equalsIgnoreCase("gc")) { + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { + class148.method781(); + } + } + + PacketBufferNode var2 = ClanChannelMember.getPacketBufferNode(ClientPacket.DOCHEAT, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(var0.length() + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var2); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class164.java b/osrs/src/main/java/class164.java index e06e2dcf8..71a5a4357 100644 --- a/osrs/src/main/java/class164.java +++ b/osrs/src/main/java/class164.java @@ -2,68 +2,184 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gl") -public class class164 { - @ObfuscatedName("ao") +@ObfuscatedName("gm") +public class class164 extends class145 { + @ObfuscatedName("gw") + @Export("currentPort") + static int currentPort; + @ObfuscatedName("ac") + int field1408; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "([BI)[I", - garbageValue = "2043897954" + descriptor = "Lff;" ) - public static int[] method863(byte[] var0) { - if (var0 != null && var0.length != 0 && var0.length <= 8) { - int[] var1 = new int[var0.length]; + final class148 this$0; - for (int var2 = 0; var2 < var0.length; ++var2) { - if (var0[var2] < 0 || var0[var2] > class538.field4284.length) { - return null; - } + @ObfuscatedSignature( + descriptor = "(Lff;)V" + ) + class164(class148 var1) { + this.this$0 = var1; + this.field1408 = -1; + } - var1[var2] = class538.field4284[var0[var2]]; - } + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lul;I)V", + garbageValue = "-11659242" + ) + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1408 = var1.readUnsignedShort(); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lgi;I)V", + garbageValue = "21847466" + ) + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method823(this.field1408); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1326457643" + ) + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + if (var4 == null) { + var4 = new ChatChannel(); + Messages.Messages_channels.put(var0, var4); + } + + Message var5 = var4.addMessage(var0, var1, var2, var3); + Messages.Messages_hashTable.put(var5, (long)var5.count); + Messages.Messages_queue.add(var5); + Client.chatCycle = Client.cycleCntr; + } + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Lii;", + garbageValue = "-1509216849" + ) + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - return null; + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); + var1 = new StructComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + StructComposition.StructDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("in") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1654219145" + descriptor = "(IIII)I", + garbageValue = "-2069590441" ) - static final void method864() { - if (Client.field538 != HealthBar.Client_plane) { - Client.field538 = HealthBar.Client_plane; - class17.method50(HealthBar.Client_plane); - } + public static int method859(int var0, int var1, int var2) { + int var3 = class76.method431(var2 - var1 + 1); + var3 <<= var1; + return var0 & ~var3; + } + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Lom;III)Z", + garbageValue = "999558105" + ) + public static boolean method862(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); + if (var3 == null) { + return false; + } else { + SpriteBuffer_decode(var3); + return true; + } } - @ObfuscatedName("mq") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "1697845802" + descriptor = "([BI)V", + garbageValue = "-2036046752" ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - GrandExchangeOfferOwnWorldComparator.scrollBarSprites[0].drawAt(var0, var1); - GrandExchangeOfferOwnWorldComparator.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field462); - int var5 = var3 * (var3 - 32) / var4; - if (var5 < 8) { - var5 = 8; + @Export("SpriteBuffer_decode") + static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); + var1.offset = var0.length - 2; + class544.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + class326.SpriteBuffer_xOffsets = new int[class544.SpriteBuffer_spriteCount]; + ModelData0.SpriteBuffer_yOffsets = new int[class544.SpriteBuffer_spriteCount]; + class59.SpriteBuffer_spriteWidths = new int[class544.SpriteBuffer_spriteCount]; + class544.SpriteBuffer_spriteHeights = new int[class544.SpriteBuffer_spriteCount]; + AddRequestTask.SpriteBuffer_pixels = new byte[class544.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class544.SpriteBuffer_spriteCount * 8; + class159.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + class500.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + int var2 = (var1.readUnsignedByte() & 255) + 1; + + int var3; + for (var3 = 0; var3 < class544.SpriteBuffer_spriteCount; ++var3) { + class326.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class544.SpriteBuffer_spriteCount; ++var3) { + ModelData0.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class544.SpriteBuffer_spriteCount; ++var3) { + class59.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class544.SpriteBuffer_spriteCount; ++var3) { + class544.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class544.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + class372.SpriteBuffer_spritePalette = new int[var2]; + + for (var3 = 1; var3 < var2; ++var3) { + class372.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (class372.SpriteBuffer_spritePalette[var3] == 0) { + class372.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; + + for (var3 = 0; var3 < class544.SpriteBuffer_spriteCount; ++var3) { + int var4 = class59.SpriteBuffer_spriteWidths[var3]; + int var5 = class544.SpriteBuffer_spriteHeights[var3]; + int var6 = var4 * var5; + byte[] var7 = new byte[var6]; + AddRequestTask.SpriteBuffer_pixels[var3] = var7; + int var8 = var1.readUnsignedByte(); + int var9; + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { + var7[var9 + var4 * var10] = var1.readByte(); + } + } + } } - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field463); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field460); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field460); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field460); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field460); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field459); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field459); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field459); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field459); } } \ No newline at end of file diff --git a/osrs/src/main/java/class165.java b/osrs/src/main/java/class165.java deleted file mode 100644 index 37a5b3b7e..000000000 --- a/osrs/src/main/java/class165.java +++ /dev/null @@ -1,94 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.io.File; -import java.io.IOException; - -@ObfuscatedName("gb") -public class class165 extends class143 { - @ObfuscatedName("au") - long field1431; - @ObfuscatedName("ae") - String field1430; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - final class146 this$0; - - @ObfuscatedSignature( - descriptor = "(Lfn;)V" - ) - class165(class146 var1) { - this.this$0 = var1; - this.field1431 = -1L; - this.field1430 = null; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" - ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1431 = var1.readLong(); - } - - this.field1430 = var1.readStringCp1252NullTerminatedOrNull(); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" - ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method815(this.field1431, this.field1430); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;Ljava/io/File;I)V", - garbageValue = "1715361402" - ) - static void method868(File var0, File var1) { - try { - AccessFile var2 = new AccessFile(JagexCache.field1463, "rw", 10000L); - Buffer var3 = new Buffer(500); - var3.writeByte(3); - var3.writeByte(var1 != null ? 1 : 0); - var3.writeCESU8(var0.getPath()); - if (var1 != null) { - var3.writeCESU8(""); - } - - var2.write(var3.array, 0, var3.offset); - var2.close(); - } catch (IOException var4) { - var4.printStackTrace(); - } - - } - - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "97" - ) - static final void method869() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.endCycle == -1) { - var0.startCycle = 0; - PacketWriter.method646(var0); - } else { - var0.remove(); - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class166.java b/osrs/src/main/java/class166.java index b83ea866b..fe8124a7b 100644 --- a/osrs/src/main/java/class166.java +++ b/osrs/src/main/java/class166.java @@ -2,55 +2,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") -public class class166 extends class159 { - @ObfuscatedName("au") - String field1434; - @ObfuscatedName("ae") - byte field1432; - @ObfuscatedName("ao") - byte field1433; - // $FF: synthetic field +@ObfuscatedName("gx") +public class class166 { + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lte;" ) - final class160 this$0; - - @ObfuscatedSignature( - descriptor = "(Lgg;)V" - ) - class166(class160 var1) { - this.this$0 = var1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "1" - ) - @Export("vmethod3238") - void vmethod3238(Buffer var1) { - this.field1434 = var1.readStringCp1252NullTerminatedOrNull(); - if (this.field1434 != null) { - var1.readUnsignedByte(); - this.field1432 = var1.readByte(); - this.field1433 = var1.readByte(); - } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lgo;I)V", - garbageValue = "831405774" - ) - @Export("vmethod3239") - void vmethod3239(ClanChannel var1) { - var1.name = this.field1434; - if (this.field1434 != null) { - var1.field1426 = this.field1432; - var1.field1425 = this.field1433; - } - - } + @Export("loginType") + static LoginType loginType; } \ No newline at end of file diff --git a/osrs/src/main/java/class167.java b/osrs/src/main/java/class167.java index ec2fd67ef..ca1c3dee8 100644 --- a/osrs/src/main/java/class167.java +++ b/osrs/src/main/java/class167.java @@ -2,75 +2,102 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") -public class class167 extends class143 { - @ObfuscatedName("ai") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "Lui;" - ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - @ObfuscatedName("au") - int field1437; - @ObfuscatedName("ae") - long field1438; +@ObfuscatedName("gp") +public class class167 extends class145 { + @ObfuscatedName("ac") + long field1420; + @ObfuscatedName("al") + String field1419; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lff;" ) - final class146 this$0; + final class148 this$0; @ObfuscatedSignature( - descriptor = "(Lfn;)V" + descriptor = "(Lff;)V" ) - class167(class146 var1) { + class167(class148 var1) { this.this$0 = var1; + this.field1420 = -1L; + this.field1419 = null; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "209179459" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1437 = var1.readInt(); - this.field1438 = var1.readLong(); + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1420 = var1.readLong(); + } + + this.field1419 = var1.readStringCp1252NullTerminatedOrNull(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfi;B)V", - garbageValue = "73" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method823(this.field1437, this.field1438); + var1.method820(this.field1420, this.field1419); } - @ObfuscatedName("jq") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "769198964" + descriptor = "(Lul;Ltp;B)Ltp;", + garbageValue = "8" ) - static final void method874() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == HealthBar.Client_plane && !var0.isFinished) { - if (Client.cycle >= var0.cycleStart) { - var0.advance(Client.field457); - if (var0.isFinished) { - var0.remove(); - } else { - class130.scene.drawEntity(var0.plane, var0.x, var0.y, var0.z, 60, var0, 0, -1L, false); - } - } + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); + int var3; + if (var1 == null) { + var3 = EnumComposition.method999(var2); + var1 = new IterableNodeHashTable(var3); + } + + for (var3 = 0; var3 < var2; ++var3) { + boolean var4 = var0.readUnsignedByte() == 1; + int var5 = var0.readMedium(); + Object var6; + if (var4) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); } else { - var0.remove(); + var6 = new IntegerNode(var0.readInt()); } + + var1.put((Node)var6, (long)var5); } + return var1; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Lom;Ljava/lang/String;Ljava/lang/String;I)Lun;", + garbageValue = "-2109687814" + ) + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + if (!var0.isValidFileName(var1, var2)) { + return null; + } else { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + IndexedSprite var5; + if (!class164.method862(var0, var3, var4)) { + var5 = null; + } else { + var5 = Widget.method1844(); + } + + return var5; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class168.java b/osrs/src/main/java/class168.java new file mode 100644 index 000000000..dce0c1b9a --- /dev/null +++ b/osrs/src/main/java/class168.java @@ -0,0 +1,164 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gd") +public class class168 extends class161 { + @ObfuscatedName("ac") + String field1423; + @ObfuscatedName("al") + byte field1422; + @ObfuscatedName("ak") + byte field1421; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + final class162 this$0; + + @ObfuscatedSignature( + descriptor = "(Lgf;)V" + ) + class168(class162 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lul;B)V", + garbageValue = "0" + ) + @Export("vmethod3238") + void vmethod3238(Buffer var1) { + this.field1423 = var1.readStringCp1252NullTerminatedOrNull(); + if (this.field1423 != null) { + var1.readUnsignedByte(); + this.field1422 = var1.readByte(); + this.field1421 = var1.readByte(); + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lgb;B)V", + garbageValue = "0" + ) + @Export("vmethod3239") + void vmethod3239(ClanChannel var1) { + var1.name = this.field1423; + if (this.field1423 != null) { + var1.field1414 = this.field1422; + var1.field1413 = this.field1421; + } + + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ILds;ZB)I", + garbageValue = "-85" + ) + static int method878(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == 100) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (var4 == 0) { + throw new RuntimeException(); + } else { + Widget var6 = class33.field89.method1740(var3); + if (var6.children == null) { + var6.children = new Widget[var5 + 1]; + } + + if (var6.children.length <= var5) { + Widget[] var7 = new Widget[var5 + 1]; + + for (int var8 = 0; var8 < var6.children.length; ++var8) { + var7[var8] = var6.children[var8]; + } + + var6.children = var7; + } + + if (var5 > 0 && var6.children[var5 - 1] == null) { + throw new RuntimeException("" + (var5 - 1)); + } else { + Widget var12 = new Widget(); + var12.type = var4; + var12.parentId = var12.id = var6.id; + var12.childIndex = var5; + var12.isIf3 = true; + if (var4 == 12) { + var12.method1876(); + var12.method1877().method1810(new class107(var12)); + var12.method1877().method1809(new class108(var12)); + } + + var6.children[var5] = var12; + if (var2) { + class416.scriptDotWidget = var12; + } else { + class306.scriptActiveWidget = var12; + } + + ClanChannelMember.invalidateWidget(var6); + return 1; + } + } + } else { + Widget var9; + if (var0 == 101) { + var9 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + Widget var10 = class33.field89.method1740(var9.id); + var10.children[var9.childIndex] = null; + ClanChannelMember.invalidateWidget(var10); + return 1; + } else if (var0 == 102) { + var9 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var9.children = null; + ClanChannelMember.invalidateWidget(var9); + return 1; + } else if (var0 != 200) { + if (var0 == 201) { + var9 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var9 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + if (var2) { + class416.scriptDotWidget = var9; + } else { + class306.scriptActiveWidget = var9; + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Widget var11 = class33.field89.getWidgetChild(var3, var4); + if (var11 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + if (var2) { + class416.scriptDotWidget = var11; + } else { + class306.scriptActiveWidget = var11; + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class169.java b/osrs/src/main/java/class169.java index f4db7a763..f55f9ba74 100644 --- a/osrs/src/main/java/class169.java +++ b/osrs/src/main/java/class169.java @@ -2,191 +2,72 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") -public class class169 extends class181 { - @ObfuscatedName("au") - String field1440; +@ObfuscatedName("gz") +public class class169 extends class145 { + @ObfuscatedName("ac") + int field1424; + @ObfuscatedName("al") + long field1425; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lff;" ) - final class170 this$0; + final class148 this$0; @ObfuscatedSignature( - descriptor = "(Lgf;Ljava/lang/String;Ljava/lang/String;)V" + descriptor = "(Lff;)V" ) - class169(class170 var1, String var2, String var3) { - super(var1, var2); + class169(class148 var1) { this.this$0 = var1; - this.field1440 = var3; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "38" + descriptor = "(Lul;I)V", + garbageValue = "-11659242" ) - @Export("vmethod3379") - public int vmethod3379() { - return 1; + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1424 = var1.readInt(); + this.field1425 = var1.readLong(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1557827941" + descriptor = "(Lgi;I)V", + garbageValue = "21847466" ) - @Export("vmethod3380") - public String vmethod3380() { - return this.field1440; + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method829(this.field1424, this.field1425); } - @ObfuscatedName("al") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-866561565" + descriptor = "(ILds;ZB)I", + garbageValue = "-23" ) - static int method879(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - } else { - var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - } - - String var4 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]) { - } - } - - var4 = var4.substring(0, var4.length() - 1); - } - - Object[] var9 = new Object[var4.length() + 1]; - - int var7; - for (var7 = var9.length - 1; var7 >= 1; --var7) { - if (var4.charAt(var7 - 1) == 's') { - var9[var7] = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - } else { - var9[var7] = new Integer(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - } - } - - var7 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var7 != -1) { - var9[0] = new Integer(var7); + static int method881(int var0, Script var1, boolean var2) { + if (var0 == 6809) { + int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ObjectComposition var4 = class91.getObjectDefinition(var3); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; + return 1; } else { - var9 = null; + return 2; } - - if (var0 == 1400) { - var3.onClick = var9; - } else if (var0 == 1401) { - var3.onHold = var9; - } else if (var0 == 1402) { - var3.onRelease = var9; - } else if (var0 == 1403) { - var3.onMouseOver = var9; - } else if (var0 == 1404) { - var3.onMouseLeave = var9; - } else if (var0 == 1405) { - var3.onDrag = var9; - } else if (var0 == 1406) { - var3.onTargetLeave = var9; - } else if (var0 == 1407) { - var3.onVarTransmit = var9; - var3.varTransmitTriggers = var5; - } else if (var0 == 1408) { - var3.onTimer = var9; - } else if (var0 == 1409) { - var3.onOp = var9; - } else if (var0 == 1410) { - var3.onDragComplete = var9; - } else if (var0 == 1411) { - var3.onClickRepeat = var9; - } else if (var0 == 1412) { - var3.onMouseRepeat = var9; - } else if (var0 == 1414) { - var3.onInvTransmit = var9; - var3.invTransmitTriggers = var5; - } else if (var0 == 1415) { - var3.onStatTransmit = var9; - var3.statTransmitTriggers = var5; - } else if (var0 == 1416) { - var3.onTargetEnter = var9; - } else if (var0 == 1417) { - var3.onScroll = var9; - } else if (var0 == 1418) { - var3.onChatTransmit = var9; - } else if (var0 == 1419) { - var3.onKey = var9; - } else if (var0 == 1420) { - var3.onFriendTransmit = var9; - } else if (var0 == 1421) { - var3.onClanTransmit = var9; - } else if (var0 == 1422) { - var3.onMiscTransmit = var9; - } else if (var0 == 1423) { - var3.onDialogAbort = var9; - } else if (var0 == 1424) { - var3.onSubChange = var9; - } else if (var0 == 1425) { - var3.onStockTransmit = var9; - } else if (var0 == 1426) { - var3.field3081 = var9; - } else if (var0 == 1427) { - var3.onResize = var9; - } else if (var0 == 1428) { - var3.field3082 = var9; - } else if (var0 == 1429) { - var3.field3090 = var9; - } else if (var0 == 1430) { - var3.field3089 = var9; - } else if (var0 == 1431) { - var3.field3079 = var9; - } else if (var0 == 1434) { - var3.field3088 = var9; - } else if (var0 == 1435) { - var3.field3076 = var9; - } else { - if (var0 < 1436 || var0 > 1439) { - return 2; - } - - class327 var8 = var3.method1847(); - if (var8 != null) { - if (var0 == 1436) { - var8.field2898 = var9; - } else if (var0 == 1437) { - var8.field2899 = var9; - } else if (var0 == 1438) { - var8.field2901 = var9; - } else if (var0 == 1439) { - var8.field2900 = var9; - } - } - } - - var3.hasListener = true; - return 1; } - @ObfuscatedName("il") + @ObfuscatedName("lw") @ObfuscatedSignature( - descriptor = "(Lib;IIII)V", - garbageValue = "1647034458" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "815194863" ) - static void method880(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && class449.clientPreferences.getAreaSoundEffectsVolume() != 0) { - if (var0.animMayaFrameSounds != null && var0.animMayaFrameSounds.containsKey(var1)) { - MouseHandler.method172((Integer)var0.animMayaFrameSounds.get(var1), var2, var3); - } + static String method882(int var0) { + if (var0 < 0) { + return ""; + } else { + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class17.java b/osrs/src/main/java/class17.java index ff1ba2089..53816277e 100644 --- a/osrs/src/main/java/class17.java +++ b/osrs/src/main/java/class17.java @@ -6,21 +6,26 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSessionContext; import javax.security.cert.X509Certificate; +import java.io.File; +import java.io.IOException; import java.security.Principal; import java.security.cert.Certificate; -@ObfuscatedName("am") +@ObfuscatedName("au") class class17 implements SSLSession { + @ObfuscatedName("ku") + @Export("cameraY") + static int cameraY; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Lap;" ) @Export("this$1") @ObfuscatedName("this$1") final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lal;)V" + descriptor = "(Lap;)V" ) class17(class12 var1) { this.this$1 = var1; @@ -65,7 +70,7 @@ public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedExcep } public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { - return this.this$1.field39; + return this.this$1.field34; } public String getPeerHost() { @@ -124,104 +129,461 @@ public void removeValue(String var1) { throw new UnsupportedOperationException(); } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1689168407" + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lto;", + garbageValue = "110" ) - static final void method49(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { - for (int var5 = var0; var5 <= var0 + var2; ++var5) { - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { - MoveSpeed.field1924[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var0 + var2 == var5 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(class500.cacheDir, "preferences" + var0 + ".dat"); + if (var3.exists()) { + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); + return var10; + } catch (IOException var9) { + } + } - if (var4 == var1 && var4 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } + String var4 = ""; + if (FileSystem.cacheGamebuild == 33) { + var4 = "_rc"; + } else if (FileSystem.cacheGamebuild == 34) { + var4 = "_wip"; + } - if (var3 + var1 == var4 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } + File var5 = new File(DevicePcmPlayerProvider.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); + AccessFile var6; + if (!var2 && var5.exists()) { + try { + var6 = new AccessFile(var5, "rw", 10000L); + return var6; + } catch (IOException var8) { } } + try { + var6 = new AccessFile(var3, "rw", 10000L); + return var6; + } catch (IOException var7) { + throw new RuntimeException(); + } } - @ObfuscatedName("ko") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1087980755" + descriptor = "(ILds;ZI)I", + garbageValue = "201012705" ) - static final void method50(int var0) { - int[] var1 = AbstractUserComparator.sceneMinimapSprite.pixels; - int var2 = var1.length; - - int var3; - for (var3 = 0; var3 < var2; ++var3) { - var1[var3] = 0; + static int method56(int var0, Script var1, boolean var2) { + int var4 = -1; + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var3 = class33.field89.method1740(var4); + } else { + var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; } - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { - var4 = (103 - var3) * 2048 + 24628; + int var10; + if (var0 == 1100) { + Interpreter.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (var3.type == 12) { + class344 var7 = var3.method1877(); + if (var7 != null && var7.method1772(var10, var6)) { + ClanChannelMember.invalidateWidget(var3); + } + } else { + var3.scrollX = var10; + if (var3.scrollX > var3.scrollWidth - var3.width) { + var3.scrollX = var3.scrollWidth - var3.width; + } - for (var5 = 1; var5 < 103; ++var5) { - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { - class130.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + if (var3.scrollX < 0) { + var3.scrollX = 0; } - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - class130.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + var3.scrollY = var6; + if (var3.scrollY > var3.scrollHeight - var3.height) { + var3.scrollY = var3.scrollHeight - var3.height; } - var4 += 4; + if (var3.scrollY < 0) { + var3.scrollY = 0; + } + + ClanChannelMember.invalidateWidget(var3); } - } - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - AbstractUserComparator.sceneMinimapSprite.setRaster(); + return 1; + } else if (var0 == 1101) { + var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1102) { + var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1103) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1104) { + var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1105) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1106) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1107) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1108) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1109) { + Interpreter.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1110) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var10 != var3.sequenceId) { + var3.sequenceId = var10; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + ClanChannelMember.invalidateWidget(var3); + } - int var6; - for (var5 = 1; var5 < 103; ++var5) { - for (var6 = 1; var6 < 103; ++var6) { - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { - class102.drawObject(var0, var6, var5, var3, var4); - } + return 1; + } else if (var0 == 1111) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else { + class344 var9; + if (var0 != 1112) { + class344 var12; + if (var0 == 1113) { + var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3.type == 12) { + var12 = var3.method1877(); + if (var12 != null) { + var12.method1779(); + } + } - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { - class102.drawObject(var0 + 1, var6, var5, var3, var4); - } - } - } + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1114) { + Interpreter.Interpreter_intStackSize -= 3; + if (var3.type == 12) { + var12 = var3.method1877(); + if (var12 != null) { + var12.method1773(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + var12.method1774(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); + } + } else { + var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + } + + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1115) { + var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1116) { + var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1117) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1118) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1119) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1120) { + Interpreter.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + ClanChannelMember.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { + PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; + } else if (var0 == 1121) { + class174.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1123) { + var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1125) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + class541 var13 = (class541)SequenceDefinition.findEnumerated(class472.FillMode_values(), var10); + if (var13 != null) { + var3.fillMode = var13; + ClanChannelMember.invalidateWidget(var3); + } - Client.mapIconCount = 0; - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - long var7 = class130.scene.getFloorDecorationTag(HealthBar.Client_plane, var5, var6); - if (0L != var7) { - int var9 = InvDefinition.Entity_unpackID(var7); - int var10 = WorldMapElement.getObjectDefinition(var9).mapIconId; - if (var10 >= 0 && class138.WorldMapElement_get(var10).field1518) { - Client.mapIcons[Client.mapIconCount] = class138.WorldMapElement_get(var10).getSpriteBool(false); - Client.mapIconXs[Client.mapIconCount] = var5; - Client.mapIconYs[Client.mapIconCount] = var6; - ++Client.mapIconCount; + return 1; + } else { + boolean var5; + if (var0 == 1126) { + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + var3.field2989 = var5; + return 1; + } else if (var0 == 1127) { + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else if (var0 == 1129) { + var3.field3119 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + ClanChannelMember.invalidateWidget(var3); + return 1; + } else if (var0 == 1130) { + var3.method1861(Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize], AbstractWorldMapIcon.urlRequester, class304.method1635()); + return 1; + } else if (var0 == 1131) { + Interpreter.Interpreter_intStackSize -= 2; + var3.method1864(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == 1132) { + var3.method1865(Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return 1; + } else { + class339 var14; + if (var0 == 1133) { + --Interpreter.Interpreter_intStackSize; + var14 = var3.method1878(); + if (var14 != null) { + var14.field2923 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1134) { + --Interpreter.Interpreter_intStackSize; + var14 = var3.method1878(); + if (var14 != null) { + var14.field2925 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1135) { + --class180.Interpreter_stringStackSize; + var12 = var3.method1877(); + if (var12 != null) { + var3.text2 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; + } + + return 1; + } else if (var0 == 1136) { + --Interpreter.Interpreter_intStackSize; + var14 = var3.method1878(); + if (var14 != null) { + var14.field2924 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1137) { + --Interpreter.Interpreter_intStackSize; + var12 = var3.method1877(); + if (var12 != null && var12.method1769(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1138) { + --Interpreter.Interpreter_intStackSize; + var12 = var3.method1877(); + if (var12 != null && var12.method1770(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1139) { + --Interpreter.Interpreter_intStackSize; + var12 = var3.method1877(); + if (var12 != null && var12.method1771(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1140) { + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Client.field422.method1134(); + var9 = var3.method1877(); + if (var9 != null && var9.method1763(var5)) { + if (var5) { + Client.field422.method1132(var3); + } + + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1141) { + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (!var5 && Client.field422.method1133() == var3) { + Client.field422.method1134(); + ClanChannelMember.invalidateWidget(var3); + } + + var9 = var3.method1877(); + if (var9 != null) { + var9.method1764(var5); + } + + return 1; + } else if (var0 == 1142) { + Interpreter.Interpreter_intStackSize -= 2; + var12 = var3.method1877(); + if (var12 != null && var12.method1787(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1])) { + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1143) { + --Interpreter.Interpreter_intStackSize; + var12 = var3.method1877(); + if (var12 != null && var12.method1787(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1144) { + --Interpreter.Interpreter_intStackSize; + var12 = var3.method1877(); + if (var12 != null) { + var12.method1776(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1145) { + --Interpreter.Interpreter_intStackSize; + var12 = var3.method1877(); + if (var12 != null) { + var12.method1775(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); + } + + return 1; + } else if (var0 == 1146) { + --Interpreter.Interpreter_intStackSize; + var12 = var3.method1877(); + if (var12 != null) { + var12.method1778(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); + } + + return 1; + } else if (var0 == 1147) { + --Interpreter.Interpreter_intStackSize; + var12 = var3.method1877(); + if (var12 != null) { + var12.method1777(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); + ClanChannelMember.invalidateWidget(var3); + } + + return 1; + } else { + class27 var11; + if (var0 == 1148) { + Interpreter.Interpreter_intStackSize -= 2; + var11 = var3.method1879(); + if (var11 != null) { + var11.method102(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + } + + return 1; + } else if (var0 == 1149) { + Interpreter.Interpreter_intStackSize -= 2; + var11 = var3.method1879(); + if (var11 != null) { + var11.method104((char)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + } + + return 1; + } else if (var0 == 1150) { + var3.method1862(Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize], AbstractWorldMapIcon.urlRequester); + return 1; + } else { + return 2; + } + } } } + } else { + String var8 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + if (!var8.equals(var3.text)) { + if (var3.type == 12) { + var9 = var3.method1877(); + if (var9 != null && var9.method1819()) { + var9.method1765(var8); + } else { + var3.text = var8; + } + } else { + var3.text = var8; + } + + ClanChannelMember.invalidateWidget(var3); + } + + return 1; } } + } - AttackOption.rasterProvider.apply(); + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "-236516761" + ) + static int method57(int var0, Script var1, boolean var2) { + if (var0 == 7108) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = VarcInt.method976() ? 1 : 0; + return 1; + } else { + return 2; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class170.java b/osrs/src/main/java/class170.java deleted file mode 100644 index bf0e57913..000000000 --- a/osrs/src/main/java/class170.java +++ /dev/null @@ -1,448 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -@ObfuscatedName("gf") -public class class170 { - @ObfuscatedName("aa") - int field1443; - @ObfuscatedName("af") - String field1444; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Let;" - ) - UrlRequest field1441; - @ObfuscatedName("aq") - String field1445; - @ObfuscatedName("al") - float[] field1442; - @ObfuscatedName("an") - ArrayList field1447; - @ObfuscatedName("ar") - ArrayList field1448; - @ObfuscatedName("ab") - ArrayList field1446; - @ObfuscatedName("ag") - Map field1449; - @ObfuscatedName("am") - Map field1450; - - public class170() { - this.field1443 = -1; - this.field1445 = null; - this.field1442 = new float[4]; - this.field1447 = new ArrayList(); - this.field1448 = new ArrayList(); - this.field1446 = new ArrayList(); - this.field1449 = new HashMap(); - this.field1450 = new HashMap(); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lev;I)Z", - garbageValue = "-117070837" - ) - public boolean method881(String var1, UrlRequester var2) { - if (var1 != null && !var1.isEmpty()) { - if (var2 == null) { - return false; - } else { - this.method891(); - - try { - this.field1444 = var1; - this.field1441 = var2.request(new URL(this.field1444)); - this.field1443 = 0; - return true; - } catch (MalformedURLException var4) { - this.method891(); - this.field1443 = 100; - return false; - } - } - } else { - return false; - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lev;I)V", - garbageValue = "-1262385396" - ) - public void method882(UrlRequester var1) { - switch(this.field1443) { - case 0: - this.method892(var1); - break; - case 1: - this.method893(); - break; - default: - return; - } - - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1206059947" - ) - public int method883() { - return this.field1443; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-63404292" - ) - public int method884(String var1) { - return this.field1449.containsKey(var1) ? (Integer)this.field1449.get(var1) : -1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1647715363" - ) - public String method885(String var1) { - return (String)((String)(this.field1450.containsKey(var1) ? this.field1450.get(var1) : null)); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(B)Ljava/util/ArrayList;", - garbageValue = "-87" - ) - public ArrayList method886() { - return this.field1448; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(B)Ljava/util/ArrayList;", - garbageValue = "88" - ) - public ArrayList method887() { - return this.field1446; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1756409477" - ) - public String method888() { - return this.field1445; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "-2115403959" - ) - public float[] method889() { - return this.field1442; - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(B)Ljava/util/ArrayList;", - garbageValue = "-78" - ) - public ArrayList method890() { - return this.field1447; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "22" - ) - void method891() { - this.field1441 = null; - this.field1445 = null; - this.field1442[0] = 0.0F; - this.field1442[1] = 0.0F; - this.field1442[2] = 1.0F; - this.field1442[3] = 1.0F; - this.field1447.clear(); - this.field1448.clear(); - this.field1446.clear(); - this.field1449.clear(); - this.field1450.clear(); - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(Lev;B)V", - garbageValue = "-76" - ) - void method892(UrlRequester var1) { - if (this.field1441 != null && this.field1441.isDone()) { - byte[] var2 = this.field1441.getResponse(); - if (var2 == null) { - this.method891(); - this.field1443 = 100; - } else { - try { - this.method898(new class462(var2), var1); - } catch (UnsupportedEncodingException var4) { - this.method891(); - this.field1443 = 102; - return; - } - - this.field1443 = this.field1448.size() > 0 ? 1 : 2; - this.field1441 = null; - } - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2026180069" - ) - void method893() { - Iterator var1 = this.field1448.iterator(); - - class176 var2; - do { - if (!var1.hasNext()) { - var1 = this.field1448.iterator(); - - while (var1.hasNext()) { - var2 = (class176)var1.next(); - if (var2.field1469 != null) { - byte[] var3 = var2.field1469.getResponse(); - if (var3 != null && var3.length > 0) { - this.field1443 = 2; - return; - } - } - } - - this.method891(); - this.field1443 = 101; - return; - } - - var2 = (class176)var1.next(); - } while(var2.field1469 == null || var2.field1469.isDone()); - - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONArray;Lev;B)V", - garbageValue = "-22" - ) - void method894(JSONArray var1, UrlRequester var2) throws JSONException { - if (var1 != null) { - for (int var3 = 0; var3 < var1.length(); ++var3) { - try { - JSONObject var4 = var1.getJSONObject(var3); - class176 var5 = new class176(this); - var5.field1469 = var2.request(new URL(var4.getString("src"))); - var5.field1470 = UserComparator5.method679(var4, "placement"); - this.field1448.add(var5); - } catch (MalformedURLException var6) { - } - } - - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONArray;I)V", - garbageValue = "205832282" - ) - void method895(JSONArray var1) throws JSONException { - if (var1 != null) { - for (int var2 = 0; var2 < var1.length(); ++var2) { - JSONObject var3 = var1.getJSONObject(var2); - class177 var4 = new class177(this); - var4.field1476 = var3.getString("text"); - String var7 = var3.getString("align_x"); - byte var6; - if (var7.equals("centre")) { - var6 = 1; - } else if (!var7.equals("bottom") && !var7.equals("right")) { - var6 = 0; - } else { - var6 = 2; - } - - var4.field1473 = var6; - String var10 = var3.getString("align_y"); - byte var9; - if (var10.equals("centre")) { - var9 = 1; - } else if (!var10.equals("bottom") && !var10.equals("right")) { - var9 = 0; - } else { - var9 = 2; - } - - var4.field1475 = var9; - var4.field1474 = var3.getInt("font"); - var4.field1472 = UserComparator5.method679(var3, "placement"); - this.field1446.add(var4); - } - - } - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;I)V", - garbageValue = "3730991" - ) - void method896(JSONObject var1) throws JSONException { - if (var1 != null) { - this.field1442 = UserComparator5.method679(var1, "clickbounds"); - this.field1445 = var1.getString("endpoint"); - String[] var2 = JSONObject.getNames(var1); - - for (int var3 = 0; var3 < var1.length(); ++var3) { - if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { - try { - int var4 = var1.getInt(var2[var3]); - this.field1447.add(new class178(this, var2[var3], var4)); - } catch (Exception var8) { - try { - String var5 = var1.getString(var2[var3]); - if (var5.equals("true")) { - this.field1447.add(new class178(this, var2[var3], 1)); - } else if (var5.equals("false")) { - this.field1447.add(new class178(this, var2[var3], 0)); - } else { - this.field1447.add(new class169(this, var2[var3], var5)); - } - } catch (Exception var7) { - } - } - } - } - - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;B)V", - garbageValue = "-60" - ) - void method897(JSONObject var1) throws JSONException { - String[] var2 = JSONObject.getNames(var1); - - for (int var3 = 0; var3 < var1.length(); ++var3) { - try { - int var4 = var1.getInt(var2[var3]); - this.field1449.put(var2[var3], var4); - } catch (Exception var8) { - try { - String var5 = var1.getString(var2[var3]); - if (var5.equals("true")) { - this.field1449.put(var2[var3], 1); - } else if (var5.equals("false")) { - this.field1449.put(var2[var3], 0); - } else { - this.field1450.put(var2[var3], var5); - } - } catch (Exception var7) { - } - } - } - - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lrl;Lev;B)V", - garbageValue = "80" - ) - void method898(class462 var1, UrlRequester var2) { - JSONObject var3; - try { - var3 = var1.method2338(); - var3 = var3.getJSONObject("message"); - } catch (Exception var9) { - this.method891(); - this.field1443 = 102; - return; - } - - try { - this.method894(var3.getJSONArray("images"), var2); - } catch (Exception var8) { - this.field1448.clear(); - } - - try { - this.method895(var3.getJSONArray("labels")); - } catch (Exception var7) { - this.field1446.clear(); - } - - try { - this.method896(var3.getJSONObject("behaviour")); - } catch (Exception var6) { - this.field1445 = null; - this.field1442[0] = 0.0F; - this.field1442[1] = 0.0F; - this.field1442[2] = 1.0F; - this.field1442[3] = 1.0F; - this.field1447.clear(); - } - - try { - this.method897(var3.getJSONObject("meta")); - } catch (Exception var5) { - this.field1449.clear(); - this.field1450.clear(); - } - - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lev;I)Z", - garbageValue = "1404178579" - ) - public boolean method899(String var1, UrlRequester var2) { - try { - this.method898(new class462(var1.getBytes()), var2); - this.field1443 = this.field1448.size() > 0 ? 1 : 2; - } catch (UnsupportedEncodingException var4) { - this.field1443 = 102; - } - - return this.field1443 < 100; - } - - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "1176704124" - ) - static int method900(int var0, Script var1, boolean var2) { - return 2; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class171.java b/osrs/src/main/java/class171.java new file mode 100644 index 000000000..de8b776ff --- /dev/null +++ b/osrs/src/main/java/class171.java @@ -0,0 +1,49 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gn") +public class class171 extends class183 { + @ObfuscatedName("tz") + @ObfuscatedSignature( + descriptor = "Lbu;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("ac") + String field1428; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lgr;" + ) + final class172 this$0; + + @ObfuscatedSignature( + descriptor = "(Lgr;Ljava/lang/String;Ljava/lang/String;)V" + ) + class171(class172 var1, String var2, String var3) { + super(var1, var2); + this.this$0 = var1; + this.field1428 = var3; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1007456210" + ) + @Export("vmethod3379") + public int vmethod3379() { + return 1; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1667250407" + ) + @Export("vmethod3380") + public String vmethod3380() { + return this.field1428; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class172.java b/osrs/src/main/java/class172.java index 92070dd0c..1cb9d367b 100644 --- a/osrs/src/main/java/class172.java +++ b/osrs/src/main/java/class172.java @@ -1,72 +1,511 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("gy") +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +@ObfuscatedName("gr") public class class172 { - @ObfuscatedName("ai") - @Export("Tiles_shapes") - static byte[][][] Tiles_shapes; + @ObfuscatedName("am") + int field1431; + @ObfuscatedName("av") + String field1433; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Leq;" + ) + UrlRequest field1429; + @ObfuscatedName("aa") + String field1432; + @ObfuscatedName("ap") + float[] field1430; + @ObfuscatedName("ay") + ArrayList field1436; + @ObfuscatedName("as") + ArrayList field1435; + @ObfuscatedName("aj") + ArrayList field1434; + @ObfuscatedName("an") + Map field1437; + @ObfuscatedName("au") + Map field1438; - @ObfuscatedName("ai") + public class172() { + this.field1431 = -1; + this.field1432 = null; + this.field1430 = new float[4]; + this.field1436 = new ArrayList(); + this.field1435 = new ArrayList(); + this.field1434 = new ArrayList(); + this.field1437 = new HashMap(); + this.field1438 = new HashMap(); + } + + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lnu;Ljava/lang/String;Ljava/lang/String;I)Luk;", - garbageValue = "2141415166" + descriptor = "(Ljava/lang/String;Len;I)Z", + garbageValue = "2131230297" ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - if (!var0.isValidFileName(var1, var2)) { - return null; + public boolean method887(String var1, UrlRequester var2) { + if (var1 != null && !var1.isEmpty()) { + if (var2 == null) { + return false; + } else { + this.method899(); + + try { + this.field1433 = var1; + this.field1429 = var2.request(new URL(this.field1433)); + this.field1431 = 0; + return true; + } catch (MalformedURLException var4) { + this.method899(); + this.field1431 = 100; + return false; + } + } } else { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - IndexedSprite var5; - if (!ApproximateRouteStrategy.method345(var0, var3, var4)) { - var5 = null; + return false; + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Len;I)V", + garbageValue = "-1476947490" + ) + public void method888(UrlRequester var1) { + switch(this.field1431) { + case 0: + this.method900(var1); + break; + case 1: + this.method901(); + break; + default: + return; + } + + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1358158711" + ) + public int method890() { + return this.field1431; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "778119532" + ) + public int method891(String var1) { + return this.field1437.containsKey(var1) ? (Integer)this.field1437.get(var1) : -1; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1794264749" + ) + public String method892(String var1) { + return (String)((String)(this.field1438.containsKey(var1) ? this.field1438.get(var1) : null)); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "-1636742003" + ) + public ArrayList method893() { + return this.field1435; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "-1336792690" + ) + public ArrayList method894() { + return this.field1434; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-5" + ) + public String method896() { + return this.field1432; + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "82" + ) + public float[] method897() { + return this.field1430; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "-1672118960" + ) + public ArrayList method898() { + return this.field1436; + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + void method899() { + this.field1429 = null; + this.field1432 = null; + this.field1430[0] = 0.0F; + this.field1430[1] = 0.0F; + this.field1430[2] = 1.0F; + this.field1430[3] = 1.0F; + this.field1436.clear(); + this.field1435.clear(); + this.field1434.clear(); + this.field1437.clear(); + this.field1438.clear(); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Len;S)V", + garbageValue = "182" + ) + void method900(UrlRequester var1) { + if (this.field1429 != null && this.field1429.isDone()) { + byte[] var2 = this.field1429.getResponse(); + if (var2 == null) { + this.method899(); + this.field1431 = 100; } else { - var5 = class493.method2466(); + try { + this.method906(new class477(var2), var1); + } catch (UnsupportedEncodingException var4) { + this.method899(); + this.field1431 = 102; + return; + } + + this.field1431 = this.field1435.size() > 0 ? 1 : 2; + this.field1429 = null; + } + } + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "14" + ) + void method901() { + Iterator var1 = this.field1435.iterator(); + + class178 var2; + do { + if (!var1.hasNext()) { + var1 = this.field1435.iterator(); + + while (var1.hasNext()) { + var2 = (class178)var1.next(); + if (var2.field1460 != null) { + byte[] var3 = var2.field1460.getResponse(); + if (var3 != null && var3.length > 0) { + this.field1431 = 2; + return; + } + } + } + + this.method899(); + this.field1431 = 101; + return; + } + + var2 = (class178)var1.next(); + } while(var2.field1460 == null || var2.field1460.isDone()); + + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONArray;Len;I)V", + garbageValue = "-2004474628" + ) + void method902(JSONArray var1, UrlRequester var2) throws JSONException { + if (var1 != null) { + for (int var3 = 0; var3 < var1.length(); ++var3) { + try { + JSONObject var4 = var1.getJSONObject(var3); + class178 var5 = new class178(this); + var5.field1460 = var2.request(new URL(var4.getString("src"))); + var5.field1461 = FloorUnderlayDefinition.method1043(var4, "placement"); + this.field1435.add(var5); + } catch (MalformedURLException var6) { + } } - return var5; } } - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1301151779" + descriptor = "(Lorg/json/JSONArray;I)V", + garbageValue = "1577665850" ) - public static boolean method906(int var0) { - if (class305.field2773.isEmpty()) { - return false; - } else { - MusicSong var1 = (MusicSong)class305.field2773.get(0); - return var1 != null && var0 == var1.musicTrackGroupId; + void method903(JSONArray var1) throws JSONException { + if (var1 != null) { + for (int var2 = 0; var2 < var1.length(); ++var2) { + JSONObject var3 = var1.getJSONObject(var2); + class179 var4 = new class179(this); + var4.field1466 = var3.getString("text"); + String var7 = var3.getString("align_x"); + byte var6; + if (var7.equals("centre")) { + var6 = 1; + } else if (!var7.equals("bottom") && !var7.equals("right")) { + var6 = 0; + } else { + var6 = 2; + } + + var4.field1464 = var6; + String var10 = var3.getString("align_y"); + byte var9; + if (var10.equals("centre")) { + var9 = 1; + } else if (!var10.equals("bottom") && !var10.equals("right")) { + var9 = 0; + } else { + var9 = 2; + } + + var4.field1465 = var9; + var4.field1463 = var3.getInt("font"); + var4.field1462 = FloorUnderlayDefinition.method1043(var3, "placement"); + this.field1434.add(var4); + } + } } - @ObfuscatedName("cx") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Ltb;I)Ljava/lang/Object;", - garbageValue = "263841727" + descriptor = "(Lorg/json/JSONObject;B)V", + garbageValue = "-11" ) - static Object method908(class502 var0) { - switch(var0.field4104) { - case 1: - return Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - case 2: - return Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - default: - throw new IllegalStateException("popValueOfType() failure - unsupported type"); + void method904(JSONObject var1) throws JSONException { + if (var1 != null) { + this.field1430 = FloorUnderlayDefinition.method1043(var1, "clickbounds"); + this.field1432 = var1.getString("endpoint"); + String[] var2 = JSONObject.getNames(var1); + + for (int var3 = 0; var3 < var1.length(); ++var3) { + if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { + try { + int var4 = var1.getInt(var2[var3]); + this.field1436.add(new class180(this, var2[var3], var4)); + } catch (Exception var8) { + try { + String var5 = var1.getString(var2[var3]); + if (var5.equals("true")) { + this.field1436.add(new class180(this, var2[var3], 1)); + } else if (var5.equals("false")) { + this.field1436.add(new class180(this, var2[var3], 0)); + } else { + this.field1436.add(new class171(this, var2[var3], var5)); + } + } catch (Exception var7) { + } + } + } + } + } } - @ObfuscatedName("he") + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONObject;I)V", + garbageValue = "-451947529" + ) + void method905(JSONObject var1) throws JSONException { + String[] var2 = JSONObject.getNames(var1); + + for (int var3 = 0; var3 < var1.length(); ++var3) { + try { + int var4 = var1.getInt(var2[var3]); + this.field1437.put(var2[var3], var4); + } catch (Exception var8) { + try { + String var5 = var1.getString(var2[var3]); + if (var5.equals("true")) { + this.field1437.put(var2[var3], 1); + } else if (var5.equals("false")) { + this.field1437.put(var2[var3], 0); + } else { + this.field1438.put(var2[var3], var5); + } + } catch (Exception var7) { + } + } + } + + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IB)I", + descriptor = "(Lsi;Len;B)V", garbageValue = "0" ) - static int method907(int var0) { - return var0 * 3 + 600; + void method906(class477 var1, UrlRequester var2) { + JSONObject var3; + try { + var3 = var1.method2379(); + var3 = var3.getJSONObject("message"); + } catch (Exception var9) { + this.method899(); + this.field1431 = 102; + return; + } + + try { + this.method902(var3.getJSONArray("images"), var2); + } catch (Exception var8) { + this.field1435.clear(); + } + + try { + this.method903(var3.getJSONArray("labels")); + } catch (Exception var7) { + this.field1434.clear(); + } + + try { + this.method904(var3.getJSONObject("behaviour")); + } catch (Exception var6) { + this.field1432 = null; + this.field1430[0] = 0.0F; + this.field1430[1] = 0.0F; + this.field1430[2] = 1.0F; + this.field1430[3] = 1.0F; + this.field1436.clear(); + } + + try { + this.method905(var3.getJSONObject("meta")); + } catch (Exception var5) { + this.field1437.clear(); + this.field1438.clear(); + } + + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Len;I)Z", + garbageValue = "16776960" + ) + public boolean method907(String var1, UrlRequester var2) { + try { + this.method906(new class477(var1.getBytes()), var2); + this.field1431 = this.field1435.size() > 0 ? 1 : 2; + } catch (UnsupportedEncodingException var4) { + this.field1431 = 102; + } + + return this.field1431 < 100; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lul;B)Ljava/lang/String;", + garbageValue = "100" + ) + @Export("readString") + public static String readString(Buffer var0) { + String var1; + try { + int var2 = var0.readUShortSmart(); + if (var2 > 32767) { + var2 = 32767; + } + + byte[] var3 = new byte[var2]; + var0.offset += class349.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = class92.decodeStringCp1252(var3, 0, var2); + var1 = var4; + } catch (Exception var6) { + var1 = "Cabbage"; + } + + return var1; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-955507774" + ) + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; + if (var0 < 0 || var0 >= 65536) { + var0 >>>= 16; + var1 += 16; + } + + if (var0 >= 256) { + var0 >>>= 8; + var1 += 8; + } + + if (var0 >= 16) { + var0 >>>= 4; + var1 += 4; + } + + if (var0 >= 4) { + var0 >>>= 2; + var1 += 2; + } + + if (var0 >= 1) { + var0 >>>= 1; + ++var1; + } + + return var0 + var1; + } + + @ObfuscatedName("ny") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1926904038" + ) + static final void method908() { + Client.field525 = Client.cycleCntr; + PcmPlayer.field180 = true; } } \ No newline at end of file diff --git a/osrs/src/main/java/class174.java b/osrs/src/main/java/class174.java index 431d5a63f..d0e5b4333 100644 --- a/osrs/src/main/java/class174.java +++ b/osrs/src/main/java/class174.java @@ -2,13 +2,132 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") -public interface class174 { - @ObfuscatedName("ao") +@ObfuscatedName("gs") +public class class174 { + @ObfuscatedName("gv") + static int field1446; + + @ObfuscatedName("lf") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1751113687" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = ClanChannelMember.getPacketBufferNode(ClientPacket.RESUME_PAUSEBUTTON, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeShort(var1); + var2.packetBuffer.writeIntME(var0); + Client.packetWriter.addNode(var2); + } + + @ObfuscatedName("le") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1678554385" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); + } + + if (var1.length() > 9) { + return " " + Client.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + Client.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + Client.colorStartTag(16776960) + var1 + ""; + } + } + + @ObfuscatedName("mp") + @ObfuscatedSignature( + descriptor = "([Lnm;II)V", + garbageValue = "-1247730840" + ) + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !CollisionMap.isComponentHidden(var3))) { + if (var3.type == 0) { + if (!var3.isIf3 && CollisionMap.isComponentHidden(var3) && var3 != class64.mousedOverWidgetIf1) { + continue; + } + + drawModelComponents(var0, var3.id); + if (var3.children != null) { + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + class178.method926(var4.group); + } + } + + if (var3.type == 6) { + int var5; + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var8 = UserComparator9.runCs1(var3); + if (var8) { + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; + } + + if (var5 != -1) { + SequenceDefinition var6 = class36.SequenceDefinition_get(var5); + if (!var6.isCachedModelIdSet()) { + for (var3.modelFrameCycle += Client.field460; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; ClanChannelMember.invalidateWidget(var3)) { + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; + ++var3.modelFrame; + if (var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame = 0; + } + } + } + } else { + var3.modelFrame += Client.field460; + int var7 = var6.method1127(); + if (var3.modelFrame >= var7) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var7) { + var3.modelFrame = 0; + } + } + + ClanChannelMember.invalidateWidget(var3); + } + } + } + + if (var3.rotationKey != 0 && !var3.isIf3) { + int var9 = var3.rotationKey >> 16; + var5 = var3.rotationKey << 16 >> 16; + var9 *= Client.field460; + var5 *= Client.field460; + var3.modelAngleX = var9 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + ClanChannelMember.invalidateWidget(var3); + } + } + } + } + + } + + @ObfuscatedName("oc") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2061400252" + descriptor = "(I)V", + garbageValue = "512465925" ) - @Export("useRotation") - int useRotation(); + static void method917() { + if (Client.oculusOrbState == 1) { + Client.oculusOrbOnLocalPlayer = true; + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/class176.java b/osrs/src/main/java/class176.java index bd2d58d23..4bf496e1f 100644 --- a/osrs/src/main/java/class176.java +++ b/osrs/src/main/java/class176.java @@ -2,52 +2,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") -public class class176 { - @ObfuscatedName("ac") +@ObfuscatedName("gc") +public interface class176 { + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "[Lch;" + descriptor = "(I)I", + garbageValue = "1993578896" ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Let;" - ) - public UrlRequest field1469; - @ObfuscatedName("ae") - public float[] field1470; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final class170 this$0; - - @ObfuscatedSignature( - descriptor = "(Lgf;)V" - ) - class176(class170 var1) { - this.this$0 = var1; - this.field1470 = new float[4]; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)[Llg;", - garbageValue = "-1051328819" - ) - public static ServerPacket[] method916() { - return new ServerPacket[]{ServerPacket.NPC_ANIM_SPECIFIC, ServerPacket.AREA_SOUND, ServerPacket.TRADING_POST_UPDATE, ServerPacket.SEND_PING, ServerPacket.UPDATE_REBOOT_TIMER, ServerPacket.IF_SETEVENTS, ServerPacket.NEW_PACKET_CAM_RESET_V2, ServerPacket.SET_PLAYER_OP, ServerPacket.VARP_LARGE, ServerPacket.IF_SETOBJECT, ServerPacket.OPEN_URL, ServerPacket.IF_MOVESUB, ServerPacket.CAM_LOOKAT_EASED_ANGLE_ABSOLUTE, ServerPacket.CAM_MOVETO_EASED_CIRCULAR, ServerPacket.IF_SETTEXT, ServerPacket.REFLECTIONCHECK_FRIENDLIST, ServerPacket.MAPPROJ_ANIM, ServerPacket.GAMEFRAME_FULL, ServerPacket.UPDATE_INV_STOP_TRANSMIT, ServerPacket.MESSAGE_PRIVATE_ECHO, ServerPacket.RUN_CLIENTSCRIPT, ServerPacket.VARCLAN_ENABLE, ServerPacket.MAPPROJ_ANIM_SPECIFIC, ServerPacket.UPDATE_RUNENERGY, ServerPacket.CAM_SHAKE, ServerPacket.MESSAGE_CLANCHANNEL, ServerPacket.IF_SETNPCHEAD, ServerPacket.IF_CLOSESUB, ServerPacket.UPDATE_STAT, ServerPacket.UPDATE_IGNORELIST, ServerPacket.IF_SETCOLOUR, ServerPacket.MAP_ANIM, ServerPacket.NPC_SPOTANIM_SPECIFIC, ServerPacket.HEAT_MAP, ServerPacket.LOC_ADD_CHANGE, ServerPacket.PLAYER_ANIM_SPECIFIC, ServerPacket.OBJ_ADD, ServerPacket.TRADING_POST_RESULTS, ServerPacket.SPOTANIM_SPECIFIC, ServerPacket.VARP_SMALL, ServerPacket.CHAT_FILTER_SETTINGS, ServerPacket.UPDATE_RUNWEIGHT, ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS, ServerPacket.RESET_ANIMS, ServerPacket.SYNTH_SOUND, ServerPacket.MIDI_JINGLE, ServerPacket.IF1_MODELROTATE, ServerPacket.HINT_ARROW, ServerPacket.NEW_PACK_215, ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR, ServerPacket.IF_SETANGLE, ServerPacket.NPC_HEADICON_SPECIFIC, ServerPacket.MESSAGE_PRIVATE, ServerPacket.IF_SETSCROLLPOS, ServerPacket.REBUILD_REGION, ServerPacket.LOC_ANIM_SPECIFIC, ServerPacket.MESSAGE_GAME, ServerPacket.UPDATE_INV_FULL, ServerPacket.IF_SETANIM, ServerPacket.IF_OPENSUB, ServerPacket.IF_SETMODEL, ServerPacket.UPDATE_UID192, ServerPacket.SYNC_CLIENT_VARCACHE, ServerPacket.CLANSETTINGS_FULL, ServerPacket.CAM_LOOKAT, ServerPacket.SET_MAP_FLAG, ServerPacket.MINIMAP_TOGGLE, ServerPacket.UPDATE_FRIENDLIST, ServerPacket.TRIGGER_ONDIALOGABORT, ServerPacket.IF_SETPLAYERMODEL_OBJ, ServerPacket.PLAYER_SPOTANIM_SPECIFIC, ServerPacket.OBJ_COUNT, ServerPacket.IF_SETPOSITION, ServerPacket.UPDATE_INV_PARTIAL, ServerPacket.RESET_CLIENT_VARCACHE, ServerPacket.FRIENDLIST_LOADED, ServerPacket.NPC_INFO_SMALL, ServerPacket.MESSAGE_FRIENDCHANNEL, ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT, ServerPacket.PLAYER_INFO, ServerPacket.IF_SETPLAYERMODEL_BODYTYPE, ServerPacket.TOGGLE_OCULUS_ORB, ServerPacket.CAM_MOVETO_EASED, ServerPacket.VARCLAN, ServerPacket.LOC_DEL, ServerPacket.REFLECTION_CHECK, ServerPacket.VARCLAN_DISABLE, ServerPacket.ENTER_FREECAM, ServerPacket.CLANCHANNEL_FULL, ServerPacket.MIDI_SONG_LEGACY, ServerPacket.IF_SETHIDE, ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM, ServerPacket.OBJ_DEL_LEGACY, ServerPacket.CLANSETTINGS_DELTA, ServerPacket.UPDATE_ZONE_FULL_FOLLOWS, ServerPacket.UPDATE_INV_CLEAR, ServerPacket.CLANCHANNEL_DELTA, ServerPacket.CAM_RESET, ServerPacket.EMPTY_PACKET, ServerPacket.REBUILD_REGION_NORMAL, ServerPacket.LOGOUT, ServerPacket.LOGOUT_FULL, ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED, ServerPacket.CAM_LOOKAT_EASED_COORD, ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2, ServerPacket.IF_OPENTOP, ServerPacket.field2725, ServerPacket.CAM_MOVETO, ServerPacket.UPDATE_SITESETTINGS, ServerPacket.PREFETCH_GAMEOBJECTS, ServerPacket.IF_SETPLAYERHEAD, ServerPacket.LOC_ANIM, ServerPacket.OBJ_DEL, ServerPacket.LOGIN_SCREEN_PACKET, ServerPacket.NPC_INFO_LARGE, ServerPacket.IF_SETPLAYERMODEL_SELF, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL, ServerPacket.MIDI_SONG, ServerPacket.MIDI_SONG_STOP, ServerPacket.MIDI_SONG_WITH_SECONDARY, ServerPacket.MIDI_SWAP, ServerPacket.field2730}; - } - - @ObfuscatedName("mu") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1840256196" - ) - static final String method917(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; - } + @Export("useRotation") + int useRotation(); } \ No newline at end of file diff --git a/osrs/src/main/java/class177.java b/osrs/src/main/java/class177.java deleted file mode 100644 index a65f528a2..000000000 --- a/osrs/src/main/java/class177.java +++ /dev/null @@ -1,77 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.io.IOException; - -@ObfuscatedName("gq") -public class class177 { - @ObfuscatedName("ay") - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("at") - public String field1476; - @ObfuscatedName("ac") - public float[] field1472; - @ObfuscatedName("ai") - public int field1473; - @ObfuscatedName("az") - public int field1475; - @ObfuscatedName("ap") - public int field1474; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final class170 this$0; - - @ObfuscatedSignature( - descriptor = "(Lgf;)V" - ) - class177(class170 var1) { - this.this$0 = var1; - this.field1472 = new float[4]; - this.field1473 = 1; - this.field1475 = 1; - this.field1474 = 0; - } - - @ObfuscatedName("at") - public static int method918(long var0) { - return (int)(var0 >>> 14 & 3L); - } - - @ObfuscatedName("ob") - @ObfuscatedSignature( - descriptor = "(Ltm;S)V", - garbageValue = "-22136" - ) - static void method919(Buffer var0) { - if (Client.randomDatData != null) { - var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var2 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var2); - - int var3; - for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { - } - - if (var3 >= 24) { - throw new IOException(); - } - } catch (Exception var6) { - for (int var4 = 0; var4 < 24; ++var4) { - var2[var4] = -1; - } - } - - var0.writeBytes(var2, 0, var2.length); - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class178.java b/osrs/src/main/java/class178.java index b1c988aee..66125247f 100644 --- a/osrs/src/main/java/class178.java +++ b/osrs/src/main/java/class178.java @@ -2,56 +2,181 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") -public class class178 extends class181 { - @ObfuscatedName("ko") +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.util.Random; + +@ObfuscatedName("gh") +public class class178 { + @ObfuscatedName("aj") + static int field1457; + @ObfuscatedName("jn") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "[Lun;" + ) + static IndexedSprite[] field1459; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Lui;" + descriptor = "Leq;" ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; - @ObfuscatedName("au") - int field1478; + public UrlRequest field1460; + @ObfuscatedName("al") + public float[] field1461; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgr;" ) - final class170 this$0; + @Export("this$0") + @ObfuscatedName("this$0") + final class172 this$0; @ObfuscatedSignature( - descriptor = "(Lgf;Ljava/lang/String;I)V" + descriptor = "(Lgr;)V" ) - class178(class170 var1, String var2, int var3) { - super(var1, var2); + class178(class172 var1) { this.this$0 = var1; - this.field1478 = var3; + this.field1461 = new float[4]; } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "38" + descriptor = "(JLjava/lang/String;I)I", + garbageValue = "-871910304" ) - public int vmethod3379() { - return 0; + static final int method924(long var0, String var2) { + Random var3 = new Random(); + Buffer var4 = new Buffer(128); + Buffer var5 = new Buffer(128); + int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; + var4.writeByte(10); + + int var7; + for (var7 = 0; var7 < 4; ++var7) { + var4.writeInt(var3.nextInt()); + } + + var4.writeInt(var6[0]); + var4.writeInt(var6[1]); + var4.writeLong(var0); + var4.writeLong(0L); + + for (var7 = 0; var7 < 4; ++var7) { + var4.writeInt(var3.nextInt()); + } + + var4.encryptRsa(class74.field730, class74.field729); + var5.writeByte(10); + + for (var7 = 0; var7 < 3; ++var7) { + var5.writeInt(var3.nextInt()); + } + + var5.writeLong(var3.nextLong()); + var5.writeLongMedium(var3.nextLong()); + if (Client.randomDatData != null) { + var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + } else { + byte[] var16 = class131.method706(); + var5.writeBytes(var16, 0, var16.length); + } + + var5.writeLong(var3.nextLong()); + var5.encryptRsa(class74.field730, class74.field729); + var7 = class478.stringCp1252NullTerminatedByteSize(var2); + if (var7 % 8 != 0) { + var7 += 8 - var7 % 8; + } + + Buffer var8 = new Buffer(var7); + var8.writeStringCp1252NullTerminated(var2); + var8.offset = var7; + var8.xteaEncryptAll(var6); + Buffer var9 = new Buffer(var5.offset + var4.offset + var8.offset + 5); + var9.writeByte(2); + var9.writeByte(var4.offset); + var9.writeBytes(var4.array, 0, var4.offset); + var9.writeByte(var5.offset); + var9.writeBytes(var5.array, 0, var5.offset); + var9.writeShort(var8.offset); + var9.writeBytes(var8.array, 0, var8.offset); + String var10 = class233.method1199(var9.array); + + try { + URL var11 = new URL(ScriptEvent.method474("services", false) + "m=accountappeal/login.ws"); + URLConnection var12 = var11.openConnection(); + var12.setDoInput(true); + var12.setDoOutput(true); + var12.setConnectTimeout(5000); + OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); + var13.write("data2=" + Timer.method2181(var10) + "&dest=" + Timer.method2181("passwordchoice.ws")); + var13.flush(); + InputStream var14 = var12.getInputStream(); + var9 = new Buffer(new byte[1000]); + + do { + int var15 = var14.read(var9.array, var9.offset, 1000 - var9.offset); + if (var15 == -1) { + var13.close(); + var14.close(); + String var17 = new String(var9.array); + if (var17.startsWith("OFFLINE")) { + return 4; + } else if (var17.startsWith("WRONG")) { + return 7; + } else if (var17.startsWith("RELOAD")) { + return 3; + } else if (var17.startsWith("Not permitted for social network accounts.")) { + return 6; + } else { + var9.xteaDecryptAll(var6); + + while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { + --var9.offset; + } + + var17 = new String(var9.array, 0, var9.offset); + if (ItemComposition.method1092(var17)) { + VertexNormal.openURL(var17, true, false); + return 2; + } else { + return 5; + } + } + } + + var9.offset += var15; + } while(var9.offset < 1000); + + return 5; + } catch (Throwable var18) { + var18.printStackTrace(); + return 5; + } } - @ObfuscatedName("af") + @ObfuscatedName("iq") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1630105394" + descriptor = "(B)I", + garbageValue = "10" ) - @Export("vmethod3378") - public int vmethod3378() { - return this.field1478; + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; } - @ObfuscatedName("cf") + @ObfuscatedName("mb") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "65280" + descriptor = "(II)V", + garbageValue = "-1551769490" ) - static int method922(int var0, Script var1, boolean var2) { - return 2; + static final void method926(int var0) { + if (class33.field89.method1742(var0)) { + class174.drawModelComponents(class33.field89.Widget_interfaceComponents[var0], -1); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class179.java b/osrs/src/main/java/class179.java new file mode 100644 index 000000000..af0905e5a --- /dev/null +++ b/osrs/src/main/java/class179.java @@ -0,0 +1,50 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gg") +public class class179 { + @ObfuscatedName("ax") + public String field1466; + @ObfuscatedName("ao") + public float[] field1462; + @ObfuscatedName("ah") + public int field1464; + @ObfuscatedName("ar") + public int field1465; + @ObfuscatedName("ab") + public int field1463; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lgr;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final class172 this$0; + + @ObfuscatedSignature( + descriptor = "(Lgr;)V" + ) + class179(class172 var1) { + this.this$0 = var1; + this.field1462 = new float[4]; + this.field1464 = 1; + this.field1465 = 1; + this.field1463 = 0; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(II)Lfl;", + garbageValue = "-1919119231" + ) + static class134 method927(int var0) { + class134[] var1 = new class134[]{class134.field1268, class134.field1273, class134.field1272, class134.field1281, class134.field1276, class134.field1270, class134.field1278, class134.field1267, class134.field1274, class134.field1280, class134.field1269, class134.field1266, class134.field1277, class134.field1282, class134.field1279, class134.field1271, class134.field1275}; + class134 var2 = (class134)SequenceDefinition.findEnumerated(var1, var0); + if (var2 == null) { + var2 = class134.field1268; + } + + return var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class18.java b/osrs/src/main/java/class18.java index 35615dd08..ab604cd97 100644 --- a/osrs/src/main/java/class18.java +++ b/osrs/src/main/java/class18.java @@ -1,153 +1,280 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; import java.util.concurrent.Future; -@ObfuscatedName("ax") +@ObfuscatedName("ai") public class class18 { - @ObfuscatedName("vg") - @ObfuscatedSignature( - descriptor = "Lsm;" - ) - static PlatformInfo field51; - @ObfuscatedName("ba") - protected static String field50; - @ObfuscatedName("au") - Future field53; - @ObfuscatedName("ae") - String field52; + @ObfuscatedName("ac") + Future field52; + @ObfuscatedName("al") + String field51; class18(Future var1) { - this.field53 = var1; + this.field52 = var1; } class18(String var1) { - this.method51(var1); + this.method58(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1898504795" + garbageValue = "-979667658" ) - void method51(String var1) { + void method58(String var1) { if (var1 == null) { var1 = ""; } - this.field52 = var1; - if (this.field53 != null) { - this.field53.cancel(true); - this.field53 = null; + this.field51 = var1; + if (this.field52 != null) { + this.field52.cancel(true); + this.field52 = null; } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-197315393" + garbageValue = "1635207847" ) - public final String method52() { - return this.field52; + public final String method59() { + return this.field51; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2089695473" + descriptor = "(B)Z", + garbageValue = "0" ) - public boolean method53() { - return this.field52 != null || this.field53 == null; + public boolean method60() { + return this.field51 != null || this.field52 == null; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "1984525165" ) - public final boolean method54() { - return this.method53() ? true : this.field53.isDone(); + public final boolean method61() { + return this.method60() ? true : this.field52.isDone(); } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Las;", - garbageValue = "626026127" + descriptor = "(I)Law;", + garbageValue = "374790018" ) - public final class20 method55() { - if (this.method53()) { - return new class20(this.field52); - } else if (!this.method54()) { + public final class20 method62() { + if (this.method60()) { + return new class20(this.field51); + } else if (!this.method61()) { return null; } else { try { - return (class20)this.field53.get(); + return (class20)this.field52.get(); } catch (Exception var3) { String var2 = "Error retrieving REST request reply"; System.err.println(var2 + "\r\n" + var3); - this.method51(var2); + this.method58(var2); return new class20(var2); } } } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1969917926" + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "475812037" ) - public static void method56() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { + return Byte.TYPE; + } else if (var0.equals("I")) { + return Integer.TYPE; + } else if (var0.equals("S")) { + return Short.TYPE; + } else if (var0.equals("J")) { + return Long.TYPE; + } else if (var0.equals("Z")) { + return Boolean.TYPE; + } else if (var0.equals("F")) { + return Float.TYPE; + } else if (var0.equals("D")) { + return Double.TYPE; + } else if (var0.equals("C")) { + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); + } } - @ObfuscatedName("ap") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(S)Lch;", - garbageValue = "9992" + descriptor = "(Lnm;II)V", + garbageValue = "913707510" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return VarcInt.getNextWorldListWorld(); - } + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field3006 == null) { + throw new RuntimeException(); + } else { + if (var0.field3080 == null) { + var0.field3080 = new int[var0.field3006.length]; + } - @ObfuscatedName("ga") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "94" - ) - static void method58() { - class27.field76 = System.getenv("JX_ACCESS_TOKEN"); - class9.field20 = System.getenv("JX_REFRESH_TOKEN"); - class157.field1407 = System.getenv("JX_SESSION_ID"); - Varcs.field1140 = System.getenv("JX_CHARACTER_ID"); - class478.method2372(System.getenv("JX_DISPLAY_NAME")); + var0.field3080[var1] = Integer.MAX_VALUE; + } } - @ObfuscatedName("jh") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1303959829" + descriptor = "(ILds;ZI)I", + garbageValue = "601237968" ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; - int var4 = var1 >> 7; - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { - int var5 = var2; - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 + 1; - } - - int var6 = var0 & 127; - int var7 = var1 & 127; - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; - int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; - return var9 * var7 + var8 * (128 - var7) >> 7; + static int method65(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 4200) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class214.ItemDefinition_get(var3).name; + return 1; } else { - return 0; + int var4; + ItemComposition var5; + if (var0 == 4201) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = class214.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 4202) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = class214.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 4203) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == 4204) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; + } else { + ItemComposition var6; + if (var0 == 4205) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = class214.ItemDefinition_get(var3); + if (var6.noteTemplate == -1 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4206) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = class214.ItemDefinition_get(var3); + if (var6.noteTemplate >= 0 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4207) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == 4208) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = class214.ItemDefinition_get(var3); + if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4209) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = class214.ItemDefinition_get(var3); + if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4210) { + String var7 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FileSystem.findItemDefinitions(var7, var4 == 1); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SoundSystem.foundItemIdCount; + return 1; + } else if (var0 != 4211) { + if (var0 == 4212) { + class317.foundItemIndex = 0; + return 1; + } else if (var0 == 4213) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = class214.ItemDefinition_get(var3).getShiftClickIndex(); + if (var4 == -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + 1; + } + + return 1; + } else if (var0 == 4214) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).maleModel; + return 1; + } else if (var0 == 4215) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).maleModel1; + return 1; + } else if (var0 == 4216) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).maleModel2; + return 1; + } else if (var0 == 4217) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = class214.ItemDefinition_get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.field1817; + return 1; + } else { + return 2; + } + } else { + if (class138.foundItemIds != null && class317.foundItemIndex < SoundSystem.foundItemIdCount) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class138.foundItemIds[++class317.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + } } } } \ No newline at end of file diff --git a/osrs/src/main/java/class180.java b/osrs/src/main/java/class180.java new file mode 100644 index 000000000..82680a33b --- /dev/null +++ b/osrs/src/main/java/class180.java @@ -0,0 +1,177 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gu") +public class class180 extends class183 { + @ObfuscatedName("ab") + static int field1467; + @ObfuscatedName("ag") + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("ac") + int field1469; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lgr;" + ) + final class172 this$0; + + @ObfuscatedSignature( + descriptor = "(Lgr;Ljava/lang/String;I)V" + ) + class180(class172 var1, String var2, int var3) { + super(var1, var2); + this.this$0 = var1; + this.field1469 = var3; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1007456210" + ) + public int vmethod3379() { + return 0; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-19272" + ) + @Export("vmethod3378") + public int vmethod3378() { + return this.field1469; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Luy;I)V", + garbageValue = "2145499670" + ) + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = TextureProvider.localPlayer = Client.players[var1] = new Player(); + var2.index = var1; + int var3 = var0.readBits(30); + byte var4 = (byte)(var3 >> 28); + int var5 = var3 >> 14 & 16383; + int var6 = var3 & 16383; + var2.pathX[0] = var5 - class20.baseX; + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); + var2.pathY[0] = var6 - class19.baseY; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + class87.Client_plane = var2.plane = var4; + if (Players.cachedAppearanceBuffer[var1] != null) { + var2.read(Players.cachedAppearanceBuffer[var1]); + } + + Players.Players_count = 0; + Players.Players_indices[++Players.Players_count - 1] = var1; + Players.activityFlags[var1] = 0; + Players.Players_emptyIdxCount = 0; + + for (int var7 = 1; var7 < 2048; ++var7) { + if (var1 != var7) { + int var8 = var0.readBits(18); + int var9 = var8 >> 16; + int var10 = var8 >> 8 & 597; + int var11 = var8 & 597; + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); + Players.Players_orientations[var7] = 0; + Players.Players_targetIndices[var7] = -1; + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; + Players.activityFlags[var7] = 0; + } + } + + var0.exportIndex(); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IB)Lix;", + garbageValue = "3" + ) + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IB)Lug;", + garbageValue = "-114" + ) + @Export("getDbRowType") + public static DbRowType getDbRowType(int var0) { + DbRowType var1 = (DbRowType)DbRowType.DBRowType_cache.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = DbRowType.field4144.takeFile(38, var0); + var1 = new DbRowType(); + if (var2 != null) { + var1.method2543(new Buffer(var2)); + } + + var1.method2546(); + DbRowType.DBRowType_cache.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "(Ldj;IILip;I)V", + garbageValue = "-537634927" + ) + static final void method933(Player var0, int var1, int var2, MoveSpeed var3) { + int var4 = var0.pathX[0]; + int var5 = var0.pathY[0]; + int var6 = var0.transformedSize(); + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { + class232 var7 = Client.field651; + int var10 = var0.transformedSize(); + Client.field650.approxDestinationX = var1; + Client.field650.approxDestinationY = var2; + Client.field650.approxDestinationSizeX = 1; + Client.field650.approxDestinationSizeY = 1; + ApproximateRouteStrategy var11 = Client.field650; + int var12 = var7.method1190(var4, var5, var10, var11, Client.collisionMaps[var0.plane], true, Client.field592, Client.field593); + if (var12 >= 1) { + for (int var13 = 0; var13 < var12 - 1; ++var13) { + var0.method503(Client.field592[var13], Client.field593[var13], var3); + } + + } + } + } + } + + @ObfuscatedName("oo") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "505958374" + ) + static void method934(int var0) { + Client.oculusOrbState = var0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class181.java b/osrs/src/main/java/class181.java deleted file mode 100644 index 1f1524084..000000000 --- a/osrs/src/main/java/class181.java +++ /dev/null @@ -1,74 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gn") -public abstract class class181 { - @ObfuscatedName("at") - String field1491; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final class170 this$0; - - @ObfuscatedSignature( - descriptor = "(Lgf;Ljava/lang/String;)V" - ) - class181(class170 var1, String var2) { - this.this$0 = var1; - this.field1491 = var2; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "38" - ) - @Export("vmethod3379") - public abstract int vmethod3379(); - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1557827941" - ) - @Export("vmethod3380") - public String vmethod3380() { - return null; - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1630105394" - ) - @Export("vmethod3378") - public int vmethod3378() { - return -1; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1802215739" - ) - public String method925() { - return this.field1491; - } - - @ObfuscatedName("ln") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "0" - ) - static String method928(int var0) { - if (var0 < 0) { - return ""; - } else { - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class183.java b/osrs/src/main/java/class183.java new file mode 100644 index 000000000..05cbec0a3 --- /dev/null +++ b/osrs/src/main/java/class183.java @@ -0,0 +1,239 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hf") +public abstract class class183 { + @ObfuscatedName("ti") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("ax") + String field1483; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lgr;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final class172 this$0; + + @ObfuscatedSignature( + descriptor = "(Lgr;Ljava/lang/String;)V" + ) + class183(class172 var1, String var2) { + this.this$0 = var1; + this.field1483 = var2; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1007456210" + ) + @Export("vmethod3379") + public abstract int vmethod3379(); + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1667250407" + ) + @Export("vmethod3380") + public String vmethod3380() { + return null; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-19272" + ) + @Export("vmethod3378") + public int vmethod3378() { + return -1; + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(S)Ljava/lang/String;", + garbageValue = "4207" + ) + public String method940() { + return this.field1483; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lfz;FB)F", + garbageValue = "-84" + ) + static float method938(class132 var0, float var1) { + if (var0 != null && var0.method717() != 0) { + if (var1 < (float)var0.field1237[0].field1200) { + return var0.field1238 == class130.field1221 ? var0.field1237[0].field1197 : class104.method605(var0, var1, true); + } else if (var1 > (float)var0.field1237[var0.method717() - 1].field1200) { + return var0.field1239 == class130.field1221 ? var0.field1237[var0.method717() - 1].field1197 : class104.method605(var0, var1, false); + } else if (var0.field1235) { + return var0.field1237[0].field1197; + } else { + class127 var2 = var0.method716(var1); + boolean var3 = false; + boolean var4 = false; + if (var2 == null) { + return 0.0F; + } else { + float var5; + float var6; + float var7; + if ((double)var2.field1198 == 0.0D && 0.0D == (double)var2.field1195) { + var3 = true; + } else if (Float.MAX_VALUE == var2.field1198 && Float.MAX_VALUE == var2.field1195) { + var4 = true; + } else if (var2.field1194 != null) { + if (var0.field1236) { + var5 = (float)var2.field1200; + float var9 = var2.field1197; + var6 = var5 + var2.field1198 * 0.33333334F; + float var10 = var2.field1195 * 0.33333334F + var9; + float var8 = (float)var2.field1194.field1200; + float var12 = var2.field1194.field1197; + var7 = var8 - var2.field1194.field1196 * 0.33333334F; + float var11 = var12 - 0.33333334F * var2.field1194.field1199; + if (var0.field1233) { + float var15 = var10; + float var16 = var11; + if (var0 != null) { + float var17 = var8 - var5; + if (0.0D != (double)var17) { + float var18 = var6 - var5; + float var19 = var7 - var5; + float[] var20 = new float[]{var18 / var17, var19 / var17}; + var0.field1234 = 0.33333334F == var20[0] && var20[1] == 0.6666667F; + float var21 = var20[0]; + float var22 = var20[1]; + if ((double)var20[0] < 0.0D) { + var20[0] = 0.0F; + } + + if ((double)var20[1] > 1.0D) { + var20[1] = 1.0F; + } + + float var23; + if ((double)var20[0] > 1.0D || var20[1] < -1.0F) { + var20[1] = 1.0F - var20[1]; + if (var20[0] < 0.0F) { + var20[0] = 0.0F; + } + + if (var20[1] < 0.0F) { + var20[1] = 0.0F; + } + + if (var20[0] > 1.0F || var20[1] > 1.0F) { + var23 = (float)(1.0D + (double)(var20[0] * (var20[0] - 2.0F + var20[1])) + (double)var20[1] * ((double)var20[1] - 2.0D)); + if (class128.field1202 + var23 > 0.0F) { + class10.method36(var20); + } + } + + var20[1] = 1.0F - var20[1]; + } + + if (var21 != var20[0]) { + float var13 = var17 * var20[0] + var5; + if ((double)var21 != 0.0D) { + var15 = var9 + var20[0] * (var10 - var9) / var21; + } + } + + if (var22 != var20[1]) { + float var14 = var20[1] * var17 + var5; + if (1.0D != (double)var22) { + var16 = (float)((double)var12 - (1.0D - (double)var20[1]) * (double)(var12 - var11) / (1.0D - (double)var22)); + } + } + + var0.field1247 = var5; + var0.field1241 = var8; + class315.method1654(0.0F, var20[0], var20[1], 1.0F, var0); + var23 = var15 - var9; + float var24 = var16 - var15; + float var25 = var12 - var16; + float var26 = var24 - var23; + var0.field1243 = var25 - var24 - var26; + var0.field1248 = var26 + var26 + var26; + var0.field1250 = var23 + var23 + var23; + var0.field1245 = var9; + } + } + } else { + TileItem.method614(var0, var5, var6, var7, var8, var9, var10, var11, var12); + } + + var0.field1236 = false; + } + } else { + var3 = true; + } + + if (var3) { + return var2.field1197; + } else if (var4) { + return (float)var2.field1200 != var1 && var2.field1194 != null ? var2.field1194.field1197 : var2.field1197; + } else if (var0.field1233) { + if (var0 == null) { + var5 = 0.0F; + } else { + if (var0.field1247 == var1) { + var6 = 0.0F; + } else if (var0.field1241 == var1) { + var6 = 1.0F; + } else { + var6 = (var1 - var0.field1247) / (var0.field1241 - var0.field1247); + } + + if (var0.field1234) { + var7 = var6; + } else { + class128.field1203[3] = var0.field1240; + class128.field1203[2] = var0.field1242; + class128.field1203[1] = var0.field1249; + class128.field1203[0] = var0.field1244 - var6; + class128.field1204[0] = 0.0F; + class128.field1204[1] = 0.0F; + class128.field1204[2] = 0.0F; + class128.field1204[3] = 0.0F; + class128.field1204[4] = 0.0F; + int var27 = PacketBufferNode.method1646(class128.field1203, 3, 0.0F, true, 1.0F, true, class128.field1204); + if (var27 == 1) { + var7 = class128.field1204[0]; + } else { + var7 = 0.0F; + } + } + + var5 = var7 * ((var0.field1243 * var7 + var0.field1248) * var7 + var0.field1250) + var0.field1245; + } + + return var5; + } else { + return DevicePcmPlayerProvider.method84(var0, var1); + } + } + } + } else { + return 0.0F; + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)[Lol;", + garbageValue = "654321032" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.field3530, PlayerType.field3531, PlayerType.field3525, PlayerType.PlayerType_ironman, PlayerType.field3533, PlayerType.PlayerType_ultimateIronman, PlayerType.field3520, PlayerType.field3528, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_playerModerator, PlayerType.field3518, PlayerType.PlayerType_jagexModerator, PlayerType.field3526, PlayerType.field3522, PlayerType.field3529, PlayerType.PlayerType_normal, PlayerType.field3517}; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class184.java b/osrs/src/main/java/class184.java deleted file mode 100644 index 82dc2b1fc..000000000 --- a/osrs/src/main/java/class184.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -import java.util.concurrent.ThreadFactory; - -@ObfuscatedName("hj") -final class class184 implements ThreadFactory { - @Export("newThread") - @ObfuscatedName("newThread") - public Thread newThread(Runnable var1) { - return new Thread(var1, "OSRS Maya Anim Load"); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class186.java b/osrs/src/main/java/class186.java new file mode 100644 index 000000000..16c08af10 --- /dev/null +++ b/osrs/src/main/java/class186.java @@ -0,0 +1,47 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.concurrent.ThreadFactory; + +@ObfuscatedName("hl") +final class class186 implements ThreadFactory { + @ObfuscatedName("cl") + @Export("otp") + static String otp; + + public Thread newThread(Runnable var1) { + return new Thread(var1, "OSRS Maya Anim Load"); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1663362302" + ) + public static int method949(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { + if ((var1 & 1) != 0) { + var2 = var0 * var2; + } + + var0 *= var0; + } + + if (var1 == 1) { + return var0 * var2; + } else { + return var2; + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)[Lfj;", + garbageValue = "865282797" + ) + static class130[] method950() { + return new class130[]{class130.field1221, class130.field1223, class130.field1222, class130.field1225, class130.field1224}; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class188.java b/osrs/src/main/java/class188.java new file mode 100644 index 000000000..f4922713e --- /dev/null +++ b/osrs/src/main/java/class188.java @@ -0,0 +1,32 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hd") +public class class188 extends DualNode { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + public static EvictingDualNodeHashTable field1492; + + static { + field1492 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "726259362" + ) + static void method955() { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (class91.clientPreferences.getUsernameToRemember() != null) { + Login.Login_username = class91.clientPreferences.getUsernameToRemember(); + Client.Login_isUsernameRemembered = true; + } else { + Client.Login_isUsernameRemembered = false; + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class189.java b/osrs/src/main/java/class189.java new file mode 100644 index 000000000..119a8a9c1 --- /dev/null +++ b/osrs/src/main/java/class189.java @@ -0,0 +1,17 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hs") +public class class189 extends DualNode { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + static EvictingDualNodeHashTable field1494; + @ObfuscatedName("ao") + public static int field1493; + + static { + field1494 = new EvictingDualNodeHashTable(64); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class19.java b/osrs/src/main/java/class19.java index c9379c1fc..c16a7cb42 100644 --- a/osrs/src/main/java/class19.java +++ b/osrs/src/main/java/class19.java @@ -5,23 +5,26 @@ import java.io.IOException; import java.util.concurrent.Callable; -@ObfuscatedName("ah") +@ObfuscatedName("ae") public class class19 implements Callable { - @ObfuscatedName("au") + @ObfuscatedName("jj") + @Export("baseY") + static int baseY; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Lag;" ) final class10 field54; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Las;" ) @Export("this$0") @ObfuscatedName("this$0") final class14 this$0; @ObfuscatedSignature( - descriptor = "(Lar;Lad;)V" + descriptor = "(Las;Lag;)V" ) class19(class14 var1, class10 var2) { this.this$0 = var1; @@ -32,53 +35,92 @@ public class class19 implements Callable { @ObfuscatedName("call") public Object call() throws Exception { try { - while (this.field54.method30()) { - PendingSpawn.method505(10L); + while (this.field54.method34()) { + Players.method623(10L); } } catch (IOException var2) { return new class20("Error servicing REST query: " + var2.getMessage()); } - return this.field54.method31(); + return this.field54.method35(); } - @ObfuscatedName("az") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1773391988" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "44" ) - public static void method60() { - DbRowType.DBRowType_cache.clear(); + static void method67(String var0, String var1, String var2) { + GameEngine.method166(7); + AbstractWorldMapIcon.setLoginResponseString(var0, var1, var2); } - @ObfuscatedName("ar") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(IIIII)I", - garbageValue = "1020330780" + descriptor = "(I)V", + garbageValue = "770676496" ) - static final int method61(int var0, int var1, int var2, int var3) { - int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; - return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); + protected static final void method66() { + class314.clock.mark(); + + int var0; + for (var0 = 0; var0 < 32; ++var0) { + GameEngine.graphicsTickTimes[var0] = 0L; + } + + for (var0 = 0; var0 < 32; ++var0) { + GameEngine.clientTickTimes[var0] = 0L; + } + + class160.gameCyclesToDo = 0; } - @ObfuscatedName("my") + @ObfuscatedName("kj") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-274496968" + descriptor = "(IIIIIIIIIIB)V", + garbageValue = "-11" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (ModeWhere.loadInterface(var0)) { - Widget[] var1 = PacketBufferNode.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } + @Export("updatePendingSpawn") + static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { + PendingSpawn var10 = null; + + for (PendingSpawn var11 = (PendingSpawn)Client.pendingSpawns.last(); var11 != null; var11 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var11.plane && var11.x == var1 && var2 == var11.y && var3 == var11.type) { + var10 = var11; + break; } + } + if (var10 == null) { + var10 = new PendingSpawn(); + var10.plane = var0; + var10.type = var3; + var10.x = var1; + var10.y = var2; + var10.field946 = -1; + GrandExchangeOfferOwnWorldComparator.method350(var10); + Client.pendingSpawns.addFirst(var10); } + + var10.id = var4; + var10.objectType = var5; + var10.rotation = var6; + var10.startCycle = var8; + var10.endCycle = var9; + var10.method506(var7); + } + + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1266586426" + ) + static final void method69(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { + if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { + Client.field408[var4] = true; + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class190.java b/osrs/src/main/java/class190.java new file mode 100644 index 000000000..396b3ee1f --- /dev/null +++ b/osrs/src/main/java/class190.java @@ -0,0 +1,141 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.io.*; +import java.net.URL; + +@ObfuscatedName("hk") +public class class190 extends DualNode { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + static EvictingDualNodeHashTable field1496; + @ObfuscatedName("ag") + static int field1495; + @ObfuscatedName("fc") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + @Export("archive10") + static Archive archive10; + + static { + field1496 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "-117296699" + ) + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; + if (var1 != null) { + Throwable var4 = var1; + String var5; + if (var1 instanceof RunException) { + RunException var6 = (RunException)var1; + var5 = var6.field4315 + " | "; + var4 = var6.parent; + } else { + var5 = ""; + } + + StringWriter var18 = new StringWriter(); + PrintWriter var7 = new PrintWriter(var18); + var4.printStackTrace(var7); + var7.close(); + String var8 = var18.toString(); + BufferedReader var9 = new BufferedReader(new StringReader(var8)); + String var10 = var9.readLine(); + + label55: + while (true) { + while (true) { + String var11 = var9.readLine(); + if (var11 == null) { + var5 = var5 + "| " + var10; + var2 = var5; + break label55; + } + + int var12 = var11.indexOf(40); + int var13 = var11.indexOf(41, var12 + 1); + if (var12 >= 0 && var13 >= 0) { + String var14 = var11.substring(var12 + 1, var13); + int var15 = var14.indexOf(".java:"); + if (var15 >= 0) { + var14 = var14.substring(0, var15) + var14.substring(var15 + 5); + var5 = var5 + var14 + ' '; + continue; + } + + var11 = var11.substring(0, var12); + } + + var11 = var11.trim(); + var11 = var11.substring(var11.lastIndexOf(32) + 1); + var11 = var11.substring(var11.lastIndexOf(9) + 1); + var5 = var5 + var11 + ' '; + } + } + } + + if (var0 != null) { + if (var1 != null) { + var2 = var2 + " | "; + } + + var2 = var2 + var0; + } + + System.out.println("Error: " + var2); + var2 = var2.replace(':', '.'); + var2 = var2.replace('@', '_'); + var2 = var2.replace('&', '_'); + var2 = var2.replace('#', '_'); + if (class462.RunException_applet == null) { + return; + } + + URL var3 = new URL(class462.RunException_applet.getCodeBase(), "clienterror.ws?cv=" + RunException.RunException_revision + "&cs=" + RunException.field4313 + "&u=" + RunException.field4314 + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + class189.field1493 + "&e=" + var2); + DataInputStream var17 = new DataInputStream(var3.openStream()); + var17.read(); + var17.close(); + } catch (Exception var16) { + } + + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IS)Lhw;", + garbageValue = "13479" + ) + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); + var1 = new NPCComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); + return var1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class191.java b/osrs/src/main/java/class191.java index dbefac8ab..665bea847 100644 --- a/osrs/src/main/java/class191.java +++ b/osrs/src/main/java/class191.java @@ -1,9 +1,52 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") -public class class191 { - @ObfuscatedName("jo") - @Export("regions") - static int[] regions; +@ObfuscatedName("hn") +public class class191 extends DualNode { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + @Export("archive7") + static EvictingDualNodeHashTable archive7; + @ObfuscatedName("gg") + static String field1499; + @ObfuscatedName("uy") + @Export("cameraMoveToX") + static int cameraMoveToX; + + static { + archive7 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;I)V", + garbageValue = "-1132254955" + ) + public static void method958(AbstractArchive var0) { + class30.FloorOverlayDefinition_archive = var0; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IB)Liw;", + garbageValue = "0" + ) + public static HitSplatDefinition method959(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); + return var1; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class193.java b/osrs/src/main/java/class193.java new file mode 100644 index 000000000..ab11b6504 --- /dev/null +++ b/osrs/src/main/java/class193.java @@ -0,0 +1,61 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.io.IOException; + +@ObfuscatedName("hh") +public class class193 extends DualNode { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + @Export("archive5") + public static EvictingDualNodeHashTable archive5; + + static { + archive5 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(Lbi;B)V", + garbageValue = "-42" + ) + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; + if (var0.sound != null) { + var0.sound.position = 0; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); + } + + } + + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1522751942" + ) + static final void method964(boolean var0) { + class313.method1648(); + ++Client.packetWriter.pendingWrites; + if (Client.packetWriter.pendingWrites >= 50 || var0) { + Client.packetWriter.pendingWrites = 0; + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = ClanChannelMember.getPacketBufferNode(ClientPacket.NO_TIMEOUT, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var1); + + try { + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.hadNetworkError = true; + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class197.java b/osrs/src/main/java/class197.java deleted file mode 100644 index 5fa6ca451..000000000 --- a/osrs/src/main/java/class197.java +++ /dev/null @@ -1,61 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hp") -public class class197 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - static final class197 field1643; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - static final class197 field1639; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - static final class197 field1641; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - static final class197 field1642; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - static final class197 field1638; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - static final class197 field1640; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - static final class197 field1644; - @ObfuscatedName("ju") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - - static { - field1643 = new class197(0, class209.field1857); - field1639 = new class197(1, class209.field1862); - field1641 = new class197(2, class209.field1858); - field1642 = new class197(3, class209.field1863); - field1638 = new class197(4, class209.field1860); - field1640 = new class197(5, class209.field1861); - field1644 = new class197(6, class209.field1859); - } - - @ObfuscatedSignature( - descriptor = "(ILil;)V" - ) - class197(int var1, class209 var2) { - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class198.java b/osrs/src/main/java/class198.java new file mode 100644 index 000000000..924a071fb --- /dev/null +++ b/osrs/src/main/java/class198.java @@ -0,0 +1,178 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hc") +public class class198 { + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + @Export("archive9") + static Archive archive9; + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2044605112" + ) + public static void method992() { + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.Widget_cachedFonts.clear(); + } + + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "64" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + int var1 = Login.loginIndex; + if (var0 == -3) { + AbstractWorldMapIcon.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { + AbstractWorldMapIcon.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { + AbstractWorldMapIcon.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { + GameEngine.method166(3); + Login.field749 = 1; + } else if (var0 == 4) { + class27.method114(0); + } else if (var0 == 5) { + Login.field749 = 2; + AbstractWorldMapIcon.setLoginResponseString("Either your account is still logged in, or the last", "world you were using has become unavailable.", "Please try again later."); + } else if (var0 == 68) { + if (!Client.reloadJS5) { + Client.reloadJS5 = true; + class140.reloadJS5(); + return; + } + + AbstractWorldMapIcon.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (!Client.onMobile && var0 == 6) { + AbstractWorldMapIcon.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (var0 == 7) { + AbstractWorldMapIcon.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { + AbstractWorldMapIcon.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { + AbstractWorldMapIcon.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { + AbstractWorldMapIcon.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { + AbstractWorldMapIcon.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { + AbstractWorldMapIcon.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { + AbstractWorldMapIcon.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { + AbstractWorldMapIcon.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { + AbstractWorldMapIcon.setLoginResponseString("Too many login attempts.", "You can use the Jagex Launcher to continue playing.", "Press the button below to download it now."); + GameEngine.method166(33); + } else if (var0 == 17) { + AbstractWorldMapIcon.setLoginResponseString("To access this free world, log into a", "members world and move your character", "to a non-members area."); + } else if (var0 == 18) { + class27.method114(1); + } else if (var0 == 19) { + AbstractWorldMapIcon.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { + AbstractWorldMapIcon.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { + AbstractWorldMapIcon.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { + AbstractWorldMapIcon.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { + AbstractWorldMapIcon.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { + AbstractWorldMapIcon.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + AbstractWorldMapIcon.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { + AbstractWorldMapIcon.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + AbstractWorldMapIcon.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); + } else if (var0 == 32) { + class27.method114(2); + } else if (var0 == 37) { + AbstractWorldMapIcon.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { + AbstractWorldMapIcon.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { + GameEngine.method166(8); + } else { + if (var0 == 56) { + AbstractWorldMapIcon.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + DefaultsGroup.updateGameState(11); + return; + } + + if (var0 == 57) { + AbstractWorldMapIcon.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + DefaultsGroup.updateGameState(11); + return; + } + + if (var0 == 61) { + AbstractWorldMapIcon.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); + GameEngine.method166(7); + } else { + if (var0 == 62) { + DefaultsGroup.updateGameState(10); + GameEngine.method166(9); + AbstractWorldMapIcon.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); + return; + } + + if (var0 == 63) { + DefaultsGroup.updateGameState(10); + GameEngine.method166(9); + AbstractWorldMapIcon.setLoginResponseString("You were signed out.", "Please sign in again.", ""); + return; + } + + if (var0 == 65 || var0 == 67) { + DefaultsGroup.updateGameState(10); + GameEngine.method166(9); + AbstractWorldMapIcon.setLoginResponseString("Failed to login.", "Please try again.", ""); + return; + } + + if (var0 == 71) { + DefaultsGroup.updateGameState(10); + GameEngine.method166(7); + AbstractWorldMapIcon.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); + } else if (var0 == 73) { + DefaultsGroup.updateGameState(10); + GameEngine.method166(6); + AbstractWorldMapIcon.setLoginResponseString("Your date of birth information is waiting", "to be reviewed by our staff.", "It will be processed shortly."); + } else if (var0 == 72) { + DefaultsGroup.updateGameState(10); + GameEngine.method166(32); + } else { + AbstractWorldMapIcon.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); + } + } + } + + DefaultsGroup.updateGameState(10); + int var4 = Login.loginIndex; + boolean var5 = var4 != var1; + if (!var5 && Client.field648.method2654()) { + GameEngine.method166(9); + } + + } + + @ObfuscatedName("nv") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1161000418" + ) + static final void method994(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); + class91.clientPreferences.setAreaSoundEffectsVolume(var0); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class199.java b/osrs/src/main/java/class199.java new file mode 100644 index 000000000..8d828fe1f --- /dev/null +++ b/osrs/src/main/java/class199.java @@ -0,0 +1,75 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hv") +public class class199 extends DualNode { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + static EvictingDualNodeHashTable field1565; + @ObfuscatedName("ar") + static byte[][][] field1563; + @ObfuscatedName("fe") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("fn") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field1567; + @ObfuscatedName("ff") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + @Export("archive8") + static Archive archive8; + + static { + field1565 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "(Ldj;ZI)V", + garbageValue = "-74786800" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { + var0.isUnanimated = false; + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; + int var3 = var0.y >> 7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + long var4 = GrandExchangeOfferAgeComparator.calculateTag(0, 0, 0, false, var0.index); + if (var0.attachedModel != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = class115.getTileHeight(var0.x, var0.y, class87.Client_plane); + var0.playerCycle = Client.cycle; + class10.scene.addNullableObject(class87.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + } + + var0.tileHeight = class115.getTileHeight(var0.x, var0.y, class87.Client_plane); + var0.playerCycle = Client.cycle; + class10.scene.drawEntity(class87.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + } + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class2.java b/osrs/src/main/java/class2.java index 39892ea2e..3224f13d7 100644 --- a/osrs/src/main/java/class2.java +++ b/osrs/src/main/java/class2.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ao") +@ObfuscatedName("ak") public interface class2 { } \ No newline at end of file diff --git a/osrs/src/main/java/class20.java b/osrs/src/main/java/class20.java index 00e98ae4a..3573008e1 100644 --- a/osrs/src/main/java/class20.java +++ b/osrs/src/main/java/class20.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -6,29 +7,36 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; import java.util.Map; -@ObfuscatedName("as") +@ObfuscatedName("aw") public class class20 { - @ObfuscatedName("au") - final int field55; - @ObfuscatedName("ae") - final Map field57; - @ObfuscatedName("ao") - final String field56; + @ObfuscatedName("jr") + @Export("baseX") + static int baseX; + @ObfuscatedName("ac") + final int field56; + @ObfuscatedName("al") + final Map field58; + @ObfuscatedName("ak") + final String field57; class20(String var1) { - this.field55 = 400; - this.field57 = null; - this.field56 = ""; + this.field56 = 400; + this.field58 = null; + this.field57 = ""; } class20(HttpURLConnection var1) throws IOException { - this.field55 = var1.getResponseCode(); + this.field56 = var1.getResponseCode(); var1.getResponseMessage(); - this.field57 = var1.getHeaderFields(); + this.field58 = var1.getHeaderFields(); StringBuilder var2 = new StringBuilder(); - InputStream var3 = this.field55 >= 300 ? var1.getErrorStream() : var1.getInputStream(); + InputStream var3 = this.field56 >= 300 ? var1.getErrorStream() : var1.getInputStream(); if (var3 != null) { InputStreamReader var4 = new InputStreamReader(var3); BufferedReader var5 = new BufferedReader(var4); @@ -41,90 +49,142 @@ public class class20 { var3.close(); } - this.field56 = var2.toString(); + this.field57 = var2.toString(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "20873" + descriptor = "(I)I", + garbageValue = "-1672578717" ) - public int method63() { - return this.field55; + public int method71() { + return this.field56; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(B)Ljava/util/Map;", - garbageValue = "105" + garbageValue = "-85" ) - public Map method65() { - return this.field57; + public Map method72() { + return this.field58; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1529858789" + garbageValue = "-21006210" ) - public String method66() { - return this.field56; + public String method73() { + return this.field57; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)I", + garbageValue = "775264196" ) - public static void method64(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; + public static int method70(int var0) { + return var0 + -512; } - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lto;B)I", - garbageValue = "103" + descriptor = "(I)V", + garbageValue = "-1265533406" ) - static int method68(PacketBuffer var0) { - int var1 = var0.readBits(2); - int var2; - if (var1 == 0) { - var2 = 0; - } else if (var1 == 1) { - var2 = var0.readBits(5); - } else if (var1 == 2) { - var2 = var0.readBits(8); - } else { - var2 = var0.readBits(11); + public static void method74() { + ParamComposition.ParamDefinition_cached.clear(); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/Date;", + garbageValue = "572472849" + ) + static Date method76() throws ParseException { + SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); + var0.setLenient(false); + StringBuilder var1 = new StringBuilder(); + String[] var2 = Login.field766; + + for (int var3 = 0; var3 < var2.length; ++var3) { + String var4 = var2[var3]; + if (var4 == null) { + class19.method67("Date not valid.", "Please ensure all characters are populated.", ""); + return null; + } + + var1.append(var4); } - return var2; + var1.append("12"); + return var0.parse(var1.toString()); } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lnu;Ljava/lang/String;Ljava/lang/String;I)[Lui;", - garbageValue = "-1440236039" + descriptor = "(I)V", + garbageValue = "-690055453" ) - public static SpritePixels[] method67(AbstractArchive var0, String var1, String var2) { - if (!var0.isValidFileName(var1, var2)) { - return null; - } else { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - return WorldMapArchiveLoader.method2379(var0, var3, var4); - } + public static void method75() { + NPCComposition.NpcDefinition_cached.clear(); + NPCComposition.HitSplatDefinition_cachedFonts.clear(); } - @ObfuscatedName("ms") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-911724199" + descriptor = "(ILds;ZI)I", + garbageValue = "1223727295" ) - static final void method69(int var0) { - var0 = Math.max(Math.min(var0, 100), 0); - var0 = 100 - var0; - float var1 = 0.5F + (float)var0 / 200.0F; - HealthBarUpdate.method526((double)var1); + static int method77(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 != 1927 && var0 != 2927) { + int var4; + if (var0 == 1928) { + var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var4 >= 1 && var4 <= 10) { + class104 var5 = new class104(var4, var3.id, var3.childIndex, var3.itemId); + Interpreter.field713.add(var5); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == 2928) { + Interpreter.Interpreter_intStackSize -= 3; + int var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (var8 >= 1 && var8 <= 10) { + class104 var6 = new class104(var8, var7, var4, class33.field89.method1740(var7).itemId); + Interpreter.field713.add(var6); + return 1; + } else { + throw new RuntimeException(); + } + } else { + return 2; + } + } else if (Interpreter.field706 >= 10) { + throw new RuntimeException(); + } else { + if (var0 >= 2000) { + var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else { + var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + } + + if (var3.onResize == null) { + return 0; + } else { + ScriptEvent var9 = new ScriptEvent(); + var9.widget = var3; + var9.args = var3.onResize; + var9.field864 = Interpreter.field706 + 1; + Client.scriptEvents.addFirst(var9); + return 1; + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class200.java b/osrs/src/main/java/class200.java deleted file mode 100644 index 670d059fd..000000000 --- a/osrs/src/main/java/class200.java +++ /dev/null @@ -1,55 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hf") -public class class200 extends DualNode { - @ObfuscatedName("ce") - static String field1669; - - static { - new EvictingDualNodeHashTable(64); - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "942209246" - ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "56" - ) - static void method1009(boolean var0) { - if (var0) { - ByteArrayPool.method2148(); - } else { - for (int var1 = 0; var1 < class305.musicSongs.size(); ++var1) { - MusicSong var2 = (MusicSong)class305.musicSongs.get(var1); - if (var2 == null) { - class305.musicSongs.remove(var1); - --var1; - } else if (var2.field2863) { - if (var2.midiPcmStream.field2809 > 0) { - --var2.midiPcmStream.field2809; - } - - var2.midiPcmStream.clear(); - var2.midiPcmStream.method1633(); - var2.midiPcmStream.setPcmStreamVolume(0); - class305.musicSongs.remove(var1); - --var1; - } else { - var2.field2863 = true; - } - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class201.java b/osrs/src/main/java/class201.java new file mode 100644 index 000000000..cc38cd0e6 --- /dev/null +++ b/osrs/src/main/java/class201.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hq") +public class class201 extends DualNode { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + static EvictingDualNodeHashTable field1580; + @ObfuscatedName("jp") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + + static { + field1580 = new EvictingDualNodeHashTable(64); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class202.java b/osrs/src/main/java/class202.java new file mode 100644 index 000000000..1f146dee7 --- /dev/null +++ b/osrs/src/main/java/class202.java @@ -0,0 +1,112 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; + +@ObfuscatedName("hx") +public class class202 extends DualNode { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + static EvictingDualNodeHashTable field1582; + @ObfuscatedName("ch") + static int field1581; + + static { + field1582 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)[Lhb;", + garbageValue = "163265038" + ) + static HorizontalAlignment[] method1003() { + return new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1585, HorizontalAlignment.field1586}; + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "1725894118" + ) + static int method1004(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + if (var0 == 1700) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == 1701) { + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 1702) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; + } else if (var0 == 1707) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method1867() ? 1 : 0; + return 1; + } else if (var0 == 1708) { + return class110.method624(var3); + } else { + return var0 == 1709 ? Canvas.method88(var3) : 2; + } + } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + descriptor = "(IZZZZI)Lok;", + garbageValue = "-1284352202" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3, boolean var4) { + ArchiveDisk var5 = null; + if (JagexCache.JagexCache_dat2File != null) { + var5 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, UserComparator8.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var5, UserComparator10.field1188, class59.field309, var0, var1, var2, var3, var4, false); + } + + @ObfuscatedName("is") + @ObfuscatedSignature( + descriptor = "(Ljava/util/ArrayList;IIIII)V", + garbageValue = "976879674" + ) + static void method1006(ArrayList var0, int var1, int var2, int var3, int var4) { + if (!var0.isEmpty()) { + int var5 = (Integer)var0.get(0); + if (var5 == -1 && !Client.playingJingle) { + ItemComposition.method1088(0, 0); + } else if (var5 != -1) { + boolean var6; + if (class319.field2789.isEmpty()) { + var6 = false; + } else { + MusicSong var7 = (MusicSong)class319.field2789.get(0); + var6 = var7 != null && var5 == var7.musicTrackGroupId; + } + + if (!var6 && class91.clientPreferences.getCurrentMusicVolume() != 0) { + ArrayList var9 = new ArrayList(); + + for (int var8 = 0; var8 < var0.size(); ++var8) { + var9.add(new MusicSong(CollisionMap.archive6, (Integer)var0.get(var8), 0, class91.clientPreferences.getCurrentMusicVolume(), false)); + } + + if (Client.playingJingle) { + class275.method1538(var9, var1, var2, var3, var4); + } else { + class148.method776(var9, var1, var2, var3, var4, false); + } + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class206.java b/osrs/src/main/java/class206.java new file mode 100644 index 000000000..646374567 --- /dev/null +++ b/osrs/src/main/java/class206.java @@ -0,0 +1,42 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; + +@ObfuscatedName("ho") +public class class206 extends DualNode { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + @Export("Widget_cachedSpriteMasks") + public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; + + static { + Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-926597754" + ) + @Export("someMusicMethod") + public static void someMusicMethod(int var0, int var1, int var2, int var3) { + if (class319.musicSongs.size() > 1 && class319.musicSongs.get(0) != null && ((MusicSong)class319.musicSongs.get(0)).midiPcmStream.isReady() && class319.musicSongs.get(1) != null && ((MusicSong)class319.musicSongs.get(1)).midiPcmStream.isReady()) { + MouseHandler.method177(var0, var1, var2, var3); + class319.field2798.add(new SwapSongTask((SongTask)null)); + ArrayList var4 = new ArrayList(); + var4.add(new DelayFadeTask(new FadeInTask((SongTask)null, 1, false, class319.field2795), class319.field2793)); + var4.add(new DelayFadeTask(new FadeOutTask((SongTask)null, 0, false, class319.field2794), class319.musicPlayerStatus)); + class319.field2798.add(new ConcurrentMidiTask((SongTask)null, var4)); + if (class319.field2789.get(0) != null && class319.field2789.get(1) != null) { + MusicSong var5 = (MusicSong)class319.field2789.get(0); + class319.field2789.set(0, class319.musicSongs.get(1)); + class319.field2789.set(1, var5); + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class208.java b/osrs/src/main/java/class208.java new file mode 100644 index 000000000..d60fd071d --- /dev/null +++ b/osrs/src/main/java/class208.java @@ -0,0 +1,106 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iv") +public class class208 extends DualNode { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + public static EvictingDualNodeHashTable field1648; + + static { + field1648 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "([BIIS)Z", + garbageValue = "-1868" + ) + static final boolean method1028(byte[] var0, int var1, int var2) { + boolean var3 = true; + Buffer var4 = new Buffer(var0); + int var5 = -1; + + label57: + while (true) { + int var6 = var4.readIncrSmallSmart(); + if (var6 == 0) { + return var3; + } + + var5 += var6; + int var7 = 0; + boolean var8 = false; + + while (true) { + int var9; + while (!var8) { + var9 = var4.readUShortSmart(); + if (var9 == 0) { + continue label57; + } + + var7 += var9 - 1; + int var10 = var7 & 63; + int var11 = var7 >> 6 & 63; + int var12 = var4.readUnsignedByte() >> 2; + int var13 = var11 + var1; + int var14 = var10 + var2; + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { + ObjectComposition var15 = class91.getObjectDefinition(var5); + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { + if (!var15.needsModelFiles()) { + ++Client.field455; + var3 = false; + } + + var8 = true; + } + } + } + + var9 = var4.readUShortSmart(); + if (var9 == 0) { + break; + } + + var4.readUnsignedByte(); + } + } + } + + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-119" + ) + static boolean method1029() { + return (Client.drawPlayerNames & 4) != 0; + } + + @ObfuscatedName("lk") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIIZI)V", + garbageValue = "1833009880" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { + if (!Client.isMenuOpen) { + if (Client.menuOptionsCount < 500) { + Client.menuActions[Client.menuOptionsCount] = var0; + Client.menuTargets[Client.menuOptionsCount] = var1; + Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuIdentifiers[Client.menuOptionsCount] = var3; + Client.menuArguments1[Client.menuOptionsCount] = var4; + Client.menuArguments2[Client.menuOptionsCount] = var5; + Client.menuItemIds[Client.menuOptionsCount] = var6; + Client.menuShiftClick[Client.menuOptionsCount] = var7; + ++Client.menuOptionsCount; + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class209.java b/osrs/src/main/java/class209.java index b01483fd7..049cad4c0 100644 --- a/osrs/src/main/java/class209.java +++ b/osrs/src/main/java/class209.java @@ -1,120 +1,84 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("ik") public class class209 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lil;" - ) - static final class209 field1870; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lil;" - ) - static final class209 field1864; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lil;" - ) - static final class209 field1868; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lil;" - ) - static final class209 field1869; @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lil;" - ) - public static final class209 field1858; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lil;" - ) - static final class209 field1865; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lil;" - ) - public static final class209 field1863; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lil;" + descriptor = "Lik;" ) - public static final class209 field1861; - @ObfuscatedName("aa") + static final class209 field1649; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lil;" + descriptor = "Lik;" ) - public static final class209 field1857; - @ObfuscatedName("af") + static final class209 field1652; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lil;" + descriptor = "Lik;" ) - public static final class209 field1860; - @ObfuscatedName("ad") + static final class209 field1651; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lil;" + descriptor = "Lik;" ) - public static final class209 field1859; - @ObfuscatedName("aq") + static final class209 field1655; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lil;" + descriptor = "Lik;" ) - public static final class209 field1862; - @ObfuscatedName("al") + static final class209 field1653; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lil;" + descriptor = "Lik;" ) - static final class209 field1866; - @ObfuscatedName("an") + static final class209 field1650; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lil;" + descriptor = "Lik;" ) - static final class209 field1867; - @ObfuscatedName("ar") - public final int field1871; + static final class209 field1654; static { - field1870 = new class209(0); - field1864 = new class209(1); - field1868 = new class209(2); - field1869 = new class209(3); - field1858 = new class209(4, class197.field1641); - field1865 = new class209(5); - field1863 = new class209(6, class197.field1642); - field1861 = new class209(7, class197.field1640); - field1857 = new class209(8, class197.field1643); - field1860 = new class209(9, class197.field1638); - field1859 = new class209(10, class197.field1644); - field1862 = new class209(11, class197.field1639); - field1866 = new class209(12); - field1867 = new class209(13); + field1649 = new class209(0, class223.field1868); + field1652 = new class209(1, class223.field1865); + field1651 = new class209(2, class223.field1869); + field1655 = new class209(3, class223.field1870); + field1653 = new class209(4, class223.field1871); + field1650 = new class209(5, class223.field1866); + field1654 = new class209(6, class223.field1867); + } + + @ObfuscatedSignature( + descriptor = "(ILij;)V" + ) + class209(int var1, class223 var2) { } - class209(int var1) { - this(var1, (class197)null); + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)[Lng;", + garbageValue = "-563682826" + ) + static GameBuild[] method1031() { + return new GameBuild[]{GameBuild.LIVE, GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.WIP}; } + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILhp;)V" + descriptor = "(B)[Llu;", + garbageValue = "50" ) - class209(int var1, class197 var2) { - this.field1871 = var1; + public static ServerPacket[] method1033() { + return new ServerPacket[]{ServerPacket.NPC_ANIM_SPECIFIC, ServerPacket.REFLECTIONCHECK_FRIENDLIST, ServerPacket.TRADING_POST_UPDATE, ServerPacket.SEND_PING, ServerPacket.field2649, ServerPacket.IF_SETNPCHEAD, ServerPacket.field2652, ServerPacket.SET_PLAYER_OP, ServerPacket.OBJ_COUNT, ServerPacket.UPDATE_UID192, ServerPacket.OBJ_DEL_LEGACY, ServerPacket.MIDI_SONG_LEGACY, ServerPacket.RESET_ANIMS, ServerPacket.IF_OPENTOP, ServerPacket.UPDATE_INV_STOP_TRANSMIT, ServerPacket.MIDI_SONG_WITH_SECONDARY, ServerPacket.MAPPROJ_ANIM, ServerPacket.OPEN_URL, ServerPacket.field2643, ServerPacket.IF_CLOSESUB, ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED, ServerPacket.VARCLAN_ENABLE, ServerPacket.UPDATE_REBOOT_TIMER, ServerPacket.VARP_LARGE, ServerPacket.TRADING_POST_RESULTS, ServerPacket.MESSAGE_CLANCHANNEL, ServerPacket.NPC_SPOTANIM_SPECIFIC, ServerPacket.IF_SETTEXT, ServerPacket.UPDATE_STAT, ServerPacket.UPDATE_IGNORELIST, ServerPacket.IF_SETMODEL, ServerPacket.MAP_ANIM, ServerPacket.IF_SETEVENTS, ServerPacket.MIDI_SONG_STOP, ServerPacket.LOC_ADD_CHANGE, ServerPacket.field2675, ServerPacket.OBJ_ADD, ServerPacket.LOC_ANIM_SPECIFIC, ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS, ServerPacket.PLAYER_INFO, ServerPacket.MESSAGE_PRIVATE_ECHO, ServerPacket.UPDATE_RUNWEIGHT, ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE, ServerPacket.VARP_SMALL, ServerPacket.PLAYER_SPOTANIM_SPECIFIC, ServerPacket.field2672, ServerPacket.IF1_MODELROTATE, ServerPacket.HINT_ARROW, ServerPacket.NEW_PACK_215, ServerPacket.IF_SETANGLE, ServerPacket.IF_SETPLAYERMODEL_OBJ, ServerPacket.field2683, ServerPacket.MESSAGE_PRIVATE, ServerPacket.IF_SETOBJECT, ServerPacket.CAM_MOVETO_EASED_CIRCULAR, ServerPacket.CLANCHANNEL_DELTA, ServerPacket.IF_SETPLAYERMODEL_SELF, ServerPacket.UPDATE_INV_FULL, ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT, ServerPacket.IF_OPENSUB, ServerPacket.IF_SETPOSITION, ServerPacket.CAM_RESET, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2, ServerPacket.CLANSETTINGS_FULL, ServerPacket.CAM_SHAKE, ServerPacket.SET_MAP_FLAG, ServerPacket.MINIMAP_TOGGLE, ServerPacket.UPDATE_FRIENDLIST, ServerPacket.TRIGGER_ONDIALOGABORT, ServerPacket.MIDI_JINGLE, ServerPacket.REBUILD_REGION, ServerPacket.IF_SETPLAYERMODEL_BODYTYPE, ServerPacket.NPC_HEADICON_SPECIFIC, ServerPacket.UPDATE_INV_PARTIAL, ServerPacket.RESET_CLIENT_VARCACHE, ServerPacket.FRIENDLIST_LOADED, ServerPacket.NPC_INFO_SMALL, ServerPacket.MESSAGE_FRIENDCHANNEL, ServerPacket.REFLECTION_CHECK, ServerPacket.VARCLAN, ServerPacket.field2730, ServerPacket.MESSAGE_GAME, ServerPacket.CAM_MOVETO_EASED, ServerPacket.PREFETCH_GAMEOBJECTS, ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR, ServerPacket.SYNC_CLIENT_VARCACHE, ServerPacket.VARCLAN_DISABLE, ServerPacket.UPDATE_RUNENERGY, ServerPacket.IF_SETANIM, ServerPacket.NPC_INFO_LARGE, ServerPacket.IF_SETHIDE, ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM, ServerPacket.field2720, ServerPacket.CLANSETTINGS_DELTA, ServerPacket.RUN_CLIENTSCRIPT, ServerPacket.UPDATE_SITESETTINGS, ServerPacket.UPDATE_ZONE_FULL_FOLLOWS, ServerPacket.LOGOUT_FULL, ServerPacket.EMPTY_PACKET, ServerPacket.HEAT_MAP, ServerPacket.field2736, ServerPacket.field2714, ServerPacket.field2715, ServerPacket.SPOTANIM_SPECIFIC, ServerPacket.IF_SETSCROLLPOS, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL, ServerPacket.CAM_LOOKAT_EASED_COORD, ServerPacket.LOGOUT, ServerPacket.CAM_MOVETO, ServerPacket.field2744, ServerPacket.NEW_PACKET_CAM_RESET_V2, ServerPacket.IF_SETPLAYERHEAD, ServerPacket.UPDATE_INV_CLEAR, ServerPacket.OBJ_DEL, ServerPacket.LOGIN_SCREEN_PACKET, ServerPacket.REBUILD_REGION_NORMAL, ServerPacket.TOGGLE_OCULUS_ORB, ServerPacket.LOC_DEL, ServerPacket.MIDI_SONG, ServerPacket.ENTER_FREECAM, ServerPacket.SYNTH_SOUND, ServerPacket.MIDI_SWAP, ServerPacket.PLAYER_ANIM_SPECIFIC, ServerPacket.field2738, ServerPacket.field2755}; } - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "61" + descriptor = "(IB)Z", + garbageValue = "3" ) - static int method1087(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; - } + public static boolean method1032(int var0) { + return var0 == WorldMapDecorationType.field3173.id; } } \ No newline at end of file diff --git a/osrs/src/main/java/class210.java b/osrs/src/main/java/class210.java deleted file mode 100644 index 64a498a1b..000000000 --- a/osrs/src/main/java/class210.java +++ /dev/null @@ -1,360 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ig") -public class class210 implements class29 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lmi;" - ) - Widget field1874; - @ObfuscatedName("ae") - boolean field1872; - @ObfuscatedName("ao") - boolean field1873; - - public class210() { - this.field1874 = null; - this.field1872 = false; - this.field1873 = false; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1089015731" - ) - @Export("vmethod3949") - public boolean vmethod3949(int var1) { - if (this.field1874 == null) { - return false; - } else { - class27 var2 = this.field1874.method1846(); - if (var2 == null) { - return false; - } else { - if (var2.method102(var1)) { - switch(var1) { - case 81: - this.field1873 = true; - break; - case 82: - this.field1872 = true; - break; - default: - if (this.method1095(var1)) { - class218.invalidateWidget(this.field1874); - } - } - } - - return var2.method100(var1); - } - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1292750960" - ) - public boolean vmethod3989(int var1) { - switch(var1) { - case 81: - this.field1873 = false; - return false; - case 82: - this.field1872 = false; - return false; - default: - return false; - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-352714805" - ) - @Export("vmethod3951") - public boolean vmethod3951(char var1) { - if (this.field1874 == null) { - return false; - } else { - boolean var2; - if (var1 >= ' ' && var1 < 127 || var1 > 127 && var1 < 160 || var1 > 160 && var1 <= 255) { - var2 = true; - } else { - label81: { - if (var1 != 0) { - char[] var3 = class384.cp1252AsciiExtension; - - for (int var4 = 0; var4 < var3.length; ++var4) { - char var5 = var3[var4]; - if (var5 == var1) { - var2 = true; - break label81; - } - } - } - - var2 = false; - } - } - - if (!var2) { - return false; - } else { - class329 var7 = this.field1874.method1844(); - if (var7 != null && var7.method1787()) { - class27 var6 = this.field1874.method1846(); - if (var6 == null) { - return false; - } else { - if (var6.method103(var1) && var7.method1748(var1)) { - class218.invalidateWidget(this.field1874); - } - - return var6.method101(var1); - } - } else { - return false; - } - } - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "-1559971994" - ) - @Export("vmethod3953") - public boolean vmethod3953(boolean var1) { - return false; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Lmi;I)V", - garbageValue = "753644002" - ) - public void method1088(Widget var1) { - this.method1090(); - if (var1 != null) { - this.field1874 = var1; - class327 var2 = var1.method1847(); - if (var2 != null) { - var2.field2902.method1731(true); - if (var2.field2898 != null) { - ScriptEvent var3 = new ScriptEvent(); - var3.method479(var1); - var3.setArgs(var2.field2898); - class30.getScriptEvents().addFirst(var3); - } - } - } - - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(I)Lmi;", - garbageValue = "-869248693" - ) - public Widget method1089() { - return this.field1874; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "3" - ) - public void method1090() { - if (this.field1874 != null) { - class327 var1 = this.field1874.method1847(); - Widget var2 = this.field1874; - this.field1874 = null; - if (var1 != null) { - var1.field2902.method1731(false); - if (var1.field2898 != null) { - ScriptEvent var3 = new ScriptEvent(); - var3.method479(var2); - var3.setArgs(var1.field2898); - class30.getScriptEvents().addFirst(var3); - } - - } - } - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-53" - ) - boolean method1095(int var1) { - if (this.field1874 == null) { - return false; - } else { - class329 var2 = this.field1874.method1844(); - if (var2 != null && var2.method1787()) { - switch(var1) { - case 13: - this.method1090(); - return true; - case 48: - if (this.field1872) { - var2.method1754(); - } - - return true; - case 65: - if (this.field1872) { - var2.method1773(GrandExchangeOfferTotalQuantityComparator.method1945()); - } - - return true; - case 66: - if (this.field1872) { - var2.method1772(GrandExchangeOfferTotalQuantityComparator.method1945()); - } - - return true; - case 67: - if (this.field1872) { - var2.method1774(GrandExchangeOfferTotalQuantityComparator.method1945()); - } - - return true; - case 84: - if (var2.method1793() == 0) { - var2.method1748(10); - } else if (this.field1873 && var2.method1797()) { - var2.method1748(10); - } else { - class327 var3 = this.field1874.method1847(); - ScriptEvent var4 = new ScriptEvent(); - var4.method479(this.field1874); - var4.setArgs(var3.field2901); - class30.getScriptEvents().addFirst(var4); - this.method1090(); - } - - return true; - case 85: - if (this.field1872) { - var2.method1751(); - } else { - var2.method1749(); - } - - return true; - case 96: - if (this.field1872) { - var2.method1762(this.field1873); - } else { - var2.method1760(this.field1873); - } - - return true; - case 97: - if (this.field1872) { - var2.method1763(this.field1873); - } else { - var2.method1761(this.field1873); - } - - return true; - case 98: - if (this.field1872) { - var2.method1775(); - } else { - var2.method1764(this.field1873); - } - - return true; - case 99: - if (this.field1872) { - var2.method1776(); - } else { - var2.method1765(this.field1873); - } - - return true; - case 101: - if (this.field1872) { - var2.method1752(); - } else { - var2.method1750(); - } - - return true; - case 102: - if (this.field1872) { - var2.method1758(this.field1873); - } else { - var2.method1756(this.field1873); - } - - return true; - case 103: - if (this.field1872) { - var2.method1759(this.field1873); - } else { - var2.method1757(this.field1873); - } - - return true; - case 104: - if (this.field1872) { - var2.method1768(this.field1873); - } else { - var2.method1766(this.field1873); - } - - return true; - case 105: - if (this.field1872) { - var2.method1769(this.field1873); - } else { - var2.method1767(this.field1873); - } - - return true; - default: - return false; - } - } else { - return false; - } - } - } - - @ObfuscatedName("np") - @ObfuscatedSignature( - descriptor = "(IIIILui;Lme;I)V", - garbageValue = "-1589482115" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { - int var6 = Client.camAngleY & 2047; - int var7 = var3 * var3 + var2 * var2; - if (var7 <= 6400) { - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var10 = var3 * var8 + var9 * var2 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - if (var7 > 2500) { - var4.method2684(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); - } - - } - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class211.java b/osrs/src/main/java/class211.java deleted file mode 100644 index 2242ed338..000000000 --- a/osrs/src/main/java/class211.java +++ /dev/null @@ -1,63 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ie") -public class class211 extends Node { - @ObfuscatedName("ao") - public int field1876; - @ObfuscatedName("at") - public int field1877; - @ObfuscatedName("ac") - public int field1875; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lmi;" - ) - public Widget field1878; - - @ObfuscatedSignature( - descriptor = "(IIILmi;)V" - ) - public class211(int var1, int var2, int var3, Widget var4) { - this.field1875 = var1; - this.field1876 = var2; - this.field1877 = var3; - this.field1878 = var4; - } - - @ObfuscatedName("ae") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (0L == var0 % 37L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class388.base37Table[(int)(var6 - 37L * var0)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } - } else { - return null; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class212.java b/osrs/src/main/java/class212.java index 11d7c730f..7f41020d0 100644 --- a/osrs/src/main/java/class212.java +++ b/osrs/src/main/java/class212.java @@ -1,283 +1,38 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Arrays; - -@ObfuscatedName("iz") -public class class212 implements class29 { - @ObfuscatedName("au") - char[] field1882; - @ObfuscatedName("ae") - int[] field1888; - @ObfuscatedName("ao") - public int[] field1892; - @ObfuscatedName("at") - @Export("pressedKeysCount") - public int pressedKeysCount; +@ObfuscatedName("in") +public class class212 extends DualNode { @ObfuscatedName("ac") - int[] field1887; - @ObfuscatedName("ai") - int field1884; - @ObfuscatedName("az") - int field1886; - @ObfuscatedName("ap") - int field1885; - @ObfuscatedName("aa") - int field1883; - @ObfuscatedName("af") - boolean[] field1880; - @ObfuscatedName("ad") - boolean[] field1879; - @ObfuscatedName("aq") - boolean[] field1881; - @ObfuscatedName("al") - public char field1889; - @ObfuscatedName("an") - public int field1890; - - public class212() { - this.field1882 = new char[128]; - this.field1888 = new int[128]; - this.field1892 = new int[128]; - this.pressedKeysCount = 0; - this.field1887 = new int[128]; - this.field1884 = 0; - this.field1886 = 0; - this.field1885 = 0; - this.field1883 = 0; - this.field1880 = new boolean[112]; - this.field1879 = new boolean[112]; - this.field1881 = new boolean[112]; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1089015731" - ) - @Export("vmethod3949") - public boolean vmethod3949(int var1) { - this.method1102(var1); - this.field1880[var1] = true; - this.field1879[var1] = true; - this.field1881[var1] = false; - this.field1892[++this.pressedKeysCount - 1] = var1; - return true; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1292750960" - ) - @Export("vmethod3989") - public boolean vmethod3989(int var1) { - this.field1880[var1] = false; - this.field1879[var1] = false; - this.field1881[var1] = true; - this.field1887[++this.field1884 - 1] = var1; - return true; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-352714805" - ) - @Export("vmethod3951") - public boolean vmethod3951(char var1) { - int var2 = this.field1885 + 1 & 127; - if (var2 != this.field1886) { - this.field1888[this.field1885] = -1; - this.field1882[this.field1885] = var1; - this.field1885 = var2; - } - - return false; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "-1559971994" - ) - @Export("vmethod3953") - public boolean vmethod3953(boolean var1) { - return false; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "25" - ) - void method1102(int var1) { - int var2 = this.field1885 + 1 & 127; - if (var2 != this.field1886) { - this.field1888[this.field1885] = var1; - this.field1882[this.field1885] = 0; - this.field1885 = var2; - } - - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "831915412" - ) - public void method1104() { - this.field1886 = this.field1883; - this.field1883 = this.field1885; - this.pressedKeysCount = 0; - this.field1884 = 0; - Arrays.fill(this.field1879, false); - Arrays.fill(this.field1881, false); - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1344001483" - ) - public final boolean method1105() { - if (this.field1886 == this.field1883) { - return false; - } else { - this.field1890 = this.field1888[this.field1886]; - this.field1889 = this.field1882[this.field1886]; - this.field1886 = this.field1886 + 1 & 127; - return true; - } - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1783943803" - ) - public boolean method1106(int var1) { - return var1 >= 0 && var1 < 112 ? this.field1879[var1] : false; - } - - @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-182514708" + descriptor = "Llr;" ) - @Export("getKeyPressed") - public boolean getKeyPressed(int var1) { - return var1 >= 0 && var1 < 112 ? this.field1880[var1] : false; - } + static EvictingDualNodeHashTable field1679; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "13" - ) - public boolean method1108(int var1) { - return var1 >= 0 && var1 < 112 ? this.field1881[var1] : false; + static { + field1679 = new EvictingDualNodeHashTable(64); } - @ObfuscatedName("as") + @ObfuscatedName("nf") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-390851826" + descriptor = "(Lnm;I)Lnm;", + garbageValue = "-1852354008" ) - public int[] method1109() { - int[] var1 = new int[this.pressedKeysCount]; - - for (int var2 = 0; var2 < this.pressedKeysCount; ++var2) { - var1[var2] = this.field1892[var2]; - } - - return var1; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "60" - ) - public int[] method1110() { - int[] var1 = new int[this.field1884]; - - for (int var2 = 0; var2 < this.field1884; ++var2) { - var1[var2] = this.field1887[var2]; - } - - return var1; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "24356" - ) - static int method1099(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else if (var1 == -1) { - return 0; + static Widget method1045(Widget var0) { + int var2 = MouseRecorder.getWidgetFlags(var0); + int var1 = var2 >> 17 & 7; + int var3 = var1; + if (var1 == 0) { + return null; } else { - int var3 = 0; - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; + for (int var4 = 0; var4 < var3; ++var4) { + var0 = class33.field89.method1740(var0.parentId); + if (var0 == null) { + return null; } } - return var3; - } - } - - @ObfuscatedName("mp") - @ObfuscatedSignature( - descriptor = "([Lmi;IB)V", - garbageValue = "-27" - ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null) { - if (var3.type == 0) { - if (var3.children != null) { - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - class385.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - WorldMapSection1.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = class92.getWidget(var3.id); - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { - continue; - } - } - - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onSubChange; - WorldMapSection1.runScriptEvent(var5); - } - } + return var0; } - } } \ No newline at end of file diff --git a/osrs/src/main/java/class214.java b/osrs/src/main/java/class214.java index 88cc4f3dd..9721b074d 100644 --- a/osrs/src/main/java/class214.java +++ b/osrs/src/main/java/class214.java @@ -1,101 +1,283 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Arrays; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; -@ObfuscatedName("io") -public class class214 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - static final class214 field1903; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - static final class214 field1900; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - public static final class214 field1898; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - static final class214 field1902; +@ObfuscatedName("im") +public class class214 extends DualNode { @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Llr;" ) - static final class214 field1899; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - static final class214 field1901; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - static final class214 field1904; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "[Lio;" - ) - static final class214[] field1905; - @ObfuscatedName("ap") - final int field1906; - @ObfuscatedName("aa") - public final int field1907; - @ObfuscatedName("af") - public final int field1908; + @Export("archive4") + static EvictingDualNodeHashTable archive4; static { - field1903 = new class214(6, 8, 8); - field1900 = new class214(3, 16, 16); - field1898 = new class214(0, 32, 32); - field1902 = new class214(2, 48, 48); - field1899 = new class214(4, 64, 64); - field1901 = new class214(5, 96, 96); - field1904 = new class214(1, 128, 128); - field1905 = class271.method1541(); - Arrays.sort(field1905, new class219()); - } - - class214(int var1, int var2, int var3) { - this.field1906 = var1; - this.field1907 = var2; - this.field1908 = var3; + archive4 = new EvictingDualNodeHashTable(64); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-4502" + descriptor = "(IB)Liy;", + garbageValue = "-114" ) - int method1123() { - return this.field1908 * this.field1907; + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = class317.ItemDefinition_archive.takeFile(10, var0); + var1 = new ItemComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.post(); + if (var1.noteTemplate != -1) { + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!HealthBarUpdate.ItemDefinition_inMembersWorld && var1.isMembersOnly) { + if (var1.noteTemplate == -1 && var1.notedId == -1 && var1.placeholderTemplate == -1) { + var1.name = var1.name + " (Members)"; + } + + var1.isTradable = false; + + int var3; + for (var3 = 0; var3 < var1.groundActions.length; ++var3) { + var1.groundActions[var3] = null; + } + + for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { + if (var3 != 4) { + var1.inventoryActions[var3] = null; + } + } + + var1.shiftClickIndex = -2; + var1.team = 0; + if (var1.params != null) { + boolean var6 = false; + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { + ParamComposition var5 = class180.getParamDefinition((int)var4.key); + if (var5.autoDisable) { + var4.remove(); + } else { + var6 = true; + } + } + + if (!var6) { + var1.params = null; + } + } + } + + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1568434479" + descriptor = "(IB)Lfk;", + garbageValue = "-119" ) - public static void method1124() { - synchronized(ArchiveDiskActionHandler.field3513) { - if (ArchiveDiskActionHandler.field3512 != 0) { - ArchiveDiskActionHandler.field3512 = 1; - ArchiveDiskActionHandler.field3511 = true; - - try { - ArchiveDiskActionHandler.field3513.wait(); - } catch (InterruptedException var3) { + static class139 method1051(int var0) { + class139 var3 = (class139)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); + class139 var2; + class139 var4; + AbstractArchive var5; + AbstractArchive var6; + boolean var7; + byte[] var8; + int var9; + byte[] var10; + if (var3 != null) { + var2 = var3; + } else { + var5 = SequenceDefinition.SequenceDefinition_animationsArchive; + var6 = SequenceDefinition.SequenceDefinition_skeletonsArchive; + var7 = true; + var8 = var5.getFile(var0 >> 16 & 65535, var0 & 65535); + if (var8 == null) { + var7 = false; + var4 = null; + } else { + var9 = (var8[1] & 255) << 8 | var8[2] & 255; + var10 = var6.getFile(var9, 0); + if (var10 == null) { + var7 = false; + } + + if (!var7) { + var4 = null; + } else { + if (SoundCache.field214 == null) { + MusicPatchPcmStream.field2855 = Runtime.getRuntime().availableProcessors(); + SoundCache.field214 = new ThreadPoolExecutor(0, MusicPatchPcmStream.field2855, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(MusicPatchPcmStream.field2855 * 100 + 100), new class186()); + } + + try { + var4 = new class139(var5, var6, var0, false); + } catch (Exception var13) { + var4 = null; + } + } + } + + if (var4 != null) { + SequenceDefinition.SequenceDefinition_cachedModel.put(var4, (long)var0); + } + + var2 = var4; + } + + int var1; + if (var2 == null) { + var1 = 2; + } else { + var1 = var2.method738() ? 0 : 1; + } + + if (var1 != 0) { + return null; + } else { + var3 = (class139)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); + if (var3 != null) { + var2 = var3; + } else { + var5 = SequenceDefinition.SequenceDefinition_animationsArchive; + var6 = SequenceDefinition.SequenceDefinition_skeletonsArchive; + var7 = true; + var8 = var5.getFile(var0 >> 16 & 65535, var0 & 65535); + if (var8 == null) { + var7 = false; + var4 = null; + } else { + var9 = (var8[1] & 255) << 8 | var8[2] & 255; + var10 = var6.getFile(var9, 0); + if (var10 == null) { + var7 = false; + } + + if (!var7) { + var4 = null; + } else { + if (SoundCache.field214 == null) { + MusicPatchPcmStream.field2855 = Runtime.getRuntime().availableProcessors(); + SoundCache.field214 = new ThreadPoolExecutor(0, MusicPatchPcmStream.field2855, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(MusicPatchPcmStream.field2855 * 100 + 100), new class216()); + } + + try { + var4 = new class139(var5, var6, var0, false); + } catch (Exception var12) { + var4 = null; + } + } } + + if (var4 != null) { + SequenceDefinition.SequenceDefinition_cachedModel.put(var4, (long)var0); + } + + var2 = var4; } + return var2; } } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2124568966" + ) + static final void method1052() { + UserComparator10.method682(); + SoundSystem.method226(); + class517.method2526(); + class74.method425(); + PlayerType.method1912(); + EnumComposition.EnumDefinition_cached.clear(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); + HealthBarDefinition.NpcDefinition_cachedModels.clear(); + HealthBarDefinition.ItemDefinition_cachedModels.clear(); + HitSplatDefinition.HitSplatDefinition_cached.clear(); + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.field1697.clear(); + MouseHandler.method173(); + KitDefinition.KitDefinition_cached.clear(); + ObjTypeCustomisation.method947(); + MusicPatchPcmStream.method1725(); + class33.method135(); + class141.method749(); + class20.method75(); + class315.method1655(); + class20.method74(); + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + SequenceDefinition.SequenceDefinition_cachedModel.clear(); + class198.method992(); + Actor.method511(); + UserComparator3.method676(); + HealthBarDefinition.Widget_cachedModels.method2516(); + class53.Widget_cachedFonts.method2516(); + class206.Widget_cachedSpriteMasks.clear(); + class208.field1648.clear(); + class154.method802(); + class193.archive5.clear(); + class188.field1492.clear(); + Language.method2002(); + KeyHandler.method95(); + UserComparator10.method684(); + UserComparator9.method678(); + Client.Widget_cachedModels.clear(); + Client.archive11.clear(); + PlayerComposition.PlayerAppearance_cachedModels.clear(); + PlayerComposition.field2939.clearFiles(); + PlayerComposition.field2937 = 0; + class33.field89.method1744(); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).clear(); + Script.Script_cached.clear(); + Client.field631.clearFiles(); + class92.field888.method1950(); + class199.field1567.method1950(); + class190.archive10.method1950(); + SongTask.archive12.method1950(); + SoundSystem.archive2.method1950(); + class313.field2770.method1950(); + WorldMapDecorationType.field3154.method1950(); + class27.archive13.method1950(); + AbstractByteArrayCopier.field3136.method1950(); + class319.field2799.method1950(); + class469.field3930.method1950(); + Language.field3643.method1950(); + class198.archive9.method1950(); + CollisionMap.archive6.method1950(); + GrandExchangeOfferOwnWorldComparator.field361.method1950(); + class317.field2776.method1950(); + class199.archive8.method1950(); + class241.field2052.method1950(); + ArchiveDiskAction.field3538.method1950(); + HorizontalAlignment.field1584.method1950(); + class358.field3177.method1950(); + AABB.field2123.method1950(); + } } \ No newline at end of file diff --git a/osrs/src/main/java/class216.java b/osrs/src/main/java/class216.java index f425f4ded..9cd52d7b0 100644 --- a/osrs/src/main/java/class216.java +++ b/osrs/src/main/java/class216.java @@ -1,149 +1,46 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") -public class class216 { - @ObfuscatedName("au") - final int[][] field1919; - @ObfuscatedName("ae") - final int[][] field1918; - @ObfuscatedName("ao") - int field1913; - @ObfuscatedName("at") - int field1914; - @ObfuscatedName("ac") - final int[] field1916; - @ObfuscatedName("ai") - final int[] field1917; - @ObfuscatedName("az") - final int field1915; +import java.util.concurrent.ThreadFactory; - public class216(int var1, int var2) { - this.field1919 = new int[var1][var2]; - this.field1918 = new int[var1][var2]; - int var3 = var2 * var1; - int var4 = WorldMapIcon_1.method1401(var3 / 4); - this.field1916 = new int[var4]; - this.field1917 = new int[var4]; - this.field1915 = var4 - 1; +@ObfuscatedName("iu") +final class class216 implements ThreadFactory { + public Thread newThread(Runnable var1) { + return new Thread(var1, "OSRS Maya Anim Load"); } - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "87" + descriptor = "(CB)C", + garbageValue = "-128" ) - void method1128() { - for (int var1 = 0; var1 < this.field1919.length; ++var1) { - for (int var2 = 0; var2 < this.field1919[var1].length; ++var2) { - this.field1919[var1][var2] = 0; - this.field1918[var1][var2] = 99999999; - } + static char method1058(char var0) { + if (var0 == 198) { + return 'E'; + } else if (var0 == 230) { + return 'e'; + } else if (var0 == 223) { + return 's'; + } else if (var0 == 338) { + return 'E'; + } else { + return (char)(var0 == 339 ? 'e' : '\u0000'); } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "335221263" - ) - void method1129(int var1, int var2) { - this.field1913 = var1; - this.field1914 = var2; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "14" - ) - int method1130() { - return this.field1913; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" - ) - int method1131() { - return this.field1914; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1220057291" - ) - int method1132() { - return this.field1919.length; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" - ) - int method1133() { - return this.field1919[0].length; } - @ObfuscatedName("az") + @ObfuscatedName("nu") @ObfuscatedSignature( - descriptor = "(I)[[I", - garbageValue = "1666372984" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-541702419" ) - int[][] method1134() { - return this.field1919; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(I)[[I", - garbageValue = "-1771437641" - ) - int[][] method1135() { - return this.field1918; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-1724623959" - ) - int[] method1136() { - return this.field1916; - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-968317767" - ) - int[] method1137() { - return this.field1917; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - int method1138() { - return this.field1915; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ltm;Ljava/lang/String;I)I", - garbageValue = "-1998833421" - ) - public static int method1127(Buffer var0, String var1) { - int var2 = var0.offset; - byte[] var3 = TextureProvider.method1301(var1); - var0.writeSmartByteShort(var3.length); - var0.offset += class334.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); - return var0.offset - var2; + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { + PacketBufferNode var1 = ClanChannelMember.getPacketBufferNode(ClientPacket.f22, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class218.java b/osrs/src/main/java/class218.java deleted file mode 100644 index efe9af10f..000000000 --- a/osrs/src/main/java/class218.java +++ /dev/null @@ -1,76 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ih") -public class class218 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "[Lij;" - ) - public static class216[] field1926; - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-1881729951" - ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - return WorldMapData_1.method1486(var0, 10, true); - } - - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-7050902" - ) - static int method1146(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == 8000) { - --SoundCache.Interpreter_intStackSize; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_arrayLengths[var3]; - class477.method2370(Interpreter.Interpreter_arrays[var3], new int[var4], 0, var4 - 1); - return 1; - } else if (var0 == 8001) { - SoundCache.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_arrayLengths[var3]; - if (var6 <= 1) { - return 1; - } else { - class409.method2146(Interpreter.Interpreter_arrays[var3], var6, var4, var5); - return 1; - } - } else { - return 2; - } - } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-864232113" - ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; - } - - @ObfuscatedName("mi") - @ObfuscatedSignature( - descriptor = "(Lmi;I)V", - garbageValue = "634496397" - ) - @Export("invalidateWidget") - public static void invalidateWidget(Widget var0) { - if (var0 != null && var0.cycle == Client.field527) { - Client.field407[var0.rootIndex] = true; - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class219.java b/osrs/src/main/java/class219.java deleted file mode 100644 index b1e7e5a01..000000000 --- a/osrs/src/main/java/class219.java +++ /dev/null @@ -1,69 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Comparator; - -@ObfuscatedName("it") -public class class219 implements Comparator { - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Luk;" - ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("bw") - @Export("client") - @ObfuscatedSignature( - descriptor = "Lclient;" - ) - static Client client; - - class219() { - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lio;Lio;I)I", - garbageValue = "-975759787" - ) - int method1148(class214 var1, class214 var2) { - return var1.method1123() - var2.method1123(); - } - - @Export("compare") - @ObfuscatedName("compare") - public int compare(Object var1, Object var2) { - return this.method1148((class214)var1, (class214)var2); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lnu;Ljava/lang/String;Ljava/lang/String;B)[Luk;", - garbageValue = "-64" - ) - public static IndexedSprite[] method1149(AbstractArchive var0, String var1, String var2) { - if (!var0.isValidFileName(var1, var2)) { - return null; - } else { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - return class28.method110(var0, var3, var4); - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-38" - ) - public static void method1150() { - DbTableType.DBTableType_cache.clear(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class223.java b/osrs/src/main/java/class223.java new file mode 100644 index 000000000..d543dc454 --- /dev/null +++ b/osrs/src/main/java/class223.java @@ -0,0 +1,177 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ij") +public class class223 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + static final class223 field1872; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + static final class223 field1875; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + static final class223 field1874; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + static final class223 field1877; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class223 field1869; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + static final class223 field1873; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class223 field1870; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class223 field1866; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class223 field1868; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class223 field1871; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class223 field1867; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class223 field1865; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + static final class223 field1876; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + static final class223 field1878; + @ObfuscatedName("aw") + public static String field1863; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lui;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("as") + public final int field1879; + + static { + field1872 = new class223(0); + field1875 = new class223(1); + field1874 = new class223(2); + field1877 = new class223(3); + field1869 = new class223(4, class209.field1651); + field1873 = new class223(5); + field1870 = new class223(6, class209.field1655); + field1866 = new class223(7, class209.field1650); + field1868 = new class223(8, class209.field1649); + field1871 = new class223(9, class209.field1653); + field1867 = new class223(10, class209.field1654); + field1865 = new class223(11, class209.field1652); + field1876 = new class223(12); + field1878 = new class223(13); + } + + class223(int var1) { + this(var1, (class209)null); + } + + @ObfuscatedSignature( + descriptor = "(ILik;)V" + ) + class223(int var1, class209 var2) { + this.field1879 = var1; + } + + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-886545953" + ) + static void method1129() { + class467.field3921 = System.getenv("JX_ACCESS_TOKEN"); + class191.field1499 = System.getenv("JX_REFRESH_TOKEN"); + LoginScreenAnimation.field1042 = System.getenv("JX_SESSION_ID"); + class155.field1355 = System.getenv("JX_CHARACTER_ID"); + String var0 = System.getenv("JX_DISPLAY_NAME"); + String var1; + if (var0 != null && !var0.isEmpty() && var0.charAt(0) != '#') { + var1 = var0; + } else { + var1 = ""; + } + + Login.field761 = var1; + } + + @ObfuscatedName("mj") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "796213891" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + class36.scrollBarSprites[0].drawAt(var0, var1); + class36.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field459); + int var5 = var3 * (var3 - 32) / var4; + if (var5 < 8) { + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field458); + Rasterizer2D.method2677(var0, var6 + var1 + 16, var5, Client.field463); + Rasterizer2D.method2677(var0 + 1, var6 + var1 + 16, var5, Client.field463); + Rasterizer2D.method2675(var0, var6 + var1 + 16, 16, Client.field463); + Rasterizer2D.method2675(var0, var6 + var1 + 17, 16, Client.field463); + Rasterizer2D.method2677(var0 + 15, var6 + var1 + 16, var5, Client.field461); + Rasterizer2D.method2677(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field461); + Rasterizer2D.method2675(var0, var5 + var6 + var1 + 15, 16, Client.field461); + Rasterizer2D.method2675(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field461); + } + + @ObfuscatedName("oj") + @ObfuscatedSignature( + descriptor = "(II)Luq;", + garbageValue = "-134807305" + ) + static class521 method1131(int var0) { + class521 var1 = (class521)Client.archive11.get((long)var0); + if (var1 == null) { + var1 = new class521(class313.field2770, var0); + } + + return var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class224.java b/osrs/src/main/java/class224.java new file mode 100644 index 000000000..0533c7b9b --- /dev/null +++ b/osrs/src/main/java/class224.java @@ -0,0 +1,411 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.awt.datatransfer.Clipboard; +import java.security.SecureRandom; + +@ObfuscatedName("ib") +public class class224 implements class29 { + @ObfuscatedName("ik") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + Widget field1883; + @ObfuscatedName("al") + boolean field1882; + @ObfuscatedName("ak") + boolean field1881; + + public class224() { + this.field1883 = null; + this.field1882 = false; + this.field1881 = false; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1448724719" + ) + @Export("vmethod3949") + public boolean vmethod3949(int var1) { + if (this.field1883 == null) { + return false; + } else { + class27 var2 = this.field1883.method1879(); + if (var2 == null) { + return false; + } else { + if (var2.method109(var1)) { + switch(var1) { + case 81: + this.field1881 = true; + break; + case 82: + this.field1882 = true; + break; + default: + if (this.method1140(var1)) { + ClanChannelMember.invalidateWidget(this.field1883); + } + } + } + + return var2.method107(var1); + } + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-974805318" + ) + public boolean vmethod3989(int var1) { + switch(var1) { + case 81: + this.field1881 = false; + return false; + case 82: + this.field1882 = false; + return false; + default: + return false; + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "19" + ) + @Export("vmethod3951") + public boolean vmethod3951(char var1) { + if (this.field1883 == null) { + return false; + } else { + boolean var2; + if (var1 >= ' ' && var1 < 127 || var1 > 127 && var1 < 160 || var1 > 160 && var1 <= 255) { + var2 = true; + } else { + label81: { + if (var1 != 0) { + char[] var3 = class399.cp1252AsciiExtension; + + for (int var4 = 0; var4 < var3.length; ++var4) { + char var5 = var3[var4]; + if (var5 == var1) { + var2 = true; + break label81; + } + } + } + + var2 = false; + } + } + + if (!var2) { + return false; + } else { + class344 var7 = this.field1883.method1877(); + if (var7 != null && var7.method1819()) { + class27 var6 = this.field1883.method1879(); + if (var6 == null) { + return false; + } else { + if (var6.method110(var1) && var7.method1780(var1)) { + ClanChannelMember.invalidateWidget(this.field1883); + } + + return var6.method108(var1); + } + } else { + return false; + } + } + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "-672025946" + ) + @Export("vmethod3953") + public boolean vmethod3953(boolean var1) { + return false; + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(Lnm;I)V", + garbageValue = "-782706277" + ) + public void method1132(Widget var1) { + this.method1134(); + if (var1 != null) { + this.field1883 = var1; + class342 var2 = var1.method1880(); + if (var2 != null) { + var2.field2936.method1763(true); + if (var2.field2933 != null) { + ScriptEvent var3 = new ScriptEvent(); + var3.method470(var1); + var3.setArgs(var2.field2933); + class7.getScriptEvents().addFirst(var3); + } + } + } + + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(B)Lnm;", + garbageValue = "-68" + ) + public Widget method1133() { + return this.field1883; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-83" + ) + public void method1134() { + if (this.field1883 != null) { + class342 var1 = this.field1883.method1880(); + Widget var2 = this.field1883; + this.field1883 = null; + if (var1 != null) { + var1.field2936.method1763(false); + if (var1.field2933 != null) { + ScriptEvent var3 = new ScriptEvent(); + var3.method470(var2); + var3.setArgs(var1.field2933); + class7.getScriptEvents().addFirst(var3); + } + + } + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "104826143" + ) + boolean method1140(int var1) { + if (this.field1883 == null) { + return false; + } else { + class344 var2 = this.field1883.method1877(); + if (var2 != null && var2.method1819()) { + Clipboard var5; + switch(var1) { + case 13: + this.method1134(); + return true; + case 48: + if (this.field1882) { + var2.method1786(); + } + + return true; + case 65: + if (this.field1882) { + var5 = class159.client.getClipboard(); + var2.method1805(var5); + } + + return true; + case 66: + if (this.field1882) { + var5 = class159.client.getClipboard(); + var2.method1804(var5); + } + + return true; + case 67: + if (this.field1882) { + var5 = class159.client.getClipboard(); + var2.method1806(var5); + } + + return true; + case 84: + if (var2.method1825() == 0) { + var2.method1780(10); + } else if (this.field1881 && var2.method1829()) { + var2.method1780(10); + } else { + class342 var3 = this.field1883.method1880(); + ScriptEvent var4 = new ScriptEvent(); + var4.method470(this.field1883); + var4.setArgs(var3.field2934); + class7.getScriptEvents().addFirst(var4); + this.method1134(); + } + + return true; + case 85: + if (this.field1882) { + var2.method1783(); + } else { + var2.method1781(); + } + + return true; + case 96: + if (this.field1882) { + var2.method1794(this.field1881); + } else { + var2.method1792(this.field1881); + } + + return true; + case 97: + if (this.field1882) { + var2.method1795(this.field1881); + } else { + var2.method1793(this.field1881); + } + + return true; + case 98: + if (this.field1882) { + var2.method1807(); + } else { + var2.method1796(this.field1881); + } + + return true; + case 99: + if (this.field1882) { + var2.method1808(); + } else { + var2.method1797(this.field1881); + } + + return true; + case 101: + if (this.field1882) { + var2.method1784(); + } else { + var2.method1782(); + } + + return true; + case 102: + if (this.field1882) { + var2.method1790(this.field1881); + } else { + var2.method1788(this.field1881); + } + + return true; + case 103: + if (this.field1882) { + var2.method1791(this.field1881); + } else { + var2.method1789(this.field1881); + } + + return true; + case 104: + if (this.field1882) { + var2.method1800(this.field1881); + } else { + var2.method1798(this.field1881); + } + + return true; + case 105: + if (this.field1882) { + var2.method1801(this.field1881); + } else { + var2.method1799(this.field1881); + } + + return true; + default: + return false; + } + } else { + return false; + } + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "([BI)Lds;", + garbageValue = "-1039632832" + ) + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); + Buffer var2 = new Buffer(var0); + var2.offset = var2.array.length - 2; + int var3 = var2.readUnsignedShort(); + int var4 = var2.array.length - 2 - var3 - 12; + var2.offset = var4; + int var5 = var2.readInt(); + var1.localIntCount = var2.readUnsignedShort(); + var1.localStringCount = var2.readUnsignedShort(); + var1.intArgumentCount = var2.readUnsignedShort(); + var1.stringArgumentCount = var2.readUnsignedShort(); + int var6 = var2.readUnsignedByte(); + int var7; + int var8; + if (var6 > 0) { + var1.switches = var1.newIterableNodeHashTable(var6); + + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2.readUnsignedShort(); + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? EnumComposition.method999(var8) : 1); + var1.switches[var7] = var9; + + while (var8-- > 0) { + int var10 = var2.readInt(); + int var11 = var2.readInt(); + var9.put(new IntegerNode(var11), (long)var10); + } + } + } + + var2.offset = 0; + var1.field820 = var2.readStringCp1252NullTerminatedOrNull(); + var1.opcodes = new int[var5]; + var1.intOperands = new int[var5]; + var1.stringOperands = new String[var5]; + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { + var8 = var2.readUnsignedShort(); + if (var8 == 3) { + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); + } + } + + return var1; + } + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "(ILds;ZB)I", + garbageValue = "120" + ) + static int method1141(int var0, Script var1, boolean var2) { + return 2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class225.java b/osrs/src/main/java/class225.java new file mode 100644 index 000000000..5e6a55dbf --- /dev/null +++ b/osrs/src/main/java/class225.java @@ -0,0 +1,29 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("il") +public class class225 extends Node { + @ObfuscatedName("am") + public static int field1884; + @ObfuscatedName("ak") + public int field1885; + @ObfuscatedName("ax") + public int field1887; + @ObfuscatedName("ao") + public int field1886; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + public Widget field1888; + + @ObfuscatedSignature( + descriptor = "(IIILnm;)V" + ) + public class225(int var1, int var2, int var3, Widget var4) { + this.field1886 = var1; + this.field1885 = var2; + this.field1887 = var3; + this.field1888 = var4; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class226.java b/osrs/src/main/java/class226.java new file mode 100644 index 000000000..a0e839e7c --- /dev/null +++ b/osrs/src/main/java/class226.java @@ -0,0 +1,212 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Arrays; + +@ObfuscatedName("it") +public class class226 implements class29 { + @ObfuscatedName("ac") + char[] field1892; + @ObfuscatedName("al") + int[] field1897; + @ObfuscatedName("ak") + public int[] field1902; + @ObfuscatedName("ax") + @Export("pressedKeysCount") + public int pressedKeysCount; + @ObfuscatedName("ao") + int[] field1898; + @ObfuscatedName("ah") + int field1894; + @ObfuscatedName("ar") + int field1896; + @ObfuscatedName("ab") + int field1893; + @ObfuscatedName("am") + int field1895; + @ObfuscatedName("av") + boolean[] field1891; + @ObfuscatedName("ag") + boolean[] field1890; + @ObfuscatedName("aa") + boolean[] field1889; + @ObfuscatedName("ap") + public char field1899; + @ObfuscatedName("ay") + public int field1901; + + public class226() { + this.field1892 = new char[128]; + this.field1897 = new int[128]; + this.field1902 = new int[128]; + this.pressedKeysCount = 0; + this.field1898 = new int[128]; + this.field1894 = 0; + this.field1896 = 0; + this.field1893 = 0; + this.field1895 = 0; + this.field1891 = new boolean[112]; + this.field1890 = new boolean[112]; + this.field1889 = new boolean[112]; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1448724719" + ) + @Export("vmethod3949") + public boolean vmethod3949(int var1) { + this.method1145(var1); + this.field1891[var1] = true; + this.field1890[var1] = true; + this.field1889[var1] = false; + this.field1902[++this.pressedKeysCount - 1] = var1; + return true; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-974805318" + ) + @Export("vmethod3989") + public boolean vmethod3989(int var1) { + this.field1891[var1] = false; + this.field1890[var1] = false; + this.field1889[var1] = true; + this.field1898[++this.field1894 - 1] = var1; + return true; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "19" + ) + @Export("vmethod3951") + public boolean vmethod3951(char var1) { + int var2 = this.field1893 + 1 & 127; + if (var2 != this.field1896) { + this.field1897[this.field1893] = -1; + this.field1892[this.field1893] = var1; + this.field1893 = var2; + } + + return false; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "-672025946" + ) + @Export("vmethod3953") + public boolean vmethod3953(boolean var1) { + return false; + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1769728274" + ) + void method1145(int var1) { + int var2 = this.field1893 + 1 & 127; + if (var2 != this.field1896) { + this.field1897[this.field1893] = var1; + this.field1892[this.field1893] = 0; + this.field1893 = var2; + } + + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + public void method1147() { + this.field1896 = this.field1895; + this.field1895 = this.field1893; + this.pressedKeysCount = 0; + this.field1894 = 0; + Arrays.fill(this.field1890, false); + Arrays.fill(this.field1889, false); + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-192433797" + ) + public final boolean method1148() { + if (this.field1896 == this.field1895) { + return false; + } else { + this.field1901 = this.field1897[this.field1896]; + this.field1899 = this.field1892[this.field1896]; + this.field1896 = this.field1896 + 1 & 127; + return true; + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1443777028" + ) + public boolean method1149(int var1) { + return var1 >= 0 && var1 < 112 ? this.field1890[var1] : false; + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-978109184" + ) + @Export("getKeyPressed") + public boolean getKeyPressed(int var1) { + return var1 >= 0 && var1 < 112 ? this.field1891[var1] : false; + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1065204501" + ) + public boolean method1151(int var1) { + return var1 >= 0 && var1 < 112 ? this.field1889[var1] : false; + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(B)[I", + garbageValue = "118" + ) + public int[] method1152() { + int[] var1 = new int[this.pressedKeysCount]; + + for (int var2 = 0; var2 < this.pressedKeysCount; ++var2) { + var1[var2] = this.field1902[var2]; + } + + return var1; + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(B)[I", + garbageValue = "-31" + ) + public int[] method1153() { + int[] var1 = new int[this.field1894]; + + for (int var2 = 0; var2 < this.field1894; ++var2) { + var1[var2] = this.field1898[var2]; + } + + return var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class227.java b/osrs/src/main/java/class227.java deleted file mode 100644 index 5e9076037..000000000 --- a/osrs/src/main/java/class227.java +++ /dev/null @@ -1,184 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("im") -public class class227 { - @ObfuscatedName("ac") - @Export("Tiles_overlays") - static short[][][] Tiles_overlays; - @ObfuscatedName("gc") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - static Archive field2040; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "[Leo;" - ) - class127[] field2042; - @ObfuscatedName("ao") - int field2043; - - @ObfuscatedSignature( - descriptor = "(Ltm;I)V" - ) - class227(Buffer var1, int var2) { - this.field2042 = new class127[var2]; - this.field2043 = var1.readUnsignedByte(); - - for (int var3 = 0; var3 < this.field2042.length; ++var3) { - class127 var4 = new class127(this.field2043, var1, false); - this.field2042[var3] = var4; - } - - this.method1211(); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1763972541" - ) - void method1211() { - class127[] var1 = this.field2042; - - for (int var2 = 0; var2 < var1.length; ++var2) { - class127 var3 = var1[var2]; - if (var3.field1222 >= 0) { - var3.field1221 = this.field2042[var3.field1222]; - } - } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1286602518" - ) - public int method1212() { - return this.field2042.length; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(II)Leo;", - garbageValue = "-1526328024" - ) - class127 method1213(int var1) { - return var1 >= this.method1212() ? null : this.field2042[var1]; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(I)[Leo;", - garbageValue = "110730333" - ) - class127[] method1214() { - return this.field2042; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lfv;II)V", - garbageValue = "1299283005" - ) - void method1216(class137 var1, int var2) { - this.method1217(var1, var2, (boolean[])null, false); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Lfv;I[ZZB)V", - garbageValue = "63" - ) - void method1217(class137 var1, int var2, boolean[] var3, boolean var4) { - int var5 = var1.method747(); - int var6 = 0; - class127[] var7 = this.method1214(); - - for (int var8 = 0; var8 < var7.length; ++var8) { - class127 var9 = var7[var8]; - if (var3 == null || var4 == var3[var6]) { - var1.method749(var2, var9, var6, var5); - } - - ++var6; - } - - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)Lhk;", - garbageValue = "-1038928775" - ) - public static VarcInt method1210(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); - var1 = new VarcInt(); - if (var2 != null) { - var1.method954(new Buffer(var2)); - } - - VarcInt.VarcInt_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;Lnu;I)V", - garbageValue = "1390466926" - ) - public static void method1215(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - UserComparator2.SequenceDefinition_archive = var0; - VarpDefinition.SequenceDefinition_animationsArchive = var1; - class485.SequenceDefinition_skeletonsArchive = var2; - } - - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "(B)Lsi;", - garbageValue = "0" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return Canvas.worldMap; - } - - @ObfuscatedName("mt") - @ObfuscatedSignature( - descriptor = "(Lmi;III)V", - garbageValue = "-767534293" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null && WorldMapLabelSize.method1395(var0) != null) { - Client.clickedWidget = var0; - Client.clickedWidgetParent = WorldMapLabelSize.method1395(var0); - Client.widgetClickX = var1; - Client.widgetClickY = var2; - class159.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var3 = Client.menuOptionsCount - 1; - if (var3 != -1) { - class9.tempMenuAction = new MenuAction(); - class9.tempMenuAction.param0 = Client.menuArguments1[var3]; - class9.tempMenuAction.param1 = Client.menuArguments2[var3]; - class9.tempMenuAction.opcode = Client.menuOpcodes[var3]; - class9.tempMenuAction.identifier = Client.menuIdentifiers[var3]; - class9.tempMenuAction.itemId = Client.menuItemIds[var3]; - class9.tempMenuAction.action = Client.menuActions[var3]; - class9.tempMenuAction.target = Client.menuTargets[var3]; - } - - } - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class228.java b/osrs/src/main/java/class228.java index c143f5b2e..a3644cfa1 100644 --- a/osrs/src/main/java/class228.java +++ b/osrs/src/main/java/class228.java @@ -1,97 +1,93 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") -public abstract class class228 extends Rasterizer2D { - @ObfuscatedName("au") - boolean field2045; - @ObfuscatedName("ae") - boolean field2044; - @ObfuscatedName("az") - int[] field2046; - @ObfuscatedName("ap") +import java.util.Arrays; + +@ObfuscatedName("ic") +public class class228 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Lic;" ) - Clips field2047; - + static final class228 field1909; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljl;)V" + descriptor = "Lic;" ) - class228(Clips var1) { - this.field2045 = false; - this.field2044 = false; - this.field2046 = Rasterizer3D.Rasterizer3D_colorPalette; - this.field2047 = var1; - } + static final class228 field1912; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + static final class228 field1911; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + static final class228 field1915; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + static final class228 field1913; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + static final class228 field1910; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + static final class228 field1914; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "[Lic;" + ) + static final class228[] field1916; + @ObfuscatedName("ab") + final int field1917; + @ObfuscatedName("am") + final int field1918; + @ObfuscatedName("av") + final int field1919; - @ObfuscatedName("au") - void method1220(int[] var1, int var2, int var3, float[] var4) { - Rasterizer2D.method2620(var1, var2, var3, var4); + static { + field1909 = new class228(5, 8, 8); + field1912 = new class228(0, 16, 16); + field1911 = new class228(1, 32, 32); + field1915 = new class228(6, 48, 48); + field1913 = new class228(4, 64, 64); + field1910 = new class228(2, 96, 96); + field1914 = new class228(3, 128, 128); + class228[] var0 = new class228[]{field1912, field1911, field1910, field1914, field1913, field1909, field1915}; + field1916 = var0; + Arrays.sort(field1916, new class233()); } - @ObfuscatedName("at") - void method1223(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, byte var13, byte var14, byte var15, byte var16) { - var10 = method1221(var10, var13, var14, var15, var16); - var11 = method1221(var11, var13, var14, var15, var16); - var12 = method1221(var12, var13, var14, var15, var16); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12); + class228(int var1, int var2, int var3) { + this.field1917 = var1; + this.field1918 = var2; + this.field1919 = var3; } @ObfuscatedName("ac") - void method1224(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, byte var11, byte var12, byte var13, byte var14) { - int var15 = method1221(var10, var11, var12, var13, var14); - var10 = this.field2046[var15]; - this.vmethod1366(var1, var2, var3, var4, var5, var6, var7, var8, var9, var10); - } - - @ObfuscatedName("ai") - @Export("vmethod1374") - abstract void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12); - - @ObfuscatedName("az") - @Export("vmethod1366") - abstract void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10); - - @ObfuscatedName("ap") - @Export("vmethod1378") - abstract void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22); - - @ObfuscatedName("aa") - @Export("vmethod1362") - abstract void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22); - - @ObfuscatedName("ae") - static int method1221(int var0, byte var1, byte var2, byte var3, byte var4) { - int var5 = var0 >> 10 & 63; - int var6 = var0 >> 7 & 7; - int var7 = var0 & 127; - int var8 = var4 & 255; - if (var1 != -1) { - var5 += var8 * (var1 - var5) >> 7; - } - - if (var2 != -1) { - var6 += var8 * (var2 - var6) >> 7; - } - - if (var3 != -1) { - var7 += var8 * (var3 - var7) >> 7; - } - - return (var5 << 10 | var6 << 7 | var7) & 65535; + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "14" + ) + int method1168() { + return this.field1919 * this.field1918; } - @ObfuscatedName("ao") - static final int method1222(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1760324394" + ) + public static int method1169(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 7 & 127L); + return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class230.java b/osrs/src/main/java/class230.java new file mode 100644 index 000000000..9bb863b98 --- /dev/null +++ b/osrs/src/main/java/class230.java @@ -0,0 +1,227 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ig") +public class class230 { + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lli;" + ) + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("dl") + @ObfuscatedSignature( + descriptor = "Lun;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("ac") + final int[][] field1931; + @ObfuscatedName("al") + final int[][] field1932; + @ObfuscatedName("ak") + int field1926; + @ObfuscatedName("ax") + int field1927; + @ObfuscatedName("ao") + final int[] field1930; + @ObfuscatedName("ah") + final int[] field1929; + @ObfuscatedName("ar") + final int field1928; + + class230(int var1, int var2) { + this.field1931 = new int[var1][var2]; + this.field1932 = new int[var1][var2]; + int var3 = var2 * var1; + int var4 = EnumComposition.method999(var3 / 4); + this.field1930 = new int[var4]; + this.field1929 = new int[var4]; + this.field1928 = var4 - 1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "79" + ) + void method1173() { + for (int var1 = 0; var1 < this.field1931.length; ++var1) { + for (int var2 = 0; var2 < this.field1931[var1].length; ++var2) { + this.field1931[var1][var2] = 0; + this.field1932[var1][var2] = 99999999; + } + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-19" + ) + void method1174(int var1, int var2) { + this.field1926 = var1; + this.field1927 = var2; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-9624" + ) + int method1175() { + return this.field1926; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-3816" + ) + int method1176() { + return this.field1927; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-796520814" + ) + int method1177() { + return this.field1931.length; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1493129305" + ) + int method1178() { + return this.field1931[0].length; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)[[I", + garbageValue = "-1798810715" + ) + int[][] method1179() { + return this.field1931; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(B)[[I", + garbageValue = "19" + ) + int[][] method1180() { + return this.field1932; + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(B)[I", + garbageValue = "40" + ) + int[] method1181() { + return this.field1930; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "-1267204855" + ) + int[] method1182() { + return this.field1929; + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2043277042" + ) + int method1183() { + return this.field1928; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(IZIZI)V", + garbageValue = "-575404360" + ) + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (UserComparator3.World_worlds != null) { + FloorDecoration.doWorldSorting(0, UserComparator3.World_worlds.length - 1, var0, var1, var2, var3); + } + + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IZI)I", + garbageValue = "-527981427" + ) + public static int method1184(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); + + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + throw new NumberFormatException(); + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + throw new NumberFormatException(); + } + + if (var3) { + var10 = -var10; + } + + int var9 = var10 + var5 * var1; + if (var9 / var1 != var5) { + throw new NumberFormatException(); + } + + var5 = var9; + var4 = true; + } + + if (!var4) { + throw new NumberFormatException(); + } else { + return var5; + } + } else { + throw new IllegalArgumentException("" + var1); + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class232.java b/osrs/src/main/java/class232.java new file mode 100644 index 000000000..e13d229f1 --- /dev/null +++ b/osrs/src/main/java/class232.java @@ -0,0 +1,1284 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ia") +public class class232 { + @ObfuscatedName("uc") + @Export("cameraLookAtSpeed") + static int cameraLookAtSpeed; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "[Lig;" + ) + class230[] field1939; + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "21" + ) + public void method1189() { + this.field1939 = new class230[1]; + class228 var1 = class228.field1911; + this.field1939[0] = new class230(var1.field1918, var1.field1919); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IIILiq;Lih;Z[I[II)I", + garbageValue = "1180709957" + ) + public int method1190(int var1, int var2, int var3, RouteStrategy var4, CollisionMap var5, boolean var6, int[] var7, int[] var8) { + return this.method1191(var1, var2, var3, var4, var5, var6, var7, var8, this.field1939[0]); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(IIILiq;Lih;Z[I[ILig;B)I", + garbageValue = "35" + ) + int method1191(int var1, int var2, int var3, RouteStrategy var4, CollisionMap var5, boolean var6, int[] var7, int[] var8, class230 var9) { + var9.method1173(); + int var10 = var9.method1177(); + int var11 = var9.method1178(); + int[][] var12 = var9.method1180(); + int[][] var13 = var9.method1179(); + int[] var14 = var9.method1181(); + int[] var15 = var9.method1182(); + boolean var16; + if (var3 == 1) { + var16 = this.method1193(var1, var2, var4, var5, var9); + } else if (var3 == 2) { + var16 = this.method1194(var1, var2, var4, var5, var9); + } else { + var16 = this.method1195(var1, var2, var3, var4, var5, var9); + } + + int var17 = var1 - (var10 >> 1); + int var18 = var2 - (var11 >> 1); + int var19 = var9.method1175(); + int var20 = var9.method1176(); + int var21; + int var22; + int var24; + if (!var16) { + if (!var6) { + return -1; + } + + var21 = Integer.MAX_VALUE; + var22 = Integer.MAX_VALUE; + byte var23 = 10; + var24 = var4.approxDestinationX; + int var25 = var4.approxDestinationY; + int var26 = var4.approxDestinationSizeX; + int var27 = var4.approxDestinationSizeY; + + for (int var28 = var24 - var23; var28 <= var23 + var24; ++var28) { + for (int var29 = var25 - var23; var29 <= var25 + var23; ++var29) { + int var30 = var28 - var17; + int var31 = var29 - var18; + if (var30 >= 0 && var31 >= 0 && var30 < var10 && var31 < var11 && var12[var30][var31] < 100) { + int var32 = 0; + if (var28 < var24) { + var32 = var24 - var28; + } else if (var28 > var24 + var26 - 1) { + var32 = var28 - (var26 + var24 - 1); + } + + int var33 = 0; + if (var29 < var25) { + var33 = var25 - var29; + } else if (var29 > var27 + var25 - 1) { + var33 = var29 - (var27 + var25 - 1); + } + + int var34 = var32 * var32 + var33 * var33; + if (var34 < var21 || var34 == var21 && var12[var30][var31] < var22) { + var21 = var34; + var22 = var12[var30][var31]; + var19 = var28; + var20 = var29; + } + } + } + } + + if (var21 == Integer.MAX_VALUE) { + return -1; + } + } + + if (var19 == var1 && var20 == var2) { + var7[0] = var19; + var8[0] = var20; + return 0; + } else { + byte var36 = 0; + var14[var36] = var19; + var21 = var36 + 1; + var15[var36] = var20; + + int var37; + for (var22 = var37 = var13[var19 - var17][var20 - var18]; var19 != var1 || var20 != var2; var22 = var13[var19 - var17][var20 - var18]) { + if (var37 != var22) { + var37 = var22; + var14[var21] = var19; + var15[var21++] = var20; + } + + if ((var22 & 2) != 0) { + ++var19; + } else if ((var22 & 8) != 0) { + --var19; + } + + if ((var22 & 1) != 0) { + ++var20; + } else if ((var22 & 4) != 0) { + --var20; + } + } + + var24 = 0; + + while (var21-- > 0) { + var7[var24] = var14[var21]; + var8[var24++] = var15[var21]; + if (var24 >= var7.length) { + break; + } + } + + return var24; + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(IILiq;Lih;Lig;I)Z", + garbageValue = "1570636396" + ) + final boolean method1193(int var1, int var2, RouteStrategy var3, CollisionMap var4, class230 var5) { + int var6 = var5.method1177(); + int var7 = var5.method1178(); + int[][] var8 = var5.method1180(); + int[][] var9 = var5.method1179(); + int[] var10 = var5.method1181(); + int[] var11 = var5.method1182(); + int var12 = var5.method1183(); + int var13 = var1; + int var14 = var2; + int var15 = var6 >> 1; + int var16 = var7 >> 1; + int var17 = var1 - var15; + int var18 = var2 - var16; + var9[var15][var16] = 99; + var8[var15][var16] = 0; + byte var19 = 0; + int var20 = 0; + var10[var19] = var1; + byte var10001 = var19; + int var25 = var19 + 1; + var11[var10001] = var2; + int[][] var21 = var4.flags; + + while (var25 != var20) { + var13 = var10[var20]; + var14 = var11[var20]; + var20 = var20 + 1 & var12; + var15 = var13 - var17; + var16 = var14 - var18; + int var22 = var13 - var4.xInset; + int var23 = var14 - var4.yInset; + if (var3.hasArrived(1, var13, var14, var4)) { + var5.method1174(var13, var14); + return true; + } + + int var24 = var8[var15][var16] + 1; + if (var15 > 0 && var9[var15 - 1][var16] == 0 && (var21[var22 - 1][var23] & 19136776) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16] = 2; + var8[var15 - 1][var16] = var24; + } + + if (var15 < var6 - 1 && var9[var15 + 1][var16] == 0 && (var21[var22 + 1][var23] & 19136896) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16] = 8; + var8[var15 + 1][var16] = var24; + } + + if (var16 > 0 && var9[var15][var16 - 1] == 0 && (var21[var22][var23 - 1] & 19136770) == 0) { + var10[var25] = var13; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15][var16 - 1] = 1; + var8[var15][var16 - 1] = var24; + } + + if (var16 < var7 - 1 && var9[var15][var16 + 1] == 0 && (var21[var22][var23 + 1] & 19136800) == 0) { + var10[var25] = var13; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15][var16 + 1] = 4; + var8[var15][var16 + 1] = var24; + } + + if (var15 > 0 && var16 > 0 && var9[var15 - 1][var16 - 1] == 0 && (var21[var22 - 1][var23 - 1] & 19136782) == 0 && (var21[var22 - 1][var23] & 19136776) == 0 && (var21[var22][var23 - 1] & 19136770) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16 - 1] = 3; + var8[var15 - 1][var16 - 1] = var24; + } + + if (var15 < var6 - 1 && var16 > 0 && var9[var15 + 1][var16 - 1] == 0 && (var21[var22 + 1][var23 - 1] & 19136899) == 0 && (var21[var22 + 1][var23] & 19136896) == 0 && (var21[var22][var23 - 1] & 19136770) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16 - 1] = 9; + var8[var15 + 1][var16 - 1] = var24; + } + + if (var15 > 0 && var16 < var7 - 1 && var9[var15 - 1][var16 + 1] == 0 && (var21[var22 - 1][var23 + 1] & 19136824) == 0 && (var21[var22 - 1][var23] & 19136776) == 0 && (var21[var22][var23 + 1] & 19136800) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16 + 1] = 6; + var8[var15 - 1][var16 + 1] = var24; + } + + if (var15 < var6 - 1 && var16 < var7 - 1 && var9[var15 + 1][var16 + 1] == 0 && (var21[var22 + 1][var23 + 1] & 19136992) == 0 && (var21[var22 + 1][var23] & 19136896) == 0 && (var21[var22][var23 + 1] & 19136800) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16 + 1] = 12; + var8[var15 + 1][var16 + 1] = var24; + } + } + + var5.method1174(var13, var14); + return false; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IILiq;Lih;Lig;I)Z", + garbageValue = "-525938769" + ) + final boolean method1194(int var1, int var2, RouteStrategy var3, CollisionMap var4, class230 var5) { + int var6 = var5.method1177(); + int var7 = var5.method1178(); + int[][] var8 = var5.method1180(); + int[][] var9 = var5.method1179(); + int[] var10 = var5.method1181(); + int[] var11 = var5.method1182(); + int var12 = var5.method1183(); + int var13 = var1; + int var14 = var2; + int var15 = var6 >> 1; + int var16 = var7 >> 1; + int var17 = var1 - var15; + int var18 = var2 - var16; + var9[var15][var16] = 99; + var8[var15][var16] = 0; + byte var19 = 0; + int var20 = 0; + var10[var19] = var1; + byte var10001 = var19; + int var25 = var19 + 1; + var11[var10001] = var2; + int[][] var21 = var4.flags; + + while (var25 != var20) { + var13 = var10[var20]; + var14 = var11[var20]; + var20 = var20 + 1 & var12; + var15 = var13 - var17; + var16 = var14 - var18; + int var22 = var13 - var4.xInset; + int var23 = var14 - var4.yInset; + if (var3.hasArrived(2, var13, var14, var4)) { + var5.method1174(var13, var14); + return true; + } + + int var24 = var8[var15][var16] + 1; + if (var15 > 0 && var9[var15 - 1][var16] == 0 && (var21[var22 - 1][var23] & 19136782) == 0 && (var21[var22 - 1][var23 + 1] & 19136824) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16] = 2; + var8[var15 - 1][var16] = var24; + } + + if (var15 < var6 - 2 && var9[var15 + 1][var16] == 0 && (var21[var22 + 2][var23] & 19136899) == 0 && (var21[var22 + 2][var23 + 1] & 19136992) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16] = 8; + var8[var15 + 1][var16] = var24; + } + + if (var16 > 0 && var9[var15][var16 - 1] == 0 && (var21[var22][var23 - 1] & 19136782) == 0 && (var21[var22 + 1][var23 - 1] & 19136899) == 0) { + var10[var25] = var13; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15][var16 - 1] = 1; + var8[var15][var16 - 1] = var24; + } + + if (var16 < var7 - 2 && var9[var15][var16 + 1] == 0 && (var21[var22][var23 + 2] & 19136824) == 0 && (var21[var22 + 1][var23 + 2] & 19136992) == 0) { + var10[var25] = var13; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15][var16 + 1] = 4; + var8[var15][var16 + 1] = var24; + } + + if (var15 > 0 && var16 > 0 && var9[var15 - 1][var16 - 1] == 0 && (var21[var22 - 1][var23] & 19136830) == 0 && (var21[var22 - 1][var23 - 1] & 19136782) == 0 && (var21[var22][var23 - 1] & 19136911) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16 - 1] = 3; + var8[var15 - 1][var16 - 1] = var24; + } + + if (var15 < var6 - 2 && var16 > 0 && var9[var15 + 1][var16 - 1] == 0 && (var21[var22 + 1][var23 - 1] & 19136911) == 0 && (var21[var22 + 2][var23 - 1] & 19136899) == 0 && (var21[var22 + 2][var23] & 19136995) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16 - 1] = 9; + var8[var15 + 1][var16 - 1] = var24; + } + + if (var15 > 0 && var16 < var7 - 2 && var9[var15 - 1][var16 + 1] == 0 && (var21[var22 - 1][var23 + 1] & 19136830) == 0 && (var21[var22 - 1][var23 + 2] & 19136824) == 0 && (var21[var22][var23 + 2] & 19137016) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16 + 1] = 6; + var8[var15 - 1][var16 + 1] = var24; + } + + if (var15 < var6 - 2 && var16 < var7 - 2 && var9[var15 + 1][var16 + 1] == 0 && (var21[var22 + 1][var23 + 2] & 19137016) == 0 && (var21[var22 + 2][var23 + 2] & 19136992) == 0 && (var21[var22 + 2][var23 + 1] & 19136995) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16 + 1] = 12; + var8[var15 + 1][var16 + 1] = var24; + } + } + + var5.method1174(var13, var14); + return false; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IIILiq;Lih;Lig;B)Z", + garbageValue = "58" + ) + final boolean method1195(int var1, int var2, int var3, RouteStrategy var4, CollisionMap var5, class230 var6) { + int var7 = var6.method1177(); + int var8 = var6.method1178(); + int[][] var9 = var6.method1180(); + int[][] var10 = var6.method1179(); + int[] var11 = var6.method1181(); + int[] var12 = var6.method1182(); + int var13 = var6.method1183(); + int var14 = var1; + int var15 = var2; + int var16 = var7 >> 1; + int var17 = var8 >> 1; + int var18 = var1 - var16; + int var19 = var2 - var17; + var10[var16][var17] = 99; + var9[var16][var17] = 0; + byte var20 = 0; + int var21 = 0; + var11[var20] = var1; + int var27 = var20 + 1; + var12[var20] = var2; + int[][] var22 = var5.flags; + + while (true) { + label265: + while (true) { + int var23; + int var24; + int var25; + int var26; + do { + do { + do { + label242: + do { + if (var21 == var27) { + var6.method1174(var14, var15); + return false; + } + + var14 = var11[var21]; + var15 = var12[var21]; + var21 = var21 + 1 & var13; + var16 = var14 - var18; + var17 = var15 - var19; + var23 = var14 - var5.xInset; + var24 = var15 - var5.yInset; + if (var4.hasArrived(var3, var14, var15, var5)) { + var6.method1174(var14, var15); + return true; + } + + var25 = var9[var16][var17] + 1; + if (var16 > 0 && var10[var16 - 1][var17] == 0 && (var22[var23 - 1][var24] & 19136782) == 0 && (var22[var23 - 1][var3 + var24 - 1] & 19136824) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3 - 1) { + var11[var27] = var14 - 1; + var12[var27] = var15; + var27 = var27 + 1 & var13; + var10[var16 - 1][var17] = 2; + var9[var16 - 1][var17] = var25; + break; + } + + if ((var22[var23 - 1][var24 + var26] & 19136830) != 0) { + break; + } + + ++var26; + } + } + + if (var16 < var7 - var3 && var10[var16 + 1][var17] == 0 && (var22[var3 + var23][var24] & 19136899) == 0 && (var22[var3 + var23][var3 + var24 - 1] & 19136992) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3 - 1) { + var11[var27] = var14 + 1; + var12[var27] = var15; + var27 = var27 + 1 & var13; + var10[var16 + 1][var17] = 8; + var9[var16 + 1][var17] = var25; + break; + } + + if ((var22[var3 + var23][var24 + var26] & 19136995) != 0) { + break; + } + + ++var26; + } + } + + if (var17 > 0 && var10[var16][var17 - 1] == 0 && (var22[var23][var24 - 1] & 19136782) == 0 && (var22[var3 + var23 - 1][var24 - 1] & 19136899) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3 - 1) { + var11[var27] = var14; + var12[var27] = var15 - 1; + var27 = var27 + 1 & var13; + var10[var16][var17 - 1] = 1; + var9[var16][var17 - 1] = var25; + break; + } + + if ((var22[var23 + var26][var24 - 1] & 19136911) != 0) { + break; + } + + ++var26; + } + } + + if (var17 < var8 - var3 && var10[var16][var17 + 1] == 0 && (var22[var23][var3 + var24] & 19136824) == 0 && (var22[var3 + var23 - 1][var3 + var24] & 19136992) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3 - 1) { + var11[var27] = var14; + var12[var27] = var15 + 1; + var27 = var27 + 1 & var13; + var10[var16][var17 + 1] = 4; + var9[var16][var17 + 1] = var25; + break; + } + + if ((var22[var23 + var26][var3 + var24] & 19137016) != 0) { + break; + } + + ++var26; + } + } + + if (var16 > 0 && var17 > 0 && var10[var16 - 1][var17 - 1] == 0 && (var22[var23 - 1][var24 - 1] & 19136782) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3) { + var11[var27] = var14 - 1; + var12[var27] = var15 - 1; + var27 = var27 + 1 & var13; + var10[var16 - 1][var17 - 1] = 3; + var9[var16 - 1][var17 - 1] = var25; + break; + } + + if ((var22[var23 - 1][var26 + (var24 - 1)] & 19136830) != 0 || (var22[var26 + (var23 - 1)][var24 - 1] & 19136911) != 0) { + break; + } + + ++var26; + } + } + + if (var16 < var7 - var3 && var17 > 0 && var10[var16 + 1][var17 - 1] == 0 && (var22[var3 + var23][var24 - 1] & 19136899) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3) { + var11[var27] = var14 + 1; + var12[var27] = var15 - 1; + var27 = var27 + 1 & var13; + var10[var16 + 1][var17 - 1] = 9; + var9[var16 + 1][var17 - 1] = var25; + break; + } + + if ((var22[var3 + var23][var26 + (var24 - 1)] & 19136995) != 0 || (var22[var23 + var26][var24 - 1] & 19136911) != 0) { + break; + } + + ++var26; + } + } + + if (var16 > 0 && var17 < var8 - var3 && var10[var16 - 1][var17 + 1] == 0 && (var22[var23 - 1][var3 + var24] & 19136824) == 0) { + for (var26 = 1; var26 < var3; ++var26) { + if ((var22[var23 - 1][var24 + var26] & 19136830) != 0 || (var22[var26 + (var23 - 1)][var3 + var24] & 19137016) != 0) { + continue label242; + } + } + + var11[var27] = var14 - 1; + var12[var27] = var15 + 1; + var27 = var27 + 1 & var13; + var10[var16 - 1][var17 + 1] = 6; + var9[var16 - 1][var17 + 1] = var25; + } + } while(var16 >= var7 - var3); + } while(var17 >= var8 - var3); + } while(var10[var16 + 1][var17 + 1] != 0); + } while((var22[var3 + var23][var3 + var24] & 19136992) != 0); + + for (var26 = 1; var26 < var3; ++var26) { + if ((var22[var26 + var23][var3 + var24] & 19137016) != 0 || (var22[var3 + var23][var26 + var24] & 19136995) != 0) { + continue label265; + } + } + + var11[var27] = var14 + 1; + var12[var27] = var15 + 1; + var27 = var27 + 1 & var13; + var10[var16 + 1][var17 + 1] = 12; + var9[var16 + 1][var17 + 1] = var25; + } + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "48" + ) + public static void method1192() { + FileSystem.FileSystem_cacheFiles.clear(); + } + + @ObfuscatedName("jj") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "368795311" + ) + static final int method1196() { + if (class91.clientPreferences.getRoofsHidden()) { + return class87.Client_plane; + } else { + int var0 = class115.getTileHeight(Client.cameraX, WorldMapArea.cameraZ, class87.Client_plane); + return var0 - class17.cameraY < 800 && (Tiles.Tiles_renderFlags[class87.Client_plane][Client.cameraX >> 7][WorldMapArea.cameraZ >> 7] & 4) != 0 ? class87.Client_plane : 3; + } + } + + @ObfuscatedName("jq") + @ObfuscatedSignature( + descriptor = "(Ldi;IIIIIB)V", + garbageValue = "79" + ) + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { + if (var0 instanceof NPC) { + NPCComposition var6 = ((NPC)var0).definition; + if (var6.transforms != null) { + var6 = var6.transform(); + } + + if (var6 == null) { + return; + } + } + + int var75 = Players.Players_count; + int[] var7 = Players.Players_indices; + boolean var8 = var1 < var75; + int var9 = -2; + if (var0.overheadText != null && (!var8 || !var0.showPublicPlayerChat && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + PlayerType.method1913(var0, var0.defaultHeight); + if (Client.viewportTempX > -1 && Client.overheadTextLimit < Client.overheadTextCount) { + Client.overheadTextXOffsets[Client.overheadTextLimit] = SoundCache.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextLimit] = SoundCache.fontBold12.ascent; + Client.overheadTextXs[Client.overheadTextLimit] = Client.viewportTempX; + Client.overheadTextYs[Client.overheadTextLimit] = Client.viewportTempY - var9; + Client.overheadTextColors[Client.overheadTextLimit] = var0.field998; + Client.overheadTextEffects[Client.overheadTextLimit] = var0.field991; + Client.overheadTextCyclesRemaining[Client.overheadTextLimit] = var0.overheadTextCyclesRemaining; + Client.field595[Client.overheadTextLimit] = var0.field1026; + Client.field602[Client.overheadTextLimit] = var0.overheadText; + ++Client.overheadTextLimit; + var9 += 12; + } + } + + int var15; + int var19; + int var22; + int var23; + if (!var0.healthBars.method2039()) { + PlayerType.method1913(var0, var0.defaultHeight + 15); + + for (HealthBar var10 = (HealthBar)var0.healthBars.last(); var10 != null; var10 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var11 = var10.get(Client.cycle); + if (var11 == null) { + if (var10.isEmpty()) { + var10.remove(); + } + } else { + HealthBarDefinition var12 = var10.definition; + SpritePixels var13 = var12.getBackSprite(); + SpritePixels var14 = var12.getFrontSprite(); + int var16 = 0; + if (var13 != null && var14 != null) { + if (var12.widthPadding * 2 < var14.subWidth) { + var16 = var12.widthPadding; + } + + var15 = var14.subWidth - var16 * 2; + } else { + var15 = var12.width; + } + + int var17 = 255; + boolean var18 = true; + var19 = Client.cycle - var11.cycle; + int var20 = var15 * var11.health2 / var12.width; + int var21; + int var101; + if (var11.cycleOffset > var19) { + var21 = var12.field1556 == 0 ? 0 : var12.field1556 * (var19 / var12.field1556); + var22 = var15 * var11.health / var12.width; + var101 = var21 * (var20 - var22) / var11.cycleOffset + var22; + } else { + var101 = var20; + var21 = var12.int5 + var11.cycleOffset - var19; + if (var12.int3 >= 0) { + var17 = (var21 << 8) / (var12.int5 - var12.int3); + } + } + + if (var11.health2 > 0 && var101 < 1) { + var101 = 1; + } + + if (var13 != null && var14 != null) { + if (var15 == var101) { + var101 += var16 * 2; + } else { + var101 += var16; + } + + var21 = var13.subHeight; + var9 += var21; + var22 = var2 + Client.viewportTempX - (var15 >> 1); + var23 = var3 + Client.viewportTempY - var9; + var22 -= var16; + if (var17 >= 0 && var17 < 255) { + var13.drawTransAt(var22, var23, var17); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var101 + var22, var21 + var23); + var14.drawTransAt(var22, var23, var17); + } else { + var13.drawTransBgAt(var22, var23); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var101, var23 + var21); + var14.drawTransBgAt(var22, var23); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var9 += 2; + } else { + var9 += 5; + if (Client.viewportTempX > -1) { + var21 = var2 + Client.viewportTempX - (var15 >> 1); + var22 = var3 + Client.viewportTempY - var9; + Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var101, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var101, var22, var15 - var101, 5, 16711680); + } + + var9 += 2; + } + } + } + } + + if (var9 == -2) { + var9 += 7; + } + + if (var8 && var0.playerCycle == Client.cycle) { + Player var94 = (Player)var0; + boolean var76; + if (Client.drawPlayerNames == 0) { + var76 = false; + } else if (var94 == TextureProvider.localPlayer) { + var76 = WorldMapLabelSize.method1437(); + } else { + var76 = class208.method1029() || ModeWhere.method2014() && var94.isFriend() || class47.method238() && var94.method493(); + } + + if (var76) { + Player var96 = (Player)var0; + if (var8) { + PlayerType.method1913(var0, var0.defaultHeight + 15); + AbstractFont var98 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + var9 += 4; + var98.drawCentered(var96.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var9, 16777215, 0); + var9 += 18; + } + } + } + + int var24; + int var26; + Archive var81; + SpritePixels[] var83; + if (var8) { + Player var92 = (Player)var0; + if (var92.isHidden) { + return; + } + + if (var92.headIconPk != -1 || var92.headIconPrayer != -1) { + PlayerType.method1913(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + if (var92.headIconPk != -1) { + var9 += 25; + UserComparator4.headIconPkSprites[var92.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); + } + + if (var92.headIconPrayer != -1) { + var9 += 25; + class157.headIconPrayerSprites[var92.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + PlayerType.method1913(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var9 += UserComparator8.headIconHintSprites[1].subHeight; + UserComparator8.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); + } + } + } else { + NPC var93 = (NPC)var0; + int[] var95 = var93.method587(); + short[] var97 = var93.method588(); + if (var97 != null && var95 != null) { + for (int var77 = 0; var77 < var97.length; ++var77) { + if (var97[var77] >= 0 && var95[var77] >= 0) { + long var78 = (long)var95[var77] << 8 | (long)var97[var77]; + Object var80 = (SpritePixels)Client.field631.method2216(var78); + if (var80 == null) { + var81 = class199.archive8; + var19 = var95[var77]; + SpritePixels[] var82; + if (!class164.method862(var81, var19, 0)) { + var82 = null; + } else { + var83 = new SpritePixels[class544.SpriteBuffer_spriteCount]; + var22 = 0; + + while (true) { + if (var22 >= class544.SpriteBuffer_spriteCount) { + class407.method2062(); + var82 = var83; + break; + } + + SpritePixels var84 = var83[var22] = new SpritePixels(); + var84.width = class159.SpriteBuffer_spriteWidth; + var84.height = class500.SpriteBuffer_spriteHeight; + var84.xOffset = class326.SpriteBuffer_xOffsets[var22]; + var84.yOffset = ModelData0.SpriteBuffer_yOffsets[var22]; + var84.subWidth = class59.SpriteBuffer_spriteWidths[var22]; + var84.subHeight = class544.SpriteBuffer_spriteHeights[var22]; + var24 = var84.subWidth * var84.subHeight; + byte[] var25 = AddRequestTask.SpriteBuffer_pixels[var22]; + var84.pixels = new int[var24]; + + for (var26 = 0; var26 < var24; ++var26) { + var84.pixels[var26] = class372.SpriteBuffer_spritePalette[var25[var26] & 255]; + } + + ++var22; + } + } + + if (var82 != null && var97[var77] < var82.length) { + var80 = var82[var97[var77]]; + Client.field631.method2217(var78, var80); + } + } + + if (var80 != null) { + PlayerType.method1913(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + ((SpritePixels)var80).drawTransBgAt(var2 + Client.viewportTempX - (((SpritePixels)var80).subWidth >> 1), Client.viewportTempY + (var3 - ((SpritePixels)var80).subHeight) - 4); + } + } + } + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + PlayerType.method1913(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + UserComparator8.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + for (int var103 = 0; var103 < 4; ++var103) { + int var86 = var0.hitSplatCycles[var103]; + int var87 = var0.hitSplatTypes[var103]; + HitSplatDefinition var99 = null; + int var88 = 0; + if (var87 >= 0) { + if (var86 <= Client.cycle) { + continue; + } + + var99 = class191.method959(var0.hitSplatTypes[var103]); + var88 = var99.field1715; + if (var99 != null && var99.transforms != null) { + var99 = var99.transform(); + if (var99 == null) { + var0.hitSplatCycles[var103] = -1; + continue; + } + } + } else if (var86 < 0) { + continue; + } + + var15 = var0.hitSplatTypes2[var103]; + HitSplatDefinition var104 = null; + if (var15 >= 0) { + var104 = class191.method959(var15); + if (var104 != null && var104.transforms != null) { + var104 = var104.transform(); + } + } + + if (var86 - var88 <= Client.cycle) { + if (var99 == null) { + var0.hitSplatCycles[var103] = -1; + } else { + PlayerType.method1913(var0, var0.defaultHeight / 2); + if (Client.viewportTempX > -1) { + boolean var100 = true; + if (var103 == 1) { + Client.viewportTempY -= 20; + } + + if (var103 == 2) { + Client.viewportTempX -= 15; + Client.viewportTempY -= 10; + } + + if (var103 == 3) { + Client.viewportTempX += 15; + Client.viewportTempY -= 10; + } + + var81 = null; + SpritePixels var89 = null; + SpritePixels var85 = null; + var83 = null; + var22 = 0; + var23 = 0; + var24 = 0; + int var90 = 0; + var26 = 0; + int var27 = 0; + int var28 = 0; + int var29 = 0; + SpritePixels var30 = null; + SpritePixels var31 = null; + SpritePixels var32 = null; + SpritePixels var33 = null; + int var34 = 0; + int var35 = 0; + int var36 = 0; + int var37 = 0; + int var38 = 0; + int var39 = 0; + int var40 = 0; + int var41 = 0; + int var42 = 0; + SpritePixels var105 = var99.method1070(); + int var43; + if (var105 != null) { + var22 = var105.subWidth; + var43 = var105.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var26 = var105.xOffset; + } + + var89 = var99.method1071(); + if (var89 != null) { + var23 = var89.subWidth; + var43 = var89.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var27 = var89.xOffset; + } + + var85 = var99.method1072(); + if (var85 != null) { + var24 = var85.subWidth; + var43 = var85.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var28 = var85.xOffset; + } + + SpritePixels var106 = var99.method1073(); + if (var106 != null) { + var90 = var106.subWidth; + var43 = var106.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var29 = var106.xOffset; + } + + if (var104 != null) { + var30 = var104.method1070(); + if (var30 != null) { + var34 = var30.subWidth; + var43 = var30.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var38 = var30.xOffset; + } + + var31 = var104.method1071(); + if (var31 != null) { + var35 = var31.subWidth; + var43 = var31.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var39 = var31.xOffset; + } + + var32 = var104.method1072(); + if (var32 != null) { + var36 = var32.subWidth; + var43 = var32.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var40 = var32.xOffset; + } + + var33 = var104.method1073(); + if (var33 != null) { + var37 = var33.subWidth; + var43 = var33.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var41 = var33.xOffset; + } + } + + Font var91 = var99.getFont(); + if (var91 == null) { + var91 = class14.fontPlain11; + } + + Font var44; + if (var104 != null) { + var44 = var104.getFont(); + if (var44 == null) { + var44 = class14.fontPlain11; + } + } else { + var44 = class14.fontPlain11; + } + + String var45 = null; + String var46 = null; + boolean var47 = false; + int var48 = 0; + var45 = var99.getString(var0.hitSplatValues[var103]); + int var102 = var91.stringWidth(var45); + if (var104 != null) { + var46 = var104.getString(var0.hitSplatValues2[var103]); + var48 = var44.stringWidth(var46); + } + + int var49 = 0; + int var50 = 0; + if (var23 > 0) { + if (var85 == null && var106 == null) { + var49 = 1; + } else { + var49 = var102 / var23 + 1; + } + } + + if (var104 != null && var35 > 0) { + if (var32 == null && var33 == null) { + var50 = 1; + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; + int var52 = var51; + if (var22 > 0) { + var51 += var22; + } + + var51 += 2; + int var53 = var51; + if (var24 > 0) { + var51 += var24; + } + + int var54 = var51; + int var55 = var51; + int var56; + if (var23 > 0) { + var56 = var23 * var49; + var51 += var56; + var55 += (var56 - var102) / 2; + } else { + var51 += var102; + } + + var56 = var51; + if (var90 > 0) { + var51 += var90; + } + + int var57 = 0; + int var58 = 0; + int var59 = 0; + int var60 = 0; + int var61 = 0; + int var62; + if (var104 != null) { + var51 += 2; + var57 = var51; + if (var34 > 0) { + var51 += var34; + } + + var51 += 2; + var58 = var51; + if (var36 > 0) { + var51 += var36; + } + + var59 = var51; + var61 = var51; + if (var35 > 0) { + var62 = var35 * var50; + var51 += var62; + var61 += (var62 - var48) / 2; + } else { + var51 += var48; + } + + var60 = var51; + if (var37 > 0) { + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var103] - Client.cycle; + int var63 = var99.field1711 - var62 * var99.field1711 / var99.field1715; + int var64 = var62 * var99.field1710 / var99.field1715 + -var99.field1710; + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); + int var66 = var64 + (var3 + Client.viewportTempY - 12); + int var67 = var66; + int var68 = var42 + var66; + int var69 = var66 + var99.field1713 + 15; + int var70 = var69 - var91.maxAscent; + int var71 = var69 + var91.maxDescent; + if (var70 < var66) { + var67 = var70; + } + + if (var71 > var68) { + var68 = var71; + } + + int var72 = 0; + int var73; + int var74; + if (var104 != null) { + var72 = var66 + var104.field1713 + 15; + var73 = var72 - var44.maxAscent; + var74 = var72 + var44.maxDescent; + if (var73 < var67) { + ; + } + + if (var74 > var68) { + ; + } + } + + var73 = 255; + if (var99.field1714 >= 0) { + var73 = (var62 << 8) / (var99.field1715 - var99.field1714); + } + + if (var73 >= 0 && var73 < 255) { + if (var105 != null) { + var105.drawTransAt(var52 + var65 - var26, var66, var73); + } + + if (var85 != null) { + var85.drawTransAt(var65 + var53 - var28, var66, var73); + } + + if (var89 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var89.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); + } + } + + if (var106 != null) { + var106.drawTransAt(var56 + var65 - var29, var66, var73); + } + + var91.drawAlpha(var45, var65 + var55, var69, var99.textColor, 0, var73); + if (var104 != null) { + if (var30 != null) { + var30.drawTransAt(var65 + var57 - var38, var66, var73); + } + + if (var32 != null) { + var32.drawTransAt(var65 + var58 - var40, var66, var73); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); + } + } + + if (var33 != null) { + var33.drawTransAt(var65 + var60 - var41, var66, var73); + } + + var44.drawAlpha(var46, var61 + var65, var72, var104.textColor, 0, var73); + } + } else { + if (var105 != null) { + var105.drawTransBgAt(var65 + var52 - var26, var66); + } + + if (var85 != null) { + var85.drawTransBgAt(var65 + var53 - var28, var66); + } + + if (var89 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var89.drawTransBgAt(var74 * var23 + (var65 + var54 - var27), var66); + } + } + + if (var106 != null) { + var106.drawTransBgAt(var65 + var56 - var29, var66); + } + + var91.draw(var45, var55 + var65, var69, var99.textColor | -16777216, 0); + if (var104 != null) { + if (var30 != null) { + var30.drawTransBgAt(var57 + var65 - var38, var66); + } + + if (var32 != null) { + var32.drawTransBgAt(var65 + var58 - var40, var66); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); + } + } + + if (var33 != null) { + var33.drawTransBgAt(var65 + var60 - var41, var66); + } + + var44.draw(var46, var65 + var61, var72, var104.textColor | -16777216, 0); + } + } + } + } + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class233.java b/osrs/src/main/java/class233.java new file mode 100644 index 000000000..952052711 --- /dev/null +++ b/osrs/src/main/java/class233.java @@ -0,0 +1,69 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Comparator; + +@ObfuscatedName("id") +public class class233 implements Comparator { + @ObfuscatedName("ec") + @ObfuscatedSignature( + descriptor = "Ldp;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + + class233() { + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lic;Lic;S)I", + garbageValue = "-253" + ) + int method1198(class228 var1, class228 var2) { + return var1.method1168() - var2.method1168(); + } + + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method1198((class228)var1, (class228)var2); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "([BI)Ljava/lang/String;", + garbageValue = "-1425233568" + ) + public static String method1199(byte[] var0) { + int var2 = var0.length; + StringBuilder var3 = new StringBuilder(); + + for (int var4 = 0; var4 < var2 + 0; var4 += 3) { + int var5 = var0[var4] & 255; + var3.append(class400.field3683[var5 >>> 2]); + if (var4 < var2 - 1) { + int var6 = var0[var4 + 1] & 255; + var3.append(class400.field3683[(var5 & 3) << 4 | var6 >>> 4]); + if (var4 < var2 - 2) { + int var7 = var0[var4 + 2] & 255; + var3.append(class400.field3683[(var6 & 15) << 2 | var7 >>> 6]).append(class400.field3683[var7 & 63]); + } else { + var3.append(class400.field3683[(var6 & 15) << 2]).append("="); + } + } else { + var3.append(class400.field3683[(var5 & 3) << 4]).append("=="); + } + } + + String var1 = var3.toString(); + return var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class238.java b/osrs/src/main/java/class238.java deleted file mode 100644 index d44028df8..000000000 --- a/osrs/src/main/java/class238.java +++ /dev/null @@ -1,56 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("je") -public class class238 { - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-27" - ) - static String method1310() { - String var0; - if (class449.clientPreferences.getIsUsernameHidden()) { - String var2 = Login.Login_username; - String var1 = class270.method1538('*', var2.length()); - var0 = var1; - } else { - var0 = Login.Login_username; - } - - return var0; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1067657553" - ) - public static boolean method1309(int var0) { - return (var0 >> 20 & 1) != 0; - } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "-50" - ) - static int method1311(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3500) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.getKeyPressed(var3) ? 1 : 0; - return 1; - } else if (var0 == 3501) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1106(var3) ? 1 : 0; - return 1; - } else if (var0 == 3502) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1108(var3) ? 1 : 0; - return 1; - } else { - return 2; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class241.java b/osrs/src/main/java/class241.java new file mode 100644 index 000000000..7a4687881 --- /dev/null +++ b/osrs/src/main/java/class241.java @@ -0,0 +1,125 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jr") +public class class241 { + @ObfuscatedName("fw") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field2052; + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "Lru;" + ) + static GraphicsDefaults field2053; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "[Led;" + ) + class129[] field2054; + @ObfuscatedName("ak") + int field2055; + + @ObfuscatedSignature( + descriptor = "(Lul;I)V" + ) + class241(Buffer var1, int var2) { + this.field2054 = new class129[var2]; + this.field2055 = var1.readUnsignedByte(); + + for (int var3 = 0; var3 < this.field2054.length; ++var3) { + class129 var4 = new class129(this.field2055, var1, false); + this.field2054[var3] = var4; + } + + this.method1259(); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-43" + ) + void method1259() { + class129[] var1 = this.field2054; + + for (int var2 = 0; var2 < var1.length; ++var2) { + class129 var3 = var1[var2]; + if (var3.field1219 >= 0) { + var3.field1218 = this.field2054[var3.field1219]; + } + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2112190855" + ) + public int method1260() { + return this.field2054.length; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)Led;", + garbageValue = "1689947059" + ) + class129 method1261(int var1) { + return var1 >= this.method1260() ? null : this.field2054[var1]; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)[Led;", + garbageValue = "-130902547" + ) + class129[] method1262() { + return this.field2054; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Lfk;II)V", + garbageValue = "1460583301" + ) + void method1263(class139 var1, int var2) { + this.method1264(var1, var2, (boolean[])null, false); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lfk;I[ZZI)V", + garbageValue = "-2124527943" + ) + void method1264(class139 var1, int var2, boolean[] var3, boolean var4) { + int var5 = var1.method739(); + int var6 = 0; + class129[] var7 = this.method1262(); + + for (int var8 = 0; var8 < var7.length; ++var8) { + class129 var9 = var7[var8]; + if (var3 == null || var4 == var3[var6]) { + var1.method741(var2, var9, var6, var5); + } + + ++var6; + } + + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-127" + ) + public static int method1265(int var0) { + if (var0 > 0) { + return 1; + } else { + return var0 < 0 ? -1 : 0; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class242.java b/osrs/src/main/java/class242.java new file mode 100644 index 000000000..48adcb5d9 --- /dev/null +++ b/osrs/src/main/java/class242.java @@ -0,0 +1,97 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jj") +public abstract class class242 extends Rasterizer2D { + @ObfuscatedName("ac") + boolean field2056; + @ObfuscatedName("al") + boolean field2057; + @ObfuscatedName("ar") + int[] field2058; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + Clips field2059; + + @ObfuscatedSignature( + descriptor = "(Ljb;)V" + ) + class242(Clips var1) { + this.field2056 = false; + this.field2057 = false; + this.field2058 = Rasterizer3D.Rasterizer3D_colorPalette; + this.field2059 = var1; + } + + @ObfuscatedName("ac") + void method1266(int[] var1, int var2, int var3, float[] var4) { + Rasterizer2D.method2659(var1, var2, var3, var4); + } + + @ObfuscatedName("ax") + void method1269(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, byte var13, byte var14, byte var15, byte var16) { + var10 = method1267(var10, var13, var14, var15, var16); + var11 = method1267(var11, var13, var14, var15, var16); + var12 = method1267(var12, var13, var14, var15, var16); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12); + } + + @ObfuscatedName("ao") + void method1270(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, byte var11, byte var12, byte var13, byte var14) { + int var15 = method1267(var10, var11, var12, var13, var14); + var10 = this.field2058[var15]; + this.vmethod1366(var1, var2, var3, var4, var5, var6, var7, var8, var9, var10); + } + + @ObfuscatedName("ah") + @Export("vmethod1374") + abstract void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12); + + @ObfuscatedName("ar") + @Export("vmethod1366") + abstract void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10); + + @ObfuscatedName("ab") + @Export("vmethod1378") + abstract void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22); + + @ObfuscatedName("am") + @Export("vmethod1362") + abstract void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22); + + @ObfuscatedName("al") + static int method1267(int var0, byte var1, byte var2, byte var3, byte var4) { + int var5 = var0 >> 10 & 63; + int var6 = var0 >> 7 & 7; + int var7 = var0 & 127; + int var8 = var4 & 255; + if (var1 != -1) { + var5 += var8 * (var1 - var5) >> 7; + } + + if (var2 != -1) { + var6 += var8 * (var2 - var6) >> 7; + } + + if (var3 != -1) { + var7 += var8 * (var3 - var7) >> 7; + } + + return (var5 << 10 | var6 << 7 | var7) & 65535; + } + + @ObfuscatedName("ak") + static final int method1268(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class243.java b/osrs/src/main/java/class257.java similarity index 88% rename from osrs/src/main/java/class243.java rename to osrs/src/main/java/class257.java index 7b2534b8d..85bfa6a3a 100644 --- a/osrs/src/main/java/class243.java +++ b/osrs/src/main/java/class257.java @@ -2,16 +2,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") -public class class243 extends class228 { +@ObfuscatedName("jm") +public class class257 extends class242 { @ObfuscatedSignature( - descriptor = "(Ljl;)V" + descriptor = "(Ljb;)V" ) - class243(Clips var1) { + class257(Clips var1) { super(var1); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("vmethod1374") void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12) { int var13 = var5 - var4; @@ -45,8 +45,8 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var22 != 0) { int var23 = (var17 * var16 - var18 * var14 << 8) / var22; int var24 = (var18 * var13 - var17 * var15 << 8) / var22; - int[] var25 = super.field2047.Rasterizer3D_rowOffsets; - int var26 = super.field2047.field2269; + int[] var25 = super.field2059.Rasterizer3D_rowOffsets; + int var26 = super.field2059.field2281; if (var1 <= var2 && var1 <= var3) { if (var1 < var26) { if (var2 > var26) { @@ -87,7 +87,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var23); var6 += var21; var5 += var19; var10 += var24; @@ -95,7 +95,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); var6 += var21; var4 += var20; var10 += var24; @@ -115,7 +115,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var23); var6 += var21; var5 += var19; var10 += var24; @@ -123,7 +123,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); var6 += var21; var4 += var20; var10 += var24; @@ -159,7 +159,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); var6 += var19; var4 += var20; var10 += var24; @@ -167,7 +167,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var23); var5 += var21; var4 += var20; var10 += var24; @@ -187,7 +187,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); var6 += var19; var4 += var20; var10 += var24; @@ -195,7 +195,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var23); var5 += var21; var4 += var20; var10 += var24; @@ -244,7 +244,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var23); var4 += var20; var6 += var21; var11 += var24; @@ -252,7 +252,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); var4 += var20; var5 += var19; var11 += var24; @@ -272,7 +272,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var23); var4 += var20; var6 += var21; var11 += var24; @@ -280,7 +280,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); var4 += var20; var5 += var19; var11 += var24; @@ -316,7 +316,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); var4 += var21; var5 += var19; var11 += var24; @@ -324,7 +324,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var23); var6 += var20; var5 += var19; var11 += var24; @@ -344,7 +344,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); var4 += var21; var5 += var19; var11 += var24; @@ -352,7 +352,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var23); var6 += var20; var5 += var19; var11 += var24; @@ -400,7 +400,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var23); var5 += var19; var4 += var20; var12 += var24; @@ -408,7 +408,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); var5 += var19; var6 += var21; var12 += var24; @@ -428,7 +428,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var23); var5 += var19; var4 += var20; var12 += var24; @@ -436,7 +436,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); var5 += var19; var6 += var21; var12 += var24; @@ -472,7 +472,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); var5 += var20; var6 += var21; var12 += var24; @@ -480,7 +480,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var23); var4 += var19; var6 += var21; var12 += var24; @@ -500,7 +500,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); var5 += var20; var6 += var21; var12 += var24; @@ -508,7 +508,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1354(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var23); + this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var23); var4 += var19; var6 += var21; var12 += var24; @@ -520,7 +520,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("vmethod1366") void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10) { int var11 = 0; @@ -538,8 +538,8 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo var13 = (var4 - var6 << 14) / (var1 - var3); } - int[] var14 = super.field2047.Rasterizer3D_rowOffsets; - int var15 = super.field2047.field2269; + int[] var14 = super.field2059.Rasterizer3D_rowOffsets; + int var15 = super.field2059.field2281; if (var1 <= var2 && var1 <= var3) { if (var1 < var15) { if (var2 > var15) { @@ -578,14 +578,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14); var6 += var13; var5 += var12; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); var6 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -604,14 +604,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14); var6 += var13; var5 += var12; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); var6 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -645,14 +645,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); var6 += var12; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14); var5 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -671,14 +671,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); var6 += var12; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14); var5 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -724,14 +724,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14); var4 += var11; var6 += var13; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); var4 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -750,14 +750,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14); var4 += var11; var6 += var13; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); var4 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -791,14 +791,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); var4 += var13; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14); var6 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -817,14 +817,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); var4 += var13; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14); var6 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -869,14 +869,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14); var5 += var12; var4 += var11; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); var5 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -895,14 +895,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14); var5 += var12; var4 += var11; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); var5 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -936,14 +936,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); var5 += var11; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14); var4 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -962,14 +962,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); var5 += var11; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1356(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14); + this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14); var4 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -979,16 +979,16 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2047.Rasterizer3D_textureLoader.getTexturePixels(var22); + int[] var23 = super.field2059.Rasterizer3D_textureLoader.getTexturePixels(var22); int var24; if (var23 == null) { - var24 = super.field2047.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class228.method1222(var24, var10), class228.method1222(var24, var11), class228.method1222(var24, var12)); + var24 = super.field2059.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class242.method1268(var24, var10), class242.method1268(var24, var11), class242.method1268(var24, var12)); } else { - super.field2044 = super.field2047.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2045 = super.field2047.Rasterizer3D_textureLoader.vmethod3989(var22); + super.field2057 = super.field2059.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2056 = super.field2059.Rasterizer3D_textureLoader.vmethod3989(var22); var24 = var5 - var4; int var25 = var2 - var1; int var26 = var6 - var4; @@ -1014,7 +1014,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var33 != 0) { int var34 = (var28 * var27 - var29 * var25 << 9) / var33; int var35 = (var29 * var24 - var28 * var26 << 9) / var33; - int var36 = super.field2047.field2280; + int var36 = super.field2059.field2290; var14 = var13 - var14; var17 = var16 - var17; var20 = var19 - var20; @@ -1030,8 +1030,8 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo int var43 = var17 * var15 - var18 * var14 << 14; int var44 = (int)(((long)(var18 * var20 - var17 * var21) << 3 << 14) / (long)var36); int var45 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var36); - int[] var46 = super.field2047.Rasterizer3D_rowOffsets; - int var47 = super.field2047.field2269; + int[] var46 = super.field2059.Rasterizer3D_rowOffsets; + int var47 = super.field2059.field2281; int var48; if (var1 <= var2 && var1 <= var3) { if (var1 < var47) { @@ -1059,7 +1059,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var48 = var1 - super.field2047.field2274; + var48 = var1 - super.field2059.field2287; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1077,7 +1077,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1088,7 +1088,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1111,7 +1111,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1122,7 +1122,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1147,7 +1147,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var48 = var1 - super.field2047.field2274; + var48 = var1 - super.field2059.field2287; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1165,7 +1165,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1176,7 +1176,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1199,7 +1199,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1210,7 +1210,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1248,7 +1248,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var48 = var2 - super.field2047.field2274; + var48 = var2 - super.field2059.field2287; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1266,7 +1266,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1277,7 +1277,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1300,7 +1300,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1311,7 +1311,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1336,7 +1336,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var48 = var2 - super.field2047.field2274; + var48 = var2 - super.field2059.field2287; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1354,7 +1354,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -1365,7 +1365,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -1388,7 +1388,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -1399,7 +1399,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -1436,7 +1436,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var48 = var3 - super.field2047.field2274; + var48 = var3 - super.field2059.field2287; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1454,7 +1454,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -1465,7 +1465,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -1488,7 +1488,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -1499,7 +1499,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -1524,7 +1524,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var48 = var3 - super.field2047.field2274; + var48 = var3 - super.field2059.field2287; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1542,7 +1542,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -1553,7 +1553,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -1576,7 +1576,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -1587,7 +1587,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1358(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -1603,16 +1603,16 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("aa") + @ObfuscatedName("am") void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2047.Rasterizer3D_textureLoader.getTexturePixels(var22); + int[] var23 = super.field2059.Rasterizer3D_textureLoader.getTexturePixels(var22); int var24; if (var23 == null) { - var24 = super.field2047.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class228.method1222(var24, var10), class228.method1222(var24, var11), class228.method1222(var24, var12)); + var24 = super.field2059.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class242.method1268(var24, var10), class242.method1268(var24, var11), class242.method1268(var24, var12)); } else { - super.field2044 = super.field2047.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2045 = super.field2047.Rasterizer3D_textureLoader.vmethod3989(var22); + super.field2057 = super.field2059.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2056 = super.field2059.Rasterizer3D_textureLoader.vmethod3989(var22); var24 = var5 - var4; int var25 = var2 - var1; int var26 = var6 - var4; @@ -1638,7 +1638,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var33 != 0) { int var34 = (var28 * var27 - var29 * var25 << 9) / var33; int var35 = (var29 * var24 - var28 * var26 << 9) / var33; - int var36 = super.field2047.field2280; + int var36 = super.field2059.field2290; var14 = var13 - var14; var17 = var16 - var17; var20 = var19 - var20; @@ -1654,9 +1654,9 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo int var43 = var17 * var15 - var18 * var14 << 14; int var44 = (int)(((long)(var18 * var20 - var17 * var21) << 14) / (long)var36); int var45 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var36); - int[] var46 = super.field2047.Rasterizer3D_rowOffsets; - int var47 = super.field2047.field2269; - int var48 = super.field2047.field2274; + int[] var46 = super.field2059.Rasterizer3D_rowOffsets; + int var47 = super.field2059.field2281; + int var48 = super.field2059.field2287; int var49; if (var1 <= var2 && var1 <= var3) { if (var1 < var47) { @@ -1702,7 +1702,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1713,7 +1713,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1736,7 +1736,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1747,7 +1747,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1790,7 +1790,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1801,7 +1801,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1824,7 +1824,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1835,7 +1835,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1891,7 +1891,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1902,7 +1902,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1925,7 +1925,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1936,7 +1936,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1979,7 +1979,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -1990,7 +1990,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -2013,7 +2013,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -2024,7 +2024,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -2079,7 +2079,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -2090,7 +2090,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -2113,7 +2113,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -2124,7 +2124,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -2167,7 +2167,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -2178,7 +2178,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -2201,7 +2201,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -2212,7 +2212,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1360(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -2228,11 +2228,11 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("bf") - final void method1354(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - if (super.field2047.field2268) { - if (var6 > super.field2047.field2276) { - var6 = super.field2047.field2276; + @ObfuscatedName("bv") + final void method1393(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + if (super.field2059.field2278) { + if (var6 > super.field2059.field2285) { + var6 = super.field2059.field2285; } if (var5 < 0) { @@ -2247,14 +2247,14 @@ final void method1354(int[] var1, int var2, int var3, int var4, int var5, int va int var10; int var11; int var12; - if (super.field2047.field2279) { + if (super.field2059.field2289) { var4 = var6 - var5 >> 2; var8 <<= 2; - if (super.field2047.field2275 == 0) { + if (super.field2059.field2282 == 0) { if (var4 > 0) { do { var9 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2046[var9]; + var3 = super.field2058[var9]; var7 += var8; var1[var2++] = var3; var1[var2++] = var3; @@ -2267,7 +2267,7 @@ final void method1354(int[] var1, int var2, int var3, int var4, int var5, int va var4 = var6 - var5 & 3; if (var4 > 0) { var9 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2046[var9]; + var3 = super.field2058[var9]; do { var1[var2++] = var3; @@ -2275,12 +2275,12 @@ final void method1354(int[] var1, int var2, int var3, int var4, int var5, int va } while(var4 > 0); } } else { - var9 = super.field2047.field2275; - var10 = 256 - super.field2047.field2275; + var9 = super.field2059.field2282; + var10 = 256 - super.field2059.field2282; if (var4 > 0) { do { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2046[var11]; + var3 = super.field2058[var11]; var7 += var8; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); var12 = var1[var2]; @@ -2298,7 +2298,7 @@ final void method1354(int[] var1, int var2, int var3, int var4, int var5, int va var4 = var6 - var5 & 3; if (var4 > 0) { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2046[var11]; + var3 = super.field2058[var11]; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); do { @@ -2311,20 +2311,20 @@ final void method1354(int[] var1, int var2, int var3, int var4, int var5, int va } else { var4 = var6 - var5; - if (super.field2047.field2275 == 0) { + if (super.field2059.field2282 == 0) { do { var9 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var1[var2++] = super.field2046[var9]; + var1[var2++] = super.field2058[var9]; var7 += var8; --var4; } while(var4 > 0); } else { - var9 = super.field2047.field2275; - var10 = 256 - super.field2047.field2275; + var9 = super.field2059.field2282; + var10 = 256 - super.field2059.field2282; do { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2046[var11]; + var3 = super.field2058[var11]; var7 += var8; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); var12 = var1[var2]; @@ -2337,11 +2337,11 @@ final void method1354(int[] var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("bq") - void method1356(int[] var1, int var2, int var3, int var4, int var5, int var6) { - if (super.field2047.field2268) { - if (var6 > super.field2047.field2276) { - var6 = super.field2047.field2276; + @ObfuscatedName("ba") + void method1395(int[] var1, int var2, int var3, int var4, int var5, int var6) { + if (super.field2059.field2278) { + if (var6 > super.field2059.field2285) { + var6 = super.field2059.field2285; } if (var5 < 0) { @@ -2352,8 +2352,8 @@ void method1356(int[] var1, int var2, int var3, int var4, int var5, int var6) { if (var5 < var6) { var2 += var5; var4 = var6 - var5 >> 2; - if (super.field2047.field2275 != 0) { - if (super.field2047.field2275 == 254) { + if (super.field2059.field2282 != 0) { + if (super.field2059.field2282 == 254) { while (true) { --var4; if (var4 < 0) { @@ -2375,8 +2375,8 @@ void method1356(int[] var1, int var2, int var3, int var4, int var5, int var6) { var1[var2++] = var1[var2]; } } else { - int var7 = super.field2047.field2275; - int var8 = 256 - super.field2047.field2275; + int var7 = super.field2059.field2282; + int var8 = 256 - super.field2059.field2282; var3 = ((var3 & 16711935) * var8 >> 8 & 16711935) + (var8 * (var3 & 65280) >> 8 & 65280); while (true) { @@ -2431,11 +2431,11 @@ void method1356(int[] var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("ba") - void method1358(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { - if (super.field2047.field2268) { - if (var7 > super.field2047.field2276) { - var7 = super.field2047.field2276; + @ObfuscatedName("bz") + void method1397(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + if (super.field2059.field2278) { + if (var7 > super.field2059.field2285) { + var7 = super.field2059.field2285; } if (var6 < 0) { @@ -2456,8 +2456,8 @@ void method1358(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var22; int var23; int var24; - if (super.field2044) { - var24 = var6 - super.field2047.field2272; + if (super.field2057) { + var24 = var6 - super.field2059.field2284; var10 += (var13 >> 3) * var24; var11 += var24 * (var14 >> 3); var12 += (var15 >> 3) * var24; @@ -2497,7 +2497,7 @@ void method1358(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2045) { + if (super.field2056) { if (var18 > 0) { do { var4 = var2[(var3 & 4032) + (var3 >>> 26)]; @@ -2652,7 +2652,7 @@ void method1358(int[] var1, int[] var2, int var3, int var4, int var5, int var6, } } } else { - var24 = var6 - super.field2047.field2272; + var24 = var6 - super.field2059.field2284; var10 += (var13 >> 3) * var24; var11 += var24 * (var14 >> 3); var12 += (var15 >> 3) * var24; @@ -2692,7 +2692,7 @@ void method1358(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2045) { + if (super.field2056) { if (var18 > 0) { do { var4 = var2[(var3 & 16256) + (var3 >>> 25)]; @@ -2851,11 +2851,11 @@ void method1358(int[] var1, int[] var2, int var3, int var4, int var5, int var6, } } - @ObfuscatedName("bl") - void method1360(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { - if (super.field2047.field2268) { - if (var7 > super.field2047.field2276) { - var7 = super.field2047.field2276; + @ObfuscatedName("bb") + void method1399(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + if (super.field2059.field2278) { + if (var7 > super.field2059.field2285) { + var7 = super.field2059.field2285; } if (var6 < 0) { @@ -2875,8 +2875,8 @@ void method1360(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var22; int var23; int var24; - if (super.field2044) { - var24 = var6 - super.field2047.field2272; + if (super.field2057) { + var24 = var6 - super.field2059.field2284; var10 += var13 * var24; var11 += var24 * var14; var12 += var24 * var15; @@ -2906,7 +2906,7 @@ void method1360(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2045) { + if (super.field2056) { if (var18 > 0) { do { var4 = var2[(var3 & 4032) + (var3 >>> 26)]; @@ -3019,7 +3019,7 @@ void method1360(int[] var1, int[] var2, int var3, int var4, int var5, int var6, } } } else { - var24 = var6 - super.field2047.field2272; + var24 = var6 - super.field2059.field2284; var10 += var13 * var24; var11 += var24 * var14; var12 += var24 * var15; @@ -3049,7 +3049,7 @@ void method1360(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2045) { + if (super.field2056) { if (var18 > 0) { do { var4 = var2[(var3 & 16256) + (var3 >>> 25)]; diff --git a/osrs/src/main/java/class245.java b/osrs/src/main/java/class259.java similarity index 81% rename from osrs/src/main/java/class245.java rename to osrs/src/main/java/class259.java index 712e895d5..fa2c2dabd 100644 --- a/osrs/src/main/java/class245.java +++ b/osrs/src/main/java/class259.java @@ -2,16 +2,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jj") -public class class245 extends class228 { +@ObfuscatedName("jg") +public class class259 extends class242 { @ObfuscatedSignature( - descriptor = "(Ljl;)V" + descriptor = "(Ljb;)V" ) - class245(Clips var1) { + class259(Clips var1) { super(var1); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @Export("vmethod1374") void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12) { int var13 = var5 - var4; @@ -49,8 +49,8 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo int var26 = (var18 * var13 - var17 * var15 << 8) / var24; float var27 = (var19 * (float)var16 - var20 * (float)var14) / (float)var24; float var28 = (var20 * (float)var13 - var19 * (float)var15) / (float)var24; - int[] var29 = super.field2047.Rasterizer3D_rowOffsets; - int var30 = super.field2047.field2269; + int[] var29 = super.field2059.Rasterizer3D_rowOffsets; + int var30 = super.field2059.field2281; if (var1 <= var2 && var1 <= var3) { if (var1 < var30) { if (var2 > var30) { @@ -93,7 +93,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var25, var7, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var25, var7, var27); var6 += var23; var5 += var21; var10 += var26; @@ -102,7 +102,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); var6 += var23; var4 += var22; var10 += var26; @@ -123,7 +123,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var25, var7, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var25, var7, var27); var6 += var23; var5 += var21; var10 += var26; @@ -132,7 +132,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); var6 += var23; var4 += var22; var10 += var26; @@ -170,7 +170,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); var6 += var21; var4 += var22; var10 += var26; @@ -179,7 +179,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var25, var7, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var25, var7, var27); var5 += var23; var4 += var22; var10 += var26; @@ -200,7 +200,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); var6 += var21; var4 += var22; var10 += var26; @@ -209,7 +209,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var25, var7, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var25, var7, var27); var5 += var23; var4 += var22; var10 += var26; @@ -261,7 +261,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var25, var8, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var25, var8, var27); var4 += var22; var6 += var23; var11 += var26; @@ -270,7 +270,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); var4 += var22; var5 += var21; var11 += var26; @@ -291,7 +291,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var25, var8, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var25, var8, var27); var4 += var22; var6 += var23; var11 += var26; @@ -300,7 +300,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); var4 += var22; var5 += var21; var11 += var26; @@ -338,7 +338,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); var4 += var23; var5 += var21; var11 += var26; @@ -347,7 +347,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var25, var8, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var25, var8, var27); var6 += var22; var5 += var21; var11 += var26; @@ -368,7 +368,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); var4 += var23; var5 += var21; var11 += var26; @@ -377,7 +377,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var25, var8, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var25, var8, var27); var6 += var22; var5 += var21; var11 += var26; @@ -428,7 +428,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var25, var9, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var25, var9, var27); var5 += var21; var4 += var22; var12 += var26; @@ -437,7 +437,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); var5 += var21; var6 += var23; var12 += var26; @@ -458,7 +458,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var25, var9, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var25, var9, var27); var5 += var21; var4 += var22; var12 += var26; @@ -467,7 +467,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); var5 += var21; var6 += var23; var12 += var26; @@ -505,7 +505,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); var5 += var22; var6 += var23; var12 += var26; @@ -514,7 +514,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var25, var9, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var25, var9, var27); var4 += var21; var6 += var23; var12 += var26; @@ -535,7 +535,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); var5 += var22; var6 += var23; var12 += var26; @@ -544,7 +544,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1369(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var25, var9, var27); + this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var25, var9, var27); var4 += var21; var6 += var23; var12 += var26; @@ -557,7 +557,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("vmethod1366") void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10) { int var11 = var5 - var4; @@ -591,8 +591,8 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var20 != 0) { float var21 = (var15 * (float)var14 - var16 * (float)var12) / (float)var20; float var22 = (var16 * (float)var11 - var15 * (float)var13) / (float)var20; - int[] var23 = super.field2047.Rasterizer3D_rowOffsets; - int var24 = super.field2047.field2269; + int[] var23 = super.field2059.Rasterizer3D_rowOffsets; + int var24 = super.field2059.field2281; if (var1 <= var2 && var1 <= var3) { if (var1 < var24) { if (var2 > var24) { @@ -633,7 +633,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14, var7, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14, var7, var21); var6 += var19; var5 += var17; var1 += Rasterizer2D.Rasterizer2D_width; @@ -641,7 +641,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); var6 += var19; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -661,7 +661,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14, var7, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14, var7, var21); var6 += var19; var5 += var17; var1 += Rasterizer2D.Rasterizer2D_width; @@ -669,7 +669,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); var6 += var19; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -705,7 +705,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); var6 += var17; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -713,7 +713,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14, var7, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14, var7, var21); var5 += var19; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -733,7 +733,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); var6 += var17; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -741,7 +741,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14, var7, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14, var7, var21); var5 += var19; var4 += var18; var1 += Rasterizer2D.Rasterizer2D_width; @@ -790,7 +790,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14, var8, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14, var8, var21); var4 += var18; var6 += var19; var2 += Rasterizer2D.Rasterizer2D_width; @@ -798,7 +798,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); var4 += var18; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -818,7 +818,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14, var8, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14, var8, var21); var4 += var18; var6 += var19; var2 += Rasterizer2D.Rasterizer2D_width; @@ -826,7 +826,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); var4 += var18; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -862,7 +862,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); var4 += var19; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -870,7 +870,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14, var8, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14, var8, var21); var6 += var18; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -890,7 +890,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); var4 += var19; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -898,7 +898,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14, var8, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14, var8, var21); var6 += var18; var5 += var17; var2 += Rasterizer2D.Rasterizer2D_width; @@ -946,7 +946,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14, var9, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14, var9, var21); var5 += var17; var4 += var18; var3 += Rasterizer2D.Rasterizer2D_width; @@ -954,7 +954,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); var5 += var17; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -974,7 +974,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14, var9, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14, var9, var21); var5 += var17; var4 += var18; var3 += Rasterizer2D.Rasterizer2D_width; @@ -982,7 +982,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); var5 += var17; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -1018,7 +1018,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); var5 += var18; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -1026,7 +1026,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14, var9, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14, var9, var21); var4 += var17; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -1046,7 +1046,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); var5 += var18; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -1054,7 +1054,7 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1371(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14, var9, var21); + this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14, var9, var21); var4 += var17; var6 += var19; var3 += Rasterizer2D.Rasterizer2D_width; @@ -1066,17 +1066,17 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("vmethod1378") void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2047.Rasterizer3D_textureLoader.getTexturePixels(var22); + int[] var23 = super.field2059.Rasterizer3D_textureLoader.getTexturePixels(var22); int var24; if (var23 == null) { - var24 = super.field2047.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class228.method1222(var24, var10), class228.method1222(var24, var11), class228.method1222(var24, var12)); + var24 = super.field2059.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class242.method1268(var24, var10), class242.method1268(var24, var11), class242.method1268(var24, var12)); } else { - super.field2044 = super.field2047.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2045 = super.field2047.Rasterizer3D_textureLoader.vmethod3989(var22); + super.field2057 = super.field2059.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2056 = super.field2059.Rasterizer3D_textureLoader.vmethod3989(var22); var24 = var5 - var4; int var25 = var2 - var1; int var26 = var6 - var4; @@ -1106,7 +1106,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo float var37 = var9 - var7; float var38 = (var36 * (float)var27 - var37 * (float)var25) / (float)var33; float var39 = (var37 * (float)var24 - var36 * (float)var26) / (float)var33; - int var40 = super.field2047.field2280; + int var40 = super.field2059.field2290; var14 = var13 - var14; var17 = var16 - var17; var20 = var19 - var20; @@ -1122,8 +1122,8 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo int var47 = var17 * var15 - var18 * var14 << 14; int var48 = (int)(((long)(var18 * var20 - var17 * var21) << 3 << 14) / (long)var40); int var49 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var40); - int[] var50 = super.field2047.Rasterizer3D_rowOffsets; - int var51 = super.field2047.field2269; + int[] var50 = super.field2059.Rasterizer3D_rowOffsets; + int var51 = super.field2059.field2281; int var52; if (var1 <= var2 && var1 <= var3) { if (var1 < var51) { @@ -1153,7 +1153,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var52 = var1 - super.field2047.field2274; + var52 = var1 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1171,7 +1171,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var5 += var31; var10 += var35; @@ -1183,7 +1183,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var4 += var30; var10 += var35; @@ -1207,7 +1207,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var5 += var31; var10 += var35; @@ -1219,7 +1219,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var4 += var30; var10 += var35; @@ -1246,7 +1246,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var52 = var1 - super.field2047.field2274; + var52 = var1 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1264,7 +1264,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var31; var4 += var30; var10 += var35; @@ -1276,7 +1276,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var5 += var32; var4 += var30; var10 += var35; @@ -1300,7 +1300,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var31; var4 += var30; var10 += var35; @@ -1312,7 +1312,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var5 += var32; var4 += var30; var10 += var35; @@ -1353,7 +1353,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var52 = var2 - super.field2047.field2274; + var52 = var2 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1371,7 +1371,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var6 += var32; var11 += var35; @@ -1383,7 +1383,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var5 += var31; var11 += var35; @@ -1407,7 +1407,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var6 += var32; var11 += var35; @@ -1419,7 +1419,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var5 += var31; var11 += var35; @@ -1446,7 +1446,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var52 = var2 - super.field2047.field2274; + var52 = var2 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1464,7 +1464,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var32; var5 += var31; var11 += var35; @@ -1476,7 +1476,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var6 += var30; var5 += var31; var11 += var35; @@ -1500,7 +1500,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var32; var5 += var31; var11 += var35; @@ -1512,7 +1512,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var6 += var30; var5 += var31; var11 += var35; @@ -1552,7 +1552,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var52 = var3 - super.field2047.field2274; + var52 = var3 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1570,7 +1570,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var4 += var30; var12 += var35; @@ -1582,7 +1582,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var6 += var32; var12 += var35; @@ -1606,7 +1606,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var4 += var30; var12 += var35; @@ -1618,7 +1618,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var6 += var32; var12 += var35; @@ -1645,7 +1645,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var52 = var3 - super.field2047.field2274; + var52 = var3 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1663,7 +1663,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var30; var6 += var32; var12 += var35; @@ -1675,7 +1675,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var4 += var31; var6 += var32; var12 += var35; @@ -1699,7 +1699,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var30; var6 += var32; var12 += var35; @@ -1711,7 +1711,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1378(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var4 += var31; var6 += var32; var12 += var35; @@ -1728,17 +1728,17 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("aa") + @ObfuscatedName("am") @Export("vmethod1362") void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2047.Rasterizer3D_textureLoader.getTexturePixels(var22); + int[] var23 = super.field2059.Rasterizer3D_textureLoader.getTexturePixels(var22); int var24; if (var23 == null) { - var24 = super.field2047.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class228.method1222(var24, var10), class228.method1222(var24, var11), class228.method1222(var24, var12)); + var24 = super.field2059.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class242.method1268(var24, var10), class242.method1268(var24, var11), class242.method1268(var24, var12)); } else { - super.field2044 = super.field2047.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2045 = super.field2047.Rasterizer3D_textureLoader.vmethod3989(var22); + super.field2057 = super.field2059.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2056 = super.field2059.Rasterizer3D_textureLoader.vmethod3989(var22); var24 = var5 - var4; int var25 = var2 - var1; int var26 = var6 - var4; @@ -1768,7 +1768,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo float var37 = var9 - var7; float var38 = (var36 * (float)var27 - var37 * (float)var25) / (float)var33; float var39 = (var37 * (float)var24 - var36 * (float)var26) / (float)var33; - int var40 = super.field2047.field2280; + int var40 = super.field2059.field2290; var14 = var13 - var14; var17 = var16 - var17; var20 = var19 - var20; @@ -1784,8 +1784,8 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo int var47 = var17 * var15 - var18 * var14 << 14; int var48 = (int)(((long)(var18 * var20 - var17 * var21) << 14) / (long)var40); int var49 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var40); - int[] var50 = super.field2047.Rasterizer3D_rowOffsets; - int var51 = super.field2047.field2269; + int[] var50 = super.field2059.Rasterizer3D_rowOffsets; + int var51 = super.field2059.field2281; int var52; if (var1 <= var2 && var1 <= var3) { if (var1 < var51) { @@ -1815,7 +1815,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var52 = var1 - super.field2047.field2274; + var52 = var1 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1833,7 +1833,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var5 += var31; var10 += var35; @@ -1845,7 +1845,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var4 += var30; var10 += var35; @@ -1869,7 +1869,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var5 += var31; var10 += var35; @@ -1881,7 +1881,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var32; var4 += var30; var10 += var35; @@ -1908,7 +1908,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var52 = var1 - super.field2047.field2274; + var52 = var1 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -1926,7 +1926,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var31; var4 += var30; var10 += var35; @@ -1938,7 +1938,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var5 += var32; var4 += var30; var10 += var35; @@ -1962,7 +1962,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var6 += var31; var4 += var30; var10 += var35; @@ -1974,7 +1974,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); var5 += var32; var4 += var30; var10 += var35; @@ -2015,7 +2015,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var52 = var2 - super.field2047.field2274; + var52 = var2 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -2033,7 +2033,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var6 += var32; var11 += var35; @@ -2045,7 +2045,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var5 += var31; var11 += var35; @@ -2069,7 +2069,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var6 += var32; var11 += var35; @@ -2081,7 +2081,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var30; var5 += var31; var11 += var35; @@ -2108,7 +2108,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var52 = var2 - super.field2047.field2274; + var52 = var2 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -2126,7 +2126,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var32; var5 += var31; var11 += var35; @@ -2138,7 +2138,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var6 += var30; var5 += var31; var11 += var35; @@ -2162,7 +2162,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var4 += var32; var5 += var31; var11 += var35; @@ -2174,7 +2174,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); var6 += var30; var5 += var31; var11 += var35; @@ -2214,7 +2214,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var52 = var3 - super.field2047.field2274; + var52 = var3 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -2232,7 +2232,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var4 += var30; var12 += var35; @@ -2244,7 +2244,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var6 += var32; var12 += var35; @@ -2268,7 +2268,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var4 += var30; var12 += var35; @@ -2280,7 +2280,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var31; var6 += var32; var12 += var35; @@ -2307,7 +2307,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var52 = var3 - super.field2047.field2274; + var52 = var3 - super.field2059.field2287; var41 += var43 * var52; var44 += var46 * var52; var47 += var49 * var52; @@ -2325,7 +2325,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var30; var6 += var32; var12 += var35; @@ -2337,7 +2337,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var4 += var31; var6 += var32; var12 += var35; @@ -2361,7 +2361,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var5 += var30; var6 += var32; var12 += var35; @@ -2373,7 +2373,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1380(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); var4 += var31; var6 += var32; var12 += var35; @@ -2390,38 +2390,38 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("bf") - final void method1365(int[] var1, float[] var2, int var3, int var4, float var5) { - int var6 = method1373(var2[var3], var5) ? 1 : 0; + @ObfuscatedName("bv") + final void method1404(int[] var1, float[] var2, int var3, int var4, float var5) { + int var6 = method1412(var2[var3], var5) ? 1 : 0; int var7 = 1 - var6; var1[var3] = var7 * var1[var3] + var6 * var4; var2[var3] = (float)var6 * var5 + (float)var7 * var2[var3]; } - @ObfuscatedName("bq") - final void method1366(int[] var1, float[] var2, int var3, int var4, float var5) { - if (method1373(var2[var3], var5)) { + @ObfuscatedName("ba") + final void method1405(int[] var1, float[] var2, int var3, int var4, float var5) { + if (method1412(var2[var3], var5)) { int var6 = (var4 & (var4 >> 31 & 1) - 1) >> 8; - var1[var3] = super.field2046[var6]; + var1[var3] = super.field2058[var6]; var2[var3] = var5; } } - @ObfuscatedName("ba") - final void method1367(int[] var1, float[] var2, int var3, int var4, int var5, float var6) { - if (method1373(var2[var3], var6)) { + @ObfuscatedName("bz") + final void method1406(int[] var1, float[] var2, int var3, int var4, int var5, float var6) { + if (method1412(var2[var3], var6)) { int var7 = var1[var3]; var1[var3] = ((var7 & 16711935) * var5 >> 8 & 16711935) + var4 + (var5 * (var7 & 65280) >> 8 & 65280); } } - @ObfuscatedName("bl") - final void method1368(int[] var1, float[] var2, int var3, int var4, int var5, int var6, float var7) { - if (method1373(var2[var3], var7)) { + @ObfuscatedName("bb") + final void method1407(int[] var1, float[] var2, int var3, int var4, int var5, int var6, float var7) { + if (method1412(var2[var3], var7)) { int var8 = (var4 & (var4 >> 31 & 1) - 1) >> 8; - int var9 = super.field2046[var8]; + int var9 = super.field2058[var8]; var9 = ((var9 & 65280) * var6 >> 8 & 65280) + ((var9 & 16711935) * var6 >> 8 & 16711935); int var10 = var1[var3]; var1[var3] = var9 + ((var10 & 16711935) * var5 >> 8 & 16711935) + (var5 * (var10 & 65280) >> 8 & 65280); @@ -2429,11 +2429,11 @@ final void method1368(int[] var1, float[] var2, int var3, int var4, int var5, in } - @ObfuscatedName("bp") - final void method1369(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, float var9, float var10) { - if (super.field2047.field2268) { - if (var6 > super.field2047.field2276) { - var6 = super.field2047.field2276; + @ObfuscatedName("bo") + final void method1408(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, float var9, float var10) { + if (super.field2059.field2278) { + if (var6 > super.field2059.field2285) { + var6 = super.field2059.field2285; } if (var5 < 0) { @@ -2447,25 +2447,25 @@ final void method1369(int[] var1, int var2, int var3, int var4, int var5, int va var9 += var10 * (float)var5; int var11; int var12; - if (super.field2047.field2279) { + if (super.field2059.field2289) { var4 = var6 - var5 >> 2; var8 <<= 2; - if (super.field2047.field2275 == 0) { + if (super.field2059.field2282 == 0) { if (var4 > 0) { do { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2046[var11]; + var3 = super.field2058[var11]; var7 += var8; - this.method1365(var1, Rasterizer2D.field4217, var2, var3, var9); + this.method1404(var1, Rasterizer2D.field4244, var2, var3, var9); var9 += var10; ++var2; - this.method1365(var1, Rasterizer2D.field4217, var2, var3, var9); + this.method1404(var1, Rasterizer2D.field4244, var2, var3, var9); var9 += var10; ++var2; - this.method1365(var1, Rasterizer2D.field4217, var2, var3, var9); + this.method1404(var1, Rasterizer2D.field4244, var2, var3, var9); var9 += var10; ++var2; - this.method1365(var1, Rasterizer2D.field4217, var2, var3, var9); + this.method1404(var1, Rasterizer2D.field4244, var2, var3, var9); var9 += var10; ++var2; --var4; @@ -2475,35 +2475,35 @@ final void method1369(int[] var1, int var2, int var3, int var4, int var5, int va var4 = var6 - var5 & 3; if (var4 > 0) { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2046[var11]; + var3 = super.field2058[var11]; do { - this.method1365(var1, Rasterizer2D.field4217, var2, var3, var9); + this.method1404(var1, Rasterizer2D.field4244, var2, var3, var9); var9 += var10; ++var2; --var4; } while(var4 > 0); } } else { - var11 = super.field2047.field2275; - var12 = 256 - super.field2047.field2275; + var11 = super.field2059.field2282; + var12 = 256 - super.field2059.field2282; int var13; if (var4 > 0) { do { var13 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2046[var13]; + var3 = super.field2058[var13]; var7 += var8; var3 = ((var3 & 16711935) * var12 >> 8 & 16711935) + (var12 * (var3 & 65280) >> 8 & 65280); - this.method1367(var1, Rasterizer2D.field4217, var2, var3, var11, var9); + this.method1406(var1, Rasterizer2D.field4244, var2, var3, var11, var9); ++var2; var9 += var10; - this.method1367(var1, Rasterizer2D.field4217, var2, var3, var11, var9); + this.method1406(var1, Rasterizer2D.field4244, var2, var3, var11, var9); ++var2; var9 += var10; - this.method1367(var1, Rasterizer2D.field4217, var2, var3, var11, var9); + this.method1406(var1, Rasterizer2D.field4244, var2, var3, var11, var9); ++var2; var9 += var10; - this.method1367(var1, Rasterizer2D.field4217, var2, var3, var11, var9); + this.method1406(var1, Rasterizer2D.field4244, var2, var3, var11, var9); ++var2; var9 += var10; --var4; @@ -2513,11 +2513,11 @@ final void method1369(int[] var1, int var2, int var3, int var4, int var5, int va var4 = var6 - var5 & 3; if (var4 > 0) { var13 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2046[var13]; + var3 = super.field2058[var13]; var3 = ((var3 & 16711935) * var12 >> 8 & 16711935) + (var12 * (var3 & 65280) >> 8 & 65280); do { - this.method1367(var1, Rasterizer2D.field4217, var2, var3, var11, var9); + this.method1406(var1, Rasterizer2D.field4244, var2, var3, var11, var9); ++var2; var9 += var10; --var4; @@ -2527,20 +2527,20 @@ final void method1369(int[] var1, int var2, int var3, int var4, int var5, int va } else { var4 = var6 - var5; - if (super.field2047.field2275 == 0) { + if (super.field2059.field2282 == 0) { do { - this.method1366(var1, Rasterizer2D.field4217, var2, var7, var9); + this.method1405(var1, Rasterizer2D.field4244, var2, var7, var9); var9 += var10; ++var2; var7 += var8; --var4; } while(var4 > 0); } else { - var11 = super.field2047.field2275; - var12 = 256 - super.field2047.field2275; + var11 = super.field2059.field2282; + var12 = 256 - super.field2059.field2282; do { - this.method1368(var1, Rasterizer2D.field4217, var2, var3, var11, var12, var9); + this.method1407(var1, Rasterizer2D.field4244, var2, var3, var11, var12, var9); var9 += var10; ++var2; var7 += var8; @@ -2552,11 +2552,11 @@ final void method1369(int[] var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("bu") - final void method1371(int[] var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8) { - if (super.field2047.field2268) { - if (var6 > super.field2047.field2276) { - var6 = super.field2047.field2276; + @ObfuscatedName("bp") + final void method1410(int[] var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8) { + if (super.field2059.field2278) { + if (var6 > super.field2059.field2285) { + var6 = super.field2059.field2285; } if (var5 < 0) { @@ -2568,8 +2568,8 @@ final void method1371(int[] var1, int var2, int var3, int var4, int var5, int va var2 += var5; var4 = var6 - var5 >> 2; var7 += var8 * (float)var5; - if (super.field2047.field2275 != 0) { - if (super.field2047.field2275 == 254) { + if (super.field2059.field2282 != 0) { + if (super.field2059.field2282 == 254) { while (true) { --var4; if (var4 < 0) { @@ -2591,8 +2591,8 @@ final void method1371(int[] var1, int var2, int var3, int var4, int var5, int va var1[var2++] = var1[var2]; } } else { - int var9 = super.field2047.field2275; - int var10 = 256 - super.field2047.field2275; + int var9 = super.field2059.field2282; + int var10 = 256 - super.field2059.field2282; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); while (true) { @@ -2606,22 +2606,22 @@ final void method1371(int[] var1, int var2, int var3, int var4, int var5, int va return; } - this.method1367(var1, Rasterizer2D.field4217, var2, var3, var9, var7); + this.method1406(var1, Rasterizer2D.field4244, var2, var3, var9, var7); ++var2; var7 += var8; } } - this.method1367(var1, Rasterizer2D.field4217, var2, var3, var9, var7); + this.method1406(var1, Rasterizer2D.field4244, var2, var3, var9, var7); ++var2; var7 += var8; - this.method1367(var1, Rasterizer2D.field4217, var2, var3, var9, var7); + this.method1406(var1, Rasterizer2D.field4244, var2, var3, var9, var7); ++var2; var7 += var8; - this.method1367(var1, Rasterizer2D.field4217, var2, var3, var9, var7); + this.method1406(var1, Rasterizer2D.field4244, var2, var3, var9, var7); ++var2; var7 += var8; - this.method1367(var1, Rasterizer2D.field4217, var2, var3, var9, var7); + this.method1406(var1, Rasterizer2D.field4244, var2, var3, var9, var7); ++var2; var7 += var8; } @@ -2638,22 +2638,22 @@ final void method1371(int[] var1, int var2, int var3, int var4, int var5, int va return; } - this.method1365(var1, Rasterizer2D.field4217, var2, var3, var7); + this.method1404(var1, Rasterizer2D.field4244, var2, var3, var7); var7 += var8; ++var2; } } - this.method1365(var1, Rasterizer2D.field4217, var2, var3, var7); + this.method1404(var1, Rasterizer2D.field4244, var2, var3, var7); var7 += var8; ++var2; - this.method1365(var1, Rasterizer2D.field4217, var2, var3, var7); + this.method1404(var1, Rasterizer2D.field4244, var2, var3, var7); var7 += var8; ++var2; - this.method1365(var1, Rasterizer2D.field4217, var2, var3, var7); + this.method1404(var1, Rasterizer2D.field4244, var2, var3, var7); var7 += var8; ++var2; - this.method1365(var1, Rasterizer2D.field4217, var2, var3, var7); + this.method1404(var1, Rasterizer2D.field4244, var2, var3, var7); var7 += var8; ++var2; } @@ -2661,11 +2661,11 @@ final void method1371(int[] var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("bz") - final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { - if (super.field2047.field2268) { - if (var7 > super.field2047.field2276) { - var7 = super.field2047.field2276; + @ObfuscatedName("bu") + final void method1417(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { + if (super.field2059.field2278) { + if (var7 > super.field2059.field2285) { + var7 = super.field2059.field2285; } if (var6 < 0) { @@ -2687,8 +2687,8 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int int var24; int var25; int var26; - if (super.field2044) { - var26 = var6 - super.field2047.field2272; + if (super.field2057) { + var26 = var6 - super.field2059.field2284; var12 += (var15 >> 3) * var26; var13 += var26 * (var16 >> 3); var14 += var26 * (var17 >> 3); @@ -2728,38 +2728,38 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int var20 >>= 3; var9 <<= 3; var18 = var8 >> 8; - if (super.field2045) { + if (super.field2056) { if (var20 > 0) { do { - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var10000 = var3 + var19; var10 += var11; @@ -2793,7 +2793,7 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -2803,35 +2803,35 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int } else { if (var20 > 0) { do { - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var10000 = var3 + var19; var10 += var11; @@ -2865,7 +2865,7 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -2874,7 +2874,7 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int } } } else { - var26 = var6 - super.field2047.field2272; + var26 = var6 - super.field2059.field2284; var12 += (var15 >> 3) * var26; var13 += var26 * (var16 >> 3); var14 += var26 * (var17 >> 3); @@ -2914,38 +2914,38 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int var20 >>= 3; var9 <<= 3; var18 = var8 >> 8; - if (super.field2045) { + if (super.field2056) { if (var20 > 0) { do { - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var10000 = var3 + var19; var10 += var11; @@ -2979,7 +2979,7 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -2989,35 +2989,35 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int } else { if (var20 > 0) { do { - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var10000 = var3 + var19; var10 += var11; @@ -3051,7 +3051,7 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3064,11 +3064,11 @@ final void method1378(int[] var1, int[] var2, int var3, int var4, int var5, int } } - @ObfuscatedName("bx") - final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { - if (super.field2047.field2268) { - if (var7 > super.field2047.field2276) { - var7 = super.field2047.field2276; + @ObfuscatedName("bf") + final void method1419(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { + if (super.field2059.field2278) { + if (var7 > super.field2059.field2285) { + var7 = super.field2059.field2285; } if (var6 < 0) { @@ -3089,8 +3089,8 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int int var24; int var25; int var26; - if (super.field2044) { - var26 = var6 - super.field2047.field2272; + if (super.field2057) { + var26 = var6 - super.field2059.field2284; var12 += var26 * var15; var13 += var26 * var16; var14 += var17 * var26; @@ -3120,38 +3120,38 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int var20 >>= 3; var9 <<= 3; var18 = var8 >> 8; - if (super.field2045) { + if (super.field2056) { if (var20 > 0) { do { - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3164,7 +3164,7 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1374(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3174,35 +3174,35 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int } else { if (var20 > 0) { do { - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3215,7 +3215,7 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1375(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3224,7 +3224,7 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int } } } else { - var26 = var6 - super.field2047.field2272; + var26 = var6 - super.field2059.field2284; var12 += var26 * var15; var13 += var26 * var16; var14 += var17 * var26; @@ -3254,38 +3254,38 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int var20 >>= 3; var9 <<= 3; var18 = var8 >> 8; - if (super.field2045) { + if (super.field2056) { if (var20 > 0) { do { - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3298,7 +3298,7 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1376(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3308,35 +3308,35 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int } else { if (var20 > 0) { do { - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3349,7 +3349,7 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int var20 = var7 - var6 & 7; if (var20 > 0) { do { - method1377(var1, Rasterizer2D.field4217, var2, var5, var18, var3, var10); + method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); ++var5; var3 += var19; var10 += var11; @@ -3362,14 +3362,14 @@ final void method1380(int[] var1, int[] var2, int var3, int var4, int var5, int } } - @ObfuscatedName("bo") - static final boolean method1373(float var0, float var1) { + @ObfuscatedName("bt") + static final boolean method1412(float var0, float var1) { return var1 > var0; } - @ObfuscatedName("bb") - static final void method1374(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { - if (method1373(var1[var3], var6)) { + @ObfuscatedName("bm") + static final void method1413(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + if (method1412(var1[var3], var6)) { int var7 = var2[(var5 & 4032) + (var5 >>> 26)]; var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; var1[var3] = var6; @@ -3378,10 +3378,10 @@ static final void method1374(int[] var0, float[] var1, int[] var2, int var3, int } @ObfuscatedName("br") - static final void method1375(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + static final void method1414(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { int var7 = var2[(var5 & 4032) + (var5 >>> 26)]; if (var7 != 0) { - if (method1373(var1[var3], var6)) { + if (method1412(var1[var3], var6)) { var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; var1[var3] = var6; } @@ -3389,9 +3389,9 @@ static final void method1375(int[] var0, float[] var1, int[] var2, int var3, int } } - @ObfuscatedName("be") - static final void method1376(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { - if (method1373(var1[var3], var6)) { + @ObfuscatedName("bs") + static final void method1415(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + if (method1412(var1[var3], var6)) { int var7 = var2[(var5 >>> 25) + (var5 & 16256)]; var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; var1[var3] = var6; @@ -3399,11 +3399,11 @@ static final void method1376(int[] var0, float[] var1, int[] var2, int var3, int } - @ObfuscatedName("bi") - static final void method1377(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + @ObfuscatedName("bc") + static final void method1416(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { int var7 = var2[(var5 >>> 25) + (var5 & 16256)]; if (var7 != 0) { - if (method1373(var1[var3], var6)) { + if (method1412(var1[var3], var6)) { var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; var1[var3] = var6; } diff --git a/osrs/src/main/java/class26.java b/osrs/src/main/java/class26.java deleted file mode 100644 index ad4ef9b49..000000000 --- a/osrs/src/main/java/class26.java +++ /dev/null @@ -1,17 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.js.JSObject; - -import java.applet.Applet; - -@ObfuscatedName("bh") -public class class26 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "-1868178316" - ) - public static Object method95(Applet var0, String var1, Object[] var2) throws Throwable { - return JSObject.getWindow(var0).call(var1, var2); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class260.java b/osrs/src/main/java/class260.java deleted file mode 100644 index 1bc2f33b4..000000000 --- a/osrs/src/main/java/class260.java +++ /dev/null @@ -1,252 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kb") -public class class260 implements WorldMapSection { - @ObfuscatedName("au") - int field2394; - @ObfuscatedName("ae") - int field2388; - @ObfuscatedName("ao") - int field2391; - @ObfuscatedName("at") - int field2393; - @ObfuscatedName("ac") - int field2387; - @ObfuscatedName("ai") - int field2390; - @ObfuscatedName("az") - int field2395; - @ObfuscatedName("ap") - int field2392; - @ObfuscatedName("aa") - int field2386; - @ObfuscatedName("af") - int field2389; - - class260() { - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljf;I)V", - garbageValue = "-474032336" - ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2387) { - var1.regionLowX = this.field2387; - } - - if (var1.regionHighX < this.field2387) { - var1.regionHighX = this.field2387; - } - - if (var1.regionLowY > this.field2390) { - var1.regionLowY = this.field2390; - } - - if (var1.regionHighY < this.field2390) { - var1.regionHighY = this.field2390; - } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "509257779" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field2394 && var1 < this.field2394 + this.field2388) { - return var2 >= (this.field2391 << 6) + (this.field2395 << 3) && var2 <= (this.field2391 << 6) + (this.field2395 << 3) + 7 && var3 >= (this.field2393 << 6) + (this.field2392 << 3) && var3 <= (this.field2393 << 6) + (this.field2392 << 3) + 7; - } else { - return false; - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-94" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field2387 << 6) + (this.field2386 << 3) && var1 <= (this.field2387 << 6) + (this.field2386 << 3) + 7 && var2 >= (this.field2390 << 6) + (this.field2389 << 3) && var2 <= (this.field2390 << 6) + (this.field2389 << 3) + 7; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "1978048199" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; - } else { - int[] var4 = new int[]{var2 + (this.field2387 * 64 - this.field2391 * 64) + (this.field2386 * 8 - this.field2395 * 8), var3 + (this.field2390 * 64 - this.field2393 * 64) + (this.field2389 * 8 - this.field2392 * 8)}; - return var4; - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(III)Lmc;", - garbageValue = "-1281040923" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } else { - int var3 = this.field2391 * 64 - this.field2387 * 64 + (this.field2395 * 8 - this.field2386 * 8) + var1; - int var4 = var2 + (this.field2393 * 64 - this.field2390 * 64) + (this.field2392 * 8 - this.field2389 * 8); - return new Coord(this.field2394, var3, var4); - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "47" - ) - @Export("read") - public void read(Buffer var1) { - this.field2394 = var1.readUnsignedByte(); - this.field2388 = var1.readUnsignedByte(); - this.field2391 = var1.readUnsignedShort(); - this.field2395 = var1.readUnsignedByte(); - this.field2393 = var1.readUnsignedShort(); - this.field2392 = var1.readUnsignedByte(); - this.field2387 = var1.readUnsignedShort(); - this.field2386 = var1.readUnsignedByte(); - this.field2390 = var1.readUnsignedShort(); - this.field2389 = var1.readUnsignedByte(); - this.method1498(); - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1425291786" - ) - void method1498() { - } - - @ObfuscatedName("lv") - @ObfuscatedSignature( - descriptor = "(Ldx;IIIB)V", - garbageValue = "-28" - ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { - NPCComposition var4 = var0.definition; - if (Client.menuOptionsCount < 400) { - if (var4.transforms != null) { - var4 = var4.transform(); - } - - if (var4 != null) { - if (var4.isInteractable) { - if (!var4.isFollower || Client.followerIndex == var1) { - String var5 = var0.method581(); - int var6; - if (var4.combatLevel != 0 && var0.combatLevelChange != 0) { - var6 = var0.combatLevelChange != -1 ? var0.combatLevelChange * -611368101 * -1824049965 : var4.combatLevel * 989486243 * 599602955; - var5 = var5 + class14.method42(var6, VarbitComposition.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; - } - - if (var4.isFollower && Client.followerOpsLowPriority) { - class385.insertMenuItemNoShift("Examine", MoveSpeed.colorStartTag(16776960) + var5, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - class385.insertMenuItemNoShift("Use", Client.field599 + " " + "->" + " " + MoveSpeed.colorStartTag(16776960) + var5, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((Canvas.selectedSpellFlags & 2) == 2) { - class385.insertMenuItemNoShift(Client.field600, Client.field601 + " " + "->" + " " + MoveSpeed.colorStartTag(16776960) + var5, 8, var1, var2, var3); - } - } else { - var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var7 = var4.actions; - int var8; - int var9; - if (var7 != null) { - for (var8 = 4; var8 >= 0; --var8) { - if (var0.method580(var8) && var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { - var9 = 0; - if (var8 == 0) { - var9 = var6 + 9; - } - - if (var8 == 1) { - var9 = var6 + 10; - } - - if (var8 == 2) { - var9 = var6 + 11; - } - - if (var8 == 3) { - var9 = var6 + 12; - } - - if (var8 == 4) { - var9 = var6 + 13; - } - - class385.insertMenuItemNoShift(var7[var8], MoveSpeed.colorStartTag(16776960) + var5, var9, var1, var2, var3); - } - } - } - - if (var7 != null) { - for (var8 = 4; var8 >= 0; --var8) { - if (var0.method580(var8) && var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { - short var10 = 0; - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > VarbitComposition.localPlayer.combatLevel) { - var10 = 2000; - } - - var9 = 0; - if (var8 == 0) { - var9 = var10 + 9; - } - - if (var8 == 1) { - var9 = var10 + 10; - } - - if (var8 == 2) { - var9 = var10 + 11; - } - - if (var8 == 3) { - var9 = var10 + 12; - } - - if (var8 == 4) { - var9 = var10 + 13; - } - - class385.insertMenuItemNoShift(var7[var8], MoveSpeed.colorStartTag(16776960) + var5, var9, var1, var2, var3); - } - } - } - } - - if (!var4.isFollower || !Client.followerOpsLowPriority) { - class385.insertMenuItemNoShift("Examine", MoveSpeed.colorStartTag(16776960) + var5, 1003, var1, var2, var3); - } - } - - } - } - } - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class261.java b/osrs/src/main/java/class261.java deleted file mode 100644 index bf82953cd..000000000 --- a/osrs/src/main/java/class261.java +++ /dev/null @@ -1,53 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kt") -public class class261 { - @ObfuscatedName("ap") - static int field2396; - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "([BIIII[Lis;I)V", - garbageValue = "657439907" - ) - static final void method1500(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { - int var7; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 64; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var2 + var8] &= -16777217; - } - } - } - } - - Buffer var12 = new Buffer(var0); - - for (var7 = 0; var7 < 4; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - for (int var9 = 0; var9 < 64; ++var9) { - int var10 = var8 + var1; - int var11 = var9 + var2; - SecureRandomFuture.loadTerrain(var12, var7, var10, var11, var3 + var10, var11 + var4, 0); - } - } - } - - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1102761288" - ) - public static void method1501() { - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class266.java b/osrs/src/main/java/class266.java new file mode 100644 index 000000000..6b5580c13 --- /dev/null +++ b/osrs/src/main/java/class266.java @@ -0,0 +1,407 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ko") +public class class266 { + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ILds;ZB)I", + garbageValue = "36" + ) + static int method1430(int var0, Script var1, boolean var2) { + String var3; + if (var0 == 3100) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + class411.addGameMessage(0, "", var3); + return 1; + } else if (var0 == 3101) { + Interpreter.Interpreter_intStackSize -= 2; + WorldMapEvent.performPlayerAnimation(TextureProvider.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == 3103) { + if (!Interpreter.field702) { + Interpreter.field701 = true; + } + + return 1; + } else { + int var10; + if (var0 == 3104) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var10 = 0; + if (AttackOption.isNumber(var3)) { + var10 = class36.method182(var3); + } + + PacketBufferNode var15 = ClanChannelMember.getPacketBufferNode(ClientPacket.RESUME_COUNTDIALOG, Client.packetWriter.isaacCipher); + var15.packetBuffer.writeInt(var10); + Client.packetWriter.addNode(var15); + return 1; + } else { + PacketBufferNode var12; + if (var0 == 3105) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.RESUME_NAMEDIALOG, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeByte(var3.length() + 1); + var12.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == 3106) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.RESUME_STRINGDIALOG, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeByte(var3.length() + 1); + var12.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var12); + return 1; + } else { + String var7; + int var8; + if (var0 == 3107) { + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + GrandExchangeOfferTotalQuantityComparator.method1976(var8, var7); + return 1; + } else if (var0 == 3108) { + Interpreter.Interpreter_intStackSize -= 3; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Widget var11 = class33.field89.method1740(var5); + TaskHandler.clickWidget(var11, var8, var10); + return 1; + } else if (var0 == 3109) { + Interpreter.Interpreter_intStackSize -= 2; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Widget var14 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + TaskHandler.clickWidget(var14, var8, var10); + return 1; + } else if (var0 == 3110) { + UserComparator8.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3111) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class91.clientPreferences.getRoofsHidden() ? 1 : 0; + return 1; + } else if (var0 == 3112) { + class91.clientPreferences.setRoofsHidden(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == 3113) { + var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + VertexNormal.openURL(var3, var4, false); + return 1; + } else if (var0 == 3115) { + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.RESUME_OBJDIALOG, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShort(var8); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == 3116) { + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + class180.Interpreter_stringStackSize -= 2; + var7 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; + String var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; + if (var7.length() > 500) { + return 1; + } else if (var9.length() > 500) { + return 1; + } else { + PacketBufferNode var6 = ClanChannelMember.getPacketBufferNode(ClientPacket.f66, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + class478.stringCp1252NullTerminatedByteSize(var7) + class478.stringCp1252NullTerminatedByteSize(var9)); + var6.packetBuffer.writeStringCp1252NullTerminated(var7); + var6.packetBuffer.writeStringCp1252NullTerminated(var9); + var6.packetBuffer.writeByteNeg(var8); + Client.packetWriter.addNode(var6); + return 1; + } + } else if (var0 == 3117) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 3118) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3119) { + Client.field388 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; + } + + return 1; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; + } + + return 1; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; + } + + return 1; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; + } + + return 1; + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; + return 1; + } else if (var0 == 3125) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3126) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3127) { + class154.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == 3128) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class47.getTapToDrop() ? 1 : 0; + return 1; + } else if (var0 == 3129) { + Interpreter.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + return 1; + } else if (var0 == 3130) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3131) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 3132) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class340.canvasWidth; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class491.canvasHeight; + return 1; + } else if (var0 == 3133) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 3134) { + return 1; + } else if (var0 == 3135) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3136) { + Client.field508 = 3; + Client.field505 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3137) { + Client.field508 = 2; + Client.field505 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3138) { + Client.field508 = 0; + return 1; + } else if (var0 == 3139) { + Client.field508 = 1; + return 1; + } else if (var0 == 3140) { + Client.field508 = 3; + Client.field505 = var2 ? class416.scriptDotWidget.id * 41171959 * -749799993 : class306.scriptActiveWidget.id * 41171959 * -749799993; + return 1; + } else { + boolean var13; + if (var0 == 3141) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class91.clientPreferences.setIsUsernameHidden(var13); + return 1; + } else if (var0 == 3142) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class91.clientPreferences.getIsUsernameHidden() ? 1 : 0; + return 1; + } else if (var0 == 3143) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var13; + if (!var13) { + class91.clientPreferences.setUsernameToRemember(""); + } + + return 1; + } else if (var0 == 3144) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; + return 1; + } else if (var0 == 3145) { + return 1; + } else if (var0 == 3146) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class91.clientPreferences.getTitleMusicDisabled(!var13); + return 1; + } else if (var0 == 3147) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class91.clientPreferences.getTitleMusicDisabled() ? 0 : 1; + return 1; + } else if (var0 == 3148) { + return 1; + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class138.method734(); + return 1; + } else if (var0 == 3155) { + --class180.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3156) { + return 1; + } else if (var0 == 3157) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3161) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3162) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3163) { + --class180.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3164) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3165) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3166) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3167) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3168) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3169) { + return 1; + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3172) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 3173) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3174) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3176) { + return 1; + } else if (var0 == 3177) { + return 1; + } else if (var0 == 3178) { + --class180.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3179) { + return 1; + } else if (var0 == 3180) { + --class180.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3181) { + FontName.method2482(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return 1; + } else if (var0 == 3182) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FaceNormal.method1334(); + return 1; + } else if (var0 == 3189) { + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + class462.method2327(var8); + return 1; + } else { + return 2; + } + } + } + } + } + } + + @ObfuscatedName("ko") + @ObfuscatedSignature( + descriptor = "(IIIIII)Z", + garbageValue = "-277761006" + ) + static final boolean method1431(int var0, int var1, int var2, int var3, int var4) { + PendingSpawn var5 = null; + + for (PendingSpawn var6 = (PendingSpawn)Client.pendingSpawns.last(); var6 != null; var6 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var6.plane && var6.x == var1 && var2 == var6.y && var3 == var6.type) { + var5 = var6; + break; + } + } + + if (var5 != null) { + var5.field946 = var4; + return true; + } else { + return false; + } + } + + @ObfuscatedName("ob") + @ObfuscatedSignature( + descriptor = "([BII)V", + garbageValue = "-1820839232" + ) + static void method1432(byte[] var0, int var1) { + if (Client.randomDatData == null) { + Client.randomDatData = new byte[24]; + } + + class424.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class27.java b/osrs/src/main/java/class27.java index 13131bf9d..d9561d195 100644 --- a/osrs/src/main/java/class27.java +++ b/osrs/src/main/java/class27.java @@ -4,106 +4,112 @@ import java.util.Arrays; -@ObfuscatedName("bj") +@ObfuscatedName("bk") public class class27 { - @ObfuscatedName("gx") - static String field76; - @ObfuscatedName("az") - int[] field78; - @ObfuscatedName("ap") + @ObfuscatedName("au") + static String[] field74; + @ObfuscatedName("fp") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("ar") int[] field77; + @ObfuscatedName("ab") + int[] field76; public class27() { - this.field78 = new int[112]; - this.field77 = new int[192]; - Arrays.fill(this.field78, 3); + this.field77 = new int[112]; + this.field76 = new int[192]; Arrays.fill(this.field77, 3); + Arrays.fill(this.field76, 3); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "4993" + descriptor = "(III)V", + garbageValue = "1970517025" ) - public void method96(int var1, int var2) { - if (this.method104(var1) && this.method106(var2)) { - this.field78[var1] = var2; + public void method102(int var1, int var2) { + if (this.method111(var1) && this.method113(var2)) { + this.field77[var1] = var2; } } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(CIB)V", - garbageValue = "4" + descriptor = "(CII)V", + garbageValue = "-1891863343" ) - public void method97(char var1, int var2) { - if (this.method105(var1) && this.method106(var2)) { - this.field77[var1] = var2; + public void method104(char var1, int var2) { + if (this.method112(var1) && this.method113(var2)) { + this.field76[var1] = var2; } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1011466688" + descriptor = "(IB)I", + garbageValue = "24" ) - public int method98(int var1) { - return this.method104(var1) ? this.field78[var1] : 0; + public int method105(int var1) { + return this.method111(var1) ? this.field77[var1] : 0; } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(CB)I", - garbageValue = "41" + descriptor = "(CI)I", + garbageValue = "-535571819" ) - public int method99(char var1) { - return this.method105(var1) ? this.field77[var1] : 0; + public int method106(char var1) { + return this.method112(var1) ? this.field76[var1] : 0; } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "2032631567" + descriptor = "(IB)Z", + garbageValue = "-101" ) - public boolean method100(int var1) { - return this.method104(var1) && (this.field78[var1] == 1 || this.field78[var1] == 3); + public boolean method107(int var1) { + return this.method111(var1) && (this.field77[var1] == 1 || this.field77[var1] == 3); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(CB)Z", - garbageValue = "1" + garbageValue = "9" ) - public boolean method101(char var1) { - return this.method105(var1) && (this.field77[var1] == 1 || this.field77[var1] == 3); + public boolean method108(char var1) { + return this.method112(var1) && (this.field76[var1] == 1 || this.field76[var1] == 3); } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "55" + descriptor = "(II)Z", + garbageValue = "-1930578634" ) - public boolean method102(int var1) { - return this.method104(var1) && (this.field78[var1] == 2 || this.field78[var1] == 3); + public boolean method109(int var1) { + return this.method111(var1) && (this.field77[var1] == 2 || this.field77[var1] == 3); } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-479848257" + descriptor = "(CB)Z", + garbageValue = "37" ) - public boolean method103(char var1) { - return this.method105(var1) && (this.field77[var1] == 2 || this.field77[var1] == 3); + public boolean method110(char var1) { + return this.method112(var1) && (this.field76[var1] == 2 || this.field76[var1] == 3); } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "516675311" + descriptor = "(IB)Z", + garbageValue = "0" ) - boolean method104(int var1) { + boolean method111(int var1) { if (var1 >= 0 && var1 < 112) { return true; } else { @@ -112,12 +118,12 @@ boolean method104(int var1) { } } - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "67" + descriptor = "(CI)Z", + garbageValue = "-1032091509" ) - boolean method105(char var1) { + boolean method112(char var1) { if (var1 >= 0 && var1 < 192) { return true; } else { @@ -126,12 +132,12 @@ boolean method105(char var1) { } } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-13" + descriptor = "(II)Z", + garbageValue = "1780470681" ) - boolean method106(int var1) { + boolean method113(int var1) { if (var1 >= 0 && var1 < 4) { return true; } else { @@ -140,70 +146,28 @@ boolean method106(int var1) { } } - @ObfuscatedName("ie") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1897607215" + descriptor = "(III)I", + garbageValue = "534503383" ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (class449.clientPreferences.getCurrentSoundEffectsVolume() != 0 && var1 != 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var0; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = 0; - ++Client.soundEffectCount; - } - - } - - @ObfuscatedName("mk") - @ObfuscatedSignature( - descriptor = "(Lmi;B)Z", - garbageValue = "14" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { - return false; + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = UserComparator9.method686(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var3 == var2) { - return false; - } - } else if (var2 != var3) { - return false; - } - } - - return true; + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; } } - @ObfuscatedName("og") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "1204243161" + descriptor = "(II)V", + garbageValue = "-376109619" ) - static void method109(Buffer var0, int var1) { - byte[] var2 = var0.array; - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; - } - - class409.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); - class13.method36(var0, var1); + static void method114(int var0) { + GameEngine.method166(14); + Login.field748 = var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class270.java b/osrs/src/main/java/class270.java deleted file mode 100644 index 70da95746..000000000 --- a/osrs/src/main/java/class270.java +++ /dev/null @@ -1,111 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.ArrayList; -import java.util.Iterator; - -@ObfuscatedName("ka") -public class class270 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lka;" - ) - static final class270 field2453; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lka;" - ) - static final class270 field2452; - @ObfuscatedName("fb") - static long field2451; - @ObfuscatedName("ao") - final int field2454; - - static { - field2453 = new class270(0); - field2452 = new class270(1); - } - - class270(int var1) { - this.field2454 = var1; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Ljava/util/ArrayList;ZI)V", - garbageValue = "544527881" - ) - static void method1536(ArrayList var0, boolean var1) { - if (!var1) { - class305.field2773.clear(); - } - - Iterator var2 = var0.iterator(); - - while (var2.hasNext()) { - MusicSong var3 = (MusicSong)var2.next(); - if (var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { - if (!var1) { - class305.field2773.add(var3); - } - - class305.field2774.add(var3); - } - } - - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "2021273787" - ) - public static void method1537(int var0, int var1, int var2, int var3) { - class305.musicPlayerStatus = var0; - class305.field2766 = var1; - class305.field2769 = var2; - class305.field2768 = var3; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(CII)Ljava/lang/String;", - garbageValue = "1203600347" - ) - public static String method1538(char var0, int var1) { - char[] var2 = new char[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var2[var3] = var0; - } - - return new String(var2); - } - - @ObfuscatedName("jt") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "340629836" - ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field615 = 0L; - if (var0 >= 2) { - Client.isResizable = true; - } else { - Client.isResizable = false; - } - - if (class218.getWindowedMode() == 1) { - class219.client.setMaxCanvasSize(765, 503); - } else { - class219.client.setMaxCanvasSize(7680, 2160); - } - - if (Client.gameState >= 25) { - Message.method341(); - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class271.java b/osrs/src/main/java/class271.java deleted file mode 100644 index b1416307d..000000000 --- a/osrs/src/main/java/class271.java +++ /dev/null @@ -1,214 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kf") -public class class271 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lkf;" - ) - static final class271 field2456; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lkf;" - ) - static final class271 field2455; - @ObfuscatedName("ao") - final int field2457; - - static { - field2456 = new class271(0); - field2455 = new class271(1); - } - - class271(int var1) { - this.field2457 = var1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)[Lio;", - garbageValue = "-681739410" - ) - static class214[] method1541() { - return new class214[]{class214.field1898, class214.field1904, class214.field1902, class214.field1900, class214.field1899, class214.field1901, class214.field1903}; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "2076822771" - ) - public static String method1540(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var3 = var0[var1]; - return var3 == null ? "null" : var3.toString(); - } else { - int var8 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var8; ++var5) { - CharSequence var6 = var0[var5]; - if (var6 == null) { - var4 += 4; - } else { - var4 += var6.length(); - } - } - - StringBuilder var9 = new StringBuilder(var4); - - for (int var10 = var1; var10 < var8; ++var10) { - CharSequence var7 = var0[var10]; - if (var7 == null) { - var9.append("null"); - } else { - var9.append(var7); - } - } - - return var9.toString(); - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)Lhu;", - garbageValue = "1432274466" - ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); - var1 = new EnumComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("kb") - @ObfuscatedSignature( - descriptor = "(ZLto;I)V", - garbageValue = "1816945767" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var3; - int var4; - int var5; - int var6; - int var7; - if (!Client.isInInstance) { - int var2 = var1.readUnsignedShort(); - var3 = var1.method2587(); - var4 = var1.readUnsignedShort(); - RunException.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - RunException.xteaKeys[var5][var6] = var1.readInt(); - } - } - - class191.regions = new int[var4]; - class59.regionMapArchiveIds = new int[var4]; - ObjTypeCustomisation.regionLandArchiveIds = new int[var4]; - UserComparator5.regionLandArchives = new byte[var4][]; - class197.regionMapArchives = new byte[var4][]; - var4 = 0; - - for (var5 = (var2 - 6) / 8; var5 <= (var2 + 6) / 8; ++var5) { - for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { - var7 = var6 + (var5 << 8); - class191.regions[var4] = var7; - class59.regionMapArchiveIds[var4] = class499.archive9.getGroupId("m" + var5 + "_" + var6); - ObjTypeCustomisation.regionLandArchiveIds[var4] = class499.archive9.getGroupId("l" + var5 + "_" + var6); - ++var4; - } - } - - class316.method1698(var2, var3, true); - } else { - boolean var15 = var1.readUnsignedByte() == 1; - var3 = var1.readUnsignedShort(); - var4 = var1.readUnsignedShort(); - var5 = var1.readUnsignedShort(); - var1.importIndex(); - - int var8; - int var9; - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = var1.readBits(1); - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; - } - } - } - } - - var1.exportIndex(); - RunException.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - RunException.xteaKeys[var6][var7] = var1.readInt(); - } - } - - class191.regions = new int[var5]; - class59.regionMapArchiveIds = new int[var5]; - ObjTypeCustomisation.regionLandArchiveIds = new int[var5]; - UserComparator5.regionLandArchives = new byte[var5][]; - class197.regionMapArchives = new byte[var5][]; - var5 = 0; - - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = Client.instanceChunkTemplates[var6][var7][var8]; - if (var9 != -1) { - int var10 = var9 >> 14 & 1023; - int var11 = var9 >> 3 & 2047; - int var12 = (var10 / 8 << 8) + var11 / 8; - - int var13; - for (var13 = 0; var13 < var5; ++var13) { - if (class191.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - class191.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - class59.regionMapArchiveIds[var5] = class499.archive9.getGroupId("m" + var13 + "_" + var14); - ObjTypeCustomisation.regionLandArchiveIds[var5] = class499.archive9.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - class316.method1698(var4, var3, !var15); - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class272.java b/osrs/src/main/java/class272.java deleted file mode 100644 index eeed69357..000000000 --- a/osrs/src/main/java/class272.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kx") -public class class272 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "119" - ) - static void method1544(int var0) { - GrandExchangeOfferOwnWorldComparator.field361 = var0; - class450.field3873 = new class450[var0]; - class462.field3904 = 0; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class274.java b/osrs/src/main/java/class274.java new file mode 100644 index 000000000..e875248a9 --- /dev/null +++ b/osrs/src/main/java/class274.java @@ -0,0 +1,149 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ks") +public class class274 implements WorldMapSection { + @ObfuscatedName("cx") + static int field2399; + @ObfuscatedName("ac") + int field2401; + @ObfuscatedName("al") + int field2404; + @ObfuscatedName("ak") + int field2403; + @ObfuscatedName("ax") + int field2409; + @ObfuscatedName("ao") + int field2406; + @ObfuscatedName("ah") + int field2402; + @ObfuscatedName("ar") + int field2407; + @ObfuscatedName("ab") + int field2400; + @ObfuscatedName("am") + int field2405; + @ObfuscatedName("av") + int field2408; + + class274() { + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lkz;I)V", + garbageValue = "1844466074" + ) + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field2406) { + var1.regionLowX = this.field2406; + } + + if (var1.regionHighX < this.field2406) { + var1.regionHighX = this.field2406; + } + + if (var1.regionLowY > this.field2402) { + var1.regionLowY = this.field2402; + } + + if (var1.regionHighY < this.field2402) { + var1.regionHighY = this.field2402; + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IIII)Z", + garbageValue = "-1135530948" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field2401 && var1 < this.field2401 + this.field2404) { + return var2 >= (this.field2403 << 6) + (this.field2407 << 3) && var2 <= (this.field2403 << 6) + (this.field2407 << 3) + 7 && var3 >= (this.field2409 << 6) + (this.field2400 << 3) && var3 <= (this.field2409 << 6) + (this.field2400 << 3) + 7; + } else { + return false; + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "1124460333" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field2406 << 6) + (this.field2405 << 3) && var1 <= (this.field2406 << 6) + (this.field2405 << 3) + 7 && var2 >= (this.field2402 << 6) + (this.field2408 << 3) && var2 <= (this.field2402 << 6) + (this.field2408 << 3) + 7; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "557011185" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { + return null; + } else { + int[] var4 = new int[]{var2 + (this.field2406 * 64 - this.field2403 * 64) + (this.field2405 * 8 - this.field2407 * 8), var3 + (this.field2402 * 64 - this.field2409 * 64) + (this.field2408 * 8 - this.field2400 * 8)}; + return var4; + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(III)Lmo;", + garbageValue = "-1670709360" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { + return null; + } else { + int var3 = this.field2403 * 64 - this.field2406 * 64 + (this.field2407 * 8 - this.field2405 * 8) + var1; + int var4 = var2 + (this.field2409 * 64 - this.field2402 * 64) + (this.field2400 * 8 - this.field2408 * 8); + return new Coord(this.field2401, var3, var4); + } + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lul;I)V", + garbageValue = "-801073373" + ) + @Export("read") + public void read(Buffer var1) { + this.field2401 = var1.readUnsignedByte(); + this.field2404 = var1.readUnsignedByte(); + this.field2403 = var1.readUnsignedShort(); + this.field2407 = var1.readUnsignedByte(); + this.field2409 = var1.readUnsignedShort(); + this.field2400 = var1.readUnsignedByte(); + this.field2406 = var1.readUnsignedShort(); + this.field2405 = var1.readUnsignedByte(); + this.field2402 = var1.readUnsignedShort(); + this.field2408 = var1.readUnsignedByte(); + this.method1535(); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "54" + ) + void method1535() { + } + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1696512982" + ) + static int method1536(int var0) { + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class275.java b/osrs/src/main/java/class275.java new file mode 100644 index 000000000..ea21fff3f --- /dev/null +++ b/osrs/src/main/java/class275.java @@ -0,0 +1,41 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; + +@ObfuscatedName("kp") +public class class275 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;I)V", + garbageValue = "-770626975" + ) + public static void method1537(AbstractArchive var0) { + EnumComposition.EnumDefinition_archive = var0; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(Ljava/util/ArrayList;IIIII)V", + garbageValue = "459181923" + ) + public static void method1538(ArrayList var0, int var1, int var2, int var3, int var4) { + class319.field2789.clear(); + class319.field2789.addAll(var0); + MouseHandler.method177(var1, var2, var3, var4); + } + + @ObfuscatedName("mv") + @ObfuscatedSignature( + descriptor = "(Lnm;I)Lnm;", + garbageValue = "1424851041" + ) + static Widget method1539(Widget var0) { + Widget var1 = class212.method1045(var0); + if (var1 == null) { + var1 = var0.parent; + } + + return var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class28.java b/osrs/src/main/java/class28.java index 1ca6530c9..52bac12be 100644 --- a/osrs/src/main/java/class28.java +++ b/osrs/src/main/java/class28.java @@ -2,55 +2,41 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bk") +@ObfuscatedName("by") public class class28 { - @ObfuscatedName("wn") - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("ds") + @ObfuscatedName("ai") + @Export("ByteArrayPool_arrays") + public static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("dk") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - static Archive field81; + @ObfuscatedName("nf") + @Export("menuX") + static int menuX; static { 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, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lnu;III)[Luk;", - garbageValue = "-1285890044" - ) - public static IndexedSprite[] method110(AbstractArchive var0, int var1, int var2) { - return !ApproximateRouteStrategy.method345(var0, var1, var2) ? null : class30.method118(); - } - - @ObfuscatedName("ow") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "972746091" + descriptor = "(IB)Lds;", + garbageValue = "14" ) - static void method111() { - if (Client.oculusOrbOnLocalPlayer && VarbitComposition.localPlayer != null) { - int var0 = VarbitComposition.localPlayer.pathX[0]; - int var1 = VarbitComposition.localPlayer.pathY[0]; - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { - return; - } - - FriendLoginUpdate.oculusOrbFocalPointX = VarbitComposition.localPlayer.x; - int var2 = class18.getTileHeight(VarbitComposition.localPlayer.x, VarbitComposition.localPlayer.y, HealthBar.Client_plane) - Client.camFollowHeight; - if (var2 < class125.field1194) { - class125.field1194 = var2; + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SongTask.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; + } else { + var1 = class224.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; } - - HealthBar.oculusOrbFocalPointY = VarbitComposition.localPlayer.y; - Client.oculusOrbOnLocalPlayer = false; } - } } \ No newline at end of file diff --git a/osrs/src/main/java/class280.java b/osrs/src/main/java/class280.java deleted file mode 100644 index 4e5707c01..000000000 --- a/osrs/src/main/java/class280.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("kk") -public interface class280 extends class282 { -} \ No newline at end of file diff --git a/osrs/src/main/java/class281.java b/osrs/src/main/java/class281.java deleted file mode 100644 index 15c7b75fc..000000000 --- a/osrs/src/main/java/class281.java +++ /dev/null @@ -1,15 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kc") -public abstract class class281 implements class283 { - @ObfuscatedName("au") - protected int field2482; - - @ObfuscatedSignature( - descriptor = "(Lns;Lon;I)V" - ) - protected class281(StudioGame var1, Language var2, int var3) { - this.field2482 = var3; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class282.java b/osrs/src/main/java/class282.java deleted file mode 100644 index b30cba68a..000000000 --- a/osrs/src/main/java/class282.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("km") -public interface class282 { -} \ No newline at end of file diff --git a/osrs/src/main/java/class283.java b/osrs/src/main/java/class283.java deleted file mode 100644 index 36cdd51e2..000000000 --- a/osrs/src/main/java/class283.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("kz") -public interface class283 extends Iterable { -} \ No newline at end of file diff --git a/osrs/src/main/java/class284.java b/osrs/src/main/java/class284.java index 5ab7b2e3d..00cb206bf 100644 --- a/osrs/src/main/java/class284.java +++ b/osrs/src/main/java/class284.java @@ -1,7 +1,49 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kh") -public interface class284 { - @ObfuscatedName("au") - void method1589(Object var1); +@ObfuscatedName("ku") +public class class284 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lku;" + ) + static final class284 field2464; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lku;" + ) + static final class284 field2465; + @ObfuscatedName("am") + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("ak") + final int field2466; + + static { + field2464 = new class284(0); + field2465 = new class284(1); + } + + class284(int var1) { + this.field2466 = var1; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "102" + ) + static final void method1572() { + class436.method2211("Your ignore list is full. Max of 100 for free users, and 400 for members"); + } + + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "(B)Lit;", + garbageValue = "-33" + ) + public static class226 method1573() { + return Client.keyHandlerInstance; + } } \ No newline at end of file diff --git a/osrs/src/main/java/class285.java b/osrs/src/main/java/class285.java new file mode 100644 index 000000000..462b09a1d --- /dev/null +++ b/osrs/src/main/java/class285.java @@ -0,0 +1,27 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ki") +public class class285 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + static final class285 field2467; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + static final class285 field2468; + @ObfuscatedName("ak") + final int field2469; + + static { + field2467 = new class285(0); + field2468 = new class285(1); + } + + class285(int var1) { + this.field2469 = var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class286.java b/osrs/src/main/java/class286.java new file mode 100644 index 000000000..1ae3adeeb --- /dev/null +++ b/osrs/src/main/java/class286.java @@ -0,0 +1,43 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("la") +public class class286 { + @ObfuscatedName("ar") + static int field2470; + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(Lni;I)Z", + garbageValue = "-249009883" + ) + static boolean method1574(PlayerComposition var0) { + if (var0.equipment[0] < 512) { + return false; + } else { + ItemComposition var1 = class214.ItemDefinition_get(var0.equipment[0] - 512); + return var1.maleModel1 != class223.field1865.field1879 && var1.maleModel2 != class223.field1865.field1879; + } + } + + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "863743368" + ) + static void method1575() { + if (Client.isSpellSelected) { + Widget var0 = class33.field89.getWidgetChild(JagexCache.field1449, Client.selectedSpellChildIndex); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + Interpreter.runScriptEvent(var1); + } + + Client.field503 = -1; + Client.isSpellSelected = false; + ClanChannelMember.invalidateWidget(var0); + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class29.java b/osrs/src/main/java/class29.java index 19047f9a7..2fc3eeb8c 100644 --- a/osrs/src/main/java/class29.java +++ b/osrs/src/main/java/class29.java @@ -2,36 +2,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bd") public interface class29 { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1089015731" + garbageValue = "-1448724719" ) @Export("vmethod3949") boolean vmethod3949(int var1); - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1292750960" + garbageValue = "-974805318" ) @Export("vmethod3989") boolean vmethod3989(int var1); - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-352714805" + descriptor = "(CB)Z", + garbageValue = "19" ) @Export("vmethod3951") boolean vmethod3951(char var1); - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(ZI)Z", - garbageValue = "-1559971994" + garbageValue = "-672025946" ) @Export("vmethod3953") boolean vmethod3953(boolean var1); diff --git a/osrs/src/main/java/class291.java b/osrs/src/main/java/class291.java deleted file mode 100644 index 94278eb0d..000000000 --- a/osrs/src/main/java/class291.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lm") -public class class291 { - @ObfuscatedName("az") - public static int field2496; -} \ No newline at end of file diff --git a/osrs/src/main/java/class292.java b/osrs/src/main/java/class292.java deleted file mode 100644 index c60eb1b01..000000000 --- a/osrs/src/main/java/class292.java +++ /dev/null @@ -1,9 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lp") -public class class292 { - @ObfuscatedName("gs") - @Export("worldHost") - static String worldHost; -} \ No newline at end of file diff --git a/osrs/src/main/java/class293.java b/osrs/src/main/java/class293.java deleted file mode 100644 index bd63cae04..000000000 --- a/osrs/src/main/java/class293.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("la") -public interface class293 { -} \ No newline at end of file diff --git a/osrs/src/main/java/class294.java b/osrs/src/main/java/class294.java new file mode 100644 index 000000000..a62312419 --- /dev/null +++ b/osrs/src/main/java/class294.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lc") +public interface class294 extends class296 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class295.java b/osrs/src/main/java/class295.java new file mode 100644 index 000000000..3cd1b30be --- /dev/null +++ b/osrs/src/main/java/class295.java @@ -0,0 +1,27 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lk") +public abstract class class295 implements class297 { + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("SequenceDefinition_archive") + static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lgi;" + ) + static ClanSettings field2496; + @ObfuscatedName("ac") + protected int field2498; + + @ObfuscatedSignature( + descriptor = "(Lnp;Loa;I)V" + ) + protected class295(StudioGame var1, Language var2, int var3) { + this.field2498 = var3; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class296.java b/osrs/src/main/java/class296.java new file mode 100644 index 000000000..2d53c2acb --- /dev/null +++ b/osrs/src/main/java/class296.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lv") +public interface class296 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class297.java b/osrs/src/main/java/class297.java new file mode 100644 index 000000000..2be2700cd --- /dev/null +++ b/osrs/src/main/java/class297.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lw") +public interface class297 extends Iterable { +} \ No newline at end of file diff --git a/osrs/src/main/java/class298.java b/osrs/src/main/java/class298.java new file mode 100644 index 000000000..28e0c2614 --- /dev/null +++ b/osrs/src/main/java/class298.java @@ -0,0 +1,7 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lo") +public interface class298 { + @ObfuscatedName("ac") + void method1616(Object var1); +} \ No newline at end of file diff --git a/osrs/src/main/java/class299.java b/osrs/src/main/java/class299.java deleted file mode 100644 index a7b454c5f..000000000 --- a/osrs/src/main/java/class299.java +++ /dev/null @@ -1,143 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.js.JSObject; - -import java.applet.Applet; -import java.io.File; -import java.io.RandomAccessFile; -import java.net.URL; - -@ObfuscatedName("ln") -public class class299 { - @ObfuscatedName("va") - @ObfuscatedSignature( - descriptor = "Lci;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "[Luk;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "1126631894" - ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; - - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); - int var5 = var3.read(); - var3.seek(0L); - var3.write(var5); - var3.seek(0L); - var3.close(); - FileSystem.FileSystem_cacheFiles.put(var0, var2); - return var2; - } - } catch (Exception var8) { - try { - if (var3 != null) { - var3.close(); - var3 = null; - } - } catch (Exception var7) { - } - - throw new RuntimeException(); - } - } - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", - garbageValue = "-644258747" - ) - static boolean method1618(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class31.field86.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; - - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var11.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; - } - } catch (Throwable var5) { - return false; - } - } else if (var1 == 1) { - try { - Object var10 = class26.method95(class31.field85, var2, new Object[]{(new URL(class31.field85.getCodeBase(), var0)).toString()}); - return var10 != null; - } catch (Throwable var6) { - return false; - } - } else if (var1 == 2) { - try { - class31.field85.getAppletContext().showDocument(new URL(class31.field85.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var7) { - return false; - } - } else if (var1 == 3) { - try { - Applet var3 = class31.field85; - JSObject.getWindow(var3).call("loggedout", (Object[])null); - } catch (Throwable var9) { - } - - try { - class31.field85.getAppletContext().showDocument(new URL(class31.field85.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var8) { - return false; - } - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(IIB)Liw;", - garbageValue = "122" - ) - static RouteStrategy method1619(int var0, int var1) { - Client.field652.approxDestinationX = var0; - Client.field652.approxDestinationY = var1; - Client.field652.approxDestinationSizeX = 1; - Client.field652.approxDestinationSizeY = 1; - return Client.field652; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class3.java b/osrs/src/main/java/class3.java index 47ce2f916..f73339780 100644 --- a/osrs/src/main/java/class3.java +++ b/osrs/src/main/java/class3.java @@ -2,11 +2,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("at") +@ObfuscatedName("ax") public interface class3 { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;)Ltm;" + descriptor = "(Lul;)Lul;" ) @Export("vmethod12") Buffer vmethod12(Buffer var1); diff --git a/osrs/src/main/java/class30.java b/osrs/src/main/java/class30.java index e3a41120b..7a3c2fc05 100644 --- a/osrs/src/main/java/class30.java +++ b/osrs/src/main/java/class30.java @@ -3,105 +3,145 @@ import net.runelite.mapping.ObfuscatedSignature; import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.Desktop.Action; -import java.net.URI; -@ObfuscatedName("bt") +@ObfuscatedName("be") public class class30 { - @ObfuscatedName("al") - static int field82; - @ObfuscatedName("he") - static String field83; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("FloorOverlayDefinition_archive") + static AbstractArchive FloorOverlayDefinition_archive; static { ImageIO.setUseCache(false); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "-75" + descriptor = "(B)[Lnq;", + garbageValue = "-42" ) - static boolean method116(int var0, int var1, int var2) { - return var0 >= 0 && var0 < 4 && var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104; + static class360[] method121() { + return new class360[]{class360.field3179, class360.field3180}; } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZB)V", - garbageValue = "-94" + descriptor = "(Ltp;ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "42" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - if (var1) { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { - try { - Desktop.getDesktop().browse(new URI(var0)); - return; - } catch (Exception var4) { - } - } - - if (class31.field86.startsWith("win")) { - BoundaryObject.method1384(var0, 0); - } else if (class31.field86.startsWith("mac")) { - class299.method1618(var0, 1, "openjs"); - } else { - BoundaryObject.method1384(var0, 2); - } + static String method122(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { + return var2; } else { - BoundaryObject.method1384(var0, 3); + ObjectNode var3 = (ObjectNode)var0.get((long)var1); + return var3 == null ? var2 : (String)var3.obj; } + } + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)[Lsz;", + garbageValue = "-651272604" + ) + static class468[] method120() { + return new class468[]{class468.field3927, class468.field3925, class468.field3926, class468.field3924}; } - @ObfuscatedName("ap") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I)[Luk;", - garbageValue = "694687164" + descriptor = "(ILds;ZI)I", + garbageValue = "2111489575" ) - static IndexedSprite[] method118() { - IndexedSprite[] var0 = new IndexedSprite[class529.SpriteBuffer_spriteCount]; - - for (int var1 = 0; var1 < class529.SpriteBuffer_spriteCount; ++var1) { - IndexedSprite var2 = var0[var1] = new IndexedSprite(); - var2.width = class529.SpriteBuffer_spriteWidth; - var2.height = class420.SpriteBuffer_spriteHeight; - var2.xOffset = class529.SpriteBuffer_xOffsets[var1]; - var2.yOffset = class152.SpriteBuffer_yOffsets[var1]; - var2.subWidth = HealthBarUpdate.SpriteBuffer_spriteWidths[var1]; - var2.subHeight = SpriteMask.SpriteBuffer_spriteHeights[var1]; - var2.palette = DbTableType.SpriteBuffer_spritePalette; - var2.pixels = Coord.SpriteBuffer_pixels[var1]; + static int method123(int var0, Script var1, boolean var2) { + Widget var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var0 == 2500) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == 2501) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == 2502) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == 2503) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == 2504) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == 2505) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; } - - class529.SpriteBuffer_xOffsets = null; - class152.SpriteBuffer_yOffsets = null; - HealthBarUpdate.SpriteBuffer_spriteWidths = null; - SpriteMask.SpriteBuffer_spriteHeights = null; - DbTableType.SpriteBuffer_spritePalette = null; - Coord.SpriteBuffer_pixels = null; - return var0; } - @ObfuscatedName("jw") + @ObfuscatedName("ih") @ObfuscatedSignature( - descriptor = "(I)Low;", - garbageValue = "1819650636" + descriptor = "(B)V", + garbageValue = "106" ) - @Export("getScriptEvents") - public static NodeDeque getScriptEvents() { - return Client.scriptEvents; + static void method124() { + if (class434.worldMap != null) { + class434.worldMap.method2432(class87.Client_plane, (TextureProvider.localPlayer.x >> 7) + class20.baseX, (TextureProvider.localPlayer.y >> 7) + class19.baseY, false); + class434.worldMap.loadCache(); + } + } - @ObfuscatedName("mc") + @ObfuscatedName("ke") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "26" + descriptor = "(III)V", + garbageValue = "-1209602899" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[class87.Client_plane][var0][var1]; + if (var2 == null) { + class10.scene.removeGroundItemPile(class87.Client_plane, var0, var1); + } else { + long var3 = -99999999L; + TileItem var5 = null; + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + ItemComposition var7 = class214.ItemDefinition_get(var6.id); + long var8 = (long)var7.price; + if (var7.isStackable == 1) { + var8 *= var6.quantity < Integer.MAX_VALUE ? (long)(var6.quantity + 1) : (long)var6.quantity; + } + + if (var8 > var3) { + var3 = var8; + var5 = var6; + } + } + + if (var5 == null) { + class10.scene.removeGroundItemPile(class87.Client_plane, var0, var1); + } else { + var2.addLast(var5); + TileItem var12 = null; + TileItem var11 = null; + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + if (var5.id != var6.id) { + if (var12 == null) { + var12 = var6; + } + + if (var6.id != var12.id && var11 == null) { + var11 = var6; + } + } + } + + long var9 = GrandExchangeOfferAgeComparator.calculateTag(var0, var1, 3, false, 0); + class10.scene.newGroundItemPile(class87.Client_plane, var0, var1, class115.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class87.Client_plane), var5, var9, var12, var11); + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class300.java b/osrs/src/main/java/class300.java deleted file mode 100644 index 6b2ce381f..000000000 --- a/osrs/src/main/java/class300.java +++ /dev/null @@ -1,69 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.TimeZone; - - -@ObfuscatedName("lc") -public final class class300 { - @ObfuscatedName("ao") - static final HashMap field2753; - - static { - field2753 = new HashMap(); - TimeZone var0; - synchronized(field2753) { - TimeZone var2 = (TimeZone)field2753.get("Europe/London"); - if (var2 == null) { - var2 = TimeZone.getTimeZone("Europe/London"); - field2753.put("Europe/London", var2); - } - - var0 = var2; - } - - java.util.Calendar.getInstance(var0); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "57" - ) - public static void method1620(int var0) { - if (!class305.musicSongs.isEmpty()) { - Iterator var1 = class305.musicSongs.iterator(); - - while (var1.hasNext()) { - MusicSong var2 = (MusicSong)var1.next(); - if (var2 != null) { - var2.musicTrackVolume = var0; - } - } - - MusicSong var3 = (MusicSong)class305.musicSongs.get(0); - if (var3 != null && var3.midiPcmStream != null && var3.midiPcmStream.isReady() && !var3.field2862) { - var3.midiPcmStream.setPcmStreamVolume(var0); - var3.field2867 = (float)var0; - } - } - - } - - @ObfuscatedName("oz") - @ObfuscatedSignature( - descriptor = "(Lmi;B)Ljava/lang/String;", - garbageValue = "-51" - ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (HealthBarDefinition.Widget_unpackTargetMask(NewShit.getWidgetFlags(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class301.java b/osrs/src/main/java/class301.java deleted file mode 100644 index eb4132ae1..000000000 --- a/osrs/src/main/java/class301.java +++ /dev/null @@ -1,20 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lv") -public final class class301 { - @ObfuscatedName("au") - static long field2754; - - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "977929295" - ) - static final void method1622() { - if (AddRequestTask.pcmPlayer1 != null) { - AddRequestTask.pcmPlayer1.run(); - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class302.java b/osrs/src/main/java/class302.java deleted file mode 100644 index e8e034ffa..000000000 --- a/osrs/src/main/java/class302.java +++ /dev/null @@ -1,90 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lr") -public class class302 { - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(IIIB)D", - garbageValue = "-9" - ) - static double method1623(int var0, int var1, int var2) { - double var3 = var1 > 0 ? (double)Math.max(0.0F, Math.min(1.0F, (float)var0 / (float)var1)) : 1.0D; - if (var3 > 0.0D && var3 < 1.0D) { - double var5; - double var7; - switch(var2) { - case 0: - return var3; - case 1: - return 1.0D - Math.cos(3.141592653589793D * var3 / 2.0D); - case 2: - return Math.sin(var3 * 3.141592653589793D / 2.0D); - case 3: - return -(Math.cos(3.141592653589793D * var3) - 1.0D) / 2.0D; - case 4: - return var3 * var3; - case 5: - return 1.0D - (1.0D - var3) * (1.0D - var3); - case 6: - return var3 < 0.5D ? var3 * 2.0D * var3 : 1.0D - Math.pow(2.0D + var3 * -2.0D, 2.0D) / 2.0D; - case 7: - return var3 * var3 * var3; - case 8: - return 1.0D - Math.pow(1.0D - var3, 3.0D); - case 9: - return var3 < 0.5D ? var3 * 4.0D * var3 * var3 : 1.0D - Math.pow(2.0D + -2.0D * var3, 3.0D) / 2.0D; - case 10: - return var3 * var3 * var3 * var3; - case 11: - return 1.0D - Math.pow(1.0D - var3, 4.0D); - case 12: - return var3 < 0.5D ? var3 * var3 * var3 * var3 * 8.0D : 1.0D - Math.pow(2.0D + -2.0D * var3, 4.0D) / 2.0D; - case 13: - return var3 * var3 * var3 * var3 * var3; - case 14: - return 1.0D - Math.pow(1.0D - var3, 5.0D); - case 15: - return var3 < 0.5D ? var3 * var3 * 8.0D * var3 * var3 * var3 : 1.0D - Math.pow(var3 * -2.0D + 2.0D, 5.0D) / 2.0D; - case 16: - return Math.pow(2.0D, var3 * 10.0D - 10.0D); - case 17: - return 1.0D - Math.pow(2.0D, var3 * -10.0D); - case 18: - return var3 < 0.5D ? Math.pow(2.0D, 10.0D + 20.0D * var3) / 2.0D : (2.0D - Math.pow(2.0D, 10.0D + var3 * -20.0D)) / 2.0D; - case 19: - return 1.0D - Math.sqrt(1.0D - Math.pow(var3, 2.0D)); - case 20: - return Math.sqrt(1.0D - Math.pow(var3 - 1.0D, 2.0D)); - case 21: - return var3 < 0.5D ? (1.0D - Math.sqrt(1.0D - Math.pow(2.0D * var3, 2.0D))) / 2.0D : (Math.sqrt(1.0D - Math.pow(2.0D + -2.0D * var3, 2.0D)) + 1.0D) / 2.0D; - case 22: - var5 = 1.70158D; - var7 = 2.70158D; - return var3 * 2.70158D * var3 * var3 - var3 * 1.70158D * var3; - case 23: - var5 = 1.70158D; - var7 = 2.70158D; - return 1.0D + 2.70158D * Math.pow(var3 - 1.0D, 3.0D) + 1.70158D * Math.pow(var3 - 1.0D, 2.0D); - case 24: - var5 = 1.70158D; - var7 = 2.5949095D; - return var3 < 0.5D ? Math.pow(var3 * 2.0D, 2.0D) * (7.189819D * var3 - 2.5949095D) / 2.0D : (Math.pow(2.0D * var3 - 2.0D, 2.0D) * (3.5949095D * (2.0D * var3 - 2.0D) + 2.5949095D) + 2.0D) / 2.0D; - case 25: - var5 = 2.0943951023931953D; - return -Math.pow(2.0D, var3 * 10.0D - 10.0D) * Math.sin((var3 * 10.0D - 10.75D) * 2.0943951023931953D); - case 26: - var5 = 2.0943951023931953D; - return Math.pow(2.0D, -10.0D * var3) * Math.sin(2.0943951023931953D * (10.0D * var3 - 0.75D)) + 1.0D; - case 27: - var5 = 1.3962634015954636D; - var7 = Math.sin((20.0D * var3 - 11.125D) * 1.3962634015954636D); - return var3 < 0.5D ? -(Math.pow(2.0D, var3 * 20.0D - 10.0D) * var7) / 2.0D : Math.pow(2.0D, 10.0D + -20.0D * var3) * var7 / 2.0D + 1.0D; - default: - return var3; - } - } else { - return var3 <= 0.0D ? 0.0D : 1.0D; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class303.java b/osrs/src/main/java/class303.java deleted file mode 100644 index db003554a..000000000 --- a/osrs/src/main/java/class303.java +++ /dev/null @@ -1,30 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lt") -public class class303 { - @ObfuscatedName("au") - static int[] field2755; - - static { - new Object(); - field2755 = new int[33]; - field2755[0] = 0; - int var0 = 2; - - for (int var1 = 1; var1 < 33; ++var1) { - field2755[var1] = var0 - 1; - var0 += var0; - } - - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)[Laz;", - garbageValue = "-2002695578" - ) - public static class6[] method1624() { - return new class6[]{class6.field6}; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class304.java b/osrs/src/main/java/class304.java new file mode 100644 index 000000000..5fc351a1d --- /dev/null +++ b/osrs/src/main/java/class304.java @@ -0,0 +1,163 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lp") +public class class304 { + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Luy;II)Z", + garbageValue = "-1822480707" + ) + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { + if (var0.readBits(1) != 0) { + updateExternalPlayer(var0, var1); + } + + var3 = var0.readBits(13); + var4 = var0.readBits(13); + boolean var12 = var0.readBits(1) == 1; + if (var12) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { + throw new RuntimeException(); + } else { + Player var6 = Client.players[var1] = new Player(); + var6.index = var1; + if (Players.cachedAppearanceBuffer[var1] != null) { + var6.read(Players.cachedAppearanceBuffer[var1]); + } + + var6.orientation = Players.Players_orientations[var1]; + var6.targetIndex = Players.Players_targetIndices[var1]; + var7 = Players.Players_regions[var1]; + var8 = var7 >> 28; + var9 = var7 >> 14 & 255; + var10 = var7 & 255; + var6.pathTraversed[0] = Players.playerMovementSpeeds[var1]; + var6.plane = (byte)var8; + var6.resetPath((var9 << 13) + var3 - class20.baseX, (var10 << 13) + var4 - class19.baseY); + var6.hasMovementPending = false; + return true; + } + } else if (var2 == 1) { + var3 = var0.readBits(2); + var4 = Players.Players_regions[var1]; + Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); + return false; + } else { + int var5; + int var11; + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var11 = Players.Players_regions[var1]; + var7 = (var11 >> 28) + var4 & 3; + var8 = var11 >> 14 & 255; + var9 = var11 & 255; + if (var5 == 0) { + --var8; + --var9; + } + + if (var5 == 1) { + --var9; + } + + if (var5 == 2) { + ++var8; + --var9; + } + + if (var5 == 3) { + --var8; + } + + if (var5 == 4) { + ++var8; + } + + if (var5 == 5) { + --var8; + ++var9; + } + + if (var5 == 6) { + ++var9; + } + + if (var5 == 7) { + ++var8; + ++var9; + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + return false; + } else { + var3 = var0.readBits(18); + var4 = var3 >> 16; + var5 = var3 >> 8 & 255; + var11 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var11 + var7 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; + } + } + } + + @ObfuscatedName("hq") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "-1658366352" + ) + static long method1635() { + return Client.playerUUID; + } + + @ObfuscatedName("me") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "703311848" + ) + static void method1636() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (class33.field89.method1742(var1)) { + boolean var2 = true; + Widget[] var3 = class33.field89.Widget_interfaceComponents[var1]; + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { + if (var3[var4] != null) { + var2 = var3[var4].isIf3; + break; + } + } + + if (!var2) { + var4 = (int)var0.key; + Widget var5 = class33.field89.method1740(var4); + if (var5 != null) { + ClanChannelMember.invalidateWidget(var5); + } + } + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class305.java b/osrs/src/main/java/class305.java index 36b3ae260..fbcb1cc16 100644 --- a/osrs/src/main/java/class305.java +++ b/osrs/src/main/java/class305.java @@ -1,62 +1,169 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; +import java.io.*; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; -@ObfuscatedName("lz") +@ObfuscatedName("lt") public class class305 { - @ObfuscatedName("au") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lun;" ) - public static AbstractArchive field2777; - @ObfuscatedName("ae") + static IndexedSprite field2513; + @ObfuscatedName("mv") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Ljq;" ) - public static AbstractArchive field2775; - @ObfuscatedName("ao") + @Export("textureProvider") + static TextureProvider textureProvider; + + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "(Luy;B)V", + garbageValue = "52" ) - public static AbstractArchive field2776; - @ObfuscatedName("at") - @Export("midiPcmStream") - public static ArrayList midiPcmStream; - @ObfuscatedName("ac") - public static LinkedList field2774; - @ObfuscatedName("ai") - @Export("musicSongs") - public static ArrayList musicSongs; - @ObfuscatedName("az") - public static ArrayList field2773; - @ObfuscatedName("ap") - public static ArrayList field2771; - @ObfuscatedName("aa") - public static final List field2778; - @ObfuscatedName("af") - @Export("musicPlayerStatus") - public static int musicPlayerStatus; - @ObfuscatedName("ad") - public static int field2766; - @ObfuscatedName("aq") - public static int field2769; - @ObfuscatedName("al") - public static int field2768; - - static { - midiPcmStream = null; - field2774 = new LinkedList(); - musicSongs = new ArrayList(3); - field2773 = new ArrayList(3); - field2771 = new ArrayList(); - field2778 = new ArrayList(); - musicPlayerStatus = 0; - field2766 = 0; - field2769 = 0; - field2768 = 0; + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class36.reflectionChecks.last(); + if (var1 != null) { + int var2 = var0.offset; + var0.writeInt(var1.id); + + for (int var3 = 0; var3 < var1.size; ++var3) { + if (var1.creationErrors[var3] != 0) { + var0.writeByte(var1.creationErrors[var3]); + } else { + try { + int var4 = var1.operations[var3]; + Field var5; + int var6; + if (var4 == 0) { + var5 = var1.field156[var3]; + var6 = Reflection.getInt(var5, (Object)null); + var0.writeByte(0); + var0.writeInt(var6); + } else if (var4 == 1) { + var5 = var1.field156[var3]; + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); + var0.writeByte(0); + } else if (var4 == 2) { + var5 = var1.field156[var3]; + var6 = var5.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + + Method var25; + if (var4 != 3) { + if (var4 == 4) { + var25 = var1.methods[var3]; + var6 = var25.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + } else { + var25 = var1.methods[var3]; + byte[][] var10 = var1.arguments[var3]; + Object[] var7 = new Object[var10.length]; + + for (int var8 = 0; var8 < var10.length; ++var8) { + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); + var7[var8] = var9.readObject(); + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); + if (var11 == null) { + var0.writeByte(0); + } else if (var11 instanceof Number) { + var0.writeByte(1); + var0.writeLong(((Number)var11).longValue()); + } else if (var11 instanceof String) { + var0.writeByte(2); + var0.writeStringCp1252NullTerminated((String)var11); + } else { + var0.writeByte(4); + } + } + } catch (ClassNotFoundException var13) { + var0.writeByte(-10); + } catch (InvalidClassException var14) { + var0.writeByte(-11); + } catch (StreamCorruptedException var15) { + var0.writeByte(-12); + } catch (OptionalDataException var16) { + var0.writeByte(-13); + } catch (IllegalAccessException var17) { + var0.writeByte(-14); + } catch (IllegalArgumentException var18) { + var0.writeByte(-15); + } catch (InvocationTargetException var19) { + var0.writeByte(-16); + } catch (SecurityException var20) { + var0.writeByte(-17); + } catch (IOException var21) { + var0.writeByte(-18); + } catch (NullPointerException var22) { + var0.writeByte(-19); + } catch (Exception var23) { + var0.writeByte(-20); + } catch (Throwable var24) { + var0.writeByte(-21); + } + } + } + + var0.writeCrc(var2); + var1.remove(); + } + } + + @ObfuscatedName("ma") + @ObfuscatedSignature( + descriptor = "(Lnm;IIIIIII)V", + garbageValue = "-754549131" + ) + static final void method1638(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field381) { + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; + } + + Client.field381 = false; + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + ClanChannelMember.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + ClanChannelMember.invalidateWidget(var0); + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { + var7 = var3 * (var3 - 32) / var4; + if (var7 < 8) { + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + ClanChannelMember.invalidateWidget(var0); + Client.field381 = true; + } + } + + if (Client.mouseWheelRotation != 0) { + var7 = var0.width; + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + var0.scrollY += Client.mouseWheelRotation * 45; + ClanChannelMember.invalidateWidget(var0); + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class306.java b/osrs/src/main/java/class306.java new file mode 100644 index 000000000..a5491f5c6 --- /dev/null +++ b/osrs/src/main/java/class306.java @@ -0,0 +1,25 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("le") +public class class306 { + @ObfuscatedName("ah") + @Export("PcmPlayer_stereo") + public static boolean PcmPlayer_stereo; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)Llx;", + garbageValue = "28" + ) + static PacketBufferNode method1639() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class307.java b/osrs/src/main/java/class307.java new file mode 100644 index 000000000..9ff26ee97 --- /dev/null +++ b/osrs/src/main/java/class307.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lg") +public interface class307 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class309.java b/osrs/src/main/java/class309.java deleted file mode 100644 index 23f781673..000000000 --- a/osrs/src/main/java/class309.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("li") -public class class309 { - @ObfuscatedName("au") - int field2821; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lcf;" - ) - class53 field2820; - - @ObfuscatedSignature( - descriptor = "(ILcf;)V" - ) - class309(int var1, class53 var2) { - this.field2821 = var1; - this.field2820 = var2; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class31.java b/osrs/src/main/java/class31.java index 9f91c5b8e..569b155f7 100644 --- a/osrs/src/main/java/class31.java +++ b/osrs/src/main/java/class31.java @@ -4,53 +4,177 @@ import java.applet.Applet; -@ObfuscatedName("bd") +@ObfuscatedName("bv") public class class31 { - @ObfuscatedName("ug") - static int field84; - @ObfuscatedName("au") - static Applet field85; - @ObfuscatedName("ae") - static String field86; + @ObfuscatedName("ac") + static Applet field83; + @ObfuscatedName("al") + static String field84; + @ObfuscatedName("py") + static int field82; static { - field85 = null; - field86 = ""; + field83 = null; + field84 = ""; } - @ObfuscatedName("ar") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1834627338" + descriptor = "(IIIB)Lds;", + garbageValue = "0" ) - static final void method121(String var0) { - UserComparator8.method673(var0 + " is already on your ignore list"); + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = class132.method708(var1, var0); + Script var4 = MouseHandler.method175(var3, var0); + if (var4 != null) { + return var4; + } else { + var3 = class347.method1883(var2, var0); + var4 = MouseHandler.method175(var3, var0); + if (var4 != null) { + return var4; + } else { + var3 = class20.method70(var0); + var4 = MouseHandler.method175(var3, var0); + return var4 != null ? var4 : null; + } + } } - @ObfuscatedName("bj") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lbw;I)V", - garbageValue = "-1174367966" + descriptor = "(ILds;ZB)I", + garbageValue = "121" ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; - if (var0.sound != null) { - var0.sound.position = 0; + static int method127(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else { + var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; } - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); + String var4 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { + } + } + + var4 = var4.substring(0, var4.length() - 1); } - } + Object[] var9 = new Object[var4.length() + 1]; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(ILdh;ZS)I", - garbageValue = "385" - ) - static int method123(int var0, Script var1, boolean var2) { - return 2; + int var7; + for (var7 = var9.length - 1; var7 >= 1; --var7) { + if (var4.charAt(var7 - 1) == 's') { + var9[var7] = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + } else { + var9[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } + } + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var7 != -1) { + var9[0] = new Integer(var7); + } else { + var9 = null; + } + + if (var0 == 1400) { + var3.onClick = var9; + } else if (var0 == 1401) { + var3.onHold = var9; + } else if (var0 == 1402) { + var3.onRelease = var9; + } else if (var0 == 1403) { + var3.onMouseOver = var9; + } else if (var0 == 1404) { + var3.onMouseLeave = var9; + } else if (var0 == 1405) { + var3.onDrag = var9; + } else if (var0 == 1406) { + var3.onTargetLeave = var9; + } else if (var0 == 1407) { + var3.onVarTransmit = var9; + var3.varTransmitTriggers = var5; + } else if (var0 == 1408) { + var3.onTimer = var9; + } else if (var0 == 1409) { + var3.onOp = var9; + } else if (var0 == 1410) { + var3.onDragComplete = var9; + } else if (var0 == 1411) { + var3.onClickRepeat = var9; + } else if (var0 == 1412) { + var3.onMouseRepeat = var9; + } else if (var0 == 1414) { + var3.onInvTransmit = var9; + var3.invTransmitTriggers = var5; + } else if (var0 == 1415) { + var3.onStatTransmit = var9; + var3.statTransmitTriggers = var5; + } else if (var0 == 1416) { + var3.onTargetEnter = var9; + } else if (var0 == 1417) { + var3.onScroll = var9; + } else if (var0 == 1418) { + var3.onChatTransmit = var9; + } else if (var0 == 1419) { + var3.onKey = var9; + } else if (var0 == 1420) { + var3.onFriendTransmit = var9; + } else if (var0 == 1421) { + var3.onClanTransmit = var9; + } else if (var0 == 1422) { + var3.onMiscTransmit = var9; + } else if (var0 == 1423) { + var3.onDialogAbort = var9; + } else if (var0 == 1424) { + var3.onSubChange = var9; + } else if (var0 == 1425) { + var3.onStockTransmit = var9; + } else if (var0 == 1426) { + var3.field3118 = var9; + } else if (var0 == 1427) { + var3.onResize = var9; + } else if (var0 == 1428) { + var3.field3113 = var9; + } else if (var0 == 1429) { + var3.field3096 = var9; + } else if (var0 == 1430) { + var3.field3100 = var9; + } else if (var0 == 1431) { + var3.field3104 = var9; + } else if (var0 == 1434) { + var3.field3117 = var9; + } else if (var0 == 1435) { + var3.field3105 = var9; + } else { + if (var0 < 1436 || var0 > 1439) { + return 2; + } + + class342 var8 = var3.method1880(); + if (var8 != null) { + if (var0 == 1436) { + var8.field2933 = var9; + } else if (var0 == 1437) { + var8.field2932 = var9; + } else if (var0 == 1438) { + var8.field2934 = var9; + } else if (var0 == 1439) { + var8.field2935 = var9; + } + } + } + + var3.hasListener = true; + return 1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class311.java b/osrs/src/main/java/class311.java deleted file mode 100644 index caf466277..000000000 --- a/osrs/src/main/java/class311.java +++ /dev/null @@ -1,12 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lb") -public interface class311 { - @ObfuscatedName("iw") - @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-9429" - ) - void vmethod1644(int var1, int var2); -} \ No newline at end of file diff --git a/osrs/src/main/java/class312.java b/osrs/src/main/java/class312.java deleted file mode 100644 index a2a09304c..000000000 --- a/osrs/src/main/java/class312.java +++ /dev/null @@ -1,75 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Date; -import java.util.PriorityQueue; -import java.util.concurrent.Callable; -import java.util.concurrent.atomic.AtomicBoolean; - -@ObfuscatedName("md") -class class312 implements Callable { - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Llf;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final MidiPcmStream this$0; - // $FF: synthetic field - @Export("val$cancelled") - @ObfuscatedName("val$cancelled") - final AtomicBoolean val$cancelled; - - @ObfuscatedSignature( - descriptor = "(Llf;Ljava/util/concurrent/atomic/AtomicBoolean;)V" - ) - class312(MidiPcmStream var1, AtomicBoolean var2) { - this.this$0 = var1; - this.val$cancelled = var2; - } - - @Export("call") - @ObfuscatedName("call") - public Object call() { - PriorityQueue var1 = this.this$0.field2801; - - while (true) { - class309 var2 = null; - synchronized(var1) { - if (var1.isEmpty() || this.val$cancelled.get()) { - return null; - } - - var2 = (class309)var1.remove(); - } - - var2.field2820.method290(); - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/Date;", - garbageValue = "1739317164" - ) - static Date method1686() { - java.util.Calendar var0 = java.util.Calendar.getInstance(); - var0.set(2, 0); - var0.set(5, 1); - var0.set(1, 1900); - return var0.getTime(); - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-2037147642" - ) - static final int method1685(int var0, int var1) { - int var2 = Strings.method1878(var0 - 1, var1 - 1) + Strings.method1878(1 + var0, var1 - 1) + Strings.method1878(var0 - 1, var1 + 1) + Strings.method1878(1 + var0, var1 + 1); - int var3 = Strings.method1878(var0 - 1, var1) + Strings.method1878(1 + var0, var1) + Strings.method1878(var0, var1 - 1) + Strings.method1878(var0, var1 + 1); - int var4 = Strings.method1878(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class313.java b/osrs/src/main/java/class313.java new file mode 100644 index 000000000..90168e059 --- /dev/null +++ b/osrs/src/main/java/class313.java @@ -0,0 +1,23 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ma") +public class class313 { + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field2770; + + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1304134289" + ) + static final void method1648() { + if (class171.pcmPlayer1 != null) { + class171.pcmPlayer1.run(); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class314.java b/osrs/src/main/java/class314.java new file mode 100644 index 000000000..4107ac0ff --- /dev/null +++ b/osrs/src/main/java/class314.java @@ -0,0 +1,1047 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.TimeZone; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; + + +@ObfuscatedName("mj") +public final class class314 { + @ObfuscatedName("ak") + static final HashMap field2772; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lhu;" + ) + @Export("clock") + static Clock clock; + + static { + field2772 = new HashMap(); + java.util.Calendar.getInstance(getMethodName("Europe/London")); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/util/TimeZone;", + garbageValue = "-1775212150" + ) + @Export("getMethodName") + static TimeZone getMethodName(String var0) { + synchronized(field2772) { + TimeZone var2 = (TimeZone)field2772.get(var0); + if (var2 == null) { + var2 = TimeZone.getTimeZone(var0); + field2772.put(var0, var2); + } + + return var2; + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "27" + ) + public static boolean method1650(int var0) { + return var0 >= WorldMapDecorationType.field3171.id && var0 <= WorldMapDecorationType.field3166.id; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(B)Ljava/util/Date;", + garbageValue = "-13" + ) + static Date method1652() { + java.util.Calendar var0 = java.util.Calendar.getInstance(); + var0.set(2, 0); + var0.set(5, 1); + var0.set(1, 1900); + return var0.getTime(); + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(IIIIIILjt;Lih;I)V", + garbageValue = "-1043876293" + ) + @Export("addObjects") + static final void addObjects(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { + if (var0 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var0; + } + + ObjectComposition var8 = class91.getObjectDefinition(var3); + int var9; + int var10; + if (var4 != 1 && var4 != 3) { + var9 = var8.sizeX; + var10 = var8.sizeY; + } else { + var9 = var8.sizeY; + var10 = var8.sizeX; + } + + int var11; + int var12; + if (var9 + var1 <= 104) { + var11 = (var9 >> 1) + var1; + var12 = (var9 + 1 >> 1) + var1; + } else { + var11 = var1; + var12 = var1 + 1; + } + + int var13; + int var14; + if (var10 + var2 <= 104) { + var13 = (var10 >> 1) + var2; + var14 = var2 + (var10 + 1 >> 1); + } else { + var13 = var2; + var14 = var2 + 1; + } + + int[][] var15 = Tiles.Tiles_heights[var0]; + int var16 = var15[var12][var13] + var15[var11][var13] + var15[var11][var14] + var15[var12][var14] >> 2; + int var17 = (var1 << 7) + (var9 << 6); + int var18 = (var2 << 7) + (var10 << 6); + long var19 = GrandExchangeOfferAgeComparator.calculateTag(var1, var2, 2, var8.int1 == 0, var3); + int var21 = var5 + (var4 << 6); + if (var8.int3 == 1) { + var21 += 256; + } + + if (var8.hasSound()) { + LoginScreenAnimation.method529(var0, var1, var2, var8, var4); + } + + Object var22; + if (var5 == 22) { + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var22, var19, var21); + if (var8.interactType == 1 && var7 != null) { + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else { + int var31; + if (var5 != 10 && var5 != 11) { + int[] var10000; + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.method1287(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = UserComparator6.field1191[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field844[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + Tiles.field835[var0][var1][var2] = 50; + Tiles.field835[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = UserComparator6.field1191[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + Tiles.field835[var0][var1][var2 + 1] = 50; + Tiles.field835[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = UserComparator6.field1191[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + Tiles.field835[var0][var1 + 1][var2] = 50; + Tiles.field835[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = UserComparator6.field1191[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + Tiles.field835[var0][var1][var2] = 50; + Tiles.field835[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = UserComparator6.field1191[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1156(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method1293(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field843[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Tiles.field835[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Tiles.field835[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Tiles.field835[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Tiles.field835[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1156(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { + var28 = var4 + 1 & 3; + Object var23; + Object var24; + if (var8.animationId == -1 && var8.transforms == null) { + var23 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); + var24 = var8.getEntity(2, var28, var15, var17, var16, var18); + } else { + var23 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + var24 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var23, (Renderable)var24, Tiles.field844[var4], Tiles.field844[var28], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = UserComparator6.field1191[var0][var1]; + var10000[var2] |= 585; + var10000 = UserComparator6.field1191[var0][var1]; + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { + var10000 = UserComparator6.field1191[var0][var1]; + var10000[var2 + 1] |= 1170; + var10000 = UserComparator6.field1191[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = UserComparator6.field1191[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = UserComparator6.field1191[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = UserComparator6.field1191[var0][var1]; + var10000[var2] |= 1170; + var10000 = UserComparator6.field1191[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1156(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method1293(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field843[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Tiles.field835[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Tiles.field835[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Tiles.field835[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Tiles.field835[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1156(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.method1287(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method1293(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field844[var4], 0, 0, 0, var19, var21); + } else { + Object var25; + long var29; + if (var5 == 5) { + var28 = 16; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var29 != 0L) { + var28 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var29)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field844[var4], 0, var28 * Tiles.field847[var4], var28 * Tiles.field845[var4], var19, var21); + } else if (var5 == 6) { + var28 = 8; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var29 != 0L) { + var28 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var29)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field848[var4], var28 * Tiles.field846[var4], var19, var21); + } else if (var5 == 7) { + var31 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(4, var31 + 4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 4, var31 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, 256, var31, 0, 0, var19, var21); + } else if (var5 == 8) { + var28 = 8; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var29 != 0L) { + var28 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var29)).int2 / 2; + } + + int var27 = var4 + 2 & 3; + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field848[var4], var28 * Tiles.field846[var4], var19, var21); + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + if (var22 != null && var6.method1287(var0, var1, var2, var16, var9, var10, (Renderable)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var31 = 15; + if (var22 instanceof Model) { + var31 = ((Model)var22).method1363() / 4; + if (var31 > 30) { + var31 = 30; + } + } + + for (int var32 = 0; var32 <= var9; ++var32) { + for (int var33 = 0; var33 <= var10; ++var33) { + if (var31 > Tiles.field835[var0][var32 + var1][var33 + var2]) { + Tiles.field835[var0][var32 + var1][var33 + var2] = (byte)var31; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } + } + + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-176913511" + ) + static void method1653() { + int var0; + if (Client.field416 == class94.field929) { + class10.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); + + for (var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0] = new CollisionMap(104, 104); + } + + SpriteMask.sceneMinimapSprite = new SpritePixels(512, 512); + Login.Login_loadingText = "Starting game engine..."; + Login.Login_loadingPercent = 5; + Client.field416 = class94.field934; + } else if (class94.field934 == Client.field416) { + Login.Login_loadingText = "Prepared visibility map"; + Login.Login_loadingPercent = 10; + Client.field416 = class94.field933; + } else { + Archive var39; + if (class94.field933 == Client.field416) { + class92.field888 = class202.newArchive(0, false, true, true, false); + class199.field1567 = class202.newArchive(1, false, true, true, false); + SoundSystem.archive2 = class202.newArchive(2, true, false, true, false); + AbstractByteArrayCopier.field3136 = class202.newArchive(3, false, true, true, false); + class469.field3930 = class202.newArchive(4, false, true, true, false); + class198.archive9 = class202.newArchive(5, true, true, true, false); + CollisionMap.archive6 = class202.newArchive(6, true, true, true, false); + GrandExchangeOfferOwnWorldComparator.field361 = class202.newArchive(7, false, true, true, false); + class199.archive8 = class202.newArchive(8, false, true, true, false); + class241.field2052 = class202.newArchive(9, false, true, true, false); + class190.archive10 = class202.newArchive(10, false, true, true, false); + Language.field3643 = class202.newArchive(11, false, true, true, false); + SongTask.archive12 = class202.newArchive(12, false, true, true, false); + class27.archive13 = class202.newArchive(13, true, false, true, false); + ArchiveDiskAction.field3538 = class202.newArchive(14, false, true, true, false); + class317.field2776 = class202.newArchive(15, false, true, true, false); + WorldMapDecorationType.field3154 = class202.newArchive(17, true, true, true, false); + class358.field3177 = class202.newArchive(18, false, true, true, false); + AABB.field2123 = class202.newArchive(19, false, true, true, false); + HorizontalAlignment.field1584 = class202.newArchive(20, false, true, true, false); + class313.field2770 = class202.newArchive(21, false, true, true, false); + ArchiveDisk var36 = null; + if (JagexCache.JagexCache_dat2File != null) { + var36 = new ArchiveDisk(22, JagexCache.JagexCache_dat2File, UserComparator8.JagexCache_idxFiles[22], 1000000); + } + + var39 = new Archive(var36, UserComparator10.field1188, class59.field309, 22, false, true, true, true, true); + class319.field2799 = var39; + Login.Login_loadingText = "Connecting to update server"; + Login.Login_loadingPercent = 20; + Client.field416 = class94.field941; + } else if (class94.field941 == Client.field416) { + byte var33 = 0; + var0 = var33 + class92.field888.percentage() * 4 / 100; + var0 += class199.field1567.percentage() * 4 / 100; + var0 += SoundSystem.archive2.percentage() * 2 / 100; + var0 += AbstractByteArrayCopier.field3136.percentage() * 2 / 100; + var0 += class469.field3930.percentage() * 6 / 100; + var0 += class198.archive9.percentage() * 4 / 100; + var0 += CollisionMap.archive6.percentage() * 2 / 100; + var0 += GrandExchangeOfferOwnWorldComparator.field361.percentage() * 54 / 100; + var0 += class199.archive8.percentage() * 2 / 100; + var0 += class241.field2052.percentage() * 2 / 100; + var0 += class190.archive10.percentage() * 2 / 100; + var0 += Language.field3643.percentage() * 2 / 100; + var0 += SongTask.archive12.percentage() * 2 / 100; + var0 += class27.archive13.percentage() * 2 / 100; + var0 += ArchiveDiskAction.field3538.percentage() * 2 / 100; + var0 += class317.field2776.percentage() * 2 / 100; + var0 += AABB.field2123.percentage() / 100; + var0 += class358.field3177.percentage() / 100; + var0 += HorizontalAlignment.field1584.percentage() / 100; + var0 += class313.field2770.percentage() / 100; + var0 += class319.field2799.percentage() / 100; + var0 += WorldMapDecorationType.field3154.method1915() && WorldMapDecorationType.field3154.isFullyLoaded() ? 1 : 0; + if (var0 != 100) { + if (var0 != 0) { + Login.Login_loadingText = "Checking for updates - " + var0 + "%"; + } + + Login.Login_loadingPercent = 30; + } else { + MusicSong.method1732(class92.field888, "Animations"); + MusicSong.method1732(class199.field1567, "Skeletons"); + MusicSong.method1732(class469.field3930, "Sound FX"); + MusicSong.method1732(class198.archive9, "Maps"); + MusicSong.method1732(CollisionMap.archive6, "Music Tracks"); + MusicSong.method1732(GrandExchangeOfferOwnWorldComparator.field361, "Models"); + MusicSong.method1732(class199.archive8, "Sprites"); + MusicSong.method1732(Language.field3643, "Music Jingles"); + MusicSong.method1732(ArchiveDiskAction.field3538, "Music Samples"); + MusicSong.method1732(class317.field2776, "Music Patches"); + MusicSong.method1732(AABB.field2123, "World Map"); + MusicSong.method1732(class358.field3177, "World Map Geography"); + MusicSong.method1732(HorizontalAlignment.field1584, "World Map Ground"); + class241.field2053 = new GraphicsDefaults(); + class241.field2053.decode(WorldMapDecorationType.field3154); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.field416 = class94.field936; + } + } else { + int var5; + if (class94.field936 == Client.field416) { + class133.method720(22050, !Client.isLowDetail, 2); + ArrayList var41 = new ArrayList(3); + TaskHandler var28 = GameEngine.taskHandler; + short var29 = 2048; + if (var29 < 256) { + var29 = 256; + } + + PcmPlayer var34; + try { + PcmPlayer var25 = class16.pcmPlayerProvider.player(); + var25.samples = new int[(class306.PcmPlayer_stereo ? 2 : 1) * 256]; + var25.field195 = var29; + var25.init(); + var25.capacity = (var29 & -1024) + 1024; + if (var25.capacity > 16384) { + var25.capacity = 16384; + } + + var25.open(var25.capacity); + if (class225.field1884 > 0 && UserComparator4.soundSystem == null) { + UserComparator4.soundSystem = new SoundSystem(); + class353.soundSystemExecutor = Executors.newScheduledThreadPool(1); + class353.soundSystemExecutor.scheduleAtFixedRate(UserComparator4.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + } + + if (UserComparator4.soundSystem != null) { + if (UserComparator4.soundSystem.players[0] != null) { + throw new IllegalArgumentException(); + } + + UserComparator4.soundSystem.players[0] = var25; + } + + var34 = var25; + } catch (Throwable var22) { + var34 = new PcmPlayer(); + } + + class171.pcmPlayer1 = var34; + class140.pcmStreamMixer = new PcmStreamMixer(); + PcmStreamMixer var27 = new PcmStreamMixer(); + var27.addSubStream(class140.pcmStreamMixer); + + for (var5 = 0; var5 < 3; ++var5) { + MidiPcmStream var31 = new MidiPcmStream(); + var31.method1671(9, 128); + var27.addSubStream(var31); + var41.add(var31); + } + + class171.pcmPlayer1.setStream(var27); + class1.method2(class317.field2776, ArchiveDiskAction.field3538, class469.field3930, var41); + class136.decimator = new Decimator(22050, PcmPlayer.field179); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.field416 = class94.field931; + class353.field3142 = new Fonts(class199.archive8, class27.archive13); + } else { + int var14; + if (class94.field931 == Client.field416) { + FontName[] var40 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; + var14 = var40.length; + Fonts var26 = class353.field3142; + FontName[] var42 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; + Client.fontsMap = var26.createMap(var42); + if (Client.fontsMap.size() < var14) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var14 + "%"; + Login.Login_loadingPercent = 40; + } else { + class14.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + UserComparator6.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + SoundCache.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + Skeleton.field2060 = Client.field641.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.field416 = class94.field938; + } + } else { + Archive var2; + int var3; + if (Client.field416 == class94.field938) { + var0 = Archive.method1922(class190.archive10, class199.archive8); + var2 = class199.archive8; + var3 = Login.field769.length + Login.field767.length; + String[] var24 = Login.field768; + + for (var5 = 0; var5 < var24.length; ++var5) { + String var30 = var24[var5]; + if (var2.getGroupId(var30) != -1) { + ++var3; + } + } + + if (var0 < var3) { + Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var3 + "%"; + Login.Login_loadingPercent = 50; + } else { + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + DefaultsGroup.updateGameState(5); + Client.field416 = class94.field928; + } + } else if (class94.field928 == Client.field416) { + if (!SoundSystem.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + SoundSystem.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; + } else if (!class313.field2770.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + (80 + SongTask.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 60; + } else { + class191.method958(SoundSystem.archive2); + var39 = SoundSystem.archive2; + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var39; + class145.method763(SoundSystem.archive2, GrandExchangeOfferOwnWorldComparator.field361); + class517.method2530(SoundSystem.archive2, GrandExchangeOfferOwnWorldComparator.field361, Client.isLowDetail); + Archive var32 = SoundSystem.archive2; + var2 = GrandExchangeOfferOwnWorldComparator.field361; + NPCComposition.NpcDefinition_archive = var32; + NPCComposition.field1595 = var2; + class142.method753(SoundSystem.archive2); + Projectile.method436(SoundSystem.archive2, GrandExchangeOfferOwnWorldComparator.field361, Client.isMembersWorld, class14.fontPlain11); + class138.method732(SoundSystem.archive2, class92.field888, class199.field1567); + Archive var15 = SoundSystem.archive2; + Archive var4 = GrandExchangeOfferOwnWorldComparator.field361; + SpotAnimationDefinition.SpotAnimationDefinition_archive = var15; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var4; + Archive var43 = SoundSystem.archive2; + VarbitComposition.VarbitDefinition_archive = var43; + Archive var6 = SoundSystem.archive2; + VarpDefinition.VarpDefinition_archive = var6; + VarpDefinition.field1501 = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); + class33.field89 = new WidgetDefinition(AbstractByteArrayCopier.field3136, GrandExchangeOfferOwnWorldComparator.field361, class199.archive8, class27.archive13, class319.field2799); + Decimator.method313(SoundSystem.archive2); + class275.method1537(SoundSystem.archive2); + class135.method727(SoundSystem.archive2); + Message.method338(SoundSystem.archive2); + FloorOverlayDefinition.method1108(SoundSystem.archive2); + MilliClock.method935(SoundSystem.archive2); + Varcs.method625(SoundSystem.archive2); + HealthBarDefinition.Widget_cachedModels = new class512(UrlRequester.field1163, 54, WorldMapLabelSize.clientLanguage, SoundSystem.archive2); + class53.Widget_cachedFonts = new class512(UrlRequester.field1163, 47, WorldMapLabelSize.clientLanguage, SoundSystem.archive2); + class33.varcs = new Varcs(); + UserComparator9.method680(SoundSystem.archive2, class199.archive8, class27.archive13); + Archive var35 = SoundSystem.archive2; + Archive var8 = class199.archive8; + HealthBarDefinition.HealthBarDefinition_archive = var35; + HealthBarDefinition.field1549 = var8; + Archive var37 = SoundSystem.archive2; + Archive var10 = class199.archive8; + WorldMapElement.WorldMapElement_archive = var10; + if (var37.isFullyLoaded()) { + DevicePcmPlayerProvider.WorldMapElement_count = var37.getGroupFileCount(35); + WorldMapElement.WorldMapElement_cached = new WorldMapElement[DevicePcmPlayerProvider.WorldMapElement_count]; + + for (int var11 = 0; var11 < DevicePcmPlayerProvider.WorldMapElement_count; ++var11) { + byte[] var12 = var37.takeFile(35, var11); + WorldMapElement.WorldMapElement_cached[var11] = new WorldMapElement(var11); + if (var12 != null) { + WorldMapElement.WorldMapElement_cached[var11].decode(new Buffer(var12)); + WorldMapElement.WorldMapElement_cached[var11].method967(); + } + } + } + + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.field416 = class94.field935; + } + } else if (class94.field935 == Client.field416) { + var0 = 0; + if (JSException.compass == null) { + JSException.compass = class47.SpriteBuffer_getSprite(class199.archive8, class241.field2053.compass, 0); + } else { + ++var0; + } + + if (ParamComposition.redHintArrowSprite == null) { + ParamComposition.redHintArrowSprite = class47.SpriteBuffer_getSprite(class199.archive8, class241.field2053.field3881, 0); + } else { + ++var0; + } + + IndexedSprite[] var1; + if (KitDefinition.mapSceneSprites == null) { + var2 = class199.archive8; + var3 = class241.field2053.mapScenes; + if (!class164.method862(var2, var3, 0)) { + var1 = null; + } else { + var1 = class512.method2517(); + } + + KitDefinition.mapSceneSprites = var1; + } else { + ++var0; + } + + SpritePixels var7; + byte[] var9; + SpritePixels[] var16; + int var17; + int var18; + int var19; + SpritePixels[] var23; + if (UserComparator4.headIconPkSprites == null) { + var2 = class199.archive8; + var3 = class241.field2053.headIconsPk; + if (!class164.method862(var2, var3, 0)) { + var23 = null; + } else { + var16 = new SpritePixels[class544.SpriteBuffer_spriteCount]; + var17 = 0; + + while (true) { + if (var17 >= class544.SpriteBuffer_spriteCount) { + class407.method2062(); + var23 = var16; + break; + } + + var7 = var16[var17] = new SpritePixels(); + var7.width = class159.SpriteBuffer_spriteWidth; + var7.height = class500.SpriteBuffer_spriteHeight; + var7.xOffset = class326.SpriteBuffer_xOffsets[var17]; + var7.yOffset = ModelData0.SpriteBuffer_yOffsets[var17]; + var7.subWidth = class59.SpriteBuffer_spriteWidths[var17]; + var7.subHeight = class544.SpriteBuffer_spriteHeights[var17]; + var18 = var7.subWidth * var7.subHeight; + var9 = AddRequestTask.SpriteBuffer_pixels[var17]; + var7.pixels = new int[var18]; + + for (var19 = 0; var19 < var18; ++var19) { + var7.pixels[var19] = class372.SpriteBuffer_spritePalette[var9[var19] & 255]; + } + + ++var17; + } + } + + UserComparator4.headIconPkSprites = var23; + } else { + ++var0; + } + + if (class157.headIconPrayerSprites == null) { + var2 = class199.archive8; + var3 = class241.field2053.field3883; + if (!class164.method862(var2, var3, 0)) { + var23 = null; + } else { + var16 = new SpritePixels[class544.SpriteBuffer_spriteCount]; + var17 = 0; + + while (true) { + if (var17 >= class544.SpriteBuffer_spriteCount) { + class407.method2062(); + var23 = var16; + break; + } + + var7 = var16[var17] = new SpritePixels(); + var7.width = class159.SpriteBuffer_spriteWidth; + var7.height = class500.SpriteBuffer_spriteHeight; + var7.xOffset = class326.SpriteBuffer_xOffsets[var17]; + var7.yOffset = ModelData0.SpriteBuffer_yOffsets[var17]; + var7.subWidth = class59.SpriteBuffer_spriteWidths[var17]; + var7.subHeight = class544.SpriteBuffer_spriteHeights[var17]; + var18 = var7.subHeight * var7.subWidth; + var9 = AddRequestTask.SpriteBuffer_pixels[var17]; + var7.pixels = new int[var18]; + + for (var19 = 0; var19 < var18; ++var19) { + var7.pixels[var19] = class372.SpriteBuffer_spritePalette[var9[var19] & 255]; + } + + ++var17; + } + } + + class157.headIconPrayerSprites = var23; + } else { + ++var0; + } + + if (UserComparator8.headIconHintSprites == null) { + var2 = class199.archive8; + var3 = class241.field2053.field3879; + if (!class164.method862(var2, var3, 0)) { + var23 = null; + } else { + var16 = new SpritePixels[class544.SpriteBuffer_spriteCount]; + var17 = 0; + + while (true) { + if (var17 >= class544.SpriteBuffer_spriteCount) { + class407.method2062(); + var23 = var16; + break; + } + + var7 = var16[var17] = new SpritePixels(); + var7.width = class159.SpriteBuffer_spriteWidth; + var7.height = class500.SpriteBuffer_spriteHeight; + var7.xOffset = class326.SpriteBuffer_xOffsets[var17]; + var7.yOffset = ModelData0.SpriteBuffer_yOffsets[var17]; + var7.subWidth = class59.SpriteBuffer_spriteWidths[var17]; + var7.subHeight = class544.SpriteBuffer_spriteHeights[var17]; + var18 = var7.subHeight * var7.subWidth; + var9 = AddRequestTask.SpriteBuffer_pixels[var17]; + var7.pixels = new int[var18]; + + for (var19 = 0; var19 < var18; ++var19) { + var7.pixels[var19] = class372.SpriteBuffer_spritePalette[var9[var19] & 255]; + } + + ++var17; + } + } + + UserComparator8.headIconHintSprites = var23; + } else { + ++var0; + } + + if (class47.mapMarkerSprites == null) { + class47.mapMarkerSprites = ScriptEvent.method468(class199.archive8, class241.field2053.field3884, 0); + } else { + ++var0; + } + + if (EnumComposition.crossSprites == null) { + var2 = class199.archive8; + var3 = class241.field2053.field3876; + if (!class164.method862(var2, var3, 0)) { + var23 = null; + } else { + var16 = new SpritePixels[class544.SpriteBuffer_spriteCount]; + var17 = 0; + + while (true) { + if (var17 >= class544.SpriteBuffer_spriteCount) { + class407.method2062(); + var23 = var16; + break; + } + + var7 = var16[var17] = new SpritePixels(); + var7.width = class159.SpriteBuffer_spriteWidth; + var7.height = class500.SpriteBuffer_spriteHeight; + var7.xOffset = class326.SpriteBuffer_xOffsets[var17]; + var7.yOffset = ModelData0.SpriteBuffer_yOffsets[var17]; + var7.subWidth = class59.SpriteBuffer_spriteWidths[var17]; + var7.subHeight = class544.SpriteBuffer_spriteHeights[var17]; + var18 = var7.subWidth * var7.subHeight; + var9 = AddRequestTask.SpriteBuffer_pixels[var17]; + var7.pixels = new int[var18]; + + for (var19 = 0; var19 < var18; ++var19) { + var7.pixels[var19] = class372.SpriteBuffer_spritePalette[var9[var19] & 255]; + } + + ++var17; + } + } + + EnumComposition.crossSprites = var23; + } else { + ++var0; + } + + if (class103.mapDotSprites == null) { + class103.mapDotSprites = ScriptEvent.method468(class199.archive8, class241.field2053.field3882, 0); + } else { + ++var0; + } + + if (class36.scrollBarSprites == null) { + var2 = class199.archive8; + var3 = class241.field2053.field3885; + if (!class164.method862(var2, var3, 0)) { + var1 = null; + } else { + var1 = class512.method2517(); + } + + class36.scrollBarSprites = var1; + } else { + ++var0; + } + + if (class178.field1459 == null) { + var2 = class199.archive8; + var3 = class241.field2053.field3878; + if (!class164.method862(var2, var3, 0)) { + var1 = null; + } else { + var1 = class512.method2517(); + } + + class178.field1459 = var1; + } else { + ++var0; + } + + if (var0 < 11) { + Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; + } else { + AbstractFont.AbstractFont_modIconSprites = class178.field1459; + ParamComposition.redHintArrowSprite.normalize(); + var14 = (int)(Math.random() * 21.0D) - 10; + int var20 = (int)(Math.random() * 21.0D) - 10; + var3 = (int)(Math.random() * 21.0D) - 10; + int var21 = (int)(Math.random() * 41.0D) - 20; + KitDefinition.mapSceneSprites[0].shiftColors(var21 + var14, var20 + var21, var21 + var3); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.field416 = class94.field940; + } + } else if (class94.field940 == Client.field416) { + if (!class241.field2052.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; + } else { + class305.textureProvider = new TextureProvider(class241.field2052, class199.archive8, 20, class91.clientPreferences.getBrightness(), Client.isLowDetail ? 64 : 128); + Rasterizer3D.method1235(class305.textureProvider); + Rasterizer3D.method1236(class91.clientPreferences.getBrightness()); + Client.field416 = class94.field930; + } + } else if (class94.field930 == Client.field416) { + var0 = class305.textureProvider.getLoadedPercentage(); + if (var0 < 100) { + Login.Login_loadingText = "Loading textures - " + var0 + "%"; + Login.Login_loadingPercent = 90; + } else { + Login.Login_loadingText = "Loaded textures"; + Login.Login_loadingPercent = 90; + Client.field416 = class94.field927; + } + } else if (class94.field927 == Client.field416) { + class233.mouseRecorder = new MouseRecorder(); + GameEngine.taskHandler.newThreadTask(class233.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.field416 = class94.field937; + } else if (Client.field416 == class94.field937) { + if (!class190.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; + } else { + Huffman var38 = new Huffman(class190.archive10.takeFileByNames("huffman", "")); + class349.huffman = var38; + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.field416 = class94.field942; + } + } else if (class94.field942 == Client.field416) { + if (!AbstractByteArrayCopier.field3136.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + AbstractByteArrayCopier.field3136.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!class319.field2799.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + class319.field2799.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!SongTask.archive12.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + SongTask.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 96; + } else if (!class27.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + class27.archive13.loadPercent() / 50) + "%"; + Login.Login_loadingPercent = 96; + } else { + Login.Login_loadingText = "Loaded interfaces"; + Login.Login_loadingPercent = 98; + if (SongTask.archive12.isValidFileName("version.dat", "")) { + Buffer var13 = new Buffer(SongTask.archive12.takeFileByNames("version.dat", "")); + var13.readUnsignedShort(); + } + + Client.field416 = class94.field939; + } + } else if (class94.field939 == Client.field416) { + Login.Login_loadingPercent = 100; + if (AABB.field2123.getGroupCount() > 0 && !AABB.field2123.tryLoadGroupByName(WorldMapCacheName.field2482.name)) { + Login.Login_loadingText = "Loading world map - " + AABB.field2123.groupLoadPercentByName(WorldMapCacheName.field2482.name) / 10 + "%"; + } else { + if (class434.worldMap == null) { + class434.worldMap = new WorldMap(); + class434.worldMap.init(AABB.field2123, class358.field3177, HorizontalAlignment.field1584, SoundCache.fontBold12, Client.fontsMap, KitDefinition.mapSceneSprites); + } + + Login.Login_loadingText = "Loaded world map"; + Client.field416 = class94.field932; + } + } else { + if (class94.field932 == Client.field416) { + DefaultsGroup.updateGameState(10); + } + + } + } + } + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class315.java b/osrs/src/main/java/class315.java new file mode 100644 index 000000000..00b4c78e8 --- /dev/null +++ b/osrs/src/main/java/class315.java @@ -0,0 +1,35 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mm") +public final class class315 { + @ObfuscatedName("al") + static long field2773; + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(FFFFLfz;B)V", + garbageValue = "0" + ) + static void method1654(float var0, float var1, float var2, float var3, class132 var4) { + float var5 = var1 - var0; + float var6 = var2 - var1; + float var7 = var3 - var2; + float var8 = var6 - var5; + var4.field1240 = var7 - var6 - var8; + var4.field1242 = var8 + var8 + var8; + var4.field1249 = var5 + var5 + var5; + var4.field1244 = var0; + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1734109525" + ) + public static void method1655() { + ItemComposition.ItemDefinition_cached.clear(); + ItemComposition.HealthBarDefinition_cachedSprites.clear(); + ItemComposition.ItemDefinition_cachedSprites.clear(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class316.java b/osrs/src/main/java/class316.java index 92f6a2f82..699565aef 100644 --- a/osrs/src/main/java/class316.java +++ b/osrs/src/main/java/class316.java @@ -1,178 +1,44 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Comparator; - -@ObfuscatedName("mq") -public class class316 implements Comparator { - @ObfuscatedName("bh") - @Export("Widget_loadedInterfaces") - public static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("nh") - @Export("menuWidth") - static int menuWidth; - - class316() { - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lli;Lli;I)I", - garbageValue = "-629446065" - ) - int method1697(class309 var1, class309 var2) { - return var1.field2821 - var2.field2821; - } - - @Export("compare") - @ObfuscatedName("compare") - public int compare(Object var1, Object var2) { - return this.method1697((class309)var1, (class309)var2); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("kt") +@ObfuscatedName("mc") +public class class316 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "-20" + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "1726171577" ) - static final void method1698(int var0, int var1, boolean var2) { - if (!var2 || var0 != Tiles.timeOfPreviousKeyPress || MouseRecorder.field873 != var1) { - Tiles.timeOfPreviousKeyPress = var0; - MouseRecorder.field873 = var1; - MusicSong.updateGameState(25); - FadeInTask.drawLoadingMessage("Loading - please wait.", true); - int var3 = UrlRequester.baseX; - int var4 = class47.baseY; - UrlRequester.baseX = (var0 - 6) * 8; - class47.baseY = (var1 - 6) * 8; - int var5 = UrlRequester.baseX - var3; - int var6 = class47.baseY - var4; - var3 = UrlRequester.baseX; - var4 = class47.baseY; - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 65536; ++var7) { - NPC var8 = Client.npcs[var7]; - if (var8 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var8.pathX; - var10000[var9] -= var5; - var10000 = var8.pathY; - var10000[var9] -= var6; - } - - var8.x -= var5 * 128; - var8.y -= var6 * 128; - } - } - - for (var7 = 0; var7 < 2048; ++var7) { - Player var21 = Client.players[var7]; - if (var21 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var21.pathX; - var10000[var9] -= var5; - var10000 = var21.pathY; - var10000[var9] -= var6; - } - - var21.x -= var5 * 128; - var21.y -= var6 * 128; + public static String method1656(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { + return ""; + } else if (var2 == 1) { + CharSequence var3 = var0[var1]; + return var3 == null ? "null" : var3.toString(); + } else { + int var8 = var2 + var1; + int var4 = 0; + + for (int var5 = var1; var5 < var8; ++var5) { + CharSequence var6 = var0[var5]; + if (var6 == null) { + var4 += 4; + } else { + var4 += var6.length(); } } - byte var20 = 0; - byte var18 = 104; - byte var22 = 1; - if (var5 < 0) { - var20 = 103; - var18 = -1; - var22 = -1; - } - - byte var10 = 0; - byte var11 = 104; - byte var12 = 1; - if (var6 < 0) { - var10 = 103; - var11 = -1; - var12 = -1; - } - - int var14; - for (int var13 = var20; var13 != var18; var13 += var22) { - for (var14 = var10; var14 != var11; var14 += var12) { - int var15 = var5 + var13; - int var16 = var6 + var14; - - for (int var17 = 0; var17 < 4; ++var17) { - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; - } else { - Client.groundItems[var17][var13][var14] = null; - } - } - } - } + StringBuilder var9 = new StringBuilder(var4); - for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { - var19.x -= var5; - var19.y -= var6; - if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { - var19.remove(); + for (int var10 = var1; var10 < var8; ++var10) { + CharSequence var7 = var0[var10]; + if (var7 == null) { + var9.append("null"); + } else { + var9.append(var7); } } - if (Client.destinationX != 0) { - Client.destinationX -= var5; - Client.destinationY -= var6; - } - - Client.soundEffectCount = 0; - Client.isCameraLocked = false; - NPCComposition.cameraX -= var5 << 7; - class139.cameraZ -= var6 << 7; - FriendLoginUpdate.oculusOrbFocalPointX -= var5 << 7; - HealthBar.oculusOrbFocalPointY -= var6 << 7; - Client.field538 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } - - } - } - - @ObfuscatedName("ma") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2123908840" - ) - static final void method1699(int var0) { - if (ModeWhere.loadInterface(var0)) { - class152.drawModelComponents(PacketBufferNode.Widget_interfaceComponents[var0], -1); - } - } - - @ObfuscatedName("ol") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "5" - ) - static void method1700(int var0) { - if (var0 != Client.loginState) { - Client.loginState = var0; + return var9.toString(); } } } \ No newline at end of file diff --git a/osrs/src/main/java/class317.java b/osrs/src/main/java/class317.java new file mode 100644 index 000000000..4e2634f7e --- /dev/null +++ b/osrs/src/main/java/class317.java @@ -0,0 +1,36 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mw") +public class class317 { + @ObfuscatedName("wo") + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("ac") + static int[] field2775; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("fx") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field2776; + + static { + new Object(); + field2775 = new int[33]; + field2775[0] = 0; + int var0 = 2; + + for (int var1 = 1; var1 < 33; ++var1) { + field2775[var1] = var0 - 1; + var0 += var0; + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class318.java b/osrs/src/main/java/class318.java deleted file mode 100644 index 24c13500e..000000000 --- a/osrs/src/main/java/class318.java +++ /dev/null @@ -1,426 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.util.BitSet; -import java.util.Random; - -@ObfuscatedName("mk") -public class class318 extends Node { - @ObfuscatedName("fq") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("au") - int field2875; - @ObfuscatedName("ae") - BitSet field2876; - - class318(int var1) { - this.field2875 = var1; - this.field2876 = new BitSet(128); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;B)I", - garbageValue = "-14" - ) - static final int method1703(long var0, String var2) { - Random var3 = new Random(); - Buffer var4 = new Buffer(128); - Buffer var5 = new Buffer(128); - int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; - var4.writeByte(10); - - int var7; - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.writeInt(var6[0]); - var4.writeInt(var6[1]); - var4.writeLong(var0); - var4.writeLong(0L); - - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.encryptRsa(class72.field731, class72.field732); - var5.writeByte(10); - - for (var7 = 0; var7 < 3; ++var7) { - var5.writeInt(var3.nextInt()); - } - - var5.writeLong(var3.nextLong()); - var5.writeLongMedium(var3.nextLong()); - class177.method919(var5); - var5.writeLong(var3.nextLong()); - var5.encryptRsa(class72.field731, class72.field732); - var7 = AbstractSocket.stringCp1252NullTerminatedByteSize(var2); - if (var7 % 8 != 0) { - var7 += 8 - var7 % 8; - } - - Buffer var8 = new Buffer(var7); - var8.writeStringCp1252NullTerminated(var2); - var8.offset = var7; - var8.xteaEncryptAll(var6); - Buffer var9 = new Buffer(var8.offset + var5.offset + var4.offset + 5); - var9.writeByte(2); - var9.writeByte(var4.offset); - var9.writeBytes(var4.array, 0, var4.offset); - var9.writeByte(var5.offset); - var9.writeBytes(var5.array, 0, var5.offset); - var9.writeShort(var8.offset); - var9.writeBytes(var8.array, 0, var8.offset); - byte[] var11 = var9.array; - String var10 = class11.method32(var11, 0, var11.length); - String var12 = var10; - - try { - URL var13 = new URL(HorizontalAlignment.method978("services", false) + "m=accountappeal/login.ws"); - URLConnection var14 = var13.openConnection(); - var14.setDoInput(true); - var14.setDoOutput(true); - var14.setConnectTimeout(5000); - OutputStreamWriter var15 = new OutputStreamWriter(var14.getOutputStream()); - String var17 = "data2=" + UserComparator10.method687(var12) + "&dest="; - int var19 = "passwordchoice.ws".length(); - StringBuilder var20 = new StringBuilder(var19); - - for (int var21 = 0; var21 < var19; ++var21) { - char var22 = "passwordchoice.ws".charAt(var21); - if ((var22 < 'a' || var22 > 'z') && (var22 < 'A' || var22 > 'Z') && (var22 < '0' || var22 > '9') && var22 != '.' && var22 != '-' && var22 != '*' && var22 != '_') { - if (var22 == ' ') { - var20.append('+'); - } else { - byte var23 = class348.charToByteCp1252(var22); - var20.append('%'); - int var24 = var23 >> 4 & 15; - if (var24 >= 10) { - var20.append((char)(var24 + 55)); - } else { - var20.append((char)(var24 + 48)); - } - - var24 = var23 & 15; - if (var24 >= 10) { - var20.append((char)(var24 + 55)); - } else { - var20.append((char)(var24 + 48)); - } - } - } else { - var20.append(var22); - } - } - - String var18 = var20.toString(); - var15.write(var17 + var18); - var15.flush(); - InputStream var25 = var14.getInputStream(); - var9 = new Buffer(new byte[1000]); - - do { - int var26 = var25.read(var9.array, var9.offset, 1000 - var9.offset); - if (var26 == -1) { - var15.close(); - var25.close(); - String var28 = new String(var9.array); - if (var28.startsWith("OFFLINE")) { - return 4; - } else if (var28.startsWith("WRONG")) { - return 7; - } else if (var28.startsWith("RELOAD")) { - return 3; - } else if (var28.startsWith("Not permitted for social network accounts.")) { - return 6; - } else { - var9.xteaDecryptAll(var6); - - while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { - --var9.offset; - } - - var28 = new String(var9.array, 0, var9.offset); - if (PendingSpawn.method508(var28)) { - class30.openURL(var28, true, false); - return 2; - } else { - return 5; - } - } - } - - var9.offset += var26; - } while(var9.offset < 1000); - - return 5; - } catch (Throwable var27) { - var27.printStackTrace(); - return 5; - } - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1758045320" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; - } - - @ObfuscatedName("im") - @ObfuscatedSignature( - descriptor = "(Ldr;II)V", - garbageValue = "798219365" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - if (var0.spotAnimation >= Client.cycle) { - Huffman.method1853(var0); - } else { - int var4; - int var5; - int var7; - int var8; - int var11; - if (var0.exactMoveArrive1Cycle >= Client.cycle) { - boolean var2 = var0.exactMoveArrive1Cycle == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0; - if (!var2) { - SequenceDefinition var3 = EnumComposition.SequenceDefinition_get(var0.sequence); - if (var3 != null && !var3.isCachedModelIdSet()) { - var2 = var0.sequenceFrameCycle + 1 > var3.frameLengths[var0.sequenceFrame]; - } else { - var2 = true; - } - } - - if (var2) { - var11 = var0.exactMoveArrive1Cycle - var0.spotAnimation; - var4 = Client.cycle - var0.spotAnimation; - var5 = var0.field976 * 64 + var0.field1004 * 128; - int var6 = var0.field976 * 64 + var0.field1001 * 128; - var7 = var0.field976 * 64 + var0.field1002 * 128; - var8 = var0.field976 * 64 + var0.field1014 * 128; - var0.x = (var4 * var7 + var5 * (var11 - var4)) / var11; - var0.y = (var4 * var8 + var6 * (var11 - var4)) / var11; - } - - var0.field1021 = 0; - var0.orientation = var0.exactMoveDirection; - var0.rotation = var0.orientation; - } else { - var0.movementSequence = var0.idleSequence; - if (var0.pathLength == 0) { - var0.field1021 = 0; - } else { - label298: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - SequenceDefinition var12 = EnumComposition.SequenceDefinition_get(var0.sequence); - if (var0.field1022 > 0 && var12.precedenceAnimating == 0) { - ++var0.field1021; - break label298; - } - - if (var0.field1022 <= 0 && var12.priority == 0) { - ++var0.field1021; - break label298; - } - } - - int var14 = var0.x; - var11 = var0.y; - var4 = var0.field976 * 64 + var0.pathX[var0.pathLength - 1] * 128; - var5 = var0.field976 * 64 + var0.pathY[var0.pathLength - 1] * 128; - if (var14 < var4) { - if (var11 < var5) { - var0.orientation = 1280; - } else if (var11 > var5) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var14 > var4) { - if (var11 < var5) { - var0.orientation = 768; - } else if (var11 > var5) { - var0.orientation = 256; - } else { - var0.orientation = 512; - } - } else if (var11 < var5) { - var0.orientation = 1024; - } else if (var11 > var5) { - var0.orientation = 0; - } - - MoveSpeed var13 = var0.pathTraversed[var0.pathLength - 1]; - if (var4 - var14 <= 256 && var4 - var14 >= -256 && var5 - var11 <= 256 && var5 - var11 >= -256) { - var7 = var0.orientation - var0.rotation & 2047; - if (var7 > 1024) { - var7 -= 2048; - } - - var8 = var0.walkBackSequence; - if (var7 >= -256 && var7 <= 256) { - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; - int var9 = 4; - boolean var10 = true; - if (var0 instanceof NPC) { - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { - if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1017 != 0) { - var9 = 2; - } - - if (var0.pathLength > 2) { - var9 = 6; - } - - if (var0.pathLength > 3) { - var9 = 8; - } - - if (var0.field1021 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1021; - } - } else { - if (var0.pathLength > 1) { - var9 = 6; - } - - if (var0.pathLength > 2) { - var9 = 8; - } - - if (var0.field1021 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1021; - } - } - - if (var13 == MoveSpeed.RUN) { - var9 <<= 1; - } else if (var13 == MoveSpeed.CRAWL) { - var9 >>= 1; - } - - if (var9 >= 8) { - if (var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } else if (var0.walkBackSequence == var0.movementSequence && var0.runBackSequence != -1) { - var0.movementSequence = var0.runBackSequence; - } else if (var0.movementSequence == var0.walkLeftSequence && var0.runLeftSequence != -1) { - var0.movementSequence = var0.runLeftSequence; - } else if (var0.walkRightSequence == var0.movementSequence && var0.runRightSequence != -1) { - var0.movementSequence = var0.runRightSequence; - } - } else if (var9 <= 2) { - if (var0.movementSequence == var0.walkSequence && var0.crawlSequence != -1) { - var0.movementSequence = var0.crawlSequence; - } else if (var0.movementSequence == var0.walkBackSequence && var0.crawlBackSequence != -1) { - var0.movementSequence = var0.crawlBackSequence; - } else if (var0.walkLeftSequence == var0.movementSequence && var0.crawlLeftSequence != -1) { - var0.movementSequence = var0.crawlLeftSequence; - } else if (var0.walkRightSequence == var0.movementSequence && var0.crawlRightSequence != -1) { - var0.movementSequence = var0.crawlRightSequence; - } - } - - if (var4 != var14 || var5 != var11) { - if (var14 < var4) { - var0.x += var9; - if (var0.x > var4) { - var0.x = var4; - } - } else if (var14 > var4) { - var0.x -= var9; - if (var0.x < var4) { - var0.x = var4; - } - } - - if (var11 < var5) { - var0.y += var9; - if (var0.y > var5) { - var0.y = var5; - } - } else if (var11 > var5) { - var0.y -= var9; - if (var0.y < var5) { - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { - --var0.pathLength; - if (var0.field1022 > 0) { - --var0.field1022; - } - } - } else { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if (var0.field1022 > 0) { - --var0.field1022; - } - } - } - } - } - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = 0; - var0.exactMoveArrive1Cycle = 0; - var0.method519(); - var0.x = var0.pathX[0] * 128 + var0.field976 * 64; - var0.y = var0.field976 * 64 + var0.pathY[0] * 128; - var0.method512(); - } - - if (VarbitComposition.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = 0; - var0.exactMoveArrive1Cycle = 0; - var0.method519(); - var0.x = var0.pathX[0] * 128 + var0.field976 * 64; - var0.y = var0.field976 * 64 + var0.pathY[0] * 128; - var0.method512(); - } - - ClanChannelMember.method777(var0); - UserComparator5.method680(var0); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class319.java b/osrs/src/main/java/class319.java new file mode 100644 index 000000000..90d0274e4 --- /dev/null +++ b/osrs/src/main/java/class319.java @@ -0,0 +1,359 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.awt.*; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +@ObfuscatedName("mr") +public class class319 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + static AbstractArchive field2800; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + static AbstractArchive field2802; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + static AbstractArchive field2801; + @ObfuscatedName("ax") + @Export("midiPcmStream") + public static ArrayList midiPcmStream; + @ObfuscatedName("ao") + public static LinkedList field2791; + @ObfuscatedName("ah") + @Export("musicSongs") + public static ArrayList musicSongs; + @ObfuscatedName("ar") + public static ArrayList field2789; + @ObfuscatedName("ab") + static ArrayList field2798; + @ObfuscatedName("am") + public static final List field2792; + @ObfuscatedName("av") + @Export("musicPlayerStatus") + static int musicPlayerStatus; + @ObfuscatedName("ag") + static int field2794; + @ObfuscatedName("aa") + static int field2793; + @ObfuscatedName("ap") + static int field2795; + @ObfuscatedName("ba") + static Image field2797; + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field2799; + + static { + midiPcmStream = null; + field2791 = new LinkedList(); + musicSongs = new ArrayList(3); + field2789 = new ArrayList(3); + field2798 = new ArrayList(); + field2792 = new ArrayList(); + musicPlayerStatus = 0; + field2794 = 0; + field2793 = 0; + field2795 = 0; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(CLoa;B)C", + garbageValue = "84" + ) + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { + if (var0 >= 192 && var0 <= 198) { + return 'A'; + } + + if (var0 == 199) { + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { + return 'U'; + } + + if (var0 == 221) { + return 'Y'; + } + + if (var0 == 223) { + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { + return 'a'; + } + + if (var0 == 231) { + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { + return 'u'; + } + + if (var0 == 253 || var0 == 255) { + return 'y'; + } + } + + if (var0 == 338) { + return 'O'; + } else if (var0 == 339) { + return 'o'; + } else { + return var0 == 376 ? 'Y' : var0; + } + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "-1456273213" + ) + static int method1660(int var0, Script var1, boolean var2) { + if (var0 == 6500) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.loadWorlds() ? 1 : 0; + return 1; + } else { + World var3; + if (var0 == 6501) { + var3 = class53.worldListStart(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 6502) { + var3 = DevicePcmPlayerProvider.getNextWorldListWorld(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else { + World var4; + int var5; + int var7; + if (var0 == 6506) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = null; + + for (var5 = 0; var5 < World.World_count; ++var5) { + if (var7 == UserComparator3.World_worlds[var5].id) { + var4 = UserComparator3.World_worlds[var5]; + break; + } + } + + if (var4 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 6507) { + Interpreter.Interpreter_intStackSize -= 4; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; + class230.sortWorldList(var7, var10, var5, var6); + return 1; + } else if (var0 != 6511) { + if (var0 == 6512) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else { + int var8; + ParamComposition var9; + if (var0 == 6513) { + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var9 = class180.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class190.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class190.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6514) { + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var9 = class180.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class91.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class91.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6515) { + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var9 = class180.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class214.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6516) { + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var9 = class180.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class164.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class164.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6518) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == 6519) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType; + return 1; + } else if (var0 == 6520) { + return 1; + } else if (var0 == 6521) { + return 1; + } else if (var0 == 6522) { + --class180.Interpreter_stringStackSize; + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --class180.Interpreter_stringStackSize; + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 6524) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 6525) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == 6526) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == 6527) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field427; + return 1; + } else { + return 2; + } + } + } else { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var7 >= 0 && var7 < World.World_count) { + var4 = UserComparator3.World_worlds[var7]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class308.java b/osrs/src/main/java/class322.java similarity index 66% rename from osrs/src/main/java/class308.java rename to osrs/src/main/java/class322.java index 34d3de662..c58f1832a 100644 --- a/osrs/src/main/java/class308.java +++ b/osrs/src/main/java/class322.java @@ -4,25 +4,20 @@ import java.util.concurrent.ThreadFactory; -@ObfuscatedName("lh") -class class308 implements ThreadFactory { - @ObfuscatedName("wc") - @ObfuscatedSignature( - descriptor = "Lnf;" - ) - static JagNetThread field2819; +@ObfuscatedName("mz") +class class322 implements ThreadFactory { // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Lmt;" ) @Export("this$0") @ObfuscatedName("this$0") final MidiPcmStream this$0; @ObfuscatedSignature( - descriptor = "(Llf;)V" + descriptor = "(Lmt;)V" ) - class308(MidiPcmStream var1) { + class322(MidiPcmStream var1) { this.this$0 = var1; } diff --git a/osrs/src/main/java/class323.java b/osrs/src/main/java/class323.java index ae285170b..fb73d305a 100644 --- a/osrs/src/main/java/class323.java +++ b/osrs/src/main/java/class323.java @@ -1,14 +1,21 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mf") -public interface class323 { - @ObfuscatedName("au") +@ObfuscatedName("mu") +public class class323 { + @ObfuscatedName("ac") + int field2844; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "17" + descriptor = "Lcu;" ) - @Export("vmethod5708") - void vmethod5708(); + class53 field2843; + + @ObfuscatedSignature( + descriptor = "(ILcu;)V" + ) + class323(int var1, class53 var2) { + this.field2844 = var1; + this.field2843 = var2; + } } \ No newline at end of file diff --git a/osrs/src/main/java/class324.java b/osrs/src/main/java/class324.java deleted file mode 100644 index 119b698c1..000000000 --- a/osrs/src/main/java/class324.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ml") -public class class324 { - @ObfuscatedName("au") - public int field2892; - @ObfuscatedName("ae") - public int field2890; - @ObfuscatedName("ao") - public int field2891; - - class324() { - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class325.java b/osrs/src/main/java/class325.java index 7f320c1d9..f95a3a0c3 100644 --- a/osrs/src/main/java/class325.java +++ b/osrs/src/main/java/class325.java @@ -2,34 +2,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") -public class class325 { - @ObfuscatedName("ai") +@ObfuscatedName("mh") +public interface class325 { + @ObfuscatedName("ix") @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "27" + descriptor = "(III)V", + garbageValue = "328818380" ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - - for (int var5 = 0; var5 < var2; ++var5) { - int var6 = var0[var5 + var1] & 255; - if (var6 != 0) { - if (var6 >= 128 && var6 < 160) { - char var7 = class384.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; - } - - var6 = var7; - } - - var3[var4++] = (char)var6; - } - } - - return new String(var3, 0, var4); - } + @Export("vmethod1644") + void vmethod1644(int var1, int var2); } \ No newline at end of file diff --git a/osrs/src/main/java/class326.java b/osrs/src/main/java/class326.java index 626d06d5e..0dc74dd30 100644 --- a/osrs/src/main/java/class326.java +++ b/osrs/src/main/java/class326.java @@ -1,114 +1,52 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.net.MalformedURLException; -import java.net.URL; +import java.util.PriorityQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicBoolean; -@ObfuscatedName("mw") -public class class326 { - @ObfuscatedName("qq") - static int field2893; - @ObfuscatedName("au") +@ObfuscatedName("ml") +class class326 implements Callable { + @ObfuscatedName("ax") + @Export("SpriteBuffer_xOffsets") + public static int[] SpriteBuffer_xOffsets; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Let;" + descriptor = "Lmt;" ) - UrlRequest field2894; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lui;" - ) - SpritePixels field2895; - - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lev;)V" - ) - class326(String var1, UrlRequester var2) { - try { - this.field2894 = var2.request(new URL(var1)); - } catch (MalformedURLException var4) { - this.field2894 = null; - } - - } - - @ObfuscatedSignature( - descriptor = "(Let;)V" - ) - class326(UrlRequest var1) { - this.field2894 = var1; - } + @Export("this$0") + @ObfuscatedName("this$0") + final MidiPcmStream this$0; + // $FF: synthetic field + @Export("val$cancelled") + @ObfuscatedName("val$cancelled") + final AtomicBoolean val$cancelled; - @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lui;", - garbageValue = "-688482237" + descriptor = "(Lmt;Ljava/util/concurrent/atomic/AtomicBoolean;)V" ) - SpritePixels method1715() { - if (this.field2895 == null && this.field2894 != null && this.field2894.isDone()) { - if (this.field2894.getResponse() != null) { - this.field2895 = WorldMapData_1.method1484(this.field2894.getResponse()); - } - - this.field2894 = null; - } - - return this.field2895; + class326(MidiPcmStream var1, AtomicBoolean var2) { + this.this$0 = var1; + this.val$cancelled = var2; } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-856388391" - ) - public static void method1714(AbstractArchive var0) { - FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; - } + @Export("call") + @ObfuscatedName("call") + public Object call() { + PriorityQueue var1 = this.this$0.field2825; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-1268604308" - ) - static int method1716(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == 2700) { - var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == 2701) { - var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } + while (true) { + class323 var2 = null; + synchronized(var1) { + if (var1.isEmpty() || this.val$cancelled.get()) { + return null; + } - return 1; - } else if (var0 == 2702) { - int var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); - if (var4 != null) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + var2 = (class323)var1.remove(); } - return 1; - } else if (var0 == 2706) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; - } else if (var0 == 2707) { - var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3.method1834() ? 1 : 0; - return 1; - } else if (var0 == 2708) { - var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - return WorldMapDecoration.method1530(var3); - } else if (var0 == 2709) { - var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - return class390.method2030(var3); - } else { - return 2; + var2.field2843.method299(); } } } \ No newline at end of file diff --git a/osrs/src/main/java/class327.java b/osrs/src/main/java/class327.java deleted file mode 100644 index 8ea2814af..000000000 --- a/osrs/src/main/java/class327.java +++ /dev/null @@ -1,35 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mp") -public class class327 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lmb;" - ) - public class329 field2902; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lml;" - ) - class324 field2897; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lbj;" - ) - class27 field2896; - @ObfuscatedName("at") - public Object[] field2900; - @ObfuscatedName("ac") - public Object[] field2898; - @ObfuscatedName("ai") - public Object[] field2899; - @ObfuscatedName("az") - public Object[] field2901; - - class327() { - this.field2902 = new class329(); - this.field2897 = new class324(); - this.field2896 = new class27(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class329.java b/osrs/src/main/java/class329.java deleted file mode 100644 index 5761b2c64..000000000 --- a/osrs/src/main/java/class329.java +++ /dev/null @@ -1,1240 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.awt.datatransfer.*; - -@ObfuscatedName("mb") -public class class329 { - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lpj;" - ) - class394 field2938; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lpj;" - ) - class394 field2939; - @ObfuscatedName("ah") - boolean field2919; - @ObfuscatedName("as") - boolean field2921; - @ObfuscatedName("ay") - int field2925; - @ObfuscatedName("aj") - boolean field2920; - @ObfuscatedName("av") - int field2923; - @ObfuscatedName("aw") - int field2924; - @ObfuscatedName("ak") - int field2922; - @ObfuscatedName("bh") - int field2928; - @ObfuscatedName("bj") - int field2929; - @ObfuscatedName("bk") - int field2930; - @ObfuscatedName("bv") - int field2934; - @ObfuscatedName("bt") - int field2933; - @ObfuscatedName("bd") - int field2926; - @ObfuscatedName("by") - int field2935; - @ObfuscatedName("bs") - int field2932; - @ObfuscatedName("bm") - int field2931; - @ObfuscatedName("bf") - int field2927; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lmf;" - ) - class323 field2937; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lmf;" - ) - class323 field2936; - - class329() { - this.field2938 = new class394(); - this.field2939 = new class394(); - this.field2919 = false; - this.field2921 = true; - this.field2925 = 0; - this.field2920 = false; - this.field2923 = 0; - this.field2924 = 0; - this.field2922 = 0; - this.field2928 = 0; - this.field2929 = 0; - this.field2930 = 0; - this.field2934 = 0; - this.field2933 = Integer.MAX_VALUE; - this.field2926 = Integer.MAX_VALUE; - this.field2935 = 0; - this.field2932 = 0; - this.field2931 = 0; - this.field2927 = 0; - this.field2938.method2046(1); - this.field2939.method2046(1); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "108" - ) - void method1730() { - this.field2925 = (this.field2925 + 1) % 60; - if (this.field2934 > 0) { - --this.field2934; - } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "-1080189228" - ) - public boolean method1731(boolean var1) { - var1 = var1 && this.field2921; - boolean var2 = this.field2919 != var1; - this.field2919 = var1; - if (!this.field2919) { - this.method1755(this.field2928, this.field2928); - } - - return var2; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "220495780" - ) - public void method1732(boolean var1) { - this.field2921 = var1; - this.field2919 = var1 && this.field2919; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-764154033" - ) - boolean method1733(String var1) { - String var2 = this.field2938.method2041(); - if (!var2.equals(var1)) { - var1 = this.method1799(var1); - this.field2938.method2054(var1); - this.method1740(this.field2931, this.field2927); - this.method1803(); - this.method1808(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Z", - garbageValue = "0" - ) - boolean method1734(String var1) { - this.field2939.method2054(var1); - return true; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Lpk;B)Z", - garbageValue = "2" - ) - boolean method1735(AbstractFont var1) { - boolean var2 = !this.field2920; - this.field2938.method2045(var1); - this.field2939.method2045(var1); - this.field2920 = true; - var2 |= this.method1740(this.field2931, this.field2927); - var2 |= this.method1755(this.field2929, this.field2928); - if (this.method1803()) { - this.method1808(); - var2 = true; - } - - return var2; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-41" - ) - public boolean method1736(int var1, int var2) { - boolean var3 = this.field2935 != var1 || var2 != this.field2932; - this.field2935 = var1; - this.field2932 = var2; - var3 |= this.method1740(this.field2931, this.field2927); - return var3; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1183077231" - ) - public boolean method1737(int var1) { - if (var1 < 0) { - var1 = Integer.MAX_VALUE; - } - - boolean var2 = var1 == this.field2938.method2065(); - this.field2938.method2042(var1); - this.field2939.method2042(var1); - if (this.method1803()) { - this.method1808(); - var2 = true; - } - - return var2; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-790356702" - ) - public boolean method1738(int var1) { - this.field2938.method2043(var1); - if (this.method1803()) { - this.method1808(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-34" - ) - public boolean method1739(int var1) { - this.field2926 = var1; - if (this.method1803()) { - this.method1808(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1916065285" - ) - public boolean method1740(int var1, int var2) { - if (!this.method1787()) { - this.field2931 = var1; - this.field2927 = var2; - return false; - } else { - int var3 = this.field2931; - int var4 = this.field2927; - int var5 = Math.max(0, this.field2938.method2060() - this.field2935 + 2); - int var6 = Math.max(0, this.field2938.method2061() - this.field2932 + 1); - this.field2931 = Math.max(0, Math.min(var5, var1)); - this.field2927 = Math.max(0, Math.min(var6, var2)); - return var3 != this.field2931 || var4 != this.field2927; - } - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(IIS)Z", - garbageValue = "-28947" - ) - public boolean method1741(int var1, int var2) { - boolean var3 = true; - if (var1 < 0 || var1 > 2) { - var3 = false; - } - - if (var2 < 0 || var2 > 2) { - var3 = false; - } - - return var3 ? this.field2938.method2047(var1, var2) : false; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "105" - ) - public void method1742(int var1) { - this.field2938.method2048(var1); - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "318624055" - ) - public void method1743(int var1) { - this.field2923 = var1; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-745884306" - ) - public void method1744(int var1) { - this.field2938.method2046(var1); - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "73" - ) - public void method1745(int var1) { - this.field2938.method2044(var1); - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1266422233" - ) - public boolean method1746(int var1) { - this.field2922 = var1; - String var2 = this.field2938.method2041(); - int var3 = var2.length(); - var2 = this.method1799(var2); - if (var2.length() != var3) { - this.field2938.method2054(var2); - this.method1740(this.field2931, this.field2927); - this.method1803(); - this.method1808(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-313169923" - ) - public void method1747() { - this.field2920 = false; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-88" - ) - public boolean method1748(int var1) { - if (this.method1809(var1)) { - this.method1753(); - class395 var2 = this.field2938.method2050((char)var1, this.field2928, this.field2933); - this.method1755(var2.method2078(), var2.method2078()); - this.method1803(); - this.method1808(); - } - - return true; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1833500314" - ) - public void method1749() { - if (!this.method1753() && this.field2928 > 0) { - int var1 = this.field2938.method2056(this.field2928 - 1); - this.method1808(); - this.method1755(var1, var1); - } - - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "54" - ) - public void method1750() { - if (!this.method1753() && this.field2928 < this.field2938.method2040()) { - int var1 = this.field2938.method2056(this.field2928); - this.method1808(); - this.method1755(var1, var1); - } - - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-66" - ) - public void method1751() { - if (!this.method1753() && this.field2928 > 0) { - class485 var1 = this.method1801(this.field2928 - 1); - int var2 = this.field2938.method2057((Integer)var1.field4049, this.field2928); - this.method1808(); - this.method1755(var2, var2); - } - - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-43" - ) - public void method1752() { - if (!this.method1753() && this.field2928 < this.field2938.method2040()) { - class485 var1 = this.method1801(this.field2928); - int var2 = this.field2938.method2057(this.field2928, (Integer)var1.field4048); - this.method1808(); - this.method1755(var2, var2); - } - - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1216764682" - ) - boolean method1753() { - if (!this.method1798()) { - return false; - } else { - int var1 = this.field2938.method2057(this.field2929, this.field2928); - this.method1808(); - this.method1755(var1, var1); - return true; - } - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-70" - ) - public void method1754() { - this.method1755(0, this.field2938.method2040()); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "28215574" - ) - public boolean method1755(int var1, int var2) { - if (!this.method1787()) { - this.field2929 = var1; - this.field2928 = var2; - return false; - } else { - if (var1 > this.field2938.method2040()) { - var1 = this.field2938.method2040(); - } - - if (var2 > this.field2938.method2040()) { - var2 = this.field2938.method2040(); - } - - boolean var3 = this.field2929 != var1 || var2 != this.field2928; - this.field2929 = var1; - if (var2 != this.field2928) { - this.field2928 = var2; - this.field2925 = 0; - this.method1806(); - } - - if (var3 && this.field2936 != null) { - this.field2936.vmethod5708(); - } - - return var3; - } - } - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "67" - ) - public void method1756(boolean var1) { - class485 var2 = this.method1802(this.field2928); - this.method1804((Integer)var2.field4049, var1); - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-86" - ) - public void method1757(boolean var1) { - class485 var2 = this.method1802(this.field2928); - this.method1804((Integer)var2.field4048, var1); - } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "103" - ) - public void method1758(boolean var1) { - this.method1804(0, var1); - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1079000340" - ) - public void method1759(boolean var1) { - this.method1804(this.field2938.method2040(), var1); - } - - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1431814125" - ) - public void method1760(boolean var1) { - if (this.method1798() && !var1) { - this.method1804(Math.min(this.field2929, this.field2928), var1); - } else if (this.field2928 > 0) { - this.method1804(this.field2928 - 1, var1); - } - - } - - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1263469110" - ) - public void method1761(boolean var1) { - if (this.method1798() && !var1) { - this.method1804(Math.max(this.field2929, this.field2928), var1); - } else if (this.field2928 < this.field2938.method2040()) { - this.method1804(this.field2928 + 1, var1); - } - - } - - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "-12006" - ) - public void method1762(boolean var1) { - if (this.field2928 > 0) { - class485 var2 = this.method1801(this.field2928 - 1); - this.method1804((Integer)var2.field4049, var1); - } - - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1452508344" - ) - public void method1763(boolean var1) { - if (this.field2928 < this.field2938.method2040()) { - class485 var2 = this.method1801(this.field2928 + 1); - this.method1804((Integer)var2.field4048, var1); - } - - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1855815967" - ) - public void method1764(boolean var1) { - if (this.field2928 > 0) { - this.method1804(this.field2938.method2059(this.field2928, -1), var1); - } - - } - - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1322004372" - ) - public void method1765(boolean var1) { - if (this.field2928 < this.field2938.method2040()) { - this.method1804(this.field2938.method2059(this.field2928, 1), var1); - } - - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "6" - ) - public void method1766(boolean var1) { - if (this.field2928 > 0) { - int var2 = this.method1805(); - this.method1804(this.field2938.method2059(this.field2928, -var2), var1); - } - - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-203552347" - ) - public void method1767(boolean var1) { - if (this.field2928 < this.field2938.method2040()) { - int var2 = this.method1805(); - this.method1804(this.field2938.method2059(this.field2928, var2), var1); - } - - } - - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "2595" - ) - public void method1768(boolean var1) { - class398 var2 = this.field2938.method2049(0, this.field2928); - class485 var3 = var2.method2119(); - this.method1804(this.field2938.method2058((Integer)var3.field4049, this.field2927), var1); - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1036465571" - ) - public void method1769(boolean var1) { - class398 var2 = this.field2938.method2049(0, this.field2928); - class485 var3 = var2.method2119(); - this.method1804(this.field2938.method2058((Integer)var3.field4049, this.field2932 + this.field2927), var1); - } - - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "(IIZZI)V", - garbageValue = "-1002335608" - ) - public void method1770(int var1, int var2, boolean var3, boolean var4) { - boolean var5 = false; - class485 var6; - int var8; - if (!this.field2920) { - var8 = 0; - } else { - var1 += this.field2931; - var2 += this.field2927; - var6 = this.method1810(); - var8 = this.field2938.method2058(var1 - (Integer)var6.field4049, var2 - (Integer)var6.field4048); - } - - if (var3 && var4) { - this.field2924 = 1; - var6 = this.method1801(var8); - class485 var7 = this.method1801(this.field2930); - this.method1800(var7, var6); - } else if (var3) { - this.field2924 = 1; - var6 = this.method1801(var8); - this.method1755((Integer)var6.field4049, (Integer)var6.field4048); - this.field2930 = (Integer)var6.field4049; - } else if (var4) { - this.method1755(this.field2930, var8); - } else { - if (this.field2934 > 0 && var8 == this.field2930) { - if (this.field2928 == this.field2929) { - this.field2924 = 1; - var6 = this.method1801(var8); - this.method1755((Integer)var6.field4049, (Integer)var6.field4048); - } else { - this.field2924 = 2; - var6 = this.method1802(var8); - this.method1755((Integer)var6.field4049, (Integer)var6.field4048); - } - } else { - this.field2924 = 0; - this.method1755(var8, var8); - this.field2930 = var8; - } - - this.field2934 = 25; - } - - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-30" - ) - public void method1771(int var1, int var2) { - if (this.field2920 && this.method1782()) { - var1 += this.field2931; - var2 += this.field2927; - class485 var3 = this.method1810(); - int var4 = this.field2938.method2058(var1 - (Integer)var3.field4049, var2 - (Integer)var3.field4048); - class485 var5; - class485 var6; - switch(this.field2924) { - case 0: - this.method1755(this.field2929, var4); - break; - case 1: - var5 = this.method1801(this.field2930); - var6 = this.method1801(var4); - this.method1800(var5, var6); - break; - case 2: - var5 = this.method1802(this.field2930); - var6 = this.method1802(var4); - this.method1800(var5, var6); - } - } - - } - - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", - garbageValue = "-1723140286" - ) - public void method1772(Clipboard var1) { - class398 var2 = this.field2938.method2049(this.field2929, this.field2928); - if (!var2.method2115()) { - String var3 = var2.method2113(); - if (!var3.isEmpty()) { - var1.setContents(new StringSelection(var3), (ClipboardOwner)null); - } - } - - } - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", - garbageValue = "2111715206" - ) - public void method1773(Clipboard var1) { - if (this.method1798()) { - this.method1772(var1); - this.method1753(); - } - - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", - garbageValue = "-992379728" - ) - public void method1774(Clipboard var1) { - Transferable var2 = var1.getContents((Object)null); - if (var2 != null && var2.isDataFlavorSupported(DataFlavor.stringFlavor)) { - try { - String var3 = this.method1799((String)var2.getTransferData(DataFlavor.stringFlavor)); - this.method1753(); - class395 var4 = this.field2938.method2051(var3, this.field2928, this.field2933); - this.method1755(var4.method2078(), var4.method2078()); - this.method1803(); - this.method1808(); - } catch (Exception var5) { - } - } - - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "127" - ) - public void method1775() { - this.field2927 = Math.max(0, this.field2927 - this.field2938.method2062()); - } - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-12" - ) - public void method1776() { - int var1 = Math.max(0, this.field2938.method2061() - this.field2932); - this.field2927 = Math.min(var1, this.field2927 + this.field2938.method2062()); - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(Lmf;I)V", - garbageValue = "1877137858" - ) - public void method1777(class323 var1) { - this.field2937 = var1; - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(Lmf;I)V", - garbageValue = "1739536664" - ) - public void method1778(class323 var1) { - this.field2936 = var1; - } - - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "(I)Lpj;", - garbageValue = "-2121359079" - ) - public class394 method1779() { - return this.field2938; - } - - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(I)Lpj;", - garbageValue = "1026932642" - ) - public class394 method1780() { - return this.field2939; - } - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(I)Lpl;", - garbageValue = "-927140025" - ) - public class398 method1781() { - return this.field2938.method2049(this.field2929, this.field2928); - } - - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "10263708" - ) - public boolean method1782() { - return this.field2919; - } - - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2120535737" - ) - public boolean method1783() { - return this.field2921; - } - - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "111" - ) - public boolean method1784() { - return this.method1782() && this.field2925 % 60 < 30; - } - - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "2" - ) - public int method1785() { - return this.field2928; - } - - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "9" - ) - public int method1786() { - return this.field2929; - } - - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "73" - ) - public boolean method1787() { - return this.field2920; - } - - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1004374049" - ) - public int method1788() { - return this.field2931; - } - - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-737818988" - ) - public int method1789() { - return this.field2927; - } - - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "770052367" - ) - public int method1790() { - return this.field2938.method2065(); - } - - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-339785891" - ) - public int method1791() { - return this.field2938.method2066(); - } - - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-105" - ) - public int method1792() { - return this.field2926; - } - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "10872" - ) - public int method1793() { - return this.field2923; - } - - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-333954295" - ) - public int method1794() { - return this.field2938.method2067(); - } - - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - public int method1795() { - return this.field2922; - } - - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2053175833" - ) - public int method1796() { - return this.field2938.method2068(); - } - - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-20" - ) - public boolean method1797() { - return this.method1791() > 1; - } - - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-350056548" - ) - boolean method1798() { - return this.field2928 != this.field2929; - } - - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "83" - ) - String method1799(String var1) { - StringBuilder var2 = new StringBuilder(var1.length()); - - for (int var3 = 0; var3 < var1.length(); ++var3) { - char var4 = var1.charAt(var3); - if (this.method1809(var4)) { - var2.append(var4); - } - } - - return var2.toString(); - } - - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "(Lss;Lss;B)V", - garbageValue = "5" - ) - void method1800(class485 var1, class485 var2) { - if ((Integer)var2.field4049 < (Integer)var1.field4049) { - this.method1755((Integer)var1.field4048, (Integer)var2.field4049); - } else { - this.method1755((Integer)var1.field4049, (Integer)var2.field4048); - } - - } - - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "(IB)Lss;", - garbageValue = "-107" - ) - class485 method1801(int var1) { - int var2 = this.field2938.method2040(); - int var3 = 0; - int var4 = var2; - - int var5; - for (var5 = var1; var5 > 0; --var5) { - if (this.method1807(this.field2938.method2036(var5 - 1).field3680)) { - var3 = var5; - break; - } - } - - for (var5 = var1; var5 < var2; ++var5) { - if (this.method1807(this.field2938.method2036(var5).field3680)) { - var4 = var5; - break; - } - } - - return new class485(var3, var4); - } - - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "(II)Lss;", - garbageValue = "-982019338" - ) - class485 method1802(int var1) { - int var2 = this.field2938.method2040(); - int var3 = 0; - int var4 = var2; - - int var5; - for (var5 = var1; var5 > 0; --var5) { - if (this.field2938.method2036(var5 - 1).field3680 == '\n') { - var3 = var5; - break; - } - } - - for (var5 = var1; var5 < var2; ++var5) { - if (this.field2938.method2036(var5).field3680 == '\n') { - var4 = var5; - break; - } - } - - return new class485(var3, var4); - } - - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2078239234" - ) - boolean method1803() { - if (!this.method1787()) { - return false; - } else { - boolean var1 = false; - if (this.field2938.method2040() > this.field2926) { - this.field2938.method2057(this.field2926, this.field2938.method2040()); - var1 = true; - } - - int var2 = this.method1791(); - int var3; - if (this.field2938.method2063() > var2) { - var3 = this.field2938.method2059(0, var2) - 1; - this.field2938.method2057(var3, this.field2938.method2040()); - var1 = true; - } - - if (var1) { - var3 = this.field2928; - int var4 = this.field2929; - int var5 = this.field2938.method2040(); - if (this.field2928 > var5) { - var3 = var5; - } - - if (this.field2929 > var5) { - var4 = var5; - } - - this.method1755(var4, var3); - } - - return var1; - } - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "1750876747" - ) - void method1804(int var1, boolean var2) { - if (var2) { - this.method1755(this.field2929, var1); - } else { - this.method1755(var1, var1); - } - - } - - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "6" - ) - int method1805() { - return this.field2932 / this.field2938.method2062(); - } - - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-676768049" - ) - void method1806() { - class398 var1 = this.field2938.method2049(0, this.field2928); - class485 var2 = var1.method2119(); - int var3 = this.field2938.method2062(); - int var4 = (Integer)var2.field4049 - 10; - int var5 = var4 + 20; - int var6 = (Integer)var2.field4048 - 3; - int var7 = var6 + var3 + 6; - int var8 = this.field2931; - int var9 = var8 + this.field2935; - int var10 = this.field2927; - int var11 = var10 + this.field2932; - int var12 = this.field2931; - int var13 = this.field2927; - if (var4 < var8) { - var12 = var4; - } else if (var5 > var9) { - var12 = var5 - this.field2935; - } - - if (var6 < var10) { - var13 = var6; - } else if (var7 > var11) { - var13 = var7 - this.field2932; - } - - this.method1740(var12, var13); - } - - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-369704395" - ) - boolean method1807(int var1) { - return var1 == 32 || var1 == 10 || var1 == 9; - } - - @ObfuscatedName("dh") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2067288907" - ) - void method1808() { - if (this.field2937 != null) { - this.field2937.vmethod5708(); - } - - } - - @ObfuscatedName("dj") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-268502133" - ) - boolean method1809(int var1) { - switch(this.field2922) { - case 1: - return WorldMapLabel.isAlphaNumeric((char)var1); - case 2: - return class200.isCharAlphabetic((char)var1); - case 3: - return class330.isDigit((char)var1); - case 4: - char var2 = (char)var1; - if (class330.isDigit(var2)) { - return true; - } else { - if (var2 != 'k' && var2 != 'K' && var2 != 'm' && var2 != 'M' && var2 != 'b' && var2 != 'B') { - return false; - } - - return true; - } - default: - return true; - } - } - - @ObfuscatedName("di") - @ObfuscatedSignature( - descriptor = "(I)Lss;", - garbageValue = "-1390264109" - ) - class485 method1810() { - int var1 = this.field2938.method2069(this.field2935); - int var2 = this.field2938.method2070(this.field2932); - return new class485(var1, var2); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class33.java b/osrs/src/main/java/class33.java index e73464021..a2dfb609c 100644 --- a/osrs/src/main/java/class33.java +++ b/osrs/src/main/java/class33.java @@ -2,64 +2,764 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bz") public class class33 { - @ObfuscatedName("um") - @Export("cameraMoveToY") - static int cameraMoveToY; - @ObfuscatedName("un") - @Export("cameraLookAtSpeed") - static int cameraLookAtSpeed; - @ObfuscatedName("az") - int field92; - @ObfuscatedName("ap") + @ObfuscatedName("ay") + public static short[][] field87; + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "Lnt;" + ) + static WidgetDefinition field89; + @ObfuscatedName("rv") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("ar") int field91; + @ObfuscatedName("ab") + int field90; class33(int var1, int var2) { - this.field92 = var1; - this.field91 = var2; + this.field91 = var1; + this.field90 = var2; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lbv;I)Z", - garbageValue = "625917301" + descriptor = "(Lbd;I)Z", + garbageValue = "-114567882" ) - boolean method130(class29 var1) { + boolean method133(class29 var1) { if (var1 == null) { return false; } else { - switch(this.field92) { + switch(this.field91) { case 1: - return var1.vmethod3949(this.field91); + return var1.vmethod3949(this.field90); case 2: - return var1.vmethod3989(this.field91); + return var1.vmethod3989(this.field90); case 3: - return var1.vmethod3951((char)this.field91); + return var1.vmethod3951((char)this.field90); case 4: - return var1.vmethod3953(this.field91 == 1); + return var1.vmethod3953(this.field90 == 1); default: return false; } } } - @ObfuscatedName("ao") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIII)I", - garbageValue = "-795893337" + descriptor = "(IIII)Lud;", + garbageValue = "1018953264" ) - static final int method129(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; + static SpritePixels method134(int var0, int var1, int var2) { + DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; + long var4 = (long)(var2 << 16 | var0 << 8 | var1); + return (SpritePixels)var3.get(var4); } - @ObfuscatedName("at") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)Lco;", - garbageValue = "-1816107521" + descriptor = "(I)V", + garbageValue = "973188034" ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); + public static void method135() { + WorldMapElement.HitSplatDefinition_cached.clear(); + } + + @ObfuscatedName("ll") + @ObfuscatedSignature( + descriptor = "(IIIIILjava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "102" + ) + @Export("menuAction") + static final void menuAction(int var0, int var1, int var2, int var3, int var4, String var5, String var6, int var7, int var8) { + if (var2 >= 2000) { + var2 -= 2000; + } + + PacketBufferNode var9; + if (var2 == 16) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.f97, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(Actor.field958); + var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeIntME(class4.field2); + var9.packetBuffer.writeShortAdd(var0 + class20.baseX); + var9.packetBuffer.writeShort(class129.field1205); + var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortLE(class19.baseY + var1); + Client.packetWriter.addNode(var9); + } + + if (var2 == 1008 || var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1012) { + class434.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); + } + + Widget var10; + int var11; + if (var2 == 28) { + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.WIDGET_TYPE, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var9); + var10 = field89.method1740(var1); + if (var10 != null && var10.cs1Instructions != null && var10.cs1Instructions[0][0] == 5) { + var11 = var10.cs1Instructions[0][1]; + Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; + ScriptEvent.changeGameOptions(var11); + } + } + + if (var2 == 4) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOC2, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(var3); + var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortAdd(var0 + class20.baseX); + var9.packetBuffer.writeShortLE(class19.baseY + var1); + Client.packetWriter.addNode(var9); + } + + if (var2 == 1) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.field2534, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntIME(class4.field2); + var9.packetBuffer.writeShortLE(var0 + class20.baseX); + var9.packetBuffer.writeShort(Actor.field958); + var9.packetBuffer.writeShortAdd(class129.field1205); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortAddLE(class19.baseY + var1); + Client.packetWriter.addNode(var9); + } + + if (var2 == 20) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJ3, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortLE(class19.baseY + var1); + var9.packetBuffer.writeShortAddLE(var3); + var9.packetBuffer.writeShortAddLE(var0 + class20.baseX); + var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var9); + } + + PacketBufferNode var14; + NPC var15; + if (var2 == 7) { + var15 = Client.npcs[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.f69, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShortAdd(Actor.field958); + var14.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeInt(class4.field2); + var14.packetBuffer.writeShortLE(var3); + var14.packetBuffer.writeShortAddLE(class129.field1205); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 6) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOC4, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortLE(class19.baseY + var1); + var9.packetBuffer.writeShortAddLE(var3); + var9.packetBuffer.writeShortAddLE(var0 + class20.baseX); + var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var9); + } + + Player var16; + if (var2 == 14) { + var16 = Client.players[var3]; + if (var16 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.f4, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeIntME(class4.field2); + var14.packetBuffer.writeShortAdd(Actor.field958); + var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShortAdd(var3); + var14.packetBuffer.writeShortAddLE(class129.field1205); + Client.packetWriter.addNode(var14); + } + } + + Widget var17; + if (var2 == 57 || var2 == 1007) { + var17 = field89.getWidgetChild(var1, var0); + if (var17 != null) { + TextureProvider.widgetDefaultMenuAction(var3, var1, var0, var4, var6); + } + } + + if (var2 == 48) { + var16 = Client.players[var3]; + if (var16 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER5, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 50) { + var16 = Client.players[var3]; + if (var16 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 23) { + if (Client.isMenuOpen) { + class10.scene.setViewportWalking(); + } else { + class10.scene.menuOpen(class87.Client_plane, var0, var1, true); + } + } + + if (var2 == 13) { + var15 = Client.npcs[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPC5, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var14); + } + } + + PacketBufferNode var12; + if (var2 == 1003) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var15 = Client.npcs[var3]; + if (var15 != null) { + NPCComposition var18 = var15.definition; + if (var18.transforms != null) { + var18 = var18.transform(); + } + + if (var18 != null) { + var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPCE, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShortAddLE(var18.id); + Client.packetWriter.addNode(var12); + } + } + } + + if (var2 == 21) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJ4, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(var3); + var9.packetBuffer.writeShort(var0 + class20.baseX); + var9.packetBuffer.writeShort(class19.baseY + var1); + var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var9); + } + + if (var2 == 44) { + var16 = Client.players[var3]; + if (var16 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShortAddLE(var3); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 11) { + var15 = Client.npcs[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPC3, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShortAddLE(var3); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 5) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOC3, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAddLE(class19.baseY + var1); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShortLE(var0 + class20.baseX); + var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var9); + } + + if (var2 == 15) { + var16 = Client.players[var3]; + if (var16 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYERT, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShort(Client.field503); + var14.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); + var14.packetBuffer.writeIntLE(JagexCache.field1449); + var14.packetBuffer.writeShortLE(var3); + var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 51) { + var16 = Client.players[var3]; + if (var16 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER8, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 22) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJ5, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShort(class19.baseY + var1); + var9.packetBuffer.writeShortLE(var0 + class20.baseX); + var9.packetBuffer.writeShortAddLE(var3); + Client.packetWriter.addNode(var9); + } + + if (var2 == 24) { + var17 = field89.method1740(var1); + if (var17 != null) { + boolean var13 = true; + if (var17.contentType > 0) { + var13 = EnumComposition.method1002(var17); + } + + if (var13) { + var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.WIDGET_TYPE, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var12); + } + } + } + + if (var2 == 2) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOCT, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); + var9.packetBuffer.writeShort(var0 + class20.baseX); + var9.packetBuffer.writeIntIME(JagexCache.field1449); + var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeShortLE(class19.baseY + var1); + var9.packetBuffer.writeShortAdd(Client.field503); + Client.packetWriter.addNode(var9); + } + + if (var2 == 30 && Client.meslayerContinueWidget == null) { + class174.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = field89.getWidgetChild(var1, var0); + ClanChannelMember.invalidateWidget(Client.meslayerContinueWidget); + } + + if (var2 == 12) { + var15 = Client.npcs[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPC4, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 9) { + var15 = Client.npcs[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPC1, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShortAdd(var3); + var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 49) { + var16 = Client.players[var3]; + if (var16 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 19) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJ2, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAddLE(var0 + class20.baseX); + var9.packetBuffer.writeShort(class19.baseY + var1); + var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var9); + } + + if (var2 == 1002) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOCE, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var9); + } + + if (var2 == 17) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJT, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(var3); + var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeInt(JagexCache.field1449); + var9.packetBuffer.writeShort(Client.field503); + var9.packetBuffer.writeShortAddLE(class19.baseY + var1); + var9.packetBuffer.writeShortAddLE(var0 + class20.baseX); + var9.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); + Client.packetWriter.addNode(var9); + } + + if (var2 == 46) { + var16 = Client.players[var3]; + if (var16 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER3, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShortAdd(var3); + var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 3) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOC1, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(var0 + class20.baseX); + var9.packetBuffer.writeShortAddLE(class19.baseY + var1); + var9.packetBuffer.writeShortAddLE(var3); + var9.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var9); + } + + if (var2 == 45) { + var16 = Client.players[var3]; + if (var16 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER2, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 10) { + var15 = Client.npcs[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPC2, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 1004) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJE, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(class19.baseY + var1); + var9.packetBuffer.writeShort(var0 + class20.baseX); + var9.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var9); + } + + if (var2 == 58) { + var17 = field89.getWidgetChild(var1, var0); + if (var17 != null) { + if (var17.field3105 != null) { + ScriptEvent var19 = new ScriptEvent(); + var19.widget = var17; + var19.opIndex = var3; + var19.targetName = var6; + var19.args = var17.field3105; + Interpreter.runScriptEvent(var19); + } + + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTONT, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); + var14.packetBuffer.writeInt(var1); + var14.packetBuffer.writeShortAdd(var4); + var14.packetBuffer.writeIntIME(JagexCache.field1449); + var14.packetBuffer.writeShortAddLE(Client.field503); + var14.packetBuffer.writeShortAddLE(var0); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 18) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJ1, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(class19.baseY + var1); + var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortAdd(var0 + class20.baseX); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + + if (var2 == 1001) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOC5, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShortAdd(class19.baseY + var1); + var9.packetBuffer.writeShortAdd(var0 + class20.baseX); + var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var9); + } + + if (var2 == 29) { + var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.WIDGET_TYPE, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var9); + var10 = field89.method1740(var1); + if (var10 != null && var10.cs1Instructions != null && var10.cs1Instructions[0][0] == 5) { + var11 = var10.cs1Instructions[0][1]; + if (Varps.Varps_main[var11] != var10.cs1ComparisonValues[0]) { + Varps.Varps_main[var11] = var10.cs1ComparisonValues[0]; + ScriptEvent.changeGameOptions(var11); + } + } + } + + if (var2 == 47) { + var16 = Client.players[var3]; + if (var16 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShortAddLE(var3); + var14.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var14); + } + } + + if (var2 == 26) { + GrandExchangeOfferOwnWorldComparator.method351(); + } + + if (var2 == 25) { + var17 = field89.getWidgetChild(var1, var0); + if (var17 != null) { + class286.method1575(); + class478.method2385(var1, var0, KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var17)), var4); + Client.isItemSelected = 0; + Client.field599 = class155.Widget_getSpellActionName(var17); + if (Client.field599 == null) { + Client.field599 = "null"; + } + + if (var17.isIf3) { + Client.field600 = var17.dataText + Client.colorStartTag(16777215); + } else { + Client.field600 = Client.colorStartTag(65280) + var17.field3124 + Client.colorStartTag(16777215); + } + } + + } else { + if (var2 == 8) { + var15 = Client.npcs[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPCT, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeIntIME(JagexCache.field1449); + var14.packetBuffer.writeShortAdd(Client.field503); + var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var14.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); + var14.packetBuffer.writeShortAddLE(var3); + Client.packetWriter.addNode(var14); + } + } + + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + ClanChannelMember.invalidateWidget(field89.method1740(class4.field2)); + } + + if (Client.isSpellSelected) { + class286.method1575(); + } + + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class330.java b/osrs/src/main/java/class330.java index 08f455096..6d8280b29 100644 --- a/osrs/src/main/java/class330.java +++ b/osrs/src/main/java/class330.java @@ -2,37 +2,70 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mm") -public class class330 { - @ObfuscatedName("au") - public static final short[] field2941; - @ObfuscatedName("ae") - public static final short[][] field2942; - @ObfuscatedName("ao") - public static final short[] field2940; - @ObfuscatedName("at") - public static final short[][] field2943; - @ObfuscatedName("ud") +import java.util.Comparator; + +@ObfuscatedName("me") +public class class330 implements Comparator { + class330() { + } + + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lcx;" + descriptor = "(Lmu;Lmu;B)I", + garbageValue = "1" ) - @Export("decimator") - static Decimator decimator; + int method1728(class323 var1, class323 var2) { + return var1.field2844 - var2.field2844; + } + + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method1728((class323)var1, (class323)var2); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); + } - static { - field2941 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2942 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010, -22122, 937, 8130, -13422, 30385}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; - field2940 = new short[]{-10304, 9104, -1, -1, -1}; - field2943 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002, -22116, 945, 8144, -13414, 30389}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(ILds;ZB)I", + garbageValue = "-1" + ) + static int method1729(int var0, Script var1, boolean var2) { + if (var0 == 6754) { + int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + NPCComposition var4 = class190.getNpcDefinition(var3); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; + return 1; + } else { + NPCComposition var5; + if (var0 == 6764) { + Interpreter.Interpreter_intStackSize -= 2; + var5 = class190.getNpcDefinition(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); + int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.method1020(var6); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.method1022(var6); + return 1; + } else if (var0 == 6765) { + var5 = class190.getNpcDefinition(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5 != null ? var5.combatLevel * -1524379573 * 1597602147 : 0; + return 1; + } else { + return 2; + } + } } - @ObfuscatedName("ad") + @ObfuscatedName("od") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "770001992" + descriptor = "(ZI)V", + garbageValue = "-1170534602" ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; + static void method1730(boolean var0) { + Client.leftClickOpensMenu = var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class332.java b/osrs/src/main/java/class332.java index e90f8646e..829ec24be 100644 --- a/osrs/src/main/java/class332.java +++ b/osrs/src/main/java/class332.java @@ -2,21 +2,442 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") -public class class332 { - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lht;" - ) - @Export("clock") - static Clock clock; +import java.util.BitSet; - @ObfuscatedName("bo") +@ObfuscatedName("my") +public class class332 extends Node { + @ObfuscatedName("ac") + int field2895; + @ObfuscatedName("al") + BitSet field2896; + + class332(int var1) { + this.field2895 = var1; + this.field2896 = new BitSet(128); + } + + @ObfuscatedName("kk") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1427775858" + descriptor = "(ZLuy;I)V", + garbageValue = "2118721779" ) - static int method1850(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field717 - 7.0D) * 256.0D); + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field492 = 0; + Client.field450 = 0; + var1.importIndex(); + int var2 = var1.readBits(8); + int var3; + if (var2 < Client.npcCount) { + for (var3 = var2; var3 < Client.npcCount; ++var3) { + Client.field561[++Client.field492 - 1] = Client.npcIndices[var3]; + } + } + + if (var2 > Client.npcCount) { + throw new RuntimeException(""); + } else { + Client.npcCount = 0; + + int var6; + int var7; + int var8; + int var9; + for (var3 = 0; var3 < var2; ++var3) { + int var4 = Client.npcIndices[var3]; + NPC var5 = Client.npcs[var4]; + var6 = var1.readBits(1); + if (var6 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var4; + var5.npcCycle = Client.cycle; + } else { + var7 = var1.readBits(2); + if (var7 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var4; + var5.npcCycle = Client.cycle; + Client.field552[++Client.field450 - 1] = var4; + } else if (var7 == 1) { + Client.npcIndices[++Client.npcCount - 1] = var4; + var5.npcCycle = Client.cycle; + var8 = var1.readBits(3); + var5.move(var8, MoveSpeed.WALK); + var9 = var1.readBits(1); + if (var9 == 1) { + Client.field552[++Client.field450 - 1] = var4; + } + } else if (var7 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var4; + var5.npcCycle = Client.cycle; + if (var1.readBits(1) == 1) { + var8 = var1.readBits(3); + var5.move(var8, MoveSpeed.RUN); + var9 = var1.readBits(3); + var5.move(var9, MoveSpeed.RUN); + } else { + var8 = var1.readBits(3); + var5.move(var8, MoveSpeed.CRAWL); + } + + var8 = var1.readBits(1); + if (var8 == 1) { + Client.field552[++Client.field450 - 1] = var4; + } + } else if (var7 == 3) { + Client.field561[++Client.field492 - 1] = var4; + } + } + } + + class13.method44(var0, var1); + + for (var2 = 0; var2 < Client.field450; ++var2) { + var3 = Client.field552[var2]; + NPC var14 = Client.npcs[var3]; + int var15 = var1.readUnsignedByte(); + if ((var15 & 64) != 0) { + var6 = var1.readUnsignedByte(); + var15 += var6 << 8; + } + + if ((var15 & 2048) != 0) { + var6 = var1.readUnsignedByte(); + var15 += var6 << 16; + } + + if ((var15 & 128) != 0) { + var6 = var1.readUnsignedShortAdd(); + if (var6 == 65535) { + var6 = -1; + } + + var7 = var1.readUnsignedByte(); + if (var6 == var14.sequence && var6 != -1) { + var8 = class36.SequenceDefinition_get(var6).replyMode; + if (var8 == 1) { + var14.sequenceFrame = 0; + var14.sequenceFrameCycle = 0; + var14.sequenceDelay = var7; + var14.currentSequenceFrameIndex = 0; + } + + if (var8 == 2) { + var14.currentSequenceFrameIndex = 0; + } + } else if (var6 == -1 || var14.sequence == -1 || class36.SequenceDefinition_get(var6).forcedPriority >= class36.SequenceDefinition_get(var14.sequence).forcedPriority) { + var14.sequence = var6; + var14.sequenceFrame = 0; + var14.sequenceFrameCycle = 0; + var14.sequenceDelay = var7; + var14.currentSequenceFrameIndex = 0; + var14.field1023 = var14.pathLength; + } + } + + if ((var15 & 2) != 0) { + var14.definition = class190.getNpcDefinition(var1.readIntME()); + WorldMapLabel.method1571(var14); + var14.method591(); + } + + if ((var15 & 32768) != 0) { + var14.field1016 = var1.readByteAdd(); + var14.field1013 = var1.readByte(); + var14.field1021 = var1.readByte(); + var14.field1010 = var1.readByteSub(); + var14.spotAnimation = var1.readIntME() + Client.cycle; + var14.exactMoveArrive1Cycle = var1.readUnsignedShort() + Client.cycle; + var14.exactMoveDirection = var1.readUnsignedShortAdd(); + var14.pathLength = 1; + var14.field1023 = 0; + var14.field1016 += var14.pathX[0]; + var14.field1013 += var14.pathY[0]; + var14.field1021 += var14.pathX[0]; + var14.field1010 += var14.pathY[0]; + } + + if ((var15 & 8) != 0) { + var1.readUnsignedShort(); + var1.readInt(); + } + + int var10; + int var11; + int[] var16; + short[] var17; + short[] var18; + long var19; + boolean var22; + if ((var15 & 16384) != 0) { + var6 = var1.readUnsignedByte(); + if ((var6 & 1) == 1) { + var14.method595(); + } else { + var16 = null; + if ((var6 & 2) == 2) { + var8 = var1.readUnsignedByteAdd(); + var16 = new int[var8]; + + for (var9 = 0; var9 < var8; ++var9) { + var10 = var1.readUnsignedShortAdd(); + var10 = var10 == 65535 ? -1 : var10; + var16[var9] = var10; + } + } + + var17 = null; + if ((var6 & 4) == 4) { + var9 = 0; + if (var14.definition.recolorTo != null) { + var9 = var14.definition.recolorTo.length; + } + + var17 = new short[var9]; + + for (var10 = 0; var10 < var9; ++var10) { + var17[var10] = (short)var1.readUnsignedShortAdd(); + } + } + + var18 = null; + if ((var6 & 8) == 8) { + var10 = 0; + if (var14.definition.retextureTo != null) { + var10 = var14.definition.retextureTo.length; + } + + var18 = new short[var10]; + + for (var11 = 0; var11 < var10; ++var11) { + var18[var11] = (short)var1.readUnsignedShort(); + } + } + + var22 = false; + if ((var6 & 16) != 0) { + var22 = var1.readUnsignedByteNeg() == 1; + } + + var19 = (long)(++NPC.field1076 - 1); + var14.method592(new NewShit(var19, var16, var17, var18, var22)); + } + } + + if ((var15 & 512) != 0) { + var14.method578(var1.readStringCp1252NullTerminated()); + } + + if ((var15 & 4096) != 0) { + var6 = var1.readUnsignedByteAdd(); + if ((var6 & 1) == 1) { + var14.method596(); + } else { + var16 = null; + if ((var6 & 2) == 2) { + var8 = var1.readUnsignedByte(); + var16 = new int[var8]; + + for (var9 = 0; var9 < var8; ++var9) { + var10 = var1.readIntME(); + var10 = var10 == 65535 ? -1 : var10; + var16[var9] = var10; + } + } + + var17 = null; + if ((var6 & 4) == 4) { + var9 = 0; + if (var14.definition.recolorTo != null) { + var9 = var14.definition.recolorTo.length; + } + + var17 = new short[var9]; + + for (var10 = 0; var10 < var9; ++var10) { + var17[var10] = (short)var1.readIntME(); + } + } + + var18 = null; + if ((var6 & 8) == 8) { + var10 = 0; + if (var14.definition.retextureTo != null) { + var10 = var14.definition.retextureTo.length; + } + + var18 = new short[var10]; + + for (var11 = 0; var11 < var10; ++var11) { + var18[var11] = (short)var1.readUnsignedShortAdd(); + } + } + + var22 = false; + if ((var6 & 16) != 0) { + var22 = var1.readUnsignedByte() == 1; + } + + var19 = (long)(++NPC.field1077 - 1); + var14.method594(new NewShit(var19, var16, var17, var18, var22)); + } + } + + if ((var15 & 262144) != 0) { + var6 = var1.readInt(); + var14.turnLeftSequence = (var6 & 1) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.turnLeftSequence * -683029639 * -518279479; + var14.turnRightSequence = (var6 & 2) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.turnRightSequence * -650094419 * 53136165; + var14.walkSequence = (var6 & 4) != 0 ? var1.readUnsignedShortAdd() : var14.definition.walkSequence * 12153249 * 1652208225; + var14.walkBackSequence = (var6 & 8) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.walkBackSequence * -601680513 * 514763391; + var14.walkLeftSequence = (var6 & 16) != 0 ? var1.readUnsignedShort() : var14.definition.walkLeftSequence * 407029447 * 193862391; + var14.walkRightSequence = (var6 & 32) != 0 ? var1.readIntME() : var14.definition.walkRightSequence * -1457167705 * 1557013783; + var14.runSequence = (var6 & 64) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.runSequence * -1220844931 * -1279088939; + var14.runBackSequence = (var6 & 128) != 0 ? var1.readUnsignedShortAdd() : var14.definition.runBackSequence * -1135999935 * -1929114687; + var14.runLeftSequence = (var6 & 256) != 0 ? var1.readIntME() : var14.definition.runLeftSequence * 1482173473 * -1555933215; + var14.runRightSequence = (var6 & 512) != 0 ? var1.readUnsignedShort() : var14.definition.runRightSequence * -2140161505 * -936033825; + var14.crawlSequence = (var6 & 1024) != 0 ? var1.readUnsignedShort() : var14.definition.crawlSequence * 700539735 * 578435175; + var14.crawlBackSequence = (var6 & 2048) != 0 ? var1.readUnsignedShort() : var14.definition.crawlBackSequence * 279963805 * -2084184651; + var14.crawlLeftSequence = (var6 & 4096) != 0 ? var1.readIntME() : var14.definition.crawlLeftSequence * -2021467469 * 1677812859; + var14.crawlRightSequence = (var6 & 8192) != 0 ? var1.readUnsignedShortAdd() : var14.definition.crawlRightSequence * 1071402625 * 999682433; + var14.idleSequence = (var6 & 16384) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.idleSequence * -771436155 * 1122795341; + } + + if ((var15 & 131072) != 0) { + var6 = var1.readUnsignedByteAdd(); + + for (var7 = 0; var7 < var6; ++var7) { + var8 = var1.readUnsignedByteSub(); + var9 = var1.readUnsignedShortAddLE(); + var10 = var1.readUnsignedIntME(); + var14.updateSpotAnimation(var8, var9, var10 >> 16, var10 & 65535); + } + } + + if ((var15 & 8192) != 0) { + var14.method579(var1.readUnsignedByteSub()); + } + + if ((var15 & 32) != 0) { + var14.overheadText = var1.readStringCp1252NullTerminated(); + var14.overheadTextCyclesRemaining = 100; + } + + if ((var15 & 16) != 0) { + var6 = var1.readUnsignedShort(); + var7 = var1.readIntME(); + var14.field964 = var1.readUnsignedByteAdd() == 1; + if (Client.param25 >= 212) { + var14.field995 = var6; + var14.field996 = var7; + } else { + var8 = var14.x - (var6 - class20.baseX - class20.baseX) * 64; + var9 = var14.y - (var7 - class19.baseY - class19.baseY) * 64; + if (var8 != 0 || var9 != 0) { + var11 = (int)(Math.atan2((double)var8, (double)var9) * 325.94932345220167D) & 2047; + var14.movingOrientation = var11; + } + } + } + + if ((var15 & 256) != 0) { + var14.combatLevelChange = var1.readUnsignedIntLE(); + } + + if ((var15 & 4) != 0) { + var14.targetIndex = var1.readIntME(); + var14.targetIndex += var1.readUnsignedByte() << 16; + var6 = 16777215; + if (var6 == var14.targetIndex) { + var14.targetIndex = -1; + } + } + + if ((var15 & 1) != 0) { + var6 = var1.readUnsignedByte(); + int var12; + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var9 = -1; + var10 = -1; + var11 = -1; + var8 = var1.readUShortSmart(); + if (var8 == 32767) { + var8 = var1.readUShortSmart(); + var10 = var1.readUShortSmart(); + var9 = var1.readUShortSmart(); + var11 = var1.readUShortSmart(); + } else if (var8 != 32766) { + var10 = var1.readUShortSmart(); + } else { + var8 = -1; + } + + var12 = var1.readUShortSmart(); + var14.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); + } + } + + var7 = var1.readUnsignedByteAdd(); + if (var7 > 0) { + for (var8 = 0; var8 < var7; ++var8) { + var9 = var1.readUShortSmart(); + var10 = var1.readUShortSmart(); + if (var10 != 32767) { + var11 = var1.readUShortSmart(); + var12 = var1.readUnsignedByte(); + int var13 = var10 > 0 ? var1.readUnsignedByteNeg() : var12; + var14.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); + } else { + var14.removeHealthBar(var9); + } + } + } + } + + if ((var15 & 1024) != 0) { + var14.recolourStartCycle = Client.cycle + var1.readUnsignedShort(); + var14.recolourEndCycle = Client.cycle + var1.readUnsignedShortAddLE(); + var14.recolourHue = var1.readByteSub(); + var14.recolourSaturation = var1.readByte(); + var14.recolourLuminance = var1.readByteNeg(); + var14.recolourAmount = (byte)var1.readUnsignedByte(); + } + + if ((var15 & 65536) != 0) { + var6 = var1.readUnsignedByteNeg(); + var16 = new int[8]; + var17 = new short[8]; + + for (var9 = 0; var9 < 8; ++var9) { + if ((var6 & 1 << var9) != 0) { + var16[var9] = var1.readNullableLargeSmart(); + var17[var9] = (short)var1.readShortSmartSub(); + } else { + var16[var9] = -1; + var17[var9] = -1; + } + } + + var14.method590(var16, var17); + } + } + + for (var2 = 0; var2 < Client.field492; ++var2) { + var3 = Client.field561[var2]; + if (Client.npcs[var3].npcCycle != Client.cycle) { + Client.npcs[var3].definition = null; + Client.npcs[var3] = null; + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var2 = 0; var2 < Client.npcCount; ++var2) { + if (Client.npcs[Client.npcIndices[var2]] == null) { + throw new RuntimeException(var2 + "," + Client.npcCount); + } + } + + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class334.java b/osrs/src/main/java/class334.java deleted file mode 100644 index 5ec53b987..000000000 --- a/osrs/src/main/java/class334.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("my") -public class class334 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lmx;" - ) - @Export("huffman") - static Huffman huffman; -} \ No newline at end of file diff --git a/osrs/src/main/java/class337.java b/osrs/src/main/java/class337.java new file mode 100644 index 000000000..e53efa575 --- /dev/null +++ b/osrs/src/main/java/class337.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mg") +public interface class337 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-118" + ) + @Export("vmethod5708") + void vmethod5708(); +} \ No newline at end of file diff --git a/osrs/src/main/java/class338.java b/osrs/src/main/java/class338.java deleted file mode 100644 index db068bb8a..000000000 --- a/osrs/src/main/java/class338.java +++ /dev/null @@ -1,87 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -@ObfuscatedName("nq") -public class class338 { - @ObfuscatedName("ao") - static int field3112; - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2066901929" - ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; - - try { - var0 = Decimator.getPreferencesFile("", WorldMapSectionType.field2417.name, true); - Buffer var1 = class449.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { - } - - try { - if (var0 != null) { - var0.closeSync(true); - } - } catch (Exception var2) { - } - - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(II)Lfv;", - garbageValue = "1964561165" - ) - static class137 method1862(int var0) { - class137 var1 = (class137)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); - if (var1 != null) { - return var1; - } else { - AbstractArchive var3 = VarpDefinition.SequenceDefinition_animationsArchive; - AbstractArchive var4 = class485.SequenceDefinition_skeletonsArchive; - boolean var5 = true; - byte[] var6 = var3.getFile(var0 >> 16 & 65535, var0 & 65535); - class137 var2; - if (var6 == null) { - var5 = false; - var2 = null; - } else { - int var7 = (var6[1] & 255) << 8 | var6[2] & 255; - byte[] var8 = var4.getFile(var7, 0); - if (var8 == null) { - var5 = false; - } - - if (!var5) { - var2 = null; - } else { - if (class137.field1296 == null) { - class291.field2496 = Runtime.getRuntime().availableProcessors(); - class137.field1296 = new ThreadPoolExecutor(0, class291.field2496, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(class291.field2496 * 100 + 100), new class184()); - } - - try { - var2 = new class137(var3, var4, var0, false); - } catch (Exception var10) { - var2 = null; - } - } - } - - if (var2 != null) { - SequenceDefinition.SequenceDefinition_cachedModel.put(var2, (long)var0); - } - - return var2; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class339.java b/osrs/src/main/java/class339.java index 3bacc18e6..ad644b414 100644 --- a/osrs/src/main/java/class339.java +++ b/osrs/src/main/java/class339.java @@ -1,91 +1,25 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("na") -public enum class339 implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lna;" - ) - field3117(0), - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lna;" - ) - field3115(1), - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lna;" - ) - field3116(2), - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lna;" - ) - field3113(3), +@ObfuscatedName("nx") +public class class339 { @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lna;" - ) - field3114(4); - - @ObfuscatedName("ai") - final int field3118; + public int field2923; + @ObfuscatedName("al") + public int field2925; + @ObfuscatedName("ak") + public int field2924; - class339(int var3) { - this.field3118 = var3; + class339() { } @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)V", + garbageValue = "-250555554" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3118; - } - - @ObfuscatedName("nb") - @ObfuscatedSignature( - descriptor = "(IIII)Lds;", - garbageValue = "-800562138" - ) - @Export("ifOpenSub") - static final InterfaceParent ifOpenSub(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - class19.Widget_resetModelFrames(var1); - Widget var4 = class92.getWidget(var0); - class218.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - class218.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var0 >> 16], var4, false); - MoveSpeed.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - class385.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; - } - - @ObfuscatedName("nh") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "18" - ) - static void method1865(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { - if ((var1.key >> 48 & 65535L) == (long)var0) { - var1.remove(); - } - } - + static void method1746() { + GameEngine.method166(24); + AbstractWorldMapIcon.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); } } \ No newline at end of file diff --git a/osrs/src/main/java/class340.java b/osrs/src/main/java/class340.java new file mode 100644 index 000000000..ce60c5b75 --- /dev/null +++ b/osrs/src/main/java/class340.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("nv") +public class class340 { + @ObfuscatedName("aw") + @Export("canvasWidth") + public static int canvasWidth; +} \ No newline at end of file diff --git a/osrs/src/main/java/class341.java b/osrs/src/main/java/class341.java new file mode 100644 index 000000000..d3b6d8f1c --- /dev/null +++ b/osrs/src/main/java/class341.java @@ -0,0 +1,59 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.net.MalformedURLException; +import java.net.URL; + +@ObfuscatedName("nd") +public class class341 { + @ObfuscatedName("of") + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Leq;" + ) + UrlRequest field2928; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lud;" + ) + SpritePixels field2929; + + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Len;)V" + ) + class341(String var1, UrlRequester var2) { + try { + this.field2928 = var2.request(new URL(var1)); + } catch (MalformedURLException var4) { + this.field2928 = null; + } + + } + + @ObfuscatedSignature( + descriptor = "(Leq;)V" + ) + class341(UrlRequest var1) { + this.field2928 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)Lud;", + garbageValue = "1517070019" + ) + SpritePixels method1747() { + if (this.field2929 == null && this.field2928 != null && this.field2928.isDone()) { + if (this.field2928.getResponse() != null) { + this.field2929 = Frames.method1335(this.field2928.getResponse()); + } + + this.field2928 = null; + } + + return this.field2929; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class342.java b/osrs/src/main/java/class342.java index bc1f2f67b..716e2ef4d 100644 --- a/osrs/src/main/java/class342.java +++ b/osrs/src/main/java/class342.java @@ -1,51 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nd") +@ObfuscatedName("no") public class class342 { - @ObfuscatedName("gk") - static int field3146; - - @ObfuscatedName("lo") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1771943161" + descriptor = "Lnz;" ) - static void method1867(int var0, int var1) { - int var2 = class59.fontBold12.stringWidth("Choose Option"); - - int var3; - int var4; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - var4 = class59.fontBold12.stringWidth(class181.method928(var3)); - if (var4 > var2) { - var2 = var4; - } - } - - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - var4 = var0 - var2 / 2; - if (var4 + var2 > class113.canvasWidth) { - var4 = class113.canvasWidth - var2; - } - - if (var4 < 0) { - var4 = 0; - } - - int var5 = var1; - if (var1 + var3 > class177.canvasHeight) { - var5 = class177.canvasHeight - var3; - } - - if (var5 < 0) { - var5 = 0; - } - - class12.menuX = var4; - class419.menuY = var5; - class316.menuWidth = var2; - Occluder.menuHeight = Client.menuOptionsCount * 15 + 22; + public class344 field2936; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lnx;" + ) + class339 field2931; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lbk;" + ) + class27 field2930; + @ObfuscatedName("ax") + public Object[] field2935; + @ObfuscatedName("ao") + public Object[] field2933; + @ObfuscatedName("ah") + public Object[] field2932; + @ObfuscatedName("ar") + public Object[] field2934; + + class342() { + this.field2936 = new class344(); + this.field2931 = new class339(); + this.field2930 = new class27(); } } \ No newline at end of file diff --git a/osrs/src/main/java/class343.java b/osrs/src/main/java/class343.java deleted file mode 100644 index 17bf235e4..000000000 --- a/osrs/src/main/java/class343.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ng") -public final class class343 { - @ObfuscatedName("gm") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - static Archive field3148; - @ObfuscatedName("ou") - @ObfuscatedSignature( - descriptor = "Lmi;" - ) - static Widget field3147; -} \ No newline at end of file diff --git a/osrs/src/main/java/class344.java b/osrs/src/main/java/class344.java index 59df3bd4d..ad5586b58 100644 --- a/osrs/src/main/java/class344.java +++ b/osrs/src/main/java/class344.java @@ -1,29 +1,1241 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nt") +import java.awt.datatransfer.*; + +@ObfuscatedName("nz") public class class344 { - @ObfuscatedName("ui") - @Export("cameraMoveToSpeed") - static int cameraMoveToSpeed; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lpp;" + ) + class409 field2972; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lpp;" + ) + class409 field2971; + @ObfuscatedName("ae") + boolean field2952; + @ObfuscatedName("aw") + boolean field2953; + @ObfuscatedName("aq") + int field2957; + @ObfuscatedName("az") + boolean field2954; + @ObfuscatedName("at") + int field2958; + @ObfuscatedName("af") + int field2956; + @ObfuscatedName("ad") + int field2955; + @ObfuscatedName("bn") + int field2964; + @ObfuscatedName("bk") + int field2963; + @ObfuscatedName("by") + int field2967; + @ObfuscatedName("bd") + int field2961; + @ObfuscatedName("be") + int field2962; + @ObfuscatedName("bv") + int field2966; + @ObfuscatedName("ba") + int field2959; + @ObfuscatedName("bz") + int field2968; + @ObfuscatedName("bb") + int field2960; + @ObfuscatedName("bo") + int field2965; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lmg;" + ) + class337 field2969; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lmg;" + ) + class337 field2970; + + class344() { + this.field2972 = new class409(); + this.field2971 = new class409(); + this.field2952 = false; + this.field2953 = true; + this.field2957 = 0; + this.field2954 = false; + this.field2958 = 0; + this.field2956 = 0; + this.field2955 = 0; + this.field2964 = 0; + this.field2963 = 0; + this.field2967 = 0; + this.field2961 = 0; + this.field2962 = Integer.MAX_VALUE; + this.field2966 = Integer.MAX_VALUE; + this.field2959 = 0; + this.field2968 = 0; + this.field2960 = 0; + this.field2965 = 0; + this.field2972.method2075(1); + this.field2971.method2075(1); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "120" + ) + void method1762() { + this.field2957 = (this.field2957 + 1) % 60; + if (this.field2961 > 0) { + --this.field2961; + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "523317409" + ) + public boolean method1763(boolean var1) { + var1 = var1 && this.field2953; + boolean var2 = this.field2952 != var1; + this.field2952 = var1; + if (!this.field2952) { + this.method1787(this.field2964, this.field2964); + } + + return var2; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1481904343" + ) + public void method1764(boolean var1) { + this.field2953 = var1; + this.field2952 = var1 && this.field2952; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "-2133127223" + ) + public boolean method1765(String var1) { + String var2 = this.field2972.method2070(); + if (!var2.equals(var1)) { + var1 = this.method1831(var1); + this.field2972.method2082(var1); + this.method1787(this.field2963, this.field2964); + this.method1772(this.field2960, this.field2965); + this.method1835(); + this.method1840(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "1293964055" + ) + boolean method1766(String var1) { + this.field2971.method2082(var1); + return true; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lpk;I)Z", + garbageValue = "2045619310" + ) + boolean method1767(AbstractFont var1) { + boolean var2 = !this.field2954; + this.field2972.method2074(var1); + this.field2971.method2074(var1); + this.field2954 = true; + var2 |= this.method1772(this.field2960, this.field2965); + var2 |= this.method1787(this.field2963, this.field2964); + if (this.method1835()) { + this.method1840(); + var2 = true; + } + + return var2; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "70" + ) + public boolean method1768(int var1, int var2) { + boolean var3 = this.field2959 != var1 || var2 != this.field2968; + this.field2959 = var1; + this.field2968 = var2; + var3 |= this.method1772(this.field2960, this.field2965); + return var3; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-74" + ) + public boolean method1769(int var1) { + if (var1 < 0) { + var1 = Integer.MAX_VALUE; + } + + boolean var2 = var1 == this.field2972.method2093(); + this.field2972.method2071(var1); + this.field2971.method2071(var1); + if (this.method1835()) { + this.method1840(); + var2 = true; + } + + return var2; + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "6" + ) + public boolean method1770(int var1) { + this.field2972.method2072(var1); + if (this.method1835()) { + this.method1840(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1717570728" + ) + public boolean method1771(int var1) { + this.field2966 = var1; + if (this.method1835()) { + this.method1840(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-1634456183" + ) + public boolean method1772(int var1, int var2) { + if (!this.method1819()) { + this.field2960 = var1; + this.field2965 = var2; + return false; + } else { + int var3 = this.field2960; + int var4 = this.field2965; + int var5 = Math.max(0, this.field2972.method2088() - this.field2959 + 2); + int var6 = Math.max(0, this.field2972.method2089() - this.field2968 + 1); + this.field2960 = Math.max(0, Math.min(var5, var1)); + this.field2965 = Math.max(0, Math.min(var6, var2)); + return var3 != this.field2960 || var4 != this.field2965; + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "2093677654" + ) + public boolean method1773(int var1, int var2) { + boolean var3 = true; + if (var1 < 0 || var1 > 2) { + var3 = false; + } + + if (var2 < 0 || var2 > 2) { + var3 = false; + } + + return var3 ? this.field2972.method2076(var1, var2) : false; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-939191131" + ) + public void method1774(int var1) { + this.field2972.method2077(var1); + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-592386576" + ) + public void method1775(int var1) { + this.field2958 = var1; + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "3" + ) + public void method1776(int var1) { + this.field2972.method2075(var1); + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1498031514" + ) + public void method1777(int var1) { + this.field2972.method2073(var1); + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "180" + ) + public boolean method1778(int var1) { + this.field2955 = var1; + String var2 = this.field2972.method2070(); + int var3 = var2.length(); + var2 = this.method1831(var2); + if (var2.length() != var3) { + this.field2972.method2082(var2); + this.method1772(this.field2960, this.field2965); + this.method1835(); + this.method1840(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-969199499" + ) + public void method1779() { + this.field2954 = false; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "4138" + ) + public boolean method1780(int var1) { + if (this.method1841(var1)) { + this.method1785(); + class410 var2 = this.field2972.method2079((char)var1, this.field2964, this.field2962); + this.method1787(var2.method2107(), var2.method2107()); + this.method1835(); + this.method1840(); + } + + return true; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "755624940" + ) + public void method1781() { + if (!this.method1785() && this.field2964 > 0) { + int var1 = this.field2972.method2084(this.field2964 - 1); + this.method1840(); + this.method1787(var1, var1); + } + + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "22" + ) + public void method1782() { + if (!this.method1785() && this.field2964 < this.field2972.method2069()) { + int var1 = this.field2972.method2084(this.field2964); + this.method1840(); + this.method1787(var1, var1); + } + + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2101637945" + ) + public void method1783() { + if (!this.method1785() && this.field2964 > 0) { + class500 var1 = this.method1833(this.field2964 - 1); + int var2 = this.field2972.method2085((Integer)var1.field4079, this.field2964); + this.method1840(); + this.method1787(var2, var2); + } + + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-882101391" + ) + public void method1784() { + if (!this.method1785() && this.field2964 < this.field2972.method2069()) { + class500 var1 = this.method1833(this.field2964); + int var2 = this.field2972.method2085(this.field2964, (Integer)var1.field4080); + this.method1840(); + this.method1787(var2, var2); + } + + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-639259447" + ) + boolean method1785() { + if (!this.method1830()) { + return false; + } else { + int var1 = this.field2972.method2085(this.field2963, this.field2964); + this.method1840(); + this.method1787(var1, var1); + return true; + } + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-3" + ) + public void method1786() { + this.method1787(0, this.field2972.method2069()); + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-504671047" + ) + public boolean method1787(int var1, int var2) { + if (!this.method1819()) { + this.field2963 = var1; + this.field2964 = var2; + return false; + } else { + if (var1 > this.field2972.method2069()) { + var1 = this.field2972.method2069(); + } + + if (var2 > this.field2972.method2069()) { + var2 = this.field2972.method2069(); + } + + boolean var3 = this.field2963 != var1 || var2 != this.field2964; + this.field2963 = var1; + if (var2 != this.field2964) { + this.field2964 = var2; + this.field2957 = 0; + this.method1838(); + } + + if (var3 && this.field2970 != null) { + this.field2970.vmethod5708(); + } + + return var3; + } + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "55" + ) + public void method1788(boolean var1) { + class500 var2 = this.method1834(this.field2964); + this.method1836((Integer)var2.field4079, var1); + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "2010552592" + ) + public void method1789(boolean var1) { + class500 var2 = this.method1834(this.field2964); + this.method1836((Integer)var2.field4080, var1); + } + + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-81" + ) + public void method1790(boolean var1) { + this.method1836(0, var1); + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1475070773" + ) + public void method1791(boolean var1) { + this.method1836(this.field2972.method2069(), var1); + } + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1914804723" + ) + public void method1792(boolean var1) { + if (this.method1830() && !var1) { + this.method1836(Math.min(this.field2963, this.field2964), var1); + } else if (this.field2964 > 0) { + this.method1836(this.field2964 - 1, var1); + } + + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1254852438" + ) + public void method1793(boolean var1) { + if (this.method1830() && !var1) { + this.method1836(Math.max(this.field2963, this.field2964), var1); + } else if (this.field2964 < this.field2972.method2069()) { + this.method1836(this.field2964 + 1, var1); + } + + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1246989574" + ) + public void method1794(boolean var1) { + if (this.field2964 > 0) { + class500 var2 = this.method1833(this.field2964 - 1); + this.method1836((Integer)var2.field4079, var1); + } + + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-589145055" + ) + public void method1795(boolean var1) { + if (this.field2964 < this.field2972.method2069()) { + class500 var2 = this.method1833(this.field2964 + 1); + this.method1836((Integer)var2.field4080, var1); + } + + } + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1596308602" + ) + public void method1796(boolean var1) { + if (this.field2964 > 0) { + this.method1836(this.field2972.method2087(this.field2964, -1), var1); + } + + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1852812163" + ) + public void method1797(boolean var1) { + if (this.field2964 < this.field2972.method2069()) { + this.method1836(this.field2972.method2087(this.field2964, 1), var1); + } + + } + + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-28" + ) + public void method1798(boolean var1) { + if (this.field2964 > 0) { + int var2 = this.method1837(); + this.method1836(this.field2972.method2087(this.field2964, -var2), var1); + } + + } + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-196223675" + ) + public void method1799(boolean var1) { + if (this.field2964 < this.field2972.method2069()) { + int var2 = this.method1837(); + this.method1836(this.field2972.method2087(this.field2964, var2), var1); + } + + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(ZS)V", + garbageValue = "18712" + ) + public void method1800(boolean var1) { + class413 var2 = this.field2972.method2078(0, this.field2964); + class500 var3 = var2.method2151(); + this.method1836(this.field2972.method2086((Integer)var3.field4079, this.field2965), var1); + } - static { - Math.sqrt(8192.0D); + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-124" + ) + public void method1801(boolean var1) { + class413 var2 = this.field2972.method2078(0, this.field2964); + class500 var3 = var2.method2151(); + this.method1836(this.field2972.method2086((Integer)var3.field4079, this.field2968 + this.field2965), var1); } - @ObfuscatedName("oi") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(II)Ltx;", - garbageValue = "2122507406" + descriptor = "(IIZZI)V", + garbageValue = "-1267266894" ) - static class506 method1868(int var0) { - class506 var1 = (class506)Client.Widget_cachedModels.get((long)var0); - if (var1 == null) { - var1 = new class506(class343.field3148, UserComparator3.method682(var0), NewShit.method979(var0)); - Client.Widget_cachedModels.put(var1, (long)var0); + public void method1802(int var1, int var2, boolean var3, boolean var4) { + boolean var5 = false; + class500 var6; + int var8; + if (!this.field2954) { + var8 = 0; + } else { + var1 += this.field2960; + var2 += this.field2965; + var6 = this.method1842(); + var8 = this.field2972.method2086(var1 - (Integer)var6.field4079, var2 - (Integer)var6.field4080); } - return var1; + if (var3 && var4) { + this.field2956 = 1; + var6 = this.method1833(var8); + class500 var7 = this.method1833(this.field2967); + this.method1832(var7, var6); + } else if (var3) { + this.field2956 = 1; + var6 = this.method1833(var8); + this.method1787((Integer)var6.field4079, (Integer)var6.field4080); + this.field2967 = (Integer)var6.field4079; + } else if (var4) { + this.method1787(this.field2967, var8); + } else { + if (this.field2961 > 0 && var8 == this.field2967) { + if (this.field2964 == this.field2963) { + this.field2956 = 1; + var6 = this.method1833(var8); + this.method1787((Integer)var6.field4079, (Integer)var6.field4080); + } else { + this.field2956 = 2; + var6 = this.method1834(var8); + this.method1787((Integer)var6.field4079, (Integer)var6.field4080); + } + } else { + this.field2956 = 0; + this.method1787(var8, var8); + this.field2967 = var8; + } + + this.field2961 = 25; + } + + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1597491058" + ) + public void method1803(int var1, int var2) { + if (this.field2954 && this.method1814()) { + var1 += this.field2960; + var2 += this.field2965; + class500 var3 = this.method1842(); + int var4 = this.field2972.method2086(var1 - (Integer)var3.field4079, var2 - (Integer)var3.field4080); + class500 var5; + class500 var6; + switch(this.field2956) { + case 0: + this.method1787(this.field2963, var4); + break; + case 1: + var5 = this.method1833(this.field2967); + var6 = this.method1833(var4); + this.method1832(var5, var6); + break; + case 2: + var5 = this.method1834(this.field2967); + var6 = this.method1834(var4); + this.method1832(var5, var6); + } + } + + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", + garbageValue = "-839335368" + ) + public void method1804(Clipboard var1) { + class413 var2 = this.field2972.method2078(this.field2963, this.field2964); + if (!var2.method2147()) { + String var3 = var2.method2145(); + if (!var3.isEmpty()) { + var1.setContents(new StringSelection(var3), (ClipboardOwner)null); + } + } + + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", + garbageValue = "2087668691" + ) + public void method1805(Clipboard var1) { + if (this.method1830()) { + this.method1804(var1); + this.method1785(); + } + + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/datatransfer/Clipboard;B)V", + garbageValue = "84" + ) + public void method1806(Clipboard var1) { + Transferable var2 = var1.getContents((Object)null); + if (var2 != null && var2.isDataFlavorSupported(DataFlavor.stringFlavor)) { + try { + String var3 = this.method1831((String)var2.getTransferData(DataFlavor.stringFlavor)); + this.method1785(); + class410 var4 = this.field2972.method2080(var3, this.field2964, this.field2962); + this.method1787(var4.method2107(), var4.method2107()); + this.method1835(); + this.method1840(); + } catch (Exception var5) { + } + } + + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + public void method1807() { + this.field2965 = Math.max(0, this.field2965 - this.field2972.method2090()); + } + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-794433961" + ) + public void method1808() { + int var1 = Math.max(0, this.field2972.method2089() - this.field2968); + this.field2965 = Math.min(var1, this.field2965 + this.field2972.method2090()); + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(Lmg;I)V", + garbageValue = "-1738038140" + ) + public void method1809(class337 var1) { + this.field2969 = var1; + } + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "(Lmg;I)V", + garbageValue = "1967767680" + ) + public void method1810(class337 var1) { + this.field2970 = var1; + } + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(B)Lpp;", + garbageValue = "-4" + ) + public class409 method1811() { + return this.field2972; + } + + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "(I)Lpp;", + garbageValue = "1583287029" + ) + public class409 method1812() { + return this.field2971; + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(I)Lpr;", + garbageValue = "1493883876" + ) + public class413 method1813() { + return this.field2972.method2078(this.field2963, this.field2964); + } + + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "435699001" + ) + public boolean method1814() { + return this.field2952; + } + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "515348942" + ) + public boolean method1815() { + return this.field2953; + } + + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "30" + ) + public boolean method1816() { + return this.method1814() && this.field2957 % 60 < 30; + } + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-272595100" + ) + public int method1817() { + return this.field2964; + } + + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "6" + ) + public int method1818() { + return this.field2963; + } + + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1559709726" + ) + public boolean method1819() { + return this.field2954; + } + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1987240412" + ) + public int method1820() { + return this.field2960; + } + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-123" + ) + public int method1821() { + return this.field2965; + } + + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1717649091" + ) + public int method1822() { + return this.field2972.method2093(); + } + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "61" + ) + public int method1823() { + return this.field2972.method2094(); + } + + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "418287158" + ) + public int method1824() { + return this.field2966; + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "250709855" + ) + public int method1825() { + return this.field2958; + } + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-150919313" + ) + public int method1826() { + return this.field2972.method2095(); + } + + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "128" + ) + public int method1827() { + return this.field2955; + } + + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "29102" + ) + public int method1828() { + return this.field2972.method2096(); + } + + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "114534110" + ) + public boolean method1829() { + return this.method1823() > 1; + } + + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-455222882" + ) + boolean method1830() { + return this.field2964 != this.field2963; + } + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "-21" + ) + String method1831(String var1) { + StringBuilder var2 = new StringBuilder(var1.length()); + + for (int var3 = 0; var3 < var1.length(); ++var3) { + char var4 = var1.charAt(var3); + if (this.method1841(var4)) { + var2.append(var4); + } + } + + return var2.toString(); + } + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "(Ltw;Ltw;I)V", + garbageValue = "1806400604" + ) + void method1832(class500 var1, class500 var2) { + if ((Integer)var2.field4079 < (Integer)var1.field4079) { + this.method1787((Integer)var1.field4080, (Integer)var2.field4079); + } else { + this.method1787((Integer)var1.field4079, (Integer)var2.field4080); + } + + } + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "(II)Ltw;", + garbageValue = "772728945" + ) + class500 method1833(int var1) { + int var2 = this.field2972.method2069(); + int var3 = 0; + int var4 = var2; + + int var5; + for (var5 = var1; var5 > 0; --var5) { + if (this.method1839(this.field2972.method2065(var5 - 1).field3713)) { + var3 = var5; + break; + } + } + + for (var5 = var1; var5 < var2; ++var5) { + if (this.method1839(this.field2972.method2065(var5).field3713)) { + var4 = var5; + break; + } + } + + return new class500(var3, var4); + } + + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "(II)Ltw;", + garbageValue = "-1936541681" + ) + class500 method1834(int var1) { + int var2 = this.field2972.method2069(); + int var3 = 0; + int var4 = var2; + + int var5; + for (var5 = var1; var5 > 0; --var5) { + if (this.field2972.method2065(var5 - 1).field3713 == '\n') { + var3 = var5; + break; + } + } + + for (var5 = var1; var5 < var2; ++var5) { + if (this.field2972.method2065(var5).field3713 == '\n') { + var4 = var5; + break; + } + } + + return new class500(var3, var4); + } + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1778479023" + ) + boolean method1835() { + if (!this.method1819()) { + return false; + } else { + boolean var1 = false; + if (this.field2972.method2069() > this.field2966) { + this.field2972.method2085(this.field2966, this.field2972.method2069()); + var1 = true; + } + + int var2 = this.method1823(); + int var3; + if (this.field2972.method2091() > var2) { + var3 = this.field2972.method2087(0, var2) - 1; + this.field2972.method2085(var3, this.field2972.method2069()); + var1 = true; + } + + if (var1) { + var3 = this.field2964; + int var4 = this.field2963; + int var5 = this.field2972.method2069(); + if (this.field2964 > var5) { + var3 = var5; + } + + if (this.field2963 > var5) { + var4 = var5; + } + + this.method1787(var4, var3); + } + + return var1; + } + } + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "(IZI)V", + garbageValue = "-1307117212" + ) + void method1836(int var1, boolean var2) { + if (var2) { + this.method1787(this.field2963, var1); + } else { + this.method1787(var1, var1); + } + + } + + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "996246059" + ) + int method1837() { + return this.field2968 / this.field2972.method2090(); + } + + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1596440102" + ) + void method1838() { + class413 var1 = this.field2972.method2078(0, this.field2964); + class500 var2 = var1.method2151(); + int var3 = this.field2972.method2090(); + int var4 = (Integer)var2.field4079 - 10; + int var5 = var4 + 20; + int var6 = (Integer)var2.field4080 - 3; + int var7 = var6 + var3 + 6; + int var8 = this.field2960; + int var9 = var8 + this.field2959; + int var10 = this.field2965; + int var11 = var10 + this.field2968; + int var12 = this.field2960; + int var13 = this.field2965; + if (var4 < var8) { + var12 = var4; + } else if (var5 > var9) { + var12 = var5 - this.field2959; + } + + if (var6 < var10) { + var13 = var6; + } else if (var7 > var11) { + var13 = var7 - this.field2968; + } + + this.method1772(var12, var13); + } + + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "5" + ) + boolean method1839(int var1) { + return var1 == 32 || var1 == 10 || var1 == 9; + } + + @ObfuscatedName("dv") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "844665494" + ) + void method1840() { + if (this.field2969 != null) { + this.field2969.vmethod5708(); + } + + } + + @ObfuscatedName("dm") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "0" + ) + boolean method1841(int var1) { + switch(this.field2955) { + case 1: + return Decimator.isAlphaNumeric((char)var1); + case 2: + return class135.isCharAlphabetic((char)var1); + case 3: + return IsaacCipher.isDigit((char)var1); + case 4: + char var2 = (char)var1; + if (IsaacCipher.isDigit(var2)) { + return true; + } else { + if (var2 != 'k' && var2 != 'K' && var2 != 'm' && var2 != 'M' && var2 != 'b' && var2 != 'B') { + return false; + } + + return true; + } + default: + return true; + } + } + + @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "(I)Ltw;", + garbageValue = "-1694076835" + ) + class500 method1842() { + int var1 = this.field2972.method2097(this.field2959); + int var2 = this.field2972.method2098(this.field2968); + return new class500(var1, var2); } } \ No newline at end of file diff --git a/osrs/src/main/java/class345.java b/osrs/src/main/java/class345.java index c62cfa4bf..8cbb08d52 100644 --- a/osrs/src/main/java/class345.java +++ b/osrs/src/main/java/class345.java @@ -1,30 +1,37 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nv") +@ObfuscatedName("nb") public class class345 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lnv;" - ) - static final class345 field3151; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lnv;" - ) - static final class345 field3150; - @ObfuscatedName("ao") - final int field3152; - @ObfuscatedName("at") - final int field3153; + @ObfuscatedName("ac") + public static final short[] field2973; + @ObfuscatedName("al") + public static final short[][] field2975; + @ObfuscatedName("ak") + public static final short[] field2974; + @ObfuscatedName("ax") + public static final short[][] field2976; + @ObfuscatedName("netscape/js") + @Export("regionLandArchives") + static byte[][] regionLandArchives; static { - field3151 = new class345(51, 27, 800, 0, 16, 16); - field3150 = new class345(25, 28, 800, 656, 40, 40); + field2973 = new short[]{6798, 8741, 25238, 4626, 4550}; + field2975 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010, -22122, 937, 8130, -13422, 30385}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; + field2974 = new short[]{-10304, 9104, -1, -1, -1}; + field2976 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002, -22116, 945, 8144, -13414, 30389}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; } - class345(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3152 = var5; - this.field3153 = var6; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "23" + ) + public static int method1843(int var0, int var1, int var2) { + int var3 = class76.method431(var2 - var1 + 1); + var3 <<= var1; + var0 |= var3; + return var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class347.java b/osrs/src/main/java/class347.java new file mode 100644 index 000000000..03fc1c03f --- /dev/null +++ b/osrs/src/main/java/class347.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nc") +public class class347 { + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1988472595" + ) + public static int method1883(int var0, int var1) { + return (-3 - var0 << 8) + var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class348.java b/osrs/src/main/java/class348.java deleted file mode 100644 index 3885f7fe6..000000000 --- a/osrs/src/main/java/class348.java +++ /dev/null @@ -1,129 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nz") -public class class348 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(CB)B", - garbageValue = "73" - ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - 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; - } - - return var1; - } - - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "(Lmi;III)V", - garbageValue = "1790851766" - ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.getSpriteMask(true); - if (var3 == null) { - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if (var3.contains(var4, var5)) { - var4 -= var3.width / 2; - var5 -= var3.height / 2; - int var6 = Client.camAngleY & 2047; - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var9 = var8 * var4 + var7 * var5 >> 11; - int var10 = var8 * var5 - var7 * var4 >> 11; - int var11 = var9 + VarbitComposition.localPlayer.x >> 7; - int var12 = VarbitComposition.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.MOVE_MINIMAPCLICK, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.writeShortAddLE(var11 + UrlRequester.baseX); - var13.packetBuffer.writeShortAdd(var12 + class47.baseY); - var13.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? (Client.keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); - var13.packetBuffer.writeByte(var4); - var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.camAngleY); - var13.packetBuffer.writeByte(57); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(89); - var13.packetBuffer.writeShort(VarbitComposition.localPlayer.x); - var13.packetBuffer.writeShort(VarbitComposition.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } - } - - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class349.java b/osrs/src/main/java/class349.java index 174afd1f5..392e10580 100644 --- a/osrs/src/main/java/class349.java +++ b/osrs/src/main/java/class349.java @@ -2,99 +2,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ne") +@ObfuscatedName("nk") public class class349 { - @ObfuscatedName("ku") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ZLto;B)V", - garbageValue = "-101" + descriptor = "Lns;" ) - static final void method1874(boolean var0, PacketBuffer var1) { - while (true) { - byte var2 = 16; - int var3 = 1 << var2; - if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= var2 + 12) { - int var4 = var1.readBits(var2); - if (var4 != var3 - 1) { - boolean var5 = false; - if (Client.npcs[var4] == null) { - Client.npcs[var4] = new NPC(); - var5 = true; - } - - NPC var6 = Client.npcs[var4]; - Client.npcIndices[++Client.npcCount - 1] = var4; - var6.npcCycle = Client.cycle; - int var8; - if (var0) { - var8 = var1.readBits(8); - if (var8 > 127) { - var8 -= 256; - } - } else { - var8 = var1.readBits(5); - if (var8 > 15) { - var8 -= 32; - } - } - - boolean var10 = var1.readBits(1) == 1; - if (var10) { - var1.readBits(32); - } - - int var7 = var1.readBits(1); - int var11 = Client.field561[var1.readBits(3)]; - if (var5) { - var6.orientation = var6.rotation = var11; - } - - var6.definition = class90.getNpcDefinition(var1.readBits(14)); - int var12 = var1.readBits(1); - if (var12 == 1) { - Client.field552[++Client.field451 - 1] = var4; - } - - int var9; - if (var0) { - var9 = var1.readBits(8); - if (var9 > 127) { - var9 -= 256; - } - } else { - var9 = var1.readBits(5); - if (var9 > 15) { - var9 -= 32; - } - } - - ItemLayer.method1152(var6); - if (var6.field1017 == 0) { - var6.rotation = 0; - } - - var6.method583(VarbitComposition.localPlayer.pathX[0] + var8, VarbitComposition.localPlayer.pathY[0] + var9, var7 == 1); - continue; - } - } - - var1.exportIndex(); - return; - } - } - - @ObfuscatedName("kz") + @Export("huffman") + public static Huffman huffman; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "87449786" + descriptor = "Lom;" ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - Frames.method1297(); - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; - } + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; } \ No newline at end of file diff --git a/osrs/src/main/java/class350.java b/osrs/src/main/java/class350.java deleted file mode 100644 index b2fbdf2e8..000000000 --- a/osrs/src/main/java/class350.java +++ /dev/null @@ -1,32 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ni") -public class class350 { - static { - int var0 = 0; - int var1 = 0; - class345[] var2 = class466.method2345(); - - for (int var3 = 0; var3 < var2.length; ++var3) { - class345 var4 = var2[var3]; - if (var4.field3152 > var0) { - var0 = var4.field3152; - } - - if (var4.field3153 > var1) { - var1 = var4.field3153; - } - } - - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1513335843" - ) - public static int method1876(int var0, int var1) { - return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class352.java b/osrs/src/main/java/class352.java deleted file mode 100644 index 47174002e..000000000 --- a/osrs/src/main/java/class352.java +++ /dev/null @@ -1,276 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("np") -public enum class352 implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lnp;" - ) - field3482(-1), - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lnp;" - ) - field3479(0), - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lnp;" - ) - field3480(1), - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lnp;" - ) - field3481(2); - - @ObfuscatedName("ac") - final int field3483; - - class352(int var3) { - this.field3483 = var3; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3483; - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "1" - ) - static int method1880(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == 4000) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 + var4; - return 1; - } else if (var0 == 4001) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } else if (var0 == 4002) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 * var4; - return 1; - } else if (var0 == 4003) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } else if (var0 == 4004) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } else if (var0 == 4005) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); - return 1; - } else { - int var5; - int var6; - int var7; - if (var0 == 4006) { - SoundCache.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); - return 1; - } else if (var0 == 4007) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; - return 1; - } else if (var0 == 4008) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } else if (var0 == 4009) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } else if (var0 == 4010) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } else if (var0 == 4011) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } else if (var0 == 4012) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); - } - - return 1; - } else if (var0 == 4013) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - } else if (var0 == 4014) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } else if (var0 == 4015) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } else if (var0 == 4016) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 < var4 ? var3 : var4; - return 1; - } else if (var0 == 4017) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 > var4 ? var3 : var4; - return 1; - } else if (var0 == 4018) { - SoundCache.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); - return 1; - } else if (var0 == 4025) { - var3 = PacketBufferNode.method1609(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == 4026) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; - return 1; - } else if (var0 == 4027) { - SoundCache.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Widget.method1812(var3, var4, var5); - return 1; - } else if (var0 == 4028) { - SoundCache.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = InvDefinition.method940(var3, var4, var5); - return 1; - } else if (var0 == 4029) { - SoundCache.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - var6 = 31 - var5; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; - return 1; - } else if (var0 == 4030) { - SoundCache.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - var3 = InvDefinition.method940(var3, var5, var6); - var7 = Projectile.method430(var6 - var5 + 1); - if (var4 > var7) { - var4 = var7; - } - - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 | var4 << var5; - return 1; - } else if (var0 == 4032) { - Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = Frames.method1292(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4033) { - Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = SongTask.method2137(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4034) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = class350.method1876(var3, var4); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var5; - return 1; - } else if (var0 == 4035) { - Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4036) { - String var15 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var4 = -1; - if (class218.isNumber(var15)) { - var4 = HealthBarUpdate.method524(var15); - } - - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var4; - return 1; - } else { - return 2; - } - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class353.java b/osrs/src/main/java/class353.java new file mode 100644 index 000000000..63cb00f1e --- /dev/null +++ b/osrs/src/main/java/class353.java @@ -0,0 +1,17 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.concurrent.ScheduledExecutorService; + +@ObfuscatedName("nw") +public class class353 { + @ObfuscatedName("ab") + @Export("soundSystemExecutor") + public static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "Ltt;" + ) + static Fonts field3142; +} \ No newline at end of file diff --git a/osrs/src/main/java/class354.java b/osrs/src/main/java/class354.java new file mode 100644 index 000000000..989cc6843 --- /dev/null +++ b/osrs/src/main/java/class354.java @@ -0,0 +1,62 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ny") +public enum class354 implements class386 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lny;" + ) + field3145(0), + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lny;" + ) + field3147(1), + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lny;" + ) + field3146(2), + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lny;" + ) + field3143(3), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lny;" + ) + field3148(4); + + @ObfuscatedName("kg") + static int field3144; + @ObfuscatedName("ah") + final int field3149; + + class354(int var3) { + this.field3149 = var3; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1243971674" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3149; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lud;IIII)V", + garbageValue = "902612467" + ) + static void method1895(SpritePixels var0, int var1, int var2, int var3) { + DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; + long var6 = (long)(var3 << 16 | var1 << 8 | var2); + var4.put(var0, var6, var0.pixels.length * 4); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class357.java b/osrs/src/main/java/class357.java index 3b6470c02..ed51a268d 100644 --- a/osrs/src/main/java/class357.java +++ b/osrs/src/main/java/class357.java @@ -1,18 +1,145 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; @ObfuscatedName("nj") -public class class357 extends DualNode { - @ObfuscatedName("au") +public class class357 { + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lul;IB)V", + garbageValue = "70" + ) + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); + var2.size = var0.readUnsignedByte(); + var2.id = var0.readInt(); + var2.operations = new int[var2.size]; + var2.creationErrors = new int[var2.size]; + var2.field156 = new Field[var2.size]; + var2.intReplaceValues = new int[var2.size]; + var2.methods = new Method[var2.size]; + var2.arguments = new byte[var2.size][][]; + + for (int var3 = 0; var3 < var2.size; ++var3) { + try { + int var4 = var0.readUnsignedByte(); + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { + if (var4 == 3 || var4 == 4) { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = var0.readUnsignedByte(); + String[] var8 = new String[var7]; + + for (int var9 = 0; var9 < var7; ++var9) { + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); + byte[][] var10 = new byte[var7][]; + int var12; + if (var4 == 3) { + for (int var11 = 0; var11 < var7; ++var11) { + var12 = var0.readInt(); + var10[var11] = new byte[var12]; + var0.readBytes(var10[var11], 0, var12); + } + } + + var2.operations[var3] = var4; + Class[] var21 = new Class[var7]; + + for (var12 = 0; var12 < var7; ++var12) { + var21[var12] = class18.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = class18.loadClassFromDescriptor(var20); + if (class18.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + Method[] var13 = class18.loadClassFromDescriptor(var5).getDeclaredMethods(); + Method[] var14 = var13; + + for (int var15 = 0; var15 < var14.length; ++var15) { + Method var16 = var14[var15]; + if (Reflection.getMethodName(var16).equals(var6)) { + Class[] var17 = Reflection.getParameterTypes(var16); + if (var21.length == var17.length) { + boolean var18 = true; + + for (int var19 = 0; var19 < var21.length; ++var19) { + if (var17[var19] != var21[var19]) { + var18 = false; + break; + } + } + + if (var18 && var22 == var16.getReturnType()) { + var2.methods[var3] = var16; + } + } + } + } + + var2.arguments[var3] = var10; + } + } else { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = 0; + if (var4 == 1) { + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; + var2.intReplaceValues[var3] = var7; + if (class18.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + var2.field156[var3] = Reflection.findField(class18.loadClassFromDescriptor(var5), var6); + } + } catch (ClassNotFoundException var24) { + var2.creationErrors[var3] = -1; + } catch (SecurityException var25) { + var2.creationErrors[var3] = -2; + } catch (NullPointerException var26) { + var2.creationErrors[var3] = -3; + } catch (Exception var27) { + var2.creationErrors[var3] = -4; + } catch (Throwable var28) { + var2.creationErrors[var3] = -5; + } + } + + class36.reflectionChecks.addFirst(var2); + } + + @ObfuscatedName("my") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "(II)V", + garbageValue = "1825300957" ) - Archive field3528; - @ObfuscatedName("ae") - int field3527; - @ObfuscatedName("ao") - byte field3526; + static final void method1901(int var0) { + if (class33.field89.method1742(var0)) { + Widget[] var1 = class33.field89.Widget_interfaceComponents[var0]; + + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3 != null) { + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + } + } - class357() { + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class358.java b/osrs/src/main/java/class358.java new file mode 100644 index 000000000..c02dab5f3 --- /dev/null +++ b/osrs/src/main/java/class358.java @@ -0,0 +1,18 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nr") +public final class class358 { + @ObfuscatedName("ge") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field3177; + @ObfuscatedName("th") + @ObfuscatedSignature( + descriptor = "Lrl;" + ) + @Export("friendsChat") + static FriendsChat friendsChat; +} \ No newline at end of file diff --git a/osrs/src/main/java/class359.java b/osrs/src/main/java/class359.java new file mode 100644 index 000000000..fa1859f99 --- /dev/null +++ b/osrs/src/main/java/class359.java @@ -0,0 +1,8 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ne") +public class class359 { + static { + Math.sqrt(8192.0D); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class36.java b/osrs/src/main/java/class36.java index 6ee2d3e52..e3e249cb6 100644 --- a/osrs/src/main/java/class36.java +++ b/osrs/src/main/java/class36.java @@ -2,46 +2,90 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bp") public class class36 { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Loc;" + descriptor = "Lpy;" ) @Export("reflectionChecks") public static IterableNodeDeque reflectionChecks; - @ObfuscatedName("aj") - @Export("userHomeDirectory") - static String userHomeDirectory; + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "[Lun;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; static { reflectionChecks = new IterableNodeDeque(); } - @ObfuscatedName("lj") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "16" + descriptor = "(II)I", + garbageValue = "1924526365" ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (ModeWhere.loadInterface(var0)) { - class162.field1420 = null; - class135.drawInterface(PacketBufferNode.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (class162.field1420 != null) { - class135.drawInterface(class162.field1420, -1412584499, var1, var2, var3, var4, class134.field1294, class326.field2893, var7); - class162.field1420 = null; - } + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var1 = Messages.method638(var0); + int var2 = var1.baseVar; + int var3 = var1.startBit; + int var4 = var1.endBit; + int var5 = Varps.Varps_masks[var4 - var3]; + return Varps.Varps_main[var2] >> var3 & var5; + } + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Lif;", + garbageValue = "1398442265" + ) + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - if (var7 != -1) { - Client.field407[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field407[var8] = true; - } + byte[] var2 = class295.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "1831211968" + ) + public static int method182(CharSequence var0) { + return class230.method1184(var0, 10, true); + } + + @ObfuscatedName("ne") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1735203823" + ) + static final void method183(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method868()) { + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + if (var2.rank == -1) { + PacketBufferNode var3 = ClanChannelMember.getPacketBufferNode(ClientPacket.f83, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(3 + class478.stringCp1252NullTerminatedByteSize(var2.username.getName())); + var3.packetBuffer.writeByte(var0); + var3.packetBuffer.writeShort(var1); + var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); + Client.packetWriter.addNode(var3); + } + } } } } \ No newline at end of file diff --git a/osrs/src/main/java/class360.java b/osrs/src/main/java/class360.java new file mode 100644 index 000000000..7d7100695 --- /dev/null +++ b/osrs/src/main/java/class360.java @@ -0,0 +1,76 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nq") +public class class360 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lnq;" + ) + static final class360 field3179; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lnq;" + ) + static final class360 field3180; + @ObfuscatedName("ak") + final int field3181; + @ObfuscatedName("ax") + final int field3182; + + static { + field3179 = new class360(51, 27, 800, 0, 16, 16); + field3180 = new class360(25, 28, 800, 656, 40, 40); + } + + class360(int var1, int var2, int var3, int var4, int var5, int var6) { + this.field3181 = var5; + this.field3182 = var6; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1417914088" + ) + public static int method1902(int var0) { + return var0 != 0 && var0 != 1 ? -1 : 0; + } + + @ObfuscatedName("lx") + @ObfuscatedSignature( + descriptor = "([Lnm;IIIZB)V", + garbageValue = "50" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { + Widget var6 = var0[var5]; + if (var6 != null && var6.parentId == var1) { + class140.alignWidgetSize(var6, var2, var3, var4); + Username.alignWidgetPosition(var6, var2, var3); + if (var6.scrollX > var6.scrollWidth - var6.width) { + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { + var6.scrollY = 0; + } + + if (var6.type == 0) { + PendingSpawn.revalidateWidgetScroll(var0, var6, var4); + } + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class363.java b/osrs/src/main/java/class363.java new file mode 100644 index 000000000..124e11fc6 --- /dev/null +++ b/osrs/src/main/java/class363.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("nf") +public class class363 { + @ObfuscatedName("gr") + @Export("js5Port") + static int js5Port; +} \ No newline at end of file diff --git a/osrs/src/main/java/class364.java b/osrs/src/main/java/class364.java new file mode 100644 index 000000000..e4b7949be --- /dev/null +++ b/osrs/src/main/java/class364.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oh") +public class class364 { + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lun;" + ) + static IndexedSprite field3198; +} \ No newline at end of file diff --git a/osrs/src/main/java/class365.java b/osrs/src/main/java/class365.java new file mode 100644 index 000000000..757256a44 --- /dev/null +++ b/osrs/src/main/java/class365.java @@ -0,0 +1,29 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("of") +public class class365 { + @ObfuscatedName("jt") + static int field3199; + @ObfuscatedName("la") + @Export("cameraPitch") + static int cameraPitch; + + static { + int var0 = 0; + int var1 = 0; + class360[] var2 = class30.method121(); + + for (int var3 = 0; var3 < var2.length; ++var3) { + class360 var4 = var2[var3]; + if (var4.field3181 > var0) { + var0 = var4.field3181; + } + + if (var4.field3182 > var1) { + var1 = var4.field3182; + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class367.java b/osrs/src/main/java/class367.java new file mode 100644 index 000000000..a15387019 --- /dev/null +++ b/osrs/src/main/java/class367.java @@ -0,0 +1,545 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("os") +public enum class367 implements class386 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Los;" + ) + field3512(-1), + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Los;" + ) + field3514(0), + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Los;" + ) + field3513(1), + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Los;" + ) + field3515(2); + + @ObfuscatedName("ao") + final int field3516; + + class367(int var3) { + this.field3516 = var3; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1243971674" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3516; + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(Lpu;Lpu;Lpu;I)V", + garbageValue = "-266598843" + ) + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (class340.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class379.loginBoxCenter = Login.loginBoxX + 180; + if (Login.worldSelectOpen) { + ArchiveDiskActionHandler.method1914(var0, var1); + } else { + PcmPlayer.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + int var4; + if (Client.gameState == 0 || Client.gameState == 5) { + byte var3 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); + var4 = 253 - var3; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); + } + + String var6; + String var7; + String var8; + String var9; + short var23; + int var24; + short var25; + if (Client.gameState == 20) { + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); + var23 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var24 += 7; + if (Login.loginIndex != 4 && Login.loginIndex != 10) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var24, 16777215, 0); + var25 = 200; + if (class91.clientPreferences.getIsUsernameHidden()) { + var8 = Login.Login_username; + var7 = class92.method486('*', var8.length()); + var6 = var7; + } else { + var6 = Login.Login_username; + } + + for (var6 = var6; var0.stringWidth(var6) > var25; var6 = var6.substring(0, var6.length() - 1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var24, 16777215, 0); + var24 += 15; + var8 = Login.Login_password; + var7 = class92.method486('*', var8.length()); + + for (var9 = var7; var0.stringWidth(var9) > var25; var9 = var9.substring(1)) { + } + + var0.draw("Password: " + var9, Login.loginBoxX + 180 - 108, var24, 16777215, 0); + var24 += 15; + } + } + + if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var14; + if (Login.loginIndex == 0) { + var23 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 30; + var4 = Login.loginBoxX + 180 - 80; + var14 = 291; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawLines("New User", var4 - 73, var14 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var4 = Login.loginBoxX + 180 + 80; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawLines("Existing User", var4 - 73, var14 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var23 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var14 = 321; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Continue", var4, var14 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Cancel", var4, var14 + 5, 16777215, 0); + } else if (Login.loginIndex == 2) { + var23 = 201; + var0.drawCentered(Login.Login_response1, class379.loginBoxCenter, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, class379.loginBoxCenter, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, class379.loginBoxCenter, var24, 16776960, 0); + var24 += 15; + var24 += 7; + var0.draw("Login: ", class379.loginBoxCenter - 110, var24, 16777215, 0); + var25 = 200; + if (class91.clientPreferences.getIsUsernameHidden()) { + var8 = Login.Login_username; + var7 = class92.method486('*', var8.length()); + var6 = var7; + } else { + var6 = Login.Login_username; + } + + for (var6 = var6; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), class379.loginBoxCenter - 70, var24, 16777215, 0); + var24 += 15; + var8 = Login.Login_password; + var7 = class92.method486('*', var8.length()); + + for (var9 = var7; var0.stringWidth(var9) > var25; var9 = var9.substring(1)) { + } + + var0.draw("Password: " + var9 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), class379.loginBoxCenter - 108, var24, 16777215, 0); + var24 += 15; + var23 = 277; + int var10 = class379.loginBoxCenter + -117; + IndexedSprite var11 = ClanSettings.method828(Client.Login_isUsernameRemembered, Login.field742); + var11.drawAt(var10, var23); + var10 = var10 + var11.subWidth + 5; + var1.draw("Remember username", var10, var23 + 13, 16776960, 0); + var10 = class379.loginBoxCenter + 24; + var11 = ClanSettings.method828(class91.clientPreferences.getIsUsernameHidden(), Login.field743); + var11.drawAt(var10, var23); + var10 = var10 + var11.subWidth + 5; + var1.draw("Hide username", var10, var23 + 13, 16776960, 0); + var24 = var23 + 15; + int var12 = class379.loginBoxCenter - 80; + short var13 = 321; + VarcInt.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); + var0.drawCentered("Login", var12, var13 + 5, 16777215, 0); + var12 = class379.loginBoxCenter + 80; + VarcInt.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); + var0.drawCentered("Cancel", var12, var13 + 5, 16777215, 0); + var23 = 357; + switch(Login.field749) { + case 2: + class16.field47 = "Having trouble logging in?"; + break; + default: + class16.field47 = "Can't login? Click here."; + } + + class481.field3945 = new Bounds(class379.loginBoxCenter, var23, var1.stringWidth(class16.field47), 11); + Message.field349 = new Bounds(class379.loginBoxCenter, var23, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(class16.field47, class379.loginBoxCenter, var23, 16777215, 0); + } else if (Login.loginIndex == 3) { + var23 = 201; + var0.drawCentered("Incorrect username or password.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 20; + var1.drawCentered("If you have upgraded to a Jagex Account, you", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 20; + var1.drawCentered("need to log in using the Jagex Launcher instead.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var14 = 276; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var2.drawCentered("Try again", var4, var14 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var14 = 326; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var2.drawCentered("Forgotten password?", var4, var14 + 5, 16777215, 0); + } else { + String var5; + if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var23 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var5 = "PIN: "; + var7 = class186.otp; + var6 = class92.method486('*', var7.length()); + var0.draw(var5 + var6 + (Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var24, 16777215, 0); + var24 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var24, 16776960, 0); + var24 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var24, 16776960, 0); + int var16 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; + int var17 = var24 - var0.ascent; + IndexedSprite var18; + if (Login.field741) { + var18 = class534.options_buttons_2Sprite; + } else { + var18 = class519.options_buttons_0Sprite; + } + + var18.drawAt(var16, var17); + var24 += 15; + int var19 = Login.loginBoxX + 180 - 80; + short var26 = 321; + VarcInt.titlebuttonSprite.drawAt(var19 - 73, var26 - 20); + var0.drawCentered("Continue", var19, var26 + 5, 16777215, 0); + var19 = Login.loginBoxX + 180 + 80; + VarcInt.titlebuttonSprite.drawAt(var19 - 73, var26 - 20); + var0.drawCentered("Cancel", var19, var26 + 5, 16777215, 0); + var1.drawCentered("Can't login? Click here.", Login.loginBoxX + 180, var26 + 36, 16777215, 0); + } else { + int var20; + short var28; + if (Login.loginIndex == 5) { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var23 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var24 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var24, 16777215, 0); + var25 = 174; + if (class91.clientPreferences.getIsUsernameHidden()) { + var8 = Login.Login_username; + var7 = class92.method486('*', var8.length()); + var6 = var7; + } else { + var6 = Login.Login_username; + } + + for (var6 = var6; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var24, 16777215, 0); + var24 += 15; + var20 = Login.loginBoxX + 180 - 80; + var28 = 321; + VarcInt.titlebuttonSprite.drawAt(var20 - 73, var28 - 20); + var0.drawCentered("Recover", var20, var28 + 5, 16777215, 0); + var20 = Login.loginBoxX + 180 + 80; + VarcInt.titlebuttonSprite.drawAt(var20 - 73, var28 - 20); + var0.drawCentered("Back", var20, var28 + 5, 16777215, 0); + var28 = 356; + var1.drawCentered("Still having trouble logging in?", class379.loginBoxCenter, var28, 268435455, 0); + } else if (Login.loginIndex == 6) { + var23 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var14 = 321; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Back", var4, var14 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + if (MusicPatchNode2.field2778 && !Client.onMobile) { + var23 = 201; + var0.drawCentered(Login.Login_response1, class379.loginBoxCenter, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, class379.loginBoxCenter, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, class379.loginBoxCenter, var24, 16776960, 0); + var4 = class379.loginBoxCenter - 150; + var24 += 10; + + int var27; + for (var27 = 0; var27 < 8; ++var27) { + VarcInt.titlebuttonSprite.method2693(var4, var24, 30, 40); + boolean var21 = var27 == Login.field751 & Client.cycle % 40 < 20; + var0.draw((Login.field766[var27] == null ? "" : Login.field766[var27]) + (var21 ? Client.colorStartTag(16776960) + "|" : ""), var4 + 10, var24 + 27, 16777215, 0); + if (var27 != 1 && var27 != 3) { + var4 += 35; + } else { + var4 += 50; + var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var24 + 27, 16777215, 0); + } + } + + var27 = class379.loginBoxCenter - 80; + short var30 = 321; + VarcInt.titlebuttonSprite.drawAt(var27 - 73, var30 - 20); + var0.drawCentered("Submit", var27, var30 + 5, 16777215, 0); + var27 = class379.loginBoxCenter + 80; + VarcInt.titlebuttonSprite.drawAt(var27 - 73, var30 - 20); + var0.drawCentered("Cancel", var27, var30 + 5, 16777215, 0); + } else { + var23 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var14 = 321; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Set Date of Birth", var4, var14 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Back", var4, var14 + 5, 16777215, 0); + } + } else if (Login.loginIndex == 8) { + var23 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var14 = 321; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Privacy Policy", var4, var14 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Back", var4, var14 + 5, 16777215, 0); + } else if (Login.loginIndex == 9) { + var23 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 25; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 25; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var4 = Login.loginBoxX + 180; + var14 = 311; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Try again", var4, var14 + 5, 16777215, 0); + } else if (Login.loginIndex == 10) { + var24 = Login.loginBoxX + 180; + var25 = 209; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var25, 16776960, 0); + var4 = var25 + 20; + Login.field775.drawAt(var24 - 109, var4); + if (Login.field761.isEmpty()) { + class364.field3198.drawAt(var24 - 48, var4 + 18); + } else { + class364.field3198.drawAt(var24 - 48, var4 + 5); + var0.drawCentered(Login.field761, var24, var4 + 68 - 15, 16776960, 0); + } + } else if (Login.loginIndex == 12) { + var24 = class379.loginBoxCenter; + var25 = 216; + var2.drawCentered("Before using this app, please read and accept our", var24, var25, 16777215, 0); + var4 = var25 + 17; + var2.drawCentered("terms of use, privacy policy, and end user licence", var24, var4, 16777215, 0); + var4 += 17; + var2.drawCentered("agreement (EULA).", var24, var4, 16777215, 0); + var4 += 17; + var2.drawCentered("By accepting, you agree to these documents.", var24, var4, 16777215, 0); + var24 = class379.loginBoxCenter - 80; + var25 = 311; + VarcInt.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); + var0.drawCentered("Accept", var24, var25 + 5, 16777215, 0); + var24 = class379.loginBoxCenter + 80; + VarcInt.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); + var0.drawCentered("Decline", var24, var25 + 5, 16777215, 0); + } else if (Login.loginIndex == 13) { + var23 = 231; + var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 20; + var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var24, 16777215, 0); + var4 = Login.loginBoxX + 180; + var23 = 311; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 14) { + var23 = 201; + String var15 = ""; + var5 = ""; + var6 = ""; + switch(Login.field748) { + case 0: + var15 = "Your account has been involved"; + var5 = "in serious rule breaking."; + var6 = ""; + break; + case 1: + var15 = "Your account has been locked due to"; + var5 = "suspicious activity."; + var6 = "Please recover your account."; + break; + case 2: + var15 = "The unpaid balance on your account needs"; + var5 = "to be resolved before you can play."; + var6 = Strings.field3355; + break; + default: + class429.Login_promptCredentials(false); + } + + var0.drawCentered(var15, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 20; + var0.drawCentered(var5, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 20; + var0.drawCentered(var6, Login.loginBoxX + 180, var24, 16776960, 0); + var20 = Login.loginBoxX + 180; + var28 = 276; + VarcInt.titlebuttonSprite.drawAt(var20 - 73, var28 - 20); + if (Login.field748 == 1) { + var0.drawCentered("Recover Account", var20, var28 + 5, 16777215, 0); + } else { + var0.drawCentered("View Appeal Options", var20, var28 + 5, 16777215, 0); + } + + var20 = Login.loginBoxX + 180; + var28 = 326; + VarcInt.titlebuttonSprite.drawAt(var20 - 73, var28 - 20); + var0.drawCentered("Back", var20, var28 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var23 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var14 = 301; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Ok", var4, var14 + 5, 16777215, 0); + } else if (Login.loginIndex == 32) { + var23 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var14 = 321; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Set Date of Birth", var4, var14 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var0.drawCentered("Back", var4, var14 + 5, 16777215, 0); + } else if (Login.loginIndex == 33) { + var23 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 20; + var1.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 20; + var1.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var14 = 276; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var2.drawCentered("Download Launcher", var4, var14 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var14 = 326; + VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); + var2.drawCentered("Back", var4, var14 + 5, 16777215, 0); + } + } + } + } + + if (Client.gameState >= 10) { + int[] var22 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var22); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class491.canvasHeight); + class544.field4278.draw(Login.xPadding - 22, Client.cycle); + class544.field4278.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var22); + } + + Login.title_muteSprite[class91.clientPreferences.getTitleMusicDisabled() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && Language.Language_EN == WorldMapLabelSize.clientLanguage) { + if (Varcs.field1138 != null) { + var24 = Login.xPadding + 5; + var25 = 463; + byte var29 = 100; + byte var31 = 35; + Varcs.field1138.drawAt(var24, var25); + var0.drawCentered("World" + " " + Client.worldId, var29 / 2 + var24, var31 / 2 + var25 - 2, 16777215, 0); + if (class91.World_request != null) { + var1.drawCentered("Loading...", var29 / 2 + var24, var31 / 2 + var25 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var29 / 2 + var24, var31 / 2 + var25 + 12, 16777215, 0); + } + } else { + Varcs.field1138 = class167.SpriteBuffer_getIndexedSpriteByName(class199.archive8, "sl_button", ""); + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class369.java b/osrs/src/main/java/class369.java deleted file mode 100644 index c6621cd90..000000000 --- a/osrs/src/main/java/class369.java +++ /dev/null @@ -1,231 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.HashMap; - -@ObfuscatedName("od") -public class class369 { - @ObfuscatedName("ck") - @Export("otp") - static String otp; - @ObfuscatedName("au") - @Export("spriteMap") - final HashMap spriteMap; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lrb;" - ) - @Export("bounds") - Bounds bounds; - @ObfuscatedName("ao") - int[] field3590; - @ObfuscatedName("at") - int[] field3591; - @ObfuscatedName("ac") - int field3589; - - public class369() { - this.spriteMap = new HashMap(); - this.bounds = new Bounds(0, 0); - this.field3590 = new int[2048]; - this.field3591 = new int[2048]; - this.field3589 = 0; - ArchiveDiskActionHandler.method1884(); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "915989256" - ) - void method1961(int var1) { - int var2 = var1 * 2 + 1; - double[] var3 = Clock.method930(0.0D, (double)((float)var1 / 3.0F), var1); - double var4 = var3[var1] * var3[var1]; - int[] var6 = new int[var2 * var2]; - boolean var7 = false; - - for (int var8 = 0; var8 < var2; ++var8) { - for (int var9 = 0; var9 < var2; ++var9) { - int var10 = var6[var9 + var8 * var2] = (int)(256.0D * (var3[var8] * var3[var9] / var4)); - if (!var7 && var10 > 0) { - var7 = true; - } - } - } - - SpritePixels var11 = new SpritePixels(var6, var2, var2); - this.spriteMap.put(var1, var11); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IB)Lui;", - garbageValue = "63" - ) - SpritePixels method1962(int var1) { - if (!this.spriteMap.containsKey(var1)) { - this.method1961(var1); - } - - return (SpritePixels)this.spriteMap.get(var1); - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1621400552" - ) - public final void method1963(int var1, int var2) { - if (this.field3589 < this.field3590.length) { - this.field3590[this.field3589] = var1; - this.field3591[this.field3589] = var2; - ++this.field3589; - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1492834453" - ) - public final void method1964() { - this.field3589 = 0; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(IILui;FI)V", - garbageValue = "435818307" - ) - public final void method1965(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(var4 * 18.0F); - SpritePixels var6 = this.method1962(var5); - int var7 = var5 * 2 + 1; - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); - Bounds var9 = new Bounds(0, 0); - this.bounds.setHigh(var7, var7); - System.nanoTime(); - - int var10; - int var11; - int var12; - for (var10 = 0; var10 < this.field3589; ++var10) { - var11 = this.field3590[var10]; - var12 = this.field3591[var10]; - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; - this.bounds.setLow(var13, var14); - this.bounds.method2285(var8, var9); - this.method1966(var6, var3, var9); - } - - System.nanoTime(); - System.nanoTime(); - - for (var10 = 0; var10 < var3.pixels.length; ++var10) { - if (var3.pixels[var10] == 0) { - var3.pixels[var10] = -16777216; - } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; - if (var11 <= 0) { - var3.pixels[var10] = -16777216; - } else { - if (var11 > ItemComposition.field1768.length) { - var11 = ItemComposition.field1768.length; - } - - var12 = ItemComposition.field1768[var11 - 1]; - var3.pixels[var10] = -16777216 | var12; - } - } - } - - System.nanoTime(); - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Lui;Lui;Lrb;I)V", - garbageValue = "-1016036720" - ) - void method1966(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { - int var4 = 0; - int var5 = 0; - if (var3.lowX == 0) { - var4 = var1.subWidth - var3.highX; - } - - if (var3.lowY == 0) { - var5 = var1.subHeight - var3.highY; - } - - int var6 = var4 + var5 * var1.subWidth; - int var7 = var2.subWidth * var3.lowY + var3.lowX; - - for (int var8 = 0; var8 < var3.highY; ++var8) { - for (int var9 = 0; var9 < var3.highX; ++var9) { - int[] var10000 = var2.pixels; - int var10001 = var7++; - var10000[var10001] += var1.pixels[var6++]; - } - - var6 += var1.subWidth - var3.highX; - var7 += var2.subWidth - var3.highX; - } - - } - } - - @ObfuscatedName("mh") - @ObfuscatedSignature( - descriptor = "(Lmi;IIZI)V", - garbageValue = "1138527751" - ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; - int var5 = var0.height; - if (var0.widthAlignment == 0) { - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { - var0.width = var0.rawWidth * var1 >> 14; - } - - if (var0.heightAlignment == 0) { - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; - } - - if (var0.widthAlignment == 4) { - var0.width = var0.field3006 * var0.height / var0.field3011; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.width * var0.field3011 / var0.field3006; - } - - if (var0.contentType == 1337) { - Client.viewportWidget = var0; - } - - if (var0.type == 12) { - var0.method1844().method1736(var0.width, var0.height); - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args = var0.onResize; - Client.scriptEvents.addFirst(var6); - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class370.java b/osrs/src/main/java/class370.java deleted file mode 100644 index eea13349e..000000000 --- a/osrs/src/main/java/class370.java +++ /dev/null @@ -1,291 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("og") -public class class370 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Log;" - ) - static final class370 field3598; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Log;" - ) - static final class370 field3595; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Log;" - ) - static final class370 field3596; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Log;" - ) - static final class370 field3597; - @ObfuscatedName("br") - @Export("hasFocus") - protected static boolean hasFocus; - - static { - field3598 = new class370(); - field3595 = new class370(); - field3596 = new class370(); - field3597 = new class370(); - } - - class370() { - } - - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2133764143" - ) - static final void method1968() { - class108.method621(false); - Client.field452 = 0; - boolean var0 = true; - - int var1; - for (var1 = 0; var1 < UserComparator5.regionLandArchives.length; ++var1) { - if (class59.regionMapArchiveIds[var1] != -1 && UserComparator5.regionLandArchives[var1] == null) { - UserComparator5.regionLandArchives[var1] = class499.archive9.takeFile(class59.regionMapArchiveIds[var1], 0); - if (UserComparator5.regionLandArchives[var1] == null) { - var0 = false; - ++Client.field452; - } - } - - if (ObjTypeCustomisation.regionLandArchiveIds[var1] != -1 && class197.regionMapArchives[var1] == null) { - class197.regionMapArchives[var1] = class499.archive9.takeFileEncrypted(ObjTypeCustomisation.regionLandArchiveIds[var1], 0, RunException.xteaKeys[var1]); - if (class197.regionMapArchives[var1] == null) { - var0 = false; - ++Client.field452; - } - } - } - - if (!var0) { - Client.field456 = 1; - } else { - Client.field455 = 0; - var0 = true; - - int var3; - int var4; - for (var1 = 0; var1 < UserComparator5.regionLandArchives.length; ++var1) { - byte[] var2 = class197.regionMapArchives[var1]; - if (var2 != null) { - var3 = (class191.regions[var1] >> 8) * 64 - UrlRequester.baseX; - var4 = (class191.regions[var1] & 255) * 64 - class47.baseY; - if (Client.isInInstance) { - var3 = 10; - var4 = 10; - } - - var0 &= class142.method768(var2, var3, var4); - } - } - - if (!var0) { - Client.field456 = 2; - } else { - if (Client.field456 != 0) { - FadeInTask.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - class301.method1622(); - class130.scene.clear(); - - for (var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); - } - - int var15; - for (var1 = 0; var1 < 4; ++var1) { - for (var15 = 0; var15 < 104; ++var15) { - for (var3 = 0; var3 < 104; ++var3) { - Tiles.Tiles_renderFlags[var1][var15][var3] = 0; - } - } - } - - class301.method1622(); - Language.method1973(); - var1 = UserComparator5.regionLandArchives.length; - class388.method2029(); - class108.method621(true); - int var17; - if (!Client.isInInstance) { - byte[] var5; - for (var15 = 0; var15 < var1; ++var15) { - var3 = (class191.regions[var15] >> 8) * 64 - UrlRequester.baseX; - var4 = (class191.regions[var15] & 255) * 64 - class47.baseY; - var5 = UserComparator5.regionLandArchives[var15]; - if (var5 != null) { - class301.method1622(); - class261.method1500(var5, var3, var4, Tiles.timeOfPreviousKeyPress * 8 - 48, MouseRecorder.field873 * 8 - 48, Client.collisionMaps); - } - } - - for (var15 = 0; var15 < var1; ++var15) { - var3 = (class191.regions[var15] >> 8) * 64 - UrlRequester.baseX; - var4 = (class191.regions[var15] & 255) * 64 - class47.baseY; - var5 = UserComparator5.regionLandArchives[var15]; - if (var5 == null && MouseRecorder.field873 < 800) { - class301.method1622(); - class17.method49(var3, var4, 64, 64); - } - } - - class108.method621(true); - - for (var15 = 0; var15 < var1; ++var15) { - byte[] var16 = class197.regionMapArchives[var15]; - if (var16 != null) { - var4 = (class191.regions[var15] >> 8) * 64 - UrlRequester.baseX; - var17 = (class191.regions[var15] & 255) * 64 - class47.baseY; - class301.method1622(); - FriendsChat.method2206(var16, var4, var17, class130.scene, Client.collisionMaps); - } - } - } - - int var6; - int var7; - int var8; - if (Client.isInInstance) { - int var9; - int var10; - int var11; - for (var15 = 0; var15 < 4; ++var15) { - class301.method1622(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - boolean var19 = false; - var6 = Client.instanceChunkTemplates[var15][var3][var4]; - if (var6 != -1) { - var7 = var6 >> 24 & 3; - var8 = var6 >> 1 & 3; - var9 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var9 / 8 << 8) + var10 / 8; - - for (int var12 = 0; var12 < class191.regions.length; ++var12) { - if (class191.regions[var12] == var11 && UserComparator5.regionLandArchives[var12] != null) { - int var13 = (var9 - var3) * 8; - int var14 = (var10 - var4) * 8; - class132.method734(UserComparator5.regionLandArchives[var12], var15, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, var13, var14, Client.collisionMaps); - var19 = true; - break; - } - } - } - - if (!var19) { - class372.method1970(var15, var3 * 8, var4 * 8); - } - } - } - } - - for (var15 = 0; var15 < 13; ++var15) { - for (var3 = 0; var3 < 13; ++var3) { - var4 = Client.instanceChunkTemplates[0][var15][var3]; - if (var4 == -1) { - class17.method49(var15 * 8, var3 * 8, 8, 8); - } - } - } - - class108.method621(true); - - for (var15 = 0; var15 < 4; ++var15) { - class301.method1622(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - var17 = Client.instanceChunkTemplates[var15][var3][var4]; - if (var17 != -1) { - var6 = var17 >> 24 & 3; - var7 = var17 >> 1 & 3; - var8 = var17 >> 14 & 1023; - var9 = var17 >> 3 & 2047; - var10 = (var8 / 8 << 8) + var9 / 8; - - for (var11 = 0; var11 < class191.regions.length; ++var11) { - if (class191.regions[var11] == var10 && class197.regionMapArchives[var11] != null) { - Tiles.method459(class197.regionMapArchives[var11], var15, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, class130.scene, Client.collisionMaps); - break; - } - } - } - } - } - } - } - - class108.method621(true); - class301.method1622(); - class129.method717(class130.scene, Client.collisionMaps); - class108.method621(true); - var15 = Tiles.Tiles_minPlane; - if (var15 > HealthBar.Client_plane) { - var15 = HealthBar.Client_plane; - } - - if (var15 < HealthBar.Client_plane - 1) { - var15 = HealthBar.Client_plane - 1; - } - - if (Client.isLowDetail) { - class130.scene.init(Tiles.Tiles_minPlane); - } else { - class130.scene.init(0); - } - - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - class135.updateItemPile(var3, var4); - } - } - - class301.method1622(); - class165.method869(); - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var18; - if (class219.client.hasFrame()) { - var18 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.DETECT_MODIFIED_CLIENT, Client.packetWriter.isaacCipher); - var18.packetBuffer.writeInt(1057001181); - Client.packetWriter.addNode(var18); - } - - if (!Client.isInInstance) { - var3 = (Tiles.timeOfPreviousKeyPress - 6) / 8; - var4 = (Tiles.timeOfPreviousKeyPress + 6) / 8; - var17 = (MouseRecorder.field873 - 6) / 8; - var6 = (MouseRecorder.field873 + 6) / 8; - - for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { - for (var8 = var17 - 1; var8 <= var6 + 1; ++var8) { - if (var7 < var3 || var7 > var4 || var8 < var17 || var8 > var6) { - class499.archive9.loadRegionFromName("m" + var7 + "_" + var8); - class499.archive9.loadRegionFromName("l" + var7 + "_" + var8); - } - } - } - } - - MusicSong.updateGameState(30); - class301.method1622(); - ObjectSound.method414(); - var18 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.MAP_BUILD_COMPLETE, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var18); - PacketWriter.method645(); - } - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class371.java b/osrs/src/main/java/class371.java deleted file mode 100644 index 7bc13ad0a..000000000 --- a/osrs/src/main/java/class371.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ob") -public interface class371 { - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - int rsOrdinal(); -} \ No newline at end of file diff --git a/osrs/src/main/java/class372.java b/osrs/src/main/java/class372.java index ced4177a7..4ec0cae17 100644 --- a/osrs/src/main/java/class372.java +++ b/osrs/src/main/java/class372.java @@ -2,195 +2,73 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.HashMap; - -@ObfuscatedName("ok") -public class class372 { - @ObfuscatedName("wr") - @Export("foundItemIndex") - static int foundItemIndex; - - static { - new HashMap(); - } - - @ObfuscatedName("ai") +@ObfuscatedName("ou") +public class class372 extends DualNode { + @ObfuscatedName("ab") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("de") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1337034941" + descriptor = "Lun;" ) - static final void method1970(int var0, int var1, int var2) { - int var3; - for (var3 = 0; var3 < 8; ++var3) { - for (int var4 = 0; var4 < 8; ++var4) { - Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; - } - } - - if (var1 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; - } - } + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + Archive field3565; + @ObfuscatedName("al") + int field3564; + @ObfuscatedName("ak") + byte field3563; - if (var2 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; - } - } + class372() { + } - if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; - } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; - } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + @ObfuscatedName("al") + public static boolean method1929(long var0) { + boolean var2 = 0L != var0; + if (var2) { + boolean var3 = (int)(var0 >>> 16 & 1L) == 1; + var2 = !var3; } + return var2; } - @ObfuscatedName("bh") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "(ILdh;ZB)I", - garbageValue = "-1" + descriptor = "([BI)[B", + garbageValue = "-655297732" ) - static int method1971(int var0, Script var1, boolean var2) { - if (var0 == 3300) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.cycle; - return 1; - } else { - int var3; - int var4; - if (var0 == 3301) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class209.method1087(var3, var4); - return 1; - } else if (var0 == 3302) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = DynamicObject.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == 3303) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class212.method1099(var3, var4); - return 1; - } else if (var0 == 3304) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = AbstractArchive.getInvDefinition(var3).size; - return 1; - } else if (var0 == 3305) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == 3306) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == 3307) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); + int var2 = var1.readUnsignedByte(); + int var3 = var1.readInt(); + if (var3 >= 0 && (AbstractArchive.maximumContainerSize == 0 || var3 <= AbstractArchive.maximumContainerSize)) { + if (var2 == 0) { + byte[] var4 = new byte[var3]; + var1.readBytes(var4, 0, var3); + return var4; } else { - int var5; - if (var0 == 3308) { - var3 = HealthBar.Client_plane; - var4 = (VarbitComposition.localPlayer.x >> 7) + UrlRequester.baseX; - var5 = (VarbitComposition.localPlayer.y >> 7) + class47.baseY; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == 3309) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == 3310) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == 3311) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == 3312) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == 3313) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class209.method1087(var3, var4); - return 1; - } else if (var0 == 3314) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = DynamicObject.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == 3315) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class212.method1099(var3, var4); - return 1; - } else if (var0 == 3316) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3317) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == 3318) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == 3321) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.runEnergy / 100; - return 1; - } else if (var0 == 3322) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == 3323) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 1; + int var6 = var1.readInt(); + if (var6 < 0 || AbstractArchive.maximumContainerSize != 0 && var6 > AbstractArchive.maximumContainerSize) { + throw new RuntimeException(); + } else { + byte[] var5 = new byte[var6]; + if (var2 == 1) { + BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; + AbstractArchive.gzipDecompressor.decompress(var1, var5); } - return 1; - } else if (var0 == 3324) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == 3325) { - SoundCache.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == 3326) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.lastMouseRecordX; - return 1; - } else if (var0 == 3327) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.lastMouseRecordY; - return 1; - } else if (var0 == 3331) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else { - return 2; + return var5; } } + } else { + throw new RuntimeException(); } } } \ No newline at end of file diff --git a/osrs/src/main/java/class379.java b/osrs/src/main/java/class379.java new file mode 100644 index 000000000..de3569f3b --- /dev/null +++ b/osrs/src/main/java/class379.java @@ -0,0 +1,24 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("op") +public class class379 { + @ObfuscatedName("az") + @Export("loginBoxCenter") + static int loginBoxCenter; + + @ObfuscatedName("ng") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-960191990" + ) + static void method1983(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { + if ((long)var0 == (var1.key >> 48 & 65535L)) { + var1.remove(); + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class383.java b/osrs/src/main/java/class383.java deleted file mode 100644 index be67d8647..000000000 --- a/osrs/src/main/java/class383.java +++ /dev/null @@ -1,24 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("oi") -public final class class383 { - @ObfuscatedName("oc") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1663230842" - ) - static void method2021() { - if (class390.field3656 != null) { - Client.field369 = Client.cycle; - class390.field3656.method1964(); - - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - class390.field3656.method1963((Client.players[var0].x >> 7) + UrlRequester.baseX, (Client.players[var0].y >> 7) + class47.baseY); - } - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class384.java b/osrs/src/main/java/class384.java index c04505e0f..dd36e25b7 100644 --- a/osrs/src/main/java/class384.java +++ b/osrs/src/main/java/class384.java @@ -2,40 +2,212 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oq") +import java.util.HashMap; + +@ObfuscatedName("ow") public class class384 { - @ObfuscatedName("au") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - @ObfuscatedName("ai") + @ObfuscatedName("am") + static int[] field3629; + @ObfuscatedName("ac") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lrx;" ) - @Export("ItemDefinition_archive") - public static AbstractArchive ItemDefinition_archive; + @Export("bounds") + Bounds bounds; + @ObfuscatedName("ak") + int[] field3631; + @ObfuscatedName("ax") + int[] field3632; + @ObfuscatedName("ao") + int field3630; + + public class384() { + this.spriteMap = new HashMap(); + this.bounds = new Bounds(0, 0); + this.field3631 = new int[2048]; + this.field3632 = new int[2048]; + this.field3630 = 0; + field3629 = new int[2000]; + int var1 = 0; + int var2 = 240; + + int var4; + for (byte var3 = 12; var1 < 16; var2 -= var3) { + var4 = class538.method2658((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + (float)var1 * 0.425F / 16.0F)); + field3629[var1] = var4; + ++var1; + } + + var2 = 48; + + for (int var6 = var2 / 6; var1 < field3629.length; var2 -= var6) { + var4 = var1 * 2; + + for (int var5 = class538.method2658((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < field3629.length; ++var1) { + field3629[var1] = var5; + } + } - static { - cp1252AsciiExtension = new char[]{'\u20ac', '\u0000', '\u201a', '\u0192', '\u201e', '\u2026', '\u2020', '\u2021', '\u02c6', '\u2030', '\u0160', '\u2039', '\u0152', '\u0000', '\u017d', '\u0000', '\u0000', '\u2018', '\u2019', '\u201c', '\u201d', '\u2022', '\u2013', '\u2014', '\u02dc', '\u2122', '\u0161', '\u203a', '\u0153', '\u0000', '\u017e', '\u0178'}; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)Lhb;", - garbageValue = "1314651935" + descriptor = "(II)V", + garbageValue = "1432707829" ) - public static VarbitComposition method2022(int var0) { - VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); - var1 = new VarbitComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + void method1995(int var1) { + int var2 = var1 * 2 + 1; + double var4 = (double)((float)var1 / 3.0F); + int var6 = var1 * 2 + 1; + double[] var7 = new double[var6]; + int var8 = -var1; + + for (int var9 = 0; var8 <= var1; ++var9) { + double var16 = (double)(var8 - 0) / var4; + double var14 = Math.exp(var16 * -var16 / 2.0D) / Math.sqrt(6.283185307179586D); + double var12 = var14 / var4; + var7[var9] = var12; + ++var8; + } + + double[] var18 = var7; + double var19 = var7[var1] * var7[var1]; + int[] var21 = new int[var2 * var2]; + boolean var22 = false; + + for (int var11 = 0; var11 < var2; ++var11) { + for (int var23 = 0; var23 < var2; ++var23) { + int var13 = var21[var23 + var11 * var2] = (int)(var18[var11] * var18[var23] / var19 * 256.0D); + if (!var22 && var13 > 0) { + var22 = true; + } + } + } + + SpritePixels var24 = new SpritePixels(var21, var2, var2); + this.spriteMap.put(var1, var24); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Lud;", + garbageValue = "297405994" + ) + SpritePixels method1996(int var1) { + if (!this.spriteMap.containsKey(var1)) { + this.method1995(var1); + } + + return (SpritePixels)this.spriteMap.get(var1); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-659509092" + ) + public final void method1997(int var1, int var2) { + if (this.field3630 < this.field3631.length) { + this.field3631[this.field3630] = var1; + this.field3632[this.field3630] = var2; + ++this.field3630; + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1095059460" + ) + public final void method1998() { + this.field3630 = 0; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IILud;FI)V", + garbageValue = "1259929010" + ) + public final void method1999(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(var4 * 18.0F); + SpritePixels var6 = this.method1996(var5); + int var7 = var5 * 2 + 1; + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); + Bounds var9 = new Bounds(0, 0); + this.bounds.setHigh(var7, var7); + System.nanoTime(); + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field3630; ++var10) { + var11 = this.field3631[var10]; + var12 = this.field3632[var10]; + int var13 = (int)(var4 * (float)(var11 - var1)) - var5; + int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; + this.bounds.setLow(var13, var14); + this.bounds.method2322(var8, var9); + this.method2000(var6, var3, var9); + } + + System.nanoTime(); + System.nanoTime(); + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { + if (var3.pixels[var10] == 0) { + var3.pixels[var10] = -16777216; + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; + if (var11 <= 0) { + var3.pixels[var10] = -16777216; + } else { + if (var11 > field3629.length) { + var11 = field3629.length; + } + + var12 = field3629[var11 - 1]; + var3.pixels[var10] = -16777216 | var12; + } + } + } + + System.nanoTime(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lud;Lud;Lrx;I)V", + garbageValue = "-493691057" + ) + void method2000(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { + int var4 = 0; + int var5 = 0; + if (var3.lowX == 0) { + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; + int var7 = var2.subWidth * var3.lowY + var3.lowX; + + for (int var8 = 0; var8 < var3.highY; ++var8) { + for (int var9 = 0; var9 < var3.highX; ++var9) { + int[] var10000 = var2.pixels; + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; + var7 += var2.subWidth - var3.highX; } - VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); - return var1; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class385.java b/osrs/src/main/java/class385.java index 82db62e12..67ecf3f07 100644 --- a/osrs/src/main/java/class385.java +++ b/osrs/src/main/java/class385.java @@ -1,143 +1,36 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ov") +@ObfuscatedName("oi") public class class385 { - @ObfuscatedName("au") - static char[] field3649; - @ObfuscatedName("ae") - static char[] field3647; - @ObfuscatedName("ao") - static char[] field3648; - @ObfuscatedName("at") - static int[] field3650; - @ObfuscatedName("fu") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Loi;" ) - @Export("archive6") - static Archive archive6; - - static { - field3649 = new char[64]; - - int var0; - for (var0 = 0; var0 < 26; ++var0) { - field3649[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3649[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3649[var0] = (char)(var0 + 48 - 52); - } - - field3649[62] = '+'; - field3649[63] = '/'; - field3647 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3647[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3647[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3647[var0] = (char)(var0 + 48 - 52); - } - - field3647[62] = '*'; - field3647[63] = '-'; - field3648 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3648[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3648[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3648[var0] = (char)(var0 + 48 - 52); - } - - field3648[62] = '-'; - field3648[63] = '_'; - field3650 = new int[128]; - - for (var0 = 0; var0 < field3650.length; ++var0) { - field3650[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { - field3650[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { - field3650[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { - field3650[var0] = var0 - 48 + 52; - } - - int[] var2 = field3650; - field3650[43] = 62; - var2[42] = 62; - int[] var1 = field3650; - field3650[47] = 63; - var1[45] = 63; - } - - @ObfuscatedName("ao") + static final class385 field3635; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "1294395846" + descriptor = "Loi;" ) - public static String method2023(CharSequence var0) { - String var1 = class211.base37DecodeLong(class134.method739(var0)); - if (var1 == null) { - var1 = ""; - } - - return var1; - } - - @ObfuscatedName("lg") + static final class385 field3637; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", - garbageValue = "12" + descriptor = "Loi;" ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - UserComparator8.insertMenuItem(var0, var1, var2, var3, var4, var5, -1, false); - } - - @ObfuscatedName("mw") + static final class385 field3636; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "189486485" + descriptor = "Loi;" ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (ModeWhere.loadInterface(var0)) { - class212.runComponentCloseListeners(PacketBufferNode.Widget_interfaceComponents[var0], var1); - } + static final class385 field3638; + + static { + field3635 = new class385(); + field3637 = new class385(); + field3636 = new class385(); + field3638 = new class385(); } - @ObfuscatedName("nl") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-85" - ) - static final void method2026(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - class449.clientPreferences.setCurrentSoundEffectVolume(var0); + class385() { } } \ No newline at end of file diff --git a/osrs/src/main/java/class386.java b/osrs/src/main/java/class386.java index f201378ff..cf9a6ffd6 100644 --- a/osrs/src/main/java/class386.java +++ b/osrs/src/main/java/class386.java @@ -1,33 +1,14 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.regex.Pattern; - - -@ObfuscatedName("op") -public final class class386 { - static { - Pattern.compile("^\\D*(\\d+)\\D*$"); - } - - @ObfuscatedName("no") +@ObfuscatedName("on") +public interface class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "289831668" + descriptor = "(I)I", + garbageValue = "-1243971674" ) - static final void method2027(int var0, int var1) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method859()) { - ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - if (var2.rank == -1) { - PacketBufferNode var3 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(3 + AbstractSocket.stringCp1252NullTerminatedByteSize(var2.username.getName())); - var3.packetBuffer.writeByte(var0); - var3.packetBuffer.writeShort(var1); - var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); - Client.packetWriter.addNode(var3); - } - } - } - } + @Export("rsOrdinal") + int rsOrdinal(); } \ No newline at end of file diff --git a/osrs/src/main/java/class387.java b/osrs/src/main/java/class387.java index 6c99c84c6..f8ad9978f 100644 --- a/osrs/src/main/java/class387.java +++ b/osrs/src/main/java/class387.java @@ -1,159 +1,10 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("or") -public class class387 { - @ObfuscatedName("gw") - @ObfuscatedSignature( - descriptor = "Lrr;" - ) - static GraphicsDefaults field3652; - - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - int var1 = class466.method2350(); - if (var0 == -3) { - class318.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - class318.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - class318.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - PcmPlayer.method212(3); - Login.field751 = 1; - } else if (var0 == 4) { - PcmPlayer.method212(14); - Login.field750 = 0; - } else if (var0 == 5) { - Login.field751 = 2; - class318.setLoginResponseString("Either your account is still logged in, or the last", "world you were using has become unavailable.", "Please try again later."); - } else if (var0 == 68) { - if (!Client.reloadJS5) { - Client.reloadJS5 = true; - class415.reloadJS5(); - return; - } - - class318.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (!Client.onMobile && var0 == 6) { - class318.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - class318.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - class318.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - class318.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - class318.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - class318.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - class318.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - class318.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - class318.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - class318.setLoginResponseString("Too many login attempts.", "You can use the Jagex Launcher to continue playing.", "Press the button below to download it now."); - PcmPlayer.method212(33); - } else if (var0 == 17) { - class318.setLoginResponseString("To access this free world, log into a", "members world and move your character", "to a non-members area."); - } else if (var0 == 18) { - PcmPlayer.method212(14); - Login.field750 = 1; - } else if (var0 == 19) { - class318.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - class318.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - class318.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - class318.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - class318.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - class318.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - class318.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - class318.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - class318.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); - } else if (var0 == 32) { - PcmPlayer.method212(14); - Login.field750 = 2; - } else if (var0 == 37) { - class318.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - class318.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { - PcmPlayer.method212(8); - } else { - if (var0 == 56) { - class318.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - MusicSong.updateGameState(11); - return; - } - - if (var0 == 57) { - class318.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - MusicSong.updateGameState(11); - return; - } - - if (var0 == 61) { - class318.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); - PcmPlayer.method212(7); - } else { - if (var0 == 62) { - MusicSong.updateGameState(10); - PcmPlayer.method212(9); - class318.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); - return; - } - - if (var0 == 63) { - MusicSong.updateGameState(10); - PcmPlayer.method212(9); - class318.setLoginResponseString("You were signed out.", "Please sign in again.", ""); - return; - } - - if (var0 == 65 || var0 == 67) { - MusicSong.updateGameState(10); - PcmPlayer.method212(9); - class318.setLoginResponseString("Failed to login.", "Please try again.", ""); - return; - } - - if (var0 == 71) { - MusicSong.updateGameState(10); - PcmPlayer.method212(7); - class318.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); - } else if (var0 == 73) { - MusicSong.updateGameState(10); - PcmPlayer.method212(6); - class318.setLoginResponseString("Your date of birth information is waiting", "to be reviewed by our staff.", "It will be processed shortly."); - } else if (var0 == 72) { - MusicSong.updateGameState(10); - PcmPlayer.method212(32); - } else { - class318.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); - } - } - } - - MusicSong.updateGameState(10); - boolean var2 = var1 != class466.method2350(); - if (!var2 && Client.field648.method2616()) { - PcmPlayer.method212(9); - } +import java.util.HashMap; +@ObfuscatedName("ot") +public class class387 { + static { + new HashMap(); } } \ No newline at end of file diff --git a/osrs/src/main/java/class388.java b/osrs/src/main/java/class388.java deleted file mode 100644 index f32f6f6f7..000000000 --- a/osrs/src/main/java/class388.java +++ /dev/null @@ -1,48 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("oo") -public final class class388 { - @ObfuscatedName("au") - @Export("base37Table") - public static final char[] base37Table; - @ObfuscatedName("ae") - static long[] field3654; - @ObfuscatedName("fk") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - static Archive field3655; - - static { - base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; - field3654 = new long[12]; - - for (int var0 = 0; var0 < field3654.length; ++var0) { - field3654[var0] = (long)Math.pow(37.0D, (double)var0); - } - - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-27" - ) - static void method2029() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.stream1 != null) { - class162.pcmStreamMixer.removeSubStream(var0.stream1); - var0.stream1 = null; - } - - if (var0.stream2 != null) { - class162.pcmStreamMixer.removeSubStream(var0.stream2); - var0.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class390.java b/osrs/src/main/java/class390.java deleted file mode 100644 index d4b2a5968..000000000 --- a/osrs/src/main/java/class390.java +++ /dev/null @@ -1,36 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ps") -public final class class390 { - @ObfuscatedName("wq") - @ObfuscatedSignature( - descriptor = "Lod;" - ) - public static class369 field3656; - @ObfuscatedName("au") - final Object field3658; - @ObfuscatedName("ae") - int field3657; - - class390(Object var1, int var2) { - this.field3658 = var1; - this.field3657 = var2; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lmi;I)I", - garbageValue = "-490718469" - ) - static int method2030(Widget var0) { - if (var0.type != 11) { - Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize - 1] = ""; - return 1; - } else { - String var1 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = var0.method1836(var1); - return 1; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class391.java b/osrs/src/main/java/class391.java deleted file mode 100644 index 872a63645..000000000 --- a/osrs/src/main/java/class391.java +++ /dev/null @@ -1,55 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.ConcurrentModificationException; -import java.util.Iterator; -import java.util.NoSuchElementException; - -@ObfuscatedName("pr") -public class class391 implements Iterator { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - class392 field3661; - @ObfuscatedName("ae") - int field3659; - @ObfuscatedName("ao") - int field3660; - - @ObfuscatedSignature( - descriptor = "(Lpa;)V" - ) - class391(class392 var1) { - this.field3659 = 0; - this.field3660 = this.field3661.field3663; - this.field3661 = var1; - } - - @Export("hasNext") - @ObfuscatedName("hasNext") - public boolean hasNext() { - return this.field3659 < this.field3661.field3664; - } - - @Export("next") - @ObfuscatedName("next") - public Object next() { - if (this.field3661.field3663 != this.field3660) { - throw new ConcurrentModificationException(); - } else if (this.field3659 < this.field3661.field3664) { - Object var1 = this.field3661.field3666[this.field3659].field3658; - ++this.field3659; - return var1; - } else { - throw new NoSuchElementException(); - } - } - - @Export("remove") - @ObfuscatedName("remove") - public void remove() { - throw new UnsupportedOperationException(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class392.java b/osrs/src/main/java/class392.java deleted file mode 100644 index c08179fe1..000000000 --- a/osrs/src/main/java/class392.java +++ /dev/null @@ -1,229 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.*; - -@ObfuscatedName("pa") -public class class392 extends AbstractQueue { - @ObfuscatedName("wh") - @ObfuscatedSignature( - descriptor = "Lno;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "[Lps;" - ) - class390[] field3666; - @ObfuscatedName("ae") - Map field3665; - @ObfuscatedName("ao") - int field3664; - @ObfuscatedName("at") - final Comparator field3667; - @ObfuscatedName("ac") - int field3663; - - public class392(int var1, Comparator var2) { - this.field3663 = 0; - this.field3666 = new class390[var1]; - this.field3665 = new HashMap(); - this.field3667 = var2; - } - - public class392(int var1) { - this(var1, (Comparator)null); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - void method2031() { - int var1 = (this.field3666.length << 1) + 1; - this.field3666 = (class390[])((class390[])Arrays.copyOf(this.field3666, var1)); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-119" - ) - void method2032(int var1) { - class390 var2; - int var3; - for (var2 = this.field3666[var1]; var1 > 0; var1 = var3) { - var3 = var1 - 1 >>> 1; - class390 var4 = this.field3666[var3]; - if (this.field3667 != null) { - if (this.field3667.compare(var2.field3658, var4.field3658) >= 0) { - break; - } - } else if (((Comparable)var2.field3658).compareTo(var4.field3658) >= 0) { - break; - } - - this.field3666[var1] = var4; - this.field3666[var1].field3657 = var1; - } - - this.field3666[var1] = var2; - this.field3666[var1].field3657 = var1; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-466589419" - ) - void method2033(int var1) { - class390 var2 = this.field3666[var1]; - - int var8; - for (int var3 = this.field3664 >>> 1; var1 < var3; var1 = var8) { - int var4 = (var1 << 1) + 1; - class390 var5 = this.field3666[var4]; - int var6 = (var1 << 1) + 2; - class390 var7 = this.field3666[var6]; - if (this.field3667 != null) { - if (var6 < this.field3664 && this.field3667.compare(var5.field3658, var7.field3658) > 0) { - var8 = var6; - } else { - var8 = var4; - } - } else if (var6 < this.field3664 && ((Comparable)var5.field3658).compareTo(var7.field3658) > 0) { - var8 = var6; - } else { - var8 = var4; - } - - if (this.field3667 != null) { - if (this.field3667.compare(var2.field3658, this.field3666[var8].field3658) <= 0) { - break; - } - } else if (((Comparable)var2.field3658).compareTo(this.field3666[var8].field3658) <= 0) { - break; - } - - this.field3666[var1] = this.field3666[var8]; - this.field3666[var1].field3657 = var1; - } - - this.field3666[var1] = var2; - this.field3666[var1].field3657 = var1; - } - - @Export("remove") - @ObfuscatedName("remove") - public boolean remove(Object var1) { - class390 var2 = (class390)this.field3665.remove(var1); - if (var2 == null) { - return false; - } else { - ++this.field3663; - --this.field3664; - if (this.field3664 == var2.field3657) { - this.field3666[this.field3664] = null; - return true; - } else { - class390 var3 = this.field3666[this.field3664]; - this.field3666[this.field3664] = null; - this.field3666[var2.field3657] = var3; - this.field3666[var2.field3657].field3657 = var2.field3657; - this.method2033(var2.field3657); - if (var3 == this.field3666[var2.field3657]) { - this.method2032(var2.field3657); - } - - return true; - } - } - } - - @Export("peek") - @ObfuscatedName("peek") - public Object peek() { - return this.field3664 == 0 ? null : this.field3666[0].field3658; - } - - @Export("size") - @ObfuscatedName("size") - public int size() { - return this.field3664; - } - - public boolean offer(Object var1) { - if (this.field3665.containsKey(var1)) { - throw new IllegalArgumentException(""); - } else { - ++this.field3663; - int var2 = this.field3664; - if (var2 >= this.field3666.length) { - this.method2031(); - } - - ++this.field3664; - if (var2 == 0) { - this.field3666[0] = new class390(var1, 0); - this.field3665.put(var1, this.field3666[0]); - } else { - this.field3666[var2] = new class390(var1, var2); - this.field3665.put(var1, this.field3666[var2]); - this.method2032(var2); - } - - return true; - } - } - - @Export("poll") - @ObfuscatedName("poll") - public Object poll() { - if (this.field3664 == 0) { - return null; - } else { - ++this.field3663; - Object var1 = this.field3666[0].field3658; - this.field3665.remove(var1); - --this.field3664; - if (this.field3664 == 0) { - this.field3666[this.field3664] = null; - } else { - this.field3666[0] = this.field3666[this.field3664]; - this.field3666[0].field3657 = 0; - this.field3666[this.field3664] = null; - this.method2033(0); - } - - return var1; - } - } - - @Export("contains") - @ObfuscatedName("contains") - public boolean contains(Object var1) { - return this.field3665.containsKey(var1); - } - - @Export("toArray") - @ObfuscatedName("toArray") - public Object[] toArray() { - Object[] var1 = super.toArray(); - if (this.field3667 != null) { - Arrays.sort(var1, this.field3667); - } else { - Arrays.sort(var1); - } - - return var1; - } - - @Export("iterator") - @ObfuscatedName("iterator") - public Iterator iterator() { - return new class391(this); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class394.java b/osrs/src/main/java/class394.java deleted file mode 100644 index 1e83b98a2..000000000 --- a/osrs/src/main/java/class394.java +++ /dev/null @@ -1,799 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.ArrayList; - -@ObfuscatedName("pj") -public class class394 { - @ObfuscatedName("ab") - int field3669; - @ObfuscatedName("ag") - int field3670; - @ObfuscatedName("am") - int field3672; - @ObfuscatedName("ax") - int field3675; - @ObfuscatedName("ah") - int field3671; - @ObfuscatedName("as") - boolean field3668; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lpk;" - ) - AbstractFont field3677; - @ObfuscatedName("aj") - ArrayList field3676; - @ObfuscatedName("av") - int field3673; - @ObfuscatedName("aw") - int field3674; - - public class394() { - this.field3669 = Integer.MAX_VALUE; - this.field3670 = Integer.MAX_VALUE; - this.field3672 = 0; - this.field3675 = 0; - this.field3671 = 0; - this.field3668 = true; - this.field3676 = new ArrayList(); - this.field3673 = 0; - this.field3674 = 0; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)Lpz;", - garbageValue = "425318611" - ) - public class396 method2036(int var1) { - return (class396)this.field3676.get(var1); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)Lpz;", - garbageValue = "1830163512" - ) - class396 method2037() { - return this.field3676.size() == 0 ? null : (class396)this.field3676.get(this.field3676.size() - 1); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1992869018" - ) - public boolean method2038() { - return this.field3676.size() == 0; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-675218118" - ) - boolean method2039() { - return this.field3670 > 1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1688510031" - ) - public int method2040() { - return this.field3676.size(); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "163147996" - ) - public String method2041() { - if (this.method2038()) { - return ""; - } else { - StringBuilder var1 = new StringBuilder(this.method2040()); - - for (int var2 = 0; var2 < this.method2040(); ++var2) { - class396 var3 = this.method2036(var2); - var1.append(var3.field3680); - } - - return var1.toString(); - } - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-32" - ) - public void method2042(int var1) { - if (this.field3677 != null && var1 < this.field3677.ascent * 2) { - var1 = Integer.MAX_VALUE; - } - - if (this.field3669 != var1) { - this.field3669 = var1; - this.method2071(); - } - - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1949241738" - ) - public void method2043(int var1) { - if (this.field3670 != var1) { - this.field3670 = var1; - this.method2071(); - } - - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-38" - ) - public void method2044(int var1) { - if (this.field3674 != var1) { - this.field3674 = var1; - this.method2071(); - } - - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(Lpk;I)V", - garbageValue = "1103184746" - ) - public void method2045(AbstractFont var1) { - if (var1 != this.field3677) { - this.field3677 = var1; - if (this.field3677 != null) { - if (this.field3671 == 0) { - this.field3671 = this.field3677.ascent; - } - - if (!this.method2038()) { - this.method2071(); - } - } - } - - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1772052418" - ) - public void method2046(int var1) { - if (this.field3673 != var1) { - this.field3673 = var1; - this.method2071(); - } - - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1456021058" - ) - public boolean method2047(int var1, int var2) { - if (this.field3672 != var1 || var2 != this.field3675) { - this.field3672 = var1; - this.field3675 = var2; - this.method2071(); - } - - return true; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1080029038" - ) - public void method2048(int var1) { - if (this.field3671 != var1) { - this.field3671 = var1; - this.method2071(); - } - - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(III)Lpl;", - garbageValue = "-1114977482" - ) - public class398 method2049(int var1, int var2) { - if (var2 == var1) { - return new class398(this, 0, 0); - } else if (var1 <= this.field3676.size() && var2 <= this.field3676.size()) { - return var2 < var1 ? new class398(this, var2, var1) : new class398(this, var1, var2); - } else { - return new class398(this, 0, 0); - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(CIII)Lpu;", - garbageValue = "-803390242" - ) - public class395 method2050(char var1, int var2, int var3) { - return this.method2051(Character.toString(var1), var2, var3); - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;III)Lpu;", - garbageValue = "-522015714" - ) - public class395 method2051(String var1, int var2, int var3) { - if (var3 == 0) { - var3 = Integer.MAX_VALUE; - } - - int var4 = var2; - if (this.field3676.size() >= var3) { - this.method2072(var2, var2); - return new class395(var2, true); - } else { - this.field3676.ensureCapacity(this.field3676.size() + var1.length()); - - for (int var5 = 0; var5 < var1.length() && this.field3676.size() < var3; ++var5) { - class396 var6 = new class396(); - var6.field3680 = var1.charAt(var5); - this.field3676.add(var4, var6); - ++var4; - } - - this.method2072(var2, var4); - if (this.field3670 != 0 && this.method2063() > this.field3670) { - while (var4 != var2) { - --var4; - this.method2056(var4); - if (this.method2063() <= this.field3670) { - break; - } - } - - return new class395(var4, true); - } else { - return new class395(var4, false); - } - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lpu;", - garbageValue = "-584459098" - ) - class395 method2052(String var1, int var2) { - return this.method2051(var1, this.field3676.size(), var2); - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Lpu;", - garbageValue = "67" - ) - public class395 method2054(String var1) { - this.method2055(); - return this.method2052(var1, 0); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1865432397" - ) - void method2055() { - this.field3676.clear(); - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "2" - ) - public int method2056(int var1) { - return this.method2057(var1, var1 + 1); - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1605170962" - ) - public int method2057(int var1, int var2) { - int var3; - if (var2 < var1) { - var3 = var2; - var2 = var1; - var1 = var3; - } - - this.field3676.subList(var1, var2).clear(); - var3 = var1; - if (this.method2039() && this.field3673 == 1) { - while (var3 > 0) { - --var3; - char var4 = ((class396)this.field3676.get(var3)).field3680; - if (var4 == ' ' || var4 == '\t') { - break; - } - } - } - - this.method2072(var3, var2); - return var1; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "194" - ) - public int method2058(int var1, int var2) { - if (this.field3677 == null) { - return 0; - } else if (this.method2039() && var1 > this.field3669) { - return this.field3676.size(); - } else { - if (!this.field3676.isEmpty()) { - for (int var3 = 0; var3 < this.field3676.size(); ++var3) { - class396 var4 = (class396)this.field3676.get(var3); - if (var2 <= var4.field3682 + this.method2062()) { - if (var2 < var4.field3682) { - break; - } - - if (var1 < var4.field3681) { - return var3 > 0 ? var3 - 1 : 0; - } - - if (1 + var3 != this.field3676.size() && ((class396)this.field3676.get(1 + var3)).field3682 != var4.field3682) { - int var5 = this.method2074((class396)this.field3676.get(var3), false); - if (var1 < var5 + var4.field3681) { - return var3; - } - - if (var2 <= var4.field3682 + this.method2062()) { - return var3 + 1; - } - } - } - } - - class396 var6 = (class396)this.field3676.get(this.field3676.size() - 1); - if (var1 >= var6.field3681 && var1 <= var6.field3681 + this.method2064() && var2 >= var6.field3682 && var2 <= var6.field3682 + this.method2062()) { - return this.field3676.size() - 1; - } - } - - return this.field3676.size(); - } - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "139" - ) - public int method2059(int var1, int var2) { - if (this.field3677 != null && !this.method2038() && var1 <= this.field3676.size()) { - byte var3; - if (var2 > 0) { - var3 = 1; - } else { - var3 = -1; - var2 = -var2; - } - - int var4 = 0; - int var5 = 0; - if (var1 > 0) { - class396 var6 = (class396)this.field3676.get(var1 - 1); - var4 = var6.field3681 + this.method2073(var1 - 1); - var5 = var6.field3682; - } else if (var3 == -1 && var1 == 0) { - return 0; - } - - int var14 = 16777215; - int var7 = 0; - int var8 = var1; - int var9 = 16777215; - int var10 = var3 == 1 ? this.field3676.size() + 1 : 0; - - for (int var11 = var3 + var1; var10 != var11; var11 += var3) { - class396 var12 = (class396)this.field3676.get(var11 - 1); - if (var5 != var12.field3682) { - ++var7; - var5 = var12.field3682; - if (var7 > var2) { - return var8; - } - } - - if (var7 == var2) { - int var13 = Math.abs(var12.field3681 + this.method2073(var11 - 1) - var4); - if (var13 >= var9) { - return var8; - } - - var8 = var11; - var9 = var13; - } - } - - if (var3 == 1) { - return this.field3676.size(); - } else { - if (var5 != 0) { - ++var7; - } - - return var9 == 16777215 || var7 == var2 && var4 < var9 ? 0 : var8; - } - } else { - return 0; - } - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-540646519" - ) - public int method2060() { - if (!this.field3676.isEmpty() && this.method2063() == 1) { - return this.field3676.isEmpty() ? 0 : ((class396)this.field3676.get(this.field3676.size() - 1)).field3681 + this.method2064(); - } else { - int var1 = -1; - int var2 = 0; - - for (int var3 = this.field3676.size() - 1; var3 >= 0; --var3) { - class396 var4 = (class396)this.field3676.get(var3); - if (var1 != var4.field3682) { - int var5 = this.method2074(var4, false) + var4.field3681; - var2 = Math.max(var5, var2); - var1 = var4.field3682; - } - } - - return var2; - } - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "872153542" - ) - public int method2061() { - return this.method2038() ? 0 : this.field3677.ascent + ((class396)this.field3676.get(this.field3676.size() - 1)).field3682; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1220139043" - ) - public int method2062() { - return this.field3671; - } - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "106" - ) - public int method2063() { - return this.method2061() / this.field3677.ascent; - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1975027491" - ) - int method2064() { - return this.method2038() ? 0 : this.method2074((class396)this.field3676.get(this.field3676.size() - 1), false); - } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "103" - ) - public int method2065() { - return this.field3669; - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2030708038" - ) - public int method2066() { - return this.field3670; - } - - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "106" - ) - public int method2067() { - return this.field3673; - } - - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "326799918" - ) - public int method2068() { - return this.field3674; - } - - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "0" - ) - public int method2069(int var1) { - switch(this.field3672) { - case 0: - return 0; - case 1: - return var1 / 2; - case 2: - return var1; - default: - return 0; - } - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "59" - ) - public int method2070(int var1) { - switch(this.field3675) { - case 0: - return 0; - case 1: - return var1 / 2; - case 2: - return var1; - default: - return 0; - } - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2042432438" - ) - void method2071() { - this.method2072(0, this.field3676.size()); - } - - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2146351228" - ) - void method2072(int var1, int var2) { - if (!this.method2038() && this.field3677 != null) { - class485 var3 = this.method2075(var1, var2); - boolean var4 = (Integer)var3.field4049 == 0 && (Integer)var3.field4048 == this.field3676.size(); - int var5 = (Integer)var3.field4049; - int var6 = 0; - int var7 = var4 ? 0 : ((class396)this.field3676.get((Integer)var3.field4049)).field3682 * 778585567 * -122833377; - int var8 = 0; - - int var9; - for (var9 = (Integer)var3.field4049; var9 <= (Integer)var3.field4048; ++var9) { - boolean var10 = var9 >= this.field3676.size(); - class396 var11 = (class396)this.field3676.get(!var10 ? var9 : this.field3676.size() - 1); - int var12 = !var10 ? this.method2074(var11, false) : 0; - boolean var13 = !var10 && var11.field3680 == '\n'; - boolean var14 = !var10 && this.method2039() && var12 + var6 > this.field3669; - if (var13 || var14 || var10) { - int var15 = var9; - int var16 = 0; - int var17; - int var18; - class396 var19; - if (var14) { - var17 = 0; - if (this.field3673 == 1) { - for (var18 = var9; var18 > var5; --var18) { - var19 = (class396)this.field3676.get(var18); - var17 += var18 < var15 ? this.method2074(var19, false) : 0; - if (var19.field3680 == ' ' || var19.field3680 == '\n') { - var15 = var18; - var6 -= var17; - var16 = var17; - break; - } - } - } - } - - var17 = -this.method2069(var6); - - for (var18 = var5; var18 < var15; ++var18) { - var19 = (class396)this.field3676.get(var18); - int var20 = this.method2074(var19, false); - var19.field3681 = var17; - var19.field3682 = var7; - var17 += var20; - } - - var5 = var15; - var6 = var16; - var7 += this.method2062(); - ++var8; - } - - var6 += !var10 ? var12 : 0; - } - - if (this.field3675 != 0 && var4) { - var9 = var8 * this.method2062(); - int var23 = this.method2070(var9); - - for (int var21 = 0; var21 < this.field3676.size(); ++var21) { - class396 var22 = (class396)this.field3676.get(var21); - var22.field3682 -= var23; - } - } - - } - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "369306860" - ) - int method2073(int var1) { - return var1 < this.field3676.size() ? this.method2074((class396)this.field3676.get(var1), false) : 0; - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(Lpz;ZI)I", - garbageValue = "1524622539" - ) - int method2074(class396 var1, boolean var2) { - if (var1.field3680 == '\n') { - return 0; - } else if (this.field3674 == 0) { - int var3 = this.field3677.advances[var1.field3680]; - if (var3 == 0) { - return var1.field3680 == '\t' ? this.field3677.advances[32] * 3 : this.field3677.advances[32]; - } else { - return var3; - } - } else { - return this.field3677.advances[42]; - } - } - - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "(IIB)Lss;", - garbageValue = "0" - ) - class485 method2075(int var1, int var2) { - int var3 = Math.min(var1, var2); - int var4 = Math.max(var1, var2); - int var5 = this.field3676.size(); - if (var3 == 0 && var4 == var5) { - return new class485(0, var5); - } else { - int var6 = this.method2076(var3, false); - int var7 = this.method2077(var4, false); - int var8; - switch(this.field3675) { - case 0: - if (this.field3672 == 0) { - return new class485(var6, var5); - } - - var8 = this.method2076(var3, true); - return new class485(var8, var5); - case 1: - return new class485(0, var5); - case 2: - if (this.field3672 == 2) { - return new class485(0, var7); - } - - var8 = this.method2077(var4, true); - return new class485(0, var8); - default: - return new class485(0, var5); - } - } - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(IZI)I", - garbageValue = "-1605508090" - ) - int method2076(int var1, boolean var2) { - if (var1 < this.field3676.size()) { - int var3 = ((class396)this.field3676.get(var1)).field3682; - - for (int var4 = var1; var4 > 0; --var4) { - if (((class396)this.field3676.get(var4 - 1)).field3682 < var3) { - if (!var2) { - return var4; - } - - var2 = false; - var3 = ((class396)this.field3676.get(var4 - 1)).field3682; - } - } - } - - return 0; - } - - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "(IZI)I", - garbageValue = "1892979097" - ) - int method2077(int var1, boolean var2) { - if (var1 < this.field3676.size()) { - int var3 = ((class396)this.field3676.get(var1)).field3682; - - for (int var4 = var1; var4 < this.field3676.size() - 1; ++var4) { - if (((class396)this.field3676.get(var4 + 1)).field3682 > var3) { - if (!var2) { - return var4; - } - - var2 = false; - var3 = ((class396)this.field3676.get(var4 + 1)).field3682; - } - } - } - - return this.field3676.size(); - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1123926703" - ) - public static void method2053() { - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class395.java b/osrs/src/main/java/class395.java deleted file mode 100644 index 2171bbd17..000000000 --- a/osrs/src/main/java/class395.java +++ /dev/null @@ -1,25 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pu") -public class class395 { - @ObfuscatedName("au") - int field3678; - - @ObfuscatedSignature( - descriptor = "(IZ)V", - garbageValue = "1" - ) - class395(int var1, boolean var2) { - this.field3678 = var1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "28670" - ) - public int method2078() { - return this.field3678; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class396.java b/osrs/src/main/java/class396.java deleted file mode 100644 index 879803c26..000000000 --- a/osrs/src/main/java/class396.java +++ /dev/null @@ -1,22 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pz") -public class class396 { - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lgo;" - ) - static ClanChannel field3679; - @ObfuscatedName("au") - public char field3680; - @ObfuscatedName("ae") - public int field3681; - @ObfuscatedName("ao") - public int field3682; - - class396() { - this.field3681 = 0; - this.field3682 = 0; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class398.java b/osrs/src/main/java/class398.java index 98ef9adb1..13132ed52 100644 --- a/osrs/src/main/java/class398.java +++ b/osrs/src/main/java/class398.java @@ -1,155 +1,14 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pl") -public class class398 { - @ObfuscatedName("gy") - @Export("playerUUIDLength") - static int playerUUIDLength; - @ObfuscatedName("au") +@ObfuscatedName("pw") +public final class class398 { + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lpj;" + descriptor = "(II)I", + garbageValue = "65535" ) - class394 field3708; - @ObfuscatedName("ae") - int field3706; - @ObfuscatedName("ao") - int field3707; - - @ObfuscatedSignature( - descriptor = "(Lpj;II)V" - ) - class398(class394 var1, int var2, int var3) { - this.field3706 = 0; - this.field3707 = 0; - this.field3708 = var1; - this.field3706 = var2; - this.field3707 = var3; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "1" - ) - public String method2113() { - if (this.method2115()) { - return ""; - } else { - StringBuilder var1 = new StringBuilder(this.method2116()); - - for (int var2 = this.field3706; var2 < this.field3707; ++var2) { - class396 var3 = this.field3708.method2036(var2); - var1.append(var3.field3680); - } - - return var1.toString(); - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "0" - ) - boolean method2114(int var1) { - return this.field3708.method2068() == 2 || this.field3708.method2068() == 1 && (!this.field3708.field3668 || this.field3707 - 1 != var1); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "181871891" - ) - public boolean method2115() { - return this.field3706 == this.field3707; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1557600445" - ) - public int method2116() { - return this.field3707 - this.field3706; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lpz;I)Z", - garbageValue = "-663348628" - ) - boolean method2117(class396 var1) { - if (this.field3708.field3674 == 2) { - return true; - } else if (this.field3708.field3674 == 0) { - return false; - } else { - return this.field3708.method2037() != var1; - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-808768391" - ) - int method2118() { - if (this.method2115()) { - return 0; - } else { - class396 var1 = this.field3708.method2036(this.field3707 - 1); - if (var1.field3680 == '\n') { - return 0; - } else if (this.method2117(var1)) { - return this.field3708.field3677.advances[42]; - } else { - int var2 = this.field3708.field3677.advances[var1.field3680]; - if (var2 == 0) { - return var1.field3680 == '\t' ? this.field3708.field3677.advances[32] * 3 : this.field3708.field3677.advances[32]; - } else { - return var2; - } - } - } - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(I)Lss;", - garbageValue = "-873357566" - ) - public class485 method2119() { - if (this.method2115()) { - return new class485(0, 0); - } else { - class396 var1 = this.field3708.method2036(this.field3707 - 1); - return new class485(var1.field3681 + this.method2118(), var1.field3682); - } - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(II)Lpz;", - garbageValue = "602399469" - ) - public class396 method2120(int var1) { - return var1 >= 0 && var1 < this.method2116() ? this.field3708.method2036(this.field3706 + var1) : null; - } - - @ObfuscatedName("mj") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-46" - ) - static boolean method2121(int var0) { - for (int var1 = 0; var1 < Client.field532; ++var1) { - if (Client.field581[var1] == var0) { - return true; - } - } - - return false; + static int method2052(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field715 - 7.0D) * 256.0D); } } \ No newline at end of file diff --git a/osrs/src/main/java/class399.java b/osrs/src/main/java/class399.java new file mode 100644 index 000000000..3a363e6f6 --- /dev/null +++ b/osrs/src/main/java/class399.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("pv") +public class class399 { + @ObfuscatedName("ac") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; + + static { + cp1252AsciiExtension = new char[]{'\u20ac', '\u0000', '\u201a', '\u0192', '\u201e', '\u2026', '\u2020', '\u2021', '\u02c6', '\u2030', '\u0160', '\u2039', '\u0152', '\u0000', '\u017d', '\u0000', '\u0000', '\u2018', '\u2019', '\u201c', '\u201d', '\u2022', '\u2013', '\u2014', '\u02dc', '\u2122', '\u0161', '\u203a', '\u0153', '\u0000', '\u017e', '\u0178'}; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class4.java b/osrs/src/main/java/class4.java index 428505050..d23974dfd 100644 --- a/osrs/src/main/java/class4.java +++ b/osrs/src/main/java/class4.java @@ -1,381 +1,235 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("ao") public final class class4 { - @ObfuscatedName("gh") - @Export("currentPort") - static int currentPort; + @ObfuscatedName("ix") + static int field2; - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIILiw;Lis;Z[I[ILij;I)I", - garbageValue = "-375034258" + descriptor = "(II)Lio;", + garbageValue = "-2052088854" ) - public static int method4(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7, class216 var8) { - var8.method1128(); - int var9 = var8.method1132(); - int var10 = var8.method1133(); - int[][] var11 = var8.method1135(); - int[][] var12 = var8.method1134(); - int[] var13 = var8.method1136(); - int[] var14 = var8.method1137(); - boolean var15; - int var17; - int var18; - int var23; - int var24; - int var25; - int var26; - int var27; - int var28; - int var29; - int var31; - int var33; - int var42; - if (var2 == 1) { - var17 = var8.method1132(); - var18 = var8.method1133(); - int[][] var19 = var8.method1135(); - int[][] var20 = var8.method1134(); - int[] var21 = var8.method1136(); - int[] var22 = var8.method1137(); - var23 = var8.method1138(); - var24 = var0; - var25 = var1; - var26 = var17 >> 1; - var27 = var18 >> 1; - var28 = var0 - var26; - var29 = var1 - var27; - var20[var26][var27] = 99; - var19[var26][var27] = 0; - byte var30 = 0; - var31 = 0; - var21[var30] = var0; - var42 = var30 + 1; - var22[var30] = var1; - int[][] var32 = var4.flags; - - boolean var16; - while (true) { - if (var42 == var31) { - var8.method1129(var24, var25); - var16 = false; - break; - } - - var24 = var21[var31]; - var25 = var22[var31]; - var31 = var31 + 1 & var23; - var26 = var24 - var28; - var27 = var25 - var29; - var33 = var24 - var4.xInset; - int var34 = var25 - var4.yInset; - if (var3.hasArrived(1, var24, var25, var4)) { - var8.method1129(var24, var25); - var16 = true; - break; - } - - int var35 = var19[var26][var27] + 1; - if (var26 > 0 && var20[var26 - 1][var27] == 0 && (var32[var33 - 1][var34] & 19136776) == 0) { - var21[var42] = var24 - 1; - var22[var42] = var25; - var42 = var42 + 1 & var23; - var20[var26 - 1][var27] = 2; - var19[var26 - 1][var27] = var35; - } - - if (var26 < var17 - 1 && var20[var26 + 1][var27] == 0 && (var32[var33 + 1][var34] & 19136896) == 0) { - var21[var42] = var24 + 1; - var22[var42] = var25; - var42 = var42 + 1 & var23; - var20[var26 + 1][var27] = 8; - var19[var26 + 1][var27] = var35; - } - - if (var27 > 0 && var20[var26][var27 - 1] == 0 && (var32[var33][var34 - 1] & 19136770) == 0) { - var21[var42] = var24; - var22[var42] = var25 - 1; - var42 = var42 + 1 & var23; - var20[var26][var27 - 1] = 1; - var19[var26][var27 - 1] = var35; - } - - if (var27 < var18 - 1 && var20[var26][var27 + 1] == 0 && (var32[var33][var34 + 1] & 19136800) == 0) { - var21[var42] = var24; - var22[var42] = var25 + 1; - var42 = var42 + 1 & var23; - var20[var26][var27 + 1] = 4; - var19[var26][var27 + 1] = var35; - } - - if (var26 > 0 && var27 > 0 && var20[var26 - 1][var27 - 1] == 0 && (var32[var33 - 1][var34 - 1] & 19136782) == 0 && (var32[var33 - 1][var34] & 19136776) == 0 && (var32[var33][var34 - 1] & 19136770) == 0) { - var21[var42] = var24 - 1; - var22[var42] = var25 - 1; - var42 = var42 + 1 & var23; - var20[var26 - 1][var27 - 1] = 3; - var19[var26 - 1][var27 - 1] = var35; - } - - if (var26 < var17 - 1 && var27 > 0 && var20[var26 + 1][var27 - 1] == 0 && (var32[var33 + 1][var34 - 1] & 19136899) == 0 && (var32[var33 + 1][var34] & 19136896) == 0 && (var32[var33][var34 - 1] & 19136770) == 0) { - var21[var42] = var24 + 1; - var22[var42] = var25 - 1; - var42 = var42 + 1 & var23; - var20[var26 + 1][var27 - 1] = 9; - var19[var26 + 1][var27 - 1] = var35; - } - - if (var26 > 0 && var27 < var18 - 1 && var20[var26 - 1][var27 + 1] == 0 && (var32[var33 - 1][var34 + 1] & 19136824) == 0 && (var32[var33 - 1][var34] & 19136776) == 0 && (var32[var33][var34 + 1] & 19136800) == 0) { - var21[var42] = var24 - 1; - var22[var42] = var25 + 1; - var42 = var42 + 1 & var23; - var20[var26 - 1][var27 + 1] = 6; - var19[var26 - 1][var27 + 1] = var35; - } - - if (var26 < var17 - 1 && var27 < var18 - 1 && var20[var26 + 1][var27 + 1] == 0 && (var32[var33 + 1][var34 + 1] & 19136992) == 0 && (var32[var33 + 1][var34] & 19136896) == 0 && (var32[var33][var34 + 1] & 19136800) == 0) { - var21[var42] = var24 + 1; - var22[var42] = var25 + 1; - var42 = var42 + 1 & var23; - var20[var26 + 1][var27 + 1] = 12; - var19[var26 + 1][var27 + 1] = var35; - } - } - - var15 = var16; - } else if (var2 == 2) { - var15 = LoginPacket.method1616(var0, var1, var3, var4, var8); + public static FloorOverlayDefinition method4(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - var15 = FontName.method2446(var0, var1, var2, var3, var4, var8); - } - - int var41 = var0 - (var9 >> 1); - var17 = var1 - (var10 >> 1); - var18 = var8.method1130(); - int var36 = var8.method1131(); - int var37; - int var38; - if (!var15) { - var37 = Integer.MAX_VALUE; - var38 = Integer.MAX_VALUE; - byte var39 = 10; - var23 = var3.approxDestinationX; - var24 = var3.approxDestinationY; - var25 = var3.approxDestinationSizeX; - var26 = var3.approxDestinationSizeY; - - for (var27 = var23 - var39; var27 <= var39 + var23; ++var27) { - for (var28 = var24 - var39; var28 <= var24 + var39; ++var28) { - var29 = var27 - var41; - var42 = var28 - var17; - if (var29 >= 0 && var42 >= 0 && var29 < var9 && var42 < var10 && var11[var29][var42] < 100) { - var31 = 0; - if (var27 < var23) { - var31 = var23 - var27; - } else if (var27 > var23 + var25 - 1) { - var31 = var27 - (var25 + var23 - 1); - } - - int var40 = 0; - if (var28 < var24) { - var40 = var24 - var28; - } else if (var28 > var26 + var24 - 1) { - var40 = var28 - (var26 + var24 - 1); - } - - var33 = var40 * var40 + var31 * var31; - if (var33 < var37 || var33 == var37 && var11[var29][var42] < var38) { - var37 = var33; - var38 = var11[var29][var42]; - var18 = var27; - var36 = var28; - } - } - } - } - - if (var37 == Integer.MAX_VALUE) { - return -1; - } - } - - if (var0 == var18 && var36 == var1) { - var6[0] = var18; - var7[0] = var36; - return 0; - } else { - byte var43 = 0; - var13[var43] = var18; - var37 = var43 + 1; - var14[var43] = var36; - - int var44; - for (var38 = var44 = var12[var18 - var41][var36 - var17]; var0 != var18 || var36 != var1; var38 = var12[var18 - var41][var36 - var17]) { - if (var38 != var44) { - var44 = var38; - var13[var37] = var18; - var14[var37++] = var36; - } - - if ((var38 & 2) != 0) { - ++var18; - } else if ((var38 & 8) != 0) { - --var18; - } - - if ((var38 & 1) != 0) { - ++var36; - } else if ((var38 & 4) != 0) { - --var36; - } + byte[] var2 = class30.FloorOverlayDefinition_archive.takeFile(4, var0); + var1 = new FloorOverlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); } - var23 = 0; - - while (var37-- > 0) { - var6[var23] = var13[var37]; - var7[var23++] = var14[var37]; - if (var23 >= var6.length) { - break; - } - } - - return var23; + var1.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIIIIZI)Lui;", - garbageValue = "693042452" + descriptor = "(IIIB)V", + garbageValue = "71" ) - @Export("getItemSprite") - public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { - var4 = 0; - } else if (var4 == 2 && var1 != 1) { - var4 = 1; - } - - long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); - SpritePixels var8; - if (!var5) { - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; + static final void method5(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { + for (int var4 = 0; var4 < 8; ++var4) { + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; } } - ItemComposition var9 = InvDefinition.ItemDefinition_get(var0); - if (var1 > 1 && var9.countobj != null) { - int var10 = -1; - - for (int var11 = 0; var11 < 10; ++var11) { - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { - var9 = InvDefinition.ItemDefinition_get(var10); + if (var1 > 0) { + for (var3 = 1; var3 < 8; ++var3) { + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; } } - Model var22 = var9.getModel(1); - if (var22 == null) { - return null; - } else { - SpritePixels var23 = null; - if (var9.noteTemplate != -1) { - var23 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if (var23 == null) { - return null; - } - } else if (var9.notedId != -1) { - var23 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if (var23 == null) { - return null; - } - } else if (var9.placeholderTemplate != -1) { - var23 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if (var23 == null) { - return null; - } + if (var2 > 0) { + for (var3 = 1; var3 < 8; ++var3) { + Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; } + } - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; - int var13 = Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_height; - float[] var15 = Rasterizer2D.field4217; - int[] var16 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var16); - var8 = new SpritePixels(36, 32); - Rasterizer3D.method1198(var8.pixels, 36, 32, (float[])null); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.method1199(); - Rasterizer3D.method1202(16, 16); - Rasterizer3D.clips.field2279 = false; - if (var9.placeholderTemplate != -1) { - var23.drawTransBgAt(0, 0); - } + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; + } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; + } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } - int var17 = var9.zoom2d; - if (var5) { - var17 = (int)((double)var17 * 1.5D); - } else if (var2 == 2) { - var17 = (int)((double)var17 * 1.04D); - } + } - int var18 = var17 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; - int var19 = var17 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; - var22.calculateBoundsCylinder(); - var22.method1338(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var22.height / 2 + var18 + var9.offsetY2d, var19 + var9.offsetY2d); - if (var9.notedId != -1) { - var23.drawTransBgAt(0, 0); - } + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "159845582" + ) + static int method6(int var0, Script var1, boolean var2) { + boolean var3 = true; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var4 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = false; + } else { + var4 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + } - if (var2 >= 1) { - var8.outline(1); + int var11; + if (var0 == 1300) { + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]); + return 1; + } else { + --class180.Interpreter_stringStackSize; + return 1; } + } else { + int var6; + if (var0 == 1301) { + Interpreter.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var4.parent = class33.field89.getWidgetChild(var11, var6); + return 1; + } else if (var0 == 1302) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1303) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == 1304) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == 1305) { + var4.dataText = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + return 1; + } else if (var0 == 1306) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; + return 1; + } else if (var0 == 1307) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1309) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else { + int var7; + byte[] var9; + if (var0 != 1350) { + byte var5; + if (var0 == 1351) { + Interpreter.Interpreter_intStackSize -= 2; + var5 = 10; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; + byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; + InterfaceParent.Widget_setKey(var4, var5, var9, var10); + return 1; + } else if (var0 == 1352) { + Interpreter.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + ScriptFrame.Widget_setKeyRate(var4, var11, var6, var7); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == 1353) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ScriptFrame.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == 1354) { + --Interpreter.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + class18.Widget_setKeyIgnoreHeld(var4, var11); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == 1355) { + var5 = 10; + class18.Widget_setKeyIgnoreHeld(var4, var5); + return 1; + } else { + return 2; + } + } else { + byte[] var8 = null; + var9 = null; + if (var3) { + Interpreter.Interpreter_intStackSize -= 10; - if (var2 >= 2) { - var8.outline(16777215); - } + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { + } - if (var3 != 0) { - var8.shadow(var3); - } + if (var7 > 0) { + var8 = new byte[var7 / 2]; + var9 = new byte[var7 / 2]; - Rasterizer3D.method1198(var8.pixels, 36, 32, (float[])null); - if (var9.noteTemplate != -1) { - var23.drawTransBgAt(0, 0); - } + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; + var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; + } + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; + } - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - Font var20 = class452.ItemDefinition_fontPlain11; - String var21; - if (var1 < 100000) { - var21 = "" + var1 + ""; - } else if (var1 < 10000000) { - var21 = "" + var1 / 1000 + "K" + ""; - } else { - var21 = "" + var1 / 1000000 + "M" + ""; + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + InterfaceParent.Widget_setKey(var4, var7, var8, var9); + return 1; + } else { + throw new RuntimeException(); + } } - - var20.draw(var21, 0, 9, 16776960, 1); } + } + } - if (!var5) { - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "1678584936" + ) + static int method7(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == 8000) { + --Interpreter.Interpreter_intStackSize; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_arrayLengths[var3]; + Frames.method1337(Interpreter.Interpreter_arrays[var3], new int[var4], 0, var4 - 1); + return 1; + } else if (var0 == 8001) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_arrayLengths[var3]; + if (var6 <= 1) { + return 1; + } else { + class424.method2177(Interpreter.Interpreter_arrays[var3], var6, var4, var5); + return 1; } - - Rasterizer3D.method1198(var12, var13, var14, var15); - Rasterizer2D.Rasterizer2D_setClipArray(var16); - Rasterizer3D.method1199(); - Rasterizer3D.clips.field2279 = true; - return var8; + } else { + return 2; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class400.java b/osrs/src/main/java/class400.java new file mode 100644 index 000000000..6ae00cbe4 --- /dev/null +++ b/osrs/src/main/java/class400.java @@ -0,0 +1,89 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("po") +public class class400 { + @ObfuscatedName("ac") + static char[] field3683; + @ObfuscatedName("al") + static char[] field3685; + @ObfuscatedName("ak") + static char[] field3684; + @ObfuscatedName("ax") + static int[] field3686; + + static { + field3683 = new char[64]; + + int var0; + for (var0 = 0; var0 < 26; ++var0) { + field3683[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3683[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3683[var0] = (char)(var0 + 48 - 52); + } + + field3683[62] = '+'; + field3683[63] = '/'; + field3685 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3685[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3685[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3685[var0] = (char)(var0 + 48 - 52); + } + + field3685[62] = '*'; + field3685[63] = '-'; + field3684 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3684[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3684[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3684[var0] = (char)(var0 + 48 - 52); + } + + field3684[62] = '-'; + field3684[63] = '_'; + field3686 = new int[128]; + + for (var0 = 0; var0 < field3686.length; ++var0) { + field3686[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { + field3686[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { + field3686[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { + field3686[var0] = var0 - 48 + 52; + } + + int[] var2 = field3686; + field3686[43] = 62; + var2[42] = 62; + int[] var1 = field3686; + field3686[47] = 63; + var1[45] = 63; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class401.java b/osrs/src/main/java/class401.java index 7bfe42a08..981fc71b5 100644 --- a/osrs/src/main/java/class401.java +++ b/osrs/src/main/java/class401.java @@ -1,73 +1,63 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; -import java.util.Iterator; +import java.util.regex.Pattern; -@ObfuscatedName("pv") -public class class401 extends SongTask { - @ObfuscatedName("au") - ArrayList field3711; - @ObfuscatedSignature( - descriptor = "(Lpm;Ljava/util/ArrayList;)V" - ) - public class401(SongTask var1, ArrayList var2) { - super(var1); - super.field3722 = "ClearRequestTask"; - this.field3711 = var2; +@ObfuscatedName("pa") +public final class class401 { + static { + Pattern.compile("^\\D*(\\d+)\\D*$"); } - @ObfuscatedName("au") + @ObfuscatedName("ii") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1604030758" + descriptor = "(Lnm;III)V", + garbageValue = "898277930" ) - public boolean vmethod2142() { - if (this.field3711.isEmpty()) { - return true; - } else { - Iterator var1 = this.field3711.iterator(); - - while (var1.hasNext()) { - MusicSong var2 = (MusicSong)var1.next(); - - try { - if (class305.musicSongs.contains(var2)) { - if (var2 == null) { - class305.musicSongs.remove(var2); - } else { - if (var2.midiPcmStream.field2809 > 0) { - --var2.midiPcmStream.field2809; - } - - if (var2.midiPcmStream.field2809 == 0) { - var2.midiPcmStream.clear(); - var2.midiPcmStream.method1633(); - var2.midiPcmStream.setPcmStreamVolume(0); - } - - int var3 = var2.musicTrackGroupId; - int var4 = var2.musicTrackFileId; - Iterator var5 = class305.field2778.iterator(); - - while (var5.hasNext()) { - class311 var6 = (class311)var5.next(); - var6.vmethod1644(var3, var4); - } + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { + SpriteMask var3 = var0.method1857(class33.field89, true); + if (var3 == null) { + return; + } - class305.musicSongs.remove(var2); - } - } - } catch (Exception var8) { - Messages.RunException_sendStackTrace((String)null, var8); - this.method2138(var8.getMessage()); - class305.musicSongs.clear(); - return true; + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; + if (var3.contains(var4, var5)) { + var4 -= var3.width / 2; + var5 -= var3.height / 2; + int var6 = Client.camAngleY & 2047; + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var9 = var7 * var5 + var4 * var8 >> 11; + int var10 = var8 * var5 - var4 * var7 >> 11; + int var11 = var9 + TextureProvider.localPlayer.x >> 7; + int var12 = TextureProvider.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = ClanChannelMember.getPacketBufferNode(ClientPacket.f51, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.writeShortAdd(var12 + class19.baseY); + var13.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? (Client.keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); + var13.packetBuffer.writeShortAdd(var11 + class20.baseX); + var13.packetBuffer.writeByte(var4); + var13.packetBuffer.writeByte(var5); + var13.packetBuffer.writeShort(Client.camAngleY); + var13.packetBuffer.writeByte(57); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(89); + var13.packetBuffer.writeShort(TextureProvider.localPlayer.x); + var13.packetBuffer.writeShort(TextureProvider.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; } } - return true; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class403.java b/osrs/src/main/java/class403.java index 8299e08f5..d3dc4ef0f 100644 --- a/osrs/src/main/java/class403.java +++ b/osrs/src/main/java/class403.java @@ -2,53 +2,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Iterator; +@ObfuscatedName("px") +public final class class403 { + @ObfuscatedName("ac") + @Export("base37Table") + static final char[] base37Table; + @ObfuscatedName("al") + static long[] field3688; + @ObfuscatedName("ak") + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; -@ObfuscatedName("pd") -public class class403 extends SongTask { - @ObfuscatedName("ae") - @Export("clearLoginScreen") - static boolean clearLoginScreen; + static { + base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; + field3688 = new long[12]; + + for (int var0 = 0; var0 < field3688.length; ++var0) { + field3688[var0] = (long)Math.pow(37.0D, (double)var0); + } - @ObfuscatedSignature( - descriptor = "(Lpm;)V" - ) - public class403(SongTask var1) { - super(var1); - super.field3722 = "StartSongTask"; } - @ObfuscatedName("au") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1604030758" + descriptor = "(Lbw;I)V", + garbageValue = "-1869845736" ) - public boolean vmethod2142() { - Iterator var1 = class305.musicSongs.iterator(); - - while (var1.hasNext()) { - MusicSong var2 = (MusicSong)var1.next(); - if (var2 != null && !var2.field2865 && var2.midiPcmStream != null) { - try { - var2.midiPcmStream.method1632(); - var2.midiPcmStream.setPcmStreamVolume(0); - if (var2.field2872 != null) { - var2.midiPcmStream.setMusicTrack(var2.field2872, var2.musicTrackBoolean); - } - - var2.field2872 = null; - var2.field2861 = null; - var2.musicTrackArchive = null; - var2.field2865 = true; - } catch (Exception var4) { - Messages.RunException_sendStackTrace((String)null, var4); - this.method2138(var4.getMessage()); - return true; - } - } - } - - super.field3721 = true; - return true; + public static final void method2054(class51 var0) { + class16.pcmPlayerProvider = var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class405.java b/osrs/src/main/java/class405.java new file mode 100644 index 000000000..717fa867e --- /dev/null +++ b/osrs/src/main/java/class405.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("pd") +public final class class405 { + @ObfuscatedName("ac") + final Object field3692; + @ObfuscatedName("al") + int field3691; + + class405(Object var1, int var2) { + this.field3692 = var1; + this.field3691 = var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class406.java b/osrs/src/main/java/class406.java new file mode 100644 index 000000000..78132a54c --- /dev/null +++ b/osrs/src/main/java/class406.java @@ -0,0 +1,108 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ConcurrentModificationException; +import java.util.Iterator; +import java.util.NoSuchElementException; + +@ObfuscatedName("pm") +public class class406 implements Iterator { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lpn;" + ) + class407 field3695; + @ObfuscatedName("al") + int field3694; + @ObfuscatedName("ak") + int field3693; + + @ObfuscatedSignature( + descriptor = "(Lpn;)V" + ) + class406(class407 var1) { + this.field3694 = 0; + this.field3693 = this.field3695.field3697; + this.field3695 = var1; + } + + @Export("hasNext") + @ObfuscatedName("hasNext") + public boolean hasNext() { + return this.field3694 < this.field3695.field3696; + } + + @Export("next") + @ObfuscatedName("next") + public Object next() { + if (this.field3695.field3697 != this.field3693) { + throw new ConcurrentModificationException(); + } else if (this.field3694 < this.field3695.field3696) { + Object var1 = this.field3695.field3699[this.field3694].field3692; + ++this.field3694; + return var1; + } else { + throw new NoSuchElementException(); + } + } + + @Export("remove") + @ObfuscatedName("remove") + public void remove() { + throw new UnsupportedOperationException(); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)Lir;", + garbageValue = "-1697714323" + ) + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)Lfs;", + garbageValue = "2022917395" + ) + static class133 method2057(int var0) { + class133[] var1 = new class133[]{class133.field1257, class133.field1260, class133.field1259, class133.field1262, class133.field1261, class133.field1258}; + class133 var2 = (class133)SequenceDefinition.findEnumerated(var1, var0); + if (var2 == null) { + var2 = class133.field1257; + } + + return var2; + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(Lom;IB)Z", + garbageValue = "1" + ) + public static boolean method2058(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + if (var2 == null) { + return false; + } else { + class164.SpriteBuffer_decode(var2); + return true; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class407.java b/osrs/src/main/java/class407.java new file mode 100644 index 000000000..62177e7a9 --- /dev/null +++ b/osrs/src/main/java/class407.java @@ -0,0 +1,239 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.*; + +@ObfuscatedName("pn") +public class class407 extends AbstractQueue { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "[Lpd;" + ) + class405[] field3699; + @ObfuscatedName("al") + Map field3698; + @ObfuscatedName("ak") + int field3696; + @ObfuscatedName("ax") + final Comparator field3700; + @ObfuscatedName("ao") + int field3697; + + public class407(int var1, Comparator var2) { + this.field3697 = 0; + this.field3699 = new class405[var1]; + this.field3698 = new HashMap(); + this.field3700 = var2; + } + + public class407(int var1) { + this(var1, (Comparator)null); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "677116728" + ) + void method2059() { + int var1 = (this.field3699.length << 1) + 1; + this.field3699 = (class405[])((class405[])Arrays.copyOf(this.field3699, var1)); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1848491495" + ) + void method2060(int var1) { + class405 var2; + int var3; + for (var2 = this.field3699[var1]; var1 > 0; var1 = var3) { + var3 = var1 - 1 >>> 1; + class405 var4 = this.field3699[var3]; + if (this.field3700 != null) { + if (this.field3700.compare(var2.field3692, var4.field3692) >= 0) { + break; + } + } else if (((Comparable)var2.field3692).compareTo(var4.field3692) >= 0) { + break; + } + + this.field3699[var1] = var4; + this.field3699[var1].field3691 = var1; + } + + this.field3699[var1] = var2; + this.field3699[var1].field3691 = var1; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1866393303" + ) + void method2061(int var1) { + class405 var2 = this.field3699[var1]; + + int var8; + for (int var3 = this.field3696 >>> 1; var1 < var3; var1 = var8) { + int var4 = (var1 << 1) + 1; + class405 var5 = this.field3699[var4]; + int var6 = (var1 << 1) + 2; + class405 var7 = this.field3699[var6]; + if (this.field3700 != null) { + if (var6 < this.field3696 && this.field3700.compare(var5.field3692, var7.field3692) > 0) { + var8 = var6; + } else { + var8 = var4; + } + } else if (var6 < this.field3696 && ((Comparable)var5.field3692).compareTo(var7.field3692) > 0) { + var8 = var6; + } else { + var8 = var4; + } + + if (this.field3700 != null) { + if (this.field3700.compare(var2.field3692, this.field3699[var8].field3692) <= 0) { + break; + } + } else if (((Comparable)var2.field3692).compareTo(this.field3699[var8].field3692) <= 0) { + break; + } + + this.field3699[var1] = this.field3699[var8]; + this.field3699[var1].field3691 = var1; + } + + this.field3699[var1] = var2; + this.field3699[var1].field3691 = var1; + } + + @Export("remove") + @ObfuscatedName("remove") + public boolean remove(Object var1) { + class405 var2 = (class405)this.field3698.remove(var1); + if (var2 == null) { + return false; + } else { + ++this.field3697; + --this.field3696; + if (this.field3696 == var2.field3691) { + this.field3699[this.field3696] = null; + return true; + } else { + class405 var3 = this.field3699[this.field3696]; + this.field3699[this.field3696] = null; + this.field3699[var2.field3691] = var3; + this.field3699[var2.field3691].field3691 = var2.field3691; + this.method2061(var2.field3691); + if (var3 == this.field3699[var2.field3691]) { + this.method2060(var2.field3691); + } + + return true; + } + } + } + + @Export("peek") + @ObfuscatedName("peek") + public Object peek() { + return this.field3696 == 0 ? null : this.field3699[0].field3692; + } + + @Export("size") + @ObfuscatedName("size") + public int size() { + return this.field3696; + } + + @Export("offer") + @ObfuscatedName("offer") + public boolean offer(Object var1) { + if (this.field3698.containsKey(var1)) { + throw new IllegalArgumentException(""); + } else { + ++this.field3697; + int var2 = this.field3696; + if (var2 >= this.field3699.length) { + this.method2059(); + } + + ++this.field3696; + if (var2 == 0) { + this.field3699[0] = new class405(var1, 0); + this.field3698.put(var1, this.field3699[0]); + } else { + this.field3699[var2] = new class405(var1, var2); + this.field3698.put(var1, this.field3699[var2]); + this.method2060(var2); + } + + return true; + } + } + + @Export("poll") + @ObfuscatedName("poll") + public Object poll() { + if (this.field3696 == 0) { + return null; + } else { + ++this.field3697; + Object var1 = this.field3699[0].field3692; + this.field3698.remove(var1); + --this.field3696; + if (this.field3696 == 0) { + this.field3699[this.field3696] = null; + } else { + this.field3699[0] = this.field3699[this.field3696]; + this.field3699[0].field3691 = 0; + this.field3699[this.field3696] = null; + this.method2061(0); + } + + return var1; + } + } + + @Export("contains") + @ObfuscatedName("contains") + public boolean contains(Object var1) { + return this.field3698.containsKey(var1); + } + + @Export("toArray") + @ObfuscatedName("toArray") + public Object[] toArray() { + Object[] var1 = super.toArray(); + if (this.field3700 != null) { + Arrays.sort(var1, this.field3700); + } else { + Arrays.sort(var1); + } + + return var1; + } + + @Export("iterator") + @ObfuscatedName("iterator") + public Iterator iterator() { + return new class406(this); + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-105" + ) + public static void method2062() { + class326.SpriteBuffer_xOffsets = null; + ModelData0.SpriteBuffer_yOffsets = null; + class59.SpriteBuffer_spriteWidths = null; + class544.SpriteBuffer_spriteHeights = null; + class372.SpriteBuffer_spritePalette = null; + AddRequestTask.SpriteBuffer_pixels = null; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class408.java b/osrs/src/main/java/class408.java deleted file mode 100644 index 93f100987..000000000 --- a/osrs/src/main/java/class408.java +++ /dev/null @@ -1,118 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Iterator; - -@ObfuscatedName("pp") -public class class408 extends SongTask { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - AbstractArchive field3728; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - AbstractArchive field3726; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - AbstractArchive field3727; - - @ObfuscatedSignature( - descriptor = "(Lpm;Lnu;Lnu;Lnu;)V" - ) - public class408(SongTask var1, AbstractArchive var2, AbstractArchive var3, AbstractArchive var4) { - super(var1); - this.field3728 = var2; - this.field3726 = var3; - this.field3727 = var4; - super.field3722 = "LoadSongTask"; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1604030758" - ) - public boolean vmethod2142() { - int var1 = 0; - Iterator var2 = class305.musicSongs.iterator(); - - while (true) { - while (var2.hasNext()) { - MusicSong var3 = (MusicSong)var2.next(); - if (var3 != null && var3.midiPcmStream.field2809 > 1 && var3.midiPcmStream.method1637()) { - this.method2138("Attempted to load patches of already loading midiplayer!"); - return true; - } - - if (var3 != null && !var3.field2866) { - try { - if (var3.musicTrackArchive != null && var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { - if (var3.field2872 == null) { - var3.field2872 = MusicTrack.readTrack(var3.musicTrackArchive, var3.musicTrackGroupId, var3.musicTrackFileId); - if (var3.field2872 == null) { - continue; - } - } - - if (var3.field2861 == null) { - var3.field2861 = new SoundCache(this.field3727, this.field3726); - } - - if (var3.midiPcmStream.method1630(var3.field2872, this.field3728, var3.field2861)) { - ++var1; - var3.field2866 = true; - var3.midiPcmStream.method1631(); - } - } else { - ++var1; - } - } catch (Exception var5) { - Messages.RunException_sendStackTrace((String)null, var5); - this.method2138(var5.getMessage()); - return true; - } - } else { - ++var1; - } - } - - if (var1 == class305.musicSongs.size()) { - return true; - } - - return false; - } - } - - @ObfuscatedName("nr") - @ObfuscatedSignature( - descriptor = "(IIIILui;Lme;I)V", - garbageValue = "-1567258086" - ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; - if (var6 > 4225 && var6 < 90000) { - int var7 = Client.camAngleY & 2047; - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; - int var10 = var3 * var8 + var9 * var2 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - double var12 = Math.atan2((double)var10, (double)var11); - int var14 = var5.width / 2 - 25; - int var15 = (int)(Math.sin(var12) * (double)var14); - int var16 = (int)(Math.cos(var12) * (double)var14); - byte var17 = 20; - class167.redHintArrowSprite.method2686(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); - } else { - class210.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class409.java b/osrs/src/main/java/class409.java index 2c0f76cb8..3ac4c80ff 100644 --- a/osrs/src/main/java/class409.java +++ b/osrs/src/main/java/class409.java @@ -1,94 +1,799 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -import java.util.Random; +import java.util.ArrayList; -@ObfuscatedName("pg") +@ObfuscatedName("pp") public class class409 { + @ObfuscatedName("aj") + int field3705; + @ObfuscatedName("an") + int field3706; @ObfuscatedName("au") - @Export("writeRandomDat") - public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { - if (var2 == var0) { - if (var3 == var1) { - return; + int field3708; + @ObfuscatedName("ai") + int field3704; + @ObfuscatedName("ae") + int field3702; + @ObfuscatedName("aw") + boolean field3701; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lpk;" + ) + AbstractFont field3710; + @ObfuscatedName("az") + ArrayList field3709; + @ObfuscatedName("at") + int field3707; + @ObfuscatedName("af") + int field3703; + + public class409() { + this.field3705 = Integer.MAX_VALUE; + this.field3706 = Integer.MAX_VALUE; + this.field3708 = 0; + this.field3704 = 0; + this.field3702 = 0; + this.field3701 = true; + this.field3709 = new ArrayList(); + this.field3707 = 0; + this.field3703 = 0; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)Lpe;", + garbageValue = "391282708" + ) + public class411 method2065(int var1) { + return (class411)this.field3709.get(var1); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)Lpe;", + garbageValue = "-2102583593" + ) + class411 method2066() { + return this.field3709.size() == 0 ? null : (class411)this.field3709.get(this.field3709.size() - 1); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-15" + ) + public boolean method2067() { + return this.field3709.size() == 0; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-122" + ) + boolean method2068() { + return this.field3706 > 1; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1628091187" + ) + public int method2069() { + return this.field3709.size(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "1" + ) + public String method2070() { + if (this.method2067()) { + return ""; + } else { + StringBuilder var1 = new StringBuilder(this.method2069()); + + for (int var2 = 0; var2 < this.method2069(); ++var2) { + class411 var3 = this.method2065(var2); + var1.append(var3.field3713); } - if (var3 > var1 && var3 < var4 + var1) { - --var4; - var1 += var4; - var3 += var4; - var4 = var1 - var4; + return var1.toString(); + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1556362413" + ) + public void method2071(int var1) { + if (this.field3710 != null && var1 < this.field3710.ascent * 2) { + var1 = Integer.MAX_VALUE; + } + + if (this.field3705 != var1) { + this.field3705 = var1; + this.method2099(); + } + + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "36" + ) + public void method2072(int var1) { + if (this.field3706 != var1) { + this.field3706 = var1; + this.method2099(); + } + + } - for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1148190983" + ) + public void method2073(int var1) { + if (this.field3703 != var1) { + this.field3703 = var1; + this.method2099(); + } + + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lpk;I)V", + garbageValue = "1676896473" + ) + public void method2074(AbstractFont var1) { + if (var1 != this.field3710) { + this.field3710 = var1; + if (this.field3710 != null) { + if (this.field3702 == 0) { + this.field3702 = this.field3710.ascent; } - for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { + if (!this.method2067()) { + this.method2099(); } + } + } + + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "903704871" + ) + public void method2075(int var1) { + if (this.field3707 != var1) { + this.field3707 = var1; + this.method2099(); + } - return; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "2058162248" + ) + public boolean method2076(int var1, int var2) { + if (this.field3708 != var1 || var2 != this.field3704) { + this.field3708 = var1; + this.field3704 = var2; + this.method2099(); + } + + return true; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1814750102" + ) + public void method2077(int var1) { + if (this.field3702 != var1) { + this.field3702 = var1; + this.method2099(); + } + + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(III)Lpr;", + garbageValue = "1762179013" + ) + public class413 method2078(int var1, int var2) { + if (var2 == var1) { + return new class413(this, 0, 0); + } else if (var1 <= this.field3709.size() && var2 <= this.field3709.size()) { + return var2 < var1 ? new class413(this, var2, var1) : new class413(this, var1, var2); + } else { + return new class413(this, 0, 0); + } + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(CIIS)Lpb;", + garbageValue = "7902" + ) + public class410 method2079(char var1, int var2, int var3) { + return this.method2080(Character.toString(var1), var2, var3); + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;IIB)Lpb;", + garbageValue = "-45" + ) + public class410 method2080(String var1, int var2, int var3) { + if (var3 == 0) { + var3 = Integer.MAX_VALUE; + } + + int var4 = var2; + if (this.field3709.size() >= var3) { + this.method2100(var2, var2); + return new class410(var2, true); + } else { + this.field3709.ensureCapacity(this.field3709.size() + var1.length()); + + for (int var5 = 0; var5 < var1.length() && this.field3709.size() < var3; ++var5) { + class411 var6 = new class411(); + var6.field3713 = var1.charAt(var5); + this.field3709.add(var4, var6); + ++var4; + } + + this.method2100(var2, var4); + if (this.field3706 != 0 && this.method2091() > this.field3706) { + while (var4 != var2) { + --var4; + this.method2084(var4); + if (this.method2091() <= this.field3706) { + break; + } + } + + return new class410(var4, true); + } else { + return new class410(var4, false); } } + } - var4 += var1; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)Lpb;", + garbageValue = "-2106167498" + ) + class410 method2081(String var1, int var2) { + return this.method2080(var1, this.field3709.size(), var2); + } - for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Lpb;", + garbageValue = "-2022964950" + ) + public class410 method2082(String var1) { + this.method2083(); + return this.method2081(var1, 0); + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-14773" + ) + void method2083() { + this.field3709.clear(); + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "398036956" + ) + public int method2084(int var1) { + return this.method2085(var1, var1 + 1); + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "895943109" + ) + public int method2085(int var1, int var2) { + int var3; + if (var2 < var1) { + var3 = var2; + var2 = var1; + var1 = var3; } - for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { + this.field3709.subList(var1, var2).clear(); + var3 = var1; + if (this.method2068() && this.field3707 == 1) { + while (var3 > 0) { + --var3; + char var4 = ((class411)this.field3709.get(var3)).field3713; + if (var4 == ' ' || var4 == '\t') { + break; + } + } } + this.method2100(var3, var2); + return var1; } - @ObfuscatedName("af") - @Export("clearIntArray") - public static void clearIntArray(int[] var0, int var1, int var2) { - for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1582951780" + ) + public int method2086(int var1, int var2) { + if (this.field3710 == null) { + return 0; + } else if (this.method2068() && var1 > this.field3705) { + return this.field3709.size(); + } else { + if (!this.field3709.isEmpty()) { + for (int var3 = 0; var3 < this.field3709.size(); ++var3) { + class411 var4 = (class411)this.field3709.get(var3); + if (var2 <= var4.field3714 + this.method2090()) { + if (var2 < var4.field3714) { + break; + } + + if (var1 < var4.field3715) { + return var3 > 0 ? var3 - 1 : 0; + } + + if (1 + var3 != this.field3709.size() && ((class411)this.field3709.get(var3 + 1)).field3714 != var4.field3714) { + int var5 = this.method2102((class411)this.field3709.get(var3), false); + if (var1 < var5 + var4.field3715) { + return var3; + } + + if (var2 <= var4.field3714 + this.method2090()) { + return var3 + 1; + } + } + } + } + + class411 var6 = (class411)this.field3709.get(this.field3709.size() - 1); + if (var1 >= var6.field3715 && var1 <= var6.field3715 + this.method2092() && var2 >= var6.field3714 && var2 <= var6.field3714 + this.method2090()) { + return this.field3709.size() - 1; + } + } + + return this.field3709.size(); } + } - for (var2 += 7; var1 < var2; var0[var1++] = 0) { + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1702844331" + ) + public int method2087(int var1, int var2) { + if (this.field3710 != null && !this.method2067() && var1 <= this.field3709.size()) { + byte var3; + if (var2 > 0) { + var3 = 1; + } else { + var3 = -1; + var2 = -var2; + } + + int var4 = 0; + int var5 = 0; + if (var1 > 0) { + class411 var6 = (class411)this.field3709.get(var1 - 1); + var4 = var6.field3715 + this.method2101(var1 - 1); + var5 = var6.field3714; + } else if (var3 == -1 && var1 == 0) { + return 0; + } + + int var14 = 16777215; + int var7 = 0; + int var8 = var1; + int var9 = 16777215; + int var10 = var3 == 1 ? this.field3709.size() + 1 : 0; + + for (int var11 = var3 + var1; var10 != var11; var11 += var3) { + class411 var12 = (class411)this.field3709.get(var11 - 1); + if (var5 != var12.field3714) { + ++var7; + var5 = var12.field3714; + if (var7 > var2) { + return var8; + } + } + + if (var7 == var2) { + int var13 = Math.abs(var12.field3715 + this.method2101(var11 - 1) - var4); + if (var13 >= var9) { + return var8; + } + + var8 = var11; + var9 = var13; + } + } + + if (var3 == 1) { + return this.field3709.size(); + } else { + if (var5 != 0) { + ++var7; + } + + return var9 == 16777215 || var7 == var2 && var4 < var9 ? 0 : var8; + } + } else { + return 0; } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-512196245" + ) + public int method2088() { + if (!this.field3709.isEmpty() && this.method2091() == 1) { + return this.field3709.isEmpty() ? 0 : ((class411)this.field3709.get(this.field3709.size() - 1)).field3715 + this.method2092(); + } else { + int var1 = -1; + int var2 = 0; + + for (int var3 = this.field3709.size() - 1; var3 >= 0; --var3) { + class411 var4 = (class411)this.field3709.get(var3); + if (var1 != var4.field3714) { + int var5 = this.method2102(var4, false) + var4.field3715; + var2 = Math.max(var5, var2); + var1 = var4.field3714; + } + } + return var2; + } + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "67" + ) + public int method2089() { + return this.method2067() ? 0 : this.field3710.ascent + ((class411)this.field3709.get(this.field3709.size() - 1)).field3714; } @ObfuscatedName("ad") - public static void method2146(int[] var0, int var1, int var2, int var3) { - if (var2 == 0 && var3 == 0) { - var2 = (int)(Math.random() * 2.147483647E9D); - var3 = (int)(Math.random() * 2.147483647E9D); + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-51" + ) + public int method2090() { + return this.field3702; + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "458527670" + ) + public int method2091() { + return this.method2089() / this.field3710.ascent; + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-317463978" + ) + int method2092() { + return this.method2067() ? 0 : this.method2102((class411)this.field3709.get(this.field3709.size() - 1), false); + } + + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "4" + ) + public int method2093() { + return this.field3705; + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-59557509" + ) + public int method2094() { + return this.field3706; + } + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1977390124" + ) + public int method2095() { + return this.field3707; + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "13" + ) + public int method2096() { + return this.field3703; + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1372497203" + ) + public int method2097(int var1) { + switch(this.field3708) { + case 0: + return 0; + case 1: + return var1 / 2; + case 2: + return var1; + default: + return 0; + } + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1982314148" + ) + public int method2098(int var1) { + switch(this.field3704) { + case 0: + return 0; + case 1: + return var1 / 2; + case 2: + return var1; + default: + return 0; + } + } + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2112190855" + ) + void method2099() { + this.method2100(0, this.field3709.size()); + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-2040581189" + ) + void method2100(int var1, int var2) { + if (!this.method2067() && this.field3710 != null) { + class500 var3 = this.method2103(var1, var2); + boolean var4 = (Integer)var3.field4079 == 0 && (Integer)var3.field4080 == this.field3709.size(); + int var5 = (Integer)var3.field4079; + int var6 = 0; + int var7 = var4 ? 0 : ((class411)this.field3709.get((Integer)var3.field4079)).field3714 * 1441776133 * 402832077; + int var8 = 0; + + int var9; + for (var9 = (Integer)var3.field4079; var9 <= (Integer)var3.field4080; ++var9) { + boolean var10 = var9 >= this.field3709.size(); + class411 var11 = (class411)this.field3709.get(!var10 ? var9 : this.field3709.size() - 1); + int var12 = !var10 ? this.method2102(var11, false) : 0; + boolean var13 = !var10 && var11.field3713 == '\n'; + boolean var14 = !var10 && this.method2068() && var12 + var6 > this.field3705; + if (var13 || var14 || var10) { + int var15 = var9; + int var16 = 0; + int var17; + int var18; + class411 var19; + if (var14) { + var17 = 0; + if (this.field3707 == 1) { + for (var18 = var9; var18 > var5; --var18) { + var19 = (class411)this.field3709.get(var18); + var17 += var18 < var15 ? this.method2102(var19, false) : 0; + if (var19.field3713 == ' ' || var19.field3713 == '\n') { + var15 = var18; + var6 -= var17; + var16 = var17; + break; + } + } + } + } + + var17 = -this.method2097(var6); + + for (var18 = var5; var18 < var15; ++var18) { + var19 = (class411)this.field3709.get(var18); + int var20 = this.method2102(var19, false); + var19.field3715 = var17; + var19.field3714 = var7; + var17 += var20; + } + + var5 = var15; + var6 = var16; + var7 += this.method2090(); + ++var8; + } + + var6 += !var10 ? var12 : 0; + } + + if (this.field3704 != 0 && var4) { + var9 = var8 * this.method2090(); + int var23 = this.method2098(var9); + + for (int var21 = 0; var21 < this.field3709.size(); ++var21) { + class411 var22 = (class411)this.field3709.get(var21); + var22.field3714 -= var23; + } + } + } + } - long var4 = (long)var2 << 32 | (long)var3; - Random var6 = new Random(var4); + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1039874623" + ) + int method2101(int var1) { + return var1 < this.field3709.size() ? this.method2102((class411)this.field3709.get(var1), false) : 0; + } - for (int var7 = var1 - 1; var7 > 0; --var7) { - int var8 = var6.nextInt(var7 + 1); - if (var7 != var8) { - int var9 = var0[var7]; - var0[var7] = var0[var8]; - var0[var8] = var9; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(Lpe;ZI)I", + garbageValue = "1478006177" + ) + int method2102(class411 var1, boolean var2) { + if (var1.field3713 == '\n') { + return 0; + } else if (this.field3703 == 0) { + int var3 = this.field3710.advances[var1.field3713]; + if (var3 == 0) { + return var1.field3713 == '\t' ? this.field3710.advances[32] * 3 : this.field3710.advances[32]; + } else { + return var3; } + } else { + return this.field3710.advances[42]; } + } + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(IIB)Ltw;", + garbageValue = "26" + ) + class500 method2103(int var1, int var2) { + int var3 = Math.min(var1, var2); + int var4 = Math.max(var1, var2); + int var5 = this.field3709.size(); + if (var3 == 0 && var4 == var5) { + return new class500(0, var5); + } else { + int var6 = this.method2104(var3, false); + int var7 = this.method2105(var4, false); + int var8; + switch(this.field3704) { + case 0: + if (this.field3708 == 0) { + return new class500(var6, var5); + } + + var8 = this.method2104(var3, true); + return new class500(var8, var5); + case 1: + return new class500(0, var5); + case 2: + if (this.field3708 == 2) { + return new class500(0, var7); + } + + var8 = this.method2105(var4, true); + return new class500(0, var8); + default: + return new class500(0, var5); + } + } + } + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(IZS)I", + garbageValue = "-9654" + ) + int method2104(int var1, boolean var2) { + if (var1 < this.field3709.size()) { + int var3 = ((class411)this.field3709.get(var1)).field3714; + + for (int var4 = var1; var4 > 0; --var4) { + if (((class411)this.field3709.get(var4 - 1)).field3714 < var3) { + if (!var2) { + return var4; + } + + var2 = false; + var3 = ((class411)this.field3709.get(var4 - 1)).field3714; + } + } + } + + return 0; + } + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(IZI)I", + garbageValue = "-1749016193" + ) + int method2105(int var1, boolean var2) { + if (var1 < this.field3709.size()) { + int var3 = ((class411)this.field3709.get(var1)).field3714; + + for (int var4 = var1; var4 < this.field3709.size() - 1; ++var4) { + if (((class411)this.field3709.get(var4 + 1)).field3714 > var3) { + if (!var2) { + return var4; + } + + var2 = false; + var3 = ((class411)this.field3709.get(var4 + 1)).field3714; + } + } + } + + return this.field3709.size(); + } + + @ObfuscatedName("ov") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-11" + ) + static void method2106(int var0) { + if (var0 != Client.loginState) { + Client.loginState = var0; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class410.java b/osrs/src/main/java/class410.java index 803257c7c..313b5af74 100644 --- a/osrs/src/main/java/class410.java +++ b/osrs/src/main/java/class410.java @@ -1,30 +1,88 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ph") +@ObfuscatedName("pb") public class class410 { - @ObfuscatedName("ax") - @Export("ByteArrayPool_arrays") - static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("au") - int field3733; - @ObfuscatedName("ae") - int field3730; - @ObfuscatedName("ao") - int field3731; - @ObfuscatedName("at") - int field3732; - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - boolean var1 = true; - int var2 = 10 - Integer.toString(this.field3733).length(); - int var3 = 10 - Integer.toString(this.field3731).length(); - int var4 = 10 - Integer.toString(this.field3730).length(); - String var5 = " ".substring(10 - var2); - String var6 = " ".substring(10 - var3); - String var7 = " ".substring(10 - var4); - return " Size: " + this.field3733 + var5 + "Created: " + this.field3730 + var7 + "Total used: " + this.field3731 + var6 + "Max-In-Use: " + this.field3732; + @ObfuscatedName("ac") + int field3711; + + @ObfuscatedSignature( + descriptor = "(IZ)V", + garbageValue = "1" + ) + class410(int var1, boolean var2) { + this.field3711 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-15695" + ) + public int method2107() { + return this.field3711; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1656605881" + ) + static final boolean method2108(char var0) { + if (Character.isISOControl(var0)) { + return false; + } else if (Decimator.isAlphaNumeric(var0)) { + return true; + } else { + char[] var1 = class508.field4108; + + int var2; + char var3; + for (var2 = 0; var2 < var1.length; ++var2) { + var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } + + var1 = class508.field4109; + + for (var2 = 0; var2 < var1.length; ++var2) { + var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } + + return false; + } + } + + @ObfuscatedName("lz") + @ObfuscatedSignature( + descriptor = "(IIIIIIIII)V", + garbageValue = "-1849908879" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (class33.field89.method1742(var0)) { + class9.field16 = null; + Tile.drawInterface(class33.field89.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (class9.field16 != null) { + Tile.drawInterface(class9.field16, -1412584499, var1, var2, var3, var4, GrandExchangeEvent.field3617, class10.field24, var7); + class9.field16 = null; + } + + } else { + if (var7 != -1) { + Client.field408[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { + Client.field408[var8] = true; + } + } + + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class411.java b/osrs/src/main/java/class411.java new file mode 100644 index 000000000..fecb5fc47 --- /dev/null +++ b/osrs/src/main/java/class411.java @@ -0,0 +1,30 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pe") +public class class411 { + @ObfuscatedName("wf") + static long field3712; + @ObfuscatedName("ac") + public char field3713; + @ObfuscatedName("al") + public int field3715; + @ObfuscatedName("ak") + public int field3714; + + class411() { + this.field3715 = 0; + this.field3714 = 0; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;B)V", + garbageValue = "56" + ) + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + class164.addChatMessage(var0, var1, var2, (String)null); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class413.java b/osrs/src/main/java/class413.java new file mode 100644 index 000000000..0f6fbf949 --- /dev/null +++ b/osrs/src/main/java/class413.java @@ -0,0 +1,136 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pr") +public class class413 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lpp;" + ) + class409 field3740; + @ObfuscatedName("al") + int field3739; + @ObfuscatedName("ak") + int field3738; + + @ObfuscatedSignature( + descriptor = "(Lpp;II)V" + ) + class413(class409 var1, int var2, int var3) { + this.field3739 = 0; + this.field3738 = 0; + this.field3740 = var1; + this.field3739 = var2; + this.field3738 = var3; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1895014245" + ) + public String method2145() { + if (this.method2147()) { + return ""; + } else { + StringBuilder var1 = new StringBuilder(this.method2148()); + + for (int var2 = this.field3739; var2 < this.field3738; ++var2) { + class411 var3 = this.field3740.method2065(var2); + var1.append(var3.field3713); + } + + return var1.toString(); + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-819207986" + ) + boolean method2146(int var1) { + return this.field3740.method2096() == 2 || this.field3740.method2096() == 1 && (!this.field3740.field3701 || this.field3738 - 1 != var1); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-70" + ) + public boolean method2147() { + return this.field3738 == this.field3739; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-40" + ) + public int method2148() { + return this.field3738 - this.field3739; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Lpe;B)Z", + garbageValue = "4" + ) + boolean method2149(class411 var1) { + if (this.field3740.field3703 == 2) { + return true; + } else if (this.field3740.field3703 == 0) { + return false; + } else { + return this.field3740.method2066() != var1; + } + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1508488797" + ) + int method2150() { + if (this.method2147()) { + return 0; + } else { + class411 var1 = this.field3740.method2065(this.field3738 - 1); + if (var1.field3713 == '\n') { + return 0; + } else if (this.method2149(var1)) { + return this.field3740.field3710.advances[42]; + } else { + int var2 = this.field3740.field3710.advances[var1.field3713]; + if (var2 == 0) { + return var1.field3713 == '\t' ? this.field3740.field3710.advances[32] * 3 : this.field3740.field3710.advances[32]; + } else { + return var2; + } + } + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)Ltw;", + garbageValue = "-1209602899" + ) + public class500 method2151() { + if (this.method2147()) { + return new class500(0, 0); + } else { + class411 var1 = this.field3740.method2065(this.field3738 - 1); + return new class500(var1.field3715 + this.method2150(), var1.field3714); + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(IB)Lpe;", + garbageValue = "-52" + ) + public class411 method2152(int var1) { + return var1 >= 0 && var1 < this.method2148() ? this.field3740.method2065(this.field3739 + var1) : null; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class415.java b/osrs/src/main/java/class415.java deleted file mode 100644 index c213ddefa..000000000 --- a/osrs/src/main/java/class415.java +++ /dev/null @@ -1,270 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.io.IOException; - -@ObfuscatedName("pw") -public class class415 { - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "66" - ) - @Export("reloadJS5") - static void reloadJS5() { - if (KeyHandler.varcs.hasUnwrittenChanges()) { - KeyHandler.varcs.write(); - } - - if (class126.mouseRecorder != null) { - class126.mouseRecorder.isRunning = false; - } - - class126.mouseRecorder = null; - Client.packetWriter.close(); - if (GameEngine.taskHandler != null) { - try { - GameEngine.taskHandler.close(); - } catch (Exception var3) { - } - } - - GameEngine.taskHandler = null; - Tiles.method461(); - class1.archive2.clearFiles(); - Player.archive13.clearFiles(); - class106.field1107.clearFiles(); - Tiles.field838.clearFiles(); - class10.field28.clearFiles(); - WorldMapElement.field1509.clearFiles(); - ClanChannelMember.field1339.clearFiles(); - class227.field2040.clearFiles(); - class72.method424(); - class130.scene.clear(); - - for (int var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); - } - - Canvas.worldMap = null; - Script.method445(0, 0); - UrlRequester.method652(); - Client.playingJingle = false; - class388.method2029(); - if (AddRequestTask.pcmPlayer1 != null) { - AddRequestTask.pcmPlayer1.shutdown(); - } - - class308.field2819.method1940(); - class214.method1124(); - if (FriendsChat.urlRequester != null) { - FriendsChat.urlRequester.close(); - } - - class510.method2513(); - JagexCache.JagexCache_dat2File = null; - JagexCache.JagexCache_idx255File = null; - WallDecoration.JagexCache_idxFiles = null; - ItemContainer.method468(); - class6.masterDisk = null; - Client.archiveLoaders.clear(); - Client.field550 = 0; - class308.field2819 = new JagNetThread(); - FriendsChat.urlRequester = new class113(class219.client.field661, 216); - - try { - SecureRandomCallable.method462("oldschool", class30.field83, WorldMapLabelSize.field2323.name, 0, 22); - } catch (IOException var2) { - throw new RuntimeException(var2); - } - - class6.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - GameEngine.taskHandler = new TaskHandler(); - class219.client.method152(); - Client.field419 = class92.field940; - MusicSong.updateGameState(0); - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1762836764" - ) - static final void method2159() { - int var0; - int var1; - int var2; - int var3; - int var4; - int var5; - if (Client.oculusOrbState == 0) { - var0 = VarbitComposition.localPlayer.x; - var1 = VarbitComposition.localPlayer.y; - if (FriendLoginUpdate.oculusOrbFocalPointX - var0 < -500 || FriendLoginUpdate.oculusOrbFocalPointX - var0 > 500 || HealthBar.oculusOrbFocalPointY - var1 < -500 || HealthBar.oculusOrbFocalPointY - var1 > 500) { - FriendLoginUpdate.oculusOrbFocalPointX = var0; - HealthBar.oculusOrbFocalPointY = var1; - } - - if (var0 != FriendLoginUpdate.oculusOrbFocalPointX) { - FriendLoginUpdate.oculusOrbFocalPointX += (var0 - FriendLoginUpdate.oculusOrbFocalPointX) / 16; - } - - if (var1 != HealthBar.oculusOrbFocalPointY) { - HealthBar.oculusOrbFocalPointY += (var1 - HealthBar.oculusOrbFocalPointY) / 16; - } - - var2 = FriendLoginUpdate.oculusOrbFocalPointX >> 7; - var3 = HealthBar.oculusOrbFocalPointY >> 7; - var4 = class18.getTileHeight(FriendLoginUpdate.oculusOrbFocalPointX, HealthBar.oculusOrbFocalPointY, HealthBar.Client_plane); - var5 = 0; - int var6; - if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { - for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { - for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { - int var8 = HealthBar.Client_plane; - if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { - ++var8; - } - - int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; - if (var9 > var5) { - var5 = var9; - } - } - } - } - - var6 = var5 * 192; - if (var6 > 98048) { - var6 = 98048; - } - - if (var6 < 32768) { - var6 = 32768; - } - - if (var6 > Client.field467) { - Client.field467 += (var6 - Client.field467) / 24; - } else if (var6 < Client.field467) { - Client.field467 += (var6 - Client.field467) / 80; - } - - class125.field1194 = class18.getTileHeight(VarbitComposition.localPlayer.x, VarbitComposition.localPlayer.y, HealthBar.Client_plane) - Client.camFollowHeight; - } else if (Client.oculusOrbState == 1) { - class28.method111(); - short var10 = -1; - if (Client.keyHandlerInstance.getKeyPressed(33)) { - var10 = 0; - } else if (Client.keyHandlerInstance.getKeyPressed(49)) { - var10 = 1024; - } - - if (Client.keyHandlerInstance.getKeyPressed(48)) { - if (var10 == 0) { - var10 = 1792; - } else if (var10 == 1024) { - var10 = 1280; - } else { - var10 = 1536; - } - } else if (Client.keyHandlerInstance.getKeyPressed(50)) { - if (var10 == 0) { - var10 = 256; - } else if (var10 == 1024) { - var10 = 768; - } else { - var10 = 512; - } - } - - byte var11 = 0; - if (Client.keyHandlerInstance.getKeyPressed(35)) { - var11 = -1; - } else if (Client.keyHandlerInstance.getKeyPressed(51)) { - var11 = 1; - } - - var2 = 0; - if (var10 >= 0 || var11 != 0) { - var2 = Client.keyHandlerInstance.getKeyPressed(81) ? Client.oculusOrbSlowedSpeed * 1039153205 * -557098467 : Client.oculusOrbNormalSpeed * -554086649 * 623963831; - var2 *= 16; - Client.field468 = var10; - Client.field471 = var11; - } - - if (Client.field480 < var2) { - Client.field480 += var2 / 8; - if (Client.field480 > var2) { - Client.field480 = var2; - } - } else if (Client.field480 > var2) { - Client.field480 = Client.field480 * 9 / 10; - } - - if (Client.field480 > 0) { - var3 = Client.field480 / 16; - if (Client.field468 >= 0) { - var0 = Client.field468 - UserComparator10.cameraYaw & 2047; - var4 = Rasterizer3D.Rasterizer3D_sine[var0]; - var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; - FriendLoginUpdate.oculusOrbFocalPointX += var4 * var3 / 65536; - HealthBar.oculusOrbFocalPointY += var5 * var3 / 65536; - } - - if (Client.field471 != 0) { - class125.field1194 += var3 * Client.field471; - if (class125.field1194 > 0) { - class125.field1194 = 0; - } - } - } else { - Client.field468 = -1; - Client.field471 = -1; - } - - if (Client.keyHandlerInstance.getKeyPressed(13)) { - ObjectSound.method416(); - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && ObjTypeCustomisation.mouseCam) { - var0 = MouseHandler.MouseHandler_y - Client.field465; - Client.camAngleDX = var0 * 2; - Client.field465 = var0 != -1 && var0 != 1 ? (Client.field465 + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * 1545391541 * 1675983005; - var1 = Client.field473 - MouseHandler.MouseHandler_x; - Client.camAngleDY = var1 * 2; - Client.field473 = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.field473) / 2 : MouseHandler.MouseHandler_x * 72258787 * 2105757899; - } else { - if (Client.keyHandlerInstance.getKeyPressed(96)) { - Client.camAngleDY += (-24 - Client.camAngleDY) / 2; - } else if (Client.keyHandlerInstance.getKeyPressed(97)) { - Client.camAngleDY += (24 - Client.camAngleDY) / 2; - } else { - Client.camAngleDY /= 2; - } - - if (Client.keyHandlerInstance.getKeyPressed(98)) { - Client.camAngleDX += (12 - Client.camAngleDX) / 2; - } else if (Client.keyHandlerInstance.getKeyPressed(99)) { - Client.camAngleDX += (-12 - Client.camAngleDX) / 2; - } else { - Client.camAngleDX /= 2; - } - - Client.field465 = MouseHandler.MouseHandler_y; - Client.field473 = MouseHandler.MouseHandler_x; - } - - Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; - Client.camAngleX += Client.camAngleDX / 2; - if (Client.camAngleX < 128) { - Client.camAngleX = 128; - } - - if (Client.camAngleX > 383) { - Client.camAngleX = 383; - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class416.java b/osrs/src/main/java/class416.java index d29179b61..175758ac3 100644 --- a/osrs/src/main/java/class416.java +++ b/osrs/src/main/java/class416.java @@ -2,80 +2,85 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qe") -public class class416 { - @ObfuscatedName("ag") - @Export("ByteArrayPool_alternativeSizes") - static int[] ByteArrayPool_alternativeSizes; +import java.applet.Applet; +import java.util.ArrayList; +import java.util.Iterator; - @ObfuscatedName("ae") +@ObfuscatedName("qi") +public class class416 extends SongTask { + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1333151916" + descriptor = "Lnm;" ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); - if (var4 == null) { - var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); - } + @Export("scriptDotWidget") + static Widget scriptDotWidget; + @ObfuscatedName("ac") + ArrayList field3743; - Message var5 = var4.addMessage(var0, var1, var2, var3); - Messages.Messages_hashTable.put(var5, (long)var5.count); - Messages.Messages_queue.add(var5); - Client.chatCycle = Client.cycleCntr; + @ObfuscatedSignature( + descriptor = "(Lqm;Ljava/util/ArrayList;)V" + ) + public class416(SongTask var1, ArrayList var2) { + super(var1); + super.field3753 = "ClearRequestTask"; + this.field3743 = var2; } - @ObfuscatedName("ia") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2143808168" + descriptor = "(B)Z", + garbageValue = "-90" ) - static final void method2161(int var0, int var1) { - if (var0 < 128) { - var0 = 128; - } else if (var0 > 383) { - var0 = 383; - } + @Export("vmethod2142") + public boolean vmethod2142() { + if (this.field3743.isEmpty()) { + return true; + } else { + Iterator var1 = this.field3743.iterator(); - if (class129.cameraPitch < var0) { - class129.cameraPitch = (var0 - class129.cameraPitch) * WorldMapElement.cameraLookAtAcceleration / 1000 + class129.cameraPitch + class33.cameraLookAtSpeed; - if (class129.cameraPitch > var0) { - class129.cameraPitch = var0; - } - } else if (class129.cameraPitch > var0) { - class129.cameraPitch -= (class129.cameraPitch - var0) * WorldMapElement.cameraLookAtAcceleration / 1000 + class33.cameraLookAtSpeed; - if (class129.cameraPitch < var0) { - class129.cameraPitch = var0; - } - } + while (var1.hasNext()) { + MusicSong var2 = (MusicSong)var1.next(); - var1 &= 2047; - int var2 = var1 - UserComparator10.cameraYaw; - if (var2 > 1024) { - var2 -= 2048; - } else if (var2 < -1024) { - var2 += 2048; - } + try { + if (class319.musicSongs.contains(var2)) { + if (var2 == null) { + class319.musicSongs.remove(var2); + } else { + if (var2.midiPcmStream.field2833 > 0) { + --var2.midiPcmStream.field2833; + } - if (var2 > 0) { - UserComparator10.cameraYaw = UserComparator10.cameraYaw + class33.cameraLookAtSpeed + var2 * WorldMapElement.cameraLookAtAcceleration / 1000; - UserComparator10.cameraYaw &= 2047; - } else if (var2 < 0) { - UserComparator10.cameraYaw -= -var2 * WorldMapElement.cameraLookAtAcceleration / 1000 + class33.cameraLookAtSpeed; - UserComparator10.cameraYaw &= 2047; - } + if (var2.midiPcmStream.field2833 == 0) { + var2.midiPcmStream.clear(); + var2.midiPcmStream.method1666(); + var2.midiPcmStream.setPcmStreamVolume(0); + } + + WorldMapDecorationType.method1897(var2.musicTrackGroupId, var2.musicTrackFileId); + class319.musicSongs.remove(var2); + } + } + } catch (Exception var4) { + class190.RunException_sendStackTrace((String)null, var4); + this.method2170(var4.getMessage()); + class319.musicSongs.clear(); + return true; + } + } - int var3 = var1 - UserComparator10.cameraYaw; - if (var3 > 1024) { - var3 -= 2048; - } else if (var3 < -1024) { - var3 += 2048; + return true; } + } - if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { - UserComparator10.cameraYaw = var1; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)V", + garbageValue = "25" + ) + public static void method2159(Applet var0, String var1) { + class31.field83 = var0; + if (var1 != null) { + class31.field84 = var1; } } diff --git a/osrs/src/main/java/class418.java b/osrs/src/main/java/class418.java index a68fecf0e..03eb4318a 100644 --- a/osrs/src/main/java/class418.java +++ b/osrs/src/main/java/class418.java @@ -1,45 +1,51 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qn") -public class class418 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lqn;" - ) - static final class418 field3759; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lqn;" - ) - static final class418 field3758; - @ObfuscatedName("ao") - final String field3760; - - static { - field3759 = new class418("Basic"); - field3758 = new class418("Bearer"); - } +import java.util.Iterator; - class418(String var1) { - this.field3760 = var1; - } - - @ObfuscatedName("au") +@ObfuscatedName("qw") +public class class418 extends SongTask { @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "75" + descriptor = "(Lqm;)V" ) - String method2162() { - return this.field3760; + public class418(SongTask var1) { + super(var1); + super.field3753 = "StartSongTask"; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)[Lrq;", - garbageValue = "-2125486223" + descriptor = "(B)Z", + garbageValue = "-90" ) - static class453[] method2163() { - return new class453[]{class453.field3896, class453.field3893, class453.field3894, class453.field3895}; + @Export("vmethod2142") + public boolean vmethod2142() { + Iterator var1 = class319.musicSongs.iterator(); + + while (var1.hasNext()) { + MusicSong var2 = (MusicSong)var1.next(); + if (var2 != null && !var2.field2884 && var2.midiPcmStream != null) { + try { + var2.midiPcmStream.method1665(); + var2.midiPcmStream.setPcmStreamVolume(0); + if (var2.field2892 != null) { + var2.midiPcmStream.setMusicTrack(var2.field2892, var2.musicTrackBoolean); + } + + var2.field2892 = null; + var2.field2883 = null; + var2.musicTrackArchive = null; + var2.field2884 = true; + } catch (Exception var4) { + class190.RunException_sendStackTrace((String)null, var4); + this.method2170(var4.getMessage()); + return true; + } + } + } + + super.field3752 = true; + return true; } } \ No newline at end of file diff --git a/osrs/src/main/java/class419.java b/osrs/src/main/java/class419.java deleted file mode 100644 index c91875c43..000000000 --- a/osrs/src/main/java/class419.java +++ /dev/null @@ -1,182 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import javax.net.ssl.HttpsURLConnection; -import java.text.DecimalFormat; -import java.util.*; -import java.util.Map.Entry; - -@ObfuscatedName("qf") -public class class419 { - @ObfuscatedName("nx") - @Export("menuY") - static int menuY; - @ObfuscatedName("at") - final Map field3764; - @ObfuscatedName("ac") - final Map field3763; - @ObfuscatedName("ai") - final DecimalFormat field3762; - - public class419() { - this.field3764 = new HashMap(); - this.field3763 = new HashMap(); - this.field3762 = new DecimalFormat(); - this.field3762.setMaximumFractionDigits(2); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljavax/net/ssl/HttpsURLConnection;B)V", - garbageValue = "14" - ) - public void method2164(HttpsURLConnection var1) { - Iterator var2 = this.field3764.entrySet().iterator(); - - while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); - var1.setRequestProperty((String)var3.getKey(), (String)var3.getValue()); - } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/Map;", - garbageValue = "1187497182" - ) - public Map method2165() { - return this.field3764; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "2091196892" - ) - public void method2166(String var1, String var2) { - if (var1 != null && !var1.isEmpty()) { - this.field3764.put(var1, var2 != null ? var2 : ""); - } - - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-321106609" - ) - public void method2167(String var1) { - if (var1 != null && !var1.isEmpty()) { - this.field3764.remove(var1); - } - - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lqn;Ljava/lang/String;B)V", - garbageValue = "19" - ) - void method2168(class418 var1, String var2) { - String var3 = String.format("%s %s", var1.method2162(), var2); - this.method2166("Authorization", var3); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1710758973" - ) - public void method2169(String var1) { - this.method2168(class418.field3759, var1); - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-911338485" - ) - public void method2170(String var1) { - this.method2168(class418.field3758, var1); - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Lre;I)V", - garbageValue = "858846638" - ) - public void method2171(class460 var1) { - this.field3764.put("Content-Type", var1.method2331()); - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "10" - ) - public void method2172() { - this.field3764.remove("Content-Type"); - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(Lre;B)V", - garbageValue = "103" - ) - public void method2173(class460 var1) { - this.method2174(var1, 1.0F); - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(Lre;FI)V", - garbageValue = "-2080888931" - ) - void method2174(class460 var1, float var2) { - this.field3763.put(var1, Math.max(0.0F, Math.min(1.0F, var2))); - this.method2175(); - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-689194447" - ) - void method2175() { - this.field3764.remove("Accept"); - if (!this.field3763.isEmpty()) { - this.field3764.put("Accept", this.method2176()); - } - - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "92" - ) - String method2176() { - ArrayList var1 = new ArrayList(this.field3763.entrySet()); - Collections.sort(var1, new class420(this)); - StringBuilder var2 = new StringBuilder(); - Iterator var3 = var1.iterator(); - - while (var3.hasNext()) { - Entry var4 = (Entry)var3.next(); - if (var2.length() > 0) { - var2.append(","); - } - - var2.append(((class460)var4.getKey()).method2331()); - float var5 = (Float)var4.getValue(); - if (var5 < 1.0F) { - String var6 = this.field3762.format((double)var5); - var2.append(";q=").append(var6); - } - } - - return var2.toString(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class421.java b/osrs/src/main/java/class421.java deleted file mode 100644 index eb43a9331..000000000 --- a/osrs/src/main/java/class421.java +++ /dev/null @@ -1,27 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("qm") -public class class421 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lqm;" - ) - public static final class421 field3766; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lqm;" - ) - static final class421 field3767; - @ObfuscatedName("ao") - final int field3768; - - static { - field3766 = new class421(0); - field3767 = new class421(1); - } - - class421(int var1) { - this.field3768 = var1; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class422.java b/osrs/src/main/java/class422.java deleted file mode 100644 index ce1ab0cc5..000000000 --- a/osrs/src/main/java/class422.java +++ /dev/null @@ -1,53 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Comparator; - -@ObfuscatedName("qw") -class class422 implements Comparator { - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - static AbstractArchive field3769; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lqv;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final class423 this$0; - - @ObfuscatedSignature( - descriptor = "(Lqv;)V" - ) - class422(class423 var1) { - this.this$0 = var1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lqj;Lqj;I)I", - garbageValue = "-1576026190" - ) - int method2178(class424 var1, class424 var2) { - if (var1.field3779 > var2.field3779) { - return 1; - } else { - return var1.field3779 < var2.field3779 ? -1 : 0; - } - } - - @Export("compare") - @ObfuscatedName("compare") - public int compare(Object var1, Object var2) { - return this.method2178((class424)var1, (class424)var2); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - return super.equals(var1); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class423.java b/osrs/src/main/java/class423.java index a6a7aac61..68a5eade1 100644 --- a/osrs/src/main/java/class423.java +++ b/osrs/src/main/java/class423.java @@ -1,199 +1,93 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Map; +import java.util.Iterator; -@ObfuscatedName("qv") -public final class class423 { - @ObfuscatedName("au") - final Comparator field3771; - @ObfuscatedName("ae") - final Map field3772; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - final class392 field3774; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - final class392 field3775; +@ObfuscatedName("ql") +public class class423 extends SongTask { @ObfuscatedName("ac") - final long field3773; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lqm;" - ) - final class421 field3776; - @ObfuscatedName("az") - final int field3770; - @ObfuscatedSignature( - descriptor = "(JILqm;)V" + descriptor = "Lom;" ) - class423(long var1, int var3, class421 var4) { - this.field3771 = new class422(this); - this.field3773 = var1; - this.field3770 = var3; - this.field3776 = var4; - if (this.field3770 == -1) { - this.field3772 = new HashMap(64); - this.field3774 = new class392(64, this.field3771); - this.field3775 = null; - } else { - if (this.field3776 == null) { - throw new IllegalArgumentException(""); - } - - this.field3772 = new HashMap(this.field3770); - this.field3774 = new class392(this.field3770, this.field3771); - this.field3775 = new class392(this.field3770); - } - - } - + AbstractArchive field3758; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(ILqm;)V" + descriptor = "Lom;" ) - public class423(int var1, class421 var2) { - this(-1L, var1, var2); - } - - @ObfuscatedName("au") + AbstractArchive field3759; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1594986015" + descriptor = "Lom;" ) - boolean method2179() { - return this.field3770 != -1; - } + AbstractArchive field3757; - @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;B)Ljava/lang/Object;", - garbageValue = "-31" + descriptor = "(Lqm;Lom;Lom;Lom;)V" ) - public Object method2180(Object var1) { - synchronized(this) { - if (this.field3773 != -1L) { - this.method2183(); - } - - class424 var3 = (class424)this.field3772.get(var1); - if (var3 == null) { - return null; - } else { - this.method2182(var3, false); - return var3.field3778; - } - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "-396691149" - ) - public Object method2181(Object var1, Object var2) { - synchronized(this) { - if (this.field3773 != -1L) { - this.method2183(); - } - - class424 var4 = (class424)this.field3772.get(var1); - if (var4 != null) { - Object var8 = var4.field3778; - var4.field3778 = var2; - this.method2182(var4, false); - return var8; - } else { - class424 var5; - if (this.method2179() && this.field3772.size() == this.field3770) { - var5 = (class424)this.field3775.remove(); - this.field3772.remove(var5.field3777); - this.field3774.remove(var5); - } - - var5 = new class424(var2, var1); - this.field3772.put(var1, var5); - this.method2182(var5, true); - return null; - } - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Lqj;ZB)V", - garbageValue = "16" - ) - void method2182(class424 var1, boolean var2) { - if (!var2) { - this.field3774.remove(var1); - if (this.method2179() && !this.field3775.remove(var1)) { - throw new IllegalStateException(""); - } - } - - var1.field3779 = System.currentTimeMillis(); - if (this.method2179()) { - switch(this.field3776.field3768) { - case 0: - var1.field3780 = var1.field3779; - break; - case 1: - ++var1.field3780; - } - - this.field3775.add(var1); - } - - this.field3774.add(var1); + public class423(SongTask var1, AbstractArchive var2, AbstractArchive var3, AbstractArchive var4) { + super(var1); + this.field3758 = var2; + this.field3759 = var3; + this.field3757 = var4; + super.field3753 = "LoadSongTask"; } @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1791287945" + descriptor = "(B)Z", + garbageValue = "-90" ) - void method2183() { - if (this.field3773 == -1L) { - throw new IllegalStateException(""); - } else { - long var1 = System.currentTimeMillis() - this.field3773; - - while (!this.field3774.isEmpty()) { - class424 var3 = (class424)this.field3774.peek(); - if (var3.field3779 >= var1) { - return; + @Export("vmethod2142") + public boolean vmethod2142() { + int var1 = 0; + Iterator var2 = class319.musicSongs.iterator(); + + while (true) { + while (var2.hasNext()) { + MusicSong var3 = (MusicSong)var2.next(); + if (var3 != null && var3.midiPcmStream.field2833 > 1 && var3.midiPcmStream.method1670()) { + this.method2170("Attempted to load patches of already loading midiplayer!"); + return true; } - this.field3772.remove(var3.field3777); - this.field3774.remove(var3); - if (this.method2179()) { - this.field3775.remove(var3); + if (var3 != null && !var3.field2887) { + try { + if (var3.musicTrackArchive != null && var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { + if (var3.field2892 == null) { + var3.field2892 = MusicTrack.readTrack(var3.musicTrackArchive, var3.musicTrackGroupId, var3.musicTrackFileId); + if (var3.field2892 == null) { + continue; + } + } + + if (var3.field2883 == null) { + var3.field2883 = new SoundCache(this.field3757, this.field3759); + } + + if (var3.midiPcmStream.method1663(var3.field2892, this.field3758, var3.field2883)) { + ++var1; + var3.field2887 = true; + var3.midiPcmStream.method1664(); + } + } else { + ++var1; + } + } catch (Exception var5) { + class190.RunException_sendStackTrace((String)null, var5); + this.method2170(var5.getMessage()); + return true; + } + } else { + ++var1; } } - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "33" - ) - public void method2184() { - synchronized(this) { - this.field3772.clear(); - this.field3774.clear(); - if (this.method2179()) { - this.field3775.clear(); + if (var1 == class319.musicSongs.size()) { + return true; } + return false; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class424.java b/osrs/src/main/java/class424.java index 9712a8953..1edf8e75c 100644 --- a/osrs/src/main/java/class424.java +++ b/osrs/src/main/java/class424.java @@ -1,55 +1,94 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("qj") -public final class class424 implements Comparable { - @ObfuscatedName("au") - Object field3778; - @ObfuscatedName("ae") - Object field3777; - @ObfuscatedName("ao") - long field3779; - @ObfuscatedName("at") - long field3780; - - class424(Object var1, Object var2) { - this.field3778 = var1; - this.field3777 = var2; - } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lqj;B)I", - garbageValue = "1" - ) - int method2185(class424 var1) { - if (this.field3780 < var1.field3780) { - return -1; - } else { - return this.field3780 > var1.field3780 ? 1 : 0; +import java.util.Random; + +@ObfuscatedName("qn") +public class class424 { + @ObfuscatedName("ac") + @Export("writeRandomDat") + public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { + if (var2 == var0) { + if (var3 == var1) { + return; + } + + if (var3 > var1 && var3 < var4 + var1) { + --var4; + var1 += var4; + var3 += var4; + var4 = var1 - var4; + + for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + } + + for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { + } + + return; + } + } + + var4 += var1; + + for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; } - } - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (var1 instanceof class424) { - return this.field3777.equals(((class424)var1).field3777); - } else { - throw new IllegalArgumentException(); + for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { } + } - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - return this.field3777.hashCode(); + @ObfuscatedName("av") + @Export("clearIntArray") + public static void clearIntArray(int[] var0, int var1, int var2) { + for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + } + + for (var2 += 7; var1 < var2; var0[var1++] = 0) { + } + } - @Export("compareTo") - @ObfuscatedName("compareTo") - public int compareTo(Object var1) { - return this.method2185((class424)var1); + @ObfuscatedName("ag") + public static void method2177(int[] var0, int var1, int var2, int var3) { + if (var2 == 0 && var3 == 0) { + var2 = (int)(Math.random() * 2.147483647E9D); + var3 = (int)(Math.random() * 2.147483647E9D); + } + + long var4 = (long)var2 << 32 | (long)var3; + Random var6 = new Random(var4); + + for (int var7 = var1 - 1; var7 > 0; --var7) { + int var8 = var6.nextInt(var7 + 1); + if (var7 != var8) { + int var9 = var0[var7]; + var0[var7] = var0[var8]; + var0[var8] = var9; + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class425.java b/osrs/src/main/java/class425.java new file mode 100644 index 000000000..2605a8d69 --- /dev/null +++ b/osrs/src/main/java/class425.java @@ -0,0 +1,41 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qj") +public class class425 { + @ObfuscatedName("au") + @Export("ByteArrayPool_altSizeArrayCounts") + public static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("ac") + int field3761; + @ObfuscatedName("al") + int field3763; + @ObfuscatedName("ak") + int field3762; + @ObfuscatedName("ax") + int field3764; + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + boolean var1 = true; + int var2 = 10 - Integer.toString(this.field3761).length(); + int var3 = 10 - Integer.toString(this.field3762).length(); + int var4 = 10 - Integer.toString(this.field3763).length(); + String var5 = " ".substring(10 - var2); + String var6 = " ".substring(10 - var3); + String var7 = " ".substring(10 - var4); + return " Size: " + this.field3761 + var5 + "Created: " + this.field3763 + var7 + "Total used: " + this.field3762 + var6 + "Max-In-Use: " + this.field3764; + } + + @ObfuscatedName("ox") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-921532851" + ) + static void method2178() { + Client.packetWriter.addNode(ClanChannelMember.getPacketBufferNode(ClientPacket.FREECAM_EXIT, Client.packetWriter.isaacCipher)); + Client.oculusOrbState = 0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class427.java b/osrs/src/main/java/class427.java new file mode 100644 index 000000000..05715a4b5 --- /dev/null +++ b/osrs/src/main/java/class427.java @@ -0,0 +1,41 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qt") +public class class427 { + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-1086858940" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { + byte var2 = 4; + int var3 = var2 + 6; + int var4 = var2 + 6; + int var5 = UserComparator6.fontPlain12.lineWidth(var0, 250); + int var6 = UserComparator6.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 16777215); + UserComparator6.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + class19.method69(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2); + if (var1) { + class223.rasterProvider.drawFull(0, 0); + } else { + int var7 = var3; + int var8 = var4; + int var9 = var5; + int var10 = var6; + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { + Client.field407[var11] = true; + } + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class429.java b/osrs/src/main/java/class429.java new file mode 100644 index 000000000..405eb2610 --- /dev/null +++ b/osrs/src/main/java/class429.java @@ -0,0 +1,34 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qr") +public class class429 { + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1179877011" + ) + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + if (!class159.client.method357() && !class159.client.method359() && !class159.client.method358()) { + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + GameEngine.method166(2); + if (var0) { + Login.Login_password = ""; + } + + class188.method955(); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + + } else { + GameEngine.method166(10); + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class430.java b/osrs/src/main/java/class430.java new file mode 100644 index 000000000..4e6bf120c --- /dev/null +++ b/osrs/src/main/java/class430.java @@ -0,0 +1,63 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qh") +public class class430 { + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "([BIIB)Ljava/lang/String;", + garbageValue = "-12" + ) + public static String method2190(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; + int var5 = var1; + + int var8; + for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { + int var7 = var0[var5++] & 255; + if (var7 < 128) { + if (var7 == 0) { + var8 = 65533; + } else { + var8 = var7; + } + } else if (var7 < 192) { + var8 = 65533; + } else if (var7 < 224) { + if (var5 < var6 && (var0[var5] & 192) == 128) { + var8 = (var7 & 31) << 6 | var0[var5++] & 63; + if (var8 < 128) { + var8 = 65533; + } + } else { + var8 = 65533; + } + } else if (var7 < 240) { + if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { + var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; + if (var8 < 2048) { + var8 = 65533; + } + } else { + var8 = 65533; + } + } else if (var7 < 248) { + if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { + var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; + if (var8 >= 65536 && var8 <= 1114111) { + var8 = 65533; + } else { + var8 = 65533; + } + } else { + var8 = 65533; + } + } else { + var8 = 65533; + } + } + + return new String(var3, 0, var4); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class432.java b/osrs/src/main/java/class432.java new file mode 100644 index 000000000..4a5009e37 --- /dev/null +++ b/osrs/src/main/java/class432.java @@ -0,0 +1,564 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qy") +public class class432 { + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IB)Lng;", + garbageValue = "-17" + ) + public static GameBuild method2191(int var0) { + GameBuild[] var1 = class209.method1031(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + GameBuild var3 = var1[var2]; + if (var0 == var3.buildId) { + return var3; + } + } + + return null; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Lte;I)Ljava/lang/String;", + garbageValue = "1990083355" + ) + public static String method2192(CharSequence var0, LoginType var1) { + if (var0 == null) { + return null; + } else { + int var2 = 0; + + int var3; + for (var3 = var0.length(); var2 < var3 && DevicePcmPlayerProvider.method82(var0.charAt(var2)); ++var2) { + } + + while (var3 > var2 && DevicePcmPlayerProvider.method82(var0.charAt(var3 - 1))) { + --var3; + } + + int var4 = var3 - var2; + if (var4 >= 1) { + byte var6; + if (var1 == null) { + var6 = 12; + } else { + switch(var1.field4106) { + case 8: + var6 = 20; + break; + default: + var6 = 12; + } + } + + if (var4 <= var6) { + StringBuilder var10 = new StringBuilder(var4); + + for (int var11 = var2; var11 < var3; ++var11) { + char var7 = var0.charAt(var11); + if (class410.method2108(var7)) { + char var8; + switch(var7) { + case ' ': + case '-': + case '_': + case '\u00a0': + var8 = '_'; + break; + case '#': + case '[': + case ']': + var8 = var7; + break; + case '\u00c0': + case '\u00c1': + case '\u00c2': + case '\u00c3': + case '\u00c4': + case '\u00e0': + case '\u00e1': + case '\u00e2': + case '\u00e3': + case '\u00e4': + var8 = 'a'; + break; + case '\u00c7': + case '\u00e7': + var8 = 'c'; + break; + case '\u00c8': + case '\u00c9': + case '\u00ca': + case '\u00cb': + case '\u00e8': + case '\u00e9': + case '\u00ea': + case '\u00eb': + var8 = 'e'; + break; + case '\u00cd': + case '\u00ce': + case '\u00cf': + case '\u00ed': + case '\u00ee': + case '\u00ef': + var8 = 'i'; + break; + case '\u00d1': + case '\u00f1': + var8 = 'n'; + break; + case '\u00d2': + case '\u00d3': + case '\u00d4': + case '\u00d5': + case '\u00d6': + case '\u00f2': + case '\u00f3': + case '\u00f4': + case '\u00f5': + case '\u00f6': + var8 = 'o'; + break; + case '\u00d9': + case '\u00da': + case '\u00db': + case '\u00dc': + case '\u00f9': + case '\u00fa': + case '\u00fb': + case '\u00fc': + var8 = 'u'; + break; + case '\u00df': + var8 = 'b'; + break; + case '\u00ff': + case '\u0178': + var8 = 'y'; + break; + default: + var8 = Character.toLowerCase(var7); + } + + if (var8 != 0) { + var10.append(var8); + } + } + } + + if (var10.length() == 0) { + return null; + } + + return var10.toString(); + } + } + + return null; + } + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1639340549" + ) + static final int method2193(int var0, int var1, int var2) { + int var3 = var0 / var2; + int var4 = var0 & var2 - 1; + int var5 = var1 / var2; + int var6 = var1 & var2 - 1; + int var7 = Login.method433(var3, var5); + int var8 = Login.method433(var3 + 1, var5); + int var9 = Login.method433(var3, var5 + 1); + int var10 = Login.method433(var3 + 1, var5 + 1); + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; + int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); + int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; + int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); + int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; + int var15 = ((65536 - var16) * var11 >> 16) + (var16 * var13 >> 16); + return var15; + } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-2048863537" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; + if (TextureProvider.localPlayer.x >> 7 == Client.destinationX && TextureProvider.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; + } + + if (Client.field388) { + class199.addPlayerToScene(TextureProvider.localPlayer, false); + } + + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + class199.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + } + + TileItem.addNpcsToScene(true); + WorldMapArchiveLoader.method2420(); + TileItem.addNpcsToScene(false); + class471.method2366(); + + for (GraphicsObject var4 = (GraphicsObject)Client.graphicsObjects.last(); var4 != null; var4 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var4.plane == class87.Client_plane && !var4.isFinished) { + if (Client.cycle >= var4.cycleStart) { + var4.advance(Client.field460); + if (var4.isFinished) { + var4.remove(); + } else { + class10.scene.drawEntity(var4.plane, var4.x, var4.y, var4.z, 60, var4, 0, -1L, false); + } + } + } else { + var4.remove(); + } + } + + class53.setViewportShape(var0, var1, var2, var3, true); + var0 = Client.viewportOffsetX; + var1 = Client.viewportOffsetY; + var2 = Client.viewportWidth; + var3 = Client.viewportHeight; + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + Rasterizer3D.method1248(); + Rasterizer2D.method2682(); + int var37 = Client.camAngleX; + if (Client.field476 / 256 > var37) { + var37 = Client.field476 / 256; + } + + if (Client.cameraShaking[4] && Client.cameraMoveIntensity[4] + 128 > var37) { + var37 = Client.cameraMoveIntensity[4] + 128; + } + + int var5 = Client.camAngleY & 2047; + int var6 = ChatChannel.oculusOrbFocalPointX; + int var7 = class433.field3789; + int var8 = AbstractWorldMapData.oculusOrbFocalPointY; + int var9 = var37 * 3 + 600; + int var12 = var3 - 334; + if (var12 < 0) { + var12 = 0; + } else if (var12 > 100) { + var12 = 100; + } + + int var13 = (Client.zoomWidth - Client.zoomHeight) * var12 / 100 + Client.zoomHeight; + int var11 = var13 * var9 / 256; + var12 = 2048 - var37 & 2047; + var13 = 2048 - var5 & 2047; + int var14 = 0; + int var15 = 0; + int var16 = var11; + int var17; + int var18; + int var19; + if (var12 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var12]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var12]; + var19 = var18 * var15 - var17 * var11 >> 16; + var16 = var18 * var11 + var15 * var17 >> 16; + var15 = var19; + } + + if (var13 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var13]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var13]; + var19 = var17 * var16 + var14 * var18 >> 16; + var16 = var18 * var16 - var14 * var17 >> 16; + var14 = var19; + } + + if (Client.isCameraLocked) { + AbstractUserComparator.field3834 = var6 - var14; + TriBool.field3849 = var7 - var15; + JagexCache.field1450 = var8 - var16; + class14.field36 = var37; + GrandExchangeOfferOwnWorldComparator.field360 = var5; + } else { + Client.cameraX = var6 - var14; + class17.cameraY = var7 - var15; + WorldMapArea.cameraZ = var8 - var16; + class365.cameraPitch = var37; + WallDecoration.cameraYaw = var5; + } + + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (ChatChannel.oculusOrbFocalPointX >> 7 != TextureProvider.localPlayer.x >> 7 || AbstractWorldMapData.oculusOrbFocalPointY >> 7 != TextureProvider.localPlayer.y >> 7)) { + var17 = TextureProvider.localPlayer.plane; + var18 = (ChatChannel.oculusOrbFocalPointX >> 7) + class20.baseX; + var19 = (AbstractWorldMapData.oculusOrbFocalPointY >> 7) + class19.baseY; + PacketBufferNode var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.f20, Client.packetWriter.isaacCipher); + var20.packetBuffer.writeShortAddLE(var18); + var20.packetBuffer.writeShortLE(var19); + var20.packetBuffer.writeInt(Client.field366); + var20.packetBuffer.writeByteAdd(var17); + Client.packetWriter.addNode(var20); + } + + if (!Client.isCameraLocked) { + var11 = class136.method731(); + } else { + var11 = class232.method1196(); + } + + var12 = Client.cameraX; + var13 = class17.cameraY; + var14 = WorldMapArea.cameraZ; + var15 = class365.cameraPitch; + var16 = WallDecoration.cameraYaw; + + for (var17 = 0; var17 < 5; ++var17) { + if (Client.cameraShaking[var17]) { + var18 = (int)(Math.random() * (double)(Client.cameraShakeIntensity[var17] * 2 + 1) - (double)Client.cameraShakeIntensity[var17] + Math.sin((double)Client.cameraShakeCycle[var17] * ((double)Client.cameraShakeSpeed[var17] / 100.0D)) * (double)Client.cameraMoveIntensity[var17]); + if (var17 == 0) { + Client.cameraX += var18; + } + + if (var17 == 1) { + class17.cameraY += var18; + } + + if (var17 == 2) { + WorldMapArea.cameraZ += var18; + } + + if (var17 == 3) { + WallDecoration.cameraYaw = var18 + WallDecoration.cameraYaw & 2047; + } + + if (var17 == 4) { + class365.cameraPitch += var18; + if (class365.cameraPitch < 128) { + class365.cameraPitch = 128; + } + + if (class365.cameraPitch > 383) { + class365.cameraPitch = 383; + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var17 = MouseHandler.MouseHandler_lastPressedX; + var18 = MouseHandler.MouseHandler_lastPressedY; + } + + if (var17 >= var0 && var17 < var0 + var2 && var18 >= var1 && var18 < var3 + var1) { + class16.method53(var17 - var0, var18 - var1); + } else { + SpotAnimationDefinition.method1038(); + } + + class313.method1648(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + class313.method1648(); + var19 = Rasterizer3D.get3dZoom(); + Rasterizer3D.method1234(class159.client.field121); + Rasterizer3D.clips.field2290 = Client.viewportZoom; + class10.scene.draw(Client.cameraX, class17.cameraY, WorldMapArea.cameraZ, class365.cameraPitch, WallDecoration.cameraYaw, var11); + Rasterizer3D.method1234(false); + if (Client.renderSelf) { + Rasterizer2D.method2683(); + } + + Rasterizer3D.clips.field2290 = var19; + class313.method1648(); + class10.scene.clearTempGameObjects(); + Client.overheadTextLimit = 0; + boolean var38 = false; + int var21 = -1; + int var22 = -1; + int var23 = Players.Players_count; + int[] var24 = Players.Players_indices; + + int var25; + for (var25 = 0; var25 < var23 + Client.npcCount; ++var25) { + Object var26; + if (var25 < var23) { + var26 = Client.players[var24[var25]]; + if (var24[var25] == Client.combatTargetPlayerIndex) { + var38 = true; + var21 = var25; + continue; + } + + if (var26 == TextureProvider.localPlayer) { + var22 = var25; + continue; + } + } else { + var26 = Client.npcs[Client.npcIndices[var25 - var23]]; + } + + class232.drawActor2d((Actor)var26, var25, var0, var1, var2, var3); + } + + if (Client.field388 && var22 != -1) { + class232.drawActor2d(TextureProvider.localPlayer, var22, var0, var1, var2, var3); + } + + if (var38) { + class232.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var21, var0, var1, var2, var3); + } + + for (var25 = 0; var25 < Client.overheadTextLimit; ++var25) { + int var39 = Client.overheadTextXs[var25]; + int var27 = Client.overheadTextYs[var25]; + int var28 = Client.overheadTextXOffsets[var25]; + int var29 = Client.overheadTextAscents[var25]; + boolean var30 = true; + + while (var30) { + var30 = false; + + for (int var31 = 0; var31 < var25; ++var31) { + if (var27 + 2 > Client.overheadTextYs[var31] - Client.overheadTextAscents[var31] && var27 - var29 < Client.overheadTextYs[var31] + 2 && var39 - var28 < Client.overheadTextXOffsets[var31] + Client.overheadTextXs[var31] && var28 + var39 > Client.overheadTextXs[var31] - Client.overheadTextXOffsets[var31] && Client.overheadTextYs[var31] - Client.overheadTextAscents[var31] < var27) { + var27 = Client.overheadTextYs[var31] - Client.overheadTextAscents[var31]; + var30 = true; + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var25]; + Client.viewportTempY = Client.overheadTextYs[var25] = var27; + String var40 = Client.field602[var25]; + if (Client.chatEffects == 0) { + int var32 = 16776960; + if (Client.overheadTextColors[var25] < 6) { + var32 = Client.field580[Client.overheadTextColors[var25]]; + } + + if (Client.overheadTextColors[var25] == 6) { + var32 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var25] == 7) { + var32 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var25] == 8) { + var32 = Client.viewportDrawCount % 20 < 10 ? '\ub000' : 8454016; + } + + int var33; + if (Client.overheadTextColors[var25] == 9) { + var33 = 150 - Client.overheadTextCyclesRemaining[var25]; + if (var33 < 50) { + var32 = var33 * 1280 + 16711680; + } else if (var33 < 100) { + var32 = 16776960 - (var33 - 50) * 327680; + } else if (var33 < 150) { + var32 = (var33 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var25] == 10) { + var33 = 150 - Client.overheadTextCyclesRemaining[var25]; + if (var33 < 50) { + var32 = var33 * 5 + 16711680; + } else if (var33 < 100) { + var32 = 16711935 - (var33 - 50) * 327680; + } else if (var33 < 150) { + var32 = (var33 - 100) * 327680 + 255 - (var33 - 100) * 5; + } + } + + if (Client.overheadTextColors[var25] == 11) { + var33 = 150 - Client.overheadTextCyclesRemaining[var25]; + if (var33 < 50) { + var32 = 16777215 - var33 * 327685; + } else if (var33 < 100) { + var32 = (var33 - 50) * 327685 + 65280; + } else if (var33 < 150) { + var32 = 16777215 - (var33 - 100) * 327680; + } + } + + int var34; + if (Client.overheadTextColors[var25] == 12 && Client.field595[var25] == null) { + var33 = var40.length(); + Client.field595[var25] = new int[var33]; + + for (var34 = 0; var34 < var33; ++var34) { + int var35 = (int)(64.0F * ((float)var34 / (float)var33)); + int var36 = var35 << 10 | 896 | 64; + Client.field595[var25][var34] = class481.field3942[var36]; + } + } + + if (Client.overheadTextEffects[var25] == 0) { + SoundCache.fontBold12.method2130(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var32, 0, Client.field595[var25]); + } + + if (Client.overheadTextEffects[var25] == 1) { + SoundCache.fontBold12.method2127(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var32, 0, Client.viewportDrawCount, Client.field595[var25]); + } + + if (Client.overheadTextEffects[var25] == 2) { + SoundCache.fontBold12.method2128(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var32, 0, Client.viewportDrawCount, Client.field595[var25]); + } + + if (Client.overheadTextEffects[var25] == 3) { + SoundCache.fontBold12.method2129(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var32, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var25], Client.field595[var25]); + } + + if (Client.overheadTextEffects[var25] == 4) { + var33 = (150 - Client.overheadTextCyclesRemaining[var25]) * (SoundCache.fontBold12.stringWidth(var40) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + SoundCache.fontBold12.method2131(var40, var0 + Client.viewportTempX + 50 - var33, Client.viewportTempY + var1, var32, 0, Client.field595[var25]); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + + if (Client.overheadTextEffects[var25] == 5) { + var33 = 150 - Client.overheadTextCyclesRemaining[var25]; + var34 = 0; + if (var33 < 25) { + var34 = var33 - 25; + } else if (var33 > 125) { + var34 = var33 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - SoundCache.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + SoundCache.fontBold12.method2130(var40, var0 + Client.viewportTempX, var34 + Client.viewportTempY + var1, var32, 0, Client.field595[var25]); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + } else { + SoundCache.fontBold12.drawCentered(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); + } + } + + HealthBarDefinition.method991(var0, var1); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).animate(Client.field460); + ConcurrentMidiTask.method2173(); + Client.cameraX = var12; + class17.cameraY = var13; + WorldMapArea.cameraZ = var14; + class365.cameraPitch = var15; + WallDecoration.cameraYaw = var16; + if (Client.isLoading && class59.field309.method1968(true, false) == 0) { + Client.isLoading = false; + } + + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + class427.drawLoadingMessage("Loading - please wait.", false); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class433.java b/osrs/src/main/java/class433.java new file mode 100644 index 000000000..e6ccc4d19 --- /dev/null +++ b/osrs/src/main/java/class433.java @@ -0,0 +1,38 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qf") +public class class433 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lqf;" + ) + static final class433 field3790; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lqf;" + ) + static final class433 field3791; + @ObfuscatedName("lw") + static int field3789; + @ObfuscatedName("ak") + final String field3792; + + static { + field3790 = new class433("Basic"); + field3791 = new class433("Bearer"); + } + + class433(String var1) { + this.field3792 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "36" + ) + String method2195() { + return this.field3792; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class434.java b/osrs/src/main/java/class434.java new file mode 100644 index 000000000..a580673ba --- /dev/null +++ b/osrs/src/main/java/class434.java @@ -0,0 +1,185 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import javax.net.ssl.HttpsURLConnection; +import java.text.DecimalFormat; +import java.util.*; +import java.util.Map.Entry; + +@ObfuscatedName("qv") +public class class434 { + @ObfuscatedName("wj") + @ObfuscatedSignature( + descriptor = "Ltu;" + ) + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("ax") + final Map field3796; + @ObfuscatedName("ao") + final Map field3795; + @ObfuscatedName("ah") + final DecimalFormat field3794; + + public class434() { + this.field3796 = new HashMap(); + this.field3795 = new HashMap(); + this.field3794 = new DecimalFormat(); + this.field3794.setMaximumFractionDigits(2); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljavax/net/ssl/HttpsURLConnection;B)V", + garbageValue = "69" + ) + public void method2196(HttpsURLConnection var1) { + Iterator var2 = this.field3796.entrySet().iterator(); + + while (var2.hasNext()) { + Entry var3 = (Entry)var2.next(); + var1.setRequestProperty((String)var3.getKey(), (String)var3.getValue()); + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/Map;", + garbageValue = "-1436798954" + ) + public Map method2197() { + return this.field3796; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "2031585126" + ) + public void method2198(String var1, String var2) { + if (var1 != null && !var1.isEmpty()) { + this.field3796.put(var1, var2 != null ? var2 : ""); + } + + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-476420420" + ) + public void method2199(String var1) { + if (var1 != null && !var1.isEmpty()) { + this.field3796.remove(var1); + } + + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Lqf;Ljava/lang/String;B)V", + garbageValue = "38" + ) + void method2200(class433 var1, String var2) { + String var3 = String.format("%s %s", var1.method2195(), var2); + this.method2198("Authorization", var3); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "696444770" + ) + public void method2201(String var1) { + this.method2200(class433.field3790, var1); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1668239999" + ) + public void method2202(String var1) { + this.method2200(class433.field3791, var1); + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Lst;I)V", + garbageValue = "1867259345" + ) + public void method2203(class475 var1) { + this.field3796.put("Content-Type", var1.method2373()); + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "25" + ) + public void method2204() { + this.field3796.remove("Content-Type"); + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lst;I)V", + garbageValue = "807760846" + ) + public void method2205(class475 var1) { + this.method2206(var1, 1.0F); + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Lst;FI)V", + garbageValue = "1069776907" + ) + void method2206(class475 var1, float var2) { + this.field3795.put(var1, Math.max(0.0F, Math.min(1.0F, var2))); + this.method2207(); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-118" + ) + void method2207() { + this.field3796.remove("Accept"); + if (!this.field3795.isEmpty()) { + this.field3796.put("Accept", this.method2208()); + } + + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "58" + ) + String method2208() { + ArrayList var1 = new ArrayList(this.field3795.entrySet()); + Collections.sort(var1, new class435(this)); + StringBuilder var2 = new StringBuilder(); + Iterator var3 = var1.iterator(); + + while (var3.hasNext()) { + Entry var4 = (Entry)var3.next(); + if (var2.length() > 0) { + var2.append(","); + } + + var2.append(((class475)var4.getKey()).method2373()); + float var5 = (Float)var4.getValue(); + if (var5 < 1.0F) { + String var6 = this.field3794.format((double)var5); + var2.append(";q=").append(var6); + } + } + + return var2.toString(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class420.java b/osrs/src/main/java/class435.java similarity index 58% rename from osrs/src/main/java/class420.java rename to osrs/src/main/java/class435.java index e5802f21b..bc90528b7 100644 --- a/osrs/src/main/java/class420.java +++ b/osrs/src/main/java/class435.java @@ -5,39 +5,36 @@ import java.util.Comparator; import java.util.Map.Entry; -@ObfuscatedName("qr") -class class420 implements Comparator { - @ObfuscatedName("ao") - @Export("SpriteBuffer_spriteHeight") - static int SpriteBuffer_spriteHeight; +@ObfuscatedName("qa") +class class435 implements Comparator { // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lqf;" + descriptor = "Lqv;" ) @Export("this$0") @ObfuscatedName("this$0") - final class419 this$0; + final class434 this$0; @ObfuscatedSignature( - descriptor = "(Lqf;)V" + descriptor = "(Lqv;)V" ) - class420(class419 var1) { + class435(class434 var1) { this.this$0 = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;I)I", - garbageValue = "1962289219" + descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;B)I", + garbageValue = "0" ) - int method2177(Entry var1, Entry var2) { + int method2209(Entry var1, Entry var2) { return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method2177((Entry)var1, (Entry)var2); + return this.method2209((Entry)var1, (Entry)var2); } @Export("equals") diff --git a/osrs/src/main/java/class436.java b/osrs/src/main/java/class436.java new file mode 100644 index 000000000..99ea47128 --- /dev/null +++ b/osrs/src/main/java/class436.java @@ -0,0 +1,167 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qs") +public class class436 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lqs;" + ) + public static final class436 field3797; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lqs;" + ) + static final class436 field3798; + @ObfuscatedName("ak") + final int field3799; + + static { + field3797 = new class436(1); + field3798 = new class436(0); + } + + class436(int var1) { + this.field3799 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "30" + ) + @Export("addImageTag") + static String addImageTag(int var0) { + return ""; + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "112" + ) + static final void method2211(String var0) { + class411.addGameMessage(30, "", var0); + } + + @ObfuscatedName("nc") + @ObfuscatedSignature( + descriptor = "(Lnm;IIII)V", + garbageValue = "-1362386286" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + class313.method1648(); + SpriteMask var4 = var0.method1857(class33.field89, false); + if (var4 != null) { + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); + if (Client.minimapState != 2 && Client.minimapState != 5) { + int var5 = Client.camAngleY & 2047; + int var6 = TextureProvider.localPlayer.x / 32 + 48; + int var7 = 464 - TextureProvider.localPlayer.y / 32; + SpriteMask.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + + int var8; + int var9; + int var10; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { + var9 = Client.mapIconXs[var8] * 4 + 2 - TextureProvider.localPlayer.x / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - TextureProvider.localPlayer.y / 32; + SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { + for (var9 = 0; var9 < 104; ++var9) { + NodeDeque var15 = Client.groundItems[class87.Client_plane][var8][var9]; + if (var15 != null) { + var11 = var8 * 4 + 2 - TextureProvider.localPlayer.x / 32; + var12 = var9 * 4 + 2 - TextureProvider.localPlayer.y / 32; + SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var11, var12, class103.mapDotSprites[0], var4); + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { + NPC var14 = Client.npcs[Client.npcIndices[var8]]; + if (var14 != null && var14.isVisible()) { + NPCComposition var18 = var14.definition; + if (var18 != null && var18.transforms != null) { + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { + var11 = var14.x / 32 - TextureProvider.localPlayer.x / 32; + var12 = var14.y / 32 - TextureProvider.localPlayer.y / 32; + SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var11, var12, class103.mapDotSprites[1], var4); + } + } + } + + var8 = Players.Players_count; + int[] var17 = Players.Players_indices; + + for (var10 = 0; var10 < var8; ++var10) { + Player var16 = Client.players[var17[var10]]; + if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != TextureProvider.localPlayer) { + var12 = var16.x / 32 - TextureProvider.localPlayer.x / 32; + int var13 = var16.y / 32 - TextureProvider.localPlayer.y / 32; + if (var16.isFriend()) { + SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var12, var13, class103.mapDotSprites[3], var4); + } else if (TextureProvider.localPlayer.team != 0 && var16.team != 0 && var16.team == TextureProvider.localPlayer.team) { + SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var12, var13, class103.mapDotSprites[4], var4); + } else if (var16.method493()) { + SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var12, var13, class103.mapDotSprites[5], var4); + } else if (var16.isClanMember()) { + SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var12, var13, class103.mapDotSprites[6], var4); + } else { + SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var12, var13, class103.mapDotSprites[2], var4); + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; + if (var19 != null) { + var11 = var19.x / 32 - TextureProvider.localPlayer.x / 32; + var12 = var19.y / 32 - TextureProvider.localPlayer.y / 32; + Language.worldToMinimap(var1, var2, var11, var12, class47.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - class20.baseX * 4 + 2 - TextureProvider.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - class19.baseY * 4 + 2 - TextureProvider.localPlayer.y / 32; + Language.worldToMinimap(var1, var2, var10, var11, class47.mapMarkerSprites[1], var4); + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { + Player var20 = Client.players[Client.hintArrowPlayerIndex]; + if (var20 != null) { + var11 = var20.x / 32 - TextureProvider.localPlayer.x / 32; + var12 = var20.y / 32 - TextureProvider.localPlayer.y / 32; + Language.worldToMinimap(var1, var2, var11, var12, class47.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - TextureProvider.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - TextureProvider.localPlayer.y / 32; + SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var10, var11, class47.mapMarkerSprites[0], var4); + } + + if (!TextureProvider.localPlayer.isHidden) { + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + } + + Client.field407[var3] = true; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class437.java b/osrs/src/main/java/class437.java new file mode 100644 index 000000000..093051f1e --- /dev/null +++ b/osrs/src/main/java/class437.java @@ -0,0 +1,65 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; +import java.util.Comparator; + +@ObfuscatedName("qp") +class class437 implements Comparator { + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lqe;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final class438 this$0; + + @ObfuscatedSignature( + descriptor = "(Lqe;)V" + ) + class437(class438 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lqd;Lqd;I)I", + garbageValue = "-199204638" + ) + int method2213(class439 var1, class439 var2) { + if (var1.field3809 > var2.field3809) { + return 1; + } else { + return var1.field3809 < var2.field3809 ? -1 : 0; + } + } + + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method2213((class439)var1, (class439)var2); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1139961954" + ) + @Export("playJingle") + static void playJingle(int var0, int var1) { + if (class91.clientPreferences.getCurrentMusicVolume() != 0 && var0 != -1) { + ArrayList var2 = new ArrayList(); + var2.add(new MusicSong(Language.field3643, var0, 0, class91.clientPreferences.getCurrentMusicVolume(), false)); + class148.method776(var2, 0, 0, 0, 0, true); + Client.playingJingle = true; + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class438.java b/osrs/src/main/java/class438.java new file mode 100644 index 000000000..ebdfc6401 --- /dev/null +++ b/osrs/src/main/java/class438.java @@ -0,0 +1,197 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; + +@ObfuscatedName("qe") +public final class class438 { + @ObfuscatedName("ac") + final Comparator field3801; + @ObfuscatedName("al") + final Map field3802; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lpn;" + ) + final class407 field3804; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lpn;" + ) + final class407 field3805; + @ObfuscatedName("ao") + final long field3803; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lqs;" + ) + final class436 field3806; + @ObfuscatedName("ar") + final int field3800; + + @ObfuscatedSignature( + descriptor = "(JILqs;)V" + ) + class438(long var1, int var3, class436 var4) { + this.field3801 = new class437(this); + this.field3803 = var1; + this.field3800 = var3; + this.field3806 = var4; + if (this.field3800 == -1) { + this.field3802 = new HashMap(64); + this.field3804 = new class407(64, this.field3801); + this.field3805 = null; + } else { + if (this.field3806 == null) { + throw new IllegalArgumentException(""); + } + + this.field3802 = new HashMap(this.field3800); + this.field3804 = new class407(this.field3800, this.field3801); + this.field3805 = new class407(this.field3800); + } + + } + + @ObfuscatedSignature( + descriptor = "(ILqs;)V" + ) + public class438(int var1, class436 var2) { + this(-1L, var1, var2); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "111" + ) + boolean method2215() { + return this.field3800 != -1; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "1480842854" + ) + public Object method2216(Object var1) { + synchronized(this) { + if (this.field3803 != -1L) { + this.method2219(); + } + + class439 var3 = (class439)this.field3802.get(var1); + if (var3 == null) { + return null; + } else { + this.method2218(var3, false); + return var3.field3807; + } + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "-496116903" + ) + public Object method2217(Object var1, Object var2) { + synchronized(this) { + if (this.field3803 != -1L) { + this.method2219(); + } + + class439 var4 = (class439)this.field3802.get(var1); + if (var4 != null) { + Object var8 = var4.field3807; + var4.field3807 = var2; + this.method2218(var4, false); + return var8; + } else { + class439 var5; + if (this.method2215() && this.field3802.size() == this.field3800) { + var5 = (class439)this.field3805.remove(); + this.field3802.remove(var5.field3808); + this.field3804.remove(var5); + } + + var5 = new class439(var2, var1); + this.field3802.put(var1, var5); + this.method2218(var5, true); + return null; + } + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Lqd;ZI)V", + garbageValue = "396560222" + ) + void method2218(class439 var1, boolean var2) { + if (!var2) { + this.field3804.remove(var1); + if (this.method2215() && !this.field3805.remove(var1)) { + throw new IllegalStateException(""); + } + } + + var1.field3809 = System.currentTimeMillis(); + if (this.method2215()) { + switch(this.field3806.field3799) { + case 0: + ++var1.field3810; + break; + case 1: + var1.field3810 = var1.field3809; + } + + this.field3805.add(var1); + } + + this.field3804.add(var1); + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "21" + ) + void method2219() { + long var1 = System.currentTimeMillis() - this.field3803; + + while (!this.field3804.isEmpty()) { + class439 var3 = (class439)this.field3804.peek(); + if (var3.field3809 >= var1) { + return; + } + + this.field3802.remove(var3.field3808); + this.field3804.remove(var3); + if (this.method2215()) { + this.field3805.remove(var3); + } + } + + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "2" + ) + @Export("clearFiles") + public void clearFiles() { + synchronized(this) { + this.field3802.clear(); + this.field3804.clear(); + if (this.method2215()) { + this.field3805.clear(); + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class439.java b/osrs/src/main/java/class439.java new file mode 100644 index 000000000..feebcf9cb --- /dev/null +++ b/osrs/src/main/java/class439.java @@ -0,0 +1,55 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qd") +public final class class439 implements Comparable { + @ObfuscatedName("ac") + Object field3807; + @ObfuscatedName("al") + Object field3808; + @ObfuscatedName("ak") + long field3809; + @ObfuscatedName("ax") + long field3810; + + class439(Object var1, Object var2) { + this.field3807 = var1; + this.field3808 = var2; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lqd;I)I", + garbageValue = "-1884046273" + ) + int method2221(class439 var1) { + if (this.field3810 < var1.field3810) { + return -1; + } else { + return this.field3810 > var1.field3810 ? 1 : 0; + } + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (var1 instanceof class439) { + return this.field3808.equals(((class439)var1).field3808); + } else { + throw new IllegalArgumentException(); + } + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + return this.field3808.hashCode(); + } + + @Export("compareTo") + @ObfuscatedName("compareTo") + public int compareTo(Object var1) { + return this.method2221((class439)var1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class448.java b/osrs/src/main/java/class448.java deleted file mode 100644 index 918dfd30b..000000000 --- a/osrs/src/main/java/class448.java +++ /dev/null @@ -1,138 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("rj") -public class class448 { - @ObfuscatedName("au") - float field3865; - @ObfuscatedName("ae") - float field3863; - @ObfuscatedName("ao") - float field3864; - - static { - new class448(0.0F, 0.0F, 0.0F); - new class448(1.0F, 1.0F, 1.0F); - new class448(1.0F, 0.0F, 0.0F); - new class448(0.0F, 1.0F, 0.0F); - new class448(0.0F, 0.0F, 1.0F); - WorldMapArea.method1413(100); - } - - class448(float var1, float var2, float var3) { - this.field3865 = var1; - this.field3863 = var2; - this.field3864 = var3; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)F", - garbageValue = "36" - ) - final float method2291() { - return (float)Math.sqrt((double)(this.field3865 * this.field3865 + this.field3863 * this.field3863 + this.field3864 * this.field3864)); - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - return this.field3865 + ", " + this.field3863 + ", " + this.field3864; - } - - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "853635809" - ) - static int method2292(int var0, Script var1, boolean var2) { - if (var0 == 6200) { - SoundCache.Interpreter_intStackSize -= 2; - Client.field638 = (short)class155.method829(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); - if (Client.field638 <= 0) { - Client.field638 = 256; - } - - Client.field640 = (short)class155.method829(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - if (Client.field640 <= 0) { - Client.field640 = 256; - } - - return 1; - } else if (var0 == 6201) { - SoundCache.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; - } - - return 1; - } else if (var0 == 6202) { - SoundCache.Interpreter_intStackSize -= 4; - Client.field635 = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - if (Client.field635 <= 0) { - Client.field635 = 1; - } - - Client.field634 = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - if (Client.field634 <= 0) { - Client.field634 = 32767; - } else if (Client.field634 < Client.field635) { - Client.field634 = Client.field635; - } - - Client.field641 = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - if (Client.field641 <= 0) { - Client.field641 = 1; - } - - Client.field637 = (short)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - if (Client.field637 <= 0) { - Client.field637 = 32767; - } else if (Client.field637 < Client.field641) { - Client.field637 = Client.field641; - } - - return 1; - } else if (var0 == 6203) { - if (Client.viewportWidget != null) { - GrandExchangeOfferOwnWorldComparator.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.viewportHeight; - } else { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } else if (var0 == 6204) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; - } else if (var0 == 6205) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class332.method1850(Client.field638); - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class332.method1850(Client.field640); - return 1; - } else if (var0 == 6220) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6221) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6222) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class113.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class177.canvasHeight; - return 1; - } else { - return 2; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class449.java b/osrs/src/main/java/class449.java deleted file mode 100644 index 3a13dca63..000000000 --- a/osrs/src/main/java/class449.java +++ /dev/null @@ -1,128 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ro") -public final class class449 { - @ObfuscatedName("wp") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "[Lro;" - ) - static class449[] field3868; - @ObfuscatedName("ae") - static int field3867; - @ObfuscatedName("at") - float field3871; - @ObfuscatedName("ac") - float field3869; - @ObfuscatedName("ai") - float field3870; - @ObfuscatedName("az") - float field3872; - - static { - field3868 = new class449[0]; - GrandExchangeOffer.method1954(100); - new class449(); - } - - class449() { - this.method2296(); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1516285968" - ) - public void method2293() { - synchronized(field3868) { - if (class338.field3112 < field3867 - 1) { - field3868[++class338.field3112 - 1] = this; - } - - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(FFFFI)V", - garbageValue = "-426853069" - ) - void method2294(float var1, float var2, float var3, float var4) { - this.field3871 = var1; - this.field3869 = var2; - this.field3870 = var3; - this.field3872 = var4; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(FFFFI)V", - garbageValue = "-49952444" - ) - public void method2295(float var1, float var2, float var3, float var4) { - float var5 = (float)Math.sin((double)(var4 * 0.5F)); - float var6 = (float)Math.cos((double)(var4 * 0.5F)); - this.field3871 = var5 * var1; - this.field3869 = var2 * var5; - this.field3870 = var5 * var3; - this.field3872 = var6; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "61" - ) - final void method2296() { - this.field3870 = 0.0F; - this.field3869 = 0.0F; - this.field3871 = 0.0F; - this.field3872 = 1.0F; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Lro;B)V", - garbageValue = "-34" - ) - public final void method2297(class449 var1) { - this.method2294(this.field3871 * var1.field3872 + this.field3872 * var1.field3871 + this.field3870 * var1.field3869 - this.field3869 * var1.field3870, var1.field3870 * this.field3871 + this.field3872 * var1.field3869 + (var1.field3872 * this.field3869 - this.field3870 * var1.field3871), var1.field3870 * this.field3872 + (this.field3870 * var1.field3872 + this.field3869 * var1.field3871 - var1.field3869 * this.field3871), this.field3872 * var1.field3872 - this.field3871 * var1.field3871 - this.field3869 * var1.field3869 - var1.field3870 * this.field3870); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (!(var1 instanceof class449)) { - return false; - } else { - class449 var2 = (class449)var1; - return var2.field3871 == this.field3871 && var2.field3869 == this.field3869 && var2.field3870 == this.field3870 && this.field3872 == var2.field3872; - } - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - boolean var1 = true; - float var2 = 1.0F; - var2 = this.field3871 + var2 * 31.0F; - var2 = this.field3869 + var2 * 31.0F; - var2 = this.field3870 + 31.0F * var2; - var2 = this.field3872 + 31.0F * var2; - return (int)var2; - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - return this.field3871 + "," + this.field3869 + "," + this.field3870 + "," + this.field3872; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class450.java b/osrs/src/main/java/class450.java deleted file mode 100644 index 52ee2dad0..000000000 --- a/osrs/src/main/java/class450.java +++ /dev/null @@ -1,447 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Arrays; - -@ObfuscatedName("rz") -public final class class450 { - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "[Lrz;" - ) - public static class450[] field3873; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lrz;" - ) - public static final class450 field3874; - @ObfuscatedName("ac") - public float[] field3875; - - static { - field3873 = new class450[0]; - class272.method1544(100); - field3874 = new class450(); - } - - public class450() { - this.field3875 = new float[16]; - this.method2302(); - } - - @ObfuscatedSignature( - descriptor = "(Lrz;)V" - ) - public class450(class450 var1) { - this.field3875 = new float[16]; - this.method2304(var1); - } - - @ObfuscatedSignature( - descriptor = "(Ltm;Z)V" - ) - public class450(Buffer var1, boolean var2) { - this.field3875 = new float[16]; - this.method2299(var1, var2); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1723077119" - ) - public void method2298() { - synchronized(field3873) { - if (class462.field3904 < GrandExchangeOfferOwnWorldComparator.field361 - 1) { - field3873[++class462.field3904 - 1] = this; - } - - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ltm;ZI)V", - garbageValue = "1560038466" - ) - void method2299(Buffer var1, boolean var2) { - if (var2) { - class451 var3 = new class451(); - int var6 = var1.readShort(); - var6 &= 16383; - float var5 = (float)(6.283185307179586D * (double)((float)var6 / 16384.0F)); - var3.method2315(var5); - int var9 = var1.readShort(); - var9 &= 16383; - float var8 = (float)((double)((float)var9 / 16384.0F) * 6.283185307179586D); - var3.method2316(var8); - int var12 = var1.readShort(); - var12 &= 16383; - float var11 = (float)((double)((float)var12 / 16384.0F) * 6.283185307179586D); - var3.method2317(var11); - var3.method2318((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); - this.method2310(var3); - } else { - for (int var13 = 0; var13 < 16; ++var13) { - this.field3875[var13] = var1.method2551(); - } - } - - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(B)[F", - garbageValue = "-57" - ) - float[] method2300() { - float[] var1 = new float[3]; - if ((double)this.field3875[2] < 0.999D && (double)this.field3875[2] > -0.999D) { - var1[1] = (float)(-Math.asin((double)this.field3875[2])); - double var2 = Math.cos((double)var1[1]); - var1[0] = (float)Math.atan2((double)this.field3875[6] / var2, (double)this.field3875[10] / var2); - var1[2] = (float)Math.atan2((double)this.field3875[1] / var2, (double)this.field3875[0] / var2); - } else { - var1[0] = 0.0F; - var1[1] = (float)Math.atan2((double)this.field3875[2], 0.0D); - var1[2] = (float)Math.atan2((double)(-this.field3875[9]), (double)this.field3875[5]); - } - - return var1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "1952444493" - ) - public float[] method2301() { - float[] var1 = new float[]{(float)(-Math.asin((double)this.field3875[6])), 0.0F, 0.0F}; - double var2 = Math.cos((double)var1[0]); - double var4; - double var6; - if (Math.abs(var2) > 0.005D) { - var4 = (double)this.field3875[2]; - var6 = (double)this.field3875[10]; - double var8 = (double)this.field3875[4]; - double var10 = (double)this.field3875[5]; - var1[1] = (float)Math.atan2(var4, var6); - var1[2] = (float)Math.atan2(var8, var10); - } else { - var4 = (double)this.field3875[1]; - var6 = (double)this.field3875[0]; - if (this.field3875[6] < 0.0F) { - var1[1] = (float)Math.atan2(var4, var6); - } else { - var1[1] = (float)(-Math.atan2(var4, var6)); - } - - var1[2] = 0.0F; - } - - return var1; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1131918254" - ) - public void method2302() { - this.field3875[0] = 1.0F; - this.field3875[1] = 0.0F; - this.field3875[2] = 0.0F; - this.field3875[3] = 0.0F; - this.field3875[4] = 0.0F; - this.field3875[5] = 1.0F; - this.field3875[6] = 0.0F; - this.field3875[7] = 0.0F; - this.field3875[8] = 0.0F; - this.field3875[9] = 0.0F; - this.field3875[10] = 1.0F; - this.field3875[11] = 0.0F; - this.field3875[12] = 0.0F; - this.field3875[13] = 0.0F; - this.field3875[14] = 0.0F; - this.field3875[15] = 1.0F; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "109" - ) - public void method2303() { - this.field3875[0] = 0.0F; - this.field3875[1] = 0.0F; - this.field3875[2] = 0.0F; - this.field3875[3] = 0.0F; - this.field3875[4] = 0.0F; - this.field3875[5] = 0.0F; - this.field3875[6] = 0.0F; - this.field3875[7] = 0.0F; - this.field3875[8] = 0.0F; - this.field3875[9] = 0.0F; - this.field3875[10] = 0.0F; - this.field3875[11] = 0.0F; - this.field3875[12] = 0.0F; - this.field3875[13] = 0.0F; - this.field3875[14] = 0.0F; - this.field3875[15] = 0.0F; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Lrz;I)V", - garbageValue = "1658923125" - ) - public void method2304(class450 var1) { - System.arraycopy(var1.field3875, 0, this.field3875, 0, 16); - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(FB)V", - garbageValue = "54" - ) - public void method2305(float var1) { - this.method2306(var1, var1, var1); - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(FFFB)V", - garbageValue = "0" - ) - public void method2306(float var1, float var2, float var3) { - this.method2302(); - this.field3875[0] = var1; - this.field3875[5] = var2; - this.field3875[10] = var3; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(Lrz;I)V", - garbageValue = "1420506541" - ) - public void method2307(class450 var1) { - for (int var2 = 0; var2 < this.field3875.length; ++var2) { - float[] var10000 = this.field3875; - var10000[var2] += var1.field3875[var2]; - } - - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(Lrz;I)V", - garbageValue = "2026698221" - ) - public void method2308(class450 var1) { - float var2 = this.field3875[2] * var1.field3875[8] + var1.field3875[0] * this.field3875[0] + var1.field3875[4] * this.field3875[1] + var1.field3875[12] * this.field3875[3]; - float var3 = this.field3875[0] * var1.field3875[1] + var1.field3875[5] * this.field3875[1] + var1.field3875[9] * this.field3875[2] + this.field3875[3] * var1.field3875[13]; - float var4 = var1.field3875[14] * this.field3875[3] + this.field3875[2] * var1.field3875[10] + var1.field3875[6] * this.field3875[1] + var1.field3875[2] * this.field3875[0]; - float var5 = this.field3875[0] * var1.field3875[3] + var1.field3875[7] * this.field3875[1] + this.field3875[2] * var1.field3875[11] + this.field3875[3] * var1.field3875[15]; - float var6 = this.field3875[7] * var1.field3875[12] + this.field3875[4] * var1.field3875[0] + this.field3875[5] * var1.field3875[4] + var1.field3875[8] * this.field3875[6]; - float var7 = this.field3875[6] * var1.field3875[9] + var1.field3875[1] * this.field3875[4] + var1.field3875[5] * this.field3875[5] + this.field3875[7] * var1.field3875[13]; - float var8 = this.field3875[7] * var1.field3875[14] + this.field3875[5] * var1.field3875[6] + this.field3875[4] * var1.field3875[2] + var1.field3875[10] * this.field3875[6]; - float var9 = var1.field3875[15] * this.field3875[7] + this.field3875[6] * var1.field3875[11] + this.field3875[4] * var1.field3875[3] + this.field3875[5] * var1.field3875[7]; - float var10 = var1.field3875[12] * this.field3875[11] + this.field3875[10] * var1.field3875[8] + var1.field3875[4] * this.field3875[9] + this.field3875[8] * var1.field3875[0]; - float var11 = this.field3875[11] * var1.field3875[13] + this.field3875[9] * var1.field3875[5] + var1.field3875[1] * this.field3875[8] + var1.field3875[9] * this.field3875[10]; - float var12 = var1.field3875[14] * this.field3875[11] + this.field3875[9] * var1.field3875[6] + var1.field3875[2] * this.field3875[8] + this.field3875[10] * var1.field3875[10]; - float var13 = var1.field3875[15] * this.field3875[11] + var1.field3875[11] * this.field3875[10] + var1.field3875[7] * this.field3875[9] + this.field3875[8] * var1.field3875[3]; - float var14 = this.field3875[14] * var1.field3875[8] + var1.field3875[0] * this.field3875[12] + this.field3875[13] * var1.field3875[4] + this.field3875[15] * var1.field3875[12]; - float var15 = var1.field3875[13] * this.field3875[15] + var1.field3875[5] * this.field3875[13] + this.field3875[12] * var1.field3875[1] + var1.field3875[9] * this.field3875[14]; - float var16 = this.field3875[14] * var1.field3875[10] + var1.field3875[6] * this.field3875[13] + this.field3875[12] * var1.field3875[2] + var1.field3875[14] * this.field3875[15]; - float var17 = var1.field3875[15] * this.field3875[15] + var1.field3875[3] * this.field3875[12] + this.field3875[13] * var1.field3875[7] + var1.field3875[11] * this.field3875[14]; - this.field3875[0] = var2; - this.field3875[1] = var3; - this.field3875[2] = var4; - this.field3875[3] = var5; - this.field3875[4] = var6; - this.field3875[5] = var7; - this.field3875[6] = var8; - this.field3875[7] = var9; - this.field3875[8] = var10; - this.field3875[9] = var11; - this.field3875[10] = var12; - this.field3875[11] = var13; - this.field3875[12] = var14; - this.field3875[13] = var15; - this.field3875[14] = var16; - this.field3875[15] = var17; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Lro;I)V", - garbageValue = "1037679755" - ) - public void method2309(class449 var1) { - float var2 = var1.field3872 * var1.field3872; - float var3 = var1.field3871 * var1.field3872; - float var4 = var1.field3872 * var1.field3869; - float var5 = var1.field3870 * var1.field3872; - float var6 = var1.field3871 * var1.field3871; - float var7 = var1.field3871 * var1.field3869; - float var8 = var1.field3870 * var1.field3871; - float var9 = var1.field3869 * var1.field3869; - float var10 = var1.field3869 * var1.field3870; - float var11 = var1.field3870 * var1.field3870; - this.field3875[0] = var6 + var2 - var11 - var9; - this.field3875[1] = var7 + var5 + var7 + var5; - this.field3875[2] = var8 - var4 - var4 + var8; - this.field3875[4] = var7 - var5 - var5 + var7; - this.field3875[5] = var2 + var9 - var6 - var11; - this.field3875[6] = var3 + var10 + var3 + var10; - this.field3875[8] = var8 + var4 + var8 + var4; - this.field3875[9] = var10 - var3 - var3 + var10; - this.field3875[10] = var11 + var2 - var9 - var6; - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(Lrm;I)V", - garbageValue = "-552331483" - ) - void method2310(class451 var1) { - this.field3875[0] = var1.field3887; - this.field3875[1] = var1.field3880; - this.field3875[2] = var1.field3883; - this.field3875[3] = 0.0F; - this.field3875[4] = var1.field3886; - this.field3875[5] = var1.field3878; - this.field3875[6] = var1.field3882; - this.field3875[7] = 0.0F; - this.field3875[8] = var1.field3888; - this.field3875[9] = var1.field3884; - this.field3875[10] = var1.field3877; - this.field3875[11] = 0.0F; - this.field3875[12] = var1.field3881; - this.field3875[13] = var1.field3879; - this.field3875[14] = var1.field3885; - this.field3875[15] = 1.0F; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)F", - garbageValue = "-1874677140" - ) - float method2311() { - return this.field3875[12] * this.field3875[9] * this.field3875[6] * this.field3875[3] + (this.field3875[8] * this.field3875[7] * this.field3875[2] * this.field3875[13] + this.field3875[8] * this.field3875[1] * this.field3875[6] * this.field3875[15] + this.field3875[14] * this.field3875[11] * this.field3875[4] * this.field3875[1] + (this.field3875[0] * this.field3875[7] * this.field3875[9] * this.field3875[14] + this.field3875[15] * this.field3875[5] * this.field3875[0] * this.field3875[10] - this.field3875[0] * this.field3875[5] * this.field3875[11] * this.field3875[14] - this.field3875[15] * this.field3875[0] * this.field3875[6] * this.field3875[9] + this.field3875[13] * this.field3875[0] * this.field3875[6] * this.field3875[11] - this.field3875[10] * this.field3875[0] * this.field3875[7] * this.field3875[13] - this.field3875[15] * this.field3875[4] * this.field3875[1] * this.field3875[10]) - this.field3875[12] * this.field3875[1] * this.field3875[6] * this.field3875[11] - this.field3875[7] * this.field3875[1] * this.field3875[8] * this.field3875[14] + this.field3875[12] * this.field3875[10] * this.field3875[7] * this.field3875[1] + this.field3875[15] * this.field3875[4] * this.field3875[2] * this.field3875[9] - this.field3875[13] * this.field3875[11] * this.field3875[4] * this.field3875[2] - this.field3875[15] * this.field3875[8] * this.field3875[2] * this.field3875[5] + this.field3875[11] * this.field3875[2] * this.field3875[5] * this.field3875[12] - this.field3875[9] * this.field3875[7] * this.field3875[2] * this.field3875[12] - this.field3875[14] * this.field3875[3] * this.field3875[4] * this.field3875[9] + this.field3875[13] * this.field3875[10] * this.field3875[4] * this.field3875[3] + this.field3875[14] * this.field3875[8] * this.field3875[5] * this.field3875[3] - this.field3875[12] * this.field3875[3] * this.field3875[5] * this.field3875[10] - this.field3875[6] * this.field3875[3] * this.field3875[8] * this.field3875[13]); - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-93" - ) - public void method2312() { - float var1 = 1.0F / this.method2311(); - float var2 = (this.field3875[11] * this.field3875[6] * this.field3875[13] + (this.field3875[15] * this.field3875[5] * this.field3875[10] - this.field3875[14] * this.field3875[11] * this.field3875[5] - this.field3875[9] * this.field3875[6] * this.field3875[15]) + this.field3875[14] * this.field3875[7] * this.field3875[9] - this.field3875[7] * this.field3875[10] * this.field3875[13]) * var1; - float var3 = (this.field3875[13] * this.field3875[3] * this.field3875[10] + (this.field3875[15] * -this.field3875[1] * this.field3875[10] + this.field3875[14] * this.field3875[11] * this.field3875[1] + this.field3875[9] * this.field3875[2] * this.field3875[15] - this.field3875[11] * this.field3875[2] * this.field3875[13] - this.field3875[14] * this.field3875[9] * this.field3875[3])) * var1; - float var4 = (this.field3875[15] * this.field3875[6] * this.field3875[1] - this.field3875[1] * this.field3875[7] * this.field3875[14] - this.field3875[15] * this.field3875[2] * this.field3875[5] + this.field3875[2] * this.field3875[7] * this.field3875[13] + this.field3875[3] * this.field3875[5] * this.field3875[14] - this.field3875[13] * this.field3875[6] * this.field3875[3]) * var1; - float var5 = (this.field3875[9] * this.field3875[3] * this.field3875[6] + (this.field3875[7] * this.field3875[1] * this.field3875[10] + this.field3875[11] * -this.field3875[1] * this.field3875[6] + this.field3875[11] * this.field3875[2] * this.field3875[5] - this.field3875[7] * this.field3875[2] * this.field3875[9] - this.field3875[5] * this.field3875[3] * this.field3875[10])) * var1; - float var6 = (this.field3875[12] * this.field3875[10] * this.field3875[7] + (this.field3875[6] * this.field3875[8] * this.field3875[15] + this.field3875[15] * this.field3875[10] * -this.field3875[4] + this.field3875[4] * this.field3875[11] * this.field3875[14] - this.field3875[11] * this.field3875[6] * this.field3875[12] - this.field3875[14] * this.field3875[8] * this.field3875[7])) * var1; - float var7 = (this.field3875[2] * this.field3875[11] * this.field3875[12] + (this.field3875[0] * this.field3875[10] * this.field3875[15] - this.field3875[14] * this.field3875[0] * this.field3875[11] - this.field3875[15] * this.field3875[2] * this.field3875[8]) + this.field3875[14] * this.field3875[8] * this.field3875[3] - this.field3875[3] * this.field3875[10] * this.field3875[12]) * var1; - float var8 = (this.field3875[15] * this.field3875[2] * this.field3875[4] + this.field3875[15] * this.field3875[6] * -this.field3875[0] + this.field3875[0] * this.field3875[7] * this.field3875[14] - this.field3875[7] * this.field3875[2] * this.field3875[12] - this.field3875[3] * this.field3875[4] * this.field3875[14] + this.field3875[12] * this.field3875[3] * this.field3875[6]) * var1; - float var9 = (this.field3875[10] * this.field3875[4] * this.field3875[3] + this.field3875[0] * this.field3875[6] * this.field3875[11] - this.field3875[10] * this.field3875[0] * this.field3875[7] - this.field3875[2] * this.field3875[4] * this.field3875[11] + this.field3875[7] * this.field3875[2] * this.field3875[8] - this.field3875[8] * this.field3875[6] * this.field3875[3]) * var1; - float var10 = (this.field3875[15] * this.field3875[4] * this.field3875[9] - this.field3875[13] * this.field3875[4] * this.field3875[11] - this.field3875[15] * this.field3875[5] * this.field3875[8] + this.field3875[11] * this.field3875[5] * this.field3875[12] + this.field3875[13] * this.field3875[8] * this.field3875[7] - this.field3875[12] * this.field3875[9] * this.field3875[7]) * var1; - float var11 = var1 * (this.field3875[15] * this.field3875[9] * -this.field3875[0] + this.field3875[13] * this.field3875[0] * this.field3875[11] + this.field3875[1] * this.field3875[8] * this.field3875[15] - this.field3875[11] * this.field3875[1] * this.field3875[12] - this.field3875[8] * this.field3875[3] * this.field3875[13] + this.field3875[9] * this.field3875[3] * this.field3875[12]); - float var12 = (this.field3875[4] * this.field3875[3] * this.field3875[13] + this.field3875[12] * this.field3875[1] * this.field3875[7] + (this.field3875[15] * this.field3875[5] * this.field3875[0] - this.field3875[13] * this.field3875[0] * this.field3875[7] - this.field3875[1] * this.field3875[4] * this.field3875[15]) - this.field3875[12] * this.field3875[3] * this.field3875[5]) * var1; - float var13 = var1 * (this.field3875[8] * this.field3875[3] * this.field3875[5] + (-this.field3875[0] * this.field3875[5] * this.field3875[11] + this.field3875[9] * this.field3875[7] * this.field3875[0] + this.field3875[4] * this.field3875[1] * this.field3875[11] - this.field3875[8] * this.field3875[1] * this.field3875[7] - this.field3875[3] * this.field3875[4] * this.field3875[9])); - float var14 = (this.field3875[12] * this.field3875[6] * this.field3875[9] + (this.field3875[14] * this.field3875[9] * -this.field3875[4] + this.field3875[13] * this.field3875[10] * this.field3875[4] + this.field3875[8] * this.field3875[5] * this.field3875[14] - this.field3875[12] * this.field3875[10] * this.field3875[5] - this.field3875[8] * this.field3875[6] * this.field3875[13])) * var1; - float var15 = (this.field3875[13] * this.field3875[8] * this.field3875[2] + this.field3875[0] * this.field3875[9] * this.field3875[14] - this.field3875[13] * this.field3875[0] * this.field3875[10] - this.field3875[1] * this.field3875[8] * this.field3875[14] + this.field3875[1] * this.field3875[10] * this.field3875[12] - this.field3875[12] * this.field3875[2] * this.field3875[9]) * var1; - float var16 = var1 * (-this.field3875[0] * this.field3875[5] * this.field3875[14] + this.field3875[6] * this.field3875[0] * this.field3875[13] + this.field3875[14] * this.field3875[1] * this.field3875[4] - this.field3875[6] * this.field3875[1] * this.field3875[12] - this.field3875[4] * this.field3875[2] * this.field3875[13] + this.field3875[2] * this.field3875[5] * this.field3875[12]); - float var17 = (this.field3875[5] * this.field3875[0] * this.field3875[10] - this.field3875[0] * this.field3875[6] * this.field3875[9] - this.field3875[1] * this.field3875[4] * this.field3875[10] + this.field3875[1] * this.field3875[6] * this.field3875[8] + this.field3875[2] * this.field3875[4] * this.field3875[9] - this.field3875[8] * this.field3875[2] * this.field3875[5]) * var1; - this.field3875[0] = var2; - this.field3875[1] = var3; - this.field3875[2] = var4; - this.field3875[3] = var5; - this.field3875[4] = var6; - this.field3875[5] = var7; - this.field3875[6] = var8; - this.field3875[7] = var9; - this.field3875[8] = var10; - this.field3875[9] = var11; - this.field3875[10] = var12; - this.field3875[11] = var13; - this.field3875[12] = var14; - this.field3875[13] = var15; - this.field3875[14] = var16; - this.field3875[15] = var17; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(B)[F", - garbageValue = "6" - ) - public float[] method2313() { - float[] var1 = new float[3]; - class448 var2 = new class448(this.field3875[0], this.field3875[1], this.field3875[2]); - class448 var3 = new class448(this.field3875[4], this.field3875[5], this.field3875[6]); - class448 var4 = new class448(this.field3875[8], this.field3875[9], this.field3875[10]); - var1[0] = var2.method2291(); - var1[1] = var3.method2291(); - var1[2] = var4.method2291(); - return var1; - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - StringBuilder var1 = new StringBuilder(); - this.method2301(); - this.method2300(); - - for (int var2 = 0; var2 < 4; ++var2) { - for (int var3 = 0; var3 < 4; ++var3) { - if (var3 > 0) { - var1.append("\t"); - } - - float var4 = this.field3875[var3 + var2 * 4]; - if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { - var4 = 0.0F; - } - - var1.append(var4); - } - - var1.append("\n"); - } - - return var1.toString(); - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - boolean var1 = true; - byte var2 = 1; - int var3 = var2 * 31 + Arrays.hashCode(this.field3875); - return var3; - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (!(var1 instanceof class450)) { - return false; - } else { - class450 var2 = (class450)var1; - - for (int var3 = 0; var3 < 16; ++var3) { - if (this.field3875[var3] != var2.field3875[var3]) { - return false; - } - } - - return true; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class451.java b/osrs/src/main/java/class451.java deleted file mode 100644 index 9f7e29eb5..000000000 --- a/osrs/src/main/java/class451.java +++ /dev/null @@ -1,147 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("rm") -public class class451 { - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "[Luk;" - ) - static IndexedSprite[] field3876; - @ObfuscatedName("au") - float field3887; - @ObfuscatedName("ae") - float field3880; - @ObfuscatedName("ao") - float field3883; - @ObfuscatedName("at") - float field3886; - @ObfuscatedName("ac") - float field3878; - @ObfuscatedName("ai") - float field3882; - @ObfuscatedName("az") - float field3888; - @ObfuscatedName("ap") - float field3884; - @ObfuscatedName("aa") - float field3877; - @ObfuscatedName("af") - float field3881; - @ObfuscatedName("ad") - float field3879; - @ObfuscatedName("aq") - float field3885; - - static { - new class451(); - } - - class451() { - this.method2314(); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1136613952" - ) - void method2314() { - this.field3885 = 0.0F; - this.field3879 = 0.0F; - this.field3881 = 0.0F; - this.field3884 = 0.0F; - this.field3888 = 0.0F; - this.field3882 = 0.0F; - this.field3886 = 0.0F; - this.field3883 = 0.0F; - this.field3880 = 0.0F; - this.field3877 = 1.0F; - this.field3878 = 1.0F; - this.field3887 = 1.0F; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(FB)V", - garbageValue = "-67" - ) - void method2315(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field3880; - float var5 = this.field3878; - float var6 = this.field3884; - float var7 = this.field3879; - this.field3880 = var4 * var2 - var3 * this.field3883; - this.field3883 = var2 * this.field3883 + var4 * var3; - this.field3878 = var5 * var2 - this.field3882 * var3; - this.field3882 = var5 * var3 + this.field3882 * var2; - this.field3884 = var2 * var6 - var3 * this.field3877; - this.field3877 = var6 * var3 + this.field3877 * var2; - this.field3879 = var2 * var7 - var3 * this.field3885; - this.field3885 = var7 * var3 + this.field3885 * var2; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(FB)V", - garbageValue = "0" - ) - void method2316(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field3887; - float var5 = this.field3886; - float var6 = this.field3888; - float var7 = this.field3881; - this.field3887 = var3 * this.field3883 + var2 * var4; - this.field3883 = this.field3883 * var2 - var4 * var3; - this.field3886 = var3 * this.field3882 + var2 * var5; - this.field3882 = this.field3882 * var2 - var3 * var5; - this.field3888 = var6 * var2 + this.field3877 * var3; - this.field3877 = this.field3877 * var2 - var3 * var6; - this.field3881 = var2 * var7 + this.field3885 * var3; - this.field3885 = this.field3885 * var2 - var7 * var3; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "-2078210991" - ) - void method2317(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field3887; - float var5 = this.field3886; - float var6 = this.field3888; - float var7 = this.field3881; - this.field3887 = var2 * var4 - var3 * this.field3880; - this.field3880 = var2 * this.field3880 + var3 * var4; - this.field3886 = var5 * var2 - var3 * this.field3878; - this.field3878 = var3 * var5 + var2 * this.field3878; - this.field3888 = var2 * var6 - var3 * this.field3884; - this.field3884 = this.field3884 * var2 + var3 * var6; - this.field3881 = var2 * var7 - this.field3879 * var3; - this.field3879 = this.field3879 * var2 + var7 * var3; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(FFFI)V", - garbageValue = "-586193895" - ) - void method2318(float var1, float var2, float var3) { - this.field3881 += var1; - this.field3879 += var2; - this.field3885 += var3; - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - return this.field3887 + "," + this.field3886 + "," + this.field3888 + "," + this.field3881 + "\n" + this.field3880 + "," + this.field3878 + "," + this.field3884 + "," + this.field3879 + "\n" + this.field3883 + "," + this.field3882 + "," + this.field3877 + "," + this.field3885; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class452.java b/osrs/src/main/java/class452.java deleted file mode 100644 index 42d11ae95..000000000 --- a/osrs/src/main/java/class452.java +++ /dev/null @@ -1,25 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("rc") -public class class452 { - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lpi;" - ) - @Export("ItemDefinition_fontPlain11") - public static Font ItemDefinition_fontPlain11; - @ObfuscatedName("aj") - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("au") - float[] field3891; - @ObfuscatedName("ae") - int field3892; - - class452(float[] var1, int var2) { - this.field3891 = var1; - this.field3892 = var2; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class453.java b/osrs/src/main/java/class453.java deleted file mode 100644 index 88e60f939..000000000 --- a/osrs/src/main/java/class453.java +++ /dev/null @@ -1,47 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("rq") -public enum class453 implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lrq;" - ) - field3896(0, 1), - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lrq;" - ) - field3893(2, 2), - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lrq;" - ) - field3894(3, 3), - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lrq;" - ) - field3895(1, 10); - - @ObfuscatedName("ac") - final int field3897; - @ObfuscatedName("ai") - final int field3898; - - class453(int var3, int var4) { - this.field3897 = var3; - this.field3898 = var4; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3898; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class454.java b/osrs/src/main/java/class454.java deleted file mode 100644 index 8addb494d..000000000 --- a/osrs/src/main/java/class454.java +++ /dev/null @@ -1,77 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("rs") -public class class454 implements class459 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lsu;" - ) - public final class489 field3899; - - @ObfuscatedSignature( - descriptor = "(Lsx;)V" - ) - class454(class490 var1) { - this.field3899 = var1; - } - - @ObfuscatedSignature( - descriptor = "(Lrp;)V" - ) - public class454(class455 var1) { - this(new class490(var1)); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "530420265" - ) - public int method2320(int var1) { - return this.field3899.vmethod8144(var1); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lfh;FS)F", - garbageValue = "26313" - ) - static float method2321(class130 var0, float var1) { - if (var0 == null) { - return 0.0F; - } else { - float var2; - if (var0.field1258 == var1) { - var2 = 0.0F; - } else if (var1 == var0.field1254) { - var2 = 1.0F; - } else { - var2 = (var1 - var0.field1258) / (var0.field1254 - var0.field1258); - } - - float var3; - if (var0.field1242) { - var3 = var2; - } else { - class126.field1206[3] = var0.field1255; - class126.field1206[2] = var0.field1249; - class126.field1206[1] = var0.field1250; - class126.field1206[0] = var0.field1247 - var2; - class126.field1207[0] = 0.0F; - class126.field1207[1] = 0.0F; - class126.field1207[2] = 0.0F; - class126.field1207[3] = 0.0F; - class126.field1207[4] = 0.0F; - int var4 = ModelData0.method1381(class126.field1206, 3, 0.0F, true, 1.0F, true, class126.field1207); - if (var4 == 1) { - var3 = class126.field1207[0]; - } else { - var3 = 0.0F; - } - } - - return var3 * (var0.field1253 + var3 * (var3 * var0.field1248 + var0.field1256)) + var0.field1252; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class455.java b/osrs/src/main/java/class455.java deleted file mode 100644 index 42b4002d4..000000000 --- a/osrs/src/main/java/class455.java +++ /dev/null @@ -1,74 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("rp") -public abstract class class455 extends class281 implements class522 { - @ObfuscatedSignature( - descriptor = "(Lns;Lon;I)V" - ) - protected class455(StudioGame var1, Language var2, int var3) { - super(var1, var2, var3); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IB)Lrv;", - garbageValue = "-32" - ) - @Export("vmethod8207") - protected abstract class457 vmethod8207(int var1); - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1119561049" - ) - public int method2322() { - return super.field2482; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "22" - ) - @Export("vmethod8697") - public Object vmethod8697(int var1) { - class457 var2 = this.vmethod8207(var1); - return var2 != null && var2.method2328() ? var2.method2329() : null; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ltm;B)Lud;", - garbageValue = "-80" - ) - public class523 method2324(Buffer var1) { - int var2 = var1.readUnsignedShort(); - class457 var3 = this.vmethod8207(var2); - class523 var4 = new class523(var2); - Class var5 = var3.field3900.field4105; - if (var5 == Integer.class) { - var4.field4215 = var1.readInt(); - } else if (var5 == Long.class) { - var4.field4215 = var1.readLong(); - } else if (var5 == String.class) { - var4.field4215 = var1.readStringCp1252NullCircumfixed(); - } else { - if (!class518.class.isAssignableFrom(var5)) { - throw new IllegalStateException(); - } - - try { - class518 var6 = (class518)var5.newInstance(); - var6.method2614(var1); - var4.field4215 = var6; - } catch (InstantiationException var7) { - } catch (IllegalAccessException var8) { - } - } - - return var4; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class456.java b/osrs/src/main/java/class456.java deleted file mode 100644 index bcbbf7d77..000000000 --- a/osrs/src/main/java/class456.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("rg") -public class class456 extends class457 { - public class456(int var1) { - super(var1); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "362589282" - ) - @Export("vmethod7769") - void vmethod7769(Buffer var1, int var2) { - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class457.java b/osrs/src/main/java/class457.java deleted file mode 100644 index 4435517b9..000000000 --- a/osrs/src/main/java/class457.java +++ /dev/null @@ -1,86 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("rv") -public abstract class class457 implements class280 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Ltb;" - ) - class502 field3900; - - class457(int var1) { - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;II)V", - garbageValue = "362589282" - ) - @Export("vmethod7769") - abstract void vmethod7769(Buffer var1, int var2); - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ltm;B)V", - garbageValue = "-87" - ) - public void method2327(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; - } - - class453 var3 = (class453)KeyHandler.findEnumerated(class418.method2163(), var2); - if (var3 != null) { - switch(var3.field3897) { - case 0: - int var4 = var1.readUnsignedByte(); - this.field3900 = SequenceDefinition.method1074(var4); - if (this.field3900 != null) { - break; - } - - throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4); - case 1: - var1.readStringCp1252NullCircumfixed(); - break; - case 2: - class352[] var5 = new class352[]{class352.field3482, class352.field3480, class352.field3479, class352.field3481}; - KeyHandler.findEnumerated(var5, var1.readUnsignedByte()); - break; - default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); - } - } else { - this.vmethod7769(var1, var2); - } - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2062851135" - ) - boolean method2328() { - return this.field3900 != null; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/Object;", - garbageValue = "-12" - ) - Object method2329() { - if (this.field3900 == class502.field4101) { - return 0; - } else if (this.field3900 == class502.field4099) { - return -1L; - } else { - return this.field3900 == class502.field4100 ? "" : null; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class458.java b/osrs/src/main/java/class458.java deleted file mode 100644 index 1053d207f..000000000 --- a/osrs/src/main/java/class458.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ry") -public interface class458 { -} \ No newline at end of file diff --git a/osrs/src/main/java/class459.java b/osrs/src/main/java/class459.java deleted file mode 100644 index 92b2fc10b..000000000 --- a/osrs/src/main/java/class459.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("rk") -public interface class459 extends class458 { -} \ No newline at end of file diff --git a/osrs/src/main/java/class46.java b/osrs/src/main/java/class46.java index 0eee6e2fc..bd8bc742c 100644 --- a/osrs/src/main/java/class46.java +++ b/osrs/src/main/java/class46.java @@ -1,67 +1,67 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bz") +@ObfuscatedName("bg") public class class46 { - @ObfuscatedName("au") - int field224; - @ObfuscatedName("ae") - int field220; - @ObfuscatedName("ao") - int field222; - @ObfuscatedName("at") - int field223; @ObfuscatedName("ac") int field219; - @ObfuscatedName("ai") + @ObfuscatedName("al") + int field222; + @ObfuscatedName("ak") int field221; - @ObfuscatedName("az") + @ObfuscatedName("ax") + int field224; + @ObfuscatedName("ao") + int field223; + @ObfuscatedName("ah") + int field220; + @ObfuscatedName("ar") int[] field225; class46() { class60 var1 = VorbisSample.field267; - this.field224 = var1.method325(16); - this.field220 = var1.method325(24); - this.field222 = var1.method325(24); - this.field223 = var1.method325(24) + 1; - this.field219 = var1.method325(6) + 1; - this.field221 = var1.method325(8); - int[] var2 = new int[this.field219]; + this.field219 = var1.method327(16); + this.field222 = var1.method327(24); + this.field221 = var1.method327(24); + this.field224 = var1.method327(24) + 1; + this.field223 = var1.method327(6) + 1; + this.field220 = var1.method327(8); + int[] var2 = new int[this.field223]; int var3; - for (var3 = 0; var3 < this.field219; ++var3) { + for (var3 = 0; var3 < this.field223; ++var3) { int var4 = 0; - int var5 = var1.method325(3); - boolean var6 = var1.method326() != 0; + int var5 = var1.method327(3); + boolean var6 = var1.method328() != 0; if (var6) { - var4 = var1.method325(5); + var4 = var1.method327(5); } var2[var3] = var4 << 3 | var5; } - this.field225 = new int[this.field219 * 8]; + this.field225 = new int[this.field223 * 8]; - for (var3 = 0; var3 < this.field219 * 8; ++var3) { - this.field225[var3] = (var2[var3 >> 3] & 1 << (var3 & 7)) != 0 ? var1.method325(8) : -1; + for (var3 = 0; var3 < this.field223 * 8; ++var3) { + this.field225[var3] = (var2[var3 >> 3] & 1 << (var3 & 7)) != 0 ? var1.method327(8) : -1; } } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([FIZLce;)V" + descriptor = "([FIZLcz;)V" ) - void method229(float[] var1, int var2, boolean var3, class60 var4) { + void method236(float[] var1, int var2, boolean var3, class60 var4) { int var5; for (var5 = 0; var5 < var2; ++var5) { var1[var5] = 0.0F; } if (!var3) { - var5 = VorbisSample.field268[this.field221].field257; - int var6 = this.field222 - this.field220; - int var7 = var6 / this.field223; + var5 = VorbisSample.field266[this.field220].field254; + int var6 = this.field221 - this.field222; + int var7 = var6 / this.field224; int[] var8 = new int[var7]; for (int var9 = 0; var9 < 8; ++var9) { @@ -71,14 +71,14 @@ void method229(float[] var1, int var2, boolean var3, class60 var4) { int var11; int var12; if (var9 == 0) { - var11 = VorbisSample.field268[this.field221].method287(var4); + var11 = VorbisSample.field266[this.field220].method296(var4); for (var12 = var5 - 1; var12 >= 0; --var12) { if (var10 + var12 < var7) { - var8[var10 + var12] = var11 % this.field219; + var8[var10 + var12] = var11 % this.field223; } - var11 /= this.field219; + var11 /= this.field223; } } @@ -86,26 +86,26 @@ void method229(float[] var1, int var2, boolean var3, class60 var4) { var12 = var8[var10]; int var13 = this.field225[var9 + var12 * 8]; if (var13 >= 0) { - int var14 = var10 * this.field223 + this.field220; - VorbisCodebook var15 = VorbisSample.field268[var13]; + int var14 = var10 * this.field224 + this.field222; + VorbisCodebook var15 = VorbisSample.field266[var13]; int var16; - if (this.field224 == 0) { - var16 = this.field223 / var15.field257; + if (this.field219 == 0) { + var16 = this.field224 / var15.field254; for (int var17 = 0; var17 < var16; ++var17) { - float[] var21 = var15.method288(var4); + float[] var21 = var15.method297(var4); - for (int var19 = 0; var19 < var15.field257; ++var19) { + for (int var19 = 0; var19 < var15.field254; ++var19) { var1[var14 + var17 + var19 * var16] += var21[var19]; } } } else { var16 = 0; - while (var16 < this.field223) { - float[] var20 = var15.method288(var4); + while (var16 < this.field224) { + float[] var20 = var15.method297(var4); - for (int var18 = 0; var18 < var15.field257; ++var18) { + for (int var18 = 0; var18 < var15.field254; ++var18) { var1[var14 + var16] += var20[var18]; ++var16; } diff --git a/osrs/src/main/java/class460.java b/osrs/src/main/java/class460.java deleted file mode 100644 index 12e46a15e..000000000 --- a/osrs/src/main/java/class460.java +++ /dev/null @@ -1,59 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("re") -public class class460 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lre;" - ) - public static final class460 field3901; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lre;" - ) - static final class460 field3902; - @ObfuscatedName("ao") - String field3903; - - static { - field3901 = new class460("application/json"); - field3902 = new class460("text/plain"); - } - - class460(String var1) { - this.field3903 = var1; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1631262328" - ) - public String method2331() { - return this.field3903; - } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "(IIIIII)Z", - garbageValue = "1329235005" - ) - static final boolean method2332(int var0, int var1, int var2, int var3, int var4) { - PendingSpawn var5 = null; - - for (PendingSpawn var6 = (PendingSpawn)Client.pendingSpawns.last(); var6 != null; var6 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var6.plane && var6.x == var1 && var2 == var6.y && var3 == var6.type) { - var5 = var6; - break; - } - } - - if (var5 != null) { - var5.field945 = var4; - return true; - } else { - return false; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class461.java b/osrs/src/main/java/class461.java deleted file mode 100644 index 84c56e76b..000000000 --- a/osrs/src/main/java/class461.java +++ /dev/null @@ -1,24 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.io.UnsupportedEncodingException; - -@ObfuscatedName("rf") -public interface class461 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Lre;", - garbageValue = "1843960357" - ) - @Export("vmethod2213") - class460 vmethod2213(); - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-2012768243" - ) - @Export("vmethod7797") - byte[] vmethod7797() throws UnsupportedEncodingException; -} \ No newline at end of file diff --git a/osrs/src/main/java/class462.java b/osrs/src/main/java/class462.java index c3a537700..b2c5c1ae1 100644 --- a/osrs/src/main/java/class462.java +++ b/osrs/src/main/java/class462.java @@ -1,93 +1,81 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import java.io.UnsupportedEncodingException; +import java.applet.Applet; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; -@ObfuscatedName("rl") -public class class462 implements class461 { - @ObfuscatedName("at") - public static int field3904; - @ObfuscatedName("ae") +@ObfuscatedName("rf") +public class class462 { + @ObfuscatedName("ac") + @Export("RunException_applet") + public static Applet RunException_applet; + + @ObfuscatedName("ow") @ObfuscatedSignature( - descriptor = "Lorg/json/JSONObject;" + descriptor = "(II)V", + garbageValue = "-123351457" ) - JSONObject field3905; - - public class462(byte[] var1) throws UnsupportedEncodingException { - this.method2336(var1); - } - - public class462(JSONObject var1) { - this.field3905 = var1; - } + static void method2327(int var0) { + SequenceDefinition var1 = class36.SequenceDefinition_get(var0); + if (var1.isCachedModelIdSet()) { + int var3 = var1.SequenceDefinition_cachedModelId; + class139 var5 = (class139)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var3); + class139 var4; + if (var5 != null) { + var4 = var5; + } else { + AbstractArchive var7 = SequenceDefinition.SequenceDefinition_animationsArchive; + AbstractArchive var8 = SequenceDefinition.SequenceDefinition_skeletonsArchive; + boolean var9 = true; + byte[] var10 = var7.getFile(var3 >> 16 & 65535, var3 & 65535); + class139 var6; + if (var10 == null) { + var9 = false; + var6 = null; + } else { + int var11 = (var10[1] & 255) << 8 | var10[2] & 255; + byte[] var12 = var8.getFile(var11, 0); + if (var12 == null) { + var9 = false; + } - public class462(String var1) throws UnsupportedEncodingException { - this.method2337(var1); - } + if (!var9) { + var6 = null; + } else { + if (SoundCache.field214 == null) { + MusicPatchPcmStream.field2855 = Runtime.getRuntime().availableProcessors(); + SoundCache.field214 = new ThreadPoolExecutor(0, MusicPatchPcmStream.field2855, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(MusicPatchPcmStream.field2855 * 100 + 100), new class73()); + } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Lre;", - garbageValue = "1843960357" - ) - public class460 vmethod2213() { - return class460.field3901; - } + try { + var6 = new class139(var7, var8, var3, false); + } catch (Exception var14) { + var6 = null; + } + } + } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-2012768243" - ) - @Export("vmethod7797") - public byte[] vmethod7797() throws UnsupportedEncodingException { - return this.field3905 == null ? new byte[0] : this.field3905.toString().getBytes("UTF-8"); - } + if (var6 != null) { + SequenceDefinition.SequenceDefinition_cachedModel.put(var6, (long)var3); + } - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "-68" - ) - void method2336(byte[] var1) throws UnsupportedEncodingException { - String var2 = new String(var1, "UTF-8"); - this.method2337(var2); - } + var4 = var6; + } - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-32" - ) - void method2337(String var1) throws UnsupportedEncodingException { - try { - if (var1.charAt(0) == '{') { - this.field3905 = new JSONObject(var1); + int var2; + if (var4 == null) { + var2 = 2; } else { - if (var1.charAt(0) != '[') { - throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); - } + var2 = var4.method738() ? 0 : 1; + } - JSONArray var2 = new JSONArray(var1); - this.field3905 = new JSONObject(); - this.field3905.method2709("arrayValues", var2); + if (var2 == 2) { + Client.field608.add(var1.SequenceDefinition_cachedModelId); } - } catch (JSONException var3) { - throw new UnsupportedEncodingException(var3.getMessage()); } } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(B)Lorg/json/JSONObject;", - garbageValue = "-30" - ) - public JSONObject method2338() { - return this.field3905; - } } \ No newline at end of file diff --git a/osrs/src/main/java/class463.java b/osrs/src/main/java/class463.java index a623be4a3..d4f59f8d8 100644 --- a/osrs/src/main/java/class463.java +++ b/osrs/src/main/java/class463.java @@ -2,73 +2,67 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; +@ObfuscatedName("ro") +public class class463 { + @ObfuscatedName("oh") + @Export("menuY") + static int menuY; + @ObfuscatedName("ac") + float field3893; + @ObfuscatedName("al") + float field3895; + @ObfuscatedName("ak") + float field3894; -@ObfuscatedName("rt") -public class class463 implements class461 { - @ObfuscatedName("au") - final Map field3906; + static { + new class463(0.0F, 0.0F, 0.0F); + new class463(1.0F, 1.0F, 1.0F); + new class463(1.0F, 0.0F, 0.0F); + new class463(0.0F, 1.0F, 0.0F); + new class463(0.0F, 0.0F, 1.0F); + NPC.method581(100); + } - public class463(Map var1) { - this.field3906 = var1; + class463(float var1, float var2, float var3) { + this.field3893 = var1; + this.field3895 = var2; + this.field3894 = var3; } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Lre;", - garbageValue = "1843960357" + descriptor = "(I)F", + garbageValue = "-718087487" ) - @Export("vmethod2213") - public class460 vmethod2213() { - return null; + final float method2328() { + return (float)Math.sqrt((double)(this.field3893 * this.field3893 + this.field3895 * this.field3895 + this.field3894 * this.field3894)); } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-2012768243" - ) - @Export("vmethod7797") - public byte[] vmethod7797() throws UnsupportedEncodingException { - return this.method2342().getBytes("UTF-8"); + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + return this.field3893 + ", " + this.field3895 + ", " + this.field3894; } - @ObfuscatedName("ai") + @ObfuscatedName("lt") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-920677238" + descriptor = "(Ljava/lang/String;Lnm;S)Ljava/lang/String;", + garbageValue = "-20030" ) - public String method2342() throws UnsupportedEncodingException { - StringBuilder var1 = new StringBuilder(); - Iterator var2 = this.field3906.entrySet().iterator(); - - while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); - String var4 = URLEncoder.encode((String)var3.getKey(), "UTF-8"); - String var5 = URLEncoder.encode((String)var3.getValue(), "UTF-8"); - var1.append(var4).append("=").append(var5).append("&"); - } + static String method2329(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { + for (int var2 = 1; var2 <= 5; ++var2) { + while (true) { + int var3 = var0.indexOf("%" + var2); + if (var3 == -1) { + break; + } - if (var1.length() == 0) { - return ""; - } else { - var1.deleteCharAt(var1.length() - 1); - var1.insert(0, "?"); - return var1.toString(); + var0 = var0.substring(0, var3) + class517.method2534(VarcInt.method977(var1, var2 - 1)) + var0.substring(var3 + 2); + } + } } - } - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "67" - ) - static void method2343() { - PcmPlayer.method212(24); - class318.setLoginResponseString("", "You were disconnected from the server.", ""); + return var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class464.java b/osrs/src/main/java/class464.java index cf00d7541..b3b634f8c 100644 --- a/osrs/src/main/java/class464.java +++ b/osrs/src/main/java/class464.java @@ -1,21 +1,124 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rx") -public class class464 { +@ObfuscatedName("rd") +public final class class464 { @ObfuscatedName("ac") - static final int[] field3907; - @ObfuscatedName("ai") - static final int[] field3908; + @ObfuscatedSignature( + descriptor = "[Lrd;" + ) + static class464[] field3898; + @ObfuscatedName("al") + static int field3897; + @ObfuscatedName("ak") + static int field3896; + @ObfuscatedName("ax") + float field3902; + @ObfuscatedName("ao") + float field3900; + @ObfuscatedName("ah") + float field3899; + @ObfuscatedName("ar") + float field3901; static { - field3907 = new int[16384]; - field3908 = new int[16384]; - double var0 = 3.834951969714103E-4D; + field3898 = new class464[0]; + class146.method768(100); + new class464(); + } + + class464() { + this.method2333(); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1744815510" + ) + public void method2330() { + synchronized(field3898) { + if (field3896 < field3897 - 1) { + field3898[++field3896 - 1] = this; + } + + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(FFFFI)V", + garbageValue = "1915313855" + ) + void method2331(float var1, float var2, float var3, float var4) { + this.field3902 = var1; + this.field3900 = var2; + this.field3899 = var3; + this.field3901 = var4; + } - for (int var2 = 0; var2 < 16384; ++var2) { - field3907[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); - field3908[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(FFFFI)V", + garbageValue = "-1238110919" + ) + public void method2332(float var1, float var2, float var3, float var4) { + float var5 = (float)Math.sin((double)(0.5F * var4)); + float var6 = (float)Math.cos((double)(0.5F * var4)); + this.field3902 = var1 * var5; + this.field3900 = var5 * var2; + this.field3899 = var5 * var3; + this.field3901 = var6; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "33554432" + ) + final void method2333() { + this.field3899 = 0.0F; + this.field3900 = 0.0F; + this.field3902 = 0.0F; + this.field3901 = 1.0F; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Lrd;I)V", + garbageValue = "255330704" + ) + public final void method2334(class464 var1) { + this.method2331(this.field3901 * var1.field3902 + this.field3902 * var1.field3901 + var1.field3900 * this.field3899 - var1.field3899 * this.field3900, this.field3902 * var1.field3899 + this.field3901 * var1.field3900 + (this.field3900 * var1.field3901 - this.field3899 * var1.field3902), var1.field3899 * this.field3901 + (var1.field3901 * this.field3899 + this.field3900 * var1.field3902 - this.field3902 * var1.field3900), var1.field3901 * this.field3901 - this.field3902 * var1.field3902 - var1.field3900 * this.field3900 - var1.field3899 * this.field3899); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (!(var1 instanceof class464)) { + return false; + } else { + class464 var2 = (class464)var1; + return this.field3902 == var2.field3902 && var2.field3900 == this.field3900 && this.field3899 == var2.field3899 && this.field3901 == var2.field3901; } + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + boolean var1 = true; + float var2 = 1.0F; + var2 = this.field3902 + var2 * 31.0F; + var2 = this.field3900 + var2 * 31.0F; + var2 = 31.0F * var2 + this.field3899; + var2 = this.field3901 + var2 * 31.0F; + return (int)var2; + } + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + return this.field3902 + "," + this.field3900 + "," + this.field3899 + "," + this.field3901; } } \ No newline at end of file diff --git a/osrs/src/main/java/class465.java b/osrs/src/main/java/class465.java index 04e8eb3b3..cd00d5efe 100644 --- a/osrs/src/main/java/class465.java +++ b/osrs/src/main/java/class465.java @@ -1,21 +1,471 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rw") -public class class465 { +import java.util.Arrays; + +@ObfuscatedName("rb") +public final class class465 { @ObfuscatedName("al") - static final int[] field3909; - @ObfuscatedName("an") - static final int[] field3910; + @ObfuscatedSignature( + descriptor = "[Lrb;" + ) + static class465[] field3907; + @ObfuscatedName("ak") + static int field3904; + @ObfuscatedName("ax") + static int field3905; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lrb;" + ) + public static final class465 field3903; + @ObfuscatedName("ui") + @Export("cameraLookAtAcceleration") + static int cameraLookAtAcceleration; + @ObfuscatedName("ao") + public float[] field3908; static { - field3909 = new int[2048]; - field3910 = new int[2048]; - double var0 = 0.0030679615757712823D; + field3907 = new class465[0]; + class76.method430(100); + field3903 = new class465(); + } + + public class465() { + this.field3908 = new float[16]; + this.method2340(); + } + + @ObfuscatedSignature( + descriptor = "(Lrb;)V" + ) + public class465(class465 var1) { + this.field3908 = new float[16]; + this.method2342(var1); + } + + @ObfuscatedSignature( + descriptor = "(Lul;Z)V" + ) + public class465(Buffer var1, boolean var2) { + this.field3908 = new float[16]; + this.method2337(var1, var2); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-695246876" + ) + public void method2336() { + synchronized(field3907) { + if (field3905 < field3904 - 1) { + field3907[++field3905 - 1] = this; + } + + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Lul;ZI)V", + garbageValue = "332749023" + ) + void method2337(Buffer var1, boolean var2) { + if (var2) { + class466 var3 = new class466(); + var3.method2353(class143.method756(var1.readShort())); + var3.method2354(class143.method756(var1.readShort())); + var3.method2355(class143.method756(var1.readShort())); + var3.method2356((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); + this.method2348(var3); + } else { + for (int var4 = 0; var4 < 16; ++var4) { + this.field3908[var4] = var1.method2586(); + } + } + + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "-1165307425" + ) + float[] method2338() { + float[] var1 = new float[3]; + if ((double)this.field3908[2] < 0.999D && (double)this.field3908[2] > -0.999D) { + var1[1] = (float)(-Math.asin((double)this.field3908[2])); + double var2 = Math.cos((double)var1[1]); + var1[0] = (float)Math.atan2((double)this.field3908[6] / var2, (double)this.field3908[10] / var2); + var1[2] = (float)Math.atan2((double)this.field3908[1] / var2, (double)this.field3908[0] / var2); + } else { + var1[0] = 0.0F; + var1[1] = (float)Math.atan2((double)this.field3908[2], 0.0D); + var1[2] = (float)Math.atan2((double)(-this.field3908[9]), (double)this.field3908[5]); + } + + return var1; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "83" + ) + public float[] method2339() { + float[] var1 = new float[]{(float)(-Math.asin((double)this.field3908[6])), 0.0F, 0.0F}; + double var2 = Math.cos((double)var1[0]); + double var4; + double var6; + if (Math.abs(var2) > 0.005D) { + var4 = (double)this.field3908[2]; + var6 = (double)this.field3908[10]; + double var8 = (double)this.field3908[4]; + double var10 = (double)this.field3908[5]; + var1[1] = (float)Math.atan2(var4, var6); + var1[2] = (float)Math.atan2(var8, var10); + } else { + var4 = (double)this.field3908[1]; + var6 = (double)this.field3908[0]; + if (this.field3908[6] < 0.0F) { + var1[1] = (float)Math.atan2(var4, var6); + } else { + var1[1] = (float)(-Math.atan2(var4, var6)); + } + + var1[2] = 0.0F; + } + + return var1; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "624646995" + ) + void method2340() { + this.field3908[0] = 1.0F; + this.field3908[1] = 0.0F; + this.field3908[2] = 0.0F; + this.field3908[3] = 0.0F; + this.field3908[4] = 0.0F; + this.field3908[5] = 1.0F; + this.field3908[6] = 0.0F; + this.field3908[7] = 0.0F; + this.field3908[8] = 0.0F; + this.field3908[9] = 0.0F; + this.field3908[10] = 1.0F; + this.field3908[11] = 0.0F; + this.field3908[12] = 0.0F; + this.field3908[13] = 0.0F; + this.field3908[14] = 0.0F; + this.field3908[15] = 1.0F; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1094416342" + ) + public void method2341() { + this.field3908[0] = 0.0F; + this.field3908[1] = 0.0F; + this.field3908[2] = 0.0F; + this.field3908[3] = 0.0F; + this.field3908[4] = 0.0F; + this.field3908[5] = 0.0F; + this.field3908[6] = 0.0F; + this.field3908[7] = 0.0F; + this.field3908[8] = 0.0F; + this.field3908[9] = 0.0F; + this.field3908[10] = 0.0F; + this.field3908[11] = 0.0F; + this.field3908[12] = 0.0F; + this.field3908[13] = 0.0F; + this.field3908[14] = 0.0F; + this.field3908[15] = 0.0F; + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(Lrb;I)V", + garbageValue = "-1754099381" + ) + public void method2342(class465 var1) { + System.arraycopy(var1.field3908, 0, this.field3908, 0, 16); + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "-184544595" + ) + public void method2343(float var1) { + this.method2344(var1, var1, var1); + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(FFFI)V", + garbageValue = "-1816436529" + ) + public void method2344(float var1, float var2, float var3) { + this.method2340(); + this.field3908[0] = var1; + this.field3908[5] = var2; + this.field3908[10] = var3; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Lrb;B)V", + garbageValue = "6" + ) + public void method2345(class465 var1) { + for (int var2 = 0; var2 < this.field3908.length; ++var2) { + float[] var10000 = this.field3908; + var10000[var2] += var1.field3908[var2]; + } + + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(Lrb;B)V", + garbageValue = "-104" + ) + public void method2346(class465 var1) { + float var2 = var1.field3908[0] * this.field3908[0] + var1.field3908[4] * this.field3908[1] + this.field3908[2] * var1.field3908[8] + var1.field3908[12] * this.field3908[3]; + float var3 = this.field3908[2] * var1.field3908[9] + this.field3908[1] * var1.field3908[5] + var1.field3908[1] * this.field3908[0] + this.field3908[3] * var1.field3908[13]; + float var4 = var1.field3908[14] * this.field3908[3] + var1.field3908[10] * this.field3908[2] + var1.field3908[6] * this.field3908[1] + var1.field3908[2] * this.field3908[0]; + float var5 = var1.field3908[15] * this.field3908[3] + var1.field3908[11] * this.field3908[2] + this.field3908[0] * var1.field3908[3] + this.field3908[1] * var1.field3908[7]; + float var6 = var1.field3908[12] * this.field3908[7] + var1.field3908[0] * this.field3908[4] + var1.field3908[4] * this.field3908[5] + this.field3908[6] * var1.field3908[8]; + float var7 = this.field3908[4] * var1.field3908[1] + var1.field3908[5] * this.field3908[5] + this.field3908[6] * var1.field3908[9] + var1.field3908[13] * this.field3908[7]; + float var8 = var1.field3908[10] * this.field3908[6] + var1.field3908[2] * this.field3908[4] + var1.field3908[6] * this.field3908[5] + this.field3908[7] * var1.field3908[14]; + float var9 = var1.field3908[11] * this.field3908[6] + this.field3908[5] * var1.field3908[7] + this.field3908[4] * var1.field3908[3] + this.field3908[7] * var1.field3908[15]; + float var10 = var1.field3908[0] * this.field3908[8] + this.field3908[9] * var1.field3908[4] + var1.field3908[8] * this.field3908[10] + var1.field3908[12] * this.field3908[11]; + float var11 = this.field3908[11] * var1.field3908[13] + this.field3908[10] * var1.field3908[9] + this.field3908[8] * var1.field3908[1] + var1.field3908[5] * this.field3908[9]; + float var12 = this.field3908[10] * var1.field3908[10] + this.field3908[9] * var1.field3908[6] + this.field3908[8] * var1.field3908[2] + var1.field3908[14] * this.field3908[11]; + float var13 = var1.field3908[3] * this.field3908[8] + var1.field3908[7] * this.field3908[9] + var1.field3908[11] * this.field3908[10] + var1.field3908[15] * this.field3908[11]; + float var14 = this.field3908[15] * var1.field3908[12] + this.field3908[14] * var1.field3908[8] + this.field3908[13] * var1.field3908[4] + this.field3908[12] * var1.field3908[0]; + float var15 = var1.field3908[13] * this.field3908[15] + var1.field3908[9] * this.field3908[14] + this.field3908[13] * var1.field3908[5] + var1.field3908[1] * this.field3908[12]; + float var16 = var1.field3908[14] * this.field3908[15] + var1.field3908[10] * this.field3908[14] + var1.field3908[6] * this.field3908[13] + var1.field3908[2] * this.field3908[12]; + float var17 = var1.field3908[11] * this.field3908[14] + this.field3908[12] * var1.field3908[3] + var1.field3908[7] * this.field3908[13] + this.field3908[15] * var1.field3908[15]; + this.field3908[0] = var2; + this.field3908[1] = var3; + this.field3908[2] = var4; + this.field3908[3] = var5; + this.field3908[4] = var6; + this.field3908[5] = var7; + this.field3908[6] = var8; + this.field3908[7] = var9; + this.field3908[8] = var10; + this.field3908[9] = var11; + this.field3908[10] = var12; + this.field3908[11] = var13; + this.field3908[12] = var14; + this.field3908[13] = var15; + this.field3908[14] = var16; + this.field3908[15] = var17; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(Lrd;I)V", + garbageValue = "-2131255556" + ) + public void method2347(class464 var1) { + float var2 = var1.field3901 * var1.field3901; + float var3 = var1.field3901 * var1.field3902; + float var4 = var1.field3901 * var1.field3900; + float var5 = var1.field3901 * var1.field3899; + float var6 = var1.field3902 * var1.field3902; + float var7 = var1.field3900 * var1.field3902; + float var8 = var1.field3902 * var1.field3899; + float var9 = var1.field3900 * var1.field3900; + float var10 = var1.field3899 * var1.field3900; + float var11 = var1.field3899 * var1.field3899; + this.field3908[0] = var6 + var2 - var11 - var9; + this.field3908[1] = var7 + var7 + var5 + var5; + this.field3908[2] = var8 - var4 - var4 + var8; + this.field3908[4] = var7 - var5 - var5 + var7; + this.field3908[5] = var9 + var2 - var6 - var11; + this.field3908[6] = var10 + var3 + var10 + var3; + this.field3908[8] = var4 + var8 + var8 + var4; + this.field3908[9] = var10 + (var10 - var3 - var3); + this.field3908[10] = var11 + var2 - var9 - var6; + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(Lrz;B)V", + garbageValue = "76" + ) + void method2348(class466 var1) { + this.field3908[0] = var1.field3911; + this.field3908[1] = var1.field3915; + this.field3908[2] = var1.field3914; + this.field3908[3] = 0.0F; + this.field3908[4] = var1.field3920; + this.field3908[5] = var1.field3917; + this.field3908[6] = var1.field3913; + this.field3908[7] = 0.0F; + this.field3908[8] = var1.field3918; + this.field3908[9] = var1.field3910; + this.field3908[10] = var1.field3916; + this.field3908[11] = 0.0F; + this.field3908[12] = var1.field3919; + this.field3908[13] = var1.field3912; + this.field3908[14] = var1.field3909; + this.field3908[15] = 1.0F; + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(B)F", + garbageValue = "-125" + ) + float method2349() { + return this.field3908[6] * this.field3908[3] * this.field3908[9] * this.field3908[12] + (this.field3908[10] * this.field3908[7] * this.field3908[1] * this.field3908[12] + (this.field3908[11] * this.field3908[4] * this.field3908[1] * this.field3908[14] + (this.field3908[14] * this.field3908[0] * this.field3908[7] * this.field3908[9] + this.field3908[15] * this.field3908[0] * this.field3908[5] * this.field3908[10] - this.field3908[14] * this.field3908[11] * this.field3908[5] * this.field3908[0] - this.field3908[15] * this.field3908[9] * this.field3908[6] * this.field3908[0] + this.field3908[11] * this.field3908[0] * this.field3908[6] * this.field3908[13] - this.field3908[10] * this.field3908[7] * this.field3908[0] * this.field3908[13] - this.field3908[10] * this.field3908[4] * this.field3908[1] * this.field3908[15]) + this.field3908[8] * this.field3908[6] * this.field3908[1] * this.field3908[15] - this.field3908[11] * this.field3908[6] * this.field3908[1] * this.field3908[12] - this.field3908[8] * this.field3908[7] * this.field3908[1] * this.field3908[14]) + this.field3908[15] * this.field3908[2] * this.field3908[4] * this.field3908[9] - this.field3908[13] * this.field3908[11] * this.field3908[2] * this.field3908[4] - this.field3908[15] * this.field3908[8] * this.field3908[5] * this.field3908[2] + this.field3908[2] * this.field3908[5] * this.field3908[11] * this.field3908[12] + this.field3908[13] * this.field3908[8] * this.field3908[7] * this.field3908[2] - this.field3908[12] * this.field3908[7] * this.field3908[2] * this.field3908[9] - this.field3908[14] * this.field3908[9] * this.field3908[4] * this.field3908[3] + this.field3908[13] * this.field3908[4] * this.field3908[3] * this.field3908[10] + this.field3908[5] * this.field3908[3] * this.field3908[8] * this.field3908[14] - this.field3908[10] * this.field3908[3] * this.field3908[5] * this.field3908[12] - this.field3908[13] * this.field3908[3] * this.field3908[6] * this.field3908[8]); + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1302965817" + ) + public void method2350() { + float var1 = 1.0F / this.method2349(); + float var2 = var1 * (this.field3908[13] * this.field3908[6] * this.field3908[11] + (this.field3908[10] * this.field3908[5] * this.field3908[15] - this.field3908[11] * this.field3908[5] * this.field3908[14] - this.field3908[15] * this.field3908[6] * this.field3908[9]) + this.field3908[7] * this.field3908[9] * this.field3908[14] - this.field3908[10] * this.field3908[7] * this.field3908[13]); + float var3 = (this.field3908[14] * this.field3908[1] * this.field3908[11] + this.field3908[15] * this.field3908[10] * -this.field3908[1] + this.field3908[15] * this.field3908[2] * this.field3908[9] - this.field3908[11] * this.field3908[2] * this.field3908[13] - this.field3908[14] * this.field3908[3] * this.field3908[9] + this.field3908[13] * this.field3908[10] * this.field3908[3]) * var1; + float var4 = (this.field3908[1] * this.field3908[6] * this.field3908[15] - this.field3908[14] * this.field3908[7] * this.field3908[1] - this.field3908[15] * this.field3908[2] * this.field3908[5] + this.field3908[13] * this.field3908[7] * this.field3908[2] + this.field3908[14] * this.field3908[3] * this.field3908[5] - this.field3908[13] * this.field3908[3] * this.field3908[6]) * var1; + float var5 = var1 * (this.field3908[9] * this.field3908[3] * this.field3908[6] + (this.field3908[11] * this.field3908[2] * this.field3908[5] + this.field3908[6] * -this.field3908[1] * this.field3908[11] + this.field3908[1] * this.field3908[7] * this.field3908[10] - this.field3908[7] * this.field3908[2] * this.field3908[9] - this.field3908[10] * this.field3908[3] * this.field3908[5])); + float var6 = var1 * (this.field3908[10] * this.field3908[7] * this.field3908[12] + (this.field3908[14] * this.field3908[11] * this.field3908[4] + this.field3908[15] * -this.field3908[4] * this.field3908[10] + this.field3908[15] * this.field3908[6] * this.field3908[8] - this.field3908[12] * this.field3908[6] * this.field3908[11] - this.field3908[14] * this.field3908[8] * this.field3908[7])); + float var7 = (this.field3908[10] * this.field3908[0] * this.field3908[15] - this.field3908[0] * this.field3908[11] * this.field3908[14] - this.field3908[15] * this.field3908[2] * this.field3908[8] + this.field3908[2] * this.field3908[11] * this.field3908[12] + this.field3908[14] * this.field3908[8] * this.field3908[3] - this.field3908[10] * this.field3908[3] * this.field3908[12]) * var1; + float var8 = var1 * (this.field3908[15] * this.field3908[6] * -this.field3908[0] + this.field3908[14] * this.field3908[7] * this.field3908[0] + this.field3908[2] * this.field3908[4] * this.field3908[15] - this.field3908[12] * this.field3908[7] * this.field3908[2] - this.field3908[14] * this.field3908[3] * this.field3908[4] + this.field3908[12] * this.field3908[3] * this.field3908[6]); + float var9 = (this.field3908[10] * this.field3908[3] * this.field3908[4] + this.field3908[7] * this.field3908[2] * this.field3908[8] + (this.field3908[11] * this.field3908[6] * this.field3908[0] - this.field3908[7] * this.field3908[0] * this.field3908[10] - this.field3908[2] * this.field3908[4] * this.field3908[11]) - this.field3908[8] * this.field3908[3] * this.field3908[6]) * var1; + float var10 = (this.field3908[15] * this.field3908[4] * this.field3908[9] - this.field3908[4] * this.field3908[11] * this.field3908[13] - this.field3908[5] * this.field3908[8] * this.field3908[15] + this.field3908[12] * this.field3908[5] * this.field3908[11] + this.field3908[13] * this.field3908[8] * this.field3908[7] - this.field3908[12] * this.field3908[7] * this.field3908[9]) * var1; + float var11 = var1 * (this.field3908[12] * this.field3908[9] * this.field3908[3] + (this.field3908[15] * this.field3908[1] * this.field3908[8] + this.field3908[15] * -this.field3908[0] * this.field3908[9] + this.field3908[0] * this.field3908[11] * this.field3908[13] - this.field3908[11] * this.field3908[1] * this.field3908[12] - this.field3908[3] * this.field3908[8] * this.field3908[13])); + float var12 = (this.field3908[13] * this.field3908[4] * this.field3908[3] + this.field3908[7] * this.field3908[1] * this.field3908[12] + (this.field3908[0] * this.field3908[5] * this.field3908[15] - this.field3908[0] * this.field3908[7] * this.field3908[13] - this.field3908[15] * this.field3908[4] * this.field3908[1]) - this.field3908[5] * this.field3908[3] * this.field3908[12]) * var1; + float var13 = (this.field3908[9] * this.field3908[7] * this.field3908[0] + this.field3908[5] * -this.field3908[0] * this.field3908[11] + this.field3908[11] * this.field3908[4] * this.field3908[1] - this.field3908[7] * this.field3908[1] * this.field3908[8] - this.field3908[4] * this.field3908[3] * this.field3908[9] + this.field3908[8] * this.field3908[5] * this.field3908[3]) * var1; + float var14 = (this.field3908[12] * this.field3908[6] * this.field3908[9] + (this.field3908[13] * this.field3908[4] * this.field3908[10] + -this.field3908[4] * this.field3908[9] * this.field3908[14] + this.field3908[8] * this.field3908[5] * this.field3908[14] - this.field3908[12] * this.field3908[10] * this.field3908[5] - this.field3908[13] * this.field3908[6] * this.field3908[8])) * var1; + float var15 = (this.field3908[9] * this.field3908[0] * this.field3908[14] - this.field3908[13] * this.field3908[0] * this.field3908[10] - this.field3908[14] * this.field3908[1] * this.field3908[8] + this.field3908[10] * this.field3908[1] * this.field3908[12] + this.field3908[13] * this.field3908[8] * this.field3908[2] - this.field3908[12] * this.field3908[2] * this.field3908[9]) * var1; + float var16 = var1 * (this.field3908[4] * this.field3908[1] * this.field3908[14] + this.field3908[14] * this.field3908[5] * -this.field3908[0] + this.field3908[0] * this.field3908[6] * this.field3908[13] - this.field3908[1] * this.field3908[6] * this.field3908[12] - this.field3908[2] * this.field3908[4] * this.field3908[13] + this.field3908[5] * this.field3908[2] * this.field3908[12]); + float var17 = var1 * (this.field3908[4] * this.field3908[2] * this.field3908[9] + this.field3908[5] * this.field3908[0] * this.field3908[10] - this.field3908[9] * this.field3908[0] * this.field3908[6] - this.field3908[10] * this.field3908[4] * this.field3908[1] + this.field3908[8] * this.field3908[1] * this.field3908[6] - this.field3908[5] * this.field3908[2] * this.field3908[8]); + this.field3908[0] = var2; + this.field3908[1] = var3; + this.field3908[2] = var4; + this.field3908[3] = var5; + this.field3908[4] = var6; + this.field3908[5] = var7; + this.field3908[6] = var8; + this.field3908[7] = var9; + this.field3908[8] = var10; + this.field3908[9] = var11; + this.field3908[10] = var12; + this.field3908[11] = var13; + this.field3908[12] = var14; + this.field3908[13] = var15; + this.field3908[14] = var16; + this.field3908[15] = var17; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "1974456847" + ) + public float[] method2351() { + float[] var1 = new float[3]; + class463 var2 = new class463(this.field3908[0], this.field3908[1], this.field3908[2]); + class463 var3 = new class463(this.field3908[4], this.field3908[5], this.field3908[6]); + class463 var4 = new class463(this.field3908[8], this.field3908[9], this.field3908[10]); + var1[0] = var2.method2328(); + var1[1] = var3.method2328(); + var1[2] = var4.method2328(); + return var1; + } + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + StringBuilder var1 = new StringBuilder(); + this.method2339(); + this.method2338(); + + for (int var2 = 0; var2 < 4; ++var2) { + for (int var3 = 0; var3 < 4; ++var3) { + if (var3 > 0) { + var1.append("\t"); + } + + float var4 = this.field3908[var3 + var2 * 4]; + if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { + var4 = 0.0F; + } + + var1.append(var4); + } + + var1.append("\n"); + } + + return var1.toString(); + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + boolean var1 = true; + byte var2 = 1; + int var3 = var2 * 31 + Arrays.hashCode(this.field3908); + return var3; + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (!(var1 instanceof class465)) { + return false; + } else { + class465 var2 = (class465)var1; + + for (int var3 = 0; var3 < 16; ++var3) { + if (var2.field3908[var3] != this.field3908[var3]) { + return false; + } + } + + return true; + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "([BILjava/lang/CharSequence;B)I", + garbageValue = "-72" + ) + public static int method2335(byte[] var0, int var1, CharSequence var2) { + int var3 = var2.length(); + int var4 = var1; - for (int var2 = 0; var2 < 2048; ++var2) { - field3909[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - field3910[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); + for (int var5 = 0; var5 < var3; ++var5) { + char var6 = var2.charAt(var5); + if (var6 <= 127) { + var0[var4++] = (byte)var6; + } else if (var6 <= 2047) { + var0[var4++] = (byte)(192 | var6 >> 6); + var0[var4++] = (byte)(128 | var6 & '?'); + } else { + var0[var4++] = (byte)(224 | var6 >> '\f'); + var0[var4++] = (byte)(128 | var6 >> 6 & 63); + var0[var4++] = (byte)(128 | var6 & '?'); + } } + return var4 - var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class466.java b/osrs/src/main/java/class466.java index d1fab3893..50783011b 100644 --- a/osrs/src/main/java/class466.java +++ b/osrs/src/main/java/class466.java @@ -2,649 +2,141 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rn") +@ObfuscatedName("rz") public class class466 { - @ObfuscatedName("ai") - static int[] field3914; - @ObfuscatedName("az") - public static int[] field3911; - @ObfuscatedName("ad") - @Export("Tiles_saturation") - static int[] Tiles_saturation; + @ObfuscatedName("ac") + float field3911; + @ObfuscatedName("al") + float field3915; + @ObfuscatedName("ak") + float field3914; + @ObfuscatedName("ax") + float field3920; + @ObfuscatedName("ao") + float field3917; + @ObfuscatedName("ah") + float field3913; + @ObfuscatedName("ar") + float field3918; @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lfi;" - ) - static ClanSettings field3912; + float field3910; + @ObfuscatedName("am") + float field3916; + @ObfuscatedName("av") + float field3919; + @ObfuscatedName("ag") + float field3912; + @ObfuscatedName("aa") + float field3909; static { - field3914 = new int[32768]; - - for (int var0 = 0; var0 < 32768; ++var0) { - field3914[var0] = method2344(var0); - } - - method2346(); + new class466(); } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)[Lnv;", - garbageValue = "3" - ) - static class345[] method2345() { - return new class345[]{class345.field3151, class345.field3150}; + class466() { + this.method2352(); } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2141889570" - ) - static final int method2344(int var0) { - double var1 = (double)(var0 >> 10 & 31) / 31.0D; - double var3 = (double)(var0 >> 5 & 31) / 31.0D; - double var5 = (double)(var0 & 31) / 31.0D; - double var7 = var1; - if (var3 < var1) { - var7 = var3; - } - - if (var5 < var7) { - var7 = var5; - } - - double var9 = var1; - if (var3 > var1) { - var9 = var3; - } - - if (var5 > var9) { - var9 = var5; - } - - double var11 = 0.0D; - double var13 = 0.0D; - double var15 = (var9 + var7) / 2.0D; - if (var7 != var9) { - if (var15 < 0.5D) { - var13 = (var9 - var7) / (var7 + var9); - } - - if (var15 >= 0.5D) { - var13 = (var9 - var7) / (2.0D - var9 - var7); - } - - if (var9 == var1) { - var11 = (var3 - var5) / (var9 - var7); - } else if (var3 == var9) { - var11 = 2.0D + (var5 - var1) / (var9 - var7); - } else if (var5 == var9) { - var11 = 4.0D + (var1 - var3) / (var9 - var7); - } - } - - int var17 = (int)(var11 * 256.0D / 6.0D); - var17 &= 255; - double var18 = 256.0D * var13; - if (var18 < 0.0D) { - var18 = 0.0D; - } else if (var18 > 255.0D) { - var18 = 255.0D; - } - - if (var15 > 0.7D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.75D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.85D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.95D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.995D) { - var15 = 0.995D; - } - - int var20 = (int)((double)(var17 / 4 * 8) + var18 / 32.0D); - return (var20 << 7) + (int)(var15 * 128.0D); - } - - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "861588431" + garbageValue = "-1690063443" ) - static void method2346() { - if (field3911 == null) { - field3911 = new int[65536]; - double var0 = 0.949999988079071D; - - for (int var2 = 0; var2 < 65536; ++var2) { - double var3 = 0.0078125D + (double)(var2 >> 10 & 63) / 64.0D; - double var5 = 0.0625D + (double)(var2 >> 7 & 7) / 8.0D; - double var7 = (double)(var2 & 127) / 128.0D; - double var9 = var7; - double var11 = var7; - double var13 = var7; - if (0.0D != var5) { - double var15; - if (var7 < 0.5D) { - var15 = var7 * (var5 + 1.0D); - } else { - var15 = var5 + var7 - var5 * var7; - } - - double var17 = 2.0D * var7 - var15; - double var19 = var3 + 0.3333333333333333D; - if (var19 > 1.0D) { - --var19; - } - - double var23 = var3 - 0.3333333333333333D; - if (var23 < 0.0D) { - ++var23; - } - - if (var19 * 6.0D < 1.0D) { - var9 = var19 * 6.0D * (var15 - var17) + var17; - } else if (2.0D * var19 < 1.0D) { - var9 = var15; - } else if (3.0D * var19 < 2.0D) { - var9 = var17 + (var15 - var17) * (0.6666666666666666D - var19) * 6.0D; - } else { - var9 = var17; - } - - if (6.0D * var3 < 1.0D) { - var11 = var17 + (var15 - var17) * 6.0D * var3; - } else if (2.0D * var3 < 1.0D) { - var11 = var15; - } else if (var3 * 3.0D < 2.0D) { - var11 = 6.0D * (var15 - var17) * (0.6666666666666666D - var3) + var17; - } else { - var11 = var17; - } - - if (6.0D * var23 < 1.0D) { - var13 = 6.0D * (var15 - var17) * var23 + var17; - } else if (var23 * 2.0D < 1.0D) { - var13 = var15; - } else if (var23 * 3.0D < 2.0D) { - var13 = var17 + (0.6666666666666666D - var23) * (var15 - var17) * 6.0D; - } else { - var13 = var17; - } - } - - var9 = Math.pow(var9, var0); - var11 = Math.pow(var11, var0); - var13 = Math.pow(var13, var0); - int var25 = (int)(256.0D * var9); - int var16 = (int)(256.0D * var11); - int var26 = (int)(256.0D * var13); - int var18 = var26 + (var16 << 8) + (var25 << 16); - field3911[var2] = var18 & 16777215; - } - - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "294804302" - ) - public static int method2347(int var0) { - return 255 - (var0 & 255); + void method2352() { + this.field3909 = 0.0F; + this.field3912 = 0.0F; + this.field3919 = 0.0F; + this.field3910 = 0.0F; + this.field3918 = 0.0F; + this.field3913 = 0.0F; + this.field3920 = 0.0F; + this.field3914 = 0.0F; + this.field3915 = 0.0F; + this.field3916 = 1.0F; + this.field3917 = 1.0F; + this.field3911 = 1.0F; } - @ObfuscatedName("ay") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "66" + descriptor = "(FB)V", + garbageValue = "-16" ) - static int method2350() { - return Login.loginIndex; + void method2353(float var1) { + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field3915; + float var5 = this.field3917; + float var6 = this.field3910; + float var7 = this.field3912; + this.field3915 = var2 * var4 - var3 * this.field3914; + this.field3914 = var3 * var4 + var2 * this.field3914; + this.field3917 = var2 * var5 - this.field3913 * var3; + this.field3913 = var5 * var3 + var2 * this.field3913; + this.field3910 = var2 * var6 - this.field3916 * var3; + this.field3916 = var6 * var3 + this.field3916 * var2; + this.field3912 = var7 * var2 - this.field3909 * var3; + this.field3909 = var3 * var7 + this.field3909 * var2; } - @ObfuscatedName("aw") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-734620102" + descriptor = "(FB)V", + garbageValue = "121" ) - static int method2349(int var0, Script var1, boolean var2) { - String var3; - if (var0 == 3100) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - MouseHandler.addGameMessage(0, "", var3); - return 1; - } else if (var0 == 3101) { - SoundCache.Interpreter_intStackSize -= 2; - LoginType.performPlayerAnimation(VarbitComposition.localPlayer, Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == 3103) { - if (!Interpreter.field704) { - Interpreter.field705 = true; - } - - return 1; - } else { - int var10; - if (var0 == 3104) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var10 = 0; - if (class218.isNumber(var3)) { - var10 = HealthBarUpdate.method524(var3); - } - - PacketBufferNode var12 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.RESUME_P_COUNTDIALOG, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var10); - Client.packetWriter.addNode(var12); - return 1; - } else { - PacketBufferNode var14; - if (var0 == 3105) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.RESUME_P_NAMEDIALOG, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == 3106) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.RESUME_P_STRINGDIALOG, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; - } else { - String var7; - int var8; - if (var0 == 3107) { - var8 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - class14.method41(var8, var7); - return 1; - } else if (var0 == 3108) { - SoundCache.Interpreter_intStackSize -= 3; - var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - Widget var13 = class92.getWidget(var9); - class227.clickWidget(var13, var8, var10); - return 1; - } else if (var0 == 3109) { - SoundCache.Interpreter_intStackSize -= 2; - var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - Widget var11 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - class227.clickWidget(var11, var8, var10); - return 1; - } else if (var0 == 3110) { - ObjTypeCustomisation.mouseCam = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3111) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class449.clientPreferences.getRoofsHidden() ? 1 : 0; - return 1; - } else if (var0 == 3112) { - class449.clientPreferences.setRoofsHidden(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == 3113) { - var3 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class30.openURL(var3, var4, false); - return 1; - } else if (var0 == 3115) { - var8 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var14 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.RESUME_P_OBJDIALOG, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShort(var8); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == 3116) { - var8 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class137.Interpreter_stringStackSize -= 2; - var7 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize + 1]; - if (var7.length() > 500) { - return 1; - } else if (var5.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.BUG_REPORT, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + AbstractSocket.stringCp1252NullTerminatedByteSize(var7) + AbstractSocket.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - var6.packetBuffer.writeByte(var8); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - Client.packetWriter.addNode(var6); - return 1; - } - } else if (var0 == 3117) { - --SoundCache.Interpreter_intStackSize; - return 1; - } else if (var0 == 3118) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3119) { - Client.field386 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; - } - - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; - } - - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; - } - - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; - } - - return 1; - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; - return 1; - } else if (var0 == 3125) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3126) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3127) { - class14.setTapToDrop(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == 3128) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class30.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == 3129) { - SoundCache.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - SoundCache.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --SoundCache.Interpreter_intStackSize; - return 1; - } else if (var0 == 3132) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class113.canvasWidth; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class177.canvasHeight; - return 1; - } else if (var0 == 3133) { - --SoundCache.Interpreter_intStackSize; - return 1; - } else if (var0 == 3134) { - return 1; - } else if (var0 == 3135) { - SoundCache.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field505 = 3; - Client.field508 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field505 = 2; - Client.field508 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field505 = 0; - return 1; - } else if (var0 == 3139) { - Client.field505 = 1; - return 1; - } else if (var0 == 3140) { - Client.field505 = 3; - Client.field508 = var2 ? GameObject.scriptDotWidget.id * -198009563 * -802277715 : SceneTilePaint.scriptActiveWidget.id * -198009563 * -802277715; - return 1; - } else { - boolean var15; - if (var0 == 3141) { - var15 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class449.clientPreferences.setIsUsernameHidden(var15); - return 1; - } else if (var0 == 3142) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class449.clientPreferences.getIsUsernameHidden() ? 1 : 0; - return 1; - } else if (var0 == 3143) { - var15 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var15; - if (!var15) { - class449.clientPreferences.setUsernameToRemember(""); - } - - return 1; - } else if (var0 == 3144) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; - return 1; - } else if (var0 == 3145) { - return 1; - } else if (var0 == 3146) { - var15 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class449.clientPreferences.getTitleMusicDisabled(!var15); - return 1; - } else if (var0 == 3147) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = class449.clientPreferences.getTitleMusicDisabled() ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = FriendSystem.method412(); - return 1; - } else if (var0 == 3155) { - --class137.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3156) { - return 1; - } else if (var0 == 3157) { - SoundCache.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3161) { - --SoundCache.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3162) { - --SoundCache.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3163) { - --class137.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --SoundCache.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3165) { - --SoundCache.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3166) { - SoundCache.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3167) { - SoundCache.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3168) { - SoundCache.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class137.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3169) { - return 1; - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3172) { - --SoundCache.Interpreter_intStackSize; - return 1; - } else if (var0 == 3173) { - --SoundCache.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3174) { - --SoundCache.Interpreter_intStackSize; - return 1; - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --class137.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --class137.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3181) { - class20.method69(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - return 1; - } else if (var0 == 3182) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = PlayerType.method1883(); - return 1; - } else if (var0 == 3189) { - var8 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - FontName.method2447(var8); - return 1; - } else { - return 2; - } - } - } - } - } + void method2354(float var1) { + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field3911; + float var5 = this.field3920; + float var6 = this.field3918; + float var7 = this.field3919; + this.field3911 = var3 * this.field3914 + var2 * var4; + this.field3914 = var2 * this.field3914 - var4 * var3; + this.field3920 = var5 * var2 + var3 * this.field3913; + this.field3913 = var2 * this.field3913 - var5 * var3; + this.field3918 = var6 * var2 + var3 * this.field3916; + this.field3916 = var2 * this.field3916 - var6 * var3; + this.field3919 = this.field3909 * var3 + var7 * var2; + this.field3909 = this.field3909 * var2 - var3 * var7; } - @ObfuscatedName("bl") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "1811966721" + descriptor = "(FI)V", + garbageValue = "1352671223" ) - static int method2351(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 5504) { - SoundCache.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; - } - - return 1; - } else if (var0 == 5505) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == 5506) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == 5530) { - var3 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == 5531) { - Interpreter.Interpreter_intStack[++SoundCache.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; - } else { - return 2; - } + void method2355(float var1) { + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field3911; + float var5 = this.field3920; + float var6 = this.field3918; + float var7 = this.field3919; + this.field3911 = var2 * var4 - var3 * this.field3915; + this.field3915 = var3 * var4 + this.field3915 * var2; + this.field3920 = var5 * var2 - this.field3917 * var3; + this.field3917 = var5 * var3 + var2 * this.field3917; + this.field3918 = var6 * var2 - this.field3910 * var3; + this.field3910 = var6 * var3 + this.field3910 * var2; + this.field3919 = var7 * var2 - var3 * this.field3912; + this.field3912 = var3 * var7 + var2 * this.field3912; } - @ObfuscatedName("hl") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lnk;Ljava/lang/String;I)V", - garbageValue = "88867976" + descriptor = "(FFFI)V", + garbageValue = "1852296601" ) - static void method2348(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field550 += var2.groupCount; + void method2356(float var1, float var2, float var3) { + this.field3919 += var1; + this.field3912 += var2; + this.field3909 += var3; } - @ObfuscatedName("ls") - @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-2084" - ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CONTINUE, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeIntLE(var0); - var2.packetBuffer.writeIntME(var1); - Client.packetWriter.addNode(var2); + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + return this.field3911 + "," + this.field3920 + "," + this.field3918 + "," + this.field3919 + "\n" + this.field3915 + "," + this.field3917 + "," + this.field3910 + "," + this.field3912 + "\n" + this.field3914 + "," + this.field3913 + "," + this.field3916 + "," + this.field3909; } } \ No newline at end of file diff --git a/osrs/src/main/java/class467.java b/osrs/src/main/java/class467.java new file mode 100644 index 000000000..bbd73abac --- /dev/null +++ b/osrs/src/main/java/class467.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("rg") +public class class467 { + @ObfuscatedName("gh") + static String field3921; + @ObfuscatedName("ac") + float[] field3922; + @ObfuscatedName("al") + int field3923; + + class467(float[] var1, int var2) { + this.field3922 = var1; + this.field3923 = var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class468.java b/osrs/src/main/java/class468.java new file mode 100644 index 000000000..616f278d9 --- /dev/null +++ b/osrs/src/main/java/class468.java @@ -0,0 +1,47 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("sz") +public enum class468 implements class386 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lsz;" + ) + field3924(0, 1), + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lsz;" + ) + field3926(2, 2), + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lsz;" + ) + field3925(3, 3), + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lsz;" + ) + field3927(1, 10); + + @ObfuscatedName("ao") + final int field3929; + @ObfuscatedName("ah") + final int field3928; + + class468(int var3, int var4) { + this.field3929 = var3; + this.field3928 = var4; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1243971674" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3928; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class469.java b/osrs/src/main/java/class469.java new file mode 100644 index 000000000..5fb0b5756 --- /dev/null +++ b/osrs/src/main/java/class469.java @@ -0,0 +1,39 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("sr") +public class class469 implements class474 { + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static Archive field3930; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lts;" + ) + public final class504 field3931; + + @ObfuscatedSignature( + descriptor = "(Lty;)V" + ) + class469(class505 var1) { + this.field3931 = var1; + } + + @ObfuscatedSignature( + descriptor = "(Lsm;)V" + ) + public class469(class470 var1) { + this(new class505(var1)); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "11" + ) + public int method2358(int var1) { + return this.field3931.vmethod8144(var1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class47.java b/osrs/src/main/java/class47.java index de745e757..ebb49b2ef 100644 --- a/osrs/src/main/java/class47.java +++ b/osrs/src/main/java/class47.java @@ -4,155 +4,82 @@ import java.util.concurrent.locks.ReentrantLock; -@ObfuscatedName("bx") +@ObfuscatedName("bj") public class class47 { - @ObfuscatedName("bk") + @ObfuscatedName("kz") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "[Lud;" ) - public static AbstractArchive field226; - @ObfuscatedName("jr") - @Export("baseY") - static int baseY; - @ObfuscatedName("ra") + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lth;" + descriptor = "Lcw;" ) - @Export("HitSplatDefinition_cachedSprites") - static class497 HitSplatDefinition_cachedSprites; - @ObfuscatedName("au") + VorbisSample field228; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lcm;" + descriptor = "Lbs;" ) - VorbisSample field230; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lbu;" - ) - RawSound field229; - @ObfuscatedName("ao") - ReentrantLock field231; + RawSound field227; + @ObfuscatedName("ak") + ReentrantLock field229; @ObfuscatedSignature( - descriptor = "(Lcm;Lbu;)V" + descriptor = "(Lcw;Lbs;)V" ) class47(VorbisSample var1, RawSound var2) { - this.field230 = var1; - this.field229 = var2; - this.field231 = new ReentrantLock(); + this.field228 = var1; + this.field227 = var2; + this.field229 = new ReentrantLock(); } - @ObfuscatedName("ly") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "997098077" + descriptor = "(Lom;III)Lud;", + garbageValue = "1460191246" ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = SoundCache.getWidgetChild(var1, var2); - if (var5 != null) { - if (var5.onOp != null) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var5; - var6.opIndex = var0; - var6.targetName = var4; - var6.args = var5.onOp; - WorldMapSection1.runScriptEvent(var6); - } - - boolean var11 = true; - if (var5.contentType > 0) { - var11 = Bounds.method2290(var5); + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + if (!class164.method862(var0, var1, var2)) { + return null; + } else { + SpritePixels var4 = new SpritePixels(); + var4.width = class159.SpriteBuffer_spriteWidth; + var4.height = class500.SpriteBuffer_spriteHeight; + var4.xOffset = class326.SpriteBuffer_xOffsets[0]; + var4.yOffset = ModelData0.SpriteBuffer_yOffsets[0]; + var4.subWidth = class59.SpriteBuffer_spriteWidths[0]; + var4.subHeight = class544.SpriteBuffer_spriteHeights[0]; + int var5 = var4.subHeight * var4.subWidth; + byte[] var6 = AddRequestTask.SpriteBuffer_pixels[0]; + var4.pixels = new int[var5]; + + for (int var7 = 0; var7 < var5; ++var7) { + var4.pixels[var7] = class372.SpriteBuffer_spritePalette[var6[var7] & 255]; } - if (var11) { - int var8 = NewShit.getWidgetFlags(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON1, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 2) { - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON2, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 3) { - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON3, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 4) { - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON4, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 5) { - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON5, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON6, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON7, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON8, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON9, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } + class407.method2062(); + return var4; + } + } - if (var0 == 10) { - var10 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.IF_BUTTON10, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } + @ObfuscatedName("ja") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1083704336" + ) + static boolean method238() { + return (Client.drawPlayerNames & 2) != 0; + } - } - } - } + @ObfuscatedName("mt") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "117649211" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; } } \ No newline at end of file diff --git a/osrs/src/main/java/class470.java b/osrs/src/main/java/class470.java new file mode 100644 index 000000000..11f467dec --- /dev/null +++ b/osrs/src/main/java/class470.java @@ -0,0 +1,92 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("sm") +public abstract class class470 extends class295 implements class537 { + @ObfuscatedSignature( + descriptor = "(Lnp;Loa;I)V" + ) + protected class470(StudioGame var1, Language var2, int var3) { + super(var1, var2, var3); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)Lsl;", + garbageValue = "-799452482" + ) + @Export("vmethod8207") + protected abstract class472 vmethod8207(int var1); + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1745704270" + ) + public int method2359() { + return super.field2498; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-123056323" + ) + @Export("vmethod8697") + public Object vmethod8697(int var1) { + class472 var2 = this.vmethod8207(var1); + return var2 != null && var2.method2369() ? var2.method2370() : null; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Lul;I)Lut;", + garbageValue = "-1458029459" + ) + public class538 method2361(Buffer var1) { + int var2 = var1.readUnsignedShort(); + class472 var3 = this.vmethod8207(var2); + class538 var4 = new class538(var2); + Class var5 = var3.field3932.field4134; + if (var5 == Integer.class) { + var4.field4242 = var1.readInt(); + } else if (var5 == Long.class) { + var4.field4242 = var1.readLong(); + } else if (var5 == String.class) { + var4.field4242 = var1.readStringCp1252NullCircumfixed(); + } else { + if (!class533.class.isAssignableFrom(var5)) { + throw new IllegalStateException(); + } + + try { + class533 var6 = (class533)var5.newInstance(); + var6.method2652(var1); + var4.field4242 = var6; + } catch (InstantiationException var7) { + } catch (IllegalAccessException var8) { + } + } + + return var4; + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-89620142" + ) + public static void method2362() { + class319.field2789.clear(); + } + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "1657121032" + ) + static int method2363(int var0, Script var1, boolean var2) { + return 2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class471.java b/osrs/src/main/java/class471.java new file mode 100644 index 000000000..58c703142 --- /dev/null +++ b/osrs/src/main/java/class471.java @@ -0,0 +1,85 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("sw") +public class class471 extends class472 { + public class471(int var1) { + super(var1); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lul;IS)V", + garbageValue = "6664" + ) + @Export("vmethod7769") + void vmethod7769(Buffer var1, int var2) { + } + + @ObfuscatedName("jx") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-701668096" + ) + static final void method2366() { + for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { + if (var0.plane == class87.Client_plane && Client.cycle <= var0.cycleEnd) { + if (Client.cycle >= var0.cycleStart) { + NPC var1; + int var2; + Player var3; + if (!var0.isMoving && var0.field804 != 0) { + if (var0.field804 > 0) { + var1 = Client.npcs[var0.field804 - 1]; + if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { + var0.sourceX = var1.x; + var0.sourceY = var1.y; + var0.setDestination(var0.field800, var0.field789, var0.field797, Client.cycle); + } + } else { + var2 = -var0.field804 - 1; + if (var2 == Client.localPlayerIndex) { + var3 = TextureProvider.localPlayer; + } else { + var3 = Client.players[var2]; + } + + if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { + var0.sourceX = var3.x; + var0.sourceY = var3.y; + var0.setDestination(var0.field800, var0.field789, var0.field797, Client.cycle); + } + } + } + + if (var0.targetIndex > 0) { + var1 = Client.npcs[var0.targetIndex - 1]; + if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { + var0.setDestination(var1.x, var1.y, class115.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); + } + } + + if (var0.targetIndex < 0) { + var2 = -var0.targetIndex - 1; + if (var2 == Client.localPlayerIndex) { + var3 = TextureProvider.localPlayer; + } else { + var3 = Client.players[var2]; + } + + if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { + var0.setDestination(var3.x, var3.y, class115.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); + } + } + + var0.advance(Client.field460); + class10.scene.drawEntity(class87.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); + } + } else { + var0.remove(); + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class472.java b/osrs/src/main/java/class472.java new file mode 100644 index 000000000..a1d9c76a0 --- /dev/null +++ b/osrs/src/main/java/class472.java @@ -0,0 +1,111 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("sl") +public abstract class class472 implements class294 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Ltr;" + ) + class517 field3932; + + class472(int var1) { + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lul;IS)V", + garbageValue = "6664" + ) + @Export("vmethod7769") + abstract void vmethod7769(Buffer var1, int var2); + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Lul;I)V", + garbageValue = "-1679983256" + ) + public void method2368(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; + } + + class468 var3 = (class468)SequenceDefinition.findEnumerated(class30.method120(), var2); + if (var3 != null) { + switch(var3.field3929) { + case 0: + int var5 = var1.readUnsignedByte(); + this.field3932 = Tile.method1230(var5); + if (this.field3932 != null) { + break; + } + + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); + case 1: + var1.readStringCp1252NullCircumfixed(); + break; + case 2: + class367[] var4 = new class367[]{class367.field3514, class367.field3513, class367.field3515, class367.field3512}; + SequenceDefinition.findEnumerated(var4, var1.readUnsignedByte()); + break; + default: + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); + } + } else { + this.vmethod7769(var1, var2); + } + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1797957438" + ) + boolean method2369() { + return this.field3932 != null; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/Object;", + garbageValue = "1069039915" + ) + Object method2370() { + if (this.field3932 == class517.field4129) { + return 0; + } else if (this.field3932 == class517.field4131) { + return -1L; + } else { + return this.field3932 == class517.field4130 ? "" : null; + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)[Luf;", + garbageValue = "-1429373012" + ) + @Export("FillMode_values") + public static class541[] FillMode_values() { + return new class541[]{class541.field4257, class541.SOLID, class541.field4258}; + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(ILds;ZB)I", + garbageValue = "47" + ) + static int method2371(int var0, Script var1, boolean var2) { + if (var0 == 7463) { + boolean var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class330.method1730(var3); + return 1; + } else { + return 2; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class473.java b/osrs/src/main/java/class473.java new file mode 100644 index 000000000..633d34aef --- /dev/null +++ b/osrs/src/main/java/class473.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("su") +public interface class473 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class474.java b/osrs/src/main/java/class474.java new file mode 100644 index 000000000..fdbf4c1bc --- /dev/null +++ b/osrs/src/main/java/class474.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("sh") +public interface class474 extends class473 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class475.java b/osrs/src/main/java/class475.java index d9a8bd375..64a06bd4d 100644 --- a/osrs/src/main/java/class475.java +++ b/osrs/src/main/java/class475.java @@ -1,14 +1,36 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sv") -public interface class475 { - @ObfuscatedName("au") +@ObfuscatedName("st") +public class class475 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(S)Lsm;", - garbageValue = "256" + descriptor = "Lst;" ) - @Export("get") - PlatformInfo get(); + public static final class475 field3933; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lst;" + ) + static final class475 field3934; + @ObfuscatedName("ak") + String field3935; + + static { + field3933 = new class475("application/json"); + field3934 = new class475("text/plain"); + } + + class475(String var1) { + this.field3935 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "733315880" + ) + public String method2373() { + return this.field3935; + } } \ No newline at end of file diff --git a/osrs/src/main/java/class476.java b/osrs/src/main/java/class476.java index a9a37a639..c69c9b456 100644 --- a/osrs/src/main/java/class476.java +++ b/osrs/src/main/java/class476.java @@ -2,88 +2,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("se") -public class class476 extends class479 { - @ObfuscatedName("au") - int field3961; - @ObfuscatedName("ae") - int field3960; - @ObfuscatedName("ao") - double field3957; - @ObfuscatedName("at") - double field3958; - @ObfuscatedName("ac") - double field3955; - @ObfuscatedName("ai") - double field3956; - @ObfuscatedName("az") - double field3959; - - public class476(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - super(var9, var10); - this.field3961 = 0; - this.field3960 = 0; - this.field3957 = 0.0D; - this.field3958 = 0.0D; - this.field3955 = 0.0D; - this.field3956 = 0.0D; - this.field3959 = 0.0D; - this.field3961 = var3; - this.field3960 = var6; - if ((var5 - var8) * (var7 - var1) == (var4 - var7) * (var8 - var2)) { - this.field3957 = (double)var4; - this.field3958 = (double)var5; - } else { - double var11 = (double)((float)(var7 + var1)) / 2.0D; - double var13 = (double)((float)(var8 + var2)) / 2.0D; - double var15 = (double)((float)(var4 + var7)) / 2.0D; - double var17 = (double)((float)(var5 + var8)) / 2.0D; - double var19 = -1.0D * (double)(var7 - var1) / (double)(var8 - var2); - double var21 = (double)(var4 - var7) * -1.0D / (double)(var5 - var8); - this.field3957 = (var19 * var11 - var21 * var15 + var17 - var13) / (var19 - var21); - this.field3958 = var13 + var19 * (this.field3957 - var11); - this.field3955 = Math.sqrt(Math.pow(this.field3957 - (double)var1, 2.0D) + Math.pow(this.field3958 - (double)var2, 2.0D)); - this.field3956 = Math.atan2((double)var2 - this.field3958, (double)var1 - this.field3957); - double var23 = Math.atan2((double)var8 - this.field3958, (double)var7 - this.field3957); - this.field3959 = Math.atan2((double)var5 - this.field3958, (double)var4 - this.field3957); - boolean var25 = this.field3956 <= var23 && var23 <= this.field3959 || this.field3959 <= var23 && var23 <= this.field3956; - if (!var25) { - this.field3959 += (double)(this.field3956 - this.field3959 > 0.0D ? 2 : -2) * 3.141592653589793D; - } +import java.io.UnsupportedEncodingException; - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "818000115" - ) - public int vmethod2349() { - double var1 = this.method2377(); - double var3 = this.field3956 + (this.field3959 - this.field3956) * var1; - return (int)Math.round(this.field3957 + this.field3955 * Math.cos(var3)); - } - - @ObfuscatedName("ae") +@ObfuscatedName("sd") +public interface class476 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "363084355" + descriptor = "(B)Lst;", + garbageValue = "1" ) - public int vmethod2347() { - double var1 = this.method2377(); - double var3 = this.field3956 + var1 * (this.field3959 - this.field3956); - return (int)Math.round(this.field3958 + this.field3955 * Math.sin(var3)); - } + @Export("vmethod2213") + class475 vmethod2213(); - @ObfuscatedName("ao") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1706544959" + descriptor = "(B)[B", + garbageValue = "17" ) - @Export("vmethod2320") - public int vmethod2320() { - double var1 = this.method2377(); - return (int)Math.round((double)this.field3961 + var1 * (double)(this.field3960 - this.field3961)); - } + @Export("vmethod7797") + byte[] vmethod7797() throws UnsupportedEncodingException; } \ No newline at end of file diff --git a/osrs/src/main/java/class477.java b/osrs/src/main/java/class477.java index 029c77eb0..c59b17bdf 100644 --- a/osrs/src/main/java/class477.java +++ b/osrs/src/main/java/class477.java @@ -1,102 +1,91 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("sk") -public class class477 extends class479 { - @ObfuscatedName("au") - int field3967; - @ObfuscatedName("ae") - int field3963; - @ObfuscatedName("ao") - int field3965; - @ObfuscatedName("at") - int field3966; - @ObfuscatedName("ac") - int field3962; - @ObfuscatedName("ai") - int field3964; +import java.io.UnsupportedEncodingException; + +@ObfuscatedName("si") +public class class477 implements class476 { + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lorg/json/JSONObject;" + ) + JSONObject field3936; + + public class477(byte[] var1) throws UnsupportedEncodingException { + this.method2377(var1); + } + + public class477(JSONObject var1) { + this.field3936 = var1; + } - public class477(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - super(var7, var8); - this.field3967 = 0; - this.field3963 = 0; - this.field3965 = 0; - this.field3966 = 0; - this.field3962 = 0; - this.field3964 = 0; - this.field3967 = var1; - this.field3963 = var2; - this.field3965 = var3; - this.field3966 = var4; - this.field3962 = var5; - this.field3964 = var6; + public class477(String var1) throws UnsupportedEncodingException { + this.method2378(var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "818000115" + descriptor = "(B)Lst;", + garbageValue = "1" ) - public int vmethod2349() { - double var1 = this.method2377(); - return (int)Math.round((double)(this.field3966 - this.field3967) * var1 + (double)this.field3967); + public class475 vmethod2213() { + return class475.field3933; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "363084355" + descriptor = "(B)[B", + garbageValue = "17" ) - public int vmethod2347() { - double var1 = this.method2377(); - return (int)Math.round(var1 * (double)(this.field3962 - this.field3963) + (double)this.field3963); + @Export("vmethod7797") + public byte[] vmethod7797() throws UnsupportedEncodingException { + return this.field3936 == null ? new byte[0] : this.field3936.toString().getBytes("UTF-8"); } - @ObfuscatedName("ao") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1706544959" + descriptor = "([BI)V", + garbageValue = "-1876533299" ) - public int vmethod2320() { - double var1 = this.method2377(); - return (int)Math.round((double)this.field3965 + (double)(this.field3964 - this.field3965) * var1); + void method2377(byte[] var1) throws UnsupportedEncodingException { + String var2 = new String(var1, "UTF-8"); + this.method2378(var2); } - @ObfuscatedName("ao") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "([I[IIII)V", - garbageValue = "-1387907364" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1250526518" ) - public static void method2370(int[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - int var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - int var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - int var8 = var6 == Integer.MAX_VALUE ? 0 : 1; - - for (int var9 = var2; var9 < var3; ++var9) { - if (var0[var9] < (var9 & var8) + var6) { - int var10 = var0[var9]; - var0[var9] = var0[var5]; - var0[var5] = var10; - int var11 = var1[var9]; - var1[var9] = var1[var5]; - var1[var5++] = var11; + void method2378(String var1) throws UnsupportedEncodingException { + try { + if (var1.charAt(0) == '{') { + this.field3936 = new JSONObject(var1); + } else { + if (var1.charAt(0) != '[') { + throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); } + + JSONArray var2 = new JSONArray(var1); + this.field3936 = new JSONObject(); + this.field3936.method2750("arrayValues", var2); } - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - method2370(var0, var1, var2, var5 - 1); - method2370(var0, var1, var5 + 1, var3); + } catch (JSONException var3) { + throw new UnsupportedEncodingException(var3.getMessage()); } + } + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(S)Lorg/json/JSONObject;", + garbageValue = "-32336" + ) + public JSONObject method2379() { + return this.field3936; } } \ No newline at end of file diff --git a/osrs/src/main/java/class478.java b/osrs/src/main/java/class478.java index ddf84d5ba..51928e260 100644 --- a/osrs/src/main/java/class478.java +++ b/osrs/src/main/java/class478.java @@ -1,37 +1,96 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sy") -public class class478 extends class480 { - @ObfuscatedName("au") - int field3969; - @ObfuscatedName("ae") - int field3968; - - public class478(int var1, int var2, int var3, int var4) { - super(var3, var4); - this.field3969 = 0; - this.field3968 = 0; - this.field3969 = var1; - this.field3968 = var2; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +@ObfuscatedName("sq") +public class class478 implements class476 { + @ObfuscatedName("ac") + final Map field3937; + + public class478(Map var1) { + this.field3937 = var1; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1901048798" + descriptor = "(B)Lst;", + garbageValue = "1" ) - public int method2371() { - double var1 = this.method2377(); - return (int)Math.round((double)this.field3969 + var1 * (double)(this.field3968 - this.field3969)); + @Export("vmethod2213") + public class475 vmethod2213() { + return null; } - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2077618476" + descriptor = "(B)[B", + garbageValue = "17" ) - static void method2372(String var0) { - Login.field764 = HorizontalAlignment.method977(var0); + @Export("vmethod7797") + public byte[] vmethod7797() throws UnsupportedEncodingException { + return this.method2383().getBytes("UTF-8"); + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1386536231" + ) + public String method2383() throws UnsupportedEncodingException { + StringBuilder var1 = new StringBuilder(); + Iterator var2 = this.field3937.entrySet().iterator(); + + while (var2.hasNext()) { + Entry var3 = (Entry)var2.next(); + String var4 = URLEncoder.encode((String)var3.getKey(), "UTF-8"); + String var5 = URLEncoder.encode((String)var3.getValue(), "UTF-8"); + var1.append(var4).append("=").append(var5).append("&"); + } + + if (var1.length() == 0) { + return ""; + } else { + var1.deleteCharAt(var1.length() - 1); + var1.insert(0, "?"); + return var1.toString(); + } + } + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1087819617" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; + } + + @ObfuscatedName("lm") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "2037077846" + ) + static void method2385(int var0, int var1, int var2, int var3) { + Widget var4 = class33.field89.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + Interpreter.runScriptEvent(var5); + } + + Client.field503 = var3; + Client.isSpellSelected = true; + JagexCache.field1449 = var0; + Client.selectedSpellChildIndex = var1; + class31.field82 = var2; + ClanChannelMember.invalidateWidget(var4); } } \ No newline at end of file diff --git a/osrs/src/main/java/class479.java b/osrs/src/main/java/class479.java index f6b82f187..6c6f4c2be 100644 --- a/osrs/src/main/java/class479.java +++ b/osrs/src/main/java/class479.java @@ -1,34 +1,21 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sn") -public abstract class class479 extends class480 { - class479(int var1, int var2) { - super(var1, var2); - } +@ObfuscatedName("sy") +public class class479 { + @ObfuscatedName("ao") + static final int[] field3939; + @ObfuscatedName("ah") + static final int[] field3938; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "818000115" - ) - @Export("vmethod2349") - public abstract int vmethod2349(); + static { + field3939 = new int[16384]; + field3938 = new int[16384]; + double var0 = 3.834951969714103E-4D; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "363084355" - ) - @Export("vmethod2347") - public abstract int vmethod2347(); + for (int var2 = 0; var2 < 16384; ++var2) { + field3939[var2] = (int)(16384.0D * Math.sin(var0 * (double)var2)); + field3938[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); + } - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1706544959" - ) - @Export("vmethod2320") - public abstract int vmethod2320(); + } } \ No newline at end of file diff --git a/osrs/src/main/java/class480.java b/osrs/src/main/java/class480.java index 2e48135e3..348f5e2f8 100644 --- a/osrs/src/main/java/class480.java +++ b/osrs/src/main/java/class480.java @@ -1,51 +1,21 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sc") -public abstract class class480 { - @ObfuscatedName("gv") - @Export("worldPort") - static int worldPort; +@ObfuscatedName("sf") +public class class480 { @ObfuscatedName("ap") - int field3974; - @ObfuscatedName("aa") - int field3972; - @ObfuscatedName("af") - double field3971; - @ObfuscatedName("ad") - int field3973; + static final int[] field3940; + @ObfuscatedName("ay") + static final int[] field3941; - class480(int var1, int var2) { - this.field3974 = 0; - this.field3972 = 0; - this.field3971 = 0.0D; - this.field3973 = 0; - this.field3974 = var1; - this.field3972 = 0; - this.field3973 = var2 >= 0 && var2 <= 27 ? var2 : 0; - this.field3971 = class302.method1623(this.field3972, this.field3974, this.field3973); - } + static { + field3940 = new int[2048]; + field3941 = new int[2048]; + double var0 = 0.0030679615757712823D; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-299202193" - ) - public void method2376() { - if (this.field3972 < this.field3974) { - ++this.field3972; - this.field3971 = class302.method1623(this.field3972, this.field3974, this.field3973); + for (int var2 = 0; var2 < 2048; ++var2) { + field3940[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); + field3941[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); } } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)D", - garbageValue = "1467440127" - ) - double method2377() { - return this.field3971; - } } \ No newline at end of file diff --git a/osrs/src/main/java/class481.java b/osrs/src/main/java/class481.java new file mode 100644 index 000000000..b8527a403 --- /dev/null +++ b/osrs/src/main/java/class481.java @@ -0,0 +1,714 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("sa") +public class class481 { + @ObfuscatedName("wb") + static Iterator field3944; + @ObfuscatedName("ah") + static int[] field3943; + @ObfuscatedName("ar") + public static int[] field3942; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lrx;" + ) + static Bounds field3945; + + static { + field3943 = new int[32768]; + + for (int var0 = 0; var0 < 32768; ++var0) { + field3943[var0] = method2386(var0); + } + + if (field3942 == null) { + field3942 = new int[65536]; + double var25 = 0.949999988079071D; + + for (int var2 = 0; var2 < 65536; ++var2) { + double var3 = 0.0078125D + (double)(var2 >> 10 & 63) / 64.0D; + double var5 = 0.0625D + (double)(var2 >> 7 & 7) / 8.0D; + double var7 = (double)(var2 & 127) / 128.0D; + double var9 = var7; + double var11 = var7; + double var13 = var7; + if (var5 != 0.0D) { + double var15; + if (var7 < 0.5D) { + var15 = (1.0D + var5) * var7; + } else { + var15 = var5 + var7 - var7 * var5; + } + + double var17 = var7 * 2.0D - var15; + double var19 = var3 + 0.3333333333333333D; + if (var19 > 1.0D) { + --var19; + } + + double var23 = var3 - 0.3333333333333333D; + if (var23 < 0.0D) { + ++var23; + } + + if (6.0D * var19 < 1.0D) { + var9 = var17 + (var15 - var17) * 6.0D * var19; + } else if (var19 * 2.0D < 1.0D) { + var9 = var15; + } else if (var19 * 3.0D < 2.0D) { + var9 = var17 + (var15 - var17) * (0.6666666666666666D - var19) * 6.0D; + } else { + var9 = var17; + } + + if (var3 * 6.0D < 1.0D) { + var11 = 6.0D * (var15 - var17) * var3 + var17; + } else if (var3 * 2.0D < 1.0D) { + var11 = var15; + } else if (var3 * 3.0D < 2.0D) { + var11 = (0.6666666666666666D - var3) * (var15 - var17) * 6.0D + var17; + } else { + var11 = var17; + } + + if (6.0D * var23 < 1.0D) { + var13 = var17 + 6.0D * (var15 - var17) * var23; + } else if (2.0D * var23 < 1.0D) { + var13 = var15; + } else if (var23 * 3.0D < 2.0D) { + var13 = var17 + 6.0D * (0.6666666666666666D - var23) * (var15 - var17); + } else { + var13 = var17; + } + } + + var9 = Math.pow(var9, var25); + var11 = Math.pow(var11, var25); + var13 = Math.pow(var13, var25); + int var27 = (int)(var9 * 256.0D); + int var16 = (int)(var11 * 256.0D); + int var28 = (int)(256.0D * var13); + int var18 = var28 + (var16 << 8) + (var27 << 16); + field3942[var2] = var18 & 16777215; + } + } + + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "68" + ) + static final int method2386(int var0) { + double var1 = (double)(var0 >> 10 & 31) / 31.0D; + double var3 = (double)(var0 >> 5 & 31) / 31.0D; + double var5 = (double)(var0 & 31) / 31.0D; + double var7 = var1; + if (var3 < var1) { + var7 = var3; + } + + if (var5 < var7) { + var7 = var5; + } + + double var9 = var1; + if (var3 > var1) { + var9 = var3; + } + + if (var5 > var9) { + var9 = var5; + } + + double var11 = 0.0D; + double var13 = 0.0D; + double var15 = (var9 + var7) / 2.0D; + if (var9 != var7) { + if (var15 < 0.5D) { + var13 = (var9 - var7) / (var9 + var7); + } + + if (var15 >= 0.5D) { + var13 = (var9 - var7) / (2.0D - var9 - var7); + } + + if (var1 == var9) { + var11 = (var3 - var5) / (var9 - var7); + } else if (var3 == var9) { + var11 = 2.0D + (var5 - var1) / (var9 - var7); + } else if (var9 == var5) { + var11 = (var1 - var3) / (var9 - var7) + 4.0D; + } + } + + int var17 = (int)(var11 * 256.0D / 6.0D); + var17 &= 255; + double var18 = var13 * 256.0D; + if (var18 < 0.0D) { + var18 = 0.0D; + } else if (var18 > 255.0D) { + var18 = 255.0D; + } + + if (var15 > 0.7D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.75D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.85D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.95D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.995D) { + var15 = 0.995D; + } + + int var20 = (int)(var18 / 32.0D + (double)(var17 / 4 * 8)); + return (var20 << 7) + (int)(var15 * 128.0D); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "2" + ) + public static int method2387(int var0) { + return 255 - (var0 & 255); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Ljt;[Lih;B)V", + garbageValue = "-54" + ) + static final void method2389(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + for (var4 = 0; var4 < 104; ++var4) { + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { + var5 = var2; + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 - 1; + } + + if (var5 >= 0) { + var1[var5].setBlockedByFloor(var3, var4); + } + } + } + } + } + + Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; + if (Tiles.rndHue < -8) { + Tiles.rndHue = -8; + } + + if (Tiles.rndHue > 8) { + Tiles.rndHue = 8; + } + + Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; + if (Tiles.rndLightness < -16) { + Tiles.rndLightness = -16; + } + + if (Tiles.rndLightness > 16) { + Tiles.rndLightness = 16; + } + + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { + byte[][] var45 = Tiles.field835[var2]; + boolean var54 = true; + boolean var55 = true; + boolean var6 = true; + boolean var7 = true; + boolean var8 = true; + var9 = (int)Math.sqrt(5100.0D); + var10 = var9 * 768 >> 8; + + int var19; + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; + var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); + var16 = (var13 << 8) / var15; + var17 = 65536 / var15; + var18 = (var14 << 8) / var15; + var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; + int var20 = (var45[var12][var11 + 1] >> 3) + (var45[var12 - 1][var11] >> 2) + (var45[var12][var11 - 1] >> 2) + (var45[var12 + 1][var11] >> 3) + (var45[var12][var11] >> 1); + class158.field1387[var12][var11] = var19 - var20; + } + } + + for (var11 = 0; var11 < 104; ++var11) { + SecureRandomFuture.Tiles_hue[var11] = 0; + class135.Tiles_saturation[var11] = 0; + Tiles.Tiles_lightness[var11] = 0; + WorldMapSection2.Tiles_hueMultiplier[var11] = 0; + Script.field812[var11] = 0; + } + + for (var11 = -5; var11 < 109; ++var11) { + for (var12 = 0; var12 < 104; ++var12) { + var13 = var11 + 5; + int var10002; + if (var13 >= 0 && var13 < 104) { + long var46 = (long)Math.pow(2.0D, 15.0D) - 1L; + var16 = (int)var46; + var17 = World.Tiles_underlays[var2][var13][var12] & var16; + if (var17 > 0) { + FloorUnderlayDefinition var48 = KitDefinition.method979(var17 - 1); + var10000 = SecureRandomFuture.Tiles_hue; + var10000[var12] += var48.hue; + var10000 = class135.Tiles_saturation; + var10000[var12] += var48.saturation; + var10000 = Tiles.Tiles_lightness; + var10000[var12] += var48.lightness; + var10000 = WorldMapSection2.Tiles_hueMultiplier; + var10000[var12] += var48.hueMultiplier; + var10002 = Script.field812[var12]++; + } + } + + var14 = var11 - 5; + if (var14 >= 0 && var14 < 104) { + long var49 = (long)Math.pow(2.0D, 15.0D) - 1L; + var17 = (int)var49; + var18 = World.Tiles_underlays[var2][var14][var12] & var17; + if (var18 > 0) { + FloorUnderlayDefinition var51 = KitDefinition.method979(var18 - 1); + var10000 = SecureRandomFuture.Tiles_hue; + var10000[var12] -= var51.hue; + var10000 = class135.Tiles_saturation; + var10000[var12] -= var51.saturation; + var10000 = Tiles.Tiles_lightness; + var10000[var12] -= var51.lightness; + var10000 = WorldMapSection2.Tiles_hueMultiplier; + var10000[var12] -= var51.hueMultiplier; + var10002 = Script.field812[var12]--; + } + } + } + + if (var11 >= 1 && var11 < 103) { + var12 = 0; + var13 = 0; + var14 = 0; + var15 = 0; + var16 = 0; + + for (var17 = -5; var17 < 109; ++var17) { + var18 = var17 + 5; + if (var18 >= 0 && var18 < 104) { + var12 += SecureRandomFuture.Tiles_hue[var18]; + var13 += class135.Tiles_saturation[var18]; + var14 += Tiles.Tiles_lightness[var18]; + var15 += WorldMapSection2.Tiles_hueMultiplier[var18]; + var16 += Script.field812[var18]; + } + + var19 = var17 - 5; + if (var19 >= 0 && var19 < 104) { + var12 -= SecureRandomFuture.Tiles_hue[var19]; + var13 -= class135.Tiles_saturation[var19]; + var14 -= Tiles.Tiles_lightness[var19]; + var15 -= WorldMapSection2.Tiles_hueMultiplier[var19]; + var16 -= Script.field812[var19]; + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { + if (var2 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var2; + } + + long var52 = (long)Math.pow(2.0D, 15.0D) - 1L; + int var22 = (int)var52; + int var23 = World.Tiles_underlays[var2][var11][var17] & var22; + int var24 = VertexNormal.Tiles_overlays[var2][var11][var17] & var22; + if (var23 > 0 || var24 > 0) { + int var25 = Tiles.Tiles_heights[var2][var11][var17]; + int var26 = Tiles.Tiles_heights[var2][var11 + 1][var17]; + int var27 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; + int var28 = Tiles.Tiles_heights[var2][var11][var17 + 1]; + int var29 = class158.field1387[var11][var17]; + int var30 = class158.field1387[var11 + 1][var17]; + int var31 = class158.field1387[var11 + 1][var17 + 1]; + int var32 = class158.field1387[var11][var17 + 1]; + int var33 = -1; + int var34 = -1; + int var35; + int var36; + if (var23 > 0) { + var35 = var12 * 256 / var15; + var36 = var13 / var16; + int var37 = var14 / var16; + var33 = EnumComposition.method1001(var35, var36, var37); + var35 = var35 + Tiles.rndHue & 255; + var37 += Tiles.rndLightness; + if (var37 < 0) { + var37 = 0; + } else if (var37 > 255) { + var37 = 255; + } + + var34 = EnumComposition.method1001(var35, var36, var37); + } + + if (var2 > 0) { + boolean var60 = true; + if (var23 == 0 && SecureRandomFuture.Tiles_shapes[var2][var11][var17] != 0) { + var60 = false; + } + + if (var24 > 0 && !class4.method4(var24 - 1).hideUnderlay) { + var60 = false; + } + + if (var60 && var25 == var26 && var25 == var27 && var25 == var28) { + var10000 = UserComparator6.field1191[var2][var11]; + var10000[var17] |= 2340; + } + } + + var35 = 0; + if (var34 != -1) { + var35 = Rasterizer3D.Rasterizer3D_colorPalette[ScriptEvent.method472(var34, 96)]; + } + + if (var24 == 0) { + var0.addTile(var2, var11, var17, 0, 0, -1, var25, var26, var27, var28, ScriptEvent.method472(var33, var29), ScriptEvent.method472(var33, var30), ScriptEvent.method472(var33, var31), ScriptEvent.method472(var33, var32), 0, 0, 0, 0, var35, 0); + } else { + var36 = SecureRandomFuture.Tiles_shapes[var2][var11][var17] + 1; + byte var61 = class199.field1563[var2][var11][var17]; + FloorOverlayDefinition var38 = class4.method4(var24 - 1); + int var39 = var38.texture; + int var40; + int var41; + int var42; + int var43; + if (var39 >= 0) { + var41 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); + var40 = -1; + } else if (var38.primaryRgb == 16711935) { + var40 = -2; + var39 = -1; + var41 = -2; + } else { + var40 = EnumComposition.method1001(var38.hue, var38.saturation, var38.lightness); + var42 = var38.hue + Tiles.rndHue & 255; + var43 = var38.lightness + Tiles.rndLightness; + if (var43 < 0) { + var43 = 0; + } else if (var43 > 255) { + var43 = 255; + } + + var41 = EnumComposition.method1001(var42, var38.saturation, var43); + } + + var42 = 0; + if (var41 != -2) { + var42 = Rasterizer3D.Rasterizer3D_colorPalette[FloorUnderlayDefinition.method1044(var41, 96)]; + } + + if (var38.secondaryRgb != -1) { + var43 = var38.secondaryHue + Tiles.rndHue & 255; + int var44 = var38.secondaryLightness + Tiles.rndLightness; + if (var44 < 0) { + var44 = 0; + } else if (var44 > 255) { + var44 = 255; + } + + var41 = EnumComposition.method1001(var43, var38.secondarySaturation, var44); + var42 = Rasterizer3D.Rasterizer3D_colorPalette[FloorUnderlayDefinition.method1044(var41, 96)]; + } + + var0.addTile(var2, var11, var17, var36, var61, var39, var25, var26, var27, var28, ScriptEvent.method472(var33, var29), ScriptEvent.method472(var33, var30), ScriptEvent.method472(var33, var31), ScriptEvent.method472(var33, var32), FloorUnderlayDefinition.method1044(var40, var29), FloorUnderlayDefinition.method1044(var40, var30), FloorUnderlayDefinition.method1044(var40, var31), FloorUnderlayDefinition.method1044(var40, var32), var35, var42); + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var0.setTileMinPlane(var2, var12, var11, WorldMapLabel.method1570(var2, var12, var11)); + } + } + + World.Tiles_underlays[var2] = null; + VertexNormal.Tiles_overlays[var2] = null; + SecureRandomFuture.Tiles_shapes[var2] = null; + class199.field1563[var2] = null; + Tiles.field835[var2] = null; + } + + var0.method1308(-50, -10, -50); + + for (var2 = 0; var2 < 104; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; + var3 = 2; + var4 = 4; + + for (var5 = 0; var5 < 4; ++var5) { + if (var5 > 0) { + var2 <<= 3; + var3 <<= 3; + var4 <<= 3; + } + + for (int var56 = 0; var56 <= var5; ++var56) { + for (int var57 = 0; var57 <= 104; ++var57) { + for (int var58 = 0; var58 <= 104; ++var58) { + short var59; + if ((UserComparator6.field1191[var56][var58][var57] & var2) != 0) { + var9 = var57; + var10 = var57; + var11 = var56; + + for (var12 = var56; var9 > 0 && (UserComparator6.field1191[var56][var58][var9 - 1] & var2) != 0; --var9) { + } + + while (var10 < 104 && (UserComparator6.field1191[var56][var58][var10 + 1] & var2) != 0) { + ++var10; + } + + label335: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UserComparator6.field1191[var11 - 1][var58][var13] & var2) == 0) { + break label335; + } + } + + --var11; + } + + label324: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UserComparator6.field1191[var12 + 1][var58][var13] & var2) == 0) { + break label324; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var59 = 240; + var15 = Tiles.Tiles_heights[var12][var58][var9] - var59; + var16 = Tiles.Tiles_heights[var11][var58][var9]; + Scene.Scene_addOccluder(var5, 1, var58 * 128, var58 * 128, var9 * 128, var10 * 128 + 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = UserComparator6.field1191[var17][var58]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((UserComparator6.field1191[var56][var58][var57] & var3) != 0) { + var9 = var58; + var10 = var58; + var11 = var56; + + for (var12 = var56; var9 > 0 && (UserComparator6.field1191[var56][var9 - 1][var57] & var3) != 0; --var9) { + } + + while (var10 < 104 && (UserComparator6.field1191[var56][var10 + 1][var57] & var3) != 0) { + ++var10; + } + + label388: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UserComparator6.field1191[var11 - 1][var13][var57] & var3) == 0) { + break label388; + } + } + + --var11; + } + + label377: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UserComparator6.field1191[var12 + 1][var13][var57] & var3) == 0) { + break label377; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var59 = 240; + var15 = Tiles.Tiles_heights[var12][var9][var57] - var59; + var16 = Tiles.Tiles_heights[var11][var9][var57]; + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var57 * 128, var57 * 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = UserComparator6.field1191[var17][var18]; + var10000[var57] &= ~var3; + } + } + } + } + + if ((UserComparator6.field1191[var56][var58][var57] & var4) != 0) { + var9 = var58; + var10 = var58; + var11 = var57; + + for (var12 = var57; var11 > 0 && (UserComparator6.field1191[var56][var58][var11 - 1] & var4) != 0; --var11) { + } + + while (var12 < 104 && (UserComparator6.field1191[var56][var58][var12 + 1] & var4) != 0) { + ++var12; + } + + label441: + while (var9 > 0) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((UserComparator6.field1191[var56][var9 - 1][var13] & var4) == 0) { + break label441; + } + } + + --var9; + } + + label430: + while (var10 < 104) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((UserComparator6.field1191[var56][var10 + 1][var13] & var4) == 0) { + break label430; + } + } + + ++var10; + } + + if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { + var13 = Tiles.Tiles_heights[var56][var9][var11]; + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); + + for (var14 = var9; var14 <= var10; ++var14) { + for (var15 = var11; var15 <= var12; ++var15) { + var10000 = UserComparator6.field1191[var56][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1686145446" + ) + static final String method2388(int var0) { + if (var0 < 100000) { + return "" + var0 + ""; + } else { + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; + } + } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1569421925" + ) + static void method2390(int var0, int var1) { + int var2 = SoundCache.fontBold12.stringWidth("Choose Option"); + + int var3; + int var4; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + var4 = SoundCache.fontBold12.stringWidth(class169.method882(var3)); + if (var4 > var2) { + var2 = var4; + } + } + + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + var4 = var0 - var2 / 2; + if (var2 + var4 > class340.canvasWidth) { + var4 = class340.canvasWidth - var2; + } + + if (var4 < 0) { + var4 = 0; + } + + int var5 = var1; + if (var3 + var1 > class491.canvasHeight) { + var5 = class491.canvasHeight - var3; + } + + if (var5 < 0) { + var5 = 0; + } + + class28.menuX = var4; + class463.menuY = var5; + class341.menuWidth = var2; + Language.menuHeight = Client.menuOptionsCount * 15 + 22; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class485.java b/osrs/src/main/java/class485.java deleted file mode 100644 index ed0f1f722..000000000 --- a/osrs/src/main/java/class485.java +++ /dev/null @@ -1,70 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ss") -public class class485 { - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - @Export("SequenceDefinition_skeletonsArchive") - static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("au") - public final Object field4049; - @ObfuscatedName("ae") - public final Object field4048; - - public class485(Object var1, Object var2) { - this.field4049 = var1; - this.field4048 = var2; - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - return this.field4049 + ", " + this.field4048; - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (var1 != null && var1 instanceof class485) { - class485 var2 = (class485)var1; - if (this.field4049 == null) { - if (var2.field4049 != null) { - return false; - } - } else if (!this.field4049.equals(var2.field4049)) { - return false; - } - - if (this.field4048 == null) { - if (var2.field4048 != null) { - return false; - } - } else if (!this.field4048.equals(var2.field4048)) { - return false; - } - - return true; - } else { - return false; - } - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - int var1 = 0; - if (this.field4049 != null) { - var1 += this.field4049.hashCode(); - } - - if (this.field4048 != null) { - var1 += 31 * this.field4048.hashCode(); - } - - return var1; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class489.java b/osrs/src/main/java/class489.java deleted file mode 100644 index 00cdf1d82..000000000 --- a/osrs/src/main/java/class489.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("su") -public interface class489 extends Iterable { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "31516" - ) - int vmethod8144(int var1); - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "1797615972" - ) - void vmethod8143(int var1, Object var2); -} \ No newline at end of file diff --git a/osrs/src/main/java/class490.java b/osrs/src/main/java/class490.java index cbce77685..4d8a8908d 100644 --- a/osrs/src/main/java/class490.java +++ b/osrs/src/main/java/class490.java @@ -2,69 +2,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -@ObfuscatedName("sx") -public class class490 implements class489 { - @ObfuscatedName("au") - Map field4064; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Luu;" - ) - final class522 field4065; - - @ObfuscatedSignature( - descriptor = "(Luu;)V" - ) - public class490(class522 var1) { - this.field4065 = var1; - } - - @ObfuscatedName("au") +@ObfuscatedName("sk") +public interface class490 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "31516" + descriptor = "(I)Lsx;", + garbageValue = "-2060739021" ) - @Export("vmethod8144") - public int vmethod8144(int var1) { - if (this.field4064 != null) { - class523 var2 = (class523)this.field4064.get(var1); - if (var2 != null) { - return (Integer)var2.field4215; - } - } - - return (Integer)this.field4065.vmethod8697(var1); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "1797615972" - ) - @Export("vmethod8143") - public void vmethod8143(int var1, Object var2) { - if (this.field4064 == null) { - this.field4064 = new HashMap(); - this.field4064.put(var1, new class523(var1, var2)); - } else { - class523 var3 = (class523)this.field4064.get(var1); - if (var3 == null) { - this.field4064.put(var1, new class523(var1, var2)); - } else { - var3.field4215 = var2; - } - } - - } - - @Export("iterator") - @ObfuscatedName("iterator") - public Iterator iterator() { - return this.field4064 == null ? Collections.emptyList().iterator() : this.field4064.values().iterator(); - } + @Export("get") + PlatformInfo get(); } \ No newline at end of file diff --git a/osrs/src/main/java/class491.java b/osrs/src/main/java/class491.java new file mode 100644 index 000000000..0d2868bdf --- /dev/null +++ b/osrs/src/main/java/class491.java @@ -0,0 +1,92 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("so") +public class class491 extends class494 { + @ObfuscatedName("aq") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("ac") + int field3992; + @ObfuscatedName("al") + int field3993; + @ObfuscatedName("ak") + double field3988; + @ObfuscatedName("ax") + double field3991; + @ObfuscatedName("ao") + double field3989; + @ObfuscatedName("ah") + double field3987; + @ObfuscatedName("ar") + double field3990; + + public class491(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + super(var9, var10); + this.field3992 = 0; + this.field3993 = 0; + this.field3988 = 0.0D; + this.field3991 = 0.0D; + this.field3989 = 0.0D; + this.field3987 = 0.0D; + this.field3990 = 0.0D; + this.field3992 = var3; + this.field3993 = var6; + if ((var5 - var8) * (var7 - var1) == (var4 - var7) * (var8 - var2)) { + this.field3988 = (double)var4; + this.field3991 = (double)var5; + } else { + double var11 = (double)((float)(var7 + var1)) / 2.0D; + double var13 = (double)((float)(var8 + var2)) / 2.0D; + double var15 = (double)((float)(var4 + var7)) / 2.0D; + double var17 = (double)((float)(var5 + var8)) / 2.0D; + double var19 = -1.0D * (double)(var7 - var1) / (double)(var8 - var2); + double var21 = (double)(var4 - var7) * -1.0D / (double)(var5 - var8); + this.field3988 = (var19 * var11 - var21 * var15 + var17 - var13) / (var19 - var21); + this.field3991 = var13 + (this.field3988 - var11) * var19; + this.field3989 = Math.sqrt(Math.pow(this.field3988 - (double)var1, 2.0D) + Math.pow(this.field3991 - (double)var2, 2.0D)); + this.field3987 = Math.atan2((double)var2 - this.field3991, (double)var1 - this.field3988); + double var23 = Math.atan2((double)var8 - this.field3991, (double)var7 - this.field3988); + this.field3990 = Math.atan2((double)var5 - this.field3991, (double)var4 - this.field3988); + boolean var25 = this.field3987 <= var23 && var23 <= this.field3990 || this.field3990 <= var23 && var23 <= this.field3987; + if (!var25) { + this.field3990 += 3.141592653589793D * (double)(this.field3987 - this.field3990 > 0.0D ? 2 : -2); + } + + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-437522182" + ) + public int vmethod2349() { + double var1 = this.method2414(); + double var3 = this.field3987 + var1 * (this.field3990 - this.field3987); + return (int)Math.round(this.field3988 + this.field3989 * Math.cos(var3)); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1670157872" + ) + public int vmethod2347() { + double var1 = this.method2414(); + double var3 = (this.field3990 - this.field3987) * var1 + this.field3987; + return (int)Math.round(this.field3991 + this.field3989 * Math.sin(var3)); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "54" + ) + @Export("vmethod2320") + public int vmethod2320() { + double var1 = this.method2414(); + return (int)Math.round(var1 * (double)(this.field3993 - this.field3992) + (double)this.field3992); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class492.java b/osrs/src/main/java/class492.java new file mode 100644 index 000000000..c91f863d7 --- /dev/null +++ b/osrs/src/main/java/class492.java @@ -0,0 +1,87 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("sc") +public class class492 extends class494 { + @ObfuscatedName("ac") + int field3994; + @ObfuscatedName("al") + int field3997; + @ObfuscatedName("ak") + int field3996; + @ObfuscatedName("ax") + int field3999; + @ObfuscatedName("ao") + int field3998; + @ObfuscatedName("ah") + int field3995; + + public class492(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + super(var7, var8); + this.field3994 = 0; + this.field3997 = 0; + this.field3996 = 0; + this.field3999 = 0; + this.field3998 = 0; + this.field3995 = 0; + this.field3994 = var1; + this.field3997 = var2; + this.field3996 = var3; + this.field3999 = var4; + this.field3998 = var5; + this.field3995 = var6; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-437522182" + ) + public int vmethod2349() { + double var1 = this.method2414(); + return (int)Math.round(var1 * (double)(this.field3999 - this.field3994) + (double)this.field3994); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1670157872" + ) + public int vmethod2347() { + double var1 = this.method2414(); + return (int)Math.round((double)this.field3997 + var1 * (double)(this.field3998 - this.field3997)); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "54" + ) + public int vmethod2320() { + double var1 = this.method2414(); + return (int)Math.round((double)this.field3996 + (double)(this.field3995 - this.field3996) * var1); + } + + @ObfuscatedName("nh") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "69" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromIgnored(); + } + + if (class358.friendsChat != null) { + class358.friendsChat.invalidateIgnoreds(); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class493.java b/osrs/src/main/java/class493.java index 23ef9bff5..e8d1595fa 100644 --- a/osrs/src/main/java/class493.java +++ b/osrs/src/main/java/class493.java @@ -1,94 +1,35 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.*; - -@ObfuscatedName("sg") -public class class493 { - @ObfuscatedName("ao") - static final char[] field4077; - @ObfuscatedName("at") - static final char[] field4078; - - static { - field4077 = new char[]{' ', '\u00a0', '_', '-', '\u00e0', '\u00e1', '\u00e2', '\u00e4', '\u00e3', '\u00c0', '\u00c1', '\u00c2', '\u00c4', '\u00c3', '\u00e8', '\u00e9', '\u00ea', '\u00eb', '\u00c8', '\u00c9', '\u00ca', '\u00cb', '\u00ed', '\u00ee', '\u00ef', '\u00cd', '\u00ce', '\u00cf', '\u00f2', '\u00f3', '\u00f4', '\u00f6', '\u00f5', '\u00d2', '\u00d3', '\u00d4', '\u00d6', '\u00d5', '\u00f9', '\u00fa', '\u00fb', '\u00fc', '\u00d9', '\u00da', '\u00db', '\u00dc', '\u00e7', '\u00c7', '\u00ff', '\u0178', '\u00f1', '\u00d1', '\u00df'}; - field4078 = new char[]{'[', ']', '#'}; - } - - @ObfuscatedName("ao") +@ObfuscatedName("sp") +public class class493 extends class495 { + @ObfuscatedName("ra") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "1089015752" + descriptor = "Lgc;" ) - static String method2465(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { - RunException var2 = (RunException)var0; - var1 = var2.field4291 + " | "; - var0 = var2.parent; - } else { - var1 = ""; - } - - StringWriter var12 = new StringWriter(); - PrintWriter var3 = new PrintWriter(var12); - var0.printStackTrace(var3); - var3.close(); - String var4 = var12.toString(); - BufferedReader var5 = new BufferedReader(new StringReader(var4)); - String var6 = var5.readLine(); - - while (true) { - while (true) { - String var7 = var5.readLine(); - if (var7 == null) { - var1 = var1 + "| " + var6; - return var1; - } - - int var8 = var7.indexOf(40); - int var9 = var7.indexOf(41, var8 + 1); - if (var8 >= 0 && var9 >= 0) { - String var10 = var7.substring(var8 + 1, var9); - int var11 = var10.indexOf(".java:"); - if (var11 >= 0) { - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); - var1 = var1 + var10 + ' '; - continue; - } - - var7 = var7.substring(0, var8); - } - - var7 = var7.trim(); - var7 = var7.substring(var7.lastIndexOf(32) + 1); - var7 = var7.substring(var7.lastIndexOf(9) + 1); - var1 = var1 + var7 + ' '; - } - } + @Export("mouseWheel") + static class176 mouseWheel; + @ObfuscatedName("ac") + int field4001; + @ObfuscatedName("al") + int field4002; + + public class493(int var1, int var2, int var3, int var4) { + super(var3, var4); + this.field4001 = 0; + this.field4002 = 0; + this.field4001 = var1; + this.field4002 = var2; } - @ObfuscatedName("aa") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)Luk;", - garbageValue = "-94" + descriptor = "(I)I", + garbageValue = "-502803957" ) - public static IndexedSprite method2466() { - IndexedSprite var0 = new IndexedSprite(); - var0.width = class529.SpriteBuffer_spriteWidth; - var0.height = class420.SpriteBuffer_spriteHeight; - var0.xOffset = class529.SpriteBuffer_xOffsets[0]; - var0.yOffset = class152.SpriteBuffer_yOffsets[0]; - var0.subWidth = HealthBarUpdate.SpriteBuffer_spriteWidths[0]; - var0.subHeight = SpriteMask.SpriteBuffer_spriteHeights[0]; - var0.palette = DbTableType.SpriteBuffer_spritePalette; - var0.pixels = Coord.SpriteBuffer_pixels[0]; - class529.SpriteBuffer_xOffsets = null; - class152.SpriteBuffer_yOffsets = null; - HealthBarUpdate.SpriteBuffer_spriteWidths = null; - SpriteMask.SpriteBuffer_spriteHeights = null; - DbTableType.SpriteBuffer_spritePalette = null; - Coord.SpriteBuffer_pixels = null; - return var0; + public int method2409() { + double var1 = this.method2414(); + return (int)Math.round((double)this.field4001 + var1 * (double)(this.field4002 - this.field4001)); } } \ No newline at end of file diff --git a/osrs/src/main/java/class494.java b/osrs/src/main/java/class494.java new file mode 100644 index 000000000..2016dafe9 --- /dev/null +++ b/osrs/src/main/java/class494.java @@ -0,0 +1,34 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("th") +public abstract class class494 extends class495 { + class494(int var1, int var2) { + super(var1, var2); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-437522182" + ) + @Export("vmethod2349") + public abstract int vmethod2349(); + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1670157872" + ) + @Export("vmethod2347") + public abstract int vmethod2347(); + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "54" + ) + @Export("vmethod2320") + public abstract int vmethod2320(); +} \ No newline at end of file diff --git a/osrs/src/main/java/class495.java b/osrs/src/main/java/class495.java new file mode 100644 index 000000000..4303e75c6 --- /dev/null +++ b/osrs/src/main/java/class495.java @@ -0,0 +1,67 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ti") +public abstract class class495 { + @ObfuscatedName("ab") + int field4004; + @ObfuscatedName("am") + int field4006; + @ObfuscatedName("av") + double field4003; + @ObfuscatedName("ag") + int field4005; + + class495(int var1, int var2) { + this.field4004 = 0; + this.field4006 = 0; + this.field4003 = 0.0D; + this.field4005 = 0; + this.field4004 = var1; + this.field4006 = 0; + this.field4005 = var2 >= 0 && var2 <= 27 ? var2 : 0; + this.field4003 = MenuAction.method428(this.field4006, this.field4004, this.field4005); + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2121571736" + ) + public void method2413() { + if (this.field4006 < this.field4004) { + ++this.field4006; + this.field4003 = MenuAction.method428(this.field4006, this.field4004, this.field4005); + } + + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(I)D", + garbageValue = "1788156713" + ) + double method2414() { + return this.field4003; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Lul;[II)[Ljava/lang/Object;", + garbageValue = "1602002103" + ) + static Object[] method2415(Buffer var0, int[] var1) { + int var2 = var0.readUShortSmart(); + Object[] var3 = new Object[var1.length * var2]; + + for (int var4 = 0; var4 < var2; ++var4) { + for (int var5 = 0; var5 < var1.length; ++var5) { + int var6 = var1.length * var4 + var5; + class517 var7 = Tile.method1230(var1[var5]); + var3[var6] = var7.method2532(var0); + } + } + + return var3; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class496.java b/osrs/src/main/java/class496.java deleted file mode 100644 index a228949db..000000000 --- a/osrs/src/main/java/class496.java +++ /dev/null @@ -1,45 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Iterator; - -@ObfuscatedName("tn") -class class496 implements Iterator { - @ObfuscatedName("au") - int field4093; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lth;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final class497 this$0; - - @ObfuscatedSignature( - descriptor = "(Lth;)V" - ) - class496(class497 var1) { - this.this$0 = var1; - } - - @Export("hasNext") - @ObfuscatedName("hasNext") - public boolean hasNext() { - return this.field4093 < this.this$0.method2322(); - } - - @Export("next") - @ObfuscatedName("next") - public Object next() { - int var1 = ++this.field4093 - 1; - class456 var2 = (class456)this.this$0.field4095.get((long)var1); - return var2 != null ? var2 : this.this$0.method2482(var1); - } - - @Export("remove") - @ObfuscatedName("remove") - public void remove() { - throw new UnsupportedOperationException(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class497.java b/osrs/src/main/java/class497.java deleted file mode 100644 index f53092acb..000000000 --- a/osrs/src/main/java/class497.java +++ /dev/null @@ -1,81 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Iterator; - -@ObfuscatedName("th") -public class class497 extends class455 implements class283 { - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - final AbstractArchive field4096; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lkg;" - ) - final DemotingHashTable field4095; - @ObfuscatedName("at") - final int field4094; - - @ObfuscatedSignature( - descriptor = "(Lns;ILon;Lnu;)V" - ) - public class497(StudioGame var1, int var2, Language var3, AbstractArchive var4) { - super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); - this.field4095 = new DemotingHashTable(64); - this.field4096 = var4; - this.field4094 = var2; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IB)Lrv;", - garbageValue = "-32" - ) - @Export("vmethod8207") - protected class457 vmethod8207(int var1) { - synchronized(this.field4095) { - class456 var2 = (class456)this.field4095.get((long)var1); - if (var2 == null) { - var2 = this.method2482(var1); - this.field4095.method1593(var2, (long)var1); - } - - return var2; - } - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(IB)Lrg;", - garbageValue = "-117" - ) - class456 method2482(int var1) { - byte[] var2 = this.field4096.takeFile(this.field4094, var1); - class456 var3 = new class456(var1); - if (var2 != null) { - var3.method2327(new Buffer(var2)); - } - - return var3; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "322447059" - ) - public void method2483() { - synchronized(this.field4095) { - this.field4095.clear(); - } - } - - @Export("iterator") - @ObfuscatedName("iterator") - public Iterator iterator() { - return new class496(this); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class499.java b/osrs/src/main/java/class499.java deleted file mode 100644 index cc3222894..000000000 --- a/osrs/src/main/java/class499.java +++ /dev/null @@ -1,98 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("tl") -final class class499 implements class498 { - @ObfuscatedName("fz") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - @Export("archive9") - static Archive archive9; - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Ltm;I)V", - garbageValue = "465506048" - ) - @Export("vmethod8274") - public void vmethod8274(Object var1, Buffer var2) { - this.method2486((Integer)var1, var2); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ltm;I)Ljava/lang/Object;", - garbageValue = "-295239457" - ) - @Export("vmethod8273") - public Object vmethod8273(Buffer var1) { - return var1.readInt(); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Ltm;S)V", - garbageValue = "128" - ) - void method2486(Integer var1, Buffer var2) { - var2.writeInt(var1); - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "1972049883" - ) - static int method2489(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 != 1927 && var0 != 2927) { - int var4; - if (var0 == 1928) { - var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var4 >= 1 && var4 <= 10) { - class102 var5 = new class102(var4, var3.id, var3.childIndex, var3.itemId); - Interpreter.field715.add(var5); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == 2928) { - SoundCache.Interpreter_intStackSize -= 3; - int var7 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - int var8 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - if (var8 >= 1 && var8 <= 10) { - class102 var6 = new class102(var8, var7, var4, class92.getWidget(var7).itemId); - Interpreter.field715.add(var6); - return 1; - } else { - throw new RuntimeException(); - } - } else { - return 2; - } - } else if (Interpreter.field708 >= 10) { - throw new RuntimeException(); - } else { - if (var0 >= 2000) { - var3 = class92.getWidget(Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - } else { - var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - } - - if (var3.onResize == null) { - return 0; - } else { - ScriptEvent var9 = new ScriptEvent(); - var9.widget = var3; - var9.args = var3.onResize; - var9.field864 = Interpreter.field708 + 1; - Client.scriptEvents.addFirst(var9); - return 1; - } - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class5.java b/osrs/src/main/java/class5.java index f75a95457..77628737c 100644 --- a/osrs/src/main/java/class5.java +++ b/osrs/src/main/java/class5.java @@ -5,41 +5,41 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -@ObfuscatedName("ai") +@ObfuscatedName("ah") public class class5 implements class2 { - @ObfuscatedName("au") - final MessageDigest field4; + @ObfuscatedName("ac") + final MessageDigest field3; @ObfuscatedSignature( - descriptor = "(Laa;)V" + descriptor = "(Lam;)V" ) class5(class8 var1) { - this.field4 = this.method10(); + this.field3 = this.method12(); } - @ObfuscatedName("au") - boolean method6(int var1, String var2, long var3) { - byte[] var5 = this.method9(var2, var3); - return method7(var5) >= var1; + @ObfuscatedName("ac") + boolean method8(int var1, String var2, long var3) { + byte[] var5 = this.method11(var2, var3); + return method9(var5) >= var1; } - @ObfuscatedName("at") - byte[] method9(String var1, long var2) { + @ObfuscatedName("ax") + byte[] method11(String var1, long var2) { StringBuilder var4 = new StringBuilder(); var4.append(var1).append(Long.toHexString(var2)); - this.field4.reset(); + this.field3.reset(); try { - this.field4.update(var4.toString().getBytes("UTF-8")); + this.field3.update(var4.toString().getBytes("UTF-8")); } catch (UnsupportedEncodingException var6) { var6.printStackTrace(); } - return this.field4.digest(); + return this.field3.digest(); } - @ObfuscatedName("ac") - MessageDigest method10() { + @ObfuscatedName("ao") + MessageDigest method12() { try { return MessageDigest.getInstance("SHA-256"); } catch (NoSuchAlgorithmException var2) { @@ -48,14 +48,14 @@ MessageDigest method10() { } } - @ObfuscatedName("ae") - static int method7(byte[] var0) { + @ObfuscatedName("al") + static int method9(byte[] var0) { int var1 = 0; byte[] var2 = var0; for (int var3 = 0; var3 < var2.length; ++var3) { byte var4 = var2[var3]; - int var5 = method8(var4); + int var5 = method10(var4); var1 += var5; if (var5 != 8) { break; @@ -65,8 +65,8 @@ static int method7(byte[] var0) { return var1; } - @ObfuscatedName("ao") - static int method8(byte var0) { + @ObfuscatedName("ak") + static int method10(byte var0) { int var1 = 0; if (var0 == 0) { var1 = 8; diff --git a/osrs/src/main/java/class500.java b/osrs/src/main/java/class500.java index 1bf5ca0aa..a12ea6c38 100644 --- a/osrs/src/main/java/class500.java +++ b/osrs/src/main/java/class500.java @@ -1,24 +1,71 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tq") +import java.io.File; + +@ObfuscatedName("tw") public class class500 { - @ObfuscatedName("ae") - static final int[] field4098; + @ObfuscatedName("ak") + @Export("SpriteBuffer_spriteHeight") + public static int SpriteBuffer_spriteHeight; + @ObfuscatedName("ao") + @Export("cacheDir") + static File cacheDir; + @ObfuscatedName("ac") + public final Object field4079; + @ObfuscatedName("al") + public final Object field4080; + + public class500(Object var1, Object var2) { + this.field4079 = var1; + this.field4080 = var2; + } + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + return this.field4079 + ", " + this.field4080; + } - static { - field4098 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (var1 != null && var1 instanceof class500) { + class500 var2 = (class500)var1; + if (this.field4079 == null) { + if (var2.field4079 != null) { + return false; + } + } else if (!this.field4079.equals(var2.field4079)) { + return false; + } + + if (this.field4080 == null) { + if (var2.field4080 != null) { + return false; + } + } else if (!this.field4080.equals(var2.field4080)) { + return false; + } + + return true; + } else { + return false; + } } - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "108" - ) - static void method2490() { - for (class211 var0 = (class211)Client.field628.last(); var0 != null; var0 = (class211)Client.field628.previous()) { - var0.remove(); + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + int var1 = 0; + if (this.field4079 != null) { + var1 += this.field4079.hashCode(); + } + + if (this.field4080 != null) { + var1 += 31 * this.field4080.hashCode(); } + return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class501.java b/osrs/src/main/java/class501.java deleted file mode 100644 index 346c330f6..000000000 --- a/osrs/src/main/java/class501.java +++ /dev/null @@ -1,35 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("tg") -final class class501 implements class498 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Ltm;I)V", - garbageValue = "465506048" - ) - @Export("vmethod8274") - public void vmethod8274(Object var1, Buffer var2) { - this.method2491((Long)var1, var2); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ltm;I)Ljava/lang/Object;", - garbageValue = "-295239457" - ) - @Export("vmethod8273") - public Object vmethod8273(Buffer var1) { - return var1.readLong(); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Ltm;B)V", - garbageValue = "-19" - ) - void method2491(Long var1, Buffer var2) { - var2.writeLong(var1); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class502.java b/osrs/src/main/java/class502.java deleted file mode 100644 index f1f96a793..000000000 --- a/osrs/src/main/java/class502.java +++ /dev/null @@ -1,101 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("tb") -public class class502 implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Ltb;" - ) - public static final class502 field4101; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Ltb;" - ) - public static final class502 field4099; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Ltb;" - ) - public static final class502 field4100; - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "[Lui;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; - @ObfuscatedName("at") - public final int field4104; - @ObfuscatedName("ac") - public final int field4103; - @ObfuscatedName("ai") - public final Class field4105; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Ltj;" - ) - public final class498 field4106; - - static { - field4101 = new class502(1, 0, Integer.class, new class499()); - field4099 = new class502(0, 1, Long.class, new class501()); - field4100 = new class502(2, 2, String.class, new class503()); - } - - @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Ltj;)V" - ) - class502(int var1, int var2, Class var3, class498 var4) { - this.field4104 = var1; - this.field4103 = var2; - this.field4105 = var3; - this.field4106 = var4; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4103; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ltm;S)Ljava/lang/Object;", - garbageValue = "5018" - ) - public Object method2497(Buffer var1) { - return this.field4106.vmethod8273(var1); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)[Ltb;", - garbageValue = "44" - ) - public static class502[] method2494() { - return new class502[]{field4101, field4100, field4099}; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Class;B)Ltb;", - garbageValue = "82" - ) - public static class502 method2495(Class var0) { - class502[] var1 = method2494(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - class502 var3 = var1[var2]; - if (var3.field4105 == var0) { - return var3; - } - } - - return null; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class503.java b/osrs/src/main/java/class503.java deleted file mode 100644 index 110f6f3b9..000000000 --- a/osrs/src/main/java/class503.java +++ /dev/null @@ -1,47 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("tz") -final class class503 implements class498 { - @ObfuscatedName("cy") - static int field4107; - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Ltm;I)V", - garbageValue = "465506048" - ) - @Export("vmethod8274") - public void vmethod8274(Object var1, Buffer var2) { - this.method2498((String)var1, var2); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ltm;I)Ljava/lang/Object;", - garbageValue = "-295239457" - ) - @Export("vmethod8273") - public Object vmethod8273(Buffer var1) { - return var1.readStringCp1252NullTerminated(); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ltm;I)V", - garbageValue = "-1097671055" - ) - void method2498(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2008641376" - ) - static final void method2501() { - UserComparator8.method673("You can't add yourself to your own ignore list"); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class504.java b/osrs/src/main/java/class504.java index a589fabc3..723e67b69 100644 --- a/osrs/src/main/java/class504.java +++ b/osrs/src/main/java/class504.java @@ -1,20 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ti") -public final class class504 { - @ObfuscatedName("ax") +@ObfuscatedName("ts") +public interface class504 extends Iterable { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IZII)V", - garbageValue = "-1433824975" + descriptor = "(II)I", + garbageValue = "-3541308" ) - public static final void method2502(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { - PcmPlayer.field181 = var0; - PcmPlayer.PcmPlayer_stereo = var1; - PcmPlayer.field182 = var2; - } else { - throw new IllegalArgumentException(); - } - } + int vmethod8144(int var1); + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "78" + ) + void vmethod8143(int var1, Object var2); } \ No newline at end of file diff --git a/osrs/src/main/java/class505.java b/osrs/src/main/java/class505.java new file mode 100644 index 000000000..5b8e957c3 --- /dev/null +++ b/osrs/src/main/java/class505.java @@ -0,0 +1,70 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +@ObfuscatedName("ty") +public class class505 implements class504 { + @ObfuscatedName("ac") + Map field4095; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Luv;" + ) + final class537 field4096; + + @ObfuscatedSignature( + descriptor = "(Luv;)V" + ) + public class505(class537 var1) { + this.field4096 = var1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-3541308" + ) + @Export("vmethod8144") + public int vmethod8144(int var1) { + if (this.field4095 != null) { + class538 var2 = (class538)this.field4095.get(var1); + if (var2 != null) { + return (Integer)var2.field4242; + } + } + + return (Integer)this.field4096.vmethod8697(var1); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "78" + ) + @Export("vmethod8143") + public void vmethod8143(int var1, Object var2) { + if (this.field4095 == null) { + this.field4095 = new HashMap(); + this.field4095.put(var1, new class538(var1, var2)); + } else { + class538 var3 = (class538)this.field4095.get(var1); + if (var3 == null) { + this.field4095.put(var1, new class538(var1, var2)); + } else { + var3.field4242 = var2; + } + } + + } + + @Export("iterator") + @ObfuscatedName("iterator") + public Iterator iterator() { + return this.field4095 == null ? Collections.emptyList().iterator() : this.field4095.values().iterator(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class506.java b/osrs/src/main/java/class506.java deleted file mode 100644 index 1caa990da..000000000 --- a/osrs/src/main/java/class506.java +++ /dev/null @@ -1,81 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@ObfuscatedName("tx") -public class class506 extends DualNode { - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "[Ltb;" - ) - class502[] field4114; - @ObfuscatedName("ac") - List field4113; - - @ObfuscatedSignature( - descriptor = "(Lnu;I)V" - ) - public class506(AbstractArchive var1, int var2) { - byte[] var3 = var1.takeFile(var2, 0); - this.method2506(new Buffer(var3)); - } - - @ObfuscatedSignature( - descriptor = "(Lnu;II)V" - ) - public class506(AbstractArchive var1, int var2, int var3) { - byte[] var4 = var1.takeFile(var2, var3 + 1); - this.method2506(new Buffer(var4)); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ltm;I)V", - garbageValue = "1051210616" - ) - void method2506(Buffer var1) { - int var2 = var1.method2565(); - this.field4114 = new class502[var2]; - this.field4113 = new ArrayList(var2); - - for (int var3 = 0; var3 < var2; ++var3) { - this.field4114[var3] = (class502)KeyHandler.findEnumerated(class502.method2494(), var1.readUnsignedByte()); - int var4 = var1.method2565(); - HashMap var5 = new HashMap(var4); - - while (var4-- > 0) { - Object var6 = this.field4114[var3].method2497(var1); - int var7 = var1.method2565(); - ArrayList var8 = new ArrayList(); - - while (var7-- > 0) { - int var9 = var1.method2565(); - var8.add(var9); - } - - var5.put(var6, var8); - } - - this.field4113.add(var3, var5); - } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;IB)Ljava/util/List;", - garbageValue = "113" - ) - public List method2507(Object var1, int var2) { - if (var2 < 0) { - var2 = 0; - } - - Map var3 = (Map)this.field4113.get(var2); - return (List)var3.get(var1); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class508.java b/osrs/src/main/java/class508.java index f285b456f..95a26c534 100644 --- a/osrs/src/main/java/class508.java +++ b/osrs/src/main/java/class508.java @@ -1,14 +1,14 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("tr") +@ObfuscatedName("tv") public class class508 { - @ObfuscatedName("ao") - static final int field4120; - @ObfuscatedName("at") - static final int field4121; + @ObfuscatedName("ak") + static final char[] field4108; + @ObfuscatedName("ax") + static final char[] field4109; static { - field4120 = (int)(Math.pow(2.0D, 4.0D) - 1.0D); - field4121 = (int)(Math.pow(2.0D, 8.0D) - 1.0D); + field4108 = new char[]{' ', '\u00a0', '_', '-', '\u00e0', '\u00e1', '\u00e2', '\u00e4', '\u00e3', '\u00c0', '\u00c1', '\u00c2', '\u00c4', '\u00c3', '\u00e8', '\u00e9', '\u00ea', '\u00eb', '\u00c8', '\u00c9', '\u00ca', '\u00cb', '\u00ed', '\u00ee', '\u00ef', '\u00cd', '\u00ce', '\u00cf', '\u00f2', '\u00f3', '\u00f4', '\u00f6', '\u00f5', '\u00d2', '\u00d3', '\u00d4', '\u00d6', '\u00d5', '\u00f9', '\u00fa', '\u00fb', '\u00fc', '\u00d9', '\u00da', '\u00db', '\u00dc', '\u00e7', '\u00c7', '\u00ff', '\u0178', '\u00f1', '\u00d1', '\u00df'}; + field4109 = new char[]{'[', ']', '#'}; } } \ No newline at end of file diff --git a/osrs/src/main/java/class51.java b/osrs/src/main/java/class51.java index 6af387408..de36a67f5 100644 --- a/osrs/src/main/java/class51.java +++ b/osrs/src/main/java/class51.java @@ -2,12 +2,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("bw") public interface class51 { - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)Lbb;", - garbageValue = "74" + descriptor = "(S)Lbu;", + garbageValue = "25906" ) @Export("player") PcmPlayer player(); diff --git a/osrs/src/main/java/class510.java b/osrs/src/main/java/class510.java deleted file mode 100644 index 479f078fe..000000000 --- a/osrs/src/main/java/class510.java +++ /dev/null @@ -1,214 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ty") -public enum class510 implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4129(1), - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4124(2), - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4127(4), - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4128(8), - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4135(16), - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4138(32), - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4151(64, true), - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4143(128), - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4122(256, true), - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4136(512), - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4123(1024), - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4144(2048), - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4140(4096), - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4142(8192), - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4145(16384), - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4134(32768), - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4125(65536), - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4141(131072), - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4149(262144), - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4137(524288), - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4146(1048576), - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4150(2097152), - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4139(4194304), - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4147(8388608), - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4148(16777216), - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4126(33554432), - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4153(67108864, true), - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4130(134217728), - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4154(268435456), - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4132(536870912, true), - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4131(1073741824, true), - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lty;" - ) - field4152(Integer.MIN_VALUE); - - @ObfuscatedName("hu") - static String field4133; - @ObfuscatedName("by") - final int field4155; - - class510(int var3) { - this.field4155 = var3; - } - - @ObfuscatedSignature( - descriptor = "(IZ)V", - garbageValue = "1" - ) - class510(int var3, boolean var4) { - this.field4155 = var3; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4155; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "3331" - ) - public static void method2513() { - try { - JagexCache.JagexCache_dat2File.close(); - - for (int var0 = 0; var0 < JagexCache.field1461; ++var0) { - WallDecoration.JagexCache_idxFiles[var0].close(); - } - - JagexCache.JagexCache_idx255File.close(); - JagexCache.JagexCache_randomDat.close(); - } catch (Exception var2) { - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class511.java b/osrs/src/main/java/class511.java new file mode 100644 index 000000000..7db454259 --- /dev/null +++ b/osrs/src/main/java/class511.java @@ -0,0 +1,57 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("tn") +class class511 implements Iterator { + @ObfuscatedName("ac") + int field4124; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ltx;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final class512 this$0; + + @ObfuscatedSignature( + descriptor = "(Ltx;)V" + ) + class511(class512 var1) { + this.this$0 = var1; + } + + @Export("hasNext") + @ObfuscatedName("hasNext") + public boolean hasNext() { + return this.field4124 < this.this$0.method2359(); + } + + @Export("next") + @ObfuscatedName("next") + public Object next() { + int var1 = ++this.field4124 - 1; + class471 var2 = (class471)this.this$0.field4126.get((long)var1); + return var2 != null ? var2 : this.this$0.method2515(var1); + } + + @Export("remove") + @ObfuscatedName("remove") + public void remove() { + throw new UnsupportedOperationException(); + } + + @ObfuscatedName("mf") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "0" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (class33.field89.method1742(var0)) { + class108.updateInterface(class33.field89.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class512.java b/osrs/src/main/java/class512.java new file mode 100644 index 000000000..baa289d51 --- /dev/null +++ b/osrs/src/main/java/class512.java @@ -0,0 +1,105 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("tx") +public class class512 extends class470 implements class297 { + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + final AbstractArchive field4127; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lls;" + ) + final DemotingHashTable field4126; + @ObfuscatedName("ax") + final int field4125; + + @ObfuscatedSignature( + descriptor = "(Lnp;ILoa;Lom;)V" + ) + public class512(StudioGame var1, int var2, Language var3, AbstractArchive var4) { + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); + this.field4126 = new DemotingHashTable(64); + this.field4127 = var4; + this.field4125 = var2; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)Lsl;", + garbageValue = "-799452482" + ) + @Export("vmethod8207") + protected class472 vmethod8207(int var1) { + synchronized(this.field4126) { + class471 var2 = (class471)this.field4126.get((long)var1); + if (var2 == null) { + var2 = this.method2515(var1); + this.field4126.method1620(var2, (long)var1); + } + + return var2; + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(IB)Lsw;", + garbageValue = "37" + ) + class471 method2515(int var1) { + byte[] var2 = this.field4127.takeFile(this.field4125, var1); + class471 var3 = new class471(var1); + if (var2 != null) { + var3.method2368(new Buffer(var2)); + } + + return var3; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-585456351" + ) + public void method2516() { + synchronized(this.field4126) { + this.field4126.clear(); + } + } + + @Export("iterator") + @ObfuscatedName("iterator") + public Iterator iterator() { + return new class511(this); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)[Lun;", + garbageValue = "2" + ) + public static IndexedSprite[] method2517() { + IndexedSprite[] var0 = new IndexedSprite[class544.SpriteBuffer_spriteCount]; + + for (int var1 = 0; var1 < class544.SpriteBuffer_spriteCount; ++var1) { + IndexedSprite var2 = var0[var1] = new IndexedSprite(); + var2.width = class159.SpriteBuffer_spriteWidth; + var2.height = class500.SpriteBuffer_spriteHeight; + var2.xOffset = class326.SpriteBuffer_xOffsets[var1]; + var2.yOffset = ModelData0.SpriteBuffer_yOffsets[var1]; + var2.subWidth = class59.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = class544.SpriteBuffer_spriteHeights[var1]; + var2.palette = class372.SpriteBuffer_spritePalette; + var2.pixels = AddRequestTask.SpriteBuffer_pixels[var1]; + } + + class407.method2062(); + return var0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class498.java b/osrs/src/main/java/class513.java similarity index 51% rename from osrs/src/main/java/class498.java rename to osrs/src/main/java/class513.java index a6ed9d1bf..2168e4df1 100644 --- a/osrs/src/main/java/class498.java +++ b/osrs/src/main/java/class513.java @@ -2,19 +2,20 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tj") -public interface class498 { - @ObfuscatedName("au") +@ObfuscatedName("td") +public interface class513 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Ltm;I)V", - garbageValue = "465506048" + descriptor = "(Ljava/lang/Object;Lul;I)V", + garbageValue = "-397863290" ) + @Export("vmethod8274") void vmethod8274(Object var1, Buffer var2); - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ltm;I)Ljava/lang/Object;", - garbageValue = "-295239457" + descriptor = "(Lul;I)Ljava/lang/Object;", + garbageValue = "-1456241929" ) @Export("vmethod8273") Object vmethod8273(Buffer var1); diff --git a/osrs/src/main/java/class514.java b/osrs/src/main/java/class514.java new file mode 100644 index 000000000..ec155d374 --- /dev/null +++ b/osrs/src/main/java/class514.java @@ -0,0 +1,35 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("tg") +final class class514 implements class513 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lul;I)V", + garbageValue = "-397863290" + ) + @Export("vmethod8274") + public void vmethod8274(Object var1, Buffer var2) { + this.method2520((Integer)var1, var2); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lul;I)Ljava/lang/Object;", + garbageValue = "-1456241929" + ) + @Export("vmethod8273") + public Object vmethod8273(Buffer var1) { + return var1.readInt(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Integer;Lul;I)V", + garbageValue = "1661995876" + ) + void method2520(Integer var1, Buffer var2) { + var2.writeInt(var1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class515.java b/osrs/src/main/java/class515.java index 9495a7e46..39169f996 100644 --- a/osrs/src/main/java/class515.java +++ b/osrs/src/main/java/class515.java @@ -1,68 +1,11 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tw") +@ObfuscatedName("tk") public class class515 { - @ObfuscatedName("au") - int[] field4163; - @ObfuscatedName("ae") - short[] field4164; + @ObfuscatedName("al") + static final int[] field4128; - @ObfuscatedSignature( - descriptor = "(Lhw;)V" - ) - public class515(NPCComposition var1) { - this.field4163 = new int[8]; - this.field4164 = new short[8]; - int var2 = 0; - if (var1.method992()) { - var2 = var1.method993().length; - System.arraycopy(var1.method993(), 0, this.field4163, 0, var2); - System.arraycopy(var1.method995(), 0, this.field4164, 0, var2); - } - - for (int var3 = var2; var3 < 8; ++var3) { - this.field4163[var3] = -1; - this.field4164[var3] = -1; - } - - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "-122" - ) - public int[] method2602() { - return this.field4163; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)[S", - garbageValue = "80" - ) - public short[] method2603() { - return this.field4164; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IISI)V", - garbageValue = "-1005641077" - ) - public void method2604(int var1, int var2, short var3) { - this.field4163[var1] = var2; - this.field4164[var1] = var3; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "([I[SB)V", - garbageValue = "1" - ) - public void method2605(int[] var1, short[] var2) { - this.field4163 = var1; - this.field4164 = var2; + static { + field4128 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } } \ No newline at end of file diff --git a/osrs/src/main/java/class516.java b/osrs/src/main/java/class516.java new file mode 100644 index 000000000..f04d30647 --- /dev/null +++ b/osrs/src/main/java/class516.java @@ -0,0 +1,35 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("tq") +final class class516 implements class513 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lul;I)V", + garbageValue = "-397863290" + ) + @Export("vmethod8274") + public void vmethod8274(Object var1, Buffer var2) { + this.method2523((Long)var1, var2); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lul;I)Ljava/lang/Object;", + garbageValue = "-1456241929" + ) + @Export("vmethod8273") + public Object vmethod8273(Buffer var1) { + return var1.readLong(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Long;Lul;B)V", + garbageValue = "1" + ) + void method2523(Long var1, Buffer var2) { + var2.writeLong(var1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class517.java b/osrs/src/main/java/class517.java new file mode 100644 index 000000000..62b0461f4 --- /dev/null +++ b/osrs/src/main/java/class517.java @@ -0,0 +1,146 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("tr") +public class class517 implements class386 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Ltr;" + ) + public static final class517 field4129; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Ltr;" + ) + public static final class517 field4131; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Ltr;" + ) + public static final class517 field4130; + @ObfuscatedName("ax") + public final int field4133; + @ObfuscatedName("ao") + public final int field4132; + @ObfuscatedName("ah") + public final Class field4134; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ltd;" + ) + public final class513 field4135; + + static { + field4129 = new class517(2, 0, Integer.class, new class514()); + field4131 = new class517(1, 1, Long.class, new class516()); + field4130 = new class517(0, 2, String.class, new class518()); + } + + @ObfuscatedSignature( + descriptor = "(IILjava/lang/Class;Ltd;)V" + ) + class517(int var1, int var2, Class var3, class513 var4) { + this.field4133 = var1; + this.field4132 = var2; + this.field4134 = var3; + this.field4135 = var4; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1243971674" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4132; + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(Lul;I)Ljava/lang/Object;", + garbageValue = "-1115238999" + ) + public Object method2532(Buffer var1) { + return this.field4135.vmethod8273(var1); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lom;Lom;ZI)V", + garbageValue = "2080268851" + ) + public static void method2530(AbstractArchive var0, AbstractArchive var1, boolean var2) { + ObjectComposition.ObjectDefinition_archive = var0; + ObjectComposition.ObjectDefinition_modelsArchive = var1; + ObjectComposition.ObjectDefinition_isLowDetail = var2; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-4677" + ) + public static void method2526() { + class190.field1496.clear(); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "618410019" + ) + public static boolean method2527(int var0) { + return (var0 >> 20 & 1) != 0; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)[Ltr;", + garbageValue = "-527981427" + ) + public static class517[] method2528() { + return new class517[]{field4130, field4129, field4131}; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;B)Ltr;", + garbageValue = "25" + ) + public static class517 method2529(Class var0) { + class517[] var1 = method2528(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + class517 var3 = var1[var2]; + if (var3.field4134 == var0) { + return var3; + } + } + + return null; + } + + @ObfuscatedName("ip") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "119" + ) + static void method2533() { + PacketBufferNode var0 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_WINDOW_SETTING, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(class178.getWindowedMode()); + var0.packetBuffer.writeShort(class340.canvasWidth); + var0.packetBuffer.writeShort(class491.canvasHeight); + Client.packetWriter.addNode(var0); + } + + @ObfuscatedName("mm") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-352823613" + ) + static final String method2534(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class518.java b/osrs/src/main/java/class518.java index 20153b3c7..a9c5064d4 100644 --- a/osrs/src/main/java/class518.java +++ b/osrs/src/main/java/class518.java @@ -1,11 +1,35 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tf") -public interface class518 { - @ObfuscatedName("au") +@ObfuscatedName("tz") +final class class518 implements class513 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ltm;B)V" + descriptor = "(Ljava/lang/Object;Lul;I)V", + garbageValue = "-397863290" ) - void method2614(Buffer var1); + @Export("vmethod8274") + public void vmethod8274(Object var1, Buffer var2) { + this.method2535((String)var1, var2); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lul;I)Ljava/lang/Object;", + garbageValue = "-1456241929" + ) + @Export("vmethod8273") + public Object vmethod8273(Buffer var1) { + return var1.readStringCp1252NullTerminated(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lul;B)V", + garbageValue = "112" + ) + void method2535(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); + } } \ No newline at end of file diff --git a/osrs/src/main/java/class519.java b/osrs/src/main/java/class519.java index 4bf40d972..8d1920d9c 100644 --- a/osrs/src/main/java/class519.java +++ b/osrs/src/main/java/class519.java @@ -2,73 +2,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tv") -public class class519 implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Ltv;" - ) - public static final class519 field4205; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Ltv;" - ) - public static final class519 field4204; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Ltv;" - ) - static final class519 field4208; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Ltv;" - ) - static final class519 field4209; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Ltv;" - ) - static final class519 field4206; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Ltv;" - ) - static final class519 field4207; - @ObfuscatedName("az") - final int field4211; +@ObfuscatedName("tj") +public final class class519 { @ObfuscatedName("ap") - final int field4210; - - static { - field4205 = new class519(1, 0); - field4204 = new class519(5, 2); - field4208 = new class519(2, 5); - field4209 = new class519(0, 6); - field4206 = new class519(4, 7); - field4207 = new class519(3, 8); - } - - class519(int var1, int var2) { - this.field4211 = var1; - this.field4210 = var2; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-664760154" - ) - public boolean method2616() { - return this == field4204; - } - - @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "Lun;" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4210; - } + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; } \ No newline at end of file diff --git a/osrs/src/main/java/class521.java b/osrs/src/main/java/class521.java new file mode 100644 index 000000000..7ed33acb1 --- /dev/null +++ b/osrs/src/main/java/class521.java @@ -0,0 +1,81 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@ObfuscatedName("uq") +public class class521 extends DualNode { + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "[Ltr;" + ) + class517[] field4142; + @ObfuscatedName("ao") + List field4141; + + @ObfuscatedSignature( + descriptor = "(Lom;I)V" + ) + public class521(AbstractArchive var1, int var2) { + byte[] var3 = var1.takeFile(var2, 0); + this.method2541(new Buffer(var3)); + } + + @ObfuscatedSignature( + descriptor = "(Lom;II)V" + ) + public class521(AbstractArchive var1, int var2, int var3) { + byte[] var4 = var1.takeFile(var2, var3 + 1); + this.method2541(new Buffer(var4)); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lul;I)V", + garbageValue = "677675313" + ) + void method2541(Buffer var1) { + int var2 = var1.packBytesToInt(); + this.field4142 = new class517[var2]; + this.field4141 = new ArrayList(var2); + + for (int var3 = 0; var3 < var2; ++var3) { + this.field4142[var3] = (class517)SequenceDefinition.findEnumerated(class517.method2528(), var1.readUnsignedByte()); + int var4 = var1.packBytesToInt(); + HashMap var5 = new HashMap(var4); + + while (var4-- > 0) { + Object var6 = this.field4142[var3].method2532(var1); + int var7 = var1.packBytesToInt(); + ArrayList var8 = new ArrayList(); + + while (var7-- > 0) { + int var9 = var1.packBytesToInt(); + var8.add(var9); + } + + var5.put(var6, var8); + } + + this.field4141.add(var3, var5); + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;II)Ljava/util/List;", + garbageValue = "17353223" + ) + public List method2542(Object var1, int var2) { + if (var2 < 0) { + var2 = 0; + } + + Map var3 = (Map)this.field4141.get(var2); + return (List)var3.get(var1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class523.java b/osrs/src/main/java/class523.java index bde25889f..860fecef3 100644 --- a/osrs/src/main/java/class523.java +++ b/osrs/src/main/java/class523.java @@ -1,42 +1,14 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ud") +@ObfuscatedName("uu") public class class523 { - @ObfuscatedName("au") - public final int field4216; - @ObfuscatedName("ae") - public Object field4215; - - public class523(int var1) { - this.field4216 = var1; - } - - public class523(int var1, Object var2) { - this.field4216 = var1; - this.field4215 = var2; - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - return super.hashCode(); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (!(var1 instanceof class523)) { - return false; - } else { - class523 var2 = (class523)var1; - if (var2.field4215 == null && this.field4215 != null) { - return false; - } else if (this.field4215 == null && var2.field4215 != null) { - return false; - } else { - return var2.field4216 == this.field4216 && var2.field4215.equals(this.field4215); - } - } + @ObfuscatedName("ak") + static final int field4148; + @ObfuscatedName("ax") + static final int field4149; + + static { + field4148 = (int)(Math.pow(2.0D, 4.0D) - 1.0D); + field4149 = (int)(Math.pow(2.0D, 8.0D) - 1.0D); } } \ No newline at end of file diff --git a/osrs/src/main/java/class525.java b/osrs/src/main/java/class525.java new file mode 100644 index 000000000..5cd85763f --- /dev/null +++ b/osrs/src/main/java/class525.java @@ -0,0 +1,192 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("um") +public enum class525 implements class386 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4150(1), + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4154(2), + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4153(4), + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4157(8), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4168(16), + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4165(32), + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4171(64, true), + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4162(128), + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4155(256, true), + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4175(512), + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4152(1024), + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4161(2048), + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4169(4096), + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4177(8192), + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4172(16384), + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4167(32768), + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4156(65536), + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4174(131072), + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4166(262144), + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4163(524288), + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4176(1048576), + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4170(2097152), + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4178(4194304), + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4173(8388608), + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4164(16777216), + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4151(33554432), + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4179(67108864, true), + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4160(134217728), + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4181(268435456), + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4158(536870912, true), + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4159(1073741824, true), + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lum;" + ) + field4180(Integer.MIN_VALUE); + + @ObfuscatedName("ba") + final int field4182; + + class525(int var3) { + this.field4182 = var3; + } + + @ObfuscatedSignature( + descriptor = "(IZ)V", + garbageValue = "1" + ) + class525(int var3, boolean var4) { + this.field4182 = var3; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1243971674" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4182; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class529.java b/osrs/src/main/java/class529.java deleted file mode 100644 index b8d084cc8..000000000 --- a/osrs/src/main/java/class529.java +++ /dev/null @@ -1,15 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("uf") -public class class529 { - @ObfuscatedName("au") - @Export("SpriteBuffer_spriteCount") - static int SpriteBuffer_spriteCount; - @ObfuscatedName("ae") - @Export("SpriteBuffer_spriteWidth") - static int SpriteBuffer_spriteWidth; - @ObfuscatedName("at") - @Export("SpriteBuffer_xOffsets") - static int[] SpriteBuffer_xOffsets; -} \ No newline at end of file diff --git a/osrs/src/main/java/class53.java b/osrs/src/main/java/class53.java index 1db51ccff..d48bedb73 100644 --- a/osrs/src/main/java/class53.java +++ b/osrs/src/main/java/class53.java @@ -2,58 +2,61 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; -import java.util.Iterator; - -@ObfuscatedName("cf") +@ObfuscatedName("cu") public class class53 extends Node { - @ObfuscatedName("au") + @ObfuscatedName("ry") + @ObfuscatedSignature( + descriptor = "Ltx;" + ) + @Export("Widget_cachedFonts") + static class512 Widget_cachedFonts; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lbj;" ) - class47 field261; + class47 field260; public class53() { - this.field261 = null; + this.field260 = null; } @ObfuscatedSignature( - descriptor = "(Lcm;)V" + descriptor = "(Lcw;)V" ) class53(VorbisSample var1) { if (var1 != null) { - this.field261 = new class47(var1, (RawSound)null); + this.field260 = new class47(var1, (RawSound)null); } } @ObfuscatedSignature( - descriptor = "(Lbu;)V" + descriptor = "(Lbs;)V" ) public class53(RawSound var1) { - this.field261 = new class47((VorbisSample)null, var1); + this.field260 = new class47((VorbisSample)null, var1); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "6" + descriptor = "(I)Z", + garbageValue = "-1320640993" ) - public boolean method289() { - return this.field261 == null; + public boolean method298() { + return this.field260 == null; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Lbu;", - garbageValue = "2082518533" + descriptor = "(I)Lbs;", + garbageValue = "248890116" ) - public RawSound method290() { - if (this.field261 != null && this.field261.field231.tryLock()) { + public RawSound method299() { + if (this.field260 != null && this.field260.field229.tryLock()) { RawSound var1; try { - var1 = this.method293(); + var1 = this.method301(); } finally { - this.field261.field231.unlock(); + this.field260.field229.unlock(); } return var1; @@ -62,20 +65,20 @@ public RawSound method290() { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Lbu;", - garbageValue = "2121230840" + descriptor = "(I)Lbs;", + garbageValue = "-262816062" ) - public RawSound method292() { - if (this.field261 != null) { - this.field261.field231.lock(); + public RawSound method300() { + if (this.field260 != null) { + this.field260.field229.lock(); RawSound var1; try { - var1 = this.method293(); + var1 = this.method301(); } finally { - this.field261.field231.unlock(); + this.field260.field229.unlock(); } return var1; @@ -84,412 +87,120 @@ public RawSound method292() { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)Lbu;", - garbageValue = "-565305963" + descriptor = "(I)Lbs;", + garbageValue = "1547022770" ) - RawSound method293() { - if (this.field261.field229 == null) { - this.field261.field229 = this.field261.field230.toRawSound((int[])null); - this.field261.field230 = null; + RawSound method301() { + if (this.field260.field227 == null) { + this.field260.field227 = this.field260.field228.toRawSound((int[])null); + this.field260.field228 = null; } - return this.field261.field229; + return this.field260.field227; } - @ObfuscatedName("ae") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljava/util/ArrayList;IIIIZI)V", - garbageValue = "-1757242477" + descriptor = "(B)Lcv;", + garbageValue = "-111" ) - public static void method291(ArrayList var0, int var1, int var2, int var3, int var4, boolean var5) { - if (!var0.isEmpty()) { - class305.field2774.clear(); - class305.field2771.clear(); - class200.method1009(var5); - class270.method1536(var0, var5); - if (!class305.field2774.isEmpty()) { - class270.method1537(var1, var2, var3, var4); - class305.field2771.add(new AddRequestTask((SongTask)null)); - class305.field2771.add(new class408((SongTask)null, class305.field2777, class305.field2775, class305.field2776)); - ArrayList var6 = new ArrayList(); - var6.add(new class403(new FadeInTask((SongTask)null, 0, true, class305.field2768))); - if (!class305.musicSongs.isEmpty()) { - ArrayList var7 = new ArrayList(); - var7.add(new DelayFadeTask(new ConcurrentMidiTask((SongTask)null, var6), class305.field2769)); - ArrayList var9 = new ArrayList(); - Iterator var10 = class305.musicSongs.iterator(); - - while (var10.hasNext()) { - MusicSong var11 = (MusicSong)var10.next(); - var9.add(var11); - } - - var7.add(new DelayFadeTask(new FadeOutTask(new class401((SongTask)null, var9), 0, false, class305.field2766), class305.musicPlayerStatus)); - class305.field2771.add(new ConcurrentMidiTask((SongTask)null, var7)); - } else { - class305.field2771.add(new DelayFadeTask((SongTask)null, class305.field2769)); - class305.field2771.add(new ConcurrentMidiTask((SongTask)null, var6)); - } - - } - } + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return DevicePcmPlayerProvider.getNextWorldListWorld(); } - @ObfuscatedName("az") + @ObfuscatedName("jd") @ObfuscatedSignature( - descriptor = "(Lto;ILdf;II)V", - garbageValue = "-2132656914" + descriptor = "(IIIIZI)V", + garbageValue = "1325251796" ) - static final void method294(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = MoveSpeed.STATIONARY.speed; - int var5; - if ((var3 & 8) != 0) { - var5 = var0.readUnsignedByte(); - byte[] var6 = new byte[var5]; - Buffer var7 = new Buffer(var6); - var0.method2601(var6, 0, var5); - Players.cachedAppearanceBuffer[var1] = var7; - var2.read(var7); - } - - int var8; - int var9; - int var16; - int var17; - if ((var3 & 65536) != 0) { - var5 = var0.readUnsignedByte(); - - for (var16 = 0; var16 < var5; ++var16) { - var17 = var0.readUnsignedByteAdd(); - var8 = var0.method2587(); - var9 = var0.readInt(); - var2.updateSpotAnimation(var17, var8, var9 >> 16, var9 & 65535); - } + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { + var2 = 1; } - if ((var3 & 64) != 0) { - var2.movingOrientation = var0.method2587(); - if (var2.pathLength == 0) { - var2.orientation = var2.movingOrientation; - var2.method521(); - } + if (var3 < 1) { + var3 = 1; } - if ((var3 & 16) != 0) { - var2.targetIndex = var0.method2587(); - var2.targetIndex += var0.readUnsignedByteAdd() << 16; - var5 = 16777215; - if (var2.targetIndex == var5) { - var2.targetIndex = -1; - } + int var5 = var3 - 334; + int var6; + if (var5 < 0) { + var6 = Client.field634; + } else if (var5 >= 100) { + var6 = Client.field633; + } else { + var6 = (Client.field633 - Client.field634) * var5 / 100 + Client.field634; } - int var10; - int var11; - if ((var3 & 4096) != 0) { - var5 = var0.method2587(); - var16 = var5 >> 8; - var17 = var16 >= 13 && var16 <= 20 ? var16 - 12 : 0; - PlayerType var18 = (PlayerType)KeyHandler.findEnumerated(MidiPcmStream.PlayerType_values(), var0.readUnsignedByteAdd()); - boolean var24 = var0.readUnsignedByte() == 1; - var10 = var0.readUnsignedByteNeg(); - var11 = var0.offset; - if (var2.username != null && var2.appearance != null) { - boolean var12 = false; - if (var18.isUser && class299.friendSystem.isIgnored(var2.username)) { - var12 = true; - } - - if (!var12 && Client.field486 == 0 && !var2.isHidden) { - Players.field1121.offset = 0; - var0.method2601(Players.field1121.array, 0, var10); - Players.field1121.offset = 0; - String var13 = AbstractFont.escapeBrackets(World.method385(DirectByteArrayCopier.readString(Players.field1121))); - var2.overheadText = var13.trim(); - var2.field995 = var5 >> 8; - var2.field996 = var5 & 255; - var2.overheadTextCyclesRemaining = 150; - byte[] var14 = null; - int var15; - if (var17 > 0 && var17 <= 8) { - var14 = new byte[var17]; - - for (var15 = 0; var15 < var17; ++var15) { - var14[var15] = var0.readSignedByteSub(); - } - } - - var2.field1028 = class164.method863(var14); - var2.isAutoChatting = var24; - var2.showPublicPlayerChat = var2 != VarbitComposition.localPlayer && var18.isUser && !Client.field602.isEmpty() && var13.toLowerCase().indexOf(Client.field602) == -1; - if (var18.isPrivileged) { - var15 = var24 ? 91 : 1; - } else { - var15 = var24 ? 90 : 2; - } - - if (var18.modIcon != -1) { - MouseHandler.addGameMessage(var15, Tile.addImageTag(var18.modIcon) + var2.username.getName(), var13); - } else { - MouseHandler.addGameMessage(var15, var2.username.getName(), var13); - } + int var7 = var3 * var6 * 512 / (var2 * 334); + int var8; + int var9; + short var18; + if (var7 < Client.field638) { + var18 = Client.field638; + var6 = var18 * var2 * 334 / (var3 * 512); + if (var6 > Client.field640) { + var6 = Client.field640; + var8 = var3 * var6 * 512 / (var18 * 334); + var9 = (var2 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); } - } - - var0.offset = var17 + var10 + var11; - } - int var26; - if ((var3 & 32) != 0) { - var5 = var0.readUnsignedShortLE(); - PlayerType var21 = (PlayerType)KeyHandler.findEnumerated(MidiPcmStream.PlayerType_values(), var0.readUnsignedByteNeg()); - boolean var27 = var0.readUnsignedByteNeg() == 1; - var8 = var0.readUnsignedByte(); - var9 = var0.offset; - if (var2.username != null && var2.appearance != null) { - boolean var25 = false; - if (var21.isUser && class299.friendSystem.isIgnored(var2.username)) { - var25 = true; + var0 += var9; + var2 -= var9 * 2; + } + } else if (var7 > Client.field635) { + var18 = Client.field635; + var6 = var18 * var2 * 334 / (var3 * 512); + if (var6 < Client.field639) { + var6 = Client.field639; + var8 = var18 * var2 * 334 / (var6 * 512); + var9 = (var3 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); } - if (!var25 && Client.field486 == 0 && !var2.isHidden) { - Players.field1121.offset = 0; - var0.method2601(Players.field1121.array, 0, var8); - Players.field1121.offset = 0; - String var19 = AbstractFont.escapeBrackets(World.method385(DirectByteArrayCopier.readString(Players.field1121))); - var2.overheadText = var19.trim(); - var2.field995 = var5 >> 8; - var2.field996 = var5 & 255; - var2.overheadTextCyclesRemaining = 150; - var2.field1028 = null; - var2.isAutoChatting = var27; - var2.showPublicPlayerChat = var2 != VarbitComposition.localPlayer && var21.isUser && !Client.field602.isEmpty() && var19.toLowerCase().indexOf(Client.field602) == -1; - if (var21.isPrivileged) { - var26 = var27 ? 91 : 1; - } else { - var26 = var27 ? 90 : 2; - } - - if (var21.modIcon != -1) { - MouseHandler.addGameMessage(var26, Tile.addImageTag(var21.modIcon) + var2.username.getName(), var19); - } else { - MouseHandler.addGameMessage(var26, var2.username.getName(), var19); - } - } + var1 += var9; + var3 -= var9 * 2; } - - var0.offset = var8 + var9; } - if ((var3 & 4) != 0) { - var5 = var0.readUnsignedByte(); - if (var5 > 0) { - for (var16 = 0; var16 < var5; ++var16) { - var8 = -1; - var9 = -1; - var10 = -1; - var17 = var0.readUShortSmart(); - if (var17 == 32767) { - var17 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var8 = var0.readUShortSmart(); - var10 = var0.readUShortSmart(); - } else if (var17 != 32766) { - var9 = var0.readUShortSmart(); - } else { - var17 = -1; - } + Client.viewportZoom = var3 * var6 / 334; + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + int[] var17 = new int[9]; - var11 = var0.readUShortSmart(); - var2.addHitSplat(var17, var9, var8, var10, Client.cycle, var11); + for (var9 = 0; var9 < var17.length; ++var9) { + int var10 = var9 * 32 + 15 + 128; + int var11 = var10 * 3 + 600; + int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; + int var15 = var3 - 334; + if (var15 < 0) { + var15 = 0; + } else if (var15 > 100) { + var15 = 100; } - } - var16 = var0.readUnsignedByte(); - if (var16 > 0) { - for (var17 = 0; var17 < var16; ++var17) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var11 = var0.readUnsignedByteAdd(); - var26 = var9 > 0 ? var0.readUnsignedByte() : var11; - var2.addHealthBar(var8, Client.cycle, var9, var10, var11, var26); - } else { - var2.removeHealthBar(var8); - } - } + int var16 = (Client.zoomWidth - Client.zoomHeight) * var15 / 100 + Client.zoomHeight; + int var14 = var16 * var11 / 256; + var17[var9] = var13 * var14 >> 16; } - } - - if ((var3 & 512) != 0) { - var2.field1004 = var0.readSignedByteSub(); - var2.field1001 = var0.readByteAdd(); - var2.field1002 = var0.readByte(); - var2.field1014 = var0.readByte(); - var2.spotAnimation = var0.readUnsignedShortLE() + Client.cycle; - var2.exactMoveArrive1Cycle = var0.readUnsignedShortLE() + Client.cycle; - var2.exactMoveDirection = var0.method2587(); - if (var2.hasMovementPending) { - var2.field1004 += var2.tileX; - var2.field1001 += var2.tileY; - var2.field1002 += var2.tileX; - var2.field1014 += var2.tileY; - var2.pathLength = 0; - } else { - var2.field1004 += var2.pathX[0]; - var2.field1001 += var2.pathY[0]; - var2.field1002 += var2.pathX[0]; - var2.field1014 += var2.pathY[0]; - var2.pathLength = 1; - } - - var2.field1022 = 0; - } - if ((var3 & 2048) != 0) { - MoveSpeed[] var20 = Players.playerMovementSpeeds; - MoveSpeed[] var23 = new MoveSpeed[]{MoveSpeed.STATIONARY, MoveSpeed.CRAWL, MoveSpeed.RUN, MoveSpeed.WALK}; - var20[var1] = (MoveSpeed)KeyHandler.findEnumerated(var23, var0.readByte()); + Scene.Scene_buildVisiblityMap(var17, 500, 800, var2 * 334 / var3, 334); } - if ((var3 & 128) != 0) { - var2.overheadText = var0.readStringCp1252NullTerminated(); - if (var2.overheadText.charAt(0) == '~') { - var2.overheadText = var2.overheadText.substring(1); - MouseHandler.addGameMessage(2, var2.username.getName(), var2.overheadText); - } else if (var2 == VarbitComposition.localPlayer) { - MouseHandler.addGameMessage(2, var2.username.getName(), var2.overheadText); - } - - var2.isAutoChatting = false; - var2.field995 = 0; - var2.field996 = 0; - var2.overheadTextCyclesRemaining = 150; - } - - if ((var3 & 16384) != 0) { - var2.recolourStartCycle = Client.cycle + var0.readIntME(); - var2.recolourEndCycle = Client.cycle + var0.readIntME(); - var2.recolourHue = var0.readSignedByteSub(); - var2.recolourSaturation = var0.readByteNeg(); - var2.recolourLuminance = var0.readByteAdd(); - var2.recolourAmount = (byte)var0.readUnsignedByteNeg(); - } - - if ((var3 & 8192) != 0) { - for (var5 = 0; var5 < 3; ++var5) { - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 1024) != 0) { - var4 = var0.readByte(); - } - - if ((var3 & 2) != 0) { - var5 = var0.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - var16 = var0.readUnsignedByteAdd(); - LoginType.performPlayerAnimation(var2, var5, var16); - } - - if (var2.hasMovementPending) { - if (var4 == 127) { - var2.resetPath(var2.tileX, var2.tileY); - } else { - MoveSpeed var28; - if (var4 != MoveSpeed.STATIONARY.speed) { - MoveSpeed[] var22 = new MoveSpeed[]{MoveSpeed.STATIONARY, MoveSpeed.CRAWL, MoveSpeed.RUN, MoveSpeed.WALK}; - var28 = (MoveSpeed)KeyHandler.findEnumerated(var22, var4); - } else { - var28 = Players.playerMovementSpeeds[var1]; - } - - var2.move(var2.tileX, var2.tileY, var28); - } - } - - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-28" - ) - static void method296() { - if (class125.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "-1225390547" - ) - static int method297(int var0, Script var1, boolean var2) { - return 2; - } - - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "959381861" - ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); - int var2 = var1.readUnsignedByte(); - int var3 = var1.readInt(); - if (var3 >= 0 && (AbstractArchive.maximumContainerSize == 0 || var3 <= AbstractArchive.maximumContainerSize)) { - if (var2 == 0) { - byte[] var4 = new byte[var3]; - var1.readBytes(var4, 0, var3); - return var4; - } else { - int var6 = var1.readInt(); - if (var6 < 0 || AbstractArchive.maximumContainerSize != 0 && var6 > AbstractArchive.maximumContainerSize) { - throw new RuntimeException(); - } else { - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } - - return var5; - } - } - } else { - throw new RuntimeException(); - } - } - - @ObfuscatedName("ld") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "709896940" - ) - static final boolean method298(int var0) { - if (var0 < 0) { - return false; - } else { - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; - } - - return var1 == 1007; - } + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; } } \ No newline at end of file diff --git a/osrs/src/main/java/class530.java b/osrs/src/main/java/class530.java new file mode 100644 index 000000000..aa65b6dd4 --- /dev/null +++ b/osrs/src/main/java/class530.java @@ -0,0 +1,85 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("up") +public class class530 { + @ObfuscatedName("ac") + int[] field4190; + @ObfuscatedName("al") + short[] field4191; + + @ObfuscatedSignature( + descriptor = "(Lhw;)V" + ) + public class530(NPCComposition var1) { + this.field4190 = new int[8]; + this.field4191 = new short[8]; + int var2 = 0; + if (var1.method1018()) { + var2 = var1.method1019().length; + System.arraycopy(var1.method1019(), 0, this.field4190, 0, var2); + System.arraycopy(var1.method1021(), 0, this.field4191, 0, var2); + } + + for (int var3 = var2; var3 < 8; ++var3) { + this.field4190[var3] = -1; + this.field4191[var3] = -1; + } + + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "-1994168844" + ) + public int[] method2639() { + return this.field4190; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)[S", + garbageValue = "-2141879918" + ) + public short[] method2640() { + return this.field4191; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(IISB)V", + garbageValue = "44" + ) + public void method2641(int var1, int var2, short var3) { + this.field4190[var1] = var2; + this.field4191[var1] = var3; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "([I[SI)V", + garbageValue = "-616052812" + ) + public void method2642(int[] var1, short[] var2) { + this.field4190 = var1; + this.field4191 = var2; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "-47" + ) + static final int method2643(int var0, int var1) { + int var2 = class432.method2193(45365 + var0, 91923 + var1, 4) - 128 + (class432.method2193(10294 + var0, 37821 + var1, 2) - 128 >> 1) + (class432.method2193(var0, var1, 1) - 128 >> 2); + var2 = (int)(0.3D * (double)var2) + 35; + if (var2 < 10) { + var2 = 10; + } else if (var2 > 60) { + var2 = 60; + } + + return var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class532.java b/osrs/src/main/java/class532.java deleted file mode 100644 index d6509d0c5..000000000 --- a/osrs/src/main/java/class532.java +++ /dev/null @@ -1,132 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("uo") -public class class532 { - @ObfuscatedName("ae") - int field4262; - @ObfuscatedName("ao") - int field4266; - @ObfuscatedName("at") - int field4269; - @ObfuscatedName("ac") - int field4260; - @ObfuscatedName("ai") - int field4263; - @ObfuscatedName("az") - int field4270; - @ObfuscatedName("ap") - int field4267; - @ObfuscatedName("aa") - int field4259; - @ObfuscatedName("af") - boolean field4258; - @ObfuscatedName("ad") - int field4261; - @ObfuscatedName("aq") - int field4268; - @ObfuscatedName("al") - int field4264; - @ObfuscatedName("an") - int field4265; - - public class532() { - this.field4267 = 0; - this.field4259 = 0; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIZB)V", - garbageValue = "115" - ) - public void method2694(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, boolean var9) { - this.field4262 = var1; - this.field4266 = var2; - this.field4269 = var3; - this.field4260 = var4; - this.field4263 = var5; - this.field4270 = var6; - this.field4267 = var7; - this.field4259 = var8; - this.field4258 = var9; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1659604987" - ) - public void method2695(int var1, int var2, int var3, int var4) { - this.field4261 = var1; - this.field4268 = var2; - this.field4264 = var3; - this.field4265 = var4; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Lpj;Lpi;B)V", - garbageValue = "-101" - ) - public void method2696(class394 var1, Font var2) { - if (var2 != null) { - int var3 = var2.ascent; - int var4 = Math.min(this.field4260, (int)((float)var3 * 0.9F)); - int var5 = var1.method2069(this.field4269); - int var6 = var1.method2070(this.field4260); - int var7 = var5 + (this.field4262 - this.field4263); - int var8 = var6 + var3 + (this.field4266 - this.field4270); - Rasterizer2D.Rasterizer2D_setClip(this.field4262, this.field4266, this.field4262 + this.field4269, this.field4260 + this.field4266); - int var9 = this.field4259; - int var10 = this.field4267; - if (var9 > var10) { - int var11 = var9; - var9 = var10; - var10 = var11; - } - - class398 var21 = var1.method2049(0, var9); - class398 var12 = var1.method2049(var9, var10); - class398 var13 = var1.method2049(var10, var1.method2040()); - class398 var14 = var1.method2049(0, this.field4267); - int var16; - int var18; - if (!var12.method2115()) { - int var15 = var2.maxAscent + var2.maxDescent; - - for (var16 = 0; var16 < var12.method2116(); ++var16) { - class396 var17 = var12.method2120(var16); - var18 = var7 + var17.field3681; - int var19 = var2.charWidth(var17.field3680); - int var20 = var8 + var17.field3682 - var3; - Rasterizer2D.Rasterizer2D_fillRectangle(var18, var20, var19, var15, this.field4265); - } - } - - if (!var21.method2115()) { - var2.method2094(var21, var7, var8, this.field4261, this.field4268, -1); - } - - if (!var12.method2115()) { - var2.method2094(var12, var7, var8, this.field4264, this.field4268, -1); - } - - if (!var13.method2115()) { - var2.method2094(var13, var7, var8, this.field4261, this.field4268, -1); - } - - if (this.field4258) { - class485 var22 = var14.method2119(); - var16 = var7 + (Integer)var22.field4049; - int var23 = var8 + (Integer)var22.field4048; - var18 = var23 - var4; - Rasterizer2D.Rasterizer2D_drawLine(var16, var23, var16, var18, this.field4261); - if (this.field4268 != -1) { - Rasterizer2D.Rasterizer2D_drawLine(var16 + 1, var23 + 1, var16 + 1, var18 + 1, this.field4268); - } - } - - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class533.java b/osrs/src/main/java/class533.java new file mode 100644 index 000000000..bf26cec81 --- /dev/null +++ b/osrs/src/main/java/class533.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("uk") +public interface class533 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lul;B)V" + ) + void method2652(Buffer var1); +} \ No newline at end of file diff --git a/osrs/src/main/java/class534.java b/osrs/src/main/java/class534.java new file mode 100644 index 000000000..dcdc40716 --- /dev/null +++ b/osrs/src/main/java/class534.java @@ -0,0 +1,80 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("uh") +public class class534 implements class386 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Luh;" + ) + public static final class534 field4231; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Luh;" + ) + public static final class534 field4232; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Luh;" + ) + static final class534 field4235; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Luh;" + ) + static final class534 field4237; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Luh;" + ) + static final class534 field4236; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Luh;" + ) + static final class534 field4234; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lun;" + ) + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("ar") + final int field4239; + @ObfuscatedName("ab") + final int field4238; + + static { + field4231 = new class534(5, 0); + field4232 = new class534(2, 2); + field4235 = new class534(1, 5); + field4237 = new class534(3, 6); + field4236 = new class534(4, 7); + field4234 = new class534(0, 8); + } + + class534(int var1, int var2) { + this.field4239 = var1; + this.field4238 = var2; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1243971674" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4238; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "91579028" + ) + public boolean method2654() { + return this == field4232; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class522.java b/osrs/src/main/java/class537.java similarity index 59% rename from osrs/src/main/java/class522.java rename to osrs/src/main/java/class537.java index 352169b3a..88e768cc3 100644 --- a/osrs/src/main/java/class522.java +++ b/osrs/src/main/java/class537.java @@ -2,12 +2,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uu") -public interface class522 { - @ObfuscatedName("ao") +@ObfuscatedName("uv") +public interface class537 { + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "22" + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-123056323" ) @Export("vmethod8697") Object vmethod8697(int var1); diff --git a/osrs/src/main/java/class538.java b/osrs/src/main/java/class538.java index 8d9eda082..1b103e854 100644 --- a/osrs/src/main/java/class538.java +++ b/osrs/src/main/java/class538.java @@ -1,11 +1,104 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("uv") +@ObfuscatedName("ut") public class class538 { - @ObfuscatedName("au") - static final int[] field4284; + @ObfuscatedName("ac") + public final int field4243; + @ObfuscatedName("al") + public Object field4242; - static { - field4284 = new int[]{16777215, 14942979, 16747520, 16772352, 32806, 2375822, 7547266, 16720268, 11884176, 5261772, 10724259, 13970688, 15693351, 16577588, 494960, 2208255, 10178454, 16756679, 13722276, 8105443, 16751190, 2543274, 7591918, 10246609, 10021057, 11894492, 2894892, 9699842, 6371605, 13680896, 4882723, 14504, 8388736, 14025328, 10682978, 4004472}; + public class538(int var1) { + this.field4243 = var1; + } + + public class538(int var1, Object var2) { + this.field4243 = var1; + this.field4242 = var2; + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + return super.hashCode(); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (!(var1 instanceof class538)) { + return false; + } else { + class538 var2 = (class538)var1; + if (var2.field4242 == null && this.field4242 != null) { + return false; + } else if (this.field4242 == null && var2.field4242 != null) { + return false; + } else { + return var2.field4243 == this.field4243 && var2.field4242.equals(this.field4242); + } + } + } + + @ObfuscatedName("ac") + public static final int method2658(double var0, double var2, double var4) { + double var6 = var4; + double var8 = var4; + double var10 = var4; + if (0.0D != var2) { + double var12; + if (var4 < 0.5D) { + var12 = var4 * (1.0D + var2); + } else { + var12 = var2 + var4 - var4 * var2; + } + + double var14 = var4 * 2.0D - var12; + double var16 = var0 + 0.3333333333333333D; + if (var16 > 1.0D) { + --var16; + } + + double var20 = var0 - 0.3333333333333333D; + if (var20 < 0.0D) { + ++var20; + } + + if (6.0D * var16 < 1.0D) { + var6 = var16 * 6.0D * (var12 - var14) + var14; + } else if (2.0D * var16 < 1.0D) { + var6 = var12; + } else if (var16 * 3.0D < 2.0D) { + var6 = (0.6666666666666666D - var16) * (var12 - var14) * 6.0D + var14; + } else { + var6 = var14; + } + + if (6.0D * var0 < 1.0D) { + var8 = var0 * (var12 - var14) * 6.0D + var14; + } else if (var0 * 2.0D < 1.0D) { + var8 = var12; + } else if (var0 * 3.0D < 2.0D) { + var8 = var14 + (0.6666666666666666D - var0) * (var12 - var14) * 6.0D; + } else { + var8 = var14; + } + + if (6.0D * var20 < 1.0D) { + var10 = var14 + var20 * 6.0D * (var12 - var14); + } else if (2.0D * var20 < 1.0D) { + var10 = var12; + } else if (var20 * 3.0D < 2.0D) { + var10 = var14 + (var12 - var14) * (0.6666666666666666D - var20) * 6.0D; + } else { + var10 = var14; + } + } + + int var22 = (int)(256.0D * var6); + int var13 = (int)(var8 * 256.0D); + int var23 = (int)(var10 * 256.0D); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; } } \ No newline at end of file diff --git a/osrs/src/main/java/class541.java b/osrs/src/main/java/class541.java new file mode 100644 index 000000000..914843535 --- /dev/null +++ b/osrs/src/main/java/class541.java @@ -0,0 +1,43 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("uf") +public enum class541 implements class386 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Luf;" + ) + @Export("SOLID") + SOLID(0, 0), + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Luf;" + ) + field4258(1, 1), + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Luf;" + ) + field4257(2, 2); + + @ObfuscatedName("ax") + public final int field4260; + @ObfuscatedName("ao") + final int field4259; + + class541(int var3, int var4) { + this.field4260 = var3; + this.field4259 = var4; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1243971674" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4259; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class544.java b/osrs/src/main/java/class544.java new file mode 100644 index 000000000..c81bd3572 --- /dev/null +++ b/osrs/src/main/java/class544.java @@ -0,0 +1,18 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ue") +public class class544 { + @ObfuscatedName("ac") + @Export("SpriteBuffer_spriteCount") + public static int SpriteBuffer_spriteCount; + @ObfuscatedName("ar") + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Ldd;" + ) + static LoginScreenAnimation field4278; +} \ No newline at end of file diff --git a/osrs/src/main/java/class547.java b/osrs/src/main/java/class547.java new file mode 100644 index 000000000..b40022a6d --- /dev/null +++ b/osrs/src/main/java/class547.java @@ -0,0 +1,132 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("vz") +public class class547 { + @ObfuscatedName("al") + int field4291; + @ObfuscatedName("ak") + int field4290; + @ObfuscatedName("ax") + int field4296; + @ObfuscatedName("ao") + int field4293; + @ObfuscatedName("ah") + int field4289; + @ObfuscatedName("ar") + int field4295; + @ObfuscatedName("ab") + int field4287; + @ObfuscatedName("am") + int field4292; + @ObfuscatedName("av") + boolean field4285; + @ObfuscatedName("ag") + int field4288; + @ObfuscatedName("aa") + int field4286; + @ObfuscatedName("ap") + int field4294; + @ObfuscatedName("ay") + int field4297; + + public class547() { + this.field4287 = 0; + this.field4292 = 0; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIZI)V", + garbageValue = "-1556835629" + ) + public void method2734(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, boolean var9) { + this.field4291 = var1; + this.field4290 = var2; + this.field4296 = var3; + this.field4293 = var4; + this.field4289 = var5; + this.field4295 = var6; + this.field4287 = var7; + this.field4292 = var8; + this.field4285 = var9; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "826854600" + ) + public void method2735(int var1, int var2, int var3, int var4) { + this.field4288 = var1; + this.field4286 = var2; + this.field4294 = var3; + this.field4297 = var4; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Lpp;Lpu;B)V", + garbageValue = "0" + ) + public void method2736(class409 var1, Font var2) { + if (var2 != null) { + int var3 = var2.ascent; + int var4 = Math.min(this.field4293, (int)(0.9F * (float)var3)); + int var5 = var1.method2097(this.field4296); + int var6 = var1.method2098(this.field4293); + int var7 = var5 + (this.field4291 - this.field4289); + int var8 = var6 + var3 + (this.field4290 - this.field4295); + Rasterizer2D.Rasterizer2D_setClip(this.field4291, this.field4290, this.field4296 + this.field4291, this.field4293 + this.field4290); + int var9 = this.field4292; + int var10 = this.field4287; + if (var9 > var10) { + int var11 = var9; + var9 = var10; + var10 = var11; + } + + class413 var21 = var1.method2078(0, var9); + class413 var12 = var1.method2078(var9, var10); + class413 var13 = var1.method2078(var10, var1.method2069()); + class413 var14 = var1.method2078(0, this.field4287); + int var16; + int var18; + if (!var12.method2147()) { + int var15 = var2.maxAscent + var2.maxDescent; + + for (var16 = 0; var16 < var12.method2148(); ++var16) { + class411 var17 = var12.method2152(var16); + var18 = var7 + var17.field3715; + int var19 = var2.charWidth(var17.field3713); + int var20 = var8 + var17.field3714 - var3; + Rasterizer2D.Rasterizer2D_fillRectangle(var18, var20, var19, var15, this.field4297); + } + } + + if (!var21.method2147()) { + var2.method2126(var21, var7, var8, this.field4288, this.field4286, -1); + } + + if (!var12.method2147()) { + var2.method2126(var12, var7, var8, this.field4294, this.field4286, -1); + } + + if (!var13.method2147()) { + var2.method2126(var13, var7, var8, this.field4288, this.field4286, -1); + } + + if (this.field4285) { + class500 var22 = var14.method2151(); + var16 = var7 + (Integer)var22.field4079; + int var23 = var8 + (Integer)var22.field4080; + var18 = var23 - var4; + Rasterizer2D.Rasterizer2D_drawLine(var16, var23, var16, var18, this.field4288); + if (this.field4286 != -1) { + Rasterizer2D.Rasterizer2D_drawLine(var16 + 1, var23 + 1, var16 + 1, var18 + 1, this.field4286); + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class553.java b/osrs/src/main/java/class553.java new file mode 100644 index 000000000..1e1be1934 --- /dev/null +++ b/osrs/src/main/java/class553.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("vj") +public class class553 { + @ObfuscatedName("ac") + public static final int[] field4311; + + static { + field4311 = new int[]{16777215, 14942979, 16747520, 16772352, 32806, 2375822, 7547266, 16720268, 11884176, 5261772, 10724259, 13970688, 15693351, 16577588, 494960, 2208255, 10178454, 16756679, 13722276, 8105443, 16751190, 2543274, 7591918, 10246609, 10021057, 11894492, 2894892, 9699842, 6371605, 13680896, 4882723, 14504, 8388736, 14025328, 10682978, 4004472}; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class59.java b/osrs/src/main/java/class59.java index 60e879070..30fb9aeaf 100644 --- a/osrs/src/main/java/class59.java +++ b/osrs/src/main/java/class59.java @@ -2,59 +2,59 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("cy") public class class59 { - @ObfuscatedName("fd") + @ObfuscatedName("wn") @ObfuscatedSignature( - descriptor = "Lqi;" + descriptor = "Loo;" ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("jt") - @ObfuscatedSignature( - descriptor = "Lpi;" - ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("js") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("au") + static JagNetThread field309; + @ObfuscatedName("ah") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("af") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("cz") + static String field307; + @ObfuscatedName("hp") + static String field308; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lbo;" + descriptor = "Lbc;" ) - VorbisFloor field311; - @ObfuscatedName("ae") - boolean field312; - @ObfuscatedName("ao") + VorbisFloor field310; + @ObfuscatedName("al") + boolean field311; + @ObfuscatedName("ak") + int[] field313; + @ObfuscatedName("ax") int[] field314; - @ObfuscatedName("at") - int[] field315; - @ObfuscatedName("ac") - boolean[] field313; + @ObfuscatedName("ao") + boolean[] field312; @ObfuscatedSignature( - descriptor = "(Lbo;Z[I[I[Z)V" + descriptor = "(Lbc;Z[I[I[Z)V" ) class59(VorbisFloor var1, boolean var2, int[] var3, int[] var4, boolean[] var5) { - this.field311 = var1; - this.field312 = var2; - this.field314 = var3; - this.field315 = var4; - this.field313 = var5; + this.field310 = var1; + this.field311 = var2; + this.field313 = var3; + this.field314 = var4; + this.field312 = var5; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([FIB)V", - garbageValue = "44" + descriptor = "([FII)V", + garbageValue = "2130530034" ) - void method321(float[] var1, int var2) { - int var3 = this.field311.field176.length; - VorbisFloor var10000 = this.field311; - int var4 = VorbisFloor.field172[this.field311.multiplier - 1]; - boolean[] var5 = this.field313; - this.field313[1] = true; + void method324(float[] var1, int var2) { + int var3 = this.field310.field175.length; + VorbisFloor var10000 = this.field310; + int var4 = VorbisFloor.field171[this.field310.multiplier - 1]; + boolean[] var5 = this.field312; + this.field312[1] = true; var5[0] = true; int var6; @@ -63,37 +63,37 @@ void method321(float[] var1, int var2) { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { - var7 = this.field311.method192(this.field314, var6); - var8 = this.field311.method193(this.field314, var6); - var9 = this.field311.method194(this.field314[var7], this.field315[var7], this.field314[var8], this.field315[var8], this.field314[var6]); - var10 = this.field315[var6]; + var7 = this.field310.method202(this.field313, var6); + var8 = this.field310.method203(this.field313, var6); + var9 = this.field310.method204(this.field313[var7], this.field314[var7], this.field313[var8], this.field314[var8], this.field313[var6]); + var10 = this.field314[var6]; int var11 = var4 - var9; int var13 = (var11 < var9 ? var11 : var9) << 1; if (var10 != 0) { - boolean[] var14 = this.field313; - this.field313[var8] = true; + boolean[] var14 = this.field312; + this.field312[var8] = true; var14[var7] = true; - this.field313[var6] = true; + this.field312[var6] = true; if (var10 >= var13) { - this.field315[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + this.field314[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - this.field315[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + this.field314[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - this.field313[var6] = false; - this.field315[var6] = var9; + this.field312[var6] = false; + this.field314[var6] = var9; } } this.VarbisFloor_sort(0, var3 - 1); var6 = 0; - var7 = this.field311.multiplier * this.field315[0]; + var7 = this.field310.multiplier * this.field314[0]; for (var8 = 1; var8 < var3; ++var8) { - if (this.field313[var8]) { - var9 = this.field314[var8]; - var10 = this.field311.multiplier * this.field315[var8]; - this.field311.method195(var6, var7, var9, var10, var1, var2); + if (this.field312[var8]) { + var9 = this.field313[var8]; + var10 = this.field310.multiplier * this.field314[var8]; + this.field310.method205(var6, var7, var9, var10, var1, var2); if (var9 >= var2) { return; } @@ -103,7 +103,7 @@ void method321(float[] var1, int var2) { } } - var10000 = this.field311; + var10000 = this.field310; float var16 = VorbisFloor.VorbisFloor_decibelStatics[var7]; for (var9 = var6; var9 < var2; ++var9) { @@ -112,66 +112,46 @@ void method321(float[] var1, int var2) { } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "81" + descriptor = "(I)Z", + garbageValue = "467756903" ) - boolean method322() { - return this.field312; + boolean method325() { + return this.field311; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1743044108" + garbageValue = "2030001337" ) @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { int var3 = var1; - int var4 = this.field314[var1]; - int var5 = this.field315[var1]; - boolean var6 = this.field313[var1]; + int var4 = this.field313[var1]; + int var5 = this.field314[var1]; + boolean var6 = this.field312[var1]; for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = this.field314[var7]; + int var8 = this.field313[var7]; if (var8 < var4) { - this.field314[var3] = var8; - this.field315[var3] = this.field315[var7]; - this.field313[var3] = this.field313[var7]; + this.field313[var3] = var8; + this.field314[var3] = this.field314[var7]; + this.field312[var3] = this.field312[var7]; ++var3; - this.field314[var7] = this.field314[var3]; - this.field315[var7] = this.field315[var3]; this.field313[var7] = this.field313[var3]; + this.field314[var7] = this.field314[var3]; + this.field312[var7] = this.field312[var3]; } } - this.field314[var3] = var4; - this.field315[var3] = var5; - this.field313[var3] = var6; + this.field313[var3] = var4; + this.field314[var3] = var5; + this.field312[var3] = var6; this.VarbisFloor_sort(var1, var3 - 1); this.VarbisFloor_sort(var3 + 1, var2); } } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(CLon;B)I", - garbageValue = "82" - ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { - var0 = Character.toLowerCase(var0); - var2 = (var0 << 4) + 1; - } - - if (var0 == 241 && var1 == Language.Language_ES) { - var2 = 1762; - } - - return var2; - } } \ No newline at end of file diff --git a/osrs/src/main/java/class6.java b/osrs/src/main/java/class6.java index eba6bf3f8..ed3b73e6a 100644 --- a/osrs/src/main/java/class6.java +++ b/osrs/src/main/java/class6.java @@ -2,166 +2,690 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") -public enum class6 implements class371 { - @ObfuscatedName("au") +@ObfuscatedName("ar") +public enum class6 implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lar;" ) - field6(0, 0); + field4(0, 0); - @ObfuscatedName("wi") - @ObfuscatedSignature( - descriptor = "Lru;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("ae") - public final int field8; - @ObfuscatedName("ao") - final int field7; + @ObfuscatedName("al") + public final int field6; + @ObfuscatedName("ak") + final int field5; class6(int var3, int var4) { - this.field8 = var3; - this.field7 = var4; + this.field6 = var3; + this.field5 = var4; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field7; + return this.field5; } - @ObfuscatedName("bn") + @ObfuscatedName("il") @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "1893076970" + descriptor = "(Ldi;II)V", + garbageValue = "1987002078" ) - static int method12(int var0, Script var1, boolean var2) { - return 2; - } + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + int var2; + int var3; + int var4; + int var5; + int var7; + SequenceDefinition var11; + if (var0.spotAnimation >= Client.cycle) { + var2 = Math.max(1, var0.spotAnimation - Client.cycle); + var3 = var0.field971 * 64 + var0.field1016 * 128; + var4 = var0.field971 * 64 + var0.field1013 * 128; + var0.x += (var3 - var0.x) / var2; + var0.y += (var4 - var0.y) / var2; + var0.field1024 = 0; + var0.orientation = var0.exactMoveDirection; + } else if (var0.exactMoveArrive1Cycle >= Client.cycle) { + JagexCache.method918(var0); + } else { + var0.movementSequence = var0.idleSequence; + if (var0.pathLength == 0) { + var0.field1024 = 0; + } else { + label554: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var11 = class36.SequenceDefinition_get(var0.sequence); + if (var0.field1023 > 0 && var11.precedenceAnimating == 0) { + ++var0.field1024; + break label554; + } - @ObfuscatedName("ne") - @ObfuscatedSignature( - descriptor = "(Lmi;IIIB)V", - garbageValue = "32" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - class301.method1622(); - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); - if (Client.minimapState != 2 && Client.minimapState != 5) { - int var5 = Client.camAngleY & 2047; - int var6 = VarbitComposition.localPlayer.x / 32 + 48; - int var7 = 464 - VarbitComposition.localPlayer.y / 32; - AbstractUserComparator.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); - - int var8; - int var9; - int var10; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { - var9 = Client.mapIconXs[var8] * 4 + 2 - VarbitComposition.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - VarbitComposition.localPlayer.y / 32; - class210.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { - for (var9 = 0; var9 < 104; ++var9) { - NodeDeque var14 = Client.groundItems[HealthBar.Client_plane][var8][var9]; - if (var14 != null) { - var11 = var8 * 4 + 2 - VarbitComposition.localPlayer.x / 32; - var12 = var9 * 4 + 2 - VarbitComposition.localPlayer.y / 32; - class210.drawSpriteOnMinimap(var1, var2, var11, var12, FloorOverlayDefinition.mapDotSprites[0], var4); + if (var0.field1023 <= 0 && var11.priority == 0) { + ++var0.field1024; + break label554; } } - } - for (var8 = 0; var8 < Client.npcCount; ++var8) { - NPC var15 = Client.npcs[Client.npcIndices[var8]]; - if (var15 != null && var15.isVisible()) { - NPCComposition var17 = var15.definition; - if (var17 != null && var17.transforms != null) { - var17 = var17.transform(); + var2 = var0.x; + var3 = var0.y; + var4 = var0.field971 * 64 + var0.pathX[var0.pathLength - 1] * 128; + var5 = var0.field971 * 64 + var0.pathY[var0.pathLength - 1] * 128; + if (var2 < var4) { + if (var3 < var5) { + var0.orientation = 1280; + } else if (var3 > var5) { + var0.orientation = 1792; + } else { + var0.orientation = 1536; + } + } else if (var2 > var4) { + if (var3 < var5) { + var0.orientation = 768; + } else if (var3 > var5) { + var0.orientation = 256; + } else { + var0.orientation = 512; + } + } else if (var3 < var5) { + var0.orientation = 1024; + } else if (var3 > var5) { + var0.orientation = 0; + } + + MoveSpeed var6 = var0.pathTraversed[var0.pathLength - 1]; + if (var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { + var7 = var0.orientation - var0.rotation & 2047; + if (var7 > 1024) { + var7 -= 2048; + } + + int var8 = var0.walkBackSequence; + if (var7 >= -256 && var7 <= 256) { + var8 = var0.walkSequence; + } else if (var7 >= 256 && var7 < 768) { + var8 = var0.walkRightSequence; + } else if (var7 >= -768 && var7 <= -256) { + var8 = var0.walkLeftSequence; + } + + if (var8 == -1) { + var8 = var0.walkSequence; + } + + var0.movementSequence = var8; + int var9 = 4; + boolean var10 = true; + if (var0 instanceof NPC) { + var10 = ((NPC)var0).definition.isClickable; + } + + if (var10) { + if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1020 != 0) { + var9 = 2; + } + + if (var0.pathLength > 2) { + var9 = 6; + } + + if (var0.pathLength > 3) { + var9 = 8; + } + + if (var0.field1024 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field1024; + } + } else { + if (var0.pathLength > 1) { + var9 = 6; + } + + if (var0.pathLength > 2) { + var9 = 8; + } + + if (var0.field1024 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field1024; + } + } + + if (var6 == MoveSpeed.RUN) { + var9 <<= 1; + } else if (var6 == MoveSpeed.CRAWL) { + var9 >>= 1; + } + + if (var9 >= 8) { + if (var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; + } else if (var0.walkBackSequence == var0.movementSequence && var0.runBackSequence != -1) { + var0.movementSequence = var0.runBackSequence; + } else if (var0.walkLeftSequence == var0.movementSequence && var0.runLeftSequence != -1) { + var0.movementSequence = var0.runLeftSequence; + } else if (var0.movementSequence == var0.walkRightSequence && var0.runRightSequence != -1) { + var0.movementSequence = var0.runRightSequence; + } + } else if (var9 <= 2) { + if (var0.walkSequence == var0.movementSequence && var0.crawlSequence != -1) { + var0.movementSequence = var0.crawlSequence; + } else if (var0.movementSequence == var0.walkBackSequence && var0.crawlBackSequence != -1) { + var0.movementSequence = var0.crawlBackSequence; + } else if (var0.walkLeftSequence == var0.movementSequence && var0.crawlLeftSequence != -1) { + var0.movementSequence = var0.crawlLeftSequence; + } else if (var0.movementSequence == var0.walkRightSequence && var0.crawlRightSequence != -1) { + var0.movementSequence = var0.crawlRightSequence; + } + } + + if (var4 != var2 || var3 != var5) { + if (var2 < var4) { + var0.x += var9; + if (var0.x > var4) { + var0.x = var4; + } + } else if (var2 > var4) { + var0.x -= var9; + if (var0.x < var4) { + var0.x = var4; + } + } + + if (var3 < var5) { + var0.y += var9; + if (var0.y > var5) { + var0.y = var5; + } + } else if (var3 > var5) { + var0.y -= var9; + if (var0.y < var5) { + var0.y = var5; + } + } } - if (var17 != null && var17.drawMapDot && var17.isInteractable) { - var11 = var15.x / 32 - VarbitComposition.localPlayer.x / 32; - var12 = var15.y / 32 - VarbitComposition.localPlayer.y / 32; - class210.drawSpriteOnMinimap(var1, var2, var11, var12, FloorOverlayDefinition.mapDotSprites[1], var4); + if (var4 == var0.x && var5 == var0.y) { + --var0.pathLength; + if (var0.field1023 > 0) { + --var0.field1023; + } + } + } else { + var0.x = var4; + var0.y = var5; + --var0.pathLength; + if (var0.field1023 > 0) { + --var0.field1023; } } } + } + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = 0; + var0.exactMoveArrive1Cycle = 0; + var0.method519(); + var0.x = var0.field971 * 64 + var0.pathX[0] * 128; + var0.y = var0.pathY[0] * 128 + var0.field971 * 64; + var0.method512(); + } + + if (TextureProvider.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = 0; + var0.exactMoveArrive1Cycle = 0; + var0.method519(); + var0.x = var0.field971 * 64 + var0.pathX[0] * 128; + var0.y = var0.pathY[0] * 128 + var0.field971 * 64; + var0.method512(); + } + + if (var0.targetIndex != -1) { + var11 = null; + var3 = 65536; + Object var18; + if (var0.targetIndex < var3) { + var18 = Client.npcs[var0.targetIndex]; + } else { + var18 = Client.players[var0.targetIndex - var3]; + } + + if (var18 != null) { + var4 = var0.x - ((Actor)var18).x; + var5 = var0.y - ((Actor)var18).y; + if (var4 != 0 || var5 != 0) { + var7 = (int)(Math.atan2((double)var4, (double)var5) * 325.94932345220167D) & 2047; + var0.orientation = var7; + } + } else if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + } + + int var12; + if (var0.pathLength == 0 || var0.field1024 > 0) { + var2 = -1; + if (var0.field995 != -1 && var0.field996 != -1) { + var3 = var0.field995 * 128 - class20.baseX * 128 + 64; + var4 = var0.field996 * 128 - class19.baseY * 128 + 64; + var5 = var0.x - var3; + var12 = var0.y - var4; + if (var5 != 0 || var12 != 0) { + var7 = (int)(Math.atan2((double)var5, (double)var12) * 325.94932345220167D) & 2047; + var2 = var7; + } + } else if (var0.movingOrientation != -1) { + var2 = var0.movingOrientation; + } + + if (var2 != -1) { + var0.orientation = var2; + if (var0.field964) { + var0.rotation = var0.orientation; + } + } + + var0.method521(); + } + + var2 = var0.orientation - var0.rotation & 2047; + if (var2 != 0) { + boolean var16 = true; + boolean var17 = true; + ++var0.field1004; + var5 = var2 > 1024 ? -1 : 1; + var0.rotation += var0.field1020 * var5; + boolean var19 = true; + if (var2 < var0.field1020 || var2 > 2048 - var0.field1020) { + var0.rotation = var0.orientation; + var19 = false; + } + + if (var0.field1020 > 0 && var0.movementSequence == var0.idleSequence && (var0.field1004 > 25 || var19)) { + if (var5 == -1 && var0.turnLeftSequence != -1) { + var0.movementSequence = var0.turnLeftSequence; + } else if (var5 == 1 && var0.turnRightSequence != -1) { + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + + var0.rotation &= 2047; + } else { + if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + + var0.field1004 = 0; + } + + var0.isWalking = false; + if (var0.movementSequence != -1) { + var11 = class36.SequenceDefinition_get(var0.movementSequence); + if (var11 != null) { + if (!var11.isCachedModelIdSet() && var11.frameIds != null) { + ++var0.movementFrameCycle; + if (var0.movementFrame < var11.frameIds.length && var0.movementFrameCycle > var11.frameLengths[var0.movementFrame]) { + var0.movementFrameCycle = 1; + ++var0.movementFrame; + FontName.method2481(var11, var0.movementFrame, var0.x, var0.y); + } - var8 = Players.Players_count; - int[] var18 = Players.Players_indices; - - for (var10 = 0; var10 < var8; ++var10) { - Player var16 = Client.players[var18[var10]]; - if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != VarbitComposition.localPlayer) { - var12 = var16.x / 32 - VarbitComposition.localPlayer.x / 32; - int var13 = var16.y / 32 - VarbitComposition.localPlayer.y / 32; - if (var16.isFriend()) { - class210.drawSpriteOnMinimap(var1, var2, var12, var13, FloorOverlayDefinition.mapDotSprites[3], var4); - } else if (VarbitComposition.localPlayer.team != 0 && var16.team != 0 && var16.team == VarbitComposition.localPlayer.team) { - class210.drawSpriteOnMinimap(var1, var2, var12, var13, FloorOverlayDefinition.mapDotSprites[4], var4); - } else if (var16.isFriendsChatMember()) { - class210.drawSpriteOnMinimap(var1, var2, var12, var13, FloorOverlayDefinition.mapDotSprites[5], var4); - } else if (var16.isClanMember()) { - class210.drawSpriteOnMinimap(var1, var2, var12, var13, FloorOverlayDefinition.mapDotSprites[6], var4); + if (var0.movementFrame >= var11.frameIds.length) { + if (var11.frameCount > 0) { + var0.movementFrame -= var11.frameCount; + if (var11.field1849) { + ++var0.field993; + } + + if (var0.movementFrame < 0 || var0.movementFrame >= var11.frameIds.length || var11.field1849 && var0.field993 >= var11.iterations) { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + var0.field993 = 0; + } } else { - class210.drawSpriteOnMinimap(var1, var2, var12, var13, FloorOverlayDefinition.mapDotSprites[2], var4); + var0.movementFrameCycle = 0; + var0.movementFrame = 0; } + + FontName.method2481(var11, var0.movementFrame, var0.x, var0.y); } + } else if (var11.isCachedModelIdSet()) { + ++var0.movementFrame; + var3 = var11.method1127(); + if (var0.movementFrame < var3) { + ModeWhere.method2013(var11, var0.movementFrame, var0.x, var0.y); + } else { + if (var11.frameCount > 0) { + var0.movementFrame -= var11.frameCount; + if (var11.field1849) { + ++var0.field993; + } + + if (var0.movementFrame < 0 || var0.movementFrame >= var3 || var11.field1849 && var0.field993 >= var11.iterations) { + var0.movementFrame = 0; + var0.movementFrameCycle = 0; + var0.field993 = 0; + } + } else { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + } + + ModeWhere.method2013(var11, var0.movementFrame, var0.x, var0.y); + } + } else { + var0.movementSequence = -1; } + } else { + var0.movementSequence = -1; + } + } + + IterableNodeHashTableIterator var20 = new IterableNodeHashTableIterator(var0.method518()); + + for (SpotAnimation var14 = (SpotAnimation)var20.method2484(); var14 != null; var14 = (SpotAnimation)var20.next()) { + if (var14.field4304 != -1 && Client.cycle >= var14.field4308) { + var4 = class406.SpotAnimationDefinition_get(var14.field4304).sequence; + if (var4 == -1) { + var14.remove(); + --var0.field1007; + } else { + var14.field4306 = Math.max(var14.field4306, 0); + SequenceDefinition var15 = class36.SequenceDefinition_get(var4); + if (var15.frameIds != null && !var15.isCachedModelIdSet()) { + ++var14.field4305; + if (var14.field4306 < var15.frameIds.length && var14.field4305 > var15.frameLengths[var14.field4306]) { + var14.field4305 = 1; + ++var14.field4306; + FontName.method2481(var15, var14.field4306, var0.x, var0.y); + } - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { - NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; - if (var19 != null) { - var11 = var19.x / 32 - VarbitComposition.localPlayer.x / 32; - var12 = var19.y / 32 - VarbitComposition.localPlayer.y / 32; - class408.worldToMinimap(var1, var2, var11, var12, Message.mapMarkerSprites[1], var4); + if (var14.field4306 >= var15.frameIds.length) { + var14.remove(); + --var0.field1007; } + } else if (var15.isCachedModelIdSet()) { + ++var14.field4306; + var12 = var15.method1127(); + if (var14.field4306 < var12) { + ModeWhere.method2013(var15, var14.field4306, var0.x, var0.y); + } else { + var14.remove(); + --var0.field1007; + } + } else { + var14.remove(); + --var0.field1007; + } + } + } + } + + SequenceDefinition var21; + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { + var21 = class36.SequenceDefinition_get(var0.sequence); + if (var21.precedenceAnimating == 1 && var0.field1023 > 0 && var0.spotAnimation <= Client.cycle && var0.exactMoveArrive1Cycle < Client.cycle) { + var0.sequenceDelay = 1; + return; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var21 = class36.SequenceDefinition_get(var0.sequence); + if (var21 == null) { + var0.sequence = -1; + } else if (!var21.isCachedModelIdSet() && var21.frameIds != null) { + ++var0.sequenceFrameCycle; + if (var0.sequenceFrame < var21.frameIds.length && var0.sequenceFrameCycle > var21.frameLengths[var0.sequenceFrame]) { + var0.sequenceFrameCycle = 1; + ++var0.sequenceFrame; + FontName.method2481(var21, var0.sequenceFrame, var0.x, var0.y); + } + + if (var0.sequenceFrame >= var21.frameIds.length) { + var0.sequenceFrame -= var21.frameCount; + ++var0.currentSequenceFrameIndex; + if (var0.currentSequenceFrameIndex >= var21.iterations) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var21.frameIds.length) { + FontName.method2481(var21, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequence = -1; } + } - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - UrlRequester.baseX * 4 + 2 - VarbitComposition.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - class47.baseY * 4 + 2 - VarbitComposition.localPlayer.y / 32; - class408.worldToMinimap(var1, var2, var10, var11, Message.mapMarkerSprites[1], var4); + var0.isWalking = var21.stretches; + } else if (var21.isCachedModelIdSet()) { + ++var0.sequenceFrame; + var4 = var21.method1127(); + if (var0.sequenceFrame < var4) { + ModeWhere.method2013(var21, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequenceFrame -= var21.frameCount; + ++var0.currentSequenceFrameIndex; + if (var0.currentSequenceFrameIndex >= var21.iterations) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var4) { + ModeWhere.method2013(var21, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequence = -1; } + } + } else { + var0.sequence = -1; + } + } - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { - Player var20 = Client.players[Client.hintArrowPlayerIndex]; - if (var20 != null) { - var11 = var20.x / 32 - VarbitComposition.localPlayer.x / 32; - var12 = var20.y / 32 - VarbitComposition.localPlayer.y / 32; - class408.worldToMinimap(var1, var2, var11, var12, Message.mapMarkerSprites[1], var4); - } + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; + } + + } + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "569925847" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = class10.scene.getBoundaryObjectTag(var0, var1, var2); + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (var5 != 0L) { + var7 = class10.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + if (class372.method1929(var5)) { + var10 = var4; + } + + int[] var11 = SpriteMask.sceneMinimapSprite.pixels; + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; + var13 = SecureRandomFuture.Entity_unpackID(var5); + ObjectComposition var14 = class91.getObjectDefinition(var13); + if (var14.mapSceneId != -1) { + IndexedSprite var15 = KitDefinition.mapSceneSprites[var14.mapSceneId]; + if (var15 != null) { + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; + var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); + } + } else { + if (var9 == 0 || var9 == 2) { + if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 1) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; } } - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - VarbitComposition.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - VarbitComposition.localPlayer.y / 32; - class210.drawSpriteOnMinimap(var1, var2, var10, var11, Message.mapMarkerSprites[0], var4); + if (var9 == 3) { + if (var8 == 0) { + var11[var12] = var10; + } else if (var8 == 1) { + var11[var12 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var11[var12 + 1536] = var10; + } + } + + if (var9 == 2) { + if (var8 == 3) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 1) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; + } + } + } + } + + var5 = class10.scene.getGameObjectTag(var0, var1, var2); + if (var5 != 0L) { + var7 = class10.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = SecureRandomFuture.Entity_unpackID(var5); + ObjectComposition var24 = class91.getObjectDefinition(var10); + int var19; + if (var24.mapSceneId != -1) { + IndexedSprite var18 = KitDefinition.mapSceneSprites[var24.mapSceneId]; + if (var18 != null) { + var13 = (var24.sizeX * 4 - var18.subWidth) / 2; + var19 = (var24.sizeY * 4 - var18.subHeight) / 2; + var18.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); + } + } else if (var9 == 9) { + var12 = 15658734; + if (class372.method1929(var5)) { + var12 = 15597568; + } + + int[] var20 = SpriteMask.sceneMinimapSprite.pixels; + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; + if (var8 != 0 && var8 != 2) { + var20[var19] = var12; + var20[var19 + 1 + 512] = var12; + var20[var19 + 1024 + 2] = var12; + var20[var19 + 1536 + 3] = var12; + } else { + var20[var19 + 1536] = var12; + var20[var19 + 1 + 1024] = var12; + var20[var19 + 512 + 2] = var12; + var20[var19 + 3] = var12; } + } + } - if (!VarbitComposition.localPlayer.isHidden) { - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + var5 = class10.scene.getFloorDecorationTag(var0, var1, var2); + if (0L != var5) { + var7 = SecureRandomFuture.Entity_unpackID(var5); + ObjectComposition var21 = class91.getObjectDefinition(var7); + if (var21.mapSceneId != -1) { + IndexedSprite var22 = KitDefinition.mapSceneSprites[var21.mapSceneId]; + if (var22 != null) { + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; + int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; + var22.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); } + } + } + + } + + @ObfuscatedName("no") + @ObfuscatedSignature( + descriptor = "(Lnm;I)V", + garbageValue = "-2045006615" + ) + static final void method16(Widget var0) { + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field548 == -1) { + Client.field548 = var0.spriteId2; + Client.field549 = var0.spriteId; + } + + if (Client.playerAppearance.field2950 == 1) { + var0.spriteId2 = Client.field548; + } else { + var0.spriteId2 = Client.field549; + } + + } else if (var1 == 325) { + if (Client.field548 == -1) { + Client.field548 = var0.spriteId2; + Client.field549 = var0.spriteId; + } + + if (Client.playerAppearance.field2950 == 1) { + var0.spriteId2 = Client.field549; } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + var0.spriteId2 = Client.field548; } - Client.field408[var3] = true; + } else if (var1 == 327) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 0; + } else if (var1 == 328) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 1; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class60.java b/osrs/src/main/java/class60.java index 39dbfd5d4..b26ee1bf4 100644 --- a/osrs/src/main/java/class60.java +++ b/osrs/src/main/java/class60.java @@ -1,81 +1,79 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("cz") public class class60 { - @ObfuscatedName("au") - byte[] field316; - @ObfuscatedName("ae") + @ObfuscatedName("ac") + byte[] field315; + @ObfuscatedName("al") int field317; - @ObfuscatedName("ao") - int field318; + @ObfuscatedName("ak") + int field316; class60() { - this.field316 = null; + this.field315 = null; this.field317 = 0; - this.field318 = 0; + this.field316 = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-62" + descriptor = "(II)I", + garbageValue = "1668070165" ) - int method325(int var1) { + int method327(int var1) { int var2 = 0; int var3; int var4; - for (var3 = 0; var1 >= 8 - this.field318; var1 -= var4) { - var4 = 8 - this.field318; + for (var3 = 0; var1 >= 8 - this.field316; var1 -= var4) { + var4 = 8 - this.field316; int var5 = (1 << var4) - 1; - var2 += (this.field316[this.field317] >> this.field318 & var5) << var3; - this.field318 = 0; + var2 += (this.field315[this.field317] >> this.field316 & var5) << var3; + this.field316 = 0; ++this.field317; var3 += var4; } if (var1 > 0) { var4 = (1 << var1) - 1; - var2 += (this.field316[this.field317] >> this.field318 & var4) << var3; - this.field318 += var1; + var2 += (this.field315[this.field317] >> this.field316 & var4) << var3; + this.field316 += var1; } return var2; } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-36" + descriptor = "(I)I", + garbageValue = "-1671970145" ) - int method326() { - int var1 = this.field316[this.field317] >> this.field318 & 1; - ++this.field318; - this.field317 += this.field318 >> 3; - this.field318 &= 7; + int method328() { + int var1 = this.field315[this.field317] >> this.field316 & 1; + ++this.field316; + this.field317 += this.field316 >> 3; + this.field316 &= 7; return var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "([BII)V", - garbageValue = "1812215657" + descriptor = "([BIS)V", + garbageValue = "-20687" ) - void method327(byte[] var1, int var2) { - this.field316 = var1; + void method329(byte[] var1, int var2) { + this.field315 = var1; this.field317 = var2; - this.field318 = 0; + this.field316 = 0; } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IZI)Ljava/lang/String;", - garbageValue = "-1921565351" + descriptor = "(IB)Z", + garbageValue = "1" ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - return var1 && var0 >= 0 ? class102.method605(var0, 10, var1) : Integer.toString(var0); + public static boolean method330(int var0) { + return var0 >= WorldMapDecorationType.field3150.id && var0 <= WorldMapDecorationType.field3153.id || var0 == WorldMapDecorationType.field3152.id; } } \ No newline at end of file diff --git a/osrs/src/main/java/class64.java b/osrs/src/main/java/class64.java new file mode 100644 index 000000000..cc6bf29d3 --- /dev/null +++ b/osrs/src/main/java/class64.java @@ -0,0 +1,88 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.concurrent.ThreadFactory; + +@ObfuscatedName("ck") +class class64 implements ThreadFactory { + @ObfuscatedName("ow") + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lclient;" + ) + final Client this$0; + + @ObfuscatedSignature( + descriptor = "(Lclient;)V" + ) + class64(Client var1) { + this.this$0 = var1; + } + + public Thread newThread(Runnable var1) { + return new Thread(var1, "OSRS Maya Anim Load"); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Lcv;Lcv;IZB)I", + garbageValue = "37" + ) + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { + int var4 = var0.population; + int var5 = var1.population; + if (!var3) { + if (var4 == -1) { + var4 = 2001; + } + + if (var5 == -1) { + var5 = 2001; + } + } + + return var4 - var5; + } else if (var2 == 2) { + return var0.location - var1.location; + } else if (var2 == 3) { + if (var0.activity.equals("-")) { + if (var1.activity.equals("-")) { + return 0; + } else { + return var3 ? -1 : 1; + } + } else if (var1.activity.equals("-")) { + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); + } + } else if (var2 == 4) { + return var0.method392() ? (var1.method392() ? 0 : 1) : (var1.method392() ? -1 : 0); + } else if (var2 == 5) { + return var0.method390() ? (var1.method390() ? 0 : 1) : (var1.method390() ? -1 : 0); + } else if (var2 == 6) { + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2137865647" + ) + static final int method336() { + return ViewportMouse.ViewportMouse_x; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class7.java b/osrs/src/main/java/class7.java index 712bc1d36..d84919071 100644 --- a/osrs/src/main/java/class7.java +++ b/osrs/src/main/java/class7.java @@ -1,86 +1,145 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -@ObfuscatedName("ap") +@ObfuscatedName("ab") public class class7 { - @ObfuscatedName("aq") - static int field9; - @ObfuscatedName("au") - ExecutorService field10; - @ObfuscatedName("ae") - Future field11; - @ObfuscatedName("ao") + @ObfuscatedName("ac") + ExecutorService field7; + @ObfuscatedName("al") + Future field8; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Ltm;" + descriptor = "Lul;" ) - final Buffer field13; - @ObfuscatedName("at") + final Buffer field10; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lat;" + descriptor = "Lax;" ) - final class3 field12; + final class3 field9; @ObfuscatedSignature( - descriptor = "(Ltm;Lat;)V" + descriptor = "(Lul;Lax;)V" ) public class7(Buffer var1, class3 var2) { - this.field10 = Executors.newSingleThreadExecutor(); - this.field13 = var1; - this.field12 = var2; - this.method17(); + this.field7 = Executors.newSingleThreadExecutor(); + this.field10 = var1; + this.field9 = var2; + this.method21(); } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1836441256" + descriptor = "(B)Z", + garbageValue = "8" ) - public boolean method14() { - return this.field11.isDone(); + public boolean method17() { + return this.field8.isDone(); } - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2092027940" + descriptor = "(B)V", + garbageValue = "40" ) - public void method15() { - this.field10.shutdown(); - this.field10 = null; + public void method18() { + this.field7.shutdown(); + this.field7 = null; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)Ltm;", - garbageValue = "-120" + descriptor = "(I)Lul;", + garbageValue = "1362565755" ) - public Buffer method16() { + public Buffer method19() { try { - return (Buffer)this.field11.get(); + return (Buffer)this.field8.get(); } catch (Exception var2) { return null; } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-691162885" + garbageValue = "-693034688" + ) + void method21() { + this.field8 = this.field7.submit(new class1(this, this.field10, this.field9)); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "-20434766" + ) + static long method20() { + try { + URL var0 = new URL(ScriptEvent.method474("services", false) + "m=accountappeal/login.ws"); + URLConnection var1 = var0.openConnection(); + var1.setRequestProperty("connection", "close"); + var1.setDoInput(true); + var1.setDoOutput(true); + var1.setConnectTimeout(5000); + OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); + var2.write("data1=req"); + var2.flush(); + InputStream var3 = var1.getInputStream(); + Buffer var4 = new Buffer(new byte[1000]); + + do { + int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); + if (var5 == -1) { + var4.offset = 0; + long var7 = var4.readLong(); + return var7; + } + + var4.offset += var5; + } while(var4.offset < 1000); + + return 0L; + } catch (Exception var9) { + return 0L; + } + } + + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1063387188" ) - void method17() { - this.field11 = this.field10.submit(new class1(this, this.field13, this.field12)); + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + CollisionMap.method1166(); + switch(var0) { + case 1: + GameEngine.method166(24); + AbstractWorldMapIcon.setLoginResponseString("", "You were disconnected from the server.", ""); + break; + case 2: + class339.method1746(); + } + } - @ObfuscatedName("iy") + @ObfuscatedName("jt") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" + descriptor = "(I)Lpf;", + garbageValue = "2097624965" ) - static final int method18(int var0) { - return Math.abs(var0 - UserComparator10.cameraYaw) > 1024 ? var0 + 2048 * (var0 < UserComparator10.cameraYaw ? 1 : -1) : var0; + @Export("getScriptEvents") + public static NodeDeque getScriptEvents() { + return Client.scriptEvents; } } \ No newline at end of file diff --git a/osrs/src/main/java/class72.java b/osrs/src/main/java/class72.java deleted file mode 100644 index ea0e33576..000000000 --- a/osrs/src/main/java/class72.java +++ /dev/null @@ -1,38 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.math.BigInteger; - -@ObfuscatedName("cj") -public class class72 { - @ObfuscatedName("ac") - static final BigInteger field731; - @ObfuscatedName("ai") - static final BigInteger field732; - @ObfuscatedName("cd") - static int field730; - - static { - field731 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field732 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); - } - - @ObfuscatedName("hh") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1604625566" - ) - static void method424() { - Client.compass = null; - class167.redHintArrowSprite = null; - class299.mapSceneSprites = null; - class178.headIconPkSprites = null; - class502.headIconPrayerSprites = null; - ArchiveLoader.headIconHintSprites = null; - Message.mapMarkerSprites = null; - class152.crossSprites = null; - FloorOverlayDefinition.mapDotSprites = null; - GrandExchangeOfferOwnWorldComparator.scrollBarSprites = null; - class451.field3876 = null; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class73.java b/osrs/src/main/java/class73.java new file mode 100644 index 000000000..2439f1e08 --- /dev/null +++ b/osrs/src/main/java/class73.java @@ -0,0 +1,145 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.concurrent.ThreadFactory; + +@ObfuscatedName("cd") +final class class73 implements ThreadFactory { + @Export("newThread") + @ObfuscatedName("newThread") + public Thread newThread(Runnable var1) { + return new Thread(var1, "OSRS Maya Anim Load"); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Lhz;", + garbageValue = "1119787820" + ) + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Lht;", + garbageValue = "-1308783411" + ) + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("hr") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2027765065" + ) + static final void method423() { + for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { + int var10002 = Client.queuedSoundEffectDelays[var0]--; + if (Client.queuedSoundEffectDelays[var0] >= -10) { + SoundEffect var9 = Client.soundEffects[var0]; + if (var9 == null) { + Object var10000 = null; + var9 = SoundEffect.readSoundEffect(class469.field3930, Client.soundEffectIds[var0], 0); + if (var9 == null) { + continue; + } + + int[] var12 = Client.queuedSoundEffectDelays; + var12[var0] += var9.calculateDelay(); + Client.soundEffects[var0] = var9; + } + + if (Client.queuedSoundEffectDelays[var0] < 0) { + int var2; + if (Client.soundLocations[var0] != 0) { + int var3 = (Client.soundLocations[var0] & 255) * 128; + int var4 = Client.soundLocations[var0] >> 16 & 255; + int var5 = var4 * 128 + 64 - TextureProvider.localPlayer.x; + if (var5 < 0) { + var5 = -var5; + } + + int var6 = Client.soundLocations[var0] >> 8 & 255; + int var7 = var6 * 128 + 64 - TextureProvider.localPlayer.y; + if (var7 < 0) { + var7 = -var7; + } + + int var8 = var5 + var7 - 128; + if (var8 > var3) { + Client.queuedSoundEffectDelays[var0] = -100; + continue; + } + + if (var8 < 0) { + var8 = 0; + } + + var2 = (var3 - var8) * class91.clientPreferences.getAreaSoundEffectsVolume() / var3; + } else { + var2 = class91.clientPreferences.getCurrentSoundEffectsVolume(); + } + + if (var2 > 0) { + RawSound var10 = var9.toRawSound().resample(class136.decimator); + RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); + var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); + class140.pcmStreamMixer.addSubStream(var11); + } + + Client.queuedSoundEffectDelays[var0] = -100; + } + } else { + --Client.soundEffectCount; + + for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { + Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; + Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; + Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; + Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; + Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; + } + + --var0; + } + } + + if (Client.playingJingle && !Strings.method1907()) { + if (class91.clientPreferences.getCurrentMusicVolume() != 0 && ScriptFrame.method334()) { + VarcInt.method975(CollisionMap.archive6, class91.clientPreferences.getCurrentMusicVolume()); + } + + Client.playingJingle = false; + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class74.java b/osrs/src/main/java/class74.java index ca28c2541..73462258a 100644 --- a/osrs/src/main/java/class74.java +++ b/osrs/src/main/java/class74.java @@ -1,24 +1,208 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import java.math.BigInteger; +import java.util.Iterator; @ObfuscatedName("ct") public class class74 { - @ObfuscatedName("au") - static final BigInteger field742; - @ObfuscatedName("ae") - static final BigInteger field741; - @ObfuscatedName("dg") + @ObfuscatedName("ao") + static final BigInteger field730; + @ObfuscatedName("ah") + static final BigInteger field729; + + static { + field730 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field729 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + } + + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lui;" + descriptor = "(IIIIB)I", + garbageValue = "-25" ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; + static final int method424(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; + } - static { - field742 = new BigInteger("10001", 16); - field741 = new BigInteger("9d65aa39691f5fadd6296eeee7726eab566ecc003adda321a1bf18f94cce90d5198fcdf30dca1deef73fa1deb8c1ed0731e3f4712b23ab9f180de4946043ea93a3fef2c0099f69c64d0be204a1415322032e6f60aca9aa2a420c696627b2ed49a7970bdfe1cdcf1446fa65530a3bb0b1573a3effc1086fa29016ff9cc35e8951", 16); + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "6345" + ) + public static void method425() { + DbRowType.DBRowType_cache.clear(); + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-970557765" + ) + static void method426() { + Iterator var0 = class319.musicSongs.iterator(); + + while (var0.hasNext()) { + MusicSong var1 = (MusicSong)var0.next(); + if (var1 != null) { + var1.midiPcmStream.clear(); + var1.midiPcmStream.method1666(); + var1.midiPcmStream.setPcmStreamVolume(0); + var1.midiPcmStream.field2833 = 0; + WorldMapDecorationType.method1897(var1.musicTrackGroupId, var1.musicTrackFileId); + } + } + + class319.musicSongs.clear(); + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "-1821439381" + ) + static int method427(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3903) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == 3904) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == 3905) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == 3906) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == 3907) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == 3908) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; + } else { + int var12; + if (var0 == 3910) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; + return 1; + } else if (var0 == 3911) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; + return 1; + } else if (var0 == 3912) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; + return 1; + } else if (var0 == 3913) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; + return 1; + } else { + boolean var13; + if (var0 == 3914) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Varps.grandExchangeEvents != null) { + Varps.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); + } + + return 1; + } else if (var0 == 3915) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Varps.grandExchangeEvents != null) { + Varps.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); + } + + return 1; + } else if (var0 == 3916) { + Interpreter.Interpreter_intStackSize -= 2; + var13 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + if (Varps.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; + Varps.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); + } + + return 1; + } else if (var0 == 3917) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Varps.grandExchangeEvents != null) { + Varps.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); + } + + return 1; + } else if (var0 == 3918) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Varps.grandExchangeEvents != null) { + Varps.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); + } + + return 1; + } else if (var0 == 3919) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.grandExchangeEvents == null ? 0 : Varps.grandExchangeEvents.events.size(); + return 1; + } else { + GrandExchangeEvent var11; + if (var0 == 3920) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.world; + return 1; + } else if (var0 == 3921) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var11.getOfferName(); + return 1; + } else if (var0 == 3922) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); + return 1; + } else if (var0 == 3923) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); + long var5 = GrandExchangeOfferTotalQuantityComparator.method1971() - class411.field3712 - var11.age; + int var7 = (int)(var5 / 3600000L); + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; + Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == 3924) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == 3925) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == 3926) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + return 1; + } else if (var0 == 3939) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).isTradable ? 1 : 0; + return 1; + } else { + return 2; + } + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class76.java b/osrs/src/main/java/class76.java new file mode 100644 index 000000000..66b461a11 --- /dev/null +++ b/osrs/src/main/java/class76.java @@ -0,0 +1,127 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.math.BigInteger; + +@ObfuscatedName("cl") +public class class76 { + @ObfuscatedName("ac") + static final BigInteger field738; + @ObfuscatedName("al") + static final BigInteger field739; + + static { + field738 = new BigInteger("10001", 16); + field739 = new BigInteger("cc90697b065845f69ec9f317c5c2120b275cdf1e7dbc83f9bd6f48b14bc9225b7400ccc4d6942e14ada8e923e99c75bfa6f001f0a92bdbf435c59a0e86120e2526ebdc45626349cbc249b24e878b5eb1a2ff432b56dafa8eb5a6282883286733f87bdb2e843f8848ec651045f7295208ea0627602d4352099e730d2b57905e95", 16); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1393359399" + ) + static void method430(int var0) { + class465.field3904 = var0; + class465.field3907 = new class465[var0]; + class465.field3905 = 0; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1583079321" + ) + public static int method431(int var0) { + return class317.field2775[var0]; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(ILds;ZB)I", + garbageValue = "0" + ) + static int method432(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else { + var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + } + + ClanChannelMember.invalidateWidget(var3); + int var4; + int var5; + if (var0 != 1200 && var0 != 1205 && var0 != 1212) { + if (var0 == 1201) { + var3.modelType = 2; + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == 1202) { + var3.modelType = 3; + var3.modelId = TextureProvider.localPlayer.appearance.getChatHeadId(); + return 1; + } else if (var0 == 1207) { + boolean var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Strings.method1908(var3, TextureProvider.localPlayer.appearance, var7); + return 1; + } else if (var0 == 1208) { + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3.field3127 == null) { + throw new RuntimeException(""); + } else { + ZoneOperation.method1645(var3, var4); + return 1; + } + } else if (var0 == 1209) { + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (var3.field3127 == null) { + throw new RuntimeException(""); + } else { + UrlRequest.method664(var3, var4, var5); + return 1; + } + } else if (var0 == 1210) { + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3.field3127 == null) { + throw new RuntimeException(""); + } else { + UrlRequester.method653(var3, TextureProvider.localPlayer.appearance.field2950, var4); + return 1; + } + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemComposition var6 = class214.ItemDefinition_get(var4); + var3.modelAngleX = var6.xan2d; + var3.modelAngleY = var6.yan2d; + var3.modelAngleZ = var6.zan2d; + var3.modelOffsetX = var6.offsetX2d; + var3.modelOffsetY = var6.offsetY2d; + var3.modelZoom = var6.zoom2d; + if (var0 == 1205) { + var3.itemQuantityMode = 0; + } else if (var0 == 1212 | 1 == var6.isStackable) { + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; + } + + if (var3.modelRotation > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.modelRotation; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class8.java b/osrs/src/main/java/class8.java index a5d2d6fd3..3d0794fc4 100644 --- a/osrs/src/main/java/class8.java +++ b/osrs/src/main/java/class8.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("am") public class class8 { - @ObfuscatedName("au") - final int field15; - @ObfuscatedName("ae") - final int field14; - @ObfuscatedName("ao") - final String field16; + @ObfuscatedName("ac") + final int field11; + @ObfuscatedName("al") + final int field12; + @ObfuscatedName("ak") + final String field13; @ObfuscatedSignature( - descriptor = "(Ltm;)V" + descriptor = "(Lul;)V" ) class8(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); } class8(int var1, int var2, String var3) { - this.field15 = var1; - this.field14 = var2; - this.field16 = var3; + this.field11 = var1; + this.field12 = var2; + this.field13 = var3; } - @ObfuscatedName("au") - String method19() { - return Integer.toHexString(this.field15) + Integer.toHexString(this.field14) + this.field16; + @ObfuscatedName("ac") + String method24() { + return Integer.toHexString(this.field11) + Integer.toHexString(this.field12) + this.field13; } - @ObfuscatedName("ae") - int method20() { - return this.field14; + @ObfuscatedName("al") + int method25() { + return this.field12; } } \ No newline at end of file diff --git a/osrs/src/main/java/class85.java b/osrs/src/main/java/class85.java deleted file mode 100644 index e1a3cfea7..000000000 --- a/osrs/src/main/java/class85.java +++ /dev/null @@ -1,127 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.awt.*; - -@ObfuscatedName("da") -public class class85 { - @ObfuscatedName("bk") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("dt") - @ObfuscatedSignature( - descriptor = "Luk;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "0" - ) - public static int method470(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var0; - } else if (var2 == 1) { - return var1; - } else { - return var2 == 2 ? 7 - var0 : 7 - var1; - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Lto;B)V", - garbageValue = "82" - ) - static final void method471(PacketBuffer var0) { - for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { - int var2 = Players.Players_pendingUpdateIndices[var1]; - Player var3 = Client.players[var2]; - int var4 = var0.readUnsignedByte(); - if ((var4 & 1) != 0) { - var4 += var0.readUnsignedByte() << 8; - } - - if ((var4 & 32768) != 0) { - var4 += var0.readUnsignedByte() << 16; - } - - class53.method294(var0, var2, var3, var4); - } - - } - - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-67" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - class449.clientPreferences.setRoofsHidden(!class449.clientPreferences.getRoofsHidden()); - if (class449.clientPreferences.getRoofsHidden()) { - MouseHandler.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - MouseHandler.addGameMessage(99, "", "Roofs will only be removed selectively"); - } - } - - if (var0.startsWith("zbuf")) { - boolean var1 = HealthBarUpdate.method524(var0.substring(5).trim()) == 1; - class219.client.method149(var1); - Rasterizer3D.method1185(var1); - } - - if (var0.equalsIgnoreCase("z")) { - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("displayfps")) { - class449.clientPreferences.method549(); - } - - if (var0.equalsIgnoreCase("renderself")) { - Client.field386 = !Client.field386; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { - if (var0.equalsIgnoreCase("errortest")) { - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { - Canvas.worldMap.showCoord = !Canvas.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { - class449.clientPreferences.method548(true); - } - - if (var0.equalsIgnoreCase("fpsoff")) { - class449.clientPreferences.method548(false); - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { - Renderable.method1291(); - } - } - - PacketBufferNode var2 = ApproximateRouteStrategy.getPacketBufferNode(ClientPacket.CLIENT_CHEAT, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(var0.length() + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var2); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class87.java b/osrs/src/main/java/class87.java new file mode 100644 index 000000000..1eb2a6a1b --- /dev/null +++ b/osrs/src/main/java/class87.java @@ -0,0 +1,129 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("df") +public class class87 { + @ObfuscatedName("md") + @Export("Client_plane") + static int Client_plane; + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1072817040" + ) + static void method461() { + synchronized(ArchiveDiskActionHandler.field3545) { + if (ArchiveDiskActionHandler.field3544 == 0) { + UserComparator3.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + UserComparator3.ArchiveDiskActionHandler_thread.setDaemon(true); + UserComparator3.ArchiveDiskActionHandler_thread.start(); + UserComparator3.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3544 = 600; + ArchiveDiskActionHandler.field3543 = false; + } + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(ILds;ZI)I", + garbageValue = "949731211" + ) + static int method462(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + if (var0 == 1500) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == 1501) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == 1502) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == 1503) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == 1504) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == 1505) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("jg") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-103317779" + ) + static final void method463(int var0) { + int[] var1 = SpriteMask.sceneMinimapSprite.pixels; + int var2 = var1.length; + + int var3; + for (var3 = 0; var3 < var2; ++var3) { + var1[var3] = 0; + } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { + var4 = (103 - var3) * 2048 + 24628; + + for (var5 = 1; var5 < 103; ++var5) { + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { + class10.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { + class10.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; + } + } + + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; + SpriteMask.sceneMinimapSprite.setRaster(); + + int var6; + for (var5 = 1; var5 < 103; ++var5) { + for (var6 = 1; var6 < 103; ++var6) { + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { + class6.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { + class6.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; + + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + long var7 = class10.scene.getFloorDecorationTag(Client_plane, var5, var6); + if (0L != var7) { + int var9 = SecureRandomFuture.Entity_unpackID(var7); + int var10 = class91.getObjectDefinition(var9).mapIconId; + if (var10 >= 0 && class148.WorldMapElement_get(var10).field1518) { + Client.mapIcons[Client.mapIconCount] = class148.WorldMapElement_get(var10).getSpriteBool(false); + Client.mapIconXs[Client.mapIconCount] = var5; + Client.mapIconYs[Client.mapIconCount] = var6; + ++Client.mapIconCount; + } + } + } + } + + class223.rasterProvider.apply(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class89.java b/osrs/src/main/java/class89.java deleted file mode 100644 index 07df32da4..000000000 --- a/osrs/src/main/java/class89.java +++ /dev/null @@ -1,52 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dl") -public enum class89 implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Ldl;" - ) - field884(0, -1), - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Ldl;" - ) - field881(1, 1), - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Ldl;" - ) - field882(2, 7), - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Ldl;" - ) - field883(3, 8), - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Ldl;" - ) - field880(4, 9); - - @ObfuscatedName("ai") - final int field885; - @ObfuscatedName("az") - final int field886; - - class89(int var3, int var4) { - this.field885 = var3; - this.field886 = var4; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field886; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class9.java b/osrs/src/main/java/class9.java index 2f2fc64d1..76e185708 100644 --- a/osrs/src/main/java/class9.java +++ b/osrs/src/main/java/class9.java @@ -2,721 +2,96 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") -public class class9 implements class371 { - @ObfuscatedName("au") +@ObfuscatedName("av") +public class class9 implements class386 { + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lav;" ) - public static final class9 field18; - @ObfuscatedName("ae") + public static final class9 field14; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lav;" ) - public static final class9 field17; - @ObfuscatedName("ao") + public static final class9 field15; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lav;" ) - static final class9 field22; - @ObfuscatedName("at") + static final class9 field17; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lav;" ) - static final class9 field23; - @ObfuscatedName("ac") + static final class9 field19; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lav;" ) - static final class9 field21; - @ObfuscatedName("gq") - static String field20; - @ObfuscatedName("ox") + static final class9 field18; + @ObfuscatedName("qo") @ObfuscatedSignature( - descriptor = "Lcz;" + descriptor = "[Lnm;" ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("ai") - int field26; - @ObfuscatedName("az") - String field27; - @ObfuscatedName("ap") - boolean field25; - @ObfuscatedName("aa") - boolean field24; + static Widget[] field16; + @ObfuscatedName("ah") + int field22; + @ObfuscatedName("ar") + String field23; + @ObfuscatedName("ab") + boolean field20; + @ObfuscatedName("am") + boolean field21; static { - field18 = new class9(0, "POST", true, true); - field17 = new class9(1, "GET", true, false); - field22 = new class9(2, "PUT", false, true); - field23 = new class9(3, "PATCH", false, true); - field21 = new class9(4, "DELETE", false, true); + field14 = new class9(0, "POST", true, true); + field15 = new class9(1, "GET", true, false); + field17 = new class9(2, "PUT", false, true); + field19 = new class9(3, "PATCH", false, true); + field18 = new class9(4, "DELETE", false, true); } class9(int var1, String var2, boolean var3, boolean var4) { - this.field26 = var1; - this.field27 = var2; - this.field25 = var3; - this.field24 = var4; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2119966021" - ) - boolean method21() { - return this.field25; + this.field22 = var1; + this.field23 = var2; + this.field20 = var3; + this.field21 = var4; } - @ObfuscatedName("ae") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" + descriptor = "(I)I", + garbageValue = "-1243971674" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field26; + return this.field22; } - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1243672924" - ) - public String method22() { - return this.field27; - } - - @ObfuscatedName("at") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "861678070" + garbageValue = "1688270936" ) - boolean method23() { - return this.field24; + boolean method26() { + return this.field20; } - @ObfuscatedName("ml") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "([Lmi;IIIIIIIB)V", - garbageValue = "-33" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1083861304" ) - @Export("updateInterface") - static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { - Widget var9 = var0[var8]; - if (var9 != null && var9.parentId == var1 && (var9.method1826() || NewShit.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { - if (var9.isIf3) { - if (class143.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != class146.mousedOverWidgetIf1 && class143.isComponentHidden(var9)) { - continue; - } - - if (var9.type == 11) { - if (var9.method1841(FriendsChat.urlRequester)) { - if (var9.method1834()) { - class218.invalidateWidget(var9); - Login.revalidateWidgetScroll(var9.children, var9, true); - } - - if (var9.field3088 != null) { - ScriptEvent var10 = new ScriptEvent(); - var10.widget = var9; - var10.args = var9.field3088; - Client.scriptEvents.addFirst(var10); - } - } - } else if (var9.type == 12 && var9.method1849()) { - class218.invalidateWidget(var9); - } - - int var26 = var9.x + var6; - int var11 = var7 + var9.y; - int var12; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - if (var9.type == 9) { - var16 = var26; - var17 = var11; - var18 = var26 + var9.width; - int var19 = var11 + var9.height; - if (var18 < var26) { - var16 = var18; - var18 = var26; - } - - if (var19 < var11) { - var17 = var19; - var19 = var11; - } - - ++var18; - ++var19; - var12 = var16 > var2 ? var16 : var2; - var13 = var17 > var3 ? var17 : var3; - var14 = var18 < var4 ? var18 : var4; - var15 = var19 < var5 ? var19 : var5; - } else { - var16 = var26 + var9.width; - var17 = var11 + var9.height; - var12 = var26 > var2 ? var26 : var2; - var13 = var11 > var3 ? var11 : var3; - var14 = var16 < var4 ? var16 : var4; - var15 = var17 < var5 ? var17 : var5; - } - - if (var9 == Client.clickedWidget) { - Client.field397 = true; - Client.field515 = var26; - Client.field521 = var11; - } - - boolean var34 = false; - if (var9.field2969) { - switch(Client.field505) { - case 0: - var34 = true; - case 1: - default: - break; - case 2: - if (Client.field508 == var9.id >>> 16) { - var34 = true; - } - break; - case 3: - if (var9.id == Client.field508) { - var34 = true; - } - } - } - - if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { - if (var9.isIf3) { - ScriptEvent var27; - if (var9.noClickThrough) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var27.field861) { - var27.remove(); - var27.widget.field2975 = false; - } - } - - class500.method2490(); - if (class159.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - class349.addCancelMenuEntry(); - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var27.field861 && var27.widget.onScroll == var27.args) { - var27.remove(); - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var17 = MouseHandler.MouseHandler_lastPressedX; - var18 = MouseHandler.MouseHandler_lastPressedY; - } - - boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; - if (var9.contentType == 1337) { - if (!Client.isLoading && !Client.isMenuOpen && var35) { - class134.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - class348.checkIfMinimapClicked(var9, var26, var11); - } else { - if (var9.contentType == 1400) { - Canvas.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var35) { - if (var9.contentType == 1400) { - Canvas.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); - } else { - ClanChannelMember.method778(var9); - } - } - - boolean var21; - int var23; - if (var34) { - for (int var20 = 0; var20 < var9.field2977.length; ++var20) { - var21 = false; - boolean var22 = false; - if (!var21 && var9.field2977[var20] != null) { - for (var23 = 0; var23 < var9.field2977[var20].length; ++var23) { - boolean var24 = false; - if (var9.field3055 != null) { - var24 = Client.keyHandlerInstance.getKeyPressed(var9.field2977[var20][var23]); - } - - if (class398.method2121(var9.field2977[var20][var23]) || var24) { - var21 = true; - if (var9.field3055 != null && var9.field3055[var20] > Client.cycle) { - break; - } - - byte var25 = var9.field2978[var20][var23]; - if (var25 == 0 || ((var25 & 8) == 0 || !Client.keyHandlerInstance.getKeyPressed(86) && !Client.keyHandlerInstance.getKeyPressed(82) && !Client.keyHandlerInstance.getKeyPressed(81)) && ((var25 & 2) == 0 || Client.keyHandlerInstance.getKeyPressed(86)) && ((var25 & 1) == 0 || Client.keyHandlerInstance.getKeyPressed(82)) && ((var25 & 4) == 0 || Client.keyHandlerInstance.getKeyPressed(81))) { - var22 = true; - break; - } - } - } - } - - if (var22) { - if (var20 < 10) { - class47.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - InvDefinition.Widget_runOnTargetLeave(); - DirectByteArrayCopier.selectSpell(var9.id, var9.childIndex, HealthBarDefinition.Widget_unpackTargetMask(NewShit.getWidgetFlags(var9)), var9.itemId); - Client.field600 = class300.Widget_getSpellActionName(var9); - if (Client.field600 == null) { - Client.field600 = "null"; - } - - Client.field601 = var9.dataText + MoveSpeed.colorStartTag(16777215); - } - - var23 = var9.field3047[var20]; - if (var9.field3055 == null) { - var9.field3055 = new int[var9.field2977.length]; - } - - if (var9.field3046 == null) { - var9.field3046 = new int[var9.field2977.length]; - } - - if (var23 != 0) { - if (var9.field3055[var20] == 0) { - var9.field3055[var20] = var23 + Client.cycle + var9.field3046[var20]; - } else { - var9.field3055[var20] = var23 + Client.cycle; - } - } else { - var9.field3055[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field3055 != null) { - var9.field3055[var20] = 0; - } - } - } - - if (var9.isIf3) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - var35 = true; - } else { - var35 = false; - } - - boolean var36 = false; - if ((MouseHandler.MouseHandler_currentButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { - var36 = true; - } - - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !ObjTypeCustomisation.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { - var21 = true; - } - - if (var21) { - class227.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.method1827()) { - if (var21) { - Client.field628.addFirst(new class211(0, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); - } - - if (var36) { - Client.field628.addFirst(new class211(1, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); - } - } - - if (var9.contentType == 1400) { - Canvas.worldMap.method2386(var17, var18, var35 & var36, var35 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && class238.method1309(NewShit.getWidgetFlags(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field395 = true; - Client.field514 = var26; - Client.field513 = var11; - } - - if (var9.hasListener) { - ScriptEvent var28; - if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseY = Client.mouseWheelRotation; - var28.args = var9.onScroll; - Client.scriptEvents.addFirst(var28); - } - - if (Client.clickedWidget != null || Client.isMenuOpen) { - var21 = false; - var36 = false; - var35 = false; - } - - if (!var9.field2974 && var21) { - var9.field2974 = true; - if (var9.onClick != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; - var28.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var28.args = var9.onClick; - Client.scriptEvents.addFirst(var28); - } - } - - if (var9.field2974 && var36 && var9.onClickRepeat != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onClickRepeat; - Client.scriptEvents.addFirst(var28); - } - - if (var9.field2974 && !var36) { - var9.field2974 = false; - if (var9.onRelease != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onRelease; - Client.field630.addFirst(var28); - } - } - - if (var36 && var9.onHold != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onHold; - Client.scriptEvents.addFirst(var28); - } - - if (!var9.field2975 && var35) { - var9.field2975 = true; - if (var9.onMouseOver != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onMouseOver; - Client.scriptEvents.addFirst(var28); - } - } - - if (var9.field2975 && var35 && var9.onMouseRepeat != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var28); - } - - if (var9.field2975 && !var35) { - var9.field2975 = false; - if (var9.onMouseLeave != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onMouseLeave; - Client.field630.addFirst(var28); - } - } - - if (var9.onTimer != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onTimer; - Client.field629.addFirst(var28); - } - - ScriptEvent var29; - int var37; - int var38; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3041) { - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3041 <= 32) { - label647: - for (var37 = var9.field3041; var37 < Client.changedVarpCount; ++var37) { - var23 = Client.changedVarps[var37 & 31]; - - for (var38 = 0; var38 < var9.varTransmitTriggers.length; ++var38) { - if (var23 == var9.varTransmitTriggers[var38]) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var29); - break label647; - } - } - } - } else { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3041 = Client.changedVarpCount; - } - - if (var9.onInvTransmit != null && Client.changedItemContainersCount > var9.field3042) { - if (var9.invTransmitTriggers != null && Client.changedItemContainersCount - var9.field3042 <= 32) { - label623: - for (var37 = var9.field3042; var37 < Client.changedItemContainersCount; ++var37) { - var23 = Client.changedItemContainers[var37 & 31]; - - for (var38 = 0; var38 < var9.invTransmitTriggers.length; ++var38) { - if (var23 == var9.invTransmitTriggers[var38]) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var29); - break label623; - } - } - } - } else { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3042 = Client.changedItemContainersCount; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3040) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3040 <= 32) { - label599: - for (var37 = var9.field3040; var37 < Client.changedSkillsCount; ++var37) { - var23 = Client.changedSkills[var37 & 31]; - - for (var38 = 0; var38 < var9.statTransmitTriggers.length; ++var38) { - if (var23 == var9.statTransmitTriggers[var38]) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var29); - break label599; - } - } - } - } else { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3040 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field3043 && var9.onChatTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field518 > var9.field3043 && var9.onFriendTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field524 > var9.field3043 && var9.onClanTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field511 > var9.field3043 && var9.field3082 != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.field3082; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field517 > var9.field3043 && var9.field3090 != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.field3090; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field529 > var9.field3043 && var9.onStockTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field525 > var9.field3043 && var9.field3081 != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.field3081; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field528 > var9.field3043 && var9.onMiscTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3043 = Client.cycleCntr; - if (var9.onKey != null) { - for (var37 = 0; var37 < Client.field532; ++var37) { - ScriptEvent var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = Client.field581[var37]; - var30.keyPressed = Client.field580[var37]; - var30.args = var9.onKey; - Client.scriptEvents.addFirst(var30); - } - } - - ScriptEvent var31; - int[] var39; - if (var9.field3089 != null) { - var39 = Client.keyHandlerInstance.method1109(); - - for (var23 = 0; var23 < var39.length; ++var23) { - var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = var39[var23]; - var31.args = var9.field3089; - Client.scriptEvents.addFirst(var31); - } - } - - if (var9.field3079 != null) { - var39 = Client.keyHandlerInstance.method1110(); - - for (var23 = 0; var23 < var39.length; ++var23) { - var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = var39[var23]; - var31.args = var9.field3079; - Client.scriptEvents.addFirst(var31); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || Client.isMenuOpen) { - continue; - } - - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - if (var9.mouseOverRedirect >= 0) { - class146.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - class146.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - class343.field3147 = var9; - } - - if (var9.scrollHeight > var9.height) { - SongTask.method2139(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { - updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); - if (var9.children != null) { - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); - } - - InterfaceParent var32 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var32 != null) { - if (var32.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (ScriptEvent var33 = (ScriptEvent)Client.scriptEvents.last(); var33 != null; var33 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var33.field861) { - var33.remove(); - var33.widget.field2975 = false; - } - } - - if (class159.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - class349.addCancelMenuEntry(); - } - } - - LoginScreenAnimation.updateRootInterface(var32.group, var12, var13, var14, var15, var26, var11); - } - } - } - } - } - } - + public String method27() { + return this.field23; } - @ObfuscatedName("ox") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-1162" + descriptor = "(I)Z", + garbageValue = "2015680525" ) - static void method26() { - class449.clientPreferences.method563(Client.param21); + boolean method28() { + return this.field21; } } \ No newline at end of file diff --git a/osrs/src/main/java/class90.java b/osrs/src/main/java/class90.java deleted file mode 100644 index 91c9893fc..000000000 --- a/osrs/src/main/java/class90.java +++ /dev/null @@ -1,86 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dk") -public enum class90 implements class371 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - field893(0, -1), - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - field889(1, 2), - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - field891(2, 3), - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - field892(3, 4), - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - field888(4, 5), - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - field890(5, 6); - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lrb;" - ) - static Bounds field887; - @ObfuscatedName("az") - final int field895; - @ObfuscatedName("ap") - final int field894; - - class90(int var3, int var4) { - this.field895 = var3; - this.field894 = var4; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "41" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field894; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IB)Lhw;", - garbageValue = "0" - ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); - return var1; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class91.java b/osrs/src/main/java/class91.java new file mode 100644 index 000000000..562846a0a --- /dev/null +++ b/osrs/src/main/java/class91.java @@ -0,0 +1,124 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("do") +public enum class91 implements class386 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + field881(0, -1), + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + field883(1, 1), + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + field882(2, 7), + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + field885(3, 8), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + field884(4, 9); + + @ObfuscatedName("wx") + @ObfuscatedSignature( + descriptor = "Ldy;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Leq;" + ) + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("ah") + final int field886; + @ObfuscatedName("ar") + final int field887; + + class91(int var3, int var4) { + this.field886 = var3; + this.field887 = var4; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1243971674" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field887; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Liz;", + garbageValue = "1356482974" + ) + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; + } + + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "48" + ) + static void method482(int var0, int var1, int var2) { + if (var0 != 0) { + int var3 = var0 >> 8; + int var4 = var0 >> 4 & 7; + int var5 = var0 & 15; + Client.soundEffectIds[Client.soundEffectCount] = var3; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; + Client.soundEffects[Client.soundEffectCount] = null; + int var6 = (var1 - 64) / 128; + int var7 = (var2 - 64) / 128; + Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); + ++Client.soundEffectCount; + } + } + + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "74" + ) + static void method483() { + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class92.java b/osrs/src/main/java/class92.java index ee3a9f5dd..f04dc2df2 100644 --- a/osrs/src/main/java/class92.java +++ b/osrs/src/main/java/class92.java @@ -2,193 +2,114 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") -public class class92 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - static final class92 field940; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - static final class92 field930; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - static final class92 field935; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - static final class92 field939; +@ObfuscatedName("dh") +public enum class92 implements class386 { @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldh;" ) - static final class92 field928; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - static final class92 field932; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - static final class92 field941; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - static final class92 field936; - @ObfuscatedName("aa") + field889(0, -1), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldh;" ) - static final class92 field926; - @ObfuscatedName("af") + field892(1, 2), + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldh;" ) - static final class92 field931; - @ObfuscatedName("ad") + field891(2, 3), + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldh;" ) - static final class92 field929; - @ObfuscatedName("aq") + field894(3, 4), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldh;" ) - static final class92 field937; - @ObfuscatedName("al") + field893(4, 5), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldh;" ) - static final class92 field933; - @ObfuscatedName("an") + field890(5, 6); + + @ObfuscatedName("fy") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Lok;" ) - static final class92 field934; + static Archive field888; @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - static final class92 field938; + final int field896; @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - static final class92 field927; - - static { - field940 = new class92(); - field930 = new class92(); - field935 = new class92(); - field939 = new class92(); - field928 = new class92(); - field932 = new class92(); - field941 = new class92(); - field936 = new class92(); - field926 = new class92(); - field931 = new class92(); - field929 = new class92(); - field937 = new class92(); - field933 = new class92(); - field934 = new class92(); - field938 = new class92(); - field927 = new class92(); - } + final int field895; - class92() { + class92(int var3, int var4) { + this.field896 = var3; + this.field895 = var4; } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)Lmi;", - garbageValue = "412092455" + descriptor = "(I)I", + garbageValue = "-1243971674" ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; - int var2 = var0 & 65535; - if (PacketBufferNode.Widget_interfaceComponents[var1] == null || PacketBufferNode.Widget_interfaceComponents[var1][var2] == null) { - boolean var3 = ModeWhere.loadInterface(var1); - if (!var3) { - return null; - } - } - - return PacketBufferNode.Widget_interfaceComponents[var1][var2]; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field895; } - @ObfuscatedName("jl") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ldf;ZB)V", - garbageValue = "1" + descriptor = "([BIIB)Ljava/lang/String;", + garbageValue = "-128" ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { - var0.isUnanimated = true; - } - - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = FontName.calculateTag(0, 0, 0, false, var0.index); - if (var0.attachedModel != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = class18.getTileHeight(var0.x, var0.y, HealthBar.Client_plane); - var0.playerCycle = Client.cycle; - class130.scene.addNullableObject(HealthBar.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + for (int var5 = 0; var5 < var2; ++var5) { + int var6 = var0[var5 + var1] & 255; + if (var6 != 0) { + if (var6 >= 128 && var6 < 160) { + char var7 = class399.cp1252AsciiExtension[var6 - 128]; + if (var7 == 0) { + var7 = '?'; } - var0.tileHeight = class18.getTileHeight(var0.x, var0.y, HealthBar.Client_plane); - var0.playerCycle = Client.cycle; - class130.scene.drawEntity(HealthBar.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + var6 = var7; } + + var3[var4++] = (char)var6; } } + return new String(var3, 0, var4); } - @ObfuscatedName("ns") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Lds;ZI)V", - garbageValue = "-1838716449" + descriptor = "(CII)Ljava/lang/String;", + garbageValue = "1422226008" ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1) { - Skeleton.method1232(var2); - } + public static String method486(char var0, int var1) { + char[] var2 = new char[var1]; - class339.method1865(var2); - Widget var4 = getWidget(var3); - if (var4 != null) { - class218.invalidateWidget(var4); + for (int var3 = 0; var3 < var1; ++var3) { + var2[var3] = var0; } - if (Client.rootInterface != -1) { - class385.runIntfCloseListeners(Client.rootInterface, 1); - } + return new String(var2); + } + @ObfuscatedName("om") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-82" + ) + public static boolean method487() { + return Client.staffModLevel >= 2; } } \ No newline at end of file diff --git a/osrs/src/main/java/class93.java b/osrs/src/main/java/class93.java deleted file mode 100644 index 4a408e3f0..000000000 --- a/osrs/src/main/java/class93.java +++ /dev/null @@ -1,398 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dw") -public class class93 { - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(ILdh;ZI)I", - garbageValue = "36436435" - ) - static int method504(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - var3 = class92.getWidget(var4); - } else { - var3 = var2 ? GameObject.scriptDotWidget : SceneTilePaint.scriptActiveWidget; - } - - int var10; - if (var0 == 1100) { - SoundCache.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - int var6 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - if (var3.type == 12) { - class329 var7 = var3.method1844(); - if (var7 != null && var7.method1740(var10, var6)) { - class218.invalidateWidget(var3); - } - } else { - var3.scrollX = var10; - if (var3.scrollX > var3.scrollWidth - var3.width) { - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { - var3.scrollX = 0; - } - - var3.scrollY = var6; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { - var3.scrollY = 0; - } - - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1101) { - var3.color = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1102) { - var3.fill = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1103) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1104) { - var3.lineWid = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1105) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1106) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1107) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1108) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1109) { - SoundCache.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 5]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1110) { - var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var10 != var3.sequenceId) { - var3.sequenceId = var10; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1111) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1112) { - String var14 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - if (!var14.equals(var3.text)) { - var3.text = var14; - class218.invalidateWidget(var3); - } - - return 1; - } else { - class329 var11; - if (var0 == 1113) { - var3.fontId = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - if (var3.type == 12) { - var11 = var3.method1844(); - if (var11 != null) { - var11.method1747(); - } - } - - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1114) { - SoundCache.Interpreter_intStackSize -= 3; - if (var3.type == 12) { - var11 = var3.method1844(); - if (var11 != null) { - var11.method1741(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - var11.method1742(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]); - } - } else { - var3.textXAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 2]; - } - - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1115) { - var3.textShadowed = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1116) { - var3.outline = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1117) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1118) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1119) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1120) { - SoundCache.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]; - class218.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - Login.revalidateWidgetScroll(PacketBufferNode.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == 1121) { - class466.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1123) { - var3.color2 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1125) { - var10 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]; - FillMode var12 = (FillMode)KeyHandler.findEnumerated(MidiPcmStream.FillMode_values(), var10); - if (var12 != null) { - var3.fillMode = var12; - class218.invalidateWidget(var3); - } - - return 1; - } else { - boolean var5; - if (var0 == 1126) { - var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - var3.field2962 = var5; - return 1; - } else if (var0 == 1127) { - var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else if (var0 == 1129) { - var3.field3091 = Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize]; - class218.invalidateWidget(var3); - return 1; - } else if (var0 == 1130) { - var3.method1828(Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize], FriendsChat.urlRequester, UrlRequester.method654()); - return 1; - } else if (var0 == 1131) { - SoundCache.Interpreter_intStackSize -= 2; - var3.method1831(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == 1132) { - var3.method1832(Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize]); - return 1; - } else { - class324 var13; - if (var0 == 1133) { - --SoundCache.Interpreter_intStackSize; - var13 = var3.method1845(); - if (var13 != null) { - var13.field2892 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1134) { - --SoundCache.Interpreter_intStackSize; - var13 = var3.method1845(); - if (var13 != null) { - var13.field2890 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1135) { - --class137.Interpreter_stringStackSize; - var11 = var3.method1844(); - if (var11 != null) { - var3.text2 = Interpreter.Interpreter_stringStack[class137.Interpreter_stringStackSize]; - } - - return 1; - } else if (var0 == 1136) { - --SoundCache.Interpreter_intStackSize; - var13 = var3.method1845(); - if (var13 != null) { - var13.field2891 = Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]; - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1137) { - --SoundCache.Interpreter_intStackSize; - var11 = var3.method1844(); - if (var11 != null && var11.method1737(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize])) { - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1138) { - --SoundCache.Interpreter_intStackSize; - var11 = var3.method1844(); - if (var11 != null && var11.method1738(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize])) { - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1139) { - --SoundCache.Interpreter_intStackSize; - var11 = var3.method1844(); - if (var11 != null && var11.method1739(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize])) { - class218.invalidateWidget(var3); - } - - return 1; - } else { - class329 var9; - if (var0 == 1140) { - var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - Client.field423.method1090(); - var9 = var3.method1844(); - if (var9 != null && var9.method1731(var5)) { - if (var5) { - Client.field423.method1088(var3); - } - - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1141) { - var5 = Interpreter.Interpreter_intStack[--SoundCache.Interpreter_intStackSize] == 1; - if (!var5 && Client.field423.method1089() == var3) { - Client.field423.method1090(); - class218.invalidateWidget(var3); - } - - var9 = var3.method1844(); - if (var9 != null) { - var9.method1732(var5); - } - - return 1; - } else if (var0 == 1142) { - SoundCache.Interpreter_intStackSize -= 2; - var11 = var3.method1844(); - if (var11 != null && var11.method1755(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1])) { - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1143) { - --SoundCache.Interpreter_intStackSize; - var11 = var3.method1844(); - if (var11 != null && var11.method1755(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize])) { - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1144) { - --SoundCache.Interpreter_intStackSize; - var11 = var3.method1844(); - if (var11 != null) { - var11.method1744(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); - class218.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1145) { - --SoundCache.Interpreter_intStackSize; - var11 = var3.method1844(); - if (var11 != null) { - var11.method1743(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); - } - - return 1; - } else if (var0 == 1146) { - --SoundCache.Interpreter_intStackSize; - var11 = var3.method1844(); - if (var11 != null) { - var11.method1746(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); - } - - return 1; - } else if (var0 == 1147) { - --SoundCache.Interpreter_intStackSize; - var11 = var3.method1844(); - if (var11 != null) { - var11.method1745(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize]); - class218.invalidateWidget(var3); - } - - return 1; - } else { - class27 var8; - if (var0 == 1148) { - SoundCache.Interpreter_intStackSize -= 2; - var8 = var3.method1846(); - if (var8 != null) { - var8.method96(Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - } - - return 1; - } else if (var0 == 1149) { - SoundCache.Interpreter_intStackSize -= 2; - var8 = var3.method1846(); - if (var8 != null) { - var8.method97((char)Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize], Interpreter.Interpreter_intStack[SoundCache.Interpreter_intStackSize + 1]); - } - - return 1; - } else if (var0 == 1150) { - var3.method1829(Interpreter.Interpreter_stringStack[--class137.Interpreter_stringStackSize], FriendsChat.urlRequester); - return 1; - } else { - return 2; - } - } - } - } - } - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class94.java b/osrs/src/main/java/class94.java new file mode 100644 index 000000000..5902fb088 --- /dev/null +++ b/osrs/src/main/java/class94.java @@ -0,0 +1,112 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("du") +public class class94 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field929; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field934; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field933; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field941; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field936; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field931; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field938; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field928; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field935; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field940; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field930; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field927; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field937; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field942; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field939; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + static final class94 field932; + @ObfuscatedName("ju") + @Export("timeOfPreviousKeyPress") + static int timeOfPreviousKeyPress; + + static { + field929 = new class94(); + field934 = new class94(); + field933 = new class94(); + field941 = new class94(); + field936 = new class94(); + field931 = new class94(); + field938 = new class94(); + field928 = new class94(); + field935 = new class94(); + field940 = new class94(); + field930 = new class94(); + field927 = new class94(); + field937 = new class94(); + field942 = new class94(); + field939 = new class94(); + field932 = new class94(); + } + + class94() { + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class95.java b/osrs/src/main/java/class95.java new file mode 100644 index 000000000..8c74a38ae --- /dev/null +++ b/osrs/src/main/java/class95.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dr") +public class class95 { + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)[Ldo;", + garbageValue = "1031859933" + ) + static class91[] method505() { + return new class91[]{class91.field884, class91.field882, class91.field885, class91.field883, class91.field881}; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java b/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java index 5eec54d38..10e704428 100644 --- a/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java +++ b/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java @@ -5,543 +5,557 @@ public class ObfuscatedClassMap extends HashMap { public static ObfuscatedClassMap INSTANCE = new ObfuscatedClassMap(); static { - INSTANCE.put("AABB", "ip"); - INSTANCE.put("AbstractArchive", "nu"); - INSTANCE.put("AbstractByteArrayCopier", "ma"); + INSTANCE.put("AABB", "jl"); + INSTANCE.put("AbstractArchive", "om"); + INSTANCE.put("AbstractByteArrayCopier", "nn"); INSTANCE.put("AbstractFont", "pk"); - INSTANCE.put("AbstractRasterProvider", "uq"); - INSTANCE.put("AbstractSocket", "qi"); - INSTANCE.put("AbstractSound", "cp"); - INSTANCE.put("AbstractUserComparator", "qz"); - INSTANCE.put("AbstractWorldMapData", "ke"); - INSTANCE.put("AbstractWorldMapIcon", "kp"); - INSTANCE.put("AccessFile", "tu"); - INSTANCE.put("Actor", "dr"); - INSTANCE.put("AddRequestTask", "pf"); - INSTANCE.put("Animation", "ia"); - INSTANCE.put("ApproximateRouteStrategy", "cl"); - INSTANCE.put("Archive", "nk"); - INSTANCE.put("ArchiveDisk", "ru"); - INSTANCE.put("ArchiveDiskAction", "nw"); - INSTANCE.put("ArchiveDiskActionHandler", "ny"); - INSTANCE.put("ArchiveLoader", "dg"); - INSTANCE.put("AttackOption", "dc"); - INSTANCE.put("AudioFilter", "cr"); - INSTANCE.put("BoundaryObject", "jo"); - INSTANCE.put("Bounds", "rb"); - INSTANCE.put("Buddy", "qb"); - INSTANCE.put("BuddyRankComparator", "ek"); - INSTANCE.put("Buffer", "tm"); - INSTANCE.put("BufferedFile", "td"); - INSTANCE.put("BufferedNetSocket", "qy"); - INSTANCE.put("BufferedSink", "qh"); - INSTANCE.put("BufferedSource", "qa"); - INSTANCE.put("ByteArrayPool", "pb"); - INSTANCE.put("BZip2Decompressor", "tt"); - INSTANCE.put("BZip2State", "te"); - INSTANCE.put("Calendar", "mo"); - INSTANCE.put("Canvas", "av"); - INSTANCE.put("ChatChannel", "di"); - INSTANCE.put("ClanChannel", "go"); - INSTANCE.put("ClanChannelMember", "fu"); - INSTANCE.put("ClanMate", "qx"); - INSTANCE.put("ClanSettings", "fi"); - INSTANCE.put("class0", "au"); - INSTANCE.put("class1", "ae"); - INSTANCE.put("class10", "ad"); - INSTANCE.put("class101", "dq"); - INSTANCE.put("class102", "de"); - INSTANCE.put("class105", "eh"); - INSTANCE.put("class106", "ey"); - INSTANCE.put("class108", "eq"); - INSTANCE.put("class11", "aq"); - INSTANCE.put("class113", "ez"); - INSTANCE.put("class12", "al"); - INSTANCE.put("class124", "eu"); - INSTANCE.put("class125", "eg"); - INSTANCE.put("class126", "ex"); - INSTANCE.put("class127", "eo"); + INSTANCE.put("AbstractRasterProvider", "ui"); + INSTANCE.put("AbstractSocket", "re"); + INSTANCE.put("AbstractSound", "cb"); + INSTANCE.put("AbstractUserComparator", "rv"); + INSTANCE.put("AbstractWorldMapData", "kv"); + INSTANCE.put("AbstractWorldMapIcon", "ll"); + INSTANCE.put("AccessFile", "to"); + INSTANCE.put("Actor", "di"); + INSTANCE.put("AddRequestTask", "pi"); + INSTANCE.put("Animation", "ji"); + INSTANCE.put("ApproximateRouteStrategy", "cs"); + INSTANCE.put("Archive", "ok"); + INSTANCE.put("ArchiveDisk", "rw"); + INSTANCE.put("ArchiveDiskAction", "oe"); + INSTANCE.put("ArchiveDiskActionHandler", "ob"); + INSTANCE.put("ArchiveLoader", "dn"); + INSTANCE.put("AttackOption", "em"); + INSTANCE.put("AudioFilter", "cq"); + INSTANCE.put("BoundaryObject", "kr"); + INSTANCE.put("Bounds", "rx"); + INSTANCE.put("Buddy", "ri"); + INSTANCE.put("BuddyRankComparator", "eu"); + INSTANCE.put("Buffer", "ul"); + INSTANCE.put("BufferedFile", "tl"); + INSTANCE.put("BufferedNetSocket", "rc"); + INSTANCE.put("BufferedSink", "net/runelite/rs"); + INSTANCE.put("BufferedSource", "rj"); + INSTANCE.put("ByteArrayPool", "qo"); + INSTANCE.put("BZip2Decompressor", "ur"); + INSTANCE.put("BZip2State", "uo"); + INSTANCE.put("Calendar", "na"); + INSTANCE.put("Canvas", "at"); + INSTANCE.put("ChatChannel", "dg"); + INSTANCE.put("ClanChannel", "gb"); + INSTANCE.put("ClanChannelMember", "fv"); + INSTANCE.put("ClanMate", "rm"); + INSTANCE.put("ClanSettings", "gi"); + INSTANCE.put("class0", "ac"); + INSTANCE.put("class1", "al"); + INSTANCE.put("class10", "ag"); + INSTANCE.put("class103", "da"); + INSTANCE.put("class104", "eo"); + INSTANCE.put("class107", "ec"); + INSTANCE.put("class108", "eg"); + INSTANCE.put("class11", "aa"); + INSTANCE.put("class110", "ex"); + INSTANCE.put("class115", "es"); + INSTANCE.put("class12", "ap"); + INSTANCE.put("class126", "ep"); + INSTANCE.put("class127", "ef"); INSTANCE.put("class128", "ew"); - INSTANCE.put("class129", "ep"); - INSTANCE.put("class13", "an"); - INSTANCE.put("class130", "fh"); - INSTANCE.put("class131", "ft"); - INSTANCE.put("class132", "fs"); - INSTANCE.put("class133", "fl"); - INSTANCE.put("class134", "fe"); - INSTANCE.put("class135", "fd"); - INSTANCE.put("class136", "fj"); - INSTANCE.put("class137", "fv"); - INSTANCE.put("class138", "fb"); - INSTANCE.put("class139", "fr"); - INSTANCE.put("class14", "ar"); - INSTANCE.put("class140", "fq"); - INSTANCE.put("class141", "fp"); - INSTANCE.put("class142", "fg"); - INSTANCE.put("class143", "fo"); - INSTANCE.put("class144", "fz"); - INSTANCE.put("class146", "fn"); - INSTANCE.put("class147", "fx"); + INSTANCE.put("class129", "ed"); + INSTANCE.put("class13", "ay"); + INSTANCE.put("class130", "fj"); + INSTANCE.put("class131", "fh"); + INSTANCE.put("class132", "fz"); + INSTANCE.put("class133", "fs"); + INSTANCE.put("class134", "fl"); + INSTANCE.put("class135", "fe"); + INSTANCE.put("class136", "fo"); + INSTANCE.put("class138", "fi"); + INSTANCE.put("class139", "fk"); + INSTANCE.put("class14", "as"); + INSTANCE.put("class140", "fy"); + INSTANCE.put("class141", "fn"); + INSTANCE.put("class142", "fb"); + INSTANCE.put("class143", "ft"); + INSTANCE.put("class144", "fa"); + INSTANCE.put("class145", "fg"); + INSTANCE.put("class146", "fm"); INSTANCE.put("class148", "ff"); - INSTANCE.put("class149", "fc"); - INSTANCE.put("class15", "ab"); - INSTANCE.put("class150", "fk"); - INSTANCE.put("class151", "fm"); - INSTANCE.put("class152", "fy"); - INSTANCE.put("class153", "fw"); - INSTANCE.put("class155", "fa"); - INSTANCE.put("class156", "gu"); - INSTANCE.put("class157", "gc"); - INSTANCE.put("class158", "gd"); - INSTANCE.put("class159", "gm"); - INSTANCE.put("class16", "ag"); - INSTANCE.put("class160", "gg"); - INSTANCE.put("class161", "gw"); - INSTANCE.put("class162", "gi"); - INSTANCE.put("class164", "gl"); - INSTANCE.put("class165", "gb"); - INSTANCE.put("class166", "gj"); - INSTANCE.put("class167", "ge"); - INSTANCE.put("class169", "gv"); - INSTANCE.put("class17", "am"); - INSTANCE.put("class170", "gf"); - INSTANCE.put("class172", "gy"); - INSTANCE.put("class174", "gk"); - INSTANCE.put("class176", "gx"); - INSTANCE.put("class177", "gq"); - INSTANCE.put("class178", "gt"); - INSTANCE.put("class18", "ax"); - INSTANCE.put("class181", "gn"); - INSTANCE.put("class184", "hj"); - INSTANCE.put("class19", "ah"); - INSTANCE.put("class191", "hg"); - INSTANCE.put("class197", "hp"); - INSTANCE.put("class2", "ao"); - INSTANCE.put("class20", "as"); - INSTANCE.put("class200", "hf"); - INSTANCE.put("class209", "il"); - INSTANCE.put("class210", "ig"); - INSTANCE.put("class211", "ie"); - INSTANCE.put("class212", "iz"); - INSTANCE.put("class214", "io"); - INSTANCE.put("class216", "ij"); - INSTANCE.put("class218", "ih"); - INSTANCE.put("class219", "it"); - INSTANCE.put("class227", "im"); - INSTANCE.put("class228", "id"); - INSTANCE.put("class238", "je"); - INSTANCE.put("class243", "ji"); - INSTANCE.put("class245", "jj"); - INSTANCE.put("class26", "bh"); - INSTANCE.put("class260", "kb"); - INSTANCE.put("class261", "kt"); - INSTANCE.put("class27", "bj"); - INSTANCE.put("class270", "ka"); - INSTANCE.put("class271", "kf"); - INSTANCE.put("class272", "kx"); - INSTANCE.put("class28", "bk"); - INSTANCE.put("class280", "kk"); - INSTANCE.put("class281", "kc"); - INSTANCE.put("class282", "km"); - INSTANCE.put("class283", "kz"); - INSTANCE.put("class284", "kh"); - INSTANCE.put("class29", "bv"); - INSTANCE.put("class291", "lm"); - INSTANCE.put("class292", "lp"); - INSTANCE.put("class293", "la"); - INSTANCE.put("class299", "ln"); - INSTANCE.put("class3", "at"); - INSTANCE.put("class30", "bt"); - INSTANCE.put("class300", "lc"); - INSTANCE.put("class301", "lv"); - INSTANCE.put("class302", "lr"); - INSTANCE.put("class303", "lt"); - INSTANCE.put("class305", "lz"); - INSTANCE.put("class308", "lh"); - INSTANCE.put("class309", "li"); - INSTANCE.put("class31", "bd"); - INSTANCE.put("class311", "lb"); - INSTANCE.put("class312", "md"); - INSTANCE.put("class316", "mq"); - INSTANCE.put("class318", "mk"); - INSTANCE.put("class323", "mf"); - INSTANCE.put("class324", "ml"); - INSTANCE.put("class325", "mj"); - INSTANCE.put("class326", "mw"); - INSTANCE.put("class327", "mp"); - INSTANCE.put("class329", "mb"); - INSTANCE.put("class33", "bs"); - INSTANCE.put("class330", "mm"); - INSTANCE.put("class332", "mn"); - INSTANCE.put("class334", "my"); - INSTANCE.put("class338", "nq"); - INSTANCE.put("class339", "na"); - INSTANCE.put("class342", "nd"); - INSTANCE.put("class343", "ng"); - INSTANCE.put("class344", "nt"); - INSTANCE.put("class345", "nv"); - INSTANCE.put("class348", "nz"); - INSTANCE.put("class349", "ne"); - INSTANCE.put("class350", "ni"); - INSTANCE.put("class352", "np"); + INSTANCE.put("class149", "fw"); + INSTANCE.put("class15", "aj"); + INSTANCE.put("class150", "fc"); + INSTANCE.put("class151", "fr"); + INSTANCE.put("class152", "fq"); + INSTANCE.put("class153", "fp"); + INSTANCE.put("class154", "fu"); + INSTANCE.put("class155", "fx"); + INSTANCE.put("class157", "ge"); + INSTANCE.put("class158", "gj"); + INSTANCE.put("class159", "gl"); + INSTANCE.put("class16", "an"); + INSTANCE.put("class160", "gq"); + INSTANCE.put("class161", "gt"); + INSTANCE.put("class162", "gf"); + INSTANCE.put("class163", "gk"); + INSTANCE.put("class164", "gm"); + INSTANCE.put("class166", "gx"); + INSTANCE.put("class167", "gp"); + INSTANCE.put("class168", "gd"); + INSTANCE.put("class169", "gz"); + INSTANCE.put("class17", "au"); + INSTANCE.put("class171", "gn"); + INSTANCE.put("class172", "gr"); + INSTANCE.put("class174", "gs"); + INSTANCE.put("class176", "gc"); + INSTANCE.put("class178", "gh"); + INSTANCE.put("class179", "gg"); + INSTANCE.put("class18", "ai"); + INSTANCE.put("class180", "gu"); + INSTANCE.put("class183", "hf"); + INSTANCE.put("class186", "hl"); + INSTANCE.put("class188", "hd"); + INSTANCE.put("class189", "hs"); + INSTANCE.put("class19", "ae"); + INSTANCE.put("class190", "hk"); + INSTANCE.put("class191", "hn"); + INSTANCE.put("class193", "hh"); + INSTANCE.put("class198", "hc"); + INSTANCE.put("class199", "hv"); + INSTANCE.put("class2", "ak"); + INSTANCE.put("class20", "aw"); + INSTANCE.put("class201", "hq"); + INSTANCE.put("class202", "hx"); + INSTANCE.put("class206", "ho"); + INSTANCE.put("class208", "iv"); + INSTANCE.put("class209", "ik"); + INSTANCE.put("class212", "in"); + INSTANCE.put("class214", "im"); + INSTANCE.put("class216", "iu"); + INSTANCE.put("class223", "ij"); + INSTANCE.put("class224", "ib"); + INSTANCE.put("class225", "il"); + INSTANCE.put("class226", "it"); + INSTANCE.put("class228", "ic"); + INSTANCE.put("class230", "ig"); + INSTANCE.put("class232", "ia"); + INSTANCE.put("class233", "id"); + INSTANCE.put("class241", "jr"); + INSTANCE.put("class242", "jj"); + INSTANCE.put("class257", "jm"); + INSTANCE.put("class259", "jg"); + INSTANCE.put("class266", "ko"); + INSTANCE.put("class27", "bk"); + INSTANCE.put("class274", "ks"); + INSTANCE.put("class275", "kp"); + INSTANCE.put("class28", "by"); + INSTANCE.put("class284", "ku"); + INSTANCE.put("class285", "ki"); + INSTANCE.put("class286", "la"); + INSTANCE.put("class29", "bd"); + INSTANCE.put("class294", "lc"); + INSTANCE.put("class295", "lk"); + INSTANCE.put("class296", "lv"); + INSTANCE.put("class297", "lw"); + INSTANCE.put("class298", "lo"); + INSTANCE.put("class3", "ax"); + INSTANCE.put("class30", "be"); + INSTANCE.put("class304", "lp"); + INSTANCE.put("class305", "lt"); + INSTANCE.put("class306", "le"); + INSTANCE.put("class307", "lg"); + INSTANCE.put("class31", "bv"); + INSTANCE.put("class313", "ma"); + INSTANCE.put("class314", "mj"); + INSTANCE.put("class315", "mm"); + INSTANCE.put("class316", "mc"); + INSTANCE.put("class317", "mw"); + INSTANCE.put("class319", "mr"); + INSTANCE.put("class322", "mz"); + INSTANCE.put("class323", "mu"); + INSTANCE.put("class325", "mh"); + INSTANCE.put("class326", "ml"); + INSTANCE.put("class33", "bz"); + INSTANCE.put("class330", "me"); + INSTANCE.put("class332", "my"); + INSTANCE.put("class337", "mg"); + INSTANCE.put("class339", "nx"); + INSTANCE.put("class340", "nv"); + INSTANCE.put("class341", "nd"); + INSTANCE.put("class342", "no"); + INSTANCE.put("class344", "nz"); + INSTANCE.put("class345", "nb"); + INSTANCE.put("class347", "nc"); + INSTANCE.put("class349", "nk"); + INSTANCE.put("class353", "nw"); + INSTANCE.put("class354", "ny"); INSTANCE.put("class357", "nj"); - INSTANCE.put("class36", "bq"); - INSTANCE.put("class369", "od"); - INSTANCE.put("class370", "og"); - INSTANCE.put("class371", "ob"); - INSTANCE.put("class372", "ok"); - INSTANCE.put("class383", "oi"); - INSTANCE.put("class384", "oq"); - INSTANCE.put("class385", "ov"); - INSTANCE.put("class386", "op"); - INSTANCE.put("class387", "or"); - INSTANCE.put("class388", "oo"); - INSTANCE.put("class390", "ps"); - INSTANCE.put("class391", "pr"); - INSTANCE.put("class392", "pa"); - INSTANCE.put("class394", "pj"); - INSTANCE.put("class395", "pu"); - INSTANCE.put("class396", "pz"); - INSTANCE.put("class398", "pl"); - INSTANCE.put("class4", "ac"); - INSTANCE.put("class401", "pv"); - INSTANCE.put("class403", "pd"); - INSTANCE.put("class408", "pp"); - INSTANCE.put("class409", "pg"); - INSTANCE.put("class410", "ph"); - INSTANCE.put("class415", "pw"); - INSTANCE.put("class416", "qe"); - INSTANCE.put("class418", "qn"); - INSTANCE.put("class419", "qf"); - INSTANCE.put("class420", "qr"); - INSTANCE.put("class421", "qm"); - INSTANCE.put("class422", "qw"); - INSTANCE.put("class423", "qv"); - INSTANCE.put("class424", "qj"); - INSTANCE.put("class448", "rj"); - INSTANCE.put("class449", "ro"); - INSTANCE.put("class450", "rz"); - INSTANCE.put("class451", "rm"); - INSTANCE.put("class452", "rc"); - INSTANCE.put("class453", "rq"); - INSTANCE.put("class454", "rs"); - INSTANCE.put("class455", "rp"); - INSTANCE.put("class456", "rg"); - INSTANCE.put("class457", "rv"); - INSTANCE.put("class458", "ry"); - INSTANCE.put("class459", "rk"); - INSTANCE.put("class46", "bz"); - INSTANCE.put("class460", "re"); - INSTANCE.put("class461", "rf"); - INSTANCE.put("class462", "rl"); - INSTANCE.put("class463", "rt"); - INSTANCE.put("class464", "rx"); - INSTANCE.put("class465", "rw"); - INSTANCE.put("class466", "rn"); - INSTANCE.put("class47", "bx"); - INSTANCE.put("class475", "sv"); - INSTANCE.put("class476", "se"); - INSTANCE.put("class477", "sk"); - INSTANCE.put("class478", "sy"); - INSTANCE.put("class479", "sn"); - INSTANCE.put("class480", "sc"); - INSTANCE.put("class485", "ss"); - INSTANCE.put("class489", "su"); - INSTANCE.put("class490", "sx"); - INSTANCE.put("class493", "sg"); - INSTANCE.put("class496", "tn"); - INSTANCE.put("class497", "th"); - INSTANCE.put("class498", "tj"); - INSTANCE.put("class499", "tl"); - INSTANCE.put("class5", "ai"); - INSTANCE.put("class500", "tq"); - INSTANCE.put("class501", "tg"); - INSTANCE.put("class502", "tb"); - INSTANCE.put("class503", "tz"); - INSTANCE.put("class504", "ti"); - INSTANCE.put("class506", "tx"); - INSTANCE.put("class508", "tr"); - INSTANCE.put("class51", "bg"); - INSTANCE.put("class510", "ty"); - INSTANCE.put("class515", "tw"); - INSTANCE.put("class518", "tf"); - INSTANCE.put("class519", "tv"); - INSTANCE.put("class522", "uu"); - INSTANCE.put("class523", "ud"); - INSTANCE.put("class529", "uf"); - INSTANCE.put("class53", "cf"); - INSTANCE.put("class532", "uo"); - INSTANCE.put("class538", "uv"); - INSTANCE.put("class59", "cd"); - INSTANCE.put("class6", "az"); - INSTANCE.put("class60", "ce"); - INSTANCE.put("class7", "ap"); - INSTANCE.put("class72", "cj"); + INSTANCE.put("class358", "nr"); + INSTANCE.put("class359", "ne"); + INSTANCE.put("class36", "bp"); + INSTANCE.put("class360", "nq"); + INSTANCE.put("class363", "nf"); + INSTANCE.put("class364", "oh"); + INSTANCE.put("class365", "of"); + INSTANCE.put("class367", "os"); + INSTANCE.put("class372", "ou"); + INSTANCE.put("class379", "op"); + INSTANCE.put("class384", "ow"); + INSTANCE.put("class385", "oi"); + INSTANCE.put("class386", "on"); + INSTANCE.put("class387", "ot"); + INSTANCE.put("class398", "pw"); + INSTANCE.put("class399", "pv"); + INSTANCE.put("class4", "ao"); + INSTANCE.put("class400", "po"); + INSTANCE.put("class401", "pa"); + INSTANCE.put("class403", "px"); + INSTANCE.put("class405", "pd"); + INSTANCE.put("class406", "pm"); + INSTANCE.put("class407", "pn"); + INSTANCE.put("class409", "pp"); + INSTANCE.put("class410", "pb"); + INSTANCE.put("class411", "pe"); + INSTANCE.put("class413", "pr"); + INSTANCE.put("class416", "qi"); + INSTANCE.put("class418", "qw"); + INSTANCE.put("class423", "ql"); + INSTANCE.put("class424", "qn"); + INSTANCE.put("class425", "qj"); + INSTANCE.put("class427", "qt"); + INSTANCE.put("class429", "qr"); + INSTANCE.put("class430", "qh"); + INSTANCE.put("class432", "qy"); + INSTANCE.put("class433", "qf"); + INSTANCE.put("class434", "qv"); + INSTANCE.put("class435", "qa"); + INSTANCE.put("class436", "qs"); + INSTANCE.put("class437", "qp"); + INSTANCE.put("class438", "qe"); + INSTANCE.put("class439", "qd"); + INSTANCE.put("class46", "bg"); + INSTANCE.put("class462", "rf"); + INSTANCE.put("class463", "ro"); + INSTANCE.put("class464", "rd"); + INSTANCE.put("class465", "rb"); + INSTANCE.put("class466", "rz"); + INSTANCE.put("class467", "rg"); + INSTANCE.put("class468", "sz"); + INSTANCE.put("class469", "sr"); + INSTANCE.put("class47", "bj"); + INSTANCE.put("class470", "sm"); + INSTANCE.put("class471", "sw"); + INSTANCE.put("class472", "sl"); + INSTANCE.put("class473", "su"); + INSTANCE.put("class474", "sh"); + INSTANCE.put("class475", "st"); + INSTANCE.put("class476", "sd"); + INSTANCE.put("class477", "si"); + INSTANCE.put("class478", "sq"); + INSTANCE.put("class479", "sy"); + INSTANCE.put("class480", "sf"); + INSTANCE.put("class481", "sa"); + INSTANCE.put("class490", "sk"); + INSTANCE.put("class491", "so"); + INSTANCE.put("class492", "sc"); + INSTANCE.put("class493", "sp"); + INSTANCE.put("class494", "th"); + INSTANCE.put("class495", "ti"); + INSTANCE.put("class5", "ah"); + INSTANCE.put("class500", "tw"); + INSTANCE.put("class504", "ts"); + INSTANCE.put("class505", "ty"); + INSTANCE.put("class508", "tv"); + INSTANCE.put("class51", "bw"); + INSTANCE.put("class511", "tn"); + INSTANCE.put("class512", "tx"); + INSTANCE.put("class513", "td"); + INSTANCE.put("class514", "tg"); + INSTANCE.put("class515", "tk"); + INSTANCE.put("class516", "tq"); + INSTANCE.put("class517", "tr"); + INSTANCE.put("class518", "tz"); + INSTANCE.put("class519", "tj"); + INSTANCE.put("class521", "uq"); + INSTANCE.put("class523", "uu"); + INSTANCE.put("class525", "um"); + INSTANCE.put("class53", "cu"); + INSTANCE.put("class530", "up"); + INSTANCE.put("class533", "uk"); + INSTANCE.put("class534", "uh"); + INSTANCE.put("class537", "uv"); + INSTANCE.put("class538", "ut"); + INSTANCE.put("class541", "uf"); + INSTANCE.put("class544", "ue"); + INSTANCE.put("class547", "vz"); + INSTANCE.put("class553", "vj"); + INSTANCE.put("class59", "cy"); + INSTANCE.put("class6", "ar"); + INSTANCE.put("class60", "cz"); + INSTANCE.put("class64", "ck"); + INSTANCE.put("class7", "ab"); + INSTANCE.put("class73", "cd"); INSTANCE.put("class74", "ct"); - INSTANCE.put("class8", "aa"); - INSTANCE.put("class85", "da"); - INSTANCE.put("class89", "dl"); - INSTANCE.put("class9", "af"); - INSTANCE.put("class90", "dk"); - INSTANCE.put("class92", "dz"); - INSTANCE.put("class93", "dw"); + INSTANCE.put("class76", "cl"); + INSTANCE.put("class8", "am"); + INSTANCE.put("class87", "df"); + INSTANCE.put("class9", "av"); + INSTANCE.put("class91", "do"); + INSTANCE.put("class92", "dh"); + INSTANCE.put("class94", "du"); + INSTANCE.put("class95", "dr"); INSTANCE.put("Client", "client"); - INSTANCE.put("ClientPacket", "lw"); - INSTANCE.put("ClientPreferences", "dp"); - INSTANCE.put("Clips", "jl"); - INSTANCE.put("Clock", "ht"); - INSTANCE.put("CollisionMap", "is"); + INSTANCE.put("ClientPacket", "ln"); + INSTANCE.put("ClientPreferences", "dy"); + INSTANCE.put("Clips", "jb"); + INSTANCE.put("Clock", "hu"); + INSTANCE.put("CollisionMap", "ih"); INSTANCE.put("com/jagex/oldscape/pub/OtlTokenRequester", "com/jagex/oldscape/pub/OtlTokenRequester"); INSTANCE.put("com/jagex/oldscape/pub/RefreshAccessTokenRequester", "com/jagex/oldscape/pub/RefreshAccessTokenRequester"); INSTANCE.put("com/jagex/oldscape/pub/RefreshAccessTokenResponse", "com/jagex/oldscape/pub/RefreshAccessTokenResponse"); - INSTANCE.put("ConcurrentMidiTask", "pe"); - INSTANCE.put("Coord", "mc"); - INSTANCE.put("DbRowType", "tc"); - INSTANCE.put("DbTableType", "tk"); - INSTANCE.put("Decimator", "cx"); + INSTANCE.put("ConcurrentMidiTask", "qz"); + INSTANCE.put("Coord", "mo"); + INSTANCE.put("DbRowType", "ug"); + INSTANCE.put("DbTableType", "uz"); + INSTANCE.put("Decimator", "cg"); INSTANCE.put("DefaultsGroup", "rh"); - INSTANCE.put("DelayFadeTask", "pn"); - INSTANCE.put("DemotingHashTable", "kg"); - INSTANCE.put("DesktopPlatformInfoProvider", "sw"); - INSTANCE.put("DevicePcmPlayer", "aw"); - INSTANCE.put("DevicePcmPlayerProvider", "aj"); - INSTANCE.put("DirectByteArrayCopier", "ms"); - INSTANCE.put("DirectWrapper", "lu"); - INSTANCE.put("DualNode", "sq"); - INSTANCE.put("DualNodeDeque", "os"); - INSTANCE.put("DynamicObject", "dj"); - INSTANCE.put("EnumComposition", "hu"); - INSTANCE.put("EvictingDualNodeHashTable", "le"); - INSTANCE.put("FaceNormal", "iq"); - INSTANCE.put("FadeInTask", "pt"); - INSTANCE.put("FadeOutTask", "px"); + INSTANCE.put("DelayFadeTask", "qb"); + INSTANCE.put("DemotingHashTable", "ls"); + INSTANCE.put("DesktopPlatformInfoProvider", "sn"); + INSTANCE.put("DevicePcmPlayer", "af"); + INSTANCE.put("DevicePcmPlayerProvider", "az"); + INSTANCE.put("DirectByteArrayCopier", "nh"); + INSTANCE.put("DirectWrapper", "lz"); + INSTANCE.put("DualNode", "sb"); + INSTANCE.put("DualNodeDeque", "pl"); + INSTANCE.put("DynamicObject", "dx"); + INSTANCE.put("EnumComposition", "ht"); + INSTANCE.put("EvictingDualNodeHashTable", "lr"); + INSTANCE.put("FaceNormal", "jv"); + INSTANCE.put("FadeInTask", "qg"); + INSTANCE.put("FadeOutTask", "qk"); INSTANCE.put("FileSystem", "ga"); - INSTANCE.put("FillMode", "um"); - INSTANCE.put("FloorDecoration", "iy"); - INSTANCE.put("FloorOverlayDefinition", "hr"); - INSTANCE.put("FloorUnderlayDefinition", "hs"); - INSTANCE.put("Font", "pi"); - INSTANCE.put("FontName", "sp"); - INSTANCE.put("Fonts", "sr"); - INSTANCE.put("Frames", "jt"); - INSTANCE.put("Friend", "qo"); - INSTANCE.put("FriendLoginUpdate", "qg"); - INSTANCE.put("FriendsChat", "qc"); - INSTANCE.put("FriendsList", "qk"); + INSTANCE.put("FloorDecoration", "jd"); + INSTANCE.put("FloorOverlayDefinition", "io"); + INSTANCE.put("FloorUnderlayDefinition", "ie"); + INSTANCE.put("Font", "pu"); + INSTANCE.put("FontName", "tc"); + INSTANCE.put("Fonts", "tt"); + INSTANCE.put("Frames", "ja"); + INSTANCE.put("Friend", "rq"); + INSTANCE.put("FriendLoginUpdate", "rr"); + INSTANCE.put("FriendsChat", "rl"); + INSTANCE.put("FriendsList", "rt"); INSTANCE.put("FriendSystem", "ci"); - INSTANCE.put("GameBuild", "nb"); - INSTANCE.put("GameEngine", "bm"); - INSTANCE.put("GameObject", "jy"); - INSTANCE.put("GrandExchangeEvent", "oz"); - INSTANCE.put("GrandExchangeEvents", "no"); - INSTANCE.put("GrandExchangeOffer", "oh"); - INSTANCE.put("GrandExchangeOfferAgeComparator", "nc"); - INSTANCE.put("GrandExchangeOfferNameComparator", "nh"); - INSTANCE.put("GrandExchangeOfferOwnWorldComparator", "cu"); - INSTANCE.put("GrandExchangeOfferTotalQuantityComparator", "nx"); - INSTANCE.put("GrandExchangeOfferUnitPriceComparator", "oy"); - INSTANCE.put("GrandExchangeOfferWorldComparator", "om"); - INSTANCE.put("GraphicsDefaults", "rr"); - INSTANCE.put("GraphicsObject", "cg"); - INSTANCE.put("GZipDecompressor", "us"); - INSTANCE.put("HealthBar", "dm"); - INSTANCE.put("HealthBarDefinition", "hl"); - INSTANCE.put("HealthBarUpdate", "do"); - INSTANCE.put("HitSplatDefinition", "hm"); - INSTANCE.put("HorizontalAlignment", "he"); - INSTANCE.put("Huffman", "mx"); - INSTANCE.put("Ignored", "qu"); - INSTANCE.put("IgnoreList", "qq"); - INSTANCE.put("IndexedSprite", "uk"); - INSTANCE.put("Instrument", "cq"); - INSTANCE.put("IntegerNode", "sz"); - INSTANCE.put("InterfaceParent", "ds"); - INSTANCE.put("Interpreter", "cb"); - INSTANCE.put("IntHashTable", "uz"); - INSTANCE.put("InvDefinition", "hh"); - INSTANCE.put("IsaacCipher", "ux"); - INSTANCE.put("ItemComposition", "hn"); - INSTANCE.put("ItemContainer", "dd"); - INSTANCE.put("ItemLayer", "ir"); - INSTANCE.put("IterableDualNodeQueue", "ou"); - INSTANCE.put("IterableDualNodeQueueIterator", "ol"); - INSTANCE.put("IterableNodeDeque", "oc"); - INSTANCE.put("IterableNodeDequeDescendingIterator", "ot"); - INSTANCE.put("IterableNodeHashTable", "sf"); - INSTANCE.put("IterableNodeHashTableIterator", "sa"); - INSTANCE.put("JagexCache", "gp"); - INSTANCE.put("JagNetThread", "nf"); - INSTANCE.put("KeyHandler", "ak"); + INSTANCE.put("GameBuild", "ng"); + INSTANCE.put("GameEngine", "bb"); + INSTANCE.put("GameObject", "kl"); + INSTANCE.put("GrandExchangeEvent", "od"); + INSTANCE.put("GrandExchangeEvents", "ox"); + INSTANCE.put("GrandExchangeOffer", "og"); + INSTANCE.put("GrandExchangeOfferAgeComparator", "oy"); + INSTANCE.put("GrandExchangeOfferNameComparator", "oz"); + INSTANCE.put("GrandExchangeOfferOwnWorldComparator", "cm"); + INSTANCE.put("GrandExchangeOfferTotalQuantityComparator", "oc"); + INSTANCE.put("GrandExchangeOfferUnitPriceComparator", "oj"); + INSTANCE.put("GrandExchangeOfferWorldComparator", "ov"); + INSTANCE.put("GraphicsDefaults", "ru"); + INSTANCE.put("GraphicsObject", "ch"); + INSTANCE.put("GZipDecompressor", "vb"); + INSTANCE.put("HealthBar", "db"); + INSTANCE.put("HealthBarDefinition", "hj"); + INSTANCE.put("HealthBarUpdate", "dt"); + INSTANCE.put("HitSplatDefinition", "iw"); + INSTANCE.put("HorizontalAlignment", "hb"); + INSTANCE.put("Huffman", "ns"); + INSTANCE.put("Ignored", "ry"); + INSTANCE.put("IgnoreList", "qu"); + INSTANCE.put("IndexedSprite", "un"); + INSTANCE.put("Instrument", "cp"); + INSTANCE.put("IntegerNode", "ss"); + INSTANCE.put("InterfaceParent", "de"); + INSTANCE.put("Interpreter", "cx"); + INSTANCE.put("IntHashTable", "vr"); + INSTANCE.put("InvDefinition", "hm"); + INSTANCE.put("IsaacCipher", "vd"); + INSTANCE.put("ItemComposition", "iy"); + INSTANCE.put("ItemContainer", "dk"); + INSTANCE.put("ItemLayer", "jc"); + INSTANCE.put("IterableDualNodeQueue", "pt"); + INSTANCE.put("IterableDualNodeQueueIterator", "ps"); + INSTANCE.put("IterableNodeDeque", "py"); + INSTANCE.put("IterableNodeDequeDescendingIterator", "pj"); + INSTANCE.put("IterableNodeHashTable", "tp"); + INSTANCE.put("IterableNodeHashTableIterator", "tm"); + INSTANCE.put("JagexCache", "gv"); + INSTANCE.put("JagNetThread", "oo"); + INSTANCE.put("JSException", "pq"); + INSTANCE.put("KeyHandler", "ad"); INSTANCE.put("KitDefinition", "hz"); - INSTANCE.put("Language", "on"); - INSTANCE.put("Link", "ri"); - INSTANCE.put("LinkDeque", "ox"); - INSTANCE.put("Login", "cy"); - INSTANCE.put("LoginPacket", "lk"); - INSTANCE.put("LoginScreenAnimation", "db"); - INSTANCE.put("LoginType", "sl"); - INSTANCE.put("LongNode", "st"); - INSTANCE.put("MenuAction", "cz"); - INSTANCE.put("Message", "co"); - INSTANCE.put("Messages", "ea"); - INSTANCE.put("MidiFileReader", "lq"); - INSTANCE.put("MidiPcmStream", "lf"); - INSTANCE.put("MilliClock", "gr"); - INSTANCE.put("Model", "jr"); - INSTANCE.put("ModelData", "ic"); - INSTANCE.put("ModelData0", "jq"); - INSTANCE.put("ModeWhere", "oe"); - INSTANCE.put("MouseHandler", "bf"); - INSTANCE.put("MouseRecorder", "dt"); - INSTANCE.put("MouseWheelHandler", "ay"); - INSTANCE.put("MoveSpeed", "in"); - INSTANCE.put("MusicPatch", "ll"); - INSTANCE.put("MusicPatchNode", "mg"); - INSTANCE.put("MusicPatchNode2", "lj"); - INSTANCE.put("MusicPatchPcmStream", "mh"); - INSTANCE.put("MusicSong", "mu"); - INSTANCE.put("MusicTrack", "mv"); - INSTANCE.put("NanoClock", "gs"); - INSTANCE.put("NewShit", "hq"); + INSTANCE.put("Language", "oa"); + INSTANCE.put("Link", "sg"); + INSTANCE.put("LinkDeque", "ph"); + INSTANCE.put("Login", "ca"); + INSTANCE.put("LoginPacket", "mi"); + INSTANCE.put("LoginScreenAnimation", "dd"); + INSTANCE.put("LoginType", "te"); + INSTANCE.put("LongNode", "se"); + INSTANCE.put("MenuAction", "cf"); + INSTANCE.put("Message", "cr"); + INSTANCE.put("Messages", "er"); + INSTANCE.put("MidiFileReader", "mf"); + INSTANCE.put("MidiPcmStream", "mt"); + INSTANCE.put("MilliClock", "go"); + INSTANCE.put("Model", "jn"); + INSTANCE.put("ModelData", "jw"); + INSTANCE.put("ModelData0", "km"); + INSTANCE.put("ModeWhere", "or"); + INSTANCE.put("MouseHandler", "bo"); + INSTANCE.put("MouseRecorder", "dp"); + INSTANCE.put("MouseWheelHandler", "aq"); + INSTANCE.put("MoveSpeed", "ip"); + INSTANCE.put("MusicPatch", "mq"); + INSTANCE.put("MusicPatchNode", "ms"); + INSTANCE.put("MusicPatchNode2", "mx"); + INSTANCE.put("MusicPatchPcmStream", "mn"); + INSTANCE.put("MusicSong", "mv"); + INSTANCE.put("MusicTrack", "mk"); + INSTANCE.put("NanoClock", "gy"); + INSTANCE.put("NewShit", "he"); INSTANCE.put("Node", "sj"); - INSTANCE.put("NodeDeque", "ow"); - INSTANCE.put("NodeHashTable", "so"); - INSTANCE.put("NPC", "dx"); + INSTANCE.put("NodeDeque", "pf"); + INSTANCE.put("NodeHashTable", "tf"); + INSTANCE.put("NPC", "dc"); INSTANCE.put("NPCComposition", "hw"); - INSTANCE.put("Null", "org/json/JSONObject$Null"); - INSTANCE.put("ObjectComposition", "hv"); - INSTANCE.put("ObjectNode", "sd"); - INSTANCE.put("ObjectSound", "ca"); - INSTANCE.put("ObjTypeCustomisation", "ho"); - INSTANCE.put("Occluder", "jn"); + INSTANCE.put("ObjectComposition", "iz"); + INSTANCE.put("ObjectNode", "sv"); + INSTANCE.put("ObjectSound", "cj"); + INSTANCE.put("ObjTypeCustomisation", "hy"); + INSTANCE.put("Occluder", "je"); INSTANCE.put("org/json/JSONArray", "org/json/JSONArray"); INSTANCE.put("org/json/JSONException", "org/json/JSONException"); INSTANCE.put("org/json/JSONObject", "org/json/JSONObject"); INSTANCE.put("org/json/JSONString", "org/json/JSONString"); INSTANCE.put("org/json/JSONTokener", "org/json/JSONTokener"); INSTANCE.put("org/json/Null", "org/json/JSONObject$Null"); - INSTANCE.put("OtlTokenRequester", "com/jagex/oldscape/pub/OtlTokenRequester"); INSTANCE.put("OtlTokenResponse", "com/jagex/oldscape/pub/OtlTokenResponse"); - INSTANCE.put("PacketBuffer", "to"); - INSTANCE.put("PacketBufferNode", "ly"); - INSTANCE.put("PacketWriter", "er"); - INSTANCE.put("ParamComposition", "hx"); - INSTANCE.put("PcmPlayer", "bb"); - INSTANCE.put("PcmStream", "bw"); - INSTANCE.put("PcmStreamMixer", "bl"); - INSTANCE.put("PcmStreamMixerListener", "cs"); - INSTANCE.put("PendingSpawn", "dv"); - INSTANCE.put("PlatformInfo", "sm"); - INSTANCE.put("Player", "df"); - INSTANCE.put("PlayerComposition", "mt"); - INSTANCE.put("Players", "ee"); - INSTANCE.put("PlayerType", "nn"); - INSTANCE.put("PrivateChatMode", "ub"); - INSTANCE.put("Projectile", "ck"); - INSTANCE.put("Rasterizer2D", "ut"); - INSTANCE.put("Rasterizer3D", "ix"); - INSTANCE.put("RasterProvider", "by"); - INSTANCE.put("RawPcmStream", "bn"); - INSTANCE.put("RawSound", "bu"); - INSTANCE.put("ReflectionCheck", "ba"); - INSTANCE.put("RefreshAccessTokenRequester", "com/jagex/oldscape/pub/RefreshAccessTokenRequester"); - INSTANCE.put("RefreshAccessTokenResponse", "com/jagex/oldscape/pub/RefreshAccessTokenResponse"); - INSTANCE.put("Renderable", "ik"); - INSTANCE.put("RouteStrategy", "iw"); - INSTANCE.put("RunException", "uy"); - INSTANCE.put("Scene", "iv"); - INSTANCE.put("SceneTileModel", "jv"); - INSTANCE.put("SceneTilePaint", "jg"); - INSTANCE.put("Script", "dh"); - INSTANCE.put("ScriptEvent", "dy"); - INSTANCE.put("ScriptFrame", "cv"); - INSTANCE.put("SecureRandomCallable", "dn"); - INSTANCE.put("SecureRandomFuture", "cc"); - INSTANCE.put("SequenceDefinition", "ib"); - INSTANCE.put("ServerPacket", "lg"); - INSTANCE.put("Skeleton", "iu"); - INSTANCE.put("Skills", "nl"); - INSTANCE.put("SoftWrapper", "lx"); - INSTANCE.put("SongTask", "pm"); - INSTANCE.put("SoundCache", "bi"); - INSTANCE.put("SoundEffect", "bp"); - INSTANCE.put("SoundEnvelope", "br"); - INSTANCE.put("SoundSystem", "be"); - INSTANCE.put("SpotAnimation", "un"); - INSTANCE.put("SpotAnimationDefinition", "ha"); - INSTANCE.put("SpriteMask", "me"); - INSTANCE.put("SpritePixels", "ui"); - INSTANCE.put("Strings", "nr"); - INSTANCE.put("StructComposition", "hc"); - INSTANCE.put("StudioGame", "ns"); - INSTANCE.put("SwapSongTask", "po"); - INSTANCE.put("Task", "gz"); - INSTANCE.put("TaskHandler", "gh"); - INSTANCE.put("Texture", "if"); - INSTANCE.put("TextureLoader", "js"); - INSTANCE.put("TextureProvider", "jk"); - INSTANCE.put("Tile", "ii"); - INSTANCE.put("TileItem", "ed"); - INSTANCE.put("Tiles", "du"); - INSTANCE.put("Timer", "py"); - INSTANCE.put("TriBool", "qp"); - INSTANCE.put("UrlRequest", "et"); - INSTANCE.put("UrlRequester", "ev"); - INSTANCE.put("User", "qs"); - INSTANCE.put("UserComparator1", "ua"); - INSTANCE.put("UserComparator10", "ef"); - INSTANCE.put("UserComparator2", "uj"); - INSTANCE.put("UserComparator3", "el"); - INSTANCE.put("UserComparator4", "en"); - INSTANCE.put("UserComparator5", "es"); - INSTANCE.put("UserComparator6", "ec"); - INSTANCE.put("UserComparator7", "ei"); - INSTANCE.put("UserComparator8", "eb"); - INSTANCE.put("UserComparator9", "em"); - INSTANCE.put("UserList", "qt"); - INSTANCE.put("Username", "uc"); - INSTANCE.put("Usernamed", "ql"); - INSTANCE.put("VarbitComposition", "hb"); - INSTANCE.put("VarcInt", "hk"); - INSTANCE.put("Varcs", "ej"); - INSTANCE.put("VarpDefinition", "hi"); - INSTANCE.put("Varps", "mz"); - INSTANCE.put("VertexNormal", "ja"); - INSTANCE.put("VerticalAlignment", "hy"); - INSTANCE.put("ViewportMouse", "jc"); - INSTANCE.put("VorbisCodebook", "cw"); - INSTANCE.put("VorbisFloor", "bo"); - INSTANCE.put("VorbisMapping", "bc"); - INSTANCE.put("VorbisSample", "cm"); - INSTANCE.put("WallDecoration", "jw"); - INSTANCE.put("Widget", "mi"); - INSTANCE.put("World", "ch"); - INSTANCE.put("WorldMap", "si"); - INSTANCE.put("WorldMapArchiveLoader", "sb"); - INSTANCE.put("WorldMapArea", "jf"); - INSTANCE.put("WorldMapAreaData", "kv"); - INSTANCE.put("WorldMapCacheName", "kr"); - INSTANCE.put("WorldMapData_0", "jx"); - INSTANCE.put("WorldMapData_1", "jh"); - INSTANCE.put("WorldMapDecoration", "kn"); - INSTANCE.put("WorldMapDecorationType", "nm"); - INSTANCE.put("WorldMapElement", "hd"); - INSTANCE.put("WorldMapEvent", "kl"); - INSTANCE.put("WorldMapIcon_0", "ki"); - INSTANCE.put("WorldMapIcon_1", "jz"); - INSTANCE.put("WorldMapLabel", "kq"); - INSTANCE.put("WorldMapLabelSize", "jb"); - INSTANCE.put("WorldMapManager", "jd"); - INSTANCE.put("WorldMapRectangle", "ks"); - INSTANCE.put("WorldMapRegion", "jm"); - INSTANCE.put("WorldMapScaleHandler", "ku"); - INSTANCE.put("WorldMapSection", "kw"); - INSTANCE.put("WorldMapSection0", "kj"); - INSTANCE.put("WorldMapSection1", "ky"); - INSTANCE.put("WorldMapSection2", "jp"); - INSTANCE.put("WorldMapSectionType", "ko"); - INSTANCE.put("WorldMapSprite", "kd"); - INSTANCE.put("Wrapper", "lo"); - INSTANCE.put("ZoneOperation", "ls"); + INSTANCE.put("PacketBuffer", "uy"); + INSTANCE.put("PacketBufferNode", "lx"); + INSTANCE.put("PacketWriter", "ez"); + INSTANCE.put("ParamComposition", "ix"); + INSTANCE.put("PcmPlayer", "bu"); + INSTANCE.put("PcmStream", "bi"); + INSTANCE.put("PcmStreamMixer", "bm"); + INSTANCE.put("PcmStreamMixerListener", "cc"); + INSTANCE.put("PendingSpawn", "dw"); + INSTANCE.put("PlatformInfo", "sx"); + INSTANCE.put("Player", "dj"); + INSTANCE.put("PlayerComposition", "ni"); + INSTANCE.put("Players", "ei"); + INSTANCE.put("PlayerType", "ol"); + INSTANCE.put("PrivateChatMode", "va"); + INSTANCE.put("Projectile", "dv"); + INSTANCE.put("Rasterizer2D", "uc"); + INSTANCE.put("Rasterizer3D", "jx"); + INSTANCE.put("RasterProvider", "ba"); + INSTANCE.put("RawPcmStream", "bx"); + INSTANCE.put("RawSound", "bs"); + INSTANCE.put("ReflectionCheck", "bt"); + INSTANCE.put("Renderable", "jy"); + INSTANCE.put("RouteStrategy", "iq"); + INSTANCE.put("RunException", "ve"); + INSTANCE.put("Scene", "jt"); + INSTANCE.put("SceneTileModel", "jf"); + INSTANCE.put("SceneTilePaint", "jz"); + INSTANCE.put("Script", "ds"); + INSTANCE.put("ScriptEvent", "dl"); + INSTANCE.put("ScriptFrame", "cn"); + INSTANCE.put("SecureRandomCallable", "dz"); + INSTANCE.put("SecureRandomFuture", "dm"); + INSTANCE.put("SequenceDefinition", "if"); + INSTANCE.put("ServerPacket", "lu"); + INSTANCE.put("Skeleton", "ju"); + INSTANCE.put("Skills", "nu"); + INSTANCE.put("SoftWrapper", "ld"); + INSTANCE.put("SongTask", "qm"); + INSTANCE.put("SoundCache", "bl"); + INSTANCE.put("SoundEffect", "br"); + INSTANCE.put("SoundEnvelope", "bf"); + INSTANCE.put("SoundSystem", "bh"); + INSTANCE.put("SpotAnimation", "vk"); + INSTANCE.put("SpotAnimationDefinition", "ir"); + INSTANCE.put("SpriteMask", "mp"); + INSTANCE.put("SpritePixels", "ud"); + INSTANCE.put("Strings", "oq"); + INSTANCE.put("StructComposition", "ii"); + INSTANCE.put("StudioGame", "np"); + INSTANCE.put("SwapSongTask", "pz"); + INSTANCE.put("Task", "hi"); + INSTANCE.put("TaskHandler", "gw"); + INSTANCE.put("Texture", "jo"); + INSTANCE.put("TextureLoader", "kg"); + INSTANCE.put("TextureProvider", "jq"); + INSTANCE.put("Tile", "jh"); + INSTANCE.put("TileItem", "el"); + INSTANCE.put("Tiles", "dq"); + INSTANCE.put("Timer", "qq"); + INSTANCE.put("TriBool", "ra"); + INSTANCE.put("UrlRequest", "eq"); + INSTANCE.put("UrlRequester", "en"); + INSTANCE.put("User", "rp"); + INSTANCE.put("UserComparator1", "uw"); + INSTANCE.put("UserComparator10", "ea"); + INSTANCE.put("UserComparator2", "ux"); + INSTANCE.put("UserComparator3", "ev"); + INSTANCE.put("UserComparator4", "ej"); + INSTANCE.put("UserComparator5", "eb"); + INSTANCE.put("UserComparator6", "ey"); + INSTANCE.put("UserComparator7", "eh"); + INSTANCE.put("UserComparator8", "et"); + INSTANCE.put("UserComparator9", "ee"); + INSTANCE.put("UserList", "rn"); + INSTANCE.put("Username", "vf"); + INSTANCE.put("Usernamed", "qc"); + INSTANCE.put("VarbitComposition", "is"); + INSTANCE.put("VarcInt", "hg"); + INSTANCE.put("Varcs", "ek"); + INSTANCE.put("VarpDefinition", "ha"); + INSTANCE.put("Varps", "md"); + INSTANCE.put("VertexNormal", "jp"); + INSTANCE.put("VerticalAlignment", "hr"); + INSTANCE.put("ViewportMouse", "netscape/js"); + INSTANCE.put("VorbisCodebook", "ce"); + INSTANCE.put("VorbisFloor", "bc"); + INSTANCE.put("VorbisMapping", "bq"); + INSTANCE.put("VorbisSample", "cw"); + INSTANCE.put("WallDecoration", "kq"); + INSTANCE.put("Widget", "nm"); + INSTANCE.put("WidgetDefinition", "nt"); + INSTANCE.put("World", "cv"); + INSTANCE.put("WorldMap", "tu"); + INSTANCE.put("WorldMapArchiveLoader", "tb"); + INSTANCE.put("WorldMapArea", "kz"); + INSTANCE.put("WorldMapAreaData", "lj"); + INSTANCE.put("WorldMapCacheName", "lh"); + INSTANCE.put("WorldMapData_0", "kj"); + INSTANCE.put("WorldMapData_1", "kh"); + INSTANCE.put("WorldMapDecoration", "kt"); + INSTANCE.put("WorldMapDecorationType", "nl"); + INSTANCE.put("WorldMapElement", "hp"); + INSTANCE.put("WorldMapEvent", "li"); + INSTANCE.put("WorldMapIcon_0", "kf"); + INSTANCE.put("WorldMapIcon_1", "kb"); + INSTANCE.put("WorldMapLabel", "kd"); + INSTANCE.put("WorldMapLabelSize", "ka"); + INSTANCE.put("WorldMapManager", "kk"); + INSTANCE.put("WorldMapRectangle", "kx"); + INSTANCE.put("WorldMapRegion", "ke"); + INSTANCE.put("WorldMapScaleHandler", "lf"); + INSTANCE.put("WorldMapSection", "lm"); + INSTANCE.put("WorldMapSection0", "kw"); + INSTANCE.put("WorldMapSection1", "ly"); + INSTANCE.put("WorldMapSection2", "kn"); + INSTANCE.put("WorldMapSectionType", "ky"); + INSTANCE.put("WorldMapSprite", "kc"); + INSTANCE.put("Wrapper", "lb"); + INSTANCE.put("ZoneOperation", "lq"); } } \ No newline at end of file diff --git a/osrs/src/main/java/netscape/js/JSObject.java b/osrs/src/main/java/netscape/js/JSObject.java index aaca02a84..235878abc 100644 --- a/osrs/src/main/java/netscape/js/JSObject.java +++ b/osrs/src/main/java/netscape/js/JSObject.java @@ -69,7 +69,7 @@ protected JSObject() { - public abstract Object call(String methodName, Object... args) throws netscape.js.JSException; + public abstract Object call(String methodName, Object... args) throws JSException; @@ -83,7 +83,7 @@ protected JSObject() { - public abstract Object eval(String s) throws netscape.js.JSException; + public abstract Object eval(String s) throws JSException; @@ -96,7 +96,7 @@ protected JSObject() { - public abstract Object getMember(String name) throws netscape.js.JSException; + public abstract Object getMember(String name) throws JSException; @@ -110,7 +110,7 @@ protected JSObject() { - public abstract void setMember(String name, Object value) throws netscape.js.JSException; + public abstract void setMember(String name, Object value) throws JSException; @@ -122,7 +122,7 @@ protected JSObject() { - public abstract void removeMember(String name) throws netscape.js.JSException; + public abstract void removeMember(String name) throws JSException; @@ -135,7 +135,7 @@ protected JSObject() { - public abstract Object getSlot(int index) throws netscape.js.JSException; + public abstract Object getSlot(int index) throws JSException; @@ -149,7 +149,7 @@ protected JSObject() { - public abstract void setSlot(int index, Object value) throws netscape.js.JSException; + public abstract void setSlot(int index, Object value) throws JSException; diff --git a/osrs/src/main/java/org/json/JSONArray.java b/osrs/src/main/java/org/json/JSONArray.java index de0d4e2ae..c3997e73a 100644 --- a/osrs/src/main/java/org/json/JSONArray.java +++ b/osrs/src/main/java/org/json/JSONArray.java @@ -22,7 +22,7 @@ public JSONArray() { this.myArrayList = new ArrayList(); } - public JSONArray(JSONTokener var1) throws JSONException { + public JSONArray(org.json.JSONTokener var1) throws org.json.JSONException { this(); char var2 = var1.nextClean(); char var3; @@ -72,7 +72,7 @@ public JSONArray(JSONTokener var1) throws JSONException { } } - public JSONArray(String var1) throws JSONException { + public JSONArray(String var1) throws org.json.JSONException { this(new JSONTokener(var1)); } @@ -80,29 +80,29 @@ public JSONArray(Collection var1) { this.myArrayList = var1 == null ? new ArrayList() : new ArrayList(var1); } - public JSONArray(Object var1) throws JSONException { + public JSONArray(Object var1) throws org.json.JSONException { this(); if (!var1.getClass().isArray()) { - throw new JSONException("JSONArray initial value should be a string or collection or array."); + throw new org.json.JSONException("JSONArray initial value should be a string or collection or array."); } else { int var2 = Array.getLength(var1); for (int var3 = 0; var3 < var2; ++var3) { - this.method2705(Array.get(var1, var3)); + this.method2746(Array.get(var1, var3)); } } } - public JSONArray(Object var1, boolean var2) throws JSONException { + public JSONArray(Object var1, boolean var2) throws org.json.JSONException { this(); if (!var1.getClass().isArray()) { - throw new JSONException("JSONArray initial value should be a string or collection or array."); + throw new org.json.JSONException("JSONArray initial value should be a string or collection or array."); } else { int var3 = Array.getLength(var1); for (int var4 = 0; var4 < var3; ++var4) { - this.method2705(new JSONObject(Array.get(var1, var4), var2)); + this.method2746(new JSONObject(Array.get(var1, var4), var2)); } } @@ -121,62 +121,62 @@ public JSONArray(Collection var1, boolean var2) { } @ObfuscatedName("opt") - public Object method2704(int var1) { + public Object method2745(int var1) { return var1 >= 0 && var1 < this.length() ? this.myArrayList.get(var1) : null; } @ObfuscatedName("get") - public Object method2703(int var1) throws JSONException { - Object var2 = this.method2704(var1); + public Object method2744(int var1) throws org.json.JSONException { + Object var2 = this.method2745(var1); if (var2 == null) { - throw new JSONException("JSONArray[" + var1 + "] not found."); + throw new org.json.JSONException("JSONArray[" + var1 + "] not found."); } else { return var2; } } @ObfuscatedName("put") - public JSONArray method2705(Object var1) { + public JSONArray method2746(Object var1) { this.myArrayList.add(var1); return this; } @Export("getBoolean") @ObfuscatedName("getBoolean") - public boolean getBoolean(int var1) throws JSONException { - Object var2 = this.method2703(var1); + public boolean getBoolean(int var1) throws org.json.JSONException { + Object var2 = this.method2744(var1); if (var2.equals(Boolean.FALSE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("false")) { return false; } else if (var2.equals(Boolean.TRUE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("true")) { return true; } else { - throw new JSONException("JSONArray[" + var1 + "] is not a Boolean."); + throw new org.json.JSONException("JSONArray[" + var1 + "] is not a Boolean."); } } @Export("getInt") @ObfuscatedName("getInt") - public int getInt(int var1) throws JSONException { - Object var2 = this.method2703(var1); + public int getInt(int var1) throws org.json.JSONException { + Object var2 = this.method2744(var1); return var2 instanceof Number ? ((Number)var2).intValue() : (int)this.getDouble(var1); } @Export("getLong") @ObfuscatedName("getLong") - public long getLong(int var1) throws JSONException { - Object var2 = this.method2703(var1); + public long getLong(int var1) throws org.json.JSONException { + Object var2 = this.method2744(var1); return var2 instanceof Number ? ((Number)var2).longValue() : (long)this.getDouble(var1); } @Export("getDouble") @ObfuscatedName("getDouble") - public double getDouble(int var1) throws JSONException { - Object var2 = this.method2703(var1); + public double getDouble(int var1) throws org.json.JSONException { + Object var2 = this.method2744(var1); try { return var2 instanceof Number ? ((Number)var2).doubleValue() : Double.valueOf((String)var2); } catch (Exception var4) { - throw new JSONException("JSONArray[" + var1 + "] is not a number."); + throw new org.json.JSONException("JSONArray[" + var1 + "] is not a number."); } } @@ -188,7 +188,7 @@ public int length() { @Export("join") @ObfuscatedName("join") - public String join(String var1) throws JSONException { + public String join(String var1) throws org.json.JSONException { int var2 = this.length(); StringBuffer var3 = new StringBuffer(); @@ -215,18 +215,18 @@ public double optDouble(int var1, double var2) { @Export("getJSONObject") @ObfuscatedName("getJSONObject") - public JSONObject getJSONObject(int var1) throws JSONException { - Object var2 = this.method2703(var1); + public JSONObject getJSONObject(int var1) throws org.json.JSONException { + Object var2 = this.method2744(var1); if (var2 instanceof JSONObject) { return (JSONObject)var2; } else { - throw new JSONException("JSONArray[" + var1 + "] is not a JSONObject."); + throw new org.json.JSONException("JSONArray[" + var1 + "] is not a JSONObject."); } } @Export("toString") @ObfuscatedName("toString") - String toString(int var1, int var2) throws JSONException { + String toString(int var1, int var2) throws org.json.JSONException { int var3 = this.length(); if (var3 == 0) { return "[]"; @@ -265,7 +265,7 @@ String toString(int var1, int var2) throws JSONException { @Export("write") @ObfuscatedName("write") - public Writer write(Writer var1) throws JSONException { + public Writer write(Writer var1) throws org.json.JSONException { try { boolean var2 = false; int var3 = this.length(); @@ -291,7 +291,7 @@ public Writer write(Writer var1) throws JSONException { var1.write(93); return var1; } catch (IOException var7) { - throw new JSONException(var7); + throw new org.json.JSONException(var7); } } @@ -308,7 +308,7 @@ public String toString() { @Export("getString") @ObfuscatedName("getString") public String getString(int var1) throws JSONException { - return this.method2703(var1).toString(); + return this.method2744(var1).toString(); } @Export("optBoolean") @@ -344,7 +344,7 @@ public long optLong(int var1, long var2) { @Export("optString") @ObfuscatedName("optString") public String optString(int var1, String var2) { - Object var3 = this.method2704(var1); + Object var3 = this.method2745(var1); return var3 != null ? var3.toString() : var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/org/json/JSONObject.java b/osrs/src/main/java/org/json/JSONObject.java index 54905e261..8b2b9a67c 100644 --- a/osrs/src/main/java/org/json/JSONObject.java +++ b/osrs/src/main/java/org/json/JSONObject.java @@ -18,17 +18,17 @@ public class JSONObject { @ObfuscatedName("NULL") public static final Object NULL; @ObfuscatedName("map") - Map field4293; + Map field4317; static { NULL = new Null(); } public JSONObject() { - this.field4293 = new HashMap(); + this.field4317 = new HashMap(); } - public JSONObject(JSONTokener var1) throws JSONException { + public JSONObject(org.json.JSONTokener var1) throws org.json.JSONException { this(); if (var1.nextClean() != '{') { throw var1.syntaxError("A JSONObject text must begin with '{'"); @@ -72,7 +72,7 @@ public JSONObject(JSONTokener var1) throws JSONException { } } - public JSONObject(String var1) throws JSONException { + public JSONObject(String var1) throws org.json.JSONException { this(new JSONTokener(var1)); } @@ -82,45 +82,45 @@ public JSONObject(Object var1, boolean var2) { } public JSONObject(Map var1) { - this.field4293 = (Map)(var1 == null ? new HashMap() : var1); + this.field4317 = (Map)(var1 == null ? new HashMap() : var1); } public JSONObject(Map var1, boolean var2) { - this.field4293 = new HashMap(); + this.field4317 = new HashMap(); if (var1 != null) { Iterator var3 = var1.entrySet().iterator(); while (var3.hasNext()) { Entry var4 = (Entry)var3.next(); - this.field4293.put(var4.getKey(), new JSONObject(var4.getValue(), var2)); + this.field4317.put(var4.getKey(), new JSONObject(var4.getValue(), var2)); } } } @ObfuscatedName("opt") - public Object method2708(String var1) { - return var1 == null ? null : this.field4293.get(var1); + public Object method2749(String var1) { + return var1 == null ? null : this.field4317.get(var1); } @ObfuscatedName("get") - public Object method2707(String var1) throws JSONException { - Object var2 = this.method2708(var1); + public Object method2748(String var1) throws org.json.JSONException { + Object var2 = this.method2749(var1); if (var2 == null) { - throw new JSONException("JSONObject[" + quote(var1) + "] not found."); + throw new org.json.JSONException("JSONObject[" + quote(var1) + "] not found."); } else { return var2; } } @ObfuscatedName("put") - public JSONObject method2709(String var1, Object var2) throws JSONException { + public JSONObject method2750(String var1, Object var2) throws org.json.JSONException { if (var1 == null) { - throw new JSONException("Null key."); + throw new org.json.JSONException("Null key."); } else { if (var2 != null) { testValidity(var2); - this.field4293.put(var1, var2); + this.field4317.put(var1, var2); } else { this.remove(var1); } @@ -131,51 +131,51 @@ public JSONObject method2709(String var1, Object var2) throws JSONException { @Export("getBoolean") @ObfuscatedName("getBoolean") - public boolean getBoolean(String var1) throws JSONException { - Object var2 = this.method2707(var1); + public boolean getBoolean(String var1) throws org.json.JSONException { + Object var2 = this.method2748(var1); if (var2.equals(Boolean.FALSE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("false")) { return false; } else if (var2.equals(Boolean.TRUE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("true")) { return true; } else { - throw new JSONException("JSONObject[" + quote(var1) + "] is not a Boolean."); + throw new org.json.JSONException("JSONObject[" + quote(var1) + "] is not a Boolean."); } } @Export("getLong") @ObfuscatedName("getLong") - public long getLong(String var1) throws JSONException { - Object var2 = this.method2707(var1); + public long getLong(String var1) throws org.json.JSONException { + Object var2 = this.method2748(var1); return var2 instanceof Number ? ((Number)var2).longValue() : (long)this.getDouble(var1); } @Export("keys") @ObfuscatedName("keys") public Iterator keys() { - return this.field4293.keySet().iterator(); + return this.field4317.keySet().iterator(); } @Export("getInt") @ObfuscatedName("getInt") - public int getInt(String var1) throws JSONException { - Object var2 = this.method2707(var1); + public int getInt(String var1) throws org.json.JSONException { + Object var2 = this.method2748(var1); return var2 instanceof Number ? ((Number)var2).intValue() : (int)this.getDouble(var1); } @Export("length") @ObfuscatedName("length") public int length() { - return this.field4293.size(); + return this.field4317.size(); } @Export("getJSONArray") @ObfuscatedName("getJSONArray") - public JSONArray getJSONArray(String var1) throws JSONException { - Object var2 = this.method2707(var1); - if (var2 instanceof JSONArray) { - return (JSONArray)var2; + public org.json.JSONArray getJSONArray(String var1) throws org.json.JSONException { + Object var2 = this.method2748(var1); + if (var2 instanceof org.json.JSONArray) { + return (org.json.JSONArray)var2; } else { - throw new JSONException("JSONObject[" + quote(var1) + "] is not a JSONArray."); + throw new org.json.JSONException("JSONObject[" + quote(var1) + "] is not a JSONArray."); } } @@ -209,19 +209,19 @@ void populateInternalMap(Object var1, boolean var2) { Object var9 = Reflection.invoke(var6, var1, (Object[])null); if (var9 == null) { - this.field4293.put(var8, NULL); + this.field4317.put(var8, NULL); } else if (var9.getClass().isArray()) { - this.field4293.put(var8, new JSONArray(var9, var2)); + this.field4317.put(var8, new org.json.JSONArray(var9, var2)); } else if (var9 instanceof Collection) { - this.field4293.put(var8, new JSONArray((Collection)var9, var2)); + this.field4317.put(var8, new org.json.JSONArray((Collection)var9, var2)); } else if (var9 instanceof Map) { - this.field4293.put(var8, new JSONObject((Map)var9, var2)); + this.field4317.put(var8, new JSONObject((Map)var9, var2)); } else if (this.isStandardProperty(var9.getClass())) { - this.field4293.put(var8, var9); + this.field4317.put(var8, var9); } else if (!var9.getClass().getPackage().getName().startsWith("java") && var9.getClass().getClassLoader() != null) { - this.field4293.put(var8, new JSONObject(var9, var2)); + this.field4317.put(var8, new JSONObject(var9, var2)); } else { - this.field4293.put(var8, var9.toString()); + this.field4317.put(var8, var9.toString()); } } } catch (Exception var10) { @@ -234,41 +234,41 @@ void populateInternalMap(Object var1, boolean var2) { @Export("remove") @ObfuscatedName("remove") public Object remove(String var1) { - return this.field4293.remove(var1); + return this.field4317.remove(var1); } @Export("getJSONObject") @ObfuscatedName("getJSONObject") - public JSONObject getJSONObject(String var1) throws JSONException { - Object var2 = this.method2707(var1); + public JSONObject getJSONObject(String var1) throws org.json.JSONException { + Object var2 = this.method2748(var1); if (var2 instanceof JSONObject) { return (JSONObject)var2; } else { - throw new JSONException("JSONObject[" + quote(var1) + "] is not a JSONObject."); + throw new org.json.JSONException("JSONObject[" + quote(var1) + "] is not a JSONObject."); } } @Export("sortedKeys") @ObfuscatedName("sortedKeys") public Iterator sortedKeys() { - return (new TreeSet(this.field4293.keySet())).iterator(); + return (new TreeSet(this.field4317.keySet())).iterator(); } @Export("getDouble") @ObfuscatedName("getDouble") - public double getDouble(String var1) throws JSONException { - Object var2 = this.method2707(var1); + public double getDouble(String var1) throws org.json.JSONException { + Object var2 = this.method2748(var1); try { return var2 instanceof Number ? ((Number)var2).doubleValue() : Double.valueOf((String)var2); } catch (Exception var4) { - throw new JSONException("JSONObject[" + quote(var1) + "] is not a number."); + throw new org.json.JSONException("JSONObject[" + quote(var1) + "] is not a number."); } } @Export("toString") @ObfuscatedName("toString") - String toString(int var1, int var2) throws JSONException { + String toString(int var1, int var2) throws org.json.JSONException { int var4 = this.length(); if (var4 == 0) { return "{}"; @@ -281,7 +281,7 @@ String toString(int var1, int var2) throws JSONException { var8 = var5.next(); var6.append(quote(var8.toString())); var6.append(": "); - var6.append(valueToString(this.field4293.get(var8), var1, var2)); + var6.append(valueToString(this.field4317.get(var8), var1, var2)); } else { while (true) { int var3; @@ -309,7 +309,7 @@ String toString(int var1, int var2) throws JSONException { var6.append(quote(var8.toString())); var6.append(": "); - var6.append(valueToString(this.field4293.get(var8), var1, var7)); + var6.append(valueToString(this.field4317.get(var8), var1, var7)); } } @@ -320,7 +320,7 @@ String toString(int var1, int var2) throws JSONException { @Export("write") @ObfuscatedName("write") - public Writer write(Writer var1) throws JSONException { + public Writer write(Writer var1) throws org.json.JSONException { try { boolean var2 = false; Iterator var3 = this.keys(); @@ -334,11 +334,11 @@ public Writer write(Writer var1) throws JSONException { Object var4 = var3.next(); var1.write(quote(var4.toString())); var1.write(58); - Object var5 = this.field4293.get(var4); + Object var5 = this.field4317.get(var4); if (var5 instanceof JSONObject) { ((JSONObject)var5).write(var1); - } else if (var5 instanceof JSONArray) { - ((JSONArray)var5).write(var1); + } else if (var5 instanceof org.json.JSONArray) { + ((org.json.JSONArray)var5).write(var1); } else { var1.write(valueToString(var5)); } @@ -347,14 +347,14 @@ public Writer write(Writer var1) throws JSONException { var1.write(125); return var1; } catch (IOException var7) { - throw new JSONException(var7); + throw new org.json.JSONException(var7); } } @Export("getString") @ObfuscatedName("getString") - public String getString(String var1) throws JSONException { - return this.method2707(var1).toString(); + public String getString(String var1) throws org.json.JSONException { + return this.method2748(var1).toString(); } @Export("toString") @@ -372,7 +372,7 @@ public String toString() { Object var3 = var1.next(); var2.append(quote(var3.toString())); var2.append(':'); - var2.append(valueToString(this.field4293.get(var3))); + var2.append(valueToString(this.field4317.get(var3))); } var2.append('}'); @@ -384,13 +384,13 @@ public String toString() { @Export("putOnce") @ObfuscatedName("putOnce") - public JSONObject putOnce(String var1, Object var2) throws JSONException { + public JSONObject putOnce(String var1, Object var2) throws org.json.JSONException { if (var1 != null && var2 != null) { - if (this.method2708(var1) != null) { - throw new JSONException("Duplicate key \"" + var1 + "\""); + if (this.method2749(var1) != null) { + throw new org.json.JSONException("Duplicate key \"" + var1 + "\""); } - this.method2709(var1, var2); + this.method2750(var1, var2); } return this; @@ -416,7 +416,7 @@ public boolean optBoolean(String var1, boolean var2) { @ObfuscatedName("optDouble") public double optDouble(String var1, double var2) { try { - Object var4 = this.method2708(var1); + Object var4 = this.method2749(var1); return var4 instanceof Number ? ((Number)var4).doubleValue() : new Double((String)var4); } catch (Exception var5) { return var2; @@ -446,15 +446,15 @@ public long optLong(String var1, long var2) { @Export("optString") @ObfuscatedName("optString") public String optString(String var1, String var2) { - Object var3 = this.method2708(var1); + Object var3 = this.method2749(var1); return var3 != null ? var3.toString() : var2; } @Export("putOpt") @ObfuscatedName("putOpt") - public JSONObject putOpt(String var1, Object var2) throws JSONException { + public JSONObject putOpt(String var1, Object var2) throws org.json.JSONException { if (var1 != null && var2 != null) { - this.method2709(var1, var2); + this.method2750(var1, var2); } return this; @@ -480,14 +480,14 @@ public static String[] getNames(JSONObject var0) { @Export("testValidity") @ObfuscatedName("testValidity") - static void testValidity(Object var0) throws JSONException { + static void testValidity(Object var0) throws org.json.JSONException { if (var0 != null) { if (var0 instanceof Double) { if (((Double)var0).isInfinite() || ((Double)var0).isNaN()) { - throw new JSONException("JSON does not allow non-finite numbers."); + throw new org.json.JSONException("JSON does not allow non-finite numbers."); } } else if (var0 instanceof Float && (((Float)var0).isInfinite() || ((Float)var0).isNaN())) { - throw new JSONException("JSON does not allow non-finite numbers."); + throw new org.json.JSONException("JSON does not allow non-finite numbers."); } } @@ -495,9 +495,9 @@ static void testValidity(Object var0) throws JSONException { @Export("numberToString") @ObfuscatedName("numberToString") - public static String numberToString(Number var0) throws JSONException { + public static String numberToString(Number var0) throws org.json.JSONException { if (var0 == null) { - throw new JSONException("Null pointer"); + throw new org.json.JSONException("Null pointer"); } else { testValidity(var0); String var1 = var0.toString(); @@ -574,11 +574,11 @@ public static String quote(String var0) { @Export("valueToString") @ObfuscatedName("valueToString") - static String valueToString(Object var0, int var1, int var2) throws JSONException { + static String valueToString(Object var0, int var1, int var2) throws org.json.JSONException { if (var0 != null && !var0.equals((Object)null)) { try { - if (var0 instanceof JSONString) { - String var3 = ((JSONString)var0).toJSONString(); + if (var0 instanceof org.json.JSONString) { + String var3 = ((org.json.JSONString)var0).toJSONString(); if (var3 instanceof String) { return (String)var3; } @@ -592,14 +592,14 @@ static String valueToString(Object var0, int var1, int var2) throws JSONExceptio return var0.toString(); } else if (var0 instanceof JSONObject) { return ((JSONObject)var0).toString(var1, var2); - } else if (var0 instanceof JSONArray) { - return ((JSONArray)var0).toString(var1, var2); + } else if (var0 instanceof org.json.JSONArray) { + return ((org.json.JSONArray)var0).toString(var1, var2); } else if (var0 instanceof Map) { return (new JSONObject((Map)var0)).toString(var1, var2); } else if (var0 instanceof Collection) { - return (new JSONArray((Collection)var0)).toString(var1, var2); + return (new org.json.JSONArray((Collection)var0)).toString(var1, var2); } else { - return var0.getClass().isArray() ? (new JSONArray(var0)).toString(var1, var2) : quote(var0.toString()); + return var0.getClass().isArray() ? (new org.json.JSONArray(var0)).toString(var1, var2) : quote(var0.toString()); } } else { return "null"; @@ -608,14 +608,14 @@ static String valueToString(Object var0, int var1, int var2) throws JSONExceptio @Export("valueToString") @ObfuscatedName("valueToString") - static String valueToString(Object var0) throws JSONException { + static String valueToString(Object var0) throws org.json.JSONException { if (var0 != null && !var0.equals((Object)null)) { - if (var0 instanceof JSONString) { + if (var0 instanceof org.json.JSONString) { String var1; try { var1 = ((JSONString)var0).toJSONString(); } catch (Exception var3) { - throw new JSONException(var3); + throw new org.json.JSONException(var3); } if (var1 instanceof String) { @@ -625,11 +625,11 @@ static String valueToString(Object var0) throws JSONException { } } else if (var0 instanceof Number) { return numberToString((Number)var0); - } else if (!(var0 instanceof Boolean) && !(var0 instanceof JSONObject) && !(var0 instanceof JSONArray)) { + } else if (!(var0 instanceof Boolean) && !(var0 instanceof JSONObject) && !(var0 instanceof org.json.JSONArray)) { if (var0 instanceof Map) { return (new JSONObject((Map)var0)).toString(); } else if (var0 instanceof Collection) { - return (new JSONArray((Collection)var0)).toString(); + return (new org.json.JSONArray((Collection)var0)).toString(); } else { return var0.getClass().isArray() ? (new JSONArray(var0)).toString() : quote(var0.toString()); } diff --git a/osrs/src/main/java/org/json/JSONTokener.java b/osrs/src/main/java/org/json/JSONTokener.java index 7a215f34c..979576a28 100644 --- a/osrs/src/main/java/org/json/JSONTokener.java +++ b/osrs/src/main/java/org/json/JSONTokener.java @@ -3,6 +3,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; import java.io.BufferedReader; import java.io.IOException; @@ -37,7 +40,7 @@ public JSONTokener(Reader var1) { @Export("nextClean") @ObfuscatedName("nextClean") - public char nextClean() throws JSONException { + public char nextClean() throws org.json.JSONException { char var1; do { var1 = this.next(); @@ -48,7 +51,7 @@ public char nextClean() throws JSONException { @Export("next") @ObfuscatedName("next") - public char next() throws JSONException { + public char next() throws org.json.JSONException { if (this.useLastChar) { this.useLastChar = false; if (this.lastChar != 0) { @@ -61,7 +64,7 @@ public char next() throws JSONException { try { var1 = this.reader.read(); } catch (IOException var3) { - throw new JSONException(var3); + throw new org.json.JSONException(var3); } if (var1 <= 0) { @@ -77,7 +80,7 @@ public char next() throws JSONException { @Export("nextTo") @ObfuscatedName("nextString") - public String nextTo(char var1) throws JSONException { + public String nextTo(char var1) throws org.json.JSONException { StringBuffer var3 = new StringBuffer(); while (true) { @@ -149,24 +152,24 @@ public String toString() { @Export("back") @ObfuscatedName("back") - public void back() throws JSONException { + public void back() throws org.json.JSONException { if (!this.useLastChar && this.index > 0) { --this.index; this.useLastChar = true; } else { - throw new JSONException("Stepping back two steps is not supported"); + throw new org.json.JSONException("Stepping back two steps is not supported"); } } @Export("syntaxError") @ObfuscatedName("syntaxError") - public JSONException syntaxError(String var1) { - return new JSONException(var1 + this.toString()); + public org.json.JSONException syntaxError(String var1) { + return new org.json.JSONException(var1 + this.toString()); } @Export("next") @ObfuscatedName("next") - public String next(int var1) throws JSONException { + public String next(int var1) throws org.json.JSONException { if (var1 == 0) { return ""; } else { @@ -184,7 +187,7 @@ public String next(int var1) throws JSONException { var3 += var4; } } catch (IOException var6) { - throw new JSONException(var6); + throw new org.json.JSONException(var6); } this.index += var3; diff --git a/osrs/src/main/java/org/json/Null.java b/osrs/src/main/java/org/json/Null.java index ba4ce6693..d164b5326 100644 --- a/osrs/src/main/java/org/json/Null.java +++ b/osrs/src/main/java/org/json/Null.java @@ -4,13 +4,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@Implements("org/json/JSONObject$Null") +@Implements("org/json/Null") @ObfuscatedName("org/json/JSONObject$Null") final class Null { - Null() { } + public final Object clone() { return this; } From f03f26b5fa6996823c4615a1ff1da818280e5720 Mon Sep 17 00:00:00 2001 From: Kaballist Date: Tue, 26 Sep 2023 10:21:42 -0700 Subject: [PATCH 10/17] expose getWidget --- osrs/src/main/java/Messages.java | 3 ++- osrs/src/main/java/class130.java | 2 +- osrs/src/main/java/class36.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/osrs/src/main/java/Messages.java b/osrs/src/main/java/Messages.java index c0a1d2638..1b35ca0f1 100644 --- a/osrs/src/main/java/Messages.java +++ b/osrs/src/main/java/Messages.java @@ -40,7 +40,8 @@ public class Messages { descriptor = "(II)Lis;", garbageValue = "517783557" ) - public static VarbitComposition method638(int var0) { + @Export("getWidget") + public static VarbitComposition getWidget(int var0) { VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); if (var1 != null) { return var1; diff --git a/osrs/src/main/java/class130.java b/osrs/src/main/java/class130.java index 81c25470c..7d4a9834b 100644 --- a/osrs/src/main/java/class130.java +++ b/osrs/src/main/java/class130.java @@ -60,7 +60,7 @@ public int rsOrdinal() { garbageValue = "861803654" ) public static void method704(int var0, int var1) { - VarbitComposition var2 = Messages.method638(var0); + VarbitComposition var2 = Messages.getWidget(var0); int var3 = var2.baseVar; int var4 = var2.startBit; int var5 = var2.endBit; diff --git a/osrs/src/main/java/class36.java b/osrs/src/main/java/class36.java index e3e249cb6..096e74d65 100644 --- a/osrs/src/main/java/class36.java +++ b/osrs/src/main/java/class36.java @@ -28,7 +28,7 @@ public class class36 { ) @Export("getVarbit") public static int getVarbit(int var0) { - VarbitComposition var1 = Messages.method638(var0); + VarbitComposition var1 = Messages.getWidget(var0); int var2 = var1.baseVar; int var3 = var1.startBit; int var4 = var1.endBit; From 7ba381316817d5df52339b76b871c5587851bdca Mon Sep 17 00:00:00 2001 From: Kaballist Date: Tue, 26 Sep 2023 11:22:03 -0700 Subject: [PATCH 11/17] mixin fixes --- .../java/net/runelite/rs/api/RSClient.java | 3 +- .../src/main/java/mixins/RSClientMixin.java | 6 ++ osrs/src/main/java/ArchiveDisk.java | 4 +- osrs/src/main/java/ClanChannel.java | 4 +- osrs/src/main/java/Client.java | 62 +++++++++---------- osrs/src/main/java/ClientPacket.java | 4 +- osrs/src/main/java/ClientPreferences.java | 6 +- osrs/src/main/java/DefaultsGroup.java | 4 +- .../main/java/DevicePcmPlayerProvider.java | 2 +- osrs/src/main/java/HealthBarDefinition.java | 6 +- osrs/src/main/java/Interpreter.java | 4 +- osrs/src/main/java/MusicPatchNode2.java | 2 +- osrs/src/main/java/MusicPatchPcmStream.java | 2 +- osrs/src/main/java/ObjectComposition.java | 23 +++---- osrs/src/main/java/PendingSpawn.java | 4 +- osrs/src/main/java/TextureProvider.java | 2 +- osrs/src/main/java/Tile.java | 10 +-- osrs/src/main/java/VarcInt.java | 4 +- osrs/src/main/java/Varps.java | 10 +-- osrs/src/main/java/VerticalAlignment.java | 4 +- osrs/src/main/java/class108.java | 4 +- osrs/src/main/java/class127.java | 2 +- osrs/src/main/java/class168.java | 10 +-- osrs/src/main/java/class17.java | 4 +- osrs/src/main/java/class178.java | 4 +- osrs/src/main/java/class20.java | 4 +- osrs/src/main/java/class212.java | 2 +- osrs/src/main/java/class214.java | 4 +- osrs/src/main/java/class266.java | 2 +- osrs/src/main/java/class286.java | 2 +- osrs/src/main/java/class30.java | 2 +- osrs/src/main/java/class304.java | 6 +- osrs/src/main/java/class31.java | 2 +- osrs/src/main/java/class314.java | 2 +- osrs/src/main/java/class33.java | 19 +++--- osrs/src/main/java/class357.java | 4 +- osrs/src/main/java/class4.java | 4 +- osrs/src/main/java/class401.java | 2 +- osrs/src/main/java/class410.java | 4 +- osrs/src/main/java/class436.java | 2 +- osrs/src/main/java/class478.java | 2 +- osrs/src/main/java/class511.java | 4 +- osrs/src/main/java/class76.java | 2 +- 43 files changed, 134 insertions(+), 125 deletions(-) diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java index fa05809ca..c46bf62e1 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java @@ -1644,7 +1644,8 @@ public interface RSClient extends RSGameEngine, Client @Import("widgetDefaultMenuAction") void invokeWidgetAction(int identifier, int param1, int param0, int itemId, String target); - + @Import("widgetDefinition") + RSWidgetDefinition getWidgetDefinition(); // Kris changes @Override diff --git a/mixins/src/main/java/mixins/RSClientMixin.java b/mixins/src/main/java/mixins/RSClientMixin.java index 5f28c81e2..5a4525bc2 100644 --- a/mixins/src/main/java/mixins/RSClientMixin.java +++ b/mixins/src/main/java/mixins/RSClientMixin.java @@ -2436,6 +2436,12 @@ public static void check(String name, RSEvictingDualNodeHashTable dualNodeHashTa dualNodeHashTable.getDeque().add(dualNodeHashTable.getDualNode()); } + @Inject + @Override + public RSEvictingDualNodeHashTable getWidgetSpriteCache() + { + return getWidgetDefinition() != null ? getWidgetDefinition().getWidgetSpriteCache() : null; + } @Inject public static void checkResize() { diff --git a/osrs/src/main/java/ArchiveDisk.java b/osrs/src/main/java/ArchiveDisk.java index 91931eca9..a2d559656 100644 --- a/osrs/src/main/java/ArchiveDisk.java +++ b/osrs/src/main/java/ArchiveDisk.java @@ -387,11 +387,11 @@ static final void closeInterface(InterfaceParent var0, boolean var1) { int var3 = (int)var0.key; var0.remove(); if (var1) { - class33.field89.method1743(var2); + class33.widgetDefinition.method1743(var2); } class379.method1983(var2); - Widget var4 = class33.field89.method1740(var3); + Widget var4 = class33.widgetDefinition.method1740(var3); if (var4 != null) { ClanChannelMember.invalidateWidget(var4); } diff --git a/osrs/src/main/java/ClanChannel.java b/osrs/src/main/java/ClanChannel.java index 4f59d6db9..a869cb034 100644 --- a/osrs/src/main/java/ClanChannel.java +++ b/osrs/src/main/java/ClanChannel.java @@ -206,14 +206,14 @@ static final InterfaceParent ifOpenSub(int var0, int var1, int var2) { var3.type = var2; Client.interfaceParents.put(var3, (long)var0); class357.method1901(var1); - Widget var4 = class33.field89.method1740(var0); + Widget var4 = class33.widgetDefinition.method1740(var0); ClanChannelMember.invalidateWidget(var4); if (Client.meslayerContinueWidget != null) { ClanChannelMember.invalidateWidget(Client.meslayerContinueWidget); Client.meslayerContinueWidget = null; } - PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var0 >> 16], var4, false); + PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var0 >> 16], var4, false); VerticalAlignment.runWidgetOnLoadListener(var1); if (Client.rootInterface != -1) { Interpreter.method418(Client.rootInterface, 1); diff --git a/osrs/src/main/java/Client.java b/osrs/src/main/java/Client.java index 2cf14f4a1..792bd2e7f 100644 --- a/osrs/src/main/java/Client.java +++ b/osrs/src/main/java/Client.java @@ -3209,7 +3209,7 @@ final void doCycleLoggedIn() { break; } - var32 = class33.field89.method1740(var55.field1888.parentId); + var32 = class33.widgetDefinition.method1740(var55.field1888.parentId); } while(var32 == null || var32.children == null || var32.children.length == 0 || var55.field1888.childIndex >= var32.children.length || var55.field1888 != var32.children[var55.field1888.childIndex]); if (var55.field1888.type == 11 && var55.field1886 == 0) { @@ -3259,7 +3259,7 @@ final void doCycleLoggedIn() { break; } - var51 = class33.field89.method1740(var32.parentId); + var51 = class33.widgetDefinition.method1740(var32.parentId); } while(var51 == null || var51.children == null || var32.childIndex >= var51.children.length || var32 != var51.children[var32.childIndex]); Interpreter.runScriptEvent(var54); @@ -3271,7 +3271,7 @@ final void doCycleLoggedIn() { break; } - var51 = class33.field89.method1740(var32.parentId); + var51 = class33.widgetDefinition.method1740(var32.parentId); } while(var51 == null || var51.children == null || var32.childIndex >= var51.children.length || var32 != var51.children[var32.childIndex]); Interpreter.runScriptEvent(var54); @@ -3283,7 +3283,7 @@ final void doCycleLoggedIn() { break; } - var51 = class33.field89.method1740(var32.parentId); + var51 = class33.widgetDefinition.method1740(var32.parentId); } while(var51 == null || var51.children == null || var32.childIndex >= var51.children.length || var32 != var51.children[var32.childIndex]); Interpreter.runScriptEvent(var54); @@ -3755,7 +3755,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.RESET_CLIENT_VARCACHE == var1.serverPacket) { var20 = var3.readInt(); var21 = var3.readStringCp1252NullTerminated(); - var6 = class33.field89.method1740(var20); + var6 = class33.widgetDefinition.method1740(var20); if (!var21.equals(var6.text)) { var6.text = var21; ClanChannelMember.invalidateWidget(var6); @@ -3854,7 +3854,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.CAM_MOVETO == var1.serverPacket) { var20 = var3.readUnsignedIntME(); var5 = var3.readIntME(); - var6 = class33.field89.method1740(var20); + var6 = class33.widgetDefinition.method1740(var20); if (var6.modelType != 1 || var5 != var6.modelId) { var6.modelType = 1; var6.modelId = var5; @@ -3927,7 +3927,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.OBJ_DEL == var1.serverPacket) { var20 = var3.readUnsignedIntLE(); var5 = var3.readUnsignedByteAdd(); - var6 = class33.field89.method1740(var20); + var6 = class33.widgetDefinition.method1740(var20); UrlRequester.method653(var6, TextureProvider.localPlayer.appearance.field2950, var5); ClanChannelMember.invalidateWidget(var6); var1.serverPacket = null; @@ -3991,7 +3991,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.HEAT_MAP == var1.serverPacket) { var20 = var3.readUnsignedShortAdd(); var5 = var3.readUnsignedIntIME(); - var6 = class33.field89.method1740(var5); + var6 = class33.widgetDefinition.method1740(var5); if (var6.modelType != 6 || var20 != var6.modelId) { var6.modelType = 6; var6.modelId = var20; @@ -4028,7 +4028,7 @@ final boolean method378(PacketWriter var1) { Widget var79; if (ServerPacket.VARCLAN == var1.serverPacket) { var20 = var3.readUnsignedIntLE(); - var79 = class33.field89.method1740(var20); + var79 = class33.widgetDefinition.method1740(var20); var79.modelType = 3; var79.modelId = TextureProvider.localPlayer.appearance.getChatHeadId(); ClanChannelMember.invalidateWidget(var79); @@ -4155,7 +4155,7 @@ final boolean method378(PacketWriter var1) { } var22 = var3.readUnsignedIntIME(); - var23 = class33.field89.method1740(var22); + var23 = class33.widgetDefinition.method1740(var22); ItemComposition var92; if (!var23.isIf3) { if (var5 == -1) { @@ -4222,15 +4222,15 @@ final boolean method378(PacketWriter var1) { interfaceParents.put(var65, (long)var5); } - var33 = class33.field89.method1740(var20); + var33 = class33.widgetDefinition.method1740(var20); if (var33 != null) { ClanChannelMember.invalidateWidget(var33); } - var33 = class33.field89.method1740(var5); + var33 = class33.widgetDefinition.method1740(var5); if (var33 != null) { ClanChannelMember.invalidateWidget(var33); - PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var33.id >>> 16], var33, true); + PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var33.id >>> 16], var33, true); } if (rootInterface != -1) { @@ -4293,7 +4293,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.MIDI_JINGLE == var1.serverPacket) { var20 = var3.readUnsignedIntIME(); - var79 = class33.field89.method1740(var20); + var79 = class33.widgetDefinition.method1740(var20); for (var22 = 0; var22 < var79.field3082.length; ++var22) { var79.field3082[var22] = -1; @@ -4489,7 +4489,7 @@ final boolean method378(PacketWriter var1) { var20 = var3.readShort(); var5 = var3.readUnsignedIntLE(); var22 = var3.method2625(); - var23 = class33.field89.method1740(var5); + var23 = class33.widgetDefinition.method1740(var5); if (var20 != var23.rawX || var22 != var23.rawY || var23.xAlignment != 0 || var23.yAlignment != 0) { var23.rawX = var20; var23.rawY = var22; @@ -4498,7 +4498,7 @@ final boolean method378(PacketWriter var1) { ClanChannelMember.invalidateWidget(var23); this.alignWidget(var23); if (var23.type == 0) { - PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var5 >> 16], var23, false); + PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var5 >> 16], var23, false); } } @@ -4510,7 +4510,7 @@ final boolean method378(PacketWriter var1) { var20 = var3.readInt(); var5 = var3.readUnsignedByteSub(); var22 = var3.readUnsignedByte(); - var23 = class33.field89.method1740(var20); + var23 = class33.widgetDefinition.method1740(var20); UrlRequest.method664(var23, var22, var5); ClanChannelMember.invalidateWidget(var23); var1.serverPacket = null; @@ -4524,7 +4524,7 @@ final boolean method378(PacketWriter var1) { var7 = var20 >> 5 & 31; var8 = var20 & 31; var24 = (var7 << 11) + (var22 << 19) + (var8 << 3); - Widget var97 = class33.field89.method1740(var5); + Widget var97 = class33.widgetDefinition.method1740(var5); if (var24 != var97.color) { var97.color = var24; ClanChannelMember.invalidateWidget(var97); @@ -4552,7 +4552,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.NEW_PACKET_CAM_RESET_V2 == var1.serverPacket) { var20 = var3.readUnsignedIntIME(); var61 = var3.readUnsignedByte() == 1; - var6 = class33.field89.method1740(var20); + var6 = class33.widgetDefinition.method1740(var20); Strings.method1908(var6, TextureProvider.localPlayer.appearance, var61); ClanChannelMember.invalidateWidget(var6); var1.serverPacket = null; @@ -4713,7 +4713,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.TRADING_POST_RESULTS == var1.serverPacket) { var20 = var3.readInt(); var5 = var3.readInt(); - var6 = class33.field89.method1740(var5); + var6 = class33.widgetDefinition.method1740(var5); ZoneOperation.method1645(var6, var20); ClanChannelMember.invalidateWidget(var6); var1.serverPacket = null; @@ -4804,7 +4804,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.PREFETCH_GAMEOBJECTS == var1.serverPacket) { var20 = var3.readInt(); var61 = var3.readUnsignedByte() == 1; - var6 = class33.field89.method1740(var20); + var6 = class33.widgetDefinition.method1740(var20); if (var61 != var6.isHidden) { var6.isHidden = var61; ClanChannelMember.invalidateWidget(var6); @@ -4834,7 +4834,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.VARCLAN_DISABLE == var1.serverPacket) { var20 = var3.readUnsignedIntLE(); var5 = var3.readUnsignedShortAddLE(); - var6 = class33.field89.method1740(var20); + var6 = class33.widgetDefinition.method1740(var20); if (var6 != null && var6.type == 0) { if (var5 > var6.scrollHeight - var6.height) { var5 = var6.scrollHeight - var6.height; @@ -5056,7 +5056,7 @@ final boolean method378(PacketWriter var1) { } if (var20 >= 0) { - var6 = class33.field89.method1740(var20); + var6 = class33.widgetDefinition.method1740(var20); } else { var6 = null; } @@ -5114,7 +5114,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.IF_OPENSUB == var1.serverPacket) { var20 = var3.readInt(); var5 = var3.readUnsignedShortAdd(); - var6 = class33.field89.method1740(var20); + var6 = class33.widgetDefinition.method1740(var20); if (var6.modelType != 2 || var5 != var6.modelId) { var6.modelType = 2; var6.modelId = var5; @@ -5129,7 +5129,7 @@ final boolean method378(PacketWriter var1) { var20 = var3.readUnsignedIntME(); var5 = var3.readIntME(); var22 = var3.readUnsignedShort(); - var23 = class33.field89.method1740(var20); + var23 = class33.widgetDefinition.method1740(var20); var23.rotationKey = var5 + (var22 << 16); var1.serverPacket = null; return true; @@ -5176,7 +5176,7 @@ final boolean method378(PacketWriter var1) { } if (var20 >= 0) { - var6 = class33.field89.method1740(var20); + var6 = class33.widgetDefinition.method1740(var20); } else { var6 = null; } @@ -5448,7 +5448,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.LOC_ADD_CHANGE == var1.serverPacket) { var20 = var3.method2623(); var5 = var3.readUnsignedIntIME(); - var6 = class33.field89.method1740(var5); + var6 = class33.widgetDefinition.method1740(var5); if (var20 != var6.sequenceId || var20 == -1) { var6.sequenceId = var20; var6.modelFrame = 0; @@ -5642,7 +5642,7 @@ final boolean method378(PacketWriter var1) { var5 = var3.readUnsignedIntLE(); var22 = var3.readUnsignedShort(); var7 = var3.readUnsignedShortAddLE(); - var33 = class33.field89.method1740(var5); + var33 = class33.widgetDefinition.method1740(var5); if (var20 != var33.modelAngleX || var7 != var33.modelAngleY || var22 != var33.modelZoom) { var33.modelAngleX = var20; var33.modelAngleY = var7; @@ -5817,8 +5817,8 @@ final void method382(boolean var1) { int var2 = rootInterface; int var3 = class340.canvasWidth; int var4 = class491.canvasHeight; - if (class33.field89.method1742(var2)) { - class360.resizeInterface(class33.field89.Widget_interfaceComponents[var2], -1, var3, var4, var1); + if (class33.widgetDefinition.method1742(var2)) { + class360.resizeInterface(class33.widgetDefinition.Widget_interfaceComponents[var2], -1, var3, var4, var1); } } @@ -5830,7 +5830,7 @@ final void method382(boolean var1) { ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : class33.field89.method1740(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : class33.widgetDefinition.method1740(var1.parentId); int var3; int var4; if (var2 == null) { diff --git a/osrs/src/main/java/ClientPacket.java b/osrs/src/main/java/ClientPacket.java index 2d45b3654..3bb030dbf 100644 --- a/osrs/src/main/java/ClientPacket.java +++ b/osrs/src/main/java/ClientPacket.java @@ -688,7 +688,7 @@ public class ClientPacket implements class307 { garbageValue = "1044263127" ) static int method1640(int var0, Script var1, boolean var2) { - Widget var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Widget var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); if (var0 == 2800) { Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var3)); return 1; @@ -748,7 +748,7 @@ static final void runComponentCloseListeners(Widget[] var0, int var1) { if (var1 == 1 && var3.onSubChange != null) { if (var3.childIndex >= 0) { - Widget var6 = class33.field89.method1740(var3.id); + Widget var6 = class33.widgetDefinition.method1740(var3.id); if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { continue; } diff --git a/osrs/src/main/java/ClientPreferences.java b/osrs/src/main/java/ClientPreferences.java index 4668c635d..03af77a25 100644 --- a/osrs/src/main/java/ClientPreferences.java +++ b/osrs/src/main/java/ClientPreferences.java @@ -486,7 +486,7 @@ static int method567(int var0, Script var1, boolean var2) { if (var0 >= 2000) { var0 -= 1000; var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = class33.field89.method1740(var3); + var4 = class33.widgetDefinition.method1740(var3); } else { var4 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; } @@ -500,7 +500,7 @@ static int method567(int var0, Script var1, boolean var2) { ClanChannelMember.invalidateWidget(var4); class159.client.alignWidget(var4); if (var3 != -1 && var4.type == 0) { - PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var3 >> 16], var4, false); + PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var3 >> 16], var4, false); } return 1; @@ -513,7 +513,7 @@ static int method567(int var0, Script var1, boolean var2) { ClanChannelMember.invalidateWidget(var4); class159.client.alignWidget(var4); if (var3 != -1 && var4.type == 0) { - PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var3 >> 16], var4, false); + PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var3 >> 16], var4, false); } return 1; diff --git a/osrs/src/main/java/DefaultsGroup.java b/osrs/src/main/java/DefaultsGroup.java index 15d00e73d..dec4b90f0 100644 --- a/osrs/src/main/java/DefaultsGroup.java +++ b/osrs/src/main/java/DefaultsGroup.java @@ -29,7 +29,7 @@ public class DefaultsGroup { garbageValue = "-1" ) public static HealthBarDefinition method2315(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.NpcDefinition_cachedModels.get((long)var0); + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { @@ -40,7 +40,7 @@ public static HealthBarDefinition method2315(int var0) { var1.decode(new Buffer(var2)); } - HealthBarDefinition.NpcDefinition_cachedModels.put(var1, (long)var0); + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); return var1; } } diff --git a/osrs/src/main/java/DevicePcmPlayerProvider.java b/osrs/src/main/java/DevicePcmPlayerProvider.java index 2ab108f24..022d50c5e 100644 --- a/osrs/src/main/java/DevicePcmPlayerProvider.java +++ b/osrs/src/main/java/DevicePcmPlayerProvider.java @@ -82,7 +82,7 @@ static World getNextWorldListWorld() { garbageValue = "124" ) static int method86(int var0, Script var1, boolean var2) { - Widget var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Widget var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); if (var0 == 2600) { Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; return 1; diff --git a/osrs/src/main/java/HealthBarDefinition.java b/osrs/src/main/java/HealthBarDefinition.java index 3504ac1d2..2f20299a4 100644 --- a/osrs/src/main/java/HealthBarDefinition.java +++ b/osrs/src/main/java/HealthBarDefinition.java @@ -21,8 +21,8 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Llr;" ) - @Export("NpcDefinition_cachedModels") - public static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @Export("HealthBarDefinition_cached") + public static EvictingDualNodeHashTable HealthBarDefinition_cached; @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "Llr;" @@ -68,7 +68,7 @@ public class HealthBarDefinition extends DualNode { public int widthPadding; static { - NpcDefinition_cachedModels = new EvictingDualNodeHashTable(64); + HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); ItemDefinition_cachedModels = new EvictingDualNodeHashTable(64); } diff --git a/osrs/src/main/java/Interpreter.java b/osrs/src/main/java/Interpreter.java index e12e8b28b..57f221988 100644 --- a/osrs/src/main/java/Interpreter.java +++ b/osrs/src/main/java/Interpreter.java @@ -89,8 +89,8 @@ public static void runScriptEvent(ScriptEvent var0) { garbageValue = "1205286290" ) static final void method418(int var0, int var1) { - if (class33.field89.method1742(var0)) { - ClientPacket.runComponentCloseListeners(class33.field89.Widget_interfaceComponents[var0], var1); + if (class33.widgetDefinition.method1742(var0)) { + ClientPacket.runComponentCloseListeners(class33.widgetDefinition.Widget_interfaceComponents[var0], var1); } } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatchNode2.java b/osrs/src/main/java/MusicPatchNode2.java index 1080bc9d5..8c66d138d 100644 --- a/osrs/src/main/java/MusicPatchNode2.java +++ b/osrs/src/main/java/MusicPatchNode2.java @@ -143,7 +143,7 @@ static void method1658() { class33.varcs.clearTransient(); Client.followerIndex = -1; if (Client.rootInterface != -1) { - class33.field89.method1743(Client.rootInterface); + class33.widgetDefinition.method1743(Client.rootInterface); } for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { diff --git a/osrs/src/main/java/MusicPatchPcmStream.java b/osrs/src/main/java/MusicPatchPcmStream.java index 6463dd65a..f1ff47874 100644 --- a/osrs/src/main/java/MusicPatchPcmStream.java +++ b/osrs/src/main/java/MusicPatchPcmStream.java @@ -211,6 +211,6 @@ public static void method1725() { ObjectComposition.ObjectDefinition_cached.clear(); ObjectComposition.ObjectDefinition_cachedModelData.clear(); ObjectComposition.ObjectDefinition_cachedEntities.clear(); - ObjectComposition.HitSplatDefinition_cachedSprites.clear(); + ObjectComposition.ObjectDefinition_cachedModels.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/ObjectComposition.java b/osrs/src/main/java/ObjectComposition.java index 7075e4557..19385a600 100644 --- a/osrs/src/main/java/ObjectComposition.java +++ b/osrs/src/main/java/ObjectComposition.java @@ -43,13 +43,14 @@ public class ObjectComposition extends DualNode { @ObfuscatedSignature( descriptor = "Llr;" ) - @Export("HitSplatDefinition_cachedSprites") - static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; + @Export("ObjectDefinition_cachedModels") + static EvictingDualNodeHashTable ObjectDefinition_cachedModels; @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "[Ljw;" ) - static ModelData[] field1721; + @Export("modelDataArray") + static ModelData[] modelDataArray; @ObfuscatedName("gn") @Export("worldPort") static int worldPort; @@ -194,8 +195,8 @@ public class ObjectComposition extends DualNode { ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); - HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(30); - field1721 = new ModelData[4]; + ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); + modelDataArray = new ModelData[4]; } ObjectComposition() { @@ -567,7 +568,7 @@ public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5 var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); } - Model var9 = (Model)HitSplatDefinition_cachedSprites.get(var7); + Model var9 = (Model) ObjectDefinition_cachedModels.get(var7); if (var9 == null) { ModelData var10 = this.getModelData(var1, var2); if (var10 == null) { @@ -575,7 +576,7 @@ public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5 } var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - HitSplatDefinition_cachedSprites.put(var9, var7); + ObjectDefinition_cachedModels.put(var9, var7); } if (this.clipType >= 0) { @@ -599,7 +600,7 @@ public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, i var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); } - Model var11 = (Model)HitSplatDefinition_cachedSprites.get(var9); + Model var11 = (Model) ObjectDefinition_cachedModels.get(var9); if (var11 == null) { ModelData var12 = this.getModelData(var1, var2); if (var12 == null) { @@ -607,7 +608,7 @@ public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, i } var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - HitSplatDefinition_cachedSprites.put(var11, var9); + ObjectDefinition_cachedModels.put(var11, var9); } if (var7 == null && this.clipType == -1) { @@ -675,12 +676,12 @@ final ModelData getModelData(int var1, int var2) { } if (var5 > 1) { - field1721[var6] = var3; + modelDataArray[var6] = var3; } } if (var5 > 1) { - var3 = new ModelData(field1721, var5); + var3 = new ModelData(modelDataArray, var5); } } else { int var9 = -1; diff --git a/osrs/src/main/java/PendingSpawn.java b/osrs/src/main/java/PendingSpawn.java index 377a4d2d1..cd3827d43 100644 --- a/osrs/src/main/java/PendingSpawn.java +++ b/osrs/src/main/java/PendingSpawn.java @@ -105,8 +105,8 @@ static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); if (var5 != null) { int var6 = var5.group; - if (class33.field89.method1742(var6)) { - class360.resizeInterface(class33.field89.Widget_interfaceComponents[var6], -1, var3, var4, var2); + if (class33.widgetDefinition.method1742(var6)) { + class360.resizeInterface(class33.widgetDefinition.Widget_interfaceComponents[var6], -1, var3, var4, var2); } } diff --git a/osrs/src/main/java/TextureProvider.java b/osrs/src/main/java/TextureProvider.java index 21dd11db1..10b874ca4 100644 --- a/osrs/src/main/java/TextureProvider.java +++ b/osrs/src/main/java/TextureProvider.java @@ -277,7 +277,7 @@ static final void method1350() { ) @Export("widgetDefaultMenuAction") static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = class33.field89.getWidgetChild(var1, var2); + Widget var5 = class33.widgetDefinition.getWidgetChild(var1, var2); if (var5 != null) { if (var5.onOp != null) { ScriptEvent var6 = new ScriptEvent(); diff --git a/osrs/src/main/java/Tile.java b/osrs/src/main/java/Tile.java index d15a8b000..99d65c471 100644 --- a/osrs/src/main/java/Tile.java +++ b/osrs/src/main/java/Tile.java @@ -375,7 +375,7 @@ static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); } } else if (var10.type == 4) { - Font var40 = var10.getFont(class33.field89); + Font var40 = var10.getFont(class33.widgetDefinition); if (var40 == null) { if (Widget.field2978) { ClanChannelMember.invalidateWidget(var10); @@ -428,7 +428,7 @@ static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int if (var10.type == 5) { SpritePixels var38; if (!var10.isIf3) { - var38 = var10.getSprite(class33.field89, UserComparator9.runCs1(var10), AbstractWorldMapIcon.urlRequester); + var38 = var10.getSprite(class33.widgetDefinition, UserComparator9.runCs1(var10), AbstractWorldMapIcon.urlRequester); if (var38 != null) { var38.drawTransBgAt(var12, var13); } else if (Widget.field2978) { @@ -438,7 +438,7 @@ static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int if (var10.itemId != -1) { var38 = class158.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); } else { - var38 = var10.getSprite(class33.field89, false, AbstractWorldMapIcon.urlRequester); + var38 = var10.getSprite(class33.widgetDefinition, false, AbstractWorldMapIcon.urlRequester); } if (var38 == null) { @@ -533,7 +533,7 @@ static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var34 = var10.modelFrame; } - var39 = var10.getModel(class33.field89, var33, var34, var36, TextureProvider.localPlayer.appearance, var45, var32); + var39 = var10.getModel(class33.widgetDefinition, var33, var34, var36, TextureProvider.localPlayer.appearance, var45, var32); if (var39 == null && Widget.field2978) { ClanChannelMember.invalidateWidget(var10); } @@ -638,7 +638,7 @@ static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int class344 var37 = var10.method1877(); class339 var35 = var10.method1878(); if (var37 != null && var35 != null && var37.method1819()) { - var29 = var10.getFont(class33.field89); + var29 = var10.getFont(class33.widgetDefinition); if (var29 != null) { Client.field649.method2734(var12, var13, var10.width, var10.height, var37.method1820(), var37.method1821(), var37.method1817(), var37.method1818(), var37.method1816()); var22 = var10.textShadowed ? var10.spriteShadow * -2035927347 * 1142466053 : -1; diff --git a/osrs/src/main/java/VarcInt.java b/osrs/src/main/java/VarcInt.java index cd8a6b20b..81bf9c075 100644 --- a/osrs/src/main/java/VarcInt.java +++ b/osrs/src/main/java/VarcInt.java @@ -154,7 +154,7 @@ static final int method977(Widget var0, int var1) { if (var6 == 4) { var9 = var2[var4++] << 16; var9 += var2[var4++]; - var10 = class33.field89.method1740(var9); + var10 = class33.widgetDefinition.method1740(var9); var11 = var2[var4++]; if (var11 != -1 && (!class214.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { for (var12 = 0; var12 < var10.field3082.length; ++var12) { @@ -192,7 +192,7 @@ static final int method977(Widget var0, int var1) { if (var6 == 10) { var9 = var2[var4++] << 16; var9 += var2[var4++]; - var10 = class33.field89.method1740(var9); + var10 = class33.widgetDefinition.method1740(var9); var11 = var2[var4++]; if (var11 != -1 && (!class214.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { for (var12 = 0; var12 < var10.field3082.length; ++var12) { diff --git a/osrs/src/main/java/Varps.java b/osrs/src/main/java/Varps.java index 67f68683b..8b7ac07b0 100644 --- a/osrs/src/main/java/Varps.java +++ b/osrs/src/main/java/Varps.java @@ -43,11 +43,11 @@ public class Varps { static int method1735(int var0, Script var1, boolean var2) { Widget var3; if (var0 == 2700) { - var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; return 1; } else if (var0 == 2701) { - var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); if (var3.itemId != -1) { Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { @@ -69,14 +69,14 @@ static int method1735(int var0, Script var1, boolean var2) { Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; return 1; } else if (var0 == 2707) { - var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method1867() ? 1 : 0; return 1; } else if (var0 == 2708) { - var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); return class110.method624(var3); } else if (var0 == 2709) { - var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); return Canvas.method88(var3); } else { return 2; diff --git a/osrs/src/main/java/VerticalAlignment.java b/osrs/src/main/java/VerticalAlignment.java index 7adb79db6..0c882828a 100644 --- a/osrs/src/main/java/VerticalAlignment.java +++ b/osrs/src/main/java/VerticalAlignment.java @@ -61,8 +61,8 @@ public int rsOrdinal() { @Export("runWidgetOnLoadListener") static void runWidgetOnLoadListener(int var0) { if (var0 != -1) { - if (class33.field89.method1742(var0)) { - Widget[] var1 = class33.field89.Widget_interfaceComponents[var0]; + if (class33.widgetDefinition.method1742(var0)) { + Widget[] var1 = class33.widgetDefinition.Widget_interfaceComponents[var0]; for (int var2 = 0; var2 < var1.length; ++var2) { Widget var3 = var1[var2]; diff --git a/osrs/src/main/java/class108.java b/osrs/src/main/java/class108.java index 1b840c392..0854d7358 100644 --- a/osrs/src/main/java/class108.java +++ b/osrs/src/main/java/class108.java @@ -291,7 +291,7 @@ static final void updateInterface(Widget[] var0, int var1, int var2, int var3, i } if (var9.type == 11) { - if (var9.method1874(class33.field89, AbstractWorldMapIcon.urlRequester)) { + if (var9.method1874(class33.widgetDefinition, AbstractWorldMapIcon.urlRequester)) { if (var9.method1867()) { ClanChannelMember.invalidateWidget(var9); PendingSpawn.revalidateWidgetScroll(var9.children, var9, true); @@ -304,7 +304,7 @@ static final void updateInterface(Widget[] var0, int var1, int var2, int var3, i Client.scriptEvents.addFirst(var10); } } - } else if (var9.type == 12 && var9.method1882(class33.field89)) { + } else if (var9.type == 12 && var9.method1882(class33.widgetDefinition)) { ClanChannelMember.invalidateWidget(var9); } diff --git a/osrs/src/main/java/class127.java b/osrs/src/main/java/class127.java index 2b34ffc70..e9ab11f48 100644 --- a/osrs/src/main/java/class127.java +++ b/osrs/src/main/java/class127.java @@ -48,7 +48,7 @@ void method691(Buffer var1, int var2) { garbageValue = "-59" ) static final void method692(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.method1857(class33.field89, false); + SpriteMask var4 = var0.method1857(class33.widgetDefinition, false); if (var4 != null) { if (Client.minimapState < 3) { JSException.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); diff --git a/osrs/src/main/java/class168.java b/osrs/src/main/java/class168.java index dce0c1b9a..284f80416 100644 --- a/osrs/src/main/java/class168.java +++ b/osrs/src/main/java/class168.java @@ -70,7 +70,7 @@ static int method878(int var0, Script var1, boolean var2) { if (var4 == 0) { throw new RuntimeException(); } else { - Widget var6 = class33.field89.method1740(var3); + Widget var6 = class33.widgetDefinition.method1740(var3); if (var6.children == null) { var6.children = new Widget[var5 + 1]; } @@ -114,18 +114,18 @@ static int method878(int var0, Script var1, boolean var2) { Widget var9; if (var0 == 101) { var9 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - Widget var10 = class33.field89.method1740(var9.id); + Widget var10 = class33.widgetDefinition.method1740(var9.id); var10.children[var9.childIndex] = null; ClanChannelMember.invalidateWidget(var10); return 1; } else if (var0 == 102) { - var9 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var9 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); var9.children = null; ClanChannelMember.invalidateWidget(var9); return 1; } else if (var0 != 200) { if (var0 == 201) { - var9 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var9 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); if (var9 != null) { Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; if (var2) { @@ -145,7 +145,7 @@ static int method878(int var0, Script var1, boolean var2) { Interpreter.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Widget var11 = class33.field89.getWidgetChild(var3, var4); + Widget var11 = class33.widgetDefinition.getWidgetChild(var3, var4); if (var11 != null && var4 != -1) { Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; if (var2) { diff --git a/osrs/src/main/java/class17.java b/osrs/src/main/java/class17.java index 53816277e..a0d46cd96 100644 --- a/osrs/src/main/java/class17.java +++ b/osrs/src/main/java/class17.java @@ -181,7 +181,7 @@ static int method56(int var0, Script var1, boolean var2) { if (var0 >= 2000) { var0 -= 1000; var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var3 = class33.field89.method1740(var4); + var3 = class33.widgetDefinition.method1740(var4); } else { var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; } @@ -333,7 +333,7 @@ static int method56(int var0, Script var1, boolean var2) { var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; ClanChannelMember.invalidateWidget(var3); if (var4 != -1 && var3.type == 0) { - PendingSpawn.revalidateWidgetScroll(class33.field89.Widget_interfaceComponents[var4 >> 16], var3, false); + PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var4 >> 16], var3, false); } return 1; diff --git a/osrs/src/main/java/class178.java b/osrs/src/main/java/class178.java index 66125247f..d7de05eb4 100644 --- a/osrs/src/main/java/class178.java +++ b/osrs/src/main/java/class178.java @@ -175,8 +175,8 @@ static int getWindowedMode() { garbageValue = "-1551769490" ) static final void method926(int var0) { - if (class33.field89.method1742(var0)) { - class174.drawModelComponents(class33.field89.Widget_interfaceComponents[var0], -1); + if (class33.widgetDefinition.method1742(var0)) { + class174.drawModelComponents(class33.widgetDefinition.Widget_interfaceComponents[var0], -1); } } } \ No newline at end of file diff --git a/osrs/src/main/java/class20.java b/osrs/src/main/java/class20.java index 3573008e1..a6626c20e 100644 --- a/osrs/src/main/java/class20.java +++ b/osrs/src/main/java/class20.java @@ -157,7 +157,7 @@ static int method77(int var0, Script var1, boolean var2) { var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; int var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; if (var8 >= 1 && var8 <= 10) { - class104 var6 = new class104(var8, var7, var4, class33.field89.method1740(var7).itemId); + class104 var6 = new class104(var8, var7, var4, class33.widgetDefinition.method1740(var7).itemId); Interpreter.field713.add(var6); return 1; } else { @@ -170,7 +170,7 @@ static int method77(int var0, Script var1, boolean var2) { throw new RuntimeException(); } else { if (var0 >= 2000) { - var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); } else { var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; } diff --git a/osrs/src/main/java/class212.java b/osrs/src/main/java/class212.java index 7f41020d0..4dd97749f 100644 --- a/osrs/src/main/java/class212.java +++ b/osrs/src/main/java/class212.java @@ -26,7 +26,7 @@ static Widget method1045(Widget var0) { return null; } else { for (int var4 = 0; var4 < var3; ++var4) { - var0 = class33.field89.method1740(var0.parentId); + var0 = class33.widgetDefinition.method1740(var0.parentId); if (var0 == null) { return null; } diff --git a/osrs/src/main/java/class214.java b/osrs/src/main/java/class214.java index 9721b074d..8bb6f92c2 100644 --- a/osrs/src/main/java/class214.java +++ b/osrs/src/main/java/class214.java @@ -217,7 +217,7 @@ static final void method1052() { EnumComposition.EnumDefinition_cached.clear(); FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - HealthBarDefinition.NpcDefinition_cachedModels.clear(); + HealthBarDefinition.HealthBarDefinition_cached.clear(); HealthBarDefinition.ItemDefinition_cachedModels.clear(); HitSplatDefinition.HitSplatDefinition_cached.clear(); HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); @@ -253,7 +253,7 @@ static final void method1052() { PlayerComposition.PlayerAppearance_cachedModels.clear(); PlayerComposition.field2939.clearFiles(); PlayerComposition.field2937 = 0; - class33.field89.method1744(); + class33.widgetDefinition.method1744(); ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).clear(); Script.Script_cached.clear(); Client.field631.clearFiles(); diff --git a/osrs/src/main/java/class266.java b/osrs/src/main/java/class266.java index 6b5580c13..b7b162820 100644 --- a/osrs/src/main/java/class266.java +++ b/osrs/src/main/java/class266.java @@ -66,7 +66,7 @@ static int method1430(int var0, Script var1, boolean var2) { var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Widget var11 = class33.field89.method1740(var5); + Widget var11 = class33.widgetDefinition.method1740(var5); TaskHandler.clickWidget(var11, var8, var10); return 1; } else if (var0 == 3109) { diff --git a/osrs/src/main/java/class286.java b/osrs/src/main/java/class286.java index 1ae3adeeb..ead093a4b 100644 --- a/osrs/src/main/java/class286.java +++ b/osrs/src/main/java/class286.java @@ -27,7 +27,7 @@ static boolean method1574(PlayerComposition var0) { ) static void method1575() { if (Client.isSpellSelected) { - Widget var0 = class33.field89.getWidgetChild(JagexCache.field1449, Client.selectedSpellChildIndex); + Widget var0 = class33.widgetDefinition.getWidgetChild(JagexCache.field1449, Client.selectedSpellChildIndex); if (var0 != null && var0.onTargetLeave != null) { ScriptEvent var1 = new ScriptEvent(); var1.widget = var0; diff --git a/osrs/src/main/java/class30.java b/osrs/src/main/java/class30.java index 7a3c2fc05..9bd16565a 100644 --- a/osrs/src/main/java/class30.java +++ b/osrs/src/main/java/class30.java @@ -55,7 +55,7 @@ static class468[] method120() { garbageValue = "2111489575" ) static int method123(int var0, Script var1, boolean var2) { - Widget var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Widget var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); if (var0 == 2500) { Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; return 1; diff --git a/osrs/src/main/java/class304.java b/osrs/src/main/java/class304.java index 5fc351a1d..25f00d538 100644 --- a/osrs/src/main/java/class304.java +++ b/osrs/src/main/java/class304.java @@ -137,9 +137,9 @@ static long method1635() { static void method1636() { for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { int var1 = var0.group; - if (class33.field89.method1742(var1)) { + if (class33.widgetDefinition.method1742(var1)) { boolean var2 = true; - Widget[] var3 = class33.field89.Widget_interfaceComponents[var1]; + Widget[] var3 = class33.widgetDefinition.Widget_interfaceComponents[var1]; int var4; for (var4 = 0; var4 < var3.length; ++var4) { @@ -151,7 +151,7 @@ static void method1636() { if (!var2) { var4 = (int)var0.key; - Widget var5 = class33.field89.method1740(var4); + Widget var5 = class33.widgetDefinition.method1740(var4); if (var5 != null) { ClanChannelMember.invalidateWidget(var5); } diff --git a/osrs/src/main/java/class31.java b/osrs/src/main/java/class31.java index 569b155f7..3f82d0c3c 100644 --- a/osrs/src/main/java/class31.java +++ b/osrs/src/main/java/class31.java @@ -51,7 +51,7 @@ static int method127(int var0, Script var1, boolean var2) { Widget var3; if (var0 >= 2000) { var0 -= 1000; - var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); } else { var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; } diff --git a/osrs/src/main/java/class314.java b/osrs/src/main/java/class314.java index 4107ac0ff..ccefe9b4c 100644 --- a/osrs/src/main/java/class314.java +++ b/osrs/src/main/java/class314.java @@ -672,7 +672,7 @@ static void method1653() { Archive var6 = SoundSystem.archive2; VarpDefinition.VarpDefinition_archive = var6; VarpDefinition.field1501 = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - class33.field89 = new WidgetDefinition(AbstractByteArrayCopier.field3136, GrandExchangeOfferOwnWorldComparator.field361, class199.archive8, class27.archive13, class319.field2799); + class33.widgetDefinition = new WidgetDefinition(AbstractByteArrayCopier.field3136, GrandExchangeOfferOwnWorldComparator.field361, class199.archive8, class27.archive13, class319.field2799); Decimator.method313(SoundSystem.archive2); class275.method1537(SoundSystem.archive2); class135.method727(SoundSystem.archive2); diff --git a/osrs/src/main/java/class33.java b/osrs/src/main/java/class33.java index a2dfb609c..03f342dda 100644 --- a/osrs/src/main/java/class33.java +++ b/osrs/src/main/java/class33.java @@ -10,7 +10,8 @@ public class class33 { @ObfuscatedSignature( descriptor = "Lnt;" ) - static WidgetDefinition field89; + @Export("widgetDefinition") + static WidgetDefinition widgetDefinition; @ObfuscatedName("rv") @ObfuscatedSignature( descriptor = "Lek;" @@ -111,7 +112,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.WIDGET_TYPE, Client.packetWriter.isaacCipher); var9.packetBuffer.writeInt(var1); Client.packetWriter.addNode(var9); - var10 = field89.method1740(var1); + var10 = widgetDefinition.method1740(var1); if (var10 != null && var10.cs1Instructions != null && var10.cs1Instructions[0][0] == 5) { var11 = var10.cs1Instructions[0][1]; Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; @@ -225,7 +226,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Widget var17; if (var2 == 57 || var2 == 1007) { - var17 = field89.getWidgetChild(var1, var0); + var17 = widgetDefinition.getWidgetChild(var1, var0); if (var17 != null) { TextureProvider.widgetDefaultMenuAction(var3, var1, var0, var4, var6); } @@ -421,7 +422,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S } if (var2 == 24) { - var17 = field89.method1740(var1); + var17 = widgetDefinition.method1740(var1); if (var17 != null) { boolean var13 = true; if (var17.contentType > 0) { @@ -456,7 +457,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S if (var2 == 30 && Client.meslayerContinueWidget == null) { class174.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = field89.getWidgetChild(var1, var0); + Client.meslayerContinueWidget = widgetDefinition.getWidgetChild(var1, var0); ClanChannelMember.invalidateWidget(Client.meslayerContinueWidget); } @@ -627,7 +628,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S } if (var2 == 58) { - var17 = field89.getWidgetChild(var1, var0); + var17 = widgetDefinition.getWidgetChild(var1, var0); if (var17 != null) { if (var17.field3105 != null) { ScriptEvent var19 = new ScriptEvent(); @@ -683,7 +684,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.WIDGET_TYPE, Client.packetWriter.isaacCipher); var9.packetBuffer.writeInt(var1); Client.packetWriter.addNode(var9); - var10 = field89.method1740(var1); + var10 = widgetDefinition.method1740(var1); if (var10 != null && var10.cs1Instructions != null && var10.cs1Instructions[0][0] == 5) { var11 = var10.cs1Instructions[0][1]; if (Varps.Varps_main[var11] != var10.cs1ComparisonValues[0]) { @@ -714,7 +715,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S } if (var2 == 25) { - var17 = field89.getWidgetChild(var1, var0); + var17 = widgetDefinition.getWidgetChild(var1, var0); if (var17 != null) { class286.method1575(); class478.method2385(var1, var0, KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var17)), var4); @@ -753,7 +754,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S if (Client.isItemSelected != 0) { Client.isItemSelected = 0; - ClanChannelMember.invalidateWidget(field89.method1740(class4.field2)); + ClanChannelMember.invalidateWidget(widgetDefinition.method1740(class4.field2)); } if (Client.isSpellSelected) { diff --git a/osrs/src/main/java/class357.java b/osrs/src/main/java/class357.java index ed51a268d..ca12f866e 100644 --- a/osrs/src/main/java/class357.java +++ b/osrs/src/main/java/class357.java @@ -129,8 +129,8 @@ public static void readReflectionCheck(Buffer var0, int var1) { garbageValue = "1825300957" ) static final void method1901(int var0) { - if (class33.field89.method1742(var0)) { - Widget[] var1 = class33.field89.Widget_interfaceComponents[var0]; + if (class33.widgetDefinition.method1742(var0)) { + Widget[] var1 = class33.widgetDefinition.Widget_interfaceComponents[var0]; for (int var2 = 0; var2 < var1.length; ++var2) { Widget var3 = var1[var2]; diff --git a/osrs/src/main/java/class4.java b/osrs/src/main/java/class4.java index d23974dfd..5564461d9 100644 --- a/osrs/src/main/java/class4.java +++ b/osrs/src/main/java/class4.java @@ -73,7 +73,7 @@ static int method6(int var0, Script var1, boolean var2) { Widget var4; if (var0 >= 2000) { var0 -= 1000; - var4 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var4 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); var3 = false; } else { var4 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; @@ -95,7 +95,7 @@ static int method6(int var0, Script var1, boolean var2) { Interpreter.Interpreter_intStackSize -= 2; var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var4.parent = class33.field89.getWidgetChild(var11, var6); + var4.parent = class33.widgetDefinition.getWidgetChild(var11, var6); return 1; } else if (var0 == 1302) { var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; diff --git a/osrs/src/main/java/class401.java b/osrs/src/main/java/class401.java index 981fc71b5..c24d53690 100644 --- a/osrs/src/main/java/class401.java +++ b/osrs/src/main/java/class401.java @@ -20,7 +20,7 @@ public final class class401 { static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { if (Client.minimapState == 0 || Client.minimapState == 3) { if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.method1857(class33.field89, true); + SpriteMask var3 = var0.method1857(class33.widgetDefinition, true); if (var3 == null) { return; } diff --git a/osrs/src/main/java/class410.java b/osrs/src/main/java/class410.java index 313b5af74..3340fb6a5 100644 --- a/osrs/src/main/java/class410.java +++ b/osrs/src/main/java/class410.java @@ -66,9 +66,9 @@ static final boolean method2108(char var0) { ) @Export("drawWidgets") static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (class33.field89.method1742(var0)) { + if (class33.widgetDefinition.method1742(var0)) { class9.field16 = null; - Tile.drawInterface(class33.field89.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + Tile.drawInterface(class33.widgetDefinition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); if (class9.field16 != null) { Tile.drawInterface(class9.field16, -1412584499, var1, var2, var3, var4, GrandExchangeEvent.field3617, class10.field24, var7); class9.field16 = null; diff --git a/osrs/src/main/java/class436.java b/osrs/src/main/java/class436.java index 99ea47128..cceaab258 100644 --- a/osrs/src/main/java/class436.java +++ b/osrs/src/main/java/class436.java @@ -53,7 +53,7 @@ static final void method2211(String var0) { @Export("drawMinimap") static final void drawMinimap(Widget var0, int var1, int var2, int var3) { class313.method1648(); - SpriteMask var4 = var0.method1857(class33.field89, false); + SpriteMask var4 = var0.method1857(class33.widgetDefinition, false); if (var4 != null) { Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); if (Client.minimapState != 2 && Client.minimapState != 5) { diff --git a/osrs/src/main/java/class478.java b/osrs/src/main/java/class478.java index 51928e260..cbb7592ee 100644 --- a/osrs/src/main/java/class478.java +++ b/osrs/src/main/java/class478.java @@ -78,7 +78,7 @@ public static int stringCp1252NullTerminatedByteSize(String var0) { garbageValue = "2037077846" ) static void method2385(int var0, int var1, int var2, int var3) { - Widget var4 = class33.field89.getWidgetChild(var0, var1); + Widget var4 = class33.widgetDefinition.getWidgetChild(var0, var1); if (var4 != null && var4.onTargetEnter != null) { ScriptEvent var5 = new ScriptEvent(); var5.widget = var4; diff --git a/osrs/src/main/java/class511.java b/osrs/src/main/java/class511.java index 7db454259..4a1ad4159 100644 --- a/osrs/src/main/java/class511.java +++ b/osrs/src/main/java/class511.java @@ -50,8 +50,8 @@ public void remove() { ) @Export("updateRootInterface") static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (class33.field89.method1742(var0)) { - class108.updateInterface(class33.field89.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + if (class33.widgetDefinition.method1742(var0)) { + class108.updateInterface(class33.widgetDefinition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); } } } \ No newline at end of file diff --git a/osrs/src/main/java/class76.java b/osrs/src/main/java/class76.java index 66b461a11..aa922e5bf 100644 --- a/osrs/src/main/java/class76.java +++ b/osrs/src/main/java/class76.java @@ -44,7 +44,7 @@ static int method432(int var0, Script var1, boolean var2) { Widget var3; if (var0 >= 2000) { var0 -= 1000; - var3 = class33.field89.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); } else { var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; } From 8dedffc46a39d07c28d81ec7a43ed29514d3e8c0 Mon Sep 17 00:00:00 2001 From: Kaballist Date: Wed, 27 Sep 2023 05:28:59 -0700 Subject: [PATCH 12/17] not done yet --- .../java/net/runelite/rs/api/RSClient.java | 1 + .../injector/injectors/RSApiInjector.java | 2 +- osrs/src/main/java/AbstractFont.java | 8 +++---- osrs/src/main/java/Client.java | 2 +- osrs/src/main/java/Interpreter.java | 2 +- osrs/src/main/java/PendingSpawn.java | 2 +- osrs/src/main/java/Rasterizer2D.java | 22 ++++++++++--------- osrs/src/main/java/VerticalAlignment.java | 2 +- osrs/src/main/java/WidgetDefinition.java | 5 +++-- osrs/src/main/java/WorldMapRegion.java | 20 ++++++++--------- osrs/src/main/java/class178.java | 2 +- osrs/src/main/java/class223.java | 16 +++++++------- osrs/src/main/java/class304.java | 2 +- osrs/src/main/java/class357.java | 2 +- osrs/src/main/java/class410.java | 2 +- osrs/src/main/java/class511.java | 2 +- 16 files changed, 48 insertions(+), 44 deletions(-) diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java index c46bf62e1..26e4e546a 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java @@ -198,6 +198,7 @@ public interface RSClient extends RSGameEngine, Client int getDragTime(); @Import("Widget_interfaceComponents") + @Override RSWidget[][] getWidgets(); /** diff --git a/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java index 5fbe1fb2a..865abd77f 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java @@ -214,7 +214,7 @@ private void injectMethods(ClassFile deobClass, RSApiClass implementingClass) final ClassFile targetClass = InjectUtil.vanillaFromApiMethod(inject, apiMethod); final Method vanillaMethod = inject.toVanilla(deobMethod); final String garbage = DeobAnnotations.getDecoder(deobMethod); - //log.debug("[DEBUG] Injecting invoker {} for {} into {}", apiMethod.getMethod(), vanillaMethod.getPoolMethod(), targetClass.getPoolClass()); + log.debug("[DEBUG] Injecting invoker {} for {} into {}", apiMethod.getMethod(), vanillaMethod.getPoolMethod(), targetClass.getPoolClass()); InjectInvoke.inject(targetClass, apiMethod, vanillaMethod, garbage); ++voke; apiMethod.setInjected(true); diff --git a/osrs/src/main/java/AbstractFont.java b/osrs/src/main/java/AbstractFont.java index 4665686f7..da77d8f6f 100644 --- a/osrs/src/main/java/AbstractFont.java +++ b/osrs/src/main/java/AbstractFont.java @@ -847,11 +847,11 @@ void draw0(String var1, int var2, int var3) { int var13 = this.advances[var7]; if (AbstractFont_strike != -1) { - Rasterizer2D.method2675(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } if (AbstractFont_underline != -1) { - Rasterizer2D.method2675(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } var2 += var13; @@ -971,11 +971,11 @@ void method2138(String var1, int var2, int var3, int[] var4, int[] var5, int[] v int var17 = this.advances[var11]; if (AbstractFont_strike != -1) { - Rasterizer2D.method2675(var2, var3 + (int)((double)this.ascent * 0.7D), var17, AbstractFont_strike); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var17, AbstractFont_strike); } if (AbstractFont_underline != -1) { - Rasterizer2D.method2675(var2, var3 + this.ascent, var17, AbstractFont_underline); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var17, AbstractFont_underline); } var2 += var17; diff --git a/osrs/src/main/java/Client.java b/osrs/src/main/java/Client.java index 792bd2e7f..1a5664ef3 100644 --- a/osrs/src/main/java/Client.java +++ b/osrs/src/main/java/Client.java @@ -5817,7 +5817,7 @@ final void method382(boolean var1) { int var2 = rootInterface; int var3 = class340.canvasWidth; int var4 = class491.canvasHeight; - if (class33.widgetDefinition.method1742(var2)) { + if (class33.widgetDefinition.loadInterface(var2)) { class360.resizeInterface(class33.widgetDefinition.Widget_interfaceComponents[var2], -1, var3, var4, var1); } diff --git a/osrs/src/main/java/Interpreter.java b/osrs/src/main/java/Interpreter.java index 57f221988..a6efd7433 100644 --- a/osrs/src/main/java/Interpreter.java +++ b/osrs/src/main/java/Interpreter.java @@ -89,7 +89,7 @@ public static void runScriptEvent(ScriptEvent var0) { garbageValue = "1205286290" ) static final void method418(int var0, int var1) { - if (class33.widgetDefinition.method1742(var0)) { + if (class33.widgetDefinition.loadInterface(var0)) { ClientPacket.runComponentCloseListeners(class33.widgetDefinition.Widget_interfaceComponents[var0], var1); } } diff --git a/osrs/src/main/java/PendingSpawn.java b/osrs/src/main/java/PendingSpawn.java index cd3827d43..e7634ffbf 100644 --- a/osrs/src/main/java/PendingSpawn.java +++ b/osrs/src/main/java/PendingSpawn.java @@ -105,7 +105,7 @@ static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); if (var5 != null) { int var6 = var5.group; - if (class33.widgetDefinition.method1742(var6)) { + if (class33.widgetDefinition.loadInterface(var6)) { class360.resizeInterface(class33.widgetDefinition.Widget_interfaceComponents[var6], -1, var3, var4, var2); } } diff --git a/osrs/src/main/java/Rasterizer2D.java b/osrs/src/main/java/Rasterizer2D.java index dc51babc6..efefc707d 100644 --- a/osrs/src/main/java/Rasterizer2D.java +++ b/osrs/src/main/java/Rasterizer2D.java @@ -610,10 +610,10 @@ public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, @ObfuscatedName("ei") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { - method2675(var0, var1, var2, var4); - method2675(var0, var3 + var1 - 1, var2, var4); - method2677(var0, var1, var3, var4); - method2677(var0 + var2 - 1, var1, var3, var4); + Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); + Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); + Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); + Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); } @ObfuscatedName("ex") @@ -629,7 +629,8 @@ public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, } @ObfuscatedName("ek") - public static void method2675(int var0, int var1, int var2, int var3) { + @Export("Rasterizer2D_drawHorizontalLine") + public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { if (var0 < Rasterizer2D_xClipStart) { var2 -= Rasterizer2D_xClipStart - var0; @@ -680,7 +681,8 @@ static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, i } @ObfuscatedName("ez") - public static void method2677(int var0, int var1, int var2, int var3) { + @Export("Rasterizer2D_drawVerticalLine") + public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { if (var1 < Rasterizer2D_yClipStart) { var2 -= Rasterizer2D_yClipStart - var1; @@ -738,16 +740,16 @@ public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, var3 -= var1; if (var3 == 0) { if (var2 >= 0) { - method2675(var0, var1, var2 + 1, var4); + Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4); } else { - method2675(var0 + var2, var1, -var2 + 1, var4); + Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); } } else if (var2 == 0) { if (var3 >= 0) { - method2677(var0, var1, var3 + 1, var4); + Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4); } else { - method2677(var0, var3 + var1, -var3 + 1, var4); + Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); } } else { diff --git a/osrs/src/main/java/VerticalAlignment.java b/osrs/src/main/java/VerticalAlignment.java index 0c882828a..5c896ae7c 100644 --- a/osrs/src/main/java/VerticalAlignment.java +++ b/osrs/src/main/java/VerticalAlignment.java @@ -61,7 +61,7 @@ public int rsOrdinal() { @Export("runWidgetOnLoadListener") static void runWidgetOnLoadListener(int var0) { if (var0 != -1) { - if (class33.widgetDefinition.method1742(var0)) { + if (class33.widgetDefinition.loadInterface(var0)) { Widget[] var1 = class33.widgetDefinition.Widget_interfaceComponents[var0]; for (int var2 = 0; var2 < var1.length; ++var2) { diff --git a/osrs/src/main/java/WidgetDefinition.java b/osrs/src/main/java/WidgetDefinition.java index c010243b3..737b0e014 100644 --- a/osrs/src/main/java/WidgetDefinition.java +++ b/osrs/src/main/java/WidgetDefinition.java @@ -109,7 +109,7 @@ public Widget method1740(int var1) { int var2 = var1 >> 16; int var3 = var1 & 65535; if (this.Widget_interfaceComponents[var2] == null || this.Widget_interfaceComponents[var2][var3] == null) { - boolean var4 = this.method1742(var2); + boolean var4 = this.loadInterface(var2); if (!var4) { return null; } @@ -138,7 +138,8 @@ public Widget getWidgetChild(int var1, int var2) { descriptor = "(IS)Z", garbageValue = "-8971" ) - public boolean method1742(int var1) { + @Export("loadInterface") + public boolean loadInterface(int var1) { if (AbstractUserComparator.field3833[var1]) { return true; } else if (!this.widgetArchive.tryLoadGroup(var1)) { diff --git a/osrs/src/main/java/WorldMapRegion.java b/osrs/src/main/java/WorldMapRegion.java index 17ecb792b..74e1ed32a 100644 --- a/osrs/src/main/java/WorldMapRegion.java +++ b/osrs/src/main/java/WorldMapRegion.java @@ -525,19 +525,19 @@ void method1494(int var1, int var2, AbstractWorldMapData var3) { if (var8.decoration == WorldMapDecorationType.field3153.id) { if (var8.rotation == 0) { - Rasterizer2D.method2675(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 1) { - Rasterizer2D.method2675(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 2) { - Rasterizer2D.method2675(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } if (var8.rotation == 3) { - Rasterizer2D.method2675(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } @@ -546,11 +546,11 @@ void method1494(int var1, int var2, AbstractWorldMapData var3) { int var12; if (var11 == 0) { for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.method2675(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); } } else { for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.method2675(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); } } } @@ -833,19 +833,19 @@ List icons() { void method1508(int var1, int var2, int var3, int var4) { var3 %= 4; if (var3 == 0) { - Rasterizer2D.method2677(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 1) { - Rasterizer2D.method2675(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 2) { - Rasterizer2D.method2677(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { - Rasterizer2D.method2675(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); } } diff --git a/osrs/src/main/java/class178.java b/osrs/src/main/java/class178.java index d7de05eb4..65cc08ab3 100644 --- a/osrs/src/main/java/class178.java +++ b/osrs/src/main/java/class178.java @@ -175,7 +175,7 @@ static int getWindowedMode() { garbageValue = "-1551769490" ) static final void method926(int var0) { - if (class33.widgetDefinition.method1742(var0)) { + if (class33.widgetDefinition.loadInterface(var0)) { class174.drawModelComponents(class33.widgetDefinition.Widget_interfaceComponents[var0], -1); } } diff --git a/osrs/src/main/java/class223.java b/osrs/src/main/java/class223.java index d543dc454..edf16a548 100644 --- a/osrs/src/main/java/class223.java +++ b/osrs/src/main/java/class223.java @@ -151,14 +151,14 @@ static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4 int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field458); - Rasterizer2D.method2677(var0, var6 + var1 + 16, var5, Client.field463); - Rasterizer2D.method2677(var0 + 1, var6 + var1 + 16, var5, Client.field463); - Rasterizer2D.method2675(var0, var6 + var1 + 16, 16, Client.field463); - Rasterizer2D.method2675(var0, var6 + var1 + 17, 16, Client.field463); - Rasterizer2D.method2677(var0 + 15, var6 + var1 + 16, var5, Client.field461); - Rasterizer2D.method2677(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field461); - Rasterizer2D.method2675(var0, var5 + var6 + var1 + 15, 16, Client.field461); - Rasterizer2D.method2675(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field461); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field463); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field463); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field463); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field463); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field461); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field461); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field461); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field461); } @ObfuscatedName("oj") diff --git a/osrs/src/main/java/class304.java b/osrs/src/main/java/class304.java index 25f00d538..ac6665470 100644 --- a/osrs/src/main/java/class304.java +++ b/osrs/src/main/java/class304.java @@ -137,7 +137,7 @@ static long method1635() { static void method1636() { for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { int var1 = var0.group; - if (class33.widgetDefinition.method1742(var1)) { + if (class33.widgetDefinition.loadInterface(var1)) { boolean var2 = true; Widget[] var3 = class33.widgetDefinition.Widget_interfaceComponents[var1]; diff --git a/osrs/src/main/java/class357.java b/osrs/src/main/java/class357.java index ca12f866e..ff5125486 100644 --- a/osrs/src/main/java/class357.java +++ b/osrs/src/main/java/class357.java @@ -129,7 +129,7 @@ public static void readReflectionCheck(Buffer var0, int var1) { garbageValue = "1825300957" ) static final void method1901(int var0) { - if (class33.widgetDefinition.method1742(var0)) { + if (class33.widgetDefinition.loadInterface(var0)) { Widget[] var1 = class33.widgetDefinition.Widget_interfaceComponents[var0]; for (int var2 = 0; var2 < var1.length; ++var2) { diff --git a/osrs/src/main/java/class410.java b/osrs/src/main/java/class410.java index 3340fb6a5..dd919a4d0 100644 --- a/osrs/src/main/java/class410.java +++ b/osrs/src/main/java/class410.java @@ -66,7 +66,7 @@ static final boolean method2108(char var0) { ) @Export("drawWidgets") static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (class33.widgetDefinition.method1742(var0)) { + if (class33.widgetDefinition.loadInterface(var0)) { class9.field16 = null; Tile.drawInterface(class33.widgetDefinition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); if (class9.field16 != null) { diff --git a/osrs/src/main/java/class511.java b/osrs/src/main/java/class511.java index 4a1ad4159..dd7fa69cd 100644 --- a/osrs/src/main/java/class511.java +++ b/osrs/src/main/java/class511.java @@ -50,7 +50,7 @@ public void remove() { ) @Export("updateRootInterface") static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (class33.widgetDefinition.method1742(var0)) { + if (class33.widgetDefinition.loadInterface(var0)) { class108.updateInterface(class33.widgetDefinition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); } } From 5afd0a7c19006ab4df94a54abfe87772ae6a7edd Mon Sep 17 00:00:00 2001 From: Kaballist Date: Wed, 27 Sep 2023 21:20:36 -0700 Subject: [PATCH 13/17] not done yet still need to find out what field is wrong in `checkResize()` in client mixin --- .../java/net/runelite/rs/api/RSClient.java | 10 ++++---- .../runelite/rs/api/RSWidgetDefinition.java | 2 +- .../meteor/plugins/poison/PoisonPlugin.kt | 1 - .../src/main/java/mixins/RSClientMixin.java | 4 +-- .../main/java/AbstractByteArrayCopier.java | 3 ++- osrs/src/main/java/Client.java | 25 ++++++++++--------- .../java/{class541.java => FillMode.java} | 4 +-- osrs/src/main/java/HitSplatDefinition.java | 9 ++++--- osrs/src/main/java/JagexCache.java | 3 ++- osrs/src/main/java/NPCComposition.java | 10 ++++---- osrs/src/main/java/ReflectionCheck.java | 3 ++- .../main/java/SpotAnimationDefinition.java | 10 ++++---- osrs/src/main/java/VarcInt.java | 8 +++--- osrs/src/main/java/Widget.java | 7 +++--- osrs/src/main/java/WorldMapElement.java | 10 ++++---- osrs/src/main/java/class17.java | 2 +- osrs/src/main/java/class198.java | 2 +- osrs/src/main/java/class20.java | 2 +- osrs/src/main/java/class214.java | 4 +-- osrs/src/main/java/class286.java | 4 +-- osrs/src/main/java/class305.java | 6 ++--- osrs/src/main/java/class314.java | 10 ++++---- osrs/src/main/java/class33.java | 22 ++++++++-------- osrs/src/main/java/class357.java | 4 +-- osrs/src/main/java/class472.java | 4 +-- osrs/src/main/java/class478.java | 4 +-- .../net/runelite/rs/ObfuscatedClassMap.java | 2 +- 27 files changed, 90 insertions(+), 85 deletions(-) rename osrs/src/main/java/{class541.java => FillMode.java} (91%) diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java index 26e4e546a..95659f867 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java @@ -197,7 +197,7 @@ public interface RSClient extends RSGameEngine, Client @Override int getDragTime(); - @Import("Widget_interfaceComponents") + //@Import("Widget_interfaceComponents") @Override RSWidget[][] getWidgets(); @@ -1503,15 +1503,15 @@ public interface RSClient extends RSGameEngine, Client @Import("Widget_cachedModels") RSEvictingDualNodeHashTable getModelsCache(); - +/* @Import("Widget_cachedFonts") - RSEvictingDualNodeHashTable getFontsCache(); + RSEvictingDualNodeHashTable getFontsCache();*/ @Import("Widget_cachedSpriteMasks") RSEvictingDualNodeHashTable getSpriteMasksCache(); - @Import("WorldMapElement_cachedSprites") - RSEvictingDualNodeHashTable getSpritesCache(); + //@Import("WorldMapElement_cachedSprites") + //RSEvictingDualNodeHashTable getSpritesCache(); @Construct RSIterableNodeHashTable createIterableNodeHashTable(int size); diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java b/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java index 51766c346..ee06a613e 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java @@ -8,7 +8,7 @@ public interface RSWidgetDefinition RSWidget[][] getWidgets(); @Import("loadInterface") - boolean loadInterface(int interfaceId); + boolean loadInterface$api(int interfaceId); @Import("Widget_cachedSprites") RSEvictingDualNodeHashTable getWidgetSpriteCache(); diff --git a/client/src/main/java/meteor/plugins/poison/PoisonPlugin.kt b/client/src/main/java/meteor/plugins/poison/PoisonPlugin.kt index 212c335cf..270516b46 100644 --- a/client/src/main/java/meteor/plugins/poison/PoisonPlugin.kt +++ b/client/src/main/java/meteor/plugins/poison/PoisonPlugin.kt @@ -31,7 +31,6 @@ import meteor.game.FontManager.runescapeSmallFont import meteor.game.SpriteManager import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor -import meteor.plugins.attackstyles.AttackStylesConfig import meteor.rs.ClientThread import meteor.ui.overlay.infobox.InfoBoxManager import meteor.util.ColorUtil.wrapWithColorTag diff --git a/mixins/src/main/java/mixins/RSClientMixin.java b/mixins/src/main/java/mixins/RSClientMixin.java index 5a4525bc2..14a7fc1ba 100644 --- a/mixins/src/main/java/mixins/RSClientMixin.java +++ b/mixins/src/main/java/mixins/RSClientMixin.java @@ -2478,9 +2478,9 @@ public static void checkResize() { check("VarcInt_cached", client.getVarcIntCache()); check("VarpDefinition_cached", client.getVarpDefinitionCache()); check("Widget_cachedModels", client.getModelsCache()); - check("Widget_cachedFonts", client.getFontsCache()); + // check("Widget_cachedFonts", client.getFontsCache()); check("Widget_cachedSpriteMasks", client.getSpriteMasksCache()); - check("WorldMapElement_cachedSprites", client.getSpritesCache()); + // check("WorldMapElement_cachedSprites", client.getSpritesCache()); } @Inject diff --git a/osrs/src/main/java/AbstractByteArrayCopier.java b/osrs/src/main/java/AbstractByteArrayCopier.java index 27764fd7b..85173e7dc 100644 --- a/osrs/src/main/java/AbstractByteArrayCopier.java +++ b/osrs/src/main/java/AbstractByteArrayCopier.java @@ -10,7 +10,8 @@ public abstract class AbstractByteArrayCopier { @ObfuscatedSignature( descriptor = "Lok;" ) - static Archive field3136; + @Export("archive4") + static Archive archive4; AbstractByteArrayCopier() { } diff --git a/osrs/src/main/java/Client.java b/osrs/src/main/java/Client.java index 1a5664ef3..16f12273a 100644 --- a/osrs/src/main/java/Client.java +++ b/osrs/src/main/java/Client.java @@ -610,7 +610,8 @@ boolean shouldProcessClick(){ @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; @ObfuscatedName("pj") - static int field503; + @Export("selectedSpellItemId") + static int selectedSpellItemId; @ObfuscatedName("ph") static String field599; @ObfuscatedName("ps") @@ -1157,7 +1158,7 @@ boolean shouldProcessClick(){ field598 = null; isSpellSelected = false; selectedSpellChildIndex = -1; - field503 = -1; + selectedSpellItemId = -1; field599 = null; field600 = null; rootInterface = -1; @@ -2164,7 +2165,7 @@ final void doCycleLoggedOut() { var34.packetBuffer.writeInt(class358.field3177.hash); var34.packetBuffer.writeIntME(Language.field3643.hash); var34.packetBuffer.writeIntME(0); - var34.packetBuffer.writeIntLE(AbstractByteArrayCopier.field3136.hash); + var34.packetBuffer.writeIntLE(AbstractByteArrayCopier.archive4.hash); var34.packetBuffer.writeIntLE(class198.archive9.hash); var34.packetBuffer.writeIntLE(AABB.field2123.hash); var34.packetBuffer.writeInt(ArchiveDiskAction.field3538.hash); @@ -4295,9 +4296,9 @@ final boolean method378(PacketWriter var1) { var20 = var3.readUnsignedIntIME(); var79 = class33.widgetDefinition.method1740(var20); - for (var22 = 0; var22 < var79.field3082.length; ++var22) { - var79.field3082[var22] = -1; - var79.field3082[var22] = 0; + for (var22 = 0; var22 < var79.itemIds.length; ++var22) { + var79.itemIds[var22] = -1; + var79.itemIds[var22] = 0; } ClanChannelMember.invalidateWidget(var79); @@ -5072,8 +5073,8 @@ final boolean method378(PacketWriter var1) { } } - if (var6 != null && var7 >= 0 && var7 < var6.field3082.length) { - var6.field3082[var7] = var8; + if (var6 != null && var7 >= 0 && var7 < var6.itemIds.length) { + var6.itemIds[var7] = var8; var6.field3079[var7] = var24; } } @@ -5182,8 +5183,8 @@ final boolean method378(PacketWriter var1) { } if (var6 != null) { - for (var7 = 0; var7 < var6.field3082.length; ++var7) { - var6.field3082[var7] = 0; + for (var7 = 0; var7 < var6.itemIds.length; ++var7) { + var6.itemIds[var7] = 0; var6.field3079[var7] = 0; } } @@ -5198,8 +5199,8 @@ final boolean method378(PacketWriter var1) { } var10 = var3.readUnsignedShort(); - if (var6 != null && var8 < var6.field3082.length) { - var6.field3082[var8] = var10; + if (var6 != null && var8 < var6.itemIds.length) { + var6.itemIds[var8] = var10; var6.field3079[var8] = var24; } diff --git a/osrs/src/main/java/class541.java b/osrs/src/main/java/FillMode.java similarity index 91% rename from osrs/src/main/java/class541.java rename to osrs/src/main/java/FillMode.java index 914843535..a7a8f70ab 100644 --- a/osrs/src/main/java/class541.java +++ b/osrs/src/main/java/FillMode.java @@ -3,7 +3,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("uf") -public enum class541 implements class386 { +public enum FillMode implements class386 { @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "Luf;" @@ -26,7 +26,7 @@ public enum class541 implements class386 { @ObfuscatedName("ao") final int field4259; - class541(int var3, int var4) { + FillMode(int var3, int var4) { this.field4260 = var3; this.field4259 = var4; } diff --git a/osrs/src/main/java/HitSplatDefinition.java b/osrs/src/main/java/HitSplatDefinition.java index 5152e1725..fa02bf513 100644 --- a/osrs/src/main/java/HitSplatDefinition.java +++ b/osrs/src/main/java/HitSplatDefinition.java @@ -33,7 +33,8 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Llr;" ) - public static EvictingDualNodeHashTable field1697; + @Export("HitSplatDefinition_cachedFonts") + public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; @ObfuscatedName("aa") @Export("fontId") int fontId; @@ -75,7 +76,7 @@ public class HitSplatDefinition extends DualNode { static { HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); - field1697 = new EvictingDualNodeHashTable(20); + HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); } HitSplatDefinition() { @@ -327,7 +328,7 @@ public Font getFont() { if (this.fontId == -1) { return null; } else { - Font var1 = (Font)field1697.get((long)this.fontId); + Font var1 = (Font) HitSplatDefinition_cachedFonts.get((long)this.fontId); if (var1 != null) { return var1; } else { @@ -352,7 +353,7 @@ public Font getFont() { } if (var2 != null) { - field1697.put(var2, (long)this.fontId); + HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); } return var2; diff --git a/osrs/src/main/java/JagexCache.java b/osrs/src/main/java/JagexCache.java index 0575288f6..6a712a459 100644 --- a/osrs/src/main/java/JagexCache.java +++ b/osrs/src/main/java/JagexCache.java @@ -30,7 +30,8 @@ public class JagexCache { @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; @ObfuscatedName("pl") - static int field1449; + @Export("selectedSpellWidget" ) + static int selectedSpellWidget; @ObfuscatedName("vz") static int field1450; diff --git a/osrs/src/main/java/NPCComposition.java b/osrs/src/main/java/NPCComposition.java index 4c275859a..c6bb48b1f 100644 --- a/osrs/src/main/java/NPCComposition.java +++ b/osrs/src/main/java/NPCComposition.java @@ -27,8 +27,8 @@ public class NPCComposition extends DualNode { @ObfuscatedSignature( descriptor = "Llr;" ) - @Export("HitSplatDefinition_cachedFonts") - static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; + @Export("NpcDefinition_cachedModels") + static EvictingDualNodeHashTable NpcDefinition_cachedModels; @ObfuscatedName("ah") @Export("id") public int id; @@ -160,7 +160,7 @@ public class NPCComposition extends DualNode { static { NpcDefinition_cached = new EvictingDualNodeHashTable(64); - HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(50); + NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); } NPCComposition() { @@ -402,7 +402,7 @@ public final Model method1011(SequenceDefinition var1, int var2, SequenceDefinit var10 |= var5.field1594 << 16; } - Model var8 = (Model)HitSplatDefinition_cachedFonts.get(var10); + Model var8 = (Model) NpcDefinition_cachedModels.get(var10); if (var8 == null) { ModelData var9 = this.method1013(this.models, var5); if (var9 == null) { @@ -410,7 +410,7 @@ public final Model method1011(SequenceDefinition var1, int var2, SequenceDefinit } var8 = var9.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); - HitSplatDefinition_cachedFonts.put(var8, var10); + NpcDefinition_cachedModels.put(var8, var10); } Model var12; diff --git a/osrs/src/main/java/ReflectionCheck.java b/osrs/src/main/java/ReflectionCheck.java index 9789e1a8c..bc19603cd 100644 --- a/osrs/src/main/java/ReflectionCheck.java +++ b/osrs/src/main/java/ReflectionCheck.java @@ -22,7 +22,8 @@ public class ReflectionCheck extends Node { @Export("creationErrors") int[] creationErrors; @ObfuscatedName("ao") - Field[] field156; + @Export("fields") + Field[] fields; @ObfuscatedName("ah") @Export("intReplaceValues") int[] intReplaceValues; diff --git a/osrs/src/main/java/SpotAnimationDefinition.java b/osrs/src/main/java/SpotAnimationDefinition.java index a72ddf127..fcff0e5e2 100644 --- a/osrs/src/main/java/SpotAnimationDefinition.java +++ b/osrs/src/main/java/SpotAnimationDefinition.java @@ -28,8 +28,8 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Llr;" ) - @Export("Widget_cachedFonts") - static EvictingDualNodeHashTable Widget_cachedFonts; + @Export("SpotAnimationDefinition_cachedModels") + static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; @ObfuscatedName("ao") @Export("id") int id; @@ -69,7 +69,7 @@ public class SpotAnimationDefinition extends DualNode { static { SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); - Widget_cachedFonts = new EvictingDualNodeHashTable(30); + SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); } SpotAnimationDefinition() { @@ -190,7 +190,7 @@ public final Model getModel(int var1) { garbageValue = "6" ) public final Model method1037() { - Model var1 = (Model)Widget_cachedFonts.get((long)this.id); + Model var1 = (Model) SpotAnimationDefinition_cachedModels.get((long)this.id); if (var1 == null) { ModelData var2 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); if (var2 == null) { @@ -211,7 +211,7 @@ public final Model method1037() { } var1 = var2.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); - Widget_cachedFonts.put(var1, (long)this.id); + SpotAnimationDefinition_cachedModels.put(var1, (long)this.id); } return var1; diff --git a/osrs/src/main/java/VarcInt.java b/osrs/src/main/java/VarcInt.java index 81bf9c075..02d7950b7 100644 --- a/osrs/src/main/java/VarcInt.java +++ b/osrs/src/main/java/VarcInt.java @@ -157,8 +157,8 @@ static final int method977(Widget var0, int var1) { var10 = class33.widgetDefinition.method1740(var9); var11 = var2[var4++]; if (var11 != -1 && (!class214.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.field3082.length; ++var12) { - if (var11 + 1 == var10.field3082[var12]) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { var7 += var10.field3079[var12]; } } @@ -195,8 +195,8 @@ static final int method977(Widget var0, int var1) { var10 = class33.widgetDefinition.method1740(var9); var11 = var2[var4++]; if (var11 != -1 && (!class214.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.field3082.length; ++var12) { - if (var11 + 1 == var10.field3082[var12]) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { var7 = 999999999; break; } diff --git a/osrs/src/main/java/Widget.java b/osrs/src/main/java/Widget.java index f8bf49d91..f29be33d5 100644 --- a/osrs/src/main/java/Widget.java +++ b/osrs/src/main/java/Widget.java @@ -110,7 +110,7 @@ public class Widget extends Node { descriptor = "Luf;" ) @Export("fillMode") - public class541 fillMode; + public FillMode fillMode; @ObfuscatedName("cy") @Export("transparencyTop") public int transparencyTop; @@ -403,7 +403,8 @@ public class Widget extends Node { @Export("buttonText") public String buttonText; @ObfuscatedName("gm") - public int[] field3082; + @Export("itemIds") + public int[] itemIds; @ObfuscatedName("gb") public int[] field3079; @ObfuscatedName("gx") @@ -489,7 +490,7 @@ public Widget() { this.mouseOverColor = 0; this.mouseOverColor2 = 0; this.fill = false; - this.fillMode = class541.SOLID; + this.fillMode = FillMode.SOLID; this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; diff --git a/osrs/src/main/java/WorldMapElement.java b/osrs/src/main/java/WorldMapElement.java index d1f349edb..1a467652c 100644 --- a/osrs/src/main/java/WorldMapElement.java +++ b/osrs/src/main/java/WorldMapElement.java @@ -22,8 +22,8 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( descriptor = "Llr;" ) - @Export("HitSplatDefinition_cached") - static EvictingDualNodeHashTable HitSplatDefinition_cached; + @Export("HitSplatDefinition_cached2") + static EvictingDualNodeHashTable HitSplatDefinition_cached2; @ObfuscatedName("ao") @Export("objectId") public final int objectId; @@ -82,7 +82,7 @@ public class WorldMapElement extends DualNode { public int category; static { - HitSplatDefinition_cached = new EvictingDualNodeHashTable(256); + HitSplatDefinition_cached2 = new EvictingDualNodeHashTable(256); } public WorldMapElement(int var1) { @@ -254,13 +254,13 @@ SpritePixels getSprite(int var1) { if (var1 < 0) { return null; } else { - SpritePixels var2 = (SpritePixels)HitSplatDefinition_cached.get((long)var1); + SpritePixels var2 = (SpritePixels) HitSplatDefinition_cached2.get((long)var1); if (var2 != null) { return var2; } else { var2 = class47.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { - HitSplatDefinition_cached.put(var2, (long)var1); + HitSplatDefinition_cached2.put(var2, (long)var1); } return var2; diff --git a/osrs/src/main/java/class17.java b/osrs/src/main/java/class17.java index a0d46cd96..9d0566bb4 100644 --- a/osrs/src/main/java/class17.java +++ b/osrs/src/main/java/class17.java @@ -356,7 +356,7 @@ static int method56(int var0, Script var1, boolean var2) { return 1; } else if (var0 == 1125) { var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class541 var13 = (class541)SequenceDefinition.findEnumerated(class472.FillMode_values(), var10); + FillMode var13 = (FillMode)SequenceDefinition.findEnumerated(class472.FillMode_values(), var10); if (var13 != null) { var3.fillMode = var13; ClanChannelMember.invalidateWidget(var3); diff --git a/osrs/src/main/java/class198.java b/osrs/src/main/java/class198.java index 924a071fb..325033901 100644 --- a/osrs/src/main/java/class198.java +++ b/osrs/src/main/java/class198.java @@ -18,7 +18,7 @@ public class class198 { ) public static void method992() { SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.Widget_cachedFonts.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); } @ObfuscatedName("hc") diff --git a/osrs/src/main/java/class20.java b/osrs/src/main/java/class20.java index a6626c20e..5a1a461df 100644 --- a/osrs/src/main/java/class20.java +++ b/osrs/src/main/java/class20.java @@ -129,7 +129,7 @@ static Date method76() throws ParseException { ) public static void method75() { NPCComposition.NpcDefinition_cached.clear(); - NPCComposition.HitSplatDefinition_cachedFonts.clear(); + NPCComposition.NpcDefinition_cachedModels.clear(); } @ObfuscatedName("ae") diff --git a/osrs/src/main/java/class214.java b/osrs/src/main/java/class214.java index 8bb6f92c2..d94690865 100644 --- a/osrs/src/main/java/class214.java +++ b/osrs/src/main/java/class214.java @@ -221,7 +221,7 @@ static final void method1052() { HealthBarDefinition.ItemDefinition_cachedModels.clear(); HitSplatDefinition.HitSplatDefinition_cached.clear(); HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.field1697.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); MouseHandler.method173(); KitDefinition.KitDefinition_cached.clear(); ObjTypeCustomisation.method947(); @@ -265,7 +265,7 @@ static final void method1052() { class313.field2770.method1950(); WorldMapDecorationType.field3154.method1950(); class27.archive13.method1950(); - AbstractByteArrayCopier.field3136.method1950(); + AbstractByteArrayCopier.archive4.method1950(); class319.field2799.method1950(); class469.field3930.method1950(); Language.field3643.method1950(); diff --git a/osrs/src/main/java/class286.java b/osrs/src/main/java/class286.java index ead093a4b..2fcef2856 100644 --- a/osrs/src/main/java/class286.java +++ b/osrs/src/main/java/class286.java @@ -27,7 +27,7 @@ static boolean method1574(PlayerComposition var0) { ) static void method1575() { if (Client.isSpellSelected) { - Widget var0 = class33.widgetDefinition.getWidgetChild(JagexCache.field1449, Client.selectedSpellChildIndex); + Widget var0 = class33.widgetDefinition.getWidgetChild(JagexCache.selectedSpellWidget, Client.selectedSpellChildIndex); if (var0 != null && var0.onTargetLeave != null) { ScriptEvent var1 = new ScriptEvent(); var1.widget = var0; @@ -35,7 +35,7 @@ static void method1575() { Interpreter.runScriptEvent(var1); } - Client.field503 = -1; + Client.selectedSpellItemId = -1; Client.isSpellSelected = false; ClanChannelMember.invalidateWidget(var0); } diff --git a/osrs/src/main/java/class305.java b/osrs/src/main/java/class305.java index fbcb1cc16..9570f3223 100644 --- a/osrs/src/main/java/class305.java +++ b/osrs/src/main/java/class305.java @@ -43,16 +43,16 @@ public static void performReflectionCheck(PacketBuffer var0) { Field var5; int var6; if (var4 == 0) { - var5 = var1.field156[var3]; + var5 = var1.fields[var3]; var6 = Reflection.getInt(var5, (Object)null); var0.writeByte(0); var0.writeInt(var6); } else if (var4 == 1) { - var5 = var1.field156[var3]; + var5 = var1.fields[var3]; Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); var0.writeByte(0); } else if (var4 == 2) { - var5 = var1.field156[var3]; + var5 = var1.fields[var3]; var6 = var5.getModifiers(); var0.writeByte(0); var0.writeInt(var6); diff --git a/osrs/src/main/java/class314.java b/osrs/src/main/java/class314.java index ccefe9b4c..f7f80949b 100644 --- a/osrs/src/main/java/class314.java +++ b/osrs/src/main/java/class314.java @@ -459,7 +459,7 @@ static void method1653() { class92.field888 = class202.newArchive(0, false, true, true, false); class199.field1567 = class202.newArchive(1, false, true, true, false); SoundSystem.archive2 = class202.newArchive(2, true, false, true, false); - AbstractByteArrayCopier.field3136 = class202.newArchive(3, false, true, true, false); + AbstractByteArrayCopier.archive4 = class202.newArchive(3, false, true, true, false); class469.field3930 = class202.newArchive(4, false, true, true, false); class198.archive9 = class202.newArchive(5, true, true, true, false); CollisionMap.archive6 = class202.newArchive(6, true, true, true, false); @@ -492,7 +492,7 @@ static void method1653() { var0 = var33 + class92.field888.percentage() * 4 / 100; var0 += class199.field1567.percentage() * 4 / 100; var0 += SoundSystem.archive2.percentage() * 2 / 100; - var0 += AbstractByteArrayCopier.field3136.percentage() * 2 / 100; + var0 += AbstractByteArrayCopier.archive4.percentage() * 2 / 100; var0 += class469.field3930.percentage() * 6 / 100; var0 += class198.archive9.percentage() * 4 / 100; var0 += CollisionMap.archive6.percentage() * 2 / 100; @@ -672,7 +672,7 @@ static void method1653() { Archive var6 = SoundSystem.archive2; VarpDefinition.VarpDefinition_archive = var6; VarpDefinition.field1501 = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - class33.widgetDefinition = new WidgetDefinition(AbstractByteArrayCopier.field3136, GrandExchangeOfferOwnWorldComparator.field361, class199.archive8, class27.archive13, class319.field2799); + class33.widgetDefinition = new WidgetDefinition(AbstractByteArrayCopier.archive4, GrandExchangeOfferOwnWorldComparator.field361, class199.archive8, class27.archive13, class319.field2799); Decimator.method313(SoundSystem.archive2); class275.method1537(SoundSystem.archive2); class135.method727(SoundSystem.archive2); @@ -998,8 +998,8 @@ static void method1653() { Client.field416 = class94.field942; } } else if (class94.field942 == Client.field416) { - if (!AbstractByteArrayCopier.field3136.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + AbstractByteArrayCopier.field3136.loadPercent() * 4 / 5 + "%"; + if (!AbstractByteArrayCopier.archive4.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + AbstractByteArrayCopier.archive4.loadPercent() * 4 / 5 + "%"; Login.Login_loadingPercent = 96; } else if (!class319.field2799.isFullyLoaded()) { Login.Login_loadingText = "Loading interfaces - " + class319.field2799.loadPercent() * 4 / 5 + "%"; diff --git a/osrs/src/main/java/class33.java b/osrs/src/main/java/class33.java index 03f342dda..d49662207 100644 --- a/osrs/src/main/java/class33.java +++ b/osrs/src/main/java/class33.java @@ -69,7 +69,7 @@ static SpritePixels method134(int var0, int var1, int var2) { garbageValue = "973188034" ) public static void method135() { - WorldMapElement.HitSplatDefinition_cached.clear(); + WorldMapElement.HitSplatDefinition_cached2.clear(); } @ObfuscatedName("ll") @@ -381,9 +381,9 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.destinationX = var0; Client.destinationY = var1; var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYERT, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShort(Client.field503); + var14.packetBuffer.writeShort(Client.selectedSpellItemId); var14.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); - var14.packetBuffer.writeIntLE(JagexCache.field1449); + var14.packetBuffer.writeIntLE(JagexCache.selectedSpellWidget); var14.packetBuffer.writeShortLE(var3); var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); Client.packetWriter.addNode(var14); @@ -448,10 +448,10 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); var9.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); var9.packetBuffer.writeShort(var0 + class20.baseX); - var9.packetBuffer.writeIntIME(JagexCache.field1449); + var9.packetBuffer.writeIntIME(JagexCache.selectedSpellWidget); var9.packetBuffer.writeShortLE(var3); var9.packetBuffer.writeShortLE(class19.baseY + var1); - var9.packetBuffer.writeShortAdd(Client.field503); + var9.packetBuffer.writeShortAdd(Client.selectedSpellItemId); Client.packetWriter.addNode(var9); } @@ -544,8 +544,8 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJT, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShortAdd(var3); var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeInt(JagexCache.field1449); - var9.packetBuffer.writeShort(Client.field503); + var9.packetBuffer.writeInt(JagexCache.selectedSpellWidget); + var9.packetBuffer.writeShort(Client.selectedSpellItemId); var9.packetBuffer.writeShortAddLE(class19.baseY + var1); var9.packetBuffer.writeShortAddLE(var0 + class20.baseX); var9.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); @@ -643,8 +643,8 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S var14.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); var14.packetBuffer.writeInt(var1); var14.packetBuffer.writeShortAdd(var4); - var14.packetBuffer.writeIntIME(JagexCache.field1449); - var14.packetBuffer.writeShortAddLE(Client.field503); + var14.packetBuffer.writeIntIME(JagexCache.selectedSpellWidget); + var14.packetBuffer.writeShortAddLE(Client.selectedSpellItemId); var14.packetBuffer.writeShortAddLE(var0); Client.packetWriter.addNode(var14); } @@ -743,8 +743,8 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.destinationX = var0; Client.destinationY = var1; var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPCT, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeIntIME(JagexCache.field1449); - var14.packetBuffer.writeShortAdd(Client.field503); + var14.packetBuffer.writeIntIME(JagexCache.selectedSpellWidget); + var14.packetBuffer.writeShortAdd(Client.selectedSpellItemId); var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); var14.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); var14.packetBuffer.writeShortAddLE(var3); diff --git a/osrs/src/main/java/class357.java b/osrs/src/main/java/class357.java index ff5125486..96d08e098 100644 --- a/osrs/src/main/java/class357.java +++ b/osrs/src/main/java/class357.java @@ -20,7 +20,7 @@ public static void readReflectionCheck(Buffer var0, int var1) { var2.id = var0.readInt(); var2.operations = new int[var2.size]; var2.creationErrors = new int[var2.size]; - var2.field156 = new Field[var2.size]; + var2.fields = new Field[var2.size]; var2.intReplaceValues = new int[var2.size]; var2.methods = new Method[var2.size]; var2.arguments = new byte[var2.size][][]; @@ -105,7 +105,7 @@ public static void readReflectionCheck(Buffer var0, int var1) { throw new SecurityException(); } - var2.field156[var3] = Reflection.findField(class18.loadClassFromDescriptor(var5), var6); + var2.fields[var3] = Reflection.findField(class18.loadClassFromDescriptor(var5), var6); } } catch (ClassNotFoundException var24) { var2.creationErrors[var3] = -1; diff --git a/osrs/src/main/java/class472.java b/osrs/src/main/java/class472.java index a1d9c76a0..c3490de26 100644 --- a/osrs/src/main/java/class472.java +++ b/osrs/src/main/java/class472.java @@ -90,8 +90,8 @@ Object method2370() { garbageValue = "-1429373012" ) @Export("FillMode_values") - public static class541[] FillMode_values() { - return new class541[]{class541.field4257, class541.SOLID, class541.field4258}; + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4257, FillMode.SOLID, FillMode.field4258}; } @ObfuscatedName("bw") diff --git a/osrs/src/main/java/class478.java b/osrs/src/main/java/class478.java index cbb7592ee..21b7ba4c0 100644 --- a/osrs/src/main/java/class478.java +++ b/osrs/src/main/java/class478.java @@ -86,9 +86,9 @@ static void method2385(int var0, int var1, int var2, int var3) { Interpreter.runScriptEvent(var5); } - Client.field503 = var3; + Client.selectedSpellItemId = var3; Client.isSpellSelected = true; - JagexCache.field1449 = var0; + JagexCache.selectedSpellWidget = var0; Client.selectedSpellChildIndex = var1; class31.field82 = var2; ClanChannelMember.invalidateWidget(var4); diff --git a/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java b/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java index 10e704428..cfcd68c01 100644 --- a/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java +++ b/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java @@ -283,7 +283,6 @@ public class ObfuscatedClassMap extends HashMap { INSTANCE.put("class534", "uh"); INSTANCE.put("class537", "uv"); INSTANCE.put("class538", "ut"); - INSTANCE.put("class541", "uf"); INSTANCE.put("class544", "ue"); INSTANCE.put("class547", "vz"); INSTANCE.put("class553", "vj"); @@ -333,6 +332,7 @@ public class ObfuscatedClassMap extends HashMap { INSTANCE.put("FadeInTask", "qg"); INSTANCE.put("FadeOutTask", "qk"); INSTANCE.put("FileSystem", "ga"); + INSTANCE.put("FillMode", "uf"); INSTANCE.put("FloorDecoration", "jd"); INSTANCE.put("FloorOverlayDefinition", "io"); INSTANCE.put("FloorUnderlayDefinition", "ie"); From 03946271f48f0fd40e1bc8ad28c3f64abca10761 Mon Sep 17 00:00:00 2001 From: Kaballist Date: Thu, 28 Sep 2023 17:37:40 -0700 Subject: [PATCH 14/17] finished I think still have to fix check resize though --- .../java/net/runelite/rs/api/RSClient.java | 6 ++-- .../main/java/net/runelite/api/WorldType.java | 33 +++++++++-------- .../attackstyles/AttackStylesPlugin.kt | 2 +- .../runelite/http/api/worlds/WorldClient.java | 2 ++ .../runelite/http/api/worlds/WorldType.java | 1 + .../src/main/java/mixins/RSClientMixin.java | 21 +++++++---- .../src/main/java/mixins/ScriptVMMixin.java | 35 ++++++++----------- osrs/src/main/java/ArchiveDisk.java | 2 +- osrs/src/main/java/ClanChannel.java | 2 +- osrs/src/main/java/Client.java | 4 +-- osrs/src/main/java/ClientPacket.java | 2 +- osrs/src/main/java/Interpreter.java | 3 +- osrs/src/main/java/WidgetDefinition.java | 1 + osrs/src/main/java/class158.java | 2 +- 14 files changed, 63 insertions(+), 53 deletions(-) diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java index 95659f867..7c653051b 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java @@ -197,9 +197,7 @@ public interface RSClient extends RSGameEngine, Client @Override int getDragTime(); - //@Import("Widget_interfaceComponents") - @Override - RSWidget[][] getWidgets(); + /** * Gets an array of widgets that correspond to the passed group ID. @@ -855,7 +853,7 @@ public interface RSClient extends RSGameEngine, Client @Import("compass") void setCompass(SpritePixels spritePixels); - @Import("Widget_cachedSprites") + //@Import("Widget_cachedSprites") @Override RSEvictingDualNodeHashTable getWidgetSpriteCache(); diff --git a/api/src/main/java/net/runelite/api/WorldType.java b/api/src/main/java/net/runelite/api/WorldType.java index 8104b2d00..9df5b822c 100644 --- a/api/src/main/java/net/runelite/api/WorldType.java +++ b/api/src/main/java/net/runelite/api/WorldType.java @@ -24,9 +24,10 @@ */ package net.runelite.api; +import lombok.AllArgsConstructor; + import java.util.Collection; import java.util.EnumSet; -import lombok.AllArgsConstructor; /** * An enumeration of possible world types. @@ -66,6 +67,10 @@ public enum WorldType * Last man standing world type. */ LAST_MAN_STANDING(1 << 14), + /** + * Beta world. + */ + BETA_WORLD(1 << 16), /** * Beta worlds without profiles that are saved. */ @@ -90,34 +95,34 @@ public enum WorldType private final int mask; private static final EnumSet PVP_WORLD_TYPES = EnumSet.of( - DEADMAN, // dmmt worlds are also flaged as DEADMAN - PVP + DEADMAN, // dmmt worlds are also flaged as DEADMAN + PVP ); private static final EnumSet DEADMAN_WORLD_TYPES = EnumSet.of( - DEADMAN + DEADMAN ); private static final EnumSet HIGHRISK_WORLD_TYPES = EnumSet.of( - HIGH_RISK + HIGH_RISK ); private static final EnumSet ALL_HIGHRISK_WORLD_TYPES = EnumSet.of( - HIGH_RISK, - DEADMAN + HIGH_RISK, + DEADMAN ); private static final EnumSet ALL_PVP_WORLD_TYPES = EnumSet.of( - HIGH_RISK, - DEADMAN, - PVP + HIGH_RISK, + DEADMAN, + PVP ); private static final EnumSet ALL_PK_WORLD_TYPES = EnumSet.of( - HIGH_RISK, - DEADMAN, - PVP, - BOUNTY + HIGH_RISK, + DEADMAN, + PVP, + BOUNTY ); /** diff --git a/client/src/main/java/meteor/plugins/attackstyles/AttackStylesPlugin.kt b/client/src/main/java/meteor/plugins/attackstyles/AttackStylesPlugin.kt index 0ff619cb0..5e0c10687 100644 --- a/client/src/main/java/meteor/plugins/attackstyles/AttackStylesPlugin.kt +++ b/client/src/main/java/meteor/plugins/attackstyles/AttackStylesPlugin.kt @@ -111,7 +111,7 @@ class AttackStylesPlugin : Plugin() { val weaponSwitch = currentEquippedWeaponTypeVarbit != equippedWeaponTypeVarbit equippedWeaponTypeVarbit = currentEquippedWeaponTypeVarbit updateAttackStyle(equippedWeaponTypeVarbit, currentAttackStyleVarbit, - currentCastingModeVarbit) + currentCastingModeVarbit) updateWarning(weaponSwitch) // this isn't required, but will hide styles 1 tick earlier than the script event, which fires diff --git a/http/src/main/java/net/runelite/http/api/worlds/WorldClient.java b/http/src/main/java/net/runelite/http/api/worlds/WorldClient.java index 34e75ff17..31849482d 100644 --- a/http/src/main/java/net/runelite/http/api/worlds/WorldClient.java +++ b/http/src/main/java/net/runelite/http/api/worlds/WorldClient.java @@ -61,6 +61,8 @@ public WorldResult lookupWorlds() throws IOException .url(url) .build(); + + try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) diff --git a/http/src/main/java/net/runelite/http/api/worlds/WorldType.java b/http/src/main/java/net/runelite/http/api/worlds/WorldType.java index e61af8863..1ec2c6c9c 100644 --- a/http/src/main/java/net/runelite/http/api/worlds/WorldType.java +++ b/http/src/main/java/net/runelite/http/api/worlds/WorldType.java @@ -8,6 +8,7 @@ public enum WorldType { SKILL_TOTAL(), QUEST_SPEEDRUNNING(), HIGH_RISK(), + BETA_WORLD(), LAST_MAN_STANDING(), NOSAVE_MODE(), TOURNAMENT(), diff --git a/mixins/src/main/java/mixins/RSClientMixin.java b/mixins/src/main/java/mixins/RSClientMixin.java index 14a7fc1ba..b4cf4b697 100644 --- a/mixins/src/main/java/mixins/RSClientMixin.java +++ b/mixins/src/main/java/mixins/RSClientMixin.java @@ -547,7 +547,12 @@ public RSWidget[] getGroup(int groupId) return widgets[groupId]; } - + @Inject + @Override + public RSWidget[][] getWidgets() + { + return getWidgetDefinition() != null ? getWidgetDefinition().getWidgets() : null; + } @Inject @Override public Widget getWidget(int groupId, int childId) @@ -1071,15 +1076,18 @@ public SpritePixels createItemSprite(int itemId, int quantity, int border, int s @Copy("runWidgetOnLoadListener") @Replace("runWidgetOnLoadListener") @SuppressWarnings("InfiniteRecursion") - public static void copy$runWidgetOnLoadListener(int groupId) { + public static void copy$runWidgetOnLoadListener(int groupId) + { copy$runWidgetOnLoadListener(groupId); - RSWidget[][] widgets = client.getWidgets(); + RSWidget[][] widgets = client.getWidgetDefinition().getWidgets(); boolean loaded = widgets != null && widgets[groupId] != null; - if (loaded) { + if (loaded) + { WidgetLoaded event = new WidgetLoaded(groupId); - client.getCallbacks().post(Events.WIDGET_LOADED, event); + event.setGroupId(groupId); + client.getCallbacks().post(Events.WIDGET_LOADED,event); } } @@ -2427,6 +2435,7 @@ public static void check(String name, RSEvictingDualNodeHashTable dualNodeHashTa boolean var3 = dualNodeHashTable.isTrashing(); dualNodeHashTable.setThreshold(dualNodeHashTable.getThreshold() * 0.92F + (var3 ? 0.07999998F : 0.0F)); if (var3) { + if (dualNodeHashTable.getThreshold() > 0.9F && dualNodeHashTable.getCapacity() < dualNodeHashTable.getTmpCapacity() * 8) { dualNodeHashTable.increaseCapacity(dualNodeHashTable.getCapacity() * 2); client.getLogger() @@ -2450,7 +2459,7 @@ public static void checkResize() { check("HealthBarDefinition_cached", client.getHealthBarCache()); check("HealthBarDefinition_cachedSprites", client.getHealthBarSpriteCache()); check("ObjectDefinition_cachedModels", client.getObjectDefinitionModelsCache()); - check("Widget_cachedSprites", client.getWidgetSpriteCache()); + //check("Widget_cachedSprites", client.getWidgetSpriteCache()); check("ItemDefinition_cached", client.getItemCompositionCache()); check("VarbitDefinition_cached", client.getVarbitCache()); check("EnumDefinition_cached", client.getEnumDefinitionCache()); diff --git a/mixins/src/main/java/mixins/ScriptVMMixin.java b/mixins/src/main/java/mixins/ScriptVMMixin.java index bf5f99bde..bcf0ef32e 100644 --- a/mixins/src/main/java/mixins/ScriptVMMixin.java +++ b/mixins/src/main/java/mixins/ScriptVMMixin.java @@ -160,22 +160,12 @@ else if ("mes".equals(stringOp)) @Inject public static int currentQuestRow = -1; - @Copy("runScriptLogic") - @Replace("runScriptLogic") - static void copy$runScriptLogic(RSScriptEvent event, RSScript var4, int maxExecutionTime, int var2) - { - copy$runScriptLogic(event, var4, maxExecutionTime, var2); - } - @Copy("runScript") @Replace("runScript") static void copy$runScript(RSScriptEvent event, int maxExecutionTime, int var2) { Object[] arguments = event.getArguments(); - if (!(arguments != null && arguments.length > 0)) { - System.out.println("Bad script arguments"); - return; - } + assert arguments != null && arguments.length > 0; if (arguments[0] instanceof JavaScriptCallback) { try @@ -184,7 +174,7 @@ else if ("mes".equals(stringOp)) } catch (Exception e) { - e.printStackTrace(); + client.getLogger().error("Error in JavaScriptCallback", e); } } else @@ -194,9 +184,6 @@ else if ("mes".equals(stringOp)) rootScriptEvent = event; copy$runScript(event, maxExecutionTime, var2); } - catch (Exception exception) { - exception.printStackTrace(); - } finally { currentScript = null; @@ -204,6 +191,13 @@ else if ("mes".equals(stringOp)) } } + @Copy("runScriptLogic") + @Replace("runScriptLogic") + static void copy$runScriptLogic(RSScriptEvent event, RSScript var4, int maxExecutionTime, int var2) + { + copy$runScriptLogic(event, var4, maxExecutionTime, var2); + } + @Inject @Override public void runScript(Object... args) @@ -215,17 +209,16 @@ public void runScript(Object... args) @Override public void runScriptEvent(RSScriptEvent event) { - Object[] args = event.getArguments(); - int scriptId = (int) args[0]; - assert isClientThread() : "runScriptEvent must be called on client thread"; - //assert currentScript == null : "scripts are not reentrant"; + assert currentScript == null : "scripts are not reentrant"; runScript(event, 5000000, 0); boolean assertionsEnabled = false; assert assertionsEnabled = true; + Object[] args = event.getArguments(); if (assertionsEnabled && args[0] instanceof Integer) { + int scriptId = (int) args[0]; RSScript script = (RSScript) client.getScriptCache().get(scriptId); if (script != null) @@ -244,8 +237,8 @@ public void runScriptEvent(RSScriptEvent event) } assert script.getIntArgumentCount() == intCount && script.getStringArgumentCount() == stringCount : - "Script " + scriptId + " was called with the incorrect number of arguments; takes " - + script.getIntArgumentCount() + "+" + script.getStringArgumentCount() + ", got " + intCount + "+" + stringCount; + "Script " + scriptId + " was called with the incorrect number of arguments; takes " + + script.getIntArgumentCount() + "+" + script.getStringArgumentCount() + ", got " + intCount + "+" + stringCount; } } } diff --git a/osrs/src/main/java/ArchiveDisk.java b/osrs/src/main/java/ArchiveDisk.java index a2d559656..1205c854f 100644 --- a/osrs/src/main/java/ArchiveDisk.java +++ b/osrs/src/main/java/ArchiveDisk.java @@ -397,7 +397,7 @@ static final void closeInterface(InterfaceParent var0, boolean var1) { } if (Client.rootInterface != -1) { - Interpreter.method418(Client.rootInterface, 1); + Interpreter.runIntfCloseListener(Client.rootInterface, 1); } } diff --git a/osrs/src/main/java/ClanChannel.java b/osrs/src/main/java/ClanChannel.java index a869cb034..f7fe4f7af 100644 --- a/osrs/src/main/java/ClanChannel.java +++ b/osrs/src/main/java/ClanChannel.java @@ -216,7 +216,7 @@ static final InterfaceParent ifOpenSub(int var0, int var1, int var2) { PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var0 >> 16], var4, false); VerticalAlignment.runWidgetOnLoadListener(var1); if (Client.rootInterface != -1) { - Interpreter.method418(Client.rootInterface, 1); + Interpreter.runIntfCloseListener(Client.rootInterface, 1); } return var3; diff --git a/osrs/src/main/java/Client.java b/osrs/src/main/java/Client.java index 16f12273a..58f345837 100644 --- a/osrs/src/main/java/Client.java +++ b/osrs/src/main/java/Client.java @@ -3910,7 +3910,7 @@ final boolean method378(PacketWriter var1) { if (ServerPacket.CAM_RESET == var1.serverPacket) { if (rootInterface != -1) { - Interpreter.method418(rootInterface, 0); + Interpreter.runIntfCloseListener(rootInterface, 0); } var1.serverPacket = null; @@ -4235,7 +4235,7 @@ final boolean method378(PacketWriter var1) { } if (rootInterface != -1) { - Interpreter.method418(rootInterface, 1); + Interpreter.runIntfCloseListener(rootInterface, 1); } var1.serverPacket = null; diff --git a/osrs/src/main/java/ClientPacket.java b/osrs/src/main/java/ClientPacket.java index 3bb030dbf..40504b305 100644 --- a/osrs/src/main/java/ClientPacket.java +++ b/osrs/src/main/java/ClientPacket.java @@ -734,7 +734,7 @@ static final void runComponentCloseListeners(Widget[] var0, int var1) { InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); if (var4 != null) { - Interpreter.method418(var4.group, var1); + Interpreter.runIntfCloseListener(var4.group, var1); } } diff --git a/osrs/src/main/java/Interpreter.java b/osrs/src/main/java/Interpreter.java index a6efd7433..b67871896 100644 --- a/osrs/src/main/java/Interpreter.java +++ b/osrs/src/main/java/Interpreter.java @@ -88,7 +88,8 @@ public static void runScriptEvent(ScriptEvent var0) { descriptor = "(III)V", garbageValue = "1205286290" ) - static final void method418(int var0, int var1) { + @Export("runIntfCloseListeners") + static final void runIntfCloseListener(int var0, int var1) { if (class33.widgetDefinition.loadInterface(var0)) { ClientPacket.runComponentCloseListeners(class33.widgetDefinition.Widget_interfaceComponents[var0], var1); } diff --git a/osrs/src/main/java/WidgetDefinition.java b/osrs/src/main/java/WidgetDefinition.java index 737b0e014..dcb0d4ee6 100644 --- a/osrs/src/main/java/WidgetDefinition.java +++ b/osrs/src/main/java/WidgetDefinition.java @@ -37,6 +37,7 @@ public class WidgetDefinition { @ObfuscatedSignature( descriptor = "[[Lnm;" ) + @Export("Widget_interfaceComponents") public Widget[][] Widget_interfaceComponents; @ObfuscatedName("ab") Map field2910; diff --git a/osrs/src/main/java/class158.java b/osrs/src/main/java/class158.java index 4b784a972..34f2236f4 100644 --- a/osrs/src/main/java/class158.java +++ b/osrs/src/main/java/class158.java @@ -168,7 +168,7 @@ static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { default: break; case 2: - throw new IllegalStateException(); + //throw new IllegalStateException(); } } else if (var32 == 0) { Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7[var5]; From 56b7db32fe757d2bc37ab63675ac32112b66a4c3 Mon Sep 17 00:00:00 2001 From: Kaballist Date: Mon, 2 Oct 2023 06:50:11 -0700 Subject: [PATCH 15/17] moved the asm directory from the deobfuscator to a new module then removed the deobfuscator from the client project --- {deobfuscator => asm}/build.gradle.kts | 31 +- .../src/main/java}/asm/Annotation.java | 2 +- .../src/main/java}/asm/ClassFile.java | 13 +- .../src/main/java}/asm/ClassGroup.java | 9 +- .../src/main/java/asm}/DeobAnnotations.java | 14 +- .../src/main/java}/asm/Field.java | 9 +- .../src/main/java}/asm/Interfaces.java | 5 +- .../src/main/java}/asm/Method.java | 33 +- .../src/main/java}/asm/Named.java | 2 +- .../src/main/java}/asm/Type.java | 4 +- .../main/java}/asm/attributes/Annotated.java | 7 +- .../src/main/java}/asm/attributes/Code.java | 21 +- .../main/java}/asm/attributes/Exceptions.java | 7 +- .../java}/asm/attributes/code/Exception.java | 6 +- .../java}/asm/attributes/code/Exceptions.java | 7 +- .../asm/attributes/code/Instruction.java | 8 +- .../asm/attributes/code/InstructionType.java | 211 +++++ .../asm/attributes/code/Instructions.java | 14 +- .../main/java}/asm/attributes/code/Label.java | 4 +- .../asm/attributes/code/LocalVariable.java | 2 +- .../java}/asm/attributes/code/Parameter.java | 2 +- .../types/AdditionInstruction.java | 16 +- .../code/instruction/types/ArrayLoad.java | 12 +- .../types/ArrayStoreInstruction.java | 2 +- .../types/ComparisonInstruction.java | 2 +- .../types/ConversionInstruction.java | 2 +- .../types/DivisionInstruction.java | 14 +- .../instruction/types/DupInstruction.java | 7 +- .../instruction/types/FieldInstruction.java | 6 +- .../types/GetFieldInstruction.java | 2 +- .../instruction/types/IntInstruction.java | 2 +- .../instruction/types/InvokeInstruction.java | 9 +- .../instruction/types/JumpingInstruction.java | 5 +- .../instruction/types/LVTInstruction.java | 4 +- .../instruction/types/LVTInstructionType.java | 2 +- .../types/MappableInstruction.java | 6 +- .../types/PushConstantInstruction.java | 4 +- .../instruction/types/ReturnInstruction.java | 2 +- .../types/SetFieldInstruction.java | 2 +- .../types/SubtractionInstruction.java | 16 +- .../instruction/types/TypeInstruction.java | 4 +- .../attributes/code/instructions/AALoad.java | 20 +- .../attributes/code/instructions/AAStore.java | 14 +- .../code/instructions/AConstNull.java | 16 +- .../attributes/code/instructions/ALoad.java | 19 +- .../code/instructions/ANewArray.java | 22 +- .../attributes/code/instructions/AStore.java | 19 +- .../attributes/code/instructions/AThrow.java | 16 +- .../code/instructions/ArrayLength.java | 18 +- .../code/instructions/ArrayStore.java | 24 +- .../attributes/code/instructions/BALoad.java | 20 +- .../attributes/code/instructions/BAStore.java | 14 +- .../attributes/code/instructions/BiPush.java | 20 +- .../attributes/code/instructions/CALoad.java | 20 +- .../attributes/code/instructions/CAStore.java | 14 +- .../code/instructions/CheckCast.java | 26 +- .../asm/attributes/code/instructions/D2F.java | 20 +- .../asm/attributes/code/instructions/D2I.java | 20 +- .../asm/attributes/code/instructions/D2L.java | 20 +- .../attributes/code/instructions/DALoad.java | 20 +- .../attributes/code/instructions/DAStore.java | 14 +- .../attributes/code/instructions/DAdd.java | 18 +- .../attributes/code/instructions/DCmpG.java | 16 +- .../attributes/code/instructions/DCmpL.java | 16 +- .../attributes/code/instructions/DDiv.java | 18 +- .../attributes/code/instructions/DLoad.java | 21 +- .../attributes/code/instructions/DMul.java | 16 +- .../attributes/code/instructions/DNeg.java | 16 +- .../attributes/code/instructions/DRem.java | 16 +- .../attributes/code/instructions/DStore.java | 19 +- .../attributes/code/instructions/DSub.java | 18 +- .../asm/attributes/code/instructions/Dup.java | 19 +- .../attributes/code/instructions/Dup2.java | 19 +- .../attributes/code/instructions/Dup2_X1.java | 19 +- .../attributes/code/instructions/Dup2_X2.java | 19 +- .../attributes/code/instructions/Dup_X1.java | 19 +- .../attributes/code/instructions/Dup_X2.java | 19 +- .../asm/attributes/code/instructions/F2D.java | 20 +- .../asm/attributes/code/instructions/F2I.java | 20 +- .../asm/attributes/code/instructions/F2L.java | 20 +- .../attributes/code/instructions/FALoad.java | 20 +- .../attributes/code/instructions/FAStore.java | 14 +- .../attributes/code/instructions/FAdd.java | 18 +- .../attributes/code/instructions/FCmpG.java | 16 +- .../attributes/code/instructions/FCmpL.java | 16 +- .../attributes/code/instructions/FDiv.java | 18 +- .../attributes/code/instructions/FLoad.java | 21 +- .../attributes/code/instructions/FMul.java | 16 +- .../attributes/code/instructions/FNeg.java | 16 +- .../attributes/code/instructions/FRem.java | 16 +- .../attributes/code/instructions/FStore.java | 19 +- .../attributes/code/instructions/FSub.java | 18 +- .../code/instructions/GetField.java | 36 +- .../code/instructions/GetStatic.java | 36 +- .../attributes/code/instructions/Goto.java | 19 +- .../attributes/code/instructions/GotoW.java | 19 +- .../asm/attributes/code/instructions/I2B.java | 20 +- .../asm/attributes/code/instructions/I2C.java | 20 +- .../asm/attributes/code/instructions/I2D.java | 20 +- .../asm/attributes/code/instructions/I2F.java | 20 +- .../asm/attributes/code/instructions/I2L.java | 20 +- .../asm/attributes/code/instructions/I2S.java | 20 +- .../attributes/code/instructions/IALoad.java | 20 +- .../attributes/code/instructions/IAStore.java | 14 +- .../attributes/code/instructions/IAdd.java | 18 +- .../attributes/code/instructions/IAnd.java | 19 +- .../attributes/code/instructions/IDiv.java | 18 +- .../attributes/code/instructions/IInc.java | 20 +- .../attributes/code/instructions/ILoad.java | 23 +- .../attributes/code/instructions/IMul.java | 16 +- .../attributes/code/instructions/INeg.java | 16 +- .../asm/attributes/code/instructions/IOr.java | 16 +- .../attributes/code/instructions/IRem.java | 16 +- .../attributes/code/instructions/IShL.java | 16 +- .../attributes/code/instructions/IShR.java | 16 +- .../attributes/code/instructions/IStore.java | 19 +- .../attributes/code/instructions/ISub.java | 18 +- .../attributes/code/instructions/IUShR.java | 16 +- .../attributes/code/instructions/IXor.java | 16 +- .../asm/attributes/code/instructions/If.java | 33 +- .../asm/attributes/code/instructions/If0.java | 35 +- .../code/instructions/IfACmpEq.java | 14 +- .../code/instructions/IfACmpNe.java | 14 +- .../attributes/code/instructions/IfCmpGe.java | 10 +- .../attributes/code/instructions/IfCmpGt.java | 10 +- .../attributes/code/instructions/IfCmpLe.java | 10 +- .../attributes/code/instructions/IfCmpLt.java | 10 +- .../attributes/code/instructions/IfEq.java | 19 +- .../attributes/code/instructions/IfGe.java | 10 +- .../attributes/code/instructions/IfGt.java | 10 +- .../code/instructions/IfICmpEq.java | 18 +- .../code/instructions/IfICmpNe.java | 21 +- .../attributes/code/instructions/IfLe.java | 10 +- .../attributes/code/instructions/IfLt.java | 10 +- .../attributes/code/instructions/IfNe.java | 19 +- .../code/instructions/IfNonNull.java | 12 +- .../attributes/code/instructions/IfNull.java | 12 +- .../code/instructions/InstanceOf.java | 22 +- .../code/instructions/InvokeDynamic.java | 25 +- .../code/instructions/InvokeInterface.java | 64 +- .../code/instructions/InvokeSpecial.java | 54 +- .../code/instructions/InvokeStatic.java | 59 +- .../code/instructions/InvokeVirtual.java | 74 +- .../asm/attributes/code/instructions/L2D.java | 20 +- .../asm/attributes/code/instructions/L2F.java | 20 +- .../asm/attributes/code/instructions/L2I.java | 20 +- .../attributes/code/instructions/LALoad.java | 20 +- .../attributes/code/instructions/LAStore.java | 14 +- .../attributes/code/instructions/LAdd.java | 18 +- .../attributes/code/instructions/LAnd.java | 16 +- .../attributes/code/instructions/LCmp.java | 27 +- .../asm/attributes/code/instructions/LDC.java | 44 +- .../attributes/code/instructions/LDiv.java | 18 +- .../attributes/code/instructions/LLoad.java | 21 +- .../attributes/code/instructions/LMul.java | 16 +- .../attributes/code/instructions/LNeg.java | 16 +- .../asm/attributes/code/instructions/LOr.java | 16 +- .../attributes/code/instructions/LRem.java | 16 +- .../attributes/code/instructions/LShL.java | 16 +- .../attributes/code/instructions/LShR.java | 16 +- .../attributes/code/instructions/LStore.java | 21 +- .../attributes/code/instructions/LSub.java | 18 +- .../attributes/code/instructions/LUShR.java | 16 +- .../attributes/code/instructions/LXor.java | 16 +- .../code/instructions/LookupSwitch.java | 23 +- .../code/instructions/MonitorEnter.java | 16 +- .../code/instructions/MonitorExit.java | 16 +- .../code/instructions/MultiANewArray.java | 22 +- .../asm/attributes/code/instructions/NOP.java | 12 +- .../asm/attributes/code/instructions/New.java | 26 +- .../code/instructions/NewArray.java | 18 +- .../asm/attributes/code/instructions/Pop.java | 14 +- .../attributes/code/instructions/Pop2.java | 16 +- .../code/instructions/PutField.java | 64 +- .../code/instructions/PutStatic.java | 57 +- .../attributes/code/instructions/Return.java | 28 +- .../attributes/code/instructions/SALoad.java | 20 +- .../attributes/code/instructions/SAStore.java | 14 +- .../attributes/code/instructions/SiPush.java | 20 +- .../attributes/code/instructions/Swap.java | 18 +- .../code/instructions/TableSwitch.java | 29 +- .../attributes/code/instructions/VReturn.java | 14 +- .../main/java}/asm/execution/Execution.java | 30 +- .../java}/asm/execution/ExecutionVisitor.java | 2 +- .../src/main/java}/asm/execution/Frame.java | 31 +- .../java}/asm/execution/FrameVisitor.java | 2 +- .../asm/execution/InstructionContext.java | 20 +- .../java}/asm/execution/MethodContext.java | 6 +- .../asm/execution/MethodContextVisitor.java | 2 +- .../execution/ParallellMappingExecutor.java | 16 +- .../src/main/java}/asm/execution/Stack.java | 6 +- .../java}/asm/execution/StackContext.java | 4 +- .../main/java}/asm/execution/StaticStep.java | 10 +- .../src/main/java}/asm/execution/Value.java | 7 +- .../java}/asm/execution/VariableContext.java | 4 +- .../main/java}/asm/execution/Variables.java | 2 +- .../asm/execution/WeakInstructionContext.java | 4 +- .../mapping/AnnotationIntegrityChecker.java | 11 +- .../java/asm}/mapping/AnnotationMapper.java | 14 +- .../java/asm}/mapping/ClassGroupMapper.java | 6 +- .../main/java/asm}/mapping/ClassMapper.java | 8 +- .../java/asm}/mapping/ConstructorMapper.java | 12 +- .../java/asm}/mapping/ExecutionMapper.java | 4 +- .../src/main/java/asm}/mapping/Mapper.java | 10 +- .../src/main/java/asm}/mapping/Mapping.java | 4 +- .../asm}/mapping/MappingExecutorUtil.java | 54 +- .../asm}/mapping/MethodSignatureMapper.java | 10 +- .../asm}/mapping/ParallelExecutorMapping.java | 12 +- .../mapping/StaticInitializerIndexer.java | 18 +- .../mapping/StaticMethodSignatureMapper.java | 12 +- .../objectwebasm/NonloadingClassWriter.java | 6 +- .../src/main/java}/asm/pool/Class.java | 2 +- .../src/main/java}/asm/pool/Field.java | 4 +- .../src/main/java}/asm/pool/Method.java | 4 +- asm/src/main/java/asm/signature/Signature.kt | 136 +++ .../java/asm/signature/util/VirtualMethods.kt | 84 ++ .../src/main/java/asm}/util/IdGen.java | 2 +- .../src/main/java/asm}/util/JarUtil.java | 26 +- .../src/main/java/asm}/util/NameMappings.java | 13 +- .../main/java/asm}/util/PrimitiveUtils.java | 2 +- .../java}/asm/visitors/ClassFieldVisitor.java | 10 +- .../java}/asm/visitors/ClassFileVisitor.java | 12 +- .../main/java}/asm/visitors/CodeVisitor.java | 78 +- .../meteor/launcher/CreateLauncherUpdate.kt | 12 +- .../asm/attributes/code/InstructionType.java | 348 -------- .../net/runelite/asm/signature/Signature.java | 178 ---- .../asm/signature/util/VirtualMethods.java | 97 --- .../net/runelite/deob/CleanRuneLitePatch.java | 136 --- .../net/runelite/deob/CreateAnnotations.java | 74 -- .../src/main/java/net/runelite/deob/Deob.java | 198 ----- .../net/runelite/deob/DeobProperties.java | 39 - .../java/net/runelite/deob/Deobfuscator.java | 33 - .../runelite/deob/RemoveNamedAnnotations.java | 81 -- .../runelite/deob/SyncRuneLitePatches.java | 73 -- .../java/net/runelite/deob/Transformer.java | 33 - .../runelite/deob/c2s/IsaacCipherFinder.java | 117 --- .../net/runelite/deob/c2s/RWOpcodeFinder.java | 111 --- .../deob/clientver/ClientVersion.java | 67 -- .../deob/clientver/ClientVersionMain.java | 60 -- .../deob/clientver/VersionClassVisitor.java | 58 -- .../deob/clientver/VersionMethodVisitor.java | 60 -- .../runelite/deob/deobfuscators/CastNull.java | 87 -- .../deob/deobfuscators/EnumDeobfuscator.java | 257 ------ .../deob/deobfuscators/FieldInliner.java | 174 ---- .../deobfuscators/IllegalStateExceptions.java | 159 ---- .../net/runelite/deob/deobfuscators/Lvt.java | 94 --- .../runelite/deob/deobfuscators/Order.java | 189 ----- .../deobfuscators/PacketHandlerOrder.java | 671 --------------- .../deob/deobfuscators/RenameUnique.java | 99 --- .../runelite/deob/deobfuscators/Renamer.java | 295 ------- .../deob/deobfuscators/RuntimeExceptions.java | 80 -- .../deob/deobfuscators/UnreachedCode.java | 107 --- .../deob/deobfuscators/UnusedClass.java | 71 -- .../deob/deobfuscators/UnusedFields.java | 79 -- .../deob/deobfuscators/UnusedMethods.java | 114 --- .../deob/deobfuscators/UnusedParameters.java | 301 ------- .../arithmetic/AssociatedConstant.java | 35 - .../arithmetic/DupDeobfuscator.java | 258 ------ .../deobfuscators/arithmetic/Encryption.java | 57 -- .../deobfuscators/arithmetic/FieldInfo.java | 165 ---- .../deobfuscators/arithmetic/ModArith.java | 795 ------------------ .../MultiplicationDeobfuscator.java | 395 --------- .../arithmetic/MultiplicationExpression.java | 134 --- .../arithmetic/MultiplyOneDeobfuscator.java | 123 --- .../arithmetic/MultiplyZeroDeobfuscator.java | 137 --- .../deob/deobfuscators/arithmetic/Pair.java | 56 -- .../deob/deobfuscators/cfg/Block.java | 132 --- .../cfg/ControlFlowDeobfuscator.java | 131 --- .../deobfuscators/cfg/ControlFlowGraph.java | 156 ---- .../constparam/ConstantMethodParameter.java | 74 -- .../constparam/ConstantParameter.java | 467 ---------- .../exprargorder/ExprArgOrder.java | 529 ------------ .../exprargorder/Expression.java | 100 --- .../deob/deobfuscators/lvt/LVTType.java | 32 - .../deob/deobfuscators/lvt/MapKey.java | 75 -- .../deob/deobfuscators/lvt/Mappings.java | 87 -- .../deobfuscators/menuaction/Comparison.java | 83 -- .../menuaction/MenuActionDeobfuscator.java | 252 ------ .../packethandler/PacketLengthFinder.java | 149 ---- .../packethandler/PacketRead.java | 113 --- .../packethandler/PacketTypeFinder.java | 109 --- .../packetwrite/OpcodeReplacer.java | 93 -- .../packetwrite/PacketWrite.java | 53 -- .../packetwrite/PacketWriteDeobfuscator.java | 331 -------- .../transformers/ClientErrorTransformer.java | 100 --- .../transformers/GetPathTransformer.java | 93 -- .../GraphicsObjectTransformer.java | 41 - .../transformers/MaxMemoryTransformer.java | 109 --- .../transformers/OpcodesTransformer.java | 74 -- .../transformers/ReflectionTransformer.java | 243 ------ .../RuneliteBufferTransformer.java | 210 ----- .../ScriptOpcodesTransformer.java | 160 ---- .../transformers/buffer/BufferFinder.java | 109 --- .../buffer/BufferMethodInjector.java | 140 --- .../buffer/BufferPayloadFinder.java | 67 -- .../buffer/PacketFlushFinder.java | 115 --- .../transformers/buffer/RuneliteBuffer.java | 198 ----- .../net/runelite/deob/s2c/HandlerFinder.java | 299 ------- .../net/runelite/deob/s2c/PacketHandler.java | 172 ---- .../net/runelite/deob/s2c/PacketHandlers.java | 70 -- .../deob/updater/AnnotationAdder.java | 77 -- .../deob/updater/AnnotationCopier.java | 101 --- .../deob/updater/AnnotationRenamer.java | 88 -- .../runelite/deob/updater/MappingDumper.java | 120 --- .../deob/updater/ParameterRenamer.java | 92 -- .../runelite/deob/updater/UpdateMappings.java | 96 --- .../updater/mappingdumper/MappedClass.java | 67 -- .../updater/mappingdumper/MappedField.java | 47 -- .../updater/mappingdumper/MappedMethod.java | 113 --- .../updater/mappingdumper/MappingDump.java | 148 ---- .../java/net/runelite/gamepack/Checker.java | 166 ---- .../net/runelite/gamepack/Downloader.java | 65 -- .../net/runelite/gamepack/URLDownloader.java | 35 - injector/build.gradle.kts | 2 +- .../java/com/openosrs/injector}/DMath.java | 2 +- .../com/openosrs/injector/InjectUtil.java | 60 +- .../java/com/openosrs/injector/Injector.java | 10 +- .../openosrs/injector/InjectorValidator.java | 4 +- .../java/com/openosrs/injector/Validator.java | 2 +- .../injector/injection/InjectData.java | 12 +- .../injector/injectors/CreateAnnotations.java | 9 +- .../injectors/CreateObfuscatedClassMap.java | 5 +- .../injector/injectors/InjectConstruct.java | 32 +- .../injector/injectors/InjectHook.java | 52 +- .../injector/injectors/InjectHookMethod.java | 26 +- .../openosrs/injector/injectors/Injector.java | 2 +- .../injector/injectors/InterfaceInjector.java | 8 +- .../injector/injectors/MixinInjector.java | 74 +- .../injector/injectors/RSApiInjector.java | 14 +- .../injectors/raw/AddPlayerToMenu.java | 42 +- .../injectors/raw/ClearColorBuffer.java | 24 +- .../injectors/raw/CopyRuneLiteClasses.java | 54 +- .../injectors/raw/DrawAfterWidgets.java | 34 +- .../injector/injectors/raw/DrawMenu.java | 26 +- .../injectors/raw/GameDrawingMode.java | 14 +- .../injectors/raw/GraphicsObject.java | 18 +- .../injector/injectors/raw/Occluder.java | 10 +- .../injectors/raw/RasterizerAlpha.java | 60 +- .../injector/injectors/raw/RenderDraw.java | 14 +- .../injectors/raw/RuneLiteIterables.java | 30 +- .../injectors/raw/RuneliteMenuEntry.java | 38 +- .../injectors/raw/RuneliteObject.java | 24 +- .../injector/injectors/raw/ScriptVM.java | 50 +- .../injectors/rsapi/InjectGetter.java | 20 +- .../injectors/rsapi/InjectInvoke.java | 30 +- .../injectors/rsapi/InjectSetter.java | 26 +- .../com/openosrs/injector/rsapi/RSApi.java | 4 +- .../openosrs/injector/rsapi/RSApiClass.java | 8 +- .../openosrs/injector/rsapi/RSApiMethod.java | 14 +- .../transformers/EnumInvokeVirtualFixer.java | 8 +- .../transformers/InjectTransformer.java | 2 +- .../injector/transformers/Java8Ifier.java | 8 +- .../injector/transformers/SourceChanger.java | 2 +- .../kotlin/meteor/scripts/AssembleScripts.kt | 2 +- settings.gradle.kts | 2 +- 355 files changed, 2584 insertions(+), 15478 deletions(-) rename {deobfuscator => asm}/build.gradle.kts (50%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/Annotation.java (99%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/ClassFile.java (97%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/ClassGroup.java (95%) rename {deobfuscator/src/main/java/net/runelite/deob => asm/src/main/java/asm}/DeobAnnotations.java (93%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/Field.java (94%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/Interfaces.java (96%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/Method.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/Named.java (64%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/Type.java (98%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/Annotated.java (92%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/Code.java (86%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/Exceptions.java (94%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/Exception.java (95%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/Exceptions.java (94%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/Instruction.java (95%) create mode 100644 asm/src/main/java/asm/attributes/code/InstructionType.java rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/Instructions.java (95%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/Label.java (96%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/LocalVariable.java (98%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/Parameter.java (97%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/AdditionInstruction.java (91%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/ArrayLoad.java (90%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/ArrayStoreInstruction.java (96%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/ComparisonInstruction.java (95%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/ConversionInstruction.java (95%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/DivisionInstruction.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/DupInstruction.java (92%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/FieldInstruction.java (91%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/GetFieldInstruction.java (96%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/IntInstruction.java (96%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/InvokeInstruction.java (89%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/JumpingInstruction.java (93%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/LVTInstruction.java (93%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/LVTInstructionType.java (96%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/MappableInstruction.java (89%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/PushConstantInstruction.java (92%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/ReturnInstruction.java (95%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/SetFieldInstruction.java (96%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/SubtractionInstruction.java (92%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instruction/types/TypeInstruction.java (94%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/AALoad.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/AAStore.java (84%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/AConstNull.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/ALoad.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/ANewArray.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/AStore.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/AThrow.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/ArrayLength.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/ArrayStore.java (86%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/BALoad.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/BAStore.java (84%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/BiPush.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/CALoad.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/CAStore.java (84%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/CheckCast.java (83%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/D2F.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/D2I.java (78%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/D2L.java (78%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DALoad.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DAStore.java (84%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DAdd.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DCmpG.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DCmpL.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DDiv.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DLoad.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DMul.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DNeg.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DRem.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DStore.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/DSub.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Dup.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Dup2.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Dup2_X1.java (91%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Dup2_X2.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Dup_X1.java (89%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Dup_X2.java (89%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/F2D.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/F2I.java (78%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/F2L.java (78%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FALoad.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FAStore.java (84%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FAdd.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FCmpG.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FCmpL.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FDiv.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FLoad.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FMul.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FNeg.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FRem.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FStore.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/FSub.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/GetField.java (78%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/GetStatic.java (77%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Goto.java (86%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/GotoW.java (85%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/I2B.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/I2C.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/I2D.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/I2F.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/I2L.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/I2S.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IALoad.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IAStore.java (84%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IAdd.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IAnd.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IDiv.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IInc.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/ILoad.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IMul.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/INeg.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IOr.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IRem.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IShL.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IShR.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IStore.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/ISub.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IUShR.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IXor.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/If.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/If0.java (85%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfACmpEq.java (87%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfACmpNe.java (87%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfCmpGe.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfCmpGt.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfCmpLe.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfCmpLt.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfEq.java (85%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfGe.java (87%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfGt.java (87%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfICmpEq.java (87%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfICmpNe.java (85%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfLe.java (87%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfLt.java (87%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfNe.java (86%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfNonNull.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/IfNull.java (88%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/InstanceOf.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/InvokeDynamic.java (85%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/InvokeInterface.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/InvokeSpecial.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/InvokeStatic.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/InvokeVirtual.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/L2D.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/L2F.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/L2I.java (78%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LALoad.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LAStore.java (84%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LAdd.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LAnd.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LCmp.java (83%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LDC.java (72%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LDiv.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LLoad.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LMul.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LNeg.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LOr.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LRem.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LShL.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LShR.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LStore.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LSub.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LUShR.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LXor.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/LookupSwitch.java (87%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/MonitorEnter.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/MonitorExit.java (81%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/MultiANewArray.java (83%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/NOP.java (85%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/New.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/NewArray.java (83%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Pop.java (83%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Pop2.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/PutField.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/PutStatic.java (75%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Return.java (79%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/SALoad.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/SAStore.java (84%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/SiPush.java (80%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/Swap.java (86%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/TableSwitch.java (86%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/attributes/code/instructions/VReturn.java (82%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/Execution.java (93%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/ExecutionVisitor.java (97%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/Frame.java (92%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/FrameVisitor.java (97%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/InstructionContext.java (91%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/MethodContext.java (95%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/MethodContextVisitor.java (97%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/ParallellMappingExecutor.java (93%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/Stack.java (96%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/StackContext.java (97%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/StaticStep.java (94%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/Value.java (97%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/VariableContext.java (97%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/Variables.java (98%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/execution/WeakInstructionContext.java (96%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/AnnotationIntegrityChecker.java (96%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/AnnotationMapper.java (91%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/ClassGroupMapper.java (94%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/ClassMapper.java (94%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/ConstructorMapper.java (93%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/ExecutionMapper.java (96%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/Mapper.java (97%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/Mapping.java (96%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/MappingExecutorUtil.java (85%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/MethodSignatureMapper.java (92%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/ParallelExecutorMapping.java (97%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/StaticInitializerIndexer.java (85%) rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators => asm/src/main/java/asm}/mapping/StaticMethodSignatureMapper.java (91%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/objectwebasm/NonloadingClassWriter.java (96%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/pool/Class.java (98%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/pool/Field.java (97%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/pool/Method.java (97%) create mode 100644 asm/src/main/java/asm/signature/Signature.kt create mode 100644 asm/src/main/java/asm/signature/util/VirtualMethods.kt rename {deobfuscator/src/main/java/net/runelite/deob => asm/src/main/java/asm}/util/IdGen.java (97%) rename {deobfuscator/src/main/java/net/runelite/deob => asm/src/main/java/asm}/util/JarUtil.java (92%) rename {deobfuscator/src/main/java/net/runelite/deob => asm/src/main/java/asm}/util/NameMappings.java (93%) rename {deobfuscator/src/main/java/net/runelite/deob => asm/src/main/java/asm}/util/PrimitiveUtils.java (98%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/visitors/ClassFieldVisitor.java (92%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/visitors/ClassFileVisitor.java (91%) rename {deobfuscator/src/main/java/net/runelite => asm/src/main/java}/asm/visitors/CodeVisitor.java (81%) delete mode 100644 deobfuscator/src/main/java/net/runelite/asm/attributes/code/InstructionType.java delete mode 100644 deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java delete mode 100644 deobfuscator/src/main/java/net/runelite/asm/signature/util/VirtualMethods.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/CleanRuneLitePatch.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/CreateAnnotations.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/Deob.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/DeobProperties.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/Deobfuscator.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/RemoveNamedAnnotations.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/SyncRuneLitePatches.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/Transformer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/c2s/IsaacCipherFinder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/c2s/RWOpcodeFinder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersion.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersionMain.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/clientver/VersionClassVisitor.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/clientver/VersionMethodVisitor.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/CastNull.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/EnumDeobfuscator.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Lvt.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Order.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/PacketHandlerOrder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/AssociatedConstant.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DupDeobfuscator.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/FieldInfo.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscator.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationExpression.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscator.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscator.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Pair.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/Block.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscator.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowGraph.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/constparam/ConstantMethodParameter.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/constparam/ConstantParameter.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/ExprArgOrder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/Expression.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/MapKey.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/Mappings.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/menuaction/Comparison.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/menuaction/MenuActionDeobfuscator.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketLengthFinder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketRead.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketTypeFinder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/OpcodeReplacer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/PacketWrite.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/PacketWriteDeobfuscator.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ClientErrorTransformer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/GetPathTransformer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/GraphicsObjectTransformer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/MaxMemoryTransformer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/OpcodesTransformer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ReflectionTransformer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/RuneliteBufferTransformer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferFinder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferMethodInjector.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferPayloadFinder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/PacketFlushFinder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/RuneliteBuffer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/s2c/HandlerFinder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/s2c/PacketHandler.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/s2c/PacketHandlers.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationCopier.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationRenamer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/MappingDumper.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedClass.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedField.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedMethod.java delete mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappingDump.java delete mode 100644 deobfuscator/src/main/java/net/runelite/gamepack/Checker.java delete mode 100644 deobfuscator/src/main/java/net/runelite/gamepack/Downloader.java delete mode 100644 deobfuscator/src/main/java/net/runelite/gamepack/URLDownloader.java rename {deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic => injector/src/main/java/com/openosrs/injector}/DMath.java (98%) diff --git a/deobfuscator/build.gradle.kts b/asm/build.gradle.kts similarity index 50% rename from deobfuscator/build.gradle.kts rename to asm/build.gradle.kts index 3f649795c..b19b3eafa 100644 --- a/deobfuscator/build.gradle.kts +++ b/asm/build.gradle.kts @@ -1,5 +1,8 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { java + kotlin("jvm") } group = "org.meteorlite" @@ -8,30 +11,38 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() maven { url = uri("https://raw.githubusercontent.com/MeteorLite/hosting/main/repo/") } + maven { url = uri("https://jitpack.io") } +} +tasks.withType(){ + duplicatesStrategy = DuplicatesStrategy.EXCLUDE } - dependencies { - with(projects) { - implementation(annotations) - implementation(api) + + + + // implementation("com.github.JagexCompliant:meteor-api:1.0.4") + with(projects){ implementation(apiRs) - implementation(logger) implementation(cache) + implementation(logger) + implementation(annotations) + implementation(api) } - + implementation(projects.logger) with(libs) { + // implementation(projects.common) annotationProcessor(lombok) - implementation(annotations) + implementation(group = "org.jetbrains", name = "annotations", version = "_") implementation(asm) implementation(asm.util) - implementation(fernflower) - implementation(gson) + implementation(group = "com.google.code.gson", name = "gson", version = "_") implementation(guava) compileOnly(lombok) } + implementation(kotlin("stdlib-jdk8")) } tasks.test { useJUnitPlatform() -} \ No newline at end of file +} diff --git a/deobfuscator/src/main/java/net/runelite/asm/Annotation.java b/asm/src/main/java/asm/Annotation.java similarity index 99% rename from deobfuscator/src/main/java/net/runelite/asm/Annotation.java rename to asm/src/main/java/asm/Annotation.java index b3cafb0ab..dc4b65428 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/Annotation.java +++ b/asm/src/main/java/asm/Annotation.java @@ -22,7 +22,7 @@ * (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.asm; +package asm; import java.util.ArrayList; import java.util.List; diff --git a/deobfuscator/src/main/java/net/runelite/asm/ClassFile.java b/asm/src/main/java/asm/ClassFile.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/asm/ClassFile.java rename to asm/src/main/java/asm/ClassFile.java index fdcf163ff..e8d0bb37b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/ClassFile.java +++ b/asm/src/main/java/asm/ClassFile.java @@ -22,22 +22,25 @@ * (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.asm; +package asm; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import lombok.Getter; -import net.runelite.asm.attributes.Annotated; -import net.runelite.asm.pool.Class; -import net.runelite.asm.signature.Signature; -import static net.runelite.deob.DeobAnnotations.*; +import asm.attributes.Annotated; +import asm.pool.Class; +import asm.signature.Signature; + import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; +import static asm.DeobAnnotations.getObfuscatedName; +import static asm.DeobAnnotations.getObfuscatedSignature; + public class ClassFile implements Annotated, Named { private ClassGroup group; diff --git a/deobfuscator/src/main/java/net/runelite/asm/ClassGroup.java b/asm/src/main/java/asm/ClassGroup.java similarity index 95% rename from deobfuscator/src/main/java/net/runelite/asm/ClassGroup.java rename to asm/src/main/java/asm/ClassGroup.java index 3b29c295b..08c6f5e4e 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/ClassGroup.java +++ b/asm/src/main/java/asm/ClassGroup.java @@ -22,7 +22,7 @@ * (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.asm; +package asm; import java.util.ArrayList; import java.util.Collections; @@ -31,11 +31,12 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.signature.Signature; -import static net.runelite.deob.DeobAnnotations.*; +import asm.attributes.Code; +import asm.signature.Signature; import org.jetbrains.annotations.NotNull; +import static asm.DeobAnnotations.getObfuscatedName; + public class ClassGroup implements Iterable { private final List classes = new ArrayList<>(); // to keep order diff --git a/deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java b/asm/src/main/java/asm/DeobAnnotations.java similarity index 93% rename from deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java rename to asm/src/main/java/asm/DeobAnnotations.java index b751a95af..d0494965d 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java +++ b/asm/src/main/java/asm/DeobAnnotations.java @@ -22,18 +22,14 @@ * (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.deob; +package asm; -import javax.annotation.Nullable; -import net.runelite.asm.attributes.Annotated; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.Annotation; -import net.runelite.asm.signature.Signature; +import asm.attributes.Annotated; +import asm.signature.Signature; import org.jetbrains.annotations.NotNull; +import javax.annotation.Nullable; + public class DeobAnnotations { public static final Type OBFUSCATED_NAME = new Type("Lnet/runelite/mapping/ObfuscatedName;"); diff --git a/deobfuscator/src/main/java/net/runelite/asm/Field.java b/asm/src/main/java/asm/Field.java similarity index 94% rename from deobfuscator/src/main/java/net/runelite/asm/Field.java rename to asm/src/main/java/asm/Field.java index 33c4f8448..178c41b18 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/Field.java +++ b/asm/src/main/java/asm/Field.java @@ -22,13 +22,12 @@ * (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.asm; +package asm; import java.util.LinkedHashMap; import java.util.Map; import lombok.Getter; -import net.runelite.asm.attributes.Annotated; -import net.runelite.deob.DeobAnnotations; +import asm.attributes.Annotated; import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.Opcodes; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; @@ -151,9 +150,9 @@ public void setValue(Object value) this.value = value; } - public net.runelite.asm.pool.Field getPoolField() + public asm.pool.Field getPoolField() { - return new net.runelite.asm.pool.Field( + return new asm.pool.Field( classFile.getPoolClass(), this.getName(), this.getType() diff --git a/deobfuscator/src/main/java/net/runelite/asm/Interfaces.java b/asm/src/main/java/asm/Interfaces.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/asm/Interfaces.java rename to asm/src/main/java/asm/Interfaces.java index ce8925af1..2a436ec44 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/Interfaces.java +++ b/asm/src/main/java/asm/Interfaces.java @@ -22,14 +22,13 @@ * (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.asm; +package asm; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; -import net.runelite.asm.pool.Class; -import net.runelite.deob.DeobAnnotations; +import asm.pool.Class; import org.jetbrains.annotations.NotNull; public class Interfaces implements Iterable diff --git a/deobfuscator/src/main/java/net/runelite/asm/Method.java b/asm/src/main/java/asm/Method.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/Method.java rename to asm/src/main/java/asm/Method.java index e1c711fdf..a86fdc141 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/Method.java +++ b/asm/src/main/java/asm/Method.java @@ -22,22 +22,21 @@ * (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.asm; +package asm; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import lombok.Getter; -import net.runelite.asm.attributes.Annotated; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.Exceptions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.LocalVariable; -import net.runelite.asm.attributes.code.Parameter; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.DeobAnnotations; +import asm.attributes.Annotated; +import asm.attributes.Code; +import asm.attributes.Exceptions; +import asm.attributes.code.Instruction; +import asm.attributes.code.LocalVariable; +import asm.attributes.code.Parameter; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.signature.Signature; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import static org.objectweb.asm.Opcodes.ACC_FINAL; @@ -102,8 +101,8 @@ public void accept(MethodVisitor visitor) visitor.visitCode(); - net.runelite.asm.attributes.code.Exceptions exceptions = code.getExceptions(); - for (net.runelite.asm.attributes.code.Exception exception : exceptions.getExceptions()) + asm.attributes.code.Exceptions exceptions = code.getExceptions(); + for (asm.attributes.code.Exception exception : exceptions.getExceptions()) { assert exception.getStart().getLabel() != null; assert exception.getEnd().getLabel() != null; @@ -138,13 +137,13 @@ public void accept(MethodVisitor visitor) Label endLabel = null; for (Instruction i : code.getInstructions().getInstructions()) { - if (i instanceof net.runelite.asm.attributes.code.Label) + if (i instanceof asm.attributes.code.Label) { if (startLabel == null) { - startLabel = ((net.runelite.asm.attributes.code.Label) i).getLabel(); + startLabel = ((asm.attributes.code.Label) i).getLabel(); } - endLabel = ((net.runelite.asm.attributes.code.Label) i).getLabel(); + endLabel = ((asm.attributes.code.Label) i).getLabel(); } } @@ -307,9 +306,9 @@ public List findLVTInstructionsForVa return list; } - public net.runelite.asm.pool.Method getPoolMethod() + public asm.pool.Method getPoolMethod() { - return new net.runelite.asm.pool.Method( + return new asm.pool.Method( classFile.getPoolClass(), name, arguments diff --git a/deobfuscator/src/main/java/net/runelite/asm/Named.java b/asm/src/main/java/asm/Named.java similarity index 64% rename from deobfuscator/src/main/java/net/runelite/asm/Named.java rename to asm/src/main/java/asm/Named.java index ec2bc0b6a..81e206ad9 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/Named.java +++ b/asm/src/main/java/asm/Named.java @@ -1,4 +1,4 @@ -package net.runelite.asm; +package asm; public interface Named { diff --git a/deobfuscator/src/main/java/net/runelite/asm/Type.java b/asm/src/main/java/asm/Type.java similarity index 98% rename from deobfuscator/src/main/java/net/runelite/asm/Type.java rename to asm/src/main/java/asm/Type.java index 89eb3b302..f7ce79741 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/Type.java +++ b/asm/src/main/java/asm/Type.java @@ -22,9 +22,9 @@ * (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.asm; +package asm; -import net.runelite.asm.pool.Class; +import asm.pool.Class; /** * Created by Kyle Fricilone on 8/20/2017 diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotated.java b/asm/src/main/java/asm/attributes/Annotated.java similarity index 92% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/Annotated.java rename to asm/src/main/java/asm/attributes/Annotated.java index bb4336104..d98469c4c 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotated.java +++ b/asm/src/main/java/asm/attributes/Annotated.java @@ -1,8 +1,9 @@ -package net.runelite.asm.attributes; +package asm.attributes; + +import asm.Annotation; +import asm.Type; import java.util.Map; -import net.runelite.asm.Annotation; -import net.runelite.asm.Type; /** * Objects implementing this only have to implement getAnnotations. diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/Code.java b/asm/src/main/java/asm/attributes/Code.java similarity index 86% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/Code.java rename to asm/src/main/java/asm/attributes/Code.java index 58c759844..ddfad755b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/Code.java +++ b/asm/src/main/java/asm/attributes/Code.java @@ -23,24 +23,25 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes; +package asm.attributes; + +import asm.Method; +import asm.attributes.code.Exceptions; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.signature.Signature; import java.util.ArrayList; import java.util.List; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Exceptions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.signature.Signature; public class Code { private Method method; private int maxStack; private Instructions instructions; - private final Exceptions exceptions; + private final asm.attributes.code.Exceptions exceptions; public Code(Method method) { @@ -103,7 +104,7 @@ public int getMaxLocals() return max; } - public Exceptions getExceptions() + public asm.attributes.code.Exceptions getExceptions() { return exceptions; } diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/Exceptions.java b/asm/src/main/java/asm/attributes/Exceptions.java similarity index 94% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/Exceptions.java rename to asm/src/main/java/asm/attributes/Exceptions.java index 0b12c513f..706ba98bc 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/Exceptions.java +++ b/asm/src/main/java/asm/attributes/Exceptions.java @@ -23,12 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes; +package asm.attributes; + +import asm.ClassFile; +import asm.pool.Class; import java.util.ArrayList; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.pool.Class; public class Exceptions { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Exception.java b/asm/src/main/java/asm/attributes/code/Exception.java similarity index 95% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/Exception.java rename to asm/src/main/java/asm/attributes/code/Exception.java index b1209a663..5042ab2b7 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Exception.java +++ b/asm/src/main/java/asm/attributes/code/Exception.java @@ -23,10 +23,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code; +package asm.attributes.code; -import net.runelite.asm.ClassFile; -import net.runelite.asm.pool.Class; +import asm.ClassFile; +import asm.pool.Class; public class Exception implements Cloneable { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Exceptions.java b/asm/src/main/java/asm/attributes/code/Exceptions.java similarity index 94% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/Exceptions.java rename to asm/src/main/java/asm/attributes/code/Exceptions.java index 30b00a011..3fd63e1bc 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Exceptions.java +++ b/asm/src/main/java/asm/attributes/code/Exceptions.java @@ -23,12 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code; +package asm.attributes.code; + +import asm.ClassFile; +import asm.attributes.Code; import java.util.ArrayList; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.attributes.Code; public class Exceptions { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Instruction.java b/asm/src/main/java/asm/attributes/code/Instruction.java similarity index 95% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/Instruction.java rename to asm/src/main/java/asm/attributes/code/Instruction.java index bf8e64535..c9463b82f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Instruction.java +++ b/asm/src/main/java/asm/attributes/code/Instruction.java @@ -22,11 +22,11 @@ * (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.asm.attributes.code; +package asm.attributes.code; -import net.runelite.asm.Method; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; +import asm.Method; +import asm.execution.Frame; +import asm.execution.InstructionContext; import org.objectweb.asm.MethodVisitor; public abstract class Instruction implements Cloneable diff --git a/asm/src/main/java/asm/attributes/code/InstructionType.java b/asm/src/main/java/asm/attributes/code/InstructionType.java new file mode 100644 index 000000000..770bb98fe --- /dev/null +++ b/asm/src/main/java/asm/attributes/code/InstructionType.java @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2016-2017, Adam + * 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 asm.attributes.code; + +import asm.attributes.code.instructions.*; + +public enum InstructionType +{ + NOP(0x00, "nop", NOP.class), + ACONST_NULL(0x01, "aconst_null", AConstNull.class), + BIPUSH(0x10, "bipush", BiPush.class), + SIPUSH(0x11, "sipush", SiPush.class), + LDC(-1, "ldc", LDC.class), + ILOAD(0x15, "iload", ILoad.class), + LLOAD(0x16, "lload", LLoad.class), + FLOAD(0x17, "fload", FLoad.class), + DLOAD(0x18, "dload", DLoad.class), + ALOAD(0x19, "aload", ALoad.class), + IALOAD(0x2e, "iaload", IALoad.class), + LALOAD(0x2f, "laload", LALoad.class), + FALOAD(0x30, "faload", FALoad.class), + DALOAD(0x31, "daload", DALoad.class), + AALOAD(0x32, "aaload", AALoad.class), + BALOAD(0x33, "baload", BALoad.class), + CALOAD(0x34, "caload", CALoad.class), + SALOAD(0x35, "saload", SALoad.class), + ISTORE(0x36, "istore", IStore.class), + LSTORE(0x37, "lstore", LStore.class), + FSTORE(0x38, "fstore", FStore.class), + DSTORE(0x39, "dstore", DStore.class), + ASTORE(0x3a, "astore", AStore.class), + IASTORE(0x4f, "iastore", IAStore.class), + LASTORE(0x50, "lastore", LAStore.class), + FASTORE(0x51, "fastore", FAStore.class), + DASTORE(0x52, "dastore", DAStore.class), + AASTORE(0x53, "aastore", AAStore.class), + BASTORE(0x54, "bastore", BAStore.class), + CASTORE(0x55, "castore", CAStore.class), + SASTORE(0x56, "sastore", SAStore.class), + POP(0x57, "pop", Pop.class), + POP2(0x58, "pop2", Pop2.class), + DUP(0x59, "dup", Dup.class), + DUP_X1(0x5a, "dup_x1", Dup_X1.class), + DUP_X2(0x5b, "dup_x2", Dup_X2.class), + DUP2(0x5c, "dup2", Dup2.class), + DUP2_X1(0x5d, "dup2_x1", Dup2_X1.class), + DUP2_X2(0x5e, "dup2_x2", Dup2_X2.class), + SWAP(0x5f, "swap", Swap.class), + IADD(0x60, "iadd", IAdd.class), + LADD(0x61, "ladd", LAdd.class), + FADD(0x62, "fadd", FAdd.class), + DADD(0x63, "dadd", DAdd.class), + ISUB(0x64, "isub", ISub.class), + LSUB(0x65, "lsub", LSub.class), + FSUB(0x66, "fsub", FSub.class), + DSUB(0x67, "dsub", DSub.class), + IMUL(0x68, "imul", IMul.class), + LMUL(0x69, "lmul", LMul.class), + FMUL(0x6a, "fmul", FMul.class), + DMUL(0x6b, "dmul", DMul.class), + IDIV(0x6c, "idiv", IDiv.class), + LDIV(0x6d, "ldiv", LDiv.class), + FDIV(0x6e, "fdiv", FDiv.class), + DDIV(0x6f, "ddiv", DDiv.class), + IREM(0x70, "irem", IRem.class), + LREM(0x71, "lrem", LRem.class), + FREM(0x72, "frem", FRem.class), + DREM(0x73, "drem", DRem.class), + INEG(0x74, "ineg", INeg.class), + LNEG(0x75, "lneg", LNeg.class), + FNEG(0x76, "fneg", FNeg.class), + DNEG(0x77, "dneg", DNeg.class), + ISHL(0x78, "ishl", IShL.class), + LSHL(0x79, "lshl", LShL.class), + ISHR(0x7a, "ishr", IShR.class), + LSHR(0x7b, "lshr", LShR.class), + IUSHR(0x7c, "iushr", IUShR.class), + LUSHR(0x7d, "lushr", LUShR.class), + IAND(0x7e, "iand", IAnd.class), + LAND(0x7f, "land", LAnd.class), + IOR(0x80, "ior", IOr.class), + LOR(0x81, "lor", LOr.class), + IXOR(0x82, "ixor", IXor.class), + LXOR(0x83, "lxor", LXor.class), + IINC(0x84, "iinc", IInc.class), + I2L(0x85, "i2l", I2L.class), + I2F(0x86, "i2f", I2F.class), + I2D(0x87, "i2d", I2D.class), + L2I(0x88, "l2i", L2I.class), + L2F(0x89, "l2f", L2F.class), + L2D(0x8a, "l2d", L2D.class), + F2I(0x8b, "f2i", F2I.class), + F2L(0x8c, "f2l", F2L.class), + F2D(0x8d, "f2d", F2D.class), + D2I(0x8e, "d2i", D2I.class), + D2L(0x8f, "d2l", D2L.class), + D2F(0x90, "d2f", D2F.class), + I2B(0x91, "i2b", I2B.class), + I2C(0x92, "i2c", I2C.class), + I2S(0x93, "i2s", I2S.class), + LCMP(0x94, "lcmp", LCmp.class), + FCMPL(0x95, "fcmpl", FCmpL.class), + FCMPG(0x96, "fcmpg", FCmpG.class), + DCMPL(0x97, "dcmpl", DCmpL.class), + DCMPG(0x98, "dcmpg", DCmpG.class), + IFEQ(0x99, "ifeq", IfEq.class), + IFNE(0x9a, "ifne", IfNe.class), + IFLT(0x9b, "iflt", IfLt.class), + IFGE(0x9c, "ifge", IfGe.class), + IFGT(0x9d, "ifgt", IfGt.class), + IFLE(0x9e, "ifle", IfLe.class), + IF_ICMPEQ(0x9f, "if_icmpeq", IfICmpEq.class), + IF_ICMPNE(0xa0, "if_icmpne", IfICmpNe.class), + IF_ICMPLT(0xa1, "if_cmplt", IfCmpLt.class), + IF_ICMPGE(0xa2, "if_icmpge", IfCmpGe.class), + IF_ICMPGT(0xa3, "if_icmpgt", IfCmpGt.class), + IF_ICMPLE(0xa4, "if_icmple", IfCmpLe.class), + IF_ACMPEQ(0xa5, "if_acmpeq", IfACmpEq.class), + IF_ACMPNE(0xa6, "if_acmpne", IfACmpNe.class), + GOTO(0xa7, "goto", Goto.class), + TABLESWITCH(0xaa, "tableswitch", TableSwitch.class), + LOOKUPSWITCH(0xab, "lookupswitch", LookupSwitch.class), + IRETURN(0xac, "ireturn", Return.class), + LRETURN(0xad, "lreturn", Return.class), + FRETURN(0xae, "freturn", Return.class), + DRETURN(0xaf, "dreturn", Return.class), + ARETURN(0xb0, "areturn", Return.class), + RETURN(0xb1, "return", VReturn.class), + GETSTATIC(0xb2, "getstatic", GetStatic.class), + PUTSTATIC(0xb3, "putstatic", PutStatic.class), + GETFIELD(0xb4, "getfield", GetField.class), + PUTFIELD(0xb5, "putfield", PutField.class), + INVOKEVIRTUAL(0xb6, "invokevirtual", InvokeVirtual.class), + INVOKESPECIAL(0xb7, "invokespecial", InvokeSpecial.class), + INVOKESTATIC(0xb8, "invokestatic", InvokeStatic.class), + INVOKEINTERFACE(0xb9, "invokeinterface", InvokeInterface.class), + INVOKEDYNAMIC(0xba, "invokedynamic", InvokeDynamic.class), + NEW(0xbb, "new", New.class), + NEWARRAY(0xbc, "newarray", NewArray.class), + ANEWARRAY(0xbd, "anewarray", ANewArray.class), + ARRAYLENGTH(0xbe, "arraylength", ArrayLength.class), + ATHROW(0xbf, "athrow", AThrow.class), + CHECKCAST(0xc0, "checkcast", CheckCast.class), + INSTANCEOf(0xc1, "instanceof", InstanceOf.class), + MONITORENTER(0xc2, "monitorenter", MonitorEnter.class), + MONITOREXIT(0xc3, "monitorexit", MonitorExit.class), + MULTIANEWARRAY(0xc5, "multianewarray", MultiANewArray.class), + IFNULL(0xc6, "ifnull", IfNull.class), + IFNONNULL(0xc7, "ifnonnull", IfNonNull.class), + GOTO_W(0xc8, "goto_w", GotoW.class); + + private final int code; + private final String name; + private final Class clazz; + + InstructionType(int op, String name, Class clazz) + { + this.code = op; + this.name = name; + this.clazz = clazz; + } + + public int getCode() + { + return code; + } + + public String getName() + { + return name; + } + + public Class getInstructionClass() + { + return clazz; + } + + public static InstructionType findInstructionFromCode(int code) + { + for (InstructionType t : InstructionType.values()) + { + if (t.getCode() == code) + { + return t; + } + } + return null; + } +} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Instructions.java b/asm/src/main/java/asm/attributes/code/Instructions.java similarity index 95% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/Instructions.java rename to asm/src/main/java/asm/attributes/code/Instructions.java index 212c16899..bc86d63c5 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Instructions.java +++ b/asm/src/main/java/asm/attributes/code/Instructions.java @@ -22,17 +22,13 @@ * (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.asm.attributes.code; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import net.runelite.asm.attributes.Code; +package asm.attributes.code; + +import asm.attributes.Code; import org.jetbrains.annotations.NotNull; +import java.util.*; + public class Instructions implements Iterable { private final Code code; diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Label.java b/asm/src/main/java/asm/attributes/code/Label.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/Label.java rename to asm/src/main/java/asm/attributes/code/Label.java index 4dcc55a01..a84248182 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Label.java +++ b/asm/src/main/java/asm/attributes/code/Label.java @@ -22,9 +22,9 @@ * (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.asm.attributes.code; +package asm.attributes.code; -import net.runelite.asm.attributes.code.instructions.NOP; +import asm.attributes.code.instructions.NOP; import org.objectweb.asm.MethodVisitor; public class Label extends NOP diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/LocalVariable.java b/asm/src/main/java/asm/attributes/code/LocalVariable.java similarity index 98% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/LocalVariable.java rename to asm/src/main/java/asm/attributes/code/LocalVariable.java index 3956b453d..41accca3e 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/LocalVariable.java +++ b/asm/src/main/java/asm/attributes/code/LocalVariable.java @@ -22,7 +22,7 @@ * (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.asm.attributes.code; +package asm.attributes.code; import org.objectweb.asm.Label; diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Parameter.java b/asm/src/main/java/asm/attributes/code/Parameter.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/Parameter.java rename to asm/src/main/java/asm/attributes/code/Parameter.java index b42a41a4b..fd736c460 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/Parameter.java +++ b/asm/src/main/java/asm/attributes/code/Parameter.java @@ -22,7 +22,7 @@ * (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.asm.attributes.code; +package asm.attributes.code; public class Parameter { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/AdditionInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/AdditionInstruction.java similarity index 91% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/AdditionInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/AdditionInstruction.java index 0fbb69ab1..7173b8533 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/AdditionInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/AdditionInstruction.java @@ -22,14 +22,14 @@ * (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.asm.attributes.code.instruction.types; - -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +package asm.attributes.code.instruction.types; + +import asm.Field; +import asm.attributes.code.Instruction; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; public interface AdditionInstruction extends MappableInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayLoad.java b/asm/src/main/java/asm/attributes/code/instruction/types/ArrayLoad.java similarity index 90% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayLoad.java rename to asm/src/main/java/asm/attributes/code/instruction/types/ArrayLoad.java index da196f005..c78b7a3d2 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayLoad.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/ArrayLoad.java @@ -22,13 +22,13 @@ * (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.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.Instruction; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; public interface ArrayLoad extends MappableInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayStoreInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/ArrayStoreInstruction.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayStoreInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/ArrayStoreInstruction.java index cf00821d1..5a067fbf0 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayStoreInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/ArrayStoreInstruction.java @@ -23,6 +23,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; public interface ArrayStoreInstruction extends MappableInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ComparisonInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/ComparisonInstruction.java similarity index 95% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ComparisonInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/ComparisonInstruction.java index 2076baead..7b931c1ad 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ComparisonInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/ComparisonInstruction.java @@ -23,6 +23,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; public interface ComparisonInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ConversionInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/ConversionInstruction.java similarity index 95% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ConversionInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/ConversionInstruction.java index 22b4977b7..c6bd32072 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ConversionInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/ConversionInstruction.java @@ -23,6 +23,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; public interface ConversionInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/DivisionInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/DivisionInstruction.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/DivisionInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/DivisionInstruction.java index f682748a6..ef2d421ba 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/DivisionInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/DivisionInstruction.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.Field; +import asm.attributes.code.Instruction; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; public interface DivisionInstruction extends MappableInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/DupInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/DupInstruction.java similarity index 92% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/DupInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/DupInstruction.java index 93ccb70e4..8e10386ed 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/DupInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/DupInstruction.java @@ -23,11 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; + +import asm.execution.InstructionContext; +import asm.execution.StackContext; import java.util.List; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; public interface DupInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/FieldInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/FieldInstruction.java similarity index 91% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/FieldInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/FieldInstruction.java index e9ed4999f..aee6baa5c 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/FieldInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/FieldInstruction.java @@ -22,9 +22,9 @@ * (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.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; -import net.runelite.asm.pool.Field; +import asm.pool.Field; public interface FieldInstruction { @@ -32,5 +32,5 @@ public interface FieldInstruction void setField(Field field); - net.runelite.asm.Field getMyField(); + asm.Field getMyField(); } diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/GetFieldInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/GetFieldInstruction.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/GetFieldInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/GetFieldInstruction.java index a9b7ab3cf..cb457e456 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/GetFieldInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/GetFieldInstruction.java @@ -23,6 +23,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; public interface GetFieldInstruction extends FieldInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/IntInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/IntInstruction.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/IntInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/IntInstruction.java index 2bc361ef4..81cd42115 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/IntInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/IntInstruction.java @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; public interface IntInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/InvokeInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/InvokeInstruction.java similarity index 89% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/InvokeInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/InvokeInstruction.java index 9396f974d..2a15d7dcf 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/InvokeInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/InvokeInstruction.java @@ -22,18 +22,19 @@ * (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.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; + +import asm.Method; import java.util.List; -import net.runelite.asm.Method; public interface InvokeInstruction extends MappableInstruction { void removeParameter(int idx); - net.runelite.asm.pool.Method getMethod(); + asm.pool.Method getMethod(); - void setMethod(net.runelite.asm.pool.Method method); + void setMethod(asm.pool.Method method); List getMethods(); } diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/JumpingInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/JumpingInstruction.java similarity index 93% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/JumpingInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/JumpingInstruction.java index fc1dda4b3..3b57e61d4 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/JumpingInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/JumpingInstruction.java @@ -22,10 +22,11 @@ * (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.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; + +import asm.attributes.code.Label; import java.util.List; -import net.runelite.asm.attributes.code.Label; public interface JumpingInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/LVTInstruction.java similarity index 93% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/LVTInstruction.java index 3710c1c38..88e08833a 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/LVTInstruction.java @@ -22,9 +22,9 @@ * (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.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; -import net.runelite.asm.attributes.code.Instruction; +import asm.attributes.code.Instruction; public interface LVTInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstructionType.java b/asm/src/main/java/asm/attributes/code/instruction/types/LVTInstructionType.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstructionType.java rename to asm/src/main/java/asm/attributes/code/instruction/types/LVTInstructionType.java index 07c5f17d9..4e297e5b1 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstructionType.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/LVTInstructionType.java @@ -22,7 +22,7 @@ * (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.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; public enum LVTInstructionType { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/MappableInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/MappableInstruction.java similarity index 89% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/MappableInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/MappableInstruction.java index e86faf24d..e91439776 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/MappableInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/MappableInstruction.java @@ -23,10 +23,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.execution.InstructionContext; +import asm.mapping.ParallelExecutorMapping; public interface MappableInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/PushConstantInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/PushConstantInstruction.java similarity index 92% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/PushConstantInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/PushConstantInstruction.java index 06da5c52f..0ee242193 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/PushConstantInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/PushConstantInstruction.java @@ -22,9 +22,9 @@ * (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.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; -import net.runelite.asm.attributes.code.Instruction; +import asm.attributes.code.Instruction; public interface PushConstantInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ReturnInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/ReturnInstruction.java similarity index 95% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ReturnInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/ReturnInstruction.java index ce9a7e7d3..9f882d1ea 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ReturnInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/ReturnInstruction.java @@ -23,6 +23,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; public interface ReturnInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/SetFieldInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/SetFieldInstruction.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/SetFieldInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/SetFieldInstruction.java index 0e645b01e..8a7e49d77 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/SetFieldInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/SetFieldInstruction.java @@ -23,6 +23,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; public interface SetFieldInstruction extends FieldInstruction, MappableInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/SubtractionInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/SubtractionInstruction.java similarity index 92% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/SubtractionInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/SubtractionInstruction.java index a31eb33df..3d480630a 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/SubtractionInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/SubtractionInstruction.java @@ -22,14 +22,14 @@ * (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.asm.attributes.code.instruction.types; - -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +package asm.attributes.code.instruction.types; + +import asm.Field; +import asm.attributes.code.Instruction; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; public interface SubtractionInstruction extends MappableInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/TypeInstruction.java b/asm/src/main/java/asm/attributes/code/instruction/types/TypeInstruction.java similarity index 94% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/TypeInstruction.java rename to asm/src/main/java/asm/attributes/code/instruction/types/TypeInstruction.java index d4ffb5619..3c814de1f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/TypeInstruction.java +++ b/asm/src/main/java/asm/attributes/code/instruction/types/TypeInstruction.java @@ -22,9 +22,9 @@ * (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.asm.attributes.code.instruction.types; +package asm.attributes.code.instruction.types; -import net.runelite.asm.Type; +import asm.Type; public interface TypeInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java b/asm/src/main/java/asm/attributes/code/instructions/AALoad.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java rename to asm/src/main/java/asm/attributes/code/instructions/AALoad.java index 287c85ba1..b5e4f84d0 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/AALoad.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ArrayLoad; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class AALoad extends Instruction implements ArrayLoad { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AAStore.java b/asm/src/main/java/asm/attributes/code/instructions/AAStore.java similarity index 84% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AAStore.java rename to asm/src/main/java/asm/attributes/code/instructions/AAStore.java index 768fe4ba6..9bdc1419d 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AAStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/AAStore.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class AAStore extends ArrayStore { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AConstNull.java b/asm/src/main/java/asm/attributes/code/instructions/AConstNull.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AConstNull.java rename to asm/src/main/java/asm/attributes/code/instructions/AConstNull.java index 88154c647..f09cd3a70 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AConstNull.java +++ b/asm/src/main/java/asm/attributes/code/instructions/AConstNull.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class AConstNull extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad.java b/asm/src/main/java/asm/attributes/code/instructions/ALoad.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad.java rename to asm/src/main/java/asm/attributes/code/instructions/ALoad.java index c8a062341..b56b43c98 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/ALoad.java @@ -23,19 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class ALoad extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ANewArray.java b/asm/src/main/java/asm/attributes/code/instructions/ANewArray.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ANewArray.java rename to asm/src/main/java/asm/attributes/code/instructions/ANewArray.java index f1b6378a2..ef4bda130 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ANewArray.java +++ b/asm/src/main/java/asm/attributes/code/instructions/ANewArray.java @@ -22,20 +22,16 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.TypeInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.TypeInstruction; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class ANewArray extends Instruction implements TypeInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AStore.java b/asm/src/main/java/asm/attributes/code/instructions/AStore.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AStore.java rename to asm/src/main/java/asm/attributes/code/instructions/AStore.java index dd5436bf8..5c17ef474 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/AStore.java @@ -23,19 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class AStore extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AThrow.java b/asm/src/main/java/asm/attributes/code/instructions/AThrow.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AThrow.java rename to asm/src/main/java/asm/attributes/code/instructions/AThrow.java index b4cf2f17f..3d489b4de 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AThrow.java +++ b/asm/src/main/java/asm/attributes/code/instructions/AThrow.java @@ -23,15 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class AThrow extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayLength.java b/asm/src/main/java/asm/attributes/code/instructions/ArrayLength.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayLength.java rename to asm/src/main/java/asm/attributes/code/instructions/ArrayLength.java index d0e5e65ee..d0896ec74 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayLength.java +++ b/asm/src/main/java/asm/attributes/code/instructions/ArrayLength.java @@ -23,16 +23,16 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class ArrayLength extends Instruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java b/asm/src/main/java/asm/attributes/code/instructions/ArrayStore.java similarity index 86% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java rename to asm/src/main/java/asm/attributes/code/instructions/ArrayStore.java index 7acb82c1e..2da5b65c3 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/ArrayStore.java @@ -22,18 +22,18 @@ * (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.asm.attributes.code.instructions; - -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ArrayStoreInstruction; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +package asm.attributes.code.instructions; + +import asm.Field; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ArrayStoreInstruction; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; public abstract class ArrayStore extends Instruction implements ArrayStoreInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BALoad.java b/asm/src/main/java/asm/attributes/code/instructions/BALoad.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BALoad.java rename to asm/src/main/java/asm/attributes/code/instructions/BALoad.java index b8d7e7a20..41d24ee24 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BALoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/BALoad.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ArrayLoad; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class BALoad extends Instruction implements ArrayLoad { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BAStore.java b/asm/src/main/java/asm/attributes/code/instructions/BAStore.java similarity index 84% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BAStore.java rename to asm/src/main/java/asm/attributes/code/instructions/BAStore.java index e5b2dd468..3147bf70d 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BAStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/BAStore.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class BAStore extends ArrayStore { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BiPush.java b/asm/src/main/java/asm/attributes/code/instructions/BiPush.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BiPush.java rename to asm/src/main/java/asm/attributes/code/instructions/BiPush.java index 97643bd54..3eb919390 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BiPush.java +++ b/asm/src/main/java/asm/attributes/code/instructions/BiPush.java @@ -23,19 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.IntInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.IntInstruction; +import asm.attributes.code.instruction.types.PushConstantInstruction; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class BiPush extends Instruction implements PushConstantInstruction, IntInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/CALoad.java b/asm/src/main/java/asm/attributes/code/instructions/CALoad.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/CALoad.java rename to asm/src/main/java/asm/attributes/code/instructions/CALoad.java index a26ff32cb..120557c2b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/CALoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/CALoad.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ArrayLoad; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class CALoad extends Instruction implements ArrayLoad { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/CAStore.java b/asm/src/main/java/asm/attributes/code/instructions/CAStore.java similarity index 84% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/CAStore.java rename to asm/src/main/java/asm/attributes/code/instructions/CAStore.java index 6a39e1132..bd1f5c641 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/CAStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/CAStore.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class CAStore extends ArrayStore { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/CheckCast.java b/asm/src/main/java/asm/attributes/code/instructions/CheckCast.java similarity index 83% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/CheckCast.java rename to asm/src/main/java/asm/attributes/code/instructions/CheckCast.java index 4fc7513a6..e0e6361f3 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/CheckCast.java +++ b/asm/src/main/java/asm/attributes/code/instructions/CheckCast.java @@ -22,19 +22,19 @@ * (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.asm.attributes.code.instructions; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.TypeInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +package asm.attributes.code.instructions; + +import asm.ClassFile; +import asm.ClassGroup; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.TypeInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; import org.objectweb.asm.MethodVisitor; public class CheckCast extends Instruction implements TypeInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/D2F.java b/asm/src/main/java/asm/attributes/code/instructions/D2F.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/D2F.java rename to asm/src/main/java/asm/attributes/code/instructions/D2F.java index e593be8b0..2ea260ad1 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/D2F.java +++ b/asm/src/main/java/asm/attributes/code/instructions/D2F.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class D2F extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/D2I.java b/asm/src/main/java/asm/attributes/code/instructions/D2I.java similarity index 78% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/D2I.java rename to asm/src/main/java/asm/attributes/code/instructions/D2I.java index 02116f2c7..966f709ee 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/D2I.java +++ b/asm/src/main/java/asm/attributes/code/instructions/D2I.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class D2I extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/D2L.java b/asm/src/main/java/asm/attributes/code/instructions/D2L.java similarity index 78% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/D2L.java rename to asm/src/main/java/asm/attributes/code/instructions/D2L.java index 2ef335766..a752fa391 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/D2L.java +++ b/asm/src/main/java/asm/attributes/code/instructions/D2L.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class D2L extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DALoad.java b/asm/src/main/java/asm/attributes/code/instructions/DALoad.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DALoad.java rename to asm/src/main/java/asm/attributes/code/instructions/DALoad.java index 01632358c..2454355c6 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DALoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DALoad.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ArrayLoad; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class DALoad extends Instruction implements ArrayLoad { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DAStore.java b/asm/src/main/java/asm/attributes/code/instructions/DAStore.java similarity index 84% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DAStore.java rename to asm/src/main/java/asm/attributes/code/instructions/DAStore.java index a7ec03fde..025e868af 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DAStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DAStore.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class DAStore extends ArrayStore { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DAdd.java b/asm/src/main/java/asm/attributes/code/instructions/DAdd.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DAdd.java rename to asm/src/main/java/asm/attributes/code/instructions/DAdd.java index 85e51efaa..0e1ef4d08 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DAdd.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DAdd.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.AdditionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.AdditionInstruction; +import asm.execution.*; public class DAdd extends Instruction implements AdditionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DCmpG.java b/asm/src/main/java/asm/attributes/code/instructions/DCmpG.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DCmpG.java rename to asm/src/main/java/asm/attributes/code/instructions/DCmpG.java index 4847ed75c..e7acfc220 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DCmpG.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DCmpG.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class DCmpG extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DCmpL.java b/asm/src/main/java/asm/attributes/code/instructions/DCmpL.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DCmpL.java rename to asm/src/main/java/asm/attributes/code/instructions/DCmpL.java index 51c518441..ed122ab93 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DCmpL.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DCmpL.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class DCmpL extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DDiv.java b/asm/src/main/java/asm/attributes/code/instructions/DDiv.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DDiv.java rename to asm/src/main/java/asm/attributes/code/instructions/DDiv.java index 1965b8c2d..bc73b0d02 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DDiv.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DDiv.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DivisionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DivisionInstruction; +import asm.execution.*; public class DDiv extends Instruction implements DivisionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad.java b/asm/src/main/java/asm/attributes/code/instructions/DLoad.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad.java rename to asm/src/main/java/asm/attributes/code/instructions/DLoad.java index 14c336bc0..ea99326c9 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DLoad.java @@ -23,20 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class DLoad extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DMul.java b/asm/src/main/java/asm/attributes/code/instructions/DMul.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DMul.java rename to asm/src/main/java/asm/attributes/code/instructions/DMul.java index d75f9596b..0fc55ad4d 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DMul.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DMul.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class DMul extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DNeg.java b/asm/src/main/java/asm/attributes/code/instructions/DNeg.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DNeg.java rename to asm/src/main/java/asm/attributes/code/instructions/DNeg.java index bb8cef042..2044a79c6 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DNeg.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DNeg.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class DNeg extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DRem.java b/asm/src/main/java/asm/attributes/code/instructions/DRem.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DRem.java rename to asm/src/main/java/asm/attributes/code/instructions/DRem.java index 1d8b9d3b9..4d79449bc 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DRem.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DRem.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class DRem extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DStore.java b/asm/src/main/java/asm/attributes/code/instructions/DStore.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DStore.java rename to asm/src/main/java/asm/attributes/code/instructions/DStore.java index 737ae1b73..ad329ba14 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DStore.java @@ -23,19 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class DStore extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DSub.java b/asm/src/main/java/asm/attributes/code/instructions/DSub.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DSub.java rename to asm/src/main/java/asm/attributes/code/instructions/DSub.java index ef71a1ee8..3aced2498 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/DSub.java +++ b/asm/src/main/java/asm/attributes/code/instructions/DSub.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.SubtractionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.SubtractionInstruction; +import asm.execution.*; public class DSub extends Instruction implements SubtractionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup.java b/asm/src/main/java/asm/attributes/code/instructions/Dup.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup.java rename to asm/src/main/java/asm/attributes/code/instructions/Dup.java index 8281ab838..e589ce039 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Dup.java @@ -23,18 +23,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DupInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; import java.util.ArrayList; import java.util.List; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; public class Dup extends Instruction implements DupInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2.java b/asm/src/main/java/asm/attributes/code/instructions/Dup2.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2.java rename to asm/src/main/java/asm/attributes/code/instructions/Dup2.java index bbfde95d3..307ebe881 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Dup2.java @@ -23,18 +23,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DupInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; import java.util.ArrayList; import java.util.List; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; public class Dup2 extends Instruction implements DupInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X1.java b/asm/src/main/java/asm/attributes/code/instructions/Dup2_X1.java similarity index 91% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X1.java rename to asm/src/main/java/asm/attributes/code/instructions/Dup2_X1.java index 22c5c31d8..98e7dabbc 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X1.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Dup2_X1.java @@ -23,18 +23,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DupInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; import java.util.Arrays; import java.util.List; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; public class Dup2_X1 extends Instruction implements DupInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X2.java b/asm/src/main/java/asm/attributes/code/instructions/Dup2_X2.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X2.java rename to asm/src/main/java/asm/attributes/code/instructions/Dup2_X2.java index 2f4e5ec2e..4d0c38ea7 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X2.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Dup2_X2.java @@ -23,17 +23,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DupInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; import java.util.List; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; public class Dup2_X2 extends Instruction implements DupInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X1.java b/asm/src/main/java/asm/attributes/code/instructions/Dup_X1.java similarity index 89% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X1.java rename to asm/src/main/java/asm/attributes/code/instructions/Dup_X1.java index 1efb44232..1c86462a5 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X1.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Dup_X1.java @@ -23,18 +23,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DupInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; import java.util.Arrays; import java.util.List; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; public class Dup_X1 extends Instruction implements DupInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X2.java b/asm/src/main/java/asm/attributes/code/instructions/Dup_X2.java similarity index 89% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X2.java rename to asm/src/main/java/asm/attributes/code/instructions/Dup_X2.java index 7d9a18122..a969052b9 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X2.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Dup_X2.java @@ -23,18 +23,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DupInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; import java.util.Arrays; import java.util.List; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; public class Dup_X2 extends Instruction implements DupInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/F2D.java b/asm/src/main/java/asm/attributes/code/instructions/F2D.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/F2D.java rename to asm/src/main/java/asm/attributes/code/instructions/F2D.java index 68b4fb294..a17bc972b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/F2D.java +++ b/asm/src/main/java/asm/attributes/code/instructions/F2D.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class F2D extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/F2I.java b/asm/src/main/java/asm/attributes/code/instructions/F2I.java similarity index 78% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/F2I.java rename to asm/src/main/java/asm/attributes/code/instructions/F2I.java index 69eed60b6..b4c49ffe0 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/F2I.java +++ b/asm/src/main/java/asm/attributes/code/instructions/F2I.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class F2I extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/F2L.java b/asm/src/main/java/asm/attributes/code/instructions/F2L.java similarity index 78% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/F2L.java rename to asm/src/main/java/asm/attributes/code/instructions/F2L.java index 5a78a80e5..f9afd48d2 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/F2L.java +++ b/asm/src/main/java/asm/attributes/code/instructions/F2L.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class F2L extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FALoad.java b/asm/src/main/java/asm/attributes/code/instructions/FALoad.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FALoad.java rename to asm/src/main/java/asm/attributes/code/instructions/FALoad.java index 84f7ebe0e..5efb6c3fb 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FALoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FALoad.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ArrayLoad; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class FALoad extends Instruction implements ArrayLoad { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FAStore.java b/asm/src/main/java/asm/attributes/code/instructions/FAStore.java similarity index 84% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FAStore.java rename to asm/src/main/java/asm/attributes/code/instructions/FAStore.java index b11cd04cc..718717552 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FAStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FAStore.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class FAStore extends ArrayStore { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FAdd.java b/asm/src/main/java/asm/attributes/code/instructions/FAdd.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FAdd.java rename to asm/src/main/java/asm/attributes/code/instructions/FAdd.java index d258b20ea..458fbd6c1 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FAdd.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FAdd.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.AdditionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.AdditionInstruction; +import asm.execution.*; public class FAdd extends Instruction implements AdditionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FCmpG.java b/asm/src/main/java/asm/attributes/code/instructions/FCmpG.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FCmpG.java rename to asm/src/main/java/asm/attributes/code/instructions/FCmpG.java index 2ca663cf7..16a17603f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FCmpG.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FCmpG.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class FCmpG extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FCmpL.java b/asm/src/main/java/asm/attributes/code/instructions/FCmpL.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FCmpL.java rename to asm/src/main/java/asm/attributes/code/instructions/FCmpL.java index e4432ede6..9432b764d 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FCmpL.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FCmpL.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class FCmpL extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FDiv.java b/asm/src/main/java/asm/attributes/code/instructions/FDiv.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FDiv.java rename to asm/src/main/java/asm/attributes/code/instructions/FDiv.java index de0e368dd..bab60e7fe 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FDiv.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FDiv.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DivisionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DivisionInstruction; +import asm.execution.*; public class FDiv extends Instruction implements DivisionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad.java b/asm/src/main/java/asm/attributes/code/instructions/FLoad.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad.java rename to asm/src/main/java/asm/attributes/code/instructions/FLoad.java index 708b06554..6a56c3b67 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FLoad.java @@ -23,20 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class FLoad extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FMul.java b/asm/src/main/java/asm/attributes/code/instructions/FMul.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FMul.java rename to asm/src/main/java/asm/attributes/code/instructions/FMul.java index 532c6fca8..46460026e 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FMul.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FMul.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class FMul extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FNeg.java b/asm/src/main/java/asm/attributes/code/instructions/FNeg.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FNeg.java rename to asm/src/main/java/asm/attributes/code/instructions/FNeg.java index f1aec63df..1a1dd8e3f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FNeg.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FNeg.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class FNeg extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FRem.java b/asm/src/main/java/asm/attributes/code/instructions/FRem.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FRem.java rename to asm/src/main/java/asm/attributes/code/instructions/FRem.java index 61c769809..32573402c 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FRem.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FRem.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class FRem extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FStore.java b/asm/src/main/java/asm/attributes/code/instructions/FStore.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FStore.java rename to asm/src/main/java/asm/attributes/code/instructions/FStore.java index 5d7b35a4a..ea8fcdf36 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FStore.java @@ -23,19 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class FStore extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FSub.java b/asm/src/main/java/asm/attributes/code/instructions/FSub.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FSub.java rename to asm/src/main/java/asm/attributes/code/instructions/FSub.java index 33f467ed1..5ea0f693f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/FSub.java +++ b/asm/src/main/java/asm/attributes/code/instructions/FSub.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.SubtractionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.SubtractionInstruction; +import asm.execution.*; public class FSub extends Instruction implements SubtractionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/GetField.java b/asm/src/main/java/asm/attributes/code/instructions/GetField.java similarity index 78% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/GetField.java rename to asm/src/main/java/asm/attributes/code/instructions/GetField.java index 183159844..25fb3a484 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/GetField.java +++ b/asm/src/main/java/asm/attributes/code/instructions/GetField.java @@ -22,27 +22,23 @@ * (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.asm.attributes.code.instructions; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Field; +package asm.attributes.code.instructions; + +import asm.ClassFile; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.execution.*; +import asm.pool.Class; +import asm.pool.Field; import org.objectweb.asm.MethodVisitor; public class GetField extends Instruction implements GetFieldInstruction { private Field field; - private net.runelite.asm.Field myField; + private asm.Field myField; public GetField(Instructions instructions, InstructionType type) { @@ -56,7 +52,7 @@ public GetField(Instructions instructions, Field field) this.field = field; } - public GetField(Instructions instructions, net.runelite.asm.Field field) + public GetField(Instructions instructions, asm.Field field) { super(instructions, InstructionType.GETFIELD); this.field = field.getPoolField(); @@ -109,9 +105,9 @@ public Field getField() } @Override - public net.runelite.asm.Field getMyField() + public asm.Field getMyField() { - Class clazz = field.getClazz(); + asm.pool.Class clazz = field.getClazz(); ClassFile cf = this.getInstructions().getCode().getMethod().getClassFile().getGroup().findClass(clazz.getName()); if (cf == null) @@ -119,7 +115,7 @@ public net.runelite.asm.Field getMyField() return null; } - net.runelite.asm.Field f2 = cf.findFieldDeep(field.getName(), field.getType()); + asm.Field f2 = cf.findFieldDeep(field.getName(), field.getType()); return f2; } diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/GetStatic.java b/asm/src/main/java/asm/attributes/code/instructions/GetStatic.java similarity index 77% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/GetStatic.java rename to asm/src/main/java/asm/attributes/code/instructions/GetStatic.java index 4224223a5..d77d5c32f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/GetStatic.java +++ b/asm/src/main/java/asm/attributes/code/instructions/GetStatic.java @@ -22,27 +22,23 @@ * (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.asm.attributes.code.instructions; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Field; +package asm.attributes.code.instructions; + +import asm.ClassFile; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.execution.*; +import asm.pool.Class; +import asm.pool.Field; import org.objectweb.asm.MethodVisitor; public class GetStatic extends Instruction implements GetFieldInstruction { private Field field; - private net.runelite.asm.Field myField; + private asm.Field myField; public GetStatic(Instructions instructions, InstructionType type) { @@ -56,7 +52,7 @@ public GetStatic(Instructions instructions, Field field) this.field = field; } - public GetStatic(Instructions instructions, net.runelite.asm.Field field) + public GetStatic(Instructions instructions, asm.Field field) { super(instructions, InstructionType.GETSTATIC); this.field = field.getPoolField(); @@ -106,9 +102,9 @@ public Field getField() } @Override - public net.runelite.asm.Field getMyField() + public asm.Field getMyField() { - Class clazz = field.getClazz(); + asm.pool.Class clazz = field.getClazz(); ClassFile cf = this.getInstructions().getCode().getMethod().getClassFile().getGroup().findClass(clazz.getName()); if (cf == null) @@ -116,7 +112,7 @@ public net.runelite.asm.Field getMyField() return null; } - net.runelite.asm.Field f2 = cf.findFieldDeep(field.getName(), field.getType()); + asm.Field f2 = cf.findFieldDeep(field.getName(), field.getType()); return f2; } diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Goto.java b/asm/src/main/java/asm/attributes/code/instructions/Goto.java similarity index 86% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Goto.java rename to asm/src/main/java/asm/attributes/code/instructions/Goto.java index f0db491ba..36912b666 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Goto.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Goto.java @@ -22,18 +22,19 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.JumpingInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import org.objectweb.asm.MethodVisitor; import java.util.Collections; import java.util.List; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import org.objectweb.asm.MethodVisitor; public class Goto extends Instruction implements JumpingInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/GotoW.java b/asm/src/main/java/asm/attributes/code/instructions/GotoW.java similarity index 85% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/GotoW.java rename to asm/src/main/java/asm/attributes/code/instructions/GotoW.java index ed2d590aa..68affe25d 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/GotoW.java +++ b/asm/src/main/java/asm/attributes/code/instructions/GotoW.java @@ -22,18 +22,19 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.JumpingInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import org.objectweb.asm.MethodVisitor; import java.util.Collections; import java.util.List; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import org.objectweb.asm.MethodVisitor; public class GotoW extends Instruction implements JumpingInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2B.java b/asm/src/main/java/asm/attributes/code/instructions/I2B.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2B.java rename to asm/src/main/java/asm/attributes/code/instructions/I2B.java index 64c5e1f4d..8e299bd7c 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2B.java +++ b/asm/src/main/java/asm/attributes/code/instructions/I2B.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class I2B extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2C.java b/asm/src/main/java/asm/attributes/code/instructions/I2C.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2C.java rename to asm/src/main/java/asm/attributes/code/instructions/I2C.java index 5549b52ff..2ea618cdd 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2C.java +++ b/asm/src/main/java/asm/attributes/code/instructions/I2C.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class I2C extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2D.java b/asm/src/main/java/asm/attributes/code/instructions/I2D.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2D.java rename to asm/src/main/java/asm/attributes/code/instructions/I2D.java index 042b21477..6ca2fb111 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2D.java +++ b/asm/src/main/java/asm/attributes/code/instructions/I2D.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class I2D extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2F.java b/asm/src/main/java/asm/attributes/code/instructions/I2F.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2F.java rename to asm/src/main/java/asm/attributes/code/instructions/I2F.java index 435c30e52..18b2ad237 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2F.java +++ b/asm/src/main/java/asm/attributes/code/instructions/I2F.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class I2F extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2L.java b/asm/src/main/java/asm/attributes/code/instructions/I2L.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2L.java rename to asm/src/main/java/asm/attributes/code/instructions/I2L.java index adfdf52fe..c84f47df8 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2L.java +++ b/asm/src/main/java/asm/attributes/code/instructions/I2L.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class I2L extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2S.java b/asm/src/main/java/asm/attributes/code/instructions/I2S.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2S.java rename to asm/src/main/java/asm/attributes/code/instructions/I2S.java index 930631d08..c8b77aded 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/I2S.java +++ b/asm/src/main/java/asm/attributes/code/instructions/I2S.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class I2S extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IALoad.java b/asm/src/main/java/asm/attributes/code/instructions/IALoad.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IALoad.java rename to asm/src/main/java/asm/attributes/code/instructions/IALoad.java index 5c4cf2807..739075459 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IALoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IALoad.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ArrayLoad; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class IALoad extends Instruction implements ArrayLoad { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IAStore.java b/asm/src/main/java/asm/attributes/code/instructions/IAStore.java similarity index 84% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IAStore.java rename to asm/src/main/java/asm/attributes/code/instructions/IAStore.java index d23dd4d2b..06436ca78 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IAStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IAStore.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class IAStore extends ArrayStore { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IAdd.java b/asm/src/main/java/asm/attributes/code/instructions/IAdd.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IAdd.java rename to asm/src/main/java/asm/attributes/code/instructions/IAdd.java index ac497bf93..ab8635aad 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IAdd.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IAdd.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.AdditionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.AdditionInstruction; +import asm.execution.*; public class IAdd extends Instruction implements AdditionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IAnd.java b/asm/src/main/java/asm/attributes/code/instructions/IAnd.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IAnd.java rename to asm/src/main/java/asm/attributes/code/instructions/IAnd.java index 6fc645a99..5a9ce7189 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IAnd.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IAnd.java @@ -23,18 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import static net.runelite.asm.attributes.code.InstructionType.IAND; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; + +import static asm.attributes.code.InstructionType.IAND; public class IAnd extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IDiv.java b/asm/src/main/java/asm/attributes/code/instructions/IDiv.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IDiv.java rename to asm/src/main/java/asm/attributes/code/instructions/IDiv.java index 2248c23c9..37f009e26 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IDiv.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IDiv.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DivisionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DivisionInstruction; +import asm.execution.*; public class IDiv extends Instruction implements DivisionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IInc.java b/asm/src/main/java/asm/attributes/code/instructions/IInc.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IInc.java rename to asm/src/main/java/asm/attributes/code/instructions/IInc.java index a423effac..364571f87 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IInc.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IInc.java @@ -23,19 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Value; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class IInc extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad.java b/asm/src/main/java/asm/attributes/code/instructions/ILoad.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad.java rename to asm/src/main/java/asm/attributes/code/instructions/ILoad.java index 80305f4e0..8240c5de0 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/ILoad.java @@ -22,20 +22,15 @@ * (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.asm.attributes.code.instructions; - -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +package asm.attributes.code.instructions; + +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class ILoad extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IMul.java b/asm/src/main/java/asm/attributes/code/instructions/IMul.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IMul.java rename to asm/src/main/java/asm/attributes/code/instructions/IMul.java index fbdba4dd2..7c1a5914f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IMul.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IMul.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class IMul extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/INeg.java b/asm/src/main/java/asm/attributes/code/instructions/INeg.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/INeg.java rename to asm/src/main/java/asm/attributes/code/instructions/INeg.java index 58b597e42..e11c60b60 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/INeg.java +++ b/asm/src/main/java/asm/attributes/code/instructions/INeg.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class INeg extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IOr.java b/asm/src/main/java/asm/attributes/code/instructions/IOr.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IOr.java rename to asm/src/main/java/asm/attributes/code/instructions/IOr.java index 535cc0341..c56d35703 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IOr.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IOr.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class IOr extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IRem.java b/asm/src/main/java/asm/attributes/code/instructions/IRem.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IRem.java rename to asm/src/main/java/asm/attributes/code/instructions/IRem.java index 6ad180a78..99286cdc7 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IRem.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IRem.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class IRem extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IShL.java b/asm/src/main/java/asm/attributes/code/instructions/IShL.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IShL.java rename to asm/src/main/java/asm/attributes/code/instructions/IShL.java index 99ffbe9e0..b2c4b2ab5 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IShL.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IShL.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class IShL extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IShR.java b/asm/src/main/java/asm/attributes/code/instructions/IShR.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IShR.java rename to asm/src/main/java/asm/attributes/code/instructions/IShR.java index 72a41eefe..9e59ead08 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IShR.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IShR.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class IShR extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IStore.java b/asm/src/main/java/asm/attributes/code/instructions/IStore.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IStore.java rename to asm/src/main/java/asm/attributes/code/instructions/IStore.java index 1e164f071..10482a0cb 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IStore.java @@ -22,19 +22,14 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class IStore extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ISub.java b/asm/src/main/java/asm/attributes/code/instructions/ISub.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ISub.java rename to asm/src/main/java/asm/attributes/code/instructions/ISub.java index 8956c0da5..429ae1cbb 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/ISub.java +++ b/asm/src/main/java/asm/attributes/code/instructions/ISub.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.SubtractionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.SubtractionInstruction; +import asm.execution.*; public class ISub extends Instruction implements SubtractionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IUShR.java b/asm/src/main/java/asm/attributes/code/instructions/IUShR.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IUShR.java rename to asm/src/main/java/asm/attributes/code/instructions/IUShR.java index a70c062c2..e3413bc16 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IUShR.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IUShR.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class IUShR extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IXor.java b/asm/src/main/java/asm/attributes/code/instructions/IXor.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IXor.java rename to asm/src/main/java/asm/attributes/code/instructions/IXor.java index fe976ae54..70735c957 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IXor.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IXor.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class IXor extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/If.java b/asm/src/main/java/asm/attributes/code/instructions/If.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/If.java rename to asm/src/main/java/asm/attributes/code/instructions/If.java index 483f9ef27..39a912c1b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/If.java +++ b/asm/src/main/java/asm/attributes/code/instructions/If.java @@ -22,28 +22,25 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.Field; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.*; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; +import org.objectweb.asm.MethodVisitor; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; -import org.objectweb.asm.MethodVisitor; public abstract class If extends Instruction implements JumpingInstruction, ComparisonInstruction, MappableInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/If0.java b/asm/src/main/java/asm/attributes/code/instructions/If0.java similarity index 85% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/If0.java rename to asm/src/main/java/asm/attributes/code/instructions/If0.java index d723d70fb..43b0f1b5c 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/If0.java +++ b/asm/src/main/java/asm/attributes/code/instructions/If0.java @@ -23,26 +23,27 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.Field; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.ComparisonInstruction; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.JumpingInstruction; +import asm.attributes.code.instruction.types.MappableInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; +import org.objectweb.asm.MethodVisitor; import java.util.Collections; import java.util.List; -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; -import org.objectweb.asm.MethodVisitor; public abstract class If0 extends Instruction implements JumpingInstruction, ComparisonInstruction, MappableInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpEq.java b/asm/src/main/java/asm/attributes/code/instructions/IfACmpEq.java similarity index 87% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpEq.java rename to asm/src/main/java/asm/attributes/code/instructions/IfACmpEq.java index b3dcfc92d..43c9cb6ca 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpEq.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfACmpEq.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.ParallelExecutorMapping; public class IfACmpEq extends If { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpNe.java b/asm/src/main/java/asm/attributes/code/instructions/IfACmpNe.java similarity index 87% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpNe.java rename to asm/src/main/java/asm/attributes/code/instructions/IfACmpNe.java index e84a9cb48..a48a0ed9b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpNe.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfACmpNe.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.ParallelExecutorMapping; public class IfACmpNe extends If { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGe.java b/asm/src/main/java/asm/attributes/code/instructions/IfCmpGe.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGe.java rename to asm/src/main/java/asm/attributes/code/instructions/IfCmpGe.java index e95fc6371..7cd848ded 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGe.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfCmpGe.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.InstructionContext; +import asm.mapping.ParallelExecutorMapping; public class IfCmpGe extends If { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGt.java b/asm/src/main/java/asm/attributes/code/instructions/IfCmpGt.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGt.java rename to asm/src/main/java/asm/attributes/code/instructions/IfCmpGt.java index 71ba0f154..2736630db 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGt.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfCmpGt.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.InstructionContext; +import asm.mapping.ParallelExecutorMapping; public class IfCmpGt extends If { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLe.java b/asm/src/main/java/asm/attributes/code/instructions/IfCmpLe.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLe.java rename to asm/src/main/java/asm/attributes/code/instructions/IfCmpLe.java index 42656a948..2ea93c910 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLe.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfCmpLe.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.InstructionContext; +import asm.mapping.ParallelExecutorMapping; public class IfCmpLe extends If { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLt.java b/asm/src/main/java/asm/attributes/code/instructions/IfCmpLt.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLt.java rename to asm/src/main/java/asm/attributes/code/instructions/IfCmpLt.java index 9e0b6ae55..47bd7a892 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLt.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfCmpLt.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.InstructionContext; +import asm.mapping.ParallelExecutorMapping; public class IfCmpLt extends If { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfEq.java b/asm/src/main/java/asm/attributes/code/instructions/IfEq.java similarity index 85% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfEq.java rename to asm/src/main/java/asm/attributes/code/instructions/IfEq.java index 928180fce..f1bcbe8cf 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfEq.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfEq.java @@ -23,16 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import static net.runelite.asm.attributes.code.instructions.IfICmpEq.isOne; -import static net.runelite.asm.attributes.code.instructions.IfICmpEq.isZero; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.ParallelExecutorMapping; + +import static asm.attributes.code.instructions.IfICmpEq.isOne; +import static asm.attributes.code.instructions.IfICmpEq.isZero; public class IfEq extends If0 { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfGe.java b/asm/src/main/java/asm/attributes/code/instructions/IfGe.java similarity index 87% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfGe.java rename to asm/src/main/java/asm/attributes/code/instructions/IfGe.java index bde0d29c9..5e6f4fa0e 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfGe.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfGe.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.InstructionContext; +import asm.mapping.ParallelExecutorMapping; public class IfGe extends If0 { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfGt.java b/asm/src/main/java/asm/attributes/code/instructions/IfGt.java similarity index 87% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfGt.java rename to asm/src/main/java/asm/attributes/code/instructions/IfGt.java index a44d0acef..f571037f4 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfGt.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfGt.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.InstructionContext; +import asm.mapping.ParallelExecutorMapping; public class IfGt extends If0 { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpEq.java b/asm/src/main/java/asm/attributes/code/instructions/IfICmpEq.java similarity index 87% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpEq.java rename to asm/src/main/java/asm/attributes/code/instructions/IfICmpEq.java index 8c76ab358..da29f0cce 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpEq.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfICmpEq.java @@ -22,16 +22,16 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.ComparisonInstruction; +import asm.attributes.code.instruction.types.PushConstantInstruction; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.ParallelExecutorMapping; public class IfICmpEq extends If { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpNe.java b/asm/src/main/java/asm/attributes/code/instructions/IfICmpNe.java similarity index 85% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpNe.java rename to asm/src/main/java/asm/attributes/code/instructions/IfICmpNe.java index 2b45dbd4d..b5a98da29 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpNe.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfICmpNe.java @@ -22,17 +22,18 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; -import static net.runelite.asm.attributes.code.instructions.IfICmpEq.isOne; -import static net.runelite.asm.attributes.code.instructions.IfICmpEq.isZero; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.ComparisonInstruction; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.ParallelExecutorMapping; + +import static asm.attributes.code.instructions.IfICmpEq.isOne; +import static asm.attributes.code.instructions.IfICmpEq.isZero; public class IfICmpNe extends If { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfLe.java b/asm/src/main/java/asm/attributes/code/instructions/IfLe.java similarity index 87% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfLe.java rename to asm/src/main/java/asm/attributes/code/instructions/IfLe.java index dbe64c910..838a1d7e9 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfLe.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfLe.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.InstructionContext; +import asm.mapping.ParallelExecutorMapping; public class IfLe extends If0 { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfLt.java b/asm/src/main/java/asm/attributes/code/instructions/IfLt.java similarity index 87% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfLt.java rename to asm/src/main/java/asm/attributes/code/instructions/IfLt.java index d1c6c90fa..735bd5acd 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfLt.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfLt.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.InstructionContext; +import asm.mapping.ParallelExecutorMapping; public class IfLt extends If0 { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfNe.java b/asm/src/main/java/asm/attributes/code/instructions/IfNe.java similarity index 86% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfNe.java rename to asm/src/main/java/asm/attributes/code/instructions/IfNe.java index 9001b554b..aa978ab30 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfNe.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfNe.java @@ -23,16 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import static net.runelite.asm.attributes.code.instructions.IfICmpEq.isOne; -import static net.runelite.asm.attributes.code.instructions.IfICmpEq.isZero; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.ParallelExecutorMapping; + +import static asm.attributes.code.instructions.IfICmpEq.isOne; +import static asm.attributes.code.instructions.IfICmpEq.isZero; public class IfNe extends If0 { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfNonNull.java b/asm/src/main/java/asm/attributes/code/instructions/IfNonNull.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfNonNull.java rename to asm/src/main/java/asm/attributes/code/instructions/IfNonNull.java index 7f47d550e..1b7dbc42c 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfNonNull.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfNonNull.java @@ -23,13 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.ParallelExecutorMapping; public class IfNonNull extends If0 { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfNull.java b/asm/src/main/java/asm/attributes/code/instructions/IfNull.java similarity index 88% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfNull.java rename to asm/src/main/java/asm/attributes/code/instructions/IfNull.java index 92f48ec4b..6d07a6498 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/IfNull.java +++ b/asm/src/main/java/asm/attributes/code/instructions/IfNull.java @@ -23,13 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.mapping.ParallelExecutorMapping; public class IfNull extends If0 { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InstanceOf.java b/asm/src/main/java/asm/attributes/code/instructions/InstanceOf.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InstanceOf.java rename to asm/src/main/java/asm/attributes/code/instructions/InstanceOf.java index a7053b68a..d7b3452f2 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InstanceOf.java +++ b/asm/src/main/java/asm/attributes/code/instructions/InstanceOf.java @@ -22,20 +22,16 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.TypeInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.TypeInstruction; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class InstanceOf extends Instruction implements TypeInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeDynamic.java b/asm/src/main/java/asm/attributes/code/instructions/InvokeDynamic.java similarity index 85% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeDynamic.java rename to asm/src/main/java/asm/attributes/code/instructions/InvokeDynamic.java index d191be179..94a581d1f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeDynamic.java +++ b/asm/src/main/java/asm/attributes/code/instructions/InvokeDynamic.java @@ -22,21 +22,22 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import java.util.Collections; -import java.util.List; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.pool.Method; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.InvokeInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.pool.Method; +import asm.mapping.ParallelExecutorMapping; import org.objectweb.asm.Handle; import org.objectweb.asm.MethodVisitor; +import java.util.Collections; +import java.util.List; + public class InvokeDynamic extends Instruction implements InvokeInstruction { private String name; @@ -67,7 +68,7 @@ public void accept(MethodVisitor visitor) @Override @SuppressWarnings("unchecked") - public List getMethods() + public List getMethods() { return Collections.EMPTY_LIST; } diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java b/asm/src/main/java/asm/attributes/code/instructions/InvokeInterface.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java rename to asm/src/main/java/asm/attributes/code/instructions/InvokeInterface.java index 3383653de..1f93fab17 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java +++ b/asm/src/main/java/asm/attributes/code/instructions/InvokeInterface.java @@ -22,35 +22,31 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.InvokeInstruction; +import asm.execution.*; +import asm.pool.Method; +import asm.signature.Signature; +import asm.signature.util.VirtualMethods; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; +import org.objectweb.asm.MethodVisitor; import java.util.Arrays; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; -import net.runelite.asm.pool.Method; -import net.runelite.asm.signature.Signature; -import net.runelite.asm.signature.util.VirtualMethods; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; -import org.objectweb.asm.MethodVisitor; public class InvokeInterface extends Instruction implements InvokeInstruction { private Method method; - private List myMethods; + private List myMethods; public InvokeInterface(Instructions instructions, InstructionType type) { @@ -80,7 +76,7 @@ public void accept(MethodVisitor visitor) } @Override - public List getMethods() + public List getMethods() { return myMethods != null ? myMethods : Arrays.asList(); } @@ -113,7 +109,7 @@ public InstructionContext execute(Frame frame) ins.push(ctx); } - for (net.runelite.asm.Method method : getMethods()) + for (asm.Method method : getMethods()) { ins.invoke(method); @@ -129,7 +125,7 @@ public InstructionContext execute(Frame frame) if (myMethods != null) { - for (net.runelite.asm.Method method : myMethods) + for (asm.Method method : myMethods) { frame.getExecution().order(frame, method); } @@ -141,7 +137,7 @@ public InstructionContext execute(Frame frame) @Override public void removeParameter(int idx) { - net.runelite.asm.pool.Class clazz = method.getClazz(); + asm.pool.Class clazz = method.getClazz(); // create new signature Signature sig = new Signature(method.getType()); @@ -157,7 +153,7 @@ public Method getMethod() return method; } - private List lookupMethods() + private List lookupMethods() { ClassGroup group = this.getInstructions().getCode().getMethod().getClassFile().getGroup(); @@ -166,7 +162,7 @@ private List lookupMethods() { return null; // not our class } - net.runelite.asm.Method m = otherClass.findMethod(method.getName(), method.getType()); + asm.Method m = otherClass.findMethod(method.getName(), method.getType()); if (m == null) { return null; @@ -198,14 +194,14 @@ public void map(ParallelExecutorMapping mapping, InstructionContext ctx, Instruc { InvokeInterface otherIv = (InvokeInterface) other.getInstruction(); - List myMethods = this.getMethods(), + List myMethods = this.getMethods(), otherMethods = otherIv.getMethods(); assert myMethods.size() == otherMethods.size(); for (int i = 0; i < myMethods.size(); ++i) { - net.runelite.asm.Method m1 = myMethods.get(i), otherMethod = null; + asm.Method m1 = myMethods.get(i), otherMethod = null; ClassFile c1 = m1.getClassFile(); if (myMethods.size() == 1) @@ -216,7 +212,7 @@ public void map(ParallelExecutorMapping mapping, InstructionContext ctx, Instruc { for (int j = 0; j < myMethods.size(); ++j) { - net.runelite.asm.Method m2 = otherMethods.get(j); + asm.Method m2 = otherMethods.get(j); ClassFile c2 = m2.getClassFile(); if (MappingExecutorUtil.isMaybeEqual(c1, c2)) @@ -299,7 +295,7 @@ public boolean isSame(InstructionContext thisIc, InstructionContext otherIc) return false; } - List thisMethods = thisIi.getMethods(), + List thisMethods = thisIi.getMethods(), otherMethods = otherIi.getMethods(); if (thisMethods.size() != otherMethods.size()) @@ -309,8 +305,8 @@ public boolean isSame(InstructionContext thisIc, InstructionContext otherIc) for (int i = 0; i < thisMethods.size(); ++i) { - net.runelite.asm.Method m1 = thisMethods.get(i); - net.runelite.asm.Method m2 = otherMethods.get(i); + asm.Method m1 = thisMethods.get(i); + asm.Method m2 = otherMethods.get(i); if (!MappingExecutorUtil.isMaybeEqual(m1.getDescriptor(), m2.getDescriptor())) { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java b/asm/src/main/java/asm/attributes/code/instructions/InvokeSpecial.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java rename to asm/src/main/java/asm/attributes/code/instructions/InvokeSpecial.java index 76c7c6bcf..d089930f3 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java +++ b/asm/src/main/java/asm/attributes/code/instructions/InvokeSpecial.java @@ -22,35 +22,31 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.InvokeInstruction; +import asm.execution.*; +import asm.pool.Method; +import asm.signature.Signature; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; +import org.objectweb.asm.MethodVisitor; import java.util.Arrays; import java.util.Collections; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; -import net.runelite.asm.pool.Method; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; -import org.objectweb.asm.MethodVisitor; public class InvokeSpecial extends Instruction implements InvokeInstruction { private Method method; - private net.runelite.asm.Method myMethod; + private asm.Method myMethod; public InvokeSpecial(Instructions instructions, InstructionType type) { @@ -64,7 +60,7 @@ public InvokeSpecial(Instructions instructions, Method method) this.method = method; } - public InvokeSpecial(Instructions instructions, net.runelite.asm.Method method) + public InvokeSpecial(Instructions instructions, asm.Method method) { super(instructions, InstructionType.INVOKESPECIAL); this.method = method.getPoolMethod(); @@ -83,7 +79,7 @@ public void accept(MethodVisitor visitor) @Override @SuppressWarnings("unchecked") - public List getMethods() + public List getMethods() { return myMethod != null ? Arrays.asList(myMethod) : Collections.EMPTY_LIST; } @@ -141,7 +137,7 @@ public String toString() @Override public void removeParameter(int idx) { - net.runelite.asm.pool.Class clazz = method.getClazz(); + asm.pool.Class clazz = method.getClazz(); // create new signature Signature sig = new Signature(method.getType()); @@ -175,7 +171,7 @@ public void lookup() return; // not our class } - net.runelite.asm.Method other = otherClass.findMethod(method.getName(), method.getType()); + asm.Method other = otherClass.findMethod(method.getName(), method.getType()); if (other == null) { return; @@ -198,7 +194,7 @@ public void map(ParallelExecutorMapping mapping, InstructionContext ctx, Instruc { InvokeSpecial otherIv = (InvokeSpecial) other.getInstruction(); - List myMethods = this.getMethods(), + List myMethods = this.getMethods(), otherMethods = otherIv.getMethods(); assert myMethods.size() == otherMethods.size(); @@ -269,7 +265,7 @@ public boolean isSame(InstructionContext thisIc, InstructionContext otherIc) return false; } - List thisMethods = thisIi.getMethods(), + List thisMethods = thisIi.getMethods(), otherMethods = otherIi.getMethods(); if (thisMethods.size() != otherMethods.size()) @@ -279,8 +275,8 @@ public boolean isSame(InstructionContext thisIc, InstructionContext otherIc) for (int i = 0; i < thisMethods.size(); ++i) { - net.runelite.asm.Method m1 = thisMethods.get(i); - net.runelite.asm.Method m2 = otherMethods.get(i); + asm.Method m1 = thisMethods.get(i); + asm.Method m2 = otherMethods.get(i); if (!MappingExecutorUtil.isMaybeEqual(m1.getClassFile(), m2.getClassFile())) { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java b/asm/src/main/java/asm/attributes/code/instructions/InvokeStatic.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java rename to asm/src/main/java/asm/attributes/code/instructions/InvokeStatic.java index 60e824c6a..8d02e903f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java +++ b/asm/src/main/java/asm/attributes/code/instructions/InvokeStatic.java @@ -22,35 +22,32 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.InvokeInstruction; +import asm.execution.*; +import asm.pool.Method; +import asm.signature.Signature; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; +import org.objectweb.asm.MethodVisitor; import java.util.Collections; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import static net.runelite.asm.execution.StaticStep.stepInto; -import net.runelite.asm.execution.Value; -import net.runelite.asm.pool.Method; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; -import org.objectweb.asm.MethodVisitor; + +import static asm.execution.StaticStep.stepInto; public class InvokeStatic extends Instruction implements InvokeInstruction { private Method method; - private net.runelite.asm.Method myMethod; + private asm.Method myMethod; public InvokeStatic(Instructions instructions, InstructionType type) { @@ -64,7 +61,7 @@ public InvokeStatic(Instructions instructions, Method method) this.method = method; } - public InvokeStatic(Instructions instructions, net.runelite.asm.Method method) + public InvokeStatic(Instructions instructions, asm.Method method) { super(instructions, InstructionType.INVOKESTATIC); this.method = method.getPoolMethod(); @@ -89,7 +86,7 @@ public String toString() @Override @SuppressWarnings("unchecked") - public List getMethods() + public List getMethods() { return myMethod != null ? Collections.singletonList(myMethod) : Collections.EMPTY_LIST; } @@ -158,7 +155,7 @@ public InstructionContext execute(Frame frame) @Override public void removeParameter(int idx) { - net.runelite.asm.pool.Class clazz = method.getClazz(); + asm.pool.Class clazz = method.getClazz(); // create new signature Signature sig = new Signature(method.getType()); @@ -174,7 +171,7 @@ public Method getMethod() return method; } - private net.runelite.asm.Method lookupMethod() + private asm.Method lookupMethod() { ClassGroup group = this.getInstructions().getCode().getMethod().getClassFile().getGroup(); @@ -183,7 +180,7 @@ private net.runelite.asm.Method lookupMethod() { return null; // not our class } - net.runelite.asm.Method other = otherClass.findMethodDeepStatic(method.getName(), method.getType()); + asm.Method other = otherClass.findMethodDeepStatic(method.getName(), method.getType()); if (other == null) { return null; // when regenerating the pool after renaming the method this can be null. @@ -212,7 +209,7 @@ public void regeneratePool() @Override public void map(ParallelExecutorMapping mapping, InstructionContext ctx, InstructionContext other) { - List myMethods = this.getMethods(), + List myMethods = this.getMethods(), otherMethods = ((InvokeStatic) other.getInstruction()).getMethods(); assert myMethods.size() == otherMethods.size(); @@ -262,7 +259,7 @@ public boolean isSame(InstructionContext thisIc, InstructionContext otherIc) return false; } - List thisMethods = thisIi.getMethods(), + List thisMethods = thisIi.getMethods(), otherMethods = otherIi.getMethods(); if (thisMethods.size() != otherMethods.size()) @@ -272,8 +269,8 @@ public boolean isSame(InstructionContext thisIc, InstructionContext otherIc) for (int i = 0; i < thisMethods.size(); ++i) { - net.runelite.asm.Method m1 = thisMethods.get(i); - net.runelite.asm.Method m2 = otherMethods.get(i); + asm.Method m1 = thisMethods.get(i); + asm.Method m2 = otherMethods.get(i); /* The class names are random */ if (!MappingExecutorUtil.isMaybeEqual(m1.getDescriptor(), m2.getDescriptor())) diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java b/asm/src/main/java/asm/attributes/code/instructions/InvokeVirtual.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java rename to asm/src/main/java/asm/attributes/code/instructions/InvokeVirtual.java index 7cae2483f..8088a4d6a 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java +++ b/asm/src/main/java/asm/attributes/code/instructions/InvokeVirtual.java @@ -22,37 +22,33 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.InvokeInstruction; +import asm.execution.*; +import asm.pool.Class; +import asm.pool.Method; +import asm.signature.Signature; +import asm.signature.util.VirtualMethods; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; +import org.objectweb.asm.MethodVisitor; import java.util.Arrays; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Method; -import net.runelite.asm.signature.Signature; -import net.runelite.asm.signature.util.VirtualMethods; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; -import org.objectweb.asm.MethodVisitor; public class InvokeVirtual extends Instruction implements InvokeInstruction { private Method method; - private net.runelite.asm.Method myMethod; - private List myMethods; + private asm.Method myMethod; + private List myMethods; public InvokeVirtual(Instructions instructions, InstructionType type) { @@ -66,7 +62,7 @@ public InvokeVirtual(Instructions instructions, Method method) this.method = method; } - public InvokeVirtual(Instructions instructions, net.runelite.asm.Method method) + public InvokeVirtual(Instructions instructions, asm.Method method) { super(instructions, InstructionType.INVOKEVIRTUAL); this.method = method.getPoolMethod(); @@ -117,7 +113,7 @@ public InstructionContext execute(Frame frame) ins.push(ctx); } - for (net.runelite.asm.Method method : getMethods()) + for (asm.Method method : getMethods()) { ins.invoke(method); @@ -133,7 +129,7 @@ public InstructionContext execute(Frame frame) if (myMethods != null) { - for (net.runelite.asm.Method method : myMethods) + for (asm.Method method : myMethods) { frame.getExecution().order(frame, method); } @@ -143,7 +139,7 @@ public InstructionContext execute(Frame frame) } @Override - public List getMethods() + public List getMethods() { return myMethods != null ? myMethods : Arrays.asList(); } @@ -151,7 +147,7 @@ public List getMethods() @Override public void removeParameter(int idx) { - net.runelite.asm.pool.Class clazz = method.getClazz(); + asm.pool.Class clazz = method.getClazz(); // create new signature Signature sig = new Signature(method.getType()); @@ -167,9 +163,9 @@ public Method getMethod() return method; } - private List lookupMethods() + private List lookupMethods() { - net.runelite.asm.Method m = lookupMethod(); + asm.Method m = lookupMethod(); if (m == null) { return null; @@ -178,7 +174,7 @@ private List lookupMethods() return VirtualMethods.getVirtualMethods(m); } - private net.runelite.asm.Method lookupMethod() + private asm.Method lookupMethod() { ClassGroup group = this.getInstructions().getCode().getMethod().getClassFile().getGroup(); @@ -188,7 +184,7 @@ private net.runelite.asm.Method lookupMethod() return null; // not our class } - net.runelite.asm.Method m = otherClass.findMethodDeep(method.getName(), method.getType()); + asm.Method m = otherClass.findMethodDeep(method.getName(), method.getType()); return m; } @@ -215,7 +211,7 @@ public void map(ParallelExecutorMapping mapping, InstructionContext ctx, Instruc { InvokeVirtual otherIv = (InvokeVirtual) other.getInstruction(); - List myMethods = this.getMethods(), + List myMethods = this.getMethods(), otherMethods = otherIv.getMethods(); assert MappingExecutorUtil.isMaybeEqual(method.getType(), otherIv.method.getType()); @@ -223,7 +219,7 @@ public void map(ParallelExecutorMapping mapping, InstructionContext ctx, Instruc for (int i = 0; i < myMethods.size(); ++i) { - net.runelite.asm.Method m1 = myMethods.get(i), otherMethod = null; + asm.Method m1 = myMethods.get(i), otherMethod = null; ClassFile c1 = m1.getClassFile(); if (myMethods.size() == 1) @@ -234,7 +230,7 @@ public void map(ParallelExecutorMapping mapping, InstructionContext ctx, Instruc { for (int j = 0; j < myMethods.size(); ++j) { - net.runelite.asm.Method m2 = otherMethods.get(j); + asm.Method m2 = otherMethods.get(j); ClassFile c2 = m2.getClassFile(); if (MappingExecutorUtil.isMaybeEqual(c1, c2)) @@ -320,7 +316,7 @@ public boolean isSame(InstructionContext thisIc, InstructionContext otherIc) return false; } - List thisMethods = thisIi.getMethods(), + List thisMethods = thisIi.getMethods(), otherMethods = otherIi.getMethods(); if (thisMethods.size() != otherMethods.size()) @@ -330,8 +326,8 @@ public boolean isSame(InstructionContext thisIc, InstructionContext otherIc) for (int i = 0; i < thisMethods.size(); ++i) { - net.runelite.asm.Method m1 = thisMethods.get(i); - net.runelite.asm.Method m2 = otherMethods.get(i); + asm.Method m1 = thisMethods.get(i); + asm.Method m2 = otherMethods.get(i); // order of methods in thisMethods/otherMethods depends on order classes // were loaded, which might not be the same diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/L2D.java b/asm/src/main/java/asm/attributes/code/instructions/L2D.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/L2D.java rename to asm/src/main/java/asm/attributes/code/instructions/L2D.java index 6a7d554f9..41a98e782 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/L2D.java +++ b/asm/src/main/java/asm/attributes/code/instructions/L2D.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class L2D extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/L2F.java b/asm/src/main/java/asm/attributes/code/instructions/L2F.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/L2F.java rename to asm/src/main/java/asm/attributes/code/instructions/L2F.java index aaa1f3434..88ba40e55 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/L2F.java +++ b/asm/src/main/java/asm/attributes/code/instructions/L2F.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class L2F extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/L2I.java b/asm/src/main/java/asm/attributes/code/instructions/L2I.java similarity index 78% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/L2I.java rename to asm/src/main/java/asm/attributes/code/instructions/L2I.java index 1997e8ab1..fc8324882 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/L2I.java +++ b/asm/src/main/java/asm/attributes/code/instructions/L2I.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class L2I extends Instruction implements ConversionInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LALoad.java b/asm/src/main/java/asm/attributes/code/instructions/LALoad.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LALoad.java rename to asm/src/main/java/asm/attributes/code/instructions/LALoad.java index db031f271..a41bca7ac 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LALoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LALoad.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ArrayLoad; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class LALoad extends Instruction implements ArrayLoad { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LAStore.java b/asm/src/main/java/asm/attributes/code/instructions/LAStore.java similarity index 84% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LAStore.java rename to asm/src/main/java/asm/attributes/code/instructions/LAStore.java index 827255575..79d3fde29 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LAStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LAStore.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class LAStore extends ArrayStore { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LAdd.java b/asm/src/main/java/asm/attributes/code/instructions/LAdd.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LAdd.java rename to asm/src/main/java/asm/attributes/code/instructions/LAdd.java index cf00f99b2..40e135e03 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LAdd.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LAdd.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.AdditionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.AdditionInstruction; +import asm.execution.*; public class LAdd extends Instruction implements AdditionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LAnd.java b/asm/src/main/java/asm/attributes/code/instructions/LAnd.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LAnd.java rename to asm/src/main/java/asm/attributes/code/instructions/LAnd.java index aae069eb7..5ad1ec745 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LAnd.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LAnd.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class LAnd extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LCmp.java b/asm/src/main/java/asm/attributes/code/instructions/LCmp.java similarity index 83% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LCmp.java rename to asm/src/main/java/asm/attributes/code/instructions/LCmp.java index 8b03ef6f1..6f5ac3a11 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LCmp.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LCmp.java @@ -22,24 +22,21 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.Field; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.MappableInstruction; +import asm.execution.*; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; import java.util.ArrayList; import java.util.List; -import net.runelite.asm.Field; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class LCmp extends Instruction implements MappableInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LDC.java b/asm/src/main/java/asm/attributes/code/instructions/LDC.java similarity index 72% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LDC.java rename to asm/src/main/java/asm/attributes/code/instructions/LDC.java index 151f3c18e..c67355383 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LDC.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LDC.java @@ -22,34 +22,18 @@ * (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.asm.attributes.code.instructions; - -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; -import net.runelite.asm.pool.Class; +package asm.attributes.code.instructions; + +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.PushConstantInstruction; +import asm.execution.*; +import asm.pool.Class; import org.objectweb.asm.MethodVisitor; -import static org.objectweb.asm.Opcodes.DCONST_0; -import static org.objectweb.asm.Opcodes.DCONST_1; -import static org.objectweb.asm.Opcodes.FCONST_0; -import static org.objectweb.asm.Opcodes.FCONST_1; -import static org.objectweb.asm.Opcodes.FCONST_2; -import static org.objectweb.asm.Opcodes.ICONST_0; -import static org.objectweb.asm.Opcodes.ICONST_1; -import static org.objectweb.asm.Opcodes.ICONST_2; -import static org.objectweb.asm.Opcodes.ICONST_3; -import static org.objectweb.asm.Opcodes.ICONST_4; -import static org.objectweb.asm.Opcodes.ICONST_5; -import static org.objectweb.asm.Opcodes.ICONST_M1; -import static org.objectweb.asm.Opcodes.LCONST_0; -import static org.objectweb.asm.Opcodes.LCONST_1; + +import static org.objectweb.asm.Opcodes.*; public class LDC extends Instruction implements PushConstantInstruction { @@ -66,9 +50,9 @@ public LDC(Instructions instructions, Object value) public void accept(MethodVisitor visitor) { Object object = getConstant(); - if (object instanceof net.runelite.asm.pool.Class) + if (object instanceof asm.pool.Class) { - net.runelite.asm.pool.Class cl = (net.runelite.asm.pool.Class) object; + asm.pool.Class cl = (asm.pool.Class) object; org.objectweb.asm.Type type = org.objectweb.asm.Type.getType("L" + cl.getName() + ";"); visitor.visitLdcInsn(type); } @@ -187,7 +171,7 @@ public Number getNumber() public void renameClass(String oldName, String newName) { Object object = getConstant(); - if (object instanceof net.runelite.asm.pool.Class) + if (object instanceof asm.pool.Class) { if (((Class) object).getName().equals(oldName)) { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LDiv.java b/asm/src/main/java/asm/attributes/code/instructions/LDiv.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LDiv.java rename to asm/src/main/java/asm/attributes/code/instructions/LDiv.java index 29008a9a1..4705b374c 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LDiv.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LDiv.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DivisionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DivisionInstruction; +import asm.execution.*; public class LDiv extends Instruction implements DivisionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad.java b/asm/src/main/java/asm/attributes/code/instructions/LLoad.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad.java rename to asm/src/main/java/asm/attributes/code/instructions/LLoad.java index 4b665705c..e3d0637f5 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LLoad.java @@ -23,20 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class LLoad extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LMul.java b/asm/src/main/java/asm/attributes/code/instructions/LMul.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LMul.java rename to asm/src/main/java/asm/attributes/code/instructions/LMul.java index 676b1bd0a..2df26ffe4 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LMul.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LMul.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class LMul extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LNeg.java b/asm/src/main/java/asm/attributes/code/instructions/LNeg.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LNeg.java rename to asm/src/main/java/asm/attributes/code/instructions/LNeg.java index 7e5f68eaf..59c7b9dec 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LNeg.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LNeg.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class LNeg extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LOr.java b/asm/src/main/java/asm/attributes/code/instructions/LOr.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LOr.java rename to asm/src/main/java/asm/attributes/code/instructions/LOr.java index d4e304f85..5846b2b31 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LOr.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LOr.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class LOr extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LRem.java b/asm/src/main/java/asm/attributes/code/instructions/LRem.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LRem.java rename to asm/src/main/java/asm/attributes/code/instructions/LRem.java index a99bdf4ba..6296b95ff 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LRem.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LRem.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class LRem extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LShL.java b/asm/src/main/java/asm/attributes/code/instructions/LShL.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LShL.java rename to asm/src/main/java/asm/attributes/code/instructions/LShL.java index 5246f9512..7f491726e 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LShL.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LShL.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class LShL extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LShR.java b/asm/src/main/java/asm/attributes/code/instructions/LShR.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LShR.java rename to asm/src/main/java/asm/attributes/code/instructions/LShR.java index 67dc075dd..7474909ea 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LShR.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LShR.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class LShR extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LStore.java b/asm/src/main/java/asm/attributes/code/instructions/LStore.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LStore.java rename to asm/src/main/java/asm/attributes/code/instructions/LStore.java index 41df1f245..11f56ae56 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LStore.java @@ -23,20 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.LVTInstructionType; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class LStore extends Instruction implements LVTInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LSub.java b/asm/src/main/java/asm/attributes/code/instructions/LSub.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LSub.java rename to asm/src/main/java/asm/attributes/code/instructions/LSub.java index 1ff4db85d..c3c959bf8 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LSub.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LSub.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.SubtractionInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.SubtractionInstruction; +import asm.execution.*; public class LSub extends Instruction implements SubtractionInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LUShR.java b/asm/src/main/java/asm/attributes/code/instructions/LUShR.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LUShR.java rename to asm/src/main/java/asm/attributes/code/instructions/LUShR.java index 97a1132b4..90062dcc3 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LUShR.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LUShR.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class LUShR extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LXor.java b/asm/src/main/java/asm/attributes/code/instructions/LXor.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LXor.java rename to asm/src/main/java/asm/attributes/code/instructions/LXor.java index c6a131720..4dafa352b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LXor.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LXor.java @@ -23,17 +23,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; public class LXor extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LookupSwitch.java b/asm/src/main/java/asm/attributes/code/instructions/LookupSwitch.java similarity index 87% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LookupSwitch.java rename to asm/src/main/java/asm/attributes/code/instructions/LookupSwitch.java index 4a5300a57..9320a4da6 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/LookupSwitch.java +++ b/asm/src/main/java/asm/attributes/code/instructions/LookupSwitch.java @@ -22,21 +22,22 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.JumpingInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; +import org.objectweb.asm.MethodVisitor; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import org.objectweb.asm.MethodVisitor; public class LookupSwitch extends Instruction implements JumpingInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/MonitorEnter.java b/asm/src/main/java/asm/attributes/code/instructions/MonitorEnter.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/MonitorEnter.java rename to asm/src/main/java/asm/attributes/code/instructions/MonitorEnter.java index 999b31432..15c050fae 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/MonitorEnter.java +++ b/asm/src/main/java/asm/attributes/code/instructions/MonitorEnter.java @@ -23,15 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class MonitorEnter extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/MonitorExit.java b/asm/src/main/java/asm/attributes/code/instructions/MonitorExit.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/MonitorExit.java rename to asm/src/main/java/asm/attributes/code/instructions/MonitorExit.java index 4ead4595d..b159fdbe2 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/MonitorExit.java +++ b/asm/src/main/java/asm/attributes/code/instructions/MonitorExit.java @@ -23,15 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class MonitorExit extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/MultiANewArray.java b/asm/src/main/java/asm/attributes/code/instructions/MultiANewArray.java similarity index 83% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/MultiANewArray.java rename to asm/src/main/java/asm/attributes/code/instructions/MultiANewArray.java index 4ab071c5b..238db4b47 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/MultiANewArray.java +++ b/asm/src/main/java/asm/attributes/code/instructions/MultiANewArray.java @@ -22,19 +22,15 @@ * (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.asm.attributes.code.instructions; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +package asm.attributes.code.instructions; + +import asm.ClassFile; +import asm.ClassGroup; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class MultiANewArray extends Instruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/NOP.java b/asm/src/main/java/asm/attributes/code/instructions/NOP.java similarity index 85% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/NOP.java rename to asm/src/main/java/asm/attributes/code/instructions/NOP.java index 21fa7e6fe..a6c9390ab 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/NOP.java +++ b/asm/src/main/java/asm/attributes/code/instructions/NOP.java @@ -22,13 +22,13 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; import org.objectweb.asm.MethodVisitor; public class NOP extends Instruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/New.java b/asm/src/main/java/asm/attributes/code/instructions/New.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/New.java rename to asm/src/main/java/asm/attributes/code/instructions/New.java index 5a0284ea2..00225f6d0 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/New.java +++ b/asm/src/main/java/asm/attributes/code/instructions/New.java @@ -23,21 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.TypeInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; -import net.runelite.asm.pool.Class; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.TypeInstruction; +import asm.execution.*; +import asm.pool.Class; import org.objectweb.asm.MethodVisitor; public class New extends Instruction implements TypeInstruction @@ -56,7 +52,7 @@ public New(Instructions instructions, Class clazz) this.clazz = clazz; } - public New(Instructions instructions, net.runelite.asm.ClassFile classFile) + public New(Instructions instructions, asm.ClassFile classFile) { super(instructions, InstructionType.NEW); this.clazz = classFile.getPoolClass(); diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/NewArray.java b/asm/src/main/java/asm/attributes/code/instructions/NewArray.java similarity index 83% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/NewArray.java rename to asm/src/main/java/asm/attributes/code/instructions/NewArray.java index eb227d923..cd9b132d1 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/NewArray.java +++ b/asm/src/main/java/asm/attributes/code/instructions/NewArray.java @@ -23,18 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.IntInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.IntInstruction; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class NewArray extends Instruction implements IntInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Pop.java b/asm/src/main/java/asm/attributes/code/instructions/Pop.java similarity index 83% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Pop.java rename to asm/src/main/java/asm/attributes/code/instructions/Pop.java index 0b5e1fbec..02820ffa0 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Pop.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Pop.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.StackContext; public class Pop extends Instruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Pop2.java b/asm/src/main/java/asm/attributes/code/instructions/Pop2.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Pop2.java rename to asm/src/main/java/asm/attributes/code/instructions/Pop2.java index 66556a5d1..31021ecdc 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Pop2.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Pop2.java @@ -23,15 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class Pop2 extends Instruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java b/asm/src/main/java/asm/attributes/code/instructions/PutField.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java rename to asm/src/main/java/asm/attributes/code/instructions/PutField.java index e548cfe1d..8aa0f7f9b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java +++ b/asm/src/main/java/asm/attributes/code/instructions/PutField.java @@ -22,31 +22,31 @@ * (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.asm.attributes.code.instructions; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Field; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +package asm.attributes.code.instructions; + +import asm.ClassFile; +import asm.ClassGroup; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.PushConstantInstruction; +import asm.attributes.code.instruction.types.SetFieldInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; +import asm.pool.Class; +import asm.pool.Field; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; import org.objectweb.asm.MethodVisitor; public class PutField extends Instruction implements SetFieldInstruction { private Field field; - private net.runelite.asm.Field myField; + private asm.Field myField; public PutField(Instructions instructions, InstructionType type) { @@ -59,7 +59,7 @@ public PutField(Instructions instructions, Field field) this.field = field; } - public PutField(Instructions instructions, net.runelite.asm.Field field) + public PutField(Instructions instructions, asm.Field field) { super(instructions, InstructionType.PUTFIELD); this.field = field.getPoolField(); @@ -107,9 +107,9 @@ public Field getField() } @Override - public net.runelite.asm.Field getMyField() + public asm.Field getMyField() { - Class clazz = field.getClazz(); + asm.pool.Class clazz = field.getClazz(); ClassGroup group = this.getInstructions().getCode().getMethod().getClassFile().getGroup(); ClassFile cf = group.findClass(clazz.getName()); @@ -118,7 +118,7 @@ public net.runelite.asm.Field getMyField() return null; } - net.runelite.asm.Field f2 = cf.findFieldDeep(field.getName(), field.getType()); + asm.Field f2 = cf.findFieldDeep(field.getName(), field.getType()); return f2; } @@ -143,8 +143,8 @@ public void regeneratePool() @Override public void map(ParallelExecutorMapping mapping, InstructionContext ctx, InstructionContext other) { - net.runelite.asm.Field myField = this.getMyField(); - net.runelite.asm.Field otherField = ((PutField) other.getInstruction()).getMyField(); + asm.Field myField = this.getMyField(); + asm.Field otherField = ((PutField) other.getInstruction()).getMyField(); assert MappingExecutorUtil.isMaybeEqual(myField.getType(), otherField.getType()); @@ -176,8 +176,8 @@ private void mapGetFieldInstructrions(ParallelExecutorMapping mapping, Instructi GetFieldInstruction gf1 = (GetFieldInstruction) base1.getInstruction(), gf2 = (GetFieldInstruction) base2.getInstruction(); - net.runelite.asm.Field f1 = gf1.getMyField(); - net.runelite.asm.Field f2 = gf2.getMyField(); + asm.Field f1 = gf1.getMyField(); + asm.Field f2 = gf2.getMyField(); if (f1 != null && f2 != null) { @@ -193,8 +193,8 @@ private boolean isMaybeEqual(InstructionContext base1, InstructionContext base2) GetFieldInstruction gf1 = (GetFieldInstruction) base1.getInstruction(), gf2 = (GetFieldInstruction) base2.getInstruction(); - net.runelite.asm.Field f1 = gf1.getMyField(); - net.runelite.asm.Field f2 = gf2.getMyField(); + asm.Field f1 = gf1.getMyField(); + asm.Field f2 = gf2.getMyField(); return MappingExecutorUtil.isMaybeEqual(f1, f2); } @@ -213,8 +213,8 @@ public boolean isSame(InstructionContext thisIc, InstructionContext otherIc) PutField thisPf = (PutField) thisIc.getInstruction(), otherPf = (PutField) otherIc.getInstruction(); - net.runelite.asm.Field f1 = thisPf.getMyField(); - net.runelite.asm.Field f2 = otherPf.getMyField(); + asm.Field f1 = thisPf.getMyField(); + asm.Field f2 = otherPf.getMyField(); if ((f1 != null) != (f2 != null)) { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/PutStatic.java b/asm/src/main/java/asm/attributes/code/instructions/PutStatic.java similarity index 75% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/PutStatic.java rename to asm/src/main/java/asm/attributes/code/instructions/PutStatic.java index 9588db5b2..780904ffd 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/PutStatic.java +++ b/asm/src/main/java/asm/attributes/code/instructions/PutStatic.java @@ -22,30 +22,29 @@ * (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.asm.attributes.code.instructions; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Field; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +package asm.attributes.code.instructions; + +import asm.ClassFile; +import asm.ClassGroup; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.SetFieldInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; +import asm.pool.Field; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; import org.objectweb.asm.MethodVisitor; public class PutStatic extends Instruction implements SetFieldInstruction { private Field field; - private net.runelite.asm.Field myField; + private asm.Field myField; public PutStatic(Instructions instructions, InstructionType type) { @@ -58,7 +57,7 @@ public PutStatic(Instructions instructions, Field field) this.field = field; } - public PutStatic(Instructions instructions, net.runelite.asm.Field field) + public PutStatic(Instructions instructions, asm.Field field) { super(instructions, InstructionType.PUTSTATIC); this.field = field.getPoolField(); @@ -105,9 +104,9 @@ public Field getField() } @Override - public net.runelite.asm.Field getMyField() + public asm.Field getMyField() { - Class clazz = field.getClazz(); + asm.pool.Class clazz = field.getClazz(); ClassGroup group = this.getInstructions().getCode().getMethod().getClassFile().getGroup(); ClassFile cf = group.findClass(clazz.getName()); @@ -116,7 +115,7 @@ public net.runelite.asm.Field getMyField() return null; } - net.runelite.asm.Field f2 = cf.findFieldDeep(field.getName(), field.getType()); + asm.Field f2 = cf.findFieldDeep(field.getName(), field.getType()); return f2; } @@ -141,8 +140,8 @@ public void regeneratePool() @Override public void map(ParallelExecutorMapping mapping, InstructionContext ctx, InstructionContext other) { - net.runelite.asm.Field myField = this.getMyField(); - net.runelite.asm.Field otherField = ((PutStatic) other.getInstruction()).getMyField(); + asm.Field myField = this.getMyField(); + asm.Field otherField = ((PutStatic) other.getInstruction()).getMyField(); assert MappingExecutorUtil.isMaybeEqual(myField.getType(), otherField.getType()); @@ -159,8 +158,8 @@ public void map(ParallelExecutorMapping mapping, InstructionContext ctx, Instruc GetFieldInstruction gf1 = (GetFieldInstruction) base1.getInstruction(), gf2 = (GetFieldInstruction) base2.getInstruction(); - net.runelite.asm.Field f1 = gf1.getMyField(); - net.runelite.asm.Field f2 = gf2.getMyField(); + asm.Field f1 = gf1.getMyField(); + asm.Field f2 = gf2.getMyField(); if (f1 != null && f2 != null) { @@ -180,8 +179,8 @@ public boolean isSame(InstructionContext thisIc, InstructionContext otherIc) PutStatic thisPf = (PutStatic) thisIc.getInstruction(), otherPf = (PutStatic) otherIc.getInstruction(); - net.runelite.asm.Field f1 = thisPf.getMyField(); - net.runelite.asm.Field f2 = otherPf.getMyField(); + asm.Field f1 = thisPf.getMyField(); + asm.Field f2 = otherPf.getMyField(); if ((f1 != null) != (f2 != null)) { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Return.java b/asm/src/main/java/asm/attributes/code/instructions/Return.java similarity index 79% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Return.java rename to asm/src/main/java/asm/attributes/code/instructions/Return.java index 691b5ae3f..37c46d64d 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Return.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Return.java @@ -22,21 +22,21 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; -import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import asm.Field; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.MappableInstruction; +import asm.attributes.code.instruction.types.ReturnInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; public class Return extends Instruction implements ReturnInstruction, MappableInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/SALoad.java b/asm/src/main/java/asm/attributes/code/instructions/SALoad.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/SALoad.java rename to asm/src/main/java/asm/attributes/code/instructions/SALoad.java index da488dfc8..a42950486 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/SALoad.java +++ b/asm/src/main/java/asm/attributes/code/instructions/SALoad.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ArrayLoad; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class SALoad extends Instruction implements ArrayLoad { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/SAStore.java b/asm/src/main/java/asm/attributes/code/instructions/SAStore.java similarity index 84% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/SAStore.java rename to asm/src/main/java/asm/attributes/code/instructions/SAStore.java index af38f46b0..05d8b0bd8 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/SAStore.java +++ b/asm/src/main/java/asm/attributes/code/instructions/SAStore.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class SAStore extends ArrayStore { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/SiPush.java b/asm/src/main/java/asm/attributes/code/instructions/SiPush.java similarity index 80% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/SiPush.java rename to asm/src/main/java/asm/attributes/code/instructions/SiPush.java index 7ac80f1d9..8a75b8924 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/SiPush.java +++ b/asm/src/main/java/asm/attributes/code/instructions/SiPush.java @@ -23,19 +23,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.IntInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.Value; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.IntInstruction; +import asm.attributes.code.instruction.types.PushConstantInstruction; +import asm.execution.*; import org.objectweb.asm.MethodVisitor; public class SiPush extends Instruction implements PushConstantInstruction, IntInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Swap.java b/asm/src/main/java/asm/attributes/code/instructions/Swap.java similarity index 86% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Swap.java rename to asm/src/main/java/asm/attributes/code/instructions/Swap.java index 1db76f5bc..6ad2aa311 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/Swap.java +++ b/asm/src/main/java/asm/attributes/code/instructions/Swap.java @@ -22,15 +22,15 @@ * (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.asm.attributes.code.instructions; - -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; +package asm.attributes.code.instructions; + +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; public class Swap extends Instruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/TableSwitch.java b/asm/src/main/java/asm/attributes/code/instructions/TableSwitch.java similarity index 86% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/TableSwitch.java rename to asm/src/main/java/asm/attributes/code/instructions/TableSwitch.java index 681409cc6..a6fa29e3d 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/TableSwitch.java +++ b/asm/src/main/java/asm/attributes/code/instructions/TableSwitch.java @@ -22,24 +22,25 @@ * (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.asm.attributes.code.instructions; +package asm.attributes.code.instructions; + +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.JumpingInstruction; +import asm.attributes.code.instruction.types.MappableInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.Stack; +import asm.execution.StackContext; +import asm.mapping.ParallelExecutorMapping; +import org.objectweb.asm.MethodVisitor; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.Stack; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; -import org.objectweb.asm.MethodVisitor; public class TableSwitch extends Instruction implements JumpingInstruction, MappableInstruction { diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/VReturn.java b/asm/src/main/java/asm/attributes/code/instructions/VReturn.java similarity index 82% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/VReturn.java rename to asm/src/main/java/asm/attributes/code/instructions/VReturn.java index 9b57fa240..9f21d754c 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/VReturn.java +++ b/asm/src/main/java/asm/attributes/code/instructions/VReturn.java @@ -23,14 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.attributes.code.instructions; +package asm.attributes.code.instructions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ReturnInstruction; +import asm.execution.Frame; +import asm.execution.InstructionContext; public class VReturn extends Instruction implements ReturnInstruction diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/Execution.java b/asm/src/main/java/asm/execution/Execution.java similarity index 93% rename from deobfuscator/src/main/java/net/runelite/asm/execution/Execution.java rename to asm/src/main/java/asm/execution/Execution.java index 3a02c0ea8..d124ca89d 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/Execution.java +++ b/asm/src/main/java/asm/execution/Execution.java @@ -22,7 +22,7 @@ * (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.asm.execution; +package asm.execution; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -34,13 +34,12 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import static net.runelite.asm.execution.StaticStep.popStack; -import net.runelite.deob.Deob; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.Method; +import asm.attributes.code.Instruction; +import static asm.execution.StaticStep.popStack; public class Execution { @@ -79,7 +78,7 @@ public List getInitialMethods() for (Method m : cf.getMethods()) { - if (!Deob.isObfuscated(m.getName()) && !m.getName().equals("")) + if (!isObfuscated(m.getName()) && !m.getName().equals("")) { if (m.getCode() == null) { @@ -99,7 +98,18 @@ public List getInitialMethods() return methods; } - + public static boolean isObfuscated(String name) + { + if (name.length() <= 3) + { + return !name.equals("run") && !name.equals("add"); + } + return name.startsWith("method") + || name.startsWith("vmethod") + || name.startsWith("field") + || name.startsWith("class") + || name.startsWith("__"); + } private static boolean extendsApplet(ClassFile cf) { if (cf.getParent() != null) diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/ExecutionVisitor.java b/asm/src/main/java/asm/execution/ExecutionVisitor.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/asm/execution/ExecutionVisitor.java rename to asm/src/main/java/asm/execution/ExecutionVisitor.java index 22452bf3e..a4f1e43c5 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/ExecutionVisitor.java +++ b/asm/src/main/java/asm/execution/ExecutionVisitor.java @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.execution; +package asm.execution; public interface ExecutionVisitor { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/Frame.java b/asm/src/main/java/asm/execution/Frame.java similarity index 92% rename from deobfuscator/src/main/java/net/runelite/asm/execution/Frame.java rename to asm/src/main/java/asm/execution/Frame.java index 68757ca6e..46c522838 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/Frame.java +++ b/asm/src/main/java/asm/execution/Frame.java @@ -22,7 +22,7 @@ * (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.asm.execution; +package asm.execution; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; @@ -31,19 +31,19 @@ import java.util.List; import meteor.Logger; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Exception; -import net.runelite.asm.attributes.code.Exceptions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; -import net.runelite.asm.attributes.code.instructions.InvokeDynamic; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.signature.Signature; +import asm.Method; +import asm.Type; +import asm.attributes.Code; +import asm.attributes.code.Exception; +import asm.attributes.code.Exceptions; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.InvokeInstruction; +import asm.attributes.code.instruction.types.MappableInstruction; +import asm.attributes.code.instructions.InvokeDynamic; +import asm.attributes.code.instructions.InvokeStatic; +import asm.signature.Signature; public class Frame { private static final Logger logger = new Logger("deob"); @@ -58,7 +58,7 @@ public class Frame private List instructions = new ArrayList<>(); // instructions executed in this frame private MethodContext ctx; protected Method nonStatic; // next non static method up the stack - public Frame other; // in the other execution for mapping + public Frame other; // in the other asm.execution for mapping public Frame returnTo; // is this the same as caller? public Frame otherStatic; private int order; @@ -262,6 +262,7 @@ public void execute() InstructionContext pushed = stacki.getPushed(); Frame frame = pushed.getFrame(); + System.err.println(pushed.getInstruction()); } System.err.println("end of stack"); ex.printStackTrace(); diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/FrameVisitor.java b/asm/src/main/java/asm/execution/FrameVisitor.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/asm/execution/FrameVisitor.java rename to asm/src/main/java/asm/execution/FrameVisitor.java index e5d59cfba..45ee29b46 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/FrameVisitor.java +++ b/asm/src/main/java/asm/execution/FrameVisitor.java @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.execution; +package asm.execution; public interface FrameVisitor { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/InstructionContext.java b/asm/src/main/java/asm/execution/InstructionContext.java similarity index 91% rename from deobfuscator/src/main/java/net/runelite/asm/execution/InstructionContext.java rename to asm/src/main/java/asm/execution/InstructionContext.java index 1b44ad19b..65e0de1d4 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/InstructionContext.java +++ b/asm/src/main/java/asm/execution/InstructionContext.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.execution; +package asm.execution; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.attributes.code.instructions.Swap; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.instruction.types.DupInstruction; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.SetFieldInstruction; +import asm.attributes.code.instructions.Swap; public class InstructionContext { @@ -41,8 +41,8 @@ public class InstructionContext private Frame frame; private Stack stack; // stack at time ins was executed private Variables variables; // variables at time ins was executed - private List pops = new ArrayList<>(); // stack contexts popped by instruction execution - private List pushes = new ArrayList<>(); // stack contexts pushed by instruction execution + private List pops = new ArrayList<>(); // stack contexts popped by instruction asm.execution + private List pushes = new ArrayList<>(); // stack contexts pushed by instruction asm.execution private List reads = new ArrayList<>(); // lvt reads private List invokes = new ArrayList<>(); // invokes private List branches = new ArrayList<>(); @@ -155,7 +155,7 @@ public boolean equals(Object other) if (ins != ic.ins) return false; - // check if stack at time of execution is equal + // check if stack at time of asm.execution is equal Stack ours = new Stack(this.getStack()), // copy stacks since we destroy them theirs = new Stack(ic.getStack()); diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/MethodContext.java b/asm/src/main/java/asm/execution/MethodContext.java similarity index 95% rename from deobfuscator/src/main/java/net/runelite/asm/execution/MethodContext.java rename to asm/src/main/java/asm/execution/MethodContext.java index 4615200f7..12cae3531 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/MethodContext.java +++ b/asm/src/main/java/asm/execution/MethodContext.java @@ -22,13 +22,13 @@ * (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.asm.execution; +package asm.execution; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import java.util.Collection; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; +import asm.Method; +import asm.attributes.code.Instruction; public class MethodContext { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/MethodContextVisitor.java b/asm/src/main/java/asm/execution/MethodContextVisitor.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/asm/execution/MethodContextVisitor.java rename to asm/src/main/java/asm/execution/MethodContextVisitor.java index d7a9480a6..6e9d83908 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/MethodContextVisitor.java +++ b/asm/src/main/java/asm/execution/MethodContextVisitor.java @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.execution; +package asm.execution; public interface MethodContextVisitor { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java b/asm/src/main/java/asm/execution/ParallellMappingExecutor.java similarity index 93% rename from deobfuscator/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java rename to asm/src/main/java/asm/execution/ParallellMappingExecutor.java index d88179ef1..32a62a852 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java +++ b/asm/src/main/java/asm/execution/ParallellMappingExecutor.java @@ -22,14 +22,14 @@ * (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.asm.execution; - -import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.asm.attributes.code.instructions.Return; -import static net.runelite.asm.execution.StaticStep.popStack; -import static net.runelite.asm.execution.StaticStep.stepInto; -import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +package asm.execution; + +import asm.attributes.code.instruction.types.ReturnInstruction; +import asm.attributes.code.instructions.Return; +import static asm.execution.StaticStep.popStack; +import static asm.execution.StaticStep.stepInto; +import asm.mapping.MappingExecutorUtil; +import asm.mapping.ParallelExecutorMapping; public class ParallellMappingExecutor { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/Stack.java b/asm/src/main/java/asm/execution/Stack.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/asm/execution/Stack.java rename to asm/src/main/java/asm/execution/Stack.java index fb01c7463..a8840d6b1 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/Stack.java +++ b/asm/src/main/java/asm/execution/Stack.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.execution; +package asm.execution; import java.util.Arrays; import java.util.List; -import net.runelite.asm.Method; -import net.runelite.asm.Type; +import asm.Method; +import asm.Type; public class Stack { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/StackContext.java b/asm/src/main/java/asm/execution/StackContext.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/asm/execution/StackContext.java rename to asm/src/main/java/asm/execution/StackContext.java index fa0d1a9e0..92d8a7d2c 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/StackContext.java +++ b/asm/src/main/java/asm/execution/StackContext.java @@ -23,11 +23,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.execution; +package asm.execution; import java.util.ArrayList; import java.util.List; -import net.runelite.asm.Type; +import asm.Type; public class StackContext { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/StaticStep.java b/asm/src/main/java/asm/execution/StaticStep.java similarity index 94% rename from deobfuscator/src/main/java/net/runelite/asm/execution/StaticStep.java rename to asm/src/main/java/asm/execution/StaticStep.java index 1a70eb285..1fac4ea33 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/StaticStep.java +++ b/asm/src/main/java/asm/execution/StaticStep.java @@ -22,15 +22,15 @@ * (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.asm.execution; +package asm.execution; import java.util.HashSet; import java.util.List; import java.util.Set; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.Return; +import asm.Method; +import asm.attributes.code.instruction.types.ReturnInstruction; +import asm.attributes.code.instructions.InvokeStatic; +import asm.attributes.code.instructions.Return; public class StaticStep { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/Value.java b/asm/src/main/java/asm/execution/Value.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/asm/execution/Value.java rename to asm/src/main/java/asm/execution/Value.java index c5ad7ea53..033b9ef85 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/Value.java +++ b/asm/src/main/java/asm/execution/Value.java @@ -23,11 +23,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.execution; +package asm.execution; + + +import asm.util.PrimitiveUtils; import java.lang.reflect.Array; import java.util.Arrays; -import net.runelite.deob.util.PrimitiveUtils; + public class Value { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/VariableContext.java b/asm/src/main/java/asm/execution/VariableContext.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/asm/execution/VariableContext.java rename to asm/src/main/java/asm/execution/VariableContext.java index 56eabd397..85207c570 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/VariableContext.java +++ b/asm/src/main/java/asm/execution/VariableContext.java @@ -23,11 +23,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.execution; +package asm.execution; import java.util.ArrayList; import java.util.List; -import net.runelite.asm.Type; +import asm.Type; public class VariableContext { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/Variables.java b/asm/src/main/java/asm/execution/Variables.java similarity index 98% rename from deobfuscator/src/main/java/net/runelite/asm/execution/Variables.java rename to asm/src/main/java/asm/execution/Variables.java index 1650493ab..6bbe5bbfb 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/Variables.java +++ b/asm/src/main/java/asm/execution/Variables.java @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.execution; +package asm.execution; public class Variables { diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/WeakInstructionContext.java b/asm/src/main/java/asm/execution/WeakInstructionContext.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/asm/execution/WeakInstructionContext.java rename to asm/src/main/java/asm/execution/WeakInstructionContext.java index e8a4b67dc..ef145430b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/WeakInstructionContext.java +++ b/asm/src/main/java/asm/execution/WeakInstructionContext.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.execution; +package asm.execution; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import net.runelite.asm.attributes.code.Instruction; +import asm.attributes.code.Instruction; public class WeakInstructionContext { diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationIntegrityChecker.java b/asm/src/main/java/asm/mapping/AnnotationIntegrityChecker.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationIntegrityChecker.java rename to asm/src/main/java/asm/mapping/AnnotationIntegrityChecker.java index 321bd9d4f..9fc8070b3 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationIntegrityChecker.java +++ b/asm/src/main/java/asm/mapping/AnnotationIntegrityChecker.java @@ -22,15 +22,14 @@ * (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.deob.deobfuscators.mapping; +package asm.mapping; import java.util.ArrayList; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.deob.DeobAnnotations; + +import asm.*; + +// net.runelite.mapping.Import; import net.runelite.mapping.Import; import net.runelite.rs.api.RSClient; diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationMapper.java b/asm/src/main/java/asm/mapping/AnnotationMapper.java similarity index 91% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationMapper.java rename to asm/src/main/java/asm/mapping/AnnotationMapper.java index 4d5a4d6ee..070c80fd4 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationMapper.java +++ b/asm/src/main/java/asm/mapping/AnnotationMapper.java @@ -23,15 +23,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.deob.deobfuscators.mapping; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Annotation; -import net.runelite.asm.attributes.Annotated; -import net.runelite.deob.DeobAnnotations; +package asm.mapping; + +import asm.*; +import asm.attributes.Annotated; + public class AnnotationMapper { diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ClassGroupMapper.java b/asm/src/main/java/asm/mapping/ClassGroupMapper.java similarity index 94% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ClassGroupMapper.java rename to asm/src/main/java/asm/mapping/ClassGroupMapper.java index 414217ad1..7ff45c27f 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ClassGroupMapper.java +++ b/asm/src/main/java/asm/mapping/ClassGroupMapper.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.deob.deobfuscators.mapping; +package asm.mapping; import java.util.HashMap; import java.util.Map; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; +import asm.ClassFile; +import asm.ClassGroup; public class ClassGroupMapper { diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ClassMapper.java b/asm/src/main/java/asm/mapping/ClassMapper.java similarity index 94% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ClassMapper.java rename to asm/src/main/java/asm/mapping/ClassMapper.java index b195bfa19..32d47a89c 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ClassMapper.java +++ b/asm/src/main/java/asm/mapping/ClassMapper.java @@ -22,15 +22,15 @@ * (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.deob.deobfuscators.mapping; +package asm.mapping; import com.google.common.collect.ImmutableMultiset; import com.google.common.collect.Multiset; import java.util.List; import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Type; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Type; +import asm.signature.Signature; public class ClassMapper { diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ConstructorMapper.java b/asm/src/main/java/asm/mapping/ConstructorMapper.java similarity index 93% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ConstructorMapper.java rename to asm/src/main/java/asm/mapping/ConstructorMapper.java index 26b9a1459..1ba503624 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ConstructorMapper.java +++ b/asm/src/main/java/asm/mapping/ConstructorMapper.java @@ -22,13 +22,13 @@ * (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.deob.deobfuscators.mapping; +package asm.mapping; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Method; +import asm.Type; +import asm.signature.Signature; public class ConstructorMapper { diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java b/asm/src/main/java/asm/mapping/ExecutionMapper.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java rename to asm/src/main/java/asm/mapping/ExecutionMapper.java index b367d2623..6df1a12ee 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java +++ b/asm/src/main/java/asm/mapping/ExecutionMapper.java @@ -23,10 +23,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.deob.deobfuscators.mapping; +package asm.mapping; import java.util.Collection; -import net.runelite.asm.Method; +import asm.Method; public class ExecutionMapper { diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapper.java b/asm/src/main/java/asm/mapping/Mapper.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapper.java rename to asm/src/main/java/asm/mapping/Mapper.java index 25326c8c5..46b4e6cc6 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapper.java +++ b/asm/src/main/java/asm/mapping/Mapper.java @@ -22,15 +22,15 @@ * (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.deob.deobfuscators.mapping; +package asm.mapping; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Method; public class Mapper { @@ -183,7 +183,7 @@ private void mapMemberMethods(ParallelExecutorMapping mapping) .filter(m -> MappingExecutorUtil.isMaybeEqual(m.getDescriptor(), method.getDescriptor())) .collect(Collectors.toList()); - // Run over execution mapper + // Run over asm.execution mapper ExecutionMapper em = new ExecutionMapper(method, possible); ParallelExecutorMapping map = em.run(); if (map == null) diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapping.java b/asm/src/main/java/asm/mapping/Mapping.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapping.java rename to asm/src/main/java/asm/mapping/Mapping.java index 73c842ae4..dfa6f5e9f 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapping.java +++ b/asm/src/main/java/asm/mapping/Mapping.java @@ -22,11 +22,11 @@ * (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.deob.deobfuscators.mapping; +package asm.mapping; import java.util.ArrayList; import java.util.List; -import net.runelite.asm.attributes.code.Instruction; +import asm.attributes.code.Instruction; public class Mapping { diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/MappingExecutorUtil.java b/asm/src/main/java/asm/mapping/MappingExecutorUtil.java similarity index 85% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/MappingExecutorUtil.java rename to asm/src/main/java/asm/mapping/MappingExecutorUtil.java index 23e9899db..78fb481be 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/MappingExecutorUtil.java +++ b/asm/src/main/java/asm/mapping/MappingExecutorUtil.java @@ -23,31 +23,31 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.deob.deobfuscators.mapping; +package asm.mapping; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Interfaces; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; -import net.runelite.asm.attributes.code.instruction.types.ConversionInstruction; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.ParallellMappingExecutor; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.Interfaces; +import asm.Method; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.instruction.types.ArrayLoad; +import asm.attributes.code.instruction.types.ConversionInstruction; +import asm.attributes.code.instruction.types.DupInstruction; +import asm.attributes.code.instruction.types.InvokeInstruction; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.MappableInstruction; +import asm.attributes.code.instruction.types.SetFieldInstruction; +import asm.attributes.code.instructions.InvokeStatic; +import asm.execution.Execution; +import asm.execution.Frame; +import asm.execution.InstructionContext; +import asm.execution.ParallellMappingExecutor; +import asm.execution.StackContext; +import asm.execution.VariableContext; +import asm.execution.Variables; +import asm.signature.Signature; public class MappingExecutorUtil { @@ -117,7 +117,7 @@ public static boolean isMappable(InvokeInstruction ii) { String className; - net.runelite.asm.pool.Method m = ii.getMethod(); + asm.pool.Method m = ii.getMethod(); className = m.getClazz().getName(); if (className.startsWith("java/lang/reflect/") || className.startsWith("java/io/") || className.startsWith("java/util/")) @@ -136,7 +136,7 @@ public static boolean isInlineable(Instruction i) ClassGroup group = i.getInstructions().getCode().getMethod().getClassFile().getGroup(); InvokeStatic is = (InvokeStatic) i; - net.runelite.asm.pool.Method m = is.getMethod(); + asm.pool.Method m = is.getMethod(); return group.findClass(m.getClazz().getName()) != null; } @@ -202,7 +202,7 @@ public static InstructionContext resolve( assert storedCtx.getInstruction() instanceof InvokeStatic; // Figure out parameter index from variable index. - Signature sig = ctx.getFrame().getMethod().getDescriptor(); // signature of current method + Signature sig = ctx.getFrame().getMethod().getDescriptor(); // asm.signature of current method int paramIndex = 0; for (int lvtIndex = 0 /* static */; paramIndex < sig.size(); diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/MethodSignatureMapper.java b/asm/src/main/java/asm/mapping/MethodSignatureMapper.java similarity index 92% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/MethodSignatureMapper.java rename to asm/src/main/java/asm/mapping/MethodSignatureMapper.java index a5128f00c..7ee1e4902 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/MethodSignatureMapper.java +++ b/asm/src/main/java/asm/mapping/MethodSignatureMapper.java @@ -23,17 +23,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.deob.deobfuscators.mapping; +package asm.mapping; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Method; +import asm.signature.Signature; public class MethodSignatureMapper { diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ParallelExecutorMapping.java b/asm/src/main/java/asm/mapping/ParallelExecutorMapping.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ParallelExecutorMapping.java rename to asm/src/main/java/asm/mapping/ParallelExecutorMapping.java index 89cde47f6..c12f0d593 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ParallelExecutorMapping.java +++ b/asm/src/main/java/asm/mapping/ParallelExecutorMapping.java @@ -22,7 +22,7 @@ * (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.deob.deobfuscators.mapping; +package asm.mapping; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -34,11 +34,11 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.Method; +import asm.attributes.code.Instruction; public class ParallelExecutorMapping { diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticInitializerIndexer.java b/asm/src/main/java/asm/mapping/StaticInitializerIndexer.java similarity index 85% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticInitializerIndexer.java rename to asm/src/main/java/asm/mapping/StaticInitializerIndexer.java index 04f841203..5dfd602c0 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticInitializerIndexer.java +++ b/asm/src/main/java/asm/mapping/StaticInitializerIndexer.java @@ -22,18 +22,18 @@ * (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.deob.deobfuscators.mapping; +package asm.mapping; import java.util.HashSet; import java.util.Set; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.PutStatic; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.PutStatic; /** * Finds fields which are initialized in clinit diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticMethodSignatureMapper.java b/asm/src/main/java/asm/mapping/StaticMethodSignatureMapper.java similarity index 91% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticMethodSignatureMapper.java rename to asm/src/main/java/asm/mapping/StaticMethodSignatureMapper.java index 4ec9aaec8..39e018b28 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticMethodSignatureMapper.java +++ b/asm/src/main/java/asm/mapping/StaticMethodSignatureMapper.java @@ -22,17 +22,17 @@ * (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.deob.deobfuscators.mapping; +package asm.mapping; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Method; +import asm.signature.Signature; public class StaticMethodSignatureMapper { @@ -54,7 +54,7 @@ private List getStaticMethods(ClassGroup group) // this used to check the method wasnt , // but fernflower was modified to not remove code // in clinit and place into ConstantValue attriutes - // on fields, so the execution order of clinit no longer + // on fields, so the asm.execution order of clinit no longer // depends on field order if (m.isStatic()) { diff --git a/deobfuscator/src/main/java/net/runelite/asm/objectwebasm/NonloadingClassWriter.java b/asm/src/main/java/asm/objectwebasm/NonloadingClassWriter.java similarity index 96% rename from deobfuscator/src/main/java/net/runelite/asm/objectwebasm/NonloadingClassWriter.java rename to asm/src/main/java/asm/objectwebasm/NonloadingClassWriter.java index c22b2e9f4..3b5a318ab 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/objectwebasm/NonloadingClassWriter.java +++ b/asm/src/main/java/asm/objectwebasm/NonloadingClassWriter.java @@ -23,10 +23,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.objectwebasm; +package asm.objectwebasm; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; +import asm.ClassFile; +import asm.ClassGroup; import org.objectweb.asm.ClassWriter; public class NonloadingClassWriter extends ClassWriter diff --git a/deobfuscator/src/main/java/net/runelite/asm/pool/Class.java b/asm/src/main/java/asm/pool/Class.java similarity index 98% rename from deobfuscator/src/main/java/net/runelite/asm/pool/Class.java rename to asm/src/main/java/asm/pool/Class.java index ef0ea642b..b8ad6cc76 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/pool/Class.java +++ b/asm/src/main/java/asm/pool/Class.java @@ -22,7 +22,7 @@ * (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.asm.pool; +package asm.pool; public class Class { diff --git a/deobfuscator/src/main/java/net/runelite/asm/pool/Field.java b/asm/src/main/java/asm/pool/Field.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/asm/pool/Field.java rename to asm/src/main/java/asm/pool/Field.java index 7211b2029..7b2a1a0f2 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/pool/Field.java +++ b/asm/src/main/java/asm/pool/Field.java @@ -23,10 +23,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.pool; +package asm.pool; import java.util.Objects; -import net.runelite.asm.Type; +import asm.Type; public class Field { diff --git a/deobfuscator/src/main/java/net/runelite/asm/pool/Method.java b/asm/src/main/java/asm/pool/Method.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/asm/pool/Method.java rename to asm/src/main/java/asm/pool/Method.java index 53d538888..1be8ca959 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/pool/Method.java +++ b/asm/src/main/java/asm/pool/Method.java @@ -22,10 +22,10 @@ * (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.asm.pool; +package asm.pool; import java.util.Objects; -import net.runelite.asm.signature.Signature; +import asm.signature.Signature; public class Method { diff --git a/asm/src/main/java/asm/signature/Signature.kt b/asm/src/main/java/asm/signature/Signature.kt new file mode 100644 index 000000000..049f8e5f9 --- /dev/null +++ b/asm/src/main/java/asm/signature/Signature.kt @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2016-2017, Adam + * 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 asm.signature + +import asm.Type +import java.util.* +import java.util.regex.Pattern + +class Signature { + private val argument: MutableList + + var returnValue: Type + + constructor(arguments: List, rv: Type) { + this.argument = ArrayList(arguments) + returnValue = rv + } + + constructor(str: String) { + val rvStart = str.indexOf(')') + require(rvStart != -1) { "Descriptor has no return value!" } + returnValue = Type(str.substring(rvStart + 1)) + argument = findArgs(str, ArrayList(), str.indexOf('(') + 1, rvStart).toMutableList() + } + + constructor(other: Signature) { + argument = ArrayList(other.argument) + returnValue = other.returnValue + } + + override fun equals(other: Any?): Boolean { + return if (other !is Signature) { + false + } else this.toString() == other.toString() + } + + override fun hashCode(): Int { + return this.toString().hashCode() + } + + override fun toString(): String { + val sb = StringBuilder() + sb.append('(') + for (a in argument) { + sb.append(a) + } + sb.append(')') + sb.append(returnValue) + return sb.toString() + } + + fun size(): Int { + return argument.size + } + + fun remove(i: Int) { + argument.removeAt(i) + } + + fun getTypeOfArg(i: Int): Type { + return argument[i] + } + + fun getArguments(): List { + return Collections.unmodifiableList(argument) + } + + val isVoid: Boolean + get() = returnValue == Type.VOID + + class Builder { + private val arguments: MutableList = ArrayList() + lateinit var rv: Type + fun setReturnType(type: Type): Builder { + rv = type + return this + } + + fun addArgument(type: Type): Builder { + arguments.add(type) + return this + } + + fun addArgument(idx: Int, type: Type): Builder { + arguments.add(idx, type) + return this + } + + fun addArguments(types: Collection?): Builder { + arguments.addAll(types!!) + return this + } + + fun build(): Signature { + return Signature(arguments, rv) + } + } + + fun rsApiToRsClient(): Signature { + return Signature(RLAPITORSAPI.matcher(this.toString()).replaceAll("")) + } + + companion object { + private val RLAPITORSAPI = Pattern.compile("net/runelite/(rs/)?api/(RS)?") + private fun findArgs(str: String, ret: MutableList, from: Int, to: Int): List { + if (from >= to) return ret + var i = from + while (str[i] == '[') ++i + if (str[i] == 'L') i = str.indexOf(';', i) + ret.add(Type(str.substring(from, ++i))) + return findArgs(str, ret, i, to) + } + } +} diff --git a/asm/src/main/java/asm/signature/util/VirtualMethods.kt b/asm/src/main/java/asm/signature/util/VirtualMethods.kt new file mode 100644 index 000000000..24ede5b16 --- /dev/null +++ b/asm/src/main/java/asm/signature/util/VirtualMethods.kt @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2016-2017, Adam + * 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 asm.signature.util + +import asm.ClassFile +import asm.Method +import asm.signature.Signature + +object VirtualMethods { + // find the base methods for a method. search goes up from there to see if two + // different methods can be invoked with the same instruction. + private fun findBaseMethods( + methods: MutableList, + cf: ClassFile?, + name: String, + type: Signature + ): MutableList { + if (cf == null) return methods + val m = cf.findMethod(name, type) + if (m != null && !m.isStatic) methods.add(m) + val parentMethods = findBaseMethods(ArrayList(), cf.parent, name, type) + for (inter in cf.interfaces.myInterfaces) parentMethods.addAll(findBaseMethods(ArrayList(), inter, name, type)) + + // parentMethods take precedence over our methods + return if (parentMethods.isEmpty()) methods else parentMethods + } + + private fun findBaseMethods(method: Method): List { + return findBaseMethods(ArrayList(), method.classFile, method.name, method.descriptor) + } + + private fun findMethodUp( + methods: MutableList, + visited: MutableSet, + cf: ClassFile?, + name: String, + type: Signature + ) { + if (cf == null || visited.contains(cf)) return + visited.add(cf) // can do diamond inheritance with interfaces + val m = cf.findMethod(name, type) + if (m != null && !m.isStatic) methods.add(m) + for (child in cf.children) findMethodUp(methods, visited, child, name, type) + } + + @JvmStatic + fun getVirtualMethods(method: Method): List { + val list: MutableList = ArrayList() + if (method.isStatic) { + list.add(method) + return list + } + val bases = findBaseMethods(method) // base methods method overrides + assert( + bases.isNotEmpty() // must contain at least a method + ) + + // now search up from bases, appending to list. + for (m in bases) findMethodUp(list, HashSet(), m.classFile, m.name, m.descriptor) + return list + } +} diff --git a/deobfuscator/src/main/java/net/runelite/deob/util/IdGen.java b/asm/src/main/java/asm/util/IdGen.java similarity index 97% rename from deobfuscator/src/main/java/net/runelite/deob/util/IdGen.java rename to asm/src/main/java/asm/util/IdGen.java index 2f1d1b2b9..7dd5f9c29 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/util/IdGen.java +++ b/asm/src/main/java/asm/util/IdGen.java @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.deob.util; +package asm.util; public class IdGen { diff --git a/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java b/asm/src/main/java/asm/util/JarUtil.java similarity index 92% rename from deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java rename to asm/src/main/java/asm/util/JarUtil.java index cdc5f769b..ce044b9b7 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java +++ b/asm/src/main/java/asm/util/JarUtil.java @@ -22,26 +22,23 @@ * (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.deob.util; +package asm.util; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; +import asm.ClassFile; +import asm.ClassGroup; +import asm.objectwebasm.NonloadingClassWriter; +import asm.visitors.ClassFileVisitor; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.util.CheckClassAdapter; + +import java.io.*; import java.util.Collection; import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarOutputStream; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.objectwebasm.NonloadingClassWriter; -import net.runelite.asm.visitors.ClassFileVisitor; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.util.CheckClassAdapter; public class JarUtil { @@ -66,6 +63,7 @@ public static ClassGroup load(File jarfile, boolean skip) continue; } + System.out.println(entry.getName()); InputStream is = jar.getInputStream(entry); diff --git a/deobfuscator/src/main/java/net/runelite/deob/util/NameMappings.java b/asm/src/main/java/asm/util/NameMappings.java similarity index 93% rename from deobfuscator/src/main/java/net/runelite/deob/util/NameMappings.java rename to asm/src/main/java/asm/util/NameMappings.java index b1dea2b93..6fc8bbc9e 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/util/NameMappings.java +++ b/asm/src/main/java/asm/util/NameMappings.java @@ -23,15 +23,16 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.deob.util; +package asm.util; -import java.util.HashMap; -import java.util.Map; +import asm.pool.Class; +import asm.pool.Field; +import asm.pool.Method; import lombok.Getter; import lombok.Setter; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Field; -import net.runelite.asm.pool.Method; + +import java.util.HashMap; +import java.util.Map; public class NameMappings { diff --git a/deobfuscator/src/main/java/net/runelite/deob/util/PrimitiveUtils.java b/asm/src/main/java/asm/util/PrimitiveUtils.java similarity index 98% rename from deobfuscator/src/main/java/net/runelite/deob/util/PrimitiveUtils.java rename to asm/src/main/java/asm/util/PrimitiveUtils.java index e8317c5d2..01385d094 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/util/PrimitiveUtils.java +++ b/asm/src/main/java/asm/util/PrimitiveUtils.java @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.deob.util; +package asm.util; public class PrimitiveUtils { diff --git a/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFieldVisitor.java b/asm/src/main/java/asm/visitors/ClassFieldVisitor.java similarity index 92% rename from deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFieldVisitor.java rename to asm/src/main/java/asm/visitors/ClassFieldVisitor.java index ff44bca66..f6d09552b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFieldVisitor.java +++ b/asm/src/main/java/asm/visitors/ClassFieldVisitor.java @@ -22,12 +22,12 @@ * (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.asm.visitors; +package asm.visitors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Type; -import net.runelite.asm.Annotation; +import asm.ClassFile; +import asm.Field; +import asm.Type; +import asm.Annotation; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.Attribute; import org.objectweb.asm.FieldVisitor; diff --git a/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFileVisitor.java b/asm/src/main/java/asm/visitors/ClassFileVisitor.java similarity index 91% rename from deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFileVisitor.java rename to asm/src/main/java/asm/visitors/ClassFileVisitor.java index a7efe37fb..7b9de27ac 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFileVisitor.java +++ b/asm/src/main/java/asm/visitors/ClassFileVisitor.java @@ -23,12 +23,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.asm.visitors; +package asm.visitors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Type; -import net.runelite.asm.Annotation; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Type; +import asm.Annotation; +import asm.signature.Signature; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.FieldVisitor; @@ -58,7 +58,7 @@ public void visit(int version, int access, String name, String signature, String classFile.setAccess(access); for (String inter : interfaces) - classFile.getInterfaces().addInterface(new net.runelite.asm.pool.Class(inter)); + classFile.getInterfaces().addInterface(new asm.pool.Class(inter)); } @Override diff --git a/deobfuscator/src/main/java/net/runelite/asm/visitors/CodeVisitor.java b/asm/src/main/java/asm/visitors/CodeVisitor.java similarity index 81% rename from deobfuscator/src/main/java/net/runelite/asm/visitors/CodeVisitor.java rename to asm/src/main/java/asm/visitors/CodeVisitor.java index f4846facf..78d20a07c 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/visitors/CodeVisitor.java +++ b/asm/src/main/java/asm/visitors/CodeVisitor.java @@ -22,38 +22,38 @@ * (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.asm.visitors; +package asm.visitors; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.Annotation; -import net.runelite.asm.attributes.code.Exceptions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.LocalVariable; -import net.runelite.asm.attributes.code.Parameter; -import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.IntInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.TypeInstruction; -import net.runelite.asm.attributes.code.instructions.IInc; -import net.runelite.asm.attributes.code.instructions.InvokeDynamic; -import net.runelite.asm.attributes.code.instructions.InvokeInterface; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.LookupSwitch; -import net.runelite.asm.attributes.code.instructions.MultiANewArray; -import net.runelite.asm.attributes.code.instructions.TableSwitch; -import net.runelite.asm.pool.Field; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Method; +import asm.Type; +import asm.attributes.Code; +import asm.Annotation; +import asm.attributes.code.Exceptions; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.LocalVariable; +import asm.attributes.code.Parameter; +import asm.attributes.code.instruction.types.FieldInstruction; +import asm.attributes.code.instruction.types.IntInstruction; +import asm.attributes.code.instruction.types.InvokeInstruction; +import asm.attributes.code.instruction.types.JumpingInstruction; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.TypeInstruction; +import asm.attributes.code.instructions.IInc; +import asm.attributes.code.instructions.InvokeDynamic; +import asm.attributes.code.instructions.InvokeInterface; +import asm.attributes.code.instructions.LDC; +import asm.attributes.code.instructions.LookupSwitch; +import asm.attributes.code.instructions.MultiANewArray; +import asm.attributes.code.instructions.TableSwitch; +import asm.pool.Field; +import asm.signature.Signature; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.Handle; import org.objectweb.asm.Label; @@ -89,12 +89,12 @@ public class CodeVisitor extends MethodVisitor method = new Method(classFile, name, signature); method.setAccessFlags(access); - net.runelite.asm.attributes.Exceptions exceptions = method.getExceptions(); + asm.attributes.Exceptions exceptions = method.getExceptions(); if (sexceptions != null) { for (String e : sexceptions) { - exceptions.addException(new net.runelite.asm.pool.Class(e)); + exceptions.addException(new asm.pool.Class(e)); } } } @@ -262,7 +262,7 @@ public void visitFieldInsn(int opcode, String owner, String name, String desc) { FieldInstruction i = (FieldInstruction) createInstructionFromOpcode(opcode); Field field = new Field( - new net.runelite.asm.pool.Class(owner), + new asm.pool.Class(owner), name, new Type(desc) ); @@ -278,8 +278,8 @@ public void visitMethodInsn(int opcode, String owner, String name, String desc, Type type = new Type(owner); - net.runelite.asm.pool.Method entry = new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class(type.getInternalName()), + asm.pool.Method entry = new asm.pool.Method( + new asm.pool.Class(type.getInternalName()), name, new Signature(desc) ); @@ -331,7 +331,7 @@ public void visitLdcInsn(Object cst) if (cst instanceof org.objectweb.asm.Type) { org.objectweb.asm.Type t = (org.objectweb.asm.Type) cst; - entry = new net.runelite.asm.pool.Class(t.getClassName()); + entry = new asm.pool.Class(t.getClassName()); } LDC ldc = new LDC(code.getInstructions(), entry); @@ -389,13 +389,13 @@ public void visitMultiANewArrayInsn(String desc, int dims) public void visitTryCatchBlock(Label start, Label end, Label handler, String type) { Exceptions exceptions = code.getExceptions(); - net.runelite.asm.attributes.code.Exception e = new net.runelite.asm.attributes.code.Exception(exceptions); + asm.attributes.code.Exception e = new asm.attributes.code.Exception(exceptions); Instructions ins = code.getInstructions(); - net.runelite.asm.attributes.code.Label startL = ins.findOrCreateLabel(start); - net.runelite.asm.attributes.code.Label endL = ins.findOrCreateLabel(end); - net.runelite.asm.attributes.code.Label handlerL = ins.findOrCreateLabel(handler); + asm.attributes.code.Label startL = ins.findOrCreateLabel(start); + asm.attributes.code.Label endL = ins.findOrCreateLabel(end); + asm.attributes.code.Label handlerL = ins.findOrCreateLabel(handler); assert startL != null; assert endL != null; @@ -406,7 +406,7 @@ public void visitTryCatchBlock(Label start, Label end, Label handler, String typ e.setHandler(handlerL); if (type != null) { - e.setCatchType(new net.runelite.asm.pool.Class(type)); + e.setCatchType(new asm.pool.Class(type)); } exceptions.add(e); @@ -415,7 +415,7 @@ public void visitTryCatchBlock(Label start, Label end, Label handler, String typ @Override public void visitLineNumber(int line, Label start) { - net.runelite.asm.attributes.code.Label label = code.getInstructions().findLabel(start); + asm.attributes.code.Label label = code.getInstructions().findLabel(start); if (label != null) { diff --git a/client/src/main/java/meteor/launcher/CreateLauncherUpdate.kt b/client/src/main/java/meteor/launcher/CreateLauncherUpdate.kt index 47a39ea8d..d64294aed 100644 --- a/client/src/main/java/meteor/launcher/CreateLauncherUpdate.kt +++ b/client/src/main/java/meteor/launcher/CreateLauncherUpdate.kt @@ -9,7 +9,7 @@ import java.util.zip.CRC32 import kotlin.math.ceil object CreateLauncherUpdate { - private val releaseVersion = "292" + private val releaseVersion = "299" private val runtimeVersion = "17.0.2" private val release = LauncherUpdate() @@ -27,14 +27,16 @@ object CreateLauncherUpdate { releaseDir.deleteRecursively() releaseDir.mkdir() - if (!clientBat.exists()) clientBat.createNewFile() + clientBat.createNewFile() + if(clientBat.exists()) { clientBat.writeText("\"%USERPROFILE%\\.meteor\\launcher\\client.exe\"\n" + "pause") - crawlDirectory(java.io.File("./client/build/compose/binaries/main/app/client/")) + crawlDirectory(java.io.File("./client/build/compose/binaries/main/app/client/")) - java.io.File("./client/build/release/release.json").writeText(gson.toJson(release)) + java.io.File("./client/build/release/release.json").writeText(gson.toJson(release)) - java.io.File("./client/build/release/runtime.version").writeText(runtimeVersion) + java.io.File("./client/build/release/runtime.version").writeText(runtimeVersion) + } } diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/InstructionType.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/InstructionType.java deleted file mode 100644 index 0c347d480..000000000 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/InstructionType.java +++ /dev/null @@ -1,348 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.asm.attributes.code; - -import net.runelite.asm.attributes.code.instructions.AALoad; -import net.runelite.asm.attributes.code.instructions.AAStore; -import net.runelite.asm.attributes.code.instructions.AConstNull; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.ANewArray; -import net.runelite.asm.attributes.code.instructions.AStore; -import net.runelite.asm.attributes.code.instructions.AThrow; -import net.runelite.asm.attributes.code.instructions.ArrayLength; -import net.runelite.asm.attributes.code.instructions.BALoad; -import net.runelite.asm.attributes.code.instructions.BAStore; -import net.runelite.asm.attributes.code.instructions.BiPush; -import net.runelite.asm.attributes.code.instructions.CALoad; -import net.runelite.asm.attributes.code.instructions.CAStore; -import net.runelite.asm.attributes.code.instructions.CheckCast; -import net.runelite.asm.attributes.code.instructions.D2F; -import net.runelite.asm.attributes.code.instructions.D2I; -import net.runelite.asm.attributes.code.instructions.D2L; -import net.runelite.asm.attributes.code.instructions.DALoad; -import net.runelite.asm.attributes.code.instructions.DAStore; -import net.runelite.asm.attributes.code.instructions.DAdd; -import net.runelite.asm.attributes.code.instructions.DCmpG; -import net.runelite.asm.attributes.code.instructions.DCmpL; -import net.runelite.asm.attributes.code.instructions.DDiv; -import net.runelite.asm.attributes.code.instructions.DLoad; -import net.runelite.asm.attributes.code.instructions.DMul; -import net.runelite.asm.attributes.code.instructions.DNeg; -import net.runelite.asm.attributes.code.instructions.DRem; -import net.runelite.asm.attributes.code.instructions.DStore; -import net.runelite.asm.attributes.code.instructions.DSub; -import net.runelite.asm.attributes.code.instructions.Dup; -import net.runelite.asm.attributes.code.instructions.Dup2; -import net.runelite.asm.attributes.code.instructions.Dup2_X1; -import net.runelite.asm.attributes.code.instructions.Dup2_X2; -import net.runelite.asm.attributes.code.instructions.Dup_X1; -import net.runelite.asm.attributes.code.instructions.Dup_X2; -import net.runelite.asm.attributes.code.instructions.F2D; -import net.runelite.asm.attributes.code.instructions.F2I; -import net.runelite.asm.attributes.code.instructions.F2L; -import net.runelite.asm.attributes.code.instructions.FALoad; -import net.runelite.asm.attributes.code.instructions.FAStore; -import net.runelite.asm.attributes.code.instructions.FAdd; -import net.runelite.asm.attributes.code.instructions.FCmpG; -import net.runelite.asm.attributes.code.instructions.FCmpL; -import net.runelite.asm.attributes.code.instructions.FDiv; -import net.runelite.asm.attributes.code.instructions.FLoad; -import net.runelite.asm.attributes.code.instructions.FMul; -import net.runelite.asm.attributes.code.instructions.FNeg; -import net.runelite.asm.attributes.code.instructions.FRem; -import net.runelite.asm.attributes.code.instructions.FStore; -import net.runelite.asm.attributes.code.instructions.FSub; -import net.runelite.asm.attributes.code.instructions.GetField; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.Goto; -import net.runelite.asm.attributes.code.instructions.GotoW; -import net.runelite.asm.attributes.code.instructions.I2B; -import net.runelite.asm.attributes.code.instructions.I2C; -import net.runelite.asm.attributes.code.instructions.I2D; -import net.runelite.asm.attributes.code.instructions.I2F; -import net.runelite.asm.attributes.code.instructions.I2L; -import net.runelite.asm.attributes.code.instructions.I2S; -import net.runelite.asm.attributes.code.instructions.IALoad; -import net.runelite.asm.attributes.code.instructions.IAStore; -import net.runelite.asm.attributes.code.instructions.IAdd; -import net.runelite.asm.attributes.code.instructions.IAnd; -import net.runelite.asm.attributes.code.instructions.IDiv; -import net.runelite.asm.attributes.code.instructions.IInc; -import net.runelite.asm.attributes.code.instructions.ILoad; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.INeg; -import net.runelite.asm.attributes.code.instructions.IOr; -import net.runelite.asm.attributes.code.instructions.IRem; -import net.runelite.asm.attributes.code.instructions.IShL; -import net.runelite.asm.attributes.code.instructions.IShR; -import net.runelite.asm.attributes.code.instructions.IStore; -import net.runelite.asm.attributes.code.instructions.ISub; -import net.runelite.asm.attributes.code.instructions.IUShR; -import net.runelite.asm.attributes.code.instructions.IXor; -import net.runelite.asm.attributes.code.instructions.IfACmpEq; -import net.runelite.asm.attributes.code.instructions.IfACmpNe; -import net.runelite.asm.attributes.code.instructions.IfCmpGe; -import net.runelite.asm.attributes.code.instructions.IfCmpGt; -import net.runelite.asm.attributes.code.instructions.IfCmpLe; -import net.runelite.asm.attributes.code.instructions.IfCmpLt; -import net.runelite.asm.attributes.code.instructions.IfEq; -import net.runelite.asm.attributes.code.instructions.IfGe; -import net.runelite.asm.attributes.code.instructions.IfGt; -import net.runelite.asm.attributes.code.instructions.IfICmpEq; -import net.runelite.asm.attributes.code.instructions.IfICmpNe; -import net.runelite.asm.attributes.code.instructions.IfLe; -import net.runelite.asm.attributes.code.instructions.IfLt; -import net.runelite.asm.attributes.code.instructions.IfNe; -import net.runelite.asm.attributes.code.instructions.IfNonNull; -import net.runelite.asm.attributes.code.instructions.IfNull; -import net.runelite.asm.attributes.code.instructions.InstanceOf; -import net.runelite.asm.attributes.code.instructions.InvokeDynamic; -import net.runelite.asm.attributes.code.instructions.InvokeInterface; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.attributes.code.instructions.L2D; -import net.runelite.asm.attributes.code.instructions.L2F; -import net.runelite.asm.attributes.code.instructions.L2I; -import net.runelite.asm.attributes.code.instructions.LALoad; -import net.runelite.asm.attributes.code.instructions.LAStore; -import net.runelite.asm.attributes.code.instructions.LAdd; -import net.runelite.asm.attributes.code.instructions.LAnd; -import net.runelite.asm.attributes.code.instructions.LCmp; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.LDiv; -import net.runelite.asm.attributes.code.instructions.LLoad; -import net.runelite.asm.attributes.code.instructions.LMul; -import net.runelite.asm.attributes.code.instructions.LNeg; -import net.runelite.asm.attributes.code.instructions.LOr; -import net.runelite.asm.attributes.code.instructions.LRem; -import net.runelite.asm.attributes.code.instructions.LShL; -import net.runelite.asm.attributes.code.instructions.LShR; -import net.runelite.asm.attributes.code.instructions.LStore; -import net.runelite.asm.attributes.code.instructions.LSub; -import net.runelite.asm.attributes.code.instructions.LUShR; -import net.runelite.asm.attributes.code.instructions.LXor; -import net.runelite.asm.attributes.code.instructions.LookupSwitch; -import net.runelite.asm.attributes.code.instructions.MonitorEnter; -import net.runelite.asm.attributes.code.instructions.MonitorExit; -import net.runelite.asm.attributes.code.instructions.MultiANewArray; -import net.runelite.asm.attributes.code.instructions.NOP; -import net.runelite.asm.attributes.code.instructions.New; -import net.runelite.asm.attributes.code.instructions.NewArray; -import net.runelite.asm.attributes.code.instructions.Pop; -import net.runelite.asm.attributes.code.instructions.Pop2; -import net.runelite.asm.attributes.code.instructions.PutField; -import net.runelite.asm.attributes.code.instructions.PutStatic; -import net.runelite.asm.attributes.code.instructions.Return; -import net.runelite.asm.attributes.code.instructions.SALoad; -import net.runelite.asm.attributes.code.instructions.SAStore; -import net.runelite.asm.attributes.code.instructions.SiPush; -import net.runelite.asm.attributes.code.instructions.Swap; -import net.runelite.asm.attributes.code.instructions.TableSwitch; -import net.runelite.asm.attributes.code.instructions.VReturn; - -public enum InstructionType -{ - NOP(0x00, "nop", NOP.class), - ACONST_NULL(0x01, "aconst_null", AConstNull.class), - BIPUSH(0x10, "bipush", BiPush.class), - SIPUSH(0x11, "sipush", SiPush.class), - LDC(-1, "ldc", LDC.class), - ILOAD(0x15, "iload", ILoad.class), - LLOAD(0x16, "lload", LLoad.class), - FLOAD(0x17, "fload", FLoad.class), - DLOAD(0x18, "dload", DLoad.class), - ALOAD(0x19, "aload", ALoad.class), - IALOAD(0x2e, "iaload", IALoad.class), - LALOAD(0x2f, "laload", LALoad.class), - FALOAD(0x30, "faload", FALoad.class), - DALOAD(0x31, "daload", DALoad.class), - AALOAD(0x32, "aaload", AALoad.class), - BALOAD(0x33, "baload", BALoad.class), - CALOAD(0x34, "caload", CALoad.class), - SALOAD(0x35, "saload", SALoad.class), - ISTORE(0x36, "istore", IStore.class), - LSTORE(0x37, "lstore", LStore.class), - FSTORE(0x38, "fstore", FStore.class), - DSTORE(0x39, "dstore", DStore.class), - ASTORE(0x3a, "astore", AStore.class), - IASTORE(0x4f, "iastore", IAStore.class), - LASTORE(0x50, "lastore", LAStore.class), - FASTORE(0x51, "fastore", FAStore.class), - DASTORE(0x52, "dastore", DAStore.class), - AASTORE(0x53, "aastore", AAStore.class), - BASTORE(0x54, "bastore", BAStore.class), - CASTORE(0x55, "castore", CAStore.class), - SASTORE(0x56, "sastore", SAStore.class), - POP(0x57, "pop", Pop.class), - POP2(0x58, "pop2", Pop2.class), - DUP(0x59, "dup", Dup.class), - DUP_X1(0x5a, "dup_x1", Dup_X1.class), - DUP_X2(0x5b, "dup_x2", Dup_X2.class), - DUP2(0x5c, "dup2", Dup2.class), - DUP2_X1(0x5d, "dup2_x1", Dup2_X1.class), - DUP2_X2(0x5e, "dup2_x2", Dup2_X2.class), - SWAP(0x5f, "swap", Swap.class), - IADD(0x60, "iadd", IAdd.class), - LADD(0x61, "ladd", LAdd.class), - FADD(0x62, "fadd", FAdd.class), - DADD(0x63, "dadd", DAdd.class), - ISUB(0x64, "isub", ISub.class), - LSUB(0x65, "lsub", LSub.class), - FSUB(0x66, "fsub", FSub.class), - DSUB(0x67, "dsub", DSub.class), - IMUL(0x68, "imul", IMul.class), - LMUL(0x69, "lmul", LMul.class), - FMUL(0x6a, "fmul", FMul.class), - DMUL(0x6b, "dmul", DMul.class), - IDIV(0x6c, "idiv", IDiv.class), - LDIV(0x6d, "ldiv", LDiv.class), - FDIV(0x6e, "fdiv", FDiv.class), - DDIV(0x6f, "ddiv", DDiv.class), - IREM(0x70, "irem", IRem.class), - LREM(0x71, "lrem", LRem.class), - FREM(0x72, "frem", FRem.class), - DREM(0x73, "drem", DRem.class), - INEG(0x74, "ineg", INeg.class), - LNEG(0x75, "lneg", LNeg.class), - FNEG(0x76, "fneg", FNeg.class), - DNEG(0x77, "dneg", DNeg.class), - ISHL(0x78, "ishl", IShL.class), - LSHL(0x79, "lshl", LShL.class), - ISHR(0x7a, "ishr", IShR.class), - LSHR(0x7b, "lshr", LShR.class), - IUSHR(0x7c, "iushr", IUShR.class), - LUSHR(0x7d, "lushr", LUShR.class), - IAND(0x7e, "iand", IAnd.class), - LAND(0x7f, "land", LAnd.class), - IOR(0x80, "ior", IOr.class), - LOR(0x81, "lor", LOr.class), - IXOR(0x82, "ixor", IXor.class), - LXOR(0x83, "lxor", LXor.class), - IINC(0x84, "iinc", IInc.class), - I2L(0x85, "i2l", I2L.class), - I2F(0x86, "i2f", I2F.class), - I2D(0x87, "i2d", I2D.class), - L2I(0x88, "l2i", L2I.class), - L2F(0x89, "l2f", L2F.class), - L2D(0x8a, "l2d", L2D.class), - F2I(0x8b, "f2i", F2I.class), - F2L(0x8c, "f2l", F2L.class), - F2D(0x8d, "f2d", F2D.class), - D2I(0x8e, "d2i", D2I.class), - D2L(0x8f, "d2l", D2L.class), - D2F(0x90, "d2f", D2F.class), - I2B(0x91, "i2b", I2B.class), - I2C(0x92, "i2c", I2C.class), - I2S(0x93, "i2s", I2S.class), - LCMP(0x94, "lcmp", LCmp.class), - FCMPL(0x95, "fcmpl", FCmpL.class), - FCMPG(0x96, "fcmpg", FCmpG.class), - DCMPL(0x97, "dcmpl", DCmpL.class), - DCMPG(0x98, "dcmpg", DCmpG.class), - IFEQ(0x99, "ifeq", IfEq.class), - IFNE(0x9a, "ifne", IfNe.class), - IFLT(0x9b, "iflt", IfLt.class), - IFGE(0x9c, "ifge", IfGe.class), - IFGT(0x9d, "ifgt", IfGt.class), - IFLE(0x9e, "ifle", IfLe.class), - IF_ICMPEQ(0x9f, "if_icmpeq", IfICmpEq.class), - IF_ICMPNE(0xa0, "if_icmpne", IfICmpNe.class), - IF_ICMPLT(0xa1, "if_cmplt", IfCmpLt.class), - IF_ICMPGE(0xa2, "if_icmpge", IfCmpGe.class), - IF_ICMPGT(0xa3, "if_icmpgt", IfCmpGt.class), - IF_ICMPLE(0xa4, "if_icmple", IfCmpLe.class), - IF_ACMPEQ(0xa5, "if_acmpeq", IfACmpEq.class), - IF_ACMPNE(0xa6, "if_acmpne", IfACmpNe.class), - GOTO(0xa7, "goto", Goto.class), - TABLESWITCH(0xaa, "tableswitch", TableSwitch.class), - LOOKUPSWITCH(0xab, "lookupswitch", LookupSwitch.class), - IRETURN(0xac, "ireturn", Return.class), - LRETURN(0xad, "lreturn", Return.class), - FRETURN(0xae, "freturn", Return.class), - DRETURN(0xaf, "dreturn", Return.class), - ARETURN(0xb0, "areturn", Return.class), - RETURN(0xb1, "return", VReturn.class), - GETSTATIC(0xb2, "getstatic", GetStatic.class), - PUTSTATIC(0xb3, "putstatic", PutStatic.class), - GETFIELD(0xb4, "getfield", GetField.class), - PUTFIELD(0xb5, "putfield", PutField.class), - INVOKEVIRTUAL(0xb6, "invokevirtual", InvokeVirtual.class), - INVOKESPECIAL(0xb7, "invokespecial", InvokeSpecial.class), - INVOKESTATIC(0xb8, "invokestatic", InvokeStatic.class), - INVOKEINTERFACE(0xb9, "invokeinterface", InvokeInterface.class), - INVOKEDYNAMIC(0xba, "invokedynamic", InvokeDynamic.class), - NEW(0xbb, "new", New.class), - NEWARRAY(0xbc, "newarray", NewArray.class), - ANEWARRAY(0xbd, "anewarray", ANewArray.class), - ARRAYLENGTH(0xbe, "arraylength", ArrayLength.class), - ATHROW(0xbf, "athrow", AThrow.class), - CHECKCAST(0xc0, "checkcast", CheckCast.class), - INSTANCEOf(0xc1, "instanceof", InstanceOf.class), - MONITORENTER(0xc2, "monitorenter", MonitorEnter.class), - MONITOREXIT(0xc3, "monitorexit", MonitorExit.class), - MULTIANEWARRAY(0xc5, "multianewarray", MultiANewArray.class), - IFNULL(0xc6, "ifnull", IfNull.class), - IFNONNULL(0xc7, "ifnonnull", IfNonNull.class), - GOTO_W(0xc8, "goto_w", GotoW.class); - - private final int code; - private final String name; - private final Class clazz; - - InstructionType(int op, String name, Class clazz) - { - this.code = op; - this.name = name; - this.clazz = clazz; - } - - public int getCode() - { - return code; - } - - public String getName() - { - return name; - } - - public Class getInstructionClass() - { - return clazz; - } - - public static InstructionType findInstructionFromCode(int code) - { - for (InstructionType t : InstructionType.values()) - { - if (t.getCode() == code) - { - return t; - } - } - return null; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java b/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java deleted file mode 100644 index 8fd9e8825..000000000 --- a/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java +++ /dev/null @@ -1,178 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.asm.signature; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.regex.Pattern; -import net.runelite.asm.Type; - -public class Signature -{ - private static final Pattern RLAPITORSAPI = Pattern.compile("net/runelite/(rs/)?api/(RS)?"); - - private final List arguments; - private final Type rv; - - public Signature(List arguments, Type rv) - { - this.arguments = new ArrayList<>(arguments); - this.rv = rv; - } - - public Signature(String str) - { - final int rvStart = str.indexOf(')'); - if (rvStart == -1) - throw new IllegalArgumentException("Descriptor has no return value!"); - - rv = new Type(str.substring(rvStart + 1)); - arguments = findArgs(str, new ArrayList<>(), str.indexOf('(') + 1, rvStart); - } - - public Signature(Signature other) - { - arguments = new ArrayList<>(other.arguments); - rv = other.rv; - } - - private static List findArgs(final String str, final List ret, final int from, final int to) - { - if (from >= to) return ret; - - int i = from; - while (str.charAt(i) == '[') ++i; - - if (str.charAt(i) == 'L') - i = str.indexOf(';', i); - - ret.add(new Type(str.substring(from, ++i))); - - return findArgs(str, ret, i, to); - } - - @Override - public boolean equals(Object other) - { - if (!(other instanceof Signature)) - { - return false; - } - - return this.toString().equals(other.toString()); - } - - @Override - public int hashCode() - { - return this.toString().hashCode(); - } - - @Override - public String toString() - { - StringBuilder sb = new StringBuilder(); - sb.append('('); - for (Type a : arguments) - { - sb.append(a); - } - sb.append(')'); - sb.append(rv); - return sb.toString(); - } - - public int size() - { - return arguments.size(); - } - - public void remove(int i) - { - arguments.remove(i); - } - - public Type getTypeOfArg(int i) - { - return arguments.get(i); - } - - public Type getReturnValue() - { - return rv; - } - - public List getArguments() - { - return Collections.unmodifiableList(arguments); - } - - public boolean isVoid() - { - return rv.equals(Type.VOID); - } - - public static class Builder - { - private final List arguments = new ArrayList<>(); - private Type rv; - - public Builder setReturnType(Type type) - { - rv = type; - return this; - } - - public Builder addArgument(Type type) - { - arguments.add(type); - return this; - } - - public Builder addArgument(int idx, Type type) - { - arguments.add(idx, type); - return this; - } - - public Builder addArguments(Collection types) - { - arguments.addAll(types); - return this; - } - - public Signature build() - { - return new Signature(arguments, rv); - } - } - - public Signature rsApiToRsClient() - { - return new Signature(RLAPITORSAPI.matcher(this.toString()).replaceAll("")); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/asm/signature/util/VirtualMethods.java b/deobfuscator/src/main/java/net/runelite/asm/signature/util/VirtualMethods.java deleted file mode 100644 index 41786e69d..000000000 --- a/deobfuscator/src/main/java/net/runelite/asm/signature/util/VirtualMethods.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.asm.signature.util; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.signature.Signature; - -public class VirtualMethods -{ - // find the base methods for a method. search goes up from there to see if two - // different methods can be invoked with the same instruction. - private static List findBaseMethods(List methods, ClassFile cf, String name, Signature type) - { - if (cf == null) - return methods; - - Method m = cf.findMethod(name, type); - if (m != null && !m.isStatic()) - methods.add(m); - - List parentMethods = findBaseMethods(new ArrayList<>(), cf.getParent(), name, type); - - for (ClassFile inter : cf.getInterfaces().getMyInterfaces()) - parentMethods.addAll(findBaseMethods(new ArrayList<>(), inter, name, type)); - - // parentMethods take precedence over our methods - return parentMethods.isEmpty() ? methods : parentMethods; - } - - private static List findBaseMethods(Method method) - { - return findBaseMethods(new ArrayList<>(), method.getClassFile(), method.getName(), method.getDescriptor()); - } - - private static void findMethodUp(List methods, Set visited, ClassFile cf, String name, Signature type) - { - if (cf == null || visited.contains(cf)) - return; - - visited.add(cf); // can do diamond inheritance with interfaces - - Method m = cf.findMethod(name, type); - if (m != null && !m.isStatic()) - methods.add(m); - - for (ClassFile child : cf.getChildren()) - findMethodUp(methods, visited, child, name, type); - } - - public static List getVirtualMethods(Method method) - { - List list = new ArrayList<>(); - - if (method.isStatic()) - { - list.add(method); - return list; - } - - List bases = findBaseMethods(method); // base methods method overrides - assert !bases.isEmpty(); // must contain at least a method - - // now search up from bases, appending to list. - for (Method m : bases) - findMethodUp(list, new HashSet<>(), m.getClassFile(), m.getName(), m.getDescriptor()); - - return list; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/CleanRuneLitePatch.java b/deobfuscator/src/main/java/net/runelite/deob/CleanRuneLitePatch.java deleted file mode 100644 index 4667831ed..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/CleanRuneLitePatch.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob; - -import com.google.common.base.Stopwatch; -import meteor.Logger; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.execution.Execution; -import net.runelite.deob.deobfuscators.*; -import net.runelite.deob.deobfuscators.arithmetic.ModArith; -import net.runelite.deob.deobfuscators.arithmetic.MultiplicationDeobfuscator; -import net.runelite.deob.deobfuscators.arithmetic.MultiplyOneDeobfuscator; -import net.runelite.deob.deobfuscators.arithmetic.MultiplyZeroDeobfuscator; -import net.runelite.deob.deobfuscators.cfg.ControlFlowDeobfuscator; -import net.runelite.deob.deobfuscators.constparam.ConstantParameter; -import net.runelite.deob.deobfuscators.exprargorder.ExprArgOrder; -import net.runelite.deob.deobfuscators.menuaction.MenuActionDeobfuscator; -import net.runelite.deob.deobfuscators.transformers.ClientErrorTransformer; -import net.runelite.deob.deobfuscators.transformers.GetPathTransformer; -import net.runelite.deob.deobfuscators.transformers.OpcodesTransformer; -import net.runelite.deob.deobfuscators.transformers.ReflectionTransformer; -import net.runelite.deob.util.JarUtil; - -import java.io.File; - -public class CleanRuneLitePatch -{ - private static final Logger logger = new Logger("deob"); - - public static final int OBFUSCATED_NAME_MAX_LEN = 3; - private static final boolean CHECK_EXEC = false; - - public static void main(String[] args) - { - Stopwatch stopwatch = Stopwatch.createStarted(); - - ClassGroup group1 = JarUtil.load(new File("./patch3.jar"), false); - ClassGroup group2 = JarUtil.load(new File("./patch4.jar"), false); - - RemoveNamedAnnotations.run(group1); - RemoveNamedAnnotations.run(group2); - - new Order().run(group1); - new Order().run(group2); - - SyncRuneLitePatches.run(group1, group2); - - JarUtil.save(group1, new File("./patch3-clean.jar")); - JarUtil.save(group2, new File("./patch4-clean.jar")); - - stopwatch.stop(); - logger.info("Done in {}", stopwatch); - } - - public static boolean isObfuscated(String name) - { - if (name.length() <= OBFUSCATED_NAME_MAX_LEN) - { - return !name.equals("run") && !name.equals("add"); - } - return name.startsWith("method") - || name.startsWith("vmethod") - || name.startsWith("field") - || name.startsWith("class") - || name.startsWith("__"); - } - - private static void runMath(ClassGroup group) - { - ModArith mod = new ModArith(); - mod.run(group); - - int last = -1, cur; - while ((cur = mod.runOnce()) > 0) - { - new MultiplicationDeobfuscator().run(group); - - // do not remove 1 * field so that ModArith can detect - // the change in guessDecreasesConstants() - new MultiplyOneDeobfuscator(true).run(group); - - new MultiplyZeroDeobfuscator().run(group); - - if (last == cur) - { - break; - } - - last = cur; - } - - // now that modarith is done, remove field * 1 - new MultiplyOneDeobfuscator(false).run(group); - - mod.annotateEncryption(); - } - - private static void run(ClassGroup group, Deobfuscator deob) - { - Stopwatch stopwatch = Stopwatch.createStarted(); - deob.run(group); - stopwatch.stop(); - - logger.info("{} took {}", deob.getClass().getSimpleName(), stopwatch); - - // check code is still correct - if (CHECK_EXEC) - { - Execution execution = new Execution(group); - execution.populateInitialMethods(); - execution.run(); - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/CreateAnnotations.java b/deobfuscator/src/main/java/net/runelite/deob/CreateAnnotations.java deleted file mode 100644 index 2fc33db3c..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/CreateAnnotations.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2019, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this submodule. - * - * Copyright (c) 2016-2017, Adam - * 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.deob; - -import net.runelite.asm.*; - -/* - * This handles creating "virtual" annotations to clean up rs-client in the main project - */ -public class CreateAnnotations -{ - - public static void run(ClassGroup classGroup) - { - for (final ClassFile deobClass : classGroup) - { - injectFields(deobClass); - injectMethods(deobClass); - - if (deobClass.getName().startsWith("class")) - { - continue; - } - - deobClass.addAnnotation(DeobAnnotations.IMPLEMENTS, deobClass.getName()); - } - } - - private static void injectFields(ClassFile deobClass) - { - for (Field deobField : deobClass.getFields()) - { - if (!deobField.getName().startsWith("field")) - deobField.addAnnotation(DeobAnnotations.EXPORT, deobField.getName()); - } - } - - private static void injectMethods(ClassFile deobClass) - { - for (Method deobMethod : deobClass.getMethods()) - { - if (!deobMethod.getName().startsWith("method") && !deobMethod.getName().contains("") && !deobMethod.getName().contains("")) - deobMethod.addAnnotation(DeobAnnotations.EXPORT, deobMethod.getName()); - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/Deob.java b/deobfuscator/src/main/java/net/runelite/deob/Deob.java deleted file mode 100644 index 15eb8eff0..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/Deob.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob; - -import com.google.common.base.Stopwatch; -import java.io.File; -import java.io.IOException; - -import meteor.Logger; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.execution.Execution; -import net.runelite.deob.deobfuscators.CastNull; -import net.runelite.deob.deobfuscators.EnumDeobfuscator; -import net.runelite.deob.deobfuscators.FieldInliner; -import net.runelite.deob.deobfuscators.IllegalStateExceptions; -import net.runelite.deob.deobfuscators.Lvt; -import net.runelite.deob.deobfuscators.Order; -import net.runelite.deob.deobfuscators.RenameUnique; -import net.runelite.deob.deobfuscators.RuntimeExceptions; -import net.runelite.deob.deobfuscators.UnreachedCode; -import net.runelite.deob.deobfuscators.UnusedClass; -import net.runelite.deob.deobfuscators.UnusedFields; -import net.runelite.deob.deobfuscators.UnusedMethods; -import net.runelite.deob.deobfuscators.UnusedParameters; -import net.runelite.deob.deobfuscators.arithmetic.ModArith; -import net.runelite.deob.deobfuscators.arithmetic.MultiplicationDeobfuscator; -import net.runelite.deob.deobfuscators.arithmetic.MultiplyOneDeobfuscator; -import net.runelite.deob.deobfuscators.arithmetic.MultiplyZeroDeobfuscator; -import net.runelite.deob.deobfuscators.cfg.ControlFlowDeobfuscator; -import net.runelite.deob.deobfuscators.constparam.ConstantParameter; -import net.runelite.deob.deobfuscators.exprargorder.ExprArgOrder; -import net.runelite.deob.deobfuscators.menuaction.MenuActionDeobfuscator; -import net.runelite.deob.deobfuscators.transformers.ClientErrorTransformer; -import net.runelite.deob.deobfuscators.transformers.GetPathTransformer; -import net.runelite.deob.deobfuscators.transformers.OpcodesTransformer; -import net.runelite.deob.deobfuscators.transformers.ReflectionTransformer; -import net.runelite.deob.util.JarUtil; -public class Deob -{ - private static final Logger logger = new Logger("deob"); - - public static final int OBFUSCATED_NAME_MAX_LEN = 3; - private static final boolean CHECK_EXEC = false; - - public static void main(String[] args) - { - logger.info("Deobfuscator revision {}", DeobProperties.getRevision()); - - Stopwatch stopwatch = Stopwatch.createStarted(); - - ClassGroup group = JarUtil.load(new File("./deobfuscator/star-215.jar"), true); - - // remove except RuntimeException - run(group, new RuntimeExceptions()); - - run(group, new ControlFlowDeobfuscator()); - - run(group, new RenameUnique()); - - // remove unused methods - this leaves Code with no instructions, - // which is not valid, so unused methods is run after - run(group, new UnreachedCode()); - run(group, new UnusedMethods()); - - // remove illegal state exceptions, frees up some parameters - run(group, new IllegalStateExceptions()); - - // remove constant logically dead parameters - run(group, new ConstantParameter()); - - // remove unhit blocks - run(group, new UnreachedCode()); - run(group, new UnusedMethods()); - - // remove unused parameters - run(group, new UnusedParameters()); - - // remove unused fields - run(group, new UnusedFields()); - - run(group, new FieldInliner()); - - // order uses class name order for sorting fields/methods, - // so run it before removing classes below - run(group, new Order()); - - run(group, new UnusedClass()); - - //runMath(group); - - run(group, new ExprArgOrder()); - - run(group, new Lvt()); - - run(group, new CastNull()); - - run(group, new EnumDeobfuscator()); - - new OpcodesTransformer().transform(group); - //run(group, new PacketHandlerOrder()); - //run(group, new PacketWriteDeobfuscator()); - - run(group, new MenuActionDeobfuscator()); - - new GetPathTransformer().transform(group); - new ClientErrorTransformer().transform(group); - new ReflectionTransformer().transform(group); - //new MaxMemoryTransformer().transform(group); - //new RuneliteBufferTransformer().transform(group); - - JarUtil.save(group, new File("./deobfuscator/deob-215.jar")); - - stopwatch.stop(); - logger.info("Done in {}", stopwatch); - } - - public static boolean isObfuscated(String name) - { - if (name.length() <= OBFUSCATED_NAME_MAX_LEN) - { - return !name.equals("run") && !name.equals("add"); - } - return name.startsWith("method") - || name.startsWith("vmethod") - || name.startsWith("field") - || name.startsWith("class") - || name.startsWith("__"); - } - - private static void runMath(ClassGroup group) - { - ModArith mod = new ModArith(); - mod.run(group); - - int last = -1, cur; - while ((cur = mod.runOnce()) > 0) - { - new MultiplicationDeobfuscator().run(group); - - // do not remove 1 * field so that ModArith can detect - // the change in guessDecreasesConstants() - new MultiplyOneDeobfuscator(true).run(group); - - new MultiplyZeroDeobfuscator().run(group); - - if (last == cur) - { - break; - } - - last = cur; - } - - // now that modarith is done, remove field * 1 - new MultiplyOneDeobfuscator(false).run(group); - - mod.annotateEncryption(); - } - - private static void run(ClassGroup group, Deobfuscator deob) - { - Stopwatch stopwatch = Stopwatch.createStarted(); - deob.run(group); - stopwatch.stop(); - - logger.info("{} took {}", deob.getClass().getSimpleName(), stopwatch); - - // check code is still correct - if (CHECK_EXEC) - { - Execution execution = new Execution(group); - execution.populateInitialMethods(); - execution.run(); - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/DeobProperties.java b/deobfuscator/src/main/java/net/runelite/deob/DeobProperties.java deleted file mode 100644 index ba32f2fe4..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/DeobProperties.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -public class DeobProperties -{ - - public static String getRevision() - { - return "207.4"; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/Deobfuscator.java b/deobfuscator/src/main/java/net/runelite/deob/Deobfuscator.java deleted file mode 100644 index 0471a24fe..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/Deobfuscator.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob; - -import net.runelite.asm.ClassGroup; - -public interface Deobfuscator -{ - void run(ClassGroup group); -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/RemoveNamedAnnotations.java b/deobfuscator/src/main/java/net/runelite/deob/RemoveNamedAnnotations.java deleted file mode 100644 index bbfe7ee71..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/RemoveNamedAnnotations.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2019, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this submodule. - * - * Copyright (c) 2016-2017, Adam - * 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.deob; - -import net.runelite.asm.*; - -public class RemoveNamedAnnotations -{ - - public static void run(ClassGroup classGroup) - { - for (final ClassFile deobClass : classGroup) - { - injectFields(deobClass); - injectMethods(deobClass); - - if (deobClass.getName().startsWith("class")) - { - continue; - } - - deobClass.addAnnotation(DeobAnnotations.IMPLEMENTS, deobClass.getName()); - } - } - - private static void injectFields(ClassFile deobClass) - { - for (Field deobField : deobClass.getFields()) - { - Type toRemove = null; - for (Annotation annotation : deobField.getAnnotations().values()) { - if (annotation.getType().getInternalName().contains("Named")) - toRemove = annotation.getType(); - } - if (toRemove != null) - deobField.getAnnotations().remove(toRemove); - } - } - - private static void injectMethods(ClassFile deobClass) - { - for (Method deobMethod : deobClass.getMethods()) - { - Type toRemove = null; - for (Annotation annotation : deobMethod.getAnnotations().values()) { - if (annotation.getType().getInternalName().contains("Named")) - toRemove = annotation.getType(); - } - if (toRemove != null) - deobMethod.getAnnotations().remove(toRemove); - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/SyncRuneLitePatches.java b/deobfuscator/src/main/java/net/runelite/deob/SyncRuneLitePatches.java deleted file mode 100644 index c9eff1612..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/SyncRuneLitePatches.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2019, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this submodule. - * - * Copyright (c) 2016-2017, Adam - * 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.deob; - -import net.runelite.asm.*; - -import java.util.ArrayList; -import java.util.List; - -public class SyncRuneLitePatches -{ - - public static void run(ClassGroup group1, ClassGroup group2) - { - for (final ClassFile classFile : group1) - { - ClassFile other = findMatchingClass(classFile, group2); - - if (other != null) { - List otherMethods = other.getMethods(); - ArrayList sortedMethods = new ArrayList<>(); - - for (Method method : classFile.getMethods()) { - for (Method otherMethod : otherMethods) { - if (method.getDescriptor().equals(otherMethod.getDescriptor())) { - sortedMethods.add(otherMethod); - break; - } - } - } - - other.setMethods(sortedMethods); - } - } - } - - private static ClassFile findMatchingClass(ClassFile cf, ClassGroup group2) { - for (ClassFile other : group2.getClasses()) { - if (other.getClassName().equals(cf.getClassName())) { - return other; - } - } - return null; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/Transformer.java b/deobfuscator/src/main/java/net/runelite/deob/Transformer.java deleted file mode 100644 index ae137e80b..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/Transformer.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob; - -import net.runelite.asm.ClassGroup; - -public interface Transformer -{ - void transform(ClassGroup group); -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/c2s/IsaacCipherFinder.java b/deobfuscator/src/main/java/net/runelite/deob/c2s/IsaacCipherFinder.java deleted file mode 100644 index a37d3f928..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/c2s/IsaacCipherFinder.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.c2s; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; - -public class IsaacCipherFinder -{ - - private static final int GOLDEN_RATIO = 0x9E3779B9; // 2^32 / phi - private final ClassGroup group; - - private ClassFile isaacCipher; - private Method getNext; - - public IsaacCipherFinder(ClassGroup group) - { - this.group = group; - } - - public ClassFile getIsaacCipher() - { - return isaacCipher; - } - - public Method getGetNext() - { - return getNext; - } - - public void find() - { - Method highest = null; - int count = 0; - - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - Code code = m.getCode(); - - int i = find(m, code); - if (i > count) - { - count = i; - highest = m; - } - } - } - - assert highest != null; - isaacCipher = highest.getClassFile(); - - // find nextInt - for (Method method : isaacCipher.getMethods()) - { - if (method.getDescriptor().size() == 0 && method.getDescriptor().getReturnValue().equals(Type.INT)) - { - getNext = method; - } - } - - } - - private int find(Method method, Code code) - { - if (code == null) - { - return 0; - } - - int gr = 0; - - for (Instruction i : code.getInstructions().getInstructions()) - { - if (i instanceof PushConstantInstruction) - { - PushConstantInstruction pci = (PushConstantInstruction) i; - - if (pci.getConstant().equals(GOLDEN_RATIO)) - { - ++gr; - } - } - } - - return gr; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/c2s/RWOpcodeFinder.java b/deobfuscator/src/main/java/net/runelite/deob/c2s/RWOpcodeFinder.java deleted file mode 100644 index 4d4fb5758..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/c2s/RWOpcodeFinder.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.c2s; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; - -public class RWOpcodeFinder -{ - - private final ClassGroup group; - - private Method readOpcode; - private Method writeOpcode; - - public RWOpcodeFinder(ClassGroup group) - { - this.group = group; - } - - public Method getReadOpcode() - { - return readOpcode; - } - - public Method getWriteOpcode() - { - return writeOpcode; - } - - public ClassFile getSecretBuffer() - { - assert writeOpcode.getClassFile() == readOpcode.getClassFile(); - return writeOpcode.getClassFile(); - } - - public ClassFile getBuffer() - { - return getSecretBuffer().getParent(); - } - - public void find() - { - IsaacCipherFinder ic = new IsaacCipherFinder(group); - ic.find(); - - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - Code code = m.getCode(); - - find(ic, m, code); - } - } - } - - private void find(IsaacCipherFinder ic, Method method, Code code) - { - if (code == null) - { - return; - } - - for (Instruction i : code.getInstructions().getInstructions()) - { - if (i instanceof InvokeInstruction) - { - if (((InvokeInstruction) i).getMethods().contains(ic.getGetNext())) - { - if (method.getDescriptor().size() == 0) - { - // read opcode - readOpcode = method; - } - else - { - // write opcode - writeOpcode = method; - } - } - } - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersion.java b/deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersion.java deleted file mode 100644 index bbd66357e..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersion.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.clientver; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.Enumeration; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; -import org.objectweb.asm.ClassReader; - -public class ClientVersion -{ - private final File jar; - - public ClientVersion(File jar) - { - this.jar = jar; - } - - public int getVersion() throws IOException - { - try (JarFile jar = new JarFile(this.jar)) - { - for (Enumeration it = jar.entries(); it.hasMoreElements();) - { - JarEntry entry = it.nextElement(); - - if (!entry.getName().equals("client.class")) - continue; - - InputStream in = jar.getInputStream(entry); - - ClassReader reader = new ClassReader(in); - VersionClassVisitor v = new VersionClassVisitor(); - reader.accept(v, 0); - return v.getVersion(); - } - } - - return -1; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersionMain.java b/deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersionMain.java deleted file mode 100644 index a354f6cce..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersionMain.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.clientver; - -import com.google.common.io.Files; -import java.io.File; -import java.io.IOException; - -public class ClientVersionMain -{ - public static void main(String[] args) throws IOException - { - File jar = new File(args[0]); - ClientVersion cv = new ClientVersion(jar); - //System.out.println(cv.getVersion()); - } - - public static int version(String loc) - { - File jar = new File(loc); - ClientVersion cv = new ClientVersion(jar); - try - { - int version = cv.getVersion(); - - Files.move(jar, new File(loc.replace("gamepack.jar", "gamepack-" + version + ".jar"))); - - return version; - } - catch (IOException e) - { - e.printStackTrace(); - } - - return -1; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/clientver/VersionClassVisitor.java b/deobfuscator/src/main/java/net/runelite/deob/clientver/VersionClassVisitor.java deleted file mode 100644 index 3565794e8..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/clientver/VersionClassVisitor.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.clientver; - -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; - -public class VersionClassVisitor extends ClassVisitor -{ - private VersionMethodVisitor vmv = new VersionMethodVisitor(); - - public VersionClassVisitor() - { - super(Opcodes.ASM5); - } - - @Override - public MethodVisitor visitMethod(int access, - String name, - String desc, - String signature, - String[] exceptions) - { - if (!name.equals("init")) - return null; - - return vmv; - } - - public int getVersion() - { - return vmv.getVersion(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/clientver/VersionMethodVisitor.java b/deobfuscator/src/main/java/net/runelite/deob/clientver/VersionMethodVisitor.java deleted file mode 100644 index a8f5c4dec..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/clientver/VersionMethodVisitor.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.clientver; - -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; - -public class VersionMethodVisitor extends MethodVisitor -{ - private int state = 0; - private int version = -1; - - VersionMethodVisitor() - { - super(Opcodes.ASM5); - } - - @Override - public void visitIntInsn(int opcode, int operand) - { - if (state == 2) - { - version = operand; - ++state; - } - - if (operand == 765 || operand == 503) - { - ++state; - } - } - - public int getVersion() - { - return version; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/CastNull.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/CastNull.java deleted file mode 100644 index 4e3df30b2..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/CastNull.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import java.util.ArrayList; -import java.util.List; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.AConstNull; -import net.runelite.asm.attributes.code.instructions.CheckCast; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.Deobfuscator; - -public class CastNull implements Deobfuscator -{ - private int removed; - - private final List interesting = new ArrayList<>(); - private final List notInteresting = new ArrayList<>(); - - private void visit(InstructionContext ictx) - { - if (!(ictx.getInstruction() instanceof CheckCast)) - return; - - if (notInteresting.contains(ictx.getInstruction()) || interesting.contains(ictx.getInstruction())) - return; - - StackContext sctx = ictx.getPops().get(0); - if (sctx.getPushed().getInstruction() instanceof AConstNull) - { - interesting.add(ictx.getInstruction()); - } - else - { - interesting.remove(ictx.getInstruction()); - notInteresting.add(ictx.getInstruction()); - } - } - - private void visit(MethodContext ctx) - { - Instructions ins = ctx.getMethod().getCode().getInstructions(); - interesting.forEach(ins::remove); - removed += interesting.size(); - interesting.clear(); - notInteresting.clear(); - } - - @Override - public void run(ClassGroup group) - { - Execution execution = new Execution(group); - execution.addExecutionVisitor(i -> visit(i)); - execution.addMethodContextVisitor(i -> visit(i)); - execution.populateInitialMethods(); - execution.run(); - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/EnumDeobfuscator.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/EnumDeobfuscator.java deleted file mode 100644 index f55812a2a..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/EnumDeobfuscator.java +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.ILoad; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.PutStatic; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Deobfuscator; - -public class EnumDeobfuscator implements Deobfuscator -{ - private static final net.runelite.asm.pool.Method ENUM_INIT = new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class("java/lang/Enum"), - "", - new Signature("(Ljava/lang/String;I)V") - ); - - @Override - public void run(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - if (!isEnum(cf) || cf.isEnum()) - { - continue; - } - - makeEnum(cf); - } - } - - private boolean isEnum(ClassFile cf) - { - if (cf.getInterfaces().getMyInterfaces().size() != 1 - || cf.getInterfaces().getInterfaces().size() != 1) - { - return false; - } - - if (!interfaceIsEnum(cf.getInterfaces().getMyInterfaces().get(0))) - { - return false; - } - - // number of non static methods should be 1 - long count = cf.getMethods() - .stream() - .filter(m -> !m.isStatic()) - .filter(m -> !m.getName().startsWith("<")) - .count(); - if (count != 1) - { - return false; - } - - return true; - } - - private boolean interfaceIsEnum(ClassFile cf) - { - assert cf.isInterface(); - - if (cf.getMethods().size() != 1) - { - return false; - } - - Method method = cf.getMethods().get(0); - return method.getDescriptor().toString().equals("()I"); // ordinal - } - - private void makeEnum(ClassFile cf) - { - cf.setEnum(); // make class an enum - - // enums super class is java/lang/Enum - assert cf.getParentClass().getName().equals("java/lang/Object"); - cf.setSuperName("java/lang/Enum"); - - // all static fields of the type of the class become enum members - for (Field field : cf.getFields()) - { - if (field.isStatic() && field.getType().equals(new Type("L" + cf.getName() + ";"))) - { - field.setEnum(); - } - } - - for (Method method : cf.getMethods()) - { - if (!method.getName().equals("")) - { - continue; - } - - // Add string as first argument, which is the field name, - // and ordinal as second argument - Signature descriptor = new Signature.Builder() - .setReturnType(method.getDescriptor().getReturnValue()) - .addArgument(Type.STRING) - .addArgument(Type.INT) - .addArguments(method.getDescriptor().getArguments()) - .build(); - - method.setDescriptor(descriptor); - - // Remove instructions up to invokespecial - Instructions ins = method.getCode().getInstructions(); - Instruction i; - do - { - i = ins.getInstructions().get(0); - ins.remove(i); - } - while (i.getType() != InstructionType.INVOKESPECIAL); - - ins.addInstruction(0, new ALoad(ins, 0)); // load this - ins.addInstruction(1, new ALoad(ins, 1)); // load constant name - ins.addInstruction(2, new ILoad(ins, 2)); // ordinal - ins.addInstruction(3, new InvokeSpecial(ins, ENUM_INIT)); // invoke enum constructor - - // Shift all indexes after this up +2 because of the new String and int argument - for (int j = 4; j < ins.getInstructions().size(); ++j) - { - i = ins.getInstructions().get(j); - - if (i instanceof LVTInstruction) - { - LVTInstruction lvt = ((LVTInstruction) i); - int idx = lvt.getVariableIndex(); - if (idx != 0) - { - lvt.setVariableIndex(idx + 2); - } - } - } - } - - // Order of fields being set in clinit, which is the order - // the enum fields are actually in - List order = new ArrayList<>(); - - for (Method method : cf.getMethods()) - { - if (!method.getName().equals("")) - { - continue; - } - - Instructions ins = method.getCode().getInstructions(); - - int count = 0; - // sometimes there is new new invokespecial invokespecial putfield - // for eg enum member field30(1, 2, String.class, new class5()); - boolean seenDup = false; - for (int j = 0; j < ins.getInstructions().size(); ++j) - { - Instruction i = ins.getInstructions().get(j); - - if (i.getType() == InstructionType.DUP && !seenDup) - { - // XXX this should actually be the field name, but it seems to have no effect on fernflower - ins.addInstruction(j + 1, new LDC(ins, "runelite")); - ins.addInstruction(j + 2, new LDC(ins, count++)); - seenDup = true; - } - else if (i.getType() == InstructionType.INVOKESPECIAL) - { - Instruction next = ins.getInstructions().get(j + 1); - - // check if this is the invokespecial on the enum, putstatic comes next - if (next.getType() == InstructionType.PUTSTATIC) - { - InvokeSpecial is = (InvokeSpecial) i; - PutStatic ps = (PutStatic) next; - - net.runelite.asm.pool.Method pmethod = new net.runelite.asm.pool.Method( - is.getMethod().getClazz(), - is.getMethod().getName(), - new Signature.Builder() - .setReturnType(is.getMethod().getType().getReturnValue()) - .addArgument(Type.STRING) - .addArgument(Type.INT) - .addArguments(is.getMethod().getType().getArguments()) - .build() - ); - - is.setMethod(pmethod); - - Field field = ps.getMyField(); - assert field != null; - order.add(field); - - seenDup = false; - } - } - } - } - - // Enum fields must be first. Also they are in order in clinit. - // Sort fields - Collections.sort(cf.getFields(), (f1, f2) -> - { - int idx1 = order.indexOf(f1); - int idx2 = order.indexOf(f2); - - if (idx1 == -1) - { - idx1 = Integer.MAX_VALUE; - } - if (idx2 == -1) - { - idx2 = Integer.MAX_VALUE; - } - - return Integer.compare(idx1, idx2); - }); - - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java deleted file mode 100644 index 88e6a1496..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.deob.Deobfuscator; - -public class FieldInliner implements Deobfuscator -{ - - private ClassGroup group; - private Multimap fieldInstructions = HashMultimap.create(); - private List fields = new ArrayList<>(); - - private void findFieldIns() - { - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - Code code = m.getCode(); - - if (code == null) - continue; - - for (Instruction i : code.getInstructions().getInstructions()) - { - if (!(i instanceof FieldInstruction)) - continue; - - FieldInstruction sf = (FieldInstruction) i; - - if (sf.getMyField() == null) - continue; - - fieldInstructions.put(sf.getMyField(), sf); - } - } - } - } - - private void makeConstantValues() - { - for (ClassFile cf : group.getClasses()) - { - for (Field f : cf.getFields()) - { - if (!f.isStatic() || !f.getType().equals(Type.STRING)) - continue; - - Object constantValue = f.getValue(); - if (constantValue != null) - continue; - - List sfis = fieldInstructions.get(f).stream().filter(f2 -> f2 instanceof SetFieldInstruction).collect(Collectors.toList()); - if (sfis.size() != 1) - continue; - - SetFieldInstruction sfi = (SetFieldInstruction) sfis.get(0); - Instruction ins = (Instruction) sfi; - - Method mOfSet = ins.getInstructions().getCode().getMethod(); - if (!mOfSet.getName().equals("")) - continue; - - // get prev instruction and change to a constant value - Instructions instructions = mOfSet.getCode().getInstructions(); - int idx = instructions.getInstructions().indexOf(ins); - assert idx != -1; - - Instruction prev = instructions.getInstructions().get(idx - 1); - if (!(prev instanceof PushConstantInstruction)) - continue; - - PushConstantInstruction pci = (PushConstantInstruction) prev; - - constantValue = pci.getConstant(); - f.setValue(constantValue); - - fields.add(f); - - boolean b = instructions.getInstructions().remove(prev); - assert b; - b = instructions.getInstructions().remove(ins); - assert b; - } - } - } - - public int inlineUse() - { - int count = 0; - - for (Field f : fields) - { - // replace getfield with constant push - List fins = fieldInstructions.get(f).stream().filter(f2 -> f2 instanceof GetFieldInstruction).collect(Collectors.toList()); - Object value = f.getValue(); - - for (FieldInstruction fin : fins) - { - // remove fin, add push constant - Instruction i = (Instruction) fin; - - Instruction pushIns = new LDC(i.getInstructions(), value); - - List instructions = i.getInstructions().getInstructions(); - - int idx = instructions.indexOf(i); - assert idx != -1; - - i.getInstructions().remove(i); - instructions.add(idx, pushIns); - - ++count; - } - - f.getClassFile().removeField(f); - } - - return count; - } - - @Override - public void run(ClassGroup group) - { - this.group = group; - findFieldIns(); - makeConstantValues(); - int count = inlineUse(); - - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java deleted file mode 100644 index 63b865c58..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.attributes.code.instructions.AThrow; -import net.runelite.asm.attributes.code.instructions.Goto; -import net.runelite.asm.attributes.code.instructions.If; -import net.runelite.asm.attributes.code.instructions.New; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.deob.Deobfuscator; - -public class IllegalStateExceptions implements Deobfuscator -{ - private int count; - private Set interesting = new HashSet<>(); - private List toRemove = new ArrayList<>(); - - /* find if, new, ..., athrow, replace with goto */ - private void findInteresting(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - Code c = m.getCode(); - if (c == null) - continue; - - Instructions instructions = c.getInstructions(); - - List ilist = instructions.getInstructions(); - for (int i = 0; i < ilist.size(); ++i) - { - Instruction ins = ilist.get(i); - - if (!(ins instanceof ComparisonInstruction)) // the if - continue; - - Instruction ins2 = ilist.get(i + 1); - if (!(ins2 instanceof New)) - continue; - - New new2 = (New) ins2; - net.runelite.asm.pool.Class clazz = new2.getNewClass(); - if (!clazz.getName().contains("java/lang/IllegalStateException")) - continue; - - interesting.add(ins); - } - } - } - } - - private void visit(InstructionContext ic) - { - if (interesting.contains(ic.getInstruction())) - { - toRemove.add(ic); - } - } - - private void visit(MethodContext ctx) - { - for (InstructionContext ictx : toRemove) - processOne(ictx); - toRemove.clear(); - } - - private void processOne(InstructionContext ic) - { - Instruction ins = ic.getInstruction(); - Instructions instructions = ins.getInstructions(); - - if (instructions == null) - return; - - List ilist = instructions.getInstructions(); - - JumpingInstruction jumpIns = (JumpingInstruction) ins; - assert jumpIns.getJumps().size() == 1; - Instruction to = jumpIns.getJumps().get(0); - - // remove stack of if. - if (ins instanceof If) - { - ic.removeStack(1); - } - ic.removeStack(0); - - int i = ilist.indexOf(ins); - assert i != -1; - - // remove up to athrow - while (!(ins instanceof AThrow)) - { - instructions.remove(ins); - ins = ilist.get(i); // don't need to ++i because - } - - // remove athrow - instructions.remove(ins); - - // insert goto - assert ilist.contains(to); - Goto g = new Goto(instructions, instructions.createLabelFor(to)); - ilist.add(i, g); - - ++count; - } - - @Override - public void run(ClassGroup group) - { - findInteresting(group); - - Execution execution = new Execution(group); - execution.addExecutionVisitor(i -> visit(i)); - execution.addMethodContextVisitor(i -> visit(i)); - execution.populateInitialMethods(); - execution.run(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Lvt.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Lvt.java deleted file mode 100644 index 1ccc574d5..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Lvt.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.Deobfuscator; -import net.runelite.deob.deobfuscators.lvt.Mappings; - -/** - * This deobfuscator is only required for fernflower which has a difficult time - * when the same lvt index is used for variables of differing types (like object - * and int), see IDEABKL-7230. - * - * @author Adam - */ -public class Lvt implements Deobfuscator -{ - - private int count = 0; - - private void process(Method method) - { - Code code = method.getCode(); - if (code == null) - { - return; - } - - Mappings mappings = new Mappings(code.getMaxLocals()); - - for (Instruction ins : code.getInstructions().getInstructions()) - { - if (!(ins instanceof LVTInstruction)) - { - continue; - } - - LVTInstruction lv = (LVTInstruction) ins; - Integer newIdx = mappings.remap(lv.getVariableIndex(), lv.type()); - - if (newIdx == null) - { - continue; - } - - assert newIdx != lv.getVariableIndex(); - - Instruction newIns = lv.setVariableIndex(newIdx); - assert ins == newIns; - - ++count; - } - } - - @Override - public void run(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - process(m); - } - } - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Order.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Order.java deleted file mode 100644 index c1387cf39..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Order.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Annotated; -import net.runelite.asm.execution.Execution; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.Deobfuscator; - -/** - * Sort fields and methods based first on the name order of the classes, and - * then based on the order the executor encounters them. - * - * @author Adam - */ -public class Order implements Deobfuscator -{ - - private Execution execution; - - private final Map nameIndices = new HashMap<>(); - - @Override - public void run(ClassGroup group) - { - execution = new Execution(group); - execution.staticStep = true; - execution.populateInitialMethods(); - execution.run(); - - for (int i = 0; i < group.getClasses().size(); i++) - { - ClassFile cf = group.getClasses().get(i); - String className = DeobAnnotations.getObfuscatedName(cf); - nameIndices.put(className, i); - } - - int sortedMethods = 0, sortedFields = 0; - - for (ClassFile cf : group.getClasses()) - { - List m = cf.getMethods(); - m.sort(this::compare); - - sortedMethods += m.size(); - - // field order of enums is mostly handled in EnumDeobfuscator - if (!cf.isEnum()) - { - List f = cf.getFields(); - f.sort(this::compare); - - sortedFields += f.size(); - } - } - } - - // static fields, member fields, clinit, init, methods, static methods - private int compare(Annotated a, Annotated b) - { - int i1 = getType(a), i2 = getType(b); - - if (i1 != i2) - { - return Integer.compare(i1, i2); - } - - int nameIdx1 = getNameIdx(a); - int nameIdx2 = getNameIdx(b); - - if (nameIdx1 != nameIdx2) - { - return Integer.compare(nameIdx1, nameIdx2); - } - - return compareOrder(a, b); - } - - private int getNameIdx(Annotated annotations) - { - String name = DeobAnnotations.getObfuscatedName(annotations); - - Integer nameIdx = nameIndices.get(name); - - return nameIdx != null ? nameIdx : -1; - } - - private int getType(Annotated a) - { - if (a instanceof Method) - return getType((Method) a); - else if (a instanceof Field) - return getType((Field) a); - throw new RuntimeException("kys"); - } - - private int getType(Method m) - { - if (m.getName().equals("")) - { - return 1; - } - if (m.getName().equals("")) - { - return 2; - } - if (!m.isStatic()) - { - return 3; - } - return 4; - } - - private int getType(Field f) - { - if (f.isStatic()) - { - return 1; - } - return 2; - } - - private int compareOrder(Object o1, Object o2) - { - Integer i1, i2; - - i1 = execution.getOrder(o1); - i2 = execution.getOrder(o2); - - if (i1 == null) - { - i1 = Integer.MAX_VALUE; - } - if (i2 == null) - { - i2 = Integer.MAX_VALUE; - } - - if (!i1.equals(i2)) - { - return Integer.compare(i1, i2); - } - - // Fall back to number of accesses - i1 = execution.getAccesses(o1); - i2 = execution.getAccesses(o2); - - if (i1 == null) - { - i1 = Integer.MAX_VALUE; - } - if (i2 == null) - { - i2 = Integer.MAX_VALUE; - } - - return Integer.compare(i1, i2); - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/PacketHandlerOrder.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/PacketHandlerOrder.java deleted file mode 100644 index 3f1f55d0c..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/PacketHandlerOrder.java +++ /dev/null @@ -1,671 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators; - -import com.google.common.primitives.Ints; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.Goto; -import net.runelite.asm.attributes.code.instructions.If; -import net.runelite.asm.attributes.code.instructions.IfEq; -import net.runelite.asm.attributes.code.instructions.IfICmpEq; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.PutStatic; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Deobfuscator; -import net.runelite.deob.deobfuscators.transformers.buffer.BufferFinder; -import net.runelite.deob.deobfuscators.packethandler.PacketLengthFinder; -import net.runelite.deob.deobfuscators.packethandler.PacketRead; -import net.runelite.deob.deobfuscators.packethandler.PacketTypeFinder; -import static net.runelite.deob.deobfuscators.transformers.OpcodesTransformer.RUNELITE_OPCODES; -import net.runelite.deob.s2c.HandlerFinder; -import net.runelite.deob.s2c.PacketHandler; -import net.runelite.deob.s2c.PacketHandlers; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ACC_STATIC; - -public class PacketHandlerOrder implements Deobfuscator -{ - - private static final String RUNELITE_PACKET = "RUNELITE_PACKET"; - - private static final MessageDigest sha256; - - static - { - try - { - sha256 = MessageDigest.getInstance("SHA-256"); - } - catch (NoSuchAlgorithmException ex) - { - throw new RuntimeException(ex); - } - } - - @Override - public void run(ClassGroup group) - { - // This is run on the deobfuscated jar, so there are no symbols yet... - // Find packetType and buffer classes - PacketTypeFinder ptf = new PacketTypeFinder(group); - ptf.find(); - - BufferFinder bf = new BufferFinder(group); - bf.find(); - - HandlerFinder hf = new HandlerFinder(group, ptf.getPacketType()); - PacketHandlers handlers = hf.findHandlers(); - - for (PacketHandler handler : handlers.getHandlers()) - { - Execution e = hf.getExecution(); - e.reset(); - - e.staticStep = true; - e.step = false; - e.noInvoke = true; - // exception processing won't do non-local jumps, so - // depending on whether methods are inlined or not - // it may jump completely out of the handler into the - // catch all for all packet handling - // just disable exception execution - e.noExceptions = true; - - assert e.frames.isEmpty(); - - Frame f = handler.jumpFrame.dup(); - assert f.isExecuting(); - f.getMethodCtx().reset(); - - e.clearExecutionVisitor(); - e.addExecutionVisitor(ictx -> - { - if (ictx.getInstruction() instanceof MappableInstruction) - { - if (ictx.getInstruction().getType() != InstructionType.INVOKESTATIC) - { - if (!handler.mappable.contains(ictx.getInstruction())) - { - handler.mappable.add(ictx.getInstruction()); - } - } - } - if (ictx.getInstruction().getType() == InstructionType.INVOKEVIRTUAL) - { - InvokeInstruction ii = (InvokeInstruction) ictx.getInstruction(); - - // check if the invoke is on buffer/packetbuffer classes - boolean matches = ii.getMethods().stream() - .filter(m -> m.getDescriptor().size() == 0) - .map(Method::getClassFile) - .anyMatch(cf -> cf == bf.getBuffer() || cf == bf.getPacketBuffer()); - if (matches) - { - Method method = ii.getMethods().get(0); - Signature descriptor = method.getDescriptor(); - Type returnValue = descriptor.getReturnValue(); - - assert ictx.getPops().size() == 1; // buffer reference - InstructionContext bufferCtx = ictx.getPops().get(0).getPushed(); - if (bufferCtx.getInstruction().getType() != InstructionType.GETSTATIC) - { - return; // sometimes buffer is passed to a function and then invoked. - } - PacketRead packetRead = new PacketRead(returnValue, bufferCtx.getInstruction(), ictx); - - if (!handler.reads.contains(packetRead)) - { - handler.reads.add(packetRead); - } - } - } - - if (ictx.getInstruction().getType() == InstructionType.INVOKEVIRTUAL - || ictx.getInstruction().getType() == InstructionType.INVOKESPECIAL - || ictx.getInstruction().getType() == InstructionType.INVOKEINTERFACE) - { - InvokeInstruction ii = (InvokeInstruction) ictx.getInstruction(); - // read methods are scrambled so cant count them - if (!handler.hasPacketRead(ictx.getInstruction())) - { - handler.methodInvokes.addAll(ii.getMethods()); - } - } - if (ictx.getInstruction() instanceof SetFieldInstruction) - { - SetFieldInstruction sfi = (SetFieldInstruction) ictx.getInstruction(); - Field field = sfi.getMyField(); - if (field != null) - { - handler.fieldWrite.add(field); - } - } - if (ictx.getInstruction() instanceof GetFieldInstruction) - { - GetFieldInstruction gfi = (GetFieldInstruction) ictx.getInstruction(); - Field field = gfi.getMyField(); - if (field != null) - { - handler.fieldRead.add(field); - } - } - if (ictx.getInstruction() instanceof LVTInstruction) - { - LVTInstruction lvt = (LVTInstruction) ictx.getInstruction(); - if (!lvt.store()) - { - // get lvt access order - Frame frame = ictx.getFrame(); - int order = frame.getNextOrder(); - if (!handler.lvtOrder.containsKey(lvt.getVariableIndex())) - { - handler.lvtOrder.put(lvt.getVariableIndex(), order); - } - } - } - if (ictx.getInstruction() instanceof PushConstantInstruction) - { - PushConstantInstruction pci = (PushConstantInstruction) ictx.getInstruction(); - handler.constants.add(pci.getConstant()); - } - }); - - e.run(); - - handler.findReorderableReads(); - } - - List unsortedHandlers = new ArrayList<>(handlers.getHandlers()); - List sortedHandlers = new ArrayList<>(handlers.getHandlers()).stream() - .sorted((PacketHandler p1, PacketHandler p2) -> - { - int c = compareReads(p1.reads, p2.reads); - if (c != 0) - { - return c; - } - if (p1.methodInvokes.size() != p2.methodInvokes.size()) - { - return Integer.compare(p1.methodInvokes.size(), p2.methodInvokes.size()); - } - if (p1.fieldRead.size() != p2.fieldRead.size()) - { - return Integer.compare(p1.fieldRead.size(), p2.fieldRead.size()); - } - if (p1.fieldWrite.size() != p2.fieldWrite.size()) - { - return Integer.compare(p1.fieldWrite.size(), p2.fieldWrite.size()); - } - int i = Integer.compare(p1.mappable.size(), p2.mappable.size()); - if (i != 0) - { - return i; - } - - int s1 = hashConstants(p1.constants), s2 = hashConstants(p2.constants); - if (s1 != s2) - { - return Integer.compare(s1, s2); - } - - return 0; - }) - .map(PacketHandler::clone) - .collect(Collectors.toList()); - - assert sortedHandlers.size() == handlers.getHandlers().size(); - - for (PacketHandler handler : sortedHandlers) - { - handler.sortedReads = new ArrayList<>(handler.reads); - handler.sortedReads.sort((PacketRead p1, PacketRead p2) -> - { - LVTInstruction l1 = (LVTInstruction) p1.getStore(); - LVTInstruction l2 = (LVTInstruction) p2.getStore(); - - if (l1 == null && l2 == null) - { - return 0; - } - if (l1 == null) - { - return 1; - } - if (l2 == null) - { - return -1; - } - - if (l1.getVariableIndex() == l2.getVariableIndex()) - { - return 0; - } - - Integer i1 = handler.lvtOrder.get(l1.getVariableIndex()); - Integer i2 = handler.lvtOrder.get(l2.getVariableIndex()); - assert i1 != null; - assert i2 != null; - int i = Integer.compare(i1, i2); - - - return i; - }); - Collections.reverse(handler.sortedReads); - } - - ClassFile runeliteOpcodes = group.findClass(RUNELITE_OPCODES); - assert runeliteOpcodes != null : "Opcodes class must exist"; - - for (PacketHandler handler : sortedHandlers) - { - final String fieldName = "PACKET_SERVER_" + handler.getOpcode(); - - // Add opcode fields - if (runeliteOpcodes.findField(fieldName) == null) - { - Field opField = new Field(runeliteOpcodes, fieldName, Type.INT); - // ACC_FINAL causes javac to inline the fields, which prevents - // the mapper from doing field mapping - opField.setAccessFlags(ACC_PUBLIC | ACC_STATIC); - // setting a non-final static field value - // doesn't work with fernflower - opField.setValue(handler.getOpcode()); - runeliteOpcodes.addField(opField); - - // add initialization - Method clinit = runeliteOpcodes.findMethod(""); - assert clinit != null; - Instructions instructions = clinit.getCode().getInstructions(); - instructions.addInstruction(0, new LDC(instructions, handler.getOpcode())); - instructions.addInstruction(1, new PutStatic(instructions, opField)); - } - } - - // Find unique methods - List methods = unsortedHandlers.stream() - .map(PacketHandler::getMethod) - .distinct() - .collect(Collectors.toList()); - - for (Method m : methods) - { - List unsortedMethodHandlers = unsortedHandlers.stream() - .filter(ph -> ph.getMethod() == m) - .collect(Collectors.toList()); - - List sortedMethodHandlers = sortedHandlers.stream() - .filter(ph -> ph.getMethod() == m) - .collect(Collectors.toList()); - - assert unsortedMethodHandlers.size() == sortedMethodHandlers.size(); - - for (int i = 0; i < sortedMethodHandlers.size(); ++i) - { - PacketHandler unsorted = unsortedMethodHandlers.get(i); - PacketHandler sortedh = sortedMethodHandlers.get(i); - - // Set opcode/jump from sorted -> unsorted - If jump = (If) unsorted.getJump(); - PushConstantInstruction pci = (PushConstantInstruction) unsorted.getPush(); - - assert unsorted.getOpcode() == ((Number) pci.getConstant()).intValue(); - - Instructions instructions = unsorted.getMethod().getCode().getInstructions(); - - final String fieldName = "PACKET_SERVER_" + sortedh.getOpcode(); - - net.runelite.asm.pool.Field field = new net.runelite.asm.pool.Field( - new net.runelite.asm.pool.Class(RUNELITE_OPCODES), - fieldName, - Type.INT - ); - instructions.replace(unsorted.getPush(), new GetStatic(instructions, field)); - - assert jump.getType() == InstructionType.IF_ICMPEQ || jump.getType() == InstructionType.IF_ICMPNE; - - Label startLabel = instructions.createLabelFor(sortedh.getStart()); - - if (jump.getType() == InstructionType.IF_ICMPEQ) - { - instructions.replace(jump, new IfICmpEq(instructions, startLabel)); - } - else if (jump.getType() == InstructionType.IF_ICMPNE) - { - // insert a jump after to go to sortedh start - int idx = instructions.getInstructions().indexOf(jump); - assert idx != -1; - - instructions.addInstruction(idx + 1, new Goto(instructions, startLabel)); - } - else - { - throw new IllegalStateException(); - } - } - } - - insertSortedReads(group, sortedHandlers); - insertPacketLength(group, ptf); - } - - private void insertSortedReads(ClassGroup group, List handlers) - { - outer: - for (PacketHandler handler : handlers) - { - Method method = handler.getMethod(); - Instructions instructions = method.getCode().getInstructions(); - List ins = instructions.getInstructions(); - - Instruction afterRead = handler.getAfterRead(); - if (afterRead == null) - { - continue; - } - - for (PacketRead read : handler.reads) - { - if (read.getStore() == null) - { - continue outer; - } - } - - List follow = follow(instructions, handler.getStart(), afterRead); - - for (Instruction i : follow) - { - if (i instanceof ComparisonInstruction) - { - continue outer; - } - } - - Label afterReadLabel = instructions.createLabelFor(afterRead); - - int idx = ins.indexOf(handler.getStart()); - assert idx != -1; - - if (handler.getStart() instanceof Label) - { - ++idx; - } - - net.runelite.asm.pool.Field field = new net.runelite.asm.pool.Field( - new net.runelite.asm.pool.Class(findClient(group).getName()), - RUNELITE_PACKET, - Type.BOOLEAN - ); - - instructions.addInstruction(idx, new GetStatic(instructions, field)); - ++idx; - - instructions.addInstruction(idx, new IfEq(instructions, instructions.createLabelFor(ins.get(idx)))); - ++idx; - - List toCopy = new ArrayList<>(); - for (Instruction i : follow) - { - assert !(i instanceof JumpingInstruction); - if (i instanceof Label) - { - continue; - } - - toCopy.add(i); - } - - // Remove getstatic/invoke/store for packet reads - for (PacketRead read : handler.reads) - { - boolean b = toCopy.remove(read.getGetBuffer()); - assert b; - b = toCopy.remove(read.getInvoke()); - assert b; - b = toCopy.remove(read.getStore()); - assert b; - } - - // Add sorted reads - for (PacketRead read : handler.sortedReads) - { - toCopy.add(0, read.getGetBuffer()); - - // replace invoke instruction with typed read - InvokeInstruction ii = (InvokeInstruction) read.getInvoke(); - net.runelite.asm.pool.Method invokeMethod; - if (read.getType().equals(Type.BYTE)) - { - invokeMethod = new net.runelite.asm.pool.Method( - ii.getMethod().getClazz(), - "runeliteReadByte", - new Signature("()B") - ); - } - else if (read.getType().equals(Type.SHORT)) - { - invokeMethod = new net.runelite.asm.pool.Method( - ii.getMethod().getClazz(), - "runeliteReadShort", - new Signature("()S") - ); - } - else if (read.getType().equals(Type.INT)) - { - invokeMethod = new net.runelite.asm.pool.Method( - ii.getMethod().getClazz(), - "runeliteReadInt", - new Signature("()I") - ); - } - else if (read.getType().equals(Type.STRING)) - { - invokeMethod = new net.runelite.asm.pool.Method( - ii.getMethod().getClazz(), - "runeliteReadString", - new Signature("()Ljava/lang/String;") - ); - } - else - { - throw new UnsupportedOperationException("Unknown type " + read.getType()); - } - toCopy.add(1, new InvokeVirtual(instructions, invokeMethod)); - - toCopy.add(2, read.getStore()); - } - - for (Instruction i : toCopy) - { - instructions.addInstruction(idx++, i.clone()); - } - - instructions.addInstruction(idx, new Goto(instructions, afterReadLabel)); - ++idx; - } - } - - private int compareReads(List r1, List r2) - { - List t1 = r1.stream() - .map(PacketRead::getType) - .sorted(this::compareType) - .collect(Collectors.toList()); - List t2 = r2.stream() - .map(PacketRead::getType) - .sorted(this::compareType) - .collect(Collectors.toList()); - if (t1.size() != t2.size()) - { - return Integer.compare(t1.size(), t2.size()); - } - - for (int i = 0; i < t1.size(); ++i) - { - Type type1 = t1.get(i), type2 = t2.get(i); - - int cmp = compareType(type1, type2); - if (cmp != 0) - { - return cmp; - } - } - - return 0; - } - - private int compareType(Type t1, Type t2) - { - if (t1.getDimensions() != t2.getDimensions()) - { - return Integer.compare(t1.getDimensions(), t2.getDimensions()); - } - return t1.toString().compareTo(t2.toString()); - } - - public static int hashConstants(List constants) - { - sha256.reset(); - for (Object o : constants) - { - if (o instanceof Number) - { - sha256.update(((Number) o).byteValue()); - } - else if (o instanceof String) - { - String s = (String) o; - sha256.update(s.getBytes()); - } - } - byte[] b = sha256.digest(); - return Ints.fromByteArray(b); - } - - private void insertPacketLength(ClassGroup group, PacketTypeFinder ptf) - { - PacketLengthFinder pfl = new PacketLengthFinder(group, ptf); - pfl.find(); - - GetStatic getArray = pfl.getGetArray(); - PutStatic ps = pfl.getStore(); // instruction to store packet length - - Instructions instructions = ps.getInstructions(); - List ins = instructions.getInstructions(); - - Label getArrayLabel = instructions.createLabelFor(getArray); - Label storeLabel = instructions.createLabelFor(ps); - - int idx = ins.indexOf(getArray); - assert idx != -1; - - --idx; // to go before label, which must exist - - net.runelite.asm.pool.Field field = new net.runelite.asm.pool.Field( - new net.runelite.asm.pool.Class(findClient(group).getName()), - RUNELITE_PACKET, - Type.BOOLEAN - ); - - instructions.addInstruction(idx++, new GetStatic(instructions, field)); - instructions.addInstruction(idx++, new IfEq(instructions, getArrayLabel)); - instructions.addInstruction(idx++, new LDC(instructions, -2)); // 2 byte length - instructions.addInstruction(idx++, new Goto(instructions, storeLabel)); - } - - private ClassFile findClient(ClassGroup group) - { - // "client" in vainlla but "Client" in deob.. - ClassFile cf = group.findClass("client"); - return cf != null ? cf : group.findClass("Client"); - } - - private List follow(Instructions instructions, Instruction start, Instruction end) - { - List list = new ArrayList<>(); - - int idx = instructions.getInstructions().indexOf(start); - assert idx != -1; - - for (;;) - { - Instruction i = instructions.getInstructions().get(idx); - - // end is the following instruction post read.. not included - if (i == end) - { - break; - } - - if (i instanceof Goto) - { - Goto g = (Goto) i; - Label to = g.getTo(); - - idx = instructions.getInstructions().indexOf(to); - assert idx != -1; - continue; - } - - list.add(i); - - if (i instanceof ComparisonInstruction) - { - return list; - } - - ++idx; - } - - return list; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java deleted file mode 100644 index ad792c557..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.signature.util.VirtualMethods; -import net.runelite.deob.Deob; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.Deobfuscator; -import net.runelite.deob.util.NameMappings; - -public class RenameUnique implements Deobfuscator -{ - private void generateClassNames(NameMappings map, ClassGroup group) - { - int i = 0; - for (ClassFile cf : group.getClasses()) - if (cf.getName().length() <= Deob.OBFUSCATED_NAME_MAX_LEN) - map.map(cf.getPoolClass(), "class" + i++); - map.setClasses(i); - } - - private void generateFieldNames(NameMappings map, ClassGroup group) - { - int i = 0; - for (ClassFile cf : group.getClasses()) - for (Field field : cf.getFields()) - if (Deob.isObfuscated(field.getName()) && !field.getName().equals(DeobAnnotations.getExportedName(field))) - map.map(field.getPoolField(), "field" + i++); - map.setFields(i); - } - - private void generateMethodNames(NameMappings map, ClassGroup group) - { - int i = 0; - for (ClassFile cf : group.getClasses()) - for (Method method : cf.getMethods()) - { - if (!Deob.isObfuscated(method.getName()) || method.getName().equals(DeobAnnotations.getExportedName(method))) - continue; - - List virtualMethods = VirtualMethods.getVirtualMethods(method); - assert !virtualMethods.isEmpty(); - - String name; - if (virtualMethods.size() == 1) - name = "method" + i++; - else - name = "vmethod" + i++; - - for (Method m : virtualMethods) - map.map(m.getPoolMethod(), name); - } - map.setMethods(i); - } - - @Override - public void run(ClassGroup group) - { - group.buildClassGraph(); - group.lookup(); - - NameMappings mappings = new NameMappings(); - - this.generateClassNames(mappings, group); - this.generateFieldNames(mappings, group); - this.generateMethodNames(mappings, group); - - Renamer renamer = new Renamer(mappings); - renamer.run(group); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java deleted file mode 100644 index 5a97e4b4c..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java +++ /dev/null @@ -1,295 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import com.google.common.base.Strings; -import java.util.List; - -import meteor.Logger; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Interfaces; -import net.runelite.asm.Method; -import net.runelite.asm.Named; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Annotated; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Exceptions; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.LocalVariable; -import net.runelite.asm.attributes.code.Parameter; -import net.runelite.asm.signature.Signature; -import net.runelite.asm.signature.util.VirtualMethods; -import net.runelite.deob.DeobAnnotations; -import static net.runelite.deob.DeobAnnotations.*; -import net.runelite.deob.Deobfuscator; -import net.runelite.deob.util.NameMappings; - -public class Renamer implements Deobfuscator -{ - private static final Logger logger = new Logger("deob"); - - private final NameMappings mappings; - - public Renamer(NameMappings mappings) - { - this.mappings = mappings; - } - - private void renameClass(ClassFile on, ClassFile old, String name) - { - if (on.getParentClass().getName().equals(old.getName())) - { - on.setParentClass(new net.runelite.asm.pool.Class(name)); - } - - Interfaces interfaces = on.getInterfaces(); - List interfaceList = interfaces.getInterfaces(); - for (net.runelite.asm.pool.Class inter : interfaceList) - { - if (inter.getName().equals(old.getName())) - { - int idx = interfaceList.indexOf(inter); - interfaceList.remove(idx); - interfaceList.add(idx, new net.runelite.asm.pool.Class(name)); - break; - } - } - } - - private void renameClass(ClassGroup group, ClassFile cf, String name) - { - for (ClassFile c : group.getClasses()) - { - // rename on child interfaces and classes - renameClass(c, cf, name); - - for (Method method : c.getMethods()) - { - // rename on instructions. this includes method calls and field accesses. - if (method.getCode() != null) - { - Code code = method.getCode(); - - // rename on instructions - for (Instruction i : code.getInstructions().getInstructions()) - { - i.renameClass(cf.getName(), name); - } - - // rename on exception handlers - Exceptions exceptions = code.getExceptions(); - exceptions.renameClass(cf, name); - } - - // rename on parameters - Signature.Builder builder = new Signature.Builder(); - Signature descriptor = method.getDescriptor(); - for (int i = 0; i < descriptor.size(); ++i) - { - Type type = descriptor.getTypeOfArg(i); - - if (type.getInternalName().equals(cf.getName())) - { - builder.addArgument(Type.getType("L" + name + ";", type.getDimensions())); - } - else - { - builder.addArgument(type); - } - } - - // rename return type - if (descriptor.getReturnValue().getInternalName().equals(cf.getName())) - { - builder.setReturnType(Type.getType("L" + name + ";", descriptor.getReturnValue().getDimensions())); - } - else - { - builder.setReturnType(descriptor.getReturnValue()); - } - - Signature newdescriptor = builder.build(); - - if (!method.getDescriptor().equals(newdescriptor)) - { - if (method.findAnnotation(OBFUSCATED_SIGNATURE) == null) - { - method.findAnnotation(OBFUSCATED_SIGNATURE, true).setElement("descriptor", method.getDescriptor().toString()); - } - } - - method.setDescriptor(newdescriptor); - - // rename on exceptions thrown - if (method.getExceptions() != null) - { - method.getExceptions().renameClass(cf, name); - } - } - - // rename on fields - for (Field field : c.getFields()) - { - if (field.getType().getInternalName().equals(cf.getName())) - { - if (field.findAnnotation(OBFUSCATED_SIGNATURE) == null) - { - field.findAnnotation(OBFUSCATED_SIGNATURE, true).setElement("descriptor", field.getType().toString()); - } - field.setType(Type.getType("L" + name + ";", field.getType().getDimensions())); - } - } - } - - addObfuscatedName(cf); - - group.renameClass(cf, name); - } - - private void regeneratePool(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - if (m.getCode() != null) - { - m.getCode().getInstructions() - .regeneratePool(); - } - } - } - } - - @Override - public void run(ClassGroup group) - { - group.buildClassGraph(); - group.lookup(); - - int classes = 0, fields = 0, methods = 0, parameters = 0; - - // rename fields - for (ClassFile cf : group.getClasses()) - { - for (Field field : cf.getFields()) - { - String newName = mappings.get(field.getPoolField()); - if (newName == null) - { - continue; - } - - addObfuscatedName(field); - - assert DeobAnnotations.getExportedName(field) == null || newName.equals(DeobAnnotations.getExportedName(field)) : "Tried changing field name to something other than the exported name!"; - - field.setName(newName); - ++fields; - } - } - - // rename methods - for (ClassFile cf : group.getClasses()) - { - for (Method method : cf.getMethods()) - { - String newName = mappings.get(method.getPoolMethod()); - String[] newParams = mappings.getP(method.getPoolMethod()); - - if (newName == null) - { - continue; - } - - List virtualMethods = VirtualMethods.getVirtualMethods(method); - assert !virtualMethods.isEmpty(); - - for (Method m : virtualMethods) - { - List oldParams = method.getParameters(); - for (Parameter p : oldParams) - { - int index = oldParams.indexOf(p); - if (newParams == null) - { - break; - } - else if (newParams.length < 1 || index > newParams.length - 1 || Strings.isNullOrEmpty(newParams[index])) - { - break; - } - - LocalVariable oldVar = p.getLocalVariable(); - LocalVariable newVar = new LocalVariable( - newParams[index], - oldVar.getDesc(), - oldVar.getSignature(), - oldVar.getStart(), - oldVar.getEnd(), - oldVar.getIndex() - ); - - p.setLocalVariable(newVar); - - ++parameters; - } - - addObfuscatedName(m); - - m.setName(newName); - } - - methods += virtualMethods.size(); - } - } - - for (ClassFile cf : group.getClasses()) - { - String newName = mappings.get(cf.getPoolClass()); - if (newName == null) - { - continue; - } - - renameClass(group, cf, newName); - ++classes; - } - - this.regeneratePool(group); - - logger.info("Renamed {} classes, {} fields, {} methods, and {} parameters", classes, fields, methods, parameters); - } - - private static void addObfuscatedName(T object) - { - if (object.findAnnotation(OBFUSCATED_NAME) == null) - { - object.findAnnotation(OBFUSCATED_NAME, true).setElement(object.getName()); - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java deleted file mode 100644 index 22d3cf2d9..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import java.util.ArrayList; - -import meteor.Logger; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.deob.Deobfuscator; - -public class RuntimeExceptions implements Deobfuscator -{ - private static final Logger logger = new Logger("deob"); - @Override - public void run(ClassGroup group) - { - boolean foundInit = false; - - int i = 0; - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - Code c = m.getCode(); - if (c == null) - continue; - - // Keep one handler in the client so the deobfuscator - // keeps the client error handling related methods - if (cf.getName().equals("client") && m.getName().equals("init")) - { - foundInit = true; - continue; - } - - for (net.runelite.asm.attributes.code.Exception e : new ArrayList<>(c.getExceptions().getExceptions())) - { - if (e.getCatchType() != null && e.getCatchType().getName().equals("java/lang/RuntimeException")) - { - c.getExceptions().remove(e); - ++i; - } - } - } - } - - if (!foundInit) - { - throw new IllegalStateException("client.init(...) method seems to be missing!"); - } - - logger.info("Remove {} exception handlers", i); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java deleted file mode 100644 index 5b3969181..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import java.util.ArrayList; -import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.execution.Execution; -import net.runelite.deob.Deobfuscator; - -public class UnreachedCode implements Deobfuscator -{ - private Execution execution; - - private int removeUnused(Method m) - { - Instructions ins = m.getCode().getInstructions(); - - int count = 0; - List insCopy = new ArrayList<>(ins.getInstructions()); - - for (int j = 0; j < insCopy.size(); ++j) - { - Instruction i = insCopy.get(j); - - if (!execution.executed.contains(i)) - { - // if this is an exception handler, the exception handler is never used... - for (net.runelite.asm.attributes.code.Exception e : new ArrayList<>(m.getCode().getExceptions().getExceptions())) - { - if (e.getStart().next() == i) - { - e.setStart(ins.createLabelFor(insCopy.get(j + 1))); - - if (e.getStart().next() == e.getEnd().next()) - { - m.getCode().getExceptions().remove(e); - continue; - } - } - if (e.getHandler().next() == i) - { - m.getCode().getExceptions().remove(e); - } - } - - if (i instanceof Label) - continue; - - ins.remove(i); - ++count; - } - } - return count; - } - - @Override - public void run(ClassGroup group) - { - group.buildClassGraph(); - - execution = new Execution(group); - execution.populateInitialMethods(); - execution.run(); - - int count = 0; - - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - if (m.getCode() == null) - continue; - - count += removeUnused(m); - } - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java deleted file mode 100644 index f6c28b451..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import java.util.ArrayList; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.deob.Deobfuscator; - -public class UnusedClass implements Deobfuscator -{ - @Override - public void run(ClassGroup group) - { - int count = 0; - for (ClassFile cf : new ArrayList<>(group.getClasses())) - { - if (!cf.getFields().isEmpty()) - { - continue; - } - - if (!cf.getMethods().isEmpty()) - { - continue; - } - - if (isImplemented(group, cf)) - { - continue; - } - - group.removeClass(cf); - ++count; - } - } - - private boolean isImplemented(ClassGroup group, ClassFile iface) - { - for (ClassFile cf : group.getClasses()) - { - if (cf.getInterfaces().getMyInterfaces().contains(iface)) - { - return true; - } - } - return false; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java deleted file mode 100644 index ae972f6d2..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; -import net.runelite.deob.Deobfuscator; - -public class UnusedFields implements Deobfuscator -{ - private final Set used = new HashSet<>(); - - private void checkForFieldUsage(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - for (Method m : cf.getMethods()) - { - Code code = m.getCode(); - if (code == null) - continue; - - for (Instruction ins : code.getInstructions().getInstructions()) - { - if (ins instanceof FieldInstruction) - { - FieldInstruction fi = (FieldInstruction) ins; - - used.add(fi.getMyField()); - } - } - } - } - - @Override - public void run(ClassGroup group) - { - checkForFieldUsage(group); - - int count = 0; - for (ClassFile cf : group.getClasses()) - for (Field f : new ArrayList<>(cf.getFields())) - if (!used.contains(f)) - { - cf.removeField(f); - ++count; - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java deleted file mode 100644 index b7e093d0a..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.deob.Deob; -import net.runelite.deob.Deobfuscator; - -public class UnusedMethods implements Deobfuscator -{ - - private final Set methods = new HashSet<>(); - - @Override - public void run(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - for (Method method : cf.getMethods()) - { - run(method); - } - } - - int count = 0; - for (ClassFile cf : group.getClasses()) - { - boolean extendsApplet = extendsApplet(cf); - - for (Method method : new ArrayList<>(cf.getMethods())) - { - // constructors can't be renamed, but are obfuscated - if (!Deob.isObfuscated(method.getName()) && !method.getName().equals("")) - { - continue; - } - - if (extendsApplet && method.getName().equals("")) - { - continue; - } - - if (!methods.contains(method)) - { - - cf.removeMethod(method); - ++count; - } - } - } - - } - - private void run(Method method) - { - Code code = method.getCode(); - - if (code == null) - { - return; - } - - for (Instruction i : code.getInstructions().getInstructions()) - { - if (!(i instanceof InvokeInstruction)) - { - continue; - } - - InvokeInstruction ii = (InvokeInstruction) i; - - methods.addAll(ii.getMethods()); - } - } - - private static boolean extendsApplet(ClassFile cf) - { - if (cf.getParent() != null) - { - return extendsApplet(cf.getParent()); - } - return cf.getSuperName().equals("java/applet/Applet"); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java deleted file mode 100644 index fb741310f..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java +++ /dev/null @@ -1,301 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.signature.Signature; -import net.runelite.asm.signature.util.VirtualMethods; -import net.runelite.deob.Deob; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.Deobfuscator; -public class UnusedParameters implements Deobfuscator -{ - private final Map, Collection> unused = new HashMap<>(); - private final Multimap invokes = HashMultimap.create(); - - private void visit(InstructionContext ictx) - { - Instruction i = ictx.getInstruction(); - - if (!(i instanceof InvokeInstruction)) - { - return; - } - - invokes.put(i, ictx); - } - - private void buildUnused(ClassGroup group) - { - unused.clear(); - - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - if (!Deob.isObfuscated(m.getName())) - { - continue; - } - - List ms = VirtualMethods.getVirtualMethods(m); - Collection u = this.findUnusedParameters(ms); - if (!u.isEmpty()) - { - unused.put(ms, u); - } - } - } - } - - private boolean shouldRemove(Method m, int parameter) - { - final var a = m.findAnnotation(DeobAnnotations.OBFUSCATED_SIGNATURE); - if (a == null) - return false; - final var str = a.get("descriptor"); - - return parameter + 1 == new Signature((String) str).size(); - } - - private int processUnused(Execution execution, ClassGroup group) - { - int count = 0; - - for (Map.Entry, Collection> entry : unused.entrySet()) - { - List m = entry.getKey(); - Collection u = entry.getValue(); - - int offset = m.size() == 1 && m.get(0).isStatic() ? 0 : 1; - - for (int unusedParameter : u) - { - if (!shouldRemove(m.get(0), unusedParameter)) - { - continue; - } - - Signature descriptor = m.get(0).getDescriptor(); - int lvtIndex = this.getLvtIndex(descriptor, offset, unusedParameter); - /* removing the parameter can't cause collisions on other (overloaded) methods because prior to this we rename - * all classes/fields/methods to have unique names. - */ - removeParameter(group, m, descriptor, execution, unusedParameter, lvtIndex); - break; - } - - ++count; - } - - return count; - } - - private Set findUnusedParameters(Method method) - { - int offset = method.isStatic() ? 0 : 1; - Signature descriptor = method.getDescriptor(); - List unusedParams = new ArrayList<>(); - - for (int variableIndex = 0, lvtIndex = offset; - variableIndex < descriptor.size(); - lvtIndex += descriptor.getTypeOfArg(variableIndex++).getSize()) - { - List lv = method.findLVTInstructionsForVariable(lvtIndex); - if (lv == null || lv.isEmpty()) - { - unusedParams.add(variableIndex); - } - } - - return ImmutableSet.copyOf(unusedParams); - } - - @SuppressWarnings("empty-statement") - private int getLvtIndex(Signature signature, int offset, int parameter) - { - // get lvt index for parameter - int lvtIndex = offset; - for (int variableIndex = 0; - variableIndex < parameter; - lvtIndex += signature.getTypeOfArg(variableIndex++).getSize()); - return lvtIndex; - } - - public Collection findUnusedParameters(Collection methods) - { - Set list = null; - - for (Method m : methods) - { - Set p = findUnusedParameters(m); - - if (list == null) - { - list = p; - } - else - { - list = Sets.intersection(list, p); - } - } - - List l = new ArrayList<>(list != null ? list : new ArrayList<>()); // i know - Collections.sort(l); - Collections.reverse(l); - return l; - } - - public void removeParameter(ClassGroup group, List methods, Signature signature, Execution execution, int paramIndex, int lvtIndex) - { - int slots = signature.getTypeOfArg(paramIndex).getSize(); - - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - Code c = m.getCode(); - - if (c == null) - { - continue; - } - - for (Instruction i : new ArrayList<>(c.getInstructions().getInstructions())) - { - if (!(i instanceof InvokeInstruction)) - { - continue; - } - - InvokeInstruction ii = (InvokeInstruction) i; - - if (ii.getMethods().stream().noneMatch(methods::contains)) - { - continue; - } - - ii.removeParameter(paramIndex); // remove parameter from instruction - - Collection ics = invokes.get(i); - assert ics != null; - for (InstructionContext ins : ics) - { - int pops = signature.size() - paramIndex - 1; // index from top of stack of parameter. 0 is the last parameter - - StackContext sctx = ins.getPops().get(pops); - if (sctx.getPushed().getInstruction().getInstructions() == null) - { - continue; - } - - ins.removeStack(pops); // remove parameter from stack - } - } - } - } - - for (Method method : methods) - { - if (method.getCode() != null) - // adjust lvt indexes to get rid of idx in the method - { - for (Instruction ins : method.getCode().getInstructions().getInstructions()) - { - if (ins instanceof LVTInstruction) - { - LVTInstruction lins = (LVTInstruction) ins; - - int i = lins.getVariableIndex(); - assert i != lvtIndex; // current unused variable detection just looks for no accesses - - // reassign - if (i > lvtIndex) - { - assert i > 0; - assert i >= lvtIndex + slots; - - Instruction newIns = lins.setVariableIndex(i - slots); - assert ins == newIns; - } - } - } - } - } - - for (Method method : methods) - { - method.getDescriptor().remove(paramIndex); - } - } - - private int count; - - @Override - public void run(ClassGroup group) - { - int i; - - group.buildClassGraph(); - - invokes.clear(); - this.buildUnused(group); - - Execution execution = new Execution(group); - execution.addExecutionVisitor(this::visit); - execution.populateInitialMethods(); - execution.run(); - - i = this.processUnused(execution, group); - - count += i; - - } - - public int getCount() - { - return count; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/AssociatedConstant.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/AssociatedConstant.java deleted file mode 100644 index 8ff20b435..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/AssociatedConstant.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.arithmetic; - -// a constant associated to a field -class AssociatedConstant -{ - Number value; - boolean other; // whether or not another field is involved - boolean constant; // whether or not the constant is a constant field assignment - boolean getter; // whether or not this is associated as a getter - boolean setter; // whether or not this is associated as a setter -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DupDeobfuscator.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DupDeobfuscator.java deleted file mode 100644 index 7a9cc6b08..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DupDeobfuscator.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.arithmetic; - -import com.google.common.collect.Lists; -import java.util.List; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.attributes.code.instructions.Dup; -import net.runelite.asm.attributes.code.instructions.Dup2_X1; -import net.runelite.asm.attributes.code.instructions.Dup_X1; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.LMul; -import net.runelite.asm.attributes.code.instructions.Pop; -import net.runelite.asm.attributes.code.instructions.Pop2; -import net.runelite.asm.attributes.code.instructions.Swap; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.Deobfuscator; - -/** - * Removes the duplication of multiplication instructions to make - * MultiplicationDeobfuscator easier - * - * @author Adam - */ -public class DupDeobfuscator implements Deobfuscator -{ - - private int count; - - private void visit(InstructionContext i) - { - if (!(i.getInstruction() instanceof DupInstruction)) - { - return; - } - - DupInstruction di = (DupInstruction) i.getInstruction(); - - List sctxs = di.getDuplicated(i); // stack values being duplicated - - for (StackContext sctx : sctxs) - { - InstructionContext ic = sctx.getPushed(); - - if (ic.getInstruction() instanceof IMul) - { - if (i.getInstruction() instanceof Dup) - { - - undup(i); - ++count; - return; - } - if (i.getInstruction() instanceof Dup_X1) - { - - undup_x1(i); - ++count; - return; - } - - } - else if (ic.getInstruction() instanceof LMul) - { - if (i.getInstruction() instanceof Dup2_X1) - { - - undup2_x1(i); - ++count; - return; - } - - } - } - - // find if mul pops anything duplicated - sctxs = di.getCopies(i); - - for (StackContext sctx : sctxs) - { - for (InstructionContext ic : sctx.getPopped()) - { - if (ic.getInstruction() instanceof IMul) - { - if (i.getInstruction() instanceof Dup) - { - - undup(i); - ++count; - return; - } - if (i.getInstruction() instanceof Dup_X1) - { - - undup_x1(i); - ++count; - return; - } - - } - else if (ic.getInstruction() instanceof LMul) - { - if (i.getInstruction() instanceof Dup2_X1) - { - - undup2_x1(i); - ++count; - return; - } - - } - } - } - } - - private void undup(InstructionContext ictx) - { - assert ictx.getInstruction() instanceof Dup; - - Instructions instructions = ictx.getInstruction().getInstructions(); - - StackContext duplicated = ictx.getPops().get(0); - - int idx = instructions.getInstructions().indexOf(ictx.getInstruction()); - assert idx != -1; - - // replace dup with duplicated instructions - instructions.remove(ictx.getInstruction()); - - // insert copy - copy(duplicated, instructions, idx); - } - - private void undup_x1(InstructionContext ictx) - { - assert ictx.getInstruction() instanceof Dup_X1; - - Instructions instructions = ictx.getInstruction().getInstructions(); - - StackContext duplicated = ictx.getPops().get(0); - - // replace dup_x1 with swap - int idx = instructions.replace(ictx.getInstruction(), new Swap(instructions)); - - // copy imul and insert after idx - copy(duplicated, instructions, idx + 1); - } - - private void undup2_x1(InstructionContext ictx) - { - assert ictx.getInstruction() instanceof Dup2_X1; - assert ictx.getPops().size() == 2; // only support this form - - // I L -> L I L - - Instructions instructions = ictx.getInstruction().getInstructions(); - - // can't swap a long on the stack, so - - int idx = instructions.getInstructions().indexOf(ictx.getInstruction()); - assert idx != -1; - - instructions.remove(ictx.getInstruction()); // remove dup2_x1 - instructions.addInstruction(idx++, new Pop2(instructions)); // pop long - instructions.addInstruction(idx++, new Pop(instructions)); // pop int - - // insert copy of long - idx = copy(ictx.getPops().get(0), instructions, idx); - // insert copy of int - idx = copy(ictx.getPops().get(1), instructions, idx); - // insert copy of long - /* idx = */ copy(ictx.getPops().get(0), instructions, idx); - } - - /** - * copy the instruction which pushed sctx and insert into instructions - * starting at index idx - */ - private int copy(StackContext sctx, Instructions instructions, int idx) - { - InstructionContext ictx = sctx.getPushed(); - - if (ictx.getInstruction() instanceof DupInstruction) - { - // we only care about one path - DupInstruction di = (DupInstruction) ictx.getInstruction(); - sctx = di.getOriginal(sctx); - ictx = sctx.getPushed(); - } - - // copy required instructions - // the first thing popped was pushed last, so reverse - for (StackContext s : Lists.reverse(ictx.getPops())) - { - idx = copy(s, instructions, idx); - } - - // copy instruction - Instruction i = ictx.getInstruction(); - - i = i.clone(); - - instructions.addInstruction(idx, i); - return idx + 1; // move on to next instruction - } - - private void visit(MethodContext mctx) - { - for (InstructionContext ictx : mctx.getInstructionContexts()) - { - if (ictx.getInstruction().getInstructions() == null) - { - // already removed? - continue; - } - - visit(ictx); - } - } - - @Override - public void run(ClassGroup group) - { - Execution e = new Execution(group); - e.addMethodContextVisitor(m -> visit(m)); - e.populateInitialMethods(); - e.run(); - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java deleted file mode 100644 index ca7a47c33..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.arithmetic; - -import java.util.HashMap; -import java.util.Map; -import net.runelite.asm.pool.Field; - -class Encryption -{ - private final Map fields = new HashMap<>(); - - void addPair(Pair pair) - { - assert pair.field != null; - - Pair existing = fields.get(pair.field); - if (existing != null) - { - // if this is a subsequent guess, then the new guess - // is multiplied into the old guess - fields.put(pair.field, new Pair(pair, existing)); - } - else - { - fields.put(pair.field, pair); - } - } - - Pair getField(Field field) - { - return fields.get(field); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/FieldInfo.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/FieldInfo.java deleted file mode 100644 index 7f7f33db7..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/FieldInfo.java +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.arithmetic; - -import static java.lang.Math.abs; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import static net.runelite.deob.deobfuscators.arithmetic.DMath.multiply; - -class FieldInfo -{ - public final Set getters = new HashSet<>(); - public final Set setters = new HashSet<>(); - public final Set constants = new HashSet<>(); - - boolean guessDecreasesConstants(Pair guess) - { - if (getters.isEmpty() && setters.isEmpty()) - { - return false; - } - - if (guess.getter.longValue() == -1 && guess.setter.longValue() == -1) - { - // special case - when guess is -1/-1, checking the abs(total) - // is not helpful. instead look for both: - // associated non-constant of value -1 - // no non-constant non-other values (indicative of field being - // obfuscated still since if it used elsewhere it would have - // an associated constant) - // - // this is really only her to fight: - // client.java: field975 = field974; - // client.java: field974 = field971; - // when field974 is only used in combination with field975 - // and is initialized to -1. This causes causes guess() - // to guess a negated getter which then causes - // client.java: field975 = field974 * -1; - // client.java: field974 = field971 * -1; - // And it becomes difficult to prevent both fields being - // multiplied by -1 on each round. field975 has some other - // uses. - - // only change if there is a -1 in the non constant - // and also there is a non constant non other too - List value2 = constants.stream() - .filter(i -> !i.constant) - .map(i -> i.value) - .collect(Collectors.toList()); - - List value = constants.stream() - .filter(i -> !i.other) - .filter(i -> !i.constant) - .map(i -> i.value) - .collect(Collectors.toList()); - return value.isEmpty() && value2.contains(-1); - } - - // remove possibe getters that are: - // - a constant - they don't necessarilly decrease when deobfuscated - // - are multiplied into another field - // - are both a getter and setter - Collection gettersFiltered = getters.stream() - .filter(number -> isOkay(number)) - .collect(Collectors.toSet()); - - Collection settersFiltered = setters.stream() - .filter(number -> isOkay(number)) - .collect(Collectors.toSet()); - - if (!gettersFiltered.isEmpty()) - { - long before = gettersFiltered.stream() - .mapToLong(number -> abs(downsample(number).longValue())) - .sum(); - long after = gettersFiltered.stream() - .mapToLong(number -> abs(downsample(multiply(number, guess.setter)).longValue())) - .sum(); - - assert before >= 0; - assert after >= 0; - - // If the total value of the getters is more, assume - // the guess is bad. Ideally the values go to 1, so - // 'after' will be small. - if (after > before) - { - return false; - } - } - - if (!settersFiltered.isEmpty()) - { - long beforeSetter = settersFiltered.stream() - .mapToLong(number -> abs(downsample(number).longValue())) - .sum(); - - long afterSetter = settersFiltered.stream() - .mapToLong(number -> abs(downsample(multiply(number, guess.getter)).longValue())) - .sum(); - - assert beforeSetter >= 0; - assert afterSetter >= 0; - - if (afterSetter > beforeSetter) - { - return false; - } - } - - return true; - } - - private boolean isOkay(Number number) - { - for (AssociatedConstant c : constants) - { - if (c.value.equals(number) - && !c.constant - && !c.other - && !(c.setter && c.getter)) - { - return true; - } - } - return false; - } - - // summation of longs probably overflows, - // so only use the most significant 32 bits - private Number downsample(Number number) - { - if (number instanceof Long) - { - long l = (Long) number; - return l >>> 32; - } - return number; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java deleted file mode 100644 index bd6c694d3..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java +++ /dev/null @@ -1,795 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.arithmetic; - -import com.google.common.collect.ImmutableSet; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import meteor.Logger; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; -import net.runelite.asm.attributes.code.instruction.types.ArrayStoreInstruction; -import net.runelite.asm.attributes.code.instruction.types.DivisionInstruction; -import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.attributes.code.instructions.IAdd; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.IShR; -import net.runelite.asm.attributes.code.instructions.ISub; -import net.runelite.asm.attributes.code.instructions.If; -import net.runelite.asm.attributes.code.instructions.If0; -import net.runelite.asm.attributes.code.instructions.LAdd; -import net.runelite.asm.attributes.code.instructions.LCmp; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.LMul; -import net.runelite.asm.attributes.code.instructions.LSub; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.Deobfuscator; -import static net.runelite.deob.deobfuscators.arithmetic.DMath.modInverse; -import static net.runelite.deob.deobfuscators.arithmetic.DMath.multiply; - -public class ModArith implements Deobfuscator -{ - private static final Logger logger = new Logger("deob"); - - private ClassGroup group; - private Execution execution; - private final Map fieldInfo = new HashMap<>(); - private List pairs = new ArrayList<>(); - private Encryption encryption = new Encryption(); - - private FieldInfo getFieldInfo(Field field) - { - FieldInfo f = fieldInfo.get(field); - if (f == null) - { - f = new FieldInfo(); - fieldInfo.put(field, f); - } - return f; - } - - private static List getInsInExpr(InstructionContext ctx, Set set, boolean imul) - { - List l = new ArrayList<>(); - - if (ctx == null || set.contains(ctx.getInstruction())) - { - return l; - } - - set.add(ctx.getInstruction()); - - if (imul) - { - if (!(ctx.getInstruction() instanceof IMul) & !(ctx.getInstruction() instanceof LMul)) - { - l.add(ctx); - return l; - } - } - else - { - // invoke and array store pops are unrelated to each other - if (ctx.getInstruction() instanceof InvokeInstruction - || ctx.getInstruction() instanceof ArrayStoreInstruction - || ctx.getInstruction() instanceof ArrayLoad - || ctx.getInstruction() instanceof If - || ctx.getInstruction() instanceof If0 - || ctx.getInstruction() instanceof LCmp - || ctx.getInstruction() instanceof DivisionInstruction - || ctx.getInstruction() instanceof IShR) - { - return l; - } - - l.add(ctx); - } - - for (StackContext s : ctx.getPops()) - { - l.addAll(getInsInExpr(s.getPushed(), set, imul)); - } - for (StackContext s : ctx.getPushes()) - { - for (InstructionContext i : s.getPopped()) - { - l.addAll(getInsInExpr(i, set, imul)); - } - } - - return l; - } - - // find associated constants with each field - private void findConstants(MethodContext mctx) - { - for (InstructionContext ctx : mctx.getInstructionContexts()) - { - if (ctx.getInstruction() instanceof FieldInstruction) - { - FieldInstruction fi = (FieldInstruction) ctx.getInstruction(); - - if (fi.getMyField() == null) - { - continue; - } - - if ((!fi.getField().getType().equals(Type.INT) - && !fi.getField().getType().equals(Type.LONG)) - || fi.getField().getType().isArray()) - { - continue; - } - - FieldInfo fieldInfo = getFieldInfo(fi.getMyField()); - - @SuppressWarnings("unchecked") List l = getInsInExpr(ctx, new HashSet(), false); - boolean other = false; // check if this contains another field - boolean getter = false, setter = false; - for (InstructionContext i : l) - { - if (i.getInstruction() instanceof FieldInstruction) - { - FieldInstruction fi2 = (FieldInstruction) i.getInstruction(); - Field myField = fi2.getMyField(); - - if (myField != null && myField != fi.getMyField()) - { - Type t = myField.getType(); - if (t.equals(fi.getMyField().getType())) - { - other = true; - } - } - - else if (myField != null && myField == fi.getMyField()) - { - if (fi2 instanceof SetFieldInstruction) - { - setter = true; - } - else - { - getter = true; - } - } - } - } - - // check if this is a constant assignment - boolean constant = false; - if (fi instanceof SetFieldInstruction) - { - InstructionContext pushedsfi = ctx.getPops().get(0).getPushed(); // value being set - pushedsfi = pushedsfi.resolve(ctx.getPops().get(0)); - - if (pushedsfi.getInstruction() instanceof LDC) - { - constant = true; - } - } - - for (InstructionContext i : l) - { - if (i.getInstruction() instanceof LDC) - { - PushConstantInstruction w = (PushConstantInstruction) i.getInstruction(); - if (w.getConstant() instanceof Integer || w.getConstant() instanceof Long) - { - AssociatedConstant n = new AssociatedConstant(); - n.value = (Number) w.getConstant(); - n.other = other; - n.constant = constant; - n.getter = getter; - n.setter = setter; - fieldInfo.constants.add(n); - } - } - } - } - } - } - - // find potential getters/setters for each field - private void findUses(MethodContext mctx) - { - for (InstructionContext ctx : mctx.getInstructionContexts()) - { - if (ctx.getInstruction() instanceof IMul || ctx.getInstruction() instanceof LMul) - { - Instruction one = ctx.getPops().get(0).getPushed().getInstruction(); - Instruction two = ctx.getPops().get(1).getPushed().getInstruction(); - - PushConstantInstruction pc = null; - GetFieldInstruction gf = null; - if (one instanceof PushConstantInstruction && two instanceof GetFieldInstruction) - { - pc = (PushConstantInstruction) one; - gf = (GetFieldInstruction) two; - } - else if (two instanceof PushConstantInstruction && one instanceof GetFieldInstruction) - { - pc = (PushConstantInstruction) two; - gf = (GetFieldInstruction) one; - } - - if (pc == null) - { - continue; - } - - Field field = gf.getMyField(); - if (field == null) - { - continue; - } - - FieldInfo fieldInfo = getFieldInfo(field); - - // parse the full multiplication expression to - // get all associated constants - @SuppressWarnings("unchecked") List insInExpr = getInsInExpr(ctx, new HashSet(), true); - - for (InstructionContext ctx2 : insInExpr) - { - if (!(ctx2.getInstruction() instanceof PushConstantInstruction)) - { - continue; - } - - PushConstantInstruction pci3 = (PushConstantInstruction) ctx2.getInstruction(); - Number value = (Number) pci3.getConstant(); - - // field * constant - if (value instanceof Integer || value instanceof Long) - { - fieldInfo.getters.add(value); - } - } - } - else if (ctx.getInstruction() instanceof SetFieldInstruction) - { - SetFieldInstruction sf = (SetFieldInstruction) ctx.getInstruction(); - - Field field = sf.getMyField(); - if (field == null) - { - continue; - } - - FieldInfo fieldInfo = getFieldInfo(field); - - InstructionContext pushedsfi = ctx.getPops().get(0).getPushed(); // value being set - pushedsfi = pushedsfi.resolve(ctx.getPops().get(0)); - - if (!(pushedsfi.getInstruction() instanceof IMul) && !(pushedsfi.getInstruction() instanceof LMul) - && !(pushedsfi.getInstruction() instanceof IAdd) && !(pushedsfi.getInstruction() instanceof LAdd) - && !(pushedsfi.getInstruction() instanceof ISub) && !(pushedsfi.getInstruction() instanceof LSub)) - { - if (pushedsfi.getInstruction() instanceof LDC) - { - PushConstantInstruction ldc = (PushConstantInstruction) pushedsfi.getInstruction(); - - if (ldc.getConstant() instanceof Integer || ldc.getConstant() instanceof Long) - { - Number i = (Number) ldc.getConstant(); - - // field = constant - fieldInfo.setters.add(i); - } - } - continue; - } - - Instruction one = pushedsfi.getPops().get(0).getPushed().getInstruction(); - Instruction two = pushedsfi.getPops().get(1).getPushed().getInstruction(); - - // field = field + imul - if (pushedsfi.getInstruction() instanceof IAdd) - { - if (one instanceof IMul && two instanceof GetFieldInstruction) - { - one = pushedsfi.getPops().get(0).getPushed().getPops().get(0).getPushed().getInstruction(); - two = pushedsfi.getPops().get(0).getPushed().getPops().get(1).getPushed().getInstruction(); - } - } - - // if both one and two are constants then one of them must not be a setter - PushConstantInstruction pc = null; - if (one instanceof PushConstantInstruction - && !(two instanceof PushConstantInstruction)) - { - pc = (PushConstantInstruction) one; - } - else if (two instanceof PushConstantInstruction - && !(one instanceof PushConstantInstruction)) - { - pc = (PushConstantInstruction) two; - } - - if (pc == null) - { - continue; - } - - Number value2 = (Number) pc.getConstant(); - - // field = something * constant - if (value2 instanceof Integer || value2 instanceof Long) - { - fieldInfo.setters.add(value2); - } - } - } - } - - private Pair guess(Field field, Collection constants) - { - if (constants.isEmpty()) - { - return null; - } - - // multiply each by each, - // lowest number wins - Number s1 = 0, s2 = 0; - Number smallest = 0; - for (Number i : constants) - { - for (Number i2 : constants) - { - if (DMath.equals(i, 0) || DMath.equals(i2, 0) - || DMath.equals(i, 1) || DMath.equals(i2, 1)) - { - continue; - } - - if (i.equals(i2)) - { - // it is never i*i. if there is only one constant, - // prefer i*inverse(i) if possible by setting i2 - // to 1 - if (i2 instanceof Integer) - { - i2 = 1; - } - else if (i2 instanceof Long) - { - i2 = 1L; - } - } - - Number result = multiply(i, i2); - - if (DMath.equals(result, 0)) - { - continue; - } - - boolean smaller; - if (smallest.longValue() == 0L - // abs(MIN_VALUE) is MIN_VALUE - it is not the smallest - || (result instanceof Long && Long.MIN_VALUE == result.longValue()) - || (result instanceof Integer && Integer.MIN_VALUE == result.intValue())) - { - smaller = false; - } - else if (i instanceof Long) - { - smaller = Math.abs((long) result) < Math.abs((long) smallest); - } - else - { - smaller = Math.abs((int) result) < Math.abs((int) smallest); - } - - if (DMath.equals(smallest, 0) || DMath.equals(result, 1) || smaller) - { - s1 = i; - s2 = i2; - smallest = result; - } - } - } - - if (!DMath.equals(smallest, 1)) - { - // smallest s1*s2 is not 1 - if (DMath.isInversable(smallest)) - { - // s1*s2=smallest - // divide both sides by inverse(smallest) - // to make the right hand side 1 - - // pick s1/s2 depending on which one isn't inversible - if (DMath.isInversable(s1)) - { - s2 = multiply(s2, modInverse(smallest)); - smallest = 1; // rhs goes to one - assert multiply(s1, s2).intValue() == 1; - } - else if (DMath.isInversable(s2)) - { - s1 = multiply(s1, modInverse(smallest)); - smallest = 1; - assert multiply(s1, s2).intValue() == 1; - } - else - { - return null; - } - } - else - { - // s1*s2 is not 1 and smallest is not inversible - // calculate a new s1 or s2 if one is inversible - if (DMath.isInversable(s1)) - { - // assume this is s1 * (s2 * constant) = 1 * constant - Number newTwo = modInverse(s1); // we guess s2 is actually this - // check if s2 * constant = old value of s2 - if (multiply(newTwo, smallest).equals(s2)) - { - s2 = newTwo; // s2 changes to new value - smallest = 1; // rhs goes to 1 - assert multiply(s1, s2).intValue() == 1; - } - } - else if (DMath.isInversable(s2)) - { - Number newOne = modInverse(s2); - if (multiply(newOne, smallest).equals(s1)) - { - s1 = newOne; - smallest = 1; - assert multiply(s1, s2).intValue() == 1; - } - } - else - { - return null; - } - } - } - - // Now that we have two constants, figure out which one is - // the getter and which is the setter - boolean g = isGetterOrSetter(field, true, s1), - g2 = isGetterOrSetter(field, true, s2); - - boolean inverse = false; - if (g == g2) - { - // both are getters - inverse = true; - g = isGetterOrSetter(field, false, s1); - g2 = isGetterOrSetter(field, false, s2); - } - - if (g == g2) - { - // special case, when the guessted value is correct but - // negated, setters and getters will both contain -1, - // and the guess will be -1/-1. - if (s1.longValue() == -1L && s2.longValue() == -1L) - { - Pair p = new Pair(); - p.field = field.getPoolField(); - p.getter = s1; - p.setter = s2; - return p; - } - // both are also setters - } - else - { - Pair p = new Pair(); - p.field = field.getPoolField(); - if (g != inverse) - { - p.getter = s1; - p.setter = s2; - } - else - { - p.getter = s2; - p.setter = s1; - } - return p; - } - return null; - } - - // figure out if value is a getter or setter - private boolean isGetterOrSetter(Field field, boolean getter, Number value) - { - FieldInfo fieldInfo = getFieldInfo(field); - - Collection c; - if (getter) - { - c = fieldInfo.getters; - } - else - { - c = fieldInfo.setters; - } - if (c == null) - { - return false; - } - - if (c.contains(value)) - { - return true; - } - - return false; - } - - private void guess() - { - for (ClassFile cf : group.getClasses()) - { - for (Field f : cf.getFields()) - { - FieldInfo fieldInfo = getFieldInfo(f); - - Collection col = fieldInfo.constants; // all constants in instructions associated with the field - if (col.isEmpty()) - { - continue; - } - - Type type = f.getType(); - assert type.equals(Type.INT) || type.equals(Type.LONG); - - Class typeOfField = type.equals(Type.INT) ? Integer.class : Long.class; - - // filter collect constants of the correct type - Collection col2 = col.stream() - .filter(i -> i.value.getClass() == typeOfField) - .collect(Collectors.toList()); - - // filer out ones that have another field in the expression - List noOther = col2.stream() - .filter(i -> !i.other && !i.constant) - .map(i -> i.value) - .distinct() - .collect(Collectors.toList()); - List other = col2.stream() - .filter(i -> i.other || i.constant) - .map(i -> i.value) - .collect(Collectors.toList()); - other.addAll(noOther); - other = ImmutableSet.copyOf(other).asList(); - - // guess with constants not associated with other fields - Pair p = this.guess(f, noOther); - if (p == null) - { - p = this.guess(f, other); // fall back to all constants - } - - // check that this guess doesn't increase constants - if (p != null && !fieldInfo.guessDecreasesConstants(p)) - { - continue; - } - if (p != null) - { - pairs.add(p); - } - } - } - } - - @Override - public void run(ClassGroup group) - { - this.group = group; - } - - private void insertGetterSetterMuls(Encryption encr) - { - // after getfield insert imul * setter - // before setfield insert imul * getter - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - Code code = m.getCode(); - if (code == null) - { - continue; - } - - Instructions ins = code.getInstructions(); - List ilist = ins.getInstructions(); - - for (int i = 0; i < ilist.size(); ++i) - { - Instruction in = ilist.get(i); - - if (in instanceof SetFieldInstruction) - { - SetFieldInstruction sfi = (SetFieldInstruction) in; - Field f = sfi.getMyField(); - - if (f == null) - { - continue; - } - - Pair p = encr.getField(f.getPoolField()); - if (p == null) - { - continue; - } - - // insert push getter - // insert imul - if (p.getType() == Integer.class) - { - ilist.add(i++, new LDC(ins, (int) p.getter)); - ilist.add(i++, new IMul(ins)); - } - else if (p.getType() == Long.class) - { - ilist.add(i++, new LDC(ins, (long) p.getter)); - ilist.add(i++, new LMul(ins)); - } - else - { - throw new IllegalStateException(); - } - } - else if (in instanceof GetFieldInstruction) - { - GetFieldInstruction sfi = (GetFieldInstruction) in; - Field f = sfi.getMyField(); - - if (f == null) - { - continue; - } - - Pair p = encr.getField(f.getPoolField()); - if (p == null) - { - continue; - } - - // add after: - // push setter - // imul - if (p.getType() == Integer.class) - { - ilist.add(++i, new LDC(ins, (int) p.setter)); - ilist.add(++i, new IMul(ins)); - } - else if (p.getType() == Long.class) - { - ilist.add(++i, new LDC(ins, (long) p.setter)); - ilist.add(++i, new LMul(ins)); - } - else - { - throw new IllegalStateException(); - } - } - } - } - } - } - - public int runOnce() - { - group.buildClassGraph(); - - pairs.clear(); - fieldInfo.clear(); - - execution = new Execution(group); - execution.addMethodContextVisitor(i -> findUses(i)); - execution.addMethodContextVisitor(i -> findConstants(i)); - execution.populateInitialMethods(); - execution.run(); - - guess(); - - int i = 0; - Encryption encr = new Encryption(); - for (Pair pair : pairs) - { - logger.debug("Processing {} getter {} setter {}", pair.field.getName(), pair.getter, pair.setter); - - encr.addPair(pair); - encryption.addPair(pair); // sum total - ++i; - } - - logger.info("Done processing {}", i); - - if (i > 0) - { - insertGetterSetterMuls(encr); - } - - return i; - } - - public void annotateEncryption() - { - for (ClassFile cf : group.getClasses()) - { - for (Field f : cf.getFields()) - { - Pair pair = encryption.getField(f.getPoolField()); - if (pair == null) - { - continue; - } - - if (pair.getter.longValue() == 1L) - { - continue; - } - - String ename = pair.getType() == Long.class - ? "longValue" - : "intValue"; - f.addAnnotation(DeobAnnotations.OBFUSCATED_GETTER, ename, pair.getter); - } - } - } - - Encryption getEncryption() - { - return encryption; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscator.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscator.java deleted file mode 100644 index 4e00a8c18..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscator.java +++ /dev/null @@ -1,395 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.arithmetic; - -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.BiPush; -import net.runelite.asm.attributes.code.instructions.IAdd; -import net.runelite.asm.attributes.code.instructions.IInc; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.ISub; -import net.runelite.asm.attributes.code.instructions.LAdd; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.LMul; -import net.runelite.asm.attributes.code.instructions.LSub; -import net.runelite.asm.attributes.code.instructions.SiPush; -import net.runelite.asm.attributes.code.instructions.Swap; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.execution.Variables; -import net.runelite.deob.Deobfuscator; - -public class MultiplicationDeobfuscator implements Deobfuscator -{ - - private ClassGroup group; - - @Override - public void run(ClassGroup group) - { - this.group = group; - - int i; - int count = 0; - while ((i = runOnce()) > 0) - { - count += i; - } - } - - public static MultiplicationExpression parseExpression(InstructionContext ctx, Class want) - { - MultiplicationExpression me = new MultiplicationExpression(); - - if (ctx.getInstruction() instanceof LVTInstruction) - { - LVTInstruction lvt = (LVTInstruction) ctx.getInstruction(); - - // loading a variable - if (!lvt.store()) - { - int idx = lvt.getVariableIndex(); // var index - Variables vars = ctx.getVariables(); // variables at time of execution - - VariableContext vctx = vars.get(idx); // get the variable - - if (vctx.getRead().size() == 1) // ? - { - InstructionContext storeCtx = vctx.getInstructionWhichStored(); // this is an istore - if (storeCtx.getInstruction() instanceof LVTInstruction) - { - // invoking funcs can put stuff in lvt - - LVTInstruction storelvt = (LVTInstruction) storeCtx.getInstruction(); - - if (storelvt instanceof IInc) - throw new IllegalStateException(); - - assert storelvt.store(); - - InstructionContext pushed = storeCtx.getPops().get(0).getPushed(); - return parseExpression(pushed, want); - } - } - } - } - - if (ctx.getInstruction() instanceof PushConstantInstruction) - { - if (ctx.getInstruction() instanceof BiPush || ctx.getInstruction() instanceof SiPush) - { - throw new IllegalStateException(); - } - - me.instructions.add(ctx); - return me; - } - - for (StackContext sctx : ctx.getPops()) - { - if (ctx.getInstruction().getClass() == want) - { - if (!isOnlyPath(ctx, sctx)) - continue; - } - - InstructionContext i = sctx.getPushed(); - - // if this instruction is imul, look at pops - if (ctx.getInstruction().getClass() == want) - { - if (i.getInstruction() instanceof Swap) - { - - Swap swap = (Swap) i.getInstruction(); - sctx = swap.getOriginal(sctx); - i = sctx.getPushed(); - } - - if (i.getInstruction() instanceof PushConstantInstruction) - { - // bipush/sipush are always not obfuscated - if (i.getInstruction() instanceof BiPush || i.getInstruction() instanceof SiPush) - continue; - - // a constant of imul - me.instructions.add(i); - } - else if (i.getInstruction().getClass() == want) - { - // chained imul, append to me - try - { - MultiplicationExpression other = parseExpression(i, want); - if (other.dupmagic != null) - { - assert me.dupmagic == null; - me.dupmagic = other.dupmagic; - } - - me.instructions.addAll(other.instructions); - me.dupedInstructions.addAll(other.dupedInstructions); - me.subexpressions.addAll(other.subexpressions); - } - catch (IllegalStateException ex) - { - // this is ok? just don't include it? - } - } - else if (i.getInstruction() instanceof IAdd || i.getInstruction() instanceof ISub - || i.getInstruction() instanceof LAdd || i.getInstruction() instanceof LSub) - { - // imul using result of iadd or isub. evaluate expression - try - { - MultiplicationExpression other = parseExpression(i, want); - assert other.dupmagic == null; - - // subexpr - me.subexpressions.add(other); - } - catch (IllegalStateException ex) - { - assert me.subexpressions.isEmpty(); - // subexpression is too complex. we can still simplify the top level though - } - } - else if (i.getInstruction() instanceof DupInstruction) - { - DupInstruction dup = (DupInstruction) i.getInstruction(); - - // find other branch of the dup instruction - // sctx = what dup pushed, find other - StackContext otherCtx = dup.getOtherBranch(sctx); // other side of dup - InstructionContext otherCtxI = otherCtx.getPopped().get(0); // what popped other side of dup. is this right? - - if (otherCtxI.getInstruction().getClass() == want) - { - //assert otherCtxI.getInstruction() instanceof IMul; - - InstructionContext pushConstant = otherCtxI.getPops().get(0).getPushed(); // other side of that imul - assert pushConstant.getInstruction() instanceof LDC; - - me.dupmagic = pushConstant; - - StackContext orig = dup.getOriginal(sctx); // original - try - { - MultiplicationExpression other = parseExpression(orig.getPushed(), want); - // this expression is used elsewhere like 'pushConstant' so any changes - // done to it affect that, too. so multiply it by existing values? - if (orig.getPushed().getInstruction() instanceof IAdd || orig.getPushed().getInstruction() instanceof ISub - || orig.getPushed().getInstruction() instanceof LAdd || orig.getPushed().getInstruction() instanceof LSub) - { - me.subexpressions.add(other); - } - else - { - assert other.dupmagic == null; - me.instructions.addAll(other.instructions); - me.dupedInstructions.addAll(other.instructions); - me.subexpressions.addAll(other.subexpressions); - } - } - catch (IllegalStateException ex) - { - assert me.subexpressions.isEmpty(); - } - } - } - else if (i.getInstruction() instanceof GetFieldInstruction) - { - me.fieldInstructions.add(i); - // non constant, ignore - } - else - { - //System.out.println("imul pops something I don't know " + i.getInstruction()); - } - } - // this is an iadd/sub - else if (ctx.getInstruction() instanceof IAdd || ctx.getInstruction() instanceof ISub - || ctx.getInstruction() instanceof LAdd || ctx.getInstruction() instanceof LSub) - { - MultiplicationExpression other = parseExpression(i, want); // parse this side of the add/sub - - me.subexpressions.add(other); - } - else - { - //System.out.println(ctx.getInstruction() + " pops something I dont know " + i.getInstruction()); - } - } - - if (me.instructions.isEmpty() && me.subexpressions.isEmpty()) - throw new IllegalStateException(); - - return me; - } - - // one = imul, two = other executeion of instruction of one, sctx = popped by imul - private static boolean ictxEqualsDir(InstructionContext one, InstructionContext two, StackContext sctx) - { - assert one.getInstruction() == two.getInstruction(); - - if (one.getInstruction() != two.getInstruction()) - return false; - - assert one.getPops().contains(sctx); - int i = one.getPops().indexOf(sctx); - - StackContext theirsctx = two.getPops().get(i); - - if (sctx.getPushed().getInstruction() != theirsctx.getPushed().getInstruction()) - return false; - - return true; - } - - // ctx = imul, sctx = popped by imul - public static boolean isOnlyPath(InstructionContext ctx, StackContext sctx) - { - assert ctx.getInstruction() instanceof IMul || ctx.getInstruction() instanceof LMul; - - Collection ins = ctx.getFrame().getMethodCtx().getInstructonContexts(ctx.getInstruction()); - for (InstructionContext i : ins) - { - if (sctx == null) - { - if (!i.equals(ctx)) - { - return false; - } - - for (StackContext sctx2 : i.getPushes()) - { - if (sctx2.getPopped().size() > 1) - { - return false; - } - } - } - else - { - // everything which pushed the parameters must be the same - if (!ictxEqualsDir(ctx, i, sctx)) - { - return false; - } - - // everything which pops the result must be the same - Instruction poppedIns = null; - for (StackContext s : i.getPushes()) - for (InstructionContext i2 : s.getPopped()) - { - if (poppedIns == null) - poppedIns = i2.getInstruction(); - else if (poppedIns != i2.getInstruction()) - return false; - } - } - } - return true; - } - - private Set done = new HashSet<>(); - - private void visit(MethodContext ctx) - { - for (InstructionContext ictx : ctx.getInstructionContexts()) - { - Instruction instruction = ictx.getInstruction(); - - if (!(instruction instanceof IMul) && !(instruction instanceof LMul)) - { - continue; - } - - MultiplicationExpression expression; - try - { - expression = parseExpression(ictx, instruction.getClass()); - } - catch (IllegalStateException ex) - { - continue; - } - - if (expression == null) - { - continue; - } - - if (done.contains(instruction)) - { - continue; - } - done.add(instruction); - - assert instruction instanceof IMul || instruction instanceof LMul; - if (instruction instanceof IMul) - { - count += expression.simplify(1); - } - else if (instruction instanceof LMul) - { - count += expression.simplify(1L); - } - else - { - throw new IllegalStateException(); - } - } - } - - int count; - - private int runOnce() - { - group.buildClassGraph(); - - count = 0; - - Execution e = new Execution(group); - e.addMethodContextVisitor(m -> visit(m)); - e.populateInitialMethods(); - e.run(); - - return count; - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationExpression.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationExpression.java deleted file mode 100644 index 6386f228c..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationExpression.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.arithmetic; - -import java.util.ArrayList; -import java.util.List; -import net.runelite.asm.Field; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.execution.InstructionContext; - -public class MultiplicationExpression -{ - List instructions = new ArrayList<>(), // push constant instructions that are being multiplied - dupedInstructions = new ArrayList<>(), - fieldInstructions = new ArrayList<>(); - List subexpressions = new ArrayList<>(); // for distributing, each subexpr is * by this - InstructionContext dupmagic; // inverse of what is distributed to subexpressions gets set here - - int simplify(Number start) - { - int count = 0; - Number result = start; - - // calculate result - for (InstructionContext i : instructions) - { - PushConstantInstruction pci = (PushConstantInstruction) i.getInstruction(); - Number value = (Number) pci.getConstant(); - - result = DMath.multiply(result, value); - } - - if (dupmagic != null) - { - // mul dupmagic by result of dup ins? - - PushConstantInstruction pci = (PushConstantInstruction) dupmagic.getInstruction(); - Number value = (Number) pci.getConstant(); - - for (InstructionContext ic : dupedInstructions) - { - PushConstantInstruction pci2 = (PushConstantInstruction) ic.getInstruction(); - Number value2 = (Number) pci2.getConstant(); - - value = DMath.multiply(value, value2); - } - - Instruction newIns = pci.setConstant(value); - assert newIns == (Instruction) pci; - } - - // multiply subexpressions by result - if (!subexpressions.isEmpty()) - { - for (MultiplicationExpression me : subexpressions) - { - count += me.simplify(result); - } - - if (dupmagic != null) - { - PushConstantInstruction pci = (PushConstantInstruction) dupmagic.getInstruction(); - Number value = (Number) pci.getConstant(); - - value = DMath.multiply(value, DMath.modInverse(result)); - - pci.setConstant(value); - } - - // constant has been distributed, outer numbers all go to 1 - if (result instanceof Long) - result = 1L; - else - result = 1; - } - - // set result on ins - for (InstructionContext i : instructions) - { - PushConstantInstruction pci = (PushConstantInstruction) i.getInstruction(); - Instruction newIns = pci.setConstant(result); - ++count; - assert newIns == pci; - // rest of the results go to 1 - if (result instanceof Long) - result = 1L; - else - result = 1; - } - - return count; - } - - public boolean hasFieldOtherThan(Field field) - { - for (InstructionContext i : this.fieldInstructions) - { - FieldInstruction fi = (FieldInstruction) i.getInstruction(); - if (fi.getMyField() != null && fi.getMyField() != field) - return true; - } - - for (MultiplicationExpression ex : this.subexpressions) - if (ex.hasFieldOtherThan(field)) - return true; - - return false; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscator.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscator.java deleted file mode 100644 index 121479889..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscator.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.arithmetic; - -import java.util.List; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.LMul; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.Deobfuscator; -public class MultiplyOneDeobfuscator implements Deobfuscator -{ - - private final boolean onlyConstants; - private int count; - - public MultiplyOneDeobfuscator(boolean onlyConstants) - { - this.onlyConstants = onlyConstants; - } - - private void visit(MethodContext mctx) - { - for (InstructionContext ictx : mctx.getInstructionContexts()) - { - Instruction instruction = ictx.getInstruction(); - - if (!(instruction instanceof IMul) && !(instruction instanceof LMul)) - { - continue; - } - - Instructions ins = ictx.getInstruction().getInstructions(); - if (ins == null) - { - continue; - } - - List ilist = ins.getInstructions(); - - if (!ilist.contains(ictx.getInstruction())) - { - continue; // already done - } - - StackContext one = ictx.getPops().get(0); - StackContext two = ictx.getPops().get(1); - - StackContext other = null; - int removeIdx = -1; - if (one.getPushed().getInstruction() instanceof PushConstantInstruction - && DMath.equals((Number) ((PushConstantInstruction) one.getPushed().getInstruction()).getConstant(), 1)) - { - removeIdx = 0; - other = two; - } - else if (two.getPushed().getInstruction() instanceof PushConstantInstruction - && DMath.equals((Number) ((PushConstantInstruction) two.getPushed().getInstruction()).getConstant(), 1)) - { - removeIdx = 1; - other = one; - } - - if (removeIdx == -1) - { - continue; - } - - if (onlyConstants && !(other.getPushed().getInstruction() instanceof PushConstantInstruction)) - { - continue; - } - - if (!MultiplicationDeobfuscator.isOnlyPath(ictx, removeIdx == 0 ? one : two)) - { - continue; - } - - ictx.removeStack(removeIdx); // remove 1 - ins.remove(instruction); // remove mul - - ++count; - } - } - - @Override - public void run(ClassGroup group) - { - Execution e = new Execution(group); - e.addMethodContextVisitor(i -> visit(i)); - e.populateInitialMethods(); - e.run(); - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscator.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscator.java deleted file mode 100644 index 95090d1b9..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscator.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.arithmetic; - -import java.util.List; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.LMul; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.Deobfuscator; - -public class MultiplyZeroDeobfuscator implements Deobfuscator -{ - - private int count; - - private void visit(MethodContext mctx) - { - for (InstructionContext ictx : mctx.getInstructionContexts()) - { - Instruction instruction = ictx.getInstruction(); - Instructions ins = instruction.getInstructions(); - if (ins == null) - { - continue; - } - - if (!(instruction instanceof IMul) && !(instruction instanceof LMul)) - { - continue; - } - - List ilist = ins.getInstructions(); - - StackContext one = ictx.getPops().get(0); - StackContext two = ictx.getPops().get(1); - - Instruction ione = one.getPushed().getInstruction(), - itwo = two.getPushed().getInstruction(); - - boolean remove = false; - if (ione instanceof PushConstantInstruction) - { - PushConstantInstruction pci = (PushConstantInstruction) ione; - Number value = (Number) pci.getConstant(); - - if (DMath.equals(value, 0)) - { - remove = true; - } - } - if (itwo instanceof PushConstantInstruction) - { - PushConstantInstruction pci = (PushConstantInstruction) itwo; - Number value = (Number) pci.getConstant(); - - if (DMath.equals(value, 0)) - { - remove = true; - } - } - - if (remove == false) - { - continue; - } - - if (!ilist.contains(instruction)) - { - continue; // already done - } - if (!MultiplicationDeobfuscator.isOnlyPath(ictx, null)) - { - continue; - } - - // remove both, remove imul, push 0 - ictx.removeStack(1); - ictx.removeStack(0); - - if (instruction instanceof IMul) - { - ins.replace(instruction, new LDC(ins, 0)); - } - else if (instruction instanceof LMul) - { - ins.replace(instruction, new LDC(ins, 0L)); - } - else - { - throw new IllegalStateException(); - } - - ++count; - - } - } - - @Override - public void run(ClassGroup group) - { - Execution e = new Execution(group); - e.addMethodContextVisitor(i -> visit(i)); - e.populateInitialMethods(); - e.run(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Pair.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Pair.java deleted file mode 100644 index e21f9352e..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Pair.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.arithmetic; - -import net.runelite.asm.pool.Field; - -class Pair -{ - Field field; - Number getter, setter; - - public Pair() - { - } - - public Pair(Pair one, Pair two) - { - assert one.getType() == two.getType(); - assert one.field != null; - assert two.field != null; - assert one.field.equals(two.field); - - getter = DMath.multiply(one.getter, two.getter); - setter = DMath.multiply(one.setter, two.setter); - field = one.field; - } - - public Class getType() - { - assert getter.getClass() == setter.getClass(); - return getter.getClass(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/Block.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/Block.java deleted file mode 100644 index c40355c29..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/Block.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.cfg; - -import java.util.ArrayList; -import java.util.List; -import lombok.Getter; -import lombok.Setter; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Label; - -@Getter -@Setter -public class Block -{ - private int id = -1; - private boolean jumptarget; // block is unconditionally jumped to - - /** - * blocks which jump here - */ - private final List preds = new ArrayList<>(); - - /** - * blocks which this jumps to - */ - private final List succs = new ArrayList<>(); - - /** - * block which flows directly into this block - */ - private Block pred; - - /** - * block which this directly flows into - */ - private Block succ; - - /** - * instructions in this block - */ - private final List instructions = new ArrayList<>(); - - @Override - public String toString() - { - StringBuilder sb = new StringBuilder(); - sb.append("Block ID ").append(id).append("\n"); - if (pred != null) - { - sb.append(" flows from ").append(pred.id).append("\n"); - } - for (Instruction i : instructions) - { - sb.append(" ").append(i.toString()).append("\n"); - } - if (succ != null) - { - sb.append(" flows into ").append(succ.id).append("\n"); - } - sb.append("\n"); - return sb.toString(); - } - - public void addInstruction(int idx, Instruction i) - { - assert !instructions.contains(i); - instructions.add(idx, i); - } - - public void addInstruction(Instruction i) - { - assert !instructions.contains(i); - instructions.add(i); - } - - public void addPrev(Block block) - { - if (!preds.contains(block)) - { - preds.add(block); - } - } - - public void addNext(Block block) - { - if (!succs.contains(block)) - { - succs.add(block); - } - } - - static int compare(Block a, Block b) - { - final int l1 = a.getLineNumber(); - final int l2 = b.getLineNumber(); - if (l1 == l2 || l1 == -1 || l2 == -1) - return 0; - return Integer.compare(l1, l2); - } - - private int getLineNumber() - { - for (Instruction i : instructions) - if (i instanceof Label) - if (((Label) i).getLineNumber() != null) - return ((Label) i).getLineNumber(); - return -1; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscator.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscator.java deleted file mode 100644 index 24f49a023..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscator.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.cfg; - -import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instructions.Goto; -import net.runelite.deob.Deobfuscator; - -public class ControlFlowDeobfuscator implements Deobfuscator -{ - private int insertedJump; - private int placedBlocks; - private int removedJumps; - - @Override - public void run(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - Code code = m.getCode(); - - if (code == null || !code.getExceptions().getExceptions().isEmpty()) - { - continue; - } - - run(code); - runJumpLabel(code); - } - } - } - - private void run(Code code) - { - Instructions ins = code.getInstructions(); - - ControlFlowGraph graph = new ControlFlowGraph(code); - - // Clear existing instructions as we are going to rebuild them - ins.clear(); - final List sorted = graph.topologicalSort(); - for (Block b : sorted) - { - ++placedBlocks; - for (Instruction i : b.getInstructions()) - { - ins.addInstruction(i); - i.setInstructions(ins); - } - if (b.getSucc() != null && b.getInstructions().size() > 0) - { - final var i = b.getInstructions().get(b.getInstructions().size() - 1); - if (!i.isTerminal()) - { - final var next = b.getSucc(); - var maybeLabel = next.getInstructions().get(0); - if (!(maybeLabel instanceof Label)) - { - maybeLabel = new Label(ins); - next.getInstructions().add(0, maybeLabel); - } - ins.addInstruction(new Goto(ins, (Label) maybeLabel)); - ++insertedJump; - } - } - } - } - - /** - * remove jumps followed immediately by the label they are jumping to - */ - private void runJumpLabel(Code code) - { - Instructions ins = code.getInstructions(); - List instructions = ins.getInstructions(); - - for (int i = 0; i < instructions.size() - 1; ++i) - { - Instruction i1 = instructions.get(i), - i2 = instructions.get(i + 1); - - if (!(i1 instanceof Goto)) - { - continue; - } - - Goto g = (Goto) i1; - assert g.getJumps().size() == 1; - if (g.getJumps().get(0) != i2) - { - continue; - } - - ins.remove(i1); // remove jump - ++removedJumps; - - // i now points to i2, so next loop we go to next instruction - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowGraph.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowGraph.java deleted file mode 100644 index a7456a29b..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowGraph.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.cfg; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; - -public class ControlFlowGraph -{ - private final Map blocks = new HashMap<>(); - private final List allBlocks = new ArrayList<>(); - private final Block head; - - public ControlFlowGraph(Code code) - { - int id = 0; - this.head = new Block(); - for (Instruction i : code.getInstructions()) - if (i instanceof Label) - blocks.computeIfAbsent((Label) i, lbl -> { - var b = new Block(); - allBlocks.add(b); - return b; - }); - - allBlocks.add(0, head); - Block cur = head; - for (Instruction i : code.getInstructions()) - { - if (i instanceof Label) - { - Block next = blocks.get(i); - if (next.getId() == -1) - { - next.setId(id++); - } - if (next != cur) - { - Instruction last = cur.getInstructions().isEmpty() - ? null - : cur.getInstructions().get(cur.getInstructions().size() - 1); - if (last == null || !last.isTerminal()) - { - assert next.getPred() == null; - assert cur.getSucc() == null; - // previous block flows directly into next - next.setPred(cur); - cur.setSucc(next); - } - cur = next; - } - } - cur.addInstruction(i); - if (i instanceof JumpingInstruction) - { - JumpingInstruction ji = (JumpingInstruction) i; - for (Label l : ji.getJumps()) - { - Block next = blocks.get(l); - if (next.getId() == -1) - { - next.setId(id++); - } - cur.addNext(next); - next.addPrev(cur); - } - } - } - - assert head.getPred() == null; - } - - List topologicalSort() - { - final List ret = new ArrayList<>(); - walk(head, ret, new HashSet<>()); - Collections.reverse(ret); - return ret; - } - - private static void walk(Block cur, List order, Set done) - { - Block dirsucc = cur.getSucc(); - if (dirsucc != null && done.add(dirsucc)) - walk(cur.getSucc(), order, done); - List succs = cur.getSuccs(); - succs.sort(Block::compare); - for (Block succ : succs) - if (done.add(succ)) - walk(succ, order, done); - order.add(cur); - } - - public ControlFlowGraph(Block head) - { - this.head = head; - } - - public Block getBlock(Label label) - { - return blocks.get(label); - } - - public Collection getBlocks() - { - return allBlocks; - } - - @Override - public String toString() - { - StringBuilder sb = new StringBuilder(); - for (Block b : allBlocks) - { - sb.append(b.toString()); - } - return sb.toString(); - } - - public Block getHead() - { - return head; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/constparam/ConstantMethodParameter.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/constparam/ConstantMethodParameter.java deleted file mode 100644 index f05e8f2be..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/constparam/ConstantMethodParameter.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.constparam; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; - -class ConstantMethodParameter -{ - List methods; // methods this is a parameter for - int paramIndex; - int lvtIndex; - List values = new ArrayList<>(); // possible values for the parameter - List operations = new ArrayList<>(); // conditional jumps based on the parameter - Boolean result; // result of the jumps (branch taken or not) - boolean invalid; - - @Override - public int hashCode() - { - int hash = 3; - hash = 47 * hash + Objects.hashCode(this.methods); - hash = 47 * hash + this.lvtIndex; - return hash; - } - - @Override - public boolean equals(Object obj) - { - if (obj == null) - { - return false; - } - if (getClass() != obj.getClass()) - { - return false; - } - final ConstantMethodParameter other = (ConstantMethodParameter) obj; - if (!Objects.equals(this.methods, other.methods)) - { - return false; - } - if (this.lvtIndex != other.lvtIndex) - { - return false; - } - return true; - } -} \ No newline at end of file diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/constparam/ConstantParameter.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/constparam/ConstantParameter.java deleted file mode 100644 index 7a99150fd..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/constparam/ConstantParameter.java +++ /dev/null @@ -1,467 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.constparam; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.Annotation; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.Goto; -import net.runelite.asm.attributes.code.instructions.If; -import net.runelite.asm.attributes.code.instructions.If0; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.Deobfuscator; -public class ConstantParameter implements Deobfuscator -{ - private final Map parameters = new HashMap<>(); - private final Multimap mparams = HashMultimap.create(); - - private void checkMethodsAreConsistent(List methods) - { - Method prev = null; - for (Method m : methods) - { - if (prev != null) - { - assert prev.getDescriptor().equals(m.getDescriptor()); - assert prev.isStatic() == m.isStatic(); - } - prev = m; - } - } - - private ConstantMethodParameter getCMPFor(List methods, int paramIndex, int lvtIndex) - { - ConstantMethodParameter cmp = new ConstantMethodParameter(); - cmp.methods = methods; - cmp.paramIndex = paramIndex; - cmp.lvtIndex = lvtIndex; - - ConstantMethodParameter exists = parameters.get(cmp); - if (exists != null) - { - // existing mparams for each method of methods can have different 'methods' - // due to invokespecial on virtual methods. - return exists; - } - - parameters.put(cmp, cmp); - - for (Method m : methods) - { - mparams.put(m, cmp); - } - - return cmp; - } - - // find constant values passed as parameters - private void findConstantParameter(List methods, InstructionContext invokeCtx) - { - checkMethodsAreConsistent(methods); - - Method method = methods.get(0); // all methods must have the same signature etc - int offset = method.isStatic() ? 0 : 1; - - List pops = invokeCtx.getPops(); - - // object is popped first, then param 1, 2, 3, etc. double and long take two slots. - for (int lvtOffset = offset, parameterIndex = 0; - parameterIndex < method.getDescriptor().size(); - lvtOffset += method.getDescriptor().getTypeOfArg(parameterIndex++).getSize()) - { - // get(0) == first thing popped which is the last parameter, - // get(descriptor.size() - 1) == first parameter - StackContext ctx = pops.get(method.getDescriptor().size() - 1 - parameterIndex); - - ConstantMethodParameter cmp = getCMPFor(methods, parameterIndex, lvtOffset); - - if (cmp.invalid) - { - continue; - } - - if (ctx.getPushed().getInstruction() instanceof PushConstantInstruction) - { - PushConstantInstruction pc = (PushConstantInstruction) ctx.getPushed().getInstruction(); - - if (!(pc.getConstant() instanceof Number)) - { - cmp.invalid = true; - continue; - } - - Number number = (Number) pc.getConstant(); - - if (!cmp.values.contains(number)) - { - cmp.values.add((Number) pc.getConstant()); - } - } - else - { - cmp.invalid = true; - } - } - } - - // find constant valuess passed to parameters - private void findParameters(InstructionContext ins) - { - if (!(ins.getInstruction() instanceof InvokeInstruction)) - { - return; - } - - List methods = ((InvokeInstruction) ins.getInstruction()).getMethods(); - if (methods.isEmpty()) - { - return; - } - - findConstantParameter(methods, ins); - } - - @SuppressWarnings("unchecked") - private List findParametersForMethod(Method m) - { - Collection c = mparams.get(m); - if (c == null) - { - return Collections.EMPTY_LIST; - } - return new ArrayList<>(c); - } - - // compare known values against a jump. also invalidates constant param - // if lvt is reassigned or a comparison is made against a non constant - private void findDeadParameters(MethodContext mctx) - { - mctx.getInstructionContexts().forEach(this::findDeadParameters); - } - - private void findDeadParameters(InstructionContext ins) - { - List parameters = this.findParametersForMethod(ins.getFrame().getMethod()); - - for (ConstantMethodParameter parameter : parameters) - { - int lvtIndex = parameter.lvtIndex; - - if (parameter.invalid) - { - continue; - } - - if (ins.getInstruction() instanceof LVTInstruction) - { - LVTInstruction lvt = (LVTInstruction) ins.getInstruction(); - - if (lvt.getVariableIndex() != lvtIndex) - { - continue; - } - - if (lvt.store() || ins.getInstruction().getType() == InstructionType.IINC) - { - parameter.invalid = true; - continue; // value changes at some point, parameter is used - } - - // check what pops the parameter is a comparison - assert ins.getPushes().size() == 1; - StackContext sctx = ins.getPushes().get(0); - - if (sctx.getPopped().size() != 1 - || !(sctx.getPopped().get(0).getInstruction() instanceof ComparisonInstruction)) - { - parameter.invalid = true; - continue; - } - } - - if (!(ins.getInstruction() instanceof ComparisonInstruction)) - { - continue; - } - - // assume that this will always be variable index #paramIndex comp with a constant. - ComparisonInstruction comp = (ComparisonInstruction) ins.getInstruction(); - - StackContext one, two = null; - - if (comp instanceof If0) - { - one = ins.getPops().get(0); - } - else if (comp instanceof If) - { - one = ins.getPops().get(0); - two = ins.getPops().get(1); - } - else - { - throw new RuntimeException("Unknown comp ins"); - } - - // find if one is a lvt ins - LVTInstruction lvt = null; - StackContext other = null; - - if (one.getPushed().getInstruction() instanceof LVTInstruction) - { - lvt = (LVTInstruction) one.getPushed().getInstruction(); - other = two; - } - else if (two != null && two.getPushed().getInstruction() instanceof LVTInstruction) - { - lvt = (LVTInstruction) two.getPushed().getInstruction(); - other = one; - } - - assert lvt == null || !lvt.store(); - - if (lvt == null || lvt.getVariableIndex() != lvtIndex) - { - continue; - } - - Number otherValue = null; - - if (two != null) // two is null for if0 - { - if (!(other.getPushed().getInstruction() instanceof PushConstantInstruction)) - { - parameter.invalid = true; - continue; - } - - PushConstantInstruction pc = (PushConstantInstruction) other.getPushed().getInstruction(); - otherValue = (Number) pc.getConstant(); - } - - for (Number value : parameter.values) - { - // the result of the comparison doesn't matter, only that it always goes the same direction for every invocation - boolean result = doLogicalComparison(value, comp, otherValue); - - // XXX this should check that the particular if always takes the same path, - // not that all ifs for a specific parameter always take the same path - if (parameter.result != null && parameter.result != result) - { - parameter.invalid = true; - } - else - { - parameter.operations.add(ins.getInstruction()); - parameter.result = result; - } - } - } - } - - private boolean doLogicalComparison(Number value, ComparisonInstruction comparison, Number otherValue) - { - Instruction ins = (Instruction) comparison; - - assert (comparison instanceof If0) == (otherValue == null); - - switch (ins.getType()) - { - case IFEQ: - return value.equals(0); - case IFNE: - return !value.equals(0); - case IFLT: - return value.intValue() < 0; - case IFGE: - return value.intValue() >= 0; - case IFGT: - return value.intValue() > 0; - case IFLE: - return value.intValue() <= 0; - case IF_ICMPEQ: - return value.equals(otherValue); - case IF_ICMPNE: - return !value.equals(otherValue); - case IF_ICMPLT: - return value.intValue() < otherValue.intValue(); - case IF_ICMPGE: - return value.intValue() >= otherValue.intValue(); - case IF_ICMPGT: - return value.intValue() > otherValue.intValue(); - case IF_ICMPLE: - return value.intValue() <= otherValue.intValue(); - default: - throw new RuntimeException("Unknown constant comparison instructuction"); - } - } - - // remove logically dead comparisons - private int removeDeadOperations(MethodContext mctx) - { - int count = 0; - for (ConstantMethodParameter cmp : parameters.values()) - { - if (cmp.invalid) - { - continue; - } - - if (!cmp.methods.contains(mctx.getMethod())) - { - continue; - } - - // only annotate garbage value of last param - if (cmp.paramIndex + 1 == mctx.getMethod().getDescriptor().size()) - { - annotateObfuscatedSignature(cmp); - } - - for (Instruction ins : cmp.operations) // comparisons - { - if (ins.getInstructions() == null || ins.getInstructions().getCode().getMethod() != mctx.getMethod()) - { - continue; - } - - InstructionContext ctx = mctx.getInstructonContexts(ins).toArray(new InstructionContext[0])[0]; - boolean branch = cmp.result; // branch that is always taken - - if (ins.getInstructions() == null) - { - continue; // ins already removed? - } - Instructions instructions = ins.getInstructions(); - - // remove the if - if (ctx.getInstruction() instanceof If) - { - ctx.removeStack(1); - } - ctx.removeStack(0); - - int idx = instructions.getInstructions().indexOf(ins); - if (idx == -1) - { - continue; // already removed? - } - ++count; - - Instruction to; - if (branch) - { - JumpingInstruction jumpIns = (JumpingInstruction) ins; - assert jumpIns.getJumps().size() == 1; - to = jumpIns.getJumps().get(0); - } - else - { - // just go to next instruction - to = instructions.getInstructions().get(idx + 1); - } - assert to.getInstructions() == instructions; - assert ins != to; - assert instructions.getInstructions().contains(to); - - instructions.remove(ins); - - assert instructions.getInstructions().contains(to); - - if (branch) - { - Goto gotoins = new Goto(instructions, instructions.createLabelFor(to)); - - // insert goto - instructions.getInstructions().add(idx, gotoins); - } - } - } - return count; - } - - private void annotateObfuscatedSignature(ConstantMethodParameter parameter) - { - for (Method m : parameter.methods) - { - Object value = parameter.values.get(0); - - Annotation obfuscatedSignature = m.findAnnotation(DeobAnnotations.OBFUSCATED_SIGNATURE, true); - if (obfuscatedSignature.size() == 2) - { - // already annotated - continue; - } - else if (obfuscatedSignature.size() == 0) - { - obfuscatedSignature.setElement("descriptor", m.getDescriptor().toString()); - } - - obfuscatedSignature.setElement("garbageValue", String.valueOf(value)); - } - } - - private int count; - - @Override - public void run(ClassGroup group) - { - Execution execution = new Execution(group); - execution.addExecutionVisitor(this::findParameters); - execution.populateInitialMethods(); - execution.run(); - - execution = new Execution(group); - execution.addMethodContextVisitor(this::findDeadParameters); - execution.populateInitialMethods(); - execution.run(); - - execution = new Execution(group); - execution.addMethodContextVisitor(m -> count += removeDeadOperations(m)); - execution.populateInitialMethods(); - execution.run(); - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/ExprArgOrder.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/ExprArgOrder.java deleted file mode 100644 index d45662903..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/ExprArgOrder.java +++ /dev/null @@ -1,529 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.exprargorder; - -import com.google.common.primitives.Ints; -import com.google.common.primitives.Longs; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import static net.runelite.asm.attributes.code.InstructionType.IADD; -import static net.runelite.asm.attributes.code.InstructionType.IF_ACMPEQ; -import static net.runelite.asm.attributes.code.InstructionType.IF_ACMPNE; -import static net.runelite.asm.attributes.code.InstructionType.IF_ICMPEQ; -import static net.runelite.asm.attributes.code.InstructionType.IF_ICMPNE; -import static net.runelite.asm.attributes.code.InstructionType.IMUL; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.AConstNull; -import net.runelite.asm.attributes.code.instructions.IAdd; -import net.runelite.asm.attributes.code.instructions.IInc; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.If; -import net.runelite.asm.attributes.code.instructions.IfACmpEq; -import net.runelite.asm.attributes.code.instructions.IfACmpNe; -import net.runelite.asm.attributes.code.instructions.IfICmpEq; -import net.runelite.asm.attributes.code.instructions.IfICmpNe; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Deobfuscator; -public class ExprArgOrder implements Deobfuscator -{ - private final List exprIns = new ArrayList<>(); - private final Map exprs = new HashMap<>(); - private int count; - - static boolean isCommutative(InstructionType type) - { - switch (type) - { - case IADD: - case IMUL: - case IF_ICMPEQ: - case IF_ICMPNE: - case IF_ACMPEQ: - case IF_ACMPNE: - return true; - default: - return false; - } - } - - private Instruction newInstruction(Instructions ins, Instruction old, InstructionType type) - { - assert isCommutative(type) : "type is " + type; - - switch (type) - { - case IADD: - return new IAdd(ins); - case IMUL: - return new IMul(ins); - case IF_ICMPEQ: - { - If i = (If) old; - return new IfICmpEq(ins, i.getJumps().get(0)); - } - case IF_ICMPNE: - { - If i = (If) old; - return new IfICmpNe(ins, i.getJumps().get(0)); - } - case IF_ACMPEQ: - { - If i = (If) old; - return new IfACmpEq(ins, i.getJumps().get(0)); - } - case IF_ACMPNE: - { - If i = (If) old; - return new IfACmpNe(ins, i.getJumps().get(0)); - } - default: - throw new IllegalStateException(); - } - } - - private void parseExpr(Expression expr, InstructionContext ctx) - { - InstructionType type = ctx.getInstruction().getType(); - - List pops = ctx.getPops(); - - for (StackContext sctx : pops) - { - InstructionContext i = sctx.getPushed(); - - if (isCommutative(type) && i.getInstruction().getType() == type) - { - parseExpr(expr, i); - } - else if (isCommutative(type)) - { - Expression sub = new Expression(i); - parseExpr(sub, i); - expr.addComExpr(sub); - } - else - { - Expression sub = new Expression(i); - parseExpr(sub, i); - expr.addExpr(sub); - } - - exprIns.remove(i.getInstruction()); - exprs.remove(i.getInstruction()); // remove sub expr - } - } - - private void visit(InstructionContext ctx) - { - Instruction ins = ctx.getInstruction(); - - if (ins instanceof IAdd || ins instanceof IMul - || ins instanceof IfICmpEq || ins instanceof IfICmpNe - || ins instanceof IfACmpEq || ins instanceof IfACmpNe) - { - Expression expression = new Expression(ctx); - parseExpr(expression, ctx); - if (!exprs.containsKey(ins)) - { - exprIns.add(ins); - exprs.put(ins, expression); - } - } - } - - private boolean canRemove(MethodContext mctx, Instructions ins, Instruction i) - { - Set ctxs = new HashSet<>(mctx.getInstructonContexts(i)); - - if (!alwaysPoppedBySameInstruction(ctxs, i) || !alwaysPopsFromSameInstructions(ctxs, i)) - { - return false; - } - - if (i instanceof InvokeInstruction) - { - // don't ever order lhs/rhs if an invoke is involved? - // func1() + func2() vs func2() + func1() is not the same thing - return false; - } - - int idx = ins.getInstructions().indexOf(i); - if (idx == -1) - { - return false; - } - - for (InstructionContext ictx : ctxs) - { - for (StackContext sctx : ictx.getPops()) - { - Instruction pushed = sctx.getPushed().getInstruction(); - - int idx2 = ins.getInstructions().indexOf(pushed); - if (idx2 == -1) - { - return false; - } - - assert idx > idx2; - - // If there is a lvt store (incl iinc!) between the two - // instructions, we can't move them - for (int j = idx2; j <= idx; ++j) - { - Instruction i2 = ins.getInstructions().get(j); - if (i2 instanceof LVTInstruction) - { - if (((LVTInstruction) i2).store()) - { - return false; - } - } - if (i2 instanceof IInc) - { - return false; - } - } - - if (!canRemove(mctx, ins, pushed)) - { - return false; - } - } - } - - return true; - - } - - private void remove(Instructions ins, InstructionContext ic) - { - ins.remove(ic.getInstruction()); - - for (StackContext sc : ic.getPops()) - { - assert sc.getPopped().size() == 1; - remove(ins, sc.getPushed()); - } - } - - private void insert(Instructions ins, InstructionContext ic, Instruction before) - { - Instruction i = ic.getInstruction(); - assert i.getInstructions() == null; - - int idx = ins.getInstructions().indexOf(before); - assert idx != -1; - - i.setInstructions(ins); - ins.addInstruction(idx, i); - } - - public static int hash(Method method, InstructionContext ic) - { - MessageDigest sha256; - try - { - sha256 = MessageDigest.getInstance("SHA-256"); - } - catch (NoSuchAlgorithmException ex) - { - throw new RuntimeException(ex); - } - - hash(method, sha256, ic); - byte[] res = sha256.digest(); - return Ints.fromByteArray(res); - } - - private static void hash(Method method, MessageDigest sha256, InstructionContext ic) - { - Instruction i = ic.getInstruction(); - - // this relies on all push constants are converted to ldc.. - sha256.update((byte) i.getType().getCode()); - - if (i instanceof PushConstantInstruction) - { - PushConstantInstruction pci = (PushConstantInstruction) i; - Object constant = pci.getConstant(); - if (constant instanceof Number) - { - long l = ((Number) constant).longValue(); - sha256.update(Longs.toByteArray(l)); - } - } - else if (i instanceof LVTInstruction) - { - int idx = ((LVTInstruction) i).getVariableIndex(); - Signature descriptor = method.getDescriptor(); - - int lvt = method.isStatic() ? 0 : 1; - for (Type type : descriptor.getArguments()) - { - if (idx == lvt) - { - // Accessing a method parameter - sha256.update(Ints.toByteArray(idx)); - break; - } - - lvt += type.getSize(); - } - } - - for (StackContext sctx : ic.getPops()) - { - hash(method, sha256, sctx.getPushed()); - } - } - - private boolean alwaysPopsFromSameInstructions(Set instructonContexts, Instruction i) - { - InstructionContext ictx = instructonContexts.iterator().next(); - - for (InstructionContext i2 : instructonContexts) - { - if (!i2.equals(ictx)) - { - // this instruction doesn't always pop the same thing - return false; - } - } - - return true; - } - - private boolean alwaysPoppedBySameInstruction(Set instructonContexts, Instruction i) - { - Set c = new HashSet<>(); - - for (InstructionContext i2 : instructonContexts) - { - i2.getPushes().stream() - .flatMap(sctx -> sctx.getPopped().stream()) - .map(ic -> ic.getInstruction()) - .forEach(i3 -> c.add(i3)); - } - - return c.size() <= 1; - } - - public static int compare(Method method, InstructionType type, InstructionContext ic1, InstructionContext ic2) - { - Instruction i1 = ic1.getInstruction(); - Instruction i2 = ic2.getInstruction(); - - if (type == IF_ICMPEQ || type == IF_ICMPNE - || type == IADD || type == IMUL) - { - if (!(i1 instanceof PushConstantInstruction) - && (i2 instanceof PushConstantInstruction)) - { - return 1; - } - - if (i1 instanceof PushConstantInstruction - && !(i2 instanceof PushConstantInstruction)) - { - return -1; - } - } - - if (type == IF_ACMPEQ || type == IF_ACMPNE) - { - if (!(i1 instanceof AConstNull) - && (i2 instanceof AConstNull)) - { - return 1; - } - - if (i1 instanceof AConstNull - && !(i2 instanceof AConstNull)) - { - return -1; - } - } - - int hash1 = hash(method, ic1); - int hash2 = hash(method, ic2); - - - return Integer.compare(hash1, hash2); - } - - public static int compare(Method method, InstructionType type, Expression expr1, Expression expr2) - { - Instruction i1 = expr1.getHead().getInstruction(); - Instruction i2 = expr2.getHead().getInstruction(); - - if (type == IF_ICMPEQ || type == IF_ICMPNE - || type == IADD || type == IMUL) - { - if (!(i1 instanceof PushConstantInstruction) - && (i2 instanceof PushConstantInstruction)) - { - return 1; - } - - if (i1 instanceof PushConstantInstruction - && !(i2 instanceof PushConstantInstruction)) - { - return -1; - } - } - - if (type == IF_ACMPEQ || type == IF_ACMPNE) - { - if (!(i1 instanceof AConstNull) - && (i2 instanceof AConstNull)) - { - return 1; - } - - if (i1 instanceof AConstNull - && !(i2 instanceof AConstNull)) - { - return -1; - } - } - - int hash1 = hash(method, expr1.getHead()); - int hash2 = hash(method, expr2.getHead()); - - - return Integer.compare(hash1, hash2); - } - - private void insert(Instructions ins, Instruction next, Expression expression) - { - int count = 0; - - if (expression.sortedExprs != null) - { - for (Expression sub : expression.sortedExprs) - { - if (count == 2) - { - Instruction newOp; - if (isCommutative(expression.getType())) - { - // there might be >2 sortedExprs so we can't reuse instructions - newOp = newInstruction(ins, expression.getHead().getInstruction(), expression.getType()); - } - else - { - newOp = expression.getHead().getInstruction(); - assert newOp.getInstructions() == null; - newOp.setInstructions(ins); - } - - int idx = ins.getInstructions().indexOf(next); - assert idx != -1; - - ins.addInstruction(idx, newOp); - count = 1; - } - - insert(ins, next, sub); - ++count; - } - } - - List reverseExpr = new ArrayList<>(expression.getExprs()); - Collections.reverse(reverseExpr); - for (Expression sub : reverseExpr) - { - insert(ins, next, sub); - } - - insert(ins, expression.getHead(), next); - } - - private void visit(MethodContext ctx) - { - Instructions ins = ctx.getMethod().getCode().getInstructions(); - - for (Instruction i : exprIns) - { - Expression expression = exprs.get(i); - assert expression != null; - - if (!canRemove(ctx, ins, i)) - { - continue; - } - - int idx = ins.getInstructions().indexOf(expression.getHead().getInstruction()); - assert idx != -1; - - // get next instruction - Instruction next = ins.getInstructions().get(idx + 1);; - - // remove expression - remove(ins, expression.getHead()); - - // sort expression - expression.sort(ctx); - - // insert expression - insert(ins, next, expression); - - ++count; - } - - exprIns.clear(); - exprs.clear(); - } - - @Override - public void run(ClassGroup group) - { - Execution execution = new Execution(group); - execution.addExecutionVisitor(i -> visit(i)); - execution.addMethodContextVisitor(i -> visit(i)); - execution.populateInitialMethods(); - execution.run(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/Expression.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/Expression.java deleted file mode 100644 index 8ba1dd8c7..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/Expression.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.exprargorder; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; - -public class Expression -{ - private final InstructionContext head; - private final List exprs = new ArrayList<>(); - private final List comExprs = new ArrayList<>(); - - public List sortedExprs; - private int exprHash; - - public Expression(InstructionContext head) - { - this.head = head; - } - - public InstructionType getType() - { - return head.getInstruction().getType(); - } - - public InstructionContext getHead() - { - return head; - } - - public void addExpr(Expression expr) - { - exprs.add(expr); - } - - public List getExprs() - { - return Collections.unmodifiableList(exprs); - } - - public void addComExpr(Expression expr) - { - comExprs.add(expr); - } - - public List getComExprs() - { - return Collections.unmodifiableList(comExprs); - } - - public void sort(MethodContext ctx) - { - for (Expression e : comExprs) - { - e.sort(ctx); - } - for (Expression e : exprs) - { - e.sort(ctx); - } - - sortedExprs = new ArrayList<>(comExprs); - Collections.sort(sortedExprs, (e1, e2) -> ExprArgOrder.compare(ctx.getMethod(), getType(), e1, e2)); - Collections.reverse(sortedExprs); - - int hash = 0; - for (Expression e : sortedExprs) - { - hash ^= e.exprHash; - } - exprHash = hash; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java deleted file mode 100644 index 573aad34d..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.lvt; - -public enum LVTType -{ - INT, - LONG, - OBJECT -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/MapKey.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/MapKey.java deleted file mode 100644 index 2e48cc1c4..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/MapKey.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.lvt; - -import java.util.Objects; - -public class MapKey -{ - private final int idx; - private final LVTType type; - - public MapKey(int idx, LVTType type) - { - this.idx = idx; - this.type = type; - } - - @Override - public int hashCode() - { - int hash = 7; - hash = 89 * hash + this.idx; - hash = 89 * hash + Objects.hashCode(this.type); - return hash; - } - - @Override - public boolean equals(Object obj) - { - if (this == obj) - { - return true; - } - if (obj == null) - { - return false; - } - if (getClass() != obj.getClass()) - { - return false; - } - final MapKey other = (MapKey) obj; - if (this.idx != other.idx) - { - return false; - } - if (this.type != other.type) - { - return false; - } - return true; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/Mappings.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/Mappings.java deleted file mode 100644 index 9be92bed4..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/Mappings.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.lvt; - -import java.util.HashMap; -import java.util.Map; -import net.runelite.asm.attributes.code.instruction.types.LVTInstructionType; - -public class Mappings -{ - - private final int maxVariables; - private int offset; - private Map map = new HashMap<>(); - private Map newIdxMap = new HashMap<>(); - - public Mappings(int maxVariables) - { - this.maxVariables = maxVariables; - } - - private static LVTType toLvtType(LVTInstructionType type) - { - switch (type) - { - case DOUBLE: - case LONG: - return LVTType.LONG; - case FLOAT: - case INT: - return LVTType.INT; - case OBJECT: - return LVTType.OBJECT; - default: - throw new IllegalArgumentException("Unknown type " + type); - } - } - - public Integer remap(int idx, LVTInstructionType type) - { - LVTType seen = map.get(idx); - - if (seen == null) - { - map.put(idx, toLvtType(type)); - } - else if (toLvtType(type) != seen) - { - MapKey key = new MapKey(idx, toLvtType(type)); - - Integer newIdx = newIdxMap.get(key); - if (newIdx == null) - { - newIdx = maxVariables + offset; - newIdxMap.put(key, newIdx); - - offset += type.getSlots(); - } - - return newIdx; - } - - return null; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/menuaction/Comparison.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/menuaction/Comparison.java deleted file mode 100644 index e1f5226cc..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/menuaction/Comparison.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.menuaction; - -import java.util.Objects; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; - -class Comparison -{ - LVTInstruction lvt; - Instruction ldc; - Instruction cmp; - - Label next; - - Number getConstant() - { - return (Number) ((PushConstantInstruction) ldc).getConstant(); - } - - @Override - public int hashCode() - { - int hash = 3; - hash = 41 * hash + Objects.hashCode(this.cmp); - return hash; - } - - @Override - public boolean equals(Object obj) - { - if (this == obj) - { - return true; - } - if (obj == null) - { - return false; - } - if (getClass() != obj.getClass()) - { - return false; - } - final Comparison other = (Comparison) obj; - if (!Objects.equals(this.cmp, other.cmp)) - { - return false; - } - return true; - } - - @Override - public String toString() - { - return "Comparison{" + "lvt=" + lvt + ", ldc=" + ldc + ", cmp=" + cmp + ", next=" + next + '}'; - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/menuaction/MenuActionDeobfuscator.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/menuaction/MenuActionDeobfuscator.java deleted file mode 100644 index 53a9101a5..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/menuaction/MenuActionDeobfuscator.java +++ /dev/null @@ -1,252 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.menuaction; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import static net.runelite.asm.attributes.code.InstructionType.IF_ICMPEQ; -import static net.runelite.asm.attributes.code.InstructionType.IF_ICMPGE; -import static net.runelite.asm.attributes.code.InstructionType.IF_ICMPGT; -import static net.runelite.asm.attributes.code.InstructionType.IF_ICMPLE; -import static net.runelite.asm.attributes.code.InstructionType.IF_ICMPLT; -import static net.runelite.asm.attributes.code.InstructionType.IF_ICMPNE; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.Goto; -import net.runelite.asm.attributes.code.instructions.If; -import net.runelite.asm.attributes.code.instructions.IfICmpEq; -import net.runelite.asm.attributes.code.instructions.IfICmpNe; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.deob.Deobfuscator; - -/** - * Sort the ifs in menuAction - * - * @author Adam - */ -public class MenuActionDeobfuscator implements Deobfuscator -{ - private static final int THRESHOLD_EQ = 50; - private static final int THRESHOLD_LT = 1; - - @Override - public void run(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - run(m); - } - } - } - - private void run(Method method) - { - if (method.getCode() == null) - { - return; - } - - Execution execution = new Execution(method.getClassFile().getGroup()); - execution.addMethod(method); - execution.noInvoke = true; - - Multimap comps = HashMultimap.create(); - - execution.addExecutionVisitor((InstructionContext ictx) -> - { - Instruction i = ictx.getInstruction(); - Frame frame = ictx.getFrame(); - - if (i instanceof If) - { - InstructionContext ctx1 = ictx.getPops().get(0).getPushed(); // constant - InstructionContext ctx2 = ictx.getPops().get(1).getPushed(); // lvt - - if (ctx1.getInstruction() instanceof PushConstantInstruction - && ctx2.getInstruction() instanceof LVTInstruction) - { - Comparison comparison = new Comparison(); - comparison.cmp = i; - comparison.ldc = ctx1.getInstruction(); - comparison.lvt = (LVTInstruction) ctx2.getInstruction(); - - comps.put(comparison.lvt.getVariableIndex(), comparison); - } - } - }); - - execution.run(); - - for (int i : comps.keySet()) - { - Collection get = comps.get(i); - long l = get.stream().filter(c -> c.cmp.getType() == IF_ICMPGE - || c.cmp.getType() == IF_ICMPGT - || c.cmp.getType() == IF_ICMPLE - || c.cmp.getType() == IF_ICMPLT - ).count(); - - List eqcmp = get.stream() - .filter(c -> c.cmp.getType() == IF_ICMPEQ || c.cmp.getType() == IF_ICMPNE) - .collect(Collectors.toList()); - - if (get.size() > THRESHOLD_EQ && l <= THRESHOLD_LT) - { - insert(method, eqcmp); - } - } - } - - private void insert(Method method, List comparisons) - { - Instructions instructions = method.getCode().getInstructions(); - List ins = instructions.getInstructions(); - - // replace all if(var == constant) with a jump to the false branch - // then, insert before the first jump the ifs to jump to the old - // true branch - // - // this is probably actually lookupswitch but it isn't mappable - // currently... - int min = -1; - - for (Comparison comp : comparisons) - { - if (min == -1) - { - min = ins.indexOf(comp.lvt); - } - else - { - min = Math.min(min, ins.indexOf(comp.lvt)); - } - - if (comp.cmp.getType() == InstructionType.IF_ICMPEQ) - { - If cmp = (If) comp.cmp; - - // remove - instructions.remove(comp.ldc); - instructions.remove((Instruction) comp.lvt); - instructions.remove(comp.cmp); - - comp.next = cmp.getJumps().get(0); - } - else if (comp.cmp.getType() == InstructionType.IF_ICMPNE) - { - // replace with goto dest - If cmp = (If) comp.cmp; - - int idx = ins.indexOf(cmp); - assert idx != -1; - comp.next = instructions.createLabelFor(ins.get(idx + 1)); - - instructions.remove(comp.ldc); - instructions.remove((Instruction) comp.lvt); - - instructions.replace(comp.cmp, new Goto(instructions, cmp.getJumps().get(0))); - } - else - { - throw new IllegalStateException(); - } - } - - assert min != -1; - - // sort comparisons - but if they jump to the same address, they are equal.. - List sortedComparisons = new ArrayList<>(comparisons); - Collections.sort(sortedComparisons, (c1, c2) -> compare(comparisons, c1, c2)); - - // reinsert jumps - for (int i = 0; i < sortedComparisons.size(); ++i) - { - Comparison comp = sortedComparisons.get(i); - Instruction lvt = (Instruction) comp.lvt; - - lvt.setInstructions(instructions); - comp.ldc.setInstructions(instructions); - - instructions.addInstruction(min++, lvt); - instructions.addInstruction(min++, comp.ldc); - - // use if_icmpeq if what follows also jumps to the same location - boolean multiple = i + 1 < sortedComparisons.size() - && sortedComparisons.get(i + 1).next == comp.next; - if (multiple) - { - instructions.addInstruction(min++, new IfICmpEq(instructions, comp.next)); - } - else - { - - // fernflower decompiles a series of if_icmpeq as chains of not equal expressions - Label label = instructions.createLabelFor(ins.get(min)); - instructions.addInstruction(min++, new IfICmpNe(instructions, label)); - instructions.addInstruction(min++, new Goto(instructions, comp.next)); - ++min; // go past label - } - } - } - - private int compare(List comparisons, Comparison c1, Comparison c2) - { - // Compare by constant - - assert comparisons.contains(c1); - assert comparisons.contains(c2); - - // The constant of a comparison is the lowest comparison that jumps to the same location, - // if all jumps to the same label are in the same location fernflower will decompile - // to if (foo || bar) - Comparison mc1 = comparisons.stream() - .filter(c -> c1.next == c.next) - .min((m1, m2) -> Integer.compare(m1.getConstant().intValue(), m2.getConstant().intValue())) - .get(); - - Comparison mc2 = comparisons.stream() - .filter(c -> c2.next == c.next) - .min((m1, m2) -> Integer.compare(m1.getConstant().intValue(), m2.getConstant().intValue())) - .get(); - - return Integer.compare(mc1.getConstant().intValue(), mc2.getConstant().intValue()); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketLengthFinder.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketLengthFinder.java deleted file mode 100644 index ec322df3d..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketLengthFinder.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.packethandler; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.IALoad; -import net.runelite.asm.attributes.code.instructions.PutStatic; - -public class PacketLengthFinder -{ - private final ClassGroup group; - private final PacketTypeFinder packetType; - - private Field packetLength; - private GetStatic getArray; - private GetStatic getType; - private IALoad load; - private PutStatic store; - - public PacketLengthFinder(ClassGroup group, PacketTypeFinder packetType) - { - this.group = group; - this.packetType = packetType; - } - - public Field getPacketLength() - { - return packetLength; - } - - public GetStatic getGetArray() - { - return getArray; - } - - public GetStatic getGetType() - { - return getType; - } - - public IALoad getLoad() - { - return load; - } - - public PutStatic getStore() - { - return store; - } - - public void find() - { - for (ClassFile cf : group.getClasses()) - { - for (Method method : cf.getMethods()) - { - run(method.getCode()); - } - } - } - - // getstatic class272/field3690 [I - // getstatic Client/packetType I - // iaload - // putstatic Client/packetLength I - private void run(Code code) - { - if (code == null) - { - return; - } - - Instructions instructions = code.getInstructions(); - Field type = packetType.getPacketType(); - - for (int i = 0; i < instructions.getInstructions().size() - 3; ++i) - { - Instruction i1 = instructions.getInstructions().get(i), - i2 = instructions.getInstructions().get(i + 1), - i3 = instructions.getInstructions().get(i + 2), - i4 = instructions.getInstructions().get(i + 3); - - if (!(i1 instanceof GetStatic)) - { - continue; - } - - if (!(i2 instanceof GetStatic)) - { - continue; - } - - GetStatic gs = (GetStatic) i2; - - if (gs.getMyField() != type) - { - continue; - } - - if (!(i3 instanceof IALoad)) - { - continue; - } - - if (!(i4 instanceof PutStatic)) - { - continue; - } - - PutStatic ps = (PutStatic) i4; - assert packetLength == null : "packetLength already found"; - packetLength = ps.getMyField(); - getArray = (GetStatic) i1; - getType = gs; - load = (IALoad) i3; - store = ps; - return; - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketRead.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketRead.java deleted file mode 100644 index 8faf63dc0..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketRead.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.packethandler; - -import java.util.Objects; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.execution.InstructionContext; - -public class PacketRead -{ - private final Type type; // type of read, from return of function - private final Instruction getBuffer; // getstatic - private final InstructionContext invokeCtx; - private final Instruction invoke; // invoke instruction to read data - private Instruction store; // lvt store for reorderable reads - - public PacketRead(Type type, Instruction getBuffer, InstructionContext invokeCtx) - { - this.type = type; - this.getBuffer = getBuffer; - this.invokeCtx = invokeCtx; - this.invoke = invokeCtx.getInstruction(); - } - - public Type getType() - { - return type; - } - - public Instruction getGetBuffer() - { - return getBuffer; - } - - public InstructionContext getInvokeCtx() - { - return invokeCtx; - } - - public Instruction getInvoke() - { - return invoke; - } - - public Instruction getStore() - { - return store; - } - - public void setStore(Instruction store) - { - this.store = store; - } - - @Override - public int hashCode() - { - int hash = 5; - hash = 37 * hash + Objects.hashCode(this.type); - hash = 37 * hash + Objects.hashCode(this.invoke); - return hash; - } - - @Override - public boolean equals(Object obj) - { - if (this == obj) - { - return true; - } - if (obj == null) - { - return false; - } - if (getClass() != obj.getClass()) - { - return false; - } - final PacketRead other = (PacketRead) obj; - if (!Objects.equals(this.type, other.type)) - { - return false; - } - if (!Objects.equals(this.invoke, other.invoke)) - { - return false; - } - return true; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketTypeFinder.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketTypeFinder.java deleted file mode 100644 index d6883aa07..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketTypeFinder.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.packethandler; - -import com.google.common.base.Objects; -import java.util.HashMap; -import java.util.Map; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; - -public class PacketTypeFinder -{ - private final ClassGroup group; - - private final Map sets = new HashMap<>(); - private Field packetType; - - public PacketTypeFinder(ClassGroup group) - { - this.group = group; - } - - public Field getPacketType() - { - return packetType; - } - - public void find() - { - for (ClassFile cf : group.getClasses()) - { - for (Method method : cf.getMethods()) - { - run(method.getCode()); - } - } - - packetType = sets.entrySet().stream() - .max((entry1, entry2) -> Integer.compare(entry1.getValue(), entry2.getValue())) - .get() - .getKey(); - } - - private void run(Code code) - { - if (code == null) - { - return; - } - - Instructions instructions = code.getInstructions(); - - for (int i = 0; i < instructions.getInstructions().size() - 1; ++i) - { - Instruction i1 = instructions.getInstructions().get(i), - i2 = instructions.getInstructions().get(i + 1); - - if (i1 instanceof PushConstantInstruction && i2.getType() == InstructionType.PUTSTATIC) - { - PushConstantInstruction pci = (PushConstantInstruction) i1; - SetFieldInstruction sfi = (SetFieldInstruction) i2; - Field field = sfi.getMyField(); - - if (Objects.equal(-1, pci.getConstant()) && field != null) - { - Integer count = sets.get(field); - if (count == null) - { - sets.put(field, 1); - } - else - { - sets.put(field, count + 1); - } - } - } - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/OpcodeReplacer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/OpcodeReplacer.java deleted file mode 100644 index 3a80fca26..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/OpcodeReplacer.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.packetwrite; - -import java.util.Collection; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.PutStatic; -import static net.runelite.deob.deobfuscators.transformers.OpcodesTransformer.RUNELITE_OPCODES; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ACC_STATIC; - -class OpcodeReplacer -{ - public void run(ClassGroup group, Collection writes) - { - int count = 0; - - ClassFile runeliteOpcodes = group.findClass(RUNELITE_OPCODES); - assert runeliteOpcodes != null : "Opcodes class must exist"; - - for (PacketWrite wp : writes) - { - Instructions ins = wp.getInstructions(); - - Instruction param = wp.getOpcodeIns(); - if (!(param instanceof PushConstantInstruction)) - { - continue; - } - - final String fieldName = "PACKET_CLIENT_" + wp.getOpcode(); - - net.runelite.asm.pool.Field field = new net.runelite.asm.pool.Field( - new net.runelite.asm.pool.Class(RUNELITE_OPCODES), - fieldName, - Type.INT - ); - ins.replace(param, new GetStatic(ins, field)); - - if (runeliteOpcodes.findField(fieldName) == null) - { - Field opField = new Field(runeliteOpcodes, fieldName, Type.INT); - // ACC_FINAL causes javac to inline the fields, which prevents - // the mapper from doing field mapping - opField.setAccessFlags(ACC_PUBLIC | ACC_STATIC); - // setting a non-final static field value - // doesn't work with fernflower - opField.setValue(wp.getOpcode()); - runeliteOpcodes.addField(opField); - - // add initialization - Method clinit = runeliteOpcodes.findMethod(""); - assert clinit != null; - Instructions instructions = clinit.getCode().getInstructions(); - instructions.addInstruction(0, new LDC(instructions, wp.getOpcode())); - instructions.addInstruction(1, new PutStatic(instructions, opField)); - } - - ++count; - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/PacketWrite.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/PacketWrite.java deleted file mode 100644 index 672aa826f..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/PacketWrite.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.packetwrite; - -import java.util.ArrayList; -import java.util.List; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.execution.InstructionContext; - -class PacketWrite -{ - InstructionContext putOpcode; - List writes = new ArrayList<>(); - - Instruction getOpcodeIns() - { - return putOpcode.getPops().get(0).getPushed().getInstruction(); - } - - public int getOpcode() - { - return ((Number) ((PushConstantInstruction) getOpcodeIns()).getConstant()).intValue(); - } - - Instructions getInstructions() - { - return putOpcode.getInstruction().getInstructions(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/PacketWriteDeobfuscator.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/PacketWriteDeobfuscator.java deleted file mode 100644 index 034da3682..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/PacketWriteDeobfuscator.java +++ /dev/null @@ -1,331 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.packetwrite; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.Goto; -import net.runelite.asm.attributes.code.instructions.If; -import net.runelite.asm.attributes.code.instructions.If0; -import net.runelite.asm.attributes.code.instructions.IfEq; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.pool.Method; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Deobfuscator; -import net.runelite.deob.c2s.RWOpcodeFinder; -import static net.runelite.asm.attributes.code.InstructionType.INVOKEVIRTUAL; - -public class PacketWriteDeobfuscator implements Deobfuscator -{ - private static final String RUNELITE_PACKET = "RUNELITE_PACKET"; - - private final OpcodeReplacer opcodeReplacer = new OpcodeReplacer(); - - private RWOpcodeFinder rw; - private PacketWrite cur; - private final Map writes = new HashMap<>(); - - public void visit(InstructionContext ctx) - { - if (isEnd(ctx)) - { - end(); - return; - } - - if (ctx.getInstruction().getType() != INVOKEVIRTUAL) - { - return; - } - - InvokeInstruction ii = (InvokeInstruction) ctx.getInstruction(); - - if (ii.getMethods().contains(rw.getWriteOpcode())) - { - end(); - PacketWrite write = start(); - write.putOpcode = ctx; - return; - } - - PacketWrite write = cur; - if (write == null) - { - return; - } - - if (!ii.getMethod().getClazz().getName().equals(rw.getWriteOpcode().getClassFile().getSuperName())) - { - return; - } - - write.writes.add(ctx); - } - - private PacketWrite start() - { - end(); - cur = new PacketWrite(); - return cur; - } - - private void end() - { - if (cur != null) - { - if (!writes.containsKey(cur.putOpcode.getInstruction())) - { - writes.put(cur.putOpcode.getInstruction(), cur); - } - cur = null; - } - } - - private boolean isEnd(InstructionContext ctx) - { - // conditions where packet write ends: - // any invoke that isn't to the packet buffer - // any variable assignment - // any field assignment - // any conditional jump - // any return - - Instruction i = ctx.getInstruction(); - - if (i instanceof InvokeInstruction) - { - InvokeInstruction ii = (InvokeInstruction) i; - Method method = ii.getMethod(); - - if (!method.getClazz().equals(rw.getSecretBuffer().getPoolClass()) - && !method.getClazz().equals(rw.getBuffer().getPoolClass())) - { - return true; - } - } - - if (i instanceof LVTInstruction) - { - LVTInstruction lvt = (LVTInstruction) i; - if (lvt.store()) - { - return true; - } - } - - if (i instanceof SetFieldInstruction) - { - return true; - } - - if (i instanceof If || i instanceof If0) - { - return true; - } - - if (i instanceof ReturnInstruction) - { - return true; - } - - return false; - } - - @Override - public void run(ClassGroup group) - { - rw = new RWOpcodeFinder(group); - rw.find(); - - Execution e = new Execution(group); - e.addExecutionVisitor(this::visit); - e.populateInitialMethods(); - e.run(); - - end(); - - opcodeReplacer.run(group, writes.values()); - - int count = 0; - int writesCount = 0; - - for (PacketWrite write : writes.values()) - { - if (write.writes.isEmpty()) - { - continue; - } - - insert(group, write); - ++count; - writesCount += write.writes.size(); - } - } - - private void insert(ClassGroup group, PacketWrite write) - { - Instructions instructions = write.putOpcode.getInstruction().getInstructions(); - List ins = instructions.getInstructions(); - - InstructionContext firstWrite = write.writes.get(0); - InstructionContext lastWrite = write.writes.get(write.writes.size() - 1); - - int idx = ins.indexOf(lastWrite.getInstruction()); - assert idx != -1; - ++idx; // past write - - Label afterWrites = instructions.createLabelFor(ins.get(idx)); - - // pops arg, getfield - InstructionContext beforeFirstWrite = firstWrite.getPops().get(1).getPushed(); - Label putOpcode = instructions.createLabelFor(beforeFirstWrite.getInstruction(), true); - - idx = ins.indexOf(beforeFirstWrite.getInstruction()); - assert idx != -1; - --idx; - - net.runelite.asm.pool.Field field = new net.runelite.asm.pool.Field( - new net.runelite.asm.pool.Class(findClient(group).getName()), - RUNELITE_PACKET, - Type.BOOLEAN - ); - - instructions.addInstruction(idx++, new GetStatic(instructions, field)); - instructions.addInstruction(idx++, new IfEq(instructions, putOpcode)); - Instruction before = ins.get(idx); - for (InstructionContext ctx : write.writes) - { - insert(instructions, ctx, before); - } - idx = ins.indexOf(before); - instructions.addInstruction(idx++, new Goto(instructions, afterWrites)); - } - - private void insert(Instructions ins, InstructionContext ic, Instruction before) - { - List pops = new ArrayList<>(ic.getPops()); - Collections.reverse(pops); - for (StackContext sc : pops) - { - insert(ins, sc.getPushed(), before); - } - - Instruction i = ic.getInstruction().clone(); - i = translate(i); - assert i.getInstructions() == ins; - - int idx = ins.getInstructions().indexOf(before); - assert idx != -1; - - ins.addInstruction(idx, i); - } - - private Instruction translate(Instruction i) - { - if (!(i instanceof InvokeVirtual)) - { - return i; - } - - InvokeVirtual ii = (InvokeVirtual) i; - Method invoked = ii.getMethod(); - - assert invoked.getType().size() == 1; - - Type argumentType = invoked.getType().getTypeOfArg(0); - - Method invokeMethod; - if (argumentType.equals(Type.BYTE)) - { - invokeMethod = new Method( - ii.getMethod().getClazz(), - "runeliteWriteByte", - new Signature("(B)V") - ); - } - else if (argumentType.equals(Type.SHORT)) - { - invokeMethod = new Method( - ii.getMethod().getClazz(), - "runeliteWriteShort", - new Signature("(S)V") - ); - } - else if (argumentType.equals(Type.INT)) - { - invokeMethod = new Method( - ii.getMethod().getClazz(), - "runeliteWriteInt", - new Signature("(I)V") - ); - } - else if (argumentType.equals(Type.LONG)) - { - invokeMethod = new Method( - ii.getMethod().getClazz(), - "runeliteWriteLong", - new Signature("(J)V") - ); - } - else if (argumentType.equals(Type.STRING)) - { - invokeMethod = new Method( - ii.getMethod().getClazz(), - "runeliteWriteString", - new Signature("(Ljava/lang/String;)V") - ); - } - else - { - throw new IllegalStateException("Unknown type " + argumentType); - } - - return new InvokeVirtual(i.getInstructions(), invokeMethod); - } - - private ClassFile findClient(ClassGroup group) - { - // "client" in vainlla but "Client" in deob.. - ClassFile cf = group.findClass("client"); - return cf != null ? cf : group.findClass("Client"); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ClientErrorTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ClientErrorTransformer.java deleted file mode 100644 index c322b1b3c..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ClientErrorTransformer.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.transformers; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.IfNull; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.attributes.code.instructions.VReturn; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Transformer; - -public class ClientErrorTransformer implements Transformer -{ - private boolean done = false; - - @Override - public void transform(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - transform(m); - } - } - - } - - private void transform(Method m) - { - if (!m.isStatic() || m.getDescriptor().size() != 2 - || !m.getDescriptor().getTypeOfArg(0).equals(Type.STRING) - || !m.getDescriptor().getTypeOfArg(1).equals(Type.THROWABLE)) - return; - - Code code = m.getCode(); - Instructions ins = code.getInstructions(); - - /* - Makes it so the old code in this method is logically dead, - letting the mapper map it but making it so it's never executed. - */ - - Instruction aload0 = new ALoad(ins, 1); // load throwable - - IfNull ifNull = new IfNull(ins, InstructionType.IFNULL); - ifNull.setTo(ins.createLabelFor(ins.getInstructions().get(0))); - - Instruction aload1 = new ALoad(ins, 1); // load throwable - - InvokeVirtual printStackTrace = new InvokeVirtual(ins, - new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class("java/lang/Throwable"), - "printStackTrace", - new Signature("()V") - ) - ); - - Instruction ret = new VReturn(ins); - - ins.addInstruction(0, aload0); - ins.addInstruction(1, ifNull); - ins.addInstruction(2, aload1); - ins.addInstruction(3, printStackTrace); - ins.addInstruction(4, ret); - - done = true; - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/GetPathTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/GetPathTransformer.java deleted file mode 100644 index 2da257963..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/GetPathTransformer.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.deobfuscators.transformers; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.Pop; -import net.runelite.deob.Transformer; - -public class GetPathTransformer implements Transformer -{ - - private boolean done = false; - - @Override - public void transform(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - transform(m); - } - } - } - - private void transform(Method m) - { - int count = 0; - - if (m.getCode() == null) - { - return; - } - - for (Instruction i : m.getCode().getInstructions().getInstructions()) - { - if (i instanceof InvokeInstruction) - { - InvokeInstruction ii = (InvokeInstruction) i; - - if (ii.getMethod().getName().equals("getPath")) - { - if (++count == 2) - { - removeInvoke(i); - done = true; - break; - } - } - } - } - } - - private void removeInvoke(Instruction i) - { - Instructions ins = i.getInstructions(); - - int idx = ins.getInstructions().indexOf(i); - - ins.remove(i); - ins.getInstructions().add(idx, new Pop(ins)); // pop File - ins.getInstructions().add(idx + 1, new LDC(ins, "")); - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/GraphicsObjectTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/GraphicsObjectTransformer.java deleted file mode 100644 index 264707886..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/GraphicsObjectTransformer.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.runelite.deob.deobfuscators.transformers; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.VReturn; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Transformer; - -public class GraphicsObjectTransformer implements Transformer // robots in disguise -{ - private static final String GRAPHICS_OBJECT = "GraphicsObject"; - private static final String RENDERABLE = "Renderable"; - - @Override - public void transform(ClassGroup group) - { - ClassFile graphicsObject = group.findClass(GRAPHICS_OBJECT); - ClassFile renderable = group.findClass(RENDERABLE); - - graphicsObject.clearFinal(); - - Method initGraphicsObject = new Method(graphicsObject, "", new Signature("()V")); - initGraphicsObject.setPublic(); - - final Code code = new Code(initGraphicsObject); - code.setMaxStack(1); - initGraphicsObject.setCode(code); - graphicsObject.addMethod(initGraphicsObject); - - Instructions ins = code.getInstructions(); - - ins.addInstruction(new ALoad(ins, 0)); - ins.addInstruction(new InvokeSpecial(ins, new net.runelite.asm.pool.Method(renderable.getPoolClass(), "", new Signature("()V")))); - ins.addInstruction(new VReturn(ins)); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/MaxMemoryTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/MaxMemoryTransformer.java deleted file mode 100644 index 5617698df..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/MaxMemoryTransformer.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.transformers; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.Dup; -import net.runelite.asm.attributes.code.instructions.I2L; -import net.runelite.asm.attributes.code.instructions.IAdd; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.New; -import net.runelite.asm.attributes.code.instructions.Pop; -import net.runelite.asm.pool.Class; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Transformer; - -public class MaxMemoryTransformer implements Transformer -{ - private boolean done = false; - - @Override - public void transform(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - transform(m); - } - } - } - - private void transform(Method m) - { - Code code = m.getCode(); - - if (code == null) - { - return; - } - - Instructions ins = code.getInstructions(); - - for (Instruction i : ins.getInstructions()) - { - if (i instanceof InvokeVirtual) - { - /* - invokestatic java/lang/Runtime/getRuntime()Ljava/lang/Runtime; - invokevirtual java/lang/Runtime/maxMemory()J - ldc2_w 1048576 - ldiv - l2i - */ - if (((InvokeVirtual) i).getMethod().getName().equals("maxMemory")) - { - insert(ins, ins.getInstructions().indexOf(i)); - done = true; - break; - } - } - } - } - - private void insert(Instructions ins, int idx) - { - Class randomClass = new net.runelite.asm.pool.Class("java/util/Random"); - - ins.getInstructions().remove(idx); - ins.getInstructions().add(idx++, new Pop(ins)); // pop runtime - ins.getInstructions().add(idx++, new New(ins, randomClass)); - ins.getInstructions().add(idx++, new Dup(ins)); - ins.getInstructions().add(idx++, new InvokeSpecial(ins, new net.runelite.asm.pool.Method(randomClass, "", new Signature("()V")))); // new Random - ins.getInstructions().add(idx++, new LDC(ins, 31457280)); - ins.getInstructions().add(idx++, new InvokeVirtual(ins, new net.runelite.asm.pool.Method(randomClass, "nextInt", new Signature("(I)I")))); // nextInt(31457280) - ins.getInstructions().add(idx++, new LDC(ins, 230686720)); - ins.getInstructions().add(idx++, new IAdd(ins)); // 230686720 + nextInt(31457280) - ins.getInstructions().add(idx++, new I2L(ins)); - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/OpcodesTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/OpcodesTransformer.java deleted file mode 100644 index d515c3bcd..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/OpcodesTransformer.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.transformers; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.VReturn; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Transformer; -import org.objectweb.asm.Opcodes; - -public class OpcodesTransformer implements Transformer -{ - public static final String RUNELITE_OPCODES = "net/runelite/rs/Opcodes"; - - @Override - public void transform(ClassGroup group) - { - ClassFile runeliteOpcodes = group.findClass(RUNELITE_OPCODES); - if (runeliteOpcodes == null) - { - runeliteOpcodes = new ClassFile(group); - runeliteOpcodes.setName(RUNELITE_OPCODES); - runeliteOpcodes.setSuperName(Type.OBJECT.getInternalName()); - runeliteOpcodes.setAccess(Opcodes.ACC_PUBLIC); - group.addClass(runeliteOpcodes); - } - else - { - runeliteOpcodes.getFields().clear(); - } - - Method clinit = runeliteOpcodes.findMethod(""); - if (clinit == null) - { - clinit = new Method(runeliteOpcodes, "", new Signature("()V")); - clinit.setStatic(true); - Code code = new Code(clinit); - code.setMaxStack(1); - clinit.setCode(code); - runeliteOpcodes.addMethod(clinit); - - Instructions instructions = code.getInstructions(); - instructions.addInstruction(new VReturn(instructions)); - } - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ReflectionTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ReflectionTransformer.java deleted file mode 100644 index 3a818b1d4..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ReflectionTransformer.java +++ /dev/null @@ -1,243 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.transformers; - -import java.util.ArrayList; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Transformer; - -public class ReflectionTransformer implements Transformer -{ - @Override - public void transform(ClassGroup group) - { - for (ClassFile cf : group.getClasses()) - { - for (Method method : cf.getMethods()) - { - transform(method); - } - } - } - - private void transform(Method method) - { - Code code = method.getCode(); - - if (code == null) - { - return; - } - - Instructions ins = code.getInstructions(); - - for (Instruction i : new ArrayList<>(ins.getInstructions())) - { - transformFindClass(i); - transformMethodName(ins, i); - transformGetParameterTypes(ins, i); - transformGetDeclaredField(ins, i); - transformSetInt(ins, i); - transformGetInt(ins, i); - transformInvokeVirtual(ins, i); - } - } - - // invokestatic java/lang/Class/forName(Ljava/lang/String;)Ljava/lang/Class; - // to - // invokestatic net/runelite/rs/Reflection/findClass(Ljava/lang/String;)Ljava/lang/Class; - private void transformFindClass(Instruction i) - { - if (!(i instanceof InvokeStatic)) - { - return; - } - - InvokeStatic is = (InvokeStatic) i; - - if (is.getMethod().getClazz().getName().equals("java/lang/Class") - && is.getMethod().getName().equals("forName")) - { - is.setMethod( - new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class("net/runelite/rs/Reflection"), "findClass", new Signature("(Ljava/lang/String;)Ljava/lang/Class;") - ) - ); - - } - } - - // invokevirtual java/lang/reflect/Method/getName()Ljava/lang/String; - // to - // invokestatic net/runelite/rs/Reflection/getMethodName(Ljava/lang/reflect/Method;)Ljava/lang/String; - private void transformMethodName(Instructions instructions, Instruction i) - { - if (!(i instanceof InvokeVirtual)) - { - return; - } - - InvokeVirtual iv = (InvokeVirtual) i; - - if (iv.getMethod().getClazz().getName().equals("java/lang/reflect/Method") - && iv.getMethod().getName().equals("getName")) - { - InvokeStatic is = new InvokeStatic(instructions, - new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class("net/runelite/rs/Reflection"), "getMethodName", new Signature("(Ljava/lang/reflect/Method;)Ljava/lang/String;") - ) - ); - instructions.replace(iv, is); - - } - } - - // invokevirtual java/lang/reflect/Method/getParameterTypes()[Ljava/lang/Class; - // to - // invokestatic net/runelite/rs/Reflection/getParameterTypes(Ljava/lang/reflect/Method;)[Ljava/lang/Class; - private void transformGetParameterTypes(Instructions instructions, Instruction i) - { - if (!(i instanceof InvokeVirtual)) - { - return; - } - - InvokeVirtual iv = (InvokeVirtual) i; - - if (iv.getMethod().getClazz().getName().equals("java/lang/reflect/Method") - && iv.getMethod().getName().equals("getParameterTypes")) - { - InvokeStatic is = new InvokeStatic(instructions, - new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class("net/runelite/rs/Reflection"), "getParameterTypes", new Signature("(Ljava/lang/reflect/Method;)[Ljava/lang/Class;") - ) - ); - instructions.replace(iv, is); - - } - } - - // invokevirtual java/lang/Class/getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field; - // to - // invokestatic net/runelite/rs/Reflection/findField - private void transformGetDeclaredField(Instructions instructions, Instruction i) - { - if (!(i instanceof InvokeVirtual)) - { - return; - } - - InvokeVirtual iv = (InvokeVirtual) i; - - if (iv.getMethod().getClazz().getName().equals("java/lang/Class") - && iv.getMethod().getName().equals("getDeclaredField")) - { - InvokeStatic is = new InvokeStatic(instructions, - new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class("net/runelite/rs/Reflection"), "findField", new Signature("(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;") - ) - ); - instructions.replace(iv, is); - - } - } - - // invokevirtual java/lang/reflect/Field/setInt(Ljava/lang/Object;I)V - private void transformSetInt(Instructions instructions, Instruction i) - { - if (!(i instanceof InvokeVirtual)) - { - return; - } - - InvokeVirtual iv = (InvokeVirtual) i; - - if (iv.getMethod().getClazz().getName().equals("java/lang/reflect/Field") - && iv.getMethod().getName().equals("setInt")) - { - InvokeStatic is = new InvokeStatic(instructions, - new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class("net/runelite/rs/Reflection"), "setInt", new Signature("(Ljava/lang/reflect/Field;Ljava/lang/Object;I)V") - ) - ); - instructions.replace(iv, is); - - } - } - - // invokevirtual java/lang/reflect/Field/getInt(Ljava/lang/Object;)I - private void transformGetInt(Instructions instructions, Instruction i) - { - if (!(i instanceof InvokeVirtual)) - { - return; - } - - InvokeVirtual iv = (InvokeVirtual) i; - - if (iv.getMethod().getClazz().getName().equals("java/lang/reflect/Field") - && iv.getMethod().getName().equals("getInt")) - { - InvokeStatic is = new InvokeStatic(instructions, - new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class("net/runelite/rs/Reflection"), "getInt", new Signature("(Ljava/lang/reflect/Field;Ljava/lang/Object;)I") - ) - ); - instructions.replace(iv, is); - - } - } - - // invokevirtual java/lang/reflect/Method/invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; - private void transformInvokeVirtual(Instructions instructions, Instruction i) - { - if (!(i instanceof InvokeVirtual)) - { - return; - } - - InvokeVirtual iv = (InvokeVirtual) i; - - if (iv.getMethod().getClazz().getName().equals("java/lang/reflect/Method") - && iv.getMethod().getName().equals("invoke")) - { - InvokeStatic is = new InvokeStatic(instructions, - new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class("net/runelite/rs/Reflection"), "invoke", new Signature("(Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;") - ) - ); - instructions.replace(iv, is); - - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/RuneliteBufferTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/RuneliteBufferTransformer.java deleted file mode 100644 index aeb52d276..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/RuneliteBufferTransformer.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.transformers; - -import java.io.IOException; -import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import static net.runelite.asm.attributes.code.InstructionType.RETURN; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.IfEq; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Transformer; -import net.runelite.deob.c2s.RWOpcodeFinder; -import net.runelite.deob.deobfuscators.transformers.buffer.BufferFinder; -import net.runelite.deob.deobfuscators.transformers.buffer.BufferMethodInjector; -import net.runelite.deob.deobfuscators.transformers.buffer.BufferPayloadFinder; -import net.runelite.deob.deobfuscators.transformers.buffer.PacketFlushFinder; -import org.objectweb.asm.Opcodes; - -public class RuneliteBufferTransformer implements Transformer -{ - private static final String RUNELITE_PACKET = "RUNELITE_PACKET"; - private static final String RUNELITE_INIT_PACKET = "runeliteInitPacket"; - private static final String RUNELITE_FINISH_PACKET = "runeliteFinishPacket"; - - @Override - public void transform(ClassGroup group) - { - injectRunelitePacket(group); - injectBufferMethods(group); - injectLengthHeader(group); - injectPacketFinish(group); - } - - /** - * inject RUNELITE_PACKET field - * - * @param group - */ - private void injectRunelitePacket(ClassGroup group) - { - ClassFile client = findClient(group); - assert client != null : "no client class"; - - if (client.findField(RUNELITE_PACKET) != null) - { - return; - } - - Field field = new Field(client, RUNELITE_PACKET, Type.BOOLEAN); - field.setAccessFlags(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC); - client.addField(field); - } - - private ClassFile findClient(ClassGroup group) - { - // "client" in vainlla but "Client" in deob.. - ClassFile cf = group.findClass("client"); - return cf != null ? cf : group.findClass("Client"); - } - - /** - * inject runelite buffer methods - * - * @param group - */ - private void injectBufferMethods(ClassGroup group) - { - BufferFinder bf = new BufferFinder(group); - bf.find(); - - BufferPayloadFinder bpf = new BufferPayloadFinder(bf.getBuffer()); - bpf.find(); - - BufferMethodInjector bmi = new BufferMethodInjector(bpf); - try - { - bmi.inject(); - } - catch (IOException ex) - { - } - } - - /** - * inject the length header after the packet opcode - * - * @param group - */ - private void injectLengthHeader(ClassGroup group) - { - RWOpcodeFinder rw = new RWOpcodeFinder(group); - rw.find(); - - Method writeOpcode = rw.getWriteOpcode(); - Code code = writeOpcode.getCode(); - Instructions instructions = code.getInstructions(); - List ins = instructions.getInstructions(); - - Instruction start = ins.get(0); - Instruction end = ins.stream().filter(i -> i.getType() == RETURN).findFirst().get(); - - Label labelForStart = instructions.createLabelFor(start); - Label labelForEnd = instructions.createLabelFor(end); - - final net.runelite.asm.pool.Field runelitePacketField = new net.runelite.asm.pool.Field( - new net.runelite.asm.pool.Class(findClient(group).getName()), - RUNELITE_PACKET, - Type.BOOLEAN - ); - - int idx = ins.indexOf(labelForStart); - - instructions.addInstruction(idx++, new GetStatic(instructions, runelitePacketField)); - instructions.addInstruction(idx++, new IfEq(instructions, labelForStart)); - - net.runelite.asm.pool.Method method = new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class(writeOpcode.getClassFile().getName()), - RUNELITE_FINISH_PACKET, - new Signature("()V") - ); - instructions.addInstruction(idx++, new ALoad(instructions, 0)); - instructions.addInstruction(idx++, new InvokeVirtual(instructions, method)); - - idx = ins.indexOf(labelForEnd); - - instructions.addInstruction(idx++, new GetStatic(instructions, runelitePacketField)); - instructions.addInstruction(idx++, new IfEq(instructions, labelForEnd)); - - method = new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class(writeOpcode.getClassFile().getName()), - RUNELITE_INIT_PACKET, - new Signature("()V") - ); - instructions.addInstruction(idx++, new ALoad(instructions, 0)); - instructions.addInstruction(idx++, new InvokeVirtual(instructions, method)); - } - - private void injectPacketFinish(ClassGroup group) - { - PacketFlushFinder pff = new PacketFlushFinder(group); - pff.find(); - - for (InstructionContext queueForWriteCtx : pff.getQueueForWrite()) - { - Instruction before = queueForWriteCtx.getPops().get(3) // socket - .getPushed().getInstruction(); - GetStatic getBuffer; - - try - { - getBuffer = (GetStatic) queueForWriteCtx.getPops().get(2) // buffer - .getPushed().getPops().get(0) // getstatic - .getPushed().getInstruction(); - } - catch (ClassCastException ex) - { - continue; - } - - Instructions instructions = before.getInstructions(); - - int idx = instructions.getInstructions().indexOf(before); - assert idx != -1; - - instructions.addInstruction(idx++, getBuffer.clone()); - - net.runelite.asm.pool.Method method = new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class(getBuffer.getField().getType().getInternalName()), - RUNELITE_FINISH_PACKET, - new Signature("()V") - ); - instructions.addInstruction(idx++, new InvokeVirtual(instructions, method)); - } - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java deleted file mode 100644 index 70e9ce482..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java +++ /dev/null @@ -1,160 +0,0 @@ -package net.runelite.deob.deobfuscators.transformers; - -import java.util.Comparator; -import java.util.HashMap; -import java.util.ListIterator; -import java.util.Map; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.ILoad; -import net.runelite.asm.attributes.code.instructions.IfICmpEq; -import net.runelite.asm.attributes.code.instructions.IfICmpNe; -import net.runelite.asm.pool.Class; -import net.runelite.deob.Transformer; -import org.objectweb.asm.Opcodes; -import static org.objectweb.asm.Opcodes.ACC_FINAL; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ACC_STATIC; - -public class ScriptOpcodesTransformer implements Transformer // robots in disguise -{ - private static final String SCRIPT_OPCODES = "net/runelite/rs/ScriptOpcodes"; - private static final HashMap OPCODE_MAP = new HashMap<>(); - - static - { - for (java.lang.reflect.Field opcodeField : net.runelite.cache.script.RuneLiteOpcodes.class.getDeclaredFields()) - { - if (opcodeField.getType() != int.class || !opcodeField.canAccess(null)) - { - continue; - } - - String opcodeName = opcodeField.getName(); - int opcode; - - try - { - opcode = opcodeField.getInt(null); - } - catch (IllegalAccessException e) - { - throw new RuntimeException(e); - } - - OPCODE_MAP.put(opcode, opcodeName); - } - } - - @Override - public void transform(ClassGroup group) - { - initializeOpcodesClassFile(group); - - for (ClassFile cf : group.getClasses()) - { - if (cf.getName().startsWith("net/runelite/rs")) - { - continue; - } - - for (Method m : cf.getMethods()) - { - if (!m.isStatic()) - { - continue; - } - - if (!m.getDescriptor().getArguments().contains(new Type("LScript;")) && !m.getDescriptor().getArguments().contains(new Type("LScriptEvent;"))) - { - continue; - } - - boolean varIndexIsKnownAnd0 = m.getDescriptor().getArguments().contains(new Type("LScript;")); - - Code code = m.getCode(); - Instructions ins = code.getInstructions(); - ListIterator it = ins.getInstructions().listIterator(); - - Instruction i; - while (it.hasNext()) - { - i = it.next(); - - if (!(i instanceof ILoad) || (varIndexIsKnownAnd0 && ((ILoad) i).getVariableIndex() != 0)) - { - continue; - } - - i = it.next(); - - if (!(i instanceof PushConstantInstruction) || - !(((PushConstantInstruction) i).getConstant() instanceof Number)) - { - continue; - } - - int val = ((Number) ((PushConstantInstruction) i).getConstant()).intValue(); - String name = OPCODE_MAP.get(val); - - i = it.next(); - - if (name == null || !(i instanceof IfICmpNe || i instanceof IfICmpEq)) - { - continue; - } - - it.previous(); - it.previous(); - - net.runelite.asm.pool.Field pool = new net.runelite.asm.pool.Field( - new Class(SCRIPT_OPCODES), - name, - Type.INT - ); - - GetStatic getStatic = new GetStatic(ins, pool); - it.set(getStatic); - } - } - } - } - - private static void initializeOpcodesClassFile(ClassGroup group) - { - ClassFile scriptOpcodes = group.findClass(SCRIPT_OPCODES); - if (scriptOpcodes == null) - { - scriptOpcodes = new ClassFile(group); - scriptOpcodes.setName(SCRIPT_OPCODES); - scriptOpcodes.setSuperName(Type.OBJECT.getInternalName()); - scriptOpcodes.setAccess(Opcodes.ACC_PUBLIC); - scriptOpcodes.setVersion(Opcodes.V1_8); - group.addClass(scriptOpcodes); - } - else - { - scriptOpcodes.getFields().clear(); - } - - ClassFile finalScriptOpcodes = scriptOpcodes; - OPCODE_MAP.entrySet().stream().sorted(Comparator.comparingInt(Map.Entry::getKey)).forEach((entry) -> - { - Integer opcode = entry.getKey(); - String opcodeName = entry.getValue(); - - Field field = new Field(finalScriptOpcodes, opcodeName, Type.INT); - field.setAccessFlags(ACC_PUBLIC | ACC_STATIC | ACC_FINAL); - field.setValue(opcode); - finalScriptOpcodes.addField(field); - }); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferFinder.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferFinder.java deleted file mode 100644 index 7102a044f..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferFinder.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.transformers.buffer; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; - -/** - * Class which identifies Buffer and PacketBuffer - * - * @author Adam - */ -public class BufferFinder -{ - private final ClassGroup group; - - private ClassFile buffer, packetBuffer; - - public BufferFinder(ClassGroup group) - { - this.group = group; - } - - public ClassFile getBuffer() - { - return buffer; - } - - public ClassFile getPacketBuffer() - { - return packetBuffer; - } - - public void find() - { - for (ClassFile cf : group.getClasses()) - { - for (Method m : cf.getMethods()) - { - Code code = m.getCode(); - - if (findModPow(code)) - { - buffer = cf; - - // packetBuffer extends this - packetBuffer = group.getClasses().stream() - .filter(cl -> cl.getParent() == cf) - .findAny() - .get(); - } - } - } - } - - // Find encryptRsa in buffer - private boolean findModPow(Code code) - { - if (code == null) - { - return false; - } - - Instructions instructions = code.getInstructions(); - - for (Instruction i : instructions.getInstructions()) - { - if (!(i instanceof InvokeVirtual)) - { - continue; - } - - InvokeVirtual iv = (InvokeVirtual) i; - net.runelite.asm.pool.Method method = iv.getMethod(); - if (method.getName().equals("modPow")) - { - return true; - } - } - return false; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferMethodInjector.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferMethodInjector.java deleted file mode 100644 index 691c18b5b..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferMethodInjector.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.transformers.buffer; - -import java.io.IOException; -import java.io.InputStream; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; -import net.runelite.asm.visitors.ClassFileVisitor; -import org.objectweb.asm.ClassReader; - -public class BufferMethodInjector -{ - private final BufferPayloadFinder bp; - - public BufferMethodInjector(BufferPayloadFinder bp) - { - this.bp = bp; - } - - public void inject() throws IOException - { - Field buffer = bp.getBuffer(); - Field offset = bp.getOffset(); - - assert buffer.getClassFile() == offset.getClassFile(); - - InputStream in = getClass().getResourceAsStream("RuneliteBuffer.class"); - assert in != null : "no RuneliteBuffer"; - ClassFile runeliteBuffer = loadClass(in); - - ClassFile bufferClass = buffer.getClassFile(); - - for (Field f : runeliteBuffer.getFields()) - { - if (!f.getName().startsWith("runelite")) - { - continue; - } - - inject(bufferClass, f); - } - - for (Method m : runeliteBuffer.getMethods()) - { - if (!m.getName().startsWith("runelite")) - { - continue; - } - - inject(bufferClass, m); - } - } - - private void inject(ClassFile bufferClass, Method method) - { - assert method.getExceptions().getExceptions().isEmpty(); - - Method newMethod = new Method(bufferClass, method.getName(), method.getDescriptor()); - Code code = new Code(newMethod); - newMethod.setCode(code); - - method.getCode().getInstructions().getInstructions().stream() - .forEach(i -> - { - if (!(i instanceof Label)) - { - i = i.clone(); - } - - if (i instanceof FieldInstruction) - { - FieldInstruction fi = (FieldInstruction) i; - if (fi.getField().getName().equals("offset")) - { - fi.setField(bp.getOffset().getPoolField()); - } - else if (fi.getField().getName().equals("payload")) - { - fi.setField(bp.getBuffer().getPoolField()); - } - else if (fi.getField().getName().equals("runeliteLengthOffset")) - { - fi.setField(bufferClass.findField("runeliteLengthOffset").getPoolField()); - } - } - - i.setInstructions(code.getInstructions()); - code.getInstructions().addInstruction(i); - }); - - code.getExceptions().getExceptions().addAll(method.getCode().getExceptions().getExceptions()); - - bufferClass.addMethod(newMethod); - } - - private void inject(ClassFile bufferClass, Field field) - { - Field newField = new Field(bufferClass, field.getName(), field.getType()); - newField.setAccessFlags(field.getAccessFlags()); - newField.setValue(field.getValue()); - bufferClass.addField(newField); - } - - static ClassFile loadClass(InputStream in) throws IOException - { - ClassReader reader = new ClassReader(in); - ClassFileVisitor cv = new ClassFileVisitor(); - - reader.accept(cv, ClassReader.SKIP_FRAMES); - - return cv.getClassFile(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferPayloadFinder.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferPayloadFinder.java deleted file mode 100644 index dc4ec9539..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferPayloadFinder.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.transformers.buffer; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Type; - -public class BufferPayloadFinder -{ - private final ClassFile bufferClass; - - private Field offset; - private Field buffer; - - public BufferPayloadFinder(ClassFile bufferClass) - { - this.bufferClass = bufferClass; - } - - public void find() - { - for (Field field : bufferClass.getFields()) - { - if (field.getType().equals(Type.INT)) - { - offset = field; - } - else if (field.getType().equals(new Type("[B"))) - { - buffer = field; - } - } - } - - public Field getOffset() - { - return offset; - } - - public Field getBuffer() - { - return buffer; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/PacketFlushFinder.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/PacketFlushFinder.java deleted file mode 100644 index c792c7ecc..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/PacketFlushFinder.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.transformers.buffer; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import static net.runelite.asm.attributes.code.InstructionType.GETFIELD; -import static net.runelite.asm.attributes.code.InstructionType.INVOKEVIRTUAL; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.signature.Signature; - -public class PacketFlushFinder -{ - private final ClassGroup group; - - private final List queueForWrite = new ArrayList<>(); - - public PacketFlushFinder(ClassGroup group) - { - this.group = group; - } - - public List getQueueForWrite() - { - return queueForWrite; - } - - public void find() - { - ClassFile client = group.findClass("Client"); - if (client == null) - { - client = group.findClass("client"); - } - - for (Method method : client.getMethods()) - { - find(method); - } - } - - private void find(Method method) - { - Code code = method.getCode(); - Set checked = new HashSet<>(); - - Execution e = new Execution(group); - e.addMethod(method); - e.noInvoke = true; - e.noExceptions = true; - e.addExecutionVisitor(ic -> - { - Instruction i = ic.getInstruction(); - - if (checked.contains(i)) - { - return; - } - checked.add(i); - - if (i.getType() != INVOKEVIRTUAL) - { - return; - } - - InvokeVirtual iv = (InvokeVirtual) i; - // queueForWrite - if (!iv.getMethod().getType().equals(new Signature("([BII)V"))) - { - return; - } - - InstructionContext lengthCtx = ic.getPops().get(0).getPushed(); - if (lengthCtx.getInstruction().getType() != GETFIELD) - { - return; - } - - queueForWrite.add(ic); - }); - e.run(); - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/RuneliteBuffer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/RuneliteBuffer.java deleted file mode 100644 index c60232cf4..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/buffer/RuneliteBuffer.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.deobfuscators.transformers.buffer; - -import java.io.UnsupportedEncodingException; - -/** - * Methods injected into runescape-client's Buffer - * - * @author Adam - */ -public class RuneliteBuffer -{ - // so that it compiles - private int offset; - private byte[] payload; - private int runeliteLengthOffset; - - public int getOffset() - { - return offset; - } - - public void setOffset(int offset) - { - this.offset = offset; - } - - public byte[] getPayload() - { - return payload; - } - - public void setPayload(byte[] payload) - { - this.payload = payload; - } - - public int getRuneliteLengthOffset() - { - return runeliteLengthOffset; - } - - public void setRuneliteLengthOffset(int runeliteLengthOffset) - { - this.runeliteLengthOffset = runeliteLengthOffset; - } - - public byte runeliteReadByte() - { - offset += 1; - return payload[offset - 1]; - } - - public short runeliteReadShort() - { - offset += 2; - return (short) (((payload[offset - 2] & 0xFF) << 8) - | (payload[offset - 1] & 0xFF)); - } - - public int runeliteReadInt() - { - offset += 4; - return ((payload[offset - 4] & 0xFF) << 24) - | ((payload[offset - 3] & 0xFF) << 16) - | ((payload[offset - 2] & 0xFF) << 8) - | (payload[offset - 1] & 0xFF); - } - - public long runeliteReadLong() - { - offset += 8; - return ((payload[offset - 8] & 0xFFL) << 56) - | ((payload[offset - 7] & 0xFFL) << 48) - | ((payload[offset - 6] & 0xFFL) << 40) - | ((payload[offset - 5] & 0xFFL) << 32) - | ((payload[offset - 4] & 0xFFL) << 24) - | ((payload[offset - 3] & 0xFFL) << 16) - | ((payload[offset - 2] & 0xFFL) << 8) - | (payload[offset - 1] & 0xFFL); - } - - public String runeliteReadString() - { - int length = runeliteReadShort(); - if (length < 0) - { - throw new RuntimeException("length < 0"); - } - - offset += length; - try - { - return new String(payload, offset - length, length, "UTF-8"); - } - catch (UnsupportedEncodingException ex) - { - throw new RuntimeException(ex); - } - } - - public void runeliteWriteByte(byte b) - { - payload[offset++] = b; - } - - public void runeliteWriteShort(short s) - { - payload[offset++] = (byte) (s >> 8); - payload[offset++] = (byte) s; - } - - public void runeliteWriteInt(int i) - { - payload[offset++] = (byte) (i >> 24); - payload[offset++] = (byte) (i >> 16); - payload[offset++] = (byte) (i >> 8); - payload[offset++] = (byte) i; - } - - public void runeliteWriteLong(long l) - { - payload[offset++] = (byte) (l >> 56); - payload[offset++] = (byte) (l >> 48); - payload[offset++] = (byte) (l >> 40); - payload[offset++] = (byte) (l >> 32); - payload[offset++] = (byte) (l >> 24); - payload[offset++] = (byte) (l >> 16); - payload[offset++] = (byte) (l >> 8); - payload[offset++] = (byte) l; - } - - public void runeliteWriteString(String s) - { - byte[] bytes; - - try - { - bytes = s.getBytes("UTF-8"); - } - catch (UnsupportedEncodingException ex) - { - throw new RuntimeException(ex); - } - - runeliteWriteShort((short) bytes.length); - for (byte b : bytes) - { - payload[offset++] = b; - } - } - - public void runeliteInitPacket() - { - runeliteLengthOffset = offset; - runeliteWriteShort((short) 0); // flush() relies on default length of 0 - } - - public void runeliteFinishPacket() - { - if (runeliteLengthOffset > 0) - { - int length = offset - runeliteLengthOffset - 2; - if (length < 0) - { - // on flush() it sets offset = 0 - // but runeliteLengthOffset remains >0 - return; - } - payload[runeliteLengthOffset++] = (byte) (length >> 8); - payload[runeliteLengthOffset++] = (byte) length; - runeliteLengthOffset = 0; - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/s2c/HandlerFinder.java b/deobfuscator/src/main/java/net/runelite/deob/s2c/HandlerFinder.java deleted file mode 100644 index 214c13f5f..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/s2c/HandlerFinder.java +++ /dev/null @@ -1,299 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.s2c; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.If; -import net.runelite.asm.attributes.code.instructions.VReturn; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.Frame; -import net.runelite.asm.execution.InstructionContext; - -public class HandlerFinder -{ - - private final ClassGroup group; - private final Field packetType; - private final Execution execution; - - public HandlerFinder(ClassGroup group, Field packetType) - { - this.group = group; - this.packetType = packetType; - this.execution = new Execution(group); - } - - public ClassGroup getGroup() - { - return group; - } - - public Execution getExecution() - { - return execution; - } - - public PacketHandlers findHandlers() - { - // Some of the packet handlers are if (type == 1 || type == 2) func() - // and func() checks the type... so search all functions for packet handlers - - List handlers = new ArrayList<>(); - - for (ClassFile cf : group.getClasses()) - { - for (Method method : cf.getMethods()) - { - if (method.getCode() == null) - { - continue; - } - - List h = findHandlers(method, packetType); - handlers.addAll(h); - } - } - - PacketHandlers packetHandlers = new PacketHandlers(group, packetType, handlers); - removeDuplicates(packetHandlers); - prepareFrame(execution, packetHandlers); - return packetHandlers; - } - - private List findHandlers(Method process, Field packetOpcode) - { - List handlers = new ArrayList<>(); - - Instructions ins = process.getCode().getInstructions(); - - for (int j = 0; j < ins.getInstructions().size(); ++j) - { - Instruction i = ins.getInstructions().get(j); - - if (i.getType() != InstructionType.GETSTATIC) - { - continue; - } - - GetStatic gs = (GetStatic) i; - if (gs.getMyField() != packetOpcode) - { - continue; - } - - Instruction push = ins.getInstructions().get(j + 1); - if (!(push instanceof PushConstantInstruction)) - { - continue; - } - - PushConstantInstruction pci = (PushConstantInstruction) push; - if (!(pci.getConstant() instanceof Number)) - { - continue; - } - - int opcode = ((Number) pci.getConstant()).intValue(); - - if (opcode == -1) - { - continue; - } - - Instruction jump = ins.getInstructions().get(j + 2); - if (jump.getType() != InstructionType.IF_ICMPEQ && jump.getType() != InstructionType.IF_ICMPNE) - { - continue; - } - - Instruction start, end; - if (jump.getType() == InstructionType.IF_ICMPEQ) - { - // this seems to not ever happen - start = ((If) jump).getJumps().get(0); - //end = ins.getInstructions().get(j + 3); - end = null; - } - else - { - start = ins.getInstructions().get(j + 3); - end = ((If) jump).getJumps().get(0); - } - - PacketHandler handler = new PacketHandler(process, jump, start, push, opcode); - handlers.add(handler); - - if (end != null) - { - // Anything else which jumps to here instead needs to return. - insertReturn(ins, jump, end); - } - } - - return handlers; - } - - private void removeDuplicates(PacketHandlers handlers) - { - // remove handlers which have multiple opcodes - Multimap i2h = HashMultimap.create(); - - for (PacketHandler handler : handlers.getHandlers()) - { - i2h.put(handler.getStart(), handler); - } - - for (Instruction i : i2h.keySet()) - { - int sz = i2h.get(i).size(); - - if (sz == 1) - { - continue; - } - - // this is part of if (opcode == 1 || opcode == 2 || ...) func(); - for (PacketHandler ph : i2h.get(i)) - { - handlers.getHandlers().remove(ph); - } - } - } - - private void prepareFrame(Execution e, PacketHandlers handlers) - { - List methods = handlers.getHandlers().stream() - .map(handler -> handler.getMethod()) - .distinct() - .collect(Collectors.toList()); - - for (Method method : methods) - { - List phandlers = handlers.getHandlers().stream() - .filter(handler -> handler.getMethod() == method) - .collect(Collectors.toList()); - - prepareFrame(e, method, phandlers); - } - } - - private void prepareFrame(Execution e, Method method, List handlers) - { - e.step = true; - - Frame f = new Frame(e, method); - f.initialize(); - - e.addFrame(f); - - while (e.frames.isEmpty() == false) - { - f = e.frames.get(0); - - if (!f.isExecuting()) - { - e.frames.remove(0); - continue; - } - - assert f.isExecuting(); - f.execute(); - - e.paused = false; - - InstructionContext ctx = f.getInstructions().get(f.getInstructions().size() - 1); - - for (PacketHandler handler : handlers) - { - if (handler.getAfterRead() == ctx.getInstruction()) - { - // frame is stopped at jump prior to handler - handler.frame = f.dup(); - e.frames.remove(handler.frame); - } - if (handler.getJump() == ctx.getInstruction()) - { - handler.jumpFrame = f.dup(); - e.frames.remove(handler.jumpFrame); - assert handler.jumpFrame.isExecuting(); - } - } - } - } - - private void insertReturn(Instructions ins, Instruction start, Instruction end) - { - assert end instanceof Label; - int idx = ins.getInstructions().indexOf(end); - assert idx != -1; - - Instruction before = ins.getInstructions().get(idx - 1); - if (before.getType() == InstructionType.RETURN) //XXX check isTerminal? - { - return; - } - - // insert return before end - Instruction ret = new VReturn(ins); - ins.addInstruction(idx, ret); - - Label label = ins.createLabelFor(ret); - - // Change jumps which go to the next handler to instead go to return - for (Instruction i : ins.getInstructions()) - { - if (i instanceof JumpingInstruction) - { - JumpingInstruction j = (JumpingInstruction) i; - - if (i == start) - { - continue; - } - - if (j.getJumps().size() == 1 && j.getJumps().get(0) == end) - { - j.setJumps(Collections.singletonList(label)); - } - } - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/s2c/PacketHandler.java b/deobfuscator/src/main/java/net/runelite/deob/s2c/PacketHandler.java deleted file mode 100644 index 535ae1bf6..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/s2c/PacketHandler.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.s2c; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.execution.Frame; -import net.runelite.deob.deobfuscators.packethandler.PacketRead; - -public class PacketHandler implements Cloneable -{ - - private final Method method; - private final Instruction jump; // jump for the packet handler - private final Instruction start; // first instruction in the handler - private final Instruction push; // instruction which pushes opcode constant - private final int opcode; - - public Frame frame; // after read - public Frame jumpFrame; - - public List mappable = new ArrayList<>(); // mappable instructions - public List reads = new ArrayList<>(); // instructions which read packet data - public List sortedReads; - public Map lvtOrder = new HashMap<>(); // access order of lvt, lvt index -> order - - public Set fieldRead = new HashSet<>(); - public Set fieldWrite = new HashSet<>(); - public Set methodInvokes = new HashSet<>(); - public List constants = new ArrayList<>(); - - public PacketHandler(Method method, Instruction jump, Instruction start, Instruction push, int opcode) - { - this.method = method; - this.jump = jump; - this.start = start; - this.push = push; - this.opcode = opcode; - } - - @Override - public String toString() - { - return "PacketHandler{" + "start=" + start + ", opcode=" + opcode + '}'; - } - - @Override - public PacketHandler clone() - { - try - { - return (PacketHandler) super.clone(); - } - catch (CloneNotSupportedException ex) - { - throw new RuntimeException(ex); - } - } - - public Method getMethod() - { - return method; - } - - public Instruction getJump() - { - return jump; - } - - public Instruction getStart() - { - return start; - } - - public Instruction getPush() - { - return push; - } - - public Instruction getAfterRead() - { - if (reads.isEmpty()) - { - return null; - } - - PacketRead last = reads.get(reads.size() - 1); - if (last.getStore() == null) - { - return null; - } - - List ins = method.getCode().getInstructions().getInstructions(); - int idx = ins.indexOf(last.getStore()); - if (idx == -1) - { - return null; // can be a read in not this function - } - - return ins.get(idx + 1); - } - - public int getOpcode() - { - return opcode; - } - - public boolean hasPacketRead(Instruction i) - { - for (PacketRead pr : reads) - { - if (pr.getInvoke() == i) - { - return true; - } - } - return false; - } - - public void findReorderableReads() - { - for (PacketRead pr : reads) - { - //InstructionContext invokeCtx = pr.getInvokeCtx(); - List instructions = pr.getInvoke().getInstructions().getInstructions(); - - // look for an lvt store immediately after - int invokeIdx = instructions.indexOf(pr.getInvoke()); - assert invokeIdx != -1; - - Instruction next = instructions.get(invokeIdx + 1); - if (next instanceof LVTInstruction) - { - LVTInstruction lvt = (LVTInstruction) next; - if (lvt.store()) - { - pr.setStore(next); - } - } - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/s2c/PacketHandlers.java b/deobfuscator/src/main/java/net/runelite/deob/s2c/PacketHandlers.java deleted file mode 100644 index bb0cc3d72..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/s2c/PacketHandlers.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.deob.s2c; - -import java.util.List; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; - -public class PacketHandlers -{ - private final ClassGroup group; - private final Field packetType; - private final List handlers; - - public PacketHandlers(ClassGroup group, Field packetType, List handlers) - { - this.group = group; - this.packetType = packetType; - this.handlers = handlers; - } - - public PacketHandler find(int opcode) - { - for (PacketHandler handler : handlers) - { - if (handler.getOpcode() == opcode) - { - return handler; - } - } - return null; - } - - public ClassGroup getGroup() - { - return group; - } - - public Field getPacketType() - { - return packetType; - } - - public List getHandlers() - { - return handlers; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java b/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java deleted file mode 100644 index b229404a0..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java +++ /dev/null @@ -1,77 +0,0 @@ -package net.runelite.deob.updater; - -import com.google.common.base.Strings; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Named; -import net.runelite.asm.attributes.Annotated; -import net.runelite.deob.Deob; -import net.runelite.deob.DeobAnnotations; - -public class AnnotationAdder -{ - AnnotationAdder(ClassGroup group) - { - this.group = group; - } - - private final ClassGroup group; - - public void run() - { - int impl = 0; - int meth = 0; - int field = 0; - - for (ClassFile c : group.getClasses()) - { - if (c.getName().contains("runelite")) - { - continue; - } - - String implementingName = DeobAnnotations.getImplements(c); - if (!Strings.isNullOrEmpty(implementingName)) - { - // Still error here cause I don't wanna call classes dumb shit - assert implementingName.equals(c.getClassName()) : c + " implements " + implementingName + " but is called " + c.getClassName(); - } - else if (!Deob.isObfuscated(c.getClassName())) - { - c.addAnnotation(DeobAnnotations.IMPLEMENTS, c.getClassName()); - impl++; - } - - for (Field f : c.getFields()) - { - if (addExport(f)) - field++; - } - - for (Method m : c.getMethods()) - { - if (addExport(m)) - meth++; - } - } - } - - private boolean addExport(T m) - { - String methodName = m.getName(); - String exportedName = DeobAnnotations.getExportedName(m); - - if (exportedName == null && Deob.isObfuscated(methodName) - || methodName.equals(DeobAnnotations.getObfuscatedName(m)) - || DeobAnnotations.getObfuscatedName(m) == null - || methodName.equals(exportedName)) - { - return false; - } - - m.findAnnotation(DeobAnnotations.EXPORT, true).setElement(methodName); - return true; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationCopier.java b/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationCopier.java deleted file mode 100644 index 857610b27..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationCopier.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.updater; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.Annotation; -import net.runelite.asm.attributes.Annotated; - -public class AnnotationCopier -{ - private final ClassGroup group1, group2; - private final Set types; - - public AnnotationCopier(ClassGroup group1, ClassGroup group2, Type... types) - { - this.group1 = group1; - this.group2 = group2; - this.types = new HashSet<>(Arrays.asList(types)); - } - - public void copy() - { - for (ClassFile cf1 : group1.getClasses()) - { - ClassFile cf2 = group2.findClass(cf1.getName()); - - assert cf2 != null; - - copy(cf1, cf2); - - for (Field f : cf1.getFields()) - { - Field f2 = cf2.findField(f.getName(), f.getType()); - - assert f2 != null || f.getAnnotations().isEmpty(); - - if (f2 == null) - continue; - - copy(f, f2); - } - - for (Method m : cf1.getMethods()) - { - Method m2 = cf2.findMethod(m.getName(), m.getDescriptor()); - - assert m2 != null || m == null; - - if (m2 == null) - continue; - - copy(m, m2); - } - } - } - - private void copy(Annotated an, Annotated an2) - { - for (Annotation a : an.getAnnotations().values()) - { - final var t = a.getType(); - if (isType(t)) - an2.getAnnotations().replace(t, a); - } - } - - private boolean isType(Type type) - { - return types.contains(type); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationRenamer.java b/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationRenamer.java deleted file mode 100644 index 263a850fa..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationRenamer.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.updater; - -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Annotation; -import net.runelite.asm.attributes.Annotated; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.deobfuscators.Renamer; -import net.runelite.deob.util.NameMappings; - -public class AnnotationRenamer -{ - private ClassGroup group; - - public AnnotationRenamer(ClassGroup group) - { - this.group = group; - } - - public void run() - { - NameMappings mappings = buildMappings(); - - Renamer renamer = new Renamer(mappings); - renamer.run(group); - } - - private NameMappings buildMappings() - { - NameMappings mappings = new NameMappings(); - - for (ClassFile cf : group.getClasses()) - { - String name = getImplements(cf); - if (name != null) - mappings.map(cf.getPoolClass(), name); - - for (Field f : cf.getFields()) - { - name = DeobAnnotations.getExportedName(f); - if (name != null) - mappings.map(f.getPoolField(), name); - } - - for (Method m : cf.getMethods()) - { - name = DeobAnnotations.getExportedName(m); - if (name != null) - mappings.map(m.getPoolMethod(), name); - } - } - - return mappings; - } - - private String getImplements(Annotated cf) - { - Annotation an = cf.findAnnotation(DeobAnnotations.IMPLEMENTS); - return an == null ? null : an.getValueString(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/MappingDumper.java b/deobfuscator/src/main/java/net/runelite/deob/updater/MappingDumper.java deleted file mode 100644 index c7892c5f4..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/MappingDumper.java +++ /dev/null @@ -1,120 +0,0 @@ -package net.runelite.deob.updater; - -import com.google.common.base.Stopwatch; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.stream.JsonWriter; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.pool.Field; -import net.runelite.asm.pool.Method; -import net.runelite.deob.DeobProperties; -import net.runelite.deob.updater.mappingdumper.MappedClass; -import net.runelite.deob.updater.mappingdumper.MappedField; -import net.runelite.deob.updater.mappingdumper.MappedMethod; -import net.runelite.deob.updater.mappingdumper.MappingDump; - -public class MappingDumper -{ - private static ClassGroup group; - private static final Map classMap = new HashMap<>(); - private static final Map fieldMap = new HashMap<>(); - private static final Map methodMap = new HashMap<>(); - - public MappingDumper(ClassGroup group) - { - MappingDumper.group = group; - } - - public void dump(final File outputFile) - { - Stopwatch st = Stopwatch.createStarted(); - group.buildClassGraph(); - - // MappingDump.of(ClassGroup) dumps everything completely - final MappingDump dump = new MappingDump().visitGroup(group); - dump.revision = Integer.parseInt(DeobProperties.getRevision()); - - writeJson(dump, outputFile); - } - - // Without this stack'll overflow :P - private void writeJson(MappingDump dump, File outputFile) - { - final Gson gson = new GsonBuilder().setPrettyPrinting().create(); - try (JsonWriter writer = new JsonWriter(new OutputStreamWriter(new FileOutputStream(outputFile), StandardCharsets.UTF_8))) - { - writer.setIndent(" "); - writer.beginObject(); - writer.name("revision").value(dump.revision); - writer.name("totalClasses").value(dump.totalClasses); - writer.name("totalNamedClasses").value(dump.totalNamedClasses); - writer.name("totalFields").value(dump.totalFields); - writer.name("totalNamedFields").value(dump.totalNamedFields); - writer.name("totalNonStaticFields").value(dump.totalNonStaticFields); - writer.name("totalNamedNonStaticFields").value(dump.totalNamedNonStaticFields); - writer.name("totalStaticFields").value(dump.totalStaticFields); - writer.name("totalNamedStaticFields").value(dump.totalNamedStaticFields); - writer.name("totalMethods").value(dump.totalMethods); - writer.name("totalNamedMethods").value(dump.totalNamedMethods); - writer.name("totalNonStaticMethods").value(dump.totalNonStaticMethods); - writer.name("totalNamedNonStaticMethods").value(dump.totalNamedNonStaticMethods); - writer.name("totalStaticMethods").value(dump.totalStaticMethods); - writer.name("totalNamedStaticMethods").value(dump.totalNamedStaticMethods); - writer.name("mappedClasses"); - writer.beginArray(); - for (MappedClass mc : dump.classes) - { - gson.toJson(mc, MappedClass.class, writer); - } - writer.endArray(); - writer.endObject(); - } - catch (IOException e) - { - } - } - - public static ClassGroup getGroup() - { - return group; - } - - public static void putMap(ClassFile clazz, MappedClass mc) - { - classMap.put(clazz, mc); - } - - public static MappedClass getMap(ClassFile clazz) - { - return classMap.get(clazz); - } - - public static void putMap(Field field, MappedField mf) - { - fieldMap.put(field, mf); - } - - public static MappedField getMap(Field field) - { - return fieldMap.get(field); - } - - public static void putMap(Method method, MappedMethod mm) - { - methodMap.put(method, mm); - } - - public static MappedMethod getMap(Method method) - { - return methodMap.get(method); - } - -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java b/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java deleted file mode 100644 index 15a4a2b91..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2018, Morgan Lewis - * 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.deob.updater; - -import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.LocalVariable; -import net.runelite.asm.attributes.code.Parameter; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; - -public class ParameterRenamer -{ - private final ClassGroup source; - private final ClassGroup dest; - private final ParallelExecutorMapping mapping; - - public ParameterRenamer(ClassGroup source, ClassGroup dest, ParallelExecutorMapping mapping) - { - this.source = source; - this.dest = dest; - this.mapping = mapping; - } - - public void run() - { - for (ClassFile sourceCF : source.getClasses()) - { - for (Method sourceM : sourceCF.getMethods()) - { - Method destM = (Method) mapping.get(sourceM); - if (destM != null && destM.getParameters().size() > 0 && sourceM.getParameters() != null && !sourceM.getParameters().isEmpty() && sourceM.getParameters().size() >= 1) - { - List oldParams = destM.getParameters(); - for (int i = 0; i < sourceM.getParameters().size(); i++) - { - String name = sourceM.getParameters().get(i).getName(); - if (name.matches("var[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' || name.charAt(0) != 'y' || name.charAt(0) != 'z')) - { - continue; - } - - Parameter oldParam = oldParams.get(i); - LocalVariable oldVar = oldParam.getLocalVariable(); - - Parameter newParam = new Parameter(name, oldParam.getAccess()); - oldParams.set(i, newParam); - - if (oldVar == null) - { - continue; - } - - LocalVariable newVar = new LocalVariable( - name, - oldVar.getDesc(), - oldVar.getSignature(), - oldVar.getStart(), - oldVar.getEnd(), - oldVar.getIndex() - ); - - newParam.setLocalVariable(newVar); - } - } - } - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java deleted file mode 100644 index 58ce675b9..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.deob.updater; - -import java.io.File; -import java.io.IOException; -import net.runelite.asm.ClassGroup; -import net.runelite.deob.CreateAnnotations; -import net.runelite.deob.deobfuscators.mapping.AnnotationIntegrityChecker; -import net.runelite.deob.deobfuscators.mapping.AnnotationMapper; -import net.runelite.deob.deobfuscators.mapping.Mapper; -import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; -import net.runelite.deob.deobfuscators.transformers.GraphicsObjectTransformer; -import net.runelite.deob.deobfuscators.transformers.ScriptOpcodesTransformer; -import net.runelite.deob.util.JarUtil; - -public class UpdateMappings -{ - private final ClassGroup group1, group2; - - public UpdateMappings(ClassGroup group1, ClassGroup group2) - { - this.group1 = group1; - this.group2 = group2; - } - - public void update() - { - CreateAnnotations.run(group1); - Mapper mapper = new Mapper(group1, group2); - mapper.run(); - ParallelExecutorMapping mapping = mapper.getMapping(); - - AnnotationMapper amapper = new AnnotationMapper(group1, group2, mapping); - amapper.run(); - - AnnotationIntegrityChecker aic = new AnnotationIntegrityChecker(group1, group2, mapping); - aic.run(); - - int errors = aic.getErrors(); - - if (errors > 0) - { - System.exit(-1); - } - - AnnotationRenamer an = new AnnotationRenamer(group2); - an.run(); - - ParameterRenamer pr = new ParameterRenamer(group1, group2, mapping); - pr.run(); - - AnnotationAdder ad = new AnnotationAdder(group2); - ad.run(); - - new ScriptOpcodesTransformer().transform(group2); - new GraphicsObjectTransformer().transform(group2); - } - - public void save(File out) throws IOException - { - JarUtil.save(group2, out); - } - - public static void main(String[] args) throws IOException - { - UpdateMappings u = new UpdateMappings( - JarUtil.load(new File("./deobfuscator/osrs-213.jar")), - JarUtil.load(new File("./deobfuscator/deob-215.jar")) - ); - u.update(); - u.save(new File("./deobfuscator/osrs-215.jar")); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedClass.java b/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedClass.java deleted file mode 100644 index 97dfc60d1..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedClass.java +++ /dev/null @@ -1,67 +0,0 @@ -package net.runelite.deob.updater.mappingdumper; - -import com.google.gson.annotations.SerializedName; -import java.util.List; -import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.updater.MappingDumper; - -public class MappedClass -{ - @SerializedName("class") - public String implementingName; - @SerializedName("name") - public String obfuscatedName; - @SerializedName("super") - public String superClass; - public int access; - public List interfaces; - public List fields; - public List methods; - public List constructors; - - public MappedClass visitClass(final ClassFile c, final MappingDump dump) - { - MappingDumper.putMap(c, this); - - implementingName = DeobAnnotations.getImplements(c); - - obfuscatedName = DeobAnnotations.getObfuscatedName(c); - if (obfuscatedName == null) - { - obfuscatedName = c.getName(); - } - - ClassFile parent = c.getParent(); - if (parent != null) - { - superClass = DeobAnnotations.getObfuscatedName(parent); - } - - access = c.getAccess(); - - interfaces = c.getInterfaces() - .getMyInterfaces() - .stream() - .map(DeobAnnotations::getObfuscatedName) - .collect(Collectors.toList()); - - fields = c.getFields() - .stream() - .map(f -> new MappedField().visitField(f, dump)) - .collect(Collectors.toList()); - - methods = c.getMethods() - .stream() - .map(m -> new MappedMethod().visitMethod(m, dump)) - .collect(Collectors.toList()); - - constructors = methods - .stream() - .filter(m -> m.obfuscatedName.endsWith("init>")) - .collect(Collectors.toList()); - - return this; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedField.java b/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedField.java deleted file mode 100644 index ba4ae28f5..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedField.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.runelite.deob.updater.mappingdumper; - -import com.google.gson.annotations.SerializedName; -import java.util.HashMap; -import java.util.Map; -import net.runelite.asm.Field; -import net.runelite.asm.pool.Method; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.updater.MappingDumper; - -public class MappedField -{ - @SerializedName("field") - public String exportedName; - public String owner; - @SerializedName("name") - public String obfuscatedName; - public int access; - public String descriptor; - public Number decoder; - // method name, amt of times - public Map puts = new HashMap<>(); - public Map gets = new HashMap<>(); - - public MappedField visitField(final Field f, final MappingDump dump) - { - MappingDumper.putMap(f.getPoolField(), this); - - exportedName = DeobAnnotations.getExportedName(f); - - owner = MappingDumper.getMap(f.getClassFile()).obfuscatedName; - - obfuscatedName = DeobAnnotations.getObfuscatedName(f); - if (obfuscatedName == null) - { - obfuscatedName = f.getName(); - } - - access = f.getAccessFlags(); - - descriptor = f.getObfuscatedType().toString(); - - decoder = DeobAnnotations.getObfuscatedGetter(f); - - return this; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedMethod.java b/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedMethod.java deleted file mode 100644 index f2eb54977..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedMethod.java +++ /dev/null @@ -1,113 +0,0 @@ -package net.runelite.deob.updater.mappingdumper; - -import com.google.gson.annotations.SerializedName; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Parameter; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Field; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.updater.MappingDumper; - -public class MappedMethod -{ - @SerializedName("method") - public String exportedName; - public String owner; - @SerializedName("name") - public String obfuscatedName; - public int access; - public List parameters; - public String descriptor; - public String garbageValue; - public List lineNumbers; - public Map fieldGets = new HashMap<>(); - public Map fieldPuts = new HashMap<>(); - public Map dependencies = new HashMap<>(); - - public MappedMethod visitMethod(final Method m, final MappingDump dump) - { - MappingDumper.putMap(m.getPoolMethod(), this); - exportedName = DeobAnnotations.getExportedName(m); - - owner = MappingDumper.getMap(m.getClassFile()).obfuscatedName; - - obfuscatedName = DeobAnnotations.getObfuscatedName(m); - if (obfuscatedName == null) - { - obfuscatedName = m.getName(); - } - - access = m.getAccessFlags(); - - parameters = m.getParameters() - .stream() - .map(Parameter::getName) - .collect(Collectors.toList()); - - descriptor = m.getObfuscatedSignature().toString(); - - garbageValue = DeobAnnotations.getDecoder(m); - - Code c = m.getCode(); - if (c != null) - { - visitCode(c); - } - - return this; - } - - private void visitCode(Code c) - { - lineNumbers = c.getLineNumbers(); - - Instructions ins = c.getInstructions(); - for (Instruction i : ins.getInstructions()) - { - if (i instanceof GetFieldInstruction) - { - Field k = ((GetFieldInstruction) i).getField(); - int v = fieldGets.getOrDefault(k, 0) + 1; - fieldGets.put(k, v); - } - else if (i instanceof SetFieldInstruction) - { - Field k = ((SetFieldInstruction) i).getField(); - int v = fieldPuts.getOrDefault(k, 0) + 1; - fieldPuts.put(k, v); - } - else if (i instanceof InvokeInstruction) - { - List met = ((InvokeInstruction) i).getMethods(); - net.runelite.asm.pool.Method k; - if (met.size() > 0) - { - Method mme = met.get(0); - k = new net.runelite.asm.pool.Method( - new Class(Objects.requireNonNull(DeobAnnotations.getObfuscatedName(mme.getClassFile()))), - DeobAnnotations.getObfuscatedName(mme), - mme.getObfuscatedSignature() != null ? mme.getObfuscatedSignature() : mme.getDescriptor() - ); - } - else - { - k = ((InvokeInstruction) i).getMethod(); - } - - int v = dependencies.getOrDefault(k, 0) + 1; - dependencies.put(k, v); - } - } - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappingDump.java b/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappingDump.java deleted file mode 100644 index adcf22889..000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappingDump.java +++ /dev/null @@ -1,148 +0,0 @@ -package net.runelite.deob.updater.mappingdumper; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Field; -import net.runelite.asm.pool.Method; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.updater.MappingDumper; -import static org.objectweb.asm.Opcodes.ACC_STATIC; - -public class MappingDump -{ - public int revision; - - public int totalClasses = 0; - public int totalNamedClasses = 0; - - public int totalFields = 0; - public int totalNamedFields = 0; - - public int totalNonStaticFields = 0; - public int totalNamedNonStaticFields = 0; - - public int totalStaticFields = 0; - public int totalNamedStaticFields = 0; - - public int totalMethods = 0; - public int totalNamedMethods = 0; - - public int totalNonStaticMethods = 0; - public int totalNamedNonStaticMethods = 0; - - public int totalStaticMethods = 0; - public int totalNamedStaticMethods = 0; - - public List classes; - - private ClassGroup group; - - public MappingDump visitGroup(ClassGroup group) - { - this.group = group; - classes = new ArrayList<>(); - - for (ClassFile c : group.getClasses()) - { - if (c.getName().contains("runelite")) - { - continue; - } - - final MappedClass mc = new MappedClass(); - classes.add(mc.visitClass(c, this)); - } - - totalClasses = classes.size(); - - for (MappedClass c : classes) - { - if (c.implementingName != null) - { - totalNamedClasses++; - } - - for (MappedMethod mm : c.methods) - { - for (Map.Entry entry : mm.fieldGets.entrySet()) - { - MappedField mf = MappingDumper.getMap(entry.getKey()); - if (mf == null) - { - continue; - } - mf.gets.put( - new Method( - new Class(mm.owner), - mm.obfuscatedName, - new Signature(mm.descriptor)), - entry.getValue()); - } - for (Map.Entry entry : mm.fieldPuts.entrySet()) - { - MappedField mf = MappingDumper.getMap(entry.getKey()); - if (mf == null) - { - continue; - } - mf.puts.put( - new Method( - new Class(mm.owner), - mm.obfuscatedName, - new Signature(mm.descriptor)), - entry.getValue()); - } - } - - grabAmountInfo(c); - } - totalNonStaticFields = totalFields - totalStaticFields; - totalNamedNonStaticFields = totalNamedFields - totalNamedStaticFields; - totalNonStaticMethods = totalMethods - totalStaticMethods; - totalNamedNonStaticMethods = totalNamedMethods - totalNamedStaticMethods; - - return this; - } - - private void grabAmountInfo(MappedClass c) - { - totalFields += c.fields.size(); - totalNamedFields += c.fields - .stream() - .filter(f -> f.exportedName != null) - .count(); - totalStaticFields += c.fields - .stream() - .filter(f -> (f.access & ACC_STATIC) != 0) - .count(); - totalNamedStaticFields += c.fields - .stream() - .filter(f -> f.exportedName != null - && (f.access & ACC_STATIC) != 0) - .count(); - - totalMethods += c.methods.size(); - totalNamedMethods += c.methods - .stream() - .filter(f -> f.exportedName != null) - .count(); - totalStaticMethods += c.methods - .stream() - .filter(f -> (f.access & ACC_STATIC) != 0) - .count(); - totalNamedStaticMethods += c.methods - .stream() - .filter(f -> f.exportedName != null - && (f.access & ACC_STATIC) != 0) - .count(); - } - - ClassGroup getGroup() - { - return group; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/gamepack/Checker.java b/deobfuscator/src/main/java/net/runelite/gamepack/Checker.java deleted file mode 100644 index cf36651ce..000000000 --- a/deobfuscator/src/main/java/net/runelite/gamepack/Checker.java +++ /dev/null @@ -1,166 +0,0 @@ -package net.runelite.gamepack; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; - -public class Checker -{ - private static final String GAME_URL = "http://oldschool1.runescape.com/"; - private static final Split[] splits = { - new Split("document.write('archive=", 1), - new Split(" ');", 0) - }; - - static String getGamePack() - { - URL url; - try - { - url = new URL(GAME_URL); - } - catch (MalformedURLException e) - { - e.printStackTrace(); - return null; - } - - String content; - try - { - content = getContent(url); - } - catch (IOException e) - { - e.printStackTrace(); - return null; - } - - for (Split split : splits) - { - String[] str = splitAtFirst(content, split.splitAt); - content = str[split.index]; - } - - return content; - } - - private static String[] splitAtFirst(String subject, String splitAt) - { - if (subject == null || subject.length() == 0) - { - return new String[]{"", ""}; - } - - if (splitAt == null || splitAt.length() == 0) - { - return new String[]{subject, ""}; - } - - char[] subjectArray = subject.toCharArray(); - char[] split = splitAt.toCharArray(); - - StringBuilder builder = null; - for (int i = 0; i < subjectArray.length; i++) - { - char c = subjectArray[i]; - - if (builder == null && c == split[0]) - { - builder = new StringBuilder(); - } - - if (builder != null) - { - builder.append(c); - - if (startsWith(splitAt, builder.toString())) - { - if (builder.length() == splitAt.length()) - { - return new String[]{subject.substring(0, i - builder.length() + 1), subject.substring(i + 1)}; - } - } - else - { - builder = null; - } - } - } - - return new String[]{subject, ""}; - } - - private static boolean startsWith(String subject, String start) - { - if (subject == null || subject.length() == 0 || start == null || start.length() == 0 || start.length() > subject.length()) - { - return false; - } - - char[] c1 = subject.toCharArray(); - char[] c2 = start.toCharArray(); - for (int i = 0; i < c2.length; i++) - { - if (c1[i] != c2[i]) - { - return false; - } - } - - return true; - } - - private static String getContent(URL url) throws IOException - { - BufferedReader rd = null; - - try - { - URLConnection conn = url.openConnection(); - - if (conn instanceof HttpURLConnection) - { - ((HttpURLConnection) conn).setInstanceFollowRedirects(false); - } - - HttpURLConnection.setFollowRedirects(false); - - rd = new BufferedReader(new InputStreamReader(conn.getInputStream())); - StringBuilder sb = new StringBuilder(); - - String line; - while ((line = rd.readLine()) != null) - { - sb.append(line); - sb.append('\n'); - } - - return sb.toString(); - - } - finally - { - if (rd != null) - { - rd.close(); - } - } - } - - public static class Split - { - public int index; - String splitAt; - - Split(String splitAt, int index) - { - this.splitAt = splitAt; - this.index = index; - } - } -} \ No newline at end of file diff --git a/deobfuscator/src/main/java/net/runelite/gamepack/Downloader.java b/deobfuscator/src/main/java/net/runelite/gamepack/Downloader.java deleted file mode 100644 index 119c103e4..000000000 --- a/deobfuscator/src/main/java/net/runelite/gamepack/Downloader.java +++ /dev/null @@ -1,65 +0,0 @@ -package net.runelite.gamepack; - -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.nio.file.Path; -import java.nio.file.Paths; - -public class Downloader -{ - private static final String REPLACE = "%archive%"; - private static final String GAMEPACK_URL = "http://oldschool1.runescape.com/" + REPLACE; - - private static String getGamepackUrl() - { - String archive = Checker.getGamePack(); - return archive == null ? "" : GAMEPACK_URL.replace(REPLACE, archive); - } - - public static String gamepack() - { - Path path = Paths.get(System.getProperty("user.home"), "gamepack"); - final File folder = new File(String.valueOf(path)); - - if (!folder.exists()) - { - folder.mkdir(); - } - - downloadLatest(folder); - - return path + File.separator + "gamepack.jar"; - } - - private static void downloadLatest(File folder) - { - File output = new File(folder, "gamepack.jar"); - - try - { - URL url = new URL(getGamepackUrl()); - - final URLDownloader downloader = new URLDownloader(url, output); - downloader.download(); - - try - { - Thread.sleep(100); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - } - catch (IOException e) - { - e.printStackTrace(); - } - } - - public static void main(String[] args) - { - gamepack(); - } -} \ No newline at end of file diff --git a/deobfuscator/src/main/java/net/runelite/gamepack/URLDownloader.java b/deobfuscator/src/main/java/net/runelite/gamepack/URLDownloader.java deleted file mode 100644 index 07d74fcf7..000000000 --- a/deobfuscator/src/main/java/net/runelite/gamepack/URLDownloader.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.runelite.gamepack; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.net.URL; -import java.nio.channels.Channels; -import java.nio.channels.FileChannel; -import java.nio.channels.ReadableByteChannel; - -class URLDownloader -{ - private URL url; - private File output; - - URLDownloader(URL url, File output) - { - this.url = url; - this.output = output; - } - - void download() throws IOException - { - this.downloadFromURL(); - } - - private void downloadFromURL() throws IOException - { - ReadableByteChannel rbc = Channels.newChannel(url.openStream()); - FileOutputStream fos = new FileOutputStream(output); - - FileChannel channel = fos.getChannel(); - channel.transferFrom(rbc, 0, Long.MAX_VALUE); - } -} \ No newline at end of file diff --git a/injector/build.gradle.kts b/injector/build.gradle.kts index 4701b04e0..2936e09e2 100644 --- a/injector/build.gradle.kts +++ b/injector/build.gradle.kts @@ -14,7 +14,7 @@ repositories{ dependencies{ with(projects){ implementation(annotations) - implementation(deobfuscator) + implementation(asm) implementation(apiRs) implementation(logger) implementation(cache) diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DMath.java b/injector/src/main/java/com/openosrs/injector/DMath.java similarity index 98% rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DMath.java rename to injector/src/main/java/com/openosrs/injector/DMath.java index 32dbd730c..cd926350a 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DMath.java +++ b/injector/src/main/java/com/openosrs/injector/DMath.java @@ -22,7 +22,7 @@ * (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.deob.deobfuscators.arithmetic; +package com.openosrs.injector; import java.math.BigInteger; diff --git a/injector/src/main/java/com/openosrs/injector/InjectUtil.java b/injector/src/main/java/com/openosrs/injector/InjectUtil.java index 14c2be9fd..04b39036f 100644 --- a/injector/src/main/java/com/openosrs/injector/InjectUtil.java +++ b/injector/src/main/java/com/openosrs/injector/InjectUtil.java @@ -8,6 +8,8 @@ package com.openosrs.injector; import com.openosrs.injector.injection.InjectData; + +import static com.openosrs.injector.DMath.modInverse; import static com.openosrs.injector.rsapi.RSApi.API_BASE; import static com.openosrs.injector.rsapi.RSApi.RL_API_BASE; import com.openosrs.injector.rsapi.RSApiClass; @@ -17,33 +19,33 @@ import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Collectors; -import net.runelite.asm.Annotation; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Named; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Annotated; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.DLoad; -import net.runelite.asm.attributes.code.instructions.FLoad; -import net.runelite.asm.attributes.code.instructions.ILoad; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.LLoad; -import net.runelite.asm.attributes.code.instructions.LMul; -import net.runelite.asm.attributes.code.instructions.Return; -import net.runelite.asm.attributes.code.instructions.VReturn; -import net.runelite.asm.pool.Class; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.deobfuscators.arithmetic.DMath; +import asm.Annotation; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.Method; +import asm.Named; +import asm.Type; +import asm.attributes.Annotated; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.ALoad; +import asm.attributes.code.instructions.DLoad; +import asm.attributes.code.instructions.FLoad; +import asm.attributes.code.instructions.ILoad; +import asm.attributes.code.instructions.IMul; +import asm.attributes.code.instructions.InvokeStatic; +import asm.attributes.code.instructions.InvokeVirtual; +import asm.attributes.code.instructions.LDC; +import asm.attributes.code.instructions.LLoad; +import asm.attributes.code.instructions.LMul; +import asm.attributes.code.instructions.Return; +import asm.attributes.code.instructions.VReturn; +import asm.pool.Class; +import asm.signature.Signature; +import asm.DeobAnnotations; + import org.jetbrains.annotations.Nullable; public interface InjectUtil @@ -526,7 +528,7 @@ static Instruction createReturnForType(Instructions instructions, Type type) } } - static Instruction createInvokeFor(Instructions instructions, net.runelite.asm.pool.Method method, boolean isStatic) + static Instruction createInvokeFor(Instructions instructions, asm.pool.Method method, boolean isStatic) { if (isStatic) { @@ -572,7 +574,7 @@ else if (getter instanceof Long) */ static void injectObfuscatedSetter(Number getter, Instructions instrs, Consumer into) { - injectObfuscatedGetter(DMath.modInverse(getter), instrs, into); + injectObfuscatedGetter(modInverse(getter), instrs, into); } private static List findArgs(final String str, final List ret, final int from, final int to) diff --git a/injector/src/main/java/com/openosrs/injector/Injector.java b/injector/src/main/java/com/openosrs/injector/Injector.java index 7097bd674..37007a162 100644 --- a/injector/src/main/java/com/openosrs/injector/Injector.java +++ b/injector/src/main/java/com/openosrs/injector/Injector.java @@ -7,6 +7,7 @@ */ package com.openosrs.injector; +import asm.util.JarUtil; import com.google.common.hash.Hashing; import com.openosrs.injector.injection.InjectData; import com.openosrs.injector.injection.InjectTaskHandler; @@ -30,10 +31,11 @@ import joptsimple.OptionSet; import joptsimple.util.EnumConverter; import meteor.Logger; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.deob.util.JarUtil; -import static net.runelite.deob.util.JarUtil.load; +import asm.ClassFile; +import asm.ClassGroup; + +import static asm.util.JarUtil.load; + public class Injector extends InjectData implements InjectTaskHandler { diff --git a/injector/src/main/java/com/openosrs/injector/InjectorValidator.java b/injector/src/main/java/com/openosrs/injector/InjectorValidator.java index 435297b43..06a6c8c0a 100644 --- a/injector/src/main/java/com/openosrs/injector/InjectorValidator.java +++ b/injector/src/main/java/com/openosrs/injector/InjectorValidator.java @@ -13,8 +13,8 @@ import com.openosrs.injector.rsapi.RSApiMethod; import lombok.RequiredArgsConstructor; import meteor.Logger; -import net.runelite.asm.ClassFile; -import net.runelite.asm.pool.Class; +import asm.ClassFile; +import asm.pool.Class; import static com.openosrs.injector.rsapi.RSApi.API_BASE; @RequiredArgsConstructor diff --git a/injector/src/main/java/com/openosrs/injector/Validator.java b/injector/src/main/java/com/openosrs/injector/Validator.java index d4679c7a3..14e6213f8 100644 --- a/injector/src/main/java/com/openosrs/injector/Validator.java +++ b/injector/src/main/java/com/openosrs/injector/Validator.java @@ -7,7 +7,7 @@ */ package com.openosrs.injector; -import net.runelite.asm.Named; +import asm.Named; public interface Validator extends Named { diff --git a/injector/src/main/java/com/openosrs/injector/injection/InjectData.java b/injector/src/main/java/com/openosrs/injector/injection/InjectData.java index 64fe566f2..a7d9d4359 100644 --- a/injector/src/main/java/com/openosrs/injector/injection/InjectData.java +++ b/injector/src/main/java/com/openosrs/injector/injection/InjectData.java @@ -16,12 +16,12 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.Method; +import asm.Type; +import asm.signature.Signature; /** * Abstract class meant as the interface of {@link com.openosrs.injector.Injector injection} for injectors diff --git a/injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java b/injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java index f29ff939f..c2b01d0e4 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java @@ -30,11 +30,12 @@ */ package com.openosrs.injector.injectors; +import asm.DeobAnnotations; import com.openosrs.injector.injection.InjectData; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.deob.DeobAnnotations; +import asm.ClassFile; +import asm.Field; +import asm.Method; + /* * This handles creating "virtual" annotations to clean up rs-client in the main project diff --git a/injector/src/main/java/com/openosrs/injector/injectors/CreateObfuscatedClassMap.java b/injector/src/main/java/com/openosrs/injector/injectors/CreateObfuscatedClassMap.java index f47081842..2c4923800 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/CreateObfuscatedClassMap.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/CreateObfuscatedClassMap.java @@ -30,11 +30,12 @@ */ package com.openosrs.injector.injectors; +import asm.DeobAnnotations; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.openosrs.injector.injection.InjectData; -import net.runelite.asm.ClassFile; -import net.runelite.deob.DeobAnnotations; +import asm.ClassFile; + import java.io.File; import java.io.FileWriter; diff --git a/injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java b/injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java index 17bc1c721..65fe6dec8 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java @@ -36,20 +36,20 @@ import com.openosrs.injector.rsapi.RSApiMethod; import java.util.List; import java.util.stream.Collectors; -import net.runelite.asm.Annotation; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.CheckCast; -import net.runelite.asm.attributes.code.instructions.Dup; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.New; -import net.runelite.asm.attributes.code.instructions.Return; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Method; -import net.runelite.asm.signature.Signature; +import asm.Annotation; +import asm.ClassFile; +import asm.Type; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.CheckCast; +import asm.attributes.code.instructions.Dup; +import asm.attributes.code.instructions.InvokeSpecial; +import asm.attributes.code.instructions.New; +import asm.attributes.code.instructions.Return; +import asm.pool.Class; +import asm.pool.Method; +import asm.signature.Signature; import static com.openosrs.injector.Injector.report; import static com.openosrs.injector.rsapi.RSApi.CONSTRUCT; @@ -106,14 +106,14 @@ private void injectConstruct(ClassFile targetClass, Method apiMethod) .setReturnType(Type.VOID) .build(); - final net.runelite.asm.Method constructor = classToConstruct.findMethod("", constr); + final asm.Method constructor = classToConstruct.findMethod("", constr); if (constructor == null) { throw new InjectException("Unable to find constructor for " + classToConstruct.getName() + "." + constr); } - net.runelite.asm.Method setterMethod = new net.runelite.asm.Method(targetClass, apiMethod.getName(), apiMethod.getType()); + asm.Method setterMethod = new asm.Method(targetClass, apiMethod.getName(), apiMethod.getType()); setterMethod.setAccessFlags(ACC_PUBLIC); targetClass.addMethod(setterMethod); diff --git a/injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java b/injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java index 4ea626dc9..516811df9 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java @@ -40,31 +40,31 @@ import java.util.Set; import javax.inject.Provider; import lombok.AllArgsConstructor; -import net.runelite.asm.Annotation; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.DupInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.attributes.code.instructions.ArrayStore; -import net.runelite.asm.attributes.code.instructions.CheckCast; -import net.runelite.asm.attributes.code.instructions.Dup; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.LMul; -import net.runelite.asm.attributes.code.instructions.PutField; -import net.runelite.asm.attributes.code.instructions.Swap; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.pool.Class; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.DeobAnnotations; +import asm.Annotation; +import asm.ClassFile; +import asm.Field; +import asm.Method; +import asm.Type; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.DupInstruction; +import asm.attributes.code.instruction.types.SetFieldInstruction; +import asm.attributes.code.instructions.ArrayStore; +import asm.attributes.code.instructions.CheckCast; +import asm.attributes.code.instructions.Dup; +import asm.attributes.code.instructions.IMul; +import asm.attributes.code.instructions.LDC; +import asm.attributes.code.instructions.LMul; +import asm.attributes.code.instructions.PutField; +import asm.attributes.code.instructions.Swap; +import asm.execution.Execution; +import asm.execution.InstructionContext; +import asm.execution.StackContext; +import asm.pool.Class; +import asm.signature.Signature; +import asm.DeobAnnotations; import static com.openosrs.injector.Injector.report; @@ -402,7 +402,7 @@ Instruction getInvoke(Instructions instructions) { return InjectUtil.createInvokeFor( instructions, - new net.runelite.asm.pool.Method( + new asm.pool.Method( targetClass, method.getName(), method.getDescriptor() diff --git a/injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java b/injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java index 196cb629b..a1c3506ab 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java @@ -37,16 +37,16 @@ import java.util.ListIterator; import java.util.Map; import javax.inject.Provider; -import net.runelite.asm.Annotation; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.signature.Signature; +import asm.Annotation; +import asm.ClassFile; +import asm.Method; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.ReturnInstruction; +import asm.attributes.code.instructions.ALoad; +import asm.attributes.code.instructions.InvokeSpecial; +import asm.signature.Signature; import static com.openosrs.injector.Injector.report; @@ -101,7 +101,7 @@ private void injectMethods(Provider mixinProvider, List ta final boolean notStatic = !mixinMethod.isStatic(); final Method targetMethod = InjectUtil.findMethod(inject, hookName, deobTarget.getName(), sig -> InjectUtil.argsMatch(sig, deobSig), notStatic, false); - final net.runelite.asm.pool.Method hookMethod = new net.runelite.asm.pool.Method( + final asm.pool.Method hookMethod = new asm.pool.Method( targetClass.getPoolClass(), mixinMethod.getName(), mixinMethod.getDescriptor() @@ -115,7 +115,7 @@ private void injectMethods(Provider mixinProvider, List ta } } - private void inject(final Method method, final net.runelite.asm.pool.Method hookMethod, boolean end) + private void inject(final Method method, final asm.pool.Method hookMethod, boolean end) { final Instructions ins = method.getCode().getInstructions(); final ListIterator it; @@ -151,7 +151,7 @@ private void inject(final Method method, final net.runelite.asm.pool.Method hook insertVoke(method, hookMethod, it); } - private void insertVoke(final Method method, final net.runelite.asm.pool.Method hookMethod, ListIterator iterator) + private void insertVoke(final Method method, final asm.pool.Method hookMethod, ListIterator iterator) { final Instructions instructions = method.getCode().getInstructions(); int varIdx = 0; diff --git a/injector/src/main/java/com/openosrs/injector/injectors/Injector.java b/injector/src/main/java/com/openosrs/injector/injectors/Injector.java index e1e497b9e..c357d03a9 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/Injector.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/Injector.java @@ -7,7 +7,7 @@ */ package com.openosrs.injector.injectors; -import net.runelite.asm.Named; +import asm.Named; public interface Injector extends Named { diff --git a/injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java index 2118b442d..cb13a3066 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java @@ -8,10 +8,10 @@ package com.openosrs.injector.injectors; import com.openosrs.injector.injection.InjectData; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Interfaces; -import net.runelite.asm.pool.Class; -import net.runelite.deob.DeobAnnotations; +import asm.ClassFile; +import asm.Interfaces; +import asm.pool.Class; +import asm.DeobAnnotations; import static com.openosrs.injector.Injector.report; import static com.openosrs.injector.rsapi.RSApi.API_BASE; diff --git a/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java index 6606c47a1..c2aa508de 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java @@ -30,6 +30,7 @@ */ package com.openosrs.injector.injectors; +import asm.util.JarUtil; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.openosrs.injector.InjectException; @@ -44,35 +45,34 @@ import javax.annotation.Nonnull; import javax.inject.Provider; import lombok.Value; -import net.runelite.asm.Annotation; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Annotated; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.ANewArray; -import net.runelite.asm.attributes.code.instructions.CheckCast; -import net.runelite.asm.attributes.code.instructions.GetField; -import net.runelite.asm.attributes.code.instructions.InvokeDynamic; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.Pop; -import net.runelite.asm.attributes.code.instructions.PutField; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.DeobAnnotations; -import net.runelite.deob.util.JarUtil; +import asm.Annotation; +import asm.ClassFile; +import asm.Field; +import asm.Method; +import asm.Type; +import asm.attributes.Annotated; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.FieldInstruction; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.InvokeInstruction; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.PushConstantInstruction; +import asm.attributes.code.instruction.types.ReturnInstruction; +import asm.attributes.code.instruction.types.SetFieldInstruction; +import asm.attributes.code.instructions.ALoad; +import asm.attributes.code.instructions.ANewArray; +import asm.attributes.code.instructions.CheckCast; +import asm.attributes.code.instructions.GetField; +import asm.attributes.code.instructions.InvokeDynamic; +import asm.attributes.code.instructions.InvokeSpecial; +import asm.attributes.code.instructions.InvokeStatic; +import asm.attributes.code.instructions.LDC; +import asm.attributes.code.instructions.Pop; +import asm.attributes.code.instructions.PutField; +import asm.signature.Signature; +import asm.DeobAnnotations; import org.jetbrains.annotations.Nullable; import org.objectweb.asm.Opcodes; @@ -91,7 +91,7 @@ public class MixinInjector extends AbstractInjector private int injectedInterfaces = 0; private final Map injectedFields = new HashMap<>(); - private final Map shadowFields = new HashMap<>(); + private final Map shadowFields = new HashMap<>(); private int copied = 0, replaced = 0, injected = 0; public MixinInjector(InjectData inject) @@ -295,7 +295,7 @@ private void injectMethods(Provider mixinProvider, List ta final ClassFile mixinClass = mixinProvider.get(); // Keeps mappings between methods annotated with @Copy -> the copied method within the vanilla pack - Map copiedMethods = new HashMap<>(); + Map copiedMethods = new HashMap<>(); // Handle the copy mixins first, so all other mixins know of the copies for (Method mixinMethod : mixinClass.getMethods()) @@ -582,7 +582,7 @@ private void moveCode(Method targetMethod, Code sourceCode) } newCode.getExceptions().getExceptions().addAll(sourceCode.getExceptions().getExceptions()); - for (net.runelite.asm.attributes.code.Exception e : newCode.getExceptions().getExceptions()) + for (asm.attributes.code.Exception e : newCode.getExceptions().getExceptions()) { e.setExceptions(newCode.getExceptions()); } @@ -590,7 +590,7 @@ private void moveCode(Method targetMethod, Code sourceCode) targetMethod.setCode(newCode); } - private void setOwnersToTargetClass(ClassFile mixinCf, ClassFile cf, Method method, Map copiedMethods) + private void setOwnersToTargetClass(ClassFile mixinCf, ClassFile cf, Method method, Map copiedMethods) { ListIterator iterator = method.getCode().getInstructions().listIterator(); @@ -630,8 +630,8 @@ else if (i instanceof InvokeInstruction) } else if (ii.getMethod().getClazz().getName().equals(mixinCf.getName())) { - ii.setMethod(new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class(cf.getName()), + ii.setMethod(new asm.pool.Method( + new asm.pool.Class(cf.getName()), ii.getMethod().getName(), ii.getMethod().getType() )); @@ -664,8 +664,8 @@ else if (i instanceof GetFieldInstruction) } else if (fi.getField().getClazz().getName().equals(mixinCf.getName())) { - fi.setField(new net.runelite.asm.pool.Field( - new net.runelite.asm.pool.Class(cf.getName()), + fi.setField(new asm.pool.Field( + new asm.pool.Class(cf.getName()), fi.getField().getName(), fi.getField().getType() )); diff --git a/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java index 865abd77f..e6152f118 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java @@ -44,13 +44,13 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Annotated; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.DeobAnnotations; +import asm.ClassFile; +import asm.Field; +import asm.Method; +import asm.Type; +import asm.attributes.Annotated; +import asm.signature.Signature; +import asm.DeobAnnotations; import static com.openosrs.injector.Injector.report; import static com.openosrs.injector.rsapi.RSApi.API_BASE; diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java index 4e36874cc..a61c321d5 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java @@ -14,22 +14,22 @@ import com.openosrs.injector.injectors.AbstractInjector; import java.util.Iterator; import java.util.ListIterator; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.BiPush; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.IAnd; -import net.runelite.asm.attributes.code.instructions.IfACmpEq; -import net.runelite.asm.attributes.code.instructions.IfACmpNe; -import net.runelite.asm.attributes.code.instructions.IfICmpNe; -import net.runelite.asm.attributes.code.instructions.IfNe; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.pool.Field; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.ComparisonInstruction; +import asm.attributes.code.instruction.types.JumpingInstruction; +import asm.attributes.code.instructions.ALoad; +import asm.attributes.code.instructions.BiPush; +import asm.attributes.code.instructions.GetStatic; +import asm.attributes.code.instructions.IAnd; +import asm.attributes.code.instructions.IfACmpEq; +import asm.attributes.code.instructions.IfACmpNe; +import asm.attributes.code.instructions.IfICmpNe; +import asm.attributes.code.instructions.IfNe; +import asm.attributes.code.instructions.InvokeStatic; +import asm.pool.Field; public class AddPlayerToMenu extends AbstractInjector { @@ -41,9 +41,9 @@ public AddPlayerToMenu(InjectData inject) public void inject() { final Method addPlayerOptions = inject.toVanilla(inject.getDeobfuscated().findClass("Scene")).findMethod("copy$addPlayerToMenu"); - final net.runelite.asm.pool.Method shouldHideAttackOptionFor = + final asm.pool.Method shouldHideAttackOptionFor = inject.getVanilla().findClass("Client").findMethod("shouldHideAttackOptionFor").getPoolMethod(); -// final net.runelite.asm.pool.Method shouldDrawMethod = +// final asm.pool.Method shouldDrawMethod = // inject.getVanilla().findStaticMethod("shouldDraw").getPoolMethod(); try @@ -58,7 +58,7 @@ public void inject() } } -// private void injectSameTileFix(Method addPlayerOptions, net.runelite.asm.pool.Method shouldDrawMethod) +// private void injectSameTileFix(Method addPlayerOptions, asm.pool.Method shouldDrawMethod) // { // // ALOAD 0 // // ICONST_0 @@ -85,7 +85,7 @@ public void inject() // } // } - private void injectHideAttack(Method addPlayerOptions, net.runelite.asm.pool.Method shouldHideAttackOptionFor) + private void injectHideAttack(Method addPlayerOptions, asm.pool.Method shouldHideAttackOptionFor) { final Field AttackOption_hidden = InjectUtil.findField(inject, "AttackOption_hidden", "AttackOption").getPoolField(); @@ -176,7 +176,7 @@ else if (i instanceof IfACmpNe) ins.addInstruction(injectIdx, i3); } - private void injectHideCast(Method addPlayerOptions, net.runelite.asm.pool.Method shouldHideAttackOptionFor) + private void injectHideCast(Method addPlayerOptions, asm.pool.Method shouldHideAttackOptionFor) { // LABEL before // BIPUSH 8 diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java index 391f637dc..23a85226e 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java @@ -12,16 +12,16 @@ import com.openosrs.injector.injectors.AbstractInjector; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.ILoad; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.PushConstantInstruction; +import asm.attributes.code.instructions.ILoad; +import asm.attributes.code.instructions.InvokeStatic; +import asm.execution.Execution; +import asm.execution.InstructionContext; +import asm.execution.MethodContext; +import asm.execution.StackContext; public class ClearColorBuffer extends AbstractInjector { @@ -38,8 +38,8 @@ public void inject() */ final Execution exec = new Execution(inject.getVanilla()); - final net.runelite.asm.pool.Method clearBuffer = inject.getVanilla().findClass("Client").findMethod("clearColorBuffer").getPoolMethod(); - final net.runelite.asm.pool.Method fillRectPool = InjectUtil.findMethod(inject, "Rasterizer2D_fillRectangle", "Rasterizer2D", null).getPoolMethod(); + final asm.pool.Method clearBuffer = inject.getVanilla().findClass("Client").findMethod("clearColorBuffer").getPoolMethod(); + final asm.pool.Method fillRectPool = InjectUtil.findMethod(inject, "Rasterizer2D_fillRectangle", "Rasterizer2D", null).getPoolMethod(); final Method drawEntities = InjectUtil.findMethod(inject, "drawEntities"); // XXX: should prob be called drawViewport? exec.addMethod(drawEntities); diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/CopyRuneLiteClasses.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/CopyRuneLiteClasses.java index 9baa511c6..a81c9db3c 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/CopyRuneLiteClasses.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/CopyRuneLiteClasses.java @@ -14,24 +14,24 @@ import java.util.List; import java.util.ListIterator; import java.util.Set; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.CheckCast; -import net.runelite.asm.attributes.code.instructions.GetField; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.attributes.code.instructions.New; -import net.runelite.asm.attributes.code.instructions.PutField; -import net.runelite.asm.attributes.code.instructions.PutStatic; -import net.runelite.asm.pool.Class; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Field; +import asm.Method; +import asm.Type; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.CheckCast; +import asm.attributes.code.instructions.GetField; +import asm.attributes.code.instructions.GetStatic; +import asm.attributes.code.instructions.InvokeSpecial; +import asm.attributes.code.instructions.InvokeStatic; +import asm.attributes.code.instructions.InvokeVirtual; +import asm.attributes.code.instructions.New; +import asm.attributes.code.instructions.PutField; +import asm.attributes.code.instructions.PutStatic; +import asm.pool.Class; +import asm.signature.Signature; import org.objectweb.asm.Opcodes; public class CopyRuneLiteClasses extends AbstractInjector @@ -130,7 +130,7 @@ private void transformMethod(Method method) if (i instanceof PutField) { - net.runelite.asm.pool.Field field = ((PutField) i).getField(); + asm.pool.Field field = ((PutField) i).getField(); Field vanilla = findField(field); if (vanilla != null) @@ -145,7 +145,7 @@ private void transformMethod(Method method) } else if (i instanceof GetField) { - net.runelite.asm.pool.Field field = ((GetField) i).getField(); + asm.pool.Field field = ((GetField) i).getField(); Field vanilla = findField(field); if (vanilla != null) @@ -160,7 +160,7 @@ else if (i instanceof GetField) } else if (i instanceof PutStatic) { - net.runelite.asm.pool.Field field = ((PutStatic) i).getField(); + asm.pool.Field field = ((PutStatic) i).getField(); Field vanilla = findField(field); if (vanilla != null) @@ -175,7 +175,7 @@ else if (i instanceof PutStatic) } else if (i instanceof GetStatic) { - net.runelite.asm.pool.Field field = ((GetStatic) i).getField(); + asm.pool.Field field = ((GetStatic) i).getField(); Field vanilla = findField(field); if (method.getClassFile().getName().equals(field.getClazz().getName()) && field.getType().toString().contains("Lnet/runelite/rs/api/RS")) @@ -199,7 +199,7 @@ else if (vanilla != null) } else if (i instanceof InvokeSpecial) { - net.runelite.asm.pool.Method meth = ((InvokeSpecial) i).getMethod(); + asm.pool.Method meth = ((InvokeSpecial) i).getMethod(); Method vanilla = findMethod(meth, true); if (vanilla != null) @@ -214,7 +214,7 @@ else if (i instanceof InvokeSpecial) } else if (i instanceof InvokeStatic) { - net.runelite.asm.pool.Method meth = ((InvokeStatic) i).getMethod(); + asm.pool.Method meth = ((InvokeStatic) i).getMethod(); Method vanilla = findMethod(meth, false); if (vanilla != null) @@ -229,7 +229,7 @@ else if (i instanceof InvokeStatic) } else if (i instanceof InvokeVirtual) { - net.runelite.asm.pool.Method meth = ((InvokeVirtual) i).getMethod(); + asm.pool.Method meth = ((InvokeVirtual) i).getMethod(); Method vanilla = findMethod(meth, true); if (vanilla != null) @@ -282,7 +282,7 @@ private Type getObfuscatedSignature(Type type) return InjectUtil.deobToVanilla(inject, type); } - private Method findMethod(net.runelite.asm.pool.Method meth, boolean notStatic) + private Method findMethod(asm.pool.Method meth, boolean notStatic) { try { @@ -294,7 +294,7 @@ private Method findMethod(net.runelite.asm.pool.Method meth, boolean notStatic) } } - private Field findField(net.runelite.asm.pool.Field field) + private Field findField(asm.pool.Field field) { try { diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java index 53388d2c0..43be19260 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java @@ -38,20 +38,20 @@ import java.util.HashSet; import java.util.ListIterator; import java.util.Set; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.GetField; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.InvokeInterface; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Field; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instruction.types.JumpingInstruction; +import asm.attributes.code.instruction.types.PushConstantInstruction; +import asm.attributes.code.instructions.GetField; +import asm.attributes.code.instructions.GetStatic; +import asm.attributes.code.instructions.IMul; +import asm.attributes.code.instructions.InvokeInterface; +import asm.attributes.code.instructions.InvokeStatic; +import asm.signature.Signature; public class DrawAfterWidgets extends AbstractInjector { @@ -115,7 +115,7 @@ public void inject() throw new InjectException("Mapped method \"Rasterizer2D_resetClip\" could not be found."); } - net.runelite.asm.pool.Method poolNoClip = noClip.getPoolMethod(); + asm.pool.Method poolNoClip = noClip.getPoolMethod(); for (ClassFile c : inject.getVanilla()) { @@ -241,8 +241,8 @@ public void inject() for (Label l : labelsToInjectAfter) { InvokeInterface invoke = new InvokeInterface(instructions, - new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class(CALLBACKS), + new asm.pool.Method( + new asm.pool.Class(CALLBACKS), "drawAfterWidgets", new Signature("()V") ) diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/DrawMenu.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/DrawMenu.java index cb2bdcbc3..a5c7e999a 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/DrawMenu.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/DrawMenu.java @@ -13,18 +13,18 @@ import com.openosrs.injector.injectors.AbstractInjector; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.IfEq; -import net.runelite.asm.attributes.code.instructions.IfNe; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.pool.Field; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instructions.GetStatic; +import asm.attributes.code.instructions.IfEq; +import asm.attributes.code.instructions.IfNe; +import asm.attributes.code.instructions.InvokeStatic; +import asm.execution.Execution; +import asm.execution.InstructionContext; +import asm.execution.MethodContext; +import asm.pool.Field; public class DrawMenu extends AbstractInjector { @@ -57,7 +57,7 @@ public void inject() * -------- */ - final net.runelite.asm.pool.Method drawMenu = inject.getVanilla().findClass("Client").findMethod("drawMenu").getPoolMethod(); + final asm.pool.Method drawMenu = inject.getVanilla().findClass("Client").findMethod("drawMenu").getPoolMethod(); final Method drawLoggedIn = InjectUtil.findMethod(inject, "drawLoggedIn", "Client", null, true, false); final Field gameDrawMode = InjectUtil.findField(inject, "gameDrawingMode", "Client").getPoolField(); final Field isMenuOpen = InjectUtil.findField(inject, "isMenuOpen", "Client").getPoolField(); diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/GameDrawingMode.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/GameDrawingMode.java index 977d304a8..86f69b078 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/GameDrawingMode.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/GameDrawingMode.java @@ -4,13 +4,13 @@ import com.openosrs.injector.injection.InjectData; import com.openosrs.injector.injectors.AbstractInjector; import java.util.ListIterator; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.PutStatic; -import net.runelite.asm.pool.Field; +import asm.ClassFile; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.LDC; +import asm.attributes.code.instructions.PutStatic; +import asm.pool.Field; public class GameDrawingMode extends AbstractInjector { diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/GraphicsObject.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/GraphicsObject.java index 7b3e74d14..11caaf63e 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/GraphicsObject.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/GraphicsObject.java @@ -9,14 +9,14 @@ import com.openosrs.injector.injection.InjectData; import com.openosrs.injector.injectors.AbstractInjector; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.VReturn; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Method; +import asm.attributes.Code; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.ALoad; +import asm.attributes.code.instructions.InvokeSpecial; +import asm.attributes.code.instructions.VReturn; +import asm.signature.Signature; public class GraphicsObject extends AbstractInjector { @@ -50,7 +50,7 @@ public void inject() Instructions ins = code.getInstructions(); ins.addInstruction(new ALoad(ins, 0)); - ins.addInstruction(new InvokeSpecial(ins, new net.runelite.asm.pool.Method(renderableVanilla.getPoolClass(), "", new Signature("()V")))); + ins.addInstruction(new InvokeSpecial(ins, new asm.pool.Method(renderableVanilla.getPoolClass(), "", new Signature("()V")))); ins.addInstruction(new VReturn(ins)); } } diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/Occluder.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/Occluder.java index 042546243..7ecbf63bb 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/Occluder.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/Occluder.java @@ -11,11 +11,11 @@ import com.openosrs.injector.injection.InjectData; import com.openosrs.injector.injectors.AbstractInjector; import java.util.ListIterator; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.BiPush; +import asm.Method; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.BiPush; public class Occluder extends AbstractInjector { diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/RasterizerAlpha.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/RasterizerAlpha.java index 0c8b02f43..74e3f335c 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/RasterizerAlpha.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/RasterizerAlpha.java @@ -11,39 +11,39 @@ import com.openosrs.injector.InjectUtil; import com.openosrs.injector.injection.InjectData; import com.openosrs.injector.injectors.AbstractInjector; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; -import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.IALoad; -import net.runelite.asm.attributes.code.instructions.IAStore; -import net.runelite.asm.attributes.code.instructions.IAdd; -import net.runelite.asm.attributes.code.instructions.ILoad; -import net.runelite.asm.attributes.code.instructions.IOr; -import net.runelite.asm.attributes.code.instructions.IShR; -import net.runelite.asm.attributes.code.instructions.ISub; -import net.runelite.asm.attributes.code.instructions.IUShR; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.SiPush; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; -import net.runelite.asm.execution.VariableContext; -import net.runelite.asm.pool.Class; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Field; +import asm.Method; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instruction.types.GetFieldInstruction; +import asm.attributes.code.instruction.types.LVTInstruction; +import asm.attributes.code.instruction.types.PushConstantInstruction; +import asm.attributes.code.instructions.GetStatic; +import asm.attributes.code.instructions.IALoad; +import asm.attributes.code.instructions.IAStore; +import asm.attributes.code.instructions.IAdd; +import asm.attributes.code.instructions.ILoad; +import asm.attributes.code.instructions.IOr; +import asm.attributes.code.instructions.IShR; +import asm.attributes.code.instructions.ISub; +import asm.attributes.code.instructions.IUShR; +import asm.attributes.code.instructions.InvokeStatic; +import asm.attributes.code.instructions.LDC; +import asm.attributes.code.instructions.SiPush; +import asm.execution.Execution; +import asm.execution.InstructionContext; +import asm.execution.MethodContext; +import asm.execution.StackContext; +import asm.execution.VariableContext; +import asm.pool.Class; +import asm.signature.Signature; public class RasterizerAlpha extends AbstractInjector { - private static final net.runelite.asm.pool.Method DRAWALPHA = new net.runelite.asm.pool.Method( + private static final asm.pool.Method DRAWALPHA = new asm.pool.Method( new Class("Client"), "drawAlpha", new Signature("([IIII)V") diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/RenderDraw.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/RenderDraw.java index 023f316d6..7fb21ed9a 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/RenderDraw.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/RenderDraw.java @@ -12,11 +12,11 @@ import com.openosrs.injector.injection.InjectData; import com.openosrs.injector.injectors.AbstractInjector; import java.util.ListIterator; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.InvokeStatic; +import asm.attributes.code.instructions.InvokeVirtual; public class RenderDraw extends AbstractInjector { @@ -30,7 +30,7 @@ public RenderDraw(InjectData inject) @Override public void inject() { - final net.runelite.asm.pool.Method renderDraw = inject.toVanilla(inject.getDeobfuscated().findClass("Scene")).findMethod("renderDraw").getPoolMethod(); + final asm.pool.Method renderDraw = inject.toVanilla(inject.getDeobfuscated().findClass("Scene")).findMethod("renderDraw").getPoolMethod(); int replaced = 0; @@ -38,7 +38,7 @@ public void inject() * This class replaces entity draw invocation instructions * with the renderDraw method on drawcallbacks */ - final net.runelite.asm.pool.Method draw = InjectUtil.findMethod(inject, "draw", "Renderable", null, true, false).getPoolMethod(); + final asm.pool.Method draw = InjectUtil.findMethod(inject, "draw", "Renderable", null, true, false).getPoolMethod(); final Method drawTile = InjectUtil.findMethod(inject, "drawTile", "Scene", null, true, false); diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneLiteIterables.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneLiteIterables.java index c8943fd7a..446ed58ae 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneLiteIterables.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneLiteIterables.java @@ -10,18 +10,18 @@ import com.openosrs.injector.injection.InjectData; import com.openosrs.injector.injectors.AbstractInjector; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.Dup; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.New; -import net.runelite.asm.attributes.code.instructions.Return; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Method; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.ALoad; +import asm.attributes.code.instructions.Dup; +import asm.attributes.code.instructions.InvokeSpecial; +import asm.attributes.code.instructions.New; +import asm.attributes.code.instructions.Return; +import asm.signature.Signature; public class RuneLiteIterables extends AbstractInjector { @@ -64,7 +64,7 @@ public void injectHashTable() ins.add(new New(instructions, runeliteIterableHashTableVanilla.getPoolClass())); ins.add(new Dup(instructions)); ins.add(new ALoad(instructions, 0)); - ins.add(new InvokeSpecial(instructions, new net.runelite.asm.pool.Method(runeliteIterableHashTableVanilla.getPoolClass(), "", new Signature("(L" + nodeHashTableVanilla.getName() + ";)V")))); + ins.add(new InvokeSpecial(instructions, new asm.pool.Method(runeliteIterableHashTableVanilla.getPoolClass(), "", new Signature("(L" + nodeHashTableVanilla.getName() + ";)V")))); ins.add(new Return(instructions, InstructionType.ARETURN)); } @@ -91,7 +91,7 @@ public void injectNodeDeque() ins.add(new New(instructions, runeliteIterableNodeDequeVanilla.getPoolClass())); ins.add(new Dup(instructions)); ins.add(new ALoad(instructions, 0)); - ins.add(new InvokeSpecial(instructions, new net.runelite.asm.pool.Method(runeliteIterableNodeDequeVanilla.getPoolClass(), "", new Signature("(L" + nodeDequeVanilla.getName() + ";)V")))); + ins.add(new InvokeSpecial(instructions, new asm.pool.Method(runeliteIterableNodeDequeVanilla.getPoolClass(), "", new Signature("(L" + nodeDequeVanilla.getName() + ";)V")))); ins.add(new Return(instructions, InstructionType.ARETURN)); } @@ -118,7 +118,7 @@ public void injectLinkDeque() ins.add(new New(instructions, runeliteIterableLinkDequeVanilla.getPoolClass())); ins.add(new Dup(instructions)); ins.add(new ALoad(instructions, 0)); - ins.add(new InvokeSpecial(instructions, new net.runelite.asm.pool.Method(runeliteIterableLinkDequeVanilla.getPoolClass(), "", new Signature("(L" + linkDequeVanilla.getName() + ";)V")))); + ins.add(new InvokeSpecial(instructions, new asm.pool.Method(runeliteIterableLinkDequeVanilla.getPoolClass(), "", new Signature("(L" + linkDequeVanilla.getName() + ";)V")))); ins.add(new Return(instructions, InstructionType.ARETURN)); } } diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteMenuEntry.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteMenuEntry.java index 83d543199..f4b998f47 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteMenuEntry.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteMenuEntry.java @@ -13,22 +13,22 @@ import com.openosrs.injector.injectors.AbstractInjector; import java.util.List; import java.util.ListIterator; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.BAStore; -import net.runelite.asm.attributes.code.instructions.Dup; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.ILoad; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.New; -import net.runelite.asm.attributes.code.instructions.Return; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Field; +import asm.Method; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.BAStore; +import asm.attributes.code.instructions.Dup; +import asm.attributes.code.instructions.GetStatic; +import asm.attributes.code.instructions.ILoad; +import asm.attributes.code.instructions.InvokeSpecial; +import asm.attributes.code.instructions.InvokeStatic; +import asm.attributes.code.instructions.New; +import asm.attributes.code.instructions.Return; +import asm.signature.Signature; public class RuneliteMenuEntry extends AbstractInjector { @@ -69,11 +69,11 @@ private void addInvoke(String methodName, boolean iload) if (iload) { ins.add(new ILoad(instructions, 0)); - ins.add(new InvokeSpecial(instructions, new net.runelite.asm.pool.Method(runeliteMenuEntryVanilla.getPoolClass(), "", new Signature("(I)V")))); + ins.add(new InvokeSpecial(instructions, new asm.pool.Method(runeliteMenuEntryVanilla.getPoolClass(), "", new Signature("(I)V")))); } else { - ins.add(new InvokeSpecial(instructions, new net.runelite.asm.pool.Method(runeliteMenuEntryVanilla.getPoolClass(), "", new Signature("()V")))); + ins.add(new InvokeSpecial(instructions, new asm.pool.Method(runeliteMenuEntryVanilla.getPoolClass(), "", new Signature("()V")))); } ins.add(new Return(instructions, InstructionType.ARETURN)); } @@ -114,7 +114,7 @@ private void addSwap(Method method, Field field) } ILoad i1 = new ILoad(ins, 3); - InvokeStatic i2 = new InvokeStatic(ins, new net.runelite.asm.pool.Method(clientVanilla.getPoolClass(), "swapMenuEntries", new Signature("(I)V"))); + InvokeStatic i2 = new InvokeStatic(ins, new asm.pool.Method(clientVanilla.getPoolClass(), "swapMenuEntries", new Signature("(I)V"))); iterator.add(i1); iterator.add(i2); diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteObject.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteObject.java index 131479c39..d6374b929 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteObject.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteObject.java @@ -10,17 +10,17 @@ import com.openosrs.injector.injection.InjectData; import com.openosrs.injector.injectors.AbstractInjector; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.InstructionType; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.Dup; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; -import net.runelite.asm.attributes.code.instructions.New; -import net.runelite.asm.attributes.code.instructions.Return; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Method; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.InstructionType; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.Dup; +import asm.attributes.code.instructions.InvokeSpecial; +import asm.attributes.code.instructions.New; +import asm.attributes.code.instructions.Return; +import asm.signature.Signature; public class RuneliteObject extends AbstractInjector { @@ -53,7 +53,7 @@ public void inject() ins.add(new New(instructions, runeliteObjectVanilla.getPoolClass())); ins.add(new Dup(instructions)); - ins.add(new InvokeSpecial(instructions, new net.runelite.asm.pool.Method(runeliteObjectVanilla.getPoolClass(), "", new Signature("()V")))); + ins.add(new InvokeSpecial(instructions, new asm.pool.Method(runeliteObjectVanilla.getPoolClass(), "", new Signature("()V")))); ins.add(new Return(instructions, InstructionType.ARETURN)); } } diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java index ea438b3ba..40fc96346 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java @@ -38,31 +38,31 @@ import java.util.ListIterator; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.AStore; -import net.runelite.asm.attributes.code.instructions.Dup; -import net.runelite.asm.attributes.code.instructions.GetField; -import net.runelite.asm.attributes.code.instructions.IALoad; -import net.runelite.asm.attributes.code.instructions.IInc; -import net.runelite.asm.attributes.code.instructions.ILoad; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.IStore; -import net.runelite.asm.attributes.code.instructions.IfNe; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.PutField; -import net.runelite.asm.attributes.code.instructions.PutStatic; -import net.runelite.asm.execution.Execution; -import net.runelite.asm.execution.InstructionContext; -import net.runelite.asm.execution.MethodContext; -import net.runelite.asm.execution.StackContext; +import asm.ClassFile; +import asm.ClassGroup; +import asm.Field; +import asm.Method; +import asm.Type; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.Label; +import asm.attributes.code.instructions.ALoad; +import asm.attributes.code.instructions.AStore; +import asm.attributes.code.instructions.Dup; +import asm.attributes.code.instructions.GetField; +import asm.attributes.code.instructions.IALoad; +import asm.attributes.code.instructions.IInc; +import asm.attributes.code.instructions.ILoad; +import asm.attributes.code.instructions.IMul; +import asm.attributes.code.instructions.IStore; +import asm.attributes.code.instructions.IfNe; +import asm.attributes.code.instructions.InvokeStatic; +import asm.attributes.code.instructions.PutField; +import asm.attributes.code.instructions.PutStatic; +import asm.execution.Execution; +import asm.execution.InstructionContext; +import asm.execution.MethodContext; +import asm.execution.StackContext; public class ScriptVM extends AbstractInjector { diff --git a/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectGetter.java b/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectGetter.java index 5f8e7273b..85061c878 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectGetter.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectGetter.java @@ -34,16 +34,16 @@ import com.openosrs.injector.InjectUtil; import com.openosrs.injector.rsapi.RSApiMethod; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.GetField; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Field; +import asm.Method; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.ALoad; +import asm.attributes.code.instructions.GetField; +import asm.attributes.code.instructions.GetStatic; +import asm.signature.Signature; public class InjectGetter { diff --git a/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectInvoke.java b/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectInvoke.java index 3b98e2d85..006657994 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectInvoke.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectInvoke.java @@ -34,21 +34,21 @@ import com.openosrs.injector.InjectUtil; import com.openosrs.injector.rsapi.RSApiMethod; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.BiPush; -import net.runelite.asm.attributes.code.instructions.CheckCast; -import net.runelite.asm.attributes.code.instructions.InvokeInterface; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.attributes.code.instructions.SiPush; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Method; +import asm.Type; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.ALoad; +import asm.attributes.code.instructions.BiPush; +import asm.attributes.code.instructions.CheckCast; +import asm.attributes.code.instructions.InvokeInterface; +import asm.attributes.code.instructions.InvokeStatic; +import asm.attributes.code.instructions.InvokeVirtual; +import asm.attributes.code.instructions.LDC; +import asm.attributes.code.instructions.SiPush; +import asm.signature.Signature; public class InjectInvoke { diff --git a/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectSetter.java b/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectSetter.java index 1f3cdfeca..8a42f9cd5 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectSetter.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectSetter.java @@ -34,19 +34,19 @@ import com.openosrs.injector.InjectUtil; import com.openosrs.injector.rsapi.RSApiMethod; import java.util.List; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.instructions.ALoad; -import net.runelite.asm.attributes.code.instructions.CheckCast; -import net.runelite.asm.attributes.code.instructions.PutField; -import net.runelite.asm.attributes.code.instructions.PutStatic; -import net.runelite.asm.attributes.code.instructions.VReturn; -import net.runelite.asm.signature.Signature; +import asm.ClassFile; +import asm.Field; +import asm.Method; +import asm.Type; +import asm.attributes.Code; +import asm.attributes.code.Instruction; +import asm.attributes.code.Instructions; +import asm.attributes.code.instructions.ALoad; +import asm.attributes.code.instructions.CheckCast; +import asm.attributes.code.instructions.PutField; +import asm.attributes.code.instructions.PutStatic; +import asm.attributes.code.instructions.VReturn; +import asm.signature.Signature; public class InjectSetter { diff --git a/injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java b/injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java index cbcbdf974..2e66c537e 100644 --- a/injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java +++ b/injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java @@ -21,8 +21,8 @@ import java.util.Set; import lombok.Getter; import lombok.NoArgsConstructor; -import net.runelite.asm.Type; -import net.runelite.asm.pool.Class; +import asm.Type; +import asm.pool.Class; import org.jetbrains.annotations.NotNull; import org.objectweb.asm.ClassReader; diff --git a/injector/src/main/java/com/openosrs/injector/rsapi/RSApiClass.java b/injector/src/main/java/com/openosrs/injector/rsapi/RSApiClass.java index 84a1d5503..c6271a87c 100644 --- a/injector/src/main/java/com/openosrs/injector/rsapi/RSApiClass.java +++ b/injector/src/main/java/com/openosrs/injector/rsapi/RSApiClass.java @@ -14,10 +14,10 @@ import java.util.Map; import lombok.Getter; import lombok.Setter; -import net.runelite.asm.Annotation; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Method; -import net.runelite.asm.signature.Signature; +import asm.Annotation; +import asm.pool.Class; +import asm.pool.Method; +import asm.signature.Signature; import org.jetbrains.annotations.NotNull; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; diff --git a/injector/src/main/java/com/openosrs/injector/rsapi/RSApiMethod.java b/injector/src/main/java/com/openosrs/injector/rsapi/RSApiMethod.java index 4d512f210..5fbb5bebd 100644 --- a/injector/src/main/java/com/openosrs/injector/rsapi/RSApiMethod.java +++ b/injector/src/main/java/com/openosrs/injector/rsapi/RSApiMethod.java @@ -11,13 +11,13 @@ import java.util.Map; import lombok.Getter; import lombok.Setter; -import net.runelite.asm.Annotation; -import net.runelite.asm.Named; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.Annotated; -import net.runelite.asm.pool.Class; -import net.runelite.asm.pool.Method; -import net.runelite.asm.signature.Signature; +import asm.Annotation; +import asm.Named; +import asm.Type; +import asm.attributes.Annotated; +import asm.pool.Class; +import asm.pool.Method; +import asm.signature.Signature; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; diff --git a/injector/src/main/java/com/openosrs/injector/transformers/EnumInvokeVirtualFixer.java b/injector/src/main/java/com/openosrs/injector/transformers/EnumInvokeVirtualFixer.java index 2c4b92bf1..10b78ca52 100644 --- a/injector/src/main/java/com/openosrs/injector/transformers/EnumInvokeVirtualFixer.java +++ b/injector/src/main/java/com/openosrs/injector/transformers/EnumInvokeVirtualFixer.java @@ -9,10 +9,10 @@ import com.openosrs.injector.injection.InjectData; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; +import asm.ClassFile; +import asm.Method; +import asm.attributes.code.Instruction; +import asm.attributes.code.instructions.InvokeVirtual; public class EnumInvokeVirtualFixer extends InjectTransformer { diff --git a/injector/src/main/java/com/openosrs/injector/transformers/InjectTransformer.java b/injector/src/main/java/com/openosrs/injector/transformers/InjectTransformer.java index ae43cf0a5..1f5665089 100644 --- a/injector/src/main/java/com/openosrs/injector/transformers/InjectTransformer.java +++ b/injector/src/main/java/com/openosrs/injector/transformers/InjectTransformer.java @@ -11,7 +11,7 @@ import com.openosrs.injector.injection.InjectData; import lombok.RequiredArgsConstructor; import meteor.Logger; -import net.runelite.asm.Named; +import asm.Named; @RequiredArgsConstructor public abstract class InjectTransformer implements Named diff --git a/injector/src/main/java/com/openosrs/injector/transformers/Java8Ifier.java b/injector/src/main/java/com/openosrs/injector/transformers/Java8Ifier.java index fb4a579e1..42a857500 100644 --- a/injector/src/main/java/com/openosrs/injector/transformers/Java8Ifier.java +++ b/injector/src/main/java/com/openosrs/injector/transformers/Java8Ifier.java @@ -10,10 +10,10 @@ import com.openosrs.injector.injection.InjectData; import java.util.List; import java.util.stream.Collectors; -import net.runelite.asm.ClassFile; -import net.runelite.asm.Method; -import net.runelite.asm.attributes.Code; -import net.runelite.asm.attributes.code.Exception; +import asm.ClassFile; +import asm.Method; +import asm.attributes.Code; +import asm.attributes.code.Exception; import org.objectweb.asm.Opcodes; public class Java8Ifier extends InjectTransformer diff --git a/injector/src/main/java/com/openosrs/injector/transformers/SourceChanger.java b/injector/src/main/java/com/openosrs/injector/transformers/SourceChanger.java index ef9a7e212..01aeade7e 100644 --- a/injector/src/main/java/com/openosrs/injector/transformers/SourceChanger.java +++ b/injector/src/main/java/com/openosrs/injector/transformers/SourceChanger.java @@ -8,7 +8,7 @@ package com.openosrs.injector.transformers; import com.openosrs.injector.injection.InjectData; -import net.runelite.asm.ClassFile; +import asm.ClassFile; /** * This class changes the java source file debug information to the rs-client file name diff --git a/scripts/src/main/kotlin/meteor/scripts/AssembleScripts.kt b/scripts/src/main/kotlin/meteor/scripts/AssembleScripts.kt index 4d7325bb6..6472be05f 100644 --- a/scripts/src/main/kotlin/meteor/scripts/AssembleScripts.kt +++ b/scripts/src/main/kotlin/meteor/scripts/AssembleScripts.kt @@ -50,7 +50,7 @@ class AssembleScripts private constructor(private val scriptDirectory: File, pri var count = 0 val scriptOut = File( outputDirectory, - Integer.toString(IndexType.CLIENTSCRIPT.number) + IndexType.CLIENTSCRIPT.number.toString() ) scriptOut.mkdirs() diff --git a/settings.gradle.kts b/settings.gradle.kts index aef4ee1ec..c7cdbbdbe 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,7 @@ include("api") include("api-rs") include("cache") include("client") -include("deobfuscator") +include("asm") include("eventbus") include("http") include("injector") From c8f94457c64a1096b35e09f57476aad5e346d72d Mon Sep 17 00:00:00 2001 From: Kaballist Date: Thu, 9 Nov 2023 16:22:06 -0800 Subject: [PATCH 16/17] rev 75% done --- .../java/net/runelite/rs/api/RSBuffer.java | 10 +- .../main/java/net/runelite/api/Buffer.java | 5 +- .../src/main/java/meteor/api/ClientPackets.kt | 25 +- .../src/main/java/mixins/RSClientMixin.java | 2 +- osrs/src/main/java/AABB.java | 20 +- osrs/src/main/java/AbstractArchive.java | 278 +- .../main/java/AbstractByteArrayCopier.java | 40 +- osrs/src/main/java/AbstractFont.java | 218 +- .../src/main/java/AbstractRasterProvider.java | 38 +- osrs/src/main/java/AbstractSocket.java | 36 +- osrs/src/main/java/AbstractSound.java | 4 +- .../src/main/java/AbstractUserComparator.java | 27 +- osrs/src/main/java/AbstractWorldMapData.java | 764 +- osrs/src/main/java/AbstractWorldMapIcon.java | 90 +- osrs/src/main/java/AccessFile.java | 72 +- osrs/src/main/java/Actor.java | 1747 ++++- osrs/src/main/java/AddRequestTask.java | 74 +- osrs/src/main/java/Animation.java | 72 +- .../main/java/ApproximateRouteStrategy.java | 496 +- osrs/src/main/java/Archive.java | 363 +- osrs/src/main/java/ArchiveDisk.java | 131 +- osrs/src/main/java/ArchiveDiskAction.java | 312 +- .../main/java/ArchiveDiskActionHandler.java | 290 +- osrs/src/main/java/ArchiveLoader.java | 99 +- osrs/src/main/java/AttackOption.java | 74 +- osrs/src/main/java/AudioFilter.java | 114 +- osrs/src/main/java/BZip2Decompressor.java | 82 +- osrs/src/main/java/BZip2State.java | 99 +- osrs/src/main/java/BoundaryObject.java | 63 +- osrs/src/main/java/Bounds.java | 88 +- osrs/src/main/java/Buddy.java | 177 +- osrs/src/main/java/BuddyRankComparator.java | 52 +- osrs/src/main/java/Buffer.java | 578 +- osrs/src/main/java/BufferedFile.java | 96 +- osrs/src/main/java/BufferedNetSocket.java | 43 +- osrs/src/main/java/BufferedSink.java | 46 +- osrs/src/main/java/BufferedSource.java | 73 +- osrs/src/main/java/ByteArrayPool.java | 164 +- osrs/src/main/java/Calendar.java | 31 +- osrs/src/main/java/Canvas.java | 213 +- osrs/src/main/java/ChatChannel.java | 27 +- osrs/src/main/java/ClanChannel.java | 171 +- osrs/src/main/java/ClanChannelMember.java | 91 +- osrs/src/main/java/ClanMate.java | 44 +- osrs/src/main/java/ClanSettings.java | 511 +- osrs/src/main/java/Client.java | 6879 ++++++++--------- osrs/src/main/java/ClientPacket.java | 989 ++- osrs/src/main/java/ClientPreferences.java | 379 +- osrs/src/main/java/Clips.java | 88 +- osrs/src/main/java/Clock.java | 29 +- osrs/src/main/java/CollisionMap.java | 251 +- osrs/src/main/java/ConcurrentMidiTask.java | 63 +- osrs/src/main/java/Coord.java | 28 +- osrs/src/main/java/DbRowType.java | 70 +- osrs/src/main/java/DbTableType.java | 59 +- osrs/src/main/java/Decimator.java | 268 +- osrs/src/main/java/DefaultsGroup.java | 121 +- osrs/src/main/java/DelayFadeTask.java | 46 +- osrs/src/main/java/DemotingHashTable.java | 40 +- .../java/DesktopPlatformInfoProvider.java | 66 +- osrs/src/main/java/DevicePcmPlayer.java | 54 +- .../main/java/DevicePcmPlayerProvider.java | 385 +- osrs/src/main/java/DirectByteArrayCopier.java | 96 +- osrs/src/main/java/DirectWrapper.java | 8 +- osrs/src/main/java/DualNode.java | 14 +- osrs/src/main/java/DualNodeDeque.java | 22 +- osrs/src/main/java/DynamicObject.java | 277 +- osrs/src/main/java/EnumComposition.java | 167 +- .../main/java/EvictingDualNodeHashTable.java | 30 +- osrs/src/main/java/FaceNormal.java | 19 +- osrs/src/main/java/FadeInTask.java | 95 +- osrs/src/main/java/FadeOutTask.java | 120 +- osrs/src/main/java/FileSystem.java | 70 +- osrs/src/main/java/FillMode.java | 36 +- osrs/src/main/java/FloorDecoration.java | 147 +- .../src/main/java/FloorOverlayDefinition.java | 284 +- .../main/java/FloorUnderlayDefinition.java | 212 +- osrs/src/main/java/Font.java | 6 +- osrs/src/main/java/FontName.java | 57 +- osrs/src/main/java/Fonts.java | 50 +- osrs/src/main/java/Frames.java | 257 +- osrs/src/main/java/Friend.java | 114 +- osrs/src/main/java/FriendLoginUpdate.java | 58 +- osrs/src/main/java/FriendSystem.java | 201 +- osrs/src/main/java/FriendsChat.java | 292 +- osrs/src/main/java/FriendsList.java | 56 +- osrs/src/main/java/GZipDecompressor.java | 10 +- osrs/src/main/java/GameBuild.java | 24 +- osrs/src/main/java/GameEngine.java | 556 +- osrs/src/main/java/GameObject.java | 54 +- osrs/src/main/java/GrandExchangeEvent.java | 35 +- osrs/src/main/java/GrandExchangeEvents.java | 23 +- osrs/src/main/java/GrandExchangeOffer.java | 38 +- .../java/GrandExchangeOfferAgeComparator.java | 37 +- .../GrandExchangeOfferNameComparator.java | 411 +- .../GrandExchangeOfferOwnWorldComparator.java | 99 +- ...dExchangeOfferTotalQuantityComparator.java | 256 +- ...GrandExchangeOfferUnitPriceComparator.java | 146 +- .../GrandExchangeOfferWorldComparator.java | 57 +- osrs/src/main/java/GraphicsDefaults.java | 84 +- osrs/src/main/java/GraphicsObject.java | 55 +- osrs/src/main/java/HealthBar.java | 122 +- osrs/src/main/java/HealthBarDefinition.java | 120 +- osrs/src/main/java/HealthBarUpdate.java | 97 +- osrs/src/main/java/HitSplatDefinition.java | 334 +- osrs/src/main/java/HorizontalAlignment.java | 95 +- osrs/src/main/java/Huffman.java | 25 +- osrs/src/main/java/IgnoreList.java | 147 +- osrs/src/main/java/Ignored.java | 16 +- osrs/src/main/java/IndexedSprite.java | 32 +- osrs/src/main/java/Instrument.java | 84 +- osrs/src/main/java/IntHashTable.java | 8 +- osrs/src/main/java/IntegerNode.java | 4 +- osrs/src/main/java/InterfaceParent.java | 80 +- osrs/src/main/java/Interpreter.java | 761 +- osrs/src/main/java/InvDefinition.java | 244 +- osrs/src/main/java/IsaacCipher.java | 50 +- osrs/src/main/java/ItemComposition.java | 411 +- osrs/src/main/java/ItemContainer.java | 32 +- osrs/src/main/java/ItemLayer.java | 41 +- osrs/src/main/java/IterableDualNodeQueue.java | 36 +- .../java/IterableDualNodeQueueIterator.java | 16 +- osrs/src/main/java/IterableNodeDeque.java | 70 +- .../IterableNodeDequeDescendingIterator.java | 22 +- osrs/src/main/java/IterableNodeHashTable.java | 36 +- .../java/IterableNodeHashTableIterator.java | 26 +- osrs/src/main/java/JSException.java | 36 - osrs/src/main/java/JagNetThread.java | 500 +- osrs/src/main/java/JagexCache.java | 172 +- osrs/src/main/java/KeyHandler.java | 193 +- osrs/src/main/java/KitDefinition.java | 340 +- osrs/src/main/java/Language.java | 255 +- osrs/src/main/java/Link.java | 12 +- osrs/src/main/java/LinkDeque.java | 22 +- osrs/src/main/java/Login.java | 214 +- osrs/src/main/java/LoginPacket.java | 121 +- osrs/src/main/java/LoginScreenAnimation.java | 444 +- osrs/src/main/java/LoginType.java | 90 +- osrs/src/main/java/LongNode.java | 4 +- osrs/src/main/java/MenuAction.java | 142 +- osrs/src/main/java/Message.java | 106 +- osrs/src/main/java/Messages.java | 61 +- osrs/src/main/java/MidiFileReader.java | 82 +- osrs/src/main/java/MidiPcmStream.java | 884 ++- osrs/src/main/java/MilliClock.java | 127 +- osrs/src/main/java/ModeWhere.java | 426 +- osrs/src/main/java/Model.java | 1280 +-- osrs/src/main/java/ModelData.java | 366 +- osrs/src/main/java/ModelData0.java | 49 +- osrs/src/main/java/MouseHandler.java | 196 +- osrs/src/main/java/MouseRecorder.java | 401 +- osrs/src/main/java/MouseWheelHandler.java | 20 +- osrs/src/main/java/MoveSpeed.java | 291 +- osrs/src/main/java/MusicPatch.java | 206 +- osrs/src/main/java/MusicPatchNode.java | 88 +- osrs/src/main/java/MusicPatchNode2.java | 187 +- osrs/src/main/java/MusicPatchPcmStream.java | 211 +- osrs/src/main/java/MusicSong.java | 95 +- osrs/src/main/java/MusicTrack.java | 26 +- osrs/src/main/java/NPC.java | 324 +- osrs/src/main/java/NPCComposition.java | 279 +- osrs/src/main/java/NanoClock.java | 14 +- osrs/src/main/java/NewShit.java | 193 +- osrs/src/main/java/Node.java | 16 +- osrs/src/main/java/NodeDeque.java | 52 +- osrs/src/main/java/NodeHashTable.java | 38 +- osrs/src/main/java/ObjTypeCustomisation.java | 47 +- osrs/src/main/java/ObjectComposition.java | 266 +- osrs/src/main/java/ObjectNode.java | 4 +- osrs/src/main/java/ObjectSound.java | 334 +- osrs/src/main/java/Occluder.java | 326 +- osrs/src/main/java/PacketBuffer.java | 130 +- osrs/src/main/java/PacketBufferNode.java | 415 +- osrs/src/main/java/PacketWriter.java | 192 +- osrs/src/main/java/ParamComposition.java | 287 +- osrs/src/main/java/PcmPlayer.java | 298 +- osrs/src/main/java/PcmStream.java | 34 +- osrs/src/main/java/PcmStreamMixer.java | 118 +- .../src/main/java/PcmStreamMixerListener.java | 12 +- osrs/src/main/java/PendingSpawn.java | 128 +- osrs/src/main/java/PlatformInfo.java | 204 +- osrs/src/main/java/Player.java | 318 +- osrs/src/main/java/PlayerComposition.java | 674 +- osrs/src/main/java/PlayerType.java | 203 +- osrs/src/main/java/Players.java | 149 +- osrs/src/main/java/PrivateChatMode.java | 28 +- osrs/src/main/java/Projectile.java | 521 +- osrs/src/main/java/RasterProvider.java | 34 +- osrs/src/main/java/Rasterizer2D.java | 132 +- osrs/src/main/java/Rasterizer3D.java | 194 +- osrs/src/main/java/RawPcmStream.java | 930 +-- osrs/src/main/java/RawSound.java | 20 +- osrs/src/main/java/ReflectionCheck.java | 479 +- osrs/src/main/java/Renderable.java | 75 +- osrs/src/main/java/RouteStrategy.java | 72 +- osrs/src/main/java/RunException.java | 26 +- osrs/src/main/java/RuneLiteMenuEntry.java | 18 +- osrs/src/main/java/Scene.java | 703 +- osrs/src/main/java/SceneTileModel.java | 78 +- osrs/src/main/java/SceneTilePaint.java | 27 +- osrs/src/main/java/Script.java | 109 +- osrs/src/main/java/ScriptEvent.java | 438 +- osrs/src/main/java/ScriptFrame.java | 74 +- osrs/src/main/java/SecureRandomCallable.java | 419 +- osrs/src/main/java/SecureRandomFuture.java | 128 +- osrs/src/main/java/SequenceDefinition.java | 260 +- osrs/src/main/java/ServerPacket.java | 821 +- osrs/src/main/java/Skeleton.java | 54 +- osrs/src/main/java/Skills.java | 39 +- osrs/src/main/java/SoftWrapper.java | 8 +- osrs/src/main/java/SongTask.java | 94 +- osrs/src/main/java/SoundCache.java | 213 +- osrs/src/main/java/SoundEffect.java | 24 +- osrs/src/main/java/SoundEnvelope.java | 36 +- osrs/src/main/java/SoundSystem.java | 661 +- osrs/src/main/java/SpotAnimation.java | 38 +- .../main/java/SpotAnimationDefinition.java | 104 +- osrs/src/main/java/SpriteMask.java | 22 +- osrs/src/main/java/SpritePixels.java | 126 +- osrs/src/main/java/Strings.java | 59 +- osrs/src/main/java/StructComposition.java | 78 +- osrs/src/main/java/StudioGame.java | 62 +- osrs/src/main/java/SwapSongTask.java | 56 +- osrs/src/main/java/Task.java | 16 +- osrs/src/main/java/TaskHandler.java | 90 +- osrs/src/main/java/Texture.java | 85 +- osrs/src/main/java/TextureLoader.java | 22 +- osrs/src/main/java/TextureProvider.java | 269 +- osrs/src/main/java/Tile.java | 635 +- osrs/src/main/java/TileItem.java | 250 +- osrs/src/main/java/Tiles.java | 466 +- osrs/src/main/java/Timer.java | 188 +- osrs/src/main/java/TriBool.java | 86 +- osrs/src/main/java/UrlRequest.java | 1015 ++- osrs/src/main/java/UrlRequester.java | 176 +- osrs/src/main/java/User.java | 78 +- osrs/src/main/java/UserComparator1.java | 10 +- osrs/src/main/java/UserComparator10.java | 54 +- osrs/src/main/java/UserComparator2.java | 10 +- osrs/src/main/java/UserComparator3.java | 63 +- osrs/src/main/java/UserComparator4.java | 234 +- osrs/src/main/java/UserComparator5.java | 156 +- osrs/src/main/java/UserComparator6.java | 76 +- osrs/src/main/java/UserComparator7.java | 48 +- osrs/src/main/java/UserComparator8.java | 127 +- osrs/src/main/java/UserComparator9.java | 90 +- osrs/src/main/java/UserList.java | 183 +- osrs/src/main/java/Username.java | 165 +- osrs/src/main/java/Usernamed.java | 8 +- osrs/src/main/java/VarbitComposition.java | 61 +- osrs/src/main/java/VarcInt.java | 276 +- osrs/src/main/java/Varcs.java | 259 +- osrs/src/main/java/VarpDefinition.java | 81 +- osrs/src/main/java/Varps.java | 68 +- osrs/src/main/java/VertexNormal.java | 88 +- osrs/src/main/java/VerticalAlignment.java | 123 +- osrs/src/main/java/ViewportMouse.java | 169 +- osrs/src/main/java/VorbisCodebook.java | 127 +- osrs/src/main/java/VorbisFloor.java | 126 +- osrs/src/main/java/VorbisMapping.java | 46 +- osrs/src/main/java/VorbisSample.java | 387 +- osrs/src/main/java/WallDecoration.java | 105 +- osrs/src/main/java/Widget.java | 936 ++- osrs/src/main/java/WidgetDefinition.java | 253 +- osrs/src/main/java/World.java | 538 +- osrs/src/main/java/WorldMap.java | 813 +- osrs/src/main/java/WorldMapArchiveLoader.java | 82 +- osrs/src/main/java/WorldMapArea.java | 256 +- osrs/src/main/java/WorldMapAreaData.java | 463 +- osrs/src/main/java/WorldMapCacheName.java | 638 +- osrs/src/main/java/WorldMapData_0.java | 127 +- osrs/src/main/java/WorldMapData_1.java | 115 +- osrs/src/main/java/WorldMapDecoration.java | 95 +- .../src/main/java/WorldMapDecorationType.java | 203 +- osrs/src/main/java/WorldMapElement.java | 230 +- osrs/src/main/java/WorldMapEvent.java | 62 +- osrs/src/main/java/WorldMapIcon_0.java | 65 +- osrs/src/main/java/WorldMapIcon_1.java | 73 +- osrs/src/main/java/WorldMapLabel.java | 66 +- osrs/src/main/java/WorldMapLabelSize.java | 224 +- osrs/src/main/java/WorldMapManager.java | 1171 +-- osrs/src/main/java/WorldMapRectangle.java | 338 +- osrs/src/main/java/WorldMapRegion.java | 437 +- osrs/src/main/java/WorldMapScaleHandler.java | 92 +- osrs/src/main/java/WorldMapSection.java | 36 +- osrs/src/main/java/WorldMapSection0.java | 109 +- osrs/src/main/java/WorldMapSection1.java | 56 +- osrs/src/main/java/WorldMapSection2.java | 219 +- osrs/src/main/java/WorldMapSectionType.java | 337 +- osrs/src/main/java/WorldMapSprite.java | 10 +- osrs/src/main/java/Wrapper.java | 8 +- osrs/src/main/java/ZoneOperation.java | 351 +- osrs/src/main/java/class0.java | 15 +- osrs/src/main/java/class1.java | 194 +- osrs/src/main/java/class10.java | 287 +- osrs/src/main/java/class101.java | 82 + osrs/src/main/java/class102.java | 150 + osrs/src/main/java/class103.java | 26 - osrs/src/main/java/class104.java | 227 - osrs/src/main/java/class105.java | 43 + osrs/src/main/java/class106.java | 474 ++ osrs/src/main/java/class107.java | 33 - osrs/src/main/java/class108.java | 963 +-- osrs/src/main/java/class11.java | 93 +- osrs/src/main/java/class110.java | 128 - osrs/src/main/java/class113.java | 147 + osrs/src/main/java/class115.java | 226 - osrs/src/main/java/class12.java | 400 +- osrs/src/main/java/class124.java | 53 + osrs/src/main/java/class125.java | 5 + osrs/src/main/java/class126.java | 43 +- osrs/src/main/java/class127.java | 78 +- osrs/src/main/java/class128.java | 309 +- osrs/src/main/java/class129.java | 274 +- osrs/src/main/java/class13.java | 314 +- osrs/src/main/java/class130.java | 113 +- osrs/src/main/java/class131.java | 292 +- osrs/src/main/java/class132.java | 301 +- osrs/src/main/java/class133.java | 538 +- osrs/src/main/java/class134.java | 401 +- osrs/src/main/java/class135.java | 182 +- osrs/src/main/java/class136.java | 174 +- osrs/src/main/java/class137.java | 101 + osrs/src/main/java/class138.java | 279 +- osrs/src/main/java/class139.java | 485 +- osrs/src/main/java/class14.java | 283 +- osrs/src/main/java/class140.java | 217 +- osrs/src/main/java/class141.java | 298 +- osrs/src/main/java/class142.java | 67 +- osrs/src/main/java/class143.java | 73 +- osrs/src/main/java/class144.java | 76 +- osrs/src/main/java/class145.java | 82 +- osrs/src/main/java/class146.java | 65 - osrs/src/main/java/class147.java | 135 + osrs/src/main/java/class148.java | 221 +- osrs/src/main/java/class149.java | 323 +- osrs/src/main/java/class15.java | 26 +- osrs/src/main/java/class150.java | 256 +- osrs/src/main/java/class151.java | 196 +- osrs/src/main/java/class152.java | 66 +- osrs/src/main/java/class153.java | 229 +- osrs/src/main/java/class154.java | 55 +- osrs/src/main/java/class155.java | 77 - osrs/src/main/java/class156.java | 522 ++ osrs/src/main/java/class157.java | 91 +- osrs/src/main/java/class158.java | 589 +- osrs/src/main/java/class159.java | 443 +- osrs/src/main/java/class16.java | 232 +- osrs/src/main/java/class160.java | 209 +- osrs/src/main/java/class161.java | 135 +- osrs/src/main/java/class162.java | 170 +- osrs/src/main/java/class163.java | 182 +- osrs/src/main/java/class164.java | 185 - osrs/src/main/java/class165.java | 14 + osrs/src/main/java/class166.java | 58 +- osrs/src/main/java/class167.java | 160 +- osrs/src/main/java/class168.java | 202 +- osrs/src/main/java/class169.java | 73 - osrs/src/main/java/class17.java | 552 +- osrs/src/main/java/class171.java | 668 +- osrs/src/main/java/class172.java | 507 +- osrs/src/main/java/class173.java | 15 + osrs/src/main/java/class174.java | 139 +- osrs/src/main/java/class176.java | 56 +- osrs/src/main/java/class178.java | 182 - osrs/src/main/java/class179.java | 50 - osrs/src/main/java/class18.java | 327 +- osrs/src/main/java/class180.java | 177 - osrs/src/main/java/class181.java | 300 + osrs/src/main/java/class182.java | 50 + osrs/src/main/java/class183.java | 239 - osrs/src/main/java/class184.java | 30 + osrs/src/main/java/class185.java | 68 + osrs/src/main/java/class186.java | 47 - osrs/src/main/java/class188.java | 32 - osrs/src/main/java/class189.java | 155 +- osrs/src/main/java/class19.java | 111 +- osrs/src/main/java/class190.java | 141 - osrs/src/main/java/class191.java | 69 +- osrs/src/main/java/class192.java | 61 + osrs/src/main/java/class193.java | 61 - osrs/src/main/java/class195.java | 26 + osrs/src/main/java/class197.java | 29 + osrs/src/main/java/class198.java | 178 - osrs/src/main/java/class199.java | 75 - osrs/src/main/java/class2.java | 2 +- osrs/src/main/java/class20.java | 195 +- osrs/src/main/java/class201.java | 19 - osrs/src/main/java/class202.java | 112 - osrs/src/main/java/class205.java | 143 + osrs/src/main/java/class206.java | 42 - osrs/src/main/java/class207.java | 54 + osrs/src/main/java/class208.java | 460 +- osrs/src/main/java/class209.java | 84 - osrs/src/main/java/class212.java | 40 +- osrs/src/main/java/class214.java | 241 +- osrs/src/main/java/class215.java | 46 + osrs/src/main/java/class216.java | 81 +- osrs/src/main/java/class219.java | 86 + osrs/src/main/java/class221.java | 472 ++ osrs/src/main/java/class222.java | 36 + osrs/src/main/java/class223.java | 299 +- osrs/src/main/java/class224.java | 411 - osrs/src/main/java/class225.java | 111 +- osrs/src/main/java/class226.java | 212 - osrs/src/main/java/class227.java | 179 + osrs/src/main/java/class228.java | 93 - osrs/src/main/java/class229.java | 601 ++ osrs/src/main/java/class230.java | 244 +- osrs/src/main/java/class232.java | 1283 +-- osrs/src/main/java/class233.java | 69 - osrs/src/main/java/class240.java | 162 + osrs/src/main/java/class241.java | 160 +- osrs/src/main/java/class250.java | 105 + osrs/src/main/java/class251.java | 97 + osrs/src/main/java/class252.java | 19 + osrs/src/main/java/class259.java | 3413 -------- osrs/src/main/java/class26.java | 37 + osrs/src/main/java/class266.java | 407 - osrs/src/main/java/class267.java | 123 + .../java/{class242.java => class268.java} | 72 +- osrs/src/main/java/class27.java | 179 +- osrs/src/main/java/class274.java | 149 - osrs/src/main/java/class275.java | 41 - osrs/src/main/java/class28.java | 103 +- .../java/{class257.java => class283.java} | 354 +- osrs/src/main/java/class284.java | 49 - osrs/src/main/java/class285.java | 3418 +++++++- osrs/src/main/java/class286.java | 43 - osrs/src/main/java/class29.java | 24 +- osrs/src/main/java/class291.java | 5 + osrs/src/main/java/class292.java | 139 + osrs/src/main/java/class293.java | 5 + osrs/src/main/java/class294.java | 4 +- osrs/src/main/java/class295.java | 28 +- osrs/src/main/java/class296.java | 5 - osrs/src/main/java/class297.java | 5 - osrs/src/main/java/class298.java | 7 - osrs/src/main/java/class3.java | 6 +- osrs/src/main/java/class30.java | 194 +- osrs/src/main/java/class301.java | 18 + osrs/src/main/java/class302.java | 95 + osrs/src/main/java/class303.java | 61 + osrs/src/main/java/class304.java | 162 +- osrs/src/main/java/class306.java | 25 - osrs/src/main/java/class307.java | 5 - osrs/src/main/java/class31.java | 188 +- osrs/src/main/java/class310.java | 32 + osrs/src/main/java/class311.java | 57 + osrs/src/main/java/class312.java | 9 + osrs/src/main/java/class313.java | 28 +- osrs/src/main/java/class314.java | 1068 +-- osrs/src/main/java/class315.java | 35 - osrs/src/main/java/class316.java | 91 +- osrs/src/main/java/class317.java | 36 - osrs/src/main/java/class319.java | 363 +- osrs/src/main/java/class320.java | 64 + osrs/src/main/java/class322.java | 29 +- osrs/src/main/java/class323.java | 76 +- osrs/src/main/java/class325.java | 14 - osrs/src/main/java/class326.java | 52 - osrs/src/main/java/class327.java | 98 + osrs/src/main/java/class329.java | 16 + osrs/src/main/java/class33.java | 779 +- osrs/src/main/java/class330.java | 71 - osrs/src/main/java/class332.java | 443 -- osrs/src/main/java/class334.java | 14 + osrs/src/main/java/class336.java | 215 + osrs/src/main/java/class337.java | 15 +- osrs/src/main/java/class338.java | 62 + osrs/src/main/java/class339.java | 176 +- osrs/src/main/java/class340.java | 9 - osrs/src/main/java/class341.java | 1240 ++- osrs/src/main/java/class342.java | 43 +- osrs/src/main/java/class344.java | 1263 +-- osrs/src/main/java/class345.java | 37 - osrs/src/main/java/class347.java | 14 - osrs/src/main/java/class348.java | 131 + osrs/src/main/java/class349.java | 19 - osrs/src/main/java/class350.java | 375 + osrs/src/main/java/class351.java | 72 + osrs/src/main/java/class353.java | 17 - osrs/src/main/java/class354.java | 68 +- osrs/src/main/java/class355.java | 26 + .../java/{class359.java => class356.java} | 4 +- osrs/src/main/java/class357.java | 534 +- osrs/src/main/java/class358.java | 18 - osrs/src/main/java/class36.java | 223 +- osrs/src/main/java/class360.java | 76 - osrs/src/main/java/class361.java | 58 + osrs/src/main/java/class362.java | 16 + osrs/src/main/java/class363.java | 9 - osrs/src/main/java/class364.java | 41 +- osrs/src/main/java/class365.java | 29 - osrs/src/main/java/class367.java | 545 -- osrs/src/main/java/class369.java | 35 + osrs/src/main/java/class372.java | 74 - osrs/src/main/java/class376.java | 11 + osrs/src/main/java/class379.java | 24 - osrs/src/main/java/class381.java | 178 + osrs/src/main/java/class382.java | 36 + .../java/{class386.java => class383.java} | 10 +- osrs/src/main/java/class384.java | 216 +- osrs/src/main/java/class385.java | 36 - osrs/src/main/java/class387.java | 10 - osrs/src/main/java/class395.java | 56 + osrs/src/main/java/class396.java | 55 + osrs/src/main/java/class397.java | 89 + osrs/src/main/java/class398.java | 15 +- osrs/src/main/java/class399.java | 16 +- osrs/src/main/java/class4.java | 252 +- osrs/src/main/java/class400.java | 92 +- osrs/src/main/java/class401.java | 63 - osrs/src/main/java/class402.java | 65 + osrs/src/main/java/class403.java | 91 +- osrs/src/main/java/class404.java | 352 + osrs/src/main/java/class405.java | 14 - osrs/src/main/java/class406.java | 832 +- osrs/src/main/java/class407.java | 871 ++- osrs/src/main/java/class408.java | 37 + osrs/src/main/java/class409.java | 799 -- osrs/src/main/java/class410.java | 205 +- osrs/src/main/java/class411.java | 30 - osrs/src/main/java/class413.java | 165 +- .../java/{class305.java => class415.java} | 131 +- osrs/src/main/java/class416.java | 87 - osrs/src/main/java/class418.java | 51 - osrs/src/main/java/class420.java | 93 + .../java/{class424.java => class421.java} | 12 +- osrs/src/main/java/class422.java | 300 + osrs/src/main/java/class423.java | 93 - osrs/src/main/java/class425.java | 41 - osrs/src/main/java/class426.java | 95 + osrs/src/main/java/class427.java | 53 +- osrs/src/main/java/class428.java | 9 + osrs/src/main/java/class429.java | 34 - osrs/src/main/java/class430.java | 79 +- osrs/src/main/java/class431.java | 178 + osrs/src/main/java/class432.java | 577 +- osrs/src/main/java/class433.java | 37 +- osrs/src/main/java/class434.java | 189 +- osrs/src/main/java/class435.java | 216 +- osrs/src/main/java/class436.java | 192 +- osrs/src/main/java/class437.java | 65 - osrs/src/main/java/class438.java | 197 - osrs/src/main/java/class439.java | 55 - osrs/src/main/java/class458.java | 19 + osrs/src/main/java/class46.java | 90 +- osrs/src/main/java/class460.java | 60 + osrs/src/main/java/class461.java | 122 + osrs/src/main/java/class462.java | 494 +- osrs/src/main/java/class463.java | 297 +- osrs/src/main/java/class464.java | 126 +- osrs/src/main/java/class465.java | 470 +- osrs/src/main/java/class466.java | 140 +- osrs/src/main/java/class467.java | 80 +- osrs/src/main/java/class468.java | 46 +- osrs/src/main/java/class469.java | 105 +- osrs/src/main/java/class47.java | 178 +- osrs/src/main/java/class470.java | 91 +- osrs/src/main/java/class471.java | 84 +- osrs/src/main/java/class472.java | 182 +- osrs/src/main/java/class473.java | 21 +- osrs/src/main/java/class474.java | 90 +- osrs/src/main/java/class475.java | 107 +- osrs/src/main/java/class476.java | 35 +- osrs/src/main/java/class477.java | 100 +- osrs/src/main/java/class478.java | 281 +- osrs/src/main/java/class479.java | 21 - osrs/src/main/java/class480.java | 21 - osrs/src/main/java/class481.java | 714 -- osrs/src/main/java/class487.java | 14 + osrs/src/main/java/class488.java | 89 + osrs/src/main/java/class489.java | 75 + osrs/src/main/java/class490.java | 30 +- osrs/src/main/java/class491.java | 94 +- osrs/src/main/java/class492.java | 102 +- osrs/src/main/java/class493.java | 35 - osrs/src/main/java/class494.java | 34 - osrs/src/main/java/class495.java | 67 - osrs/src/main/java/class497.java | 63 + osrs/src/main/java/class5.java | 26 +- osrs/src/main/java/class500.java | 71 - .../java/{class504.java => class501.java} | 14 +- osrs/src/main/java/class502.java | 70 + osrs/src/main/java/class503.java | 7 + osrs/src/main/java/class505.java | 74 +- osrs/src/main/java/class508.java | 49 +- osrs/src/main/java/class509.java | 81 + osrs/src/main/java/class51.java | 8 +- osrs/src/main/java/class510.java | 22 + osrs/src/main/java/class511.java | 206 +- osrs/src/main/java/class512.java | 104 +- osrs/src/main/java/class513.java | 31 +- osrs/src/main/java/class514.java | 167 +- osrs/src/main/java/class515.java | 40 +- osrs/src/main/java/class516.java | 60 +- osrs/src/main/java/class517.java | 146 - osrs/src/main/java/class518.java | 108 +- osrs/src/main/java/class519.java | 13 - osrs/src/main/java/class520.java | 107 + osrs/src/main/java/class521.java | 85 +- .../java/{class525.java => class522.java} | 208 +- osrs/src/main/java/class523.java | 14 - osrs/src/main/java/class527.java | 68 + osrs/src/main/java/class53.java | 297 +- osrs/src/main/java/class530.java | 84 +- osrs/src/main/java/class531.java | 74 + osrs/src/main/java/class533.java | 11 - osrs/src/main/java/class534.java | 78 +- osrs/src/main/java/class535.java | 42 + osrs/src/main/java/class537.java | 14 - osrs/src/main/java/class538.java | 104 - osrs/src/main/java/class541.java | 24 + osrs/src/main/java/class542.java | 13 + osrs/src/main/java/class544.java | 273 +- osrs/src/main/java/class547.java | 132 - .../java/{class553.java => class550.java} | 10 +- osrs/src/main/java/class59.java | 362 +- osrs/src/main/java/class6.java | 816 +- osrs/src/main/java/class60.java | 233 +- osrs/src/main/java/class64.java | 88 - osrs/src/main/java/class7.java | 145 +- osrs/src/main/java/class72.java | 108 + osrs/src/main/java/class73.java | 145 - osrs/src/main/java/class74.java | 208 +- osrs/src/main/java/class76.java | 127 - osrs/src/main/java/class8.java | 34 +- osrs/src/main/java/class85.java | 15 + osrs/src/main/java/class87.java | 129 - osrs/src/main/java/class89.java | 120 + osrs/src/main/java/class9.java | 455 +- osrs/src/main/java/class90.java | 545 ++ osrs/src/main/java/class91.java | 124 - osrs/src/main/java/class92.java | 191 +- osrs/src/main/java/class93.java | 130 + osrs/src/main/java/class94.java | 112 - osrs/src/main/java/class95.java | 14 - .../net/runelite/rs/ObfuscatedClassMap.java | 561 -- .../main/java/net/runelite/rs/Reflection.java | 5 +- osrs/src/main/java/org/json/JSONArray.java | 64 +- osrs/src/main/java/org/json/JSONObject.java | 171 +- osrs/src/main/java/org/json/JSONTokener.java | 23 +- osrs/src/main/java/org/json/Null.java | 4 +- 644 files changed, 60746 insertions(+), 61453 deletions(-) delete mode 100644 osrs/src/main/java/JSException.java create mode 100644 osrs/src/main/java/class101.java create mode 100644 osrs/src/main/java/class102.java delete mode 100644 osrs/src/main/java/class103.java delete mode 100644 osrs/src/main/java/class104.java create mode 100644 osrs/src/main/java/class105.java create mode 100644 osrs/src/main/java/class106.java delete mode 100644 osrs/src/main/java/class107.java delete mode 100644 osrs/src/main/java/class110.java create mode 100644 osrs/src/main/java/class113.java delete mode 100644 osrs/src/main/java/class115.java create mode 100644 osrs/src/main/java/class124.java create mode 100644 osrs/src/main/java/class125.java create mode 100644 osrs/src/main/java/class137.java delete mode 100644 osrs/src/main/java/class146.java create mode 100644 osrs/src/main/java/class147.java delete mode 100644 osrs/src/main/java/class155.java create mode 100644 osrs/src/main/java/class156.java delete mode 100644 osrs/src/main/java/class164.java create mode 100644 osrs/src/main/java/class165.java delete mode 100644 osrs/src/main/java/class169.java create mode 100644 osrs/src/main/java/class173.java delete mode 100644 osrs/src/main/java/class178.java delete mode 100644 osrs/src/main/java/class179.java delete mode 100644 osrs/src/main/java/class180.java create mode 100644 osrs/src/main/java/class181.java create mode 100644 osrs/src/main/java/class182.java delete mode 100644 osrs/src/main/java/class183.java create mode 100644 osrs/src/main/java/class184.java create mode 100644 osrs/src/main/java/class185.java delete mode 100644 osrs/src/main/java/class186.java delete mode 100644 osrs/src/main/java/class188.java delete mode 100644 osrs/src/main/java/class190.java create mode 100644 osrs/src/main/java/class192.java delete mode 100644 osrs/src/main/java/class193.java create mode 100644 osrs/src/main/java/class195.java create mode 100644 osrs/src/main/java/class197.java delete mode 100644 osrs/src/main/java/class198.java delete mode 100644 osrs/src/main/java/class199.java delete mode 100644 osrs/src/main/java/class201.java delete mode 100644 osrs/src/main/java/class202.java create mode 100644 osrs/src/main/java/class205.java delete mode 100644 osrs/src/main/java/class206.java create mode 100644 osrs/src/main/java/class207.java delete mode 100644 osrs/src/main/java/class209.java create mode 100644 osrs/src/main/java/class215.java create mode 100644 osrs/src/main/java/class219.java create mode 100644 osrs/src/main/java/class221.java create mode 100644 osrs/src/main/java/class222.java delete mode 100644 osrs/src/main/java/class224.java delete mode 100644 osrs/src/main/java/class226.java create mode 100644 osrs/src/main/java/class227.java delete mode 100644 osrs/src/main/java/class228.java create mode 100644 osrs/src/main/java/class229.java delete mode 100644 osrs/src/main/java/class233.java create mode 100644 osrs/src/main/java/class240.java create mode 100644 osrs/src/main/java/class250.java create mode 100644 osrs/src/main/java/class251.java create mode 100644 osrs/src/main/java/class252.java delete mode 100644 osrs/src/main/java/class259.java create mode 100644 osrs/src/main/java/class26.java delete mode 100644 osrs/src/main/java/class266.java create mode 100644 osrs/src/main/java/class267.java rename osrs/src/main/java/{class242.java => class268.java} (66%) delete mode 100644 osrs/src/main/java/class274.java delete mode 100644 osrs/src/main/java/class275.java rename osrs/src/main/java/{class257.java => class283.java} (88%) delete mode 100644 osrs/src/main/java/class284.java delete mode 100644 osrs/src/main/java/class286.java create mode 100644 osrs/src/main/java/class291.java create mode 100644 osrs/src/main/java/class292.java create mode 100644 osrs/src/main/java/class293.java delete mode 100644 osrs/src/main/java/class296.java delete mode 100644 osrs/src/main/java/class297.java delete mode 100644 osrs/src/main/java/class298.java create mode 100644 osrs/src/main/java/class301.java create mode 100644 osrs/src/main/java/class302.java create mode 100644 osrs/src/main/java/class303.java delete mode 100644 osrs/src/main/java/class306.java delete mode 100644 osrs/src/main/java/class307.java create mode 100644 osrs/src/main/java/class310.java create mode 100644 osrs/src/main/java/class311.java create mode 100644 osrs/src/main/java/class312.java delete mode 100644 osrs/src/main/java/class315.java delete mode 100644 osrs/src/main/java/class317.java create mode 100644 osrs/src/main/java/class320.java delete mode 100644 osrs/src/main/java/class325.java delete mode 100644 osrs/src/main/java/class326.java create mode 100644 osrs/src/main/java/class327.java create mode 100644 osrs/src/main/java/class329.java delete mode 100644 osrs/src/main/java/class330.java delete mode 100644 osrs/src/main/java/class332.java create mode 100644 osrs/src/main/java/class334.java create mode 100644 osrs/src/main/java/class336.java create mode 100644 osrs/src/main/java/class338.java delete mode 100644 osrs/src/main/java/class340.java delete mode 100644 osrs/src/main/java/class345.java delete mode 100644 osrs/src/main/java/class347.java create mode 100644 osrs/src/main/java/class348.java delete mode 100644 osrs/src/main/java/class349.java create mode 100644 osrs/src/main/java/class350.java create mode 100644 osrs/src/main/java/class351.java delete mode 100644 osrs/src/main/java/class353.java create mode 100644 osrs/src/main/java/class355.java rename osrs/src/main/java/{class359.java => class356.java} (63%) delete mode 100644 osrs/src/main/java/class358.java delete mode 100644 osrs/src/main/java/class360.java create mode 100644 osrs/src/main/java/class361.java create mode 100644 osrs/src/main/java/class362.java delete mode 100644 osrs/src/main/java/class363.java delete mode 100644 osrs/src/main/java/class365.java delete mode 100644 osrs/src/main/java/class367.java create mode 100644 osrs/src/main/java/class369.java delete mode 100644 osrs/src/main/java/class372.java create mode 100644 osrs/src/main/java/class376.java delete mode 100644 osrs/src/main/java/class379.java create mode 100644 osrs/src/main/java/class381.java create mode 100644 osrs/src/main/java/class382.java rename osrs/src/main/java/{class386.java => class383.java} (60%) delete mode 100644 osrs/src/main/java/class385.java delete mode 100644 osrs/src/main/java/class387.java create mode 100644 osrs/src/main/java/class395.java create mode 100644 osrs/src/main/java/class396.java create mode 100644 osrs/src/main/java/class397.java delete mode 100644 osrs/src/main/java/class401.java create mode 100644 osrs/src/main/java/class402.java create mode 100644 osrs/src/main/java/class404.java delete mode 100644 osrs/src/main/java/class405.java create mode 100644 osrs/src/main/java/class408.java delete mode 100644 osrs/src/main/java/class409.java delete mode 100644 osrs/src/main/java/class411.java rename osrs/src/main/java/{class305.java => class415.java} (62%) delete mode 100644 osrs/src/main/java/class416.java delete mode 100644 osrs/src/main/java/class418.java create mode 100644 osrs/src/main/java/class420.java rename osrs/src/main/java/{class424.java => class421.java} (91%) create mode 100644 osrs/src/main/java/class422.java delete mode 100644 osrs/src/main/java/class423.java delete mode 100644 osrs/src/main/java/class425.java create mode 100644 osrs/src/main/java/class426.java create mode 100644 osrs/src/main/java/class428.java delete mode 100644 osrs/src/main/java/class429.java create mode 100644 osrs/src/main/java/class431.java delete mode 100644 osrs/src/main/java/class437.java delete mode 100644 osrs/src/main/java/class438.java delete mode 100644 osrs/src/main/java/class439.java create mode 100644 osrs/src/main/java/class458.java create mode 100644 osrs/src/main/java/class460.java create mode 100644 osrs/src/main/java/class461.java delete mode 100644 osrs/src/main/java/class479.java delete mode 100644 osrs/src/main/java/class480.java delete mode 100644 osrs/src/main/java/class481.java create mode 100644 osrs/src/main/java/class487.java create mode 100644 osrs/src/main/java/class488.java create mode 100644 osrs/src/main/java/class489.java delete mode 100644 osrs/src/main/java/class493.java delete mode 100644 osrs/src/main/java/class494.java delete mode 100644 osrs/src/main/java/class495.java create mode 100644 osrs/src/main/java/class497.java delete mode 100644 osrs/src/main/java/class500.java rename osrs/src/main/java/{class504.java => class501.java} (58%) create mode 100644 osrs/src/main/java/class502.java create mode 100644 osrs/src/main/java/class503.java create mode 100644 osrs/src/main/java/class509.java create mode 100644 osrs/src/main/java/class510.java delete mode 100644 osrs/src/main/java/class517.java delete mode 100644 osrs/src/main/java/class519.java create mode 100644 osrs/src/main/java/class520.java rename osrs/src/main/java/{class525.java => class522.java} (51%) delete mode 100644 osrs/src/main/java/class523.java create mode 100644 osrs/src/main/java/class527.java create mode 100644 osrs/src/main/java/class531.java delete mode 100644 osrs/src/main/java/class533.java create mode 100644 osrs/src/main/java/class535.java delete mode 100644 osrs/src/main/java/class537.java delete mode 100644 osrs/src/main/java/class538.java create mode 100644 osrs/src/main/java/class541.java create mode 100644 osrs/src/main/java/class542.java delete mode 100644 osrs/src/main/java/class547.java rename osrs/src/main/java/{class553.java => class550.java} (67%) delete mode 100644 osrs/src/main/java/class64.java create mode 100644 osrs/src/main/java/class72.java delete mode 100644 osrs/src/main/java/class73.java delete mode 100644 osrs/src/main/java/class76.java create mode 100644 osrs/src/main/java/class85.java delete mode 100644 osrs/src/main/java/class87.java create mode 100644 osrs/src/main/java/class89.java create mode 100644 osrs/src/main/java/class90.java delete mode 100644 osrs/src/main/java/class91.java create mode 100644 osrs/src/main/java/class93.java delete mode 100644 osrs/src/main/java/class94.java delete mode 100644 osrs/src/main/java/class95.java delete mode 100644 osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java b/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java index 67df6bd26..35950dc60 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java @@ -22,15 +22,7 @@ public interface RSBuffer extends Buffer, RSNode @Override int readUnsignedByteNeg$api(); - - -@Import("method2432") -@Override -byte readByteAdd(); - -@Import("method2396") -@Override -byte readByteNeg(); +; @Import("readUnsignedByteSub") @Override diff --git a/api/src/main/java/net/runelite/api/Buffer.java b/api/src/main/java/net/runelite/api/Buffer.java index 0ada0b905..9b3a32f64 100644 --- a/api/src/main/java/net/runelite/api/Buffer.java +++ b/api/src/main/java/net/runelite/api/Buffer.java @@ -9,14 +9,13 @@ public interface Buffer extends Node int readUnsignedByteAdd$api(); int readUnsignedByteNeg$api(); - byte readByteAdd(); - byte readByteNeg(); int readUnsignedByteSub$api(); int readUnsignedByte$api(); byte readByte$api(); int readUnsignedShort$api(); int readShort$api(); String readString(); + int readSignedShortAddLE$api(); int readShortSmart$api(); int readUShortSmart$api(); @@ -26,9 +25,9 @@ public interface Buffer extends Node void writeIntIME$api(int i); void writeIntME$api(int i); int readInt$api(); - int readIntLE$api(); int readIntIME(); int readIntME(); + int readIntLE$api(); void writeShortLE$api(int i); void writeShortAdd$api(int i); void writeShortAddLE$api(int i); diff --git a/client/src/main/java/meteor/api/ClientPackets.kt b/client/src/main/java/meteor/api/ClientPackets.kt index 02e245a9c..50e645235 100644 --- a/client/src/main/java/meteor/api/ClientPackets.kt +++ b/client/src/main/java/meteor/api/ClientPackets.kt @@ -14,6 +14,7 @@ import net.runelite.api.packets.PacketBufferNode import net.runelite.api.widgets.Widget import net.runelite.api.widgets.WidgetType import java.awt.Point +import class113 as class1131 /** * an object for calling various Client Packets @@ -25,7 +26,7 @@ object ClientPackets { // param0: worldX // param1: worldY fun createGroundItemAction1Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ1) + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC5) bufferNode.packetBuffer.`writeShortAdd$api`(worldY) bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAdd$api`(worldX) @@ -61,7 +62,7 @@ object ClientPackets { // param0: worldX // param1: worldY fun createGroundItemAction4Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ4) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOCT) bufferNode.packetBuffer.`writeShortAdd$api`(groundItemId) bufferNode.packetBuffer.`writeShort$api`(worldX) bufferNode.packetBuffer.`writeShort$api`(worldY) @@ -107,7 +108,7 @@ object ClientPackets { worldY: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOC2) + val bufferNode = preparePacketBuffer(ClientPacket.CLICK) bufferNode.packetBuffer.`writeShortAdd$api`(objectID) bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAdd$api`(worldX) @@ -178,13 +179,13 @@ object ClientPackets { itemWidgetID: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOCT) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOCE) bufferNode.packetBuffer.`writeShortAddLE$api`(itemSlot) bufferNode.packetBuffer.`writeShort$api`(worldX) - bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) - bufferNode.packetBuffer.`writeShortLE$api`(objectID) bufferNode.packetBuffer.`writeShortLE$api`(worldY) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortLE$api`(objectID) + bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) bufferNode.packetBuffer.`writeShortAdd$api`(itemId) return bufferNode } @@ -197,7 +198,7 @@ object ClientPackets { itemSlot: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPNPCT) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER3) bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) bufferNode.packetBuffer.`writeShortAdd$api`(itemID) bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) @@ -321,7 +322,7 @@ object ClientPackets { ///OPPLAYER8 fun createPlayerAction8Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.EVENT_KEYBOARD) + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER8) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortLE$api`(playerIdx) return bufferNode @@ -337,7 +338,7 @@ object ClientPackets { itemWidgetID: Int, shiftPressed: Boolean ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOCE) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOCT) bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) bufferNode.packetBuffer.`writeShortAddLE$api`(itemWidgetID) bufferNode.packetBuffer.`writeShort$api`(worldX) @@ -513,7 +514,7 @@ object ClientPackets { childId: Int, ): PacketBufferNode { val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON10) - bufferNode.packetBuffer.`writeInt$api`(widgetId) + bufferNode.packetBuffer. `writeInt$api`(widgetId) bufferNode.packetBuffer.`writeShort$api`(childId) bufferNode.packetBuffer.`writeShort$api`(itemId) return bufferNode @@ -531,7 +532,7 @@ object ClientPackets { // WALK fun createMovementPacket(worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.MOVE_GAMECLICK) + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC5) bufferNode.packetBuffer.`writeByte$api`(5) bufferNode.packetBuffer.`writeShortAdd$api`(worldY) bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) diff --git a/mixins/src/main/java/mixins/RSClientMixin.java b/mixins/src/main/java/mixins/RSClientMixin.java index b4cf4b697..639420e14 100644 --- a/mixins/src/main/java/mixins/RSClientMixin.java +++ b/mixins/src/main/java/mixins/RSClientMixin.java @@ -3201,7 +3201,7 @@ public static void onSubInterfaceChange(int targetComponent, int interfaceId, in @Inject @MethodHook(value = "loadRegions", end = true) - public static void onRegionLoad(boolean instanced, RSPacketBuffer buffer) { + public static void onRegionLoad(boolean instanced, RSPacketBuffer buffer, boolean bool) { if (!instanced) { return; } diff --git a/osrs/src/main/java/AABB.java b/osrs/src/main/java/AABB.java index 7028594a7..3355e1a97 100644 --- a/osrs/src/main/java/AABB.java +++ b/osrs/src/main/java/AABB.java @@ -1,32 +1,26 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("ku") @Implements("AABB") public class AABB { - @ObfuscatedName("gi") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - static Archive field2123; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("xMid") int xMid; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("yMid") int yMid; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("zMid") int zMid; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("zMidOffset") int zMidOffset; diff --git a/osrs/src/main/java/AbstractArchive.java b/osrs/src/main/java/AbstractArchive.java index 042533d1c..39a8360be 100644 --- a/osrs/src/main/java/AbstractArchive.java +++ b/osrs/src/main/java/AbstractArchive.java @@ -3,67 +3,67 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("om") +@ObfuscatedName("ol") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("bv") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lvb;" + descriptor = "Lve;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("maximumContainerSize") static int maximumContainerSize; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("groupCount") int groupCount; @ObfuscatedName("aw") @Export("groupIds") int[] groupIds; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("az") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lvr;" + descriptor = "Lvh;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("bn") + @ObfuscatedName("be") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("by") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "[Lvr;" + descriptor = "[Lvh;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("groups") Object[] groups; - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("files") Object[][] files; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("hash") public int hash; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("shallowFiles") boolean shallowFiles; @@ -77,45 +77,45 @@ public abstract class AbstractArchive { this.shallowFiles = var2; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1737906888" + garbageValue = "606874642" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "11" + descriptor = "(II)V", + garbageValue = "-412384319" ) @Export("loadGroup") void loadGroup(int var1) { } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "177421131" + garbageValue = "-788412100" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("bu") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "269560048" + garbageValue = "-18383412" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { int var3 = var1.length; - int var2 = ArchiveDisk.method2309(var1, 0, var3); + int var2 = class174.method885(var1, 0, var3); this.hash = var2; - Buffer var4 = new Buffer(class372.decompressBytes(var1)); + Buffer var4 = new Buffer(class30.decompressBytes(var1)); int var5 = var4.readUnsignedByte(); if (var5 >= 5 && var5 <= 7) { if (var5 >= 6) { @@ -240,20 +240,20 @@ void decodeIndex(byte[] var1) { } } - @ObfuscatedName("bf") + @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "1711310441" + garbageValue = "946380186" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("bh") + @ObfuscatedName("cg") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "-1302021436" + garbageValue = "1812200763" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -269,7 +269,7 @@ public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { } } - byte[] var5 = class135.method726(this.files[var1][var2], false); + byte[] var5 = class128.method694(this.files[var1][var2], false); if (this.shallowFiles) { this.files[var1][var2] = null; } @@ -280,10 +280,10 @@ public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { } } - @ObfuscatedName("bl") + @ObfuscatedName("cv") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-919359930" + garbageValue = "-1107473294" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -301,12 +301,12 @@ public boolean tryLoadFile(int var1, int var2) { } } - @ObfuscatedName("bg") + @ObfuscatedName("cx") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-855081287" + garbageValue = "-544854529" ) - public boolean method1937(int var1) { + public boolean method1930(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -316,10 +316,10 @@ public boolean method1937(int var1) { } } - @ObfuscatedName("bj") + @ObfuscatedName("cp") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1482943907" + garbageValue = "456199859" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -331,10 +331,10 @@ public boolean tryLoadGroup(int var1) { } } - @ObfuscatedName("bx") + @ObfuscatedName("ce") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "39" + garbageValue = "127" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -353,10 +353,10 @@ public boolean isFullyLoaded() { return var1; } - @ObfuscatedName("bi") + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "2123852000" + descriptor = "(IB)[B", + garbageValue = "30" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -369,10 +369,10 @@ public byte[] takeFileFlat(int var1) { } } - @ObfuscatedName("bq") + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "(III)[B", - garbageValue = "1658357673" + descriptor = "(IIB)[B", + garbageValue = "-4" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -388,17 +388,17 @@ public byte[] getFile(int var1, int var2) { } } - byte[] var4 = class135.method726(this.files[var1][var2], false); + byte[] var4 = class128.method694(this.files[var1][var2], false); return var4; } else { return null; } } - @ObfuscatedName("bw") + @ObfuscatedName("cw") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "-2100873000" + garbageValue = "-1549556992" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -411,30 +411,30 @@ public byte[] getFileFlat(int var1) { } } - @ObfuscatedName("ce") + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "(IB)[I", - garbageValue = "114" + descriptor = "(II)[I", + garbageValue = "1026301706" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("cu") + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "5" + descriptor = "(II)I", + garbageValue = "1471865818" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files != null && var1 < this.files.length && this.files[var1] != null ? this.files[var1].length : 0; } - @ObfuscatedName("cw") + @ObfuscatedName("cs") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "325433573" + garbageValue = "1806746664" ) @Export("getGroupCount") public int getGroupCount() { @@ -443,8 +443,8 @@ public int getGroupCount() { @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-28003" + descriptor = "(B)V", + garbageValue = "5" ) @Export("clearGroups") public void clearGroups() { @@ -454,10 +454,10 @@ public void clearGroups() { } - @ObfuscatedName("cc") + @ObfuscatedName("cm") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-334571913" + garbageValue = "2080028111" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -467,12 +467,12 @@ public void clearFilesGroup(int var1) { } - @ObfuscatedName("cg") + @ObfuscatedName("cn") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-37" + garbageValue = "6" ) - public void method1950() { + public void method1943() { for (int var1 = 0; var1 < this.files.length; ++var1) { if (this.files[var1] != null) { for (int var2 = 0; var2 < this.files[var1].length; ++var2) { @@ -483,10 +483,10 @@ public void method1950() { } - @ObfuscatedName("cq") + @ObfuscatedName("cr") @ObfuscatedSignature( descriptor = "(I[IB)Z", - garbageValue = "4" + garbageValue = "19" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -508,27 +508,26 @@ boolean buildFiles(int var1, int[] var2) { if (var6) { return true; } else { - byte[] var21; + byte[] var18; if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) { - var21 = class135.method726(this.groups[var1], true); - Buffer var8 = new Buffer(var21); + var18 = class128.method694(this.groups[var1], true); + Buffer var8 = new Buffer(var18); var8.xteaDecrypt(var2, 5, var8.array.length); } else { - var21 = class135.method726(this.groups[var1], false); + var18 = class128.method694(this.groups[var1], false); } - byte[] var25 = class372.decompressBytes(var21); + byte[] var20 = class30.decompressBytes(var18); if (this.releaseGroups) { this.groups[var1] = null; } - int var10; if (var3 > 1) { - int var9 = var25.length; + int var9 = var20.length; --var9; - var10 = var25[var9] & 255; - var9 -= var10 * var3 * 4; - Buffer var11 = new Buffer(var25); + int var10 = var20[var9] & 255; + var9 -= var3 * var10 * 4; + Buffer var11 = new Buffer(var20); int[] var12 = new int[var3]; var11.offset = var9; @@ -543,23 +542,22 @@ boolean buildFiles(int var1, int[] var2) { } } - byte[][] var23 = new byte[var3][]; + byte[][] var19 = new byte[var3][]; for (var14 = 0; var14 < var3; ++var14) { - var23[var14] = new byte[var12[var14]]; + var19[var14] = new byte[var12[var14]]; var12[var14] = 0; } var11.offset = var9; var14 = 0; - int var17; for (var15 = 0; var15 < var10; ++var15) { int var16 = 0; - for (var17 = 0; var17 < var3; ++var17) { + for (int var17 = 0; var17 < var3; ++var17) { var16 += var11.readInt(); - System.arraycopy(var25, var14, var23[var17], var12[var17], var16); + System.arraycopy(var20, var14, var19[var17], var12[var17], var16); var12[var17] += var16; var14 += var16; } @@ -567,40 +565,15 @@ boolean buildFiles(int var1, int[] var2) { for (var15 = 0; var15 < var3; ++var15) { if (!this.shallowFiles) { - var17 = var4[var15]; - byte[] var19 = var23[var15]; - Object var18; - if (var19 == null) { - var18 = null; - } else if (var19.length > 136) { - DirectByteArrayCopier var20 = new DirectByteArrayCopier(); - var20.set(var19); - var18 = var20; - } else { - var18 = var19; - } - - var5[var17] = var18; + var5[var4[var15]] = VarcInt.method899(var19[var15], false); } else { - var5[var4[var15]] = var23[var15]; + var5[var4[var15]] = var19[var15]; } } } else if (!this.shallowFiles) { - var10 = var4[0]; - Object var26; - if (var25 == null) { - var26 = null; - } else if (var25.length > 136) { - DirectByteArrayCopier var27 = new DirectByteArrayCopier(); - var27.set(var25); - var26 = var27; - } else { - var26 = var25; - } - - var5[var10] = var26; + var5[var4[0]] = VarcInt.method899(var20, false); } else { - var5[var4[0]] = var25; + var5[var4[0]] = var20; } return true; @@ -608,118 +581,109 @@ boolean buildFiles(int var1, int[] var2) { } } - @ObfuscatedName("cy") + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)I", - garbageValue = "14942" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1919401274" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(EnumComposition.hashString(var1)); + return this.groupNameHashTable.get(class150.hashString(var1)); } - @ObfuscatedName("cz") + @ObfuscatedName("ca") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)I", - garbageValue = "261034000" + garbageValue = "-34343914" ) @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(EnumComposition.hashString(var2)); + return this.fileNameHashTables[var1].get(class150.hashString(var2)); } - @ObfuscatedName("cp") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "873049159" + descriptor = "(Ljava/lang/String;Ljava/lang/String;S)Z", + garbageValue = "245" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); + int var3 = this.groupNameHashTable.get(class150.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(EnumComposition.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(class150.hashString(var2)); return var4 >= 0; } } - @ObfuscatedName("cb") + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;S)[B", - garbageValue = "-22373" + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", + garbageValue = "1936244729" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(EnumComposition.hashString(var2)); + int var3 = this.groupNameHashTable.get(class150.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(class150.hashString(var2)); return this.takeFile(var3, var4); } - @ObfuscatedName("cn") + @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-227874487" + descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", + garbageValue = "100" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(EnumComposition.hashString(var2)); + int var3 = this.groupNameHashTable.get(class150.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(class150.hashString(var2)); return this.tryLoadFile(var3, var4); } - @ObfuscatedName("ck") + @ObfuscatedName("cb") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "1792346501" + garbageValue = "-1281128467" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); + int var2 = this.groupNameHashTable.get(class150.hashString(var1)); return this.tryLoadGroup(var2); } - @ObfuscatedName("cr") + @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-24" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1287445108" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); + int var2 = this.groupNameHashTable.get(class150.hashString(var1)); if (var2 >= 0) { this.loadRegionFromGroup(var2); } } - @ObfuscatedName("cs") + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "-108" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-1550662505" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(EnumComposition.hashString(var1)); + int var2 = this.groupNameHashTable.get(class150.hashString(var1)); return this.groupLoadPercent(var2); } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1888101922" - ) - public static int method1931(int var0) { - return var0 >>> 12; - } } \ No newline at end of file diff --git a/osrs/src/main/java/AbstractByteArrayCopier.java b/osrs/src/main/java/AbstractByteArrayCopier.java index 85173e7dc..a9efaeca3 100644 --- a/osrs/src/main/java/AbstractByteArrayCopier.java +++ b/osrs/src/main/java/AbstractByteArrayCopier.java @@ -3,47 +3,41 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nn") +@ObfuscatedName("np") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - @ObfuscatedName("ft") + @ObfuscatedName("kn") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "[Luz;" ) - @Export("archive4") - static Archive archive4; + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; AbstractByteArrayCopier() { } - @ObfuscatedName("al") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "1381422717" + descriptor = "(B)[B", + garbageValue = "5" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("ak") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-2137536013" + descriptor = "([BB)V", + garbageValue = "67" ) @Export("set") - public abstract void set(byte[] var1); + abstract void set(byte[] var1); - @ObfuscatedName("ar") + @ObfuscatedName("jn") @ObfuscatedSignature( - descriptor = "(II)Lfy;", - garbageValue = "-1206517900" + descriptor = "(I)Z", + garbageValue = "-880488507" ) - static class140 method1886(int var0) { - class140[] var1 = new class140[]{class140.field1301, class140.field1304, class140.field1303, class140.field1308, class140.field1306, class140.field1302, class140.field1307, class140.field1300, class140.field1305}; - class140 var2 = (class140)SequenceDefinition.findEnumerated(var1, var0); - if (var2 == null) { - var2 = class140.field1305; - } - - return var2; + static boolean method1879() { + return (Client.drawPlayerNames & 1) != 0; } } \ No newline at end of file diff --git a/osrs/src/main/java/AbstractFont.java b/osrs/src/main/java/AbstractFont.java index da77d8f6f..f9db45874 100644 --- a/osrs/src/main/java/AbstractFont.java +++ b/osrs/src/main/java/AbstractFont.java @@ -5,76 +5,76 @@ import java.util.Random; -@ObfuscatedName("pk") +@ObfuscatedName("pa") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Lun;" + descriptor = "[Lup;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; @ObfuscatedName("aw") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("pixels") byte[][] pixels; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("advances") int[] advances; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("widths") int[] widths; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("heights") int[] heights; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("topBearings") int[] topBearings; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("ascent") public int ascent; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("kerning") byte[] kerning; @@ -92,12 +92,6 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_lines = new String[100]; } - AbstractFont(byte[] var1) { - this.pixels = new byte[256][]; - this.ascent = 0; - this.readMetrics(var1); - } - AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { this.pixels = new byte[256][]; this.ascent = 0; @@ -124,11 +118,17 @@ public abstract class AbstractFont extends Rasterizer2D { this.maxDescent = var9 - this.ascent; } - @ObfuscatedName("ac") + AbstractFont(byte[] var1) { + this.pixels = new byte[256][]; + this.ascent = 0; + this.readMetrics(var1); + } + + @ObfuscatedName("at") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); @@ -194,7 +194,7 @@ void readMetrics(byte[] var1) { if (var13 != 32 && var13 != 160) { for (var8 = 0; var8 < 256; ++var8) { if (var8 != 32 && var8 != 160) { - this.kerning[var8 + (var13 << 8)] = (byte)method2112(var11, var12, var4, this.advances, var10, var13, var8); + this.kerning[var8 + (var13 << 8)] = (byte)method2098(var11, var12, var4, this.advances, var10, var13, var8); } } } @@ -205,17 +205,17 @@ void readMetrics(byte[] var1) { } - @ObfuscatedName("av") + @ObfuscatedName("aa") @Export("charWidth") public int charWidth(char var1) { if (var1 == 160) { var1 = ' '; } - return this.advances[Actor.charToByteCp1252(var1) & 255]; + return this.advances[class137.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("ag") + @ObfuscatedName("ac") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { @@ -239,7 +239,7 @@ public int stringWidth(String var1) { if (!var7.equals("gt")) { if (var7.startsWith("img=")) { try { - int var8 = class36.method182(var7.substring(4)); + int var8 = Huffman.method1888(var7.substring(4)); var4 += AbstractFont_modIconSprites[var8].width; var3 = -1; } catch (Exception var10) { @@ -257,7 +257,7 @@ public int stringWidth(String var1) { } if (var2 == -1) { - var4 += this.advances[(char)(Actor.charToByteCp1252(var6) & 255)]; + var4 += this.advances[(char)(class137.charToByteCp1252(var6) & 255)]; if (this.kerning != null && var3 != -1) { var4 += this.kerning[var6 + (var3 << 8)]; } @@ -271,7 +271,7 @@ public int stringWidth(String var1) { } } - @ObfuscatedName("aa") + @ObfuscatedName("al") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { @@ -322,7 +322,7 @@ public int breakLines(String var1, int[] var2, String[] var3) { var11 = '>'; } else if (var16.startsWith("img=")) { try { - int var17 = class36.method182(var16.substring(4)); + int var17 = Huffman.method1888(var16.substring(4)); var4 += AbstractFont_modIconSprites[var17].width; var11 = 0; } catch (Exception var20) { @@ -376,7 +376,7 @@ public int breakLines(String var1, int[] var2, String[] var3) { } } - @ObfuscatedName("ap") + @ObfuscatedName("az") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); @@ -392,17 +392,17 @@ public int lineWidth(String var1, int var2) { return var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ap") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("aj") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;II)Lrx;" + descriptor = "(IILjava/lang/String;II)Lrv;" ) - public Bounds method2119(int var1, int var2, String var3, int var4, int var5) { + public Bounds method2105(int var1, int var2, String var3, int var4, int var5) { if (var3 != null && var3.length() >= var2 + var1) { int var6 = var4 - this.stringWidth(var3) / 2; var6 += this.stringWidth(var3.substring(0, var1)); @@ -415,7 +415,7 @@ public Bounds method2119(int var1, int var2, String var3, int var4, int var5) { } } - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -424,7 +424,7 @@ public void draw(String var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("au") + @ObfuscatedName("ay") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -434,7 +434,7 @@ public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int v } } - @ObfuscatedName("ai") + @ObfuscatedName("ak") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -443,7 +443,7 @@ public void drawRightAligned(String var1, int var2, int var3, int var4, int var5 } } - @ObfuscatedName("ae") + @ObfuscatedName("aj") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -452,14 +452,14 @@ public void drawCentered(String var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("aw") + @ObfuscatedName("am") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - return this.method2125(var1, var2, var3, var4, var5, var6, var7, 256, var8, var9, var10); + return this.method2111(var1, var2, var3, var4, var5, var6, var7, 256, var8, var9, var10); } @ObfuscatedName("aq") - public int method2125(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { + public int method2111(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { if (var1 == null) { return 0; } else { @@ -523,24 +523,24 @@ public int method2125(String var1, int var2, int var3, int var4, int var5, int v } } - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lpr;IIIII)Ltw;" + descriptor = "(Lpd;IIIII)Lti;" ) - public class500 method2126(class413 var1, int var2, int var3, int var4, int var5, int var6) { - if (!var1.method2147()) { + public class497 method2112(class410 var1, int var2, int var3, int var4, int var5, int var6) { + if (!var1.method2133()) { this.reset(var4, var5); var3 -= this.ascent; - for (int var7 = 0; var7 < var1.method2148(); ++var7) { - class411 var8 = var1.method2152(var7); - if (var6 != -1 && var8.field3714 > var6) { - return new class500(var8.field3715, var8.field3714); + for (int var7 = 0; var7 < var1.method2134(); ++var7) { + class408 var8 = var1.method2138(var7); + if (var6 != -1 && var8.field3718 > var6) { + return new class497(var8.field3717, var8.field3718); } - char var9 = var8.field3713; + char var9 = var8.field3716; if (var9 != '\n') { - if (var1.method2146(var7)) { + if (var1.method2132(var7)) { var9 = '*'; } @@ -549,8 +549,8 @@ public class500 method2126(class413 var1, int var2, int var3, int var4, int var5 var9 = ' '; } - int var10 = var2 + var8.field3715; - int var11 = var3 + var8.field3714; + int var10 = var2 + var8.field3717; + int var11 = var3 + var8.field3718; int var12 = this.widths[var9]; int var13 = this.heights[var9]; if (AbstractFont_shadow != -1) { @@ -563,16 +563,16 @@ public class500 method2126(class413 var1, int var2, int var3, int var4, int var5 } } - return var1.method2151(); + return var1.method2137(); } - @ObfuscatedName("at") - public void method2127(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { + @ObfuscatedName("aw") + public void method2113(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { if (var1 != null) { this.reset(var4, var5); int[] var8 = null; if (var7 != null) { - var8 = this.method2132(var7, var1.length()); + var8 = this.method2118(var7, var1.length()); } int[] var9 = new int[var1.length()]; @@ -581,17 +581,17 @@ public void method2127(String var1, int var2, int var3, int var4, int var5, int var9[var10] = (int)(Math.sin((double)var10 / 2.0D + (double)var6 / 5.0D) * 5.0D); } - this.method2138(var1, var2 - this.stringWidth(var1) / 2, var3, var8, (int[])null, var9); + this.method2124(var1, var2 - this.stringWidth(var1) / 2, var3, var8, (int[])null, var9); } } - @ObfuscatedName("af") - public void method2128(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { + @ObfuscatedName("ae") + public void method2114(String var1, int var2, int var3, int var4, int var5, int var6, int[] var7) { if (var1 != null) { this.reset(var4, var5); int[] var8 = null; if (var7 != null) { - var8 = this.method2132(var7, var1.length()); + var8 = this.method2118(var7, var1.length()); } int[] var9 = new int[var1.length()]; @@ -602,17 +602,17 @@ public void method2128(String var1, int var2, int var3, int var4, int var5, int var10[var11] = (int)(Math.sin((double)var11 / 3.0D + (double)var6 / 5.0D) * 5.0D); } - this.method2138(var1, var2 - this.stringWidth(var1) / 2, var3, var8, var9, var10); + this.method2124(var1, var2 - this.stringWidth(var1) / 2, var3, var8, var9, var10); } } - @ObfuscatedName("ad") - public void method2129(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int[] var8) { + @ObfuscatedName("an") + public void method2115(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int[] var8) { if (var1 != null) { this.reset(var4, var5); int[] var9 = null; if (var8 != null) { - var9 = this.method2132(var8, var1.length()); + var9 = this.method2118(var8, var1.length()); } double var10 = 7.0D - (double)var7 / 8.0D; @@ -626,38 +626,38 @@ public void method2129(String var1, int var2, int var3, int var4, int var5, int var12[var13] = (int)(Math.sin((double)var13 / 1.5D + (double)var6 / 1.0D) * var10); } - this.method2138(var1, var2 - this.stringWidth(var1) / 2, var3, var9, (int[])null, var12); + this.method2124(var1, var2 - this.stringWidth(var1) / 2, var3, var9, (int[])null, var12); } } - @ObfuscatedName("bn") - public void method2130(String var1, int var2, int var3, int var4, int var5, int[] var6) { + @ObfuscatedName("ag") + public void method2116(String var1, int var2, int var3, int var4, int var5, int[] var6) { if (var1 != null) { this.reset(var4, var5); int[] var7 = null; if (var6 != null) { - var7 = this.method2132(var6, var1.length()); + var7 = this.method2118(var6, var1.length()); } - this.method2138(var1, var2 - this.stringWidth(var1) / 2, var3, var7, (int[])null, (int[])null); + this.method2124(var1, var2 - this.stringWidth(var1) / 2, var3, var7, (int[])null, (int[])null); } } - @ObfuscatedName("bk") - public void method2131(String var1, int var2, int var3, int var4, int var5, int[] var6) { + @ObfuscatedName("ad") + public void method2117(String var1, int var2, int var3, int var4, int var5, int[] var6) { if (var1 != null) { this.reset(var4, var5); int[] var7 = null; if (var6 != null) { - var7 = this.method2132(var6, var1.length()); + var7 = this.method2118(var6, var1.length()); } - this.method2138(var1, var2, var3, var7, (int[])null, (int[])null); + this.method2124(var1, var2, var3, var7, (int[])null, (int[])null); } } - @ObfuscatedName("by") - int[] method2132(int[] var1, int var2) { + @ObfuscatedName("af") + int[] method2118(int[] var1, int var2) { if (var2 == 0) { return null; } else { @@ -672,7 +672,7 @@ int[] method2132(int[] var1, int var2) { } } - @ObfuscatedName("bd") + @ObfuscatedName("be") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -689,11 +689,11 @@ public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, } } - this.method2138(var1, var2, var3, (int[])null, var7, (int[])null); + this.method2124(var1, var2, var3, (int[])null, var7, (int[])null); } } - @ObfuscatedName("be") + @ObfuscatedName("bd") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; @@ -707,7 +707,7 @@ void reset(int var1, int var2) { AbstractFont_justificationCurrent = 0; } - @ObfuscatedName("bv") + @ObfuscatedName("bl") @Export("decodeTag") void decodeTag(String var1) { try { @@ -715,13 +715,13 @@ void decodeTag(String var1) { String var3; if (var1.startsWith("col=")) { var3 = var1.substring(4); - var2 = class230.method1184(var3, 16, true); + var2 = NPC.method580(var3, 16, true); AbstractFont_color = var2; } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { var3 = var1.substring(4); - var2 = class230.method1184(var3, 16, true); + var2 = NPC.method580(var3, 16, true); AbstractFont_strike = var2; } else if (var1.equals("str")) { AbstractFont_strike = 8388608; @@ -729,7 +729,7 @@ void decodeTag(String var1) { AbstractFont_strike = -1; } else if (var1.startsWith("u=")) { var3 = var1.substring(2); - var2 = class230.method1184(var3, 16, true); + var2 = NPC.method580(var3, 16, true); AbstractFont_underline = var2; } else if (var1.equals("u")) { AbstractFont_underline = 0; @@ -737,7 +737,7 @@ void decodeTag(String var1) { AbstractFont_underline = -1; } else if (var1.startsWith("shad=")) { var3 = var1.substring(5); - var2 = class230.method1184(var3, 16, true); + var2 = NPC.method580(var3, 16, true); AbstractFont_shadow = var2; } else if (var1.equals("shad")) { AbstractFont_shadow = 0; @@ -751,7 +751,7 @@ void decodeTag(String var1) { } - @ObfuscatedName("ba") + @ObfuscatedName("bi") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; @@ -774,7 +774,7 @@ void calculateLineJustification(String var1, int var2) { } - @ObfuscatedName("bz") + @ObfuscatedName("bv") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; @@ -783,7 +783,7 @@ void draw0(String var1, int var2, int var3) { for (int var6 = 0; var6 < var1.length(); ++var6) { if (var1.charAt(var6) != 0) { - char var7 = (char)(Actor.charToByteCp1252(var1.charAt(var6)) & 255); + char var7 = (char)(class137.charToByteCp1252(var1.charAt(var6)) & 255); if (var7 == '<') { var4 = var6; } else { @@ -797,7 +797,7 @@ void draw0(String var1, int var2, int var3) { if (!var8.equals("gt")) { if (var8.startsWith("img=")) { try { - var9 = class36.method182(var8.substring(4)); + var9 = Huffman.method1888(var8.substring(4)); IndexedSprite var10 = AbstractFont_modIconSprites[var9]; var10.drawAt(var2, var3 + this.ascent - var10.height); var2 += var10.width; @@ -863,8 +863,8 @@ void draw0(String var1, int var2, int var3) { } - @ObfuscatedName("bb") - void method2138(String var1, int var2, int var3, int[] var4, int[] var5, int[] var6) { + @ObfuscatedName("bf") + void method2124(String var1, int var2, int var3, int[] var4, int[] var5, int[] var6) { var3 -= this.ascent; int var7 = -1; int var8 = -1; @@ -872,7 +872,7 @@ void method2138(String var1, int var2, int var3, int[] var4, int[] var5, int[] v for (int var10 = 0; var10 < var1.length(); ++var10) { if (var1.charAt(var10) != 0) { - char var11 = (char)(Actor.charToByteCp1252(var1.charAt(var10)) & 255); + char var11 = (char)(class137.charToByteCp1252(var1.charAt(var10)) & 255); if (var11 == '<') { var7 = var10; } else { @@ -901,7 +901,7 @@ void method2138(String var1, int var2, int var3, int[] var4, int[] var5, int[] v } ++var9; - var15 = class36.method182(var12.substring(4)); + var15 = Huffman.method1888(var12.substring(4)); IndexedSprite var16 = AbstractFont_modIconSprites[var15]; var16.drawAt(var13 + var2, var14 + (var3 + this.ascent - var16.height)); var2 += var16.width; @@ -987,8 +987,8 @@ void method2138(String var1, int var2, int var3, int[] var4, int[] var5, int[] v } - @ObfuscatedName("am") - static int method2112(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("au") + static int method2098(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { int var7 = var2[var5]; int var8 = var7 + var4[var5]; int var9 = var2[var6]; @@ -1023,7 +1023,7 @@ static int method2112(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[ return -var13; } - @ObfuscatedName("as") + @ObfuscatedName("av") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); @@ -1052,7 +1052,7 @@ public static String escapeBrackets(String var0) { return var6.toString(); } - @ObfuscatedName("bo") + @ObfuscatedName("bg") @Export("AbstractFont_drawGlyph") static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -1094,7 +1094,7 @@ static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, in } } - @ObfuscatedName("bp") + @ObfuscatedName("ba") @Export("AbstractFont_placeGlyph") static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -1142,7 +1142,7 @@ static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, } - @ObfuscatedName("bt") + @ObfuscatedName("bm") @Export("AbstractFont_drawGlyphAlpha") static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -1184,7 +1184,7 @@ static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var } } - @ObfuscatedName("bm") + @ObfuscatedName("bp") @Export("AbstractFont_placeGlyphAlpha") static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; diff --git a/osrs/src/main/java/AbstractRasterProvider.java b/osrs/src/main/java/AbstractRasterProvider.java index b912acf8e..ab3b8636e 100644 --- a/osrs/src/main/java/AbstractRasterProvider.java +++ b/osrs/src/main/java/AbstractRasterProvider.java @@ -3,56 +3,56 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ui") +@ObfuscatedName("uu") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("pixels") public int[] pixels; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("width") public int width; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("height") public int height; - @ObfuscatedName("ah") - protected float[] field4252; + @ObfuscatedName("au") + protected float[] field4253; protected AbstractRasterProvider() { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-237304267" + descriptor = "(IIB)V", + garbageValue = "-24" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(IIIIB)V", - garbageValue = "-3" + garbageValue = "1" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("aj") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1751275534" + descriptor = "(B)V", + garbageValue = "46" ) @Export("apply") public final void apply() { - Rasterizer2D.method2659(this.pixels, this.width, this.height, this.field4252); + Rasterizer2D.method2637(this.pixels, this.width, this.height, this.field4253); } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "952320023" + garbageValue = "1918983678" ) - public final void method2685(boolean var1) { - this.field4252 = var1 ? new float[this.width * this.height + 1] : null; + public final void method2663(boolean var1) { + this.field4253 = var1 ? new float[this.width * this.height + 1] : null; } } \ No newline at end of file diff --git a/osrs/src/main/java/AbstractSocket.java b/osrs/src/main/java/AbstractSocket.java index 776a43ba2..cde676c63 100644 --- a/osrs/src/main/java/AbstractSocket.java +++ b/osrs/src/main/java/AbstractSocket.java @@ -5,56 +5,60 @@ import java.io.IOException; -@ObfuscatedName("re") +@ObfuscatedName("ro") @Implements("AbstractSocket") public abstract class AbstractSocket { + @ObfuscatedName("gg") + @Export("js5Port") + static int js5Port; + AbstractSocket() { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "2050917556" + garbageValue = "278911957" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-111326055" + garbageValue = "1133909296" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-4" + descriptor = "(I)I", + garbageValue = "-1251290768" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "-2009008666" + descriptor = "([BIIB)I", + garbageValue = "-54" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "40171702" + garbageValue = "-1734190943" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "2421" + descriptor = "(I)V", + garbageValue = "1195407219" ) @Export("close") public abstract void close(); diff --git a/osrs/src/main/java/AbstractSound.java b/osrs/src/main/java/AbstractSound.java index 3e6ba4ded..91e12a0f1 100644 --- a/osrs/src/main/java/AbstractSound.java +++ b/osrs/src/main/java/AbstractSound.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("cb") +@ObfuscatedName("cl") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("position") int position; diff --git a/osrs/src/main/java/AbstractUserComparator.java b/osrs/src/main/java/AbstractUserComparator.java index 9007a4ec4..454359807 100644 --- a/osrs/src/main/java/AbstractUserComparator.java +++ b/osrs/src/main/java/AbstractUserComparator.java @@ -5,24 +5,20 @@ import java.util.Comparator; -@ObfuscatedName("rv") +@ObfuscatedName("rn") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("ar") - static boolean[] field3833; - @ObfuscatedName("uj") - static int field3834; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } - @ObfuscatedName("am") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "1018649978" + garbageValue = "1936813741" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -34,10 +30,10 @@ final void addComparator(Comparator var1) { } - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lrp;Lrp;B)I", - garbageValue = "-78" + descriptor = "(Lrf;Lrf;I)I", + garbageValue = "-94519432" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -49,4 +45,13 @@ protected final int compareUser(User var1, User var2) { public boolean equals(Object var1) { return super.equals(var1); } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-50" + ) + static final void method2242(String var0) { + WorldMapArea.method1213("Please remove " + var0 + " from your ignore list first"); + } } \ No newline at end of file diff --git a/osrs/src/main/java/AbstractWorldMapData.java b/osrs/src/main/java/AbstractWorldMapData.java index 0f066e01f..ec6527f8d 100644 --- a/osrs/src/main/java/AbstractWorldMapData.java +++ b/osrs/src/main/java/AbstractWorldMapData.java @@ -5,84 +5,83 @@ import java.util.LinkedList; -@ObfuscatedName("kv") +@ObfuscatedName("jm") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("lo") - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("ao") - int field2445; - @ObfuscatedName("ah") - int field2443; - @ObfuscatedName("ar") + @ObfuscatedName("uk") + static int field2045; + @ObfuscatedName("ab") + int field2051; + @ObfuscatedName("au") + int field2055; + @ObfuscatedName("aa") @Export("regionX") int regionX; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("regionY") int regionY; - @ObfuscatedName("am") - int field2444; - @ObfuscatedName("av") + @ObfuscatedName("al") + int field2053; + @ObfuscatedName("az") @Export("planes") int planes; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("groupId") int groupId; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("fileId") int fileId; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("as") - byte[][][] field2439; + @ObfuscatedName("ay") + byte[][][] field2049; + @ObfuscatedName("ak") + byte[][][] field2048; @ObfuscatedName("aj") - byte[][][] field2438; - @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "[[[[Lkt;" + descriptor = "[[[[Ljs;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("au") - boolean field2437; - @ObfuscatedName("ai") - boolean field2436; + @ObfuscatedName("am") + boolean field2046; + @ObfuscatedName("aq") + boolean field2047; AbstractWorldMapData() { this.groupId = -1; this.fileId = -1; new LinkedList(); - this.field2437 = false; - this.field2436 = false; + this.field2046 = false; + this.field2047 = false; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "2115325709" + descriptor = "(Luj;B)V", + garbageValue = "7" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("at") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "780555008" + garbageValue = "153115175" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2437 && this.field2436; + return this.field2046 && this.field2047; } - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lom;I)V", - garbageValue = "905694632" + descriptor = "(Lol;I)V", + garbageValue = "816077843" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -90,53 +89,53 @@ void loadGeography(AbstractArchive var1) { byte[] var2 = var1.takeFile(this.groupId, this.fileId); if (var2 != null) { this.readGeography(new Buffer(var2)); - this.field2437 = true; - this.field2436 = true; + this.field2046 = true; + this.field2047 = true; } } } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1430776643" + garbageValue = "1929265244" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field2439 = null; - this.field2438 = null; + this.field2049 = null; + this.field2048 = null; this.decorations = null; - this.field2437 = false; - this.field2436 = false; + this.field2046 = false; + this.field2047 = false; } - @ObfuscatedName("bn") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IILul;I)V", - garbageValue = "744133359" + descriptor = "(IILuj;I)V", + garbageValue = "-2036497889" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); if (var4 != 0) { if ((var4 & 1) != 0) { - this.method1561(var1, var2, var3, var4); + this.method1319(var1, var2, var3, var4); } else { - this.method1562(var1, var2, var3, var4); + this.method1320(var1, var2, var3, var4); } } } - @ObfuscatedName("bk") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(IILul;II)V", - garbageValue = "1523871519" + descriptor = "(IILuj;II)V", + garbageValue = "-388208328" ) - void method1561(int var1, int var2, Buffer var3, int var4) { + void method1319(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; if (var5) { this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedShort(); @@ -145,12 +144,12 @@ void method1561(int var1, int var2, Buffer var3, int var4) { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedShort(); } - @ObfuscatedName("by") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(IILul;II)V", - garbageValue = "1937265234" + descriptor = "(IILuj;II)V", + garbageValue = "1227555705" ) - void method1562(int var1, int var2, Buffer var3, int var4) { + void method1320(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; boolean var6 = (var4 & 2) != 0; boolean var7 = (var4 & 4) != 0; @@ -166,8 +165,8 @@ void method1562(int var1, int var2, Buffer var3, int var4) { if (var10 != 0) { this.floorOverlayIds[var9][var1][var2] = (short)var10; var11 = var3.readUnsignedByte(); - this.field2439[var9][var1][var2] = (byte)(var11 >> 2); - this.field2438[var9][var1][var2] = (byte)(var11 & 3); + this.field2049[var9][var1][var2] = (byte)(var11 >> 2); + this.field2048[var9][var1][var2] = (byte)(var11 & 3); } } } @@ -191,40 +190,653 @@ void method1562(int var1, int var2, Buffer var3, int var4) { @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-66" + descriptor = "(I)I", + garbageValue = "908938497" ) @Export("getRegionX") int getRegionX() { return this.regionX; } - @ObfuscatedName("be") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1500412713" + descriptor = "(B)I", + garbageValue = "16" ) @Export("getRegionY") int getRegionY() { return this.regionY; } - @ObfuscatedName("ak") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "-91" + descriptor = "(Lnn;II)V", + garbageValue = "1102490716" ) - static final int method1556(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; + public static void method1323(Widget var0, int var1) { + ItemComposition var2 = class214.ItemDefinition_get(var1); + var0.field3125.equipment[var2.maleModel] = var1 + 512; + if (var2.maleModel1 != -1) { + var0.field3125.equipment[var2.maleModel1] = 0; + } + + if (var2.maleModel2 != -1) { + var0.field3125.equipment[var2.maleModel2] = 0; + } + + var0.field3125.method1756(); } - @ObfuscatedName("ah") + @ObfuscatedName("mn") @ObfuscatedSignature( - descriptor = "(IZI)Ljava/lang/String;", - garbageValue = "-1780027636" + descriptor = "([Lnn;IIIIIIIB)V", + garbageValue = "-49" ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - return var1 && var0 >= 0 ? UserComparator5.method673(var0, 10, var1) : Integer.toString(var0); + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + for (int var8 = 0; var8 < var0.length; ++var8) { + Widget var9 = var0[var8]; + if (var9 != null && var9.parentId == var1 && (var9.method1853() || class361.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { + if (var9.isIf3) { + if (class11.isComponentHidden(var9)) { + continue; + } + } else if (var9.type == 0 && var9 != Interpreter.mousedOverWidgetIf1 && class11.isComponentHidden(var9)) { + continue; + } + + if (var9.type == 11) { + if (var9.method1868(HealthBarDefinition.widgetDefinition, class60.urlRequester)) { + if (var9.method1861()) { + class159.invalidateWidget(var9); + class132.revalidateWidgetScroll(var9.children, var9, true); + } + + if (var9.field3116 != null) { + ScriptEvent var10 = new ScriptEvent(); + var10.widget = var9; + var10.args = var9.field3116; + Client.scriptEvents.addFirst(var10); + } + } + } else if (var9.type == 12 && var9.method1876(HealthBarDefinition.widgetDefinition)) { + class159.invalidateWidget(var9); + } + + int var26 = var9.x + var6; + int var11 = var7 + var9.y; + int var12; + int var13; + int var14; + int var15; + int var16; + int var17; + int var18; + if (var9.type == 9) { + var16 = var26; + var17 = var11; + var18 = var26 + var9.width; + int var19 = var11 + var9.height; + if (var18 < var26) { + var16 = var18; + var18 = var26; + } + + if (var19 < var11) { + var17 = var19; + var19 = var11; + } + + ++var18; + ++var19; + var12 = var16 > var2 ? var16 : var2; + var13 = var17 > var3 ? var17 : var3; + var14 = var18 < var4 ? var18 : var4; + var15 = var19 < var5 ? var19 : var5; + } else { + var16 = var26 + var9.width; + var17 = var11 + var9.height; + var12 = var26 > var2 ? var26 : var2; + var13 = var11 > var3 ? var11 : var3; + var14 = var16 < var4 ? var16 : var4; + var15 = var17 < var5 ? var17 : var5; + } + + if (var9 == Client.clickedWidget) { + Client.field397 = true; + Client.field514 = var26; + Client.field508 = var11; + } + + boolean var34 = false; + if (var9.field2995) { + switch(Client.field505) { + case 0: + var34 = true; + case 1: + default: + break; + case 2: + if (Client.field499 == var9.id >>> 16) { + var34 = true; + } + break; + case 3: + if (var9.id == Client.field499) { + var34 = true; + } + } + } + + if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { + if (var9.isIf3) { + ScriptEvent var27; + if (var9.noClickThrough) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var27.field866) { + var27.remove(); + var27.widget.field3001 = false; + } + } + + Tile.method1412(); + if (class148.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + UserComparator10.addCancelMenuEntry(); + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var27.field866 && var27.widget.onScroll == var27.args) { + var27.remove(); + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var17 = MouseHandler.MouseHandler_lastPressedX; + var18 = MouseHandler.MouseHandler_lastPressedY; + } + + boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var35) { + PacketBufferNode.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { + class18.checkIfMinimapClicked(var9, var26, var11); + } else { + if (var9.contentType == 1400) { + NewShit.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); + } + + if (!Client.isMenuOpen && var35) { + if (var9.contentType == 1400) { + NewShit.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); + } else { + class93.method502(var9); + } + } + + boolean var21; + int var23; + if (var34) { + for (int var20 = 0; var20 < var9.field3003.length; ++var20) { + var21 = false; + boolean var22 = false; + if (!var21 && var9.field3003[var20] != null) { + for (var23 = 0; var23 < var9.field3003[var20].length; ++var23) { + boolean var24 = false; + if (var9.field3080 != null) { + var24 = Client.keyHandlerInstance.getKeyPressed(var9.field3003[var20][var23]); + } + + if (class163.method852(var9.field3003[var20][var23]) || var24) { + var21 = true; + if (var9.field3080 != null && var9.field3080[var20] > Client.cycle) { + break; + } + + byte var25 = var9.field3004[var20][var23]; + if (var25 == 0 || ((var25 & 8) == 0 || !Client.keyHandlerInstance.getKeyPressed(86) && !Client.keyHandlerInstance.getKeyPressed(82) && !Client.keyHandlerInstance.getKeyPressed(81)) && ((var25 & 2) == 0 || Client.keyHandlerInstance.getKeyPressed(86)) && ((var25 & 1) == 0 || Client.keyHandlerInstance.getKeyPressed(82)) && ((var25 & 4) == 0 || Client.keyHandlerInstance.getKeyPressed(81))) { + var22 = true; + break; + } + } + } + } + + if (var22) { + if (var20 < 10) { + FloorOverlayDefinition.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { + class53.method308(); + FadeOutTask.method2154(var9.id, var9.childIndex, WorldMapData_0.Widget_unpackTargetMask(class361.getWidgetFlags(var9)), var9.itemId); + Client.field599 = class89.Widget_getSpellActionName(var9); + if (Client.field599 == null) { + Client.field599 = "null"; + } + + Client.field598 = var9.dataText + class167.colorStartTag(16777215); + } + + var23 = var9.field3073[var20]; + if (var9.field3080 == null) { + var9.field3080 = new int[var9.field3003.length]; + } + + if (var9.field3072 == null) { + var9.field3072 = new int[var9.field3003.length]; + } + + if (var23 != 0) { + if (var9.field3080[var20] == 0) { + var9.field3080[var20] = var23 + Client.cycle + var9.field3072[var20]; + } else { + var9.field3080[var20] = var23 + Client.cycle; + } + } else { + var9.field3080[var20] = Integer.MAX_VALUE; + } + } + + if (!var21 && var9.field3080 != null) { + var9.field3080[var20] = 0; + } + } + } + + if (var9.isIf3) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + var35 = true; + } else { + var35 = false; + } + + boolean var36 = false; + if ((MouseHandler.MouseHandler_currentButton == 1 || !class19.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { + var36 = true; + } + + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !class19.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { + var21 = true; + } + + if (var21) { + HorizontalAlignment.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.method1854()) { + if (var21) { + Client.field625.addFirst(new class222(0, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); + } + + if (var36) { + Client.field625.addFirst(new class222(1, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); + } + } + + if (var9.contentType == 1400) { + NewShit.worldMap.method2400(var17, var18, var35 & var36, var35 & var21); + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && class12.method43(class361.getWidgetFlags(var9))) { + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { + Client.field396 = true; + Client.field512 = var26; + Client.field513 = var11; + } + + if (var9.hasListener) { + ScriptEvent var28; + if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { + var28 = new ScriptEvent(); + var28.field866 = true; + var28.widget = var9; + var28.mouseY = Client.mouseWheelRotation; + var28.args = var9.onScroll; + Client.scriptEvents.addFirst(var28); + } + + if (Client.clickedWidget != null || Client.isMenuOpen) { + var21 = false; + var36 = false; + var35 = false; + } + + if (!var9.field2999 && var21) { + var9.field2999 = true; + if (var9.onClick != null) { + var28 = new ScriptEvent(); + var28.field866 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; + var28.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var28.args = var9.onClick; + Client.scriptEvents.addFirst(var28); + } + } + + if (var9.field2999 && var36 && var9.onClickRepeat != null) { + var28 = new ScriptEvent(); + var28.field866 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onClickRepeat; + Client.scriptEvents.addFirst(var28); + } + + if (var9.field2999 && !var36) { + var9.field2999 = false; + if (var9.onRelease != null) { + var28 = new ScriptEvent(); + var28.field866 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onRelease; + Client.field628.addFirst(var28); + } + } + + if (var36 && var9.onHold != null) { + var28 = new ScriptEvent(); + var28.field866 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onHold; + Client.scriptEvents.addFirst(var28); + } + + if (!var9.field3001 && var35) { + var9.field3001 = true; + if (var9.onMouseOver != null) { + var28 = new ScriptEvent(); + var28.field866 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onMouseOver; + Client.scriptEvents.addFirst(var28); + } + } + + if (var9.field3001 && var35 && var9.onMouseRepeat != null) { + var28 = new ScriptEvent(); + var28.field866 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var28); + } + + if (var9.field3001 && !var35) { + var9.field3001 = false; + if (var9.onMouseLeave != null) { + var28 = new ScriptEvent(); + var28.field866 = true; + var28.widget = var9; + var28.mouseX = MouseHandler.MouseHandler_x - var26; + var28.mouseY = MouseHandler.MouseHandler_y - var11; + var28.args = var9.onMouseLeave; + Client.field628.addFirst(var28); + } + } + + if (var9.onTimer != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onTimer; + Client.field627.addFirst(var28); + } + + ScriptEvent var29; + int var37; + int var38; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3071) { + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3071 <= 32) { + label647: + for (var37 = var9.field3071; var37 < Client.changedVarpCount; ++var37) { + var23 = Client.changedVarps[var37 & 31]; + + for (var38 = 0; var38 < var9.varTransmitTriggers.length; ++var38) { + if (var23 == var9.varTransmitTriggers[var38]) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var29); + break label647; + } + } + } + } else { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3071 = Client.changedVarpCount; + } + + if (var9.onInvTransmit != null && Client.changedItemContainersCount > var9.field3069) { + if (var9.invTransmitTriggers != null && Client.changedItemContainersCount - var9.field3069 <= 32) { + label623: + for (var37 = var9.field3069; var37 < Client.changedItemContainersCount; ++var37) { + var23 = Client.changedItemContainers[var37 & 31]; + + for (var38 = 0; var38 < var9.invTransmitTriggers.length; ++var38) { + if (var23 == var9.invTransmitTriggers[var38]) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var29); + break label623; + } + } + } + } else { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3069 = Client.changedItemContainersCount; + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3062) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3062 <= 32) { + label599: + for (var37 = var9.field3062; var37 < Client.changedSkillsCount; ++var37) { + var23 = Client.changedSkills[var37 & 31]; + + for (var38 = 0; var38 < var9.statTransmitTriggers.length; ++var38) { + if (var23 == var9.statTransmitTriggers[var38]) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var29); + break label599; + } + } + } + } else { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3062 = Client.changedSkillsCount; + } + + if (Client.chatCycle > var9.field3065 && var9.onChatTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field524 > var9.field3065 && var9.onFriendTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field526 > var9.field3065 && var9.onClanTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field520 > var9.field3065 && var9.field3099 != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.field3099; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field525 > var9.field3065 && var9.field3114 != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.field3114; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field519 > var9.field3065 && var9.onStockTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field527 > var9.field3065 && var9.field3115 != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.field3115; + Client.scriptEvents.addFirst(var28); + } + + if (Client.field522 > var9.field3065 && var9.onMiscTransmit != null) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var28); + } + + var9.field3065 = Client.cycleCntr; + if (var9.onKey != null) { + for (var37 = 0; var37 < Client.field530; ++var37) { + ScriptEvent var30 = new ScriptEvent(); + var30.widget = var9; + var30.keyTyped = Client.field577[var37]; + var30.keyPressed = Client.field579[var37]; + var30.args = var9.onKey; + Client.scriptEvents.addFirst(var30); + } + } + + ScriptEvent var31; + int[] var39; + if (var9.field3107 != null) { + var39 = Client.keyHandlerInstance.method1132(); + + for (var23 = 0; var23 < var39.length; ++var23) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = var39[var23]; + var31.args = var9.field3107; + Client.scriptEvents.addFirst(var31); + } + } + + if (var9.field3108 != null) { + var39 = Client.keyHandlerInstance.method1133(); + + for (var23 = 0; var23 < var39.length; ++var23) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = var39[var23]; + var31.args = var9.field3108; + Client.scriptEvents.addFirst(var31); + } + } + } + } + + if (!var9.isIf3) { + if (Client.clickedWidget != null || Client.isMenuOpen) { + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + if (var9.mouseOverRedirect >= 0) { + Interpreter.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + Interpreter.mousedOverWidgetIf1 = var9; + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + SwapSongTask.field3744 = var9; + } + + if (var9.scrollHeight > var9.height) { + class17.method63(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { + updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); + if (var9.children != null) { + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var32 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var32 != null) { + if (var32.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (ScriptEvent var33 = (ScriptEvent)Client.scriptEvents.last(); var33 != null; var33 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var33.field866) { + var33.remove(); + var33.widget.field3001 = false; + } + } + + if (class148.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + UserComparator10.addCancelMenuEntry(); + } + } + + class406.updateRootInterface(var32.group, var12, var13, var14, var15, var26, var11); + } + } + } + } + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/AbstractWorldMapIcon.java b/osrs/src/main/java/AbstractWorldMapIcon.java index 214664796..0dff268dc 100644 --- a/osrs/src/main/java/AbstractWorldMapIcon.java +++ b/osrs/src/main/java/AbstractWorldMapIcon.java @@ -3,78 +3,72 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ll") +@ObfuscatedName("jc") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("id") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Len;" - ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmh;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmh;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("screenX") int screenX; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lmo;Lmo;)V" + descriptor = "(Lmh;Lmh;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1637535390" + garbageValue = "-1307533886" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)Lkd;", - garbageValue = "5" + descriptor = "(B)Ljk;", + garbageValue = "-49" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "65" + descriptor = "(I)I", + garbageValue = "472460923" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1338001743" + garbageValue = "-653051141" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("as") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1492661122" + descriptor = "(IIB)Z", + garbageValue = "-1" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -85,10 +79,10 @@ boolean fitsScreen(int var1, int var2) { } } - @ObfuscatedName("aj") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "898631117" + descriptor = "(S)Z", + garbageValue = "497" ) @Export("hasValidElement") boolean hasValidElement() { @@ -97,32 +91,32 @@ boolean hasValidElement() { @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-74" + descriptor = "(III)Z", + garbageValue = "384970426" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = class148.WorldMapElement_get(this.getElement()); + WorldMapElement var3 = class141.WorldMapElement_get(this.getElement()); int var4 = this.getSubWidth(); int var5 = this.getSubHeight(); switch(var3.horizontalAlignment.value) { case 0: - if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { + if (var1 > this.screenX - var4 && var1 <= this.screenX) { break; } return false; case 1: - if (var1 > this.screenX - var4 && var1 <= this.screenX) { + if (var1 >= this.screenX && var1 < var4 + this.screenX) { break; } return false; case 2: - if (var1 < this.screenX || var1 >= var4 + this.screenX) { + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { return false; } } @@ -135,12 +129,12 @@ boolean elementFitsScreen(int var1, int var2) { return false; case 1: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { + if (var2 < this.screenY || var2 >= var5 + this.screenY) { return false; } break; case 2: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { + if (var2 <= this.screenY - var5 || var2 > this.screenY) { return false; } } @@ -149,10 +143,10 @@ boolean elementFitsScreen(int var1, int var2) { } } - @ObfuscatedName("au") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "7" + descriptor = "(III)Z", + garbageValue = "870406805" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -160,21 +154,9 @@ boolean labelFitsScreen(int var1, int var2) { if (var3 == null) { return false; } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { - return var2 >= this.screenY && var2 <= var3.height + this.screenY; + return var2 >= this.screenY && var2 <= this.screenY + var3.height; } else { return false; } } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-37607217" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; - } } \ No newline at end of file diff --git a/osrs/src/main/java/AccessFile.java b/osrs/src/main/java/AccessFile.java index 9ddc35b4a..4d33b0b3f 100644 --- a/osrs/src/main/java/AccessFile.java +++ b/osrs/src/main/java/AccessFile.java @@ -8,13 +8,13 @@ @ObfuscatedName("to") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("file") RandomAccessFile file; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("maxSize") final long maxSize; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("offset") long offset; @@ -39,17 +39,17 @@ public AccessFile(File var1, String var2, long var3) throws IOException { this.file.seek(0L); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); this.offset = var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1199497051" + garbageValue = "382643150" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -63,20 +63,20 @@ public final void write(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2118009691" + descriptor = "(B)V", + garbageValue = "97" ) @Export("close") public final void close() throws IOException { this.closeSync(false); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "8" + garbageValue = "52" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -94,20 +94,20 @@ public final void closeSync(boolean var1) throws IOException { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "-9" + descriptor = "(I)J", + garbageValue = "494268668" ) @Export("length") public final long length() throws IOException { return this.file.length(); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "1856614206" + garbageValue = "-1827594375" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { @@ -128,4 +128,44 @@ protected void finalize() throws Throwable { } } + + @ObfuscatedName("jf") + @ObfuscatedSignature( + descriptor = "(Lds;ZB)V", + garbageValue = "-57" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { + var0.isUnanimated = false; + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; + int var3 = var0.y >> 7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + long var4 = Player.calculateTag(0, 0, 0, false, var0.index); + if (var0.attachedModel != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = WorldMapDecorationType.getTileHeight(var0.x, var0.y, ItemLayer.Client_plane); + var0.playerCycle = Client.cycle; + class36.scene.addNullableObject(ItemLayer.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + } + + var0.tileHeight = WorldMapDecorationType.getTileHeight(var0.x, var0.y, ItemLayer.Client_plane); + var0.playerCycle = Client.cycle; + class36.scene.drawEntity(ItemLayer.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + } + } + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/Actor.java b/osrs/src/main/java/Actor.java index d936b20a6..f675f4a04 100644 --- a/osrs/src/main/java/Actor.java +++ b/osrs/src/main/java/Actor.java @@ -3,240 +3,250 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +import java.awt.*; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.util.ArrayList; +import java.util.Random; + +@ObfuscatedName("df") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("hg") - static String field959; - @ObfuscatedName("or") - static int field958; @ObfuscatedName("an") @Export("isWalking") boolean isWalking; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("x") int x; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("y") int y; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("rotation") int rotation; - @ObfuscatedName("bb") - int field971; - @ObfuscatedName("bo") + @ObfuscatedName("bm") + int field983; + @ObfuscatedName("bp") @Export("playerCycle") int playerCycle; - @ObfuscatedName("bp") + @ObfuscatedName("bw") @Export("idleSequence") int idleSequence; - @ObfuscatedName("bt") + @ObfuscatedName("bj") @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("bm") + @ObfuscatedName("bn") @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("br") + @ObfuscatedName("bo") @Export("walkSequence") int walkSequence; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("bc") + @ObfuscatedName("bu") @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("bu") + @ObfuscatedName("by") @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("bf") + @ObfuscatedName("bh") @Export("runSequence") int runSequence; - @ObfuscatedName("bh") + @ObfuscatedName("bz") @Export("runBackSequence") int runBackSequence; - @ObfuscatedName("bl") + @ObfuscatedName("bc") @Export("runLeftSequence") int runLeftSequence; - @ObfuscatedName("bg") + @ObfuscatedName("bs") @Export("runRightSequence") int runRightSequence; - @ObfuscatedName("bj") + @ObfuscatedName("bx") @Export("crawlSequence") int crawlSequence; - @ObfuscatedName("bx") + @ObfuscatedName("bb") @Export("crawlBackSequence") int crawlBackSequence; - @ObfuscatedName("bi") + @ObfuscatedName("bk") @Export("crawlLeftSequence") int crawlLeftSequence; - @ObfuscatedName("bq") + @ObfuscatedName("br") @Export("crawlRightSequence") int crawlRightSequence; - @ObfuscatedName("bw") + @ObfuscatedName("bq") @Export("overheadText") String overheadText; - @ObfuscatedName("ce") + @ObfuscatedName("cf") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("cu") + @ObfuscatedName("cg") @Export("showPublicPlayerChat") boolean showPublicPlayerChat; - @ObfuscatedName("cw") + @ObfuscatedName("cv") @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("co") - int field998; - @ObfuscatedName("cc") - int field991; - @ObfuscatedName("cg") - int[] field1026; - @ObfuscatedName("cy") + @ObfuscatedName("cx") + int field1005; + @ObfuscatedName("cp") + int field1003; + @ObfuscatedName("ce") + int[] field1030; + @ObfuscatedName("ct") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("cz") + @ObfuscatedName("cw") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("cb") + @ObfuscatedName("cl") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("cn") + @ObfuscatedName("cs") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("ck") + @ObfuscatedName("co") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("cr") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lpm;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("cs") + @ObfuscatedName("cn") @Export("targetIndex") int targetIndex; - @ObfuscatedName("cm") + @ObfuscatedName("cr") @Export("false0") boolean false0; - @ObfuscatedName("cv") + @ObfuscatedName("cj") @Export("movingOrientation") int movingOrientation; - @ObfuscatedName("ci") + @ObfuscatedName("ca") int field995; - @ObfuscatedName("cj") - int field996; - @ObfuscatedName("cx") - boolean field964; + @ObfuscatedName("cc") + int field997; + @ObfuscatedName("cu") + boolean field969; @ObfuscatedName("ch") @Export("movementSequence") int movementSequence; - @ObfuscatedName("cd") + @ObfuscatedName("cb") @Export("movementFrame") int movementFrame; - @ObfuscatedName("ct") + @ObfuscatedName("cz") @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("cf") - int field993; - @ObfuscatedName("cl") + @ObfuscatedName("cy") + int field1006; + @ObfuscatedName("ck") @Export("sequence") int sequence; - @ObfuscatedName("ca") + @ObfuscatedName("cd") @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("dv") + @ObfuscatedName("dt") @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("dm") + @ObfuscatedName("di") @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("ds") + @ObfuscatedName("dk") @Export("currentSequenceFrameIndex") int currentSequenceFrameIndex; - @ObfuscatedName("dx") + @ObfuscatedName("dd") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Ltz;" ) @Export("spotAnimations") IterableNodeHashTable spotAnimations; - @ObfuscatedName("dg") - int field1007; - @ObfuscatedName("dq") - int field1016; - @ObfuscatedName("dz") - int field1021; - @ObfuscatedName("dn") + @ObfuscatedName("dx") + int field1026; + @ObfuscatedName("dh") int field1013; - @ObfuscatedName("dk") + @ObfuscatedName("du") + int field1024; + @ObfuscatedName("dg") + int field1012; + @ObfuscatedName("dc") int field1010; - @ObfuscatedName("df") + @ObfuscatedName("do") @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("de") + @ObfuscatedName("db") @Export("exactMoveArrive1Cycle") int exactMoveArrive1Cycle; - @ObfuscatedName("dl") + @ObfuscatedName("dm") @Export("exactMoveDirection") int exactMoveDirection; - @ObfuscatedName("dp") + @ObfuscatedName("dr") @Export("npcCycle") int npcCycle; - @ObfuscatedName("do") + @ObfuscatedName("ds") @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("dh") + @ObfuscatedName("da") @Export("recolourStartCycle") int recolourStartCycle; - @ObfuscatedName("dj") + @ObfuscatedName("dw") @Export("recolourEndCycle") int recolourEndCycle; - @ObfuscatedName("du") + @ObfuscatedName("dp") @Export("recolourHue") byte recolourHue; - @ObfuscatedName("dr") + @ObfuscatedName("df") @Export("recolourSaturation") byte recolourSaturation; - @ObfuscatedName("dw") + @ObfuscatedName("dv") @Export("recolourLuminance") byte recolourLuminance; - @ObfuscatedName("di") + @ObfuscatedName("dz") @Export("recolourAmount") byte recolourAmount; - @ObfuscatedName("dt") + @ObfuscatedName("dl") @Export("orientation") int orientation; - @ObfuscatedName("dd") - int field1004; - @ObfuscatedName("dy") - int field1020; - @ObfuscatedName("db") + @ObfuscatedName("de") + int field1011; + @ObfuscatedName("dn") + int field1018; + @ObfuscatedName("dq") @Export("pathLength") int pathLength; - @ObfuscatedName("dc") + @ObfuscatedName("dj") @Export("pathX") int[] pathX; - @ObfuscatedName("da") + @ObfuscatedName("dy") @Export("pathY") int[] pathY; - @ObfuscatedName("eo") + @ObfuscatedName("ec") @ObfuscatedSignature( - descriptor = "[Lip;" + descriptor = "[Liz;" ) @Export("pathTraversed") MoveSpeed[] pathTraversed; - @ObfuscatedName("em") - int field1024; - @ObfuscatedName("el") - int field1023; - @ObfuscatedName("ec") + @ObfuscatedName("ew") + int field1028; + @ObfuscatedName("ex") + int field1029; + @ObfuscatedName("ev") @Export("combatLevelChange") int combatLevelChange; Actor() { this.isWalking = false; - this.field971 = 1; + this.field983 = 1; this.idleSequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; @@ -255,9 +265,9 @@ public abstract class Actor extends Renderable { this.overheadText = null; this.showPublicPlayerChat = false; this.overheadTextCyclesRemaining = 100; - this.field998 = 0; - this.field991 = 0; - this.field1026 = null; + this.field1005 = 0; + this.field1003 = 0; + this.field1030 = null; this.hitSplatCount = 0; this.hitSplatTypes = new int[4]; this.hitSplatValues = new int[4]; @@ -269,57 +279,57 @@ public abstract class Actor extends Renderable { this.false0 = false; this.movingOrientation = -1; this.field995 = -1; - this.field996 = -1; + this.field997 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; - this.field993 = 0; + this.field1006 = 0; this.sequence = -1; this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; this.currentSequenceFrameIndex = 0; this.spotAnimations = new IterableNodeHashTable(4); - this.field1007 = 0; + this.field1026 = 0; this.npcCycle = 0; this.defaultHeight = 200; this.recolourStartCycle = -1; this.recolourEndCycle = -1; - this.field1004 = 0; - this.field1020 = 32; + this.field1011 = 0; + this.field1018 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new MoveSpeed[10]; - this.field1024 = 0; - this.field1023 = 0; + this.field1028 = 0; + this.field1029 = 0; this.combatLevelChange = -1; } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "4" + descriptor = "(I)Z", + garbageValue = "1221291483" ) @Export("isVisible") boolean isVisible() { return false; } - @ObfuscatedName("bq") + @ObfuscatedName("cp") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "188506301" + garbageValue = "585669071" ) - final void method512() { + final void method506() { this.pathLength = 0; - this.field1023 = 0; + this.field1029 = 0; } - @ObfuscatedName("bw") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "2011213643" + descriptor = "(IIIIIIB)V", + garbageValue = "31" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -339,9 +349,9 @@ final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var int var10 = -1; int var11 = 0; if (var1 >= 0) { - HitSplatDefinition var12 = class191.method959(var1); - var10 = var12.field1716; - var11 = var12.field1715; + HitSplatDefinition var12 = class149.method776(var1); + var10 = var12.field1656; + var11 = var12.field1658; } int var14; @@ -397,14 +407,14 @@ final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var } } - @ObfuscatedName("ce") + @ObfuscatedName("ci") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "555870749" + garbageValue = "-2108984921" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = DefaultsGroup.method2315(var1); + HealthBarDefinition var7 = class92.method497(var1); HealthBar var8 = null; HealthBar var9 = null; int var10 = var7.int2; @@ -413,7 +423,7 @@ final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int va HealthBar var12; for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { ++var11; - if (var12.definition.field1559 == var7.field1559) { + if (var12.definition.field1494 == var7.field1494) { var12.put(var2 + var4, var5, var6, var3); return; } @@ -444,14 +454,14 @@ final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("cu") + @ObfuscatedName("ct") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1727929675" + garbageValue = "-875440561" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = DefaultsGroup.method2315(var1); + HealthBarDefinition var2 = class92.method497(var1); for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { if (var2 == var3.definition) { @@ -465,7 +475,7 @@ final void removeHealthBar(int var1) { @ObfuscatedName("cw") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1528136211" + garbageValue = "-702211426" ) @Export("updateSpotAnimation") void updateSpotAnimation(int var1, int var2, int var3, int var4) { @@ -473,7 +483,7 @@ void updateSpotAnimation(int var1, int var2, int var3, int var4) { SpotAnimation var6 = (SpotAnimation)this.spotAnimations.get((long)var1); if (var6 != null) { var6.remove(); - --this.field1007; + --this.field1026; } if (var2 != 65535 && var2 != -1) { @@ -483,69 +493,69 @@ void updateSpotAnimation(int var1, int var2, int var3, int var4) { } this.spotAnimations.put(new SpotAnimation(var2, var3, var5, var7), (long)var1); - ++this.field1007; + ++this.field1026; } } - @ObfuscatedName("co") + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "(B)Ltp;", - garbageValue = "-113" + descriptor = "(B)Ltz;", + garbageValue = "-1" ) - IterableNodeHashTable method518() { + IterableNodeHashTable method512() { return this.spotAnimations; } - @ObfuscatedName("cc") + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "106644167" + descriptor = "(B)V", + garbageValue = "98" ) - void method519() { + void method513() { IterableNodeHashTableIterator var1 = new IterableNodeHashTableIterator(this.spotAnimations); - for (SpotAnimation var2 = (SpotAnimation)var1.method2484(); var2 != null; var2 = (SpotAnimation)var1.next()) { + for (SpotAnimation var2 = (SpotAnimation)var1.method2461(); var2 != null; var2 = (SpotAnimation)var1.next()) { var2.remove(); } - this.field1007 = 0; + this.field1026 = 0; } - @ObfuscatedName("cg") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(Ljn;B)Ljn;", - garbageValue = "5" + descriptor = "(Lka;I)Lka;", + garbageValue = "-1145530728" ) - Model method520(Model var1) { - if (this.field1007 == 0) { + Model method514(Model var1) { + if (this.field1026 == 0) { return var1; } else { IterableNodeHashTableIterator var2 = new IterableNodeHashTableIterator(this.spotAnimations); int var3 = var1.verticesCount; int var4 = var1.indicesCount; - int var5 = var1.field2254; - byte var6 = var1.field2247; + int var5 = var1.field2421; + byte var6 = var1.field2415; - for (SpotAnimation var7 = (SpotAnimation)var2.method2484(); var7 != null; var7 = (SpotAnimation)var2.next()) { - if (var7.field4306 != -1) { - Model var8 = class406.SpotAnimationDefinition_get(var7.field4304).method1037(); + for (SpotAnimation var7 = (SpotAnimation)var2.method2461(); var7 != null; var7 = (SpotAnimation)var2.next()) { + if (var7.field4310 != -1) { + Model var8 = Canvas.SpotAnimationDefinition_get(var7.field4313).method966(); if (var8 != null) { var3 += var8.verticesCount; var4 += var8.indicesCount; - var5 += var8.field2254; + var5 += var8.field2421; } } } Model var10 = new Model(var3, var4, var5, var6); - var10.method1355(var1); + var10.method1532(var1); - for (SpotAnimation var11 = (SpotAnimation)var2.method2484(); var11 != null; var11 = (SpotAnimation)var2.next()) { - if (var11.field4306 != -1) { - Model var9 = class406.SpotAnimationDefinition_get(var11.field4304).getModel(var11.field4306); + for (SpotAnimation var11 = (SpotAnimation)var2.method2461(); var11 != null; var11 = (SpotAnimation)var2.next()) { + if (var11.field4310 != -1) { + Model var9 = Canvas.SpotAnimationDefinition_get(var11.field4313).getModel(var11.field4310); if (var9 != null) { - var9.offsetBy(0, -var11.field4307, 0); - var10.method1355(var9); + var9.offsetBy(0, -var11.field4309, 0); + var10.method1532(var9); } } } @@ -554,97 +564,1368 @@ Model method520(Model var1) { } } - @ObfuscatedName("cq") + @ObfuscatedName("co") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-57" + garbageValue = "1" ) - void method521() { - this.field964 = false; + void method515() { + this.field969 = false; this.movingOrientation = -1; this.field995 = -1; - this.field996 = -1; + this.field997 = -1; } @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(CI)B", - garbageValue = "-1751998077" + descriptor = "(Lbm;Lpf;Lpf;I)V", + garbageValue = "1431524852" ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - 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; + static void method516(GameEngine var0, Font var1, Font var2) { + int var6; + int var78; + int var79; + boolean var93; + if (Login.worldSelectOpen) { + class223 var76 = Client.keyHandlerInstance; + class223 var4 = var76; + + while (true) { + if (!var4.method1128()) { + if (MouseHandler.MouseHandler_lastButton != 1 && (class19.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { + break; + } + + int var77 = Login.xPadding + 280; + if (MouseHandler.MouseHandler_lastPressedX >= var77 && MouseHandler.MouseHandler_lastPressedX <= var77 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + VarcInt.changeWorldSelectSorting(0, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var77 + 15 && MouseHandler.MouseHandler_lastPressedX <= var77 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + VarcInt.changeWorldSelectSorting(0, 1); + break; + } + + var6 = Login.xPadding + 390; + if (MouseHandler.MouseHandler_lastPressedX >= var6 && MouseHandler.MouseHandler_lastPressedX <= var6 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + VarcInt.changeWorldSelectSorting(1, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var6 + 15 && MouseHandler.MouseHandler_lastPressedX <= var6 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + VarcInt.changeWorldSelectSorting(1, 1); + break; + } + + var78 = Login.xPadding + 500; + if (MouseHandler.MouseHandler_lastPressedX >= var78 && MouseHandler.MouseHandler_lastPressedX <= var78 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + VarcInt.changeWorldSelectSorting(2, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var78 + 15 && MouseHandler.MouseHandler_lastPressedX <= var78 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + VarcInt.changeWorldSelectSorting(2, 1); + break; + } + + var79 = Login.xPadding + 610; + if (MouseHandler.MouseHandler_lastPressedX >= var79 && MouseHandler.MouseHandler_lastPressedX <= var79 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + VarcInt.changeWorldSelectSorting(3, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var79 + 15 && MouseHandler.MouseHandler_lastPressedX <= var79 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + VarcInt.changeWorldSelectSorting(3, 1); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { + Login.worldSelectOpen = false; + class250.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + break; + } + + if (Login.hoveredWorldIndex != -1) { + World var80 = class361.World_worlds[Login.hoveredWorldIndex]; + if (var80.isDeadman()) { + var80.field679 = "beta"; + } + + boolean var10 = false; + if (var80.properties != Client.worldProperties) { + var93 = (Client.worldProperties & class522.field4153.rsOrdinal()) != 0; + boolean var94 = var80.isDeadman(); + if (var93 && !var94 || !var93 && var94) { + var10 = true; + } + } + + class28.changeWorld(var80); + Login.worldSelectOpen = false; + class250.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + if (var10) { + ByteArrayPool.reloadJS5(); + } + } else { + if (Login.worldSelectPage > 0 && Varps.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= Varps.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class47.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class47.canvasHeight / 2 + 50) { + --Login.worldSelectPage; + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && class105.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= Language.canvasWidth - class105.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= Language.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class47.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class47.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; + } + } + break; + } + + if (var4.field1899 == 13) { + Login.worldSelectOpen = false; + class250.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + break; + } + + if (var4.field1899 == 96) { + if (Login.worldSelectPage > 0 && Varps.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (var4.field1899 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class105.worldSelectRightSprite != null) { + ++Login.worldSelectPage; + } } + } else { - var1 = (byte)var0; - } + if ((MouseHandler.MouseHandler_lastButton == 1 || !class19.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + WorldMapIcon_1.clientPreferences.getTitleMusicDisabled(!WorldMapIcon_1.clientPreferences.getTitleMusicDisabled()); + if (!WorldMapIcon_1.clientPreferences.getTitleMusicDisabled()) { + ArrayList var3 = new ArrayList(); + var3.add(new MusicSong(class514.archive6, "scape main", "", 255, false)); + PendingSpawn.method505(var3, 0, 0, 0, 100, false); + } else { + WorldMapManager.method1265(0, 0); + } + + class472.method2350(); + } + + if (Client.gameState != 5) { + if (-1L == Login.field774) { + Login.field774 = SpotAnimationDefinition.method962() + 1000L; + } + + long var37 = SpotAnimationDefinition.method962(); + boolean var5; + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + while (true) { + if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { + var5 = true; + break; + } + + ArchiveLoader var39 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); + if (!var39.isLoaded()) { + var5 = false; + break; + } + + ++Client.archiveLoadersDone; + } + } else { + var5 = true; + } + + if (var5 && Login.field773 == -1L) { + Login.field773 = var37; + if (Login.field773 > Login.field774) { + Login.field774 = Login.field773; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + if (class85.clientLanguage == Language.Language_EN) { + if (MouseHandler.MouseHandler_lastButton == 1 || !class19.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var6 = Login.xPadding + 5; + short var7 = 463; + byte var8 = 100; + byte var40 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var6 && MouseHandler.MouseHandler_lastPressedX <= var6 + var8 && MouseHandler.MouseHandler_lastPressedY >= var7 && MouseHandler.MouseHandler_lastPressedY <= var7 + var40) { + if (class241.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + + return; + } + } + + if (class542.World_request != null && class241.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + } + + var6 = MouseHandler.MouseHandler_lastButton; + var78 = MouseHandler.MouseHandler_lastPressedX; + var79 = MouseHandler.MouseHandler_lastPressedY; + if (var6 == 0) { + var78 = MouseHandler.MouseHandler_x; + var79 = MouseHandler.MouseHandler_y; + } + + if (!class19.mouseCam && var6 == 4) { + var6 = 1; + } + + class223 var9 = Client.keyHandlerInstance; + class223 var41 = var9; + short var82; + int var83; + if (Login.loginIndex == 0) { + var93 = false; + + while (var41.method1128()) { + if (var41.field1899 == 84) { + var93 = true; + } + } + + var83 = class157.loginBoxCenter - 80; + var82 = 291; + if (var6 == 1 && var78 >= var83 - 75 && var78 <= var83 + 75 && var79 >= var82 - 20 && var79 <= var82 + 20) { + HealthBar.openURL(class251.method1336("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + } + + var83 = class157.loginBoxCenter + 80; + if (var6 == 1 && var78 >= var83 - 75 && var78 <= var83 + 75 && var79 >= var82 - 20 && var79 <= var82 + 20 || var93) { + if ((Client.worldProperties & class522.field4151.rsOrdinal()) != 0) { + Login.Login_response0 = ""; + Login.Login_response1 = "This is a Beta world."; + Login.Login_response2 = "Your normal account will not be affected."; + Login.Login_response3 = ""; + UserComparator7.method674(1); + class150.method785(); + } else if ((Client.worldProperties & class522.field4157.rsOrdinal()) != 0) { + if ((Client.worldProperties & class522.field4156.rsOrdinal()) != 0) { + Login.Login_response1 = "This is a High Risk PvP world."; + Login.Login_response2 = "Players can attack each other almost everywhere"; + Login.Login_response3 = "and the Protect Item prayer won't work."; + } else { + Login.Login_response1 = "This is a PvP world."; + Login.Login_response2 = "Players can attack each other"; + Login.Login_response3 = "almost everywhere."; + } + + Login.Login_response0 = "Warning!"; + UserComparator7.method674(1); + class150.method785(); + } else if ((Client.worldProperties & class522.field4156.rsOrdinal()) != 0) { + Login.Login_response1 = "This is a High Risk world."; + Login.Login_response2 = "The Protect Item prayer will"; + Login.Login_response3 = "not work on this world."; + Login.Login_response0 = "Warning!"; + UserComparator7.method674(1); + class150.method785(); + } else { + SoundSystem.Login_promptCredentials(false); + } + } + } else { + int var11; + short var12; + if (Login.loginIndex == 1) { + while (true) { + if (!var41.method1128()) { + var11 = class157.loginBoxCenter - 80; + var12 = 321; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + SoundSystem.Login_promptCredentials(false); + } + + var11 = class157.loginBoxCenter + 80; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + UserComparator7.method674(0); + } + break; + } + + if (var41.field1899 == 84) { + SoundSystem.Login_promptCredentials(false); + } else if (var41.field1899 == 13) { + UserComparator7.method674(0); + } + } + } else { + int var15; + short var81; + if (Login.loginIndex == 2) { + var81 = 201; + var11 = var81 + 52; + if (var6 == 1 && var79 >= var11 - 12 && var79 < var11 + 2) { + Login.currentLoginField = 0; + } + + var11 += 15; + if (var6 == 1 && var79 >= var11 - 12 && var79 < var11 + 2) { + Login.currentLoginField = 1; + } + + var11 += 15; + var81 = 361; + if (Login.field775 != null) { + var83 = Login.field775.highX / 2; + if (var6 == 1 && var78 >= Login.field775.lowX - var83 && var78 <= var83 + Login.field775.lowX && var79 >= var81 - 15 && var79 < var81) { + switch(Login.field750) { + case 1: + HealthBar.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); + return; + case 2: + HealthBar.openURL("https://support.runescape.com/hc/en-gb", true, false); + } + } + } + + var83 = class157.loginBoxCenter - 80; + var82 = 321; + if (var6 == 1 && var78 >= var83 - 75 && var78 <= var83 + 75 && var79 >= var82 - 20 && var79 <= var82 + 20) { + class478.method2365(); + return; + } + + var83 = Login.loginBoxX + 180 + 80; + if (var6 == 1 && var78 >= var83 - 75 && var78 <= var83 + 75 && var79 >= var82 - 20 && var79 <= var82 + 20) { + UserComparator7.method674(0); + Login.Login_username = ""; + Login.Login_password = ""; + class53.field256 = 0; + NewShit.otp = ""; + Login.field744 = true; + } + + var83 = class157.loginBoxCenter + -117; + var82 = 277; + Login.field743 = var78 >= var83 && var78 < var83 + NPCComposition.field1532 && var79 >= var82 && var79 < var82 + class113.field1178; + if (var6 == 1 && Login.field743) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && WorldMapIcon_1.clientPreferences.getUsernameToRemember() != null) { + WorldMapIcon_1.clientPreferences.setUsernameToRemember((String)null); + } + } + + var83 = class157.loginBoxCenter + 24; + var82 = 277; + Login.field745 = var78 >= var83 && var78 < var83 + NPCComposition.field1532 && var79 >= var82 && var79 < var82 + class113.field1178; + if (var6 == 1 && Login.field745) { + WorldMapIcon_1.clientPreferences.setIsUsernameHidden(!WorldMapIcon_1.clientPreferences.getIsUsernameHidden()); + if (!WorldMapIcon_1.clientPreferences.getIsUsernameHidden()) { + Login.Login_username = ""; + WorldMapIcon_1.clientPreferences.setUsernameToRemember((String)null); + class150.method785(); + } + } + + while (true) { + int var88; + Transferable var104; + do { + while (true) { + label1419: + do { + while (true) { + while (var41.method1128()) { + if (var41.field1899 != 13) { + if (Login.currentLoginField != 0) { + continue label1419; + } + + char var87 = var41.field1897; + + for (var15 = 0; var15 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var87 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var15); ++var15) { + } + + if (var41.field1899 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (var41.field1899 == 84 || var41.field1899 == 80) { + Login.currentLoginField = 1; + } + + if (WorldMapScaleHandler.method1380(var41.field1897) && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + var41.field1897; + } + } else { + UserComparator7.method674(0); + Login.Login_username = ""; + Login.Login_password = ""; + class53.field256 = 0; + NewShit.otp = ""; + Login.field744 = true; + } + } + + return; + } + } while(Login.currentLoginField != 1); + + if (var41.field1899 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } else if (var41.field1899 == 84 || var41.field1899 == 80) { + Login.currentLoginField = 0; + if (var41.field1899 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + class139.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + class139.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + class139.setLoginResponseString("", "Connecting to server...", ""); + VerticalAlignment.method958(false); + WorldMapSection2.updateGameState(20); + return; + } + } + + if ((var41.getKeyPressed(82) || var41.getKeyPressed(87)) && var41.field1899 == 67) { + Clipboard var103 = Toolkit.getDefaultToolkit().getSystemClipboard(); + var104 = var103.getContents(SpriteMask.client); + var88 = 20 - Login.Login_password.length(); + break; + } + + if (DirectByteArrayCopier.method1884(var41.field1897) && WorldMapScaleHandler.method1380(var41.field1897) && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + var41.field1897; + } + } + } while(var88 <= 0); + + try { + String var89 = (String)var104.getTransferData(DataFlavor.stringFlavor); + int var92 = Math.min(var88, var89.length()); + + for (int var19 = 0; var19 < var92; ++var19) { + if (!DirectByteArrayCopier.method1884(var89.charAt(var19)) || !WorldMapScaleHandler.method1380(var89.charAt(var19))) { + UserComparator7.method674(3); + return; + } + } + + Login.Login_password = Login.Login_password + var89.substring(0, var92); + } catch (UnsupportedFlavorException var74) { + } catch (IOException var75) { + } + } + } else { + Bounds var44; + if (Login.loginIndex == 3) { + var11 = Login.loginBoxX + 180; + var12 = 241; + var44 = var1.method2105(25, "need to log in using the Jagex Launcher instead.".length() - 34, "need to log in using the Jagex Launcher instead.", var11, var12); + if (var6 == 1 && var44.method2300(var78, var79)) { + HealthBar.openURL("https://oldschool.runescape.com/launcher", true, false); + } + + var11 = Login.loginBoxX + 180; + var12 = 276; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + ClientPreferences.method568(false); + } + + var11 = Login.loginBoxX + 180; + var12 = 326; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + HealthBar.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); + return; + } + } else { + int var14; + if (Login.loginIndex == 4) { + var11 = Login.loginBoxX + 180 - 80; + var12 = 321; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + NewShit.otp.trim(); + if (NewShit.otp.length() != 6) { + class139.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class53.field256 = Integer.parseInt(NewShit.otp); + NewShit.otp = ""; + VerticalAlignment.method958(true); + class139.setLoginResponseString("", "Connecting to server...", ""); + WorldMapSection2.updateGameState(20); + return; + } + + if (var6 == 1 && var78 >= Login.loginBoxX + 180 - 9 && var78 <= Login.loginBoxX + 180 + 130 && var79 >= 263 && var79 <= 296) { + Login.field744 = !Login.field744; + } + + if (var6 == 1 && var78 >= Login.loginBoxX + 180 - 34 && var78 <= Login.loginBoxX + 34 + 180 && var79 >= 351 && var79 <= 363) { + HealthBar.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); + } + + var11 = Login.loginBoxX + 180 + 80; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + UserComparator7.method674(0); + Login.Login_username = ""; + Login.Login_password = ""; + class53.field256 = 0; + NewShit.otp = ""; + } + + while (var41.method1128()) { + boolean var13 = false; + + for (var14 = 0; var14 < "1234567890".length(); ++var14) { + if (var41.field1897 == "1234567890".charAt(var14)) { + var13 = true; + break; + } + } + + if (var41.field1899 == 13) { + UserComparator7.method674(0); + Login.Login_username = ""; + Login.Login_password = ""; + class53.field256 = 0; + NewShit.otp = ""; + } else { + if (var41.field1899 == 85 && NewShit.otp.length() > 0) { + NewShit.otp = NewShit.otp.substring(0, NewShit.otp.length() - 1); + } + + if (var41.field1899 == 84) { + NewShit.otp.trim(); + if (NewShit.otp.length() != 6) { + class139.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class53.field256 = Integer.parseInt(NewShit.otp); + NewShit.otp = ""; + VerticalAlignment.method958(true); + class139.setLoginResponseString("", "Connecting to server...", ""); + WorldMapSection2.updateGameState(20); + return; + } + + if (var13 && NewShit.otp.length() < 6) { + NewShit.otp = NewShit.otp + var41.field1897; + } + } + } + } else if (Login.loginIndex == 5) { + var11 = Login.loginBoxX + 180 - 80; + var12 = 321; + Buffer var22; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + class139.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var48; + try { + URL var45 = new URL(class251.method1336("services", false) + "m=accountappeal/login.ws"); + URLConnection var17 = var45.openConnection(); + var17.setRequestProperty("connection", "close"); + var17.setDoInput(true); + var17.setDoOutput(true); + var17.setConnectTimeout(5000); + OutputStreamWriter var106 = new OutputStreamWriter(var17.getOutputStream()); + var106.write("data1=req"); + var106.flush(); + InputStream var107 = var17.getInputStream(); + Buffer var90 = new Buffer(new byte[1000]); + + while (true) { + int var21 = var107.read(var90.array, var90.offset, 1000 - var90.offset); + if (var21 == -1) { + var90.offset = 0; + long var50 = var90.readLong(); + var48 = var50; + break; + } - return var1; + var90.offset += var21; + if (var90.offset >= 1000) { + var48 = 0L; + break; + } + } + } catch (Exception var70) { + var48 = 0L; + } + + byte var84; + if (var48 == 0L) { + var84 = 5; + } else { + String var108 = Login.Login_username; + Random var91 = new Random(); + Buffer var110 = new Buffer(128); + var22 = new Buffer(128); + int[] var96 = new int[]{var91.nextInt(), var91.nextInt(), (int)(var48 >> 32), (int)var48}; + var110.writeByte(10); + + int var24; + for (var24 = 0; var24 < 4; ++var24) { + var110.writeInt(var91.nextInt()); + } + + var110.writeInt(var96[0]); + var110.writeInt(var96[1]); + var110.writeLong(var48); + var110.writeLong(0L); + + for (var24 = 0; var24 < 4; ++var24) { + var110.writeInt(var91.nextInt()); + } + + var110.encryptRsa(class72.field729, class72.field730); + var22.writeByte(10); + + for (var24 = 0; var24 < 3; ++var24) { + var22.writeInt(var91.nextInt()); + } + + var22.writeLong(var91.nextLong()); + var22.writeLongMedium(var91.nextLong()); + class354.method1897(var22); + var22.writeLong(var91.nextLong()); + var22.encryptRsa(class72.field729, class72.field730); + var24 = ClanChannel.stringCp1252NullTerminatedByteSize(var108); + if (var24 % 8 != 0) { + var24 += 8 - var24 % 8; + } + + Buffer var97 = new Buffer(var24); + var97.writeStringCp1252NullTerminated(var108); + var97.offset = var24; + var97.xteaEncryptAll(var96); + Buffer var26 = new Buffer(var22.offset + var110.offset + var97.offset + 5); + var26.writeByte(2); + var26.writeByte(var110.offset); + var26.writeBytes(var110.array, 0, var110.offset); + var26.writeByte(var22.offset); + var26.writeBytes(var22.array, 0, var22.offset); + var26.writeShort(var97.offset); + var26.writeBytes(var97.array, 0, var97.offset); + String var98 = class415.method2150(var26.array); + + byte var18; + try { + URL var99 = new URL(class251.method1336("services", false) + "m=accountappeal/login.ws"); + URLConnection var100 = var99.openConnection(); + var100.setDoInput(true); + var100.setDoOutput(true); + var100.setConnectTimeout(5000); + OutputStreamWriter var101 = new OutputStreamWriter(var100.getOutputStream()); + var101.write("data2=" + WorldMapData_0.method1179(var98) + "&dest=" + WorldMapData_0.method1179("passwordchoice.ws")); + var101.flush(); + InputStream var102 = var100.getInputStream(); + var26 = new Buffer(new byte[1000]); + + while (true) { + int var32 = var102.read(var26.array, var26.offset, 1000 - var26.offset); + if (var32 == -1) { + var101.close(); + var102.close(); + String var111 = new String(var26.array); + if (var111.startsWith("OFFLINE")) { + var18 = 4; + } else if (var111.startsWith("WRONG")) { + var18 = 7; + } else if (var111.startsWith("RELOAD")) { + var18 = 3; + } else if (var111.startsWith("Not permitted for social network accounts.")) { + var18 = 6; + } else { + var26.xteaDecryptAll(var96); + + while (var26.offset > 0 && var26.array[var26.offset - 1] == 0) { + --var26.offset; + } + + var111 = new String(var26.array, 0, var26.offset); + boolean var33; + if (var111 == null) { + var33 = false; + } else { + label1588: { + try { + new URL(var111); + } catch (MalformedURLException var68) { + var33 = false; + break label1588; + } + + var33 = true; + } + } + + if (var33) { + HealthBar.openURL(var111, true, false); + var18 = 2; + } else { + var18 = 5; + } + } + break; + } + + var26.offset += var32; + if (var26.offset >= 1000) { + var18 = 5; + break; + } + } + } catch (Throwable var69) { + var69.printStackTrace(); + var18 = 5; + } + + var84 = var18; + } + + switch(var84) { + case 2: + class139.setLoginResponseString(Strings.field3442, Strings.field3443, Strings.field3465); + UserComparator7.method674(6); + break; + case 3: + class139.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + class139.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + class139.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + class139.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + class139.setLoginResponseString("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."); + } + } + + return; + } + + var11 = Login.loginBoxX + 180 + 80; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + SoundSystem.Login_promptCredentials(true); + } + + var82 = 361; + if (class7.field13 != null) { + var14 = class7.field13.highX / 2; + if (var6 == 1 && var78 >= class7.field13.lowX - var14 && var78 <= var14 + class7.field13.lowX && var79 >= var82 - 15 && var79 < var82) { + HealthBar.openURL(class251.method1336("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + } + } + + while (var41.method1128()) { + boolean var85 = false; + + for (var15 = 0; var15 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var15) { + if (var41.field1897 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var15)) { + var85 = true; + break; + } + } + + if (var41.field1899 == 13) { + SoundSystem.Login_promptCredentials(true); + } else { + if (var41.field1899 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (var41.field1899 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + class139.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var52; + try { + URL var46 = new URL(class251.method1336("services", false) + "m=accountappeal/login.ws"); + URLConnection var47 = var46.openConnection(); + var47.setRequestProperty("connection", "close"); + var47.setDoInput(true); + var47.setDoOutput(true); + var47.setConnectTimeout(5000); + OutputStreamWriter var20 = new OutputStreamWriter(var47.getOutputStream()); + var20.write("data1=req"); + var20.flush(); + InputStream var54 = var47.getInputStream(); + var22 = new Buffer(new byte[1000]); + + while (true) { + int var56 = var54.read(var22.array, var22.offset, 1000 - var22.offset); + if (var56 == -1) { + var22.offset = 0; + long var57 = var22.readLong(); + var52 = var57; + break; + } + + var22.offset += var56; + if (var22.offset >= 1000) { + var52 = 0L; + break; + } + } + } catch (Exception var73) { + var52 = 0L; + } + + byte var86; + if (0L == var52) { + var86 = 5; + } else { + String var109 = Login.Login_username; + Random var95 = new Random(); + Buffer var23 = new Buffer(128); + Buffer var61 = new Buffer(128); + int[] var25 = new int[]{var95.nextInt(), var95.nextInt(), (int)(var52 >> 32), (int)var52}; + var23.writeByte(10); + + int var62; + for (var62 = 0; var62 < 4; ++var62) { + var23.writeInt(var95.nextInt()); + } + + var23.writeInt(var25[0]); + var23.writeInt(var25[1]); + var23.writeLong(var52); + var23.writeLong(0L); + + for (var62 = 0; var62 < 4; ++var62) { + var23.writeInt(var95.nextInt()); + } + + var23.encryptRsa(class72.field729, class72.field730); + var61.writeByte(10); + + for (var62 = 0; var62 < 3; ++var62) { + var61.writeInt(var95.nextInt()); + } + + var61.writeLong(var95.nextLong()); + var61.writeLongMedium(var95.nextLong()); + class354.method1897(var61); + var61.writeLong(var95.nextLong()); + var61.encryptRsa(class72.field729, class72.field730); + var62 = ClanChannel.stringCp1252NullTerminatedByteSize(var109); + if (var62 % 8 != 0) { + var62 += 8 - var62 % 8; + } + + Buffer var27 = new Buffer(var62); + var27.writeStringCp1252NullTerminated(var109); + var27.offset = var62; + var27.xteaEncryptAll(var25); + Buffer var28 = new Buffer(var27.offset + var61.offset + var23.offset + 5); + var28.writeByte(2); + var28.writeByte(var23.offset); + var28.writeBytes(var23.array, 0, var23.offset); + var28.writeByte(var61.offset); + var28.writeBytes(var61.array, 0, var61.offset); + var28.writeShort(var27.offset); + var28.writeBytes(var27.array, 0, var27.offset); + String var29 = class415.method2150(var28.array); + + byte var65; + try { + URL var30 = new URL(class251.method1336("services", false) + "m=accountappeal/login.ws"); + URLConnection var31 = var30.openConnection(); + var31.setDoInput(true); + var31.setDoOutput(true); + var31.setConnectTimeout(5000); + OutputStreamWriter var55 = new OutputStreamWriter(var31.getOutputStream()); + var55.write("data2=" + WorldMapData_0.method1179(var29) + "&dest=" + WorldMapData_0.method1179("passwordchoice.ws")); + var55.flush(); + InputStream var63 = var31.getInputStream(); + var28 = new Buffer(new byte[1000]); + + while (true) { + int var64 = var63.read(var28.array, var28.offset, 1000 - var28.offset); + if (var64 == -1) { + var55.close(); + var63.close(); + String var34 = new String(var28.array); + if (var34.startsWith("OFFLINE")) { + var65 = 4; + } else if (var34.startsWith("WRONG")) { + var65 = 7; + } else if (var34.startsWith("RELOAD")) { + var65 = 3; + } else if (var34.startsWith("Not permitted for social network accounts.")) { + var65 = 6; + } else { + var28.xteaDecryptAll(var25); + + while (var28.offset > 0 && var28.array[var28.offset - 1] == 0) { + --var28.offset; + } + + var34 = new String(var28.array, 0, var28.offset); + boolean var35; + if (var34 == null) { + var35 = false; + } else { + label1590: { + try { + new URL(var34); + } catch (MalformedURLException var71) { + var35 = false; + break label1590; + } + + var35 = true; + } + } + + if (var35) { + HealthBar.openURL(var34, true, false); + var65 = 2; + } else { + var65 = 5; + } + } + break; + } + + var28.offset += var64; + if (var28.offset >= 1000) { + var65 = 5; + break; + } + } + } catch (Throwable var72) { + var72.printStackTrace(); + var65 = 5; + } + + var86 = var65; + } + + switch(var86) { + case 2: + class139.setLoginResponseString(Strings.field3442, Strings.field3443, Strings.field3465); + UserComparator7.method674(6); + break; + case 3: + class139.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + class139.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + class139.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + class139.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + class139.setLoginResponseString("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."); + } + } + + return; + } + + if (var85 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + var41.field1897; + } + } + } + } else if (Login.loginIndex != 6) { + if (Login.loginIndex == 7) { + if (PendingSpawn.field949 && !Client.onMobile) { + var11 = class157.loginBoxCenter - 150; + var83 = var11 + 40 + 240 + 25; + var82 = 231; + var14 = var82 + 40; + if (var6 == 1 && var78 >= var11 && var78 <= var83 && var79 >= var82 && var79 <= var14) { + Login.field753 = ObjectSound.method423(var11, var78); + } + + var15 = Login.loginBoxX + 180 - 80; + short var16 = 321; + boolean var66; + if (var6 == 1 && var78 >= var15 - 75 && var78 <= var15 + 75 && var79 >= var16 - 20 && var79 <= var16 + 20) { + var66 = class36.method184(); + if (var66) { + WorldMapSection2.updateGameState(50); + return; + } + } + + var15 = Login.loginBoxX + 180 + 80; + if (var6 == 1 && var78 >= var15 - 75 && var78 <= var15 + 75 && var79 >= var16 - 20 && var79 <= var16 + 20) { + Login.field769 = new String[8]; + SoundSystem.Login_promptCredentials(true); + } + + while (var41.method1128()) { + if (var41.field1899 == 101) { + Login.field769[Login.field753] = null; + } + + if (var41.field1899 == 85) { + if (Login.field769[Login.field753] == null && Login.field753 > 0) { + --Login.field753; + } + + Login.field769[Login.field753] = null; + } + + if (var41.field1897 >= '0' && var41.field1897 <= '9') { + Login.field769[Login.field753] = "" + var41.field1897; + if (Login.field753 < 7) { + ++Login.field753; + } + } + + if (var41.field1899 == 84) { + var66 = class36.method184(); + if (var66) { + WorldMapSection2.updateGameState(50); + } + + return; + } + } + } else { + var11 = Login.loginBoxX + 180 - 80; + var12 = 321; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + HealthBar.openURL(class251.method1336("secure", true) + "m=dob/set_dob.ws", true, false); + class139.setLoginResponseString("", "Page has opened in the browser.", ""); + UserComparator7.method674(6); + return; + } + + var11 = Login.loginBoxX + 180 + 80; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + SoundSystem.Login_promptCredentials(true); + } + } + } else if (Login.loginIndex == 8) { + var11 = Login.loginBoxX + 180 - 80; + var12 = 321; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + HealthBar.openURL("https://www.jagex.com/terms/privacy", true, false); + class139.setLoginResponseString("", "Page has opened in the browser.", ""); + UserComparator7.method674(6); + return; + } + + var11 = Login.loginBoxX + 180 + 80; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + SoundSystem.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 9) { + var11 = Login.loginBoxX + 180; + var12 = 311; + if (var9.field1899 == 84 || var9.field1899 == 13 || var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + ClientPreferences.method568(false); + } + } else if (Login.loginIndex == 10) { + var11 = Login.loginBoxX + 180; + var12 = 209; + if (var9.field1899 == 84 || var6 == 1 && var78 >= var11 - 109 && var78 <= var11 + 109 && var79 >= var12 && var79 <= var12 + 68) { + class139.setLoginResponseString("", "Connecting to server...", ""); + Client.field648 = class531.field4233; + VerticalAlignment.method958(false); + WorldMapSection2.updateGameState(20); + } + } else if (Login.loginIndex == 12) { + var11 = class157.loginBoxCenter; + var12 = 233; + var44 = var2.method2105(0, 30, "terms of use, privacy policy, and end user licence", var11, var12); + Bounds var42 = var2.method2105(32, 32, "terms of use, privacy policy, and end user licence", var11, var12); + Bounds var43 = var2.method2105(70, 34, "terms of use, privacy policy, and end user licence", var11, var12); + var83 = var12 + 17; + Bounds var105 = var2.method2105(0, 34, "agreement (EULA).", var11, var83); + if (var6 == 1) { + if (var44.method2300(var78, var79)) { + HealthBar.openURL("https://www.jagex.com/terms", true, false); + } else if (var42.method2300(var78, var79)) { + HealthBar.openURL("https://www.jagex.com/terms/privacy", true, false); + } else if (var43.method2300(var78, var79) || var105.method2300(var78, var79)) { + HealthBar.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); + } + } + + var11 = class157.loginBoxCenter - 80; + var12 = 311; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + WorldMapIcon_1.clientPreferences.method560(Client.param21); + ClientPreferences.method568(true); + } + + var11 = class157.loginBoxCenter + 80; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + Login.loginIndex = 13; + } + } else if (Login.loginIndex == 13) { + var11 = class157.loginBoxCenter; + var12 = 321; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + ClientPreferences.method568(true); + } + } else if (Login.loginIndex == 14) { + String var67 = ""; + switch(Login.field751) { + case 0: + var67 = "https://secure.runescape.com/m=offence-appeal/account-history"; + break; + case 1: + var67 = "https://secure.runescape.com/m=accountappeal/passwordrecovery"; + break; + case 2: + var67 = "https://support.runescape.com/hc/en-gb/articles/207256855-Settle-an-Unpaid-Balance"; + break; + default: + SoundSystem.Login_promptCredentials(false); + } + + var83 = Login.loginBoxX + 180; + var82 = 276; + if (var6 == 1 && var78 >= var83 - 75 && var78 <= var83 + 75 && var79 >= var82 - 20 && var79 <= var82 + 20) { + HealthBar.openURL(var67, true, false); + class139.setLoginResponseString("", "Page has opened in the browser.", ""); + UserComparator7.method674(6); + return; + } + + var83 = Login.loginBoxX + 180; + var82 = 326; + if (var6 == 1 && var78 >= var83 - 75 && var78 <= var83 + 75 && var79 >= var82 - 20 && var79 <= var82 + 20) { + SoundSystem.Login_promptCredentials(false); + } + } else if (Login.loginIndex == 24) { + var11 = Login.loginBoxX + 180; + var12 = 301; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + ClientPreferences.method568(false); + } + } else if (Login.loginIndex == 32) { + var11 = Login.loginBoxX + 180 - 80; + var12 = 321; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + HealthBar.openURL(class251.method1336("secure", true) + "m=dob/set_dob.ws", true, false); + class139.setLoginResponseString("", "Page has opened in the browser.", ""); + UserComparator7.method674(6); + return; + } + + var11 = Login.loginBoxX + 180 + 80; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + SoundSystem.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 33) { + var11 = Login.loginBoxX + 180; + var12 = 276; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + HealthBar.openURL("https://oldschool.runescape.com/launcher", true, false); + } + + var11 = Login.loginBoxX + 180; + var12 = 326; + if (var6 == 1 && var78 >= var11 - 75 && var78 <= var11 + 75 && var79 >= var12 - 20 && var79 <= var12 + 20) { + SoundSystem.Login_promptCredentials(true); + } + } + } else { + while (true) { + do { + if (!var41.method1128()) { + var81 = 321; + if (var6 == 1 && var79 >= var81 - 20 && var79 <= var81 + 20) { + SoundSystem.Login_promptCredentials(true); + } + + return; + } + } while(var41.field1899 != 84 && var41.field1899 != 13); + + SoundSystem.Login_promptCredentials(true); + } + } + } + } + } + } + + } + } + } } - @ObfuscatedName("ab") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1768262837" + descriptor = "(ILdt;ZI)I", + garbageValue = "-983398043" ) - public static void method511() { - StructComposition.StructDefinition_cached.clear(); + static int method517(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3903) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == 3904) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == 3905) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == 3906) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == 3907) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == 3908) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; + } else { + int var12; + if (var0 == 3910) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; + return 1; + } else if (var0 == 3911) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; + return 1; + } else if (var0 == 3912) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; + return 1; + } else if (var0 == 3913) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; + return 1; + } else { + boolean var13; + if (var0 == 3914) { + var13 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class6.grandExchangeEvents != null) { + class6.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); + } + + return 1; + } else if (var0 == 3915) { + var13 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class6.grandExchangeEvents != null) { + class6.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); + } + + return 1; + } else if (var0 == 3916) { + DbTableType.Interpreter_intStackSize -= 2; + var13 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1] == 1; + if (class6.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; + class6.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); + } + + return 1; + } else if (var0 == 3917) { + var13 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class6.grandExchangeEvents != null) { + class6.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); + } + + return 1; + } else if (var0 == 3918) { + var13 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class6.grandExchangeEvents != null) { + class6.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); + } + + return 1; + } else if (var0 == 3919) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class6.grandExchangeEvents == null ? 0 : class6.grandExchangeEvents.events.size(); + return 1; + } else { + GrandExchangeEvent var11; + if (var0 == 3920) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var11.world; + return 1; + } else if (var0 == 3921) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var11.getOfferName(); + return 1; + } else if (var0 == 3922) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); + return 1; + } else if (var0 == 3923) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); + long var5 = SpotAnimationDefinition.method962() - class489.field3990 - var11.age; + int var7 = (int)(var5 / 3600000L); + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == 3924) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == 3925) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == 3926) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + return 1; + } else if (var0 == 3939) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).isTradable ? 1 : 0; + return 1; + } else { + return 2; + } + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/AddRequestTask.java b/osrs/src/main/java/AddRequestTask.java index 8721fcd0a..40b665a18 100644 --- a/osrs/src/main/java/AddRequestTask.java +++ b/osrs/src/main/java/AddRequestTask.java @@ -5,50 +5,46 @@ import java.util.Iterator; -@ObfuscatedName("pi") +@ObfuscatedName("pj") @Implements("AddRequestTask") public class AddRequestTask extends SongTask { - @ObfuscatedName("am") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; - @ObfuscatedSignature( - descriptor = "(Lqm;)V" + descriptor = "(Lql;)V" ) public AddRequestTask(SongTask var1) { super(var1); - super.field3753 = "AddRequestTask"; + super.field3756 = "AddRequestTask"; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-90" + descriptor = "(I)Z", + garbageValue = "-799935345" ) @Export("vmethod2142") public boolean vmethod2142() { - while (!class319.field2791.isEmpty()) { - MusicSong var1 = (MusicSong)class319.field2791.peek(); + while (!class316.field2790.isEmpty()) { + MusicSong var1 = (MusicSong)class316.field2790.peek(); if (var1 == null) { - class319.field2791.pop(); + class316.field2790.pop(); } else { - var1.midiPcmStream = this.method2154(); - class319.musicSongs.add(var1); - class319.field2791.pop(); + var1.midiPcmStream = this.method2142(); + class316.musicSongs.add(var1); + class316.field2790.pop(); } } return true; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Lmt;", - garbageValue = "4" + descriptor = "(I)Lmn;", + garbageValue = "1270029666" ) - MidiPcmStream method2154() { + MidiPcmStream method2142() { MidiPcmStream var1 = null; - Iterator var2 = class319.midiPcmStream.iterator(); + Iterator var2 = class316.midiPcmStream.iterator(); while (true) { MidiPcmStream var3; @@ -56,10 +52,10 @@ MidiPcmStream method2154() { do { if (!var2.hasNext()) { if (var1 != null) { - ++var1.field2833; - if (var1.method1662() == 0 && var1.isReady()) { + ++var1.field2830; + if (var1.method1653() == 0 && var1.isReady()) { var1.clear(); - var1.method1666(); + var1.method1657(); var1.setPcmStreamVolume(0); } } @@ -69,37 +65,9 @@ MidiPcmStream method2154() { var3 = (MidiPcmStream)var2.next(); } while(var3 == null); - } while(var1 != null && var1.field2833 <= var3.field2833 && (var3.method1662() != 0 || !var3.isReady())); + } while(var1 != null && var1.field2830 <= var3.field2830 && (var3.method1653() != 0 || !var3.isReady())); var1 = var3; } } - - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1457106589" - ) - static final void method2155() { - Scene.Scene_isLowDetail = false; - Client.isLowDetail = false; - } - - @ObfuscatedName("la") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "19136899" - ) - static final void method2156(int var0) { - if (var0 >= 0) { - int var1 = Client.menuArguments1[var0]; - int var2 = Client.menuArguments2[var0]; - int var3 = Client.menuOpcodes[var0]; - int var4 = Client.menuIdentifiers[var0]; - int var5 = Client.menuItemIds[var0]; - String var6 = Client.menuActions[var0]; - String var7 = Client.menuTargets[var0]; - class33.menuAction(var1, var2, var3, var4, var5, var6, var7, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/Animation.java b/osrs/src/main/java/Animation.java index 4bff3989b..b6f4e193f 100644 --- a/osrs/src/main/java/Animation.java +++ b/osrs/src/main/java/Animation.java @@ -3,51 +3,51 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("kr") @Implements("Animation") public class Animation { - @ObfuscatedName("ac") - static int[] field2009; - @ObfuscatedName("al") - static int[] field2011; - @ObfuscatedName("ak") - static int[] field2010; - @ObfuscatedName("ax") - static int[] field2012; + @ObfuscatedName("at") + static int[] field2183; + @ObfuscatedName("ah") + static int[] field2180; + @ObfuscatedName("ar") + static int[] field2182; @ObfuscatedName("ao") + static int[] field2181; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lkd;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("transformCount") int transformCount; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("transformXs") int[] transformXs; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("transformYs") int[] transformYs; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("transformZs") int[] transformZs; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field2009 = new int[500]; - field2011 = new int[500]; - field2010 = new int[500]; - field2012 = new int[500]; + field2183 = new int[500]; + field2180 = new int[500]; + field2182 = new int[500]; + field2181 = new int[500]; } @ObfuscatedSignature( - descriptor = "([BLju;)V" + descriptor = "([BLkd;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; @@ -69,38 +69,38 @@ public class Animation { if (this.skeleton.transformTypes[var8] != 0) { for (int var10 = var8 - 1; var10 > var6; --var10) { if (this.skeleton.transformTypes[var10] == 0) { - field2009[var7] = var10; - field2011[var7] = 0; - field2010[var7] = 0; - field2012[var7] = 0; + field2183[var7] = var10; + field2180[var7] = 0; + field2182[var7] = 0; + field2181[var7] = 0; ++var7; break; } } } - field2009[var7] = var8; + field2183[var7] = var8; short var11 = 0; if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } if ((var9 & 1) != 0) { - field2011[var7] = var4.readShortSmart(); + field2180[var7] = var4.readShortSmart(); } else { - field2011[var7] = var11; + field2180[var7] = var11; } if ((var9 & 2) != 0) { - field2010[var7] = var4.readShortSmart(); + field2182[var7] = var4.readShortSmart(); } else { - field2010[var7] = var11; + field2182[var7] = var11; } if ((var9 & 4) != 0) { - field2012[var7] = var4.readShortSmart(); + field2181[var7] = var4.readShortSmart(); } else { - field2012[var7] = var11; + field2181[var7] = var11; } var6 = var8; @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; for (var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = field2009[var8]; - this.transformXs[var8] = field2011[var8]; - this.transformYs[var8] = field2010[var8]; - this.transformZs[var8] = field2012[var8]; + this.transformSkeletonLabels[var8] = field2183[var8]; + this.transformXs[var8] = field2180[var8]; + this.transformYs[var8] = field2182[var8]; + this.transformZs[var8] = field2181[var8]; } } diff --git a/osrs/src/main/java/ApproximateRouteStrategy.java b/osrs/src/main/java/ApproximateRouteStrategy.java index acb04476a..6557aff4a 100644 --- a/osrs/src/main/java/ApproximateRouteStrategy.java +++ b/osrs/src/main/java/ApproximateRouteStrategy.java @@ -3,22 +3,506 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("cm") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("gc") - static int field359; + @ObfuscatedName("wd") + @Export("foundItemIndex") + static int foundItemIndex; ApproximateRouteStrategy() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIILih;B)Z", - garbageValue = "0" + descriptor = "(IIILiw;I)Z", + garbageValue = "729664573" ) @Export("hasArrived") protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Ldo;Ldt;IIB)V", + garbageValue = "113" + ) + @Export("runScriptLogic") + static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { + Object[] var4 = var0.args; + DbTableType.Interpreter_intStackSize = 0; + class127.Interpreter_stringStackSize = 0; + int var5 = -1; + int[] var6 = var1.opcodes; + int[] var7 = var1.intOperands; + byte var8 = -1; + Interpreter.Interpreter_frameDepth = 0; + Interpreter.field702 = false; + boolean var9 = false; + int var10 = 0; + boolean var29 = false; + + label860: { + label861: { + try { + int var13; + try { + var29 = true; + Interpreter.Interpreter_intLocals = new int[var1.localIntCount]; + int var11 = 0; + class60.Interpreter_stringLocals = new String[var1.localStringCount]; + int var12 = 0; + + int var14; + String var20; + for (var13 = 1; var13 < var4.length; ++var13) { + if (var4[var13] instanceof Integer) { + var14 = (Integer)var4[var13]; + if (var14 == -2147483647) { + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { + var14 = var0.widget != null ? var0.widget.id * 898987495 * 225496535 : -1; + } + + if (var14 == -2147483644) { + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { + var14 = var0.widget != null ? var0.widget.childIndex * 1774053999 * 355251343 : -1; + } + + if (var14 == -2147483642) { + var14 = var0.dragTarget != null ? var0.dragTarget.id * 898987495 * 225496535 : -1; + } + + if (var14 == -2147483641) { + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1774053999 * 355251343 : -1; + } + + if (var14 == -2147483640) { + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { + var14 = var0.keyPressed; + } + + Interpreter.Interpreter_intLocals[var11++] = var14; + } else if (var4[var13] instanceof String) { + var20 = (String)var4[var13]; + if (var20.equals("event_opbase")) { + var20 = var0.targetName; + } + + class60.Interpreter_stringLocals[var12++] = var20; + } + } + + Interpreter.field705 = var0.field871; + + label841: + while (true) { + ++var10; + if (var10 > var2) { + throw new RuntimeException(); + } + + ++var5; + int var32 = var6[var5]; + if (var32 >= 100) { + boolean var34; + if (var1.intOperands[var5] == 1) { + var34 = true; + } else { + var34 = false; + } + + var14 = class149.method779(var32, var1, var34); + switch(var14) { + case 0: + var29 = false; + break label841; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); + } + } else if (var32 == 0) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7[var5]; + } else if (var32 == 1) { + var13 = var7[var5]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; + } else if (var32 == 2) { + var13 = var7[var5]; + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Projectile.changeGameOptions(var13); + } else if (var32 == 3) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var1.stringOperands[var5]; + } else if (var32 == 6) { + var5 += var7[var5]; + } else if (var32 == 7) { + DbTableType.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 8) { + DbTableType.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 9) { + DbTableType.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 10) { + DbTableType.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 21) { + if (Interpreter.Interpreter_frameDepth == 0) { + var29 = false; + break label861; + } + + ScriptFrame var39 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; + var1 = var39.script; + var6 = var1.opcodes; + var7 = var1.intOperands; + var5 = var39.pc; + Interpreter.Interpreter_intLocals = var39.intLocals; + class60.Interpreter_stringLocals = var39.stringLocals; + } else if (var32 == 25) { + var13 = var7[var5]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = HealthBar.getVarbit(var13); + } else if (var32 == 27) { + var13 = var7[var5]; + ZoneOperation.method1632(var13, Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + } else if (var32 == 31) { + DbTableType.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 32) { + DbTableType.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]) { + var5 += var7[var5]; + } + } else if (var32 == 33) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var7[var5]]; + } else if (var32 == 34) { + Interpreter.Interpreter_intLocals[var7[var5]] = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + } else if (var32 == 35) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = class60.Interpreter_stringLocals[var7[var5]]; + } else if (var32 == 36) { + class60.Interpreter_stringLocals[var7[var5]] = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + } else if (var32 == 37) { + var13 = var7[var5]; + class127.Interpreter_stringStackSize -= var13; + var20 = BoundaryObject.method1600(Interpreter.Interpreter_stringStack, class127.Interpreter_stringStackSize, var13); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var20; + } else if (var32 == 38) { + --DbTableType.Interpreter_intStackSize; + } else if (var32 == 39) { + --class127.Interpreter_stringStackSize; + } else { + int var17; + if (var32 != 40) { + if (var32 == 42) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class176.varcs.getInt(var7[var5]); + } else if (var32 == 43) { + class176.varcs.setInt(var7[var5], Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + } else if (var32 == 44) { + var13 = var7[var5] >> 16; + var14 = var7[var5] & 65535; + int var23 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var23 < 0 || var23 > 5000) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrayLengths[var13] = var23; + byte var24 = -1; + if (var14 == 105) { + var24 = 0; + } + + for (var17 = 0; var17 < var23; ++var17) { + Interpreter.Interpreter_arrays[var13][var17] = var24; + } + } else if (var32 == 45) { + var13 = var7[var5]; + var14 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; + } else if (var32 == 46) { + var13 = var7[var5]; + DbTableType.Interpreter_intStackSize -= 2; + var14 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + } else { + String var21; + if (var32 == 47) { + var21 = class176.varcs.getStringOld(var7[var5]); + if (var21 == null) { + var21 = "null"; + } + + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var21; + } else if (var32 == 48) { + class176.varcs.setStringOld(var7[var5], Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]); + } else if (var32 == 49) { + var21 = class176.varcs.getString(var7[var5]); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var21; + } else if (var32 == 50) { + class176.varcs.setString(var7[var5], Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]); + } else if (var32 == 60) { + IterableNodeHashTable var37 = var1.switches[var7[var5]]; + IntegerNode var36 = (IntegerNode)var37.get((long)Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + if (var36 != null) { + var5 += var36.integer; + } + } else { + Integer var38; + if (var32 == 74) { + var38 = Timer.field3782.getTitleGroupValue(var7[var5]); + if (var38 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var38; + } + } else { + if (var32 != 76) { + throw new IllegalStateException(); + } + + var38 = Client.varclan.method2337(var7[var5]); + if (var38 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var38; + } + } + } + } + } else { + var13 = var7[var5]; + Script var35 = HealthBarUpdate.getScript(var13); + int[] var15 = new int[var35.localIntCount]; + String[] var16 = new String[var35.localStringCount]; + + for (var17 = 0; var17 < var35.intArgumentCount; ++var17) { + var15[var17] = Interpreter.Interpreter_intStack[var17 + (DbTableType.Interpreter_intStackSize - var35.intArgumentCount)]; + } + + for (var17 = 0; var17 < var35.stringArgumentCount; ++var17) { + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class127.Interpreter_stringStackSize - var35.stringArgumentCount)]; + } + + DbTableType.Interpreter_intStackSize -= var35.intArgumentCount; + class127.Interpreter_stringStackSize -= var35.stringArgumentCount; + ScriptFrame var22 = new ScriptFrame(); + var22.script = var1; + var22.pc = var5; + var22.intLocals = Interpreter.Interpreter_intLocals; + var22.stringLocals = class60.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; + var1 = var35; + var6 = var35.opcodes; + var7 = var35.intOperands; + var5 = -1; + Interpreter.Interpreter_intLocals = var15; + class60.Interpreter_stringLocals = var16; + } + } + } + } catch (Exception var30) { + var9 = true; + StringBuilder var26 = new StringBuilder(30); + var26.append("").append(var1.key).append(" "); + + for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { + var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + } + + var26.append("").append(var8); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace(var26.toString(), var30); + var29 = false; + break label860; + } + } finally { + if (var29) { + while (Interpreter.field712.size() > 0) { + class102 var19 = (class102)Interpreter.field712.remove(0); + FloorOverlayDefinition.widgetDefaultMenuAction(var19.method598(), var19.method599(), var19.method600(), var19.method601(), ""); + } + + if (Interpreter.field702) { + Interpreter.field702 = false; + class520.method2526(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.field823 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + } + } + + while (Interpreter.field712.size() > 0) { + class102 var33 = (class102)Interpreter.field712.remove(0); + FloorOverlayDefinition.widgetDefaultMenuAction(var33.method598(), var33.method599(), var33.method600(), var33.method601(), ""); + } + + if (Interpreter.field702) { + Interpreter.field702 = false; + class520.method2526(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.field823 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + return; + } + + while (Interpreter.field712.size() > 0) { + class102 var40 = (class102)Interpreter.field712.remove(0); + FloorOverlayDefinition.widgetDefaultMenuAction(var40.method598(), var40.method599(), var40.method600(), var40.method601(), ""); + } + + if (Interpreter.field702) { + Interpreter.field702 = false; + class520.method2526(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.field823 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + return; + } + + while (Interpreter.field712.size() > 0) { + class102 var25 = (class102)Interpreter.field712.remove(0); + FloorOverlayDefinition.widgetDefaultMenuAction(var25.method598(), var25.method599(), var25.method600(), var25.method601(), ""); + } + + if (Interpreter.field702) { + Interpreter.field702 = false; + class520.method2526(); + } + + if (!var9 && var3 > 0 && var10 >= var3) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.field823 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + } + + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "1367539098" + ) + static int method356(int var0, Script var1, boolean var2) { + int var3; + int var4; + int var6; + if (var0 == 3400) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + EnumComposition var5 = ObjectComposition.getEnum(var3); + if (var5.outputType != 's') { + } + + for (var6 = 0; var6 < var5.outputCount; ++var6) { + if (var4 == var5.keys[var6]) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var5.strVals[var6]; + var5 = null; + break; + } + } + + if (var5 != null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var5.defaultStr; + } + + return 1; + } else if (var0 != 3408) { + if (var0 == 3411) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + EnumComposition var10 = ObjectComposition.getEnum(var3); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var10.size(); + return 1; + } else { + return 2; + } + } else { + DbTableType.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + EnumComposition var7 = ObjectComposition.getEnum(var9); + if (var3 == var7.inputType && var4 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { + if (var6 == var7.keys[var8]) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7.intVals[var8]; + } + + var7 = null; + break; + } + } + + if (var7 != null) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7.defaultInt; + } + } + + return 1; + } else { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } + + @ObfuscatedName("iy") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2097312971" + ) + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; + } } \ No newline at end of file diff --git a/osrs/src/main/java/Archive.java b/osrs/src/main/java/Archive.java index 629add983..c74db0feb 100644 --- a/osrs/src/main/java/Archive.java +++ b/osrs/src/main/java/Archive.java @@ -5,98 +5,98 @@ import java.util.zip.CRC32; -@ObfuscatedName("ok") +@ObfuscatedName("oh") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lrw;" + descriptor = "Lrg;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lrw;" + descriptor = "Lrg;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("index") int index; - @ObfuscatedName("am") - volatile int field3560; - @ObfuscatedName("av") - boolean field3551; - @ObfuscatedName("ag") + @ObfuscatedName("al") + volatile int field3557; + @ObfuscatedName("az") + boolean field3548; + @ObfuscatedName("ap") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("indexCrc") int indexCrc; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("indexVersion") int indexVersion; - @ObfuscatedName("as") - int field3554; + @ObfuscatedName("ay") + int field3552; + @ObfuscatedName("ak") + boolean field3547; @ObfuscatedName("aj") - boolean field3549; - @ObfuscatedName("an") - boolean field3550; - @ObfuscatedName("au") + boolean field3546; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Loo;" + descriptor = "Loz;" ) - JagNetThread field3556; + JagNetThread field3553; static { Archive_crc = new CRC32(); } @ObfuscatedSignature( - descriptor = "(Lrw;Lrw;Loo;IZZZZZ)V" + descriptor = "(Lrg;Lrg;Loz;IZZZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, JagNetThread var3, int var4, boolean var5, boolean var6, boolean var7, boolean var8, boolean var9) { super(var5, var6); - this.field3560 = 0; - this.field3551 = false; - this.field3554 = -1; - this.field3549 = false; - this.field3550 = false; + this.field3557 = 0; + this.field3548 = false; + this.field3552 = -1; + this.field3547 = false; + this.field3546 = false; this.archiveDisk = var1; this.masterDisk = var2; this.index = var4; - this.field3551 = var7; - this.field3549 = var8; - this.field3550 = var9; - this.field3556 = var3; - this.field3556.method1963(this, this.index); + this.field3548 = var7; + this.field3547 = var8; + this.field3546 = var9; + this.field3553 = var3; + this.field3553.method1956(this, this.index); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "792420297" + garbageValue = "2141667286" ) - public boolean method1915() { - return this.field3560 == 1; + public boolean method1912() { + return this.field3557 == 1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-266993868" + garbageValue = "-2079566791" ) @Export("percentage") public int percentage() { - if (this.field3560 == 1 || this.field3549 && this.field3560 == 2) { + if (this.field3557 == 1 || this.field3547 && this.field3557 == 2) { return 100; } else if (super.groups != null) { return 99; } else { - int var1 = this.field3556.method1967(255, this.index); + int var1 = this.field3553.method1960(255, this.index); if (var1 >= 100) { var1 = 99; } @@ -105,20 +105,20 @@ public int percentage() { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1737906888" + garbageValue = "606874642" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - this.field3556.method1966(this.index, var1); + this.field3553.method1959(this.index, var1); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "11" + descriptor = "(II)V", + garbageValue = "-412384319" ) @Export("loadGroup") void loadGroup(int var1) { @@ -127,7 +127,7 @@ void loadGroup(int var1) { byte[] var4 = null; synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { + if ((long)var1 == var6.key && var2 == var6.archiveDisk && var6.type == 0) { var4 = var6.data; break; } @@ -141,18 +141,18 @@ void loadGroup(int var1) { this.load(var2, var1, var5, true); } } else { - this.field3556.method1965(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + this.field3553.method1958(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1649823621" + garbageValue = "152861270" ) - void method1919() { - this.field3560 = 2; + void method1916() { + this.field3557 = 2; super.groupIds = new int[0]; super.groupCrcs = new int[0]; super.groupVersions = new int[0]; @@ -162,10 +162,10 @@ void method1919() { super.files = new Object[0][]; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-5167" + descriptor = "(III)V", + garbageValue = "949324306" ) @Export("loadIndex") void loadIndex(int var1, int var2) { @@ -177,7 +177,7 @@ void loadIndex(int var1, int var2) { byte[] var6 = null; synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { + if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { var6 = var8.data; break; } @@ -191,25 +191,25 @@ void loadIndex(int var1, int var2) { this.load(var4, var3, var7, true); } } else { - this.field3556.method1965(this, 255, this.index, this.indexCrc, (byte)0, true); + this.field3553.method1958(this, 255, this.index, this.indexCrc, (byte)0, true); } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I[BZZS)V", - garbageValue = "-22741" + descriptor = "(I[BZZI)V", + garbageValue = "1611170598" ) @Export("write") void write(int var1, byte[] var2, boolean var3, boolean var4) { if (var3) { - if (this.field3560 == 1) { + if (this.field3557 == 1) { throw new RuntimeException(); } if (this.masterDisk != null) { - WorldMapCacheName.method1592(this.index, var2, this.masterDisk); + CollisionMap.method1134(this.index, var2, this.masterDisk); } this.decodeIndex(var2); @@ -218,117 +218,100 @@ void write(int var1, byte[] var2, boolean var3, boolean var4) { var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); var2[var2.length - 1] = (byte)super.groupVersions[var1]; if (this.archiveDisk != null) { - WorldMapCacheName.method1592(var1, var2, this.archiveDisk); + CollisionMap.method1134(var1, var2, this.archiveDisk); this.validGroups[var1] = true; } if (var4) { - Object[] var5 = super.groups; - Object var7; - if (var2 == null) { - var7 = null; - } else if (var2.length > 136) { - DirectByteArrayCopier var8 = new DirectByteArrayCopier(); - var8.set(var2); - var7 = var8; - } else { - var7 = var2; - } - - var5[var1] = var7; + super.groups[var1] = VarcInt.method899(var2, false); } } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lrw;I[BZB)V", - garbageValue = "61" + descriptor = "(Lrg;I[BZB)V", + garbageValue = "0" ) @Export("load") - void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; if (var1 == this.masterDisk) { - if (this.field3560 == 1) { + if (this.field3557 == 1) { throw new RuntimeException(); - } else if (var3 == null) { - this.field3556.method1965(this, 255, this.index, this.indexCrc, (byte)0, true); - } else { - Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length); - var5 = (int)Archive_crc.getValue(); - if (var5 != this.indexCrc) { - this.field3556.method1965(this, 255, this.index, this.indexCrc, (byte)0, true); - } else { - Buffer var6 = new Buffer(class372.decompressBytes(var3)); - int var7 = var6.readUnsignedByte(); - if (var7 != 5 && var7 != 6) { - throw new RuntimeException(var7 + "," + this.index + "," + var2); - } else { - int var8 = 0; - if (var7 >= 6) { - var8 = var6.readInt(); - } + } - if (var8 != this.indexVersion) { - this.field3556.method1965(this, 255, this.index, this.indexCrc, (byte)0, true); - } else { - this.decodeIndex(var3); - this.loadAllLocal(); - } - } - } + if (var3 == null) { + this.field3553.method1958(this, 255, this.index, this.indexCrc, (byte)0, true); + return; } - } else { - if (!var4 && var2 == this.field3554) { - this.field3560 = 1; + + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length); + var5 = (int)Archive_crc.getValue(); + if (var5 != this.indexCrc) { + this.field3553.method1958(this, 255, this.index, this.indexCrc, (byte)0, true); + return; } - if (var3 != null && var3.length > 2) { - Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length - 2); - var5 = (int)Archive_crc.getValue(); - int var11 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); - if (var5 == super.groupCrcs[var2] && var11 == super.groupVersions[var2]) { - this.validGroups[var2] = true; - if (var4) { - Object[] var12 = super.groups; - Object var9; - if (var3 == null) { - var9 = null; - } else if (var3.length > 136) { - DirectByteArrayCopier var10 = new DirectByteArrayCopier(); - var10.set(var3); - var9 = var10; - } else { - var9 = var3; - } + Buffer var6 = new Buffer(class30.decompressBytes(var3)); + int var7 = var6.readUnsignedByte(); + if (var7 != 5 && var7 != 6) { + throw new RuntimeException(var7 + "," + this.index + "," + var2); + } - var12[var2] = var9; - } + int var8 = 0; + if (var7 >= 6) { + var8 = var6.readInt(); + } - } else { - this.validGroups[var2] = false; - if (this.field3551 || var4) { - this.field3556.method1965(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } + if (var8 != this.indexVersion) { + this.field3553.method1958(this, 255, this.index, this.indexCrc, (byte)0, true); + return; + } + this.decodeIndex(var3); + this.loadAllLocal(); + } else { + if (!var4 && var2 == this.field3552) { + this.field3557 = 1; + } + + if (var3 == null || var3.length <= 2) { + this.validGroups[var2] = false; + if (this.field3548 || var4) { + this.field3553.method1958(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - } else { + + return; + } + + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length - 2); + var5 = (int)Archive_crc.getValue(); + int var9 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); + if (var5 != super.groupCrcs[var2] || var9 != super.groupVersions[var2]) { this.validGroups[var2] = false; - if (this.field3551 || var4) { - this.field3556.method1965(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3548 || var4) { + this.field3553.method1958(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } + return; + } + + this.validGroups[var2] = true; + if (var4) { + super.groups[var2] = VarcInt.method899(var3, false); } } + } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-527981427" + garbageValue = "-65241547" ) @Export("loadAllLocal") void loadAllLocal() { @@ -340,60 +323,81 @@ void loadAllLocal() { } if (this.archiveDisk == null) { - this.field3560 = 1; + this.field3557 = 1; } else { - this.field3554 = -1; + this.field3552 = -1; for (var1 = 0; var1 < this.validGroups.length; ++var1) { if (super.fileCounts[var1] > 0) { - SecureRandomFuture.method444(var1, this.archiveDisk, this); - this.field3554 = var1; + ArchiveDisk var2 = this.archiveDisk; + ArchiveDiskAction var4 = new ArchiveDiskAction(); + var4.type = 1; + var4.key = (long)var1; + var4.archiveDisk = var2; + var4.archive = this; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); + } + + synchronized(ArchiveDiskActionHandler.field3543) { + if (ArchiveDiskActionHandler.field3542 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3542 = 600; + ArchiveDiskActionHandler.field3541 = false; + } + + this.field3552 = var1; } } - if (this.field3554 == -1) { - this.field3560 = 1; + if (this.field3552 == -1) { + this.field3557 = 1; } } } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "177421131" + garbageValue = "-788412100" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { if (super.groups[var1] != null) { return 100; } else { - return this.validGroups[var1] ? 100 : this.field3556.method1967(this.index, var1); + return this.validGroups[var1] ? 100 : this.field3553.method1960(this.index, var1); } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1483404371" + garbageValue = "1250672154" ) - public boolean method1926(int var1) { + public boolean method1922(int var1) { return this.validGroups[var1]; } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "-109" + garbageValue = "48" ) - public boolean method1927(int var1) { + public boolean method1923(int var1) { return this.getGroupFileIds(var1) != null; } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "115" + descriptor = "(I)I", + garbageValue = "939033209" ) @Export("loadPercent") public int loadPercent() { @@ -415,43 +419,4 @@ public int loadPercent() { return var3; } } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lom;Lom;B)I", - garbageValue = "8" - ) - static int method1922(AbstractArchive var0, AbstractArchive var1) { - int var2 = 0; - String[] var3 = Login.field769; - - int var4; - String var5; - for (var4 = 0; var4 < var3.length; ++var4) { - var5 = var3[var4]; - if (var0.tryLoadFileByNames(var5, "")) { - ++var2; - } - } - - var3 = Login.field767; - - for (var4 = 0; var4 < var3.length; ++var4) { - var5 = var3[var4]; - if (var1.tryLoadFileByNames(var5, "")) { - ++var2; - } - } - - var3 = Login.field768; - - for (var4 = 0; var4 < var3.length; ++var4) { - var5 = var3[var4]; - if (var1.getGroupId(var5) != -1 && var1.tryLoadFileByNames(var5, "")) { - ++var2; - } - } - - return var2; - } } \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveDisk.java b/osrs/src/main/java/ArchiveDisk.java index 1205c854f..a506b0ca5 100644 --- a/osrs/src/main/java/ArchiveDisk.java +++ b/osrs/src/main/java/ArchiveDisk.java @@ -6,28 +6,28 @@ import java.io.EOFException; import java.io.IOException; -@ObfuscatedName("rw") +@ObfuscatedName("rg") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Ltl;" + descriptor = "Ltr;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ltl;" + descriptor = "Ltr;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("archive") int archive; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("maxEntrySize") int maxEntrySize; @@ -36,7 +36,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - descriptor = "(ILtl;Ltl;I)V" + descriptor = "(ILtr;Ltr;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; @@ -48,10 +48,10 @@ public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.maxEntrySize = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "896649257" + descriptor = "(IB)[B", + garbageValue = "1" ) @Export("read") public byte[] read(int var1) { @@ -83,7 +83,7 @@ public byte[] read(int var1) { return (byte[])var10000; } - this.datFile.seek((long)var4 * 520L); + this.datFile.seek(520L * (long)var4); int var8 = var3 - var6; int var9; int var10; @@ -96,7 +96,7 @@ public byte[] read(int var1) { } var13 = 10; - this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); @@ -116,7 +116,7 @@ public byte[] read(int var1) { if (var9 == var1 && var7 == var10 && var12 == this.archive) { if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { - int var14 = var13 + var8; + int var14 = var8 + var13; for (int var15 = var13; var15 < var14; ++var15) { var5[var6++] = ArchiveDisk_buffer[var15]; @@ -148,10 +148,10 @@ public byte[] read(int var1) { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I[BII)Z", - garbageValue = "-473377734" + garbageValue = "-1602122838" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -169,10 +169,10 @@ public boolean write(int var1, byte[] var2, int var3) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I[BIZI)Z", - garbageValue = "1363704518" + descriptor = "(I[BIZB)Z", + garbageValue = "-47" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -282,7 +282,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) { ArchiveDisk_buffer[7] = (byte)(var9 >> 8); ArchiveDisk_buffer[8] = (byte)var9; ArchiveDisk_buffer[9] = (byte)this.archive; - this.datFile.seek(520L * (long)var6); + this.datFile.seek((long)var6 * 520L); this.datFile.write(ArchiveDisk_buffer, 0, 10); var10 = var3 - var7; if (var10 > 510) { @@ -304,7 +304,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) { ArchiveDisk_buffer[5] = (byte)(var9 >> 8); ArchiveDisk_buffer[6] = (byte)var9; ArchiveDisk_buffer[7] = (byte)this.archive; - this.datFile.seek(520L * (long)var6); + this.datFile.seek((long)var6 * 520L); this.datFile.write(ArchiveDisk_buffer, 0, 8); var10 = var3 - var7; if (var10 > 512) { @@ -335,91 +335,4 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) { public String toString() { return "" + this.archive; } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Ldl;III)V", - garbageValue = "168519800" - ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; - Script var4; - if (SongTask.isWorldMapEvent(var0.type)) { - class230.worldMapEvent = (WorldMapEvent)var3[0]; - WorldMapElement var5 = class148.WorldMapElement_get(class230.worldMapEvent.mapElement); - var4 = class31.getWorldMapScript(var0.type, var5.objectId, var5.category); - } else { - int var6 = (Integer)var3[0]; - var4 = class28.getScript(var6); - } - - if (var4 != null) { - class158.runScriptLogic(var0, var4, var1, var2); - } - - } - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "125" - ) - public static int method2309(byte[] var0, int var1, int var2) { - int var3 = -1; - - for (int var4 = var1; var4 < var2; ++var4) { - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; - } - - var3 = ~var3; - return var3; - } - - @ObfuscatedName("nb") - @ObfuscatedSignature( - descriptor = "(Lde;ZI)V", - garbageValue = "-1659889087" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1) { - class33.widgetDefinition.method1743(var2); - } - - class379.method1983(var2); - Widget var4 = class33.widgetDefinition.method1740(var3); - if (var4 != null) { - ClanChannelMember.invalidateWidget(var4); - } - - if (Client.rootInterface != -1) { - Interpreter.runIntfCloseListener(Client.rootInterface, 1); - } - - } - - @ObfuscatedName("nr") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-54268811" - ) - static final void method2314(int var0, int var1) { - ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : ClanChannelMember.guestClanChannel; - if (var2 != null && var1 >= 0 && var1 < var2.method868()) { - ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); - if (var3.rank == -1) { - String var4 = var3.username.getName(); - PacketBufferNode var5 = ClanChannelMember.getPacketBufferNode(ClientPacket.f65, Client.packetWriter.isaacCipher); - var5.packetBuffer.writeByte(3 + class478.stringCp1252NullTerminatedByteSize(var4)); - var5.packetBuffer.writeByte(var0); - var5.packetBuffer.writeShort(var1); - var5.packetBuffer.writeStringCp1252NullTerminated(var4); - Client.packetWriter.addNode(var5); - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveDiskAction.java b/osrs/src/main/java/ArchiveDiskAction.java index a3ec2df0a..5ca941151 100644 --- a/osrs/src/main/java/ArchiveDiskAction.java +++ b/osrs/src/main/java/ArchiveDiskAction.java @@ -3,33 +3,319 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oe") +import java.util.Date; + +@ObfuscatedName("or") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("fu") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Liu;" ) - static Archive field3538; - @ObfuscatedName("ac") + @Export("clock") + static Clock clock; + @ObfuscatedName("at") @Export("type") int type; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("data") - byte[] data; - @ObfuscatedName("ak") + public byte[] data; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lrw;" + descriptor = "Lrg;" ) @Export("archiveDisk") - ArchiveDisk archiveDisk; - @ObfuscatedName("ax") + public ArchiveDisk archiveDisk; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Loh;" ) @Export("archive") - Archive archive; + public Archive archive; ArchiveDiskAction() { } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(ILdt;ZB)I", + garbageValue = "20" + ) + static int method1909(int var0, Script var1, boolean var2) { + String var3; + int var4; + if (var0 == 4100) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3 + var4; + return 1; + } else { + String var9; + if (var0 == 4101) { + class127.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } else if (var0 == 4102) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3 + SceneTilePaint.intToString(var4, true); + return 1; + } else if (var0 == 4103) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } else { + int var6; + int var10; + if (var0 == 4104) { + var10 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + long var11 = (11745L + (long)var10) * 86400000L; + Interpreter.Interpreter_calendar.setTime(new Date(var11)); + var6 = Interpreter.Interpreter_calendar.get(5); + int var17 = Interpreter.Interpreter_calendar.get(2); + int var8 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; + return 1; + } else if (var0 != 4105) { + if (var0 == 4106) { + var10 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == 4107) { + class127.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.method1970(class189.compareStrings(Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize + 1], class85.clientLanguage)); + return 1; + } else { + int var5; + byte[] var13; + Font var14; + if (var0 == 4108) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + DbTableType.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var13 = VarbitComposition.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + return 1; + } else if (var0 == 4109) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + DbTableType.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var13 = VarbitComposition.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + return 1; + } else if (var0 == 4110) { + class127.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var9; + } + + return 1; + } else if (var0 == 4111) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == 4112) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3 + (char)var4; + return 1; + } else if (var0 == 4113) { + var10 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapElement.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4114) { + var10 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = KeyHandler.isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4115) { + var10 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class10.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4116) { + var10 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Player.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == 4117) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 4118) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + DbTableType.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); + return 1; + } else if (var0 == 4119) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + StringBuilder var18 = new StringBuilder(var3.length()); + boolean var16 = false; + + for (var6 = 0; var6 < var3.length(); ++var6) { + char var7 = var3.charAt(var6); + if (var7 == '<') { + var16 = true; + } else if (var7 == '>') { + var16 = false; + } else if (!var16) { + var18.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var18.toString(); + return 1; + } else if (var0 == 4120) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.indexOf(var4); + return 1; + } else if (var0 == 4121) { + class127.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + return 1; + } else if (var0 == 4122) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } else if (var0 == 4123) { + class127.Interpreter_stringStackSize -= 3; + var3 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize + 1]; + String var15 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize + 2]; + if (class229.localPlayer.appearance == null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var15; + return 1; + } else { + switch(class229.localPlayer.appearance.field2948) { + case 0: + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3; + break; + case 1: + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var9; + break; + case 2: + default: + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var15; + } + + return 1; + } + } else { + return 2; + } + } + } else { + class127.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize + 1]; + if (class229.localPlayer.appearance != null && class229.localPlayer.appearance.field2947 != 0) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var9; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3; + } + + return 1; + } + } + } + } + + @ObfuscatedName("lr") + @ObfuscatedSignature( + descriptor = "(Lds;IIIB)V", + garbageValue = "0" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (class229.localPlayer != var0) { + if (Client.menuOptionsCount < 400) { + String var4; + if (var0.skillLevel == 0) { + var4 = var0.actions[0] + var0.username + var0.actions[1] + class28.method126(var0.combatLevel, class229.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; + } + + int var5; + if (Client.isItemSelected == 1) { + WorldMapSectionType.insertMenuItemNoShift("Use", Client.field597 + " " + "->" + " " + class167.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((UrlRequest.field1182 & 8) == 8) { + WorldMapSectionType.insertMenuItemNoShift(Client.field599, Client.field598 + " " + "->" + " " + class167.colorStartTag(16777215) + var4, 15, var1, var2, var3); + } + } else { + for (var5 = 7; var5 >= 0; --var5) { + if (Client.playerMenuActions[var5] != null) { + short var6 = 0; + if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { + continue; + } + + if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > class229.localPlayer.combatLevel) { + var6 = 2000; + } + + if (class229.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == class229.localPlayer.team) { + var6 = 2000; + } else { + var6 = 0; + } + } else if (Client.playerAttackOption == AttackOption.field1103 && var0.isClanMember()) { + var6 = 2000; + } + } else if (Client.playerOptionsPriorities[var5]) { + var6 = 2000; + } + + boolean var7 = false; + int var8 = Client.playerMenuOpcodes[var5] + var6; + WorldMapSectionType.insertMenuItemNoShift(Client.playerMenuActions[var5], class167.colorStartTag(16777215) + var4, var8, var1, var2, var3); + } + } + } + + for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (Client.menuOpcodes[var5] == 23) { + Client.menuTargets[var5] = class167.colorStartTag(16777215) + var4; + break; + } + } + + } + } + } + + @ObfuscatedName("mu") + @ObfuscatedSignature( + descriptor = "(Lnn;I)Lnn;", + garbageValue = "725672133" + ) + static Widget method1911(Widget var0) { + Widget var1 = class227.method1165(var0); + if (var1 == null) { + var1 = var0.parent; + } + + return var1; + } } \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveDiskActionHandler.java b/osrs/src/main/java/ArchiveDiskActionHandler.java index 491ed6d06..9b57e938e 100644 --- a/osrs/src/main/java/ArchiveDiskActionHandler.java +++ b/osrs/src/main/java/ArchiveDiskActionHandler.java @@ -3,34 +3,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ob") +@ObfuscatedName("ox") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("ArchiveDiskActionHandler_requestQueue") - static final NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("al") + public static final NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("ArchiveDiskActionHandler_responseQueue") - static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("ak") - static int field3544; - @ObfuscatedName("ax") - static boolean field3543; + public static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("ar") + static int field3542; @ObfuscatedName("ao") - static Object field3545; + static boolean field3541; + @ObfuscatedName("ab") + static Object field3543; + @ObfuscatedName("au") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3544 = 0; - field3543 = false; - field3545 = new Object(); + field3542 = 0; + field3541 = false; + field3543 = new Object(); } ArchiveDiskActionHandler() { @@ -59,263 +62,30 @@ public void run() { } } - synchronized(field3545) { - if ((field3543 || field3544 <= 1) && ArchiveDiskActionHandler_requestQueue.method2028()) { - field3544 = 0; - field3545.notifyAll(); + synchronized(field3543) { + if ((field3541 || field3542 <= 1) && ArchiveDiskActionHandler_requestQueue.method2016()) { + field3542 = 0; + field3543.notifyAll(); return; } - field3544 = 600; + field3542 = 600; } } else { - Players.method623(100L); - synchronized(field3545) { - if ((field3543 || field3544 <= 1) && ArchiveDiskActionHandler_requestQueue.method2028()) { - field3544 = 0; - field3545.notifyAll(); + class219.method1104(100L); + synchronized(field3543) { + if ((field3541 || field3542 <= 1) && ArchiveDiskActionHandler_requestQueue.method2016()) { + field3542 = 0; + field3543.notifyAll(); return; } - --field3544; + --field3542; } } } } catch (Exception var13) { - class190.RunException_sendStackTrace((String)null, var13); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var13); } } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(Lpu;Lpu;I)V", - garbageValue = "2109842428" - ) - static void method1914(Font var0, Font var1) { - if (SecureRandomCallable.worldSelectBackSprites == null) { - SecureRandomCallable.worldSelectBackSprites = PacketWriter.method646(class199.archive8, "sl_back", ""); - } - - if (PendingSpawn.worldSelectFlagSprites == null) { - PendingSpawn.worldSelectFlagSprites = InvDefinition.method953(class199.archive8, "sl_flags", ""); - } - - if (ModelData0.worldSelectArrows == null) { - ModelData0.worldSelectArrows = InvDefinition.method953(class199.archive8, "sl_arrows", ""); - } - - if (TaskHandler.worldSelectStars == null) { - TaskHandler.worldSelectStars = InvDefinition.method953(class199.archive8, "sl_stars", ""); - } - - if (class372.worldSelectLeftSprite == null) { - class372.worldSelectLeftSprite = class167.SpriteBuffer_getIndexedSpriteByName(class199.archive8, "leftarrow", ""); - } - - if (class230.worldSelectRightSprite == null) { - class230.worldSelectRightSprite = class167.SpriteBuffer_getIndexedSpriteByName(class199.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); - if (TaskHandler.worldSelectStars != null) { - TaskHandler.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - TaskHandler.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - int var4; - int var5; - if (ModelData0.worldSelectArrows != null) { - int var2 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - ModelData0.worldSelectArrows[2].drawAt(var2, 4); - } else { - ModelData0.worldSelectArrows[0].drawAt(var2, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - ModelData0.worldSelectArrows[3].drawAt(var2 + 15, 4); - } else { - ModelData0.worldSelectArrows[1].drawAt(var2 + 15, 4); - } - - var0.draw("World", var2 + 32, 17, 16777215, -1); - int var3 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - ModelData0.worldSelectArrows[2].drawAt(var3, 4); - } else { - ModelData0.worldSelectArrows[0].drawAt(var3, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - ModelData0.worldSelectArrows[3].drawAt(var3 + 15, 4); - } else { - ModelData0.worldSelectArrows[1].drawAt(var3 + 15, 4); - } - - var0.draw("Players", var3 + 32, 17, 16777215, -1); - var4 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - ModelData0.worldSelectArrows[2].drawAt(var4, 4); - } else { - ModelData0.worldSelectArrows[0].drawAt(var4, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - ModelData0.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - ModelData0.worldSelectArrows[1].drawAt(var4 + 15, 4); - } - - var0.draw("Location", var4 + 32, 17, 16777215, -1); - var5 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - ModelData0.worldSelectArrows[2].drawAt(var5, 4); - } else { - ModelData0.worldSelectArrows[0].drawAt(var5, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - ModelData0.worldSelectArrows[3].drawAt(var5 + 15, 4); - } else { - ModelData0.worldSelectArrows[1].drawAt(var5 + 15, 4); - } - - var0.draw("Type", var5 + 32, 17, 16777215, -1); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); - Login.hoveredWorldIndex = -1; - if (SecureRandomCallable.worldSelectBackSprites != null) { - byte var23 = 88; - byte var24 = 19; - var4 = 765 / (var23 + 1) - 1; - var5 = 480 / (var24 + 1); - - int var6; - int var7; - do { - var6 = var5; - var7 = var4; - if (var5 * (var4 - 1) >= World.World_count) { - --var4; - } - - if (var4 * (var5 - 1) >= World.World_count) { - --var5; - } - - if (var4 * (var5 - 1) >= World.World_count) { - --var5; - } - } while(var6 != var5 || var7 != var4); - - var6 = (765 - var23 * var4) / (var4 + 1); - if (var6 > 5) { - var6 = 5; - } - - var7 = (480 - var5 * var24) / (var5 + 1); - if (var7 > 5) { - var7 = 5; - } - - int var8 = (765 - var23 * var4 - var6 * (var4 - 1)) / 2; - int var9 = (480 - var24 * var5 - var7 * (var5 - 1)) / 2; - int var10 = (var5 + World.World_count - 1) / var5; - Login.worldSelectPagesCount = var10 - var4; - if (class372.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - class372.worldSelectLeftSprite.drawAt(8, class491.canvasHeight / 2 - class372.worldSelectLeftSprite.subHeight / 2); - } - - if (class230.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - class230.worldSelectRightSprite.drawAt(class340.canvasWidth - class230.worldSelectRightSprite.subWidth - 8, class491.canvasHeight / 2 - class230.worldSelectRightSprite.subHeight / 2); - } - - int var11 = var9 + 23; - int var12 = var8 + Login.xPadding; - int var13 = 0; - boolean var14 = false; - int var15 = Login.worldSelectPage; - - int var16; - for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { - World var17 = UserComparator3.World_worlds[var16]; - boolean var18 = true; - String var19 = Integer.toString(var17.population); - if (var17.population == -1) { - var19 = "OFF"; - var18 = false; - } else if (var17.population > 1980) { - var19 = "FULL"; - var18 = false; - } - - class110 var20 = null; - int var21 = 0; - if (var17.isBeta()) { - var20 = var17.isMembersOnly() ? class110.field1122 : class110.field1132; - } else if (var17.isDeadman()) { - var20 = var17.isMembersOnly() ? class110.field1126 : class110.field1133; - } else if (var17.method393()) { - var21 = 16711680; - var20 = var17.isMembersOnly() ? class110.field1125 : class110.field1130; - } else if (var17.method395()) { - var20 = var17.isMembersOnly() ? class110.field1134 : class110.field1129; - } else if (var17.isPvp()) { - var20 = var17.isMembersOnly() ? class110.field1135 : class110.field1127; - } else if (var17.method396()) { - var20 = var17.isMembersOnly() ? class110.field1121 : class110.field1124; - } else if (var17.method397()) { - var20 = var17.isMembersOnly() ? class110.field1136 : class110.field1131; - } - - if (var20 == null || var20.field1137 >= SecureRandomCallable.worldSelectBackSprites.length) { - var20 = var17.isMembersOnly() ? class110.field1128 : class110.field1123; - } - - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var23 && MouseHandler.MouseHandler_y < var11 + var24 && var18) { - Login.hoveredWorldIndex = var16; - SecureRandomCallable.worldSelectBackSprites[var20.field1137].drawTransOverlayAt(var12, var11, 128, 16777215); - var14 = true; - } else { - SecureRandomCallable.worldSelectBackSprites[var20.field1137].drawAt(var12, var11); - } - - if (PendingSpawn.worldSelectFlagSprites != null) { - PendingSpawn.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); - } - - var0.drawCentered(Integer.toString(var17.id), var12 + 15, var24 / 2 + var11 + 5, var21, -1); - var1.drawCentered(var19, var12 + 60, var24 / 2 + var11 + 5, 268435455, -1); - var11 = var11 + var24 + var7; - ++var13; - if (var13 >= var5) { - var11 = var9 + 23; - var12 = var12 + var23 + var6; - var13 = 0; - ++var15; - } - } - - if (var14) { - var16 = var1.stringWidth(UserComparator3.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var22 = var1.ascent + 8; - int var25 = MouseHandler.MouseHandler_y + 25; - if (var25 + var22 > 480) { - var25 = MouseHandler.MouseHandler_y - 25 - var22; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var22, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var22, 0); - var1.drawCentered(UserComparator3.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); - } - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/ArchiveLoader.java b/osrs/src/main/java/ArchiveLoader.java index 82ad21852..f55366fa1 100644 --- a/osrs/src/main/java/ArchiveLoader.java +++ b/osrs/src/main/java/ArchiveLoader.java @@ -3,24 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dn") +@ObfuscatedName("dh") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Loh;" ) @Export("archive") final Archive archive; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("groupCount") final int groupCount; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Lok;Ljava/lang/String;)V" + descriptor = "(Loh;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -28,21 +28,102 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1549334673" + garbageValue = "2136927523" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method1927(var1) || this.archive.method1926(var1)) { + if (!this.archive.method1923(var1) || this.archive.method1922(var1)) { ++this.loadedCount; } } return this.loadedCount >= this.groupCount; } + + @ObfuscatedName("at") + public static final int method459(double var0, double var2, double var4) { + double var6 = var4; + double var8 = var4; + double var10 = var4; + if (0.0D != var2) { + double var12; + if (var4 < 0.5D) { + var12 = (var2 + 1.0D) * var4; + } else { + var12 = var2 + var4 - var2 * var4; + } + + double var14 = 2.0D * var4 - var12; + double var16 = var0 + 0.3333333333333333D; + if (var16 > 1.0D) { + --var16; + } + + double var20 = var0 - 0.3333333333333333D; + if (var20 < 0.0D) { + ++var20; + } + + if (6.0D * var16 < 1.0D) { + var6 = (var12 - var14) * 6.0D * var16 + var14; + } else if (var16 * 2.0D < 1.0D) { + var6 = var12; + } else if (3.0D * var16 < 2.0D) { + var6 = 6.0D * (0.6666666666666666D - var16) * (var12 - var14) + var14; + } else { + var6 = var14; + } + + if (6.0D * var0 < 1.0D) { + var8 = var14 + 6.0D * (var12 - var14) * var0; + } else if (var0 * 2.0D < 1.0D) { + var8 = var12; + } else if (var0 * 3.0D < 2.0D) { + var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; + } else { + var8 = var14; + } + + if (6.0D * var20 < 1.0D) { + var10 = var14 + var20 * 6.0D * (var12 - var14); + } else if (2.0D * var20 < 1.0D) { + var10 = var12; + } else if (var20 * 3.0D < 2.0D) { + var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14); + } else { + var10 = var14; + } + } + + int var22 = (int)(var6 * 256.0D); + int var13 = (int)(var8 * 256.0D); + int var23 = (int)(var10 * 256.0D); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "2035865306" + ) + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + if (var4 == null) { + var4 = new ChatChannel(); + Messages.Messages_channels.put(var0, var4); + } + + Message var5 = var4.addMessage(var0, var1, var2, var3); + Messages.Messages_hashTable.put(var5, (long)var5.count); + Messages.Messages_queue.add(var5); + Client.chatCycle = Client.cycleCntr; + } } \ No newline at end of file diff --git a/osrs/src/main/java/AttackOption.java b/osrs/src/main/java/AttackOption.java index 61120d049..09e809412 100644 --- a/osrs/src/main/java/AttackOption.java +++ b/osrs/src/main/java/AttackOption.java @@ -3,41 +3,39 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") +@ObfuscatedName("dy") @Implements("AttackOption") -public enum AttackOption implements class386 { - @ObfuscatedName("ac") +public enum AttackOption implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Ldy;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Ldy;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Ldy;" ) - field1100(2), - @ObfuscatedName("ax") + field1106(2), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Ldy;" ) @Export("AttackOption_hidden") AttackOption_hidden(3), - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Ldy;" ) - field1102(4); + field1103(4); - @ObfuscatedName("il") - static long field1098; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("id") final int id; @@ -45,46 +43,32 @@ public enum AttackOption implements class386 { this.id = var3; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Ltp;III)I", - garbageValue = "1550710334" - ) - static int method607(IterableNodeHashTable var0, int var1, int var2) { - if (var0 == null) { - return var2; - } else { - IntegerNode var3 = (IntegerNode)var0.get((long)var1); - return var3 == null ? var2 : var3.integer; - } - } - - @ObfuscatedName("al") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "1281251233" + descriptor = "(B)V", + garbageValue = "-99" ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - return class135.method728(var0, 10, true); + public static void method606() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); + HealthBarDefinition.ItemDefinition_cachedModels.clear(); } - @ObfuscatedName("lv") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-860429671" + descriptor = "(B)V", + garbageValue = "3" ) - static final int method609() { - return Client.menuOptionsCount - 1; + static final void method607() { + WorldMapArea.method1213("Your friend list is full. Max of 200 for free users, and 400 for members"); } } \ No newline at end of file diff --git a/osrs/src/main/java/AudioFilter.java b/osrs/src/main/java/AudioFilter.java index c57cde813..e6312e109 100644 --- a/osrs/src/main/java/AudioFilter.java +++ b/osrs/src/main/java/AudioFilter.java @@ -3,154 +3,154 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("ci") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("ah") - static float[][] field298; - @ObfuscatedName("ar") + @ObfuscatedName("au") + static float[][] field295; + @ObfuscatedName("aa") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("ab") - static float field297; - @ObfuscatedName("am") + @ObfuscatedName("ac") + static float field294; + @ObfuscatedName("al") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("pairs") int[] pairs; - @ObfuscatedName("ak") - int[][][] field303; - @ObfuscatedName("ax") - int[][][] field304; + @ObfuscatedName("ar") + int[][][] field301; @ObfuscatedName("ao") - int[] field302; + int[][][] field300; + @ObfuscatedName("ab") + int[] field298; static { - field298 = new float[2][8]; + field295 = new float[2][8]; coefficients = new int[2][8]; } AudioFilter() { this.pairs = new int[2]; - this.field303 = new int[2][2][4]; - this.field304 = new int[2][2][4]; - this.field302 = new int[2]; + this.field301 = new int[2][2][4]; + this.field300 = new int[2][2][4]; + this.field298 = new int[2]; } - @ObfuscatedName("ac") - float method319(int var1, int var2, float var3) { - float var4 = (float)this.field304[var1][0][var2] + var3 * (float)(this.field304[var1][1][var2] - this.field304[var1][0][var2]); + @ObfuscatedName("at") + float method324(int var1, int var2, float var3) { + float var4 = (float)this.field300[var1][0][var2] + var3 * (float)(this.field300[var1][1][var2] - this.field300[var1][0][var2]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } - @ObfuscatedName("ak") - float method321(int var1, int var2, float var3) { - float var4 = (float)this.field303[var1][0][var2] + var3 * (float)(this.field303[var1][1][var2] - this.field303[var1][0][var2]); + @ObfuscatedName("ar") + float method326(int var1, int var2, float var3) { + float var4 = (float)this.field301[var1][0][var2] + var3 * (float)(this.field301[var1][1][var2] - this.field301[var1][0][var2]); var4 *= 1.2207031E-4F; return normalize(var4); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { - var3 = (float)this.field302[0] + (float)(this.field302[1] - this.field302[0]) * var2; + var3 = (float)this.field298[0] + (float)(this.field298[1] - this.field298[0]) * var2; var3 *= 0.0030517578F; - field297 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field297 * 65536.0F); + field294 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field294 * 65536.0F); } if (this.pairs[var1] == 0) { return 0; } else { - var3 = this.method319(var1, 0, var2); - field298[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method321(var1, 0, var2)); - field298[var1][1] = var3 * var3; + var3 = this.method324(var1, 0, var2); + field295[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method326(var1, 0, var2)); + field295[var1][1] = var3 * var3; float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method319(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method321(var1, var4, var2)); + var3 = this.method324(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method326(var1, var4, var2)); float var6 = var3 * var3; - field298[var1][var4 * 2 + 1] = field298[var1][var4 * 2 - 1] * var6; - field298[var1][var4 * 2] = field298[var1][var4 * 2 - 1] * var5 + field298[var1][var4 * 2 - 2] * var6; + field295[var1][var4 * 2 + 1] = field295[var1][var4 * 2 - 1] * var6; + field295[var1][var4 * 2] = field295[var1][var4 * 2 - 1] * var5 + field295[var1][var4 * 2 - 2] * var6; for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field298[var1]; - var10000[var7] += field298[var1][var7 - 1] * var5 + field298[var1][var7 - 2] * var6; + var10000 = field295[var1]; + var10000[var7] += field295[var1][var7 - 1] * var5 + field295[var1][var7 - 2] * var6; } - var10000 = field298[var1]; - var10000[1] += field298[var1][0] * var5 + var6; - var10000 = field298[var1]; + var10000 = field295[var1]; + var10000[1] += field295[var1][0] * var5 + var6; + var10000 = field295[var1]; var10000[0] += var5; } if (var1 == 0) { for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field298[0]; - var10000[var4] *= field297; + var10000 = field295[0]; + var10000[var4] *= field294; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field298[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field295[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lul;Lbf;)V" + descriptor = "(Luj;Lbh;)V" ) - final void method323(Buffer var1, SoundEnvelope var2) { + final void method328(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.pairs[0] = var3 >> 4; this.pairs[1] = var3 & 15; if (var3 != 0) { - this.field302[0] = var1.readUnsignedShort(); - this.field302[1] = var1.readUnsignedShort(); + this.field298[0] = var1.readUnsignedShort(); + this.field298[1] = var1.readUnsignedShort(); int var4 = var1.readUnsignedByte(); int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - this.field303[var5][0][var6] = var1.readUnsignedShort(); - this.field304[var5][0][var6] = var1.readUnsignedShort(); + this.field301[var5][0][var6] = var1.readUnsignedShort(); + this.field300[var5][0][var6] = var1.readUnsignedShort(); } } for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { if ((var4 & 1 << var5 * 4 << var6) != 0) { - this.field303[var5][1][var6] = var1.readUnsignedShort(); - this.field304[var5][1][var6] = var1.readUnsignedShort(); + this.field301[var5][1][var6] = var1.readUnsignedShort(); + this.field300[var5][1][var6] = var1.readUnsignedShort(); } else { - this.field303[var5][1][var6] = this.field303[var5][0][var6]; - this.field304[var5][1][var6] = this.field304[var5][0][var6]; + this.field301[var5][1][var6] = this.field301[var5][0][var6]; + this.field300[var5][1][var6] = this.field300[var5][0][var6]; } } } - if (var4 != 0 || this.field302[1] != this.field302[0]) { + if (var4 != 0 || this.field298[1] != this.field298[0]) { var2.decodeSegments(var1); } } else { - int[] var7 = this.field302; - this.field302[1] = 0; + int[] var7 = this.field298; + this.field298[1] = 0; var7[0] = 0; } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); diff --git a/osrs/src/main/java/BZip2Decompressor.java b/osrs/src/main/java/BZip2Decompressor.java index 730ae94a0..36e0c017b 100644 --- a/osrs/src/main/java/BZip2Decompressor.java +++ b/osrs/src/main/java/BZip2Decompressor.java @@ -3,12 +3,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ur") +@ObfuscatedName("uh") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Luo;" + descriptor = "Luq;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { @@ -29,7 +29,7 @@ public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var BZip2Decompressor_state.bsLive = 0; BZip2Decompressor_state.bsBuff = 0; BZip2Decompressor_state.nextBit_unused = 0; - BZip2Decompressor_state.field4211 = 0; + BZip2Decompressor_state.field4216 = 0; BZip2Decompressor_decompress(BZip2Decompressor_state); var1 -= BZip2Decompressor_state.outputLength; BZip2Decompressor_state.inputArray = null; @@ -38,21 +38,21 @@ public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Luo;)V" + descriptor = "(Luq;)V" ) - static void method2645(BZip2State var0) { + static void method2624(BZip2State var0) { byte var2 = var0.out_char; int var3 = var0.su_rNToGo; int var4 = var0.nblocks_used; int var5 = var0.su_ch2; - int[] var6 = class59.BZip2Decompressor_block; - int var7 = var0.field4205; + int[] var6 = BZip2State.BZip2Decompressor_block; + int var7 = var0.field4206; byte[] var8 = var0.outputArray; int var9 = var0.next_out; int var10 = var0.outputLength; - int var12 = var0.field4216 + 1; + int var12 = var0.field4218 + 1; label62: while (true) { @@ -148,25 +148,25 @@ static void method2645(BZip2State var0) { break; } - int var13 = var0.field4211; - var0.field4211 += var10 - var10; - if (var0.field4211 < var13) { + int var13 = var0.field4216; + var0.field4216 += var10 - var10; + if (var0.field4216 < var13) { } var0.out_char = var2; var0.su_rNToGo = var3; var0.nblocks_used = var4; var0.su_ch2 = var5; - class59.BZip2Decompressor_block = var6; - var0.field4205 = var7; + BZip2State.BZip2Decompressor_block = var6; + var0.field4206 = var7; var0.outputArray = var8; var0.next_out = var9; var0.outputLength = var10; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Luo;)V" + descriptor = "(Luq;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ static void BZip2Decompressor_decompress(BZip2State var0) { int[] var23 = null; int[] var24 = null; int[] var25 = null; - var0.blockSize100k = 1284764955; - if (class59.BZip2Decompressor_block == null) { - class59.BZip2Decompressor_block = new int[var0.blockSize100k * -1161486880]; + var0.blockSize100k = 72123797; + if (BZip2State.BZip2Decompressor_block == null) { + BZip2State.BZip2Decompressor_block = new int[var0.blockSize100k * 2001765408]; } boolean var26 = true; @@ -430,7 +430,7 @@ static void BZip2Decompressor_decompress(BZip2State var0) { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; - class59.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + BZip2State.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; ++var47; if (var45 == 0) { ++var43; @@ -489,7 +489,7 @@ static void BZip2Decompressor_decompress(BZip2State var0) { var10000 = var0.unzftab; for (var10000[var1 & 255] += var48; var48 > 0; --var48) { - class59.BZip2Decompressor_block[var47] = var1 & 255; + BZip2State.BZip2Decompressor_block[var47] = var1 & 255; ++var47; } } @@ -509,22 +509,22 @@ static void BZip2Decompressor_decompress(BZip2State var0) { } for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(class59.BZip2Decompressor_block[var36] & 255); - var10000 = class59.BZip2Decompressor_block; + var1 = (byte)(BZip2State.BZip2Decompressor_block[var36] & 255); + var10000 = BZip2State.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; } - var0.field4205 = class59.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.field4206 = BZip2State.BZip2Decompressor_block[var0.originalPointer] >> 8; var0.nblocks_used = 0; - var0.field4205 = class59.BZip2Decompressor_block[var0.field4205]; - var0.su_ch2 = (byte)(var0.field4205 & 255); - var0.field4205 >>= 8; + var0.field4206 = BZip2State.BZip2Decompressor_block[var0.field4206]; + var0.su_ch2 = (byte)(var0.field4206 & 255); + var0.field4206 >>= 8; ++var0.nblocks_used; - var0.field4216 = var47; - method2645(var0); - if (var0.field4216 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field4218 = var47; + method2624(var0); + if (var0.field4218 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } @@ -538,27 +538,27 @@ static void BZip2Decompressor_decompress(BZip2State var0) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Luo;)B" + descriptor = "(Luq;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Luo;)B" + descriptor = "(Luq;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILuo;)I" + descriptor = "(ILuq;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ static int BZip2Decompressor_readBits(int var0, BZip2State var1) { return var2; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Luo;)V" + descriptor = "(Luq;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ static void makeMaps(BZip2State var0) { } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; diff --git a/osrs/src/main/java/BZip2State.java b/osrs/src/main/java/BZip2State.java index d45ee1b80..58603e691 100644 --- a/osrs/src/main/java/BZip2State.java +++ b/osrs/src/main/java/BZip2State.java @@ -2,122 +2,125 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("uo") +@ObfuscatedName("uq") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("ac") - final int field4224; - @ObfuscatedName("al") + @ObfuscatedName("ad") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("at") + final int field4230; + @ObfuscatedName("ah") final int field4227; - @ObfuscatedName("ak") - final int field4226; - @ObfuscatedName("ax") + @ObfuscatedName("ar") final int field4229; @ObfuscatedName("ao") final int field4228; - @ObfuscatedName("ah") - final int field4225; - @ObfuscatedName("ar") + @ObfuscatedName("ab") + final int field4226; + @ObfuscatedName("au") + final int field4231; + @ObfuscatedName("aa") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("nextByte") int nextByte; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("next_out") int next_out; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("outputLength") int outputLength; - @ObfuscatedName("ap") - int field4211; - @ObfuscatedName("ay") + @ObfuscatedName("ax") + int field4216; + @ObfuscatedName("as") @Export("out_char") byte out_char; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("bsBuff") int bsBuff; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("bsLive") int bsLive; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("originalPointer") int originalPointer; - @ObfuscatedName("ae") - int field4205; + @ObfuscatedName("ai") + int field4206; @ObfuscatedName("aw") @Export("su_ch2") int su_ch2; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("unzftab") int[] unzftab; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("cftab") int[] cftab; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("nInUse") int nInUse; - @ObfuscatedName("bn") + @ObfuscatedName("be") @Export("inUse") boolean[] inUse; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("ll8") byte[] ll8; - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("selector") byte[] selector; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("limit") int[][] limit; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("base") int[][] base; - @ObfuscatedName("bp") + @ObfuscatedName("bw") @Export("perm") int[][] perm; - @ObfuscatedName("bt") + @ObfuscatedName("bj") @Export("minLens") int[] minLens; - @ObfuscatedName("bm") - int field4216; + @ObfuscatedName("bn") + int field4218; BZip2State() { - this.field4224 = 4096; + this.field4230 = 4096; this.field4227 = 16; - this.field4226 = 258; - this.field4229 = 6; - this.field4228 = 50; - this.field4225 = 18002; + this.field4229 = 258; + this.field4228 = 6; + this.field4226 = 50; + this.field4231 = 18002; this.nextByte = 0; this.next_out = 0; this.unzftab = new int[256]; diff --git a/osrs/src/main/java/BoundaryObject.java b/osrs/src/main/java/BoundaryObject.java index 0cb665648..38d9a05f2 100644 --- a/osrs/src/main/java/BoundaryObject.java +++ b/osrs/src/main/java/BoundaryObject.java @@ -3,40 +3,40 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") +@ObfuscatedName("lv") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("z") int z; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("x") int x; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("y") int y; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("orientationA") int orientationA; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("orientationB") int orientationB; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkt;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkt;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("tag") public long tag; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("flags") int flags; @@ -44,4 +44,43 @@ public final class BoundaryObject { this.tag = 0L; this.flags = 0; } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "-1198617474" + ) + public static String method1600(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { + return ""; + } else if (var2 == 1) { + CharSequence var3 = var0[var1]; + return var3 == null ? "null" : var3.toString(); + } else { + int var8 = var2 + var1; + int var4 = 0; + + for (int var5 = var1; var5 < var8; ++var5) { + CharSequence var6 = var0[var5]; + if (var6 == null) { + var4 += 4; + } else { + var4 += var6.length(); + } + } + + StringBuilder var9 = new StringBuilder(var4); + + for (int var10 = var1; var10 < var8; ++var10) { + CharSequence var7 = var0[var10]; + if (var7 == null) { + var9.append("null"); + } else { + var9.append(var7); + } + } + + return var9.toString(); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Bounds.java b/osrs/src/main/java/Bounds.java index 8c4b389c2..53f306846 100644 --- a/osrs/src/main/java/Bounds.java +++ b/osrs/src/main/java/Bounds.java @@ -3,19 +3,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rx") +@ObfuscatedName("rv") @Implements("Bounds") public class Bounds { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("lowX") public int lowX; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("lowY") public int lowY; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("highX") public int highX; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("highY") public int highY; @@ -28,10 +28,10 @@ public Bounds(int var1, int var2) { this(0, 0, var1, var2); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "950647486" + descriptor = "(IIB)V", + garbageValue = "20" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -39,10 +39,10 @@ public void setLow(int var1, int var2) { this.lowY = var2; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-260511510" + garbageValue = "-1923662926" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -50,40 +50,40 @@ public void setHigh(int var1, int var2) { this.highY = var2; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-8" + descriptor = "(III)Z", + garbageValue = "375775673" ) - public boolean method2321(int var1, int var2) { - return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.lowY + this.highY; + public boolean method2300(int var1, int var2) { + return var1 >= this.lowX && var1 < this.highX + this.lowX && var2 >= this.lowY && var2 < this.highY + this.lowY; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lrx;Lrx;I)V", - garbageValue = "1323786426" + descriptor = "(Lrv;Lrv;I)V", + garbageValue = "-1398838147" ) - public void method2322(Bounds var1, Bounds var2) { - this.method2323(var1, var2); - this.method2324(var1, var2); + public void method2301(Bounds var1, Bounds var2) { + this.method2302(var1, var2); + this.method2303(var1, var2); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lrx;Lrx;B)V", - garbageValue = "-1" + descriptor = "(Lrv;Lrv;I)V", + garbageValue = "497587597" ) - void method2323(Bounds var1, Bounds var2) { + void method2302(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { - var2.highX = (var2.highX * 801752255 - (var1.lowX * 801752255 - this.lowX * 801752255)) * -1823233217; + var2.highX = (var2.highX * -2085674849 - (var1.lowX * -2085674849 - this.lowX * -2085674849)) * 1385823071; var2.lowX = var1.lowX; } - if (var2.method2325() > var1.method2325()) { - var2.highX -= var2.method2325() - var1.method2325(); + if (var2.method2304() > var1.method2304()) { + var2.highX -= var2.method2304() - var1.method2304(); } if (var2.highX < 0) { @@ -92,21 +92,21 @@ void method2323(Bounds var1, Bounds var2) { } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lrx;Lrx;I)V", - garbageValue = "1489153236" + descriptor = "(Lrv;Lrv;I)V", + garbageValue = "1262928810" ) - void method2324(Bounds var1, Bounds var2) { + void method2303(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { - var2.highY = (var2.highY * 110199335 - (var1.lowY * 110199335 - this.lowY * 110199335)) * -61485673; + var2.highY = (var2.highY * -1396881341 - (var1.lowY * -1396881341 - this.lowY * -1396881341)) * -453294997; var2.lowY = var1.lowY; } - if (var2.method2326() > var1.method2326()) { - var2.highY -= var2.method2326() - var1.method2326(); + if (var2.method2305() > var1.method2305()) { + var2.highY -= var2.method2305() - var1.method2305(); } if (var2.highY < 0) { @@ -115,22 +115,22 @@ void method2324(Bounds var1, Bounds var2) { } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2139192788" + garbageValue = "-222138556" ) - int method2325() { - return this.highX + this.lowX; + int method2304() { + return this.lowX + this.highX; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-49" + descriptor = "(I)I", + garbageValue = "578775229" ) - int method2326() { - return this.highY + this.lowY; + int method2305() { + return this.lowY + this.highY; } @Export("toString") diff --git a/osrs/src/main/java/Buddy.java b/osrs/src/main/java/Buddy.java index 0dfe34ca0..a92c9da88 100644 --- a/osrs/src/main/java/Buddy.java +++ b/osrs/src/main/java/Buddy.java @@ -3,16 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ri") +@ObfuscatedName("rh") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("world") public int world; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("int2") public int int2; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("rank") public int rank; @@ -20,10 +20,10 @@ public class Buddy extends User { this.world = -1; } - @ObfuscatedName("bt") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "717087406" + descriptor = "(IIB)V", + garbageValue = "2" ) @Export("set") void set(int var1, int var2) { @@ -31,103 +31,138 @@ void set(int var1, int var2) { this.int2 = var2; } - @ObfuscatedName("bm") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-83" + garbageValue = "48" ) @Export("getWorld") public int getWorld() { return this.world; } - @ObfuscatedName("br") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-410640416" + garbageValue = "1781991225" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; } - @ObfuscatedName("bk") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "682390818" + descriptor = "(Luo;II)Z", + garbageValue = "1704651337" ) - static int method2285(int var0, Script var1, boolean var2) { + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); int var3; int var4; - int var6; - if (var0 == 3400) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - EnumComposition var5 = class73.getEnum(var3); - if (var5.outputType != 's') { + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { + if (var0.readBits(1) != 0) { + updateExternalPlayer(var0, var1); } - for (var6 = 0; var6 < var5.outputCount; ++var6) { - if (var4 == var5.keys[var6]) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var5.strVals[var6]; - var5 = null; - break; - } - } - - if (var5 != null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var5.defaultStr; + var3 = var0.readBits(13); + var4 = var0.readBits(13); + boolean var12 = var0.readBits(1) == 1; + if (var12) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; } - return 1; - } else if (var0 != 3408) { - if (var0 == 3411) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - EnumComposition var10 = class73.getEnum(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var10.size(); - return 1; + if (Client.players[var1] != null) { + throw new RuntimeException(); } else { - return 2; + Player var6 = Client.players[var1] = new Player(); + var6.index = var1; + if (Players.cachedAppearanceBuffer[var1] != null) { + var6.read(Players.cachedAppearanceBuffer[var1]); + } + + var6.orientation = Players.Players_orientations[var1]; + var6.targetIndex = Players.Players_targetIndices[var1]; + var7 = Players.Players_regions[var1]; + var8 = var7 >> 28; + var9 = var7 >> 14 & 255; + var10 = var7 & 255; + var6.pathTraversed[0] = Players.playerMovementSpeeds[var1]; + var6.plane = (byte)var8; + var6.resetPath((var9 << 13) + var3 - NewShit.baseX, (var10 << 13) + var4 - class101.baseY); + var6.hasMovementPending = false; + return true; } + } else if (var2 == 1) { + var3 = var0.readBits(2); + var4 = Players.Players_regions[var1]; + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); + return false; } else { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - EnumComposition var7 = class73.getEnum(var9); - if (var3 == var7.inputType && var4 == var7.outputType) { - for (int var8 = 0; var8 < var7.outputCount; ++var8) { - if (var6 == var7.keys[var8]) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; - } - - var7 = null; - break; - } + int var5; + int var11; + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var11 = Players.Players_regions[var1]; + var7 = (var11 >> 28) + var4 & 3; + var8 = var11 >> 14 & 255; + var9 = var11 & 255; + if (var5 == 0) { + --var8; + --var9; } - if (var7 != null) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; - } + if (var5 == 1) { + --var9; } - return 1; - } else { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + if (var5 == 2) { + ++var8; + --var9; + } + + if (var5 == 3) { + --var8; } - return 1; + if (var5 == 4) { + ++var8; + } + + if (var5 == 5) { + --var8; + ++var9; + } + + if (var5 == 6) { + ++var9; + } + + if (var5 == 7) { + ++var8; + ++var9; + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + return false; + } else { + var3 = var0.readBits(18); + var4 = var3 >> 16; + var5 = var3 >> 8 & 255; + var11 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var11 + var7 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; } } } diff --git a/osrs/src/main/java/BuddyRankComparator.java b/osrs/src/main/java/BuddyRankComparator.java index 26c2b3641..9e45aba02 100644 --- a/osrs/src/main/java/BuddyRankComparator.java +++ b/osrs/src/main/java/BuddyRankComparator.java @@ -3,10 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") +@ObfuscatedName("eg") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("ac") + @ObfuscatedName("wz") + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + static Archive field1200; + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -14,10 +22,10 @@ public BuddyRankComparator(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lri;Lri;I)I", - garbageValue = "383953435" + descriptor = "(Lrh;Lrh;B)I", + garbageValue = "95" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -34,32 +42,16 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1321294301" - ) - static void method687() { - World.Tiles_underlays = null; - VertexNormal.Tiles_overlays = null; - SecureRandomFuture.Tiles_shapes = null; - class199.field1563 = null; - UserComparator6.field1191 = null; - Tiles.field835 = null; - class158.field1387 = null; - SecureRandomFuture.Tiles_hue = null; - class135.Tiles_saturation = null; - Tiles.Tiles_lightness = null; - WorldMapSection2.Tiles_hueMultiplier = null; - Script.field812 = null; - } - - @ObfuscatedName("ay") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "-457265261" ) - protected static final int method688() { - return GameEngine.keyHandler.getIdleCycles(); + public static boolean method687() { + if (!class316.field2798.isEmpty()) { + return true; + } else { + return !class316.musicSongs.isEmpty() && class316.musicSongs.get(0) != null && ((MusicSong)class316.musicSongs.get(0)).midiPcmStream != null ? ((MusicSong)class316.musicSongs.get(0)).midiPcmStream.isReady() : false; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/Buffer.java b/osrs/src/main/java/Buffer.java index 1eab80465..b0bfbd26a 100644 --- a/osrs/src/main/java/Buffer.java +++ b/osrs/src/main/java/Buffer.java @@ -5,19 +5,19 @@ import java.math.BigInteger; -@ObfuscatedName("ul") +@ObfuscatedName("uj") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("array") public byte[] array; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("offset") public int offset; @@ -58,11 +58,11 @@ public class Buffer extends Node { } public Buffer(int var1, boolean var2) { - this.array = ByteArrayPool.ByteArrayPool_getArrayBool(var1, var2); + this.array = ServerPacket.ByteArrayPool_getArrayBool(var1, var2); } public Buffer(int var1) { - this.array = class148.ByteArrayPool_getArray(var1); + this.array = class362.ByteArrayPool_getArray(var1); this.offset = 0; } @@ -71,24 +71,24 @@ public Buffer(byte[] var1) { this.offset = 0; } - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-113" + descriptor = "(I)V", + garbageValue = "37821" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { - MenuAction.ByteArrayPool_release(this.array); + SwapSongTask.ByteArrayPool_release(this.array); } this.array = null; } - @ObfuscatedName("bc") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-984499580" + garbageValue = "2032904894" ) @Export("writeByte") public void writeByte(int var1) { @@ -97,8 +97,8 @@ public void writeByte(int var1) { @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-5002" + descriptor = "(II)V", + garbageValue = "2078437680" ) @Export("writeShort") public void writeShort(int var1) { @@ -106,10 +106,10 @@ public void writeShort(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("bf") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1065618714" + garbageValue = "-1102308470" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -120,8 +120,8 @@ public void writeMedium(int var1) { @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-43" + descriptor = "(II)V", + garbageValue = "-2121704960" ) @Export("writeInt") public void writeInt(int var1) { @@ -131,7 +131,7 @@ public void writeInt(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("bl") + @ObfuscatedName("bz") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); @@ -142,7 +142,7 @@ public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bg") + @ObfuscatedName("bc") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); @@ -155,20 +155,20 @@ public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bj") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "16" + descriptor = "(ZI)V", + garbageValue = "-1187697267" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); } - @ObfuscatedName("bi") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-960928092" + garbageValue = "900280888" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -176,15 +176,15 @@ public void writeStringCp1252NullTerminated(String var1) { if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.offset += class16.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += NewShit.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bq") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-511011778" + garbageValue = "1205300061" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { @@ -193,15 +193,15 @@ public void writeStringCp1252NullCircumfixed(String var1) { throw new IllegalArgumentException(""); } else { this.array[++this.offset - 1] = 0; - this.offset += class16.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += NewShit.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bw") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)V", - garbageValue = "100" + descriptor = "(Ljava/lang/CharSequence;I)V", + garbageValue = "395083018" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { @@ -221,13 +221,13 @@ public void writeCESU8(CharSequence var1) { this.array[++this.offset - 1] = 0; this.writeVarInt(var4); - this.offset += class465.method2335(this.array, this.offset, var1); + this.offset += class344.method1877(this.array, this.offset, var1); } - @ObfuscatedName("ce") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1303601550" + garbageValue = "1351924623" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { @@ -237,19 +237,20 @@ public void writeBytes(byte[] var1, int var2, int var3) { } - @ObfuscatedName("cu") + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "-116" + descriptor = "(Luj;I)V", + garbageValue = "-1328772504" ) + @Export("writeBuffer") public void writeBuffer(Buffer var1) { this.writeBytes(var1.array, 0, var1.offset); } - @ObfuscatedName("cw") + @ObfuscatedName("cg") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-88" + garbageValue = "31" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { @@ -263,10 +264,10 @@ public void writeLengthInt(int var1) { } } - @ObfuscatedName("co") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "1632479764" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { @@ -278,13 +279,13 @@ public void writeLengthShort(int var1) { } } - @ObfuscatedName("cc") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "23" + descriptor = "(II)V", + garbageValue = "-579744730" ) @Export("writeLengthByte") - public void WriteLengthByte(int var1) { + public void writeLengthByte(int var1) { if (var1 >= 0 && var1 <= 255) { this.array[this.offset - var1 - 1] = (byte)var1; } else { @@ -292,7 +293,7 @@ public void WriteLengthByte(int var1) { } } - @ObfuscatedName("cg") + @ObfuscatedName("cp") @ObfuscatedSignature( descriptor = "(IB)V", garbageValue = "1" @@ -308,10 +309,10 @@ public void writeSmartByteShort(int var1) { } } - @ObfuscatedName("cq") + @ObfuscatedName("ce") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "33" + garbageValue = "-24" ) @Export("writeVarInt") public void writeVarInt(int var1) { @@ -334,30 +335,30 @@ public void writeVarInt(int var1) { this.writeByte(var1 & 127); } - @ObfuscatedName("cy") + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "-2140703005" ) @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; } - @ObfuscatedName("cz") + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-24140714" + descriptor = "(B)B", + garbageValue = "-38" ) @Export("readByte") public byte readByte() { return this.array[++this.offset - 1]; } - @ObfuscatedName("cp") + @ObfuscatedName("cw") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-38" + garbageValue = "118" ) @Export("readUnsignedShort") public int readUnsignedShort() { @@ -365,10 +366,10 @@ public int readUnsignedShort() { return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("cb") + @ObfuscatedName("cq") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-69" + garbageValue = "100" ) @Export("readShort") public int readShort() { @@ -381,10 +382,10 @@ public int readShort() { return var1; } - @ObfuscatedName("cn") + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1904620263" + descriptor = "(B)I", + garbageValue = "-100" ) @Export("readMedium") public int readMedium() { @@ -392,12 +393,13 @@ public int readMedium() { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("ck") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2027677776" + descriptor = "(B)I", + garbageValue = "89" ) - public int method2583() { + @Export("readUnsignedByteAdd") + public int readUnsignedByteAdd() { this.offset += 3; int var1 = ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 8388607) { @@ -407,10 +409,10 @@ public int method2583() { return var1; } - @ObfuscatedName("cr") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "255" + descriptor = "(B)I", + garbageValue = "-12" ) @Export("readInt") public int readInt() { @@ -418,41 +420,41 @@ public int readInt() { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); } - @ObfuscatedName("cs") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "95" + descriptor = "(I)J", + garbageValue = "1536717051" ) @Export("readLong") public long readLong() { long var1 = (long)this.readInt() & 4294967295L; long var3 = (long)this.readInt() & 4294967295L; - return (var1 << 32) + var3; + return var3 + (var1 << 32); } - @ObfuscatedName("cm") + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "(S)F", - garbageValue = "4005" + descriptor = "(I)F", + garbageValue = "346642387" ) - public float method2586() { + public float method2565() { return Float.intBitsToFloat(this.readInt()); } - @ObfuscatedName("cv") + @ObfuscatedName("cr") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2117231513" + garbageValue = "2040454969" ) @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; } - @ObfuscatedName("ci") + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "37" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1977045355" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { @@ -464,10 +466,10 @@ public String readStringCp1252NullTerminatedOrNull() { } } - @ObfuscatedName("cj") + @ObfuscatedName("ca") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1433848614" + garbageValue = "1287732949" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { @@ -477,13 +479,13 @@ public String readStringCp1252NullTerminated() { } int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : class92.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : World.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("cx") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "0" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-716580944" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { @@ -497,14 +499,14 @@ public String readStringCp1252NullCircumfixed() { } int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : class92.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : World.decodeStringCp1252(this.array, var2, var3); } } - @ObfuscatedName("ch") + @ObfuscatedName("cu") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1940899039" + garbageValue = "-780563964" ) @Export("readCESUB") public String readCESUB() { @@ -516,17 +518,68 @@ public String readCESUB() { if (var2 + this.offset > this.array.length) { throw new IllegalStateException(""); } else { - String var3 = class430.method2190(this.array, this.offset, var2); + byte[] var4 = this.array; + int var5 = this.offset; + char[] var6 = new char[var2]; + int var7 = 0; + int var8 = var5; + + int var11; + for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { + int var10 = var4[var8++] & 255; + if (var10 < 128) { + if (var10 == 0) { + var11 = 65533; + } else { + var11 = var10; + } + } else if (var10 < 192) { + var11 = 65533; + } else if (var10 < 224) { + if (var8 < var9 && (var4[var8] & 192) == 128) { + var11 = (var10 & 31) << 6 | var4[var8++] & 63; + if (var11 < 128) { + var11 = 65533; + } + } else { + var11 = 65533; + } + } else if (var10 < 240) { + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; + if (var11 < 2048) { + var11 = 65533; + } + } else { + var11 = 65533; + } + } else if (var10 < 248) { + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; + if (var11 >= 65536 && var11 <= 1114111) { + var11 = 65533; + } else { + var11 = 65533; + } + } else { + var11 = 65533; + } + } else { + var11 = 65533; + } + } + + String var3 = new String(var6, 0, var7); this.offset += var2; return var3; } } } - @ObfuscatedName("cd") + @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-808602806" + garbageValue = "-2014110901" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { @@ -536,10 +589,10 @@ public void readBytes(byte[] var1, int var2, int var3) { } - @ObfuscatedName("ct") + @ObfuscatedName("cb") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-15010737" + garbageValue = "875734256" ) @Export("readShortSmart") public int readShortSmart() { @@ -547,10 +600,10 @@ public int readShortSmart() { return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } - @ObfuscatedName("cf") + @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "2" + descriptor = "(I)I", + garbageValue = "1283658901" ) @Export("readUShortSmart") public int readUShortSmart() { @@ -558,10 +611,10 @@ public int readUShortSmart() { return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } - @ObfuscatedName("cl") + @ObfuscatedName("cy") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1742442094" + garbageValue = "1077896012" ) @Export("readShortSmartSub") public int readShortSmartSub() { @@ -569,10 +622,10 @@ public int readShortSmartSub() { return var1 < 128 ? this.readUnsignedByte() - 1 : this.readUnsignedShort() - 32769; } - @ObfuscatedName("ca") + @ObfuscatedName("ck") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "5" + garbageValue = "75" ) @Export("readIncrSmallSmart") public int readIncrSmallSmart() { @@ -587,20 +640,20 @@ public int readIncrSmallSmart() { return var1; } - @ObfuscatedName("dv") + @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-5504" + descriptor = "(I)I", + garbageValue = "-2102511661" ) @Export("readLargeSmart") public int readLargeSmart() { return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } - @ObfuscatedName("dm") + @ObfuscatedName("dt") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-80" + descriptor = "(I)I", + garbageValue = "1637265381" ) @Export("readNullableLargeSmart") public int readNullableLargeSmart() { @@ -612,10 +665,10 @@ public int readNullableLargeSmart() { } } - @ObfuscatedName("ds") + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1526409696" + descriptor = "(B)I", + garbageValue = "-29" ) @Export("readVarInt") public int readVarInt() { @@ -629,11 +682,12 @@ public int readVarInt() { return var2 | var1; } - @ObfuscatedName("dx") + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-57" + descriptor = "(I)I", + garbageValue = "-1675409719" ) + @Export("packBytesToInt") public int packBytesToInt() { int var2 = 0; int var3 = 0; @@ -648,10 +702,10 @@ public int packBytesToInt() { return var2; } - @ObfuscatedName("dg") + @ObfuscatedName("dd") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "98180298" + garbageValue = "2139836666" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { @@ -676,10 +730,10 @@ public void xteaEncryptAll(int[] var1) { } - @ObfuscatedName("dq") + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "([IB)V", - garbageValue = "-56" + descriptor = "([II)V", + garbageValue = "-1034826768" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { @@ -704,10 +758,10 @@ public void xteaDecryptAll(int[] var1) { } - @ObfuscatedName("dz") + @ObfuscatedName("dh") @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "1472576240" + descriptor = "([IIIB)V", + garbageValue = "-6" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { @@ -734,10 +788,10 @@ public void xteaEncrypt(int[] var1, int var2, int var3) { this.offset = var4; } - @ObfuscatedName("dn") + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "([IIIB)V", - garbageValue = "121" + descriptor = "([IIII)V", + garbageValue = "1763762234" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { @@ -764,10 +818,10 @@ public void xteaDecrypt(int[] var1, int var2, int var3) { this.offset = var4; } - @ObfuscatedName("dk") + @ObfuscatedName("dg") @ObfuscatedSignature( descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-36777133" + garbageValue = "-2126574510" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { @@ -783,180 +837,179 @@ public void encryptRsa(BigInteger var1, BigInteger var2) { this.writeBytes(var7, 0, var7.length); } - @ObfuscatedName("df") + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1093540006" + descriptor = "(IB)I", + garbageValue = "36" ) @Export("writeCrc") public int writeCrc(int var1) { - int var2 = ArchiveDisk.method2309(this.array, var1, this.offset); + int var2 = class174.method885(this.array, var1, this.offset); this.writeInt(var2); return var2; } - @ObfuscatedName("de") + @ObfuscatedName("do") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "103" + descriptor = "(I)Z", + garbageValue = "-1490830987" ) @Export("checkCrc") public boolean checkCrc() { this.offset -= 4; - int var1 = ArchiveDisk.method2309(this.array, 0, this.offset); + int var1 = class174.method885(this.array, 0, this.offset); int var2 = this.readInt(); - return var1 == var2; + return var2 == var1; } - @ObfuscatedName("dl") + @ObfuscatedName("db") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1580399246" + garbageValue = "1106007511" ) - @Export("writeByteAdd") public void writeByteAdd(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("dp") + @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "518186020" + descriptor = "(IB)V", + garbageValue = "110" ) @Export("writeByteNeg") public void writeByteNeg(int var1) { this.array[++this.offset - 1] = (byte)(0 - var1); } - @ObfuscatedName("do") + @ObfuscatedName("dr") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-751225274" + garbageValue = "-861052915" ) @Export("writeByteSub") public void writeByteSub(int var1) { this.array[++this.offset - 1] = (byte)(128 - var1); } - @ObfuscatedName("dh") + @ObfuscatedName("ds") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2038958991" + garbageValue = "-756845354" ) - @Export("readUnsignedByteAdd") - public int readUnsignedByteAdd() { + @Export("readUnsignedShortAdd") + public int readUnsignedShortAdd() { return this.array[++this.offset - 1] - 128 & 255; } - @ObfuscatedName("dj") + @ObfuscatedName("da") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2068421837" + garbageValue = "-2085859197" ) - @Export("readUnsignedByteNeg") - public int readUnsignedByteNeg() { + @Export("readUnsignedByteSub") + public int readUnsignedByteSub() { return 0 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("du") + @ObfuscatedName("dw") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "17" + descriptor = "(I)I", + garbageValue = "-2004918107" ) - @Export("readUnsignedByteSub") - public int readUnsignedByteSub() { + @Export("readUnsignedByteNeg") + public int readUnsignedByteNeg() { return 128 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("dr") + @ObfuscatedName("dp") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "80020089" + garbageValue = "21885876" ) @Export("readByteAdd") public byte readByteAdd() { return (byte)(this.array[++this.offset - 1] - 128); } - @ObfuscatedName("dw") + @ObfuscatedName("df") @ObfuscatedSignature( descriptor = "(B)B", - garbageValue = "-29" + garbageValue = "101" ) @Export("readByteNeg") public byte readByteNeg() { return (byte)(0 - this.array[++this.offset - 1]); } - @ObfuscatedName("di") + @ObfuscatedName("dv") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "1972781971" + garbageValue = "1189405453" ) @Export("readByteSub") public byte readByteSub() { return (byte)(128 - this.array[++this.offset - 1]); } - @ObfuscatedName("dt") + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "106" + descriptor = "(II)V", + garbageValue = "642088344" ) - @Export("writeShortLE") - public void writeShortLE(int var1) { + @Export("writeShortAdd") + public void writeShortAdd(int var1) { this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("dd") + @ObfuscatedName("dl") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1925557775" + garbageValue = "-2051245858" ) - @Export("writeShortAddLE") - public void writeShortAddLE(int var1) { + @Export("writeIntME") + public void writeIntME(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("dy") + @ObfuscatedName("de") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "18" + descriptor = "(II)V", + garbageValue = "-436427063" ) - @Export("writeShortAdd") - public void writeShortAdd(int var1) { + @Export("writeShortLE") + public void writeShortLE(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("db") + @ObfuscatedName("dn") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "3" + garbageValue = "113" ) - @Export("readIntME") - public int readIntME() { + @Export("readUnsignedIntLE") + public int readUnsignedShortLE() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); } - @ObfuscatedName("dc") + @ObfuscatedName("dq") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1401197709" + garbageValue = "201481069" ) - @Export("readUnsignedShortAdd") - public int readUnsignedShortAdd() { + @Export("readUnsignedIntIME") + public int readUnsignedIntIME() { this.offset += 2; return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("da") + @ObfuscatedName("dj") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-976069698" + descriptor = "(B)I", + garbageValue = "1" ) @Export("readUnsignedShortAddLE") public int readUnsignedShortAddLE() { @@ -964,12 +1017,12 @@ public int readUnsignedShortAddLE() { return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); } - @ObfuscatedName("eo") + @ObfuscatedName("dy") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1014937104" + descriptor = "(B)I", + garbageValue = "88" ) - public int method2623() { + public int method2602() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); if (var1 > 32767) { @@ -979,10 +1032,10 @@ public int method2623() { return var1; } - @ObfuscatedName("em") + @ObfuscatedName("ec") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "53" + descriptor = "(I)I", + garbageValue = "-1774495709" ) @Export("readShortLE") public int readShortLE() { @@ -995,12 +1048,12 @@ public int readShortLE() { return var1; } - @ObfuscatedName("el") + @ObfuscatedName("ew") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-813012509" + garbageValue = "-1535378058" ) - public int method2625() { + public int method2604() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); if (var1 > 32767) { @@ -1010,44 +1063,58 @@ public int method2625() { return var1; } - @ObfuscatedName("ec") + @ObfuscatedName("ex") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "19" + descriptor = "(II)V", + garbageValue = "228979090" ) - @Export("writeMediumLE") - public void writeMediumLE(int var1) { + public void method2605(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 >> 16); this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("eg") + @ObfuscatedName("ev") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2139060147" + descriptor = "(B)I", + garbageValue = "6" ) - public int method2627() { + public int method2606() { this.offset += 3; return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); } - @ObfuscatedName("ei") + @ObfuscatedName("ek") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "784295122" + descriptor = "(B)I", + garbageValue = "104" ) - public int method2628() { + public int method2607() { this.offset += 3; - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); } - @ObfuscatedName("ex") + @ObfuscatedName("em") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "953463259" + descriptor = "(B)I", + garbageValue = "-46" ) - public int method2629() { + public int method2608() { + this.offset += 3; + int var1 = (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); + if (var1 > 8388607) { + var1 -= 16777216; + } + + return var1; + } + + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "71" + ) + public int method2609() { this.offset += 3; int var1 = ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); if (var1 > 8388607) { @@ -1057,12 +1124,12 @@ public int method2629() { return var1; } - @ObfuscatedName("ek") + @ObfuscatedName("ef") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-927007563" + descriptor = "(B)I", + garbageValue = "55" ) - public int method2630() { + public int method2610() { this.offset += 3; int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); if (var1 > 8388607) { @@ -1072,73 +1139,70 @@ public int method2630() { return var1; } - @ObfuscatedName("er") + @ObfuscatedName("el") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-40" + descriptor = "(II)V", + garbageValue = "392771780" ) - @Export("writeIntLE") - public void writeIntLE(int var1) { + @Export("writeIntIME") + public void writeIntIME(int var1) { this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 >> 16); this.array[++this.offset - 1] = (byte)(var1 >> 24); } - @ObfuscatedName("ez") + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "759646108" + descriptor = "(IB)V", + garbageValue = "20" ) - @Export("writeIntME") - public void writeIntME(int var1) { + @Export("writeIntLE") + public void writeIntLE(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 24); this.array[++this.offset - 1] = (byte)(var1 >> 16); } - @ObfuscatedName("en") + @ObfuscatedName("ea") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1723404491" + garbageValue = "116974832" ) - @Export("writeIntIME") - public void writeIntIME(int var1) { + public void method2613(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 16); this.array[++this.offset - 1] = (byte)(var1 >> 24); this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("es") + @ObfuscatedName("en") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1509017356" + garbageValue = "1727101871" ) - @Export("readUnsignedIntLE") - public int readUnsignedIntLE() { + @Export("readIntME") + public int readIntME() { this.offset += 4; return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); } - @ObfuscatedName("eq") + @ObfuscatedName("eh") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-743264140" + descriptor = "(B)I", + garbageValue = "126" ) - @Export("readUnsignedIntIME") - public int readUnsignedIntIME() { + public int readIntIME() { this.offset += 4; return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); } - @ObfuscatedName("ej") + @ObfuscatedName("ei") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-119646435" + garbageValue = "1456274575" ) - @Export("readUnsignedIntME") public int readUnsignedIntME() { this.offset += 4; return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); @@ -1147,21 +1211,23 @@ public int readUnsignedIntME() { @ObfuscatedName("et") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "265273731" + garbageValue = "1299498311" ) - public void method2637(byte[] var1, int var2, int var3) { + public void method2617(byte[] var1, int var2, int var3) { for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { var1[var4] = this.array[++this.offset - 1]; } } - @ObfuscatedName("eh") + + @ObfuscatedName("er") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "157152103" + descriptor = "([BIIB)V", + garbageValue = "22" ) - public void method2638(byte[] var1, int var2, int var3) { + + public void method2618(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } diff --git a/osrs/src/main/java/BufferedFile.java b/osrs/src/main/java/BufferedFile.java index ccc330481..e9e872fd1 100644 --- a/osrs/src/main/java/BufferedFile.java +++ b/osrs/src/main/java/BufferedFile.java @@ -6,43 +6,43 @@ import java.io.EOFException; import java.io.IOException; -@ObfuscatedName("tl") +@ObfuscatedName("tr") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "Lto;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("offset") long offset; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("fileLength") long fileLength; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("length") long length; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("fileOffset") long fileOffset; @@ -60,10 +60,10 @@ public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.offset = 0L; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1702864120" + descriptor = "(B)V", + garbageValue = "4" ) @Export("close") public void close() throws IOException { @@ -71,7 +71,7 @@ public void close() throws IOException { this.accessFile.close(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { @@ -81,30 +81,30 @@ public void seek(long var1) throws IOException { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(S)J", - garbageValue = "-9181" + descriptor = "(I)J", + garbageValue = "-955462674" ) @Export("length") public long length() { return this.length; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "([BB)V", - garbageValue = "90" + garbageValue = "0" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "([BIIS)V", - garbageValue = "9117" + descriptor = "([BIII)V", + garbageValue = "1020211310" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -182,9 +182,9 @@ public void read(byte[] var1, int var2, int var3) throws IOException { var13 = var4; } - if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= var4 + (long)var7) { + if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { var10 = (long)this.writeBufferLength + this.writeBufferOffset; - } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { + } else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { var10 = var4 + (long)var7; } @@ -207,10 +207,10 @@ public void read(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-63" + garbageValue = "16" ) @Export("load") void load() throws IOException { @@ -237,23 +237,23 @@ void load() throws IOException { } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "61" + descriptor = "([BIII)V", + garbageValue = "267822914" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if (this.offset + (long)var3 > this.length) { - this.length = (long)var3 + this.offset; + if ((long)var3 + this.offset > this.length) { + this.length = this.offset + (long)var3; } - if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { + if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { this.flush(); } - if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { + if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); this.offset += (long)var4; @@ -265,7 +265,7 @@ public void write(byte[] var1, int var2, int var3) throws IOException { if (var3 <= this.writeBuffer.length) { if (var3 > 0) { - if (-1L == this.writeBufferOffset) { + if (this.writeBufferOffset == -1L) { this.writeBufferOffset = this.offset; } @@ -292,19 +292,19 @@ public void write(byte[] var1, int var2, int var3) throws IOException { long var6 = -1L; if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { var9 = this.offset; - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { var9 = this.readBufferOffset; } - if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { - var6 = this.offset + (long)var3; - } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { - var6 = this.readBufferOffset + (long)this.readBufferLength; + if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) { + var6 = (long)var3 + this.offset; + } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= this.offset + (long)var3) { + var6 = (long)this.readBufferLength + this.readBufferOffset; } if (var9 > -1L && var6 > var9) { int var8 = (int)(var6 - var9); - System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); + System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); } this.offset += (long)var3; @@ -315,14 +315,14 @@ public void write(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-503112387" + garbageValue = "16711680" ) @Export("flush") void flush() throws IOException { - if (-1L != this.writeBufferOffset) { + if (this.writeBufferOffset != -1L) { if (this.writeBufferOffset != this.fileOffset) { this.accessFile.seek(this.writeBufferOffset); this.fileOffset = this.writeBufferOffset; @@ -338,13 +338,13 @@ void flush() throws IOException { long var3 = -1L; if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { var1 = this.writeBufferOffset; - } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { + } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { var1 = this.readBufferOffset; } if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) { - var3 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { + var3 = (long)this.writeBufferLength + this.writeBufferOffset; + } else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { var3 = this.readBufferOffset + (long)this.readBufferLength; } diff --git a/osrs/src/main/java/BufferedNetSocket.java b/osrs/src/main/java/BufferedNetSocket.java index 4aab498bf..99cfc7069 100644 --- a/osrs/src/main/java/BufferedNetSocket.java +++ b/osrs/src/main/java/BufferedNetSocket.java @@ -6,22 +6,19 @@ import java.io.IOException; import java.net.Socket; -@ObfuscatedName("rc") +@ObfuscatedName("re") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("uv") - @Export("cameraLookAtY") - static int cameraLookAtY; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("socket") Socket socket; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lrj;" + descriptor = "Lra;" ) @Export("source") BufferedSource source; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "Lrs;" ) @@ -38,60 +35,60 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "2050917556" + garbageValue = "278911957" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-111326055" + garbageValue = "1133909296" ) @Export("available") public int available() throws IOException { return this.source.available(); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-4" + descriptor = "(I)I", + garbageValue = "-1251290768" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "-2009008666" + descriptor = "([BIIB)I", + garbageValue = "-54" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "40171702" + garbageValue = "-1734190943" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "2421" + descriptor = "(I)V", + garbageValue = "1195407219" ) @Export("close") public void close() { diff --git a/osrs/src/main/java/BufferedSink.java b/osrs/src/main/java/BufferedSink.java index 6978b408e..919deb6b4 100644 --- a/osrs/src/main/java/BufferedSink.java +++ b/osrs/src/main/java/BufferedSink.java @@ -6,31 +6,31 @@ import java.io.IOException; import java.io.OutputStream; -@ObfuscatedName("net/runelite/rs") +@ObfuscatedName("rs") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("thread") Thread thread; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("capacity") int capacity; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("buffer") byte[] buffer; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("position") int position; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("limit") int limit; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("exception") IOException exception; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("closed") boolean closed; @@ -45,10 +45,10 @@ public class BufferedSink implements Runnable { this.thread.start(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2138016913" + garbageValue = "-1028287550" ) @Export("isClosed") boolean isClosed() { @@ -70,10 +70,10 @@ boolean isClosed() { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-939344469" + descriptor = "([BIIB)V", + garbageValue = "-81" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -110,10 +110,10 @@ void write(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "792661080" + garbageValue = "1504320255" ) @Export("close") void close() { @@ -190,18 +190,4 @@ public void run() { } while(!this.isClosed()); } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-100" - ) - public static void method2304() { - if (MouseHandler.MouseHandler_instance != null) { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_instance = null; - } - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/BufferedSource.java b/osrs/src/main/java/BufferedSource.java index 9c0888f10..c43e069ae 100644 --- a/osrs/src/main/java/BufferedSource.java +++ b/osrs/src/main/java/BufferedSource.java @@ -7,28 +7,28 @@ import java.io.IOException; import java.io.InputStream; -@ObfuscatedName("rj") +@ObfuscatedName("ra") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("thread") Thread thread; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("capacity") int capacity; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("buffer") byte[] buffer; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("position") int position; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("limit") int limit; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("exception") IOException exception; @@ -43,10 +43,10 @@ public class BufferedSource implements Runnable { this.thread.start(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "0" + descriptor = "(II)Z", + garbageValue = "-1783973158" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -77,10 +77,10 @@ boolean isAvailable(int var1) throws IOException { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1929996335" + garbageValue = "1286803903" ) @Export("available") int available() throws IOException { @@ -101,10 +101,10 @@ int available() throws IOException { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1702106506" + garbageValue = "-125616841" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { @@ -124,10 +124,10 @@ int readUnsignedByte() throws IOException { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "171624144" + descriptor = "([BIIB)I", + garbageValue = "-29" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -165,10 +165,10 @@ int read(byte[] var1, int var2, int var3) throws IOException { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-189717411" + garbageValue = "1957181554" ) @Export("close") void close() { @@ -236,37 +236,4 @@ public void run() { } } } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "([BIIII[Lih;I)V", - garbageValue = "-2138792122" - ) - static final void method2298(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { - int var7; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 64; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var2 + var8] &= -16777217; - } - } - } - } - - Buffer var12 = new Buffer(var0); - - for (var7 = 0; var7 < 4; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - for (int var9 = 0; var9 < 64; ++var9) { - int var10 = var8 + var1; - int var11 = var9 + var2; - class104.loadTerrain(var12, var7, var10, var11, var3 + var10, var11 + var4, 0); - } - } - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/ByteArrayPool.java b/osrs/src/main/java/ByteArrayPool.java index c449ecfc4..125973a5b 100644 --- a/osrs/src/main/java/ByteArrayPool.java +++ b/osrs/src/main/java/ByteArrayPool.java @@ -3,115 +3,137 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; -@ObfuscatedName("qo") +@ObfuscatedName("qq") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("ao") + @ObfuscatedName("ab") + static final Object field3781; + @ObfuscatedName("au") @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("ah") + @ObfuscatedName("aa") @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("ar") + @ObfuscatedName("ac") @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("ab") - static int field3772; - @ObfuscatedName("am") + @ObfuscatedName("al") + static int field3774; + @ObfuscatedName("az") + static int field3779; + @ObfuscatedName("ap") static int field3775; @ObfuscatedName("av") + static int field3777; + @ObfuscatedName("ax") static int field3778; - @ObfuscatedName("ag") - static int field3773; - @ObfuscatedName("aa") - static int field3771; - @ObfuscatedName("ap") + @ObfuscatedName("as") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; @ObfuscatedName("ay") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("as") + @ObfuscatedName("ak") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; @ObfuscatedName("aj") - static byte[][] field3767; - @ObfuscatedName("an") - @Export("ByteArrayPool_alternativeSizes") - public static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("ae") - public static ArrayList field3766; + static byte[][] field3768; + @ObfuscatedName("aw") + static ArrayList field3780; static { + field3781 = new Object(); ByteArrayPool_smallCount = 0; ByteArrayPool_mediumCount = 0; ByteArrayPool_largeCount = 0; - field3772 = 0; - field3775 = 1000; - field3778 = 250; - field3773 = 100; - field3771 = 50; + field3774 = 0; + field3779 = 1000; + field3775 = 250; + field3777 = 100; + field3778 = 50; ByteArrayPool_small = new byte[1000][]; ByteArrayPool_medium = new byte[250][]; ByteArrayPool_large = new byte[100][]; - field3767 = new byte[50][]; - field3766 = new ArrayList(); - field3766.clear(); - field3766.add(100); - field3766.add(5000); - field3766.add(10000); - field3766.add(30000); + field3768 = new byte[50][]; + field3780 = new ArrayList(); + Renderable.method1514(); new HashMap(); } - @ObfuscatedName("ac") + @ObfuscatedName("hb") @ObfuscatedSignature( - descriptor = "(IZI)[B", - garbageValue = "664601398" + descriptor = "(I)V", + garbageValue = "1234231525" ) - @Export("ByteArrayPool_getArrayBool") - public static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { - byte[] var2; - if ((var0 == 100 || var0 < 100 && var1) && ByteArrayPool_smallCount > 0) { - var2 = ByteArrayPool_small[--ByteArrayPool_smallCount]; - ByteArrayPool_small[ByteArrayPool_smallCount] = null; - return var2; - } else if ((var0 == 5000 || var0 < 5000 && var1) && ByteArrayPool_mediumCount > 0) { - var2 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; - ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; - return var2; - } else if ((var0 == 10000 || var0 < 10000 && var1) && ByteArrayPool_largeCount > 0) { - var2 = ByteArrayPool_large[--ByteArrayPool_largeCount]; - ByteArrayPool_large[ByteArrayPool_largeCount] = null; - return var2; - } else if ((var0 == 30000 || var0 < 30000 && var1) && field3772 > 0) { - var2 = field3767[--field3772]; - field3767[field3772] = null; - return var2; - } else { - int var4; - if (class28.ByteArrayPool_arrays != null) { - for (var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) { - if ((ByteArrayPool_alternativeSizes[var4] == var0 || var0 < ByteArrayPool_alternativeSizes[var4] && var1) && class425.ByteArrayPool_altSizeArrayCounts[var4] > 0) { - byte[] var3 = class28.ByteArrayPool_arrays[var4][--class425.ByteArrayPool_altSizeArrayCounts[var4]]; - class28.ByteArrayPool_arrays[var4][class425.ByteArrayPool_altSizeArrayCounts[var4]] = null; - return var3; - } - } - } + @Export("reloadJS5") + static void reloadJS5() { + if (class176.varcs.hasUnwrittenChanges()) { + class176.varcs.write(); + } - if (var1 && ByteArrayPool_alternativeSizes != null) { - for (var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) { - if (var0 <= ByteArrayPool_alternativeSizes[var4] && class425.ByteArrayPool_altSizeArrayCounts[var4] < class28.ByteArrayPool_arrays[var4].length) { - return new byte[ByteArrayPool_alternativeSizes[var4]]; - } - } + class53.method307(); + if (Message.mouseRecorder != null) { + Message.mouseRecorder.isRunning = false; + } + + Message.mouseRecorder = null; + Client.packetWriter.close(); + if (GameEngine.taskHandler != null) { + try { + GameEngine.taskHandler.close(); + } catch (Exception var3) { } + } + + GameEngine.taskHandler = null; + ObjectSound.method424(); + class182.method921(); + class36.scene.clear(); + + for (int var1 = 0; var1 < 4; ++var1) { + Client.collisionMaps[var1].clear(); + } - return new byte[var0]; + NewShit.worldMap = null; + WorldMapManager.method1265(0, 0); + class472.method2350(); + Client.playingJingle = false; + WorldMapSectionType.method1311(); + if (MusicPatchPcmStream.pcmPlayer1 != null) { + MusicPatchPcmStream.pcmPlayer1.shutdown(); } + + WorldMapSectionType.field2038.method1962(); + class227.method1164(); + if (class60.urlRequester != null) { + class60.urlRequester.close(); + } + + HealthBarDefinition.method916(); + JagexCache.JagexCache_dat2File = null; + JagexCache.JagexCache_idx255File = null; + KeyHandler.JagexCache_idxFiles = null; + ObjTypeCustomisation.method876(); + class302.field2511 = null; + Client.archiveLoaders.clear(); + Client.field549 = 0; + WorldMapSectionType.field2038 = new JagNetThread(); + class60.urlRequester = new class113(SpriteMask.client.field661, 218); + + try { + class339.method1744("oldschool", ItemLayer.field2109, class191.field1585.name, 0, 23); + } catch (IOException var2) { + throw new RuntimeException(var2); + } + + class302.field2511 = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + GameEngine.taskHandler = new TaskHandler(); + SpriteMask.client.method164(); + Client.field414 = class92.field942; + WorldMapSection2.updateGameState(0); } } \ No newline at end of file diff --git a/osrs/src/main/java/Calendar.java b/osrs/src/main/java/Calendar.java index af510fbde..1d9a24a37 100644 --- a/osrs/src/main/java/Calendar.java +++ b/osrs/src/main/java/Calendar.java @@ -1,20 +1,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; import java.util.TimeZone; -@ObfuscatedName("na") +@ObfuscatedName("nc") @Implements("Calendar") public class Calendar { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("MONTH_NAMES_ENGLISH_GERMAN") public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("DAYS_OF_THE_WEEK") public static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("Calendar_calendar") public static java.util.Calendar Calendar_calendar; @@ -24,26 +23,4 @@ public class Calendar { java.util.Calendar.getInstance(); Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)[Lnp;", - garbageValue = "1714112630" - ) - public static StudioGame[] method1889() { - return new StudioGame[]{StudioGame.game3, StudioGame.game5, StudioGame.runescape, StudioGame.stellardawn, StudioGame.oldscape, StudioGame.game4}; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1782569305" - ) - public static void method1890(boolean var0) { - if (var0 != HealthBarUpdate.ItemDefinition_inMembersWorld) { - class315.method1655(); - HealthBarUpdate.ItemDefinition_inMembersWorld = var0; - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/Canvas.java b/osrs/src/main/java/Canvas.java index e3be655f1..b0e7fc3c0 100644 --- a/osrs/src/main/java/Canvas.java +++ b/osrs/src/main/java/Canvas.java @@ -5,17 +5,17 @@ import java.awt.*; import java.net.URL; +import java.util.Iterator; -@ObfuscatedName("at") +@ObfuscatedName("ag") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("sa") + @ObfuscatedName("fk") @ObfuscatedSignature( - descriptor = "Lva;" + descriptor = "Loh;" ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("ac") + static Archive field68; + @ObfuscatedName("at") @Export("component") Component component; @@ -31,59 +31,182 @@ public final void paint(Graphics var1) { this.component.paint(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1694208579" + descriptor = "(II)Lhd;", + garbageValue = "-1413317241" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (class91.World_request == null) { - class91.World_request = AbstractWorldMapIcon.urlRequester.request(new URL(class59.field307)); - } else if (class91.World_request.isDone()) { - byte[] var0 = class91.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - UserComparator3.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = UserComparator3.World_worlds[var2] = new World(); - var3.id = var1.readUnsignedShort(); - var3.properties = var1.readInt(); - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); - var3.location = var1.readUnsignedByte(); - var3.population = var1.readShort(); + public static FloorOverlayDefinition method85(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); + var1 = new FloorOverlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)Lha;", + garbageValue = "-2114676262" + ) + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", + garbageValue = "50" + ) + static boolean method88(String var0, int var1, String var2) { + if (var1 == 0) { + try { + if (!class31.field86.startsWith("win")) { + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { + throw new Exception(); + } else { + String var10 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var10.indexOf(var0.charAt(var4)) == -1) { + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); + return true; } + } catch (Throwable var5) { + return false; + } + } else if (var1 == 1) { + try { + Object var3 = class26.invoke(class31.field85, var2, new Object[]{(new URL(class31.field85.getCodeBase(), var0)).toString()}); + return var3 != null; + } catch (Throwable var6) { + return false; + } + } else if (var1 == 2) { + try { + class31.field85.getAppletContext().showDocument(new URL(class31.field85.getCodeBase(), var0), "_blank"); + return true; + } catch (Exception var7) { + return false; + } + } else if (var1 == 3) { + try { + class26.method108(class31.field85, "loggedout"); + } catch (Throwable var9) { + } - class12.sortWorlds(UserComparator3.World_worlds, 0, UserComparator3.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - class91.World_request = null; + try { + class31.field85.getAppletContext().showDocument(new URL(class31.field85.getCodeBase(), var0), "_top"); return true; + } catch (Exception var8) { + return false; } - } catch (Exception var4) { - var4.printStackTrace(); - class91.World_request = null; + } else { + throw new IllegalArgumentException(); } + } - return false; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(FFFFLfm;I)V", + garbageValue = "-2092193307" + ) + static void method90(float var0, float var1, float var2, float var3, class131 var4) { + float var5 = var1 - var0; + float var6 = var2 - var1; + float var7 = var3 - var2; + float var8 = var6 - var5; + var4.field1262 = var7 - var6 - var8; + var4.field1269 = var8 + var8 + var8; + var4.field1266 = var5 + var5 + var5; + var4.field1268 = var0; } @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnm;I)I", - garbageValue = "-907105353" + descriptor = "(B)V", + garbageValue = "6" + ) + static void method89() { + Script.Script_cached.clear(); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-18" ) - static int method88(Widget var0) { - if (var0.type != 11) { - Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize - 1] = ""; - return 1; + static void method87() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromIgnored(); + } + + } + + @ObfuscatedName("js") + @ObfuscatedSignature( + descriptor = "(Ldf;II)V", + garbageValue = "330156995" + ) + static final void method91(Actor var0, int var1) { + class514.worldToScreen(var0.x, var0.y, var1); + } + + @ObfuscatedName("ln") + @ObfuscatedSignature( + descriptor = "(IIIIIIIII)V", + garbageValue = "1842329520" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (HealthBarDefinition.widgetDefinition.loadInterface(var0)) { + UserComparator10.field1197 = null; + SoundSystem.drawInterface(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (UserComparator10.field1197 != null) { + SoundSystem.drawInterface(UserComparator10.field1197, -1412584499, var1, var2, var3, var4, ParamComposition.field1629, PendingSpawn.field950, var7); + UserComparator10.field1197 = null; + } + } else { - String var1 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var0.method1869(var1); - return 1; + if (var7 != -1) { + Client.field407[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { + Client.field407[var8] = true; + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/ChatChannel.java b/osrs/src/main/java/ChatChannel.java index 8b9c71d9f..9ff7711e6 100644 --- a/osrs/src/main/java/ChatChannel.java +++ b/osrs/src/main/java/ChatChannel.java @@ -3,19 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") +@ObfuscatedName("dk") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("lv") - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; @ObfuscatedName("al") + static int[] field835; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[Lcr;" + descriptor = "[Lco;" ) @Export("messages") Message[] messages; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("count") int count; @@ -23,10 +22,10 @@ public class ChatChannel { this.messages = new Message[100]; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lcr;", - garbageValue = "-1" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lco;", + garbageValue = "-698368105" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { @@ -54,20 +53,20 @@ Message addMessage(int var1, String var2, String var3, String var4) { return var5; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)Lcr;", - garbageValue = "-1861075879" + descriptor = "(II)Lco;", + garbageValue = "-649876518" ) @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1856127113" + garbageValue = "519230888" ) @Export("size") int size() { diff --git a/osrs/src/main/java/ClanChannel.java b/osrs/src/main/java/ClanChannel.java index f7fe4f7af..cb597445a 100644 --- a/osrs/src/main/java/ClanChannel.java +++ b/osrs/src/main/java/ClanChannel.java @@ -7,51 +7,48 @@ import java.util.BitSet; import java.util.List; -@ObfuscatedName("gb") +@ObfuscatedName("gn") @Implements("ClanChannel") public class ClanChannel extends Node { - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lun;" - ) - static IndexedSprite field1409; - @ObfuscatedName("ac") - boolean field1410; - @ObfuscatedName("al") - boolean field1411; - @ObfuscatedName("ak") + @ObfuscatedName("aw") + public static String field1413; + @ObfuscatedName("at") + boolean field1415; + @ObfuscatedName("ah") + boolean field1414; + @ObfuscatedName("ar") @Export("members") public List members; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("ao") - public long field1417; - @ObfuscatedName("ah") + @ObfuscatedName("ab") + public long field1421; + @ObfuscatedName("au") @Export("name") public String name; - @ObfuscatedName("ar") - public byte field1414; - @ObfuscatedName("ab") - public byte field1413; + @ObfuscatedName("aa") + public byte field1417; + @ObfuscatedName("ac") + public byte field1418; static { new BitSet(65536); } @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;)V" ) public ClanChannel(Buffer var1) { - this.field1411 = true; + this.field1414 = true; this.name = null; - this.method870(var1); + this.method859(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)[I", - garbageValue = "-35" + garbageValue = "85" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -60,20 +57,20 @@ public int[] getSortedMembers() { this.sortedMembers = new int[this.members.size()]; for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { - var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method2740(); + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method2718(); } int[] var3 = this.sortedMembers; - class161.method846(var1, var3, 0, var1.length - 1); + class475.method2362(var1, var3, 0, var1.length - 1); } return this.sortedMembers; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lfv;B)V", - garbageValue = "0" + descriptor = "(Lft;I)V", + garbageValue = "1476937216" ) @Export("addMember") void addMember(ClanChannelMember var1) { @@ -81,10 +78,10 @@ void addMember(ClanChannelMember var1) { this.sortedMembers = null; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-32" + garbageValue = "93" ) @Export("removeMember") void removeMember(int var1) { @@ -92,22 +89,22 @@ void removeMember(int var1) { this.sortedMembers = null; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1630727140" + descriptor = "(B)I", + garbageValue = "0" ) - public int method868() { + public int method857() { return this.members.size(); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1421976889" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "-62" ) - public int method869(String var1) { - if (!this.field1411) { + public int method858(String var1) { + if (!this.field1414) { throw new RuntimeException("Displaynames not available"); } else { for (int var2 = 0; var2 < this.members.size(); ++var2) { @@ -120,19 +117,19 @@ public int method869(String var1) { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "446907071" + descriptor = "(Luj;B)V", + garbageValue = "92" ) - void method870(Buffer var1) { + void method859(Buffer var1) { int var2 = var1.readUnsignedByte(); if ((var2 & 1) != 0) { - this.field1410 = true; + this.field1415 = true; } if ((var2 & 2) != 0) { - this.field1411 = true; + this.field1414 = true; } int var3 = 2; @@ -141,22 +138,22 @@ void method870(Buffer var1) { } super.key = var1.readLong(); - this.field1417 = var1.readLong(); + this.field1421 = var1.readLong(); this.name = var1.readStringCp1252NullTerminated(); var1.readBoolean(); - this.field1413 = var1.readByte(); - this.field1414 = var1.readByte(); + this.field1418 = var1.readByte(); + this.field1417 = var1.readByte(); int var4 = var1.readUnsignedShort(); if (var4 > 0) { this.members = new ArrayList(var4); for (int var5 = 0; var5 < var4; ++var5) { ClanChannelMember var6 = new ClanChannelMember(); - if (this.field1410) { + if (this.field1415) { var1.readLong(); } - if (this.field1411) { + if (this.field1414) { var6.username = new Username(var1.readStringCp1252NullTerminated()); } @@ -172,53 +169,53 @@ void method870(Buffer var1) { } - @ObfuscatedName("al") + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-18" + ) + public static boolean method853(int var0) { + return (var0 >> 22 & 1) != 0; + } + + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IB)Lhm;", - garbageValue = "77" + descriptor = "(IIB)I", + garbageValue = "-82" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static final int method861(int var0, int var1) { + if (var0 == -1) { + return 12345678; } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; } - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; + return (var0 & 65408) + var1; } } - @ObfuscatedName("nz") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(IIII)Lde;", - garbageValue = "203333818" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1458009071" ) - @Export("ifOpenSub") - static final InterfaceParent ifOpenSub(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - class357.method1901(var1); - Widget var4 = class33.widgetDefinition.method1740(var0); - ClanChannelMember.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - ClanChannelMember.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; + } - PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var0 >> 16], var4, false); - VerticalAlignment.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - Interpreter.runIntfCloseListener(Client.rootInterface, 1); + @ObfuscatedName("ml") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1117566535" + ) + static final void method862(int var0) { + if (HealthBarDefinition.widgetDefinition.loadInterface(var0)) { + SoundCache.drawModelComponents(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var0], -1); } - - return var3; } } \ No newline at end of file diff --git a/osrs/src/main/java/ClanChannelMember.java b/osrs/src/main/java/ClanChannelMember.java index 3ea704bab..60775c583 100644 --- a/osrs/src/main/java/ClanChannelMember.java +++ b/osrs/src/main/java/ClanChannelMember.java @@ -3,24 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("ft") @Implements("ClanChannelMember") public class ClanChannelMember { - @ObfuscatedName("tt") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - @Export("guestClanChannel") - static ClanChannel guestClanChannel; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("rank") public byte rank; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("world") public int world; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lvf;" + descriptor = "Lvj;" ) @Export("username") public Username username; @@ -28,60 +22,33 @@ public class ClanChannelMember { ClanChannelMember() { } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1441597193" - ) - public static int method771(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var1; - } else if (var2 == 1) { - return 7 - var0; - } else { - return var2 == 2 ? 7 - var1 : var0; - } - } - - @ObfuscatedName("al") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lln;Lvd;I)Llx;", - garbageValue = "2045853930" + descriptor = "(ILdt;ZI)I", + garbageValue = "-1206628329" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = class306.method1639(); - var2.clientPacket = var0; - var2.clientPacketLength = var0.length; - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { - var2.packetBuffer = new PacketBuffer(100); + static int method768(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + if (var0 == 1500) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == 1501) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == 1502) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == 1503) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == 1504) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == 1505) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.parentId; + return 1; } else { - var2.packetBuffer = new PacketBuffer(260); + return 2; } - - var2.packetBuffer.setIsaacCipher(var1); - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); - var2.index = 0; - return var2; - } - - @ObfuscatedName("ms") - @ObfuscatedSignature( - descriptor = "(Lnm;I)V", - garbageValue = "1124709425" - ) - @Export("invalidateWidget") - public static void invalidateWidget(Widget var0) { - if (var0 != null && var0.cycle == Client.field523) { - Client.field408[var0.rootIndex] = true; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/ClanMate.java b/osrs/src/main/java/ClanMate.java index d19254b30..acf4958d3 100644 --- a/osrs/src/main/java/ClanMate.java +++ b/osrs/src/main/java/ClanMate.java @@ -3,18 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rm") +@ObfuscatedName("rp") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lra;" + descriptor = "Lrw;" ) @Export("friend") TriBool friend; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lra;" + descriptor = "Lrw;" ) @Export("ignored") TriBool ignored; @@ -24,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1815552840" + descriptor = "(S)V", + garbageValue = "-19628" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-709167908" + garbageValue = "-1857487386" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public final boolean isFriend() { return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("ah") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1239857697" + garbageValue = "-711176995" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = InvDefinition.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.friend = class12.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1599253716" + descriptor = "(B)V", + garbageValue = "66" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("ag") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "166606102" + descriptor = "(S)Z", + garbageValue = "-21149" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,13 +82,13 @@ public final boolean isIgnored() { return this.ignored == TriBool.TriBool_true; } - @ObfuscatedName("aa") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1341614247" + garbageValue = "1915523322" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = InvDefinition.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.ignored = class12.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } } \ No newline at end of file diff --git a/osrs/src/main/java/ClanSettings.java b/osrs/src/main/java/ClanSettings.java index b2b385840..931a2d60d 100644 --- a/osrs/src/main/java/ClanSettings.java +++ b/osrs/src/main/java/ClanSettings.java @@ -3,95 +3,95 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("fc") @Implements("ClanSettings") public class ClanSettings { - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("useHashes") boolean useHashes; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("useNames") boolean useNames; - @ObfuscatedName("ax") - long field1363; @ObfuscatedName("ao") - public int field1375; - @ObfuscatedName("ah") + long field1374; + @ObfuscatedName("ab") + public int field1385; + @ObfuscatedName("au") @Export("name") public String name; - @ObfuscatedName("ar") - int field1360; - @ObfuscatedName("ab") + @ObfuscatedName("aa") + int field1371; + @ObfuscatedName("ac") @Export("allowGuests") public boolean allowGuests; - @ObfuscatedName("am") - public byte field1371; - @ObfuscatedName("av") - public byte field1372; - @ObfuscatedName("ag") - public byte field1370; - @ObfuscatedName("aa") - public byte field1369; + @ObfuscatedName("al") + public byte field1380; + @ObfuscatedName("az") + public byte field1383; @ObfuscatedName("ap") + public byte field1381; + @ObfuscatedName("av") + public byte field1382; + @ObfuscatedName("ax") @Export("memberCount") public int memberCount; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("memberHashes") long[] memberHashes; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("memberRanks") public byte[] memberRanks; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("an") - int[] field1362; - @ObfuscatedName("au") - public int[] field1379; + @ObfuscatedName("aj") + int[] field1372; + @ObfuscatedName("am") + public int[] field1390; + @ObfuscatedName("aq") + public boolean[] field1379; @ObfuscatedName("ai") - public boolean[] field1368; - @ObfuscatedName("ae") @Export("currentOwner") public int currentOwner; @ObfuscatedName("aw") - public int field1378; - @ObfuscatedName("aq") + public int field1388; + @ObfuscatedName("ae") @Export("bannedMemberCount") public int bannedMemberCount; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("bannedMemberHashes") long[] bannedMemberHashes; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("memberNames") public String[] memberNames; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("bannedMemberNames") public String[] bannedMemberNames; - @ObfuscatedName("ad") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Ltz;" ) @Export("parameters") IterableNodeHashTable parameters; @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;)V" ) public ClanSettings(Buffer var1) { - this.field1375 = 0; + this.field1385 = 0; this.name = null; - this.field1360 = 0; + this.field1371 = 0; this.currentOwner = -1; - this.field1378 = -1; - this.method831(var1); + this.field1388 = -1; + this.method818(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-22" + garbageValue = "95" ) - void method811(int var1) { + void method798(int var1) { if (this.useHashes) { if (this.memberHashes != null) { System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); @@ -114,32 +114,32 @@ void method811(int var1) { this.memberRanks = new byte[var1]; } - if (this.field1362 != null) { - System.arraycopy(this.field1362, 0, this.field1362 = new int[var1], 0, this.memberCount); + if (this.field1372 != null) { + System.arraycopy(this.field1372, 0, this.field1372 = new int[var1], 0, this.memberCount); } else { - this.field1362 = new int[var1]; + this.field1372 = new int[var1]; } - if (this.field1379 != null) { - System.arraycopy(this.field1379, 0, this.field1379 = new int[var1], 0, this.memberCount); + if (this.field1390 != null) { + System.arraycopy(this.field1390, 0, this.field1390 = new int[var1], 0, this.memberCount); } else { - this.field1379 = new int[var1]; + this.field1390 = new int[var1]; } - if (this.field1368 != null) { - System.arraycopy(this.field1368, 0, this.field1368 = new boolean[var1], 0, this.memberCount); + if (this.field1379 != null) { + System.arraycopy(this.field1379, 0, this.field1379 = new boolean[var1], 0, this.memberCount); } else { - this.field1368 = new boolean[var1]; + this.field1379 = new boolean[var1]; } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "25" + descriptor = "(II)V", + garbageValue = "-1189145621" ) - void method812(int var1) { + void method799(int var1) { if (this.useHashes) { if (this.bannedMemberHashes != null) { System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); @@ -158,12 +158,12 @@ void method812(int var1) { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-288941295" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "1" ) - public int method813(String var1) { + public int method800(String var1) { if (var1 != null && var1.length() != 0) { for (int var2 = 0; var2 < this.memberCount; ++var2) { if (this.memberNames[var2].equals(var1)) { @@ -177,20 +177,20 @@ public int method813(String var1) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "1759031552" + garbageValue = "1718718774" ) - public int method814(int var1, int var2, int var3) { + public int method801(int var1, int var2, int var3) { int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; - return (this.field1362[var1] & var4) >>> var2; + return (this.field1372[var1] & var4) >>> var2; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/Integer;", - garbageValue = "1853842367" + garbageValue = "2128934080" ) @Export("getTitleGroupValue") public Integer getTitleGroupValue(int var1) { @@ -202,10 +202,10 @@ public Integer getTitleGroupValue(int var1) { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "1632099437" + garbageValue = "-672366104" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -221,29 +221,29 @@ public int[] getSortedMembers() { } int[] var3 = this.sortedMembers; - class161.method846(var1, var3, 0, var1.length - 1); + class475.method2362(var1, var3, 0, var1.length - 1); } return this.sortedMembers; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;II)V", - garbageValue = "597392143" + garbageValue = "613838614" ) - void method817(long var1, String var3, int var4) { + void method804(long var1, String var3, int var4) { if (var3 != null && var3.length() == 0) { var3 = null; } if (var1 > 0L != this.useHashes) { throw new RuntimeException(""); - } else if (this.useNames != (var3 != null)) { + } else if (var3 != null != this.useNames) { throw new RuntimeException(""); } else { if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { - this.method811(this.memberCount + 5); + this.method798(this.memberCount + 5); } if (this.memberHashes != null) { @@ -261,20 +261,20 @@ void method817(long var1, String var3, int var4) { this.memberRanks[this.memberCount] = 0; } - this.field1362[this.memberCount] = 0; - this.field1379[this.memberCount] = var4; - this.field1368[this.memberCount] = false; + this.field1372[this.memberCount] = 0; + this.field1390[this.memberCount] = var4; + this.field1379[this.memberCount] = false; ++this.memberCount; this.sortedMembers = null; } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "45" + descriptor = "(II)V", + garbageValue = "2072484175" ) - void method818(int var1) { + void method806(int var1) { if (var1 >= 0 && var1 < this.memberCount) { --this.memberCount; this.sortedMembers = null; @@ -282,16 +282,16 @@ void method818(int var1) { this.memberHashes = null; this.memberNames = null; this.memberRanks = null; - this.field1362 = null; + this.field1372 = null; + this.field1390 = null; this.field1379 = null; - this.field1368 = null; this.currentOwner = -1; - this.field1378 = -1; + this.field1388 = -1; } else { System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); - System.arraycopy(this.field1362, var1 + 1, this.field1362, var1, this.memberCount - var1); + System.arraycopy(this.field1372, var1 + 1, this.field1372, var1, this.memberCount - var1); + System.arraycopy(this.field1390, var1 + 1, this.field1390, var1, this.memberCount - var1); System.arraycopy(this.field1379, var1 + 1, this.field1379, var1, this.memberCount - var1); - System.arraycopy(this.field1368, var1 + 1, this.field1368, var1, this.memberCount - var1); if (this.memberHashes != null) { System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); } @@ -308,32 +308,32 @@ void method818(int var1) { } } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-645370304" + descriptor = "(B)V", + garbageValue = "-7" ) @Export("updateOwner") void updateOwner() { if (this.memberCount == 0) { this.currentOwner = -1; - this.field1378 = -1; + this.field1388 = -1; } else { this.currentOwner = -1; - this.field1378 = -1; + this.field1388 = -1; int var1 = 0; byte var2 = this.memberRanks[0]; for (int var3 = 1; var3 < this.memberCount; ++var3) { if (this.memberRanks[var3] > var2) { if (var2 == 125) { - this.field1378 = var1; + this.field1388 = var1; } var1 = var3; var2 = this.memberRanks[var3]; - } else if (this.field1378 == -1 && this.memberRanks[var3] == 125) { - this.field1378 = var3; + } else if (this.field1388 == -1 && this.memberRanks[var3] == 125) { + this.field1388 = var3; } } @@ -345,12 +345,12 @@ void updateOwner() { } } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;I)V", - garbageValue = "1288611513" + garbageValue = "-1952730404" ) - void method820(long var1, String var3) { + void method808(long var1, String var3) { if (var3 != null && var3.length() == 0) { var3 = null; } @@ -361,7 +361,7 @@ void method820(long var1, String var3) { throw new RuntimeException(""); } else { if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { - this.method812(this.bannedMemberCount + 5); + this.method799(this.bannedMemberCount + 5); } if (this.bannedMemberHashes != null) { @@ -376,12 +376,12 @@ void method820(long var1, String var3) { } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1133861013" + garbageValue = "-1253930747" ) - void method821(int var1) { + void method809(int var1) { --this.bannedMemberCount; if (this.bannedMemberCount == 0) { this.bannedMemberHashes = null; @@ -398,14 +398,14 @@ void method821(int var1) { } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(IBB)I", - garbageValue = "110" + garbageValue = "-88" ) - int method822(int var1, byte var2) { + int method810(int var1, byte var2) { if (var2 != 126 && var2 != 127) { - if (this.currentOwner == var1 && (this.field1378 == -1 || this.memberRanks[this.field1378] < 125)) { + if (this.currentOwner == var1 && (this.field1388 == -1 || this.memberRanks[this.field1388] < 125)) { return -1; } else if (this.memberRanks[var1] == var2) { return -1; @@ -419,15 +419,15 @@ int method822(int var1, byte var2) { } } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "848193095" + descriptor = "(IB)Z", + garbageValue = "7" ) - boolean method823(int var1) { + boolean method811(int var1) { if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { this.memberRanks[this.currentOwner] = 125; - this.field1378 = this.currentOwner; + this.field1388 = this.currentOwner; this.memberRanks[var1] = 126; this.currentOwner = var1; return true; @@ -436,47 +436,47 @@ boolean method823(int var1) { } } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(IZI)I", - garbageValue = "345939318" + garbageValue = "-1328118008" ) - int method824(int var1, boolean var2) { - if (this.field1368[var1] == var2) { + int method812(int var1, boolean var2) { + if (this.field1379[var1] == var2) { return -1; } else { - this.field1368[var1] = var2; + this.field1379[var1] = var2; return var1; } } - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "-29" + descriptor = "(IIIII)I", + garbageValue = "2048454468" ) - int method825(int var1, int var2, int var3, int var4) { + int method813(int var1, int var2, int var3, int var4) { int var5 = (1 << var3) - 1; int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; int var7 = var6 ^ var5; var2 <<= var3; var2 &= var7; - int var8 = this.field1362[var1]; + int var8 = this.field1372[var1]; if ((var8 & var7) == var2) { return -1; } else { var8 &= ~var7; - this.field1362[var1] = var8 | var2; + this.field1372[var1] = var8 | var2; return var1; } } - @ObfuscatedName("aj") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "585633360" + garbageValue = "2056023373" ) - boolean method826(int var1, int var2) { + boolean method814(int var1, int var2) { if (this.parameters != null) { Node var3 = this.parameters.get((long)var1); if (var3 != null) { @@ -500,12 +500,12 @@ boolean method826(int var1, int var2) { return true; } - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(IIIII)Z", - garbageValue = "-420623843" + garbageValue = "-303137716" ) - boolean method827(int var1, int var2, int var3, int var4) { + boolean method815(int var1, int var2, int var3, int var4) { int var5 = (1 << var3) - 1; int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; int var7 = var6 ^ var5; @@ -535,8 +535,8 @@ boolean method827(int var1, int var2, int var3, int var4) { return true; } - @ObfuscatedName("au") - boolean method829(int var1, long var2) { + @ObfuscatedName("am") + boolean method816(int var1, long var2) { if (this.parameters != null) { Node var4 = this.parameters.get((long)var1); if (var4 != null) { @@ -560,12 +560,12 @@ boolean method829(int var1, long var2) { return true; } - @ObfuscatedName("ai") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Z", - garbageValue = "0" + descriptor = "(ILjava/lang/String;I)Z", + garbageValue = "-1755861280" ) - boolean method830(int var1, String var2) { + boolean method817(int var1, String var2) { if (var2 == null) { var2 = ""; } else if (var2.length() > 80) { @@ -598,12 +598,12 @@ boolean method830(int var1, String var2) { return true; } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "1254240423" + descriptor = "(Luj;B)V", + garbageValue = "-1" ) - void method831(Buffer var1) { + void method818(Buffer var1) { int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 6) { int var3 = var1.readUnsignedByte(); @@ -625,10 +625,10 @@ void method831(Buffer var1) { this.bannedMemberNames = null; } - this.field1375 = var1.readInt(); - this.field1360 = var1.readInt(); - if (var2 <= 3 && this.field1360 != 0) { - this.field1360 += 16912800; + this.field1385 = var1.readInt(); + this.field1371 = var1.readInt(); + if (var2 <= 3 && this.field1371 != 0) { + this.field1371 += 16912800; } this.memberCount = var1.readUnsignedShort(); @@ -639,10 +639,10 @@ void method831(Buffer var1) { } this.allowGuests = var1.readUnsignedByte() == 1; - this.field1371 = var1.readByte(); - this.field1372 = var1.readByte(); - this.field1370 = var1.readByte(); - this.field1369 = var1.readByte(); + this.field1380 = var1.readByte(); + this.field1383 = var1.readByte(); + this.field1381 = var1.readByte(); + this.field1382 = var1.readByte(); int var4; if (this.memberCount > 0) { if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { @@ -657,16 +657,16 @@ void method831(Buffer var1) { this.memberRanks = new byte[this.memberCount]; } - if (this.field1362 == null || this.field1362.length < this.memberCount) { - this.field1362 = new int[this.memberCount]; + if (this.field1372 == null || this.field1372.length < this.memberCount) { + this.field1372 = new int[this.memberCount]; } - if (this.field1379 == null || this.field1379.length < this.memberCount) { - this.field1379 = new int[this.memberCount]; + if (this.field1390 == null || this.field1390.length < this.memberCount) { + this.field1390 = new int[this.memberCount]; } - if (this.field1368 == null || this.field1368.length < this.memberCount) { - this.field1368 = new boolean[this.memberCount]; + if (this.field1379 == null || this.field1379.length < this.memberCount) { + this.field1379 = new boolean[this.memberCount]; } for (var4 = 0; var4 < this.memberCount; ++var4) { @@ -680,19 +680,19 @@ void method831(Buffer var1) { this.memberRanks[var4] = var1.readByte(); if (var2 >= 2) { - this.field1362[var4] = var1.readInt(); + this.field1372[var4] = var1.readInt(); } if (var2 >= 5) { - this.field1379[var4] = var1.readUnsignedShort(); + this.field1390[var4] = var1.readUnsignedShort(); } else { - this.field1379[var4] = 0; + this.field1390[var4] = 0; } if (var2 >= 6) { - this.field1368[var4] = var1.readUnsignedByte() == 1; + this.field1379[var4] = var1.readUnsignedByte() == 1; } else { - this.field1368[var4] = false; + this.field1379[var4] = false; } } @@ -722,7 +722,7 @@ void method831(Buffer var1) { if (var2 >= 3) { var4 = var1.readUnsignedShort(); if (var4 > 0) { - this.parameters = new IterableNodeHashTable(var4 < 16 ? EnumComposition.method999(var4) : 16); + this.parameters = new IterableNodeHashTable(var4 < 16 ? class184.method927(var4) : 16); while (var4-- > 0) { int var5 = var1.readInt(); @@ -747,36 +747,199 @@ void method831(Buffer var1) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(ZZI)Lun;", - garbageValue = "-1436227031" + descriptor = "(Lri;FFFI)F", + garbageValue = "-584068586" ) - static IndexedSprite method828(boolean var0, boolean var1) { - return var0 ? (var1 ? ClanChannel.field1409 : class534.options_buttons_2Sprite) : (var1 ? class305.field2513 : class519.options_buttons_0Sprite); + static float method805(class464 var0, float var1, float var2, float var3) { + float var4 = class251.method1335(var0.field3921, var0.field3922, var1); + if (Math.abs(var4) < class127.field1219) { + return var1; + } else { + float var5 = class251.method1335(var0.field3921, var0.field3922, var2); + if (Math.abs(var5) < class127.field1219) { + return var2; + } else { + float var6 = 0.0F; + float var7 = 0.0F; + float var8 = 0.0F; + float var13 = 0.0F; + boolean var14 = true; + boolean var15 = false; + + do { + var15 = false; + if (var14) { + var6 = var1; + var13 = var4; + var7 = var2 - var1; + var8 = var7; + var14 = false; + } + + if (Math.abs(var13) < Math.abs(var5)) { + var1 = var2; + var2 = var6; + var6 = var1; + var4 = var5; + var5 = var13; + var13 = var4; + } + + float var16 = class127.field1218 * Math.abs(var2) + 0.5F * var3; + float var17 = (var6 - var2) * 0.5F; + boolean var18 = Math.abs(var17) > var16 && var5 != 0.0F; + if (var18) { + if (Math.abs(var8) >= var16 && Math.abs(var4) > Math.abs(var5)) { + float var12 = var5 / var4; + float var9; + float var10; + if (var6 == var1) { + var9 = var12 * var17 * 2.0F; + var10 = 1.0F - var12; + } else { + var10 = var4 / var13; + float var11 = var5 / var13; + var9 = (var17 * 2.0F * var10 * (var10 - var11) - (var2 - var1) * (var11 - 1.0F)) * var12; + var10 = (var12 - 1.0F) * (var11 - 1.0F) * (var10 - 1.0F); + } + + if ((double)var9 > 0.0D) { + var10 = -var10; + } else { + var9 = -var9; + } + + var12 = var8; + var8 = var7; + if (var9 * 2.0F < var17 * 3.0F * var10 - Math.abs(var16 * var10) && var9 < Math.abs(var12 * 0.5F * var10)) { + var7 = var9 / var10; + } else { + var7 = var17; + var8 = var17; + } + } else { + var7 = var17; + var8 = var17; + } + + var1 = var2; + var4 = var5; + if (Math.abs(var7) > var16) { + var2 += var7; + } else if ((double)var17 > 0.0D) { + var2 += var16; + } else { + var2 -= var16; + } + + var5 = class251.method1335(var0.field3921, var0.field3922, var2); + if ((double)(var5 * (var13 / Math.abs(var13))) > 0.0D) { + var14 = true; + var15 = true; + } else { + var15 = true; + } + } + } while(var15); + + return var2; + } + } } - @ObfuscatedName("ak") + @ObfuscatedName("ki") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "116" + descriptor = "(IIS)V", + garbageValue = "25188" ) - static int method810(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[ItemLayer.Client_plane][var0][var1]; if (var2 == null) { - return 0; - } else if (var1 == -1) { - return 0; + class36.scene.removeGroundItemPile(ItemLayer.Client_plane, var0, var1); } else { - int var3 = 0; + long var3 = -99999999L; + TileItem var5 = null; + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + ItemComposition var7 = class214.ItemDefinition_get(var6.id); + long var8 = (long)var7.price; + if (var7.isStackable == 1) { + var8 *= var6.quantity < Integer.MAX_VALUE ? (long)(var6.quantity + 1) : (long)var6.quantity; + } + + if (var8 > var3) { + var3 = var8; + var5 = var6; + } + } + + if (var5 == null) { + class36.scene.removeGroundItemPile(ItemLayer.Client_plane, var0, var1); + } else { + var2.addLast(var5); + TileItem var12 = null; + TileItem var11 = null; + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + if (var6.id != var5.id) { + if (var12 == null) { + var12 = var6; + } - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; + if (var6.id != var12.id && var11 == null) { + var11 = var6; + } + } } + + long var9 = Player.calculateTag(var0, var1, 3, false, 0); + class36.scene.newGroundItemPile(ItemLayer.Client_plane, var0, var1, WorldMapDecorationType.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, ItemLayer.Client_plane), var5, var9, var12, var11); + } + } + } + + @ObfuscatedName("ko") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static final void method820() { + int var0 = FriendSystem.menuX; + int var1 = class60.menuY; + int var2 = class428.menuWidth; + int var3 = class515.menuHeight; + int var4 = 6116423; + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); + GrandExchangeOfferTotalQuantityComparator.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); + int var5 = MouseHandler.MouseHandler_x; + int var6 = MouseHandler.MouseHandler_y; + + for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { + int var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; + int var9 = 16777215; + if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { + var9 = 16776960; + } + + Font var10 = GrandExchangeOfferTotalQuantityComparator.fontBold12; + String var11; + if (var7 < 0) { + var11 = ""; + } else if (Client.menuTargets[var7].length() > 0) { + var11 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; + } else { + var11 = Client.menuActions[var7]; } - return var3; + var10.draw(var11, var0 + 3, var8, var9, 0); } + + SoundSystem.method233(FriendSystem.menuX, class60.menuY, class428.menuWidth, class515.menuHeight); } } \ No newline at end of file diff --git a/osrs/src/main/java/Client.java b/osrs/src/main/java/Client.java index 58f345837..77de589a8 100644 --- a/osrs/src/main/java/Client.java +++ b/osrs/src/main/java/Client.java @@ -6,7 +6,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.js.JSObject; +import net.runelite.rs.api.RSClient; import org.json.JSONException; import org.json.JSONObject; @@ -14,17 +14,13 @@ import java.net.Socket; import java.net.URL; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Future; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; @Implements("Client") @ObfuscatedName("client") -public final class Client extends GameEngine implements Usernamed, OAuthApi, class325 { +public final class Client extends GameEngine implements Usernamed, OAuthApi, class322 { boolean shouldProcessClick(){ return false; @@ -32,963 +28,965 @@ boolean shouldProcessClick(){ @ObfuscatedName("vg") @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("vp") + @ObfuscatedName("vr") @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("wp") - public static int field368; - @ObfuscatedName("wk") + @ObfuscatedName("wi") + public static int field369; + @ObfuscatedName("wv") @ObfuscatedSignature( - descriptor = "Lia;" + descriptor = "Liy;" ) - static final class232 field651; - @ObfuscatedName("xx") + static final class229 field654; + @ObfuscatedName("xl") @ObfuscatedSignature( - descriptor = "Lcs;" + descriptor = "Lcm;" ) - static final ApproximateRouteStrategy field650; - @ObfuscatedName("xo") + static final ApproximateRouteStrategy field651; + @ObfuscatedName("xn") static int[] field592; - @ObfuscatedName("xu") - static int[] field593; - @ObfuscatedName("wu") - static int field548; - @ObfuscatedName("vi") + @ObfuscatedName("xf") + static int[] field591; + @ObfuscatedName("wl") + static int field546; + @ObfuscatedName("wk") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("wq") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnb;" ) @Export("playerAppearance") static PlayerComposition playerAppearance; @ObfuscatedName("ww") - static int field549; - @ObfuscatedName("wc") + static int field547; + @ObfuscatedName("xe") @Export("archiveLoaders") static ArrayList archiveLoaders; - @ObfuscatedName("xp") + @ObfuscatedName("xd") @Export("archiveLoadersDone") static int archiveLoadersDone; - @ObfuscatedName("vt") - @Export("cameraShakeCycle") - static int[] cameraShakeCycle; - @ObfuscatedName("wa") - @ObfuscatedSignature( - descriptor = "[Log;" - ) - @Export("grandExchangeOffers") - static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("xy") - static int field551; - @ObfuscatedName("wy") + @ObfuscatedName("xi") + static int field549; + @ObfuscatedName("wr") @ObfuscatedSignature( - descriptor = "Lsk;" + descriptor = "Lsz;" ) - static class490 field641; - @ObfuscatedName("vm") - static short field634; - @ObfuscatedName("vc") - static short field633; - @ObfuscatedName("vv") - static short field638; - @ObfuscatedName("vo") - static short field635; - @ObfuscatedName("vy") + static class487 field645; + @ObfuscatedName("vt") static short field640; - @ObfuscatedName("vx") + @ObfuscatedName("vd") + static short field636; + @ObfuscatedName("vp") + static short field638; + @ObfuscatedName("vb") + static short field634; + @ObfuscatedName("vk") + static short field637; + @ObfuscatedName("vn") @Export("viewportZoom") static int viewportZoom; - @ObfuscatedName("vw") + @ObfuscatedName("vs") static short field639; - @ObfuscatedName("vn") + @ObfuscatedName("vu") @Export("viewportWidth") static int viewportWidth; - @ObfuscatedName("vl") + @ObfuscatedName("vm") @Export("viewportHeight") static int viewportHeight; - @ObfuscatedName("vq") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("vs") + @ObfuscatedName("vi") + @Export("cameraShaking") + static boolean[] cameraShaking; + @ObfuscatedName("vo") + @Export("cameraShakeIntensity") + static int[] cameraShakeIntensity; + @ObfuscatedName("va") + @Export("cameraMoveIntensity") + static int[] cameraMoveIntensity; + @ObfuscatedName("vy") + @Export("cameraShakeSpeed") + static int[] cameraShakeSpeed; + @ObfuscatedName("vw") + static int[] field589; + @ObfuscatedName("vc") @Export("zoomHeight") static short zoomHeight; - @ObfuscatedName("wg") + @ObfuscatedName("vx") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("wf") + static List field607; + @ObfuscatedName("wc") @ObfuscatedSignature( - descriptor = "Lcm;" + descriptor = "Lcn;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; - @ObfuscatedName("wq") + @ObfuscatedName("wb") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("archive11") static EvictingDualNodeHashTable archive11; - @ObfuscatedName("wt") + @ObfuscatedName("wm") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("ws") - static int field547; - @ObfuscatedName("wz") - static List field608; - @ObfuscatedName("wi") + @ObfuscatedName("wh") + static int field545; + @ObfuscatedName("wo") @ObfuscatedSignature( - descriptor = "Lqe;" + descriptor = "Lqc;" ) - static class438 field631; - @ObfuscatedName("bq") + static class435 field631; + @ObfuscatedName("br") @Export("lockMouseRecorder") static boolean lockMouseRecorder; - @ObfuscatedName("bw") + @ObfuscatedName("bq") @Export("worldId") public static int worldId; - @ObfuscatedName("ce") + @ObfuscatedName("cf") @Export("worldProperties") static int worldProperties; - @ObfuscatedName("cw") + @ObfuscatedName("cv") @Export("gameBuild") static int gameBuild; - @ObfuscatedName("cg") + @ObfuscatedName("ce") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("cq") + @ObfuscatedName("ci") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("cn") + @ObfuscatedName("cs") @Export("param21") static int param21; - @ObfuscatedName("ck") + @ObfuscatedName("co") @Export("clientType") static int clientType; - @ObfuscatedName("cr") - static int field427; - @ObfuscatedName("cs") + @ObfuscatedName("cm") + static int field424; + @ObfuscatedName("cn") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("cm") + @ObfuscatedName("cr") @Export("param25") public static int param25; - @ObfuscatedName("dm") + @ObfuscatedName("di") @Export("gameState") static int gameState; - @ObfuscatedName("ds") + @ObfuscatedName("dk") @Export("reloadJS5") static boolean reloadJS5; - @ObfuscatedName("eo") + @ObfuscatedName("ec") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("em") + @ObfuscatedName("ew") @Export("cycle") static int cycle; - @ObfuscatedName("el") + @ObfuscatedName("ex") @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("eg") + @ObfuscatedName("ek") @Export("lastMouseRecordX") static int lastMouseRecordX; - @ObfuscatedName("ei") + @ObfuscatedName("em") @Export("lastMouseRecordY") static int lastMouseRecordY; - @ObfuscatedName("ex") + @ObfuscatedName("eo") static long field610; - @ObfuscatedName("ek") + @ObfuscatedName("ef") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("er") + @ObfuscatedName("el") @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("ez") + @ObfuscatedName("es") @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("en") + @ObfuscatedName("ea") @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("es") + @ObfuscatedName("en") @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("eq") + @ObfuscatedName("eh") @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("ej") + @ObfuscatedName("ei") @Export("hintArrowY") static int hintArrowY; @ObfuscatedName("et") @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("eh") + @ObfuscatedName("er") @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("eb") + @ObfuscatedName("ez") @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("ee") + @ObfuscatedName("eg") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Ldy;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("ea") + @ObfuscatedName("ey") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Ldy;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("ey") + @ObfuscatedName("ed") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("fl") + @ObfuscatedName("fe") @ObfuscatedSignature( - descriptor = "Ldu;" + descriptor = "Lda;" ) - static class94 field416; - @ObfuscatedName("fd") + static class92 field414; + @ObfuscatedName("fr") @Export("js5ConnectState") static int js5ConnectState; @ObfuscatedName("fi") @Export("js5Cycles") static int js5Cycles; - @ObfuscatedName("gf") + @ObfuscatedName("gp") @Export("js5Errors") static int js5Errors; - @ObfuscatedName("gm") + @ObfuscatedName("gn") @Export("loginState") static int loginState; @ObfuscatedName("gb") static int field444; - @ObfuscatedName("gx") - static int field448; - @ObfuscatedName("gp") + @ObfuscatedName("gu") static int field447; - @ObfuscatedName("gd") + @ObfuscatedName("ga") + static int field443; + @ObfuscatedName("gf") @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Leb;" ) - static class141 field419; - @ObfuscatedName("gz") + static class124 field419; + @ObfuscatedName("gx") @ObfuscatedSignature( - descriptor = "Luh;" + descriptor = "Lus;" ) - static class534 field648; + static class531 field648; + @ObfuscatedName("hc") + static final String field656; @ObfuscatedName("ha") - static final String field654; - @ObfuscatedName("hh") static final String field655; - @ObfuscatedName("hr") + @ObfuscatedName("hn") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("iv") + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Lcd;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("im") + @ObfuscatedName("ib") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("iy") + @ObfuscatedName("iq") @ObfuscatedSignature( - descriptor = "[Ldc;" + descriptor = "[Ldn;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("io") + @ObfuscatedName("ia") @Export("npcCount") static int npcCount; - @ObfuscatedName("if") + @ObfuscatedName("iu") @Export("npcIndices") static int[] npcIndices; @ObfuscatedName("ij") - static int field450; - @ObfuscatedName("ib") - static int[] field552; + static int field449; + @ObfuscatedName("il") + static int[] field550; @ObfuscatedName("it") - static String field598; - @ObfuscatedName("ic") + static String field597; + @ObfuscatedName("ig") @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Lef;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("ig") + @ObfuscatedName("ip") @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("ip") + @ObfuscatedName("ii") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("ia") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "Lqq;" + descriptor = "Lqn;" ) @Export("timer") static Timer timer; - @ObfuscatedName("ji") + @ObfuscatedName("jf") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("jl") - static int field454; + @ObfuscatedName("jm") + static int field452; @ObfuscatedName("jy") - static int field456; - @ObfuscatedName("jv") static int field455; - @ObfuscatedName("ja") - static int field452; - @ObfuscatedName("je") + @ObfuscatedName("js") static int field453; - @ObfuscatedName("jm") + @ObfuscatedName("ju") + static int field454; + @ObfuscatedName("jk") + static int field451; + @ObfuscatedName("jx") @ObfuscatedSignature( - descriptor = "[Lih;" + descriptor = "[Liw;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("jb") + @ObfuscatedName("ja") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("jg") + @ObfuscatedName("jt") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("km") + @ObfuscatedName("kj") static final int[] field652; - @ObfuscatedName("kq") + @ObfuscatedName("ks") static int field460; - @ObfuscatedName("kp") - static int field459; - @ObfuscatedName("kf") - static int field458; @ObfuscatedName("kw") static int field461; - @ObfuscatedName("ky") - static int field463; - @ObfuscatedName("kv") - static boolean field381; - @ObfuscatedName("kx") + @ObfuscatedName("kg") + static int field458; + @ObfuscatedName("kl") + static int field459; + @ObfuscatedName("kc") + static int field457; + @ObfuscatedName("ka") + static boolean field382; + @ObfuscatedName("kb") @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("kd") - @Export("cameraX") - static int cameraX; - @ObfuscatedName("ll") + @ObfuscatedName("lw") @Export("camAngleX") static int camAngleX; - @ObfuscatedName("lh") + @ObfuscatedName("lj") @Export("camAngleY") static int camAngleY; - @ObfuscatedName("lm") + @ObfuscatedName("le") @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("lj") + @ObfuscatedName("lm") @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("lf") - static int field467; - @ObfuscatedName("li") - static int field470; + @ObfuscatedName("lz") + static int field478; @ObfuscatedName("lc") + static int field464; + @ObfuscatedName("lb") @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("lk") + @ObfuscatedName("lr") @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("ls") - static int field478; - @ObfuscatedName("ld") - static int field466; - @ObfuscatedName("lr") + @ObfuscatedName("ll") + static int field471; + @ObfuscatedName("la") + static int field462; + @ObfuscatedName("lx") static int field477; - @ObfuscatedName("lb") + @ObfuscatedName("lh") @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("lp") + @ObfuscatedName("li") @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("lt") - public static int field366; - @ObfuscatedName("le") + @ObfuscatedName("lq") + public static int field367; + @ObfuscatedName("ly") @Export("oculusOrbOnLocalPlayer") static boolean oculusOrbOnLocalPlayer; - @ObfuscatedName("lg") + @ObfuscatedName("ld") @Export("packetIndicator") static int packetIndicator; - @ObfuscatedName("ln") + @ObfuscatedName("lu") @Export("emitPackets") static boolean emitPackets; - @ObfuscatedName("lq") - static int field476; - @ObfuscatedName("lx") + @ObfuscatedName("lo") + static int field473; + @ObfuscatedName("lg") @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("lu") + @ObfuscatedName("lt") @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("mi") + @ObfuscatedName("mb") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("ma") + @ObfuscatedName("md") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("mj") + @ObfuscatedName("my") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("mm") + @ObfuscatedName("mk") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("mc") + @ObfuscatedName("mi") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("mw") + @ObfuscatedName("mn") @Export("overheadTextEffects") static int[] overheadTextEffects; @ObfuscatedName("mx") - static int[][] field595; - @ObfuscatedName("mr") + static int[][] field594; + @ObfuscatedName("mv") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("mt") - static String[] field602; - @ObfuscatedName("mf") + @ObfuscatedName("mm") + static String[] field601; + @ObfuscatedName("mq") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("mz") + @ObfuscatedName("mf") @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("mu") + @ObfuscatedName("mo") @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("mq") + @ObfuscatedName("mj") @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("mh") + @ObfuscatedName("ms") @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("ml") + @ObfuscatedName("mw") @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("mn") + @ObfuscatedName("mu") @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("mk") + @ObfuscatedName("mt") @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("ms") + @ObfuscatedName("ml") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("me") - static int field481; - @ObfuscatedName("my") + @ObfuscatedName("ma") + static int field479; + @ObfuscatedName("mg") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("mp") + @ObfuscatedName("mc") @ObfuscatedSignature( - descriptor = "[Ldj;" + descriptor = "[Lds;" ) @Export("players") static Player[] players; - @ObfuscatedName("mo") + @ObfuscatedName("mp") @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("mg") + @ObfuscatedName("mz") @Export("isMembers") static int isMembers; - @ObfuscatedName("nt") + @ObfuscatedName("nd") @Export("playerUUID") static long playerUUID; - @ObfuscatedName("nv") - static boolean field388; @ObfuscatedName("nb") + static boolean field387; + @ObfuscatedName("np") @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("nm") - static int field492; @ObfuscatedName("nc") - static int[] field561; - @ObfuscatedName("nk") + static int field489; + @ObfuscatedName("na") + static int[] field559; + @ObfuscatedName("nh") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("nn") + @ObfuscatedName("ny") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("na") + @ObfuscatedName("nu") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("nh") + @ObfuscatedName("nx") static int[] field563; - @ObfuscatedName("nw") + @ObfuscatedName("nj") @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("ny") + @ObfuscatedName("nf") @ObfuscatedSignature( - descriptor = "[[[Lpf;" + descriptor = "[[[Lon;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("nl") + @ObfuscatedName("nk") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("nu") + @ObfuscatedName("ns") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("nj") + @ObfuscatedName("nm") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("nr") + @ObfuscatedName("nv") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("ne") + @ObfuscatedName("nt") @Export("levels") static int[] levels; - @ObfuscatedName("nq") + @ObfuscatedName("ne") @Export("experience") static int[] experience; - @ObfuscatedName("ng") + @ObfuscatedName("nz") + static int[] field564; + @ObfuscatedName("nl") @Export("leftClickOpensMenu") static boolean leftClickOpensMenu; - @ObfuscatedName("np") + @ObfuscatedName("nr") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("ol") + @ObfuscatedName("oy") @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("oe") + @ObfuscatedName("ol") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("ob") + @ObfuscatedName("oz") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("ok") + @ObfuscatedName("ov") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("ou") + @ObfuscatedName("oq") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("om") + @ObfuscatedName("oo") @Export("menuItemIds") static int[] menuItemIds; - @ObfuscatedName("oo") + @ObfuscatedName("oa") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("ox") + @ObfuscatedName("ou") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("oc") + @ObfuscatedName("om") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("oz") + @ObfuscatedName("og") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("op") + @ObfuscatedName("ob") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("ov") + @ObfuscatedName("os") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("od") + @ObfuscatedName("ot") @Export("viewportX") static int viewportX; - @ObfuscatedName("og") + @ObfuscatedName("oj") @Export("viewportY") static int viewportY; + @ObfuscatedName("oe") + static int field493; + @ObfuscatedName("od") + static int field492; @ObfuscatedName("on") - static int field498; - @ObfuscatedName("ot") - static int field499; - @ObfuscatedName("oa") @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("pc") + @ObfuscatedName("pm") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("pf") + @ObfuscatedName("ph") @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("pj") + @ObfuscatedName("po") @Export("selectedSpellItemId") static int selectedSpellItemId; - @ObfuscatedName("ph") + @ObfuscatedName("pp") static String field599; - @ObfuscatedName("ps") - static String field600; - @ObfuscatedName("pt") + @ObfuscatedName("pb") + static String field598; + @ObfuscatedName("pl") @Export("rootInterface") static int rootInterface; - @ObfuscatedName("pw") + @ObfuscatedName("pz") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Ltw;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("px") - static int field508; - @ObfuscatedName("pq") + @ObfuscatedName("ps") static int field505; - @ObfuscatedName("pd") + @ObfuscatedName("pf") + static int field499; + @ObfuscatedName("pv") @Export("chatEffects") static int chatEffects; - @ObfuscatedName("pm") + @ObfuscatedName("px") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnn;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; @ObfuscatedName("pn") @Export("runEnergy") static int runEnergy; - @ObfuscatedName("pu") + @ObfuscatedName("pa") @Export("weight") static int weight; - @ObfuscatedName("pp") + @ObfuscatedName("pd") @Export("staffModLevel") public static int staffModLevel; - @ObfuscatedName("pb") + @ObfuscatedName("pj") @Export("followerIndex") static int followerIndex; - @ObfuscatedName("pe") + @ObfuscatedName("pi") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("pk") + @ObfuscatedName("pq") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnn;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("pr") + @ObfuscatedName("pt") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnn;" ) @Export("clickedWidget") - public static Widget clickedWidget; - @ObfuscatedName("pi") + static Widget clickedWidget; + @ObfuscatedName("py") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnn;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("pz") + @ObfuscatedName("qb") @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("qi") + @ObfuscatedName("qt") @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("qb") + @ObfuscatedName("ql") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnn;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("qw") + @ObfuscatedName("qu") static boolean field396; - @ObfuscatedName("qk") - static int field516; - @ObfuscatedName("qg") + @ObfuscatedName("qo") + static int field512; + @ObfuscatedName("qp") + static int field513; + @ObfuscatedName("qy") + static boolean field397; + @ObfuscatedName("qq") static int field514; - @ObfuscatedName("qm") - static boolean field394; - @ObfuscatedName("qz") - static int field521; - @ObfuscatedName("ql") - static int field517; + @ObfuscatedName("qd") + static int field508; @ObfuscatedName("qn") @Export("isDraggingWidget") static boolean isDraggingWidget; @ObfuscatedName("qr") @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("qy") + @ObfuscatedName("qm") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("qf") + @ObfuscatedName("qv") @Export("changedVarpCount") static int changedVarpCount; - @ObfuscatedName("qv") + @ObfuscatedName("qc") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("qa") + @ObfuscatedName("qe") @Export("changedItemContainersCount") static int changedItemContainersCount; @ObfuscatedName("qs") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("qp") + @ObfuscatedName("qz") @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("qe") + @ObfuscatedName("qh") static int[] field571; - @ObfuscatedName("qd") - static int field512; - @ObfuscatedName("qu") + @ObfuscatedName("qi") + static int field510; + @ObfuscatedName("qk") @Export("chatCycle") static int chatCycle; - @ObfuscatedName("qc") - static int field511; - @ObfuscatedName("rt") - static int field530; - @ObfuscatedName("rl") - static int field525; - @ObfuscatedName("rq") - static int field528; - @ObfuscatedName("rr") - static int field529; @ObfuscatedName("rm") - static int field526; + static int field524; @ObfuscatedName("rp") + static int field526; + @ObfuscatedName("rf") + static int field520; + @ObfuscatedName("rn") + static int field525; + @ObfuscatedName("rc") + static int field519; + @ObfuscatedName("rr") static int field527; - @ObfuscatedName("re") + @ObfuscatedName("rh") + static int field522; + @ObfuscatedName("ra") + @ObfuscatedSignature( + descriptor = "Lrx;" + ) + @Export("varclan") + static class466 varclan; + @ObfuscatedName("rg") @Export("mouseWheelRotation") static int mouseWheelRotation; - @ObfuscatedName("rc") + @ObfuscatedName("rk") @ObfuscatedSignature( - descriptor = "Lvz;" + descriptor = "Lut;" ) - static class547 field649; - @ObfuscatedName("rj") + static class544 field649; + @ObfuscatedName("rl") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("net/runelite/rs") + @ObfuscatedName("rv") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) - static NodeDeque field628; - @ObfuscatedName("rw") + static NodeDeque field627; + @ObfuscatedName("ry") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) - static NodeDeque field629; - @ObfuscatedName("rh") + static NodeDeque field628; + @ObfuscatedName("rd") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) - static NodeDeque field626; - @ObfuscatedName("ru") + static NodeDeque field625; + @ObfuscatedName("rb") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Ltw;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("rk") + @ObfuscatedName("rz") @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("rf") + @ObfuscatedName("rj") static int field523; - @ObfuscatedName("ro") - static boolean[] field408; - @ObfuscatedName("rd") + @ObfuscatedName("ri") static boolean[] field407; - @ObfuscatedName("rb") - static boolean[] field406; - @ObfuscatedName("rz") + @ObfuscatedName("ru") + static boolean[] field408; + @ObfuscatedName("rx") + static boolean[] field409; + @ObfuscatedName("rt") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("rg") + @ObfuscatedName("sg") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("sz") + @ObfuscatedName("sj") @Export("rootWidgetWidths") static int[] rootWidgetWidths; @ObfuscatedName("sr") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("sm") + @ObfuscatedName("sa") @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("sw") + @ObfuscatedName("si") static long field613; - @ObfuscatedName("sl") + @ObfuscatedName("sd") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("sy") - static int[] field580; - @ObfuscatedName("sf") + @ObfuscatedName("sn") + static int[] field578; + @ObfuscatedName("sw") @Export("publicChatMode") static int publicChatMode; - @ObfuscatedName("sg") + @ObfuscatedName("sy") @Export("tradeChatMode") static int tradeChatMode; + @ObfuscatedName("sh") + static String field600; @ObfuscatedName("sb") - static String field601; - @ObfuscatedName("se") - @Export("crossWorldMessageIds") - static long[] crossWorldMessageIds; - @ObfuscatedName("ss") - @Export("crossWorldMessageIdsIndex") - static int crossWorldMessageIdsIndex; - @ObfuscatedName("sj") + static long[] field615; + @ObfuscatedName("sz") + static int field533; + @ObfuscatedName("sp") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lil;" ) @Export("keyHandlerInstance") - static class226 keyHandlerInstance; - @ObfuscatedName("sn") + public static class223 keyHandlerInstance; + @ObfuscatedName("sf") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "Lij;" ) - static class224 field422; - @ObfuscatedName("sk") - static int field533; + static class221 field422; + @ObfuscatedName("sq") + static int field530; @ObfuscatedName("so") - static int[] field578; - @ObfuscatedName("sc") + static int[] field579; + @ObfuscatedName("sl") static int[] field577; - @ObfuscatedName("sp") + @ObfuscatedName("tn") @Export("timeOfPreviousKeyPress") static long timeOfPreviousKeyPress; - @ObfuscatedName("tu") + @ObfuscatedName("tp") @ObfuscatedSignature( - descriptor = "[Lgi;" + descriptor = "[Lfc;" ) @Export("currentClanSettings") static ClanSettings[] currentClanSettings; - @ObfuscatedName("tc") + @ObfuscatedName("tw") @ObfuscatedSignature( - descriptor = "[Lgb;" + descriptor = "[Lgn;" ) @Export("currentClanChannels") static ClanChannel[] currentClanChannels; - @ObfuscatedName("tm") - static int field539; - @ObfuscatedName("tp") + @ObfuscatedName("tq") + static int field535; + @ObfuscatedName("ts") @Export("mapIconCount") static int mapIconCount; - @ObfuscatedName("tf") + @ObfuscatedName("tt") @Export("mapIconXs") static int[] mapIconXs; - @ObfuscatedName("ts") + @ObfuscatedName("tg") @Export("mapIconYs") static int[] mapIconYs; - @ObfuscatedName("ty") + @ObfuscatedName("to") @ObfuscatedSignature( - descriptor = "[Lud;" + descriptor = "[Luz;" ) @Export("mapIcons") static SpritePixels[] mapIcons; - @ObfuscatedName("ta") + @ObfuscatedName("tr") @Export("destinationX") static int destinationX; - @ObfuscatedName("te") + @ObfuscatedName("tx") @Export("destinationY") static int destinationY; - @ObfuscatedName("tg") + @ObfuscatedName("ta") @Export("minimapState") static int minimapState; - @ObfuscatedName("tk") + @ObfuscatedName("tj") @Export("playingJingle") static boolean playingJingle; - @ObfuscatedName("uz") + @ObfuscatedName("ue") @Export("soundEffectCount") static int soundEffectCount; - @ObfuscatedName("uq") + @ObfuscatedName("ug") @Export("soundEffectIds") static int[] soundEffectIds; - @ObfuscatedName("ug") + @ObfuscatedName("ui") @Export("queuedSoundEffectLoops") static int[] queuedSoundEffectLoops; - @ObfuscatedName("uu") + @ObfuscatedName("uv") @Export("queuedSoundEffectDelays") static int[] queuedSoundEffectDelays; - @ObfuscatedName("ua") + @ObfuscatedName("uo") @Export("soundLocations") static int[] soundLocations; - @ObfuscatedName("um") + @ObfuscatedName("uj") @ObfuscatedSignature( - descriptor = "[Lbr;" + descriptor = "[Lbo;" ) @Export("soundEffects") static SoundEffect[] soundEffects; - @ObfuscatedName("ub") + @ObfuscatedName("uq") @Export("isCameraLocked") static boolean isCameraLocked; - @ObfuscatedName("uk") + @ObfuscatedName("ur") static boolean field402; - @ObfuscatedName("uh") - static boolean field401; + @ObfuscatedName("ux") + static boolean field404; @ObfuscatedName("uw") static boolean field403; - @ObfuscatedName("uf") + @ObfuscatedName("ub") @ObfuscatedSignature( - descriptor = "Lth;" + descriptor = "Lsq;" ) - static class494 field646; - @ObfuscatedName("un") + static class491 field644; + @ObfuscatedName("uy") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Lsm;" ) - static class493 field643; - @ObfuscatedName("ud") + static class490 field643; + @ObfuscatedName("ut") @ObfuscatedSignature( - descriptor = "Lsp;" + descriptor = "Lsm;" ) - static class493 field642; - @ObfuscatedName("ue") + static class490 field642; + @ObfuscatedName("un") static boolean field400; - @ObfuscatedName("vf") - @Export("cameraShaking") - static boolean[] cameraShaking; - @ObfuscatedName("vj") - @Export("cameraShakeIntensity") - static int[] cameraShakeIntensity; - @ObfuscatedName("vu") - @Export("cameraMoveIntensity") - static int[] cameraMoveIntensity; - @ObfuscatedName("ve") - @Export("cameraShakeSpeed") - static int[] cameraShakeSpeed; - @ObfuscatedName("hi") - String field664; - @ObfuscatedName("hf") + @ObfuscatedName("hb") + String field665; + @ObfuscatedName("hp") @ObfuscatedSignature( - descriptor = "Las;" + descriptor = "Lay;" ) - class14 field659; - @ObfuscatedName("hu") + class14 field660; + @ObfuscatedName("hl") @ObfuscatedSignature( - descriptor = "Lai;" + descriptor = "Laq;" ) - class18 field658; - @ObfuscatedName("hy") + class18 field659; + @ObfuscatedName("hi") @ObfuscatedSignature( descriptor = "Lcom/jagex/oldscape/pub/OtlTokenRequester;" ) - OtlTokenRequester field661; - @ObfuscatedName("hl") - Future field665; - @ObfuscatedName("hm") - boolean field660; - @ObfuscatedName("hd") - int field663; - @ObfuscatedName("hs") + OtlTokenRequester field662; + @ObfuscatedName("hq") + Future field667; + @ObfuscatedName("hf") + boolean field661; + @ObfuscatedName("hw") + int field664; + @ObfuscatedName("hj") @ObfuscatedSignature( - descriptor = "Lai;" + descriptor = "Laq;" ) - class18 field657; - @ObfuscatedName("hk") + class18 field658; + @ObfuscatedName("hg") @ObfuscatedSignature( descriptor = "Lcom/jagex/oldscape/pub/RefreshAccessTokenRequester;" ) - RefreshAccessTokenRequester field662; - @ObfuscatedName("hn") + RefreshAccessTokenRequester field663; + @ObfuscatedName("hk") Future field666; - @ObfuscatedName("ie") + @ObfuscatedName("if") @ObfuscatedSignature( - descriptor = "Lul;" + descriptor = "Luj;" ) - Buffer field668; - @ObfuscatedName("in") + Buffer field669; + @ObfuscatedName("is") @ObfuscatedSignature( - descriptor = "Lab;" + descriptor = "Lac;" ) - class7 field656; - @ObfuscatedName("is") - long field667; + class7 field657; + @ObfuscatedName("im") + long field668; static { lockMouseRecorder = true; @@ -999,9 +997,9 @@ boolean shouldProcessClick(){ isLowDetail = false; param21 = -1; clientType = -1; - field427 = -1; + field424 = -1; onMobile = false; - param25 = 217; + param25 = 218; gameState = 0; reloadJS5 = false; isLoading = true; @@ -1023,21 +1021,36 @@ boolean shouldProcessClick(){ playerAttackOption = AttackOption.AttackOption_hidden; npcAttackOption = AttackOption.AttackOption_hidden; renderSelf = false; - field416 = class94.field929; + field414 = class92.field942; js5ConnectState = 0; js5Cycles = 0; js5Errors = 0; loginState = 0; field444 = 0; - field448 = 0; field447 = 0; - field419 = class141.field1312; - field648 = class534.field4231; + field443 = 0; + field419 = class124.field1207; + field648 = class531.field4234; int var1 = "com_jagex_auth_desktop_osrs:public".length(); byte[] var2 = new byte[var1]; - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = "com_jagex_auth_desktop_osrs:public".charAt(var3); + int var3; + char var4; + for (var3 = 0; var3 < var1; ++var3) { + var4 = "com_jagex_auth_desktop_osrs:public".charAt(var3); + if (var4 > 127) { + var2[var3] = 63; + } else { + var2[var3] = (byte)var4; + } + } + + field656 = class415.method2150(var2); + var1 = "com_jagex_auth_desktop_runelite:public".length(); + var2 = new byte[var1]; + + for (var3 = 0; var3 < var1; ++var3) { + var4 = "com_jagex_auth_desktop_runelite:public".charAt(var3); if (var4 > 127) { var2[var3] = 63; } else { @@ -1045,55 +1058,54 @@ boolean shouldProcessClick(){ } } - field654 = class233.method1199(var2); - field655 = class233.method1199(FriendSystem.method399("com_jagex_auth_desktop_runelite:public")); + field655 = class415.method2150(var2); Login_isUsernameRemembered = false; secureRandomFuture = new SecureRandomFuture(); randomDatData = null; npcs = new NPC[65536]; npcCount = 0; npcIndices = new int[65536]; - field450 = 0; - field552 = new int[250]; + field449 = 0; + field550 = new int[250]; packetWriter = new PacketWriter(); logoutTimer = 0; hadNetworkError = false; timer = new Timer(); fontsMap = new HashMap(); - field454 = 0; - field456 = 1; - field455 = 0; - field452 = 1; + field452 = 0; + field455 = 1; field453 = 0; + field454 = 1; + field451 = 0; collisionMaps = new CollisionMap[4]; isInInstance = false; instanceChunkTemplates = new int[4][13][13]; field652 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; field460 = 0; - field459 = 2301979; + field461 = 2301979; field458 = 5063219; - field461 = 3353893; - field463 = 7759444; - field381 = false; + field459 = 3353893; + field457 = 7759444; + field382 = false; alternativeScrollbarWidth = 0; camAngleX = 128; camAngleY = 0; camAngleDY = 0; camAngleDX = 0; - field467 = 0; - field470 = 0; + field478 = 0; + field464 = 0; oculusOrbState = 0; camFollowHeight = 50; - field478 = 0; - field466 = 0; + field471 = 0; + field462 = 0; field477 = 0; oculusOrbNormalSpeed = 12; oculusOrbSlowedSpeed = 6; - field366 = 0; + field367 = 0; oculusOrbOnLocalPlayer = false; packetIndicator = 0; emitPackets = false; - field476 = 0; + field473 = 0; overheadTextLimit = 0; overheadTextCount = 50; overheadTextXs = new int[overheadTextCount]; @@ -1102,9 +1114,9 @@ boolean shouldProcessClick(){ overheadTextXOffsets = new int[overheadTextCount]; overheadTextColors = new int[overheadTextCount]; overheadTextEffects = new int[overheadTextCount]; - field595 = new int[overheadTextCount][]; + field594 = new int[overheadTextCount][]; overheadTextCyclesRemaining = new int[overheadTextCount]; - field602 = new String[overheadTextCount]; + field601 = new String[overheadTextCount]; tileLastDrawnActor = new int[104][104]; viewportDrawCount = 0; viewportTempX = -1; @@ -1114,16 +1126,16 @@ boolean shouldProcessClick(){ mouseCrossState = 0; mouseCrossColor = 0; showMouseCross = true; - field481 = 0; + field479 = 0; showLoadingMessages = true; players = new Player[2048]; localPlayerIndex = -1; isMembers = 0; playerUUID = -1L; - field388 = true; + field387 = true; drawPlayerNames = 0; - field492 = 0; - field561 = new int[1000]; + field489 = 0; + field559 = new int[1000]; playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; playerMenuActions = new String[8]; playerOptionsPriorities = new boolean[8]; @@ -1136,6 +1148,7 @@ boolean shouldProcessClick(){ currentLevels = new int[25]; levels = new int[25]; experience = new int[25]; + field564 = new int[25]; leftClickOpensMenu = false; isMenuOpen = false; menuOptionsCount = 0; @@ -1152,19 +1165,19 @@ boolean shouldProcessClick(){ showMouseOverText = true; viewportX = -1; viewportY = -1; - field498 = 0; - field499 = 50; + field493 = 0; + field492 = 50; isItemSelected = 0; - field598 = null; + field597 = null; isSpellSelected = false; selectedSpellChildIndex = -1; selectedSpellItemId = -1; field599 = null; - field600 = null; + field598 = null; rootInterface = -1; interfaceParents = new NodeHashTable(8); - field508 = 0; - field505 = -1; + field505 = 0; + field499 = -1; chatEffects = 0; meslayerContinueWidget = null; runEnergy = 0; @@ -1179,11 +1192,11 @@ boolean shouldProcessClick(){ widgetClickY = 0; draggedOnWidget = null; field396 = false; - field516 = -1; + field512 = -1; + field513 = -1; + field397 = false; field514 = -1; - field394 = false; - field521 = -1; - field517 = -1; + field508 = -1; isDraggingWidget = false; cycleCntr = 1; changedVarps = new int[32]; @@ -1193,27 +1206,27 @@ boolean shouldProcessClick(){ changedSkills = new int[32]; changedSkillsCount = 0; field571 = new int[32]; - field512 = 0; + field510 = 0; chatCycle = 0; - field511 = 0; - field530 = 0; - field525 = 0; - field528 = 0; - field529 = 0; + field524 = 0; field526 = 0; + field520 = 0; + field525 = 0; + field519 = 0; field527 = 0; + field522 = 0; mouseWheelRotation = 0; - field649 = new class547(); + field649 = new class544(); scriptEvents = new NodeDeque(); + field627 = new NodeDeque(); field628 = new NodeDeque(); - field629 = new NodeDeque(); - field626 = new NodeDeque(); + field625 = new NodeDeque(); widgetFlags = new NodeHashTable(512); rootWidgetCount = 0; field523 = -2; - field408 = new boolean[100]; field407 = new boolean[100]; - field406 = new boolean[100]; + field408 = new boolean[100]; + field409 = new boolean[100]; rootWidgetXs = new int[100]; rootWidgetYs = new int[100]; rootWidgetWidths = new int[100]; @@ -1221,21 +1234,21 @@ boolean shouldProcessClick(){ gameDrawingMode = 0; field613 = 0L; isResizable = true; - field580 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + field578 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field601 = ""; - crossWorldMessageIds = new long[100]; - crossWorldMessageIdsIndex = 0; - keyHandlerInstance = new class226(); - field422 = new class224(); + field600 = ""; + field615 = new long[100]; field533 = 0; - field578 = new int[128]; + keyHandlerInstance = new class223(); + field422 = new class221(); + field530 = 0; + field579 = new int[128]; field577 = new int[128]; timeOfPreviousKeyPress = -1L; currentClanSettings = new ClanSettings[4]; currentClanChannels = new ClanChannel[4]; - field539 = -1; + field535 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; @@ -1252,9 +1265,9 @@ boolean shouldProcessClick(){ soundEffects = new SoundEffect[50]; isCameraLocked = false; field402 = false; - field401 = false; + field404 = false; field403 = false; - field646 = null; + field644 = null; field643 = null; field642 = null; field400 = false; @@ -1262,482 +1275,505 @@ boolean shouldProcessClick(){ cameraShakeIntensity = new int[5]; cameraMoveIntensity = new int[5]; cameraShakeSpeed = new int[5]; - cameraShakeCycle = new int[5]; - field634 = 256; - field633 = 205; + field589 = new int[5]; + field640 = 256; + field636 = 205; zoomHeight = 256; zoomWidth = 320; field639 = 1; - field640 = 32767; + field637 = 32767; field638 = 1; - field635 = 32767; + field634 = 32767; viewportOffsetX = 0; viewportOffsetY = 0; viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; playerAppearance = new PlayerComposition(); - field548 = -1; - field549 = -1; - field641 = new DesktopPlatformInfoProvider(); + field546 = -1; + field547 = -1; + field645 = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - field631 = new class438(8, class436.field3797); + field631 = new class435(8, class433.field3801); Widget_cachedModels = new EvictingDualNodeHashTable(64); archive11 = new EvictingDualNodeHashTable(64); - field547 = -1; - field368 = -1; - field608 = new ArrayList(); - field651 = new class232(); + field545 = -1; + field369 = -1; + field607 = new ArrayList(); + field654 = new class229(); archiveLoaders = new ArrayList(10); archiveLoadersDone = 0; - field551 = 0; - field650 = new ApproximateRouteStrategy(); + field549 = 0; + field651 = new ApproximateRouteStrategy(); field592 = new int[50]; - field593 = new int[50]; + field591 = new int[50]; } public Client() { - this.field660 = false; - this.field663 = 0; - this.field667 = -1L; + this.field661 = false; + this.field664 = 0; + this.field668 = -1L; } - @ObfuscatedName("ai") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-953371865" + descriptor = "(B)V", + garbageValue = "101" ) @Export("resizeGame") protected final void resizeGame() { - field613 = GrandExchangeOfferTotalQuantityComparator.method1971() + 500L; + field613 = SpotAnimationDefinition.method962() + 500L; this.resizeJS(); if (rootInterface != -1) { - this.method382(true); + this.method389(true); } } - @ObfuscatedName("bb") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-84" + descriptor = "(I)V", + garbageValue = "-550390769" ) @Export("setUp") protected final void setUp() { - int[] var1 = new int[]{20, 260, 10000}; - int[] var2 = new int[]{1000, 100, 500}; - if (var1 != null && var2 != null) { - ByteArrayPool.ByteArrayPool_alternativeSizes = var1; - class425.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; - class28.ByteArrayPool_arrays = new byte[var1.length][][]; - - for (int var3 = 0; var3 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var3) { - class28.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; - ByteArrayPool.field3766.add(var1[var3]); + class4.method5(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); + WorldMapCacheName.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; + AbstractSocket.js5Port = gameBuild == 0 ? 443 : worldId + 50000; + class252.currentPort = WorldMapCacheName.worldPort; + WorldMapLabelSize.field1939 = class342.field2973; + class90.field892 = class342.field2974; + class503.field4091 = class342.field2972; + PlayerComposition.field2935 = class342.field2975; + class60.urlRequester = new class113(this.field661, 218); + this.setUpKeyboard(); + this.method155(); + class396.mouseWheel = this.mouseWheel(); + this.method154(field422, 0); + this.method154(keyHandlerInstance, 1); + this.setUpClipboard(); + class302.field2511 = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + AccessFile var2 = null; + ClientPreferences var3 = new ClientPreferences(); + + try { + var2 = class131.getPreferencesFile("", Messages.field1156.name, false); + byte[] var4 = new byte[(int)var2.length()]; + + int var6; + for (int var5 = 0; var5 < var4.length; var5 += var6) { + var6 = var2.read(var4, var5, var4.length - var5); + if (var6 == -1) { + throw new IOException(); + } } - Collections.sort(ByteArrayPool.field3766); - } else { - ByteArrayPool.ByteArrayPool_alternativeSizes = null; - class425.ByteArrayPool_altSizeArrayCounts = null; - class28.ByteArrayPool_arrays = null; - ByteArrayPool.field3766.clear(); - ByteArrayPool.field3766.add(100); - ByteArrayPool.field3766.add(5000); - ByteArrayPool.field3766.add(10000); - ByteArrayPool.field3766.add(30000); + var3 = new ClientPreferences(new Buffer(var4)); + } catch (Exception var8) { } - ObjectComposition.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; - class363.js5Port = gameBuild == 0 ? 443 : worldId + 50000; - class164.currentPort = ObjectComposition.worldPort; - PlayerComposition.field2940 = class345.field2973; - class104.field1093 = class345.field2975; - Coord.field2906 = class345.field2974; - class33.field87 = class345.field2976; - AbstractWorldMapIcon.urlRequester = new class115(this.field660, 217); - this.setUpKeyboard(); - this.method146(); - class493.mouseWheel = this.mouseWheel(); - this.method145(field422, 0); - this.method145(keyHandlerInstance, 1); - this.setUpClipboard(); - UserComparator10.field1188 = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - class91.clientPreferences = FadeInTask.method2164(); - class416.method2159(this, GraphicsObject.field717); - NPCComposition.setWindowedMode(class91.clientPreferences.method562()); - InvDefinition.friendSystem = new FriendSystem(class166.loginType); - this.field659 = new class14("tokenRequest", 1, 1); - WorldMapIcon_1.method1439(this); - field651.method1189(); + try { + if (var2 != null) { + var2.close(); + } + } catch (Exception var7) { + } + + WorldMapIcon_1.clientPreferences = var3; + class27.method112(this, class14.field44); + class9.setWindowedMode(WorldMapIcon_1.clientPreferences.method563()); + class12.friendSystem = new FriendSystem(class89.loginType); + this.field660 = new class14("tokenRequest", 1, 1); + if (!class316.field2793.contains(this)) { + class316.field2793.add(this); + } + + field654.method1169(); } - @ObfuscatedName("bo") + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-800201684" + garbageValue = "564244601" ) @Export("doCycle") protected final void doCycle() { ++cycle; this.doCycleJs5(); - Skills.method1899(); - boolean var1 = CollisionMap.method1157(); - if (var1 && playingJingle && class171.pcmPlayer1 != null) { - class171.pcmPlayer1.tryDiscard(); - } - class313.method1648(); - keyHandlerInstance.method1147(); - this.method144(); - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; - MouseHandler.MouseHandler_lastButtonVolatile = 0; - } + while (true) { + ArchiveDiskAction var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + } - if (class493.mouseWheel != null) { - int var4 = class493.mouseWheel.useRotation(); - mouseWheelRotation = var4; - } + if (var1 == null) { + boolean var5 = class516.method2513(); + if (var5 && playingJingle && MusicPatchPcmStream.pcmPlayer1 != null) { + MusicPatchPcmStream.pcmPlayer1.tryDiscard(); + } + + class102.method604(); + keyHandlerInstance.method1127(); + this.method153(); + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; + MouseHandler.MouseHandler_lastButtonVolatile = 0; + } + + if (class396.mouseWheel != null) { + int var6 = class396.mouseWheel.useRotation(); + mouseWheelRotation = var6; + } + + if (gameState == 0) { + WorldMapCacheName.method1354(); + WorldMapManager.method1277(); + } else if (gameState == 5) { + Actor.method516(this, class369.fontPlain11, ItemLayer.fontPlain12); + WorldMapCacheName.method1354(); + WorldMapManager.method1277(); + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { + Actor.method516(this, class369.fontPlain11, ItemLayer.fontPlain12); + this.doCycleLoggedOut(); + } else if (gameState == 50) { + Actor.method516(this, class369.fontPlain11, ItemLayer.fontPlain12); + this.doCycleLoggedOut(); + } else if (gameState == 25) { + ModeWhere.method2002(); + } + } else { + Actor.method516(this, class369.fontPlain11, ItemLayer.fontPlain12); + } - if (gameState == 0) { - class314.method1653(); - class19.method66(); - } else if (gameState == 5) { - WorldMapManager.method1521(this, class14.fontPlain11, UserComparator6.fontPlain12); - class314.method1653(); - class19.method66(); - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - WorldMapManager.method1521(this, class14.fontPlain11, UserComparator6.fontPlain12); - this.doCycleLoggedOut(); - } else if (gameState == 50) { - WorldMapManager.method1521(this, class14.fontPlain11, UserComparator6.fontPlain12); - this.doCycleLoggedOut(); - } else if (gameState == 25) { - Occluder.method1341(); + if (gameState == 30) { + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { + this.doCycleLoggedOut(); + } + + return; } - } else { - WorldMapManager.method1521(this, class14.fontPlain11, UserComparator6.fontPlain12); - } - if (gameState == 30) { - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { - this.doCycleLoggedOut(); + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); } - } - @ObfuscatedName("bp") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "40" + descriptor = "(ZI)V", + garbageValue = "-851092167" ) @Export("draw") protected final void draw(boolean var1) { - if ((gameState == 10 || gameState == 20 || gameState == 30) && field613 != 0L && GrandExchangeOfferTotalQuantityComparator.method1971() > field613) { - NPCComposition.setWindowedMode(class178.getWindowedMode()); + if ((gameState == 10 || gameState == 20 || gameState == 30) && field613 != 0L && SpotAnimationDefinition.method962() > field613) { + class9.setWindowedMode(ApproximateRouteStrategy.getWindowedMode()); } int var2; if (var1) { for (var2 = 0; var2 < 100; ++var2) { - field408[var2] = true; + field407[var2] = true; } } if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - class367.drawTitle(SoundCache.fontBold12, class14.fontPlain11, UserComparator6.fontPlain12); + UrlRequest.drawTitle(GrandExchangeOfferTotalQuantityComparator.fontBold12, class369.fontPlain11, ItemLayer.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - class367.drawTitle(SoundCache.fontBold12, class14.fontPlain11, UserComparator6.fontPlain12); + UrlRequest.drawTitle(GrandExchangeOfferTotalQuantityComparator.fontBold12, class369.fontPlain11, ItemLayer.fontPlain12); } else if (gameState == 50) { - class367.drawTitle(SoundCache.fontBold12, class14.fontPlain11, UserComparator6.fontPlain12); + UrlRequest.drawTitle(GrandExchangeOfferTotalQuantityComparator.fontBold12, class369.fontPlain11, ItemLayer.fontPlain12); } else if (gameState == 25) { - if (field453 == 1) { - if (field454 > field456) { - field456 = field454; + if (field451 == 1) { + if (field452 > field455) { + field455 = field452; } - var2 = (field456 * 50 - field454 * 50) / field456; - class427.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); - } else if (field453 == 2) { - if (field455 > field452) { - field452 = field455; + var2 = (field455 * 50 - field452 * 50) / field455; + LoginPacket.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); + } else if (field451 == 2) { + if (field453 > field454) { + field454 = field453; } - var2 = (field452 * 50 - field455 * 50) / field452 + 50; - class427.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); + var2 = (field454 * 50 - field453 * 50) / field454 + 50; + LoginPacket.drawLoadingMessage("Loading - please wait." + "
" + " (" + var2 + "%" + ")", false); } else { - class427.drawLoadingMessage("Loading - please wait.", false); + LoginPacket.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - class427.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + LoginPacket.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); } else if (gameState == 45) { - class427.drawLoadingMessage("Please wait...", false); + LoginPacket.drawLoadingMessage("Please wait...", false); } } else { - class367.drawTitle(SoundCache.fontBold12, class14.fontPlain11, UserComparator6.fontPlain12); + UrlRequest.drawTitle(GrandExchangeOfferTotalQuantityComparator.fontBold12, class369.fontPlain11, ItemLayer.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { for (var2 = 0; var2 < rootWidgetCount; ++var2) { - if (field407[var2]) { - class223.rasterProvider.draw(rootWidgetXs[var2], rootWidgetYs[var2], rootWidgetWidths[var2], rootWidgetHeights[var2]); - field407[var2] = false; + if (field408[var2]) { + class338.rasterProvider.draw(rootWidgetXs[var2], rootWidgetYs[var2], rootWidgetWidths[var2], rootWidgetHeights[var2]); + field408[var2] = false; } } } else if (gameState > 0) { - class223.rasterProvider.drawFull(0, 0); + class338.rasterProvider.drawFull(0, 0); for (var2 = 0; var2 < rootWidgetCount; ++var2) { - field407[var2] = false; + field408[var2] = false; } } } - @ObfuscatedName("bt") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1875481219" + garbageValue = "1863199463" ) @Export("kill0") protected final void kill0() { - if (class33.varcs.hasUnwrittenChanges()) { - class33.varcs.write(); + if (class176.varcs.hasUnwrittenChanges()) { + class176.varcs.write(); } - if (class233.mouseRecorder != null) { - class233.mouseRecorder.isRunning = false; + if (Message.mouseRecorder != null) { + Message.mouseRecorder.isRunning = false; } - class233.mouseRecorder = null; + Message.mouseRecorder = null; packetWriter.close(); - BufferedSink.method2304(); - class493.mouseWheel = null; - if (class171.pcmPlayer1 != null) { - class171.pcmPlayer1.shutdown(); + if (MouseHandler.MouseHandler_instance != null) { + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_instance = null; + } + } + + class396.mouseWheel = null; + if (MusicPatchPcmStream.pcmPlayer1 != null) { + MusicPatchPcmStream.pcmPlayer1.shutdown(); } - class59.field309.method1969(); - WorldMapDecorationType.method1898(); - if (AbstractWorldMapIcon.urlRequester != null) { - AbstractWorldMapIcon.urlRequester.close(); - AbstractWorldMapIcon.urlRequester = null; + WorldMapSectionType.field2038.method1962(); + class227.method1164(); + if (class60.urlRequester != null) { + class60.urlRequester.close(); + class60.urlRequester = null; } - HealthBar.method577(); - this.field659.method48(); + HealthBarDefinition.method916(); + this.field660.method56(); } - @ObfuscatedName("bl") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "390692392" + descriptor = "(B)V", + garbageValue = "-94" ) @Export("vmethod1485") protected final void vmethod1485() { } + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2071645038" + ) + boolean method363() { + return this.field664 == 1; + } + @ObfuscatedName("gc") @ObfuscatedSignature( descriptor = "(S)Z", - garbageValue = "28669" + garbageValue = "-22117" ) - boolean method356() { - return this.field663 == 1; + boolean method364() { + return Messages.field1155 != null && !Messages.field1155.trim().isEmpty() && ObjectComposition.field1664 != null && !ObjectComposition.field1664.trim().isEmpty(); } - @ObfuscatedName("ga") + @ObfuscatedName("gr") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-83" + garbageValue = "74" ) - boolean method357() { - return class467.field3921 != null && !class467.field3921.trim().isEmpty() && class191.field1499 != null && !class191.field1499.trim().isEmpty(); + boolean method365() { + return class369.field3560 != null && !class369.field3560.trim().isEmpty() && InterfaceParent.field862 != null && !InterfaceParent.field862.trim().isEmpty(); } - @ObfuscatedName("gh") + @ObfuscatedName("gk") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1137874919" + garbageValue = "-1304458364" ) - boolean method358() { - return LoginScreenAnimation.field1042 != null && !LoginScreenAnimation.field1042.trim().isEmpty() && class155.field1355 != null && !class155.field1355.trim().isEmpty(); + boolean method366() { + return this.field662 != null; } - @ObfuscatedName("gg") + @ObfuscatedName("go") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "2" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-191398087" ) - boolean method359() { - return this.field661 != null; - } - - @ObfuscatedName("gu") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-10" - ) - void method360(String var1) throws IOException { + void method367(String var1) throws IOException { HashMap var2 = new HashMap(); var2.put("grant_type", "refresh_token"); var2.put("scope", "gamesso.token.create"); var2.put("refresh_token", var1); - URL var3 = new URL(class59.field308 + "shield/oauth/token" + (new class478(var2)).method2383()); - class434 var4 = new class434(); - if (this.method356()) { - var4.method2201(field655); + URL var3 = new URL(class314.field2776 + "shield/oauth/token" + (new class475(var2)).method2361()); + class431 var4 = new class431(); + if (this.method363()) { + var4.method2185(field655); } else { - var4.method2201(field654); + var4.method2185(field656); } - var4.method2198("Host", (new URL(class59.field308)).getHost()); - var4.method2205(class475.field3933); - class9 var5 = class9.field14; - RefreshAccessTokenRequester var6 = this.field662; + var4.method2182("Host", (new URL(class314.field2776)).getHost()); + var4.method2189(class472.field3931); + class9 var5 = class9.field22; + RefreshAccessTokenRequester var6 = this.field663; if (var6 != null) { - this.field666 = var6.request(var5.method27(), var3, var4.method2197(), ""); + this.field666 = var6.request(var5.method24(), var3, var4.method2181(), ""); } else { - class10 var7 = new class10(var3, var5, var4, this.field660); - this.field657 = this.field659.method47(var7); + class10 var7 = new class10(var3, var5, var4, this.field661); + this.field658 = this.field660.method54(var7); } } - @ObfuscatedName("go") + @ObfuscatedName("gh") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2007713791" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-43" ) - void method361(String var1) throws IOException { - URL var2 = new URL(class59.field308 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); - class434 var3 = new class434(); - var3.method2202(var1); - class9 var4 = class9.field15; - OtlTokenRequester var5 = this.field661; + void method368(String var1) throws IOException { + URL var2 = new URL(class314.field2776 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); + class431 var3 = new class431(); + var3.method2186(var1); + class9 var4 = class9.field21; + OtlTokenRequester var5 = this.field662; if (var5 != null) { - this.field665 = var5.request(var4.method27(), var2, var3.method2197(), ""); + this.field667 = var5.request(var4.method24(), var2, var3.method2181(), ""); } else { - class10 var6 = new class10(var2, var4, var3, this.field660); - this.field658 = this.field659.method47(var6); + class10 var6 = new class10(var2, var4, var3, this.field661); + this.field659 = this.field660.method54(var6); } } - @ObfuscatedName("hi") + @ObfuscatedName("gd") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-259118253" + garbageValue = "169401816" ) - void method362(String var1, String var2) throws IOException, JSONException { - URL var3 = new URL(Actor.field959 + "game-session/v1/tokens"); - class10 var4 = new class10(var3, class9.field14, this.field660); - var4.method31().method2202(var1); - var4.method31().method2205(class475.field3933); + void method369(String var1, String var2) throws IOException, JSONException { + URL var3 = new URL(FriendsChat.field3821 + "game-session/v1/tokens"); + class10 var4 = new class10(var3, class9.field22, this.field661); + var4.method34().method2186(var1); + var4.method34().method2189(class472.field3931); JSONObject var5 = new JSONObject(); - var5.method2750("accountId", var2); - var4.method32(new class477(var5)); - this.field658 = this.field659.method47(var4); + var5.method2727("accountId", var2); + var4.method35(new class474(var5)); + this.field659 = this.field660.method54(var4); } - @ObfuscatedName("hm") + @ObfuscatedName("hi") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-19583" + descriptor = "(I)V", + garbageValue = "121204254" ) @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { - boolean var1 = class59.field309.method1960(); + boolean var1 = WorldMapSectionType.field2038.method1953(); if (!var1) { - this.method368(); + this.method375(); } } } - @ObfuscatedName("hd") + @ObfuscatedName("hq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1822852781" + garbageValue = "-1703369019" ) - void method368() { - if (class59.field309.field3607 >= 4) { + void method375() { + if (WorldMapSectionType.field2038.field3605 >= 4) { this.error("js5crc"); - DefaultsGroup.updateGameState(1000); + WorldMapSection2.updateGameState(1000); } else { - if (class59.field309.field3606 >= 4) { + if (WorldMapSectionType.field2038.field3606 >= 4) { if (gameState <= 5) { this.error("js5io"); - DefaultsGroup.updateGameState(1000); + WorldMapSection2.updateGameState(1000); return; } js5Cycles = 3000; - class59.field309.field3606 = 3; + WorldMapSectionType.field2038.field3606 = 3; } if (--js5Cycles + 1 <= 0) { try { if (js5ConnectState == 0) { - class199.js5SocketTask = GameEngine.taskHandler.newSocketTask(MouseHandler.worldHost, class164.currentPort); + class101.js5SocketTask = GameEngine.taskHandler.newSocketTask(Friend.worldHost, class252.currentPort); ++js5ConnectState; } if (js5ConnectState == 1) { - if (class199.js5SocketTask.status == 2) { + if (class101.js5SocketTask.status == 2) { this.js5Error(-1); return; } - if (class199.js5SocketTask.status == 1) { + if (class101.js5SocketTask.status == 1) { ++js5ConnectState; } } if (js5ConnectState == 2) { - class162.js5Socket = WorldMapData_1.method1522((Socket)class199.js5SocketTask.result, 40000, 5000); + class167.js5Socket = WorldMapData_0.method1178((Socket)class101.js5SocketTask.result, 40000, 5000); Buffer var1 = new Buffer(5); var1.writeByte(15); - var1.writeInt(217); - class162.js5Socket.write(var1.array, 0, 5); + var1.writeInt(218); + class167.js5Socket.write(var1.array, 0, 5); ++js5ConnectState; - FloorDecoration.field1991 = GrandExchangeOfferTotalQuantityComparator.method1971(); + class310.field2769 = SpotAnimationDefinition.method962(); } if (js5ConnectState == 3) { - if (class162.js5Socket.available() > 0) { - int var2 = class162.js5Socket.readUnsignedByte(); + if (class167.js5Socket.available() > 0) { + int var2 = class167.js5Socket.readUnsignedByte(); if (var2 != 0) { this.js5Error(var2); return; } ++js5ConnectState; - } else if (GrandExchangeOfferTotalQuantityComparator.method1971() - FloorDecoration.field1991 > 30000L) { + } else if (SpotAnimationDefinition.method962() - class310.field2769 > 30000L) { this.js5Error(-2); return; } } if (js5ConnectState == 4) { - class59.field309.method1962(class162.js5Socket, gameState > 20); - class199.js5SocketTask = null; - class162.js5Socket = null; + WorldMapSectionType.field2038.method1955(class167.js5Socket, gameState > 20); + class101.js5SocketTask = null; + class167.js5Socket = null; js5ConnectState = 0; js5Errors = 0; } @@ -1749,48 +1785,48 @@ void method368() { } } - @ObfuscatedName("hs") + @ObfuscatedName("hf") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "5" + descriptor = "(II)V", + garbageValue = "-383870339" ) @Export("js5Error") void js5Error(int var1) { - class199.js5SocketTask = null; - class162.js5Socket = null; + class101.js5SocketTask = null; + class167.js5Socket = null; js5ConnectState = 0; - if (class164.currentPort == ObjectComposition.worldPort) { - class164.currentPort = class363.js5Port; + if (class252.currentPort == WorldMapCacheName.worldPort) { + class252.currentPort = AbstractSocket.js5Port; } else { - class164.currentPort = ObjectComposition.worldPort; + class252.currentPort = WorldMapCacheName.worldPort; } ++js5Errors; if (js5Errors < 2 || var1 != 7 && var1 != 9) { if (js5Errors >= 2 && var1 == 6) { this.error("js5connect_outofdate"); - DefaultsGroup.updateGameState(1000); + WorldMapSection2.updateGameState(1000); } else if (js5Errors >= 4) { if (gameState <= 5) { this.error("js5connect"); - DefaultsGroup.updateGameState(1000); + WorldMapSection2.updateGameState(1000); } else { js5Cycles = 3000; } } } else if (gameState <= 5) { this.error("js5connect_full"); - DefaultsGroup.updateGameState(1000); + WorldMapSection2.updateGameState(1000); } else { js5Cycles = 3000; } } - @ObfuscatedName("hg") + @ObfuscatedName("hh") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-1040776320" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { @@ -1799,53 +1835,53 @@ final void doCycleLoggedOut() { try { if (loginState == 0) { - if (class224.secureRandom == null && (secureRandomFuture.isDone() || field444 > 250)) { - class224.secureRandom = secureRandomFuture.get(); + if (EnumComposition.secureRandom == null && (secureRandomFuture.isDone() || field444 > 250)) { + EnumComposition.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if (class224.secureRandom != null) { + if (EnumComposition.secureRandom != null) { if (var1 != null) { var1.close(); var1 = null; } - MouseHandler.socketTask = null; + Player.socketTask = null; hadNetworkError = false; field444 = 0; - if (field648.method2654()) { - if (this.method357()) { + if (field648.method2633()) { + if (this.method364()) { try { - this.method360(class191.field1499); - class409.method2106(21); - } catch (Throwable var24) { - class190.RunException_sendStackTrace((String)null, var24); - class198.getLoginError(65); + this.method367(ObjectComposition.field1664); + class19.method73(21); + } catch (Throwable var22) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var22); + class149.getLoginError(65); return; } } else { - if (!this.method358()) { - class198.getLoginError(65); + if (!this.method365()) { + class149.getLoginError(65); return; } try { - this.method362(LoginScreenAnimation.field1042, class155.field1355); - class409.method2106(20); - } catch (Exception var23) { - class190.RunException_sendStackTrace((String)null, var23); - class198.getLoginError(65); + this.method369(class369.field3560, InterfaceParent.field862); + class19.method73(20); + } catch (Exception var21) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var21); + class149.getLoginError(65); return; } } } else { - class409.method2106(1); + class19.method73(1); } } } - class20 var26; + class20 var24; if (loginState == 21) { if (this.field666 != null) { if (!this.field666.isDone()) { @@ -1853,7 +1889,7 @@ final void doCycleLoggedOut() { } if (this.field666.isCancelled()) { - class198.getLoginError(65); + class149.getLoginError(65); this.field666 = null; return; } @@ -1861,204 +1897,204 @@ final void doCycleLoggedOut() { try { RefreshAccessTokenResponse var3 = (RefreshAccessTokenResponse)this.field666.get(); if (!var3.isSuccess()) { - class198.getLoginError(65); + class149.getLoginError(65); this.field666 = null; return; } - class467.field3921 = var3.getAccessToken(); - class191.field1499 = var3.getRefreshToken(); + Messages.field1155 = var3.getAccessToken(); + ObjectComposition.field1664 = var3.getRefreshToken(); this.field666 = null; - } catch (Exception var22) { - class190.RunException_sendStackTrace((String)null, var22); - class198.getLoginError(65); + } catch (Exception var20) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var20); + class149.getLoginError(65); this.field666 = null; return; } } else { - if (this.field657 == null) { - class198.getLoginError(65); + if (this.field658 == null) { + class149.getLoginError(65); return; } - if (!this.field657.method61()) { + if (!this.field658.method68()) { return; } - if (this.field657.method60()) { - class190.RunException_sendStackTrace(this.field657.method59(), (Throwable)null); - class198.getLoginError(65); - this.field657 = null; + if (this.field658.method67()) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace(this.field658.method66(), (Throwable)null); + class149.getLoginError(65); + this.field658 = null; return; } - var26 = this.field657.method62(); - if (var26.method71() != 200) { - class198.getLoginError(65); - this.field657 = null; + var24 = this.field658.method69(); + if (var24.method74() != 200) { + class149.getLoginError(65); + this.field658 = null; return; } field444 = 0; - class477 var4 = new class477(var26.method73()); + class474 var4 = new class474(var24.method76()); try { - class467.field3921 = var4.method2379().getString("access_token"); - class191.field1499 = var4.method2379().getString("refresh_token"); - } catch (Exception var21) { - class190.RunException_sendStackTrace("Error parsing tokens", var21); - class198.getLoginError(65); - this.field657 = null; + Messages.field1155 = var4.method2357().getString("access_token"); + ObjectComposition.field1664 = var4.method2357().getString("refresh_token"); + } catch (Exception var19) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Error parsing tokens", var19); + class149.getLoginError(65); + this.field658 = null; return; } } - this.method361(class467.field3921); - class409.method2106(20); + this.method368(Messages.field1155); + class19.method73(20); } if (loginState == 20) { - if (this.field665 != null) { - if (!this.field665.isDone()) { + if (this.field667 != null) { + if (!this.field667.isDone()) { return; } - if (this.field665.isCancelled()) { - class198.getLoginError(65); - this.field665 = null; + if (this.field667.isCancelled()) { + class149.getLoginError(65); + this.field667 = null; return; } try { - OtlTokenResponse var27 = (OtlTokenResponse)this.field665.get(); - if (!var27.isSuccess()) { - class198.getLoginError(65); - this.field665 = null; + OtlTokenResponse var25 = (OtlTokenResponse)this.field667.get(); + if (!var25.isSuccess()) { + class149.getLoginError(65); + this.field667 = null; return; } - this.field664 = var27.getToken(); - this.field665 = null; - } catch (Exception var20) { - class190.RunException_sendStackTrace((String)null, var20); - class198.getLoginError(65); - this.field665 = null; + this.field665 = var25.getToken(); + this.field667 = null; + } catch (Exception var18) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var18); + class149.getLoginError(65); + this.field667 = null; return; } } else { - if (this.field658 == null) { - class198.getLoginError(65); + if (this.field659 == null) { + class149.getLoginError(65); return; } - if (!this.field658.method61()) { + if (!this.field659.method68()) { return; } - if (this.field658.method60()) { - class190.RunException_sendStackTrace(this.field658.method59(), (Throwable)null); - class198.getLoginError(65); - this.field658 = null; + if (this.field659.method67()) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace(this.field659.method66(), (Throwable)null); + class149.getLoginError(65); + this.field659 = null; return; } - var26 = this.field658.method62(); - if (var26.method71() != 200) { - class190.RunException_sendStackTrace("Response code: " + var26.method71() + "Response body: " + var26.method73(), (Throwable)null); - class198.getLoginError(65); - this.field658 = null; + var24 = this.field659.method69(); + if (var24.method74() != 200) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Response code: " + var24.method74() + "Response body: " + var24.method76(), (Throwable)null); + class149.getLoginError(65); + this.field659 = null; return; } - List var29 = (List)var26.method72().get("Content-Type"); - if (var29 != null && var29.contains(class475.field3933.method2373())) { + List var27 = (List)var24.method75().get("Content-Type"); + if (var27 != null && var27.contains(class472.field3931.method2348())) { try { - JSONObject var5 = new JSONObject(var26.method73()); - this.field664 = var5.getString("token"); - } catch (JSONException var19) { - class190.RunException_sendStackTrace((String)null, var19); - class198.getLoginError(65); - this.field658 = null; + JSONObject var5 = new JSONObject(var24.method76()); + this.field665 = var5.getString("token"); + } catch (JSONException var17) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var17); + class149.getLoginError(65); + this.field659 = null; return; } } else { - this.field664 = var26.method73(); + this.field665 = var24.method76(); } - this.field658 = null; + this.field659 = null; } field444 = 0; - class409.method2106(1); + class19.method73(1); } if (loginState == 1) { - if (MouseHandler.socketTask == null) { - MouseHandler.socketTask = GameEngine.taskHandler.newSocketTask(MouseHandler.worldHost, class164.currentPort); + if (Player.socketTask == null) { + Player.socketTask = GameEngine.taskHandler.newSocketTask(Friend.worldHost, class252.currentPort); } - if (MouseHandler.socketTask.status == 2) { + if (Player.socketTask.status == 2) { throw new IOException(); } - if (MouseHandler.socketTask.status == 1) { - var1 = WorldMapData_1.method1522((Socket)MouseHandler.socketTask.result, 40000, 5000); + if (Player.socketTask.status == 1) { + var1 = WorldMapData_0.method1178((Socket)Player.socketTask.result, 40000, 5000); packetWriter.setSocket(var1); - MouseHandler.socketTask = null; - class409.method2106(2); + Player.socketTask = null; + class19.method73(2); } } - PacketBufferNode var28; + PacketBufferNode var26; if (loginState == 2) { packetWriter.clearBuffer(); - var28 = class103.method599(); - var28.packetBuffer.writeByte(LoginPacket.field2762.id); - packetWriter.addNode(var28); + var26 = HorizontalAlignment.method931(); + var26.packetBuffer.writeByte(LoginPacket.field2764.id); + packetWriter.addNode(var26); packetWriter.flush(); var2.offset = 0; - class409.method2106(3); + class19.method73(3); } - int var13; + int var12; if (loginState == 3) { - if (class171.pcmPlayer1 != null) { - class171.pcmPlayer1.method209(); + if (MusicPatchPcmStream.pcmPlayer1 != null) { + MusicPatchPcmStream.pcmPlayer1.method213(); } if (var1.isAvailable(1)) { - var13 = var1.readUnsignedByte(); - if (class171.pcmPlayer1 != null) { - class171.pcmPlayer1.method209(); + var12 = var1.readUnsignedByte(); + if (MusicPatchPcmStream.pcmPlayer1 != null) { + MusicPatchPcmStream.pcmPlayer1.method213(); } - if (var13 != 0) { - class198.getLoginError(var13); + if (var12 != 0) { + class149.getLoginError(var12); return; } var2.offset = 0; - class409.method2106(4); + class19.method73(4); } } if (loginState == 4) { if (var2.offset < 8) { - var13 = var1.available(); - if (var13 > 8 - var2.offset) { - var13 = 8 - var2.offset; + var12 = var1.available(); + if (var12 > 8 - var2.offset) { + var12 = 8 - var2.offset; } - if (var13 > 0) { - var1.read(var2.array, var2.offset, var13); - var2.offset += var13; + if (var12 > 0) { + var1.read(var2.array, var2.offset, var12); + var2.offset += var12; } } if (var2.offset == 8) { var2.offset = 0; - AttackOption.field1098 = var2.readLong(); - class409.method2106(5); + Clock.field1876 = var2.readLong(); + class19.method73(5); } } @@ -2066,259 +2102,245 @@ final void doCycleLoggedOut() { if (loginState == 5) { packetWriter.packetBuffer.offset = 0; packetWriter.clearBuffer(); - PacketBuffer var30 = new PacketBuffer(500); - int[] var31 = new int[]{class224.secureRandom.nextInt(), class224.secureRandom.nextInt(), class224.secureRandom.nextInt(), class224.secureRandom.nextInt()}; - var30.offset = 0; - var30.writeByte(1); - var30.writeInt(var31[0]); - var30.writeInt(var31[1]); - var30.writeInt(var31[2]); - var30.writeInt(var31[3]); - var30.writeLong(AttackOption.field1098); + PacketBuffer var28 = new PacketBuffer(500); + int[] var29 = new int[]{EnumComposition.secureRandom.nextInt(), EnumComposition.secureRandom.nextInt(), EnumComposition.secureRandom.nextInt(), EnumComposition.secureRandom.nextInt()}; + var28.offset = 0; + var28.writeByte(1); + var28.writeInt(var29[0]); + var28.writeInt(var29[1]); + var28.writeInt(var29[2]); + var28.writeInt(var29[3]); + var28.writeLong(Clock.field1876); if (gameState == 40) { - var30.writeInt(SecureRandomFuture.field809[0]); - var30.writeInt(SecureRandomFuture.field809[1]); - var30.writeInt(SecureRandomFuture.field809[2]); - var30.writeInt(SecureRandomFuture.field809[3]); + var28.writeInt(class215.field1854[0]); + var28.writeInt(class215.field1854[1]); + var28.writeInt(class215.field1854[2]); + var28.writeInt(class215.field1854[3]); } else { if (gameState == 50) { - var30.writeByte(class141.field1314.rsOrdinal()); - var30.writeInt(class153.field1352); + var28.writeByte(class124.field1204.rsOrdinal()); + var28.writeInt(class160.field1406); } else { - var30.writeByte(field419.rsOrdinal()); - switch(field419.field1317) { + var28.writeByte(field419.rsOrdinal()); + switch(field419.field1210) { + case 0: case 1: - var30.offset += 4; + var28.writeMedium(class53.field256); + ++var28.offset; break; case 2: - var30.writeInt(class91.clientPreferences.method565(Login.Login_username)); + var28.offset += 4; break; case 3: - case 4: - var30.writeMedium(ClientPreferences.field1059); - ++var30.offset; + var28.writeInt(WorldMapIcon_1.clientPreferences.method566(Login.Login_username)); } } - if (field648.method2654()) { - var30.writeByte(class534.field4232.rsOrdinal()); - var30.writeStringCp1252NullTerminated(this.field664); + if (field648.method2633()) { + var28.writeByte(class531.field4233.rsOrdinal()); + var28.writeStringCp1252NullTerminated(this.field665); } else { - var30.writeByte(class534.field4231.rsOrdinal()); - var30.writeStringCp1252NullTerminated(Login.Login_password); + var28.writeByte(class531.field4234.rsOrdinal()); + var28.writeStringCp1252NullTerminated(Login.Login_password); } } - var30.encryptRsa(class76.field738, class76.field739); - SecureRandomFuture.field809 = var31; - PacketBufferNode var34 = class103.method599(); - var34.packetBuffer.offset = 0; + var28.encryptRsa(class74.field742, class74.field741); + class215.field1854 = var29; + PacketBufferNode var32 = HorizontalAlignment.method931(); + var32.packetBuffer.offset = 0; if (gameState == 40) { - var34.packetBuffer.writeByte(LoginPacket.RECONNECT_LOGIN_CONNECTION.id); + var32.packetBuffer.writeByte(LoginPacket.RECONNECT_LOGIN_CONNECTION.id); } else { - var34.packetBuffer.writeByte(LoginPacket.NEW_LOGIN_CONNECTION.id); + var32.packetBuffer.writeByte(LoginPacket.NEW_LOGIN_CONNECTION.id); } - var34.packetBuffer.writeShort(0); - var6 = var34.packetBuffer.offset; - var34.packetBuffer.writeInt(217); - var34.packetBuffer.writeInt(1); - var34.packetBuffer.writeByte(clientType); - var34.packetBuffer.writeByte(field427); + var32.packetBuffer.writeShort(0); + var6 = var32.packetBuffer.offset; + var32.packetBuffer.writeInt(218); + var32.packetBuffer.writeInt(1); + var32.packetBuffer.writeByte(clientType); + var32.packetBuffer.writeByte(field424); byte var7 = 0; - var34.packetBuffer.writeByte(var7); - var34.packetBuffer.writeBytes(var30.array, 0, var30.offset); - int var8 = var34.packetBuffer.offset; - var34.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var34.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var34.packetBuffer.writeShort(class340.canvasWidth); - var34.packetBuffer.writeShort(class491.canvasHeight); - PacketBuffer var9 = var34.packetBuffer; - if (randomDatData != null) { - var9.writeBytes(randomDatData, 0, randomDatData.length); - } else { - byte[] var10 = class131.method706(); - var9.writeBytes(var10, 0, var10.length); - } - - var34.packetBuffer.writeStringCp1252NullTerminated(HealthBarDefinition.param9); - var34.packetBuffer.writeInt(WorldMapIcon_1.field2337); + var32.packetBuffer.writeByte(var7); + var32.packetBuffer.writeBytes(var28.array, 0, var28.offset); + int var8 = var32.packetBuffer.offset; + var32.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var32.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var32.packetBuffer.writeShort(Language.canvasWidth); + var32.packetBuffer.writeShort(class47.canvasHeight); + class354.method1897(var32.packetBuffer); + var32.packetBuffer.writeStringCp1252NullTerminated(MenuAction.param9); + var32.packetBuffer.writeInt(DevicePcmPlayerProvider.field66); if (param25 > 213) { - var34.packetBuffer.writeByte(0); - } - - Buffer var40 = new Buffer(Skeleton.field2060.size()); - Skeleton.field2060.write(var40); - var34.packetBuffer.writeBytes(var40.array, 0, var40.array.length); - var34.packetBuffer.writeByte(clientType); - var34.packetBuffer.writeInt(0); - var34.packetBuffer.writeInt(WorldMapDecorationType.field3154.hash); - var34.packetBuffer.writeInt(class199.field1567.hash); - var34.packetBuffer.writeIntIME(class199.archive8.hash); - var34.packetBuffer.writeIntME(class241.field2052.hash); - var34.packetBuffer.writeIntLE(class27.archive13.hash); - var34.packetBuffer.writeIntLE(class469.field3930.hash); - var34.packetBuffer.writeIntLE(SoundSystem.archive2.hash); - var34.packetBuffer.writeIntME(class190.archive10.hash); - var34.packetBuffer.writeIntIME(HorizontalAlignment.field1584.hash); - var34.packetBuffer.writeIntME(GrandExchangeOfferOwnWorldComparator.field361.hash); - var34.packetBuffer.writeInt(class358.field3177.hash); - var34.packetBuffer.writeIntME(Language.field3643.hash); - var34.packetBuffer.writeIntME(0); - var34.packetBuffer.writeIntLE(AbstractByteArrayCopier.archive4.hash); - var34.packetBuffer.writeIntLE(class198.archive9.hash); - var34.packetBuffer.writeIntLE(AABB.field2123.hash); - var34.packetBuffer.writeInt(ArchiveDiskAction.field3538.hash); - var34.packetBuffer.writeIntLE(CollisionMap.archive6.hash); - var34.packetBuffer.writeInt(SongTask.archive12.hash); - var34.packetBuffer.writeIntLE(class317.field2776.hash); - var34.packetBuffer.writeIntIME(class92.field888.hash); - var34.packetBuffer.xteaEncrypt(var31, var8, var34.packetBuffer.offset); - var34.packetBuffer.writeLengthShort(var34.packetBuffer.offset - var6); - packetWriter.addNode(var34); + var32.packetBuffer.writeByte(0); + } + + Buffer var9 = new Buffer(class60.field312.size()); + class60.field312.write(var9); + var32.packetBuffer.writeBytes(var9.array, 0, var9.array.length); + var32.packetBuffer.writeByte(clientType); + var32.packetBuffer.writeInt(0); + var32.packetBuffer.writeIntIME(PcmPlayer.field181.hash); + var32.packetBuffer.method2613(SoundSystem.field209.hash); + var32.packetBuffer.writeIntLE(class145.field1338.hash); + var32.packetBuffer.method2613(class7.field12.hash); + var32.packetBuffer.writeIntLE(class514.archive6.hash); + var32.packetBuffer.writeIntLE(StructComposition.field1637.hash); + var32.packetBuffer.method2613(class313.archive4.hash); + var32.packetBuffer.writeIntIME(UserComparator7.field1190.hash); + var32.packetBuffer.writeIntLE(WorldMapDecorationType.archive10.hash); + var32.packetBuffer.writeIntIME(SpotAnimationDefinition.field1597.hash); + var32.packetBuffer.method2613(Canvas.field68.hash); + var32.packetBuffer.writeIntIME(VarbitComposition.archive13.hash); + var32.packetBuffer.writeInt(WorldMapData_0.field1938.hash); + var32.packetBuffer.method2613(0); + var32.packetBuffer.writeIntLE(class47.archive12.hash); + var32.packetBuffer.writeIntLE(GrandExchangeOfferOwnWorldComparator.archive8.hash); + var32.packetBuffer.writeIntLE(Language.field3643.hash); + var32.packetBuffer.writeInt(WorldMapSection0.archive9.hash); + var32.packetBuffer.writeIntLE(class19.field59.hash); + var32.packetBuffer.writeIntIME(class344.archive2.hash); + var32.packetBuffer.writeIntIME(BuddyRankComparator.field1200.hash); + var32.packetBuffer.xteaEncrypt(var29, var8, var32.packetBuffer.offset); + var32.packetBuffer.writeLengthShort(var32.packetBuffer.offset - var6); + packetWriter.addNode(var32); packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var31); - int[] var11 = new int[4]; + packetWriter.isaacCipher = new IsaacCipher(var29); + int[] var10 = new int[4]; - for (int var12 = 0; var12 < 4; ++var12) { - var11[var12] = var31[var12] + 50; + for (int var11 = 0; var11 < 4; ++var11) { + var10[var11] = var29[var11] + 50; } - var2.newIsaacCipher(var11); - class409.method2106(6); + var2.newIsaacCipher(var10); + class19.method73(6); } - int var14; + int var13; if (loginState == 6 && var1.available() > 0) { - var13 = var1.readUnsignedByte(); - if (var13 == 61) { - var14 = var1.available(); - MusicPatchNode2.field2778 = var14 == 1 && var1.readUnsignedByte() == 1; - class409.method2106(5); - } - - if (var13 == 21 && gameState == 20) { - class409.method2106(12); - } else if (var13 == 2) { - class409.method2106(14); - } else if (var13 == 15 && gameState == 40) { + var12 = var1.readUnsignedByte(); + if (var12 == 61) { + var13 = var1.available(); + PendingSpawn.field949 = var13 == 1 && var1.readUnsignedByte() == 1; + class19.method73(5); + } + + if (var12 == 21 && gameState == 20) { + class19.method73(12); + } else if (var12 == 2) { + class19.method73(14); + } else if (var12 == 15 && gameState == 40) { packetWriter.serverPacketLength = -1; - class409.method2106(19); - } else if (var13 == 64) { - class409.method2106(10); - } else if (var13 == 23 && field448 < 1) { - ++field448; - class409.method2106(0); - } else if (var13 == 29) { - class409.method2106(17); + class19.method73(19); + } else if (var12 == 64) { + class19.method73(10); + } else if (var12 == 23 && field447 < 1) { + ++field447; + class19.method73(0); + } else if (var12 == 29) { + class19.method73(17); } else { - if (var13 != 69) { - class198.getLoginError(var13); + if (var12 != 69) { + class149.getLoginError(var12); return; } - class409.method2106(7); + class19.method73(7); } } if (loginState == 7 && var1.available() >= 2) { var1.read(var2.array, 0, 2); var2.offset = 0; - class13.field35 = var2.readUnsignedShort(); - class409.method2106(8); + Language.field3642 = var2.readUnsignedShort(); + class19.method73(8); } - if (loginState == 8 && var1.available() >= class13.field35) { + if (loginState == 8 && var1.available() >= Language.field3642) { var2.offset = 0; - var1.read(var2.array, var2.offset, class13.field35); - class6[] var32 = new class6[]{class6.field4}; - class6 var33 = var32[var2.readUnsignedByte()]; + var1.read(var2.array, var2.offset, Language.field3642); + class6 var30 = class221.method1111()[var2.readUnsignedByte()]; try { - switch(var33.field6) { - case 0: - class0 var36 = new class0(); - this.field656 = new class7(var2, var36); - class409.method2106(9); - break; - default: - throw new IllegalArgumentException(); - } - } catch (Exception var18) { - class198.getLoginError(22); + class3 var31 = WorldMapElement.method890(var30); + this.field657 = new class7(var2, var31); + class19.method73(9); + } catch (Exception var16) { + class149.getLoginError(22); return; } } - if (loginState == 9 && this.field656.method17()) { - this.field668 = this.field656.method19(); - this.field656.method18(); - this.field656 = null; - if (this.field668 == null) { - class198.getLoginError(22); + if (loginState == 9 && this.field657.method17()) { + this.field669 = this.field657.method19(); + this.field657.method18(); + this.field657 = null; + if (this.field669 == null) { + class149.getLoginError(22); return; } packetWriter.clearBuffer(); - var28 = class103.method599(); - var28.packetBuffer.writeByte(LoginPacket.field2764.id); - var28.packetBuffer.writeShort(this.field668.offset); - var28.packetBuffer.writeBuffer(this.field668); - packetWriter.addNode(var28); + var26 = HorizontalAlignment.method931(); + var26.packetBuffer.writeByte(LoginPacket.field2761.id); + var26.packetBuffer.writeShort(this.field669.offset); + var26.packetBuffer.writeBuffer(this.field669); + packetWriter.addNode(var26); packetWriter.flush(); - this.field668 = null; - class409.method2106(6); + this.field669 = null; + class19.method73(6); } if (loginState == 10 && var1.available() > 0) { - class174.field1446 = var1.readUnsignedByte(); - class409.method2106(11); + class223.field1885 = var1.readUnsignedByte(); + class19.method73(11); } - if (loginState == 11 && var1.available() >= class174.field1446) { - var1.read(var2.array, 0, class174.field1446); + if (loginState == 11 && var1.available() >= class223.field1885) { + var1.read(var2.array, 0, class223.field1885); var2.offset = 0; - class409.method2106(6); + class19.method73(6); } if (loginState == 12 && var1.available() > 0) { - field447 = (var1.readUnsignedByte() + 3) * 60; - class409.method2106(13); + field443 = (var1.readUnsignedByte() + 3) * 60; + class19.method73(13); } if (loginState == 13) { field444 = 0; - AbstractWorldMapIcon.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field447 / 60 + " seconds."); - if (--field447 <= 0) { - class409.method2106(0); + class139.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field443 / 60 + " seconds."); + if (--field443 <= 0) { + class19.method73(0); } } else { if (loginState == 14 && var1.available() >= 1) { - Tiles.playerUUIDLength = var1.readUnsignedByte(); - class409.method2106(15); + SoundCache.playerUUIDLength = var1.readUnsignedByte(); + class19.method73(15); } - if (loginState == 15 && var1.available() >= Tiles.playerUUIDLength) { - boolean var42 = var1.readUnsignedByte() == 1; + if (loginState == 15 && var1.available() >= SoundCache.playerUUIDLength) { + boolean var38 = var1.readUnsignedByte() == 1; var1.read(var2.array, 0, 4); var2.offset = 0; - boolean var41 = false; - if (var42) { - var14 = var2.readByteIsaac() << 24; - var14 |= var2.readByteIsaac() << 16; - var14 |= var2.readByteIsaac() << 8; - var14 |= var2.readByteIsaac(); - class91.clientPreferences.method563(Login.Login_username, var14); + boolean var37 = false; + if (var38) { + var13 = var2.readByteIsaac() << 24; + var13 |= var2.readByteIsaac() << 16; + var13 |= var2.readByteIsaac() << 8; + var13 |= var2.readByteIsaac(); + WorldMapIcon_1.clientPreferences.method564(Login.Login_username, var13); } if (Login_isUsernameRemembered) { - class91.clientPreferences.setUsernameToRemember(Login.Login_username); + WorldMapIcon_1.clientPreferences.setUsernameToRemember(Login.Login_username); } else { - class91.clientPreferences.setUsernameToRemember((String)null); + WorldMapIcon_1.clientPreferences.setUsernameToRemember((String)null); } - class144.savePreferences(); + TextureProvider.savePreferences(); staffModLevel = var1.readUnsignedByte(); playerMod = var1.readUnsignedByte() == 1; localPlayerIndex = var1.readUnsignedByte(); @@ -2327,7 +2349,7 @@ final void doCycleLoggedOut() { isMembers = var1.readUnsignedByte(); var1.read(var2.array, 0, 8); var2.offset = 0; - this.field667 = var2.readLong(); + this.field668 = var2.readLong(); var1.read(var2.array, 0, 8); var2.offset = 0; playerUUID = var2.readLong(); @@ -2339,36 +2361,35 @@ final void doCycleLoggedOut() { var1.read(var2.array, 0, 1); var2.offset = 0; - ServerPacket[] var38 = class209.method1033(); + ServerPacket[] var35 = class12.method46(); var6 = var2.readSmartByteShortIsaac(); - if (var6 < 0 || var6 >= var38.length) { + if (var6 < 0 || var6 >= var35.length) { throw new IOException(var6 + " " + var2.offset); } - packetWriter.serverPacket = var38[var6]; + packetWriter.serverPacket = var35[var6]; packetWriter.serverPacketLength = packetWriter.serverPacket.length; var1.read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - Client var16 = class159.client; - JSObject.getWindow(var16).call("zap", (Object[])null); - } catch (Throwable var17) { + class26.method108(SpriteMask.client, "zap"); + } catch (Throwable var15) { } - class409.method2106(16); + class19.method73(16); } if (loginState == 16) { if (var1.available() >= packetWriter.serverPacketLength) { var2.offset = 0; var1.read(var2.array, 0, packetWriter.serverPacketLength); - timer.method2185(); - MusicPatchNode2.method1658(); - class180.updatePlayer(var2); - class94.timeOfPreviousKeyPress = -1; - class151.loadRegions(false, var2); + timer.method2173(); + class53.method307(); + Players.updatePlayer(var2); + DefaultsGroup.timeOfPreviousKeyPress = -1; + GrandExchangeOfferUnitPriceComparator.loadRegions(false, var2, param25 >= 218); packetWriter.serverPacket = null; } @@ -2377,21 +2398,21 @@ final void doCycleLoggedOut() { var2.offset = 0; var1.read(var2.array, 0, 2); var2.offset = 0; - ApproximateRouteStrategy.field359 = var2.readUnsignedShort(); - class409.method2106(18); + GrandExchangeOfferOwnWorldComparator.field360 = var2.readUnsignedShort(); + class19.method73(18); } - if (loginState == 18 && var1.available() >= ApproximateRouteStrategy.field359) { + if (loginState == 18 && var1.available() >= GrandExchangeOfferOwnWorldComparator.field360) { var2.offset = 0; - var1.read(var2.array, 0, ApproximateRouteStrategy.field359); + var1.read(var2.array, 0, GrandExchangeOfferOwnWorldComparator.field360); var2.offset = 0; - String var37 = var2.readStringCp1252NullTerminated(); - String var35 = var2.readStringCp1252NullTerminated(); - String var39 = var2.readStringCp1252NullTerminated(); - AbstractWorldMapIcon.setLoginResponseString(var37, var35, var39); - DefaultsGroup.updateGameState(10); - if (field648.method2654()) { - GameEngine.method166(9); + String var34 = var2.readStringCp1252NullTerminated(); + String var33 = var2.readStringCp1252NullTerminated(); + String var36 = var2.readStringCp1252NullTerminated(); + class139.setLoginResponseString(var34, var33, var36); + WorldMapSection2.updateGameState(10); + if (field648.method2633()) { + UserComparator7.method674(9); } } @@ -2409,53 +2430,53 @@ final void doCycleLoggedOut() { if (var1.available() >= packetWriter.serverPacketLength) { var1.read(var2.array, 0, packetWriter.serverPacketLength); var2.offset = 0; - var13 = packetWriter.serverPacketLength; - timer.method2187(); - MouseHandler.method178(); - class180.updatePlayer(var2); - if (var13 != var2.offset) { + var12 = packetWriter.serverPacketLength; + timer.method2175(); + class17.method61(); + Players.updatePlayer(var2); + if (var12 != var2.offset) { throw new RuntimeException(); } } } else { ++field444; if (field444 > 2000) { - if (field448 < 1) { - if (ObjectComposition.worldPort == class164.currentPort) { - class164.currentPort = class363.js5Port; + if (field447 < 1) { + if (WorldMapCacheName.worldPort == class252.currentPort) { + class252.currentPort = AbstractSocket.js5Port; } else { - class164.currentPort = ObjectComposition.worldPort; + class252.currentPort = WorldMapCacheName.worldPort; } - ++field448; - class409.method2106(0); + ++field447; + class19.method73(0); } else { - class198.getLoginError(-3); + class149.getLoginError(-3); } } } } } - } catch (IOException var25) { - if (field448 < 1) { - if (ObjectComposition.worldPort == class164.currentPort) { - class164.currentPort = class363.js5Port; + } catch (IOException var23) { + if (field447 < 1) { + if (WorldMapCacheName.worldPort == class252.currentPort) { + class252.currentPort = AbstractSocket.js5Port; } else { - class164.currentPort = ObjectComposition.worldPort; + class252.currentPort = WorldMapCacheName.worldPort; } - ++field448; - class409.method2106(0); + ++field447; + class19.method73(0); } else { - class198.getLoginError(-2); + class149.getLoginError(-2); } } } - @ObfuscatedName("hw") + @ObfuscatedName("hm") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-614967617" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { @@ -2469,302 +2490,426 @@ final void doCycleLoggedIn() { if (hadNetworkError) { hadNetworkError = false; - class148.method781(); + class9.method29(); } else { if (!isMenuOpen) { - StudioGame.addCancelMenuEntry(); + UserComparator10.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method378(packetWriter); ++var1) { + for (var1 = 0; var1 < 100 && this.method385(packetWriter); ++var1) { } if (gameState == 30) { - while (true) { - ReflectionCheck var2 = (ReflectionCheck)class36.reflectionChecks.last(); - boolean var41; - if (var2 == null) { - var41 = false; - } else { - var41 = true; - } - - int var3; - PacketBufferNode var42; - if (!var41) { - PacketBufferNode var20; - int var21; - if (timer.field3788) { - var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.LOGIN_TIMINGS, packetWriter.isaacCipher); - var20.packetBuffer.writeByte(0); - var21 = var20.packetBuffer.offset; - timer.write(var20.packetBuffer); - var20.packetBuffer.WriteLengthByte(var20.packetBuffer.offset - var21); - packetWriter.addNode(var20); - timer.method2186(); - } - - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - synchronized(class233.mouseRecorder.lock) { - if (!lockMouseRecorder) { - class233.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || class233.mouseRecorder.index >= 40) { - var42 = null; - var3 = 0; - var4 = 0; - var5 = 0; - var6 = 0; - - for (var7 = 0; var7 < class233.mouseRecorder.index && (var42 == null || var42.packetBuffer.offset - var3 < 246); ++var7) { - var4 = var7; - var8 = class233.mouseRecorder.ys[var7]; - if (var8 < -1) { - var8 = -1; - } else if (var8 > 65534) { - var8 = 65534; - } + int var2; + PacketBufferNode var14; + while (class216.method1096()) { + var14 = class113.getPacketBufferNode(ClientPacket.REFLECTION_CHECK_REPLY, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + var2 = var14.packetBuffer.offset; + class415.performReflectionCheck(var14.packetBuffer); + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); + packetWriter.addNode(var14); + } + + if (timer.field3792) { + var14 = class113.getPacketBufferNode(ClientPacket.LOGIN_TIMINGS, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + var2 = var14.packetBuffer.offset; + timer.write(var14.packetBuffer); + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); + packetWriter.addNode(var14); + timer.method2174(); + } + + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + PacketBuffer var10000; + synchronized(Message.mouseRecorder.lock) { + if (!lockMouseRecorder) { + Message.mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || Message.mouseRecorder.index >= 40) { + PacketBufferNode var15 = null; + var3 = 0; + var4 = 0; + var5 = 0; + var6 = 0; - var9 = class233.mouseRecorder.xs[var7]; - if (var9 < -1) { - var9 = -1; - } else if (var9 > 65534) { - var9 = 65534; - } + for (var7 = 0; var7 < Message.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { + var4 = var7; + var8 = Message.mouseRecorder.ys[var7]; + if (var8 < -1) { + var8 = -1; + } else if (var8 > 65534) { + var8 = 65534; + } - if (var9 != lastMouseRecordX || var8 != lastMouseRecordY) { - if (var42 == null) { - var42 = ClanChannelMember.getPacketBufferNode(ClientPacket.f52, packetWriter.isaacCipher); - var42.packetBuffer.writeByte(0); - var3 = var42.packetBuffer.offset; - PacketBuffer var10000 = var42.packetBuffer; - var10000.offset += 2; - var5 = 0; - var6 = 0; - } - - if (-1L != field610) { - var10 = var9 - lastMouseRecordX; - var11 = var8 - lastMouseRecordY; - var12 = (int)((class233.mouseRecorder.millis[var7] - field610) / 20L); - var5 = (int)((long)var5 + (class233.mouseRecorder.millis[var7] - field610) % 20L); - } else { - var10 = var9; - var11 = var8; - var12 = Integer.MAX_VALUE; - } - - lastMouseRecordX = var9; - lastMouseRecordY = var8; - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { - var10 += 32; - var11 += 32; - var42.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { - var10 += 128; - var11 += 128; - var42.packetBuffer.writeByte(var12 + 128); - var42.packetBuffer.writeShort(var11 + (var10 << 8)); - } else if (var12 < 32) { - var42.packetBuffer.writeByte(var12 + 192); - if (var9 != -1 && var8 != -1) { - var42.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var42.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } else { - var42.packetBuffer.writeShort((var12 & 8191) + 57344); - if (var9 != -1 && var8 != -1) { - var42.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var42.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } + var9 = Message.mouseRecorder.xs[var7]; + if (var9 < -1) { + var9 = -1; + } else if (var9 > 65534) { + var9 = 65534; + } - ++var6; - field610 = class233.mouseRecorder.millis[var7]; - } + if (var9 != lastMouseRecordX || var8 != lastMouseRecordY) { + if (var15 == null) { + var15 = class113.getPacketBufferNode(ClientPacket.f52, packetWriter.isaacCipher); + var15.packetBuffer.writeByte(0); + var3 = var15.packetBuffer.offset; + var10000 = var15.packetBuffer; + var10000.offset += 2; + var5 = 0; + var6 = 0; } - if (var42 != null) { - var42.packetBuffer.WriteLengthByte(var42.packetBuffer.offset - var3); - var7 = var42.packetBuffer.offset; - var42.packetBuffer.offset = var3; - var42.packetBuffer.writeByte(var5 / var6); - var42.packetBuffer.writeByte(var5 % var6); - var42.packetBuffer.offset = var7; - packetWriter.addNode(var42); + if (-1L != field610) { + var10 = var9 - lastMouseRecordX; + var11 = var8 - lastMouseRecordY; + var12 = (int)((Message.mouseRecorder.millis[var7] - field610) / 20L); + var5 = (int)((long)var5 + (Message.mouseRecorder.millis[var7] - field610) % 20L); + } else { + var10 = var9; + var11 = var8; + var12 = Integer.MAX_VALUE; } - if (var4 >= class233.mouseRecorder.index) { - class233.mouseRecorder.index = 0; + lastMouseRecordX = var9; + lastMouseRecordY = var8; + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { + var10 += 32; + var11 += 32; + var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { + var10 += 128; + var11 += 128; + var15.packetBuffer.writeByte(var12 + 128); + var15.packetBuffer.writeShort(var11 + (var10 << 8)); + } else if (var12 < 32) { + var15.packetBuffer.writeByte(var12 + 192); + if (var9 != -1 && var8 != -1) { + var15.packetBuffer.writeInt(var9 | var8 << 16); + } else { + var15.packetBuffer.writeInt(Integer.MIN_VALUE); + } } else { - MouseRecorder var58 = class233.mouseRecorder; - var58.index -= var4; - System.arraycopy(class233.mouseRecorder.xs, var4, class233.mouseRecorder.xs, 0, class233.mouseRecorder.index); - System.arraycopy(class233.mouseRecorder.ys, var4, class233.mouseRecorder.ys, 0, class233.mouseRecorder.index); - System.arraycopy(class233.mouseRecorder.millis, var4, class233.mouseRecorder.millis, 0, class233.mouseRecorder.index); + var15.packetBuffer.writeShort((var12 & 8191) + 57344); + if (var9 != -1 && var8 != -1) { + var15.packetBuffer.writeInt(var9 | var8 << 16); + } else { + var15.packetBuffer.writeInt(Integer.MIN_VALUE); + } } + + ++var6; + field610 = Message.mouseRecorder.millis[var7]; } } - PacketBufferNode var24; - if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - long var22 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; - if (var22 > 32767L) { - var22 = 32767L; - } + if (var15 != null) { + var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var3); + var7 = var15.packetBuffer.offset; + var15.packetBuffer.offset = var3; + var15.packetBuffer.writeByte(var5 / var6); + var15.packetBuffer.writeByte(var5 % var6); + var15.packetBuffer.offset = var7; + packetWriter.addNode(var15); + } - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; - var3 = MouseHandler.MouseHandler_lastPressedY; - if (var3 < 0) { - var3 = 0; - } else if (var3 > class491.canvasHeight) { - var3 = class491.canvasHeight; - } + if (var4 >= Message.mouseRecorder.index) { + Message.mouseRecorder.index = 0; + } else { + MouseRecorder var52 = Message.mouseRecorder; + var52.index -= var4; + System.arraycopy(Message.mouseRecorder.xs, var4, Message.mouseRecorder.xs, 0, Message.mouseRecorder.index); + System.arraycopy(Message.mouseRecorder.ys, var4, Message.mouseRecorder.ys, 0, Message.mouseRecorder.index); + System.arraycopy(Message.mouseRecorder.millis, var4, Message.mouseRecorder.millis, 0, Message.mouseRecorder.index); + } + } + } - var4 = MouseHandler.MouseHandler_lastPressedX; - if (var4 < 0) { - var4 = 0; - } else if (var4 > class340.canvasWidth) { - var4 = class340.canvasWidth; - } + if (MouseHandler.MouseHandler_lastButton == 1 || !class19.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; + if (var16 > 32767L) { + var16 = 32767L; + } - var5 = (int)var22; - if(shouldProcessClick()) { - var24 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_MOUSE_CLICK, packetWriter.isaacCipher); - var24.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); - var24.packetBuffer.writeShort(var4); - var24.packetBuffer.writeShort(var3); - packetWriter.addNode(var24); - } + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; + var3 = MouseHandler.MouseHandler_lastPressedY; + if (var3 < 0) { + var3 = 0; + } else if (var3 > class47.canvasHeight) { + var3 = class47.canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; + if (var4 < 0) { + var4 = 0; + } else if (var4 > Language.canvasWidth) { + var4 = Language.canvasWidth; + } + + var5 = (int)var16; + if(shouldProcessClick()) { + PacketBufferNode var18 = class113.getPacketBufferNode(ClientPacket.CLICK, packetWriter.isaacCipher); + var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); + var18.packetBuffer.writeShort(var4); + var18.packetBuffer.writeShort(var3); + packetWriter.addNode(var18); + } + } + + if (mouseWheelRotation != 0) { + var14 = class113.getPacketBufferNode(ClientPacket.MIDDLE_MOUSE, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(mouseWheelRotation); + packetWriter.addNode(var14); + } + + if (keyHandlerInstance.pressedKeysCount > 0) { + var14 = class113.getPacketBufferNode(ClientPacket.IF_BUTTONT, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(0); + var2 = var14.packetBuffer.offset; + long var19 = SpotAnimationDefinition.method962(); + + for (var5 = 0; var5 < keyHandlerInstance.pressedKeysCount; ++var5) { + long var21 = var19 - timeOfPreviousKeyPress; + if (var21 > 16777215L) { + var21 = 16777215L; } - if (mouseWheelRotation != 0) { - var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.f17, packetWriter.isaacCipher); - var20.packetBuffer.writeShort(mouseWheelRotation); - packetWriter.addNode(var20); + timeOfPreviousKeyPress = var19; + var14.packetBuffer.method2605((int)var21); + var14.packetBuffer.writeByteNeg(keyHandlerInstance.field1900[var5]); + } + + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); + packetWriter.addNode(var14); + } + + if (packetIndicator > 0) { + --packetIndicator; + } + + if (keyHandlerInstance.getKeyPressed(96) || keyHandlerInstance.getKeyPressed(97) || keyHandlerInstance.getKeyPressed(98) || keyHandlerInstance.getKeyPressed(99)) { + emitPackets = true; + } + + if (emitPackets && packetIndicator <= 0) { + packetIndicator = 20; + emitPackets = false; + var14 = class113.getPacketBufferNode(ClientPacket.EVENT_CAMERA_FOCUS, packetWriter.isaacCipher); + var14.packetBuffer.writeShortAdd(camAngleX); + var14.packetBuffer.writeShortAdd(camAngleY); + packetWriter.addNode(var14); + } + + if (class357.hasFocus && !hadFocus) { + hadFocus = true; + var14 = class113.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(1); + packetWriter.addNode(var14); + } + + if (!class357.hasFocus && hadFocus) { + hadFocus = false; + var14 = class113.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + packetWriter.addNode(var14); + } + + if (NewShit.worldMap != null) { + NewShit.worldMap.method2398(); + } + + if (class344.ClanChat_inClanChat) { + if (class20.friendsChat != null) { + class20.friendsChat.sort(); + } + + for (var1 = 0; var1 < Players.Players_count; ++var1) { + Player var35 = players[Players.Players_indices[var1]]; + var35.clearIsInFriendsChat(); + } + + class344.ClanChat_inClanChat = false; + } + + class153.method794(); + class435.method2201(); + if (gameState == 30) { + for (PendingSpawn var34 = (PendingSpawn)pendingSpawns.last(); var34 != null; var34 = (PendingSpawn)pendingSpawns.previous()) { + if (var34.endCycle > 0) { + --var34.endCycle; } - if (keyHandlerInstance.pressedKeysCount > 0) { - var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_KEYBOARD, packetWriter.isaacCipher); - var20.packetBuffer.writeShort(0); - var21 = var20.packetBuffer.offset; - long var25 = GrandExchangeOfferTotalQuantityComparator.method1971(); + if (var34.endCycle == 0) { + if (var34.objectId >= 0) { + var3 = var34.objectId; + var4 = var34.field951; + ObjectComposition var23 = WorldMapSection2.getObjectDefinition(var3); + if (var4 == 11) { + var4 = 10; + } - for (var5 = 0; var5 < keyHandlerInstance.pressedKeysCount; ++var5) { - long var27 = var25 - timeOfPreviousKeyPress; - if (var27 > 16777215L) { - var27 = 16777215L; + if (var4 >= 5 && var4 <= 8) { + var4 = 4; } - timeOfPreviousKeyPress = var25; - var20.packetBuffer.writeByte(keyHandlerInstance.field1902[var5]); - var20.packetBuffer.writeMediumLE((int)var27); + boolean var30 = var23.method1003(var4); + if (!var30) { + continue; + } } - var20.packetBuffer.writeLengthShort(var20.packetBuffer.offset - var21); - packetWriter.addNode(var20); - } + WorldMapAreaData.addPendingSpawnToScene(var34.plane, var34.type, var34.x, var34.y, var34.objectId, var34.field961, var34.field951, var34.field957); + var34.remove(); + } else { + if (var34.startCycle > 0) { + --var34.startCycle; + } - if (packetIndicator > 0) { - --packetIndicator; + if (var34.startCycle == 0 && var34.x >= 1 && var34.y >= 1 && var34.x <= 102 && var34.y <= 102 && (var34.id < 0 || class141.method755(var34.id, var34.objectType))) { + WorldMapAreaData.addPendingSpawnToScene(var34.plane, var34.type, var34.x, var34.y, var34.id, var34.rotation, var34.objectType, var34.field957); + var34.startCycle = -1; + if (var34.id == var34.objectId && var34.objectId == -1) { + var34.remove(); + } else if (var34.id == var34.objectId && var34.field961 == var34.rotation && var34.objectType == var34.field951) { + var34.remove(); + } + } } + } - if (keyHandlerInstance.getKeyPressed(96) || keyHandlerInstance.getKeyPressed(97) || keyHandlerInstance.getKeyPressed(98) || keyHandlerInstance.getKeyPressed(99)) { - emitPackets = true; - } + int var10002; + for (var1 = 0; var1 < soundEffectCount; ++var1) { + var10002 = queuedSoundEffectDelays[var1]--; + if (queuedSoundEffectDelays[var1] >= -10) { + SoundEffect var37 = soundEffects[var1]; + if (var37 == null) { + var10000 = null; + var37 = SoundEffect.readSoundEffect(Language.field3643, soundEffectIds[var1], 0); + if (var37 == null) { + continue; + } - if (emitPackets && packetIndicator <= 0) { - packetIndicator = 20; - emitPackets = false; - var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_CAMERA_FOCUS, packetWriter.isaacCipher); - var20.packetBuffer.writeShortLE(camAngleY); - var20.packetBuffer.writeShortAddLE(camAngleX); - packetWriter.addNode(var20); - } + int[] var53 = queuedSoundEffectDelays; + var53[var1] += var37.calculateDelay(); + soundEffects[var1] = var37; + } - if (KeyHandler.hasFocus && !hadFocus) { - hadFocus = true; - var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); - var20.packetBuffer.writeByte(1); - packetWriter.addNode(var20); - } + if (queuedSoundEffectDelays[var1] < 0) { + if (soundLocations[var1] != 0) { + var4 = (soundLocations[var1] & 255) * 128; + var5 = soundLocations[var1] >> 16 & 255; + var6 = var5 * 128 + 64 - class229.localPlayer.x; + if (var6 < 0) { + var6 = -var6; + } - if (!KeyHandler.hasFocus && hadFocus) { - hadFocus = false; - var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_APPLET_FOCUS, packetWriter.isaacCipher); - var20.packetBuffer.writeByte(0); - packetWriter.addNode(var20); - } + var7 = soundLocations[var1] >> 8 & 255; + var8 = var7 * 128 + 64 - class229.localPlayer.y; + if (var8 < 0) { + var8 = -var8; + } - if (class434.worldMap != null) { - class434.worldMap.method2422(); - } + var9 = var8 + var6 - 128; + if (var9 > var4) { + queuedSoundEffectDelays[var1] = -100; + continue; + } + + if (var9 < 0) { + var9 = 0; + } + + var3 = (var4 - var9) * WorldMapIcon_1.clientPreferences.getAreaSoundEffectsVolume() / var4; + } else { + var3 = WorldMapIcon_1.clientPreferences.getCurrentSoundEffectsVolume(); + } - class143.method759(); - if (PcmPlayer.field180) { - for (var1 = 0; var1 < Players.Players_count; ++var1) { - Player var43 = players[Players.Players_indices[var1]]; - var43.clearIsInClanChat(); + if (var3 > 0) { + RawSound var24 = var37.toRawSound().resample(class521.decimator); + RawPcmStream var44 = RawPcmStream.createRawPcmStream(var24, 100, var3); + var44.setNumLoops(queuedSoundEffectLoops[var1] - 1); + LoginScreenAnimation.pcmStreamMixer.addSubStream(var44); + } + + queuedSoundEffectDelays[var1] = -100; + } + } else { + --soundEffectCount; + + for (var2 = var1; var2 < soundEffectCount; ++var2) { + soundEffectIds[var2] = soundEffectIds[var2 + 1]; + soundEffects[var2] = soundEffects[var2 + 1]; + queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; + queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; + soundLocations[var2] = soundLocations[var2 + 1]; } - PcmPlayer.field180 = false; + --var1; } + } - if (field539 != class87.Client_plane) { - field539 = class87.Client_plane; - class87.method463(class87.Client_plane); + if (playingJingle && !BuddyRankComparator.method687()) { + if (WorldMapIcon_1.clientPreferences.getCurrentMusicVolume() != 0) { + boolean var31 = !class316.field2787.isEmpty(); + if (var31) { + class72.method433(class514.archive6, WorldMapIcon_1.clientPreferences.getCurrentMusicVolume()); + } } - if (gameState != 30) { - return; - } + playingJingle = false; + } - UserComparator8.method669(); - class73.method423(); - ++packetWriter.field1152; - if (packetWriter.field1152 > 750) { - class148.method781(); - return; - } + ++packetWriter.field1164; + if (packetWriter.field1164 > 750) { + class9.method29(); + } else { + var1 = Players.Players_count; + int[] var39 = Players.Players_indices; - class139.method745(); + for (var3 = 0; var3 < var1; ++var3) { + Player var46 = players[var39[var3]]; + if (var46 != null) { + MoveSpeed.updateActorSequence(var46, 1); + } + } for (var1 = 0; var1 < npcCount; ++var1) { - var21 = npcIndices[var1]; - NPC var29 = npcs[var21]; - if (var29 != null) { - class6.updateActorSequence(var29, var29.definition.size); + var2 = npcIndices[var1]; + NPC var25 = npcs[var2]; + if (var25 != null) { + MoveSpeed.updateActorSequence(var25, var25.definition.size); } } - int[] var49 = Players.Players_indices; + int[] var36 = Players.Players_indices; - for (var21 = 0; var21 < Players.Players_count; ++var21) { - Player var52 = players[var49[var21]]; - if (var52 != null && var52.overheadTextCyclesRemaining > 0) { - --var52.overheadTextCyclesRemaining; - if (var52.overheadTextCyclesRemaining == 0) { - var52.overheadText = null; + for (var2 = 0; var2 < Players.Players_count; ++var2) { + Player var50 = players[var36[var2]]; + if (var50 != null && var50.overheadTextCyclesRemaining > 0) { + --var50.overheadTextCyclesRemaining; + if (var50.overheadTextCyclesRemaining == 0) { + var50.overheadText = null; } } } - for (var21 = 0; var21 < npcCount; ++var21) { - var3 = npcIndices[var21]; - NPC var30 = npcs[var3]; - if (var30 != null && var30.overheadTextCyclesRemaining > 0) { - --var30.overheadTextCyclesRemaining; - if (var30.overheadTextCyclesRemaining == 0) { - var30.overheadText = null; + for (var2 = 0; var2 < npcCount; ++var2) { + var3 = npcIndices[var2]; + NPC var47 = npcs[var3]; + if (var47 != null && var47.overheadTextCyclesRemaining > 0) { + --var47.overheadTextCyclesRemaining; + if (var47.overheadTextCyclesRemaining == 0) { + var47.overheadText = null; } } } @@ -2777,477 +2922,265 @@ final void doCycleLoggedIn() { } } - Widget var50 = class64.mousedOverWidgetIf1; - Widget var44 = GrandExchangeOfferNameComparator.field3615; - class64.mousedOverWidgetIf1 = null; - GrandExchangeOfferNameComparator.field3615 = null; + Widget var38 = Interpreter.mousedOverWidgetIf1; + Widget var41 = SwapSongTask.field3744; + Interpreter.mousedOverWidgetIf1 = null; + SwapSongTask.field3744 = null; draggedOnWidget = null; - field394 = false; + field397 = false; field396 = false; - field533 = 0; - - while (keyHandlerInstance.method1148() && field533 < 128) { - if (staffModLevel >= 2 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.field1901 == 66) { - String var53 = RouteStrategy.method1170(); - class159.client.method141(var53); - } else if (oculusOrbState != 1 || keyHandlerInstance.field1899 <= 0) { - field577[field533] = keyHandlerInstance.field1901; - field578[field533] = keyHandlerInstance.field1899; - ++field533; + field530 = 0; + + while (keyHandlerInstance.method1128() && field530 < 128) { + if (staffModLevel >= 2 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.field1899 == 66) { + String var51 = class250.method1332(); + SpriteMask.client.method150(var51); + } else if (oculusOrbState != 1 || keyHandlerInstance.field1897 <= 0) { + field577[field530] = keyHandlerInstance.field1899; + field579[field530] = keyHandlerInstance.field1897; + ++field530; } } - boolean var45 = staffModLevel >= 2; - PacketBufferNode var31; - if (var45 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.getKeyPressed(81) && mouseWheelRotation != 0) { - var4 = TextureProvider.localPlayer.plane - mouseWheelRotation; + boolean var32 = staffModLevel >= 2; + PacketBufferNode var26; + if (var32 && keyHandlerInstance.getKeyPressed(82) && keyHandlerInstance.getKeyPressed(81) && mouseWheelRotation != 0) { + var4 = class229.localPlayer.plane - mouseWheelRotation; if (var4 < 0) { var4 = 0; } else if (var4 > 3) { var4 = 3; } - if (var4 != TextureProvider.localPlayer.plane) { - var5 = TextureProvider.localPlayer.pathX[0] + class20.baseX; - var6 = TextureProvider.localPlayer.pathY[0] + class19.baseY; - var31 = ClanChannelMember.getPacketBufferNode(ClientPacket.f20, packetWriter.isaacCipher); - var31.packetBuffer.writeShortAddLE(var5); - var31.packetBuffer.writeShortLE(var6); - var31.packetBuffer.writeInt(0); - var31.packetBuffer.writeByteAdd(var4); - packetWriter.addNode(var31); + if (var4 != class229.localPlayer.plane) { + var5 = class229.localPlayer.pathX[0] + NewShit.baseX; + var6 = class229.localPlayer.pathY[0] + class101.baseY; + var26 = class113.getPacketBufferNode(ClientPacket.f20, packetWriter.isaacCipher); + var26.packetBuffer.writeInt(0); + var26.packetBuffer.writeIntME(var5); + var26.packetBuffer.writeIntME(var6); + var26.packetBuffer.writeByte(var4); + packetWriter.addNode(var26); } mouseWheelRotation = 0; } - if (MouseHandler.MouseHandler_lastButton == 1) { - field422.method1134(); - } - if (rootInterface != -1) { - class511.updateRootInterface(rootInterface, 0, 0, class340.canvasWidth, class491.canvasHeight, 0, 0); + class406.updateRootInterface(rootInterface, 0, 0, Language.canvasWidth, class47.canvasHeight, 0, 0); } ++cycleCntr; while (true) { - Widget var32; - Widget var51; - ScriptEvent var54; + Widget var40; + Widget var45; + ScriptEvent var49; do { - var54 = (ScriptEvent)field628.removeLast(); - if (var54 == null) { + var49 = (ScriptEvent)field627.removeLast(); + if (var49 == null) { while (true) { do { - var54 = (ScriptEvent)field629.removeLast(); - if (var54 == null) { + var49 = (ScriptEvent)field628.removeLast(); + if (var49 == null) { while (true) { do { - var54 = (ScriptEvent)scriptEvents.removeLast(); - if (var54 == null) { + var49 = (ScriptEvent)scriptEvents.removeLast(); + if (var49 == null) { + boolean var33 = false; + while (true) { - while (true) { - class225 var55; - do { - do { - do { - var55 = (class225)field626.removeLast(); - if (var55 == null) { - this.menu(); - class30.method124(); - if (clickedWidget != null) { - this.method384(); - } + class222 var48 = (class222)field625.removeLast(); + if (var48 == null) { + if (!var33 && MouseHandler.MouseHandler_lastButton == 1) { + field422.method1114(); + } - if (Scene.shouldSendWalk()) { - var4 = Scene.Scene_selectedX; - var5 = Scene.Scene_selectedY; - var24 = ClanChannelMember.getPacketBufferNode(ClientPacket.MOVE_GAMECLICK, packetWriter.isaacCipher); - var24.packetBuffer.writeByte(5); - var24.packetBuffer.writeShortAdd(var5 + class19.baseY); - var24.packetBuffer.writeByte(keyHandlerInstance.getKeyPressed(82) ? (keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); - var24.packetBuffer.writeShortAdd(var4 + class20.baseX); - packetWriter.addNode(var24); - Scene.method1319(); - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; - mouseCrossColor = 1; - mouseCrossState = 0; - destinationX = var4; - destinationY = var5; - } + this.menu(); + class127.method692(); + if (clickedWidget != null) { + this.method391(); + } - if (var50 != class64.mousedOverWidgetIf1) { - if (var50 != null) { - ClanChannelMember.invalidateWidget(var50); - } + if (Scene.shouldSendWalk()) { + var5 = Scene.Scene_selectedX; + var6 = Scene.Scene_selectedY; + var26 = class113.getPacketBufferNode(ClientPacket.MOVE_GAMECLICK, packetWriter.isaacCipher); + var26.packetBuffer.writeByte(5); + var26.packetBuffer.writeShort(var5 + NewShit.baseX); + var26.packetBuffer.writeShortAdd(var6 + class101.baseY); + var26.packetBuffer.writeByteSub(keyHandlerInstance.getKeyPressed(82) ? (keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); + packetWriter.addNode(var26); + Scene.method1499(); + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; + mouseCrossColor = 1; + mouseCrossState = 0; + destinationX = var5; + destinationY = var6; + } - if (class64.mousedOverWidgetIf1 != null) { - ClanChannelMember.invalidateWidget(class64.mousedOverWidgetIf1); - } - } + if (var38 != Interpreter.mousedOverWidgetIf1) { + if (var38 != null) { + class159.invalidateWidget(var38); + } - if (var44 != GrandExchangeOfferNameComparator.field3615 && field498 == field499) { - if (var44 != null) { - ClanChannelMember.invalidateWidget(var44); - } + if (Interpreter.mousedOverWidgetIf1 != null) { + class159.invalidateWidget(Interpreter.mousedOverWidgetIf1); + } - if (GrandExchangeOfferNameComparator.field3615 != null) { - ClanChannelMember.invalidateWidget(GrandExchangeOfferNameComparator.field3615); - } - } + } - if (GrandExchangeOfferNameComparator.field3615 != null) { - if (field498 < field499) { - ++field498; - if (field498 == field499) { - ClanChannelMember.invalidateWidget(GrandExchangeOfferNameComparator.field3615); - } - } - } else if (field498 > 0) { - --field498; - } + if (var41 != SwapSongTask.field3744 && field493 == field492) { + if (var41 != null) { + class159.invalidateWidget(var41); + } - if (oculusOrbState == 0) { - var4 = TextureProvider.localPlayer.x; - var5 = TextureProvider.localPlayer.y; - if (ChatChannel.oculusOrbFocalPointX - var4 < -500 || ChatChannel.oculusOrbFocalPointX - var4 > 500 || AbstractWorldMapData.oculusOrbFocalPointY - var5 < -500 || AbstractWorldMapData.oculusOrbFocalPointY - var5 > 500) { - ChatChannel.oculusOrbFocalPointX = var4; - AbstractWorldMapData.oculusOrbFocalPointY = var5; - } - - if (var4 != ChatChannel.oculusOrbFocalPointX) { - ChatChannel.oculusOrbFocalPointX += (var4 - ChatChannel.oculusOrbFocalPointX) / 16; - } - - if (var5 != AbstractWorldMapData.oculusOrbFocalPointY) { - AbstractWorldMapData.oculusOrbFocalPointY += (var5 - AbstractWorldMapData.oculusOrbFocalPointY) / 16; - } - - var6 = ChatChannel.oculusOrbFocalPointX >> 7; - var7 = AbstractWorldMapData.oculusOrbFocalPointY >> 7; - var8 = class115.getTileHeight(ChatChannel.oculusOrbFocalPointX, AbstractWorldMapData.oculusOrbFocalPointY, class87.Client_plane); - var9 = 0; - if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { - for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { - for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { - var12 = class87.Client_plane; - if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { - ++var12; - } - - int var34 = var8 - Tiles.Tiles_heights[var12][var10][var11]; - if (var34 > var9) { - var9 = var34; - } - } - } - } - - var10 = var9 * 192; - if (var10 > 98048) { - var10 = 98048; - } - - if (var10 < 32768) { - var10 = 32768; - } - - if (var10 > field476) { - field476 += (var10 - field476) / 24; - } else if (var10 < field476) { - field476 += (var10 - field476) / 80; - } - - class433.field3789 = class115.getTileHeight(TextureProvider.localPlayer.x, TextureProvider.localPlayer.y, class87.Client_plane) - camFollowHeight; - } else if (oculusOrbState == 1) { - if (oculusOrbOnLocalPlayer && TextureProvider.localPlayer != null) { - var4 = TextureProvider.localPlayer.pathX[0]; - var5 = TextureProvider.localPlayer.pathY[0]; - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - ChatChannel.oculusOrbFocalPointX = TextureProvider.localPlayer.x; - var6 = class115.getTileHeight(TextureProvider.localPlayer.x, TextureProvider.localPlayer.y, class87.Client_plane) - camFollowHeight; - if (var6 < class433.field3789) { - class433.field3789 = var6; - } - - AbstractWorldMapData.oculusOrbFocalPointY = TextureProvider.localPlayer.y; - oculusOrbOnLocalPlayer = false; - } - } - - short var47 = -1; - if (keyHandlerInstance.getKeyPressed(33)) { - var47 = 0; - } else if (keyHandlerInstance.getKeyPressed(49)) { - var47 = 1024; - } - - if (keyHandlerInstance.getKeyPressed(48)) { - if (var47 == 0) { - var47 = 1792; - } else if (var47 == 1024) { - var47 = 1280; - } else { - var47 = 1536; - } - } else if (keyHandlerInstance.getKeyPressed(50)) { - if (var47 == 0) { - var47 = 256; - } else if (var47 == 1024) { - var47 = 768; - } else { - var47 = 512; - } - } - - byte var48 = 0; - if (keyHandlerInstance.getKeyPressed(35)) { - var48 = -1; - } else if (keyHandlerInstance.getKeyPressed(51)) { - var48 = 1; - } - - var6 = 0; - if (var47 >= 0 || var48 != 0) { - var6 = keyHandlerInstance.getKeyPressed(81) ? oculusOrbSlowedSpeed * -872637063 * -4178743 : oculusOrbNormalSpeed * -199987921 * -2029520433; - var6 *= 16; - field466 = var47; - field477 = var48; - } - - if (field478 < var6) { - field478 += var6 / 8; - if (field478 > var6) { - field478 = var6; - } - } else if (field478 > var6) { - field478 = field478 * 9 / 10; - } - - if (field478 > 0) { - var7 = field478 / 16; - if (field466 >= 0) { - var4 = field466 - WallDecoration.cameraYaw & 2047; - var8 = Rasterizer3D.Rasterizer3D_sine[var4]; - var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; - ChatChannel.oculusOrbFocalPointX += var7 * var8 / 65536; - AbstractWorldMapData.oculusOrbFocalPointY += var9 * var7 / 65536; - } - - if (field477 != 0) { - class433.field3789 += var7 * field477; - if (class433.field3789 > 0) { - class433.field3789 = 0; - } - } - } else { - field466 = -1; - field477 = -1; - } - - if (keyHandlerInstance.getKeyPressed(13)) { - class425.method2178(); - } - } + if (SwapSongTask.field3744 != null) { + class159.invalidateWidget(SwapSongTask.field3744); + } + } - if (MouseHandler.MouseHandler_currentButton == 4 && UserComparator8.mouseCam) { - var4 = MouseHandler.MouseHandler_y - field470; - camAngleDX = var4 * 2; - field470 = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_y + field470) / 2 : MouseHandler.MouseHandler_y * 397181729 * -167198495; - var5 = field467 - MouseHandler.MouseHandler_x; - camAngleDY = var5 * 2; - field467 = var5 != -1 && var5 != 1 ? (field467 + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -963425685 * 44569155; - } else { - if (keyHandlerInstance.getKeyPressed(96)) { - camAngleDY += (-24 - camAngleDY) / 2; - } else if (keyHandlerInstance.getKeyPressed(97)) { - camAngleDY += (24 - camAngleDY) / 2; - } else { - camAngleDY /= 2; - } - - if (keyHandlerInstance.getKeyPressed(98)) { - camAngleDX += (12 - camAngleDX) / 2; - } else if (keyHandlerInstance.getKeyPressed(99)) { - camAngleDX += (-12 - camAngleDX) / 2; - } else { - camAngleDX /= 2; - } - - field470 = MouseHandler.MouseHandler_y; - field467 = MouseHandler.MouseHandler_x; - } + if (SwapSongTask.field3744 != null) { + if (field493 < field492) { + ++field493; + if (field492 == field493) { + class159.invalidateWidget(SwapSongTask.field3744); + } + } + } else if (field493 > 0) { + --field493; + } - camAngleY = camAngleDY / 2 + camAngleY & 2047; - camAngleX += camAngleDX / 2; - if (camAngleX < 128) { - camAngleX = 128; - } + class336.method1740(); + if (field400) { + TextureProvider.method1529(); + } else if (isCameraLocked) { + if (!field402) { + var5 = ScriptFrame.cameraLookAtX * 128 + 64; + var6 = class216.cameraLookAtY * 128 + 64; + var7 = WorldMapDecorationType.getTileHeight(var5, var6, ItemLayer.Client_plane) - class127.cameraLookAtHeight; + class314.method1649(var5, var7, var6); + } else if (field644 != null) { + ViewportMouse.cameraX = field644.vmethod2386(); + class36.cameraZ = field644.vmethod2387(); + if (field403) { + SecureRandomFuture.cameraY = field644.vmethod2320(); + } else { + SecureRandomFuture.cameraY = WorldMapDecorationType.getTileHeight(ViewportMouse.cameraX, class36.cameraZ, ItemLayer.Client_plane) - field644.vmethod2320(); + } - if (camAngleX > 383) { - camAngleX = 383; - } + field644.method2389(); + } - if (field400) { - WorldMapSectionType.method1555(AbstractUserComparator.field3834, TriBool.field3849, JagexCache.field1450); - Projectile.method438(class14.field36, GrandExchangeOfferOwnWorldComparator.field360); - if (AbstractUserComparator.field3834 == cameraX && class17.cameraY == TriBool.field3849 && JagexCache.field1450 == WorldMapArea.cameraZ && class14.field36 == class365.cameraPitch && WallDecoration.cameraYaw == GrandExchangeOfferOwnWorldComparator.field360) { - field400 = false; - isCameraLocked = false; - field402 = false; - field401 = false; - class148.cameraLookAtX = 0; - BufferedNetSocket.cameraLookAtY = 0; - class161.cameraLookAtHeight = 0; - class232.cameraLookAtSpeed = 0; - class465.cameraLookAtAcceleration = 0; - class131.cameraMoveToAcceleration = 0; - SecureRandomCallable.cameraMoveToSpeed = 0; - class191.cameraMoveToX = 0; - MouseHandler.cameraMoveToY = 0; - SoundSystem.cameraMoveToHeight = 0; - field646 = null; - field642 = null; - field643 = null; - } - } else if (isCameraLocked) { - PcmPlayer.method221(); - } + if (!field404) { + var5 = Messages.field1154 * 128 + 64; + var6 = AbstractWorldMapData.field2045 * 128 + 64; + var7 = WorldMapDecorationType.getTileHeight(var5, var6, ItemLayer.Client_plane) - class302.field2510; + var8 = var5 - ViewportMouse.cameraX; + var9 = var7 - SecureRandomFuture.cameraY; + var10 = var6 - class36.cameraZ; + var11 = (int)Math.sqrt((double)(var10 * var10 + var8 * var8)); + var12 = (int)(Math.atan2((double)var9, (double)var11) * 325.9490051269531D) & 2047; + int var27 = (int)(Math.atan2((double)var8, (double)var10) * -325.9490051269531D) & 2047; + class303.method1628(var12, var27); + } else { + if (field642 != null) { + Varcs.cameraPitch = field642.method2385(); + Varcs.cameraPitch = Math.min(Math.max(Varcs.cameraPitch, 128), 383); + field642.method2389(); + } - for (var4 = 0; var4 < 5; ++var4) { - int var10002 = cameraShakeCycle[var4]++; - } + if (field643 != null) { + class192.cameraYaw = field643.method2385() & 2047; + field643.method2389(); + } + } + } - class33.varcs.tryWrite(); - var4 = ++MouseHandler.MouseHandler_idleCycles - 1; - var6 = BuddyRankComparator.method688(); - if (var4 > 15000 && var6 > 15000) { - logoutTimer = 250; - class138.method733(14500); - var31 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_MOUSE_IDLE, packetWriter.isaacCipher); - packetWriter.addNode(var31); - } + for (var5 = 0; var5 < 5; ++var5) { + var10002 = field589[var5]++; + } - InvDefinition.friendSystem.processFriendUpdates(); - - for (var7 = 0; var7 < field608.size(); ++var7) { - var9 = (Integer)field608.get(var7); - class139 var35 = (class139)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var9); - class139 var36; - if (var35 != null) { - var36 = var35; - } else { - AbstractArchive var13 = SequenceDefinition.SequenceDefinition_animationsArchive; - AbstractArchive var14 = SequenceDefinition.SequenceDefinition_skeletonsArchive; - boolean var15 = true; - byte[] var16 = var13.getFile(var9 >> 16 & 65535, var9 & 65535); - class139 var37; - if (var16 == null) { - var15 = false; - var37 = null; - } else { - int var17 = (var16[1] & 255) << 8 | var16[2] & 255; - byte[] var18 = var14.getFile(var17, 0); - if (var18 == null) { - var15 = false; - } - - if (!var15) { - var37 = null; - } else { - if (SoundCache.field214 == null) { - MusicPatchPcmStream.field2855 = Runtime.getRuntime().availableProcessors(); - SoundCache.field214 = new ThreadPoolExecutor(0, MusicPatchPcmStream.field2855, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(MusicPatchPcmStream.field2855 * 100 + 100), new class64(this)); - } - - try { - var37 = new class139(var13, var14, var9, false); - } catch (Exception var39) { - var37 = null; - } - } - } - - if (var37 != null) { - SequenceDefinition.SequenceDefinition_cachedModel.put(var37, (long)var9); - } - - var36 = var37; - } - - if (var36 == null) { - var8 = 2; - } else { - var8 = var36.method738() ? 0 : 1; - } - - if (var8 != 2) { - field608.remove(var7); - --var7; - } - } + class176.varcs.tryWrite(); + var5 = InterfaceParent.method463(); + var6 = class181.method919(); + if (var5 > 15000 && var6 > 15000) { + logoutTimer = 250; + WorldMapEvent.method1382(14500); + var26 = class113.getPacketBufferNode(ClientPacket.field2515, packetWriter.isaacCipher); + packetWriter.addNode(var26); + } - ++packetWriter.pendingWrites; - if (packetWriter.pendingWrites > 50) { - var31 = ClanChannelMember.getPacketBufferNode(ClientPacket.NO_TIMEOUT, packetWriter.isaacCipher); - packetWriter.addNode(var31); - } + class12.friendSystem.processFriendUpdates(); - try { - packetWriter.flush(); - } catch (IOException var38) { - class148.method781(); - } + for (var7 = 0; var7 < field607.size(); ++var7) { + if (MouseRecorder.method469((Integer)field607.get(var7)) != 2) { + field607.remove(var7); + --var7; + } + } - return; - } - } while(var55 == null); - } while(var55.field1888 == null); + ++packetWriter.pendingWrites; + if (packetWriter.pendingWrites > 50) { + var26 = class113.getPacketBufferNode(ClientPacket.NO_TIMEOUT, packetWriter.isaacCipher); + packetWriter.addNode(var26); + } - if (var55.field1888.childIndex < 0) { - break; - } + try { + packetWriter.flush(); + } catch (IOException var28) { + class9.method29(); + } + + return; + } - var32 = class33.widgetDefinition.method1740(var55.field1888.parentId); - } while(var32 == null || var32.children == null || var32.children.length == 0 || var55.field1888.childIndex >= var32.children.length || var55.field1888 != var32.children[var55.field1888.childIndex]); + if (var48.field1884.type == 12) { + var33 = true; + } + + if (var48 != null && var48.field1884 != null) { + if (var48.field1884.childIndex >= 0) { + var40 = HealthBarDefinition.widgetDefinition.method1733(var48.field1884.parentId); + if (var40 == null || var40.children == null || var40.children.length == 0 || var48.field1884.childIndex >= var40.children.length || var48.field1884 != var40.children[var48.field1884.childIndex]) { + continue; + } + } - if (var55.field1888.type == 11 && var55.field1886 == 0) { - if (var55.field1888.method1866(var55.field1885, var55.field1887, 0, 0)) { - switch(var55.field1888.method1870()) { + if (var48.field1884.type == 11 && var48.field1881 == 0) { + if (var48.field1884.method1860(var48.field1883, var48.field1882, 0, 0)) { + switch(var48.field1884.method1864()) { case 0: - VertexNormal.openURL(var55.field1888.method1872(), true, false); + HealthBar.openURL(var48.field1884.method1866(), true, false); break; case 1: - var6 = MouseRecorder.getWidgetFlags(var55.field1888); - boolean var46 = (var6 >> 22 & 1) != 0; - if (var46) { - int[] var56 = var55.field1888.method1873(); - if (var56 != null) { - PacketBufferNode var33 = ClanChannelMember.getPacketBufferNode(ClientPacket.f11, packetWriter.isaacCipher); - var33.packetBuffer.writeShortLE(var55.field1888.childIndex); - var33.packetBuffer.writeInt(var55.field1888.method1871()); - var33.packetBuffer.writeIntLE(var55.field1888.id); - var33.packetBuffer.writeIntIME(var56[1]); - var33.packetBuffer.writeIntME(var56[0]); - var33.packetBuffer.writeIntME(var56[2]); - packetWriter.addNode(var33); + if (ClanChannel.method853(class361.getWidgetFlags(var48.field1884))) { + int[] var43 = var48.field1884.method1867(); + if (var43 != null) { + var26 = class113.getPacketBufferNode(ClientPacket.f97, packetWriter.isaacCipher); + var26.packetBuffer.writeIntIME(var43[1]); + var26.packetBuffer.writeInt(var43[0]); + var26.packetBuffer.writeShortLE(var48.field1884.childIndex); + var26.packetBuffer.writeInt(var43[2]); + var26.packetBuffer.writeIntIME(var48.field1884.id); + var26.packetBuffer.writeIntLE(var48.field1884.method1865()); + packetWriter.addNode(var26); } } } } - } else if (var55.field1888.type == 12) { - class344 var57 = var55.field1888.method1877(); - if (var57 != null && var57.method1815()) { - switch(var55.field1886) { + } else if (var48.field1884.type == 12) { + class341 var42 = var48.field1884.method1871(); + if (var42 != null && var42.method1811()) { + switch(var48.field1881) { case 0: - field422.method1132(var55.field1888); - var57.method1763(true); - var57.method1802(var55.field1885, var55.field1887, keyHandlerInstance.getKeyPressed(82), keyHandlerInstance.getKeyPressed(81)); + field422.method1112(var48.field1884); + var42.method1759(true); + var42.method1798(var48.field1883, var48.field1882, keyHandlerInstance.getKeyPressed(82), keyHandlerInstance.getKeyPressed(81)); break; case 1: - var57.method1803(var55.field1885, var55.field1887); + var42.method1799(var48.field1883, var48.field1882); } } } @@ -3255,63 +3188,56 @@ final void doCycleLoggedIn() { } } - var32 = var54.widget; - if (var32.childIndex < 0) { + var45 = var49.widget; + if (var45.childIndex < 0) { break; } - var51 = class33.widgetDefinition.method1740(var32.parentId); - } while(var51 == null || var51.children == null || var32.childIndex >= var51.children.length || var32 != var51.children[var32.childIndex]); + var40 = HealthBarDefinition.widgetDefinition.method1733(var45.parentId); + } while(var40 == null || var40.children == null || var45.childIndex >= var40.children.length || var45 != var40.children[var45.childIndex]); - Interpreter.runScriptEvent(var54); + class157.runScriptEvent(var49); } } - var32 = var54.widget; - if (var32.childIndex < 0) { + var45 = var49.widget; + if (var45.childIndex < 0) { break; } - var51 = class33.widgetDefinition.method1740(var32.parentId); - } while(var51 == null || var51.children == null || var32.childIndex >= var51.children.length || var32 != var51.children[var32.childIndex]); + var40 = HealthBarDefinition.widgetDefinition.method1733(var45.parentId); + } while(var40 == null || var40.children == null || var45.childIndex >= var40.children.length || var45 != var40.children[var45.childIndex]); - Interpreter.runScriptEvent(var54); + class157.runScriptEvent(var49); } } - var32 = var54.widget; - if (var32.childIndex < 0) { + var45 = var49.widget; + if (var45.childIndex < 0) { break; } - var51 = class33.widgetDefinition.method1740(var32.parentId); - } while(var51 == null || var51.children == null || var32.childIndex >= var51.children.length || var32 != var51.children[var32.childIndex]); + var40 = HealthBarDefinition.widgetDefinition.method1733(var45.parentId); + } while(var40 == null || var40.children == null || var45.childIndex >= var40.children.length || var45 != var40.children[var45.childIndex]); - Interpreter.runScriptEvent(var54); + class157.runScriptEvent(var49); } } - - var42 = ClanChannelMember.getPacketBufferNode(ClientPacket.REFLECTION_CHECK_REPLY, packetWriter.isaacCipher); - var42.packetBuffer.writeByte(0); - var3 = var42.packetBuffer.offset; - class305.performReflectionCheck(var42.packetBuffer); - var42.packetBuffer.WriteLengthByte(var42.packetBuffer.offset - var3); - packetWriter.addNode(var42); } } } } - @ObfuscatedName("ix") + @ObfuscatedName("im") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "328818380" + garbageValue = "-1786579284" ) @Export("vmethod1644") public void vmethod1644(int var1, int var2) { if (packetWriter != null && packetWriter.isaacCipher != null) { - if (var1 > -1 && class91.clientPreferences.getCurrentMusicVolume() > 0 && !playingJingle) { - PacketBufferNode var3 = ClanChannelMember.getPacketBufferNode(ClientPacket.SOUND_SONGEND, packetWriter.isaacCipher); + if (var1 > -1 && WorldMapIcon_1.clientPreferences.getCurrentMusicVolume() > 0 && !playingJingle) { + PacketBufferNode var3 = class113.getPacketBufferNode(ClientPacket.SOUND_SONGEND, packetWriter.isaacCipher); var3.packetBuffer.writeInt(var1); packetWriter.addNode(var3); } @@ -3319,15 +3245,15 @@ public void vmethod1644(int var1, int var2) { } } - @ObfuscatedName("ia") + @ObfuscatedName("ii") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1844765006" + descriptor = "(B)V", + garbageValue = "58" ) @Export("resizeJS") void resizeJS() { - int var1 = class340.canvasWidth; - int var2 = class491.canvasHeight; + int var1 = Language.canvasWidth; + int var2 = class47.canvasHeight; if (super.contentWidth < var1) { var1 = super.contentWidth; } @@ -3336,36 +3262,34 @@ void resizeJS() { var2 = super.contentHeight; } - if (class91.clientPreferences != null) { + if (WorldMapIcon_1.clientPreferences != null) { try { - Client var3 = class159.client; - Object[] var4 = new Object[]{class178.getWindowedMode()}; - JSObject.getWindow(var3).call("resize", var4); - } catch (Throwable var5) { + class26.invoke(SpriteMask.client, "resize", new Object[]{ApproximateRouteStrategy.getWindowedMode()}); + } catch (Throwable var4) { } } } - @ObfuscatedName("id") + @ObfuscatedName("ik") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "4" + garbageValue = "-37" ) @Export("drawLoggedIn") final void drawLoggedIn() { if (rootInterface != -1) { - class178.method926(rootInterface); + ClanChannel.method862(rootInterface); } int var1; for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field408[var1]) { - field407[var1] = true; + if (field407[var1]) { + field408[var1] = true; } - field406[var1] = field408[var1]; - field408[var1] = false; + field409[var1] = field407[var1]; + field407[var1] = false; } field523 = cycle; @@ -3373,232 +3297,118 @@ final void drawLoggedIn() { viewportY = -1; if (rootInterface != -1) { rootWidgetCount = 0; - class410.drawWidgets(rootInterface, 0, 0, class340.canvasWidth, class491.canvasHeight, 0, 0, -1); + Canvas.drawWidgets(rootInterface, 0, 0, Language.canvasWidth, class47.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); if (showMouseCross) { if (mouseCrossColor == 1) { - EnumComposition.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + VarpDefinition.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } if (mouseCrossColor == 2) { - EnumComposition.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + VarpDefinition.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } - int var2; - int var3; - int var4; - int var6; - int var7; - int var8; if (!isMenuOpen) { if (viewportX != -1) { - class135.method730(viewportX, viewportY); + class478.method2366(viewportX, viewportY); } } else { - var1 = class28.menuX; - var2 = class463.menuY; - var3 = class341.menuWidth; - var4 = Language.menuHeight; - int var5 = 6116423; - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); - Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); - SoundCache.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); - var6 = MouseHandler.MouseHandler_x; - var7 = MouseHandler.MouseHandler_y; - - int var9; - int var10; - for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; - var10 = 16777215; - if (var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { - var10 = 16776960; - } - - SoundCache.fontBold12.draw(class169.method882(var8), var1 + 3, var9, var10, 0); - } - - var8 = class28.menuX; - var9 = class463.menuY; - var10 = class341.menuWidth; - int var11 = Language.menuHeight; - - for (int var12 = 0; var12 < rootWidgetCount; ++var12) { - if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var10 + var8 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { - field407[var12] = true; - } - } + ClanSettings.method820(); } if (gameDrawingMode == 3) { for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field406[var1]) { + if (field409[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field407[var1]) { + } else if (field408[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - var1 = class87.Client_plane; - var2 = TextureProvider.localPlayer.x; - var3 = TextureProvider.localPlayer.y; - var4 = field460; - - for (ObjectSound var13 = (ObjectSound)ObjectSound.objectSounds.last(); var13 != null; var13 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var13.soundEffectId != -1 || var13.soundEffectIds != null) { - var6 = 0; - if (var2 > var13.maxX) { - var6 += var2 - var13.maxX; - } else if (var2 < var13.x) { - var6 += var13.x - var2; - } - - if (var3 > var13.maxY) { - var6 += var3 - var13.maxY; - } else if (var3 < var13.y) { - var6 += var13.y - var3; - } - - if (var6 - 64 <= var13.field696 && class91.clientPreferences.getAreaSoundEffectsVolume() != 0 && var1 == var13.plane) { - var6 -= 64; - if (var6 < 0) { - var6 = 0; - } - - var7 = (var13.field696 - var6) * class91.clientPreferences.getAreaSoundEffectsVolume() / var13.field696; - Object var10000; - if (var13.stream1 == null) { - if (var13.soundEffectId >= 0) { - var10000 = null; - SoundEffect var14 = SoundEffect.readSoundEffect(class469.field3930, var13.soundEffectId, 0); - if (var14 != null) { - RawSound var15 = var14.toRawSound().resample(class136.decimator); - RawPcmStream var16 = RawPcmStream.createRawPcmStream(var15, 100, var7); - var16.setNumLoops(-1); - class140.pcmStreamMixer.addSubStream(var16); - var13.stream1 = var16; - } - } - } else { - var13.stream1.method247(var7); - } - - if (var13.stream2 == null) { - if (var13.soundEffectIds != null && (var13.field695 -= var4) <= 0) { - var8 = (int)(Math.random() * (double)var13.soundEffectIds.length); - var10000 = null; - SoundEffect var18 = SoundEffect.readSoundEffect(class469.field3930, var13.soundEffectIds[var8], 0); - if (var18 != null) { - RawSound var19 = var18.toRawSound().resample(class136.decimator); - RawPcmStream var17 = RawPcmStream.createRawPcmStream(var19, 100, var7); - var17.setNumLoops(0); - class140.pcmStreamMixer.addSubStream(var17); - var13.stream2 = var17; - var13.field695 = var13.field697 + (int)(Math.random() * (double)(var13.field690 - var13.field697)); - } - } - } else { - var13.stream2.method247(var7); - if (!var13.stream2.hasNext()) { - var13.stream2 = null; - } - } - } else { - if (var13.stream1 != null) { - class140.pcmStreamMixer.removeSubStream(var13.stream1); - var13.stream1 = null; - } - - if (var13.stream2 != null) { - class140.pcmStreamMixer.removeSubStream(var13.stream2); - var13.stream2 = null; - } - } - } - } - + IgnoreList.method2206(ItemLayer.Client_plane, class229.localPlayer.x, class229.localPlayer.y, field460); field460 = 0; } - @ObfuscatedName("kr") + @ObfuscatedName("jx") @ObfuscatedSignature( - descriptor = "(Lez;IS)Z", - garbageValue = "-3136" + descriptor = "(Lef;II)Z", + garbageValue = "-2137639716" ) - boolean method376(PacketWriter var1, int var2) { + boolean method383(PacketWriter var1, int var2) { if (var1.serverPacketLength == 0) { - class358.friendsChat = null; + class20.friendsChat = null; } else { - if (class358.friendsChat == null) { - class358.friendsChat = new FriendsChat(class166.loginType, class159.client); + if (class20.friendsChat == null) { + class20.friendsChat = new FriendsChat(class89.loginType, SpriteMask.client); } - class358.friendsChat.method2234(var1.packetBuffer, var2); + class20.friendsChat.method2218(var1.packetBuffer, var2); } - UserComparator10.method685(); + field526 = cycleCntr; + class344.ClanChat_inClanChat = true; var1.serverPacket = null; return true; } - @ObfuscatedName("kg") + @ObfuscatedName("ja") @ObfuscatedSignature( - descriptor = "(Lez;I)Z", - garbageValue = "-1216543487" + descriptor = "(Lef;B)Z", + garbageValue = "-16" ) - boolean method377(PacketWriter var1) { - if (class358.friendsChat != null) { - class358.friendsChat.method2235(var1.packetBuffer); + boolean method384(PacketWriter var1) { + if (class20.friendsChat != null) { + class20.friendsChat.method2220(var1.packetBuffer); } - UserComparator10.method685(); + field526 = cycleCntr; + class344.ClanChat_inClanChat = true; var1.serverPacket = null; return true; } - @ObfuscatedName("kq") + @ObfuscatedName("jt") @ObfuscatedSignature( - descriptor = "(Lez;I)Z", - garbageValue = "1463612350" + descriptor = "(Lef;B)Z", + garbageValue = "1" ) - final boolean method378(PacketWriter var1) { + final boolean method385(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; } else { - String var21; - int var22; + int var6; + String var20; try { int var5; if (var1.serverPacket == null) { - if (var1.field1148) { + if (var1.field1160) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 0, 1); - var1.field1152 = 0; - var1.field1148 = false; + var1.field1164 = 0; + var1.field1160 = false; } var3.offset = 0; - if (var3.method2552()) { + if (var3.method2532()) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 1, 1); - var1.field1152 = 0; + var1.field1164 = 0; } - var1.field1148 = true; - ServerPacket[] var4 = class209.method1033(); + var1.field1160 = true; + ServerPacket[] var4 = class12.method46(); var5 = var3.readSmartByteShortIsaac(); if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); @@ -3633,852 +3443,947 @@ final boolean method378(PacketWriter var1) { var3.offset = 0; var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1152 = 0; - timer.method2182(); - var1.field1156 = var1.field1154; - var1.field1154 = var1.field1153; - var1.field1153 = var1.serverPacket; - if (ServerPacket.UPDATE_UID192 == var1.serverPacket) { - return this.method376(var1, 1); + var1.field1164 = 0; + timer.method2170(); + var1.field1166 = var1.field1168; + var1.field1168 = var1.field1167; + var1.field1167 = var1.serverPacket; + String var52; + if (ServerPacket.TRADING_POST_RESULTS == var1.serverPacket) { + var52 = var3.readStringCp1252NullTerminated(); + var20 = AbstractFont.escapeBrackets(class20.method77(class128.readString(var3))); + GrandExchangeOfferUnitPriceComparator.addGameMessage(6, var52, var20); + var1.serverPacket = null; + return true; } - byte var72; - if (ServerPacket.IF_SETMODEL == var1.serverPacket) { - class172.method908(); - var72 = var3.readByte(); - class148 var83 = new class148(var3); - ClanSettings var67; - if (var72 >= 0) { - var67 = currentClanSettings[var72]; - } else { - var67 = VerticalAlignment.guestClanSettings; - } - - if (var67 == null) { - this.method387(var72); - var1.serverPacket = null; - return true; - } - - if (var83.field1335 > var67.field1375) { - this.method387(var72); - var1.serverPacket = null; - return true; - } - - if (var83.field1335 < var67.field1375) { - var1.serverPacket = null; - return true; - } - - var83.method777(var67); + if (ServerPacket.VARP_SMALL == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.LOC_ADD_CHANGE); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETANIM == var1.serverPacket) { - class172.method908(); - var72 = var3.readByte(); + byte var76; + if (ServerPacket.SET_MAP_FLAG == var1.serverPacket) { + class316.method1650(); + var76 = var3.readByte(); if (var1.serverPacketLength == 1) { - if (var72 >= 0) { - currentClanSettings[var72] = null; + if (var76 >= 0) { + currentClanSettings[var76] = null; } else { - VerticalAlignment.guestClanSettings = null; + class478.guestClanSettings = null; } var1.serverPacket = null; return true; } - if (var72 >= 0) { - currentClanSettings[var72] = new ClanSettings(var3); + if (var76 >= 0) { + currentClanSettings[var76] = new ClanSettings(var3); } else { - VerticalAlignment.guestClanSettings = new ClanSettings(var3); + class478.guestClanSettings = new ClanSettings(var3); } var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.field2623); + int var7; + int var8; + int var9; + int var11; + int var21; + int var23; + long var63; + InterfaceParent var75; + if (ServerPacket.NPC_SPOTANIM_SPECIFIC == var1.serverPacket) { + var21 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.method389(false); + class130.method713(rootInterface); + class106.runWidgetOnLoadListener(rootInterface); + + for (var7 = 0; var7 < 100; ++var7) { + field407[var7] = true; + } + } + + InterfaceParent var59; + for (; var6-- > 0; var59.field863 = true) { + var7 = var3.readInt(); + var8 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + var59 = (InterfaceParent)interfaceParents.get((long)var7); + if (var59 != null && var8 != var59.group) { + class302.closeInterface(var59, true); + var59 = null; + } + + if (var59 == null) { + var59 = UserComparator8.ifOpenSub(var7, var8, var9); + } + } + + for (var75 = (InterfaceParent)interfaceParents.first(); var75 != null; var75 = (InterfaceParent)interfaceParents.next()) { + if (var75.field863) { + var75.field863 = false; + } else { + class302.closeInterface(var75, true); + } + } + + widgetFlags = new NodeHashTable(512); + + while (var3.offset < var21) { + var7 = var3.readInt(); + var8 = var3.readUnsignedShort(); + var9 = var3.readUnsignedShort(); + var23 = var3.readInt(); + + for (var11 = var8; var11 <= var9; ++var11) { + var63 = ((long)var7 << 32) + (long)var11; + widgetFlags.put(new IntegerNode(var23), var63); + } + } + var1.serverPacket = null; return true; } - if (ServerPacket.field2675 == var1.serverPacket) { - class332.updateNpcs(true, var3); + if (ServerPacket.LOGOUT_FULL == var1.serverPacket) { + var21 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedShort(); + class460.queueSoundEffect(var21, var5, var6); var1.serverPacket = null; return true; } - int var7; - int var8; - int var20; - if (ServerPacket.LOC_DEL == var1.serverPacket) { - var22 = var3.readUnsignedShortAdd(); - var7 = var3.readIntME(); - var8 = var3.readUnsignedShortAdd(); - var5 = var3.readUnsignedShort(); - var20 = var3.readUnsignedShortAdd(); - if (var20 == 65535) { - var20 = -1; + int var24; + boolean var62; + boolean var82; + if (ServerPacket.VARP_LARGE == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field402 = true; + ScriptFrame.cameraLookAtX = var3.readUnsignedByte(); + class216.cameraLookAtY = var3.readUnsignedByte(); + var21 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte() * 128 + 64; + var6 = var3.readUnsignedByte() * 128 + 64; + var7 = var3.readUnsignedShort(); + field403 = var3.readBoolean(); + var8 = var3.readUnsignedByte(); + var9 = ScriptFrame.cameraLookAtX * 128 + 64; + var23 = class216.cameraLookAtY * 128 + 64; + var62 = false; + var82 = false; + if (field403) { + var11 = SecureRandomFuture.cameraY; + var24 = WorldMapDecorationType.getTileHeight(var9, var23, ItemLayer.Client_plane) - var21; + } else { + var11 = WorldMapDecorationType.getTileHeight(ViewportMouse.cameraX, class36.cameraZ, ItemLayer.Client_plane) - SecureRandomFuture.cameraY; + var24 = var21; } - ArrayList var56 = new ArrayList(); - var56.add(var20); - class202.method1006(var56, var5, var22, var7, var8); + field644 = new class488(ViewportMouse.cameraX, class36.cameraZ, var11, var9, var23, var24, var5, var6, var7, var8); var1.serverPacket = null; return true; } - if (ServerPacket.field2649 == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field401 = true; - var20 = NPC.method597(var3.readShort() & 2027); - var5 = class153.method800(var3.readShort() & 2027); - var22 = var3.readUnsignedShort(); - var7 = var3.readUnsignedByte(); - field642 = new class493(class365.cameraPitch, var5, var22, var7); - field643 = new class493(WallDecoration.cameraYaw, var20, var22, var7); + if (ServerPacket.field2648 == var1.serverPacket) { + publicChatMode = var3.readUnsignedByteNeg(); + tradeChatMode = var3.readUnsignedShortAdd(); var1.serverPacket = null; return true; } - if (ServerPacket.OBJ_COUNT == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.LOC_ANIM); + Widget var25; + if (ServerPacket.SEND_PING == var1.serverPacket) { + var21 = var3.readUnsignedIntIME(); + var5 = var3.readUnsignedIntME(); + var25 = HealthBarDefinition.widgetDefinition.method1733(var5); + if (var25 != null && var25.type == 0) { + if (var21 > var25.scrollHeight - var25.height) { + var21 = var25.scrollHeight - var25.height; + } + + if (var21 < 0) { + var21 = 0; + } + + if (var21 != var25.scrollY) { + var25.scrollY = var21; + class159.invalidateWidget(var25); + } + } + var1.serverPacket = null; return true; } - Widget var6; - if (ServerPacket.RESET_CLIENT_VARCACHE == var1.serverPacket) { - var20 = var3.readInt(); - var21 = var3.readStringCp1252NullTerminated(); - var6 = class33.widgetDefinition.method1740(var20); - if (!var21.equals(var6.text)) { - var6.text = var21; - ClanChannelMember.invalidateWidget(var6); - } - + if (ServerPacket.field2651 == var1.serverPacket) { + class90.updateNpcs(true, var3); var1.serverPacket = null; return true; } if (ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE == var1.serverPacket) { - var22 = var3.readUnsignedByteNeg(); - var5 = var3.readIntME(); - var20 = var3.readUnsignedShortAdd(); - if (var5 == 65535) { - var5 = -1; - } + varclan = null; + var1.serverPacket = null; + return true; + } - NPC var86 = npcs[var20]; - if (var86 != null) { - if (var5 == var86.sequence && var5 != -1) { - var8 = class36.SequenceDefinition_get(var5).replyMode; - if (var8 == 1) { - var86.sequenceFrame = 0; - var86.sequenceFrameCycle = 0; - var86.sequenceDelay = var22; - var86.currentSequenceFrameIndex = 0; - } else if (var8 == 2) { - var86.currentSequenceFrameIndex = 0; - } - } else if (var5 == -1 || var86.sequence == -1 || class36.SequenceDefinition_get(var5).forcedPriority >= class36.SequenceDefinition_get(var86.sequence).forcedPriority) { - var86.sequence = var5; - var86.sequenceFrame = 0; - var86.sequenceFrameCycle = 0; - var86.sequenceDelay = var22; - var86.currentSequenceFrameIndex = 0; - var86.field1023 = var86.pathLength; + boolean var98; + if (ServerPacket.field2641 == var1.serverPacket) { + var98 = var3.readBoolean(); + if (var98) { + if (MidiPcmStream.field2799 == null) { + MidiPcmStream.field2799 = new class381(); } + } else { + MidiPcmStream.field2799 = null; } var1.serverPacket = null; return true; } - if (ServerPacket.LOGOUT_FULL == var1.serverPacket) { - var20 = var3.readIntME(); - GrandExchangeOfferUnitPriceComparator.method1994(var20); - changedItemContainers[++changedItemContainersCount - 1 & 31] = var20 & 32767; + if (ServerPacket.MIDI_SONG_STOP == var1.serverPacket) { + var21 = var3.readUnsignedShort(); + var5 = var3.readUnsignedIntME(); + var25 = HealthBarDefinition.widgetDefinition.method1733(var5); + if (var25.modelType != 6 || var21 != var25.modelId) { + var25.modelType = 6; + var25.modelId = var21; + class159.invalidateWidget(var25); + } + var1.serverPacket = null; return true; } - if (ServerPacket.CAM_MOVETO_EASED == var1.serverPacket) { - for (var20 = 0; var20 < VarpDefinition.field1501; ++var20) { - VarpDefinition var82 = class150.VarpDefinition_get(var20); - if (var82 != null) { - Varps.Varps_temp[var20] = 0; - Varps.Varps_main[var20] = 0; - } - } + if (ServerPacket.SYNTH_SOUND == var1.serverPacket) { + return this.method383(var1, 1); + } - class304.method1636(); - changedVarpCount += 32; + if (ServerPacket.field2748 == var1.serverPacket) { + class153.readReflectionCheck(var3, var1.serverPacketLength); var1.serverPacket = null; return true; } - if (ServerPacket.SYNTH_SOUND == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.field2619); + if (ServerPacket.TOGGLE_OCULUS_ORB == var1.serverPacket) { + var21 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var21] = new GrandExchangeOffer(); + var3.offset += 18; + } else { + --var3.offset; + grandExchangeOffers[var21] = new GrandExchangeOffer(var3, false); + } + + field519 = cycleCntr; var1.serverPacket = null; return true; } - String var55; - if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 == var1.serverPacket) { - byte[] var54 = new byte[var1.serverPacketLength]; - var3.method2554(var54, 0, var54.length); - Buffer var80 = new Buffer(var54); - var55 = var80.readStringCp1252NullTerminated(); - VertexNormal.openURL(var55, true, false); + if (ServerPacket.CAM_MOVETO == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.OBJ_COUNT); var1.serverPacket = null; return true; } - if (ServerPacket.TOGGLE_OCULUS_ORB == var1.serverPacket) { - var20 = var3.readUnsignedByteSub(); - var5 = var3.readUnsignedShortAddLE(); - if (var5 == 65535) { - var5 = -1; - } + if (ServerPacket.field2682 == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); + var1.serverPacket = null; + return true; + } - WorldMapEvent.performPlayerAnimation(TextureProvider.localPlayer, var5, var20); + if (ServerPacket.TRADING_POST_UPDATE == var1.serverPacket) { + Interpreter.updatePlayers(var3, var1.serverPacketLength); + WorldMapSectionType.method1314(); var1.serverPacket = null; return true; } - if (ServerPacket.CAM_MOVETO == var1.serverPacket) { - var20 = var3.readUnsignedIntME(); - var5 = var3.readIntME(); - var6 = class33.widgetDefinition.method1740(var20); - if (var6.modelType != 1 || var5 != var6.modelId) { - var6.modelType = 1; - var6.modelId = var5; - ClanChannelMember.invalidateWidget(var6); + if (ServerPacket.IF_OPENSUB == var1.serverPacket) { + for (var21 = 0; var21 < Varps.Varps_main.length; ++var21) { + if (Varps.Varps_main[var21] != Varps.Varps_temp[var21]) { + Varps.Varps_main[var21] = Varps.Varps_temp[var21]; + Projectile.changeGameOptions(var21); + changedVarps[++changedVarpCount - 1 & 31] = var21; + } } var1.serverPacket = null; return true; } - if (ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT == var1.serverPacket) { - var20 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var22 = var3.readUnsignedByte(); - var7 = var3.readUnsignedByte(); - cameraShaking[var20] = true; - cameraShakeIntensity[var20] = var5; - cameraMoveIntensity[var20] = var22; - cameraShakeSpeed[var20] = var7; - cameraShakeCycle[var20] = 0; + if (ServerPacket.field2670 == var1.serverPacket) { + var21 = var3.readInt(); + InterfaceParent var80 = (InterfaceParent)interfaceParents.get((long)var21); + if (var80 != null) { + class302.closeInterface(var80, true); + } + + if (meslayerContinueWidget != null) { + class159.invalidateWidget(meslayerContinueWidget); + meslayerContinueWidget = null; + } + var1.serverPacket = null; return true; } - if (ServerPacket.LOGOUT == var1.serverPacket) { - field400 = false; - isCameraLocked = false; - field402 = false; - field401 = false; - class148.cameraLookAtX = 0; - BufferedNetSocket.cameraLookAtY = 0; - class161.cameraLookAtHeight = 0; - field403 = false; - class232.cameraLookAtSpeed = 0; - class465.cameraLookAtAcceleration = 0; - class131.cameraMoveToAcceleration = 0; - SecureRandomCallable.cameraMoveToSpeed = 0; - class191.cameraMoveToX = 0; - MouseHandler.cameraMoveToY = 0; - SoundSystem.cameraMoveToHeight = 0; - field646 = null; - field642 = null; - field643 = null; + if (ServerPacket.field2719 == var1.serverPacket) { + class316.method1650(); + var76 = var3.readByte(); + class147 var78 = new class147(var3); + ClanSettings var91; + if (var76 >= 0) { + var91 = currentClanSettings[var76]; + } else { + var91 = class478.guestClanSettings; + } + + if (var91 == null) { + this.method395(var76); + var1.serverPacket = null; + return true; + } + + if (var78.field1346 > var91.field1385) { + this.method395(var76); + var1.serverPacket = null; + return true; + } - for (var20 = 0; var20 < 5; ++var20) { - cameraShaking[var20] = false; + if (var78.field1346 < var91.field1385) { + var1.serverPacket = null; + return true; } + var78.method770(var91); var1.serverPacket = null; return true; } - if (ServerPacket.CAM_RESET == var1.serverPacket) { - if (rootInterface != -1) { - Interpreter.runIntfCloseListener(rootInterface, 0); + int var15; + int var65; + if (ServerPacket.IF_SETPLAYERMODEL_SELF == var1.serverPacket) { + var9 = var3.readUnsignedByteSub(); + var23 = var9 >> 2; + var11 = var9 & 3; + var24 = field652[var23]; + var65 = var3.readUnsignedShort(); + var6 = var3.readMedium(); + var21 = var6 >> 16; + var5 = var6 >> 8 & 255; + var7 = var21 + (var6 >> 4 & 7); + var8 = var5 + (var6 & 7); + if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { + if (var24 == 0) { + BoundaryObject var68 = class36.scene.method1479(ItemLayer.Client_plane, var7, var8); + if (var68 != null) { + var15 = class232.Entity_unpackID(var68.tag); + if (var23 == 2) { + var68.renderable1 = new DynamicObject(var15, 2, var11 + 4, ItemLayer.Client_plane, var7, var8, var65, false, var68.renderable1); + var68.renderable2 = new DynamicObject(var15, 2, var11 + 1 & 3, ItemLayer.Client_plane, var7, var8, var65, false, var68.renderable2); + } else { + var68.renderable1 = new DynamicObject(var15, var23, var11, ItemLayer.Client_plane, var7, var8, var65, false, var68.renderable1); + } + } + } else if (var24 == 1) { + WallDecoration var67 = class36.scene.method1480(ItemLayer.Client_plane, var7, var8); + if (var67 != null) { + var15 = class232.Entity_unpackID(var67.tag); + if (var23 != 4 && var23 != 5) { + if (var23 == 6) { + var67.renderable1 = new DynamicObject(var15, 4, var11 + 4, ItemLayer.Client_plane, var7, var8, var65, false, var67.renderable1); + } else if (var23 == 7) { + var67.renderable1 = new DynamicObject(var15, 4, (var11 + 2 & 3) + 4, ItemLayer.Client_plane, var7, var8, var65, false, var67.renderable1); + } else if (var23 == 8) { + var67.renderable1 = new DynamicObject(var15, 4, var11 + 4, ItemLayer.Client_plane, var7, var8, var65, false, var67.renderable1); + var67.renderable2 = new DynamicObject(var15, 4, (var11 + 2 & 3) + 4, ItemLayer.Client_plane, var7, var8, var65, false, var67.renderable2); + } + } else { + var67.renderable1 = new DynamicObject(var15, 4, var11, ItemLayer.Client_plane, var7, var8, var65, false, var67.renderable1); + } + } + } else if (var24 == 2) { + GameObject var64 = class36.scene.getGameObject(ItemLayer.Client_plane, var7, var8); + if (var23 == 11) { + var23 = 10; + } + + if (var64 != null) { + var64.renderable = new DynamicObject(class232.Entity_unpackID(var64.tag), var23, var11, ItemLayer.Client_plane, var7, var8, var65, false, var64.renderable); + } + } else if (var24 == 3) { + FloorDecoration var66 = class36.scene.getFloorDecoration(ItemLayer.Client_plane, var7, var8); + if (var66 != null) { + var66.renderable = new DynamicObject(class232.Entity_unpackID(var66.tag), 22, var11, ItemLayer.Client_plane, var7, var8, var65, false, var66.renderable); + } + } } var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPLAYERHEAD == var1.serverPacket) { - class304.method1636(); - runEnergy = var3.readUnsignedShort(); - field527 = cycleCntr; + int var16; + int var17; + int var18; + Projectile var19; + int var26; + byte var57; + byte var81; + if (ServerPacket.NPC_ANIM_SPECIFIC == var1.serverPacket) { + var15 = var3.readUnsignedShort(); + var17 = var3.readUnsignedByte(); + var6 = var3.readMedium(); + var21 = var6 >> 16; + var5 = var6 >> 8 & 255; + var7 = var21 + (var6 >> 4 & 7); + var8 = var5 + (var6 & 7); + var57 = var3.readByte(); + var16 = var3.readUnsignedShortAddLE(); + var24 = var3.readUnsignedShort(); + var11 = var3.method2610(); + var26 = var3.readUnsignedShortAdd() * 4; + var65 = var3.readUnsignedByte() * 4; + var18 = var3.readUnsignedIntIME(); + var81 = var3.readByteAdd(); + var9 = var57 + var7; + var23 = var81 + var8; + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var9 >= 0 && var23 >= 0 && var9 < 104 && var23 < 104 && var24 != 65535) { + var7 = var7 * 128 + 64; + var8 = var8 * 128 + 64; + var9 = var9 * 128 + 64; + var23 = var23 * 128 + 64; + var19 = new Projectile(var24, ItemLayer.Client_plane, var7, var8, WorldMapDecorationType.getTileHeight(var7, var8, ItemLayer.Client_plane) - var65, var15 + cycle, var16 + cycle, var17, var18, var11, var26); + var19.setDestination(var9, var23, WorldMapDecorationType.getTileHeight(var9, var23, ItemLayer.Client_plane) - var26, var15 + cycle); + projectiles.addFirst(var19); + } + var1.serverPacket = null; return true; } - if (ServerPacket.OBJ_DEL == var1.serverPacket) { - var20 = var3.readUnsignedIntLE(); - var5 = var3.readUnsignedByteAdd(); - var6 = class33.widgetDefinition.method1740(var20); - UrlRequester.method653(var6, TextureProvider.localPlayer.appearance.field2950, var5); - ClanChannelMember.invalidateWidget(var6); + if (ServerPacket.field2724 == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.MAPPROJ_ANIM); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPLAYERMODEL_SELF == var1.serverPacket) { - var20 = var3.readInt(); - var5 = var3.readInt(); - var22 = TileItem.getGcDuration(); - PacketBufferNode var84 = ClanChannelMember.getPacketBufferNode(ClientPacket.PING_STATS, packetWriter.isaacCipher); - var84.packetBuffer.writeIntME(var20); - var84.packetBuffer.writeIntIME(var5); - var84.packetBuffer.writeByte(var22); - var84.packetBuffer.writeByteNeg(GameEngine.fps); - packetWriter.addNode(var84); + Widget var22; + if (ServerPacket.UPDATE_ZONE_FULL_FOLLOWS == var1.serverPacket) { + var21 = var3.readUnsignedByte(); + var5 = var3.readUnsignedShortAdd(); + var6 = var3.readInt(); + var22 = HealthBarDefinition.widgetDefinition.method1733(var6); + ZoneOperation.method1633(var22, var21, var5); + class159.invalidateWidget(var22); var1.serverPacket = null; return true; } - if (ServerPacket.NPC_ANIM_SPECIFIC == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.PREFETCH_GAMEOBJECTS); + if (ServerPacket.HINT_ARROW == var1.serverPacket) { + var21 = var3.readUnsignedShortLE(); + var5 = var3.readIntIME(); + var6 = var3.readUnsignedShortAdd(); + var75 = (InterfaceParent)interfaceParents.get((long)var5); + if (var75 != null) { + class302.closeInterface(var75, var21 != var75.group); + } + + UserComparator8.ifOpenSub(var5, var21, var6); var1.serverPacket = null; return true; } - int var10; - int var24; - if (ServerPacket.field2744 == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field401 = false; - class148.cameraLookAtX = var3.readUnsignedByte(); - BufferedNetSocket.cameraLookAtY = var3.readUnsignedByte(); - class161.cameraLookAtHeight = var3.readUnsignedShort(); - class232.cameraLookAtSpeed = var3.readUnsignedByte(); - class465.cameraLookAtAcceleration = var3.readUnsignedByte(); - if (class465.cameraLookAtAcceleration >= 100) { - var20 = class148.cameraLookAtX * 128 + 64; - var5 = BufferedNetSocket.cameraLookAtY * 128 + 64; - var22 = class115.getTileHeight(var20, var5, class87.Client_plane) - class161.cameraLookAtHeight; - var7 = var20 - cameraX; - var8 = var22 - class17.cameraY; - var24 = var5 - WorldMapArea.cameraZ; - var10 = (int)Math.sqrt((double)(var24 * var24 + var7 * var7)); - class365.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.9490051269531D) & 2047; - WallDecoration.cameraYaw = (int)(Math.atan2((double)var7, (double)var24) * -325.9490051269531D) & 2047; - if (class365.cameraPitch < 128) { - class365.cameraPitch = 128; + if (ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED == var1.serverPacket) { + var21 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var21 < -70000) { + var5 += 32768; + } + + if (var21 >= 0) { + var25 = HealthBarDefinition.widgetDefinition.method1733(var21); + } else { + var25 = null; + } + + if (var25 != null) { + for (var7 = 0; var7 < var25.itemIds.length; ++var7) { + var25.itemIds[var7] = 0; + var25.field3077[var7] = 0; + } + } + + class28.clearItemContainer(var5); + var7 = var3.readUnsignedShort(); + + for (var8 = 0; var8 < var7; ++var8) { + var9 = var3.readUnsignedIntIME(); + var23 = var3.readUnsignedShortAdd(); + if (var23 == 255) { + var23 = var3.readInt(); } - if (class365.cameraPitch > 383) { - class365.cameraPitch = 383; + if (var25 != null && var8 < var25.itemIds.length) { + var25.itemIds[var8] = var9; + var25.field3077[var8] = var23; } + + class185.itemContainerSetItem(var5, var8, var9 - 1, var23); + } + + if (var25 != null) { + class159.invalidateWidget(var25); } + class396.method2042(); + changedItemContainers[++changedItemContainersCount - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.HEAT_MAP == var1.serverPacket) { - var20 = var3.readUnsignedShortAdd(); - var5 = var3.readUnsignedIntIME(); - var6 = class33.widgetDefinition.method1740(var5); - if (var6.modelType != 6 || var20 != var6.modelId) { - var6.modelType = 6; - var6.modelId = var20; - ClanChannelMember.invalidateWidget(var6); + Widget var74; + if (ServerPacket.field2674 == var1.serverPacket) { + var21 = var3.readIntIME(); + var74 = HealthBarDefinition.widgetDefinition.method1733(var21); + + for (var6 = 0; var6 < var74.itemIds.length; ++var6) { + var74.itemIds[var6] = -1; + var74.itemIds[var6] = 0; } + class159.invalidateWidget(var74); var1.serverPacket = null; return true; } - if (ServerPacket.CAM_MOVETO_EASED_CIRCULAR == var1.serverPacket) { - var20 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var20] = new GrandExchangeOffer(); - var3.offset += 18; - } else { - --var3.offset; - grandExchangeOffers[var20] = new GrandExchangeOffer(var3, false); + long var27; + long var29; + String var34; + if (ServerPacket.NPC_HEADICON_SPECIFIC == var1.serverPacket) { + var52 = var3.readStringCp1252NullTerminated(); + var27 = (long)var3.readUnsignedShort(); + var29 = (long)var3.readMedium(); + PlayerType var90 = (PlayerType)class12.findEnumerated(class320.PlayerType_values(), var3.readUnsignedByte()); + long var32 = (var27 << 32) + var29; + var82 = false; + + for (var65 = 0; var65 < 100; ++var65) { + if (field615[var65] == var32) { + var82 = true; + break; + } } - field529 = cycleCntr; - var1.serverPacket = null; - return true; - } + if (class12.friendSystem.isIgnored(new Username(var52, class89.loginType))) { + var82 = true; + } + + if (!var82 && field479 == 0) { + field615[field533] = var32; + field533 = (field533 + 1) % 100; + var34 = AbstractFont.escapeBrackets(class20.method77(class128.readString(var3))); + byte var87; + if (var90.isPrivileged) { + var87 = 7; + } else { + var87 = 3; + } + + if (var90.modIcon != -1) { + GrandExchangeOfferUnitPriceComparator.addGameMessage(var87, FloorUnderlayDefinition.addImageTag(var90.modIcon) + var52, var34); + } else { + GrandExchangeOfferUnitPriceComparator.addGameMessage(var87, var52, var34); + } + } - if (ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED == var1.serverPacket) { - class304.method1636(); - weight = var3.readShort(); - field527 = cycleCntr; var1.serverPacket = null; return true; } - Widget var79; - if (ServerPacket.VARCLAN == var1.serverPacket) { - var20 = var3.readUnsignedIntLE(); - var79 = class33.widgetDefinition.method1740(var20); - var79.modelType = 3; - var79.modelId = TextureProvider.localPlayer.appearance.getChatHeadId(); - ClanChannelMember.invalidateWidget(var79); + if (ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR == var1.serverPacket) { + ObjTypeCustomisation.privateChatMode = WorldMapArea.method1204(var3.readUnsignedByte()); var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SWAP == var1.serverPacket) { - tradeChatMode = var3.readUnsignedByte(); - publicChatMode = var3.readUnsignedByteNeg(); + if (ServerPacket.UPDATE_FRIENDLIST == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field404 = true; + var21 = class319.method1705(var3.readShort() & 2027); + var5 = class240.method1293(var3.readShort() & 2027); + var6 = var3.readUnsignedShort(); + var7 = var3.readUnsignedByte(); + field642 = new class490(Varcs.cameraPitch, var5, var6, var7); + field643 = new class490(class192.cameraYaw, var21, var6, var7); var1.serverPacket = null; return true; } - boolean var11; - long var25; - long var27; - long var29; - String var31; - int var68; - int var69; - if (ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR == var1.serverPacket) { - var72 = var3.readByte(); - var25 = (long)var3.readUnsignedShort(); - var27 = (long)var3.readMedium(); - var29 = var27 + (var25 << 32); - var11 = false; - ClanChannel var63 = var72 >= 0 ? currentClanChannels[var72] : ClanChannelMember.guestClanChannel; - if (var63 == null) { - var11 = true; - } else { - for (var68 = 0; var68 < 100; ++var68) { - if (crossWorldMessageIds[var68] == var29) { - var11 = true; - break; - } - } - } - - if (!var11) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var29; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var31 = class172.readString(var3); - var69 = var72 >= 0 ? 43 : 46; - class164.addChatMessage(var69, "", var31, var63.name); - } - + if (ServerPacket.field2656 == var1.serverPacket) { + rebootTimer = var3.readUnsignedShort() * 30; + field522 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_FRIENDLIST == var1.serverPacket) { + if (ServerPacket.MIDI_SONG_WITH_SECONDARY == var1.serverPacket) { + var21 = var3.readInt(); + var74 = HealthBarDefinition.widgetDefinition.method1733(var21); + var74.modelType = 3; + var74.modelId = class229.localPlayer.appearance.getChatHeadId(); + class159.invalidateWidget(var74); var1.serverPacket = null; return true; } - int var15; - int var16; - int var17; - int var18; - Projectile var19; - int var60; - byte var62; - byte var85; - int var87; - if (ServerPacket.field2730 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - var60 = var3.method2629(); - var62 = var3.readByte(); - var69 = var3.readUnsignedByteAdd() * 4; - var18 = var3.readUnsignedByte(); - var68 = var3.readUnsignedByteNeg() * 4; - var87 = var3.readUnsignedShortAddLE(); - var22 = var3.method2628(); - var20 = var22 >> 16; - var5 = var22 >> 8 & 255; - var7 = var20 + (var22 >> 4 & 7); - var8 = var5 + (var22 & 7); - var16 = var3.readIntME(); - var15 = var3.readUnsignedShortAddLE(); - var85 = var3.readByte(); - var24 = var85 + var7; - var10 = var62 + var8; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var24 >= 0 && var10 >= 0 && var24 < 104 && var10 < 104 && var87 != 65535) { - var7 = var7 * 128 + 64; - var8 = var8 * 128 + 64; - var24 = var24 * 128 + 64; - var10 = var10 * 128 + 64; - var19 = new Projectile(var87, class87.Client_plane, var7, var8, class115.getTileHeight(var7, var8, class87.Client_plane) - var68, var15 + cycle, var16 + cycle, var17, var18, var60, var69); - var19.setDestination(var24, var10, class115.getTileHeight(var24, var10, class87.Client_plane) - var69, var15 + cycle); - projectiles.addFirst(var19); + if (ServerPacket.UPDATE_STAT == var1.serverPacket) { + var21 = var3.method2602(); + var5 = var3.readInt(); + var25 = HealthBarDefinition.widgetDefinition.method1733(var5); + if (var21 != var25.sequenceId || var21 == -1) { + var25.sequenceId = var21; + var25.modelFrame = 0; + var25.modelFrameCycle = 0; + class159.invalidateWidget(var25); } var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SONG_WITH_SECONDARY == var1.serverPacket) { - class151.loadRegions(true, var1.packetBuffer); + if (ServerPacket.MIDI_SONG == var1.serverPacket) { + class396.method2042(); + runEnergy = var3.readUnsignedShort(); + field522 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.LOC_ANIM_SPECIFIC == var1.serverPacket) { - InvDefinition.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - class492.FriendSystem_invalidateIgnoreds(); - field511 = cycleCntr; + if (ServerPacket.REFLECTIONCHECK_FRIENDLIST == var1.serverPacket) { + var76 = var3.readByteNeg(); + var5 = var3.readUnsignedShort(); + Varps.Varps_temp[var5] = var76; + if (Varps.Varps_main[var5] != var76) { + Varps.Varps_main[var5] = var76; + } + + Projectile.changeGameOptions(var5); + changedVarps[++changedVarpCount - 1 & 31] = var5; var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETEVENTS == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.OBJ_COUNT); + if (ServerPacket.field2756 == var1.serverPacket) { + return this.method383(var1, 2); + } + + if (ServerPacket.SET_PLAYER_OP == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.field2622); var1.serverPacket = null; return true; } - Widget var23; - if (ServerPacket.REFLECTIONCHECK_FRIENDLIST == var1.serverPacket) { - var20 = var3.readInt(); - var5 = var3.readIntME(); - if (var5 == 65535) { - var5 = -1; + if (ServerPacket.UPDATE_IGNORELIST == var1.serverPacket) { + hintArrowType = var3.readUnsignedByte(); + if (hintArrowType == 1) { + hintArrowNpcIndex = var3.readUnsignedShort(); } - var22 = var3.readUnsignedIntIME(); - var23 = class33.widgetDefinition.method1740(var22); - ItemComposition var92; - if (!var23.isIf3) { - if (var5 == -1) { - var23.modelType = 0; - var1.serverPacket = null; - return true; + if (hintArrowType >= 2 && hintArrowType <= 6) { + if (hintArrowType == 2) { + hintArrowSubX = 64; + hintArrowSubY = 64; } - var92 = class214.ItemDefinition_get(var5).getCountObj(var20); - var23.modelType = 4; - var23.modelId = var5; - var23.modelAngleX = var92.xan2d; - var23.modelAngleY = var92.yan2d; - var23.modelZoom = var92.zoom2d * 100 / var20; - ClanChannelMember.invalidateWidget(var23); - } else { - var23.itemId = var5; - var23.itemQuantity = var20; - var92 = class214.ItemDefinition_get(var5).getCountObj(var20); - var23.modelAngleX = var92.xan2d; - var23.modelAngleY = var92.yan2d; - var23.modelAngleZ = var92.zan2d; - var23.modelOffsetX = var92.offsetX2d; - var23.modelOffsetY = var92.offsetY2d; - var23.modelZoom = var92.zoom2d; - if (var92.isStackable == 1) { - var23.itemQuantityMode = 1; - } else { - var23.itemQuantityMode = 2; + if (hintArrowType == 3) { + hintArrowSubX = 0; + hintArrowSubY = 64; + } + + if (hintArrowType == 4) { + hintArrowSubX = 128; + hintArrowSubY = 64; + } + + if (hintArrowType == 5) { + hintArrowSubX = 64; + hintArrowSubY = 0; } - if (var23.modelRotation > 0) { - var23.modelZoom = var23.modelZoom * 32 / var23.modelRotation; - } else if (var23.rawWidth > 0) { - var23.modelZoom = var23.modelZoom * 32 / var23.rawWidth; + if (hintArrowType == 6) { + hintArrowSubX = 64; + hintArrowSubY = 128; } - ClanChannelMember.invalidateWidget(var23); + hintArrowType = 2; + hintArrowX = var3.readUnsignedShort(); + hintArrowY = var3.readUnsignedShort(); + hintArrowHeight = var3.readUnsignedByte(); + } + + if (hintArrowType == 10) { + hintArrowPlayerIndex = var3.readUnsignedShort(); } var1.serverPacket = null; return true; } - if (ServerPacket.field2755 == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.MAPPROJ_ANIM); + if (ServerPacket.RUN_CLIENTSCRIPT == var1.serverPacket) { + if (varclan == null) { + varclan = new class466(Players.Widget_cachedFonts); + } + + class535 var53 = Players.Widget_cachedFonts.method2340(var3); + varclan.field3929.vmethod8143(var53.field4244, var53.field4243); + field571[++field510 - 1 & 31] = var53.field4244; var1.serverPacket = null; return true; } - Widget var33; - InterfaceParent var78; - if (ServerPacket.MIDI_SONG == var1.serverPacket) { - var20 = var3.readInt(); - var5 = var3.readUnsignedIntIME(); - InterfaceParent var65 = (InterfaceParent)interfaceParents.get((long)var20); - var78 = (InterfaceParent)interfaceParents.get((long)var5); - if (var78 != null) { - ArchiveDisk.closeInterface(var78, var65 == null || var65.group != var78.group); - } - - if (var65 != null) { - var65.remove(); - interfaceParents.put(var65, (long)var5); + if (ServerPacket.UPDATE_RUNWEIGHT == var1.serverPacket) { + var21 = var3.readUnsignedShort(); + var5 = var3.readIntME(); + var25 = HealthBarDefinition.widgetDefinition.method1733(var5); + if (var25.modelType != 1 || var21 != var25.modelId) { + var25.modelType = 1; + var25.modelId = var21; + class159.invalidateWidget(var25); } - var33 = class33.widgetDefinition.method1740(var20); - if (var33 != null) { - ClanChannelMember.invalidateWidget(var33); - } + var1.serverPacket = null; + return true; + } - var33 = class33.widgetDefinition.method1740(var5); - if (var33 != null) { - ClanChannelMember.invalidateWidget(var33); - PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var33.id >>> 16], var33, true); + if (ServerPacket.MESSAGE_GAME == var1.serverPacket) { + var5 = var3.readUnsignedShortLE(); + var7 = var3.readUnsignedShortAdd(); + var6 = var3.readUnsignedIntME(); + var21 = var3.readUnsignedIntIME(); + Player var95; + if (var21 == localPlayerIndex) { + var95 = class229.localPlayer; + } else { + var95 = players[var21]; } - if (rootInterface != -1) { - Interpreter.runIntfCloseListener(rootInterface, 1); + if (var95 != null) { + var95.updateSpotAnimation(var7, var5, var6 >> 16, var6 & 65535); } var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_PRIVATE == var1.serverPacket) { - field528 = cycleCntr; - var72 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var72 >= 0) { - currentClanChannels[var72] = null; - } else { - ClanChannelMember.guestClanChannel = null; - } - - var1.serverPacket = null; - return true; - } - - if (var72 >= 0) { - currentClanChannels[var72] = new ClanChannel(var3); - } else { - ClanChannelMember.guestClanChannel = new ClanChannel(var3); - } + if (ServerPacket.MIDI_JINGLE == var1.serverPacket) { + var21 = var3.readUnsignedIntIME(); + WorldMapEvent.method1383(var21); + changedItemContainers[++changedItemContainersCount - 1 & 31] = var21 & 32767; + var1.serverPacket = null; + return true; + } + if (ServerPacket.field2698 == var1.serverPacket) { + var21 = var3.readInt(); + var5 = var3.readInt(); + var6 = class167.getGcDuration(); + PacketBufferNode var79 = class113.getPacketBufferNode(ClientPacket.OPHELDD, packetWriter.isaacCipher); + var79.packetBuffer.method2613(var21); + var79.packetBuffer.writeIntLE(var5); + var79.packetBuffer.writeByteNeg(var6); + var79.packetBuffer.writeByte(GameEngine.fps); + packetWriter.addNode(var79); var1.serverPacket = null; return true; } - if (ServerPacket.RUN_CLIENTSCRIPT == var1.serverPacket) { - var20 = var3.readUnsignedShortAdd(); + String var84; + if (ServerPacket.LOGIN_SCREEN_PACKET == var1.serverPacket) { + var21 = var3.readUnsignedByte(); var5 = var3.readUnsignedByteNeg(); - var22 = var3.readUnsignedIntLE(); - var78 = (InterfaceParent)interfaceParents.get((long)var22); - if (var78 != null) { - ArchiveDisk.closeInterface(var78, var20 != var78.group); + var84 = var3.readStringCp1252NullTerminated(); + if (var21 >= 1 && var21 <= 8) { + if (var84.equalsIgnoreCase("null")) { + var84 = null; + } + + playerMenuActions[var21 - 1] = var84; + playerOptionsPriorities[var21 - 1] = var5 == 0; } - ClanChannel.ifOpenSub(var22, var20, var5); var1.serverPacket = null; return true; } - if (ServerPacket.NPC_HEADICON_SPECIFIC == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); + if (ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM == var1.serverPacket) { + class12.friendSystem.method409(); + field524 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPLAYERMODEL_BODYTYPE == var1.serverPacket) { - SequenceDefinition.varclan = new class469(class53.Widget_cachedFonts); + if (ServerPacket.IF_SETANIM == var1.serverPacket) { + varclan = new class466(Players.Widget_cachedFonts); var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_JINGLE == var1.serverPacket) { - var20 = var3.readUnsignedIntIME(); - var79 = class33.widgetDefinition.method1740(var20); - - for (var22 = 0; var22 < var79.itemIds.length; ++var22) { - var79.itemIds[var22] = -1; - var79.itemIds[var22] = 0; - } - - ClanChannelMember.invalidateWidget(var79); + if (ServerPacket.VARCLAN_ENABLE == var1.serverPacket) { var1.serverPacket = null; return true; } - if (ServerPacket.SET_PLAYER_OP == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field401 = true; - class148.cameraLookAtX = var3.readUnsignedByte(); - BufferedNetSocket.cameraLookAtY = var3.readUnsignedByte(); - class161.cameraLookAtHeight = var3.readUnsignedShort(); - var20 = var3.readUnsignedShort(); + if (ServerPacket.UPDATE_REBOOT_TIMER == var1.serverPacket) { + var21 = var3.readUnsignedByte(); var5 = var3.readUnsignedByte(); - var22 = class148.cameraLookAtX * 128 + 64; - var7 = BufferedNetSocket.cameraLookAtY * 128 + 64; - var8 = class115.getTileHeight(var22, var7, class87.Client_plane) - class161.cameraLookAtHeight; - var24 = var22 - cameraX; - var10 = var8 - class17.cameraY; - var60 = var7 - WorldMapArea.cameraZ; - double var91 = Math.sqrt((double)(var60 * var60 + var24 * var24)); - var69 = class153.method800((int)(Math.atan2((double)var10, var91) * 325.9490051269531D) & 2047); - var15 = NPC.method597((int)(Math.atan2((double)var24, (double)var60) * -325.9490051269531D) & 2047); - field642 = new class493(class365.cameraPitch, var69, var20, var5); - field643 = new class493(WallDecoration.cameraYaw, var15, var20, var5); + var6 = var3.readUnsignedByte(); + var7 = var3.readUnsignedByte(); + cameraShaking[var21] = true; + cameraShakeIntensity[var21] = var5; + cameraMoveIntensity[var21] = var6; + cameraShakeSpeed[var21] = var7; + field589[var21] = 0; var1.serverPacket = null; return true; } - if (ServerPacket.LOGIN_SCREEN_PACKET == var1.serverPacket) { - var5 = var3.readUnsignedShortAddLE(); - var20 = var3.readIntME(); - ItemComposition.method1088(var20, var5); + Widget var93; + if (ServerPacket.UPDATE_UID192 == var1.serverPacket) { + var21 = var3.readUnsignedIntIME(); + var5 = var3.readInt(); + var6 = var3.readUnsignedShortLE(); + var7 = var3.readUnsignedShortAddLE(); + var93 = HealthBarDefinition.widgetDefinition.method1733(var5); + if (var21 != var93.modelAngleX || var6 != var93.modelAngleY || var7 != var93.modelZoom) { + var93.modelAngleX = var21; + var93.modelAngleY = var6; + var93.modelZoom = var7; + class159.invalidateWidget(var93); + } + var1.serverPacket = null; return true; } - if (ServerPacket.PLAYER_SPOTANIM_SPECIFIC == var1.serverPacket) { - class332.updateNpcs(false, var3); + if (ServerPacket.IF_SETNPCHEAD == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.field2620); var1.serverPacket = null; return true; } - if (ServerPacket.IF_OPENTOP == var1.serverPacket) { - var24 = var3.readUnsignedShortAddLE(); - var10 = var3.readUnsignedByteNeg(); - var22 = var3.method2628(); - var20 = var22 >> 16; - var5 = var22 >> 8 & 255; - var7 = var20 + (var22 >> 4 & 7); - var8 = var5 + (var22 & 7); - var60 = var3.readUnsignedShortAdd(); - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - var7 = var7 * 128 + 64; - var8 = var8 * 128 + 64; - GraphicsObject var12 = new GraphicsObject(var24, class87.Client_plane, var7, var8, class115.getTileHeight(var7, var8, class87.Client_plane) - var10, var60, cycle); - graphicsObjects.addFirst(var12); + if (ServerPacket.UPDATE_SITESETTINGS == var1.serverPacket) { + var21 = var3.readInt(); + if (var21 != field367) { + field367 = var21; + VerticalAlignment.method960(); } var1.serverPacket = null; return true; } - if (ServerPacket.VARCLAN_ENABLE == var1.serverPacket) { - var20 = var3.readUnsignedByte(); - class180.method934(var20); + if (ServerPacket.CLANSETTINGS_FULL == var1.serverPacket) { + class12.friendSystem.readUpdate(var3, var1.serverPacketLength); + field524 = cycleCntr; var1.serverPacket = null; return true; } - String var50; - if (ServerPacket.UPDATE_REBOOT_TIMER == var1.serverPacket) { - var50 = var3.readStringCp1252NullTerminated(); - Object[] var77 = new Object[var50.length() + 1]; - - for (var22 = var50.length() - 1; var22 >= 0; --var22) { - if (var50.charAt(var22) == 's') { - var77[var22 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var77[var22 + 1] = new Integer(var3.readInt()); - } + if (ServerPacket.MESSAGE_FRIENDCHANNEL == var1.serverPacket) { + var98 = var3.readUnsignedByte() == 1; + if (var98) { + class489.field3990 = SpotAnimationDefinition.method962() - var3.readLong(); + class6.grandExchangeEvents = new GrandExchangeEvents(var3, true); + } else { + class6.grandExchangeEvents = null; } - var77[0] = new Integer(var3.readInt()); - ScriptEvent var64 = new ScriptEvent(); - var64.args = var77; - Interpreter.runScriptEvent(var64); + field527 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.SET_MAP_FLAG == var1.serverPacket) { - field528 = cycleCntr; - var72 = var3.readByte(); - class162 var76 = new class162(var3); - ClanChannel var59; - if (var72 >= 0) { - var59 = currentClanChannels[var72]; - } else { - var59 = ClanChannelMember.guestClanChannel; - } - - if (var59 == null) { - this.method386(var72); - var1.serverPacket = null; - return true; + if (ServerPacket.REBUILD_REGION_NORMAL == var1.serverPacket) { + var21 = var3.readUnsignedShort(); + if (var21 == 65535) { + var21 = -1; } - if (var76.field1404 > var59.field1417) { - this.method386(var72); - var1.serverPacket = null; - return true; - } + rootInterface = var21; + this.method389(false); + class130.method713(var21); + class106.runWidgetOnLoadListener(rootInterface); - if (var76.field1404 < var59.field1417) { - var1.serverPacket = null; - return true; + for (var5 = 0; var5 < 100; ++var5) { + field407[var5] = true; } - var76.method851(var59); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETANGLE == var1.serverPacket) { - var20 = var3.readUnsignedShortAdd(); - if (var20 == 65535) { - var20 = -1; + if (ServerPacket.field2642 == var1.serverPacket) { + var21 = var3.readUnsignedShortAddLE(); + var6 = var3.readUnsignedByteNeg(); + var5 = var3.readUnsignedShortLE(); + if (var5 == 65535) { + var5 = -1; } - rootInterface = var20; - this.method382(false); - class357.method1901(var20); - VerticalAlignment.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field408[var5] = true; + NPC var77 = npcs[var21]; + if (var77 != null) { + if (var5 == var77.sequence && var5 != -1) { + var8 = DynamicObject.SequenceDefinition_get(var5).replyMode; + if (var8 == 1) { + var77.sequenceFrame = 0; + var77.sequenceFrameCycle = 0; + var77.sequenceDelay = var6; + var77.currentSequenceFrameIndex = 0; + } else if (var8 == 2) { + var77.currentSequenceFrameIndex = 0; + } + } else if (var5 == -1 || var77.sequence == -1 || DynamicObject.SequenceDefinition_get(var5).forcedPriority >= DynamicObject.SequenceDefinition_get(var77.sequence).forcedPriority) { + var77.sequence = var5; + var77.sequenceFrame = 0; + var77.sequenceFrameCycle = 0; + var77.sequenceDelay = var6; + var77.currentSequenceFrameIndex = 0; + var77.field1029 = var77.pathLength; + } } var1.serverPacket = null; return true; } - boolean var32; - if (ServerPacket.UPDATE_IGNORELIST == var1.serverPacket) { - var50 = var3.readStringCp1252NullTerminated(); - var25 = (long)var3.readUnsignedShort(); - var27 = (long)var3.readMedium(); - PlayerType var9 = (PlayerType)SequenceDefinition.findEnumerated(class183.PlayerType_values(), var3.readUnsignedByte()); - long var36 = var27 + (var25 << 32); - var32 = false; - - for (var68 = 0; var68 < 100; ++var68) { - if (var36 == crossWorldMessageIds[var68]) { - var32 = true; - break; + if (ServerPacket.NEW_PACKET_CAM_RESET_V2 == var1.serverPacket) { + for (var21 = 0; var21 < players.length; ++var21) { + if (players[var21] != null) { + players[var21].sequence = -1; } } - if (InvDefinition.friendSystem.isIgnored(new Username(var50, class166.loginType))) { - var32 = true; - } - - if (!var32 && field481 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var36; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var31 = AbstractFont.escapeBrackets(HealthBarUpdate.method523(class172.readString(var3))); - byte var70; - if (var9.isPrivileged) { - var70 = 7; - } else { - var70 = 3; - } - - if (var9.modIcon != -1) { - class411.addGameMessage(var70, class436.addImageTag(var9.modIcon) + var50, var31); - } else { - class411.addGameMessage(var70, var50, var31); + for (var21 = 0; var21 < npcs.length; ++var21) { + if (npcs[var21] != null) { + npcs[var21].sequence = -1; } } @@ -4486,1019 +4391,1036 @@ final boolean method378(PacketWriter var1) { return true; } - if (ServerPacket.HINT_ARROW == var1.serverPacket) { - var20 = var3.readShort(); - var5 = var3.readUnsignedIntLE(); - var22 = var3.method2625(); - var23 = class33.widgetDefinition.method1740(var5); - if (var20 != var23.rawX || var22 != var23.rawY || var23.xAlignment != 0 || var23.yAlignment != 0) { - var23.rawX = var20; - var23.rawY = var22; - var23.xAlignment = 0; - var23.yAlignment = 0; - ClanChannelMember.invalidateWidget(var23); - this.alignWidget(var23); - if (var23.type == 0) { - PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var5 >> 16], var23, false); - } - } + if (ServerPacket.field2753 == var1.serverPacket) { + class90.updateNpcs(false, var3); + var1.serverPacket = null; + return true; + } + if (ServerPacket.field2713 == var1.serverPacket) { + class13.method51(); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.OBJ_ADD == var1.serverPacket) { + class396.method2042(); + weight = var3.readShort(); + field522 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_FRIENDCHANNEL == var1.serverPacket) { - var20 = var3.readInt(); - var5 = var3.readUnsignedByteSub(); - var22 = var3.readUnsignedByte(); - var23 = class33.widgetDefinition.method1740(var20); - UrlRequest.method664(var23, var22, var5); - ClanChannelMember.invalidateWidget(var23); + if (ServerPacket.PLAYER_INFO == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.LOC_DEL); var1.serverPacket = null; return true; } - if (ServerPacket.NEW_PACK_215 == var1.serverPacket) { - var20 = var3.readUnsignedShortAdd(); - var5 = var3.readInt(); - var22 = var20 >> 10 & 31; - var7 = var20 >> 5 & 31; - var8 = var20 & 31; - var24 = (var7 << 11) + (var22 << 19) + (var8 << 3); - Widget var97 = class33.widgetDefinition.method1740(var5); - if (var24 != var97.color) { - var97.color = var24; - ClanChannelMember.invalidateWidget(var97); + if (ServerPacket.REBUILD_REGION == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field402 = false; + ScriptFrame.cameraLookAtX = var3.readUnsignedByte(); + class216.cameraLookAtY = var3.readUnsignedByte(); + class127.cameraLookAtHeight = var3.readUnsignedShort(); + WorldMapIcon_0.cameraMoveToSpeed = var3.readUnsignedByte(); + class1.cameraLookAtAcceleration = var3.readUnsignedByte(); + if (class1.cameraLookAtAcceleration >= 100) { + ViewportMouse.cameraX = ScriptFrame.cameraLookAtX * 128 + 64; + class36.cameraZ = class216.cameraLookAtY * 128 + 64; + SecureRandomFuture.cameraY = WorldMapDecorationType.getTileHeight(ViewportMouse.cameraX, class36.cameraZ, ItemLayer.Client_plane) - class127.cameraLookAtHeight; } var1.serverPacket = null; return true; } - if (ServerPacket.field2683 == var1.serverPacket) { - var20 = var3.readIntME(); - byte var71 = var3.readByte(); - Varps.Varps_temp[var20] = var71; - if (Varps.Varps_main[var20] != var71) { - Varps.Varps_main[var20] = var71; + if (ServerPacket.SPOTANIM_SPECIFIC == var1.serverPacket) { + return this.method384(var1); + } + + if (ServerPacket.field2736 == var1.serverPacket) { + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { + destinationY = 0; } - ScriptEvent.changeGameOptions(var20); - changedVarps[++changedVarpCount - 1 & 31] = var20; var1.serverPacket = null; return true; } - boolean var61; - if (ServerPacket.NEW_PACKET_CAM_RESET_V2 == var1.serverPacket) { - var20 = var3.readUnsignedIntIME(); - var61 = var3.readUnsignedByte() == 1; - var6 = class33.widgetDefinition.method1740(var20); - Strings.method1908(var6, TextureProvider.localPlayer.appearance, var61); - ClanChannelMember.invalidateWidget(var6); + if (ServerPacket.field2694 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + class336.method1741(var3, var3.offset - 28); + } + var1.serverPacket = null; return true; } - if (ServerPacket.field2720 == var1.serverPacket) { - var20 = var3.readUnsignedShortAdd(); - if (var20 == 65535) { - var20 = -1; + long var36; + if (ServerPacket.field2673 == var1.serverPacket) { + var76 = var3.readByte(); + var27 = (long)var3.readUnsignedShort(); + var29 = (long)var3.readMedium(); + var36 = (var27 << 32) + var29; + var62 = false; + ClanChannel var96 = var76 >= 0 ? currentClanChannels[var76] : ItemContainer.guestClanChannel; + if (var96 == null) { + var62 = true; + } else { + for (var65 = 0; var65 < 100; ++var65) { + if (var36 == field615[var65]) { + var62 = true; + break; + } + } } - var24 = var3.readUnsignedShort(); - var7 = var3.readUnsignedShortAdd(); - var8 = var3.readUnsignedShortAddLE(); - var22 = var3.readUnsignedShortAdd(); - var5 = var3.readUnsignedShortAddLE(); - if (var5 == 65535) { - var5 = -1; + if (!var62) { + field615[field533] = var36; + field533 = (field533 + 1) % 100; + var34 = class128.readString(var3); + var26 = var76 >= 0 ? 43 : 46; + ArchiveLoader.addChatMessage(var26, "", var34, var96.name); } - ArrayList var95 = new ArrayList(); - var95.add(var20); - var95.add(var5); - class202.method1006(var95, var22, var7, var8, var24); var1.serverPacket = null; return true; } - if (ServerPacket.field2714 == var1.serverPacket) { - return this.method377(var1); - } + if (ServerPacket.UPDATE_INV_FULL == var1.serverPacket) { + var8 = var3.readUnsignedShortAddLE(); + var5 = var3.readUnsignedShortLE(); + var7 = var3.readUnsignedIntIME(); + var6 = var3.readUnsignedShortLE(); + var21 = var3.readUnsignedShortAddLE(); + if (var21 == 65535) { + var21 = -1; + } - if (ServerPacket.OBJ_ADD == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.OBJ_ADD); + ArrayList var31 = new ArrayList(); + var31.add(var21); + class135.method734(var31, var5, var6, var7, var8); var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SONG_STOP == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.LOC_DEL); + if (ServerPacket.OBJ_DEL_LEGACY == var1.serverPacket) { + var21 = var3.readIntIME(); + var20 = var3.readStringCp1252NullTerminated(); + var25 = HealthBarDefinition.widgetDefinition.method1733(var21); + if (!var20.equals(var25.text)) { + var25.text = var20; + class159.invalidateWidget(var25); + } + var1.serverPacket = null; return true; } - if (ServerPacket.REBUILD_REGION == var1.serverPacket) { - SequenceDefinition.varclan = null; + if (ServerPacket.field2757 == var1.serverPacket) { + var5 = var3.readUnsignedShort(); + var7 = var3.readUnsignedIntIME(); + var21 = var3.readUnsignedShortLE(); + var6 = var3.readUnsignedShortAddLE(); + class191.someMusicMethod(var21, var5, var6, var7); var1.serverPacket = null; return true; } - if (ServerPacket.SPOTANIM_SPECIFIC == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.field2624); + if (ServerPacket.field2745 == var1.serverPacket) { + class12.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + DelayFadeTask.FriendSystem_invalidateIgnoreds(); + field524 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.REFLECTION_CHECK == var1.serverPacket) { - var20 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var22 = var3.readUnsignedShort(); - GraphicsDefaults.queueSoundEffect(var20, var5, var22); + if (ServerPacket.MESSAGE_PRIVATE == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.field2618); var1.serverPacket = null; return true; } - long var34; - if (ServerPacket.VARP_SMALL == var1.serverPacket) { - var20 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - var22 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.method382(false); - class357.method1901(rootInterface); - VerticalAlignment.runWidgetOnLoadListener(rootInterface); + String var40; + if (ServerPacket.PREFETCH_GAMEOBJECTS == var1.serverPacket) { + var52 = var3.readStringCp1252NullTerminated(); + var27 = var3.readLong(); + var29 = (long)var3.readUnsignedShort(); + var36 = (long)var3.readMedium(); + PlayerType var97 = (PlayerType)class12.findEnumerated(class320.PlayerType_values(), var3.readUnsignedByte()); + var63 = (var29 << 32) + var36; + boolean var85 = false; - for (var7 = 0; var7 < 100; ++var7) { - field408[var7] = true; + for (var15 = 0; var15 < 100; ++var15) { + if (field615[var15] == var63) { + var85 = true; + break; } } - InterfaceParent var93; - for (; var22-- > 0; var93.field858 = true) { - var7 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var24 = var3.readUnsignedByte(); - var93 = (InterfaceParent)interfaceParents.get((long)var7); - if (var93 != null && var8 != var93.group) { - ArchiveDisk.closeInterface(var93, true); - var93 = null; - } - - if (var93 == null) { - var93 = ClanChannel.ifOpenSub(var7, var8, var24); - } + if (var97.isUser && class12.friendSystem.isIgnored(new Username(var52, class89.loginType))) { + var85 = true; } - for (var78 = (InterfaceParent)interfaceParents.first(); var78 != null; var78 = (InterfaceParent)interfaceParents.next()) { - if (var78.field858) { - var78.field858 = false; + if (!var85 && field479 == 0) { + field615[field533] = var63; + field533 = (field533 + 1) % 100; + var40 = AbstractFont.escapeBrackets(class20.method77(class128.readString(var3))); + if (var97.modIcon != -1) { + ArchiveLoader.addChatMessage(9, FloorUnderlayDefinition.addImageTag(var97.modIcon) + var52, var40, HitSplatDefinition.base37DecodeLong(var27)); } else { - ArchiveDisk.closeInterface(var78, true); + ArchiveLoader.addChatMessage(9, var52, var40, HitSplatDefinition.base37DecodeLong(var27)); } } - widgetFlags = new NodeHashTable(512); + var1.serverPacket = null; + return true; + } - while (var3.offset < var20) { - var7 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var24 = var3.readUnsignedShort(); - var10 = var3.readInt(); + if (ServerPacket.IF_OPENTOP == var1.serverPacket) { + var52 = var3.readStringCp1252NullTerminated(); + Object[] var73 = new Object[var52.length() + 1]; - for (var60 = var8; var60 <= var24; ++var60) { - var34 = ((long)var7 << 32) + (long)var60; - widgetFlags.put(new IntegerNode(var10), var34); + for (var6 = var52.length() - 1; var6 >= 0; --var6) { + if (var52.charAt(var6) == 's') { + var73[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var73[var6 + 1] = new Integer(var3.readInt()); } } + var73[0] = new Integer(var3.readInt()); + ScriptEvent var89 = new ScriptEvent(); + var89.args = var73; + class157.runScriptEvent(var89); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_INV_CLEAR == var1.serverPacket) { - Tiles.updatePlayers(var3, var1.serverPacketLength); - SecureRandomCallable.method458(); + if (ServerPacket.field2722 == var1.serverPacket) { + var21 = var3.readUnsignedByte(); + WorldMapIcon_1.method1194(var21); var1.serverPacket = null; return true; } - boolean var74; - if (ServerPacket.UPDATE_INV_FULL == var1.serverPacket) { - var74 = var3.readUnsignedByte() == 1; - if (var74) { - class411.field3712 = GrandExchangeOfferTotalQuantityComparator.method1971() - var3.readLong(); - Varps.grandExchangeEvents = new GrandExchangeEvents(var3, true); - } else { - Varps.grandExchangeEvents = null; + if (ServerPacket.VARCLAN_DISABLE == var1.serverPacket) { + if (rootInterface != -1) { + class514.runIntfCloseListener(rootInterface, 0); } - field526 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.MIDI_SONG_LEGACY == var1.serverPacket) { - Clock.field1484 = var3.readUnsignedByte(); - class354.field3144 = var3.readUnsignedByte(); + if (ServerPacket.OBJ_COUNT == var1.serverPacket && isCameraLocked) { + field400 = true; + field404 = false; + field402 = false; + + for (var21 = 0; var21 < 5; ++var21) { + cameraShaking[var21] = false; + } + var1.serverPacket = null; return true; } - if (ServerPacket.TRADING_POST_RESULTS == var1.serverPacket) { - var20 = var3.readInt(); + if (ServerPacket.field2740 == var1.serverPacket) { + var21 = var3.readUnsignedShortLE(); var5 = var3.readInt(); - var6 = class33.widgetDefinition.method1740(var5); - ZoneOperation.method1645(var6, var20); - ClanChannelMember.invalidateWidget(var6); + var6 = var21 >> 10 & 31; + var7 = var21 >> 5 & 31; + var8 = var21 & 31; + var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); + Widget var58 = HealthBarDefinition.widgetDefinition.method1733(var5); + if (var9 != var58.color) { + var58.color = var9; + class159.invalidateWidget(var58); + } + var1.serverPacket = null; return true; } - if (ServerPacket.VARP_LARGE == var1.serverPacket) { - var24 = var3.readUnsignedByteNeg(); - var10 = var24 >> 2; - var60 = var24 & 3; - var87 = field652[var10]; - var22 = var3.method2627(); - var20 = var22 >> 16; - var5 = var22 >> 8 & 255; - var7 = var20 + (var22 >> 4 & 7); - var8 = var5 + (var22 & 7); - var68 = var3.readUnsignedShortAddLE(); - if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { - if (var87 == 0) { - BoundaryObject var100 = class10.scene.method1299(class87.Client_plane, var7, var8); - if (var100 != null) { - var15 = SecureRandomFuture.Entity_unpackID(var100.tag); - if (var10 == 2) { - var100.renderable1 = new DynamicObject(var15, 2, var60 + 4, class87.Client_plane, var7, var8, var68, false, var100.renderable1); - var100.renderable2 = new DynamicObject(var15, 2, var60 + 1 & 3, class87.Client_plane, var7, var8, var68, false, var100.renderable2); - } else { - var100.renderable1 = new DynamicObject(var15, var10, var60, class87.Client_plane, var7, var8, var68, false, var100.renderable1); - } - } - } else if (var87 == 1) { - WallDecoration var98 = class10.scene.method1300(class87.Client_plane, var7, var8); - if (var98 != null) { - var15 = SecureRandomFuture.Entity_unpackID(var98.tag); - if (var10 != 4 && var10 != 5) { - if (var10 == 6) { - var98.renderable1 = new DynamicObject(var15, 4, var60 + 4, class87.Client_plane, var7, var8, var68, false, var98.renderable1); - } else if (var10 == 7) { - var98.renderable1 = new DynamicObject(var15, 4, (var60 + 2 & 3) + 4, class87.Client_plane, var7, var8, var68, false, var98.renderable1); - } else if (var10 == 8) { - var98.renderable1 = new DynamicObject(var15, 4, var60 + 4, class87.Client_plane, var7, var8, var68, false, var98.renderable1); - var98.renderable2 = new DynamicObject(var15, 4, (var60 + 2 & 3) + 4, class87.Client_plane, var7, var8, var68, false, var98.renderable2); - } - } else { - var98.renderable1 = new DynamicObject(var15, 4, var60, class87.Client_plane, var7, var8, var68, false, var98.renderable1); - } - } - } else if (var87 == 2) { - GameObject var94 = class10.scene.getGameObject(class87.Client_plane, var7, var8); - if (var10 == 11) { - var10 = 10; - } - - if (var94 != null) { - var94.renderable = new DynamicObject(SecureRandomFuture.Entity_unpackID(var94.tag), var10, var60, class87.Client_plane, var7, var8, var68, false, var94.renderable); - } - } else if (var87 == 3) { - FloorDecoration var96 = class10.scene.getFloorDecoration(class87.Client_plane, var7, var8); - if (var96 != null) { - var96.renderable = new DynamicObject(SecureRandomFuture.Entity_unpackID(var96.tag), 22, var60, class87.Client_plane, var7, var8, var68, false, var96.renderable); - } - } + NPC var94; + if (ServerPacket.UPDATE_INV_STOP_TRANSMIT == var1.serverPacket) { + var21 = var3.readUnsignedShortAddLE(); + var94 = npcs[var21]; + var6 = var3.readUnsignedShortAddLE(); + var5 = var3.readIntIME(); + var7 = var3.readUnsignedShortAdd(); + if (var94 != null) { + var94.updateSpotAnimation(var7, var6, var5 >> 16, var5 & 65535); } var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETNPCHEAD == var1.serverPacket) { - var5 = var3.readIntME(); - var7 = var3.readUnsignedByteNeg(); - var20 = var3.readUnsignedShortAdd(); - Player var90; - if (var20 == localPlayerIndex) { - var90 = TextureProvider.localPlayer; - } else { - var90 = players[var20]; - } + if (ServerPacket.MESSAGE_CLANCHANNEL == var1.serverPacket) { + field525 = cycleCntr; + var76 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var76 >= 0) { + currentClanChannels[var76] = null; + } else { + ItemContainer.guestClanChannel = null; + } - var22 = var3.readInt(); - if (var90 != null) { - var90.updateSpotAnimation(var7, var5, var22 >> 16, var22 & 65535); + var1.serverPacket = null; + return true; } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.PREFETCH_GAMEOBJECTS == var1.serverPacket) { - var20 = var3.readInt(); - var61 = var3.readUnsignedByte() == 1; - var6 = class33.widgetDefinition.method1740(var20); - if (var61 != var6.isHidden) { - var6.isHidden = var61; - ClanChannelMember.invalidateWidget(var6); + if (var76 >= 0) { + currentClanChannels[var76] = new ClanChannel(var3); + } else { + ItemContainer.guestClanChannel = new ClanChannel(var3); } var1.serverPacket = null; return true; } - if (ServerPacket.IF1_MODELROTATE == var1.serverPacket) { - var20 = var3.readUnsignedShortAdd(); - var5 = var3.readUnsignedShort(); - var22 = var3.readUnsignedShortAddLE(); + if (ServerPacket.RESET_ANIMS == var1.serverPacket) { + var21 = var3.readUnsignedIntME(); + var5 = var3.readUnsignedShortLE(); + short var60 = (short)var3.readShort(); var7 = var3.readUnsignedShortAdd(); - class206.someMusicMethod(var20, var5, var22, var7); - var1.serverPacket = null; - return true; - } + var94 = npcs[var5]; + if (var94 != null) { + var94.method586(var7, var21, var60); + } - if (ServerPacket.UPDATE_SITESETTINGS == var1.serverPacket) { - rebootTimer = var3.readIntME() * 30; - field527 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.VARCLAN_DISABLE == var1.serverPacket) { - var20 = var3.readUnsignedIntLE(); - var5 = var3.readUnsignedShortAddLE(); - var6 = class33.widgetDefinition.method1740(var20); - if (var6 != null && var6.type == 0) { - if (var5 > var6.scrollHeight - var6.height) { - var5 = var6.scrollHeight - var6.height; - } - - if (var5 < 0) { - var5 = 0; - } + if (ServerPacket.CAM_SHAKE == var1.serverPacket) { + class18.field55 = var3.readUnsignedByteNeg(); + class6.field6 = var3.readUnsignedByteSub(); - if (var5 != var6.scrollY) { - var6.scrollY = var5; - ClanChannelMember.invalidateWidget(var6); - } + while (var3.offset < var1.serverPacketLength) { + var21 = var3.readUnsignedByte(); + ZoneOperation var72 = class520.method2524()[var21]; + class106.processZoneOperation(var72); } var1.serverPacket = null; return true; } - if (ServerPacket.NPC_SPOTANIM_SPECIFIC == var1.serverPacket) { - var20 = var3.readUnsignedIntLE(); - var5 = var3.readUnsignedShortAddLE(); - if (var5 == 65535) { - var5 = -1; + if (ServerPacket.RESET_CLIENT_VARCACHE == var1.serverPacket) { + field525 = cycleCntr; + var76 = var3.readByte(); + class161 var71 = new class161(var3); + ClanChannel var88; + if (var76 >= 0) { + var88 = currentClanChannels[var76]; + } else { + var88 = ItemContainer.guestClanChannel; } - var22 = var3.readUnsignedShort(); - if (var22 == 65535) { - var22 = -1; + if (var88 == null) { + this.method394(var76); + var1.serverPacket = null; + return true; } - var7 = var3.readUnsignedIntIME(); - - for (var8 = var22; var8 <= var5; ++var8) { - var29 = ((long)var7 << 32) + (long)var8; - Node var99 = widgetFlags.get(var29); - if (var99 != null) { - var99.remove(); - } + if (var71.field1409 > var88.field1421) { + this.method394(var76); + var1.serverPacket = null; + return true; + } - widgetFlags.put(new IntegerNode(var20), var29); + if (var71.field1409 < var88.field1421) { + var1.serverPacket = null; + return true; } + var71.method844(var88); var1.serverPacket = null; return true; } - if (ServerPacket.field2652 == var1.serverPacket) { - var20 = var3.readIntME(); - if (var20 == 65535) { - var20 = -1; - } - - MusicPatch.playSong(var20); + if (ServerPacket.field2709 == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.OBJ_DEL); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_INV_STOP_TRANSMIT == var1.serverPacket) { - var20 = var3.readUnsignedShortAdd(); - if (var20 == 65535) { - var20 = -1; - } - - var5 = var3.method2627(); - class437.playJingle(var20, var5); + if (ServerPacket.IF_CLOSESUB == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.field2616); var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_CLANCHANNEL == var1.serverPacket) { - World var53 = new World(); - var53.host = var3.readStringCp1252NullTerminated(); - var53.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var53.properties = var5; - if (var53.isDeadman()) { - var53.field680 = "beta"; - } - - DefaultsGroup.updateGameState(45); - var2.close(); - var2 = null; - Language.changeWorld(var53); - var1.serverPacket = null; - return false; - } + if (ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT == var1.serverPacket) { + class396.method2042(); + var21 = var3.readUnsignedByteSub(); + var5 = var3.readIntME(); + var6 = var3.readUnsignedByte(); + experience[var21] = var5; + currentLevels[var21] = var6; + levels[var21] = 1; + field564[var21] = var6; - NPC var89; - if (ServerPacket.RESET_ANIMS == var1.serverPacket) { - var20 = var3.readUnsignedShortAdd(); - short var66 = (short)var3.readShortLE(); - var22 = var3.readUnsignedIntLE(); - var7 = var3.readUnsignedByteNeg(); - var89 = npcs[var20]; - if (var89 != null) { - var89.method589(var7, var22, var66); + for (var7 = 0; var7 < 98; ++var7) { + if (var5 >= Skills.Skills_experienceTable[var7]) { + levels[var21] = var7 + 2; + } } + changedSkills[++changedSkillsCount - 1 & 31] = var21; var1.serverPacket = null; return true; } - if (ServerPacket.CAM_SHAKE == var1.serverPacket) { - var50 = var3.readStringCp1252NullTerminated(); - var5 = var3.readUnsignedByte(); - var22 = var3.readUnsignedByteNeg(); - if (var5 >= 1 && var5 <= 8) { - if (var50.equalsIgnoreCase("null")) { - var50 = null; - } - - playerMenuActions[var5 - 1] = var50; - playerOptionsPriorities[var5 - 1] = var22 == 0; - } - + if (ServerPacket.LOC_ANIM_SPECIFIC == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.field2625); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_RUNWEIGHT == var1.serverPacket) { - var5 = var3.readUnsignedIntLE(); - var22 = var3.readIntME(); - var7 = var3.readUnsignedByte(); - var20 = var3.readUnsignedShort(); - var89 = npcs[var20]; - if (var89 != null) { - var89.updateSpotAnimation(var7, var22, var5 >> 16, var5 & 65535); - } - + if (ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS == var1.serverPacket) { + class410.method2140(var3.readStringCp1252NullTerminated()); var1.serverPacket = null; return true; } - if (ServerPacket.SYNC_CLIENT_VARCACHE == var1.serverPacket) { - for (var20 = 0; var20 < players.length; ++var20) { - if (players[var20] != null) { - players[var20].sequence = -1; - } - } - - for (var20 = 0; var20 < npcs.length; ++var20) { - if (npcs[var20] != null) { - npcs[var20].sequence = -1; - } + boolean var55; + if (ServerPacket.field2697 == var1.serverPacket) { + var21 = var3.readIntME(); + var55 = var3.readUnsignedByte() == 1; + var25 = HealthBarDefinition.widgetDefinition.method1733(var21); + if (var55 != var25.isHidden) { + var25.isHidden = var55; + class159.invalidateWidget(var25); } var1.serverPacket = null; return true; } - if (ServerPacket.IF_CLOSESUB == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { - destinationY = 0; - } - + if (ServerPacket.field2655 == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.PREFETCH_GAMEOBJECTS); var1.serverPacket = null; return true; } - if (ServerPacket.REBUILD_REGION_NORMAL == var1.serverPacket) { - if (SequenceDefinition.varclan == null) { - SequenceDefinition.varclan = new class469(class53.Widget_cachedFonts); - } - - class538 var52 = class53.Widget_cachedFonts.method2361(var3); - SequenceDefinition.varclan.field3931.vmethod8143(var52.field4243, var52.field4242); - field571[++field512 - 1 & 31] = var52.field4243; + if (ServerPacket.UPDATE_RUNENERGY == var1.serverPacket) { + class18.field55 = var3.readUnsignedShortAdd(); + class6.field6 = var3.readUnsignedByteSub(); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPOSITION == var1.serverPacket) { - var20 = var3.readUShortSmart(); - var61 = var3.readUnsignedByte() == 1; - var55 = ""; - boolean var58 = false; - if (var61) { - var55 = var3.readStringCp1252NullTerminated(); - if (InvDefinition.friendSystem.isIgnored(new Username(var55, class166.loginType))) { - var58 = true; + if (ServerPacket.CAM_RESET == var1.serverPacket) { + for (var21 = 0; var21 < VarpDefinition.field1443; ++var21) { + VarpDefinition var70 = FloorOverlayDefinition.VarpDefinition_get(var21); + if (var70 != null) { + Varps.Varps_temp[var21] = 0; + Varps.Varps_main[var21] = 0; } } - String var88 = var3.readStringCp1252NullTerminated(); - if (!var58) { - class411.addGameMessage(var20, var55, var88); - } - + class396.method2042(); + changedVarpCount += 32; var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS == var1.serverPacket) { - Clock.field1484 = var3.readUnsignedByte(); - class354.field3144 = var3.readUnsignedByteSub(); - - while (var3.offset < var1.serverPacketLength) { - var20 = var3.readUnsignedByte(); - ZoneOperation var75 = JSException.method2055()[var20]; - UrlRequest.processZoneOperation(var75); - } - + if (ServerPacket.IF_SETOBJECT == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.AREA_SOUND); var1.serverPacket = null; return true; } - if (ServerPacket.PLAYER_INFO == var1.serverPacket) { - var20 = var3.readInt(); + if (ServerPacket.MESSAGE_PRIVATE_ECHO == var1.serverPacket) { + var21 = var3.readInt(); var5 = var3.readUnsignedShort(); - if (var20 < -70000) { + if (var21 < -70000) { var5 += 32768; } - if (var20 >= 0) { - var6 = class33.widgetDefinition.method1740(var20); + if (var21 >= 0) { + var25 = HealthBarDefinition.widgetDefinition.method1733(var21); } else { - var6 = null; + var25 = null; } - for (; var3.offset < var1.serverPacketLength; SecureRandomFuture.itemContainerSetItem(var5, var7, var8 - 1, var24)) { + for (; var3.offset < var1.serverPacketLength; class185.itemContainerSetItem(var5, var7, var8 - 1, var9)) { var7 = var3.readUShortSmart(); var8 = var3.readUnsignedShort(); - var24 = 0; + var9 = 0; if (var8 != 0) { - var24 = var3.readUnsignedByte(); - if (var24 == 255) { - var24 = var3.readInt(); + var9 = var3.readUnsignedByte(); + if (var9 == 255) { + var9 = var3.readInt(); } } - if (var6 != null && var7 >= 0 && var7 < var6.itemIds.length) { - var6.itemIds[var7] = var8; - var6.field3079[var7] = var24; + if (var25 != null && var7 >= 0 && var7 < var25.itemIds.length) { + var25.itemIds[var7] = var8; + var25.field3077[var7] = var9; } } - if (var6 != null) { - ClanChannelMember.invalidateWidget(var6); + if (var25 != null) { + class159.invalidateWidget(var25); } - class304.method1636(); + class396.method2042(); changedItemContainers[++changedItemContainersCount - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.CLANSETTINGS_FULL == var1.serverPacket) { - InvDefinition.friendSystem.method401(); - field511 = cycleCntr; + if (ServerPacket.PLAYER_ANIM_SPECIFIC == var1.serverPacket) { + World var51 = new World(); + var51.host = var3.readStringCp1252NullTerminated(); + var51.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var51.properties = var5; + if (var51.isDeadman()) { + var51.field679 = "beta"; + } + + WorldMapSection2.updateGameState(45); + var2.close(); + var2 = null; + class28.changeWorld(var51); var1.serverPacket = null; - return true; + return false; } - if (ServerPacket.UPDATE_RUNENERGY == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.AREA_SOUND); + if (ServerPacket.IF_SETTEXT == var1.serverPacket) { + var21 = var3.readUnsignedIntME(); + var5 = var3.readIntIME(); + InterfaceParent var86 = (InterfaceParent)interfaceParents.get((long)var5); + var75 = (InterfaceParent)interfaceParents.get((long)var21); + if (var75 != null) { + class302.closeInterface(var75, var86 == null || var86.group != var75.group); + } + + if (var86 != null) { + var86.remove(); + interfaceParents.put(var86, (long)var21); + } + + var93 = HealthBarDefinition.widgetDefinition.method1733(var5); + if (var93 != null) { + class159.invalidateWidget(var93); + } + + var93 = HealthBarDefinition.widgetDefinition.method1733(var21); + if (var93 != null) { + class159.invalidateWidget(var93); + class132.revalidateWidgetScroll(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var93.id >>> 16], var93, true); + } + + if (rootInterface != -1) { + class514.runIntfCloseListener(rootInterface, 1); + } + var1.serverPacket = null; return true; } - if (ServerPacket.TRADING_POST_UPDATE == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - NPC.method598(var3, var3.offset - 28); + if (ServerPacket.IF_SETPLAYERMODEL_OBJ == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field402 = true; + ScriptFrame.cameraLookAtX = var3.readUnsignedByte(); + class216.cameraLookAtY = var3.readUnsignedByte(); + var21 = var3.readUnsignedShort(); + var5 = var3.readUnsignedShort(); + field403 = var3.readBoolean(); + var6 = var3.readUnsignedByte(); + var7 = ScriptFrame.cameraLookAtX * 128 + 64; + var8 = class216.cameraLookAtY * 128 + 64; + boolean var61 = false; + boolean var83 = false; + if (field403) { + var9 = SecureRandomFuture.cameraY; + var23 = WorldMapDecorationType.getTileHeight(var7, var8, ItemLayer.Client_plane) - var21; + } else { + var9 = WorldMapDecorationType.getTileHeight(ViewportMouse.cameraX, class36.cameraZ, ItemLayer.Client_plane) - SecureRandomFuture.cameraY; + var23 = var21; } + field644 = new class489(ViewportMouse.cameraX, class36.cameraZ, var9, var7, var8, var23, var5, var6); var1.serverPacket = null; return true; } - if (ServerPacket.IF_OPENSUB == var1.serverPacket) { - var20 = var3.readInt(); - var5 = var3.readUnsignedShortAdd(); - var6 = class33.widgetDefinition.method1740(var20); - if (var6.modelType != 2 || var5 != var6.modelId) { - var6.modelType = 2; - var6.modelId = var5; - ClanChannelMember.invalidateWidget(var6); + if (ServerPacket.TRIGGER_ONDIALOGABORT == var1.serverPacket) { + var9 = var3.readUnsignedShortLE(); + var8 = var3.readUnsignedShortAddLE(); + var21 = var3.readUnsignedShortAddLE(); + if (var21 == 65535) { + var21 = -1; + } + + var7 = var3.readUnsignedShortLE(); + var6 = var3.readUnsignedShortLE(); + var5 = var3.readUnsignedShortLE(); + if (var5 == 65535) { + var5 = -1; } + ArrayList var56 = new ArrayList(); + var56.add(var21); + var56.add(var5); + class135.method734(var56, var6, var7, var8, var9); var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_PRIVATE_ECHO == var1.serverPacket) { - var20 = var3.readUnsignedIntME(); - var5 = var3.readIntME(); - var22 = var3.readUnsignedShort(); - var23 = class33.widgetDefinition.method1740(var20); - var23.rotationKey = var5 + (var22 << 16); + if (ServerPacket.MIDI_SWAP == var1.serverPacket) { + GrandExchangeOfferUnitPriceComparator.loadRegions(true, var1.packetBuffer, false); var1.serverPacket = null; return true; } - if (ServerPacket.PLAYER_ANIM_SPECIFIC == var1.serverPacket) { - var20 = var3.readInt(); - if (var20 != field366) { - field366 = var20; - class174.method917(); + if (ServerPacket.SYNC_CLIENT_VARCACHE == var1.serverPacket) { + var11 = var3.method2610(); + var26 = var3.readUnsignedByteNeg() * 4; + var24 = var3.readUnsignedShortAddLE(); + var6 = var3.method2606(); + var21 = var6 >> 16; + var5 = var6 >> 8 & 255; + var7 = var21 + (var6 >> 4 & 7); + var8 = var5 + (var6 & 7); + var15 = var3.readUnsignedShortLE(); + var57 = var3.readByte(); + var18 = var3.readUnsignedByteSub(); + var16 = var3.readUnsignedIntIME(); + var17 = var3.readUnsignedShortAdd(); + var81 = var3.readByteAdd(); + var65 = var3.readUnsignedByte() * 4; + var9 = var57 + var7; + var23 = var81 + var8; + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var9 >= 0 && var23 >= 0 && var9 < 104 && var23 < 104 && var24 != 65535) { + var7 = var7 * 128 + 64; + var8 = var8 * 128 + 64; + var9 = var9 * 128 + 64; + var23 = var23 * 128 + 64; + var19 = new Projectile(var24, ItemLayer.Client_plane, var7, var8, WorldMapDecorationType.getTileHeight(var7, var8, ItemLayer.Client_plane) - var65, var15 + cycle, var16 + cycle, var17, var18, var11, var26); + var19.setDestination(var9, var23, WorldMapDecorationType.getTileHeight(var9, var23, ItemLayer.Client_plane) - var26, var15 + cycle); + projectiles.addFirst(var19); } var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETTEXT == var1.serverPacket) { - class357.readReflectionCheck(var3, var1.serverPacketLength); + if (ServerPacket.NPC_INFO_LARGE == var1.serverPacket) { + GrandExchangeOfferUnitPriceComparator.loadRegions(false, var1.packetBuffer, false); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETPLAYERMODEL_OBJ == var1.serverPacket) { - var20 = var3.readInt(); - InterfaceParent var73 = (InterfaceParent)interfaceParents.get((long)var20); - if (var73 != null) { - ArchiveDisk.closeInterface(var73, true); - } - - if (meslayerContinueWidget != null) { - ClanChannelMember.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - + if (ServerPacket.ENTER_FREECAM == var1.serverPacket) { + GrandExchangeOfferUnitPriceComparator.loadRegions(false, var1.packetBuffer, true); var1.serverPacket = null; return true; } - if (ServerPacket.CLANCHANNEL_DELTA == var1.serverPacket) { - var20 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var20 < -70000) { - var5 += 32768; - } - - if (var20 >= 0) { - var6 = class33.widgetDefinition.method1740(var20); - } else { - var6 = null; - } + if (ServerPacket.field2707 == var1.serverPacket) { + var5 = var3.readUnsignedShortAddLE(); + var21 = var3.readUnsignedShortLE(); + WorldMapManager.method1265(var21, var5); + var1.serverPacket = null; + return true; + } - if (var6 != null) { - for (var7 = 0; var7 < var6.itemIds.length; ++var7) { - var6.itemIds[var7] = 0; - var6.field3079[var7] = 0; + if (ServerPacket.NEW_PACK_215 == var1.serverPacket) { + var21 = var3.method2602(); + var5 = var3.method2604(); + var6 = var3.readIntIME(); + var22 = HealthBarDefinition.widgetDefinition.method1733(var6); + if (var5 != var22.rawX || var21 != var22.rawY || var22.xAlignment != 0 || var22.yAlignment != 0) { + var22.rawX = var5; + var22.rawY = var21; + var22.xAlignment = 0; + var22.yAlignment = 0; + class159.invalidateWidget(var22); + this.alignWidget(var22); + if (var22.type == 0) { + class132.revalidateWidgetScroll(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var6 >> 16], var22, false); } } - class155.clearItemContainer(var5); - var7 = var3.readUnsignedShort(); - - for (var8 = 0; var8 < var7; ++var8) { - var24 = var3.readUnsignedByte(); - if (var24 == 255) { - var24 = var3.readUnsignedIntIME(); - } - - var10 = var3.readUnsignedShort(); - if (var6 != null && var8 < var6.itemIds.length) { - var6.itemIds[var8] = var10; - var6.field3079[var8] = var24; - } - - SecureRandomFuture.itemContainerSetItem(var5, var8, var10 - 1, var24); - } + var1.serverPacket = null; + return true; + } - if (var6 != null) { - ClanChannelMember.invalidateWidget(var6); + if (ServerPacket.VARCLAN == var1.serverPacket) { + var21 = var3.readUnsignedShort(); + if (var21 == 65535) { + var21 = -1; } - class304.method1636(); - changedItemContainers[++changedItemContainersCount - 1 & 31] = var5 & 32767; + class102.playSong(var21); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_STAT == var1.serverPacket) { - class304.method1636(); - var20 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByteSub(); - var22 = var3.readUnsignedIntIME(); - experience[var20] = var22; - currentLevels[var20] = var5; - levels[var20] = 1; - - for (var7 = 0; var7 < 98; ++var7) { - if (var22 >= Skills.Skills_experienceTable[var7]) { - levels[var20] = var7 + 2; - } + if (ServerPacket.IF_SETSCROLLPOS == var1.serverPacket) { + var21 = var3.method2607(); + var5 = var3.readUnsignedIntIME(); + if (var5 == 65535) { + var5 = -1; } - changedSkills[++changedSkillsCount - 1 & 31] = var20; + FileSystem.playJingle(var5, var21); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETOBJECT == var1.serverPacket) { - return this.method376(var1, 2); + if (ServerPacket.MINIMAP_TOGGLE == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field404 = true; + var21 = var3.readShort(); + var5 = var3.readShort(); + var6 = class240.method1293(var5 + Varcs.cameraPitch & 2027); + var7 = var21 + class192.cameraYaw; + var8 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + field642 = new class490(Varcs.cameraPitch, var6, var8, var9); + field643 = new class490(class192.cameraYaw, var7, var8, var9); + var1.serverPacket = null; + return true; } - if (ServerPacket.NPC_INFO_LARGE == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.OBJ_DEL); + if (ServerPacket.OPEN_URL == var1.serverPacket) { + var21 = var3.readUnsignedShortLE(); + var5 = var3.readUnsignedShortLE(); + var6 = var3.readIntIME(); + var22 = HealthBarDefinition.widgetDefinition.method1733(var6); + var22.rotationKey = var5 + (var21 << 16); var1.serverPacket = null; return true; } - if (ServerPacket.ENTER_FREECAM == var1.serverPacket) { - hintArrowType = var3.readUnsignedByte(); - if (hintArrowType == 1) { - hintArrowNpcIndex = var3.readUnsignedShort(); - } - - if (hintArrowType >= 2 && hintArrowType <= 6) { - if (hintArrowType == 2) { - hintArrowSubX = 64; - hintArrowSubY = 64; - } - - if (hintArrowType == 3) { - hintArrowSubX = 0; - hintArrowSubY = 64; - } - - if (hintArrowType == 4) { - hintArrowSubX = 128; - hintArrowSubY = 64; - } - - if (hintArrowType == 5) { - hintArrowSubX = 64; - hintArrowSubY = 0; - } + if (ServerPacket.field2728 == var1.serverPacket) { + class18.field55 = var3.readUnsignedShortAdd(); + class6.field6 = var3.readUnsignedShortAdd(); - if (hintArrowType == 6) { - hintArrowSubX = 64; - hintArrowSubY = 128; + for (var21 = class18.field55; var21 < class18.field55 + 8; ++var21) { + for (var5 = class6.field6; var5 < class6.field6 + 8; ++var5) { + if (groundItems[ItemLayer.Client_plane][var21][var5] != null) { + groundItems[ItemLayer.Client_plane][var21][var5] = null; + ClanSettings.updateItemPile(var21, var5); + } } - - hintArrowType = 2; - hintArrowX = var3.readUnsignedShort(); - hintArrowY = var3.readUnsignedShort(); - hintArrowHeight = var3.readUnsignedByte(); } - if (hintArrowType == 10) { - hintArrowPlayerIndex = var3.readUnsignedShort(); + for (PendingSpawn var50 = (PendingSpawn)pendingSpawns.last(); var50 != null; var50 = (PendingSpawn)pendingSpawns.previous()) { + if (var50.x >= class18.field55 && var50.x < class18.field55 + 8 && var50.y >= class6.field6 && var50.y < class6.field6 + 8 && var50.plane == ItemLayer.Client_plane) { + var50.endCycle = 0; + } } var1.serverPacket = null; return true; } - if (ServerPacket.field2672 == var1.serverPacket) { - InvDefinition.friendSystem.readUpdate(var3, var1.serverPacketLength); - field511 = cycleCntr; + if (ServerPacket.field2684 == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field404 = true; + Messages.field1154 = var3.readUnsignedByte(); + AbstractWorldMapData.field2045 = var3.readUnsignedByte(); + class302.field2510 = var3.readUnsignedShort(); + var21 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var6 = Messages.field1154 * 128 + 64; + var7 = AbstractWorldMapData.field2045 * 128 + 64; + var8 = WorldMapDecorationType.getTileHeight(var6, var7, ItemLayer.Client_plane) - class302.field2510; + var9 = var6 - ViewportMouse.cameraX; + var23 = var8 - SecureRandomFuture.cameraY; + var11 = var7 - class36.cameraZ; + double var12 = Math.sqrt((double)(var9 * var9 + var11 * var11)); + var26 = class240.method1293((int)(Math.atan2((double)var23, var12) * 325.9490051269531D) & 2047); + var15 = class319.method1705((int)(Math.atan2((double)var9, (double)var11) * -325.9490051269531D) & 2047); + field642 = new class490(Varcs.cameraPitch, var26, var21, var5); + field643 = new class490(class192.cameraYaw, var15, var21, var5); var1.serverPacket = null; return true; } - if (ServerPacket.FRIENDLIST_LOADED == var1.serverPacket) { - var20 = var3.readUnsignedIntIME(); - var5 = var3.readIntME(); - Varps.Varps_temp[var5] = var20; - if (Varps.Varps_main[var5] != var20) { - Varps.Varps_main[var5] = var20; - } - - ScriptEvent.changeGameOptions(var5); - changedVarps[++changedVarpCount - 1 & 31] = var5; + if (ServerPacket.field2637 == var1.serverPacket) { + var21 = var3.readIntME(); + var55 = var3.readUnsignedByteNeg() == 1; + var25 = HealthBarDefinition.widgetDefinition.method1733(var21); + class18.method70(var25, class229.localPlayer.appearance, var55); + class159.invalidateWidget(var25); var1.serverPacket = null; return true; } - if (ServerPacket.UPDATE_INV_PARTIAL == var1.serverPacket) { - class151.loadRegions(false, var1.packetBuffer); + if (ServerPacket.LOC_ADD_CHANGE == var1.serverPacket) { + var21 = var3.readUnsignedByte(); + var5 = var3.readInt(); + var25 = HealthBarDefinition.widgetDefinition.method1733(var5); + class302.method1626(var25, class229.localPlayer.appearance.field2947, var21); + class159.invalidateWidget(var25); var1.serverPacket = null; return true; } - if (ServerPacket.IF_SETSCROLLPOS == var1.serverPacket) { - Clock.field1484 = var3.readUnsignedByte(); - class354.field3144 = var3.readUnsignedByteNeg(); - - for (var20 = Clock.field1484; var20 < Clock.field1484 + 8; ++var20) { - for (var5 = class354.field3144; var5 < class354.field3144 + 8; ++var5) { - if (groundItems[class87.Client_plane][var20][var5] != null) { - groundItems[class87.Client_plane][var20][var5] = null; - class30.updateItemPile(var20, var5); - } + if (ServerPacket.IF_SETPOSITION == var1.serverPacket) { + var21 = var3.readUShortSmart(); + var55 = var3.readUnsignedByte() == 1; + var84 = ""; + boolean var54 = false; + if (var55) { + var84 = var3.readStringCp1252NullTerminated(); + if (class12.friendSystem.isIgnored(new Username(var84, class89.loginType))) { + var54 = true; } } - for (PendingSpawn var51 = (PendingSpawn)pendingSpawns.last(); var51 != null; var51 = (PendingSpawn)pendingSpawns.previous()) { - if (var51.x >= Clock.field1484 && var51.x < Clock.field1484 + 8 && var51.y >= class354.field3144 && var51.y < class354.field3144 + 8 && var51.plane == class87.Client_plane) { - var51.endCycle = 0; - } + String var92 = var3.readStringCp1252NullTerminated(); + if (!var54) { + GrandExchangeOfferUnitPriceComparator.addGameMessage(var21, var84, var92); } var1.serverPacket = null; return true; } - if (ServerPacket.MINIMAP_TOGGLE == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field401 = true; - var20 = var3.readShort(); - var5 = var3.readShort(); - var22 = class153.method800(var5 + class365.cameraPitch & 2027); - var7 = var20 + WallDecoration.cameraYaw; - var8 = var3.readUnsignedShort(); - var24 = var3.readUnsignedByte(); - field642 = new class493(class365.cameraPitch, var22, var8, var24); - field643 = new class493(WallDecoration.cameraYaw, var7, var8, var24); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.OPEN_URL == var1.serverPacket) { - Canvas.privateChatMode = UserComparator9.method679(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2738 == var1.serverPacket) { - var87 = var3.readUnsignedShortAdd(); - var22 = var3.method2627(); - var20 = var22 >> 16; - var5 = var22 >> 8 & 255; - var7 = var20 + (var22 >> 4 & 7); - var8 = var5 + (var22 & 7); - var18 = var3.readUnsignedShortAddLE(); - var68 = var3.readUnsignedByteNeg() * 4; - var85 = var3.readByteNeg(); - var62 = var3.readByteAdd(); - var16 = var3.readUnsignedShortAdd(); - var15 = var3.readUnsignedShortAddLE(); - var60 = var3.method2583(); - var17 = var3.readUnsignedByteSub(); - var69 = var3.readUnsignedByteAdd() * 4; - var24 = var85 + var7; - var10 = var62 + var8; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var24 >= 0 && var10 >= 0 && var24 < 104 && var10 < 104 && var87 != 65535) { + if (ServerPacket.NPC_INFO_SMALL == var1.serverPacket) { + var9 = var3.readUnsignedShortAddLE(); + var23 = var3.readUnsignedShortAdd(); + var6 = var3.readMedium(); + var21 = var6 >> 16; + var5 = var6 >> 8 & 255; + var7 = var21 + (var6 >> 4 & 7); + var8 = var5 + (var6 & 7); + var11 = var3.readUnsignedShortLE(); + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { var7 = var7 * 128 + 64; var8 = var8 * 128 + 64; - var24 = var24 * 128 + 64; - var10 = var10 * 128 + 64; - var19 = new Projectile(var87, class87.Client_plane, var7, var8, class115.getTileHeight(var7, var8, class87.Client_plane) - var68, var15 + cycle, var16 + cycle, var17, var18, var60, var69); - var19.setDestination(var24, var10, class115.getTileHeight(var24, var10, class87.Client_plane) - var69, var15 + cycle); - projectiles.addFirst(var19); + GraphicsObject var38 = new GraphicsObject(var9, ItemLayer.Client_plane, var7, var8, WorldMapDecorationType.getTileHeight(var7, var8, ItemLayer.Client_plane) - var23, var11, cycle); + graphicsObjects.addFirst(var38); } var1.serverPacket = null; return true; } - String var41; - if (ServerPacket.OBJ_DEL_LEGACY == var1.serverPacket) { - var50 = var3.readStringCp1252NullTerminated(); - var25 = var3.readLong(); - var27 = (long)var3.readUnsignedShort(); - var29 = (long)var3.readMedium(); - PlayerType var40 = (PlayerType)SequenceDefinition.findEnumerated(class183.PlayerType_values(), var3.readUnsignedByte()); - var34 = (var27 << 32) + var29; - boolean var14 = false; + if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL == var1.serverPacket) { + var21 = var3.readUnsignedIntME(); + var5 = var3.readIntME(); + var25 = HealthBarDefinition.widgetDefinition.method1733(var5); + AbstractWorldMapData.method1323(var25, var21); + class159.invalidateWidget(var25); + var1.serverPacket = null; + return true; + } - for (var15 = 0; var15 < 100; ++var15) { - if (var34 == crossWorldMessageIds[var15]) { - var14 = true; - break; - } + if (ServerPacket.field2718 == var1.serverPacket) { + var21 = var3.readUnsignedIntME(); + var5 = var3.readUnsignedIntIME(); + if (var5 == 65535) { + var5 = -1; } - if (var40.isUser && InvDefinition.friendSystem.isIgnored(new Username(var50, class166.loginType))) { - var14 = true; - } + var6 = var3.readIntME(); + var22 = HealthBarDefinition.widgetDefinition.method1733(var6); + ItemComposition var35; + if (!var22.isIf3) { + if (var5 == -1) { + var22.modelType = 0; + var1.serverPacket = null; + return true; + } - if (!var14 && field481 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var34; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var41 = AbstractFont.escapeBrackets(HealthBarUpdate.method523(class172.readString(var3))); - if (var40.modIcon != -1) { - class164.addChatMessage(9, class436.addImageTag(var40.modIcon) + var50, var41, class163.base37DecodeLong(var25)); + var35 = class214.ItemDefinition_get(var5).getCountObj(var21); + var22.modelType = 4; + var22.modelId = var5; + var22.modelAngleX = var35.xan2d; + var22.modelAngleY = var35.yan2d; + var22.modelZoom = var35.zoom2d * 100 / var21; + class159.invalidateWidget(var22); + } else { + var22.itemId = var5; + var22.itemQuantity = var21; + var35 = class214.ItemDefinition_get(var5).getCountObj(var21); + var22.modelAngleX = var35.xan2d; + var22.modelAngleY = var35.yan2d; + var22.modelAngleZ = var35.zan2d; + var22.modelOffsetX = var35.offsetX2d; + var22.modelOffsetY = var35.offsetY2d; + var22.modelZoom = var35.zoom2d; + if (var35.isStackable == 1) { + var22.itemQuantityMode = 1; } else { - class164.addChatMessage(9, var50, var41, class163.base37DecodeLong(var25)); + var22.itemQuantityMode = 2; + } + + if (var22.modelRotation > 0) { + var22.modelZoom = var22.modelZoom * 32 / var22.modelRotation; + } else if (var22.rawWidth > 0) { + var22.modelZoom = var22.modelZoom * 32 / var22.rawWidth; } + + class159.invalidateWidget(var22); } var1.serverPacket = null; return true; } - if (ServerPacket.MESSAGE_GAME == var1.serverPacket && isCameraLocked) { - field400 = true; - field401 = false; + if (ServerPacket.PLAYER_SPOTANIM_SPECIFIC == var1.serverPacket) { + field400 = false; + isCameraLocked = false; field402 = false; + field404 = false; + Messages.field1154 = 0; + AbstractWorldMapData.field2045 = 0; + class302.field2510 = 0; + field403 = false; + class60.cameraLookAtSpeed = 0; + class134.cameraMoveToAcceleration = 0; + class1.cameraLookAtAcceleration = 0; + WorldMapIcon_0.cameraMoveToSpeed = 0; + ScriptFrame.cameraLookAtX = 0; + class216.cameraLookAtY = 0; + class127.cameraLookAtHeight = 0; + field644 = null; + field642 = null; + field643 = null; - for (var20 = 0; var20 < 5; ++var20) { - cameraShaking[var20] = false; + for (var21 = 0; var21 < 5; ++var21) { + cameraShaking[var21] = false; } var1.serverPacket = null; return true; } - if (ServerPacket.LOC_ADD_CHANGE == var1.serverPacket) { - var20 = var3.method2623(); - var5 = var3.readUnsignedIntIME(); - var6 = class33.widgetDefinition.method1740(var5); - if (var20 != var6.sequenceId || var20 == -1) { - var6.sequenceId = var20; - var6.modelFrame = 0; - var6.modelFrameCycle = 0; - ClanChannelMember.invalidateWidget(var6); + if (ServerPacket.UPDATE_INV_CLEAR == var1.serverPacket) { + byte[] var49 = new byte[var1.serverPacketLength]; + var3.method2534(var49, 0, var49.length); + Buffer var69 = new Buffer(var49); + var84 = var69.readStringCp1252NullTerminated(); + HealthBar.openURL(var84, true, false); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2639 == var1.serverPacket) { + isCameraLocked = true; + field400 = false; + field404 = false; + Messages.field1154 = var3.readUnsignedByte(); + AbstractWorldMapData.field2045 = var3.readUnsignedByte(); + class302.field2510 = var3.readUnsignedShort(); + class60.cameraLookAtSpeed = var3.readUnsignedByte(); + class134.cameraMoveToAcceleration = var3.readUnsignedByte(); + if (class134.cameraMoveToAcceleration >= 100) { + var21 = Messages.field1154 * 128 + 64; + var5 = AbstractWorldMapData.field2045 * 128 + 64; + var6 = WorldMapDecorationType.getTileHeight(var21, var5, ItemLayer.Client_plane) - class302.field2510; + var7 = var21 - ViewportMouse.cameraX; + var8 = var6 - SecureRandomFuture.cameraY; + var9 = var5 - class36.cameraZ; + var23 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); + Varcs.cameraPitch = (int)(Math.atan2((double)var8, (double)var23) * 325.9490051269531D) & 2047; + class192.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; + if (Varcs.cameraPitch < 128) { + Varcs.cameraPitch = 128; + } + + if (Varcs.cameraPitch > 383) { + Varcs.cameraPitch = 383; + } } var1.serverPacket = null; return true; } - if (ServerPacket.field2643 == var1.serverPacket) { - var74 = var3.readBoolean(); - if (var74) { - if (WallDecoration.field2303 == null) { - WallDecoration.field2303 = new class384(); + if (ServerPacket.IF_SETHIDE == var1.serverPacket) { + class396.method2042(); + var21 = var3.readUnsignedByteNeg(); + var5 = var3.readIntIME(); + var6 = var3.readUnsignedByte(); + var7 = var3.readUnsignedByteSub(); + experience[var6] = var5; + currentLevels[var6] = var7; + levels[var6] = 1; + field564[var6] = var21; + + for (var8 = 0; var8 < 98; ++var8) { + if (var5 >= Skills.Skills_experienceTable[var8]) { + levels[var6] = var8 + 2; } - } else { - WallDecoration.field2303 = null; } + changedSkills[++changedSkillsCount - 1 & 31] = var6; var1.serverPacket = null; return true; } - if (ServerPacket.NPC_INFO_SMALL == var1.serverPacket) { - var72 = var3.readByte(); - var21 = var3.readStringCp1252NullTerminated(); - long var42 = (long)var3.readUnsignedShort(); - long var44 = (long)var3.readMedium(); - PlayerType var38 = (PlayerType)SequenceDefinition.findEnumerated(class183.PlayerType_values(), var3.readUnsignedByte()); - long var46 = (var42 << 32) + var44; + if (ServerPacket.field2633 == var1.serverPacket) { + var21 = var3.readUnsignedShort(); + var5 = var3.readInt(); + Varps.Varps_temp[var21] = var5; + if (Varps.Varps_main[var21] != var5) { + Varps.Varps_main[var21] = var5; + } + + Projectile.changeGameOptions(var21); + changedVarps[++changedVarpCount - 1 & 31] = var21; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.EMPTY_PACKET == var1.serverPacket) { + class106.processZoneOperation(ZoneOperation.LOC_ANIM); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2754 == var1.serverPacket) { + var76 = var3.readByte(); + var20 = var3.readStringCp1252NullTerminated(); + long var41 = (long)var3.readUnsignedShort(); + long var43 = (long)var3.readMedium(); + PlayerType var10 = (PlayerType)class12.findEnumerated(class320.PlayerType_values(), var3.readUnsignedByte()); + long var45 = var43 + (var41 << 32); boolean var13 = false; - ClanChannel var39 = null; - var39 = var72 >= 0 ? currentClanChannels[var72] : ClanChannelMember.guestClanChannel; - if (var39 == null) { + ClanChannel var14 = null; + var14 = var76 >= 0 ? currentClanChannels[var76] : ItemContainer.guestClanChannel; + if (var14 == null) { var13 = true; } else { var15 = 0; while (true) { if (var15 >= 100) { - if (var38.isUser && InvDefinition.friendSystem.isIgnored(new Username(var21, class166.loginType))) { + if (var10.isUser && class12.friendSystem.isIgnored(new Username(var20, class89.loginType))) { var13 = true; } break; } - if (crossWorldMessageIds[var15] == var46) { + if (var45 == field615[var15]) { var13 = true; break; } @@ -5508,14 +5430,14 @@ final boolean method378(PacketWriter var1) { } if (!var13) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var46; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var41 = AbstractFont.escapeBrackets(class172.readString(var3)); - var16 = var72 >= 0 ? 41 : 44; - if (var38.modIcon != -1) { - class164.addChatMessage(var16, class436.addImageTag(var38.modIcon) + var21, var41, var39.name); + field615[field533] = var45; + field533 = (field533 + 1) % 100; + var40 = AbstractFont.escapeBrackets(class128.readString(var3)); + var16 = var76 >= 0 ? 41 : 44; + if (var10.modIcon != -1) { + ArchiveLoader.addChatMessage(var16, FloorUnderlayDefinition.addImageTag(var10.modIcon) + var20, var40, var14.name); } else { - class164.addChatMessage(var16, var21, var41, var39.name); + ArchiveLoader.addChatMessage(var16, var20, var40, var14.name); } } @@ -5523,173 +5445,89 @@ final boolean method378(PacketWriter var1) { return true; } - if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field402 = true; - class191.cameraMoveToX = var3.readUnsignedByte(); - MouseHandler.cameraMoveToY = var3.readUnsignedByte(); - var20 = var3.readUnsignedShort(); - var5 = var3.readUnsignedShort(); - field403 = var3.readBoolean(); - var22 = var3.readUnsignedByte(); - var7 = class191.cameraMoveToX * 128 + 64; - var8 = MouseHandler.cameraMoveToY * 128 + 64; - boolean var81 = false; - boolean var57 = false; - if (field403) { - var24 = class17.cameraY; - var10 = class115.getTileHeight(var7, var8, class87.Client_plane) - var20; - } else { - var24 = class115.getTileHeight(cameraX, WorldMapArea.cameraZ, class87.Client_plane) - class17.cameraY; - var10 = var20; - } - - field646 = new class492(cameraX, WorldMapArea.cameraZ, var24, var7, var8, var10, var5, var22); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.UPDATE_ZONE_FULL_FOLLOWS == var1.serverPacket) { - for (var20 = 0; var20 < Varps.Varps_main.length; ++var20) { - if (Varps.Varps_temp[var20] != Varps.Varps_main[var20]) { - Varps.Varps_main[var20] = Varps.Varps_temp[var20]; - ScriptEvent.changeGameOptions(var20); - changedVarps[++changedVarpCount - 1 & 31] = var20; - } + if (ServerPacket.IF_SETPLAYERHEAD == var1.serverPacket) { + var21 = var3.readUnsignedIntME(); + var5 = var3.readUnsignedShortLE(); + if (var5 == 65535) { + var5 = -1; } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.MAP_ANIM == var1.serverPacket) { - var20 = var3.readUnsignedByte(); - class7.forceDisconnect(var20); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.TRIGGER_ONDIALOGABORT == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field402 = true; - class191.cameraMoveToX = var3.readUnsignedByte(); - MouseHandler.cameraMoveToY = var3.readUnsignedByte(); - var20 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte() * 128 + 64; - var22 = var3.readUnsignedByte() * 128 + 64; + var6 = var3.readIntIME(); var7 = var3.readUnsignedShort(); - field403 = var3.readBoolean(); - var8 = var3.readUnsignedByte(); - var24 = class191.cameraMoveToX * 128 + 64; - var10 = MouseHandler.cameraMoveToY * 128 + 64; - var11 = false; - var32 = false; - if (field403) { - var60 = class17.cameraY; - var87 = class115.getTileHeight(var24, var10, class87.Client_plane) - var20; - } else { - var60 = class115.getTileHeight(cameraX, WorldMapArea.cameraZ, class87.Client_plane) - class17.cameraY; - var87 = var20; + if (var7 == 65535) { + var7 = -1; } - field646 = new class491(cameraX, WorldMapArea.cameraZ, var60, var24, var10, var87, var5, var22, var7, var8); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.SEND_PING == var1.serverPacket) { - CollisionMap.method1166(); - var1.serverPacket = null; - return false; - } + for (var8 = var7; var8 <= var5; ++var8) { + var36 = ((long)var6 << 32) + (long)var8; + Node var39 = widgetFlags.get(var36); + if (var39 != null) { + var39.remove(); + } - if (ServerPacket.IF_SETHIDE == var1.serverPacket) { - isCameraLocked = true; - field400 = false; - field402 = false; - class191.cameraMoveToX = var3.readUnsignedByte(); - MouseHandler.cameraMoveToY = var3.readUnsignedByte(); - SoundSystem.cameraMoveToHeight = var3.readUnsignedShort(); - SecureRandomCallable.cameraMoveToSpeed = var3.readUnsignedByte(); - class131.cameraMoveToAcceleration = var3.readUnsignedByte(); - if (class131.cameraMoveToAcceleration >= 100) { - cameraX = class191.cameraMoveToX * 128 + 64; - WorldMapArea.cameraZ = MouseHandler.cameraMoveToY * 128 + 64; - class17.cameraY = class115.getTileHeight(cameraX, WorldMapArea.cameraZ, class87.Client_plane) - SoundSystem.cameraMoveToHeight; + widgetFlags.put(new IntegerNode(var21), var36); } var1.serverPacket = null; return true; } - if (ServerPacket.CAM_LOOKAT_EASED_COORD == var1.serverPacket) { - var50 = var3.readStringCp1252NullTerminated(); - var21 = AbstractFont.escapeBrackets(HealthBarUpdate.method523(class172.readString(var3))); - class411.addGameMessage(6, var50, var21); - var1.serverPacket = null; - return true; - } + if (ServerPacket.MAPPROJ_ANIM == var1.serverPacket) { + var21 = var3.readUnsignedShortAddLE(); + var5 = var3.readUnsignedByteNeg(); + if (var21 == 65535) { + var21 = -1; + } - if (ServerPacket.EMPTY_PACKET == var1.serverPacket) { - World.method398(var3.readStringCp1252NullTerminated()); + WorldMapLabelSize.performPlayerAnimation(class229.localPlayer, var21, var5); var1.serverPacket = null; return true; } - if (ServerPacket.field2715 == var1.serverPacket) { - var20 = var3.readUnsignedShort(); - var5 = var3.readUnsignedIntLE(); - var22 = var3.readUnsignedShort(); - var7 = var3.readUnsignedShortAddLE(); - var33 = class33.widgetDefinition.method1740(var5); - if (var20 != var33.modelAngleX || var7 != var33.modelAngleY || var22 != var33.modelZoom) { - var33.modelAngleX = var20; - var33.modelAngleY = var7; - var33.modelZoom = var22; - ClanChannelMember.invalidateWidget(var33); + if (ServerPacket.field2743 == var1.serverPacket) { + var21 = var3.readIntIME(); + var5 = var3.readUnsignedShortLE(); + var25 = HealthBarDefinition.widgetDefinition.method1733(var21); + if (var25.modelType != 2 || var5 != var25.modelId) { + var25.modelType = 2; + var25.modelId = var5; + class159.invalidateWidget(var25); } var1.serverPacket = null; return true; } - if (ServerPacket.field2736 == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.field2617); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.MAPPROJ_ANIM == var1.serverPacket) { - UrlRequest.processZoneOperation(ZoneOperation.LOC_ADD_CHANGE); + if (ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 == var1.serverPacket) { + var21 = var3.readUnsignedByte(); + PacketWriter.forceDisconnect(var21); var1.serverPacket = null; - return true; + return false; } - class190.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1495788863 * -800816449 : -1) + "," + (var1.field1154 != null ? var1.field1154.id * 1495788863 * -800816449 : -1) + "," + (var1.field1156 != null ? var1.field1156.id * 1495788863 * -800816449 : -1) + "," + var1.serverPacketLength, (Throwable)null); - CollisionMap.method1166(); - } catch (IOException var48) { - class148.method781(); - } catch (Exception var49) { - var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1495788863 * -800816449 : -1) + "," + (var1.field1154 != null ? var1.field1154.id * 1495788863 * -800816449 : -1) + "," + (var1.field1156 != null ? var1.field1156.id * 1495788863 * -800816449 : -1) + "," + var1.serverPacketLength + "," + (TextureProvider.localPlayer.pathX[0] + class20.baseX) + "," + (TextureProvider.localPlayer.pathY[0] + class19.baseY) + ","; + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1979699673 * 581410409 : -1) + "," + (var1.field1168 != null ? var1.field1168.id * 1979699673 * 581410409 : -1) + "," + (var1.field1166 != null ? var1.field1166.id * 1979699673 * 581410409 : -1) + "," + var1.serverPacketLength, (Throwable)null); + class13.method51(); + } catch (IOException var47) { + class9.method29(); + } catch (Exception var48) { + var20 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1979699673 * 581410409 : -1) + "," + (var1.field1168 != null ? var1.field1168.id * 1979699673 * 581410409 : -1) + "," + (var1.field1166 != null ? var1.field1166.id * 1979699673 * 581410409 : -1) + "," + var1.serverPacketLength + "," + (class229.localPlayer.pathX[0] + NewShit.baseX) + "," + (class229.localPlayer.pathY[0] + class101.baseY) + ","; - for (var22 = 0; var22 < var1.serverPacketLength && var22 < 50; ++var22) { - var21 = var21 + var3.array[var22] + ","; + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { + var20 = var20 + var3.array[var6] + ","; } - class190.RunException_sendStackTrace(var21, var49); - CollisionMap.method1166(); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace(var20, var48); + class13.method51(); } return true; } } - @ObfuscatedName("kt") + @ObfuscatedName("kl") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "33" + descriptor = "(I)V", + garbageValue = "1598980943" ) @Export("menu") final void menu() { @@ -5732,51 +5570,91 @@ final void menu() { } if (clickedWidget == null) { - int var12 = MouseHandler.MouseHandler_lastButton; + int var19 = MouseHandler.MouseHandler_lastButton; + int var7; + int var8; + int var16; + int var20; if (isMenuOpen) { - int var10; - if (var12 != 1 && (UserComparator8.mouseCam || var12 != 4)) { + int var15; + if (var19 != 1 && (class19.mouseCam || var19 != 4)) { var2 = MouseHandler.MouseHandler_x; - var10 = MouseHandler.MouseHandler_y; - if (var2 < class28.menuX - 10 || var2 > class341.menuWidth + class28.menuX + 10 || var10 < class463.menuY - 10 || var10 > class463.menuY + Language.menuHeight + 10) { + var15 = MouseHandler.MouseHandler_y; + if (var2 < FriendSystem.menuX - 10 || var2 > FriendSystem.menuX + class428.menuWidth + 10 || var15 < class60.menuY - 10 || var15 > class515.menuHeight + class60.menuY + 10) { isMenuOpen = false; - class19.method69(class28.menuX, class463.menuY, class341.menuWidth, Language.menuHeight); + var16 = FriendSystem.menuX; + var5 = class60.menuY; + var20 = class428.menuWidth; + var7 = class515.menuHeight; + + for (var8 = 0; var8 < rootWidgetCount; ++var8) { + if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var16 && rootWidgetXs[var8] < var20 + var16 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var5 + var7) { + field407[var8] = true; + } + } } } - if (var12 == 1 || !UserComparator8.mouseCam && var12 == 4) { - var2 = class28.menuX; - var10 = class463.menuY; - int var11 = class341.menuWidth; + if (var19 == 1 || !class19.mouseCam && var19 == 4) { + var2 = FriendSystem.menuX; + var15 = class60.menuY; + var16 = class428.menuWidth; var5 = MouseHandler.MouseHandler_lastPressedX; - int var13 = MouseHandler.MouseHandler_lastPressedY; - int var7 = -1; + var20 = MouseHandler.MouseHandler_lastPressedY; + var7 = -1; - for (int var8 = 0; var8 < menuOptionsCount; ++var8) { - int var9 = var10 + (menuOptionsCount - 1 - var8) * 15 + 31; - if (var5 > var2 && var5 < var2 + var11 && var13 > var9 - 13 && var13 < var9 + 3) { + int var9; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { + var9 = var15 + (menuOptionsCount - 1 - var8) * 15 + 31; + if (var5 > var2 && var5 < var2 + var16 && var20 > var9 - 13 && var20 < var9 + 3) { var7 = var8; } } - if (var7 != -1) { - AddRequestTask.method2156(var7); + int var10; + int var11; + int var12; + if (var7 != -1 && var7 >= 0) { + var8 = menuArguments1[var7]; + var9 = menuArguments2[var7]; + var10 = menuOpcodes[var7]; + var11 = menuIdentifiers[var7]; + var12 = menuItemIds[var7]; + String var13 = menuActions[var7]; + String var14 = menuTargets[var7]; + class407.menuAction(var8, var9, var10, var11, var12, var13, var14, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } isMenuOpen = false; - class19.method69(class28.menuX, class463.menuY, class341.menuWidth, Language.menuHeight); + var8 = FriendSystem.menuX; + var9 = class60.menuY; + var10 = class428.menuWidth; + var11 = class515.menuHeight; + + for (var12 = 0; var12 < rootWidgetCount; ++var12) { + if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var8 + var10 && rootWidgetYs[var12] + rootWidgetHeights[var12] > var9 && rootWidgetYs[var12] < var11 + var9) { + field407[var12] = true; + } + } } } else { - var2 = AttackOption.method609(); - if ((var12 == 1 || !UserComparator8.mouseCam && var12 == 4) && this.shouldLeftClickOpenMenu()) { - var12 = 2; + var2 = menuOptionsCount - 1; + if ((var19 == 1 || !class19.mouseCam && var19 == 4) && this.shouldLeftClickOpenMenu()) { + var19 = 2; } - if ((var12 == 1 || !UserComparator8.mouseCam && var12 == 4) && menuOptionsCount > 0) { - AddRequestTask.method2156(var2); + if ((var19 == 1 || !class19.mouseCam && var19 == 4) && menuOptionsCount > 0 && var2 >= 0) { + var16 = menuArguments1[var2]; + var5 = menuArguments2[var2]; + var20 = menuOpcodes[var2]; + var7 = menuIdentifiers[var2]; + var8 = menuItemIds[var2]; + String var17 = menuActions[var2]; + String var18 = menuTargets[var2]; + class407.menuAction(var16, var5, var20, var7, var8, var17, var18, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } - if (var12 == 2 && menuOptionsCount > 0) { + if (var19 == 2 && menuOptionsCount > 0) { this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } } @@ -5786,104 +5664,98 @@ final void menu() { @ObfuscatedName("kc") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "29401" + descriptor = "(I)Z", + garbageValue = "-1230030345" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = AttackOption.method609(); - return (leftClickOpensMenu && menuOptionsCount > 2 || WallDecoration.method1425(var1)) && !menuShiftClick[var1]; + int var1 = menuOptionsCount - 1; + return (leftClickOpensMenu && menuOptionsCount > 2 || class514.method2508(var1)) && !menuShiftClick[var1]; } - @ObfuscatedName("kd") + @ObfuscatedName("ka") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-2675" + descriptor = "(IIB)V", + garbageValue = "-26" ) @Export("openMenu") final void openMenu(int var1, int var2) { - class481.method2390(var1, var2); + Decimator.method322(var1, var2); var1 -= viewportOffsetX; var2 -= viewportOffsetY; - class10.scene.menuOpen(class87.Client_plane, var1, var2, false); + class36.scene.menuOpen(ItemLayer.Client_plane, var1, var2, false); isMenuOpen = true; } - @ObfuscatedName("lg") + @ObfuscatedName("lp") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-758466559" + garbageValue = "-577799502" ) - final void method382(boolean var1) { - int var2 = rootInterface; - int var3 = class340.canvasWidth; - int var4 = class491.canvasHeight; - if (class33.widgetDefinition.loadInterface(var2)) { - class360.resizeInterface(class33.widgetDefinition.Widget_interfaceComponents[var2], -1, var3, var4, var1); - } - + final void method389(boolean var1) { + NPCComposition.method952(rootInterface, Language.canvasWidth, class47.canvasHeight, var1); } - @ObfuscatedName("ln") + @ObfuscatedName("lh") @ObfuscatedSignature( - descriptor = "(Lnm;B)V", - garbageValue = "0" + descriptor = "(Lnn;I)V", + garbageValue = "1484692020" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : class33.widgetDefinition.method1740(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : HealthBarDefinition.widgetDefinition.method1733(var1.parentId); int var3; int var4; if (var2 == null) { - var3 = class340.canvasWidth; - var4 = class491.canvasHeight; + var3 = Language.canvasWidth; + var4 = class47.canvasHeight; } else { var3 = var2.width; var4 = var2.height; } - class140.alignWidgetSize(var1, var3, var4, false); - Username.alignWidgetPosition(var1, var3, var4); + Renderable.alignWidgetSize(var1, var3, var4, false); + JagexCache.alignWidgetPosition(var1, var3, var4); } - @ObfuscatedName("mn") + @ObfuscatedName("mf") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2017777407" + descriptor = "(B)V", + garbageValue = "-74" ) - final void method384() { - ClanChannelMember.invalidateWidget(clickedWidget); - ++FriendsChat.widgetDragDuration; - if (field394 && field396) { + final void method391() { + class159.invalidateWidget(clickedWidget); + ++class148.widgetDragDuration; + if (field397 && field396) { int var1 = MouseHandler.MouseHandler_x; int var2 = MouseHandler.MouseHandler_y; var1 -= widgetClickX; var2 -= widgetClickY; - if (var1 < field516) { - var1 = field516; + if (var1 < field512) { + var1 = field512; } - if (var1 + clickedWidget.width > field516 + clickedWidgetParent.width) { - var1 = field516 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field512 + clickedWidgetParent.width) { + var1 = field512 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field514) { - var2 = field514; + if (var2 < field513) { + var2 = field513; } - if (var2 + clickedWidget.height > field514 + clickedWidgetParent.height) { - var2 = field514 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field513 + clickedWidgetParent.height) { + var2 = field513 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field521; - int var4 = var2 - field517; + int var3 = var1 - field514; + int var4 = var2 - field508; int var5 = clickedWidget.dragZoneSize; - if (FriendsChat.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + if (class148.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { isDraggingWidget = true; } - int var6 = var1 - field516 + clickedWidgetParent.scrollX; - int var7 = var2 - field514 + clickedWidgetParent.scrollY; + int var6 = var1 - field512 + clickedWidgetParent.scrollX; + int var7 = var2 - field513 + clickedWidgetParent.scrollY; ScriptEvent var8; if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); @@ -5891,7 +5763,7 @@ final void method384() { var8.mouseX = var6; var8.mouseY = var7; var8.args = clickedWidget.onDrag; - Interpreter.runScriptEvent(var8); + class157.runScriptEvent(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -5903,32 +5775,32 @@ final void method384() { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args = clickedWidget.onDragComplete; - Interpreter.runScriptEvent(var8); + class157.runScriptEvent(var8); } - if (draggedOnWidget != null && class212.method1045(clickedWidget) != null) { - PacketBufferNode var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPHELDD, packetWriter.isaacCipher); + if (draggedOnWidget != null && class227.method1165(clickedWidget) != null) { + PacketBufferNode var9 = class113.getPacketBufferNode(ClientPacket.field2559, packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(clickedWidget.itemId); + var9.packetBuffer.writeIntME(draggedOnWidget.childIndex); var9.packetBuffer.writeIntLE(clickedWidget.id); - var9.packetBuffer.writeShort(draggedOnWidget.childIndex); - var9.packetBuffer.writeShort(clickedWidget.childIndex); var9.packetBuffer.writeInt(draggedOnWidget.id); - var9.packetBuffer.writeShortAddLE(clickedWidget.itemId); - var9.packetBuffer.writeShort(draggedOnWidget.itemId); + var9.packetBuffer.writeShortAdd(clickedWidget.childIndex); + var9.packetBuffer.writeIntME(draggedOnWidget.itemId); packetWriter.addNode(var9); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field521 + widgetClickX, field517 + widgetClickY); + this.openMenu(field514 + widgetClickX, field508 + widgetClickY); } else if (menuOptionsCount > 0) { - VarbitComposition.method1049(widgetClickX + field521, widgetClickY + field517); + method392(widgetClickX + field514, field508 + widgetClickY); } clickedWidget = null; } } else { - if (FriendsChat.widgetDragDuration > 1) { + if (class148.widgetDragDuration > 1) { if (!isDraggingWidget && menuOptionsCount > 0) { - VarbitComposition.method1049(field521 + widgetClickX, field517 + widgetClickY); + method392(widgetClickX + field514, widgetClickY + field508); } clickedWidget = null; @@ -5937,38 +5809,38 @@ final void method384() { } } - @ObfuscatedName("ou") + @ObfuscatedName("or") @ObfuscatedSignature( - descriptor = "(I)Lvf;", - garbageValue = "-1440888763" + descriptor = "(I)Lvj;", + garbageValue = "-1748725154" ) @Export("username") public Username username() { - return TextureProvider.localPlayer != null ? TextureProvider.localPlayer.username : null; + return class229.localPlayer != null ? class229.localPlayer.username : null; } - @ObfuscatedName("on") + @ObfuscatedName("ob") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "95" + descriptor = "(II)V", + garbageValue = "-1572672090" ) - void method386(int var1) { + void method394(int var1) { if (param25 >= 216) { - PacketBufferNode var2 = ClanChannelMember.getPacketBufferNode(ClientPacket.f3, packetWriter.isaacCipher); + PacketBufferNode var2 = class113.getPacketBufferNode(ClientPacket.OPPLAYER5, packetWriter.isaacCipher); var2.packetBuffer.writeByte(var1); packetWriter.addNode(var2); } } - @ObfuscatedName("ot") + @ObfuscatedName("os") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-859215777" + garbageValue = "-1728239313" ) - void method387(int var1) { + void method395(int var1) { if (param25 >= 216) { - PacketBufferNode var2 = ClanChannelMember.getPacketBufferNode(ClientPacket.f50, packetWriter.isaacCipher); + PacketBufferNode var2 = class113.getPacketBufferNode(ClientPacket.f1, packetWriter.isaacCipher); var2.packetBuffer.writeByte(var1); packetWriter.addNode(var2); } @@ -6000,28 +5872,48 @@ public final void init() { worldProperties = Integer.parseInt(var2); break; case 6: - WorldMapLabelSize.clientLanguage = Language.method2007(Integer.parseInt(var2)); + class85.clientLanguage = Language.method1995(Integer.parseInt(var2)); break; case 7: - SoundSystem.field211 = class432.method2191(Integer.parseInt(var2)); + int var4 = Integer.parseInt(var2); + GameBuild[] var5 = class13.method50(); + int var6 = 0; + + GameBuild var8; + while (true) { + if (var6 >= var5.length) { + var8 = null; + break; + } + + GameBuild var7 = var5[var6]; + if (var4 == var7.buildId) { + var8 = var7; + break; + } + + ++var6; + } + + class191.field1585 = var8; break; case 8: if (var2.equalsIgnoreCase("true")) { } break; case 9: - HealthBarDefinition.param9 = var2; + MenuAction.param9 = var2; break; case 10: - UrlRequester.field1163 = (StudioGame)SequenceDefinition.findEnumerated(Calendar.method1889(), Integer.parseInt(var2)); - if (UrlRequester.field1163 == StudioGame.oldscape) { - class166.loginType = LoginType.oldscape; + Messages.field1156 = (StudioGame)class12.findEnumerated(VerticalAlignment.method955(), Integer.parseInt(var2)); + if (Messages.field1156 == StudioGame.oldscape) { + class89.loginType = LoginType.oldscape; } else { - class166.loginType = LoginType.field4098; + class89.loginType = LoginType.field4092; } break; case 11: - class59.field308 = var2; + class314.field2776 = var2; break; case 12: worldId = Integer.parseInt(var2); @@ -6035,19 +5927,19 @@ public final void init() { default: break; case 14: - WorldMapIcon_1.field2337 = Integer.parseInt(var2); + DevicePcmPlayerProvider.field66 = Integer.parseInt(var2); break; case 15: gameBuild = Integer.parseInt(var2); break; case 17: - class59.field307 = var2; + MoveSpeed.field1933 = var2; break; case 21: param21 = Integer.parseInt(var2); break; case 22: - Actor.field959 = var2; + FriendsChat.field3821 = var2; break; case 25: int var3 = var2.indexOf("."); @@ -6061,78 +5953,103 @@ public final void init() { } } - AddRequestTask.method2155(); - MouseHandler.worldHost = this.getCodeBase().getHost(); - class59.field309 = new JagNetThread(); - String var4 = SoundSystem.field211.name; - byte var5 = 0; - if ((worldProperties & class525.field4156.rsOrdinal()) != 0) { - UserComparator3.field1184 = "beta"; + Scene.Scene_isLowDetail = false; + isLowDetail = false; + Friend.worldHost = this.getCodeBase().getHost(); + WorldMapSectionType.field2038 = new JagNetThread(); + String var9 = class191.field1585.name; + byte var10 = 0; + if ((worldProperties & class522.field4153.rsOrdinal()) != 0) { + ItemLayer.field2109 = "beta"; } try { - class139.method735("oldschool", UserComparator3.field1184, var4, var5, 23); - } catch (Exception var7) { - class190.RunException_sendStackTrace((String)null, var7); + class339.method1744("oldschool", ItemLayer.field2109, var9, var10, 23); + } catch (Exception var12) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var12); + } + + SpriteMask.client = this; + RuneLiteMenuEntry.client = (RSClient)(Object) this; + RunException.field4317 = clientType; + Messages.field1155 = System.getenv("JX_ACCESS_TOKEN"); + ObjectComposition.field1664 = System.getenv("JX_REFRESH_TOKEN"); + class369.field3560 = System.getenv("JX_SESSION_ID"); + InterfaceParent.field862 = System.getenv("JX_CHARACTER_ID"); + String var14 = System.getenv("JX_DISPLAY_NAME"); + String var11; + if (var14 != null && !var14.isEmpty() && var14.charAt(0) != '#') { + var11 = var14; + } else { + var11 = ""; } - class159.client = this; - class189.field1493 = clientType; - class223.method1129(); + Login.field763 = var11; if (Boolean.parseBoolean(System.getProperty("jagex.disableBouncyCastle"))) { - this.field660 = true; + this.field661 = true; } - if (field427 == -1) { - if (!this.method357() && !this.method358()) { - field427 = 0; + if (field424 == -1) { + if (!this.method364() && !this.method365()) { + field424 = 0; } else { - field427 = 5; + field424 = 5; } } - this.startThread(765, 503, 217, 1); + this.startThread(765, 503, 218, 1); } - } catch (RuntimeException var8) { - throw GrandExchangeOfferTotalQuantityComparator.method1973(var8, "client.init(" + ')'); + } catch (RuntimeException var13) { + throw CollisionMap.method1136(var13, "client.init(" + ')'); } } @Export("finalize") @ObfuscatedName("finalize") protected void finalize() throws Throwable { - class319.field2792.remove(this); + InterfaceParent.method462(this); super.finalize(); } - @ObfuscatedName("al") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)Lhg;", - garbageValue = "-1459620271" + descriptor = "(Luo;B)I", + garbageValue = "80" ) - public static VarcInt method353(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); - if (var1 != null) { - return var1; + static int method361(PacketBuffer var0) { + int var1 = var0.readBits(2); + int var2; + if (var1 == 0) { + var2 = 0; + } else if (var1 == 1) { + var2 = var0.readBits(5); + } else if (var1 == 2) { + var2 = var0.readBits(8); } else { - byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); - var1 = new VarcInt(); - if (var2 != null) { - var1.method972(new Buffer(var2)); - } - - VarcInt.VarcInt_cached.put(var1, (long)var0); - return var1; + var2 = var0.readBits(11); } + + return var2; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "743374996" + ) + public static void method360() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); } - @ObfuscatedName("al") + @ObfuscatedName("mj") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1915022124" + descriptor = "(III)V", + garbageValue = "2100775885" ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; + static void method392(int var0, int var1) { + class59.method334(class174.tempMenuAction, var0, var1); + class174.tempMenuAction = null; } } \ No newline at end of file diff --git a/osrs/src/main/java/ClientPacket.java b/osrs/src/main/java/ClientPacket.java index 40504b305..02f5c469d 100644 --- a/osrs/src/main/java/ClientPacket.java +++ b/osrs/src/main/java/ClientPacket.java @@ -3,678 +3,685 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("lq") @Implements("ClientPacket") -public class ClientPacket implements class307 { - @ObfuscatedName("ac") +public class ClientPacket implements class304 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) + @Export("EVENT_MOUSE_IDLE") public static final ClientPacket EVENT_MOUSE_IDLE; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - static final ClientPacket f1; - @ObfuscatedName("ak") + @Export("OPNPC2") + public static final ClientPacket OPNPC2; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("FRIEND_SETRANK") - public static final ClientPacket f2; - @ObfuscatedName("ax") + @Export("OPNPC3") + public static final ClientPacket OPNPC3; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket f3; - @ObfuscatedName("ao") + @Export("f49") + public static final ClientPacket f49; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket OPOBJE; - @ObfuscatedName("ah") + @Export("f10") + public static final ClientPacket f10; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPPLAYERU") - public static final ClientPacket OPNPCT; - @ObfuscatedName("ar") + @Export("IF_BUTTON10") + public static final ClientPacket IF_BUTTON10; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("IF_BUTTON6") - public static final ClientPacket f5; - @ObfuscatedName("ab") + @Export("f5") + public static final ClientPacket OPPLAYERT; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("UPDATE_APPEARANCE") - public static final ClientPacket f9; - @ObfuscatedName("am") + public static final ClientPacket field2515; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL") - public static final ClientPacket f10; - @ObfuscatedName("av") + @Export("IGNORE_DELUSER") + public static final ClientPacket IGNORE_DELUSER; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPOBJ2_") - public static final ClientPacket f11; - @ObfuscatedName("ag") + @Export("DETECT_MODIFIED_CLIENT") + public static final ClientPacket DETECT_MODIFIED_CLIENT; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket PING_STATS; - @ObfuscatedName("aa") + @Export("PING_STATS") + public static final ClientPacket MOVE_GAMECLICK; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket OPNPC2; - @ObfuscatedName("ap") + @Export("f2") + public static final ClientPacket f2; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("REFLECTION_CHECK_REPLY") - public static final ClientPacket REFLECTION_CHECK_REPLY; + @Export("f20") + public static final ClientPacket f20; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("OPPLAYER1") + public static final ClientPacket OPPLAYER1; @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("FRIENDLIST_DEL") - public static final ClientPacket FRIEND_DELETE_USER; - @ObfuscatedName("as") + @Export("f6") + public static final ClientPacket f6; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("IF_BUTTONT") - static final ClientPacket f6; + @Export("OPNPC1") + public static final ClientPacket OPNPC1; @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("CLICKWORLDMAP") - public static final ClientPacket f16; - @ObfuscatedName("an") + @Export("OPNPCT") + public static final ClientPacket OPNPCT; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) @Export("IF_BUTTON2") - public static final ClientPacket f17; - @ObfuscatedName("au") + public static final ClientPacket IF_BUTTON2; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - static final ClientPacket f18; + @Export("CHAT_SETFILTER") + public static final ClientPacket CHAT_SETFILTER; @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPLOCT") - public static final ClientPacket OPLOCE; - @ObfuscatedName("ae") + @Export("IF_BUTTON4") + public static final ClientPacket IF_BUTTON4; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) + @Export("IF_BUTTON5") public static final ClientPacket IF_BUTTON5; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket field2534; - @ObfuscatedName("aq") + @Export("IF_BUTTON9") + public static final ClientPacket IF_BUTTON9; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("TELEPORT") - public static final ClientPacket f20; - @ObfuscatedName("az") + @Export("OPLOC2") + public static final ClientPacket OPLOC2; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("EVENT_CAMERA_POSITION") - public static final ClientPacket EVENT_CAMERA_FOCUS; - @ObfuscatedName("at") + public static final ClientPacket OPPLAYER2; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("CLAN_JOINCHAT_LEAVECHAT") - public static final ClientPacket f22; + @Export("f88") + public static final ClientPacket f88; @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("IDLE_LOGOUT") - public static final ClientPacket OPLOC5; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPNPC6") + @Export("IF_BUTTONT") public static final ClientPacket IF_BUTTONT; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("IF_BUTTON1") - public static final ClientPacket OPPLAYER3; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - public static final ClientPacket IF_BUTTON9; - @ObfuscatedName("by") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPOBJ1") - public static final ClientPacket IF_BUTTON3; + public static final ClientPacket f1; @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPOBJ1") - public static final ClientPacket OPOBJ1; - @ObfuscatedName("be") + @Export("IF_BUTTON8") + public static final ClientPacket IF_BUTTON8; + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) @Export("NO_TIMEOUT") public static final ClientPacket NO_TIMEOUT; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("OPNPC5") + public static final ClientPacket OPNPC5; @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPPLAYER2") - public static final ClientPacket OPPLAYER8; - @ObfuscatedName("ba") + public static final ClientPacket field2558; + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("RESUME_PAUSEBUTTON") - public static final ClientPacket RESUME_PAUSEBUTTON; - @ObfuscatedName("bz") + @Export("IF_BUTTON3") + public static final ClientPacket IF_BUTTON3; + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("EXIT_FREECAM") - public static final ClientPacket OPOBJ4; - @ObfuscatedName("bb") + @Export("f66") + public static final ClientPacket f66; + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPNPC1") - public static final ClientPacket WIDGET_TYPE; - @ObfuscatedName("bo") + static final ClientPacket field2606; + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPPLAYERT") - public static final ClientPacket OPNPC4; + @Export("WIDGET_TYPE") + public static final ClientPacket WIDGET_TYPE; @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("RESUME_P_OBJDIALOG") - public static final ClientPacket RESUME_OBJDIALOG; - @ObfuscatedName("bt") + @Export("FREECAM_EXIT") + public static final ClientPacket FREECAM_EXIT; + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("EVENT_APPLET_FOCUS") - public static final ClientPacket EVENT_APPLET_FOCUS; - @ObfuscatedName("bm") + public static final ClientPacket field2559; + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket OPLOC1; - @ObfuscatedName("br") + public static final ClientPacket field2546; + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPLOC3") - public static final ClientPacket OPLOC2; - @ObfuscatedName("bs") + @Export("OPOBJ3") + public static final ClientPacket OPOBJ3; + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket OPPLAYERT; - @ObfuscatedName("bc") + @Export("CLICK") + public static final ClientPacket CLICK; + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("MAP_BUILD_COMPLETE") - public static final ClientPacket f49; + @Export("OPLOC3") + public static final ClientPacket OPLOC3; @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPOBJ3") - public static final ClientPacket f50; - @ObfuscatedName("bf") + @Export("OPPLAYER4") + public static final ClientPacket OPPLAYER4; + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket f51; + @Export("RESUME_NAMEDIALOG") + public static final ClientPacket RESUME_NAMEDIALOG; @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("notsure") - public static final ClientPacket f52; - @ObfuscatedName("bl") + static final ClientPacket field2607; + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPOBJ5_") - static final ClientPacket f53; - @ObfuscatedName("bg") + @Export("LOGIN_TIMINGS") + public static final ClientPacket LOGIN_TIMINGS; + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPOBJE") - public static final ClientPacket f4; - @ObfuscatedName("bj") + @Export("f53") + public static final ClientPacket f53; + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket OPNPC3; + @Export("f4") + public static final ClientPacket MIDDLE_MOUSE; @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("WINDOW_STATUS") - public static final ClientPacket EVENT_WINDOW_SETTING; - @ObfuscatedName("bi") + @Export("SOUND_SONGEND") + public static final ClientPacket SOUND_SONGEND; + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPPLAYER6") - public static final ClientPacket OPPLAYER6; - @ObfuscatedName("bq") + @Export("CLAN_KICKUSER") + public static final ClientPacket CLAN_KICKUSER; + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPOBJ2") - public static final ClientPacket IF_BUTTON1; - @ObfuscatedName("bw") + @Export("IF_BUTTON7") + public static final ClientPacket IF_BUTTON7; + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPNPCU") - public static final ClientPacket IF_BUTTON8; - @ObfuscatedName("ce") + public static final ClientPacket OPLOC1; + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("RESUME_P_STRINGDIALOG") - public static final ClientPacket RESUME_STRINGDIALOG; - @ObfuscatedName("cu") + @Export("OPPLAYER7") + public static final ClientPacket OPPLAYER7; + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPPLAYER3") - public static final ClientPacket OPPLAYER2; - @ObfuscatedName("cw") + @Export("f51") + public static final ClientPacket f51; + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("CLIENT_CHEAT") - public static final ClientPacket DOCHEAT; - @ObfuscatedName("co") + @Export("OPPLAYER2") + public static final ClientPacket WIDGET_TYPE5; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("RESUME_STRINGDIALOG") + public static final ClientPacket RESUME_STRINGDIALOG; + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) @Export("CLOSE_MODAL") public static final ClientPacket CLOSE_MODAL; - @ObfuscatedName("cc") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("RESUME_P_COUNTDIALOG") - public static final ClientPacket RESUME_COUNTDIALOG; - @ObfuscatedName("cg") + @Export("OPNPC4") + public static final ClientPacket OPNPC4; + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("RESUME_P_NAMEDIALOG") - public static final ClientPacket RESUME_NAMEDIALOG; - @ObfuscatedName("cq") + @Export("RESUME_COUNTDIALOG") + public static final ClientPacket RESUME_COUNTDIALOG; + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("CLANCHANNEL_KICKUSER") - public static final ClientPacket f65; - @ObfuscatedName("cy") + @Export("DOCHEAT") + public static final ClientPacket DOCHEAT; + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("BUG_REPORT") - public static final ClientPacket f66; - @ObfuscatedName("cz") + @Export("RESUME_OBJDIALOG") + public static final ClientPacket RESUME_OBJDIALOG; + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket IF_BUTTON7; - @ObfuscatedName("cp") + @Export("f96") + public static final ClientPacket f96; + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPPLAYER8") - public static final ClientPacket EVENT_KEYBOARD; - @ObfuscatedName("cb") + @Export("OPOBJ4") + public static final ClientPacket OPLOCT; + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("EVENT_MOUSE_SCROLl") - public static final ClientPacket f69; - @ObfuscatedName("cn") + public static final ClientPacket field2573; + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("CLAN_KICKUSER") - public static final ClientPacket CLAN_KICKUSER; - @ObfuscatedName("ck") + public static final ClientPacket field2580; + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPLOCE") - public static final ClientPacket OPLOC3; - @ObfuscatedName("cr") + @Export("OPPLAYER6") + public static final ClientPacket OPPLAYER6; + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPNPCE") + @Export("OPPLAYER5") public static final ClientPacket OPPLAYER5; - @ObfuscatedName("cs") + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPPLAYER4") - public static final ClientPacket OPPLAYER4; - @ObfuscatedName("cm") + @Export("FRIEND_DELETE_USER") + public static final ClientPacket FRIEND_DELETE_USER; + @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket OPNPCE; - @ObfuscatedName("cv") + @Export("CHAT_SEND_ABUSE_REPORT") + public static final ClientPacket CHAT_SEND_ABUSE_REPORT; + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("IGNORELIST_DEL") - public static final ClientPacket IGNORE_DELUSER; - @ObfuscatedName("ci") + static final ClientPacket field2608; + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPLOC2") + @Export("OPOBJ2") public static final ClientPacket OPOBJ2; - @ObfuscatedName("cj") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket OPNPC1; - @ObfuscatedName("cx") + @Export("IF_BUTTON1") + public static final ClientPacket IF_BUTTON1; + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPPLAYER1") - public static final ClientPacket OPPLAYER1; + @Export("EVENT_APPLET_FOCUS") + public static final ClientPacket EVENT_APPLET_FOCUS; @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("SET_CHATFILTERSETTINGS") - public static final ClientPacket CHAT_SETFILTER; - @ObfuscatedName("cd") + @Export("f52") + public static final ClientPacket f52; + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) @Export("EVENT_MOUSE_CLICK") public static final ClientPacket EVENT_MOUSE_CLICK; - @ObfuscatedName("ct") + @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("MESSAGE_PRIVATE") - public static final ClientPacket CHAT_SENDPRIVATE; - @ObfuscatedName("cf") + public static final ClientPacket field2587; + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket IF_BUTTON4; - @ObfuscatedName("cl") + @Export("f9") + public static final ClientPacket f9; + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL") - public static final ClientPacket f83; - @ObfuscatedName("ca") + @Export("RESUME_PAUSEBUTTON") + public static final ClientPacket RESUME_PAUSEBUTTON; + @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPPLAYER7") - public static final ClientPacket OPPLAYER7; - @ObfuscatedName("dv") + @Export("CHAT_SENDPRIVATE") + public static final ClientPacket CHAT_SENDPRIVATE; + @ObfuscatedName("dt") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("LOGIN_STATISTICS") - public static final ClientPacket LOGIN_TIMINGS; - @ObfuscatedName("dm") + @Export("REFLECTION_CHECK_REPLY") + public static final ClientPacket REFLECTION_CHECK_REPLY; + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPLOC1") - public static final ClientPacket OPLOC4; - @ObfuscatedName("ds") + @Export("IF_BUTTON6") + public static final ClientPacket IF_BUTTON6; + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("DETECT_MODIFIED_CLIENT") - public static final ClientPacket DETECT_MODIFIED_CLIENT; - @ObfuscatedName("dx") + public static final ClientPacket field2595; + @ObfuscatedName("dd") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("FRIENDLIST_ADD") - public static final ClientPacket f88; - @ObfuscatedName("dg") + @Export("FIREND_ADDUSER") + public static final ClientPacket FIREND_ADDUSER; + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket IF_BUTTON10; - @ObfuscatedName("dq") + public static final ClientPacket field2604; + @ObfuscatedName("dh") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket FREECAM_EXIT; - @ObfuscatedName("dz") + public static final ClientPacket field2593; + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket IF_BUTTON2; - @ObfuscatedName("dn") + @Export("OPPLAYER3") + public static final ClientPacket OPPLAYER3; + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPNPC3") - public static final ClientPacket OPNPC5; - @ObfuscatedName("dk") + @Export("f65") + public static final ClientPacket f65; + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) + @Export("OPOBJ5") public static final ClientPacket OPOBJ5; - @ObfuscatedName("df") + @ObfuscatedName("do") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket IF_BUTTON6; - @ObfuscatedName("de") + @Export("f83") + public static final ClientPacket f83; + @ObfuscatedName("db") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) @Export("MOVE_GAMECLICK") - public static final ClientPacket MOVE_GAMECLICK; - @ObfuscatedName("dl") + public static final ClientPacket OPLOC5; + @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("IF_BUTTON5") - public static final ClientPacket OPOBJ3; - @ObfuscatedName("dp") + @Export("f22") + public static final ClientPacket f22; + @ObfuscatedName("dr") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("OPOBJ4") - public static final ClientPacket OPLOCT; - @ObfuscatedName("do") + @Export("OPLOCE") + public static final ClientPacket OPLOCE; + @ObfuscatedName("ds") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("MESSAGE_PUBLIC") - public static final ClientPacket f96; - @ObfuscatedName("dh") + @Export("EVENT_CAMERA_FOCUS") + public static final ClientPacket EVENT_CAMERA_FOCUS; + @ObfuscatedName("da") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) + @Export("f97") public static final ClientPacket f97; - @ObfuscatedName("dj") + @ObfuscatedName("dw") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("SEND_SNAPSHOT") - public static final ClientPacket CHAT_SEND_ABUSE_REPORT; - @ObfuscatedName("du") + static final ClientPacket field2610; + @ObfuscatedName("dp") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("SOUND_SONGEND") - public static final ClientPacket SOUND_SONGEND; - @ObfuscatedName("dr") + @Export("OPLOC4") + public static final ClientPacket OPLOC4; + @ObfuscatedName("df") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - public static final ClientPacket OPOBJT; - @ObfuscatedName("dw") + @Export("OPPLAYER8") + public static final ClientPacket OPPLAYER8; + @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("IF_BUTTOND") + @Export("OPHELDD") public static final ClientPacket OPHELDD; - @ObfuscatedName("di") + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) - @Export("IGNORELIST_ADD") - public static final ClientPacket FIREND_ADDUSER; - @ObfuscatedName("dt") + public static final ClientPacket field2605; + @ObfuscatedName("dl") @Export("id") public final int id; - @ObfuscatedName("dd") + @ObfuscatedName("de") @Export("length") public final int length; static { - EVENT_MOUSE_IDLE = new ClientPacket(0, 0); - f1 = new ClientPacket(1, 7); - f2 = new ClientPacket(2, -1); - f3 = new ClientPacket(3, 1); - OPOBJE = new ClientPacket(4, 6); - OPNPCT = new ClientPacket(5, 11); - f5 = new ClientPacket(6, -1); - f9 = new ClientPacket(7, 13); - f10 = new ClientPacket(8, -1); - f11 = new ClientPacket(9, 22); - PING_STATS = new ClientPacket(10, 10); - OPNPC2 = new ClientPacket(11, 3); - REFLECTION_CHECK_REPLY = new ClientPacket(12, -1); - FRIEND_DELETE_USER = new ClientPacket(13, -1); - f6 = new ClientPacket(14, -1); - f16 = new ClientPacket(15, 4); - f17 = new ClientPacket(16, 2); - f18 = new ClientPacket(17, 2); - OPLOCE = new ClientPacket(18, 2); - IF_BUTTON5 = new ClientPacket(19, 8); - field2534 = new ClientPacket(20, 15); - f20 = new ClientPacket(21, 9); - EVENT_CAMERA_FOCUS = new ClientPacket(22, 4); - f22 = new ClientPacket(23, -1); - OPLOC5 = new ClientPacket(24, 7); - IF_BUTTONT = new ClientPacket(25, 16); - OPPLAYER3 = new ClientPacket(26, 3); - IF_BUTTON9 = new ClientPacket(27, 8); - IF_BUTTON3 = new ClientPacket(28, 8); - OPOBJ1 = new ClientPacket(29, 7); - NO_TIMEOUT = new ClientPacket(30, 0); - OPPLAYER8 = new ClientPacket(31, 3); - RESUME_PAUSEBUTTON = new ClientPacket(32, 6); - OPOBJ4 = new ClientPacket(33, 7); - WIDGET_TYPE = new ClientPacket(34, 4); - OPNPC4 = new ClientPacket(35, 3); - RESUME_OBJDIALOG = new ClientPacket(36, 2); - EVENT_APPLET_FOCUS = new ClientPacket(37, 1); - OPLOC1 = new ClientPacket(38, 7); - OPLOC2 = new ClientPacket(39, 7); - OPPLAYERT = new ClientPacket(40, 11); - f49 = new ClientPacket(41, 0); - f50 = new ClientPacket(42, 1); - f51 = new ClientPacket(43, -1); - f52 = new ClientPacket(44, -1); - f53 = new ClientPacket(45, 2); - f4 = new ClientPacket(46, 11); - OPNPC3 = new ClientPacket(47, 3); - EVENT_WINDOW_SETTING = new ClientPacket(48, 5); - OPPLAYER6 = new ClientPacket(49, 3); - IF_BUTTON1 = new ClientPacket(50, 8); - IF_BUTTON8 = new ClientPacket(51, 8); - RESUME_STRINGDIALOG = new ClientPacket(52, -1); - OPPLAYER2 = new ClientPacket(53, 3); - DOCHEAT = new ClientPacket(54, -1); - CLOSE_MODAL = new ClientPacket(55, 0); - RESUME_COUNTDIALOG = new ClientPacket(56, 4); - RESUME_NAMEDIALOG = new ClientPacket(57, -1); - f65 = new ClientPacket(58, -1); - f66 = new ClientPacket(59, -2); - IF_BUTTON7 = new ClientPacket(60, 8); - EVENT_KEYBOARD = new ClientPacket(61, -2); - f69 = new ClientPacket(62, 11); - CLAN_KICKUSER = new ClientPacket(63, -1); - OPLOC3 = new ClientPacket(64, 7); - OPPLAYER5 = new ClientPacket(65, 3); - OPPLAYER4 = new ClientPacket(66, 3); - OPNPCE = new ClientPacket(67, 2); - IGNORE_DELUSER = new ClientPacket(68, -1); - OPOBJ2 = new ClientPacket(69, 7); - OPNPC1 = new ClientPacket(70, 3); - OPPLAYER1 = new ClientPacket(71, 3); - CHAT_SETFILTER = new ClientPacket(72, 3); - EVENT_MOUSE_CLICK = new ClientPacket(73, 6); - CHAT_SENDPRIVATE = new ClientPacket(74, -2); - IF_BUTTON4 = new ClientPacket(75, 8); - f83 = new ClientPacket(76, -1); - OPPLAYER7 = new ClientPacket(77, 3); - LOGIN_TIMINGS = new ClientPacket(78, -1); - OPLOC4 = new ClientPacket(79, 7); - DETECT_MODIFIED_CLIENT = new ClientPacket(80, 4); - f88 = new ClientPacket(81, -1); - IF_BUTTON10 = new ClientPacket(82, 8); - FREECAM_EXIT = new ClientPacket(83, 0); - IF_BUTTON2 = new ClientPacket(84, 8); - OPNPC5 = new ClientPacket(85, 3); - OPOBJ5 = new ClientPacket(86, 7); - IF_BUTTON6 = new ClientPacket(87, 8); - MOVE_GAMECLICK = new ClientPacket(88, -1); - OPOBJ3 = new ClientPacket(89, 7); - OPLOCT = new ClientPacket(90, 15); - f96 = new ClientPacket(91, -1); - f97 = new ClientPacket(92, 15); - CHAT_SEND_ABUSE_REPORT = new ClientPacket(93, -1); - SOUND_SONGEND = new ClientPacket(94, 4); - OPOBJT = new ClientPacket(95, 15); - OPHELDD = new ClientPacket(96, 16); - FIREND_ADDUSER = new ClientPacket(97, -1); + EVENT_MOUSE_IDLE = new ClientPacket(0, 5); + OPNPC2 = new ClientPacket(1, 3); + OPNPC3 = new ClientPacket(2, 3); + f49 = new ClientPacket(3, 0); + f10 = new ClientPacket(4, -1); + IF_BUTTON10 = new ClientPacket(5, 8); + OPPLAYERT = new ClientPacket(6, 11); + field2515 = new ClientPacket(7, 0); + IGNORE_DELUSER = new ClientPacket(8, -1); + DETECT_MODIFIED_CLIENT = new ClientPacket(9, 4); + MOVE_GAMECLICK = new ClientPacket(10, -1); + f2 = new ClientPacket(11, -1); + f20 = new ClientPacket(12, 9); + OPPLAYER1 = new ClientPacket(13, 3); + f6 = new ClientPacket(14, 16); + OPNPC1 = new ClientPacket(15, 3); + OPNPCT = new ClientPacket(16, 11); + IF_BUTTON2 = new ClientPacket(17, 8); + CHAT_SETFILTER = new ClientPacket(18, 3); + IF_BUTTON4 = new ClientPacket(19, 8); + IF_BUTTON5 = new ClientPacket(20, 8); + IF_BUTTON9 = new ClientPacket(21, 8); + OPLOC2 = new ClientPacket(22, 7); + OPPLAYER2 = new ClientPacket(23, 3); + f88 = new ClientPacket(24, -1); + IF_BUTTONT = new ClientPacket(25, -2); + f1 = new ClientPacket(26, 1); + IF_BUTTON8 = new ClientPacket(27, 8); + NO_TIMEOUT = new ClientPacket(28, 0); + OPNPC5 = new ClientPacket(29, 3); + field2558 = new ClientPacket(30, 7); + IF_BUTTON3 = new ClientPacket(31, 8); + f66 = new ClientPacket(32, -2); + field2606 = new ClientPacket(33, 2); + WIDGET_TYPE = new ClientPacket(34, 3); + FREECAM_EXIT = new ClientPacket(35, 0); + field2559 = new ClientPacket(36, 16); + field2546 = new ClientPacket(37, 7); + OPOBJ3 = new ClientPacket(38, 15); + CLICK = new ClientPacket(39, 6); + OPLOC3 = new ClientPacket(40, 7); + OPPLAYER4 = new ClientPacket(41, 3); + RESUME_NAMEDIALOG = new ClientPacket(42, -1); + field2607 = new ClientPacket(43, -1); + LOGIN_TIMINGS = new ClientPacket(44, -1); + f53 = new ClientPacket(45, 15); + MIDDLE_MOUSE = new ClientPacket(46, 2); + SOUND_SONGEND = new ClientPacket(47, 4); + CLAN_KICKUSER = new ClientPacket(48, -1); + IF_BUTTON7 = new ClientPacket(49, 8); + OPLOC1 = new ClientPacket(50, 7); + OPPLAYER7 = new ClientPacket(51, 3); + f51 = new ClientPacket(52, -1); + WIDGET_TYPE5 = new ClientPacket(53, 4); + RESUME_STRINGDIALOG = new ClientPacket(54, -1); + CLOSE_MODAL = new ClientPacket(55, 2); + OPNPC4 = new ClientPacket(56, 3); + RESUME_COUNTDIALOG = new ClientPacket(57, 4); + DOCHEAT = new ClientPacket(58, -1); + RESUME_OBJDIALOG = new ClientPacket(59, 2); + f96 = new ClientPacket(60, -1); + OPLOCT = new ClientPacket(61, 15); + field2573 = new ClientPacket(62, 7); + field2580 = new ClientPacket(63, 4); + OPPLAYER6 = new ClientPacket(64, 3); + OPPLAYER5 = new ClientPacket(65, 1); + FRIEND_DELETE_USER = new ClientPacket(66, -1); + CHAT_SEND_ABUSE_REPORT = new ClientPacket(67, -1); + field2608 = new ClientPacket(68, 2); + OPOBJ2 = new ClientPacket(69, 6); + IF_BUTTON1 = new ClientPacket(70, 8); + EVENT_APPLET_FOCUS = new ClientPacket(71, 1); + f52 = new ClientPacket(72, -1); + EVENT_MOUSE_CLICK = new ClientPacket(73, 11); + field2587 = new ClientPacket(74, 11); + f9 = new ClientPacket(75, 13); + RESUME_PAUSEBUTTON = new ClientPacket(76, 6); + CHAT_SENDPRIVATE = new ClientPacket(77, -2); + REFLECTION_CHECK_REPLY = new ClientPacket(78, -1); + IF_BUTTON6 = new ClientPacket(79, 8); + field2595 = new ClientPacket(80, 7); + FIREND_ADDUSER = new ClientPacket(81, -1); + field2604 = new ClientPacket(82, 15); + field2593 = new ClientPacket(83, 0); + OPPLAYER3 = new ClientPacket(84, 3); + f65 = new ClientPacket(85, -1); + OPOBJ5 = new ClientPacket(86, -1); + f83 = new ClientPacket(87, -1); + OPLOC5 = new ClientPacket(88, 7); + f22 = new ClientPacket(89, -1); + OPLOCE = new ClientPacket(90, 2); + EVENT_CAMERA_FOCUS = new ClientPacket(91, 4); + f97 = new ClientPacket(92, 22); + field2610 = new ClientPacket(93, 7); + OPLOC4 = new ClientPacket(94, 7); + OPPLAYER8 = new ClientPacket(95, 3); + OPHELDD = new ClientPacket(96, 10); + field2605 = new ClientPacket(97, 7); } ClientPacket(int var1, int var2) { @@ -682,85 +689,13 @@ public class ClientPacket implements class307 { this.length = var2; } - @ObfuscatedName("at") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "1044263127" - ) - static int method1640(int var0, Script var1, boolean var2) { - Widget var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == 2800) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var3)); - return 1; - } else if (var0 != 2801) { - if (var0 == 2802) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - } - - @ObfuscatedName("mh") - @ObfuscatedSignature( - descriptor = "([Lnm;IB)V", - garbageValue = "5" - ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null) { - if (var3.type == 0) { - if (var3.children != null) { - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - Interpreter.runIntfCloseListener(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - Interpreter.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = class33.widgetDefinition.method1740(var3.id); - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { - continue; - } - } - - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onSubChange; - Interpreter.runScriptEvent(var5); - } - } - } - + descriptor = "(Ljava/lang/CharSequence;B)Z", + garbageValue = "1" + ) + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return Script.method447(var0, 10, true); } } \ No newline at end of file diff --git a/osrs/src/main/java/ClientPreferences.java b/osrs/src/main/java/ClientPreferences.java index 03af77a25..0c1a62bd7 100644 --- a/osrs/src/main/java/ClientPreferences.java +++ b/osrs/src/main/java/ClientPreferences.java @@ -8,46 +8,44 @@ import java.util.Map; import java.util.Map.Entry; -@ObfuscatedName("dy") +@ObfuscatedName("dl") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("cf") - static int field1059; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("displayFps") boolean displayFps; - @ObfuscatedName("am") - int field1068; - @ObfuscatedName("av") + @ObfuscatedName("al") + int field1070; + @ObfuscatedName("az") @Export("brightness") double brightness; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("musicVolume") int musicVolume; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("ay") - int field1070; @ObfuscatedName("as") + int field1072; + @ObfuscatedName("ay") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("windowMode") int windowMode; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("parameters") final Map parameters; @@ -58,15 +56,15 @@ public class ClientPreferences { this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1070 = -1; + this.field1072 = -1; this.rememberedUsername = null; this.windowMode = 1; this.parameters = new LinkedHashMap(); - this.method536(true); + this.method537(true); } @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;)V" ) ClientPreferences(Buffer var1) { this.hideUsername = false; @@ -75,7 +73,7 @@ public class ClientPreferences { this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1070 = -1; + this.field1072 = -1; this.rememberedUsername = null; this.windowMode = 1; this.parameters = new LinkedHashMap(); @@ -120,7 +118,7 @@ public class ClientPreferences { } if (var2 > 7) { - this.field1070 = var1.readUnsignedByte(); + this.field1072 = var1.readUnsignedByte(); } if (var2 > 8) { @@ -128,29 +126,29 @@ public class ClientPreferences { } if (var2 > 9) { - this.field1068 = var1.readInt(); + this.field1070 = var1.readInt(); } } else { - this.method536(true); + this.method537(true); } } else { - this.method536(true); + this.method537(true); } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "12" + garbageValue = "65" ) - void method536(boolean var1) { + void method537(boolean var1) { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)Lul;", - garbageValue = "2143107784" + descriptor = "(I)Luj;", + garbageValue = "1617415071" ) @Export("toBuffer") Buffer toBuffer() { @@ -170,221 +168,221 @@ Buffer toBuffer() { var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); var1.writeBoolean(this.hideUsername); - var1.writeByte((int)(100.0D * this.brightness)); + var1.writeByte((int)(this.brightness * 100.0D)); var1.writeByte(this.musicVolume); var1.writeByte(this.soundEffectsVolume); var1.writeByte(this.areaSoundEffectsVolume); - var1.writeByte(this.field1070); + var1.writeByte(this.field1072); var1.writeByte(this.displayFps ? 1 : 0); - var1.writeInt(this.field1068); + var1.writeInt(this.field1070); return var1; } @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "5523" + descriptor = "(ZB)V", + garbageValue = "-10" ) @Export("setRoofsHidden") void setRoofsHidden(boolean var1) { this.roofsHidden = var1; - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-16777216" + garbageValue = "-194443239" ) @Export("getRoofsHidden") boolean getRoofsHidden() { return this.roofsHidden; } - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-118" + descriptor = "(ZI)V", + garbageValue = "-2140370030" ) @Export("setIsUsernameHidden") void setIsUsernameHidden(boolean var1) { this.hideUsername = var1; - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("ab") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2079873029" + garbageValue = "190376852" ) @Export("getIsUsernameHidden") boolean getIsUsernameHidden() { return this.hideUsername; } - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1738158187" + descriptor = "(ZS)V", + garbageValue = "-5895" ) @Export("getTitleMusicDisabled") void getTitleMusicDisabled(boolean var1) { this.titleMusicDisabled = var1; - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("av") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-76" + descriptor = "(I)Z", + garbageValue = "1853874202" ) @Export("getTitleMusicDisabled") boolean getTitleMusicDisabled() { return this.titleMusicDisabled; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1239790948" + garbageValue = "-1108077215" ) - void method544(boolean var1) { + void method545(boolean var1) { this.displayFps = var1; - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("aa") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-448178452" + garbageValue = "-482539852" ) - void method545() { - this.method544(!this.displayFps); + void method546() { + this.method545(!this.displayFps); } - @ObfuscatedName("ap") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1788161752" + garbageValue = "682721054" ) - boolean method546() { + boolean method547() { return this.displayFps; } - @ObfuscatedName("ay") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "34" + descriptor = "(IS)V", + garbageValue = "-12427" ) - void method547(int var1) { - this.field1068 = var1; - class144.savePreferences(); + void method548(int var1) { + this.field1070 = var1; + TextureProvider.savePreferences(); } @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-67" + garbageValue = "0" ) - int method548() { - return this.field1068; + int method549() { + return this.field1070; } - @ObfuscatedName("aj") + @ObfuscatedName("ay") @Export("setBrightness") void setBrightness(double var1) { this.brightness = var1; - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("an") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)D", - garbageValue = "579802004" + garbageValue = "-2063080274" ) @Export("getBrightness") double getBrightness() { return this.brightness; } - @ObfuscatedName("au") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "428446104" + garbageValue = "1063115901" ) @Export("setCurrentMusicVolume") void setCurrentMusicVolume(int var1) { this.musicVolume = var1; - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("ai") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "813225298" + garbageValue = "2102721692" ) @Export("getCurrentMusicVolume") int getCurrentMusicVolume() { return this.musicVolume; } - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1930056928" + descriptor = "(IS)V", + garbageValue = "256" ) @Export("setCurrentSoundEffectVolume") void setCurrentSoundEffectVolume(int var1) { this.soundEffectsVolume = var1; - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("aw") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "440195040" + garbageValue = "782450849" ) @Export("getCurrentSoundEffectsVolume") int getCurrentSoundEffectsVolume() { return this.soundEffectsVolume; } - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1563658200" + garbageValue = "-568127597" ) @Export("setAreaSoundEffectsVolume") void setAreaSoundEffectsVolume(int var1) { this.areaSoundEffectsVolume = var1; - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("az") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-40" + descriptor = "(I)I", + garbageValue = "-1804486619" ) @Export("getAreaSoundEffectsVolume") int getAreaSoundEffectsVolume() { return this.areaSoundEffectsVolume; } - @ObfuscatedName("at") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "8224" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1092362617" ) @Export("setUsernameToRemember") void setUsernameToRemember(String var1) { this.rememberedUsername = var1; - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "222957667" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-25" ) @Export("getUsernameToRemember") String getUsernameToRemember() { @@ -394,48 +392,48 @@ String getUsernameToRemember() { @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "305556660" + garbageValue = "608118295" ) - void method559(int var1) { - this.field1070 = var1; - class144.savePreferences(); + void method560(int var1) { + this.field1072 = var1; + TextureProvider.savePreferences(); } - @ObfuscatedName("bn") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2047489929" + descriptor = "(B)I", + garbageValue = "-12" ) - int method560() { - return this.field1070; + int method561() { + return this.field1072; } - @ObfuscatedName("bk") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1603412139" + descriptor = "(IB)V", + garbageValue = "32" ) - void method561(int var1) { + void method562(int var1) { this.windowMode = var1; - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("by") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-453513391" + garbageValue = "-1248539592" ) - int method562() { + int method563() { return this.windowMode; } - @ObfuscatedName("bd") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;II)V", - garbageValue = "1984702450" + garbageValue = "-1748399566" ) - void method563(String var1, int var2) { - int var3 = this.method566(var1); + void method564(String var1, int var2) { + int var3 = this.method567(var1); if (this.parameters.size() >= 10 && !this.parameters.containsKey(var3)) { Iterator var4 = this.parameters.entrySet().iterator(); var4.next(); @@ -443,117 +441,96 @@ void method563(String var1, int var2) { } this.parameters.put(var3, var2); - class144.savePreferences(); + TextureProvider.savePreferences(); } - @ObfuscatedName("be") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-754165935" + garbageValue = "-885731567" ) - boolean method564(String var1) { - int var2 = this.method566(var1); + boolean method565(String var1) { + int var2 = this.method567(var1); return this.parameters.containsKey(var2); } @ObfuscatedName("bv") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-558374148" + garbageValue = "1978025457" ) - int method565(String var1) { - int var2 = this.method566(var1); + int method566(String var1) { + int var2 = this.method567(var1); return !this.parameters.containsKey(var2) ? 0 : (Integer)this.parameters.get(var2); } - @ObfuscatedName("ba") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1498275662" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "8" ) - int method566(String var1) { - return PacketWriter.method647(var1.toLowerCase()); + int method567(String var1) { + return Message.method354(var1.toLowerCase()); } - @ObfuscatedName("ah") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ILds;ZS)I", - garbageValue = "-14036" + descriptor = "(II)Lht;", + garbageValue = "1728806709" ) - static int method567(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = class33.widgetDefinition.method1740(var3); + @Export("getWidget") + public static VarbitComposition getWidget(int var0) { + VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - var4 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - } - - if (var0 == 1000) { - Interpreter.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - ClanChannelMember.invalidateWidget(var4); - class159.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == 1001) { - Interpreter.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - ClanChannelMember.invalidateWidget(var4); - class159.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var3 >> 16], var4, false); + byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); + var1 = new VarbitComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - return 1; - } else if (var0 == 1003) { - boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - ClanChannelMember.invalidateWidget(var4); - } - - return 1; - } else if (var0 == 1005) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1006) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else { - return 2; + VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)[Lem;", - garbageValue = "1083227717" + descriptor = "(III)I", + garbageValue = "2085182056" ) - static AttackOption[] method569() { - return new AttackOption[]{AttackOption.field1100, AttackOption.field1102, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick}; + static int method535(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; + } } - @ObfuscatedName("an") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-29" - ) - static final int method568(int var0, int var1) { - int var2 = var1 * 57 + var0; - var2 ^= var2 << 13; - int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; + descriptor = "(ZB)V", + garbageValue = "-77" + ) + static void method568(boolean var0) { + byte var1 = 0; + if (!class4.method7()) { + var1 = 12; + } else if (SpriteMask.client.method364() || SpriteMask.client.method366() || SpriteMask.client.method365()) { + var1 = 10; + } + + UserComparator7.method674(var1); + if (var0) { + Login.Login_username = ""; + Login.Login_password = ""; + class53.field256 = 0; + NewShit.otp = ""; + } + + Frames.method1519(); + class150.method785(); } } \ No newline at end of file diff --git a/osrs/src/main/java/Clips.java b/osrs/src/main/java/Clips.java index 95f1984f9..136ad06f5 100644 --- a/osrs/src/main/java/Clips.java +++ b/osrs/src/main/java/Clips.java @@ -3,75 +3,75 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("kh") @Implements("Clips") public class Clips { - @ObfuscatedName("ac") - boolean field2278; - @ObfuscatedName("al") - public boolean field2289; - @ObfuscatedName("ak") - int field2282; + @ObfuscatedName("at") + boolean field2446; @ObfuscatedName("ah") - public int field2290; + public boolean field2457; @ObfuscatedName("ar") + int field2452; + @ObfuscatedName("au") + public int field2458; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Llw;" ) @Export("Rasterizer3D_textureLoader") public TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("ap") - int field2284; - @ObfuscatedName("ay") - int field2287; + @ObfuscatedName("ax") + int field2454; @ObfuscatedName("as") - int field2285; + int field2453; + @ObfuscatedName("ay") + int field2455; + @ObfuscatedName("ak") + int field2449; @ObfuscatedName("aj") - int field2281; - @ObfuscatedName("an") @Export("clipNegativeMidX") int clipNegativeMidX; - @ObfuscatedName("au") - int field2286; - @ObfuscatedName("ai") + @ObfuscatedName("am") + int field2450; + @ObfuscatedName("aq") @Export("clipNegativeMidY") int clipNegativeMidY; - @ObfuscatedName("ae") - int field2279; + @ObfuscatedName("ai") + int field2447; @ObfuscatedName("aw") @Export("Rasterizer3D_rowOffsets") int[] Rasterizer3D_rowOffsets; Clips() { - this.field2278 = false; - this.field2289 = true; - this.field2282 = 0; - this.field2290 = 512; + this.field2446 = false; + this.field2457 = true; + this.field2452 = 0; + this.field2458 = 512; this.Rasterizer3D_rowOffsets = new int[1024]; } - @ObfuscatedName("ac") - void method1400() { - this.field2284 = this.field2285 / 2; - this.field2287 = this.field2281 / 2; - this.clipNegativeMidX = -this.field2284; - this.field2286 = this.field2285 - this.field2284; - this.clipNegativeMidY = -this.field2287; - this.field2279 = this.field2281 - this.field2287; + @ObfuscatedName("at") + void method1578() { + this.field2454 = this.field2455 / 2; + this.field2453 = this.field2449 / 2; + this.clipNegativeMidX = -this.field2454; + this.field2450 = this.field2455 - this.field2454; + this.clipNegativeMidY = -this.field2453; + this.field2447 = this.field2449 - this.field2453; } - @ObfuscatedName("al") - void method1401(int var1, int var2, int var3, int var4) { - this.field2284 = var1 - var2; - this.field2287 = var3 - var4; - this.clipNegativeMidX = -this.field2284; - this.field2286 = this.field2285 - this.field2284; - this.clipNegativeMidY = -this.field2287; - this.field2279 = this.field2281 - this.field2287; + @ObfuscatedName("ah") + void method1579(int var1, int var2, int var3, int var4) { + this.field2454 = var1 - var2; + this.field2453 = var3 - var4; + this.clipNegativeMidX = -this.field2454; + this.field2450 = this.field2455 - this.field2454; + this.clipNegativeMidY = -this.field2453; + this.field2447 = this.field2449 - this.field2453; } - @ObfuscatedName("ak") - void method1402(int var1, int var2, int var3) { - this.field2278 = var1 < 0 || var1 > this.field2285 || var2 < 0 || var2 > this.field2285 || var3 < 0 || var3 > this.field2285; + @ObfuscatedName("ar") + void method1580(int var1, int var2, int var3) { + this.field2446 = var1 < 0 || var1 > this.field2455 || var2 < 0 || var2 > this.field2455 || var3 < 0 || var3 > this.field2455; } } \ No newline at end of file diff --git a/osrs/src/main/java/Clock.java b/osrs/src/main/java/Clock.java index 7b53f6dae..eaf7caa50 100644 --- a/osrs/src/main/java/Clock.java +++ b/osrs/src/main/java/Clock.java @@ -3,40 +3,31 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("iu") @Implements("Clock") public abstract class Clock { - @ObfuscatedName("kr") - static int field1484; + @ObfuscatedName("am") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("iw") + static long field1876; Clock() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "436321701" + garbageValue = "-1366277024" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "712947185" + garbageValue = "-2001388980" ) @Export("wait") public abstract int wait(int var1, int var2); - - @ObfuscatedName("jl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1548584577" - ) - static void method944() { - for (class225 var0 = (class225)Client.field626.last(); var0 != null; var0 = (class225)Client.field626.previous()) { - var0.remove(); - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/CollisionMap.java b/osrs/src/main/java/CollisionMap.java index 249fae130..3b0998f74 100644 --- a/osrs/src/main/java/CollisionMap.java +++ b/osrs/src/main/java/CollisionMap.java @@ -3,28 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("iw") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("bz") + @ObfuscatedName("vj") + static int field1901; + @ObfuscatedName("ba") @Export("xInset") int xInset; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("yInset") int yInset; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("xSize") int xSize; - @ObfuscatedName("bp") + @ObfuscatedName("bw") @Export("ySize") int ySize; - @ObfuscatedName("bt") + @ObfuscatedName("bj") @Export("flags") public int[][] flags; @@ -37,10 +33,10 @@ public CollisionMap(int var1, int var2) { this.clear(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1112127553" + garbageValue = "-1902574063" ) @Export("clear") public void clear() { @@ -56,12 +52,12 @@ public void clear() { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIIIZB)V", - garbageValue = "22" + descriptor = "(IIIIZI)V", + garbageValue = "-1712724177" ) - public void method1156(int var1, int var2, int var3, int var4, boolean var5) { + public void method1137(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -208,10 +204,10 @@ public void method1156(int var1, int var2, int var3, int var4, boolean var5) { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(IIIIZB)V", - garbageValue = "-29" + garbageValue = "68" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -235,10 +231,10 @@ public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "404851372" + garbageValue = "-1907019996" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -248,10 +244,10 @@ public void setBlockedByFloor(int var1, int var2) { var10000[var2] |= 2097152; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "43" + descriptor = "(III)V", + garbageValue = "-1671554834" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -261,10 +257,10 @@ public void setBlockedByFloorDec(int var1, int var2) { var10000[var2] |= 262144; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1437518268" + descriptor = "(IIIB)V", + garbageValue = "1" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -272,12 +268,12 @@ void setFlag(int var1, int var2, int var3) { var10000[var2] |= var3; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "1303990924" + garbageValue = "1877141157" ) - public void method1162(int var1, int var2, int var3, int var4, boolean var5) { + public void method1142(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -424,10 +420,10 @@ public void method1162(int var1, int var2, int var3, int var4, boolean var5) { } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(IIIIIZI)V", - garbageValue = "-1836775904" + garbageValue = "-1490436324" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -457,10 +453,10 @@ public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5 } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1412347367" + garbageValue = "1035067169" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -468,178 +464,69 @@ void setFlagOff(int var1, int var2, int var3) { var10000[var2] &= ~var3; } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-278708003" + descriptor = "(IIB)V", + garbageValue = "-95" ) - public void method1165(int var1, int var2) { + public void method1145(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; int[] var10000 = this.flags[var1]; var10000[var2] &= -262145; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Loa;B)I", - garbageValue = "-53" + descriptor = "(I[BLrg;I)V", + garbageValue = "412809840" ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); - int var4 = var1.length(); - int var5 = 0; - int var6 = 0; - char var7 = 0; - char var8 = 0; - - while (var5 - var7 < var3 || var6 - var8 < var4) { - if (var5 - var7 >= var3) { - return -1; - } - - if (var6 - var8 >= var4) { - return 1; - } - - char var9; - if (var7 != 0) { - var9 = var7; - boolean var14 = false; - } else { - var9 = var0.charAt(var5++); - } - - char var10; - if (var8 != 0) { - var10 = var8; - boolean var15 = false; - } else { - var10 = var1.charAt(var6++); - } - - var7 = class216.method1058(var9); - var8 = class216.method1058(var10); - var9 = class319.standardizeChar(var9, var2); - var10 = class319.standardizeChar(var10, var2); - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var9 != var10) { - return class11.lowercaseChar(var9, var2) - class11.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); - - char var12; - int var17; - for (var17 = 0; var17 < var16; ++var17) { - if (var2 == Language.Language_FR) { - var5 = var3 - 1 - var17; - var6 = var4 - 1 - var17; - } else { - var6 = var17; - var5 = var17; - } - - char var11 = var0.charAt(var5); - var12 = var1.charAt(var6); - if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { - var11 = Character.toLowerCase(var11); - var12 = Character.toLowerCase(var12); - if (var12 != var11) { - return class11.lowercaseChar(var11, var2) - class11.lowercaseChar(var12, var2); - } - } + static void method1134(int var0, byte[] var1, ArchiveDisk var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 0; + var3.key = (long)var0; + var3.data = var1; + var3.archiveDisk = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); } - var17 = var3 - var4; - if (var17 != 0) { - return var17; - } else { - for (int var18 = 0; var18 < var16; ++var18) { - var12 = var0.charAt(var18); - char var13 = var1.charAt(var18); - if (var13 != var12) { - return class11.lowercaseChar(var12, var2) - class11.lowercaseChar(var13, var2); - } + synchronized(ArchiveDiskActionHandler.field3543) { + if (ArchiveDiskActionHandler.field3542 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); } - return 0; + ArchiveDiskActionHandler.field3542 = 600; + ArchiveDiskActionHandler.field3541 = false; } } - @ObfuscatedName("ag") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "10" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lvf;" ) - public static boolean method1157() { - boolean var0 = false; - boolean var1 = false; - if (!class319.field2798.isEmpty()) { - SongTask var2 = (SongTask)class319.field2798.get(0); - if (var2 == null) { - class319.field2798.remove(0); - } else if (var2.vmethod2142()) { - if (var2.method2165()) { - System.out.println("Error in midimanager.service: " + var2.method2168()); - var0 = true; - } else { - if (var2.method2169() != null) { - class319.field2798.add(1, var2.method2169()); - } - - var1 = var2.method2167(); - } - - class319.field2798.remove(0); - } else { - var1 = var2.method2167(); - } - } - - if (var0) { - class319.field2798.clear(); - class74.method426(); + public static RunException method1136(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { + var2 = (RunException)var0; + var2.field4320 = var2.field4320 + ' ' + var1; + } else { + var2 = new RunException(var0, var1); } - return var1; + return var2; } - @ObfuscatedName("hv") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "856561238" - ) - static final void method1166() { - Client.packetWriter.close(); - class214.method1052(); - class10.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); - } - - Client.field422.method1134(); - System.gc(); - ItemComposition.method1088(0, 0); - class470.method2362(); - Client.playingJingle = false; - SoundCache.method228(); - DefaultsGroup.updateGameState(10); - } - - @ObfuscatedName("oh") - @ObfuscatedSignature( - descriptor = "(Lnm;I)Z", - garbageValue = "1332044592" + garbageValue = "2056075058" ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; + static void method1146() { + UserComparator7.method674(24); + class139.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); } } \ No newline at end of file diff --git a/osrs/src/main/java/ConcurrentMidiTask.java b/osrs/src/main/java/ConcurrentMidiTask.java index a18550e05..985325f30 100644 --- a/osrs/src/main/java/ConcurrentMidiTask.java +++ b/osrs/src/main/java/ConcurrentMidiTask.java @@ -5,77 +5,54 @@ import java.util.ArrayList; -@ObfuscatedName("qz") +@ObfuscatedName("qu") @Implements("ConcurrentMidiTask") public class ConcurrentMidiTask extends SongTask { - @ObfuscatedName("ac") - ArrayList field3756; + @ObfuscatedName("at") + ArrayList field3759; @ObfuscatedSignature( - descriptor = "(Lqm;Ljava/util/ArrayList;)V" + descriptor = "(Lql;Ljava/util/ArrayList;)V" ) public ConcurrentMidiTask(SongTask var1, ArrayList var2) { super(var1); - this.field3756 = var2; - super.field3753 = "ConcurrentMidiTask"; + this.field3759 = var2; + super.field3756 = "ConcurrentMidiTask"; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-90" + descriptor = "(I)Z", + garbageValue = "-799935345" ) @Export("vmethod2142") public boolean vmethod2142() { - for (int var1 = 0; var1 < this.field3756.size(); ++var1) { - SongTask var2 = (SongTask)this.field3756.get(var1); + for (int var1 = 0; var1 < this.field3759.size(); ++var1) { + SongTask var2 = (SongTask)this.field3759.get(var1); if (var2 == null) { - this.field3756.remove(var1); + this.field3759.remove(var1); --var1; } else if (var2.vmethod2142()) { - if (var2.method2165()) { - this.method2170(var2.method2168()); - this.field3756.clear(); + if (var2.method2156()) { + this.method2160(var2.method2158()); + this.field3759.clear(); return true; } - if (var2.method2169() != null) { - this.field3756.add(var2.method2169()); + if (var2.method2159() != null) { + this.field3759.add(var2.method2159()); } - super.field3752 = var2.field3752; - this.field3756.remove(var1); + super.field3754 = var2.field3754; + this.field3759.remove(var1); --var1; } } - if (this.field3756.isEmpty()) { + if (this.field3759.isEmpty()) { return true; } else { return false; } } - - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-495331166" - ) - static final void method2173() { - Client.field481 = 0; - int var0 = (TextureProvider.localPlayer.x >> 7) + class20.baseX; - int var1 = (TextureProvider.localPlayer.y >> 7) + class19.baseY; - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { - Client.field481 = 1; - } - - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { - Client.field481 = 1; - } - - if (Client.field481 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { - Client.field481 = 0; - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/Coord.java b/osrs/src/main/java/Coord.java index 9801a5596..80eb4cf2b 100644 --- a/osrs/src/main/java/Coord.java +++ b/osrs/src/main/java/Coord.java @@ -3,23 +3,21 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("mh") @Implements("Coord") public class Coord { - @ObfuscatedName("ap") - public static short[] field2906; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("plane") public int plane; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("x") public int x; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lmo;)V" + descriptor = "(Lmh;)V" ) public Coord(Coord var1) { this.plane = var1.plane; @@ -44,20 +42,20 @@ public Coord(int var1) { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2125169401" + garbageValue = "-497441948" ) @Export("packed") public int packed() { - return Player.method488(this.plane, this.x, this.y); + return VarpDefinition.method886(this.plane, this.x, this.y); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lmo;I)Z", - garbageValue = "467966647" + descriptor = "(Lmh;I)Z", + garbageValue = "-578750151" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -70,10 +68,10 @@ boolean equalsCoord(Coord var1) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-211582088" + garbageValue = "-1754319501" ) @Export("toString") String toString(String var1) { diff --git a/osrs/src/main/java/DbRowType.java b/osrs/src/main/java/DbRowType.java index 4c01a3ad8..f4e6d6b53 100644 --- a/osrs/src/main/java/DbRowType.java +++ b/osrs/src/main/java/DbRowType.java @@ -3,26 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ug") +@ObfuscatedName("tf") @Implements("DbRowType") public class DbRowType extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) - static AbstractArchive field4144; - @ObfuscatedName("al") + public static AbstractArchive field4140; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("DBRowType_cache") static EvictingDualNodeHashTable DBRowType_cache; - @ObfuscatedName("ak") + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lol;" + ) + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("ar") @Export("columnTypes") Object[][] columnTypes; - @ObfuscatedName("ax") - int[][] field4145; @ObfuscatedName("ao") + int[][] field4143; + @ObfuscatedName("ab") @Export("tableId") public int tableId; @@ -34,26 +40,26 @@ public class DbRowType extends DualNode { this.tableId = -1; } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "333466413" + descriptor = "(Luj;S)V", + garbageValue = "2044" ) - void method2543(Buffer var1) { + void method2520(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method2545(var1, var2); + this.method2522(var1, var2); } } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(II)[Ljava/lang/Object;", - garbageValue = "-2125245982" + descriptor = "(IB)[Ljava/lang/Object;", + garbageValue = "14" ) @Export("getColumnType") public Object[] getColumnType(int var1) { @@ -62,15 +68,15 @@ public Object[] getColumnType(int var1) { @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "-103" + descriptor = "(Luj;IB)V", + garbageValue = "55" ) - void method2545(Buffer var1, int var2) { + void method2522(Buffer var1, int var2) { if (var2 == 3) { int var3 = var1.readUnsignedByte(); if (this.columnTypes == null) { this.columnTypes = new Object[var3][]; - this.field4145 = new int[var3][]; + this.field4143 = new int[var3][]; } for (int var4 = var1.readUnsignedByte(); var4 != 255; var4 = var1.readUnsignedByte()) { @@ -81,8 +87,20 @@ void method2545(Buffer var1, int var2) { var6[var7] = var1.readUShortSmart(); } - this.columnTypes[var4] = class495.method2415(var1, var6); - this.field4145[var4] = var6; + Object[][] var16 = this.columnTypes; + int var10 = var1.readUShortSmart(); + Object[] var11 = new Object[var6.length * var10]; + + for (int var12 = 0; var12 < var10; ++var12) { + for (int var13 = 0; var13 < var6.length; ++var13) { + int var14 = var13 + var6.length * var12; + class514 var15 = class472.method2349(var6[var13]); + var11[var14] = var15.method2506(var1); + } + } + + var16[var4] = var11; + this.field4143[var4] = var6; } } else if (var2 == 4) { this.tableId = var1.packBytesToInt(); @@ -90,11 +108,11 @@ void method2545(Buffer var1, int var2) { } - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1273272100" + garbageValue = "-1202767644" ) - void method2546() { + void method2523() { } } \ No newline at end of file diff --git a/osrs/src/main/java/DbTableType.java b/osrs/src/main/java/DbTableType.java index 452c3b986..c0739ca4b 100644 --- a/osrs/src/main/java/DbTableType.java +++ b/osrs/src/main/java/DbTableType.java @@ -3,24 +3,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uz") +@ObfuscatedName("tb") @Implements("DbTableType") public class DbTableType extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) - static AbstractArchive field4138; - @ObfuscatedName("al") + public static AbstractArchive field4134; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("DBTableType_cache") - static EvictingDualNodeHashTable DBTableType_cache; - @ObfuscatedName("ak") + public static EvictingDualNodeHashTable DBTableType_cache; + @ObfuscatedName("al") + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("ar") @Export("types") public int[][] types; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("defaultValues") public Object[][] defaultValues; @@ -31,28 +34,28 @@ public class DbTableType extends DualNode { DbTableType() { } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "2" + descriptor = "(Luj;I)V", + garbageValue = "-2001833472" ) - void method2538(Buffer var1) { + void method2514(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method2539(var1, var2); + this.method2515(var1, var2); } } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "-1635084839" + descriptor = "(Luj;II)V", + garbageValue = "268630673" ) - void method2539(Buffer var1, int var2) { + void method2515(Buffer var1, int var2) { if (var2 == 1) { int var3 = var1.readUnsignedByte(); if (this.types == null) { @@ -74,7 +77,19 @@ void method2539(Buffer var1, int var2) { this.defaultValues = new Object[this.types.length][]; } - this.defaultValues[var5] = class495.method2415(var1, var7); + Object[][] var17 = this.defaultValues; + int var11 = var1.readUShortSmart(); + Object[] var12 = new Object[var7.length * var11]; + + for (int var13 = 0; var13 < var11; ++var13) { + for (int var14 = 0; var14 < var7.length; ++var14) { + int var15 = var14 + var7.length * var13; + class514 var16 = class472.method2349(var7[var14]); + var12[var15] = var16.method2506(var1); + } + } + + var17[var5] = var12; } } } @@ -83,9 +98,9 @@ void method2539(Buffer var1, int var2) { @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1223582453" + descriptor = "(B)V", + garbageValue = "-34" ) - void method2540() { + void method2516() { } } \ No newline at end of file diff --git a/osrs/src/main/java/Decimator.java b/osrs/src/main/java/Decimator.java index f218f46ee..43293cf52 100644 --- a/osrs/src/main/java/Decimator.java +++ b/osrs/src/main/java/Decimator.java @@ -3,65 +3,77 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("ce") @Implements("Decimator") public class Decimator { - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("inputRate") int inputRate; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("outputRate") int outputRate; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { - int var3 = ModeWhere.method2011(var1, var2); - var1 /= var3; - var2 /= var3; + int var4 = var1; + int var5 = var2; + if (var2 > var1) { + var4 = var2; + var5 = var1; + } + + while (var5 != 0) { + int var6 = var4 % var5; + var4 = var5; + var5 = var6; + } + + var1 /= var4; + var2 /= var4; this.inputRate = var1; this.outputRate = var2; this.table = new int[var1][14]; - for (int var4 = 0; var4 < var1; ++var4) { - int[] var5 = this.table[var4]; - double var6 = 6.0D + (double)var4 / (double)var1; - int var8 = (int)Math.floor(var6 - 7.0D + 1.0D); - if (var8 < 0) { - var8 = 0; + for (int var7 = 0; var7 < var1; ++var7) { + int[] var8 = this.table[var7]; + double var9 = (double)var7 / (double)var1 + 6.0D; + int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); + if (var11 < 0) { + var11 = 0; } - int var9 = (int)Math.ceil(var6 + 7.0D); - if (var9 > 14) { - var9 = 14; + int var12 = (int)Math.ceil(var9 + 7.0D); + if (var12 > 14) { + var12 = 14; } - for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { - double var12 = 3.141592653589793D * ((double)var8 - var6); - double var14 = var10; - if (var12 < -1.0E-4D || var12 > 1.0E-4D) { - var14 = var10 * (Math.sin(var12) / var12); + for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { + double var15 = 3.141592653589793D * ((double)var11 - var9); + double var17 = var13; + if (var15 < -1.0E-4D || var15 > 1.0E-4D) { + var17 = var13 * (Math.sin(var15) / var15); } - var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); - var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D); + var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D); + var8[var11] = (int)Math.floor(65536.0D * var17 + 0.5D); } } } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "([BI)[B", - garbageValue = "-668170179" + garbageValue = "2088613185" ) @Export("resample") byte[] resample(byte[] var1) { if (this.table != null) { - int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; + int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; int[] var3 = new int[var2]; int var4 = 0; int var5 = 0; @@ -99,81 +111,205 @@ byte[] resample(byte[] var1) { return var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "470837923" + descriptor = "(IB)I", + garbageValue = "114" ) @Export("scaleRate") int scaleRate(int var1) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); } return var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "551468970" + descriptor = "(IB)I", + garbageValue = "-9" ) @Export("scalePosition") int scalePosition(int var1) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; } return var1; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lom;I)V", - garbageValue = "1896465710" + descriptor = "(Lfm;FZI)F", + garbageValue = "2138001774" ) - public static void method313(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; - } + static float method321(class131 var0, float var1, boolean var2) { + float var3 = 0.0F; + if (var0 != null && var0.method722() != 0) { + float var4 = (float)var0.field1258[0].field1217; + float var5 = (float)var0.field1258[var0.method722() - 1].field1217; + float var6 = var5 - var4; + if (0.0D == (double)var6) { + return var0.field1258[0].field1213; + } else { + float var7 = 0.0F; + if (var1 > var5) { + var7 = (var1 - var5) / var6; + } else { + var7 = (var1 - var4) / var6; + } - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-262215336" - ) - static final void method317(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { - for (int var5 = var0; var5 <= var0 + var2; ++var5) { - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { - Tiles.field835[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } + double var8 = (double)((int)var7); + float var10 = Math.abs((float)((double)var7 - var8)); + float var11 = var10 * var6; + var8 = Math.abs(var8 + 1.0D); + double var12 = var8 / 2.0D; + double var14 = (double)((int)var12); + var10 = (float)(var12 - var14); + float var16; + float var17; + if (var2) { + if (var0.field1257 == class129.field1240) { + if (0.0D != (double)var10) { + var11 += var4; + } else { + var11 = var5 - var11; + } + } else if (var0.field1257 != class129.field1243 && var0.field1257 != class129.field1242) { + if (var0.field1257 == class129.field1241) { + var11 = var4 - var1; + var16 = var0.field1258[0].field1215; + var17 = var0.field1258[0].field1214; + var3 = var0.field1258[0].field1213; + if (0.0D != (double)var16) { + var3 -= var17 * var11 / var16; + } - if (var0 + var2 == var5 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + return var3; + } + } else { + var11 = var5 - var11; } - - if (var4 == var1 && var4 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } else if (var0.field1256 == class129.field1240) { + if (0.0D != (double)var10) { + var11 = var5 - var11; + } else { + var11 += var4; } + } else if (var0.field1256 != class129.field1243 && var0.field1256 != class129.field1242) { + if (var0.field1256 == class129.field1241) { + var11 = var1 - var5; + var16 = var0.field1258[var0.method722() - 1].field1212; + var17 = var0.field1258[var0.method722() - 1].field1216; + var3 = var0.field1258[var0.method722() - 1].field1213; + if (0.0D != (double)var16) { + var3 += var11 * var17 / var16; + } - if (var3 + var1 == var4 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + return var3; } + } else { + var11 += var4; } + + var3 = class404.method2045(var0, var11); + float var18; + if (var2 && var0.field1257 == class129.field1242) { + var18 = var0.field1258[var0.method722() - 1].field1213 - var0.field1258[0].field1213; + var3 = (float)((double)var3 - var8 * (double)var18); + } else if (!var2 && var0.field1256 == class129.field1242) { + var18 = var0.field1258[var0.method722() - 1].field1213 - var0.field1258[0].field1213; + var3 = (float)((double)var3 + var8 * (double)var18); + } + + return var3; + } + } else { + return var3; + } + } + + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-17" + ) + static void method322(int var0, int var1) { + int var2 = GrandExchangeOfferTotalQuantityComparator.fontBold12.stringWidth("Choose Option"); + + int var3; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + Font var4 = GrandExchangeOfferTotalQuantityComparator.fontBold12; + String var5; + if (var3 < 0) { + var5 = ""; + } else if (Client.menuTargets[var3].length() > 0) { + var5 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; + } else { + var5 = Client.menuActions[var3]; + } + + int var6 = var4.stringWidth(var5); + if (var6 > var2) { + var2 = var6; } } + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + int var7 = var0 - var2 / 2; + if (var2 + var7 > Language.canvasWidth) { + var7 = Language.canvasWidth - var2; + } + + if (var7 < 0) { + var7 = 0; + } + + int var8 = var1; + if (var1 + var3 > class47.canvasHeight) { + var8 = class47.canvasHeight - var3; + } + + if (var8 < 0) { + var8 = 0; + } + + FriendSystem.menuX = var7; + class60.menuY = var8; + class428.menuWidth = var2; + class515.menuHeight = Client.menuOptionsCount * 15 + 22; } - @ObfuscatedName("aa") + @ObfuscatedName("mh") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1378992941" + descriptor = "(IS)V", + garbageValue = "-14068" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + static final void method323(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); + if (var0 != WorldMapIcon_1.clientPreferences.getCurrentMusicVolume()) { + label22: { + if (WorldMapIcon_1.clientPreferences.getCurrentMusicVolume() == 0) { + boolean var1 = !class316.field2787.isEmpty(); + if (var1) { + class72.method433(class514.archive6, var0); + Client.playingJingle = false; + break label22; + } + } + + if (var0 == 0) { + WorldMapManager.method1265(0, 0); + Client.playingJingle = false; + } else { + class251.method1334(var0); + } + } + + WorldMapIcon_1.clientPreferences.setCurrentMusicVolume(var0); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/DefaultsGroup.java b/osrs/src/main/java/DefaultsGroup.java index dec4b90f0..b0a306bc2 100644 --- a/osrs/src/main/java/DefaultsGroup.java +++ b/osrs/src/main/java/DefaultsGroup.java @@ -3,123 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rh") +@ObfuscatedName("rk") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lrh;" + descriptor = "Lrk;" ) - static final DefaultsGroup field3874; - @ObfuscatedName("al") + static final DefaultsGroup field3879; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lrk;" + ) + static final DefaultsGroup field3878; + @ObfuscatedName("jh") + @Export("timeOfPreviousKeyPress") + static int timeOfPreviousKeyPress; + @ObfuscatedName("ar") @Export("group") final int group; static { - field3874 = new DefaultsGroup(3); + field3879 = new DefaultsGroup(1); + field3878 = new DefaultsGroup(3); } DefaultsGroup(int var1) { this.group = var1; } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IB)Lhj;", - garbageValue = "-1" - ) - public static HealthBarDefinition method2315(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); - var1 = new HealthBarDefinition(); - var1.field1559 = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("hl") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1882017485" - ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 30) { - Client.field422.method1134(); - } - - if (Client.gameState == 0) { - class159.client.method161(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { - class409.method2106(0); - Client.field444 = 0; - Client.field448 = 0; - Client.timer.method2184(var0); - if (var0 != 20) { - UserComparator6.method690(false); - } - } - - if (var0 != 20 && var0 != 40 && class11.field33 != null) { - class11.field33.close(); - class11.field33 = null; - } - - if (Client.gameState == 25) { - Client.field453 = 0; - Client.field454 = 0; - Client.field456 = 1; - Client.field455 = 0; - Client.field452 = 1; - } - - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - int var3 = Client.gameState == 11 ? 4 : 0; - ScriptEvent.method471(class190.archive10, class199.archive8, false, var3); - } else if (var0 == 11) { - ScriptEvent.method471(class190.archive10, class199.archive8, false, 4); - } else if (var0 == 50) { - AbstractWorldMapIcon.setLoginResponseString("", "Updating date of birth...", ""); - ScriptEvent.method471(class190.archive10, class199.archive8, false, 7); - } else if (Login.clearLoginScreen) { - Login.titleboxSprite = null; - VarcInt.titlebuttonSprite = null; - Login.runesSprite = null; - PcmPlayer.leftTitleSprite = null; - Login.rightTitleSprite = null; - Login.logoSprite = null; - Login.title_muteSprite = null; - class519.options_buttons_0Sprite = null; - class534.options_buttons_2Sprite = null; - SecureRandomCallable.worldSelectBackSprites = null; - PendingSpawn.worldSelectFlagSprites = null; - ModelData0.worldSelectArrows = null; - TaskHandler.worldSelectStars = null; - Varcs.field1138 = null; - class544.field4278.method527(); - ItemComposition.method1088(0, 100); - class13.method45().method1961(true); - Login.clearLoginScreen = false; - } - } else { - boolean var1 = class91.clientPreferences.method560() >= Client.param21; - int var2 = var1 ? 0 : 12; - ScriptEvent.method471(class190.archive10, class199.archive8, true, var2); - } - - Client.gameState = var0; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/DelayFadeTask.java b/osrs/src/main/java/DelayFadeTask.java index 4a6935942..7335837b7 100644 --- a/osrs/src/main/java/DelayFadeTask.java +++ b/osrs/src/main/java/DelayFadeTask.java @@ -3,35 +3,55 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qb") +@ObfuscatedName("pt") @Implements("DelayFadeTask") public class DelayFadeTask extends SongTask { - @ObfuscatedName("ac") - long field3745; - @ObfuscatedName("al") - int field3744; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lbz;" + ) + @Export("soundSystem") + public static SoundSystem soundSystem; + @ObfuscatedName("at") + long field3748; + @ObfuscatedName("ah") + int field3747; @ObfuscatedSignature( - descriptor = "(Lqm;I)V" + descriptor = "(Lql;I)V" ) public DelayFadeTask(SongTask var1, int var2) { super(var1); - this.field3744 = var2; - super.field3753 = "DelayFadeTask"; + this.field3747 = var2; + super.field3756 = "DelayFadeTask"; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-90" + descriptor = "(I)Z", + garbageValue = "-799935345" ) @Export("vmethod2142") public boolean vmethod2142() { - if (this.field3745 < (long)this.field3744) { - ++this.field3745; + if (this.field3748 < (long)this.field3747) { + ++this.field3748; return false; } else { return true; } } + + @ObfuscatedName("nc") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-52" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Canvas.method87(); + if (class20.friendsChat != null) { + class20.friendsChat.invalidateIgnoreds(); + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/DemotingHashTable.java b/osrs/src/main/java/DemotingHashTable.java index 00a11d904..eefa1071b 100644 --- a/osrs/src/main/java/DemotingHashTable.java +++ b/osrs/src/main/java/DemotingHashTable.java @@ -6,29 +6,29 @@ @ObfuscatedName("ls") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("capacity") int capacity; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("remaining") int remaining; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Ltz;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "Lpo;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Llr;" ) - class298 field2501; + class295 field2499; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); @@ -46,7 +46,7 @@ public DemotingHashTable(int var1) { this(var1, var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); @@ -77,16 +77,16 @@ public Object get(long var1) { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); this.removeWrapper(var3); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Llb;)V" + descriptor = "(Lla;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -98,12 +98,12 @@ void removeWrapper(Wrapper var1) { } - @ObfuscatedName("ax") - public void method1620(Object var1, long var2) { + @ObfuscatedName("ao") + public void method1611(Object var1, long var2) { this.put(var1, var2, 1); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("put") public void put(Object var1, long var2, int var4) { this.remove(var2); @@ -119,8 +119,8 @@ public void put(Object var1, long var2, int var4) { } this.removeWrapper(var5); - if (this.field2501 != null) { - this.field2501.method1616(var5.get()); + if (this.field2499 != null) { + this.field2499.method1607(var5.get()); } } @@ -130,7 +130,7 @@ public void put(Object var1, long var2, int var4) { var6.keyDual = 0L; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { @@ -151,7 +151,7 @@ public void demote(int var1) { } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("clear") public void clear() { this.queue.clear(); diff --git a/osrs/src/main/java/DesktopPlatformInfoProvider.java b/osrs/src/main/java/DesktopPlatformInfoProvider.java index c786292c9..cf1eda782 100644 --- a/osrs/src/main/java/DesktopPlatformInfoProvider.java +++ b/osrs/src/main/java/DesktopPlatformInfoProvider.java @@ -3,29 +3,29 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sn") +@ObfuscatedName("st") @Implements("DesktopPlatformInfoProvider") -public class DesktopPlatformInfoProvider implements class490 { - @ObfuscatedName("ax") - int field3959; +public class DesktopPlatformInfoProvider implements class487 { @ObfuscatedName("ao") - int field3958; - @ObfuscatedName("ah") - int field3957; + int field3955; + @ObfuscatedName("ab") + int field3954; + @ObfuscatedName("au") + int field3956; - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lsx;", - garbageValue = "-2060739021" + descriptor = "(B)Lsb;", + garbageValue = "-87" ) @Export("get") public PlatformInfo get() { byte var1; - if (class223.field1863.startsWith("win")) { + if (ClanChannel.field1413.startsWith("win")) { var1 = 1; - } else if (class223.field1863.startsWith("mac")) { + } else if (ClanChannel.field1413.startsWith("mac")) { var1 = 2; - } else if (class223.field1863.startsWith("linux")) { + } else if (ClanChannel.field1413.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -123,11 +123,11 @@ public PlatformInfo get() { var8 = 4; } - this.method2396(var5); + this.method2372(var5); boolean var9 = false; int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; int var11; - if (this.field3959 > 3) { + if (this.field3955 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; @@ -149,53 +149,53 @@ public PlatformInfo get() { String var25 = ""; String var26 = ""; boolean var27 = false; - return new PlatformInfo(var1, var28, var7, var8, this.field3959, this.field3958, this.field3957, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "", ""); + return new PlatformInfo(var1, var28, var7, var8, this.field3955, this.field3954, this.field3956, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "", ""); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "39" + garbageValue = "118" ) - void method2396(String var1) { + void method2372(String var1) { if (var1.startsWith("1.")) { - this.method2397(var1); + this.method2373(var1); } else { - this.method2398(var1); + this.method2374(var1); } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-982803931" + garbageValue = "804463097" ) - void method2397(String var1) { + void method2373(String var1) { String[] var2 = var1.split("\\."); try { - this.field3959 = Integer.parseInt(var2[1]); + this.field3955 = Integer.parseInt(var2[1]); var2 = var2[2].split("_"); - this.field3958 = Integer.parseInt(var2[0]); - this.field3957 = Integer.parseInt(var2[1]); + this.field3954 = Integer.parseInt(var2[0]); + this.field3956 = Integer.parseInt(var2[1]); } catch (Exception var4) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "86" + garbageValue = "51" ) - void method2398(String var1) { + void method2374(String var1) { String[] var2 = var1.split("\\."); try { - this.field3959 = Integer.parseInt(var2[0]); - this.field3958 = Integer.parseInt(var2[1]); - this.field3957 = Integer.parseInt(var2[2]); + this.field3955 = Integer.parseInt(var2[0]); + this.field3954 = Integer.parseInt(var2[1]); + this.field3956 = Integer.parseInt(var2[2]); } catch (Exception var4) { } diff --git a/osrs/src/main/java/DevicePcmPlayer.java b/osrs/src/main/java/DevicePcmPlayer.java index efacc7bf5..d29ad5a07 100644 --- a/osrs/src/main/java/DevicePcmPlayer.java +++ b/osrs/src/main/java/DevicePcmPlayer.java @@ -9,52 +9,52 @@ import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; -@ObfuscatedName("af") +@ObfuscatedName("ad") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("format") AudioFormat format; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("line") SourceDataLine line; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("capacity2") int capacity2; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1058566109" + descriptor = "(B)V", + garbageValue = "95" ) @Export("init") public void init() { - this.format = new AudioFormat((float)PcmPlayer.field179, 16, class306.PcmPlayer_stereo ? 2 : 1, true, false); - this.byteSamples = new byte[256 << (class306.PcmPlayer_stereo ? 2 : 1)]; + this.format = new AudioFormat((float)PcmPlayer.field179, 16, WorldMapRectangle.PcmPlayer_stereo ? 2 : 1, true, false); + this.byteSamples = new byte[256 << (WorldMapRectangle.PcmPlayer_stereo ? 2 : 1)]; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "1706445518" ) @Export("open") public void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (class306.PcmPlayer_stereo ? 2 : 1)); + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (WorldMapRectangle.PcmPlayer_stereo ? 2 : 1)); this.line = (SourceDataLine)AudioSystem.getLine(var2); this.line.open(); this.line.start(); this.capacity2 = var1; } catch (LineUnavailableException var3) { - if (WorldMapLabel.method1569(var1) != 1) { - this.open(EnumComposition.method999(var1)); + if (UserComparator4.method665(var1) != 1) { + this.open(class184.method927(var1)); } else { this.line = null; throw var3; @@ -62,21 +62,21 @@ public void open(int var1) throws LineUnavailableException { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-325041005" + garbageValue = "-79725090" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (class306.PcmPlayer_stereo ? 2 : 1)); + return this.capacity2 - (this.line.available() >> (WorldMapRectangle.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("write") protected void write() { int var1 = 256; - if (class306.PcmPlayer_stereo) { + if (WorldMapRectangle.PcmPlayer_stereo) { var1 <<= 1; } @@ -93,10 +93,10 @@ protected void write() { this.line.write(this.byteSamples, 0, var1 << 1); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "3331" + descriptor = "(I)V", + garbageValue = "1254913818" ) @Export("close") protected void close() { @@ -107,10 +107,10 @@ protected void close() { } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-264971545" ) @Export("discard") protected void discard() { diff --git a/osrs/src/main/java/DevicePcmPlayerProvider.java b/osrs/src/main/java/DevicePcmPlayerProvider.java index 022d50c5e..8af441337 100644 --- a/osrs/src/main/java/DevicePcmPlayerProvider.java +++ b/osrs/src/main/java/DevicePcmPlayerProvider.java @@ -3,219 +3,244 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +import java.util.List; + +@ObfuscatedName("an") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements class51 { - @ObfuscatedName("ak") - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("az") - @Export("userHomeDirectory") - static String userHomeDirectory; + @ObfuscatedName("wu") + static List field67; + @ObfuscatedName("cl") + static int field66; DevicePcmPlayerProvider() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(S)Lbu;", - garbageValue = "25906" + descriptor = "(S)Lby;", + garbageValue = "-2211" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } - @ObfuscatedName("al") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-2139426983" + descriptor = "(Luj;II)Ljava/lang/String;", + garbageValue = "1966437671" ) - static final boolean method82(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; - } + static String method82(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); + if (var2 > var1) { + var2 = var1; + } - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Lfz;FB)F", - garbageValue = "-61" - ) - static float method84(class132 var0, float var1) { - if (var0 == null) { - return 0.0F; - } else { - float var2 = var1 - var0.field1247; - return var2 * (var2 * (var0.field1249 + var2 * var0.field1244) + var0.field1242) + var0.field1240; + byte[] var3 = new byte[var2]; + var0.offset += class350.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = World.decodeStringCp1252(var3, 0, var2); + return var4; + } catch (Exception var6) { + return "Cabbage"; } } - @ObfuscatedName("ah") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lcv;Lcv;IZIZI)I", - garbageValue = "-1939338222" + descriptor = "(III)I", + garbageValue = "-26053498" ) - static int method83(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = class64.compareWorlds(var0, var1, var2, var3); - if (var6 != 0) { - return var3 ? -var6 : var6; - } else if (var4 == -1) { - return 0; - } else { - int var7 = class64.compareWorlds(var0, var1, var4, var5); - return var5 ? -var7 : var7; + static final int method83(int var0, int var1) { + int var2 = WorldMapIcon_0.method1301(45365 + var0, var1 + 91923, 4) - 128 + (WorldMapIcon_0.method1301(var0 + 10294, var1 + 37821, 2) - 128 >> 1) + (WorldMapIcon_0.method1301(var0, var1, 1) - 128 >> 2); + var2 = (int)((double)var2 * 0.3D) + 35; + if (var2 < 10) { + var2 = 10; + } else if (var2 > 60) { + var2 = 60; } - } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)Lcv;", - garbageValue = "-784805347" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? UserComparator3.World_worlds[++World.World_listCount - 1] : null; + return var2; } - @ObfuscatedName("aq") + @ObfuscatedName("ir") @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "124" + descriptor = "(Ldf;I)V", + garbageValue = "1536572289" ) - static int method86(int var0, Script var1, boolean var2) { - Widget var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == 2600) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == 2601) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == 2602) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == 2603) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == 2604) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == 2605) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == 2606) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == 2607) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == 2608) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == 2609) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 2610) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == 2611) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == 2612) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 2613) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == 2614) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; + static final void method84(Actor var0) { + var0.movementSequence = var0.idleSequence; + if (var0.pathLength == 0) { + var0.field1028 = 0; } else { - class339 var4; - if (var0 == 2617) { - var4 = var3.method1878(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2923 * -1501316877 * 383918139 : 0; + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + SequenceDefinition var1 = DynamicObject.SequenceDefinition_get(var0.sequence); + if (var0.field1029 > 0 && var1.precedenceAnimating == 0) { + ++var0.field1028; + return; + } + + if (var0.field1029 <= 0 && var1.priority == 0) { + ++var0.field1028; + return; + } } - if (var0 == 2618) { - var4 = var3.method1878(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2925 * 1245217763 * 1917639115 : 0; - return 1; - } else { - class344 var7; - if (var0 == 2619) { - var7 = var3.method1877(); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1812().method2070() : ""; - return 1; - } else if (var0 == 2620) { - var4 = var3.method1878(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2924 * 1697101243 * 2044708723 : 0; - return 1; - } else if (var0 == 2621) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1822() : 0; - return 1; - } else if (var0 == 2622) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1823() : 0; - return 1; - } else if (var0 == 2623) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1824() : 0; - return 1; - } else if (var0 == 2624) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1814() ? 1 : 0; - return 1; - } else if (var0 != 2625) { - if (var0 == 2626) { - var7 = var3.method1877(); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1813().method2145() : ""; - return 1; - } else if (var0 == 2627) { - var7 = var3.method1877(); - int var5 = var7 != null ? var7.method1818() : 0; - int var6 = var7 != null ? var7.method1817() : 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.min(var5, var6); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.max(var5, var6); - return 1; - } else if (var0 == 2628) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1817() : 0; - return 1; - } else if (var0 == 2629) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1826() : 0; - return 1; - } else if (var0 == 2630) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1825() : 0; - return 1; - } else if (var0 == 2631) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1827() : 0; - return 1; - } else if (var0 == 2632) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1828() : 0; - return 1; - } else { - class27 var8; - if (var0 == 2633) { - var8 = var3.method1879(); - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method105(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; - return 1; - } else if (var0 == 2634) { - var8 = var3.method1879(); - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method106((char)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; - return 1; - } else { - return 2; - } + int var10 = var0.x; + int var2 = var0.y; + int var3 = var0.field983 * 64 + var0.pathX[var0.pathLength - 1] * 128; + int var4 = var0.field983 * 64 + var0.pathY[var0.pathLength - 1] * 128; + if (var10 < var3) { + if (var2 < var4) { + var0.orientation = 1280; + } else if (var2 > var4) { + var0.orientation = 1792; + } else { + var0.orientation = 1536; + } + } else if (var10 > var3) { + if (var2 < var4) { + var0.orientation = 768; + } else if (var2 > var4) { + var0.orientation = 256; + } else { + var0.orientation = 512; + } + } else if (var2 < var4) { + var0.orientation = 1024; + } else if (var2 > var4) { + var0.orientation = 0; + } + + MoveSpeed var5 = var0.pathTraversed[var0.pathLength - 1]; + if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { + int var6 = var0.orientation - var0.rotation & 2047; + if (var6 > 1024) { + var6 -= 2048; + } + + int var7 = var0.walkBackSequence; + if (var6 >= -256 && var6 <= 256) { + var7 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { + var7 = var0.walkRightSequence; + } else if (var6 >= -768 && var6 <= -256) { + var7 = var0.walkLeftSequence; + } + + if (var7 == -1) { + var7 = var0.walkSequence; + } + + var0.movementSequence = var7; + int var8 = 4; + boolean var9 = true; + if (var0 instanceof NPC) { + var9 = ((NPC)var0).definition.isClickable; + } + + if (var9) { + if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1018 != 0) { + var8 = 2; + } + + if (var0.pathLength > 2) { + var8 = 6; + } + + if (var0.pathLength > 3) { + var8 = 8; + } + + if (var0.field1028 > 0 && var0.pathLength > 1) { + var8 = 8; + --var0.field1028; } } else { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1815() ? 1 : 0; - return 1; + if (var0.pathLength > 1) { + var8 = 6; + } + + if (var0.pathLength > 2) { + var8 = 8; + } + + if (var0.field1028 > 0 && var0.pathLength > 1) { + var8 = 8; + --var0.field1028; + } + } + + if (var5 == MoveSpeed.RUN) { + var8 <<= 1; + } else if (var5 == MoveSpeed.CRAWL) { + var8 >>= 1; + } + + if (var8 >= 8) { + if (var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; + } else if (var0.movementSequence == var0.walkBackSequence && var0.runBackSequence != -1) { + var0.movementSequence = var0.runBackSequence; + } else if (var0.movementSequence == var0.walkLeftSequence && var0.runLeftSequence != -1) { + var0.movementSequence = var0.runLeftSequence; + } else if (var0.walkRightSequence == var0.movementSequence && var0.runRightSequence != -1) { + var0.movementSequence = var0.runRightSequence; + } + } else if (var8 <= 2) { + if (var0.walkSequence == var0.movementSequence && var0.crawlSequence != -1) { + var0.movementSequence = var0.crawlSequence; + } else if (var0.walkBackSequence == var0.movementSequence && var0.crawlBackSequence != -1) { + var0.movementSequence = var0.crawlBackSequence; + } else if (var0.walkLeftSequence == var0.movementSequence && var0.crawlLeftSequence != -1) { + var0.movementSequence = var0.crawlLeftSequence; + } else if (var0.walkRightSequence == var0.movementSequence && var0.crawlRightSequence != -1) { + var0.movementSequence = var0.crawlRightSequence; + } } + + if (var3 != var10 || var4 != var2) { + if (var10 < var3) { + var0.x += var8; + if (var0.x > var3) { + var0.x = var3; + } + } else if (var10 > var3) { + var0.x -= var8; + if (var0.x < var3) { + var0.x = var3; + } + } + + if (var2 < var4) { + var0.y += var8; + if (var0.y > var4) { + var0.y = var4; + } + } else if (var2 > var4) { + var0.y -= var8; + if (var0.y < var4) { + var0.y = var4; + } + } + } + + if (var3 == var0.x && var4 == var0.y) { + --var0.pathLength; + if (var0.field1029 > 0) { + --var0.field1029; + } + } + + } else { + var0.x = var3; + var0.y = var4; + --var0.pathLength; + if (var0.field1029 > 0) { + --var0.field1029; + } + } } } diff --git a/osrs/src/main/java/DirectByteArrayCopier.java b/osrs/src/main/java/DirectByteArrayCopier.java index cc8ebd525..247ec4145 100644 --- a/osrs/src/main/java/DirectByteArrayCopier.java +++ b/osrs/src/main/java/DirectByteArrayCopier.java @@ -5,17 +5,22 @@ import java.nio.ByteBuffer; -@ObfuscatedName("nh") +@ObfuscatedName("na") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("ac") + @ObfuscatedName("ao") + static int field3136; + @ObfuscatedName("at") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("al") + DirectByteArrayCopier() { + } + + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "1381422717" + descriptor = "(B)[B", + garbageValue = "5" ) @Export("get") byte[] get() { @@ -25,82 +30,39 @@ byte[] get() { return var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-2137536013" + descriptor = "([BB)V", + garbageValue = "67" ) @Export("set") - public void set(byte[] var1) { + void set(byte[] var1) { this.directBuffer = ByteBuffer.allocateDirect(var1.length); this.directBuffer.position(0); this.directBuffer.put(var1); } - @ObfuscatedName("ld") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ldj;IIIB)V", - garbageValue = "8" + descriptor = "(CI)Z", + garbageValue = "-946296977" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (TextureProvider.localPlayer != var0) { - if (Client.menuOptionsCount < 400) { - String var4; - if (var0.skillLevel == 0) { - var4 = var0.actions[0] + var0.username + var0.actions[1] + WidgetDefinition.method1745(var0.combatLevel, TextureProvider.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; - } - - int var5; - if (Client.isItemSelected == 1) { - class153.insertMenuItemNoShift("Use", Client.field598 + " " + "->" + " " + Client.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((class31.field82 & 8) == 8) { - class153.insertMenuItemNoShift(Client.field599, Client.field600 + " " + "->" + " " + Client.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } - } else { - for (var5 = 7; var5 >= 0; --var5) { - if (Client.playerMenuActions[var5] != null) { - short var6 = 0; - if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { - continue; - } - - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > TextureProvider.localPlayer.combatLevel) { - var6 = 2000; - } + public static boolean method1884(char var0) { + if ((var0 < ' ' || var0 >= 127) && (var0 <= 127 || var0 >= 160) && (var0 <= 160 || var0 > 255)) { + if (var0 != 0) { + char[] var1 = class396.cp1252AsciiExtension; - if (TextureProvider.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == TextureProvider.localPlayer.team) { - var6 = 2000; - } else { - var6 = 0; - } - } else if (Client.playerAttackOption == AttackOption.field1102 && var0.isClanMember()) { - var6 = 2000; - } - } else if (Client.playerOptionsPriorities[var5]) { - var6 = 2000; - } - - boolean var7 = false; - int var8 = Client.playerMenuOpcodes[var5] + var6; - class153.insertMenuItemNoShift(Client.playerMenuActions[var5], Client.colorStartTag(16777215) + var4, var8, var1, var2, var3); - } - } - } - - for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (Client.menuOpcodes[var5] == 23) { - Client.menuTargets[var5] = Client.colorStartTag(16777215) + var4; - break; + for (int var2 = 0; var2 < var1.length; ++var2) { + char var3 = var1[var2]; + if (var0 == var3) { + return true; } } - } + + return false; + } else { + return true; } } } \ No newline at end of file diff --git a/osrs/src/main/java/DirectWrapper.java b/osrs/src/main/java/DirectWrapper.java index 8079941ac..7a71ce01c 100644 --- a/osrs/src/main/java/DirectWrapper.java +++ b/osrs/src/main/java/DirectWrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lz") +@ObfuscatedName("ll") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("get") Object get() { return this.obj; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("isSoft") boolean isSoft() { return false; diff --git a/osrs/src/main/java/DualNode.java b/osrs/src/main/java/DualNode.java index b7fe0a804..a7859293e 100644 --- a/osrs/src/main/java/DualNode.java +++ b/osrs/src/main/java/DualNode.java @@ -3,26 +3,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sb") +@ObfuscatedName("sn") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("ei") + @ObfuscatedName("em") @Export("keyDual") public long keyDual; - @ObfuscatedName("ex") + @ObfuscatedName("eo") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsn;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("ek") + @ObfuscatedName("ef") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsn;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("fs") + @ObfuscatedName("fd") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { diff --git a/osrs/src/main/java/DualNodeDeque.java b/osrs/src/main/java/DualNodeDeque.java index 262a42991..edca07bc6 100644 --- a/osrs/src/main/java/DualNodeDeque.java +++ b/osrs/src/main/java/DualNodeDeque.java @@ -3,12 +3,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pl") +@ObfuscatedName("od") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsn;" ) @Export("sentinel") DualNode sentinel; @@ -19,11 +19,11 @@ public DualNodeDeque() { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lsb;)V" + descriptor = "(Lsn;)V" ) - public void method2015(DualNode var1) { + public void method2003(DualNode var1) { if (var1.nextDual != null) { var1.removeDual(); } @@ -34,11 +34,11 @@ public void method2015(DualNode var1) { var1.previousDual.nextDual = var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lsb;)V" + descriptor = "(Lsn;)V" ) - public void method2016(DualNode var1) { + public void method2004(DualNode var1) { if (var1.nextDual != null) { var1.removeDual(); } @@ -49,9 +49,9 @@ public void method2016(DualNode var1) { var1.previousDual.nextDual = var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsn;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/osrs/src/main/java/DynamicObject.java b/osrs/src/main/java/DynamicObject.java index fb91fbca3..2ba5ea017 100644 --- a/osrs/src/main/java/DynamicObject.java +++ b/osrs/src/main/java/DynamicObject.java @@ -3,45 +3,42 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.LinkedList; -import java.util.List; - -@ObfuscatedName("dx") +@ObfuscatedName("di") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("id") int id; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("type") int type; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("orientation") int orientation; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("plane") int plane; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("x") int x; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("y") int y; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lif;" + descriptor = "Lhx;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("frame") int frame; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLjy;)V" + descriptor = "(IIIIIIIZLkt;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; @@ -51,12 +48,12 @@ public class DynamicObject extends Renderable { this.x = var5; this.y = var6; if (var7 != -1) { - this.sequenceDefinition = class36.SequenceDefinition_get(var7); + this.sequenceDefinition = SequenceDefinition_get(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; if (this.sequenceDefinition.replyMode == 0 && var9 != null && var9 instanceof DynamicObject) { DynamicObject var10 = (DynamicObject)var9; - if (this.sequenceDefinition == var10.sequenceDefinition) { + if (var10.sequenceDefinition == this.sequenceDefinition) { this.frame = var10.frame; this.cycleStart = var10.cycleStart; return; @@ -68,17 +65,17 @@ public class DynamicObject extends Renderable { this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); } else { - this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method1127()); + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method1052()); } } } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Ljn;", - garbageValue = "0" + descriptor = "(B)Lka;", + garbageValue = "1" ) @Export("getModel") protected final Model getModel() { @@ -90,7 +87,7 @@ protected final Model getModel() { } if (this.sequenceDefinition.isCachedModelIdSet()) { - var2 = this.sequenceDefinition.method1127(); + var2 = this.sequenceDefinition.method1052(); this.frame += var1; var1 = 0; if (this.frame >= var2) { @@ -121,7 +118,7 @@ protected final Model getModel() { this.cycleStart = Client.cycle - var1; } - ObjectComposition var12 = class91.getObjectDefinition(this.id); + ObjectComposition var12 = WorldMapSection2.getObjectDefinition(this.id); if (var12.transforms != null) { var12 = var12.transform(); } @@ -150,203 +147,67 @@ protected final Model getModel() { } } - @ObfuscatedName("ce") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-1342712165" + descriptor = "(II)Lhx;", + garbageValue = "-1047374686" ) - static int method451(int var0, Script var1, boolean var2) { - int var3; - int var5; - int var7; - Object var21; - class521 var22; - if (var0 != 7500 && var0 != 7508) { - if (var0 != 7501) { - int var4; - int var6; - if (var0 == 7502) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = AbstractArchive.method1931(var4); - var7 = VarbitComposition.method1046(var4); - int var8 = HealthBar.method571(var4); - DbRowType var23 = class180.getDbRowType(var3); - DbTableType var24 = ZoneOperation.getDbTableType(var6); - int[] var25 = var24.types[var7]; - int var12 = 0; - int var13 = var25.length; - if (var8 >= 0) { - if (var8 >= var13) { - throw new RuntimeException("Tuple index out-of-bounds. Requested: " + var8 + ", Max: " + var13); - } - - var12 = var8; - var13 = var8 + 1; - } - - Object[] var14 = var23.getColumnType(var7); - if (var14 == null && var24.defaultValues != null) { - var14 = var24.defaultValues[var7]; - } + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = class369.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } - int var15; - int var16; - if (var14 == null) { - for (var15 = var12; var15 < var13; ++var15) { - var16 = var25[var15]; - class517 var17 = Tile.method1230(var16); - if (var17 == class517.field4130) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class360.method1902(var16); - } - } + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; + } + } - return 1; - } else { - var15 = var14.length / var25.length; - if (var5 >= 0 && var5 < var15) { - for (var16 = var12; var16 < var13; ++var16) { - int var19 = var16 + var25.length * var5; - class517 var18 = Tile.method1230(var25[var16]); - if (var18 == class517.field4130) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = (String)var14[var19]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (Integer)var14[var19]; - } + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "(Lhx;IIILdf;I)V", + garbageValue = "732979691" + ) + static void method451(SequenceDefinition var0, int var1, int var2, int var3, Actor var4) { + if (Client.soundEffectCount < 50) { + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { + int var5 = var0.soundEffects[var1] & 15; + if ((var5 <= 0 || WorldMapIcon_1.clientPreferences.getAreaSoundEffectsVolume() != 0) && (var5 != 0 || WorldMapIcon_1.clientPreferences.getCurrentSoundEffectsVolume() != 0)) { + int var6 = var0.soundEffects[var1]; + boolean var9 = var4 == class229.localPlayer; + if (var6 != 0) { + int var10 = var6 & 15; + int var11; + int var12; + if (var10 == 0) { + if (!var9) { + return; } - return 1; + Client.soundLocations[Client.soundEffectCount] = 0; } else { - throw new RuntimeException(); - } - } - } else if (var0 == 7503) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = 0; - var6 = AbstractArchive.method1931(var4); - var7 = VarbitComposition.method1046(var4); - DbRowType var26 = class180.getDbRowType(var3); - DbTableType var9 = ZoneOperation.getDbTableType(var6); - int[] var10 = var9.types[var7]; - Object[] var11 = var26.getColumnType(var7); - if (var11 == null && var9.defaultValues != null) { - var11 = var9.defaultValues[var7]; - } - - if (var11 != null) { - var5 = var11.length / var10.length; - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; - return 1; - } else if (var0 != 7504 && var0 != 7510) { - if (var0 == 7505) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - DbRowType var28 = class180.getDbRowType(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var28.tableId; - return 1; - } else if (var0 == 7506) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = -1; - if (class130.field1220 != null && var3 >= 0 && var3 < class130.field1220.size()) { - var4 = (Integer)class130.field1220.get(var3); - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - return 1; - } else if (var0 != 7507 && var0 != 7509) { - return 2; - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var21 = GrandExchangeOfferOwnWorldComparator.method349(var3); - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var22 = SoundCache.method235(var5); - if (var22 == null) { - throw new RuntimeException(); - } else if (AbstractArchive.method1931(var5) != Client.field547) { - throw new RuntimeException(); - } else if (class130.field1220 == null && class130.field1220.isEmpty()) { - throw new RuntimeException(); - } else { - var7 = HealthBar.method571(var5); - List var20 = var22.method2542(var21, var7); - class130.field1220 = new LinkedList(class130.field1220); - if (var20 != null) { - class130.field1220.retainAll(var20); - } else { - class130.field1220.clear(); - } - - class481.field3944 = class130.field1220.iterator(); - if (var0 == 7507) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class130.field1220.size(); - } - - return 1; - } - } - } else { - --Interpreter.Interpreter_intStackSize; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - class521 var27 = class223.method1131(var3); - if (var27 == null) { - throw new RuntimeException(); - } else { - class130.field1220 = var27.method2542(0, 0); - var5 = 0; - if (class130.field1220 != null) { - Client.field547 = var3; - class481.field3944 = class130.field1220.iterator(); - var5 = class130.field1220.size(); - } - - if (var0 == 7504) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; + var11 = (var2 - 64) / 128; + var12 = (var3 - 64) / 128; + Client.soundLocations[Client.soundEffectCount] = var10 + (var12 << 8) + (var11 << 16); } - return 1; + var11 = var6 >> 8; + var12 = var6 >> 4 & 7; + Client.soundEffectIds[Client.soundEffectCount] = var11; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var12; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; + Client.soundEffects[Client.soundEffectCount] = null; + ++Client.soundEffectCount; } - } - } else { - if (class481.field3944 != null && class481.field3944.hasNext()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (Integer)class481.field3944.next(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } - return 1; - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var21 = GrandExchangeOfferOwnWorldComparator.method349(var3); - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var22 = SoundCache.method235(var5); - if (var22 == null) { - throw new RuntimeException(); - } else { - var7 = HealthBar.method571(var5); - class130.field1220 = var22.method2542(var21, var7); - if (class130.field1220 != null) { - Client.field547 = AbstractArchive.method1931(var5); - class481.field3944 = class130.field1220.iterator(); - if (var0 == 7500) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class130.field1220.size(); - } - } else { - Client.field547 = -1; - class481.field3944 = null; - if (var0 == 7500) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } } - - return 1; } } } diff --git a/osrs/src/main/java/EnumComposition.java b/osrs/src/main/java/EnumComposition.java index 777432e78..d6dc52860 100644 --- a/osrs/src/main/java/EnumComposition.java +++ b/osrs/src/main/java/EnumComposition.java @@ -3,49 +3,53 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +import java.security.SecureRandom; + +@ObfuscatedName("hp") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("EnumDefinition_archive") - static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("al") + public static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("EnumDefinition_cached") public static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("ke") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "[Lud;" + descriptor = "Ldz;" ) - @Export("crossSprites") - static SpritePixels[] crossSprites; - @ObfuscatedName("ak") + static LoginScreenAnimation field1505; + @ObfuscatedName("ih") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("ar") @Export("inputType") public char inputType; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("outputType") public char outputType; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("defaultInt") public int defaultInt; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("outputCount") public int outputCount; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("keys") public int[] keys; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("intVals") public int[] intVals; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("strVals") public String[] strVals; @@ -58,10 +62,10 @@ public class EnumComposition extends DualNode { this.outputCount = 0; } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "72" + descriptor = "(Luj;I)V", + garbageValue = "-673581219" ) @Export("decode") void decode(Buffer var1) { @@ -75,10 +79,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "101" + descriptor = "(Luj;II)V", + garbageValue = "225113863" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -117,113 +121,38 @@ void decodeNext(Buffer var1, int var2) { @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-1812244472" ) @Export("size") public int size() { return this.outputCount; } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "164767930" - ) - public static int method999(int var0) { - --var0; - var0 |= var0 >>> 1; - var0 |= var0 >>> 2; - var0 |= var0 >>> 4; - var0 |= var0 >>> 8; - var0 |= var0 >>> 16; - return var0 + 1; - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "-124" - ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + Actor.charToByteCp1252(var0.charAt(var3)); - } - - return var2; - } - - @ObfuscatedName("ae") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1375573031" + descriptor = "(Lol;IB)Z", + garbageValue = "120" ) - static final int method1001(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; + public static boolean method926(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + if (var2 == null) { + return false; + } else { + class162.SpriteBuffer_decode(var2); + return true; } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; } - @ObfuscatedName("nm") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lnm;B)Z", - garbageValue = "1" + descriptor = "(IIIII)V", + garbageValue = "-264971545" ) - static final boolean method1002(Widget var0) { - int var1 = var0.contentType; - if (var1 == 205) { - Client.logoutTimer = 250; - return true; - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { - var2 = (var1 - 300) / 2; - var3 = var1 & 1; - Client.playerAppearance.changeAppearance(var2, var3 == 1); - } - - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method1753(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.method1754(0); - } - - if (var1 == 325) { - Client.playerAppearance.method1754(1); - } - - if (var1 == 326) { - PacketBufferNode var4 = ClanChannelMember.getPacketBufferNode(ClientPacket.f9, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; - } else { - return false; - } - } + public static void method925(int var0, int var1, int var2, int var3) { + class316.musicPlayerStatus = var0; + class316.field2794 = var1; + class316.field2795 = var2; + class316.field2796 = var3; } } \ No newline at end of file diff --git a/osrs/src/main/java/EvictingDualNodeHashTable.java b/osrs/src/main/java/EvictingDualNodeHashTable.java index 20e913c20..928649acb 100644 --- a/osrs/src/main/java/EvictingDualNodeHashTable.java +++ b/osrs/src/main/java/EvictingDualNodeHashTable.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("lk") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsn;" ) @Export("dualNode") DualNode dualNode; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("capacity") int capacity; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Ltz;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "Lpo;" ) @Export("deque") IterableDualNodeQueue deque; @@ -44,9 +44,9 @@ public EvictingDualNodeHashTable(int var1) { this.hashTable = new IterableNodeHashTable(var2); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(J)Lsb;" + descriptor = "(J)Lsn;" ) @Export("get") public DualNode get(long var1) { @@ -58,7 +58,7 @@ public DualNode get(long var1) { return var3; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); @@ -70,9 +70,9 @@ public void remove(long var1) { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lsb;J)V" + descriptor = "(Lsn;J)V" ) @Export("put") public void put(DualNode var1, long var2) { @@ -93,7 +93,7 @@ public void put(DualNode var1, long var2) { this.deque.add(var1); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("clear") public void clear() { this.deque.clear(); diff --git a/osrs/src/main/java/FaceNormal.java b/osrs/src/main/java/FaceNormal.java index 124a4cdcd..101f532f6 100644 --- a/osrs/src/main/java/FaceNormal.java +++ b/osrs/src/main/java/FaceNormal.java @@ -3,29 +3,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("kp") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("x") int x; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("y") int y; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("z") int z; FaceNormal() { } - @ObfuscatedName("mo") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2079902231" + descriptor = "(I)Lld;", + garbageValue = "1253542503" ) - static final int method1334() { - float var0 = 200.0F * ((float)class91.clientPreferences.getBrightness() - 0.5F); - return 100 - Math.round(var0); + static PacketBufferNode method1516() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; } } \ No newline at end of file diff --git a/osrs/src/main/java/FadeInTask.java b/osrs/src/main/java/FadeInTask.java index 32b8089eb..c2338d0c1 100644 --- a/osrs/src/main/java/FadeInTask.java +++ b/osrs/src/main/java/FadeInTask.java @@ -3,104 +3,67 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.IOException; - -@ObfuscatedName("qg") +@ObfuscatedName("qt") @Implements("FadeInTask") public class FadeInTask extends SongTask { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmt;" ) - MusicSong field3749; - @ObfuscatedName("al") - int field3748; + MusicSong field3753; + @ObfuscatedName("ah") + int field3752; @ObfuscatedSignature( - descriptor = "(Lqm;IZI)V" + descriptor = "(Lql;IZI)V" ) public FadeInTask(SongTask var1, int var2, boolean var3, int var4) { super(var1); - this.field3749 = null; - this.field3748 = 0; - super.field3753 = "FadeInTask"; + this.field3753 = null; + this.field3752 = 0; + super.field3756 = "FadeInTask"; if (var2 >= 0) { - if (var3 && var2 < class319.field2791.size()) { - this.field3749 = (MusicSong)class319.field2791.get(var2); - } else if (!var3 && var2 < class319.musicSongs.size()) { - this.field3749 = (MusicSong)class319.musicSongs.get(var2); + if (var3 && var2 < class316.field2790.size()) { + this.field3753 = (MusicSong)class316.field2790.get(var2); + } else if (!var3 && var2 < class316.musicSongs.size()) { + this.field3753 = (MusicSong)class316.musicSongs.get(var2); } - this.field3748 = var4; + this.field3752 = var4; } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-90" + descriptor = "(I)Z", + garbageValue = "-799935345" ) @Export("vmethod2142") public boolean vmethod2142() { - if (this.field3749 != null && this.field3749.midiPcmStream != null) { - this.field3749.field2886 = true; + if (this.field3753 != null && this.field3753.midiPcmStream != null) { + this.field3753.field2884 = true; try { - if (this.field3749.field2888 < (float)this.field3749.musicTrackVolume && this.field3749.midiPcmStream.isReady()) { - float var1 = this.field3748 == 0 ? (float)this.field3748 : (float)this.field3749.musicTrackVolume / (float)this.field3748; - MusicSong var10000 = this.field3749; - var10000.field2888 += 0.0F == var1 ? (float)this.field3749.musicTrackVolume : var1; - if (this.field3749.field2888 > (float)this.field3749.musicTrackVolume) { - this.field3749.field2888 = (float)this.field3749.musicTrackVolume; + if (this.field3753.field2886 < (float)this.field3753.musicTrackVolume && this.field3753.midiPcmStream.isReady()) { + float var1 = this.field3752 == 0 ? (float)this.field3752 : (float)this.field3753.musicTrackVolume / (float)this.field3752; + MusicSong var10000 = this.field3753; + var10000.field2886 += var1 == 0.0F ? (float)this.field3753.musicTrackVolume : var1; + if (this.field3753.field2886 > (float)this.field3753.musicTrackVolume) { + this.field3753.field2886 = (float)this.field3753.musicTrackVolume; } - this.field3749.midiPcmStream.setPcmStreamVolume((int)this.field3749.field2888); + this.field3753.midiPcmStream.setPcmStreamVolume((int)this.field3753.field2886); return false; } } catch (Exception var3) { - this.method2170(var3.getMessage()); + this.method2160(var3.getMessage()); return true; } - this.field3749.field2886 = false; + this.field3753.field2884 = false; return true; } else { return true; } } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)Ldy;", - garbageValue = "1147627487" - ) - static ClientPreferences method2164() { - AccessFile var0 = null; - ClientPreferences var1 = new ClientPreferences(); - - try { - var0 = class17.getPreferencesFile("", UrlRequester.field1163.name, false); - byte[] var2 = new byte[(int)var0.length()]; - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var0.read(var2, var3, var2.length - var3); - if (var4 == -1) { - throw new IOException(); - } - } - - var1 = new ClientPreferences(new Buffer(var2)); - } catch (Exception var6) { - } - - try { - if (var0 != null) { - var0.close(); - } - } catch (Exception var5) { - } - - return var1; - } } \ No newline at end of file diff --git a/osrs/src/main/java/FadeOutTask.java b/osrs/src/main/java/FadeOutTask.java index 67460e7a3..4d14e503f 100644 --- a/osrs/src/main/java/FadeOutTask.java +++ b/osrs/src/main/java/FadeOutTask.java @@ -3,67 +3,129 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qk") +@ObfuscatedName("qb") @Implements("FadeOutTask") public class FadeOutTask extends SongTask { - @ObfuscatedName("ac") + @ObfuscatedName("do") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lup;" ) - MusicSong field3747; - @ObfuscatedName("al") - int field3746; + static IndexedSprite field3749; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lmt;" + ) + MusicSong field3751; + @ObfuscatedName("ah") + int field3750; @ObfuscatedSignature( - descriptor = "(Lqm;IZI)V" + descriptor = "(Lql;IZI)V" ) public FadeOutTask(SongTask var1, int var2, boolean var3, int var4) { super(var1); - this.field3747 = null; - this.field3746 = 0; - super.field3753 = "FadeOutTask"; + this.field3751 = null; + this.field3750 = 0; + super.field3756 = "FadeOutTask"; if (var2 >= 0) { - if (var3 && var2 < class319.field2791.size()) { - this.field3747 = (MusicSong)class319.field2791.get(var2); - } else if (!var3 && var2 < class319.musicSongs.size()) { - this.field3747 = (MusicSong)class319.musicSongs.get(var2); + if (var3 && var2 < class316.field2790.size()) { + this.field3751 = (MusicSong)class316.field2790.get(var2); + } else if (!var3 && var2 < class316.musicSongs.size()) { + this.field3751 = (MusicSong)class316.musicSongs.get(var2); } - this.field3746 = var4; + this.field3750 = var4; } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-90" + descriptor = "(I)Z", + garbageValue = "-799935345" ) @Export("vmethod2142") public boolean vmethod2142() { - if (this.field3747 != null && this.field3747.midiPcmStream != null) { - this.field3747.field2886 = true; + if (this.field3751 != null && this.field3751.midiPcmStream != null) { + this.field3751.field2884 = true; try { - if (this.field3747.field2888 > 0.0F && this.field3747.midiPcmStream.isReady()) { - float var1 = this.field3746 == 0 ? (float)this.field3746 : (float)this.field3747.musicTrackVolume / (float)this.field3746; - MusicSong var10000 = this.field3747; - var10000.field2888 -= var1 == 0.0F ? (float)this.field3747.musicTrackVolume : var1; - if (this.field3747.field2888 < 0.0F) { - this.field3747.field2888 = 0.0F; + if (this.field3751.field2886 > 0.0F && this.field3751.midiPcmStream.isReady()) { + float var1 = this.field3750 == 0 ? (float)this.field3750 : (float)this.field3751.musicTrackVolume / (float)this.field3750; + MusicSong var10000 = this.field3751; + var10000.field2886 -= 0.0F == var1 ? (float)this.field3751.musicTrackVolume : var1; + if (this.field3751.field2886 < 0.0F) { + this.field3751.field2886 = 0.0F; } - this.field3747.midiPcmStream.setPcmStreamVolume((int)this.field3747.field2888); + this.field3751.midiPcmStream.setPcmStreamVolume((int)this.field3751.field2886); return false; } } catch (Exception var3) { - this.method2170(var3.getMessage()); + this.method2160(var3.getMessage()); return true; } - this.field3747.field2886 = false; + this.field3751.field2884 = false; return true; } else { return true; } } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Ltb;", + garbageValue = "419212113" + ) + @Export("getDbTableType") + public static DbTableType getDbTableType(int var0) { + DbTableType var1 = (DbTableType)DbTableType.DBTableType_cache.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = DbTableType.field4134.takeFile(39, var0); + var1 = new DbTableType(); + if (var2 != null) { + var1.method2514(new Buffer(var2)); + } + + var1.method2516(); + DbTableType.DBTableType_cache.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "82" + ) + static final int method2153(int var0, int var1) { + int var2 = NPC.method595(var0 - 1, var1 - 1) + NPC.method595(1 + var0, var1 - 1) + NPC.method595(var0 - 1, 1 + var1) + NPC.method595(var0 + 1, 1 + var1); + int var3 = NPC.method595(var0 - 1, var1) + NPC.method595(var0 + 1, var1) + NPC.method595(var0, var1 - 1) + NPC.method595(var0, 1 + var1); + int var4 = NPC.method595(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; + } + + @ObfuscatedName("kk") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1205562248" + ) + static void method2154(int var0, int var1, int var2, int var3) { + Widget var4 = HealthBarDefinition.widgetDefinition.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + class157.runScriptEvent(var5); + } + + Client.selectedSpellItemId = var3; + Client.isSpellSelected = true; + class348.selectedSpellWidget = var0; + Client.selectedSpellChildIndex = var1; + UrlRequest.field1182 = var2; + class159.invalidateWidget(var4); + } } \ No newline at end of file diff --git a/osrs/src/main/java/FileSystem.java b/osrs/src/main/java/FileSystem.java index de84db3c9..631a8cae4 100644 --- a/osrs/src/main/java/FileSystem.java +++ b/osrs/src/main/java/FileSystem.java @@ -4,72 +4,50 @@ import net.runelite.mapping.ObfuscatedSignature; import java.io.File; +import java.util.ArrayList; import java.util.Hashtable; -@ObfuscatedName("ga") +@ObfuscatedName("im") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("FileSystem_cacheDir") static File FileSystem_cacheDir; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; - @ObfuscatedName("aj") - @Export("cacheGamebuild") - static int cacheGamebuild; static { FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); } - @ObfuscatedName("oe") + @ObfuscatedName("is") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "1782754354" + descriptor = "(IIB)V", + garbageValue = "52" ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); - short[] var2 = new short[16]; - int var3 = 0; - - for (int var4 = 0; var4 < class284.ItemDefinition_fileCount; ++var4) { - ItemComposition var5 = class214.ItemDefinition_get(var4); - if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - SoundSystem.foundItemIdCount = -1; - class138.foundItemIds = null; - return; - } - - if (var3 >= var2.length) { - short[] var6 = new short[var2.length * 2]; - - for (int var7 = 0; var7 < var3; ++var7) { - var6[var7] = var2[var7]; - } - - var2 = var6; - } - - var2[var3++] = (short)var4; - } + @Export("playJingle") + static void playJingle(int var0, int var1) { + if (WorldMapIcon_1.clientPreferences.getCurrentMusicVolume() != 0 && var0 != -1) { + ArrayList var2 = new ArrayList(); + var2.add(new MusicSong(PcmPlayer.field181, var0, 0, WorldMapIcon_1.clientPreferences.getCurrentMusicVolume(), false)); + PendingSpawn.method505(var2, 0, 0, 0, 0, true); + Client.playingJingle = true; } - class138.foundItemIds = var2; - class317.foundItemIndex = 0; - SoundSystem.foundItemIdCount = var3; - String[] var8 = new String[SoundSystem.foundItemIdCount]; - - for (int var9 = 0; var9 < SoundSystem.foundItemIdCount; ++var9) { - var8[var9] = class214.ItemDefinition_get(var2[var9]).name; - } + } - GameObject.method1426(var8, class138.foundItemIds); + @ObfuscatedName("jq") + @ObfuscatedSignature( + descriptor = "(I)Lon;", + garbageValue = "-187710170" + ) + @Export("getScriptEvents") + public static NodeDeque getScriptEvents() { + return Client.scriptEvents; } } \ No newline at end of file diff --git a/osrs/src/main/java/FillMode.java b/osrs/src/main/java/FillMode.java index a7a8f70ab..17b3f8bcb 100644 --- a/osrs/src/main/java/FillMode.java +++ b/osrs/src/main/java/FillMode.java @@ -2,42 +2,42 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uf") -public enum FillMode implements class386 { - @ObfuscatedName("ac") +@ObfuscatedName("uk") +public enum FillMode implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Luf;" + descriptor = "Luk;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Luf;" + descriptor = "Luk;" ) field4258(1, 1), - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Luf;" + descriptor = "Luk;" ) - field4257(2, 2); + field4259(2, 2); - @ObfuscatedName("ax") - public final int field4260; @ObfuscatedName("ao") - final int field4259; + public final int field4261; + @ObfuscatedName("ab") + final int field4260; FillMode(int var3, int var4) { - this.field4260 = var3; - this.field4259 = var4; + this.field4261 = var3; + this.field4260 = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4259; + return this.field4260; } } \ No newline at end of file diff --git a/osrs/src/main/java/FloorDecoration.java b/osrs/src/main/java/FloorDecoration.java index 52cb6af31..d19d4c4ad 100644 --- a/osrs/src/main/java/FloorDecoration.java +++ b/osrs/src/main/java/FloorDecoration.java @@ -3,160 +3,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("km") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("fk") - static long field1991; - @ObfuscatedName("ac") + @ObfuscatedName("aa") + static int field2162; + @ObfuscatedName("at") @Export("z") int z; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("x") int x; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("y") int y; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkt;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("tag") public long tag; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("flags") int flags; FloorDecoration() { } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IIIZIZI)V", - garbageValue = "759565724" - ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { - int var6 = (var0 + var1) / 2; - int var7 = var0; - World var8 = UserComparator3.World_worlds[var6]; - UserComparator3.World_worlds[var6] = UserComparator3.World_worlds[var1]; - UserComparator3.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - if (DevicePcmPlayerProvider.method83(UserComparator3.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { - World var10 = UserComparator3.World_worlds[var9]; - UserComparator3.World_worlds[var9] = UserComparator3.World_worlds[var7]; - UserComparator3.World_worlds[var7++] = var10; - } - } - - UserComparator3.World_worlds[var1] = UserComparator3.World_worlds[var7]; - UserComparator3.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); - } - - } - - @ObfuscatedName("mx") - @ObfuscatedSignature( - descriptor = "(Lnm;B)V", - garbageValue = "0" - ) - static final void method1226(Widget var0) { - String var1; - int var2; - int var3; - if (var0.buttonType == 1) { - var1 = var0.buttonText; - var2 = var0.id; - var3 = var0.itemId; - class208.insertMenuItem(var1, "", 24, 0, 0, var2, var3, false); - } - - int var4; - String var8; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var1 = class155.Widget_getSpellActionName(var0); - if (var1 != null) { - var8 = Client.colorStartTag(65280) + var0.field3124; - var3 = var0.id; - var4 = var0.itemId; - class208.insertMenuItem(var1, var8, 25, 0, -1, var3, var4, false); - } - } - - if (var0.buttonType == 3) { - class153.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - class153.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - class153.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - class153.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - if (var0.isIf3) { - int var5; - int var6; - int var7; - String var10; - if (Client.isSpellSelected) { - var2 = MouseRecorder.getWidgetFlags(var0); - boolean var9 = (var2 >> 21 & 1) != 0; - if (var9 && (class31.field82 & 32) == 32) { - var10 = Client.field599; - String var11 = Client.field600 + " " + "->" + " " + var0.dataText; - var5 = var0.childIndex; - var6 = var0.id; - var7 = var0.itemId; - class208.insertMenuItem(var10, var11, 58, 0, var5, var6, var7, false); - } - } else { - for (int var12 = 9; var12 >= 5; --var12) { - var8 = MoveSpeed.method1188(var0, var12); - if (var8 != null) { - var10 = var0.dataText; - var4 = var12 + 1; - var5 = var0.childIndex; - var6 = var0.id; - var7 = var0.itemId; - class208.insertMenuItem(var8, var10, 1007, var4, var5, var6, var7, false); - } - } - - var1 = class155.Widget_getSpellActionName(var0); - if (var1 != null) { - var8 = var0.dataText; - var3 = var0.childIndex; - var4 = var0.id; - var5 = var0.itemId; - class208.insertMenuItem(var1, var8, 25, 0, var3, var4, var5, false); - } - - for (var2 = 4; var2 >= 0; --var2) { - var10 = MoveSpeed.method1188(var0, var2); - if (var10 != null) { - class208.insertMenuItem(var10, var0.dataText, 57, var2 + 1, var0.childIndex, var0.id, var0.itemId, var0.prioritizeMenuEntry); - } - } - - if (class146.method767(MouseRecorder.getWidgetFlags(var0))) { - class153.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } - } - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/FloorOverlayDefinition.java b/osrs/src/main/java/FloorOverlayDefinition.java index ecd6746ad..71225c456 100644 --- a/osrs/src/main/java/FloorOverlayDefinition.java +++ b/osrs/src/main/java/FloorOverlayDefinition.java @@ -2,44 +2,53 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("io") +@ObfuscatedName("hd") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("al") + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lol;" + ) + @Export("FloorOverlayDefinition_archive") + public static AbstractArchive FloorOverlayDefinition_archive; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("FloorOverlayDefinition_cached") - public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("ak") + static EvictingDualNodeHashTable FloorOverlayDefinition_cached; + @ObfuscatedName("ve") + static int field1772; + @ObfuscatedName("ar") @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("texture") public int texture; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("hue") public int hue; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("saturation") public int saturation; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("lightness") public int lightness; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("secondaryLightness") public int secondaryLightness; @@ -54,10 +63,10 @@ public class FloorOverlayDefinition extends DualNode { this.secondaryRgb = -1; } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-178426447" + garbageValue = "563834011" ) @Export("postDecode") void postDecode() { @@ -71,10 +80,10 @@ void postDecode() { this.setHsl(this.primaryRgb); } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "-33" + descriptor = "(Luj;II)V", + garbageValue = "1543407873" ) @Export("decode") void decode(Buffer var1, int var2) { @@ -90,8 +99,8 @@ void decode(Buffer var1, int var2) { @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;III)V", - garbageValue = "1318940948" + descriptor = "(Luj;IIB)V", + garbageValue = "2" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -108,10 +117,10 @@ void decodeNext(Buffer var1, int var2, int var3) { } - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "2" + descriptor = "(II)V", + garbageValue = "-1030496121" ) @Export("setHsl") void setHsl(int var1) { @@ -138,29 +147,29 @@ void setHsl(int var1) { double var12 = 0.0D; double var14 = 0.0D; - double var16 = (var8 + var10) / 2.0D; + double var16 = (var10 + var8) / 2.0D; if (var8 != var10) { if (var16 < 0.5D) { - var14 = (var10 - var8) / (var8 + var10); + var14 = (var10 - var8) / (var10 + var8); } if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { + if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); } else if (var10 == var4) { var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var6 == var10) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + } else if (var10 == var6) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; } } var12 /= 6.0D; this.hue = (int)(256.0D * var12); - this.saturation = (int)(var14 * 256.0D); - this.lightness = (int)(var16 * 256.0D); + this.saturation = (int)(256.0D * var14); + this.lightness = (int)(256.0D * var16); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -175,31 +184,212 @@ void setHsl(int var1) { } - @ObfuscatedName("ac") + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)Lgv;", + garbageValue = "202631143" + ) + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); + var1 = new VarpDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)[Lmi;", - garbageValue = "-1928270491" + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "92814810" ) - static LoginPacket[] method1109() { - return new LoginPacket[]{LoginPacket.field2766, LoginPacket.NEW_LOGIN_CONNECTION, LoginPacket.field2762, LoginPacket.field2767, LoginPacket.RECONNECT_LOGIN_CONNECTION, LoginPacket.field2764}; + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { + return Byte.TYPE; + } else if (var0.equals("I")) { + return Integer.TYPE; + } else if (var0.equals("S")) { + return Short.TYPE; + } else if (var0.equals("J")) { + return Long.TYPE; + } else if (var0.equals("Z")) { + return Boolean.TYPE; + } else if (var0.equals("F")) { + return Float.TYPE; + } else if (var0.equals("D")) { + return Double.TYPE; + } else if (var0.equals("C")) { + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); + } } - @ObfuscatedName("ac") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lom;I)V", - garbageValue = "490485615" + descriptor = "(ILdt;ZB)I", + garbageValue = "-19" ) - public static void method1108(AbstractArchive var0) { - ParamComposition.ParamDefinition_archive = var0; + static int method1038(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == 2700) { + var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == 2701) { + var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 2702) { + int var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); + if (var4 != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 2706) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.rootInterface; + return 1; + } else if (var0 == 2707) { + var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.method1861() ? 1 : 0; + return 1; + } else if (var0 == 2708) { + var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + return class310.method1645(var3); + } else if (var0 == 2709) { + var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + return GrandExchangeOfferTotalQuantityComparator.method1965(var3); + } else { + return 2; + } } - @ObfuscatedName("nx") + @ObfuscatedName("lw") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1802192770" + descriptor = "(IIIILjava/lang/String;B)V", + garbageValue = "8" ) - static final void method1114(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - class91.clientPreferences.setCurrentSoundEffectVolume(var0); + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = HealthBarDefinition.widgetDefinition.getWidgetChild(var1, var2); + if (var5 != null) { + if (var5.onOp != null) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var5; + var6.opIndex = var0; + var6.targetName = var4; + var6.args = var5.onOp; + class157.runScriptEvent(var6); + } + + boolean var8 = true; + if (var5.contentType > 0) { + var8 = class101.method597(var5); + } + + if (var8) { + if (GraphicsObject.method428(class361.getWidgetFlags(var5), var0 - 1)) { + PacketBufferNode var7; + if (var0 == 1) { + var7 = class113.getPacketBufferNode(ClientPacket.IF_BUTTON1, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 2) { + var7 = class113.getPacketBufferNode(ClientPacket.IF_BUTTON2, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 3) { + var7 = class113.getPacketBufferNode(ClientPacket.IF_BUTTON3, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 4) { + var7 = class113.getPacketBufferNode(ClientPacket.IF_BUTTON4, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 5) { + var7 = class113.getPacketBufferNode(ClientPacket.IF_BUTTON5, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 6) { + var7 = class113.getPacketBufferNode(ClientPacket.IF_BUTTON6, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 7) { + var7 = class113.getPacketBufferNode(ClientPacket.IF_BUTTON7, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 8) { + var7 = class113.getPacketBufferNode(ClientPacket.IF_BUTTON8, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 9) { + var7 = class113.getPacketBufferNode(ClientPacket.IF_BUTTON9, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 10) { + var7 = class113.getPacketBufferNode(ClientPacket.IF_BUTTON10, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/FloorUnderlayDefinition.java b/osrs/src/main/java/FloorUnderlayDefinition.java index b504588aa..c9f9c6732 100644 --- a/osrs/src/main/java/FloorUnderlayDefinition.java +++ b/osrs/src/main/java/FloorUnderlayDefinition.java @@ -2,38 +2,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -@ObfuscatedName("ie") +@ObfuscatedName("hu") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("FloorUnderlayDefinition_cached") - public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("ak") + static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; + @ObfuscatedName("ar") @Export("rgb") int rgb; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("hue") public int hue; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("saturation") public int saturation; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("lightness") public int lightness; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("hueMultiplier") public int hueMultiplier; @@ -45,20 +42,20 @@ public class FloorUnderlayDefinition extends DualNode { this.rgb = 0; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1890021577" + descriptor = "(B)V", + garbageValue = "110" ) @Export("postDecode") void postDecode() { this.setHsl(this.rgb); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "1012239262" + descriptor = "(Luj;II)V", + garbageValue = "-1456833472" ) @Export("decode") void decode(Buffer var1, int var2) { @@ -72,10 +69,10 @@ void decode(Buffer var1, int var2) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;III)V", - garbageValue = "2138795593" + descriptor = "(Luj;IIS)V", + garbageValue = "29369" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -85,10 +82,10 @@ void decodeNext(Buffer var1, int var2, int var3) { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1881157581" + garbageValue = "511229306" ) @Export("setHsl") void setHsl(int var1) { @@ -115,8 +112,8 @@ void setHsl(int var1) { double var12 = 0.0D; double var14 = 0.0D; - double var16 = (var10 + var8) / 2.0D; - if (var10 != var8) { + double var16 = (var8 + var10) / 2.0D; + if (var8 != var10) { if (var16 < 0.5D) { var14 = (var10 - var8) / (var8 + var10); } @@ -125,12 +122,12 @@ void setHsl(int var1) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { + if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { + } else if (var10 == var4) { var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; + var12 = 4.0D + (var2 - var4) / (var10 - var8); } } @@ -150,9 +147,9 @@ void setHsl(int var1) { } if (var16 > 0.5D) { - this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); + this.hueMultiplier = (int)(512.0D * (1.0D - var16) * var14); } else { - this.hueMultiplier = (int)(var16 * var14 * 512.0D); + this.hueMultiplier = (int)(512.0D * var16 * var14); } if (this.hueMultiplier < 1) { @@ -162,55 +159,122 @@ void setHsl(int var1) { this.hue = (int)(var12 * (double)this.hueMultiplier); } - @ObfuscatedName("ai") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "65" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1839424065" ) - static final int method1044(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } + @Export("addImageTag") + static String addImageTag(int var0) { + return ""; } - @ObfuscatedName("ae") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;I)[F", - garbageValue = "508880574" + descriptor = "([FIFZFZ[FI)I", + garbageValue = "-1537766732" ) - static float[] method1043(JSONObject var0, String var1) throws JSONException { - float[] var2 = new float[4]; - - try { - JSONArray var3 = var0.getJSONArray(var1); - var2[0] = (float)var3.optDouble(0, 0.0D); - var2[1] = (float)var3.optDouble(1, 0.0D); - var2[2] = (float)var3.optDouble(2, 1.0D); - var2[3] = (float)var3.optDouble(3, 1.0D); - } catch (JSONException var4) { - var2[0] = 0.0F; - var2[1] = 0.0F; - var2[2] = 1.0F; - var2[3] = 1.0F; + public static int method967(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { + float var7 = 0.0F; + + for (int var8 = 0; var8 < var1 + 1; ++var8) { + var7 += Math.abs(var0[var8]); } - return var2; + float var24 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class127.field1219; + if (var7 <= var24) { + return -1; + } else { + float[] var9 = new float[var1 + 1]; + + int var10; + for (var10 = 0; var10 < var1 + 1; ++var10) { + var9[var10] = var0[var10] * (1.0F / var7); + } + + while (Math.abs(var9[var1]) < var24) { + --var1; + } + + var10 = 0; + if (var1 == 0) { + return var10; + } else if (var1 == 1) { + var6[0] = -var9[0] / var9[1]; + boolean var11 = var3 ? var2 < var6[0] + var24 : var2 < var6[0] - var24; + boolean var12 = var5 ? var4 > var6[0] - var24 : var4 > var24 + var6[0]; + var10 = var11 && var12 ? 1 : 0; + if (var10 > 0) { + if (var3 && var6[0] < var2) { + var6[0] = var2; + } else if (var5 && var6[0] > var4) { + var6[0] = var4; + } + } + + return var10; + } else { + class464 var21 = new class464(var9, var1); + float[] var22 = new float[var1 + 1]; + + for (int var13 = 1; var13 <= var1; ++var13) { + var22[var13 - 1] = (float)var13 * var9[var13]; + } + + float[] var23 = new float[var1 + 1]; + int var14 = method967(var22, var1 - 1, var2, false, var4, false, var23); + if (var14 == -1) { + return 0; + } else { + boolean var15 = false; + float var17 = 0.0F; + float var18 = 0.0F; + float var19 = 0.0F; + + for (int var20 = 0; var20 <= var14; ++var20) { + if (var10 > var1) { + return var10; + } + + float var16; + if (var20 == 0) { + var16 = var2; + var18 = class251.method1335(var9, var1, var2); + if (Math.abs(var18) <= var24 && var3) { + var6[var10++] = var2; + } + } else { + var16 = var19; + var18 = var17; + } + + if (var20 == var14) { + var19 = var4; + var15 = false; + } else { + var19 = var23[var20]; + } + + var17 = class251.method1335(var9, var1, var19); + if (var15) { + var15 = false; + } else if (Math.abs(var17) < var24) { + if (var14 != var20 || var5) { + var6[var10++] = var19; + var15 = true; + } + } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { + var6[var10++] = ClanSettings.method805(var21, var16, var19, 0.0F); + if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var24) { + var6[var10 - 2] = (var6[var10 - 2] + var6[var10 - 1]) * 0.5F; + --var10; + } + } + } + + return var10; + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/Font.java b/osrs/src/main/java/Font.java index 9d53d9527..e7fa1c4fc 100644 --- a/osrs/src/main/java/Font.java +++ b/osrs/src/main/java/Font.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("pu") +@ObfuscatedName("pf") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { @@ -13,7 +13,7 @@ public Font(byte[] var1) { super(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; @@ -55,7 +55,7 @@ final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; diff --git a/osrs/src/main/java/FontName.java b/osrs/src/main/java/FontName.java index 7d1ef917c..3cedcbfc2 100644 --- a/osrs/src/main/java/FontName.java +++ b/osrs/src/main/java/FontName.java @@ -3,46 +3,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tc") +@ObfuscatedName("th") @Implements("FontName") public class FontName { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lth;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lth;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lth;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lth;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lth;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lth;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("name") String name; @@ -59,28 +59,23 @@ public class FontName { this.name = var1; } - @ObfuscatedName("iv") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lif;IIII)V", - garbageValue = "-1051855910" + descriptor = "(IB)V", + garbageValue = "-56" ) - static void method2481(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && class91.clientPreferences.getAreaSoundEffectsVolume() != 0) { - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { - class91.method482(var0.soundEffects[var1], var2, var3); - } - } + static void method2459(int var0) { + class461.field3899 = var0; + class461.field3900 = new class461[var0]; + IgnoreList.field3815 = 0; } - @ObfuscatedName("md") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1514156294" + descriptor = "(B)[Lth;", + garbageValue = "50" ) - static final void method2482(int var0) { - var0 = Math.max(Math.min(var0, 100), 0); - var0 = 100 - var0; - float var1 = 0.5F + (float)var0 / 200.0F; - JagexCache.method920((double)var1); + public static FontName[] method2458() { + return new FontName[]{FontName_verdana13, FontName_bold12, FontName_verdana15, FontName_plain11, FontName_plain12, FontName_verdana11}; } } \ No newline at end of file diff --git a/osrs/src/main/java/Fonts.java b/osrs/src/main/java/Fonts.java index 7772ac1fa..3d2504a3b 100644 --- a/osrs/src/main/java/Fonts.java +++ b/osrs/src/main/java/Fonts.java @@ -5,27 +5,27 @@ import java.util.HashMap; -@ObfuscatedName("tt") +@ObfuscatedName("tk") @Implements("Fonts") public class Fonts { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Lom;Lom;)V" + descriptor = "(Lol;Lol;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; @@ -33,10 +33,10 @@ public Fonts(AbstractArchive var1, AbstractArchive var2) { this.map = new HashMap(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([Ltc;I)Ljava/util/HashMap;", - garbageValue = "932595648" + descriptor = "([Lth;I)Ljava/util/HashMap;", + garbageValue = "-926554557" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -48,35 +48,7 @@ public HashMap createMap(FontName[] var1) { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - AbstractArchive var7 = this.spritesArchive; - AbstractArchive var8 = this.fontsArchive; - String var9 = var5.name; - Font var6; - if (!var7.isValidFileName(var9, "")) { - var6 = null; - } else { - int var10 = var7.getGroupId(var9); - int var11 = var7.getFileId(var10, ""); - Font var12; - if (!class164.method862(var7, var10, var11)) { - var12 = null; - } else { - byte[] var14 = var8.takeFile(var10, var11); - Font var13; - if (var14 == null) { - var13 = null; - } else { - Font var15 = new Font(var14, class326.SpriteBuffer_xOffsets, ModelData0.SpriteBuffer_yOffsets, class59.SpriteBuffer_spriteWidths, class544.SpriteBuffer_spriteHeights, class372.SpriteBuffer_spritePalette, AddRequestTask.SpriteBuffer_pixels); - class407.method2062(); - var13 = var15; - } - - var12 = var13; - } - - var6 = var12; - } - + Font var6 = class10.method40(this.spritesArchive, this.fontsArchive, var5.name, ""); if (var6 != null) { this.map.put(var5, var6); var2.put(var5, var6); diff --git a/osrs/src/main/java/Frames.java b/osrs/src/main/java/Frames.java index f62dd62f1..37d29e543 100644 --- a/osrs/src/main/java/Frames.java +++ b/osrs/src/main/java/Frames.java @@ -3,24 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; - -@ObfuscatedName("ja") +@ObfuscatedName("ko") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "[Lji;" + descriptor = "[Lkr;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lom;Lom;IZ)V" + descriptor = "(Lol;Lol;IZ)V" ) Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); @@ -57,238 +51,53 @@ public class Frames extends DualNode { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1567177600" + descriptor = "(IB)Z", + garbageValue = "-58" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "([BI)Lud;", - garbageValue = "-1476934708" - ) - public static final SpritePixels method1335(byte[] var0) { - BufferedImage var1 = null; - - try { - Class var2 = ImageIO.class; - synchronized(ImageIO.class) { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); - } - - int var6 = var1.getWidth(); - int var7 = var1.getHeight(); - int[] var4 = new int[var6 * var7]; - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var6, var7, var4, 0, var6); - var5.grabPixels(); - return new SpritePixels(var4, var6, var7); - } catch (IOException var9) { - } catch (InterruptedException var10) { - } - - return new SpritePixels(0, 0); - } - - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([FIFI)F", - garbageValue = "-2051781010" + descriptor = "(II)Lhr;", + garbageValue = "-1830265159" ) - static float method1338(float[] var0, int var1, float var2) { - float var3 = var0[var1]; - - for (int var4 = var1 - 1; var4 >= 0; --var4) { - var3 = var2 * var3 + var0[var4]; - } - - return var3; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "([I[IIIB)V", - garbageValue = "-27" - ) - public static void method1337(int[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - int var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - int var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - int var8 = var6 == Integer.MAX_VALUE ? 0 : 1; - - for (int var9 = var2; var9 < var3; ++var9) { - if (var0[var9] < (var9 & var8) + var6) { - int var10 = var0[var9]; - var0[var9] = var0[var5]; - var0[var5] = var10; - int var11 = var1[var9]; - var1[var9] = var1[var5]; - var1[var5++] = var11; - } + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - method1337(var0, var1, var2, var5 - 1); - method1337(var0, var1, var5 + 1, var3); + var1.postDecode(); + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); + return var1; } - } - @ObfuscatedName("bn") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-1515461469" + descriptor = "(B)V", + garbageValue = "-34" ) - static int method1339(int var0, Script var1, boolean var2) { - if (var0 == 3300) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; - return 1; - } else { - int var3; - int var4; - if (var0 == 3301) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.method2003(var3, var4); - return 1; - } else if (var0 == 3302) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class27.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == 3303) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.method810(var3, var4); - return 1; - } else if (var0 == 3304) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanChannel.getInvDefinition(var3).size; - return 1; - } else if (var0 == 3305) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == 3306) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == 3307) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; + static void method1519() { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (WorldMapIcon_1.clientPreferences.getUsernameToRemember() != null) { + Login.Login_username = WorldMapIcon_1.clientPreferences.getUsernameToRemember(); + Client.Login_isUsernameRemembered = true; } else { - int var5; - if (var0 == 3308) { - var3 = class87.Client_plane; - var4 = (TextureProvider.localPlayer.x >> 7) + class20.baseX; - var5 = (TextureProvider.localPlayer.y >> 7) + class19.baseY; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == 3309) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == 3310) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == 3311) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == 3312) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == 3313) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.method2003(var3, var4); - return 1; - } else if (var0 == 3314) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class27.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == 3315) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.method810(var3, var4); - return 1; - } else if (var0 == 3316) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3317) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == 3318) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == 3321) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy / 100; - return 1; - } else if (var0 == 3322) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == 3323) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3324) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == 3325) { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == 3326) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.lastMouseRecordX; - return 1; - } else if (var0 == 3327) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.lastMouseRecordY; - return 1; - } else if (var0 == 3331) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else { - return 2; - } + Client.Login_isUsernameRemembered = false; } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/Friend.java b/osrs/src/main/java/Friend.java index 1bf889d02..b6de5aa53 100644 --- a/osrs/src/main/java/Friend.java +++ b/osrs/src/main/java/Friend.java @@ -2,26 +2,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.js.JSObject; -import java.applet.Applet; -import java.net.URL; - -@ObfuscatedName("rq") +@ObfuscatedName("qk") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("ac") - boolean field3824; - @ObfuscatedName("al") - boolean field3825; + @ObfuscatedName("gz") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("at") + boolean field3831; + @ObfuscatedName("ah") + boolean field3830; Friend() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lrq;B)I", - garbageValue = "0" + descriptor = "(Lqk;I)I", + garbageValue = "1155977086" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -33,23 +32,23 @@ int compareToFriend(Friend var1) { return -1; } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field3824 && !var1.field3824) { + } else if (this.field3831 && !var1.field3831) { return -1; - } else if (!this.field3824 && var1.field3824) { + } else if (!this.field3831 && var1.field3831) { return 1; - } else if (this.field3825 && !var1.field3825) { + } else if (this.field3830 && !var1.field3830) { return -1; - } else if (!this.field3825 && var1.field3825) { + } else if (!this.field3830 && var1.field3830) { return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lrp;I)I", - garbageValue = "762888653" + descriptor = "(Lrf;B)I", + garbageValue = "-95" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -60,81 +59,4 @@ public int compareTo_user(User var1) { public int compareTo(Object var1) { return this.compareToFriend((Friend)var1); } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(B)Lrd;", - garbageValue = "-67" - ) - public static class464 method2240() { - synchronized(class464.field3898) { - if (class464.field3896 == 0) { - return new class464(); - } else { - class464.field3898[--class464.field3896].method2333(); - return class464.field3898[class464.field3896]; - } - } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", - garbageValue = "2116973766" - ) - static boolean method2242(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class31.field84.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; - - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var14.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; - } - } catch (Throwable var8) { - return false; - } - } else if (var1 == 1) { - try { - Applet var7 = class31.field83; - Object[] var5 = new Object[]{(new URL(class31.field83.getCodeBase(), var0)).toString()}; - Object var13 = JSObject.getWindow(var7).call(var2, var5); - return var13 != null; - } catch (Throwable var9) { - return false; - } - } else if (var1 == 2) { - try { - class31.field83.getAppletContext().showDocument(new URL(class31.field83.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var10) { - return false; - } - } else if (var1 == 3) { - try { - Applet var3 = class31.field83; - JSObject.getWindow(var3).call("loggedout", (Object[])null); - } catch (Throwable var12) { - } - - try { - class31.field83.getAppletContext().showDocument(new URL(class31.field83.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var11) { - return false; - } - } else { - throw new IllegalArgumentException(); - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/FriendLoginUpdate.java b/osrs/src/main/java/FriendLoginUpdate.java index 03f254aad..37d8f2e0a 100644 --- a/osrs/src/main/java/FriendLoginUpdate.java +++ b/osrs/src/main/java/FriendLoginUpdate.java @@ -3,27 +3,69 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rr") +@ObfuscatedName("rm") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("ac") - public int field3826; - @ObfuscatedName("al") + @ObfuscatedName("at") + public int field3832; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lvf;" + descriptor = "Lvj;" ) @Export("friendUsername") public Username friendUsername; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("worldId") public short worldId; @ObfuscatedSignature( - descriptor = "(Lvf;I)V" + descriptor = "(Lvj;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3826 = (int)(GrandExchangeOfferTotalQuantityComparator.method1971() / 1000L); + this.field3832 = (int)(SpotAnimationDefinition.method962() / 1000L); this.friendUsername = var1; this.worldId = (short)var2; } + + @ObfuscatedName("ic") + @ObfuscatedSignature( + descriptor = "(Lhx;IIILdf;B)V", + garbageValue = "-64" + ) + static void method2227(SequenceDefinition var0, int var1, int var2, int var3, Actor var4) { + if (Client.soundEffectCount < 50) { + if (var0.animMayaFrameSounds != null && var0.animMayaFrameSounds.containsKey(var1)) { + int var5 = (Integer)var0.animMayaFrameSounds.get(var1) & 15; + if ((var5 <= 0 || WorldMapIcon_1.clientPreferences.getAreaSoundEffectsVolume() != 0) && (var5 != 0 || WorldMapIcon_1.clientPreferences.getCurrentSoundEffectsVolume() != 0)) { + int var6 = (Integer)var0.animMayaFrameSounds.get(var1); + boolean var9 = var4 == class229.localPlayer; + if (var6 != 0) { + int var10 = var6 & 15; + int var11; + int var12; + if (var10 == 0) { + if (!var9) { + return; + } + + Client.soundLocations[Client.soundEffectCount] = 0; + } else { + var11 = (var2 - 64) / 128; + var12 = (var3 - 64) / 128; + Client.soundLocations[Client.soundEffectCount] = var10 + (var12 << 8) + (var11 << 16); + } + + var11 = var6 >> 8; + var12 = var6 >> 4 & 7; + Client.soundEffectIds[Client.soundEffectCount] = var11; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var12; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; + Client.soundEffects[Client.soundEffectCount] = null; + ++Client.soundEffectCount; + } + + } + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/FriendSystem.java b/osrs/src/main/java/FriendSystem.java index 901bd1396..32bdef46b 100644 --- a/osrs/src/main/java/FriendSystem.java +++ b/osrs/src/main/java/FriendSystem.java @@ -3,33 +3,38 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +import java.util.Iterator; + +@ObfuscatedName("cj") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("ax") + @ObfuscatedName("oi") + @Export("menuX") + static int menuX; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lrt;" + descriptor = "Lqh;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lqu;" + descriptor = "Lqs;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("friendListStatus") int friendListStatus; @ObfuscatedSignature( - descriptor = "(Lte;)V" + descriptor = "(Ltt;)V" ) FriendSystem(LoginType var1) { this.friendListStatus = 0; @@ -38,51 +43,67 @@ public class FriendSystem { this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1564644877" + descriptor = "(B)Z", + garbageValue = "-69" ) - boolean method400() { + boolean method408() { return this.friendListStatus == 2; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-207858450" ) - final void method401() { + final void method409() { this.friendListStatus = 1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "-47" + descriptor = "(Luj;II)V", + garbageValue = "-1145524939" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); this.friendListStatus = 2; - VerticalAlignment.method1027(); + + for (int var3 = 0; var3 < Players.Players_count; ++var3) { + Player var4 = Client.players[Players.Players_indices[var3]]; + var4.clearIsFriend(); + } + + Iterator var5 = Messages.Messages_hashTable.iterator(); + + while (var5.hasNext()) { + Message var6 = (Message)var5.next(); + var6.clearIsFromFriend(); + } + + if (class20.friendsChat != null) { + class20.friendsChat.clearFriends(); + } + } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-592111602" + garbageValue = "1225915073" ) @Export("processFriendUpdates") final void processFriendUpdates() { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3826 < GrandExchangeOfferTotalQuantityComparator.method1971() / 1000L - 5L) { + if ((long)var1.field3832 < SpotAnimationDefinition.method962() / 1000L - 5L) { if (var1.worldId > 0) { - class411.addGameMessage(5, "", var1.friendUsername + " has logged in."); + GrandExchangeOfferUnitPriceComparator.addGameMessage(5, "", var1.friendUsername + " has logged in."); } if (var1.worldId == 0) { - class411.addGameMessage(5, "", var1.friendUsername + " has logged out."); + GrandExchangeOfferUnitPriceComparator.addGameMessage(5, "", var1.friendUsername + " has logged out."); } var1.remove(); @@ -91,10 +112,10 @@ final void processFriendUpdates() { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1144489465" + garbageValue = "-2013654454" ) @Export("clear") final void clear() { @@ -103,26 +124,26 @@ final void clear() { this.ignoreList.clear(); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lvf;ZB)Z", - garbageValue = "32" + descriptor = "(Lvj;ZI)Z", + garbageValue = "1878561272" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } else if (var1.equals(TextureProvider.localPlayer.username)) { + } else if (var1.equals(class229.localPlayer.username)) { return true; } else { return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lvf;I)Z", - garbageValue = "1117529753" + descriptor = "(Lvj;I)Z", + garbageValue = "150326624" ) @Export("isIgnored") final boolean isIgnored(Username var1) { @@ -133,10 +154,10 @@ final boolean isIgnored(Username var1) { } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2080092876" + garbageValue = "1173246505" ) @Export("addFriend") final void addFriend(String var1) { @@ -144,16 +165,16 @@ final void addFriend(String var1) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsListIsFull()) { - class436.method2211("Your friend list is full. Max of 200 for free users, and 400 for members"); - } else if (TextureProvider.localPlayer.username.equals(var2)) { - class436.method2211("You can't add yourself to your own friend list"); + AttackOption.method607(); + } else if (class229.localPlayer.username.equals(var2)) { + class163.method849(); } else if (this.isFriended(var2, false)) { - PendingSpawn.method508(var1); + class222.method1121(var1); } else if (this.isIgnored(var2)) { - class436.method2211("Please remove " + var1 + " from your ignore list first"); + AbstractUserComparator.method2242(var1); } else { - PacketBufferNode var3 = ClanChannelMember.getPacketBufferNode(ClientPacket.f88, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var1)); + PacketBufferNode var3 = class113.getPacketBufferNode(ClientPacket.f88, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(ClanChannel.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } @@ -161,20 +182,20 @@ final void addFriend(String var1) { } } - @ObfuscatedName("ag") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "19" + descriptor = "(I)Z", + garbageValue = "-1130501973" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.isMembers != 1; } - @ObfuscatedName("aa") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "0" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2025283192" ) @Export("addIgnore") final void addIgnore(String var1) { @@ -182,34 +203,34 @@ final void addIgnore(String var1) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.canAddIgnore()) { - class284.method1572(); - } else if (TextureProvider.localPlayer.username.equals(var2)) { - RouteStrategy.method1171(); + WorldMapArea.method1213("Your ignore list is full. Max of 100 for free users, and 400 for members"); + } else if (class229.localPlayer.username.equals(var2)) { + class158.method829(); } else if (this.isIgnored(var2)) { - class436.method2211(var1 + " is already on your ignore list"); + WorldMapArea.method1213(var1 + " is already on your ignore list"); } else if (this.isFriended(var2, false)) { - class436.method2211("Please remove " + var1 + " from your friend list first"); + WorldMapArea.method1213("Please remove " + var1 + " from your friend list first"); } else { - class145.method764(var1); + ScriptFrame.method343(var1); } } } } - @ObfuscatedName("aj") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "592853895" + garbageValue = "431528192" ) @Export("canAddIgnore") final boolean canAddIgnore() { return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.isMembers != 1; } - @ObfuscatedName("an") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-16" + garbageValue = "-125" ) @Export("removeFriend") final void removeFriend(String var1) { @@ -217,22 +238,37 @@ final void removeFriend(String var1) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { - Client.field511 = Client.cycleCntr; - PacketBufferNode var3 = ClanChannelMember.getPacketBufferNode(ClientPacket.FRIEND_DELETE_USER, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var1)); + JagexCache.method1088(); + PacketBufferNode var3 = class113.getPacketBufferNode(ClientPacket.FRIEND_DELETE_USER, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(ClanChannel.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - VerticalAlignment.method1027(); + for (int var5 = 0; var5 < Players.Players_count; ++var5) { + Player var4 = Client.players[Players.Players_indices[var5]]; + var4.clearIsFriend(); + } + + Iterator var6 = Messages.Messages_hashTable.iterator(); + + while (var6.hasNext()) { + Message var7 = (Message)var6.next(); + var7.clearIsFromFriend(); + } + + if (class20.friendsChat != null) { + class20.friendsChat.clearFriends(); + } + } } } - @ObfuscatedName("au") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "-2065988446" + garbageValue = "-462327739" ) @Export("removeIgnore") public final void removeIgnore(String var1, boolean var2) { @@ -240,49 +276,28 @@ public final void removeIgnore(String var1, boolean var2) { Username var3 = new Username(var1, this.loginType); if (var3.hasCleanName()) { if (this.ignoreList.removeByUsername(var3)) { - Client.field511 = Client.cycleCntr; + JagexCache.method1088(); if (var2) { - PacketBufferNode var4 = ClanChannelMember.getPacketBufferNode(ClientPacket.IGNORE_DELUSER, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var1)); + PacketBufferNode var4 = class113.getPacketBufferNode(ClientPacket.IGNORE_DELUSER, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(ClanChannel.stringCp1252NullTerminatedByteSize(var1)); var4.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var4); } } - class492.FriendSystem_invalidateIgnoreds(); + DelayFadeTask.FriendSystem_invalidateIgnoreds(); } } } @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lvf;B)Z", - garbageValue = "-15" + descriptor = "(Lvj;I)Z", + garbageValue = "-94470483" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { Friend var2 = (Friend)this.friendsList.getByUsername(var1); return var2 != null && var2.hasWorld(); } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)[B", - garbageValue = "1223769236" - ) - public static byte[] method399(CharSequence var0) { - int var1 = var0.length(); - byte[] var2 = new byte[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if (var4 > 127) { - var2[var3] = 63; - } else { - var2[var3] = (byte)var4; - } - } - - return var2; - } } \ No newline at end of file diff --git a/osrs/src/main/java/FriendsChat.java b/osrs/src/main/java/FriendsChat.java index 44d3603ac..d058b00f1 100644 --- a/osrs/src/main/java/FriendsChat.java +++ b/osrs/src/main/java/FriendsChat.java @@ -3,42 +3,41 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rl") +@ObfuscatedName("qi") @Implements("FriendsChat") public class FriendsChat extends UserList { - @ObfuscatedName("qj") - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("al") + @ObfuscatedName("hh") + static String field3821; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lqc;" + descriptor = "Lqz;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("name") public String name; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("owner") public String owner; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("minKick") public byte minKick; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("rank") public int rank; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("memberCount") int memberCount; @ObfuscatedSignature( - descriptor = "(Lte;Lqc;)V" + descriptor = "(Ltt;Lqz;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { super(500); @@ -49,146 +48,116 @@ public FriendsChat(LoginType var1, Usernamed var2) { this.localUser = var2; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lrp;", - garbageValue = "1002915738" + descriptor = "(I)Lrf;", + garbageValue = "794695059" ) @Export("newInstance") User newInstance() { return new ClanMate(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)[Lrp;", - garbageValue = "-1086220070" + descriptor = "(II)[Lrf;", + garbageValue = "-190310061" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1282030500" + garbageValue = "-2021517341" ) - final void method2232(String var1) { - long var5 = 0L; - int var7 = var1.length(); - - for (int var8 = 0; var8 < var7; ++var8) { - var5 *= 37L; - char var9 = var1.charAt(var8); - if (var9 >= 'A' && var9 <= 'Z') { - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); - } - - if (var5 >= 177917621779460413L) { - break; - } - } - - while (0L == var5 % 37L && var5 != 0L) { - var5 /= 37L; - } - - String var10 = class163.base37DecodeLong(var5); - if (var10 == null) { - var10 = ""; - } - - this.name = var10; + final void method2216(String var1) { + this.name = class128.method696(var1); } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "121" + garbageValue = "111" ) - final void method2233(String var1) { - long var5 = 0L; - int var7 = var1.length(); + final void method2217(String var1) { + this.owner = class128.method696(var1); + } - for (int var8 = 0; var8 < var7; ++var8) { - var5 *= 37L; - char var9 = var1.charAt(var8); - if (var9 >= 'A' && var9 <= 'Z') { - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); - } + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Luj;IB)V", + garbageValue = "103" + ) + public final void method2218(Buffer var1, int var2) { + this.method2217(var1.readStringCp1252NullTerminated()); + long var3 = var1.readLong(); + long var6 = var3; + String var5; + int var8; + if (var3 > 0L && var3 < 6582952005840035281L) { + if (var3 % 37L == 0L) { + var5 = null; + } else { + var8 = 0; + + for (long var9 = var3; 0L != var9; var9 /= 37L) { + ++var8; + } - if (var5 >= 177917621779460413L) { - break; - } - } + StringBuilder var11 = new StringBuilder(var8); - while (0L == var5 % 37L && var5 != 0L) { - var5 /= 37L; - } + while (var6 != 0L) { + long var12 = var6; + var6 /= 37L; + var11.append(class400.base37Table[(int)(var12 - 37L * var6)]); + } - String var10 = class163.base37DecodeLong(var5); - if (var10 == null) { - var10 = ""; + var5 = var11.reverse().toString(); + } + } else { + var5 = null; } - this.owner = var10; - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "795527291" - ) - public final void method2234(Buffer var1, int var2) { - this.method2233(var1.readStringCp1252NullTerminated()); - long var3 = var1.readLong(); - this.method2232(class160.method841(var3)); + this.method2216(var5); this.minKick = var1.readByte(); - int var5; - short var6; + short var14; if (var2 == 1) { - var5 = var1.readUnsignedByte(); - var6 = 255; + var8 = var1.readUnsignedByte(); + var14 = 255; } else { if (var2 != 2) { throw new IllegalArgumentException("Invalid friend chat full update version: " + var2); } - var5 = var1.readShortSmartSub(); - var6 = -1; + var8 = var1.readShortSmartSub(); + var14 = -1; } - if (var5 != var6) { - int var7 = var5; + if (var8 != var14) { + int var10 = var8; this.clear(); - for (int var8 = 0; var8 < var7; ++var8) { - ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var10 = var1.readUnsignedShort(); - var9.set(var10, ++this.memberCount - 1); - var9.rank = var1.readByte(); + for (int var15 = 0; var15 < var10; ++var15) { + ClanMate var16 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); + int var13 = var1.readUnsignedShort(); + var16.set(var13, ++this.memberCount - 1); + var16.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); - this.isLocalPlayer(var9); + this.isLocalPlayer(var16); } } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "1748337091" + descriptor = "(Luj;I)V", + garbageValue = "-623451894" ) - public final void method2235(Buffer var1) { + public final void method2220(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); @@ -225,10 +194,10 @@ public final void method2235(Buffer var1) { } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-6" + descriptor = "(I)V", + garbageValue = "-1485871297" ) @Export("clearFriends") public final void clearFriends() { @@ -238,10 +207,10 @@ public final void clearFriends() { } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-450328361" + garbageValue = "511267202" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { @@ -251,10 +220,10 @@ public final void invalidateIgnoreds() { } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lrm;B)V", - garbageValue = "0" + descriptor = "(Lrp;S)V", + garbageValue = "-25332" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { @@ -263,4 +232,97 @@ final void isLocalPlayer(ClanMate var1) { } } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(CI)C", + garbageValue = "-350707745" + ) + public static char method2219(char var0) { + switch(var0) { + case ' ': + case '-': + case '_': + case '\u00a0': + return '_'; + case '#': + case '[': + case ']': + return var0; + case '\u00c0': + case '\u00c1': + case '\u00c2': + case '\u00c3': + case '\u00c4': + case '\u00e0': + case '\u00e1': + case '\u00e2': + case '\u00e3': + case '\u00e4': + return 'a'; + case '\u00c7': + case '\u00e7': + return 'c'; + case '\u00c8': + case '\u00c9': + case '\u00ca': + case '\u00cb': + case '\u00e8': + case '\u00e9': + case '\u00ea': + case '\u00eb': + return 'e'; + case '\u00cd': + case '\u00ce': + case '\u00cf': + case '\u00ed': + case '\u00ee': + case '\u00ef': + return 'i'; + case '\u00d1': + case '\u00f1': + return 'n'; + case '\u00d2': + case '\u00d3': + case '\u00d4': + case '\u00d5': + case '\u00d6': + case '\u00f2': + case '\u00f3': + case '\u00f4': + case '\u00f5': + case '\u00f6': + return 'o'; + case '\u00d9': + case '\u00da': + case '\u00db': + case '\u00dc': + case '\u00f9': + case '\u00fa': + case '\u00fb': + case '\u00fc': + return 'u'; + case '\u00df': + return 'b'; + case '\u00ff': + case '\u0178': + return 'y'; + default: + return Character.toLowerCase(var0); + } + } + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(ILmh;ZI)V", + garbageValue = "-1919128859" + ) + static void method2224(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = WorldMapArchiveLoader.getWorldMap().getMapArea(var0); + int var4 = class229.localPlayer.plane; + int var5 = (class229.localPlayer.x >> 7) + NewShit.baseX; + int var6 = (class229.localPlayer.y >> 7) + class101.baseY; + Coord var7 = new Coord(var4, var5, var6); + WorldMapArchiveLoader.getWorldMap().method2414(var3, var7, var1, var2); + } } \ No newline at end of file diff --git a/osrs/src/main/java/FriendsList.java b/osrs/src/main/java/FriendsList.java index 5da8facf3..f31ac0ce2 100644 --- a/osrs/src/main/java/FriendsList.java +++ b/osrs/src/main/java/FriendsList.java @@ -3,60 +3,64 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rt") +@ObfuscatedName("qh") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("an") - static String[] field3812; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Lup;" + ) + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ltt;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("ax") - int field3813; @ObfuscatedName("ao") + int field3818; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lph;" + descriptor = "Lpu;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lte;)V" + descriptor = "(Ltt;)V" ) public FriendsList(LoginType var1) { super(400); - this.field3813 = 1; + this.field3818 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lrp;", - garbageValue = "1002915738" + descriptor = "(I)Lrf;", + garbageValue = "794695059" ) @Export("newInstance") User newInstance() { return new Friend(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)[Lrp;", - garbageValue = "-1086220070" + descriptor = "(II)[Lrf;", + garbageValue = "-190310061" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lvf;ZI)Z", - garbageValue = "-2020456802" + descriptor = "(Lvj;ZI)Z", + garbageValue = "645872851" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -68,10 +72,10 @@ public boolean isFriended(Username var1, boolean var2) { } } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "121" + descriptor = "(Luj;II)V", + garbageValue = "-846480965" ) @Export("read") public void read(Buffer var1, int var2) { @@ -135,17 +139,17 @@ public void read(Buffer var1, int var2) { } if (var6 != var11.world) { - var11.int2 = ++this.field3813 - 1; + var11.int2 = ++this.field3818 - 1; if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * 1199192167) * 885089111; + var11.int2 = -(var11.int2 * 1393374135) * -977987065; } var11.world = var6; } var11.rank = var7; - var11.field3824 = var9; - var11.field3825 = var10; + var11.field3831 = var9; + var11.field3830 = var10; continue; } diff --git a/osrs/src/main/java/GZipDecompressor.java b/osrs/src/main/java/GZipDecompressor.java index 6f2a8fd36..0e993efb9 100644 --- a/osrs/src/main/java/GZipDecompressor.java +++ b/osrs/src/main/java/GZipDecompressor.java @@ -5,10 +5,10 @@ import java.util.zip.Inflater; -@ObfuscatedName("vb") +@ObfuscatedName("ve") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("inflater") Inflater inflater; @@ -23,10 +23,10 @@ public GZipDecompressor() { GZipDecompressor(int var1, int var2, int var3) { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;[BI)V", - garbageValue = "-684526708" + descriptor = "(Luj;[BI)V", + garbageValue = "1095129019" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { diff --git a/osrs/src/main/java/GameBuild.java b/osrs/src/main/java/GameBuild.java index d67ff8307..53b1a9722 100644 --- a/osrs/src/main/java/GameBuild.java +++ b/osrs/src/main/java/GameBuild.java @@ -3,39 +3,39 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ng") +@ObfuscatedName("nv") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lng;" + descriptor = "Lnv;" ) @Export("LIVE") static final GameBuild LIVE; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lng;" + descriptor = "Lnv;" ) @Export("BUILDLIVE") static final GameBuild BUILDLIVE; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lng;" + descriptor = "Lnv;" ) @Export("RC") static final GameBuild RC; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lng;" + descriptor = "Lnv;" ) @Export("WIP") static final GameBuild WIP; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("name") public final String name; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("buildId") - final int buildId; + public final int buildId; static { LIVE = new GameBuild("LIVE", 0); diff --git a/osrs/src/main/java/GameEngine.java b/osrs/src/main/java/GameEngine.java index e92607c5c..e5f49a2af 100644 --- a/osrs/src/main/java/GameEngine.java +++ b/osrs/src/main/java/GameEngine.java @@ -12,118 +12,121 @@ import java.awt.image.ImageObserver; import java.net.URL; -@ObfuscatedName("bb") +@ObfuscatedName("bm") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lih;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lbb;" + descriptor = "Lbm;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("ab") + @ObfuscatedName("aa") + @Export("gameCyclesToDo") + static int gameCyclesToDo; + @ObfuscatedName("ac") @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("fps") protected static int fps; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("graphicsTickTimes") static long[] graphicsTickTimes; - @ObfuscatedName("ay") - static int field100; @ObfuscatedName("as") + static int field101; + @ObfuscatedName("ay") @Export("clientTickTimes") static long[] clientTickTimes; - @ObfuscatedName("bz") - static int field101; - @ObfuscatedName("bu") + @ObfuscatedName("ba") + static int field102; + @ObfuscatedName("by") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("bh") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Laf;" ) @Export("keyHandler") static KeyHandler keyHandler; - @ObfuscatedName("bg") + @ObfuscatedName("bs") @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("bj") + @ObfuscatedName("bx") @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("canvasX") int canvasX; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("canvasY") int canvasY; - @ObfuscatedName("az") + @ObfuscatedName("an") int field116; - @ObfuscatedName("at") - int field115; - @ObfuscatedName("af") + @ObfuscatedName("ag") + int field114; + @ObfuscatedName("ad") @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("bn") - protected boolean field121; - @ObfuscatedName("bd") + @ObfuscatedName("be") + protected boolean field122; + @ObfuscatedName("bi") @Export("frame") Frame frame; - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("bp") - volatile long field126; - @ObfuscatedName("br") + @ObfuscatedName("bw") + volatile long field127; + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Laq;" + descriptor = "Lae;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("bc") + @ObfuscatedName("bu") @Export("eventQueue") final EventQueue eventQueue; @@ -137,7 +140,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen fps = 0; graphicsTickTimes = new long[32]; clientTickTimes = new long[32]; - field101 = 500; + field102 = 500; volatileFocus = true; keyHandler = new KeyHandler(); garbageCollectorLastCollectionTime = -1L; @@ -148,11 +151,11 @@ protected GameEngine() { this.hasErrored = false; this.canvasX = 0; this.canvasY = 0; - this.field121 = false; + this.field122 = false; this.fullRedraw = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; - this.field126 = 0L; + this.field127 = 0L; EventQueue var1 = null; try { @@ -161,18 +164,19 @@ protected GameEngine() { } this.eventQueue = var1; - class403.method2054(new DevicePcmPlayerProvider()); + DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); + PcmPlayer.pcmPlayerProvider = var2; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "119" + garbageValue = "-49" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method158(); + this.method167(); } this.maxCanvasWidth = var1; @@ -181,14 +185,14 @@ protected final void setMaxCanvasSize(int var1, int var2) { @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;B)V", - garbageValue = "-34" + descriptor = "(Ljava/lang/Object;I)V", + garbageValue = "-1974837267" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - Players.method623(1L); + class219.method1104(1L); } if (var1 != null) { @@ -198,13 +202,13 @@ final void post(Object var1) { } } - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lgc;", - garbageValue = "643109691" + descriptor = "(I)Lis;", + garbageValue = "313158588" ) @Export("mouseWheel") - protected class176 mouseWheel() { + protected class212 mouseWheel() { if (this.mouseWheelHandler == null) { this.mouseWheelHandler = new MouseWheelHandler(); this.mouseWheelHandler.addTo(this.canvas); @@ -213,77 +217,107 @@ protected class176 mouseWheel() { return this.mouseWheelHandler; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-97772302" + garbageValue = "-2071259913" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); } - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1746840557" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-117" ) - protected void method141(String var1) { + protected void method150(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); } - @ObfuscatedName("aa") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/datatransfer/Clipboard;", - garbageValue = "-375508984" + descriptor = "(B)Ljava/awt/datatransfer/Clipboard;", + garbageValue = "88" ) @Export("getClipboard") public Clipboard getClipboard() { return this.clipboard; } - @ObfuscatedName("ap") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "84" + garbageValue = "57" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - WorldMapSection2.method1451(); - keyHandler.method98(this.canvas); + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { + class28.KeyHandler_keyCodes[186] = 57; + class28.KeyHandler_keyCodes[187] = 27; + class28.KeyHandler_keyCodes[188] = 71; + class28.KeyHandler_keyCodes[189] = 26; + class28.KeyHandler_keyCodes[190] = 72; + class28.KeyHandler_keyCodes[191] = 73; + class28.KeyHandler_keyCodes[192] = 58; + class28.KeyHandler_keyCodes[219] = 42; + class28.KeyHandler_keyCodes[220] = 74; + class28.KeyHandler_keyCodes[221] = 43; + class28.KeyHandler_keyCodes[222] = 59; + class28.KeyHandler_keyCodes[223] = 28; + } else { + class28.KeyHandler_keyCodes[44] = 71; + class28.KeyHandler_keyCodes[45] = 26; + class28.KeyHandler_keyCodes[46] = 72; + class28.KeyHandler_keyCodes[47] = 73; + class28.KeyHandler_keyCodes[59] = 57; + class28.KeyHandler_keyCodes[61] = 27; + class28.KeyHandler_keyCodes[91] = 42; + class28.KeyHandler_keyCodes[92] = 74; + class28.KeyHandler_keyCodes[93] = 43; + class28.KeyHandler_keyCodes[192] = 28; + class28.KeyHandler_keyCodes[222] = 58; + class28.KeyHandler_keyCodes[520] = 59; + } + + keyHandler.method101(this.canvas); } - @ObfuscatedName("as") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1343543797" + garbageValue = "-379793759" ) - protected final void method144() { - keyHandler.method100(); + protected final void method153() { + keyHandler.method103(); } - @ObfuscatedName("aj") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lbd;IS)V", - garbageValue = "-1458" + descriptor = "(Lbi;II)V", + garbageValue = "1492984668" ) - protected void method145(class29 var1, int var2) { - keyHandler.method96(var1, var2); + protected void method154(class29 var1, int var2) { + keyHandler.method99(var1, var2); } - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1316323394" + descriptor = "(B)V", + garbageValue = "-1" ) - protected final void method146() { - Tiles.method455(this.canvas); + protected final void method155() { + java.awt.Canvas var1 = this.canvas; + var1.addMouseListener(MouseHandler.MouseHandler_instance); + var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var1.addFocusListener(MouseHandler.MouseHandler_instance); } - @ObfuscatedName("au") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-845812181" + descriptor = "(S)V", + garbageValue = "27503" ) @Export("resizeCanvas") final void resizeCanvas() { @@ -291,7 +325,7 @@ final void resizeCanvas() { if (var1 != null) { Bounds var2 = this.getFrameContentBounds(); this.contentWidth = Math.max(var2.highX, this.field116); - this.contentHeight = Math.max(var2.highY, this.field115); + this.contentHeight = Math.max(var2.highY, this.field114); if (this.contentWidth <= 0) { this.contentWidth = 1; } @@ -300,15 +334,15 @@ final void resizeCanvas() { this.contentHeight = 1; } - class340.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - class491.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - class340.canvasWidth) / 2; + Language.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + class47.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - Language.canvasWidth) / 2; this.canvasY = 0; - this.canvas.setSize(class340.canvasWidth, class491.canvasHeight); - class223.rasterProvider = new RasterProvider(class340.canvasWidth, class491.canvasHeight, this.canvas, this.field121); + this.canvas.setSize(Language.canvasWidth, class47.canvasHeight); + class338.rasterProvider = new RasterProvider(Language.canvasWidth, class47.canvasHeight, this.canvas, this.field122); if (var1 == this.frame) { Insets var3 = this.frame.getInsets(); - this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); + this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -318,25 +352,25 @@ final void resizeCanvas() { } } - @ObfuscatedName("ai") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-953371865" + descriptor = "(B)V", + garbageValue = "101" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("ae") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "175147715" + garbageValue = "103216408" ) @Export("clearBackground") void clearBackground() { int var1 = this.canvasX; int var2 = this.canvasY; - int var3 = this.contentWidth - class340.canvasWidth - var1; - int var4 = this.contentHeight - class491.canvasHeight - var2; + int var3 = this.contentWidth - Language.canvasWidth - var1; + int var4 = this.contentHeight - class47.canvasHeight - var2; if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); @@ -371,37 +405,36 @@ void clearBackground() { } - @ObfuscatedName("aw") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1884885221" + garbageValue = "1609680743" ) @Export("replaceCanvas") final void replaceCanvas() { - keyHandler.method99(this.canvas); - java.awt.Canvas var1 = this.canvas; - var1.removeMouseListener(MouseHandler.MouseHandler_instance); - var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); - var1.removeFocusListener(MouseHandler.MouseHandler_instance); - MouseHandler.MouseHandler_currentButtonVolatile = 0; + keyHandler.method102(this.canvas); + class339.method1743(this.canvas); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.method79(this.canvas); } this.addCanvas(); - keyHandler.method98(this.canvas); - Tiles.method455(this.canvas); + keyHandler.method101(this.canvas); + java.awt.Canvas var1 = this.canvas; + var1.addMouseListener(MouseHandler.MouseHandler_instance); + var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var1.addFocusListener(MouseHandler.MouseHandler_instance); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method158(); + this.method167(); } @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-749120852" + garbageValue = "958927213" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3, int var4) { @@ -418,27 +451,27 @@ protected final void startThread(int var1, int var2, int var3, int var4) { } gameEngine = this; - class340.canvasWidth = var1; - class491.canvasHeight = var2; - RunException.RunException_revision = var3; - RunException.field4313 = var4; - class462.RunException_applet = this; + Language.canvasWidth = var1; + class47.canvasHeight = var2; + class145.RunException_revision = var3; + RunException.field4318 = var4; + RunException.RunException_applet = this; if (taskHandler == null) { taskHandler = new TaskHandler(); } taskHandler.newThreadTask(this, 1); } catch (Exception var6) { - class190.RunException_sendStackTrace((String)null, var6); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var6); this.error("crash"); } } - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2110760887" + garbageValue = "-1184721348" ) @Export("addCanvas") final synchronized void addCanvas() { @@ -448,25 +481,25 @@ final synchronized void addCanvas() { var1.remove(this.canvas); } - class340.canvasWidth = Math.max(var1.getWidth(), this.field116); - class491.canvasHeight = Math.max(var1.getHeight(), this.field115); + Language.canvasWidth = Math.max(var1.getWidth(), this.field116); + class47.canvasHeight = Math.max(var1.getHeight(), this.field114); Insets var2; if (this.frame != null) { var2 = this.frame.getInsets(); - class340.canvasWidth -= var2.right + var2.left; - class491.canvasHeight -= var2.top + var2.bottom; + Language.canvasWidth -= var2.left + var2.right; + class47.canvasHeight -= var2.top + var2.bottom; } this.canvas = new Canvas(this); var1.setBackground(Color.BLACK); var1.setLayout((LayoutManager)null); var1.add(this.canvas); - this.canvas.setSize(class340.canvasWidth, class491.canvasHeight); + this.canvas.setSize(Language.canvasWidth, class47.canvasHeight); this.canvas.setVisible(true); this.canvas.setBackground(Color.BLACK); if (var1 == this.frame) { var2 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); + this.canvas.setLocation(this.canvasX + var2.left, var2.top + this.canvasY); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -474,35 +507,35 @@ final synchronized void addCanvas() { this.canvas.addFocusListener(this); this.canvas.requestFocus(); this.fullRedraw = true; - if (class223.rasterProvider != null && class340.canvasWidth == class223.rasterProvider.width && class491.canvasHeight == class223.rasterProvider.height) { - ((RasterProvider)class223.rasterProvider).setComponent(this.canvas); - class223.rasterProvider.drawFull(0, 0); + if (class338.rasterProvider != null && Language.canvasWidth == class338.rasterProvider.width && class47.canvasHeight == class338.rasterProvider.height) { + ((RasterProvider)class338.rasterProvider).setComponent(this.canvas); + class338.rasterProvider.drawFull(0, 0); } else { - class223.rasterProvider = new RasterProvider(class340.canvasWidth, class491.canvasHeight, this.canvas, this.field121); + class338.rasterProvider = new RasterProvider(Language.canvasWidth, class47.canvasHeight, this.canvas, this.field122); } this.isCanvasInvalid = false; - this.field126 = GrandExchangeOfferTotalQuantityComparator.method1971(); + this.field127 = SpotAnimationDefinition.method962(); } - @ObfuscatedName("at") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "2016311208" + garbageValue = "1876817454" ) - protected void method152(boolean var1) { - if (this.field121 != var1) { - this.field121 = var1; - class223.rasterProvider.method2685(var1); - class223.rasterProvider.apply(); + protected void method161(boolean var1) { + if (this.field122 != var1) { + this.field122 = var1; + class338.rasterProvider.method2663(var1); + class338.rasterProvider.apply(); } } - @ObfuscatedName("af") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1592501950" + garbageValue = "1264805931" ) @Export("checkHost") protected final boolean checkHost() { @@ -531,61 +564,61 @@ protected final boolean checkHost() { } } - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-73" + descriptor = "(I)V", + garbageValue = "-1012835334" ) @Export("clientTick") void clientTick() { - long var1 = GrandExchangeOfferTotalQuantityComparator.method1971(); - long var3 = clientTickTimes[class178.field1457]; - clientTickTimes[class178.field1457] = var1; - class178.field1457 = class178.field1457 + 1 & 31; + long var1 = SpotAnimationDefinition.method962(); + long var3 = clientTickTimes[class18.field54]; + clientTickTimes[class18.field54] = var1; + class18.field54 = class18.field54 + 1 & 31; if (var3 != 0L && var1 > var3) { } synchronized(this) { - KeyHandler.hasFocus = volatileFocus; + class357.hasFocus = volatileFocus; } this.doCycle(); } - @ObfuscatedName("by") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "68" + garbageValue = "1" ) - protected final void method155() { + protected final void method164() { this.fullRedraw = true; } - @ObfuscatedName("bd") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1944967760" + garbageValue = "1866404073" ) @Export("graphicsTick") void graphicsTick() { Container var1 = this.container(); - long var2 = GrandExchangeOfferTotalQuantityComparator.method1971(); - long var4 = graphicsTickTimes[field100]; - graphicsTickTimes[field100] = var2; - field100 = field100 + 1 & 31; + long var2 = SpotAnimationDefinition.method962(); + long var4 = graphicsTickTimes[field101]; + graphicsTickTimes[field101] = var2; + field101 = field101 + 1 & 31; if (var4 != 0L && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if (++field101 - 1 > 50) { - field101 -= 50; + if (++field102 - 1 > 50) { + field102 -= 50; this.fullRedraw = true; - this.canvas.setSize(class340.canvasWidth, class491.canvasHeight); + this.canvas.setSize(Language.canvasWidth, class47.canvasHeight); this.canvas.setVisible(true); if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); + this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -595,7 +628,7 @@ void graphicsTick() { this.replaceCanvas(); } - this.method157(); + this.method166(); this.draw(this.fullRedraw); if (this.fullRedraw) { this.clearBackground(); @@ -604,33 +637,33 @@ void graphicsTick() { this.fullRedraw = false; } - @ObfuscatedName("be") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "3" + descriptor = "(I)V", + garbageValue = "-992112857" ) - final void method157() { + final void method166() { Bounds var1 = this.getFrameContentBounds(); - if (var1.highX != this.contentWidth || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { + if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { this.resizeCanvas(); this.resizeCanvasNextFrame = false; } } - @ObfuscatedName("bv") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-351835050" + garbageValue = "-327763413" ) - final void method158() { + final void method167() { this.resizeCanvasNextFrame = true; } - @ObfuscatedName("ba") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "17082" + descriptor = "(I)V", + garbageValue = "785770975" ) @Export("kill") final synchronized void kill() { @@ -665,87 +698,87 @@ final synchronized void kill() { } } - @ObfuscatedName("bb") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-84" + descriptor = "(I)V", + garbageValue = "-550390769" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("bo") + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-800201684" + garbageValue = "564244601" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("bp") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "40" + descriptor = "(ZI)V", + garbageValue = "-851092167" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("bt") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1875481219" + garbageValue = "1863199463" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("bm") + @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;ZI)V", - garbageValue = "234034519" + garbageValue = "1838069290" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (class14.fontHelvetica13 == null) { - class14.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - class14.loginScreenFontMetrics = this.canvas.getFontMetrics(class14.fontHelvetica13); + if (class28.fontHelvetica13 == null) { + class28.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + class6.loginScreenFontMetrics = this.canvas.getFontMetrics(class28.fontHelvetica13); } if (var3) { var4.setColor(Color.black); - var4.fillRect(0, 0, class340.canvasWidth, class491.canvasHeight); + var4.fillRect(0, 0, Language.canvasWidth, class47.canvasHeight); } Color var5 = new Color(140, 17, 17); try { - if (class319.field2797 == null) { - class319.field2797 = this.canvas.createImage(304, 34); + if (class151.field1359 == null) { + class151.field1359 = this.canvas.createImage(304, 34); } - Graphics var6 = class319.field2797.getGraphics(); + Graphics var6 = class151.field1359.getGraphics(); var6.setColor(var5); var6.drawRect(0, 0, 303, 33); var6.fillRect(2, 2, var1 * 3, 30); var6.setColor(Color.black); var6.drawRect(1, 1, 301, 31); var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); - var6.setFont(class14.fontHelvetica13); + var6.setFont(class28.fontHelvetica13); var6.setColor(Color.white); - var6.drawString(var2, (304 - class14.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(class319.field2797, class340.canvasWidth / 2 - 152, class491.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - class6.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(class151.field1359, Language.canvasWidth / 2 - 152, class47.canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { - int var7 = class340.canvasWidth / 2 - 152; - int var8 = class491.canvasHeight / 2 - 18; + int var7 = Language.canvasWidth / 2 - 152; + int var8 = class47.canvasHeight / 2 - 18; var4.setColor(var5); var4.drawRect(var7, var8, 303, 33); var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); var4.setColor(Color.black); var4.drawRect(var7 + 1, var8 + 1, 301, 31); var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(class14.fontHelvetica13); + var4.setFont(class28.fontHelvetica13); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - class14.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - class6.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -753,21 +786,21 @@ protected final void drawInitial(int var1, String var2, boolean var3) { } - @ObfuscatedName("br") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "403874015" + garbageValue = "180057214" ) - protected final void method161() { - class319.field2797 = null; - class14.fontHelvetica13 = null; - class14.loginScreenFontMetrics = null; + protected final void method170() { + class151.field1359 = null; + class28.fontHelvetica13 = null; + class6.loginScreenFontMetrics = null; } - @ObfuscatedName("bs") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1574795554" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "5" ) @Export("error") protected void error(String var1) { @@ -783,49 +816,49 @@ protected void error(String var1) { } } - @ObfuscatedName("bc") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(B)Ljava/awt/Container;", - garbageValue = "91" + descriptor = "(S)Ljava/awt/Container;", + garbageValue = "15421" ) @Export("container") Container container() { return (Container)(this.frame != null ? this.frame : this); } - @ObfuscatedName("bu") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(I)Lrx;", - garbageValue = "-138440448" + descriptor = "(B)Lrv;", + garbageValue = "95" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); int var2 = Math.max(var1.getWidth(), this.field116); - int var3 = Math.max(var1.getHeight(), this.field115); + int var3 = Math.max(var1.getHeight(), this.field114); if (this.frame != null) { Insets var4 = this.frame.getInsets(); - var2 -= var4.right + var4.left; + var2 -= var4.left + var4.right; var3 -= var4.bottom + var4.top; } return new Bounds(var2, var3); } - @ObfuscatedName("bf") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1209134026" + descriptor = "(B)Z", + garbageValue = "50" ) @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; } - @ObfuscatedName("bl") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "390692392" + descriptor = "(B)V", + garbageValue = "-94" ) @Export("vmethod1485") protected abstract void vmethod1485(); @@ -834,8 +867,8 @@ protected final boolean hasFrame() { @ObfuscatedName("destroy") public final void destroy() { if (this == gameEngine && !isKilled) { - stopTimeMs = GrandExchangeOfferTotalQuantityComparator.method1971(); - Players.method623(5000L); + stopTimeMs = SpotAnimationDefinition.method962(); + class219.method1104(5000L); this.kill(); } } @@ -845,9 +878,9 @@ public final void destroy() { public final synchronized void paint(Graphics var1) { if (this == gameEngine && !isKilled) { this.fullRedraw = true; - if (GrandExchangeOfferTotalQuantityComparator.method1971() - this.field126 > 1000L) { + if (SpotAnimationDefinition.method962() - this.field127 > 1000L) { Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= class340.canvasWidth && var2.height >= class491.canvasHeight) { + if (var2 == null || var2.width >= Language.canvasWidth && var2.height >= class47.canvasHeight) { this.isCanvasInvalid = true; } } @@ -870,11 +903,11 @@ public void run() { if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && IsaacCipher.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && Player.isDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if (AttackOption.isNumber(var4) && class36.method182(var4) < 10) { + if (ClientPacket.isNumber(var4) && Huffman.method1888(var4) < 10) { this.error("wrongjava"); return; } @@ -887,12 +920,12 @@ public void run() { this.setFocusCycleRoot(true); this.addCanvas(); this.setUp(); - class314.clock = WorldMapScaleHandler.method1602(); + ArchiveDiskAction.clock = SoundSystem.method230(); - while (0L == stopTimeMs || GrandExchangeOfferTotalQuantityComparator.method1971() < stopTimeMs) { - class160.gameCyclesToDo = class314.clock.wait(cycleDurationMillis, fiveOrOne); + while (stopTimeMs == 0L || SpotAnimationDefinition.method962() < stopTimeMs) { + gameCyclesToDo = ArchiveDiskAction.clock.wait(cycleDurationMillis, fiveOrOne); - for (int var5 = 0; var5 < class160.gameCyclesToDo; ++var5) { + for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { this.clientTick(); } @@ -900,7 +933,7 @@ public void run() { this.post(this.canvas); } } catch (Exception var6) { - class190.RunException_sendStackTrace((String)null, var6); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var6); this.error("crash"); } @@ -917,7 +950,7 @@ public final void start() { public final void stop() { if (this == gameEngine && !isKilled) { - stopTimeMs = GrandExchangeOfferTotalQuantityComparator.method1971() + 4000L; + stopTimeMs = SpotAnimationDefinition.method962() + 4000L; } } @@ -965,14 +998,53 @@ public final void windowOpened(WindowEvent var1) { @ObfuscatedName("init") public abstract void init(); - @ObfuscatedName("aw") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1887479417" + descriptor = "([BIIIIIIIII[Liw;B)V", + garbageValue = "48" ) - static void method166(int var0) { - if (var0 != Login.loginIndex) { - Login.loginIndex = var0; + static final void method146(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, CollisionMap[] var10) { + int var12; + for (int var11 = 0; var11 < 8; ++var11) { + for (var12 = 0; var12 < 8; ++var12) { + if (var11 + var2 > 0 && var11 + var2 < 103 && var3 + var12 > 0 && var3 + var12 < 103) { + int[] var10000 = var10[var1].flags[var11 + var2]; + var10000[var12 + var3] &= -16777217; + } + } + } + + Buffer var24 = new Buffer(var0); + + for (var12 = 0; var12 < 4; ++var12) { + for (int var13 = 0; var13 < 64; ++var13) { + for (int var14 = 0; var14 < 64; ++var14) { + if (var12 == var4 && var13 >= var5 && var13 < var5 + 8 && var14 >= var6 && var14 < var6 + 8) { + int var15 = var2 + class31.method135(var13 & 7, var14 & 7, var7); + int var18 = var13 & 7; + int var19 = var14 & 7; + int var20 = var7 & 3; + int var17; + if (var20 == 0) { + var17 = var19; + } else if (var20 == 1) { + var17 = 7 - var18; + } else if (var20 == 2) { + var17 = 7 - var19; + } else { + var17 = var18; + } + + int var21 = var17 + var3; + int var22 = (var13 & 7) + var8 + var2; + int var23 = var3 + (var14 & 7) + var9; + class14.loadTerrain(var24, var1, var15, var21, var22, var23, var7); + } else { + class14.loadTerrain(var24, 0, -1, -1, 0, 0, 0); + } + } + } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/GameObject.java b/osrs/src/main/java/GameObject.java index 0906f1ef4..99bf44ee1 100644 --- a/osrs/src/main/java/GameObject.java +++ b/osrs/src/main/java/GameObject.java @@ -3,51 +3,53 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("le") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("ac") + @ObfuscatedName("aj") + static String[] field2480; + @ObfuscatedName("at") @Export("plane") int plane; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("z") int z; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("centerX") int centerX; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("centerY") int centerY; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkt;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("orientation") int orientation; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("startX") int startX; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("endX") int endX; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("startY") int startY; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("endY") int endY; - @ObfuscatedName("ag") - int field2319; - @ObfuscatedName("aa") + @ObfuscatedName("ap") + int field2486; + @ObfuscatedName("av") @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("tag") public long tag; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("flags") int flags; @@ -55,22 +57,4 @@ public final class GameObject { this.tag = 0L; this.flags = 0; } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SB)V", - garbageValue = "84" - ) - public static void method1426(String[] var0, short[] var1) { - VarpDefinition.sortItemsByName(var0, var1, 0, var0.length - 1); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2128713491" - ) - public static int method1427(int var0) { - return class479.field3939[var0 & 16383]; - } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeEvent.java b/osrs/src/main/java/GrandExchangeEvent.java index 2d5d6c37a..93f0b9dba 100644 --- a/osrs/src/main/java/GrandExchangeEvent.java +++ b/osrs/src/main/java/GrandExchangeEvent.java @@ -3,32 +3,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("od") +@ObfuscatedName("og") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("qt") - static int field3617; - @ObfuscatedName("ac") + @ObfuscatedName("jz") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("at") @Export("world") public final int world; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("age") public final long age; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Log;" + descriptor = "Low;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("offerName") String offerName; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lul;BI)V" + descriptor = "(Luj;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -38,8 +39,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method1990(2); - this.grandExchangeOffer.method1991(var2); + this.grandExchangeOffer.method1978(2); + this.grandExchangeOffer.method1979(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -47,20 +48,20 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "-12823" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1118320286" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "407762879" + garbageValue = "-2144907217" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { diff --git a/osrs/src/main/java/GrandExchangeEvents.java b/osrs/src/main/java/GrandExchangeEvents.java index 99ba83dd9..2e3d05d56 100644 --- a/osrs/src/main/java/GrandExchangeEvents.java +++ b/osrs/src/main/java/GrandExchangeEvents.java @@ -8,22 +8,27 @@ import java.util.Comparator; import java.util.List; -@ObfuscatedName("ox") +@ObfuscatedName("ov") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("ac") + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lup;" + ) + static IndexedSprite field3611; + @ObfuscatedName("at") @Export("events") public final List events; @@ -36,7 +41,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - descriptor = "(Lul;Z)V", + descriptor = "(Luj;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -58,10 +63,10 @@ public GrandExchangeEvents(Buffer var1, boolean var2) { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;ZB)V", - garbageValue = "0" + garbageValue = "1" ) @Export("sort") public void sort(Comparator var1, boolean var2) { diff --git a/osrs/src/main/java/GrandExchangeOffer.java b/osrs/src/main/java/GrandExchangeOffer.java index f5081d929..6b1fefa83 100644 --- a/osrs/src/main/java/GrandExchangeOffer.java +++ b/osrs/src/main/java/GrandExchangeOffer.java @@ -3,25 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("og") +@ObfuscatedName("ow") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("state") byte state; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("id") public int id; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("unitPrice") public int unitPrice; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("currentPrice") public int currentPrice; @@ -29,7 +29,7 @@ public GrandExchangeOffer() { } @ObfuscatedSignature( - descriptor = "(Lul;Z)V", + descriptor = "(Luj;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -41,42 +41,42 @@ public GrandExchangeOffer(Buffer var1, boolean var2) { this.currentPrice = var1.readInt(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1707206023" + garbageValue = "-1302720391" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "-1911768409" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1662902257" + garbageValue = "-2128384441" ) - void method1990(int var1) { + void method1978(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1720563334" + garbageValue = "830444255" ) - void method1991(int var1) { + void method1979(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); diff --git a/osrs/src/main/java/GrandExchangeOfferAgeComparator.java b/osrs/src/main/java/GrandExchangeOfferAgeComparator.java index 87bab934e..a1bc762a7 100644 --- a/osrs/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferAgeComparator.java @@ -5,17 +5,17 @@ import java.util.Comparator; -@ObfuscatedName("oy") +@ObfuscatedName("oa") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lod;Lod;I)I", - garbageValue = "-684725239" + descriptor = "(Log;Log;S)I", + garbageValue = "5269" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); + return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); } @Export("compare") @@ -32,16 +32,25 @@ public boolean equals(Object var1) { @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIIZII)J", - garbageValue = "-2118619289" + descriptor = "(II)I", + garbageValue = "-2066613698" ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; - if (var3) { - var5 |= 65536L; - } + public static int method1969(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 7 & 127L); + return var1; + } - return var5; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1600616066" + ) + public static int method1970(int var0) { + if (var0 > 0) { + return 1; + } else { + return var0 < 0 ? -1 : 0; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferNameComparator.java b/osrs/src/main/java/GrandExchangeOfferNameComparator.java index 98ad8b4d9..1c4c766e4 100644 --- a/osrs/src/main/java/GrandExchangeOfferNameComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferNameComparator.java @@ -3,25 +3,15 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; import java.util.Comparator; -import java.util.Iterator; -@ObfuscatedName("oz") +@ObfuscatedName("oo") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("aq") - static String field3614; - @ObfuscatedName("oi") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lnm;" - ) - static Widget field3615; - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lod;Lod;B)I", - garbageValue = "59" + descriptor = "(Log;Log;I)I", + garbageValue = "1361054844" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -39,397 +29,4 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Ljava/util/ArrayList;ZI)V", - garbageValue = "-1254192693" - ) - static void method1979(ArrayList var0, boolean var1) { - if (!var1) { - class319.field2789.clear(); - } - - Iterator var2 = var0.iterator(); - - while (var2.hasNext()) { - MusicSong var3 = (MusicSong)var2.next(); - if (var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { - if (!var1) { - class319.field2789.add(var3); - } - - class319.field2791.add(var3); - } - } - - } - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-33084570" - ) - static int method1980(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = class87.Client_plane; - int var9 = (TextureProvider.localPlayer.x >> 7) + class20.baseX; - int var5 = (TextureProvider.localPlayer.y >> 7) + class19.baseY; - class153.getWorldMap().method2432(var3, var9, var5, true); - return 1; - } else { - WorldMapArea var11; - if (var0 == 6601) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - String var16 = ""; - var11 = class153.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); - } - - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == 6602) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class153.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == 6603) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == 6604) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class153.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == 6605) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var15; - if (var0 == 6606) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class153.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); - return 1; - } else if (var0 == 6607) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class153.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); - return 1; - } else if (var0 == 6608) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class153.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == 6609) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class153.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == 6610) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var13; - if (var0 == 6611) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = class153.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); - } - - return 1; - } else if (var0 == 6612) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = class153.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == 6613) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = class153.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == 6614) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = class153.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var15 = class153.getWorldMap().getDisplayCoord(); - if (var15 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.x; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.y; - } - - return 1; - } else if (var0 == 6616) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == 6617) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = class153.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var14 = var13.position(var15.plane, var15.x, var15.y); - if (var14 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[0]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[1]; - } - - return 1; - } - } else { - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = class153.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var7 = var13.coord(var15.x, var15.y); - if (var7 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } - } else { - Coord var12; - if (var0 == 6619) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - UrlRequest.method665(var3, var12, false); - return 1; - } else if (var0 == 6620) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - UrlRequest.method665(var3, var12, true); - return 1; - } else if (var0 == 6621) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - var11 = class153.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; - return 1; - } - } else if (var0 == 6622) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = class153.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getId(); - } - - return 1; - } else if (var0 == 6624) { - class153.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - class153.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - class153.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - class153.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var10; - if (var0 == 6628) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class153.getWorldMap().setPerpetualFlash(var10); - return 1; - } else if (var0 == 6629) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class153.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == 6630) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class153.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == 6631) { - class153.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == 6632) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class153.getWorldMap().setElementsDisabled(var10); - return 1; - } else { - boolean var4; - if (var0 == 6633) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - class153.getWorldMap().disableElement(var3, var4); - return 1; - } else if (var0 == 6634) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - class153.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } else if (var0 == 6635) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == 6636) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6637) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class153.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - var7 = class153.getWorldMap().method2476(var3, var12); - if (var7 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var8; - if (var0 == 6639) { - var8 = class153.getWorldMap().iconStart(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else if (var0 == 6640) { - var8 = class153.getWorldMap().iconNext(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var6; - if (var0 == 6693) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class148.WorldMapElement_get(var3); - if (var6.name == null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var6.name; - } - - return 1; - } else if (var0 == 6694) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class148.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.textSize; - return 1; - } else if (var0 == 6695) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class148.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.category; - } - - return 1; - } else if (var0 == 6696) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class148.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.sprite1; - } - - return 1; - } else if (var0 == 6697) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class230.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class230.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == 6699) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class230.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } - } - } - } - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java index cd79cbc24..e865bfec7 100644 --- a/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -5,27 +5,28 @@ import java.util.Comparator; -@ObfuscatedName("cm") +@ObfuscatedName("cn") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("fv") + @ObfuscatedName("fp") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Loh;" ) - static Archive field361; - @ObfuscatedName("va") + @Export("archive8") + static Archive archive8; + @ObfuscatedName("gc") static int field360; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lod;Lod;S)I", - garbageValue = "255" + descriptor = "(Log;Log;I)I", + garbageValue = "-1440367085" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -57,84 +58,4 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-2097816691" - ) - public static int method348(int var0) { - return SecureRandomFuture.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); - } - - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "29" - ) - static Object method349(int var0) { - return ItemContainer.method460((class517)SequenceDefinition.findEnumerated(class517.method2528(), var0)); - } - - @ObfuscatedName("kb") - @ObfuscatedSignature( - descriptor = "(Ldw;I)V", - garbageValue = "-1344994052" - ) - static final void method350(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = class10.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { - var1 = class10.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = class10.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = class10.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var1 != 0L) { - int var6 = class10.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = SecureRandomFuture.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field953 = var4; - var0.field947 = var5; - } - - @ObfuscatedName("ni") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-17" - ) - static final void method351() { - PacketBufferNode var0 = ClanChannelMember.getPacketBufferNode(ClientPacket.CLOSE_MODAL, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var0); - Interpreter.field702 = true; - - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { - if (var1.type == 0 || var1.type == 3) { - ArchiveDisk.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { - ClanChannelMember.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - Interpreter.field702 = false; - } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index cceadc868..93221506d 100644 --- a/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -3,20 +3,22 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.lang.management.GarbageCollectorMXBean; import java.util.Comparator; -@ObfuscatedName("oc") +@ObfuscatedName("oq") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("bl") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "Lpf;" + ) + @Export("fontBold12") + static Font fontBold12; - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lod;Lod;I)I", - garbageValue = "1700442227" + descriptor = "(Log;Log;I)I", + garbageValue = "-2047796467" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -35,228 +37,42 @@ public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-784623811" - ) - public static final synchronized long method1971() { - long var0 = System.currentTimeMillis(); - if (var0 < class135.field1287) { - class315.field2773 += class135.field1287 - var0; - } - - class135.field1287 = var0; - return var0 + class315.field2773; - } - - @ObfuscatedName("al") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lve;" + descriptor = "(Lnn;B)I", + garbageValue = "0" ) - public static RunException method1973(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.field4315 = var2.field4315 + ' ' + var1; + static int method1965(Widget var0) { + if (var0.type != 11) { + Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize - 1] = ""; + return 1; } else { - var2 = new RunException(var0, var1); + String var1 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var0.method1863(var1); + return 1; } - - return var2; } - @ObfuscatedName("ak") + @ObfuscatedName("lm") @ObfuscatedSignature( - descriptor = "(Luy;B)V", - garbageValue = "-47" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIIZS)V", + garbageValue = "14887" ) - static final void method1975(PacketBuffer var0) { - int var1 = 0; - var0.importIndex(); - - byte[] var10000; - int var2; - int var3; - int var4; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.activityFlags[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.activityFlags; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class108.method619(var0); - var10000 = Players.activityFlags; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - WorldMapSectionType.readPlayerUpdate(var0, var3); - } - } + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { + if (!Client.isMenuOpen) { + if (Client.menuOptionsCount < 500) { + Client.menuActions[Client.menuOptionsCount] = var0; + Client.menuTargets[Client.menuOptionsCount] = var1; + Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuIdentifiers[Client.menuOptionsCount] = var3; + Client.menuArguments1[Client.menuOptionsCount] = var4; + Client.menuArguments2[Client.menuOptionsCount] = var5; + Client.menuItemIds[Client.menuOptionsCount] = var6; + Client.menuShiftClick[Client.menuOptionsCount] = var7; + ++Client.menuOptionsCount; } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.activityFlags[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.activityFlags; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class108.method619(var0); - var10000 = Players.activityFlags; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - WorldMapSectionType.readPlayerUpdate(var0, var3); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.activityFlags[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.activityFlags; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class108.method619(var0); - var10000 = Players.activityFlags; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (class304.updateExternalPlayer(var0, var3)) { - var10000 = Players.activityFlags; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.activityFlags[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.activityFlags; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class108.method619(var0); - var10000 = Players.activityFlags; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (class304.updateExternalPlayer(var0, var3)) { - var10000 = Players.activityFlags; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } - } - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - for (var2 = 1; var2 < 2048; ++var2) { - var10000 = Players.activityFlags; - var10000[var2] = (byte)(var10000[var2] >> 1); - Player var5 = Client.players[var2]; - if (var5 != null) { - Players.Players_indices[++Players.Players_count - 1] = var2; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; - } - } - - } - } - } - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-29" - ) - static final boolean method1974() { - return ViewportMouse.ViewportMouse_isInViewport; - } - - @ObfuscatedName("lh") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1235379718" - ) - static void method1976(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, class166.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != TextureProvider.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByteAdd(0); - var8.packetBuffer.writeShortAddLE(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortAddLE(var3[var6]); - var8.packetBuffer.writeByteNeg(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByteNeg(0); - var8.packetBuffer.writeShortLE(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - var8.packetBuffer.writeShort(var3[var6]); - Client.packetWriter.addNode(var8); - } - - var4 = true; - break; - } - } - - if (!var4) { - class411.addGameMessage(4, "", "Unable to find " + var1); } - } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 0cdc15c90..b99fb6f80 100644 --- a/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -5,13 +5,13 @@ import java.util.Comparator; -@ObfuscatedName("oj") +@ObfuscatedName("ob") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lod;Lod;I)I", - garbageValue = "-1207503699" + descriptor = "(Log;Log;I)I", + garbageValue = "714689738" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -30,24 +30,138 @@ public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("ao") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "73" + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1588481788" ) - static final int method1992(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + ArchiveLoader.addChatMessage(var0, var1, var2, (String)null); } - @ObfuscatedName("ah") + @ObfuscatedName("jd") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-21" + descriptor = "(ZLuo;ZI)V", + garbageValue = "151188621" ) - static void method1994(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1, boolean var2) { + Client.isInInstance = var0; + int var3; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { + int var4; + if (var2) { + var1.readShortLE(); + var4 = var1.readUnsignedShort(); + var3 = var1.readUnsignedShort(); + var5 = var1.readUnsignedShort(); + } else { + var4 = var1.readUnsignedShort(); + var3 = var1.readUnsignedIntIME(); + var5 = var1.readUnsignedShort(); + } + + Varcs.xteaKeys = new int[var5][4]; + + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + Varcs.xteaKeys[var6][var7] = var1.readInt(); + } + } + + KitDefinition.regions = new int[var5]; + UserComparator7.regionMapArchiveIds = new int[var5]; + UserComparator3.regionLandArchiveIds = new int[var5]; + WorldMapData_1.regionLandArchives = new byte[var5][]; + GrandExchangeEvent.regionMapArchives = new byte[var5][]; + var5 = 0; + + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { + for (var7 = (var4 - 6) / 8; var7 <= (var4 + 6) / 8; ++var7) { + var8 = var7 + (var6 << 8); + KitDefinition.regions[var5] = var8; + UserComparator7.regionMapArchiveIds[var5] = WorldMapSection0.archive9.getGroupId("m" + var6 + "_" + var7); + UserComparator3.regionLandArchiveIds[var5] = WorldMapSection0.archive9.getGroupId("l" + var6 + "_" + var7); + ++var5; + } + } + + class292.method1606(var3, var4, true); + } else { + var3 = var1.readUnsignedIntIME(); + boolean var16 = var1.readUnsignedByte() == 1; + var5 = var1.readUnsignedShort(); + var6 = var1.readUnsignedShort(); + var1.importIndex(); + + int var9; + int var10; + for (var7 = 0; var7 < 4; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + for (var9 = 0; var9 < 13; ++var9) { + var10 = var1.readBits(1); + if (var10 == 1) { + Client.instanceChunkTemplates[var7][var8][var9] = var1.readBits(26); + } else { + Client.instanceChunkTemplates[var7][var8][var9] = -1; + } + } + } + } + + var1.exportIndex(); + Varcs.xteaKeys = new int[var6][4]; + + for (var7 = 0; var7 < var6; ++var7) { + for (var8 = 0; var8 < 4; ++var8) { + Varcs.xteaKeys[var7][var8] = var1.readInt(); + } + } + + KitDefinition.regions = new int[var6]; + UserComparator7.regionMapArchiveIds = new int[var6]; + UserComparator3.regionLandArchiveIds = new int[var6]; + WorldMapData_1.regionLandArchives = new byte[var6][]; + GrandExchangeEvent.regionMapArchives = new byte[var6][]; + var6 = 0; + + for (var7 = 0; var7 < 4; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + for (var9 = 0; var9 < 13; ++var9) { + var10 = Client.instanceChunkTemplates[var7][var8][var9]; + if (var10 != -1) { + int var11 = var10 >> 14 & 1023; + int var12 = var10 >> 3 & 2047; + int var13 = (var11 / 8 << 8) + var12 / 8; + + int var14; + for (var14 = 0; var14 < var6; ++var14) { + if (KitDefinition.regions[var14] == var13) { + var13 = -1; + break; + } + } + + if (var13 != -1) { + KitDefinition.regions[var6] = var13; + var14 = var13 >> 8 & 255; + int var15 = var13 & 255; + UserComparator7.regionMapArchiveIds[var6] = WorldMapSection0.archive9.getGroupId("m" + var14 + "_" + var15); + UserComparator3.regionLandArchiveIds[var6] = WorldMapSection0.archive9.getGroupId("l" + var14 + "_" + var15); + ++var6; + } + } + } + } + } + + class292.method1606(var5, var3, !var16); } + } } \ No newline at end of file diff --git a/osrs/src/main/java/GrandExchangeOfferWorldComparator.java b/osrs/src/main/java/GrandExchangeOfferWorldComparator.java index f921c937a..f6a8c6860 100644 --- a/osrs/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferWorldComparator.java @@ -3,15 +3,21 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.io.DataInputStream; +import java.net.URL; import java.util.Comparator; -@ObfuscatedName("ov") +@ObfuscatedName("om") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("ac") + @ObfuscatedName("ar") + @Export("SpriteBuffer_spriteHeight") + public static int SpriteBuffer_spriteHeight; + + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lod;Lod;I)I", - garbageValue = "-600778902" + descriptor = "(Log;Log;I)I", + garbageValue = "1620655261" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -29,4 +35,47 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "939664876" + ) + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; + if (var1 != null) { + var2 = class520.method2525(var1); + } + + if (var0 != null) { + if (var1 != null) { + var2 = var2 + " | "; + } + + var2 = var2 + var0; + } + + System.out.println("Error: " + var2); + var2 = var2.replace(':', '.'); + var2 = var2.replace('@', '_'); + var2 = var2.replace('&', '_'); + var2 = var2.replace('#', '_'); + if (RunException.RunException_applet == null) { + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?cv=" + class145.RunException_revision + "&cs=" + RunException.field4318 + "&u=" + class17.field53 + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.field4317 + "&e=" + var2); + DataInputStream var4 = new DataInputStream(var3.openStream()); + var4.read(); + var4.close(); + } catch (Exception var5) { + } + + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/GraphicsDefaults.java b/osrs/src/main/java/GraphicsDefaults.java index 37f2f816d..a3168ccfb 100644 --- a/osrs/src/main/java/GraphicsDefaults.java +++ b/osrs/src/main/java/GraphicsDefaults.java @@ -3,57 +3,57 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ru") +@ObfuscatedName("rl") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("compass") public int compass; - @ObfuscatedName("al") - public int field3881; - @ObfuscatedName("ak") + @ObfuscatedName("ah") + public int field3884; + @ObfuscatedName("ar") @Export("mapScenes") public int mapScenes; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("ao") - public int field3883; - @ObfuscatedName("ah") - public int field3879; - @ObfuscatedName("ar") - public int field3884; @ObfuscatedName("ab") - public int field3876; - @ObfuscatedName("am") public int field3882; - @ObfuscatedName("av") + @ObfuscatedName("au") + public int field3890; + @ObfuscatedName("aa") + public int field3881; + @ObfuscatedName("ac") + public int field3883; + @ObfuscatedName("al") public int field3885; - @ObfuscatedName("ag") - public int field3878; + @ObfuscatedName("az") + public int field3891; + @ObfuscatedName("ap") + public int field3887; public GraphicsDefaults() { this.compass = -1; - this.field3881 = -1; + this.field3884 = -1; this.mapScenes = -1; this.headIconsPk = -1; - this.field3883 = -1; - this.field3879 = -1; - this.field3884 = -1; - this.field3876 = -1; this.field3882 = -1; + this.field3890 = -1; + this.field3881 = -1; + this.field3883 = -1; this.field3885 = -1; - this.field3878 = -1; + this.field3891 = -1; + this.field3887 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lom;B)V", - garbageValue = "5" + descriptor = "(Lol;B)V", + garbageValue = "78" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3874.group); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3878.group); Buffer var3 = new Buffer(var2); while (true) { @@ -68,35 +68,17 @@ public void decode(AbstractArchive var1) { break; case 2: this.compass = var3.readNullableLargeSmart(); - this.field3881 = var3.readNullableLargeSmart(); + this.field3884 = var3.readNullableLargeSmart(); this.mapScenes = var3.readNullableLargeSmart(); this.headIconsPk = var3.readNullableLargeSmart(); - this.field3883 = var3.readNullableLargeSmart(); - this.field3879 = var3.readNullableLargeSmart(); - this.field3884 = var3.readNullableLargeSmart(); - this.field3876 = var3.readNullableLargeSmart(); this.field3882 = var3.readNullableLargeSmart(); + this.field3890 = var3.readNullableLargeSmart(); + this.field3881 = var3.readNullableLargeSmart(); + this.field3883 = var3.readNullableLargeSmart(); this.field3885 = var3.readNullableLargeSmart(); - this.field3878 = var3.readNullableLargeSmart(); + this.field3891 = var3.readNullableLargeSmart(); + this.field3887 = var3.readNullableLargeSmart(); } } } - - @ObfuscatedName("ie") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1779911274" - ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (class91.clientPreferences.getCurrentSoundEffectsVolume() != 0 && var1 != 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var0; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = 0; - ++Client.soundEffectCount; - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/GraphicsObject.java b/osrs/src/main/java/GraphicsObject.java index a4b2aae6f..12bc8df7b 100644 --- a/osrs/src/main/java/GraphicsObject.java +++ b/osrs/src/main/java/GraphicsObject.java @@ -3,44 +3,40 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("cu") @Implements("GraphicsObject") public class GraphicsObject extends Renderable { - @ObfuscatedName("aa") - static int field718; - @ObfuscatedName("bt") - protected static String field717; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("id") int id; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("cycleStart") int cycleStart; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("plane") int plane; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("x") int x; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("y") int y; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("z") int z; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lif;" + descriptor = "Lhx;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("frame") int frame; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("frameCycle") int frameCycle; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("isFinished") boolean isFinished; @@ -54,20 +50,20 @@ public class GraphicsObject extends Renderable { this.y = var4; this.z = var5; this.cycleStart = var7 + var6; - int var8 = class406.SpotAnimationDefinition_get(this.id).sequence; + int var8 = Canvas.SpotAnimationDefinition_get(this.id).sequence; if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = class36.SequenceDefinition_get(var8); + this.sequenceDefinition = DynamicObject.SequenceDefinition_get(var8); } else { this.isFinished = true; } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "108" + garbageValue = "-19" ) @Export("advance") final void advance(int var1) { @@ -84,7 +80,7 @@ final void advance(int var1) { } } else { this.frame += var1; - if (this.frame >= this.sequenceDefinition.method1127()) { + if (this.frame >= this.sequenceDefinition.method1052()) { this.isFinished = true; } } @@ -92,14 +88,14 @@ final void advance(int var1) { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Ljn;", - garbageValue = "0" + descriptor = "(B)Lka;", + garbageValue = "1" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = class406.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = Canvas.SpotAnimationDefinition_get(this.id); Model var2; if (!this.isFinished) { var2 = var1.getModel(this.frame); @@ -110,6 +106,15 @@ protected final Model getModel() { return var2 == null ? null : var2; } + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "-89" + ) + public static boolean method428(int var0, int var1) { + return (var0 >> var1 + 1 & 1) != 0; + } + public GraphicsObject() { } } \ No newline at end of file diff --git a/osrs/src/main/java/HealthBar.java b/osrs/src/main/java/HealthBar.java index 213592ebb..8a70de7bc 100644 --- a/osrs/src/main/java/HealthBar.java +++ b/osrs/src/main/java/HealthBar.java @@ -3,36 +3,44 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("db") +import java.awt.*; +import java.awt.Desktop.Action; +import java.net.URI; + +@ObfuscatedName("de") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("ap") - static int field1073; - @ObfuscatedName("ak") + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lnn;" + ) + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lhj;" + descriptor = "Lgh;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lpm;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lhj;)V" + descriptor = "(Lgh;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); this.definition = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-495031119" + descriptor = "(IIIIB)V", + garbageValue = "1" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -65,10 +73,10 @@ void put(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)Ldt;", - garbageValue = "-24" + descriptor = "(II)Ldv;", + garbageValue = "478923199" ) @Export("get") HealthBarUpdate get(int var1) { @@ -90,77 +98,65 @@ HealthBarUpdate get(int var1) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1212431293" + garbageValue = "1159323457" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method2039(); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "-21237" - ) - public static int method572(int var0, int var1) { - return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; + return this.updates.method2027(); } - @ObfuscatedName("ak") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1762849549" + garbageValue = "2038355157" ) - public static int method575(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 0 & 127L); - return var1; + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var1 = ClientPreferences.getWidget(var0); + int var2 = var1.baseVar; + int var3 = var1.startBit; + int var4 = var1.endBit; + int var5 = Varps.Varps_masks[var4 - var3]; + return Varps.Varps_main[var2] >> var3 & var5; } - @ObfuscatedName("ak") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "28917" + descriptor = "(I)[Ldm;", + garbageValue = "-789514227" ) - public static int method571(int var0) { - return (var0 & class523.field4148) - 1; + static class89[] method569() { + return new class89[]{class89.field885, class89.field887, class89.field886, class89.field888, class89.field889}; } @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "1" + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "2050033545" ) - public static void method576(Buffer var0, int var1) { - if (JagexCache.JagexCache_randomDat != null) { - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); - } catch (Exception var3) { + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + if (var1) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + try { + Desktop.getDesktop().browse(new URI(var0)); + return; + } catch (Exception var4) { + } } - } - - } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "516067263" - ) - public static void method577() { - try { - JagexCache.JagexCache_dat2File.close(); - - for (int var0 = 0; var0 < UrlRequester.field1162; ++var0) { - UserComparator8.JagexCache_idxFiles[var0].close(); + if (class31.field86.startsWith("win")) { + Canvas.method88(var0, 0, "openjs"); + } else if (class31.field86.startsWith("mac")) { + Canvas.method88(var0, 1, "openjs"); + } else { + Canvas.method88(var0, 2, "openjs"); } - - JagexCache.JagexCache_idx255File.close(); - JagexCache.JagexCache_randomDat.close(); - } catch (Exception var2) { + } else { + Canvas.method88(var0, 3, "openjs"); } } diff --git a/osrs/src/main/java/HealthBarDefinition.java b/osrs/src/main/java/HealthBarDefinition.java index 2f20299a4..c37c34028 100644 --- a/osrs/src/main/java/HealthBarDefinition.java +++ b/osrs/src/main/java/HealthBarDefinition.java @@ -3,67 +3,61 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +import java.security.SecureRandom; + +@ObfuscatedName("gh") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("al") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lom;" - ) - public static AbstractArchive field1549; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("HealthBarDefinition_cached") - public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("ax") + static EvictingDualNodeHashTable HealthBarDefinition_cached; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("ItemDefinition_cachedModels") - public static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("cp") - @Export("param9") - static String param9; - @ObfuscatedName("rn") + static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("eb") @ObfuscatedSignature( - descriptor = "Ltx;" + descriptor = "Lmr;" ) - @Export("Widget_cachedModels") - static class512 Widget_cachedModels; - @ObfuscatedName("ao") - public int field1559; + @Export("widgetDefinition") + static WidgetDefinition widgetDefinition; @ObfuscatedName("ab") + public int field1494; + @ObfuscatedName("ac") @Export("int1") public int int1; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("int2") public int int2; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("int3") public int int3; - @ObfuscatedName("ag") - public int field1556; - @ObfuscatedName("aa") + @ObfuscatedName("ap") + public int field1498; + @ObfuscatedName("av") @Export("int5") public int int5; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("width") public int width; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("widthPadding") public int widthPadding; @@ -76,7 +70,7 @@ public class HealthBarDefinition extends DualNode { this.int1 = 255; this.int2 = 255; this.int3 = -1; - this.field1556 = 1; + this.field1498 = 1; this.int5 = 70; this.frontSpriteID = -1; this.backSpriteID = -1; @@ -84,10 +78,10 @@ public class HealthBarDefinition extends DualNode { this.widthPadding = 0; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "-15" + descriptor = "(Luj;I)V", + garbageValue = "-1942652761" ) @Export("decode") void decode(Buffer var1) { @@ -101,10 +95,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "1665332626" + descriptor = "(Luj;II)V", + garbageValue = "88568767" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -134,10 +128,10 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Lud;", - garbageValue = "-1762701574" + descriptor = "(I)Luz;", + garbageValue = "-309117701" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { @@ -148,7 +142,7 @@ public SpritePixels getFrontSprite() { if (var1 != null) { return var1; } else { - var1 = class47.SpriteBuffer_getSprite(field1549, this.frontSpriteID, 0); + var1 = IgnoreList.SpriteBuffer_getSprite(SecureRandomCallable.field851, this.frontSpriteID, 0); if (var1 != null) { ItemDefinition_cachedModels.put(var1, (long)this.frontSpriteID); } @@ -158,10 +152,10 @@ public SpritePixels getFrontSprite() { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)Lud;", - garbageValue = "665921612" + descriptor = "(B)Luz;", + garbageValue = "54" ) @Export("getBackSprite") public SpritePixels getBackSprite() { @@ -172,7 +166,7 @@ public SpritePixels getBackSprite() { if (var1 != null) { return var1; } else { - var1 = class47.SpriteBuffer_getSprite(field1549, this.backSpriteID, 0); + var1 = IgnoreList.SpriteBuffer_getSprite(SecureRandomCallable.field851, this.backSpriteID, 0); if (var1 != null) { ItemDefinition_cachedModels.put(var1, (long)this.backSpriteID); } @@ -182,18 +176,34 @@ public SpritePixels getBackSprite() { } } - @ObfuscatedName("ju") + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)Ljava/security/SecureRandom;", + garbageValue = "1872253772" + ) + static SecureRandom method911() { + SecureRandom var0 = new SecureRandom(); + var0.nextInt(); + return var0; + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-17" + descriptor = "(I)V", + garbageValue = "-876386223" ) - static final void method991(int var0, int var1) { - if (Client.hintArrowType == 2) { - class150.worldToScreen((Client.hintArrowX - class20.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class19.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - UserComparator8.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + public static void method916() { + try { + JagexCache.JagexCache_dat2File.close(); + + for (int var0 = 0; var0 < UserComparator6.field1202; ++var0) { + KeyHandler.JagexCache_idxFiles[var0].close(); } + JagexCache.JagexCache_idx255File.close(); + JagexCache.JagexCache_randomDat.close(); + } catch (Exception var2) { } + } } \ No newline at end of file diff --git a/osrs/src/main/java/HealthBarUpdate.java b/osrs/src/main/java/HealthBarUpdate.java index 848ea34e4..bc852c11f 100644 --- a/osrs/src/main/java/HealthBarUpdate.java +++ b/osrs/src/main/java/HealthBarUpdate.java @@ -3,22 +3,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("dv") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("ab") - @Export("ItemDefinition_inMembersWorld") - static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("cycle") int cycle; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("health") int health; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("health2") int health2; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("cycleOffset") int cycleOffset; @@ -29,10 +26,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-104835898" + garbageValue = "857709911" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -42,74 +39,24 @@ void set(int var1, int var2, int var3, int var4) { this.cycleOffset = var4; } - @ObfuscatedName("ap") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-53586823" + descriptor = "(II)Ldt;", + garbageValue = "-1907419429" ) - public static String method523(String var0) { - int var1 = var0.length(); - char[] var2 = new char[var1]; - byte var3 = 2; - - for (int var4 = 0; var4 < var1; ++var4) { - char var5 = var0.charAt(var4); - if (var3 == 0) { - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { - var5 = StudioGame.method1905(var5); - } - - if (Character.isLetter(var5)) { - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { - if (Character.isSpaceChar(var5)) { - if (var3 != 2) { - var3 = 1; - } - } else { - var3 = 1; - } - } else { - var3 = 2; - } - - var2[var4] = var5; - } - - return new String(var2); - } - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-2085144575" - ) - static int method524(int var0, Script var1, boolean var2) { - if (var0 == 5630) { - Client.logoutTimer = 250; - return 1; + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - return 2; - } - } - - @ObfuscatedName("nq") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "2104594196" - ) - static final void method525(int var0, int var1, boolean var2) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method868()) { - ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - PacketBufferNode var4 = ClanChannelMember.getPacketBufferNode(ClientPacket.f10, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(4 + class478.stringCp1252NullTerminatedByteSize(var3.username.getName())); - var4.packetBuffer.writeByte(var0); - var4.packetBuffer.writeShort(var1); - var4.packetBuffer.writeBoolean(var2); - var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); - Client.packetWriter.addNode(var4); + byte[] var2 = class47.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; + } else { + var1 = NewShit.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; } } } diff --git a/osrs/src/main/java/HitSplatDefinition.java b/osrs/src/main/java/HitSplatDefinition.java index fa02bf513..6b99619f9 100644 --- a/osrs/src/main/java/HitSplatDefinition.java +++ b/osrs/src/main/java/HitSplatDefinition.java @@ -3,73 +3,79 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") +@ObfuscatedName("hz") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("HitSplatDefinition_archive") - static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("al") + public static AbstractArchive HitSplatDefinition_archive; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) - static AbstractArchive field1701; - @ObfuscatedName("ax") + public static AbstractArchive field1640; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Lol;" ) - @Export("HitSplatDefinition_cached") - public static EvictingDualNodeHashTable HitSplatDefinition_cached; + @Export("HitSplatDefinition_fontsArchive") + public static AbstractArchive HitSplatDefinition_fontsArchive; @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" + ) + @Export("HitSplatDefinition_cached") + static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Llk;" ) @Export("HitSplatDefinition_cachedSprites") - public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("ah") + static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("HitSplatDefinition_cachedFonts") - public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("aa") + static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; + @ObfuscatedName("av") @Export("fontId") int fontId; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("textColor") public int textColor; - @ObfuscatedName("ay") - public int field1715; @ObfuscatedName("as") - int field1706; + public int field1658; + @ObfuscatedName("ay") + int field1651; + @ObfuscatedName("ak") + int field1648; @ObfuscatedName("aj") - int field1704; - @ObfuscatedName("an") - int field1705; - @ObfuscatedName("au") - int field1707; + int field1647; + @ObfuscatedName("am") + int field1649; + @ObfuscatedName("aq") + public int field1657; @ObfuscatedName("ai") - public int field1711; - @ObfuscatedName("ae") - public int field1710; + public int field1655; @ObfuscatedName("aw") - public int field1714; - @ObfuscatedName("aq") - String field1709; - @ObfuscatedName("az") - public int field1716; - @ObfuscatedName("at") - public int field1713; - @ObfuscatedName("af") + public int field1659; + @ObfuscatedName("ae") + String field1653; + @ObfuscatedName("an") + public int field1656; + @ObfuscatedName("ag") + public int field1654; + @ObfuscatedName("ad") @Export("transforms") public int[] transforms; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("bn") + @ObfuscatedName("be") @Export("transformVarp") int transformVarp; @@ -82,25 +88,25 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition() { this.fontId = -1; this.textColor = 16777215; - this.field1715 = 70; - this.field1706 = -1; - this.field1704 = -1; - this.field1705 = -1; - this.field1707 = -1; - this.field1711 = 0; - this.field1710 = 0; - this.field1714 = -1; - this.field1709 = ""; - this.field1716 = -1; - this.field1713 = 0; + this.field1658 = 70; + this.field1651 = -1; + this.field1648 = -1; + this.field1647 = -1; + this.field1649 = -1; + this.field1657 = 0; + this.field1655 = 0; + this.field1659 = -1; + this.field1653 = ""; + this.field1656 = -1; + this.field1654 = 0; this.transformVarbit = -1; this.transformVarp = -1; } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;S)V", - garbageValue = "7501" + descriptor = "(Luj;B)V", + garbageValue = "76" ) @Export("decode") void decode(Buffer var1) { @@ -114,10 +120,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "1630340273" + descriptor = "(Luj;IB)V", + garbageValue = "-1" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -126,29 +132,29 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 2) { this.textColor = var1.readMedium(); } else if (var2 == 3) { - this.field1706 = var1.readNullableLargeSmart(); + this.field1651 = var1.readNullableLargeSmart(); } else if (var2 == 4) { - this.field1705 = var1.readNullableLargeSmart(); + this.field1647 = var1.readNullableLargeSmart(); } else if (var2 == 5) { - this.field1704 = var1.readNullableLargeSmart(); + this.field1648 = var1.readNullableLargeSmart(); } else if (var2 == 6) { - this.field1707 = var1.readNullableLargeSmart(); + this.field1649 = var1.readNullableLargeSmart(); } else if (var2 == 7) { - this.field1711 = var1.readShort(); + this.field1657 = var1.readShort(); } else if (var2 == 8) { - this.field1709 = var1.readStringCp1252NullCircumfixed(); + this.field1653 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field1715 = var1.readUnsignedShort(); + this.field1658 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field1710 = var1.readShort(); + this.field1655 = var1.readShort(); } else if (var2 == 11) { - this.field1714 = 0; + this.field1659 = 0; } else if (var2 == 12) { - this.field1716 = var1.readUnsignedByte(); + this.field1656 = var1.readUnsignedByte(); } else if (var2 == 13) { - this.field1713 = var1.readShort(); + this.field1654 = var1.readShort(); } else if (var2 == 14) { - this.field1714 = var1.readUnsignedShort(); + this.field1659 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { @@ -185,14 +191,14 @@ void decodeNext(Buffer var1, int var2) { @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Liw;", - garbageValue = "-588472147" + descriptor = "(B)Lhz;", + garbageValue = "14" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = class36.getVarbit(this.transformVarbit); + var1 = HealthBar.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -204,17 +210,17 @@ public final HitSplatDefinition transform() { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class191.method959(var2) : null; + return var2 != -1 ? class149.method776(var2) : null; } - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1312743018" + descriptor = "(IS)Ljava/lang/String;", + garbageValue = "184" ) @Export("getString") public String getString(int var1) { - String var2 = this.field1709; + String var2 = this.field1653; while (true) { int var3 = var2.indexOf("%1"); @@ -222,26 +228,26 @@ public String getString(int var1) { return var2; } - var2 = var2.substring(0, var3) + AbstractWorldMapData.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + SceneTilePaint.intToString(var1, false) + var2.substring(var3 + 2); } } - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lud;", - garbageValue = "-580598117" + descriptor = "(B)Luz;", + garbageValue = "87" ) - public SpritePixels method1070() { - if (this.field1706 < 0) { + public SpritePixels method992() { + if (this.field1651 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1706); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1651); if (var1 != null) { return var1; } else { - var1 = class47.SpriteBuffer_getSprite(field1701, this.field1706, 0); + var1 = IgnoreList.SpriteBuffer_getSprite(field1640, this.field1651, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1706); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1651); } return var1; @@ -249,22 +255,22 @@ public SpritePixels method1070() { } } - @ObfuscatedName("ab") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)Lud;", - garbageValue = "1894874204" + descriptor = "(I)Luz;", + garbageValue = "-1829294182" ) - public SpritePixels method1071() { - if (this.field1704 < 0) { + public SpritePixels method993() { + if (this.field1648 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1704); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1648); if (var1 != null) { return var1; } else { - var1 = class47.SpriteBuffer_getSprite(field1701, this.field1704, 0); + var1 = IgnoreList.SpriteBuffer_getSprite(field1640, this.field1648, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1704); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1648); } return var1; @@ -272,22 +278,22 @@ public SpritePixels method1071() { } } - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)Lud;", - garbageValue = "-3" + descriptor = "(B)Luz;", + garbageValue = "40" ) - public SpritePixels method1072() { - if (this.field1705 < 0) { + public SpritePixels method995() { + if (this.field1647 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1705); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1647); if (var1 != null) { return var1; } else { - var1 = class47.SpriteBuffer_getSprite(field1701, this.field1705, 0); + var1 = IgnoreList.SpriteBuffer_getSprite(field1640, this.field1647, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1705); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1647); } return var1; @@ -295,22 +301,22 @@ public SpritePixels method1072() { } } - @ObfuscatedName("av") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Lud;", - garbageValue = "-1859973859" + descriptor = "(I)Luz;", + garbageValue = "-1809532978" ) - public SpritePixels method1073() { - if (this.field1707 < 0) { + public SpritePixels method996() { + if (this.field1649 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1707); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1649); if (var1 != null) { return var1; } else { - var1 = class47.SpriteBuffer_getSprite(field1701, this.field1707, 0); + var1 = IgnoreList.SpriteBuffer_getSprite(field1640, this.field1649, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1707); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1649); } return var1; @@ -318,38 +324,37 @@ public SpritePixels method1073() { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)Lpu;", - garbageValue = "36" + descriptor = "(I)Lpf;", + garbageValue = "1266357542" ) @Export("getFont") public Font getFont() { if (this.fontId == -1) { return null; } else { - Font var1 = (Font) HitSplatDefinition_cachedFonts.get((long)this.fontId); + Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); if (var1 != null) { return var1; } else { - AbstractArchive var3 = field1701; - AbstractArchive var4 = class135.HitSplatDefinition_fontsArchive; + AbstractArchive var3 = field1640; + AbstractArchive var4 = HitSplatDefinition_fontsArchive; int var5 = this.fontId; + byte[] var7 = var3.takeFile(var5, 0); + boolean var6; + if (var7 == null) { + var6 = false; + } else { + class162.SpriteBuffer_decode(var7); + var6 = true; + } + Font var2; - if (!class164.method862(var3, var5, 0)) { + if (!var6) { var2 = null; } else { - byte[] var7 = var4.takeFile(var5, 0); - Font var6; - if (var7 == null) { - var6 = null; - } else { - Font var8 = new Font(var7, class326.SpriteBuffer_xOffsets, ModelData0.SpriteBuffer_yOffsets, class59.SpriteBuffer_spriteWidths, class544.SpriteBuffer_spriteHeights, class372.SpriteBuffer_spritePalette, AddRequestTask.SpriteBuffer_pixels); - class407.method2062(); - var6 = var8; - } - - var2 = var6; + var2 = WorldMapArea.method1229(var4.takeFile(var5, 0)); } if (var2 != null) { @@ -360,4 +365,79 @@ public Font getFont() { } } } + + @ObfuscatedName("at") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (var0 % 37L == 0L) { + return null; + } else { + int var2 = 0; + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { + ++var2; + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { + long var6 = var0; + var0 /= 37L; + var8 = class400.base37Table[(int)(var6 - var0 * 37L)]; + if (var8 == '_') { + int var9 = var5.length() - 1; + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); + var8 = 160; + } + } + + var5.reverse(); + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); + return var5.toString(); + } + } else { + return null; + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2098653411" + ) + public static void method994() { + KitDefinition.KitDefinition_cached.clear(); + } + + @ObfuscatedName("la") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lnn;I)Ljava/lang/String;", + garbageValue = "-1437467043" + ) + static String method998(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { + for (int var2 = 1; var2 <= 5; ++var2) { + while (true) { + int var3 = var0.indexOf("%" + var2); + if (var3 == -1) { + break; + } + + String var4 = var0.substring(0, var3); + int var6 = UserComparator4.method666(var1, var2 - 1); + String var5; + if (var6 < 999999999) { + var5 = Integer.toString(var6); + } else { + var5 = "*"; + } + + var0 = var4 + var5 + var0.substring(var3 + 2); + } + } + } + + return var0; + } } \ No newline at end of file diff --git a/osrs/src/main/java/HorizontalAlignment.java b/osrs/src/main/java/HorizontalAlignment.java index 75d5bb55b..347ac11d4 100644 --- a/osrs/src/main/java/HorizontalAlignment.java +++ b/osrs/src/main/java/HorizontalAlignment.java @@ -3,38 +3,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("hq") @Implements("HorizontalAlignment") -public enum HorizontalAlignment implements class386 { - @ObfuscatedName("ac") +public enum HorizontalAlignment implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lhb;" + descriptor = "Lhq;" ) - field1585(1, 0), - @ObfuscatedName("al") + field1521(0, 0), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lhb;" + descriptor = "Lhq;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(0, 1), - @ObfuscatedName("ak") + HorizontalAlignment_centered(2, 1), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lhb;" + descriptor = "Lhq;" ) - field1586(2, 2); + field1520(1, 2); - @ObfuscatedName("gj") + @ObfuscatedName("kt") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "[Luz;" ) - static Archive field1584; - @ObfuscatedName("jf") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("ax") + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + @ObfuscatedName("ao") @Export("value") public final int value; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("id") final int id; @@ -43,13 +41,66 @@ public enum HorizontalAlignment implements class386 { this.id = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)Lld;", + garbageValue = "-863810784" + ) + public static PacketBufferNode method931() { + PacketBufferNode var0; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { + var0 = new PacketBufferNode(); + } else { + var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + } + + var0.clientPacket = null; + var0.clientPacketLength = 0; + var0.packetBuffer = new PacketBuffer(5000); + return var0; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1945756897" + ) + public static int method932(int var0, int var1) { + int var2 = var0 >>> 31; + return (var0 + var2) / var1 - var2; + } + + @ObfuscatedName("mq") + @ObfuscatedSignature( + descriptor = "(Lnn;III)V", + garbageValue = "-79973183" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null && ArchiveDiskAction.method1911(var0) != null) { + Client.clickedWidget = var0; + Client.clickedWidgetParent = ArchiveDiskAction.method1911(var0); + Client.widgetClickX = var1; + Client.widgetClickY = var2; + class148.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var3 = Client.menuOptionsCount - 1; + if (var3 != -1) { + PcmPlayer.method225(var3); + } + + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Huffman.java b/osrs/src/main/java/Huffman.java index 783421a53..e8a297eb7 100644 --- a/osrs/src/main/java/Huffman.java +++ b/osrs/src/main/java/Huffman.java @@ -3,16 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ns") +@ObfuscatedName("nh") @Implements("Huffman") public class Huffman { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("masks") int[] masks; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("bits") byte[] bits; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("keys") int[] keys; @@ -99,10 +99,10 @@ public Huffman(byte[] var1) { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "1960932844" + garbageValue = "938505450" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -150,10 +150,10 @@ int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "([BI[BIII)I", - garbageValue = "-1820686670" + garbageValue = "-725308504" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -293,4 +293,13 @@ int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { return var7 + 1 - var2; } } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;S)I", + garbageValue = "17247" + ) + public static int method1888(CharSequence var0) { + return NPC.method580(var0, 10, true); + } } \ No newline at end of file diff --git a/osrs/src/main/java/IgnoreList.java b/osrs/src/main/java/IgnoreList.java index 309b43565..b47580739 100644 --- a/osrs/src/main/java/IgnoreList.java +++ b/osrs/src/main/java/IgnoreList.java @@ -3,64 +3,66 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qu") +@ObfuscatedName("qs") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("ao") + @ObfuscatedName("ar") + static int field3815; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) - final LoginType field3811; + final LoginType field3816; @ObfuscatedSignature( - descriptor = "(Lte;)V" + descriptor = "(Ltt;)V" ) public IgnoreList(LoginType var1) { super(400); - this.field3811 = var1; + this.field3816 = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lrp;", - garbageValue = "1002915738" + descriptor = "(I)Lrf;", + garbageValue = "794695059" ) @Export("newInstance") User newInstance() { return new Ignored(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)[Lrp;", - garbageValue = "-1086220070" + descriptor = "(II)[Lrf;", + garbageValue = "-190310061" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "2" + descriptor = "(Luj;IB)V", + garbageValue = "-24" ) @Export("read") public void read(Buffer var1, int var2) { while (var1.offset < var2) { int var3 = var1.readUnsignedByte(); if (var3 == 4) { - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.field3811); + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.field3816); if (!var4.hasCleanName()) { throw new IllegalStateException(); } boolean var5 = false; - InvDefinition.friendSystem.removeIgnore(var4.getName(), var5); + class12.friendSystem.removeIgnore(var4.getName(), var5); } else { boolean var9 = (var3 & 1) != 0; - Username var10 = new Username(var1.readStringCp1252NullTerminated(), this.field3811); - Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.field3811); + Username var10 = new Username(var1.readStringCp1252NullTerminated(), this.field3816); + Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.field3816); var1.readStringCp1252NullTerminated(); if (!var10.hasCleanName()) { throw new IllegalStateException(); @@ -89,4 +91,111 @@ public void read(Buffer var1, int var2) { } } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Lol;IIB)Luz;", + garbageValue = "-123" + ) + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); + boolean var3; + if (var4 == null) { + var3 = false; + } else { + class162.SpriteBuffer_decode(var4); + var3 = true; + } + + return !var3 ? null : WorldMapCacheName.method1353(); + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "35" + ) + static void method2206(int var0, int var1, int var2, int var3) { + for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { + int var5 = 0; + if (var1 > var4.maxX) { + var5 += var1 - var4.maxX; + } else if (var1 < var4.x) { + var5 += var4.x - var1; + } + + if (var2 > var4.maxY) { + var5 += var2 - var4.maxY; + } else if (var2 < var4.y) { + var5 += var4.y - var2; + } + + if (var5 - 64 <= var4.field691 && WorldMapIcon_1.clientPreferences.getAreaSoundEffectsVolume() != 0 && var0 == var4.plane) { + var5 -= 64; + if (var5 < 0) { + var5 = 0; + } + + int var6 = (var4.field691 - var5) * WorldMapIcon_1.clientPreferences.getAreaSoundEffectsVolume() / var4.field691; + if (var4.stream1 == null) { + if (var4.soundEffectId >= 0) { + SoundEffect var7 = SoundEffect.readSoundEffect(Language.field3643, var4.soundEffectId, 0); + if (var7 != null) { + RawSound var8 = var7.toRawSound().resample(class521.decimator); + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); + var9.setNumLoops(-1); + LoginScreenAnimation.pcmStreamMixer.addSubStream(var9); + var4.stream1 = var9; + } + } + } else { + var4.stream1.method252(var6); + } + + if (var4.stream2 == null) { + if (var4.soundEffectIds != null && (var4.field699 -= var3) <= 0) { + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); + SoundEffect var12 = SoundEffect.readSoundEffect(Language.field3643, var4.soundEffectIds[var11], 0); + if (var12 != null) { + RawSound var13 = var12.toRawSound().resample(class521.decimator); + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); + var10.setNumLoops(0); + LoginScreenAnimation.pcmStreamMixer.addSubStream(var10); + var4.stream2 = var10; + var4.field699 = var4.field700 + (int)(Math.random() * (double)(var4.field696 - var4.field700)); + } + } + } else { + var4.stream2.method252(var6); + if (!var4.stream2.hasNext()) { + var4.stream2 = null; + } + } + } else { + if (var4.stream1 != null) { + LoginScreenAnimation.pcmStreamMixer.removeSubStream(var4.stream1); + var4.stream1 = null; + } + + if (var4.stream2 != null) { + LoginScreenAnimation.pcmStreamMixer.removeSubStream(var4.stream2); + var4.stream2 = null; + } + } + } + } + + } + + @ObfuscatedName("my") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-24" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; + } } \ No newline at end of file diff --git a/osrs/src/main/java/Ignored.java b/osrs/src/main/java/Ignored.java index f29f7f2da..dbe2549fc 100644 --- a/osrs/src/main/java/Ignored.java +++ b/osrs/src/main/java/Ignored.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ry") +@ObfuscatedName("rr") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("id") int id; Ignored() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lry;B)I", - garbageValue = "16" + descriptor = "(Lrr;I)I", + garbageValue = "-987193014" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lrp;I)I", - garbageValue = "762888653" + descriptor = "(Lrf;B)I", + garbageValue = "-95" ) @Export("compareTo_user") public int compareTo_user(User var1) { diff --git a/osrs/src/main/java/IndexedSprite.java b/osrs/src/main/java/IndexedSprite.java index 4abc638ca..01b0b3cd3 100644 --- a/osrs/src/main/java/IndexedSprite.java +++ b/osrs/src/main/java/IndexedSprite.java @@ -2,35 +2,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("un") +@ObfuscatedName("up") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("pixels") public byte[] pixels; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("palette") public int[] palette; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("subWidth") public int subWidth; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("subHeight") public int subHeight; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("xOffset") public int xOffset; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("yOffset") public int yOffset; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("width") public int width; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("height") public int height; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -51,7 +51,7 @@ public void normalize() { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { @@ -84,7 +84,7 @@ public void shiftColors(int var1, int var2, int var3) { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -130,8 +130,8 @@ public void drawAt(int var1, int var2) { } } - @ObfuscatedName("ao") - public void method2693(int var1, int var2, int var3, int var4) { + @ObfuscatedName("ab") + public void method2671(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -192,7 +192,7 @@ public void method2693(int var1, int var2, int var3, int var4) { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -246,7 +246,7 @@ static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int } - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("IndexedSprite_something") static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; diff --git a/osrs/src/main/java/Instrument.java b/osrs/src/main/java/Instrument.java index 5b6b7f03f..d901b273e 100644 --- a/osrs/src/main/java/Instrument.java +++ b/osrs/src/main/java/Instrument.java @@ -5,112 +5,112 @@ import java.util.Random; -@ObfuscatedName("cp") +@ObfuscatedName("cq") @Implements("Instrument") public class Instrument { - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbh;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbh;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbh;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbh;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbh;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbh;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbh;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbh;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("delayTime") int delayTime; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("delayDecay") int delayDecay; - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lcq;" + descriptor = "Lci;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbh;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("duration") int duration; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("offset") int offset; @@ -147,10 +147,10 @@ public class Instrument { this.offset = 0; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class424.clearIntArray(Instrument_samples, 0, var1); + class421.clearIntArray(Instrument_samples, 0, var1); if (var2 < 10) { return Instrument_samples; } else { @@ -355,7 +355,7 @@ final int[] synthesize(int var1, int var2) { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { @@ -369,9 +369,9 @@ final int evaluateWave(int var1, int var2, int var3) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -423,6 +423,6 @@ final void decode(Buffer var1) { this.offset = var1.readUnsignedShort(); this.filter = new AudioFilter(); this.filterEnvelope = new SoundEnvelope(); - this.filter.method323(var1, this.filterEnvelope); + this.filter.method328(var1, this.filterEnvelope); } } \ No newline at end of file diff --git a/osrs/src/main/java/IntHashTable.java b/osrs/src/main/java/IntHashTable.java index 7147789f2..ddb004dad 100644 --- a/osrs/src/main/java/IntHashTable.java +++ b/osrs/src/main/java/IntHashTable.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("vr") +@ObfuscatedName("vh") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("array") int[] array; @@ -32,10 +32,10 @@ public IntHashTable(int[] var1) { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1585226443" + garbageValue = "-2036964375" ) @Export("get") public int get(int var1) { diff --git a/osrs/src/main/java/IntegerNode.java b/osrs/src/main/java/IntegerNode.java index 74428348f..bf648077b 100644 --- a/osrs/src/main/java/IntegerNode.java +++ b/osrs/src/main/java/IntegerNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ss") +@ObfuscatedName("sy") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("integer") public int integer; diff --git a/osrs/src/main/java/InterfaceParent.java b/osrs/src/main/java/InterfaceParent.java index f5f7b549b..38117d748 100644 --- a/osrs/src/main/java/InterfaceParent.java +++ b/osrs/src/main/java/InterfaceParent.java @@ -3,73 +3,51 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("dc") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("gd") + static String field862; + @ObfuscatedName("ty") + static boolean field861; + @ObfuscatedName("at") @Export("group") int group; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("type") int type; - @ObfuscatedName("ak") - boolean field858; + @ObfuscatedName("ar") + boolean field863; InterfaceParent() { - this.field858 = false; + this.field863 = false; } - @ObfuscatedName("av") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lnm;I[B[BI)V", - garbageValue = "101462872" + descriptor = "(Lmf;I)V", + garbageValue = "-919285791" ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field3006 == null) { - if (var2 == null) { - return; - } - - var0.field3006 = new byte[11][]; - var0.field3005 = new byte[11][]; - var0.field3074 = new int[11]; - var0.field3075 = new int[11]; - } - - var0.field3006[var1] = var2; - if (var2 != null) { - var0.field2998 = true; - } else { - var0.field2998 = false; - - for (int var4 = 0; var4 < var0.field3006.length; ++var4) { - if (var0.field3006[var4] != null) { - var0.field2998 = true; - break; - } - } - } - - var0.field3005[var1] = var3; + public static void method462(class322 var0) { + class316.field2793.remove(var0); } - @ObfuscatedName("oz") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "554905289" + descriptor = "(I)I", + garbageValue = "-1759271664" ) - static String method465(String var0) { - PlayerType[] var1 = class183.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(class436.addImageTag(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; - } - } + public static int method463() { + return ++MouseHandler.MouseHandler_idleCycles - 1; + } - return var0; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "94" + ) + public static void method464() { + NPCComposition.NpcDefinition_cached.clear(); + NPCComposition.NpcDefinition_cachedModels.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/Interpreter.java b/osrs/src/main/java/Interpreter.java index b67871896..4f2faffbc 100644 --- a/osrs/src/main/java/Interpreter.java +++ b/osrs/src/main/java/Interpreter.java @@ -5,57 +5,64 @@ import java.util.ArrayList; -@ObfuscatedName("cx") +@ObfuscatedName("cc") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("Interpreter_intLocals") static int[] Interpreter_intLocals; - @ObfuscatedName("ah") + @ObfuscatedName("ab") + @Export("Tiles_overlays") + static short[][][] Tiles_overlays; + @ObfuscatedName("au") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("am") - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "[Lcn;" + descriptor = "[Lcs;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lnn;" ) - static ClanChannel field704; - @ObfuscatedName("ai") + @Export("scriptDotWidget") + static Widget scriptDotWidget; + @ObfuscatedName("aq") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("aq") - static boolean field701; - @ObfuscatedName("az") + @ObfuscatedName("ae") static boolean field702; - @ObfuscatedName("at") - static ArrayList field713; - @ObfuscatedName("af") - static int field706; - @ObfuscatedName("by") - static final double field715; + @ObfuscatedName("an") + static boolean field703; + @ObfuscatedName("ag") + static ArrayList field712; + @ObfuscatedName("ad") + static int field705; + @ObfuscatedName("bl") + static final double field717; + @ObfuscatedName("of") + @ObfuscatedSignature( + descriptor = "Lnn;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; static { Interpreter_arrayLengths = new int[5]; @@ -66,32 +73,700 @@ public class Interpreter { Interpreter_frames = new ScriptFrame[50]; Interpreter_calendar = java.util.Calendar.getInstance(); Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - field701 = false; field702 = false; - field713 = new ArrayList(); - field706 = 0; - field715 = Math.log(2.0D); + field703 = false; + field712 = new ArrayList(); + field705 = 0; + field717 = Math.log(2.0D); } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ldl;I)V", - garbageValue = "1932379586" + descriptor = "(Luo;II)V", + garbageValue = "593247130" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - ArchiveDisk.runScript(var0, 500000, 475000); + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + class221.method1120(var0); + + for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { + int var4 = Players.Players_pendingUpdateIndices[var3]; + Player var5 = Client.players[var4]; + int var6 = var0.readUnsignedByte(); + if ((var6 & 128) != 0) { + var6 += var0.readUnsignedByte() << 8; + } + + if ((var6 & 16384) != 0) { + var6 += var0.readUnsignedByte() << 16; + } + + byte var7 = MoveSpeed.STATIONARY.speed; + if ((var6 & 512) != 0) { + var7 = var0.readByteSub(); + } + + if ((var6 & 1024) != 0) { + MoveSpeed[] var8 = Players.playerMovementSpeeds; + MoveSpeed[] var10 = new MoveSpeed[]{MoveSpeed.WALK, MoveSpeed.STATIONARY, MoveSpeed.CRAWL, MoveSpeed.RUN}; + var8[var4] = (MoveSpeed)class12.findEnumerated(var10, var0.readByteNeg()); + } + + if ((var6 & 4) != 0) { + var5.movingOrientation = var0.readUnsignedShort(); + if (var5.pathLength == 0) { + var5.orientation = var5.movingOrientation; + var5.method515(); + } + } + + if ((var6 & 4096) != 0) { + var5.field1013 = var0.readByteNeg(); + var5.field1012 = var0.readByteNeg(); + var5.field1024 = var0.readByte(); + var5.field1010 = var0.readByteNeg(); + var5.spotAnimation = var0.readUnsignedShort() + Client.cycle; + var5.exactMoveArrive1Cycle = var0.readUnsignedShort() + Client.cycle; + var5.exactMoveDirection = var0.readUnsignedShort(); + if (var5.hasMovementPending) { + var5.field1013 += var5.tileX; + var5.field1012 += var5.tileY; + var5.field1024 += var5.tileX; + var5.field1010 += var5.tileY; + var5.pathLength = 0; + } else { + var5.field1013 += var5.pathX[0]; + var5.field1012 += var5.pathY[0]; + var5.field1024 += var5.pathX[0]; + var5.field1010 += var5.pathY[0]; + var5.pathLength = 1; + } + + var5.field1029 = 0; + } + + int var23; + if ((var6 & 8192) != 0) { + for (var23 = 0; var23 < 3; ++var23) { + var5.actions[var23] = var0.readStringCp1252NullTerminated(); + } + } + + int var9; + int var13; + int var14; + int var24; + if ((var6 & 2048) != 0) { + var23 = var0.readUnsignedShortAddLE(); + var9 = var23 >> 8; + var24 = var9 >= 13 && var9 <= 20 ? var9 - 12 : 0; + PlayerType var11 = (PlayerType)class12.findEnumerated(class320.PlayerType_values(), var0.readUnsignedShortAdd()); + boolean var12 = var0.readUnsignedByte() == 1; + var13 = var0.readUnsignedByte(); + var14 = var0.offset; + if (var5.username != null && var5.appearance != null) { + boolean var15 = false; + if (var11.isUser && class12.friendSystem.isIgnored(var5.username)) { + var15 = true; + } + + if (!var15 && Client.field479 == 0 && !var5.isHidden) { + Players.field1126.offset = 0; + var0.method2618(Players.field1126.array, 0, var13); + Players.field1126.offset = 0; + String var16 = AbstractFont.escapeBrackets(class20.method77(class128.readString(Players.field1126))); + var5.overheadText = var16.trim(); + var5.field1005 = var23 >> 8; + var5.field1003 = var23 & 255; + var5.overheadTextCyclesRemaining = 150; + byte[] var17 = null; + if (var24 > 0 && var24 <= 8) { + var17 = new byte[var24]; + + for (int var18 = 0; var18 < var24; ++var18) { + var17[var18] = var0.readByte(); + } + } + + byte[] var20 = var17; + int[] var19; + if (var17 != null && var17.length != 0 && var17.length <= 8) { + int[] var21 = new int[var17.length]; + int var22 = 0; + + while (true) { + if (var22 >= var20.length) { + var19 = var21; + break; + } + + if (var20[var22] < 0 || var20[var22] > class550.field4316.length) { + var19 = null; + break; + } + + var21[var22] = class550.field4316[var20[var22]]; + ++var22; + } + } else { + var19 = null; + } + + var5.field1030 = var19; + var5.isAutoChatting = var12; + var5.showPublicPlayerChat = var5 != class229.localPlayer && var11.isUser && !Client.field600.isEmpty() && var16.toLowerCase().indexOf(Client.field600) == -1; + int var26; + if (var11.isPrivileged) { + var26 = var12 ? 91 : 1; + } else { + var26 = var12 ? 90 : 2; + } + + if (var11.modIcon != -1) { + GrandExchangeOfferUnitPriceComparator.addGameMessage(var26, FloorUnderlayDefinition.addImageTag(var11.modIcon) + var5.username.getName(), var16); + } else { + GrandExchangeOfferUnitPriceComparator.addGameMessage(var26, var5.username.getName(), var16); + } + } + } + + var0.offset = var24 + var13 + var14; + } + + int var27; + int var32; + if ((var6 & 65536) != 0) { + var23 = var0.readUnsignedByteNeg(); + + for (var9 = 0; var9 < var23; ++var9) { + var24 = var0.readUnsignedByteSub(); + var27 = var0.readUnsignedShort(); + var32 = var0.readIntIME(); + var5.updateSpotAnimation(var24, var27, var32 >> 16, var32 & 65535); + } + } + + if ((var6 & 32) != 0) { + var5.overheadText = var0.readStringCp1252NullTerminated(); + if (var5.overheadText.charAt(0) == '~') { + var5.overheadText = var5.overheadText.substring(1); + GrandExchangeOfferUnitPriceComparator.addGameMessage(2, var5.username.getName(), var5.overheadText); + } else if (var5 == class229.localPlayer) { + GrandExchangeOfferUnitPriceComparator.addGameMessage(2, var5.username.getName(), var5.overheadText); + } + + var5.isAutoChatting = false; + var5.field1005 = 0; + var5.field1003 = 0; + var5.overheadTextCyclesRemaining = 150; + } + + int var34; + if ((var6 & 16) != 0) { + var23 = var0.readUnsignedShortAdd(); + if (var23 > 0) { + for (var9 = 0; var9 < var23; ++var9) { + var27 = -1; + var32 = -1; + var13 = -1; + var24 = var0.readUShortSmart(); + if (var24 == 32767) { + var24 = var0.readUShortSmart(); + var32 = var0.readUShortSmart(); + var27 = var0.readUShortSmart(); + var13 = var0.readUShortSmart(); + } else if (var24 != 32766) { + var32 = var0.readUShortSmart(); + } else { + var24 = -1; + } + + var14 = var0.readUShortSmart(); + var5.addHitSplat(var24, var32, var27, var13, Client.cycle, var14); + } + } + + var9 = var0.readUnsignedByte(); + if (var9 > 0) { + for (var24 = 0; var24 < var9; ++var24) { + var27 = var0.readUShortSmart(); + var32 = var0.readUShortSmart(); + if (var32 != 32767) { + var13 = var0.readUShortSmart(); + var14 = var0.readUnsignedShortAdd(); + var34 = var32 > 0 ? var0.readUnsignedByteNeg() : var14; + var5.addHealthBar(var27, Client.cycle, var32, var13, var14, var34); + } else { + var5.removeHealthBar(var27); + } + } + } + } + + if ((var6 & 2) != 0) { + var23 = var0.readUnsignedShortAdd(); + byte[] var28 = new byte[var23]; + Buffer var31 = new Buffer(var28); + var0.method2617(var28, 0, var23); + Players.cachedAppearanceBuffer[var4] = var31; + var5.read(var31); + } + + if ((var6 & 1) != 0) { + var23 = var0.readUnsignedShortAddLE(); + if (var23 == 65535) { + var23 = -1; + } + + var9 = var0.readUnsignedByteSub(); + WorldMapLabelSize.performPlayerAnimation(var5, var23, var9); + } + + if ((var6 & 64) != 0) { + var5.targetIndex = var0.readUnsignedShort(); + var5.targetIndex += var0.readUnsignedByteNeg() << 16; + var23 = 16777215; + if (var23 == var5.targetIndex) { + var5.targetIndex = -1; + } + } + + if ((var6 & 8) != 0) { + var23 = var0.readUnsignedShortLE(); + PlayerType var36 = (PlayerType)class12.findEnumerated(class320.PlayerType_values(), var0.readUnsignedByteSub()); + boolean var35 = var0.readUnsignedShortAdd() == 1; + var27 = var0.readUnsignedByte(); + var32 = var0.offset; + if (var5.username != null && var5.appearance != null) { + boolean var33 = false; + if (var36.isUser && class12.friendSystem.isIgnored(var5.username)) { + var33 = true; + } + + if (!var33 && Client.field479 == 0 && !var5.isHidden) { + Players.field1126.offset = 0; + var0.readBytes(Players.field1126.array, 0, var27); + Players.field1126.offset = 0; + String var29 = AbstractFont.escapeBrackets(class20.method77(class128.readString(Players.field1126))); + var5.overheadText = var29.trim(); + var5.field1005 = var23 >> 8; + var5.field1003 = var23 & 255; + var5.overheadTextCyclesRemaining = 150; + var5.field1030 = null; + var5.isAutoChatting = var35; + var5.showPublicPlayerChat = var5 != class229.localPlayer && var36.isUser && !Client.field600.isEmpty() && var29.toLowerCase().indexOf(Client.field600) == -1; + if (var36.isPrivileged) { + var34 = var35 ? 91 : 1; + } else { + var34 = var35 ? 90 : 2; + } + + if (var36.modIcon != -1) { + GrandExchangeOfferUnitPriceComparator.addGameMessage(var34, FloorUnderlayDefinition.addImageTag(var36.modIcon) + var5.username.getName(), var29); + } else { + GrandExchangeOfferUnitPriceComparator.addGameMessage(var34, var5.username.getName(), var29); + } + } + } + + var0.offset = var27 + var32; + } + + if ((var6 & 256) != 0) { + var5.recolourStartCycle = Client.cycle + var0.readUnsignedShortLE(); + var5.recolourEndCycle = Client.cycle + var0.readUnsignedShortAddLE(); + var5.recolourHue = var0.readByteAdd(); + var5.recolourSaturation = var0.readByteNeg(); + var5.recolourLuminance = var0.readByteSub(); + var5.recolourAmount = (byte)var0.readUnsignedByteNeg(); + } + + if (var5.hasMovementPending) { + if (var7 == 127) { + var5.resetPath(var5.tileX, var5.tileY); + } else { + MoveSpeed var30; + if (var7 != MoveSpeed.STATIONARY.speed) { + MoveSpeed[] var37 = new MoveSpeed[]{MoveSpeed.WALK, MoveSpeed.STATIONARY, MoveSpeed.CRAWL, MoveSpeed.RUN}; + var30 = (MoveSpeed)class12.findEnumerated(var37, var7); + } else { + var30 = Players.playerMovementSpeeds[var4]; + } + + var5.move(var5.tileX, var5.tileY, var30); + } + } + } + + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); + } } - @ObfuscatedName("mq") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1205286290" + descriptor = "(IIIIIILkf;Liw;B)V", + garbageValue = "-87" ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListener(int var0, int var1) { - if (class33.widgetDefinition.loadInterface(var0)) { - ClientPacket.runComponentCloseListeners(class33.widgetDefinition.Widget_interfaceComponents[var0], var1); + @Export("addObjects") + static final void addObjects(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { + if (var0 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var0; + } + + ObjectComposition var8 = WorldMapSection2.getObjectDefinition(var3); + int var9; + int var10; + if (var4 != 1 && var4 != 3) { + var9 = var8.sizeX; + var10 = var8.sizeY; + } else { + var9 = var8.sizeY; + var10 = var8.sizeX; + } + + int var11; + int var12; + if (var9 + var1 <= 104) { + var11 = (var9 >> 1) + var1; + var12 = (var9 + 1 >> 1) + var1; + } else { + var11 = var1; + var12 = var1 + 1; + } + + int var13; + int var14; + if (var10 + var2 <= 104) { + var13 = (var10 >> 1) + var2; + var14 = var2 + (var10 + 1 >> 1); + } else { + var13 = var2; + var14 = var2 + 1; + } + + int[][] var15 = Tiles.Tiles_heights[var0]; + int var16 = var15[var12][var14] + var15[var11][var13] + var15[var12][var13] + var15[var11][var14] >> 2; + int var17 = (var1 << 7) + (var9 << 6); + int var18 = (var2 << 7) + (var10 << 6); + long var19 = Player.calculateTag(var1, var2, 2, var8.int1 == 0, var3); + int var21 = var5 + (var4 << 6); + if (var8.int3 == 1) { + var21 += 256; + } + + if (var8.hasSound()) { + UrlRequester.method648(var0, var1, var2, var8, var4); + } + + Object var22; + if (var5 == 22) { + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var22, var19, var21); + if (var8.interactType == 1 && var7 != null) { + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else { + int var31; + if (var5 != 10 && var5 != 11) { + int[] var10000; + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.method1467(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = class344.field3130[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field849[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + class93.field948[var0][var1][var2] = 50; + class93.field948[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = class344.field3130[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + class93.field948[var0][var1][var2 + 1] = 50; + class93.field948[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = class344.field3130[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + class93.field948[var0][var1 + 1][var2] = 50; + class93.field948[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = class344.field3130[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + class93.field948[var0][var1][var2] = 50; + class93.field948[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = class344.field3130[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1137(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method1473(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field847[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + class93.field948[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + class93.field948[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + class93.field948[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + class93.field948[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1137(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { + var28 = var4 + 1 & 3; + Object var23; + Object var24; + if (var8.animationId == -1 && var8.transforms == null) { + var23 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); + var24 = var8.getEntity(2, var28, var15, var17, var16, var18); + } else { + var23 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + var24 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var23, (Renderable)var24, Tiles.field849[var4], Tiles.field849[var28], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = class344.field3130[var0][var1]; + var10000[var2] |= 585; + var10000 = class344.field3130[var0][var1]; + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { + var10000 = class344.field3130[var0][var1]; + var10000[1 + var2] |= 1170; + var10000 = class344.field3130[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = class344.field3130[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = class344.field3130[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = class344.field3130[var0][var1]; + var10000[var2] |= 1170; + var10000 = class344.field3130[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1137(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method1473(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field847[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + class93.field948[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + class93.field948[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + class93.field948[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + class93.field948[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method1137(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.method1467(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method1473(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field849[var4], 0, 0, 0, var19, var21); + } else { + Object var25; + long var29; + if (var5 == 5) { + var28 = 16; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var29) { + var28 = WorldMapSection2.getObjectDefinition(class232.Entity_unpackID(var29)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field849[var4], 0, var28 * Tiles.field850[var4], var28 * Tiles.field845[var4], var19, var21); + } else if (var5 == 6) { + var28 = 8; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var29 != 0L) { + var28 = WorldMapSection2.getObjectDefinition(class232.Entity_unpackID(var29)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field848[var4], var28 * Tiles.field846[var4], var19, var21); + } else if (var5 == 7) { + var31 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(4, var31 + 4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 4, var31 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, 256, var31, 0, 0, var19, var21); + } else if (var5 == 8) { + var28 = 8; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var29 != 0L) { + var28 = WorldMapSection2.getObjectDefinition(class232.Entity_unpackID(var29)).int2 / 2; + } + + int var27 = var4 + 2 & 3; + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field848[var4], var28 * Tiles.field846[var4], var19, var21); + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + } + + if (var22 != null && var6.method1467(var0, var1, var2, var16, var9, var10, (Renderable)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var31 = 15; + if (var22 instanceof Model) { + var31 = ((Model)var22).method1540() / 4; + if (var31 > 30) { + var31 = 30; + } + } + + for (int var32 = 0; var32 <= var9; ++var32) { + for (int var33 = 0; var33 <= var10; ++var33) { + if (var31 > class93.field948[var0][var32 + var1][var33 + var2]) { + class93.field948[var0][var32 + var1][var33 + var2] = (byte)var31; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } } } } \ No newline at end of file diff --git a/osrs/src/main/java/InvDefinition.java b/osrs/src/main/java/InvDefinition.java index b90cb8ee2..73f5b60ef 100644 --- a/osrs/src/main/java/InvDefinition.java +++ b/osrs/src/main/java/InvDefinition.java @@ -3,32 +3,22 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; - -@ObfuscatedName("hm") +@ObfuscatedName("gz") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("vh") - @ObfuscatedSignature( - descriptor = "Lci;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("InvDefinition_archive") - static AbstractArchive InvDefinition_archive; - @ObfuscatedName("al") + public static AbstractArchive InvDefinition_archive; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("InvDefinition_cached") - static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("ak") + public static EvictingDualNodeHashTable InvDefinition_cached; + @ObfuscatedName("ar") @Export("size") public int size; @@ -40,10 +30,10 @@ public class InvDefinition extends DualNode { this.size = 0; } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "1869609284" + descriptor = "(Luj;B)V", + garbageValue = "0" ) @Export("decode") void decode(Buffer var1) { @@ -57,10 +47,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "-570859961" + descriptor = "(Luj;II)V", + garbageValue = "-472687960" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -70,194 +60,38 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IB)Ljava/io/File;", - garbageValue = "116" + descriptor = "(Lol;Lol;S)V", + garbageValue = "1000" ) - static File method954(String var0, String var1, int var2) { - String var3 = var2 == 0 ? "" : "" + var2; - JagexCache.field1451 = new File(DevicePcmPlayerProvider.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); - String var4 = null; - String var5 = null; - boolean var6 = false; - Buffer var8; - int var11; - File var27; - if (JagexCache.field1451.exists()) { - try { - AccessFile var7 = new AccessFile(JagexCache.field1451, "rw", 10000L); - - int var9; - for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { - var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); - if (var9 == -1) { - throw new IOException(); - } - } - - var8.offset = 0; - var9 = var8.readUnsignedByte(); - if (var9 < 1 || var9 > 3) { - throw new IOException("" + var9); - } - - int var10 = 0; - if (var9 > 1) { - var10 = var8.readUnsignedByte(); - } - - if (var9 <= 2) { - var4 = var8.readStringCp1252NullCircumfixed(); - if (var10 == 1) { - var5 = var8.readStringCp1252NullCircumfixed(); - } - } else { - var4 = var8.readCESUB(); - if (var10 == 1) { - var5 = var8.readCESUB(); - } - } - - var7.close(); - } catch (IOException var25) { - var25.printStackTrace(); - } - - if (var4 != null) { - var27 = new File(var4); - if (!var27.exists()) { - var4 = null; - } - } - - if (var4 != null) { - var27 = new File(var4, "test.dat"); - - boolean var28; - try { - RandomAccessFile var15 = new RandomAccessFile(var27, "rw"); - var11 = var15.read(); - var15.seek(0L); - var15.write(var11); - var15.seek(0L); - var15.close(); - var27.delete(); - var28 = true; - } catch (Exception var23) { - var28 = false; - } - - if (!var28) { - var4 = null; - } - } - } - - if (var4 == null && var2 == 0) { - label134: - for (int var16 = 0; var16 < class27.field74.length; ++var16) { - for (int var17 = 0; var17 < FriendsList.field3812.length; ++var17) { - File var18 = new File(FriendsList.field3812[var17] + class27.field74[var16] + File.separatorChar + var0 + File.separatorChar); - if (var18.exists()) { - File var19 = new File(var18, "test.dat"); - - boolean var29; - try { - RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); - int var13 = var12.read(); - var12.seek(0L); - var12.write(var13); - var12.seek(0L); - var12.close(); - var19.delete(); - var29 = true; - } catch (Exception var22) { - var29 = false; - } - - if (var29) { - var4 = var18.toString(); - var6 = true; - break label134; - } - } - } - } - } - - if (var4 == null) { - var4 = DevicePcmPlayerProvider.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; - var6 = true; - } - - File var26; - if (var5 != null) { - var26 = new File(var5); - var27 = new File(var4); - - try { - File[] var33 = var26.listFiles(); - File[] var31 = var33; - - for (var11 = 0; var11 < var31.length; ++var11) { - File var30 = var31[var11]; - File var20 = new File(var27, var30.getName()); - boolean var14 = var30.renameTo(var20); - if (!var14) { - throw new IOException(); - } - } - } catch (Exception var24) { - var24.printStackTrace(); - } - - var6 = true; - } - - if (var6) { - var26 = new File(var4); - var8 = null; - - try { - AccessFile var34 = new AccessFile(JagexCache.field1451, "rw", 10000L); - Buffer var32 = new Buffer(500); - var32.writeByte(3); - var32.writeByte(var8 != null ? 1 : 0); - var32.writeCESU8(var26.getPath()); - if (var8 != null) { - var32.writeCESU8(""); - } - - var34.write(var32.array, 0, var32.offset); - var34.close(); - } catch (IOException var21) { - var21.printStackTrace(); - } - } - - return new File(var4); + public static void method879(AbstractArchive var0, AbstractArchive var1) { + KitDefinition.KitDefinition_archive = var0; + KitDefinition.KitDefinition_modelsArchive = var1; + class348.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); } - @ObfuscatedName("ak") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lom;Ljava/lang/String;Ljava/lang/String;S)[Lun;", - garbageValue = "20693" + descriptor = "(I)V", + garbageValue = "264426483" ) - public static IndexedSprite[] method953(AbstractArchive var0, String var1, String var2) { - if (!var0.isValidFileName(var1, var2)) { - return null; - } else { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - IndexedSprite[] var5; - if (!class164.method862(var0, var3, var4)) { - var5 = null; - } else { - var5 = class512.method2517(); - } + public static void method877() { + class173.field1440.clear(); + } - return var5; + @ObfuscatedName("ny") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-103" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (class20.friendsChat != null) { + PacketBufferNode var1 = class113.getPacketBufferNode(ClientPacket.CLAN_KICKUSER, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(ClanChannel.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } } \ No newline at end of file diff --git a/osrs/src/main/java/IsaacCipher.java b/osrs/src/main/java/IsaacCipher.java index 8f0433e1a..be4c848f8 100644 --- a/osrs/src/main/java/IsaacCipher.java +++ b/osrs/src/main/java/IsaacCipher.java @@ -3,25 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("vd") +@ObfuscatedName("uy") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("results") int[] results; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("mm") int[] mm; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("aa") int aa; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("bb") int bb; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("cc") int cc; @@ -33,13 +33,13 @@ public IsaacCipher(int[] var1) { this.results[var2] = var1[var2]; } - this.method2732(); + this.method2710(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "65535" + descriptor = "(B)I", + garbageValue = "72" ) @Export("nextInt") public final int nextInt() { @@ -51,12 +51,12 @@ public final int nextInt() { return this.results[--this.valuesRemaining]; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1348213836" + garbageValue = "-1756863806" ) - public final int method2730() { + public final int method2708() { if (this.valuesRemaining == 0) { this.generateMoreResults(); this.valuesRemaining = 256; @@ -65,10 +65,10 @@ public final int method2730() { return this.results[this.valuesRemaining - 1]; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-14" + garbageValue = "-1" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -90,18 +90,18 @@ final void generateMoreResults() { this.aa += this.mm[128 + var1 & 255]; int var3; - this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-999291280" + garbageValue = "1303649759" ) - final void method2732() { + final void method2710() { int var9 = -1640531527; int var8 = -1640531527; int var7 = -1640531527; @@ -228,14 +228,4 @@ final void method2732() { this.generateMoreResults(); this.valuesRemaining = 256; } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "526630296" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; - } } \ No newline at end of file diff --git a/osrs/src/main/java/ItemComposition.java b/osrs/src/main/java/ItemComposition.java index dc78c60ff..2d12cf837 100644 --- a/osrs/src/main/java/ItemComposition.java +++ b/osrs/src/main/java/ItemComposition.java @@ -3,179 +3,183 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; - -@ObfuscatedName("iy") +@ObfuscatedName("hv") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Lol;" + ) + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("al") + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Llk;" ) @Export("ItemDefinition_cached") - static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("ag") + public static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("HealthBarDefinition_cachedSprites") - static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("aa") + public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("id") int id; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("model") int model; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("name") public String name; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("retextureTo") public short[] retextureTo; @ObfuscatedName("aw") @Export("zoom2d") public int zoom2d; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("xan2d") public int xan2d; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("yan2d") public int yan2d; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("zan2d") public int zan2d; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("isStackable") public int isStackable; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("price") public int price; - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("maleModel") public int maleModel; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("maleModel1") public int maleModel1; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("maleModel2") public int maleModel2; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("bt") + @ObfuscatedName("bj") @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("bm") + @ObfuscatedName("bn") @Export("femaleModel") int femaleModel; - @ObfuscatedName("br") + @ObfuscatedName("bo") @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("bc") + @ObfuscatedName("bu") @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("bu") + @ObfuscatedName("by") @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("bf") - int field1777; @ObfuscatedName("bh") + int field1724; + @ObfuscatedName("bz") @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("bl") + @ObfuscatedName("bc") @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("bg") + @ObfuscatedName("bs") @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("bj") - int field1781; @ObfuscatedName("bx") - int field1788; - @ObfuscatedName("bi") - int field1780; - @ObfuscatedName("bq") + int field1732; + @ObfuscatedName("bb") + int field1722; + @ObfuscatedName("bk") + int field1726; + @ObfuscatedName("br") @Export("countobj") int[] countobj; - @ObfuscatedName("bw") + @ObfuscatedName("bq") @Export("countco") int[] countco; - @ObfuscatedName("ce") + @ObfuscatedName("cf") @Export("note") public int note; - @ObfuscatedName("cu") + @ObfuscatedName("cg") @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("cw") + @ObfuscatedName("cv") @Export("resizeX") int resizeX; - @ObfuscatedName("co") + @ObfuscatedName("cx") @Export("resizeY") int resizeY; - @ObfuscatedName("cc") + @ObfuscatedName("cp") @Export("resizeZ") int resizeZ; - @ObfuscatedName("cg") - public int field1811; - @ObfuscatedName("cq") - public int field1812; - @ObfuscatedName("cy") + @ObfuscatedName("ce") + public int field1756; + @ObfuscatedName("ci") + public int field1759; + @ObfuscatedName("ct") @Export("team") public int team; - @ObfuscatedName("cz") - public int field1817; - @ObfuscatedName("cp") + @ObfuscatedName("cw") + public int field1763; + @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Ltz;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("cb") + @ObfuscatedName("cl") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("cn") + @ObfuscatedName("cs") @Export("unnotedId") int unnotedId; - @ObfuscatedName("ck") + @ObfuscatedName("co") @Export("notedId") int notedId; - @ObfuscatedName("cr") + @ObfuscatedName("cm") @Export("placeholder") public int placeholder; - @ObfuscatedName("cs") + @ObfuscatedName("cn") @Export("placeholderTemplate") public int placeholderTemplate; @@ -207,22 +211,22 @@ public class ItemComposition extends DualNode { this.femaleOffset = 0; this.maleHeadModel = -1; this.maleHeadModel2 = -1; - this.field1777 = 0; + this.field1724 = 0; this.femaleModel2 = -1; this.femaleHeadModel = -1; this.femaleHeadModel2 = -1; - this.field1781 = -1; - this.field1788 = -1; - this.field1780 = -1; + this.field1732 = -1; + this.field1722 = -1; + this.field1726 = -1; this.note = -1; this.noteTemplate = -1; this.resizeX = 128; this.resizeY = 128; this.resizeZ = 128; - this.field1811 = 0; - this.field1812 = 0; + this.field1756 = 0; + this.field1759 = 0; this.team = 0; - this.field1817 = 0; + this.field1763 = 0; this.isTradable = false; this.unnotedId = -1; this.notedId = -1; @@ -230,23 +234,23 @@ public class ItemComposition extends DualNode { this.placeholderTemplate = -1; } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1200594754" + garbageValue = "1127699243" ) @Export("post") void post() { if (this.isStackable == 1) { - this.field1817 = 0; + this.field1763 = 0; } } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-1772742303" + descriptor = "(Luj;I)V", + garbageValue = "1081544822" ) @Export("decode") void decode(Buffer var1) { @@ -262,8 +266,8 @@ void decode(Buffer var1) { @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "215649893" + descriptor = "(Luj;IS)V", + garbageValue = "321" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -306,7 +310,7 @@ void decodeNext(Buffer var1, int var2) { this.femaleModel1 = var1.readUnsignedShort(); } else if (var2 == 25) { this.maleHeadModel = var1.readUnsignedShort(); - this.field1777 = var1.readUnsignedByte(); + this.field1724 = var1.readUnsignedByte(); } else if (var2 == 26) { this.maleHeadModel2 = var1.readUnsignedShort(); } else if (var2 == 27) { @@ -344,7 +348,7 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 65) { this.isTradable = true; } else if (var2 == 75) { - this.field1817 = var1.readShort(); + this.field1763 = var1.readShort(); } else if (var2 == 78) { this.femaleModel2 = var1.readUnsignedShort(); } else if (var2 == 79) { @@ -352,11 +356,11 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 90) { this.femaleHeadModel2 = var1.readUnsignedShort(); } else if (var2 == 91) { - this.field1788 = var1.readUnsignedShort(); + this.field1722 = var1.readUnsignedShort(); } else if (var2 == 92) { - this.field1781 = var1.readUnsignedShort(); + this.field1732 = var1.readUnsignedShort(); } else if (var2 == 93) { - this.field1780 = var1.readUnsignedShort(); + this.field1726 = var1.readUnsignedShort(); } else if (var2 == 94) { var1.readUnsignedShort(); } else if (var2 == 95) { @@ -380,9 +384,9 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 112) { this.resizeZ = var1.readUnsignedShort(); } else if (var2 == 113) { - this.field1811 = var1.readByte(); + this.field1756 = var1.readByte(); } else if (var2 == 114) { - this.field1812 = var1.readByte() * 5; + this.field1759 = var1.readByte() * 5; } else if (var2 == 115) { this.team = var1.readUnsignedByte(); } else if (var2 == 139) { @@ -394,16 +398,16 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = class167.readStringIntParameters(var1, this.params); + this.params = class144.readStringIntParameters(var1, this.params); } } } - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Liy;Liy;B)V", - garbageValue = "-75" + descriptor = "(Lhv;Lhv;I)V", + garbageValue = "672457360" ) @Export("genCert") void genCert(ItemComposition var1, ItemComposition var2) { @@ -424,10 +428,10 @@ void genCert(ItemComposition var1, ItemComposition var2) { this.isStackable = 1; } - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Liy;Liy;I)V", - garbageValue = "2123004115" + descriptor = "(Lhv;Lhv;B)V", + garbageValue = "0" ) @Export("genBought") void genBought(ItemComposition var1, ItemComposition var2) { @@ -455,12 +459,12 @@ void genBought(ItemComposition var1, ItemComposition var2) { this.maleHeadModel2 = var2.maleHeadModel2; this.femaleHeadModel = var2.femaleHeadModel; this.femaleHeadModel2 = var2.femaleHeadModel2; - this.field1781 = var2.field1781; - this.field1788 = var2.field1788; - this.field1780 = var2.field1780; + this.field1732 = var2.field1732; + this.field1722 = var2.field1722; + this.field1726 = var2.field1726; this.team = var2.team; this.groundActions = var2.groundActions; - this.field1817 = var2.field1817; + this.field1763 = var2.field1763; this.inventoryActions = new String[5]; if (var2.inventoryActions != null) { for (int var3 = 0; var3 < 4; ++var3) { @@ -472,10 +476,10 @@ void genBought(ItemComposition var1, ItemComposition var2) { this.price = 0; } - @ObfuscatedName("ab") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Liy;Liy;S)V", - garbageValue = "29021" + descriptor = "(Lhv;Lhv;I)V", + garbageValue = "1710826520" ) @Export("genPlaceholder") void genPlaceholder(ItemComposition var1, ItemComposition var2) { @@ -497,10 +501,10 @@ void genPlaceholder(ItemComposition var1, ItemComposition var2) { this.isTradable = false; } - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IB)Ljw;", - garbageValue = "37" + descriptor = "(II)Lkq;", + garbageValue = "-1456114839" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -519,7 +523,7 @@ public final ModelData getModelData(int var1) { } } - ModelData var4 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, this.model, 0); + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; } else { @@ -543,10 +547,10 @@ public final ModelData getModelData(int var1) { } } - @ObfuscatedName("av") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)Ljn;", - garbageValue = "108" + descriptor = "(II)Lka;", + garbageValue = "1125634368" ) @Export("getModel") public final Model getModel(int var1) { @@ -568,7 +572,7 @@ public final Model getModel(int var1) { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, this.model, 0); + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); if (var6 == null) { return null; } else { @@ -589,7 +593,7 @@ public final Model getModel(int var1) { } } - var5 = var6.toModel(this.field1811 + 64, this.field1812 + 768, -50, -10, -50); + var5 = var6.toModel(this.field1756 + 64, this.field1759 + 768, -50, -10, -50); var5.isSingleTile = true; HealthBarDefinition_cachedSprites.put(var5, (long)this.id); return var5; @@ -597,10 +601,10 @@ public final Model getModel(int var1) { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(II)Liy;", - garbageValue = "587694924" + descriptor = "(II)Lhv;", + garbageValue = "2013624500" ) @Export("getCountObj") public ItemComposition getCountObj(int var1) { @@ -621,12 +625,12 @@ public ItemComposition getCountObj(int var1) { return this; } - @ObfuscatedName("ay") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-274386962" + descriptor = "(IB)Z", + garbageValue = "0" ) - public final boolean method1099(int var1) { + public final boolean method1022(int var1) { int var2 = this.femaleModel; int var3 = this.femaleModel1; int var4 = this.femaleModel2; @@ -640,15 +644,15 @@ public final boolean method1099(int var1) { return true; } else { boolean var5 = true; - if (!class349.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !class349.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !class349.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -656,12 +660,12 @@ public final boolean method1099(int var1) { } } - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IB)Ljw;", - garbageValue = "122" + descriptor = "(IB)Lkq;", + garbageValue = "4" ) - public final ModelData method1100(int var1) { + public final ModelData method1023(int var1) { int var2 = this.femaleModel; int var3 = this.femaleModel1; int var4 = this.femaleModel2; @@ -674,11 +678,11 @@ public final ModelData method1100(int var1) { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, var2, 0); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, var3, 0); + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, var4, 0); + ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); } else { @@ -691,8 +695,8 @@ public final ModelData method1100(int var1) { var5.changeOffset(0, this.femaleOffset, 0); } - if (var1 == 1 && this.field1777 != 0) { - var5.changeOffset(0, this.field1777, 0); + if (var1 == 1 && this.field1724 != 0) { + var5.changeOffset(0, this.field1724, 0); } int var9; @@ -712,28 +716,28 @@ public final ModelData method1100(int var1) { } } - @ObfuscatedName("aj") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1156430655" + garbageValue = "-1904060082" ) - public final boolean method1101(int var1) { + public final boolean method1024(int var1) { int var2 = this.femaleHeadModel2; - int var3 = this.field1781; + int var3 = this.field1732; if (var1 == 1) { - var2 = this.field1788; - var3 = this.field1780; + var2 = this.field1722; + var3 = this.field1726; } if (var2 == -1) { return true; } else { boolean var4 = true; - if (!class349.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !class349.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -741,25 +745,25 @@ public final boolean method1101(int var1) { } } - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IB)Ljw;", - garbageValue = "1" + descriptor = "(II)Lkq;", + garbageValue = "1718936593" ) - public final ModelData method1102(int var1) { + public final ModelData method1025(int var1) { int var2 = this.femaleHeadModel2; - int var3 = this.field1781; + int var3 = this.field1732; if (var1 == 1) { - var2 = this.field1788; - var3 = this.field1780; + var2 = this.field1722; + var3 = this.field1726; } if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, var2, 0); + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(class349.ItemDefinition_modelArchive, var3, 0); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } @@ -781,36 +785,49 @@ public final ModelData method1102(int var1) { } } - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1786847682" + descriptor = "(IIB)I", + garbageValue = "20" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return AttackOption.method607(this.params, var1, var2); + return Player.method478(this.params, var1, var2); } - @ObfuscatedName("ai") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "2" + garbageValue = "88" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class30.method122(this.params, var1, var2); + IterableNodeHashTable var4 = this.params; + String var3; + if (var4 == null) { + var3 = var2; + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = (String)var5.obj; + } + } + + return var3; } - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2124438684" + descriptor = "(B)I", + garbageValue = "1" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { if (this.shiftClickIndex != -1 && this.inventoryActions != null) { if (this.shiftClickIndex >= 0) { - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 970785649 * 1579244945 : -1; + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 1804659871 * -1176948897 : -1; } else { return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } @@ -819,68 +836,58 @@ public int getShiftClickIndex() { } } - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "32" + garbageValue = "-121" ) @Export("hasRecolor") boolean hasRecolor() { return this.recolorTo != null; } - @ObfuscatedName("at") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "1" + garbageValue = "-67" ) @Export("hasRetexture") boolean hasRetexture() { return this.retextureTo != null; } - @ObfuscatedName("ak") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)Z", - garbageValue = "5119" + descriptor = "(ILdt;ZI)I", + garbageValue = "-1566499542" ) - static boolean method1092(String var0) { - if (var0 == null) { - return false; - } else { - try { - new URL(var0); - return true; - } catch (MalformedURLException var2) { - return false; - } - } - } + static int method1031(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + if (var0 == 1800) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapData_0.Widget_unpackTargetMask(class361.getWidgetFlags(var3)); + return 1; + } else if (var0 != 1801) { + if (var0 == 1802) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.dataText; + } - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1262407240" - ) - public static void method1088(int var0, int var1) { - MouseHandler.method177(var0, var1, 0, 0); - class319.field2789.clear(); - class319.field2798.clear(); - if (class319.musicSongs.isEmpty() || var0 == 0 && var1 == 0) { - class74.method426(); + return 1; + } else { + return 2; + } } else { - class319.field2798.add(new DelayFadeTask((SongTask)null, class319.musicPlayerStatus)); - class319.field2798.add(new FadeOutTask((SongTask)null, 0, false, class319.field2794)); - ArrayList var3 = new ArrayList(); - Iterator var4 = class319.musicSongs.iterator(); - - while (var4.hasNext()) { - MusicSong var5 = (MusicSong)var4.next(); - var3.add(var5); + int var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; } - class319.field2798.add(new class416((SongTask)null, var3)); + return 1; } - } } \ No newline at end of file diff --git a/osrs/src/main/java/ItemContainer.java b/osrs/src/main/java/ItemContainer.java index a245f1d4b..2fd9c0c91 100644 --- a/osrs/src/main/java/ItemContainer.java +++ b/osrs/src/main/java/ItemContainer.java @@ -3,19 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +@ObfuscatedName("du") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Ltw;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("al") + @ObfuscatedName("tz") + @ObfuscatedSignature( + descriptor = "Lgn;" + ) + @Export("guestClanChannel") + static ClanChannel guestClanChannel; + @ObfuscatedName("ah") @Export("ids") int[] ids; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("quantities") int[] quantities; @@ -27,20 +33,4 @@ public class ItemContainer extends Node { this.ids = new int[]{-1}; this.quantities = new int[]{0}; } - - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "(Ltr;I)Ljava/lang/Object;", - garbageValue = "1234966456" - ) - static Object method460(class517 var0) { - switch(var0.field4133) { - case 0: - return Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - case 2: - return Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - default: - throw new IllegalStateException("popValueOfType() failure - unsupported type"); - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/ItemLayer.java b/osrs/src/main/java/ItemLayer.java index d4a98e803..4045277cd 100644 --- a/osrs/src/main/java/ItemLayer.java +++ b/osrs/src/main/java/ItemLayer.java @@ -3,40 +3,57 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("kj") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("ac") + @ObfuscatedName("ht") + static String field2109; + @ObfuscatedName("jv") + @ObfuscatedSignature( + descriptor = "Lpf;" + ) + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("kr") + @ObfuscatedSignature( + descriptor = "Luz;" + ) + @Export("compass") + static SpritePixels compass; + @ObfuscatedName("mr") + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("at") @Export("z") int z; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("x") int x; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("y") int y; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkt;" ) @Export("first") Renderable first; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkt;" ) @Export("second") Renderable second; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkt;" ) @Export("third") Renderable third; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("tag") long tag; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("height") int height; diff --git a/osrs/src/main/java/IterableDualNodeQueue.java b/osrs/src/main/java/IterableDualNodeQueue.java index 4fd6da562..8c6ef12cf 100644 --- a/osrs/src/main/java/IterableDualNodeQueue.java +++ b/osrs/src/main/java/IterableDualNodeQueue.java @@ -5,18 +5,18 @@ import java.util.Iterator; -@ObfuscatedName("pt") +@ObfuscatedName("po") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsn;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsn;" ) @Export("head") DualNode head; @@ -27,7 +27,7 @@ public IterableDualNodeQueue() { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { @@ -36,9 +36,9 @@ public void clear() { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lsb;)V" + descriptor = "(Lsn;)V" ) @Export("add") public void add(DualNode var1) { @@ -52,9 +52,9 @@ public void add(DualNode var1) { var1.previousDual.nextDual = var1; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsn;" ) @Export("removeLast") public DualNode removeLast() { @@ -67,18 +67,18 @@ public DualNode removeLast() { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsn;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lsb;)Lsb;" + descriptor = "(Lsn;)Lsn;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -98,9 +98,9 @@ DualNode previousOrLast(DualNode var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "()Lsb;" + descriptor = "()Lsn;" ) @Export("previous") public DualNode previous() { @@ -120,9 +120,9 @@ public Iterator iterator() { return new IterableDualNodeQueueIterator(this); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lsb;Lsb;)V" + descriptor = "(Lsn;Lsn;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { diff --git a/osrs/src/main/java/IterableDualNodeQueueIterator.java b/osrs/src/main/java/IterableDualNodeQueueIterator.java index 5fc343073..38035f5d6 100644 --- a/osrs/src/main/java/IterableDualNodeQueueIterator.java +++ b/osrs/src/main/java/IterableDualNodeQueueIterator.java @@ -5,30 +5,30 @@ import java.util.Iterator; -@ObfuscatedName("ps") +@ObfuscatedName("ph") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "Lpo;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsn;" ) @Export("head") DualNode head; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lsb;" + descriptor = "Lsn;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Lpt;)V" + descriptor = "(Lpo;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; diff --git a/osrs/src/main/java/IterableNodeDeque.java b/osrs/src/main/java/IterableNodeDeque.java index 47c157842..fcdae3cba 100644 --- a/osrs/src/main/java/IterableNodeDeque.java +++ b/osrs/src/main/java/IterableNodeDeque.java @@ -6,18 +6,18 @@ import java.util.Collection; import java.util.Iterator; -@ObfuscatedName("py") +@ObfuscatedName("pm") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) Node field3674; @@ -27,7 +27,7 @@ public IterableNodeDeque() { this.sentinel.next = this.sentinel; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { @@ -36,9 +36,9 @@ public void rsClear() { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lsj;)V" + descriptor = "(Lsh;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -52,9 +52,9 @@ public void addFirst(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lsj;)V" + descriptor = "(Lsh;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -68,20 +68,20 @@ public void addLast(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("last") public Node last() { - return this.method2036((Node)null); + return this.method2024((Node)null); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lsj;)Lsj;" + descriptor = "(Lsh;)Lsh;" ) - Node method2036(Node var1) { + Node method2024(Node var1) { Node var2; if (var1 == null) { var2 = this.sentinel.previous; @@ -98,9 +98,9 @@ Node method2036(Node var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("previous") public Node previous() { @@ -114,8 +114,8 @@ public Node previous() { } } - @ObfuscatedName("ab") - int method2038() { + @ObfuscatedName("ac") + int method2026() { int var1 = 0; for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { @@ -125,17 +125,17 @@ int method2038() { return var1; } - @ObfuscatedName("am") - public boolean method2039() { + @ObfuscatedName("al") + public boolean method2027() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "()[Lsj;" + descriptor = "()[Lsh;" ) - Node[] method2040() { - Node[] var1 = new Node[this.method2038()]; + Node[] method2028() { + Node[] var1 = new Node[this.method2026()]; int var2 = 0; for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { @@ -145,11 +145,11 @@ Node[] method2040() { return var1; } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lsj;)Z" + descriptor = "(Lsh;)Z" ) - boolean method2041(Node var1) { + boolean method2029(Node var1) { this.addFirst(var1); return true; } @@ -163,13 +163,13 @@ public Iterator iterator() { @Export("size") @ObfuscatedName("size") public int size() { - return this.method2038(); + return this.method2026(); } @Export("isEmpty") @ObfuscatedName("isEmpty") public boolean isEmpty() { - return this.method2039(); + return this.method2027(); } public boolean contains(Object var1) { @@ -179,7 +179,7 @@ public boolean contains(Object var1) { @Export("toArray") @ObfuscatedName("toArray") public Object[] toArray() { - return this.method2040(); + return this.method2028(); } @Export("toArray") @@ -223,7 +223,7 @@ public void clear() { @Export("add") @ObfuscatedName("add") public boolean add(Object var1) { - return this.method2041((Node)var1); + return this.method2029((Node)var1); } @Export("equals") @@ -238,9 +238,9 @@ public int hashCode() { return super.hashCode(); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lsj;Lsj;)V" + descriptor = "(Lsh;Lsh;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { diff --git a/osrs/src/main/java/IterableNodeDequeDescendingIterator.java b/osrs/src/main/java/IterableNodeDequeDescendingIterator.java index c13a2e977..b5ddff754 100644 --- a/osrs/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/osrs/src/main/java/IterableNodeDequeDescendingIterator.java @@ -5,38 +5,38 @@ import java.util.Iterator; -@ObfuscatedName("pj") +@ObfuscatedName("pk") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lpm;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) Node field3672; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lpy;)V" + descriptor = "(Lpm;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; this.setDeque(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lpy;)V" + descriptor = "(Lpm;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -44,7 +44,7 @@ void setDeque(IterableNodeDeque var1) { this.start(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("start") void start() { this.field3672 = this.deque != null ? this.deque.sentinel.previous : null; diff --git a/osrs/src/main/java/IterableNodeHashTable.java b/osrs/src/main/java/IterableNodeHashTable.java index f718bee33..f8f5ff85d 100644 --- a/osrs/src/main/java/IterableNodeHashTable.java +++ b/osrs/src/main/java/IterableNodeHashTable.java @@ -5,31 +5,31 @@ import java.util.Iterator; -@ObfuscatedName("tp") +@ObfuscatedName("tz") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("size") int size; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[Lsj;" + descriptor = "[Lsh;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("current") Node current; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("index") int index; @@ -46,9 +46,9 @@ public IterableNodeHashTable(int var1) { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(J)Lsj;" + descriptor = "(J)Lsh;" ) @Export("get") public Node get(long var1) { @@ -66,9 +66,9 @@ public Node get(long var1) { return null; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lsj;J)V" + descriptor = "(Lsh;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -84,7 +84,7 @@ public void put(Node var1, long var2) { var1.key = var2; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { @@ -104,9 +104,9 @@ public void clear() { this.current = null; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("first") public Node first() { @@ -114,9 +114,9 @@ public Node first() { return this.next(); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("next") public Node next() { diff --git a/osrs/src/main/java/IterableNodeHashTableIterator.java b/osrs/src/main/java/IterableNodeHashTableIterator.java index 45a14d707..075c49ebc 100644 --- a/osrs/src/main/java/IterableNodeHashTableIterator.java +++ b/osrs/src/main/java/IterableNodeHashTableIterator.java @@ -5,33 +5,33 @@ import java.util.Iterator; -@ObfuscatedName("tm") +@ObfuscatedName("tp") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Ltz;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("head") Node head; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("index") int index; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Ltp;)V" + descriptor = "(Ltz;)V" ) public IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; @@ -39,7 +39,7 @@ public IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.start(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; @@ -47,11 +47,11 @@ void start() { this.last = null; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) - public Node method2484() { + public Node method2461() { this.start(); return (Node)this.next(); } diff --git a/osrs/src/main/java/JSException.java b/osrs/src/main/java/JSException.java deleted file mode 100644 index fa730d487..000000000 --- a/osrs/src/main/java/JSException.java +++ /dev/null @@ -1,36 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pq") -@Implements("netscape/js/JSException") -public class JSException extends RuntimeException { - @ObfuscatedName("kl") - @ObfuscatedSignature( - descriptor = "Lud;" - ) - @Export("compass") - static SpritePixels compass; - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)[Llq;", - garbageValue = "1413170050" - ) - public static ZoneOperation[] method2055() { - return new ZoneOperation[]{ZoneOperation.LOC_ADD_CHANGE, - ZoneOperation.LOC_ANIM, - ZoneOperation.LOC_DEL, - ZoneOperation.OBJ_DEL, - ZoneOperation.field2624, - ZoneOperation.OBJ_COUNT, - ZoneOperation.PREFETCH_GAMEOBJECTS, - ZoneOperation.field2617, - ZoneOperation.field2623, - ZoneOperation.OBJ_ADD, - ZoneOperation.field2619, - ZoneOperation.AREA_SOUND, - ZoneOperation.MAPPROJ_ANIM}; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/JagNetThread.java b/osrs/src/main/java/JagNetThread.java index 0f8112111..d59ce093d 100644 --- a/osrs/src/main/java/JagNetThread.java +++ b/osrs/src/main/java/JagNetThread.java @@ -5,165 +5,165 @@ import java.io.IOException; import java.util.zip.CRC32; -@ObfuscatedName("oo") +@ObfuscatedName("oz") @Implements("JagNetThread") public class JagNetThread { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lre;" - ) - AbstractSocket field3598; - @ObfuscatedName("al") - int field3586; - @ObfuscatedName("ak") - long field3594; - @ObfuscatedName("ax") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Lro;" ) - NodeHashTable field3602; - @ObfuscatedName("ao") - int field3588; + AbstractSocket field3597; @ObfuscatedName("ah") + int field3587; + @ObfuscatedName("ar") + long field3593; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Ltw;" ) - NodeHashTable field3600; - @ObfuscatedName("ar") - int field3590; + NodeHashTable field3599; @ObfuscatedName("ab") + int field3585; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lpl;" + descriptor = "Ltw;" ) - DualNodeDeque field3597; - @ObfuscatedName("am") + NodeHashTable field3601; + @ObfuscatedName("aa") + int field3584; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Lod;" ) - NodeHashTable field3601; - @ObfuscatedName("av") - int field3591; - @ObfuscatedName("ag") + DualNodeDeque field3594; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Ltw;" ) - NodeHashTable field3599; - @ObfuscatedName("aa") - int field3585; + NodeHashTable field3598; + @ObfuscatedName("az") + int field3591; @ObfuscatedName("ap") - boolean field3583; - @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lou;" + descriptor = "Ltw;" ) - class372 field3596; + NodeHashTable field3600; + @ObfuscatedName("av") + int field3590; + @ObfuscatedName("ax") + boolean field3582; @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lul;" + descriptor = "Loy;" ) - Buffer field3605; - @ObfuscatedName("aj") + class369 field3596; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lul;" + descriptor = "Luj;" ) Buffer field3604; - @ObfuscatedName("an") - int field3587; - @ObfuscatedName("ai") - CRC32 field3593; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lul;" + descriptor = "Luj;" ) Buffer field3603; + @ObfuscatedName("aj") + int field3588; + @ObfuscatedName("aq") + CRC32 field3592; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Luj;" + ) + Buffer field3602; @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "[Lok;" + descriptor = "[Loh;" ) Archive[] field3595; - @ObfuscatedName("aq") + @ObfuscatedName("ae") + int field3586; + @ObfuscatedName("an") int field3589; - @ObfuscatedName("az") - int field3592; - @ObfuscatedName("at") - byte field3584; - @ObfuscatedName("af") - public int field3607; + @ObfuscatedName("ag") + byte field3583; @ObfuscatedName("ad") + public int field3605; + @ObfuscatedName("af") public int field3606; public JagNetThread() { - this.field3586 = 0; - this.field3602 = new NodeHashTable(4096); - this.field3588 = 0; - this.field3600 = new NodeHashTable(32); - this.field3590 = 0; - this.field3597 = new DualNodeDeque(); - this.field3601 = new NodeHashTable(4096); - this.field3591 = 0; + this.field3587 = 0; this.field3599 = new NodeHashTable(4096); this.field3585 = 0; - this.field3605 = new Buffer(8); - this.field3587 = 0; - this.field3593 = new CRC32(); - this.field3595 = new Archive[256]; - this.field3589 = -1; - this.field3592 = 255; + this.field3601 = new NodeHashTable(32); this.field3584 = 0; - this.field3607 = 0; + this.field3594 = new DualNodeDeque(); + this.field3598 = new NodeHashTable(4096); + this.field3591 = 0; + this.field3600 = new NodeHashTable(4096); + this.field3590 = 0; + this.field3604 = new Buffer(8); + this.field3588 = 0; + this.field3592 = new CRC32(); + this.field3595 = new Archive[256]; + this.field3586 = -1; + this.field3589 = 255; + this.field3583 = 0; + this.field3605 = 0; this.field3606 = 0; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "877525740" + descriptor = "(B)Z", + garbageValue = "-63" ) - public boolean method1960() { - long var1 = GrandExchangeOfferTotalQuantityComparator.method1971(); - int var3 = (int)(var1 - this.field3594); - this.field3594 = var1; + public boolean method1953() { + long var1 = SpotAnimationDefinition.method962(); + int var3 = (int)(var1 - this.field3593); + this.field3593 = var1; if (var3 > 200) { var3 = 200; } - this.field3586 += var3; - if (this.field3585 == 0 && this.field3590 == 0 && this.field3591 == 0 && this.field3588 == 0) { + this.field3587 += var3; + if (this.field3590 == 0 && this.field3584 == 0 && this.field3591 == 0 && this.field3585 == 0) { return true; - } else if (this.field3598 == null) { + } else if (this.field3597 == null) { return false; } else { try { - if (this.field3586 > 30000) { + if (this.field3587 > 30000) { throw new IOException(); } else { - class372 var4; + class369 var4; Buffer var5; - while (this.field3590 < 200 && this.field3588 > 0) { - var4 = (class372)this.field3602.first(); + while (this.field3584 < 200 && this.field3585 > 0) { + var4 = (class369)this.field3599.first(); var5 = new Buffer(4); var5.writeByte(1); var5.writeMedium((int)var4.key); - this.field3598.write(var5.array, 0, 4); - this.field3600.put(var4, var4.key); - --this.field3588; - ++this.field3590; + this.field3597.write(var5.array, 0, 4); + this.field3601.put(var4, var4.key); + --this.field3585; + ++this.field3584; } - while (this.field3585 < 200 && this.field3591 > 0) { - var4 = (class372)this.field3597.removeLast(); + while (this.field3590 < 200 && this.field3591 > 0) { + var4 = (class369)this.field3594.removeLast(); var5 = new Buffer(4); var5.writeByte(0); var5.writeMedium((int)var4.key); - this.field3598.write(var5.array, 0, 4); + this.field3597.write(var5.array, 0, 4); var4.removeDual(); - this.field3599.put(var4, var4.key); + this.field3600.put(var4, var4.key); --this.field3591; - ++this.field3585; + ++this.field3590; } for (int var16 = 0; var16 < 100; ++var16) { - int var17 = this.field3598.available(); + int var17 = this.field3597.available(); if (var17 < 0) { throw new IOException(); } @@ -172,11 +172,11 @@ public boolean method1960() { break; } - this.field3586 = 0; + this.field3587 = 0; byte var6 = 0; if (this.field3596 == null) { var6 = 8; - } else if (this.field3587 == 0) { + } else if (this.field3588 == 0) { var6 = 1; } @@ -187,38 +187,38 @@ public boolean method1960() { int var10001; Buffer var22; if (var6 > 0) { - var7 = var6 - this.field3605.offset; + var7 = var6 - this.field3604.offset; if (var7 > var17) { var7 = var17; } - this.field3598.read(this.field3605.array, this.field3605.offset, var7); - if (this.field3584 != 0) { + this.field3597.read(this.field3604.array, this.field3604.offset, var7); + if (this.field3583 != 0) { for (var8 = 0; var8 < var7; ++var8) { - var10000 = this.field3605.array; - var10001 = var8 + this.field3605.offset; - var10000[var10001] ^= this.field3584; + var10000 = this.field3604.array; + var10001 = var8 + this.field3604.offset; + var10000[var10001] ^= this.field3583; } } - var22 = this.field3605; + var22 = this.field3604; var22.offset += var7; - if (this.field3605.offset < var6) { + if (this.field3604.offset < var6) { break; } if (this.field3596 == null) { - this.field3605.offset = 0; - var8 = this.field3605.readUnsignedByte(); - var9 = this.field3605.readUnsignedShort(); - int var10 = this.field3605.readUnsignedByte(); - int var11 = this.field3605.readInt(); + this.field3604.offset = 0; + var8 = this.field3604.readUnsignedByte(); + var9 = this.field3604.readUnsignedShort(); + int var10 = this.field3604.readUnsignedByte(); + int var11 = this.field3604.readInt(); long var12 = (long)(var9 + (var8 << 16)); - class372 var14 = (class372)this.field3600.get(var12); - this.field3583 = true; + class369 var14 = (class369)this.field3601.get(var12); + this.field3582 = true; if (var14 == null) { - var14 = (class372)this.field3599.get(var12); - this.field3583 = false; + var14 = (class369)this.field3600.get(var12); + this.field3582 = false; } if (var14 == null) { @@ -227,89 +227,89 @@ public boolean method1960() { int var15 = var10 == 0 ? 5 : 9; this.field3596 = var14; - this.field3604 = new Buffer(this.field3596.field3563 + var15 + var11); - this.field3604.writeByte(var10); - this.field3604.writeInt(var11); - this.field3587 = 8; - this.field3605.offset = 0; - } else if (this.field3587 == 0) { - if (this.field3605.array[0] == -1) { - this.field3587 = 1; - this.field3605.offset = 0; + this.field3603 = new Buffer(this.field3596.field3562 + var11 + var15); + this.field3603.writeByte(var10); + this.field3603.writeInt(var11); + this.field3588 = 8; + this.field3604.offset = 0; + } else if (this.field3588 == 0) { + if (this.field3604.array[0] == -1) { + this.field3588 = 1; + this.field3604.offset = 0; } else { this.field3596 = null; } } } else { - var7 = this.field3604.array.length - this.field3596.field3563; - var8 = 512 - this.field3587; - if (var8 > var7 - this.field3604.offset) { - var8 = var7 - this.field3604.offset; + var7 = this.field3603.array.length - this.field3596.field3562; + var8 = 512 - this.field3588; + if (var8 > var7 - this.field3603.offset) { + var8 = var7 - this.field3603.offset; } if (var8 > var17) { var8 = var17; } - this.field3598.read(this.field3604.array, this.field3604.offset, var8); - if (this.field3584 != 0) { + this.field3597.read(this.field3603.array, this.field3603.offset, var8); + if (this.field3583 != 0) { for (var9 = 0; var9 < var8; ++var9) { - var10000 = this.field3604.array; - var10001 = var9 + this.field3604.offset; - var10000[var10001] ^= this.field3584; + var10000 = this.field3603.array; + var10001 = this.field3603.offset + var9; + var10000[var10001] ^= this.field3583; } } - var22 = this.field3604; + var22 = this.field3603; var22.offset += var8; - this.field3587 += var8; - if (this.field3604.offset == var7) { - if (16711935L == this.field3596.key) { - this.field3603 = this.field3604; + this.field3588 += var8; + if (this.field3603.offset == var7) { + if (this.field3596.key == 16711935L) { + this.field3602 = this.field3603; for (var9 = 0; var9 < 256; ++var9) { Archive var18 = this.field3595[var9]; if (var18 != null) { - this.method1964(var18, var9); + this.method1957(var18, var9); } } } else { - this.field3593.reset(); - this.field3593.update(this.field3604.array, 0, var7); - var9 = (int)this.field3593.getValue(); - if (this.field3596.field3564 != var9) { + this.field3592.reset(); + this.field3592.update(this.field3603.array, 0, var7); + var9 = (int)this.field3592.getValue(); + if (this.field3596.field3563 != var9) { try { - this.field3598.close(); + this.field3597.close(); } catch (Exception var20) { } - ++this.field3607; - this.field3598 = null; - this.field3584 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + ++this.field3605; + this.field3597 = null; + this.field3583 = (byte)((int)(Math.random() * 255.0D + 1.0D)); return false; } - this.field3607 = 0; + this.field3605 = 0; this.field3606 = 0; - this.field3596.field3565.write((int)(this.field3596.key & 65535L), this.field3604.array, (this.field3596.key & 16711680L) == 16711680L, this.field3583); + this.field3596.field3564.write((int)(this.field3596.key & 65535L), this.field3603.array, (this.field3596.key & 16711680L) == 16711680L, this.field3582); } this.field3596.remove(); - if (this.field3583) { - --this.field3590; + if (this.field3582) { + --this.field3584; } else { - --this.field3585; + --this.field3590; } - this.field3587 = 0; + this.field3588 = 0; this.field3596 = null; - this.field3604 = null; + this.field3603 = null; } else { - if (this.field3587 != 512) { + if (this.field3588 != 512) { break; } - this.field3587 = 0; + this.field3588 = 0; } } } @@ -318,196 +318,196 @@ public boolean method1960() { } } catch (IOException var21) { try { - this.field3598.close(); + this.field3597.close(); } catch (Exception var19) { } ++this.field3606; - this.field3598 = null; + this.field3597 = null; return false; } } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "1" + descriptor = "(ZI)V", + garbageValue = "-438812293" ) - public void method1961(boolean var1) { - if (this.field3598 != null) { + public void method1954(boolean var1) { + if (this.field3597 != null) { try { Buffer var2 = new Buffer(4); var2.writeByte(var1 ? 2 : 3); var2.writeMedium(0); - this.field3598.write(var2.array, 0, 4); + this.field3597.write(var2.array, 0, 4); } catch (IOException var5) { try { - this.field3598.close(); + this.field3597.close(); } catch (Exception var4) { } ++this.field3606; - this.field3598 = null; + this.field3597 = null; } } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lre;ZB)V", - garbageValue = "-76" + descriptor = "(Lro;ZI)V", + garbageValue = "1047063145" ) - public void method1962(AbstractSocket var1, boolean var2) { - if (this.field3598 != null) { + public void method1955(AbstractSocket var1, boolean var2) { + if (this.field3597 != null) { try { - this.field3598.close(); + this.field3597.close(); } catch (Exception var7) { } - this.field3598 = null; + this.field3597 = null; } - this.field3598 = var1; - this.method1961(var2); - this.field3605.offset = 0; + this.field3597 = var1; + this.method1954(var2); + this.field3604.offset = 0; this.field3596 = null; - this.field3604 = null; - this.field3587 = 0; + this.field3603 = null; + this.field3588 = 0; while (true) { - class372 var3 = (class372)this.field3600.first(); + class369 var3 = (class369)this.field3601.first(); if (var3 == null) { while (true) { - var3 = (class372)this.field3599.first(); + var3 = (class369)this.field3600.first(); if (var3 == null) { - if (this.field3584 != 0) { + if (this.field3583 != 0) { try { Buffer var8 = new Buffer(4); var8.writeByte(4); - var8.writeByte(this.field3584); + var8.writeByte(this.field3583); var8.writeShort(0); - this.field3598.write(var8.array, 0, 4); + this.field3597.write(var8.array, 0, 4); } catch (IOException var6) { try { - this.field3598.close(); + this.field3597.close(); } catch (Exception var5) { } ++this.field3606; - this.field3598 = null; + this.field3597 = null; } } - this.field3586 = 0; - this.field3594 = GrandExchangeOfferTotalQuantityComparator.method1971(); + this.field3587 = 0; + this.field3593 = SpotAnimationDefinition.method962(); return; } - this.field3597.method2016(var3); - this.field3601.put(var3, var3.key); + this.field3594.method2004(var3); + this.field3598.put(var3, var3.key); ++this.field3591; - --this.field3585; + --this.field3590; } } - this.field3602.put(var3, var3.key); - ++this.field3588; - --this.field3590; + this.field3599.put(var3, var3.key); + ++this.field3585; + --this.field3584; } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lok;II)V", - garbageValue = "-699589985" + descriptor = "(Loh;II)V", + garbageValue = "-1796726180" ) - void method1963(Archive var1, int var2) { - if (var1.field3549 && !var1.field3550) { - if (var2 <= this.field3589) { + void method1956(Archive var1, int var2) { + if (var1.field3547 && !var1.field3546) { + if (var2 <= this.field3586) { throw new RuntimeException(""); } - if (var2 < this.field3592) { - this.field3592 = var2; + if (var2 < this.field3589) { + this.field3589 = var2; } } else { - if (var2 >= this.field3592) { + if (var2 >= this.field3589) { throw new RuntimeException(""); } - if (var2 > this.field3589) { - this.field3589 = var2; + if (var2 > this.field3586) { + this.field3586 = var2; } } - if (this.field3603 != null) { - this.method1964(var1, var2); + if (this.field3602 != null) { + this.method1957(var1, var2); } else { - this.method1965((Archive)null, 255, 255, 0, (byte)0, true); + this.method1958((Archive)null, 255, 255, 0, (byte)0, true); this.field3595[var2] = var1; } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lok;II)V", - garbageValue = "-1352429107" + descriptor = "(Loh;IB)V", + garbageValue = "-34" ) - void method1964(Archive var1, int var2) { - this.field3603.offset = var2 * 8 + 5; - if (this.field3603.offset >= this.field3603.array.length) { - if (var1.field3549) { - var1.method1919(); + void method1957(Archive var1, int var2) { + this.field3602.offset = var2 * 8 + 5; + if (this.field3602.offset >= this.field3602.array.length) { + if (var1.field3547) { + var1.method1916(); } else { throw new RuntimeException(""); } } else { - int var3 = this.field3603.readInt(); - int var4 = this.field3603.readInt(); + int var3 = this.field3602.readInt(); + int var4 = this.field3602.readInt(); var1.loadIndex(var3, var4); } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lok;IIIBZI)V", - garbageValue = "-1546984161" + descriptor = "(Loh;IIIBZB)V", + garbageValue = "71" ) - void method1965(Archive var1, int var2, int var3, int var4, byte var5, boolean var6) { + void method1958(Archive var1, int var2, int var3, int var4, byte var5, boolean var6) { long var7 = (long)(var3 + (var2 << 16)); - class372 var9 = (class372)this.field3602.get(var7); + class369 var9 = (class369)this.field3599.get(var7); if (var9 == null) { - var9 = (class372)this.field3600.get(var7); + var9 = (class369)this.field3601.get(var7); if (var9 == null) { - var9 = (class372)this.field3601.get(var7); + var9 = (class369)this.field3598.get(var7); if (var9 != null) { if (var6) { var9.removeDual(); - this.field3602.put(var9, var7); + this.field3599.put(var9, var7); --this.field3591; - ++this.field3588; + ++this.field3585; } } else { if (!var6) { - var9 = (class372)this.field3599.get(var7); + var9 = (class369)this.field3600.get(var7); if (var9 != null) { return; } } - var9 = new class372(); - var9.field3565 = var1; - var9.field3564 = var4; - var9.field3563 = var5; + var9 = new class369(); + var9.field3564 = var1; + var9.field3563 = var4; + var9.field3562 = var5; if (var6) { - this.field3602.put(var9, var7); - ++this.field3588; + this.field3599.put(var9, var7); + ++this.field3585; } else { - this.field3597.method2015(var9); - this.field3601.put(var9, var7); + this.field3594.method2003(var9); + this.field3598.put(var9, var7); ++this.field3591; } @@ -516,48 +516,48 @@ void method1965(Archive var1, int var2, int var3, int var4, byte var5, boolean v } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "223399065" + garbageValue = "880980368" ) - void method1966(int var1, int var2) { + void method1959(int var1, int var2) { long var3 = (long)((var1 << 16) + var2); - class372 var5 = (class372)this.field3601.get(var3); + class369 var5 = (class369)this.field3598.get(var3); if (var5 != null) { - this.field3597.method2016(var5); + this.field3594.method2004(var5); } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "823173998" + garbageValue = "480276269" ) - int method1967(int var1, int var2) { + int method1960(int var1, int var2) { long var3 = (long)((var1 << 16) + var2); - return this.field3596 != null && var3 == this.field3596.key ? this.field3604.offset * 99 / (this.field3604.array.length - this.field3596.field3563) + 1 : 0; + return this.field3596 != null && this.field3596.key == var3 ? this.field3603.offset * 99 / (this.field3603.array.length - this.field3596.field3562) + 1 : 0; } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(ZZB)I", - garbageValue = "-84" + garbageValue = "-122" ) - public int method1968(boolean var1, boolean var2) { + public int method1961(boolean var1, boolean var2) { byte var3 = 0; - int var4 = var3 + this.field3590 + this.field3588; + int var4 = var3 + this.field3585 + this.field3584; return var4; } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "45" + descriptor = "(I)V", + garbageValue = "-1516647272" ) - public void method1969() { - if (this.field3598 != null) { - this.field3598.close(); + public void method1962() { + if (this.field3597 != null) { + this.field3597.close(); } } diff --git a/osrs/src/main/java/JagexCache.java b/osrs/src/main/java/JagexCache.java index 6a712a459..f4514520d 100644 --- a/osrs/src/main/java/JagexCache.java +++ b/osrs/src/main/java/JagexCache.java @@ -4,36 +4,33 @@ import net.runelite.mapping.ObfuscatedSignature; import java.io.File; -import java.util.Iterator; -@ObfuscatedName("gv") +@ObfuscatedName("if") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("ax") - static File field1451; - @ObfuscatedName("aa") + @ObfuscatedName("ao") + static File field1848; + @ObfuscatedName("ab") + @Export("cacheDir") + static File cacheDir; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Ltl;" + descriptor = "Ltr;" ) @Export("JagexCache_randomDat") - static BufferedFile JagexCache_randomDat; - @ObfuscatedName("ap") + public static BufferedFile JagexCache_randomDat; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Ltl;" + descriptor = "Ltr;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Ltl;" + descriptor = "Ltr;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("pl") - @Export("selectedSpellWidget" ) - static int selectedSpellWidget; - @ObfuscatedName("vz") - static int field1450; static { JagexCache_randomDat = null; @@ -41,124 +38,49 @@ public class JagexCache { JagexCache_idx255File = null; } - @ObfuscatedName("it") + @ObfuscatedName("lu") @ObfuscatedSignature( - descriptor = "(Ldi;I)V", - garbageValue = "-1922065040" + descriptor = "(Lnn;IIB)V", + garbageValue = "80" ) - static final void method918(Actor var0) { - boolean var1 = var0.exactMoveArrive1Cycle == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0; - if (!var1) { - SequenceDefinition var2 = class36.SequenceDefinition_get(var0.sequence); - if (var2 != null && !var2.isCachedModelIdSet()) { - var1 = var0.sequenceFrameCycle + 1 > var2.frameLengths[var0.sequenceFrame]; - } else { - var1 = true; - } + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { + var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); } - if (var1) { - int var8 = var0.exactMoveArrive1Cycle - var0.spotAnimation; - int var3 = Client.cycle - var0.spotAnimation; - int var4 = var0.field971 * 64 + var0.field1016 * 128; - int var5 = var0.field971 * 64 + var0.field1013 * 128; - int var6 = var0.field971 * 64 + var0.field1021 * 128; - int var7 = var0.field971 * 64 + var0.field1010 * 128; - var0.x = (var3 * var6 + var4 * (var8 - var3)) / var8; - var0.y = (var3 * var7 + var5 * (var8 - var3)) / var8; + if (var0.yAlignment == 0) { + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; + } else if (var0.yAlignment == 4) { + var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); } - var0.field1024 = 0; - var0.orientation = var0.exactMoveDirection; - var0.rotation = var0.orientation; } - @ObfuscatedName("lp") + @ObfuscatedName("nw") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "1000434204" + descriptor = "(I)V", + garbageValue = "-1344105044" ) - static final void method919(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; - int var7 = var3 - var1; - int var8 = var6 >= 0 ? var6 : -var6; - int var9 = var7 >= 0 ? var7 : -var7; - int var10 = var8; - if (var8 < var9) { - var10 = var9; - } - - if (var10 != 0) { - int var11 = (var6 << 16) / var10; - int var12 = (var7 << 16) / var10; - if (var12 <= var11) { - var11 = -var11; - } else { - var12 = -var12; - } - - int var13 = var5 * var12 >> 17; - int var14 = var5 * var12 + 1 >> 17; - int var15 = var5 * var11 >> 17; - int var16 = var5 * var11 + 1 >> 17; - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; - int var17 = var0 + var13; - int var18 = var0 - var14; - int var19 = var0 + var6 - var14; - int var20 = var0 + var6 + var13; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var7 + var15 + var1; - Rasterizer3D.method1252(var17, var18, var19); - Rasterizer3D.method1254(var21, var22, var23, var17, var18, var19, 0.0F, 0.0F, 0.0F, var4); - Rasterizer3D.method1252(var17, var19, var20); - Rasterizer3D.method1254(var21, var23, var24, var17, var19, var20, 0.0F, 0.0F, 0.0F, var4); - } - } - - @ObfuscatedName("mg") - static final void method920(double var0) { - Rasterizer3D.method1236(var0); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(var0); - ItemComposition.ItemDefinition_cachedSprites.clear(); - class91.clientPreferences.setBrightness(var0); - } - - @ObfuscatedName("nt") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-10864" - ) - static final void method921(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); - if (var0 != class91.clientPreferences.getCurrentMusicVolume()) { - if (class91.clientPreferences.getCurrentMusicVolume() == 0 && ScriptFrame.method334()) { - VarcInt.method975(CollisionMap.archive6, var0); - Client.playingJingle = false; - } else if (var0 == 0) { - ItemComposition.method1088(0, 0); - Client.playingJingle = false; - } else if (!class319.musicSongs.isEmpty()) { - Iterator var1 = class319.musicSongs.iterator(); - - while (var1.hasNext()) { - MusicSong var2 = (MusicSong)var1.next(); - if (var2 != null) { - var2.musicTrackVolume = var0; - } - } - - MusicSong var3 = (MusicSong)class319.musicSongs.get(0); - if (var3 != null && var3.midiPcmStream != null && var3.midiPcmStream.isReady() && !var3.field2886) { - var3.midiPcmStream.setPcmStreamVolume(var0); - var3.field2888 = (float)var0; - } - } - - class91.clientPreferences.setCurrentMusicVolume(var0); - } - + static final void method1088() { + Client.field524 = Client.cycleCntr; } } \ No newline at end of file diff --git a/osrs/src/main/java/KeyHandler.java b/osrs/src/main/java/KeyHandler.java index 6ba143ca2..3d9a34283 100644 --- a/osrs/src/main/java/KeyHandler.java +++ b/osrs/src/main/java/KeyHandler.java @@ -12,135 +12,133 @@ import java.util.Collection; import java.util.Iterator; -@ObfuscatedName("ad") +@ObfuscatedName("af") @Implements("KeyHandler") public class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("bf") - @Export("hasFocus") - protected static boolean hasFocus; - @ObfuscatedName("al") - Collection field72; - @ObfuscatedName("ak") - Collection field71; - @ObfuscatedName("ax") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "[Lbd;" + descriptor = "[Ltr;" ) - class29[] field69; + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("ah") + Collection field77; + @ObfuscatedName("ar") + Collection field78; @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "[Lbi;" + ) + class29[] field75; + @ObfuscatedName("ab") @Export("KeyHandler_pressedKeys") boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("KeyHandler_idleCycles") volatile int KeyHandler_idleCycles; KeyHandler() { - this.field69 = new class29[3]; + this.field75 = new class29[3]; this.KeyHandler_pressedKeys = new boolean[112]; this.KeyHandler_idleCycles = 0; - this.field72 = new ArrayList(100); - this.field71 = new ArrayList(100); + this.field77 = new ArrayList(100); + this.field78 = new ArrayList(100); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lbd;IB)V", - garbageValue = "14" + descriptor = "(Lbi;II)V", + garbageValue = "-22982573" ) - void method96(class29 var1, int var2) { - this.field69[var2] = var1; + void method99(class29 var1, int var2) { + this.field75[var2] = var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "82" + descriptor = "(I)I", + garbageValue = "2119301753" ) @Export("getIdleCycles") int getIdleCycles() { return this.KeyHandler_idleCycles; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "-86" + garbageValue = "54" ) - void method98(Component var1) { + void method101(Component var1) { var1.setFocusTraversalKeysEnabled(false); var1.addKeyListener(this); var1.addFocusListener(this); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "28" + garbageValue = "-62" ) - synchronized void method99(Component var1) { + synchronized void method102(Component var1) { var1.removeKeyListener(this); var1.removeFocusListener(this); synchronized(this) { - this.field72.add(new class33(4, 0)); + this.field77.add(new class33(4, 0)); } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2131622455" + garbageValue = "-1170925164" ) - void method100() { + void method103() { ++this.KeyHandler_idleCycles; - this.method101(); - Iterator var1 = this.field71.iterator(); + this.method104(); + Iterator var1 = this.field78.iterator(); while (var1.hasNext()) { class33 var2 = (class33)var1.next(); - for (int var3 = 0; var3 < this.field69.length && !var2.method133(this.field69[var3]); ++var3) { + for (int var3 = 0; var3 < this.field75.length && !var2.method142(this.field75[var3]); ++var3) { } } - this.field71.clear(); + this.field78.clear(); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-30" + descriptor = "(S)V", + garbageValue = "-5600" ) - synchronized void method101() { - Collection var1 = this.field71; - this.field71 = this.field72; - this.field72 = var1; + synchronized void method104() { + Collection var1 = this.field78; + this.field78 = this.field77; + this.field77 = var1; } - @Export("keyPressed") - @ObfuscatedName("keyPressed") public final synchronized void keyPressed(KeyEvent var1) { - int var2; - label23: { - var2 = var1.getKeyCode(); - if (var2 >= 0) { - int var4 = class28.KeyHandler_keyCodes.length; - if (var2 < var4) { - var2 = MouseRecorder.method476(var2); - boolean var5 = (var2 & 128) != 0; - if (var5) { - var2 = -1; - } - break label23; - } + int var2 = var1.getKeyCode(); + if (var2 >= 0 && var2 < WorldMapRectangle.method1326()) { + int var3 = class28.KeyHandler_keyCodes[var2]; + var2 = var3; + boolean var4 = (var3 & 128) != 0; + if (var4) { + var2 = -1; } - + } else { var2 = -1; } if (var2 >= 0) { + if (!this.KeyHandler_pressedKeys[var2]) { + this.KeyHandler_idleCycles = 0; + } + this.KeyHandler_pressedKeys[var2] = true; - this.field72.add(new class33(1, var2)); - this.KeyHandler_idleCycles = 0; + this.field77.add(new class33(1, var2)); } var1.consume(); @@ -149,23 +147,17 @@ public final synchronized void keyPressed(KeyEvent var1) { @Export("keyReleased") @ObfuscatedName("keyReleased") public final synchronized void keyReleased(KeyEvent var1) { - int var2; - label16: { - var2 = var1.getKeyCode(); - if (var2 >= 0) { - int var4 = class28.KeyHandler_keyCodes.length; - if (var2 < var4) { - var2 = MouseRecorder.method476(var2) & -129; - break label16; - } - } - + int var2 = var1.getKeyCode(); + if (var2 >= 0 && var2 < WorldMapRectangle.method1326()) { + int var3 = class28.KeyHandler_keyCodes[var2]; + var2 = var3 & -129; + } else { var2 = -1; } if (var2 >= 0) { this.KeyHandler_pressedKeys[var2] = false; - this.field72.add(new class33(2, var2)); + this.field77.add(new class33(2, var2)); } var1.consume(); @@ -175,38 +167,15 @@ public final synchronized void keyReleased(KeyEvent var1) { @ObfuscatedName("keyTyped") public final synchronized void keyTyped(KeyEvent var1) { char var2 = var1.getKeyChar(); - if (var2 != 0 && var2 != '\uffff') { - boolean var3; - if ((var2 <= 0 || var2 >= 128) && (var2 < 160 || var2 > 255)) { - label47: { - if (var2 != 0) { - char[] var4 = class399.cp1252AsciiExtension; - - for (int var5 = 0; var5 < var4.length; ++var5) { - char var6 = var4[var5]; - if (var2 == var6) { - var3 = true; - break label47; - } - } - } - - var3 = false; - } - } else { - var3 = true; - } - - if (var3) { - this.field72.add(new class33(3, var2)); - } + if (var2 != 0 && var2 != '\uffff' && WorldMapArea.method1207(var2)) { + this.field77.add(new class33(3, var2)); } var1.consume(); } public final synchronized void focusGained(FocusEvent var1) { - this.field72.add(new class33(4, 1)); + this.field77.add(new class33(4, 1)); } @Export("focusLost") @@ -215,19 +184,29 @@ public final synchronized void focusLost(FocusEvent var1) { for (int var2 = 0; var2 < 112; ++var2) { if (this.KeyHandler_pressedKeys[var2]) { this.KeyHandler_pressedKeys[var2] = false; - this.field72.add(new class33(2, var2)); + this.field77.add(new class33(2, var2)); } } - this.field72.add(new class33(4, 0)); + this.field77.add(new class33(4, 0)); } - @ObfuscatedName("ac") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1253121225" + descriptor = "(CB)Z", + garbageValue = "76" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } + + @ObfuscatedName("le") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIII)V", + garbageValue = "-2097696373" ) - public static void method95() { - class214.archive4.clear(); + static final void method106(String var0, String var1, int var2, int var3, int var4, int var5, int var6) { + GrandExchangeOfferTotalQuantityComparator.insertMenuItem(var0, var1, var2, var3, var4, var5, var6, false); } } \ No newline at end of file diff --git a/osrs/src/main/java/KitDefinition.java b/osrs/src/main/java/KitDefinition.java index 86b1239b5..f199cf6a4 100644 --- a/osrs/src/main/java/KitDefinition.java +++ b/osrs/src/main/java/KitDefinition.java @@ -3,55 +3,52 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hz") +@ObfuscatedName("go") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("KitDefinition_archive") static AbstractArchive KitDefinition_archive; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("KitDefinition_modelsArchive") static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("KitDefinition_cached") - public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("ko") - @ObfuscatedSignature( - descriptor = "[Lun;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("ao") + static EvictingDualNodeHashTable KitDefinition_cached; + @ObfuscatedName("je") + @Export("regions") + static int[] regions; + @ObfuscatedName("ab") @Export("bodypartID") public int bodypartID; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("models2") int[] models2; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("models") int[] models; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("nonSelectable") public boolean nonSelectable; @@ -65,10 +62,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "-80" + descriptor = "(Luj;I)V", + garbageValue = "-1802859477" ) @Export("decode") void decode(Buffer var1) { @@ -82,10 +79,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "4" + descriptor = "(Luj;II)V", + garbageValue = "-601182989" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -128,10 +125,10 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "699085118" + garbageValue = "1847787627" ) @Export("ready") public boolean ready() { @@ -150,10 +147,10 @@ public boolean ready() { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Ljw;", - garbageValue = "1587109036" + descriptor = "(B)Lkq;", + garbageValue = "6" ) @Export("getModelData") public ModelData getModelData() { @@ -190,12 +187,12 @@ public ModelData getModelData() { } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-9" + garbageValue = "-62" ) - public boolean method984() { + public boolean method909() { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { @@ -207,10 +204,10 @@ public boolean method984() { return var1; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(S)Ljw;", - garbageValue = "2504" + descriptor = "(I)Lkq;", + garbageValue = "1386054697" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -240,267 +237,12 @@ public ModelData getKitDefinitionModels() { return var5; } - @ObfuscatedName("ac") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Lie;", - garbageValue = "-765907227" + descriptor = "(I)V", + garbageValue = "1051367383" ) - public static FloorUnderlayDefinition method979(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); - var1 = new FloorUnderlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); - } - - var1.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "769007597" - ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; - } - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(ILds;ZS)I", - garbageValue = "9029" - ) - static int method986(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == 4000) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + var3; - return 1; - } else if (var0 == 4001) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } else if (var0 == 4002) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 * var4; - return 1; - } else if (var0 == 4003) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } else if (var0 == 4004) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } else if (var0 == 4005) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); - return 1; - } else { - int var5; - int var6; - int var7; - if (var0 == 4006) { - Interpreter.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); - return 1; - } else if (var0 == 4007) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; - return 1; - } else if (var0 == 4008) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } else if (var0 == 4009) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } else if (var0 == 4010) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } else if (var0 == 4011) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } else if (var0 == 4012) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); - } - - return 1; - } else if (var0 == 4013) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - } else if (var0 == 4014) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } else if (var0 == 4015) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } else if (var0 == 4016) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 < var4 ? var3 : var4; - return 1; - } else if (var0 == 4017) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 > var4 ? var3 : var4; - return 1; - } else if (var0 == 4018) { - Interpreter.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); - return 1; - } else if (var0 == 4025) { - var3 = WorldMapLabel.method1569(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == 4026) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; - return 1; - } else if (var0 == 4027) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class345.method1843(var3, var4, var5); - return 1; - } else if (var0 == 4028) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class164.method859(var3, var4, var5); - return 1; - } else if (var0 == 4029) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = 31 - var5; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; - return 1; - } else if (var0 == 4030) { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var3 = class164.method859(var3, var5, var6); - var7 = class76.method431(var6 - var5 + 1); - if (var4 > var7) { - var4 = var7; - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4 << var5; - return 1; - } else if (var0 == 4032) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = GameObject.method1427(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4033) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = WorldMapLabelSize.method1435(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4034) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = HealthBar.method572(var3, var4); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; - return 1; - } else if (var0 == 4035) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4036) { - String var15 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var4 = -1; - if (AttackOption.isNumber(var15)) { - var4 = class36.method182(var15); - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - return 1; - } else { - return 2; - } - } + public static void method907() { + DbRowType.DBRowType_cache.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/Language.java b/osrs/src/main/java/Language.java index 7e93ef8a1..1915745b9 100644 --- a/osrs/src/main/java/Language.java +++ b/osrs/src/main/java/Language.java @@ -7,78 +7,80 @@ -@ObfuscatedName("oa") +@ObfuscatedName("of") @Implements("Language") -public class Language implements class386 { - @ObfuscatedName("ac") +public class Language implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lof;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lof;" ) - static final Language field3644; - @ObfuscatedName("ak") + static final Language field3646; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lof;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lof;" ) static final Language field3647; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lof;" ) static final Language field3645; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lof;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lof;" ) - static final Language field3646; - @ObfuscatedName("ag") + static final Language field3644; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Loa;" + descriptor = "[Lof;" ) static final Language[] field3648; - @ObfuscatedName("fr") + @ObfuscatedName("aw") + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Loh;" ) static Archive field3643; - @ObfuscatedName("oq") - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("ab") + @ObfuscatedName("gr") + static int field3642; + @ObfuscatedName("ac") final String field3650; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("language") final String language; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field3654, 0, "GB"); - field3644 = new Language("DE", "de", "German", ModeWhere.field3654, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", ModeWhere.field3654, 2, "FR"); - field3647 = new Language("PT", "pt", "Portuguese", ModeWhere.field3654, 3, "BR"); - field3645 = new Language("NL", "nl", "Dutch", ModeWhere.field3664, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3664, 5, "ES"); - field3646 = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3654, 6, "MX"); - Language[] var0 = method2004(); + Language_EN = new Language("EN", "en", "English", ModeWhere.field3661, 0, "GB"); + field3646 = new Language("DE", "de", "German", ModeWhere.field3661, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3661, 2, "FR"); + field3647 = new Language("PT", "pt", "Portuguese", ModeWhere.field3661, 3, "BR"); + field3645 = new Language("NL", "nl", "Dutch", ModeWhere.field3658, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3658, 5, "ES"); + field3644 = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3661, 6, "MX"); + Language[] var0 = method1992(); field3648 = new Language[var0.length]; Language[] var1 = var0; @@ -90,7 +92,7 @@ public class Language implements class386 { } @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lor;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lok;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { this.field3650 = var1; @@ -104,20 +106,20 @@ public class Language implements class386 { } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("ab") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-351070004" + garbageValue = "1714564751" ) @Export("getLanguage") String getLanguage() { @@ -130,95 +132,122 @@ public String toString() { return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1873739638" + descriptor = "(I)[Lfa;", + garbageValue = "-1038072000" ) - static int method2003(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; - } + static class132[] method1991() { + return new class132[]{class132.field1279, class132.field1276, class132.field1278, class132.field1277, class132.field1275, class132.field1280}; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1596579775" + descriptor = "(B)[Lof;", + garbageValue = "0" ) - public static void method2002() { - class191.archive7.clear(); + static Language[] method1992() { + return new Language[]{field3647, field3644, Language_FR, Language_EN, field3645, field3646, Language_ES}; } @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(S)[Loa;", - garbageValue = "-24301" - ) - static Language[] method2004() { - return new Language[]{Language_ES, field3647, Language_FR, field3645, Language_EN, field3644, field3646}; + descriptor = "(Lfm;FFFFFFFFB)V", + garbageValue = "1" + ) + static void method1997(class131 var0, float var1, float var2, float var3, float var4, float var5, float var6, float var7, float var8) { + if (var0 != null) { + float var9 = var4 - var1; + if ((double)var9 != 0.0D) { + float var10 = var2 - var1; + float var11 = var3 - var1; + float[] var12 = new float[]{var10 / var9, var11 / var9}; + var0.field1255 = var12[0] == 0.33333334F && 0.6666667F == var12[1]; + float var13 = var12[0]; + float var14 = var12[1]; + if ((double)var12[0] < 0.0D) { + var12[0] = 0.0F; + } + + if ((double)var12[1] > 1.0D) { + var12[1] = 1.0F; + } + + if ((double)var12[0] > 1.0D || var12[1] < -1.0F) { + var12[1] = 1.0F - var12[1]; + if (var12[0] < 0.0F) { + var12[0] = 0.0F; + } + + if (var12[1] < 0.0F) { + var12[1] = 0.0F; + } + + if (var12[0] > 1.0F || var12[1] > 1.0F) { + float var15 = (float)(1.0D + ((double)var12[1] - 2.0D) * (double)var12[1] + (double)(var12[0] * (var12[1] + (var12[0] - 2.0F)))); + if (var15 + class127.field1219 > 0.0F) { + if (class127.field1219 + var12[0] < 1.3333334F) { + float var16 = var12[0] - 2.0F; + float var17 = var12[0] - 1.0F; + float var18 = (float)Math.sqrt((double)(var16 * var16 - var17 * var17 * 4.0F)); + float var19 = (-var16 + var18) * 0.5F; + if (var12[1] + class127.field1219 > var19) { + var12[1] = var19 - class127.field1219; + } else { + var19 = 0.5F * (-var16 - var18); + if (var12[1] < class127.field1219 + var19) { + var12[1] = class127.field1219 + var19; + } + } + } else { + var12[0] = 1.3333334F - class127.field1219; + var12[1] = 0.33333334F - class127.field1219; + } + } + } + + var12[1] = 1.0F - var12[1]; + } + + if (var12[0] != var13) { + var2 = var12[0] * var9 + var1; + if (0.0D != (double)var13) { + var6 = var5 + var12[0] * (var6 - var5) / var13; + } + } + + if (var12[1] != var14) { + float var10000 = var1 + var12[1] * var9; + if ((double)var14 != 1.0D) { + var7 = (float)((double)var8 - (1.0D - (double)var12[1]) * (double)(var8 - var7) / (1.0D - (double)var14)); + } + } + + var0.field1259 = var1; + var0.field1260 = var4; + class145.method767(0.0F, var12[0], var12[1], 1.0F, var0); + Canvas.method90(var5, var6, var7, var8, var0); + } + } } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)Loa;", - garbageValue = "1742943694" + descriptor = "(IB)Lof;", + garbageValue = "15" ) - public static Language method2007(int var0) { + public static Language method1995(int var0) { return var0 >= 0 && var0 < field3648.length ? field3648[var0] : null; } - @ObfuscatedName("au") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lcv;B)V", - garbageValue = "0" + descriptor = "(I)Lcr;", + garbageValue = "458832274" ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - Calendar.method1890(var0.isMembersOnly()); - } - - if (var0.properties != Client.worldProperties) { - TextureProvider.method1351(class199.archive8, var0.properties); - } - - MouseHandler.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - UserComparator3.field1184 = var0.field680; - ObjectComposition.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - class363.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; - class164.currentPort = ObjectComposition.worldPort; - } - - @ObfuscatedName("nk") - @ObfuscatedSignature( - descriptor = "(IIIILud;Lmp;B)V", - garbageValue = "81" - ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; - if (var6 > 4225 && var6 < 90000) { - int var7 = Client.camAngleY & 2047; - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; - int var10 = var3 * var8 + var9 * var2 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - double var12 = Math.atan2((double)var10, (double)var11); - int var14 = var5.width / 2 - 25; - int var15 = (int)(Math.sin(var12) * (double)var14); - int var16 = (int)(Math.cos(var12) * (double)var14); - byte var17 = 20; - ParamComposition.redHintArrowSprite.method2725(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); - } else { - SecureRandomFuture.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); - } - + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return WorldMapData_0.getNextWorldListWorld(); } } \ No newline at end of file diff --git a/osrs/src/main/java/Link.java b/osrs/src/main/java/Link.java index 0a3f3a16d..a15599052 100644 --- a/osrs/src/main/java/Link.java +++ b/osrs/src/main/java/Link.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sg") +@ObfuscatedName("se") @Implements("Link") public class Link { - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lse;" ) @Export("previous") public Link previous; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lse;" ) @Export("next") public Link next; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("remove") public void remove() { if (this.next != null) { diff --git a/osrs/src/main/java/LinkDeque.java b/osrs/src/main/java/LinkDeque.java index 2e27f8105..de85a9d4f 100644 --- a/osrs/src/main/java/LinkDeque.java +++ b/osrs/src/main/java/LinkDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ph") +@ObfuscatedName("pu") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lse;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lsg;" + descriptor = "Lse;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public LinkDeque() { this.sentinel.next = this.sentinel; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lsg;)V" + descriptor = "(Lse;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public void addFirst(Link var1) { var1.previous.next = var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "()Lsg;" + descriptor = "()Lse;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public Link last() { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "()Lsg;" + descriptor = "()Lse;" ) @Export("previous") public Link previous() { diff --git a/osrs/src/main/java/Login.java b/osrs/src/main/java/Login.java index 4223e0af5..65d01f5e1 100644 --- a/osrs/src/main/java/Login.java +++ b/osrs/src/main/java/Login.java @@ -4,130 +4,143 @@ import net.runelite.mapping.ObfuscatedSignature; import java.text.DecimalFormat; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; -@ObfuscatedName("ca") +@ObfuscatedName("cy") @Implements("Login") public class Login { - @ObfuscatedName("al") - @Export("clearLoginScreen") - static boolean clearLoginScreen; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("xPadding") static int xPadding; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "[Lun;" - ) - @Export("runesSprite") - static IndexedSprite[] runesSprite; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lun;" + descriptor = "Lup;" ) @Export("titleboxSprite") static IndexedSprite titleboxSprite; - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lun;" + descriptor = "Lup;" ) - static IndexedSprite field775; - @ObfuscatedName("av") + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "Lup;" + ) + static IndexedSprite field776; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Luz;" ) @Export("rightTitleSprite") static SpritePixels rightTitleSprite; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lun;" + descriptor = "Lup;" ) @Export("logoSprite") static IndexedSprite logoSprite; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "[Lun;" + descriptor = "[Lup;" ) @Export("title_muteSprite") static IndexedSprite[] title_muteSprite; - @ObfuscatedName("aq") + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lup;" + ) + static IndexedSprite field779; + @ObfuscatedName("ae") @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("at") + @ObfuscatedName("an") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("ag") @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("bl") - static int field748; - @ObfuscatedName("bx") - static int field749; - @ObfuscatedName("ce") + @ObfuscatedName("bc") + static int field751; + @ObfuscatedName("bb") + static int field750; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lrv;" + ) + static Bounds field775; + @ObfuscatedName("cf") @Export("loginIndex") static int loginIndex; - @ObfuscatedName("cu") + @ObfuscatedName("cg") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("cw") + @ObfuscatedName("cv") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("co") + @ObfuscatedName("cx") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("cc") + @ObfuscatedName("cp") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("cg") + @ObfuscatedName("ce") @Export("Login_username") static String Login_username; - @ObfuscatedName("cq") + @ObfuscatedName("ci") @Export("Login_password") static String Login_password; + @ObfuscatedName("cw") + static int field753; + @ObfuscatedName("cq") + static String[] field769; + @ObfuscatedName("cn") + static String field763; + @ObfuscatedName("cb") + static boolean field743; @ObfuscatedName("cz") - static int field751; - @ObfuscatedName("cp") - static String[] field766; - @ObfuscatedName("cs") - static String field761; + static boolean field745; @ObfuscatedName("cd") - static boolean field742; - @ObfuscatedName("ct") - static boolean field743; - @ObfuscatedName("ca") - static boolean field741; - @ObfuscatedName("dv") + static boolean field744; + @ObfuscatedName("dt") @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("dg") + @ObfuscatedName("dx") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("dp") + @ObfuscatedName("dr") @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("do") + @ObfuscatedName("ds") @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("dh") + @ObfuscatedName("da") @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("du") - static long field771; - @ObfuscatedName("dr") - static long field770; - @ObfuscatedName("dw") - static String[] field769; - @ObfuscatedName("di") - static String[] field767; - @ObfuscatedName("dt") - static String[] field768; + @ObfuscatedName("dp") + static long field774; + @ObfuscatedName("df") + static long field773; + @ObfuscatedName("dv") + static String[] field771; + @ObfuscatedName("dz") + static String[] field772; + @ObfuscatedName("dl") + static String[] field770; static { xPadding = 0; loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; - field748 = -1; - field749 = 1; + field751 = -1; + field750 = 1; loginIndex = 0; Login_response0 = ""; Login_response1 = ""; @@ -135,12 +148,12 @@ public class Login { Login_response3 = ""; Login_username = ""; Login_password = ""; - field751 = 0; - field766 = new String[8]; - field761 = ""; - field742 = false; + field753 = 0; + field769 = new String[8]; + field763 = ""; field743 = false; - field741 = true; + field745 = false; + field744 = true; currentLoginField = 0; worldSelectOpen = false; hoveredWorldIndex = -1; @@ -148,22 +161,61 @@ public class Login { worldSelectPagesCount = 0; new DecimalFormat("##0.00"); new class135(); - field771 = -1L; - field770 = -1L; - field769 = new String[]{"title.jpg"}; - field767 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; - field768 = new String[]{"logo_speedrunning"}; + field774 = -1L; + field773 = -1L; + field771 = new String[]{"title.jpg"}; + field772 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; + field770 = new String[]{"logo_speedrunning"}; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lol;Lol;IZI)Lfo;", + garbageValue = "-1429797359" + ) + public static class139 method437(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; + byte[] var5 = var0.getFile(var2 >> 16 & 65535, var2 & 65535); + if (var5 == null) { + var4 = false; + return null; + } else { + int var6 = (var5[1] & 255) << 8 | var5[2] & 255; + byte[] var7; + if (var3) { + var7 = var1.getFile(0, var6); + } else { + var7 = var1.getFile(var6, 0); + } + + if (var7 == null) { + var4 = false; + } + + if (!var4) { + return null; + } else { + if (class139.field1309 == null) { + FloorDecoration.field2162 = Runtime.getRuntime().availableProcessors(); + class139.field1309 = new ThreadPoolExecutor(0, FloorDecoration.field2162, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(FloorDecoration.field2162 * 100 + 100), new class136()); + } + + try { + return new class139(var0, var1, var2, var3); + } catch (Exception var9) { + return null; + } + } + } } - @ObfuscatedName("aj") + @ObfuscatedName("mr") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "85678974" + descriptor = "(IB)V", + garbageValue = "10" ) - static final int method433(int var0, int var1) { - int var2 = ClientPreferences.method568(var0 - 1, var1 - 1) + ClientPreferences.method568(var0 + 1, var1 - 1) + ClientPreferences.method568(var0 - 1, var1 + 1) + ClientPreferences.method568(var0 + 1, var1 + 1); - int var3 = ClientPreferences.method568(var0 - 1, var1) + ClientPreferences.method568(var0 + 1, var1) + ClientPreferences.method568(var0, var1 - 1) + ClientPreferences.method568(var0, 1 + var1); - int var4 = ClientPreferences.method568(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; + static final void method438(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); + WorldMapIcon_1.clientPreferences.setAreaSoundEffectsVolume(var0); } } \ No newline at end of file diff --git a/osrs/src/main/java/LoginPacket.java b/osrs/src/main/java/LoginPacket.java index f79cdb4ba..e07360f36 100644 --- a/osrs/src/main/java/LoginPacket.java +++ b/osrs/src/main/java/LoginPacket.java @@ -3,62 +3,62 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mi") +@ObfuscatedName("lo") @Implements("LoginPacket") -public class LoginPacket implements class307 { - @ObfuscatedName("ac") +public class LoginPacket implements class304 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Llo;" ) - public static final LoginPacket field2762; - @ObfuscatedName("al") + public static final LoginPacket field2764; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Llo;" ) - static final LoginPacket field2767; - @ObfuscatedName("ak") + static final LoginPacket field2765; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Llo;" ) @Export("NEW_LOGIN_CONNECTION") public static final LoginPacket NEW_LOGIN_CONNECTION; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Llo;" ) @Export("RECONNECT_LOGIN_CONNECTION") public static final LoginPacket RECONNECT_LOGIN_CONNECTION; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Llo;" ) - public static final LoginPacket field2764; - @ObfuscatedName("ah") + public static final LoginPacket field2761; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Llo;" ) static final LoginPacket field2766; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Lmi;" + descriptor = "[Llo;" ) - static final LoginPacket[] field2768; - @ObfuscatedName("ar") + static final LoginPacket[] field2767; + @ObfuscatedName("aa") @Export("id") public final int id; static { - field2762 = new LoginPacket(14, 0); - field2767 = new LoginPacket(15, 4); + field2764 = new LoginPacket(14, 0); + field2765 = new LoginPacket(15, 4); NEW_LOGIN_CONNECTION = new LoginPacket(16, -2); RECONNECT_LOGIN_CONNECTION = new LoginPacket(18, -2); - field2764 = new LoginPacket(19, -2); + field2761 = new LoginPacket(19, -2); field2766 = new LoginPacket(27, 0); - field2768 = new LoginPacket[32]; - LoginPacket[] var0 = FloorOverlayDefinition.method1109(); + field2767 = new LoginPacket[32]; + LoginPacket[] var0 = class36.method183(); for (int var1 = 0; var1 < var0.length; ++var1) { - field2768[var0[var1].id] = var0[var1]; + field2767[var0[var1].id] = var0[var1]; } } @@ -70,4 +70,71 @@ public class LoginPacket implements class307 { LoginPacket(int var1, int var2) { this.id = var1; } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Lgz;", + garbageValue = "2140543068" + ) + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); + var1 = new InvDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "216092039" + ) + public static void method1643() { + VarpDefinition.VarpDefinition_cached.clear(); + } + + @ObfuscatedName("io") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)V", + garbageValue = "-63" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { + byte var2 = 4; + int var3 = var2 + 6; + int var4 = var2 + 6; + int var5 = ItemLayer.fontPlain12.lineWidth(var0, 250); + int var6 = ItemLayer.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 16777215); + ItemLayer.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + int var7 = var3 - var2; + int var8 = var4 - var2; + int var9 = var2 + var2 + var5; + int var10 = var2 + var2 + var6; + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { + Client.field407[var11] = true; + } + } + + if (var1) { + class338.rasterProvider.drawFull(0, 0); + } else { + SoundSystem.method233(var3, var4, var5, var6); + } + + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/LoginScreenAnimation.java b/osrs/src/main/java/LoginScreenAnimation.java index aad811e36..b628c0dec 100644 --- a/osrs/src/main/java/LoginScreenAnimation.java +++ b/osrs/src/main/java/LoginScreenAnimation.java @@ -3,191 +3,200 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +import java.io.IOException; + +@ObfuscatedName("dz") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("gu") - static String field1042; - @ObfuscatedName("ac") + @ObfuscatedName("ls") + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("te") @ObfuscatedSignature( - descriptor = "[Lun;" + descriptor = "Lbn;" ) - IndexedSprite[] field1058; - @ObfuscatedName("ar") + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "[Lup;" + ) + IndexedSprite[] field1063; + @ObfuscatedName("aa") int[] field1054; - @ObfuscatedName("ab") - int field1043; - @ObfuscatedName("am") - int[] field1052; - @ObfuscatedName("av") + @ObfuscatedName("ac") + int field1048; + @ObfuscatedName("al") int[] field1057; - @ObfuscatedName("ag") - int[] field1050; - @ObfuscatedName("aa") - int[] field1049; + @ObfuscatedName("az") + int[] field1062; @ObfuscatedName("ap") - int field1046; - @ObfuscatedName("ay") - int field1048; + int[] field1059; + @ObfuscatedName("av") + int[] field1060; + @ObfuscatedName("ax") + int field1053; @ObfuscatedName("as") - int[] field1055; - @ObfuscatedName("aj") - int[] field1051; - @ObfuscatedName("an") - int[] field1053; - @ObfuscatedName("au") + int field1051; + @ObfuscatedName("ay") + int[] field1061; + @ObfuscatedName("ak") int[] field1056; + @ObfuscatedName("aj") + int[] field1055; + @ObfuscatedName("am") + int[] field1058; + @ObfuscatedName("aq") + int field1050; @ObfuscatedName("ai") - int field1045; - @ObfuscatedName("ae") - int field1044; + int field1049; @ObfuscatedName("aw") - int field1047; + int field1052; @ObfuscatedSignature( - descriptor = "([Lun;)V" + descriptor = "([Lup;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { this.field1054 = new int[256]; - this.field1043 = 0; - this.field1046 = 0; this.field1048 = 0; - this.field1045 = 0; - this.field1044 = 0; - this.field1047 = 0; - this.field1058 = var1; + this.field1053 = 0; + this.field1051 = 0; + this.field1050 = 0; + this.field1049 = 0; + this.field1052 = 0; + this.field1063 = var1; this.initColors(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "75" + garbageValue = "47" ) @Export("initColors") void initColors() { - this.field1057 = new int[256]; + this.field1062 = new int[256]; int var1; for (var1 = 0; var1 < 64; ++var1) { - this.field1057[var1] = var1 * 262144; + this.field1062[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1057[var1 + 64] = var1 * 1024 + 16711680; + this.field1062[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1057[var1 + 128] = var1 * 4 + 16776960; + this.field1062[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1057[var1 + 192] = 16777215; + this.field1062[var1 + 192] = 16777215; } - this.field1050 = new int[256]; + this.field1059 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1050[var1] = var1 * 1024; + this.field1059[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { - this.field1050[var1 + 64] = var1 * 4 + 65280; + this.field1059[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { - this.field1050[var1 + 128] = var1 * 262144 + 65535; + this.field1059[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { - this.field1050[var1 + 192] = 16777215; + this.field1059[var1 + 192] = 16777215; } - this.field1049 = new int[256]; + this.field1060 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1] = var1 * 4; + this.field1060[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1 + 64] = var1 * 262144 + 255; + this.field1060[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1 + 128] = var1 * 1024 + 16711935; + this.field1060[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1049[var1 + 192] = 16777215; + this.field1060[var1 + 192] = 16777215; } - this.field1052 = new int[256]; - this.field1045 = 0; - this.field1053 = new int[32768]; - this.field1056 = new int[32768]; - this.method535((IndexedSprite)null); + this.field1057 = new int[256]; + this.field1050 = 0; this.field1055 = new int[32768]; - this.field1051 = new int[32768]; + this.field1058 = new int[32768]; + this.method533((IndexedSprite)null); + this.field1061 = new int[32768]; + this.field1056 = new int[32768]; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-6404822" + garbageValue = "-761993864" ) - void method527() { + void method524() { + this.field1062 = null; + this.field1059 = null; + this.field1060 = null; this.field1057 = null; - this.field1050 = null; - this.field1049 = null; - this.field1052 = null; - this.field1053 = null; - this.field1056 = null; this.field1055 = null; - this.field1051 = null; - this.field1045 = 0; - this.field1044 = 0; + this.field1058 = null; + this.field1061 = null; + this.field1056 = null; + this.field1050 = 0; + this.field1049 = 0; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1382576663" + garbageValue = "960530049" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1055 == null) { + if (this.field1061 == null) { this.initColors(); } - if (this.field1047 == 0) { - this.field1047 = var2; + if (this.field1052 == 0) { + this.field1052 = var2; } - int var3 = var2 - this.field1047; + int var3 = var2 - this.field1052; if (var3 >= 256) { var3 = 0; } - this.field1047 = var2; + this.field1052 = var2; if (var3 > 0) { - this.method530(var3); + this.method528(var3); } - this.method532(var1); + this.method530(var1); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1766870241" + descriptor = "(IB)V", + garbageValue = "-52" ) - final void method530(int var1) { - this.field1045 += 128 * var1; + final void method528(int var1) { + this.field1050 += var1 * 128; int var2; - if (this.field1045 > this.field1053.length) { - this.field1045 -= this.field1053.length; + if (this.field1050 > this.field1055.length) { + this.field1050 -= this.field1055.length; var2 = (int)(Math.random() * 12.0D); - this.method535(this.field1058[var2]); + this.method533(this.field1063[var2]); } var2 = 0; @@ -196,12 +205,12 @@ final void method530(int var1) { int var6; for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1055[var2 + var3] - this.field1053[var2 + this.field1045 & this.field1053.length - 1] * var1 / 6; + var6 = this.field1061[var3 + var2] - this.field1055[var2 + this.field1050 & this.field1055.length - 1] * var1 / 6; if (var6 < 0) { var6 = 0; } - this.field1055[var2++] = var6; + this.field1061[var2++] = var6; } byte var15 = 10; @@ -215,29 +224,29 @@ final void method530(int var1) { for (int var9 = 0; var9 < 128; ++var9) { var10 = (int)(Math.random() * 100.0D); if (var10 < 50 && var9 > var15 && var9 < var6) { - this.field1055[var8 + var9] = 255; + this.field1061[var8 + var9] = 255; } else { - this.field1055[var8 + var9] = 0; + this.field1061[var9 + var8] = 0; } } } - if (this.field1046 > 0) { - this.field1046 -= var1 * 4; + if (this.field1053 > 0) { + this.field1053 -= var1 * 4; } - if (this.field1048 > 0) { - this.field1048 -= var1 * 4; + if (this.field1051 > 0) { + this.field1051 -= var1 * 4; } - if (this.field1046 == 0 && this.field1048 == 0) { + if (this.field1053 == 0 && this.field1051 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); if (var7 == 0) { - this.field1046 = 1024; + this.field1053 = 1024; } if (var7 == 1) { - this.field1048 = 1024; + this.field1051 = 1024; } } @@ -246,11 +255,11 @@ final void method530(int var1) { } for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1054[var7] = (int)(Math.sin((double)this.field1043 / 14.0D) * 16.0D + Math.sin((double)this.field1043 / 15.0D) * 14.0D + Math.sin((double)this.field1043 / 16.0D) * 12.0D); - ++this.field1043; + this.field1054[var7] = (int)(Math.sin((double)this.field1048 / 14.0D) * 16.0D + Math.sin((double)this.field1048 / 15.0D) * 14.0D + Math.sin((double)this.field1048 / 16.0D) * 12.0D); + ++this.field1048; } - this.field1044 += var1; + this.field1049 += var1; var7 = ((Client.cycle & 1) + var1) / 2; if (var7 > 0) { short var16 = 128; @@ -260,13 +269,13 @@ final void method530(int var1) { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1044 * 100; ++var11) { + for (var11 = 0; var11 < this.field1049 * 100; ++var11) { var12 = (int)(Math.random() * (double)var10) + var17; var13 = (int)(Math.random() * (double)var16) + var16; - this.field1055[var12 + (var13 << 7)] = 192; + this.field1061[var12 + (var13 << 7)] = 192; } - this.field1044 = 0; + this.field1049 = 0; int var14; for (var11 = 0; var11 < 256; ++var11) { @@ -274,16 +283,16 @@ final void method530(int var1) { var13 = var11 * 128; for (var14 = -var7; var14 < 128; ++var14) { - if (var14 + var7 < 128) { - var12 += this.field1055[var13 + var14 + var7]; + if (var7 + var14 < 128) { + var12 += this.field1061[var13 + var14 + var7]; } if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1055[var13 + var14 - (var7 + 1)]; + var12 -= this.field1061[var14 + var13 - (var7 + 1)]; } if (var14 >= 0) { - this.field1051[var13 + var14] = var12 / (var7 * 2 + 1); + this.field1056[var14 + var13] = var12 / (var7 * 2 + 1); } } } @@ -293,16 +302,16 @@ final void method530(int var1) { for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; - if (var7 + var13 < 256) { - var12 += this.field1051[var7 * 128 + var11 + var14]; + if (var13 + var7 < 256) { + var12 += this.field1056[var7 * 128 + var14 + var11]; } if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1051[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1056[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1055[var14 + var11] = var12 / (var7 * 2 + 1); + this.field1061[var14 + var11] = var12 / (var7 * 2 + 1); } } } @@ -310,62 +319,62 @@ final void method530(int var1) { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "92" + descriptor = "(IIII)I", + garbageValue = "-1611908618" ) - final int method531(int var1, int var2, int var3) { + final int method529(int var1, int var2, int var3) { int var4 = 256 - var3; return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-527981427" + garbageValue = "-650502535" ) - final void method532(int var1) { - int var2 = this.field1052.length; - if (this.field1046 > 0) { - this.method533(this.field1046, this.field1050); - } else if (this.field1048 > 0) { - this.method533(this.field1048, this.field1049); + final void method530(int var1) { + int var2 = this.field1057.length; + if (this.field1053 > 0) { + this.method531(this.field1053, this.field1059); + } else if (this.field1051 > 0) { + this.method531(this.field1051, this.field1060); } else { for (int var3 = 0; var3 < var2; ++var3) { - this.field1052[var3] = this.field1057[var3]; + this.field1057[var3] = this.field1062[var3]; } } - this.method534(var1); + this.method532(var1); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I[II)V", - garbageValue = "-1793969695" + garbageValue = "-2016304583" ) - final void method533(int var1, int[] var2) { - int var3 = this.field1052.length; + final void method531(int var1, int[] var2) { + int var3 = this.field1057.length; for (int var4 = 0; var4 < var3; ++var4) { if (var1 > 768) { - this.field1052[var4] = this.method531(this.field1057[var4], var2[var4], 1024 - var1); + this.field1057[var4] = this.method529(this.field1062[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1052[var4] = var2[var4]; + this.field1057[var4] = var2[var4]; } else { - this.field1052[var4] = this.method531(var2[var4], this.field1057[var4], 256 - var1); + this.field1057[var4] = this.method529(var2[var4], this.field1062[var4], 256 - var1); } } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1816590027" + garbageValue = "1596261133" ) - final void method534(int var1) { + final void method532(int var1) { int var2 = 0; for (int var3 = 1; var3 < 255; ++var3) { @@ -378,22 +387,22 @@ final void method534(int var1) { var5 = 0; } - if (var5 + 128 >= class223.rasterProvider.width) { - var7 = class223.rasterProvider.width - var5; + if (var5 + 128 >= class338.rasterProvider.width) { + var7 = class338.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * class223.rasterProvider.width; + int var8 = var5 + (var3 + 8) * class338.rasterProvider.width; var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1055[var2++]; + int var10 = this.field1061[var2++]; int var11 = var8 % Rasterizer2D.Rasterizer2D_width; if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { int var12 = var10; int var13 = 256 - var10; - var10 = this.field1052[var10]; - int var14 = class223.rasterProvider.pixels[var8]; - class223.rasterProvider.pixels[var8++] = -16777216 | ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; + var10 = this.field1057[var10]; + int var14 = class338.rasterProvider.pixels[var8]; + class338.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; } else { ++var8; } @@ -404,21 +413,21 @@ final void method534(int var1) { } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lun;I)V", - garbageValue = "129400298" + descriptor = "(Lup;I)V", + garbageValue = "1899155334" ) - final void method535(IndexedSprite var1) { + final void method533(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1053.length; ++var2) { - this.field1053[var2] = 0; + for (var2 = 0; var2 < this.field1055.length; ++var2) { + this.field1055[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1053[var3] = (int)(Math.random() * 256.0D); + this.field1055[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -427,13 +436,13 @@ final void method535(IndexedSprite var1) { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); - this.field1056[var5] = (this.field1053[var5 + 128] + this.field1053[var5 - 128] + this.field1053[var5 + 1] + this.field1053[var5 - 1]) / 4; + this.field1058[var5] = (this.field1055[var5 + 128] + this.field1055[var5 - 128] + this.field1055[var5 + 1] + this.field1055[var5 - 1]) / 4; } } - int[] var8 = this.field1053; - this.field1053 = this.field1056; - this.field1056 = var8; + int[] var8 = this.field1055; + this.field1055 = this.field1058; + this.field1058 = var8; } if (var1 != null) { @@ -445,7 +454,7 @@ final void method535(IndexedSprite var1) { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1053[var7] = 0; + this.field1055[var7] = 0; } } } @@ -453,39 +462,104 @@ final void method535(IndexedSprite var1) { } - @ObfuscatedName("ax") + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lol;II)Lmq;", + garbageValue = "812097859" + ) + static MusicPatch method521(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + return var2 == null ? null : new MusicPatch(var2); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lol;Lol;B)V", + garbageValue = "41" + ) + public static void method526(AbstractArchive var0, AbstractArchive var1) { + NPCComposition.NpcDefinition_archive = var0; + class191.field1586 = var1; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IIIIB)I", + garbageValue = "18" + ) + static final int method520(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; + } + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIILiz;IB)V", - garbageValue = "-106" + descriptor = "(IB)I", + garbageValue = "-12" ) - static void method529(int var0, int var1, int var2, ObjectComposition var3, int var4) { - ObjectSound var5 = new ObjectSound(); - var5.plane = var0; - var5.x = var1 * 128; - var5.y = var2 * 128; - int var6 = var3.sizeX; - int var7 = var3.sizeY; - if (var4 == 1 || var4 == 3) { - var6 = var3.sizeY; - var7 = var3.sizeX; - } - - var5.maxX = (var6 + var1) * 128; - var5.maxY = (var7 + var2) * 128; - var5.soundEffectId = var3.ambientSoundId; - var5.field696 = var3.int7 * 128; - var5.field697 = var3.int5; - var5.field690 = var3.int6; - var5.soundEffectIds = var3.soundEffectIds; - if (var3.transforms != null) { - var5.obj = var3; - var5.set(); - } - - ObjectSound.objectSounds.addFirst(var5); - if (var5.soundEffectIds != null) { - var5.field695 = var5.field697 + (int)(Math.random() * (double)(var5.field690 - var5.field697)); + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; + if (var0 < 0 || var0 >= 65536) { + var0 >>>= 16; + var1 += 16; + } + + if (var0 >= 256) { + var0 >>>= 8; + var1 += 8; + } + + if (var0 >= 16) { + var0 >>>= 4; + var1 += 4; + } + + if (var0 >= 4) { + var0 >>>= 2; + var1 += 2; + } + + if (var0 >= 1) { + var0 >>>= 1; + ++var1; } + return var0 + var1; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1084664088" + ) + static void method523() { + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; + } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "112" + ) + static final void method534(boolean var0) { + class102.method604(); + ++Client.packetWriter.pendingWrites; + if (Client.packetWriter.pendingWrites >= 50 || var0) { + Client.packetWriter.pendingWrites = 0; + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = class113.getPacketBufferNode(ClientPacket.NO_TIMEOUT, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var1); + + try { + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.hadNetworkError = true; + } + } + + } } } \ No newline at end of file diff --git a/osrs/src/main/java/LoginType.java b/osrs/src/main/java/LoginType.java index b5c7ba9b9..a3c0bb0a9 100644 --- a/osrs/src/main/java/LoginType.java +++ b/osrs/src/main/java/LoginType.java @@ -3,88 +3,88 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("te") +@ObfuscatedName("tt") @Implements("LoginType") public class LoginType { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) - static final LoginType field4102; - @ObfuscatedName("ak") + static final LoginType field4097; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) - static final LoginType field4101; - @ObfuscatedName("ax") + static final LoginType field4099; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) - static final LoginType field4105; - @ObfuscatedName("ao") + static final LoginType field4098; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) - static final LoginType field4103; - @ObfuscatedName("ah") + static final LoginType field4095; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) static final LoginType field4100; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) - static final LoginType field4104; - @ObfuscatedName("ab") + static final LoginType field4094; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) - static final LoginType field4099; - @ObfuscatedName("am") + static final LoginType field4096; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Ltt;" ) - public static final LoginType field4098; - @ObfuscatedName("av") - final int field4106; - @ObfuscatedName("ag") - final String field4107; + public static final LoginType field4092; + @ObfuscatedName("az") + public final int field4102; + @ObfuscatedName("ap") + final String field4101; static { - oldscape = new LoginType(4, 0, "", ""); - field4102 = new LoginType(6, 1, "", ""); - field4101 = new LoginType(3, 2, "", ""); - field4105 = new LoginType(5, 3, "", ""); - field4103 = new LoginType(7, 4, "", ""); - field4100 = new LoginType(8, 5, "", ""); - field4104 = new LoginType(2, 6, "", ""); - field4099 = new LoginType(0, 7, "", ""); - field4098 = new LoginType(1, -1, "", "", true, new LoginType[]{oldscape, field4102, field4101, field4103, field4105}); + oldscape = new LoginType(0, 0, "", ""); + field4097 = new LoginType(8, 1, "", ""); + field4099 = new LoginType(7, 2, "", ""); + field4098 = new LoginType(5, 3, "", ""); + field4095 = new LoginType(4, 4, "", ""); + field4100 = new LoginType(1, 5, "", ""); + field4094 = new LoginType(6, 6, "", ""); + field4096 = new LoginType(3, 7, "", ""); + field4092 = new LoginType(2, -1, "", "", true, new LoginType[]{oldscape, field4097, field4099, field4095, field4098}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4106 = var1; - this.field4107 = var4; + this.field4102 = var1; + this.field4101 = var4; } @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lte;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Ltt;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4106 = var1; - this.field4107 = var4; + this.field4102 = var1; + this.field4101 = var4; } @Export("toString") @ObfuscatedName("toString") public String toString() { - return this.field4107; + return this.field4101; } } \ No newline at end of file diff --git a/osrs/src/main/java/LongNode.java b/osrs/src/main/java/LongNode.java index 6e97399b4..d96951a4b 100644 --- a/osrs/src/main/java/LongNode.java +++ b/osrs/src/main/java/LongNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("se") +@ObfuscatedName("su") @Implements("LongNode") public class LongNode extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("longValue") public long longValue; diff --git a/osrs/src/main/java/MenuAction.java b/osrs/src/main/java/MenuAction.java index 597664088..c25cabad4 100644 --- a/osrs/src/main/java/MenuAction.java +++ b/osrs/src/main/java/MenuAction.java @@ -3,144 +3,64 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("cb") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("ac") + @ObfuscatedName("ax") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("cq") + @Export("param9") + static String param9; + @ObfuscatedName("at") @Export("param0") int param0; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("param1") int param1; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("opcode") int opcode; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("identifier") int identifier; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("itemId") int itemId; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("action") String action; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("target") String target; MenuAction() { } - @ObfuscatedName("ak") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "-3" + descriptor = "(I)[Ldy;", + garbageValue = "-180597093" ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field3775) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field3778) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field3773) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.field3772 < ByteArrayPool.field3771) { - ByteArrayPool.field3767[++ByteArrayPool.field3772 - 1] = var0; - } else { - if (class28.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && class425.ByteArrayPool_altSizeArrayCounts[var1] < class28.ByteArrayPool_arrays[var1].length) { - class28.ByteArrayPool_arrays[var1][class425.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } - } - } - - } + static AttackOption[] method436() { + return new AttackOption[]{AttackOption.field1103, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.field1106}; } - @ObfuscatedName("as") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIII)D", - garbageValue = "-2018326069" + descriptor = "(Lol;II)V", + garbageValue = "1404218002" ) - static double method428(int var0, int var1, int var2) { - double var3 = var1 > 0 ? (double)Math.max(0.0F, Math.min(1.0F, (float)var0 / (float)var1)) : 1.0D; - if (var3 > 0.0D && var3 < 1.0D) { - double var5; - double var7; - switch(var2) { - case 0: - return var3; - case 1: - return 1.0D - Math.cos(3.141592653589793D * var3 / 2.0D); - case 2: - return Math.sin(3.141592653589793D * var3 / 2.0D); - case 3: - return -(Math.cos(3.141592653589793D * var3) - 1.0D) / 2.0D; - case 4: - return var3 * var3; - case 5: - return 1.0D - (1.0D - var3) * (1.0D - var3); - case 6: - return var3 < 0.5D ? var3 * 2.0D * var3 : 1.0D - Math.pow(2.0D + var3 * -2.0D, 2.0D) / 2.0D; - case 7: - return var3 * var3 * var3; - case 8: - return 1.0D - Math.pow(1.0D - var3, 3.0D); - case 9: - return var3 < 0.5D ? var3 * 4.0D * var3 * var3 : 1.0D - Math.pow(var3 * -2.0D + 2.0D, 3.0D) / 2.0D; - case 10: - return var3 * var3 * var3 * var3; - case 11: - return 1.0D - Math.pow(1.0D - var3, 4.0D); - case 12: - return var3 < 0.5D ? var3 * var3 * var3 * 8.0D * var3 : 1.0D - Math.pow(var3 * -2.0D + 2.0D, 4.0D) / 2.0D; - case 13: - return var3 * var3 * var3 * var3 * var3; - case 14: - return 1.0D - Math.pow(1.0D - var3, 5.0D); - case 15: - return var3 < 0.5D ? var3 * 8.0D * var3 * var3 * var3 * var3 : 1.0D - Math.pow(-2.0D * var3 + 2.0D, 5.0D) / 2.0D; - case 16: - return Math.pow(2.0D, var3 * 10.0D - 10.0D); - case 17: - return 1.0D - Math.pow(2.0D, var3 * -10.0D); - case 18: - return var3 < 0.5D ? Math.pow(2.0D, 10.0D + var3 * 20.0D) / 2.0D : (2.0D - Math.pow(2.0D, 10.0D + var3 * -20.0D)) / 2.0D; - case 19: - return 1.0D - Math.sqrt(1.0D - Math.pow(var3, 2.0D)); - case 20: - return Math.sqrt(1.0D - Math.pow(var3 - 1.0D, 2.0D)); - case 21: - return var3 < 0.5D ? (1.0D - Math.sqrt(1.0D - Math.pow(2.0D * var3, 2.0D))) / 2.0D : (Math.sqrt(1.0D - Math.pow(-2.0D * var3 + 2.0D, 2.0D)) + 1.0D) / 2.0D; - case 22: - var5 = 1.70158D; - var7 = 2.70158D; - return var3 * var3 * 2.70158D * var3 - 1.70158D * var3 * var3; - case 23: - var5 = 1.70158D; - var7 = 2.70158D; - return 1.0D + 2.70158D * Math.pow(var3 - 1.0D, 3.0D) + 1.70158D * Math.pow(var3 - 1.0D, 2.0D); - case 24: - var5 = 1.70158D; - var7 = 2.5949095D; - return var3 < 0.5D ? Math.pow(var3 * 2.0D, 2.0D) * (var3 * 7.189819D - 2.5949095D) / 2.0D : (Math.pow(var3 * 2.0D - 2.0D, 2.0D) * (3.5949095D * (2.0D * var3 - 2.0D) + 2.5949095D) + 2.0D) / 2.0D; - case 25: - var5 = 2.0943951023931953D; - return -Math.pow(2.0D, 10.0D * var3 - 10.0D) * Math.sin((var3 * 10.0D - 10.75D) * 2.0943951023931953D); - case 26: - var5 = 2.0943951023931953D; - return Math.pow(2.0D, var3 * -10.0D) * Math.sin(2.0943951023931953D * (10.0D * var3 - 0.75D)) + 1.0D; - case 27: - var5 = 1.3962634015954636D; - var7 = Math.sin(1.3962634015954636D * (var3 * 20.0D - 11.125D)); - return var3 < 0.5D ? -(Math.pow(2.0D, 20.0D * var3 - 10.0D) * var7) / 2.0D : Math.pow(2.0D, 10.0D + var3 * -20.0D) * var7 / 2.0D + 1.0D; - default: - return var3; - } + static void method435(AbstractArchive var0, int var1) { + if ((var1 & class522.field4160.rsOrdinal()) != 0) { + Login.logoSprite = class313.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); + } else if ((var1 & class522.field4161.rsOrdinal()) != 0) { + Login.logoSprite = class313.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); + } else if ((var1 & class522.field4154.rsOrdinal()) != 0) { + Login.logoSprite = class313.SpriteBuffer_getIndexedSpriteByName(var0, "logo_speedrunning", ""); } else { - return var3 <= 0.0D ? 0.0D : 1.0D; + Login.logoSprite = class313.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Message.java b/osrs/src/main/java/Message.java index cc5959dd1..9e3b14890 100644 --- a/osrs/src/main/java/Message.java +++ b/osrs/src/main/java/Message.java @@ -3,48 +3,49 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("co") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("bw") + @ObfuscatedName("ev") @ObfuscatedSignature( - descriptor = "Lrx;" + descriptor = "Ldb;" ) - static Bounds field349; - @ObfuscatedName("ac") + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("at") @Export("count") int count; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("cycle") int cycle; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("type") int type; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("sender") String sender; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lvf;" + descriptor = "Lvj;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lra;" + descriptor = "Lrw;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lra;" + descriptor = "Lrw;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("prefix") String prefix; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("text") String text; @@ -54,10 +55,10 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "88" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "2135051365" ) @Export("set") void set(int var1, String var2, String var3, String var4) { @@ -73,20 +74,20 @@ void set(int var1, String var2, String var3, String var4) { this.clearIsFromIgnored(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1192879818" + garbageValue = "-817284641" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2133471128" + descriptor = "(S)Z", + garbageValue = "-446" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -97,30 +98,30 @@ final boolean isFromFriend() { return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1787046526" + garbageValue = "-2127132249" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = InvDefinition.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromFriend0 = class12.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "32" + descriptor = "(I)V", + garbageValue = "-1827223059" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-67" + garbageValue = "92" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -131,36 +132,55 @@ final boolean isFromIgnored() { return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-1277362161" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = InvDefinition.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = class12.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1525431428" + garbageValue = "1209997538" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(InterfaceParent.method465(this.sender), class166.loginType); + this.senderUsername = new Username(UserComparator7.method675(this.sender), class89.loginType); } else { this.senderUsername = null; } } - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lom;B)V", - garbageValue = "-50" + descriptor = "(II)I", + garbageValue = "1188584098" ) - public static void method338(AbstractArchive var0) { + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;B)I", + garbageValue = "11" + ) + public static int method354(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + var0.charAt(var3); + } + + return var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/Messages.java b/osrs/src/main/java/Messages.java index 1b35ca0f1..f3d39dc3f 100644 --- a/osrs/src/main/java/Messages.java +++ b/osrs/src/main/java/Messages.java @@ -6,27 +6,36 @@ import java.util.HashMap; import java.util.Map; -@ObfuscatedName("er") +@ObfuscatedName("eo") @Implements("Messages") public class Messages { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Ltz;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "Lpo;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("Messages_count") static int Messages_count; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lnt;" + ) + static StudioGame field1156; + @ObfuscatedName("gk") + static String field1155; + @ObfuscatedName("uu") + static int field1154; static { Messages_channels = new HashMap(); @@ -35,25 +44,29 @@ public class Messages { Messages_count = 0; } - @ObfuscatedName("ac") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(II)Lis;", - garbageValue = "517783557" + descriptor = "(IIII)I", + garbageValue = "292264125" ) - @Export("getWidget") - public static VarbitComposition getWidget(int var0) { - VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); - var1 = new VarbitComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); - return var1; + static final int method634(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; } + + if (var2 > 192) { + var1 /= 2; + } + + if (var2 > 217) { + var1 /= 2; + } + + if (var2 > 243) { + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; } } \ No newline at end of file diff --git a/osrs/src/main/java/MidiFileReader.java b/osrs/src/main/java/MidiFileReader.java index 51f778324..6dbe2d2d3 100644 --- a/osrs/src/main/java/MidiFileReader.java +++ b/osrs/src/main/java/MidiFileReader.java @@ -3,52 +3,52 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mf") +@ObfuscatedName("mx") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("av") - static final byte[] field2834; - @ObfuscatedName("ac") + @ObfuscatedName("az") + static final byte[] field2831; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lul;" + descriptor = "Luj;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("division") int division; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("ah") + @ObfuscatedName("au") int[] field2837; - @ObfuscatedName("ar") - int field2836; - @ObfuscatedName("am") - long field2841; + @ObfuscatedName("aa") + int field2832; + @ObfuscatedName("al") + long field2838; static { - field2834 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + field2831 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; } MidiFileReader() { this.buffer = new Buffer((byte[])null); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("parse") void parse(byte[] var1) { this.buffer.array = var1; this.buffer.offset = 10; int var2 = this.buffer.readUnsignedShort(); this.division = this.buffer.readUnsignedShort(); - this.field2836 = 500000; + this.field2832 = 500000; this.trackStarts = new int[var2]; Buffer var10000; @@ -65,7 +65,7 @@ void parse(byte[] var1) { var10000 = this.buffer; } - this.field2841 = 0L; + this.field2838 = 0L; this.trackPositions = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { @@ -76,7 +76,7 @@ void parse(byte[] var1) { this.field2837 = new int[var2]; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("clear") void clear() { this.buffer.array = null; @@ -86,37 +86,37 @@ void clear() { this.field2837 = null; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("isReady") boolean isReady() { return this.buffer.array != null; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("trackCount") int trackCount() { return this.trackPositions.length; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); @@ -124,14 +124,14 @@ void readTrackLength(int var1) { var10000[var1] += var2; } - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); return var2; } - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; @@ -145,7 +145,7 @@ int readMessage0(int var1) { } if (var5 != 240 && var5 != 247) { - return this.method1709(var1, var5); + return this.method1700(var1, var5); } else { int var3 = this.buffer.readVarInt(); if (var5 == 247 && var3 > 0) { @@ -153,7 +153,7 @@ int readMessage0(int var1) { if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { ++this.buffer.offset; this.field2837[var1] = var4; - return this.method1709(var1, var4); + return this.method1700(var1, var4); } } @@ -163,8 +163,8 @@ int readMessage0(int var1) { } } - @ObfuscatedName("ag") - int method1709(int var1, int var2) { + @ObfuscatedName("ap") + int method1700(int var1, int var2) { int var4; if (var2 == 255) { int var7 = this.buffer.readUnsignedByte(); @@ -178,8 +178,8 @@ int method1709(int var1, int var2) { int var5 = this.buffer.readMedium(); var4 -= 3; int var6 = this.trackLengths[var1]; - this.field2841 += (long)var6 * (long)(this.field2836 - var5); - this.field2836 = var5; + this.field2838 += (long)var6 * (long)(this.field2832 - var5); + this.field2832 = var5; var10000 = this.buffer; var10000.offset += var4; return 2; @@ -189,7 +189,7 @@ int method1709(int var1, int var2) { return 3; } } else { - byte var3 = field2834[var2 - 128]; + byte var3 = field2831[var2 - 128]; var4 = var2; if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -203,12 +203,12 @@ int method1709(int var1, int var2) { } } - @ObfuscatedName("aa") - long method1710(int var1) { - return this.field2841 + (long)var1 * (long)this.field2836; + @ObfuscatedName("av") + long method1701(int var1) { + return this.field2838 + (long)var1 * (long)this.field2832; } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; @@ -225,7 +225,7 @@ int getPrioritizedTrack() { return var2; } - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; @@ -239,10 +239,10 @@ boolean isDone() { return true; } - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("reset") void reset(long var1) { - this.field2841 = var1; + this.field2838 = var1; int var3 = this.trackPositions.length; for (int var4 = 0; var4 < var3; ++var4) { diff --git a/osrs/src/main/java/MidiPcmStream.java b/osrs/src/main/java/MidiPcmStream.java index 6ca300633..ce70153f0 100644 --- a/osrs/src/main/java/MidiPcmStream.java +++ b/osrs/src/main/java/MidiPcmStream.java @@ -10,160 +10,165 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -@ObfuscatedName("mt") +@ObfuscatedName("mn") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("bo") - static AtomicBoolean field2804; + @ObfuscatedName("wg") + @ObfuscatedSignature( + descriptor = "Los;" + ) + public static class381 field2799; @ObfuscatedName("bp") - static ThreadPoolExecutor field2803; - @ObfuscatedName("ac") + static AtomicBoolean field2801; + @ObfuscatedName("bw") + static ThreadPoolExecutor field2800; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Ltw;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("al") - int field2807; - @ObfuscatedName("ak") - int field2806; - @ObfuscatedName("ax") - int[] field2823; - @ObfuscatedName("ao") - int[] field2817; @ObfuscatedName("ah") - int[] field2815; + int field2803; @ObfuscatedName("ar") - int[] field2819; - @ObfuscatedName("ab") - int[] field2811; - @ObfuscatedName("am") + int field2804; + @ObfuscatedName("ao") int[] field2816; - @ObfuscatedName("av") - int[] field2821; - @ObfuscatedName("ag") - int[] field2814; - @ObfuscatedName("aa") - int[] field2810; - @ObfuscatedName("ae") - int[] field2812; - @ObfuscatedName("aw") - int[] field2822; - @ObfuscatedName("aq") + @ObfuscatedName("ab") + int[] field2808; + @ObfuscatedName("au") int[] field2818; + @ObfuscatedName("aa") + int[] field2807; + @ObfuscatedName("ac") + int[] field2809; + @ObfuscatedName("al") + int[] field2814; @ObfuscatedName("az") - int[] field2824; - @ObfuscatedName("at") - int[] field2820; - @ObfuscatedName("af") + int[] field2821; + @ObfuscatedName("ap") + int[] field2817; + @ObfuscatedName("av") + int[] field2819; + @ObfuscatedName("ai") int[] field2813; + @ObfuscatedName("aw") + int[] field2820; + @ObfuscatedName("ae") + int[] field2811; + @ObfuscatedName("an") + int[] field2815; + @ObfuscatedName("ag") + int[] field2812; @ObfuscatedName("ad") + int[] field2810; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "[[Lms;" + descriptor = "[[Lmw;" ) - MusicPatchNode[][] field2830; - @ObfuscatedName("bn") + MusicPatchNode[][] field2826; + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "[[Lms;" + descriptor = "[[Lmw;" ) - MusicPatchNode[][] field2831; - @ObfuscatedName("bk") + MusicPatchNode[][] field2827; + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lmx;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("by") - boolean field2805; - @ObfuscatedName("bd") + @ObfuscatedName("bl") + boolean field2802; + @ObfuscatedName("bi") @Export("track") int track; - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("trackLength") int trackLength; - @ObfuscatedName("bv") - long field2827; + @ObfuscatedName("bf") + long field2823; + @ObfuscatedName("bg") + long field2824; @ObfuscatedName("ba") - long field2826; - @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmj;" ) @Export("patchStream") MusicPatchPcmStream patchStream; - @ObfuscatedName("bb") - PriorityQueue field2825; - @ObfuscatedName("bt") - public int field2833; + @ObfuscatedName("bm") + PriorityQueue field2822; + @ObfuscatedName("bj") + public int field2830; static { - field2804 = null; - field2803 = null; + field2801 = null; + field2800 = null; } public MidiPcmStream() { - this.field2807 = 256; - this.field2806 = 1000000; - this.field2823 = new int[16]; + this.field2803 = 256; + this.field2804 = 1000000; + this.field2816 = new int[16]; + this.field2808 = new int[16]; + this.field2818 = new int[16]; + this.field2807 = new int[16]; + this.field2809 = new int[16]; + this.field2814 = new int[16]; + this.field2821 = new int[16]; this.field2817 = new int[16]; - this.field2815 = new int[16]; this.field2819 = new int[16]; + this.field2813 = new int[16]; + this.field2820 = new int[16]; this.field2811 = new int[16]; - this.field2816 = new int[16]; - this.field2821 = new int[16]; - this.field2814 = new int[16]; - this.field2810 = new int[16]; + this.field2815 = new int[16]; this.field2812 = new int[16]; - this.field2822 = new int[16]; - this.field2818 = new int[16]; - this.field2824 = new int[16]; - this.field2820 = new int[16]; - this.field2813 = new int[16]; - this.field2830 = new MusicPatchNode[16][128]; - this.field2831 = new MusicPatchNode[16][128]; + this.field2810 = new int[16]; + this.field2826 = new MusicPatchNode[16][128]; + this.field2827 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); - this.field2825 = new PriorityQueue(5, new class330()); - this.field2833 = 0; + this.field2822 = new PriorityQueue(5, new class327()); + this.field2830 = 0; this.musicPatches = new NodeHashTable(128); - this.method1683(); + this.method1674(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "109" + garbageValue = "-19" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field2807 = var1; + this.field2803 = var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-13" + garbageValue = "30" ) - public int method1662() { - return this.field2807; + public int method1653() { + return this.field2803; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lmk;Lom;Lbl;I)Z", - garbageValue = "-1830159532" + descriptor = "(Lms;Lol;Lbc;I)Z", + garbageValue = "289790936" ) - public synchronized boolean method1663(MusicTrack var1, AbstractArchive var2, SoundCache var3) { + public synchronized boolean method1654(MusicTrack var1, AbstractArchive var2, SoundCache var3) { boolean var4 = true; - synchronized(this.field2825) { - this.field2825.clear(); + synchronized(this.field2822) { + this.field2822.clear(); } - for (class332 var5 = (class332)var1.field2860.first(); var5 != null; var5 = (class332)var1.field2860.next()) { + for (class329 var5 = (class329)var1.field2857.first(); var5 != null; var5 = (class329)var1.field2857.next()) { int var12 = (int)var5.key; MusicPatch var7 = (MusicPatch)this.musicPatches.get((long)var12); if (var7 == null) { - var7 = ZoneOperation.method1643(var2, var12); + var7 = LoginScreenAnimation.method521(var2, var12); if (var7 == null) { var4 = false; continue; @@ -172,15 +177,15 @@ public synchronized boolean method1663(MusicTrack var1, AbstractArchive var2, So this.musicPatches.put(var7, (long)var12); } - if (!var7.method1714(var3, var5.field2896)) { + if (!var7.method1710(var3, var5.field2894)) { var4 = false; - } else if (this.field2825 != null) { - synchronized(this.field2825) { - Iterator var9 = var7.field2851.iterator(); + } else if (this.field2822 != null) { + synchronized(this.field2822) { + Iterator var9 = var7.field2848.iterator(); while (var9.hasNext()) { class53 var10 = (class53)var9.next(); - this.field2825.add(new class323(var5.field2895, var10)); + this.field2822.add(new class320(var5.field2893, var10)); } } } @@ -189,135 +194,135 @@ public synchronized boolean method1663(MusicTrack var1, AbstractArchive var2, So return var4; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-38" + garbageValue = "121" ) - public void method1664() { - if (this.field2825 != null) { - if (field2804 != null) { - field2804.set(true); + public void method1655() { + if (this.field2822 != null) { + if (field2801 != null) { + field2801.set(true); } - field2804 = new AtomicBoolean(false); - AtomicBoolean var1 = field2804; - if (field2803 == null) { + field2801 = new AtomicBoolean(false); + AtomicBoolean var1 = field2801; + if (field2800 == null) { int var2 = Runtime.getRuntime().availableProcessors(); - field2803 = new ThreadPoolExecutor(0, var2, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), new class322(this)); + field2800 = new ThreadPoolExecutor(0, var2, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), new class319(this)); } - field2803.submit(new class326(this, var1)); + field2800.submit(new class323(this, var1)); } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "356838086" + garbageValue = "1842485318" ) - public synchronized void method1665() { + public synchronized void method1656() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.clear(); } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbk;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbk;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") protected synchronized int vmethod5648() { return 0; } - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2806 / PcmPlayer.field179; + int var4 = this.midiFile.division * this.field2804 / PcmPlayer.field179; do { - long var5 = this.field2827 + (long)var3 * (long)var4; - if (this.field2826 - var5 >= 0L) { - this.field2827 = var5; + long var5 = (long)var3 * (long)var4 + this.field2823; + if (this.field2824 - var5 >= 0L) { + this.field2823 = var5; break; } - int var7 = (int)((this.field2826 - this.field2827 + (long)var4 - 1L) / (long)var4); - this.field2827 += (long)var7 * (long)var4; + int var7 = (int)(((long)var4 + (this.field2824 - this.field2823) - 1L) / (long)var4); + this.field2823 += (long)var4 * (long)var7; this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; - this.method1696(); + this.method1687(); } while(this.midiFile.isReady()); } this.patchStream.fill(var1, var2, var3); } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "64" + garbageValue = "-64" ) - public synchronized void method1666() { + public synchronized void method1657() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.remove(); } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2806 / PcmPlayer.field179; + int var2 = this.midiFile.division * this.field2804 / PcmPlayer.field179; do { - long var3 = this.field2827 + (long)var1 * (long)var2; - if (this.field2826 - var3 >= 0L) { - this.field2827 = var3; + long var3 = (long)var1 * (long)var2 + this.field2823; + if (this.field2824 - var3 >= 0L) { + this.field2823 = var3; break; } - int var5 = (int)((this.field2826 - this.field2827 + (long)var2 - 1L) / (long)var2); - this.field2827 += (long)var5 * (long)var2; + int var5 = (int)(((long)var2 + (this.field2824 - this.field2823) - 1L) / (long)var2); + this.field2823 += (long)var2 * (long)var5; this.patchStream.skip(var5); var1 -= var5; - this.method1696(); + this.method1687(); } while(this.midiFile.isReady()); } this.patchStream.skip(var1); } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lmk;ZI)V", - garbageValue = "-1812900871" + descriptor = "(Lms;ZI)V", + garbageValue = "-624556623" ) @Export("setMusicTrack") public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.field2805 = var2; - this.field2827 = 0L; + this.field2802 = var2; + this.field2823 = 0L; int var3 = this.midiFile.trackCount(); for (int var4 = 0; var4 < var3; ++var4) { @@ -328,180 +333,180 @@ public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2826 = this.midiFile.method1710(this.trackLength); + this.field2824 = this.midiFile.method1701(this.trackLength); } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1705880184" + descriptor = "(B)V", + garbageValue = "84" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); - this.method1683(); + this.method1674(); } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1826603097" + garbageValue = "2096879002" ) @Export("isReady") public synchronized boolean isReady() { return this.midiFile.isReady(); } - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1035642858" + descriptor = "(S)Z", + garbageValue = "26568" ) - public synchronized boolean method1670() { - return this.musicPatches.method2491() > 0; + public synchronized boolean method1661() { + return this.musicPatches.method2468() > 0; } - @ObfuscatedName("aj") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" + descriptor = "(III)V", + garbageValue = "-438742560" ) - public synchronized void method1671(int var1, int var2) { - this.method1672(var1, var2); + public synchronized void method1662(int var1, int var2) { + this.method1663(var1, var2); } - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "160" + descriptor = "(IIB)V", + garbageValue = "31" ) - void method1672(int var1, int var2) { - this.field2819[var1] = var2; - this.field2816[var1] = var2 & -128; - this.method1673(var1, var2); + void method1663(int var1, int var2) { + this.field2807[var1] = var2; + this.field2814[var1] = var2 & -128; + this.method1664(var1, var2); } - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2093622252" + descriptor = "(IIB)V", + garbageValue = "39" ) - void method1673(int var1, int var2) { - if (var2 != this.field2811[var1]) { - this.field2811[var1] = var2; + void method1664(int var1, int var2) { + if (var2 != this.field2809[var1]) { + this.field2809[var1] = var2; for (int var3 = 0; var3 < 128; ++var3) { - this.field2831[var1][var3] = null; + this.field2827[var1][var3] = null; } } } - @ObfuscatedName("ai") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1932106886" + descriptor = "(IIIB)V", + garbageValue = "123" ) - void method1674(int var1, int var2, int var3) { - this.method1676(var1, var2, 64); - if ((this.field2812[var1] & 2) != 0) { + void method1665(int var1, int var2, int var3) { + this.method1667(var1, var2, 64); + if ((this.field2813[var1] & 2) != 0) { for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2865 == var1 && var4.field2876 < 0) { - this.field2830[var1][var4.field2868] = null; - this.field2830[var1][var2] = var4; - int var5 = (var4.field2867 * var4.field2878 >> 12) + var4.field2870; - var4.field2870 += var2 - var4.field2868 << 8; - var4.field2878 = var5 - var4.field2870; - var4.field2867 = 4096; - var4.field2868 = var2; + if (var4.field2872 == var1 && var4.field2876 < 0) { + this.field2826[var1][var4.field2873] = null; + this.field2826[var1][var2] = var4; + int var5 = (var4.field2877 * var4.field2870 >> 12) + var4.field2868; + var4.field2868 += var2 - var4.field2873 << 8; + var4.field2877 = var5 - var4.field2868; + var4.field2870 = 4096; + var4.field2873 = var2; return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2811[var1]); + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2809[var1]); if (var9 != null) { if (var9.rawSounds[var2] != null) { - RawSound var8 = var9.rawSounds[var2].method300(); + RawSound var8 = var9.rawSounds[var2].method305(); if (var8 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.field2865 = var1; + var6.field2872 = var1; var6.table = var9; var6.rawSound = var8; - var6.field2881 = var9.field2852[var2]; - var6.field2872 = var9.field2845[var2]; - var6.field2868 = var2; - var6.field2875 = var3 * var3 * var9.field2847[var2] * var9.field2849 + 1024 >> 11; - var6.field2864 = var9.field2846[var2] & 255; - var6.field2870 = (var2 << 8) - (var9.field2853[var2] & 32767); - var6.field2863 = 0; - var6.field2873 = 0; - var6.field2879 = 0; + var6.field2878 = var9.field2849[var2]; + var6.field2862 = var9.field2843[var2]; + var6.field2873 = var2; + var6.field2861 = var3 * var3 * var9.field2842[var2] * var9.field2846 + 1024 >> 11; + var6.field2863 = var9.field2844[var2] & 255; + var6.field2868 = (var2 << 8) - (var9.field2850[var2] & 32767); + var6.field2874 = 0; + var6.field2875 = 0; + var6.field2871 = 0; var6.field2876 = -1; - var6.field2869 = 0; - if (this.field2824[var1] == 0) { - var6.stream = RawPcmStream.method244(var8, this.method1688(var6), this.method1689(var6), this.method1690(var6)); + var6.field2867 = 0; + if (this.field2815[var1] == 0) { + var6.stream = RawPcmStream.method249(var8, this.method1679(var6), this.method1680(var6), this.method1681(var6)); } else { - var6.stream = RawPcmStream.method244(var8, this.method1688(var6), 0, this.method1690(var6)); - this.method1675(var6, var9.field2853[var2] < 0); + var6.stream = RawPcmStream.method249(var8, this.method1679(var6), 0, this.method1681(var6)); + this.method1666(var6, var9.field2850[var2] < 0); } - if (var9.field2853[var2] < 0) { + if (var9.field2850[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field2872 >= 0) { - MusicPatchNode var7 = this.field2831[var1][var6.field2872]; + if (var6.field2862 >= 0) { + MusicPatchNode var7 = this.field2827[var1][var6.field2862]; if (var7 != null && var7.field2876 < 0) { - this.field2830[var1][var7.field2868] = null; + this.field2826[var1][var7.field2873] = null; var7.field2876 = 0; } - this.field2831[var1][var6.field2872] = var6; + this.field2827[var1][var6.field2862] = var6; } this.patchStream.queue.addFirst(var6); - this.field2830[var1][var2] = var6; + this.field2826[var1][var2] = var6; } } } } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lms;ZI)V", - garbageValue = "240911451" + descriptor = "(Lmw;ZB)V", + garbageValue = "8" ) - void method1675(MusicPatchNode var1, boolean var2) { + void method1666(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; int var4; - if (var2 && var1.rawSound.field166) { + if (var2 && var1.rawSound.field165) { int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)this.field2824[var1.field2865] * (long)var5 >> 6); + var4 = (int)((long)this.field2815[var1.field2872] * (long)var5 >> 6); var3 <<= 8; if (var4 >= var3) { var4 = var3 + var3 - 1 - var4; - var1.stream.method253(); + var1.stream.method258(); } } else { - var4 = (int)((long)var3 * (long)this.field2824[var1.field2865] >> 6); + var4 = (int)((long)this.field2815[var1.field2872] * (long)var3 >> 6); } - var1.stream.method252(var4); + var1.stream.method257(var4); } @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1358549088" + garbageValue = "-1277420327" ) - void method1676(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2830[var1][var2]; + void method1667(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2826[var1][var2]; if (var4 != null) { - this.field2830[var1][var2] = null; - if ((this.field2812[var1] & 2) != 0) { + this.field2826[var1][var2] = null; + if ((this.field2813[var1] & 2) != 0) { for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var5.field2865 == var4.field2865 && var5.field2876 < 0 && var5 != var4) { + if (var5.field2872 == var4.field2872 && var5.field2876 < 0 && var5 != var4) { var4.field2876 = 0; break; } @@ -513,50 +518,50 @@ void method1676(int var1, int var2, int var3) { } } - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "714069724" + descriptor = "(IIIB)V", + garbageValue = "-84" ) - void method1677(int var1, int var2, int var3) { + void method1668(int var1, int var2, int var3) { } - @ObfuscatedName("bb") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-454645454" + descriptor = "(IIB)V", + garbageValue = "0" ) - void method1678(int var1, int var2) { + void method1669(int var1, int var2) { } - @ObfuscatedName("bo") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2005247777" + descriptor = "(IIS)V", + garbageValue = "-5960" ) - void method1679(int var1, int var2) { + void method1670(int var1, int var2) { this.field2821[var1] = var2; } - @ObfuscatedName("bp") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "7" + descriptor = "(II)V", + garbageValue = "-2098056782" ) - void method1680(int var1) { + void method1671(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2865 == var1) { + if (var1 < 0 || var2.field2872 == var1) { if (var2.stream != null) { - var2.stream.method257(PcmPlayer.field179 / 100); - if (var2.stream.method261()) { + var2.stream.method262(PcmPlayer.field179 / 100); + if (var2.stream.method266()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method1727(); + var2.method1724(); } if (var2.field2876 < 0) { - this.field2830[var2.field2865][var2.field2868] = null; + this.field2826[var2.field2872][var2.field2873] = null; } var2.remove(); @@ -565,78 +570,78 @@ void method1680(int var1) { } - @ObfuscatedName("bm") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-58" + garbageValue = "1" ) - void method1681(int var1) { + void method1672(int var1) { if (var1 >= 0) { - this.field2823[var1] = 12800; - this.field2817[var1] = 8192; - this.field2815[var1] = 16383; + this.field2816[var1] = 12800; + this.field2808[var1] = 8192; + this.field2818[var1] = 16383; this.field2821[var1] = 8192; - this.field2814[var1] = 0; - this.field2810[var1] = 8192; - this.method1684(var1); - this.method1685(var1); - this.field2812[var1] = 0; - this.field2822[var1] = 32767; - this.field2818[var1] = 256; - this.field2824[var1] = 0; - this.method1687(var1, 8192); + this.field2817[var1] = 0; + this.field2819[var1] = 8192; + this.method1675(var1); + this.method1676(var1); + this.field2813[var1] = 0; + this.field2820[var1] = 32767; + this.field2811[var1] = 256; + this.field2815[var1] = 0; + this.method1678(var1, 8192); } else { for (var1 = 0; var1 < 16; ++var1) { - this.method1681(var1); + this.method1672(var1); } } } - @ObfuscatedName("br") + @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1157620765" + garbageValue = "-2027347232" ) - void method1682(int var1) { + void method1673(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2865 == var1) && var2.field2876 < 0) { - this.field2830[var2.field2865][var2.field2868] = null; + if ((var1 < 0 || var2.field2872 == var1) && var2.field2876 < 0) { + this.field2826[var2.field2872][var2.field2873] = null; var2.field2876 = 0; } } } - @ObfuscatedName("bc") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "421748536" + garbageValue = "3235279" ) - void method1683() { - this.method1680(-1); - this.method1681(-1); + void method1674() { + this.method1671(-1); + this.method1672(-1); int var1; for (var1 = 0; var1 < 16; ++var1) { - this.field2811[var1] = this.field2819[var1]; + this.field2809[var1] = this.field2807[var1]; } for (var1 = 0; var1 < 16; ++var1) { - this.field2816[var1] = this.field2819[var1] & -128; + this.field2814[var1] = this.field2807[var1] & -128; } } - @ObfuscatedName("bu") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "666381709" + garbageValue = "936925077" ) - void method1684(int var1) { - if ((this.field2812[var1] & 2) != 0) { + void method1675(int var1) { + if ((this.field2813[var1] & 2) != 0) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2865 == var1 && this.field2830[var1][var2.field2868] == null && var2.field2876 < 0) { + if (var2.field2872 == var1 && this.field2826[var1][var2.field2873] == null && var2.field2876 < 0) { var2.field2876 = 0; } } @@ -644,28 +649,28 @@ void method1684(int var1) { } - @ObfuscatedName("bf") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "3" + garbageValue = "31" ) - void method1685(int var1) { - if ((this.field2812[var1] & 4) != 0) { + void method1676(int var1) { + if ((this.field2813[var1] & 4) != 0) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2865 == var1) { - var2.field2874 = 0; + if (var2.field2872 == var1) { + var2.field2864 = 0; } } } } - @ObfuscatedName("bh") + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1231976764" + garbageValue = "-1011808650" ) - void method1686(int var1) { + void method1677(int var1) { int var2 = var1 & 240; int var3; int var4; @@ -674,235 +679,235 @@ void method1686(int var1) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method1676(var3, var4, var5); + this.method1667(var3, var4, var5); } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var5 > 0) { - this.method1674(var3, var4, var5); + this.method1665(var3, var4, var5); } else { - this.method1676(var3, var4, 64); + this.method1667(var3, var4, 64); } } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method1677(var3, var4, var5); + this.method1668(var3, var4, var5); } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var4 == 0) { - this.field2816[var3] = (var5 << 14) + (this.field2816[var3] & -2080769); + this.field2814[var3] = (var5 << 14) + (this.field2814[var3] & -2080769); } if (var4 == 32) { - this.field2816[var3] = (var5 << 7) + (this.field2816[var3] & -16257); + this.field2814[var3] = (var5 << 7) + (this.field2814[var3] & -16257); } if (var4 == 1) { - this.field2814[var3] = (var5 << 7) + (this.field2814[var3] & -16257); + this.field2817[var3] = (var5 << 7) + (this.field2817[var3] & -16257); } if (var4 == 33) { - this.field2814[var3] = var5 + (this.field2814[var3] & -128); + this.field2817[var3] = var5 + (this.field2817[var3] & -128); } if (var4 == 5) { - this.field2810[var3] = (var5 << 7) + (this.field2810[var3] & -16257); + this.field2819[var3] = (var5 << 7) + (this.field2819[var3] & -16257); } if (var4 == 37) { - this.field2810[var3] = var5 + (this.field2810[var3] & -128); + this.field2819[var3] = var5 + (this.field2819[var3] & -128); } if (var4 == 7) { - this.field2823[var3] = (var5 << 7) + (this.field2823[var3] & -16257); + this.field2816[var3] = (var5 << 7) + (this.field2816[var3] & -16257); } if (var4 == 39) { - this.field2823[var3] = var5 + (this.field2823[var3] & -128); + this.field2816[var3] = var5 + (this.field2816[var3] & -128); } if (var4 == 10) { - this.field2817[var3] = (var5 << 7) + (this.field2817[var3] & -16257); + this.field2808[var3] = (var5 << 7) + (this.field2808[var3] & -16257); } if (var4 == 42) { - this.field2817[var3] = var5 + (this.field2817[var3] & -128); + this.field2808[var3] = var5 + (this.field2808[var3] & -128); } if (var4 == 11) { - this.field2815[var3] = (var5 << 7) + (this.field2815[var3] & -16257); + this.field2818[var3] = (var5 << 7) + (this.field2818[var3] & -16257); } if (var4 == 43) { - this.field2815[var3] = var5 + (this.field2815[var3] & -128); + this.field2818[var3] = var5 + (this.field2818[var3] & -128); } int[] var10000; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field2812; + var10000 = this.field2813; var10000[var3] |= 1; } else { - var10000 = this.field2812; + var10000 = this.field2813; var10000[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field2812; + var10000 = this.field2813; var10000[var3] |= 2; } else { - this.method1684(var3); - var10000 = this.field2812; + this.method1675(var3); + var10000 = this.field2813; var10000[var3] &= -3; } } if (var4 == 99) { - this.field2822[var3] = (var5 << 7) + (this.field2822[var3] & 127); + this.field2820[var3] = (var5 << 7) + (this.field2820[var3] & 127); } if (var4 == 98) { - this.field2822[var3] = (this.field2822[var3] & 16256) + var5; + this.field2820[var3] = (this.field2820[var3] & 16256) + var5; } if (var4 == 101) { - this.field2822[var3] = (var5 << 7) + (this.field2822[var3] & 127) + 16384; + this.field2820[var3] = (var5 << 7) + (this.field2820[var3] & 127) + 16384; } if (var4 == 100) { - this.field2822[var3] = (this.field2822[var3] & 16256) + var5 + 16384; + this.field2820[var3] = (this.field2820[var3] & 16256) + var5 + 16384; } if (var4 == 120) { - this.method1680(var3); + this.method1671(var3); } if (var4 == 121) { - this.method1681(var3); + this.method1672(var3); } if (var4 == 123) { - this.method1682(var3); + this.method1673(var3); } int var6; if (var4 == 6) { - var6 = this.field2822[var3]; + var6 = this.field2820[var3]; if (var6 == 16384) { - this.field2818[var3] = (var5 << 7) + (this.field2818[var3] & -16257); + this.field2811[var3] = (var5 << 7) + (this.field2811[var3] & -16257); } } if (var4 == 38) { - var6 = this.field2822[var3]; + var6 = this.field2820[var3]; if (var6 == 16384) { - this.field2818[var3] = var5 + (this.field2818[var3] & -128); + this.field2811[var3] = var5 + (this.field2811[var3] & -128); } } if (var4 == 16) { - this.field2824[var3] = (var5 << 7) + (this.field2824[var3] & -16257); + this.field2815[var3] = (var5 << 7) + (this.field2815[var3] & -16257); } if (var4 == 48) { - this.field2824[var3] = var5 + (this.field2824[var3] & -128); + this.field2815[var3] = var5 + (this.field2815[var3] & -128); } if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field2812; + var10000 = this.field2813; var10000[var3] |= 4; } else { - this.method1685(var3); - var10000 = this.field2812; + this.method1676(var3); + var10000 = this.field2813; var10000[var3] &= -5; } } if (var4 == 17) { - this.method1687(var3, (var5 << 7) + (this.field2820[var3] & -16257)); + this.method1678(var3, (var5 << 7) + (this.field2812[var3] & -16257)); } if (var4 == 49) { - this.method1687(var3, var5 + (this.field2820[var3] & -128)); + this.method1678(var3, var5 + (this.field2812[var3] & -128)); } } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method1673(var3, var4 + this.field2816[var3]); + this.method1664(var3, var4 + this.field2814[var3]); } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method1678(var3, var4); + this.method1669(var3, var4); } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method1679(var3, var4); + this.method1670(var3, var4); } else { var2 = var1 & 255; if (var2 == 255) { - this.method1683(); + this.method1674(); } } } - @ObfuscatedName("bl") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1065588896" + descriptor = "(IIB)V", + garbageValue = "23" ) - void method1687(int var1, int var2) { - this.field2820[var1] = var2; - this.field2813[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); + void method1678(int var1, int var2) { + this.field2812[var1] = var2; + this.field2810[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); } - @ObfuscatedName("bg") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(Lms;S)I", - garbageValue = "2001" + descriptor = "(Lmw;I)I", + garbageValue = "2086193831" ) - int method1688(MusicPatchNode var1) { - int var2 = (var1.field2878 * var1.field2867 >> 12) + var1.field2870; - var2 += (this.field2821[var1.field2865] - 8192) * this.field2818[var1.field2865] >> 12; - MusicPatchNode2 var3 = var1.field2881; + int method1679(MusicPatchNode var1) { + int var2 = (var1.field2877 * var1.field2870 >> 12) + var1.field2868; + var2 += (this.field2821[var1.field2872] - 8192) * this.field2811[var1.field2872] >> 12; + MusicPatchNode2 var3 = var1.field2878; int var4; - if (var3.field2781 > 0 && (var3.field2786 > 0 || this.field2814[var1.field2865] > 0)) { - var4 = var3.field2786 << 2; - int var5 = var3.field2784 << 1; - if (var1.field2871 < var5) { - var4 = var4 * var1.field2871 / var5; + if (var3.field2782 > 0 && (var3.field2780 > 0 || this.field2817[var1.field2872] > 0)) { + var4 = var3.field2780 << 2; + int var5 = var3.field2783 << 1; + if (var1.field2866 < var5) { + var4 = var4 * var1.field2866 / var5; } - var4 += this.field2814[var1.field2865] >> 7; - double var6 = Math.sin((double)(var1.field2877 & 511) * 0.01227184630308513D); + var4 += this.field2817[var1.field2872] >> 7; + double var6 = Math.sin((double)(var1.field2869 & 511) * 0.01227184630308513D); var2 += (int)((double)var4 * var6); } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)PcmPlayer.field179 + 0.5D); + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field179 + 0.5D); return var4 < 1 ? 1 : var4; } - @ObfuscatedName("bj") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(Lms;B)I", - garbageValue = "59" + descriptor = "(Lmw;B)I", + garbageValue = "-88" ) - int method1689(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2881; - int var3 = this.field2815[var1.field2865] * this.field2823[var1.field2865] + 4096 >> 13; + int method1680(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2878; + int var3 = this.field2816[var1.field2872] * this.field2818[var1.field2872] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2875 + 16384 >> 15; - var3 = var3 * this.field2807 + 128 >> 8; - if (var2.field2783 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2783 * (double)var1.field2863 * 1.953125E-5D) + 0.5D); + var3 = var3 * var1.field2861 + 16384 >> 15; + var3 = var3 * this.field2803 + 128 >> 8; + if (var2.field2785 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2874 * (double)var2.field2785) + 0.5D); } int var4; @@ -910,24 +915,24 @@ int method1689(MusicPatchNode var1) { int var6; int var7; if (var2.field2779 != null) { - var4 = var1.field2873; - var5 = var2.field2779[var1.field2879 + 1]; - if (var1.field2879 < var2.field2779.length - 2) { - var6 = (var2.field2779[var1.field2879] & 255) << 8; - var7 = (var2.field2779[var1.field2879 + 2] & 255) << 8; - var5 += (var4 - var6) * (var2.field2779[var1.field2879 + 3] - var5) / (var7 - var6); + var4 = var1.field2875; + var5 = var2.field2779[var1.field2871 + 1]; + if (var1.field2871 < var2.field2779.length - 2) { + var6 = (var2.field2779[var1.field2871] & 255) << 8; + var7 = (var2.field2779[var1.field2871 + 2] & 255) << 8; + var5 += (var2.field2779[var1.field2871 + 3] - var5) * (var4 - var6) / (var7 - var6); } - var3 = var5 * var3 + 32 >> 6; + var3 = var3 * var5 + 32 >> 6; } - if (var1.field2876 > 0 && var2.field2780 != null) { + if (var1.field2876 > 0 && var2.field2778 != null) { var4 = var1.field2876; - var5 = var2.field2780[var1.field2869 + 1]; - if (var1.field2869 < var2.field2780.length - 2) { - var6 = (var2.field2780[var1.field2869] & 255) << 8; - var7 = (var2.field2780[var1.field2869 + 2] & 255) << 8; - var5 += (var2.field2780[var1.field2869 + 3] - var5) * (var4 - var6) / (var7 - var6); + var5 = var2.field2778[var1.field2867 + 1]; + if (var1.field2867 < var2.field2778.length - 2) { + var6 = (var2.field2778[var1.field2867] & 255) << 8; + var7 = (var2.field2778[var1.field2867 + 2] & 255) << 8; + var5 += (var4 - var6) * (var2.field2778[var1.field2867 + 3] - var5) / (var7 - var6); } var3 = var5 * var3 + 32 >> 6; @@ -936,27 +941,27 @@ int method1689(MusicPatchNode var1) { return var3; } - @ObfuscatedName("bx") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(Lms;B)I", - garbageValue = "2" + descriptor = "(Lmw;B)I", + garbageValue = "-7" ) - int method1690(MusicPatchNode var1) { - int var2 = this.field2817[var1.field2865]; - return var2 < 8192 ? var2 * var1.field2864 + 32 >> 6 : 16384 - ((128 - var1.field2864) * (16384 - var2) + 32 >> 6); + int method1681(MusicPatchNode var1) { + int var2 = this.field2808[var1.field2872]; + return var2 < 8192 ? var2 * var1.field2863 + 32 >> 6 : 16384 - ((128 - var1.field2863) * (16384 - var2) + 32 >> 6); } - @ObfuscatedName("bi") + @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2129137394" + garbageValue = "-1708238703" ) - void method1696() { + void method1687() { int var1 = this.track; int var2 = this.trackLength; long var3; - for (var3 = this.field2826; var2 == this.trackLength; var3 = this.midiFile.method1710(var2)) { + for (var3 = this.field2824; var2 == this.trackLength; var3 = this.midiFile.method1701(var2)) { while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); @@ -964,8 +969,8 @@ void method1696() { this.midiFile.setTrackDone(); this.midiFile.markTrackPosition(var1); if (this.midiFile.isDone()) { - if (!this.field2805 || var2 == 0) { - this.method1683(); + if (!this.field2802 || var2 == 0) { + this.method1674(); this.midiFile.clear(); return; } @@ -976,7 +981,7 @@ void method1696() { } if ((var5 & 128) != 0) { - this.method1686(var5); + this.method1677(var5); } this.midiFile.readTrackLength(var1); @@ -989,20 +994,20 @@ void method1696() { this.track = var1; this.trackLength = var2; - this.field2826 = var3; + this.field2824 = var3; } - @ObfuscatedName("bq") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(Lms;B)Z", - garbageValue = "-28" + descriptor = "(Lmw;I)Z", + garbageValue = "1582725415" ) - boolean method1697(MusicPatchNode var1) { + boolean method1688(MusicPatchNode var1) { if (var1.stream == null) { if (var1.field2876 >= 0) { var1.remove(); - if (var1.field2872 > 0 && var1 == this.field2831[var1.field2865][var1.field2872]) { - this.field2831[var1.field2865][var1.field2872] = null; + if (var1.field2862 > 0 && var1 == this.field2827[var1.field2872][var1.field2862]) { + this.field2827[var1.field2872][var1.field2862] = null; } } @@ -1012,103 +1017,124 @@ boolean method1697(MusicPatchNode var1) { } } - @ObfuscatedName("bw") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "(Lms;[IIIS)Z", - garbageValue = "27530" + descriptor = "(Lmw;[IIII)Z", + garbageValue = "1206952354" ) - boolean method1698(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2866 = PcmPlayer.field179 / 100; - if (var1.field2876 < 0 || var1.stream != null && !var1.stream.method260()) { - int var5 = var1.field2867; + boolean method1689(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2865 = PcmPlayer.field179 / 100; + if (var1.field2876 < 0 || var1.stream != null && !var1.stream.method265()) { + int var5 = var1.field2870; if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2810[var1.field2865] * 4.921259842519685E-4D) + 0.5D); + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2819[var1.field2872] * 4.921259842519685E-4D) + 0.5D); if (var5 < 0) { var5 = 0; } - var1.field2867 = var5; + var1.field2870 = var5; } - var1.stream.method258(this.method1688(var1)); - MusicPatchNode2 var6 = var1.field2881; + var1.stream.method263(this.method1679(var1)); + MusicPatchNode2 var6 = var1.field2878; boolean var7 = false; - ++var1.field2871; - var1.field2877 += var6.field2781; - double var8 = (double)((var1.field2868 - 60 << 8) + (var1.field2878 * var1.field2867 >> 12)) * 5.086263020833333E-6D; - if (var6.field2783 > 0) { - if (var6.field2782 > 0) { - var1.field2863 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2782 * var8) + 0.5D); + ++var1.field2866; + var1.field2869 += var6.field2782; + double var8 = (double)((var1.field2873 - 60 << 8) + (var1.field2877 * var1.field2870 >> 12)) * 5.086263020833333E-6D; + if (var6.field2785 > 0) { + if (var6.field2786 > 0) { + var1.field2874 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2786 * var8) + 0.5D); } else { - var1.field2863 += 128; + var1.field2874 += 128; } } if (var6.field2779 != null) { - if (var6.field2787 > 0) { - var1.field2873 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2787 * var8) + 0.5D); + if (var6.field2784 > 0) { + var1.field2875 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2784 * var8) + 0.5D); } else { - var1.field2873 += 128; + var1.field2875 += 128; } - while (var1.field2879 < var6.field2779.length - 2 && var1.field2873 > (var6.field2779[var1.field2879 + 2] & 255) << 8) { - var1.field2879 += 2; + while (var1.field2871 < var6.field2779.length - 2 && var1.field2875 > (var6.field2779[var1.field2871 + 2] & 255) << 8) { + var1.field2871 += 2; } - if (var6.field2779.length - 2 == var1.field2879 && var6.field2779[var1.field2879 + 1] == 0) { + if (var6.field2779.length - 2 == var1.field2871 && var6.field2779[var1.field2871 + 1] == 0) { var7 = true; } } - if (var1.field2876 >= 0 && var6.field2780 != null && (this.field2812[var1.field2865] & 1) == 0 && (var1.field2872 < 0 || var1 != this.field2831[var1.field2865][var1.field2872])) { - if (var6.field2785 > 0) { - var1.field2876 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2785 * var8) + 0.5D); + if (var1.field2876 >= 0 && var6.field2778 != null && (this.field2813[var1.field2872] & 1) == 0 && (var1.field2862 < 0 || var1 != this.field2827[var1.field2872][var1.field2862])) { + if (var6.field2781 > 0) { + var1.field2876 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2781 * var8) + 0.5D); } else { var1.field2876 += 128; } - while (var1.field2869 < var6.field2780.length - 2 && var1.field2876 > (var6.field2780[var1.field2869 + 2] & 255) << 8) { - var1.field2869 += 2; + while (var1.field2867 < var6.field2778.length - 2 && var1.field2876 > (var6.field2778[var1.field2867 + 2] & 255) << 8) { + var1.field2867 += 2; } - if (var6.field2780.length - 2 == var1.field2869) { + if (var6.field2778.length - 2 == var1.field2867) { var7 = true; } } if (var7) { - var1.stream.method257(var1.field2866); + var1.stream.method262(var1.field2865); if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); } - if (var1.stream.method261()) { + if (var1.stream.method266()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method1727(); + var1.method1724(); if (var1.field2876 >= 0) { var1.remove(); - if (var1.field2872 > 0 && var1 == this.field2831[var1.field2865][var1.field2872]) { - this.field2831[var1.field2865][var1.field2872] = null; + if (var1.field2862 > 0 && var1 == this.field2827[var1.field2872][var1.field2862]) { + this.field2827[var1.field2872][var1.field2862] = null; } } return true; } else { - var1.stream.method256(var1.field2866, this.method1689(var1), this.method1690(var1)); + var1.stream.method261(var1.field2865, this.method1680(var1), this.method1681(var1)); return false; } } else { - var1.method1727(); + var1.method1724(); var1.remove(); - if (var1.field2872 > 0 && var1 == this.field2831[var1.field2865][var1.field2872]) { - this.field2831[var1.field2865][var1.field2872] = null; + if (var1.field2862 > 0 && var1 == this.field2827[var1.field2872][var1.field2862]) { + this.field2827[var1.field2872][var1.field2862] = null; } return true; } } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1188911227" + ) + static void method1651() { + Tiles.Tiles_minPlane = 99; + class74.Tiles_underlays = new short[4][104][104]; + Interpreter.Tiles_overlays = new short[4][104][104]; + ViewportMouse.Tiles_shapes = new byte[4][104][104]; + class369.field3559 = new byte[4][104][104]; + class344.field3130 = new int[4][105][105]; + class93.field948 = new byte[4][105][105]; + Tiles.field843 = new int[105][105]; + class337.Tiles_hue = new int[104]; + Tiles.Tiles_saturation = new int[104]; + class185.Tiles_lightness = new int[104]; + MenuAction.Tiles_hueMultiplier = new int[104]; + WorldMapLabelSize.field1943 = new int[104]; + } } \ No newline at end of file diff --git a/osrs/src/main/java/MilliClock.java b/osrs/src/main/java/MilliClock.java index a4509e141..405868ca4 100644 --- a/osrs/src/main/java/MilliClock.java +++ b/osrs/src/main/java/MilliClock.java @@ -3,111 +3,128 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("go") +@ObfuscatedName("ie") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("ac") - long[] field1475; - @ObfuscatedName("al") - int field1472; - @ObfuscatedName("ak") - int field1471; - @ObfuscatedName("ax") - long field1474; - @ObfuscatedName("ao") - int field1473; + @ObfuscatedName("at") + long[] field1867; @ObfuscatedName("ah") - int field1470; + int field1863; + @ObfuscatedName("ar") + int field1864; + @ObfuscatedName("ao") + long field1866; + @ObfuscatedName("ab") + int field1862; + @ObfuscatedName("au") + int field1865; MilliClock() { - this.field1475 = new long[10]; - this.field1472 = 256; - this.field1471 = 1; - this.field1473 = 0; - this.field1474 = GrandExchangeOfferTotalQuantityComparator.method1971(); + this.field1867 = new long[10]; + this.field1863 = 256; + this.field1864 = 1; + this.field1862 = 0; + this.field1866 = SpotAnimationDefinition.method962(); for (int var1 = 0; var1 < 10; ++var1) { - this.field1475[var1] = this.field1474; + this.field1867[var1] = this.field1866; } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "436321701" + garbageValue = "-1366277024" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { - this.field1475[var1] = 0L; + this.field1867[var1] = 0L; } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "712947185" + garbageValue = "-2001388980" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1472; - int var4 = this.field1471; - this.field1472 = 300; - this.field1471 = 1; - this.field1474 = GrandExchangeOfferTotalQuantityComparator.method1971(); - if (this.field1475[this.field1470] == 0L) { - this.field1472 = var3; - this.field1471 = var4; - } else if (this.field1474 > this.field1475[this.field1470]) { - this.field1472 = (int)((long)(var1 * 2560) / (this.field1474 - this.field1475[this.field1470])); + int var3 = this.field1863; + int var4 = this.field1864; + this.field1863 = 300; + this.field1864 = 1; + this.field1866 = SpotAnimationDefinition.method962(); + if (this.field1867[this.field1865] == 0L) { + this.field1863 = var3; + this.field1864 = var4; + } else if (this.field1866 > this.field1867[this.field1865]) { + this.field1863 = (int)((long)(var1 * 2560) / (this.field1866 - this.field1867[this.field1865])); } - if (this.field1472 < 25) { - this.field1472 = 25; + if (this.field1863 < 25) { + this.field1863 = 25; } - if (this.field1472 > 256) { - this.field1472 = 256; - this.field1471 = (int)((long)var1 - (this.field1474 - this.field1475[this.field1470]) / 10L); + if (this.field1863 > 256) { + this.field1863 = 256; + this.field1864 = (int)((long)var1 - (this.field1866 - this.field1867[this.field1865]) / 10L); } - if (this.field1471 > var1) { - this.field1471 = var1; + if (this.field1864 > var1) { + this.field1864 = var1; } - this.field1475[this.field1470] = this.field1474; - this.field1470 = (this.field1470 + 1) % 10; + this.field1867[this.field1865] = this.field1866; + this.field1865 = (this.field1865 + 1) % 10; int var5; - if (this.field1471 > 1) { + if (this.field1864 > 1) { for (var5 = 0; var5 < 10; ++var5) { - if (this.field1475[var5] != 0L) { - this.field1475[var5] += (long)this.field1471; + if (0L != this.field1867[var5]) { + this.field1867[var5] += (long)this.field1864; } } } - if (this.field1471 < var2) { - this.field1471 = var2; + if (this.field1864 < var2) { + this.field1864 = var2; } - Players.method623((long)this.field1471); + class219.method1104((long)this.field1864); - for (var5 = 0; this.field1473 < 256; this.field1473 += this.field1472) { + for (var5 = 0; this.field1862 < 256; this.field1862 += this.field1863) { ++var5; } - this.field1473 &= 255; + this.field1862 &= 255; return var5; } - @ObfuscatedName("ac") + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)[Loi;", + garbageValue = "-1866806569" + ) + public static class364[] method1100() { + return new class364[]{class364.field3509, class364.field3510, class364.field3511, class364.field3508}; + } + + @ObfuscatedName("nn") @ObfuscatedSignature( - descriptor = "(Lom;I)V", - garbageValue = "2111970758" + descriptor = "(Lnn;IIIB)V", + garbageValue = "42" ) - public static void method935(AbstractArchive var0) { - DbTableType.field4138 = var0; + static final void method1103(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.method1851(HealthBarDefinition.widgetDefinition, false); + if (var4 != null) { + if (Client.minimapState < 3) { + ItemLayer.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + } + + } } } \ No newline at end of file diff --git a/osrs/src/main/java/ModeWhere.java b/osrs/src/main/java/ModeWhere.java index f2b5e583b..f24227fd4 100644 --- a/osrs/src/main/java/ModeWhere.java +++ b/osrs/src/main/java/ModeWhere.java @@ -6,166 +6,408 @@ import java.util.HashSet; import java.util.Set; -@ObfuscatedName("or") +@ObfuscatedName("ok") @Implements("ModeWhere") -public enum ModeWhere implements class386 { - @ObfuscatedName("ac") +public enum ModeWhere implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3654("", 0, new class385[]{class385.field3638, class385.field3635}), - @ObfuscatedName("al") + field3661("", 0, new class382[]{class382.field3634, class382.field3636}), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3658("", 1, new class385[]{class385.field3636, class385.field3638, class385.field3635}), - @ObfuscatedName("ak") + field3656("", 1, new class382[]{class382.field3635, class382.field3634, class382.field3636}), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3657("", 2, new class385[]{class385.field3636, class385.field3637, class385.field3638}), - @ObfuscatedName("ax") + field3660("", 2, new class382[]{class382.field3635, class382.field3633, class382.field3634}), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3664("", 3, new class385[]{class385.field3636}), - @ObfuscatedName("ao") + field3658("", 3, new class382[]{class382.field3635}), + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3660("", 4), - @ObfuscatedName("ah") + field3654("", 4), + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3656("", 5, new class385[]{class385.field3636, class385.field3638}), - @ObfuscatedName("ar") + field3662("", 5, new class382[]{class382.field3635, class382.field3634}), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3662("", 6, new class385[]{class385.field3638}), - @ObfuscatedName("ab") + field3653("", 6, new class382[]{class382.field3634}), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3653("", 8, new class385[]{class385.field3636, class385.field3638}), - @ObfuscatedName("am") + field3655("", 8, new class382[]{class382.field3635, class382.field3634}), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3659("", 9, new class385[]{class385.field3636, class385.field3637}), - @ObfuscatedName("av") + field3657("", 9, new class382[]{class382.field3635, class382.field3633}), + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3663("", 10, new class385[]{class385.field3636}), - @ObfuscatedName("ag") + field3665("", 10, new class382[]{class382.field3635}), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3655("", 11, new class385[]{class385.field3636}), - @ObfuscatedName("aa") + field3659("", 11, new class382[]{class382.field3635}), + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3652("", 12, new class385[]{class385.field3636, class385.field3638}), - @ObfuscatedName("ap") + field3663("", 12, new class382[]{class382.field3635, class382.field3634}), + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lok;" ) - field3661("", 13, new class385[]{class385.field3636}); + field3664("", 13, new class382[]{class382.field3635}); - @ObfuscatedName("ay") + @ObfuscatedName("bk") + static String field3652; + @ObfuscatedName("as") @Export("id") final int id; - @ObfuscatedName("as") - final Set field3666; + @ObfuscatedName("ay") + final Set field3667; static { - $values$(); + $values(); } @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Loi;)V" + descriptor = "(Ljava/lang/String;I[Lot;)V" ) - ModeWhere(String var3, int var4, class385[] var5) { - this.field3666 = new HashSet(); + ModeWhere(String var3, int var4, class382[] var5) { + this.field3667 = new HashSet(); this.id = var4; - class385[] var6 = var5; + class382[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { - class385 var8 = var6[var7]; - this.field3666.add(var8); + class382 var8 = var6[var7]; + this.field3667.add(var8); } } ModeWhere(String var3, int var4) { - this.field3666 = new HashSet(); + this.field3667 = new HashSet(); this.id = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1022385277" + descriptor = "(I)[Lok;", + garbageValue = "435699803" ) - public static int method2011(int var0, int var1) { - int var2; - if (var1 > var0) { - var2 = var0; - var0 = var1; - var1 = var2; - } + @Export("$values") + static ModeWhere[] $values() { + return new ModeWhere[]{field3657, field3664, field3663, field3655, field3654, field3660, field3661, field3659, field3662, field3656, field3653, field3665, field3658}; + } - while (var1 != 0) { - var2 = var0 % var1; - var0 = var1; - var1 = var2; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IIII)Ldt;", + garbageValue = "-1608087816" + ) + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = class10.method32(var1, var0); + Script var4 = WorldMapData_1.method1280(var3, var0); + if (var4 != null) { + return var4; + } else { + int var5 = (-3 - var2 << 8) + var0; + var4 = WorldMapData_1.method1280(var5, var0); + if (var4 != null) { + return var4; + } else { + int var6 = var0 + -512; + var4 = WorldMapData_1.method1280(var6, var0); + return var4 != null ? var4 : null; + } } - - return var0; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)[Lor;", - garbageValue = "28" + descriptor = "(I)V", + garbageValue = "277734474" ) - @Export("$values$") - static ModeWhere[] $values$() { - return new ModeWhere[]{field3652, field3653, field3658, field3660, field3657, field3659, field3664, field3655, field3663, field3662, field3661, field3654, field3656}; + public static void method2001() { + ParamComposition.ParamDefinition_cached.clear(); } - @ObfuscatedName("ik") + @ObfuscatedName("jc") @ObfuscatedSignature( - descriptor = "(Lif;IIIS)V", - garbageValue = "-16278" + descriptor = "(B)V", + garbageValue = "-46" ) - static void method2013(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && class91.clientPreferences.getAreaSoundEffectsVolume() != 0) { - if (var0.animMayaFrameSounds != null && var0.animMayaFrameSounds.containsKey(var1)) { - class91.method482((Integer)var0.animMayaFrameSounds.get(var1), var2, var3); + static final void method2002() { + LoginScreenAnimation.method534(false); + Client.field452 = 0; + boolean var0 = true; + + int var1; + for (var1 = 0; var1 < WorldMapData_1.regionLandArchives.length; ++var1) { + if (UserComparator7.regionMapArchiveIds[var1] != -1 && WorldMapData_1.regionLandArchives[var1] == null) { + WorldMapData_1.regionLandArchives[var1] = WorldMapSection0.archive9.takeFile(UserComparator7.regionMapArchiveIds[var1], 0); + if (WorldMapData_1.regionLandArchives[var1] == null) { + var0 = false; + ++Client.field452; + } + } + + if (UserComparator3.regionLandArchiveIds[var1] != -1 && GrandExchangeEvent.regionMapArchives[var1] == null) { + GrandExchangeEvent.regionMapArchives[var1] = WorldMapSection0.archive9.takeFileEncrypted(UserComparator3.regionLandArchiveIds[var1], 0, Varcs.xteaKeys[var1]); + if (GrandExchangeEvent.regionMapArchives[var1] == null) { + var0 = false; + ++Client.field452; + } } } - } - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2030592343" - ) - static boolean method2014() { - return (Client.drawPlayerNames & 1) != 0; + if (!var0) { + Client.field451 = 1; + } else { + Client.field453 = 0; + var0 = true; + + int var3; + int var4; + for (var1 = 0; var1 < WorldMapData_1.regionLandArchives.length; ++var1) { + byte[] var2 = GrandExchangeEvent.regionMapArchives[var1]; + if (var2 != null) { + var3 = (KitDefinition.regions[var1] >> 8) * 64 - NewShit.baseX; + var4 = (KitDefinition.regions[var1] & 255) * 64 - class101.baseY; + if (Client.isInInstance) { + var3 = 10; + var4 = 10; + } + + var0 &= class150.method784(var2, var3, var4); + } + } + + if (!var0) { + Client.field451 = 2; + } else { + if (Client.field451 != 0) { + LoginPacket.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + class102.method604(); + class36.scene.clear(); + + for (var1 = 0; var1 < 4; ++var1) { + Client.collisionMaps[var1].clear(); + } + + int var15; + for (var1 = 0; var1 < 4; ++var1) { + for (var15 = 0; var15 < 104; ++var15) { + for (var3 = 0; var3 < 104; ++var3) { + Tiles.Tiles_renderFlags[var1][var15][var3] = 0; + } + } + } + + class102.method604(); + MidiPcmStream.method1651(); + var1 = WorldMapData_1.regionLandArchives.length; + WorldMapSectionType.method1311(); + LoginScreenAnimation.method534(true); + int var17; + if (!Client.isInInstance) { + byte[] var5; + for (var15 = 0; var15 < var1; ++var15) { + var3 = (KitDefinition.regions[var15] >> 8) * 64 - NewShit.baseX; + var4 = (KitDefinition.regions[var15] & 255) * 64 - class101.baseY; + var5 = WorldMapData_1.regionLandArchives[var15]; + if (var5 != null) { + class102.method604(); + class427.method2178(var5, var3, var4, DefaultsGroup.timeOfPreviousKeyPress * 8 - 48, class223.field1886 * 8 - 48, Client.collisionMaps); + } + } + + for (var15 = 0; var15 < var1; ++var15) { + var3 = (KitDefinition.regions[var15] >> 8) * 64 - NewShit.baseX; + var4 = (KitDefinition.regions[var15] & 255) * 64 - class101.baseY; + var5 = WorldMapData_1.regionLandArchives[var15]; + if (var5 == null && class223.field1886 < 800) { + class102.method604(); + MouseHandler.method182(var3, var4, 64, 64); + } + } + + LoginScreenAnimation.method534(true); + + for (var15 = 0; var15 < var1; ++var15) { + byte[] var16 = GrandExchangeEvent.regionMapArchives[var15]; + if (var16 != null) { + var4 = (KitDefinition.regions[var15] >> 8) * 64 - NewShit.baseX; + var17 = (KitDefinition.regions[var15] & 255) * 64 - class101.baseY; + class102.method604(); + class250.method1333(var16, var4, var17, class36.scene, Client.collisionMaps); + } + } + } + + int var6; + int var7; + int var8; + if (Client.isInInstance) { + int var9; + int var10; + int var11; + for (var15 = 0; var15 < 4; ++var15) { + class102.method604(); + + for (var3 = 0; var3 < 13; ++var3) { + for (var4 = 0; var4 < 13; ++var4) { + boolean var19 = false; + var6 = Client.instanceChunkTemplates[var15][var3][var4]; + if (var6 != -1) { + var7 = var6 >> 24 & 3; + var8 = var6 >> 1 & 3; + var9 = var6 >> 14 & 1023; + var10 = var6 >> 3 & 2047; + var11 = (var9 / 8 << 8) + var10 / 8; + + for (int var12 = 0; var12 < KitDefinition.regions.length; ++var12) { + if (KitDefinition.regions[var12] == var11 && WorldMapData_1.regionLandArchives[var12] != null) { + int var13 = (var9 - var3) * 8; + int var14 = (var10 - var4) * 8; + GameEngine.method146(WorldMapData_1.regionLandArchives[var12], var15, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, var13, var14, Client.collisionMaps); + var19 = true; + break; + } + } + } + + if (!var19) { + class230.method1176(var15, var3 * 8, var4 * 8); + } + } + } + } + + for (var15 = 0; var15 < 13; ++var15) { + for (var3 = 0; var3 < 13; ++var3) { + var4 = Client.instanceChunkTemplates[0][var15][var3]; + if (var4 == -1) { + MouseHandler.method182(var15 * 8, var3 * 8, 8, 8); + } + } + } + + LoginScreenAnimation.method534(true); + + for (var15 = 0; var15 < 4; ++var15) { + class102.method604(); + + for (var3 = 0; var3 < 13; ++var3) { + for (var4 = 0; var4 < 13; ++var4) { + var17 = Client.instanceChunkTemplates[var15][var3][var4]; + if (var17 != -1) { + var6 = var17 >> 24 & 3; + var7 = var17 >> 1 & 3; + var8 = var17 >> 14 & 1023; + var9 = var17 >> 3 & 2047; + var10 = (var8 / 8 << 8) + var9 / 8; + + for (var11 = 0; var11 < KitDefinition.regions.length; ++var11) { + if (KitDefinition.regions[var11] == var10 && GrandExchangeEvent.regionMapArchives[var11] != null) { + Tiles.method455(GrandExchangeEvent.regionMapArchives[var11], var15, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, class36.scene, Client.collisionMaps); + break; + } + } + } + } + } + } + } + + LoginScreenAnimation.method534(true); + class102.method604(); + class156.method823(class36.scene, Client.collisionMaps); + LoginScreenAnimation.method534(true); + var15 = Tiles.Tiles_minPlane; + if (var15 > ItemLayer.Client_plane) { + var15 = ItemLayer.Client_plane; + } + + if (var15 < ItemLayer.Client_plane - 1) { + var15 = ItemLayer.Client_plane - 1; + } + + if (Client.isLowDetail) { + class36.scene.init(Tiles.Tiles_minPlane); + } else { + class36.scene.init(0); + } + + for (var3 = 0; var3 < 104; ++var3) { + for (var4 = 0; var4 < 104; ++var4) { + ClanSettings.updateItemPile(var3, var4); + } + } + + class102.method604(); + class90.method476(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + PacketBufferNode var18; + if (SpriteMask.client.hasFrame()) { + var18 = class113.getPacketBufferNode(ClientPacket.DETECT_MODIFIED_CLIENT, Client.packetWriter.isaacCipher); + var18.packetBuffer.writeInt(1057001181); + Client.packetWriter.addNode(var18); + } + + if (!Client.isInInstance) { + var3 = (DefaultsGroup.timeOfPreviousKeyPress - 6) / 8; + var4 = (DefaultsGroup.timeOfPreviousKeyPress + 6) / 8; + var17 = (class223.field1886 - 6) / 8; + var6 = (class223.field1886 + 6) / 8; + + for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { + for (var8 = var17 - 1; var8 <= var6 + 1; ++var8) { + if (var7 < var3 || var7 > var4 || var8 < var17 || var8 > var6) { + WorldMapSection0.archive9.loadRegionFromName("m" + var7 + "_" + var8); + WorldMapSection0.archive9.loadRegionFromName("l" + var7 + "_" + var8); + } + } + } + } + + WorldMapSection2.updateGameState(30); + class102.method604(); + class320.method1707(); + var18 = class113.getPacketBufferNode(ClientPacket.f49, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var18); + WorldMapManager.method1277(); + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/Model.java b/osrs/src/main/java/Model.java index cb28a0d30..b6ce43251 100644 --- a/osrs/src/main/java/Model.java +++ b/osrs/src/main/java/Model.java @@ -6,246 +6,246 @@ import java.util.Arrays; import java.util.HashMap; -@ObfuscatedName("jn") +@ObfuscatedName("ka") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Lka;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Lka;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lrb;" + descriptor = "Lrz;" ) - static class465 field2217; - @ObfuscatedName("ah") + static class462 field2385; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lrb;" + descriptor = "Lrz;" ) - static class465 field2216; - @ObfuscatedName("ar") + static class462 field2386; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lrb;" + descriptor = "Lrz;" ) - static class465 field2218; - @ObfuscatedName("br") - static boolean[] field2185; - @ObfuscatedName("bs") - static boolean[] field2186; - @ObfuscatedName("bc") + static class462 field2384; + @ObfuscatedName("bo") + static boolean[] field2353; + @ObfuscatedName("bt") + static boolean[] field2354; + @ObfuscatedName("bu") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("bu") + @ObfuscatedName("by") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("bf") - static float[] field2191; @ObfuscatedName("bh") - static int[] field2198; - @ObfuscatedName("bl") - static int[] field2200; - @ObfuscatedName("bg") - static int[] field2197; - @ObfuscatedName("bj") - static int[] field2199; - @ObfuscatedName("bi") - static char[] field2189; + static float[] field2359; + @ObfuscatedName("bz") + static int[] field2370; + @ObfuscatedName("bc") + static int[] field2364; + @ObfuscatedName("bs") + static int[] field2366; + @ObfuscatedName("bx") + static int[] field2368; + @ObfuscatedName("bk") + static char[] field2357; + @ObfuscatedName("br") + static char[][] field2358; @ObfuscatedName("bq") - static char[][] field2190; - @ObfuscatedName("bw") - static int[] field2202; + static int[] field2365; + @ObfuscatedName("cf") + static int[][] field2381; + @ObfuscatedName("cg") + static int[] field2373; + @ObfuscatedName("cv") + static int[] field2379; + @ObfuscatedName("cx") + static int[] field2380; + @ObfuscatedName("cp") + static int[] field2377; @ObfuscatedName("ce") - static int[][] field2213; - @ObfuscatedName("cu") - static int[] field2210; + static int[] field2372; + @ObfuscatedName("ci") + static int[] field2374; + @ObfuscatedName("ct") + static float[] field2360; @ObfuscatedName("cw") - static int[] field2212; - @ObfuscatedName("co") - static int[] field2207; - @ObfuscatedName("cc") - static int[] field2203; - @ObfuscatedName("cg") - static int[] field2204; - @ObfuscatedName("cq") - static int[] field2208; - @ObfuscatedName("cy") - static float[] field2192; - @ObfuscatedName("cz") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("cb") + @ObfuscatedName("cl") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("cn") - static boolean field2184; @ObfuscatedName("cs") - static int[] field2209; - @ObfuscatedName("cm") - static int[] field2206; - @ObfuscatedName("cv") - static int[] field2211; - @ObfuscatedName("ci") - static int[] field2205; + static boolean field2352; + @ObfuscatedName("cn") + static int[] field2376; + @ObfuscatedName("cr") + static int[] field2378; + @ObfuscatedName("cj") + static int[] field2375; + @ObfuscatedName("ca") + static int[] field2371; @ObfuscatedName("ch") - static final float field2219; - @ObfuscatedName("ab") + static final float field2387; + @ObfuscatedName("ac") @Export("verticesCount") public int verticesCount; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("verticesX") int[] verticesX; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("verticesY") int[] verticesY; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("indicesCount") public int indicesCount; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("indices1") int[] indices1; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("indices2") int[] indices2; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("indices3") int[] indices3; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("faceAlphas") byte[] faceAlphas; @ObfuscatedName("aw") - byte[] field2222; - @ObfuscatedName("aq") + byte[] field2390; + @ObfuscatedName("ae") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("az") - public byte field2247; - @ObfuscatedName("at") - public int field2254; - @ObfuscatedName("af") - int[] field2229; + @ObfuscatedName("an") + public byte field2415; + @ObfuscatedName("ag") + public int field2421; @ObfuscatedName("ad") - int[] field2228; - @ObfuscatedName("bn") - int[] field2239; - @ObfuscatedName("bk") + int[] field2396; + @ObfuscatedName("af") + int[] field2397; + @ObfuscatedName("be") + int[] field2407; + @ObfuscatedName("bd") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("bd") - int[][] field2240; - @ObfuscatedName("be") - int[][] field2241; + @ObfuscatedName("bi") + int[][] field2409; @ObfuscatedName("bv") + int[][] field2411; + @ObfuscatedName("bf") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("boundsType") int boundsType; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("bottomY") int bottomY; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("xzRadius") int xzRadius; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("diameter") int diameter; - @ObfuscatedName("bp") + @ObfuscatedName("bw") @Export("radius") int radius; - @ObfuscatedName("bt") + @ObfuscatedName("bj") @Export("aabb") HashMap aabb; - @ObfuscatedName("cd") + @ObfuscatedName("cb") @Export("overrideHue") public byte overrideHue; - @ObfuscatedName("ct") + @ObfuscatedName("cz") @Export("overrideSaturation") public byte overrideSaturation; - @ObfuscatedName("cf") + @ObfuscatedName("cy") @Export("overrideLuminance") public byte overrideLuminance; - @ObfuscatedName("cl") + @ObfuscatedName("ck") @Export("overrideAmount") public byte overrideAmount; - @ObfuscatedName("ca") - public short field2255; + @ObfuscatedName("cd") + public short field2423; static { Model_sharedSequenceModel = new Model(); Model_sharedSequenceModelFaceAlphas = new byte[1]; Model_sharedSpotAnimationModel = new Model(); Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; - field2217 = new class465(); - field2216 = new class465(); - field2218 = new class465(); - field2185 = new boolean[6500]; - field2186 = new boolean[6500]; + field2385 = new class462(); + field2386 = new class462(); + field2384 = new class462(); + field2353 = new boolean[6500]; + field2354 = new boolean[6500]; modelViewportXs = new int[6500]; modelViewportYs = new int[6500]; - field2191 = new float[6500]; - field2198 = new int[6500]; - field2200 = new int[6500]; - field2197 = new int[6500]; - field2199 = new int[6500]; - field2189 = new char[6000]; - field2190 = new char[6000][512]; - field2202 = new int[12]; - field2213 = new int[12][2000]; - field2210 = new int[2000]; - field2212 = new int[2000]; - field2207 = new int[12]; - field2203 = new int[10]; - field2204 = new int[10]; - field2208 = new int[10]; - field2192 = new float[10]; - field2184 = true; - field2209 = Rasterizer3D.Rasterizer3D_sine; - field2206 = Rasterizer3D.Rasterizer3D_cosine; - field2211 = Rasterizer3D.Rasterizer3D_colorPalette; - field2205 = Rasterizer3D.field2047; - field2219 = SecureRandomFuture.method443(50); + field2359 = new float[6500]; + field2370 = new int[6500]; + field2364 = new int[6500]; + field2366 = new int[6500]; + field2368 = new int[6500]; + field2357 = new char[6000]; + field2358 = new char[6000][512]; + field2365 = new int[12]; + field2381 = new int[12][2000]; + field2373 = new int[2000]; + field2379 = new int[2000]; + field2377 = new int[12]; + field2372 = new int[10]; + field2380 = new int[10]; + field2374 = new int[10]; + field2360 = new float[10]; + field2352 = true; + field2376 = Rasterizer3D.Rasterizer3D_sine; + field2378 = Rasterizer3D.Rasterizer3D_cosine; + field2375 = Rasterizer3D.Rasterizer3D_colorPalette; + field2371 = Rasterizer3D.field2219; + field2387 = WorldMapAreaData.method1364(50); } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2247 = 0; - this.field2254 = 0; + this.field2415 = 0; + this.field2421 = 0; this.isSingleTile = false; this.aabb = new HashMap(); } @@ -253,31 +253,31 @@ public class Model extends Renderable { public Model(int var1, int var2, int var3, byte var4) { this.verticesCount = 0; this.indicesCount = 0; - this.field2247 = 0; - this.field2254 = 0; + this.field2415 = 0; + this.field2421 = 0; this.isSingleTile = false; this.aabb = new HashMap(); - this.method1353(var1, var2, var3); - this.field2247 = var4; + this.method1530(var1, var2, var3); + this.field2415 = var4; this.verticesCount = 0; this.indicesCount = 0; - this.field2254 = 0; + this.field2421 = 0; } @ObfuscatedSignature( - descriptor = "([Ljn;I)V" + descriptor = "([Lka;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; - this.field2247 = 0; - this.field2254 = 0; + this.field2415 = 0; + this.field2421 = 0; this.isSingleTile = false; this.aabb = new HashMap(); this.verticesCount = 0; this.indicesCount = 0; - this.field2254 = 0; - this.field2247 = -1; + this.field2421 = 0; + this.field2415 = -1; int var3; for (var3 = 0; var3 < var2; ++var3) { @@ -285,26 +285,26 @@ public Model(Model[] var1, int var2) { if (var4 != null) { this.verticesCount += var4.verticesCount; this.indicesCount += var4.indicesCount; - this.field2254 += var4.field2254; - if (this.field2247 == -1) { - this.field2247 = var4.field2247; + this.field2421 += var4.field2421; + if (this.field2415 == -1) { + this.field2415 = var4.field2415; } } } - this.method1353(this.verticesCount, this.indicesCount, this.field2254); + this.method1530(this.verticesCount, this.indicesCount, this.field2421); this.verticesCount = 0; this.indicesCount = 0; - this.field2254 = 0; + this.field2421 = 0; for (var3 = 0; var3 < var2; ++var3) { - this.method1355(var1[var3]); + this.method1532(var1[var3]); } } - @ObfuscatedName("ac") - void method1353(int var1, int var2, int var3) { + @ObfuscatedName("at") + void method1530(int var1, int var2, int var3) { this.verticesX = new int[var1]; this.verticesY = new int[var1]; this.verticesZ = new int[var1]; @@ -315,22 +315,22 @@ void method1353(int var1, int var2, int var3) { this.faceColors2 = new int[var2]; this.faceColors3 = new int[var2]; if (var3 > 0) { - this.field2229 = new int[var3]; - this.field2228 = new int[var3]; - this.field2239 = new int[var3]; + this.field2396 = new int[var3]; + this.field2397 = new int[var3]; + this.field2407 = new int[var3]; } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljn;)V" + descriptor = "(Lka;)V" ) - void method1354(Model var1) { + void method1531(Model var1) { int var2 = this.indices1.length; - if (this.faceRenderPriorities == null && (var1.faceRenderPriorities != null || this.field2247 != var1.field2247)) { + if (this.faceRenderPriorities == null && (var1.faceRenderPriorities != null || this.field2415 != var1.field2415)) { this.faceRenderPriorities = new byte[var2]; - Arrays.fill(this.faceRenderPriorities, this.field2247); + Arrays.fill(this.faceRenderPriorities, this.field2415); } if (this.faceAlphas == null && var1.faceAlphas != null) { @@ -343,20 +343,20 @@ void method1354(Model var1) { Arrays.fill(this.faceTextures, (short)-1); } - if (this.field2222 == null && var1.field2222 != null) { - this.field2222 = new byte[var2]; - Arrays.fill(this.field2222, (byte)-1); + if (this.field2390 == null && var1.field2390 != null) { + this.field2390 = new byte[var2]; + Arrays.fill(this.field2390, (byte)-1); } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljn;)V" + descriptor = "(Lka;)V" ) - public void method1355(Model var1) { + public void method1532(Model var1) { if (var1 != null) { - this.method1354(var1); + this.method1531(var1); int var2; for (var2 = 0; var2 < var1.indicesCount; ++var2) { @@ -367,7 +367,7 @@ public void method1355(Model var1) { this.faceColors2[this.indicesCount] = var1.faceColors2[var2]; this.faceColors3[this.indicesCount] = var1.faceColors3[var2]; if (this.faceRenderPriorities != null) { - this.faceRenderPriorities[this.indicesCount] = var1.faceRenderPriorities != null ? var1.faceRenderPriorities[var2] : var1.field2247; + this.faceRenderPriorities[this.indicesCount] = var1.faceRenderPriorities != null ? var1.faceRenderPriorities[var2] : var1.field2415; } if (this.faceAlphas != null && var1.faceAlphas != null) { @@ -378,22 +378,22 @@ public void method1355(Model var1) { this.faceTextures[this.indicesCount] = var1.faceTextures != null ? var1.faceTextures[var2] : -1; } - if (this.field2222 != null) { - if (var1.field2222 != null && var1.field2222[var2] != -1) { - this.field2222[this.indicesCount] = (byte)(var1.field2222[var2] + this.field2254); + if (this.field2390 != null) { + if (var1.field2390 != null && var1.field2390[var2] != -1) { + this.field2390[this.indicesCount] = (byte)(var1.field2390[var2] + this.field2421); } else { - this.field2222[this.indicesCount] = -1; + this.field2390[this.indicesCount] = -1; } } ++this.indicesCount; } - for (var2 = 0; var2 < var1.field2254; ++var2) { - this.field2229[this.field2254] = this.verticesCount + var1.field2229[var2]; - this.field2228[this.field2254] = this.verticesCount + var1.field2228[var2]; - this.field2239[this.field2254] = this.verticesCount + var1.field2239[var2]; - ++this.field2254; + for (var2 = 0; var2 < var1.field2421; ++var2) { + this.field2396[this.field2421] = this.verticesCount + var1.field2396[var2]; + this.field2397[this.field2421] = this.verticesCount + var1.field2397[var2]; + this.field2407[this.field2421] = this.verticesCount + var1.field2407[var2]; + ++this.field2421; } for (var2 = 0; var2 < var1.verticesCount; ++var2) { @@ -406,9 +406,9 @@ public void method1355(Model var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Ljn;" + descriptor = "([[IIIIZI)Lka;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -430,7 +430,7 @@ public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean v var11 = new Model(); var11.verticesCount = this.verticesCount; var11.indicesCount = this.indicesCount; - var11.field2254 = this.field2254; + var11.field2421 = this.field2421; var11.verticesX = this.verticesX; var11.verticesZ = this.verticesZ; var11.indices1 = this.indices1; @@ -441,12 +441,12 @@ public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean v var11.faceColors3 = this.faceColors3; var11.faceRenderPriorities = this.faceRenderPriorities; var11.faceAlphas = this.faceAlphas; - var11.field2222 = this.field2222; + var11.field2390 = this.field2390; var11.faceTextures = this.faceTextures; - var11.field2247 = this.field2247; - var11.field2229 = this.field2229; - var11.field2228 = this.field2228; - var11.field2239 = this.field2239; + var11.field2415 = this.field2415; + var11.field2396 = this.field2396; + var11.field2397 = this.field2397; + var11.field2407 = this.field2407; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; var11.isSingleTile = this.isSingleTile; @@ -504,9 +504,9 @@ public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean v } } - @ObfuscatedName("ar") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Z)Ljn;" + descriptor = "(Z)Lka;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -517,9 +517,9 @@ public Model toSharedSequenceModel(boolean var1) { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); } - @ObfuscatedName("ab") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Z)Ljn;" + descriptor = "(Z)Lka;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -530,15 +530,15 @@ public Model toSharedSpotAnimationModel(boolean var1) { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); } - @ObfuscatedName("am") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(ZLjn;[B)Ljn;" + descriptor = "(ZLka;[B)Lka;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.field2254 = this.field2254; + var2.field2421 = this.field2421; if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { var2.verticesX = new int[this.verticesCount + 100]; var2.verticesY = new int[this.verticesCount + 100]; @@ -574,23 +574,23 @@ Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.faceColors2 = this.faceColors2; var2.faceColors3 = this.faceColors3; var2.faceRenderPriorities = this.faceRenderPriorities; - var2.field2222 = this.field2222; + var2.field2390 = this.field2390; var2.faceTextures = this.faceTextures; - var2.field2247 = this.field2247; - var2.field2229 = this.field2229; - var2.field2228 = this.field2228; - var2.field2239 = this.field2239; + var2.field2415 = this.field2415; + var2.field2396 = this.field2396; + var2.field2397 = this.field2397; + var2.field2407 = this.field2407; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; - var2.field2240 = this.field2240; - var2.field2241 = this.field2241; + var2.field2409 = this.field2409; + var2.field2411 = this.field2411; var2.isSingleTile = this.isSingleTile; var2.resetBounds(); var2.overrideAmount = 0; return var2; } - @ObfuscatedName("av") + @ObfuscatedName("ax") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (!this.aabb.containsKey(var1)) { @@ -600,13 +600,15 @@ void calculateBoundingBox(int var1) { int var5 = 0; int var6 = 0; int var7 = 0; - int var8 = field2206[var1]; - int var9 = field2209[var1]; + int var8 = field2378[var1]; + int var9 = field2376[var1]; for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var11 = PlayerComposition.method1748(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var11 = WorldMapEvent.method1381(this.verticesX[var10], this.verticesZ[var10], var8, var9); int var12 = this.verticesY[var10]; - int var13 = class74.method424(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var14 = this.verticesX[var10]; + int var15 = this.verticesZ[var10]; + int var13 = var15 * var8 - var9 * var14 >> 16; if (var11 < var2) { var2 = var11; } @@ -632,27 +634,27 @@ void calculateBoundingBox(int var1) { } } - AABB var14 = new AABB((var5 + var2) / 2, (var6 + var3) / 2, (var7 + var4) / 2, (var5 - var2 + 1) / 2, (var6 - var3 + 1) / 2, (var7 - var4 + 1) / 2); - boolean var15 = true; - if (var14.xMidOffset < 32) { - var14.xMidOffset = 32; + AABB var17 = new AABB((var5 + var2) / 2, (var6 + var3) / 2, (var7 + var4) / 2, (var5 - var2 + 1) / 2, (var6 - var3 + 1) / 2, (var7 - var4 + 1) / 2); + boolean var18 = true; + if (var17.xMidOffset < 32) { + var17.xMidOffset = 32; } - if (var14.zMidOffset < 32) { - var14.zMidOffset = 32; + if (var17.zMidOffset < 32) { + var17.zMidOffset = 32; } if (this.isSingleTile) { - boolean var16 = true; - var14.xMidOffset += 8; - var14.zMidOffset += 8; + boolean var19 = true; + var17.xMidOffset += 8; + var17.zMidOffset += 8; } - this.aabb.put(var1, var14); + this.aabb.put(var1, var17); } } - @ObfuscatedName("ag") + @ObfuscatedName("as") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { @@ -685,8 +687,8 @@ public void calculateBoundsCylinder() { } } - @ObfuscatedName("aa") - void method1362() { + @ObfuscatedName("ay") + void method1539() { if (this.boundsType != 2) { this.boundsType = 2; this.xzRadius = 0; @@ -707,22 +709,22 @@ void method1362() { } } - @ObfuscatedName("ap") - public int method1363() { + @ObfuscatedName("ak") + public int method1540() { this.calculateBoundsCylinder(); return this.xzRadius; } - @ObfuscatedName("ay") + @ObfuscatedName("aj") @Export("resetBounds") public void resetBounds() { this.boundsType = 0; this.aabb.clear(); } - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lja;I)V" + descriptor = "(Lko;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -744,36 +746,36 @@ public void animate(Frames var1, int var2) { } } - @ObfuscatedName("aj") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lfk;I)V" + descriptor = "(Lfo;I)V" ) - public void method1366(class139 var1, int var2) { - Skeleton var3 = var1.field1298; - class241 var4 = var3.method1276(); + public void method1543(class139 var1, int var2) { + Skeleton var3 = var1.field1317; + class267 var4 = var3.method1455(); if (var4 != null) { - var3.method1276().method1263(var1, var2); - this.method1368(var3.method1276(), var1.method739()); + var3.method1455().method1442(var1, var2); + this.method1545(var3.method1455(), var1.method742()); } - if (var1.method740()) { - this.method1367(var1, var2); + if (var1.method743()) { + this.method1544(var1, var2); } this.resetBounds(); } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lfk;I)V" + descriptor = "(Lfo;I)V" ) - void method1367(class139 var1, int var2) { - Skeleton var3 = var1.field1298; + void method1544(class139 var1, int var2) { + Skeleton var3 = var1.field1317; for (int var4 = 0; var4 < var3.count; ++var4) { int var5 = var3.transformTypes[var4]; - if (var5 == 5 && var1.field1297 != null && var1.field1297[var4] != null && var1.field1297[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { - class132 var6 = var1.field1297[var4][0]; + if (var5 == 5 && var1.field1316 != null && var1.field1316[var4] != null && var1.field1316[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { + class131 var6 = var1.field1316[var4][0]; int[] var7 = var3.labels[var4]; int var8 = var7.length; @@ -784,7 +786,7 @@ void method1367(class139 var1, int var2) { for (int var12 = 0; var12 < var11.length; ++var12) { int var13 = var11[var12]; - int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method711(var2) * 255.0F); + int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method716(var2) * 255.0F); if (var14 < 0) { var14 = 0; } else if (var14 > 255) { @@ -800,17 +802,17 @@ void method1367(class139 var1, int var2) { } - @ObfuscatedName("au") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Ljr;I)V" + descriptor = "(Lkz;I)V" ) - void method1368(class241 var1, int var2) { - this.method1388(var1, var2); + void method1545(class267 var1, int var2) { + this.method1565(var1, var2); } - @ObfuscatedName("ai") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lja;ILja;I[I)V" + descriptor = "(Lko;ILko;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -860,30 +862,30 @@ public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { } } - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lju;Lfk;I[ZZZ)V" + descriptor = "(Lkd;Lfo;I[ZZZ)V" ) - public void method1370(Skeleton var1, class139 var2, int var3, boolean[] var4, boolean var5, boolean var6) { - class241 var7 = var1.method1276(); + public void method1547(Skeleton var1, class139 var2, int var3, boolean[] var4, boolean var5, boolean var6) { + class267 var7 = var1.method1455(); if (var7 != null) { - var7.method1264(var2, var3, var4, var5); + var7.method1443(var2, var3, var4, var5); if (var6) { - this.method1368(var7, var2.method739()); + this.method1545(var7, var2.method742()); } } - if (!var5 && var2.method740()) { - this.method1367(var2, var3); + if (!var5 && var2.method743()) { + this.method1544(var2, var3); } } - @ObfuscatedName("aw") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lja;I[IZ)V" + descriptor = "(Lko;I[IZ)V" ) - public void method1371(Frames var1, int var2, int[] var3, boolean var4) { + public void method1548(Frames var1, int var2, int[] var3, boolean var4) { if (var3 == null) { this.animate(var1, var2); } else { @@ -913,7 +915,7 @@ public void method1371(Frames var1, int var2, int[] var3, boolean var4) { } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; @@ -995,24 +997,24 @@ void transform(int var1, int[] var2, int var3, int var4, int var5) { int var16; int var17; if (var14 != 0) { - var15 = field2209[var14]; - var16 = field2206[var14]; + var15 = field2376[var14]; + var16 = field2378[var14]; var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; this.verticesX[var11] = var17; } if (var12 != 0) { - var15 = field2209[var12]; - var16 = field2206[var12]; + var15 = field2376[var12]; + var16 = field2378[var12]; var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; this.verticesY[var11] = var17; } if (var13 != 0) { - var15 = field2209[var13]; - var16 = field2206[var13]; + var15 = field2376[var13]; + var16 = field2378[var13]; var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; this.verticesX[var11] = var17; @@ -1081,7 +1083,7 @@ void transform(int var1, int[] var2, int var3, int var4, int var5) { } } - @ObfuscatedName("az") + @ObfuscatedName("af") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -1093,7 +1095,7 @@ public void rotateY90Ccw() { this.resetBounds(); } - @ObfuscatedName("at") + @ObfuscatedName("be") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -1104,7 +1106,7 @@ public void rotateY180() { this.resetBounds(); } - @ObfuscatedName("af") + @ObfuscatedName("bd") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -1116,11 +1118,11 @@ public void rotateY270Ccw() { this.resetBounds(); } - @ObfuscatedName("ad") + @ObfuscatedName("bl") @Export("rotateZ") public void rotateZ(int var1) { - int var2 = field2209[var1]; - int var3 = field2206[var1]; + int var2 = field2376[var1]; + int var3 = field2378[var1]; for (int var4 = 0; var4 < this.verticesCount; ++var4) { int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; @@ -1131,7 +1133,7 @@ public void rotateZ(int var1) { this.resetBounds(); } - @ObfuscatedName("bn") + @ObfuscatedName("bi") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1146,7 +1148,7 @@ public void offsetBy(int var1, int var2, int var3) { this.resetBounds(); } - @ObfuscatedName("bk") + @ObfuscatedName("bv") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1158,22 +1160,22 @@ public void scale(int var1, int var2, int var3) { this.resetBounds(); } - @ObfuscatedName("by") - public final void method1379(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + @ObfuscatedName("bf") + public final void method1556(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (this.boundsType != 2 && this.boundsType != 1) { - this.method1362(); + this.method1539(); } int var8 = Rasterizer3D.getClipMidX(); int var9 = Rasterizer3D.getClipMidY(); - int var10 = field2209[var1]; - int var11 = field2206[var1]; - int var12 = field2209[var2]; - int var13 = field2206[var2]; - int var14 = field2209[var3]; - int var15 = field2206[var3]; - int var16 = field2209[var4]; - int var17 = field2206[var4]; + int var10 = field2376[var1]; + int var11 = field2378[var1]; + int var12 = field2376[var2]; + int var13 = field2378[var2]; + int var14 = field2376[var3]; + int var15 = field2378[var3]; + int var16 = field2376[var4]; + int var17 = field2378[var4]; int var18 = var16 * var6 + var17 * var7 >> 16; for (int var19 = 0; var19 < this.verticesCount; ++var19) { @@ -1204,14 +1206,14 @@ public final void method1379(int var1, int var2, int var3, int var4, int var5, i var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - field2198[var19] = var22 - var18; + field2370[var19] = var22 - var18; modelViewportXs[var19] = var8 + var20 * Rasterizer3D.get3dZoom() / var22; modelViewportYs[var19] = var9 + var23 * Rasterizer3D.get3dZoom() / var22; - field2191[var19] = SecureRandomFuture.method443(var22); - if (this.field2254 > 0) { - field2200[var19] = var20; - field2197[var19] = var23; - field2199[var19] = var22; + field2359[var19] = WorldMapAreaData.method1364(var22); + if (this.field2421 > 0) { + field2364[var19] = var20; + field2366[var19] = var23; + field2368[var19] = var22; } } @@ -1222,22 +1224,22 @@ public final void method1379(int var1, int var2, int var3, int var4, int var5, i } - @ObfuscatedName("bd") - public final void method1380(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("bg") + public final void method1557(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (this.boundsType != 2 && this.boundsType != 1) { - this.method1362(); + this.method1539(); } int var9 = Rasterizer3D.getClipMidX(); int var10 = Rasterizer3D.getClipMidY(); - int var11 = field2209[var1]; - int var12 = field2206[var1]; - int var13 = field2209[var2]; - int var14 = field2206[var2]; - int var15 = field2209[var3]; - int var16 = field2206[var3]; - int var17 = field2209[var4]; - int var18 = field2206[var4]; + int var11 = field2376[var1]; + int var12 = field2378[var1]; + int var13 = field2376[var2]; + int var14 = field2378[var2]; + int var15 = field2376[var3]; + int var16 = field2378[var3]; + int var17 = field2376[var4]; + int var18 = field2378[var4]; int var19 = var17 * var6 + var18 * var7 >> 16; for (int var20 = 0; var20 < this.verticesCount; ++var20) { @@ -1268,14 +1270,14 @@ public final void method1380(int var1, int var2, int var3, int var4, int var5, i var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - field2198[var20] = var23 - var19; + field2370[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.get3dZoom() / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.get3dZoom() / var8; - field2191[var20] = SecureRandomFuture.method443(var8); - if (this.field2254 > 0) { - field2200[var20] = var21; - field2197[var20] = var24; - field2199[var20] = var23; + field2359[var20] = WorldMapAreaData.method1364(var8); + if (this.field2421 > 0) { + field2364[var20] = var21; + field2366[var20] = var24; + field2368[var20] = var23; } } @@ -1286,13 +1288,13 @@ public final void method1380(int var1, int var2, int var3, int var4, int var5, i } - @ObfuscatedName("be") + @ObfuscatedName("ba") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { if (this.diameter < 6000) { int var6; for (var6 = 0; var6 < this.diameter; ++var6) { - field2189[var6] = 0; + field2357[var6] = 0; } var6 = var3 ? 20 : 5; @@ -1314,196 +1316,196 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { var11 = modelViewportXs[var8]; var12 = modelViewportXs[var9]; var13 = modelViewportXs[var10]; - int var14; - if (!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) { - if (var2 && class133.method721(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var13, var6)) { - class160.method845(var4); - var2 = false; - } - - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { - field2186[var7] = false; - var14 = Rasterizer3D.method1246(); - if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= var14 && var12 <= var14 && var13 <= var14) { - field2185[var7] = false; - } else { - field2185[var7] = true; - } - - var15 = (field2198[var8] + field2198[var9] + field2198[var10]) / 3 + this.radius; - field2190[var15][field2189[var15]++] = var7; - } - } else { - var14 = field2200[var8]; - var15 = field2200[var9]; - var16 = field2200[var10]; - int var17 = field2197[var8]; - var18 = field2197[var9]; - int var19 = field2197[var10]; - int var20 = field2199[var8]; - int var21 = field2199[var9]; - int var22 = field2199[var10]; - var14 -= var15; + int var27; + if (var1 && (var11 == -5000 || var12 == -5000 || var13 == -5000)) { + var27 = field2364[var8]; + var15 = field2364[var9]; + var16 = field2364[var10]; + int var17 = field2366[var8]; + var18 = field2366[var9]; + int var19 = field2366[var10]; + int var20 = field2368[var8]; + int var21 = field2368[var9]; + int var22 = field2368[var10]; + var27 -= var15; var16 -= var15; var17 -= var18; var19 -= var18; var20 -= var21; var22 -= var21; int var23 = var17 * var22 - var20 * var19; - int var24 = var20 * var16 - var14 * var22; - int var25 = var14 * var19 - var17 * var16; + int var24 = var20 * var16 - var27 * var22; + int var25 = var27 * var19 - var17 * var16; if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field2186[var7] = true; - int var26 = (field2198[var8] + field2198[var9] + field2198[var10]) / 3 + this.radius; - field2190[var26][field2189[var26]++] = var7; + field2354[var7] = true; + int var26 = (field2370[var8] + field2370[var9] + field2370[var10]) / 3 + this.radius; + field2358[var26][field2357[var26]++] = var7; + } + } else { + if (var2 && class225.method1148(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var13, var6)) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; + var2 = false; + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { + field2354[var7] = false; + var27 = Rasterizer3D.method1425(); + if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= var27 && var12 <= var27 && var13 <= var27) { + field2353[var7] = false; + } else { + field2353[var7] = true; + } + + var15 = (field2370[var8] + field2370[var9] + field2370[var10]) / 3 + this.radius; + field2358[var15][field2357[var15]++] = var7; } } } } - char[] var27; - int var31; - char var32; + char[] var28; + int var32; + char var33; if (this.faceRenderPriorities == null) { - for (var31 = this.diameter - 1; var31 >= 0; --var31) { - var32 = field2189[var31]; - if (var32 > 0) { - var27 = field2190[var31]; + for (var32 = this.diameter - 1; var32 >= 0; --var32) { + var33 = field2357[var32]; + if (var33 > 0) { + var28 = field2358[var32]; - for (var10 = 0; var10 < var32; ++var10) { - this.drawFace(var27[var10]); + for (var10 = 0; var10 < var33; ++var10) { + this.drawFace(var28[var10]); } } } } else { - for (var31 = 0; var31 < 12; ++var31) { - field2202[var31] = 0; - field2207[var31] = 0; + for (var32 = 0; var32 < 12; ++var32) { + field2365[var32] = 0; + field2377[var32] = 0; } - for (var31 = this.diameter - 1; var31 >= 0; --var31) { - var32 = field2189[var31]; - if (var32 > 0) { - var27 = field2190[var31]; - - for (var10 = 0; var10 < var32; ++var10) { - char var33 = var27[var10]; - byte var34 = this.faceRenderPriorities[var33]; - var13 = field2202[var34]++; - field2213[var34][var13] = var33; - if (var34 < 10) { - int[] var35 = field2207; - var35[var34] += var31; - } else if (var34 == 10) { - field2210[var13] = var31; + for (var32 = this.diameter - 1; var32 >= 0; --var32) { + var33 = field2357[var32]; + if (var33 > 0) { + var28 = field2358[var32]; + + for (var10 = 0; var10 < var33; ++var10) { + char var34 = var28[var10]; + byte var35 = this.faceRenderPriorities[var34]; + var13 = field2365[var35]++; + field2381[var35][var13] = var34; + if (var35 < 10) { + int[] var36 = field2377; + var36[var35] += var32; + } else if (var35 == 10) { + field2373[var13] = var32; } else { - field2212[var13] = var31; + field2379[var13] = var32; } } } } - var31 = 0; - if (field2202[1] > 0 || field2202[2] > 0) { - var31 = (field2207[1] + field2207[2]) / (field2202[1] + field2202[2]); + var32 = 0; + if (field2365[1] > 0 || field2365[2] > 0) { + var32 = (field2377[1] + field2377[2]) / (field2365[1] + field2365[2]); } var8 = 0; - if (field2202[3] > 0 || field2202[4] > 0) { - var8 = (field2207[3] + field2207[4]) / (field2202[3] + field2202[4]); + if (field2365[3] > 0 || field2365[4] > 0) { + var8 = (field2377[3] + field2377[4]) / (field2365[3] + field2365[4]); } var9 = 0; - if (field2202[6] > 0 || field2202[8] > 0) { - var9 = (field2207[8] + field2207[6]) / (field2202[8] + field2202[6]); + if (field2365[6] > 0 || field2365[8] > 0) { + var9 = (field2377[8] + field2377[6]) / (field2365[8] + field2365[6]); } var11 = 0; - var12 = field2202[10]; - int[] var28 = field2213[10]; - int[] var29 = field2210; + var12 = field2365[10]; + int[] var29 = field2381[10]; + int[] var30 = field2373; if (var11 == var12) { var11 = 0; - var12 = field2202[11]; - var28 = field2213[11]; - var29 = field2212; + var12 = field2365[11]; + var29 = field2381[11]; + var30 = field2379; } if (var11 < var12) { - var10 = var29[var11]; + var10 = var30[var11]; } else { var10 = -1000; } for (var15 = 0; var15 < 10; ++var15) { - while (var15 == 0 && var10 > var31) { - this.drawFace(var28[var11++]); - if (var11 == var12 && var28 != field2213[11]) { + while (var15 == 0 && var10 > var32) { + this.drawFace(var29[var11++]); + if (var11 == var12 && var29 != field2381[11]) { var11 = 0; - var12 = field2202[11]; - var28 = field2213[11]; - var29 = field2212; + var12 = field2365[11]; + var29 = field2381[11]; + var30 = field2379; } if (var11 < var12) { - var10 = var29[var11]; + var10 = var30[var11]; } else { var10 = -1000; } } while (var15 == 3 && var10 > var8) { - this.drawFace(var28[var11++]); - if (var11 == var12 && var28 != field2213[11]) { + this.drawFace(var29[var11++]); + if (var11 == var12 && var29 != field2381[11]) { var11 = 0; - var12 = field2202[11]; - var28 = field2213[11]; - var29 = field2212; + var12 = field2365[11]; + var29 = field2381[11]; + var30 = field2379; } if (var11 < var12) { - var10 = var29[var11]; + var10 = var30[var11]; } else { var10 = -1000; } } while (var15 == 5 && var10 > var9) { - this.drawFace(var28[var11++]); - if (var11 == var12 && var28 != field2213[11]) { + this.drawFace(var29[var11++]); + if (var11 == var12 && var29 != field2381[11]) { var11 = 0; - var12 = field2202[11]; - var28 = field2213[11]; - var29 = field2212; + var12 = field2365[11]; + var29 = field2381[11]; + var30 = field2379; } if (var11 < var12) { - var10 = var29[var11]; + var10 = var30[var11]; } else { var10 = -1000; } } - var16 = field2202[var15]; - int[] var30 = field2213[var15]; + var16 = field2365[var15]; + int[] var31 = field2381[var15]; for (var18 = 0; var18 < var16; ++var18) { - this.drawFace(var30[var18]); + this.drawFace(var31[var18]); } } while (var10 != -1000) { - this.drawFace(var28[var11++]); - if (var11 == var12 && var28 != field2213[11]) { + this.drawFace(var29[var11++]); + if (var11 == var12 && var29 != field2381[11]) { var11 = 0; - var28 = field2213[11]; - var12 = field2202[11]; - var29 = field2212; + var29 = field2381[11]; + var12 = field2365[11]; + var30 = field2379; } if (var11 < var12) { - var10 = var29[var11]; + var10 = var30[var11]; } else { var10 = -1000; } @@ -1513,42 +1515,42 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) { } } - @ObfuscatedName("bv") + @ObfuscatedName("bm") @Export("drawFace") final void drawFace(int var1) { - if (field2186[var1]) { - this.method1386(var1); + if (field2354[var1]) { + this.method1563(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.clips.field2278 = field2185[var1]; + Rasterizer3D.clips.field2446 = field2353[var1]; if (this.faceAlphas == null) { - Rasterizer3D.clips.field2282 = 0; + Rasterizer3D.clips.field2452 = 0; } else { - Rasterizer3D.clips.field2282 = (this.faceAlphas[var1] == -1 ? 253 : this.faceAlphas[var1]) & 255; + Rasterizer3D.clips.field2452 = (this.faceAlphas[var1] == -1 ? 253 : this.faceAlphas[var1]) & 255; } - this.method1385(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2191[var2], field2191[var3], field2191[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + this.method1562(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2359[var2], field2359[var3], field2359[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } - @ObfuscatedName("ba") - boolean method1384(int var1) { - return this.overrideAmount > 0 && var1 < this.field2255; + @ObfuscatedName("bp") + boolean method1561(int var1) { + return this.overrideAmount > 0 && var1 < this.field2423; } - @ObfuscatedName("bz") - final void method1385(int var1, int var2, int var3, int var4, int var5, int var6, int var7, float var8, float var9, float var10, int var11, int var12, int var13) { + @ObfuscatedName("bw") + final void method1562(int var1, int var2, int var3, int var4, int var5, int var6, int var7, float var8, float var9, float var10, int var11, int var12, int var13) { if (this.faceTextures != null && this.faceTextures[var1] != -1) { int var15; int var16; int var18; - if (this.field2222 != null && this.field2222[var1] != -1) { - int var17 = this.field2222[var1] & 255; - var18 = this.field2229[var17]; - var15 = this.field2228[var17]; - var16 = this.field2239[var17]; + if (this.field2390 != null && this.field2390[var1] != -1) { + int var17 = this.field2390[var1] & 255; + var18 = this.field2396[var17]; + var15 = this.field2397[var17]; + var16 = this.field2407[var17]; } else { var18 = this.indices1[var1]; var15 = this.indices2[var1]; @@ -1556,40 +1558,40 @@ final void method1385(int var1, int var2, int var3, int var4, int var5, int var6 } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method1255(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var11, var11, field2200[var18], field2200[var15], field2200[var16], field2197[var18], field2197[var15], field2197[var16], field2199[var18], field2199[var15], field2199[var16], this.faceTextures[var1]); + Rasterizer3D.method1434(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var11, var11, field2364[var18], field2364[var15], field2364[var16], field2366[var18], field2366[var15], field2366[var16], field2368[var18], field2368[var15], field2368[var16], this.faceTextures[var1]); } else { - Rasterizer3D.method1255(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, field2200[var18], field2200[var15], field2200[var16], field2197[var18], field2197[var15], field2197[var16], field2199[var18], field2199[var15], field2199[var16], this.faceTextures[var1]); + Rasterizer3D.method1434(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, field2364[var18], field2364[var15], field2364[var16], field2366[var18], field2366[var15], field2366[var16], field2368[var18], field2368[var15], field2368[var16], this.faceTextures[var1]); } } else { - boolean var14 = this.method1384(var1); + boolean var14 = this.method1561(var1); if (this.faceColors3[var1] == -1 && var14) { - Rasterizer3D.method1258(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2211[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + Rasterizer3D.method1437(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2375[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method1254(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2211[this.faceColors1[var1]]); + Rasterizer3D.method1433(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2375[this.faceColors1[var1]]); } else if (var14) { - Rasterizer3D.method1257(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + Rasterizer3D.method1436(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); } else { - Rasterizer3D.method1253(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); + Rasterizer3D.method1432(var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); } } } - @ObfuscatedName("bb") - final void method1386(int var1) { + @ObfuscatedName("bj") + final void method1563(int var1) { int var2 = Rasterizer3D.getClipMidX(); int var3 = Rasterizer3D.getClipMidY(); int var4 = 0; int var5 = this.indices1[var1]; int var6 = this.indices2[var1]; int var7 = this.indices3[var1]; - int var8 = field2199[var5]; - int var9 = field2199[var6]; - int var10 = field2199[var7]; + int var8 = field2368[var5]; + int var9 = field2368[var6]; + int var10 = field2368[var7]; if (this.faceAlphas == null) { - Rasterizer3D.clips.field2282 = 0; + Rasterizer3D.clips.field2452 = 0; } else { - Rasterizer3D.clips.field2282 = this.faceAlphas[var1] & 255; + Rasterizer3D.clips.field2452 = this.faceAlphas[var1] & 255; } int var11; @@ -1597,115 +1599,115 @@ final void method1386(int var1) { int var13; int var14; if (var8 >= 50) { - field2203[var4] = modelViewportXs[var5]; - field2204[var4] = modelViewportYs[var5]; - field2192[var4] = field2191[var7]; - field2208[var4++] = this.faceColors1[var1]; + field2372[var4] = modelViewportXs[var5]; + field2380[var4] = modelViewportYs[var5]; + field2360[var4] = field2359[var7]; + field2374[var4++] = this.faceColors1[var1]; } else { - var11 = field2200[var5]; - var12 = field2197[var5]; + var11 = field2364[var5]; + var12 = field2366[var5]; var13 = this.faceColors1[var1]; if (var10 >= 50) { - var14 = field2205[var10 - var8] * (50 - var8); - field2203[var4] = var2 + (var11 + ((field2200[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2204[var4] = var3 + (var12 + ((field2197[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2192[var4] = field2219; - field2208[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field2371[var10 - var8] * (50 - var8); + field2372[var4] = var2 + (var11 + ((field2364[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2380[var4] = var3 + (var12 + ((field2366[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2360[var4] = field2387; + field2374[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } if (var9 >= 50) { - var14 = field2205[var9 - var8] * (50 - var8); - field2203[var4] = var2 + (var11 + ((field2200[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2204[var4] = var3 + (var12 + ((field2197[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2192[var4] = field2219; - field2208[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field2371[var9 - var8] * (50 - var8); + field2372[var4] = var2 + (var11 + ((field2364[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2380[var4] = var3 + (var12 + ((field2366[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2360[var4] = field2387; + field2374[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } if (var9 >= 50) { - field2203[var4] = modelViewportXs[var6]; - field2204[var4] = modelViewportYs[var6]; - field2192[var4] = field2191[var7]; - field2208[var4++] = this.faceColors2[var1]; + field2372[var4] = modelViewportXs[var6]; + field2380[var4] = modelViewportYs[var6]; + field2360[var4] = field2359[var7]; + field2374[var4++] = this.faceColors2[var1]; } else { - var11 = field2200[var6]; - var12 = field2197[var6]; + var11 = field2364[var6]; + var12 = field2366[var6]; var13 = this.faceColors2[var1]; if (var8 >= 50) { - var14 = field2205[var8 - var9] * (50 - var9); - field2203[var4] = var2 + (var11 + ((field2200[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2204[var4] = var3 + (var12 + ((field2197[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2192[var4] = field2219; - field2208[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field2371[var8 - var9] * (50 - var9); + field2372[var4] = var2 + (var11 + ((field2364[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2380[var4] = var3 + (var12 + ((field2366[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2360[var4] = field2387; + field2374[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } if (var10 >= 50) { - var14 = field2205[var10 - var9] * (50 - var9); - field2203[var4] = var2 + (var11 + ((field2200[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2204[var4] = var3 + (var12 + ((field2197[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2208[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field2371[var10 - var9] * (50 - var9); + field2372[var4] = var2 + (var11 + ((field2364[var7] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2380[var4] = var3 + (var12 + ((field2366[var7] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2374[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } if (var10 >= 50) { - field2203[var4] = modelViewportXs[var7]; - field2204[var4] = modelViewportYs[var7]; - field2192[var4] = field2191[var7]; - field2208[var4++] = this.faceColors3[var1]; + field2372[var4] = modelViewportXs[var7]; + field2380[var4] = modelViewportYs[var7]; + field2360[var4] = field2359[var7]; + field2374[var4++] = this.faceColors3[var1]; } else { - var11 = field2200[var7]; - var12 = field2197[var7]; + var11 = field2364[var7]; + var12 = field2366[var7]; var13 = this.faceColors3[var1]; if (var9 >= 50) { - var14 = field2205[var9 - var10] * (50 - var10); - field2203[var4] = var2 + (var11 + ((field2200[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2204[var4] = var3 + (var12 + ((field2197[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2192[var4] = field2219; - field2208[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field2371[var9 - var10] * (50 - var10); + field2372[var4] = var2 + (var11 + ((field2364[var6] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2380[var4] = var3 + (var12 + ((field2366[var6] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2360[var4] = field2387; + field2374[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } if (var8 >= 50) { - var14 = field2205[var8 - var10] * (50 - var10); - field2203[var4] = var2 + (var11 + ((field2200[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2204[var4] = var3 + (var12 + ((field2197[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; - field2192[var4] = field2219; - field2208[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field2371[var8 - var10] * (50 - var10); + field2372[var4] = var2 + (var11 + ((field2364[var5] - var11) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2380[var4] = var3 + (var12 + ((field2366[var5] - var12) * var14 >> 16)) * Rasterizer3D.get3dZoom() / 50; + field2360[var4] = field2387; + field2374[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field2203[0]; - var12 = field2203[1]; - var13 = field2203[2]; - var14 = field2204[0]; - int var15 = field2204[1]; - int var16 = field2204[2]; - float var17 = field2192[0]; - float var18 = field2192[1]; - float var19 = field2192[2]; - Rasterizer3D.clips.field2278 = false; - int var20 = Rasterizer3D.method1246(); + var11 = field2372[0]; + var12 = field2372[1]; + var13 = field2372[2]; + var14 = field2380[0]; + int var15 = field2380[1]; + int var16 = field2380[2]; + float var17 = field2360[0]; + float var18 = field2360[1]; + float var19 = field2360[2]; + Rasterizer3D.clips.field2446 = false; + int var20 = Rasterizer3D.method1425(); if (var4 == 3) { if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > var20 || var12 > var20 || var13 > var20) { - Rasterizer3D.clips.field2278 = true; + Rasterizer3D.clips.field2446 = true; } - this.method1385(var1, var14, var15, var16, var11, var12, var13, var17, var18, var19, field2208[0], field2208[1], field2208[2]); + this.method1562(var1, var14, var15, var16, var11, var12, var13, var17, var18, var19, field2374[0], field2374[1], field2374[2]); } if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > var20 || var12 > var20 || var13 > var20 || field2203[3] < 0 || field2203[3] > var20) { - Rasterizer3D.clips.field2278 = true; + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > var20 || var12 > var20 || var13 > var20 || field2372[3] < 0 || field2372[3] > var20) { + Rasterizer3D.clips.field2446 = true; } int var22; if (this.faceTextures != null && this.faceTextures[var1] != -1) { int var23; int var25; - if (this.field2222 != null && this.field2222[var1] != -1) { - int var24 = this.field2222[var1] & 255; - var25 = this.field2229[var24]; - var22 = this.field2228[var24]; - var23 = this.field2239[var24]; + if (this.field2390 != null && this.field2390[var1] != -1) { + int var24 = this.field2390[var1] & 255; + var25 = this.field2396[var24]; + var22 = this.field2397[var24]; + var23 = this.field2407[var24]; } else { var25 = var5; var22 = var6; @@ -1714,39 +1716,39 @@ final void method1386(int var1) { short var26 = this.faceTextures[var1]; if (this.faceColors3[var1] == -1) { - Rasterizer3D.method1255(var14, var15, var16, var11, var12, var13, var17, var18, var19, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2200[var25], field2200[var22], field2200[var23], field2197[var25], field2197[var22], field2197[var23], field2199[var25], field2199[var22], field2199[var23], var26); - Rasterizer3D.method1255(var14, var16, field2204[3], var11, var13, field2203[3], var17, var19, field2192[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2200[var25], field2200[var22], field2200[var23], field2197[var25], field2197[var22], field2197[var23], field2199[var25], field2199[var22], field2199[var23], var26); + Rasterizer3D.method1434(var14, var15, var16, var11, var12, var13, var17, var18, var19, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2364[var25], field2364[var22], field2364[var23], field2366[var25], field2366[var22], field2366[var23], field2368[var25], field2368[var22], field2368[var23], var26); + Rasterizer3D.method1434(var14, var16, field2380[3], var11, var13, field2372[3], var17, var19, field2360[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2364[var25], field2364[var22], field2364[var23], field2366[var25], field2366[var22], field2366[var23], field2368[var25], field2368[var22], field2368[var23], var26); } else { - Rasterizer3D.method1255(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2208[0], field2208[1], field2208[2], field2200[var25], field2200[var22], field2200[var23], field2197[var25], field2197[var22], field2197[var23], field2199[var25], field2199[var22], field2199[var23], var26); - Rasterizer3D.method1255(var14, var16, field2204[3], var11, var13, field2203[3], var17, var19, field2192[3], field2208[0], field2208[2], field2208[3], field2200[var25], field2200[var22], field2200[var23], field2197[var25], field2197[var22], field2197[var23], field2199[var25], field2199[var22], field2199[var23], var26); + Rasterizer3D.method1434(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2374[0], field2374[1], field2374[2], field2364[var25], field2364[var22], field2364[var23], field2366[var25], field2366[var22], field2366[var23], field2368[var25], field2368[var22], field2368[var23], var26); + Rasterizer3D.method1434(var14, var16, field2380[3], var11, var13, field2372[3], var17, var19, field2360[3], field2374[0], field2374[2], field2374[3], field2364[var25], field2364[var22], field2364[var23], field2366[var25], field2366[var22], field2366[var23], field2368[var25], field2368[var22], field2368[var23], var26); } } else { - boolean var21 = this.method1384(var1); + boolean var21 = this.method1561(var1); if (this.faceColors3[var1] == -1 && var21) { - var22 = field2211[this.faceColors1[var1]]; - Rasterizer3D.method1258(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); - Rasterizer3D.method1258(var14, var16, field2204[3], var11, var13, field2203[3], var17, var19, field2192[3], var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + var22 = field2375[this.faceColors1[var1]]; + Rasterizer3D.method1437(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); + Rasterizer3D.method1437(var14, var16, field2380[3], var11, var13, field2372[3], var17, var19, field2360[3], var22, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); } else if (this.faceColors3[var1] == -1) { - var22 = field2211[this.faceColors1[var1]]; - Rasterizer3D.method1254(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22); - Rasterizer3D.method1254(var14, var16, field2204[3], var11, var13, field2203[3], var17, var19, field2192[3], var22); + var22 = field2375[this.faceColors1[var1]]; + Rasterizer3D.method1433(var14, var15, var16, var11, var12, var13, var17, var18, var19, var22); + Rasterizer3D.method1433(var14, var16, field2380[3], var11, var13, field2372[3], var17, var19, field2360[3], var22); } else if (var21) { - Rasterizer3D.method1257(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2208[0], field2208[1], field2208[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); - Rasterizer3D.method1257(var14, var16, field2204[3], var11, var13, field2203[3], 0.0F, 0.0F, 0.0F, field2208[0], field2208[2], field2208[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); + Rasterizer3D.method1436(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2374[0], field2374[1], field2374[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); + Rasterizer3D.method1436(var14, var16, field2380[3], var11, var13, field2372[3], 0.0F, 0.0F, 0.0F, field2374[0], field2374[2], field2374[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); } else { - Rasterizer3D.method1253(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2208[0], field2208[1], field2208[2]); - Rasterizer3D.method1253(var14, var16, field2204[3], var11, var13, field2203[3], var17, var19, field2192[3], field2208[0], field2208[2], field2208[3]); + Rasterizer3D.method1432(var14, var15, var16, var11, var12, var13, var17, var18, var19, field2374[0], field2374[1], field2374[2]); + Rasterizer3D.method1432(var14, var16, field2380[3], var11, var13, field2372[3], var17, var19, field2360[3], field2374[0], field2374[2], field2374[3]); } } } } - @ObfuscatedName("bo") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(ILrb;)V" + descriptor = "(ILrz;)V" ) - void method1387(int var1, class465 var2) { + void method1564(int var1, class462 var2) { float var3 = (float)this.verticesX[var1]; float var4 = (float)(-this.verticesY[var1]); float var5 = (float)(-this.verticesZ[var1]); @@ -1756,37 +1758,37 @@ void method1387(int var1, class465 var2) { this.verticesZ[var1] = -((int)(var2.field3908[2] * var3 + var2.field3908[6] * var4 + var2.field3908[10] * var5 + var2.field3908[14] * var6)); } - @ObfuscatedName("bp") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(Ljr;I)V" + descriptor = "(Lkz;I)V" ) - void method1388(class241 var1, int var2) { - if (this.field2240 != null) { + void method1565(class267 var1, int var2) { + if (this.field2409 != null) { for (int var3 = 0; var3 < this.verticesCount; ++var3) { - int[] var4 = this.field2240[var3]; + int[] var4 = this.field2409[var3]; if (var4 != null && var4.length != 0) { - int[] var5 = this.field2241[var3]; - field2217.method2341(); + int[] var5 = this.field2411[var3]; + field2385.method2319(); for (int var6 = 0; var6 < var4.length; ++var6) { int var7 = var4[var6]; - class129 var8 = var1.method1261(var7); + class128 var8 = var1.method1440(var7); if (var8 != null) { - field2216.method2343((float)var5[var6] / 255.0F); - field2218.method2342(var8.method700(var2)); - field2218.method2346(field2216); - field2217.method2345(field2218); + field2386.method2321((float)var5[var6] / 255.0F); + field2384.method2320(var8.method704(var2)); + field2384.method2324(field2386); + field2385.method2323(field2384); } } - this.method1387(var3, field2217); + this.method1564(var3, field2385); } } } } - @ObfuscatedName("du") + @ObfuscatedName("dw") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { if (this.boundsType != 1) { @@ -1803,12 +1805,12 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var16 = (var15 - this.xzRadius) * Rasterizer3D.get3dZoom(); if (var16 / var14 < Rasterizer3D.getClipMidX2()) { int var17 = (var15 + this.xzRadius) * Rasterizer3D.get3dZoom(); - if (var17 / var14 > Rasterizer3D.method1241()) { + if (var17 / var14 > Rasterizer3D.method1420()) { int var18 = var3 * var7 - var11 * var2 >> 16; int var19 = var2 * this.xzRadius >> 16; int var20 = (var3 * this.bottomY >> 16) + var19; int var21 = (var18 + var20) * Rasterizer3D.get3dZoom(); - if (var21 / var14 > Rasterizer3D.method1244()) { + if (var21 / var14 > Rasterizer3D.method1423()) { int var22 = (var3 * super.height >> 16) + var19; int var23 = (var18 - var22) * Rasterizer3D.get3dZoom(); if (var23 / var14 < Rasterizer3D.getClipMidY2()) { @@ -1819,105 +1821,177 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, var26 = true; } - boolean var27 = var26 || this.field2254 > 0; - int var28 = class64.method336(); - int var29 = WorldMapLabelSize.method1436(); - boolean var30 = GrandExchangeOfferTotalQuantityComparator.method1974(); - boolean var31 = class372.method1929(var9); - boolean var32 = false; - int var34; - int var35; - int var36; - if (var31 && var30) { - boolean var33 = false; - if (field2184) { - var33 = class11.method38(this, var1, var6, var7, var8); + boolean var27 = var26 || this.field2421 > 0; + int var28 = ViewportMouse.ViewportMouse_x; + int var30 = ViewportMouse.ViewportMouse_y; + boolean var32 = ViewportMouse.ViewportMouse_isInViewport; + boolean var34 = class207.method1059(var9); + boolean var35 = false; + int var40; + int var41; + int var42; + int var43; + int var56; + int var61; + int var62; + int var63; + if (var34 && var32) { + boolean var36 = false; + if (field2352) { + boolean var39 = ViewportMouse.ViewportMouse_isInViewport; + boolean var37; + if (!var39) { + var37 = false; + } else { + int var46; + int var47; + int var48; + int var49; + int var64; + if (!ViewportMouse.ViewportMouse_false0) { + var40 = Scene.Scene_cameraPitchSine; + var41 = Scene.Scene_cameraPitchCosine; + var42 = Scene.Scene_cameraYawSine; + var43 = Scene.Scene_cameraYawCosine; + byte var44 = 50; + short var45 = 3500; + var46 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.getClipMidX()) * var44 / Rasterizer3D.get3dZoom(); + var47 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.getClipMidY()) * var44 / Rasterizer3D.get3dZoom(); + var48 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.getClipMidX()) * var45 / Rasterizer3D.get3dZoom(); + var49 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.getClipMidY()) * var45 / Rasterizer3D.get3dZoom(); + int var51 = var40 * var44 + var41 * var47 >> 16; + int var52 = var44 * var41 - var40 * var47 >> 16; + int var53 = var49 * var41 + var40 * var45 >> 16; + int var54 = var41 * var45 - var49 * var40 >> 16; + int var50 = LoginScreenAnimation.method520(var46, var52, var43, var42); + var63 = class167.method867(var46, var52, var43, var42); + var46 = var50; + var50 = LoginScreenAnimation.method520(var48, var54, var43, var42); + var64 = class167.method867(var48, var54, var43, var42); + class422.field3763 = (var50 + var46) / 2; + class106.field1113 = (var51 + var53) / 2; + ObjTypeCustomisation.field1431 = (var64 + var63) / 2; + class303.field2512 = (var50 - var46) / 2; + class402.field3694 = (var53 - var51) / 2; + ViewportMouse.field2433 = (var64 - var63) / 2; + ViewportMouse.field2429 = Math.abs(class303.field2512); + MusicPatchNode2.field2777 = Math.abs(class402.field3694); + ViewportMouse.field2432 = Math.abs(ViewportMouse.field2433); + } + + AABB var55 = (AABB)this.aabb.get(var1); + var41 = var55.xMid + var6; + var42 = var7 + var55.yMid; + var43 = var8 + var55.zMid; + var63 = var55.xMidOffset; + var64 = var55.yMidOffset; + var46 = var55.zMidOffset; + var47 = class422.field3763 - var41; + var48 = class106.field1113 - var42; + var49 = ObjTypeCustomisation.field1431 - var43; + if (Math.abs(var47) > var63 + ViewportMouse.field2429) { + var37 = false; + } else if (Math.abs(var48) > var64 + MusicPatchNode2.field2777) { + var37 = false; + } else if (Math.abs(var49) > var46 + ViewportMouse.field2432) { + var37 = false; + } else if (Math.abs(var49 * class402.field3694 - var48 * ViewportMouse.field2433) > var46 * MusicPatchNode2.field2777 + var64 * ViewportMouse.field2432) { + var37 = false; + } else if (Math.abs(var47 * ViewportMouse.field2433 - var49 * class303.field2512) > var46 * ViewportMouse.field2429 + var63 * ViewportMouse.field2432) { + var37 = false; + } else if (Math.abs(var48 * class303.field2512 - var47 * class402.field3694) > var63 * MusicPatchNode2.field2777 + var64 * ViewportMouse.field2429) { + var37 = false; + } else { + var37 = true; + } + } + + var36 = var37; } else { - var34 = var12 - var13; - if (var34 <= 50) { - var34 = 50; + var62 = var12 - var13; + if (var62 <= 50) { + var62 = 50; } if (var15 > 0) { var16 /= var14; - var17 /= var34; + var17 /= var62; } else { var17 /= var14; - var16 /= var34; + var16 /= var62; } if (var18 > 0) { var23 /= var14; - var21 /= var34; + var21 /= var62; } else { var21 /= var14; - var23 /= var34; + var23 /= var62; } - var35 = var28 - Rasterizer3D.getClipMidX(); - var36 = var29 - Rasterizer3D.getClipMidY(); - if (var35 > var16 && var35 < var17 && var36 > var23 && var36 < var21) { - var33 = true; + var56 = var28 - Rasterizer3D.getClipMidX(); + var61 = var30 - Rasterizer3D.getClipMidY(); + if (var56 > var16 && var56 < var17 && var61 > var23 && var61 < var21) { + var36 = true; } } - if (var33) { + if (var36) { if (this.isSingleTile) { - class160.method845(var9); + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; } else { - var32 = true; + var35 = true; } } } - int var44 = Rasterizer3D.getClipMidX(); - var34 = Rasterizer3D.getClipMidY(); - var35 = 0; - var36 = 0; + int var60 = Rasterizer3D.getClipMidX(); + var62 = Rasterizer3D.getClipMidY(); + var56 = 0; + var61 = 0; if (var1 != 0) { - var35 = field2209[var1]; - var36 = field2206[var1]; + var56 = field2376[var1]; + var61 = field2378[var1]; } - for (int var37 = 0; var37 < this.verticesCount; ++var37) { - int var38 = this.verticesX[var37]; - int var39 = this.verticesY[var37]; - int var40 = this.verticesZ[var37]; - int var41; + for (var40 = 0; var40 < this.verticesCount; ++var40) { + var41 = this.verticesX[var40]; + var42 = this.verticesY[var40]; + var43 = this.verticesZ[var40]; if (var1 != 0) { - var41 = var40 * var35 + var38 * var36 >> 16; - var40 = var40 * var36 - var38 * var35 >> 16; - var38 = var41; + var63 = var43 * var56 + var41 * var61 >> 16; + var43 = var43 * var61 - var41 * var56 >> 16; + var41 = var63; } - var38 += var6; - var39 += var7; - var40 += var8; - var41 = var40 * var4 + var5 * var38 >> 16; - var40 = var5 * var40 - var38 * var4 >> 16; - var38 = var41; - var41 = var3 * var39 - var40 * var2 >> 16; - var40 = var39 * var2 + var3 * var40 >> 16; - field2198[var37] = var40 - var12; - if (var40 >= 50) { - modelViewportXs[var37] = var44 + var38 * Rasterizer3D.get3dZoom() / var40; - modelViewportYs[var37] = var34 + var41 * Rasterizer3D.get3dZoom() / var40; - field2191[var37] = SecureRandomFuture.method443(var40); + var41 += var6; + var42 += var7; + var43 += var8; + var63 = var43 * var4 + var5 * var41 >> 16; + var43 = var5 * var43 - var41 * var4 >> 16; + var41 = var63; + var63 = var3 * var42 - var43 * var2 >> 16; + var43 = var42 * var2 + var3 * var43 >> 16; + field2370[var40] = var43 - var12; + if (var43 >= 50) { + modelViewportXs[var40] = var60 + var41 * Rasterizer3D.get3dZoom() / var43; + modelViewportYs[var40] = var62 + var63 * Rasterizer3D.get3dZoom() / var43; + field2359[var40] = WorldMapAreaData.method1364(var43); } else { - modelViewportXs[var37] = -5000; + modelViewportXs[var40] = -5000; var25 = true; } if (var27) { - field2200[var37] = var38; - field2197[var37] = var41; - field2199[var37] = var40; + field2364[var40] = var41; + field2366[var40] = var63; + field2368[var40] = var43; } } try { - this.draw0(var25, var32, this.isSingleTile, var9); - } catch (Exception var43) { + this.draw0(var25, var35, this.isSingleTile, var9); + } catch (Exception var59) { } } diff --git a/osrs/src/main/java/ModelData.java b/osrs/src/main/java/ModelData.java index 7dc96d6b4..be057b3c8 100644 --- a/osrs/src/main/java/ModelData.java +++ b/osrs/src/main/java/ModelData.java @@ -3,139 +3,139 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jw") +@ObfuscatedName("kq") @Implements("ModelData") public class ModelData extends Renderable { - @ObfuscatedName("bs") - static int[] field1953; - @ObfuscatedName("bc") - static int[] field1950; + @ObfuscatedName("bt") + static int[] field2122; @ObfuscatedName("bu") - static int field1949; - @ObfuscatedName("bf") + static int[] field2123; + @ObfuscatedName("by") + static int field2120; + @ObfuscatedName("bh") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("bh") + @ObfuscatedName("bz") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("verticesCount") int verticesCount; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("verticesX") int[] verticesX; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("verticesY") int[] verticesY; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("faceCount") int faceCount; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("indices1") int[] indices1; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("indices2") int[] indices2; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("indices3") int[] indices3; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("faceColors") short[] faceColors; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("priority") byte priority; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("textureRenderTypes") byte[] textureRenderTypes; @ObfuscatedName("aw") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("bn") + @ObfuscatedName("be") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("bk") - int[][] field1978; - @ObfuscatedName("by") - int[][] field1980; @ObfuscatedName("bd") + int[][] field2149; + @ObfuscatedName("bl") + int[][] field2151; + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "[Ljv;" + descriptor = "[Lkp;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("be") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "[Ljp;" + descriptor = "[Lky;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "[Ljp;" + descriptor = "[Lky;" ) @Export("vertexVertices") VertexNormal[] vertexVertices; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("ambient") public short ambient; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("contrast") public short contrast; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("bo") - int field1965; @ObfuscatedName("bp") - int field1966; - @ObfuscatedName("bt") - int field1968; - @ObfuscatedName("bm") - int field1964; - @ObfuscatedName("br") - int field1967; + int field2138; + @ObfuscatedName("bw") + int field2139; + @ObfuscatedName("bj") + int field2135; + @ObfuscatedName("bn") + int field2136; + @ObfuscatedName("bo") + int field2137; static { - field1953 = new int[10000]; - field1950 = new int[10000]; - field1949 = 0; + field2122 = new int[10000]; + field2123 = new int[10000]; + field2120 = 0; ModelData_sine = Rasterizer3D.Rasterizer3D_sine; ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } @@ -148,7 +148,7 @@ public class ModelData extends Renderable { } @ObfuscatedSignature( - descriptor = "([Ljw;I)V" + descriptor = "([Lkq;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -192,7 +192,7 @@ public ModelData(ModelData[] var1, int var2) { var6 |= var11.faceSkins != null; var7 |= var11.faceTextures != null; var8 |= var11.textureCoords != null; - var9 |= var11.field1978 != null; + var9 |= var11.field2149 != null; } } @@ -228,8 +228,8 @@ public ModelData(ModelData[] var1, int var2) { } if (var9) { - this.field1978 = new int[this.verticesCount][]; - this.field1980 = new int[this.verticesCount][]; + this.field2149 = new int[this.verticesCount][]; + this.field2151 = new int[this.verticesCount][]; } this.faceColors = new short[this.faceCount]; @@ -286,18 +286,18 @@ public ModelData(ModelData[] var1, int var2) { } this.faceColors[this.faceCount] = var11.faceColors[var12]; - this.indices1[this.faceCount] = this.method1205(var11, var11.indices1[var12]); - this.indices2[this.faceCount] = this.method1205(var11, var11.indices2[var12]); - this.indices3[this.faceCount] = this.method1205(var11, var11.indices3[var12]); + this.indices1[this.faceCount] = this.method1389(var11, var11.indices1[var12]); + this.indices2[this.faceCount] = this.method1389(var11, var11.indices2[var12]); + this.indices3[this.faceCount] = this.method1389(var11, var11.indices3[var12]); ++this.faceCount; } for (var12 = 0; var12 < var11.textureTriangleCount; ++var12) { byte var13 = this.textureRenderTypes[this.textureTriangleCount] = var11.textureRenderTypes[var12]; if (var13 == 0) { - this.texTriangleX[this.textureTriangleCount] = (short)this.method1205(var11, var11.texTriangleX[var12]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method1205(var11, var11.texTriangleY[var12]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method1205(var11, var11.texTriangleZ[var12]); + this.texTriangleX[this.textureTriangleCount] = (short)this.method1389(var11, var11.texTriangleX[var12]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method1389(var11, var11.texTriangleY[var12]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method1389(var11, var11.texTriangleZ[var12]); } ++this.textureTriangleCount; @@ -315,19 +315,19 @@ public ModelData(ModelData[] var1, int var2) { Buffer var2 = new Buffer(10); var2.writeShort(-2); if (var1[var1.length - 1] == -3 && var1[var1.length - 2] == -1) { - this.method1201(var1); + this.method1385(var1); } else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { - this.method1202(var1); + this.method1386(var1); } else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { - this.method1203(var1); + this.method1387(var1); } else { - this.method1204(var1); + this.method1388(var1); } } @ObfuscatedSignature( - descriptor = "(Ljw;ZZZZ)V", + descriptor = "(Lkq;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -394,14 +394,14 @@ public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boole this.vertexNormals = var1.vertexNormals; this.faceNormals = var1.faceNormals; this.vertexVertices = var1.vertexVertices; - this.field1978 = var1.field1978; - this.field1980 = var1.field1980; + this.field2149 = var1.field2149; + this.field2151 = var1.field2151; this.ambient = var1.ambient; this.contrast = var1.contrast; } - @ObfuscatedName("ak") - void method1201(byte[] var1) { + @ObfuscatedName("ar") + void method1385(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -544,8 +544,8 @@ void method1201(byte[] var1) { } if (var18 == 1) { - this.field1978 = new int[var9][]; - this.field1980 = new int[var9][]; + this.field2149 = new int[var9][]; + this.field2151 = new int[var9][]; } this.faceColors = new short[var10]; @@ -600,12 +600,12 @@ void method1201(byte[] var1) { if (var18 == 1) { for (var53 = 0; var53 < var9; ++var53) { var54 = var6.readUnsignedByte(); - this.field1978[var53] = new int[var54]; - this.field1980[var53] = new int[var54]; + this.field2149[var53] = new int[var54]; + this.field2151[var53] = new int[var54]; for (var55 = 0; var55 < var54; ++var55) { - this.field1978[var53][var55] = var6.readUnsignedByte(); - this.field1980[var53][var55] = var6.readUnsignedByte(); + this.field2149[var53][var55] = var6.readUnsignedByte(); + this.field2151[var53][var55] = var6.readUnsignedByte(); } } } @@ -723,8 +723,8 @@ void method1201(byte[] var1) { } - @ObfuscatedName("ax") - void method1202(byte[] var1) { + @ObfuscatedName("ao") + void method1386(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -825,8 +825,8 @@ void method1202(byte[] var1) { } if (var17 == 1) { - this.field1978 = new int[var9][]; - this.field1980 = new int[var9][]; + this.field2149 = new int[var9][]; + this.field2151 = new int[var9][]; } this.faceColors = new short[var10]; @@ -875,12 +875,12 @@ void method1202(byte[] var1) { if (var17 == 1) { for (var40 = 0; var40 < var9; ++var40) { var41 = var8.readUnsignedByte(); - this.field1978[var40] = new int[var41]; - this.field1980[var40] = new int[var41]; + this.field2149[var40] = new int[var41]; + this.field2151[var40] = new int[var41]; for (var42 = 0; var42 < var41; ++var42) { - this.field1978[var40][var42] = var8.readUnsignedByte(); - this.field1980[var40][var42] = var8.readUnsignedByte(); + this.field2149[var40][var42] = var8.readUnsignedByte(); + this.field2151[var40][var42] = var8.readUnsignedByte(); } } } @@ -1017,8 +1017,8 @@ void method1202(byte[] var1) { } - @ObfuscatedName("ao") - void method1203(byte[] var1) { + @ObfuscatedName("ab") + void method1387(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -1323,8 +1323,8 @@ void method1203(byte[] var1) { } - @ObfuscatedName("ar") - void method1204(byte[] var1) { + @ObfuscatedName("az") + void method1388(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -1600,11 +1600,11 @@ void method1204(byte[] var1) { } - @ObfuscatedName("ab") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Ljw;I)I" + descriptor = "(Lkq;I)I" ) - final int method1205(ModelData var1, int var2) { + final int method1389(ModelData var1, int var2) { int var3 = -1; int var4 = var1.verticesX[var2]; int var5 = var1.verticesY[var2]; @@ -1625,9 +1625,9 @@ final int method1205(ModelData var1, int var2) { this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; } - if (var1.field1978 != null) { - this.field1978[this.verticesCount] = var1.field1978[var2]; - this.field1980[this.verticesCount] = var1.field1980[var2]; + if (var1.field2149 != null) { + this.field2149[this.verticesCount] = var1.field2149[var2]; + this.field2151[this.verticesCount] = var1.field2151[var2]; } var3 = this.verticesCount++; @@ -1636,9 +1636,9 @@ final int method1205(ModelData var1, int var2) { return var3; } - @ObfuscatedName("am") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "()Ljw;" + descriptor = "()Lkq;" ) @Export("copyModelData") public ModelData copyModelData() { @@ -1681,16 +1681,16 @@ public ModelData copyModelData() { return var1; } - @ObfuscatedName("av") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Ljw;" + descriptor = "([[IIIIZI)Lkq;" ) - public ModelData method1207(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method1391(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); - int var7 = var2 + this.field1966; - int var8 = var2 + this.field1968; - int var9 = var4 + this.field1967; - int var10 = var4 + this.field1964; + int var7 = var2 + this.field2139; + int var8 = var2 + this.field2135; + int var9 = var4 + this.field2137; + int var10 = var4 + this.field2136; if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { var7 >>= 7; var8 = var8 + 127 >> 7; @@ -1775,8 +1775,8 @@ public ModelData method1207(int[][] var1, int var2, int var3, int var4, boolean } } - @ObfuscatedName("ag") - void method1208() { + @ObfuscatedName("as") + void method1392() { int[] var1; int var2; int var10002; @@ -1836,8 +1836,8 @@ void method1208() { } - @ObfuscatedName("aa") - public void method1209() { + @ObfuscatedName("ay") + public void method1393() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; this.verticesX[var1] = this.verticesZ[var1]; @@ -1847,8 +1847,8 @@ public void method1209() { this.invalidate(); } - @ObfuscatedName("ap") - public void method1210() { + @ObfuscatedName("ak") + public void method1394() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesX[var1] = -this.verticesX[var1]; this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1857,8 +1857,8 @@ public void method1210() { this.invalidate(); } - @ObfuscatedName("ay") - public void method1211() { + @ObfuscatedName("aj") + public void method1395() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesZ[var1]; this.verticesZ[var1] = this.verticesX[var1]; @@ -1868,8 +1868,8 @@ public void method1211() { this.invalidate(); } - @ObfuscatedName("as") - public void method1212(int var1) { + @ObfuscatedName("am") + public void method1396(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1882,7 +1882,7 @@ public void method1212(int var1) { this.invalidate(); } - @ObfuscatedName("aj") + @ObfuscatedName("aq") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1897,7 +1897,7 @@ public void changeOffset(int var1, int var2, int var3) { this.invalidate(); } - @ObfuscatedName("an") + @ObfuscatedName("ai") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { @@ -1908,7 +1908,7 @@ public void recolor(short var1, short var2) { } - @ObfuscatedName("au") + @ObfuscatedName("aw") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { @@ -1921,8 +1921,8 @@ public void retexture(short var1, short var2) { } } - @ObfuscatedName("ai") - public void method1216() { + @ObfuscatedName("ae") + public void method1400() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1937,7 +1937,7 @@ public void method1216() { this.invalidate(); } - @ObfuscatedName("ae") + @ObfuscatedName("an") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1949,7 +1949,7 @@ public void resize(int var1, int var2, int var3) { this.invalidate(); } - @ObfuscatedName("aw") + @ObfuscatedName("ag") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { @@ -2025,7 +2025,7 @@ public void calculateVertexNormals() { } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @Export("invalidate") void invalidate() { this.vertexNormals = null; @@ -2034,43 +2034,43 @@ void invalidate() { this.isBoundsCalculated = false; } - @ObfuscatedName("az") + @ObfuscatedName("af") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { super.height = 0; - this.field1965 = 0; - this.field1966 = 999999; - this.field1968 = -999999; - this.field1964 = -99999; - this.field1967 = 99999; + this.field2138 = 0; + this.field2139 = 999999; + this.field2135 = -999999; + this.field2136 = -99999; + this.field2137 = 99999; for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; int var3 = this.verticesY[var1]; int var4 = this.verticesZ[var1]; - if (var2 < this.field1966) { - this.field1966 = var2; + if (var2 < this.field2139) { + this.field2139 = var2; } - if (var2 > this.field1968) { - this.field1968 = var2; + if (var2 > this.field2135) { + this.field2135 = var2; } - if (var4 < this.field1967) { - this.field1967 = var4; + if (var4 < this.field2137) { + this.field2137 = var4; } - if (var4 > this.field1964) { - this.field1964 = var4; + if (var4 > this.field2136) { + this.field2136 = var4; } if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field1965) { - this.field1965 = var3; + if (var3 > this.field2138) { + this.field2138 = var3; } } @@ -2078,9 +2078,9 @@ void calculateBounds() { } } - @ObfuscatedName("af") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(IIIII)Ljn;" + descriptor = "(IIIII)Lka;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -2101,38 +2101,38 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } } - var8.field2254 = 0; + var8.field2421 = 0; for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field2254; + ++var8.field2421; } } - var8.field2229 = new int[var8.field2254]; - var8.field2228 = new int[var8.field2254]; - var8.field2239 = new int[var8.field2254]; + var8.field2396 = new int[var8.field2421]; + var8.field2397 = new int[var8.field2421]; + var8.field2407 = new int[var8.field2421]; var10 = 0; int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field2229[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field2228[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field2239[var10] = this.texTriangleZ[var11] & '\uffff'; + var8.field2396[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field2397[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field2407[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.field2222 = new byte[this.faceCount]; + var8.field2390 = new byte[this.faceCount]; for (var11 = 0; var11 < this.faceCount; ++var11) { if (this.textureCoords[var11] != -1) { - var8.field2222[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field2390[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2222[var11] = -1; + var8.field2390[var11] = -1; } } } @@ -2175,7 +2175,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method1223(this.faceColors[var16] & '\uffff', var14); + var8.faceColors1[var16] = method1407(this.faceColors[var16] & '\uffff', var14); var8.faceColors3[var16] = -1; } else if (var17 == 3) { var8.faceColors1[var16] = 128; @@ -2192,7 +2192,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method1223(var15, var14); + var8.faceColors1[var16] = method1407(var15, var14); if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2200,7 +2200,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method1223(var15, var14); + var8.faceColors2[var16] = method1407(var15, var14); if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { var13 = this.vertexVertices[this.indices3[var16]]; } else { @@ -2208,13 +2208,13 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method1223(var15, var14); + var8.faceColors3[var16] = method1407(var15, var14); } } else if (var17 != 0) { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method1224(var14); + var8.faceColors1[var16] = method1408(var14); var8.faceColors3[var16] = -1; } else { var8.faceColors3[var16] = -2; @@ -2227,7 +2227,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method1224(var14); + var8.faceColors1[var16] = method1408(var14); if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2235,7 +2235,7 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method1224(var14); + var8.faceColors2[var16] = method1408(var14); if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { var13 = this.vertexVertices[this.indices3[var16]]; } else { @@ -2243,11 +2243,11 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method1224(var14); + var8.faceColors3[var16] = method1408(var14); } } - this.method1208(); + this.method1392(); var8.verticesCount = this.verticesCount; var8.verticesX = this.verticesX; var8.verticesY = this.verticesY; @@ -2258,18 +2258,18 @@ public final Model toModel(int var1, int var2, int var3, int var4, int var5) { var8.indices3 = this.indices3; var8.faceRenderPriorities = this.faceRenderPriorities; var8.faceAlphas = this.faceAlphas; - var8.field2247 = this.priority; + var8.field2415 = this.priority; var8.vertexLabels = this.vertexLabels; var8.faceLabelsAlpha = this.faceLabelsAlpha; var8.faceTextures = this.faceTextures; - var8.field2240 = this.field1978; - var8.field2241 = this.field1980; + var8.field2409 = this.field2149; + var8.field2411 = this.field2151; return var8; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lom;II)Ljw;" + descriptor = "(Lol;II)Lkq;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -2277,16 +2277,16 @@ public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) return var3 == null ? null : new ModelData(var3); } - @ObfuscatedName("at") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(Ljw;Ljw;IIIZ)V" + descriptor = "(Lkq;Lkq;IIIZ)V" ) - static void method1221(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method1405(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); var0.calculateVertexNormals(); var1.calculateBounds(); var1.calculateVertexNormals(); - ++field1949; + ++field2120; int var6 = 0; int[] var7 = var1.verticesX; int var8 = var1.verticesCount; @@ -2296,11 +2296,11 @@ static void method1221(ModelData var0, ModelData var1, int var2, int var3, int v VertexNormal var10 = var0.vertexNormals[var9]; if (var10.magnitude != 0) { int var11 = var0.verticesY[var9] - var3; - if (var11 <= var1.field1965) { + if (var11 <= var1.field2138) { int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field1966 && var12 <= var1.field1968) { + if (var12 >= var1.field2139 && var12 <= var1.field2135) { int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field1967 && var13 <= var1.field1964) { + if (var13 >= var1.field2137 && var13 <= var1.field2136) { for (int var14 = 0; var14 < var8; ++var14) { VertexNormal var15 = var1.vertexNormals[var14]; if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { @@ -2331,8 +2331,8 @@ static void method1221(ModelData var0, ModelData var1, int var2, int var3, int v var17.z += var10.z; var17.magnitude += var10.magnitude; ++var6; - field1953[var9] = field1949; - field1950[var14] = field1949; + field2122[var9] = field2120; + field2123[var14] = field2120; } } } @@ -2343,7 +2343,7 @@ static void method1221(ModelData var0, ModelData var1, int var2, int var3, int v if (var6 >= 3 && var5) { for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field1953[var0.indices1[var9]] == field1949 && field1953[var0.indices2[var9]] == field1949 && field1953[var0.indices3[var9]] == field1949) { + if (field2122[var0.indices1[var9]] == field2120 && field2122[var0.indices2[var9]] == field2120 && field2122[var0.indices3[var9]] == field2120) { if (var0.faceRenderTypes == null) { var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -2353,7 +2353,7 @@ static void method1221(ModelData var0, ModelData var1, int var2, int var3, int v } for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field1949 == field1950[var1.indices1[var9]] && field1949 == field1950[var1.indices2[var9]] && field1949 == field1950[var1.indices3[var9]]) { + if (field2120 == field2123[var1.indices1[var9]] && field2120 == field2123[var1.indices2[var9]] && field2120 == field2123[var1.indices3[var9]]) { if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -2365,8 +2365,8 @@ static void method1221(ModelData var0, ModelData var1, int var2, int var3, int v } } - @ObfuscatedName("ad") - static final int method1223(int var0, int var1) { + @ObfuscatedName("bl") + static final int method1407(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2377,8 +2377,8 @@ static final int method1223(int var0, int var1) { return (var0 & 65408) + var1; } - @ObfuscatedName("bn") - static final int method1224(int var0) { + @ObfuscatedName("bi") + static final int method1408(int var0) { if (var0 < 2) { var0 = 2; } else if (var0 > 126) { diff --git a/osrs/src/main/java/ModelData0.java b/osrs/src/main/java/ModelData0.java index ca61955a6..29611dd2e 100644 --- a/osrs/src/main/java/ModelData0.java +++ b/osrs/src/main/java/ModelData0.java @@ -1,21 +1,50 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("lf") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("ao") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("dn") + ModelData0() { + } + + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "[Lun;" + descriptor = "(ILdt;ZI)I", + garbageValue = "384222635" ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; + static int method1599(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == 8000) { + --DbTableType.Interpreter_intStackSize; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_arrayLengths[var3]; + class422.method2167(Interpreter.Interpreter_arrays[var3], new int[var4], 0, var4 - 1); + return 1; + } else if (var0 == 8001) { + DbTableType.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_arrayLengths[var3]; + if (var6 <= 1) { + return 1; + } else { + class421.method2166(Interpreter.Interpreter_arrays[var3], var6, var4, var5); + return 1; + } + } else { + return 2; + } + } - ModelData0() { + @ObfuscatedName("hs") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "1205269572" + ) + static long method1598() { + return Client.playerUUID; } } \ No newline at end of file diff --git a/osrs/src/main/java/MouseHandler.java b/osrs/src/main/java/MouseHandler.java index c8f45ecba..41009dd5d 100644 --- a/osrs/src/main/java/MouseHandler.java +++ b/osrs/src/main/java/MouseHandler.java @@ -5,78 +5,66 @@ import java.awt.event.*; -@ObfuscatedName("bo") +@ObfuscatedName("bp") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lbo;" + descriptor = "Lbp;" ) @Export("MouseHandler_instance") public static MouseHandler MouseHandler_instance; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("MouseHandler_idleCycles") - public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("ah") + static volatile int MouseHandler_idleCycles; + @ObfuscatedName("au") @Export("MouseHandler_currentButtonVolatile") public static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("MouseHandler_xVolatile") public static volatile int MouseHandler_xVolatile; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("MouseHandler_yVolatile") public static volatile int MouseHandler_yVolatile; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("MouseHandler_lastMovedVolatile") public static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("MouseHandler_x") public static int MouseHandler_x; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("MouseHandler_y") public static int MouseHandler_y; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("MouseHandler_lastButtonVolatile") public static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("MouseHandler_lastPressedXVolatile") public static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("MouseHandler_lastPressedYVolatile") public static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("MouseHandler_lastPressedTimeMillisVolatile") public static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; @ObfuscatedName("aw") @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("gy") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("ul") - @Export("cameraMoveToY") - static int cameraMoveToY; static { MouseHandler_instance = new MouseHandler(); @@ -102,10 +90,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(Ljava/awt/event/MouseEvent;B)I", - garbageValue = "29" + garbageValue = "115" ) @Export("getButton") final int getButton(MouseEvent var1) { @@ -134,7 +122,7 @@ public final synchronized void mousePressed(MouseEvent var1) { MouseHandler_idleCycles = 0; MouseHandler_lastPressedXVolatile = var1.getX(); MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = GrandExchangeOfferTotalQuantityComparator.method1971(); + MouseHandler_lastPressedTimeMillisVolatile = SpotAnimationDefinition.method962(); MouseHandler_lastButtonVolatile = this.getButton(var1); if (MouseHandler_lastButtonVolatile != 0) { MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; @@ -198,136 +186,34 @@ public final synchronized void focusLost(FocusEvent var1) { } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1381957040" - ) - public static void method173() { - class189.field1494.clear(); - } - - @ObfuscatedName("al") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-948962256" + descriptor = "(IIIII)V", + garbageValue = "-455674284" ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; - int[] var3 = new int[4]; - var2[0] = var0; - var3[0] = var1; - int var4 = 1; - - for (int var5 = 0; var5 < 4; ++var5) { - if (World.World_sortOption1[var5] != var0) { - var2[var4] = World.World_sortOption1[var5]; - var3[var4] = World.World_sortOption2[var5]; - ++var4; - } - } + static final void method182(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { + for (int var5 = var0; var5 <= var0 + var2; ++var5) { + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { + class93.field948[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } - World.World_sortOption1 = var2; - World.World_sortOption2 = var3; - class12.sortWorlds(UserComparator3.World_worlds, 0, UserComparator3.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - } + if (var0 + var2 == var5 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(III)Lds;", - garbageValue = "332721621" - ) - static Script method175(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); - if (var2 != null) { - return var2; - } else { - String var3 = String.valueOf(var0); - int var4 = SongTask.archive12.getGroupId(var3); - if (var4 == -1) { - return null; - } else { - byte[] var5 = SongTask.archive12.takeFileFlat(var4); - if (var5 != null) { - if (var5.length <= 1) { - return null; + if (var4 == var1 && var4 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; } - var2 = class224.newScript(var5); - if (var2 != null) { - Script.Script_cached.put(var2, (long)(var0 << 16)); - return var2; + if (var3 + var1 == var4 && var4 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; } } - - return null; - } - } - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "65" - ) - static void method177(int var0, int var1, int var2, int var3) { - class319.musicPlayerStatus = var0; - class319.field2794 = var1; - class319.field2793 = var2; - class319.field2795 = var3; - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "671130802" - ) - static int method179(int var0, Script var1, boolean var2) { - return 2; - } - - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1315584412" - ) - static void method178() { - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1153 = null; - Client.packetWriter.field1154 = null; - Client.packetWriter.field1156 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1152 = 0; - Client.rebootTimer = 0; - class91.method483(); - Client.minimapState = 0; - Client.destinationX = 0; - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; - } - - TextureProvider.localPlayer = null; - - for (var0 = 0; var0 < Client.npcs.length; ++var0) { - NPC var1 = Client.npcs[var0]; - if (var1 != null) { - var1.targetIndex = -1; - var1.false0 = false; } } - Tile.method1231(); - DefaultsGroup.updateGameState(30); - - for (var0 = 0; var0 < 100; ++var0) { - Client.field408[var0] = true; - } - - class517.method2533(); } } \ No newline at end of file diff --git a/osrs/src/main/java/MouseRecorder.java b/osrs/src/main/java/MouseRecorder.java index 3f070070a..e39deb123 100644 --- a/osrs/src/main/java/MouseRecorder.java +++ b/osrs/src/main/java/MouseRecorder.java @@ -3,25 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("db") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("isRunning") boolean isRunning; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("lock") Object lock; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("index") int index; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("xs") int[] xs; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("ys") int[] ys; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("millis") long[] millis; @@ -37,7 +37,7 @@ public class MouseRecorder implements Runnable { @Export("run") @ObfuscatedName("run") public void run() { - for (; this.isRunning; Players.method623(50L)) { + for (; this.isRunning; class219.method1104(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; @@ -50,382 +50,29 @@ public void run() { } - @ObfuscatedName("al") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-2055845886" + descriptor = "(IB)I", + garbageValue = "-43" ) - static int method476(int var0) { - return class28.KeyHandler_keyCodes[var0]; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "258753092" - ) - static int method475(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; + public static int method469(int var0) { + class139 var2 = (class139)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); + class139 var1; + if (var2 != null) { + var1 = var2; } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; - } - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IIIIIIIILjt;Lih;I)V", - garbageValue = "-737190520" - ) - static final void method477(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap var9) { - ObjectComposition var10 = class91.getObjectDefinition(var4); - int var11 = var7 >= 0 ? var7 : var10.animationId * -1053143457 * 1992396191; - int var12; - int var13; - if (var5 != 1 && var5 != 3) { - var12 = var10.sizeX; - var13 = var10.sizeY; - } else { - var12 = var10.sizeY; - var13 = var10.sizeX; - } - - int var14; - int var15; - if (var12 + var2 <= 104) { - var14 = (var12 >> 1) + var2; - var15 = var2 + (var12 + 1 >> 1); - } else { - var14 = var2; - var15 = var2 + 1; - } - - int var16; - int var17; - if (var3 + var13 <= 104) { - var16 = var3 + (var13 >> 1); - var17 = var3 + (var13 + 1 >> 1); - } else { - var16 = var3; - var17 = var3 + 1; - } - - int[][] var18 = Tiles.Tiles_heights[var1]; - int var19 = var18[var15][var17] + var18[var14][var16] + var18[var15][var16] + var18[var14][var17] >> 2; - int var20 = (var2 << 7) + (var12 << 6); - int var21 = (var3 << 7) + (var13 << 6); - long var22 = GrandExchangeOfferAgeComparator.calculateTag(var2, var3, 2, var10.int1 == 0, var4); - int var24 = (var5 << 6) + var6; - if (var10.int3 == 1) { - var24 += 256; - } - - Object var25; - if (var6 == 22) { - if (var11 == -1 && var10.transforms == null) { - var25 = var10.getModel(22, var5, var18, var20, var19, var21); - } else { - var25 = new DynamicObject(var4, 22, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.newFloorDecoration(var0, var2, var3, var19, (Renderable)var25, var22, var24); - if (var10.interactType == 1) { - var9.setBlockedByFloorDec(var2, var3); - } - - } else if (var6 != 10 && var6 != 11) { - if (var6 >= 12) { - if (var11 == -1 && var10.transforms == null) { - var25 = var10.getModel(var6, var5, var18, var20, var19, var21); - } else { - var25 = new DynamicObject(var4, var6, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.method1287(var0, var2, var3, var19, 1, 1, (Renderable)var25, 0, var22, var24); - if (var10.interactType != 0) { - var9.addGameObject(var2, var3, var12, var13, var10.boolean1); - } - - } else if (var6 == 0) { - if (var11 == -1 && var10.transforms == null) { - var25 = var10.getModel(0, var5, var18, var20, var19, var21); - } else { - var25 = new DynamicObject(var4, 0, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.newBoundaryObject(var0, var2, var3, var19, (Renderable)var25, (Renderable)null, Tiles.field844[var5], 0, var22, var24); - if (var10.interactType != 0) { - var9.method1156(var2, var3, var6, var5, var10.boolean1); - } - - } else if (var6 == 1) { - if (var11 == -1 && var10.transforms == null) { - var25 = var10.getModel(1, var5, var18, var20, var19, var21); - } else { - var25 = new DynamicObject(var4, 1, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.newBoundaryObject(var0, var2, var3, var19, (Renderable)var25, (Renderable)null, Tiles.field843[var5], 0, var22, var24); - if (var10.interactType != 0) { - var9.method1156(var2, var3, var6, var5, var10.boolean1); - } - - } else { - int var31; - if (var6 == 2) { - var31 = var5 + 1 & 3; - Object var26; - Object var27; - if (var11 == -1 && var10.transforms == null) { - var26 = var10.getModel(2, var5 + 4, var18, var20, var19, var21); - var27 = var10.getModel(2, var31, var18, var20, var19, var21); - } else { - var26 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - var27 = new DynamicObject(var4, 2, var31, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.newBoundaryObject(var0, var2, var3, var19, (Renderable)var26, (Renderable)var27, Tiles.field844[var5], Tiles.field844[var31], var22, var24); - if (var10.interactType != 0) { - var9.method1156(var2, var3, var6, var5, var10.boolean1); - } - - } else if (var6 == 3) { - if (var11 == -1 && var10.transforms == null) { - var25 = var10.getModel(3, var5, var18, var20, var19, var21); - } else { - var25 = new DynamicObject(var4, 3, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.newBoundaryObject(var0, var2, var3, var19, (Renderable)var25, (Renderable)null, Tiles.field843[var5], 0, var22, var24); - if (var10.interactType != 0) { - var9.method1156(var2, var3, var6, var5, var10.boolean1); - } - - } else if (var6 == 9) { - if (var11 == -1 && var10.transforms == null) { - var25 = var10.getModel(var6, var5, var18, var20, var19, var21); - } else { - var25 = new DynamicObject(var4, var6, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.method1287(var0, var2, var3, var19, 1, 1, (Renderable)var25, 0, var22, var24); - if (var10.interactType != 0) { - var9.addGameObject(var2, var3, var12, var13, var10.boolean1); - } - - } else if (var6 == 4) { - if (var11 == -1 && var10.transforms == null) { - var25 = var10.getModel(4, var5, var18, var20, var19, var21); - } else { - var25 = new DynamicObject(var4, 4, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.newWallDecoration(var0, var2, var3, var19, (Renderable)var25, (Renderable)null, Tiles.field844[var5], 0, 0, 0, var22, var24); - } else { - Object var28; - long var32; - if (var6 == 5) { - var31 = 16; - var32 = var8.getBoundaryObjectTag(var0, var2, var3); - if (0L != var32) { - var31 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var32)).int2; - } - - if (var11 == -1 && var10.transforms == null) { - var28 = var10.getModel(4, var5, var18, var20, var19, var21); - } else { - var28 = new DynamicObject(var4, 4, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.newWallDecoration(var0, var2, var3, var19, (Renderable)var28, (Renderable)null, Tiles.field844[var5], 0, var31 * Tiles.field847[var5], var31 * Tiles.field845[var5], var22, var24); - } else if (var6 == 6) { - var31 = 8; - var32 = var8.getBoundaryObjectTag(var0, var2, var3); - if (0L != var32) { - var31 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var32)).int2 / 2; - } - - if (var11 == -1 && var10.transforms == null) { - var28 = var10.getModel(4, var5 + 4, var18, var20, var19, var21); - } else { - var28 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.newWallDecoration(var0, var2, var3, var19, (Renderable)var28, (Renderable)null, 256, var5, var31 * Tiles.field848[var5], var31 * Tiles.field846[var5], var22, var24); - } else if (var6 == 7) { - int var34 = var5 + 2 & 3; - if (var11 == -1 && var10.transforms == null) { - var25 = var10.getModel(4, var34 + 4, var18, var20, var19, var21); - } else { - var25 = new DynamicObject(var4, 4, var34 + 4, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.newWallDecoration(var0, var2, var3, var19, (Renderable)var25, (Renderable)null, 256, var34, 0, 0, var22, var24); - } else if (var6 == 8) { - var31 = 8; - var32 = var8.getBoundaryObjectTag(var0, var2, var3); - if (0L != var32) { - var31 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var32)).int2 / 2; - } - - int var30 = var5 + 2 & 3; - Object var29; - if (var11 == -1 && var10.transforms == null) { - var28 = var10.getModel(4, var5 + 4, var18, var20, var19, var21); - var29 = var10.getModel(4, var30 + 4, var18, var20, var19, var21); - } else { - var28 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - var29 = new DynamicObject(var4, 4, var30 + 4, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - var8.newWallDecoration(var0, var2, var3, var19, (Renderable)var28, (Renderable)var29, 256, var5, var31 * Tiles.field848[var5], var31 * Tiles.field846[var5], var22, var24); - } - } - } - } else { - if (var11 == -1 && var10.transforms == null) { - var25 = var10.getModel(10, var5, var18, var20, var19, var21); - } else { - var25 = new DynamicObject(var4, 10, var5, var1, var2, var3, var11, var10.boolean3, (Renderable)null); - } - - if (var25 != null) { - var8.method1287(var0, var2, var3, var19, var12, var13, (Renderable)var25, var6 == 11 ? 256 : 0, var22, var24); - } - - if (var10.interactType != 0) { - var9.addGameObject(var2, var3, var12, var13, var10.boolean1); + var2 = Login.method437(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); + if (var2 != null) { + SequenceDefinition.SequenceDefinition_cachedModel.put(var2, (long)var0); } + var1 = var2; } - } - - @ObfuscatedName("jz") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "-1742769560" - ) - static final void method478(int var0, int var1, boolean var2) { - if (!var2 || var0 != class94.timeOfPreviousKeyPress || class365.field3199 != var1) { - class94.timeOfPreviousKeyPress = var0; - class365.field3199 = var1; - DefaultsGroup.updateGameState(25); - class427.drawLoadingMessage("Loading - please wait.", true); - int var3 = class20.baseX; - int var4 = class19.baseY; - class20.baseX = (var0 - 6) * 8; - class19.baseY = (var1 - 6) * 8; - int var5 = class20.baseX - var3; - int var6 = class19.baseY - var4; - var3 = class20.baseX; - var4 = class19.baseY; - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 65536; ++var7) { - NPC var8 = Client.npcs[var7]; - if (var8 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var8.pathX; - var10000[var9] -= var5; - var10000 = var8.pathY; - var10000[var9] -= var6; - } - - var8.x -= var5 * 128; - var8.y -= var6 * 128; - } - } - - for (var7 = 0; var7 < 2048; ++var7) { - Player var21 = Client.players[var7]; - if (var21 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var21.pathX; - var10000[var9] -= var5; - var10000 = var21.pathY; - var10000[var9] -= var6; - } - - var21.x -= var5 * 128; - var21.y -= var6 * 128; - } - } - - byte var20 = 0; - byte var18 = 104; - byte var22 = 1; - if (var5 < 0) { - var20 = 103; - var18 = -1; - var22 = -1; - } - - byte var10 = 0; - byte var11 = 104; - byte var12 = 1; - if (var6 < 0) { - var10 = 103; - var11 = -1; - var12 = -1; - } - - int var14; - for (int var13 = var20; var18 != var13; var13 += var22) { - for (var14 = var10; var14 != var11; var14 += var12) { - int var15 = var5 + var13; - int var16 = var6 + var14; - - for (int var17 = 0; var17 < 4; ++var17) { - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; - } else { - Client.groundItems[var17][var13][var14] = null; - } - } - } - } - - for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { - var19.x -= var5; - var19.y -= var6; - if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { - var19.remove(); - } - } - - if (Client.destinationX != 0) { - Client.destinationX -= var5; - Client.destinationY -= var6; - } - - Client.soundEffectCount = 0; - Client.isCameraLocked = false; - Client.cameraX -= var5 << 7; - WorldMapArea.cameraZ -= var6 << 7; - ChatChannel.oculusOrbFocalPointX -= var5 << 7; - AbstractWorldMapData.oculusOrbFocalPointY -= var6 << 7; - Client.field539 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } + if (var1 == null) { + return 2; + } else { + return var1.method741() ? 0 : 1; } } - - @ObfuscatedName("np") - @ObfuscatedSignature( - descriptor = "(Lnm;I)I", - garbageValue = "-1186602538" - ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); - return var1 != null ? var1.integer : var0.flags; - } } \ No newline at end of file diff --git a/osrs/src/main/java/MouseWheelHandler.java b/osrs/src/main/java/MouseWheelHandler.java index 8bcc01c94..6fb430851 100644 --- a/osrs/src/main/java/MouseWheelHandler.java +++ b/osrs/src/main/java/MouseWheelHandler.java @@ -7,10 +7,10 @@ import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; -@ObfuscatedName("aq") +@ObfuscatedName("ae") @Implements("MouseWheelHandler") -public final class MouseWheelHandler implements class176, MouseWheelListener { - @ObfuscatedName("ac") +public final class MouseWheelHandler implements class212, MouseWheelListener { + @ObfuscatedName("at") @Export("rotation") int rotation; @@ -18,29 +18,29 @@ public final class MouseWheelHandler implements class176, MouseWheelListener { this.rotation = 0; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "1378624213" + garbageValue = "635528306" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-65029558" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "72" ) void method79(Component var1) { var1.removeMouseWheelListener(this); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1993578896" + garbageValue = "-855152300" ) @Export("useRotation") public synchronized int useRotation() { diff --git a/osrs/src/main/java/MoveSpeed.java b/osrs/src/main/java/MoveSpeed.java index 53c2b2344..9e8e46cd2 100644 --- a/osrs/src/main/java/MoveSpeed.java +++ b/osrs/src/main/java/MoveSpeed.java @@ -3,37 +3,43 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Date; - -@ObfuscatedName("ip") +@ObfuscatedName("iz") @Implements("MoveSpeed") -public enum MoveSpeed implements class386 { - @ObfuscatedName("ac") +public enum MoveSpeed implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Liz;" ) @Export("STATIONARY") STATIONARY((byte)-1), - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Liz;" ) @Export("CRAWL") CRAWL((byte)0), - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Liz;" ) @Export("WALK") WALK((byte)1), - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Liz;" ) @Export("RUN") RUN((byte)2); - @ObfuscatedName("ao") + @ObfuscatedName("cw") + static String field1933; + @ObfuscatedName("dc") + @ObfuscatedSignature( + descriptor = "[Lup;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("ab") @Export("speed") public byte speed; @@ -41,38 +47,261 @@ public enum MoveSpeed implements class386 { this.speed = var3; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { return this.speed; } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/util/Date;B)Z", - garbageValue = "-81" + descriptor = "(I[III)V", + garbageValue = "-1953021335" ) - static boolean method1187(Date var0) { - Date var1 = class314.method1652(); - return var0.after(var1); + static void method1167(int var0, int[] var1, int var2) { + for (int var3 = 0; var3 < class348.KitDefinition_fileCount; ++var3) { + KitDefinition var4 = class1.KitDefinition_get(var3); + if (var4 != null && !var4.nonSelectable && var4.bodypartID == (var0 == 1 ? 7 : 0) + var2) { + var1[PlayerComposition.equipmentIndices[var2]] = var3 + 256; + break; + } + } + } - @ObfuscatedName("of") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "(Lnm;IB)Ljava/lang/String;", - garbageValue = "-29" + descriptor = "(Ldf;II)V", + garbageValue = "-1026770295" ) - static String method1188(Widget var0, int var1) { - int var3 = MouseRecorder.getWidgetFlags(var0); - boolean var2 = (var3 >> var1 + 1 & 1) != 0; - if (!var2 && var0.onOp == null) { - return null; + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + int var3; + int var4; + int var6; + SequenceDefinition var9; + if (var0.spotAnimation >= Client.cycle) { + int var2 = Math.max(1, var0.spotAnimation - Client.cycle); + var3 = var0.field983 * 64 + var0.field1013 * 128; + var4 = var0.field983 * 64 + var0.field1012 * 128; + var0.x += (var3 - var0.x) / var2; + var0.y += (var4 - var0.y) / var2; + var0.field1028 = 0; + var0.orientation = var0.exactMoveDirection; + } else if (var0.exactMoveArrive1Cycle >= Client.cycle) { + boolean var12 = var0.exactMoveArrive1Cycle == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0; + if (!var12) { + var9 = DynamicObject.SequenceDefinition_get(var0.sequence); + if (var9 != null && !var9.isCachedModelIdSet()) { + var12 = var0.sequenceFrameCycle + 1 > var9.frameLengths[var0.sequenceFrame]; + } else { + var12 = true; + } + } + + if (var12) { + var3 = var0.exactMoveArrive1Cycle - var0.spotAnimation; + var4 = Client.cycle - var0.spotAnimation; + int var5 = var0.field983 * 64 + var0.field1013 * 128; + var6 = var0.field983 * 64 + var0.field1012 * 128; + int var7 = var0.field983 * 64 + var0.field1024 * 128; + int var8 = var0.field983 * 64 + var0.field1010 * 128; + var0.x = (var4 * var7 + var5 * (var3 - var4)) / var3; + var0.y = (var8 * var4 + var6 * (var3 - var4)) / var3; + } + + var0.field1028 = 0; + var0.orientation = var0.exactMoveDirection; + var0.rotation = var0.orientation; } else { - return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; + DevicePcmPlayerProvider.method84(var0); + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = 0; + var0.exactMoveArrive1Cycle = 0; + var0.method513(); + var0.x = var0.pathX[0] * 128 + var0.field983 * 64; + var0.y = var0.field983 * 64 + var0.pathY[0] * 128; + var0.method506(); + } + + if (class229.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = 0; + var0.exactMoveArrive1Cycle = 0; + var0.method513(); + var0.x = var0.pathX[0] * 128 + var0.field983 * 64; + var0.y = var0.pathY[0] * 128 + var0.field983 * 64; + var0.method506(); + } + + WorldMap.method2456(var0); + var0.isWalking = false; + if (var0.movementSequence != -1) { + SequenceDefinition var10 = DynamicObject.SequenceDefinition_get(var0.movementSequence); + if (var10 != null) { + if (!var10.isCachedModelIdSet() && var10.frameIds != null) { + ++var0.movementFrameCycle; + if (var0.movementFrame < var10.frameIds.length && var0.movementFrameCycle > var10.frameLengths[var0.movementFrame]) { + var0.movementFrameCycle = 1; + ++var0.movementFrame; + DynamicObject.method451(var10, var0.movementFrame, var0.x, var0.y, var0); + } + + if (var0.movementFrame >= var10.frameIds.length) { + if (var10.frameCount > 0) { + var0.movementFrame -= var10.frameCount; + if (var10.field1796) { + ++var0.field1006; + } + + if (var0.movementFrame < 0 || var0.movementFrame >= var10.frameIds.length || var10.field1796 && var0.field1006 >= var10.iterations) { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + var0.field1006 = 0; + } + } else { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + } + + DynamicObject.method451(var10, var0.movementFrame, var0.x, var0.y, var0); + } + } else if (var10.isCachedModelIdSet()) { + ++var0.movementFrame; + var3 = var10.method1052(); + if (var0.movementFrame < var3) { + FriendLoginUpdate.method2227(var10, var0.movementFrame, var0.x, var0.y, var0); + } else { + if (var10.frameCount > 0) { + var0.movementFrame -= var10.frameCount; + if (var10.field1796) { + ++var0.field1006; + } + + if (var0.movementFrame < 0 || var0.movementFrame >= var3 || var10.field1796 && var0.field1006 >= var10.iterations) { + var0.movementFrame = 0; + var0.movementFrameCycle = 0; + var0.field1006 = 0; + } + } else { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + } + + FriendLoginUpdate.method2227(var10, var0.movementFrame, var0.x, var0.y, var0); + } + } else { + var0.movementSequence = -1; + } + } else { + var0.movementSequence = -1; + } } + + IterableNodeHashTableIterator var14 = new IterableNodeHashTableIterator(var0.method512()); + + for (SpotAnimation var13 = (SpotAnimation)var14.method2461(); var13 != null; var13 = (SpotAnimation)var14.next()) { + if (var13.field4313 != -1 && Client.cycle >= var13.field4311) { + var4 = Canvas.SpotAnimationDefinition_get(var13.field4313).sequence; + if (var4 == -1) { + var13.remove(); + --var0.field1026; + } else { + var13.field4310 = Math.max(var13.field4310, 0); + SequenceDefinition var11 = DynamicObject.SequenceDefinition_get(var4); + if (var11.frameIds != null && !var11.isCachedModelIdSet()) { + ++var13.field4312; + if (var13.field4310 < var11.frameIds.length && var13.field4312 > var11.frameLengths[var13.field4310]) { + var13.field4312 = 1; + ++var13.field4310; + DynamicObject.method451(var11, var13.field4310, var0.x, var0.y, var0); + } + + if (var13.field4310 >= var11.frameIds.length) { + var13.remove(); + --var0.field1026; + } + } else if (var11.isCachedModelIdSet()) { + ++var13.field4310; + var6 = var11.method1052(); + if (var13.field4310 < var6) { + FriendLoginUpdate.method2227(var11, var13.field4310, var0.x, var0.y, var0); + } else { + var13.remove(); + --var0.field1026; + } + } else { + var13.remove(); + --var0.field1026; + } + } + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { + var9 = DynamicObject.SequenceDefinition_get(var0.sequence); + if (var9.precedenceAnimating == 1 && var0.field1029 > 0 && var0.spotAnimation <= Client.cycle && var0.exactMoveArrive1Cycle < Client.cycle) { + var0.sequenceDelay = 1; + return; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var9 = DynamicObject.SequenceDefinition_get(var0.sequence); + if (var9 == null) { + var0.sequence = -1; + } else if (!var9.isCachedModelIdSet() && var9.frameIds != null) { + ++var0.sequenceFrameCycle; + if (var0.sequenceFrame < var9.frameIds.length && var0.sequenceFrameCycle > var9.frameLengths[var0.sequenceFrame]) { + var0.sequenceFrameCycle = 1; + ++var0.sequenceFrame; + DynamicObject.method451(var9, var0.sequenceFrame, var0.x, var0.y, var0); + } + + if (var0.sequenceFrame >= var9.frameIds.length) { + var0.sequenceFrame -= var9.frameCount; + ++var0.currentSequenceFrameIndex; + if (var0.currentSequenceFrameIndex >= var9.iterations) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var9.frameIds.length) { + DynamicObject.method451(var9, var0.sequenceFrame, var0.x, var0.y, var0); + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var9.stretches; + } else if (var9.isCachedModelIdSet()) { + ++var0.sequenceFrame; + var4 = var9.method1052(); + if (var0.sequenceFrame < var4) { + FriendLoginUpdate.method2227(var9, var0.sequenceFrame, var0.x, var0.y, var0); + } else { + var0.sequenceFrame -= var9.frameCount; + ++var0.currentSequenceFrameIndex; + if (var0.currentSequenceFrameIndex >= var9.iterations) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var4) { + FriendLoginUpdate.method2227(var9, var0.sequenceFrame, var0.x, var0.y, var0); + } else { + var0.sequence = -1; + } + } + } else { + var0.sequence = -1; + } + } + + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatch.java b/osrs/src/main/java/MusicPatch.java index 69d2c6c74..c73d258c4 100644 --- a/osrs/src/main/java/MusicPatch.java +++ b/osrs/src/main/java/MusicPatch.java @@ -9,41 +9,41 @@ @ObfuscatedName("mq") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("ac") - int field2849; - @ObfuscatedName("ak") + @ObfuscatedName("at") + int field2846; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "[Lcu;" + descriptor = "[Lcg;" ) @Export("rawSounds") class53[] rawSounds; - @ObfuscatedName("ax") - short[] field2853; @ObfuscatedName("ao") - byte[] field2847; - @ObfuscatedName("ah") - byte[] field2846; - @ObfuscatedName("ar") + short[] field2850; + @ObfuscatedName("ab") + byte[] field2842; + @ObfuscatedName("au") + byte[] field2844; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "[Lmx;" + descriptor = "[Lmk;" ) - MusicPatchNode2[] field2852; - @ObfuscatedName("ab") - byte[] field2845; - @ObfuscatedName("am") - ArrayList field2851; - @ObfuscatedName("av") - int[] field2850; + MusicPatchNode2[] field2849; + @ObfuscatedName("ac") + byte[] field2843; + @ObfuscatedName("al") + ArrayList field2848; + @ObfuscatedName("az") + int[] field2847; MusicPatch(byte[] var1) { - this.field2851 = new ArrayList(8); + this.field2848 = new ArrayList(8); this.rawSounds = new class53[128]; - this.field2853 = new short[128]; - this.field2847 = new byte[128]; - this.field2846 = new byte[128]; - this.field2852 = new MusicPatchNode2[128]; - this.field2845 = new byte[128]; - this.field2850 = new int[128]; + this.field2850 = new short[128]; + this.field2842 = new byte[128]; + this.field2844 = new byte[128]; + this.field2849 = new MusicPatchNode2[128]; + this.field2843 = new byte[128]; + this.field2847 = new int[128]; Buffer var2 = new Buffer(var1); int var3; @@ -128,8 +128,8 @@ public class MusicPatch extends Node { var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2780 = new byte[var16 * 2 + 2]; - var38.field2780[1] = 64; + var38.field2778 = new byte[var16 * 2 + 2]; + var38.field2778[1] = 64; } } @@ -156,7 +156,7 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - this.field2853[var20] = (short)var19; + this.field2850[var20] = (short)var19; } var19 = 0; @@ -164,7 +164,7 @@ public class MusicPatch extends Node { short[] var48; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - var48 = this.field2853; + var48 = this.field2850; var48[var20] = (short)(var48[var20] + (var19 << 8)); } @@ -184,9 +184,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); } - var48 = this.field2853; + var48 = this.field2850; var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field2850[var23] = var22; + this.field2847[var23] = var22; --var20; } @@ -196,7 +196,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { - if (this.field2850[var24] != 0) { + if (this.field2847[var24] != 0) { if (var20 == 0) { if (var21 < var4.length) { var20 = var4[var21++]; @@ -207,7 +207,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; } - this.field2845[var24] = (byte)var23; + this.field2843[var24] = (byte)var23; --var20; } } @@ -217,7 +217,7 @@ public class MusicPatch extends Node { var24 = 0; for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2850[var25] != 0) { + if (this.field2847[var25] != 0) { if (var20 == 0) { if (var21 < var7.length) { var20 = var7[var21++]; @@ -228,7 +228,7 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; } - this.field2846[var25] = (byte)var24; + this.field2844[var25] = (byte)var24; --var20; } } @@ -239,7 +239,7 @@ public class MusicPatch extends Node { int var26; for (var26 = 0; var26 < 128; ++var26) { - if (this.field2850[var26] != 0) { + if (this.field2847[var26] != 0) { if (var20 == 0) { var40 = var37[var36[var21]]; if (var21 < var10.length) { @@ -249,7 +249,7 @@ public class MusicPatch extends Node { } } - this.field2852[var26] = var40; + this.field2849[var26] = var40; --var20; } } @@ -267,16 +267,16 @@ public class MusicPatch extends Node { var20 = -1; } - if (this.field2850[var27] > 0) { + if (this.field2847[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field2847[var27] = (byte)var26; + this.field2842[var27] = (byte)var26; --var20; } - this.field2849 = var2.readUnsignedByte() + 1; + this.field2846 = var2.readUnsignedByte() + 1; MusicPatchNode2 var28; int var29; @@ -288,9 +288,9 @@ public class MusicPatch extends Node { } } - if (var28.field2780 != null) { - for (var29 = 3; var29 < var28.field2780.length - 2; var29 += 2) { - var28.field2780[var29] = var2.readByte(); + if (var28.field2778 != null) { + for (var29 = 3; var29 < var28.field2778.length - 2; var29 += 2) { + var28.field2778[var29] = var2.readByte(); } } } @@ -309,12 +309,12 @@ public class MusicPatch extends Node { for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2780 != null) { + if (var28.field2778 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2780.length; var29 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2780[var29] = (byte)var19; + for (var29 = 2; var29 < var28.field2778.length; var29 += 2) { + var19 = 1 + var19 + var2.readUnsignedByte(); + var28.field2778[var29] = (byte)var19; } } } @@ -325,7 +325,7 @@ public class MusicPatch extends Node { var19 = 0; for (var29 = 2; var29 < var28.field2779.length; var29 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); + var19 = var19 + 1 + var2.readUnsignedByte(); var28.field2779[var29] = (byte)var19; } } @@ -342,7 +342,7 @@ public class MusicPatch extends Node { var45[0] = (byte)var19; for (var27 = 2; var27 < var45.length; var27 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); + var19 = 1 + var19 + var2.readUnsignedByte(); var45[var27] = (byte)var19; } @@ -350,7 +350,7 @@ public class MusicPatch extends Node { byte var41 = var45[1]; for (var29 = 0; var29 < var44; ++var29) { - this.field2847[var29] = (byte)(var41 * this.field2847[var29] + 32 >> 6); + this.field2842[var29] = (byte)(var41 * this.field2842[var29] + 32 >> 6); } for (var29 = 2; var29 < var45.length; var29 += 2) { @@ -359,8 +359,8 @@ public class MusicPatch extends Node { var32 = var41 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = VarcInt.method974(var32, var30 - var44); - this.field2847[var33] = (byte)(var34 * this.field2847[var33] + 32 >> 6); + var34 = HorizontalAlignment.method932(var32, var30 - var44); + this.field2842[var33] = (byte)(var34 * this.field2842[var33] + 32 >> 6); var32 += var31 - var41; } @@ -369,7 +369,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - this.field2847[var42] = (byte)(var41 * this.field2847[var42] + 32 >> 6); + this.field2842[var42] = (byte)(var41 * this.field2842[var42] + 32 >> 6); } var38 = null; @@ -388,7 +388,7 @@ public class MusicPatch extends Node { int var47 = var39[1] << 1; for (var29 = 0; var29 < var44; ++var29) { - var42 = var47 + (this.field2846[var29] & 255); + var42 = var47 + (this.field2844[var29] & 255); if (var42 < 0) { var42 = 0; } @@ -397,7 +397,7 @@ public class MusicPatch extends Node { var42 = 128; } - this.field2846[var29] = (byte)var42; + this.field2844[var29] = (byte)var42; } int var43; @@ -407,8 +407,8 @@ public class MusicPatch extends Node { var32 = var47 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = VarcInt.method974(var32, var30 - var44); - int var35 = var34 + (this.field2846[var33] & 255); + var34 = HorizontalAlignment.method932(var32, var30 - var44); + int var35 = var34 + (this.field2844[var33] & 255); if (var35 < 0) { var35 = 0; } @@ -417,7 +417,7 @@ public class MusicPatch extends Node { var35 = 128; } - this.field2846[var33] = (byte)var35; + this.field2844[var33] = (byte)var35; var32 += var43 - var47; } @@ -426,7 +426,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - var43 = var47 + (this.field2846[var42] & 255); + var43 = var47 + (this.field2844[var42] & 255); if (var43 < 0) { var43 = 0; } @@ -435,57 +435,57 @@ public class MusicPatch extends Node { var43 = 128; } - this.field2846[var42] = (byte)var43; + this.field2844[var42] = (byte)var43; } Object var46 = null; } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2783 = var2.readUnsignedByte(); + var37[var27].field2785 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; if (var28.field2779 != null) { - var28.field2787 = var2.readUnsignedByte(); + var28.field2784 = var2.readUnsignedByte(); } - if (var28.field2780 != null) { - var28.field2785 = var2.readUnsignedByte(); + if (var28.field2778 != null) { + var28.field2781 = var2.readUnsignedByte(); } - if (var28.field2783 > 0) { - var28.field2782 = var2.readUnsignedByte(); + if (var28.field2785 > 0) { + var28.field2786 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2781 = var2.readUnsignedByte(); + var37[var27].field2782 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2781 > 0) { - var28.field2786 = var2.readUnsignedByte(); + if (var28.field2782 > 0) { + var28.field2780 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2786 > 0) { - var28.field2784 = var2.readUnsignedByte(); + if (var28.field2780 > 0) { + var28.field2783 = var2.readUnsignedByte(); } } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lbl;Ljava/util/BitSet;I)Z", - garbageValue = "-461548778" + descriptor = "(Lbc;Ljava/util/BitSet;I)Z", + garbageValue = "1639529302" ) - boolean method1714(SoundCache var1, BitSet var2) { + boolean method1710(SoundCache var1, BitSet var2) { boolean var3 = true; int var4 = 0; class53 var5 = new class53(); @@ -496,26 +496,26 @@ boolean method1714(SoundCache var1, BitSet var2) { for (int var8 = var6; var8 < var7; ++var8) { if (var2.get(var8)) { - int var9 = this.field2850[var8]; + int var9 = this.field2847[var8]; if (var9 != 0) { if (var4 != var9) { var4 = var9--; if ((var9 & 1) == 0) { - var5 = new class53(var1.method233(var9 >> 2)); + var5 = new class53(var1.method240(var9 >> 2)); } else { - var5 = var1.method232(var9 >> 2); + var5 = var1.method239(var9 >> 2); } - if (var5.method298()) { + if (var5.method303()) { var3 = false; } else { - this.field2851.add(this.field2851.size(), var5); + this.field2848.add(this.field2848.size(), var5); } } - if (!var5.method298()) { + if (!var5.method303()) { this.rawSounds[var8] = var5; - this.field2850[var8] = 0; + this.field2847[var8] = 0; } } } @@ -525,44 +525,30 @@ boolean method1714(SoundCache var1, BitSet var2) { return var3; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-14" + descriptor = "(I)V", + garbageValue = "-2008776711" ) @Export("clear") void clear() { - this.field2850 = null; + this.field2847 = null; } - @ObfuscatedName("in") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1601039867" + descriptor = "(Ljava/lang/CharSequence;S)Ljava/lang/String;", + garbageValue = "-1361" ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.playingJingle) { - ItemComposition.method1088(0, 0); - } else if (var0 != -1) { - boolean var1; - if (class319.field2789.isEmpty()) { - var1 = false; - } else { - MusicSong var2 = (MusicSong)class319.field2789.get(0); - var1 = var2 != null && var0 == var2.musicTrackGroupId; - } + public static String method1709(CharSequence var0) { + int var2 = var0.length(); + char[] var3 = new char[var2]; - if (!var1 && class91.clientPreferences.getCurrentMusicVolume() != 0) { - ArrayList var3 = new ArrayList(); - var3.add(new MusicSong(CollisionMap.archive6, var0, 0, class91.clientPreferences.getCurrentMusicVolume(), false)); - if (Client.playingJingle) { - class275.method1538(var3, 0, 100, 100, 0); - } else { - class148.method776(var3, 0, 100, 100, 0, false); - } - } + for (int var4 = 0; var4 < var2; ++var4) { + var3[var4] = '*'; } + String var1 = new String(var3); + return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatchNode.java b/osrs/src/main/java/MusicPatchNode.java index b6f0e7f79..231e00f96 100644 --- a/osrs/src/main/java/MusicPatchNode.java +++ b/osrs/src/main/java/MusicPatchNode.java @@ -3,79 +3,91 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") +@ObfuscatedName("mw") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("ac") - int field2865; - @ObfuscatedName("al") + @ObfuscatedName("wy") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("at") + int field2872; + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "Lmq;" ) @Export("table") MusicPatch table; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lbs;" + descriptor = "Lbt;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmk;" ) - MusicPatchNode2 field2881; - @ObfuscatedName("ao") - int field2872; - @ObfuscatedName("ah") - int field2868; - @ObfuscatedName("ar") - int field2875; + MusicPatchNode2 field2878; @ObfuscatedName("ab") - int field2864; - @ObfuscatedName("am") - int field2870; - @ObfuscatedName("av") - int field2878; - @ObfuscatedName("ag") - int field2867; + int field2862; + @ObfuscatedName("au") + int field2873; @ObfuscatedName("aa") + int field2861; + @ObfuscatedName("ac") int field2863; + @ObfuscatedName("al") + int field2868; + @ObfuscatedName("az") + int field2877; @ObfuscatedName("ap") - int field2873; - @ObfuscatedName("ay") - int field2879; + int field2870; + @ObfuscatedName("av") + int field2874; + @ObfuscatedName("ax") + int field2875; @ObfuscatedName("as") + int field2871; + @ObfuscatedName("ay") int field2876; + @ObfuscatedName("ak") + int field2867; @ObfuscatedName("aj") + int field2866; + @ObfuscatedName("am") int field2869; - @ObfuscatedName("an") - int field2871; - @ObfuscatedName("au") - int field2877; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lbb;" ) @Export("stream") RawPcmStream stream; + @ObfuscatedName("ai") + int field2865; @ObfuscatedName("ae") - int field2866; - @ObfuscatedName("aq") - int field2874; + int field2864; MusicPatchNode() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "60" + garbageValue = "94" ) - void method1727() { + void method1724() { this.table = null; this.rawSound = null; - this.field2881 = null; + this.field2878 = null; this.stream = null; } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "666285399" + ) + public static int method1723(int var0) { + return var0 != 0 && var0 != 1 ? -1 : 0; + } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatchNode2.java b/osrs/src/main/java/MusicPatchNode2.java index 8c66d138d..f0361119d 100644 --- a/osrs/src/main/java/MusicPatchNode2.java +++ b/osrs/src/main/java/MusicPatchNode2.java @@ -1,185 +1,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import java.util.Arrays; - -@ObfuscatedName("mx") +@ObfuscatedName("mk") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("da") - static boolean field2778; - @ObfuscatedName("ac") + @ObfuscatedName("av") + static int field2777; + @ObfuscatedName("at") byte[] field2779; - @ObfuscatedName("al") - byte[] field2780; - @ObfuscatedName("ak") - int field2783; - @ObfuscatedName("ax") - int field2787; - @ObfuscatedName("ao") - int field2785; @ObfuscatedName("ah") - int field2782; + byte[] field2778; @ObfuscatedName("ar") - int field2786; + int field2785; + @ObfuscatedName("ao") + int field2784; @ObfuscatedName("ab") int field2781; - @ObfuscatedName("am") - int field2784; + @ObfuscatedName("au") + int field2786; + @ObfuscatedName("aa") + int field2780; + @ObfuscatedName("ac") + int field2782; + @ObfuscatedName("al") + int field2783; MusicPatchNode2() { } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "15" - ) - static void method1657(boolean var0) { - byte var1 = 0; - boolean var2 = class91.clientPreferences.method560() >= Client.param21; - if (!var2) { - var1 = 12; - } else if (class159.client.method357() || class159.client.method359() || class159.client.method358()) { - var1 = 10; - } - - GameEngine.method166(var1); - if (var0) { - Login.Login_username = ""; - Login.Login_password = ""; - ClientPreferences.field1059 = 0; - class186.otp = ""; - } - - class188.method955(); - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - - } - - @ObfuscatedName("hz") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - static void method1658() { - Client.mouseLastLastPressedTimeMillis = -1L; - class233.mouseRecorder.index = 0; - KeyHandler.hasFocus = true; - Client.hadFocus = true; - Client.timeOfPreviousKeyPress = -1L; - class36.reflectionChecks = new IterableNodeDeque(); - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1153 = null; - Client.packetWriter.field1154 = null; - Client.packetWriter.field1156 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1152 = 0; - Client.rebootTimer = 0; - Client.logoutTimer = 0; - Client.hintArrowType = 0; - class91.method483(); - class138.method733(0); - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - Client.isItemSelected = 0; - Client.isSpellSelected = false; - Client.soundEffectCount = 0; - Client.camAngleY = 0; - Client.oculusOrbState = 0; - WallDecoration.field2303 = null; - Client.minimapState = 0; - Client.field539 = -1; - Client.destinationX = 0; - Client.destinationY = 0; - Client.playerAttackOption = AttackOption.AttackOption_hidden; - Client.npcAttackOption = AttackOption.AttackOption_hidden; - Client.npcCount = 0; - class11.method39(); - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; - } - - for (var0 = 0; var0 < 65536; ++var0) { - Client.npcs[var0] = null; - } - - Client.combatTargetPlayerIndex = -1; - Client.projectiles.clear(); - Client.graphicsObjects.clear(); - - for (var0 = 0; var0 < 4; ++var0) { - for (int var1 = 0; var1 < 104; ++var1) { - for (int var2 = 0; var2 < 104; ++var2) { - Client.groundItems[var0][var1][var2] = null; - } - } - } - - Client.pendingSpawns = new NodeDeque(); - InvDefinition.friendSystem.clear(); - if (VarpDefinition.field1501 > 5000) { - } - - for (var0 = 0; var0 < VarpDefinition.field1501; ++var0) { - VarpDefinition var3 = class150.VarpDefinition_get(var0); - if (var3 != null) { - Varps.Varps_temp[var0] = 0; - Varps.Varps_main[var0] = 0; - } - } - - class33.varcs.clearTransient(); - Client.followerIndex = -1; - if (Client.rootInterface != -1) { - class33.widgetDefinition.method1743(Client.rootInterface); - } - - for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { - ArchiveDisk.closeInterface(var4, true); - } - - Client.rootInterface = -1; - Client.interfaceParents = new NodeHashTable(8); - Client.meslayerContinueWidget = null; - class91.method483(); - Client.playerAppearance.method1750((int[])null, (int[])null, new int[]{0, 0, 0, 0, 0}, 0, -1); - - for (var0 = 0; var0 < 8; ++var0) { - Client.playerMenuActions[var0] = null; - Client.playerOptionsPriorities[var0] = false; - } - - Tile.method1231(); - Client.isLoading = true; - - for (var0 = 0; var0 < 100; ++var0) { - Client.field408[var0] = true; - } - - class517.method2533(); - class358.friendsChat = null; - VerticalAlignment.guestClanSettings = null; - Arrays.fill(Client.currentClanSettings, (Object)null); - ClanChannelMember.guestClanChannel = null; - Arrays.fill(Client.currentClanChannels, (Object)null); - - for (var0 = 0; var0 < 8; ++var0) { - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); - } - - Varps.grandExchangeEvents = null; - Client.reloadJS5 = false; - } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicPatchPcmStream.java b/osrs/src/main/java/MusicPatchPcmStream.java index f1ff47874..7ebcddb11 100644 --- a/osrs/src/main/java/MusicPatchPcmStream.java +++ b/osrs/src/main/java/MusicPatchPcmStream.java @@ -3,32 +3,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") +@ObfuscatedName("mj") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("ar") - public static int field2855; - @ObfuscatedName("ac") + @ObfuscatedName("tf") + @ObfuscatedSignature( + descriptor = "Lby;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmn;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lbm;" + descriptor = "Lbn;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Lmt;)V" + descriptor = "(Lmn;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -36,26 +40,26 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lms;[IIIII)V", - garbageValue = "1027988933" + descriptor = "(Lmw;[IIIII)V", + garbageValue = "-1281472428" ) - void method1723(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2812[var1.field2865] & 4) != 0 && var1.field2876 < 0) { - int var6 = this.superStream.field2813[var1.field2865] / PcmPlayer.field179; + void method1719(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2813[var1.field2872] & 4) != 0 && var1.field2876 < 0) { + int var6 = this.superStream.field2810[var1.field2872] / PcmPlayer.field179; while (true) { - int var7 = (var6 + 1048575 - var1.field2874) / var6; + int var7 = (var6 + 1048575 - var1.field2864) / var6; if (var7 > var4) { - var1.field2874 += var4 * var6; + var1.field2864 += var4 * var6; break; } var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; - var1.field2874 += var7 * var6 - 1048576; + var1.field2864 += var6 * var7 - 1048576; int var8 = PcmPlayer.field179 / 100; int var9 = 262144 / var6; if (var9 < var8) { @@ -63,21 +67,21 @@ void method1723(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { } RawPcmStream var10 = var1.stream; - if (this.superStream.field2824[var1.field2865] == 0) { - var1.stream = RawPcmStream.method244(var1.rawSound, var10.method259(), var10.method250(), var10.method251()); + if (this.superStream.field2815[var1.field2872] == 0) { + var1.stream = RawPcmStream.method249(var1.rawSound, var10.method264(), var10.method255(), var10.method256()); } else { - var1.stream = RawPcmStream.method244(var1.rawSound, var10.method259(), 0, var10.method251()); - this.superStream.method1675(var1, var1.table.field2853[var1.field2868] < 0); - var1.stream.method255(var8, var10.method250()); + var1.stream = RawPcmStream.method249(var1.rawSound, var10.method264(), 0, var10.method256()); + this.superStream.method1666(var1, var1.table.field2850[var1.field2873] < 0); + var1.stream.method260(var8, var10.method255()); } - if (var1.table.field2853[var1.field2868] < 0) { + if (var1.table.field2850[var1.field2873] < 0) { var1.stream.setNumLoops(-1); } - var10.method257(var8); + var10.method262(var8); var10.fill(var2, var3, var5 - var3); - if (var10.method261()) { + if (var10.method266()) { this.mixer.addSubStream(var10); } } @@ -86,38 +90,38 @@ void method1723(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { var1.stream.fill(var2, var3, var4); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lms;II)V", - garbageValue = "1919662235" + descriptor = "(Lmw;II)V", + garbageValue = "-1821439633" ) - void method1724(MusicPatchNode var1, int var2) { - if ((this.superStream.field2812[var1.field2865] & 4) != 0 && var1.field2876 < 0) { - int var3 = this.superStream.field2813[var1.field2865] / PcmPlayer.field179; - int var4 = (var3 + 1048575 - var1.field2874) / var3; - var1.field2874 = var3 * var2 + var1.field2874 & 1048575; + void method1721(MusicPatchNode var1, int var2) { + if ((this.superStream.field2813[var1.field2872] & 4) != 0 && var1.field2876 < 0) { + int var3 = this.superStream.field2810[var1.field2872] / PcmPlayer.field179; + int var4 = (var3 + 1048575 - var1.field2864) / var3; + var1.field2864 = var3 * var2 + var1.field2864 & 1048575; if (var4 <= var2) { - if (this.superStream.field2824[var1.field2865] == 0) { - var1.stream = RawPcmStream.method244(var1.rawSound, var1.stream.method259(), var1.stream.method250(), var1.stream.method251()); + if (this.superStream.field2815[var1.field2872] == 0) { + var1.stream = RawPcmStream.method249(var1.rawSound, var1.stream.method264(), var1.stream.method255(), var1.stream.method256()); } else { - var1.stream = RawPcmStream.method244(var1.rawSound, var1.stream.method259(), 0, var1.stream.method251()); - this.superStream.method1675(var1, var1.table.field2853[var1.field2868] < 0); + var1.stream = RawPcmStream.method249(var1.rawSound, var1.stream.method264(), 0, var1.stream.method256()); + this.superStream.method1666(var1, var1.table.field2850[var1.field2873] < 0); } - if (var1.table.field2853[var1.field2868] < 0) { + if (var1.table.field2850[var1.field2873] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2874 / var3; + var2 = var1.field2864 / var3; } } var1.stream.skip(var2); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbk;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -129,9 +133,9 @@ protected PcmStream firstSubStream() { } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbk;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -146,71 +150,136 @@ protected PcmStream nextSubStream() { return var1.stream; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("vmethod5648") protected int vmethod5648() { return 0; } - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method1697(var6)) { + if (!this.superStream.method1688(var6)) { int var4 = var2; int var5 = var3; do { - if (var5 <= var6.field2866) { - this.method1723(var6, var1, var4, var5, var5 + var4); - var6.field2866 -= var5; + if (var5 <= var6.field2865) { + this.method1719(var6, var1, var4, var5, var5 + var4); + var6.field2865 -= var5; break; } - this.method1723(var6, var1, var4, var6.field2866, var4 + var5); - var4 += var6.field2866; - var5 -= var6.field2866; - } while(!this.superStream.method1698(var6, var1, var4, var5)); + this.method1719(var6, var1, var4, var6.field2865, var5 + var4); + var4 += var6.field2865; + var5 -= var6.field2865; + } while(!this.superStream.method1689(var6, var1, var4, var5)); } } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method1697(var3)) { + if (!this.superStream.method1688(var3)) { int var2 = var1; do { - if (var2 <= var3.field2866) { - this.method1724(var3, var2); - var3.field2866 -= var2; + if (var2 <= var3.field2865) { + this.method1721(var3, var2); + var3.field2865 -= var2; break; } - this.method1724(var3, var3.field2866); - var2 -= var3.field2866; - } while(!this.superStream.method1698(var3, (int[])null, 0, var2)); + this.method1721(var3, var3.field2865); + var2 -= var3.field2865; + } while(!this.superStream.method1689(var3, (int[])null, 0, var2)); } } } - @ObfuscatedName("as") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "120235827" + descriptor = "(Ljava/lang/CharSequence;I)[B", + garbageValue = "125922381" ) - public static void method1725() { - ObjectComposition.ObjectDefinition_cached.clear(); - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - ObjectComposition.ObjectDefinition_cachedEntities.clear(); - ObjectComposition.ObjectDefinition_cachedModels.clear(); + public static byte[] method1720(CharSequence var0) { + int var1 = var0.length(); + byte[] var2 = new byte[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if ((var4 <= 0 || var4 >= 128) && (var4 < 160 || var4 > 255)) { + if (var4 == 8364) { + var2[var3] = -128; + } else if (var4 == 8218) { + var2[var3] = -126; + } else if (var4 == 402) { + var2[var3] = -125; + } else if (var4 == 8222) { + var2[var3] = -124; + } else if (var4 == 8230) { + var2[var3] = -123; + } else if (var4 == 8224) { + var2[var3] = -122; + } else if (var4 == 8225) { + var2[var3] = -121; + } else if (var4 == 710) { + var2[var3] = -120; + } else if (var4 == 8240) { + var2[var3] = -119; + } else if (var4 == 352) { + var2[var3] = -118; + } else if (var4 == 8249) { + var2[var3] = -117; + } else if (var4 == 338) { + var2[var3] = -116; + } else if (var4 == 381) { + var2[var3] = -114; + } else if (var4 == 8216) { + var2[var3] = -111; + } else if (var4 == 8217) { + var2[var3] = -110; + } else if (var4 == 8220) { + var2[var3] = -109; + } else if (var4 == 8221) { + var2[var3] = -108; + } else if (var4 == 8226) { + var2[var3] = -107; + } else if (var4 == 8211) { + var2[var3] = -106; + } else if (var4 == 8212) { + var2[var3] = -105; + } else if (var4 == 732) { + var2[var3] = -104; + } else if (var4 == 8482) { + var2[var3] = -103; + } else if (var4 == 353) { + var2[var3] = -102; + } else if (var4 == 8250) { + var2[var3] = -101; + } else if (var4 == 339) { + var2[var3] = -100; + } else if (var4 == 382) { + var2[var3] = -98; + } else if (var4 == 376) { + var2[var3] = -97; + } else { + var2[var3] = 63; + } + } else { + var2[var3] = (byte)var4; + } + } + + return var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicSong.java b/osrs/src/main/java/MusicSong.java index e5fb95d3a..6362f626f 100644 --- a/osrs/src/main/java/MusicSong.java +++ b/osrs/src/main/java/MusicSong.java @@ -3,105 +3,94 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mv") +@ObfuscatedName("mt") @Implements("MusicSong") public class MusicSong { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("musicTrackArchive") public AbstractArchive musicTrackArchive; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("musicTrackGroupId") public int musicTrackGroupId; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("musicTrackFileId") public int musicTrackFileId; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("musicTrackVolume") public int musicTrackVolume; - @ObfuscatedName("ao") - public float field2888; - @ObfuscatedName("ah") + @ObfuscatedName("ab") + public float field2886; + @ObfuscatedName("au") @Export("musicTrackBoolean") public boolean musicTrackBoolean; - @ObfuscatedName("ar") - public boolean field2887; - @ObfuscatedName("ab") + @ObfuscatedName("aa") + public boolean field2882; + @ObfuscatedName("ac") + public boolean field2883; + @ObfuscatedName("al") public boolean field2884; - @ObfuscatedName("am") - public boolean field2886; - @ObfuscatedName("av") - boolean field2882; - @ObfuscatedName("ag") + @ObfuscatedName("az") + boolean field2880; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmn;" ) @Export("midiPcmStream") public MidiPcmStream midiPcmStream; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lbl;" + descriptor = "Lbc;" ) - public SoundCache field2883; - @ObfuscatedName("ap") + public SoundCache field2881; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lms;" ) - public MusicTrack field2892; + public MusicTrack field2891; @ObfuscatedSignature( - descriptor = "(Lom;IIIZ)V" + descriptor = "(Lol;Ljava/lang/String;Ljava/lang/String;IZ)V" ) - public MusicSong(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + public MusicSong(AbstractArchive var1, String var2, String var3, int var4, boolean var5) { this.musicTrackGroupId = -1; this.musicTrackFileId = -1; this.musicTrackVolume = 0; - this.field2888 = 0.0F; + this.field2886 = 0.0F; this.musicTrackBoolean = false; - this.field2886 = false; - this.field2882 = false; - this.method1731(var1, var2, var3, var4, var5); + this.field2884 = false; + this.field2880 = false; + this.musicTrackGroupId = var1.getGroupId(var2); + this.musicTrackFileId = var1.getFileId(this.musicTrackGroupId, var3); + this.method1727(var1, this.musicTrackGroupId, this.musicTrackFileId, var4, var5); } @ObfuscatedSignature( - descriptor = "(Lom;Ljava/lang/String;Ljava/lang/String;IZ)V" + descriptor = "(Lol;IIIZ)V" ) - public MusicSong(AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + public MusicSong(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { this.musicTrackGroupId = -1; this.musicTrackFileId = -1; this.musicTrackVolume = 0; - this.field2888 = 0.0F; + this.field2886 = 0.0F; this.musicTrackBoolean = false; - this.field2886 = false; - this.field2882 = false; - this.musicTrackGroupId = var1.getGroupId(var2); - this.musicTrackFileId = var1.getFileId(this.musicTrackGroupId, var3); - this.method1731(var1, this.musicTrackGroupId, this.musicTrackFileId, var4, var5); + this.field2884 = false; + this.field2880 = false; + this.method1727(var1, var2, var3, var4, var5); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lom;IIIZB)V", - garbageValue = "-90" + descriptor = "(Lol;IIIZI)V", + garbageValue = "-2008731586" ) - void method1731(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + void method1727(AbstractArchive var1, int var2, int var3, int var4, boolean var5) { this.musicTrackArchive = var1; this.musicTrackGroupId = var2; this.musicTrackFileId = var3; this.musicTrackVolume = var4; this.musicTrackBoolean = var5; } - - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "(Lok;Ljava/lang/String;B)V", - garbageValue = "-43" - ) - static void method1732(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field551 += var2.groupCount; - } } \ No newline at end of file diff --git a/osrs/src/main/java/MusicTrack.java b/osrs/src/main/java/MusicTrack.java index 814c66275..eafa42348 100644 --- a/osrs/src/main/java/MusicTrack.java +++ b/osrs/src/main/java/MusicTrack.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mk") +@ObfuscatedName("ms") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Ltw;" ) - NodeHashTable field2860; - @ObfuscatedName("al") + NodeHashTable field2857; + @ObfuscatedName("ah") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;)V" ) MusicTrack(Buffer var1) { - this.field2860 = new NodeHashTable(16); + this.field2857 = new NodeHashTable(16); var1.offset = var1.array.length - 3; int var2 = var1.readUnsignedByte(); int var3 = var1.readUnsignedShort(); @@ -254,13 +254,13 @@ public class MusicTrack extends Node { var51.writeByte(var71); if (var71 > 0) { int var72 = var61[var52]; - class332 var73 = (class332)this.field2860.get((long)var72); + class329 var73 = (class329)this.field2857.get((long)var72); if (var73 == null) { - var73 = new class332(var65); - this.field2860.put(var73, (long)var72); + var73 = new class329(var65); + this.field2857.put(var73, (long)var72); } - var73.field2896.set(var74); + var73.field2894.set(var74); } } else if (var66 == 1) { if (var69) { @@ -367,9 +367,9 @@ public class MusicTrack extends Node { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lom;II)Lmk;" + descriptor = "(Lol;II)Lms;" ) @Export("readTrack") public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { diff --git a/osrs/src/main/java/NPC.java b/osrs/src/main/java/NPC.java index ec9b83329..0f48f2a8c 100644 --- a/osrs/src/main/java/NPC.java +++ b/osrs/src/main/java/NPC.java @@ -3,76 +3,76 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dc") +@ObfuscatedName("dn") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("ar") - static int field1077; - @ObfuscatedName("am") - static int field1076; - @ObfuscatedName("ac") + @ObfuscatedName("aa") + static int field1080; + @ObfuscatedName("al") + static int field1081; + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "Lhw;" ) @Export("definition") NPCComposition definition; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("nameChange") String nameChange; - @ObfuscatedName("ax") - int field1081; @ObfuscatedName("ao") + int field1085; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lup;" + descriptor = "Lum;" ) - class530 field1083; - @ObfuscatedName("ah") + class527 field1087; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhf;" ) - NewShit field1079; - @ObfuscatedName("ab") + NewShit field1083; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhf;" ) - NewShit field1078; + NewShit field1082; static { - field1077 = 1; - field1076 = 1; + field1080 = 1; + field1081 = 1; } NPC() { this.nameChange = ""; - this.field1081 = 31; + this.field1085 = 31; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "218528952" + garbageValue = "-983100224" ) - void method578(String var1) { + void method575(String var1) { this.nameChange = var1 == null ? "" : var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Ljn;", - garbageValue = "0" + descriptor = "(B)Lka;", + garbageValue = "1" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class36.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : class36.SequenceDefinition_get(super.movementSequence); + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? DynamicObject.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : DynamicObject.SequenceDefinition_get(super.movementSequence); Model var3 = null; - if (this.field1079 != null && this.field1079.field1593) { - var3 = TextureProvider.localPlayer.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); + if (this.field1083 != null && this.field1083.field1530) { + var3 = class229.localPlayer.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); } else { - var3 = this.definition.method1011(var1, super.sequenceFrame, var2, super.movementFrame, this.field1079); + var3 = this.definition.method940(var1, super.sequenceFrame, var2, super.movementFrame, this.field1083); } if (var3 == null) { @@ -81,7 +81,7 @@ protected final Model getModel() { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; int var4 = var3.indicesCount; - var3 = this.method520(var3); + var3 = this.method514(var3); if (this.definition.size == 1) { var3.isSingleTile = true; } @@ -91,7 +91,7 @@ protected final Model getModel() { var3.overrideSaturation = super.recolourSaturation; var3.overrideLuminance = super.recolourLuminance; var3.overrideAmount = super.recolourAmount; - var3.field2255 = (short)var4; + var3.field2423 = (short)var4; } else { var3.overrideAmount = 0; } @@ -101,34 +101,34 @@ protected final Model getModel() { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1833659778" + garbageValue = "804243007" ) - void method579(int var1) { - this.field1081 = var1; + void method576(int var1) { + this.field1085 = var1; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "113824049" + garbageValue = "1535698170" ) - boolean method580(int var1) { + boolean method577(int var1) { if (var1 >= 0 && var1 <= 4) { - return (this.field1081 & 1 << var1) != 0; + return (this.field1085 & 1 << var1) != 0; } else { return true; } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "-29" + garbageValue = "0" ) - final String method582() { + final String method578() { if (!this.nameChange.isEmpty()) { return this.nameChange; } else { @@ -144,10 +144,10 @@ final String method582() { } } - @ObfuscatedName("ar") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(ILip;B)V", - garbageValue = "-1" + descriptor = "(ILiz;I)V", + garbageValue = "844868343" ) @Export("move") final void move(int var1, MoveSpeed var2) { @@ -189,7 +189,7 @@ final void move(int var1, MoveSpeed var2) { --var4; } - if (super.sequence != -1 && class36.SequenceDefinition_get(super.sequence).priority == 1) { + if (super.sequence != -1 && DynamicObject.SequenceDefinition_get(super.sequence).priority == 1) { super.sequence = -1; } @@ -208,13 +208,13 @@ final void move(int var1, MoveSpeed var2) { super.pathTraversed[0] = var2; } - @ObfuscatedName("ab") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "-358090235" + descriptor = "(IIZB)V", + garbageValue = "75" ) - final void method584(int var1, int var2, boolean var3) { - if (super.sequence != -1 && class36.SequenceDefinition_get(super.sequence).priority == 1) { + final void method581(int var1, int var2, boolean var3) { + if (super.sequence != -1 && DynamicObject.SequenceDefinition_get(super.sequence).priority == 1) { super.sequence = -1; } @@ -240,146 +240,214 @@ final void method584(int var1, int var2, boolean var3) { } super.pathLength = 0; - super.field1023 = 0; - super.field1024 = 0; + super.field1029 = 0; + super.field1028 = 0; super.pathX[0] = var1; super.pathY[0] = var2; - super.x = super.field971 * 64 + super.pathX[0] * 128; - super.y = super.field971 * 64 + super.pathY[0] * 128; + super.x = super.pathX[0] * 128 + super.field983 * 64; + super.y = super.pathY[0] * 128 + super.field983 * 64; } - @ObfuscatedName("am") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "0" + descriptor = "(S)[I", + garbageValue = "-23200" ) - int[] method587() { - return this.field1083 != null ? this.field1083.method2639() : this.definition.method1019(); + int[] method584() { + return this.field1087 != null ? this.field1087.method2619() : this.definition.method948(); } - @ObfuscatedName("av") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)[S", - garbageValue = "-288846359" + descriptor = "(B)[S", + garbageValue = "120" ) - short[] method588() { - return this.field1083 != null ? this.field1083.method2640() : this.definition.method1021(); + short[] method585() { + return this.field1087 != null ? this.field1087.method2620() : this.definition.method950(); } - @ObfuscatedName("ag") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IISS)V", - garbageValue = "-15144" + descriptor = "(IISI)V", + garbageValue = "-558766672" ) - void method589(int var1, int var2, short var3) { - if (this.field1083 == null) { - this.field1083 = new class530(this.definition); + void method586(int var1, int var2, short var3) { + if (this.field1087 == null) { + this.field1087 = new class527(this.definition); } - this.field1083.method2641(var1, var2, var3); + this.field1087.method2621(var1, var2, var3); } - @ObfuscatedName("aa") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "([I[SB)V", - garbageValue = "8" + descriptor = "([I[SI)V", + garbageValue = "-1790507927" ) - void method590(int[] var1, short[] var2) { - if (this.field1083 == null) { - this.field1083 = new class530(this.definition); + void method587(int[] var1, short[] var2) { + if (this.field1087 == null) { + this.field1087 = new class527(this.definition); } - this.field1083.method2642(var1, var2); + this.field1087.method2622(var1, var2); } - @ObfuscatedName("ap") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-432488525" + descriptor = "(B)V", + garbageValue = "0" ) - void method591() { - this.field1083 = null; + void method588() { + this.field1087 = null; } - @ObfuscatedName("ay") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lhe;I)V", - garbageValue = "-1403637183" + descriptor = "(Lhf;I)V", + garbageValue = "-906762953" ) - void method592(NewShit var1) { - this.field1078 = var1; + void method589(NewShit var1) { + this.field1082 = var1; } - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)Lhe;", - garbageValue = "905115149" + descriptor = "(B)Lhf;", + garbageValue = "2" ) - NewShit method593() { - return this.field1078; + NewShit method590() { + return this.field1082; } - @ObfuscatedName("aj") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lhe;I)V", - garbageValue = "463654606" + descriptor = "(Lhf;I)V", + garbageValue = "-977381781" ) - void method594(NewShit var1) { - this.field1079 = var1; + void method591(NewShit var1) { + this.field1083 = var1; } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "4" + descriptor = "(I)Z", + garbageValue = "1221291483" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; } - @ObfuscatedName("au") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-64" + descriptor = "(I)V", + garbageValue = "-434488190" ) - void method595() { - this.field1078 = null; + void method592() { + this.field1082 = null; } - @ObfuscatedName("ai") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "257879915" + garbageValue = "-923674269" ) - void method596() { - this.field1079 = null; + void method593() { + this.field1083 = null; } - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-965276822" + descriptor = "(Ljava/lang/CharSequence;IZB)I", + garbageValue = "-22" ) - static void method581(int var0) { + public static int method580(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); + + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + throw new NumberFormatException(); + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + throw new NumberFormatException(); + } + + if (var3) { + var10 = -var10; + } + + int var9 = var5 * var1 + var10; + if (var9 / var1 != var5) { + throw new NumberFormatException(); + } + + var5 = var9; + var4 = true; + } + + if (!var4) { + throw new NumberFormatException(); + } else { + return var5; + } + } else { + throw new IllegalArgumentException("" + var1); + } } - @ObfuscatedName("iy") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "0" + descriptor = "(III)I", + garbageValue = "-1588641318" ) - static final int method597(int var0) { - return Math.abs(var0 - WallDecoration.cameraYaw) > 1024 ? 2048 * (var0 < WallDecoration.cameraYaw ? 1 : -1) + var0 : var0; + static final int method595(int var0, int var1) { + int var2 = var0 + var1 * 57; + var2 ^= var2 << 13; + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; + return var3 >> 19 & 255; } - @ObfuscatedName("ok") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "101752739" + descriptor = "(Lbk;I)V", + garbageValue = "2109670231" ) - static void method598(Buffer var0, int var1) { - class266.method1432(var0.array, var1); - HealthBar.method576(var0, var1); + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; + if (var0.sound != null) { + var0.sound.position = 0; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/NPCComposition.java b/osrs/src/main/java/NPCComposition.java index c6bb48b1f..fe1eb1cd6 100644 --- a/osrs/src/main/java/NPCComposition.java +++ b/osrs/src/main/java/NPCComposition.java @@ -6,154 +6,151 @@ @ObfuscatedName("hw") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("NpcDefinition_archive") - public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - public static AbstractArchive field1595; - @ObfuscatedName("ax") + static AbstractArchive NpcDefinition_archive; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("NpcDefinition_cached") static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("NpcDefinition_cachedModels") static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("ah") + @ObfuscatedName("cu") + static int field1532; + @ObfuscatedName("au") @Export("id") public int id; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("name") public String name; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("size") public int size; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("models") int[] models; - @ObfuscatedName("av") - int[] field1606; - @ObfuscatedName("ag") + @ObfuscatedName("az") + int[] field1543; + @ObfuscatedName("ap") @Export("idleSequence") public int idleSequence; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("walkSequence") public int walkSequence; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("runSequence") public int runSequence; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("runBackSequence") public int runBackSequence; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("runLeftSequence") public int runLeftSequence; @ObfuscatedName("aw") @Export("runRightSequence") public int runRightSequence; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("crawlSequence") public int crawlSequence; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("crawlBackSequence") public int crawlBackSequence; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("crawlLeftSequence") public int crawlLeftSequence; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("crawlRightSequence") public int crawlRightSequence; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("bn") + @ObfuscatedName("be") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("actions") public String[] actions; - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("combatLevel") public int combatLevel; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("widthScale") int widthScale; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("heightScale") int heightScale; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("ambient") int ambient; - @ObfuscatedName("bp") + @ObfuscatedName("bw") @Export("contrast") int contrast; - @ObfuscatedName("bt") + @ObfuscatedName("bj") @Export("rotation") public int rotation; - @ObfuscatedName("bm") + @ObfuscatedName("bn") @Export("transforms") public int[] transforms; - @ObfuscatedName("br") + @ObfuscatedName("bo") @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @Export("transformVarp") int transformVarp; - @ObfuscatedName("bc") + @ObfuscatedName("bu") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("bu") + @ObfuscatedName("by") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("bf") + @ObfuscatedName("bh") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("bh") + @ObfuscatedName("bz") @Export("headIconArchiveIds") int[] headIconArchiveIds; - @ObfuscatedName("bl") + @ObfuscatedName("bc") @Export("headIconSpriteIndexes") short[] headIconSpriteIndexes; - @ObfuscatedName("bg") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Ltz;" ) @Export("params") IterableNodeHashTable params; @@ -199,7 +196,7 @@ public class NPCComposition extends DualNode { this.headIconSpriteIndexes = null; } - @ObfuscatedName("al") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(B)V", garbageValue = "3" @@ -208,10 +205,10 @@ public class NPCComposition extends DualNode { void postDecode() { } - @ObfuscatedName("ak") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "2" + descriptor = "(Luj;B)V", + garbageValue = "-39" ) @Export("decode") void decode(Buffer var1) { @@ -225,10 +222,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "0" + descriptor = "(Luj;II)V", + garbageValue = "221871708" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -285,10 +282,10 @@ void decodeNext(Buffer var1, int var2) { } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.field1606 = new int[var3]; + this.field1543 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field1606[var4] = var1.readUnsignedShort(); + this.field1543[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; @@ -350,7 +347,7 @@ void decodeNext(Buffer var1, int var2) { this.crawlLeftSequence = var1.readUnsignedShort(); this.crawlRightSequence = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = class167.readStringIntParameters(var1, this.params); + this.params = class144.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -387,24 +384,24 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lif;ILif;ILhe;B)Ljn;", - garbageValue = "0" + descriptor = "(Lhx;ILhx;ILhf;B)Lka;", + garbageValue = "-112" ) - public final Model method1011(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4, NewShit var5) { + public final Model method940(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4, NewShit var5) { if (this.transforms != null) { NPCComposition var6 = this.transform(); - return var6 == null ? null : var6.method1011(var1, var2, var3, var4, var5); + return var6 == null ? null : var6.method940(var1, var2, var3, var4, var5); } else { long var10 = (long)this.id; if (var5 != null) { - var10 |= var5.field1594 << 16; + var10 |= var5.field1531 << 16; } - Model var8 = (Model) NpcDefinition_cachedModels.get(var10); + Model var8 = (Model)NpcDefinition_cachedModels.get(var10); if (var8 == null) { - ModelData var9 = this.method1013(this.models, var5); + ModelData var9 = this.method942(this.models, var5); if (var9 == null) { return null; } @@ -432,29 +429,29 @@ public final Model method1011(SequenceDefinition var1, int var2, SequenceDefinit } } - @ObfuscatedName("ah") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lhe;I)Ljw;", - garbageValue = "-1925302214" + descriptor = "(Lhf;B)Lkq;", + garbageValue = "40" ) - public final ModelData method1012(NewShit var1) { + public final ModelData method941(NewShit var1) { if (this.transforms != null) { NPCComposition var2 = this.transform(); - return var2 == null ? null : var2.method1012(var1); + return var2 == null ? null : var2.method941(var1); } else { - return this.method1013(this.field1606, var1); + return this.method942(this.field1543, var1); } } - @ObfuscatedName("ar") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([ILhe;I)Ljw;", - garbageValue = "817549267" + descriptor = "([ILhf;I)Lkq;", + garbageValue = "-578729183" ) - ModelData method1013(int[] var1, NewShit var2) { + ModelData method942(int[] var1, NewShit var2) { int[] var3 = var1; - if (var2 != null && var2.field1590 != null) { - var3 = var2.field1590; + if (var2 != null && var2.field1527 != null) { + var3 = var2.field1527; } if (var3 == null) { @@ -463,7 +460,7 @@ ModelData method1013(int[] var1, NewShit var2) { boolean var4 = false; for (int var5 = 0; var5 < var3.length; ++var5) { - if (var3[var5] != -1 && !field1595.tryLoadFile(var3[var5], 0)) { + if (var3[var5] != -1 && !class191.field1586.tryLoadFile(var3[var5], 0)) { var4 = true; } } @@ -474,7 +471,7 @@ ModelData method1013(int[] var1, NewShit var2) { ModelData[] var9 = new ModelData[var3.length]; for (int var6 = 0; var6 < var3.length; ++var6) { - var9[var6] = ModelData.ModelData_get(field1595, var3[var6], 0); + var9[var6] = ModelData.ModelData_get(class191.field1586, var3[var6], 0); } ModelData var10; @@ -491,8 +488,8 @@ ModelData method1013(int[] var1, NewShit var2) { int var8; if (this.recolorFrom != null) { var7 = this.recolorTo; - if (var2 != null && var2.field1591 != null) { - var7 = var2.field1591; + if (var2 != null && var2.field1529 != null) { + var7 = var2.field1529; } for (var8 = 0; var8 < this.recolorFrom.length; ++var8) { @@ -502,8 +499,8 @@ ModelData method1013(int[] var1, NewShit var2) { if (this.retextureFrom != null) { var7 = this.retextureTo; - if (var2 != null && var2.field1592 != null) { - var7 = var2.field1592; + if (var2 != null && var2.field1528 != null) { + var7 = var2.field1528; } for (var8 = 0; var8 < this.retextureFrom.length; ++var8) { @@ -516,16 +513,16 @@ ModelData method1013(int[] var1, NewShit var2) { } } - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)Lhw;", - garbageValue = "637485229" + garbageValue = "-454054205" ) @Export("transform") public final NPCComposition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = class36.getVarbit(this.transformVarbit); + var1 = HealthBar.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -537,13 +534,13 @@ public final NPCComposition transform() { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class190.getNpcDefinition(var2) : null; + return var2 != -1 ? VerticalAlignment.getNpcDefinition(var2) : null; } - @ObfuscatedName("am") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-329950655" + descriptor = "(B)Z", + garbageValue = "10" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -552,7 +549,7 @@ public boolean transformIsVisible() { } else { int var1 = -1; if (this.transformVarbit != -1) { - var1 = class36.getVarbit(this.transformVarbit); + var1 = HealthBar.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -565,94 +562,92 @@ public boolean transformIsVisible() { } } - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "-28498" + descriptor = "(III)I", + garbageValue = "-1331214833" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return AttackOption.method607(this.params, var1, var2); + return Player.method478(this.params, var1, var2); } - @ObfuscatedName("ag") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-210955753" + garbageValue = "-2078724578" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class30.method122(this.params, var1, var2); + IterableNodeHashTable var4 = this.params; + String var3; + if (var4 == null) { + var3 = var2; + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = (String)var5.obj; + } + } + + return var3; } - @ObfuscatedName("ap") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1901854799" + garbageValue = "1998191718" ) - public boolean method1018() { + public boolean method947() { return this.headIconArchiveIds != null && this.headIconSpriteIndexes != null; } @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "71" + descriptor = "(I)[I", + garbageValue = "-1546218068" ) - public int[] method1019() { + public int[] method948() { return this.headIconArchiveIds; } - @ObfuscatedName("as") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "438787459" + garbageValue = "1923898777" ) - public int method1020(int var1) { + public int method949(int var1) { return this.headIconArchiveIds != null && var1 < this.headIconArchiveIds.length ? this.headIconArchiveIds[var1] : -1; } @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)[S", - garbageValue = "1864289740" + garbageValue = "1795535195" ) - public short[] method1021() { + public short[] method950() { return this.headIconSpriteIndexes; } - @ObfuscatedName("an") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(II)S", - garbageValue = "628204446" + descriptor = "(IB)S", + garbageValue = "-62" ) - public short method1022(int var1) { + public short method951(int var1) { return this.headIconSpriteIndexes != null && var1 < this.headIconSpriteIndexes.length ? this.headIconSpriteIndexes[var1] : -1; } - @ObfuscatedName("ig") + @ObfuscatedName("lq") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1885012369" + descriptor = "(IIIZB)V", + garbageValue = "-115" ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field613 = 0L; - if (var0 >= 2) { - Client.isResizable = true; - } else { - Client.isResizable = false; - } - - if (class178.getWindowedMode() == 1) { - class159.client.setMaxCanvasSize(765, 503); - } else { - class159.client.setMaxCanvasSize(7680, 2160); + static final void method952(int var0, int var1, int var2, boolean var3) { + if (HealthBarDefinition.widgetDefinition.loadInterface(var0)) { + UrlRequest.resizeInterface(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var0], -1, var1, var2, var3); } - - if (Client.gameState >= 25) { - class517.method2533(); - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/NanoClock.java b/osrs/src/main/java/NanoClock.java index 7e71ec6d4..4be0ecc9c 100644 --- a/osrs/src/main/java/NanoClock.java +++ b/osrs/src/main/java/NanoClock.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gy") +@ObfuscatedName("he") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("lastTimeNano") long lastTimeNano; @@ -14,20 +14,20 @@ public class NanoClock extends Clock { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "436321701" + garbageValue = "-1366277024" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "712947185" + garbageValue = "-2001388980" ) @Export("wait") public int wait(int var1, int var2) { @@ -37,7 +37,7 @@ public int wait(int var1, int var2) { var5 = var3; } - Players.method623(var5 / 1000000L); + class219.method1104(var5 / 1000000L); long var7 = System.nanoTime(); int var9; diff --git a/osrs/src/main/java/NewShit.java b/osrs/src/main/java/NewShit.java index 12264e5df..94754a915 100644 --- a/osrs/src/main/java/NewShit.java +++ b/osrs/src/main/java/NewShit.java @@ -1,26 +1,187 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +@ObfuscatedName("hf") @Implements("NewShit") public class NewShit { - @ObfuscatedName("ac") - public long field1594; - @ObfuscatedName("al") - int[] field1590; - @ObfuscatedName("ak") - short[] field1591; - @ObfuscatedName("ax") - short[] field1592; + @ObfuscatedName("we") + @ObfuscatedSignature( + descriptor = "Ltn;" + ) + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("ck") + @Export("otp") + static String otp; + @ObfuscatedName("jr") + @Export("baseX") + static int baseX; + @ObfuscatedName("at") + public long field1531; + @ObfuscatedName("ah") + int[] field1527; + @ObfuscatedName("ar") + short[] field1529; @ObfuscatedName("ao") - public boolean field1593; + short[] field1528; + @ObfuscatedName("ab") + public boolean field1530; public NewShit(long var1, int[] var3, short[] var4, short[] var5, boolean var6) { - this.field1593 = false; - this.field1594 = var1; - this.field1590 = var3; - this.field1591 = var4; - this.field1592 = var5; - this.field1593 = var6; + this.field1530 = false; + this.field1531 = var1; + this.field1527 = var3; + this.field1529 = var4; + this.field1528 = var5; + this.field1530 = var6; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "([BI)Ldt;", + garbageValue = "-357186857" + ) + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); + Buffer var2 = new Buffer(var0); + var2.offset = var2.array.length - 2; + int var3 = var2.readUnsignedShort(); + int var4 = var2.array.length - 2 - var3 - 12; + var2.offset = var4; + int var5 = var2.readInt(); + var1.localIntCount = var2.readUnsignedShort(); + var1.localStringCount = var2.readUnsignedShort(); + var1.intArgumentCount = var2.readUnsignedShort(); + var1.stringArgumentCount = var2.readUnsignedShort(); + int var6 = var2.readUnsignedByte(); + int var7; + int var8; + if (var6 > 0) { + var1.switches = var1.newIterableNodeHashTable(var6); + + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2.readUnsignedShort(); + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? class184.method927(var8) : 1); + var1.switches[var7] = var9; + + while (var8-- > 0) { + int var10 = var2.readInt(); + int var11 = var2.readInt(); + var9.put(new IntegerNode(var11), (long)var10); + } + } + } + + var2.offset = 0; + var1.field823 = var2.readStringCp1252NullTerminatedOrNull(); + var1.opcodes = new int[var5]; + var1.intOperands = new int[var5]; + var1.stringOperands = new String[var5]; + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { + var8 = var2.readUnsignedShort(); + if (var8 == 3) { + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); + } + } + + return var1; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II[BIB)I", + garbageValue = "48" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; + + for (int var6 = 0; var6 < var5; ++var6) { + char var7 = var0.charAt(var6 + var1); + if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { + if (var7 == 8364) { + var3[var6 + var4] = -128; + } else if (var7 == 8218) { + var3[var6 + var4] = -126; + } else if (var7 == 402) { + var3[var6 + var4] = -125; + } else if (var7 == 8222) { + var3[var6 + var4] = -124; + } else if (var7 == 8230) { + var3[var6 + var4] = -123; + } else if (var7 == 8224) { + var3[var6 + var4] = -122; + } else if (var7 == 8225) { + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; + } else if (var7 == 8240) { + var3[var6 + var4] = -119; + } else if (var7 == 352) { + var3[var6 + var4] = -118; + } else if (var7 == 8249) { + var3[var6 + var4] = -117; + } else if (var7 == 338) { + var3[var6 + var4] = -116; + } else if (var7 == 381) { + var3[var6 + var4] = -114; + } else if (var7 == 8216) { + var3[var6 + var4] = -111; + } else if (var7 == 8217) { + var3[var6 + var4] = -110; + } else if (var7 == 8220) { + var3[var6 + var4] = -109; + } else if (var7 == 8221) { + var3[var6 + var4] = -108; + } else if (var7 == 8226) { + var3[var6 + var4] = -107; + } else if (var7 == 8211) { + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; + } else if (var7 == 732) { + var3[var6 + var4] = -104; + } else if (var7 == 8482) { + var3[var6 + var4] = -103; + } else if (var7 == 353) { + var3[var6 + var4] = -102; + } else if (var7 == 8250) { + var3[var6 + var4] = -101; + } else if (var7 == 339) { + var3[var6 + var4] = -100; + } else if (var7 == 382) { + var3[var6 + var4] = -98; + } else if (var7 == 376) { + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; + } + } else { + var3[var6 + var4] = (byte)var7; + } + } + + return var5; + } + + @ObfuscatedName("nr") + @ObfuscatedSignature( + descriptor = "([BII)V", + garbageValue = "2008735118" + ) + static void method936(byte[] var0, int var1) { + if (Client.randomDatData == null) { + Client.randomDatData = new byte[24]; + } + + class421.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); } } \ No newline at end of file diff --git a/osrs/src/main/java/Node.java b/osrs/src/main/java/Node.java index 847fddaaa..d156db3da 100644 --- a/osrs/src/main/java/Node.java +++ b/osrs/src/main/java/Node.java @@ -3,26 +3,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sj") +@ObfuscatedName("sh") @Implements("Node") public class Node { - @ObfuscatedName("hf") + @ObfuscatedName("hp") @Export("key") public long key; - @ObfuscatedName("hu") + @ObfuscatedName("hl") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("previous") public Node previous; - @ObfuscatedName("hy") + @ObfuscatedName("hq") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("next") public Node next; - @ObfuscatedName("gx") + @ObfuscatedName("fz") @Export("remove") public void remove() { if (this.next != null) { @@ -33,7 +33,7 @@ public void remove() { } } - @ObfuscatedName("gp") + @ObfuscatedName("fx") @Export("hasNext") public boolean hasNext() { return this.next != null; diff --git a/osrs/src/main/java/NodeDeque.java b/osrs/src/main/java/NodeDeque.java index f6c106ccc..46972689c 100644 --- a/osrs/src/main/java/NodeDeque.java +++ b/osrs/src/main/java/NodeDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pf") +@ObfuscatedName("on") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public NodeDeque() { this.sentinel.next = this.sentinel; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public void clear() { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lsj;)V" + descriptor = "(Lsh;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public void addFirst(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lsj;)V" + descriptor = "(Lsh;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public void addLast(Node var1) { var1.previous.next = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public Node removeLast() { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public Node removeFirst() { } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public Node last() { } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public Node first() { } } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public Node previous() { } } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("next") public Node next() { @@ -165,14 +165,14 @@ public Node next() { } } - @ObfuscatedName("ag") - public boolean method2028() { + @ObfuscatedName("ap") + public boolean method2016() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lsj;Lsj;)V" + descriptor = "(Lsh;Lsh;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { diff --git a/osrs/src/main/java/NodeHashTable.java b/osrs/src/main/java/NodeHashTable.java index 227272775..e6f345934 100644 --- a/osrs/src/main/java/NodeHashTable.java +++ b/osrs/src/main/java/NodeHashTable.java @@ -3,31 +3,31 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tf") +@ObfuscatedName("tw") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("size") int size; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[Lsj;" + descriptor = "[Lsh;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lsj;" + descriptor = "Lsh;" ) @Export("current") Node current; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("index") int index; @@ -44,9 +44,9 @@ public NodeHashTable(int var1) { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(J)Lsj;" + descriptor = "(J)Lsh;" ) @Export("get") public Node get(long var1) { @@ -64,8 +64,8 @@ public Node get(long var1) { return null; } - @ObfuscatedName("al") - public int method2491() { + @ObfuscatedName("ah") + public int method2468() { int var1 = 0; for (int var2 = 0; var2 < this.size; ++var2) { @@ -79,9 +79,9 @@ public int method2491() { return var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lsj;J)V" + descriptor = "(Lsh;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -97,9 +97,9 @@ public void put(Node var1, long var2) { var1.key = var2; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("first") public Node first() { @@ -107,9 +107,9 @@ public Node first() { return this.next(); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "()Lsj;" + descriptor = "()Lsh;" ) @Export("next") public Node next() { diff --git a/osrs/src/main/java/ObjTypeCustomisation.java b/osrs/src/main/java/ObjTypeCustomisation.java index 444910384..a86b01049 100644 --- a/osrs/src/main/java/ObjTypeCustomisation.java +++ b/osrs/src/main/java/ObjTypeCustomisation.java @@ -3,17 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +@ObfuscatedName("gx") @Implements("ObjTypeCustomisation") public class ObjTypeCustomisation { - @ObfuscatedName("ak") + @ObfuscatedName("aa") + static int field1431; + @ObfuscatedName("su") + @ObfuscatedSignature( + descriptor = "Lun;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("ar") @Export("recol") public short[] recol; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("retex") public short[] retex; - public ObjTypeCustomisation(int var1) { + ObjTypeCustomisation(int var1) { ItemComposition var2 = class214.ItemDefinition_get(var1); if (var2.hasRecolor()) { this.recol = new short[var2.recolorTo.length]; @@ -27,33 +35,12 @@ public ObjTypeCustomisation(int var1) { } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "466779098" - ) - static void method948() { - Tiles.Tiles_minPlane = 99; - World.Tiles_underlays = new short[4][104][104]; - VertexNormal.Tiles_overlays = new short[4][104][104]; - SecureRandomFuture.Tiles_shapes = new byte[4][104][104]; - class199.field1563 = new byte[4][104][104]; - UserComparator6.field1191 = new int[4][105][105]; - Tiles.field835 = new byte[4][105][105]; - class158.field1387 = new int[105][105]; - SecureRandomFuture.Tiles_hue = new int[104]; - class135.Tiles_saturation = new int[104]; - Tiles.Tiles_lightness = new int[104]; - WorldMapSection2.Tiles_hueMultiplier = new int[104]; - Script.field812 = new int[104]; - } - - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "841575506" + descriptor = "(B)V", + garbageValue = "-19" ) - public static void method947() { - InvDefinition.InvDefinition_cached.clear(); + public static void method876() { + FileSystem.FileSystem_cacheFiles.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/ObjectComposition.java b/osrs/src/main/java/ObjectComposition.java index 19385a600..04d9dc79f 100644 --- a/osrs/src/main/java/ObjectComposition.java +++ b/osrs/src/main/java/ObjectComposition.java @@ -3,189 +3,188 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iz") +@ObfuscatedName("hs") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("ObjectDefinition_isLowDetail") static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("ObjectDefinition_archive") static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("ObjectDefinition_modelsArchive") static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("ObjectDefinition_cached") static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("ObjectDefinition_cachedEntities") static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("ObjectDefinition_cachedModels") static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Ljw;" + descriptor = "[Lkq;" ) @Export("modelDataArray") static ModelData[] modelDataArray; - @ObfuscatedName("gn") - @Export("worldPort") - static int worldPort; - @ObfuscatedName("am") + @ObfuscatedName("go") + static String field1664; + @ObfuscatedName("al") @Export("id") public int id; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("modelIds") int[] modelIds; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("models") int[] models; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("name") public String name; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("sizeX") public int sizeX; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("sizeY") public int sizeY; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("interactType") public int interactType; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("boolean1") public boolean boolean1; @ObfuscatedName("aw") @Export("int1") public int int1; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("clipType") int clipType; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("animationId") public int animationId; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("int2") public int int2; - @ObfuscatedName("bn") + @ObfuscatedName("be") @Export("ambient") int ambient; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("contrast") int contrast; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("actions") public String[] actions; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("mapIconId") public int mapIconId; - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("isRotated") boolean isRotated; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("clipped") public boolean clipped; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("modelHeight") int modelHeight; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("bp") + @ObfuscatedName("bw") @Export("offsetX") int offsetX; - @ObfuscatedName("bt") + @ObfuscatedName("bj") @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("bm") + @ObfuscatedName("bn") @Export("offsetY") int offsetY; - @ObfuscatedName("br") + @ObfuscatedName("bo") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @Export("isSolid") boolean isSolid; - @ObfuscatedName("bc") + @ObfuscatedName("bu") @Export("int3") public int int3; - @ObfuscatedName("bu") + @ObfuscatedName("by") @Export("transforms") public int[] transforms; - @ObfuscatedName("bf") + @ObfuscatedName("bh") @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("bh") + @ObfuscatedName("bz") @Export("transformVarp") int transformVarp; - @ObfuscatedName("bl") + @ObfuscatedName("bc") @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("bg") + @ObfuscatedName("bs") @Export("int7") public int int7; - @ObfuscatedName("bj") + @ObfuscatedName("bx") @Export("int5") public int int5; - @ObfuscatedName("bx") + @ObfuscatedName("bb") @Export("int6") public int int6; - @ObfuscatedName("bi") + @ObfuscatedName("bk") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("bq") + @ObfuscatedName("br") @Export("boolean3") public boolean boolean3; - @ObfuscatedName("bw") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Ltz;" ) @Export("params") IterableNodeHashTable params; @@ -236,10 +235,10 @@ public class ObjectComposition extends DualNode { this.boolean3 = true; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-867726910" + descriptor = "(S)V", + garbageValue = "-9893" ) @Export("postDecode") void postDecode() { @@ -262,10 +261,10 @@ void postDecode() { } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-461427986" + descriptor = "(Luj;B)V", + garbageValue = "-11" ) @Export("decode") void decode(Buffer var1) { @@ -279,10 +278,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "14" + descriptor = "(Luj;II)V", + garbageValue = "1972303486" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -292,7 +291,7 @@ void decodeNext(Buffer var1, int var2) { var3 = var1.readUnsignedByte(); if (var3 > 0) { if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += 3 * var3; + var1.offset += var3 * 3; } else { this.models = new int[var3]; this.modelIds = new int[var3]; @@ -421,7 +420,7 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 89) { this.boolean3 = false; } else if (var2 == 249) { - this.params = class167.readStringIntParameters(var1, this.params); + this.params = class144.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -457,12 +456,12 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1803901225" + garbageValue = "-813448886" ) - public final boolean method1078(int var1) { + public final boolean method1003(int var1) { if (this.models != null) { for (int var4 = 0; var4 < this.models.length; ++var4) { if (this.models[var4] == var1) { @@ -486,10 +485,10 @@ public final boolean method1078(int var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "0" + garbageValue = "50" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -506,10 +505,10 @@ public final boolean needsModelFiles() { } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Ljy;", - garbageValue = "2012346986" + descriptor = "(II[[IIIII)Lkt;", + garbageValue = "-484347663" ) @Export("getEntity") public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -547,17 +546,17 @@ public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, in if (var9 instanceof Model) { var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method1207(var3, var4, var5, var6, true, this.clipType); + var9 = ((ModelData)var9).method1391(var3, var4, var5, var6, true, this.clipType); } } return (Renderable)var9; } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Ljn;", - garbageValue = "2069936324" + descriptor = "(II[[IIIII)Lka;", + garbageValue = "-593704599" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -568,7 +567,7 @@ public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5 var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); } - Model var9 = (Model) ObjectDefinition_cachedModels.get(var7); + Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); if (var9 == null) { ModelData var10 = this.getModelData(var1, var2); if (var10 == null) { @@ -586,10 +585,10 @@ public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5 return var9; } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(II[[IIIILif;II)Ljn;", - garbageValue = "-715890668" + descriptor = "(II[[IIIILhx;IB)Lka;", + garbageValue = "-49" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -600,7 +599,7 @@ public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, i var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); } - Model var11 = (Model) ObjectDefinition_cachedModels.get(var9); + Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); if (var11 == null) { ModelData var12 = this.getModelData(var1, var2); if (var12 == null) { @@ -628,10 +627,10 @@ public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, i } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIB)Ljw;", - garbageValue = "-106" + descriptor = "(III)Lkq;", + garbageValue = "63656086" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -669,7 +668,7 @@ final ModelData getModelData(int var1, int var2) { } if (var4) { - var3.method1216(); + var3.method1400(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); @@ -711,7 +710,7 @@ final ModelData getModelData(int var1, int var2) { } if (var10) { - var3.method1216(); + var3.method1400(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); @@ -733,17 +732,17 @@ final ModelData getModelData(int var1, int var2) { ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true); if (var1 == 4 && var2 > 3) { - var8.method1212(256); + var8.method1396(256); var8.changeOffset(45, 0, -45); } var2 &= 3; if (var2 == 1) { - var8.method1209(); + var8.method1393(); } else if (var2 == 2) { - var8.method1210(); + var8.method1394(); } else if (var2 == 3) { - var8.method1211(); + var8.method1395(); } if (this.recolorFrom != null) { @@ -769,16 +768,16 @@ final ModelData getModelData(int var1, int var2) { return var8; } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)Liz;", - garbageValue = "18" + descriptor = "(I)Lhs;", + garbageValue = "809573033" ) @Export("transform") public final ObjectComposition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = class36.getVarbit(this.transformVarbit); + var1 = HealthBar.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -790,33 +789,46 @@ public final ObjectComposition transform() { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class91.getObjectDefinition(var2) : null; + return var2 != -1 ? WorldMapSection2.getObjectDefinition(var2) : null; } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "149195300" + garbageValue = "-2010138774" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return AttackOption.method607(this.params, var1, var2); + return Player.method478(this.params, var1, var2); } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "62" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-2012679893" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class30.method122(this.params, var1, var2); + IterableNodeHashTable var4 = this.params; + String var3; + if (var4 == null) { + var3 = var2; + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = (String)var5.obj; + } + } + + return var3; } - @ObfuscatedName("aj") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1339827330" + descriptor = "(B)Z", + garbageValue = "0" ) @Export("hasSound") public boolean hasSound() { @@ -825,7 +837,7 @@ public boolean hasSound() { } else { for (int var1 = 0; var1 < this.transforms.length; ++var1) { if (this.transforms[var1] != -1) { - ObjectComposition var2 = class91.getObjectDefinition(this.transforms[var1]); + ObjectComposition var2 = WorldMapSection2.getObjectDefinition(this.transforms[var1]); if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { return true; } @@ -835,4 +847,26 @@ public boolean hasSound() { return false; } } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Lhp;", + garbageValue = "523066781" + ) + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); + return var1; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/ObjectNode.java b/osrs/src/main/java/ObjectNode.java index 6079f9ede..0e1a9de85 100644 --- a/osrs/src/main/java/ObjectNode.java +++ b/osrs/src/main/java/ObjectNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("sv") +@ObfuscatedName("sw") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("obj") public final Object obj; diff --git a/osrs/src/main/java/ObjectSound.java b/osrs/src/main/java/ObjectSound.java index 673fe59e4..54bf9f126 100644 --- a/osrs/src/main/java/ObjectSound.java +++ b/osrs/src/main/java/ObjectSound.java @@ -3,59 +3,59 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("ca") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("plane") int plane; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("x") int x; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("y") int y; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("maxX") int maxX; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("maxY") int maxY; - @ObfuscatedName("ar") - int field696; - @ObfuscatedName("ab") + @ObfuscatedName("aa") + int field691; + @ObfuscatedName("ac") @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lbb;" ) @Export("stream1") RawPcmStream stream1; + @ObfuscatedName("az") + int field700; + @ObfuscatedName("ap") + int field696; @ObfuscatedName("av") - int field697; - @ObfuscatedName("ag") - int field690; - @ObfuscatedName("aa") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("ap") - int field695; - @ObfuscatedName("ay") + @ObfuscatedName("ax") + int field699; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lbb;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lhs;" ) @Export("obj") ObjectComposition obj; @@ -67,10 +67,10 @@ public final class ObjectSound extends Node { ObjectSound() { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "12079465" ) @Export("set") void set() { @@ -78,83 +78,261 @@ void set() { ObjectComposition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field696 = var2.int7 * 128; - this.field697 = var2.int5; - this.field690 = var2.int6; + this.field691 = var2.int7 * 128; + this.field700 = var2.int5; + this.field696 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; + this.field691 = 0; + this.field700 = 0; this.field696 = 0; - this.field697 = 0; - this.field690 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - class140.pcmStreamMixer.removeSubStream(this.stream1); + LoginScreenAnimation.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } - @ObfuscatedName("bm") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "5" + descriptor = "(III)I", + garbageValue = "-737174701" ) - static int method416(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 5504) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; + static int method423(int var0, int var1) { + for (int var2 = 0; var2 < 8; ++var2) { + if (var1 <= var0 + 30) { + return var2; } - return 1; - } else if (var0 == 5505) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == 5506) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == 5530) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == 5531) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; - } else { - return 2; + var0 += 30; + var0 += var2 != 1 && var2 != 3 ? 5 : 20; } + + return 0; } - @ObfuscatedName("hn") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(ILdt;ZB)I", + garbageValue = "2" ) - static boolean method415() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var0.isLoaded()) { - return false; + static int method425(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 4200) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = class214.ItemDefinition_get(var3).name; + return 1; + } else { + int var4; + ItemComposition var5; + if (var0 == 4201) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = class214.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; } - ++Client.archiveLoadersDone; - } + return 1; + } else if (var0 == 4202) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = class214.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } - return true; - } else { - return true; + return 1; + } else if (var0 == 4203) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == 4204) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; + } else { + ItemComposition var6; + if (var0 == 4205) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var6 = class214.ItemDefinition_get(var3); + if (var6.noteTemplate == -1 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4206) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var6 = class214.ItemDefinition_get(var3); + if (var6.noteTemplate >= 0 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4207) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == 4208) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var6 = class214.ItemDefinition_get(var3); + if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4209) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var6 = class214.ItemDefinition_get(var3); + if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == 4210) { + String var7 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + UrlRequest.findItemDefinitions(var7, var4 == 1); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = BuddyRankComparator.foundItemIdCount; + return 1; + } else if (var0 != 4211) { + if (var0 == 4212) { + ApproximateRouteStrategy.foundItemIndex = 0; + return 1; + } else if (var0 == 4213) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var4 = class214.ItemDefinition_get(var3).getShiftClickIndex(); + if (var4 == -1) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 + 1; + } + + return 1; + } else if (var0 == 4214) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).maleModel; + return 1; + } else if (var0 == 4215) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).maleModel1; + return 1; + } else if (var0 == 4216) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).maleModel2; + return 1; + } else if (var0 == 4217) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var6 = class214.ItemDefinition_get(var3); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var6.field1763; + return 1; + } else { + return 2; + } + } else { + if (MusicPatchNode.foundItemIds != null && ApproximateRouteStrategy.foundItemIndex < BuddyRankComparator.foundItemIdCount) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = MusicPatchNode.foundItemIds[++ApproximateRouteStrategy.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + } } } + + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-16844" + ) + static final void method424() { + class72.method431(); + class184.field1515.clear(); + InvDefinition.method877(); + KitDefinition.method907(); + DbTableType.DBTableType_cache.clear(); + EnumComposition.EnumDefinition_cached.clear(); + class138.method737(); + class172.method883(); + AttackOption.method606(); + Client.method360(); + class145.method764(); + HitSplatDefinition.method994(); + InvDefinition.InvDefinition_cached.clear(); + class267.method1444(); + WorldMapElement.HitSplatDefinition_cached2.clear(); + class185.field1516.clear(); + InterfaceParent.method464(); + ItemComposition.ItemDefinition_cached.clear(); + ItemComposition.HealthBarDefinition_cachedSprites.clear(); + ItemComposition.ItemDefinition_cachedSprites.clear(); + ModeWhere.method2001(); + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + SequenceDefinition.SequenceDefinition_cachedModel.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); + WorldMapElement.method893(); + class252.method1337(); + class399.Widget_cachedModels.method2493(); + Players.Widget_cachedFonts.method2493(); + class189.Widget_cachedSpriteMasks.clear(); + class191.field1584.clear(); + VarcInt.VarcInt_cached.clear(); + VarcInt.method900(); + class171.field1438.clear(); + class208.method1062(); + class197.archive4.clear(); + LoginPacket.method1643(); + class195.field1619.clear(); + Client.Widget_cachedModels.clear(); + Client.archive11.clear(); + RouteStrategy.method1150(); + HealthBarDefinition.widgetDefinition.method1737(); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).clear(); + Canvas.method89(); + Client.field631.clearFiles(); + UserComparator7.field1190.method1943(); + class145.field1338.method1943(); + WorldMapDecorationType.archive10.method1943(); + class47.archive12.method1943(); + class344.archive2.method1943(); + class267.field2224.method1943(); + SoundSystem.field209.method1943(); + VarbitComposition.archive13.method1943(); + class313.archive4.method1943(); + WorldMapAreaData.field2099.method1943(); + Language.field3643.method1943(); + PcmPlayer.field181.method1943(); + WorldMapSection0.archive9.method1943(); + class514.archive6.method1943(); + class19.field59.method1943(); + class7.field12.method1943(); + GrandExchangeOfferOwnWorldComparator.archive8.method1943(); + Canvas.field68.method1943(); + StructComposition.field1637.method1943(); + WorldMapData_0.field1938.method1943(); + BuddyRankComparator.field1200.method1943(); + SpotAnimationDefinition.field1597.method1943(); + } } \ No newline at end of file diff --git a/osrs/src/main/java/Occluder.java b/osrs/src/main/java/Occluder.java index 1083c9b17..008406be1 100644 --- a/osrs/src/main/java/Occluder.java +++ b/osrs/src/main/java/Occluder.java @@ -1,336 +1,58 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("kw") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("minTileX") int minTileX; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("maxTileX") int maxTileX; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("minTileY") int minTileY; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("maxTileY") int maxTileY; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("type") int type; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("minX") int minX; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("maxX") int maxX; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("minZ") int minZ; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("maxZ") int maxZ; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("minY") int minY; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("maxY") int maxY; - @ObfuscatedName("aa") - int field2135; - @ObfuscatedName("ap") - int field2146; - @ObfuscatedName("ay") - int field2152; + @ObfuscatedName("av") + int field2318; + @ObfuscatedName("ax") + int field2319; @ObfuscatedName("as") - int field2148; + int field2315; + @ObfuscatedName("ay") + int field2320; + @ObfuscatedName("ak") + int field2309; @ObfuscatedName("aj") - int field2140; - @ObfuscatedName("an") - int field2144; - @ObfuscatedName("au") - int field2149; + int field2308; + @ObfuscatedName("am") + int field2311; Occluder() { } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-104" - ) - static int method1340(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; - } - - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1093816432" - ) - static final void method1341() { - class193.method964(false); - Client.field454 = 0; - boolean var0 = true; - - int var1; - for (var1 = 0; var1 < class345.regionLandArchives.length; ++var1) { - if (HorizontalAlignment.regionMapArchiveIds[var1] != -1 && class345.regionLandArchives[var1] == null) { - class345.regionLandArchives[var1] = class198.archive9.takeFile(HorizontalAlignment.regionMapArchiveIds[var1], 0); - if (class345.regionLandArchives[var1] == null) { - var0 = false; - ++Client.field454; - } - } - - if (WorldMapIcon_0.regionLandArchiveIds[var1] != -1 && class201.regionMapArchives[var1] == null) { - class201.regionMapArchives[var1] = class198.archive9.takeFileEncrypted(WorldMapIcon_0.regionLandArchiveIds[var1], 0, class178.xteaKeys[var1]); - if (class201.regionMapArchives[var1] == null) { - var0 = false; - ++Client.field454; - } - } - } - - if (!var0) { - Client.field453 = 1; - } else { - Client.field455 = 0; - var0 = true; - - int var3; - int var4; - for (var1 = 0; var1 < class345.regionLandArchives.length; ++var1) { - byte[] var2 = class201.regionMapArchives[var1]; - if (var2 != null) { - var3 = (class152.regions[var1] >> 8) * 64 - class20.baseX; - var4 = (class152.regions[var1] & 255) * 64 - class19.baseY; - if (Client.isInInstance) { - var3 = 10; - var4 = 10; - } - - var0 &= class208.method1028(var2, var3, var4); - } - } - - if (!var0) { - Client.field453 = 2; - } else { - if (Client.field453 != 0) { - class427.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - class313.method1648(); - class10.scene.clear(); - - for (var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); - } - - int var15; - for (var1 = 0; var1 < 4; ++var1) { - for (var15 = 0; var15 < 104; ++var15) { - for (var3 = 0; var3 < 104; ++var3) { - Tiles.Tiles_renderFlags[var1][var15][var3] = 0; - } - } - } - - class313.method1648(); - ObjTypeCustomisation.method948(); - var1 = class345.regionLandArchives.length; - SoundCache.method228(); - class193.method964(true); - int var17; - if (!Client.isInInstance) { - byte[] var5; - for (var15 = 0; var15 < var1; ++var15) { - var3 = (class152.regions[var15] >> 8) * 64 - class20.baseX; - var4 = (class152.regions[var15] & 255) * 64 - class19.baseY; - var5 = class345.regionLandArchives[var15]; - if (var5 != null) { - class313.method1648(); - BufferedSource.method2298(var5, var3, var4, class94.timeOfPreviousKeyPress * 8 - 48, class365.field3199 * 8 - 48, Client.collisionMaps); - } - } - - for (var15 = 0; var15 < var1; ++var15) { - var3 = (class152.regions[var15] >> 8) * 64 - class20.baseX; - var4 = (class152.regions[var15] & 255) * 64 - class19.baseY; - var5 = class345.regionLandArchives[var15]; - if (var5 == null && class365.field3199 < 800) { - class313.method1648(); - Decimator.method317(var3, var4, 64, 64); - } - } - - class193.method964(true); - - for (var15 = 0; var15 < var1; ++var15) { - byte[] var16 = class201.regionMapArchives[var15]; - if (var16 != null) { - var4 = (class152.regions[var15] >> 8) * 64 - class20.baseX; - var17 = (class152.regions[var15] & 255) * 64 - class19.baseY; - class313.method1648(); - PacketBuffer.method2559(var16, var4, var17, class10.scene, Client.collisionMaps); - } - } - } - - int var6; - int var7; - int var8; - if (Client.isInInstance) { - int var9; - int var10; - int var11; - for (var15 = 0; var15 < 4; ++var15) { - class313.method1648(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - boolean var19 = false; - var6 = Client.instanceChunkTemplates[var15][var3][var4]; - if (var6 != -1) { - var7 = var6 >> 24 & 3; - var8 = var6 >> 1 & 3; - var9 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var9 / 8 << 8) + var10 / 8; - - for (int var12 = 0; var12 < class152.regions.length; ++var12) { - if (class152.regions[var12] == var11 && class345.regionLandArchives[var12] != null) { - int var13 = (var9 - var3) * 8; - int var14 = (var10 - var4) * 8; - UserComparator5.method672(class345.regionLandArchives[var12], var15, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, var13, var14, Client.collisionMaps); - var19 = true; - break; - } - } - } - - if (!var19) { - class4.method5(var15, var3 * 8, var4 * 8); - } - } - } - } - - for (var15 = 0; var15 < 13; ++var15) { - for (var3 = 0; var3 < 13; ++var3) { - var4 = Client.instanceChunkTemplates[0][var15][var3]; - if (var4 == -1) { - Decimator.method317(var15 * 8, var3 * 8, 8, 8); - } - } - } - - class193.method964(true); - - for (var15 = 0; var15 < 4; ++var15) { - class313.method1648(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - var17 = Client.instanceChunkTemplates[var15][var3][var4]; - if (var17 != -1) { - var6 = var17 >> 24 & 3; - var7 = var17 >> 1 & 3; - var8 = var17 >> 14 & 1023; - var9 = var17 >> 3 & 2047; - var10 = (var8 / 8 << 8) + var9 / 8; - - for (var11 = 0; var11 < class152.regions.length; ++var11) { - if (class152.regions[var11] == var10 && class201.regionMapArchives[var11] != null) { - Tiles.method457(class201.regionMapArchives[var11], var15, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, class10.scene, Client.collisionMaps); - break; - } - } - } - } - } - } - } - - class193.method964(true); - class313.method1648(); - class481.method2389(class10.scene, Client.collisionMaps); - class193.method964(true); - var15 = Tiles.Tiles_minPlane; - if (var15 > class87.Client_plane) { - var15 = class87.Client_plane; - } - - if (var15 < class87.Client_plane - 1) { - var15 = class87.Client_plane - 1; - } - - if (Client.isLowDetail) { - class10.scene.init(Tiles.Tiles_minPlane); - } else { - class10.scene.init(0); - } - - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - class30.updateItemPile(var3, var4); - } - } - - class313.method1648(); - WorldMapDecoration.method1567(); - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var18; - if (class159.client.hasFrame()) { - var18 = ClanChannelMember.getPacketBufferNode(ClientPacket.DETECT_MODIFIED_CLIENT, Client.packetWriter.isaacCipher); - var18.packetBuffer.writeInt(1057001181); - Client.packetWriter.addNode(var18); - } - - if (!Client.isInInstance) { - var3 = (class94.timeOfPreviousKeyPress - 6) / 8; - var4 = (class94.timeOfPreviousKeyPress + 6) / 8; - var17 = (class365.field3199 - 6) / 8; - var6 = (class365.field3199 + 6) / 8; - - for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { - for (var8 = var17 - 1; var8 <= var6 + 1; ++var8) { - if (var7 < var3 || var7 > var4 || var8 < var17 || var8 > var6) { - class198.archive9.loadRegionFromName("m" + var7 + "_" + var8); - class198.archive9.loadRegionFromName("l" + var7 + "_" + var8); - } - } - } - } - - DefaultsGroup.updateGameState(30); - class313.method1648(); - BuddyRankComparator.method687(); - var18 = ClanChannelMember.getPacketBufferNode(ClientPacket.f49, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var18); - class19.method66(); - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/PacketBuffer.java b/osrs/src/main/java/PacketBuffer.java index 5aa8cb471..61e22d094 100644 --- a/osrs/src/main/java/PacketBuffer.java +++ b/osrs/src/main/java/PacketBuffer.java @@ -3,83 +3,83 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uy") +@ObfuscatedName("uo") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("al") - static final int[] field4183; - @ObfuscatedName("ac") + @ObfuscatedName("ah") + static final int[] field4184; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lvd;" + descriptor = "Luy;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("bitIndex") int bitIndex; static { - field4183 = 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}; + field4184 = 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) { super(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "696462538" + garbageValue = "986454226" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lvd;I)V", - garbageValue = "-542273738" + descriptor = "(Luy;I)V", + garbageValue = "1815702468" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1739155677" + garbageValue = "264966043" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "126" + descriptor = "(I)I", + garbageValue = "-1536095737" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "10238360" + descriptor = "(B)Z", + garbageValue = "52" ) - public boolean method2552() { - int var1 = super.array[super.offset] - this.isaacCipher.method2730() & 255; + public boolean method2532() { + int var1 = super.array[super.offset] - this.isaacCipher.method2708() & 255; return var1 >= 128; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "38" + garbageValue = "-41" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -87,32 +87,32 @@ public int readSmartByteShortIsaac() { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1046012809" + garbageValue = "947660207" ) - public void method2554(byte[] var1, int var2, int var3) { + public void method2534(byte[] var1, int var2, int var3) { for (int var4 = 0; var4 < var3; ++var4) { var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1508899013" + descriptor = "(B)V", + garbageValue = "28" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-2142636526" + garbageValue = "-551105504" ) @Export("readBits") public int readBits(int var1) { @@ -121,86 +121,36 @@ public int readBits(int var1) { int var4 = 0; for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field4183[var3]) << var1 - var3; + var4 += (super.array[var2++] & field4184[var3]) << var1 - var3; var1 -= var3; } if (var3 == var1) { - var4 += super.array[var2] & field4183[var3]; + var4 += super.array[var2] & field4184[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4183[var1]; + var4 += super.array[var2] >> var3 - var1 & field4184[var1]; } return var4; } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "59" + descriptor = "(S)V", + garbageValue = "20580" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1292401715" + garbageValue = "1836154384" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "([BIILjt;[Lih;I)V", - garbageValue = "-1538039820" - ) - static final void method2559(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); - int var6 = -1; - - while (true) { - int var7 = var5.readIncrSmallSmart(); - if (var7 == 0) { - return; - } - - var6 += var7; - int var8 = 0; - - while (true) { - int var9 = var5.readUShortSmart(); - if (var9 == 0) { - break; - } - - var8 += var9 - 1; - int var10 = var8 & 63; - int var11 = var8 >> 6 & 63; - int var12 = var8 >> 12; - int var13 = var5.readUnsignedByte(); - int var14 = var13 >> 2; - int var15 = var13 & 3; - int var16 = var11 + var1; - int var17 = var10 + var2; - if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { - int var18 = var12; - if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { - var18 = var12 - 1; - } - - CollisionMap var19 = null; - if (var18 >= 0) { - var19 = var4[var18]; - } - - class314.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); - } - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/PacketBufferNode.java b/osrs/src/main/java/PacketBufferNode.java index f5d8223b7..960e43a99 100644 --- a/osrs/src/main/java/PacketBufferNode.java +++ b/osrs/src/main/java/PacketBufferNode.java @@ -3,34 +3,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lx") +@ObfuscatedName("ld") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Llx;" + descriptor = "[Lld;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llq;" ) @Export("clientPacket") ClientPacket clientPacket; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("clientPacketLength") int clientPacketLength; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Luy;" + descriptor = "Luo;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("index") public int index; @@ -42,10 +42,10 @@ public class PacketBufferNode extends Node { PacketBufferNode() { } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1253397804" + garbageValue = "-1380070255" ) @Export("release") public void release() { @@ -54,211 +54,266 @@ public void release() { } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([FIFZFZ[FB)I", - garbageValue = "88" + descriptor = "(III)I", + garbageValue = "-1877979689" ) - public static int method1646(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { - float var7 = 0.0F; - - for (int var8 = 0; var8 < var1 + 1; ++var8) { - var7 += Math.abs(var0[var8]); - } + public static int method1635(int var0, int var1) { + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; + } - float var44 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class128.field1202; - if (var7 <= var44) { - return -1; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1854762565" + ) + static void method1637(boolean var0) { + if (var0) { + SecureRandomCallable.method457(); } else { - float[] var9 = new float[var1 + 1]; + for (int var1 = 0; var1 < class316.musicSongs.size(); ++var1) { + MusicSong var2 = (MusicSong)class316.musicSongs.get(var1); + if (var2 == null) { + class316.musicSongs.remove(var1); + --var1; + } else if (var2.field2880) { + if (var2.midiPcmStream.field2830 > 0) { + --var2.midiPcmStream.field2830; + } - int var10; - for (var10 = 0; var10 < var1 + 1; ++var10) { - var9[var10] = var0[var10] * (1.0F / var7); + var2.midiPcmStream.clear(); + var2.midiPcmStream.method1657(); + var2.midiPcmStream.setPcmStreamVolume(0); + class316.musicSongs.remove(var1); + --var1; + } else { + var2.field2880 = true; + } } + } - while (Math.abs(var9[var1]) < var44) { - --var1; - } + } - var10 = 0; - if (var1 == 0) { - return var10; - } else if (var1 == 1) { - var6[0] = -var9[0] / var9[1]; - boolean var11 = var3 ? var2 < var6[0] + var44 : var2 < var6[0] - var44; - boolean var12 = var5 ? var4 > var6[0] - var44 : var4 > var6[0] + var44; - var10 = var11 && var12 ? 1 : 0; - if (var10 > 0) { - if (var3 && var6[0] < var2) { - var6[0] = var2; - } else if (var5 && var6[0] > var4) { - var6[0] = var4; + @ObfuscatedName("lc") + @ObfuscatedSignature( + descriptor = "(IIIIS)V", + garbageValue = "-9846" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + WorldMapSectionType.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + } + + long var4 = -1L; + long var6 = -1L; + + int var8; + for (var8 = 0; var8 < class93.method501(); ++var8) { + long var9 = ViewportMouse.ViewportMouse_entityTags[var8]; + if (var9 != var6) { + var6 = var9; + long var15 = ViewportMouse.ViewportMouse_entityTags[var8]; + int var14 = (int)(var15 >>> 0 & 127L); + var14 = var14; + int var25 = GrandExchangeOfferAgeComparator.method1969(var8); + int var16 = class128.method699(var8); + int var17 = class232.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); + int var18 = var17; + int var22; + if (var16 == 2 && class36.scene.getObjectFlags(ItemLayer.Client_plane, var14, var25, var9) >= 0) { + ObjectComposition var19 = WorldMapSection2.getObjectDefinition(var17); + if (var19.transforms != null) { + var19 = var19.transform(); + } + + if (var19 == null) { + continue; } - } - return var10; - } else { - class467 var41 = new class467(var9, var1); - float[] var42 = new float[var1 + 1]; + PendingSpawn var20 = null; + + for (PendingSpawn var21 = (PendingSpawn)Client.pendingSpawns.last(); var21 != null; var21 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var21.plane == ItemLayer.Client_plane && var14 == var21.x && var25 == var21.y && var18 == var21.id) { + var20 = var21; + break; + } + } + + if (Client.isItemSelected == 1) { + WorldMapSectionType.insertMenuItemNoShift("Use", Client.field597 + " " + "->" + " " + class167.colorStartTag(65535) + var19.name, 1, var18, var14, var25); + } else if (Client.isSpellSelected) { + if ((UrlRequest.field1182 & 4) == 4) { + WorldMapSectionType.insertMenuItemNoShift(Client.field599, Client.field598 + " " + "->" + " " + class167.colorStartTag(65535) + var19.name, 2, var18, var14, var25); + } + } else { + String[] var35 = var19.actions; + if (var35 != null) { + for (var22 = 4; var22 >= 0; --var22) { + if ((var20 == null || var20.method504(var22)) && var35[var22] != null) { + short var23 = 0; + if (var22 == 0) { + var23 = 3; + } + + if (var22 == 1) { + var23 = 4; + } + + if (var22 == 2) { + var23 = 5; + } + + if (var22 == 3) { + var23 = 6; + } + + if (var22 == 4) { + var23 = 1001; + } + + WorldMapSectionType.insertMenuItemNoShift(var35[var22], class167.colorStartTag(65535) + var19.name, var23, var18, var14, var25); + } + } + } - for (int var13 = 1; var13 <= var1; ++var13) { - var42[var13 - 1] = (float)var13 * var9[var13]; + WorldMapSectionType.insertMenuItemNoShift("Examine", class167.colorStartTag(65535) + var19.name, 1002, var19.id, var14, var25); + } } - float[] var43 = new float[var1 + 1]; - int var14 = method1646(var42, var1 - 1, var2, false, var4, false, var43); - if (var14 == -1) { - return 0; - } else { - boolean var15 = false; - float var17 = 0.0F; - float var18 = 0.0F; - float var19 = 0.0F; - - for (int var20 = 0; var20 <= var14; ++var20) { - if (var10 > var1) { - return var10; + int var26; + Player var27; + NPC var36; + int[] var37; + if (var16 == 1) { + NPC var31 = Client.npcs[var18]; + if (var31 == null) { + continue; + } + + if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { + for (var26 = 0; var26 < Client.npcCount; ++var26) { + var36 = Client.npcs[Client.npcIndices[var26]]; + if (var36 != null && var36 != var31 && var36.definition.size == 1 && var36.x == var31.x && var36.y == var31.y) { + WorldMapLabelSize.addNpcToMenu(var36, Client.npcIndices[var26], var14, var25); + } } - float var16; - if (var20 == 0) { - var16 = var2; - var18 = Frames.method1338(var9, var1, var2); - if (Math.abs(var18) <= var44 && var3) { - var6[var10++] = var2; + var26 = Players.Players_count; + var37 = Players.Players_indices; + + for (var22 = 0; var22 < var26; ++var22) { + var27 = Client.players[var37[var22]]; + if (var27 != null && var27.x == var31.x && var27.y == var31.y) { + ArchiveDiskAction.addPlayerToMenu(var27, var37[var22], var14, var25); } - } else { - var16 = var19; - var18 = var17; } + } - if (var20 == var14) { - var19 = var4; - var15 = false; - } else { - var19 = var43[var20]; + WorldMapLabelSize.addNpcToMenu(var31, var18, var14, var25); + } + + if (var16 == 0) { + Player var32 = Client.players[var18]; + if (var32 == null) { + continue; + } + + if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { + for (var26 = 0; var26 < Client.npcCount; ++var26) { + var36 = Client.npcs[Client.npcIndices[var26]]; + if (var36 != null && var36.definition.size == 1 && var32.x == var36.x && var32.y == var36.y) { + WorldMapLabelSize.addNpcToMenu(var36, Client.npcIndices[var26], var14, var25); + } } - var17 = Frames.method1338(var9, var1, var19); - if (var15) { - var15 = false; - } else if (Math.abs(var17) < var44) { - if (var14 != var20 || var5) { - var6[var10++] = var19; - var15 = true; + var26 = Players.Players_count; + var37 = Players.Players_indices; + + for (var22 = 0; var22 < var26; ++var22) { + var27 = Client.players[var37[var22]]; + if (var27 != null && var32 != var27 && var32.x == var27.x && var27.y == var32.y) { + ArchiveDiskAction.addPlayerToMenu(var27, var37[var22], var14, var25); } - } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { - int var22 = var10++; - float var24 = var16; - float var25 = var19; - float var26 = Frames.method1338(var41.field3922, var41.field3923, var16); - float var23; - if (Math.abs(var26) < class128.field1202) { - var23 = var16; + } + } + + if (var18 != Client.combatTargetPlayerIndex) { + ArchiveDiskAction.addPlayerToMenu(var32, var18, var14, var25); + } else { + var4 = var9; + } + } + + if (var16 == 3) { + NodeDeque var33 = Client.groundItems[ItemLayer.Client_plane][var14][var25]; + if (var33 != null) { + for (TileItem var34 = (TileItem)var33.first(); var34 != null; var34 = (TileItem)var33.next()) { + ItemComposition var38 = class214.ItemDefinition_get(var34.id); + if (Client.isItemSelected == 1) { + WorldMapSectionType.insertMenuItemNoShift("Use", Client.field597 + " " + "->" + " " + class167.colorStartTag(16748608) + var38.name, 16, var34.id, var14, var25); + } else if (Client.isSpellSelected) { + if ((UrlRequest.field1182 & 1) == 1) { + WorldMapSectionType.insertMenuItemNoShift(Client.field599, Client.field598 + " " + "->" + " " + class167.colorStartTag(16748608) + var38.name, 17, var34.id, var14, var25); + } } else { - float var27 = Frames.method1338(var41.field3922, var41.field3923, var19); - if (Math.abs(var27) < class128.field1202) { - var23 = var19; - } else { - float var28 = 0.0F; - float var29 = 0.0F; - float var30 = 0.0F; - float var35 = 0.0F; - boolean var36 = true; - boolean var37 = false; - - do { - var37 = false; - if (var36) { - var28 = var24; - var35 = var26; - var29 = var25 - var24; - var30 = var29; - var36 = false; - } + String[] var28 = var38.groundActions; - if (Math.abs(var35) < Math.abs(var27)) { - var24 = var25; - var25 = var28; - var28 = var24; - var26 = var27; - var27 = var35; - var35 = var26; - } + for (int var39 = 4; var39 >= 0; --var39) { + if (var34.method610(var39)) { + if (var28 != null && var28[var39] != null) { + byte var24 = 0; + if (var39 == 0) { + var24 = 18; + } - float var38 = class128.field1201 * Math.abs(var25) + 0.0F; - float var39 = 0.5F * (var28 - var25); - boolean var40 = Math.abs(var39) > var38 && 0.0F != var27; - if (var40) { - if (Math.abs(var30) >= var38 && Math.abs(var26) > Math.abs(var27)) { - float var34 = var27 / var26; - float var31; - float var32; - if (var24 == var28) { - var31 = var34 * 2.0F * var39; - var32 = 1.0F - var34; - } else { - var32 = var26 / var35; - float var33 = var27 / var35; - var31 = var34 * ((var32 - var33) * 2.0F * var39 * var32 - (var33 - 1.0F) * (var25 - var24)); - var32 = (var32 - 1.0F) * (var33 - 1.0F) * (var34 - 1.0F); - } - - if ((double)var31 > 0.0D) { - var32 = -var32; - } else { - var31 = -var31; - } - - var34 = var30; - var30 = var29; - if (var31 * 2.0F < var39 * 3.0F * var32 - Math.abs(var38 * var32) && var31 < Math.abs(var32 * 0.5F * var34)) { - var29 = var31 / var32; - } else { - var29 = var39; - var30 = var39; - } - } else { - var29 = var39; - var30 = var39; + if (var39 == 1) { + var24 = 19; } - var24 = var25; - var26 = var27; - if (Math.abs(var29) > var38) { - var25 += var29; - } else if ((double)var39 > 0.0D) { - var25 += var38; - } else { - var25 -= var38; + if (var39 == 2) { + var24 = 20; } - var27 = Frames.method1338(var41.field3922, var41.field3923, var25); - if ((double)(var27 * (var35 / Math.abs(var35))) > 0.0D) { - var36 = true; - var37 = true; - } else { - var37 = true; + if (var39 == 3) { + var24 = 21; } - } - } while(var37); - var23 = var25; + if (var39 == 4) { + var24 = 22; + } + + WorldMapSectionType.insertMenuItemNoShift(var28[var39], class167.colorStartTag(16748608) + var38.name, var24, var34.id, var14, var25); + } else if (var39 == 2) { + WorldMapSectionType.insertMenuItemNoShift("Take", class167.colorStartTag(16748608) + var38.name, 20, var34.id, var14, var25); + } + } } - } - var6[var22] = var23; - if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var44) { - var6[var10 - 2] = (var6[var10 - 1] + var6[var10 - 2]) * 0.5F; - --var10; + WorldMapSectionType.insertMenuItemNoShift("Examine", class167.colorStartTag(16748608) + var38.name, 1004, var34.id, var14, var25); } } } - - return var10; } } } + + if (-1L != var4) { + var8 = (int)(var4 >>> 0 & 127L); + int var10 = (int)(var4 >>> 7 & 127L); + Player var12 = Client.players[Client.combatTargetPlayerIndex]; + ArchiveDiskAction.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); + } + + } + + @ObfuscatedName("oo") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1716534762" + ) + public static boolean method1639() { + return Client.clickedWidget != null; } } \ No newline at end of file diff --git a/osrs/src/main/java/PacketWriter.java b/osrs/src/main/java/PacketWriter.java index 6dff6431a..2759ac9a8 100644 --- a/osrs/src/main/java/PacketWriter.java +++ b/osrs/src/main/java/PacketWriter.java @@ -3,75 +3,77 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.io.File; import java.io.IOException; +import java.io.RandomAccessFile; -@ObfuscatedName("ez") +@ObfuscatedName("ef") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lre;" + descriptor = "Lro;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lpm;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("bufferSize") int bufferSize; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lul;" + descriptor = "Luj;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lvd;" + descriptor = "Luy;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Luy;" + descriptor = "Luo;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("am") - boolean field1148; - @ObfuscatedName("av") - int field1152; - @ObfuscatedName("ag") + @ObfuscatedName("al") + boolean field1160; + @ObfuscatedName("az") + int field1164; + @ObfuscatedName("ap") @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "Llu;" ) - ServerPacket field1153; - @ObfuscatedName("ap") + ServerPacket field1167; + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "Llu;" ) - ServerPacket field1154; - @ObfuscatedName("ay") + ServerPacket field1168; + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "Llu;" ) - ServerPacket field1156; + ServerPacket field1166; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); @@ -80,15 +82,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); this.serverPacket = null; this.serverPacketLength = 0; - this.field1148 = true; - this.field1152 = 0; + this.field1160 = true; + this.field1164 = 0; this.pendingWrites = 0; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-633870649" + descriptor = "(B)V", + garbageValue = "-90" ) @Export("clearBuffer") final void clearBuffer() { @@ -96,10 +98,10 @@ final void clearBuffer() { this.bufferSize = 0; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1725575924" + descriptor = "(S)V", + garbageValue = "225" ) @Export("flush") final void flush() throws IOException { @@ -124,10 +126,10 @@ final void flush() throws IOException { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Llx;B)V", - garbageValue = "22" + descriptor = "(Lld;I)V", + garbageValue = "-1187530783" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -137,20 +139,20 @@ public final void addNode(PacketBufferNode var1) { this.bufferSize += var1.index; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lre;I)V", - garbageValue = "-584011742" + descriptor = "(Lro;I)V", + garbageValue = "-1775171508" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2087446789" + descriptor = "(B)V", + garbageValue = "1" ) @Export("close") void close() { @@ -161,20 +163,20 @@ void close() { } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-669241034" + descriptor = "(B)V", + garbageValue = "7" ) @Export("removeSocket") void removeSocket() { this.socket = null; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)Lre;", - garbageValue = "-1314055794" + descriptor = "(I)Lro;", + garbageValue = "-1239264198" ) @Export("getSocket") AbstractSocket getSocket() { @@ -183,59 +185,71 @@ AbstractSocket getSocket() { @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lom;Ljava/lang/String;Ljava/lang/String;I)[Lud;", - garbageValue = "1067620942" - ) - public static SpritePixels[] method646(AbstractArchive var0, String var1, String var2) { - if (!var0.isValidFileName(var1, var2)) { - return null; - } else { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - SpritePixels[] var5; - if (!class164.method862(var0, var3, var4)) { - var5 = null; + descriptor = "(I)V", + garbageValue = "-1549345675" + ) + static void method643() { + try { + File var0 = new File(Login.userHomeDirectory, "random.dat"); + int var2; + if (var0.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); } else { - SpritePixels[] var7 = new SpritePixels[class544.SpriteBuffer_spriteCount]; - - for (int var8 = 0; var8 < class544.SpriteBuffer_spriteCount; ++var8) { - SpritePixels var9 = var7[var8] = new SpritePixels(); - var9.width = class159.SpriteBuffer_spriteWidth; - var9.height = class500.SpriteBuffer_spriteHeight; - var9.xOffset = class326.SpriteBuffer_xOffsets[var8]; - var9.yOffset = ModelData0.SpriteBuffer_yOffsets[var8]; - var9.subWidth = class59.SpriteBuffer_spriteWidths[var8]; - var9.subHeight = class544.SpriteBuffer_spriteHeights[var8]; - int var10 = var9.subWidth * var9.subHeight; - byte[] var11 = AddRequestTask.SpriteBuffer_pixels[var8]; - var9.pixels = new int[var10]; - - for (int var12 = 0; var12 < var10; ++var12) { - var9.pixels[var12] = class372.SpriteBuffer_spritePalette[var11[var12] & 255]; + label34: + for (int var1 = 0; var1 < class85.field859.length; ++var1) { + for (var2 = 0; var2 < GameObject.field2480.length; ++var2) { + File var3 = new File(GameObject.field2480[var2] + class85.field859[var1] + File.separatorChar + "random.dat"); + if (var3.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); + break label34; + } } } - - class407.method2062(); - var5 = var7; } - return var5; + if (JagexCache.JagexCache_randomDat == null) { + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); + var2 = var4.read(); + var4.seek(0L); + var4.write(var2); + var4.seek(0L); + var4.close(); + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + } + } catch (IOException var5) { } + } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "-63" + descriptor = "(IZIZI)V", + garbageValue = "1585666384" ) - public static int method647(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (class361.World_worlds != null) { + class129.doWorldSorting(0, class361.World_worlds.length - 1, var0, var1, var2, var3); + } + + } - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + var0.charAt(var3); + @ObfuscatedName("hz") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-577406943" + ) + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + class13.method51(); + switch(var0) { + case 1: + UserComparator7.method674(24); + class139.setLoginResponseString("", "You were disconnected from the server.", ""); + break; + case 2: + CollisionMap.method1146(); } - return var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/ParamComposition.java b/osrs/src/main/java/ParamComposition.java index c0aee0ad1..a921f1037 100644 --- a/osrs/src/main/java/ParamComposition.java +++ b/osrs/src/main/java/ParamComposition.java @@ -3,37 +3,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("hr") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("ParamDefinition_archive") static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("ParamDefinition_cached") static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "Lud;" - ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - @ObfuscatedName("ak") + @ObfuscatedName("qg") + static int field1629; + @ObfuscatedName("ar") @Export("type") char type; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("defaultInt") public int defaultInt; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("autoDisable") boolean autoDisable; @@ -45,19 +41,19 @@ public class ParamComposition extends DualNode { this.autoDisable = true; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-560254991" + descriptor = "(B)V", + garbageValue = "23" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-721387460" + descriptor = "(Luj;I)V", + garbageValue = "-2107778896" ) @Export("decode") void decode(Buffer var1) { @@ -71,15 +67,15 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "-1665298229" + descriptor = "(Luj;IB)V", + garbageValue = "56" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.type = class149.method782(var1.readByte()); + this.type = class17.method60(var1.readByte()); } else if (var2 == 2) { this.defaultInt = var1.readInt(); } else if (var2 == 4) { @@ -90,29 +86,246 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-19" + descriptor = "(I)Z", + garbageValue = "-232171801" ) @Export("isString") public boolean isString() { return this.type == 's'; } - @ObfuscatedName("al") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(I)Lrb;", - garbageValue = "-91337538" + descriptor = "(Lpf;Lpf;B)V", + garbageValue = "74" ) - public static class465 method1053() { - synchronized(class465.field3907) { - if (class465.field3905 == 0) { - return new class465(); + static void method981(Font var0, Font var1) { + if (class108.worldSelectBackSprites == null) { + class108.worldSelectBackSprites = Players.method620(GrandExchangeOfferOwnWorldComparator.archive8, "sl_back", ""); + } + + if (class130.worldSelectFlagSprites == null) { + class130.worldSelectFlagSprites = Skills.method1895(GrandExchangeOfferOwnWorldComparator.archive8, "sl_flags", ""); + } + + if (class148.worldSelectArrows == null) { + class148.worldSelectArrows = Skills.method1895(GrandExchangeOfferOwnWorldComparator.archive8, "sl_arrows", ""); + } + + if (MoveSpeed.worldSelectStars == null) { + MoveSpeed.worldSelectStars = Skills.method1895(GrandExchangeOfferOwnWorldComparator.archive8, "sl_stars", ""); + } + + if (Varps.worldSelectLeftSprite == null) { + Varps.worldSelectLeftSprite = class313.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferOwnWorldComparator.archive8, "leftarrow", ""); + } + + if (class105.worldSelectRightSprite == null) { + class105.worldSelectRightSprite = class313.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferOwnWorldComparator.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); + if (MoveSpeed.worldSelectStars != null) { + MoveSpeed.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + MoveSpeed.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + int var4; + int var5; + if (class148.worldSelectArrows != null) { + int var2 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { + class148.worldSelectArrows[2].drawAt(var2, 4); + } else { + class148.worldSelectArrows[0].drawAt(var2, 4); + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { + class148.worldSelectArrows[3].drawAt(var2 + 15, 4); + } else { + class148.worldSelectArrows[1].drawAt(var2 + 15, 4); + } + + var0.draw("World", var2 + 32, 17, 16777215, -1); + int var3 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { + class148.worldSelectArrows[2].drawAt(var3, 4); + } else { + class148.worldSelectArrows[0].drawAt(var3, 4); + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { + class148.worldSelectArrows[3].drawAt(var3 + 15, 4); + } else { + class148.worldSelectArrows[1].drawAt(var3 + 15, 4); + } + + var0.draw("Players", var3 + 32, 17, 16777215, -1); + var4 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { + class148.worldSelectArrows[2].drawAt(var4, 4); } else { - class465.field3907[--class465.field3905].method2340(); - return class465.field3907[class465.field3905]; + class148.worldSelectArrows[0].drawAt(var4, 4); } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { + class148.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + class148.worldSelectArrows[1].drawAt(var4 + 15, 4); + } + + var0.draw("Location", var4 + 32, 17, 16777215, -1); + var5 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { + class148.worldSelectArrows[2].drawAt(var5, 4); + } else { + class148.worldSelectArrows[0].drawAt(var5, 4); + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { + class148.worldSelectArrows[3].drawAt(var5 + 15, 4); + } else { + class148.worldSelectArrows[1].drawAt(var5 + 15, 4); + } + + var0.draw("Type", var5 + 32, 17, 16777215, -1); } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if (class108.worldSelectBackSprites != null) { + byte var23 = 88; + byte var24 = 19; + var4 = 765 / (var23 + 1) - 1; + var5 = 480 / (var24 + 1); + + int var6; + int var7; + do { + var6 = var5; + var7 = var4; + if (var5 * (var4 - 1) >= World.World_count) { + --var4; + } + + if (var4 * (var5 - 1) >= World.World_count) { + --var5; + } + + if (var4 * (var5 - 1) >= World.World_count) { + --var5; + } + } while(var5 != var6 || var4 != var7); + + var6 = (765 - var4 * var23) / (var4 + 1); + if (var6 > 5) { + var6 = 5; + } + + var7 = (480 - var24 * var5) / (var5 + 1); + if (var7 > 5) { + var7 = 5; + } + + int var8 = (765 - var23 * var4 - var6 * (var4 - 1)) / 2; + int var9 = (480 - var24 * var5 - var7 * (var5 - 1)) / 2; + int var10 = (var5 + World.World_count - 1) / var5; + Login.worldSelectPagesCount = var10 - var4; + if (Varps.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + Varps.worldSelectLeftSprite.drawAt(8, class47.canvasHeight / 2 - Varps.worldSelectLeftSprite.subHeight / 2); + } + + if (class105.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + class105.worldSelectRightSprite.drawAt(Language.canvasWidth - class105.worldSelectRightSprite.subWidth - 8, class47.canvasHeight / 2 - class105.worldSelectRightSprite.subHeight / 2); + } + + int var11 = var9 + 23; + int var12 = var8 + Login.xPadding; + int var13 = 0; + boolean var14 = false; + int var15 = Login.worldSelectPage; + + int var16; + for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { + World var17 = class361.World_worlds[var16]; + boolean var18 = true; + String var19 = Integer.toString(var17.population); + if (var17.population == -1) { + var19 = "OFF"; + var18 = false; + } else if (var17.population > 1980) { + var19 = "FULL"; + var18 = false; + } + + class108 var20 = null; + int var21 = 0; + if (var17.isBeta()) { + var20 = var17.isMembersOnly() ? class108.field1131 : class108.field1129; + } else if (var17.isDeadman()) { + var20 = var17.isMembersOnly() ? class108.field1133 : class108.field1143; + } else if (var17.method402()) { + var21 = 16711680; + var20 = var17.isMembersOnly() ? class108.field1140 : class108.field1130; + } else if (var17.method404()) { + var20 = var17.isMembersOnly() ? class108.field1144 : class108.field1134; + } else if (var17.isPvp()) { + var20 = var17.isMembersOnly() ? class108.field1135 : class108.field1137; + } else if (var17.method405()) { + var20 = var17.isMembersOnly() ? class108.field1141 : class108.field1136; + } else if (var17.method406()) { + var20 = var17.isMembersOnly() ? class108.field1138 : class108.field1142; + } + + if (var20 == null || var20.field1145 >= class108.worldSelectBackSprites.length) { + var20 = var17.isMembersOnly() ? class108.field1132 : class108.field1139; + } + + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var23 + var12 && MouseHandler.MouseHandler_y < var11 + var24 && var18) { + Login.hoveredWorldIndex = var16; + class108.worldSelectBackSprites[var20.field1145].drawTransOverlayAt(var12, var11, 128, 16777215); + var14 = true; + } else { + class108.worldSelectBackSprites[var20.field1145].drawAt(var12, var11); + } + + if (class130.worldSelectFlagSprites != null) { + class130.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); + } + + var0.drawCentered(Integer.toString(var17.id), var12 + 15, var24 / 2 + var11 + 5, var21, -1); + var1.drawCentered(var19, var12 + 60, var24 / 2 + var11 + 5, 268435455, -1); + var11 = var11 + var7 + var24; + ++var13; + if (var13 >= var5) { + var11 = var9 + 23; + var12 = var12 + var23 + var6; + var13 = 0; + ++var15; + } + } + + if (var14) { + var16 = var1.stringWidth(class361.World_worlds[Login.hoveredWorldIndex].activity) + 6; + int var22 = var1.ascent + 8; + int var25 = MouseHandler.MouseHandler_y + 25; + if (var25 + var22 > 480) { + var25 = MouseHandler.MouseHandler_y - 25 - var22; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var22, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var22, 0); + var1.drawCentered(class361.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/PcmPlayer.java b/osrs/src/main/java/PcmPlayer.java index 9896cd888..fcc975e5f 100644 --- a/osrs/src/main/java/PcmPlayer.java +++ b/osrs/src/main/java/PcmPlayer.java @@ -3,152 +3,157 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("by") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("ao") + @ObfuscatedName("ab") public static int field179; - @ObfuscatedName("am") + @ObfuscatedName("al") + public static int field180; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "Lbq;" ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; - @ObfuscatedName("tw") - static boolean field180; - @ObfuscatedName("ay") + @Export("pcmPlayerProvider") + public static class51 pcmPlayerProvider; + @ObfuscatedName("fx") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + static Archive field181; + @ObfuscatedName("as") @Export("samples") public int[] samples; - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lbi;" + descriptor = "Lbk;" ) @Export("stream") PcmStream stream; + @ObfuscatedName("ak") + int field189; @ObfuscatedName("aj") - int field187; - @ObfuscatedName("an") @Export("timeMs") long timeMs; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("capacity") public int capacity; + @ObfuscatedName("aq") + public int field196; @ObfuscatedName("ai") - public int field195; - @ObfuscatedName("ae") - int field186; + int field188; @ObfuscatedName("aw") long field194; - @ObfuscatedName("aq") - int field188; - @ObfuscatedName("az") + @ObfuscatedName("ae") + int field186; + @ObfuscatedName("an") int field190; - @ObfuscatedName("at") - int field189; - @ObfuscatedName("af") - long field192; + @ObfuscatedName("ag") + int field187; @ObfuscatedName("ad") + long field192; + @ObfuscatedName("af") boolean field185; - @ObfuscatedName("bv") + @ObfuscatedName("bf") int field191; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "[Lbi;" + descriptor = "[Lbk;" ) - PcmStream[] field183; - @ObfuscatedName("bz") + PcmStream[] field184; + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "[Lbi;" + descriptor = "[Lbk;" ) - PcmStream[] field184; + PcmStream[] field183; public PcmPlayer() { - this.field187 = 32; - this.timeMs = GrandExchangeOfferTotalQuantityComparator.method1971(); + this.field189 = 32; + this.timeMs = SpotAnimationDefinition.method962(); this.field194 = 0L; - this.field188 = 0; + this.field186 = 0; this.field190 = 0; - this.field189 = 0; + this.field187 = 0; this.field192 = 0L; this.field185 = true; this.field191 = 0; - this.field183 = new PcmStream[8]; this.field184 = new PcmStream[8]; + this.field183 = new PcmStream[8]; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1058566109" + descriptor = "(B)V", + garbageValue = "95" ) @Export("init") public void init() throws Exception { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "1706445518" ) @Export("open") public void open(int var1) throws Exception { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-325041005" + garbageValue = "-79725090" ) @Export("position") protected int position() throws Exception { return this.capacity; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("write") protected void write() throws Exception { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "3331" + descriptor = "(I)V", + garbageValue = "1254913818" ) @Export("close") protected void close() { } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-264971545" ) @Export("discard") protected void discard() throws Exception { } - @ObfuscatedName("at") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lbi;I)V", - garbageValue = "-1717479669" + descriptor = "(Lbk;B)V", + garbageValue = "32" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; } - @ObfuscatedName("af") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1281644299" + garbageValue = "-1871006724" ) @Export("run") public final synchronized void run() { if (this.samples != null) { - long var1 = GrandExchangeOfferTotalQuantityComparator.method1971(); + long var1 = SpotAnimationDefinition.method962(); try { - if (this.field194 != 0L) { + if (0L != this.field194) { if (var1 < this.field194) { return; } @@ -159,11 +164,11 @@ public final synchronized void run() { } int var3 = this.position(); - if (this.field189 - var3 > this.field188) { - this.field188 = this.field189 - var3; + if (this.field187 - var3 > this.field186) { + this.field186 = this.field187 - var3; } - int var4 = this.field186 + this.field195; + int var4 = this.field196 + this.field188; if (var4 + 256 > 16384) { var4 = 16128; } @@ -180,7 +185,7 @@ public final synchronized void run() { this.field185 = true; if (var4 + 256 > this.capacity) { var4 = this.capacity - 256; - this.field186 = var4 - this.field195; + this.field188 = var4 - this.field196; } } @@ -192,26 +197,26 @@ public final synchronized void run() { if (var1 > this.field192) { if (!this.field185) { - if (this.field188 == 0 && this.field190 == 0) { + if (this.field186 == 0 && this.field190 == 0) { this.close(); - this.field194 = var1 + 2000L; + this.field194 = 2000L + var1; return; } - this.field186 = Math.min(this.field190, this.field188); - this.field190 = this.field188; + this.field188 = Math.min(this.field190, this.field186); + this.field190 = this.field186; } else { this.field185 = false; } - this.field188 = 0; - this.field192 = 2000L + var1; + this.field186 = 0; + this.field192 = var1 + 2000L; } - this.field189 = var3; + this.field187 = var3; } catch (Exception var7) { this.close(); - this.field194 = var1 + 2000L; + this.field194 = 2000L + var1; } try { @@ -230,19 +235,19 @@ public final synchronized void run() { } } - @ObfuscatedName("ad") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "233937978" + garbageValue = "-440619545" ) - public final void method209() { + public final void method213() { this.field185 = true; } - @ObfuscatedName("bn") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1063946921" + garbageValue = "-2108187094" ) @Export("tryDiscard") public final synchronized void tryDiscard() { @@ -252,35 +257,35 @@ public final synchronized void tryDiscard() { this.discard(); } catch (Exception var2) { this.close(); - this.field194 = GrandExchangeOfferTotalQuantityComparator.method1971() + 2000L; + this.field194 = SpotAnimationDefinition.method962() + 2000L; } } - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1490878758" + garbageValue = "592900977" ) @Export("shutdown") public final synchronized void shutdown() { - if (UserComparator4.soundSystem != null) { + if (DelayFadeTask.soundSystem != null) { boolean var1 = true; for (int var2 = 0; var2 < 2; ++var2) { - if (this == UserComparator4.soundSystem.players[var2]) { - UserComparator4.soundSystem.players[var2] = null; + if (this == DelayFadeTask.soundSystem.players[var2]) { + DelayFadeTask.soundSystem.players[var2] = null; } - if (UserComparator4.soundSystem.players[var2] != null) { + if (DelayFadeTask.soundSystem.players[var2] != null) { var1 = false; } } if (var1) { - class353.soundSystemExecutor.shutdownNow(); - class353.soundSystemExecutor = null; - UserComparator4.soundSystem = null; + class342.soundSystemExecutor.shutdownNow(); + class342.soundSystemExecutor = null; + DelayFadeTask.soundSystem = null; } } @@ -288,10 +293,10 @@ public final synchronized void shutdown() { this.samples = null; } - @ObfuscatedName("by") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1697605758" + descriptor = "(IB)V", + garbageValue = "-120" ) @Export("skip") final void skip(int var1) { @@ -306,20 +311,20 @@ final void skip(int var1) { } - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; - if (class306.PcmPlayer_stereo) { + if (WorldMapRectangle.PcmPlayer_stereo) { var3 = var2 << 1; } - class424.clearIntArray(var1, 0, var3); + class421.clearIntArray(var1, 0, var3); this.field191 -= var2; if (this.stream != null && this.field191 <= 0) { this.field191 += field179 >> 4; - class193.PcmStream_disable(this.stream); - this.method214(this.stream, this.stream.vmethod1019()); + NPC.PcmStream_disable(this.stream); + this.method218(this.stream, this.stream.vmethod1019()); int var4 = 0; int var5 = 255; @@ -341,7 +346,7 @@ final void fill(int[] var1, int var2) { if ((var9 & 1) != 0) { var5 &= ~(1 << var7); var10 = null; - PcmStream var11 = this.field183[var7]; + PcmStream var11 = this.field184[var7]; label99: while (true) { @@ -363,27 +368,27 @@ final void fill(int[] var1, int var2) { var12.position += var13; } - if (var4 >= this.field187) { + if (var4 >= this.field189) { break label105; } PcmStream var14 = var11.firstSubStream(); if (var14 != null) { - for (int var15 = var11.field247; var14 != null; var14 = var11.nextSubStream()) { - this.method214(var14, var15 * var14.vmethod1019() >> 8); + for (int var15 = var11.field244; var14 != null; var14 = var11.nextSubStream()) { + this.method218(var14, var15 * var14.vmethod1019() >> 8); } } PcmStream var16 = var11.after; var11.after = null; if (var10 == null) { - this.field183[var7] = var16; + this.field184[var7] = var16; } else { var10.after = var16; } if (var16 == null) { - this.field184[var7] = var10; + this.field183[var7] = var10; } var11 = var16; @@ -398,9 +403,9 @@ final void fill(int[] var1, int var2) { } for (var6 = 0; var6 < 8; ++var6) { - PcmStream var17 = this.field183[var6]; - PcmStream[] var18 = this.field183; - this.field184[var6] = null; + PcmStream var17 = this.field184[var6]; + PcmStream[] var18 = this.field184; + this.field183[var6] = null; for (var18[var6] = null; var17 != null; var17 = var10) { var10 = var17.after; @@ -417,76 +422,53 @@ final void fill(int[] var1, int var2) { this.stream.fill(var1, 0, var2); } - this.timeMs = GrandExchangeOfferTotalQuantityComparator.method1971(); + this.timeMs = SpotAnimationDefinition.method962(); } - @ObfuscatedName("bv") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(Lbi;IB)V", - garbageValue = "-119" + descriptor = "(Lbk;IB)V", + garbageValue = "39" ) - final void method214(PcmStream var1, int var2) { + final void method218(PcmStream var1, int var2) { int var3 = var2 >> 5; - PcmStream var4 = this.field184[var3]; + PcmStream var4 = this.field183[var3]; if (var4 == null) { - this.field183[var3] = var1; + this.field184[var3] = var1; } else { var4.after = var1; } - this.field184[var3] = var1; - var1.field247 = var2; + this.field183[var3] = var1; + var1.field244 = var2; } - @ObfuscatedName("ij") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "13" + descriptor = "(Luj;Ljava/lang/String;B)I", + garbageValue = "108" ) - static final void method221() { - int var0; - int var1; - int var2; - if (!Client.field402) { - var0 = class191.cameraMoveToX * 128 + 64; - var1 = MouseHandler.cameraMoveToY * 128 + 64; - var2 = class115.getTileHeight(var0, var1, class87.Client_plane) - SoundSystem.cameraMoveToHeight; - WorldMapSectionType.method1555(var0, var2, var1); - } else if (Client.field646 != null) { - Client.cameraX = Client.field646.vmethod2349(); - WorldMapArea.cameraZ = Client.field646.vmethod2347(); - if (Client.field403) { - class17.cameraY = Client.field646.vmethod2320(); - } else { - class17.cameraY = class115.getTileHeight(Client.cameraX, WorldMapArea.cameraZ, class87.Client_plane) - Client.field646.vmethod2320(); - } - - Client.field646.method2413(); - } - - if (!Client.field401) { - var0 = class148.cameraLookAtX * 128 + 64; - var1 = BufferedNetSocket.cameraLookAtY * 128 + 64; - var2 = class115.getTileHeight(var0, var1, class87.Client_plane) - class161.cameraLookAtHeight; - int var3 = var0 - Client.cameraX; - int var4 = var2 - class17.cameraY; - int var5 = var1 - WorldMapArea.cameraZ; - int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); - int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; - int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; - Projectile.method438(var7, var8); - } else { - if (Client.field642 != null) { - class365.cameraPitch = Client.field642.method2409(); - class365.cameraPitch = Math.min(Math.max(class365.cameraPitch, 128), 383); - Client.field642.method2413(); - } - - if (Client.field643 != null) { - WallDecoration.cameraYaw = Client.field643.method2409() & 2047; - Client.field643.method2413(); - } - } + public static int method210(Buffer var0, String var1) { + int var2 = var0.offset; + byte[] var3 = MusicPatchPcmStream.method1720(var1); + var0.writeSmartByteShort(var3.length); + var0.offset += class350.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); + return var0.offset - var2; + } + @ObfuscatedName("mo") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-54" + ) + static void method225(int var0) { + class174.tempMenuAction = new MenuAction(); + class174.tempMenuAction.param0 = Client.menuArguments1[var0]; + class174.tempMenuAction.param1 = Client.menuArguments2[var0]; + class174.tempMenuAction.opcode = Client.menuOpcodes[var0]; + class174.tempMenuAction.identifier = Client.menuIdentifiers[var0]; + class174.tempMenuAction.itemId = Client.menuItemIds[var0]; + class174.tempMenuAction.action = Client.menuActions[var0]; + class174.tempMenuAction.target = Client.menuTargets[var0]; } } \ No newline at end of file diff --git a/osrs/src/main/java/PcmStream.java b/osrs/src/main/java/PcmStream.java index 25d9d1eb9..84dc28803 100644 --- a/osrs/src/main/java/PcmStream.java +++ b/osrs/src/main/java/PcmStream.java @@ -3,24 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("bk") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("aj") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lbi;" + descriptor = "Lbk;" ) @Export("after") PcmStream after; - @ObfuscatedName("an") - int field247; - @ObfuscatedName("au") + @ObfuscatedName("aj") + int field244; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lcb;" + descriptor = "Lcl;" ) @Export("sound") AbstractSound sound; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("active") volatile boolean active; @@ -28,39 +28,39 @@ protected PcmStream() { this.active = true; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbk;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbk;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("vmethod5648") protected abstract int vmethod5648(); - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("bs") + @ObfuscatedName("bx") @Export("vmethod1019") int vmethod1019() { return 255; } - @ObfuscatedName("gm") + @ObfuscatedName("ft") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { diff --git a/osrs/src/main/java/PcmStreamMixer.java b/osrs/src/main/java/PcmStreamMixer.java index 4fc138a9a..9eb7a9665 100644 --- a/osrs/src/main/java/PcmStreamMixer.java +++ b/osrs/src/main/java/PcmStreamMixer.java @@ -3,153 +3,153 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("bn") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) - NodeDeque field161; - @ObfuscatedName("ak") + NodeDeque field159; + @ObfuscatedName("ar") int field158; - @ObfuscatedName("ax") - int field159; + @ObfuscatedName("ao") + int field157; public PcmStreamMixer() { this.subStreams = new NodeDeque(); - this.field161 = new NodeDeque(); + this.field159 = new NodeDeque(); this.field158 = 0; - this.field159 = -1; + this.field157 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lbi;)V" + descriptor = "(Lbk;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lbi;)V" + descriptor = "(Lbk;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); } - @ObfuscatedName("ak") - void method187() { + @ObfuscatedName("ar") + void method190() { if (this.field158 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field161.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field161.previous()) { - var1.field293 -= this.field158; + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field159.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field159.previous()) { + var1.field290 -= this.field158; } - this.field159 -= this.field158; + this.field157 -= this.field158; this.field158 = 0; } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lsj;Lcc;)V" + descriptor = "(Lsh;Lcx;)V" ) - void method188(Node var1, PcmStreamMixerListener var2) { - while (this.field161.sentinel != var1 && ((PcmStreamMixerListener)var1).field293 <= var2.field293) { + void method191(Node var1, PcmStreamMixerListener var2) { + while (this.field159.sentinel != var1 && ((PcmStreamMixerListener)var1).field290 <= var2.field290) { var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); - this.field159 = ((PcmStreamMixerListener)this.field161.sentinel.previous).field293; + this.field157 = ((PcmStreamMixerListener)this.field159.sentinel.previous).field290; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lcc;)V" + descriptor = "(Lcx;)V" ) - void method189(PcmStreamMixerListener var1) { + void method192(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); - Node var2 = this.field161.sentinel.previous; - if (var2 == this.field161.sentinel) { - this.field159 = -1; + Node var2 = this.field159.sentinel.previous; + if (var2 == this.field159.sentinel) { + this.field157 = -1; } else { - this.field159 = ((PcmStreamMixerListener)var2).field293; + this.field157 = ((PcmStreamMixerListener)var2).field290; } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbk;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbk;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("vmethod5648") protected int vmethod5648() { return 0; } - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field159 < 0) { + if (this.field157 < 0) { this.updateSubStreams(var1, var2, var3); return; } - if (var3 + this.field158 < this.field159) { + if (var3 + this.field158 < this.field157) { this.field158 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.field159 - this.field158; + int var4 = this.field157 - this.field158; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; this.field158 += var4; - this.method187(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field161.last(); + this.method190(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field159.last(); synchronized(var5) { int var7 = var5.update(); if (var7 < 0) { - var5.field293 = 0; - this.method189(var5); + var5.field290 = 0; + this.method192(var5); } else { - var5.field293 = var7; - this.method188(var5.previous, var5); + var5.field290 = var7; + this.method191(var5.previous, var5); } } } while(var3 != 0); } - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { @@ -158,42 +158,42 @@ void updateSubStreams(int[] var1, int var2, int var3) { } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field159 < 0) { + if (this.field157 < 0) { this.skipSubStreams(var1); return; } - if (this.field158 + var1 < this.field159) { + if (this.field158 + var1 < this.field157) { this.field158 += var1; this.skipSubStreams(var1); return; } - int var2 = this.field159 - this.field158; + int var2 = this.field157 - this.field158; this.skipSubStreams(var2); var1 -= var2; this.field158 += var2; - this.method187(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field161.last(); + this.method190(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field159.last(); synchronized(var3) { int var5 = var3.update(); if (var5 < 0) { - var3.field293 = 0; - this.method189(var3); + var3.field290 = 0; + this.method192(var3); } else { - var3.field293 = var5; - this.method188(var3.previous, var3); + var3.field290 = var5; + this.method191(var3.previous, var3); } } } while(var1 != 0); } - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { diff --git a/osrs/src/main/java/PcmStreamMixerListener.java b/osrs/src/main/java/PcmStreamMixerListener.java index 7982c2be8..689c23b66 100644 --- a/osrs/src/main/java/PcmStreamMixerListener.java +++ b/osrs/src/main/java/PcmStreamMixerListener.java @@ -3,19 +3,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") +@ObfuscatedName("cx") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("ac") - int field293; + @ObfuscatedName("at") + int field290; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("remove2") abstract void remove2(); - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lbm;)I" + descriptor = "(Lbn;)I" ) @Export("update") abstract int update(); diff --git a/osrs/src/main/java/PendingSpawn.java b/osrs/src/main/java/PendingSpawn.java index e7634ffbf..83cc0fb6b 100644 --- a/osrs/src/main/java/PendingSpawn.java +++ b/osrs/src/main/java/PendingSpawn.java @@ -3,115 +3,119 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") +import java.util.ArrayList; +import java.util.Iterator; + +@ObfuscatedName("dp") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("dz") - @ObfuscatedSignature( - descriptor = "[Lun;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("ac") + @ObfuscatedName("dy") + static boolean field949; + @ObfuscatedName("qa") + static int field950; + @ObfuscatedName("at") @Export("plane") int plane; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("type") int type; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("x") int x; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("y") int y; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("objectId") int objectId; - @ObfuscatedName("ah") - int field947; - @ObfuscatedName("ar") - int field953; - @ObfuscatedName("ab") + @ObfuscatedName("au") + int field961; + @ObfuscatedName("aa") + int field951; + @ObfuscatedName("ac") @Export("id") int id; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("rotation") int rotation; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("objectType") int objectType; - @ObfuscatedName("ag") - int field946; @ObfuscatedName("ap") - int field952; - @ObfuscatedName("ay") + int field957; + @ObfuscatedName("ax") + int field962; + @ObfuscatedName("as") @Export("startCycle") int startCycle; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("endCycle") int endCycle; PendingSpawn() { - this.field952 = 31; + this.field962 = 31; this.startCycle = 0; this.endCycle = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1554580645" + garbageValue = "-1592817450" ) - void method506(int var1) { - this.field952 = var1; + void method503(int var1) { + this.field962 = var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "585710320" + descriptor = "(IS)Z", + garbageValue = "7928" ) - boolean method507(int var1) { + boolean method504(int var1) { if (var1 >= 0 && var1 <= 4) { - return (this.field952 & 1 << var1) != 0; + return (this.field962 & 1 << var1) != 0; } else { return true; } } - @ObfuscatedName("av") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-121" + descriptor = "(Ljava/util/ArrayList;IIIIZI)V", + garbageValue = "1949440150" ) - static final void method508(String var0) { - class436.method2211(var0 + " is already on your friend list"); - } + public static void method505(ArrayList var0, int var1, int var2, int var3, int var4, boolean var5) { + if (!var0.isEmpty()) { + class316.field2790.clear(); + class316.field2798.clear(); + PacketBufferNode.method1637(var5); + class30.method131(var0, var5); + if (!class316.field2790.isEmpty()) { + EnumComposition.method925(var1, var2, var3, var4); + class316.field2798.add(new AddRequestTask((SongTask)null)); + class316.field2798.add(new class420((SongTask)null, class316.field2792, class316.field2791, class168.field1428)); + ArrayList var6 = new ArrayList(); + var6.add(new class415(new FadeInTask((SongTask)null, 0, true, class316.field2796))); + if (!class316.musicSongs.isEmpty()) { + ArrayList var7 = new ArrayList(); + var7.add(new DelayFadeTask(new ConcurrentMidiTask((SongTask)null, var6), class316.field2795)); + ArrayList var9 = new ArrayList(); + Iterator var10 = class316.musicSongs.iterator(); - @ObfuscatedName("lq") - @ObfuscatedSignature( - descriptor = "([Lnm;Lnm;ZB)V", - garbageValue = "-37" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -935068743 * -231105911 : var1.width * -2052421073 * -1523778353; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -356890711 * -111326055 : var1.height * -2112445931 * -503112387; - class360.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - class360.resizeInterface(var1.children, var1.id, var3, var4, var2); - } + while (var10.hasNext()) { + MusicSong var11 = (MusicSong)var10.next(); + var9.add(var11); + } - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - int var6 = var5.group; - if (class33.widgetDefinition.loadInterface(var6)) { - class360.resizeInterface(class33.widgetDefinition.Widget_interfaceComponents[var6], -1, var3, var4, var2); - } - } + var7.add(new DelayFadeTask(new FadeOutTask(new class413((SongTask)null, var9), 0, false, class316.field2794), class316.musicPlayerStatus)); + class316.field2798.add(new ConcurrentMidiTask((SongTask)null, var7)); + } else { + class316.field2798.add(new DelayFadeTask((SongTask)null, class316.field2795)); + class316.field2798.add(new ConcurrentMidiTask((SongTask)null, var6)); + } - if (var1.contentType == 1337) { + } } - } } \ No newline at end of file diff --git a/osrs/src/main/java/PlatformInfo.java b/osrs/src/main/java/PlatformInfo.java index c42034506..8d34ba6e9 100644 --- a/osrs/src/main/java/PlatformInfo.java +++ b/osrs/src/main/java/PlatformInfo.java @@ -3,162 +3,162 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sx") +@ObfuscatedName("sb") @Implements("PlatformInfo") public class PlatformInfo extends Node { + @ObfuscatedName("bg") + int field3959; @ObfuscatedName("ba") - int field3962; - @ObfuscatedName("bz") - boolean field3961; - @ObfuscatedName("bb") + boolean field3957; + @ObfuscatedName("bm") int field3963; - @ObfuscatedName("bo") - int field3969; @ObfuscatedName("bp") + int field3965; + @ObfuscatedName("bw") int field3970; + @ObfuscatedName("bj") + int field3961; + @ObfuscatedName("bn") + int field3964; + @ObfuscatedName("bo") + boolean field3958; @ObfuscatedName("bt") - int field3973; - @ObfuscatedName("bm") int field3968; - @ObfuscatedName("br") - boolean field3960; - @ObfuscatedName("bs") - int field3972; - @ObfuscatedName("bc") - int field3964; - @ObfuscatedName("bf") - int field3965; + @ObfuscatedName("bu") + int field3969; @ObfuscatedName("bh") - int field3966; - @ObfuscatedName("bl") - String field3980; - @ObfuscatedName("bg") - String field3978; - @ObfuscatedName("bj") - String field3979; + int field3960; + @ObfuscatedName("bz") + int field3971; + @ObfuscatedName("bc") + String field3976; + @ObfuscatedName("bs") + String field3977; @ObfuscatedName("bx") - String field3981; - @ObfuscatedName("bi") + String field3978; + @ObfuscatedName("bb") + String field3975; + @ObfuscatedName("bk") + int field3962; + @ObfuscatedName("br") int field3967; @ObfuscatedName("bq") - int field3971; - @ObfuscatedName("bw") - int field3974; - @ObfuscatedName("ce") - int field3976; - @ObfuscatedName("cu") - String field3984; - @ObfuscatedName("cw") - String field3985; - @ObfuscatedName("co") - int[] field3977; - @ObfuscatedName("cc") - int field3975; + int field3966; + @ObfuscatedName("cf") + int field3972; @ObfuscatedName("cg") + String field3980; + @ObfuscatedName("cv") String field3982; - @ObfuscatedName("cq") - String field3983; + @ObfuscatedName("cx") + int[] field3974; + @ObfuscatedName("cp") + int field3973; + @ObfuscatedName("ce") + String field3979; + @ObfuscatedName("ci") + String field3981; PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25, String var26) { - this.field3977 = new int[3]; - this.field3962 = var1; - this.field3961 = var2; + this.field3974 = new int[3]; + this.field3959 = var1; + this.field3957 = var2; this.field3963 = var3; - this.field3969 = var4; + this.field3965 = var4; this.field3970 = var5; - this.field3973 = var6; - this.field3968 = var7; - this.field3960 = var8; - this.field3972 = var9; - this.field3964 = var10; - this.field3965 = var11; - this.field3966 = var12; - this.field3980 = var13; - this.field3978 = var14; - this.field3979 = var15; - this.field3981 = var16; - this.field3967 = var17; - this.field3971 = var18; - this.field3974 = var19; - this.field3976 = var20; - this.field3984 = var21; - this.field3985 = var22; - this.field3977 = var23; - this.field3975 = var24; - this.field3982 = var25; - this.field3983 = var26; + this.field3961 = var6; + this.field3964 = var7; + this.field3958 = var8; + this.field3968 = var9; + this.field3969 = var10; + this.field3960 = var11; + this.field3971 = var12; + this.field3976 = var13; + this.field3977 = var14; + this.field3978 = var15; + this.field3975 = var16; + this.field3962 = var17; + this.field3967 = var18; + this.field3966 = var19; + this.field3972 = var20; + this.field3980 = var21; + this.field3982 = var22; + this.field3974 = var23; + this.field3973 = var24; + this.field3979 = var25; + this.field3981 = var26; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "1684641716" + descriptor = "(Luj;I)V", + garbageValue = "1412255226" ) @Export("write") public void write(Buffer var1) { var1.writeByte(9); - var1.writeByte(this.field3962); - var1.writeByte(this.field3961 ? 1 : 0); + var1.writeByte(this.field3959); + var1.writeByte(this.field3957 ? 1 : 0); var1.writeShort(this.field3963); - var1.writeByte(this.field3969); + var1.writeByte(this.field3965); var1.writeByte(this.field3970); - var1.writeByte(this.field3973); - var1.writeByte(this.field3968); - var1.writeByte(this.field3960 ? 1 : 0); - var1.writeShort(this.field3972); + var1.writeByte(this.field3961); var1.writeByte(this.field3964); - var1.writeMedium(this.field3965); - var1.writeShort(this.field3966); - var1.writeStringCp1252NullCircumfixed(this.field3980); + var1.writeByte(this.field3958 ? 1 : 0); + var1.writeShort(this.field3968); + var1.writeByte(this.field3969); + var1.writeMedium(this.field3960); + var1.writeShort(this.field3971); + var1.writeStringCp1252NullCircumfixed(this.field3976); + var1.writeStringCp1252NullCircumfixed(this.field3977); var1.writeStringCp1252NullCircumfixed(this.field3978); - var1.writeStringCp1252NullCircumfixed(this.field3979); - var1.writeStringCp1252NullCircumfixed(this.field3981); - var1.writeByte(this.field3971); - var1.writeShort(this.field3967); - var1.writeStringCp1252NullCircumfixed(this.field3984); - var1.writeStringCp1252NullCircumfixed(this.field3985); - var1.writeByte(this.field3974); - var1.writeByte(this.field3976); + var1.writeStringCp1252NullCircumfixed(this.field3975); + var1.writeByte(this.field3967); + var1.writeShort(this.field3962); + var1.writeStringCp1252NullCircumfixed(this.field3980); + var1.writeStringCp1252NullCircumfixed(this.field3982); + var1.writeByte(this.field3966); + var1.writeByte(this.field3972); - for (int var2 = 0; var2 < this.field3977.length; ++var2) { - var1.writeInt(this.field3977[var2]); + for (int var2 = 0; var2 < this.field3974.length; ++var2) { + var1.writeInt(this.field3974[var2]); } - var1.writeInt(this.field3975); - var1.writeStringCp1252NullCircumfixed(this.field3982); - var1.writeStringCp1252NullCircumfixed(this.field3983); + var1.writeInt(this.field3973); + var1.writeStringCp1252NullCircumfixed(this.field3979); + var1.writeStringCp1252NullCircumfixed(this.field3981); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "725870581" + garbageValue = "2077819620" ) @Export("size") public int size() { byte var1 = 39; - String var4 = this.field3980; + String var4 = this.field3976; int var3 = var4.length() + 2; int var26 = var1 + var3; - String var7 = this.field3978; + String var7 = this.field3977; int var6 = var7.length() + 2; var26 += var6; - String var10 = this.field3979; + String var10 = this.field3978; int var9 = var10.length() + 2; var26 += var9; - String var13 = this.field3981; + String var13 = this.field3975; int var12 = var13.length() + 2; var26 += var12; - String var16 = this.field3984; + String var16 = this.field3980; int var15 = var16.length() + 2; var26 += var15; - String var19 = this.field3985; + String var19 = this.field3982; int var18 = var19.length() + 2; var26 += var18; - String var22 = this.field3982; + String var22 = this.field3979; int var21 = var22.length() + 2; var26 += var21; - String var25 = this.field3983; + String var25 = this.field3981; int var24 = var25.length() + 2; var26 += var24; return var26; diff --git a/osrs/src/main/java/Player.java b/osrs/src/main/java/Player.java index b4e17f3ae..4adaa9611 100644 --- a/osrs/src/main/java/Player.java +++ b/osrs/src/main/java/Player.java @@ -3,110 +3,116 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dj") +@ObfuscatedName("ds") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("ac") + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lvf;" + descriptor = "Lvj;" ) @Export("username") Username username; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnb;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("headIconPk") int headIconPk; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("actions") String[] actions; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("combatLevel") int combatLevel; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("skillLevel") int skillLevel; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("tileHeight") int tileHeight; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("aa") - int field900; - @ObfuscatedName("ap") + @ObfuscatedName("av") + int field919; + @ObfuscatedName("ax") @Export("baseTileHeight") int baseTileHeight; - @ObfuscatedName("ay") - int field916; @ObfuscatedName("as") + int field918; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Lka;" ) @Export("attachedModel") Model attachedModel; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("minX") int minX; - @ObfuscatedName("au") + @ObfuscatedName("aj") @Export("minY") int minY; - @ObfuscatedName("ai") + @ObfuscatedName("am") @Export("maxX") int maxX; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @Export("maxY") int maxY; - @ObfuscatedName("aw") + @ObfuscatedName("ai") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("team") int team; - @ObfuscatedName("az") + @ObfuscatedName("ae") @Export("isHidden") boolean isHidden; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("plane") int plane; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("index") int index; - @ObfuscatedName("ad") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lra;" + descriptor = "Lrw;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("bn") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lra;" + descriptor = "Lrw;" ) @Export("isInFriendsChat") TriBool isInFriendsChat; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Lra;" + descriptor = "Lrw;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("hasMovementPending") boolean hasMovementPending; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("tileX") int tileX; - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("tileY") int tileY; @@ -132,10 +138,10 @@ public final class Player extends Actor { this.hasMovementPending = false; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "16" + descriptor = "(Luj;I)V", + garbageValue = "722515666" ) @Export("read") final void read(Buffer var1) { @@ -172,30 +178,30 @@ final void read(Buffer var1) { } } - int[] var26 = null; + int[] var13 = null; if (Client.param25 >= 213) { - var26 = new int[12]; + var13 = new int[12]; for (var7 = 0; var7 < 12; ++var7) { var8 = var1.readUnsignedByte(); if (var8 == 0) { - var26[var7] = 0; + var13[var7] = 0; } else { var9 = var1.readUnsignedByte(); - var26[var7] = var9 + (var8 << 8); + var13[var7] = var9 + (var8 << 8); } } } - int[] var27 = new int[5]; + int[] var14 = new int[5]; for (var8 = 0; var8 < 5; ++var8) { var9 = var1.readUnsignedByte(); - if (var9 < 0 || var9 >= class104.field1093[var8].length) { + if (var9 < 0 || var9 >= class90.field892[var8].length) { var9 = 0; } - var27[var8] = var9; + var14[var8] = var9; } super.idleSequence = var1.readUnsignedShort(); @@ -234,12 +240,12 @@ final void read(Buffer var1) { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), class166.loginType); + this.username = new Username(var1.readStringCp1252NullTerminated(), class89.loginType); this.clearIsFriend(); this.clearIsInFriendsChat(); this.clearIsInClanChat(); - if (this == TextureProvider.localPlayer) { - RunException.field4314 = this.username.getName(); + if (this == class229.localPlayer) { + class17.field53 = this.username.getName(); } this.combatLevel = var1.readUnsignedByte(); @@ -249,58 +255,18 @@ final void read(Buffer var1) { this.isHidden = false; } - ObjTypeCustomisation[] var28 = null; - boolean var30 = false; + ObjTypeCustomisation[] var15 = null; + boolean var17 = false; int var10 = var1.readUnsignedShort(); - var30 = (var10 >> 15 & 1) == 1; + var17 = (var10 >> 15 & 1) == 1; int var11; if (var10 > 0 && var10 != 32768) { - var28 = new ObjTypeCustomisation[12]; + var15 = new ObjTypeCustomisation[12]; for (var11 = 0; var11 < 12; ++var11) { int var12 = var10 >> 12 - var11 & 1; if (var12 == 1) { - int var16 = var5[var11] - 512; - int var17 = var1.readUnsignedByte(); - boolean var18 = (var17 & 1) != 0; - boolean var19 = (var17 & 2) != 0; - ObjTypeCustomisation var20 = new ObjTypeCustomisation(var16); - int var21; - int[] var22; - boolean var23; - int var24; - short var25; - if (var18) { - var21 = var1.readUnsignedByte(); - var22 = new int[]{var21 & 15, var21 >> 4 & 15}; - var23 = var20.recol != null && var22.length == var20.recol.length; - - for (var24 = 0; var24 < 2; ++var24) { - if (var22[var24] != 15) { - var25 = (short)var1.readUnsignedShort(); - if (var23) { - var20.recol[var22[var24]] = var25; - } - } - } - } - - if (var19) { - var21 = var1.readUnsignedByte(); - var22 = new int[]{var21 & 15, var21 >> 4 & 15}; - var23 = var20.retex != null && var22.length == var20.retex.length; - - for (var24 = 0; var24 < 2; ++var24) { - if (var22[var24] != 15) { - var25 = (short)var1.readUnsignedShort(); - if (var23) { - var20.retex[var22[var24]] = var25; - } - } - } - } - - var28[var11] = var20; + var15[var11] = ZoneOperation.method1631(var5[var11] - 512, var1); } } } @@ -309,26 +275,26 @@ final void read(Buffer var1) { this.actions[var11] = var1.readStringCp1252NullTerminated(); } - int var29 = var1.readUnsignedByte(); + int var16 = var1.readUnsignedByte(); if (this.appearance == null) { this.appearance = new PlayerComposition(); } - this.appearance.method1749(var26, var5, var28, var30, var27, var2, var4, var29); + this.appearance.method1745(var13, var5, var15, var17, var14, var2, var4, var16); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Ljn;", - garbageValue = "0" + descriptor = "(B)Lka;", + garbageValue = "1" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class36.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : class36.SequenceDefinition_get(super.movementSequence); + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? DynamicObject.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : DynamicObject.SequenceDefinition_get(super.movementSequence); Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -337,7 +303,7 @@ protected final Model getModel() { super.defaultHeight = var3.height; int var4 = var3.indicesCount; if (!this.isUnanimated) { - var3 = this.method520(var3); + var3 = this.method514(var3); } if (!this.isUnanimated && this.attachedModel != null) { @@ -347,7 +313,7 @@ protected final Model getModel() { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { Model var5 = this.attachedModel; - var5.offsetBy(this.field900 - super.x, this.baseTileHeight - this.tileHeight, this.field916 - super.y); + var5.offsetBy(this.field919 - super.x, this.baseTileHeight - this.tileHeight, this.field918 - super.y); if (super.orientation == 512) { var5.rotateY90Ccw(); var5.rotateY90Ccw(); @@ -372,7 +338,7 @@ protected final Model getModel() { var5.rotateY90Ccw(); } - var5.offsetBy(super.x - this.field900, this.tileHeight - this.baseTileHeight, super.y - this.field916); + var5.offsetBy(super.x - this.field919, this.tileHeight - this.baseTileHeight, super.y - this.field918); } } @@ -382,7 +348,7 @@ protected final Model getModel() { var3.overrideSaturation = super.recolourSaturation; var3.overrideLuminance = super.recolourLuminance; var3.overrideAmount = super.recolourAmount; - var3.field2255 = (short)var4; + var3.field2423 = (short)var4; } else { var3.overrideAmount = 0; } @@ -392,10 +358,10 @@ protected final Model getModel() { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1468374152" + garbageValue = "-1713250919" ) @Export("isFriend") boolean isFriend() { @@ -406,32 +372,32 @@ boolean isFriend() { return this.isFriendTriBool == TriBool.TriBool_true; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-7" + garbageValue = "-81" ) @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-16283" + descriptor = "(B)V", + garbageValue = "-14" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = InvDefinition.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriendTriBool = class12.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("ar") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "1" + garbageValue = "14" ) - boolean method493() { + boolean method485() { if (this.isInFriendsChat == TriBool.TriBool_unknown) { this.updateIsInFriendsChat(); } @@ -439,35 +405,35 @@ boolean method493() { return this.isInFriendsChat == TriBool.TriBool_true; } - @ObfuscatedName("ab") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "58" + descriptor = "(I)V", + garbageValue = "-2089631916" ) @Export("clearIsInFriendsChat") void clearIsInFriendsChat() { this.isInFriendsChat = TriBool.TriBool_unknown; } - @ObfuscatedName("am") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "180" + descriptor = "(I)V", + garbageValue = "1196848864" ) @Export("updateIsInFriendsChat") void updateIsInFriendsChat() { - this.isInFriendsChat = class358.friendsChat != null && class358.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isInFriendsChat = class20.friendsChat != null && class20.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("av") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1325607421" + descriptor = "(B)V", + garbageValue = "115" ) @Export("updateIsInClanChat") void updateIsInClanChat() { for (int var1 = 0; var1 < 4; ++var1) { - if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method813(this.username.getName()) != -1 && var1 != 2) { + if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method800(this.username.getName()) != -1 && var1 != 2) { this.isInClanChat = TriBool.TriBool_true; return; } @@ -476,20 +442,20 @@ void updateIsInClanChat() { this.isInClanChat = TriBool.TriBool_false; } - @ObfuscatedName("ag") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "62" + garbageValue = "-73" ) @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; } - @ObfuscatedName("aa") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "28" + descriptor = "(I)Z", + garbageValue = "-2021409739" ) @Export("isClanMember") boolean isClanMember() { @@ -500,35 +466,35 @@ boolean isClanMember() { return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("ap") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-149597751" + garbageValue = "2046405362" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? class190.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? VerticalAlignment.getNpcDefinition(this.appearance.npcTransformId).size : 1; } - @ObfuscatedName("ay") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IILip;I)V", - garbageValue = "877591570" + descriptor = "(IILiz;I)V", + garbageValue = "2103873992" ) @Export("move") final void move(int var1, int var2, MoveSpeed var3) { - if (super.sequence != -1 && class36.SequenceDefinition_get(super.sequence).priority == 1) { + if (super.sequence != -1 && DynamicObject.SequenceDefinition_get(super.sequence).priority == 1) { super.sequence = -1; } - this.method521(); + this.method515(); if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { if (var3 == MoveSpeed.RUN) { - class180.method933(this, var1, var2, MoveSpeed.RUN); + WorldMapCacheName.method1355(this, var1, var2, MoveSpeed.RUN); } - this.method503(var1, var2, var3); + this.method495(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -538,29 +504,29 @@ final void move(int var1, int var2, MoveSpeed var3) { } - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-57" + descriptor = "(III)V", + garbageValue = "1104771167" ) @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.field1023 = 0; - super.field1024 = 0; + super.field1029 = 0; + super.field1028 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); - super.x = var3 * 64 + super.pathX[0] * 128; + super.x = super.pathX[0] * 128 + var3 * 64; super.y = super.pathY[0] * 128 + var3 * 64; } - @ObfuscatedName("aj") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IILip;B)V", - garbageValue = "-120" + descriptor = "(IILiz;I)V", + garbageValue = "1624897043" ) - final void method503(int var1, int var2, MoveSpeed var3) { + final void method495(int var1, int var2, MoveSpeed var3) { if (super.pathLength < 9) { ++super.pathLength; } @@ -576,22 +542,52 @@ final void method503(int var1, int var2, MoveSpeed var3) { super.pathTraversed[0] = var3; } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "4" + descriptor = "(I)Z", + garbageValue = "1221291483" ) @Export("isVisible") final boolean isVisible() { return this.appearance != null; } - @ObfuscatedName("al") + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ltz;III)I", + garbageValue = "319825494" + ) + static int method478(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { + return var2; + } else { + IntegerNode var3 = (IntegerNode)var0.get((long)var1); + return var3 == null ? var2 : var3.integer; + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(IIIZII)J", + garbageValue = "211437143" + ) + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; + if (var3) { + var5 |= 65536L; + } + + return var5; + } + + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1479868908" + descriptor = "(CB)Z", + garbageValue = "2" ) - static int method488(int var0, int var1, int var2) { - return var0 << 28 | var1 << 14 | var2; + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; } } \ No newline at end of file diff --git a/osrs/src/main/java/PlayerComposition.java b/osrs/src/main/java/PlayerComposition.java index 299cc4a14..da31ff725 100644 --- a/osrs/src/main/java/PlayerComposition.java +++ b/osrs/src/main/java/PlayerComposition.java @@ -5,143 +5,137 @@ import java.util.Arrays; -@ObfuscatedName("ni") +@ObfuscatedName("nb") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("ag") - public static short[] field2940; @ObfuscatedName("as") + public static short[][] field2935; + @ObfuscatedName("ay") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("PlayerAppearance_cachedModels") - public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("ai") + static EvictingDualNodeHashTable PlayerAppearance_cachedModels; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lqe;" + descriptor = "Lqc;" ) - public static class438 field2939; - @ObfuscatedName("ae") - public static int field2937; - @ObfuscatedName("ac") + static class435 field2938; + @ObfuscatedName("ai") + static int field2936; + @ObfuscatedName("at") int[] field2944; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("equipment") int[] equipment; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("ax") - public int field2951; @ObfuscatedName("ao") - public int field2950; - @ObfuscatedName("ah") + public int field2948; + @ObfuscatedName("ab") + public int field2947; + @ObfuscatedName("au") @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("hash") long hash; - @ObfuscatedName("ab") - long field2947; - @ObfuscatedName("am") + @ObfuscatedName("ac") + long field2946; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lhy;" + descriptor = "[Lgx;" ) @Export("customisations") ObjTypeCustomisation[] customisations; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("isFemale") boolean isFemale; static { - equipmentIndices = new int[]{class223.field1868.field1879, class223.field1865.field1879, class223.field1869.field1879, class223.field1870.field1879, class223.field1871.field1879, class223.field1866.field1879, class223.field1867.field1879}; + equipmentIndices = new int[]{class205.field1813.field1824, class205.field1815.field1824, class205.field1811.field1824, class205.field1810.field1824, class205.field1816.field1824, class205.field1812.field1824, class205.field1814.field1824}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); - field2939 = new class438(16, class436.field3797); - field2937 = 0; + field2938 = new class435(16, class433.field3801); + field2936 = 0; } public PlayerComposition() { - this.field2951 = -1; - this.field2950 = 0; + this.field2948 = -1; + this.field2947 = 0; this.isFemale = false; } @ObfuscatedSignature( - descriptor = "(Lni;)V" + descriptor = "(Lnb;)V" ) PlayerComposition(PlayerComposition var1) { - this.field2951 = -1; - this.field2950 = 0; + this.field2948 = -1; + this.field2947 = 0; this.isFemale = false; int[] var2 = Arrays.copyOf(var1.equipment, var1.equipment.length); int[] var3 = Arrays.copyOf(var1.field2944, var1.field2944.length); ObjTypeCustomisation[] var4 = (ObjTypeCustomisation[])(var1.customisations != null ? (ObjTypeCustomisation[])Arrays.copyOf(var1.customisations, var1.customisations.length) : null); int[] var5 = Arrays.copyOf(var1.bodyColors, var1.bodyColors.length); - this.method1749(var3, var2, var4, false, var5, var1.field2950, var1.npcTransformId, var1.field2951); + this.method1745(var3, var2, var4, false, var5, var1.field2947, var1.npcTransformId, var1.field2948); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([I[I[Lhy;Z[IIIII)V", - garbageValue = "-106574907" + descriptor = "([I[I[Lgx;Z[IIIII)V", + garbageValue = "-712663226" ) - public void method1749(int[] var1, int[] var2, ObjTypeCustomisation[] var3, boolean var4, int[] var5, int var6, int var7, int var8) { + public void method1745(int[] var1, int[] var2, ObjTypeCustomisation[] var3, boolean var4, int[] var5, int var6, int var7, int var8) { this.customisations = var3; this.isFemale = var4; - this.field2951 = var8; - this.method1750(var1, var2, var5, var6, var7); + this.field2948 = var8; + this.method1746(var1, var2, var5, var6, var7); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "([I[I[IIIB)V", - garbageValue = "108" + garbageValue = "-107" ) - public void method1750(int[] var1, int[] var2, int[] var3, int var4, int var5) { + public void method1746(int[] var1, int[] var2, int[] var3, int var4, int var5) { if (var1 == null) { - var1 = this.method1751(var4); + var1 = this.method1747(var4); } if (var2 == null) { - var2 = this.method1751(var4); + var2 = this.method1747(var4); } this.field2944 = var1; this.equipment = var2; this.bodyColors = var3; - this.field2950 = var4; + this.field2947 = var4; this.npcTransformId = var5; this.setHash(); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(IB)[I", - garbageValue = "1" + garbageValue = "45" ) - int[] method1751(int var1) { + int[] method1747(int var1) { int[] var2 = new int[12]; for (int var3 = 0; var3 < 7; ++var3) { - for (int var4 = 0; var4 < class403.KitDefinition_fileCount; ++var4) { - KitDefinition var5 = class73.KitDefinition_get(var4); - if (var5 != null && !var5.nonSelectable && var3 + (var1 == 1 ? 7 : 0) == var5.bodypartID) { - var2[equipmentIndices[var3]] = var4 + 256; - break; - } - } + MoveSpeed.method1167(var1, var2, var3); } return var2; } - @ObfuscatedName("ax") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "-151201208" + garbageValue = "1628205152" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -154,82 +148,69 @@ public void changeAppearance(int var1, boolean var2) { if (!var2) { --var3; if (var3 < 0) { - var3 = class403.KitDefinition_fileCount - 1; + var3 = class348.KitDefinition_fileCount - 1; } } else { ++var3; - if (var3 >= class403.KitDefinition_fileCount) { + if (var3 >= class348.KitDefinition_fileCount) { var3 = 0; } } - var4 = class73.KitDefinition_get(var3); - } while(var4 == null || var4.nonSelectable || (this.field2950 == 1 ? 7 : 0) + var1 != var4.bodypartID); + var4 = class1.KitDefinition_get(var3); + } while(var4 == null || var4.nonSelectable || var4.bodypartID != var1 + (this.field2947 == 1 ? 7 : 0)); this.equipment[equipmentIndices[var1]] = var3 + 256; this.setHash(); } } - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "1880856093" + descriptor = "(IZB)V", + garbageValue = "-58" ) - public void method1753(int var1, boolean var2) { + public void method1749(int var1, boolean var2) { int var3 = this.bodyColors[var1]; - boolean var4; if (!var2) { do { --var3; if (var3 < 0) { - var3 = class104.field1093[var1].length - 1; - } - - if (var1 == 4 && var3 >= 8) { - var4 = false; - } else { - var4 = true; + var3 = class90.field892[var1].length - 1; } - } while(!var4); + } while(!class90.method473(var1, var3)); } else { do { ++var3; - if (var3 >= class104.field1093[var1].length) { + if (var3 >= class90.field892[var1].length) { var3 = 0; } - - if (var1 == 4 && var3 >= 8) { - var4 = false; - } else { - var4 = true; - } - } while(!var4); + } while(!class90.method473(var1, var3)); } this.bodyColors[var1] = var3; this.setHash(); } - @ObfuscatedName("ah") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-554597133" + garbageValue = "-530024953" ) - public void method1754(int var1) { - if (this.field2950 != var1) { - this.method1750((int[])null, (int[])null, this.bodyColors, var1, -1); + public void method1750(int var1) { + if (this.field2947 != var1) { + this.method1746((int[])null, (int[])null, this.bodyColors, var1, -1); } } - @ObfuscatedName("ar") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "28" + descriptor = "(Luj;B)V", + garbageValue = "0" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.field2950); + var1.writeByte(this.field2947); int var2; for (var2 = 0; var2 < 7; ++var2) { @@ -247,10 +228,10 @@ public void write(Buffer var1) { } - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "89" + descriptor = "(I)V", + garbageValue = "226179138" ) @Export("setHash") void setHash() { @@ -283,24 +264,24 @@ void setHash() { } this.hash <<= 1; - this.hash += (long)this.field2950; + this.hash += (long)this.field2947; this.equipment[5] = var3; this.equipment[9] = var4; - if (var1 != 0L && var1 != this.hash || this.isFemale) { + if (0L != var1 && this.hash != var1 || this.isFemale) { PlayerAppearance_cachedModels.remove(var1); } } - @ObfuscatedName("am") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lif;ILif;II)Ljn;", - garbageValue = "745471626" + descriptor = "(Lhx;ILhx;II)Lka;", + garbageValue = "1048858154" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return class190.getNpcDefinition(this.npcTransformId).method1011(var1, var2, var3, var4, (NewShit)null); + return VerticalAlignment.getNpcDefinition(this.npcTransformId).method940(var1, var2, var3, var4, (NewShit)null); } else { long var5 = this.hash; int[] var7 = this.equipment; @@ -329,18 +310,18 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 int var11; for (int var10 = 0; var10 < 12; ++var10) { var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !class73.KitDefinition_get(var11 - 256).ready()) { + if (var11 >= 256 && var11 < 512 && !class1.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !class214.ItemDefinition_get(var11 - 512).method1099(this.field2950)) { + if (var11 >= 512 && !class214.ItemDefinition_get(var11 - 512).method1022(this.field2947)) { var9 = true; } } if (var9) { - if (this.field2947 != -1L) { - var18 = (Model)PlayerAppearance_cachedModels.get(this.field2947); + if (this.field2946 != -1L) { + var18 = (Model)PlayerAppearance_cachedModels.get(this.field2946); } if (var18 == null) { @@ -356,7 +337,7 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 for (int var12 = 0; var12 < 12; ++var12) { var13 = var7[var12]; if (var13 >= 256 && var13 < 512) { - ModelData var14 = class73.KitDefinition_get(var13 - 256).getModelData(); + ModelData var14 = class1.KitDefinition_get(var13 - 256).getModelData(); if (var14 != null) { var19[var11++] = var14; } @@ -364,13 +345,13 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 if (var13 >= 512) { ItemComposition var22 = class214.ItemDefinition_get(var13 - 512); - ModelData var15 = var22.method1100(this.field2950); + ModelData var15 = var22.method1023(this.field2947); if (var15 != null) { if (this.customisations != null) { ObjTypeCustomisation var16 = this.customisations[var12]; if (var16 != null) { int var17; - if (var16.recol != null && var22.recolorFrom != null && var22.recolorTo.length == var16.recol.length) { + if (var16.recol != null && var22.recolorFrom != null && var16.recol.length == var22.recolorTo.length) { for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { var15.recolor(var22.recolorTo[var17], var16.recol[var17]); } @@ -392,18 +373,18 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 ModelData var20 = new ModelData(var19, var11); for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < class104.field1093[var13].length) { - var20.recolor(field2940[var13], class104.field1093[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < class90.field892[var13].length) { + var20.recolor(WorldMapLabelSize.field1939[var13], class90.field892[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < class33.field87[var13].length) { - var20.recolor(Coord.field2906[var13], class33.field87[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < field2935[var13].length) { + var20.recolor(class503.field4091[var13], field2935[var13][this.bodyColors[var13]]); } } var18 = var20.toModel(64, 850, -30, -50, -30); PlayerAppearance_cachedModels.put(var18, var5); - this.field2947 = var5; + this.field2946 = var5; } } @@ -422,26 +403,26 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3 } } - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)Ljw;", - garbageValue = "-578216920" + descriptor = "(I)Lkq;", + garbageValue = "-468638043" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { - return class190.getNpcDefinition(this.npcTransformId).method1012((NewShit)null); + return VerticalAlignment.getNpcDefinition(this.npcTransformId).method941((NewShit)null); } else { boolean var1 = false; int var3; for (int var2 = 0; var2 < 12; ++var2) { var3 = this.equipment[var2]; - if (var3 >= 256 && var3 < 512 && !class73.KitDefinition_get(var3 - 256).method984()) { + if (var3 >= 256 && var3 < 512 && !class1.KitDefinition_get(var3 - 256).method909()) { var1 = true; } - if (var3 >= 512 && !class214.ItemDefinition_get(var3 - 512).method1101(this.field2950)) { + if (var3 >= 512 && !class214.ItemDefinition_get(var3 - 512).method1024(this.field2947)) { var1 = true; } } @@ -457,14 +438,14 @@ ModelData getModelData() { var5 = this.equipment[var4]; ModelData var6; if (var5 >= 256 && var5 < 512) { - var6 = class73.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + var6 = class1.KitDefinition_get(var5 - 256).getKitDefinitionModels(); if (var6 != null) { var7[var3++] = var6; } } if (var5 >= 512) { - var6 = class214.ItemDefinition_get(var5 - 512).method1102(this.field2950); + var6 = class214.ItemDefinition_get(var5 - 512).method1025(this.field2947); if (var6 != null) { var7[var3++] = var6; } @@ -474,12 +455,12 @@ ModelData getModelData() { ModelData var8 = new ModelData(var7, var3); for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < class104.field1093[var5].length) { - var8.recolor(field2940[var5], class104.field1093[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < class90.field892[var5].length) { + var8.recolor(WorldMapLabelSize.field1939[var5], class90.field892[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < class33.field87[var5].length) { - var8.recolor(Coord.field2906[var5], class33.field87[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < field2935[var5].length) { + var8.recolor(class503.field4091[var5], field2935[var5][this.bodyColors[var5]]); } } @@ -488,10 +469,10 @@ ModelData getModelData() { } } - @ObfuscatedName("ag") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1292206549" + garbageValue = "-1257035370" ) @Export("getChatHeadId") public int getChatHeadId() { @@ -500,70 +481,423 @@ public int getChatHeadId() { var1 = -65536L | (long)this.npcTransformId; } - Integer var3 = (Integer)field2939.method2216(var1); + Integer var3 = (Integer)field2938.method2196(var1); if (var3 == null) { - var3 = ++field2937 - 1; - field2939.method2217(var1, var3); - field2937 %= 65535; + var3 = ++field2936 - 1; + field2938.method2197(var1, var3); + field2936 %= 65535; } return var3; } - @ObfuscatedName("aa") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-1823719371" ) - void method1760() { - this.method1750(this.field2944, this.equipment, this.bodyColors, this.field2950, this.npcTransformId); + void method1756() { + this.method1746(this.field2944, this.equipment, this.bodyColors, this.field2947, this.npcTransformId); } - @ObfuscatedName("ac") + @ObfuscatedName("jp") @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "20" + descriptor = "(IIIIB)V", + garbageValue = "21" ) - static final int method1748(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; - } + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; + class92.method499(); + class320.method1708(); + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + AccessFile.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + } - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "63" - ) - static int method1761(int var0, Script var1, boolean var2) { - if (var0 == 5306) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class178.getWindowedMode(); - return 1; + class18.addNpcsToScene(true); + int var4 = Players.Players_count; + int[] var5 = Players.Players_indices; + + int var6; + for (var6 = 0; var6 < var4; ++var6) { + if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { + AccessFile.addPlayerToScene(Client.players[var5[var6]], true); + } + } + + class18.addNpcsToScene(false); + class327.method1726(); + + for (GraphicsObject var36 = (GraphicsObject)Client.graphicsObjects.last(); var36 != null; var36 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var36.plane == ItemLayer.Client_plane && !var36.isFinished) { + if (Client.cycle >= var36.cycleStart) { + var36.advance(Client.field460); + if (var36.isFinished) { + var36.remove(); + } else { + class36.scene.drawEntity(var36.plane, var36.x, var36.y, var36.z, 60, var36, 0, -1L, false); + } + } + } else { + var36.remove(); + } + } + + class348.setViewportShape(var0, var1, var2, var3, true); + var0 = Client.viewportOffsetX; + var1 = Client.viewportOffsetY; + var2 = Client.viewportWidth; + var3 = Client.viewportHeight; + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + Rasterizer3D.method1427(); + Rasterizer2D.method2660(); + var4 = Client.camAngleX; + if (Client.field473 / 256 > var4) { + var4 = Client.field473 / 256; + } + + if (Client.cameraShaking[4] && Client.cameraMoveIntensity[4] + 128 > var4) { + var4 = Client.cameraMoveIntensity[4] + 128; + } + + int var37 = Client.camAngleY & 2047; + var6 = LoginScreenAnimation.oculusOrbFocalPointX; + int var7 = class12.field41; + int var8 = ScriptFrame.oculusOrbFocalPointY; + int var9 = class158.method832(var4); + var9 = class395.method2041(var9, var3); + int var10 = 2048 - var4 & 2047; + int var11 = 2048 - var37 & 2047; + int var12 = 0; + int var13 = 0; + int var14 = var9; + int var15; + int var16; + int var17; + if (var10 != 0) { + var15 = Rasterizer3D.Rasterizer3D_sine[var10]; + var16 = Rasterizer3D.Rasterizer3D_cosine[var10]; + var17 = var16 * var13 - var9 * var15 >> 16; + var14 = var16 * var9 + var15 * var13 >> 16; + var13 = var17; + } + + if (var11 != 0) { + var15 = Rasterizer3D.Rasterizer3D_sine[var11]; + var16 = Rasterizer3D.Rasterizer3D_cosine[var11]; + var17 = var16 * var12 + var14 * var15 >> 16; + var14 = var16 * var14 - var12 * var15 >> 16; + var12 = var17; + } + + if (Client.isCameraLocked) { + FloorOverlayDefinition.field1772 = var6 - var12; + class323.field2851 = var7 - var13; + Projectile.field783 = var8 - var14; + class127.field1224 = var4; + CollisionMap.field1901 = var37; } else { - int var3; - if (var0 == 5307) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - NPCComposition.setWindowedMode(var3); - } - - return 1; - } else if (var0 == 5308) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class91.clientPreferences.method562(); - return 1; - } else if (var0 != 5309) { - if (var0 == 5310) { - --Interpreter.Interpreter_intStackSize; - return 1; + ViewportMouse.cameraX = var6 - var12; + SecureRandomFuture.cameraY = var7 - var13; + class36.cameraZ = var8 - var14; + Varcs.cameraPitch = var4; + class192.cameraYaw = var37; + } + + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (LoginScreenAnimation.oculusOrbFocalPointX >> 7 != class229.localPlayer.x >> 7 || ScriptFrame.oculusOrbFocalPointY >> 7 != class229.localPlayer.y >> 7)) { + var15 = class229.localPlayer.plane; + var16 = (LoginScreenAnimation.oculusOrbFocalPointX >> 7) + NewShit.baseX; + var17 = (ScriptFrame.oculusOrbFocalPointY >> 7) + class101.baseY; + PacketBufferNode var18 = class113.getPacketBufferNode(ClientPacket.f20, Client.packetWriter.isaacCipher); + var18.packetBuffer.writeInt(Client.field367); + var18.packetBuffer.writeIntME(var16); + var18.packetBuffer.writeIntME(var17); + var18.packetBuffer.writeByte(var15); + Client.packetWriter.addNode(var18); + } + + if (!Client.isCameraLocked) { + var10 = ZoneOperation.method1634(); + } else { + if (WorldMapIcon_1.clientPreferences.getRoofsHidden()) { + var11 = ItemLayer.Client_plane; + } else { + var12 = WorldMapDecorationType.getTileHeight(ViewportMouse.cameraX, class36.cameraZ, ItemLayer.Client_plane); + if (var12 - SecureRandomFuture.cameraY < 800 && (Tiles.Tiles_renderFlags[ItemLayer.Client_plane][ViewportMouse.cameraX >> 7][class36.cameraZ >> 7] & 4) != 0) { + var11 = ItemLayer.Client_plane; } else { - return 2; + var11 = 3; + } + } + + var10 = var11; + } + + var11 = ViewportMouse.cameraX; + var12 = SecureRandomFuture.cameraY; + var13 = class36.cameraZ; + var14 = Varcs.cameraPitch; + var15 = class192.cameraYaw; + + for (var16 = 0; var16 < 5; ++var16) { + if (Client.cameraShaking[var16]) { + var17 = (int)(Math.random() * (double)(Client.cameraShakeIntensity[var16] * 2 + 1) - (double)Client.cameraShakeIntensity[var16] + Math.sin((double)Client.field589[var16] * ((double)Client.cameraShakeSpeed[var16] / 100.0D)) * (double)Client.cameraMoveIntensity[var16]); + if (var16 == 0) { + ViewportMouse.cameraX += var17; + } + + if (var16 == 1) { + SecureRandomFuture.cameraY += var17; + } + + if (var16 == 2) { + class36.cameraZ += var17; + } + + if (var16 == 3) { + class192.cameraYaw = var17 + class192.cameraYaw & 2047; + } + + if (var16 == 4) { + Varcs.cameraPitch += var17; + if (Varcs.cameraPitch < 128) { + Varcs.cameraPitch = 128; + } + + if (Varcs.cameraPitch > 383) { + Varcs.cameraPitch = 383; + } + } + } + } + + var16 = MouseHandler.MouseHandler_x; + var17 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var16 = MouseHandler.MouseHandler_lastPressedX; + var17 = MouseHandler.MouseHandler_lastPressedY; + } + + if (var16 >= var0 && var16 < var0 + var2 && var17 >= var1 && var17 < var3 + var1) { + class301.method1625(var16 - var0, var17 - var1); + } else { + class410.method2139(); + } + + class102.method604(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + class102.method604(); + int var38 = Rasterizer3D.get3dZoom(); + Rasterizer3D.method1413(SpriteMask.client.field122); + Rasterizer3D.clips.field2458 = Client.viewportZoom; + class36.scene.draw(ViewportMouse.cameraX, SecureRandomFuture.cameraY, class36.cameraZ, Varcs.cameraPitch, class192.cameraYaw, var10); + Rasterizer3D.method1413(false); + if (Client.renderSelf) { + Rasterizer2D.method2661(); + } + + Rasterizer3D.clips.field2458 = var38; + class102.method604(); + class36.scene.clearTempGameObjects(); + Client.overheadTextLimit = 0; + boolean var19 = false; + int var20 = -1; + int var21 = -1; + int var22 = Players.Players_count; + int[] var23 = Players.Players_indices; + + int var24; + for (var24 = 0; var24 < var22 + Client.npcCount; ++var24) { + Object var25; + if (var24 < var22) { + var25 = Client.players[var23[var24]]; + if (var23[var24] == Client.combatTargetPlayerIndex) { + var19 = true; + var20 = var24; + continue; + } + + if (var25 == class229.localPlayer) { + var21 = var24; + continue; } } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - class91.clientPreferences.method561(var3); + var25 = Client.npcs[Client.npcIndices[var24 - var22]]; + } + + class171.drawActor2d((Actor)var25, var24, var0, var1, var2, var3); + } + + if (Client.field387 && var21 != -1) { + class171.drawActor2d(class229.localPlayer, var21, var0, var1, var2, var3); + } + + if (var19) { + class171.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var20, var0, var1, var2, var3); + } + + for (var24 = 0; var24 < Client.overheadTextLimit; ++var24) { + int var39 = Client.overheadTextXs[var24]; + int var26 = Client.overheadTextYs[var24]; + int var27 = Client.overheadTextXOffsets[var24]; + int var28 = Client.overheadTextAscents[var24]; + boolean var29 = true; + + while (var29) { + var29 = false; + + for (int var30 = 0; var30 < var24; ++var30) { + if (var26 + 2 > Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] && var26 - var28 < Client.overheadTextYs[var30] + 2 && var39 - var27 < Client.overheadTextXOffsets[var30] + Client.overheadTextXs[var30] && var27 + var39 > Client.overheadTextXs[var30] - Client.overheadTextXOffsets[var30] && Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] < var26) { + var26 = Client.overheadTextYs[var30] - Client.overheadTextAscents[var30]; + var29 = true; + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var24]; + Client.viewportTempY = Client.overheadTextYs[var24] = var26; + String var40 = Client.field601[var24]; + if (Client.chatEffects == 0) { + int var31 = 16776960; + if (Client.overheadTextColors[var24] < 6) { + var31 = Client.field578[Client.overheadTextColors[var24]]; + } + + if (Client.overheadTextColors[var24] == 6) { + var31 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var24] == 7) { + var31 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var24] == 8) { + var31 = Client.viewportDrawCount % 20 < 10 ? '\ub000' : 8454016; + } + + int var32; + if (Client.overheadTextColors[var24] == 9) { + var32 = 150 - Client.overheadTextCyclesRemaining[var24]; + if (var32 < 50) { + var31 = var32 * 1280 + 16711680; + } else if (var32 < 100) { + var31 = 16776960 - (var32 - 50) * 327680; + } else if (var32 < 150) { + var31 = (var32 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var24] == 10) { + var32 = 150 - Client.overheadTextCyclesRemaining[var24]; + if (var32 < 50) { + var31 = var32 * 5 + 16711680; + } else if (var32 < 100) { + var31 = 16711935 - (var32 - 50) * 327680; + } else if (var32 < 150) { + var31 = (var32 - 100) * 327680 + 255 - (var32 - 100) * 5; + } + } + + if (Client.overheadTextColors[var24] == 11) { + var32 = 150 - Client.overheadTextCyclesRemaining[var24]; + if (var32 < 50) { + var31 = 16777215 - var32 * 327685; + } else if (var32 < 100) { + var31 = (var32 - 50) * 327685 + 65280; + } else if (var32 < 150) { + var31 = 16777215 - (var32 - 100) * 327680; + } + } + + int var33; + if (Client.overheadTextColors[var24] == 12 && Client.field594[var24] == null) { + var32 = var40.length(); + Client.field594[var24] = new int[var32]; + + for (var33 = 0; var33 < var32; ++var33) { + int var34 = (int)((float)var33 / (float)var32 * 64.0F); + int var35 = var34 << 10 | 896 | 64; + Client.field594[var24][var33] = class478.field3940[var35]; + } + } + + if (Client.overheadTextEffects[var24] == 0) { + GrandExchangeOfferTotalQuantityComparator.fontBold12.method2116(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.field594[var24]); + } + + if (Client.overheadTextEffects[var24] == 1) { + GrandExchangeOfferTotalQuantityComparator.fontBold12.method2113(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.viewportDrawCount, Client.field594[var24]); + } + + if (Client.overheadTextEffects[var24] == 2) { + GrandExchangeOfferTotalQuantityComparator.fontBold12.method2114(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.viewportDrawCount, Client.field594[var24]); + } + + if (Client.overheadTextEffects[var24] == 3) { + GrandExchangeOfferTotalQuantityComparator.fontBold12.method2115(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var31, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var24], Client.field594[var24]); + } + + if (Client.overheadTextEffects[var24] == 4) { + var32 = (150 - Client.overheadTextCyclesRemaining[var24]) * (GrandExchangeOfferTotalQuantityComparator.fontBold12.stringWidth(var40) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + GrandExchangeOfferTotalQuantityComparator.fontBold12.method2117(var40, var0 + Client.viewportTempX + 50 - var32, Client.viewportTempY + var1, var31, 0, Client.field594[var24]); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); } - return 1; + if (Client.overheadTextEffects[var24] == 5) { + var32 = 150 - Client.overheadTextCyclesRemaining[var24]; + var33 = 0; + if (var32 < 25) { + var33 = var32 - 25; + } else if (var32 > 125) { + var33 = var32 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - GrandExchangeOfferTotalQuantityComparator.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + GrandExchangeOfferTotalQuantityComparator.fontBold12.method2116(var40, var0 + Client.viewportTempX, var33 + Client.viewportTempY + var1, var31, 0, Client.field594[var24]); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + } else { + GrandExchangeOfferTotalQuantityComparator.fontBold12.drawCentered(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); } } + + if (Client.hintArrowType == 2) { + class514.worldToScreen((Client.hintArrowX - NewShit.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class101.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + class60.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).animate(Client.field460); + Client.field479 = 0; + int var41 = (class229.localPlayer.x >> 7) + NewShit.baseX; + var20 = (class229.localPlayer.y >> 7) + class101.baseY; + if (var41 >= 3053 && var41 <= 3156 && var20 >= 3056 && var20 <= 3136) { + Client.field479 = 1; + } + + if (var41 >= 3072 && var41 <= 3118 && var20 >= 9492 && var20 <= 9535) { + Client.field479 = 1; + } + + if (Client.field479 == 1 && var41 >= 3139 && var41 <= 3199 && var20 >= 3008 && var20 <= 3062) { + Client.field479 = 0; + } + + ViewportMouse.cameraX = var11; + SecureRandomFuture.cameraY = var12; + class36.cameraZ = var13; + Varcs.cameraPitch = var14; + class192.cameraYaw = var15; + if (Client.isLoading && WorldMapSectionType.field2038.method1961(true, false) == 0) { + Client.isLoading = false; + } + + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + LoginPacket.drawLoadingMessage("Loading - please wait.", false); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/PlayerType.java b/osrs/src/main/java/PlayerType.java index 66c5e3fa4..7353105e6 100644 --- a/osrs/src/main/java/PlayerType.java +++ b/osrs/src/main/java/PlayerType.java @@ -3,108 +3,108 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ol") +@ObfuscatedName("oc") @Implements("PlayerType") -public enum PlayerType implements class386 { - @ObfuscatedName("ac") +public enum PlayerType implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3529(6, 22, false, false, true), - @ObfuscatedName("ab") + field3513(6, 22, false, false, true), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3518(7, 41, false, false, true), - @ObfuscatedName("am") + field3515(7, 41, false, false, true), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3525(8, 42, false, false, true), - @ObfuscatedName("av") + field3519(8, 42, false, false, true), + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3531(9, 43, false, false, true), - @ObfuscatedName("ag") + field3529(9, 43, false, false, true), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3520(10, 44, false, false, true), - @ObfuscatedName("aa") + field3521(10, 44, false, false, true), + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3517(11, 45, false, false, true), - @ObfuscatedName("ap") + field3526(11, 45, false, false, true), + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3528(12, 46, false, false, true), - @ObfuscatedName("ay") + field3527(12, 46, false, false, true), + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3533(13, 47, false, false, true), - @ObfuscatedName("as") + field3523(13, 47, false, false, true), + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3530(14, 48, false, false, true), - @ObfuscatedName("aj") + field3528(14, 48, false, false, true), + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3522(15, 49, false, false, true), - @ObfuscatedName("an") + field3518(15, 49, false, false, true), + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Loc;" ) - field3526(16, 52, false, false, true); + field3517(16, 52, false, false, true); - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("id") final int id; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("modIcon") public final int modIcon; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("isPrivileged") public final boolean isPrivileged; @ObfuscatedName("aw") @@ -118,31 +118,98 @@ public enum PlayerType implements class386 { this.isUser = var7; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1861309020" - ) - public static void method1912() { - DbTableType.DBTableType_cache.clear(); - } - - @ObfuscatedName("jk") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Ldi;II)V", - garbageValue = "-1410811311" - ) - static final void method1913(Actor var0, int var1) { - class150.worldToScreen(var0.x, var0.y, var1); + descriptor = "(IIII)D", + garbageValue = "-2021333271" + ) + static double method1907(int var0, int var1, int var2) { + double var3 = var1 > 0 ? (double)Math.max(0.0F, Math.min(1.0F, (float)var0 / (float)var1)) : 1.0D; + if (var3 > 0.0D && var3 < 1.0D) { + double var5; + double var7; + switch(var2) { + case 0: + return var3; + case 1: + return 1.0D - Math.cos(3.141592653589793D * var3 / 2.0D); + case 2: + return Math.sin(var3 * 3.141592653589793D / 2.0D); + case 3: + return -(Math.cos(3.141592653589793D * var3) - 1.0D) / 2.0D; + case 4: + return var3 * var3; + case 5: + return 1.0D - (1.0D - var3) * (1.0D - var3); + case 6: + return var3 < 0.5D ? 2.0D * var3 * var3 : 1.0D - Math.pow(var3 * -2.0D + 2.0D, 2.0D) / 2.0D; + case 7: + return var3 * var3 * var3; + case 8: + return 1.0D - Math.pow(1.0D - var3, 3.0D); + case 9: + return var3 < 0.5D ? var3 * 4.0D * var3 * var3 : 1.0D - Math.pow(2.0D + -2.0D * var3, 3.0D) / 2.0D; + case 10: + return var3 * var3 * var3 * var3; + case 11: + return 1.0D - Math.pow(1.0D - var3, 4.0D); + case 12: + return var3 < 0.5D ? var3 * var3 * var3 * 8.0D * var3 : 1.0D - Math.pow(2.0D + -2.0D * var3, 4.0D) / 2.0D; + case 13: + return var3 * var3 * var3 * var3 * var3; + case 14: + return 1.0D - Math.pow(1.0D - var3, 5.0D); + case 15: + return var3 < 0.5D ? var3 * var3 * var3 * 8.0D * var3 * var3 : 1.0D - Math.pow(var3 * -2.0D + 2.0D, 5.0D) / 2.0D; + case 16: + return Math.pow(2.0D, 10.0D * var3 - 10.0D); + case 17: + return 1.0D - Math.pow(2.0D, -10.0D * var3); + case 18: + return var3 < 0.5D ? Math.pow(2.0D, 10.0D + var3 * 20.0D) / 2.0D : (2.0D - Math.pow(2.0D, var3 * -20.0D + 10.0D)) / 2.0D; + case 19: + return 1.0D - Math.sqrt(1.0D - Math.pow(var3, 2.0D)); + case 20: + return Math.sqrt(1.0D - Math.pow(var3 - 1.0D, 2.0D)); + case 21: + return var3 < 0.5D ? (1.0D - Math.sqrt(1.0D - Math.pow(var3 * 2.0D, 2.0D))) / 2.0D : (Math.sqrt(1.0D - Math.pow(-2.0D * var3 + 2.0D, 2.0D)) + 1.0D) / 2.0D; + case 22: + var5 = 1.70158D; + var7 = 2.70158D; + return var3 * var3 * 2.70158D * var3 - 1.70158D * var3 * var3; + case 23: + var5 = 1.70158D; + var7 = 2.70158D; + return 1.0D + 2.70158D * Math.pow(var3 - 1.0D, 3.0D) + 1.70158D * Math.pow(var3 - 1.0D, 2.0D); + case 24: + var5 = 1.70158D; + var7 = 2.5949095D; + return var3 < 0.5D ? Math.pow(var3 * 2.0D, 2.0D) * (7.189819D * var3 - 2.5949095D) / 2.0D : (Math.pow(var3 * 2.0D - 2.0D, 2.0D) * (3.5949095D * (2.0D * var3 - 2.0D) + 2.5949095D) + 2.0D) / 2.0D; + case 25: + var5 = 2.0943951023931953D; + return -Math.pow(2.0D, var3 * 10.0D - 10.0D) * Math.sin(2.0943951023931953D * (10.0D * var3 - 10.75D)); + case 26: + var5 = 2.0943951023931953D; + return Math.pow(2.0D, -10.0D * var3) * Math.sin((var3 * 10.0D - 0.75D) * 2.0943951023931953D) + 1.0D; + case 27: + var5 = 1.3962634015954636D; + var7 = Math.sin((20.0D * var3 - 11.125D) * 1.3962634015954636D); + return var3 < 0.5D ? -(Math.pow(2.0D, var3 * 20.0D - 10.0D) * var7) / 2.0D : Math.pow(2.0D, 10.0D + -20.0D * var3) * var7 / 2.0D + 1.0D; + default: + return var3; + } + } else { + return var3 <= 0.0D ? 0.0D : 1.0D; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/Players.java b/osrs/src/main/java/Players.java index 5f91d577a..71396b9a1 100644 --- a/osrs/src/main/java/Players.java +++ b/osrs/src/main/java/Players.java @@ -3,56 +3,62 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +@ObfuscatedName("ev") @Implements("Players") public class Players { - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("activityFlags") static byte[] activityFlags; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "[Lip;" + descriptor = "[Liz;" ) @Export("playerMovementSpeeds") static MoveSpeed[] playerMovementSpeeds; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Lul;" + descriptor = "[Luj;" ) @Export("cachedAppearanceBuffer") static Buffer[] cachedAppearanceBuffer; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("Players_count") static int Players_count; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("as") + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Luj;" + ) + static Buffer field1126; + @ObfuscatedName("re") @ObfuscatedSignature( - descriptor = "Lul;" + descriptor = "Ltl;" ) - static Buffer field1119; + @Export("Widget_cachedFonts") + static class509 Widget_cachedFonts; static { activityFlags = new byte[2048]; @@ -67,31 +73,104 @@ public class Players { Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1119 = new Buffer(new byte[5000]); + field1126 = new Buffer(new byte[5000]); } - @ObfuscatedName("ac") - public static final void method623(long var0) { - if (var0 > 0L) { - if (0L == var0 % 10L) { - long var2 = var0 - 1L; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Luo;I)V", + garbageValue = "-823798047" + ) + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = class229.localPlayer = Client.players[var1] = new Player(); + var2.index = var1; + int var3 = var0.readBits(30); + byte var4 = (byte)(var3 >> 28); + int var5 = var3 >> 14 & 16383; + int var6 = var3 & 16383; + var2.pathX[0] = var5 - NewShit.baseX; + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); + var2.pathY[0] = var6 - class101.baseY; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + ItemLayer.Client_plane = var2.plane = var4; + if (cachedAppearanceBuffer[var1] != null) { + var2.read(cachedAppearanceBuffer[var1]); + } + + Players_count = 0; + Players_indices[++Players_count - 1] = var1; + activityFlags[var1] = 0; + Players_emptyIdxCount = 0; + + for (int var7 = 1; var7 < 2048; ++var7) { + if (var1 != var7) { + int var8 = var0.readBits(18); + int var9 = var8 >> 16; + int var10 = var8 >> 8 & 597; + int var11 = var8 & 597; + Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); + Players_orientations[var7] = 0; + Players_targetIndices[var7] = -1; + Players_emptyIndices[++Players_emptyIdxCount - 1] = var7; + activityFlags[var7] = 0; + } + } + + var0.exportIndex(); + } - try { - Thread.sleep(var2); - } catch (InterruptedException var8) { + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lol;Ljava/lang/String;Ljava/lang/String;I)[Luz;", + garbageValue = "-669885727" + ) + public static SpritePixels[] method620(AbstractArchive var0, String var1, String var2) { + if (!var0.isValidFileName(var1, var2)) { + return null; + } else { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + return VertexNormal.method1568(var0, var3, var4); + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(IIZI)Ljava/lang/String;", + garbageValue = "-1100853766" + ) + static String method619(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + if (var2 && var0 >= 0) { + int var3 = 2; + + for (int var4 = var0 / var1; var4 != 0; ++var3) { + var4 /= var1; } - try { - Thread.sleep(1L); - } catch (InterruptedException var7) { + char[] var5 = new char[var3]; + var5[0] = '+'; + + for (int var6 = var3 - 1; var6 > 0; --var6) { + int var7 = var0; + var0 /= var1; + int var8 = var7 - var0 * var1; + if (var8 >= 10) { + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); + } } + + return new String(var5); } else { - try { - Thread.sleep(var0); - } catch (InterruptedException var6) { - } + return Integer.toString(var0, var1); } - + } else { + throw new IllegalArgumentException("" + var1); } } } \ No newline at end of file diff --git a/osrs/src/main/java/PrivateChatMode.java b/osrs/src/main/java/PrivateChatMode.java index 93ab4b5fa..1678b50af 100644 --- a/osrs/src/main/java/PrivateChatMode.java +++ b/osrs/src/main/java/PrivateChatMode.java @@ -3,32 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("va") +@ObfuscatedName("un") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lva;" + descriptor = "Lun;" ) - static final PrivateChatMode field4299; - @ObfuscatedName("al") + static final PrivateChatMode field4305; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lva;" + descriptor = "Lun;" ) - public static final PrivateChatMode field4298; - @ObfuscatedName("ak") + public static final PrivateChatMode field4303; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lva;" + descriptor = "Lun;" ) - static final PrivateChatMode field4300; - @ObfuscatedName("ax") + static final PrivateChatMode field4304; + @ObfuscatedName("ao") @Export("id") public final int id; static { - field4299 = new PrivateChatMode(0); - field4298 = new PrivateChatMode(1); - field4300 = new PrivateChatMode(2); + field4305 = new PrivateChatMode(0); + field4303 = new PrivateChatMode(1); + field4304 = new PrivateChatMode(2); } PrivateChatMode(int var1) { diff --git a/osrs/src/main/java/Projectile.java b/osrs/src/main/java/Projectile.java index c2cfea43d..06306ed6c 100644 --- a/osrs/src/main/java/Projectile.java +++ b/osrs/src/main/java/Projectile.java @@ -3,92 +3,94 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("ck") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("ac") + @ObfuscatedName("vl") + static int field783; + @ObfuscatedName("at") @Export("id") int id; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("plane") int plane; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("sourceX") int sourceX; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("sourceY") int sourceY; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("sourceZ") int sourceZ; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("endHeight") int endHeight; - @ObfuscatedName("ar") + @ObfuscatedName("aa") + int field794; + @ObfuscatedName("ac") + int field796; + @ObfuscatedName("al") int field800; - @ObfuscatedName("ab") - int field789; - @ObfuscatedName("am") - int field797; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("cycleStart") int cycleStart; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("slope") int slope; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("startHeight") int startHeight; - @ObfuscatedName("ay") - int field804; @ObfuscatedName("as") + int field804; + @ObfuscatedName("ay") @Export("targetIndex") int targetIndex; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("isMoving") boolean isMoving; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("x") double x; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("y") double y; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("z") double z; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("speedY") double speedY; @ObfuscatedName("aw") @Export("speedX") double speedX; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("speed") double speed; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("speedZ") double speedZ; - @ObfuscatedName("at") - double field783; - @ObfuscatedName("af") + @ObfuscatedName("ag") + double field786; + @ObfuscatedName("ad") @Export("yaw") int yaw; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("pitch") int pitch; - @ObfuscatedName("bn") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lif;" + descriptor = "Lhx;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("frame") int frame; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("frameCycle") int frameCycle; @@ -108,9 +110,9 @@ public final class Projectile extends Renderable { this.targetIndex = var10; this.endHeight = var11; this.isMoving = false; - int var12 = class406.SpotAnimationDefinition_get(this.id).sequence; + int var12 = Canvas.SpotAnimationDefinition_get(this.id).sequence; if (var12 != -1) { - this.sequenceDefinition = class36.SequenceDefinition_get(var12); + this.sequenceDefinition = DynamicObject.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; } @@ -122,45 +124,45 @@ public final class Projectile extends Renderable { this.field804 = var10; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "715135572" + garbageValue = "34043964" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { - this.field800 = var1; - this.field789 = var2; - this.field797 = var3; + this.field794 = var1; + this.field796 = var2; + this.field800 = var3; double var5; if (!this.isMoving) { - var5 = (double)(this.field800 - this.sourceX); - double var7 = (double)(this.field789 - this.sourceY); - double var9 = Math.sqrt(var5 * var5 + var7 * var7); - this.x = var5 * (double)this.startHeight / var9 + (double)this.sourceX; - this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; + var5 = (double)(this.field794 - this.sourceX); + double var7 = (double)(this.field796 - this.sourceY); + double var9 = Math.sqrt(var7 * var7 + var5 * var5); + this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; + this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; this.z = (double)this.sourceZ; } var5 = (double)(this.cycleEnd + 1 - var4); - this.speedY = ((double)this.field800 - this.x) / var5; - this.speedX = ((double)this.field789 - this.y) / var5; + this.speedY = ((double)this.field794 - this.x) / var5; + this.speedX = ((double)this.field796 - this.y) / var5; this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); if (!this.isMoving) { - this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); + this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.field783 = ((double)this.field797 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); + this.field786 = 2.0D * ((double)this.field800 - this.z - this.speedZ * var5) / (var5 * var5); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Ljn;", - garbageValue = "0" + descriptor = "(B)Lka;", + garbageValue = "1" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = class406.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = Canvas.SpotAnimationDefinition_get(this.id); Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; @@ -170,18 +172,18 @@ protected final Model getModel() { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-952040923" + garbageValue = "-1019112167" ) @Export("advance") final void advance(int var1) { this.isMoving = true; this.x += (double)var1 * this.speedY; this.y += (double)var1 * this.speedX; - this.z += (double)var1 * this.field783 * 0.5D * (double)var1 + (double)var1 * this.speedZ; - this.speedZ += (double)var1 * this.field783; + this.z += (double)var1 * this.speedZ + (double)var1 * (double)var1 * 0.5D * this.field786; + this.speedZ += this.field786 * (double)var1; this.yaw = (int)(Math.atan2(this.speedY, this.speedX) * 325.949D) + 1024 & 2047; this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; if (this.sequenceDefinition != null) { @@ -206,7 +208,7 @@ final void advance(int var1) { } } else { this.frame += var1; - int var2 = this.sequenceDefinition.method1127(); + int var2 = this.sequenceDefinition.method1052(); if (this.frame >= var2) { this.frame = var2 - this.sequenceDefinition.frameCount; } @@ -215,292 +217,161 @@ final void advance(int var1) { } - @ObfuscatedName("ac") + @ObfuscatedName("jm") @ObfuscatedSignature( - descriptor = "(Lom;Lom;ZLpu;I)V", - garbageValue = "1662908547" + descriptor = "(I)Z", + garbageValue = "-1070521773" ) - public static void method436(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - class317.ItemDefinition_archive = var0; - class349.ItemDefinition_modelArchive = var1; - HealthBarUpdate.ItemDefinition_inMembersWorld = var2; - class284.ItemDefinition_fileCount = class317.ItemDefinition_archive.getGroupFileCount(10); - class142.ItemDefinition_fontPlain11 = var3; + static boolean method442() { + return (Client.drawPlayerNames & 8) != 0; } - @ObfuscatedName("bp") + @ObfuscatedName("mp") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-1524962913" + descriptor = "(II)V", + garbageValue = "2039275921" ) - static int method439(int var0, Script var1, boolean var2) { - if (var0 == 5000) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } else if (var0 == 5001) { - Interpreter.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - Canvas.privateChatMode = UserComparator9.method679(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - if (Canvas.privateChatMode == null) { - Canvas.privateChatMode = PrivateChatMode.field4298; + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + class396.method2042(); + class159.method834(); + int var1 = FloorOverlayDefinition.VarpDefinition_get(var0).type; + if (var1 != 0) { + int var2 = Varps.Varps_main[var0]; + if (var1 == 1) { + if (var2 == 1) { + Rasterizer3D.method1415(0.9D); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.9D); + class166.method866(); + WorldMapIcon_1.clientPreferences.setBrightness(0.9D); + } + + if (var2 == 2) { + Rasterizer3D.method1415(0.8D); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.8D); + class166.method866(); + WorldMapIcon_1.clientPreferences.setBrightness(0.8D); + } + + if (var2 == 3) { + Rasterizer3D.method1415(0.7D); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.7D); + class166.method866(); + WorldMapIcon_1.clientPreferences.setBrightness(0.7D); + } + + if (var2 == 4) { + Rasterizer3D.method1415(0.6D); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness(0.6D); + class166.method866(); + WorldMapIcon_1.clientPreferences.setBrightness(0.6D); + } } - Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - PacketBufferNode var11 = ClanChannelMember.getPacketBufferNode(ClientPacket.CHAT_SETFILTER, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeByte(Client.publicChatMode); - var11.packetBuffer.writeByte(Canvas.privateChatMode.id); - var11.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var11); - return 1; - } else { - String var3; - int var4; - int var5; - PacketBufferNode var6; - if (var0 == 5002) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var6 = ClanChannelMember.getPacketBufferNode(ClientPacket.CHAT_SEND_ABUSE_REPORT, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var3) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var3); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.addNode(var6); - return 1; - } else { - int var7; - Message var8; - if (var0 == 5003) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var8 = SoundCache.Messages_getByChannelAndID(var7, var4); - if (var8 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.count; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.cycle; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - Message var9; - if (var0 == 5004) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var9 = WorldMapRegion.Messages_getMessage(var7); - if (var9 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.type; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.cycle; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 5005) { - if (Canvas.privateChatMode == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.privateChatMode.id; - } - - return 1; - } else { - PacketBufferNode var12; - if (var0 == 5008) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = class160.method842(var4, var3, WorldMapLabelSize.clientLanguage, -1); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == 5009) { - class180.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; - String var13 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; - var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.CHAT_SENDPRIVATE, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(0); - int var10 = var12.packetBuffer.offset; - var12.packetBuffer.writeStringCp1252NullTerminated(var3); - class150.method785(var12.packetBuffer, var13); - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == 5010) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var6 = class160.method842(var4, var3, WorldMapLabelSize.clientLanguage, var5); - Client.packetWriter.addNode(var6); - return 1; - } else if (var0 != 5015) { - if (var0 == 5016) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } else if (var0 == 5017) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferNameComparator.Messages_getHistorySize(var7); - return 1; - } else if (var0 == 5018) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UrlRequest.Messages_getLastChatID(var7); - return 1; - } else if (var0 == 5019) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.method475(var7); - return 1; - } else if (var0 == 5020) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - class163.doCheat(var3); - return 1; - } else if (var0 == 5021) { - Client.field601 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == 5022) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = Client.field601; - return 1; - } else if (var0 == 5023) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else if (var0 == 5030) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var8 = SoundCache.Messages_getByChannelAndID(var7, var4); - if (var8 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.count; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.cycle; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 5031) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var9 = WorldMapRegion.Messages_getMessage(var7); - if (var9 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.type; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.cycle; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - if (TextureProvider.localPlayer != null && TextureProvider.localPlayer.username != null) { - var3 = TextureProvider.localPlayer.username.getName(); - } else { - var3 = ""; - } + if (var1 == 3) { + if (var2 == 0) { + Decimator.method323(255); + } + + if (var2 == 1) { + Decimator.method323(192); + } + + if (var2 == 2) { + Decimator.method323(128); + } - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3; - return 1; - } - } + if (var2 == 3) { + Decimator.method323(64); + } + + if (var2 == 4) { + Decimator.method323(0); } } - } - } - @ObfuscatedName("if") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1050765779" - ) - static final void method438(int var0, int var1) { - if (var0 < 128) { - var0 = 128; - } else if (var0 > 383) { - var0 = 383; - } + if (var1 == 4) { + if (var2 == 0) { + SoundSystem.method235(127); + } + + if (var2 == 1) { + SoundSystem.method235(96); + } + + if (var2 == 2) { + SoundSystem.method235(64); + } + + if (var2 == 3) { + SoundSystem.method235(32); + } + + if (var2 == 4) { + SoundSystem.method235(0); + } + } - if (class365.cameraPitch < var0) { - class365.cameraPitch = (var0 - class365.cameraPitch) * class465.cameraLookAtAcceleration / 1000 + class365.cameraPitch + class232.cameraLookAtSpeed; - if (class365.cameraPitch > var0) { - class365.cameraPitch = var0; + if (var1 == 5) { + Client.leftClickOpensMenu = var2 == 1; } - } else if (class365.cameraPitch > var0) { - class365.cameraPitch -= (class365.cameraPitch - var0) * class465.cameraLookAtAcceleration / 1000 + class232.cameraLookAtSpeed; - if (class365.cameraPitch < var0) { - class365.cameraPitch = var0; + + if (var1 == 6) { + Client.chatEffects = var2; } - } - var1 &= 2047; - int var2 = var1 - WallDecoration.cameraYaw; - if (var2 > 1024) { - var2 -= 2048; - } else if (var2 < -1024) { - var2 += 2048; - } + if (var1 == 9) { + } - if (var2 > 0) { - WallDecoration.cameraYaw = WallDecoration.cameraYaw + class232.cameraLookAtSpeed + var2 * class465.cameraLookAtAcceleration / 1000; - WallDecoration.cameraYaw &= 2047; - } else if (var2 < 0) { - WallDecoration.cameraYaw -= -var2 * class465.cameraLookAtAcceleration / 1000 + class232.cameraLookAtSpeed; - WallDecoration.cameraYaw &= 2047; - } + if (var1 == 10) { + if (var2 == 0) { + Login.method438(127); + } - int var3 = var1 - WallDecoration.cameraYaw; - if (var3 > 1024) { - var3 -= 2048; - } else if (var3 < -1024) { - var3 += 2048; - } + if (var2 == 1) { + Login.method438(96); + } - if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { - WallDecoration.cameraYaw = var1; - } + if (var2 == 2) { + Login.method438(64); + } + + if (var2 == 3) { + Login.method438(32); + } + + if (var2 == 4) { + Login.method438(0); + } + } + + if (var1 == 17) { + Client.followerIndex = var2 & 65535; + } + if (var1 == 18) { + Client.playerAttackOption = (AttackOption)class12.findEnumerated(MenuAction.method436(), var2); + if (Client.playerAttackOption == null) { + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var1 == 19) { + if (var2 == -1) { + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; + } + } + + if (var1 == 22) { + AttackOption[] var3 = new AttackOption[]{AttackOption.field1103, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.field1106}; + Client.npcAttackOption = (AttackOption)class12.findEnumerated(var3, var2); + if (Client.npcAttackOption == null) { + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } } } \ No newline at end of file diff --git a/osrs/src/main/java/RasterProvider.java b/osrs/src/main/java/RasterProvider.java index ffaba9956..fd2b74785 100644 --- a/osrs/src/main/java/RasterProvider.java +++ b/osrs/src/main/java/RasterProvider.java @@ -7,13 +7,13 @@ import java.awt.image.*; import java.util.Hashtable; -@ObfuscatedName("ba") +@ObfuscatedName("bg") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("component") Component component; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("image") Image image; @@ -22,7 +22,7 @@ public final class RasterProvider extends AbstractRasterProvider { super.height = var2; super.pixels = new int[var2 * var1 + 1]; if (var4) { - super.field4252 = new float[var2 * var1 + 1]; + super.field4253 = new float[var2 * var1 + 1]; } DataBufferInt var5 = new DataBufferInt(super.pixels, super.pixels.length); @@ -33,40 +33,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-2046056671" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "22" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-237304267" + descriptor = "(IIB)V", + garbageValue = "-24" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(IIIIB)V", - garbageValue = "-3" + garbageValue = "1" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;III)V", - garbageValue = "-887938586" + garbageValue = "-321512657" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -78,10 +78,10 @@ final void drawFull0(Graphics var1, int var2, int var3) { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "1460118678" + descriptor = "(Ljava/awt/Graphics;IIIIB)V", + garbageValue = "58" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { diff --git a/osrs/src/main/java/Rasterizer2D.java b/osrs/src/main/java/Rasterizer2D.java index efefc707d..b98f00f5a 100644 --- a/osrs/src/main/java/Rasterizer2D.java +++ b/osrs/src/main/java/Rasterizer2D.java @@ -3,30 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uc") +@ObfuscatedName("uw") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("bn") - public static float[] field4244; - @ObfuscatedName("by") + @ObfuscatedName("be") + public static float[] field4245; + @ObfuscatedName("bl") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -40,16 +40,16 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } - @ObfuscatedName("dr") - protected static void method2659(int[] var0, int var1, int var2, float[] var3) { + @ObfuscatedName("eh") + protected static void method2637(int[] var0, int var1, int var2, float[] var3) { Rasterizer2D_pixels = var0; Rasterizer2D_width = var1; Rasterizer2D_height = var2; - field4244 = var3; + field4245 = var3; Rasterizer2D_setClip(0, 0, var1, var2); } - @ObfuscatedName("dw") + @ObfuscatedName("ei") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; @@ -58,7 +58,7 @@ public static void Rasterizer2D_resetClip() { Rasterizer2D_yClipEnd = Rasterizer2D_height; } - @ObfuscatedName("di") + @ObfuscatedName("et") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { @@ -83,7 +83,7 @@ public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) Rasterizer2D_yClipEnd = var3; } - @ObfuscatedName("dt") + @ObfuscatedName("er") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { @@ -104,7 +104,7 @@ public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var } - @ObfuscatedName("dd") + @ObfuscatedName("ez") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; @@ -113,7 +113,7 @@ public static void Rasterizer2D_getClipArray(int[] var0) { var0[3] = Rasterizer2D_yClipEnd; } - @ObfuscatedName("dy") + @ObfuscatedName("eu") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; @@ -122,7 +122,7 @@ public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_yClipEnd = var0[3]; } - @ObfuscatedName("db") + @ObfuscatedName("eg") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; @@ -141,10 +141,10 @@ public static void Rasterizer2D_clear() { for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { } - method2682(); + method2660(); } - @ObfuscatedName("dc") + @ObfuscatedName("ey") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { @@ -239,7 +239,7 @@ static void drawCircle(int var0, int var1, int var2, int var3) { } } - @ObfuscatedName("da") + @ObfuscatedName("eb") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { @@ -352,7 +352,7 @@ public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, in } } - @ObfuscatedName("eo") + @ObfuscatedName("ed") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { @@ -390,7 +390,7 @@ public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, } - @ObfuscatedName("em") + @ObfuscatedName("eq") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { @@ -424,7 +424,7 @@ public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int } - @ObfuscatedName("el") + @ObfuscatedName("ee") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { @@ -468,7 +468,7 @@ public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int va } } - @ObfuscatedName("ec") + @ObfuscatedName("ej") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var2 > 0 && var3 > 0) { @@ -526,7 +526,7 @@ public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, i } } - @ObfuscatedName("eg") + @ObfuscatedName("ep") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" @@ -607,7 +607,7 @@ public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, } } - @ObfuscatedName("ei") + @ObfuscatedName("fq") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); @@ -616,7 +616,7 @@ public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); } - @ObfuscatedName("ex") + @ObfuscatedName("fe") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); @@ -628,8 +628,7 @@ public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, } - @ObfuscatedName("ek") - @Export("Rasterizer2D_drawHorizontalLine") + @ObfuscatedName("ff") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { if (var0 < Rasterizer2D_xClipStart) { @@ -650,7 +649,7 @@ public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, } } - @ObfuscatedName("er") + @ObfuscatedName("fb") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -680,8 +679,7 @@ static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, i } } - @ObfuscatedName("ez") - @Export("Rasterizer2D_drawVerticalLine") + @ObfuscatedName("fr") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { if (var1 < Rasterizer2D_yClipStart) { @@ -702,7 +700,7 @@ public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, i } } - @ObfuscatedName("en") + @ObfuscatedName("fi") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -733,7 +731,7 @@ static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int } } - @ObfuscatedName("es") + @ObfuscatedName("fo") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; @@ -815,7 +813,7 @@ public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, } } - @ObfuscatedName("eq") + @ObfuscatedName("fw") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { @@ -823,7 +821,7 @@ static void Rasterizer2D_setPixel(int var0, int var1, int var2) { } } - @ObfuscatedName("ej") + @ObfuscatedName("fj") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; @@ -840,28 +838,28 @@ public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2 } - @ObfuscatedName("et") - public static void method2682() { - if (field4244 != null) { + @ObfuscatedName("fh") + public static void method2660() { + if (field4245 != null) { int var0; int var1; int var2; if (Rasterizer2D_xClipStart == 0 && Rasterizer2D_xClipEnd == Rasterizer2D_width && Rasterizer2D_yClipStart == 0 && Rasterizer2D_yClipEnd == Rasterizer2D_height) { - var0 = field4244.length; + var0 = field4245.length; var1 = var0 - (var0 & 7); - for (var2 = 0; var2 < var1; field4244[var2++] = 0.0F) { - field4244[var2++] = 0.0F; - field4244[var2++] = 0.0F; - field4244[var2++] = 0.0F; - field4244[var2++] = 0.0F; - field4244[var2++] = 0.0F; - field4244[var2++] = 0.0F; - field4244[var2++] = 0.0F; + for (var2 = 0; var2 < var1; field4245[var2++] = 0.0F) { + field4245[var2++] = 0.0F; + field4245[var2++] = 0.0F; + field4245[var2++] = 0.0F; + field4245[var2++] = 0.0F; + field4245[var2++] = 0.0F; + field4245[var2++] = 0.0F; + field4245[var2++] = 0.0F; } while (var2 < var0) { - field4244[var2++] = 0.0F; + field4245[var2++] = 0.0F; } } else { var0 = Rasterizer2D_xClipEnd - Rasterizer2D_xClipStart; @@ -879,21 +877,21 @@ public static void method2682() { do { ++var0; - field4244[var0] = 0.0F; + field4245[var0] = 0.0F; ++var0; - field4244[var0] = 0.0F; + field4245[var0] = 0.0F; ++var0; - field4244[var0] = 0.0F; + field4245[var0] = 0.0F; ++var0; - field4244[var0] = 0.0F; + field4245[var0] = 0.0F; ++var0; - field4244[var0] = 0.0F; + field4245[var0] = 0.0F; ++var0; - field4244[var0] = 0.0F; + field4245[var0] = 0.0F; ++var0; - field4244[var0] = 0.0F; + field4245[var0] = 0.0F; ++var0; - field4244[var0] = 0.0F; + field4245[var0] = 0.0F; --var6; } while(var6 > 0); } @@ -903,7 +901,7 @@ public static void method2682() { do { ++var0; - field4244[var0] = 0.0F; + field4245[var0] = 0.0F; --var6; } while(var6 > 0); } @@ -915,17 +913,17 @@ public static void method2682() { } } - @ObfuscatedName("eh") - public static void method2683() { - if (field4244 != null) { - int var0 = field4244.length; + @ObfuscatedName("fg") + public static void method2661() { + if (field4245 != null) { + int var0 = field4245.length; for (int var1 = 0; var1 < var0; ++var1) { - if (var1 % Rasterizer2D_width < Rasterizer2D_width / 2 && field4244[var1] > 0.0F) { - float var3 = field4244[var1]; + if (var1 % Rasterizer2D_width < Rasterizer2D_width / 2 && field4245[var1] > 0.0F) { + float var3 = field4245[var1]; float var4 = 75.0F; float var5 = 10000.0F; - float var6 = 750000.0F / (10000.0F - var3 * 9925.0F); + float var6 = 750000.0F / (10000.0F - 9925.0F * var3); float var2 = (var6 - 75.0F) / 9925.0F; int var7 = (int)(255.0F * var2); Rasterizer2D_pixels[var1] = var7 << 16 | var7 << 8 | var7; diff --git a/osrs/src/main/java/Rasterizer3D.java b/osrs/src/main/java/Rasterizer3D.java index dd30e74be..a15b185eb 100644 --- a/osrs/src/main/java/Rasterizer3D.java +++ b/osrs/src/main/java/Rasterizer3D.java @@ -3,58 +3,58 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("ki") @Implements("Rasterizer3D") public class Rasterizer3D { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("al") - static int[] field2048; - @ObfuscatedName("ak") - static int[] field2047; - @ObfuscatedName("ax") + @ObfuscatedName("ah") + static int[] field2218; + @ObfuscatedName("ar") + static int[] field2219; + @ObfuscatedName("ao") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lkh;" ) @Export("clips") public static Clips clips; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Ljj;" + descriptor = "Lkn;" ) - static class242 field2049; - @ObfuscatedName("ab") + static class268 field2220; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ljj;" + descriptor = "Lkn;" ) - static final class242 field2050; - @ObfuscatedName("am") + static final class268 field2221; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ljj;" + descriptor = "Lkn;" ) - static final class242 field2051; + static final class268 field2222; static { Rasterizer3D_colorPalette = new int[65536]; - field2048 = new int[512]; - field2047 = new int[2048]; + field2218 = new int[512]; + field2219 = new int[2048]; Rasterizer3D_sine = new int[2048]; Rasterizer3D_cosine = new int[2048]; int var0; for (var0 = 1; var0 < 512; ++var0) { - field2048[var0] = 32768 / var0; + field2218[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { - field2047[var0] = 65536 / var0; + field2219[var0] = 65536 / var0; } for (var0 = 0; var0 < 2048; ++var0) { @@ -63,35 +63,35 @@ public class Rasterizer3D { } clips = new Clips(); - field2050 = new class257(clips); - field2051 = new class259(clips); - field2049 = field2050; + field2221 = new class283(clips); + field2222 = new class285(clips); + field2220 = field2221; } - @ObfuscatedName("ac") - public static void method1234(boolean var0) { - if (var0 && Rasterizer2D.field4244 != null) { - field2049 = field2051; + @ObfuscatedName("at") + public static void method1413(boolean var0) { + if (var0 && Rasterizer2D.field4245 != null) { + field2220 = field2222; } else { - field2049 = field2050; + field2220 = field2221; } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lkg;)V" + descriptor = "(Llw;)V" ) - public static void method1235(TextureLoader var0) { + public static void method1414(TextureLoader var0) { clips.Rasterizer3D_textureLoader = var0; } - @ObfuscatedName("ak") - public static void method1236(double var0) { + @ObfuscatedName("ar") + public static void method1415(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("Rasterizer3D_buildPalette") static void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; @@ -170,7 +170,7 @@ static void Rasterizer3D_buildPalette(double var0, int var2, int var3) { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; @@ -185,128 +185,128 @@ static int Rasterizer3D_brighten(int var0, double var1) { return var11 + (var10 << 8) + (var9 << 16); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("getClipMidX") static int getClipMidX() { - return clips.field2284; + return clips.field2454; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("getClipMidY") static int getClipMidY() { - return clips.field2287; + return clips.field2453; } - @ObfuscatedName("ab") - static int method1241() { + @ObfuscatedName("ac") + static int method1420() { return clips.clipNegativeMidX; } - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("getClipMidX2") static int getClipMidX2() { - return clips.field2286; + return clips.field2450; } - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("getClipMidY2") static int getClipMidY2() { - return clips.field2279; + return clips.field2447; } - @ObfuscatedName("ag") - static int method1244() { + @ObfuscatedName("ap") + static int method1423() { return clips.clipNegativeMidY; } - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("get3dZoom") public static int get3dZoom() { - return clips.field2290; + return clips.field2458; } - @ObfuscatedName("ap") - static int method1246() { - return clips.field2285; + @ObfuscatedName("ax") + static int method1425() { + return clips.field2455; } - @ObfuscatedName("ay") - public static void method1247(int[] var0, int var1, int var2, float[] var3) { - if (var3 == null && field2049 == field2051) { - field2049 = field2050; + @ObfuscatedName("as") + public static void method1426(int[] var0, int var1, int var2, float[] var3) { + if (var3 == null && field2220 == field2222) { + field2220 = field2221; } - field2049.method1266(var0, var1, var2, var3); + field2220.method1445(var0, var1, var2, var3); } - @ObfuscatedName("as") - public static void method1248() { - method1249(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); + @ObfuscatedName("ay") + public static void method1427() { + method1428(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } - @ObfuscatedName("aj") - static void method1249(int var0, int var1, int var2, int var3) { - clips.field2285 = var2 - var0; - clips.field2281 = var3 - var1; - method1250(); - if (clips.Rasterizer3D_rowOffsets.length < clips.field2281) { - clips.Rasterizer3D_rowOffsets = new int[EnumComposition.method999(clips.field2281)]; + @ObfuscatedName("ak") + static void method1428(int var0, int var1, int var2, int var3) { + clips.field2455 = var2 - var0; + clips.field2449 = var3 - var1; + method1429(); + if (clips.Rasterizer3D_rowOffsets.length < clips.field2449) { + clips.Rasterizer3D_rowOffsets = new int[class184.method927(clips.field2449)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; - for (int var5 = 0; var5 < clips.field2281; ++var5) { + for (int var5 = 0; var5 < clips.field2449; ++var5) { clips.Rasterizer3D_rowOffsets[var5] = var4; var4 += Rasterizer2D.Rasterizer2D_width; } } - @ObfuscatedName("an") - public static void method1250() { - clips.method1400(); + @ObfuscatedName("aj") + public static void method1429() { + clips.method1578(); } - @ObfuscatedName("au") - public static void method1251(int var0, int var1) { + @ObfuscatedName("am") + public static void method1430(int var0, int var1) { int var2 = clips.Rasterizer3D_rowOffsets[0]; int var3 = var2 / Rasterizer2D.Rasterizer2D_width; int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; - clips.method1401(var0, var4, var1, var3); + clips.method1579(var0, var4, var1, var3); } - @ObfuscatedName("ai") - public static void method1252(int var0, int var1, int var2) { - clips.method1402(var0, var1, var2); + @ObfuscatedName("aq") + public static void method1431(int var0, int var1, int var2) { + clips.method1580(var0, var1, var2); } - @ObfuscatedName("ae") - static void method1253(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11) { - field2049.vmethod1374(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11); + @ObfuscatedName("ai") + static void method1432(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11) { + field2220.vmethod1374(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11); } @ObfuscatedName("aw") - public static void method1254(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9) { - field2049.vmethod1366(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9); + public static void method1433(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9) { + field2220.vmethod1366(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9); } - @ObfuscatedName("aq") - static void method1255(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { - field2049.vmethod1378(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); + @ObfuscatedName("ae") + static void method1434(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { + field2220.vmethod1378(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); } - @ObfuscatedName("az") - static void method1256(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { - field2049.vmethod1362(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); + @ObfuscatedName("an") + static void method1435(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21) { + field2220.vmethod1362(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20, var21); } - @ObfuscatedName("at") - static void method1257(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, byte var12, byte var13, byte var14, byte var15) { - field2049.method1269(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15); + @ObfuscatedName("ag") + static void method1436(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, int var10, int var11, byte var12, byte var13, byte var14, byte var15) { + field2220.method1448(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15); } - @ObfuscatedName("af") - static void method1258(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, byte var10, byte var11, byte var12, byte var13) { - field2049.method1270(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); + @ObfuscatedName("ad") + static void method1437(int var0, int var1, int var2, int var3, int var4, int var5, float var6, float var7, float var8, int var9, byte var10, byte var11, byte var12, byte var13) { + field2220.method1449(var0, var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12, var13); } } \ No newline at end of file diff --git a/osrs/src/main/java/RawPcmStream.java b/osrs/src/main/java/RawPcmStream.java index 95a6f1b20..d2f9efe95 100644 --- a/osrs/src/main/java/RawPcmStream.java +++ b/osrs/src/main/java/RawPcmStream.java @@ -3,108 +3,108 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bx") +@ObfuscatedName("bb") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("ac") - int field233; - @ObfuscatedName("al") + @ObfuscatedName("at") int field236; - @ObfuscatedName("ak") - int field235; - @ObfuscatedName("ax") - int field243; - @ObfuscatedName("ao") - int field238; @ObfuscatedName("ah") - int field234; + int field231; @ObfuscatedName("ar") - int field240; + int field234; + @ObfuscatedName("ao") + int field233; @ObfuscatedName("ab") + int field229; + @ObfuscatedName("au") + int field237; + @ObfuscatedName("aa") + int field228; + @ObfuscatedName("ac") @Export("numLoops") int numLoops; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("start") int start; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("end") int end; - @ObfuscatedName("ag") - boolean field230; - @ObfuscatedName("aa") - int field231; @ObfuscatedName("ap") + boolean field227; + @ObfuscatedName("av") + int field238; + @ObfuscatedName("ax") int field239; - @ObfuscatedName("ay") - int field244; @ObfuscatedName("as") - int field241; + int field235; + @ObfuscatedName("ay") + int field240; @ObfuscatedSignature( - descriptor = "(Lbs;III)V" + descriptor = "(Lbt;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field230 = var1.field166; - this.field236 = var2; - this.field235 = var3; - this.field243 = var4; - this.field233 = 0; - this.method245(); + this.field227 = var1.field165; + this.field231 = var2; + this.field234 = var3; + this.field233 = var4; + this.field236 = 0; + this.method250(); } @ObfuscatedSignature( - descriptor = "(Lbs;II)V" + descriptor = "(Lbt;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field230 = var1.field166; - this.field236 = var2; - this.field235 = var3; - this.field243 = 8192; - this.field233 = 0; - this.method245(); + this.field227 = var1.field165; + this.field231 = var2; + this.field234 = var3; + this.field233 = 8192; + this.field236 = 0; + this.method250(); } - @ObfuscatedName("ao") - void method245() { - this.field238 = this.field235; - this.field234 = method240(this.field235, this.field243); - this.field240 = method241(this.field235, this.field243); + @ObfuscatedName("ab") + void method250() { + this.field229 = this.field234; + this.field237 = method245(this.field234, this.field233); + this.field228 = method246(this.field234, this.field233); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbk;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "()Lbi;" + descriptor = "()Lbk;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("vmethod5648") protected int vmethod5648() { - return this.field235 == 0 && this.field231 == 0 ? 0 : 1; + return this.field234 == 0 && this.field238 == 0 ? 0 : 1; } - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field235 == 0 && this.field231 == 0) { + if (this.field234 == 0 && this.field238 == 0) { this.skip(var3); } else { RawSound var4 = (RawSound)super.sound; @@ -118,163 +118,163 @@ public synchronized void fill(int[] var1, int var2, int var3) { int var9 = var2; var3 += var2; - if (this.field233 < 0) { - if (this.field236 <= 0) { - this.method254(); + if (this.field236 < 0) { + if (this.field231 <= 0) { + this.method259(); this.remove(); return; } - this.field233 = 0; + this.field236 = 0; } - if (this.field233 >= var7) { - if (this.field236 >= 0) { - this.method254(); + if (this.field236 >= var7) { + if (this.field231 >= 0) { + this.method259(); this.remove(); return; } - this.field233 = var7 - 1; + this.field236 = var7 - 1; } if (this.numLoops < 0) { - if (this.field230) { - if (this.field236 < 0) { - var9 = this.method268(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field233 >= var5) { + if (this.field227) { + if (this.field231 < 0) { + var9 = this.method273(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field236 >= var5) { return; } - this.field233 = var5 + var5 - 1 - this.field233; - this.field236 = -this.field236; + this.field236 = var5 + var5 - 1 - this.field236; + this.field231 = -this.field231; } while (true) { - var9 = this.method267(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field233 < var6) { + var9 = this.method272(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field236 < var6) { return; } - this.field233 = var6 + var6 - 1 - this.field233; - this.field236 = -this.field236; - var9 = this.method268(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field233 >= var5) { + this.field236 = var6 + var6 - 1 - this.field236; + this.field231 = -this.field231; + var9 = this.method273(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field236 >= var5) { return; } - this.field233 = var5 + var5 - 1 - this.field233; - this.field236 = -this.field236; + this.field236 = var5 + var5 - 1 - this.field236; + this.field231 = -this.field231; } - } else if (this.field236 < 0) { + } else if (this.field231 < 0) { while (true) { - var9 = this.method268(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field233 >= var5) { + var9 = this.method273(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field236 >= var5) { return; } - this.field233 = var6 - 1 - (var6 - 1 - this.field233) % var8; + this.field236 = var6 - 1 - (var6 - 1 - this.field236) % var8; } } else { while (true) { - var9 = this.method267(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field233 < var6) { + var9 = this.method272(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field236 < var6) { return; } - this.field233 = var5 + (this.field233 - var5) % var8; + this.field236 = var5 + (this.field236 - var5) % var8; } } } else { if (this.numLoops > 0) { - if (this.field230) { + if (this.field227) { label133: { - if (this.field236 < 0) { - var9 = this.method268(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field233 >= var5) { + if (this.field231 < 0) { + var9 = this.method273(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field236 >= var5) { return; } - this.field233 = var5 + var5 - 1 - this.field233; - this.field236 = -this.field236; + this.field236 = var5 + var5 - 1 - this.field236; + this.field231 = -this.field231; if (--this.numLoops == 0) { break label133; } } do { - var9 = this.method267(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field233 < var6) { + var9 = this.method272(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field236 < var6) { return; } - this.field233 = var6 + var6 - 1 - this.field233; - this.field236 = -this.field236; + this.field236 = var6 + var6 - 1 - this.field236; + this.field231 = -this.field231; if (--this.numLoops == 0) { break; } - var9 = this.method268(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field233 >= var5) { + var9 = this.method273(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field236 >= var5) { return; } - this.field233 = var5 + var5 - 1 - this.field233; - this.field236 = -this.field236; + this.field236 = var5 + var5 - 1 - this.field236; + this.field231 = -this.field231; } while(--this.numLoops != 0); } } else { int var10; - if (this.field236 < 0) { + if (this.field231 < 0) { while (true) { - var9 = this.method268(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field233 >= var5) { + var9 = this.method273(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field236 >= var5) { return; } - var10 = (var6 - 1 - this.field233) / var8; + var10 = (var6 - 1 - this.field236) / var8; if (var10 >= this.numLoops) { - this.field233 += var8 * this.numLoops; + this.field236 += var8 * this.numLoops; this.numLoops = 0; break; } - this.field233 += var8 * var10; + this.field236 += var8 * var10; this.numLoops -= var10; } } else { while (true) { - var9 = this.method267(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field233 < var6) { + var9 = this.method272(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field236 < var6) { return; } - var10 = (this.field233 - var5) / var8; + var10 = (this.field236 - var5) / var8; if (var10 >= this.numLoops) { - this.field233 -= var8 * this.numLoops; + this.field236 -= var8 * this.numLoops; this.numLoops = 0; break; } - this.field233 -= var8 * var10; + this.field236 -= var8 * var10; this.numLoops -= var10; } } } } - if (this.field236 < 0) { - this.method268(var1, var9, 0, var3, 0); - if (this.field233 < 0) { - this.field233 = -1; - this.method254(); + if (this.field231 < 0) { + this.method273(var1, var9, 0, var3, 0); + if (this.field236 < 0) { + this.field236 = -1; + this.method259(); this.remove(); } } else { - this.method267(var1, var9, var7, var3, 0); - if (this.field233 >= var7) { - this.field233 = var7; - this.method254(); + this.method272(var1, var9, var7, var3, 0); + if (this.field236 >= var7) { + this.field236 = var7; + this.method259(); this.remove(); } } @@ -283,33 +283,33 @@ public synchronized void fill(int[] var1, int var2, int var3) { } } - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("skip") public synchronized void skip(int var1) { - if (this.field231 > 0) { - if (var1 >= this.field231) { - if (this.field235 == Integer.MIN_VALUE) { - this.field235 = 0; - this.field240 = 0; + if (this.field238 > 0) { + if (var1 >= this.field238) { + if (this.field234 == Integer.MIN_VALUE) { this.field234 = 0; - this.field238 = 0; + this.field228 = 0; + this.field237 = 0; + this.field229 = 0; this.remove(); - var1 = this.field231; + var1 = this.field238; } - this.field231 = 0; - this.method245(); + this.field238 = 0; + this.method250(); } else { - this.field238 += this.field239 * var1; - this.field234 += this.field244 * var1; - this.field240 += this.field241 * var1; - this.field231 -= var1; + this.field229 += this.field239 * var1; + this.field237 += this.field235 * var1; + this.field228 += this.field240 * var1; + this.field238 -= var1; } } @@ -322,130 +322,130 @@ public synchronized void skip(int var1) { this.numLoops = 0; } - if (this.field233 < 0) { - if (this.field236 <= 0) { - this.method254(); + if (this.field236 < 0) { + if (this.field231 <= 0) { + this.method259(); this.remove(); return; } - this.field233 = 0; + this.field236 = 0; } - if (this.field233 >= var5) { - if (this.field236 >= 0) { - this.method254(); + if (this.field236 >= var5) { + if (this.field231 >= 0) { + this.method259(); this.remove(); return; } - this.field233 = var5 - 1; + this.field236 = var5 - 1; } - this.field233 += this.field236 * var1; + this.field236 += this.field231 * var1; if (this.numLoops < 0) { - if (!this.field230) { - if (this.field236 < 0) { - if (this.field233 >= var3) { + if (!this.field227) { + if (this.field231 < 0) { + if (this.field236 >= var3) { return; } - this.field233 = var4 - 1 - (var4 - 1 - this.field233) % var6; + this.field236 = var4 - 1 - (var4 - 1 - this.field236) % var6; } else { - if (this.field233 < var4) { + if (this.field236 < var4) { return; } - this.field233 = var3 + (this.field233 - var3) % var6; + this.field236 = var3 + (this.field236 - var3) % var6; } } else { - if (this.field236 < 0) { - if (this.field233 >= var3) { + if (this.field231 < 0) { + if (this.field236 >= var3) { return; } - this.field233 = var3 + var3 - 1 - this.field233; - this.field236 = -this.field236; + this.field236 = var3 + var3 - 1 - this.field236; + this.field231 = -this.field231; } - while (this.field233 >= var4) { - this.field233 = var4 + var4 - 1 - this.field233; - this.field236 = -this.field236; - if (this.field233 >= var3) { + while (this.field236 >= var4) { + this.field236 = var4 + var4 - 1 - this.field236; + this.field231 = -this.field231; + if (this.field236 >= var3) { return; } - this.field233 = var3 + var3 - 1 - this.field233; - this.field236 = -this.field236; + this.field236 = var3 + var3 - 1 - this.field236; + this.field231 = -this.field231; } } } else { if (this.numLoops > 0) { - if (this.field230) { + if (this.field227) { label121: { - if (this.field236 < 0) { - if (this.field233 >= var3) { + if (this.field231 < 0) { + if (this.field236 >= var3) { return; } - this.field233 = var3 + var3 - 1 - this.field233; - this.field236 = -this.field236; + this.field236 = var3 + var3 - 1 - this.field236; + this.field231 = -this.field231; if (--this.numLoops == 0) { break label121; } } do { - if (this.field233 < var4) { + if (this.field236 < var4) { return; } - this.field233 = var4 + var4 - 1 - this.field233; - this.field236 = -this.field236; + this.field236 = var4 + var4 - 1 - this.field236; + this.field231 = -this.field231; if (--this.numLoops == 0) { break; } - if (this.field233 >= var3) { + if (this.field236 >= var3) { return; } - this.field233 = var3 + var3 - 1 - this.field233; - this.field236 = -this.field236; + this.field236 = var3 + var3 - 1 - this.field236; + this.field231 = -this.field231; } while(--this.numLoops != 0); } } else { label153: { int var7; - if (this.field236 < 0) { - if (this.field233 >= var3) { + if (this.field231 < 0) { + if (this.field236 >= var3) { return; } - var7 = (var4 - 1 - this.field233) / var6; + var7 = (var4 - 1 - this.field236) / var6; if (var7 >= this.numLoops) { - this.field233 += var6 * this.numLoops; + this.field236 += var6 * this.numLoops; this.numLoops = 0; break label153; } - this.field233 += var6 * var7; + this.field236 += var6 * var7; this.numLoops -= var7; } else { - if (this.field233 < var4) { + if (this.field236 < var4) { return; } - var7 = (this.field233 - var3) / var6; + var7 = (this.field236 - var3) / var6; if (var7 >= this.numLoops) { - this.field233 -= var6 * this.numLoops; + this.field236 -= var6 * this.numLoops; this.numLoops = 0; break label153; } - this.field233 -= var6 * var7; + this.field236 -= var6 * var7; this.numLoops -= var7; } @@ -454,51 +454,51 @@ public synchronized void skip(int var1) { } } - if (this.field236 < 0) { - if (this.field233 < 0) { - this.field233 = -1; - this.method254(); + if (this.field231 < 0) { + if (this.field236 < 0) { + this.field236 = -1; + this.method259(); this.remove(); } - } else if (this.field233 >= var5) { - this.field233 = var5; - this.method254(); + } else if (this.field236 >= var5) { + this.field236 = var5; + this.method259(); this.remove(); } } } - @ObfuscatedName("aa") - public synchronized void method247(int var1) { - this.method249(var1 << 6, this.method251()); + @ObfuscatedName("av") + public synchronized void method252(int var1) { + this.method254(var1 << 6, this.method256()); } - @ObfuscatedName("ap") - synchronized void method248(int var1) { - this.method249(var1, this.method251()); + @ObfuscatedName("ax") + synchronized void method253(int var1) { + this.method254(var1, this.method256()); } - @ObfuscatedName("ay") - synchronized void method249(int var1, int var2) { - this.field235 = var1; - this.field243 = var2; - this.field231 = 0; - this.method245(); + @ObfuscatedName("as") + synchronized void method254(int var1, int var2) { + this.field234 = var1; + this.field233 = var2; + this.field238 = 0; + this.method250(); } - @ObfuscatedName("as") - public synchronized int method250() { - return this.field235 == Integer.MIN_VALUE ? 0 : this.field235; + @ObfuscatedName("ay") + public synchronized int method255() { + return this.field234 == Integer.MIN_VALUE ? 0 : this.field234; } - @ObfuscatedName("aj") - public synchronized int method251() { - return this.field243 < 0 ? -1 : this.field243; + @ObfuscatedName("ak") + public synchronized int method256() { + return this.field233 < 0 ? -1 : this.field233; } - @ObfuscatedName("an") - public synchronized void method252(int var1) { + @ObfuscatedName("aj") + public synchronized void method257(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if (var1 < -1) { var1 = -1; @@ -508,268 +508,254 @@ public synchronized void method252(int var1) { var1 = var2; } - this.field233 = var1; + this.field236 = var1; } - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method253() { - this.field236 = (this.field236 ^ this.field236 >> 31) + (this.field236 >>> 31); - this.field236 = -this.field236; + public synchronized void method258() { + this.field231 = (this.field231 ^ this.field231 >> 31) + (this.field231 >>> 31); + this.field231 = -this.field231; } - @ObfuscatedName("ai") - void method254() { - if (this.field231 != 0) { - if (this.field235 == Integer.MIN_VALUE) { - this.field235 = 0; + @ObfuscatedName("aq") + void method259() { + if (this.field238 != 0) { + if (this.field234 == Integer.MIN_VALUE) { + this.field234 = 0; } - this.field231 = 0; - this.method245(); + this.field238 = 0; + this.method250(); } } - @ObfuscatedName("ae") - public synchronized void method255(int var1, int var2) { - this.method256(var1, var2, this.method251()); + @ObfuscatedName("ai") + public synchronized void method260(int var1, int var2) { + this.method261(var1, var2, this.method256()); } @ObfuscatedName("aw") - public synchronized void method256(int var1, int var2, int var3) { + public synchronized void method261(int var1, int var2, int var3) { if (var1 == 0) { - this.method249(var2, var3); + this.method254(var2, var3); } else { - int var4 = method240(var2, var3); - int var5 = method241(var2, var3); - if (var4 == this.field234 && var5 == this.field240) { - this.field231 = 0; + int var4 = method245(var2, var3); + int var5 = method246(var2, var3); + if (var4 == this.field237 && var5 == this.field228) { + this.field238 = 0; } else { - int var6 = var2 - this.field238; - if (this.field238 - var2 > var6) { - var6 = this.field238 - var2; + int var6 = var2 - this.field229; + if (this.field229 - var2 > var6) { + var6 = this.field229 - var2; } - if (var4 - this.field234 > var6) { - var6 = var4 - this.field234; + if (var4 - this.field237 > var6) { + var6 = var4 - this.field237; } - if (this.field234 - var4 > var6) { - var6 = this.field234 - var4; + if (this.field237 - var4 > var6) { + var6 = this.field237 - var4; } - if (var5 - this.field240 > var6) { - var6 = var5 - this.field240; + if (var5 - this.field228 > var6) { + var6 = var5 - this.field228; } - if (this.field240 - var5 > var6) { - var6 = this.field240 - var5; + if (this.field228 - var5 > var6) { + var6 = this.field228 - var5; } if (var1 > var6) { var1 = var6; } - this.field231 = var1; - this.field235 = var2; - this.field243 = var3; - this.field239 = (var2 - this.field238) / var1; - this.field244 = (var4 - this.field234) / var1; - this.field241 = (var5 - this.field240) / var1; + this.field238 = var1; + this.field234 = var2; + this.field233 = var3; + this.field239 = (var2 - this.field229) / var1; + this.field235 = (var4 - this.field237) / var1; + this.field240 = (var5 - this.field228) / var1; } } } - @ObfuscatedName("aq") - public synchronized void method257(int var1) { + @ObfuscatedName("ae") + public synchronized void method262(int var1) { if (var1 == 0) { - this.method248(0); + this.method253(0); this.remove(); - } else if (this.field234 == 0 && this.field240 == 0) { - this.field231 = 0; - this.field235 = 0; + } else if (this.field237 == 0 && this.field228 == 0) { this.field238 = 0; + this.field234 = 0; + this.field229 = 0; this.remove(); } else { - int var2 = -this.field238; - if (this.field238 > var2) { - var2 = this.field238; + int var2 = -this.field229; + if (this.field229 > var2) { + var2 = this.field229; } - if (-this.field234 > var2) { - var2 = -this.field234; + if (-this.field237 > var2) { + var2 = -this.field237; } - if (this.field234 > var2) { - var2 = this.field234; + if (this.field237 > var2) { + var2 = this.field237; } - if (-this.field240 > var2) { - var2 = -this.field240; + if (-this.field228 > var2) { + var2 = -this.field228; } - if (this.field240 > var2) { - var2 = this.field240; + if (this.field228 > var2) { + var2 = this.field228; } if (var1 > var2) { var1 = var2; } - this.field231 = var1; - this.field235 = Integer.MIN_VALUE; - this.field239 = -this.field238 / var1; - this.field244 = -this.field234 / var1; - this.field241 = -this.field240 / var1; + this.field238 = var1; + this.field234 = Integer.MIN_VALUE; + this.field239 = -this.field229 / var1; + this.field235 = -this.field237 / var1; + this.field240 = -this.field228 / var1; } } - @ObfuscatedName("bb") - public synchronized void method258(int var1) { - if (this.field236 < 0) { - this.field236 = -var1; + @ObfuscatedName("an") + public synchronized void method263(int var1) { + if (this.field231 < 0) { + this.field231 = -var1; } else { - this.field236 = var1; + this.field231 = var1; } } - @ObfuscatedName("bo") - public synchronized int method259() { - return this.field236 < 0 ? -this.field236 : this.field236; + @ObfuscatedName("ag") + public synchronized int method264() { + return this.field231 < 0 ? -this.field231 : this.field231; } - @ObfuscatedName("bp") - public boolean method260() { - return this.field233 < 0 || this.field233 >= ((RawSound)super.sound).samples.length << 8; + @ObfuscatedName("ad") + public boolean method265() { + return this.field236 < 0 || this.field236 >= ((RawSound)super.sound).samples.length << 8; } - @ObfuscatedName("bm") - public boolean method261() { - return this.field231 != 0; + @ObfuscatedName("af") + public boolean method266() { + return this.field238 != 0; } - @ObfuscatedName("br") - int method267(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("bn") + int method272(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field231 > 0) { - int var6 = var2 + this.field231; + if (this.field238 > 0) { + int var6 = var2 + this.field238; if (var6 > var4) { var6 = var4; } - this.field231 += var2; - if (this.field236 == 256 && (this.field233 & 255) == 0) { - if (class306.PcmPlayer_stereo) { - var2 = method279(0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, this.field244, this.field241, 0, var6, var3, this); + this.field238 += var2; + if (this.field231 == 256 && (this.field236 & 255) == 0) { + if (WorldMapRectangle.PcmPlayer_stereo) { + var2 = method284(0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field237, this.field228, this.field235, this.field240, 0, var6, var3, this); } else { - var2 = method278(((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, this.field239, 0, var6, var3, this); + var2 = method283(((RawSound)super.sound).samples, var1, this.field236, var2, this.field229, this.field239, 0, var6, var3, this); } - } else if (class306.PcmPlayer_stereo) { - var2 = method283(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, this.field244, this.field241, 0, var6, var3, this, this.field236, var5); + } else if (WorldMapRectangle.PcmPlayer_stereo) { + var2 = method288(0, 0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field237, this.field228, this.field235, this.field240, 0, var6, var3, this, this.field231, var5); } else { - var2 = method282(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, this.field239, 0, var6, var3, this, this.field236, var5); + var2 = method287(0, 0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field229, this.field239, 0, var6, var3, this, this.field231, var5); } - this.field231 -= var2; - if (this.field231 != 0) { + this.field238 -= var2; + if (this.field238 != 0) { return var2; } - if (!this.method269()) { + if (!this.method274()) { continue; } return var4; } - if (this.field236 == 256 && (this.field233 & 255) == 0) { - if (class306.PcmPlayer_stereo) { - return method271(0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, 0, var4, var3, this); + if (this.field231 == 256 && (this.field236 & 255) == 0) { + if (WorldMapRectangle.PcmPlayer_stereo) { + return method276(0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field237, this.field228, 0, var4, var3, this); } - return method270(((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, 0, var4, var3, this); + return method275(((RawSound)super.sound).samples, var1, this.field236, var2, this.field229, 0, var4, var3, this); } - if (class306.PcmPlayer_stereo) { - return method275(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, 0, var4, var3, this, this.field236, var5); + if (WorldMapRectangle.PcmPlayer_stereo) { + return method280(0, 0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field237, this.field228, 0, var4, var3, this, this.field231, var5); } - return method274(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, 0, var4, var3, this, this.field236, var5); + return method279(0, 0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field229, 0, var4, var3, this, this.field231, var5); } } - @ObfuscatedName("bs") - @Export("vmethod1019") - int vmethod1019() { - int var1 = this.field238 * 3 >> 6; - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); - if (this.numLoops == 0) { - var1 -= var1 * this.field233 / (((RawSound)super.sound).samples.length << 8); - } else if (this.numLoops >= 0) { - var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; - } - - return var1 > 255 ? 255 : var1; - } - - @ObfuscatedName("bc") - int method268(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("bo") + int method273(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field231 > 0) { - int var6 = var2 + this.field231; + if (this.field238 > 0) { + int var6 = var2 + this.field238; if (var6 > var4) { var6 = var4; } - this.field231 += var2; - if (this.field236 == -256 && (this.field233 & 255) == 0) { - if (class306.PcmPlayer_stereo) { - var2 = method281(0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, this.field244, this.field241, 0, var6, var3, this); + this.field238 += var2; + if (this.field231 == -256 && (this.field236 & 255) == 0) { + if (WorldMapRectangle.PcmPlayer_stereo) { + var2 = method286(0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field237, this.field228, this.field235, this.field240, 0, var6, var3, this); } else { - var2 = method280(((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, this.field239, 0, var6, var3, this); + var2 = method285(((RawSound)super.sound).samples, var1, this.field236, var2, this.field229, this.field239, 0, var6, var3, this); } - } else if (class306.PcmPlayer_stereo) { - var2 = method285(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, this.field244, this.field241, 0, var6, var3, this, this.field236, var5); + } else if (WorldMapRectangle.PcmPlayer_stereo) { + var2 = method290(0, 0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field237, this.field228, this.field235, this.field240, 0, var6, var3, this, this.field231, var5); } else { - var2 = method284(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, this.field239, 0, var6, var3, this, this.field236, var5); + var2 = method289(0, 0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field229, this.field239, 0, var6, var3, this, this.field231, var5); } - this.field231 -= var2; - if (this.field231 != 0) { + this.field238 -= var2; + if (this.field238 != 0) { return var2; } - if (!this.method269()) { + if (!this.method274()) { continue; } return var4; } - if (this.field236 == -256 && (this.field233 & 255) == 0) { - if (class306.PcmPlayer_stereo) { - return method273(0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, 0, var4, var3, this); + if (this.field231 == -256 && (this.field236 & 255) == 0) { + if (WorldMapRectangle.PcmPlayer_stereo) { + return method278(0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field237, this.field228, 0, var4, var3, this); } - return method272(((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, 0, var4, var3, this); + return method277(((RawSound)super.sound).samples, var1, this.field236, var2, this.field229, 0, var4, var3, this); } - if (class306.PcmPlayer_stereo) { - return method277(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field234, this.field240, 0, var4, var3, this, this.field236, var5); + if (WorldMapRectangle.PcmPlayer_stereo) { + return method282(0, 0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field237, this.field228, 0, var4, var3, this, this.field231, var5); } - return method276(0, 0, ((RawSound)super.sound).samples, var1, this.field233, var2, this.field238, 0, var4, var3, this, this.field236, var5); + return method281(0, 0, ((RawSound)super.sound).samples, var1, this.field236, var2, this.field229, 0, var4, var3, this, this.field231, var5); } } - @ObfuscatedName("bu") - boolean method269() { - int var1 = this.field235; + @ObfuscatedName("bz") + boolean method274() { + int var1 = this.field234; int var2; int var3; if (var1 == Integer.MIN_VALUE) { @@ -777,97 +763,111 @@ boolean method269() { var2 = 0; var1 = 0; } else { - var2 = method240(var1, this.field243); - var3 = method241(var1, this.field243); + var2 = method245(var1, this.field233); + var3 = method246(var1, this.field233); } - if (var1 == this.field238 && var2 == this.field234 && var3 == this.field240) { - if (this.field235 == Integer.MIN_VALUE) { - this.field235 = 0; - this.field240 = 0; + if (var1 == this.field229 && var2 == this.field237 && var3 == this.field228) { + if (this.field234 == Integer.MIN_VALUE) { this.field234 = 0; - this.field238 = 0; + this.field228 = 0; + this.field237 = 0; + this.field229 = 0; this.remove(); return true; } else { - this.method245(); + this.method250(); return false; } } else { - if (this.field238 < var1) { + if (this.field229 < var1) { this.field239 = 1; - this.field231 = var1 - this.field238; - } else if (this.field238 > var1) { + this.field238 = var1 - this.field229; + } else if (this.field229 > var1) { this.field239 = -1; - this.field231 = this.field238 - var1; + this.field238 = this.field229 - var1; } else { this.field239 = 0; } - if (this.field234 < var2) { - this.field244 = 1; - if (this.field231 == 0 || this.field231 > var2 - this.field234) { - this.field231 = var2 - this.field234; + if (this.field237 < var2) { + this.field235 = 1; + if (this.field238 == 0 || this.field238 > var2 - this.field237) { + this.field238 = var2 - this.field237; } - } else if (this.field234 > var2) { - this.field244 = -1; - if (this.field231 == 0 || this.field231 > this.field234 - var2) { - this.field231 = this.field234 - var2; + } else if (this.field237 > var2) { + this.field235 = -1; + if (this.field238 == 0 || this.field238 > this.field237 - var2) { + this.field238 = this.field237 - var2; } } else { - this.field244 = 0; + this.field235 = 0; } - if (this.field240 < var3) { - this.field241 = 1; - if (this.field231 == 0 || this.field231 > var3 - this.field240) { - this.field231 = var3 - this.field240; + if (this.field228 < var3) { + this.field240 = 1; + if (this.field238 == 0 || this.field238 > var3 - this.field228) { + this.field238 = var3 - this.field228; } - } else if (this.field240 > var3) { - this.field241 = -1; - if (this.field231 == 0 || this.field231 > this.field240 - var3) { - this.field231 = this.field240 - var3; + } else if (this.field228 > var3) { + this.field240 = -1; + if (this.field238 == 0 || this.field238 > this.field228 - var3) { + this.field238 = this.field228 - var3; } } else { - this.field241 = 0; + this.field240 = 0; } return false; } } - @ObfuscatedName("ac") - static int method240(int var0, int var1) { + @ObfuscatedName("bx") + @Export("vmethod1019") + int vmethod1019() { + int var1 = this.field229 * 3 >> 6; + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); + if (this.numLoops == 0) { + var1 -= var1 * this.field236 / (((RawSound)super.sound).samples.length << 8); + } else if (this.numLoops >= 0) { + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; + } + + return var1 > 255 ? 255 : var1; + } + + @ObfuscatedName("at") + static int method245(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("al") - static int method241(int var0, int var1) { + @ObfuscatedName("ah") + static int method246(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lbs;II)Lbx;" + descriptor = "(Lbt;II)Lbb;" ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field179 * 100)), var2 << 6) : null; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lbs;III)Lbx;" + descriptor = "(Lbt;III)Lbb;" ) - public static RawPcmStream method244(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method249(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } - @ObfuscatedName("bf") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILbx;)I" + descriptor = "([B[IIIIIIILbb;)I" ) - static int method270(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method275(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -890,15 +890,15 @@ static int method270(byte[] var0, int[] var1, int var2, int var3, int var4, int var10001 = var3++; } - var8.field233 = var2 << 8; + var8.field236 = var2 << 8; return var3; } - @ObfuscatedName("bh") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILbx;)I" + descriptor = "(I[B[IIIIIIIILbb;)I" ) - static int method271(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method276(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -941,15 +941,15 @@ static int method271(int var0, byte[] var1, int[] var2, int var3, int var4, int var10001 = var4++; } - var10.field233 = var3 << 8; + var10.field236 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bl") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILbx;)I" + descriptor = "([B[IIIIIIILbb;)I" ) - static int method272(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method277(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -972,15 +972,15 @@ static int method272(byte[] var0, int[] var1, int var2, int var3, int var4, int var10001 = var3++; } - var8.field233 = var2 << 8; + var8.field236 = var2 << 8; return var3; } - @ObfuscatedName("bg") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILbx;)I" + descriptor = "(I[B[IIIIIIIILbb;)I" ) - static int method273(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method278(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -1023,15 +1023,15 @@ static int method273(int var0, byte[] var1, int[] var2, int var3, int var4, int var10001 = var4++; } - var10.field233 = var3 << 8; + var10.field236 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bj") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILbx;II)I" + descriptor = "(II[B[IIIIIIILbb;II)I" ) - static int method274(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method279(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { var7 = var8; } @@ -1056,15 +1056,15 @@ static int method274(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field233 = var4; + var10.field236 = var4; return var5; } - @ObfuscatedName("bx") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbx;II)I" + descriptor = "(II[B[IIIIIIIILbb;II)I" ) - static int method275(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method280(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1098,15 +1098,15 @@ static int method275(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += var0 * var7 >> 6; } - var11.field233 = var4; + var11.field236 = var4; return var5 >> 1; } - @ObfuscatedName("bi") + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILbx;II)I" + descriptor = "(II[B[IIIIIIILbb;II)I" ) - static int method276(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method281(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { var7 = var8; } @@ -1131,15 +1131,15 @@ static int method276(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field233 = var4; + var10.field236 = var4; return var5; } - @ObfuscatedName("bq") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbx;II)I" + descriptor = "(II[B[IIIIIIIILbb;II)I" ) - static int method277(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method282(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1171,15 +1171,15 @@ static int method277(int var0, int var1, byte[] var2, int[] var3, int var4, int var3[var10001] += var0 * var7 >> 6; } - var11.field233 = var4; + var11.field236 = var4; return var5 >> 1; } - @ObfuscatedName("bw") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILbx;)I" + descriptor = "([B[IIIIIIIILbb;)I" ) - static int method278(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method283(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1188,8 +1188,8 @@ static int method278(byte[] var0, int[] var1, int var2, int var3, int var4, int var6 = var7; } - var9.field234 += var9.field244 * (var6 - var3); - var9.field240 += var9.field241 * (var6 - var3); + var9.field237 += var9.field235 * (var6 - var3); + var9.field228 += var9.field240 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1211,16 +1211,16 @@ static int method278(byte[] var0, int[] var1, int var2, int var3, int var4, int var1[var10001] += var0[var2++] * var4; } - var9.field238 = var4 >> 2; - var9.field233 = var2 << 8; + var9.field229 = var4 >> 2; + var9.field236 = var2 << 8; return var3; } - @ObfuscatedName("ce") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILbx;)I" + descriptor = "(I[B[IIIIIIIIIILbb;)I" ) - static int method279(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method284(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1231,7 +1231,7 @@ static int method279(int var0, byte[] var1, int[] var2, int var3, int var4, int var9 = var10; } - var12.field238 += var12.field239 * (var9 - var4); + var12.field229 += var12.field239 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1276,17 +1276,17 @@ static int method279(int var0, byte[] var1, int[] var2, int var3, int var4, int var2[var10001] += var13 * var6; } - var12.field234 = var5 >> 2; - var12.field240 = var6 >> 2; - var12.field233 = var3 << 8; + var12.field237 = var5 >> 2; + var12.field228 = var6 >> 2; + var12.field236 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("cu") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILbx;)I" + descriptor = "([B[IIIIIIIILbb;)I" ) - static int method280(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method285(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1295,8 +1295,8 @@ static int method280(byte[] var0, int[] var1, int var2, int var3, int var4, int var6 = var7; } - var9.field234 += var9.field244 * (var6 - var3); - var9.field240 += var9.field241 * (var6 - var3); + var9.field237 += var9.field235 * (var6 - var3); + var9.field228 += var9.field240 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1318,16 +1318,16 @@ static int method280(byte[] var0, int[] var1, int var2, int var3, int var4, int var1[var10001] += var0[var2--] * var4; } - var9.field238 = var4 >> 2; - var9.field233 = var2 << 8; + var9.field229 = var4 >> 2; + var9.field236 = var2 << 8; return var3; } - @ObfuscatedName("cw") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILbx;)I" + descriptor = "(I[B[IIIIIIIIIILbb;)I" ) - static int method281(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method286(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1338,7 +1338,7 @@ static int method281(int var0, byte[] var1, int[] var2, int var3, int var4, int var9 = var10; } - var12.field238 += var12.field239 * (var9 - var4); + var12.field229 += var12.field239 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1383,19 +1383,19 @@ static int method281(int var0, byte[] var1, int[] var2, int var3, int var4, int var2[var10001] += var13 * var6; } - var12.field234 = var5 >> 2; - var12.field240 = var6 >> 2; - var12.field233 = var3 << 8; + var12.field237 = var5 >> 2; + var12.field228 = var6 >> 2; + var12.field236 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("co") + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbx;II)I" + descriptor = "(II[B[IIIIIIIILbb;II)I" ) - static int method282(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field234 -= var11.field244 * var5; - var11.field240 -= var11.field241 * var5; + static int method287(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field237 -= var11.field235 * var5; + var11.field228 -= var11.field240 * var5; if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1422,19 +1422,19 @@ static int method282(int var0, int var1, byte[] var2, int[] var3, int var4, int var6 += var7; } - var11.field234 += var11.field244 * var5; - var11.field240 += var11.field241 * var5; - var11.field238 = var6; - var11.field233 = var4; + var11.field237 += var11.field235 * var5; + var11.field228 += var11.field240 * var5; + var11.field229 = var6; + var11.field236 = var4; return var5; } - @ObfuscatedName("cc") + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILbx;II)I" + descriptor = "(II[B[IIIIIIIIIILbb;II)I" ) - static int method283(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field238 -= var5 * var13.field239; + static int method288(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field229 -= var5 * var13.field239; if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } @@ -1473,20 +1473,20 @@ static int method283(int var0, int var1, byte[] var2, int[] var3, int var4, int } var5 >>= 1; - var13.field238 += var13.field239 * var5; - var13.field234 = var6; - var13.field240 = var7; - var13.field233 = var4; + var13.field229 += var13.field239 * var5; + var13.field237 = var6; + var13.field228 = var7; + var13.field236 = var4; return var5; } - @ObfuscatedName("cg") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbx;II)I" + descriptor = "(II[B[IIIIIIIILbb;II)I" ) - static int method284(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field234 -= var11.field244 * var5; - var11.field240 -= var11.field241 * var5; + static int method289(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field237 -= var11.field235 * var5; + var11.field228 -= var11.field240 * var5; if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1513,19 +1513,19 @@ static int method284(int var0, int var1, byte[] var2, int[] var3, int var4, int var6 += var7; } - var11.field234 += var11.field244 * var5; - var11.field240 += var11.field241 * var5; - var11.field238 = var6; - var11.field233 = var4; + var11.field237 += var11.field235 * var5; + var11.field228 += var11.field240 * var5; + var11.field229 = var6; + var11.field236 = var4; return var5; } @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILbx;II)I" + descriptor = "(II[B[IIIIIIIIIILbb;II)I" ) - static int method285(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field238 -= var5 * var13.field239; + static int method290(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field229 -= var5 * var13.field239; if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } @@ -1562,10 +1562,10 @@ static int method285(int var0, int var1, byte[] var2, int[] var3, int var4, int } var5 >>= 1; - var13.field238 += var13.field239 * var5; - var13.field234 = var6; - var13.field240 = var7; - var13.field233 = var4; + var13.field229 += var13.field239 * var5; + var13.field237 = var6; + var13.field228 = var7; + var13.field236 = var4; return var5; } } \ No newline at end of file diff --git a/osrs/src/main/java/RawSound.java b/osrs/src/main/java/RawSound.java index 477ec386d..3511a5acb 100644 --- a/osrs/src/main/java/RawSound.java +++ b/osrs/src/main/java/RawSound.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bt") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("samples") public byte[] samples; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("start") public int start; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("end") int end; - @ObfuscatedName("ao") - public boolean field166; + @ObfuscatedName("ab") + public boolean field165; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; this.start = var3; this.end = var4; - this.field166 = var5; + this.field165 = var5; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lcg;)Lbs;" + descriptor = "(Lce;)Lbt;" ) @Export("resample") public RawSound resample(Decimator var1) { diff --git a/osrs/src/main/java/ReflectionCheck.java b/osrs/src/main/java/ReflectionCheck.java index bc19603cd..a23f0ed1e 100644 --- a/osrs/src/main/java/ReflectionCheck.java +++ b/osrs/src/main/java/ReflectionCheck.java @@ -6,396 +6,199 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -@ObfuscatedName("bt") +@ObfuscatedName("bj") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("id") int id; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("size") int size; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("operations") int[] operations; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("fields") Field[] fields; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("methods") Method[] methods; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("arguments") byte[][][] arguments; ReflectionCheck() { } - @ObfuscatedName("bd") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "215917133" + descriptor = "(ILdt;ZB)I", + garbageValue = "1" ) - static int method184(int var0, Script var1, boolean var2) { - if (var0 == 3600) { - if (InvDefinition.friendSystem.friendListStatus == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; - } else if (InvDefinition.friendSystem.friendListStatus == 1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.friendSystem.friendsList.getSize(); - } - + static int method186(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + if (var0 == 1600) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == 1601) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.scrollY; return 1; } else { - int var3; - if (var0 == 3601) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (InvDefinition.friendSystem.method400() && var3 >= 0 && var3 < InvDefinition.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)InvDefinition.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + class341 var7; + if (var0 == 1602) { + if (var3.type == 12) { + var7 = var3.method1871(); + if (var7 != null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var7.method1807().method2056(); + return 1; + } } + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.text; return 1; - } else if (var0 == 3602) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (InvDefinition.friendSystem.method400() && var3 >= 0 && var3 < InvDefinition.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)InvDefinition.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - + } else if (var0 == 1603) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; - } else if (var0 == 3603) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (InvDefinition.friendSystem.method400() && var3 >= 0 && var3 < InvDefinition.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)InvDefinition.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - + } else if (var0 == 1604) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == 1605) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == 1606) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == 1607) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == 1608) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == 1609) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 1610) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == 1611) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == 1612) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 1613) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == 1614) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; return 1; } else { - String var5; - if (var0 == 3604) { - var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - int var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class148.setFriendsRank(var5, var9); - return 1; - } else if (var0 == 3605) { - var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - InvDefinition.friendSystem.addFriend(var5); - return 1; - } else if (var0 == 3606) { - var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - InvDefinition.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == 3607) { - var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - InvDefinition.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == 3608) { - var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - boolean var6 = true; - InvDefinition.friendSystem.removeIgnore(var5, var6); - return 1; - } else if (var0 == 3609) { - var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var5 = InterfaceParent.method465(var5); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.friendSystem.isFriended(new Username(var5, class166.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == 3611) { - if (class358.friendsChat != null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class358.friendsChat.name; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3612) { - if (class358.friendsChat != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class358.friendsChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3613) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class358.friendsChat != null && var3 < class358.friendsChat.getSize()) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class358.friendsChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3614) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class358.friendsChat != null && var3 < class358.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class358.friendsChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3615) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class358.friendsChat != null && var3 < class358.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class358.friendsChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } + class336 var4; + if (var0 == 1617) { + var4 = var3.method1872(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2923 * 1307671165 * -2042671403 : 0; + } + if (var0 == 1618) { + var4 = var3.method1872(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2921 * -1246608637 * -1141194837 : 0; return 1; - } else if (var0 == 3616) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class358.friendsChat != null ? class358.friendsChat.minKick : 0; - return 1; - } else if (var0 == 3617) { - var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - class14.clanKickUser(var5); + } else if (var0 == 1619) { + var7 = var3.method1871(); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1808().method2056() : ""; return 1; - } else if (var0 == 3618) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class358.friendsChat != null ? class358.friendsChat.rank * -1160213393 * 2144490127 : 0; + } else if (var0 == 1620) { + var4 = var3.method1872(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2922 * -1028807547 * -113724339 : 0; return 1; - } else if (var0 == 3619) { - var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - class216.Clan_joinChat(var5); + } else if (var0 == 1621) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1818() : 0; return 1; - } else if (var0 == 3620) { - WorldMapSection0.Clan_leaveChat(); + } else if (var0 == 1622) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1819() : 0; return 1; - } else if (var0 == 3621) { - if (!InvDefinition.friendSystem.method400()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == 3622) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (InvDefinition.friendSystem.method400() && var3 >= 0 && var3 < InvDefinition.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)InvDefinition.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } - + } else if (var0 == 1623) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1820() : 0; return 1; - } else if (var0 == 3623) { - var5 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var5 = InterfaceParent.method465(var5); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.friendSystem.isIgnored(new Username(var5, class166.loginType)) ? 1 : 0; + } else if (var0 == 1624) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null && var7.method1810() ? 1 : 0; return 1; - } else if (var0 == 3624) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class358.friendsChat != null && var3 < class358.friendsChat.getSize() && class358.friendsChat.get(var3).getUsername().equals(TextureProvider.localPlayer.username)) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3625) { - if (class358.friendsChat != null && class358.friendsChat.owner != null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class358.friendsChat.owner; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 3626) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class358.friendsChat != null && var3 < class358.friendsChat.getSize() && ((ClanMate)class358.friendsChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != 3627) { - if (var0 == 3628) { - InvDefinition.friendSystem.friendsList.removeComparator(); + } else if (var0 != 1625) { + if (var0 == 1626) { + var7 = var3.method1871(); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1809().method2131() : ""; + return 1; + } else if (var0 == 1627) { + var7 = var3.method1871(); + int var5 = var7 != null ? var7.method1814() : 0; + int var6 = var7 != null ? var7.method1813() : 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Math.min(var5, var6); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Math.max(var5, var6); + return 1; + } else if (var0 == 1628) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1813() : 0; + return 1; + } else if (var0 == 1629) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1822() : 0; + return 1; + } else if (var0 == 1630) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1821() : 0; + return 1; + } else if (var0 == 1631) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1823() : 0; + return 1; + } else if (var0 == 1632) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1824() : 0; return 1; } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - InvDefinition.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - InvDefinition.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - InvDefinition.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (class358.friendsChat != null) { - class358.friendsChat.removeComparator(); - } - + class27 var8; + if (var0 == 1633) { + var8 = var3.method1873(); + Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1] = var8 != null ? var8.method115(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1]) : 0; return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (class358.friendsChat != null) { - class358.friendsChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class358.friendsChat != null) { - class358.friendsChat.addComparator(new BuddyRankComparator(var7)); - } - + } else if (var0 == 1634) { + var8 = var3.method1873(); + Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1] = var8 != null ? var8.method116((char)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1]) : 0; return 1; } else { return 2; } } } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class358.friendsChat != null && var3 < class358.friendsChat.getSize() && ((ClanMate)class358.friendsChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null && var7.method1811() ? 1 : 0; return 1; } } } } + + @ObfuscatedName("lz") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "674487818" + ) + static String method187(int var0) { + if (var0 < 0) { + return ""; + } else { + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Renderable.java b/osrs/src/main/java/Renderable.java index 9cd7ef7a6..345ef7092 100644 --- a/osrs/src/main/java/Renderable.java +++ b/osrs/src/main/java/Renderable.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("kt") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("eg") + @ObfuscatedName("ek") @Export("height") public int height; @@ -14,17 +14,17 @@ protected Renderable() { this.height = 1000; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Ljn;", - garbageValue = "0" + descriptor = "(B)Lka;", + garbageValue = "1" ) @Export("getModel") protected Model getModel() { return null; } - @ObfuscatedName("du") + @ObfuscatedName("dw") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); @@ -34,4 +34,67 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, } } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1945159516" + ) + static void method1514() { + ByteArrayPool.field3780.clear(); + ByteArrayPool.field3780.add(100); + ByteArrayPool.field3780.add(5000); + ByteArrayPool.field3780.add(10000); + ByteArrayPool.field3780.add(30000); + } + + @ObfuscatedName("ld") + @ObfuscatedSignature( + descriptor = "(Lnn;IIZB)V", + garbageValue = "-74" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; + int var5 = var0.height; + if (var0.widthAlignment == 0) { + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { + var0.width = var0.field3006 * var0.height / var0.field3020; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.width * var0.field3020 / var0.field3006; + } + + if (var0.contentType == 1337) { + Client.viewportWidget = var0; + } + + if (var0.type == 12) { + var0.method1871().method1764(var0.width, var0.height); + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var0; + var6.args = var0.onResize; + Client.scriptEvents.addFirst(var6); + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/RouteStrategy.java b/osrs/src/main/java/RouteStrategy.java index a97dc3351..de1f973bd 100644 --- a/osrs/src/main/java/RouteStrategy.java +++ b/osrs/src/main/java/RouteStrategy.java @@ -3,60 +3,74 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Iterator; - -@ObfuscatedName("iq") +@ObfuscatedName("it") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("approxDestinationSizeY") public int approxDestinationSizeY; protected RouteStrategy() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIILih;B)Z", - garbageValue = "0" + descriptor = "(IIILiw;I)Z", + garbageValue = "729664573" ) @Export("hasArrived") protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("ab") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "517814479" + descriptor = "(I)[Lir;", + garbageValue = "-994113329" ) - static String method1170() { - StringBuilder var0 = new StringBuilder(); - - Message var2; - for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0.append(var2.text).append('\n')) { - var2 = (Message)var1.next(); - if (var2.sender != null && !var2.sender.isEmpty()) { - var0.append(var2.sender).append(':'); - } - } - - return var0.toString(); + static class225[] method1149() { + return new class225[]{class225.field1912, class225.field1909, class225.field1907, class225.field1911, class225.field1913, class225.field1910, class225.field1908}; } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "972272925" + garbageValue = "820783273" ) - static final void method1171() { - class436.method2211("You can't add yourself to your own ignore list"); + public static void method1150() { + PlayerComposition.PlayerAppearance_cachedModels.clear(); + PlayerComposition.field2938.clearFiles(); + PlayerComposition.field2936 = 0; + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(ILdt;ZB)I", + garbageValue = "52" + ) + static int method1151(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3500) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.getKeyPressed(var3) ? 1 : 0; + return 1; + } else if (var0 == 3501) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1129(var3) ? 1 : 0; + return 1; + } else if (var0 == 3502) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1131(var3) ? 1 : 0; + return 1; + } else { + return 2; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/RunException.java b/osrs/src/main/java/RunException.java index f35db556e..eb6783957 100644 --- a/osrs/src/main/java/RunException.java +++ b/osrs/src/main/java/RunException.java @@ -2,24 +2,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ve") +import java.applet.Applet; + +@ObfuscatedName("vf") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("al") - public static String field4314; - @ObfuscatedName("ak") - @Export("RunException_revision") - public static int RunException_revision; - @ObfuscatedName("ax") - public static int field4313; - @ObfuscatedName("ah") - String field4315; - @ObfuscatedName("ar") + @ObfuscatedName("at") + @Export("RunException_applet") + public static Applet RunException_applet; + @ObfuscatedName("ao") + public static int field4318; + @ObfuscatedName("ab") + public static int field4317; + @ObfuscatedName("au") + String field4320; + @ObfuscatedName("aa") @Export("parent") Throwable parent; RunException(Throwable var1, String var2) { - this.field4315 = var2; + this.field4320 = var2; this.parent = var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/RuneLiteMenuEntry.java b/osrs/src/main/java/RuneLiteMenuEntry.java index 76d2fc9d6..8e475bd27 100644 --- a/osrs/src/main/java/RuneLiteMenuEntry.java +++ b/osrs/src/main/java/RuneLiteMenuEntry.java @@ -443,23 +443,31 @@ public void setItemId(int itemId) { itemIdOverride = itemId; } @Override - public Widget getWidget() { + public Widget getWidget() + { int param1 = this.getParam1(); int param0 = this.getParam0(); + Widget widget = client.getWidget(param1); - if (widget == null) { + + if (widget == null) + { return null; } - if (param0 != -1) { + + if (param0 != -1) + { Widget child = widget.getChild(param0); - if (child != null) { + + if (child != null) + { return child; } } + return widget; } - @Override public NPC getNpc() { diff --git a/osrs/src/main/java/Scene.java b/osrs/src/main/java/Scene.java index b76f74cb5..697da48ea 100644 --- a/osrs/src/main/java/Scene.java +++ b/osrs/src/main/java/Scene.java @@ -3,188 +3,188 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("kf") @Implements("Scene") public class Scene { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; @ObfuscatedName("aw") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("bn") + @ObfuscatedName("be") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("be") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "[Lkl;" + descriptor = "[Lle;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("bp") + @ObfuscatedName("bw") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("bt") + @ObfuscatedName("bj") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("bc") + @ObfuscatedName("bu") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("bu") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "[[Lje;" + descriptor = "[[Lkw;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("bf") + @ObfuscatedName("bh") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("bh") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "[Lje;" + descriptor = "[Lkw;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("bl") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("bg") - static final int[] field2105; - @ObfuscatedName("bj") - static final int[] field2107; + @ObfuscatedName("bs") + static final int[] field2279; @ObfuscatedName("bx") - static final int[] field2110; - @ObfuscatedName("bi") - static final int[] field2106; + static final int[] field2280; + @ObfuscatedName("bb") + static final int[] field2275; + @ObfuscatedName("bk") + static final int[] field2276; + @ObfuscatedName("br") + static final int[] field2278; @ObfuscatedName("bq") - static final int[] field2108; - @ObfuscatedName("bw") - static final int[] field2109; - @ObfuscatedName("ce") - static final int[] field2111; - @ObfuscatedName("cy") + static final int[] field2277; + @ObfuscatedName("cf") + static final int[] field2281; + @ObfuscatedName("ct") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("cz") + @ObfuscatedName("cw") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("cb") + @ObfuscatedName("cl") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("cn") + @ObfuscatedName("cs") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("ck") + @ObfuscatedName("co") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("cr") + @ObfuscatedName("cm") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("cs") + @ObfuscatedName("cn") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("planes") int planes; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("xSize") int xSize; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("ySize") int ySize; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "[[[Ljh;" + descriptor = "[[[Lkv;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("minPlane") int minPlane; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lkl;" + descriptor = "[Lle;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("av") - int[][][] field2120; - @ObfuscatedName("cg") + @ObfuscatedName("az") + int[][][] field2290; + @ObfuscatedName("ce") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("cq") + @ObfuscatedName("ci") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; Scene_currentOccluders = new Occluder[500]; Scene_tilesDeque = new NodeDeque(); - field2105 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field2107 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field2110 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field2106 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field2108 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field2109 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field2111 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + field2279 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field2280 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field2275 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field2276 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field2278 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field2277 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field2281 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; visibilityMap = new boolean[8][32][51][51]; } @@ -226,12 +226,12 @@ public Scene(int var1, int var2, int var3, int[][][] var4) { this.xSize = var2; this.ySize = var3; this.tiles = new Tile[var1][var2][var3]; - this.field2120 = new int[var1][var2 + 1][var3 + 1]; + this.field2290 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public void clear() { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("init") public void init(int var1) { this.minPlane = var1; @@ -279,7 +279,7 @@ public void init(int var1) { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; @@ -291,7 +291,9 @@ public void setLinkBelow(int var1, int var2) { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { GameObject var7 = var5.gameObjects[var6]; - if (SequenceDefinition.method1116(var7.tag) && var7.startX == var1 && var2 == var7.startY) { + long var9 = var7.tag; + boolean var8 = class158.method828(var9) == 2; + if (var8 && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } } @@ -306,7 +308,7 @@ public void setLinkBelow(int var1, int var2) { this.tiles[3][var1][var2] = null; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; @@ -315,7 +317,7 @@ public void setTileMinPlane(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { SceneTilePaint var21; @@ -353,9 +355,9 @@ public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IIIILjy;JI)V" + descriptor = "(IIIILkt;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { @@ -375,9 +377,9 @@ public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderabl } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIILjy;JLjy;Ljy;)V" + descriptor = "(IIIILkt;JLkt;Lkt;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) { @@ -411,9 +413,9 @@ public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable this.tiles[var1][var2][var3].itemLayer = var10; } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIIILjy;Ljy;IIJI)V" + descriptor = "(IIIILkt;Lkt;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) { @@ -439,9 +441,9 @@ public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable } } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IIIILjy;Ljy;IIIIJI)V" + descriptor = "(IIIILkt;Lkt;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) { @@ -469,11 +471,11 @@ public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIIIIILjy;IJI)Z" + descriptor = "(IIIIIILkt;IJI)Z" ) - public boolean method1287(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + public boolean method1467(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { if (var7 == null) { return true; } else { @@ -483,9 +485,9 @@ public boolean method1287(int var1, int var2, int var3, int var4, int var5, int } } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(IIIIILjy;IJZ)Z" + descriptor = "(IIIIILkt;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) { @@ -522,18 +524,18 @@ public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Rend } } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IIIIILjy;IJIIII)Z" + descriptor = "(IIIIILkt;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) { return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IIIIIIIILjy;IZJI)Z" + descriptor = "(IIIIIIIILkt;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) { @@ -605,7 +607,7 @@ boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6 return true; } - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { @@ -617,9 +619,9 @@ public void clearTempGameObjects() { this.tempGameObjectsCount = 0; } - @ObfuscatedName("aj") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lkl;)V" + descriptor = "(Lle;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -653,8 +655,8 @@ void removeGameObject(GameObject var1) { } - @ObfuscatedName("an") - public void method1293(int var1, int var2, int var3, int var4) { + @ObfuscatedName("aj") + public void method1473(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; if (var5 != null) { WallDecoration var6 = var5.wallDecoration; @@ -665,16 +667,15 @@ public void method1293(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("au") - @Export("removeBoundaryObject") - public void removeBoundaryObject(int var1, int var2, int var3) { + @ObfuscatedName("am") + public void method1474(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { var4.boundaryObject = null; } } - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -683,14 +684,16 @@ public void removeWallDecoration(int var1, int var2, int var3) { } } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (SequenceDefinition.method1116(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + long var8 = var6.tag; + boolean var7 = class158.method828(var8) == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { this.removeGameObject(var6); return; } @@ -708,7 +711,7 @@ public void removeFloorDecoration(int var1, int var2, int var3) { } } - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -717,27 +720,27 @@ public void removeGroundItemPile(int var1, int var2, int var3) { } } - @ObfuscatedName("az") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(III)Lkr;" + descriptor = "(III)Llv;" ) - public BoundaryObject method1299(int var1, int var2, int var3) { + public BoundaryObject method1479(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.boundaryObject; } - @ObfuscatedName("at") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(III)Lkq;" + descriptor = "(III)Llj;" ) - public WallDecoration method1300(int var1, int var2, int var3) { + public WallDecoration method1480(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.wallDecoration; } - @ObfuscatedName("af") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(III)Lkl;" + descriptor = "(III)Lle;" ) @Export("getGameObject") public GameObject getGameObject(int var1, int var2, int var3) { @@ -747,7 +750,9 @@ public GameObject getGameObject(int var1, int var2, int var3) { } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (SequenceDefinition.method1116(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + long var8 = var6.tag; + boolean var7 = class158.method828(var8) == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6; } } @@ -756,9 +761,9 @@ public GameObject getGameObject(int var1, int var2, int var3) { } } - @ObfuscatedName("ad") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(III)Ljd;" + descriptor = "(III)Lkm;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { @@ -766,21 +771,21 @@ public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } - @ObfuscatedName("bn") + @ObfuscatedName("be") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; } - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; } - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -789,7 +794,9 @@ public long getGameObjectTag(int var1, int var2, int var3) { } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (SequenceDefinition.method1116(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + long var8 = var6.tag; + boolean var7 = class158.method828(var8) == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } } @@ -798,14 +805,14 @@ public long getGameObjectTag(int var1, int var2, int var3) { } } - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; @@ -828,8 +835,8 @@ public int getObjectFlags(int var1, int var2, int var3, long var4) { } } - @ObfuscatedName("bv") - public void method1308(int var1, int var2, int var3) { + @ObfuscatedName("bf") + public void method1488(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.planes; ++var4) { for (int var5 = 0; var5 < this.xSize; ++var5) { for (int var6 = 0; var6 < this.ySize; ++var6) { @@ -839,11 +846,11 @@ public void method1308(int var1, int var2, int var3) { ModelData var10; if (var8 != null && var8.renderable1 instanceof ModelData) { ModelData var9 = (ModelData)var8.renderable1; - this.method1310(var9, var4, var5, var6, 1, 1); + this.method1490(var9, var4, var5, var6, 1, 1); if (var8.renderable2 instanceof ModelData) { var10 = (ModelData)var8.renderable2; - this.method1310(var10, var4, var5, var6, 1, 1); - ModelData.method1221(var9, var10, 0, 0, 0, false); + this.method1490(var10, var4, var5, var6, 1, 1); + ModelData.method1405(var9, var10, 0, 0, 0, false); var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } @@ -854,7 +861,7 @@ public void method1308(int var1, int var2, int var3) { GameObject var14 = var7.gameObjects[var12]; if (var14 != null && var14.renderable instanceof ModelData) { ModelData var11 = (ModelData)var14.renderable; - this.method1310(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + this.method1490(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); } } @@ -862,7 +869,7 @@ public void method1308(int var1, int var2, int var3) { FloorDecoration var13 = var7.floorDecoration; if (var13 != null && var13.renderable instanceof ModelData) { var10 = (ModelData)var13.renderable; - this.method1309(var10, var4, var5, var6); + this.method1489(var10, var4, var5, var6); var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } @@ -872,11 +879,11 @@ public void method1308(int var1, int var2, int var3) { } - @ObfuscatedName("ba") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(Ljw;III)V" + descriptor = "(Lkq;III)V" ) - void method1309(ModelData var1, int var2, int var3, int var4) { + void method1489(ModelData var1, int var2, int var3, int var4) { int var6 = var3 + 1; int var7 = var4 - 1; int var8 = var4 + 1; @@ -887,9 +894,9 @@ void method1309(ModelData var1, int var2, int var3, int var4) { if (var10 >= 0 && var10 < this.ySize && (var9 >= var6 || var10 >= var8)) { Tile var11 = this.tiles[var2][var9][var10]; if (var11 != null && var11.floorDecoration != null && var11.floorDecoration.renderable instanceof ModelData) { - int var12 = this.method1311(var2, var9, var10, var2, var3, var4); + int var12 = this.method1491(var2, var9, var10, var2, var3, var4); ModelData var13 = (ModelData)var11.floorDecoration.renderable; - ModelData.method1221(var1, var13, (var9 - var3) * 128, var12, (var10 - var4) * 128, true); + ModelData.method1405(var1, var13, (var9 - var3) * 128, var12, (var10 - var4) * 128, true); } } } @@ -898,11 +905,11 @@ void method1309(ModelData var1, int var2, int var3, int var4) { } - @ObfuscatedName("bz") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(Ljw;IIIII)V" + descriptor = "(Lkq;IIIII)V" ) - void method1310(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method1490(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; @@ -917,18 +924,18 @@ void method1310(ModelData var1, int var2, int var3, int var4, int var5, int var6 if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { Tile var15 = this.tiles[var12][var13][var14]; if (var15 != null) { - int var16 = this.method1311(var12, var13, var14, var2, var3, var4); + int var16 = this.method1491(var12, var13, var14, var2, var3, var4); BoundaryObject var17 = var15.boundaryObject; if (var17 != null) { ModelData var18; if (var17.renderable1 instanceof ModelData) { var18 = (ModelData)var17.renderable1; - ModelData.method1221(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method1405(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } if (var17.renderable2 instanceof ModelData) { var18 = (ModelData)var17.renderable2; - ModelData.method1221(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method1405(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } @@ -938,7 +945,7 @@ void method1310(ModelData var1, int var2, int var3, int var4, int var5, int var6 ModelData var20 = (ModelData)var19.renderable; int var21 = var19.endX - var19.startX + 1; int var22 = var19.endY - var19.startY + 1; - ModelData.method1221(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + ModelData.method1405(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -954,17 +961,17 @@ void method1310(ModelData var1, int var2, int var3, int var4, int var5, int var6 } - @ObfuscatedName("bb") - int method1311(int var1, int var2, int var3, int var4, int var5, int var6) { - return this.method1312(var1, var2, var3) - this.method1312(var4, var5, var6); + @ObfuscatedName("bm") + int method1491(int var1, int var2, int var3, int var4, int var5, int var6) { + return this.method1492(var1, var2, var3) - this.method1492(var4, var5, var6); } - @ObfuscatedName("bo") - int method1312(int var1, int var2, int var3) { + @ObfuscatedName("bp") + int method1492(int var1, int var2, int var3) { return (this.tileHeights[var1][var2 + 1][var3 + 1] + this.tileHeights[var1][var2][var3] + this.tileHeights[var1][var2][var3 + 1] + this.tileHeights[var1][var2 + 1][var3]) / 4; } - @ObfuscatedName("bp") + @ObfuscatedName("bw") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; @@ -1029,7 +1036,7 @@ public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, } } - @ObfuscatedName("br") + @ObfuscatedName("bo") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { if (!shouldSendWalk() || var4) { @@ -1043,13 +1050,13 @@ public void menuOpen(int var1, int var2, int var3, boolean var4) { } } - @ObfuscatedName("bs") + @ObfuscatedName("bt") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; } - @ObfuscatedName("bf") + @ObfuscatedName("bh") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { @@ -1116,11 +1123,7 @@ public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { Tile var16 = var8[var9][var10]; if (var16 != null) { - if (var16.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { - var16.drawPrimary = false; - var16.drawSecondary = false; - var16.drawGameObjectEdges = 0; - } else { + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { var16.drawPrimary = true; var16.drawSecondary = true; if (var16.gameObjectsCount > 0) { @@ -1130,6 +1133,10 @@ public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { } ++tileUpdateCount; + } else { + var16.drawPrimary = false; + var16.drawSecondary = false; + var16.drawGameObjectEdges = 0; } } } @@ -1246,9 +1253,9 @@ public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { checkClick = false; } - @ObfuscatedName("bh") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(Ljh;Z)V" + descriptor = "(Lkv;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1342,10 +1349,10 @@ void drawTile(Tile var1, boolean var2) { if (var3.linkedBelowTile != null) { var9 = var3.linkedBelowTile; if (var9.paint != null) { - if (!this.method1327(0, var4, var5)) { + if (!this.method1507(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method1327(0, var4, var5)) { + } else if (var9.model != null && !this.method1507(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1364,13 +1371,13 @@ void drawTile(Tile var1, boolean var2) { var20 = false; if (var3.paint != null) { - if (!this.method1327(var7, var4, var5)) { + if (!this.method1507(var7, var4, var5)) { var20 = true; if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method1327(var7, var4, var5)) { + } else if (var3.model != null && !this.method1507(var7, var4, var5)) { var20 = true; this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1392,43 +1399,43 @@ void drawTile(Tile var1, boolean var2) { var21 += 6; } - var11 = field2105[var21]; - var3.field2029 = field2110[var21]; + var11 = field2279[var21]; + var3.field2194 = field2275[var21]; } if (var31 != null) { - if ((var31.orientationA & field2107[var21]) != 0) { + if ((var31.orientationA & field2280[var21]) != 0) { if (var31.orientationA == 16) { var3.drawGameObjectEdges = 3; - var3.field2024 = field2106[var21]; - var3.field2031 = 3 - var3.field2024; + var3.field2196 = field2276[var21]; + var3.field2203 = 3 - var3.field2196; } else if (var31.orientationA == 32) { var3.drawGameObjectEdges = 6; - var3.field2024 = field2108[var21]; - var3.field2031 = 6 - var3.field2024; + var3.field2196 = field2278[var21]; + var3.field2203 = 6 - var3.field2196; } else if (var31.orientationA == 64) { var3.drawGameObjectEdges = 12; - var3.field2024 = field2109[var21]; - var3.field2031 = 12 - var3.field2024; + var3.field2196 = field2277[var21]; + var3.field2203 = 12 - var3.field2196; } else { var3.drawGameObjectEdges = 9; - var3.field2024 = field2111[var21]; - var3.field2031 = 9 - var3.field2024; + var3.field2196 = field2281[var21]; + var3.field2203 = 9 - var3.field2196; } } else { var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method1328(var7, var4, var5, var31.orientationA)) { + if ((var31.orientationA & var11) != 0 && !this.method1508(var7, var4, var5, var31.orientationA)) { var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method1328(var7, var4, var5, var31.orientationB)) { + if ((var31.orientationB & var11) != 0 && !this.method1508(var7, var4, var5, var31.orientationB)) { var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method1329(var7, var4, var5, var13.renderable1.height)) { + if (var13 != null && !this.method1509(var7, var4, var5, var13.renderable1.height)) { if ((var13.orientation & var11) != 0) { var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.z - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); } else if (var13.orientation == 256) { @@ -1516,7 +1523,7 @@ void drawTile(Tile var1, boolean var2) { var20 = true; for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2024) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2196) { var20 = false; break; } @@ -1524,7 +1531,7 @@ void drawTile(Tile var1, boolean var2) { if (var20) { var10 = var3.boundaryObject; - if (!this.method1328(var7, var4, var5, var10.orientationA)) { + if (!this.method1508(var7, var4, var5, var10.orientationA)) { var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.z - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } @@ -1571,7 +1578,7 @@ void drawTile(Tile var1, boolean var2) { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2031) { + if ((var16 & var36.drawGameObjectEdges) == var3.field2203) { var3.drawGameObjects = true; continue label563; } @@ -1589,9 +1596,9 @@ void drawTile(Tile var1, boolean var2) { var15 = Scene_cameraYTile - var12.startY; var16 = var12.endY - Scene_cameraYTile; if (var16 > var15) { - var12.field2319 = var24 + var16; + var12.field2486 = var24 + var16; } else { - var12.field2319 = var24 + var15; + var12.field2486 = var24 + var15; } } } @@ -1603,10 +1610,10 @@ void drawTile(Tile var1, boolean var2) { for (var24 = 0; var24 < var21; ++var24) { GameObject var35 = gameObjects[var24]; if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field2319 > var11) { - var11 = var35.field2319; + if (var35.field2486 > var11) { + var11 = var35.field2486; var25 = var24; - } else if (var11 == var35.field2319) { + } else if (var11 == var35.field2486) { var15 = var35.centerX - Scene_cameraX; var16 = var35.centerY - Scene_cameraZ; var17 = gameObjects[var25].centerX - Scene_cameraX; @@ -1624,7 +1631,7 @@ void drawTile(Tile var1, boolean var2) { GameObject var33 = gameObjects[var25]; var33.lastDrawn = Scene_drawnCount; - if (!this.method1330(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { + if (!this.method1510(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } @@ -1696,10 +1703,10 @@ void drawTile(Tile var1, boolean var2) { } } - if (var3.field2029 != 0) { + if (var3.field2194 != 0) { WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method1329(var7, var4, var5, var29.renderable1.height)) { - if ((var29.orientation & var3.field2029) != 0) { + if (var29 != null && !this.method1509(var7, var4, var5, var29.renderable1.height)) { + if ((var29.orientation & var3.field2194) != 0) { var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.z - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); } else if (var29.orientation == 256) { var11 = var29.x - Scene_cameraX; @@ -1728,11 +1735,11 @@ void drawTile(Tile var1, boolean var2) { BoundaryObject var27 = var3.boundaryObject; if (var27 != null) { - if ((var27.orientationB & var3.field2029) != 0 && !this.method1328(var7, var4, var5, var27.orientationB)) { + if ((var27.orientationB & var3.field2194) != 0 && !this.method1508(var7, var4, var5, var27.orientationB)) { var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field2029) != 0 && !this.method1328(var7, var4, var5, var27.orientationA)) { + if ((var27.orientationA & var3.field2194) != 0 && !this.method1508(var7, var4, var5, var27.orientationA)) { var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } @@ -1776,9 +1783,9 @@ void drawTile(Tile var1, boolean var2) { } } - @ObfuscatedName("bl") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(Ljz;IIIIIII)V" + descriptor = "(Lke;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -1829,18 +1836,18 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var int var27 = Rasterizer3D.getClipMidY() + var19 * Rasterizer3D.get3dZoom() / var16; int var28 = Rasterizer3D.getClipMidX() + var9 * Rasterizer3D.get3dZoom() / var15; int var29 = Rasterizer3D.getClipMidY() + var21 * Rasterizer3D.get3dZoom() / var15; - float var30 = SecureRandomFuture.method443(var12); - float var31 = SecureRandomFuture.method443(var11); - float var32 = SecureRandomFuture.method443(var16); - float var33 = SecureRandomFuture.method443(var15); - Rasterizer3D.clips.field2282 = 0; + float var30 = WorldMapAreaData.method1364(var12); + float var31 = WorldMapAreaData.method1364(var11); + float var32 = WorldMapAreaData.method1364(var16); + float var33 = WorldMapAreaData.method1364(var15); + Rasterizer3D.clips.field2452 = 0; int var34; int var35; if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.clips.field2278 = false; - var34 = Rasterizer3D.method1246(); + Rasterizer3D.clips.field2446 = false; + var34 = Rasterizer3D.method1425(); if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > var34 || var28 > var34 || var24 > var34) { - Rasterizer3D.clips.field2278 = true; + Rasterizer3D.clips.field2446 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { @@ -1850,25 +1857,25 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var if (var1.texture == -1) { if (var1.neColor != 12345678) { - Rasterizer3D.method1253(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor); + Rasterizer3D.method1432(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor); } } else if (!Scene_isLowDetail) { if (var1.isFlat) { - Rasterizer3D.method1256(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); + Rasterizer3D.method1435(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - Rasterizer3D.method1256(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); + Rasterizer3D.method1435(var27, var29, var25, var26, var28, var24, var32, var33, var31, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); } } else { var35 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method1253(var27, var29, var25, var26, var28, var24, var32, var33, var31, method1324(var35, var1.neColor), method1324(var35, var1.nwColor), method1324(var35, var1.seColor)); + Rasterizer3D.method1432(var27, var29, var25, var26, var28, var24, var32, var33, var31, method1504(var35, var1.neColor), method1504(var35, var1.nwColor), method1504(var35, var1.seColor)); } } if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.clips.field2278 = false; - var34 = Rasterizer3D.method1246(); + Rasterizer3D.clips.field2446 = false; + var34 = Rasterizer3D.method1425(); if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > var34 || var24 > var34 || var28 > var34) { - Rasterizer3D.clips.field2278 = true; + Rasterizer3D.clips.field2446 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { @@ -1878,13 +1885,13 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var if (var1.texture == -1) { if (var1.swColor != 12345678) { - Rasterizer3D.method1253(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor); + Rasterizer3D.method1432(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor); } } else if (!Scene_isLowDetail) { - Rasterizer3D.method1256(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); + Rasterizer3D.method1435(var23, var25, var29, var22, var24, var28, var30, var31, var33, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { var35 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method1253(var23, var25, var29, var22, var24, var28, var30, var31, var33, method1324(var35, var1.swColor), method1324(var35, var1.seColor), method1324(var35, var1.nwColor)); + Rasterizer3D.method1432(var23, var25, var29, var22, var24, var28, var30, var31, var33, method1504(var35, var1.swColor), method1504(var35, var1.seColor), method1504(var35, var1.nwColor)); } } @@ -1894,9 +1901,9 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var } } - @ObfuscatedName("bg") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(Ljf;IIIIII)V" + descriptor = "(Lkl;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -1921,37 +1928,37 @@ void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5 } if (var1.triangleTextureId != null) { - SceneTileModel.field2163[var9] = var10; - SceneTileModel.field2162[var9] = var13; - SceneTileModel.field2166[var9] = var12; + SceneTileModel.field2333[var9] = var10; + SceneTileModel.field2330[var9] = var13; + SceneTileModel.field2334[var9] = var12; } - SceneTileModel.field2164[var9] = Rasterizer3D.getClipMidX() + var10 * Rasterizer3D.get3dZoom() / var12; - SceneTileModel.field2165[var9] = Rasterizer3D.getClipMidY() + var13 * Rasterizer3D.get3dZoom() / var12; - SceneTileModel.field2161[var9] = SecureRandomFuture.method443(var12); + SceneTileModel.field2332[var9] = Rasterizer3D.getClipMidX() + var10 * Rasterizer3D.get3dZoom() / var12; + SceneTileModel.field2331[var9] = Rasterizer3D.getClipMidY() + var13 * Rasterizer3D.get3dZoom() / var12; + SceneTileModel.field2329[var9] = WorldMapAreaData.method1364(var12); } - Rasterizer3D.clips.field2282 = 0; + Rasterizer3D.clips.field2452 = 0; var8 = var1.faceX.length; for (var9 = 0; var9 < var8; ++var9) { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = SceneTileModel.field2164[var10]; - int var14 = SceneTileModel.field2164[var11]; - int var15 = SceneTileModel.field2164[var12]; - int var16 = SceneTileModel.field2165[var10]; - int var17 = SceneTileModel.field2165[var11]; - int var18 = SceneTileModel.field2165[var12]; - float var19 = SceneTileModel.field2161[var10]; - float var20 = SceneTileModel.field2161[var11]; - float var21 = SceneTileModel.field2161[var12]; + var13 = SceneTileModel.field2332[var10]; + int var14 = SceneTileModel.field2332[var11]; + int var15 = SceneTileModel.field2332[var12]; + int var16 = SceneTileModel.field2331[var10]; + int var17 = SceneTileModel.field2331[var11]; + int var18 = SceneTileModel.field2331[var12]; + float var19 = SceneTileModel.field2329[var10]; + float var20 = SceneTileModel.field2329[var11]; + float var21 = SceneTileModel.field2329[var12]; if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.clips.field2278 = false; - int var22 = Rasterizer3D.method1246(); + Rasterizer3D.clips.field2446 = false; + int var22 = Rasterizer3D.method1425(); if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > var22 || var14 > var22 || var15 > var22) { - Rasterizer3D.clips.field2278 = true; + Rasterizer3D.clips.field2446 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { @@ -1962,23 +1969,23 @@ void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5 if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { if (!Scene_isLowDetail) { if (var1.isFlat) { - Rasterizer3D.method1256(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2163[0], SceneTileModel.field2163[1], SceneTileModel.field2163[3], SceneTileModel.field2162[0], SceneTileModel.field2162[1], SceneTileModel.field2162[3], SceneTileModel.field2166[0], SceneTileModel.field2166[1], SceneTileModel.field2166[3], var1.triangleTextureId[var9]); + Rasterizer3D.method1435(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2333[0], SceneTileModel.field2333[1], SceneTileModel.field2333[3], SceneTileModel.field2330[0], SceneTileModel.field2330[1], SceneTileModel.field2330[3], SceneTileModel.field2334[0], SceneTileModel.field2334[1], SceneTileModel.field2334[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.method1256(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2163[var10], SceneTileModel.field2163[var11], SceneTileModel.field2163[var12], SceneTileModel.field2162[var10], SceneTileModel.field2162[var11], SceneTileModel.field2162[var12], SceneTileModel.field2166[var10], SceneTileModel.field2166[var11], SceneTileModel.field2166[var12], var1.triangleTextureId[var9]); + Rasterizer3D.method1435(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2333[var10], SceneTileModel.field2333[var11], SceneTileModel.field2333[var12], SceneTileModel.field2330[var10], SceneTileModel.field2330[var11], SceneTileModel.field2330[var12], SceneTileModel.field2334[var10], SceneTileModel.field2334[var11], SceneTileModel.field2334[var12], var1.triangleTextureId[var9]); } } else { int var23 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method1253(var16, var17, var18, var13, var14, var15, var19, var20, var21, method1324(var23, var1.triangleColorA[var9]), method1324(var23, var1.triangleColorB[var9]), method1324(var23, var1.triangleColorC[var9])); + Rasterizer3D.method1432(var16, var17, var18, var13, var14, var15, var19, var20, var21, method1504(var23, var1.triangleColorA[var9]), method1504(var23, var1.triangleColorB[var9]), method1504(var23, var1.triangleColorC[var9])); } } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method1253(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + Rasterizer3D.method1432(var16, var17, var18, var13, var14, var15, var19, var20, var21, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } } - @ObfuscatedName("bi") + @ObfuscatedName("bk") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; @@ -2017,20 +2024,20 @@ void occlude() { if (var13) { var9 = Scene_cameraX - var4.minX; if (var9 > 32) { - var4.field2135 = 1; + var4.field2318 = 1; } else { if (var9 >= -32) { continue; } - var4.field2135 = 2; + var4.field2318 = 2; var9 = -var9; } - var4.field2148 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field2140 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field2144 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2149 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field2320 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field2309 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field2308 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2311 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2059,20 +2066,20 @@ void occlude() { if (var13) { var9 = Scene_cameraZ - var4.minZ; if (var9 > 32) { - var4.field2135 = 3; + var4.field2318 = 3; } else { if (var9 >= -32) { continue; } - var4.field2135 = 4; + var4.field2318 = 4; var9 = -var9; } - var4.field2146 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field2152 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field2144 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2149 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field2319 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field2315 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field2308 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2311 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2113,11 +2120,11 @@ void occlude() { } if (var10) { - var4.field2135 = 5; - var4.field2146 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field2152 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field2148 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field2140 = (var4.maxZ - Scene_cameraZ << 8) / var5; + var4.field2318 = 5; + var4.field2319 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field2315 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field2320 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field2309 = (var4.maxZ - Scene_cameraZ << 8) / var5; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2127,9 +2134,9 @@ void occlude() { } - @ObfuscatedName("bq") - boolean method1327(int var1, int var2, int var3) { - int var4 = this.field2120[var1][var2][var3]; + @ObfuscatedName("br") + boolean method1507(int var1, int var2, int var3) { + int var4 = this.field2290[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; } else if (var4 == Scene_drawnCount) { @@ -2137,19 +2144,19 @@ boolean method1327(int var1, int var2, int var3) { } else { int var5 = var2 << 7; int var6 = var3 << 7; - if (this.method1331(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method1331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method1331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method1331(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field2120[var1][var2][var3] = Scene_drawnCount; + if (this.method1511(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method1511(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method1511(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method1511(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field2290[var1][var2][var3] = Scene_drawnCount; return true; } else { - this.field2120[var1][var2][var3] = -Scene_drawnCount; + this.field2290[var1][var2][var3] = -Scene_drawnCount; return false; } } } - @ObfuscatedName("bw") - boolean method1328(int var1, int var2, int var3, int var4) { - if (!this.method1327(var1, var2, var3)) { + @ObfuscatedName("bq") + boolean method1508(int var1, int var2, int var3, int var4) { + if (!this.method1507(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; @@ -2161,30 +2168,30 @@ boolean method1328(int var1, int var2, int var3, int var4) { if (var4 < 16) { if (var4 == 1) { if (var5 > Scene_cameraX) { - if (!this.method1331(var5, var7, var6)) { + if (!this.method1511(var5, var7, var6)) { return false; } - if (!this.method1331(var5, var7, var6 + 128)) { + if (!this.method1511(var5, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method1331(var5, var8, var6)) { + if (!this.method1511(var5, var8, var6)) { return false; } - if (!this.method1331(var5, var8, var6 + 128)) { + if (!this.method1511(var5, var8, var6 + 128)) { return false; } } - if (!this.method1331(var5, var9, var6)) { + if (!this.method1511(var5, var9, var6)) { return false; } - if (!this.method1331(var5, var9, var6 + 128)) { + if (!this.method1511(var5, var9, var6 + 128)) { return false; } @@ -2193,30 +2200,30 @@ boolean method1328(int var1, int var2, int var3, int var4) { if (var4 == 2) { if (var6 < Scene_cameraZ) { - if (!this.method1331(var5, var7, var6 + 128)) { + if (!this.method1511(var5, var7, var6 + 128)) { return false; } - if (!this.method1331(var5 + 128, var7, var6 + 128)) { + if (!this.method1511(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method1331(var5, var8, var6 + 128)) { + if (!this.method1511(var5, var8, var6 + 128)) { return false; } - if (!this.method1331(var5 + 128, var8, var6 + 128)) { + if (!this.method1511(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method1331(var5, var9, var6 + 128)) { + if (!this.method1511(var5, var9, var6 + 128)) { return false; } - if (!this.method1331(var5 + 128, var9, var6 + 128)) { + if (!this.method1511(var5 + 128, var9, var6 + 128)) { return false; } @@ -2225,30 +2232,30 @@ boolean method1328(int var1, int var2, int var3, int var4) { if (var4 == 4) { if (var5 < Scene_cameraX) { - if (!this.method1331(var5 + 128, var7, var6)) { + if (!this.method1511(var5 + 128, var7, var6)) { return false; } - if (!this.method1331(var5 + 128, var7, var6 + 128)) { + if (!this.method1511(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method1331(var5 + 128, var8, var6)) { + if (!this.method1511(var5 + 128, var8, var6)) { return false; } - if (!this.method1331(var5 + 128, var8, var6 + 128)) { + if (!this.method1511(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method1331(var5 + 128, var9, var6)) { + if (!this.method1511(var5 + 128, var9, var6)) { return false; } - if (!this.method1331(var5 + 128, var9, var6 + 128)) { + if (!this.method1511(var5 + 128, var9, var6 + 128)) { return false; } @@ -2257,30 +2264,30 @@ boolean method1328(int var1, int var2, int var3, int var4) { if (var4 == 8) { if (var6 > Scene_cameraZ) { - if (!this.method1331(var5, var7, var6)) { + if (!this.method1511(var5, var7, var6)) { return false; } - if (!this.method1331(var5 + 128, var7, var6)) { + if (!this.method1511(var5 + 128, var7, var6)) { return false; } } if (var1 > 0) { - if (!this.method1331(var5, var8, var6)) { + if (!this.method1511(var5, var8, var6)) { return false; } - if (!this.method1331(var5 + 128, var8, var6)) { + if (!this.method1511(var5 + 128, var8, var6)) { return false; } } - if (!this.method1331(var5, var9, var6)) { + if (!this.method1511(var5, var9, var6)) { return false; } - if (!this.method1331(var5 + 128, var9, var6)) { + if (!this.method1511(var5 + 128, var9, var6)) { return false; } @@ -2288,49 +2295,49 @@ boolean method1328(int var1, int var2, int var3, int var4) { } } - if (!this.method1331(var5 + 64, var10, var6 + 64)) { + if (!this.method1511(var5 + 64, var10, var6 + 64)) { return false; } else if (var4 == 16) { - return this.method1331(var5, var9, var6 + 128); + return this.method1511(var5, var9, var6 + 128); } else if (var4 == 32) { - return this.method1331(var5 + 128, var9, var6 + 128); + return this.method1511(var5 + 128, var9, var6 + 128); } else if (var4 == 64) { - return this.method1331(var5 + 128, var9, var6); + return this.method1511(var5 + 128, var9, var6); } else if (var4 == 128) { - return this.method1331(var5, var9, var6); + return this.method1511(var5, var9, var6); } else { return true; } } } - @ObfuscatedName("ce") - boolean method1329(int var1, int var2, int var3, int var4) { - if (!this.method1327(var1, var2, var3)) { + @ObfuscatedName("cf") + boolean method1509(int var1, int var2, int var3, int var4) { + if (!this.method1507(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; int var6 = var3 << 7; - return this.method1331(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method1331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method1331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method1331(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + return this.method1511(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method1511(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method1511(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method1511(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } } - @ObfuscatedName("cu") - boolean method1330(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("cg") + boolean method1510(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; if (var3 == var2 && var5 == var4) { - if (!this.method1327(var1, var2, var4)) { + if (!this.method1507(var1, var2, var4)) { return false; } else { var7 = var2 << 7; var8 = var4 << 7; - return this.method1331(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method1331(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method1331(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method1331(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + return this.method1511(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method1511(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method1511(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method1511(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); } } else { for (var7 = var2; var7 <= var3; ++var7) { for (var8 = var4; var8 <= var5; ++var8) { - if (this.field2120[var1][var7][var8] == -Scene_drawnCount) { + if (this.field2290[var1][var7][var8] == -Scene_drawnCount) { return false; } } @@ -2339,17 +2346,17 @@ boolean method1330(int var1, int var2, int var3, int var4, int var5, int var6) { var7 = (var2 << 7) + 1; var8 = (var4 << 7) + 2; int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method1331(var7, var9, var8)) { + if (!this.method1511(var7, var9, var8)) { return false; } else { int var10 = (var3 << 7) - 1; - if (!this.method1331(var10, var9, var8)) { + if (!this.method1511(var10, var9, var8)) { return false; } else { int var11 = (var5 << 7) - 1; - if (!this.method1331(var7, var9, var11)) { + if (!this.method1511(var7, var9, var11)) { return false; - } else if (!this.method1331(var10, var9, var11)) { + } else if (!this.method1511(var10, var9, var11)) { return false; } else { return true; @@ -2359,8 +2366,8 @@ boolean method1330(int var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("cw") - boolean method1331(int var1, int var2, int var3) { + @ObfuscatedName("cv") + boolean method1511(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; int var6; @@ -2368,57 +2375,57 @@ boolean method1331(int var1, int var2, int var3) { int var8; int var9; int var10; - if (var5.field2135 == 1) { + if (var5.field2318 == 1) { var6 = var5.minX - var1; if (var6 > 0) { - var7 = (var6 * var5.field2148 >> 8) + var5.minZ; - var8 = (var6 * var5.field2140 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2144 >> 8) + var5.minY; - var10 = (var6 * var5.field2149 >> 8) + var5.maxY; + var7 = (var6 * var5.field2320 >> 8) + var5.minZ; + var8 = (var6 * var5.field2309 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2308 >> 8) + var5.minY; + var10 = (var6 * var5.field2311 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2135 == 2) { + } else if (var5.field2318 == 2) { var6 = var1 - var5.minX; if (var6 > 0) { - var7 = (var6 * var5.field2148 >> 8) + var5.minZ; - var8 = (var6 * var5.field2140 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2144 >> 8) + var5.minY; - var10 = (var6 * var5.field2149 >> 8) + var5.maxY; + var7 = (var6 * var5.field2320 >> 8) + var5.minZ; + var8 = (var6 * var5.field2309 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2308 >> 8) + var5.minY; + var10 = (var6 * var5.field2311 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2135 == 3) { + } else if (var5.field2318 == 3) { var6 = var5.minZ - var3; if (var6 > 0) { - var7 = (var6 * var5.field2146 >> 8) + var5.minX; - var8 = (var6 * var5.field2152 >> 8) + var5.maxX; - var9 = (var6 * var5.field2144 >> 8) + var5.minY; - var10 = (var6 * var5.field2149 >> 8) + var5.maxY; + var7 = (var6 * var5.field2319 >> 8) + var5.minX; + var8 = (var6 * var5.field2315 >> 8) + var5.maxX; + var9 = (var6 * var5.field2308 >> 8) + var5.minY; + var10 = (var6 * var5.field2311 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2135 == 4) { + } else if (var5.field2318 == 4) { var6 = var3 - var5.minZ; if (var6 > 0) { - var7 = (var6 * var5.field2146 >> 8) + var5.minX; - var8 = (var6 * var5.field2152 >> 8) + var5.maxX; - var9 = (var6 * var5.field2144 >> 8) + var5.minY; - var10 = (var6 * var5.field2149 >> 8) + var5.maxY; + var7 = (var6 * var5.field2319 >> 8) + var5.minX; + var8 = (var6 * var5.field2315 >> 8) + var5.maxX; + var9 = (var6 * var5.field2308 >> 8) + var5.minY; + var10 = (var6 * var5.field2311 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2135 == 5) { + } else if (var5.field2318 == 5) { var6 = var2 - var5.minY; if (var6 > 0) { - var7 = (var6 * var5.field2146 >> 8) + var5.minX; - var8 = (var6 * var5.field2152 >> 8) + var5.maxX; - var9 = (var6 * var5.field2148 >> 8) + var5.minZ; - var10 = (var6 * var5.field2140 >> 8) + var5.maxZ; + var7 = (var6 * var5.field2319 >> 8) + var5.minX; + var8 = (var6 * var5.field2315 >> 8) + var5.maxX; + var9 = (var6 * var5.field2320 >> 8) + var5.minZ; + var10 = (var6 * var5.field2309 >> 8) + var5.maxZ; if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } @@ -2429,7 +2436,7 @@ boolean method1331(int var1, int var2, int var3) { return false; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { Occluder var8 = new Occluder(); @@ -2447,7 +2454,7 @@ public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; } - @ObfuscatedName("bt") + @ObfuscatedName("bj") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; @@ -2480,7 +2487,7 @@ public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int v boolean var14 = false; for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method1315(var12, var0[var8] + var15, var13)) { + if (method1495(var12, var0[var8] + var15, var13)) { var14 = true; break; } @@ -2531,8 +2538,8 @@ public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int v } - @ObfuscatedName("bm") - static boolean method1315(int var0, int var1, int var2) { + @ObfuscatedName("bn") + static boolean method1495(int var0, int var1, int var2) { int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; @@ -2546,20 +2553,20 @@ static boolean method1315(int var0, int var1, int var2) { } } - @ObfuscatedName("bc") + @ObfuscatedName("bu") @Export("shouldSendWalk") public static boolean shouldSendWalk() { return viewportWalking && Scene_selectedX != -1; } - @ObfuscatedName("bu") - public static void method1319() { + @ObfuscatedName("by") + public static void method1499() { Scene_selectedX = -1; viewportWalking = false; } - @ObfuscatedName("bj") - static final int method1324(int var0, int var1) { + @ObfuscatedName("bx") + static final int method1504(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2570,7 +2577,7 @@ static final int method1324(int var0, int var1) { return (var0 & 65408) + var1; } - @ObfuscatedName("bx") + @ObfuscatedName("bb") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 < var2 && var1 < var3 && var1 < var4) { diff --git a/osrs/src/main/java/SceneTileModel.java b/osrs/src/main/java/SceneTileModel.java index b0759c5e3..189210a7b 100644 --- a/osrs/src/main/java/SceneTileModel.java +++ b/osrs/src/main/java/SceneTileModel.java @@ -2,80 +2,80 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("jf") +@ObfuscatedName("kl") @Implements("SceneTileModel") public final class SceneTileModel { + @ObfuscatedName("ak") + static int[] field2332; @ObfuscatedName("aj") - static int[] field2164; - @ObfuscatedName("an") - static int[] field2165; - @ObfuscatedName("au") - static float[] field2161; + static int[] field2331; + @ObfuscatedName("am") + static float[] field2329; + @ObfuscatedName("aq") + static int[] field2333; @ObfuscatedName("ai") - static int[] field2163; - @ObfuscatedName("ae") - static int[] field2162; + static int[] field2330; @ObfuscatedName("aw") - static int[] field2166; - @ObfuscatedName("aq") - static final int[][] field2167; - @ObfuscatedName("az") - static final int[][] field2168; - @ObfuscatedName("ac") + static int[] field2334; + @ObfuscatedName("ae") + static final int[][] field2335; + @ObfuscatedName("an") + static final int[][] field2336; + @ObfuscatedName("at") @Export("vertexX") int[] vertexX; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("vertexY") int[] vertexY; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("faceX") int[] faceX; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("faceY") int[] faceY; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("faceZ") int[] faceZ; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("isFlat") boolean isFlat; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("shape") int shape; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("rotation") int rotation; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("overlayRgb") int overlayRgb; static { - field2164 = new int[6]; - field2165 = new int[6]; - field2161 = new float[6]; - field2163 = new int[6]; - field2162 = new int[6]; - field2166 = new int[6]; - field2167 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; - field2168 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; + field2332 = new int[6]; + field2331 = new int[6]; + field2329 = new float[6]; + field2333 = new int[6]; + field2330 = new int[6]; + field2334 = new int[6]; + field2335 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; + field2336 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -92,7 +92,7 @@ public final class SceneTileModel { int var21 = var20 / 2; int var22 = var20 / 4; int var23 = var20 * 3 / 4; - int[] var24 = field2167[var1]; + int[] var24 = field2335[var1]; int var25 = var24.length; this.vertexX = new int[var25]; this.vertexY = new int[var25]; @@ -227,7 +227,7 @@ public final class SceneTileModel { var27[var30] = var36; } - int[] var38 = field2168[var1]; + int[] var38 = field2336[var1]; var31 = var38.length / 4; this.faceX = new int[var31]; this.faceY = new int[var31]; diff --git a/osrs/src/main/java/SceneTilePaint.java b/osrs/src/main/java/SceneTilePaint.java index d7a2077ec..4ee8dcc97 100644 --- a/osrs/src/main/java/SceneTilePaint.java +++ b/osrs/src/main/java/SceneTilePaint.java @@ -1,29 +1,30 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jz") +@ObfuscatedName("ke") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("swColor") int swColor; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("seColor") int seColor; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("neColor") int neColor; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("nwColor") int nwColor; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("texture") int texture; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("isFlat") boolean isFlat; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("rgb") int rgb; @@ -37,4 +38,14 @@ public final class SceneTilePaint { this.rgb = var6; this.isFlat = var7; } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IZB)Ljava/lang/String;", + garbageValue = "12" + ) + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? Players.method619(var0, 10, var1) : Integer.toString(var0); + } } \ No newline at end of file diff --git a/osrs/src/main/java/Script.java b/osrs/src/main/java/Script.java index decec63fe..39f75ac54 100644 --- a/osrs/src/main/java/Script.java +++ b/osrs/src/main/java/Script.java @@ -3,43 +3,41 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("dt") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("ay") - static int[] field812; - @ObfuscatedName("al") - String field820; - @ObfuscatedName("ak") + @ObfuscatedName("ah") + String field823; + @ObfuscatedName("ar") @Export("opcodes") int[] opcodes; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("intOperands") int[] intOperands; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("localIntCount") int localIntCount; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("localStringCount") int localStringCount; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "[Ltp;" + descriptor = "[Ltz;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -51,45 +49,74 @@ public class Script extends DualNode { Script() { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)[Ltp;", - garbageValue = "-902364502" + descriptor = "(II)[Ltz;", + garbageValue = "714760120" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; } - @ObfuscatedName("aj") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1816632175" + descriptor = "(Ljava/lang/CharSequence;IZI)Z", + garbageValue = "1142322479" ) - static void method449(boolean var0) { - if (var0) { - class74.method426(); - } else { - for (int var1 = 0; var1 < class319.musicSongs.size(); ++var1) { - MusicSong var2 = (MusicSong)class319.musicSongs.get(var1); - if (var2 == null) { - class319.musicSongs.remove(var1); - --var1; - } else if (var2.field2882) { - if (var2.midiPcmStream.field2833 > 0) { - --var2.midiPcmStream.field2833; + static boolean method447(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); + + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; } + } - var2.midiPcmStream.clear(); - var2.midiPcmStream.method1666(); - var2.midiPcmStream.setPcmStreamVolume(0); - class319.musicSongs.remove(var1); - --var1; + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; } else { - var2.field2882 = true; + if (var8 < 'a' || var8 > 'z') { + return false; + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + return false; } + + if (var3) { + var10 = -var10; + } + + int var9 = var5 * var1 + var10; + if (var9 / var1 != var5) { + return false; + } + + var5 = var9; + var4 = true; } - } + return var4; + } else { + throw new IllegalArgumentException("" + var1); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/ScriptEvent.java b/osrs/src/main/java/ScriptEvent.java index 9134e88c9..a911ab737 100644 --- a/osrs/src/main/java/ScriptEvent.java +++ b/osrs/src/main/java/ScriptEvent.java @@ -3,49 +3,47 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; - -@ObfuscatedName("dl") +@ObfuscatedName("do") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("args") Object[] args; - @ObfuscatedName("al") - boolean field861; - @ObfuscatedName("ak") + @ObfuscatedName("ah") + boolean field866; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnn;" ) @Export("widget") Widget widget; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("mouseX") int mouseX; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("mouseY") int mouseY; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("opIndex") int opIndex; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnn;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("keyTyped") int keyTyped; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("keyPressed") int keyPressed; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("targetName") String targetName; - @ObfuscatedName("ag") - int field864; - @ObfuscatedName("aa") + @ObfuscatedName("ap") + int field871; + @ObfuscatedName("av") @Export("type") int type; @@ -53,415 +51,41 @@ public ScriptEvent() { this.type = 76; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([Ljava/lang/Object;B)V", - garbageValue = "-8" + descriptor = "([Ljava/lang/Object;I)V", + garbageValue = "-1214962197" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1815349260" + garbageValue = "334360487" ) @Export("setType") public void setType(int var1) { this.type = var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lnm;B)V", - garbageValue = "-116" + descriptor = "(Lnn;B)V", + garbageValue = "102" ) - public void method470(Widget var1) { + public void method467(Widget var1) { this.widget = var1; } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-119" - ) - static int method466(int var0, int var1) { - FloorOverlayDefinition var2 = class4.method4(var0); - if (var2 == null) { - return var1; - } else { - int var3; - int var4; - byte var5; - int var7; - if (var2.secondaryRgb >= 0) { - var3 = Occluder.method1340(var2.secondaryHue, var2.secondarySaturation, var2.secondaryLightness); - var5 = 96; - if (var3 == -2) { - var4 = 12345678; - } else if (var3 == -1) { - if (var5 < 0) { - var5 = 0; - } else if (var5 > 127) { - var5 = 127; - } - - var7 = 127 - var5; - var4 = var7; - } else { - var7 = var5 * (var3 & 127) / 128; - if (var7 < 2) { - var7 = 2; - } else if (var7 > 126) { - var7 = 126; - } - - var4 = var7 + (var3 & 65408); - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; - } else if (var2.texture >= 0) { - var4 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); - var5 = 96; - if (var4 == -2) { - var3 = 12345678; - } else if (var4 == -1) { - if (var5 < 0) { - var5 = 0; - } else if (var5 > 127) { - var5 = 127; - } - - var7 = 127 - var5; - var3 = var7; - } else { - var7 = var5 * (var4 & 127) / 128; - if (var7 < 2) { - var7 = 2; - } else if (var7 > 126) { - var7 = 126; - } - - var3 = var7 + (var4 & 65408); - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; - } else { - var3 = Occluder.method1340(var2.hue, var2.saturation, var2.lightness); - var5 = 96; - if (var3 == -2) { - var4 = 12345678; - } else if (var3 == -1) { - if (var5 < 0) { - var5 = 0; - } else if (var5 > 127) { - var5 = 127; - } - - var7 = 127 - var5; - var4 = var7; - } else { - var7 = var5 * (var3 & 127) / 128; - if (var7 < 2) { - var7 = 2; - } else if (var7 > 126) { - var7 = 126; - } - - var4 = var7 + (var3 & 65408); - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; - } - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lom;III)[Lud;", - garbageValue = "-1840423911" - ) - public static SpritePixels[] method468(AbstractArchive var0, int var1, int var2) { - if (!class164.method862(var0, var1, var2)) { - return null; - } else { - SpritePixels[] var4 = new SpritePixels[class544.SpriteBuffer_spriteCount]; - - for (int var5 = 0; var5 < class544.SpriteBuffer_spriteCount; ++var5) { - SpritePixels var6 = var4[var5] = new SpritePixels(); - var6.width = class159.SpriteBuffer_spriteWidth; - var6.height = class500.SpriteBuffer_spriteHeight; - var6.xOffset = class326.SpriteBuffer_xOffsets[var5]; - var6.yOffset = ModelData0.SpriteBuffer_yOffsets[var5]; - var6.subWidth = class59.SpriteBuffer_spriteWidths[var5]; - var6.subHeight = class544.SpriteBuffer_spriteHeights[var5]; - int var7 = var6.subWidth * var6.subHeight; - byte[] var8 = AddRequestTask.SpriteBuffer_pixels[var5]; - var6.pixels = new int[var7]; - - for (int var9 = 0; var9 < var7; ++var9) { - var6.pixels[var9] = class372.SpriteBuffer_spritePalette[var8[var9] & 255]; - } - } - - class407.method2062(); - return var4; - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Lom;Lom;ZIB)V", - garbageValue = "-22" - ) - static void method471(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.clearLoginScreen) { - if (var3 == 4) { - GameEngine.method166(4); - } - - } else { - if (var3 == 0) { - MusicPatchNode2.method1657(var2); - } else { - GameEngine.method166(var3); - } - - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - PcmPlayer.leftTitleSprite = Frames.method1335(var4); - Login.rightTitleSprite = PcmPlayer.leftTitleSprite.mirrorHorizontally(); - TextureProvider.method1351(var1, Client.worldProperties); - Login.titleboxSprite = class167.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - VarcInt.titlebuttonSprite = class167.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - Login.field775 = class167.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); - class364.field3198 = class167.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); - class167.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); - Login.runesSprite = InvDefinition.method953(var1, "runes", ""); - Login.title_muteSprite = InvDefinition.method953(var1, "title_mute", ""); - class519.options_buttons_0Sprite = class167.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - class305.field2513 = class167.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - class534.options_buttons_2Sprite = class167.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - ClanChannel.field1409 = class167.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - class274.field2399 = class519.options_buttons_0Sprite.subWidth; - class202.field1581 = class519.options_buttons_0Sprite.subHeight; - class544.field4278 = new LoginScreenAnimation(Login.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - Login.field766 = new String[8]; - Login.field751 = 0; - } - - ClientPreferences.field1059 = 0; - class186.otp = ""; - Login.field741 = true; - Login.worldSelectOpen = false; - if (!class91.clientPreferences.getTitleMusicDisabled()) { - ArrayList var5 = new ArrayList(); - var5.add(new MusicSong(CollisionMap.archive6, "scape main", "", 255, false)); - class148.method776(var5, 0, 0, 0, 100, false); - } else { - ItemComposition.method1088(0, 0); - } - - class470.method2362(); - class13.method45().method1961(false); - Login.clearLoginScreen = true; - Login.xPadding = (class340.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - class379.loginBoxCenter = Login.loginBoxX + 180; - PcmPlayer.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "77" - ) - static final int method472(int var0, int var1) { - if (var0 == -1) { - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("nd") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1310629797" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - class304.method1636(); - ZoneOperation.method1644(); - int var1 = class150.VarpDefinition_get(var0).type; - if (var1 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var1 == 1) { - if (var2 == 1) { - JagexCache.method920(0.9D); - } - - if (var2 == 2) { - JagexCache.method920(0.8D); - } - - if (var2 == 3) { - JagexCache.method920(0.7D); - } - - if (var2 == 4) { - JagexCache.method920(0.6D); - } - } - - if (var1 == 3) { - if (var2 == 0) { - JagexCache.method921(255); - } - - if (var2 == 1) { - JagexCache.method921(192); - } - - if (var2 == 2) { - JagexCache.method921(128); - } - - if (var2 == 3) { - JagexCache.method921(64); - } - - if (var2 == 4) { - JagexCache.method921(0); - } - } - - if (var1 == 4) { - if (var2 == 0) { - FloorOverlayDefinition.method1114(127); - } - - if (var2 == 1) { - FloorOverlayDefinition.method1114(96); - } - - if (var2 == 2) { - FloorOverlayDefinition.method1114(64); - } - - if (var2 == 3) { - FloorOverlayDefinition.method1114(32); - } - - if (var2 == 4) { - FloorOverlayDefinition.method1114(0); - } - } - - if (var1 == 5) { - Client.leftClickOpensMenu = var2 == 1; - } - - if (var1 == 6) { - Client.chatEffects = var2; - } - - if (var1 == 9) { - } - - if (var1 == 10) { - if (var2 == 0) { - class198.method994(127); - } - - if (var2 == 1) { - class198.method994(96); - } - - if (var2 == 2) { - class198.method994(64); - } - - if (var2 == 3) { - class198.method994(32); - } - - if (var2 == 4) { - class198.method994(0); - } - } - - if (var1 == 17) { - Client.followerIndex = var2 & 65535; - } - - if (var1 == 18) { - Client.playerAttackOption = (AttackOption)SequenceDefinition.findEnumerated(ClientPreferences.method569(), var2); - if (Client.playerAttackOption == null) { - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var1 == 19) { - if (var2 == -1) { - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; - } - } - - if (var1 == 22) { - Client.npcAttackOption = (AttackOption)SequenceDefinition.findEnumerated(ClientPreferences.method569(), var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } - } - - @ObfuscatedName("os") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "-1009991511" + descriptor = "(ILdt;ZB)I", + garbageValue = "0" ) - static String method474(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (Client.gameBuild == 1) { - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { - var0 = "local"; - } - - String var3 = ""; - if (HealthBarDefinition.param9 != null) { - var3 = "/p=" + HealthBarDefinition.param9; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + WorldMapLabelSize.clientLanguage + "/a=" + WorldMapIcon_1.field2337 + var3 + "/"; + static int method468(int var0, Script var1, boolean var2) { + return 2; } } \ No newline at end of file diff --git a/osrs/src/main/java/ScriptFrame.java b/osrs/src/main/java/ScriptFrame.java index 0e9124e37..55ab6ba4d 100644 --- a/osrs/src/main/java/ScriptFrame.java +++ b/osrs/src/main/java/ScriptFrame.java @@ -3,22 +3,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("cs") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("ac") + @ObfuscatedName("lk") + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("uh") + @Export("cameraLookAtX") + static int cameraLookAtX; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Ldt;" ) @Export("script") Script script; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("pc") int pc; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("intLocals") int[] intLocals; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("stringLocals") String[] stringLocals; @@ -26,27 +32,53 @@ public class ScriptFrame { this.pc = -1; } - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1603981165" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1468769999" ) - public static boolean method334() { - return !class319.field2789.isEmpty(); + static final void method343(String var0) { + PacketBufferNode var1 = class113.getPacketBufferNode(ClientPacket.FIREND_ADDUSER, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(ClanChannel.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } - @ObfuscatedName("ag") + @ObfuscatedName("kr") @ObfuscatedSignature( - descriptor = "(Lnm;IIII)V", - garbageValue = "1957450993" + descriptor = "(Ldp;I)V", + garbageValue = "128237974" ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field3074 == null) { - throw new RuntimeException(); - } else { - var0.field3074[var1] = var2; - var0.field3075[var1] = var3; + static final void method344(PendingSpawn var0) { + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { + var1 = class36.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); } + + if (var0.type == 1) { + var1 = class36.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { + var1 = class36.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = class36.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (0L != var1) { + int var6 = class36.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = class232.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; + } + + var0.objectId = var3; + var0.field951 = var4; + var0.field961 = var5; } } \ No newline at end of file diff --git a/osrs/src/main/java/SecureRandomCallable.java b/osrs/src/main/java/SecureRandomCallable.java index a8cba02f1..f5474fbfc 100644 --- a/osrs/src/main/java/SecureRandomCallable.java +++ b/osrs/src/main/java/SecureRandomCallable.java @@ -3,21 +3,17 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.security.SecureRandom; +import java.util.Iterator; import java.util.concurrent.Callable; -@ObfuscatedName("dz") +@ObfuscatedName("dx") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("dq") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[Lud;" + descriptor = "Lol;" ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("uo") - @Export("cameraMoveToSpeed") - static int cameraMoveToSpeed; + public static AbstractArchive field851; SecureRandomCallable() { } @@ -25,27 +21,406 @@ public class SecureRandomCallable implements Callable { @Export("call") @ObfuscatedName("call") public Object call() { - SecureRandom var2 = new SecureRandom(); - var2.nextInt(); - return var2; + return HealthBarDefinition.method911(); } - @ObfuscatedName("oy") + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)[Lun;", + garbageValue = "0" + ) + static PrivateChatMode[] method456() { + return new PrivateChatMode[]{PrivateChatMode.field4304, PrivateChatMode.field4305, PrivateChatMode.field4303}; + } + + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2097515012" + garbageValue = "2131515534" ) - static void method458() { - if (WallDecoration.field2303 != null) { - Client.field368 = Client.cycle; - WallDecoration.field2303.method1998(); - - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - WallDecoration.field2303.method1997((Client.players[var0].x >> 7) + class20.baseX, (Client.players[var0].y >> 7) + class19.baseY); + static void method457() { + Iterator var0 = class316.musicSongs.iterator(); + + while (true) { + MusicSong var1; + do { + if (!var0.hasNext()) { + class316.musicSongs.clear(); + return; } + + var1 = (MusicSong)var0.next(); + } while(var1 == null); + + var1.midiPcmStream.clear(); + var1.midiPcmStream.method1657(); + var1.midiPcmStream.setPcmStreamVolume(0); + var1.midiPcmStream.field2830 = 0; + int var2 = var1.musicTrackGroupId; + int var3 = var1.musicTrackFileId; + Iterator var4 = class316.field2793.iterator(); + + while (var4.hasNext()) { + class322 var5 = (class322)var4.next(); + var5.vmethod1644(var2, var3); } } + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "-732445486" + ) + static int method458(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { + var3 = ItemLayer.Client_plane; + int var9 = (class229.localPlayer.x >> 7) + NewShit.baseX; + int var5 = (class229.localPlayer.y >> 7) + class101.baseY; + WorldMapArchiveLoader.getWorldMap().method2408(var3, var9, var5, true); + return 1; + } else { + WorldMapArea var11; + if (var0 == 6601) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + String var16 = ""; + var11 = WorldMapArchiveLoader.getWorldMap().getMapArea(var3); + if (var11 != null) { + var16 = var11.getExternalName(); + } + + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == 6602) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + WorldMapArchiveLoader.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == 6603) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == 6604) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + WorldMapArchiveLoader.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == 6605) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; + } else { + Coord var15; + if (var0 == 6606) { + var15 = new Coord(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + WorldMapArchiveLoader.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); + return 1; + } else if (var0 == 6607) { + var15 = new Coord(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + WorldMapArchiveLoader.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); + return 1; + } else if (var0 == 6608) { + var15 = new Coord(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + WorldMapArchiveLoader.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == 6609) { + var15 = new Coord(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + WorldMapArchiveLoader.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == 6610) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.getWorldMap().getDisplayY(); + return 1; + } else { + WorldMapArea var13; + if (var0 == 6611) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var13 = WorldMapArchiveLoader.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); + } + + return 1; + } else if (var0 == 6612) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var13 = WorldMapArchiveLoader.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; + } + return 1; + } else if (var0 == 6613) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var13 = WorldMapArchiveLoader.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } else if (var0 == 6614) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var13 = WorldMapArchiveLoader.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var13.getZoom(); + } + + return 1; + } else if (var0 == 6615) { + var15 = WorldMapArchiveLoader.getWorldMap().getDisplayCoord(); + if (var15 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var15.x; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var15.y; + } + + return 1; + } else if (var0 == 6616) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == 6617) { + var15 = new Coord(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + var13 = WorldMapArchiveLoader.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + int[] var14 = var13.position(var15.plane, var15.x, var15.y); + if (var14 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var14[0]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var14[1]; + } + + return 1; + } + } else { + Coord var7; + if (var0 == 6618) { + var15 = new Coord(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + var13 = WorldMapArchiveLoader.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + var7 = var13.coord(var15.x, var15.y); + if (var7 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } + } else { + Coord var12; + if (var0 == 6619) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + FriendsChat.method2224(var3, var12, false); + return 1; + } else if (var0 == 6620) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + FriendsChat.method2224(var3, var12, true); + return 1; + } else if (var0 == 6621) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + var11 = WorldMapArchiveLoader.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; + return 1; + } + } else if (var0 == 6622) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var15 = new Coord(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + var13 = WorldMapArchiveLoader.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); + if (var13 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var13.getId(); + } + + return 1; + } else if (var0 == 6624) { + WorldMapArchiveLoader.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + WorldMapArchiveLoader.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + WorldMapArchiveLoader.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + WorldMapArchiveLoader.getWorldMap().resetCyclesPerFlash(); + return 1; + } else { + boolean var10; + if (var0 == 6628) { + var10 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + WorldMapArchiveLoader.getWorldMap().setPerpetualFlash(var10); + return 1; + } else if (var0 == 6629) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + WorldMapArchiveLoader.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == 6630) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + WorldMapArchiveLoader.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == 6631) { + WorldMapArchiveLoader.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == 6632) { + var10 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + WorldMapArchiveLoader.getWorldMap().setElementsDisabled(var10); + return 1; + } else { + boolean var4; + if (var0 == 6633) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1] == 1; + WorldMapArchiveLoader.getWorldMap().disableElement(var3, var4); + return 1; + } else if (var0 == 6634) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1] == 1; + WorldMapArchiveLoader.getWorldMap().setCategoryDisabled(var3, var4); + return 1; + } else if (var0 == 6635) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == 6636) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6637) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapArchiveLoader.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + var7 = WorldMapArchiveLoader.getWorldMap().method2452(var3, var12); + if (var7 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } else { + AbstractWorldMapIcon var8; + if (var0 == 6639) { + var8 = WorldMapArchiveLoader.getWorldMap().iconStart(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else if (var0 == 6640) { + var8 = WorldMapArchiveLoader.getWorldMap().iconNext(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else { + WorldMapElement var6; + if (var0 == 6693) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var6 = class141.WorldMapElement_get(var3); + if (var6.name == null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var6.name; + } + + return 1; + } else if (var0 == 6694) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var6 = class141.WorldMapElement_get(var3); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var6.textSize; + return 1; + } else if (var0 == 6695) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var6 = class141.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var6.category; + } + + return 1; + } else if (var0 == 6696) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var6 = class141.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var6.sprite1; + } + + return 1; + } else if (var0 == 6697) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class133.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class133.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == 6699) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class133.worldMapEvent.coord2.packed(); + return 1; + } else { + return 2; + } + } + } + } + } + } + } + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/SecureRandomFuture.java b/osrs/src/main/java/SecureRandomFuture.java index 7651e290e..a72b828d6 100644 --- a/osrs/src/main/java/SecureRandomFuture.java +++ b/osrs/src/main/java/SecureRandomFuture.java @@ -8,21 +8,16 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -@ObfuscatedName("dm") +@ObfuscatedName("cd") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("ah") - @Export("Tiles_shapes") - static byte[][][] Tiles_shapes; - @ObfuscatedName("av") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("ir") - static int[] field809; - @ObfuscatedName("ac") + @ObfuscatedName("kh") + @Export("cameraY") + static int cameraY; + @ObfuscatedName("at") @Export("executor") ExecutorService executor; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("future") Future future; @@ -31,10 +26,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "75" + descriptor = "(I)V", + garbageValue = "-55292502" ) @Export("shutdown") void shutdown() { @@ -42,20 +37,20 @@ void shutdown() { this.executor = null; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1952225914" + descriptor = "(B)Z", + garbageValue = "20" ) @Export("isDone") boolean isDone() { return this.future.isDone(); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "862228801" + garbageValue = "694331827" ) @Export("get") SecureRandom get() { @@ -67,99 +62,4 @@ SecureRandom get() { return var3; } } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ILrw;Lok;I)V", - garbageValue = "-1154223283" - ) - static void method444(int var0, ArchiveDisk var1, Archive var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 1; - var3.key = (long)var0; - var3.archiveDisk = var1; - var3.archive = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); - } - - class87.method461(); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1191570763" - ) - @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var4 == null) { - var4 = new ItemContainer(); - ItemContainer.itemContainers.put(var4, (long)var0); - } - - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; - - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { - var5[var7] = var4.ids[var7]; - var6[var7] = var4.quantities[var7]; - } - - for (var7 = var4.ids.length; var7 < var1; ++var7) { - var5[var7] = -1; - var6[var7] = 0; - } - - var4.ids = var5; - var4.quantities = var6; - } - - var4.ids[var1] = var2; - var4.quantities[var1] = var3; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "469992378" - ) - static final float method443(int var0) { - float var1 = 10075.0F - (float)var0; - return (1.0075567F * var1 - 75.56675F) / var1; - } - - @ObfuscatedName("ah") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); - } - - @ObfuscatedName("nn") - @ObfuscatedSignature( - descriptor = "(IIIILud;Lmp;B)V", - garbageValue = "23" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { - int var6 = Client.camAngleY & 2047; - int var7 = var3 * var3 + var2 * var2; - if (var7 <= 6400) { - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var10 = var9 * var2 + var3 * var8 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - if (var7 > 2500) { - var4.method2723(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); - } - - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/SequenceDefinition.java b/osrs/src/main/java/SequenceDefinition.java index 1237bac04..de0a28286 100644 --- a/osrs/src/main/java/SequenceDefinition.java +++ b/osrs/src/main/java/SequenceDefinition.java @@ -6,109 +6,103 @@ import java.util.HashMap; import java.util.Map; -@ObfuscatedName("if") +@ObfuscatedName("hx") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("ac") - static boolean field1841; - @ObfuscatedName("ah") + @ObfuscatedName("at") + static boolean field1789; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("SequenceDefinition_animationsArchive") public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("SequenceDefinition_skeletonsArchive") public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("SequenceDefinition_cached") public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("SequenceDefinition_cachedFrames") public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("SequenceDefinition_cachedModel") public static EvictingDualNodeHashTable SequenceDefinition_cachedModel; - @ObfuscatedName("ri") - @ObfuscatedSignature( - descriptor = "Lsr;" - ) - @Export("varclan") - static class469 varclan; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("SequenceDefinition_cachedModelId") public int SequenceDefinition_cachedModelId; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("animMayaFrameSounds") public Map animMayaFrameSounds; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("animMayaStart") int animMayaStart; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("animMayaEnd") int animMayaEnd; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("frameCount") public int frameCount; - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("mergedBoneGroups") int[] mergedBoneGroups; @ObfuscatedName("aw") @Export("animMayaMasks") boolean[] animMayaMasks; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("stretches") public boolean stretches; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("forcedPriority") public int forcedPriority; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("shield") public int shield; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("weapon") public int weapon; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("iterations") public int iterations; - @ObfuscatedName("bn") - public boolean field1849; - @ObfuscatedName("bk") + @ObfuscatedName("be") + public boolean field1796; + @ObfuscatedName("bd") @Export("precedenceAnimating") public int precedenceAnimating; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("priority") public int priority; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("replyMode") public int replyMode; static { - field1841 = false; + field1789 = false; SequenceDefinition_cached = new EvictingDualNodeHashTable(64); SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); SequenceDefinition_cachedModel = new EvictingDualNodeHashTable(100); @@ -124,16 +118,16 @@ public class SequenceDefinition extends DualNode { this.shield = -1; this.weapon = -1; this.iterations = 99; - this.field1849 = false; + this.field1796 = false; this.precedenceAnimating = -1; this.priority = -1; this.replyMode = 2; } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "-79" + descriptor = "(Luj;I)V", + garbageValue = "724172563" ) @Export("decode") void decode(Buffer var1) { @@ -147,10 +141,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "839529749" + descriptor = "(Luj;II)V", + garbageValue = "-848433725" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -194,7 +188,7 @@ void decodeNext(Buffer var1, int var2) { this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { this.iterations = var1.readUnsignedByte(); - this.field1849 = true; + this.field1796 = true; } else if (var2 == 9) { this.precedenceAnimating = var1.readUnsignedByte(); } else if (var2 == 10) { @@ -251,8 +245,8 @@ void decodeNext(Buffer var1, int var2) { @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "12569" + descriptor = "(B)V", + garbageValue = "-73" ) @Export("postDecode") void postDecode() { @@ -274,17 +268,17 @@ void postDecode() { } - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljn;II)Ljn;", - garbageValue = "119029641" + descriptor = "(Lka;IB)Lka;", + garbageValue = "61" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { Model var4; if (!this.isCachedModelIdSet()) { var2 = this.frameIds[var2]; - Frames var5 = class14.getFrames(var2 >> 16); + Frames var5 = class102.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var1.toSharedSequenceModel(true); @@ -294,28 +288,28 @@ public Model transformActorModel(Model var1, int var2) { return var4; } } else { - class139 var3 = class214.method1051(this.SequenceDefinition_cachedModelId); + class139 var3 = class151.method788(this.SequenceDefinition_cachedModelId); if (var3 == null) { return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var3.method740()); - var4.method1366(var3, var2); + var4 = var1.toSharedSequenceModel(!var3.method743()); + var4.method1543(var3, var2); return var4; } } } - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljn;III)Ljn;", - garbageValue = "2034057429" + descriptor = "(Lka;III)Lka;", + garbageValue = "-1872374798" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { Model var5; if (!this.isCachedModelIdSet()) { var2 = this.frameIds[var2]; - Frames var6 = class14.getFrames(var2 >> 16); + Frames var6 = class102.getFrames(var2 >> 16); var2 &= 65535; if (var6 == null) { return var1.toSharedSequenceModel(true); @@ -342,11 +336,11 @@ Model transformObjectModel(Model var1, int var2, int var3) { return var5; } } else { - class139 var4 = class214.method1051(this.SequenceDefinition_cachedModelId); + class139 var4 = class151.method788(this.SequenceDefinition_cachedModelId); if (var4 == null) { return var1.toSharedSequenceModel(true); } else { - var5 = var1.toSharedSequenceModel(!var4.method740()); + var5 = var1.toSharedSequenceModel(!var4.method743()); var3 &= 3; if (var3 == 1) { var5.rotateY270Ccw(); @@ -356,7 +350,7 @@ Model transformObjectModel(Model var1, int var2, int var3) { var5.rotateY90Ccw(); } - var5.method1366(var4, var2); + var5.method1543(var4, var2); if (var3 == 1) { var5.rotateY90Ccw(); } else if (var3 == 2) { @@ -370,17 +364,17 @@ Model transformObjectModel(Model var1, int var2, int var3) { } } - @ObfuscatedName("ab") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Ljn;IB)Ljn;", - garbageValue = "58" + descriptor = "(Lka;IB)Lka;", + garbageValue = "55" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { Model var4; if (!this.isCachedModelIdSet()) { var2 = this.frameIds[var2]; - Frames var5 = class14.getFrames(var2 >> 16); + Frames var5 = class102.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var1.toSharedSpotAnimationModel(true); @@ -390,26 +384,26 @@ Model transformSpotAnimationModel(Model var1, int var2) { return var4; } } else { - class139 var3 = class214.method1051(this.SequenceDefinition_cachedModelId); + class139 var3 = class151.method788(this.SequenceDefinition_cachedModelId); if (var3 == null) { return var1.toSharedSpotAnimationModel(true); } else { - var4 = var1.toSharedSpotAnimationModel(!var3.method740()); - var4.method1366(var3, var2); + var4 = var1.toSharedSpotAnimationModel(!var3.method743()); + var4.method1543(var3, var2); return var4; } } } - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljn;ILif;II)Ljn;", - garbageValue = "-130759845" + descriptor = "(Lka;ILhx;IB)Lka;", + garbageValue = "-75" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - if (field1841 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { - return this.method1124(var1, var2, var3, var4); + if (field1789 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { + return this.method1049(var1, var2, var3, var4); } else { Model var5 = var1.toSharedSequenceModel(false); boolean var6 = false; @@ -417,21 +411,21 @@ public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, Skeleton var8 = null; class139 var9; if (this.isCachedModelIdSet()) { - var9 = this.method1128(); + var9 = this.method1053(); if (var9 == null) { return var5; } if (var3.isCachedModelIdSet() && this.animMayaMasks == null) { - var5.method1366(var9, var2); + var5.method1543(var9, var2); return var5; } - var8 = var9.field1298; - var5.method1370(var8, var9, var2, this.animMayaMasks, false, !var3.isCachedModelIdSet()); + var8 = var9.field1317; + var5.method1547(var8, var9, var2, this.animMayaMasks, false, !var3.isCachedModelIdSet()); } else { var2 = this.frameIds[var2]; - var7 = class14.getFrames(var2 >> 16); + var7 = class102.getFrames(var2 >> 16); var2 &= 65535; if (var7 == null) { return var3.transformActorModel(var1, var4); @@ -449,34 +443,34 @@ public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, var6 = var3.isCachedModelIdSet(); if (!var6) { - var5.method1371(var7, var2, this.mergedBoneGroups, false); + var5.method1548(var7, var2, this.mergedBoneGroups, false); } } if (var3.isCachedModelIdSet()) { - var9 = var3.method1128(); + var9 = var3.method1053(); if (var9 == null) { return var5; } if (var8 == null) { - var8 = var9.field1298; + var8 = var9.field1317; } - var5.method1370(var8, var9, var4, this.animMayaMasks, true, true); + var5.method1547(var8, var9, var4, this.animMayaMasks, true, true); } else { var4 = var3.frameIds[var4]; - Frames var10 = class14.getFrames(var4 >> 16); + Frames var10 = class102.getFrames(var4 >> 16); var4 &= 65535; if (var10 == null) { return this.transformActorModel(var1, var2); } - var5.method1371(var10, var4, this.mergedBoneGroups, true); + var5.method1548(var10, var4, this.mergedBoneGroups, true); } if (var6 && var7 != null) { - var5.method1371(var7, var2, this.mergedBoneGroups, false); + var5.method1548(var7, var2, this.mergedBoneGroups, false); } var5.resetBounds(); @@ -484,20 +478,20 @@ public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, } } - @ObfuscatedName("av") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Ljn;ILif;II)Ljn;", - garbageValue = "-561327832" + descriptor = "(Lka;ILhx;II)Lka;", + garbageValue = "1735546670" ) - Model method1124(Model var1, int var2, SequenceDefinition var3, int var4) { + Model method1049(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; - Frames var5 = class14.getFrames(var2 >> 16); + Frames var5 = class102.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; - Frames var6 = class14.getFrames(var4 >> 16); + Frames var6 = class102.getFrames(var4 >> 16); var4 &= 65535; Model var7; if (var6 == null) { @@ -512,16 +506,16 @@ Model method1124(Model var1, int var2, SequenceDefinition var3, int var4) { } } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Ljn;IS)Ljn;", - garbageValue = "6000" + descriptor = "(Lka;II)Lka;", + garbageValue = "1947242189" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { if (!this.isCachedModelIdSet()) { int var3 = this.frameIds[var2]; - Frames var4 = class14.getFrames(var3 >> 16); + Frames var4 = class102.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -530,7 +524,7 @@ public Model transformWidgetModel(Model var1, int var2) { int var6 = 0; if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { var6 = this.chatFrameIds[var2]; - var5 = class14.getFrames(var6 >> 16); + var5 = class102.getFrames(var6 >> 16); var6 &= 65535; } @@ -551,56 +545,72 @@ public Model transformWidgetModel(Model var1, int var2) { } } - @ObfuscatedName("aa") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1797639917" + garbageValue = "-2015458472" ) @Export("isCachedModelIdSet") public boolean isCachedModelIdSet() { return this.SequenceDefinition_cachedModelId >= 0; } - @ObfuscatedName("ap") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1128031722" + garbageValue = "759292138" ) - public int method1127() { + public int method1052() { return this.animMayaEnd - this.animMayaStart; } - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)Lfk;", - garbageValue = "-585395726" + descriptor = "(B)Lfo;", + garbageValue = "52" ) - class139 method1128() { - return this.isCachedModelIdSet() ? class214.method1051(this.SequenceDefinition_cachedModelId) : null; + class139 method1053() { + return this.isCachedModelIdSet() ? class151.method788(this.SequenceDefinition_cachedModelId) : null; } - @ObfuscatedName("ac") - static boolean method1116(long var0) { - int var2 = (int)(var0 >>> 14 & 3L); - return var2 == 2; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "12" + ) + public static int method1040(int var0, int var1) { + return (int)(Math.atan2((double)var0, (double)var1) * 325.94932345220167D) & 2047; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([Lon;II)Lon;", - garbageValue = "-805987290" + descriptor = "(II)I", + garbageValue = "294649800" ) - @Export("findEnumerated") - public static class386 findEnumerated(class386[] var0, int var1) { - class386[] var2 = var0; + public static int method1041(int var0) { + return var0 >>> 12; + } - for (int var3 = 0; var3 < var2.length; ++var3) { - class386 var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { - return var4; - } + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "2048798044" + ) + static int method1055(int var0, Script var1, boolean var2) { + return 2; + } + + @ObfuscatedName("hu") + @ObfuscatedSignature( + descriptor = "(IZZZZZI)Loh;", + garbageValue = "550564154" + ) + static Archive method1054(int var0, boolean var1, boolean var2, boolean var3, boolean var4, boolean var5) { + ArchiveDisk var6 = null; + if (JagexCache.JagexCache_dat2File != null) { + var6 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, KeyHandler.JagexCache_idxFiles[var0], 1000000); } - return null; + return new Archive(var6, class302.field2511, WorldMapSectionType.field2038, var0, var1, var2, var3, var4, var5); } } \ No newline at end of file diff --git a/osrs/src/main/java/ServerPacket.java b/osrs/src/main/java/ServerPacket.java index 8bfd5f115..7d481f991 100644 --- a/osrs/src/main/java/ServerPacket.java +++ b/osrs/src/main/java/ServerPacket.java @@ -6,879 +6,940 @@ @ObfuscatedName("lu") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("NPC_ANIM_SPECIFIC") - public static final ServerPacket NPC_ANIM_SPECIFIC; - @ObfuscatedName("al") + public static final ServerPacket field2651; + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("REFLECTIONCHECK_FRIENDLIST") - public static final ServerPacket REFLECTIONCHECK_FRIENDLIST; - @ObfuscatedName("ak") + public static final ServerPacket field2639; + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("TRADING_POST_UPDATE") public static final ServerPacket TRADING_POST_UPDATE; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("SEND_PING") public static final ServerPacket SEND_PING; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2649; - @ObfuscatedName("ah") + public static final ServerPacket field2633; + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("IF_SETNPCHEAD") public static final ServerPacket IF_SETNPCHEAD; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2652; - @ObfuscatedName("ab") + @Export("IF_SETTEXT") + public static final ServerPacket IF_SETTEXT; + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("SET_PLAYER_OP") public static final ServerPacket SET_PLAYER_OP; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("OBJ_COUNT") public static final ServerPacket OBJ_COUNT; - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("UPDATE_UID192") public static final ServerPacket UPDATE_UID192; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("OBJ_DEL_LEGACY") public static final ServerPacket OBJ_DEL_LEGACY; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("MIDI_SONG_LEGACY") - public static final ServerPacket MIDI_SONG_LEGACY; - @ObfuscatedName("ap") + @Export("RESET_ANIMS") + public static final ServerPacket RESET_ANIMS; + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("RESET_ANIMS") - public static final ServerPacket RESET_ANIMS; - @ObfuscatedName("ay") + public static final ServerPacket field2655; + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("IF_OPENTOP") public static final ServerPacket IF_OPENTOP; - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("UPDATE_INV_STOP_TRANSMIT") - public static final ServerPacket UPDATE_INV_STOP_TRANSMIT; - @ObfuscatedName("aj") + public static final ServerPacket field2656; + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("MIDI_SONG_WITH_SECONDARY") - public static final ServerPacket MIDI_SONG_WITH_SECONDARY; - @ObfuscatedName("an") + public static final ServerPacket field2642; + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("MAPPROJ_ANIM") - public static final ServerPacket MAPPROJ_ANIM; - @ObfuscatedName("au") + public static final ServerPacket field2641; + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("OPEN_URL") - public static final ServerPacket OPEN_URL; - @ObfuscatedName("ai") + @Export("PREFETCH_GAMEOBJECTS") + public static final ServerPacket PREFETCH_GAMEOBJECTS; + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2643; - @ObfuscatedName("ae") + public static final ServerPacket field2648; + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_CLOSESUB") - public static final ServerPacket IF_CLOSESUB; + @Export("MIDI_SONG_WITH_SECONDARY") + public static final ServerPacket MIDI_SONG_WITH_SECONDARY; @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("UPDATE_ZONE_PARTIAL_ENCLOSED") - public static final ServerPacket UPDATE_ZONE_PARTIAL_ENCLOSED; - @ObfuscatedName("aq") + @Export("UPDATE_FRIENDCHAT_CHANNEL_FULL") + public static final ServerPacket UPDATE_FRIENDCHAT_CHANNEL_FULL; + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("VARCLAN_ENABLE") - public static final ServerPacket VARCLAN_ENABLE; - @ObfuscatedName("az") + @Export("MAPPROJ_ANIM") + public static final ServerPacket MAPPROJ_ANIM; + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("UPDATE_REBOOT_TIMER") - public static final ServerPacket UPDATE_REBOOT_TIMER; - @ObfuscatedName("at") + @Export("NPC_ANIM_SPECIFIC") + public static final ServerPacket NPC_ANIM_SPECIFIC; + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("VARP_LARGE") public static final ServerPacket VARP_LARGE; - @ObfuscatedName("af") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("TRADING_POST_RESULTS") public static final ServerPacket TRADING_POST_RESULTS; - @ObfuscatedName("ad") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("MESSAGE_CLANCHANNEL") - public static final ServerPacket MESSAGE_CLANCHANNEL; - @ObfuscatedName("bn") + public static final ServerPacket field2637; + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("NPC_SPOTANIM_SPECIFIC") public static final ServerPacket NPC_SPOTANIM_SPECIFIC; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_SETTEXT") - public static final ServerPacket IF_SETTEXT; - @ObfuscatedName("by") + @Export("REFLECTIONCHECK_FRIENDLIST") + public static final ServerPacket REFLECTIONCHECK_FRIENDLIST; + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("UPDATE_STAT") public static final ServerPacket UPDATE_STAT; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("UPDATE_IGNORELIST") public static final ServerPacket UPDATE_IGNORELIST; - @ObfuscatedName("be") + @ObfuscatedName("bv") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_SETMODEL") - public static final ServerPacket IF_SETMODEL; - @ObfuscatedName("bv") + @Export("IF_SETPLAYERMODEL_BASECOLOUR") + public static final ServerPacket IF_SETPLAYERMODEL_BASECOLOUR; + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("MAP_ANIM") - public static final ServerPacket MAP_ANIM; - @ObfuscatedName("ba") + @Export("TOGGLE_OCULUS_ORB") + public static final ServerPacket TOGGLE_OCULUS_ORB; + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_SETEVENTS") - public static final ServerPacket IF_SETEVENTS; - @ObfuscatedName("bz") + @Export("VARCLAN_ENABLE") + public static final ServerPacket VARCLAN_ENABLE; + @ObfuscatedName("ba") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("MIDI_SONG_STOP") public static final ServerPacket MIDI_SONG_STOP; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("LOC_ADD_CHANGE") - public static final ServerPacket LOC_ADD_CHANGE; - @ObfuscatedName("bo") + public static final ServerPacket field2670; + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2675; - @ObfuscatedName("bp") + public static final ServerPacket field2673; + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("OBJ_ADD") - public static final ServerPacket OBJ_ADD; - @ObfuscatedName("bt") + @Export("IF_SETSCROLLPOS") + public static final ServerPacket IF_SETSCROLLPOS; + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("LOC_ANIM_SPECIFIC") public static final ServerPacket LOC_ANIM_SPECIFIC; - @ObfuscatedName("bm") + @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("UPDATE_ZONE_PARTIAL_FOLLOWS") - public static final ServerPacket UPDATE_ZONE_PARTIAL_FOLLOWS; - @ObfuscatedName("br") + @Export("MESSAGE_PRIVATE_ECHO") + public static final ServerPacket MESSAGE_PRIVATE_ECHO; + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("PLAYER_INFO") public static final ServerPacket PLAYER_INFO; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("MESSAGE_PRIVATE_ECHO") - public static final ServerPacket MESSAGE_PRIVATE_ECHO; - @ObfuscatedName("bc") + @Export("EMPTY_PACKET") + public static final ServerPacket EMPTY_PACKET; + @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("UPDATE_RUNWEIGHT") public static final ServerPacket UPDATE_RUNWEIGHT; - @ObfuscatedName("bu") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("CAM_LOOKAT_EASED_ANGLE_RELATIVE") - public static final ServerPacket CAM_LOOKAT_EASED_ANGLE_RELATIVE; - @ObfuscatedName("bf") + public static final ServerPacket field2682; + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("VARP_SMALL") public static final ServerPacket VARP_SMALL; - @ObfuscatedName("bh") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("PLAYER_SPOTANIM_SPECIFIC") public static final ServerPacket PLAYER_SPOTANIM_SPECIFIC; - @ObfuscatedName("bl") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2672; - @ObfuscatedName("bg") + @Export("IF_SETPLAYERMODEL_OBJ") + public static final ServerPacket IF_SETPLAYERMODEL_OBJ; + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF1_MODELROTATE") - public static final ServerPacket IF1_MODELROTATE; - @ObfuscatedName("bj") + @Export("IF_CLOSESUB") + public static final ServerPacket IF_CLOSESUB; + @ObfuscatedName("bx") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("HINT_ARROW") public static final ServerPacket HINT_ARROW; - @ObfuscatedName("bx") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("NEW_PACK_215") public static final ServerPacket NEW_PACK_215; - @ObfuscatedName("bi") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_SETANGLE") - public static final ServerPacket IF_SETANGLE; - @ObfuscatedName("bq") + @Export("UPDATE_ZONE_PARTIAL_ENCLOSED") + public static final ServerPacket UPDATE_ZONE_PARTIAL_ENCLOSED; + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_SETPLAYERMODEL_OBJ") - public static final ServerPacket IF_SETPLAYERMODEL_OBJ; - @ObfuscatedName("bw") + @Export("OPEN_URL") + public static final ServerPacket OPEN_URL; + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2683; - @ObfuscatedName("ce") + public static final ServerPacket field2674; + @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("MESSAGE_PRIVATE") public static final ServerPacket MESSAGE_PRIVATE; - @ObfuscatedName("cu") + @ObfuscatedName("cg") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("IF_SETOBJECT") public static final ServerPacket IF_SETOBJECT; - @ObfuscatedName("cw") + @ObfuscatedName("cv") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("CAM_MOVETO_EASED_CIRCULAR") - public static final ServerPacket CAM_MOVETO_EASED_CIRCULAR; - @ObfuscatedName("co") + static final ServerPacket CAM_MOVETO_EASED_CIRCULAR; + @ObfuscatedName("cx") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("CLANCHANNEL_DELTA") - public static final ServerPacket CLANCHANNEL_DELTA; - @ObfuscatedName("cc") + @Export("MINIMAP_TOGGLE") + public static final ServerPacket MINIMAP_TOGGLE; + @ObfuscatedName("cp") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_SETPLAYERMODEL_SELF") - public static final ServerPacket IF_SETPLAYERMODEL_SELF; - @ObfuscatedName("cg") + @Export("NEW_PACKET_CAM_RESET_V2") + public static final ServerPacket NEW_PACKET_CAM_RESET_V2; + @ObfuscatedName("ce") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("UPDATE_INV_FULL") - public static final ServerPacket UPDATE_INV_FULL; - @ObfuscatedName("cq") + @Export("MESSAGE_CLANCHANNEL") + public static final ServerPacket MESSAGE_CLANCHANNEL; + @ObfuscatedName("ci") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("CHAT_FILTER_SETTINGS_PRIVATECHAT") public static final ServerPacket CHAT_FILTER_SETTINGS_PRIVATECHAT; - @ObfuscatedName("cy") + @ObfuscatedName("ct") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("IF_OPENSUB") public static final ServerPacket IF_OPENSUB; - @ObfuscatedName("cz") + @ObfuscatedName("cw") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("IF_SETPOSITION") public static final ServerPacket IF_SETPOSITION; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("CAM_RESET") public static final ServerPacket CAM_RESET; - @ObfuscatedName("cb") + @ObfuscatedName("cl") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("UPDATE_FRIENDCHAT_CHANNEL_FULL_V2") public static final ServerPacket UPDATE_FRIENDCHAT_CHANNEL_FULL_V2; - @ObfuscatedName("cn") + @ObfuscatedName("cs") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("CLANSETTINGS_FULL") public static final ServerPacket CLANSETTINGS_FULL; - @ObfuscatedName("ck") + @ObfuscatedName("co") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("CAM_SHAKE") - public static final ServerPacket CAM_SHAKE; - @ObfuscatedName("cr") + public static final ServerPacket field2698; + @ObfuscatedName("cm") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("SET_MAP_FLAG") public static final ServerPacket SET_MAP_FLAG; - @ObfuscatedName("cs") + @ObfuscatedName("cn") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("MINIMAP_TOGGLE") - public static final ServerPacket MINIMAP_TOGGLE; - @ObfuscatedName("cm") + public static final ServerPacket field2697; + @ObfuscatedName("cr") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("UPDATE_FRIENDLIST") - public static final ServerPacket UPDATE_FRIENDLIST; - @ObfuscatedName("cv") + @Export("UPDATE_REBOOT_TIMER") + public static final ServerPacket UPDATE_REBOOT_TIMER; + @ObfuscatedName("cj") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("TRIGGER_ONDIALOGABORT") public static final ServerPacket TRIGGER_ONDIALOGABORT; - @ObfuscatedName("ci") + @ObfuscatedName("ca") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("MIDI_JINGLE") - public static final ServerPacket MIDI_JINGLE; - @ObfuscatedName("cj") + public static final ServerPacket field2684; + @ObfuscatedName("cc") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("REBUILD_REGION") public static final ServerPacket REBUILD_REGION; - @ObfuscatedName("cx") + @ObfuscatedName("cu") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_SETPLAYERMODEL_BODYTYPE") - public static final ServerPacket IF_SETPLAYERMODEL_BODYTYPE; + @Export("RUN_CLIENTSCRIPT") + public static final ServerPacket RUN_CLIENTSCRIPT; @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("NPC_HEADICON_SPECIFIC") public static final ServerPacket NPC_HEADICON_SPECIFIC; - @ObfuscatedName("cd") + @ObfuscatedName("cb") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("UPDATE_INV_PARTIAL") - public static final ServerPacket UPDATE_INV_PARTIAL; - @ObfuscatedName("ct") + @Export("UPDATE_ZONE_PARTIAL_FOLLOWS") + public static final ServerPacket UPDATE_ZONE_PARTIAL_FOLLOWS; + @ObfuscatedName("cz") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("RESET_CLIENT_VARCACHE") public static final ServerPacket RESET_CLIENT_VARCACHE; - @ObfuscatedName("cf") + @ObfuscatedName("cy") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("FRIENDLIST_LOADED") - public static final ServerPacket FRIENDLIST_LOADED; - @ObfuscatedName("cl") + public static final ServerPacket field2707; + @ObfuscatedName("ck") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("NPC_INFO_SMALL") - public static final ServerPacket NPC_INFO_SMALL; - @ObfuscatedName("ca") + public static final ServerPacket field2694; + @ObfuscatedName("cd") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("MESSAGE_FRIENDCHANNEL") - public static final ServerPacket MESSAGE_FRIENDCHANNEL; - @ObfuscatedName("dv") + @Export("CAM_MOVETO") + public static final ServerPacket CAM_MOVETO; + @ObfuscatedName("dt") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("REFLECTION_CHECK") - public static final ServerPacket REFLECTION_CHECK; - @ObfuscatedName("dm") + public static final ServerPacket field2728; + @ObfuscatedName("di") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("VARCLAN") public static final ServerPacket VARCLAN; - @ObfuscatedName("ds") + @ObfuscatedName("dk") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2730; - @ObfuscatedName("dx") + public static final ServerPacket field2719; + @ObfuscatedName("dd") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("MESSAGE_GAME") public static final ServerPacket MESSAGE_GAME; - @ObfuscatedName("dg") + @ObfuscatedName("dx") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("CAM_MOVETO_EASED") - public static final ServerPacket CAM_MOVETO_EASED; - @ObfuscatedName("dq") + @Export("LOC_ADD_CHANGE") + public static final ServerPacket LOC_ADD_CHANGE; + @ObfuscatedName("dh") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("PREFETCH_GAMEOBJECTS") - public static final ServerPacket PREFETCH_GAMEOBJECTS; - @ObfuscatedName("dz") + @Export("SYNTH_SOUND") + public static final ServerPacket SYNTH_SOUND; + @ObfuscatedName("du") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_SETPLAYERMODEL_BASECOLOUR") - public static final ServerPacket IF_SETPLAYERMODEL_BASECOLOUR; - @ObfuscatedName("dn") + @Export("MESSAGE_FRIENDCHANNEL") + public static final ServerPacket MESSAGE_FRIENDCHANNEL; + @ObfuscatedName("dg") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("SYNC_CLIENT_VARCACHE") public static final ServerPacket SYNC_CLIENT_VARCACHE; - @ObfuscatedName("dk") + @ObfuscatedName("dc") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("VARCLAN_DISABLE") - public static final ServerPacket VARCLAN_DISABLE; - @ObfuscatedName("df") + @Export("CAM_SHAKE") + public static final ServerPacket CAM_SHAKE; + @ObfuscatedName("do") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("UPDATE_RUNENERGY") public static final ServerPacket UPDATE_RUNENERGY; - @ObfuscatedName("de") + @ObfuscatedName("db") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("IF_SETANIM") public static final ServerPacket IF_SETANIM; - @ObfuscatedName("dl") + @ObfuscatedName("dm") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("NPC_INFO_LARGE") - public static final ServerPacket NPC_INFO_LARGE; - @ObfuscatedName("dp") + @Export("UPDATE_INV_STOP_TRANSMIT") + public static final ServerPacket UPDATE_INV_STOP_TRANSMIT; + @ObfuscatedName("dr") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_SETHIDE") - public static final ServerPacket IF_SETHIDE; - @ObfuscatedName("do") + @Export("MIDI_JINGLE") + public static final ServerPacket MIDI_JINGLE; + @ObfuscatedName("ds") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("MESSAGE_CLANCHANNEL_SYSTEM") public static final ServerPacket MESSAGE_CLANCHANNEL_SYSTEM; - @ObfuscatedName("dh") + @ObfuscatedName("da") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2720; - @ObfuscatedName("dj") + public static final ServerPacket field2709; + @ObfuscatedName("dw") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("CLANSETTINGS_DELTA") - static final ServerPacket CLANSETTINGS_DELTA; - @ObfuscatedName("du") + @Export("ENTER_FREECAM") + public static final ServerPacket ENTER_FREECAM; + @ObfuscatedName("dp") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("RUN_CLIENTSCRIPT") - public static final ServerPacket RUN_CLIENTSCRIPT; - @ObfuscatedName("dr") + public static final ServerPacket field2724; + @ObfuscatedName("df") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("UPDATE_SITESETTINGS") public static final ServerPacket UPDATE_SITESETTINGS; - @ObfuscatedName("dw") + @ObfuscatedName("dv") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("UPDATE_ZONE_FULL_FOLLOWS") public static final ServerPacket UPDATE_ZONE_FULL_FOLLOWS; - @ObfuscatedName("di") + @ObfuscatedName("dz") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("LOGOUT_FULL") public static final ServerPacket LOGOUT_FULL; - @ObfuscatedName("dt") + @ObfuscatedName("dl") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("EMPTY_PACKET") - public static final ServerPacket EMPTY_PACKET; - @ObfuscatedName("dd") + @Export("PLAYER_ANIM_SPECIFIC") + public static final ServerPacket PLAYER_ANIM_SPECIFIC; + @ObfuscatedName("de") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("HEAT_MAP") - public static final ServerPacket HEAT_MAP; - @ObfuscatedName("dy") + public static final ServerPacket field2713; + @ObfuscatedName("dn") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2736; - @ObfuscatedName("db") + public static final ServerPacket field2722; + @ObfuscatedName("dq") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2714; - @ObfuscatedName("dc") + @Export("NPC_INFO_SMALL") + public static final ServerPacket NPC_INFO_SMALL; + @ObfuscatedName("dj") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2715; - @ObfuscatedName("da") + public static final ServerPacket field2718; + @ObfuscatedName("dy") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("SPOTANIM_SPECIFIC") - public static final ServerPacket SPOTANIM_SPECIFIC; - @ObfuscatedName("eo") + @Export("VARCLAN_DISABLE") + public static final ServerPacket VARCLAN_DISABLE; + @ObfuscatedName("ec") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("IF_SETSCROLLPOS") - public static final ServerPacket IF_SETSCROLLPOS; - @ObfuscatedName("em") + @Export("LOGIN_SCREEN_PACKET") + public static final ServerPacket LOGIN_SCREEN_PACKET; + @ObfuscatedName("ew") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("UPDATE_FRIENDCHAT_CHANNEL_FULL") - public static final ServerPacket UPDATE_FRIENDCHAT_CHANNEL_FULL; - @ObfuscatedName("el") + public static final ServerPacket field2754; + @ObfuscatedName("ex") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("CAM_LOOKAT_EASED_COORD") - public static final ServerPacket CAM_LOOKAT_EASED_COORD; - @ObfuscatedName("ec") + @Export("UPDATE_FRIENDLIST") + public static final ServerPacket UPDATE_FRIENDLIST; + @ObfuscatedName("ev") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("LOGOUT") - public static final ServerPacket LOGOUT; - @ObfuscatedName("eg") + public static final ServerPacket field2753; + @ObfuscatedName("ek") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("CAM_MOVETO") - public static final ServerPacket CAM_MOVETO; - @ObfuscatedName("ei") + public static final ServerPacket field2743; + @ObfuscatedName("em") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2744; - @ObfuscatedName("ex") + public static final ServerPacket field2745; + @ObfuscatedName("eo") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("NEW_PACKET_CAM_RESET_V2") - public static final ServerPacket NEW_PACKET_CAM_RESET_V2; - @ObfuscatedName("ek") + @Export("SPOTANIM_SPECIFIC") + public static final ServerPacket SPOTANIM_SPECIFIC; + @ObfuscatedName("ef") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("IF_SETPLAYERHEAD") public static final ServerPacket IF_SETPLAYERHEAD; - @ObfuscatedName("er") + @ObfuscatedName("el") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("UPDATE_INV_CLEAR") public static final ServerPacket UPDATE_INV_CLEAR; - @ObfuscatedName("ez") + @ObfuscatedName("es") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("OBJ_DEL") - public static final ServerPacket OBJ_DEL; - @ObfuscatedName("en") + @Export("UPDATE_INV_FULL") + public static final ServerPacket UPDATE_INV_FULL; + @ObfuscatedName("ea") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("LOGIN_SCREEN_PACKET") - public static final ServerPacket LOGIN_SCREEN_PACKET; - @ObfuscatedName("es") + @Export("IF_SETPLAYERMODEL_SELF") + public static final ServerPacket IF_SETPLAYERMODEL_SELF; + @ObfuscatedName("en") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("REBUILD_REGION_NORMAL") public static final ServerPacket REBUILD_REGION_NORMAL; - @ObfuscatedName("eq") + @ObfuscatedName("eh") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("TOGGLE_OCULUS_ORB") - public static final ServerPacket TOGGLE_OCULUS_ORB; - @ObfuscatedName("ej") + @Export("CAM_LOOKAT_EASED_ANGLE_RELATIVE") + public static final ServerPacket CAM_LOOKAT_EASED_ANGLE_RELATIVE; + @ObfuscatedName("ei") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("LOC_DEL") - public static final ServerPacket LOC_DEL; + @Export("NPC_INFO_LARGE") + public static final ServerPacket NPC_INFO_LARGE; @ObfuscatedName("et") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("MIDI_SONG") public static final ServerPacket MIDI_SONG; - @ObfuscatedName("eh") + @ObfuscatedName("er") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("ENTER_FREECAM") - public static final ServerPacket ENTER_FREECAM; - @ObfuscatedName("eb") + @Export("OBJ_ADD") + public static final ServerPacket OBJ_ADD; + @ObfuscatedName("ez") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("SYNTH_SOUND") - public static final ServerPacket SYNTH_SOUND; - @ObfuscatedName("ev") + public static final ServerPacket field2757; + @ObfuscatedName("eu") @ObfuscatedSignature( descriptor = "Llu;" ) @Export("MIDI_SWAP") public static final ServerPacket MIDI_SWAP; - @ObfuscatedName("ee") + @ObfuscatedName("eg") @ObfuscatedSignature( descriptor = "Llu;" ) - @Export("PLAYER_ANIM_SPECIFIC") - public static final ServerPacket PLAYER_ANIM_SPECIFIC; - @ObfuscatedName("ea") + public static final ServerPacket field2740; + @ObfuscatedName("ey") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2738; - @ObfuscatedName("eu") + public static final ServerPacket field2756; + @ObfuscatedName("eb") @ObfuscatedSignature( descriptor = "Llu;" ) - public static final ServerPacket field2755; - @ObfuscatedName("ey") + public static final ServerPacket field2736; + @ObfuscatedName("ed") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("IF_SETHIDE") + public static final ServerPacket IF_SETHIDE; + @ObfuscatedName("eq") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + public static final ServerPacket field2748; + @ObfuscatedName("ee") @Export("id") public final int id; - @ObfuscatedName("ep") + @ObfuscatedName("ej") @Export("length") public final int length; static { - NPC_ANIM_SPECIFIC = new ServerPacket(0, 14); - REFLECTIONCHECK_FRIENDLIST = new ServerPacket(1, 10); - TRADING_POST_UPDATE = new ServerPacket(2, 28); - SEND_PING = new ServerPacket(3, 0); - field2649 = new ServerPacket(4, 7); - IF_SETNPCHEAD = new ServerPacket(5, 9); - field2652 = new ServerPacket(6, 2); - SET_PLAYER_OP = new ServerPacket(7, 7); + field2651 = new ServerPacket(0, -2); + field2639 = new ServerPacket(1, 6); + TRADING_POST_UPDATE = new ServerPacket(2, -2); + SEND_PING = new ServerPacket(3, 6); + field2633 = new ServerPacket(4, 6); + IF_SETNPCHEAD = new ServerPacket(5, 20); + IF_SETTEXT = new ServerPacket(6, 8); + SET_PLAYER_OP = new ServerPacket(7, 6); OBJ_COUNT = new ServerPacket(8, 4); - UPDATE_UID192 = new ServerPacket(9, -2); - OBJ_DEL_LEGACY = new ServerPacket(10, -1); - MIDI_SONG_LEGACY = new ServerPacket(11, 2); - RESET_ANIMS = new ServerPacket(12, 9); - IF_OPENTOP = new ServerPacket(13, 8); - UPDATE_INV_STOP_TRANSMIT = new ServerPacket(14, 5); - MIDI_SONG_WITH_SECONDARY = new ServerPacket(15, -2); - MAPPROJ_ANIM = new ServerPacket(16, 5); - OPEN_URL = new ServerPacket(17, 1); - field2643 = new ServerPacket(18, 1); - IF_CLOSESUB = new ServerPacket(19, 2); - UPDATE_ZONE_PARTIAL_ENCLOSED = new ServerPacket(20, 2); - VARCLAN_ENABLE = new ServerPacket(21, 1); - UPDATE_REBOOT_TIMER = new ServerPacket(22, -2); - VARP_LARGE = new ServerPacket(23, 6); - TRADING_POST_RESULTS = new ServerPacket(24, 8); - MESSAGE_CLANCHANNEL = new ServerPacket(25, -1); - NPC_SPOTANIM_SPECIFIC = new ServerPacket(26, 12); - IF_SETTEXT = new ServerPacket(27, -2); + UPDATE_UID192 = new ServerPacket(9, 10); + OBJ_DEL_LEGACY = new ServerPacket(10, -2); + RESET_ANIMS = new ServerPacket(11, 9); + field2655 = new ServerPacket(12, 2); + IF_OPENTOP = new ServerPacket(13, -2); + field2656 = new ServerPacket(14, 2); + field2642 = new ServerPacket(15, 5); + field2641 = new ServerPacket(16, 1); + PREFETCH_GAMEOBJECTS = new ServerPacket(17, -1); + field2648 = new ServerPacket(18, 2); + MIDI_SONG_WITH_SECONDARY = new ServerPacket(19, 4); + UPDATE_FRIENDCHAT_CHANNEL_FULL = new ServerPacket(20, 8); + MAPPROJ_ANIM = new ServerPacket(21, 3); + NPC_ANIM_SPECIFIC = new ServerPacket(22, 19); + VARP_LARGE = new ServerPacket(23, 10); + TRADING_POST_RESULTS = new ServerPacket(24, -2); + field2637 = new ServerPacket(25, 5); + NPC_SPOTANIM_SPECIFIC = new ServerPacket(26, -2); + REFLECTIONCHECK_FRIENDLIST = new ServerPacket(27, 3); UPDATE_STAT = new ServerPacket(28, 6); - UPDATE_IGNORELIST = new ServerPacket(29, -2); - IF_SETMODEL = new ServerPacket(30, -2); - MAP_ANIM = new ServerPacket(31, 1); - IF_SETEVENTS = new ServerPacket(32, 16); - MIDI_SONG_STOP = new ServerPacket(33, 7); - LOC_ADD_CHANGE = new ServerPacket(34, 6); - field2675 = new ServerPacket(35, -2); - OBJ_ADD = new ServerPacket(36, 19); - LOC_ANIM_SPECIFIC = new ServerPacket(37, -2); - UPDATE_ZONE_PARTIAL_FOLLOWS = new ServerPacket(38, -2); - PLAYER_INFO = new ServerPacket(39, -2); - MESSAGE_PRIVATE_ECHO = new ServerPacket(40, 8); - UPDATE_RUNWEIGHT = new ServerPacket(41, 9); - CAM_LOOKAT_EASED_ANGLE_RELATIVE = new ServerPacket(42, 5); - VARP_SMALL = new ServerPacket(43, -2); - PLAYER_SPOTANIM_SPECIFIC = new ServerPacket(44, -2); - field2672 = new ServerPacket(45, -2); - IF1_MODELROTATE = new ServerPacket(46, 8); - HINT_ARROW = new ServerPacket(47, 8); - NEW_PACK_215 = new ServerPacket(48, 6); - IF_SETANGLE = new ServerPacket(49, 2); - IF_SETPLAYERMODEL_OBJ = new ServerPacket(50, 4); - field2683 = new ServerPacket(51, 3); - MESSAGE_PRIVATE = new ServerPacket(52, -2); - IF_SETOBJECT = new ServerPacket(53, -2); - CAM_MOVETO_EASED_CIRCULAR = new ServerPacket(54, 20); - CLANCHANNEL_DELTA = new ServerPacket(55, -2); - IF_SETPLAYERMODEL_SELF = new ServerPacket(56, 8); - UPDATE_INV_FULL = new ServerPacket(57, -2); - CHAT_FILTER_SETTINGS_PRIVATECHAT = new ServerPacket(58, 4); - IF_OPENSUB = new ServerPacket(59, 6); + UPDATE_IGNORELIST = new ServerPacket(29, 6); + IF_SETPLAYERMODEL_BASECOLOUR = new ServerPacket(30, 1); + TOGGLE_OCULUS_ORB = new ServerPacket(31, 20); + VARCLAN_ENABLE = new ServerPacket(32, 0); + MIDI_SONG_STOP = new ServerPacket(33, 6); + field2670 = new ServerPacket(34, 4); + field2673 = new ServerPacket(35, -1); + IF_SETSCROLLPOS = new ServerPacket(36, 5); + LOC_ANIM_SPECIFIC = new ServerPacket(37, 7); + MESSAGE_PRIVATE_ECHO = new ServerPacket(38, -2); + PLAYER_INFO = new ServerPacket(39, 14); + EMPTY_PACKET = new ServerPacket(40, 4); + UPDATE_RUNWEIGHT = new ServerPacket(41, 6); + field2682 = new ServerPacket(42, 1); + VARP_SMALL = new ServerPacket(43, 14); + PLAYER_SPOTANIM_SPECIFIC = new ServerPacket(44, 0); + IF_SETPLAYERMODEL_OBJ = new ServerPacket(45, 8); + IF_CLOSESUB = new ServerPacket(46, 5); + HINT_ARROW = new ServerPacket(47, 7); + NEW_PACK_215 = new ServerPacket(48, 8); + UPDATE_ZONE_PARTIAL_ENCLOSED = new ServerPacket(49, -2); + OPEN_URL = new ServerPacket(50, 8); + field2674 = new ServerPacket(51, 4); + MESSAGE_PRIVATE = new ServerPacket(52, 4); + IF_SETOBJECT = new ServerPacket(53, 5); + CAM_MOVETO_EASED_CIRCULAR = new ServerPacket(54, -2); + MINIMAP_TOGGLE = new ServerPacket(55, 7); + NEW_PACKET_CAM_RESET_V2 = new ServerPacket(56, 0); + MESSAGE_CLANCHANNEL = new ServerPacket(57, -2); + CHAT_FILTER_SETTINGS_PRIVATECHAT = new ServerPacket(58, 6); + IF_OPENSUB = new ServerPacket(59, 0); IF_SETPOSITION = new ServerPacket(60, -1); CAM_RESET = new ServerPacket(61, 0); - UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 = new ServerPacket(62, -2); - CLANSETTINGS_FULL = new ServerPacket(63, 0); - CAM_SHAKE = new ServerPacket(64, -1); + UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 = new ServerPacket(62, 1); + CLANSETTINGS_FULL = new ServerPacket(63, -2); + field2698 = new ServerPacket(64, 8); SET_MAP_FLAG = new ServerPacket(65, -2); - MINIMAP_TOGGLE = new ServerPacket(66, 7); - UPDATE_FRIENDLIST = new ServerPacket(67, 0); - TRIGGER_ONDIALOGABORT = new ServerPacket(68, 10); - MIDI_JINGLE = new ServerPacket(69, 4); - REBUILD_REGION = new ServerPacket(70, 0); - IF_SETPLAYERMODEL_BODYTYPE = new ServerPacket(71, 0); - NPC_HEADICON_SPECIFIC = new ServerPacket(72, 1); - UPDATE_INV_PARTIAL = new ServerPacket(73, -2); + field2697 = new ServerPacket(66, 5); + UPDATE_REBOOT_TIMER = new ServerPacket(67, 4); + TRIGGER_ONDIALOGABORT = new ServerPacket(68, 12); + field2684 = new ServerPacket(69, 7); + REBUILD_REGION = new ServerPacket(70, 6); + RUN_CLIENTSCRIPT = new ServerPacket(71, -1); + NPC_HEADICON_SPECIFIC = new ServerPacket(72, -2); + UPDATE_ZONE_PARTIAL_FOLLOWS = new ServerPacket(73, -1); RESET_CLIENT_VARCACHE = new ServerPacket(74, -2); - FRIENDLIST_LOADED = new ServerPacket(75, 6); - NPC_INFO_SMALL = new ServerPacket(76, -1); - MESSAGE_FRIENDCHANNEL = new ServerPacket(77, 6); - REFLECTION_CHECK = new ServerPacket(78, 5); - VARCLAN = new ServerPacket(79, 4); - field2730 = new ServerPacket(80, 17); - MESSAGE_GAME = new ServerPacket(81, 4); - CAM_MOVETO_EASED = new ServerPacket(82, 0); - PREFETCH_GAMEOBJECTS = new ServerPacket(83, 5); - IF_SETPLAYERMODEL_BASECOLOUR = new ServerPacket(84, -1); - SYNC_CLIENT_VARCACHE = new ServerPacket(85, 0); - VARCLAN_DISABLE = new ServerPacket(86, 6); + field2707 = new ServerPacket(75, 4); + field2694 = new ServerPacket(76, 28); + CAM_MOVETO = new ServerPacket(77, 19); + field2728 = new ServerPacket(78, 2); + VARCLAN = new ServerPacket(79, 2); + field2719 = new ServerPacket(80, -2); + MESSAGE_GAME = new ServerPacket(81, 9); + LOC_ADD_CHANGE = new ServerPacket(82, 5); + SYNTH_SOUND = new ServerPacket(83, -2); + MESSAGE_FRIENDCHANNEL = new ServerPacket(84, -2); + SYNC_CLIENT_VARCACHE = new ServerPacket(85, 17); + CAM_SHAKE = new ServerPacket(86, -2); UPDATE_RUNENERGY = new ServerPacket(87, 2); - IF_SETANIM = new ServerPacket(88, -2); - NPC_INFO_LARGE = new ServerPacket(89, 4); - IF_SETHIDE = new ServerPacket(90, 6); - MESSAGE_CLANCHANNEL_SYSTEM = new ServerPacket(91, 5); - field2720 = new ServerPacket(92, 12); - CLANSETTINGS_DELTA = new ServerPacket(93, -2); - RUN_CLIENTSCRIPT = new ServerPacket(94, 7); - UPDATE_SITESETTINGS = new ServerPacket(95, 2); - UPDATE_ZONE_FULL_FOLLOWS = new ServerPacket(96, 0); - LOGOUT_FULL = new ServerPacket(97, 2); - EMPTY_PACKET = new ServerPacket(98, -1); - HEAT_MAP = new ServerPacket(99, 6); - field2736 = new ServerPacket(100, 6); - field2714 = new ServerPacket(101, -1); - field2715 = new ServerPacket(102, 10); - SPOTANIM_SPECIFIC = new ServerPacket(103, 14); - IF_SETSCROLLPOS = new ServerPacket(104, 2); - UPDATE_FRIENDCHAT_CHANNEL_FULL = new ServerPacket(105, 8); - CAM_LOOKAT_EASED_COORD = new ServerPacket(106, -2); - LOGOUT = new ServerPacket(107, 0); - CAM_MOVETO = new ServerPacket(108, 6); - field2744 = new ServerPacket(109, 6); - NEW_PACKET_CAM_RESET_V2 = new ServerPacket(110, 5); - IF_SETPLAYERHEAD = new ServerPacket(111, 2); + IF_SETANIM = new ServerPacket(88, 0); + UPDATE_INV_STOP_TRANSMIT = new ServerPacket(89, 9); + MIDI_JINGLE = new ServerPacket(90, 2); + MESSAGE_CLANCHANNEL_SYSTEM = new ServerPacket(91, 0); + field2709 = new ServerPacket(92, 16); + ENTER_FREECAM = new ServerPacket(93, -2); + field2724 = new ServerPacket(94, 11); + UPDATE_SITESETTINGS = new ServerPacket(95, 4); + UPDATE_ZONE_FULL_FOLLOWS = new ServerPacket(96, 6); + LOGOUT_FULL = new ServerPacket(97, 5); + PLAYER_ANIM_SPECIFIC = new ServerPacket(98, -1); + field2713 = new ServerPacket(99, 0); + field2722 = new ServerPacket(100, 1); + NPC_INFO_SMALL = new ServerPacket(101, 8); + field2718 = new ServerPacket(102, 10); + VARCLAN_DISABLE = new ServerPacket(103, 0); + LOGIN_SCREEN_PACKET = new ServerPacket(104, -1); + field2754 = new ServerPacket(105, -1); + UPDATE_FRIENDLIST = new ServerPacket(106, 7); + field2753 = new ServerPacket(107, -2); + field2743 = new ServerPacket(108, 6); + field2745 = new ServerPacket(109, -2); + SPOTANIM_SPECIFIC = new ServerPacket(110, -1); + IF_SETPLAYERHEAD = new ServerPacket(111, 12); UPDATE_INV_CLEAR = new ServerPacket(112, -2); - OBJ_DEL = new ServerPacket(113, 5); - LOGIN_SCREEN_PACKET = new ServerPacket(114, 4); - REBUILD_REGION_NORMAL = new ServerPacket(115, -1); - TOGGLE_OCULUS_ORB = new ServerPacket(116, 3); - LOC_DEL = new ServerPacket(117, 10); - MIDI_SONG = new ServerPacket(118, 8); - ENTER_FREECAM = new ServerPacket(119, 6); - SYNTH_SOUND = new ServerPacket(120, 11); - MIDI_SWAP = new ServerPacket(121, 2); - PLAYER_ANIM_SPECIFIC = new ServerPacket(122, 4); - field2738 = new ServerPacket(123, 19); - field2755 = new ServerPacket(124, 20); + UPDATE_INV_FULL = new ServerPacket(113, 10); + IF_SETPLAYERMODEL_SELF = new ServerPacket(114, 6); + REBUILD_REGION_NORMAL = new ServerPacket(115, 2); + CAM_LOOKAT_EASED_ANGLE_RELATIVE = new ServerPacket(116, 0); + NPC_INFO_LARGE = new ServerPacket(117, -2); + MIDI_SONG = new ServerPacket(118, 2); + OBJ_ADD = new ServerPacket(119, 2); + field2757 = new ServerPacket(120, 8); + MIDI_SWAP = new ServerPacket(121, -2); + field2740 = new ServerPacket(122, 6); + field2756 = new ServerPacket(123, -2); + field2736 = new ServerPacket(124, 2); + IF_SETHIDE = new ServerPacket(125, 7); + field2748 = new ServerPacket(126, -2); } ServerPacket(int var1, int var2) { this.id = var1; this.length = var2; } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "128950429" + ) + static void method1640(int var0) { + class462.field3906 = var0; + class462.field3907 = new class462[var0]; + DirectByteArrayCopier.field3136 = 0; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IZI)[B", + garbageValue = "-2070270076" + ) + @Export("ByteArrayPool_getArrayBool") + public static byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { + synchronized(ByteArrayPool.field3781) { + byte[] var3; + if ((var0 == 100 || var0 < 100 && var1) && ByteArrayPool.ByteArrayPool_smallCount > 0) { + var3 = ByteArrayPool.ByteArrayPool_small[--ByteArrayPool.ByteArrayPool_smallCount]; + ByteArrayPool.ByteArrayPool_small[ByteArrayPool.ByteArrayPool_smallCount] = null; + return var3; + } + + if ((var0 == 5000 || var0 < 5000 && var1) && ByteArrayPool.ByteArrayPool_mediumCount > 0) { + var3 = ByteArrayPool.ByteArrayPool_medium[--ByteArrayPool.ByteArrayPool_mediumCount]; + ByteArrayPool.ByteArrayPool_medium[ByteArrayPool.ByteArrayPool_mediumCount] = null; + return var3; + } + + if ((var0 == 10000 || var0 < 10000 && var1) && ByteArrayPool.ByteArrayPool_largeCount > 0) { + var3 = ByteArrayPool.ByteArrayPool_large[--ByteArrayPool.ByteArrayPool_largeCount]; + ByteArrayPool.ByteArrayPool_large[ByteArrayPool.ByteArrayPool_largeCount] = null; + return var3; + } + + if ((var0 == 30000 || var0 < 30000 && var1) && ByteArrayPool.field3774 > 0) { + var3 = ByteArrayPool.field3768[--ByteArrayPool.field3774]; + ByteArrayPool.field3768[ByteArrayPool.field3774] = null; + return var3; + } + + int var6; + if (class1.ByteArrayPool_arrays != null) { + for (var6 = 0; var6 < Clock.ByteArrayPool_alternativeSizes.length; ++var6) { + if ((Clock.ByteArrayPool_alternativeSizes[var6] == var0 || var0 < Clock.ByteArrayPool_alternativeSizes[var6] && var1) && class267.ByteArrayPool_altSizeArrayCounts[var6] > 0) { + byte[] var4 = class1.ByteArrayPool_arrays[var6][--class267.ByteArrayPool_altSizeArrayCounts[var6]]; + class1.ByteArrayPool_arrays[var6][class267.ByteArrayPool_altSizeArrayCounts[var6]] = null; + return var4; + } + } + } + + if (var1 && Clock.ByteArrayPool_alternativeSizes != null) { + for (var6 = 0; var6 < Clock.ByteArrayPool_alternativeSizes.length; ++var6) { + if (var0 <= Clock.ByteArrayPool_alternativeSizes[var6] && class267.ByteArrayPool_altSizeArrayCounts[var6] < class1.ByteArrayPool_arrays[var6].length) { + return new byte[Clock.ByteArrayPool_alternativeSizes[var6]]; + } + } + } + } + + return new byte[var0]; + } } \ No newline at end of file diff --git a/osrs/src/main/java/Skeleton.java b/osrs/src/main/java/Skeleton.java index faf79a060..d97844855 100644 --- a/osrs/src/main/java/Skeleton.java +++ b/osrs/src/main/java/Skeleton.java @@ -3,31 +3,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("kd") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("wr") - @ObfuscatedSignature( - descriptor = "Lsx;" - ) - static PlatformInfo field2060; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("id") int id; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("count") int count; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("labels") int[][] labels; - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Lkz;" ) - class241 field2065; + class267 field2235; public Skeleton(int var1, byte[] var2) { this.id = var1; @@ -54,27 +49,42 @@ public Skeleton(int var1, byte[] var2) { if (var3.offset < var3.array.length) { var4 = var3.readUnsignedShort(); if (var4 > 0) { - this.field2065 = new class241(var3, var4); + this.field2235 = new class267(var3, var4); } } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1245812999" + garbageValue = "-1055269733" ) - public int method1275() { + public int method1454() { return this.count; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Ljr;", - garbageValue = "-13" + descriptor = "(I)Lkz;", + garbageValue = "-155827584" ) - public class241 method1276() { - return this.field2065; + public class267 method1455() { + return this.field2235; + } + + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(IZZZZI)Loh;", + garbageValue = "-1589546581" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3, boolean var4) { + ArchiveDisk var5 = null; + if (JagexCache.JagexCache_dat2File != null) { + var5 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, KeyHandler.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var5, class302.field2511, WorldMapSectionType.field2038, var0, var1, var2, var3, var4, false); } } \ No newline at end of file diff --git a/osrs/src/main/java/Skills.java b/osrs/src/main/java/Skills.java index d64fcbf41..8c19d2d89 100644 --- a/osrs/src/main/java/Skills.java +++ b/osrs/src/main/java/Skills.java @@ -3,13 +3,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nu") +@ObfuscatedName("nj") @Implements("Skills") public class Skills { - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; @@ -27,23 +27,34 @@ public class Skills { } - @ObfuscatedName("ak") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "75" + descriptor = "(Lol;Ljava/lang/String;Ljava/lang/String;I)[Lup;", + garbageValue = "900236984" ) - public static void method1899() { - while (true) { - ArchiveDiskAction var0; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + public static IndexedSprite[] method1895(AbstractArchive var0, String var1, String var2) { + if (!var0.isValidFileName(var1, var2)) { + return null; + } else { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + byte[] var7 = var0.takeFile(var3, var4); + boolean var6; + if (var7 == null) { + var6 = false; + } else { + class162.SpriteBuffer_decode(var7); + var6 = true; } - if (var0 == null) { - return; + IndexedSprite[] var5; + if (!var6) { + var5 = null; + } else { + var5 = class518.method2519(); } - var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); + return var5; } } } \ No newline at end of file diff --git a/osrs/src/main/java/SoftWrapper.java b/osrs/src/main/java/SoftWrapper.java index e0507114f..53f0e0d4a 100644 --- a/osrs/src/main/java/SoftWrapper.java +++ b/osrs/src/main/java/SoftWrapper.java @@ -4,10 +4,10 @@ import java.lang.ref.SoftReference; -@ObfuscatedName("ld") +@ObfuscatedName("ln") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("ref") SoftReference ref; @@ -16,13 +16,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("get") Object get() { return this.ref.get(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("isSoft") boolean isSoft() { return true; diff --git a/osrs/src/main/java/SongTask.java b/osrs/src/main/java/SongTask.java index 90ebd909d..8b07dde0d 100644 --- a/osrs/src/main/java/SongTask.java +++ b/osrs/src/main/java/SongTask.java @@ -3,97 +3,81 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qm") +@ObfuscatedName("ql") @Implements("SongTask") public abstract class SongTask { - @ObfuscatedName("fq") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lqm;" + descriptor = "Lql;" ) - SongTask field3755; - @ObfuscatedName("ax") - String field3754; + SongTask field3758; @ObfuscatedName("ao") - String field3753; - @ObfuscatedName("ah") - boolean field3751; - @ObfuscatedName("ar") - boolean field3752; + String field3757; + @ObfuscatedName("ab") + String field3756; + @ObfuscatedName("au") + boolean field3755; + @ObfuscatedName("aa") + boolean field3754; @ObfuscatedSignature( - descriptor = "(Lqm;)V" + descriptor = "(Lql;)V" ) SongTask(SongTask var1) { - this.field3755 = var1; + this.field3758 = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-90" + descriptor = "(I)Z", + garbageValue = "-799935345" ) @Export("vmethod2142") public abstract boolean vmethod2142(); - @ObfuscatedName("ab") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1050307233" + garbageValue = "1285191143" ) - public boolean method2165() { - return this.field3751; + public boolean method2156() { + return this.field3755; } - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "45" + garbageValue = "0" ) - public boolean method2167() { - return this.field3752; + public boolean method2157() { + return this.field3754; } - @ObfuscatedName("av") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1522187493" - ) - public String method2168() { - return "Error in task: " + this.field3753 + ", Error message: " + this.field3754; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)Lqm;", - garbageValue = "-1213560262" + garbageValue = "1733616113" ) - public SongTask method2169() { - return this.field3755; + public String method2158() { + return "Error in task: " + this.field3756 + ", Error message: " + this.field3757; } - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "225620137" + descriptor = "(I)Lql;", + garbageValue = "1680402489" ) - void method2170(String var1) { - this.field3751 = true; - this.field3754 = var1; + public SongTask method2159() { + return this.field3758; } - @ObfuscatedName("ac") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1674491330" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "2" ) - @Export("isWorldMapEvent") - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; + void method2160(String var1) { + this.field3755 = true; + this.field3757 = var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/SoundCache.java b/osrs/src/main/java/SoundCache.java index 7df6ae1c7..c0a8ff140 100644 --- a/osrs/src/main/java/SoundCache.java +++ b/osrs/src/main/java/SoundCache.java @@ -3,57 +3,50 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.concurrent.ThreadPoolExecutor; - -@ObfuscatedName("bl") +@ObfuscatedName("bc") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("ab") - public static ThreadPoolExecutor field214; - @ObfuscatedName("jo") - @ObfuscatedSignature( - descriptor = "Lpu;" - ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("ac") + @ObfuscatedName("gy") + @Export("playerUUIDLength") + static int playerUUIDLength; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) - AbstractArchive field217; - @ObfuscatedName("ak") + AbstractArchive field212; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ltf;" + descriptor = "Ltw;" ) - NodeHashTable field218; + NodeHashTable field214; @ObfuscatedSignature( - descriptor = "(Lom;Lom;)V" + descriptor = "(Lol;Lol;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { new NodeHashTable(256); - this.field218 = new NodeHashTable(256); + this.field214 = new NodeHashTable(256); this.soundEffectIndex = var1; - this.field217 = var2; + this.field212 = var2; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II[II)Lbs;", - garbageValue = "804068595" + descriptor = "(II[II)Lbt;", + garbageValue = "1933572054" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { - long var4 = this.method234(var1, var2, false); - class53 var6 = (class53)this.field218.get(var4); + long var4 = this.method241(var1, var2, false); + class53 var6 = (class53)this.field214.get(var4); if (var6 != null) { - return var6.method300(); + return var6.method305(); } else if (var3 != null && var3[0] <= 0) { return null; } else { @@ -62,7 +55,7 @@ RawSound getSoundEffect0(int var1, int var2, int[] var3) { return null; } else { RawSound var8 = var7.toRawSound(); - this.field218.put(new class53(var8), var4); + this.field214.put(new class53(var8), var4); if (var3 != null) { var3[0] -= var8.samples.length; } @@ -72,32 +65,32 @@ RawSound getSoundEffect0(int var1, int var2, int[] var3) { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(III)Lcu;", - garbageValue = "941566921" + descriptor = "(IIB)Lcg;", + garbageValue = "1" ) - class53 method229(int var1, int var2) { - long var3 = this.method234(var1, var2, true); - class53 var5 = (class53)this.field218.get(var3); + class53 method237(int var1, int var2) { + long var3 = this.method241(var1, var2, true); + class53 var5 = (class53)this.field214.get(var3); if (var5 != null) { return var5; } else { - VorbisSample var6 = VorbisSample.readMusicSample(this.field217, var1, var2); + VorbisSample var6 = VorbisSample.readMusicSample(this.field212, var1, var2); if (var6 == null) { return new class53(); } else { class53 var7 = new class53(var6); - this.field218.put(var7, var3); + this.field214.put(var7, var3); return var7; } } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I[IB)Lbs;", - garbageValue = "-23" + descriptor = "(I[IB)Lbt;", + garbageValue = "47" ) @Export("getSoundEffect") RawSound getSoundEffect(int var1, int[] var2) { @@ -110,85 +103,117 @@ RawSound getSoundEffect(int var1, int[] var2) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)Lcu;", - garbageValue = "0" + descriptor = "(II)Lcg;", + garbageValue = "656232055" ) - public class53 method232(int var1) { - if (this.field217.getGroupCount() == 1) { - return this.method229(0, var1); - } else if (this.field217.getGroupFileCount(var1) == 1) { - return this.method229(var1, 0); + public class53 method239(int var1) { + if (this.field212.getGroupCount() == 1) { + return this.method237(0, var1); + } else if (this.field212.getGroupFileCount(var1) == 1) { + return this.method237(var1, 0); } else { throw new RuntimeException(); } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IS)Lbs;", - garbageValue = "11636" + descriptor = "(IS)Lbt;", + garbageValue = "26403" ) - public RawSound method233(int var1) { + public RawSound method240(int var1) { return this.getSoundEffect(var1, (int[])null); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(IIZI)J", - garbageValue = "1435261523" + garbageValue = "414633479" ) - long method234(int var1, int var2, boolean var3) { + long method241(int var1, int var2, boolean var3) { int var4 = var2 ^ (var1 << 4 & 65535 | var1 >> 12); var4 |= var1 << 16; return var3 ? (long)var4 ^ 4294967296L : (long)var4; } - @ObfuscatedName("ac") + @ObfuscatedName("ma") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "74" + descriptor = "([Lnn;II)V", + garbageValue = "685108589" ) - static void method228() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.stream1 != null) { - class140.pcmStreamMixer.removeSubStream(var0.stream1); - var0.stream1 = null; - } + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class11.isComponentHidden(var3))) { + if (var3.type == 0) { + if (!var3.isIf3 && class11.isComponentHidden(var3) && var3 != Interpreter.mousedOverWidgetIf1) { + continue; + } + + drawModelComponents(var0, var3.id); + if (var3.children != null) { + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + ClanChannel.method862(var4.group); + } + } - if (var0.stream2 != null) { - class140.pcmStreamMixer.removeSubStream(var0.stream2); - var0.stream2 = null; + if (var3.type == 6) { + int var5; + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var8 = WidgetDefinition.runCs1(var3); + if (var8) { + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; + } + + if (var5 != -1) { + SequenceDefinition var6 = DynamicObject.SequenceDefinition_get(var5); + if (!var6.isCachedModelIdSet()) { + for (var3.modelFrameCycle += Client.field460; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class159.invalidateWidget(var3)) { + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; + ++var3.modelFrame; + if (var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame = 0; + } + } + } + } else { + var3.modelFrame += Client.field460; + int var7 = var6.method1052(); + if (var3.modelFrame >= var7) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var7) { + var3.modelFrame = 0; + } + } + + class159.invalidateWidget(var3); + } + } + } + + if (var3.rotationKey != 0 && !var3.isIf3) { + int var9 = var3.rotationKey >> 16; + var5 = var3.rotationKey << 16 >> 16; + var9 *= Client.field460; + var5 *= Client.field460; + var3.modelAngleX = var9 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + class159.invalidateWidget(var3); + } + } } } - ObjectSound.objectSounds.clear(); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(III)Lcr;", - garbageValue = "1668135160" - ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); - } - - @ObfuscatedName("og") - @ObfuscatedSignature( - descriptor = "(IB)Luq;", - garbageValue = "-5" - ) - static class521 method235(int var0) { - class521 var1 = (class521)Client.Widget_cachedModels.get((long)var0); - if (var1 == null) { - var1 = new class521(class313.field2770, AbstractArchive.method1931(var0), VarbitComposition.method1046(var0)); - Client.Widget_cachedModels.put(var1, (long)var0); - } - - return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/SoundEffect.java b/osrs/src/main/java/SoundEffect.java index 6d7d9cfbd..11ac1aa1f 100644 --- a/osrs/src/main/java/SoundEffect.java +++ b/osrs/src/main/java/SoundEffect.java @@ -3,24 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bo") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[Lcp;" + descriptor = "[Lcq;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("start") int start; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "()Lbs;" + descriptor = "()Lbt;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public RawSound toRawSound() { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; @@ -83,7 +83,7 @@ public final int calculateDelay() { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("mix") final byte[] mix() { int var1 = 0; @@ -122,9 +122,9 @@ final byte[] mix() { } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lom;II)Lbr;" + descriptor = "(Lol;II)Lbo;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { diff --git a/osrs/src/main/java/SoundEnvelope.java b/osrs/src/main/java/SoundEnvelope.java index da0b36b73..eb7ac3ef7 100644 --- a/osrs/src/main/java/SoundEnvelope.java +++ b/osrs/src/main/java/SoundEnvelope.java @@ -3,40 +3,40 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bf") +@ObfuscatedName("bh") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("segments") int segments; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("durations") int[] durations; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("phases") int[] phases; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("start") int start; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("end") int end; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("form") int form; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("ticks") int ticks; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("step") int step; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("amplitude") int amplitude; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("max") int max; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ final void decode(Buffer var1) { this.decodeSegments(var1); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ final void decodeSegments(Buffer var1) { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("reset") final void reset() { this.ticks = 0; @@ -89,7 +89,7 @@ final void reset() { this.max = 0; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { diff --git a/osrs/src/main/java/SoundSystem.java b/osrs/src/main/java/SoundSystem.java index c48ec4bf1..381797bc9 100644 --- a/osrs/src/main/java/SoundSystem.java +++ b/osrs/src/main/java/SoundSystem.java @@ -3,29 +3,17 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +@ObfuscatedName("bz") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("wh") - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("cu") + @ObfuscatedName("ge") @ObfuscatedSignature( - descriptor = "Lng;" + descriptor = "Loh;" ) - static GameBuild field211; - @ObfuscatedName("fb") + static Archive field209; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lok;" - ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("up") - @Export("cameraMoveToHeight") - static int cameraMoveToHeight; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "[Lbu;" + descriptor = "[Lby;" ) @Export("players") public volatile PcmPlayer[] players; @@ -45,17 +33,642 @@ public void run() { } } } catch (Exception var4) { - class190.RunException_sendStackTrace((String)null, var4); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var4); + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)Liu;", + garbageValue = "1" + ) + public static Clock method230() { + try { + return new NanoClock(); + } catch (Throwable var1) { + return new MilliClock(); + } + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "467776303" + ) + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + if (!SpriteMask.client.method364() && !SpriteMask.client.method366() && !SpriteMask.client.method365()) { + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + UserComparator7.method674(2); + if (var0) { + Login.Login_password = ""; + } + + Frames.method1519(); + class150.method785(); + } else { + UserComparator7.method674(10); + } + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(ILdt;ZB)I", + garbageValue = "0" + ) + static int method232(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 5504) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; + } + + return 1; + } else if (var0 == 5505) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == 5506) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == 5530) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var3 < 0) { + var3 = 0; + } + + Client.camFollowHeight = var3; + return 1; + } else if (var0 == 5531) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.camFollowHeight; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("kg") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "702782966" + ) + static final void method233(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { + if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { + Client.field408[var4] = true; + } + } + + } + + @ObfuscatedName("lk") + @ObfuscatedSignature( + descriptor = "([Lnn;IIIIIIIII)V", + garbageValue = "-610795305" + ) + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.method1427(); + + for (int var9 = 0; var9 < var0.length; ++var9) { + Widget var10 = var0[var9]; + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { + int var11; + if (var8 == -1) { + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; + var11 = ++Client.rootWidgetCount - 1; + } else { + var11 = var8; + } + + var10.rootIndex = var11; + var10.cycle = Client.cycle; + if (!var10.isIf3 || !class11.isComponentHidden(var10)) { + if (var10.contentType > 0) { + class348.method1886(var10); + } + + int var12 = var10.x + var6; + int var13 = var7 + var10.y; + int var14 = var10.transparencyTop; + int var15; + int var16; + if (var10 == Client.clickedWidget) { + if (var1 != -1412584499 && !var10.isScrollBar) { + UserComparator10.field1197 = var0; + ParamComposition.field1629 = var6; + PendingSpawn.field950 = var7; + continue; + } + + if (Client.isDraggingWidget && Client.field396) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field512) { + var15 = Client.field512; + } + + if (var15 + var10.width > Client.field512 + Client.clickedWidgetParent.width) { + var15 = Client.field512 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field513) { + var16 = Client.field513; + } + + if (var16 + var10.height > Client.field513 + Client.clickedWidgetParent.height) { + var16 = Client.field513 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; + var13 = var16; + } + + if (!var10.isScrollBar) { + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 9) { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + if (var21 < var12) { + var19 = var21; + var21 = var12; + } + + if (var22 < var13) { + var20 = var22; + var22 = var13; + } + + ++var21; + ++var22; + var15 = var19 > var2 ? var19 : var2; + var16 = var20 > var3 ? var20 : var3; + var17 = var21 < var4 ? var21 : var4; + var18 = var22 < var5 ? var22 : var5; + } else { + var19 = var12 + var10.width; + var20 = var13 + var10.height; + var15 = var12 > var2 ? var12 : var2; + var16 = var13 > var3 ? var13 : var3; + var17 = var19 < var4 ? var19 : var4; + var18 = var20 < var5 ? var20 : var5; + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { + if (var10.contentType != 0) { + if (var10.contentType == 1336) { + if (WorldMapIcon_1.clientPreferences.method547()) { + var13 += 15; + ItemLayer.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); + var13 += 15; + Runtime var41 = Runtime.getRuntime(); + var20 = (int)((var41.totalMemory() - var41.freeMemory()) / 1024L); + var21 = 16776960; + if (var20 > 327680 && !Client.isLowDetail) { + var21 = 16711680; + } + + ItemLayer.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; + } + continue; + } + + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + PlayerComposition.drawEntities(var12, var13, var10.width, var10.height); + Client.field407[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1338) { + class36.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1339) { + MilliClock.method1103(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1400) { + NewShit.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); + } + + if (var10.contentType == 1401) { + NewShit.worldMap.drawOverview(var12, var13, var10.width, var10.height); + } + + if (var10.contentType == 1402) { + EnumComposition.field1505.draw(var12, Client.cycle); + } + } + + if (var10.type == 0) { + if (!var10.isIf3 && class11.isComponentHidden(var10) && var10 != Interpreter.mousedOverWidgetIf1) { + continue; + } + + if (!var10.isIf3) { + if (var10.scrollY > var10.scrollHeight - var10.height) { + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + if (var10.children != null) { + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); + if (var28 != null) { + Canvas.drawWidgets(var28.group, var15, var16, var17, var18, var12, var13, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.method1427(); + } else if (var10.type == 11) { + if (class11.isComponentHidden(var10) && var10 != Interpreter.mousedOverWidgetIf1) { + continue; + } + + if (var10.children != null) { + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.method1427(); + } + + if (Client.isResizable || Client.field409[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + Varcs.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { + if (var10.type == 3) { + if (WidgetDefinition.runCs1(var10)) { + var19 = var10.color2; + if (var10 == Interpreter.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; + if (var10 == Interpreter.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { + switch(var10.fillMode.field4261) { + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); + break; + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); + break; + default: + if (var14 == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } + } else if (var14 == 0) { + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } else if (var10.type == 4) { + Font var40 = var10.getFont(HealthBarDefinition.widgetDefinition); + if (var40 == null) { + if (Widget.field2976) { + class159.invalidateWidget(var10); + } + } else { + String var42 = var10.text; + if (WidgetDefinition.runCs1(var10)) { + var20 = var10.color2; + if (var10 == Interpreter.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { + var42 = var10.text2; + } + } else { + var20 = var10.color; + if (var10 == Interpreter.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { + ItemComposition var43 = class214.ItemDefinition_get(var10.itemId); + var42 = var43.name; + if (var42 == null) { + var42 = "null"; + } + + if ((var43.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var42 = class167.colorStartTag(16748608) + var42 + "" + " " + 'x' + class355.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { + var42 = "Please wait..."; + var20 = var10.color; + } + + if (!var10.isIf3) { + var42 = HitSplatDefinition.method998(var42, var10); + } + + var40.method2111(var42, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, class478.method2364(var10.transparencyTop), var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); + } + } else { + int var23; + int var24; + int var25; + if (var10.type == 5) { + SpritePixels var38; + if (!var10.isIf3) { + var38 = var10.getSprite(HealthBarDefinition.widgetDefinition, WidgetDefinition.runCs1(var10), class60.urlRequester); + if (var38 != null) { + var38.drawTransBgAt(var12, var13); + } else if (Widget.field2976) { + class159.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { + var38 = class6.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var38 = var10.getSprite(HealthBarDefinition.widgetDefinition, false, class60.urlRequester); + } + + if (var38 == null) { + if (Widget.field2976) { + class159.invalidateWidget(var10); + } + } else { + var20 = var38.width; + var21 = var38.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { + var38.method2704(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { + var38.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { + var38.drawTransBgAt(var12, var13); + } else { + var38.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); + var22 = (var20 - 1 + var10.width) / var20; + var23 = (var21 - 1 + var10.height) / var21; + + for (var24 = 0; var24 < var22; ++var24) { + for (var25 = 0; var25 < var23; ++var25) { + if (var10.spriteAngle != 0) { + var38.method2704(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); + } else if (var14 != 0) { + var38.drawTransAt(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var38.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } else { + int var34; + if (var10.type == 6) { + boolean var36 = WidgetDefinition.runCs1(var10); + if (var36) { + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; + } + + Model var39 = null; + var22 = 0; + if (var10.itemId != -1) { + ItemComposition var44 = class214.ItemDefinition_get(var10.itemId); + if (var44 != null) { + var44 = var44.getCountObj(var10.itemQuantity); + var39 = var44.getModel(1); + if (var39 != null) { + var39.calculateBoundsCylinder(); + var22 = var39.height / 2; + } else { + class159.invalidateWidget(var10); + } + } + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var39 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var39 = class229.localPlayer.getModel(); + } + } else if (var10.modelType == 7) { + var39 = var10.field3125.getModel((SequenceDefinition)null, -1, DynamicObject.SequenceDefinition_get(class229.localPlayer.idleSequence), class229.localPlayer.movementFrame); + } else { + NPCComposition var45 = null; + NewShit var32 = null; + if (var10.modelType == 6) { + var25 = var10.modelId; + if (var25 >= 0 && var25 < Client.npcs.length) { + NPC var26 = Client.npcs[var25]; + if (var26 != null) { + var45 = var26.definition; + var32 = var26.method590(); + } + } + } + + SequenceDefinition var33 = null; + var34 = -1; + if (var20 != -1) { + var33 = DynamicObject.SequenceDefinition_get(var20); + var34 = var10.modelFrame; + } + + var39 = var10.getModel(HealthBarDefinition.widgetDefinition, var33, var34, var36, class229.localPlayer.appearance, var45, var32); + if (var39 == null && Widget.field2976) { + class159.invalidateWidget(var10); + } + } + + Rasterizer3D.method1430(var10.width / 2 + var12, var10.height / 2 + var13); + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; + if (var39 != null) { + if (!var10.isIf3) { + var39.method1556(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var39.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var39.method1557(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var39.method1556(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); + } + } + } + + Rasterizer3D.method1429(); + } else { + Font var29; + if (var10.type == 8 && var10 == SwapSongTask.field3744 && Client.field492 == Client.field493) { + var19 = 0; + var20 = 0; + var29 = ItemLayer.fontPlain12; + String var30 = var10.text; + + String var31; + for (var30 = HitSplatDefinition.method998(var30, var10); var30.length() > 0; var20 = var20 + var29.ascent + 1) { + var24 = var30.indexOf("
"); + if (var24 != -1) { + var31 = var30.substring(0, var24); + var30 = var30.substring(var24 + 4); + } else { + var31 = var30; + var30 = ""; + } + + var25 = var29.stringWidth(var31); + if (var25 > var19) { + var19 = var25; + } + } + + var19 += 6; + var20 += 7; + var24 = var12 + var10.width - 5 - var19; + var25 = var13 + var10.height + 5; + if (var24 < var12 + 5) { + var24 = var12 + 5; + } + + if (var19 + var24 > var4) { + var24 = var4 - var19; + } + + if (var20 + var25 > var5) { + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); + var30 = var10.text; + var34 = var25 + var29.ascent + 2; + + for (var30 = HitSplatDefinition.method998(var30, var10); var30.length() > 0; var34 = var34 + var29.ascent + 1) { + int var27 = var30.indexOf("
"); + if (var27 != -1) { + var31 = var30.substring(0, var27); + var30 = var30.substring(var27 + 4); + } else { + var31 = var30; + var30 = ""; + } + + var29.draw(var31, var24 + 3, var34, 0, -1); + } + } + + if (var10.type == 9) { + if (var10.field2989) { + var19 = var12; + var20 = var13 + var10.height; + var21 = var12 + var10.width; + var22 = var13; + } else { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + } + + if (var10.lineWid == 1) { + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); + } else { + UrlRequest.method661(var19, var20, var21, var22, var10.color, var10.lineWid); + } + } else if (var10.type == 12) { + class341 var37 = var10.method1871(); + class336 var35 = var10.method1872(); + if (var37 != null && var35 != null && var37.method1815()) { + var29 = var10.getFont(HealthBarDefinition.widgetDefinition); + if (var29 != null) { + Client.field649.method2712(var12, var13, var10.width, var10.height, var37.method1816(), var37.method1817(), var37.method1813(), var37.method1814(), var37.method1812()); + var22 = var10.textShadowed ? var10.spriteShadow * -457439149 * -1616413733 : -1; + if (!var37.method1810() && var37.method1807().method2053()) { + Client.field649.method2713(var35.field2922, var22, var35.field2923, var35.field2921); + Client.field649.method2714(var37.method1808(), var29); + } else { + Client.field649.method2713(var10.color, var22, var35.field2923, var35.field2921); + Client.field649.method2714(var37.method1807(), var29); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } + } + } + } + } + } + } + } } } - @ObfuscatedName("ac") + @ObfuscatedName("mc") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "13012" + descriptor = "(IS)V", + garbageValue = "4026" ) - public static void method226() { - class201.field1580.clear(); + static final void method235(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); + WorldMapIcon_1.clientPreferences.setCurrentSoundEffectVolume(var0); } } \ No newline at end of file diff --git a/osrs/src/main/java/SpotAnimation.java b/osrs/src/main/java/SpotAnimation.java index 79f5970ca..b5c90948e 100644 --- a/osrs/src/main/java/SpotAnimation.java +++ b/osrs/src/main/java/SpotAnimation.java @@ -1,29 +1,29 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("vk") +@ObfuscatedName("vl") @Implements("SpotAnimation") public class SpotAnimation extends Node { - @ObfuscatedName("ac") - public int field4304; - @ObfuscatedName("al") - public int field4306; - @ObfuscatedName("ak") - public int field4305; - @ObfuscatedName("ax") - public int field4308; + @ObfuscatedName("at") + public int field4313; + @ObfuscatedName("ah") + public int field4310; + @ObfuscatedName("ar") + public int field4312; @ObfuscatedName("ao") - public int field4307; + public int field4311; + @ObfuscatedName("ab") + public int field4309; public SpotAnimation(int var1, int var2, int var3, int var4) { - this.field4304 = -1; - this.field4306 = 0; - this.field4305 = 0; - this.field4308 = 0; - this.field4307 = 0; - this.field4304 = var1; - this.field4307 = var2; - this.field4308 = var3; - this.field4306 = var4; + this.field4313 = -1; + this.field4310 = 0; + this.field4312 = 0; + this.field4311 = 0; + this.field4309 = 0; + this.field4313 = var1; + this.field4309 = var2; + this.field4311 = var3; + this.field4310 = var4; } } \ No newline at end of file diff --git a/osrs/src/main/java/SpotAnimationDefinition.java b/osrs/src/main/java/SpotAnimationDefinition.java index fcff0e5e2..87190df0f 100644 --- a/osrs/src/main/java/SpotAnimationDefinition.java +++ b/osrs/src/main/java/SpotAnimationDefinition.java @@ -3,67 +3,72 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("ha") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("SpotAnimationDefinition_archive") - public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("al") + static AbstractArchive SpotAnimationDefinition_archive; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("SpotAnimationDefinition_modelArchive") - public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("ak") + static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("SpotAnimationDefinition_cached") - static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("ax") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("SpotAnimationDefinition_cachedModels") - static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("ao") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("gm") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + static Archive field1597; + @ObfuscatedName("ab") @Export("id") int id; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("archive") int archive; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("sequence") public int sequence; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("widthScale") int widthScale; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("heightScale") int heightScale; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("orientation") int orientation; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("ambient") int ambient; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("contrast") int contrast; @@ -81,10 +86,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; } - @ObfuscatedName("al") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-1113058920" + descriptor = "(Luj;I)V", + garbageValue = "-1590582359" ) @Export("decode") void decode(Buffer var1) { @@ -98,10 +103,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "2121319025" + descriptor = "(Luj;IB)V", + garbageValue = "-22" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -145,17 +150,17 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("ax") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)Ljn;", - garbageValue = "1896803273" + descriptor = "(IB)Lka;", + garbageValue = "-10" ) @Export("getModel") public final Model getModel(int var1) { - Model var2 = this.method1037(); + Model var2 = this.method966(); Model var3; if (this.sequence != -1 && var1 != -1) { - var3 = class36.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var3 = DynamicObject.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var3 = var2.toSharedSpotAnimationModel(true); } @@ -184,13 +189,13 @@ public final Model getModel(int var1) { return var3; } - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)Ljn;", - garbageValue = "6" + descriptor = "(B)Lka;", + garbageValue = "115" ) - public final Model method1037() { - Model var1 = (Model) SpotAnimationDefinition_cachedModels.get((long)this.id); + public final Model method966() { + Model var1 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); if (var1 == null) { ModelData var2 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); if (var2 == null) { @@ -217,13 +222,18 @@ public final Model method1037() { return var1; } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-113" + descriptor = "(B)J", + garbageValue = "32" ) - public static final void method1038() { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; + public static final synchronized long method962() { + long var0 = System.currentTimeMillis(); + if (var0 < class312.field2773) { + class312.field2772 += class312.field2773 - var0; + } + + class312.field2773 = var0; + return class312.field2772 + var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/SpriteMask.java b/osrs/src/main/java/SpriteMask.java index baa01d1c0..c2ad3cef5 100644 --- a/osrs/src/main/java/SpriteMask.java +++ b/osrs/src/main/java/SpriteMask.java @@ -3,25 +3,25 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mp") +@ObfuscatedName("me") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("tv") + @ObfuscatedName("bk") + @Export("client") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "Lclient;" ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("ac") + public static Client client; + @ObfuscatedName("at") @Export("width") public final int width; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("height") public final int height; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("xStarts") public final int[] xStarts; @@ -32,10 +32,10 @@ public class SpriteMask extends DualNode { this.xStarts = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1677893354" + garbageValue = "1206229207" ) @Export("contains") public boolean contains(int var1, int var2) { diff --git a/osrs/src/main/java/SpritePixels.java b/osrs/src/main/java/SpritePixels.java index b0e6d6c3e..46b2c0cfb 100644 --- a/osrs/src/main/java/SpritePixels.java +++ b/osrs/src/main/java/SpritePixels.java @@ -3,28 +3,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ud") +@ObfuscatedName("uz") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("pixels") public int[] pixels; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("subWidth") public int subWidth; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("subHeight") public int subHeight; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("xOffset") public int xOffset; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("yOffset") - public int yOffset; - @ObfuscatedName("ah") + int yOffset; + @ObfuscatedName("au") @Export("width") public int width; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("height") public int height; @@ -40,12 +40,12 @@ public SpritePixels(int var1, int var2) { this(new int[var2 * var1], var1, var2); } - public SpritePixels() { + SpritePixels() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "()Lud;" + descriptor = "()Luz;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { @@ -64,11 +64,11 @@ public SpritePixels mirrorHorizontally() { return var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "()Lud;" + descriptor = "()Luz;" ) - public SpritePixels method2696() { + public SpritePixels method2674() { SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); var1.width = this.width; var1.height = this.height; @@ -83,9 +83,9 @@ public SpritePixels method2696() { return var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "()Lud;" + descriptor = "()Luz;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { @@ -100,13 +100,13 @@ public SpritePixels copyNormalized() { return var1; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("setRaster") public void setRaster() { - Rasterizer2D.method2659(this.pixels, this.subWidth, this.subHeight, (float[])null); + Rasterizer2D.method2637(this.pixels, this.subWidth, this.subHeight, (float[])null); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -126,7 +126,7 @@ public void normalize() { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -168,7 +168,7 @@ public void pad(int var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -184,7 +184,7 @@ public void flipHorizontally() { this.xOffset = this.width - this.subWidth - this.xOffset; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -200,7 +200,7 @@ public void flipVertically() { this.yOffset = this.height - this.subHeight - this.yOffset; } - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; @@ -228,7 +228,7 @@ public void outline(int var1) { this.pixels = var2; } - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { @@ -243,7 +243,7 @@ public void shadow(int var1) { } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -289,7 +289,7 @@ public void drawAt(int var1, int var2) { } } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; @@ -335,7 +335,7 @@ public void drawTransBgAt(int var1, int var2) { } } - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { @@ -400,7 +400,7 @@ public void drawScaledAt(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { @@ -450,7 +450,7 @@ public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; @@ -561,8 +561,8 @@ public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) } } - @ObfuscatedName("az") - public void method2717(int var1, int var2, int var3) { + @ObfuscatedName("an") + public void method2695(int var1, int var2, int var3) { var1 += this.xOffset; var2 += this.yOffset; int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -603,16 +603,16 @@ public void method2717(int var1, int var2, int var3) { if (var7 > 0 && var6 > 0) { if (var3 == 256) { - method2718(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method2696(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method2719(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method2697(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } } - @ObfuscatedName("ad") - public void method2720(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("af") + public void method2698(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { int var6 = this.subWidth; int var7 = this.subHeight; @@ -672,16 +672,16 @@ public void method2720(int var1, int var2, int var3, int var4, int var5) { } if (var5 == 256) { - method2721(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method2699(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method2722(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method2700(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } } - @ObfuscatedName("by") - public void method2723(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("bl") + public void method2701(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0 ? -var2 : 0; int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; int var11 = var1 < 0 ? -var1 : 0; @@ -728,7 +728,7 @@ public void method2723(int var1, int var2, int var3, int var4, int var5, int var } - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { @@ -763,8 +763,8 @@ public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int va } - @ObfuscatedName("be") - public void method2725(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("bv") + public void method2703(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; int var11 = -var4 / 2; @@ -802,13 +802,13 @@ public void method2725(int var1, int var2, int var3, int var4, int var5, int var } - @ObfuscatedName("bv") - public void method2726(int var1, int var2, int var3, int var4) { - this.method2727(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + @ObfuscatedName("bf") + public void method2704(int var1, int var2, int var3, int var4) { + this.method2705(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } - @ObfuscatedName("ba") - void method2727(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("bg") + void method2705(int var1, int var2, int var3, int var4, int var5, int var6) { if (var6 != 0) { var1 -= this.xOffset << 4; var2 -= this.yOffset << 4; @@ -1276,7 +1276,7 @@ void method2727(int var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { @@ -1399,7 +1399,7 @@ public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { @@ -1419,7 +1419,7 @@ static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, in } - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -1472,7 +1472,7 @@ static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int v } - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; @@ -1498,7 +1498,7 @@ static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int va } - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { int var11 = 256 - var9; @@ -1524,7 +1524,7 @@ static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; @@ -1546,7 +1546,7 @@ static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, i } - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { int var13 = 256 - var12; @@ -1574,8 +1574,8 @@ static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, i } - @ObfuscatedName("at") - static void method2718(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + @ObfuscatedName("ag") + static void method2696(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1596,8 +1596,8 @@ static void method2718(int var0, int var1, int var2, int[] var3, int[] var4, int } - @ObfuscatedName("af") - static void method2719(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + @ObfuscatedName("ad") + static void method2697(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1620,8 +1620,8 @@ static void method2719(int var0, int var1, int var2, int[] var3, int[] var4, int } - @ObfuscatedName("bn") - static void method2721(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + @ObfuscatedName("be") + static void method2699(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { for (int var16 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); @@ -1647,8 +1647,8 @@ static void method2721(int var0, int var1, int var2, int var3, int[] var4, int[] } - @ObfuscatedName("bk") - static void method2722(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { + @ObfuscatedName("bd") + static void method2700(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { for (int var17 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); diff --git a/osrs/src/main/java/Strings.java b/osrs/src/main/java/Strings.java index e722c0c59..6f7678789 100644 --- a/osrs/src/main/java/Strings.java +++ b/osrs/src/main/java/Strings.java @@ -1,53 +1,34 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Arrays; - -@ObfuscatedName("oq") +@ObfuscatedName("nr") @Implements("Strings") public class Strings { - @ObfuscatedName("fz") - public static String field3355; - @ObfuscatedName("kv") - public static String field3466; - @ObfuscatedName("kx") - public static String field3468; - @ObfuscatedName("kt") - public static String field3464; + @ObfuscatedName("fa") + public static String field3326; + @ObfuscatedName("ka") + public static String field3442; + @ObfuscatedName("kb") + public static String field3443; + @ObfuscatedName("ky") + public static String field3465; static { - field3355 = "Please visit the support page for assistance."; - field3466 = ""; - field3468 = "Page has opened in the browser."; - field3464 = ""; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "5563087" - ) - public static boolean method1907() { - if (!class319.field2798.isEmpty()) { - return true; - } else { - return !class319.musicSongs.isEmpty() && class319.musicSongs.get(0) != null && ((MusicSong)class319.musicSongs.get(0)).midiPcmStream != null ? ((MusicSong)class319.musicSongs.get(0)).midiPcmStream.isReady() : false; - } + field3326 = "Please visit the support page for assistance."; + field3442 = ""; + field3443 = "Page has opened in the browser."; + field3465 = ""; } - @ObfuscatedName("bf") + @ObfuscatedName("mk") @ObfuscatedSignature( - descriptor = "(Lnm;Lni;ZB)V", - garbageValue = "-63" + descriptor = "(B)Z", + garbageValue = "-80" ) - public static void method1908(Widget var0, PlayerComposition var1, boolean var2) { - var0.modelType = 7; - var0.field3127 = new PlayerComposition(var1); - if (!var2) { - var0.field3127.equipment = Arrays.copyOf(var0.field3127.field2944, var0.field3127.field2944.length); - var0.field3127.method1760(); - } - + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; } } \ No newline at end of file diff --git a/osrs/src/main/java/StructComposition.java b/osrs/src/main/java/StructComposition.java index 6f949ea9b..099fc6bbe 100644 --- a/osrs/src/main/java/StructComposition.java +++ b/osrs/src/main/java/StructComposition.java @@ -3,24 +3,29 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("hy") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("StructDefinition_cached") static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("ak") + @ObfuscatedName("fn") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + static Archive field1637; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ltp;" + descriptor = "Ltz;" ) @Export("params") IterableNodeHashTable params; @@ -32,19 +37,19 @@ public class StructComposition extends DualNode { StructComposition() { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2078749719" + garbageValue = "-968582789" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-1812478277" + descriptor = "(Luj;I)V", + garbageValue = "-1850200983" ) @Export("decode") void decode(Buffer var1) { @@ -58,52 +63,49 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "586234796" + descriptor = "(Luj;IB)V", + garbageValue = "4" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = class167.readStringIntParameters(var1, this.params); + this.params = class144.readStringIntParameters(var1, this.params); } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "-32631" + descriptor = "(III)I", + garbageValue = "-408803352" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return AttackOption.method607(this.params, var1, var2); + return Player.method478(this.params, var1, var2); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1837160520" + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "78" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class30.method122(this.params, var1, var2); - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1128755492" - ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; + IterableNodeHashTable var4 = this.params; + String var3; + if (var4 == null) { + var3 = var2; } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; + ObjectNode var5 = (ObjectNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = (String)var5.obj; + } } + + return var3; } } \ No newline at end of file diff --git a/osrs/src/main/java/StudioGame.java b/osrs/src/main/java/StudioGame.java index 7f0c11138..62f210d46 100644 --- a/osrs/src/main/java/StudioGame.java +++ b/osrs/src/main/java/StudioGame.java @@ -3,50 +3,50 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("np") +@ObfuscatedName("nt") @Implements("StudioGame") -public enum StudioGame implements class386 { - @ObfuscatedName("ac") +public enum StudioGame implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lnp;" + descriptor = "Lnt;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lnp;" + descriptor = "Lnt;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lnp;" + descriptor = "Lnt;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lnp;" + descriptor = "Lnt;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lnp;" + descriptor = "Lnt;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnp;" + descriptor = "Lnt;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("name") public final String name; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("id") final int id; @@ -55,37 +55,13 @@ public enum StudioGame implements class386 { this.id = var5; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "-444646790" - ) - static char method1905(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; - } - - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "6526" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - class91.method483(); - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; - } } \ No newline at end of file diff --git a/osrs/src/main/java/SwapSongTask.java b/osrs/src/main/java/SwapSongTask.java index 09e4a283c..128372865 100644 --- a/osrs/src/main/java/SwapSongTask.java +++ b/osrs/src/main/java/SwapSongTask.java @@ -3,30 +3,66 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pz") +@ObfuscatedName("pi") @Implements("SwapSongTask") public class SwapSongTask extends SongTask { + @ObfuscatedName("ok") @ObfuscatedSignature( - descriptor = "(Lqm;)V" + descriptor = "Lnn;" + ) + static Widget field3744; + + @ObfuscatedSignature( + descriptor = "(Lql;)V" ) public SwapSongTask(SongTask var1) { super(var1); - super.field3753 = "SwapSongTask"; + super.field3756 = "SwapSongTask"; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-90" + descriptor = "(I)Z", + garbageValue = "-799935345" ) @Export("vmethod2142") public boolean vmethod2142() { - if (class319.musicSongs.size() > 1 && class319.musicSongs.get(0) != null && ((MusicSong)class319.musicSongs.get(0)).midiPcmStream.isReady() && class319.musicSongs.get(1) != null && ((MusicSong)class319.musicSongs.get(1)).midiPcmStream.isReady()) { - MusicSong var1 = (MusicSong)class319.musicSongs.get(0); - class319.musicSongs.set(0, class319.musicSongs.get(1)); - class319.musicSongs.set(1, var1); + if (class316.musicSongs.size() > 1 && class316.musicSongs.get(0) != null && ((MusicSong)class316.musicSongs.get(0)).midiPcmStream.isReady() && class316.musicSongs.get(1) != null && ((MusicSong)class316.musicSongs.get(1)).midiPcmStream.isReady()) { + MusicSong var1 = (MusicSong)class316.musicSongs.get(0); + class316.musicSongs.set(0, class316.musicSongs.get(1)); + class316.musicSongs.set(1, var1); } return true; } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "([BB)V", + garbageValue = "23" + ) + @Export("ByteArrayPool_release") + public static void ByteArrayPool_release(byte[] var0) { + synchronized(ByteArrayPool.field3781) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field3779) { + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field3775) { + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; + } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field3777) { + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; + } else if (var0.length == 30000 && ByteArrayPool.field3774 < ByteArrayPool.field3778) { + ByteArrayPool.field3768[++ByteArrayPool.field3774 - 1] = var0; + } else { + if (class1.ByteArrayPool_arrays != null) { + for (int var2 = 0; var2 < Clock.ByteArrayPool_alternativeSizes.length; ++var2) { + if (var0.length == Clock.ByteArrayPool_alternativeSizes[var2] && class267.ByteArrayPool_altSizeArrayCounts[var2] < class1.ByteArrayPool_arrays[var2].length) { + class1.ByteArrayPool_arrays[var2][class267.ByteArrayPool_altSizeArrayCounts[var2]++] = var0; + return; + } + } + } + + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Task.java b/osrs/src/main/java/Task.java index 1fb0329c2..25d0294d6 100644 --- a/osrs/src/main/java/Task.java +++ b/osrs/src/main/java/Task.java @@ -3,28 +3,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") +@ObfuscatedName("iq") @Implements("Task") public class Task { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Liq;" ) @Export("next") Task next; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("status") public volatile int status; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("type") int type; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("intArgument") public int intArgument; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("result") public volatile Object result; diff --git a/osrs/src/main/java/TaskHandler.java b/osrs/src/main/java/TaskHandler.java index 865a9bdd4..a61f6bab5 100644 --- a/osrs/src/main/java/TaskHandler.java +++ b/osrs/src/main/java/TaskHandler.java @@ -8,37 +8,37 @@ import java.net.Socket; import java.net.URL; -@ObfuscatedName("gw") +@ObfuscatedName("ih") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("dk") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "[Lun;" + descriptor = "Lpf;" ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("ak") + @Export("ItemDefinition_fontPlain11") + public static Font ItemDefinition_fontPlain11; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Liq;" ) @Export("current") Task current; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Liq;" ) @Export("task") Task task; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("thread") Thread thread; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("isClosed") boolean isClosed; @@ -62,10 +62,10 @@ public TaskHandler() { this.thread.start(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-585427867" ) @Export("close") public final void close() { @@ -81,10 +81,10 @@ public final void close() { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;B)Lhi;", - garbageValue = "99" + descriptor = "(IIILjava/lang/Object;I)Liq;", + garbageValue = "-993585503" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -105,20 +105,20 @@ final Task newTask(int var1, int var2, int var3, Object var4) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IS)Lhi;", - garbageValue = "-20310" + descriptor = "(Ljava/lang/String;II)Liq;", + garbageValue = "-180890687" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lhi;", - garbageValue = "-1310826122" + descriptor = "(Ljava/lang/Runnable;II)Liq;", + garbageValue = "1323280137" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -175,34 +175,26 @@ public final void run() { } } - @ObfuscatedName("ml") + @ObfuscatedName("km") @ObfuscatedSignature( - descriptor = "(Lnm;III)V", - garbageValue = "-23690326" + descriptor = "(IIIIII)Z", + garbageValue = "1243535616" ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null && class275.method1539(var0) != null) { - Client.clickedWidget = var0; - Client.clickedWidgetParent = class275.method1539(var0); - Client.widgetClickX = var1; - Client.widgetClickY = var2; - FriendsChat.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var3 = AttackOption.method609(); - if (var3 != -1) { - class133.tempMenuAction = new MenuAction(); - class133.tempMenuAction.param0 = Client.menuArguments1[var3]; - class133.tempMenuAction.param1 = Client.menuArguments2[var3]; - class133.tempMenuAction.opcode = Client.menuOpcodes[var3]; - class133.tempMenuAction.identifier = Client.menuIdentifiers[var3]; - class133.tempMenuAction.itemId = Client.menuItemIds[var3]; - class133.tempMenuAction.action = Client.menuActions[var3]; - class133.tempMenuAction.target = Client.menuTargets[var3]; - } + static final boolean method1086(int var0, int var1, int var2, int var3, int var4) { + PendingSpawn var5 = null; + for (PendingSpawn var6 = (PendingSpawn)Client.pendingSpawns.last(); var6 != null; var6 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var6.plane && var6.x == var1 && var2 == var6.y && var3 == var6.type) { + var5 = var6; + break; } } + + if (var5 != null) { + var5.field957 = var4; + return true; + } else { + return false; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/Texture.java b/osrs/src/main/java/Texture.java index 8a8ebb583..da0ebe096 100644 --- a/osrs/src/main/java/Texture.java +++ b/osrs/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jo") +@ObfuscatedName("ks") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("averageRGB") int averageRGB; - @ObfuscatedName("ah") - boolean field1999; - @ObfuscatedName("ar") + @ObfuscatedName("au") + boolean field2171; + @ObfuscatedName("aa") @Export("fileIds") int[] fileIds; - @ObfuscatedName("ab") - int[] field2004; - @ObfuscatedName("am") - int[] field2005; - @ObfuscatedName("av") - int[] field2008; - @ObfuscatedName("ag") + @ObfuscatedName("ac") + int[] field2176; + @ObfuscatedName("al") + int[] field2177; + @ObfuscatedName("az") + int[] field2179; + @ObfuscatedName("ap") @Export("animationDirection") int animationDirection; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("pixels") int[] pixels; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;)V" ) Texture(Buffer var1) { this.isLoaded = false; this.averageRGB = var1.readUnsignedShort(); - this.field1999 = var1.readUnsignedByte() == 1; + this.field2171 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 4) { this.fileIds = new int[var2]; @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { - this.field2004 = new int[var2 - 1]; + this.field2176 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field2004[var3] = var1.readUnsignedByte(); + this.field2176[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { - this.field2005 = new int[var2 - 1]; + this.field2177 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field2005[var3] = var1.readUnsignedByte(); + this.field2177[var3] = var1.readUnsignedByte(); } } - this.field2008 = new int[var2]; + this.field2179 = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.field2008[var3] = var1.readInt(); + this.field2179[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); @@ -82,9 +82,9 @@ public class Texture extends Node { } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(DILom;)Z" + descriptor = "(DILol;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -101,26 +101,31 @@ boolean load(double var1, int var3, AbstractArchive var4) { for (int var6 = 0; var6 < this.fileIds.length; ++var6) { int var8 = this.fileIds[var6]; IndexedSprite var7; - if (!class406.method2058(var4, var8)) { + if (!EnumComposition.method926(var4, var8)) { var7 = null; } else { IndexedSprite var10 = new IndexedSprite(); - var10.width = class159.SpriteBuffer_spriteWidth; - var10.height = class500.SpriteBuffer_spriteHeight; - var10.xOffset = class326.SpriteBuffer_xOffsets[0]; - var10.yOffset = ModelData0.SpriteBuffer_yOffsets[0]; - var10.subWidth = class59.SpriteBuffer_spriteWidths[0]; - var10.subHeight = class544.SpriteBuffer_spriteHeights[0]; - var10.palette = class372.SpriteBuffer_spritePalette; - var10.pixels = AddRequestTask.SpriteBuffer_pixels[0]; - class407.method2062(); + var10.width = class541.SpriteBuffer_spriteWidth; + var10.height = GrandExchangeOfferWorldComparator.SpriteBuffer_spriteHeight; + var10.xOffset = class541.SpriteBuffer_xOffsets[0]; + var10.yOffset = class541.SpriteBuffer_yOffsets[0]; + var10.subWidth = class541.SpriteBuffer_spriteWidths[0]; + var10.subHeight = class520.SpriteBuffer_spriteHeights[0]; + var10.palette = class541.SpriteBuffer_spritePalette; + var10.pixels = class396.SpriteBuffer_pixels[0]; + class541.SpriteBuffer_xOffsets = null; + class541.SpriteBuffer_yOffsets = null; + class541.SpriteBuffer_spriteWidths = null; + class520.SpriteBuffer_spriteHeights = null; + class541.SpriteBuffer_spritePalette = null; + class396.SpriteBuffer_pixels = null; var7 = var10; } var7.normalize(); byte[] var17 = var7.pixels; int[] var11 = var7.palette; - int var12 = this.field2008[var6]; + int var12 = this.field2179[var6]; if ((var12 & -16777216) == 16777216) { } @@ -151,7 +156,7 @@ boolean load(double var1, int var3, AbstractArchive var4) { if (var6 == 0) { var13 = 0; } else { - var13 = this.field2004[var6 - 1]; + var13 = this.field2176[var6 - 1]; } if (var13 == 0) { @@ -195,13 +200,13 @@ boolean load(double var1, int var3, AbstractArchive var4) { return true; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("reset") void reset() { this.pixels = null; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("animate") void animate(int var1) { if (this.pixels != null) { diff --git a/osrs/src/main/java/TextureLoader.java b/osrs/src/main/java/TextureLoader.java index 8f16b7547..29d367261 100644 --- a/osrs/src/main/java/TextureLoader.java +++ b/osrs/src/main/java/TextureLoader.java @@ -3,37 +3,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("lw") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-1910207818" + garbageValue = "2146690386" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "958373665" + garbageValue = "-799593144" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-20" + descriptor = "(II)Z", + garbageValue = "-293103198" ) @Export("vmethod3989") boolean vmethod3989(int var1); - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "21443457" + descriptor = "(IS)Z", + garbageValue = "32621" ) @Export("isLowDetail") boolean isLowDetail(int var1); diff --git a/osrs/src/main/java/TextureProvider.java b/osrs/src/main/java/TextureProvider.java index 10b874ca4..e3552e798 100644 --- a/osrs/src/main/java/TextureProvider.java +++ b/osrs/src/main/java/TextureProvider.java @@ -3,48 +3,42 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("kg") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("nx") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ldj;" - ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "[Ljo;" + descriptor = "[Lks;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lon;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("capacity") int capacity; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("remaining") int remaining; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("brightness") double brightness; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("textureSize") int textureSize; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Lom;Lom;IDI)V" + descriptor = "(Lol;Lol;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); @@ -71,10 +65,10 @@ public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, dou } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "56" + garbageValue = "81" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -93,7 +87,7 @@ public int getLoadedPercentage() { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.archive.method1937(var8)) { + if (this.archive.method1930(var8)) { ++var2; } } @@ -108,17 +102,17 @@ public int getLoadedPercentage() { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; this.clear(); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-1910207818" + garbageValue = "2146690386" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -148,40 +142,40 @@ public int[] getTexturePixels(int var1) { return null; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "958373665" + garbageValue = "-799593144" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-20" + descriptor = "(II)Z", + garbageValue = "-293103198" ) @Export("vmethod3989") public boolean vmethod3989(int var1) { - return this.textures[var1].field1999; + return this.textures[var1].field2171; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "21443457" + descriptor = "(IS)Z", + garbageValue = "32621" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1815480398" + garbageValue = "1262125265" ) @Export("clear") public void clear() { @@ -195,10 +189,10 @@ public void clear() { this.remaining = this.capacity; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2088818432" + garbageValue = "2003638345" ) @Export("animate") public void animate(int var1) { @@ -212,175 +206,58 @@ public void animate(int var1) { } - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lom;IB)V", - garbageValue = "32" + descriptor = "(I)V", + garbageValue = "-1703102437" ) - static void method1351(AbstractArchive var0, int var1) { - if ((var1 & class525.field4158.rsOrdinal()) != 0) { - Login.logoSprite = class167.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); - } else if ((var1 & class525.field4159.rsOrdinal()) != 0) { - Login.logoSprite = class167.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); - } else if ((var1 & class525.field4155.rsOrdinal()) != 0) { - Login.logoSprite = class167.SpriteBuffer_getIndexedSpriteByName(var0, "logo_speedrunning", ""); - } else { - Login.logoSprite = class167.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; + + try { + var0 = class131.getPreferencesFile("", Messages.field1156.name, true); + Buffer var1 = WorldMapIcon_1.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { + } + + try { + if (var0 != null) { + var0.closeSync(true); + } + } catch (Exception var2) { } } - @ObfuscatedName("ay") + @ObfuscatedName("iu") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-32" + garbageValue = "-73" ) - static final void method1350() { - if (!ViewportMouse.ViewportMouse_false0) { - int var0 = Scene.Scene_cameraPitchSine; - int var1 = Scene.Scene_cameraPitchCosine; - int var2 = Scene.Scene_cameraYawSine; - int var3 = Scene.Scene_cameraYawCosine; - byte var4 = 50; - short var5 = 3500; - int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.getClipMidX()) * var4 / Rasterizer3D.get3dZoom(); - int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.getClipMidY()) * var4 / Rasterizer3D.get3dZoom(); - int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.getClipMidX()) * var5 / Rasterizer3D.get3dZoom(); - int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.getClipMidY()) * var5 / Rasterizer3D.get3dZoom(); - int var10 = class10.method30(var7, var4, var1, var0); - int var13 = GrandExchangeOfferUnitPriceComparator.method1992(var7, var4, var1, var0); - var7 = var10; - var10 = class10.method30(var9, var5, var1, var0); - int var14 = GrandExchangeOfferUnitPriceComparator.method1992(var9, var5, var1, var0); - var9 = var10; - var10 = AbstractWorldMapData.method1556(var6, var13, var3, var2); - int var11 = var6 * var2 + var13 * var3 >> 16; - var6 = var10; - var10 = AbstractWorldMapData.method1556(var8, var14, var3, var2); - int var12 = var3 * var14 + var8 * var2 >> 16; - ViewportMouse.field2264 = (var6 + var10) / 2; - ViewportMouse.field2260 = (var9 + var7) / 2; - class286.field2470 = (var12 + var11) / 2; - class180.field1467 = (var10 - var6) / 2; - ViewportMouse.field2263 = (var9 - var7) / 2; - ViewportMouse.field2265 = (var12 - var11) / 2; - class190.field1495 = Math.abs(class180.field1467); - GraphicsObject.field718 = Math.abs(ViewportMouse.field2263); - HealthBar.field1073 = Math.abs(ViewportMouse.field2265); + static final void method1529() { + class314.method1649(FloorOverlayDefinition.field1772, class323.field2851, Projectile.field783); + class303.method1628(class127.field1224, CollisionMap.field1901); + if (FloorOverlayDefinition.field1772 == ViewportMouse.cameraX && SecureRandomFuture.cameraY == class323.field2851 && class36.cameraZ == Projectile.field783 && class127.field1224 == Varcs.cameraPitch && CollisionMap.field1901 == class192.cameraYaw) { + Client.field400 = false; + Client.isCameraLocked = false; + Client.field402 = false; + Client.field404 = false; + Messages.field1154 = 0; + AbstractWorldMapData.field2045 = 0; + class302.field2510 = 0; + class60.cameraLookAtSpeed = 0; + class134.cameraMoveToAcceleration = 0; + class1.cameraLookAtAcceleration = 0; + WorldMapIcon_0.cameraMoveToSpeed = 0; + ScriptFrame.cameraLookAtX = 0; + class216.cameraLookAtY = 0; + class127.cameraLookAtHeight = 0; + Client.field644 = null; + Client.field642 = null; + Client.field643 = null; } - } - @ObfuscatedName("li") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "-2147134009" - ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = class33.widgetDefinition.getWidgetChild(var1, var2); - if (var5 != null) { - if (var5.onOp != null) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var5; - var6.opIndex = var0; - var6.targetName = var4; - var6.args = var5.onOp; - Interpreter.runScriptEvent(var6); - } - - boolean var11 = true; - if (var5.contentType > 0) { - var11 = EnumComposition.method1002(var5); - } - - if (var11) { - int var8 = MouseRecorder.getWidgetFlags(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON1, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 2) { - var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON2, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 3) { - var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON3, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 4) { - var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON4, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 5) { - var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON5, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON6, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON7, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON8, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON9, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 10) { - var10 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTON10, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - } - } - } } } \ No newline at end of file diff --git a/osrs/src/main/java/Tile.java b/osrs/src/main/java/Tile.java index 99d65c471..832df429f 100644 --- a/osrs/src/main/java/Tile.java +++ b/osrs/src/main/java/Tile.java @@ -3,96 +3,96 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jh") +@ObfuscatedName("kv") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("plane") int plane; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("x") int x; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("y") int y; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("originalPlane") int originalPlane; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Lke;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Lkl;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Llv;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llj;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Lkm;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lkj;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "[Lkl;" + descriptor = "[Lle;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("minPlane") int minPlane; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("ae") - int field2024; + @ObfuscatedName("ai") + int field2196; @ObfuscatedName("aw") - int field2031; - @ObfuscatedName("aq") - int field2029; - @ObfuscatedName("az") + int field2203; + @ObfuscatedName("ae") + int field2194; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Lkv;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -106,572 +106,15 @@ public final class Tile extends Node { this.y = var3; } - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)Ltr;", - garbageValue = "1668422636" - ) - public static class517 method1230(int var0) { - int var1 = class515.field4128[var0]; - if (var1 == 1) { - return class517.field4129; - } else if (var1 == 2) { - return class517.field4130; - } else { - return var1 == 3 ? class517.field4131 : null; - } - } - - @ObfuscatedName("ar") + @ObfuscatedName("jh") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1270571298" - ) - static void method1231() { - ItemContainer.itemContainers = new NodeHashTable(32); - } - - @ObfuscatedName("lb") - @ObfuscatedSignature( - descriptor = "([Lnm;IIIIIIIII)V", - garbageValue = "-1800705740" + garbageValue = "1636778707" ) - @Export("drawInterface") - static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.method1248(); - - for (int var9 = 0; var9 < var0.length; ++var9) { - Widget var10 = var0[var9]; - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { - int var11; - if (var8 == -1) { - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; - var11 = ++Client.rootWidgetCount - 1; - } else { - var11 = var8; - } - - var10.rootIndex = var11; - var10.cycle = Client.cycle; - if (!var10.isIf3 || !CollisionMap.isComponentHidden(var10)) { - if (var10.contentType > 0) { - class6.method16(var10); - } - - int var12 = var10.x + var6; - int var13 = var7 + var10.y; - int var14 = var10.transparencyTop; - int var15; - int var16; - if (var10 == Client.clickedWidget) { - if (var1 != -1412584499 && !var10.isScrollBar) { - class9.field16 = var0; - GrandExchangeEvent.field3617 = var6; - class10.field24 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field396) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field516) { - var15 = Client.field516; - } - - if (var15 + var10.width > Client.field516 + Client.clickedWidgetParent.width) { - var15 = Client.field516 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field514) { - var16 = Client.field514; - } - - if (var16 + var10.height > Client.field514 + Client.clickedWidgetParent.height) { - var16 = Client.field514 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 9) { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if (var21 < var12) { - var19 = var21; - var21 = var12; - } - - if (var22 < var13) { - var20 = var22; - var22 = var13; - } - - ++var21; - ++var22; - var15 = var19 > var2 ? var19 : var2; - var16 = var20 > var3 ? var20 : var3; - var17 = var21 < var4 ? var21 : var4; - var18 = var22 < var5 ? var22 : var5; - } else { - var19 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var19 < var4 ? var19 : var4; - var18 = var20 < var5 ? var20 : var5; - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { - if (var10.contentType != 0) { - if (var10.contentType == 1336) { - if (class91.clientPreferences.method546()) { - var13 += 15; - UserComparator6.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); - var13 += 15; - Runtime var41 = Runtime.getRuntime(); - var20 = (int)((var41.totalMemory() - var41.freeMemory()) / 1024L); - var21 = 16776960; - if (var20 > 327680 && !Client.isLowDetail) { - var21 = 16711680; - } - - UserComparator6.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - class432.drawEntities(var12, var13, var10.width, var10.height); - Client.field408[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - class436.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - class127.method692(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - class434.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - class434.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - class544.field4278.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && CollisionMap.isComponentHidden(var10) && var10 != class64.mousedOverWidgetIf1) { - continue; - } - - if (!var10.isIf3) { - if (var10.scrollY > var10.scrollHeight - var10.height) { - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); - if (var28 != null) { - class410.drawWidgets(var28.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.method1248(); - } else if (var10.type == 11) { - if (CollisionMap.isComponentHidden(var10) && var10 != class64.mousedOverWidgetIf1) { - continue; - } - - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.method1248(); - } - - if (Client.isResizable || Client.field406[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - class223.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { - if (var10.type == 3) { - if (UserComparator9.runCs1(var10)) { - var19 = var10.color2; - if (var10 == class64.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; - if (var10 == class64.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.field4260) { - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); - break; - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); - break; - default: - if (var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } - } else if (var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } else if (var10.type == 4) { - Font var40 = var10.getFont(class33.widgetDefinition); - if (var40 == null) { - if (Widget.field2978) { - ClanChannelMember.invalidateWidget(var10); - } - } else { - String var42 = var10.text; - if (UserComparator9.runCs1(var10)) { - var20 = var10.color2; - if (var10 == class64.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var42 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == class64.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemComposition var43 = class214.ItemDefinition_get(var10.itemId); - var42 = var43.name; - if (var42 == null) { - var42 = "null"; - } - - if ((var43.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var42 = Client.colorStartTag(16748608) + var42 + "" + " " + 'x' + class174.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var42 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var42 = class463.method2329(var42, var10); - } - - var40.method2125(var42, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, class481.method2387(var10.transparencyTop), var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); - } - } else { - int var23; - int var24; - int var25; - if (var10.type == 5) { - SpritePixels var38; - if (!var10.isIf3) { - var38 = var10.getSprite(class33.widgetDefinition, UserComparator9.runCs1(var10), AbstractWorldMapIcon.urlRequester); - if (var38 != null) { - var38.drawTransBgAt(var12, var13); - } else if (Widget.field2978) { - ClanChannelMember.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var38 = class158.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var38 = var10.getSprite(class33.widgetDefinition, false, AbstractWorldMapIcon.urlRequester); - } - - if (var38 == null) { - if (Widget.field2978) { - ClanChannelMember.invalidateWidget(var10); - } - } else { - var20 = var38.width; - var21 = var38.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var38.method2726(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { - var38.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { - var38.drawTransBgAt(var12, var13); - } else { - var38.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); - var22 = (var20 - 1 + var10.width) / var20; - var23 = (var21 - 1 + var10.height) / var21; - - for (var24 = 0; var24 < var22; ++var24) { - for (var25 = 0; var25 < var23; ++var25) { - if (var10.spriteAngle != 0) { - var38.method2726(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var38.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); - } else { - var38.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - int var34; - if (var10.type == 6) { - boolean var36 = UserComparator9.runCs1(var10); - if (var36) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var39 = null; - var22 = 0; - if (var10.itemId != -1) { - ItemComposition var44 = class214.ItemDefinition_get(var10.itemId); - if (var44 != null) { - var44 = var44.getCountObj(var10.itemQuantity); - var39 = var44.getModel(1); - if (var39 != null) { - var39.calculateBoundsCylinder(); - var22 = var39.height / 2; - } else { - ClanChannelMember.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var39 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var39 = TextureProvider.localPlayer.getModel(); - } - } else if (var10.modelType == 7) { - var39 = var10.field3127.getModel((SequenceDefinition)null, -1, class36.SequenceDefinition_get(TextureProvider.localPlayer.idleSequence), TextureProvider.localPlayer.movementFrame); - } else { - NPCComposition var45 = null; - NewShit var32 = null; - if (var10.modelType == 6) { - var25 = var10.modelId; - if (var25 >= 0 && var25 < Client.npcs.length) { - NPC var26 = Client.npcs[var25]; - if (var26 != null) { - var45 = var26.definition; - var32 = var26.method593(); - } - } - } - - SequenceDefinition var33 = null; - var34 = -1; - if (var20 != -1) { - var33 = class36.SequenceDefinition_get(var20); - var34 = var10.modelFrame; - } - - var39 = var10.getModel(class33.widgetDefinition, var33, var34, var36, TextureProvider.localPlayer.appearance, var45, var32); - if (var39 == null && Widget.field2978) { - ClanChannelMember.invalidateWidget(var10); - } - } - - Rasterizer3D.method1251(var10.width / 2 + var12, var10.height / 2 + var13); - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; - if (var39 != null) { - if (!var10.isIf3) { - var39.method1379(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var39.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var39.method1380(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var39.method1379(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } - } - - Rasterizer3D.method1250(); - } else { - Font var29; - if (var10.type == 8 && var10 == GrandExchangeOfferNameComparator.field3615 && Client.field499 == Client.field498) { - var19 = 0; - var20 = 0; - var29 = UserComparator6.fontPlain12; - String var30 = var10.text; - - String var31; - for (var30 = class463.method2329(var30, var10); var30.length() > 0; var20 = var20 + var29.ascent + 1) { - var24 = var30.indexOf("
"); - if (var24 != -1) { - var31 = var30.substring(0, var24); - var30 = var30.substring(var24 + 4); - } else { - var31 = var30; - var30 = ""; - } - - var25 = var29.stringWidth(var31); - if (var25 > var19) { - var19 = var25; - } - } - - var19 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var19; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; - } - - if (var24 + var19 > var4) { - var24 = var4 - var19; - } - - if (var25 + var20 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); - var30 = var10.text; - var34 = var25 + var29.ascent + 2; - - for (var30 = class463.method2329(var30, var10); var30.length() > 0; var34 = var34 + var29.ascent + 1) { - int var27 = var30.indexOf("
"); - if (var27 != -1) { - var31 = var30.substring(0, var27); - var30 = var30.substring(var27 + 4); - } else { - var31 = var30; - var30 = ""; - } - - var29.draw(var31, var24 + 3, var34, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field2989) { - var19 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; - } else { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - } - - if (var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); - } else { - JagexCache.method919(var19, var20, var21, var22, var10.color, var10.lineWid); - } - } else if (var10.type == 12) { - class344 var37 = var10.method1877(); - class339 var35 = var10.method1878(); - if (var37 != null && var35 != null && var37.method1819()) { - var29 = var10.getFont(class33.widgetDefinition); - if (var29 != null) { - Client.field649.method2734(var12, var13, var10.width, var10.height, var37.method1820(), var37.method1821(), var37.method1817(), var37.method1818(), var37.method1816()); - var22 = var10.textShadowed ? var10.spriteShadow * -2035927347 * 1142466053 : -1; - if (!var37.method1814() && var37.method1811().method2067()) { - Client.field649.method2735(var35.field2924, var22, var35.field2923, var35.field2925); - Client.field649.method2736(var37.method1812(), var29); - } else { - Client.field649.method2735(var10.color, var22, var35.field2923, var35.field2925); - Client.field649.method2736(var37.method1811(), var29); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } - } - } - } - } - } - } - } + static void method1412() { + for (class222 var0 = (class222)Client.field625.last(); var0 != null; var0 = (class222)Client.field625.previous()) { + var0.remove(); } } - - @ObfuscatedName("op") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1817325777" - ) - static void method1233() { - class91.clientPreferences.method559(Client.param21); - } } \ No newline at end of file diff --git a/osrs/src/main/java/TileItem.java b/osrs/src/main/java/TileItem.java index cabd85889..15cceade4 100644 --- a/osrs/src/main/java/TileItem.java +++ b/osrs/src/main/java/TileItem.java @@ -3,182 +3,172 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; - -@ObfuscatedName("el") +@ObfuscatedName("ec") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("id") int id; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("quantity") int quantity; - @ObfuscatedName("ax") - int field1107; + @ObfuscatedName("ao") + int field1110; TileItem() { - this.field1107 = 31; + this.field1110 = 31; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "-2048402866" ) - void method611(int var1) { - this.field1107 = var1; + void method609(int var1) { + this.field1110 = var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Ljn;", - garbageValue = "0" + descriptor = "(B)Lka;", + garbageValue = "1" ) @Export("getModel") protected final Model getModel() { return class214.ItemDefinition_get(this.id).getModel(this.quantity); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "60" + descriptor = "(II)Z", + garbageValue = "117367628" ) - boolean method612(int var1) { + boolean method610(int var1) { if (var1 >= 0 && var1 <= 4) { - return (this.field1107 & 1 << var1) != 0; + return (this.field1110 & 1 << var1) != 0; } else { return true; } } - @ObfuscatedName("ax") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lfz;FFFFFFFFI)V", - garbageValue = "262393745" + descriptor = "(CLof;I)C", + garbageValue = "938832228" ) - static void method614(class132 var0, float var1, float var2, float var3, float var4, float var5, float var6, float var7, float var8) { - if (var0 != null) { - var0.field1247 = var1; - float var9 = var4 - var1; - float var10 = var8 - var5; - float var11 = var2 - var1; - float var12 = 0.0F; - float var13 = 0.0F; - if ((double)var11 != 0.0D) { - var12 = (var6 - var5) / var11; - } - - var11 = var4 - var3; - if (0.0D != (double)var11) { - var13 = (var8 - var7) / var11; - } - - float var14 = 1.0F / (var9 * var9); - float var15 = var12 * var9; - float var16 = var9 * var13; - var0.field1244 = var14 * (var15 + var16 - var10 - var10) / var9; - var0.field1249 = (var10 + var10 + var10 - var15 - var15 - var16) * var14; - var0.field1242 = var12; - var0.field1240 = var5; - } - } + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { + if (var0 >= 192 && var0 <= 198) { + return 'A'; + } - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(Liz;I)Z", - garbageValue = "-966132551" - ) - static boolean method615(ObjectComposition var0) { - if (var0.transforms != null) { - int[] var1 = var0.transforms; - - for (int var2 = 0; var2 < var1.length; ++var2) { - int var3 = var1[var2]; - ObjectComposition var4 = class91.getObjectDefinition(var3); - if (var4.mapIconId != -1) { - return true; - } - } - } else if (var0.mapIconId != -1) { - return true; - } + if (var0 == 199) { + return 'C'; + } - return false; - } + if (var0 >= 200 && var0 <= 203) { + return 'E'; + } - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "667275397" - ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (GrandExchangeOfferTotalQuantityComparator.garbageCollector == null || !GrandExchangeOfferTotalQuantityComparator.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - GrandExchangeOfferTotalQuantityComparator.garbageCollector = var2; - GameEngine.garbageCollectorLastCheckTimeMs = -1L; - GameEngine.garbageCollectorLastCollectionTime = -1L; - } - } - } catch (Throwable var11) { + if (var0 >= 204 && var0 <= 207) { + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { + return 'N'; } - } - if (GrandExchangeOfferTotalQuantityComparator.garbageCollector != null) { - long var9 = GrandExchangeOfferTotalQuantityComparator.method1971(); - long var3 = GrandExchangeOfferTotalQuantityComparator.garbageCollector.getCollectionTime(); - if (GameEngine.garbageCollectorLastCollectionTime != -1L) { - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; - if (0L != var7) { - var0 = (int)(var5 * 100L / var7); - } + if (var0 >= 210 && var0 <= 214) { + return 'O'; } - GameEngine.garbageCollectorLastCollectionTime = var3; - GameEngine.garbageCollectorLastCheckTimeMs = var9; + if (var0 >= 217 && var0 <= 220) { + return 'U'; + } + + if (var0 == 221) { + return 'Y'; + } + + if (var0 == 223) { + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { + return 'a'; + } + + if (var0 == 231) { + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { + return 'u'; + } + + if (var0 == 253 || var0 == 255) { + return 'y'; + } } - return var0; + if (var0 == 338) { + return 'O'; + } else if (var0 == 339) { + return 'o'; + } else { + return var0 == 376 ? 'Y' : var0; + } } - @ObfuscatedName("jh") + @ObfuscatedName("kq") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "901755520" + descriptor = "(IIIIIIIIIII)V", + garbageValue = "2136163663" ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { - NPC var2 = Client.npcs[Client.npcIndices[var1]]; - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { - int var3 = var2.x >> 7; - int var4 = var2.y >> 7; - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { - if (var2.field971 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; - } - - long var5 = GrandExchangeOfferAgeComparator.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - class10.scene.drawEntity(class87.Client_plane, var2.x, var2.y, class115.getTileHeight(var2.field971 * 64 - 64 + var2.x, var2.field971 * 64 - 64 + var2.y, class87.Client_plane), var2.field971 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); - } + @Export("updatePendingSpawn") + static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { + PendingSpawn var10 = null; + + for (PendingSpawn var11 = (PendingSpawn)Client.pendingSpawns.last(); var11 != null; var11 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var11.plane && var11.x == var1 && var2 == var11.y && var3 == var11.type) { + var10 = var11; + break; } } + if (var10 == null) { + var10 = new PendingSpawn(); + var10.plane = var0; + var10.type = var3; + var10.x = var1; + var10.y = var2; + var10.field957 = -1; + ScriptFrame.method344(var10); + Client.pendingSpawns.addFirst(var10); + } + + var10.id = var4; + var10.objectType = var5; + var10.rotation = var6; + var10.startCycle = var8; + var10.endCycle = var9; + var10.method503(var7); } } \ No newline at end of file diff --git a/osrs/src/main/java/Tiles.java b/osrs/src/main/java/Tiles.java index 9a9e2ac4c..379acd2a1 100644 --- a/osrs/src/main/java/Tiles.java +++ b/osrs/src/main/java/Tiles.java @@ -3,54 +3,49 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.awt.*; - -@ObfuscatedName("dq") +@ObfuscatedName("dd") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("ab") - static byte[][][] field835; - @ObfuscatedName("aa") - @Export("Tiles_lightness") - static int[] Tiles_lightness; + @ObfuscatedName("al") + static int[][] field843; + @ObfuscatedName("ap") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("aq") + static final int[] field849; @ObfuscatedName("ai") - static final int[] field844; - @ObfuscatedName("ae") - static final int[] field843; - @ObfuscatedName("aw") static final int[] field847; - @ObfuscatedName("aq") + @ObfuscatedName("aw") + static final int[] field850; + @ObfuscatedName("ae") static final int[] field845; - @ObfuscatedName("az") + @ObfuscatedName("an") static final int[] field848; - @ObfuscatedName("at") + @ObfuscatedName("ag") static final int[] field846; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("rndHue") static int rndHue; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("rndLightness") static int rndLightness; - @ObfuscatedName("gs") - @Export("playerUUIDLength") - static int playerUUIDLength; static { Tiles_heights = new int[4][105][105]; Tiles_renderFlags = new byte[4][104][104]; Tiles_minPlane = 99; - field844 = new int[]{1, 2, 4, 8}; - field843 = new int[]{16, 32, 64, 128}; - field847 = new int[]{1, 0, -1, 0}; + field849 = new int[]{1, 2, 4, 8}; + field847 = new int[]{16, 32, 64, 128}; + field850 = new int[]{1, 0, -1, 0}; field845 = new int[]{0, -1, 0, 1}; field848 = new int[]{1, -1, -1, 1}; field846 = new int[]{-1, -1, 1, 1}; @@ -58,347 +53,11 @@ public final class Tiles { rndLightness = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1109073895" - ) - static void method455(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Luy;II)V", - garbageValue = "90907201" - ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - GrandExchangeOfferTotalQuantityComparator.method1975(var0); - - for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { - int var4 = Players.Players_pendingUpdateIndices[var3]; - Player var5 = Client.players[var4]; - int var6 = var0.readUnsignedByte(); - if ((var6 & 1) != 0) { - var6 += var0.readUnsignedByte() << 8; - } - - if ((var6 & 4096) != 0) { - var6 += var0.readUnsignedByte() << 16; - } - - byte var7 = MoveSpeed.STATIONARY.speed; - int var8; - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - if ((var6 & 128) != 0) { - var8 = var0.readUnsignedByteAdd(); - if (var8 > 0) { - for (var9 = 0; var9 < var8; ++var9) { - var11 = -1; - var12 = -1; - var13 = -1; - var10 = var0.readUShortSmart(); - if (var10 == 32767) { - var10 = var0.readUShortSmart(); - var12 = var0.readUShortSmart(); - var11 = var0.readUShortSmart(); - var13 = var0.readUShortSmart(); - } else if (var10 != 32766) { - var12 = var0.readUShortSmart(); - } else { - var10 = -1; - } - - var14 = var0.readUShortSmart(); - var5.addHitSplat(var10, var12, var11, var13, Client.cycle, var14); - } - } - - var9 = var0.readUnsignedByte(); - if (var9 > 0) { - for (var10 = 0; var10 < var9; ++var10) { - var11 = var0.readUShortSmart(); - var12 = var0.readUShortSmart(); - if (var12 != 32767) { - var13 = var0.readUShortSmart(); - var14 = var0.readUnsignedByte(); - var15 = var12 > 0 ? var0.readUnsignedByteNeg() : var14; - var5.addHealthBar(var11, Client.cycle, var12, var13, var14, var15); - } else { - var5.removeHealthBar(var11); - } - } - } - } - - if ((var6 & 65536) != 0) { - var8 = var0.readUnsignedByteAdd(); - - for (var9 = 0; var9 < var8; ++var9) { - var10 = var0.readUnsignedByte(); - var11 = var0.readIntME(); - var12 = var0.readUnsignedIntLE(); - var5.updateSpotAnimation(var10, var11, var12 >> 16, var12 & 65535); - } - } - - if ((var6 & 16) != 0) { - var5.targetIndex = var0.readUnsignedShortAdd(); - var5.targetIndex += var0.readUnsignedByteNeg() << 16; - var8 = 16777215; - if (var8 == var5.targetIndex) { - var5.targetIndex = -1; - } - } - - if ((var6 & 1024) != 0) { - MoveSpeed[] var23 = Players.playerMovementSpeeds; - MoveSpeed[] var24 = new MoveSpeed[]{MoveSpeed.CRAWL, MoveSpeed.STATIONARY, MoveSpeed.WALK, MoveSpeed.RUN}; - var23[var4] = (MoveSpeed)SequenceDefinition.findEnumerated(var24, var0.readByte()); - } - - if ((var6 & 256) != 0) { - var5.recolourStartCycle = Client.cycle + var0.readIntME(); - var5.recolourEndCycle = Client.cycle + var0.readUnsignedShortAdd(); - var5.recolourHue = var0.readByteNeg(); - var5.recolourSaturation = var0.readByteAdd(); - var5.recolourLuminance = var0.readByteSub(); - var5.recolourAmount = (byte)var0.readUnsignedByteNeg(); - } - - if ((var6 & 2) != 0) { - var5.overheadText = var0.readStringCp1252NullTerminated(); - if (var5.overheadText.charAt(0) == '~') { - var5.overheadText = var5.overheadText.substring(1); - class411.addGameMessage(2, var5.username.getName(), var5.overheadText); - } else if (var5 == TextureProvider.localPlayer) { - class411.addGameMessage(2, var5.username.getName(), var5.overheadText); - } - - var5.isAutoChatting = false; - var5.field998 = 0; - var5.field991 = 0; - var5.overheadTextCyclesRemaining = 150; - } - - if ((var6 & 16384) != 0) { - var5.field1016 = var0.readByteAdd(); - var5.field1013 = var0.readByteSub(); - var5.field1021 = var0.readByte(); - var5.field1010 = var0.readByteAdd(); - var5.spotAnimation = var0.readIntME() + Client.cycle; - var5.exactMoveArrive1Cycle = var0.readUnsignedShort() + Client.cycle; - var5.exactMoveDirection = var0.readUnsignedShortAdd(); - if (var5.hasMovementPending) { - var5.field1016 += var5.tileX; - var5.field1013 += var5.tileY; - var5.field1021 += var5.tileX; - var5.field1010 += var5.tileY; - var5.pathLength = 0; - } else { - var5.field1016 += var5.pathX[0]; - var5.field1013 += var5.pathY[0]; - var5.field1021 += var5.pathX[0]; - var5.field1010 += var5.pathY[0]; - var5.pathLength = 1; - } - - var5.field1023 = 0; - } - - if ((var6 & 4) != 0) { - var8 = var0.readUnsignedShortAdd(); - if (var8 == 65535) { - var8 = -1; - } - - var9 = var0.readUnsignedByteAdd(); - WorldMapEvent.performPlayerAnimation(var5, var8, var9); - } - - if ((var6 & 2048) != 0) { - for (var8 = 0; var8 < 3; ++var8) { - var5.actions[var8] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var6 & 32) != 0) { - var5.movingOrientation = var0.readUnsignedShortAddLE(); - if (var5.pathLength == 0) { - var5.orientation = var5.movingOrientation; - var5.method521(); - } - } - - if ((var6 & 8) != 0) { - var8 = var0.readUnsignedShortAddLE(); - PlayerType var25 = (PlayerType)SequenceDefinition.findEnumerated(class183.PlayerType_values(), var0.readUnsignedByte()); - boolean var30 = var0.readUnsignedByteSub() == 1; - var11 = var0.readUnsignedByteNeg(); - var12 = var0.offset; - if (var5.username != null && var5.appearance != null) { - boolean var31 = false; - if (var25.isUser && InvDefinition.friendSystem.isIgnored(var5.username)) { - var31 = true; - } - - if (!var31 && Client.field481 == 0 && !var5.isHidden) { - Players.field1119.offset = 0; - var0.method2638(Players.field1119.array, 0, var11); - Players.field1119.offset = 0; - String var26 = AbstractFont.escapeBrackets(HealthBarUpdate.method523(class172.readString(Players.field1119))); - var5.overheadText = var26.trim(); - var5.field998 = var8 >> 8; - var5.field991 = var8 & 255; - var5.overheadTextCyclesRemaining = 150; - var5.field1026 = null; - var5.isAutoChatting = var30; - var5.showPublicPlayerChat = var5 != TextureProvider.localPlayer && var25.isUser && !Client.field601.isEmpty() && var26.toLowerCase().indexOf(Client.field601) == -1; - if (var25.isPrivileged) { - var15 = var30 ? 91 : 1; - } else { - var15 = var30 ? 90 : 2; - } - - if (var25.modIcon != -1) { - class411.addGameMessage(var15, class436.addImageTag(var25.modIcon) + var5.username.getName(), var26); - } else { - class411.addGameMessage(var15, var5.username.getName(), var26); - } - } - } - - var0.offset = var11 + var12; - } - - if ((var6 & 512) != 0) { - var8 = var0.readUnsignedShortAdd(); - var9 = var8 >> 8; - var10 = var9 >= 13 && var9 <= 20 ? var9 - 12 : 0; - PlayerType var27 = (PlayerType)SequenceDefinition.findEnumerated(class183.PlayerType_values(), var0.readUnsignedByte()); - boolean var32 = var0.readUnsignedByteSub() == 1; - var13 = var0.readUnsignedByte(); - var14 = var0.offset; - if (var5.username != null && var5.appearance != null) { - boolean var33 = false; - if (var27.isUser && InvDefinition.friendSystem.isIgnored(var5.username)) { - var33 = true; - } - - if (!var33 && Client.field481 == 0 && !var5.isHidden) { - Players.field1119.offset = 0; - var0.readBytes(Players.field1119.array, 0, var13); - Players.field1119.offset = 0; - String var16 = AbstractFont.escapeBrackets(HealthBarUpdate.method523(class172.readString(Players.field1119))); - var5.overheadText = var16.trim(); - var5.field998 = var8 >> 8; - var5.field991 = var8 & 255; - var5.overheadTextCyclesRemaining = 150; - byte[] var17 = null; - if (var10 > 0 && var10 <= 8) { - var17 = new byte[var10]; - - for (int var18 = 0; var18 < var10; ++var18) { - var17[var18] = var0.readByteAdd(); - } - } - - byte[] var20 = var17; - int[] var19; - if (var17 != null && var17.length != 0 && var17.length <= 8) { - int[] var21 = new int[var17.length]; - int var22 = 0; - - while (true) { - if (var22 >= var20.length) { - var19 = var21; - break; - } - - if (var20[var22] < 0 || var20[var22] > class553.field4311.length) { - var19 = null; - break; - } - - var21[var22] = class553.field4311[var20[var22]]; - ++var22; - } - } else { - var19 = null; - } - - var5.field1026 = var19; - var5.isAutoChatting = var32; - var5.showPublicPlayerChat = var5 != TextureProvider.localPlayer && var27.isUser && !Client.field601.isEmpty() && var16.toLowerCase().indexOf(Client.field601) == -1; - int var29; - if (var27.isPrivileged) { - var29 = var32 ? 91 : 1; - } else { - var29 = var32 ? 90 : 2; - } - - if (var27.modIcon != -1) { - class411.addGameMessage(var29, class436.addImageTag(var27.modIcon) + var5.username.getName(), var16); - } else { - class411.addGameMessage(var29, var5.username.getName(), var16); - } - } - } - - var0.offset = var13 + var14 + var10; - } - - if ((var6 & 64) != 0) { - var8 = var0.readUnsignedByteNeg(); - byte[] var36 = new byte[var8]; - Buffer var35 = new Buffer(var36); - var0.method2637(var36, 0, var8); - Players.cachedAppearanceBuffer[var4] = var35; - var5.read(var35); - } - - if ((var6 & 8192) != 0) { - var7 = var0.readByte(); - } - - if (var5.hasMovementPending) { - if (var7 == 127) { - var5.resetPath(var5.tileX, var5.tileY); - } else { - MoveSpeed var34; - if (var7 != MoveSpeed.STATIONARY.speed) { - MoveSpeed[] var37 = new MoveSpeed[]{MoveSpeed.CRAWL, MoveSpeed.STATIONARY, MoveSpeed.WALK, MoveSpeed.RUN}; - var34 = (MoveSpeed)SequenceDefinition.findEnumerated(var37, var7); - } else { - var34 = Players.playerMovementSpeeds[var4]; - } - - var5.move(var5.tileX, var5.tileY, var34); - } - } - } - - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); - } - } - - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "([BIIIIIIILjt;[Lih;)V" + descriptor = "([BIIIIIIILkf;[Liw;)V" ) - static final void method457(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { + static final void method455(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { Buffer var10 = new Buffer(var0); int var11 = -1; @@ -425,44 +84,67 @@ static final void method457(byte[] var0, int var1, int var2, int var3, int var4, int var19 = var18 >> 2; int var20 = var18 & 3; if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { - ObjectComposition var21 = class91.getObjectDefinition(var11); - int var22 = var2 + class153.method796(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); - int var25 = var16 & 7; - int var26 = var15 & 7; - int var28 = var21.sizeX; - int var29 = var21.sizeY; - int var30; + ObjectComposition var21 = WorldMapSection2.getObjectDefinition(var11); + int var24 = var16 & 7; + int var25 = var15 & 7; + int var27 = var21.sizeX; + int var28 = var21.sizeY; + int var29; if ((var20 & 1) == 1) { - var30 = var28; + var29 = var27; + var27 = var28; var28 = var29; - var29 = var30; } - int var27 = var7 & 3; - int var24; - if (var27 == 0) { - var24 = var26; - } else if (var27 == 1) { - var24 = 7 - var25 - (var28 - 1); - } else if (var27 == 2) { - var24 = 7 - var26 - (var29 - 1); + int var26 = var7 & 3; + int var23; + if (var26 == 0) { + var23 = var24; + } else if (var26 == 1) { + var23 = var25; + } else if (var26 == 2) { + var23 = 7 - var24 - (var27 - 1); + } else { + var23 = 7 - var25 - (var28 - 1); + } + + var29 = var23 + var2; + int var32 = var16 & 7; + int var33 = var15 & 7; + int var35 = var21.sizeX; + int var36 = var21.sizeY; + int var37; + if ((var20 & 1) == 1) { + var37 = var35; + var35 = var36; + var36 = var37; + } + + int var34 = var7 & 3; + int var31; + if (var34 == 0) { + var31 = var33; + } else if (var34 == 1) { + var31 = 7 - var32 - (var35 - 1); + } else if (var34 == 2) { + var31 = 7 - var33 - (var36 - 1); } else { - var24 = var25; + var31 = var32; } - var30 = var24 + var3; - if (var22 > 0 && var30 > 0 && var22 < 103 && var30 < 103) { - int var31 = var1; - if ((Tiles_renderFlags[1][var22][var30] & 2) == 2) { - var31 = var1 - 1; + var37 = var31 + var3; + if (var29 > 0 && var37 > 0 && var29 < 103 && var37 < 103) { + int var38 = var1; + if ((Tiles_renderFlags[1][var29][var37] & 2) == 2) { + var38 = var1 - 1; } - CollisionMap var32 = null; - if (var31 >= 0) { - var32 = var9[var31]; + CollisionMap var39 = null; + if (var38 >= 0) { + var39 = var9[var38]; } - class314.addObjects(var1, var22, var30, var11, var20 + var7 & 3, var19, var8, var32); + Interpreter.addObjects(var1, var29, var37, var11, var20 + var7 & 3, var19, var8, var39); } } } diff --git a/osrs/src/main/java/Timer.java b/osrs/src/main/java/Timer.java index 4af350270..a2a58d69d 100644 --- a/osrs/src/main/java/Timer.java +++ b/osrs/src/main/java/Timer.java @@ -3,117 +3,122 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qq") +@ObfuscatedName("qn") @Implements("Timer") public class Timer { - @ObfuscatedName("ac") - long field3783; - @ObfuscatedName("al") - long field3785; @ObfuscatedName("ak") - public boolean field3788; - @ObfuscatedName("ax") - long field3787; - @ObfuscatedName("ao") - long field3786; + @ObfuscatedSignature( + descriptor = "Lfc;" + ) + static ClanSettings field3782; + @ObfuscatedName("at") + long field3790; @ObfuscatedName("ah") - long field3784; + long field3788; @ObfuscatedName("ar") - int field3781; + public boolean field3792; + @ObfuscatedName("ao") + long field3789; @ObfuscatedName("ab") - int field3779; - @ObfuscatedName("am") - int field3780; - @ObfuscatedName("av") - int field3782; + long field3787; + @ObfuscatedName("au") + long field3791; + @ObfuscatedName("aa") + int field3783; + @ObfuscatedName("ac") + int field3784; + @ObfuscatedName("al") + int field3785; + @ObfuscatedName("az") + int field3786; public Timer() { - this.field3783 = -1L; - this.field3785 = -1L; - this.field3788 = false; + this.field3790 = -1L; + this.field3788 = -1L; + this.field3792 = false; + this.field3789 = 0L; this.field3787 = 0L; - this.field3786 = 0L; - this.field3784 = 0L; - this.field3781 = 0; - this.field3779 = 0; - this.field3780 = 0; - this.field3782 = 0; + this.field3791 = 0L; + this.field3783 = 0; + this.field3784 = 0; + this.field3785 = 0; + this.field3786 = 0; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "281982191" + garbageValue = "919653710" ) - public void method2182() { - this.field3783 = GrandExchangeOfferTotalQuantityComparator.method1971(); + public void method2170() { + this.field3790 = SpotAnimationDefinition.method962(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "8" + descriptor = "(I)V", + garbageValue = "587956368" ) - public void method2183() { - if (-1L != this.field3783) { - this.field3786 = GrandExchangeOfferTotalQuantityComparator.method1971() - this.field3783; - this.field3783 = -1L; + public void method2171() { + if (this.field3790 != -1L) { + this.field3787 = SpotAnimationDefinition.method962() - this.field3790; + this.field3790 = -1L; } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "49" + descriptor = "(II)V", + garbageValue = "1512116667" ) - public void method2184(int var1) { - this.field3785 = GrandExchangeOfferTotalQuantityComparator.method1971(); - this.field3781 = var1; + public void method2172(int var1) { + this.field3788 = SpotAnimationDefinition.method962(); + this.field3783 = var1; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1876587712" + descriptor = "(B)V", + garbageValue = "-7" ) - public void method2185() { - if (-1L != this.field3785) { - this.field3787 = GrandExchangeOfferTotalQuantityComparator.method1971() - this.field3785; - this.field3785 = -1L; + public void method2173() { + if (-1L != this.field3788) { + this.field3789 = SpotAnimationDefinition.method962() - this.field3788; + this.field3788 = -1L; } - ++this.field3780; - this.field3788 = true; + ++this.field3785; + this.field3792 = true; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-699557437" + garbageValue = "2032251318" ) - public void method2186() { - this.field3788 = false; - this.field3779 = 0; + public void method2174() { + this.field3792 = false; + this.field3784 = 0; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1309820962" + descriptor = "(B)V", + garbageValue = "36" ) - public void method2187() { - this.method2185(); + public void method2175() { + this.method2173(); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "1951350671" + descriptor = "(Luj;I)V", + garbageValue = "221618490" ) @Export("write") public void write(Buffer var1) { - long var2 = this.field3786; + long var2 = this.field3787; var2 /= 10L; if (var2 < 0L) { var2 = 0L; @@ -122,7 +127,7 @@ public void write(Buffer var1) { } var1.writeShort((int)var2); - long var4 = this.field3787; + long var4 = this.field3789; var4 /= 10L; if (var4 < 0L) { var4 = 0L; @@ -131,7 +136,7 @@ public void write(Buffer var1) { } var1.writeShort((int)var4); - long var6 = this.field3784; + long var6 = this.field3791; var6 /= 10L; if (var6 < 0L) { var6 = 0L; @@ -140,48 +145,9 @@ public void write(Buffer var1) { } var1.writeShort((int)var6); - var1.writeShort(this.field3781); - var1.writeShort(this.field3779); - var1.writeShort(this.field3780); - var1.writeShort(this.field3782); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "-2042986049" - ) - public static String method2181(CharSequence var0) { - int var1 = var0.length(); - StringBuilder var2 = new StringBuilder(var1); - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { - if (var4 == ' ') { - var2.append('+'); - } else { - byte var5 = Actor.charToByteCp1252(var4); - var2.append('%'); - int var6 = var5 >> 4 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - - var6 = var5 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); - } - } - - return var2.toString(); + var1.writeShort(this.field3783); + var1.writeShort(this.field3784); + var1.writeShort(this.field3785); + var1.writeShort(this.field3786); } } \ No newline at end of file diff --git a/osrs/src/main/java/TriBool.java b/osrs/src/main/java/TriBool.java index 9bf51f824..e9bdb20d6 100644 --- a/osrs/src/main/java/TriBool.java +++ b/osrs/src/main/java/TriBool.java @@ -3,29 +3,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ra") +@ObfuscatedName("rw") @Implements("TriBool") public class TriBool { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lra;" + descriptor = "Lrw;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lra;" + descriptor = "Lrw;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lra;" + descriptor = "Lrw;" ) @Export("TriBool_false") public static final TriBool TriBool_false; - @ObfuscatedName("vd") - static int field3849; static { TriBool_unknown = new TriBool(); @@ -35,4 +33,74 @@ public class TriBool { TriBool() { } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-999239127" + ) + static int method2273(int var0, int var1) { + FloorOverlayDefinition var2 = Canvas.method85(var0); + if (var2 == null) { + return var1; + } else { + int var4; + int var5; + int var6; + int var7; + int var8; + if (var2.secondaryRgb >= 0) { + var4 = var2.secondaryHue; + var5 = var2.secondarySaturation; + var6 = var2.secondaryLightness; + if (var6 > 179) { + var5 /= 2; + } + + if (var6 > 192) { + var5 /= 2; + } + + if (var6 > 217) { + var5 /= 2; + } + + if (var6 > 243) { + var5 /= 2; + } + + var7 = (var5 / 32 << 7) + var6 / 2 + (var4 / 4 << 10); + var8 = UserComparator3.method680(var7, 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216; + } else if (var2.texture >= 0) { + int var3 = UserComparator3.method680(Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; + } else if (var2.primaryRgb == 16711935) { + return var1; + } else { + var4 = var2.hue; + var5 = var2.saturation; + var6 = var2.lightness; + if (var6 > 179) { + var5 /= 2; + } + + if (var6 > 192) { + var5 /= 2; + } + + if (var6 > 217) { + var5 /= 2; + } + + if (var6 > 243) { + var5 /= 2; + } + + var7 = (var5 / 32 << 7) + var6 / 2 + (var4 / 4 << 10); + var8 = UserComparator3.method680(var7, 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216; + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/UrlRequest.java b/osrs/src/main/java/UrlRequest.java index 6ce6412c5..cdebd61b0 100644 --- a/osrs/src/main/java/UrlRequest.java +++ b/osrs/src/main/java/UrlRequest.java @@ -5,507 +5,668 @@ import java.net.URL; -@ObfuscatedName("eq") +@ObfuscatedName("ea") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("al") - static int field1170; - @ObfuscatedName("ak") - static int field1169; - @ObfuscatedName("ac") - final URL field1171; - @ObfuscatedName("ax") - volatile int field1173; + @ObfuscatedName("ah") + static int field1180; + @ObfuscatedName("ar") + static int field1181; + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "[Luz;" + ) + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("pr") + static int field1182; + @ObfuscatedName("at") + final URL field1184; @ObfuscatedName("ao") + volatile int field1186; + @ObfuscatedName("ab") @Export("response0") volatile byte[] response0; static { - field1170 = -1; - field1169 = -2; + field1180 = -1; + field1181 = -2; } UrlRequest(URL var1) { - this.field1173 = field1170; - this.field1171 = var1; + this.field1186 = field1180; + this.field1184 = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "53" + descriptor = "(I)Z", + garbageValue = "143275860" ) @Export("isDone") public boolean isDone() { - return this.field1173 != field1170; + return this.field1186 != field1180; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "365015590" + descriptor = "(B)[B", + garbageValue = "1" ) @Export("getResponse") public byte[] getResponse() { return this.response0; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-570806933" + garbageValue = "1515971347" ) - public String method663() { - return this.field1171.toString(); + public String method659() { + return this.field1184.toString(); } - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1964306071" + descriptor = "(Lpf;Lpf;Lpf;I)V", + garbageValue = "-1245628340" ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (Language.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class157.loginBoxCenter = Login.loginBoxX + 180; + if (Login.worldSelectOpen) { + ParamComposition.method981(var0, var1); } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; - } - } + class250.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + int var4; + if (Client.gameState == 0 || Client.gameState == 5) { + byte var3 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); + var4 = 253 - var3; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); + } - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(Lnm;III)V", - garbageValue = "-1837392633" - ) - public static void method664(Widget var0, int var1, int var2) { - var0.field3127.bodyColors[var1] = var2; - var0.field3127.method1760(); - } + String var5; + String var6; + String var7; + short var23; + int var24; + short var25; + if (Client.gameState == 20) { + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); + var23 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var24 += 7; + if (Login.loginIndex != 4 && Login.loginIndex != 10) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var24, 16777215, 0); + var25 = 200; + var5 = WorldMapIcon_1.clientPreferences.getIsUsernameHidden() ? MusicPatch.method1709(Login.Login_username) : Login.Login_username; + + for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(0, var6.length() - 1)) { + } - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(ILmo;ZI)V", - garbageValue = "-2002889011" - ) - static void method665(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = class153.getWorldMap().getMapArea(var0); - int var4 = TextureProvider.localPlayer.plane; - int var5 = (TextureProvider.localPlayer.x >> 7) + class20.baseX; - int var6 = (TextureProvider.localPlayer.y >> 7) + class19.baseY; - Coord var7 = new Coord(var4, var5, var6); - class153.getWorldMap().method2438(var3, var7, var1, var2); - } + var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var24, 16777215, 0); + var24 += 15; - @ObfuscatedName("kl") - @ObfuscatedSignature( - descriptor = "(Llq;I)V", - garbageValue = "-1816644009" - ) - @Export("processZoneOperation") - static final void processZoneOperation(ZoneOperation var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var2; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - if (ZoneOperation.AREA_SOUND == var0) { - var2 = var1.readUnsignedByte(); - var3 = (var2 >> 4 & 7) + Clock.field1484; - var4 = (var2 & 7) + class354.field3144; - var5 = var1.readUnsignedByteSub(); - var6 = var5 >> 2; - var7 = var5 & 3; - var8 = Client.field652[var6]; - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - class19.updatePendingSpawn(class87.Client_plane, var3, var4, var8, -1, var6, var7, 31, 0, -1); - } + for (var7 = MusicPatch.method1709(Login.Login_password); var0.stringWidth(var7) > var25; var7 = var7.substring(1)) { + } - } else { - int var9; - int var10; - int var11; - int var12; - int var13; - Projectile var16; - byte var37; - int var41; - int var42; - if (ZoneOperation.OBJ_ADD == var0) { - var2 = var1.readUnsignedByteAdd() * 4; - var3 = var1.readUnsignedByteAdd(); - byte var38 = var1.readByteAdd(); - var5 = var1.readIntME(); - var37 = var1.readByteNeg(); - var7 = var1.readUnsignedByteNeg(); - var8 = (var7 >> 4 & 7) + Clock.field1484; - var9 = (var7 & 7) + class354.field3144; - var10 = var1.method2629(); - var11 = var1.readUnsignedShort(); - var12 = var1.method2630(); - var13 = var1.readUnsignedByteNeg(); - var41 = var1.readIntME(); - var42 = var1.readUnsignedByteSub() * 4; - var6 = var37 + var8; - var4 = var38 + var9; - if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104 && var6 >= 0 && var4 >= 0 && var6 < 104 && var4 < 104 && var11 != 65535) { - var8 = var8 * 128 + 64; - var9 = var9 * 128 + 64; - var6 = var6 * 128 + 64; - var4 = var4 * 128 + 64; - var16 = new Projectile(var11, class87.Client_plane, var8, var9, class115.getTileHeight(var8, var9, class87.Client_plane) - var42, var5 + Client.cycle, var41 + Client.cycle, var3, var13, var12, var10, var2); - var16.setDestination(var6, var4, class115.getTileHeight(var6, var4, class87.Client_plane) - var2, var5 + Client.cycle); - Client.projectiles.addFirst(var16); + var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var24, 16777215, 0); + var24 += 15; } + } - } else if (ZoneOperation.field2619 == var0) { - var2 = var1.readUnsignedShortAddLE(); - var3 = var1.readUnsignedByteSub(); - var4 = (var3 >> 4 & 7) + Clock.field1484; - var5 = (var3 & 7) + class354.field3144; - var6 = var1.readUnsignedIntLE(); - var7 = var1.readUnsignedIntIME(); - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - NodeDeque var44 = Client.groundItems[class87.Client_plane][var4][var5]; - if (var44 != null) { - for (TileItem var32 = (TileItem)var44.last(); var32 != null; var32 = (TileItem)var44.previous()) { - if ((var2 & 32767) == var32.id && var7 == var32.quantity) { - var32.quantity = var6; - break; - } - } - - class30.updateItemPile(var4, var5); + if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var18; + if (Login.loginIndex == 0) { + var23 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 30; + var4 = Login.loginBoxX + 180 - 80; + var18 = 291; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawLines("New User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawLines("Existing User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var23 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var18 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Continue", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Cancel", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 2) { + var23 = 201; + var0.drawCentered(Login.Login_response1, class157.loginBoxCenter, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, class157.loginBoxCenter, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, class157.loginBoxCenter, var24, 16776960, 0); + var24 += 15; + var24 += 7; + var0.draw("Login: ", class157.loginBoxCenter - 110, var24, 16777215, 0); + var25 = 200; + var5 = WorldMapIcon_1.clientPreferences.getIsUsernameHidden() ? MusicPatch.method1709(Login.Login_username) : Login.Login_username; + + for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { } - } - } else { - byte var14; - if (ZoneOperation.MAPPROJ_ANIM == var0) { - var2 = var1.readUnsignedByte() * 4; - var3 = var1.readIntME(); - var4 = var1.method2629(); - var5 = var1.readUnsignedByte() * 4; - var6 = var1.readUnsignedShortAddLE(); - var7 = var1.method2629(); - var8 = var1.readIntME(); - var9 = var1.readUnsignedShortAdd(); - var10 = var1.readUnsignedByteSub(); - var11 = (var10 >> 4 & 7) + Clock.field1484; - var12 = (var10 & 7) + class354.field3144; - byte var40 = var1.readByteAdd(); - var14 = var1.readByte(); - var42 = var1.readUnsignedByteSub(); - var13 = var40 + var11; - var41 = var14 + var12; - if (var11 >= 0 && var12 >= 0 && var11 < 104 && var12 < 104 && var13 >= 0 && var41 >= 0 && var13 < 104 && var41 < 104 && var8 != 65535) { - var11 = var11 * 128 + 64; - var12 = var12 * 128 + 64; - var13 = var13 * 128 + 64; - var41 = var41 * 128 + 64; - var16 = new Projectile(var8, class87.Client_plane, var11, var12, class115.getTileHeight(var11, var12, class87.Client_plane) - var5, var6 + Client.cycle, var3 + Client.cycle, var42, var9, var4, var7, var2); - var16.setDestination(var13, var41, class115.getTileHeight(var13, var41, class87.Client_plane) - var2, var6 + Client.cycle); - Client.projectiles.addFirst(var16); + var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class167.colorStartTag(16776960) + "|" : ""), class157.loginBoxCenter - 70, var24, 16777215, 0); + var24 += 15; + + for (var7 = MusicPatch.method1709(Login.Login_password); var0.stringWidth(var7) > var25; var7 = var7.substring(1)) { } - } else if (ZoneOperation.OBJ_COUNT == var0) { - var2 = var1.readUnsignedByteNeg(); - var3 = var1.readIntME(); - var4 = var1.readUnsignedByteSub(); - var5 = (var4 >> 4 & 7) + Clock.field1484; - var6 = (var4 & 7) + class354.field3144; - var7 = var1.readUnsignedByte() * 4; - var8 = var1.readIntME(); - var9 = var1.method2583(); - var10 = var1.readUnsignedByteNeg() * 4; - var11 = var1.readUnsignedShortAdd(); - byte var39 = var1.readByte(); - var13 = var1.readUnsignedByteNeg(); - var14 = var1.readByteSub(); - var12 = var39 + var5; - var41 = var14 + var6; - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104 && var12 >= 0 && var41 >= 0 && var12 < 104 && var41 < 104 && var3 != 65535) { - var5 = var5 * 128 + 64; - var6 = var6 * 128 + 64; - var12 = var12 * 128 + 64; - var41 = var41 * 128 + 64; - Projectile var33 = new Projectile(var3, class87.Client_plane, var5, var6, class115.getTileHeight(var5, var6, class87.Client_plane) - var7, var11 + Client.cycle, var8 + Client.cycle, var2, var13, var9, var10); - var33.setDestination(var12, var41, class115.getTileHeight(var12, var41, class87.Client_plane) - var10, var11 + Client.cycle); - Client.projectiles.addFirst(var33); + var0.draw("Password: " + var7 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class167.colorStartTag(16776960) + "|" : ""), class157.loginBoxCenter - 108, var24, 16777215, 0); + var24 += 15; + var23 = 277; + int var8 = class157.loginBoxCenter + -117; + boolean var10 = Client.Login_isUsernameRemembered; + boolean var11 = Login.field743; + IndexedSprite var9 = var10 ? (var11 ? GrandExchangeEvents.field3611 : FriendsList.options_buttons_2Sprite) : (var11 ? Login.field779 : class310.options_buttons_0Sprite); + var9.drawAt(var8, var23); + var8 = var8 + var9.subWidth + 5; + var1.draw("Remember username", var8, var23 + 13, 16776960, 0); + var8 = class157.loginBoxCenter + 24; + boolean var14 = WorldMapIcon_1.clientPreferences.getIsUsernameHidden(); + boolean var15 = Login.field745; + IndexedSprite var13 = var14 ? (var15 ? GrandExchangeEvents.field3611 : FriendsList.options_buttons_2Sprite) : (var15 ? Login.field779 : class310.options_buttons_0Sprite); + var13.drawAt(var8, var23); + var8 = var8 + var13.subWidth + 5; + var1.draw("Hide username", var8, var23 + 13, 16776960, 0); + var24 = var23 + 15; + int var16 = class157.loginBoxCenter - 80; + short var17 = 321; + Login.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); + var0.drawCentered("Login", var16, var17 + 5, 16777215, 0); + var16 = class157.loginBoxCenter + 80; + Login.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); + var0.drawCentered("Cancel", var16, var17 + 5, 16777215, 0); + var23 = 357; + switch(Login.field750) { + case 2: + ModeWhere.field3652 = "Having trouble logging in?"; + break; + default: + ModeWhere.field3652 = "Can't login? Click here."; } - } else if (ZoneOperation.LOC_ANIM == var0) { - var2 = var1.readUnsignedShortAddLE(); - var3 = var1.readUnsignedByteSub(); - var4 = (var3 >> 4 & 7) + Clock.field1484; - var5 = (var3 & 7) + class354.field3144; - var6 = var1.readUnsignedByteAdd(); - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field652[var7]; - if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) { - if (var9 == 0) { - BoundaryObject var34 = class10.scene.method1299(class87.Client_plane, var4, var5); - if (var34 != null) { - var11 = SecureRandomFuture.Entity_unpackID(var34.tag); - if (var7 == 2) { - var34.renderable1 = new DynamicObject(var11, 2, var8 + 4, class87.Client_plane, var4, var5, var2, false, var34.renderable1); - var34.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, class87.Client_plane, var4, var5, var2, false, var34.renderable2); - } else { - var34.renderable1 = new DynamicObject(var11, var7, var8, class87.Client_plane, var4, var5, var2, false, var34.renderable1); - } + Login.field775 = new Bounds(class157.loginBoxCenter, var23, var1.stringWidth(ModeWhere.field3652), 11); + class7.field13 = new Bounds(class157.loginBoxCenter, var23, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(ModeWhere.field3652, class157.loginBoxCenter, var23, 16777215, 0); + } else if (Login.loginIndex == 3) { + var23 = 201; + var0.drawCentered("Incorrect username or password.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 20; + var1.drawCentered("If you have upgraded to a Jagex Account, you", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 20; + var1.drawCentered("need to log in using the Jagex Launcher instead.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var18 = 276; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var2.drawCentered("Try again", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var18 = 326; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var2.drawCentered("Forgotten password?", var4, var18 + 5, 16777215, 0); + } else { + int var19; + short var27; + int var28; + if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var23 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.draw("PIN: " + MusicPatch.method1709(NewShit.otp) + (Client.cycle % 40 < 20 ? class167.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var24, 16777215, 0); + var24 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var24, 16776960, 0); + var24 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var24, 16776960, 0); + var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + var28 = var24 - var0.ascent; + IndexedSprite var26; + if (Login.field744) { + var26 = FriendsList.options_buttons_2Sprite; + } else { + var26 = class310.options_buttons_0Sprite; + } - return; - } + var26.drawAt(var4, var28); + var24 += 15; + var19 = Login.loginBoxX + 180 - 80; + var27 = 321; + Login.titlebuttonSprite.drawAt(var19 - 73, var27 - 20); + var0.drawCentered("Continue", var19, var27 + 5, 16777215, 0); + var19 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var19 - 73, var27 - 20); + var0.drawCentered("Cancel", var19, var27 + 5, 16777215, 0); + var1.drawCentered("Can't login? Click here.", Login.loginBoxX + 180, var27 + 36, 16777215, 0); + } else if (Login.loginIndex == 5) { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var23 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var24 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var24, 16777215, 0); + var25 = 174; + var5 = WorldMapIcon_1.clientPreferences.getIsUsernameHidden() ? MusicPatch.method1709(Login.Login_username) : Login.Login_username; + + for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { } - if (var9 == 1) { - WallDecoration var45 = class10.scene.method1300(class87.Client_plane, var4, var5); - if (var45 != null) { - var11 = SecureRandomFuture.Entity_unpackID(var45.tag); - if (var7 != 4 && var7 != 5) { - if (var7 == 6) { - var45.renderable1 = new DynamicObject(var11, 4, var8 + 4, class87.Client_plane, var4, var5, var2, false, var45.renderable1); - } else if (var7 == 7) { - var45.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class87.Client_plane, var4, var5, var2, false, var45.renderable1); - } else if (var7 == 8) { - var45.renderable1 = new DynamicObject(var11, 4, var8 + 4, class87.Client_plane, var4, var5, var2, false, var45.renderable1); - var45.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class87.Client_plane, var4, var5, var2, false, var45.renderable2); - } + var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? class167.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var24, 16777215, 0); + var24 += 15; + var19 = Login.loginBoxX + 180 - 80; + var27 = 321; + Login.titlebuttonSprite.drawAt(var19 - 73, var27 - 20); + var0.drawCentered("Recover", var19, var27 + 5, 16777215, 0); + var19 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var19 - 73, var27 - 20); + var0.drawCentered("Back", var19, var27 + 5, 16777215, 0); + var27 = 356; + var1.drawCentered("Still having trouble logging in?", class157.loginBoxCenter, var27, 268435455, 0); + } else if (Login.loginIndex == 6) { + var23 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var18 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + if (PendingSpawn.field949 && !Client.onMobile) { + var23 = 201; + var0.drawCentered(Login.Login_response1, class157.loginBoxCenter, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, class157.loginBoxCenter, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, class157.loginBoxCenter, var24, 16776960, 0); + var4 = class157.loginBoxCenter - 150; + var24 += 10; + + for (var28 = 0; var28 < 8; ++var28) { + Login.titlebuttonSprite.method2671(var4, var24, 30, 40); + boolean var20 = var28 == Login.field753 & Client.cycle % 40 < 20; + var0.draw((Login.field769[var28] == null ? "" : Login.field769[var28]) + (var20 ? class167.colorStartTag(16776960) + "|" : ""), var4 + 10, var24 + 27, 16777215, 0); + if (var28 != 1 && var28 != 3) { + var4 += 35; } else { - var45.renderable1 = new DynamicObject(var11, 4, var8, class87.Client_plane, var4, var5, var2, false, var45.renderable1); + var4 += 50; + var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var24 + 27, 16777215, 0); } - - return; - } - } - - if (var9 == 2) { - GameObject var46 = class10.scene.getGameObject(class87.Client_plane, var4, var5); - if (var7 == 11) { - var7 = 10; } - if (var46 != null) { - var46.renderable = new DynamicObject(SecureRandomFuture.Entity_unpackID(var46.tag), var7, var8, class87.Client_plane, var4, var5, var2, false, var46.renderable); - return; - } + var28 = class157.loginBoxCenter - 80; + short var29 = 321; + Login.titlebuttonSprite.drawAt(var28 - 73, var29 - 20); + var0.drawCentered("Submit", var28, var29 + 5, 16777215, 0); + var28 = class157.loginBoxCenter + 80; + Login.titlebuttonSprite.drawAt(var28 - 73, var29 - 20); + var0.drawCentered("Cancel", var28, var29 + 5, 16777215, 0); + } else { + var23 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var18 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Set Date of Birth", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); + } + } else if (Login.loginIndex == 8) { + var23 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var18 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Privacy Policy", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 9) { + var23 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 25; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 25; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var4 = Login.loginBoxX + 180; + var18 = 311; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Try again", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 10) { + var24 = Login.loginBoxX + 180; + var25 = 209; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var25, 16776960, 0); + var4 = var25 + 20; + Login.field776.drawAt(var24 - 109, var4); + if (Login.field763.isEmpty()) { + class11.field38.drawAt(var24 - 48, var4 + 18); + } else { + class11.field38.drawAt(var24 - 48, var4 + 5); + var0.drawCentered(Login.field763, var24, var4 + 68 - 15, 16776960, 0); + } + } else if (Login.loginIndex == 12) { + var24 = class157.loginBoxCenter; + var25 = 216; + var2.drawCentered("Before using this app, please read and accept our", var24, var25, 16777215, 0); + var4 = var25 + 17; + var2.drawCentered("terms of use, privacy policy, and end user licence", var24, var4, 16777215, 0); + var4 += 17; + var2.drawCentered("agreement (EULA).", var24, var4, 16777215, 0); + var4 += 17; + var2.drawCentered("By accepting, you agree to these documents.", var24, var4, 16777215, 0); + var24 = class157.loginBoxCenter - 80; + var25 = 311; + Login.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); + var0.drawCentered("Accept", var24, var25 + 5, 16777215, 0); + var24 = class157.loginBoxCenter + 80; + Login.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); + var0.drawCentered("Decline", var24, var25 + 5, 16777215, 0); + } else if (Login.loginIndex == 13) { + var23 = 231; + var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 20; + var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var24, 16777215, 0); + var4 = Login.loginBoxX + 180; + var23 = 311; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 14) { + var23 = 201; + String var21 = ""; + var5 = ""; + var6 = ""; + switch(Login.field751) { + case 0: + var21 = "Your account has been involved"; + var5 = "in serious rule breaking."; + var6 = ""; + break; + case 1: + var21 = "Your account has been locked due to"; + var5 = "suspicious activity."; + var6 = "Please recover your account."; + break; + case 2: + var21 = "The unpaid balance on your account needs"; + var5 = "to be resolved before you can play."; + var6 = Strings.field3326; + break; + default: + SoundSystem.Login_promptCredentials(false); } - if (var9 == 3) { - FloorDecoration var47 = class10.scene.getFloorDecoration(class87.Client_plane, var4, var5); - if (var47 != null) { - var47.renderable = new DynamicObject(SecureRandomFuture.Entity_unpackID(var47.tag), 22, var8, class87.Client_plane, var4, var5, var2, false, var47.renderable); - return; - } + var0.drawCentered(var21, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 20; + var0.drawCentered(var5, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 20; + var0.drawCentered(var6, Login.loginBoxX + 180, var24, 16776960, 0); + var19 = Login.loginBoxX + 180; + var27 = 276; + Login.titlebuttonSprite.drawAt(var19 - 73, var27 - 20); + if (Login.field751 == 1) { + var0.drawCentered("Recover Account", var19, var27 + 5, 16777215, 0); + } else { + var0.drawCentered("View Appeal Options", var19, var27 + 5, 16777215, 0); } - class266.method1431(class87.Client_plane, var4, var5, var9, var2); + var19 = Login.loginBoxX + 180; + var27 = 326; + Login.titlebuttonSprite.drawAt(var19 - 73, var27 - 20); + var0.drawCentered("Back", var19, var27 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var23 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var18 = 301; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Ok", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 32) { + var23 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var18 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Set Date of Birth", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 33) { + var23 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 20; + var1.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 20; + var1.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var18 = 276; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var2.drawCentered("Download Launcher", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var18 = 326; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var2.drawCentered("Back", var4, var18 + 5, 16777215, 0); } + } + } - } else { - if (ZoneOperation.LOC_ADD_CHANGE == var0) { - var2 = var1.readUnsignedByteAdd(); - var3 = var1.readIntME(); - var4 = var1.readUnsignedByteSub(); - var5 = var4 >> 4 & 15; - var6 = var4 & 7; - var7 = var1.readUnsignedByteAdd(); - var8 = (var7 >> 4 & 7) + Clock.field1484; - var9 = (var7 & 7) + class354.field3144; - if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { - var10 = var5 + 1; - if (TextureProvider.localPlayer.pathX[0] >= var8 - var10 && TextureProvider.localPlayer.pathX[0] <= var10 + var8 && TextureProvider.localPlayer.pathY[0] >= var9 - var10 && TextureProvider.localPlayer.pathY[0] <= var10 + var9 && class91.clientPreferences.getAreaSoundEffectsVolume() != 0 && var6 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var3; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var5 + (var9 << 8) + (var8 << 16); - ++Client.soundEffectCount; - } - } + if (Client.gameState >= 10) { + int[] var22 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var22); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class47.canvasHeight); + EnumComposition.field1505.draw(Login.xPadding - 22, Client.cycle); + EnumComposition.field1505.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var22); + } + + Login.title_muteSprite[WorldMapIcon_1.clientPreferences.getTitleMusicDisabled() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && class85.clientLanguage == Language.Language_EN) { + if (FadeOutTask.field3749 != null) { + var24 = Login.xPadding + 5; + var25 = 463; + byte var31 = 100; + byte var30 = 35; + FadeOutTask.field3749.drawAt(var24, var25); + var0.drawCentered("World" + " " + Client.worldId, var31 / 2 + var24, var30 / 2 + var25 - 2, 16777215, 0); + if (class542.World_request != null) { + var1.drawCentered("Loading...", var31 / 2 + var24, var30 / 2 + var25 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var31 / 2 + var24, var30 / 2 + var25 + 12, 16777215, 0); } + } else { + FadeOutTask.field3749 = class313.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferOwnWorldComparator.archive8, "sl_button", ""); + } + } - if (ZoneOperation.PREFETCH_GAMEOBJECTS == var0) { - var2 = var1.readUnsignedShortAddLE(); - var3 = var1.readUnsignedByte(); - var4 = (var3 >> 4 & 7) + Clock.field1484; - var5 = (var3 & 7) + class354.field3144; - var37 = var1.readByteSub(); - var7 = var1.readIntME(); - var8 = var1.readUnsignedShort(); - var9 = var1.readUnsignedShortAdd(); - var10 = var1.readUnsignedByteNeg(); - var11 = var10 >> 2; - var12 = var10 & 3; - var13 = Client.field652[var11]; - var14 = var1.readByteNeg(); - byte var15 = var1.readByteSub(); - byte var35 = var1.readByteAdd(); - Player var17; - if (var7 == Client.localPlayerIndex) { - var17 = TextureProvider.localPlayer; - } else { - var17 = Client.players[var7]; - } + } + } - if (var17 != null) { - ObjectComposition var18 = class91.getObjectDefinition(var8); - int var19; - int var20; - if (var12 != 1 && var12 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } + @ObfuscatedName("ll") + @ObfuscatedSignature( + descriptor = "(IIIIIIB)V", + garbageValue = "-1" + ) + static final void method661(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; + int var7 = var3 - var1; + int var8 = var6 >= 0 ? var6 : -var6; + int var9 = var7 >= 0 ? var7 : -var7; + int var10 = var8; + if (var8 < var9) { + var10 = var9; + } - int var21 = var4 + (var19 >> 1); - int var22 = var4 + (var19 + 1 >> 1); - int var23 = var5 + (var20 >> 1); - int var24 = var5 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[class87.Client_plane]; - int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2; - int var27 = (var4 << 7) + (var19 << 6); - int var28 = (var5 << 7) + (var20 << 6); - Model var29 = var18.getModel(var11, var12, var25, var27, var26, var28); - if (var29 != null) { - class19.updatePendingSpawn(class87.Client_plane, var4, var5, var13, -1, 0, 0, 31, var2 + 1, var9 + 1); - var17.animationCycleStart = var2 + Client.cycle; - var17.animationCycleEnd = var9 + Client.cycle; - var17.attachedModel = var29; - var17.field900 = var19 * 64 + var4 * 128; - var17.field916 = var20 * 64 + var5 * 128; - var17.baseTileHeight = var26; - byte var30; - if (var35 > var37) { - var30 = var35; - var35 = var37; - var37 = var30; - } + if (var10 != 0) { + int var11 = (var6 << 16) / var10; + int var12 = (var7 << 16) / var10; + if (var12 <= var11) { + var11 = -var11; + } else { + var12 = -var12; + } - if (var14 > var15) { - var30 = var14; - var14 = var15; - var15 = var30; - } + int var13 = var5 * var12 >> 17; + int var14 = var5 * var12 + 1 >> 17; + int var15 = var5 * var11 >> 17; + int var16 = var5 * var11 + 1 >> 17; + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; + int var17 = var0 + var13; + int var18 = var0 - var14; + int var19 = var0 + var6 - var14; + int var20 = var0 + var6 + var13; + int var21 = var15 + var1; + int var22 = var1 - var16; + int var23 = var7 + var1 - var16; + int var24 = var7 + var15 + var1; + Rasterizer3D.method1431(var17, var18, var19); + Rasterizer3D.method1433(var21, var22, var23, var17, var18, var19, 0.0F, 0.0F, 0.0F, var4); + Rasterizer3D.method1431(var17, var19, var20); + Rasterizer3D.method1433(var21, var23, var24, var17, var19, var20, 0.0F, 0.0F, 0.0F, var4); + } + } - var17.minX = var35 + var4; - var17.maxX = var37 + var4; - var17.minY = var14 + var5; - var17.maxY = var15 + var5; - } - } - } + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "([Lnn;IIIZB)V", + garbageValue = "2" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { + Widget var6 = var0[var5]; + if (var6 != null && var6.parentId == var1) { + Renderable.alignWidgetSize(var6, var2, var3, var4); + JagexCache.alignWidgetPosition(var6, var2, var3); + if (var6.scrollX > var6.scrollWidth - var6.width) { + var6.scrollX = var6.scrollWidth - var6.width; + } - TileItem var31; - if (ZoneOperation.field2624 == var0) { - var2 = var1.readUnsignedByteAdd(); - var3 = var1.readUnsignedIntME(); - var4 = var1.readUnsignedByteAdd(); - var5 = (var4 >> 4 & 7) + Clock.field1484; - var6 = (var4 & 7) + class354.field3144; - var1.readUnsignedByteAdd(); - var1.readUnsignedShortAddLE(); - var1.readUnsignedByteSub(); - var7 = var1.readUnsignedShort(); - var1.readUnsignedShort(); - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var31 = new TileItem(); - var31.id = var7; - var31.quantity = var3; - var31.method611(var2); - if (Client.groundItems[class87.Client_plane][var5][var6] == null) { - Client.groundItems[class87.Client_plane][var5][var6] = new NodeDeque(); - } + if (var6.scrollX < 0) { + var6.scrollX = 0; + } - Client.groundItems[class87.Client_plane][var5][var6].addFirst(var31); - class30.updateItemPile(var5, var6); - } + if (var6.scrollY > var6.scrollHeight - var6.height) { + var6.scrollY = var6.scrollHeight - var6.height; + } - } else { - NodeDeque var36; - if (ZoneOperation.OBJ_DEL == var0) { - var2 = var1.readUnsignedByteAdd(); - var3 = (var2 >> 4 & 7) + Clock.field1484; - var4 = (var2 & 7) + class354.field3144; - var5 = var1.readUnsignedShort(); - var6 = var1.readUnsignedByteSub(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - var36 = Client.groundItems[class87.Client_plane][var3][var4]; - if (var36 != null) { - for (var31 = (TileItem)var36.last(); var31 != null; var31 = (TileItem)var36.previous()) { - if ((var5 & 32767) == var31.id) { - var31.method611(var6); - break; - } - } - } - } + if (var6.scrollY < 0) { + var6.scrollY = 0; + } - } else if (ZoneOperation.LOC_DEL != var0) { - if (ZoneOperation.field2617 == var0) { - var2 = var1.readUnsignedShort(); - var3 = var1.readUnsignedShort(); - var4 = var1.readUnsignedByte(); - var5 = (var4 >> 4 & 7) + Clock.field1484; - var6 = (var4 & 7) + class354.field3144; - var7 = var1.readUnsignedByteNeg(); - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var5 = var5 * 128 + 64; - var6 = var6 * 128 + 64; - GraphicsObject var43 = new GraphicsObject(var3, class87.Client_plane, var5, var6, class115.getTileHeight(var5, var6, class87.Client_plane) - var7, var2, Client.cycle); - Client.graphicsObjects.addFirst(var43); - } + if (var6.type == 0) { + class132.revalidateWidgetScroll(var0, var6, var4); + } + } + } - } else if (ZoneOperation.field2623 == var0) { - var2 = var1.readUnsignedByte(); - var3 = var1.readUnsignedByteAdd(); - var4 = var3 >> 2; - var5 = var3 & 3; - var6 = Client.field652[var4]; - var7 = var1.readUnsignedByteAdd(); - var8 = (var7 >> 4 & 7) + Clock.field1484; - var9 = (var7 & 7) + class354.field3144; - var10 = var1.readUnsignedShortAdd(); - if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { - class19.updatePendingSpawn(class87.Client_plane, var8, var9, var6, var10, var4, var5, var2, 0, -1); - } + } - } - } else { - var2 = var1.readUnsignedIntLE(); - var3 = var1.readUnsignedByteAdd(); - var4 = (var3 >> 4 & 7) + Clock.field1484; - var5 = (var3 & 7) + class354.field3144; - var6 = var1.readUnsignedShortAddLE(); - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var36 = Client.groundItems[class87.Client_plane][var4][var5]; - if (var36 != null) { - for (var31 = (TileItem)var36.last(); var31 != null; var31 = (TileItem)var36.previous()) { - if ((var6 & 32767) == var31.id && var2 == var31.quantity) { - var31.remove(); - break; - } - } - - if (var36.last() == null) { - Client.groundItems[class87.Client_plane][var4][var5] = null; - } - - class30.updateItemPile(var4, var5); - } - } + @ObfuscatedName("nl") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)V", + garbageValue = "99" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); + short[] var2 = new short[16]; + int var3 = 0; + + for (int var4 = 0; var4 < ItemComposition.ItemDefinition_fileCount; ++var4) { + ItemComposition var5 = class214.ItemDefinition_get(var4); + if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + BuddyRankComparator.foundItemIdCount = -1; + MusicPatchNode.foundItemIds = null; + return; + } - } + if (var3 >= var2.length) { + short[] var6 = new short[var2.length * 2]; + + for (int var7 = 0; var7 < var3; ++var7) { + var6[var7] = var2[var7]; } + + var2 = var6; } + + var2[var3++] = (short)var4; } } + + MusicPatchNode.foundItemIds = var2; + ApproximateRouteStrategy.foundItemIndex = 0; + BuddyRankComparator.foundItemIdCount = var3; + String[] var8 = new String[BuddyRankComparator.foundItemIdCount]; + + for (int var9 = 0; var9 < BuddyRankComparator.foundItemIdCount; ++var9) { + var8[var9] = class214.ItemDefinition_get(var2[var9]).name; + } + + class215.method1095(var8, MusicPatchNode.foundItemIds); } } \ No newline at end of file diff --git a/osrs/src/main/java/UrlRequester.java b/osrs/src/main/java/UrlRequester.java index bd048e092..957743d63 100644 --- a/osrs/src/main/java/UrlRequester.java +++ b/osrs/src/main/java/UrlRequester.java @@ -11,50 +11,43 @@ import java.util.LinkedList; import java.util.Queue; -@ObfuscatedName("en") +@ObfuscatedName("el") @Implements("UrlRequester") public abstract class UrlRequester implements Runnable { + @ObfuscatedName("at") + final Thread field1176; @ObfuscatedName("ah") - static int field1162; - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "Lnp;" - ) - static StudioGame field1163; - @ObfuscatedName("ac") - final Thread field1166; - @ObfuscatedName("al") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("requests") Queue requests; - @ObfuscatedName("ax") - int field1164; + @ObfuscatedName("ao") + int field1174; UrlRequester(int var1) { this.requests = new LinkedList(); - this.field1166 = new Thread(this); - this.field1166.setPriority(1); - this.field1166.start(); - this.field1164 = var1; + this.field1176 = new Thread(this); + this.field1176.setPriority(1); + this.field1176.start(); + this.field1174 = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Leq;I)V", - garbageValue = "1796222901" + descriptor = "(Lea;I)V", + garbageValue = "422697771" ) @Export("vmethod2700") abstract void vmethod2700(UrlRequest var1) throws IOException; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(Ljava/net/URLConnection;B)I", - garbageValue = "127" + garbageValue = "117" ) - int method648(URLConnection var1) { - int var2 = UrlRequest.field1169; + int method645(URLConnection var1) { + int var2 = UrlRequest.field1181; if (var1 != null) { try { if (var1 instanceof HttpURLConnection) { @@ -67,25 +60,25 @@ int method648(URLConnection var1) { return var2; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(Ljava/net/URLConnection;I)V", - garbageValue = "204362010" + garbageValue = "-727405176" ) - void method649(URLConnection var1) { + void method646(URLConnection var1) { var1.setConnectTimeout(5000); var1.setReadTimeout(5000); var1.setUseCaches(false); var1.setRequestProperty("Connection", "close"); - var1.setRequestProperty("User-Agent", "OldSchoolRuneScape/" + this.field1164); + var1.setRequestProperty("User-Agent", "OldSchoolRuneScape/" + this.field1174); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/net/URLConnection;Leq;S)V", - garbageValue = "32767" + descriptor = "(Ljava/net/URLConnection;Lea;I)V", + garbageValue = "-1518278388" ) - void method650(URLConnection var1, UrlRequest var2) { + void method647(URLConnection var1, UrlRequest var2) { DataInputStream var3 = null; try { @@ -97,7 +90,7 @@ void method650(URLConnection var1, UrlRequest var2) { var3.readFully(var4); } else { var4 = new byte[0]; - byte[] var6 = class148.ByteArrayPool_getArray(5000); + byte[] var6 = class362.ByteArrayPool_getArray(5000); for (int var7 = var3.read(var6); var7 > -1; var7 = var3.read(var6)) { byte[] var8 = new byte[var4.length + var7]; @@ -106,14 +99,14 @@ void method650(URLConnection var1, UrlRequest var2) { var4 = var8; } - MenuAction.ByteArrayPool_release(var6); + SwapSongTask.ByteArrayPool_release(var6); } var2.response0 = var4; } catch (IOException var14) { var2.response0 = null; } finally { - var2.field1173 = this.method648(var1); + var2.field1186 = this.method645(var1); } if (var3 != null) { @@ -125,10 +118,10 @@ void method650(URLConnection var1, UrlRequest var2) { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Leq;", - garbageValue = "511979680" + descriptor = "(Ljava/net/URL;I)Lea;", + garbageValue = "-511964616" ) @Export("request") public UrlRequest request(URL var1) { @@ -140,10 +133,10 @@ public UrlRequest request(URL var1) { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1319494381" + garbageValue = "-264971545" ) @Export("close") public void close() { @@ -154,7 +147,7 @@ public void close() { this.notify(); } - this.field1166.join(); + this.field1176.join(); } catch (InterruptedException var4) { } @@ -179,53 +172,80 @@ public void run() { this.vmethod2700(var1); } catch (Exception var7) { - class190.RunException_sendStackTrace((String)null, var7); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var7); } } } - @ObfuscatedName("br") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lnm;III)V", - garbageValue = "1281314063" + descriptor = "(IIILhs;II)V", + garbageValue = "237436184" ) - public static void method653(Widget var0, int var1, int var2) { - PlayerComposition var3 = var0.field3127; - boolean var4 = var2 != var3.field2950; - var3.field2950 = var2; - if (var4) { - int var5; - int var6; - if (var3.field2950 == var1) { - for (var5 = 0; var5 < PlayerComposition.equipmentIndices.length; ++var5) { - var6 = PlayerComposition.equipmentIndices[var5]; - if (var3.equipment[var6] > 0 && var3.equipment[var6] < 512) { - var3.equipment[var6] = var3.field2944[var6]; - } - } - } else { - if (var3.equipment[0] < 512 || class286.method1574(var3)) { - var3.equipment[class223.field1865.field1879] = 1; - } + static void method648(int var0, int var1, int var2, ObjectComposition var3, int var4) { + ObjectSound var5 = new ObjectSound(); + var5.plane = var0; + var5.x = var1 * 128; + var5.y = var2 * 128; + int var6 = var3.sizeX; + int var7 = var3.sizeY; + if (var4 == 1 || var4 == 3) { + var6 = var3.sizeY; + var7 = var3.sizeX; + } - for (var5 = 0; var5 < 7; ++var5) { - var6 = PlayerComposition.equipmentIndices[var5]; - if (var3.equipment[var6] > 0 && var3.equipment[var6] < 512) { - int[] var7 = var3.equipment; - - for (int var8 = 0; var8 < class403.KitDefinition_fileCount; ++var8) { - KitDefinition var9 = class73.KitDefinition_get(var8); - if (var9 != null && !var9.nonSelectable && var9.bodypartID == (var2 == 1 ? 7 : 0) + var5) { - var7[PlayerComposition.equipmentIndices[var5]] = var8 + 256; - break; - } - } - } + var5.maxX = (var6 + var1) * 128; + var5.maxY = (var7 + var2) * 128; + var5.soundEffectId = var3.ambientSoundId; + var5.field691 = var3.int7 * 128; + var5.field700 = var3.int5; + var5.field696 = var3.int6; + var5.soundEffectIds = var3.soundEffectIds; + if (var3.transforms != null) { + var5.obj = var3; + var5.set(); + } + + ObjectSound.objectSounds.addFirst(var5); + if (var5.soundEffectIds != null) { + var5.field699 = var5.field700 + (int)(Math.random() * (double)(var5.field696 - var5.field700)); + } + + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(ILdt;ZS)I", + garbageValue = "-175" + ) + static int method651(int var0, Script var1, boolean var2) { + Widget var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + if (var0 == 2800) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapData_0.Widget_unpackTargetMask(class361.getWidgetFlags(var3)); + return 1; + } else if (var0 != 2801) { + if (var0 == 2802) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.dataText; } + + return 1; + } else { + return 2; + } + } else { + int var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; } - } - var3.method1760(); + return 1; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/User.java b/osrs/src/main/java/User.java index 02173aa8e..721f2da33 100644 --- a/osrs/src/main/java/User.java +++ b/osrs/src/main/java/User.java @@ -3,18 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rp") +@ObfuscatedName("rf") @Implements("User") public class User implements Comparable { - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lvf;" + descriptor = "Lvj;" ) @Export("username") Username username; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lvf;" + descriptor = "Lvj;" ) @Export("previousUsername") Username previousUsername; @@ -22,50 +22,50 @@ public class User implements Comparable { User() { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lrp;I)I", - garbageValue = "762888653" + descriptor = "(Lrf;B)I", + garbageValue = "-95" ) @Export("compareTo_user") public int compareTo_user(User var1) { return this.username.compareToTyped(var1.username); } - @ObfuscatedName("az") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(B)Lvf;", - garbageValue = "-16" + descriptor = "(I)Lvj;", + garbageValue = "-1855232108" ) @Export("getUsername") public Username getUsername() { return this.username; } - @ObfuscatedName("at") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "-1070" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1231899353" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("af") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "725290011" + garbageValue = "52965911" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("ad") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(Lvf;Lvf;I)V", - garbageValue = "-184606185" + descriptor = "(Lvj;Lvj;B)V", + garbageValue = "16" ) @Export("set") void set(Username var1, Username var2) { @@ -83,12 +83,42 @@ public int compareTo(Object var1) { return this.compareTo_user((User)var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([BI)Lkc;", - garbageValue = "-1515763175" + descriptor = "(Lol;Lol;S)I", + garbageValue = "-21186" ) - static WorldMapSprite method2251(byte[] var0) { - return var0 == null ? new WorldMapSprite() : new WorldMapSprite(Frames.method1335(var0).pixels); + static int method2239(AbstractArchive var0, AbstractArchive var1) { + int var2 = 0; + String[] var3 = Login.field771; + + int var4; + String var5; + for (var4 = 0; var4 < var3.length; ++var4) { + var5 = var3[var4]; + if (var0.tryLoadFileByNames(var5, "")) { + ++var2; + } + } + + var3 = Login.field772; + + for (var4 = 0; var4 < var3.length; ++var4) { + var5 = var3[var4]; + if (var1.tryLoadFileByNames(var5, "")) { + ++var2; + } + } + + var3 = Login.field770; + + for (var4 = 0; var4 < var3.length; ++var4) { + var5 = var3[var4]; + if (var1.getGroupId(var5) != -1 && var1.tryLoadFileByNames(var5, "")) { + ++var2; + } + } + + return var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator1.java b/osrs/src/main/java/UserComparator1.java index f3a92f0be..0bc766c67 100644 --- a/osrs/src/main/java/UserComparator1.java +++ b/osrs/src/main/java/UserComparator1.java @@ -5,10 +5,10 @@ import java.util.Comparator; -@ObfuscatedName("uw") +@ObfuscatedName("ul") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -16,10 +16,10 @@ public UserComparator1(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lrp;Lrp;I)I", - garbageValue = "1358473518" + descriptor = "(Lrf;Lrf;I)I", + garbageValue = "415712924" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/osrs/src/main/java/UserComparator10.java b/osrs/src/main/java/UserComparator10.java index 3e692c747..6707a3246 100644 --- a/osrs/src/main/java/UserComparator10.java +++ b/osrs/src/main/java/UserComparator10.java @@ -3,15 +3,20 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ea") +import java.lang.management.GarbageCollectorMXBean; + +@ObfuscatedName("eu") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("wm") + @ObfuscatedName("bc") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("qw") @ObfuscatedSignature( - descriptor = "Lrw;" + descriptor = "[Lnn;" ) - static ArchiveDisk field1188; - @ObfuscatedName("ac") + static Widget[] field1197; + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -19,10 +24,10 @@ public UserComparator10(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lri;Lri;B)I", - garbageValue = "0" + descriptor = "(Lrh;Lrh;I)I", + garbageValue = "-1398324092" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -39,31 +44,18 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1153152060" - ) - public static void method682() { - class199.field1565.clear(); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-61" - ) - public static void method684() { - VarpDefinition.VarpDefinition_cached.clear(); - } - - @ObfuscatedName("nw") + @ObfuscatedName("kt") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-205905443" + garbageValue = "-2060260259" ) - static final void method685() { - Client.field530 = Client.cycleCntr; - class183.ClanChat_inClanChat = true; + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + class160.method840(); + Client.menuActions[0] = "Cancel"; + Client.menuTargets[0] = ""; + Client.menuOpcodes[0] = 1006; + Client.menuShiftClick[0] = false; + Client.menuOptionsCount = 1; } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator2.java b/osrs/src/main/java/UserComparator2.java index 74529c4dc..a97967bd6 100644 --- a/osrs/src/main/java/UserComparator2.java +++ b/osrs/src/main/java/UserComparator2.java @@ -5,10 +5,10 @@ import java.util.Comparator; -@ObfuscatedName("ux") +@ObfuscatedName("ud") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -16,10 +16,10 @@ public UserComparator2(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lrp;Lrp;B)I", - garbageValue = "-19" + descriptor = "(Lrf;Lrf;B)I", + garbageValue = "1" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/osrs/src/main/java/UserComparator3.java b/osrs/src/main/java/UserComparator3.java index 587a7f915..92cf8eae1 100644 --- a/osrs/src/main/java/UserComparator3.java +++ b/osrs/src/main/java/UserComparator3.java @@ -3,21 +3,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ev") +@ObfuscatedName("er") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "[Lcv;" - ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("ah") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("hz") - static String field1184; - @ObfuscatedName("ac") + @ObfuscatedName("ji") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -25,10 +17,10 @@ public UserComparator3(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lri;Lri;B)I", - garbageValue = "85" + descriptor = "(Lrh;Lrh;I)I", + garbageValue = "1490590572" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -45,12 +37,41 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ax") + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)[Ldr;", + garbageValue = "-253012574" + ) + static class90[] method679() { + return new class90[]{class90.field894, class90.field896, class90.field898, class90.field899, class90.field897, class90.field895}; + } + + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1193478763" + descriptor = "(III)I", + garbageValue = "868585172" ) - public static void method676() { - VarbitComposition.VarbitDefinition_cached.clear(); + static int method680(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 0) { + var1 = 0; + } else if (var1 > 127) { + var1 = 127; + } + + var1 = 127 - var1; + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator4.java b/osrs/src/main/java/UserComparator4.java index a245e76b4..06593d5f5 100644 --- a/osrs/src/main/java/UserComparator4.java +++ b/osrs/src/main/java/UserComparator4.java @@ -5,22 +5,10 @@ import java.util.Comparator; -@ObfuscatedName("ej") +@ObfuscatedName("en") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lbh;" - ) - @Export("soundSystem") - public static SoundSystem soundSystem; - @ObfuscatedName("ka") - @ObfuscatedSignature( - descriptor = "[Lud;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -28,10 +16,10 @@ public UserComparator4(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lri;Lri;B)I", - garbageValue = "2" + descriptor = "(Lrh;Lrh;B)I", + garbageValue = "26" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { @@ -49,4 +37,216 @@ public int compare(Object var1, Object var2) { public boolean equals(Object var1) { return super.equals(var1); } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1918308972" + ) + public static int method665(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); + var0 = var0 + (var0 >>> 4) & 252645135; + var0 += var0 >>> 8; + var0 += var0 >>> 16; + return var0 & 255; + } + + @ObfuscatedName("mb") + @ObfuscatedSignature( + descriptor = "(Lnn;II)I", + garbageValue = "1187363281" + ) + static final int method666(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { + try { + int[] var2 = var0.cs1Instructions[var1]; + int var3 = 0; + int var4 = 0; + byte var5 = 0; + + while (true) { + int var6 = var2[var4++]; + int var7 = 0; + byte var8 = 0; + if (var6 == 0) { + return var3; + } + + if (var6 == 1) { + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = HealthBarDefinition.widgetDefinition.method1733(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!class214.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 += var10.field3077[var12]; + } + } + } + } + + if (var6 == 5) { + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { + var7 = class229.localPlayer.combatLevel; + } + + if (var6 == 9) { + for (var9 = 0; var9 < 25; ++var9) { + if (Skills.Skills_enabled[var9]) { + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = HealthBarDefinition.widgetDefinition.method1733(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!class214.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 = 999999999; + break; + } + } + } + } + + if (var6 == 11) { + var7 = Client.runEnergy; + } + + if (var6 == 12) { + var7 = Client.weight; + } + + if (var6 == 13) { + var9 = Varps.Varps_main[var2[var4++]]; + int var13 = var2[var4++]; + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; + } + + if (var6 == 14) { + var9 = var2[var4++]; + var7 = HealthBar.getVarbit(var9); + } + + if (var6 == 15) { + var8 = 1; + } + + if (var6 == 16) { + var8 = 2; + } + + if (var6 == 17) { + var8 = 3; + } + + if (var6 == 18) { + var7 = (class229.localPlayer.x >> 7) + NewShit.baseX; + } + + if (var6 == 19) { + var7 = (class229.localPlayer.y >> 7) + class101.baseY; + } + + if (var6 == 20) { + var7 = var2[var4++]; + } + + if (var8 == 0) { + if (var5 == 0) { + var3 += var7; + } + + if (var5 == 1) { + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { + var3 /= var7; + } + + if (var5 == 3) { + var3 *= var7; + } + + var5 = 0; + } else { + var5 = var8; + } + } + } catch (Exception var14) { + return -1; + } + } else { + return -2; + } + } + + @ObfuscatedName("nf") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "52" + ) + static final void method667(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method857()) { + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + if (var2.rank == -1) { + PacketBufferNode var3 = class113.getPacketBufferNode(ClientPacket.f83, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(3 + ClanChannel.stringCp1252NullTerminatedByteSize(var2.username.getName())); + var3.packetBuffer.writeByte(var0); + var3.packetBuffer.writeShort(var1); + var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); + Client.packetWriter.addNode(var3); + } + } + } + } + + @ObfuscatedName("om") + @ObfuscatedSignature( + descriptor = "(II)Lte;", + garbageValue = "-125616841" + ) + static class518 method668(int var0) { + class518 var1 = (class518)Client.archive11.get((long)var0); + if (var1 == null) { + var1 = new class518(class267.field2224, var0); + } + + return var1; + } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator5.java b/osrs/src/main/java/UserComparator5.java index 2041be1a7..2ab5b5eb9 100644 --- a/osrs/src/main/java/UserComparator5.java +++ b/osrs/src/main/java/UserComparator5.java @@ -3,14 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; - -@ObfuscatedName("eb") +@ObfuscatedName("et") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -18,10 +14,10 @@ public UserComparator5(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lri;Lri;B)I", - garbageValue = "29" + descriptor = "(Lrh;Lrh;I)I", + garbageValue = "-405710173" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -42,128 +38,50 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ax") + @ObfuscatedName("mm") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-128" + descriptor = "([Lnn;IB)V", + garbageValue = "58" ) - static void method674() { - try { - File var0 = new File(DevicePcmPlayerProvider.userHomeDirectory, "random.dat"); - int var2; - if (var0.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); - } else { - label34: - for (int var1 = 0; var1 < class27.field74.length; ++var1) { - for (var2 = 0; var2 < FriendsList.field3812.length; ++var2) { - File var3 = new File(FriendsList.field3812[var2] + class27.field74[var1] + File.separatorChar + "random.dat"); - if (var3.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); - break label34; - } + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null) { + if (var3.type == 0) { + if (var3.children != null) { + runComponentCloseListeners(var3.children, var1); } - } - } - - if (JagexCache.JagexCache_randomDat == null) { - RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); - var2 = var4.read(); - var4.seek(0L); - var4.write(var2); - var4.seek(0L); - var4.close(); - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); - } - } catch (IOException var5) { - } - - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "([BIIIIIIIII[Lih;B)V", - garbageValue = "-89" - ) - static final void method672(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, CollisionMap[] var10) { - int var12; - for (int var11 = 0; var11 < 8; ++var11) { - for (var12 = 0; var12 < 8; ++var12) { - if (var11 + var2 > 0 && var11 + var2 < 103 && var3 + var12 > 0 && var3 + var12 < 103) { - int[] var10000 = var10[var1].flags[var11 + var2]; - var10000[var3 + var12] &= -16777217; - } - } - } - Buffer var24 = new Buffer(var0); - - for (var12 = 0; var12 < 4; ++var12) { - for (int var13 = 0; var13 < 64; ++var13) { - for (int var14 = 0; var14 < 64; ++var14) { - if (var12 == var4 && var13 >= var5 && var13 < var5 + 8 && var14 >= var6 && var14 < var6 + 8) { - int var17 = var13 & 7; - int var18 = var14 & 7; - int var19 = var7 & 3; - int var16; - if (var19 == 0) { - var16 = var17; - } else if (var19 == 1) { - var16 = var18; - } else if (var19 == 2) { - var16 = 7 - var17; - } else { - var16 = 7 - var18; - } - - int var20 = var16 + var2; - int var21 = var3 + ClanChannelMember.method771(var13 & 7, var14 & 7, var7); - int var22 = (var13 & 7) + var8 + var2; - int var23 = var3 + (var14 & 7) + var9; - class104.loadTerrain(var24, var1, var20, var21, var22, var23, var7); - } else { - class104.loadTerrain(var24, 0, -1, -1, 0, 0, 0); + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + class514.runIntfCloseListener(var4.group, var1); } } - } - } - - } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IIZI)Ljava/lang/String;", - garbageValue = "-18328048" - ) - static String method673(int var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - if (var2 && var0 >= 0) { - int var3 = 2; - - for (int var4 = var0 / var1; var4 != 0; ++var3) { - var4 /= var1; + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + class157.runScriptEvent(var5); } - char[] var5 = new char[var3]; - var5[0] = '+'; - - for (int var6 = var3 - 1; var6 > 0; --var6) { - int var7 = var0; - var0 /= var1; - int var8 = var7 - var0 * var1; - if (var8 >= 10) { - var5[var6] = (char)(var8 + 87); - } else { - var5[var6] = (char)(var8 + 48); + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = HealthBarDefinition.widgetDefinition.method1733(var3.id); + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { + continue; + } } - } - return new String(var5); - } else { - return Integer.toString(var0, var1); + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onSubChange; + class157.runScriptEvent(var5); + } } - } else { - throw new IllegalArgumentException("" + var1); } + } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator6.java b/osrs/src/main/java/UserComparator6.java index e1b93e700..a08951b42 100644 --- a/osrs/src/main/java/UserComparator6.java +++ b/osrs/src/main/java/UserComparator6.java @@ -6,15 +6,9 @@ @ObfuscatedName("ey") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("as") - static int[][][] field1191; - @ObfuscatedName("jd") - @ObfuscatedSignature( - descriptor = "Lpu;" - ) - @Export("fontPlain12") - static Font fontPlain12; - @ObfuscatedName("ac") + @ObfuscatedName("au") + static int field1202; + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -22,10 +16,10 @@ public UserComparator6(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lri;Lri;B)I", - garbageValue = "1" + descriptor = "(Lrh;Lrh;I)I", + garbageValue = "-464829605" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -42,17 +36,59 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("he") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "97" + descriptor = "(ILdt;ZB)I", + garbageValue = "-32" ) - static final void method690(boolean var0) { - if (var0) { - Client.field419 = Login.field741 ? class141.field1313 : class141.field1315; + static int method689(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 != 1927 && var0 != 2927) { + int var4; + if (var0 == 1928) { + var3 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var4 >= 1 && var4 <= 10) { + class102 var5 = new class102(var4, var3.id, var3.childIndex, var3.itemId); + Interpreter.field712.add(var5); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == 2928) { + DbTableType.Interpreter_intStackSize -= 3; + int var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + int var8 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + if (var8 >= 1 && var8 <= 10) { + class102 var6 = new class102(var8, var7, var4, HealthBarDefinition.widgetDefinition.method1733(var7).itemId); + Interpreter.field712.add(var6); + return 1; + } else { + throw new RuntimeException(); + } + } else { + return 2; + } + } else if (Interpreter.field705 >= 10) { + throw new RuntimeException(); } else { - Client.field419 = class91.clientPreferences.method564(Login.Login_username) ? class141.field1311 : class141.field1312; - } + if (var0 >= 2000) { + var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + } else { + var3 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + } + if (var3.onResize == null) { + return 0; + } else { + ScriptEvent var9 = new ScriptEvent(); + var9.widget = var3; + var9.args = var3.onResize; + var9.field871 = Interpreter.field705 + 1; + Client.scriptEvents.addFirst(var9); + return 1; + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator7.java b/osrs/src/main/java/UserComparator7.java index 7971f6302..774e476d1 100644 --- a/osrs/src/main/java/UserComparator7.java +++ b/osrs/src/main/java/UserComparator7.java @@ -3,10 +3,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("ei") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("ac") + @ObfuscatedName("fw") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + static Archive field1190; + @ObfuscatedName("jd") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -14,10 +22,10 @@ public UserComparator7(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lri;Lri;I)I", - garbageValue = "-577121058" + descriptor = "(Lrh;Lrh;I)I", + garbageValue = "1768375186" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -33,4 +41,34 @@ int compareBuddy(Buddy var1, Buddy var2) { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "19" + ) + static void method674(int var0) { + if (var0 != Login.loginIndex) { + Login.loginIndex = var0; + } + } + + @ObfuscatedName("ol") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1939309328" + ) + static String method675(String var0) { + PlayerType[] var1 = class320.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon != -1 && var0.startsWith(FloorUnderlayDefinition.addImageTag(var3.modIcon))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); + break; + } + } + + return var0; + } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator8.java b/osrs/src/main/java/UserComparator8.java index e6b2ae460..6b34d49b3 100644 --- a/osrs/src/main/java/UserComparator8.java +++ b/osrs/src/main/java/UserComparator8.java @@ -3,25 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("eh") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "[Ltl;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("ev") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("kn") - @ObfuscatedSignature( - descriptor = "[Lud;" - ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -29,10 +14,10 @@ public UserComparator8(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lri;Lri;B)I", - garbageValue = "0" + descriptor = "(Lrh;Lrh;B)I", + garbageValue = "118" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -53,76 +38,50 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("kn") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(S)[Lfw;", + garbageValue = "226" ) - static final void method669() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.endCycle > 0) { - --var0.endCycle; - } - - boolean var1; - int var2; - int var3; - ObjectComposition var4; - if (var0.endCycle == 0) { - if (var0.objectId >= 0) { - var2 = var0.objectId; - var3 = var0.field953; - var4 = class91.getObjectDefinition(var2); - if (var3 == 11) { - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { - var3 = 4; - } - - var1 = var4.method1078(var3); - if (!var1) { - continue; - } - } - - class115.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field947, var0.field953, var0.field946); - var0.remove(); - } else { - if (var0.startCycle > 0) { - --var0.startCycle; - } - - if (var0.startCycle == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { - if (var0.id >= 0) { - var2 = var0.id; - var3 = var0.objectType; - var4 = class91.getObjectDefinition(var2); - if (var3 == 11) { - var3 = 10; - } + static class140[] method671() { + return new class140[]{class140.field1326, class140.field1322, class140.field1325, class140.field1324, class140.field1320, class140.field1327, class140.field1319, class140.field1321, class140.field1323}; + } - if (var3 >= 5 && var3 <= 8) { - var3 = 4; - } + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lol;Lol;I)V", + garbageValue = "-1842959884" + ) + public static void method670(AbstractArchive var0, AbstractArchive var1) { + SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; + } - var1 = var4.method1078(var3); - if (!var1) { - continue; - } - } + @ObfuscatedName("nq") + @ObfuscatedSignature( + descriptor = "(IIII)Ldc;", + garbageValue = "853776255" + ) + @Export("ifOpenSub") + static final InterfaceParent ifOpenSub(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + class130.method713(var1); + Widget var4 = HealthBarDefinition.widgetDefinition.method1733(var0); + class159.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + class159.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } - class115.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.rotation, var0.objectType, var0.field946); - var0.startCycle = -1; - if (var0.objectId == var0.id && var0.objectId == -1) { - var0.remove(); - } else if (var0.objectId == var0.id && var0.rotation == var0.field947 && var0.objectType == var0.field953) { - var0.remove(); - } - } - } + class132.revalidateWidgetScroll(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var0 >> 16], var4, false); + class106.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { + class514.runIntfCloseListener(Client.rootInterface, 1); } + return var3; } } \ No newline at end of file diff --git a/osrs/src/main/java/UserComparator9.java b/osrs/src/main/java/UserComparator9.java index f16a67dca..c27604383 100644 --- a/osrs/src/main/java/UserComparator9.java +++ b/osrs/src/main/java/UserComparator9.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("ez") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public UserComparator9(boolean var1) { this.reversed = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lri;Lri;I)I", - garbageValue = "1813564346" + descriptor = "(Lrh;Lrh;I)I", + garbageValue = "573682833" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -34,76 +34,30 @@ public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ac") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(Lom;Lom;Lom;I)V", - garbageValue = "-1363426561" + descriptor = "(ILdt;ZI)I", + garbageValue = "1141161217" ) - public static void method680(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - HitSplatDefinition.HitSplatDefinition_archive = var0; - HitSplatDefinition.field1701 = var1; - class135.HitSplatDefinition_fontsArchive = var2; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)Lva;", - garbageValue = "1793860244" - ) - public static PrivateChatMode method679(int var0) { - PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4299, PrivateChatMode.field4300, PrivateChatMode.field4298}; - PrivateChatMode[] var2 = var1; - - for (int var3 = 0; var3 < var2.length; ++var3) { - PrivateChatMode var4 = var2[var3]; - if (var0 == var4.id) { - return var4; - } + static int method682(int var0, Script var1, boolean var2) { + if (var0 == 5630) { + Client.logoutTimer = 250; + return 1; + } else { + return 2; } - - return null; } - @ObfuscatedName("al") + @ObfuscatedName("na") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1897883590" + descriptor = "(B)V", + garbageValue = "40" ) - public static void method678() { - class212.field1679.clear(); - } - - @ObfuscatedName("mc") - @ObfuscatedSignature( - descriptor = "(Lnm;I)Z", - garbageValue = "1578685634" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = VarcInt.method977(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var2 == var3) { - return false; - } - } else if (var3 != var2) { - return false; - } - } - - return true; + static final void method683() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsInClanChat(); } + } } \ No newline at end of file diff --git a/osrs/src/main/java/UserList.java b/osrs/src/main/java/UserList.java index a5a4d635b..d4fbc8598 100644 --- a/osrs/src/main/java/UserList.java +++ b/osrs/src/main/java/UserList.java @@ -7,28 +7,28 @@ import java.util.Comparator; import java.util.HashMap; -@ObfuscatedName("rn") +@ObfuscatedName("rc") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("capacity") final int capacity; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("size") int size; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Lrp;" + descriptor = "[Lrf;" ) @Export("array") User[] array; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("comparator") Comparator comparator; @@ -41,26 +41,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lrp;", - garbageValue = "1002915738" + descriptor = "(I)Lrf;", + garbageValue = "794695059" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)[Lrp;", - garbageValue = "-1086220070" + descriptor = "(II)[Lrf;", + garbageValue = "-190310061" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("bb") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-43" + descriptor = "(I)V", + garbageValue = "-1535217845" ) @Export("clear") public void clear() { @@ -70,30 +70,30 @@ public void clear() { this.previousUsernamesMap.clear(); } - @ObfuscatedName("bo") + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-246674667" + garbageValue = "-1124880837" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("bp") + @ObfuscatedName("ba") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1551209369" + garbageValue = "458796278" ) @Export("isFull") public boolean isFull() { return this.capacity == this.size; } - @ObfuscatedName("bt") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(Lvf;I)Z", - garbageValue = "630041153" + descriptor = "(Lvj;S)Z", + garbageValue = "18697" ) @Export("contains") public boolean contains(Username var1) { @@ -104,10 +104,10 @@ public boolean contains(Username var1) { } } - @ObfuscatedName("bm") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(Lvf;I)Lrp;", - garbageValue = "1492153372" + descriptor = "(Lvj;I)Lrf;", + garbageValue = "-1933118786" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -115,30 +115,30 @@ public User getByUsername(Username var1) { return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("br") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(Lvf;I)Lrp;", - garbageValue = "-1842958661" + descriptor = "(Lvj;I)Lrf;", + garbageValue = "756260945" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } - @ObfuscatedName("bs") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(Lvf;B)Lrp;", - garbageValue = "2" + descriptor = "(Lvj;I)Lrf;", + garbageValue = "-858632406" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } - @ObfuscatedName("bc") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(Lvf;I)Z", - garbageValue = "-1004850002" + descriptor = "(Lvj;I)Z", + garbageValue = "-1442833706" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -151,10 +151,10 @@ public final boolean removeByUsername(Username var1) { } } - @ObfuscatedName("bu") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(Lrp;B)V", - garbageValue = "-65" + descriptor = "(Lrf;I)V", + garbageValue = "-1690044546" ) @Export("remove") final void remove(User var1) { @@ -165,38 +165,34 @@ final void remove(User var1) { } } - @ObfuscatedName("bf") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Lvf;B)Lrp;", - garbageValue = "-54" + descriptor = "(Lvj;B)Lrf;", + garbageValue = "-83" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); } - @ObfuscatedName("bh") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(Lvf;Lvf;I)Lrp;", - garbageValue = "-274589503" + descriptor = "(Lvj;Lvj;I)Lrf;", + garbageValue = "1851941311" ) @Export("addLast") User addLast(Username var1, Username var2) { - if (this.getByCurrentUsername(var1) != null) { - throw new IllegalStateException(); - } else { - User var3 = this.newInstance(); - var3.set(var1, var2); - this.arrayAddLast(var3); - this.mapPut(var3); - return var3; - } + User var3 = this.newInstance(); + var3.set(var1, var2); + this.arrayAddLast(var3); + this.mapPut(var3); + return var3; } - @ObfuscatedName("bl") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(IB)Lrp;", - garbageValue = "-47" + descriptor = "(II)Lrf;", + garbageValue = "-56414305" ) @Export("get") public final User get(int var1) { @@ -207,10 +203,10 @@ public final User get(int var1) { } } - @ObfuscatedName("bg") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1844239177" + descriptor = "(B)V", + garbageValue = "76" ) @Export("sort") public final void sort() { @@ -222,10 +218,10 @@ public final void sort() { } - @ObfuscatedName("bj") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(Lrp;Lvf;Lvf;B)V", - garbageValue = "0" + descriptor = "(Lrf;Lvj;Lvj;B)V", + garbageValue = "30" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -234,10 +230,10 @@ final void changeName(User var1, Username var2, Username var3) { this.mapPut(var1); } - @ObfuscatedName("bx") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(Lrp;I)I", - garbageValue = "2089243961" + descriptor = "(Lrf;B)I", + garbageValue = "-102" ) @Export("indexOf") final int indexOf(User var1) { @@ -250,10 +246,10 @@ final int indexOf(User var1) { return -1; } - @ObfuscatedName("bi") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(Lrp;B)V", - garbageValue = "53" + descriptor = "(Lrf;B)V", + garbageValue = "-78" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -263,20 +259,20 @@ final void mapRemove(User var1) { } - @ObfuscatedName("bq") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(Lrp;I)V", - garbageValue = "-1328367592" + descriptor = "(Lrf;I)V", + garbageValue = "-488058670" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; } - @ObfuscatedName("bw") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(Lrp;S)V", - garbageValue = "4323" + descriptor = "(Lrf;I)V", + garbageValue = "-1090734641" ) @Export("mapPut") final void mapPut(User var1) { @@ -290,10 +286,10 @@ final void mapPut(User var1) { } - @ObfuscatedName("ce") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-818952963" + garbageValue = "-312876519" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -304,20 +300,20 @@ final void arrayRemove(int var1) { } - @ObfuscatedName("cu") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-456856178" + garbageValue = "1908013155" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; } - @ObfuscatedName("cw") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "764754614" + descriptor = "(Ljava/util/Comparator;S)V", + garbageValue = "-18324" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -328,4 +324,27 @@ public final void addComparator(Comparator var1) { } } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IS)Lhy;", + garbageValue = "196" + ) + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); + var1 = new StructComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + StructComposition.StructDefinition_cached.put(var1, (long)var0); + return var1; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/Username.java b/osrs/src/main/java/Username.java index cbd4cb53e..37beaa1b2 100644 --- a/osrs/src/main/java/Username.java +++ b/osrs/src/main/java/Username.java @@ -3,62 +3,156 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("vf") +@ObfuscatedName("vj") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("name") String name; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lte;)V" + descriptor = "(Ljava/lang/String;Ltt;)V" ) public Username(String var1, LoginType var2) { this.name = var1; - this.cleanName = class432.method2192(var1, var2); + this.cleanName = class14.method52(var1, var2); } public Username(String var1) { this.name = var1; - this.cleanName = class432.method2192(var1, LoginType.oldscape); + LoginType var4 = LoginType.oldscape; + String var3; + if (var1 == null) { + var3 = null; + } else { + label100: { + int var5 = 0; + + int var6; + for (var6 = var1.length(); var5 < var6 && class489.method2381(var1.charAt(var5)); ++var5) { + } + + while (var6 > var5 && class489.method2381(var1.charAt(var6 - 1))) { + --var6; + } + + int var7 = var6 - var5; + if (var7 >= 1) { + byte var9; + if (var4 == null) { + var9 = 12; + } else { + switch(var4.field4102) { + case 1: + var9 = 20; + break; + default: + var9 = 12; + } + } + + if (var7 <= var9) { + StringBuilder var15 = new StringBuilder(var7); + + for (int var17 = var5; var17 < var6; ++var17) { + char var10 = var1.charAt(var17); + boolean var11; + if (Character.isISOControl(var10)) { + var11 = false; + } else if (KeyHandler.isAlphaNumeric(var10)) { + var11 = true; + } else { + char[] var12 = class505.field4104; + int var13 = 0; + + label67: + while (true) { + char var14; + if (var13 >= var12.length) { + var12 = class505.field4103; + + for (var13 = 0; var13 < var12.length; ++var13) { + var14 = var12[var13]; + if (var14 == var10) { + var11 = true; + break label67; + } + } + + var11 = false; + break; + } + + var14 = var12[var13]; + if (var10 == var14) { + var11 = true; + break; + } + + ++var13; + } + } + + if (var11) { + char var16 = FriendsChat.method2219(var10); + if (var16 != 0) { + var15.append(var16); + } + } + } + + if (var15.length() == 0) { + var3 = null; + } else { + var3 = var15.toString(); + } + break label100; + } + } + + var3 = null; + } + } + + this.cleanName = var3; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1870950849" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "8" ) @Export("getName") public String getName() { return this.name; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "641761865" + garbageValue = "-1344600615" ) - public String method2740() { + public String method2718() { return this.cleanName; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-46" + garbageValue = "19" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; } - @ObfuscatedName("ah") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lvf;I)I", - garbageValue = "585813874" + descriptor = "(Lvj;I)I", + garbageValue = "1848187995" ) @Export("compareToTyped") public int compareToTyped(Username var1) { @@ -103,41 +197,4 @@ public String toString() { public int compareTo(Object var1) { return this.compareToTyped((Username)var1); } - - @ObfuscatedName("mi") - @ObfuscatedSignature( - descriptor = "(Lnm;III)V", - garbageValue = "-2147237579" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { - var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); - } - - if (var0.yAlignment == 0) { - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; - } else if (var0.yAlignment == 4) { - var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/Usernamed.java b/osrs/src/main/java/Usernamed.java index 17b0a567b..888d1dc2e 100644 --- a/osrs/src/main/java/Usernamed.java +++ b/osrs/src/main/java/Usernamed.java @@ -3,13 +3,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qc") +@ObfuscatedName("qz") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("ou") + @ObfuscatedName("or") @ObfuscatedSignature( - descriptor = "(I)Lvf;", - garbageValue = "-1440888763" + descriptor = "(I)Lvj;", + garbageValue = "-1748725154" ) @Export("username") Username username(); diff --git a/osrs/src/main/java/VarbitComposition.java b/osrs/src/main/java/VarbitComposition.java index d311366cf..b8d79512e 100644 --- a/osrs/src/main/java/VarbitComposition.java +++ b/osrs/src/main/java/VarbitComposition.java @@ -3,40 +3,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("ht") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("VarbitDefinition_cached") static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("ah") - static final int[] field1682; - @ObfuscatedName("ak") + @ObfuscatedName("au") + static final int[] field1624; + @ObfuscatedName("fy") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("ar") @Export("baseVar") public int baseVar; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("startBit") public int startBit; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); - field1682 = new int[32]; + field1624 = new int[32]; int var0 = 2; for (int var1 = 0; var1 < 32; ++var1) { - field1682[var1] = var0 - 1; + field1624[var1] = var0 - 1; var0 += var0; } @@ -45,10 +51,10 @@ public class VarbitComposition extends DualNode { VarbitComposition() { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-1759643857" + descriptor = "(Luj;B)V", + garbageValue = "-93" ) @Export("decode") void decode(Buffer var1) { @@ -62,10 +68,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "649154016" + descriptor = "(Luj;II)V", + garbageValue = "-30709508" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -76,23 +82,4 @@ void decodeNext(Buffer var1, int var2) { } } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1812761064" - ) - public static int method1046(int var0) { - return var0 >>> 4 & class523.field4149; - } - - @ObfuscatedName("mk") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1743166576" - ) - static void method1049(int var0, int var1) { - class12.method41(class133.tempMenuAction, var0, var1); - class133.tempMenuAction = null; - } } \ No newline at end of file diff --git a/osrs/src/main/java/VarcInt.java b/osrs/src/main/java/VarcInt.java index 02d7950b7..b8228f9c2 100644 --- a/osrs/src/main/java/VarcInt.java +++ b/osrs/src/main/java/VarcInt.java @@ -3,33 +3,21 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; -import java.util.Iterator; - -@ObfuscatedName("hg") +@ObfuscatedName("gk") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("VarcInt_archive") - static AbstractArchive VarcInt_archive; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("VarcInt_cached") - static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("ah") + public static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lun;" + descriptor = "Lgn;" ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("au") - static int field1529; - @ObfuscatedName("ak") + static ClanChannel field1474; + @ObfuscatedName("ar") @Export("persist") public boolean persist; @@ -41,239 +29,83 @@ public class VarcInt extends DualNode { this.persist = false; } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-1749757315" + descriptor = "(Luj;S)V", + garbageValue = "-26758" ) - void method972(Buffer var1) { + void method901(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method973(var1, var2); + this.method902(var1, var2); } } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "7" + descriptor = "(Luj;IB)V", + garbageValue = "14" ) - void method973(Buffer var1, int var2) { + void method902(Buffer var1, int var2) { if (var2 == 2) { this.persist = true; } } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1764742883" + descriptor = "([BZI)Ljava/lang/Object;", + garbageValue = "-648175177" ) - public static int method974(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(Lom;II)V", - garbageValue = "-1876796577" - ) - public static void method975(AbstractArchive var0, int var1) { - if (!class319.field2789.isEmpty()) { - ArrayList var2 = new ArrayList(); - Iterator var3 = class319.field2789.iterator(); - - while (var3.hasNext()) { - MusicSong var4 = (MusicSong)var3.next(); - var4.field2884 = false; - var4.field2887 = false; - var4.field2886 = false; - var4.field2882 = false; - var4.musicTrackArchive = var0; - var4.musicTrackVolume = var1; - var4.field2888 = 0.0F; - var2.add(var4); - } - - class148.method776(var2, class319.musicPlayerStatus, class319.field2794, class319.field2793, class319.field2795, false); + public static Object method899(byte[] var0, boolean var1) { + if (var0 == null) { + return null; + } else if (var0.length > 136) { + DirectByteArrayCopier var2 = new DirectByteArrayCopier(); + var2.set(var0); + return var2; + } else { + return var0; } } - @ObfuscatedName("kv") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1597661026" + descriptor = "(B)V", + garbageValue = "60" ) - static final boolean method976() { - return Client.isMenuOpen; + public static void method900() { + class176.archive5.clear(); } - @ObfuscatedName("mw") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lnm;II)I", - garbageValue = "-599828632" + descriptor = "(III)V", + garbageValue = "1925718940" ) - static final int method977(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { - try { - int[] var2 = var0.cs1Instructions[var1]; - int var3 = 0; - int var4 = 0; - byte var5 = 0; - - while (true) { - int var6 = var2[var4++]; - int var7 = 0; - byte var8 = 0; - if (var6 == 0) { - return var3; - } - - if (var6 == 1) { - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = class33.widgetDefinition.method1740(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!class214.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 += var10.field3079[var12]; - } - } - } - } - - if (var6 == 5) { - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { - var7 = TextureProvider.localPlayer.combatLevel; - } - - if (var6 == 9) { - for (var9 = 0; var9 < 25; ++var9) { - if (Skills.Skills_enabled[var9]) { - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = class33.widgetDefinition.method1740(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!class214.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 = 999999999; - break; - } - } - } - } - - if (var6 == 11) { - var7 = Client.runEnergy; - } - - if (var6 == 12) { - var7 = Client.weight; - } - - if (var6 == 13) { - var9 = Varps.Varps_main[var2[var4++]]; - int var13 = var2[var4++]; - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; - } - - if (var6 == 14) { - var9 = var2[var4++]; - var7 = class36.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = (TextureProvider.localPlayer.x >> 7) + class20.baseX; - } - - if (var6 == 19) { - var7 = (TextureProvider.localPlayer.y >> 7) + class19.baseY; - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 == 0) { - if (var5 == 0) { - var3 += var7; - } - - if (var5 == 1) { - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { - var3 /= var7; - } - - if (var5 == 3) { - var3 *= var7; - } - - var5 = 0; - } else { - var5 = var8; - } - } - } catch (Exception var14) { - return -1; + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; + int[] var3 = new int[4]; + var2[0] = var0; + var3[0] = var1; + int var4 = 1; + + for (int var5 = 0; var5 < 4; ++var5) { + if (World.World_sortOption1[var5] != var0) { + var2[var4] = World.World_sortOption1[var5]; + var3[var4] = World.World_sortOption2[var5]; + ++var4; } - } else { - return -2; } + + World.World_sortOption1 = var2; + World.World_sortOption2 = var3; + class181.sortWorlds(class361.World_worlds, 0, class361.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); } } \ No newline at end of file diff --git a/osrs/src/main/java/Varcs.java b/osrs/src/main/java/Varcs.java index 78b88ec55..0969445ff 100644 --- a/osrs/src/main/java/Varcs.java +++ b/osrs/src/main/java/Varcs.java @@ -9,56 +9,57 @@ import java.util.Map; import java.util.Map.Entry; -@ObfuscatedName("ek") +@ObfuscatedName("em") @Implements("Varcs") public class Varcs { - @ObfuscatedName("df") - @ObfuscatedSignature( - descriptor = "Lun;" - ) - static IndexedSprite field1138; - @ObfuscatedName("ak") + @ObfuscatedName("jw") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("lf") + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("ar") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("map") Map map; /** @deprecated */ @Deprecated - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("strings") String[] strings; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("ar") - long field1143; + @ObfuscatedName("aa") + long field1152; Varcs() { this.unwrittenChanges = false; - int var1 = SoundSystem.archive2.getGroupFileCount(19); + int var1 = class344.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; int var2; for (var2 = 0; var2 < var1; ++var2) { - VarcInt var3 = Client.method353(var2); + VarcInt var3 = class140.method750(var2); this.intsPersistence[var2] = var3.persist; } var2 = 0; - if (SoundSystem.archive2.method1927(15)) { - var2 = SoundSystem.archive2.getGroupFileCount(15); + if (class344.archive2.method1923(15)) { + var2 = class344.archive2.getGroupFileCount(15); } this.strings = new String[var2]; this.read(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "122334652" + garbageValue = "-1897497270" ) @Export("setInt") void setInt(int var1, int var2) { @@ -69,10 +70,10 @@ void setInt(int var1, int var2) { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-72" + descriptor = "(II)I", + garbageValue = "-1991515717" ) @Export("getInt") int getInt(int var1) { @@ -80,20 +81,20 @@ int getInt(int var1) { return var2 instanceof Integer ? (Integer)var2 : -1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-1655952111" + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "-59" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1561446610" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "32" ) @Export("getString") String getString(int var1) { @@ -103,10 +104,10 @@ String getString(int var1) { /** @deprecated */ @Deprecated - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1584969503" + garbageValue = "-1603974039" ) @Export("setStringOld") void setStringOld(int var1, String var2) { @@ -115,20 +116,20 @@ void setStringOld(int var1, String var2) { /** @deprecated */ @Deprecated - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(IB)Ljava/lang/String;", - garbageValue = "12" + garbageValue = "0" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-109" + descriptor = "(I)V", + garbageValue = "19136992" ) @Export("clearTransient") void clearTransient() { @@ -145,20 +146,20 @@ void clearTransient() { } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(ZI)Lto;", - garbageValue = "-1600709615" + garbageValue = "-1859436086" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return class17.getPreferencesFile("2", UrlRequester.field1163.name, var1); + return class131.getPreferencesFile("2", Messages.field1156.name, var1); } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1883242657" + garbageValue = "-2104867526" ) @Export("write") void write() { @@ -178,7 +179,7 @@ void write() { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += class478.stringCp1252NullTerminatedByteSize((String)var7); + var2 += ClanChannel.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; @@ -196,15 +197,15 @@ void write() { if (this.intsPersistence[var16]) { var26.writeShort(var16); Object var8 = var15.getValue(); - class517 var9 = class517.method2529(var8.getClass()); - var26.writeByte(var9.field4132); + class514 var9 = class514.method2504(var8.getClass()); + var26.writeByte(var9.field4128); Class var11 = var8.getClass(); - class517 var12 = class517.method2529(var11); + class514 var12 = class514.method2504(var11); if (var12 == null) { throw new IllegalArgumentException(); } - class513 var10 = var12.field4135; + class510 var10 = var12.field4131; var10.vmethod8274(var8, var26); } } @@ -220,130 +221,132 @@ void write() { } this.unwrittenChanges = false; - this.field1143 = GrandExchangeOfferTotalQuantityComparator.method1971(); + this.field1152 = SpotAnimationDefinition.method962(); } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-16884896" + descriptor = "(B)V", + garbageValue = "121" ) @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); - label234: { - try { - byte[] var2 = new byte[(int)var1.length()]; + try { + byte[] var2 = new byte[(int)var1.length()]; - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var1.read(var2, var3, var2.length - var3); - if (var4 == -1) { - throw new EOFException(); - } + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { + var4 = var1.read(var2, var3, var2.length - var3); + if (var4 == -1) { + throw new EOFException(); } + } - Buffer var14 = new Buffer(var2); - if (var14.array.length - var14.offset >= 1) { - int var15 = var14.readUnsignedByte(); - if (var15 >= 0 && var15 <= 2) { - int var7; - int var8; - int var9; - int var16; - if (var15 >= 2) { - var16 = var14.readUnsignedShort(); - var7 = 0; - - while (true) { - if (var7 >= var16) { - break label234; - } - - var8 = var14.readUnsignedShort(); - var9 = var14.readUnsignedByte(); - class517 var10 = (class517)SequenceDefinition.findEnumerated(class517.method2528(), var9); - Object var11 = var10.method2532(var14); - if (var8 >= 0 && var8 < this.intsPersistence.length && this.intsPersistence[var8]) { - this.map.put(var8, var11); - } - - ++var7; - } - } else { - var16 = var14.readUnsignedShort(); - - for (var7 = 0; var7 < var16; ++var7) { - var8 = var14.readUnsignedShort(); - var9 = var14.readInt(); - if (var8 >= 0 && var8 < this.intsPersistence.length && this.intsPersistence[var8]) { - this.map.put(var8, var9); - } - } - - var7 = var14.readUnsignedShort(); - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label234; - } - - var14.readUnsignedShort(); - var14.readStringCp1252NullTerminated(); - ++var8; - } - } - } + Buffer var14 = new Buffer(var2); + if (var14.array.length - var14.offset < 1) { + return; + } - return; + int var15 = var14.readUnsignedByte(); + if (var15 < 0 || var15 > 2) { + return; + } + + int var7; + int var8; + int var9; + int var16; + if (var15 >= 2) { + var16 = var14.readUnsignedShort(); + + for (var7 = 0; var7 < var16; ++var7) { + var8 = var14.readUnsignedShort(); + var9 = var14.readUnsignedByte(); + class514 var10 = (class514)class12.findEnumerated(class514.method2503(), var9); + Object var11 = var10.method2506(var14); + if (var8 >= 0 && var8 < this.intsPersistence.length && this.intsPersistence[var8]) { + this.map.put(var8, var11); + } } - } catch (Exception var25) { - break label234; - } finally { - try { - var1.close(); - } catch (Exception var24) { + } else { + var16 = var14.readUnsignedShort(); + + for (var7 = 0; var7 < var16; ++var7) { + var8 = var14.readUnsignedShort(); + var9 = var14.readInt(); + if (var8 >= 0 && var8 < this.intsPersistence.length && this.intsPersistence[var8]) { + this.map.put(var8, var9); + } } + var7 = var14.readUnsignedShort(); + + for (var8 = 0; var8 < var7; ++var8) { + var14.readUnsignedShort(); + var14.readStringCp1252NullTerminated(); + } + } + } catch (Exception var25) { + } finally { + try { + var1.close(); + } catch (Exception var24) { } - return; } this.unwrittenChanges = false; } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-409824509" + garbageValue = "1055402619" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1143 < GrandExchangeOfferTotalQuantityComparator.method1971() - 60000L) { + if (this.unwrittenChanges && this.field1152 < SpotAnimationDefinition.method962() - 60000L) { this.write(); } } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1882993315" + descriptor = "(B)Z", + garbageValue = "3" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; } - @ObfuscatedName("ac") + @ObfuscatedName("lg") @ObfuscatedSignature( - descriptor = "(Lom;I)V", - garbageValue = "-1336759241" + descriptor = "(IIIIII)V", + garbageValue = "2070284698" ) - public static void method625(AbstractArchive var0) { - DbRowType.field4144 = var0; + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + class31.scrollBarSprites[0].drawAt(var0, var1); + class31.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field461); + int var5 = var3 * (var3 - 32) / var4; + if (var5 < 8) { + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field458); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field457); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field457); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field457); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field457); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field459); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field459); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field459); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field459); } } \ No newline at end of file diff --git a/osrs/src/main/java/VarpDefinition.java b/osrs/src/main/java/VarpDefinition.java index 3389a7689..fdf38acb8 100644 --- a/osrs/src/main/java/VarpDefinition.java +++ b/osrs/src/main/java/VarpDefinition.java @@ -3,24 +3,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ha") +@ObfuscatedName("gv") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("VarpDefinition_archive") - public static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("al") - public static int field1501; - @ObfuscatedName("ak") + static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("ah") + public static int field1443; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("VarpDefinition_cached") static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("ax") + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "[Lup;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "[Luz;" + ) + @Export("crossSprites") + static SpritePixels[] crossSprites; + @ObfuscatedName("ao") @Export("type") public int type; @@ -32,10 +44,10 @@ public class VarpDefinition extends DualNode { this.type = 0; } - @ObfuscatedName("al") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "1806040188" + descriptor = "(Luj;B)V", + garbageValue = "-51" ) @Export("decode") void decode(Buffer var1) { @@ -49,10 +61,10 @@ void decode(Buffer var1) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;IS)V", - garbageValue = "4095" + descriptor = "(Luj;II)V", + garbageValue = "-521810807" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -62,41 +74,12 @@ void decodeNext(Buffer var1, int var2) { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIII)V", - garbageValue = "445766054" + descriptor = "(IIII)I", + garbageValue = "-634068040" ) - @Export("sortItemsByName") - static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - short var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - short var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - sortItemsByName(var0, var1, var2, var5 - 1); - sortItemsByName(var0, var1, var5 + 1, var3); - } - + static int method886(int var0, int var1, int var2) { + return var0 << 28 | var1 << 14 | var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/Varps.java b/osrs/src/main/java/Varps.java index 8b7ac07b0..2352c4d08 100644 --- a/osrs/src/main/java/Varps.java +++ b/osrs/src/main/java/Varps.java @@ -3,24 +3,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("md") +@ObfuscatedName("mg") @Implements("Varps") public class Varps { - @ObfuscatedName("wl") - @ObfuscatedSignature( - descriptor = "Lox;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("Varps_main") public static int[] Varps_main; + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "Lup;" + ) + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; static { Varps_masks = new int[32]; @@ -34,52 +34,4 @@ public class Varps { Varps_temp = new int[5000]; Varps_main = new int[5000]; } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "-62" - ) - static int method1735(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == 2700) { - var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == 2701) { - var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 2702) { - int var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); - if (var4 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 2706) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; - } else if (var0 == 2707) { - var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method1867() ? 1 : 0; - return 1; - } else if (var0 == 2708) { - var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return class110.method624(var3); - } else if (var0 == 2709) { - var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return Canvas.method88(var3); - } else { - return 2; - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/VertexNormal.java b/osrs/src/main/java/VertexNormal.java index d61983e8a..a57468304 100644 --- a/osrs/src/main/java/VertexNormal.java +++ b/osrs/src/main/java/VertexNormal.java @@ -3,26 +3,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.awt.*; -import java.awt.Desktop.Action; -import java.net.URI; - -@ObfuscatedName("jp") +@ObfuscatedName("ky") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("ao") - @Export("Tiles_overlays") - static short[][][] Tiles_overlays; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("x") int x; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("y") int y; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("z") int z; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("magnitude") int magnitude; @@ -30,7 +23,7 @@ public class VertexNormal { } @ObfuscatedSignature( - descriptor = "(Ljp;)V" + descriptor = "(Lky;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; @@ -39,32 +32,59 @@ public class VertexNormal { this.magnitude = var1.magnitude; } - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZI)V", - garbageValue = "-2141219999" + descriptor = "(Lol;B)V", + garbageValue = "-54" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - if (var1) { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { - try { - Desktop.getDesktop().browse(new URI(var0)); - return; - } catch (Exception var4) { - } - } + public static void method1567(AbstractArchive var0) { + ParamComposition.ParamDefinition_archive = var0; + } - if (class31.field84.startsWith("win")) { - Friend.method2242(var0, 0, "openjs"); - } else if (class31.field84.startsWith("mac")) { - Friend.method2242(var0, 1, "openjs"); - } else { - Friend.method2242(var0, 2, "openjs"); - } + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lol;IIB)[Luz;", + garbageValue = "-73" + ) + public static SpritePixels[] method1568(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); + boolean var3; + if (var4 == null) { + var3 = false; } else { - Friend.method2242(var0, 3, "openjs"); + class162.SpriteBuffer_decode(var4); + var3 = true; } + if (!var3) { + return null; + } else { + SpritePixels[] var5 = new SpritePixels[class541.SpriteBuffer_spriteCount]; + + for (int var6 = 0; var6 < class541.SpriteBuffer_spriteCount; ++var6) { + SpritePixels var7 = var5[var6] = new SpritePixels(); + var7.width = class541.SpriteBuffer_spriteWidth; + var7.height = GrandExchangeOfferWorldComparator.SpriteBuffer_spriteHeight; + var7.xOffset = class541.SpriteBuffer_xOffsets[var6]; + var7.yOffset = class541.SpriteBuffer_yOffsets[var6]; + var7.subWidth = class541.SpriteBuffer_spriteWidths[var6]; + var7.subHeight = class520.SpriteBuffer_spriteHeights[var6]; + int var8 = var7.subHeight * var7.subWidth; + byte[] var9 = class396.SpriteBuffer_pixels[var6]; + var7.pixels = new int[var8]; + + for (int var10 = 0; var10 < var8; ++var10) { + var7.pixels[var10] = class541.SpriteBuffer_spritePalette[var9[var10] & 255]; + } + } + + class541.SpriteBuffer_xOffsets = null; + class541.SpriteBuffer_yOffsets = null; + class541.SpriteBuffer_spriteWidths = null; + class520.SpriteBuffer_spriteHeights = null; + class541.SpriteBuffer_spritePalette = null; + class396.SpriteBuffer_pixels = null; + return var5; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/VerticalAlignment.java b/osrs/src/main/java/VerticalAlignment.java index 5c896ae7c..fea7627ce 100644 --- a/osrs/src/main/java/VerticalAlignment.java +++ b/osrs/src/main/java/VerticalAlignment.java @@ -3,38 +3,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Iterator; - -@ObfuscatedName("hr") +@ObfuscatedName("hg") @Implements("VerticalAlignment") -public enum VerticalAlignment implements class386 { - @ObfuscatedName("ac") +public enum VerticalAlignment implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lhg;" ) - field1643(1, 0), - @ObfuscatedName("al") + field1581(2, 0), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lhg;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(0, 1), - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lhg;" ) - field1644(2, 2); + field1580(1, 2); - @ObfuscatedName("tb") - @ObfuscatedSignature( - descriptor = "Lgi;" - ) - @Export("guestClanSettings") - static ClanSettings guestClanSettings; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("value") public final int value; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("id") final int id; @@ -43,61 +35,80 @@ public enum VerticalAlignment implements class386 { this.id = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("co") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "900742897" + descriptor = "(I)[Lnt;", + garbageValue = "1599103276" ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (class33.widgetDefinition.loadInterface(var0)) { - Widget[] var1 = class33.widgetDefinition.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3.onLoad != null) { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onLoad; - ArchiveDisk.runScript(var4, 5000000, 0); - } - } + public static StudioGame[] method955() { + return new StudioGame[]{StudioGame.game5, StudioGame.stellardawn, StudioGame.oldscape, StudioGame.game3, StudioGame.runescape, StudioGame.game4}; + } + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IS)Lhw;", + garbageValue = "4625" + ) + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); + var1 = new NPCComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); } + + var1.postDecode(); + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("na") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1054734987" + descriptor = "(ILdt;ZI)I", + garbageValue = "-2145020206" ) - static final void method1027() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsFriend(); - } - - Iterator var2 = Messages.Messages_hashTable.iterator(); + static int method959(int var0, Script var1, boolean var2) { + return 2; + } - while (var2.hasNext()) { - Message var3 = (Message)var2.next(); - var3.clearIsFromFriend(); + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-52" + ) + static final void method958(boolean var0) { + if (var0) { + Client.field419 = Login.field744 ? class124.field1205 : class124.field1206; + } else { + Client.field419 = WorldMapIcon_1.clientPreferences.method565(Login.Login_username) ? class124.field1208 : class124.field1207; } - if (class358.friendsChat != null) { - class358.friendsChat.clearFriends(); + } + + @ObfuscatedName("oh") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-66" + ) + static void method960() { + if (Client.oculusOrbState == 1) { + Client.oculusOrbOnLocalPlayer = true; } } diff --git a/osrs/src/main/java/ViewportMouse.java b/osrs/src/main/java/ViewportMouse.java index b9c2c9fa5..43d1fa553 100644 --- a/osrs/src/main/java/ViewportMouse.java +++ b/osrs/src/main/java/ViewportMouse.java @@ -3,35 +3,39 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("netscape/js") +@ObfuscatedName("kb") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("ViewportMouse_isInViewport") static boolean ViewportMouse_isInViewport; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("ViewportMouse_x") static int ViewportMouse_x; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("ViewportMouse_y") static int ViewportMouse_y; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("ViewportMouse_false0") static boolean ViewportMouse_false0; - @ObfuscatedName("ao") - static int field2264; - @ObfuscatedName("ah") - static int field2260; - @ObfuscatedName("am") - static int field2263; - @ObfuscatedName("av") - static int field2265; - @ObfuscatedName("ay") - @Export("ViewportMouse_entityCount") - public static int ViewportMouse_entityCount; + @ObfuscatedName("au") + @Export("Tiles_shapes") + static byte[][][] Tiles_shapes; + @ObfuscatedName("az") + static int field2433; + @ObfuscatedName("ap") + static int field2429; + @ObfuscatedName("ax") + static int field2432; @ObfuscatedName("as") + @Export("ViewportMouse_entityCount") + static int ViewportMouse_entityCount; + @ObfuscatedName("ay") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; + @ObfuscatedName("kx") + @Export("cameraX") + static int cameraX; static { ViewportMouse_isInViewport = false; @@ -42,134 +46,13 @@ public class ViewportMouse { ViewportMouse_entityTags = new long[1000]; } - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-527981427" - ) - static int method1389(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return class168.method878(var0, var1, var2); - } else if (var0 < 1100) { - return ClientPreferences.method567(var0, var1, var2); - } else if (var0 < 1200) { - return class17.method56(var0, var1, var2); - } else if (var0 < 1300) { - return class76.method432(var0, var1, var2); - } else if (var0 < 1400) { - return class4.method6(var0, var1, var2); - } else if (var0 < 1500) { - return class31.method127(var0, var1, var2); - } else if (var0 < 1600) { - return class87.method462(var0, var1, var2); - } else if (var0 < 1700) { - return class134.method725(var0, var1, var2); - } else if (var0 < 1800) { - return class202.method1004(var0, var1, var2); - } else if (var0 < 1900) { - return class13.method42(var0, var1, var2); - } else if (var0 < 2000) { - return class20.method77(var0, var1, var2); - } else if (var0 < 2100) { - return ClientPreferences.method567(var0, var1, var2); - } else if (var0 < 2200) { - return class17.method56(var0, var1, var2); - } else if (var0 < 2300) { - return class76.method432(var0, var1, var2); - } else if (var0 < 2400) { - return class4.method6(var0, var1, var2); - } else if (var0 < 2500) { - return class31.method127(var0, var1, var2); - } else if (var0 < 2600) { - return class30.method123(var0, var1, var2); - } else if (var0 < 2700) { - return DevicePcmPlayerProvider.method86(var0, var1, var2); - } else if (var0 < 2800) { - return Varps.method1735(var0, var1, var2); - } else if (var0 < 2900) { - return ClientPacket.method1640(var0, var1, var2); - } else if (var0 < 3000) { - return class20.method77(var0, var1, var2); - } else if (var0 < 3200) { - return class266.method1430(var0, var1, var2); - } else if (var0 < 3300) { - return class133.method722(var0, var1, var2); - } else if (var0 < 3400) { - return Frames.method1339(var0, var1, var2); - } else if (var0 < 3500) { - return Buddy.method2285(var0, var1, var2); - } else if (var0 < 3600) { - return WorldMapElement.method971(var0, var1, var2); - } else if (var0 < 3700) { - return ReflectionCheck.method184(var0, var1, var2); - } else if (var0 < 3800) { - return class470.method2363(var0, var1, var2); - } else if (var0 < 3900) { - return class13.method43(var0, var1, var2); - } else if (var0 < 4000) { - return class74.method427(var0, var1, var2); - } else if (var0 < 4100) { - return KitDefinition.method986(var0, var1, var2); - } else if (var0 < 4200) { - return class141.method752(var0, var1, var2); - } else if (var0 < 4300) { - return class18.method65(var0, var1, var2); - } else if (var0 < 5100) { - return Projectile.method439(var0, var1, var2); - } else if (var0 < 5400) { - return PlayerComposition.method1761(var0, var1, var2); - } else if (var0 < 5600) { - return ObjectSound.method416(var0, var1, var2); - } else if (var0 < 5700) { - return HealthBarUpdate.method524(var0, var1, var2); - } else if (var0 < 6300) { - return WorldMapAreaData.method1601(var0, var1, var2); - } else if (var0 < 6600) { - return class319.method1660(var0, var1, var2); - } else if (var0 < 6700) { - return GrandExchangeOfferNameComparator.method1980(var0, var1, var2); - } else if (var0 < 6800) { - return class330.method1729(var0, var1, var2); - } else if (var0 < 6900) { - return class169.method881(var0, var1, var2); - } else if (var0 < 7000) { - return class104.method606(var0, var1, var2); - } else if (var0 < 7100) { - return class224.method1141(var0, var1, var2); - } else if (var0 < 7200) { - return class17.method57(var0, var1, var2); - } else if (var0 < 7300) { - return MouseHandler.method179(var0, var1, var2); - } else if (var0 < 7500) { - return class472.method2371(var0, var1, var2); - } else if (var0 < 7600) { - return DynamicObject.method451(var0, var1, var2); - } else if (var0 < 7700) { - return class150.method789(var0, var1, var2); - } else { - return var0 < 8100 ? class4.method7(var0, var1, var2) : 2; - } - } - - @ObfuscatedName("be") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ILnm;IIIII[FI)Lnm;", - garbageValue = "-357368567" + descriptor = "(Lol;I)V", + garbageValue = "181873849" ) - static Widget method1390(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) { - Widget var8 = new Widget(); - var8.type = var0; - var8.parentId = var1.id; - var8.childIndex = var2; - var8.isIf3 = true; - var8.xAlignment = var3; - var8.yAlignment = var4; - var8.widthAlignment = var5; - var8.heightAlignment = var6; - var8.rawX = (int)(var7[0] * (float)var1.width); - var8.rawY = (int)((float)var1.height * var7[1]); - var8.rawWidth = (int)(var7[2] * (float)var1.width); - var8.rawHeight = (int)((float)var1.height * var7[3]); - return var8; + public static void method1566(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; + VarpDefinition.field1443 = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); } } \ No newline at end of file diff --git a/osrs/src/main/java/VorbisCodebook.java b/osrs/src/main/java/VorbisCodebook.java index 89594614e..d8700fd63 100644 --- a/osrs/src/main/java/VorbisCodebook.java +++ b/osrs/src/main/java/VorbisCodebook.java @@ -3,79 +3,79 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("cf") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("ac") - int field254; - @ObfuscatedName("al") + @ObfuscatedName("at") + int field252; + @ObfuscatedName("ah") @Export("entries") int entries; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("ax") - int[] field258; @ObfuscatedName("ao") - float[][] field253; - @ObfuscatedName("ah") + int[] field253; + @ObfuscatedName("ab") + float[][] field250; + @ObfuscatedName("au") @Export("keys") int[] keys; VorbisCodebook() { - class60 var1 = VorbisSample.field267; - var1.method327(24); - this.field254 = var1.method327(16); - this.entries = var1.method327(24); + class60 var1 = VorbisSample.field264; + var1.method335(24); + this.field252 = var1.method335(16); + this.entries = var1.method335(24); this.lengthMap = new int[this.entries]; - boolean var2 = var1.method328() != 0; + boolean var2 = var1.method336() != 0; int var3; int var4; int var6; if (var2) { var3 = 0; - for (var4 = var1.method327(5) + 1; var3 < this.entries; ++var4) { - int var5 = var1.method327(class172.iLog(this.entries - var3)); + for (var4 = var1.method335(5) + 1; var3 < this.entries; ++var4) { + int var5 = var1.method335(LoginScreenAnimation.iLog(this.entries - var3)); for (var6 = 0; var6 < var5; ++var6) { this.lengthMap[var3++] = var4; } } } else { - boolean var15 = var1.method328() != 0; + boolean var15 = var1.method336() != 0; for (var4 = 0; var4 < this.entries; ++var4) { - if (var15 && var1.method328() == 0) { + if (var15 && var1.method336() == 0) { this.lengthMap[var4] = 0; } else { - this.lengthMap[var4] = var1.method327(5) + 1; + this.lengthMap[var4] = var1.method335(5) + 1; } } } - this.method295(); - var3 = var1.method327(4); + this.method300(); + var3 = var1.method335(4); if (var3 > 0) { - float var16 = VorbisSample.float32Unpack(var1.method327(32)); - float var17 = VorbisSample.float32Unpack(var1.method327(32)); - var6 = var1.method327(4) + 1; - boolean var7 = var1.method328() != 0; + float var16 = VorbisSample.float32Unpack(var1.method335(32)); + float var17 = VorbisSample.float32Unpack(var1.method335(32)); + var6 = var1.method335(4) + 1; + boolean var7 = var1.method336() != 0; int var8; if (var3 == 1) { - var8 = mapType1QuantValues(this.entries, this.field254); + var8 = mapType1QuantValues(this.entries, this.field252); } else { - var8 = this.entries * this.field254; + var8 = this.entries * this.field252; } - this.field258 = new int[var8]; + this.field253 = new int[var8]; int var9; for (var9 = 0; var9 < var8; ++var9) { - this.field258[var9] = var1.method327(var6); + this.field253[var9] = var1.method335(var6); } - this.field253 = new float[this.entries][this.field254]; + this.field250 = new float[this.entries][this.field252]; float var10; int var11; int var12; @@ -84,10 +84,10 @@ public class VorbisCodebook { var10 = 0.0F; var11 = 1; - for (var12 = 0; var12 < this.field254; ++var12) { + for (var12 = 0; var12 < this.field252; ++var12) { int var13 = var9 / var11 % var8; - float var14 = (float)this.field258[var13] * var17 + var16 + var10; - this.field253[var9][var12] = var14; + float var14 = (float)this.field253[var13] * var17 + var16 + var10; + this.field250[var9][var12] = var14; if (var7) { var10 = var14; } @@ -98,11 +98,11 @@ public class VorbisCodebook { } else { for (var9 = 0; var9 < this.entries; ++var9) { var10 = 0.0F; - var11 = var9 * this.field254; + var11 = var9 * this.field252; - for (var12 = 0; var12 < this.field254; ++var12) { - float var18 = (float)this.field258[var11] * var17 + var16 + var10; - this.field253[var9][var12] = var18; + for (var12 = 0; var12 < this.field252; ++var12) { + float var18 = (float)this.field253[var11] * var17 + var16 + var10; + this.field250[var9][var12] = var18; if (var7) { var10 = var18; } @@ -115,8 +115,8 @@ public class VorbisCodebook { } - @ObfuscatedName("al") - void method295() { + @ObfuscatedName("ah") + void method300() { int[] var1 = new int[this.entries]; int[] var2 = new int[33]; @@ -209,33 +209,56 @@ void method295() { } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lcz;)I" + descriptor = "(Lcw;)I" ) - int method296(class60 var1) { + int method301(class60 var1) { int var2; - for (var2 = 0; this.keys[var2] >= 0; var2 = var1.method328() != 0 ? this.keys[var2] : var2 + 1) { + for (var2 = 0; this.keys[var2] >= 0; var2 = var1.method336() != 0 ? this.keys[var2] : var2 + 1) { } return ~this.keys[var2]; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lcz;)[F" + descriptor = "(Lcw;)[F" ) - float[] method297(class60 var1) { - return this.field253[this.method296(var1)]; + float[] method302(class60 var1) { + return this.field250[this.method301(var1)]; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; class186.method949(var2, var1) > var0; --var2) { - } + int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; + + while (true) { + int var4 = var2; + int var5 = var1; + + int var6; + for (var6 = 1; var5 > 1; var5 >>= 1) { + if ((var5 & 1) != 0) { + var6 *= var4; + } - return var2; + var4 *= var4; + } + + int var3; + if (var5 == 1) { + var3 = var4 * var6; + } else { + var3 = var6; + } + + if (var3 <= var0) { + return var2; + } + + --var2; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/VorbisFloor.java b/osrs/src/main/java/VorbisFloor.java index 1717aeeae..b343de576 100644 --- a/osrs/src/main/java/VorbisFloor.java +++ b/osrs/src/main/java/VorbisFloor.java @@ -3,84 +3,84 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("bu") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("ac") - static final int[] field171; - @ObfuscatedName("al") + @ObfuscatedName("at") + static final int[] field170; + @ObfuscatedName("ah") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("ak") + @ObfuscatedName("ar") int[] field175; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("multiplier") int multiplier; - @ObfuscatedName("ao") - int[] field176; - @ObfuscatedName("ah") - int[] field174; - @ObfuscatedName("ar") - int[] field177; @ObfuscatedName("ab") int[] field173; - @ObfuscatedName("am") - int[][] field178; + @ObfuscatedName("au") + int[] field176; + @ObfuscatedName("aa") + int[] field172; + @ObfuscatedName("ac") + int[] field174; + @ObfuscatedName("al") + int[][] field177; static { - field171 = new int[]{256, 128, 86, 64}; + field170 = new int[]{256, 128, 86, 64}; VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; } VorbisFloor() { - class60 var1 = VorbisSample.field267; - int var2 = var1.method327(16); + class60 var1 = VorbisSample.field264; + int var2 = var1.method335(16); if (var2 != 1) { throw new RuntimeException(); } else { - int var3 = var1.method327(5); + int var3 = var1.method335(5); int var4 = 0; - this.field176 = new int[var3]; + this.field173 = new int[var3]; int var5; int var6; for (var5 = 0; var5 < var3; ++var5) { - var6 = var1.method327(4); - this.field176[var5] = var6; + var6 = var1.method335(4); + this.field173[var5] = var6; if (var6 >= var4) { var4 = var6 + 1; } } + this.field176 = new int[var4]; + this.field172 = new int[var4]; this.field174 = new int[var4]; - this.field177 = new int[var4]; - this.field173 = new int[var4]; - this.field178 = new int[var4][]; + this.field177 = new int[var4][]; int var8; for (var5 = 0; var5 < var4; ++var5) { - this.field174[var5] = var1.method327(3) + 1; - var6 = this.field177[var5] = var1.method327(2); + this.field176[var5] = var1.method335(3) + 1; + var6 = this.field172[var5] = var1.method335(2); if (var6 != 0) { - this.field173[var5] = var1.method327(8); + this.field174[var5] = var1.method335(8); } var6 = 1 << var6; int[] var10 = new int[var6]; - this.field178[var5] = var10; + this.field177[var5] = var10; for (var8 = 0; var8 < var6; ++var8) { - var10[var8] = var1.method327(8) - 1; + var10[var8] = var1.method335(8) - 1; } } - this.multiplier = var1.method327(2) + 1; - var5 = var1.method327(4); + this.multiplier = var1.method335(2) + 1; + var5 = var1.method335(4); var6 = 2; int var7; for (var7 = 0; var7 < var3; ++var7) { - var6 += this.field174[this.field176[var7]]; + var6 += this.field176[this.field173[var7]]; } this.field175 = new int[var6]; @@ -89,18 +89,18 @@ public class VorbisFloor { var6 = 2; for (var7 = 0; var7 < var3; ++var7) { - var8 = this.field176[var7]; + var8 = this.field173[var7]; - for (int var9 = 0; var9 < this.field174[var8]; ++var9) { - this.field175[var6++] = var1.method327(var5); + for (int var9 = 0; var9 < this.field176[var8]; ++var9) { + this.field175[var6++] = var1.method335(var5); } } } } - @ObfuscatedName("ac") - int method202(int[] var1, int var2) { + @ObfuscatedName("at") + int method205(int[] var1, int var2) { int var3 = var1[var2]; int var4 = -1; int var5 = Integer.MIN_VALUE; @@ -116,8 +116,8 @@ int method202(int[] var1, int var2) { return var4; } - @ObfuscatedName("al") - int method203(int[] var1, int var2) { + @ObfuscatedName("ah") + int method206(int[] var1, int var2) { int var3 = var1[var2]; int var4 = -1; int var5 = Integer.MAX_VALUE; @@ -133,8 +133,8 @@ int method203(int[] var1, int var2) { return var4; } - @ObfuscatedName("ak") - int method204(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ar") + int method207(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; int var7 = var3 - var1; int var8 = var6 < 0 ? -var6 : var6; @@ -143,8 +143,8 @@ int method204(int var1, int var2, int var3, int var4, int var5) { return var6 < 0 ? var2 - var10 : var10 + var2; } - @ObfuscatedName("ax") - void method205(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("ao") + void method208(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; int var8 = var3 - var1; int var9 = var7 < 0 ? -var7 : var7; @@ -172,48 +172,48 @@ void method205(int var1, int var2, int var3, int var4, float[] var5, int var6) { } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lcz;)Lcy;" + descriptor = "(Lcw;)Lct;" ) - class59 method206(class60 var1) { - boolean var2 = var1.method328() != 0; + class59 method209(class60 var1) { + boolean var2 = var1.method336() != 0; if (!var2) { return new class59(this, false, (int[])null, (int[])null, (boolean[])null); } else { class59 var3 = new class59(this, true, (int[])null, (int[])null, (boolean[])null); int var4 = this.field175.length; - if (var3.field313 == null || var3.field313.length < var4) { - var3.field313 = new int[var4]; - var3.field314 = new int[var4]; - var3.field312 = new boolean[var4]; + if (var3.field307 == null || var3.field307.length < var4) { + var3.field307 = new int[var4]; + var3.field306 = new int[var4]; + var3.field304 = new boolean[var4]; } int var5; for (var5 = 0; var5 < var4; ++var5) { - var3.field313[var5] = this.field175[var5]; + var3.field307[var5] = this.field175[var5]; } - var5 = field171[this.multiplier - 1]; - int var6 = class172.iLog(var5 - 1); - var3.field314[0] = var1.method327(var6); - var3.field314[1] = var1.method327(var6); + var5 = field170[this.multiplier - 1]; + int var6 = LoginScreenAnimation.iLog(var5 - 1); + var3.field306[0] = var1.method335(var6); + var3.field306[1] = var1.method335(var6); int var7 = 2; - for (int var8 = 0; var8 < this.field176.length; ++var8) { - int var9 = this.field176[var8]; - int var10 = this.field174[var9]; - int var11 = this.field177[var9]; + for (int var8 = 0; var8 < this.field173.length; ++var8) { + int var9 = this.field173[var8]; + int var10 = this.field176[var9]; + int var11 = this.field172[var9]; int var12 = (1 << var11) - 1; int var13 = 0; if (var11 > 0) { - var13 = VorbisSample.field266[this.field173[var9]].method296(var1); + var13 = VorbisSample.field263[this.field174[var9]].method301(var1); } for (int var14 = 0; var14 < var10; ++var14) { - int var15 = this.field178[var9][var13 & var12]; + int var15 = this.field177[var9][var13 & var12]; var13 >>>= var11; - var3.field314[var7++] = var15 >= 0 ? VorbisSample.field266[var15].method296(var1) : 0; + var3.field306[var7++] = var15 >= 0 ? VorbisSample.field263[var15].method301(var1) : 0; } } diff --git a/osrs/src/main/java/VorbisMapping.java b/osrs/src/main/java/VorbisMapping.java index 088db9f16..8fb4b6b81 100644 --- a/osrs/src/main/java/VorbisMapping.java +++ b/osrs/src/main/java/VorbisMapping.java @@ -1,38 +1,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bq") +@ObfuscatedName("br") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("ac") - int field249; - @ObfuscatedName("al") - int field250; - @ObfuscatedName("ak") - int[] field251; - @ObfuscatedName("ax") - int[] field252; + @ObfuscatedName("at") + int field247; + @ObfuscatedName("ah") + int field246; + @ObfuscatedName("ar") + int[] field249; + @ObfuscatedName("ao") + int[] field248; VorbisMapping() { - class60 var1 = VorbisSample.field267; - var1.method327(16); - this.field249 = var1.method328() != 0 ? var1.method327(4) + 1 : 1; - if (var1.method328() != 0) { - var1.method327(8); + class60 var1 = VorbisSample.field264; + var1.method335(16); + this.field247 = var1.method336() != 0 ? var1.method335(4) + 1 : 1; + if (var1.method336() != 0) { + var1.method335(8); } - var1.method327(2); - if (this.field249 > 1) { - this.field250 = var1.method327(4); + var1.method335(2); + if (this.field247 > 1) { + this.field246 = var1.method335(4); } - this.field251 = new int[this.field249]; - this.field252 = new int[this.field249]; + this.field249 = new int[this.field247]; + this.field248 = new int[this.field247]; - for (int var2 = 0; var2 < this.field249; ++var2) { - var1.method327(8); - this.field251[var2] = var1.method327(8); - this.field252[var2] = var1.method327(8); + for (int var2 = 0; var2 < this.field247; ++var2) { + var1.method335(8); + this.field249[var2] = var1.method335(8); + this.field248[var2] = var1.method335(8); } } diff --git a/osrs/src/main/java/VorbisSample.java b/osrs/src/main/java/VorbisSample.java index 81e132285..2e76c9490 100644 --- a/osrs/src/main/java/VorbisSample.java +++ b/osrs/src/main/java/VorbisSample.java @@ -3,104 +3,104 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("cv") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lcz;" + descriptor = "Lcw;" ) - static class60 field267; - @ObfuscatedName("ab") - static int field274; - @ObfuscatedName("am") - static int field275; - @ObfuscatedName("av") + static class60 field264; + @ObfuscatedName("ac") + static int field271; + @ObfuscatedName("al") + static int field272; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "[Lce;" + descriptor = "[Lcf;" ) - static VorbisCodebook[] field266; - @ObfuscatedName("ag") + static VorbisCodebook[] field263; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Lbc;" + descriptor = "[Lbu;" ) - static VorbisFloor[] field261; - @ObfuscatedName("aa") + static VorbisFloor[] field262; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "[Lbg;" + descriptor = "[Lbs;" ) - static class46[] field262; - @ObfuscatedName("ap") + static class46[] field261; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "[Lbq;" + descriptor = "[Lbr;" ) - static VorbisMapping[] field265; - @ObfuscatedName("ay") - static boolean[] field264; + static VorbisMapping[] field260; @ObfuscatedName("as") - static int[] field276; - @ObfuscatedName("aj") - static boolean field263; - @ObfuscatedName("aq") - static float[] field270; - @ObfuscatedName("az") - static float[] field272; - @ObfuscatedName("at") - static float[] field271; - @ObfuscatedName("af") + static boolean[] field259; + @ObfuscatedName("ay") + static int[] field273; + @ObfuscatedName("ak") + static boolean field258; + @ObfuscatedName("ae") + static float[] field266; + @ObfuscatedName("an") static float[] field269; - @ObfuscatedName("ad") + @ObfuscatedName("ag") static float[] field268; - @ObfuscatedName("bn") - static float[] field273; - @ObfuscatedName("bk") - static int[] field277; - @ObfuscatedName("by") - static int[] field278; - @ObfuscatedName("ac") - byte[][] field282; - @ObfuscatedName("al") + @ObfuscatedName("ad") + static float[] field265; + @ObfuscatedName("af") + static float[] field267; + @ObfuscatedName("be") + static float[] field270; + @ObfuscatedName("bd") + static int[] field274; + @ObfuscatedName("bl") + static int[] field275; + @ObfuscatedName("at") + byte[][] field279; + @ObfuscatedName("ah") @Export("sampleRate") int sampleRate; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("sampleCount") int sampleCount; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("start") int start; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("end") int end; - @ObfuscatedName("ah") - boolean field280; - @ObfuscatedName("an") - float[] field283; @ObfuscatedName("au") - int field289; + boolean field277; + @ObfuscatedName("aj") + float[] field280; + @ObfuscatedName("am") + int field284; + @ObfuscatedName("aq") + int field286; @ObfuscatedName("ai") - int field285; - @ObfuscatedName("ae") - boolean field279; + boolean field276; @ObfuscatedName("aw") - float[] field284; - @ObfuscatedName("bd") + float[] field281; + @ObfuscatedName("bi") @Export("samples") byte[] samples; - @ObfuscatedName("be") - int field291; @ObfuscatedName("bv") - int field292; + int field289; + @ObfuscatedName("bf") + int field288; static { - field267 = new class60(); - field263 = false; + field264 = new class60(); + field258 = false; } VorbisSample(byte[] var1) { this.read(var1); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); @@ -110,11 +110,11 @@ void read(byte[] var1) { this.end = var2.readInt(); if (this.end < 0) { this.end = ~this.end; - this.field280 = true; + this.field277 = true; } int var3 = var2.readInt(); - this.field282 = new byte[var3][]; + this.field279 = new byte[var3][]; for (int var4 = 0; var4 < var3; ++var4) { int var5 = 0; @@ -127,25 +127,25 @@ void read(byte[] var1) { byte[] var7 = new byte[var5]; var2.readBytes(var7, 0, var5); - this.field282[var4] = var7; + this.field279[var4] = var7; } } - @ObfuscatedName("ax") - float[] method307(int var1) { + @ObfuscatedName("ao") + float[] method312(int var1) { class60 var2 = new class60(); - var2.method329(this.field282[var1], 0); - this.field284 = new float[field275]; - var2.method328(); - int var3 = var2.method327(class172.iLog(field276.length - 1)); - boolean var4 = field264[var3]; - int var5 = var4 ? field275 : field274; + var2.method337(this.field279[var1], 0); + this.field281 = new float[field272]; + var2.method336(); + int var3 = var2.method335(LoginScreenAnimation.iLog(field273.length - 1)); + boolean var4 = field259[var3]; + int var5 = var4 ? field272 : field271; boolean var6 = false; boolean var7 = false; if (var4) { - var6 = var2.method328() != 0; - var7 = var2.method328() != 0; + var6 = var2.method336() != 0; + var7 = var2.method336() != 0; } int var8 = var5 >> 1; @@ -153,9 +153,9 @@ float[] method307(int var1) { int var10; int var11; if (var4 && !var6) { - var9 = (var5 >> 2) - (field274 >> 2); - var10 = (field274 >> 2) + (var5 >> 2); - var11 = field274 >> 1; + var9 = (var5 >> 2) - (field271 >> 2); + var10 = (field271 >> 2) + (var5 >> 2); + var11 = field271 >> 1; } else { var9 = 0; var10 = var8; @@ -166,45 +166,45 @@ float[] method307(int var1) { int var13; int var14; if (var4 && !var7) { - var12 = var5 - (var5 >> 2) - (field274 >> 2); - var13 = (field274 >> 2) + (var5 - (var5 >> 2)); - var14 = field274 >> 1; + var12 = var5 - (var5 >> 2) - (field271 >> 2); + var13 = (field271 >> 2) + (var5 - (var5 >> 2)); + var14 = field271 >> 1; } else { var12 = var8; var13 = var5; var14 = var5 >> 1; } - VorbisMapping var15 = field265[field276[var3]]; - int var16 = var15.field250; - int var17 = var15.field251[var16]; - class59 var18 = field261[var17].method206(var2); - boolean var19 = !var18.method325(); + VorbisMapping var15 = field260[field273[var3]]; + int var16 = var15.field246; + int var17 = var15.field249[var16]; + class59 var18 = field262[var17].method209(var2); + boolean var19 = !var18.method330(); int var20; - for (var20 = 0; var20 < var15.field249; ++var20) { - class46 var21 = field262[var15.field252[var20]]; - float[] var22 = this.field284; - var21.method236(var22, var5 >> 1, var19, var2); + for (var20 = 0; var20 < var15.field247; ++var20) { + class46 var21 = field261[var15.field248[var20]]; + float[] var22 = this.field281; + var21.method243(var22, var5 >> 1, var19, var2); } - if (var18.method325()) { - var16 = var15.field250; - int var10000 = var15.field251[var16]; - var18.method324(this.field284, var5 >> 1); + if (var18.method330()) { + var16 = var15.field246; + int var10000 = var15.field249[var16]; + var18.method329(this.field281, var5 >> 1); } int var43; int var44; - if (!var18.method325()) { + if (!var18.method330()) { for (var20 = var5 >> 1; var20 < var5; ++var20) { - this.field284[var20] = 0.0F; + this.field281[var20] = 0.0F; } } else { var20 = var5 >> 1; var43 = var5 >> 2; var44 = var5 >> 3; - float[] var23 = this.field284; + float[] var23 = this.field281; int var24; for (var24 = 0; var24 < var20; ++var24) { @@ -215,10 +215,10 @@ float[] method307(int var1) { var23[var24] = -var23[var5 - var24 - 1]; } - float[] var45 = var4 ? field269 : field270; - float[] var25 = var4 ? field268 : field272; - float[] var26 = var4 ? field273 : field271; - int[] var27 = var4 ? field278 : field277; + float[] var45 = var4 ? field265 : field266; + float[] var25 = var4 ? field267 : field269; + float[] var26 = var4 ? field270 : field268; + int[] var27 = var4 ? field275 : field274; int var28; float var29; @@ -249,7 +249,7 @@ float[] method307(int var1) { var23[var28 * 4 + 1] = (var30 - var32) * var33 + (var29 - var31) * var34; } - var28 = class172.iLog(var5 - 1); + var28 = LoginScreenAnimation.iLog(var5 - 1); int var49; int var50; @@ -349,49 +349,49 @@ float[] method307(int var1) { float[] var57; for (var49 = var9; var49 < var10; ++var49) { var30 = (float)Math.sin(((double)(var49 - var9) + 0.5D) / (double)var11 * 0.5D * 3.141592653589793D); - var57 = this.field284; + var57 = this.field281; var57[var49] *= (float)Math.sin(1.5707963267948966D * (double)var30 * (double)var30); } for (var49 = var12; var49 < var13; ++var49) { var30 = (float)Math.sin(((double)(var49 - var12) + 0.5D) / (double)var14 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var57 = this.field284; + var57 = this.field281; var57[var49] *= (float)Math.sin(1.5707963267948966D * (double)var30 * (double)var30); } } float[] var46 = null; - if (this.field289 > 0) { - var43 = var5 + this.field289 >> 2; + if (this.field284 > 0) { + var43 = var5 + this.field284 >> 2; var46 = new float[var43]; int var47; - if (!this.field279) { - for (var44 = 0; var44 < this.field285; ++var44) { - var47 = var44 + (this.field289 >> 1); - var46[var44] += this.field283[var47]; + if (!this.field276) { + for (var44 = 0; var44 < this.field286; ++var44) { + var47 = var44 + (this.field284 >> 1); + var46[var44] += this.field280[var47]; } } - if (var18.method325()) { + if (var18.method330()) { for (var44 = var9; var44 < var5 >> 1; ++var44) { var47 = var46.length - (var5 >> 1) + var44; - var46[var47] += this.field284[var44]; + var46[var47] += this.field281[var44]; } } } - float[] var48 = this.field283; - this.field283 = this.field284; - this.field284 = var48; - this.field289 = var5; - this.field285 = var13 - (var5 >> 1); - this.field279 = !var18.method325(); + float[] var48 = this.field280; + this.field280 = this.field281; + this.field281 = var48; + this.field284 = var5; + this.field286 = var13 - (var5 >> 1); + this.field276 = !var18.method330(); return var46; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "([I)Lbs;" + descriptor = "([I)Lbt;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -399,21 +399,21 @@ RawSound toRawSound(int[] var1) { return null; } else { if (this.samples == null) { - this.field289 = 0; - this.field283 = new float[field275]; + this.field284 = 0; + this.field280 = new float[field272]; this.samples = new byte[this.sampleCount]; - this.field291 = 0; - this.field292 = 0; + this.field289 = 0; + this.field288 = 0; } - for (; this.field292 < this.field282.length; ++this.field292) { + for (; this.field288 < this.field279.length; ++this.field288) { if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method307(this.field292); + float[] var2 = this.method312(this.field288); if (var2 != null) { - int var3 = this.field291; + int var3 = this.field289; int var4 = var2.length; if (var4 > this.sampleCount - var3) { var4 = this.sampleCount - var3; @@ -429,21 +429,21 @@ RawSound toRawSound(int[] var1) { } if (var1 != null) { - var1[0] -= var3 - this.field291; + var1[0] -= var3 - this.field289; } - this.field291 = var3; + this.field289 = var3; } } - this.field283 = null; + this.field280 = null; byte[] var7 = this.samples; this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field280); + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field277); } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; @@ -456,12 +456,12 @@ static float float32Unpack(int var0) { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); } - @ObfuscatedName("ak") - static void method306(byte[] var0) { - class60 var1 = field267; - var1.method329(var0, 0); - field274 = 1 << var1.method327(4); - field275 = 1 << var1.method327(4); + @ObfuscatedName("ar") + static void method311(byte[] var0) { + class60 var1 = field264; + var1.method337(var0, 0); + field271 = 1 << var1.method335(4); + field272 = 1 << var1.method335(4); int var2; int var3; @@ -469,132 +469,123 @@ static void method306(byte[] var0) { int var5; int var6; for (var2 = 0; var2 < 2; ++var2) { - var3 = var2 != 0 ? field275 : field274; + var3 = var2 != 0 ? field272 : field271; var4 = var3 >> 1; var5 = var3 >> 2; var6 = var3 >> 3; - float[] var7 = new float[var4]; + float[] var13 = new float[var4]; for (int var8 = 0; var8 < var5; ++var8) { - var7[var8 * 2] = (float)Math.cos((double)(var8 * 4) * 3.141592653589793D / (double)var3); - var7[var8 * 2 + 1] = -((float)Math.sin((double)(var8 * 4) * 3.141592653589793D / (double)var3)); + var13[var8 * 2] = (float)Math.cos((double)(var8 * 4) * 3.141592653589793D / (double)var3); + var13[var8 * 2 + 1] = -((float)Math.sin((double)(var8 * 4) * 3.141592653589793D / (double)var3)); } - float[] var19 = new float[var4]; + float[] var14 = new float[var4]; for (int var9 = 0; var9 < var5; ++var9) { - var19[var9 * 2] = (float)Math.cos((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); - var19[var9 * 2 + 1] = (float)Math.sin((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); + var14[var9 * 2] = (float)Math.cos((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); + var14[var9 * 2 + 1] = (float)Math.sin((double)(var9 * 2 + 1) * 3.141592653589793D / (double)(var3 * 2)); } - float[] var20 = new float[var5]; + float[] var15 = new float[var5]; for (int var10 = 0; var10 < var6; ++var10) { - var20[var10 * 2] = (float)Math.cos((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3); - var20[var10 * 2 + 1] = -((float)Math.sin((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3)); + var15[var10 * 2] = (float)Math.cos((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3); + var15[var10 * 2 + 1] = -((float)Math.sin((double)(var10 * 4 + 2) * 3.141592653589793D / (double)var3)); } - int[] var21 = new int[var6]; - int var11 = class172.iLog(var6 - 1); + int[] var16 = new int[var6]; + int var11 = LoginScreenAnimation.iLog(var6 - 1); for (int var12 = 0; var12 < var6; ++var12) { - int var16 = var12; - int var17 = var11; - - int var18; - for (var18 = 0; var17 > 0; --var17) { - var18 = var18 << 1 | var16 & 1; - var16 >>>= 1; - } - - var21[var12] = var18; + var16[var12] = class361.method1902(var12, var11); } if (var2 != 0) { - field269 = var7; - field268 = var19; - field273 = var20; - field278 = var21; + field265 = var13; + field267 = var14; + field270 = var15; + field275 = var16; } else { - field270 = var7; - field272 = var19; - field271 = var20; - field277 = var21; + field266 = var13; + field269 = var14; + field268 = var15; + field274 = var16; } } - var2 = var1.method327(8) + 1; - field266 = new VorbisCodebook[var2]; + var2 = var1.method335(8) + 1; + field263 = new VorbisCodebook[var2]; for (var3 = 0; var3 < var2; ++var3) { - field266[var3] = new VorbisCodebook(); + field263[var3] = new VorbisCodebook(); } - var3 = var1.method327(6) + 1; + var3 = var1.method335(6) + 1; for (var4 = 0; var4 < var3; ++var4) { - var1.method327(16); + var1.method335(16); } - var3 = var1.method327(6) + 1; - field261 = new VorbisFloor[var3]; + var3 = var1.method335(6) + 1; + field262 = new VorbisFloor[var3]; for (var4 = 0; var4 < var3; ++var4) { - field261[var4] = new VorbisFloor(); + field262[var4] = new VorbisFloor(); } - var4 = var1.method327(6) + 1; - field262 = new class46[var4]; + var4 = var1.method335(6) + 1; + field261 = new class46[var4]; for (var5 = 0; var5 < var4; ++var5) { - field262[var5] = new class46(); + field261[var5] = new class46(); } - var5 = var1.method327(6) + 1; - field265 = new VorbisMapping[var5]; + var5 = var1.method335(6) + 1; + field260 = new VorbisMapping[var5]; for (var6 = 0; var6 < var5; ++var6) { - field265[var6] = new VorbisMapping(); + field260[var6] = new VorbisMapping(); } - var6 = var1.method327(6) + 1; - field264 = new boolean[var6]; - field276 = new int[var6]; + var6 = var1.method335(6) + 1; + field259 = new boolean[var6]; + field273 = new int[var6]; - for (int var22 = 0; var22 < var6; ++var22) { - field264[var22] = var1.method328() != 0; - var1.method327(16); - var1.method327(16); - field276[var22] = var1.method327(8); + for (int var7 = 0; var7 < var6; ++var7) { + field259[var7] = var1.method336() != 0; + var1.method335(16); + var1.method335(16); + field273[var7] = var1.method335(8); } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lom;)Z" + descriptor = "(Lol;)Z" ) - static boolean method308(AbstractArchive var0) { - if (!field263) { + static boolean method313(AbstractArchive var0) { + if (!field258) { byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } - method306(var1); - field263 = true; + method311(var1); + field258 = true; } return true; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lom;II)Lcw;" + descriptor = "(Lol;II)Lcv;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method308(var0)) { + if (!method313(var0)) { var0.tryLoadFile(var1, var2); return null; } else { diff --git a/osrs/src/main/java/WallDecoration.java b/osrs/src/main/java/WallDecoration.java index caf0b08ec..b2b822385 100644 --- a/osrs/src/main/java/WallDecoration.java +++ b/osrs/src/main/java/WallDecoration.java @@ -3,57 +3,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.File; -import java.io.RandomAccessFile; - -@ObfuscatedName("kq") +@ObfuscatedName("lj") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("wv") - @ObfuscatedSignature( - descriptor = "Low;" - ) - public static class384 field2303; - @ObfuscatedName("ly") - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("z") int z; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("x") int x; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("y") int y; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("orientation") int orientation; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("orientation2") int orientation2; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("xOffset") int xOffset; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("yOffset") int yOffset; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkt;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkt;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("tag") public long tag; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("flags") int flags; @@ -62,67 +51,13 @@ public final class WallDecoration { this.flags = 0; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/io/File;", - garbageValue = "97" + descriptor = "(I)[Luk;", + garbageValue = "-1385996560" ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; - - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); - int var5 = var3.read(); - var3.seek(0L); - var3.write(var5); - var3.seek(0L); - var3.close(); - FileSystem.FileSystem_cacheFiles.put(var0, var2); - return var2; - } - } catch (Exception var8) { - try { - if (var3 != null) { - var3.close(); - var3 = null; - } - } catch (Exception var7) { - } - - throw new RuntimeException(); - } - } - } - } - - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "16" - ) - static final boolean method1425(int var0) { - if (var0 < 0) { - return false; - } else { - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; - } - - return var1 == 1007; - } + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.SOLID, FillMode.field4258, FillMode.field4259}; } } \ No newline at end of file diff --git a/osrs/src/main/java/Widget.java b/osrs/src/main/java/Widget.java index f29be33d5..e4a1c1067 100644 --- a/osrs/src/main/java/Widget.java +++ b/osrs/src/main/java/Widget.java @@ -7,456 +7,456 @@ import java.util.HashMap; import java.util.Iterator; -@ObfuscatedName("nm") +@ObfuscatedName("nn") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("ad") - public static boolean field2978; - @ObfuscatedName("bn") + @ObfuscatedName("af") + public static boolean field2976; + @ObfuscatedName("be") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("id") public int id; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("childIndex") public int childIndex; - @ObfuscatedName("bd") - String field2983; - @ObfuscatedName("be") + @ObfuscatedName("bi") + String field2981; + @ObfuscatedName("bv") @Export("type") public int type; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("buttonType") public int buttonType; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("contentType") public int contentType; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("xAlignment") public int xAlignment; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("yAlignment") public int yAlignment; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("bp") + @ObfuscatedName("bw") @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("bt") + @ObfuscatedName("bj") @Export("rawX") public int rawX; - @ObfuscatedName("bm") + @ObfuscatedName("bn") @Export("rawY") public int rawY; - @ObfuscatedName("br") + @ObfuscatedName("bo") @Export("rawWidth") public int rawWidth; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @Export("rawHeight") public int rawHeight; - @ObfuscatedName("bc") + @ObfuscatedName("bu") @Export("x") public int x; - @ObfuscatedName("bu") + @ObfuscatedName("by") @Export("y") public int y; - @ObfuscatedName("bf") + @ObfuscatedName("bh") @Export("width") public int width; - @ObfuscatedName("bh") + @ObfuscatedName("bz") @Export("height") public int height; - @ObfuscatedName("bl") - public int field3017; - @ObfuscatedName("bg") - public int field3012; - @ObfuscatedName("bj") + @ObfuscatedName("bc") + public int field3006; + @ObfuscatedName("bs") + public int field3020; + @ObfuscatedName("bx") @Export("parentId") public int parentId; - @ObfuscatedName("bx") + @ObfuscatedName("bb") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("bi") + @ObfuscatedName("bk") @Export("scrollX") public int scrollX; - @ObfuscatedName("bq") + @ObfuscatedName("br") @Export("scrollY") public int scrollY; - @ObfuscatedName("bw") + @ObfuscatedName("bq") @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("ce") + @ObfuscatedName("cf") @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("cu") + @ObfuscatedName("cg") @Export("color") public int color; - @ObfuscatedName("cw") + @ObfuscatedName("cv") @Export("color2") public int color2; - @ObfuscatedName("co") + @ObfuscatedName("cx") @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("cc") + @ObfuscatedName("cp") @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("cg") + @ObfuscatedName("ce") @Export("fill") public boolean fill; - @ObfuscatedName("cq") + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "Luf;" + descriptor = "Luk;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("cy") + @ObfuscatedName("ct") @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("cz") + @ObfuscatedName("cw") @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @Export("lineWid") public int lineWid; - @ObfuscatedName("cb") + @ObfuscatedName("cl") public boolean field2989; - @ObfuscatedName("cn") + @ObfuscatedName("cs") @Export("spriteId2") public int spriteId2; - @ObfuscatedName("ck") + @ObfuscatedName("co") @Export("spriteId") public int spriteId; - @ObfuscatedName("cr") - public String field3119; - @ObfuscatedName("cs") + @ObfuscatedName("cm") + public String field3117; + @ObfuscatedName("cn") @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("cm") + @ObfuscatedName("cr") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("cv") + @ObfuscatedName("cj") @Export("outline") public int outline; - @ObfuscatedName("ci") + @ObfuscatedName("ca") @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("cj") + @ObfuscatedName("cc") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("cx") + @ObfuscatedName("cu") @Export("spriteFlipH") public boolean spriteFlipH; @ObfuscatedName("ch") @Export("modelType") public int modelType; - @ObfuscatedName("cd") + @ObfuscatedName("cb") @Export("modelId") public int modelId; - @ObfuscatedName("ct") + @ObfuscatedName("cz") @Export("modelType2") int modelType2; - @ObfuscatedName("cf") + @ObfuscatedName("cy") @Export("modelId2") int modelId2; - @ObfuscatedName("cl") + @ObfuscatedName("ck") @Export("sequenceId") public int sequenceId; - @ObfuscatedName("ca") + @ObfuscatedName("cd") @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("dv") + @ObfuscatedName("dt") @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("dm") + @ObfuscatedName("di") @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("ds") + @ObfuscatedName("dk") @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("dx") + @ObfuscatedName("dd") @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("dg") + @ObfuscatedName("dx") @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("dq") + @ObfuscatedName("dh") @Export("modelZoom") public int modelZoom; - @ObfuscatedName("dz") + @ObfuscatedName("du") @Export("modelRotation") public int modelRotation; - @ObfuscatedName("dn") + @ObfuscatedName("dg") @Export("rotationKey") public int rotationKey; - @ObfuscatedName("dk") + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnb;" ) - public PlayerComposition field3127; - @ObfuscatedName("df") + public PlayerComposition field3125; + @ObfuscatedName("do") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("de") + @ObfuscatedName("db") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("dl") + @ObfuscatedName("dm") @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("dp") + @ObfuscatedName("dr") @Export("fontId") public int fontId; - @ObfuscatedName("do") + @ObfuscatedName("ds") @Export("text") public String text; - @ObfuscatedName("dh") + @ObfuscatedName("da") @Export("text2") public String text2; - @ObfuscatedName("dj") + @ObfuscatedName("dw") @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("du") + @ObfuscatedName("dp") @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("dr") + @ObfuscatedName("df") @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("dw") + @ObfuscatedName("dv") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("di") + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lic;" ) - class172 field2979; - @ObfuscatedName("dt") - int field2982; - @ObfuscatedName("dd") - HashMap field2984; - @ObfuscatedName("dy") - HashMap field2985; - @ObfuscatedName("dc") + class208 field2977; + @ObfuscatedName("dl") + int field2980; + @ObfuscatedName("de") + HashMap field2982; + @ObfuscatedName("dn") + HashMap field2983; + @ObfuscatedName("dj") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnq;" ) - class342 field2986; - @ObfuscatedName("da") + class339 field2984; + @ObfuscatedName("dy") @Export("flags") public int flags; - @ObfuscatedName("eo") - public boolean field2998; - @ObfuscatedName("em") - public byte[][] field3006; - @ObfuscatedName("el") - public byte[][] field3005; @ObfuscatedName("ec") - public int[] field3074; - @ObfuscatedName("eg") - public int[] field3075; - @ObfuscatedName("ez") + public boolean field2995; + @ObfuscatedName("ew") + public byte[][] field3003; + @ObfuscatedName("ex") + public byte[][] field3004; + @ObfuscatedName("ev") + public int[] field3073; + @ObfuscatedName("ek") + public int[] field3072; + @ObfuscatedName("es") @Export("dataText") public String dataText; - @ObfuscatedName("en") + @ObfuscatedName("ea") @Export("actions") public String[] actions; - @ObfuscatedName("es") + @ObfuscatedName("en") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnn;" ) @Export("parent") public Widget parent; - @ObfuscatedName("eq") + @ObfuscatedName("eh") @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("ej") + @ObfuscatedName("ei") @Export("dragThreshold") public int dragThreshold; @ObfuscatedName("et") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("eh") + @ObfuscatedName("er") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("eb") + @ObfuscatedName("ez") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("ev") + @ObfuscatedName("eu") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("ee") + @ObfuscatedName("eg") @Export("onClick") public Object[] onClick; - @ObfuscatedName("ea") + @ObfuscatedName("ey") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("eu") + @ObfuscatedName("eb") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("ey") + @ObfuscatedName("ed") @Export("onHold") public Object[] onHold; - @ObfuscatedName("ep") + @ObfuscatedName("eq") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("ef") + @ObfuscatedName("ee") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("ew") + @ObfuscatedName("ej") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("ed") + @ObfuscatedName("ep") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("fj") + @ObfuscatedName("fd") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("fh") + @ObfuscatedName("fm") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("fz") + @ObfuscatedName("fa") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("fs") + @ObfuscatedName("fq") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("fl") + @ObfuscatedName("fe") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("fe") + @ObfuscatedName("ff") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("fo") + @ObfuscatedName("fb") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("fd") + @ObfuscatedName("fr") @Export("onStatTransmit") public Object[] onStatTransmit; @ObfuscatedName("fi") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("fk") + @ObfuscatedName("fo") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("fy") + @ObfuscatedName("fw") @Export("onOp") public Object[] onOp; - @ObfuscatedName("fn") - public Object[] field3105; - @ObfuscatedName("fb") + @ObfuscatedName("fj") + public Object[] field3098; + @ObfuscatedName("fh") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("ft") + @ObfuscatedName("fg") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("fa") + @ObfuscatedName("fl") @Export("onKey") public Object[] onKey; - @ObfuscatedName("fg") - public Object[] field3100; - @ObfuscatedName("fm") - public Object[] field3104; + @ObfuscatedName("fs") + public Object[] field3107; + @ObfuscatedName("ft") + public Object[] field3108; @ObfuscatedName("fv") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("ff") + @ObfuscatedName("fp") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("fw") - public Object[] field3113; - @ObfuscatedName("fc") - public Object[] field3096; - @ObfuscatedName("fr") + @ObfuscatedName("fk") + public Object[] field3099; + @ObfuscatedName("fz") + public Object[] field3114; + @ObfuscatedName("fx") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("fq") + @ObfuscatedName("fu") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("fp") + @ObfuscatedName("fy") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("fu") + @ObfuscatedName("fn") @Export("onResize") public Object[] onResize; - @ObfuscatedName("fx") + @ObfuscatedName("fc") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("gi") - public Object[] field3118; - @ObfuscatedName("ge") - public Object[] field3117; - @ObfuscatedName("gj") + @ObfuscatedName("gm") + public Object[] field3115; + @ObfuscatedName("gw") + public Object[] field3116; + @ObfuscatedName("gl") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("gl") + @ObfuscatedName("ge") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("gq") + @ObfuscatedName("gs") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("gt") + @ObfuscatedName("gi") @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("gf") - public String field3124; - @ObfuscatedName("gk") + @ObfuscatedName("gp") + public String field3122; + @ObfuscatedName("gq") @Export("buttonText") public String buttonText; - @ObfuscatedName("gm") + @ObfuscatedName("gn") @Export("itemIds") public int[] itemIds; @ObfuscatedName("gb") - public int[] field3079; - @ObfuscatedName("gx") + public int[] field3077; + @ObfuscatedName("gu") @Export("itemId") public int itemId; - @ObfuscatedName("gp") + @ObfuscatedName("ga") @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("gd") + @ObfuscatedName("gf") @Export("modelFrame") public int modelFrame; - @ObfuscatedName("gz") + @ObfuscatedName("gx") @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("gy") + @ObfuscatedName("gz") @ObfuscatedSignature( - descriptor = "[Lnm;" + descriptor = "[Lnn;" ) @Export("children") public Widget[] children; - @ObfuscatedName("gn") - public boolean field3000; - @ObfuscatedName("gr") - public boolean field3002; - @ObfuscatedName("gw") + @ObfuscatedName("gt") + public boolean field3001; + @ObfuscatedName("gg") + public boolean field2999; + @ObfuscatedName("gj") + public int field3065; + @ObfuscatedName("gy") public int field3071; - @ObfuscatedName("gs") - public int field3068; @ObfuscatedName("gv") - public int field3070; + public int field3069; @ObfuscatedName("gc") - public int field3064; - @ObfuscatedName("ga") + public int field3062; + @ObfuscatedName("gr") @Export("rootIndex") public int rootIndex; - @ObfuscatedName("gh") + @ObfuscatedName("gk") @Export("cycle") public int cycle; - @ObfuscatedName("gg") + @ObfuscatedName("go") public int[] field3080; - @ObfuscatedName("gu") + @ObfuscatedName("gh") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("go") + @ObfuscatedName("gd") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("hi") + @ObfuscatedName("hb") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; static { - field2978 = false; + field2976 = false; } public Widget() { @@ -477,8 +477,8 @@ public Widget() { this.y = 0; this.width = 0; this.height = 0; - this.field3017 = 1; - this.field3012 = 1; + this.field3006 = 1; + this.field3020 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -525,9 +525,9 @@ public Widget() { this.textXAlignment = 0; this.textYAlignment = 0; this.textShadowed = false; - this.field2982 = -1; + this.field2980 = -1; this.flags = 0; - this.field2998 = false; + this.field2995 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -536,18 +536,18 @@ public Widget() { this.spellActionName = ""; this.hasListener = false; this.mouseOverRedirect = -1; - this.field3124 = ""; + this.field3122 = ""; this.buttonText = "Ok"; this.itemId = -1; this.itemQuantity = 0; this.modelFrame = 0; this.modelFrameCycle = 0; - this.field3000 = false; - this.field3002 = false; - this.field3071 = -1; - this.field3068 = 0; - this.field3070 = 0; - this.field3064 = 0; + this.field3001 = false; + this.field2999 = false; + this.field3065 = -1; + this.field3071 = 0; + this.field3069 = 0; + this.field3062 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; @@ -555,10 +555,10 @@ public Widget() { this.prioritizeMenuEntry = false; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "256698557" + descriptor = "(Luj;I)V", + garbageValue = "1076912273" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { @@ -693,7 +693,7 @@ void decodeLegacy(Buffer var1) { if (this.buttonType == 2) { this.spellActionName = var1.readStringCp1252NullTerminated(); - this.field3124 = var1.readStringCp1252NullTerminated(); + this.field3122 = var1.readStringCp1252NullTerminated(); var4 = var1.readUnsignedShort() & 63; this.flags |= var4 << 11; } @@ -729,10 +729,10 @@ void decodeLegacy(Buffer var1) { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "1307379688" + descriptor = "(Luj;I)V", + garbageValue = "167197032" ) @Export("decode") void decode(Buffer var1) { @@ -871,19 +871,19 @@ void decode(Buffer var1) { this.statTransmitTriggers = this.readListenerTriggers(var1); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-474340220" + descriptor = "(Luj;I)V", + garbageValue = "361710485" ) - void method1847(Buffer var1) { - this.field2983 = var1.readStringCp1252NullTerminated(); + void method1841(Buffer var1) { + this.field2981 = var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lul;I)[Ljava/lang/Object;", - garbageValue = "1937096505" + descriptor = "(Luj;I)[Ljava/lang/Object;", + garbageValue = "-1864963770" ) @Export("readListener") Object[] readListener(Buffer var1) { @@ -907,10 +907,10 @@ Object[] readListener(Buffer var1) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lul;I)[I", - garbageValue = "-1309902668" + descriptor = "(Luj;I)[I", + garbageValue = "1916026116" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { @@ -928,16 +928,16 @@ int[] readListenerTriggers(Buffer var1) { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lnt;ZLen;B)Lud;", - garbageValue = "-70" + descriptor = "(Lmr;ZLel;I)Luz;", + garbageValue = "-1408001366" ) @Export("getSprite") public SpritePixels getSprite(WidgetDefinition var1, boolean var2, UrlRequester var3) { - field2978 = false; - if (this.field3119 != null) { - SpritePixels var4 = this.method1851(var1, var3); + field2976 = false; + if (this.field3117 != null) { + SpritePixels var4 = this.method1845(var1, var3); if (var4 != null) { return var4; } @@ -953,17 +953,17 @@ public SpritePixels getSprite(WidgetDefinition var1, boolean var2, UrlRequester if (var8 == -1) { return null; } else { - long var5 = (long)var8 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); + long var5 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var8; SpritePixels var7 = (SpritePixels)var1.Widget_cachedSprites.get(var5); if (var7 != null) { return var7; } else { - var7 = class47.SpriteBuffer_getSprite(var1.field2919, var8, 0); + var7 = IgnoreList.SpriteBuffer_getSprite(var1.field2915, var8, 0); if (var7 == null) { - field2978 = true; + field2976 = true; return null; } else { - this.method1854(var7); + this.method1848(var7); var1.Widget_cachedSprites.put(var7, var5); return var7; } @@ -971,23 +971,23 @@ public SpritePixels getSprite(WidgetDefinition var1, boolean var2, UrlRequester } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lnt;Len;I)Lud;", - garbageValue = "19328064" + descriptor = "(Lmr;Lel;I)Luz;", + garbageValue = "243499919" ) - SpritePixels method1851(WidgetDefinition var1, UrlRequester var2) { - if (!this.method1853()) { - return this.method1852(var1, var2); + SpritePixels method1845(WidgetDefinition var1, UrlRequester var2) { + if (!this.method1847()) { + return this.method1846(var1, var2); } else { - String var3 = this.field3119 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; - SpritePixels var4 = (SpritePixels)var1.field2921.method2216(var3); + String var3 = this.field3117 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; + SpritePixels var4 = (SpritePixels)var1.field2918.method2196(var3); if (var4 == null) { - SpritePixels var5 = this.method1852(var1, var2); + SpritePixels var5 = this.method1846(var1, var2); if (var5 != null) { - var4 = var5.method2696(); - this.method1854(var4); - var1.field2921.method2217(var3, var4); + var4 = var5.method2674(); + this.method1848(var4); + var1.field2918.method2197(var3, var4); } } @@ -995,40 +995,40 @@ SpritePixels method1851(WidgetDefinition var1, UrlRequester var2) { } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lnt;Len;S)Lud;", - garbageValue = "9140" + descriptor = "(Lmr;Lel;I)Luz;", + garbageValue = "769156512" ) - SpritePixels method1852(WidgetDefinition var1, UrlRequester var2) { - if (this.field3119 != null && var2 != null) { - class341 var3 = (class341)var1.field2920.method2216(this.field3119); + SpritePixels method1846(WidgetDefinition var1, UrlRequester var2) { + if (this.field3117 != null && var2 != null) { + class338 var3 = (class338)var1.field2919.method2196(this.field3117); if (var3 == null) { - var3 = new class341(this.field3119, var2); - var1.field2920.method2217(this.field3119, var3); + var3 = new class338(this.field3117, var2); + var1.field2919.method2197(this.field3117, var3); } - return var3.method1747(); + return var3.method1742(); } else { return null; } } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1213670035" + garbageValue = "623493870" ) - boolean method1853() { + boolean method1847() { return this.spriteFlipV || this.spriteFlipH || this.outline != 0 || this.spriteShadow != 0; } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lud;B)V", - garbageValue = "12" + descriptor = "(Luz;I)V", + garbageValue = "-891883391" ) - void method1854(SpritePixels var1) { + void method1848(SpritePixels var1) { if (this.spriteFlipV) { var1.flipVertically(); } @@ -1055,14 +1055,14 @@ void method1854(SpritePixels var1) { } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lnt;I)Lpu;", - garbageValue = "-729897431" + descriptor = "(Lmr;I)Lpf;", + garbageValue = "1649883355" ) @Export("getFont") public Font getFont(WidgetDefinition var1) { - field2978 = false; + field2976 = false; if (this.fontId == -1) { return null; } else { @@ -1070,30 +1070,29 @@ public Font getFont(WidgetDefinition var1) { if (var2 != null) { return var2; } else { - AbstractArchive var4 = var1.field2919; - AbstractArchive var5 = var1.field2918; + AbstractArchive var4 = var1.field2915; + AbstractArchive var5 = var1.field2913; int var6 = this.fontId; + byte[] var8 = var4.takeFile(var6, 0); + boolean var7; + if (var8 == null) { + var7 = false; + } else { + class162.SpriteBuffer_decode(var8); + var7 = true; + } + Font var3; - if (!class164.method862(var4, var6, 0)) { + if (!var7) { var3 = null; } else { - byte[] var8 = var5.takeFile(var6, 0); - Font var7; - if (var8 == null) { - var7 = null; - } else { - Font var9 = new Font(var8, class326.SpriteBuffer_xOffsets, ModelData0.SpriteBuffer_yOffsets, class59.SpriteBuffer_spriteWidths, class544.SpriteBuffer_spriteHeights, class372.SpriteBuffer_spritePalette, AddRequestTask.SpriteBuffer_pixels); - class407.method2062(); - var7 = var9; - } - - var3 = var7; + var3 = WorldMapArea.method1229(var5.takeFile(var6, 0)); } if (var3 != null) { var1.Widget_cachedFonts.put(var3, (long)this.fontId); } else { - field2978 = true; + field2976 = true; } return var3; @@ -1101,14 +1100,14 @@ public Font getFont(WidgetDefinition var1) { } } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lnt;Lif;IZLni;Lhw;Lhe;B)Ljn;", - garbageValue = "-104" + descriptor = "(Lmr;Lhx;IZLnb;Lhw;Lhf;B)Lka;", + garbageValue = "52" ) - @Export("getModel" ) + @Export("getModel") public Model getModel(WidgetDefinition var1, SequenceDefinition var2, int var3, boolean var4, PlayerComposition var5, NPCComposition var6, NewShit var7) { - field2978 = false; + field2976 = false; int var8; int var9; if (var4) { @@ -1132,13 +1131,13 @@ public Model getModel(WidgetDefinition var1, SequenceDefinition var2, int var3, } else if (var8 == 1 && var9 == -1) { return null; } else { - if (var7 != null && var7.field1593 && var8 == 6) { + if (var7 != null && var7.field1530 && var8 == 6) { var8 = 3; } long var10 = (long)(var9 + (var8 << 16)); if (var7 != null) { - var10 |= var7.field1594 << 20; + var10 |= var7.field1531 << 20; } Model var12 = (Model)var1.Widget_cachedModels.get(var10); @@ -1151,7 +1150,7 @@ public Model getModel(WidgetDefinition var1, SequenceDefinition var2, int var3, var13 = ModelData.ModelData_get(var1.field2916, var9, 0); break; case 2: - var13 = class190.getNpcDefinition(var9).method1012((NewShit)null); + var13 = VerticalAlignment.getNpcDefinition(var9).method941((NewShit)null); break; case 3: var13 = var5 != null ? var5.getModelData() : null; @@ -1159,17 +1158,17 @@ public Model getModel(WidgetDefinition var1, SequenceDefinition var2, int var3, case 4: ItemComposition var16 = class214.ItemDefinition_get(var9); var13 = var16.getModelData(10); - var14 += var16.field1811; - var15 += var16.field1812; + var14 += var16.field1756; + var15 += var16.field1759; case 5: default: break; case 6: - var13 = class190.getNpcDefinition(var9).method1012(var7); + var13 = VerticalAlignment.getNpcDefinition(var9).method941(var7); } if (var13 == null) { - field2978 = true; + field2976 = true; return null; } @@ -1185,21 +1184,21 @@ public Model getModel(WidgetDefinition var1, SequenceDefinition var2, int var3, } } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lnt;ZI)Lmp;", - garbageValue = "1153974487" + descriptor = "(Lmr;ZB)Lme;", + garbageValue = "4" ) - public SpriteMask method1857(WidgetDefinition var1, boolean var2) { + public SpriteMask method1851(WidgetDefinition var1, boolean var2) { if (this.spriteId == -1) { var2 = false; } - int var3 = var2 ? this.spriteId * -1637135593 * -742351705 : this.spriteId2 * 1406466773 * -514691459; + int var3 = var2 ? this.spriteId * -1029572693 * -2036249853 : this.spriteId2 * -1780213167 * 277573297; if (var3 == -1) { return null; } else { - long var4 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var3 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); + long var4 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var3 + ((long)this.outline << 36) + ((long)this.spriteShadow << 40); SpriteMask var6 = (SpriteMask)var1.Widget_cachedSpriteMasks.get(var4); if (var6 != null) { return var6; @@ -1243,10 +1242,10 @@ public SpriteMask method1857(WidgetDefinition var1, boolean var2) { } } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-1879897053" + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "-73" ) @Export("setAction") public void setAction(int var1, String var2) { @@ -1264,177 +1263,177 @@ public void setAction(int var1, String var2) { this.actions[var1] = var2; } - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1501160732" + garbageValue = "101495939" ) - public boolean method1859() { + public boolean method1853() { return !this.isIf3 || this.type == 0 || this.type == 11 || this.hasListener || this.contentType == 1338 || this.type == 12; } - @ObfuscatedName("aj") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1474529826" + descriptor = "(B)Z", + garbageValue = "54" ) - public boolean method1860() { + public boolean method1854() { return this.type == 11 || this.type == 12; } - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Len;J)V" + descriptor = "(Ljava/lang/String;Lel;J)V" ) - public void method1861(String var1, UrlRequester var2, long var3) { - if (this.type == 11 && var3 != -1L) { + public void method1855(String var1, UrlRequester var2, long var3) { + if (this.type == 11 && -1L != var3) { var1 = var1.replaceAll("%userid%", Long.toString(var3)); - this.field2979 = new class172(); - if (!this.field2979.method887(var1, var2)) { - this.field2979 = null; + this.field2977 = new class208(); + if (!this.field2977.method1063(var1, var2)) { + this.field2977 = null; } else { - if (this.field2984 == null || this.field2985 == null) { - this.method1863(); + if (this.field2982 == null || this.field2983 == null) { + this.method1857(); } } } } - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Len;I)V", - garbageValue = "2097031968" + descriptor = "(Ljava/lang/String;Lel;I)V", + garbageValue = "-1255401092" ) - public void method1862(String var1, UrlRequester var2) { + public void method1856(String var1, UrlRequester var2) { if (this.type == 11 && var1 != null) { - this.field2979 = new class172(); - this.field2979.method907(var1, var2); + this.field2977 = new class208(); + this.field2977.method1081(var1, var2); } } - @ObfuscatedName("ai") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-296601660" + garbageValue = "1944060082" ) - void method1863() { - this.field2984 = new HashMap(); - this.field2985 = new HashMap(); + void method1857() { + this.field2982 = new HashMap(); + this.field2983 = new HashMap(); } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-652704759" + descriptor = "(IIB)V", + garbageValue = "105" ) - public void method1864(int var1, int var2) { + public void method1858(int var1, int var2) { if (this.type == 11) { - if (this.field2984 == null) { - this.method1863(); + if (this.field2982 == null) { + this.method1857(); } - this.field2984.put(var1, var2); + this.field2982.put(var1, var2); } } @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "-304469184" + descriptor = "(Ljava/lang/String;IB)V", + garbageValue = "40" ) - public void method1865(String var1, int var2) { + public void method1859(String var1, int var2) { if (this.type == 11) { - if (this.field2985 == null) { - this.method1863(); + if (this.field2983 == null) { + this.method1857(); } - this.field2985.put(var1, var2); + this.field2983.put(var1, var2); } } - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(IIIII)Z", - garbageValue = "-282270797" + garbageValue = "-1885191377" ) - public boolean method1866(int var1, int var2, int var3, int var4) { - if (this.type == 11 && this.field2979 != null && this.method1867()) { + public boolean method1860(int var1, int var2, int var3, int var4) { + if (this.type == 11 && this.field2977 != null && this.method1861()) { var1 -= var3; var2 -= var4; - int var5 = (int)(this.field2979.method897()[0] * (float)this.width); - int var6 = (int)(this.field2979.method897()[1] * (float)this.height); - int var7 = var5 + (int)(this.field2979.method897()[2] * (float)this.width); - int var8 = var6 + (int)(this.field2979.method897()[3] * (float)this.height); + int var5 = (int)(this.field2977.method1071()[0] * (float)this.width); + int var6 = (int)(this.field2977.method1071()[1] * (float)this.height); + int var7 = var5 + (int)(this.field2977.method1071()[2] * (float)this.width); + int var8 = var6 + (int)(this.field2977.method1071()[3] * (float)this.height); return var1 >= var5 && var2 >= var6 && var1 < var7 && var2 < var8; } else { return false; } } - @ObfuscatedName("az") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1033886288" + descriptor = "(B)Z", + garbageValue = "29" ) - public boolean method1867() { - return this.field2982 == 2; + public boolean method1861() { + return this.field2980 == 2; } - @ObfuscatedName("at") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "2104948044" + garbageValue = "-720840753" ) - public int method1868(String var1) { - return this.type == 11 && this.field2979 != null && this.method1867() ? this.field2979.method891(var1) : -1; + public int method1862(String var1) { + return this.type == 11 && this.field2977 != null && this.method1861() ? this.field2977.method1066(var1) : -1; } - @ObfuscatedName("af") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1855282224" + garbageValue = "1149651075" ) - public String method1869(String var1) { - return this.type == 11 && this.field2979 != null && this.method1867() ? this.field2979.method892(var1) : null; + public String method1863(String var1) { + return this.type == 11 && this.field2977 != null && this.method1861() ? this.field2977.method1067(var1) : null; } - @ObfuscatedName("ad") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1779226653" + garbageValue = "2095276271" ) - public int method1870() { - return this.field2985 != null && this.field2985.size() > 0 ? 1 : 0; + public int method1864() { + return this.field2983 != null && this.field2983.size() > 0 ? 1 : 0; } - @ObfuscatedName("bn") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "1126201283" ) - public int method1871() { - if (this.type == 11 && this.field2979 != null && this.field2985 != null && !this.field2985.isEmpty()) { - String var1 = this.field2979.method896(); - return var1 != null && this.field2985.containsKey(this.field2979.method896()) ? (Integer)this.field2985.get(var1) : -1; + public int method1865() { + if (this.type == 11 && this.field2977 != null && this.field2983 != null && !this.field2983.isEmpty()) { + String var1 = this.field2977.method1070(); + return var1 != null && this.field2983.containsKey(this.field2977.method1070()) ? (Integer)this.field2983.get(var1) : -1; } else { return -1; } } - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "-80" + garbageValue = "81" ) - public String method1872() { - if (this.type == 11 && this.field2979 != null) { - String var1 = this.field2979.method896(); - Iterator var2 = this.field2979.method898().iterator(); + public String method1866() { + if (this.type == 11 && this.field2977 != null) { + String var1 = this.field2977.method1070(); + Iterator var2 = this.field2977.method1072().iterator(); while (var2.hasNext()) { - class183 var3 = (class183)var2.next(); - String var4 = String.format("%%%S%%", var3.method940()); + class219 var3 = (class219)var2.next(); + String var4 = String.format("%%%S%%", var3.method1105()); if (var3.vmethod3379() == 0) { var1.replaceAll(var4, Integer.toString(var3.vmethod3378())); } else { @@ -1448,20 +1447,20 @@ public String method1872() { } } - @ObfuscatedName("by") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "1962423370" + descriptor = "(B)[I", + garbageValue = "-61" ) - public int[] method1873() { - if (this.type == 11 && this.field2979 != null) { + public int[] method1867() { + if (this.type == 11 && this.field2977 != null) { int[] var1 = new int[3]; int var2 = 0; - Iterator var3 = this.field2979.method898().iterator(); + Iterator var3 = this.field2977.method1072().iterator(); while (var3.hasNext()) { - class183 var4 = (class183)var3.next(); - if (!var4.method940().equals("user_id")) { + class219 var4 = (class219)var3.next(); + if (!var4.method1105().equals("user_id")) { if (var4.vmethod3379() != 0) { return null; } @@ -1479,22 +1478,22 @@ public int[] method1873() { } } - @ObfuscatedName("bd") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(Lnt;Len;I)Z", - garbageValue = "-1209602899" + descriptor = "(Lmr;Lel;I)Z", + garbageValue = "1588534614" ) - public boolean method1874(WidgetDefinition var1, UrlRequester var2) { - if (this.type == 11 && this.field2979 != null) { - this.field2979.method888(var2); - if (this.field2979.method890() != this.field2982) { - this.field2982 = this.field2979.method890(); - if (this.field2982 >= 100) { + public boolean method1868(WidgetDefinition var1, UrlRequester var2) { + if (this.type == 11 && this.field2977 != null) { + this.field2977.method1064(var2); + if (this.field2977.method1065() != this.field2980) { + this.field2980 = this.field2977.method1065(); + if (this.field2980 >= 100) { return true; } - if (this.field2982 == 2) { - this.method1875(var1); + if (this.field2980 == 2) { + this.method1869(var1); return true; } } @@ -1505,15 +1504,15 @@ public boolean method1874(WidgetDefinition var1, UrlRequester var2) { } } - @ObfuscatedName("bv") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "2132169674" + descriptor = "(Lmr;I)V", + garbageValue = "1425941595" ) - void method1875(WidgetDefinition var1) { + void method1869(WidgetDefinition var1) { this.noClickThrough = true; - ArrayList var2 = this.field2979.method893(); - ArrayList var3 = this.field2979.method894(); + ArrayList var2 = this.field2977.method1068(); + ArrayList var3 = this.field2977.method1069(); int var4 = var2.size() + var3.size(); this.children = new Widget[var4]; int var5 = 0; @@ -1521,88 +1520,88 @@ void method1875(WidgetDefinition var1) { Iterator var6; Widget var8; for (var6 = var2.iterator(); var6.hasNext(); this.children[var5++] = var8) { - class178 var7 = (class178)var6.next(); - var8 = ViewportMouse.method1390(5, this, var5, 0, 0, 0, 0, var7.field1461); - var8.field3119 = var7.field1460.method663(); - class341 var9 = new class341(var7.field1460); - var1.field2920.method2217(var8.field3119, var9); + class214 var7 = (class214)var6.next(); + var8 = class160.method839(5, this, var5, 0, 0, 0, 0, var7.field1853); + var8.field3117 = var7.field1852.method659(); + class338 var9 = new class338(var7.field1852); + var1.field2919.method2197(var8.field3117, var9); } for (var6 = var3.iterator(); var6.hasNext(); this.children[var5++] = var8) { - class179 var10 = (class179)var6.next(); - var8 = ViewportMouse.method1390(4, this, var5, 0, 0, 0, 0, var10.field1462); - var8.text = var10.field1466; - var8.fontId = (Integer)this.field2984.get(var10.field1463); - var8.textXAlignment = var10.field1464; - var8.textYAlignment = var10.field1465; + class215 var10 = (class215)var6.next(); + var8 = class160.method839(4, this, var5, 0, 0, 0, 0, var10.field1855); + var8.text = var10.field1859; + var8.fontId = (Integer)this.field2982.get(var10.field1857); + var8.textXAlignment = var10.field1858; + var8.textYAlignment = var10.field1856; } } - @ObfuscatedName("ba") + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "101274851" + garbageValue = "-1475013178" ) - public void method1876() { - this.field2986 = new class342(); + public void method1870() { + this.field2984 = new class339(); for (int var1 = 1; var1 <= 12; ++var1) { - this.field2986.field2930.method102(var1, 0); + this.field2984.field2928.method111(var1, 0); } for (char var2 = 0; var2 < ' '; ++var2) { - this.field2986.field2930.method104(var2, 0); + this.field2984.field2928.method113(var2, 0); } - this.field2986.field2930.method104('\u0080', 0); - this.field2986.field2930.method102(82, 2); - this.field2986.field2930.method102(81, 2); - this.field2986.field2930.method102(86, 2); + this.field2984.field2928.method113('\u0080', 0); + this.field2984.field2928.method111(82, 2); + this.field2984.field2928.method111(81, 2); + this.field2984.field2928.method111(86, 2); } - @ObfuscatedName("bz") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(B)Lnz;", - garbageValue = "5" + descriptor = "(I)Lni;", + garbageValue = "-2105376256" ) - public class344 method1877() { - return this.field2986 != null ? this.field2986.field2936 : null; + public class341 method1871() { + return this.field2984 != null ? this.field2984.field2934 : null; } - @ObfuscatedName("bb") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(S)Lnx;", - garbageValue = "4477" + descriptor = "(B)Lmp;", + garbageValue = "-116" ) - public class339 method1878() { - return this.field2986 != null ? this.field2986.field2931 : null; + public class336 method1872() { + return this.field2984 != null ? this.field2984.field2929 : null; } - @ObfuscatedName("bo") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(I)Lbk;", - garbageValue = "-1397060242" + descriptor = "(I)Lbd;", + garbageValue = "-35642997" ) - public class27 method1879() { - return this.field2986 != null ? this.field2986.field2930 : null; + public class27 method1873() { + return this.field2984 != null ? this.field2984.field2928 : null; } - @ObfuscatedName("bp") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(I)Lno;", - garbageValue = "-280848154" + descriptor = "(I)Lnq;", + garbageValue = "1933652600" ) - public class342 method1880() { - return this.field2986; + public class339 method1874() { + return this.field2984; } - @ObfuscatedName("bt") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(Lnz;I)Z", - garbageValue = "2067973032" + descriptor = "(Lni;I)Z", + garbageValue = "588474161" ) - boolean method1881(class344 var1) { + boolean method1875(class341 var1) { boolean var2 = false; String var5; String var6; @@ -1643,7 +1642,7 @@ boolean method1881(class344 var1) { } var5 = var7.toString(); - var2 |= var1.method1765(var5); + var2 |= var1.method1761(var5); this.text = ""; } @@ -1678,61 +1677,42 @@ boolean method1881(class344 var1) { } var5 = var7.toString(); - var2 |= var1.method1766(var5); + var2 |= var1.method1762(var5); this.text2 = ""; } return var2; } - @ObfuscatedName("bm") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(Lnt;I)Z", - garbageValue = "-636872431" + descriptor = "(Lmr;B)Z", + garbageValue = "16" ) - public boolean method1882(WidgetDefinition var1) { - class344 var2 = this.method1877(); + public boolean method1876(WidgetDefinition var1) { + class341 var2 = this.method1871(); if (var2 == null) { return false; } else { boolean var3 = false; - if (!var2.method1819() && this.fontId != -1) { - int var4 = var2.method1820(); - int var5 = var2.method1821(); - int var6 = var2.method1818(); - int var7 = var2.method1817(); + if (!var2.method1815() && this.fontId != -1) { + int var4 = var2.method1816(); + int var5 = var2.method1817(); + int var6 = var2.method1814(); + int var7 = var2.method1813(); Font var8 = this.getFont(var1); if (var8 != null) { - var3 |= var2.method1767(var8); - var3 |= this.method1881(var2); - var3 |= var2.method1772(var4, var5); - var3 |= var2.method1787(var6, var7); + var3 |= var2.method1763(var8); + var3 |= this.method1875(var2); + var3 |= var2.method1768(var4, var5); + var3 |= var2.method1783(var6, var7); } - } else if (var2.method1819()) { - var3 |= this.method1881(var2); + } else if (var2.method1815()) { + var3 |= this.method1875(var2); } - var2.method1762(); + var2.method1758(); return var3; } } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(B)Lun;", - garbageValue = "5" - ) - static IndexedSprite method1844() { - IndexedSprite var0 = new IndexedSprite(); - var0.width = class159.SpriteBuffer_spriteWidth; - var0.height = class500.SpriteBuffer_spriteHeight; - var0.xOffset = class326.SpriteBuffer_xOffsets[0]; - var0.yOffset = ModelData0.SpriteBuffer_yOffsets[0]; - var0.subWidth = class59.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class544.SpriteBuffer_spriteHeights[0]; - var0.palette = class372.SpriteBuffer_spritePalette; - var0.pixels = AddRequestTask.SpriteBuffer_pixels[0]; - class407.method2062(); - return var0; - } } \ No newline at end of file diff --git a/osrs/src/main/java/WidgetDefinition.java b/osrs/src/main/java/WidgetDefinition.java index dcb0d4ee6..f1e4e59b5 100644 --- a/osrs/src/main/java/WidgetDefinition.java +++ b/osrs/src/main/java/WidgetDefinition.java @@ -1,112 +1,116 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import java.util.HashMap; import java.util.Map; -@ObfuscatedName("nt") +@ObfuscatedName("mr") +@Implements("WidgetDefinition") public class WidgetDefinition { - @ObfuscatedName("ac") + @ObfuscatedName("aa") + static boolean[] field2907; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("widgetArchive") AbstractArchive widgetArchive; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) - AbstractArchive field2917; - @ObfuscatedName("ak") + AbstractArchive field2914; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) AbstractArchive field2916; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) - AbstractArchive field2919; - @ObfuscatedName("ao") + AbstractArchive field2915; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) - AbstractArchive field2918; - @ObfuscatedName("ah") + AbstractArchive field2913; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "[[Lnm;" + descriptor = "[[Lnn;" ) @Export("Widget_interfaceComponents") public Widget[][] Widget_interfaceComponents; - @ObfuscatedName("ab") - Map field2910; - @ObfuscatedName("am") + @ObfuscatedName("ac") + Map field2908; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("Widget_cachedSprites") EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("Widget_cachedModels") EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("Widget_cachedFonts") EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("Widget_cachedSpriteMasks") EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lqe;" + descriptor = "Lqc;" ) - class438 field2920; - @ObfuscatedName("ay") + class435 field2919; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lqe;" + descriptor = "Lqc;" ) - class438 field2921; + class435 field2918; @ObfuscatedSignature( - descriptor = "(Lom;Lom;Lom;Lom;Lom;)V" + descriptor = "(Lol;Lol;Lol;Lol;Lol;)V" ) public WidgetDefinition(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, AbstractArchive var4, AbstractArchive var5) { - this.field2910 = new HashMap(); + this.field2908 = new HashMap(); this.Widget_cachedSprites = new EvictingDualNodeHashTable(200); this.Widget_cachedModels = new EvictingDualNodeHashTable(50); this.Widget_cachedFonts = new EvictingDualNodeHashTable(20); this.Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - this.field2920 = new class438(10, class436.field3797); - this.field2921 = new class438(10, class436.field3797); + this.field2919 = new class435(10, class433.field3801); + this.field2918 = new class435(10, class433.field3801); int var6 = 0; if (var1 != null) { this.widgetArchive = var1; this.field2916 = var2; - this.field2919 = var3; - this.field2918 = var4; - this.field2917 = var5; + this.field2915 = var3; + this.field2913 = var4; + this.field2914 = var5; var6 = this.widgetArchive.getGroupCount(); } this.Widget_interfaceComponents = new Widget[var6][]; - AbstractUserComparator.field3833 = new boolean[var6]; + field2907 = new boolean[var6]; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)Lnm;", - garbageValue = "-836235004" + descriptor = "(IB)Lnn;", + garbageValue = "16" ) - public Widget method1740(int var1) { + public Widget method1733(int var1) { int var2 = var1 >> 16; int var3 = var1 & 65535; if (this.Widget_interfaceComponents[var2] == null || this.Widget_interfaceComponents[var2][var3] == null) { @@ -119,14 +123,14 @@ public Widget method1740(int var1) { return this.Widget_interfaceComponents[var2][var3]; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(III)Lnm;", - garbageValue = "-1175209184" + descriptor = "(III)Lnn;", + garbageValue = "1789235417" ) @Export("getWidgetChild") public Widget getWidgetChild(int var1, int var2) { - Widget var3 = this.method1740(var1); + Widget var3 = this.method1733(var1); if (var2 == -1) { return var3; } else { @@ -134,21 +138,21 @@ public Widget getWidgetChild(int var1, int var2) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "-8971" + descriptor = "(II)Z", + garbageValue = "-1302781087" ) @Export("loadInterface") public boolean loadInterface(int var1) { - if (AbstractUserComparator.field3833[var1]) { + if (field2907[var1]) { return true; } else if (!this.widgetArchive.tryLoadGroup(var1)) { return false; } else { int var2 = this.widgetArchive.getGroupFileCount(var1); if (var2 == 0) { - AbstractUserComparator.field3833[var1] = true; + field2907[var1] = true; return true; } else { if (this.Widget_interfaceComponents[var1] == null) { @@ -167,31 +171,31 @@ public boolean loadInterface(int var1) { this.Widget_interfaceComponents[var1][var3].decodeLegacy(new Buffer(var4)); } - if (this.field2917 != null) { - byte[] var5 = this.field2917.takeFile(var1, var3); + if (this.field2914 != null) { + byte[] var5 = this.field2914.takeFile(var1, var3); if (var5 != null && var5.length > 0) { - this.Widget_interfaceComponents[var1][var3].method1847(new Buffer(var5)); - this.field2910.put(this.Widget_interfaceComponents[var1][var3].field2983, var1); + this.Widget_interfaceComponents[var1][var3].method1841(new Buffer(var5)); + this.field2908.put(this.Widget_interfaceComponents[var1][var3].field2981, var1); } } } } } - AbstractUserComparator.field3833[var1] = true; + field2907[var1] = true; return true; } } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1200843852" + descriptor = "(IB)V", + garbageValue = "0" ) - public void method1743(int var1) { + public void method1736(int var1) { if (var1 != -1) { - if (AbstractUserComparator.field3833[var1]) { + if (field2907[var1]) { this.widgetArchive.clearFilesGroup(var1); if (this.Widget_interfaceComponents[var1] != null) { for (int var2 = 0; var2 < this.Widget_interfaceComponents[var1].length; ++var2) { @@ -201,47 +205,116 @@ public void method1743(int var1) { } this.Widget_interfaceComponents[var1] = null; - AbstractUserComparator.field3833[var1] = false; + field2907[var1] = false; } } } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-17" + descriptor = "(I)V", + garbageValue = "2131589936" ) - public void method1744() { + public void method1737() { this.Widget_cachedSprites.clear(); this.Widget_cachedModels.clear(); this.Widget_cachedFonts.clear(); this.Widget_cachedSpriteMasks.clear(); } - @ObfuscatedName("lr") - @ObfuscatedSignature( - descriptor = "(III)Ljava/lang/String;", - garbageValue = "-1362915838" - ) - static final String method1745(int var0, int var1) { - int var2 = var1 - var0; - if (var2 < -9) { - return Client.colorStartTag(16711680); - } else if (var2 < -6) { - return Client.colorStartTag(16723968); - } else if (var2 < -3) { - return Client.colorStartTag(16740352); - } else if (var2 < 0) { - return Client.colorStartTag(16756736); - } else if (var2 > 9) { - return Client.colorStartTag(65280); - } else if (var2 > 6) { - return Client.colorStartTag(4259584); - } else if (var2 > 3) { - return Client.colorStartTag(8453888); + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(ILdt;ZB)I", + garbageValue = "0" + ) + static int method1738(int var0, Script var1, boolean var2) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var4 = HealthBarDefinition.widgetDefinition.method1733(var3); } else { - return var2 > 0 ? Client.colorStartTag(12648192) : Client.colorStartTag(16776960); + var4 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + } + + if (var0 == 1000) { + DbTableType.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + class159.invalidateWidget(var4); + SpriteMask.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + class132.revalidateWidgetScroll(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == 1001) { + DbTableType.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + class159.invalidateWidget(var4); + SpriteMask.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + class132.revalidateWidgetScroll(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == 1003) { + boolean var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + class159.invalidateWidget(var4); + } + + return 1; + } else if (var0 == 1005) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1006) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("lt") + @ObfuscatedSignature( + descriptor = "(Lnn;B)Z", + garbageValue = "64" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { + int var2 = UserComparator4.method666(var0, var1); + int var3 = var0.cs1ComparisonValues[var1]; + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { + if (var2 == var3) { + return false; + } + } else if (var2 != var3) { + return false; + } + } + + return true; } } } \ No newline at end of file diff --git a/osrs/src/main/java/World.java b/osrs/src/main/java/World.java index 8c68e09d2..b40f6b03d 100644 --- a/osrs/src/main/java/World.java +++ b/osrs/src/main/java/World.java @@ -2,52 +2,45 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.js.JSObject; -import java.util.Date; - - -@ObfuscatedName("cv") +@ObfuscatedName("cr") @Implements("World") public class World { - @ObfuscatedName("ax") - @Export("Tiles_underlays") - static short[][][] Tiles_underlays; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("World_count") static int World_count; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("World_listCount") static int World_listCount; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("id") int id; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("properties") int properties; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("population") int population; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("host") String host; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("activity") String activity; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("location") int location; - @ObfuscatedName("an") + @ObfuscatedName("aj") @Export("index") int index; - @ObfuscatedName("au") - String field680; + @ObfuscatedName("am") + String field679; static { World_count = 0; @@ -59,135 +52,492 @@ public class World { World() { } - @ObfuscatedName("av") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "844978616" + descriptor = "(B)Z", + garbageValue = "-98" ) @Export("isMembersOnly") boolean isMembersOnly() { - return (class525.field4150.rsOrdinal() & this.properties) != 0; + return (class522.field4158.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-249260285" + descriptor = "(B)Z", + garbageValue = "0" ) @Export("isDeadman") boolean isDeadman() { - return (class525.field4156.rsOrdinal() & this.properties) != 0; + return (class522.field4153.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("aa") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1975874921" + descriptor = "(B)Z", + garbageValue = "25" ) - boolean method390() { - return (class525.field4154.rsOrdinal() & this.properties) != 0; + boolean method399() { + return (class522.field4152.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ap") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "32" + descriptor = "(I)Z", + garbageValue = "2092493983" ) @Export("isPvp") boolean isPvp() { - return (class525.field4153.rsOrdinal() & this.properties) != 0; + return (class522.field4157.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ay") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "-1744253846" ) - boolean method392() { - return (class525.field4157.rsOrdinal() & this.properties) != 0; + boolean method401() { + return (class522.field4155.rsOrdinal() & this.properties) != 0; } @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "42" + descriptor = "(S)Z", + garbageValue = "1917" ) - boolean method393() { - return (class525.field4158.rsOrdinal() & this.properties) != 0; + boolean method402() { + return (class522.field4160.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("aj") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1488383834" + garbageValue = "-1429834032" ) @Export("isBeta") boolean isBeta() { - return (class525.field4151.rsOrdinal() & this.properties) != 0; + return (class522.field4151.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("an") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1132976200" + garbageValue = "893660966" ) - boolean method395() { - return (class525.field4159.rsOrdinal() & this.properties) != 0; + boolean method404() { + return (class522.field4161.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("au") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-43" + garbageValue = "-42" ) - boolean method396() { - return (class525.field4155.rsOrdinal() & this.properties) != 0; + boolean method405() { + return (class522.field4154.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ai") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "165086370" + descriptor = "(B)Z", + garbageValue = "-15" ) - boolean method397() { - return (class525.field4160.rsOrdinal() & this.properties) != 0; + boolean method406() { + return (class522.field4159.rsOrdinal() & this.properties) != 0; } - @ObfuscatedName("ol") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "-14910" + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "-1248471414" ) - static void method398(String var0) { - HealthBarDefinition.param9 = var0; - - try { - String var1 = class159.client.getParameter(Integer.toString(18)); - String var2 = class159.client.getParameter(Integer.toString(13)); - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; - String var5; - if (var0.length() == 0) { - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - String var4 = var3 + "; Expires="; - long var6 = GrandExchangeOfferTotalQuantityComparator.method1971() + 94608000000L; - Calendar.Calendar_calendar.setTime(new Date(var6)); - int var8 = Calendar.Calendar_calendar.get(7); - int var9 = Calendar.Calendar_calendar.get(5); - int var10 = Calendar.Calendar_calendar.get(2); - int var11 = Calendar.Calendar_calendar.get(1); - int var12 = Calendar.Calendar_calendar.get(11); - int var13 = Calendar.Calendar_calendar.get(12); - int var14 = Calendar.Calendar_calendar.get(13); - var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; - var3 = var4 + var5 + "; Max-Age=" + 94608000L; - } + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; + + for (int var5 = 0; var5 < var2; ++var5) { + int var6 = var0[var5 + var1] & 255; + if (var6 != 0) { + if (var6 >= 128 && var6 < 160) { + char var7 = class396.cp1252AsciiExtension[var6 - 128]; + if (var7 == 0) { + var7 = '?'; + } + + var6 = var7; + } - Client var16 = class159.client; - var5 = "document.cookie=\"" + var3 + "\""; - JSObject.getWindow(var16).eval(var5); - } catch (Throwable var15) { + var3[var4++] = (char)var6; + } } + return new String(var3, 0, var4); + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "1960092148" + ) + static int method407(int var0, Script var1, boolean var2) { + String var3; + if (var0 == 3100) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + GrandExchangeOfferUnitPriceComparator.addGameMessage(0, "", var3); + return 1; + } else if (var0 == 3101) { + DbTableType.Interpreter_intStackSize -= 2; + WorldMapLabelSize.performPlayerAnimation(class229.localPlayer, Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize], Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == 3103) { + if (!Interpreter.field703) { + Interpreter.field702 = true; + } + + return 1; + } else { + int var10; + if (var0 == 3104) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var10 = 0; + if (ClientPacket.isNumber(var3)) { + var10 = Huffman.method1888(var3); + } + + PacketBufferNode var12 = class113.getPacketBufferNode(ClientPacket.RESUME_COUNTDIALOG, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var10); + Client.packetWriter.addNode(var12); + return 1; + } else { + PacketBufferNode var14; + if (var0 == 3105) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var14 = class113.getPacketBufferNode(ClientPacket.RESUME_NAMEDIALOG, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == 3106) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var14 = class113.getPacketBufferNode(ClientPacket.RESUME_STRINGDIALOG, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); + return 1; + } else { + String var7; + int var8; + if (var0 == 3107) { + var8 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + class402.method2043(var8, var7); + return 1; + } else if (var0 == 3108) { + DbTableType.Interpreter_intStackSize -= 3; + var8 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + Widget var13 = HealthBarDefinition.widgetDefinition.method1733(var9); + HorizontalAlignment.clickWidget(var13, var8, var10); + return 1; + } else if (var0 == 3109) { + DbTableType.Interpreter_intStackSize -= 2; + var8 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Widget var11 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + HorizontalAlignment.clickWidget(var11, var8, var10); + return 1; + } else if (var0 == 3110) { + class19.mouseCam = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3111) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapIcon_1.clientPreferences.getRoofsHidden() ? 1 : 0; + return 1; + } else if (var0 == 3112) { + WorldMapIcon_1.clientPreferences.setRoofsHidden(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == 3113) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + HealthBar.openURL(var3, var4, false); + return 1; + } else if (var0 == 3115) { + var8 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var14 = class113.getPacketBufferNode(ClientPacket.RESUME_OBJDIALOG, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShort(var8); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == 3116) { + var8 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class127.Interpreter_stringStackSize -= 2; + var7 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize + 1]; + if (var7.length() > 500) { + return 1; + } else if (var5.length() > 500) { + return 1; + } else { + PacketBufferNode var6 = class113.getPacketBufferNode(ClientPacket.f66, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + ClanChannel.stringCp1252NullTerminatedByteSize(var7) + ClanChannel.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + var6.packetBuffer.writeStringCp1252NullTerminated(var7); + var6.packetBuffer.writeByteAdd(var8); + Client.packetWriter.addNode(var6); + return 1; + } + } else if (var0 == 3117) { + --DbTableType.Interpreter_intStackSize; + return 1; + } else if (var0 == 3118) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3119) { + Client.field387 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; + } + + return 1; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; + } + + return 1; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; + } + + return 1; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; + } + + return 1; + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; + return 1; + } else if (var0 == 3125) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3126) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3127) { + IgnoreList.setTapToDrop(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == 3128) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Strings.getTapToDrop() ? 1 : 0; + return 1; + } else if (var0 == 3129) { + DbTableType.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + return 1; + } else if (var0 == 3130) { + DbTableType.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3131) { + --DbTableType.Interpreter_intStackSize; + return 1; + } else if (var0 == 3132) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Language.canvasWidth; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class47.canvasHeight; + return 1; + } else if (var0 == 3133) { + --DbTableType.Interpreter_intStackSize; + return 1; + } else if (var0 == 3134) { + return 1; + } else if (var0 == 3135) { + DbTableType.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3136) { + Client.field505 = 3; + Client.field499 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3137) { + Client.field505 = 2; + Client.field499 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3138) { + Client.field505 = 0; + return 1; + } else if (var0 == 3139) { + Client.field505 = 1; + return 1; + } else if (var0 == 3140) { + Client.field505 = 3; + Client.field499 = var2 ? Interpreter.scriptDotWidget.id * 898987495 * 225496535 : HealthBar.scriptActiveWidget.id * 898987495 * 225496535; + return 1; + } else { + boolean var15; + if (var0 == 3141) { + var15 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + WorldMapIcon_1.clientPreferences.setIsUsernameHidden(var15); + return 1; + } else if (var0 == 3142) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapIcon_1.clientPreferences.getIsUsernameHidden() ? 1 : 0; + return 1; + } else if (var0 == 3143) { + var15 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var15; + if (!var15) { + WorldMapIcon_1.clientPreferences.setUsernameToRemember(""); + } + + return 1; + } else if (var0 == 3144) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; + return 1; + } else if (var0 == 3145) { + return 1; + } else if (var0 == 3146) { + var15 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + WorldMapIcon_1.clientPreferences.getTitleMusicDisabled(!var15); + return 1; + } else if (var0 == 3147) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapIcon_1.clientPreferences.getTitleMusicDisabled() ? 0 : 1; + return 1; + } else if (var0 == 3148) { + return 1; + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapData_1.method1285(); + return 1; + } else if (var0 == 3155) { + --class127.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3156) { + return 1; + } else if (var0 == 3157) { + DbTableType.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3161) { + --DbTableType.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3162) { + --DbTableType.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3163) { + --class127.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3164) { + --DbTableType.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3165) { + --DbTableType.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3166) { + DbTableType.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3167) { + DbTableType.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3168) { + DbTableType.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3169) { + return 1; + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3172) { + --DbTableType.Interpreter_intStackSize; + return 1; + } else if (var0 == 3173) { + --DbTableType.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3174) { + --DbTableType.Interpreter_intStackSize; + return 1; + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3176) { + return 1; + } else if (var0 == 3177) { + return 1; + } else if (var0 == 3178) { + --class127.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3179) { + return 1; + } else if (var0 == 3180) { + --class127.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3181) { + class311.method1647(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + return 1; + } else if (var0 == 3182) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class216.method1099(); + return 1; + } else if (var0 == 3189) { + var8 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class240.method1294(var8); + return 1; + } else { + return 2; + } + } + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMap.java b/osrs/src/main/java/WorldMap.java index b7e207408..2ee995b99 100644 --- a/osrs/src/main/java/WorldMap.java +++ b/osrs/src/main/java/WorldMap.java @@ -5,208 +5,208 @@ import java.util.*; -@ObfuscatedName("tu") +@ObfuscatedName("tn") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lth;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lth;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Ltc;" + descriptor = "Lth;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lpu;" + descriptor = "Lpf;" ) @Export("font") Font font; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("fonts") HashMap fonts; - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "[Lun;" + descriptor = "[Lup;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("details") HashMap details; - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Ljv;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Ljv;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("ai") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Ljv;" ) - WorldMapArea field4053; - @ObfuscatedName("ae") + WorldMapArea field4051; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Ljf;" ) @Export("worldMapManager") WorldMapManager worldMapManager; @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Ltb;" + descriptor = "Lsl;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @Export("centerTileX") int centerTileX; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("centerTileY") int centerTileY; - @ObfuscatedName("at") + @ObfuscatedName("ag") @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("af") + @ObfuscatedName("ad") @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("ad") + @ObfuscatedName("af") @Export("zoom") float zoom; - @ObfuscatedName("bn") + @ObfuscatedName("be") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("by") + @ObfuscatedName("bl") @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("be") + @ObfuscatedName("bv") @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("ba") + @ObfuscatedName("bg") @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("bz") + @ObfuscatedName("ba") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("bb") + @ObfuscatedName("bm") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("bo") + @ObfuscatedName("bp") @Export("flashCount") int flashCount; - @ObfuscatedName("bp") + @ObfuscatedName("bw") @Export("flashCycle") int flashCycle; + @ObfuscatedName("bj") + int field4024; + @ObfuscatedName("bn") + int field4026; + @ObfuscatedName("bo") + int field4027; @ObfuscatedName("bt") - int field4033; - @ObfuscatedName("bm") - int field4028; - @ObfuscatedName("br") - int field4031; - @ObfuscatedName("bs") - int field4032; - @ObfuscatedName("bc") - long field4056; + int field4029; @ObfuscatedName("bu") - int field4034; - @ObfuscatedName("bf") - int field4026; + long field4052; + @ObfuscatedName("by") + int field4032; @ObfuscatedName("bh") - boolean field4014; - @ObfuscatedName("bj") + int field4022; + @ObfuscatedName("bz") + boolean field4012; + @ObfuscatedName("bx") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("bx") + @ObfuscatedName("bb") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("bi") + @ObfuscatedName("bk") @Export("enabledElementIds") HashSet enabledElementIds; + @ObfuscatedName("br") + HashSet field4043; @ObfuscatedName("bq") - HashSet field4047; - @ObfuscatedName("bw") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("ce") - int field4038; - @ObfuscatedName("cw") + @ObfuscatedName("cf") + int field4033; + @ObfuscatedName("cv") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("co") - List field4051; - @ObfuscatedName("cc") + @ObfuscatedName("cx") + List field4047; + @ObfuscatedName("cp") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("cg") - HashSet field4049; - @ObfuscatedName("cq") + @ObfuscatedName("ce") + HashSet field4045; + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmh;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("cy") + @ObfuscatedName("ct") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("cz") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "Luz;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("cb") + @ObfuscatedName("cl") @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("cn") + @ObfuscatedName("cs") @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("ck") - int field4039; + @ObfuscatedName("co") + int field4035; static { fontNameVerdana11 = FontName.FontName_verdana11; @@ -227,30 +227,30 @@ public WorldMap() { this.flashingElements = null; this.flashCount = -1; this.flashCycle = -1; - this.field4033 = -1; - this.field4028 = -1; - this.field4031 = -1; - this.field4032 = -1; - this.field4014 = true; + this.field4024 = -1; + this.field4026 = -1; + this.field4027 = -1; + this.field4029 = -1; + this.field4012 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); this.enabledElementIds = new HashSet(); - this.field4047 = new HashSet(); + this.field4043 = new HashSet(); this.elementsDisabled = false; - this.field4038 = 0; + this.field4033 = 0; this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field4049 = new HashSet(); + this.field4045 = new HashSet(); this.mouseCoord = null; this.showCoord = false; this.minCachedTileX = -1; this.minCachedTileY = -1; - this.field4039 = -1; + this.field4035 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lom;Lom;Lom;Lpu;Ljava/util/HashMap;[Lun;B)V", - garbageValue = "-35" + descriptor = "(Lol;Lol;Lol;Lpf;Ljava/util/HashMap;[Lup;I)V", + garbageValue = "-686529494" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { @@ -264,7 +264,7 @@ public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); this.cacheLoader = new WorldMapArchiveLoader(var1); - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2482.name); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2095.name); int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); int var9 = var8 == null ? 0 : var8.length; this.details = new HashMap(var9); @@ -272,7 +272,7 @@ public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var for (int var10 = 0; var10 < var9; ++var10) { Buffer var11 = new Buffer(this.WorldMap_archive.takeFile(var7, var8[var10])); WorldMapArea var12 = new WorldMapArea(); - var12.method1452(var11, var8[var10], Client.param25 >= 217); + var12.method1205(var11, var8[var10], Client.param25 >= 217); this.details.put(var12.getInternalName(), var12); if (var12.getIsMain()) { this.mainMapArea = var12; @@ -280,22 +280,22 @@ public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var } this.setCurrentMapArea(this.mainMapArea); - this.field4053 = null; + this.field4051 = null; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "400049492" + garbageValue = "1839563363" ) - public void method2422() { + public void method2398() { WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(IIZIIIII)V", - garbageValue = "217069528" + garbageValue = "-1895076651" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { @@ -305,27 +305,27 @@ public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int va if (var3) { int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); - List var10 = this.worldMapManager.method1514(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); + List var10 = this.worldMapManager.method1270(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); HashSet var11 = new HashSet(); Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); Interpreter.runScriptEvent(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); class157.runScriptEvent(var14)) { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); - if (this.field4049.contains(var13)) { + if (this.field4045.contains(var13)) { var14.setType(17); } else { var14.setType(15); } } - var12 = this.field4049.iterator(); + var12 = this.field4045.iterator(); while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); @@ -334,91 +334,84 @@ public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int va var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - Interpreter.runScriptEvent(var14); + class157.runScriptEvent(var14); } } - this.field4049 = var11; + this.field4045 = var11; } } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIZZI)V", - garbageValue = "1429275185" - ) - public void method2424(int var1, int var2, boolean var3, boolean var4) { - long var5; - label33: { - var5 = GrandExchangeOfferTotalQuantityComparator.method1971(); - this.method2425(var1, var2, var4, var5); - if (!this.hasTarget() && (var4 || var3)) { - boolean var7 = Client.clickedWidget != null; - if (!var7) { - if (var4) { - this.field4031 = var1; - this.field4032 = var2; - this.field4033 = this.centerTileX; - this.field4028 = this.centerTileY; - } - - if (this.field4033 != -1) { - int var8 = var1 - this.field4031; - int var9 = var2 - this.field4032; - this.setWorldMapPosition(this.field4033 - (int)((float)var8 / this.zoomTarget), (int)((float)var9 / this.zoomTarget) + this.field4028, false); - } - break label33; - } + descriptor = "(IIZZS)V", + garbageValue = "4180" + ) + public void method2400(int var1, int var2, boolean var3, boolean var4) { + long var5 = SpotAnimationDefinition.method962(); + this.method2401(var1, var2, var4, var5); + if (!this.hasTarget() && (var4 || var3) && !PacketBufferNode.method1639()) { + if (var4) { + this.field4027 = var1; + this.field4029 = var2; + this.field4024 = this.centerTileX; + this.field4026 = this.centerTileY; } - this.method2429(); + if (this.field4024 != -1) { + int var7 = var1 - this.field4027; + int var8 = var2 - this.field4029; + this.setWorldMapPosition(this.field4024 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4026, false); + } + } else { + this.method2405(); } if (var4) { - this.field4056 = var5; - this.field4034 = var1; - this.field4026 = var2; + this.field4052 = var5; + this.field4032 = var1; + this.field4022 = var2; } } - @ObfuscatedName("ao") - void method2425(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("ab") + void method2401(int var1, int var2, boolean var3, long var4) { if (this.currentMapArea != null) { int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); if (this.mouseCoord != null && var3) { - class226 var8 = class284.method1573(); - boolean var9 = Client.staffModLevel >= 2; - int var11; + class223 var8 = Client.keyHandlerInstance; + boolean var10 = Client.staffModLevel >= 2; int var12; - if (var9 && var8.getKeyPressed(82) && var8.getKeyPressed(81)) { - int var15 = this.mouseCoord.x; - var11 = this.mouseCoord.y; - var12 = this.mouseCoord.plane; - PacketBufferNode var13 = ClanChannelMember.getPacketBufferNode(ClientPacket.f20, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeShortAddLE(var15); - var13.packetBuffer.writeShortLE(var11); - var13.packetBuffer.writeInt(0); - var13.packetBuffer.writeByteAdd(var12); - Client.packetWriter.addNode(var13); + int var13; + if (var10 && var8.getKeyPressed(82) && var8.getKeyPressed(81)) { + int var16 = this.mouseCoord.x; + var12 = this.mouseCoord.y; + var13 = this.mouseCoord.plane; + PacketBufferNode var14 = class113.getPacketBufferNode(ClientPacket.f20, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeInt(0); + var14.packetBuffer.writeIntME(var16); + var14.packetBuffer.writeIntME(var12); + var14.packetBuffer.writeByte(var13); + Client.packetWriter.addNode(var14); } else { - boolean var10 = true; - if (this.field4014) { - var11 = var1 - this.field4034; - var12 = var2 - this.field4026; - if (var4 - this.field4056 > 500L || var11 < -25 || var11 > 25 || var12 < -25 || var12 > 25) { - var10 = false; + boolean var11 = true; + if (this.field4012) { + var12 = var1 - this.field4032; + var13 = var2 - this.field4022; + if (var4 - this.field4052 > 500L || var12 < -25 || var12 > 25 || var13 < -25 || var13 > 25) { + var11 = false; } } - if (var10) { - PacketBufferNode var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.f16, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeInt(this.mouseCoord.packed()); - Client.packetWriter.addNode(var14); - this.field4056 = 0L; + if (var11) { + PacketBufferNode var15 = class113.getPacketBufferNode(ClientPacket.field2580, Client.packetWriter.isaacCipher); + var15.packetBuffer.writeIntIME(this.mouseCoord.packed()); + Client.packetWriter.addNode(var15); + this.field4052 = 0L; } } } @@ -428,14 +421,14 @@ void method2425(int var1, int var2, boolean var3, long var4) { } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2036397007" + garbageValue = "217198758" ) @Export("smoothZoom") void smoothZoom() { - if (WallDecoration.field2303 != null) { + if (MidiPcmStream.field2799 != null) { this.zoom = this.zoomTarget; } else { if (this.zoom < this.zoomTarget) { @@ -449,10 +442,10 @@ void smoothZoom() { } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "6" + garbageValue = "84" ) @Export("scrollToTarget") void scrollToTarget() { @@ -468,7 +461,7 @@ void scrollToTarget() { } this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); - if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { + if (this.worldMapTargetX == this.centerTileX && this.worldMapTargetY == this.centerTileY) { this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -476,48 +469,48 @@ void scrollToTarget() { } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "118256723" + descriptor = "(IIZB)V", + garbageValue = "3" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; this.centerTileY = var2; - GrandExchangeOfferTotalQuantityComparator.method1971(); + SpotAnimationDefinition.method962(); if (var3) { - this.method2429(); + this.method2405(); } } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-36" + descriptor = "(I)V", + garbageValue = "1741658330" ) - final void method2429() { - this.field4032 = -1; - this.field4031 = -1; - this.field4028 = -1; - this.field4033 = -1; + final void method2405() { + this.field4029 = -1; + this.field4027 = -1; + this.field4026 = -1; + this.field4024 = -1; } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "412429797" + garbageValue = "-357792182" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIIB)Lkz;", - garbageValue = "117" + descriptor = "(IIII)Ljv;", + garbageValue = "-472972186" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { @@ -535,12 +528,12 @@ public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { return var5; } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(IIIZB)V", - garbageValue = "30" + garbageValue = "-68" ) - public void method2432(int var1, int var2, int var3, boolean var4) { + public void method2408(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if (var5 == null) { if (!var4) { @@ -551,8 +544,8 @@ public void method2432(int var1, int var2, int var3, boolean var4) { } boolean var6 = false; - if (var5 != this.field4053 || var4) { - this.field4053 = var5; + if (var5 != this.field4051 || var4) { + this.field4051 = var5; this.setCurrentMapArea(var5); var6 = true; } @@ -563,10 +556,10 @@ public void method2432(int var1, int var2, int var3, boolean var4) { } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "5" + descriptor = "(IS)V", + garbageValue = "-16384" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -577,30 +570,30 @@ public void setCurrentMapAreaId(int var1) { } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-370898847" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)Lkz;", - garbageValue = "-221227669" + descriptor = "(S)Ljv;", + garbageValue = "2772" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; } - @ObfuscatedName("aj") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lkz;B)V", - garbageValue = "1" + descriptor = "(Ljv;I)V", + garbageValue = "724172563" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -610,10 +603,10 @@ void setCurrentMapArea(WorldMapArea var1) { } } - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lkz;B)V", - garbageValue = "111" + descriptor = "(Ljv;B)V", + garbageValue = "6" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -622,12 +615,12 @@ void initializeWorldMapManager(WorldMapArea var1) { this.cacheLoader.reset(this.currentMapArea == null ? null : this.currentMapArea.getInternalName()); } - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lkz;Lmo;Lmo;ZI)V", - garbageValue = "1877422890" + descriptor = "(Ljv;Lmh;Lmh;ZB)V", + garbageValue = "62" ) - public void method2438(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method2414(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMapManager(var1); @@ -642,10 +635,10 @@ public void method2438(WorldMapArea var1, Coord var2, Coord var3, boolean var4) } } - @ObfuscatedName("ai") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "758116550" + descriptor = "(IIIB)V", + garbageValue = "0" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -660,16 +653,16 @@ void jump(int var1, int var2, int var3) { this.worldMapTargetY = -1; this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); this.zoomTarget = this.zoom; - this.field4051 = null; + this.field4047 = null; this.iconIterator = null; this.worldMapManager.clearIcons(); } } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "372049411" + descriptor = "(IIIIIB)V", + garbageValue = "24" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { @@ -681,13 +674,13 @@ public void draw(int var1, int var2, int var3, int var4, int var5) { this.drawLoading(var1, var2, var3, var4, var7); } else { if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.method1509(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld, Client.param25 >= 217); + this.worldMapManager.method1264(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld, Client.param25 >= 217); if (!this.worldMapManager.isLoaded()) { return; } } - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, this.worldMapManager.method1517()); + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, this.worldMapManager.method1273()); if (this.flashingElements != null) { ++this.flashCycle; if (this.flashCycle % this.cyclesPerFlash == 0) { @@ -703,18 +696,20 @@ public void draw(int var1, int var2, int var3, int var4, int var5) { int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); + boolean var10; if (!this.elementsDisabled) { - boolean var10 = false; - if (var5 - this.field4038 > 100) { - this.field4038 = var5; + var10 = false; + if (var5 - this.field4033 > 100) { + this.field4033 = var5; var10 = true; } - this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4047, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); + this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4043, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); } - this.method2442(var1, var2, var3, var4, var8, var9); - if (class92.method487() && this.showCoord && this.mouseCoord != null) { + this.method2418(var1, var2, var3, var4, var8, var9); + var10 = Client.staffModLevel >= 2; + if (var10 && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } @@ -728,16 +723,16 @@ public void draw(int var1, int var2, int var3, int var4, int var5) { @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(IIIIIIB)Z", - garbageValue = "-107" + descriptor = "(IIIIIII)Z", + garbageValue = "-2129366613" ) - boolean method2441(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method2417(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.sprite == null) { return true; } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { return true; - } else if (this.field4039 != Client.field368) { + } else if (this.field4035 != Client.field369) { return true; } else if (var3 <= 0 && var4 <= 0) { return var3 + var1 < var5 || var2 + var4 < var6; @@ -749,13 +744,13 @@ boolean method2441(int var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "105561208" + garbageValue = "1396727376" ) - void method2442(int var1, int var2, int var3, int var4, int var5, int var6) { - if (WallDecoration.field2303 != null) { + void method2418(int var1, int var2, int var3, int var4, int var5, int var6) { + if (MidiPcmStream.field2799 != null) { int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); int var8 = var3 + 512; int var9 = var4 + 512; @@ -766,7 +761,7 @@ void method2442(int var1, int var2, int var3, int var4, int var5, int var6) { int var12 = this.getDisplayY() - var6 / 2 - var7; int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - if (this.method2441(var8, var9, var13, var14, var3, var4)) { + if (this.method2417(var8, var9, var13, var14, var3, var4)) { if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { Arrays.fill(this.sprite.pixels, 0); } else { @@ -776,32 +771,32 @@ void method2442(int var1, int var2, int var3, int var4, int var5, int var6) { this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - WallDecoration.field2303.method1999(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field4039 = Client.field368; + MidiPcmStream.field2799.method1987(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field4035 = Client.field369; var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); } Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); - if (var10 == 1.0F) { - this.sprite.method2717(var13, var14, 192); + if (1.0F == var10) { + this.sprite.method2695(var13, var14, 192); } else { - this.sprite.method2720(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); + this.sprite.method2698(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); } } } - @ObfuscatedName("az") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1890990429" + descriptor = "(IIIIB)V", + garbageValue = "51" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { if (this.cacheLoader.isLoaded()) { if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.method1509(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld, Client.param25 >= 217); + this.worldMapManager.method1264(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld, Client.param25 >= 217); if (!this.worldMapManager.isLoaded()) { return; } @@ -811,20 +806,20 @@ public void drawOverview(int var1, int var2, int var3, int var4) { } } - @ObfuscatedName("at") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-91789765" + descriptor = "(IB)V", + garbageValue = "0" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); } - @ObfuscatedName("af") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(IIIIII)V", - garbageValue = "76184385" + garbageValue = "-699862709" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { @@ -834,13 +829,13 @@ void drawLoading(int var1, int var2, int var3, int var4, int var5) { Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); - this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); + this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); } - @ObfuscatedName("ad") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(IB)F", - garbageValue = "5" + garbageValue = "31" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { @@ -857,16 +852,16 @@ float getZoomFromPercentage(int var1) { } } - @ObfuscatedName("bn") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-52" + descriptor = "(I)I", + garbageValue = "1066219424" ) @Export("getZoomLevel") public int getZoomLevel() { - if (1.0D == (double)this.zoomTarget) { + if ((double)this.zoomTarget == 1.0D) { return 25; - } else if (1.5D == (double)this.zoomTarget) { + } else if ((double)this.zoomTarget == 1.5D) { return 37; } else if (2.0D == (double)this.zoomTarget) { return 50; @@ -877,30 +872,30 @@ public int getZoomLevel() { } } - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1930237841" + descriptor = "(B)V", + garbageValue = "123" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); } - @ObfuscatedName("by") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "19517" + descriptor = "(I)Z", + garbageValue = "369984889" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); } - @ObfuscatedName("bd") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(IB)Lkz;", - garbageValue = "73" + descriptor = "(II)Ljv;", + garbageValue = "1808256615" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { @@ -918,10 +913,10 @@ public WorldMapArea getMapArea(int var1) { return var3; } - @ObfuscatedName("be") + @ObfuscatedName("bv") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1843882941" + garbageValue = "-678637606" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -931,10 +926,10 @@ public void setWorldMapPositionTarget(int var1, int var2) { } } - @ObfuscatedName("bv") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-31" + descriptor = "(III)V", + garbageValue = "-1573739056" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -945,10 +940,10 @@ public void setWorldMapPositionTargetInstant(int var1, int var2) { } } - @ObfuscatedName("ba") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "107" + descriptor = "(IIII)V", + garbageValue = "-13928817" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -961,10 +956,10 @@ public void jumpToSourceCoord(int var1, int var2, int var3) { } } - @ObfuscatedName("bz") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "30" + descriptor = "(IIII)V", + garbageValue = "996468240" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -977,60 +972,60 @@ public void jumpToSourceCoordInstant(int var1, int var2, int var3) { } } - @ObfuscatedName("bb") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-696270991" + descriptor = "(B)I", + garbageValue = "-43" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } - @ObfuscatedName("bo") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "-853833323" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } - @ObfuscatedName("bp") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(I)Lmo;", - garbageValue = "635022283" + descriptor = "(B)Lmh;", + garbageValue = "0" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } - @ObfuscatedName("bt") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-350169881" + garbageValue = "537116922" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; } - @ObfuscatedName("bm") + @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-756132894" + garbageValue = "1296388714" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; } - @ObfuscatedName("br") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-15167" + descriptor = "(II)V", + garbageValue = "-857515700" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1040,20 +1035,20 @@ public void setMaxFlashCount(int var1) { } - @ObfuscatedName("bs") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2080903444" + garbageValue = "1866064784" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; } - @ObfuscatedName("bc") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-629779711" + descriptor = "(IB)V", + garbageValue = "-90" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1063,30 +1058,30 @@ public void setCyclesPerFlash(int var1) { } - @ObfuscatedName("bu") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "970345063" + garbageValue = "1119701020" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; } - @ObfuscatedName("bf") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-685582392" + garbageValue = "1336488312" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; } - @ObfuscatedName("bh") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "94114012" + descriptor = "(IB)V", + garbageValue = "41" ) @Export("flashElement") public void flashElement(int var1) { @@ -1096,10 +1091,10 @@ public void flashElement(int var1) { this.flashCycle = 0; } - @ObfuscatedName("bl") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-230402435" + garbageValue = "-1850840845" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1107,38 +1102,38 @@ public void flashCategory(int var1) { this.flashCount = 0; this.flashCycle = 0; - for (int var2 = 0; var2 < DevicePcmPlayerProvider.WorldMapElement_count; ++var2) { - if (class148.WorldMapElement_get(var2) != null && class148.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(class148.WorldMapElement_get(var2).objectId); + for (int var2 = 0; var2 < class137.WorldMapElement_count; ++var2) { + if (class141.WorldMapElement_get(var2) != null && class141.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(class141.WorldMapElement_get(var2).objectId); } } } - @ObfuscatedName("bg") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "102" + descriptor = "(I)V", + garbageValue = "1649001731" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; } - @ObfuscatedName("bj") + @ObfuscatedName("bx") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "-8" + garbageValue = "0" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; } - @ObfuscatedName("bx") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "-769968427" + descriptor = "(IZB)V", + garbageValue = "125" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1148,13 +1143,13 @@ public void disableElement(int var1, boolean var2) { this.enabledElements.remove(var1); } - this.method2474(); + this.method2450(); } - @ObfuscatedName("bi") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(IZB)V", - garbageValue = "41" + descriptor = "(IZI)V", + garbageValue = "1569784149" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1164,9 +1159,9 @@ public void setCategoryDisabled(int var1, boolean var2) { this.enabledCategories.remove(var1); } - for (int var3 = 0; var3 < DevicePcmPlayerProvider.WorldMapElement_count; ++var3) { - if (class148.WorldMapElement_get(var3) != null && class148.WorldMapElement_get(var3).category == var1) { - int var4 = class148.WorldMapElement_get(var3).objectId; + for (int var3 = 0; var3 < class137.WorldMapElement_count; ++var3) { + if (class141.WorldMapElement_get(var3) != null && class141.WorldMapElement_get(var3).category == var1) { + int var4 = class141.WorldMapElement_get(var3).objectId; if (!var2) { this.enabledElementIds.add(var4); } else { @@ -1175,61 +1170,61 @@ public void setCategoryDisabled(int var1, boolean var2) { } } - this.method2474(); + this.method2450(); } - @ObfuscatedName("bq") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1516672500" + descriptor = "(B)Z", + garbageValue = "41" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; } - @ObfuscatedName("bw") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-12" + descriptor = "(II)Z", + garbageValue = "2012466674" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); } - @ObfuscatedName("ce") + @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "2114625315" + garbageValue = "-1791520679" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); } - @ObfuscatedName("cu") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1459658126" + descriptor = "(B)V", + garbageValue = "96" ) - void method2474() { - this.field4047.clear(); - this.field4047.addAll(this.enabledElements); - this.field4047.addAll(this.enabledElementIds); + void method2450() { + this.field4043.clear(); + this.field4043.addAll(this.enabledElements); + this.field4043.addAll(this.enabledElementIds); } - @ObfuscatedName("cw") + @ObfuscatedName("cv") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "331775866" + garbageValue = "-1420454539" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.cacheLoader.isLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); - List var9 = this.worldMapManager.method1514(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); + List var9 = this.worldMapManager.method1270(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); @@ -1240,12 +1235,12 @@ public void addElementMenuOptions(int var1, int var2, int var3, int var4, int va } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = class148.WorldMapElement_get(var11.getElement()); + WorldMapElement var12 = class141.WorldMapElement_get(var11.getElement()); var13 = false; for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { if (var12.menuActions[var14] != null) { - class153.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + WorldMapSectionType.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); var13 = true; } } @@ -1255,12 +1250,12 @@ public void addElementMenuOptions(int var1, int var2, int var3, int var4, int va } } - @ObfuscatedName("co") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(ILmo;I)Lmo;", - garbageValue = "1156685308" + descriptor = "(ILmh;I)Lmh;", + garbageValue = "1628169243" ) - public Coord method2476(int var1, Coord var2) { + public Coord method2452(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { @@ -1286,7 +1281,7 @@ public Coord method2476(int var1, Coord var2) { var8 = (AbstractWorldMapIcon)var7.next(); int var9 = var8.coord2.x - var2.x; int var10 = var8.coord2.y - var2.y; - var11 = var10 * var10 + var9 * var9; + var11 = var9 * var9 + var10 * var10; if (var11 == 0) { return var8.coord2; } @@ -1301,10 +1296,10 @@ public Coord method2476(int var1, Coord var2) { } } - @ObfuscatedName("cc") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "(IILmo;Lmo;I)V", - garbageValue = "-559043995" + descriptor = "(IILmh;Lmh;B)V", + garbageValue = "84" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1328,13 +1323,13 @@ public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { var5.setType(14); } - Interpreter.runScriptEvent(var5); + class157.runScriptEvent(var5); } - @ObfuscatedName("cg") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(I)Lll;", - garbageValue = "-1734759912" + descriptor = "(B)Ljc;", + garbageValue = "-80" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { @@ -1344,23 +1339,23 @@ public AbstractWorldMapIcon iconStart() { return null; } else { HashMap var1 = this.worldMapManager.buildIcons(); - this.field4051 = new LinkedList(); + this.field4047 = new LinkedList(); Iterator var2 = var1.values().iterator(); while (var2.hasNext()) { List var3 = (List)var2.next(); - this.field4051.addAll(var3); + this.field4047.addAll(var3); } - this.iconIterator = this.field4051.iterator(); + this.iconIterator = this.field4047.iterator(); return this.iconNext(); } } - @ObfuscatedName("cq") + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "(S)Lll;", - garbageValue = "21797" + descriptor = "(B)Ljc;", + garbageValue = "94" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { @@ -1379,4 +1374,94 @@ public AbstractWorldMapIcon iconNext() { return var1; } } + + @ObfuscatedName("it") + @ObfuscatedSignature( + descriptor = "(Ldf;I)V", + garbageValue = "-921124497" + ) + static final void method2456(Actor var0) { + int var2; + int var3; + int var4; + if (var0.targetIndex != -1) { + Object var1 = null; + var2 = 65536; + if (var0.targetIndex < var2) { + var1 = Client.npcs[var0.targetIndex]; + } else { + var1 = Client.players[var0.targetIndex - var2]; + } + + if (var1 != null) { + var3 = var0.x - ((Actor)var1).x; + var4 = var0.y - ((Actor)var1).y; + if (var3 != 0 || var4 != 0) { + var0.orientation = SequenceDefinition.method1040(var3, var4); + } + } else if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + } + + int var7; + if (var0.pathLength == 0 || var0.field1028 > 0) { + var7 = -1; + if (var0.field995 != -1 && var0.field997 != -1) { + var2 = var0.field995 * 128 - NewShit.baseX * 128 + 64; + var3 = var0.field997 * 128 - class101.baseY * 128 + 64; + var4 = var0.x - var2; + int var5 = var0.y - var3; + if (var4 != 0 || var5 != 0) { + var7 = SequenceDefinition.method1040(var4, var5); + } + } else if (var0.movingOrientation != -1) { + var7 = var0.movingOrientation; + } + + if (var7 != -1) { + var0.orientation = var7; + if (var0.field969) { + var0.rotation = var0.orientation; + } + } + + var0.method515(); + } + + var7 = var0.orientation - var0.rotation & 2047; + if (var7 != 0) { + boolean var8 = true; + boolean var9 = true; + ++var0.field1011; + var4 = var7 > 1024 ? -1 : 1; + var0.rotation += var0.field1018 * var4; + boolean var10 = true; + if (var7 < var0.field1018 || var7 > 2048 - var0.field1018) { + var0.rotation = var0.orientation; + var10 = false; + } + + if (var0.field1018 > 0 && var0.movementSequence == var0.idleSequence && (var0.field1011 > 25 || var10)) { + if (var4 == -1 && var0.turnLeftSequence != -1) { + var0.movementSequence = var0.turnLeftSequence; + } else if (var4 == 1 && var0.turnRightSequence != -1) { + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + + var0.rotation &= 2047; + } else { + if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + + var0.field1011 = 0; + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapArchiveLoader.java b/osrs/src/main/java/WorldMapArchiveLoader.java index a6327cc25..dec3b6648 100644 --- a/osrs/src/main/java/WorldMapArchiveLoader.java +++ b/osrs/src/main/java/WorldMapArchiveLoader.java @@ -3,27 +3,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tb") +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; + +@ObfuscatedName("sl") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("cacheName") String cacheName; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Lom;)V" + descriptor = "(Lol;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; @@ -31,10 +37,10 @@ public class WorldMapArchiveLoader { this.archive = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "211979079" + garbageValue = "2039026903" ) @Export("reset") void reset(String var1) { @@ -48,10 +54,10 @@ void reset(String var1) { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1289967643" + descriptor = "(B)I", + garbageValue = "-24" ) @Export("load") int load() { @@ -60,7 +66,7 @@ int load() { this.loaded = true; } else { if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2484.name, this.cacheName)) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2093.name, this.cacheName)) { return this.percentLoaded; } @@ -68,7 +74,7 @@ int load() { } if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field2483.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2483.name, this.cacheName)) { + if (this.archive.isValidFileName(WorldMapCacheName.field2094.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2094.name, this.cacheName)) { return this.percentLoaded; } @@ -76,7 +82,7 @@ int load() { } if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2485.name)) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2092.name)) { return this.percentLoaded; } @@ -88,40 +94,60 @@ int load() { return this.percentLoaded; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "0" + garbageValue = "74" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "835132926" + garbageValue = "301299850" ) @Export("getPercentLoaded") int getPercentLoaded() { return this.percentLoaded; } - @ObfuscatedName("jo") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2054343870" + descriptor = "([BI)Luz;", + garbageValue = "1918465427" ) - static void method2420() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; + public static final SpritePixels method2391(byte[] var0) { + BufferedImage var1 = null; - for (int var2 = 0; var2 < var0; ++var2) { - if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { - class199.addPlayerToScene(Client.players[var1[var2]], true); + try { + Class var2 = ImageIO.class; + synchronized(ImageIO.class) { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); } + + int var6 = var1.getWidth(); + int var7 = var1.getHeight(); + int[] var4 = new int[var7 * var6]; + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var6, var7, var4, 0, var6); + var5.grabPixels(); + return new SpritePixels(var4, var6, var7); + } catch (IOException var9) { + } catch (InterruptedException var10) { } + return new SpritePixels(0, 0); + } + + @ObfuscatedName("gj") + @ObfuscatedSignature( + descriptor = "(I)Ltn;", + garbageValue = "-472166633" + ) + @Export("getWorldMap") + static WorldMap getWorldMap() { + return NewShit.worldMap; } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapArea.java b/osrs/src/main/java/WorldMapArea.java index a2b122876..61de74079 100644 --- a/osrs/src/main/java/WorldMapArea.java +++ b/osrs/src/main/java/WorldMapArea.java @@ -6,57 +6,54 @@ import java.util.Iterator; import java.util.LinkedList; -@ObfuscatedName("kz") +@ObfuscatedName("jv") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("ki") - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("id") int id; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("internalName") String internalName; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("externalName") String externalName; - @ObfuscatedName("ax") - int field2364; @ObfuscatedName("ao") - int field2362; - @ObfuscatedName("ah") + int field1968; + @ObfuscatedName("ab") + int field1965; + @ObfuscatedName("au") @Export("zoom") int zoom; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmh;" ) @Export("origin") Coord origin; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("regionLowX") int regionLowX; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("regionHighX") int regionHighX; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("regionLowY") int regionLowY; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("regionHighY") int regionHighY; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("isMain") boolean isMain; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("sections") LinkedList sections; public WorldMapArea() { this.id = -1; - this.field2364 = -1; - this.field2362 = -16777216; + this.field1968 = -1; + this.field1965 = -16777216; this.zoom = -1; this.origin = null; this.regionLowX = Integer.MAX_VALUE; @@ -66,19 +63,19 @@ public WorldMapArea() { this.isMain = false; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;IZI)V", - garbageValue = "1729868446" + descriptor = "(Luj;IZI)V", + garbageValue = "-44094135" ) - public void method1452(Buffer var1, int var2, boolean var3) { + public void method1205(Buffer var1, int var2, boolean var3) { this.id = var2; this.internalName = var1.readStringCp1252NullTerminated(); this.externalName = var1.readStringCp1252NullTerminated(); this.origin = new Coord(var1.readInt()); - this.field2364 = var1.readInt(); + this.field1968 = var1.readInt(); if (var3) { - this.field2362 = var1.readInt(); + this.field1965 = var1.readInt(); } var1.readUnsignedByte(); @@ -94,42 +91,41 @@ public void method1452(Buffer var1, int var2, boolean var3) { this.setBounds(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)Llm;", - garbageValue = "-358116235" + descriptor = "(Luj;B)Ljj;", + garbageValue = "2" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; - WorldMapSectionType var4 = (WorldMapSectionType)SequenceDefinition.findEnumerated(var3, var2); - Object var5 = null; - switch(var4.type) { + WorldMapSectionType var3 = (WorldMapSectionType)class12.findEnumerated(WorldMapSectionType.method1309(), var2); + Object var4 = null; + switch(var3.type) { case 0: - var5 = new WorldMapSection2(); + var4 = new WorldMapSection2(); break; case 1: - var5 = new WorldMapSection0(); + var4 = new WorldMapSection1(); break; case 2: - var5 = new WorldMapSection1(); + var4 = new class240(); break; case 3: - var5 = new class274(); + var4 = new WorldMapSection0(); break; default: throw new IllegalStateException(""); } - ((WorldMapSection)var5).read(var1); - return (WorldMapSection)var5; + ((WorldMapSection)var4).read(var1); + return (WorldMapSection)var4; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIIS)Z", - garbageValue = "18238" + descriptor = "(IIII)Z", + garbageValue = "-808014283" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -147,10 +143,10 @@ public boolean containsCoord(int var1, int var2, int var3) { return true; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1010823945" + descriptor = "(IIB)Z", + garbageValue = "0" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -178,10 +174,10 @@ public boolean containsPosition(int var1, int var2) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "150153753" + descriptor = "(IIIB)[I", + garbageValue = "1" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -199,10 +195,10 @@ public int[] position(int var1, int var2, int var3) { return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(III)Lmo;", - garbageValue = "-1645849130" + descriptor = "(III)Lmh;", + garbageValue = "-468461591" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -220,10 +216,10 @@ public Coord coord(int var1, int var2) { return var4.coord(var1, var2); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "834208858" + garbageValue = "611139604" ) @Export("setBounds") void setBounds() { @@ -236,128 +232,128 @@ void setBounds() { } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-20045" + descriptor = "(B)I", + garbageValue = "73" ) @Export("getId") public int getId() { return this.id; } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-105" + descriptor = "(I)Z", + garbageValue = "1014185109" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "47" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "2145030252" ) @Export("getInternalName") public String getInternalName() { return this.internalName; } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1404403293" + garbageValue = "-1365317840" ) @Export("getExternalName") public String getExternalName() { return this.externalName; } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2113761361" + descriptor = "(B)I", + garbageValue = "33" ) - int method1463() { - return this.field2364; + int method1218() { + return this.field1968; } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-293473033" + garbageValue = "-1742263057" ) - int method1464() { - return this.field2362; + int method1219() { + return this.field1965; } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "220732046" + garbageValue = "1577792513" ) @Export("getZoom") public int getZoom() { return this.zoom; } - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "112" + descriptor = "(I)I", + garbageValue = "-2095033284" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; } - @ObfuscatedName("aj") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "77" + garbageValue = "119" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; } - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "61" + descriptor = "(I)I", + garbageValue = "-2077646418" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-90" + descriptor = "(I)I", + garbageValue = "1665861743" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; } - @ObfuscatedName("ai") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-23241120" + garbageValue = "494271544" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-12" + descriptor = "(S)I", + garbageValue = "-2282" ) @Export("getOriginPlane") public int getOriginPlane() { @@ -366,21 +362,87 @@ public int getOriginPlane() { @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-23" + descriptor = "(I)I", + garbageValue = "927085335" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Lmo;", - garbageValue = "1687888353" + descriptor = "(B)Lmh;", + garbageValue = "-69" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "-71" + ) + public static boolean method1207(char var0) { + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { + if (var0 != 0) { + char[] var1 = class396.cp1252AsciiExtension; + + for (int var2 = 0; var2 < var1.length; ++var2) { + char var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } + } + + return false; + } else { + return true; + } + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)Lun;", + garbageValue = "-1672092553" + ) + public static PrivateChatMode method1204(int var0) { + PrivateChatMode[] var1 = SecureRandomCallable.method456(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PrivateChatMode var3 = var1[var2]; + if (var0 == var3.id) { + return var3; + } + } + + return null; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "122" + ) + static final void method1213(String var0) { + GrandExchangeOfferUnitPriceComparator.addGameMessage(30, "", var0); + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "([BB)Lpf;", + garbageValue = "94" + ) + public static Font method1229(byte[] var0) { + if (var0 == null) { + return null; + } else { + Font var1 = new Font(var0, class541.SpriteBuffer_xOffsets, class541.SpriteBuffer_yOffsets, class541.SpriteBuffer_spriteWidths, class520.SpriteBuffer_spriteHeights, class541.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); + class458.method2306(); + return var1; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapAreaData.java b/osrs/src/main/java/WorldMapAreaData.java index f4be04f6f..7df242288 100644 --- a/osrs/src/main/java/WorldMapAreaData.java +++ b/osrs/src/main/java/WorldMapAreaData.java @@ -7,29 +7,34 @@ import java.util.LinkedList; import java.util.List; -@ObfuscatedName("lj") +@ObfuscatedName("jx") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("ay") - HashSet field2489; + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + static Archive field2099; @ObfuscatedName("as") - HashSet field2488; - @ObfuscatedName("aj") + HashSet field2100; + @ObfuscatedName("ay") + HashSet field2101; + @ObfuscatedName("ak") @Export("iconList") List iconList; WorldMapAreaData() { } - @ObfuscatedName("cx") + @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "(Lul;Lul;IZZI)V", - garbageValue = "-940833039" + descriptor = "(Luj;Luj;IZZI)V", + garbageValue = "-605935351" ) - void method1599(Buffer var1, Buffer var2, int var3, boolean var4, boolean var5) { - this.method1452(var1, var3, var5); + void method1363(Buffer var1, Buffer var2, int var3, boolean var4, boolean var5) { + this.method1205(var1, var3, var5); int var6 = var2.readUnsignedShort(); - this.field2489 = new HashSet(var6); + this.field2100 = new HashSet(var6); int var7; for (var7 = 0; var7 < var6; ++var7) { @@ -41,11 +46,11 @@ void method1599(Buffer var1, Buffer var2, int var3, boolean var4, boolean var5) continue; } - this.field2489.add(var8); + this.field2100.add(var8); } var7 = var2.readUnsignedShort(); - this.field2488 = new HashSet(var7); + this.field2101 = new HashSet(var7); for (int var11 = 0; var11 < var7; ++var11) { WorldMapData_1 var9 = new WorldMapData_1(); @@ -56,16 +61,16 @@ void method1599(Buffer var1, Buffer var2, int var3, boolean var4, boolean var5) continue; } - this.field2488.add(var9); + this.field2101.add(var9); } this.initIconsList(var2, var4); } - @ObfuscatedName("ch") + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "(Lul;ZB)V", - garbageValue = "0" + descriptor = "(Luj;ZI)V", + garbageValue = "950262169" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -83,98 +88,372 @@ void initIconsList(Buffer var1, boolean var2) { } - @ObfuscatedName("bu") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "1112250156" + descriptor = "(II)F", + garbageValue = "1883889398" ) - static int method1601(int var0, Script var1, boolean var2) { - if (var0 == 6200) { - Interpreter.Interpreter_intStackSize -= 2; - Client.field634 = (short)class274.method1536(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - if (Client.field634 <= 0) { - Client.field634 = 256; - } + static final float method1364(int var0) { + float var1 = 10075.0F - (float)var0; + return (var1 * 1.0075567F - 75.56675F) / var1; + } - Client.field633 = (short)class274.method1536(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - if (Client.field633 <= 0) { - Client.field633 = 256; - } + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(Lnn;IIII)V", + garbageValue = "-1973089018" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3073 == null) { + throw new RuntimeException(); + } else { + var0.field3073[var1] = var2; + var0.field3072[var1] = var3; + } + } - return 1; - } else if (var0 == 6201) { - Interpreter.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIB)V", + garbageValue = "-113" + ) + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { + if (Client.isLowDetail && var0 != ItemLayer.Client_plane) { + return; } - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; + long var8 = 0L; + boolean var10 = true; + boolean var11 = false; + boolean var12 = false; + if (var1 == 0) { + var8 = class36.scene.getBoundaryObjectTag(var0, var2, var3); } - return 1; - } else if (var0 == 6202) { - Interpreter.Interpreter_intStackSize -= 4; - Client.field639 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (Client.field639 <= 0) { - Client.field639 = 1; + if (var1 == 1) { + var8 = class36.scene.getWallDecorationTag(var0, var2, var3); } - Client.field640 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (Client.field640 <= 0) { - Client.field640 = 32767; - } else if (Client.field640 < Client.field639) { - Client.field640 = Client.field639; + if (var1 == 2) { + var8 = class36.scene.getGameObjectTag(var0, var2, var3); } - Client.field638 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (Client.field638 <= 0) { - Client.field638 = 1; + if (var1 == 3) { + var8 = class36.scene.getFloorDecorationTag(var0, var2, var3); } - Client.field635 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - if (Client.field635 <= 0) { - Client.field635 = 32767; - } else if (Client.field635 < Client.field638) { - Client.field635 = Client.field638; - } + int var13; + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (0L != var8) { + var13 = class36.scene.getObjectFlags(var0, var2, var3, var8); + int var44 = class232.Entity_unpackID(var8); + int var45 = var13 & 31; + int var46 = var13 >> 6 & 3; + ObjectComposition var14 = WorldMapSection2.getObjectDefinition(var44); + if (var14 != null && var14.hasSound()) { + var17 = var14.sizeX; + var18 = var14.sizeY; + if (var46 == 1 || var46 == 3) { + var17 = var14.sizeY; + var18 = var14.sizeX; + } + + var19 = (var17 + var2) * 128; + var20 = (var3 + var18) * 128; + int var15 = var2 * 128; + int var16 = var3 * 128; + var21 = var14.ambientSoundId; + var22 = var14.int7 * 128; + if (var14.transforms != null) { + ObjectComposition var23 = var14.transform(); + if (var23 != null) { + var21 = var23.ambientSoundId; + var22 = var23.int7 * 128; + } + } + + Object var10000 = null; + + for (ObjectSound var48 = (ObjectSound)ObjectSound.objectSounds.last(); var48 != null; var48 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0 == var48.plane && var15 == var48.x && var16 == var48.y && var19 == var48.maxX && var20 == var48.maxY && var21 == var48.soundEffectId && var22 == var48.field691) { + if (var48.stream1 != null) { + LoginScreenAnimation.pcmStreamMixer.removeSubStream(var48.stream1); + var48.stream1 = null; + } + + if (var48.stream2 != null) { + LoginScreenAnimation.pcmStreamMixer.removeSubStream(var48.stream2); + var48.stream2 = null; + } + + var48.remove(); + break; + } - return 1; - } else if (var0 == 6203) { - if (Client.viewportWidget != null) { - class53.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + var10000 = null; + } + } + + if (var1 == 0) { + class36.scene.method1474(var0, var2, var3); + if (var14.interactType != 0) { + Client.collisionMaps[var0].method1142(var2, var3, var45, var46, var14.boolean1); + } + } + + if (var1 == 1) { + class36.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { + class36.scene.removeGameObject(var0, var2, var3); + if (var2 + var14.sizeX > 103 || var3 + var14.sizeX > 103 || var2 + var14.sizeY > 103 || var3 + var14.sizeY > 103) { + return; + } + + if (var14.interactType != 0) { + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var14.sizeX, var14.sizeY, var46, var14.boolean1); + } + } + + if (var1 == 3) { + class36.scene.removeFloorDecoration(var0, var2, var3); + if (var14.interactType == 1) { + Client.collisionMaps[var0].method1145(var2, var3); + } + } } - return 1; - } else if (var0 == 6204) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; - } else if (var0 == 6205) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class398.method2052(Client.field634); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class398.method2052(Client.field633); - return 1; - } else if (var0 == 6220) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6221) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6222) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class340.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class491.canvasHeight; - return 1; - } else { - return 2; + if (var4 >= 0) { + var13 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var13 = var0 + 1; + } + + Scene var47 = class36.scene; + CollisionMap var37 = Client.collisionMaps[var0]; + ObjectComposition var38 = WorldMapSection2.getObjectDefinition(var4); + var17 = var7 >= 0 ? var7 : var38.animationId * -1341489307 * 1434557037; + if (var5 != 1 && var5 != 3) { + var18 = var38.sizeX; + var19 = var38.sizeY; + } else { + var18 = var38.sizeY; + var19 = var38.sizeX; + } + + if (var18 + var2 <= 104) { + var20 = (var18 >> 1) + var2; + var21 = var2 + (var18 + 1 >> 1); + } else { + var20 = var2; + var21 = var2 + 1; + } + + int var39; + if (var3 + var19 <= 104) { + var22 = var3 + (var19 >> 1); + var39 = var3 + (var19 + 1 >> 1); + } else { + var22 = var3; + var39 = var3 + 1; + } + + int[][] var24 = Tiles.Tiles_heights[var13]; + int var25 = var24[var20][var22] + var24[var21][var22] + var24[var20][var39] + var24[var21][var39] >> 2; + int var26 = (var2 << 7) + (var18 << 6); + int var27 = (var3 << 7) + (var19 << 6); + long var28 = Player.calculateTag(var2, var3, 2, var38.int1 == 0, var4); + int var30 = (var5 << 6) + var6; + if (var38.int3 == 1) { + var30 += 256; + } + + Object var31; + if (var6 == 22) { + if (var17 == -1 && var38.transforms == null) { + var31 = var38.getModel(22, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 22, var5, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.newFloorDecoration(var0, var2, var3, var25, (Renderable)var31, var28, var30); + if (var38.interactType == 1) { + var37.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var17 == -1 && var38.transforms == null) { + var31 = var38.getModel(var6, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, var6, var5, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.method1467(var0, var2, var3, var25, 1, 1, (Renderable)var31, 0, var28, var30); + if (var38.interactType != 0) { + var37.addGameObject(var2, var3, var18, var19, var38.boolean1); + } + } else if (var6 == 0) { + if (var17 == -1 && var38.transforms == null) { + var31 = var38.getModel(0, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 0, var5, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field849[var5], 0, var28, var30); + if (var38.interactType != 0) { + var37.method1137(var2, var3, var6, var5, var38.boolean1); + } + } else if (var6 == 1) { + if (var17 == -1 && var38.transforms == null) { + var31 = var38.getModel(1, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 1, var5, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field847[var5], 0, var28, var30); + if (var38.interactType != 0) { + var37.method1137(var2, var3, var6, var5, var38.boolean1); + } + } else { + int var40; + if (var6 == 2) { + var40 = var5 + 1 & 3; + Object var32; + Object var33; + if (var17 == -1 && var38.transforms == null) { + var32 = var38.getModel(2, var5 + 4, var24, var26, var25, var27); + var33 = var38.getModel(2, var40, var24, var26, var25, var27); + } else { + var32 = new DynamicObject(var4, 2, var5 + 4, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + var33 = new DynamicObject(var4, 2, var40, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.newBoundaryObject(var0, var2, var3, var25, (Renderable)var32, (Renderable)var33, Tiles.field849[var5], Tiles.field849[var40], var28, var30); + if (var38.interactType != 0) { + var37.method1137(var2, var3, var6, var5, var38.boolean1); + } + } else if (var6 == 3) { + if (var17 == -1 && var38.transforms == null) { + var31 = var38.getModel(3, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 3, var5, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.newBoundaryObject(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field847[var5], 0, var28, var30); + if (var38.interactType != 0) { + var37.method1137(var2, var3, var6, var5, var38.boolean1); + } + } else if (var6 == 9) { + if (var17 == -1 && var38.transforms == null) { + var31 = var38.getModel(var6, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, var6, var5, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.method1467(var0, var2, var3, var25, 1, 1, (Renderable)var31, 0, var28, var30); + if (var38.interactType != 0) { + var37.addGameObject(var2, var3, var18, var19, var38.boolean1); + } + } else if (var6 == 4) { + if (var17 == -1 && var38.transforms == null) { + var31 = var38.getModel(4, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 4, var5, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.newWallDecoration(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, Tiles.field849[var5], 0, 0, 0, var28, var30); + } else { + Object var34; + long var41; + if (var6 == 5) { + var40 = 16; + var41 = var47.getBoundaryObjectTag(var0, var2, var3); + if (var41 != 0L) { + var40 = WorldMapSection2.getObjectDefinition(class232.Entity_unpackID(var41)).int2; + } + + if (var17 == -1 && var38.transforms == null) { + var34 = var38.getModel(4, var5, var24, var26, var25, var27); + } else { + var34 = new DynamicObject(var4, 4, var5, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)null, Tiles.field849[var5], 0, var40 * Tiles.field850[var5], var40 * Tiles.field845[var5], var28, var30); + } else if (var6 == 6) { + var40 = 8; + var41 = var47.getBoundaryObjectTag(var0, var2, var3); + if (0L != var41) { + var40 = WorldMapSection2.getObjectDefinition(class232.Entity_unpackID(var41)).int2 / 2; + } + + if (var17 == -1 && var38.transforms == null) { + var34 = var38.getModel(4, var5 + 4, var24, var26, var25, var27); + } else { + var34 = new DynamicObject(var4, 4, var5 + 4, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)null, 256, var5, var40 * Tiles.field848[var5], var40 * Tiles.field846[var5], var28, var30); + } else if (var6 == 7) { + int var43 = var5 + 2 & 3; + if (var17 == -1 && var38.transforms == null) { + var31 = var38.getModel(4, var43 + 4, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 4, var43 + 4, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.newWallDecoration(var0, var2, var3, var25, (Renderable)var31, (Renderable)null, 256, var43, 0, 0, var28, var30); + } else if (var6 == 8) { + var40 = 8; + var41 = var47.getBoundaryObjectTag(var0, var2, var3); + if (var41 != 0L) { + var40 = WorldMapSection2.getObjectDefinition(class232.Entity_unpackID(var41)).int2 / 2; + } + + int var36 = var5 + 2 & 3; + Object var35; + if (var17 == -1 && var38.transforms == null) { + var34 = var38.getModel(4, var5 + 4, var24, var26, var25, var27); + var35 = var38.getModel(4, var36 + 4, var24, var26, var25, var27); + } else { + var34 = new DynamicObject(var4, 4, var5 + 4, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + var35 = new DynamicObject(var4, 4, var36 + 4, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + var47.newWallDecoration(var0, var2, var3, var25, (Renderable)var34, (Renderable)var35, 256, var5, var40 * Tiles.field848[var5], var40 * Tiles.field846[var5], var28, var30); + } + } + } + } else { + if (var17 == -1 && var38.transforms == null) { + var31 = var38.getModel(10, var5, var24, var26, var25, var27); + } else { + var31 = new DynamicObject(var4, 10, var5, var13, var2, var3, var17, var38.boolean3, (Renderable)null); + } + + if (var31 != null) { + var47.method1467(var0, var2, var3, var25, var18, var19, (Renderable)var31, var6 == 11 ? 256 : 0, var28, var30); + } + + if (var38.interactType != 0) { + var37.addGameObject(var2, var3, var18, var19, var38.boolean1); + } + } + + var38 = WorldMapSection2.getObjectDefinition(var4); + if (var38 != null && var38.hasSound()) { + UrlRequester.method648(var13, var2, var3, var38, var5); + } + } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapCacheName.java b/osrs/src/main/java/WorldMapCacheName.java index babb6dc1f..0a806a4d7 100644 --- a/osrs/src/main/java/WorldMapCacheName.java +++ b/osrs/src/main/java/WorldMapCacheName.java @@ -3,65 +3,635 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +import java.util.ArrayList; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; + +@ObfuscatedName("jz") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Ljz;" ) - public static final WorldMapCacheName field2482; - @ObfuscatedName("al") + public static final WorldMapCacheName field2095; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Ljz;" ) - public static final WorldMapCacheName field2484; - @ObfuscatedName("ak") + public static final WorldMapCacheName field2093; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Ljz;" ) - public static final WorldMapCacheName field2483; - @ObfuscatedName("ax") + public static final WorldMapCacheName field2094; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Ljz;" ) - static final WorldMapCacheName field2486; - @ObfuscatedName("ao") + static final WorldMapCacheName field2097; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Ljz;" ) - public static final WorldMapCacheName field2485; - @ObfuscatedName("ah") + public static final WorldMapCacheName field2092; + @ObfuscatedName("gt") + @Export("worldPort") + static int worldPort; + @ObfuscatedName("au") @Export("name") public final String name; static { - field2482 = new WorldMapCacheName("details"); - field2484 = new WorldMapCacheName("compositemap"); - field2483 = new WorldMapCacheName("compositetexture"); - field2486 = new WorldMapCacheName("area"); - field2485 = new WorldMapCacheName("labels"); + field2095 = new WorldMapCacheName("details"); + field2093 = new WorldMapCacheName("compositemap"); + field2094 = new WorldMapCacheName("compositetexture"); + field2097 = new WorldMapCacheName("area"); + field2092 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { this.name = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)Luz;", + garbageValue = "-120" + ) + static SpritePixels method1353() { + SpritePixels var0 = new SpritePixels(); + var0.width = class541.SpriteBuffer_spriteWidth; + var0.height = GrandExchangeOfferWorldComparator.SpriteBuffer_spriteHeight; + var0.xOffset = class541.SpriteBuffer_xOffsets[0]; + var0.yOffset = class541.SpriteBuffer_yOffsets[0]; + var0.subWidth = class541.SpriteBuffer_spriteWidths[0]; + var0.subHeight = class520.SpriteBuffer_spriteHeights[0]; + int var1 = var0.subHeight * var0.subWidth; + byte[] var2 = class396.SpriteBuffer_pixels[0]; + var0.pixels = new int[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + var0.pixels[var3] = class541.SpriteBuffer_spritePalette[var2[var3] & 255]; + } + + class458.method2306(); + return var0; + } + + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1839929572" + ) + static void method1354() { + int var0; + if (Client.field414 == class92.field942) { + class36.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); + + for (var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0] = new CollisionMap(104, 104); + } + + class102.sceneMinimapSprite = new SpritePixels(512, 512); + Login.Login_loadingText = "Starting game engine..."; + Login.Login_loadingPercent = 5; + Client.field414 = class92.field935; + } else if (Client.field414 == class92.field935) { + Login.Login_loadingText = "Prepared visibility map"; + Login.Login_loadingPercent = 10; + Client.field414 = class92.field940; + } else if (class92.field940 == Client.field414) { + UserComparator7.field1190 = Skeleton.newArchive(0, false, true, true, false); + class145.field1338 = Skeleton.newArchive(1, false, true, true, false); + class344.archive2 = Skeleton.newArchive(2, true, false, true, false); + class313.archive4 = Skeleton.newArchive(3, false, true, true, false); + Language.field3643 = Skeleton.newArchive(4, false, true, true, false); + WorldMapSection0.archive9 = Skeleton.newArchive(5, true, true, true, false); + class514.archive6 = Skeleton.newArchive(6, true, true, true, false); + class19.field59 = Skeleton.newArchive(7, false, true, true, false); + GrandExchangeOfferOwnWorldComparator.archive8 = Skeleton.newArchive(8, false, true, true, false); + Canvas.field68 = Skeleton.newArchive(9, false, true, true, false); + WorldMapDecorationType.archive10 = Skeleton.newArchive(10, false, true, true, false); + PcmPlayer.field181 = Skeleton.newArchive(11, false, true, true, false); + class47.archive12 = Skeleton.newArchive(12, false, true, true, false); + VarbitComposition.archive13 = Skeleton.newArchive(13, true, false, true, false); + StructComposition.field1637 = Skeleton.newArchive(14, false, true, true, false); + class7.field12 = Skeleton.newArchive(15, false, true, true, false); + SoundSystem.field209 = Skeleton.newArchive(17, true, true, true, false); + BuddyRankComparator.field1200 = Skeleton.newArchive(18, false, true, true, false); + SpotAnimationDefinition.field1597 = Skeleton.newArchive(19, false, true, true, false); + WorldMapData_0.field1938 = Skeleton.newArchive(20, false, true, true, false); + class267.field2224 = Skeleton.newArchive(21, false, true, true, false); + WorldMapAreaData.field2099 = SequenceDefinition.method1054(22, false, true, true, true, true); + Login.Login_loadingText = "Connecting to update server"; + Login.Login_loadingPercent = 20; + Client.field414 = class92.field938; + } else if (class92.field938 == Client.field414) { + byte var42 = 0; + var0 = var42 + UserComparator7.field1190.percentage() * 4 / 100; + var0 += class145.field1338.percentage() * 4 / 100; + var0 += class344.archive2.percentage() * 2 / 100; + var0 += class313.archive4.percentage() * 2 / 100; + var0 += Language.field3643.percentage() * 6 / 100; + var0 += WorldMapSection0.archive9.percentage() * 4 / 100; + var0 += class514.archive6.percentage() * 2 / 100; + var0 += class19.field59.percentage() * 54 / 100; + var0 += GrandExchangeOfferOwnWorldComparator.archive8.percentage() * 2 / 100; + var0 += Canvas.field68.percentage() * 2 / 100; + var0 += WorldMapDecorationType.archive10.percentage() * 2 / 100; + var0 += PcmPlayer.field181.percentage() * 2 / 100; + var0 += class47.archive12.percentage() * 2 / 100; + var0 += VarbitComposition.archive13.percentage() * 2 / 100; + var0 += StructComposition.field1637.percentage() * 2 / 100; + var0 += class7.field12.percentage() * 2 / 100; + var0 += SpotAnimationDefinition.field1597.percentage() / 100; + var0 += BuddyRankComparator.field1200.percentage() / 100; + var0 += WorldMapData_0.field1938.percentage() / 100; + var0 += class267.field2224.percentage() / 100; + var0 += WorldMapAreaData.field2099.percentage() / 100; + var0 += SoundSystem.field209.method1912() && SoundSystem.field209.isFullyLoaded() ? 1 : 0; + if (var0 != 100) { + if (var0 != 0) { + Login.Login_loadingText = "Checking for updates - " + var0 + "%"; + } + + Login.Login_loadingPercent = 30; + } else { + class357.method1900(UserComparator7.field1190, "Animations"); + class357.method1900(class145.field1338, "Skeletons"); + class357.method1900(Language.field3643, "Sound FX"); + class357.method1900(WorldMapSection0.archive9, "Maps"); + class357.method1900(class514.archive6, "Music Tracks"); + class357.method1900(class19.field59, "Models"); + class357.method1900(GrandExchangeOfferOwnWorldComparator.archive8, "Sprites"); + class357.method1900(PcmPlayer.field181, "Music Jingles"); + class357.method1900(StructComposition.field1637, "Music Samples"); + class357.method1900(class7.field12, "Music Patches"); + class357.method1900(SpotAnimationDefinition.field1597, "World Map"); + class357.method1900(BuddyRankComparator.field1200, "World Map Geography"); + class357.method1900(WorldMapData_0.field1938, "World Map Ground"); + class376.field3614 = new GraphicsDefaults(); + class376.field3614.decode(SoundSystem.field209); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.field414 = class92.field933; + } + } else { + Archive var7; + Archive var8; + Archive var25; + if (class92.field933 == Client.field414) { + boolean var41 = !Client.isLowDetail; + PcmPlayer.field179 = 22050; + WorldMapRectangle.PcmPlayer_stereo = var41; + PcmPlayer.field180 = 2; + ArrayList var34 = new ArrayList(3); + TaskHandler var32 = GameEngine.taskHandler; + short var40 = 2048; + if (var40 < 256) { + var40 = 256; + } + + PcmPlayer var33; + try { + PcmPlayer var36 = PcmPlayer.pcmPlayerProvider.player(); + var36.samples = new int[256 * (WorldMapRectangle.PcmPlayer_stereo ? 2 : 1)]; + var36.field196 = var40; + var36.init(); + var36.capacity = (var40 & -1024) + 1024; + if (var36.capacity > 16384) { + var36.capacity = 16384; + } + + var36.open(var36.capacity); + if (PcmPlayer.field180 > 0 && DelayFadeTask.soundSystem == null) { + DelayFadeTask.soundSystem = new SoundSystem(); + class342.soundSystemExecutor = Executors.newScheduledThreadPool(1); + class342.soundSystemExecutor.scheduleAtFixedRate(DelayFadeTask.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + } + + if (DelayFadeTask.soundSystem != null) { + if (DelayFadeTask.soundSystem.players[0] != null) { + throw new IllegalArgumentException(); + } + + DelayFadeTask.soundSystem.players[0] = var36; + } + + var33 = var36; + } catch (Throwable var30) { + var33 = new PcmPlayer(); + } + + MusicPatchPcmStream.pcmPlayer1 = var33; + LoginScreenAnimation.pcmStreamMixer = new PcmStreamMixer(); + PcmStreamMixer var37 = new PcmStreamMixer(); + var37.addSubStream(LoginScreenAnimation.pcmStreamMixer); + + for (int var6 = 0; var6 < 3; ++var6) { + MidiPcmStream var38 = new MidiPcmStream(); + var38.method1662(9, 128); + var37.addSubStream(var38); + var34.add(var38); + } + + MusicPatchPcmStream.pcmPlayer1.setStream(var37); + var25 = class7.field12; + var7 = StructComposition.field1637; + var8 = Language.field3643; + class316.field2792 = var25; + class316.field2791 = var7; + class168.field1428 = var8; + class316.midiPcmStream = var34; + class521.decimator = new Decimator(22050, PcmPlayer.field179); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.field414 = class92.field943; + class140.field1318 = new Fonts(GrandExchangeOfferOwnWorldComparator.archive8, VarbitComposition.archive13); + } else if (Client.field414 == class92.field943) { + var0 = FontName.method2458().length; + Client.fontsMap = class140.field1318.createMap(FontName.method2458()); + if (Client.fontsMap.size() < var0) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var0 + "%"; + Login.Login_loadingPercent = 40; + } else { + class369.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + ItemLayer.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + GrandExchangeOfferTotalQuantityComparator.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + class60.field312 = Client.field645.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.field414 = class92.field932; + } + } else { + int var26; + if (Client.field414 == class92.field932) { + var0 = User.method2239(WorldMapDecorationType.archive10, GrandExchangeOfferOwnWorldComparator.archive8); + var26 = class189.method954(GrandExchangeOfferOwnWorldComparator.archive8); + if (var0 < var26) { + Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var26 + "%"; + Login.Login_loadingPercent = 50; + } else { + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + WorldMapSection2.updateGameState(5); + Client.field414 = class92.field934; + } + } else { + Archive var2; + boolean var4; + if (class92.field934 != Client.field414) { + if (class92.field937 == Client.field414) { + var0 = 0; + if (ItemLayer.compass == null) { + ItemLayer.compass = IgnoreList.SpriteBuffer_getSprite(GrandExchangeOfferOwnWorldComparator.archive8, class376.field3614.compass, 0); + } else { + ++var0; + } + + if (class11.redHintArrowSprite == null) { + class11.redHintArrowSprite = IgnoreList.SpriteBuffer_getSprite(GrandExchangeOfferOwnWorldComparator.archive8, class376.field3614.field3884, 0); + } else { + ++var0; + } + + int var28; + IndexedSprite[] var31; + byte[] var35; + if (VarpDefinition.mapSceneSprites == null) { + var2 = GrandExchangeOfferOwnWorldComparator.archive8; + var28 = class376.field3614.mapScenes; + var35 = var2.takeFile(var28, 0); + if (var35 == null) { + var4 = false; + } else { + class162.SpriteBuffer_decode(var35); + var4 = true; + } + + if (!var4) { + var31 = null; + } else { + var31 = class518.method2519(); + } + + VarpDefinition.mapSceneSprites = var31; + } else { + ++var0; + } + + if (UrlRequest.headIconPkSprites == null) { + UrlRequest.headIconPkSprites = VertexNormal.method1568(GrandExchangeOfferOwnWorldComparator.archive8, class376.field3614.headIconsPk, 0); + } else { + ++var0; + } + + if (AbstractByteArrayCopier.headIconPrayerSprites == null) { + AbstractByteArrayCopier.headIconPrayerSprites = VertexNormal.method1568(GrandExchangeOfferOwnWorldComparator.archive8, class376.field3614.field3882, 0); + } else { + ++var0; + } + + if (class60.headIconHintSprites == null) { + class60.headIconHintSprites = VertexNormal.method1568(GrandExchangeOfferOwnWorldComparator.archive8, class376.field3614.field3890, 0); + } else { + ++var0; + } + + if (class12.mapMarkerSprites == null) { + class12.mapMarkerSprites = VertexNormal.method1568(GrandExchangeOfferOwnWorldComparator.archive8, class376.field3614.field3881, 0); + } else { + ++var0; + } + + if (VarpDefinition.crossSprites == null) { + VarpDefinition.crossSprites = VertexNormal.method1568(GrandExchangeOfferOwnWorldComparator.archive8, class376.field3614.field3883, 0); + } else { + ++var0; + } + + if (HorizontalAlignment.mapDotSprites == null) { + HorizontalAlignment.mapDotSprites = VertexNormal.method1568(GrandExchangeOfferOwnWorldComparator.archive8, class376.field3614.field3885, 0); + } else { + ++var0; + } + + if (class31.scrollBarSprites == null) { + var2 = GrandExchangeOfferOwnWorldComparator.archive8; + var28 = class376.field3614.field3891; + var35 = var2.takeFile(var28, 0); + if (var35 == null) { + var4 = false; + } else { + class162.SpriteBuffer_decode(var35); + var4 = true; + } + + if (!var4) { + var31 = null; + } else { + var31 = class518.method2519(); + } + + class31.scrollBarSprites = var31; + } else { + ++var0; + } + + if (class134.field1307 == null) { + var2 = GrandExchangeOfferOwnWorldComparator.archive8; + var28 = class376.field3614.field3887; + var35 = var2.takeFile(var28, 0); + if (var35 == null) { + var4 = false; + } else { + class162.SpriteBuffer_decode(var35); + var4 = true; + } + + if (!var4) { + var31 = null; + } else { + var31 = class518.method2519(); + } + + class134.field1307 = var31; + } else { + ++var0; + } + + if (var0 < 11) { + Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; + } else { + AbstractFont.AbstractFont_modIconSprites = class134.field1307; + class11.redHintArrowSprite.normalize(); + var26 = (int)(Math.random() * 21.0D) - 10; + int var29 = (int)(Math.random() * 21.0D) - 10; + var28 = (int)(Math.random() * 21.0D) - 10; + int var39 = (int)(Math.random() * 41.0D) - 20; + VarpDefinition.mapSceneSprites[0].shiftColors(var26 + var39, var39 + var29, var39 + var28); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.field414 = class92.field947; + } + } else if (class92.field947 == Client.field414) { + if (!Canvas.field68.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; + } else { + class292.textureProvider = new TextureProvider(Canvas.field68, GrandExchangeOfferOwnWorldComparator.archive8, 20, WorldMapIcon_1.clientPreferences.getBrightness(), Client.isLowDetail ? 64 : 128); + Rasterizer3D.method1414(class292.textureProvider); + Rasterizer3D.method1415(WorldMapIcon_1.clientPreferences.getBrightness()); + Client.field414 = class92.field939; + } + } else if (class92.field939 == Client.field414) { + var0 = class292.textureProvider.getLoadedPercentage(); + if (var0 < 100) { + Login.Login_loadingText = "Loading textures - " + var0 + "%"; + Login.Login_loadingPercent = 90; + } else { + Login.Login_loadingText = "Loaded textures"; + Login.Login_loadingPercent = 90; + Client.field414 = class92.field944; + } + } else if (Client.field414 == class92.field944) { + Message.mouseRecorder = new MouseRecorder(); + GameEngine.taskHandler.newThreadTask(Message.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.field414 = class92.field945; + } else if (class92.field945 == Client.field414) { + if (!WorldMapDecorationType.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; + } else { + Huffman var44 = new Huffman(WorldMapDecorationType.archive10.takeFileByNames("huffman", "")); + class27.method110(var44); + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.field414 = class92.field941; + } + } else if (Client.field414 == class92.field941) { + if (!class313.archive4.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + class313.archive4.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!WorldMapAreaData.field2099.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + WorldMapAreaData.field2099.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!class47.archive12.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + class47.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 96; + } else if (!VarbitComposition.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + VarbitComposition.archive13.loadPercent() / 50) + "%"; + Login.Login_loadingPercent = 96; + } else { + Login.Login_loadingText = "Loaded interfaces"; + Login.Login_loadingPercent = 98; + if (class47.archive12.isValidFileName("version.dat", "")) { + Buffer var43 = new Buffer(class47.archive12.takeFileByNames("version.dat", "")); + var43.readUnsignedShort(); + } + + Client.field414 = class92.field946; + } + } else if (Client.field414 == class92.field946) { + Login.Login_loadingPercent = 100; + if (SpotAnimationDefinition.field1597.getGroupCount() > 0 && !SpotAnimationDefinition.field1597.tryLoadGroupByName(field2095.name)) { + Login.Login_loadingText = "Loading world map - " + SpotAnimationDefinition.field1597.groupLoadPercentByName(field2095.name) / 10 + "%"; + } else { + if (NewShit.worldMap == null) { + NewShit.worldMap = new WorldMap(); + NewShit.worldMap.init(SpotAnimationDefinition.field1597, BuddyRankComparator.field1200, WorldMapData_0.field1938, GrandExchangeOfferTotalQuantityComparator.fontBold12, Client.fontsMap, VarpDefinition.mapSceneSprites); + } + + Login.Login_loadingText = "Loaded world map"; + Client.field414 = class92.field936; + } + } else { + if (Client.field414 == class92.field936) { + WorldMapSection2.updateGameState(10); + } + + } + } else if (!class344.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + class344.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; + } else if (!class267.field2224.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + (80 + class47.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 60; + } else { + Archive var27 = class344.archive2; + FloorOverlayDefinition.FloorOverlayDefinition_archive = var27; + Archive var1 = class344.archive2; + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var1; + InvDefinition.method879(class344.archive2, class19.field59); + class406.method2058(class344.archive2, class19.field59, Client.isLowDetail); + LoginScreenAnimation.method526(class344.archive2, class19.field59); + class18.method65(class344.archive2); + var2 = class344.archive2; + Archive var3 = class19.field59; + var4 = Client.isMembersWorld; + Font var5 = class369.fontPlain11; + DbRowType.ItemDefinition_archive = var2; + ItemComposition.ItemDefinition_modelArchive = var3; + class129.ItemDefinition_inMembersWorld = var4; + ItemComposition.ItemDefinition_fileCount = DbRowType.ItemDefinition_archive.getGroupFileCount(10); + TaskHandler.ItemDefinition_fontPlain11 = var5; + var25 = class344.archive2; + var7 = UserComparator7.field1190; + var8 = class145.field1338; + class369.SequenceDefinition_archive = var25; + SequenceDefinition.SequenceDefinition_animationsArchive = var7; + SequenceDefinition.SequenceDefinition_skeletonsArchive = var8; + UserComparator8.method670(class344.archive2, class19.field59); + Archive var9 = class344.archive2; + VarbitComposition.VarbitDefinition_archive = var9; + ViewportMouse.method1566(class344.archive2); + HealthBarDefinition.widgetDefinition = new WidgetDefinition(class313.archive4, class19.field59, GrandExchangeOfferOwnWorldComparator.archive8, VarbitComposition.archive13, WorldMapAreaData.field2099); + Archive var10 = class344.archive2; + InvDefinition.InvDefinition_archive = var10; + Archive var11 = class344.archive2; + EnumComposition.EnumDefinition_archive = var11; + Archive var12 = class344.archive2; + class30.VarcInt_archive = var12; + Archive var13 = class344.archive2; + VertexNormal.method1567(class344.archive2); + Archive var14 = class344.archive2; + DbTableType.field4134 = var14; + Archive var15 = class344.archive2; + DbRowType.field4140 = var15; + class399.Widget_cachedModels = new class509(Messages.field1156, 54, class85.clientLanguage, class344.archive2); + Players.Widget_cachedFonts = new class509(Messages.field1156, 47, class85.clientLanguage, class344.archive2); + class176.varcs = new Varcs(); + Archive var16 = class344.archive2; + Archive var17 = GrandExchangeOfferOwnWorldComparator.archive8; + Archive var18 = VarbitComposition.archive13; + HitSplatDefinition.HitSplatDefinition_archive = var16; + HitSplatDefinition.field1640 = var17; + HitSplatDefinition.HitSplatDefinition_fontsArchive = var18; + Archive var19 = class344.archive2; + Archive var20 = GrandExchangeOfferOwnWorldComparator.archive8; + HealthBarDefinition.HealthBarDefinition_archive = var19; + SecureRandomCallable.field851 = var20; + Archive var21 = class344.archive2; + Archive var22 = GrandExchangeOfferOwnWorldComparator.archive8; + class432.WorldMapElement_archive = var22; + if (var21.isFullyLoaded()) { + class137.WorldMapElement_count = var21.getGroupFileCount(35); + WorldMapElement.WorldMapElement_cached = new WorldMapElement[class137.WorldMapElement_count]; + + for (int var23 = 0; var23 < class137.WorldMapElement_count; ++var23) { + byte[] var24 = var21.takeFile(35, var23); + WorldMapElement.WorldMapElement_cached[var23] = new WorldMapElement(var23); + if (var24 != null) { + WorldMapElement.WorldMapElement_cached[var23].decode(new Buffer(var24)); + WorldMapElement.WorldMapElement_cached[var23].method894(); + } + } + } + + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.field414 = class92.field937; + } + } + } + } + } + + @ObfuscatedName("kf") @ObfuscatedSignature( - descriptor = "(I[BLrw;B)V", - garbageValue = "21" + descriptor = "(Lds;IILiz;I)V", + garbageValue = "398904459" ) - static void method1592(int var0, byte[] var1, ArchiveDisk var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 0; - var3.key = (long)var0; - var3.data = var1; - var3.archiveDisk = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); + static final void method1355(Player var0, int var1, int var2, MoveSpeed var3) { + int var4 = var0.pathX[0]; + int var5 = var0.pathY[0]; + int var6 = var0.transformedSize(); + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { + class229 var7 = Client.field654; + int var10 = var0.transformedSize(); + Client.field651.approxDestinationX = var1; + Client.field651.approxDestinationY = var2; + Client.field651.approxDestinationSizeX = 1; + Client.field651.approxDestinationSizeY = 1; + ApproximateRouteStrategy var11 = Client.field651; + int var12 = var7.method1170(var4, var5, var10, var11, Client.collisionMaps[var0.plane], true, Client.field592, Client.field591); + if (var12 >= 1) { + for (int var13 = 0; var13 < var12 - 1; ++var13) { + var0.method495(Client.field592[var13], Client.field591[var13], var3); + } + + } + } + } + } + + @ObfuscatedName("oy") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1657545960" + ) + static void method1356() { + if (Client.oculusOrbOnLocalPlayer && class229.localPlayer != null) { + int var0 = class229.localPlayer.pathX[0]; + int var1 = class229.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { + return; + } + + LoginScreenAnimation.oculusOrbFocalPointX = class229.localPlayer.x; + int var2 = WorldMapDecorationType.getTileHeight(class229.localPlayer.x, class229.localPlayer.y, ItemLayer.Client_plane) - Client.camFollowHeight; + if (var2 < class12.field41) { + class12.field41 = var2; + } + + ScriptFrame.oculusOrbFocalPointY = class229.localPlayer.y; + Client.oculusOrbOnLocalPlayer = false; } - class87.method461(); } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapData_0.java b/osrs/src/main/java/WorldMapData_0.java index 8c13f1944..2378a6e45 100644 --- a/osrs/src/main/java/WorldMapData_0.java +++ b/osrs/src/main/java/WorldMapData_0.java @@ -3,27 +3,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +import java.io.IOException; +import java.net.Socket; + +@ObfuscatedName("ii") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + static Archive field1938; + WorldMapData_0() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "15" + descriptor = "(Luj;B)V", + garbageValue = "-89" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != class285.field2467.field2469) { + if (var2 != class251.field2079.field2080) { throw new IllegalStateException(""); } else { - super.field2444 = var1.readUnsignedByte(); + super.field2053 = var1.readUnsignedByte(); super.planes = var1.readUnsignedByte(); - super.field2445 = var1.readUnsignedShort(); - super.field2443 = var1.readUnsignedShort(); + super.field2051 = var1.readUnsignedShort(); + super.field2055 = var1.readUnsignedShort(); super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); super.groupId = var1.readNullableLargeSmart(); @@ -31,35 +40,31 @@ void init(Buffer var1) { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "2115325709" + descriptor = "(Luj;B)V", + garbageValue = "7" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field2439 = new byte[super.planes][64][64]; - super.field2438 = new byte[super.planes][64][64]; + super.field2049 = new byte[super.planes][64][64]; + super.field2048 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class284.field2464.field2466) { - throw new IllegalStateException(""); - } else { - int var3 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); - if (var3 == super.regionX && var4 == super.regionY) { - for (int var5 = 0; var5 < 64; ++var5) { - for (int var6 = 0; var6 < 64; ++var6) { - this.readTile(var5, var6, var1); - } + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY) { + for (int var5 = 0; var5 < 64; ++var5) { + for (int var6 = 0; var6 < 64; ++var6) { + this.readTile(var5, var6, var1); } - - } else { - throw new IllegalStateException(""); } + + } else { + throw new IllegalStateException(""); } } @@ -70,7 +75,7 @@ public boolean equals(Object var1) { return false; } else { WorldMapData_0 var2 = (WorldMapData_0)var1; - return var2.regionX == super.regionX && var2.regionY == super.regionY; + return var2.regionX == super.regionX && super.regionY == var2.regionY; } } @@ -79,4 +84,72 @@ public boolean equals(Object var1) { public int hashCode() { return super.regionX | super.regionY << 8; } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/net/Socket;III)Lro;", + garbageValue = "-919788218" + ) + public static AbstractSocket method1178(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "265827581" + ) + public static String method1179(CharSequence var0) { + int var1 = var0.length(); + StringBuilder var2 = new StringBuilder(var1); + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { + if (var4 == ' ') { + var2.append('+'); + } else { + byte var5 = class137.charToByteCp1252(var4); + var2.append('%'); + int var6 = var5 >> 4 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + + var6 = var5 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + } + } else { + var2.append(var4); + } + } + + return var2.toString(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "2049995843" + ) + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)Lcr;", + garbageValue = "850899958" + ) + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? class361.World_worlds[++World.World_listCount - 1] : null; + } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapData_1.java b/osrs/src/main/java/WorldMapData_1.java index 8ba9acf8d..394c7d72b 100644 --- a/osrs/src/main/java/WorldMapData_1.java +++ b/osrs/src/main/java/WorldMapData_1.java @@ -3,43 +3,43 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.IOException; -import java.net.Socket; - -@ObfuscatedName("kh") +@ObfuscatedName("jo") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("ac") + @ObfuscatedName("jc") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("at") @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("chunkX") int chunkX; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("chunkY") int chunkY; WorldMapData_1() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "152954151" + descriptor = "(Luj;I)V", + garbageValue = "1464083774" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != class285.field2468.field2469) { + if (var2 != class251.field2078.field2080) { throw new IllegalStateException(""); } else { - super.field2444 = var1.readUnsignedByte(); + super.field2053 = var1.readUnsignedByte(); super.planes = var1.readUnsignedByte(); - super.field2445 = var1.readUnsignedShort(); - super.field2443 = var1.readUnsignedShort(); + super.field2051 = var1.readUnsignedShort(); + super.field2055 = var1.readUnsignedShort(); this.chunkXLow = var1.readUnsignedByte(); this.chunkYLow = var1.readUnsignedByte(); super.regionX = var1.readUnsignedShort(); @@ -51,21 +51,21 @@ void init(Buffer var1) { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "2115325709" + descriptor = "(Luj;B)V", + garbageValue = "7" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field2439 = new byte[super.planes][64][64]; - super.field2438 = new byte[super.planes][64][64]; + super.field2049 = new byte[super.planes][64][64]; + super.field2048 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class284.field2465.field2466) { + if (var2 != class250.field2075.field2077) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -85,20 +85,20 @@ void readGeography(Buffer var1) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1995830791" + garbageValue = "2104981166" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; } - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-101" + descriptor = "(B)I", + garbageValue = "6" ) @Export("getChunkYLow") int getChunkYLow() { @@ -107,18 +107,18 @@ int getChunkYLow() { @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1442893967" + descriptor = "(B)I", + garbageValue = "0" ) @Export("getChunkX") int getChunkX() { return this.chunkX; } - @ObfuscatedName("am") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-510892913" + descriptor = "(B)I", + garbageValue = "98" ) @Export("getChunkY") int getChunkY() { @@ -144,12 +144,55 @@ public int hashCode() { return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; } - @ObfuscatedName("ac") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;IIS)Lre;", - garbageValue = "-24237" + descriptor = "(III)Ldt;", + garbageValue = "1462611314" ) - public static AbstractSocket method1522(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); + static Script method1280(int var0, int var1) { + Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); + if (var2 != null) { + return var2; + } else { + String var3 = String.valueOf(var0); + int var4 = class47.archive12.getGroupId(var3); + if (var4 == -1) { + return null; + } else { + byte[] var5 = class47.archive12.takeFileFlat(var4); + if (var5 != null) { + if (var5.length <= 1) { + return null; + } + + var2 = NewShit.newScript(var5); + if (var2 != null) { + Script.Script_cached.put(var2, (long)(var0 << 16)); + return var2; + } + } + + return null; + } + } + } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "5" + ) + static int method1285() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + int var0 = 0; + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + } + + return var0 * 10000 / Client.field549; + } else { + return 10000; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapDecoration.java b/osrs/src/main/java/WorldMapDecoration.java index 2f92dae5e..e7f462fec 100644 --- a/osrs/src/main/java/WorldMapDecoration.java +++ b/osrs/src/main/java/WorldMapDecoration.java @@ -3,16 +3,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +@ObfuscatedName("js") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("decoration") final int decoration; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("rotation") final int rotation; @@ -22,20 +22,89 @@ public class WorldMapDecoration { this.rotation = var3; } - @ObfuscatedName("ka") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1531578947" + descriptor = "(B)Lrz;", + garbageValue = "55" ) - static final void method1567() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.endCycle == -1) { - var0.startCycle = 0; - GrandExchangeOfferOwnWorldComparator.method350(var0); + public static class462 method1329() { + synchronized(class462.field3907) { + if (DirectByteArrayCopier.field3136 == 0) { + return new class462(); } else { - var0.remove(); + class462.field3907[--DirectByteArrayCopier.field3136].method2318(); + return class462.field3907[DirectByteArrayCopier.field3136]; + } + } + } + + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "750324904" + ) + static final void method1330(int var0) { + int[] var1 = class102.sceneMinimapSprite.pixels; + int var2 = var1.length; + + int var3; + for (var3 = 0; var3 < var2; ++var3) { + var1[var3] = 0; + } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { + var4 = (103 - var3) * 2048 + 24628; + + for (var5 = 1; var5 < 103; ++var5) { + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { + class36.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { + class36.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; + } + } + + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; + class102.sceneMinimapSprite.setRaster(); + + int var6; + for (var5 = 1; var5 < 103; ++var5) { + for (var6 = 1; var6 < 103; ++var6) { + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { + class511.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { + class511.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; + + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + long var7 = class36.scene.getFloorDecorationTag(ItemLayer.Client_plane, var5, var6); + if (0L != var7) { + int var9 = class232.Entity_unpackID(var7); + int var10 = WorldMapSection2.getObjectDefinition(var9).mapIconId; + if (var10 >= 0 && class141.WorldMapElement_get(var10).field1462) { + Client.mapIcons[Client.mapIconCount] = class141.WorldMapElement_get(var10).getSpriteBool(false); + Client.mapIconXs[Client.mapIconCount] = var5; + Client.mapIconYs[Client.mapIconCount] = var6; + ++Client.mapIconCount; + } + } } } + class338.rasterProvider.apply(); } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapDecorationType.java b/osrs/src/main/java/WorldMapDecorationType.java index 1f9d2163e..6ec7c1f35 100644 --- a/osrs/src/main/java/WorldMapDecorationType.java +++ b/osrs/src/main/java/WorldMapDecorationType.java @@ -3,133 +3,132 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Iterator; - -@ObfuscatedName("nl") +@ObfuscatedName("nx") @Implements("WorldMapDecorationType") -public enum WorldMapDecorationType implements class386 { - @ObfuscatedName("ac") +public enum WorldMapDecorationType implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3150(0, 0), - @ObfuscatedName("al") + field3155(0, 0), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3162(1, 0), - @ObfuscatedName("ak") + field3160(1, 0), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3151(2, 0), - @ObfuscatedName("ax") + field3154(2, 0), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) field3153(3, 0), - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3152(9, 2), - @ObfuscatedName("ah") + field3150(9, 2), + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3159(4, 1), - @ObfuscatedName("ar") + field3169(4, 1), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3167(5, 1), - @ObfuscatedName("ab") + field3158(5, 1), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3156(6, 1), - @ObfuscatedName("am") + field3159(6, 1), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3163(7, 1), - @ObfuscatedName("av") + field3164(7, 1), + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3170(8, 1), - @ObfuscatedName("ag") + field3173(8, 1), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3158(12, 2), - @ObfuscatedName("aa") + field3166(12, 2), + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3155(13, 2), - @ObfuscatedName("ap") + field3170(13, 2), + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lnx;" + ) + field3171(14, 2), + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3165(14, 2), + field3168(15, 2), @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3172(15, 2), - @ObfuscatedName("as") + field3172(16, 2), + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3168(16, 2), + field3163(17, 2), @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3161(17, 2), - @ObfuscatedName("an") + field3162(18, 2), + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3164(18, 2), - @ObfuscatedName("au") + field3165(19, 2), + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3169(19, 2), + field3167(20, 2), @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3160(20, 2), - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lnl;" - ) - field3157(21, 2), + field3161(21, 2), @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3171(10, 2), - @ObfuscatedName("aq") + field3156(10, 2), + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3166(11, 2), - @ObfuscatedName("az") + field3151(11, 2), + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnx;" ) - field3173(22, 3); + field3152(22, 3); - @ObfuscatedName("gl") + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Loh;" ) - static Archive field3154; - @ObfuscatedName("at") + @Export("archive10") + static Archive archive10; + @ObfuscatedName("ag") @Export("id") public final int id; @@ -141,48 +140,38 @@ public enum WorldMapDecorationType implements class386 { this.id = var3; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "0" - ) - public static void method1897(int var0, int var1) { - Iterator var2 = class319.field2792.iterator(); - - while (var2.hasNext()) { - class325 var3 = (class325)var2.next(); - var3.vmethod1644(var0, var1); - } - - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1905325743" - ) - public static void method1898() { - synchronized(ArchiveDiskActionHandler.field3545) { - if (ArchiveDiskActionHandler.field3544 != 0) { - ArchiveDiskActionHandler.field3544 = 1; - ArchiveDiskActionHandler.field3543 = true; - - try { - ArchiveDiskActionHandler.field3545.wait(); - } catch (InterruptedException var3) { - } + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "1041005781" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; + int var4 = var1 >> 7; + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + int var5 = var2; + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 + 1; } + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; + int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; + return var8 * (128 - var7) + var7 * var9 >> 7; + } else { + return 0; } } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapElement.java b/osrs/src/main/java/WorldMapElement.java index 1a467652c..00a90a247 100644 --- a/osrs/src/main/java/WorldMapElement.java +++ b/osrs/src/main/java/WorldMapElement.java @@ -3,81 +3,75 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hp") +@ObfuscatedName("gr") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("WorldMapElement_archive") - public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[Lhp;" + descriptor = "[Lgr;" ) @Export("WorldMapElement_cached") public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) @Export("HitSplatDefinition_cached2") - static EvictingDualNodeHashTable HitSplatDefinition_cached2; - @ObfuscatedName("ao") + public static EvictingDualNodeHashTable HitSplatDefinition_cached2; + @ObfuscatedName("ab") @Export("objectId") public final int objectId; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("sprite1") public int sprite1; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("sprite2") int sprite2; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("name") public String name; - @ObfuscatedName("am") - public int field1523; - @ObfuscatedName("av") + @ObfuscatedName("al") + public int field1466; + @ObfuscatedName("az") @Export("textSize") public int textSize; - @ObfuscatedName("aa") - public boolean field1517; - @ObfuscatedName("ap") - public boolean field1518; - @ObfuscatedName("ay") + @ObfuscatedName("av") + public boolean field1461; + @ObfuscatedName("ax") + public boolean field1462; + @ObfuscatedName("as") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("menuTargetName") public String menuTargetName; + @ObfuscatedName("ak") + int[] field1459; @ObfuscatedName("aj") - int[] field1515; - @ObfuscatedName("an") - int field1512; - @ObfuscatedName("au") - int field1514; + int field1456; + @ObfuscatedName("am") + int field1457; + @ObfuscatedName("aq") + int field1458; @ObfuscatedName("ai") - int field1511; - @ObfuscatedName("ae") - int field1510; + int field1455; @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lhb;" + descriptor = "Lhq;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lhg;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("az") - int[] field1516; - @ObfuscatedName("at") - byte[] field1509; - @ObfuscatedName("af") + @ObfuscatedName("an") + int[] field1460; + @ObfuscatedName("ag") + byte[] field1453; + @ObfuscatedName("ad") @Export("category") public int category; @@ -89,23 +83,23 @@ public WorldMapElement(int var1) { this.sprite1 = -1; this.sprite2 = -1; this.textSize = 0; - this.field1517 = true; - this.field1518 = false; + this.field1461 = true; + this.field1462 = false; this.menuActions = new String[5]; - this.field1512 = Integer.MAX_VALUE; - this.field1514 = Integer.MAX_VALUE; - this.field1511 = Integer.MIN_VALUE; - this.field1510 = Integer.MIN_VALUE; + this.field1456 = Integer.MAX_VALUE; + this.field1457 = Integer.MAX_VALUE; + this.field1458 = Integer.MIN_VALUE; + this.field1455 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "7" + descriptor = "(Luj;I)V", + garbageValue = "-987728818" ) @Export("decode") public void decode(Buffer var1) { @@ -119,10 +113,10 @@ public void decode(Buffer var1) { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "-63" + descriptor = "(Luj;IB)V", + garbageValue = "0" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -133,7 +127,7 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.field1523 = var1.readMedium(); + this.field1466 = var1.readMedium(); } else if (var2 == 5) { var1.readMedium(); } else if (var2 == 6) { @@ -143,11 +137,11 @@ void decodeNext(Buffer var1, int var2) { if (var2 == 7) { var3 = var1.readUnsignedByte(); if ((var3 & 1) == 0) { - this.field1517 = false; + this.field1461 = false; } if ((var3 & 2) == 2) { - this.field1518 = true; + this.field1462 = true; } } else if (var2 == 8) { var1.readUnsignedByte(); @@ -155,26 +149,26 @@ void decodeNext(Buffer var1, int var2) { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); } else if (var2 == 15) { var3 = var1.readUnsignedByte(); - this.field1515 = new int[var3 * 2]; + this.field1459 = new int[var3 * 2]; int var4; for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field1515[var4] = var1.readShort(); + this.field1459[var4] = var1.readShort(); } var1.readInt(); var4 = var1.readUnsignedByte(); - this.field1516 = new int[var4]; + this.field1460 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field1516.length; ++var5) { - this.field1516[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1460.length; ++var5) { + this.field1460[var5] = var1.readInt(); } - this.field1509 = new byte[var3]; + this.field1453 = new byte[var3]; for (var5 = 0; var5 < var3; ++var5) { - this.field1509[var5] = var1.readByte(); + this.field1453[var5] = var1.readByte(); } } else if (var2 != 16) { if (var2 == 17) { @@ -199,66 +193,67 @@ void decodeNext(Buffer var1, int var2) { } else if (var2 == 28) { var1.readUnsignedByte(); } else if (var2 == 29) { - this.horizontalAlignment = (HorizontalAlignment)SequenceDefinition.findEnumerated(class202.method1003(), var1.readUnsignedByte()); + HorizontalAlignment[] var6 = new HorizontalAlignment[]{HorizontalAlignment.field1521, HorizontalAlignment.field1520, HorizontalAlignment.HorizontalAlignment_centered}; + this.horizontalAlignment = (HorizontalAlignment)class12.findEnumerated(var6, var1.readUnsignedByte()); } else if (var2 == 30) { - VerticalAlignment[] var6 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1643, VerticalAlignment.field1644}; - this.verticalAlignment = (VerticalAlignment)SequenceDefinition.findEnumerated(var6, var1.readUnsignedByte()); + VerticalAlignment[] var7 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1580, VerticalAlignment.field1581}; + this.verticalAlignment = (VerticalAlignment)class12.findEnumerated(var7, var1.readUnsignedByte()); } } } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-4" + descriptor = "(I)V", + garbageValue = "-1778533168" ) - public void method967() { - if (this.field1515 != null) { - for (int var1 = 0; var1 < this.field1515.length; var1 += 2) { - if (this.field1515[var1] < this.field1512) { - this.field1512 = this.field1515[var1]; - } else if (this.field1515[var1] > this.field1511) { - this.field1511 = this.field1515[var1]; + public void method894() { + if (this.field1459 != null) { + for (int var1 = 0; var1 < this.field1459.length; var1 += 2) { + if (this.field1459[var1] < this.field1456) { + this.field1456 = this.field1459[var1]; + } else if (this.field1459[var1] > this.field1458) { + this.field1458 = this.field1459[var1]; } - if (this.field1515[var1 + 1] < this.field1514) { - this.field1514 = this.field1515[var1 + 1]; - } else if (this.field1515[var1 + 1] > this.field1510) { - this.field1510 = this.field1515[var1 + 1]; + if (this.field1459[var1 + 1] < this.field1457) { + this.field1457 = this.field1459[var1 + 1]; + } else if (this.field1459[var1 + 1] > this.field1455) { + this.field1455 = this.field1459[var1 + 1]; } } } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(ZI)Lud;", - garbageValue = "794347545" + descriptor = "(ZB)Luz;", + garbageValue = "9" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1 * 1563781855 * -155660001; + int var2 = this.sprite1 * 1450652377 * -351523479; return this.getSprite(var2); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IB)Lud;", - garbageValue = "-97" + descriptor = "(II)Luz;", + garbageValue = "539086783" ) @Export("getSprite") SpritePixels getSprite(int var1) { if (var1 < 0) { return null; } else { - SpritePixels var2 = (SpritePixels) HitSplatDefinition_cached2.get((long)var1); + SpritePixels var2 = (SpritePixels)HitSplatDefinition_cached2.get((long)var1); if (var2 != null) { return var2; } else { - var2 = class47.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + var2 = IgnoreList.SpriteBuffer_getSprite(class432.WorldMapElement_archive, var1, 0); if (var2 != null) { HitSplatDefinition_cached2.put(var2, (long)var1); } @@ -268,37 +263,52 @@ SpritePixels getSprite(int var1) { } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "314107499" ) @Export("getObjectId") public int getObjectId() { return this.objectId; } - @ObfuscatedName("by") + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Laa;I)Lao;", + garbageValue = "2008844718" + ) + public static class3 method890(class6 var0) { + switch(var0.field10) { + case 0: + return new class0(); + default: + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1025083911" + ) + public static void method893() { + StructComposition.StructDefinition_cached.clear(); + } + + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "2010949873" + descriptor = "(CB)Z", + garbageValue = "-10" ) - static int method971(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3500) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.getKeyPressed(var3) ? 1 : 0; - return 1; - } else if (var0 == 3501) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1149(var3) ? 1 : 0; - return 1; - } else if (var0 == 3502) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.keyHandlerInstance.method1151(var3) ? 1 : 0; - return 1; + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; } else { - return 2; + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapEvent.java b/osrs/src/main/java/WorldMapEvent.java index 9fea2690b..af436aba3 100644 --- a/osrs/src/main/java/WorldMapEvent.java +++ b/osrs/src/main/java/WorldMapEvent.java @@ -3,27 +3,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("li") +@ObfuscatedName("jt") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("mapElement") public int mapElement; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmh;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmh;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILmo;Lmo;)V" + descriptor = "(ILmh;Lmh;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; @@ -31,33 +31,33 @@ public WorldMapEvent(int var1, Coord var2, Coord var3) { this.coord2 = var3; } - @ObfuscatedName("ic") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ldj;IIB)V", - garbageValue = "124" + descriptor = "(IIIII)I", + garbageValue = "-2019263957" ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = class36.SequenceDefinition_get(var1).replyMode; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.currentSequenceFrameIndex = 0; - } + static final int method1381(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; + } - if (var3 == 2) { - var0.currentSequenceFrameIndex = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || class36.SequenceDefinition_get(var1).forcedPriority >= class36.SequenceDefinition_get(var0.sequence).forcedPriority) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.currentSequenceFrameIndex = 0; - var0.field1023 = var0.pathLength; - } + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2126248771" + ) + public static void method1382(int var0) { + MouseHandler.MouseHandler_idleCycles = var0; + } + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-890618115" + ) + static void method1383(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapIcon_0.java b/osrs/src/main/java/WorldMapIcon_0.java index 94097e3c5..3e0844cae 100644 --- a/osrs/src/main/java/WorldMapIcon_0.java +++ b/osrs/src/main/java/WorldMapIcon_0.java @@ -3,36 +3,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") +@ObfuscatedName("jq") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("jk") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("ac") + @ObfuscatedName("ul") + @Export("cameraMoveSpeed") + static int cameraMoveToSpeed; + @ObfuscatedName("at") @Export("element") final int element; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Ljk;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("subWidth") final int subWidth; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lmo;Lmo;ILkd;)V" + descriptor = "(Lmh;Lmh;ILjk;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.element = var3; this.label = var4; - WorldMapElement var5 = class148.WorldMapElement_get(this.getElement()); + WorldMapElement var5 = class141.WorldMapElement_get(this.getElement()); SpritePixels var6 = var5.getSpriteBool(false); if (var6 != null) { this.subWidth = var6.subWidth; @@ -44,43 +44,66 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1637535390" + garbageValue = "-1307533886" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)Lkd;", - garbageValue = "5" + descriptor = "(B)Ljk;", + garbageValue = "-49" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "65" + descriptor = "(I)I", + garbageValue = "472460923" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1338001743" + garbageValue = "-653051141" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "-4" + ) + static final int method1301(int var0, int var1, int var2) { + int var3 = var0 / var2; + int var4 = var0 & var2 - 1; + int var5 = var1 / var2; + int var6 = var1 & var2 - 1; + int var7 = FadeOutTask.method2153(var3, var5); + int var8 = FadeOutTask.method2153(var3 + 1, var5); + int var9 = FadeOutTask.method2153(var3, var5 + 1); + int var10 = FadeOutTask.method2153(var3 + 1, var5 + 1); + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; + int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); + int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; + int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); + int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; + int var15 = ((65536 - var16) * var11 >> 16) + (var13 * var16 >> 16); + return var15; + } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapIcon_1.java b/osrs/src/main/java/WorldMapIcon_1.java index 0e11841ed..704e1b23c 100644 --- a/osrs/src/main/java/WorldMapIcon_1.java +++ b/osrs/src/main/java/WorldMapIcon_1.java @@ -3,38 +3,42 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("jp") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("cb") - static int field2337; - @ObfuscatedName("ac") + @ObfuscatedName("wt") + @ObfuscatedSignature( + descriptor = "Ldl;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("at") @Export("objectDefId") final int objectDefId; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Ljl;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("element") int element; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Ljk;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("subWidth") int subWidth; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lmo;Lmo;ILke;)V" + descriptor = "(Lmh;Lmh;ILjl;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -43,16 +47,16 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-19" + descriptor = "(I)V", + garbageValue = "-450829681" ) @Export("init") void init() { - this.element = class91.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(class148.WorldMapElement_get(this.element)); - WorldMapElement var1 = class148.WorldMapElement_get(this.getElement()); + this.element = WorldMapSection2.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(class141.WorldMapElement_get(this.element)); + WorldMapElement var1 = class141.WorldMapElement_get(this.getElement()); SpritePixels var2 = var1.getSpriteBool(false); if (var2 != null) { this.subWidth = var2.subWidth; @@ -64,55 +68,52 @@ void init() { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1637535390" + garbageValue = "-1307533886" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)Lkd;", - garbageValue = "5" + descriptor = "(B)Ljk;", + garbageValue = "-49" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "65" + descriptor = "(I)I", + garbageValue = "472460923" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1338001743" + garbageValue = "-653051141" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("al") + @ObfuscatedName("ox") @ObfuscatedSignature( - descriptor = "(Lmh;I)V", - garbageValue = "-866715691" + descriptor = "(IB)V", + garbageValue = "-26" ) - public static void method1439(class325 var0) { - if (!class319.field2792.contains(var0)) { - class319.field2792.add(var0); - } - + static void method1194(int var0) { + Client.oculusOrbState = var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapLabel.java b/osrs/src/main/java/WorldMapLabel.java index 22d608841..e3c143e4e 100644 --- a/osrs/src/main/java/WorldMapLabel.java +++ b/osrs/src/main/java/WorldMapLabel.java @@ -3,27 +3,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kd") +@ObfuscatedName("jk") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("text") String text; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("width") int width; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("height") int height; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lio;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILka;)V" + descriptor = "(Ljava/lang/String;IILio;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -31,56 +31,4 @@ public class WorldMapLabel { this.height = var3; this.size = var4; } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1591685204" - ) - public static int method1569(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); - var0 = var0 + (var0 >>> 4) & 252645135; - var0 += var0 >>> 8; - var0 += var0 >>> 16; - return var0 & 255; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-26" - ) - static int method1570(int var0, int var1, int var2) { - if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { - return 0; - } else { - return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; - } - } - - @ObfuscatedName("ks") - @ObfuscatedSignature( - descriptor = "(Ldc;I)V", - garbageValue = "-1071136907" - ) - static void method1571(NPC var0) { - var0.field971 = var0.definition.size; - var0.field1020 = var0.definition.rotation; - var0.walkSequence = var0.definition.walkSequence; - var0.walkBackSequence = var0.definition.walkBackSequence; - var0.walkLeftSequence = var0.definition.walkLeftSequence; - var0.walkRightSequence = var0.definition.walkRightSequence; - var0.idleSequence = var0.definition.idleSequence; - var0.turnLeftSequence = var0.definition.turnLeftSequence; - var0.turnRightSequence = var0.definition.turnRightSequence; - var0.runSequence = var0.definition.runSequence; - var0.runBackSequence = var0.definition.runBackSequence; - var0.runLeftSequence = var0.definition.runLeftSequence; - var0.runRightSequence = var0.definition.runRightSequence; - var0.crawlSequence = var0.definition.crawlSequence; - var0.crawlBackSequence = var0.definition.crawlBackSequence; - var0.crawlLeftSequence = var0.definition.crawlLeftSequence; - var0.crawlRightSequence = var0.definition.crawlRightSequence; - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapLabelSize.java b/osrs/src/main/java/WorldMapLabelSize.java index 26dd6cb9e..e2e7689a5 100644 --- a/osrs/src/main/java/WorldMapLabelSize.java +++ b/osrs/src/main/java/WorldMapLabelSize.java @@ -3,73 +3,71 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("io") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lio;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lio;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lio;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "Loa;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("ax") - final int field2336; + @ObfuscatedName("ap") + public static short[] field1939; + @ObfuscatedName("as") + static int[] field1943; @ObfuscatedName("ao") - final int field2335; - @ObfuscatedName("ah") - final int field2334; + final int field1945; + @ObfuscatedName("ab") + final int field1944; + @ObfuscatedName("au") + final int field1946; static { - WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); - WorldMapLabelSize_medium = new WorldMapLabelSize(0, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); + WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); + WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); + WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field2336 = var1; - this.field2335 = var2; - this.field2334 = var3; + this.field1945 = var1; + this.field1944 = var2; + this.field1946 = var3; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(FI)Z", - garbageValue = "-198292177" + descriptor = "(FB)Z", + garbageValue = "-28" ) - boolean method1433(float var1) { - return var1 >= (float)this.field2334; + boolean method1184(float var1) { + return var1 >= (float)this.field1946; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)Lka;", - garbageValue = "108" + descriptor = "(IB)Lio;", + garbageValue = "-1" ) - static WorldMapLabelSize method1434(int var0) { - WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_medium, WorldMapLabelSize_large, WorldMapLabelSize_small}; + static WorldMapLabelSize method1185(int var0) { + WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_medium, WorldMapLabelSize_small}; WorldMapLabelSize[] var2 = var1; for (int var3 = 0; var3 < var2.length; ++var3) { WorldMapLabelSize var4 = var2[var3]; - if (var0 == var4.field2335) { + if (var0 == var4.field1944) { return var4; } } @@ -77,30 +75,156 @@ static WorldMapLabelSize method1434(int var0) { return null; } - @ObfuscatedName("ax") + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1105487530" + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-1950450301" ) - public static int method1435(int var0) { - return class479.field3938[var0 & 16383]; + static Object method1187(int var0) { + return class408.method2096((class514)class12.findEnumerated(class514.method2503(), var0)); } - @ObfuscatedName("ap") + @ObfuscatedName("iz") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1216862596" + descriptor = "(Lds;III)V", + garbageValue = "-896511288" ) - static final int method1436() { - return ViewportMouse.ViewportMouse_y; + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = DynamicObject.SequenceDefinition_get(var1).replyMode; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.currentSequenceFrameIndex = 0; + } + + if (var3 == 2) { + var0.currentSequenceFrameIndex = 0; + } + } else if (var1 == -1 || var0.sequence == -1 || DynamicObject.SequenceDefinition_get(var1).forcedPriority >= DynamicObject.SequenceDefinition_get(var0.sequence).forcedPriority) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.currentSequenceFrameIndex = 0; + var0.field1029 = var0.pathLength; + } + } - @ObfuscatedName("je") + @ObfuscatedName("lb") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-13" + descriptor = "(Ldn;IIII)V", + garbageValue = "-140985889" ) - static boolean method1437() { - return (Client.drawPlayerNames & 8) != 0; + @Export("addNpcToMenu") + static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { + NPCComposition var4 = var0.definition; + if (Client.menuOptionsCount < 400) { + if (var4.transforms != null) { + var4 = var4.transform(); + } + + if (var4 != null) { + if (var4.isInteractable) { + if (!var4.isFollower || Client.followerIndex == var1) { + String var5 = var0.method578(); + int var6; + if (var4.combatLevel != 0 && var0.combatLevelChange != 0) { + var6 = var0.combatLevelChange != -1 ? var0.combatLevelChange * -1350642785 * -375551905 : var4.combatLevel * 550789923 * -1916672885; + var5 = var5 + class28.method126(var6, class229.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; + } + + if (var4.isFollower && Client.followerOpsLowPriority) { + WorldMapSectionType.insertMenuItemNoShift("Examine", class167.colorStartTag(16776960) + var5, 1003, var1, var2, var3); + } + + if (Client.isItemSelected == 1) { + WorldMapSectionType.insertMenuItemNoShift("Use", Client.field597 + " " + "->" + " " + class167.colorStartTag(16776960) + var5, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((UrlRequest.field1182 & 2) == 2) { + WorldMapSectionType.insertMenuItemNoShift(Client.field599, Client.field598 + " " + "->" + " " + class167.colorStartTag(16776960) + var5, 8, var1, var2, var3); + } + } else { + var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var7 = var4.actions; + int var8; + int var9; + if (var7 != null) { + for (var8 = 4; var8 >= 0; --var8) { + if (var0.method577(var8) && var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { + var9 = 0; + if (var8 == 0) { + var9 = var6 + 9; + } + + if (var8 == 1) { + var9 = var6 + 10; + } + + if (var8 == 2) { + var9 = var6 + 11; + } + + if (var8 == 3) { + var9 = var6 + 12; + } + + if (var8 == 4) { + var9 = var6 + 13; + } + + WorldMapSectionType.insertMenuItemNoShift(var7[var8], class167.colorStartTag(16776960) + var5, var9, var1, var2, var3); + } + } + } + + if (var7 != null) { + for (var8 = 4; var8 >= 0; --var8) { + if (var0.method577(var8) && var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { + short var10 = 0; + if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var4.combatLevel > class229.localPlayer.combatLevel) { + var10 = 2000; + } + + var9 = 0; + if (var8 == 0) { + var9 = var10 + 9; + } + + if (var8 == 1) { + var9 = var10 + 10; + } + + if (var8 == 2) { + var9 = var10 + 11; + } + + if (var8 == 3) { + var9 = var10 + 12; + } + + if (var8 == 4) { + var9 = var10 + 13; + } + + WorldMapSectionType.insertMenuItemNoShift(var7[var8], class167.colorStartTag(16776960) + var5, var9, var1, var2, var3); + } + } + } + } + + if (!var4.isFollower || !Client.followerOpsLowPriority) { + WorldMapSectionType.insertMenuItemNoShift("Examine", class167.colorStartTag(16776960) + var5, 1003, var1, var2, var3); + } + } + + } + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapManager.java b/osrs/src/main/java/WorldMapManager.java index 2e1434f28..3cda6b167 100644 --- a/osrs/src/main/java/WorldMapManager.java +++ b/osrs/src/main/java/WorldMapManager.java @@ -3,90 +3,83 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.awt.*; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; -import java.util.List; import java.util.*; -@ObfuscatedName("kk") +@ObfuscatedName("jf") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("loaded") boolean loaded; - @ObfuscatedName("al") - boolean field2380; - @ObfuscatedName("ak") + @ObfuscatedName("ah") + boolean field1987; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Llj;" + descriptor = "Ljx;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "Luz;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("icons") HashMap icons; - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "[[Lke;" + descriptor = "[[Ljl;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Lun;" + descriptor = "[Lup;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("fonts") final HashMap fonts; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("tileX") int tileX; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("tileY") int tileY; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("tileWidth") int tileWidth; - @ObfuscatedName("as") + @ObfuscatedName("ay") @Export("tileHeight") int tileHeight; - @ObfuscatedName("aj") + @ObfuscatedName("ak") @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Lun;Ljava/util/HashMap;Lom;Lom;)V" + descriptor = "([Lup;Ljava/util/HashMap;Lol;Lol;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; - this.field2380 = false; + this.field1987 = false; this.scaleHandlers = new HashMap(); this.pixelsPerTile = 0; this.mapSceneSprites = var1; @@ -95,26 +88,26 @@ public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, this.groundArchive = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lom;Ljava/lang/String;ZZB)V", - garbageValue = "121" + descriptor = "(Lol;Ljava/lang/String;ZZB)V", + garbageValue = "-4" ) - public void method1509(AbstractArchive var1, String var2, boolean var3, boolean var4) { - if (!this.field2380) { + public void method1264(AbstractArchive var1, String var2, boolean var3, boolean var4) { + if (!this.field1987) { this.loaded = false; - this.field2380 = true; + this.field1987 = true; System.nanoTime(); - int var5 = var1.getGroupId(WorldMapCacheName.field2482.name); + int var5 = var1.getGroupId(WorldMapCacheName.field2095.name); int var6 = var1.getFileId(var5, var2); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2482.name, var2)); - Buffer var8 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2484.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2095.name, var2)); + Buffer var8 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2093.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); try { - this.mapAreaData.method1599(var7, var8, var6, var3, var4); + this.mapAreaData.method1363(var7, var8, var6, var3, var4); } catch (IllegalStateException var20) { return; } @@ -130,9 +123,9 @@ public void method1509(AbstractArchive var1, String var2, boolean var3, boolean int var10 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; System.nanoTime(); System.nanoTime(); - class139.method737(); + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); this.regions = new WorldMapRegion[var17][var10]; - Iterator var11 = this.mapAreaData.field2489.iterator(); + Iterator var11 = this.mapAreaData.field2100.iterator(); while (var11.hasNext()) { WorldMapData_0 var12 = (WorldMapData_0)var11.next(); @@ -140,54 +133,54 @@ public void method1509(AbstractArchive var1, String var2, boolean var3, boolean int var14 = var12.regionY; int var15 = var13 - this.mapAreaData.getRegionLowX(); int var16 = var14 - this.mapAreaData.getRegionLowY(); - this.regions[var15][var16] = new WorldMapRegion(var13, var14, this.mapAreaData.method1463(), this.fonts); + this.regions[var15][var16] = new WorldMapRegion(var13, var14, this.mapAreaData.method1218(), this.fonts); this.regions[var15][var16].initWorldMapData0(var12, this.mapAreaData.iconList); } for (int var18 = 0; var18 < var17; ++var18) { for (int var19 = 0; var19 < var10; ++var19) { if (this.regions[var18][var19] == null) { - this.regions[var18][var19] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var18, this.mapAreaData.getRegionLowY() + var19, this.mapAreaData.method1463(), this.fonts); - this.regions[var18][var19].initWorldMapData1(this.mapAreaData.field2488, this.mapAreaData.iconList); + this.regions[var18][var19] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var18, this.mapAreaData.getRegionLowY() + var19, this.mapAreaData.method1218(), this.fonts); + this.regions[var18][var19].initWorldMapData1(this.mapAreaData.field2101, this.mapAreaData.iconList); } } } System.nanoTime(); System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field2483.name, var2)) { - byte[] var21 = var1.takeFileByNames(WorldMapCacheName.field2483.name, var2); - this.compositeTextureSprite = Frames.method1335(var21); + if (var1.isValidFileName(WorldMapCacheName.field2094.name, var2)) { + byte[] var21 = var1.takeFileByNames(WorldMapCacheName.field2094.name, var2); + this.compositeTextureSprite = WorldMapArchiveLoader.method2391(var21); } System.nanoTime(); var1.clearGroups(); - var1.method1950(); + var1.method1943(); this.loaded = true; } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-236187865" + garbageValue = "-120523343" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "909385403" + garbageValue = "-737280912" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int[] var9 = Rasterizer2D.Rasterizer2D_pixels; int var10 = Rasterizer2D.Rasterizer2D_width; int var11 = Rasterizer2D.Rasterizer2D_height; - float[] var12 = Rasterizer2D.field4244; + float[] var12 = Rasterizer2D.field4245; int[] var13 = new int[4]; Rasterizer2D.Rasterizer2D_getClipArray(var13); WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); @@ -200,7 +193,7 @@ public final void drawTiles(int var1, int var2, int var3, int var4, int var5, in this.scaleHandlers.put(var16, var17); } - int var24 = var14.width + var14.x - 1; + int var24 = var14.x + var14.width - 1; int var18 = var14.y + var14.height - 1; int var19; @@ -211,47 +204,47 @@ public final void drawTiles(int var1, int var2, int var3, int var4, int var5, in } } - Rasterizer3D.method1247(var9, var10, var11, var12); + Rasterizer3D.method1426(var9, var10, var11, var12); Rasterizer2D.Rasterizer2D_setClipArray(var13); var19 = (int)(var15 * 64.0F); var20 = this.tileX + var1; int var21 = var2 + this.tileY; for (int var22 = var14.x; var22 < var14.x + var14.width; ++var22) { - for (int var23 = var14.y; var23 < var14.height + var14.y; ++var23) { - this.regions[var22][var23].method1475(var5 + (this.regions[var22][var23].regionX * 64 - var20) * var19 / 64, var8 - (this.regions[var22][var23].regionY * 64 - var21 + 64) * var19 / 64, var19); + for (int var23 = var14.y; var23 < var14.y + var14.height; ++var23) { + this.regions[var22][var23].method1230(var5 + (this.regions[var22][var23].regionX * 64 - var20) * var19 / 64, var8 - (this.regions[var22][var23].regionY * 64 - var21 + 64) * var19 / 64, var19); } } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-1519783799" + garbageValue = "-1576808810" ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); - int var16 = (int)(var15 * 64.0F); + int var16 = (int)(64.0F * var15); int var17 = this.tileX + var1; int var18 = var2 + this.tileY; int var19; int var20; for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { - for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { if (var13) { this.regions[var19][var20].initWorldMapIcon1s(); } - this.regions[var19][var20].method1485(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); + this.regions[var19][var20].method1240(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); } } if (var10 != null && var11 > 0) { - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { this.regions[var19][var20].flashElements(var10, var11, var12); } @@ -260,10 +253,10 @@ public final void drawElements(int var1, int var2, int var3, int var4, int var5, } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "65" + descriptor = "(IIIILjava/util/HashSet;III)V", + garbageValue = "-1372538042" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -300,12 +293,12 @@ public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, i } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIIIIIIIIIB)Ljava/util/List;", - garbageValue = "13" + descriptor = "(IIIIIIIIIII)Ljava/util/List;", + garbageValue = "-44973275" ) - public List method1514(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method1270(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); if (!this.loaded) { return var11; @@ -317,8 +310,8 @@ public List method1514(int var1, int var2, int var3, int var4, int var5, int var int var16 = var2 + this.tileY; for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { - for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { - List var19 = this.regions[var17][var18].method1506(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); + for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { + List var19 = this.regions[var17][var18].method1261(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); if (!var19.isEmpty()) { var11.addAll(var19); } @@ -329,10 +322,10 @@ public List method1514(int var1, int var2, int var3, int var4, int var5, int var } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IIIII)Lkx;", - garbageValue = "-1144444981" + descriptor = "(IIIII)Ljy;", + garbageValue = "-242177292" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { @@ -372,29 +365,29 @@ WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4 return var5; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1564953955" + garbageValue = "2083018743" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1360371503" + garbageValue = "-1029220515" ) - public int method1517() { - return this.mapAreaData.method1464(); + public int method1273() { + return this.mapAreaData.method1219(); } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/HashMap;", - garbageValue = "-868447675" + descriptor = "(B)Ljava/util/HashMap;", + garbageValue = "-62" ) @Export("buildIcons") public HashMap buildIcons() { @@ -402,10 +395,10 @@ public HashMap buildIcons() { return this.icons; } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "76" + descriptor = "(S)V", + garbageValue = "22535" ) @Export("buildIcons0") void buildIcons0() { @@ -439,10 +432,10 @@ void buildIcons0() { } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(III)F", - garbageValue = "-56693416" + garbageValue = "847621694" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { @@ -457,972 +450,50 @@ float getPixelsPerTile(int var1, int var2) { } } - @ObfuscatedName("ah") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lbb;Lpu;Lpu;B)V", - garbageValue = "77" + descriptor = "(III)V", + garbageValue = "-129998298" ) - static void method1521(GameEngine var0, Font var1, Font var2) { - int var5; - boolean var11; - int var40; - int var41; - boolean var55; - if (Login.worldSelectOpen) { - class226 var39 = class284.method1573(); - - while (true) { - if (!var39.method1148()) { - if (MouseHandler.MouseHandler_lastButton != 1 && (UserComparator8.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { - break; - } - - int var4 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - MouseHandler.changeWorldSelectSorting(0, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - MouseHandler.changeWorldSelectSorting(0, 1); - break; - } - - var5 = Login.xPadding + 390; - if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - MouseHandler.changeWorldSelectSorting(1, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - MouseHandler.changeWorldSelectSorting(1, 1); - break; - } - - var40 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var40 && MouseHandler.MouseHandler_lastPressedX <= var40 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - MouseHandler.changeWorldSelectSorting(2, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var40 + 15 && MouseHandler.MouseHandler_lastPressedX <= var40 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - MouseHandler.changeWorldSelectSorting(2, 1); - break; - } - - var41 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var41 && MouseHandler.MouseHandler_lastPressedX <= var41 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - MouseHandler.changeWorldSelectSorting(3, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var41 + 15 && MouseHandler.MouseHandler_lastPressedX <= var41 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - MouseHandler.changeWorldSelectSorting(3, 1); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - Login.worldSelectOpen = false; - PcmPlayer.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - break; - } - - if (Login.hoveredWorldIndex != -1) { - World var42 = UserComparator3.World_worlds[Login.hoveredWorldIndex]; - if (var42.isDeadman()) { - var42.field680 = "beta"; - } - - var55 = false; - if (var42.properties != Client.worldProperties) { - boolean var56 = (Client.worldProperties & class525.field4156.rsOrdinal()) != 0; - var11 = var42.isDeadman(); - if (var56 && !var11 || !var56 && var11) { - var55 = true; - } - } - - Language.changeWorld(var42); - Login.worldSelectOpen = false; - PcmPlayer.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - if (var55) { - class140.reloadJS5(); - } - } else { - if (Login.worldSelectPage > 0 && class372.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class372.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class491.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class491.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && class230.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= class340.canvasWidth - class230.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= class340.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class491.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class491.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } - break; - } - - if (var39.field1901 == 13) { - Login.worldSelectOpen = false; - PcmPlayer.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - break; - } - - if (var39.field1901 == 96) { - if (Login.worldSelectPage > 0 && class372.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (var39.field1901 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class230.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } - } - + public static void method1265(int var0, int var1) { + EnumComposition.method925(var0, var1, 0, 0); + class316.field2787.clear(); + class316.field2798.clear(); + if (class316.musicSongs.isEmpty() || var0 == 0 && var1 == 0) { + SecureRandomCallable.method457(); } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - class91.clientPreferences.getTitleMusicDisabled(!class91.clientPreferences.getTitleMusicDisabled()); - if (!class91.clientPreferences.getTitleMusicDisabled()) { - ArrayList var3 = new ArrayList(); - var3.add(new MusicSong(CollisionMap.archive6, "scape main", "", 255, false)); - class148.method776(var3, 0, 0, 0, 100, false); - } else { - ItemComposition.method1088(0, 0); - } - - class470.method2362(); + class316.field2798.add(new DelayFadeTask((SongTask)null, class316.musicPlayerStatus)); + class316.field2798.add(new FadeOutTask((SongTask)null, 0, false, class316.field2794)); + ArrayList var3 = new ArrayList(); + Iterator var4 = class316.musicSongs.iterator(); + + while (var4.hasNext()) { + MusicSong var5 = (MusicSong)var4.next(); + var3.add(var5); } - if (Client.gameState != 5) { - if (Login.field771 == -1L) { - Login.field771 = GrandExchangeOfferTotalQuantityComparator.method1971() + 1000L; - } - - long var23 = GrandExchangeOfferTotalQuantityComparator.method1971(); - if (ObjectSound.method415() && Login.field770 == -1L) { - Login.field770 = var23; - if (Login.field770 > Login.field771) { - Login.field771 = Login.field770; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - if (WorldMapLabelSize.clientLanguage == Language.Language_EN) { - if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var5 = Login.xPadding + 5; - short var6 = 463; - byte var7 = 100; - byte var25 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + var7 && MouseHandler.MouseHandler_lastPressedY >= var6 && MouseHandler.MouseHandler_lastPressedY <= var6 + var25) { - if (Canvas.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - - return; - } - } - - if (class91.World_request != null && Canvas.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - } - - var5 = MouseHandler.MouseHandler_lastButton; - var40 = MouseHandler.MouseHandler_lastPressedX; - var41 = MouseHandler.MouseHandler_lastPressedY; - if (var5 == 0) { - var40 = MouseHandler.MouseHandler_x; - var41 = MouseHandler.MouseHandler_y; - } - - if (!UserComparator8.mouseCam && var5 == 4) { - var5 = 1; - } - - class226 var8 = class284.method1573(); - short var44; - int var45; - if (Login.loginIndex == 0) { - var55 = false; - - while (var8.method1148()) { - if (var8.field1901 == 84) { - var55 = true; - } - } - - var45 = class379.loginBoxCenter - 80; - var44 = 291; - if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20) { - VertexNormal.openURL(ScriptEvent.method474("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var45 = class379.loginBoxCenter + 80; - if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20 || var55) { - if ((Client.worldProperties & class525.field4151.rsOrdinal()) != 0) { - Login.Login_response0 = ""; - Login.Login_response1 = "This is a Beta world."; - Login.Login_response2 = "Your normal account will not be affected."; - Login.Login_response3 = ""; - GameEngine.method166(1); - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } else if ((Client.worldProperties & class525.field4153.rsOrdinal()) != 0) { - if ((Client.worldProperties & class525.field4152.rsOrdinal()) != 0) { - Login.Login_response1 = "This is a High Risk PvP world."; - Login.Login_response2 = "Players can attack each other almost everywhere"; - Login.Login_response3 = "and the Protect Item prayer won't work."; - } else { - Login.Login_response1 = "This is a PvP world."; - Login.Login_response2 = "Players can attack each other"; - Login.Login_response3 = "almost everywhere."; - } - - Login.Login_response0 = "Warning!"; - GameEngine.method166(1); - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } else if ((Client.worldProperties & class525.field4152.rsOrdinal()) != 0) { - Login.Login_response1 = "This is a High Risk world."; - Login.Login_response2 = "The Protect Item prayer will"; - Login.Login_response3 = "not work on this world."; - Login.Login_response0 = "Warning!"; - GameEngine.method166(1); - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } else { - class429.Login_promptCredentials(false); - } - } - } else { - int var9; - short var10; - if (Login.loginIndex == 1) { - while (true) { - if (!var8.method1148()) { - var9 = class379.loginBoxCenter - 80; - var10 = 321; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - class429.Login_promptCredentials(false); - } - - var9 = class379.loginBoxCenter + 80; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - GameEngine.method166(0); - } - break; - } - - if (var8.field1901 == 84) { - class429.Login_promptCredentials(false); - } else if (var8.field1901 == 13) { - GameEngine.method166(0); - } - } - } else { - int var13; - int var14; - int var30; - short var43; - boolean var47; - if (Login.loginIndex == 2) { - var43 = 201; - var9 = var43 + 52; - if (var5 == 1 && var41 >= var9 - 12 && var41 < var9 + 2) { - Login.currentLoginField = 0; - } - - var9 += 15; - if (var5 == 1 && var41 >= var9 - 12 && var41 < var9 + 2) { - Login.currentLoginField = 1; - } - - var9 += 15; - var43 = 361; - if (class481.field3945 != null) { - var45 = class481.field3945.highX / 2; - if (var5 == 1 && var40 >= class481.field3945.lowX - var45 && var40 <= var45 + class481.field3945.lowX && var41 >= var43 - 15 && var41 < var43) { - switch(Login.field749) { - case 1: - VertexNormal.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); - return; - case 2: - VertexNormal.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var45 = class379.loginBoxCenter - 80; - var44 = 321; - if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20) { - class148.method780(); - return; - } - - var45 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20) { - GameEngine.method166(0); - Login.Login_username = ""; - Login.Login_password = ""; - ClientPreferences.field1059 = 0; - class186.otp = ""; - Login.field741 = true; - } - - var45 = class379.loginBoxCenter + -117; - var44 = 277; - Login.field742 = var40 >= var45 && var40 < var45 + class274.field2399 && var41 >= var44 && var41 < var44 + class202.field1581; - if (var5 == 1 && Login.field742) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && class91.clientPreferences.getUsernameToRemember() != null) { - class91.clientPreferences.setUsernameToRemember((String)null); - } - } - - var45 = class379.loginBoxCenter + 24; - var44 = 277; - Login.field743 = var40 >= var45 && var40 < var45 + class274.field2399 && var41 >= var44 && var41 < var44 + class202.field1581; - if (var5 == 1 && Login.field743) { - class91.clientPreferences.setIsUsernameHidden(!class91.clientPreferences.getIsUsernameHidden()); - if (!class91.clientPreferences.getIsUsernameHidden()) { - Login.Login_username = ""; - class91.clientPreferences.setUsernameToRemember((String)null); - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } - } - - label1341: - while (true) { - Transferable var59; - do { - while (true) { - label1257: - do { - while (true) { - while (var8.method1148()) { - if (var8.field1901 != 13) { - if (Login.currentLoginField != 0) { - continue label1257; - } - - char var48 = var8.field1899; - - for (var13 = 0; var13 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var48 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var13); ++var13) { - } - - if (var8.field1901 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (var8.field1901 == 84 || var8.field1901 == 80) { - Login.currentLoginField = 1; - } - - char var50 = var8.field1899; - boolean var53 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var50) != -1; - if (var53 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + var8.field1899; - } - } else { - GameEngine.method166(0); - Login.Login_username = ""; - Login.Login_password = ""; - ClientPreferences.field1059 = 0; - class186.otp = ""; - Login.field741 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (var8.field1901 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (var8.field1901 == 84 || var8.field1901 == 80) { - Login.currentLoginField = 0; - if (var8.field1901 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - AbstractWorldMapIcon.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - AbstractWorldMapIcon.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - AbstractWorldMapIcon.setLoginResponseString("", "Connecting to server...", ""); - UserComparator6.method690(false); - DefaultsGroup.updateGameState(20); - return; - } - } - - if ((var8.getKeyPressed(82) || var8.getKeyPressed(87)) && var8.field1901 == 67) { - Clipboard var58 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var59 = var58.getContents(class159.client); - var14 = 20 - Login.Login_password.length(); - break; - } - - char var54 = var8.field1899; - if ((var54 < ' ' || var54 >= 127) && (var54 <= 127 || var54 >= 160) && (var54 <= 160 || var54 > 255)) { - label1495: { - if (var54 != 0) { - char[] var60 = class399.cp1252AsciiExtension; - - for (var30 = 0; var30 < var60.length; ++var30) { - char var16 = var60[var30]; - if (var16 == var54) { - var47 = true; - break label1495; - } - } - } - - var47 = false; - } - } else { - var47 = true; - } - - if (var47) { - char var62 = var8.field1899; - boolean var51 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var62) != -1; - if (var51 && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + var8.field1899; - } - } - } - } while(var14 <= 0); - - try { - String var15 = (String)var59.getTransferData(DataFlavor.stringFlavor); - int var52 = Math.min(var14, var15.length()); - int var17 = 0; - - while (true) { - if (var17 >= var52) { - Login.Login_password = Login.Login_password + var15.substring(0, var52); - continue label1341; - } - - char var19 = var15.charAt(var17); - boolean var18; - if (var19 >= ' ' && var19 < 127 || var19 > 127 && var19 < 160 || var19 > 160 && var19 <= 255) { - var18 = true; - } else { - label1513: { - if (var19 != 0) { - char[] var20 = class399.cp1252AsciiExtension; - - for (int var21 = 0; var21 < var20.length; ++var21) { - char var22 = var20[var21]; - if (var19 == var22) { - var18 = true; - break label1513; - } - } - } - - var18 = false; - } - } - - if (!var18) { - break; - } - - char var57 = var15.charAt(var17); - boolean var28 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var57) != -1; - if (!var28) { - break; - } - - ++var17; - } - - GameEngine.method166(3); - return; - } catch (UnsupportedFlavorException var37) { - } catch (IOException var38) { - } - } - } else { - Bounds var31; - if (Login.loginIndex == 3) { - var9 = Login.loginBoxX + 180; - var10 = 241; - var31 = var1.method2119(25, "need to log in using the Jagex Launcher instead.".length() - 34, "need to log in using the Jagex Launcher instead.", var9, var10); - if (var5 == 1 && var31.method2321(var40, var41)) { - VertexNormal.openURL("https://oldschool.runescape.com/launcher", true, false); - } - - var9 = Login.loginBoxX + 180; - var10 = 276; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - MusicPatchNode2.method1657(false); - } - - var9 = Login.loginBoxX + 180; - var10 = 326; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - VertexNormal.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); - return; - } - } else { - int var12; - if (Login.loginIndex == 4) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - class186.otp.trim(); - if (class186.otp.length() != 6) { - AbstractWorldMapIcon.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - ClientPreferences.field1059 = Integer.parseInt(class186.otp); - class186.otp = ""; - UserComparator6.method690(true); - AbstractWorldMapIcon.setLoginResponseString("", "Connecting to server...", ""); - DefaultsGroup.updateGameState(20); - return; - } - - if (var5 == 1 && var40 >= Login.loginBoxX + 180 - 9 && var40 <= Login.loginBoxX + 180 + 130 && var41 >= 263 && var41 <= 296) { - Login.field741 = !Login.field741; - } - - if (var5 == 1 && var40 >= Login.loginBoxX + 180 - 34 && var40 <= Login.loginBoxX + 34 + 180 && var41 >= 351 && var41 <= 363) { - VertexNormal.openURL("https://support.runescape.com/hc/en-gb/articles/360001552065", true, false); - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - GameEngine.method166(0); - Login.Login_username = ""; - Login.Login_password = ""; - ClientPreferences.field1059 = 0; - class186.otp = ""; - } - - while (var8.method1148()) { - var11 = false; - - for (var12 = 0; var12 < "1234567890".length(); ++var12) { - if (var8.field1899 == "1234567890".charAt(var12)) { - var11 = true; - break; - } - } - - if (var8.field1901 == 13) { - GameEngine.method166(0); - Login.Login_username = ""; - Login.Login_password = ""; - ClientPreferences.field1059 = 0; - class186.otp = ""; - } else { - if (var8.field1901 == 85 && class186.otp.length() > 0) { - class186.otp = class186.otp.substring(0, class186.otp.length() - 1); - } - - if (var8.field1901 == 84) { - class186.otp.trim(); - if (class186.otp.length() != 6) { - AbstractWorldMapIcon.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - ClientPreferences.field1059 = Integer.parseInt(class186.otp); - class186.otp = ""; - UserComparator6.method690(true); - AbstractWorldMapIcon.setLoginResponseString("", "Connecting to server...", ""); - DefaultsGroup.updateGameState(20); - return; - } - - if (var11 && class186.otp.length() < 6) { - class186.otp = class186.otp + var8.field1899; - } - } - } - } else if (Login.loginIndex == 5) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - AbstractWorldMapIcon.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var32 = class7.method20(); - int var46; - if (0L == var32) { - var46 = 5; - } else { - var46 = class178.method924(var32, Login.Login_username); - } - - switch(var46) { - case 2: - AbstractWorldMapIcon.setLoginResponseString(Strings.field3466, Strings.field3468, Strings.field3464); - GameEngine.method166(6); - break; - case 3: - AbstractWorldMapIcon.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - AbstractWorldMapIcon.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - AbstractWorldMapIcon.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - AbstractWorldMapIcon.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - AbstractWorldMapIcon.setLoginResponseString("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."); - } - } - - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - class429.Login_promptCredentials(true); - } - - var44 = 361; - if (Message.field349 != null) { - var12 = Message.field349.highX / 2; - if (var5 == 1 && var40 >= Message.field349.lowX - var12 && var40 <= var12 + Message.field349.lowX && var41 >= var44 - 15 && var41 < var44) { - VertexNormal.openURL(ScriptEvent.method474("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (var8.method1148()) { - var47 = false; - - for (var13 = 0; var13 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var13) { - if (var8.field1899 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var13)) { - var47 = true; - break; - } - } - - if (var8.field1901 == 13) { - class429.Login_promptCredentials(true); - } else { - if (var8.field1901 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (var8.field1901 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - AbstractWorldMapIcon.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var34 = class7.method20(); - if (0L == var34) { - var13 = 5; - } else { - var13 = class178.method924(var34, Login.Login_username); - } - - switch(var13) { - case 2: - AbstractWorldMapIcon.setLoginResponseString(Strings.field3466, Strings.field3468, Strings.field3464); - GameEngine.method166(6); - break; - case 3: - AbstractWorldMapIcon.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - AbstractWorldMapIcon.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - AbstractWorldMapIcon.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - AbstractWorldMapIcon.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - AbstractWorldMapIcon.setLoginResponseString("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."); - } - } - - return; - } - - if (var47 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + var8.field1899; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - if (MusicPatchNode2.field2778 && !Client.onMobile) { - var9 = class379.loginBoxCenter - 150; - var45 = var9 + 40 + 240 + 25; - var44 = 231; - var12 = var44 + 40; - if (var5 == 1 && var40 >= var9 && var40 <= var45 && var41 >= var44 && var41 <= var12) { - var14 = var9; - var30 = 0; - - while (true) { - if (var30 >= 8) { - var13 = 0; - break; - } - - if (var40 <= var14 + 30) { - var13 = var30; - break; - } - - var14 += 30; - var14 += var30 != 1 && var30 != 3 ? 5 : 20; - ++var30; - } - - Login.field751 = var13; - } - - var13 = Login.loginBoxX + 180 - 80; - short var49 = 321; - boolean var61; - if (var5 == 1 && var40 >= var13 - 75 && var40 <= var13 + 75 && var41 >= var49 - 20 && var41 <= var49 + 20) { - var61 = class159.method840(); - if (var61) { - DefaultsGroup.updateGameState(50); - return; - } - } - - var13 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var40 >= var13 - 75 && var40 <= var13 + 75 && var41 >= var49 - 20 && var41 <= var49 + 20) { - Login.field766 = new String[8]; - class429.Login_promptCredentials(true); - } - - while (var8.method1148()) { - if (var8.field1901 == 101) { - Login.field766[Login.field751] = null; - } - - if (var8.field1901 == 85) { - if (Login.field766[Login.field751] == null && Login.field751 > 0) { - --Login.field751; - } - - Login.field766[Login.field751] = null; - } - - if (var8.field1899 >= '0' && var8.field1899 <= '9') { - Login.field766[Login.field751] = "" + var8.field1899; - if (Login.field751 < 7) { - ++Login.field751; - } - } - - if (var8.field1901 == 84) { - var61 = class159.method840(); - if (var61) { - DefaultsGroup.updateGameState(50); - } - - return; - } - } - } else { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - VertexNormal.openURL(ScriptEvent.method474("secure", true) + "m=dob/set_dob.ws", true, false); - AbstractWorldMapIcon.setLoginResponseString("", "Page has opened in the browser.", ""); - GameEngine.method166(6); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - class429.Login_promptCredentials(true); - } - } - } else if (Login.loginIndex == 8) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - VertexNormal.openURL("https://www.jagex.com/terms/privacy", true, false); - AbstractWorldMapIcon.setLoginResponseString("", "Page has opened in the browser.", ""); - GameEngine.method166(6); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - class429.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 9) { - var9 = Login.loginBoxX + 180; - var10 = 311; - if (var8.field1901 == 84 || var8.field1901 == 13 || var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - MusicPatchNode2.method1657(false); - } - } else if (Login.loginIndex == 10) { - var9 = Login.loginBoxX + 180; - var10 = 209; - if (var8.field1901 == 84 || var5 == 1 && var40 >= var9 - 109 && var40 <= var9 + 109 && var41 >= var10 && var41 <= var10 + 68) { - AbstractWorldMapIcon.setLoginResponseString("", "Connecting to server...", ""); - Client.field648 = class534.field4232; - UserComparator6.method690(false); - DefaultsGroup.updateGameState(20); - } - } else if (Login.loginIndex == 12) { - var9 = class379.loginBoxCenter; - var10 = 233; - var31 = var2.method2119(0, 30, "terms of use, privacy policy, and end user licence", var9, var10); - Bounds var26 = var2.method2119(32, 32, "terms of use, privacy policy, and end user licence", var9, var10); - Bounds var27 = var2.method2119(70, 34, "terms of use, privacy policy, and end user licence", var9, var10); - var45 = var10 + 17; - Bounds var29 = var2.method2119(0, 34, "agreement (EULA).", var9, var45); - if (var5 == 1) { - if (var31.method2321(var40, var41)) { - VertexNormal.openURL("https://www.jagex.com/terms", true, false); - } else if (var26.method2321(var40, var41)) { - VertexNormal.openURL("https://www.jagex.com/terms/privacy", true, false); - } else if (var27.method2321(var40, var41) || var29.method2321(var40, var41)) { - VertexNormal.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); - } - } - - var9 = class379.loginBoxCenter - 80; - var10 = 311; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - Tile.method1233(); - MusicPatchNode2.method1657(true); - } - - var9 = class379.loginBoxCenter + 80; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - Login.loginIndex = 13; - } - } else if (Login.loginIndex == 13) { - var9 = class379.loginBoxCenter; - var10 = 321; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - MusicPatchNode2.method1657(true); - } - } else if (Login.loginIndex == 14) { - String var36 = ""; - switch(Login.field748) { - case 0: - var36 = "https://secure.runescape.com/m=offence-appeal/account-history"; - break; - case 1: - var36 = "https://secure.runescape.com/m=accountappeal/passwordrecovery"; - break; - case 2: - var36 = "https://support.runescape.com/hc/en-gb/articles/207256855-Settle-an-Unpaid-Balance"; - break; - default: - class429.Login_promptCredentials(false); - } - - var45 = Login.loginBoxX + 180; - var44 = 276; - if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20) { - VertexNormal.openURL(var36, true, false); - AbstractWorldMapIcon.setLoginResponseString("", "Page has opened in the browser.", ""); - GameEngine.method166(6); - return; - } - - var45 = Login.loginBoxX + 180; - var44 = 326; - if (var5 == 1 && var40 >= var45 - 75 && var40 <= var45 + 75 && var41 >= var44 - 20 && var41 <= var44 + 20) { - class429.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var9 = Login.loginBoxX + 180; - var10 = 301; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - MusicPatchNode2.method1657(false); - } - } else if (Login.loginIndex == 32) { - var9 = Login.loginBoxX + 180 - 80; - var10 = 321; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - VertexNormal.openURL(ScriptEvent.method474("secure", true) + "m=dob/set_dob.ws", true, false); - AbstractWorldMapIcon.setLoginResponseString("", "Page has opened in the browser.", ""); - GameEngine.method166(6); - return; - } - - var9 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - class429.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 33) { - var9 = Login.loginBoxX + 180; - var10 = 276; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - VertexNormal.openURL("https://oldschool.runescape.com/launcher", true, false); - } + class316.field2798.add(new class413((SongTask)null, var3)); + } - var9 = Login.loginBoxX + 180; - var10 = 326; - if (var5 == 1 && var40 >= var9 - 75 && var40 <= var9 + 75 && var41 >= var10 - 20 && var41 <= var10 + 20) { - class429.Login_promptCredentials(true); - } - } - } else { - while (true) { - do { - if (!var8.method1148()) { - var43 = 321; - if (var5 == 1 && var41 >= var43 - 20 && var41 <= var43 + 20) { - class429.Login_promptCredentials(true); - } + } - return; - } - } while(var8.field1901 != 84 && var8.field1901 != 13); + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "1154" + ) + protected static final void method1277() { + ArchiveDiskAction.clock.mark(); - class429.Login_promptCredentials(true); - } - } - } - } - } - } + int var0; + for (var0 = 0; var0 < 32; ++var0) { + GameEngine.graphicsTickTimes[var0] = 0L; + } - } - } + for (var0 = 0; var0 < 32; ++var0) { + GameEngine.clientTickTimes[var0] = 0L; } + + GameEngine.gameCyclesToDo = 0; } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapRectangle.java b/osrs/src/main/java/WorldMapRectangle.java index 6bd248e8c..34e1e2635 100644 --- a/osrs/src/main/java/WorldMapRectangle.java +++ b/osrs/src/main/java/WorldMapRectangle.java @@ -3,33 +3,357 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kx") +@ObfuscatedName("jy") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("ac") + @ObfuscatedName("au") + @Export("PcmPlayer_stereo") + public static boolean PcmPlayer_stereo; + @ObfuscatedName("at") @Export("width") int width; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("height") int height; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("x") int x; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Ljf;" ) @Export("this$0") @ObfuscatedName("this$0") final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lkk;)V" + descriptor = "(Ljf;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1725155859" + ) + static int method1326() { + return class28.KeyHandler_keyCodes.length; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "-373966383" + ) + static int method1327(int var0, Script var1, boolean var2) { + boolean var3 = true; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var4 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + var3 = false; + } else { + var4 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + } + + int var11; + if (var0 == 1300) { + var11 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]); + return 1; + } else { + --class127.Interpreter_stringStackSize; + return 1; + } + } else { + int var6; + if (var0 == 1301) { + DbTableType.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var4.parent = HealthBarDefinition.widgetDefinition.getWidgetChild(var11, var6); + return 1; + } else if (var0 == 1302) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1303) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + return 1; + } else if (var0 == 1304) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + return 1; + } else if (var0 == 1305) { + var4.dataText = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + return 1; + } else if (var0 == 1306) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + return 1; + } else if (var0 == 1307) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1309) { + --DbTableType.Interpreter_intStackSize; + return 1; + } else { + int var7; + byte[] var9; + if (var0 != 1350) { + byte var5; + if (var0 == 1351) { + DbTableType.Interpreter_intStackSize -= 2; + var5 = 10; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]}; + byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]}; + class176.Widget_setKey(var4, var5, var9, var10); + return 1; + } else if (var0 == 1352) { + DbTableType.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + WorldMapAreaData.Widget_setKeyRate(var4, var11, var6, var7); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == 1353) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + WorldMapAreaData.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == 1354) { + --DbTableType.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + class137.Widget_setKeyIgnoreHeld(var4, var11); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == 1355) { + var5 = 10; + class137.Widget_setKeyIgnoreHeld(var4, var5); + return 1; + } else { + return 2; + } + } else { + byte[] var8 = null; + var9 = null; + if (var3) { + DbTableType.Interpreter_intStackSize -= 10; + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + DbTableType.Interpreter_intStackSize] >= 0; var7 += 2) { + } + + if (var7 > 0) { + var8 = new byte[var7 / 2]; + var9 = new byte[var7 / 2]; + + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + DbTableType.Interpreter_intStackSize]; + var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + DbTableType.Interpreter_intStackSize + 1]; + } + } + } else { + DbTableType.Interpreter_intStackSize -= 2; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]}; + } + + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + class176.Widget_setKey(var4, var7, var8, var9); + return 1; + } else { + throw new RuntimeException(); + } + } + } + } + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "-1752890787" + ) + static int method1328(int var0, Script var1, boolean var2) { + if (var0 == 3800) { + if (class478.guestClanSettings != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + Timer.field3782 = class478.guestClanSettings; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + int var3; + if (var0 == 3801) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (Client.currentClanSettings[var3] != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + Timer.field3782 = Client.currentClanSettings[var3]; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3802) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = Timer.field3782.name; + return 1; + } else if (var0 == 3803) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.allowGuests ? 1 : 0; + return 1; + } else if (var0 == 3804) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.field1380; + return 1; + } else if (var0 == 3805) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.field1383; + return 1; + } else if (var0 == 3806) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.field1381; + return 1; + } else if (var0 == 3807) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.field1382; + return 1; + } else if (var0 == 3809) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.memberCount; + return 1; + } else if (var0 == 3810) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = Timer.field3782.memberNames[var3]; + return 1; + } else if (var0 == 3811) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.memberRanks[var3]; + return 1; + } else if (var0 == 3812) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.bannedMemberCount; + return 1; + } else if (var0 == 3813) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = Timer.field3782.bannedMemberNames[var3]; + return 1; + } else { + int var5; + int var6; + if (var0 == 3814) { + DbTableType.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.method801(var3, var6, var5); + return 1; + } else if (var0 == 3815) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.currentOwner; + return 1; + } else if (var0 == 3816) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.field1388; + return 1; + } else if (var0 == 3817) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.method800(Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]); + return 1; + } else if (var0 == 3818) { + Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.getSortedMembers()[Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == 3819) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + UserComparator4.method667(var6, var3); + return 1; + } else if (var0 == 3820) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.field1390[var3]; + return 1; + } else { + if (var0 == 3821) { + DbTableType.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + class4.method6(var5, var3, var4); + } + + if (var0 == 3822) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Timer.field3782.field1379[var3] ? 1 : 0; + return 1; + } else if (var0 == 3850) { + if (ItemContainer.guestClanChannel != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + VarcInt.field1474 = ItemContainer.guestClanChannel; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3851) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (Client.currentClanChannels[var3] != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + VarcInt.field1474 = Client.currentClanChannels[var3]; + class395.field3683 = var3; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3852) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = VarcInt.field1474.name; + return 1; + } else if (var0 == 3853) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = VarcInt.field1474.field1418; + return 1; + } else if (var0 == 3854) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = VarcInt.field1474.field1417; + return 1; + } else if (var0 == 3855) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = VarcInt.field1474.method857(); + return 1; + } else if (var0 == 3856) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ((ClanChannelMember)VarcInt.field1474.members.get(var3)).username.getName(); + return 1; + } else if (var0 == 3857) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = ((ClanChannelMember)VarcInt.field1474.members.get(var3)).rank; + return 1; + } else if (var0 == 3858) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = ((ClanChannelMember)VarcInt.field1474.members.get(var3)).world; + return 1; + } else if (var0 == 3859) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class30.method134(class395.field3683, var3); + return 1; + } else if (var0 == 3860) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = VarcInt.field1474.method858(Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]); + return 1; + } else if (var0 == 3861) { + Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1] = VarcInt.field1474.getSortedMembers()[Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == 3890) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.varclan != null ? 1 : 0; + return 1; + } else { + return 2; + } + } + } + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapRegion.java b/osrs/src/main/java/WorldMapRegion.java index 74e1ed32a..427f8eb7a 100644 --- a/osrs/src/main/java/WorldMapRegion.java +++ b/osrs/src/main/java/WorldMapRegion.java @@ -6,43 +6,43 @@ import java.util.*; import java.util.Map.Entry; -@ObfuscatedName("ke") +@ObfuscatedName("jl") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "Lls;" ) @Export("WorldMapRegion_cachedSprites") public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("regionX") int regionX; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("regionY") int regionY; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lii;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("icon0List") List icon0List; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("fonts") final HashMap fonts; @@ -60,13 +60,13 @@ public class WorldMapRegion { this.fonts = var4; } - @ObfuscatedName("ax") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-15" + descriptor = "(IIII)V", + garbageValue = "-1077363567" ) - void method1475(int var1, int var2, int var3) { - SpritePixels var4 = class33.method134(this.regionX, this.regionY, this.pixelsPerTile); + void method1230(int var1, int var2, int var3) { + SpritePixels var4 = class130.method712(this.regionX, this.regionY, this.pixelsPerTile); if (var4 != null) { if (var3 == this.pixelsPerTile * 64) { var4.drawAt(var1, var2); @@ -77,10 +77,10 @@ void method1475(int var1, int var2, int var3) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lkj;Ljava/util/List;S)V", - garbageValue = "-25171" + descriptor = "(Lii;Ljava/util/List;I)V", + garbageValue = "1079022526" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -89,10 +89,10 @@ void initWorldMapData0(WorldMapData_0 var1, List var2) { this.addAllToIconList(var2); } - @ObfuscatedName("ah") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "-121213257" + descriptor = "(Ljava/util/HashSet;Ljava/util/List;S)V", + garbageValue = "363" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -109,10 +109,10 @@ void initWorldMapData1(HashSet var1, List var2) { this.addAllToIconList(var2); } - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIIILkv;S)V", - garbageValue = "29922" + descriptor = "(IIIILjm;I)V", + garbageValue = "-1882994474" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { @@ -126,8 +126,8 @@ void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapDa for (int var11 = 0; var11 < var10.length; ++var11) { WorldMapDecoration var12 = var10[var11]; - ObjectComposition var13 = class91.getObjectDefinition(var12.objectDefinitionId); - if (TileItem.method615(var13)) { + ObjectComposition var13 = WorldMapSection2.getObjectDefinition(var12.objectDefinitionId); + if (class351.method1892(var13)) { this.getIcon(var13, var8, var6, var7, var5); continue label45; } @@ -139,20 +139,20 @@ void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapDa } - @ObfuscatedName("ab") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Liz;IIILkv;I)V", - garbageValue = "1079014997" + descriptor = "(Lhs;IIILjm;B)V", + garbageValue = "-49" ) @Export("getIcon") void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); Coord var7 = null; if (this.worldMapData_0 != null) { - var7 = new Coord(this.worldMapData_0.field2444 + var2, var3 + this.worldMapData_0.field2445 * 64, var4 + this.worldMapData_0.field2443 * 64); + var7 = new Coord(this.worldMapData_0.field2053 + var2, var3 + this.worldMapData_0.field2051 * 64, var4 + this.worldMapData_0.field2055 * 64); } else { WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.field2444, var8.field2445 * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.field2443 * 64 + var8.getChunkYLow() * 8); + var7 = new Coord(var2 + var8.field2053, var3 + var8.field2051 * 64 + var8.getChunkXLow() * 8, var8.field2055 * 64 + var4 + var8.getChunkYLow() * 8); } WorldMapElement var9; @@ -160,21 +160,21 @@ void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorld if (var1.transforms != null) { var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - var9 = class148.WorldMapElement_get(var1.mapIconId); + var9 = class141.WorldMapElement_get(var1.mapIconId); var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); } - var9 = class148.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); - if (var9.field1517) { + var9 = class141.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); + if (var9.field1461) { this.iconMap.put(new Coord(0, var3, var4), var10); } } - @ObfuscatedName("am") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "1468543514" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { @@ -189,10 +189,10 @@ void initWorldMapIcon1s() { } - @ObfuscatedName("av") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Ljava/util/List;I)V", - garbageValue = "-1862948896" + garbageValue = "-1918438816" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -200,20 +200,20 @@ void addAllToIconList(List var1) { while (var2.hasNext()) { WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); - if (class148.WorldMapElement_get(var3.element).field1517 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method1504(var3.element)); + if (class141.WorldMapElement_get(var3.element).field1461 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method1259(var3.element)); this.icon0List.add(var4); } } } - @ObfuscatedName("ag") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2032089595" + descriptor = "(B)V", + garbageValue = "-70" ) - void method1482() { + void method1237() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { @@ -227,10 +227,10 @@ void method1482() { } - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lom;B)Z", - garbageValue = "24" + descriptor = "(Lol;I)Z", + garbageValue = "-207493702" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { @@ -268,14 +268,14 @@ boolean loadGeography(AbstractArchive var1) { @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ILlf;[Lun;Lom;Lom;B)V", - garbageValue = "127" + descriptor = "(ILja;[Lup;Lol;Lol;I)V", + garbageValue = "-67039997" ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.pixelsPerTile = var1; if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - if (class33.method134(this.regionX, this.regionY, var1) == null) { + if (class130.method712(this.regionX, this.regionY, var1) == null) { boolean var6 = true; var6 &= this.loadGeography(var4); int var8; @@ -288,28 +288,39 @@ void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, Abstrac var6 &= var5.tryLoadGroup(var8); if (var6) { byte[] var7 = var5.takeFileFlat(var8); - WorldMapSprite var9 = User.method2251(var7); - SpritePixels var10 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); - var10.setRaster(); + WorldMapSprite var9; + if (var7 == null) { + var9 = new WorldMapSprite(); + } else { + var9 = new WorldMapSprite(WorldMapArchiveLoader.method2391(var7).pixels); + } + + SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); + var11.setRaster(); if (this.worldMapData_0 != null) { - this.method1487(var2, var3, var9); + this.method1242(var2, var3, var9); } else { - this.method1488(var2, var3, var9); + this.method1243(var2, var3, var9); } - class354.method1895(var10, this.regionX, this.regionY, this.pixelsPerTile); - this.method1482(); + int var12 = this.regionX; + int var13 = this.regionY; + int var14 = this.pixelsPerTile; + DemotingHashTable var15 = WorldMapRegion_cachedSprites; + long var17 = (long)(var14 << 16 | var12 << 8 | var13); + var15.put(var11, var17, var11.pixels.length * 4); + this.method1237(); } } } } - @ObfuscatedName("ay") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(IIILjava/util/HashSet;B)V", - garbageValue = "0" + garbageValue = "99" ) - void method1485(int var1, int var2, int var3, HashSet var4) { + void method1240(int var1, int var2, int var3, HashSet var4) { if (var4 == null) { var4 = new HashSet(); } @@ -318,10 +329,10 @@ void method1485(int var1, int var2, int var3, HashSet var4) { this.drawMapLinks(var1, var2, var4, var3); } - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "28125091" + garbageValue = "-1303977769" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { @@ -332,44 +343,44 @@ void flashElements(HashSet var1, int var2, int var3) { if (var5.hasValidElement()) { int var6 = var5.getElement(); if (var1.contains(var6)) { - WorldMapElement var7 = class148.WorldMapElement_get(var6); + WorldMapElement var7 = class141.WorldMapElement_get(var6); this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method1496(var1, var2, var3); + this.method1251(var1, var2, var3); } - @ObfuscatedName("aj") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Llf;[Lun;Lkc;I)V", - garbageValue = "-1042706129" + descriptor = "(Lja;[Lup;Lju;B)V", + garbageValue = "41" ) - void method1487(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method1242(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); - this.method1491(var4, var5, this.worldMapData_0, var1); + this.method1246(var4, var5, this.worldMapData_0, var1); } } for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { - this.method1489(var4, var5, this.worldMapData_0, var1, var2); + this.method1244(var4, var5, this.worldMapData_0, var1, var2); } } } - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Llf;[Lun;Lkc;I)V", - garbageValue = "1664111804" + descriptor = "(Lja;[Lup;Lju;B)V", + garbageValue = "85" ) - void method1488(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method1243(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -381,7 +392,7 @@ void method1488(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { this.drawTileGround(var6, var7, var5, var1, var3); - this.method1491(var6, var7, var5, var1); + this.method1246(var6, var7, var5, var1); } } } @@ -393,27 +404,27 @@ void method1488(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { - this.method1489(var6, var7, var5, var1, var2); + this.method1244(var6, var7, var5, var1, var2); } } } } - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IILkv;Llf;[Lun;I)V", - garbageValue = "560650516" + descriptor = "(IILjm;Lja;[Lup;I)V", + garbageValue = "125658269" ) - void method1489(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method1494(var1, var2, var3); - this.method1493(var1, var2, var3, var5); + void method1244(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method1249(var1, var2, var3); + this.method1248(var1, var2, var3, var5); } - @ObfuscatedName("ai") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IILkv;Llf;Lkc;B)V", - garbageValue = "120" + descriptor = "(IILjm;Lja;Lju;I)V", + garbageValue = "-102705399" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { @@ -425,56 +436,56 @@ void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScale int var8 = 16711935; if (var7 != -1) { - var8 = ScriptEvent.method466(var7, this.backgroundColor); + var8 = TriBool.method2273(var7, this.backgroundColor); } - if (var7 > -1 && var3.field2439[0][var1][var2] == 0) { + if (var7 > -1 && var3.field2049[0][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - int var9 = this.method1492(var1, var2, var3, var5); + int var9 = this.method1247(var1, var2, var3, var5); if (var7 == -1) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method1603(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2439[0][var1][var2], var3.field2438[0][var1][var2]); + var4.method1368(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2049[0][var1][var2], var3.field2048[0][var1][var2]); } } } - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IILkv;Llf;S)V", - garbageValue = "-16059" + descriptor = "(IILjm;Lja;I)V", + garbageValue = "579360220" ) - void method1491(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + void method1246(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { for (int var5 = 1; var5 < var3.planes; ++var5) { int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; if (var6 > -1) { - int var7 = ScriptEvent.method466(var6, this.backgroundColor); - if (var3.field2439[var5][var1][var2] == 0) { + int var7 = TriBool.method2273(var6, this.backgroundColor); + if (var3.field2049[var5][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var4.method1603(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2439[var5][var1][var2], var3.field2438[var5][var1][var2]); + var4.method1368(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2049[var5][var1][var2], var3.field2048[var5][var1][var2]); } } } } - @ObfuscatedName("aw") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IILkv;Lkc;I)I", - garbageValue = "-453973498" + descriptor = "(IILjm;Lju;B)I", + garbageValue = "0" ) - int method1492(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + int method1247(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } - @ObfuscatedName("aq") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(IILkv;[Lun;B)V", - garbageValue = "-100" + descriptor = "(IILjm;[Lup;S)V", + garbageValue = "168" ) - void method1493(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + void method1248(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { for (int var5 = 0; var5 < var3.planes; ++var5) { WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; if (var6 != null && var6.length != 0) { @@ -482,14 +493,22 @@ void method1493(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] v for (int var8 = 0; var8 < var7.length; ++var8) { WorldMapDecoration var9 = var7[var8]; - if (class314.method1650(var9.decoration) || class209.method1032(var9.decoration)) { - ObjectComposition var10 = class91.getObjectDefinition(var9.objectDefinitionId); - if (var10.mapSceneId != -1) { - if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { - var4[var10.mapSceneId].method2693(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); - } else { - var4[var10.mapSceneId].method2693(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); - } + int var11 = var9.decoration; + boolean var10 = var11 >= WorldMapDecorationType.field3156.id && var11 <= WorldMapDecorationType.field3151.id; + if (!var10) { + int var13 = var9.decoration; + boolean var12 = var13 == WorldMapDecorationType.field3152.id; + if (!var12) { + continue; + } + } + + ObjectComposition var14 = WorldMapSection2.getObjectDefinition(var9.objectDefinitionId); + if (var14.mapSceneId != -1) { + if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { + var4[var14.mapSceneId].method2671(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + } else { + var4[var14.mapSceneId].method2671(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); } } } @@ -498,12 +517,12 @@ void method1493(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] v } - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(IILkv;I)V", - garbageValue = "-428310467" + descriptor = "(IILjm;I)V", + garbageValue = "-393075620" ) - void method1494(int var1, int var2, AbstractWorldMapData var3) { + void method1249(int var1, int var2, AbstractWorldMapData var3) { for (int var4 = 0; var4 < var3.planes; ++var4) { WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; if (var5 != null && var5.length != 0) { @@ -511,46 +530,48 @@ void method1494(int var1, int var2, AbstractWorldMapData var3) { for (int var7 = 0; var7 < var6.length; ++var7) { WorldMapDecoration var8 = var6[var7]; - if (class60.method330(var8.decoration)) { - ObjectComposition var9 = class91.getObjectDefinition(var8.objectDefinitionId); - int var10 = var9.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field3150.id) { - this.method1508(var1, var2, var8.rotation, var10); + int var10 = var8.decoration; + boolean var9 = var10 >= WorldMapDecorationType.field3155.id && var10 <= WorldMapDecorationType.field3153.id || var10 == WorldMapDecorationType.field3150.id; + if (var9) { + ObjectComposition var11 = WorldMapSection2.getObjectDefinition(var8.objectDefinitionId); + int var12 = var11.int1 != 0 ? -3407872 : -3355444; + if (var8.decoration == WorldMapDecorationType.field3155.id) { + this.method1263(var1, var2, var8.rotation, var12); } - if (var8.decoration == WorldMapDecorationType.field3151.id) { - this.method1508(var1, var2, var8.rotation, -3355444); - this.method1508(var1, var2, var8.rotation + 1, var10); + if (var8.decoration == WorldMapDecorationType.field3154.id) { + this.method1263(var1, var2, var8.rotation, -3355444); + this.method1263(var1, var2, var8.rotation + 1, var12); } if (var8.decoration == WorldMapDecorationType.field3153.id) { if (var8.rotation == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); } if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); } if (var8.rotation == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); } } - if (var8.decoration == WorldMapDecorationType.field3152.id) { - int var11 = var8.rotation % 2; - int var12; - if (var11 == 0) { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); + if (var8.decoration == WorldMapDecorationType.field3150.id) { + int var13 = var8.rotation % 2; + int var14; + if (var13 == 0) { + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); } } else { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); } } } @@ -561,10 +582,10 @@ void method1494(int var1, int var2, AbstractWorldMapData var3) { } - @ObfuscatedName("at") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "1490709112" + descriptor = "(IILjava/util/HashSet;IS)V", + garbageValue = "3124" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { @@ -576,32 +597,32 @@ void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { Entry var8 = (Entry)var7.next(); Coord var9 = (Coord)var8.getKey(); int var10 = (int)((float)var9.x * var5 + (float)var1 - var6); - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); + int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); if (var12 != null && var12.hasValidElement()) { var12.screenX = var10; var12.screenY = var11; - WorldMapElement var13 = class148.WorldMapElement_get(var12.getElement()); + WorldMapElement var13 = class141.WorldMapElement_get(var12.getElement()); if (!var3.contains(var13.getObjectId())) { - this.method1498(var12, var10, var11, var5); + this.method1253(var12, var10, var11, var5); } } } } - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "1547039881" + descriptor = "(Ljava/util/HashSet;IIB)V", + garbageValue = "-44" ) - void method1496(HashSet var1, int var2, int var3) { + void method1251(HashSet var1, int var2, int var3) { Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.hasValidElement()) { - WorldMapElement var6 = class148.WorldMapElement_get(var5.getElement()); + WorldMapElement var6 = class141.WorldMapElement_get(var5.getElement()); if (var6 != null && var1.contains(var6.getObjectId())) { this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } @@ -610,10 +631,10 @@ void method1496(HashSet var1, int var2, int var3) { } - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lhp;IIIII)V", - garbageValue = "-1967099559" + descriptor = "(Lgr;IIIII)V", + garbageValue = "1904364897" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { @@ -628,43 +649,43 @@ void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, in } } - @ObfuscatedName("bn") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lll;IIFI)V", - garbageValue = "543653437" + descriptor = "(Ljc;IIFI)V", + garbageValue = "1545285255" ) - void method1498(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = class148.WorldMapElement_get(var1.getElement()); - this.method1499(var5, var2, var3); - this.method1500(var1, var5, var2, var3, var4); + void method1253(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = class141.WorldMapElement_get(var1.getElement()); + this.method1254(var5, var2, var3); + this.method1255(var1, var5, var2, var3, var4); } - @ObfuscatedName("bk") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lhp;IIS)V", - garbageValue = "18184" + descriptor = "(Lgr;III)V", + garbageValue = "-980453833" ) - void method1499(WorldMapElement var1, int var2, int var3) { + void method1254(WorldMapElement var1, int var2, int var3) { SpritePixels var4 = var1.getSpriteBool(false); if (var4 != null) { - int var5 = this.method1502(var4, var1.horizontalAlignment); - int var6 = this.method1503(var4, var1.verticalAlignment); + int var5 = this.method1257(var4, var1.horizontalAlignment); + int var6 = this.method1258(var4, var1.verticalAlignment); var4.drawTransBgAt(var5 + var2, var3 + var6); } } - @ObfuscatedName("by") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(Lll;Lhp;IIFB)V", - garbageValue = "-110" + descriptor = "(Ljc;Lgr;IIFI)V", + garbageValue = "1339330901" ) - void method1500(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + void method1255(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.getLabel(); if (var6 != null) { - if (var6.size.method1433(var5)) { + if (var6.size.method1184(var5)) { Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1523, 0, 1, 0, var7.ascent / 2); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1466, 0, 1, 0, var7.ascent / 2); } } } @@ -672,7 +693,7 @@ void method1500(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int v @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(IILjava/util/HashSet;IB)V", - garbageValue = "105" + garbageValue = "57" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { @@ -687,64 +708,64 @@ void drawMapLinks(int var1, int var2, HashSet var3, int var4) { var7.screenX = (int)((float)var8 * var5 + (float)var1); var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); if (!var3.contains(var7.getElement())) { - this.method1498(var7, var7.screenX, var7.screenY, var5); + this.method1253(var7, var7.screenX, var7.screenY, var5); } } } } - @ObfuscatedName("be") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(Lud;Lhb;B)I", - garbageValue = "0" + descriptor = "(Luz;Lhq;I)I", + garbageValue = "1376501823" ) - int method1502(SpritePixels var1, HorizontalAlignment var2) { + int method1257(SpritePixels var1, HorizontalAlignment var2) { switch(var2.value) { case 0: - return -var1.subWidth / 2; - case 1: return 0; + case 2: + return -var1.subWidth / 2; default: return -var1.subWidth; } } - @ObfuscatedName("bv") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(Lud;Lhr;I)I", - garbageValue = "1581572144" + descriptor = "(Luz;Lhg;I)I", + garbageValue = "1990886316" ) - int method1503(SpritePixels var1, VerticalAlignment var2) { + int method1258(SpritePixels var1, VerticalAlignment var2) { switch(var2.value) { case 0: return -var1.subHeight / 2; - case 1: + case 2: return 0; default: return -var1.subHeight; } } - @ObfuscatedName("bz") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(IB)Lkd;", - garbageValue = "91" + descriptor = "(IB)Ljk;", + garbageValue = "1" ) - WorldMapLabel method1504(int var1) { - WorldMapElement var2 = class148.WorldMapElement_get(var1); + WorldMapLabel method1259(int var1) { + WorldMapElement var2 = class141.WorldMapElement_get(var1); return this.createMapLabel(var2); } - @ObfuscatedName("bb") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(Lhp;I)Lkd;", - garbageValue = "273104668" + descriptor = "(Lgr;I)Ljk;", + garbageValue = "1614567762" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { - WorldMapLabelSize var2 = WorldMapLabelSize.method1434(var1.textSize); + WorldMapLabelSize var2 = WorldMapLabelSize.method1185(var1.textSize); if (var2 == null) { return null; } else { @@ -775,12 +796,12 @@ WorldMapLabel createMapLabel(WorldMapElement var1) { } } - @ObfuscatedName("bo") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(IIIIII)Ljava/util/List;", - garbageValue = "217734504" + descriptor = "(IIIIIB)Ljava/util/List;", + garbageValue = "102" ) - List method1506(int var1, int var2, int var3, int var4, int var5) { + List method1261(int var1, int var2, int var3, int var4, int var5) { LinkedList var6 = new LinkedList(); if (var4 >= var1 && var5 >= var2) { if (var4 < var3 + var1 && var5 < var3 + var2) { @@ -812,10 +833,10 @@ List method1506(int var1, int var2, int var3, int var4, int var5) { } } - @ObfuscatedName("bp") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(I)Ljava/util/List;", - garbageValue = "-1898009311" + garbageValue = "201703863" ) @Export("icons") List icons() { @@ -825,12 +846,12 @@ List icons() { return var1; } - @ObfuscatedName("bt") + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1887311417" + garbageValue = "-164238097" ) - void method1508(int var1, int var2, int var3, int var4) { + void method1263(int var1, int var2, int var3, int var4) { var3 %= 4; if (var3 == 0) { Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); @@ -849,14 +870,4 @@ void method1508(int var1, int var2, int var3, int var4) { } } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(II)Lcr;", - garbageValue = "-1821344982" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapScaleHandler.java b/osrs/src/main/java/WorldMapScaleHandler.java index 0a300aef9..977162154 100644 --- a/osrs/src/main/java/WorldMapScaleHandler.java +++ b/osrs/src/main/java/WorldMapScaleHandler.java @@ -3,13 +3,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("ja") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("tileTemplates") byte[][][] tileTemplates; @@ -17,25 +17,25 @@ public class WorldMapScaleHandler { this.pixelsPerTile = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "2135415394" + descriptor = "(IIIIIIIIB)V", + garbageValue = "-68" ) - void method1603(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method1368(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { - var8 = this.method1604(var8, var7); - var7 = this.method1605(var7); + var8 = this.method1369(var8, var7); + var7 = this.method1370(var7); Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1861454757" + garbageValue = "-1836186644" ) - int method1604(int var1, int var2) { + int method1369(int var1, int var2) { if (var2 == 9) { var1 = var1 + 1 & 3; } @@ -51,12 +51,12 @@ int method1604(int var1, int var2) { return var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1575077587" + garbageValue = "1639881459" ) - int method1605(int var1) { + int method1370(int var1) { if (var1 != 9 && var1 != 10) { return var1 == 11 ? 8 : var1; } else { @@ -64,10 +64,10 @@ int method1605(int var1) { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1584291418" + descriptor = "(B)V", + garbageValue = "1" ) @Export("init") void init() { @@ -84,10 +84,10 @@ void init() { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "14" + descriptor = "(I)V", + garbageValue = "1390851291" ) @Export("init0") void init0() { @@ -151,10 +151,10 @@ void init0() { this.tileTemplates[0][3] = var1; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-826599457" + garbageValue = "-164292987" ) @Export("init1") void init1() { @@ -222,10 +222,10 @@ void init1() { this.tileTemplates[1][3] = var1; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1845734656" + descriptor = "(B)V", + garbageValue = "53" ) @Export("init2") void init2() { @@ -289,10 +289,10 @@ void init2() { this.tileTemplates[2][3] = var1; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "16711935" + garbageValue = "1774787578" ) @Export("init3") void init3() { @@ -356,10 +356,10 @@ void init3() { this.tileTemplates[3][3] = var1; } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "723161545" + descriptor = "(B)V", + garbageValue = "-19" ) @Export("init4") void init4() { @@ -423,10 +423,10 @@ void init4() { this.tileTemplates[4][3] = var1; } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1015422631" + descriptor = "(B)V", + garbageValue = "65" ) @Export("init5") void init5() { @@ -492,10 +492,10 @@ void init5() { this.tileTemplates[5][3] = var1; } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2137801556" + descriptor = "(B)V", + garbageValue = "-3" ) @Export("init6") void init6() { @@ -561,10 +561,10 @@ void init6() { this.tileTemplates[6][3] = var1; } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1430870503" + garbageValue = "-1465348421" ) @Export("init7") void init7() { @@ -630,16 +630,12 @@ void init7() { this.tileTemplates[7][3] = var1; } - @ObfuscatedName("ah") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)Lhu;", - garbageValue = "2088927693" + descriptor = "(CI)Z", + garbageValue = "-1137880095" ) - public static Clock method1602() { - try { - return new NanoClock(); - } catch (Throwable var1) { - return new MilliClock(); - } + static boolean method1380(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"\u00ef\u00bf\u00bd$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSection.java b/osrs/src/main/java/WorldMapSection.java index 8a35e451a..3ff7044a4 100644 --- a/osrs/src/main/java/WorldMapSection.java +++ b/osrs/src/main/java/WorldMapSection.java @@ -3,53 +3,53 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("jj") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lkz;I)V", - garbageValue = "1844466074" + descriptor = "(Ljv;B)V", + garbageValue = "16" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1135530948" + descriptor = "(IIIB)Z", + garbageValue = "2" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1124460333" + garbageValue = "542110974" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "557011185" + descriptor = "(IIIS)[I", + garbageValue = "12300" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(III)Lmo;", - garbageValue = "-1670709360" + descriptor = "(III)Lmh;", + garbageValue = "-1535299153" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-801073373" + descriptor = "(Luj;B)V", + garbageValue = "-10" ) @Export("read") void read(Buffer var1); diff --git a/osrs/src/main/java/WorldMapSection0.java b/osrs/src/main/java/WorldMapSection0.java index 7469e2216..ba126b7fb 100644 --- a/osrs/src/main/java/WorldMapSection0.java +++ b/osrs/src/main/java/WorldMapSection0.java @@ -3,59 +3,65 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kw") +@ObfuscatedName("jh") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("ac") + @ObfuscatedName("fs") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + @Export("archive9") + static Archive archive9; + @ObfuscatedName("at") @Export("oldZ") int oldZ; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("newZ") int newZ; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("oldX") int oldX; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("oldY") int oldY; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("newX") int newX; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("newY") int newY; - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("ay") + @ObfuscatedName("as") @Export("newChunkYHigh") int newChunkYHigh; WorldMapSection0() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lkz;I)V", - garbageValue = "1844466074" + descriptor = "(Ljv;B)V", + garbageValue = "16" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -77,34 +83,34 @@ public void expandBounds(WorldMapArea var1) { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1135530948" + descriptor = "(IIIB)Z", + garbageValue = "2" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { + if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; } else { return false; } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1124460333" + garbageValue = "542110974" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "557011185" + descriptor = "(IIIS)[I", + garbageValue = "12300" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -116,10 +122,10 @@ public int[] getBorderTileLengths(int var1, int var2, int var3) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(III)Lmo;", - garbageValue = "-1670709360" + descriptor = "(III)Lmh;", + garbageValue = "-1535299153" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -132,10 +138,10 @@ public Coord coord(int var1, int var2) { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-801073373" + descriptor = "(Luj;B)V", + garbageValue = "-10" ) @Export("read") public void read(Buffer var1) { @@ -156,43 +162,12 @@ public void read(Buffer var1) { this.postRead(); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-15" + descriptor = "(I)V", + garbageValue = "-1662553303" ) @Export("postRead") void postRead() { } - - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1252747607" - ) - static void method1551() { - JSException.compass = null; - ParamComposition.redHintArrowSprite = null; - KitDefinition.mapSceneSprites = null; - UserComparator4.headIconPkSprites = null; - class157.headIconPrayerSprites = null; - UserComparator8.headIconHintSprites = null; - class47.mapMarkerSprites = null; - EnumComposition.crossSprites = null; - class103.mapDotSprites = null; - class36.scrollBarSprites = null; - class178.field1459 = null; - } - - @ObfuscatedName("nj") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "47" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = ClanChannelMember.getPacketBufferNode(ClientPacket.f22, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); - } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSection1.java b/osrs/src/main/java/WorldMapSection1.java index cadbf55be..2f2168cb1 100644 --- a/osrs/src/main/java/WorldMapSection1.java +++ b/osrs/src/main/java/WorldMapSection1.java @@ -3,35 +3,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("jw") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("minPlane") int minPlane; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("planes") int planes; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("regionStartX") int regionStartX; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("regionStartY") int regionStartY; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("regionEndX") int regionEndX; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("regionEndY") int regionEndY; WorldMapSection1() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lkz;I)V", - garbageValue = "1844466074" + descriptor = "(Ljv;B)V", + garbageValue = "16" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -53,34 +53,34 @@ public void expandBounds(WorldMapArea var1) { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1135530948" + descriptor = "(IIIB)Z", + garbageValue = "2" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { + if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; } else { return false; } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1124460333" + garbageValue = "542110974" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "557011185" + descriptor = "(IIIS)[I", + garbageValue = "12300" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -92,10 +92,10 @@ public int[] getBorderTileLengths(int var1, int var2, int var3) { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(III)Lmo;", - garbageValue = "-1670709360" + descriptor = "(III)Lmh;", + garbageValue = "-1535299153" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -108,10 +108,10 @@ public Coord coord(int var1, int var2) { } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-801073373" + descriptor = "(Luj;B)V", + garbageValue = "-10" ) @Export("read") public void read(Buffer var1) { @@ -124,10 +124,10 @@ public void read(Buffer var1) { this.postRead(); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "477600139" + descriptor = "(B)V", + garbageValue = "4" ) @Export("postRead") void postRead() { diff --git a/osrs/src/main/java/WorldMapSection2.java b/osrs/src/main/java/WorldMapSection2.java index 3fdfd26f3..66023801e 100644 --- a/osrs/src/main/java/WorldMapSection2.java +++ b/osrs/src/main/java/WorldMapSection2.java @@ -3,126 +3,123 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("jg") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("ap") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("minPlane") int minPlane; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("planes") int planes; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("regionStartX") int regionStartX; - @ObfuscatedName("ax") + @ObfuscatedName("ao") @Export("regionStartY") int regionStartY; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("regionEndX") int regionEndX; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("regionEndY") int regionEndY; - @ObfuscatedName("ar") - int field2352; - @ObfuscatedName("ab") - int field2345; - @ObfuscatedName("am") - int field2350; - @ObfuscatedName("av") - int field2353; + @ObfuscatedName("aa") + int field1954; + @ObfuscatedName("ac") + int field1956; + @ObfuscatedName("al") + int field1958; + @ObfuscatedName("az") + int field1963; WorldMapSection2() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lkz;I)V", - garbageValue = "1844466074" + descriptor = "(Ljv;B)V", + garbageValue = "16" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2352) { - var1.regionLowX = this.field2352; + if (var1.regionLowX > this.field1954) { + var1.regionLowX = this.field1954; } - if (var1.regionHighX < this.field2350) { - var1.regionHighX = this.field2350; + if (var1.regionHighX < this.field1958) { + var1.regionHighX = this.field1958; } - if (var1.regionLowY > this.field2345) { - var1.regionLowY = this.field2345; + if (var1.regionLowY > this.field1956) { + var1.regionLowY = this.field1956; } - if (var1.regionHighY < this.field2353) { - var1.regionHighY = this.field2353; + if (var1.regionHighY < this.field1963) { + var1.regionHighY = this.field1963; } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1135530948" + descriptor = "(IIIB)Z", + garbageValue = "2" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { + if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; } else { return false; } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1124460333" + garbageValue = "542110974" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field2352 && var1 >> 6 <= this.field2350 && var2 >> 6 >= this.field2345 && var2 >> 6 <= this.field2353; + return var1 >> 6 >= this.field1954 && var1 >> 6 <= this.field1958 && var2 >> 6 >= this.field1956 && var2 >> 6 <= this.field1963; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "557011185" + descriptor = "(IIIS)[I", + garbageValue = "12300" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{var2 + (this.field2352 * 64 - this.regionStartX * 64), var3 + (this.field2345 * 64 - this.regionStartY * 64)}; + int[] var4 = new int[]{var2 + (this.field1954 * 64 - this.regionStartX * 64), var3 + (this.field1956 * 64 - this.regionStartY * 64)}; return var4; } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(III)Lmo;", - garbageValue = "-1670709360" + descriptor = "(III)Lmh;", + garbageValue = "-1535299153" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.regionStartX * 64 - this.field2352 * 64 + var1; - int var4 = var2 + (this.regionStartY * 64 - this.field2345 * 64); + int var3 = this.regionStartX * 64 - this.field1954 * 64 + var1; + int var4 = var2 + (this.regionStartY * 64 - this.field1956 * 64); return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-801073373" + descriptor = "(Luj;B)V", + garbageValue = "-10" ) @Export("read") public void read(Buffer var1) { @@ -132,55 +129,109 @@ public void read(Buffer var1) { this.regionStartY = var1.readUnsignedShort(); this.regionEndX = var1.readUnsignedShort(); this.regionEndY = var1.readUnsignedShort(); - this.field2352 = var1.readUnsignedShort(); - this.field2345 = var1.readUnsignedShort(); - this.field2350 = var1.readUnsignedShort(); - this.field2353 = var1.readUnsignedShort(); + this.field1954 = var1.readUnsignedShort(); + this.field1956 = var1.readUnsignedShort(); + this.field1958 = var1.readUnsignedShort(); + this.field1963 = var1.readUnsignedShort(); this.postRead(); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "20489" + descriptor = "(I)V", + garbageValue = "-471572167" ) @Export("postRead") void postRead() { } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1323346942" + descriptor = "(II)Lhs;", + garbageValue = "-726042655" ) - static void method1451() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { - class28.KeyHandler_keyCodes[186] = 57; - class28.KeyHandler_keyCodes[187] = 27; - class28.KeyHandler_keyCodes[188] = 71; - class28.KeyHandler_keyCodes[189] = 26; - class28.KeyHandler_keyCodes[190] = 72; - class28.KeyHandler_keyCodes[191] = 73; - class28.KeyHandler_keyCodes[192] = 58; - class28.KeyHandler_keyCodes[219] = 42; - class28.KeyHandler_keyCodes[220] = 74; - class28.KeyHandler_keyCodes[221] = 43; - class28.KeyHandler_keyCodes[222] = 59; - class28.KeyHandler_keyCodes[223] = 28; + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - class28.KeyHandler_keyCodes[44] = 71; - class28.KeyHandler_keyCodes[45] = 26; - class28.KeyHandler_keyCodes[46] = 72; - class28.KeyHandler_keyCodes[47] = 73; - class28.KeyHandler_keyCodes[59] = 57; - class28.KeyHandler_keyCodes[61] = 27; - class28.KeyHandler_keyCodes[91] = 42; - class28.KeyHandler_keyCodes[92] = 74; - class28.KeyHandler_keyCodes[93] = 43; - class28.KeyHandler_keyCodes[192] = 28; - class28.KeyHandler_keyCodes[222] = 58; - class28.KeyHandler_keyCodes[520] = 59; + byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; + } + + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); + return var1; } + } + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1992791084" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 30) { + Client.field422.method1114(); + } + + if (Client.gameState == 0) { + SpriteMask.client.method170(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { + class19.method73(0); + Client.field444 = 0; + Client.field447 = 0; + Client.timer.method2172(var0); + if (var0 != 20) { + VerticalAlignment.method958(false); + } + } + + if (var0 != 20 && var0 != 40 && class4.field4 != null) { + class4.field4.close(); + class4.field4 = null; + } + + if (Client.gameState == 25) { + Client.field451 = 0; + Client.field452 = 0; + Client.field455 = 1; + Client.field453 = 0; + Client.field454 = 1; + } + + int var1; + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + var1 = Client.gameState == 11 ? 4 : 0; + class6.method14(WorldMapDecorationType.archive10, GrandExchangeOfferOwnWorldComparator.archive8, false, var1); + } else if (var0 == 11) { + class6.method14(WorldMapDecorationType.archive10, GrandExchangeOfferOwnWorldComparator.archive8, false, 4); + } else if (var0 == 50) { + class139.setLoginResponseString("", "Updating date of birth...", ""); + class6.method14(WorldMapDecorationType.archive10, GrandExchangeOfferOwnWorldComparator.archive8, false, 7); + } else { + class14.method58(); + } + } else { + var1 = class4.method7() ? 0 : 12; + class6.method14(WorldMapDecorationType.archive10, GrandExchangeOfferOwnWorldComparator.archive8, true, var1); + } + + Client.gameState = var0; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/WorldMapSectionType.java b/osrs/src/main/java/WorldMapSectionType.java index 77f1a2349..b48316466 100644 --- a/osrs/src/main/java/WorldMapSectionType.java +++ b/osrs/src/main/java/WorldMapSectionType.java @@ -3,38 +3,43 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("jn") @Implements("WorldMapSectionType") -public enum WorldMapSectionType implements class386 { - @ObfuscatedName("ac") +public enum WorldMapSectionType implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Ljn;" ) @Export("WORLDMAPSECTIONTYPE0") WORLDMAPSECTIONTYPE0(0, (byte)0), - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Ljn;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(2, (byte)1), - @ObfuscatedName("ak") + WORLDMAPSECTIONTYPE1(1, (byte)1), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Ljn;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(1, (byte)2), - @ObfuscatedName("ax") + WORLDMAPSECTIONTYPE2(3, (byte)2), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Ljn;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(3, (byte)3); + WORLDMAPSECTIONTYPE3(2, (byte)3); - @ObfuscatedName("ao") + @ObfuscatedName("wp") + @ObfuscatedSignature( + descriptor = "Loz;" + ) + static JagNetThread field2038; + @ObfuscatedName("ab") @Export("type") final int type; - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("id") final byte id; @@ -43,274 +48,82 @@ public enum WorldMapSectionType implements class386 { this.id = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("ao") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Luy;II)V", - garbageValue = "2004765344" + descriptor = "(I)[Ljn;", + garbageValue = "-190919972" ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; - if (var2) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - int var3 = var0.readBits(2); - Player var4 = Client.players[var1]; - if (var3 == 0) { - if (var2) { - var4.hasMovementPending = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (class19.baseY + var4.pathY[0] >> 13) + (class20.baseX + var4.pathX[0] >> 13 << 14); - if (var4.movingOrientation != -1) { - Players.Players_orientations[var1] = var4.movingOrientation; - } else { - Players.Players_orientations[var1] = var4.orientation; - } - - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - class304.updateExternalPlayer(var0, var1); - } - - } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { - var5 = var0.readBits(3); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - --var6; - --var7; - } else if (var5 == 1) { - --var7; - } else if (var5 == 2) { - ++var6; - --var7; - } else if (var5 == 3) { - --var6; - } else if (var5 == 4) { - ++var6; - } else if (var5 == 5) { - --var6; - ++var7; - } else if (var5 == 6) { - ++var7; - } else if (var5 == 7) { - ++var6; - ++var7; - } - - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.hasMovementPending = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.hasMovementPending = false; - var4.move(var6, var7, Players.playerMovementSpeeds[var1]); - } - } else { - var4.resetPath(var6, var7); - var4.hasMovementPending = false; - } - - } else if (var3 == 2) { - var5 = var0.readBits(4); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - var6 -= 2; - var7 -= 2; - } else if (var5 == 1) { - --var6; - var7 -= 2; - } else if (var5 == 2) { - var7 -= 2; - } else if (var5 == 3) { - ++var6; - var7 -= 2; - } else if (var5 == 4) { - var6 += 2; - var7 -= 2; - } else if (var5 == 5) { - var6 -= 2; - --var7; - } else if (var5 == 6) { - var6 += 2; - --var7; - } else if (var5 == 7) { - var6 -= 2; - } else if (var5 == 8) { - var6 += 2; - } else if (var5 == 9) { - var6 -= 2; - ++var7; - } else if (var5 == 10) { - var6 += 2; - ++var7; - } else if (var5 == 11) { - var6 -= 2; - var7 += 2; - } else if (var5 == 12) { - --var6; - var7 += 2; - } else if (var5 == 13) { - var7 += 2; - } else if (var5 == 14) { - ++var6; - var7 += 2; - } else if (var5 == 15) { - var6 += 2; - var7 += 2; - } - - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.hasMovementPending = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.hasMovementPending = false; - var4.move(var6, var7, Players.playerMovementSpeeds[var1]); - } - } else { - var4.resetPath(var6, var7); - var4.hasMovementPending = false; - } - - } else { - var5 = var0.readBits(1); - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { - var6 = var0.readBits(12); - var7 = var6 >> 10; - var8 = var6 >> 5 & 31; - if (var8 > 15) { - var8 -= 32; - } - - var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; - var11 = var9 + var4.pathY[0]; - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.hasMovementPending = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.hasMovementPending = false; - var4.move(var10, var11, Players.playerMovementSpeeds[var1]); - } - } else { - var4.resetPath(var10, var11); - var4.hasMovementPending = false; - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - class87.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (var8 + class20.baseX + var4.pathX[0] & 16383) - class20.baseX; - var11 = (var9 + class19.baseY + var4.pathY[0] & 16383) - class19.baseY; - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.hasMovementPending = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.hasMovementPending = false; - var4.move(var10, var11, Players.playerMovementSpeeds[var1]); - } - } else { - var4.resetPath(var10, var11); - var4.hasMovementPending = false; - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - class87.Client_plane = var4.plane; - } - - } - } - } + static WorldMapSectionType[] method1309() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE2}; } - @ObfuscatedName("io") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1356138757" + descriptor = "(I)V", + garbageValue = "2050835652" ) - static final void method1555(int var0, int var1, int var2) { - if (Client.cameraX < var0) { - Client.cameraX = (var0 - Client.cameraX) * class131.cameraMoveToAcceleration / 1000 + Client.cameraX + SecureRandomCallable.cameraMoveToSpeed; - if (Client.cameraX > var0) { - Client.cameraX = var0; + static void method1311() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.stream1 != null) { + LoginScreenAnimation.pcmStreamMixer.removeSubStream(var0.stream1); + var0.stream1 = null; } - } - if (Client.cameraX > var0) { - Client.cameraX -= (Client.cameraX - var0) * class131.cameraMoveToAcceleration / 1000 + SecureRandomCallable.cameraMoveToSpeed; - if (Client.cameraX < var0) { - Client.cameraX = var0; + if (var0.stream2 != null) { + LoginScreenAnimation.pcmStreamMixer.removeSubStream(var0.stream2); + var0.stream2 = null; } } - if (class17.cameraY < var1) { - class17.cameraY = (var1 - class17.cameraY) * class131.cameraMoveToAcceleration / 1000 + class17.cameraY + SecureRandomCallable.cameraMoveToSpeed; - if (class17.cameraY > var1) { - class17.cameraY = var1; - } - } + ObjectSound.objectSounds.clear(); + } - if (class17.cameraY > var1) { - class17.cameraY -= (class17.cameraY - var1) * class131.cameraMoveToAcceleration / 1000 + SecureRandomCallable.cameraMoveToSpeed; - if (class17.cameraY < var1) { - class17.cameraY = var1; - } - } + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "57610498" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + GrandExchangeOfferTotalQuantityComparator.insertMenuItem(var0, var1, var2, var3, var4, var5, -1, false); + } - if (WorldMapArea.cameraZ < var2) { - WorldMapArea.cameraZ = (var2 - WorldMapArea.cameraZ) * class131.cameraMoveToAcceleration / 1000 + WorldMapArea.cameraZ + SecureRandomCallable.cameraMoveToSpeed; - if (WorldMapArea.cameraZ > var2) { - WorldMapArea.cameraZ = var2; - } - } + @ObfuscatedName("nx") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1233384886" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = class113.getPacketBufferNode(ClientPacket.f22, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); + } - if (WorldMapArea.cameraZ > var2) { - WorldMapArea.cameraZ -= (WorldMapArea.cameraZ - var2) * class131.cameraMoveToAcceleration / 1000 + SecureRandomCallable.cameraMoveToSpeed; - if (WorldMapArea.cameraZ < var2) { - WorldMapArea.cameraZ = var2; + @ObfuscatedName("oz") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-113" + ) + static void method1314() { + if (MidiPcmStream.field2799 != null) { + Client.field369 = Client.cycle; + MidiPcmStream.field2799.method1986(); + + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { + MidiPcmStream.field2799.method1985((Client.players[var0].x >> 7) + NewShit.baseX, (Client.players[var0].y >> 7) + class101.baseY); + } } } diff --git a/osrs/src/main/java/WorldMapSprite.java b/osrs/src/main/java/WorldMapSprite.java index d8259a8a1..b11162ab0 100644 --- a/osrs/src/main/java/WorldMapSprite.java +++ b/osrs/src/main/java/WorldMapSprite.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kc") +@ObfuscatedName("ju") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("tileColors") final int[] tileColors; @@ -18,10 +18,10 @@ public final class WorldMapSprite { this.tileColors = var1; } - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "156" + descriptor = "(III)I", + garbageValue = "-2024920281" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { diff --git a/osrs/src/main/java/Wrapper.java b/osrs/src/main/java/Wrapper.java index 256b66620..04bbc6d52 100644 --- a/osrs/src/main/java/Wrapper.java +++ b/osrs/src/main/java/Wrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lb") +@ObfuscatedName("la") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("get") abstract Object get(); - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("isSoft") abstract boolean isSoft(); } \ No newline at end of file diff --git a/osrs/src/main/java/ZoneOperation.java b/osrs/src/main/java/ZoneOperation.java index a18297b25..10d3e1d0e 100644 --- a/osrs/src/main/java/ZoneOperation.java +++ b/osrs/src/main/java/ZoneOperation.java @@ -3,170 +3,313 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("ly") @Implements("ZoneOperation") public class ZoneOperation { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("LOC_ADD_CHANGE") - public static final ZoneOperation LOC_ADD_CHANGE; - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lly;" ) @Export("LOC_ANIM") public static final ZoneOperation LOC_ANIM; - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lly;" ) - @Export("LOC_DEL") - public static final ZoneOperation LOC_DEL; - @ObfuscatedName("ax") + public static final ZoneOperation field2616; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lly;" ) - @Export("OBJ_DEL") - public static final ZoneOperation OBJ_DEL; + public static final ZoneOperation field2620; @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Llq;" - ) - public static final ZoneOperation field2624; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lly;" ) - @Export("OBJ_COUNT") - public static final ZoneOperation OBJ_COUNT; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("PREFETCH_GAMEOBJECTS") - public static final ZoneOperation PREFETCH_GAMEOBJECTS; + public static final ZoneOperation field2618; @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lly;" ) - public static final ZoneOperation field2617; - @ObfuscatedName("am") + @Export("OBJ_DEL") + public static final ZoneOperation OBJ_DEL; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lly;" ) - public static final ZoneOperation field2623; - @ObfuscatedName("av") + public static final ZoneOperation field2622; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lly;" ) - @Export("OBJ_ADD") - public static final ZoneOperation OBJ_ADD; - @ObfuscatedName("ag") + @Export("LOC_DEL") + public static final ZoneOperation LOC_DEL; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lly;" ) - public static final ZoneOperation field2619; - @ObfuscatedName("aa") + @Export("LOC_ADD_CHANGE") + public static final ZoneOperation LOC_ADD_CHANGE; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lly;" ) @Export("AREA_SOUND") public static final ZoneOperation AREA_SOUND; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lly;" + ) + public static final ZoneOperation field2625; @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lly;" + ) + @Export("OBJ_COUNT") + public static final ZoneOperation OBJ_COUNT; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lly;" ) @Export("MAPPROJ_ANIM") public static final ZoneOperation MAPPROJ_ANIM; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lly;" + ) + @Export("PREFETCH_GAMEOBJECTS") + public static final ZoneOperation PREFETCH_GAMEOBJECTS; static { - LOC_ADD_CHANGE = new ZoneOperation(5); LOC_ANIM = new ZoneOperation(4); - LOC_DEL = new ZoneOperation(7); - OBJ_DEL = new ZoneOperation(4); - field2624 = new ZoneOperation(14); - OBJ_COUNT = new ZoneOperation(16); - PREFETCH_GAMEOBJECTS = new ZoneOperation(14); - field2617 = new ZoneOperation(6); - field2623 = new ZoneOperation(5); - OBJ_ADD = new ZoneOperation(19); - field2619 = new ZoneOperation(11); - AREA_SOUND = new ZoneOperation(2); - MAPPROJ_ANIM = new ZoneOperation(20); + field2616 = new ZoneOperation(5); + field2620 = new ZoneOperation(20); + field2618 = new ZoneOperation(4); + OBJ_DEL = new ZoneOperation(16); + field2622 = new ZoneOperation(6); + LOC_DEL = new ZoneOperation(14); + LOC_ADD_CHANGE = new ZoneOperation(14); + AREA_SOUND = new ZoneOperation(5); + field2625 = new ZoneOperation(7); + OBJ_COUNT = new ZoneOperation(19); + MAPPROJ_ANIM = new ZoneOperation(11); + PREFETCH_GAMEOBJECTS = new ZoneOperation(2); } @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "5" + garbageValue = "4" ) ZoneOperation(int var1) { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lom;II)Lmq;", - garbageValue = "-1598987475" + descriptor = "(ILuj;I)Lgx;", + garbageValue = "-485620123" ) - static MusicPatch method1643(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - return var2 == null ? null : new MusicPatch(var2); + public static ObjTypeCustomisation method1631(int var0, Buffer var1) { + int var2 = var1.readUnsignedByte(); + boolean var3 = (var2 & 1) != 0; + boolean var4 = (var2 & 2) != 0; + ObjTypeCustomisation var5 = new ObjTypeCustomisation(var0); + int var6; + int[] var7; + boolean var8; + int var9; + short var10; + if (var3) { + var6 = var1.readUnsignedByte(); + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; + var8 = var5.recol != null && var7.length == var5.recol.length; + + for (var9 = 0; var9 < 2; ++var9) { + if (var7[var9] != 15) { + var10 = (short)var1.readUnsignedShort(); + if (var8) { + var5.recol[var7[var9]] = var10; + } + } + } + } + + if (var4) { + var6 = var1.readUnsignedByte(); + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; + var8 = var5.retex != null && var7.length == var5.retex.length; + + for (var9 = 0; var9 < 2; ++var9) { + if (var7[var9] != 15) { + var10 = (short)var1.readUnsignedShort(); + if (var8) { + var5.retex[var7[var9]] = var10; + } + } + } + } + + return var5; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-191003094" + descriptor = "(III)V", + garbageValue = "744218081" ) - static void method1644() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.obj != null) { - var0.set(); - } + public static void method1632(int var0, int var1) { + VarbitComposition var2 = ClientPreferences.getWidget(var0); + int var3 = var2.baseVar; + int var4 = var2.startBit; + int var5 = var2.endBit; + int var6 = Varps.Varps_masks[var5 - var4]; + if (var1 < 0 || var1 > var6) { + var1 = 0; } + var6 <<= var4; + Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)Luz;", - garbageValue = "-108536845" + descriptor = "(II)I", + garbageValue = "-373898981" ) - @Export("getDbTableType") - public static DbTableType getDbTableType(int var0) { - DbTableType var1 = (DbTableType)DbTableType.DBTableType_cache.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = DbTableType.field4138.takeFile(39, var0); - var1 = new DbTableType(); - if (var2 != null) { - var1.method2538(new Buffer(var2)); - } + public static int method1630(int var0) { + return var0 >>> 4 & class520.field4147; + } - var1.method2540(); - DbTableType.DBTableType_cache.put(var1, (long)var0); - return var1; - } + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(Lnn;IIS)V", + garbageValue = "-21324" + ) + public static void method1633(Widget var0, int var1, int var2) { + var0.field3125.bodyColors[var1] = var2; + var0.field3125.method1756(); } - @ObfuscatedName("bu") + @ObfuscatedName("jr") @ObfuscatedSignature( - descriptor = "(Lnm;II)V", - garbageValue = "-1795308286" + descriptor = "(I)I", + garbageValue = "56799465" ) - public static void method1645(Widget var0, int var1) { - ItemComposition var2 = class214.ItemDefinition_get(var1); - var0.field3127.equipment[var2.maleModel] = var1 + 512; - if (var2.maleModel1 != -1) { - var0.field3127.equipment[var2.maleModel1] = 0; - } + static final int method1634() { + if (WorldMapIcon_1.clientPreferences.getRoofsHidden()) { + return ItemLayer.Client_plane; + } else { + int var0 = 3; + if (Varcs.cameraPitch < 310) { + int var1; + int var2; + if (Client.oculusOrbState == 1) { + var1 = LoginScreenAnimation.oculusOrbFocalPointX >> 7; + var2 = ScriptFrame.oculusOrbFocalPointY >> 7; + } else { + var1 = class229.localPlayer.x >> 7; + var2 = class229.localPlayer.y >> 7; + } - if (var2.maleModel2 != -1) { - var0.field3127.equipment[var2.maleModel2] = 0; - } + int var3 = ViewportMouse.cameraX >> 7; + int var4 = class36.cameraZ >> 7; + if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { + return ItemLayer.Client_plane; + } + + if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { + return ItemLayer.Client_plane; + } + + if ((Tiles.Tiles_renderFlags[ItemLayer.Client_plane][var3][var4] & 4) != 0) { + var0 = ItemLayer.Client_plane; + } + + int var5; + if (var1 > var3) { + var5 = var1 - var3; + } else { + var5 = var3 - var1; + } + + int var6; + if (var2 > var4) { + var6 = var2 - var4; + } else { + var6 = var4 - var2; + } + + int var7; + int var8; + if (var5 > var6) { + var7 = var6 * 65536 / var5; + var8 = 32768; + + while (var1 != var3) { + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[ItemLayer.Client_plane][var3][var4] & 4) != 0) { + var0 = ItemLayer.Client_plane; + } - var0.field3127.method1760(); + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[ItemLayer.Client_plane][var3][var4] & 4) != 0) { + var0 = ItemLayer.Client_plane; + } + } + } + } else if (var6 > 0) { + var7 = var5 * 65536 / var6; + var8 = 32768; + + while (var2 != var4) { + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[ItemLayer.Client_plane][var3][var4] & 4) != 0) { + var0 = ItemLayer.Client_plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[ItemLayer.Client_plane][var3][var4] & 4) != 0) { + var0 = ItemLayer.Client_plane; + } + } + } + } + } + + if (class229.localPlayer.x >= 0 && class229.localPlayer.y >= 0 && class229.localPlayer.x < 13312 && class229.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[ItemLayer.Client_plane][class229.localPlayer.x >> 7][class229.localPlayer.y >> 7] & 4) != 0) { + var0 = ItemLayer.Client_plane; + } + + return var0; + } else { + return ItemLayer.Client_plane; + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class0.java b/osrs/src/main/java/class0.java index 9e62e6b6c..eded4b45b 100644 --- a/osrs/src/main/java/class0.java +++ b/osrs/src/main/java/class0.java @@ -2,11 +2,14 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("at") public class class0 implements class3 { - @ObfuscatedName("ac") + class0() { + } + + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;)Lul;" + descriptor = "(Luj;)Luj;" ) @Export("vmethod12") public Buffer vmethod12(Buffer var1) { @@ -15,16 +18,16 @@ public Buffer vmethod12(Buffer var1) { return var2; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;Lul;)V" + descriptor = "(Luj;Luj;)V" ) void method1(Buffer var1, Buffer var2) { class8 var3 = new class8(var1); class5 var4 = new class5(var3); long var5; - for (var5 = 0L; !var4.method8(var3.method25(), var3.method24(), var5); ++var5) { + for (var5 = 0L; !var4.method8(var3.method22(), var3.method21(), var5); ++var5) { } var2.writeLong(var5); diff --git a/osrs/src/main/java/class1.java b/osrs/src/main/java/class1.java index 07c0e3562..7a84b1ab5 100644 --- a/osrs/src/main/java/class1.java +++ b/osrs/src/main/java/class1.java @@ -2,54 +2,204 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; import java.util.concurrent.Callable; -@ObfuscatedName("al") +@ObfuscatedName("ah") public class class1 implements Callable { - @ObfuscatedName("ac") + @ObfuscatedName("ai") + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("ud") + @Export("cameraLookAtAcceleration") + static int cameraLookAtAcceleration; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lul;" + descriptor = "Luj;" ) - final Buffer field1; - @ObfuscatedName("al") + final Buffer field3; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lax;" + descriptor = "Lao;" ) - final class3 field0; + final class3 field2; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lab;" + descriptor = "Lac;" ) @Export("this$0") @ObfuscatedName("this$0") final class7 this$0; @ObfuscatedSignature( - descriptor = "(Lab;Lul;Lax;)V" + descriptor = "(Lac;Luj;Lao;)V" ) class1(class7 var1, Buffer var2, class3 var3) { this.this$0 = var1; - this.field1 = var2; - this.field0 = var3; + this.field3 = var2; + this.field2 = var3; } @Export("call") @ObfuscatedName("call") public Object call() { - return this.field0.vmethod12(this.field1); + return this.field2.vmethod12(this.field3); } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lom;Lom;Lom;Ljava/util/ArrayList;B)Z", - garbageValue = "-86" + descriptor = "(IB)Lgo;", + garbageValue = "9" ) - public static boolean method2(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, ArrayList var3) { - class319.field2800 = var0; - class319.field2802 = var1; - class319.field2801 = var2; - class319.midiPcmStream = var3; - return true; + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "1140575558" + ) + static int method3(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + } else { + var3 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + } + + String var4 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]) { + } + } + + var4 = var4.substring(0, var4.length() - 1); + } + + Object[] var9 = new Object[var4.length() + 1]; + + int var7; + for (var7 = var9.length - 1; var7 >= 1; --var7) { + if (var4.charAt(var7 - 1) == 's') { + var9[var7] = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + } else { + var9[var7] = new Integer(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + } + } + + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var7 != -1) { + var9[0] = new Integer(var7); + } else { + var9 = null; + } + + if (var0 == 1400) { + var3.onClick = var9; + } else if (var0 == 1401) { + var3.onHold = var9; + } else if (var0 == 1402) { + var3.onRelease = var9; + } else if (var0 == 1403) { + var3.onMouseOver = var9; + } else if (var0 == 1404) { + var3.onMouseLeave = var9; + } else if (var0 == 1405) { + var3.onDrag = var9; + } else if (var0 == 1406) { + var3.onTargetLeave = var9; + } else if (var0 == 1407) { + var3.onVarTransmit = var9; + var3.varTransmitTriggers = var5; + } else if (var0 == 1408) { + var3.onTimer = var9; + } else if (var0 == 1409) { + var3.onOp = var9; + } else if (var0 == 1410) { + var3.onDragComplete = var9; + } else if (var0 == 1411) { + var3.onClickRepeat = var9; + } else if (var0 == 1412) { + var3.onMouseRepeat = var9; + } else if (var0 == 1414) { + var3.onInvTransmit = var9; + var3.invTransmitTriggers = var5; + } else if (var0 == 1415) { + var3.onStatTransmit = var9; + var3.statTransmitTriggers = var5; + } else if (var0 == 1416) { + var3.onTargetEnter = var9; + } else if (var0 == 1417) { + var3.onScroll = var9; + } else if (var0 == 1418) { + var3.onChatTransmit = var9; + } else if (var0 == 1419) { + var3.onKey = var9; + } else if (var0 == 1420) { + var3.onFriendTransmit = var9; + } else if (var0 == 1421) { + var3.onClanTransmit = var9; + } else if (var0 == 1422) { + var3.onMiscTransmit = var9; + } else if (var0 == 1423) { + var3.onDialogAbort = var9; + } else if (var0 == 1424) { + var3.onSubChange = var9; + } else if (var0 == 1425) { + var3.onStockTransmit = var9; + } else if (var0 == 1426) { + var3.field3115 = var9; + } else if (var0 == 1427) { + var3.onResize = var9; + } else if (var0 == 1428) { + var3.field3099 = var9; + } else if (var0 == 1429) { + var3.field3114 = var9; + } else if (var0 == 1430) { + var3.field3107 = var9; + } else if (var0 == 1431) { + var3.field3108 = var9; + } else if (var0 == 1434) { + var3.field3116 = var9; + } else if (var0 == 1435) { + var3.field3098 = var9; + } else { + if (var0 < 1436 || var0 > 1439) { + return 2; + } + + class339 var8 = var3.method1874(); + if (var8 != null) { + if (var0 == 1436) { + var8.field2931 = var9; + } else if (var0 == 1437) { + var8.field2933 = var9; + } else if (var0 == 1438) { + var8.field2930 = var9; + } else if (var0 == 1439) { + var8.field2932 = var9; + } + } + } + + var3.hasListener = true; + return 1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class10.java b/osrs/src/main/java/class10.java index a6894658b..0ebc01fba 100644 --- a/osrs/src/main/java/class10.java +++ b/osrs/src/main/java/class10.java @@ -3,126 +3,119 @@ import net.runelite.mapping.ObfuscatedSignature; import javax.net.ssl.HttpsURLConnection; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.net.ProtocolException; import java.net.URL; +import java.util.Iterator; -@ObfuscatedName("ag") +@ObfuscatedName("ap") public class class10 { - @ObfuscatedName("jz") - @ObfuscatedSignature( - descriptor = "Ljt;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("qq") - static int field24; - @ObfuscatedName("ac") - final HttpsURLConnection field31; - @ObfuscatedName("al") + @ObfuscatedName("wj") + static Iterator field30; + @ObfuscatedName("at") + final HttpsURLConnection field36; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lqv;" + descriptor = "Lqf;" ) - final class434 field32; - @ObfuscatedName("ak") + final class431 field37; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Laz;" ) - final class9 field30; - @ObfuscatedName("ax") + final class9 field35; + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "Lsd;" ) - class476 field29; - @ObfuscatedName("ao") - boolean field27; - @ObfuscatedName("ah") - boolean field26; - @ObfuscatedName("ar") - int field28; + class473 field34; + @ObfuscatedName("ab") + boolean field31; + @ObfuscatedName("au") + boolean field32; + @ObfuscatedName("aa") + int field33; @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;Lav;Lqv;Z)V" + descriptor = "(Ljava/net/URL;Laz;Lqf;Z)V" ) - public class10(URL var1, class9 var2, class434 var3, boolean var4) throws IOException { - this.field27 = false; - this.field26 = false; - this.field28 = 300000; - if (!var2.method26()) { - throw new UnsupportedEncodingException("Unsupported request method used " + var2.method27()); + public class10(URL var1, class9 var2, class431 var3, boolean var4) throws IOException { + this.field31 = false; + this.field32 = false; + this.field33 = 300000; + if (!var2.method23()) { + throw new UnsupportedEncodingException("Unsupported request method used " + var2.method24()); } else { - this.field31 = (HttpsURLConnection)var1.openConnection(); + this.field36 = (HttpsURLConnection)var1.openConnection(); if (!var4) { - HttpsURLConnection var5 = this.field31; - if (class15.field44 == null) { - class15.field44 = new class15(); + HttpsURLConnection var5 = this.field36; + if (class15.field49 == null) { + class15.field49 = new class15(); } - class15 var6 = class15.field44; + class15 var6 = class15.field49; var5.setSSLSocketFactory(var6); } - this.field30 = var2; - this.field32 = var3 != null ? var3 : new class434(); + this.field35 = var2; + this.field37 = var3 != null ? var3 : new class431(); } } @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;Lav;Z)V" + descriptor = "(Ljava/net/URL;Laz;Z)V" ) public class10(URL var1, class9 var2, boolean var3) throws IOException { - this(var1, var2, new class434(), var3); + this(var1, var2, new class431(), var3); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lqv;", - garbageValue = "1852518909" + descriptor = "(I)Lqf;", + garbageValue = "77865186" ) - public class434 method31() { - return this.field32; + public class431 method34() { + return this.field37; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(Lsd;I)V", - garbageValue = "-1455589333" + garbageValue = "2039275921" ) - public void method32(class476 var1) { - if (!this.field27) { + public void method35(class473 var1) { + if (!this.field31) { if (var1 == null) { - this.field32.method2199("Content-Type"); - this.field29 = null; + this.field37.method2183("Content-Type"); + this.field34 = null; } else { - this.field29 = var1; - if (this.field29.vmethod2213() != null) { - this.field32.method2203(this.field29.vmethod2213()); + this.field34 = var1; + if (this.field34.vmethod2213() != null) { + this.field37.method2187(this.field34.vmethod2213()); } else { - this.field32.method2204(); + this.field37.method2188(); } } } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "937101739" + descriptor = "(B)V", + garbageValue = "6" ) - void method33() throws ProtocolException { - if (!this.field27) { - this.field31.setRequestMethod(this.field30.method27()); - this.field32.method2196(this.field31); - if (this.field30.method28() && this.field29 != null) { - this.field31.setDoOutput(true); + void method36() throws ProtocolException { + if (!this.field31) { + this.field36.setRequestMethod(this.field35.method24()); + this.field37.method2180(this.field36); + if (this.field35.method25() && this.field34 != null) { + this.field36.setDoOutput(true); ByteArrayOutputStream var1 = new ByteArrayOutputStream(); try { - var1.write(this.field29.vmethod7797()); - var1.writeTo(this.field31.getOutputStream()); + var1.write(this.field34.vmethod7797()); + var1.writeTo(this.field36.getOutputStream()); } catch (IOException var11) { var11.printStackTrace(); } finally { @@ -135,86 +128,160 @@ void method33() throws ProtocolException { } } - this.field31.setConnectTimeout(this.field28); - this.field31.setInstanceFollowRedirects(this.field26); - this.field27 = true; + this.field36.setConnectTimeout(this.field33); + this.field36.setInstanceFollowRedirects(this.field32); + this.field31 = true; } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2097496739" + garbageValue = "1613730505" ) - boolean method34() throws IOException { - if (!this.field27) { - this.method33(); + boolean method37() throws IOException { + if (!this.field31) { + this.method36(); } - this.field31.connect(); - return this.field31.getResponseCode() == -1; + this.field36.connect(); + return this.field36.getResponseCode() == -1; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)Law;", - garbageValue = "1182023619" + garbageValue = "1005545851" ) - class20 method35() { + class20 method38() { try { - if (!this.field27 || this.field31.getResponseCode() == -1) { + if (!this.field31 || this.field36.getResponseCode() == -1) { return new class20("No REST response has been received yet."); } } catch (IOException var10) { - this.field31.disconnect(); + this.field36.disconnect(); return new class20("Error decoding REST response code: " + var10.getMessage()); } class20 var3; try { - class20 var1 = new class20(this.field31); + class20 var1 = new class20(this.field36); return var1; } catch (IOException var8) { var3 = new class20("Error decoding REST response: " + var8.getMessage()); } finally { - this.field31.disconnect(); + this.field36.disconnect(); } return var3; } - @ObfuscatedName("ax") + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "1180339211" + ) + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); + RandomAccessFile var3 = null; + + try { + File var4 = new File(var2.getParent()); + if (!var4.exists()) { + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); + int var5 = var3.read(); + var3.seek(0L); + var3.write(var5); + var3.seek(0L); + var3.close(); + FileSystem.FileSystem_cacheFiles.put(var0, var2); + return var2; + } + } catch (Exception var8) { + try { + if (var3 != null) { + var3.close(); + var3 = null; + } + } catch (Exception var7) { + } + + throw new RuntimeException(); + } + } + } + } + + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIII)I", - garbageValue = "-1751398414" + descriptor = "(III)I", + garbageValue = "-841050646" ) - static final int method30(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; + public static int method32(int var0, int var1) { + return (var0 << 8) + var1; } - @ObfuscatedName("ao") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "([FI)V", - garbageValue = "-1762235426" + descriptor = "(Lol;Lol;Ljava/lang/String;Ljava/lang/String;B)Lpf;", + garbageValue = "84" ) - static void method36(float[] var0) { - if (class128.field1202 + var0[0] < 1.3333334F) { - float var1 = var0[0] - 2.0F; - float var2 = var0[0] - 1.0F; - float var3 = (float)Math.sqrt((double)(var1 * var1 - var2 * var2 * 4.0F)); - float var4 = (var3 + -var1) * 0.5F; - if (var0[1] + class128.field1202 > var4) { - var0[1] = var4 - class128.field1202; + public static Font method40(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + if (!var0.isValidFileName(var2, var3)) { + return null; + } else { + int var4 = var0.getGroupId(var2); + int var5 = var0.getFileId(var4, var3); + byte[] var8 = var0.takeFile(var4, var5); + boolean var7; + if (var8 == null) { + var7 = false; } else { - var4 = (-var1 - var3) * 0.5F; - if (var0[1] < class128.field1202 + var4) { - var0[1] = var4 + class128.field1202; - } + class162.SpriteBuffer_decode(var8); + var7 = true; } - } else { - var0[0] = 1.3333334F - class128.field1202; - var0[1] = 0.33333334F - class128.field1202; + + Font var6; + if (!var7) { + var6 = null; + } else { + var6 = WorldMapArea.method1229(var1.takeFile(var4, var5)); + } + + return var6; } + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(CS)Z", + garbageValue = "128" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } + @ObfuscatedName("lv") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "10" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = class113.getPacketBufferNode(ClientPacket.RESUME_PAUSEBUTTON, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeIntLE(var0); + var2.packetBuffer.writeIntME(var1); + Client.packetWriter.addNode(var2); } } \ No newline at end of file diff --git a/osrs/src/main/java/class101.java b/osrs/src/main/java/class101.java new file mode 100644 index 000000000..26ab7f348 --- /dev/null +++ b/osrs/src/main/java/class101.java @@ -0,0 +1,82 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dq") +public class class101 { + @ObfuscatedName("ff") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("jq") + @Export("baseY") + static int baseY; + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Lhu;", + garbageValue = "103628277" + ) + public static FloorUnderlayDefinition method596(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); + var1 = new FloorUnderlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ni") + @ObfuscatedSignature( + descriptor = "(Lnn;I)Z", + garbageValue = "-429343938" + ) + static final boolean method597(Widget var0) { + int var1 = var0.contentType; + if (var1 == 205) { + Client.logoutTimer = 250; + return true; + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { + var2 = (var1 - 300) / 2; + var3 = var1 & 1; + Client.playerAppearance.changeAppearance(var2, var3 == 1); + } + + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method1749(var2, var3 == 1); + } + + if (var1 == 324) { + Client.playerAppearance.method1750(0); + } + + if (var1 == 325) { + Client.playerAppearance.method1750(1); + } + + if (var1 == 326) { + PacketBufferNode var4 = class113.getPacketBufferNode(ClientPacket.f9, Client.packetWriter.isaacCipher); + Client.playerAppearance.write(var4.packetBuffer); + Client.packetWriter.addNode(var4); + return true; + } else { + return false; + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class102.java b/osrs/src/main/java/class102.java new file mode 100644 index 000000000..b9e079fea --- /dev/null +++ b/osrs/src/main/java/class102.java @@ -0,0 +1,150 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.ArrayList; + +@ObfuscatedName("dj") +public class class102 { + @ObfuscatedName("tl") + @ObfuscatedSignature( + descriptor = "Luz;" + ) + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("at") + int field1102; + @ObfuscatedName("ah") + int field1099; + @ObfuscatedName("ar") + int field1101; + @ObfuscatedName("ao") + int field1100; + + class102(int var1, int var2, int var3, int var4) { + this.field1102 = var1; + this.field1099 = var2; + this.field1101 = var3; + this.field1100 = var4; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "664232090" + ) + int method598() { + return this.field1102; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1580269670" + ) + int method599() { + return this.field1099; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-21" + ) + int method600() { + return this.field1101; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "1" + ) + int method601() { + return this.field1100; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(II)Lko;", + garbageValue = "-1983844659" + ) + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; + } else { + var1 = class135.method733(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); + if (var1 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + } + + return var1; + } + } + + @ObfuscatedName("hk") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1556654633" + ) + static void method603(int var0, int var1) { + int[] var2 = new int[9]; + + for (int var3 = 0; var3 < var2.length; ++var3) { + int var4 = var3 * 32 + 15 + 128; + int var5 = class158.method832(var4); + int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; + var5 = class395.method2041(var5, var1); + var2[var3] = var5 * var6 >> 16; + } + + Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); + } + + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-702066776" + ) + static final void method604() { + if (MusicPatchPcmStream.pcmPlayer1 != null) { + MusicPatchPcmStream.pcmPlayer1.run(); + } + + } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-100" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.playingJingle) { + WorldMapManager.method1265(0, 0); + } else if (var0 != -1) { + boolean var1; + if (class316.field2787.isEmpty()) { + var1 = false; + } else { + MusicSong var2 = (MusicSong)class316.field2787.get(0); + var1 = var2 != null && var0 == var2.musicTrackGroupId; + } + + if (!var1 && WorldMapIcon_1.clientPreferences.getCurrentMusicVolume() != 0) { + ArrayList var3 = new ArrayList(); + var3.add(new MusicSong(class514.archive6, var0, 0, WorldMapIcon_1.clientPreferences.getCurrentMusicVolume(), false)); + if (Client.playingJingle) { + class316.field2787.clear(); + class316.field2787.addAll(var3); + EnumComposition.method925(0, 100, 100, 0); + } else { + PendingSpawn.method505(var3, 0, 100, 100, 0, false); + } + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class103.java b/osrs/src/main/java/class103.java deleted file mode 100644 index 3aaaeacdf..000000000 --- a/osrs/src/main/java/class103.java +++ /dev/null @@ -1,26 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("da") -public class class103 { - @ObfuscatedName("kk") - @ObfuscatedSignature( - descriptor = "[Lud;" - ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)Llx;", - garbageValue = "-1015037603" - ) - public static PacketBufferNode method599() { - PacketBufferNode var0 = class306.method1639(); - var0.clientPacket = null; - var0.clientPacketLength = 0; - var0.packetBuffer = new PacketBuffer(5000); - return var0; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class104.java b/osrs/src/main/java/class104.java deleted file mode 100644 index c433ca357..000000000 --- a/osrs/src/main/java/class104.java +++ /dev/null @@ -1,227 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("eo") -public class class104 { - @ObfuscatedName("aa") - public static short[][] field1093; - @ObfuscatedName("ac") - int field1094; - @ObfuscatedName("al") - int field1096; - @ObfuscatedName("ak") - int field1095; - @ObfuscatedName("ax") - int field1097; - - class104(int var1, int var2, int var3, int var4) { - this.field1094 = var1; - this.field1096 = var2; - this.field1095 = var3; - this.field1097 = var4; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "86" - ) - int method600() { - return this.field1094; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "433721125" - ) - int method601() { - return this.field1096; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1676197536" - ) - int method602() { - return this.field1095; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-1" - ) - int method603() { - return this.field1097; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Lfz;FZI)F", - garbageValue = "-1944566118" - ) - static float method605(class132 var0, float var1, boolean var2) { - float var3 = 0.0F; - if (var0 != null && var0.method717() != 0) { - float var4 = (float)var0.field1237[0].field1200; - float var5 = (float)var0.field1237[var0.method717() - 1].field1200; - float var6 = var5 - var4; - if (0.0D == (double)var6) { - return var0.field1237[0].field1197; - } else { - float var7 = 0.0F; - if (var1 > var5) { - var7 = (var1 - var5) / var6; - } else { - var7 = (var1 - var4) / var6; - } - - double var8 = (double)((int)var7); - float var10 = Math.abs((float)((double)var7 - var8)); - float var11 = var10 * var6; - var8 = Math.abs(var8 + 1.0D); - double var12 = var8 / 2.0D; - double var14 = (double)((int)var12); - var10 = (float)(var12 - var14); - float var16; - float var17; - if (var2) { - if (var0.field1238 == class130.field1224) { - if ((double)var10 != 0.0D) { - var11 += var4; - } else { - var11 = var5 - var11; - } - } else if (var0.field1238 != class130.field1222 && var0.field1238 != class130.field1225) { - if (var0.field1238 == class130.field1223) { - var11 = var4 - var1; - var16 = var0.field1237[0].field1196; - var17 = var0.field1237[0].field1199; - var3 = var0.field1237[0].field1197; - if ((double)var16 != 0.0D) { - var3 -= var17 * var11 / var16; - } - - return var3; - } - } else { - var11 = var5 - var11; - } - } else if (var0.field1239 == class130.field1224) { - if ((double)var10 != 0.0D) { - var11 = var5 - var11; - } else { - var11 += var4; - } - } else if (var0.field1239 != class130.field1222 && var0.field1239 != class130.field1225) { - if (var0.field1239 == class130.field1223) { - var11 = var1 - var5; - var16 = var0.field1237[var0.method717() - 1].field1198; - var17 = var0.field1237[var0.method717() - 1].field1195; - var3 = var0.field1237[var0.method717() - 1].field1197; - if ((double)var16 != 0.0D) { - var3 += var11 * var17 / var16; - } - - return var3; - } - } else { - var11 += var4; - } - - var3 = class183.method938(var0, var11); - float var18; - if (var2 && var0.field1238 == class130.field1225) { - var18 = var0.field1237[var0.method717() - 1].field1197 - var0.field1237[0].field1197; - var3 = (float)((double)var3 - (double)var18 * var8); - } else if (!var2 && var0.field1239 == class130.field1225) { - var18 = var0.field1237[var0.method717() - 1].field1197 - var0.field1237[0].field1197; - var3 = (float)((double)var3 + (double)var18 * var8); - } - - return var3; - } - } else { - return var3; - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Lul;IIIIIIB)V", - garbageValue = "76" - ) - @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = var1 >= 0 && var1 < 4 && var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104; - int var8; - if (var7) { - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - - while (true) { - var8 = var0.readUnsignedShort(); - if (var8 == 0) { - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -class530.method2643(932731 + var4, var5 + 556238) * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; - } - break; - } - - if (var8 == 1) { - int var9 = var0.readUnsignedByte(); - if (var9 == 1) { - var9 = 0; - } - - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var9 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var9 * 8; - } - break; - } - - if (var8 <= 49) { - VertexNormal.Tiles_overlays[var1][var2][var3] = (short)var0.readShort(); - SecureRandomFuture.Tiles_shapes[var1][var2][var3] = (byte)((var8 - 2) / 4); - class199.field1563[var1][var2][var3] = (byte)(var8 - 2 + var6 & 3); - } else if (var8 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var8 - 49); - } else { - World.Tiles_underlays[var1][var2][var3] = (short)(var8 - 81); - } - } - } else { - while (true) { - var8 = var0.readUnsignedShort(); - if (var8 == 0) { - break; - } - - if (var8 == 1) { - var0.readUnsignedByte(); - break; - } - - if (var8 <= 49) { - var0.readShort(); - } - } - } - - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-1642041169" - ) - static int method606(int var0, Script var1, boolean var2) { - return 2; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class105.java b/osrs/src/main/java/class105.java new file mode 100644 index 000000000..44fd8cad2 --- /dev/null +++ b/osrs/src/main/java/class105.java @@ -0,0 +1,43 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ew") +final class class105 implements class334 { + @ObfuscatedName("dm") + @ObfuscatedSignature( + descriptor = "Lup;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lnn;" + ) + @Export("val$cc") + @ObfuscatedName("val$cc") + final Widget val$cc; + + @ObfuscatedSignature( + descriptor = "(Lnn;)V" + ) + class105(Widget var1) { + this.val$cc = var1; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "5" + ) + @Export("vmethod5708") + public void vmethod5708() { + if (this.val$cc != null && this.val$cc.method1874().field2933 != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.method467(this.val$cc); + var1.setArgs(this.val$cc.method1874().field2933); + FileSystem.getScriptEvents().addFirst(var1); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class106.java b/osrs/src/main/java/class106.java new file mode 100644 index 000000000..c2503af4c --- /dev/null +++ b/osrs/src/main/java/class106.java @@ -0,0 +1,474 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ex") +final class class106 implements class334 { + @ObfuscatedName("au") + static int field1113; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lnn;" + ) + @Export("val$cc") + @ObfuscatedName("val$cc") + final Widget val$cc; + + @ObfuscatedSignature( + descriptor = "(Lnn;)V" + ) + class106(Widget var1) { + this.val$cc = var1; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "5" + ) + @Export("vmethod5708") + public void vmethod5708() { + if (this.val$cc != null && this.val$cc.method1874().field2932 != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.method467(this.val$cc); + var1.setArgs(this.val$cc.method1874().field2932); + FileSystem.getScriptEvents().addFirst(var1); + } + + } + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1624666505" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { + if (HealthBarDefinition.widgetDefinition.loadInterface(var0)) { + Widget[] var1 = HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var0]; + + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3.onLoad != null) { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onLoad; + class323.runScript(var4, 5000000, 0); + } + } + + } + } + } + + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "(Lly;B)V", + garbageValue = "1" + ) + @Export("processZoneOperation") + static final void processZoneOperation(ZoneOperation var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + if (ZoneOperation.AREA_SOUND == var0) { + var2 = var1.readUnsignedShortLE(); + var3 = var1.readUnsignedByteSub(); + var4 = (var3 >> 4 & 7) + class18.field55; + var5 = (var3 & 7) + class6.field6; + var6 = var1.readUnsignedByteSub(); + var7 = var1.readUnsignedByteSub(); + var8 = var7 >> 2; + var9 = var7 & 3; + var10 = Client.field652[var8]; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + TileItem.updatePendingSpawn(ItemLayer.Client_plane, var4, var5, var10, var2, var8, var9, var6, 0, -1); + } + + } else { + TileItem var31; + if (ZoneOperation.LOC_DEL == var0) { + var2 = var1.readUnsignedByte(); + var3 = (var2 >> 4 & 7) + class18.field55; + var4 = (var2 & 7) + class6.field6; + var5 = var1.readUnsignedShortAdd(); + var6 = var1.readUnsignedShortAddLE(); + var1.readUnsignedIntIME(); + var1.readUnsignedByteNeg(); + var7 = var1.readInt(); + var1.readUnsignedByteSub(); + var1.readUnsignedIntIME(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + var31 = new TileItem(); + var31.id = var6; + var31.quantity = var7; + var31.method609(var5); + if (Client.groundItems[ItemLayer.Client_plane][var3][var4] == null) { + Client.groundItems[ItemLayer.Client_plane][var3][var4] = new NodeDeque(); + } + + Client.groundItems[ItemLayer.Client_plane][var3][var4].addFirst(var31); + ClanSettings.updateItemPile(var3, var4); + } + + } else { + if (ZoneOperation.field2616 == var0) { + var2 = var1.readUnsignedByte(); + var3 = var2 >> 4 & 15; + var4 = var2 & 7; + var5 = var1.readUnsignedByteSub(); + var6 = var1.readUnsignedIntIME(); + var7 = var1.readUnsignedByteSub(); + var8 = (var7 >> 4 & 7) + class18.field55; + var9 = (var7 & 7) + class6.field6; + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { + var10 = var3 + 1; + if (class229.localPlayer.pathX[0] >= var8 - var10 && class229.localPlayer.pathX[0] <= var10 + var8 && class229.localPlayer.pathY[0] >= var9 - var10 && class229.localPlayer.pathY[0] <= var9 + var10 && WorldMapIcon_1.clientPreferences.getAreaSoundEffectsVolume() != 0 && var4 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var6; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var3 + (var9 << 8) + (var8 << 16); + ++Client.soundEffectCount; + } + } + } + + if (ZoneOperation.MAPPROJ_ANIM == var0) { + var2 = var1.readUnsignedShortLE(); + var3 = var1.readIntME(); + var4 = var1.readUnsignedByteSub(); + var5 = (var4 >> 4 & 7) + class18.field55; + var6 = (var4 & 7) + class6.field6; + var7 = var1.readInt(); + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + NodeDeque var47 = Client.groundItems[ItemLayer.Client_plane][var5][var6]; + if (var47 != null) { + for (TileItem var32 = (TileItem)var47.last(); var32 != null; var32 = (TileItem)var47.previous()) { + if ((var2 & 32767) == var32.id && var3 == var32.quantity) { + var32.quantity = var7; + break; + } + } + + ClanSettings.updateItemPile(var5, var6); + } + } + + } else { + int var11; + int var12; + int var13; + int var14; + int var15; + Projectile var16; + byte var38; + if (ZoneOperation.OBJ_COUNT == var0) { + var2 = var1.readUnsignedByteNeg(); + var38 = var1.readByteAdd(); + var4 = var1.readUnsignedIntIME(); + var5 = var1.readUnsignedByteSub(); + var6 = var1.readUnsignedByteSub() * 4; + var7 = var1.readUnsignedByte(); + var8 = (var7 >> 4 & 7) + class18.field55; + var9 = (var7 & 7) + class6.field6; + var10 = var1.readUnsignedShortLE(); + var11 = var1.readUnsignedByteAdd(); + var12 = var1.method2608(); + byte var44 = var1.readByteNeg(); + var14 = var1.readUnsignedByteSub() * 4; + var15 = var1.readUnsignedShortLE(); + var13 = var44 + var8; + var3 = var38 + var9; + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104 && var13 >= 0 && var3 >= 0 && var13 < 104 && var3 < 104 && var10 != 65535) { + var8 = var8 * 128 + 64; + var9 = var9 * 128 + 64; + var13 = var13 * 128 + 64; + var3 = var3 * 128 + 64; + var16 = new Projectile(var10, ItemLayer.Client_plane, var8, var9, WorldMapDecorationType.getTileHeight(var8, var9, ItemLayer.Client_plane) - var14, var15 + Client.cycle, var4 + Client.cycle, var2, var5, var11, var12, var6); + var16.setDestination(var13, var3, WorldMapDecorationType.getTileHeight(var13, var3, ItemLayer.Client_plane) - var6, var15 + Client.cycle); + Client.projectiles.addFirst(var16); + } + + } else { + NodeDeque var33; + if (ZoneOperation.LOC_ANIM == var0) { + var2 = var1.readUnsignedShortAdd(); + var3 = (var2 >> 4 & 7) + class18.field55; + var4 = (var2 & 7) + class6.field6; + var5 = var1.readUnsignedShortLE(); + var6 = var1.readUnsignedShortAdd(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + var33 = Client.groundItems[ItemLayer.Client_plane][var3][var4]; + if (var33 != null) { + for (var31 = (TileItem)var33.last(); var31 != null; var31 = (TileItem)var33.previous()) { + if ((var5 & 32767) == var31.id) { + var31.method609(var6); + break; + } + } + } + } + + } else { + if (ZoneOperation.LOC_ADD_CHANGE == var0) { + byte var37 = var1.readByteAdd(); + var38 = var1.readByteAdd(); + byte var39 = var1.readByteNeg(); + var5 = var1.readUnsignedShortAddLE(); + byte var40 = var1.readByte(); + var7 = var1.readUnsignedByteNeg(); + var8 = (var7 >> 4 & 7) + class18.field55; + var9 = (var7 & 7) + class6.field6; + var10 = var1.readUnsignedIntIME(); + var11 = var1.readUnsignedShortAddLE(); + var12 = var1.readUnsignedShortAdd(); + var13 = var12 >> 2; + var14 = var12 & 3; + var15 = Client.field652[var13]; + int var34 = var1.readUnsignedShortAddLE(); + Player var17; + if (var34 == Client.localPlayerIndex) { + var17 = class229.localPlayer; + } else { + var17 = Client.players[var34]; + } + + if (var17 != null) { + ObjectComposition var18 = WorldMapSection2.getObjectDefinition(var10); + int var19; + int var20; + if (var14 != 1 && var14 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; + } else { + var19 = var18.sizeY; + var20 = var18.sizeX; + } + + int var21 = var8 + (var19 >> 1); + int var22 = var8 + (var19 + 1 >> 1); + int var23 = var9 + (var20 >> 1); + int var24 = var9 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[ItemLayer.Client_plane]; + int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; + int var27 = (var8 << 7) + (var19 << 6); + int var28 = (var9 << 7) + (var20 << 6); + Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); + if (var29 != null) { + TileItem.updatePendingSpawn(ItemLayer.Client_plane, var8, var9, var15, -1, 0, 0, 31, var11 + 1, var5 + 1); + var17.animationCycleStart = var11 + Client.cycle; + var17.animationCycleEnd = var5 + Client.cycle; + var17.attachedModel = var29; + var17.field919 = var19 * 64 + var8 * 128; + var17.field918 = var20 * 64 + var9 * 128; + var17.baseTileHeight = var26; + byte var30; + if (var39 > var37) { + var30 = var39; + var39 = var37; + var37 = var30; + } + + if (var40 > var38) { + var30 = var40; + var40 = var38; + var38 = var30; + } + + var17.minX = var39 + var8; + var17.maxX = var37 + var8; + var17.minY = var9 + var40; + var17.maxY = var9 + var38; + } + } + } + + if (ZoneOperation.PREFETCH_GAMEOBJECTS == var0) { + var2 = var1.readUnsignedShortAdd(); + var3 = (var2 >> 4 & 7) + class18.field55; + var4 = (var2 & 7) + class6.field6; + var5 = var1.readUnsignedShortAdd(); + var6 = var5 >> 2; + var7 = var5 & 3; + var8 = Client.field652[var6]; + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + TileItem.updatePendingSpawn(ItemLayer.Client_plane, var3, var4, var8, -1, var6, var7, 31, 0, -1); + } + + } else if (ZoneOperation.field2620 == var0) { + var2 = var1.readUnsignedShortLE(); + var3 = var1.readUnsignedByte(); + var4 = (var3 >> 4 & 7) + class18.field55; + var5 = (var3 & 7) + class6.field6; + var6 = var1.readUnsignedShort(); + var7 = var1.readUnsignedShortAdd() * 4; + byte var41 = var1.readByteSub(); + var9 = var1.readUnsignedByteNeg(); + var10 = var1.readUnsignedByteNeg() * 4; + var11 = var1.readUnsignedShortAddLE(); + var12 = var1.readUnsignedByteAdd(); + var13 = var1.readUnsignedShortLE(); + var14 = var1.method2609(); + byte var45 = var1.readByteAdd(); + var15 = var45 + var4; + var8 = var41 + var5; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104 && var15 >= 0 && var8 >= 0 && var15 < 104 && var8 < 104 && var11 != 65535) { + var4 = var4 * 128 + 64; + var5 = var5 * 128 + 64; + var15 = var15 * 128 + 64; + var8 = var8 * 128 + 64; + var16 = new Projectile(var11, ItemLayer.Client_plane, var4, var5, WorldMapDecorationType.getTileHeight(var4, var5, ItemLayer.Client_plane) - var7, var13 + Client.cycle, var2 + Client.cycle, var9, var6, var12, var14, var10); + var16.setDestination(var15, var8, WorldMapDecorationType.getTileHeight(var15, var8, ItemLayer.Client_plane) - var10, var13 + Client.cycle); + Client.projectiles.addFirst(var16); + } + + } else if (ZoneOperation.OBJ_DEL == var0) { + var2 = var1.readUnsignedByteAdd(); + var3 = var1.readUnsignedShortAddLE(); + var4 = var1.readUnsignedByte(); + var5 = var1.readUnsignedShortAdd(); + var6 = (var5 >> 4 & 7) + class18.field55; + var7 = (var5 & 7) + class6.field6; + var8 = var1.readUnsignedByte() * 4; + var9 = var1.readUnsignedShort(); + var10 = var1.readUnsignedShortLE(); + byte var42 = var1.readByteAdd(); + byte var43 = var1.readByteNeg(); + var13 = var1.readUnsignedByteSub(); + var14 = var1.readUnsignedShortAdd() * 4; + var11 = var42 + var6; + var12 = var43 + var7; + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var11 >= 0 && var12 >= 0 && var11 < 104 && var12 < 104 && var10 != 65535) { + var6 = var6 * 128 + 64; + var7 = var7 * 128 + 64; + var11 = var11 * 128 + 64; + var12 = var12 * 128 + 64; + Projectile var35 = new Projectile(var10, ItemLayer.Client_plane, var6, var7, WorldMapDecorationType.getTileHeight(var6, var7, ItemLayer.Client_plane) - var8, var9 + Client.cycle, var3 + Client.cycle, var13, var4, var2, var14); + var35.setDestination(var11, var12, WorldMapDecorationType.getTileHeight(var11, var12, ItemLayer.Client_plane) - var14, var9 + Client.cycle); + Client.projectiles.addFirst(var35); + } + + } else if (ZoneOperation.field2618 == var0) { + var2 = var1.readUnsignedByte(); + var3 = var2 >> 2; + var4 = var2 & 3; + var5 = Client.field652[var3]; + var6 = var1.readUnsignedIntIME(); + var7 = var1.readUnsignedByteSub(); + var8 = (var7 >> 4 & 7) + class18.field55; + var9 = (var7 & 7) + class6.field6; + if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { + if (var5 == 0) { + BoundaryObject var36 = class36.scene.method1479(ItemLayer.Client_plane, var8, var9); + if (var36 != null) { + var11 = class232.Entity_unpackID(var36.tag); + if (var3 == 2) { + var36.renderable1 = new DynamicObject(var11, 2, var4 + 4, ItemLayer.Client_plane, var8, var9, var6, false, var36.renderable1); + var36.renderable2 = new DynamicObject(var11, 2, var4 + 1 & 3, ItemLayer.Client_plane, var8, var9, var6, false, var36.renderable2); + } else { + var36.renderable1 = new DynamicObject(var11, var3, var4, ItemLayer.Client_plane, var8, var9, var6, false, var36.renderable1); + } + + return; + } + } + + if (var5 == 1) { + WallDecoration var48 = class36.scene.method1480(ItemLayer.Client_plane, var8, var9); + if (var48 != null) { + var11 = class232.Entity_unpackID(var48.tag); + if (var3 != 4 && var3 != 5) { + if (var3 == 6) { + var48.renderable1 = new DynamicObject(var11, 4, var4 + 4, ItemLayer.Client_plane, var8, var9, var6, false, var48.renderable1); + } else if (var3 == 7) { + var48.renderable1 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, ItemLayer.Client_plane, var8, var9, var6, false, var48.renderable1); + } else if (var3 == 8) { + var48.renderable1 = new DynamicObject(var11, 4, var4 + 4, ItemLayer.Client_plane, var8, var9, var6, false, var48.renderable1); + var48.renderable2 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, ItemLayer.Client_plane, var8, var9, var6, false, var48.renderable2); + } + } else { + var48.renderable1 = new DynamicObject(var11, 4, var4, ItemLayer.Client_plane, var8, var9, var6, false, var48.renderable1); + } + + return; + } + } + + if (var5 == 2) { + GameObject var49 = class36.scene.getGameObject(ItemLayer.Client_plane, var8, var9); + if (var3 == 11) { + var3 = 10; + } + + if (var49 != null) { + var49.renderable = new DynamicObject(class232.Entity_unpackID(var49.tag), var3, var4, ItemLayer.Client_plane, var8, var9, var6, false, var49.renderable); + return; + } + } + + if (var5 == 3) { + FloorDecoration var50 = class36.scene.getFloorDecoration(ItemLayer.Client_plane, var8, var9); + if (var50 != null) { + var50.renderable = new DynamicObject(class232.Entity_unpackID(var50.tag), 22, var4, ItemLayer.Client_plane, var8, var9, var6, false, var50.renderable); + return; + } + } + + TaskHandler.method1086(ItemLayer.Client_plane, var8, var9, var5, var6); + } + + } else if (ZoneOperation.field2622 == var0) { + var2 = var1.readUnsignedShort(); + var3 = var1.readUnsignedByteSub(); + var4 = var1.readUnsignedIntIME(); + var5 = var1.readUnsignedByteSub(); + var6 = (var5 >> 4 & 7) + class18.field55; + var7 = (var5 & 7) + class6.field6; + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { + var6 = var6 * 128 + 64; + var7 = var7 * 128 + 64; + GraphicsObject var46 = new GraphicsObject(var4, ItemLayer.Client_plane, var6, var7, WorldMapDecorationType.getTileHeight(var6, var7, ItemLayer.Client_plane) - var3, var2, Client.cycle); + Client.graphicsObjects.addFirst(var46); + } + + } else if (ZoneOperation.field2625 == var0) { + var2 = var1.readIntIME(); + var3 = var1.readUnsignedByte(); + var4 = (var3 >> 4 & 7) + class18.field55; + var5 = (var3 & 7) + class6.field6; + var6 = var1.readUnsignedShortLE(); + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + var33 = Client.groundItems[ItemLayer.Client_plane][var4][var5]; + if (var33 != null) { + for (var31 = (TileItem)var33.last(); var31 != null; var31 = (TileItem)var33.previous()) { + if ((var6 & 32767) == var31.id && var2 == var31.quantity) { + var31.remove(); + break; + } + } + + if (var33.last() == null) { + Client.groundItems[ItemLayer.Client_plane][var4][var5] = null; + } + + ClanSettings.updateItemPile(var4, var5); + } + } + + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class107.java b/osrs/src/main/java/class107.java deleted file mode 100644 index 7ef0f9a0c..000000000 --- a/osrs/src/main/java/class107.java +++ /dev/null @@ -1,33 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ec") -final class class107 implements class337 { - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lnm;" - ) - final Widget val$cc; - - @ObfuscatedSignature( - descriptor = "(Lnm;)V" - ) - class107(Widget var1) { - this.val$cc = var1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-118" - ) - public void vmethod5708() { - if (this.val$cc != null && this.val$cc.method1880().field2932 != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.method470(this.val$cc); - var1.setArgs(this.val$cc.method1880().field2932); - class7.getScriptEvents().addFirst(var1); - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class108.java b/osrs/src/main/java/class108.java index 0854d7358..1313b021b 100644 --- a/osrs/src/main/java/class108.java +++ b/osrs/src/main/java/class108.java @@ -2,886 +2,117 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") -final class class108 implements class337 { - // $FF: synthetic field +@ObfuscatedName("ek") +public class class108 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lek;" ) - final Widget val$cc; - + static final class108 field1139; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lnm;)V" + descriptor = "Lek;" ) - class108(Widget var1) { - this.val$cc = var1; - } - + static final class108 field1132; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + static final class108 field1137; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + static final class108 field1135; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + static final class108 field1130; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + static final class108 field1140; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + static final class108 field1129; @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-118" + descriptor = "Lek;" ) - public void vmethod5708() { - if (this.val$cc != null && this.val$cc.method1880().field2935 != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.method470(this.val$cc); - var1.setArgs(this.val$cc.method1880().field2935); - class7.getScriptEvents().addFirst(var1); - } - - } - + static final class108 field1131; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + static final class108 field1134; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + static final class108 field1144; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + static final class108 field1136; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + static final class108 field1141; @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Luy;B)I", - garbageValue = "0" + descriptor = "Lek;" ) - static int method619(PacketBuffer var0) { - int var1 = var0.readBits(2); - int var2; - if (var1 == 0) { - var2 = 0; - } else if (var1 == 1) { - var2 = var0.readBits(5); - } else if (var1 == 2) { - var2 = var0.readBits(8); - } else { - var2 = var0.readBits(11); - } - - return var2; - } - - @ObfuscatedName("lo") + static final class108 field1142; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-957149443" + descriptor = "Lek;" ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - class153.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); - } - - long var4 = -1L; - long var6 = -1L; - int var8 = 0; - - while (true) { - int var10 = ViewportMouse.ViewportMouse_entityCount; - if (var8 >= var10) { - if (var4 != -1L) { - var8 = (int)(var4 >>> 0 & 127L); - var10 = (int)(var4 >>> 7 & 127L); - Player var12 = Client.players[Client.combatTargetPlayerIndex]; - DirectByteArrayCopier.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); - } - - return; - } - - long var26 = ViewportMouse.ViewportMouse_entityTags[var8]; - if (var6 != var26) { - label309: { - var6 = var26; - int var15 = HealthBar.method575(var8); - int var16 = class228.method1169(var8); - long var19 = ViewportMouse.ViewportMouse_entityTags[var8]; - int var18 = (int)(var19 >>> 14 & 3L); - int var28 = GrandExchangeOfferOwnWorldComparator.method348(var8); - int var23; - if (var18 == 2 && class10.scene.getObjectFlags(class87.Client_plane, var15, var16, var26) >= 0) { - ObjectComposition var20 = class91.getObjectDefinition(var28); - if (var20.transforms != null) { - var20 = var20.transform(); - } - - if (var20 == null) { - break label309; - } - - PendingSpawn var21 = null; - - for (PendingSpawn var22 = (PendingSpawn)Client.pendingSpawns.last(); var22 != null; var22 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var22.plane == class87.Client_plane && var15 == var22.x && var16 == var22.y && var28 == var22.id) { - var21 = var22; - break; - } - } - - if (Client.isItemSelected == 1) { - class153.insertMenuItemNoShift("Use", Client.field598 + " " + "->" + " " + Client.colorStartTag(65535) + var20.name, 1, var28, var15, var16); - } else if (Client.isSpellSelected) { - if ((class31.field82 & 4) == 4) { - class153.insertMenuItemNoShift(Client.field599, Client.field600 + " " + "->" + " " + Client.colorStartTag(65535) + var20.name, 2, var28, var15, var16); - } - } else { - String[] var36 = var20.actions; - if (var36 != null) { - for (var23 = 4; var23 >= 0; --var23) { - if ((var21 == null || var21.method507(var23)) && var36[var23] != null) { - short var24 = 0; - if (var23 == 0) { - var24 = 3; - } - - if (var23 == 1) { - var24 = 4; - } - - if (var23 == 2) { - var24 = 5; - } - - if (var23 == 3) { - var24 = 6; - } - - if (var23 == 4) { - var24 = 1001; - } - - class153.insertMenuItemNoShift(var36[var23], Client.colorStartTag(65535) + var20.name, var24, var28, var15, var16); - } - } - } - - class153.insertMenuItemNoShift("Examine", Client.colorStartTag(65535) + var20.name, 1002, var20.id, var15, var16); - } - } - - int var29; - Player var30; - NPC var37; - int[] var38; - if (var18 == 1) { - NPC var32 = Client.npcs[var28]; - if (var32 == null) { - break label309; - } - - if (var32.definition.size == 1 && (var32.x & 127) == 64 && (var32.y & 127) == 64) { - for (var29 = 0; var29 < Client.npcCount; ++var29) { - var37 = Client.npcs[Client.npcIndices[var29]]; - if (var37 != null && var32 != var37 && var37.definition.size == 1 && var37.x == var32.x && var37.y == var32.y) { - class16.addNpcToMenu(var37, Client.npcIndices[var29], var15, var16); - } - } - - var29 = Players.Players_count; - var38 = Players.Players_indices; - - for (var23 = 0; var23 < var29; ++var23) { - var30 = Client.players[var38[var23]]; - if (var30 != null && var30.x == var32.x && var32.y == var30.y) { - DirectByteArrayCopier.addPlayerToMenu(var30, var38[var23], var15, var16); - } - } - } - - class16.addNpcToMenu(var32, var28, var15, var16); - } - - if (var18 == 0) { - Player var33 = Client.players[var28]; - if (var33 == null) { - break label309; - } - - if ((var33.x & 127) == 64 && (var33.y & 127) == 64) { - for (var29 = 0; var29 < Client.npcCount; ++var29) { - var37 = Client.npcs[Client.npcIndices[var29]]; - if (var37 != null && var37.definition.size == 1 && var37.x == var33.x && var33.y == var37.y) { - class16.addNpcToMenu(var37, Client.npcIndices[var29], var15, var16); - } - } - - var29 = Players.Players_count; - var38 = Players.Players_indices; - - for (var23 = 0; var23 < var29; ++var23) { - var30 = Client.players[var38[var23]]; - if (var30 != null && var30 != var33 && var30.x == var33.x && var33.y == var30.y) { - DirectByteArrayCopier.addPlayerToMenu(var30, var38[var23], var15, var16); - } - } - } - - if (var28 != Client.combatTargetPlayerIndex) { - DirectByteArrayCopier.addPlayerToMenu(var33, var28, var15, var16); - } else { - var4 = var26; - } - } - - if (var18 == 3) { - NodeDeque var34 = Client.groundItems[class87.Client_plane][var15][var16]; - if (var34 != null) { - for (TileItem var35 = (TileItem)var34.first(); var35 != null; var35 = (TileItem)var34.next()) { - ItemComposition var39 = class214.ItemDefinition_get(var35.id); - if (Client.isItemSelected == 1) { - class153.insertMenuItemNoShift("Use", Client.field598 + " " + "->" + " " + Client.colorStartTag(16748608) + var39.name, 16, var35.id, var15, var16); - } else if (Client.isSpellSelected) { - if ((class31.field82 & 1) == 1) { - class153.insertMenuItemNoShift(Client.field599, Client.field600 + " " + "->" + " " + Client.colorStartTag(16748608) + var39.name, 17, var35.id, var15, var16); - } - } else { - String[] var31 = var39.groundActions; - - for (int var40 = 4; var40 >= 0; --var40) { - if (var35.method612(var40)) { - if (var31 != null && var31[var40] != null) { - byte var25 = 0; - if (var40 == 0) { - var25 = 18; - } - - if (var40 == 1) { - var25 = 19; - } - - if (var40 == 2) { - var25 = 20; - } - - if (var40 == 3) { - var25 = 21; - } - - if (var40 == 4) { - var25 = 22; - } - - class153.insertMenuItemNoShift(var31[var40], Client.colorStartTag(16748608) + var39.name, var25, var35.id, var15, var16); - } else if (var40 == 2) { - class153.insertMenuItemNoShift("Take", Client.colorStartTag(16748608) + var39.name, 20, var35.id, var15, var16); - } - } - } - - class153.insertMenuItemNoShift("Examine", Client.colorStartTag(16748608) + var39.name, 1004, var35.id, var15, var16); - } - } - } - } - } - } - - ++var8; - } - } - - @ObfuscatedName("mz") + static final class108 field1138; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "([Lnm;IIIIIIIB)V", - garbageValue = "13" + descriptor = "Lek;" ) - @Export("updateInterface") - static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { - Widget var9 = var0[var8]; - if (var9 != null && var9.parentId == var1 && (var9.method1859() || MouseRecorder.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { - if (var9.isIf3) { - if (CollisionMap.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != class64.mousedOverWidgetIf1 && CollisionMap.isComponentHidden(var9)) { - continue; - } - - if (var9.type == 11) { - if (var9.method1874(class33.widgetDefinition, AbstractWorldMapIcon.urlRequester)) { - if (var9.method1867()) { - ClanChannelMember.invalidateWidget(var9); - PendingSpawn.revalidateWidgetScroll(var9.children, var9, true); - } - - if (var9.field3117 != null) { - ScriptEvent var10 = new ScriptEvent(); - var10.widget = var9; - var10.args = var9.field3117; - Client.scriptEvents.addFirst(var10); - } - } - } else if (var9.type == 12 && var9.method1882(class33.widgetDefinition)) { - ClanChannelMember.invalidateWidget(var9); - } - - int var26 = var9.x + var6; - int var11 = var7 + var9.y; - int var12; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - if (var9.type == 9) { - var16 = var26; - var17 = var11; - var18 = var26 + var9.width; - int var19 = var11 + var9.height; - if (var18 < var26) { - var16 = var18; - var18 = var26; - } - - if (var19 < var11) { - var17 = var19; - var19 = var11; - } - - ++var18; - ++var19; - var12 = var16 > var2 ? var16 : var2; - var13 = var17 > var3 ? var17 : var3; - var14 = var18 < var4 ? var18 : var4; - var15 = var19 < var5 ? var19 : var5; - } else { - var16 = var26 + var9.width; - var17 = var11 + var9.height; - var12 = var26 > var2 ? var26 : var2; - var13 = var11 > var3 ? var11 : var3; - var14 = var16 < var4 ? var16 : var4; - var15 = var17 < var5 ? var17 : var5; - } - - if (var9 == Client.clickedWidget) { - Client.field394 = true; - Client.field521 = var26; - Client.field517 = var11; - } - - boolean var34 = false; - if (var9.field2998) { - switch(Client.field508) { - case 0: - var34 = true; - case 1: - default: - break; - case 2: - if (Client.field505 == var9.id >>> 16) { - var34 = true; - } - break; - case 3: - if (var9.id == Client.field505) { - var34 = true; - } - } - } - - if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { - if (var9.isIf3) { - ScriptEvent var27; - if (var9.noClickThrough) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var27.field861) { - var27.remove(); - var27.widget.field3000 = false; - } - } - - Clock.method944(); - if (FriendsChat.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - StudioGame.addCancelMenuEntry(); - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var27.field861 && var27.widget.onScroll == var27.args) { - var27.remove(); - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var17 = MouseHandler.MouseHandler_lastPressedX; - var18 = MouseHandler.MouseHandler_lastPressedY; - } - - boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; - if (var9.contentType == 1337) { - if (!Client.isLoading && !Client.isMenuOpen && var35) { - addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - class401.checkIfMinimapClicked(var9, var26, var11); - } else { - if (var9.contentType == 1400) { - class434.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var35) { - if (var9.contentType == 1400) { - class434.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); - } else { - FloorDecoration.method1226(var9); - } - } - - boolean var21; - int var23; - if (var34) { - for (int var20 = 0; var20 < var9.field3006.length; ++var20) { - var21 = false; - boolean var22 = false; - if (!var21 && var9.field3006[var20] != null) { - for (var23 = 0; var23 < var9.field3006[var20].length; ++var23) { - boolean var24 = false; - if (var9.field3080 != null) { - var24 = Client.keyHandlerInstance.getKeyPressed(var9.field3006[var20][var23]); - } - - if (class131.method707(var9.field3006[var20][var23]) || var24) { - var21 = true; - if (var9.field3080 != null && var9.field3080[var20] > Client.cycle) { - break; - } - - byte var25 = var9.field3005[var20][var23]; - if (var25 == 0 || ((var25 & 8) == 0 || !Client.keyHandlerInstance.getKeyPressed(86) && !Client.keyHandlerInstance.getKeyPressed(82) && !Client.keyHandlerInstance.getKeyPressed(81)) && ((var25 & 2) == 0 || Client.keyHandlerInstance.getKeyPressed(86)) && ((var25 & 1) == 0 || Client.keyHandlerInstance.getKeyPressed(82)) && ((var25 & 4) == 0 || Client.keyHandlerInstance.getKeyPressed(81))) { - var22 = true; - break; - } - } - } - } - - if (var22) { - if (var20 < 10) { - TextureProvider.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - class286.method1575(); - class478.method2385(var9.id, var9.childIndex, KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var9)), var9.itemId); - Client.field599 = class155.Widget_getSpellActionName(var9); - if (Client.field599 == null) { - Client.field599 = "null"; - } - - Client.field600 = var9.dataText + Client.colorStartTag(16777215); - } - - var23 = var9.field3074[var20]; - if (var9.field3080 == null) { - var9.field3080 = new int[var9.field3006.length]; - } - - if (var9.field3075 == null) { - var9.field3075 = new int[var9.field3006.length]; - } - - if (var23 != 0) { - if (var9.field3080[var20] == 0) { - var9.field3080[var20] = var23 + Client.cycle + var9.field3075[var20]; - } else { - var9.field3080[var20] = var23 + Client.cycle; - } - } else { - var9.field3080[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field3080 != null) { - var9.field3080[var20] = 0; - } - } - } - - if (var9.isIf3) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - var35 = true; - } else { - var35 = false; - } - - boolean var36 = false; - if ((MouseHandler.MouseHandler_currentButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { - var36 = true; - } - - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { - var21 = true; - } - - if (var21) { - TaskHandler.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.method1860()) { - if (var21) { - Client.field626.addFirst(new class225(0, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); - } - - if (var36) { - Client.field626.addFirst(new class225(1, MouseHandler.MouseHandler_x - var26, MouseHandler.MouseHandler_y - var11, var9)); - } - } - - if (var9.contentType == 1400) { - class434.worldMap.method2424(var17, var18, var35 & var36, var35 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && class517.method2527(MouseRecorder.getWidgetFlags(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field396 = true; - Client.field516 = var26; - Client.field514 = var11; - } - - if (var9.hasListener) { - ScriptEvent var28; - if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseY = Client.mouseWheelRotation; - var28.args = var9.onScroll; - Client.scriptEvents.addFirst(var28); - } - - if (Client.clickedWidget != null || Client.isMenuOpen) { - var21 = false; - var36 = false; - var35 = false; - } - - if (!var9.field3002 && var21) { - var9.field3002 = true; - if (var9.onClick != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; - var28.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var28.args = var9.onClick; - Client.scriptEvents.addFirst(var28); - } - } - - if (var9.field3002 && var36 && var9.onClickRepeat != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onClickRepeat; - Client.scriptEvents.addFirst(var28); - } - - if (var9.field3002 && !var36) { - var9.field3002 = false; - if (var9.onRelease != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onRelease; - Client.field629.addFirst(var28); - } - } - - if (var36 && var9.onHold != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onHold; - Client.scriptEvents.addFirst(var28); - } - - if (!var9.field3000 && var35) { - var9.field3000 = true; - if (var9.onMouseOver != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onMouseOver; - Client.scriptEvents.addFirst(var28); - } - } - - if (var9.field3000 && var35 && var9.onMouseRepeat != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var28); - } - - if (var9.field3000 && !var35) { - var9.field3000 = false; - if (var9.onMouseLeave != null) { - var28 = new ScriptEvent(); - var28.field861 = true; - var28.widget = var9; - var28.mouseX = MouseHandler.MouseHandler_x - var26; - var28.mouseY = MouseHandler.MouseHandler_y - var11; - var28.args = var9.onMouseLeave; - Client.field629.addFirst(var28); - } - } - - if (var9.onTimer != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onTimer; - Client.field628.addFirst(var28); - } - - ScriptEvent var29; - int var37; - int var38; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3068) { - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3068 <= 32) { - label647: - for (var37 = var9.field3068; var37 < Client.changedVarpCount; ++var37) { - var23 = Client.changedVarps[var37 & 31]; - - for (var38 = 0; var38 < var9.varTransmitTriggers.length; ++var38) { - if (var23 == var9.varTransmitTriggers[var38]) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var29); - break label647; - } - } - } - } else { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3068 = Client.changedVarpCount; - } - - if (var9.onInvTransmit != null && Client.changedItemContainersCount > var9.field3070) { - if (var9.invTransmitTriggers != null && Client.changedItemContainersCount - var9.field3070 <= 32) { - label623: - for (var37 = var9.field3070; var37 < Client.changedItemContainersCount; ++var37) { - var23 = Client.changedItemContainers[var37 & 31]; - - for (var38 = 0; var38 < var9.invTransmitTriggers.length; ++var38) { - if (var23 == var9.invTransmitTriggers[var38]) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var29); - break label623; - } - } - } - } else { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3070 = Client.changedItemContainersCount; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3064) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3064 <= 32) { - label599: - for (var37 = var9.field3064; var37 < Client.changedSkillsCount; ++var37) { - var23 = Client.changedSkills[var37 & 31]; - - for (var38 = 0; var38 < var9.statTransmitTriggers.length; ++var38) { - if (var23 == var9.statTransmitTriggers[var38]) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var29); - break label599; - } - } - } - } else { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3064 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field3071 && var9.onChatTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field511 > var9.field3071 && var9.onFriendTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field530 > var9.field3071 && var9.onClanTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field525 > var9.field3071 && var9.field3113 != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.field3113; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field528 > var9.field3071 && var9.field3096 != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.field3096; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field529 > var9.field3071 && var9.onStockTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field526 > var9.field3071 && var9.field3118 != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.field3118; - Client.scriptEvents.addFirst(var28); - } - - if (Client.field527 > var9.field3071 && var9.onMiscTransmit != null) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var28); - } - - var9.field3071 = Client.cycleCntr; - if (var9.onKey != null) { - for (var37 = 0; var37 < Client.field533; ++var37) { - ScriptEvent var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = Client.field577[var37]; - var30.keyPressed = Client.field578[var37]; - var30.args = var9.onKey; - Client.scriptEvents.addFirst(var30); - } - } - - ScriptEvent var31; - int[] var39; - if (var9.field3100 != null) { - var39 = Client.keyHandlerInstance.method1152(); - - for (var23 = 0; var23 < var39.length; ++var23) { - var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = var39[var23]; - var31.args = var9.field3100; - Client.scriptEvents.addFirst(var31); - } - } - - if (var9.field3104 != null) { - var39 = Client.keyHandlerInstance.method1153(); - - for (var23 = 0; var23 < var39.length; ++var23) { - var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = var39[var23]; - var31.args = var9.field3104; - Client.scriptEvents.addFirst(var31); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || Client.isMenuOpen) { - continue; - } - - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - if (var9.mouseOverRedirect >= 0) { - class64.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - class64.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - GrandExchangeOfferNameComparator.field3615 = var9; - } - - if (var9.scrollHeight > var9.height) { - class305.method1638(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { - updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); - if (var9.children != null) { - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); - } - - InterfaceParent var32 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var32 != null) { - if (var32.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (ScriptEvent var33 = (ScriptEvent)Client.scriptEvents.last(); var33 != null; var33 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var33.field861) { - var33.remove(); - var33.widget.field3000 = false; - } - } - - if (FriendsChat.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - StudioGame.addCancelMenuEntry(); - } - } - - class511.updateRootInterface(var32.group, var12, var13, var14, var15, var26, var11); - } - } - } - } - } - } + static final class108 field1143; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + static final class108 field1133; + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "[Luz;" + ) + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; + @ObfuscatedName("aj") + int field1145; + + static { + field1139 = new class108(0); + field1132 = new class108(1); + field1137 = new class108(2); + field1135 = new class108(3); + field1130 = new class108(4); + field1140 = new class108(5); + field1129 = new class108(6); + field1131 = new class108(7); + field1134 = new class108(8); + field1144 = new class108(9); + field1136 = new class108(10); + field1141 = new class108(11); + field1142 = new class108(12); + field1138 = new class108(13); + field1143 = new class108(14); + field1133 = new class108(15); + } + class108(int var1) { + this.field1145 = var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class11.java b/osrs/src/main/java/class11.java index 6e8bd9719..adeadf101 100644 --- a/osrs/src/main/java/class11.java +++ b/osrs/src/main/java/class11.java @@ -12,23 +12,29 @@ import java.security.cert.CertificateFactory; import java.util.LinkedList; -@ObfuscatedName("aa") +@ObfuscatedName("av") class class11 implements TlsAuthentication { - @ObfuscatedName("iq") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lre;" + descriptor = "Lup;" ) - static AbstractSocket field33; + static IndexedSprite field38; + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "Luz;" + ) + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lay;" + descriptor = "Las;" ) @Export("this$2") @ObfuscatedName("this$2") final class13 this$2; @ObfuscatedSignature( - descriptor = "(Lay;)V" + descriptor = "(Las;)V" ) class11(class13 var1) { this.this$2 = var1; @@ -47,7 +53,7 @@ public void notifyServerCertificate(Certificate var1) throws IOException { var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); } - this.this$2.this$1.field34 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); + this.this$2.this$1.field43 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); } catch (CertificateException var7) { throw new IOException(var7); } @@ -59,74 +65,13 @@ public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOExc return null; } - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(CLoa;I)I", - garbageValue = "832566677" - ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { - var0 = Character.toLowerCase(var0); - var2 = (var0 << 4) + 1; - } - - if (var0 == 241 && var1 == Language.Language_ES) { - var2 = 1762; - } - - return var2; - } - - @ObfuscatedName("ar") + @ObfuscatedName("nv") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "610139414" + descriptor = "(Lnn;B)Z", + garbageValue = "18" ) - static void method39() { - Players.Players_count = 0; - - for (int var0 = 0; var0 < 2048; ++var0) { - Players.cachedAppearanceBuffer[var0] = null; - Players.playerMovementSpeeds[var0] = MoveSpeed.WALK; - } - - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Ljn;IIIII)Z", - garbageValue = "-916093529" - ) - static final boolean method38(Model var0, int var1, int var2, int var3, int var4) { - if (!GrandExchangeOfferTotalQuantityComparator.method1974()) { - return false; - } else { - TextureProvider.method1350(); - AABB var5 = (AABB)var0.aabb.get(var1); - int var6 = var2 + var5.xMid; - int var7 = var3 + var5.yMid; - int var8 = var4 + var5.zMid; - int var9 = var5.xMidOffset; - int var10 = var5.yMidOffset; - int var11 = var5.zMidOffset; - int var12 = ViewportMouse.field2264 - var6; - int var13 = ViewportMouse.field2260 - var7; - int var14 = class286.field2470 - var8; - if (Math.abs(var12) > var9 + class190.field1495) { - return false; - } else if (Math.abs(var13) > var10 + GraphicsObject.field718) { - return false; - } else if (Math.abs(var14) > var11 + HealthBar.field1073) { - return false; - } else if (Math.abs(var14 * ViewportMouse.field2263 - var13 * ViewportMouse.field2265) > var11 * GraphicsObject.field718 + var10 * HealthBar.field1073) { - return false; - } else if (Math.abs(var12 * ViewportMouse.field2265 - var14 * class180.field1467) > var11 * class190.field1495 + var9 * HealthBar.field1073) { - return false; - } else { - return Math.abs(var13 * class180.field1467 - var12 * ViewportMouse.field2263) <= var9 * GraphicsObject.field718 + var10 * class190.field1495; - } - } + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; } } \ No newline at end of file diff --git a/osrs/src/main/java/class110.java b/osrs/src/main/java/class110.java deleted file mode 100644 index 7fbfa1e91..000000000 --- a/osrs/src/main/java/class110.java +++ /dev/null @@ -1,128 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ex") -public class class110 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1123; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1128; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1127; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1135; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1130; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1125; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1132; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1122; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1129; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1134; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1124; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1121; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1131; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1136; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1133; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static final class110 field1126; - @ObfuscatedName("an") - int field1137; - - static { - field1123 = new class110(0); - field1128 = new class110(1); - field1127 = new class110(2); - field1135 = new class110(3); - field1130 = new class110(4); - field1125 = new class110(5); - field1132 = new class110(6); - field1122 = new class110(7); - field1129 = new class110(8); - field1134 = new class110(9); - field1124 = new class110(10); - field1121 = new class110(11); - field1131 = new class110(12); - field1136 = new class110(13); - field1133 = new class110(14); - field1126 = new class110(15); - } - - class110(int var1) { - this.field1137 = var1; - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(Lnm;I)I", - garbageValue = "48072594" - ) - static int method624(Widget var0) { - if (var0.type != 11) { - --class180.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - String var1 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var0.method1868(var1); - return 1; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class113.java b/osrs/src/main/java/class113.java new file mode 100644 index 000000000..956cd7c5a --- /dev/null +++ b/osrs/src/main/java/class113.java @@ -0,0 +1,147 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import javax.net.ssl.HttpsURLConnection; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URLConnection; + +@ObfuscatedName("es") +public class class113 extends UrlRequester { + @ObfuscatedName("ch") + static int field1178; + @ObfuscatedName("ab") + final boolean field1179; + + public class113(boolean var1, int var2) { + super(var2); + this.field1179 = var1; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lea;I)V", + garbageValue = "422697771" + ) + @Export("vmethod2700") + void vmethod2700(UrlRequest var1) throws IOException { + URLConnection var2 = null; + boolean var9 = false; + + label124: { + HttpURLConnection var12; + label125: { + try { + var9 = true; + String var3 = var1.field1184.getProtocol(); + if (var3.equals("http")) { + var2 = this.method655(var1); + } else { + if (!var3.equals("https")) { + var1.field1186 = UrlRequest.field1181; + var9 = false; + break label124; + } + + var2 = this.method656(var1); + } + + this.method647(var2, var1); + var9 = false; + break label125; + } catch (IOException var10) { + var1.field1186 = UrlRequest.field1181; + var9 = false; + } finally { + if (var9) { + if (var2 != null && var2 instanceof HttpURLConnection) { + HttpURLConnection var6 = (HttpURLConnection)var2; + var6.disconnect(); + } + + } + } + + if (var2 != null && var2 instanceof HttpURLConnection) { + var12 = (HttpURLConnection)var2; + var12.disconnect(); + } + + return; + } + + if (var2 != null && var2 instanceof HttpURLConnection) { + var12 = (HttpURLConnection)var2; + var12.disconnect(); + } + + return; + } + + if (var2 != null && var2 instanceof HttpURLConnection) { + HttpURLConnection var4 = (HttpURLConnection)var2; + var4.disconnect(); + } + + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(Lea;I)Ljava/net/URLConnection;", + garbageValue = "-1165040742" + ) + URLConnection method655(UrlRequest var1) throws IOException { + URLConnection var2 = var1.field1184.openConnection(); + this.method646(var2); + return var2; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Lea;I)Ljava/net/URLConnection;", + garbageValue = "1061431523" + ) + URLConnection method656(UrlRequest var1) throws IOException { + HttpsURLConnection var2 = (HttpsURLConnection)var1.field1184.openConnection(); + if (!this.field1179) { + if (class15.field49 == null) { + class15.field49 = new class15(); + } + + class15 var4 = class15.field49; + var2.setSSLSocketFactory(var4); + } + + this.method646(var2); + return var2; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Llq;Luy;I)Lld;", + garbageValue = "-133059507" + ) + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = FaceNormal.method1516(); + var2.clientPacket = var0; + var2.clientPacketLength = var0.length; + if (var2.clientPacketLength == -1) { + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); + } else if (var2.clientPacketLength <= 18) { + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); + } + + var2.packetBuffer.setIsaacCipher(var1); + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); + var2.index = 0; + return var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class115.java b/osrs/src/main/java/class115.java deleted file mode 100644 index 6bad378c1..000000000 --- a/osrs/src/main/java/class115.java +++ /dev/null @@ -1,226 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import javax.net.ssl.HttpsURLConnection; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URLConnection; - -@ObfuscatedName("es") -public class class115 extends UrlRequester { - @ObfuscatedName("ao") - final boolean field1168; - - public class115(boolean var1, int var2) { - super(var2); - this.field1168 = var1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Leq;I)V", - garbageValue = "1796222901" - ) - @Export("vmethod2700") - void vmethod2700(UrlRequest var1) throws IOException { - URLConnection var2 = null; - boolean var9 = false; - - label124: { - HttpURLConnection var12; - label125: { - try { - var9 = true; - String var3 = var1.field1171.getProtocol(); - if (var3.equals("http")) { - var2 = this.method656(var1); - } else { - if (!var3.equals("https")) { - var1.field1173 = UrlRequest.field1169; - var9 = false; - break label124; - } - - var2 = this.method657(var1); - } - - this.method650(var2, var1); - var9 = false; - break label125; - } catch (IOException var10) { - var1.field1173 = UrlRequest.field1169; - var9 = false; - } finally { - if (var9) { - if (var2 != null && var2 instanceof HttpURLConnection) { - HttpURLConnection var6 = (HttpURLConnection)var2; - var6.disconnect(); - } - - } - } - - if (var2 != null && var2 instanceof HttpURLConnection) { - var12 = (HttpURLConnection)var2; - var12.disconnect(); - } - - return; - } - - if (var2 != null && var2 instanceof HttpURLConnection) { - var12 = (HttpURLConnection)var2; - var12.disconnect(); - } - - return; - } - - if (var2 != null && var2 instanceof HttpURLConnection) { - HttpURLConnection var4 = (HttpURLConnection)var2; - var4.disconnect(); - } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Leq;I)Ljava/net/URLConnection;", - garbageValue = "-188799571" - ) - URLConnection method656(UrlRequest var1) throws IOException { - URLConnection var2 = var1.field1171.openConnection(); - this.method649(var2); - return var2; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Leq;I)Ljava/net/URLConnection;", - garbageValue = "-1796104931" - ) - URLConnection method657(UrlRequest var1) throws IOException { - HttpsURLConnection var2 = (HttpsURLConnection)var1.field1171.openConnection(); - if (!this.field1168) { - if (class15.field44 == null) { - class15.field44 = new class15(); - } - - class15 var4 = class15.field44; - var2.setSSLSocketFactory(var4); - } - - this.method649(var2); - return var2; - } - - @ObfuscatedName("netscape/js") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-57" - ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; - int var4 = var1 >> 7; - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { - int var5 = var2; - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 + 1; - } - - int var6 = var0 & 127; - int var7 = var1 & 127; - int var8 = Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 + (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] >> 7; - int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; - return var7 * var9 + var8 * (128 - var7) >> 7; - } else { - return 0; - } - } - - @ObfuscatedName("kz") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "-12" - ) - @Export("addPendingSpawnToScene") - static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if (Client.isLowDetail && var0 != class87.Client_plane) { - return; - } - - long var8 = 0L; - boolean var10 = true; - boolean var11 = false; - boolean var12 = false; - if (var1 == 0) { - var8 = class10.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var8 = class10.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var8 = class10.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var8 = class10.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var13; - if (var8 != 0L) { - var13 = class10.scene.getObjectFlags(var0, var2, var3, var8); - int var15 = SecureRandomFuture.Entity_unpackID(var8); - int var16 = var13 & 31; - int var17 = var13 >> 6 & 3; - ObjectComposition var14; - if (var1 == 0) { - class10.scene.removeBoundaryObject(var0, var2, var3); - var14 = class91.getObjectDefinition(var15); - if (var14.interactType != 0) { - Client.collisionMaps[var0].method1162(var2, var3, var16, var17, var14.boolean1); - } - } - - if (var1 == 1) { - class10.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - class10.scene.removeGameObject(var0, var2, var3); - var14 = class91.getObjectDefinition(var15); - if (var2 + var14.sizeX > 103 || var3 + var14.sizeX > 103 || var2 + var14.sizeY > 103 || var3 + var14.sizeY > 103) { - return; - } - - if (var14.interactType != 0) { - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var14.sizeX, var14.sizeY, var17, var14.boolean1); - } - } - - if (var1 == 3) { - class10.scene.removeFloorDecoration(var0, var2, var3); - var14 = class91.getObjectDefinition(var15); - if (var14.interactType == 1) { - Client.collisionMaps[var0].method1165(var2, var3); - } - } - } - - if (var4 >= 0) { - var13 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var13 = var0 + 1; - } - - MouseRecorder.method477(var0, var13, var2, var3, var4, var5, var6, var7, class10.scene, Client.collisionMaps[var0]); - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class12.java b/osrs/src/main/java/class12.java index 73c094bce..4b39dacea 100644 --- a/osrs/src/main/java/class12.java +++ b/osrs/src/main/java/class12.java @@ -11,13 +11,27 @@ import java.io.OutputStream; import java.security.cert.Certificate; -@ObfuscatedName("ap") +@ObfuscatedName("ax") class class12 extends SSLSocket { - @ObfuscatedName("ac") - Certificate[] field34; + @ObfuscatedName("vq") + @ObfuscatedSignature( + descriptor = "Lcj;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "[Luz;" + ) + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("ln") + static int field41; + @ObfuscatedName("at") + Certificate[] field43; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Laj;" + descriptor = "Lak;" ) @Export("this$0") @ObfuscatedName("this$0") @@ -32,7 +46,7 @@ class class12 extends SSLSocket { final String val$host; @ObfuscatedSignature( - descriptor = "(Laj;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" + descriptor = "(Lak;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" ) class12(class15 var1, TlsClientProtocol var2, String var3) { this.this$0 = var1; @@ -122,127 +136,301 @@ public void startHandshake() throws IOException { this.val$tlsClientProtocol.connect(new class13(this)); } - @ObfuscatedName("ak") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([Lcv;II[I[II)V", - garbageValue = "-1654835319" + descriptor = "([Loj;II)Loj;", + garbageValue = "-948387119" ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { - int var5 = var1 - 1; - int var6 = var2 + 1; - int var7 = (var2 + var1) / 2; - World var8 = var0[var7]; - var0[var7] = var0[var1]; - var0[var1] = var8; - - while (var5 < var6) { - boolean var9 = true; - - int var10; - int var11; - int var12; - do { - --var6; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var6].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var6].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } + @Export("findEnumerated") + public static class383 findEnumerated(class383[] var0, int var1) { + class383[] var2 = var0; + + for (int var3 = 0; var3 < var2.length; ++var3) { + class383 var4 = var2[var3]; + if (var1 == var4.rsOrdinal()) { + return var4; + } + } - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var6].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var6].id; - var12 = var8.id; - } + return null; + } - if (var11 != var12) { - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { - var9 = false; - } - break; - } + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)[Llu;", + garbageValue = "915557708" + ) + public static ServerPacket[] method46() { + return new ServerPacket[]{ServerPacket.field2651, ServerPacket.field2639, ServerPacket.TRADING_POST_UPDATE, ServerPacket.SEND_PING, ServerPacket.field2633, ServerPacket.IF_SETNPCHEAD, ServerPacket.IF_SETTEXT, ServerPacket.SET_PLAYER_OP, ServerPacket.OBJ_COUNT, ServerPacket.UPDATE_UID192, ServerPacket.OBJ_DEL_LEGACY, ServerPacket.RESET_ANIMS, ServerPacket.field2655, ServerPacket.IF_OPENTOP, ServerPacket.field2656, ServerPacket.field2642, ServerPacket.field2641, ServerPacket.PREFETCH_GAMEOBJECTS, ServerPacket.field2648, ServerPacket.MIDI_SONG_WITH_SECONDARY, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL, ServerPacket.MAPPROJ_ANIM, ServerPacket.NPC_ANIM_SPECIFIC, ServerPacket.VARP_LARGE, ServerPacket.TRADING_POST_RESULTS, ServerPacket.field2637, ServerPacket.NPC_SPOTANIM_SPECIFIC, ServerPacket.REFLECTIONCHECK_FRIENDLIST, ServerPacket.UPDATE_STAT, ServerPacket.UPDATE_IGNORELIST, ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR, ServerPacket.TOGGLE_OCULUS_ORB, ServerPacket.VARCLAN_ENABLE, ServerPacket.MIDI_SONG_STOP, ServerPacket.field2670, ServerPacket.field2673, ServerPacket.IF_SETSCROLLPOS, ServerPacket.LOC_ANIM_SPECIFIC, ServerPacket.MESSAGE_PRIVATE_ECHO, ServerPacket.PLAYER_INFO, ServerPacket.EMPTY_PACKET, ServerPacket.UPDATE_RUNWEIGHT, ServerPacket.field2682, ServerPacket.VARP_SMALL, ServerPacket.PLAYER_SPOTANIM_SPECIFIC, ServerPacket.IF_SETPLAYERMODEL_OBJ, ServerPacket.IF_CLOSESUB, ServerPacket.HINT_ARROW, ServerPacket.NEW_PACK_215, ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED, ServerPacket.OPEN_URL, ServerPacket.field2674, ServerPacket.MESSAGE_PRIVATE, ServerPacket.IF_SETOBJECT, ServerPacket.CAM_MOVETO_EASED_CIRCULAR, ServerPacket.MINIMAP_TOGGLE, ServerPacket.NEW_PACKET_CAM_RESET_V2, ServerPacket.MESSAGE_CLANCHANNEL, ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT, ServerPacket.IF_OPENSUB, ServerPacket.IF_SETPOSITION, ServerPacket.CAM_RESET, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2, ServerPacket.CLANSETTINGS_FULL, ServerPacket.field2698, ServerPacket.SET_MAP_FLAG, ServerPacket.field2697, ServerPacket.UPDATE_REBOOT_TIMER, ServerPacket.TRIGGER_ONDIALOGABORT, ServerPacket.field2684, ServerPacket.REBUILD_REGION, ServerPacket.RUN_CLIENTSCRIPT, ServerPacket.NPC_HEADICON_SPECIFIC, ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS, ServerPacket.RESET_CLIENT_VARCACHE, ServerPacket.field2707, ServerPacket.field2694, ServerPacket.CAM_MOVETO, ServerPacket.field2728, ServerPacket.VARCLAN, ServerPacket.field2719, ServerPacket.MESSAGE_GAME, ServerPacket.LOC_ADD_CHANGE, ServerPacket.SYNTH_SOUND, ServerPacket.MESSAGE_FRIENDCHANNEL, ServerPacket.SYNC_CLIENT_VARCACHE, ServerPacket.CAM_SHAKE, ServerPacket.UPDATE_RUNENERGY, ServerPacket.IF_SETANIM, ServerPacket.UPDATE_INV_STOP_TRANSMIT, ServerPacket.MIDI_JINGLE, ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM, ServerPacket.field2709, ServerPacket.ENTER_FREECAM, ServerPacket.field2724, ServerPacket.UPDATE_SITESETTINGS, ServerPacket.UPDATE_ZONE_FULL_FOLLOWS, ServerPacket.LOGOUT_FULL, ServerPacket.PLAYER_ANIM_SPECIFIC, ServerPacket.field2713, ServerPacket.field2722, ServerPacket.NPC_INFO_SMALL, ServerPacket.field2718, ServerPacket.VARCLAN_DISABLE, ServerPacket.LOGIN_SCREEN_PACKET, ServerPacket.field2754, ServerPacket.UPDATE_FRIENDLIST, ServerPacket.field2753, ServerPacket.field2743, ServerPacket.field2745, ServerPacket.SPOTANIM_SPECIFIC, ServerPacket.IF_SETPLAYERHEAD, ServerPacket.UPDATE_INV_CLEAR, ServerPacket.UPDATE_INV_FULL, ServerPacket.IF_SETPLAYERMODEL_SELF, ServerPacket.REBUILD_REGION_NORMAL, ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE, ServerPacket.NPC_INFO_LARGE, ServerPacket.MIDI_SONG, ServerPacket.OBJ_ADD, ServerPacket.field2757, ServerPacket.MIDI_SWAP, ServerPacket.field2740, ServerPacket.field2756, ServerPacket.field2736, ServerPacket.IF_SETHIDE, ServerPacket.field2748}; + } - if (var10 == 3) { - var9 = false; - } + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "1" + ) + public static boolean method43(int var0) { + return (var0 >> 20 & 1) != 0; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1907529408" + ) + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; + } + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;IB)V", + garbageValue = "12" + ) + @Export("setFriendsRank") + static final void setFriendsRank(String var0, int var1) { + PacketBufferNode var2 = class113.getPacketBufferNode(ClientPacket.f2, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(ClanChannel.stringCp1252NullTerminatedByteSize(var0) + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + var2.packetBuffer.writeByteNeg(var1); + Client.packetWriter.addNode(var2); + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "1724856740" + ) + static int method48(int var0, Script var1, boolean var2) { + if (var0 == 5000) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == 5001) { + DbTableType.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + ObjTypeCustomisation.privateChatMode = WorldMapArea.method1204(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + if (ObjTypeCustomisation.privateChatMode == null) { + ObjTypeCustomisation.privateChatMode = PrivateChatMode.field4303; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + PacketBufferNode var11 = class113.getPacketBufferNode(ClientPacket.CHAT_SETFILTER, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeByte(Client.publicChatMode); + var11.packetBuffer.writeByte(ObjTypeCustomisation.privateChatMode.id); + var11.packetBuffer.writeByte(Client.tradeChatMode); + Client.packetWriter.addNode(var11); + return 1; + } else { + String var3; + int var4; + int var5; + PacketBufferNode var6; + if (var0 == 5002) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + DbTableType.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var6 = class113.getPacketBufferNode(ClientPacket.CHAT_SEND_ABUSE_REPORT, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(ClanChannel.stringCp1252NullTerminatedByteSize(var3) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var3); + var6.packetBuffer.writeByte(var4 - 1); + var6.packetBuffer.writeByte(var5); + Client.packetWriter.addNode(var6); + return 1; + } else { + int var7; + Message var8; + if (var0 == 5003) { + DbTableType.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var8 = class14.Messages_getByChannelAndID(var7, var4); + if (var8 != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var8.count; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var8.cycle; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; } - } while(var9); - - var9 = true; - - do { - ++var5; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var5].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var5].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var5].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; + return 1; + } else { + Message var9; + if (var0 == 5004) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var9 = class31.Messages_getMessage(var7); + if (var9 != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var9.type; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var9.cycle; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); } else { - var11 = var0[var5].id; - var12 = var8.id; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; } - if (var11 != var12) { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { - var9 = false; - } - break; + return 1; + } else if (var0 == 5005) { + if (ObjTypeCustomisation.privateChatMode == null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = ObjTypeCustomisation.privateChatMode.id; } - if (var10 == 3) { - var9 = false; + return 1; + } else { + PacketBufferNode var12; + if (var0 == 5008) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var12 = class544.method2711(var4, var3, class85.clientLanguage, -1); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == 5009) { + class127.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize]; + String var13 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize + 1]; + var12 = class113.getPacketBufferNode(ClientPacket.CHAT_SENDPRIVATE, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShort(0); + int var10 = var12.packetBuffer.offset; + var12.packetBuffer.writeStringCp1252NullTerminated(var3); + PcmPlayer.method210(var12.packetBuffer, var13); + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == 5010) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + DbTableType.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var6 = class544.method2711(var4, var3, class85.clientLanguage, var5); + Client.packetWriter.addNode(var6); + return 1; + } else if (var0 != 5015) { + if (var0 == 5016) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == 5017) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Message.Messages_getHistorySize(var7); + return 1; + } else if (var0 == 5018) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Messages_getLastChatID(var7); + return 1; + } else if (var0 == 5019) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class92.method498(var7); + return 1; + } else if (var0 == 5020) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + class9.doCheat(var3); + return 1; + } else if (var0 == 5021) { + Client.field600 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == 5022) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = Client.field600; + return 1; + } else if (var0 == 5023) { + var3 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + System.out.println(var3); + return 1; + } else if (var0 == 5030) { + DbTableType.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var8 = class14.Messages_getByChannelAndID(var7, var4); + if (var8 != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var8.count; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var8.cycle; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var8.sender != null ? var8.sender : ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var8.prefix != null ? var8.prefix : ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var8.text != null ? var8.text : ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var8.isFromFriend() ? 1 : (var8.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 5031) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var9 = class31.Messages_getMessage(var7); + if (var9 != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var9.type; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var9.cycle; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var9.sender != null ? var9.sender : ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var9.prefix != null ? var9.prefix : ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var9.text != null ? var9.text : ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var9.isFromFriend() ? 1 : (var9.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + if (class229.localPlayer != null && class229.localPlayer.username != null) { + var3 = class229.localPlayer.username.getName(); + } else { + var3 = ""; + } + + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3; + return 1; } } - } while(var9); - - if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; } } - - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); } - } - @ObfuscatedName("ly") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(Lcf;III)V", - garbageValue = "-1330448420" + descriptor = "(ILdt;ZB)I", + garbageValue = "11" ) - static final void method41(MenuAction var0, int var1, int var2) { - if (var0 != null) { - class33.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.itemId, var0.action, var0.target, var1, var2); - } - + static int method49(int var0, Script var1, boolean var2) { + return 2; } } \ No newline at end of file diff --git a/osrs/src/main/java/class124.java b/osrs/src/main/java/class124.java new file mode 100644 index 000000000..399b747fc --- /dev/null +++ b/osrs/src/main/java/class124.java @@ -0,0 +1,53 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("eb") +public enum class124 implements class383 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Leb;" + ) + field1208(3, 0), + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Leb;" + ) + field1205(0, 1), + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Leb;" + ) + field1207(2, 2), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Leb;" + ) + field1206(1, 3), + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Leb;" + ) + field1204(4, 4); + + @ObfuscatedName("au") + public final int field1210; + @ObfuscatedName("aa") + @Export("id") + final int id; + + class124(int var3, int var4) { + this.field1210 = var3; + this.id = var4; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-11" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class125.java b/osrs/src/main/java/class125.java new file mode 100644 index 000000000..c4e131326 --- /dev/null +++ b/osrs/src/main/java/class125.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ed") +public interface class125 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class126.java b/osrs/src/main/java/class126.java index 464d37017..c5f170380 100644 --- a/osrs/src/main/java/class126.java +++ b/osrs/src/main/java/class126.java @@ -1,5 +1,44 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ep") -public interface class126 { +@ObfuscatedName("eq") +public class class126 { + @ObfuscatedName("at") + int field1217; + @ObfuscatedName("ah") + float field1213; + @ObfuscatedName("ar") + float field1215; + @ObfuscatedName("ao") + float field1214; + @ObfuscatedName("ab") + float field1212; + @ObfuscatedName("au") + float field1216; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Leq;" + ) + class126 field1211; + + class126() { + this.field1215 = Float.MAX_VALUE; + this.field1214 = Float.MAX_VALUE; + this.field1212 = Float.MAX_VALUE; + this.field1216 = Float.MAX_VALUE; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Luj;IB)V", + garbageValue = "116" + ) + void method691(Buffer var1, int var2) { + this.field1217 = var1.readShort(); + this.field1213 = var1.method2565(); + this.field1215 = var1.method2565(); + this.field1214 = var1.method2565(); + this.field1212 = var1.method2565(); + this.field1216 = var1.method2565(); + } } \ No newline at end of file diff --git a/osrs/src/main/java/class127.java b/osrs/src/main/java/class127.java index e9ab11f48..8b9993d81 100644 --- a/osrs/src/main/java/class127.java +++ b/osrs/src/main/java/class127.java @@ -1,61 +1,43 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ef") +@ObfuscatedName("ee") public class class127 { - @ObfuscatedName("ac") - int field1200; - @ObfuscatedName("al") - float field1197; - @ObfuscatedName("ak") - float field1196; - @ObfuscatedName("ax") - float field1199; @ObfuscatedName("ao") - float field1198; - @ObfuscatedName("ah") - float field1195; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lef;" - ) - class127 field1194; - - class127() { - this.field1196 = Float.MAX_VALUE; - this.field1199 = Float.MAX_VALUE; - this.field1198 = Float.MAX_VALUE; - this.field1195 = Float.MAX_VALUE; - } + public static final float field1219; + @ObfuscatedName("ab") + public static final float field1218; + @ObfuscatedName("au") + static float[] field1221; + @ObfuscatedName("aa") + static float[] field1220; + @ObfuscatedName("ap") + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("us") + @Export("cameraLookAtHeight") + static int cameraLookAtHeight; + @ObfuscatedName("vz") + static int field1224; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "1810575829" - ) - void method691(Buffer var1, int var2) { - this.field1200 = var1.readShort(); - this.field1197 = var1.method2586(); - this.field1196 = var1.method2586(); - this.field1199 = var1.method2586(); - this.field1198 = var1.method2586(); - this.field1195 = var1.method2586(); + static { + field1219 = Math.ulp(1.0F); + field1218 = 2.0F * field1219; + field1221 = new float[4]; + field1220 = new float[5]; } - @ObfuscatedName("ns") + @ObfuscatedName("ig") @ObfuscatedSignature( - descriptor = "(Lnm;IIIB)V", - garbageValue = "-59" + descriptor = "(I)V", + garbageValue = "-2049504300" ) - static final void method692(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.method1857(class33.widgetDefinition, false); - if (var4 != null) { - if (Client.minimapState < 3) { - JSException.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); - } - + static void method692() { + if (NewShit.worldMap != null) { + NewShit.worldMap.method2408(ItemLayer.Client_plane, (class229.localPlayer.x >> 7) + NewShit.baseX, (class229.localPlayer.y >> 7) + class101.baseY, false); + NewShit.worldMap.loadCache(); } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class128.java b/osrs/src/main/java/class128.java index 396810666..4bd796c35 100644 --- a/osrs/src/main/java/class128.java +++ b/osrs/src/main/java/class128.java @@ -1,20 +1,309 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ew") +@ObfuscatedName("ej") public class class128 { + @ObfuscatedName("at") + public final int field1238; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lej;" + ) + public class128 field1237; + @ObfuscatedName("ar") + float[][] field1227; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "[Lrz;" + ) + final class462[] field1236; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "[Lrz;" + ) + class462[] field1234; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "[Lrz;" + ) + class462[] field1235; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lrz;" + ) + class462 field1231; + @ObfuscatedName("ac") + boolean field1225; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lrz;" + ) + class462 field1232; + @ObfuscatedName("az") + boolean field1226; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lrz;" + ) + class462 field1233; + @ObfuscatedName("av") + float[][] field1229; @ObfuscatedName("ax") - public static final float field1202; + float[][] field1230; + @ObfuscatedName("as") + float[][] field1228; + + @ObfuscatedSignature( + descriptor = "(ILuj;Z)V" + ) + public class128(int var1, Buffer var2, boolean var3) { + this.field1231 = new class462(); + this.field1225 = true; + this.field1232 = new class462(); + this.field1226 = true; + this.field1233 = new class462(); + this.field1238 = var2.readShort(); + this.field1236 = new class462[var1]; + this.field1234 = new class462[this.field1236.length]; + this.field1235 = new class462[this.field1236.length]; + this.field1227 = new float[this.field1236.length][3]; + + for (int var4 = 0; var4 < this.field1236.length; ++var4) { + this.field1236[var4] = new class462(var2, var3); + this.field1227[var4][0] = var2.method2565(); + this.field1227[var4][1] = var2.method2565(); + this.field1227[var4][2] = var2.method2565(); + } + + this.method695(); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-36" + ) + void method695() { + this.field1229 = new float[this.field1236.length][3]; + this.field1230 = new float[this.field1236.length][3]; + this.field1228 = new float[this.field1236.length][3]; + class462 var1 = WorldMapDecoration.method1329(); + + for (int var2 = 0; var2 < this.field1236.length; ++var2) { + class462 var3 = this.method697(var2); + var1.method2320(var3); + var1.method2328(); + this.field1229[var2] = var1.method2317(); + this.field1230[var2][0] = var3.field3908[12]; + this.field1230[var2][1] = var3.field3908[13]; + this.field1230[var2][2] = var3.field3908[14]; + this.field1228[var2] = var3.method2329(); + } + + var1.method2314(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)Lrz;", + garbageValue = "1567155502" + ) + class462 method697(int var1) { + return this.field1236[var1]; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)Lrz;", + garbageValue = "211716274" + ) + class462 method698(int var1) { + if (this.field1234[var1] == null) { + this.field1234[var1] = new class462(this.method697(var1)); + if (this.field1237 != null) { + this.field1234[var1].method2324(this.field1237.method698(var1)); + } else { + this.field1234[var1].method2324(class462.field3905); + } + } + + return this.field1234[var1]; + } + @ObfuscatedName("ao") - public static final float field1201; + @ObfuscatedSignature( + descriptor = "(IS)Lrz;", + garbageValue = "6325" + ) + class462 method700(int var1) { + if (this.field1235[var1] == null) { + this.field1235[var1] = new class462(this.method698(var1)); + this.field1235[var1].method2328(); + } + + return this.field1235[var1]; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Lrz;I)V", + garbageValue = "1841353885" + ) + void method701(class462 var1) { + this.field1231.method2320(var1); + this.field1225 = true; + this.field1226 = true; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)Lrz;", + garbageValue = "37" + ) + class462 method702() { + return this.field1231; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)Lrz;", + garbageValue = "155823310" + ) + class462 method703() { + if (this.field1225) { + this.field1232.method2320(this.method702()); + if (this.field1237 != null) { + this.field1232.method2324(this.field1237.method703()); + } + + this.field1225 = false; + } + + return this.field1232; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IB)Lrz;", + garbageValue = "80" + ) + public class462 method704(int var1) { + if (this.field1226) { + this.field1233.method2320(this.method700(var1)); + this.field1233.method2324(this.method703()); + this.field1226 = false; + } + + return this.field1233; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)[F", + garbageValue = "-2041613656" + ) + float[] method705(int var1) { + return this.field1229[var1]; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(II)[F", + garbageValue = "-1019764578" + ) + float[] method706(int var1) { + return this.field1230[var1]; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(IB)[F", + garbageValue = "4" + ) + float[] method707(int var1) { + return this.field1228[var1]; + } + @ObfuscatedName("ah") - static float[] field1203; + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-566534946" + ) + public static String method696(CharSequence var0) { + long var3 = 0L; + int var5 = var0.length(); + + for (int var6 = 0; var6 < var5; ++var6) { + var3 *= 37L; + char var7 = var0.charAt(var6); + if (var7 >= 'A' && var7 <= 'Z') { + var3 += (long)(var7 + 1 - 65); + } else if (var7 >= 'a' && var7 <= 'z') { + var3 += (long)(var7 + 1 - 97); + } else if (var7 >= '0' && var7 <= '9') { + var3 += (long)(var7 + 27 - 48); + } + + if (var3 >= 177917621779460413L) { + break; + } + } + + while (0L == var3 % 37L && 0L != var3) { + var3 /= 37L; + } + + String var8 = HitSplatDefinition.base37DecodeLong(var3); + if (var8 == null) { + var8 = ""; + } + + return var8; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "-232126704" + ) + public static byte[] method694(Object var0, boolean var1) { + if (var0 == null) { + return null; + } else if (var0 instanceof byte[]) { + byte[] var6 = (byte[])((byte[])var0); + if (var1) { + int var4 = var6.length; + byte[] var5 = new byte[var4]; + System.arraycopy(var6, 0, var5, 0, var4); + return var5; + } else { + return var6; + } + } else if (var0 instanceof AbstractByteArrayCopier) { + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; + return var2.get(); + } else { + throw new IllegalArgumentException(); + } + } + @ObfuscatedName("ar") - static float[] field1204; + @ObfuscatedSignature( + descriptor = "(Luj;I)Ljava/lang/String;", + garbageValue = "1233783388" + ) + @Export("readString") + public static String readString(Buffer var0) { + return DevicePcmPlayerProvider.method82(var0, 32767); + } - static { - field1202 = Math.ulp(1.0F); - field1201 = 2.0F * field1202; - field1203 = new float[4]; - field1204 = new float[5]; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "41" + ) + public static int method699(int var0) { + return class158.method828(ViewportMouse.ViewportMouse_entityTags[var0]); } } \ No newline at end of file diff --git a/osrs/src/main/java/class129.java b/osrs/src/main/java/class129.java index cc4e84ae1..09985de94 100644 --- a/osrs/src/main/java/class129.java +++ b/osrs/src/main/java/class129.java @@ -1,228 +1,124 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") -public class class129 { - @ObfuscatedName("iz") - static int field1205; - @ObfuscatedName("ac") - public final int field1219; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Led;" - ) - public class129 field1218; - @ObfuscatedName("ak") - float[][] field1209; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "[Lrb;" - ) - final class465[] field1217; - @ObfuscatedName("ao") +@ObfuscatedName("ep") +public enum class129 implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "[Lrb;" + descriptor = "Lep;" ) - class465[] field1216; + field1244(0, 0), @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[Lrb;" + descriptor = "Lep;" ) - class465[] field1215; + field1241(1, 1), @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lrb;" + descriptor = "Lep;" ) - class465 field1214; - @ObfuscatedName("ab") - boolean field1206; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lrb;" - ) - class465 field1213; - @ObfuscatedName("av") - boolean field1207; - @ObfuscatedName("ag") + field1243(2, 2), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lrb;" + descriptor = "Lep;" ) - class465 field1212; - @ObfuscatedName("aa") - float[][] field1208; - @ObfuscatedName("ap") - float[][] field1210; - @ObfuscatedName("ay") - float[][] field1211; - + field1242(3, 3), + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(ILul;Z)V" + descriptor = "Lep;" ) - public class129(int var1, Buffer var2, boolean var3) { - this.field1214 = new class465(); - this.field1206 = true; - this.field1213 = new class465(); - this.field1207 = true; - this.field1212 = new class465(); - this.field1219 = var2.readShort(); - this.field1217 = new class465[var1]; - this.field1216 = new class465[this.field1217.length]; - this.field1215 = new class465[this.field1217.length]; - this.field1209 = new float[this.field1217.length][3]; - - for (int var4 = 0; var4 < this.field1217.length; ++var4) { - this.field1217[var4] = new class465(var2, var3); - this.field1209[var4][0] = var2.method2586(); - this.field1209[var4][1] = var2.method2586(); - this.field1209[var4][2] = var2.method2586(); - } - - this.method693(); - } + field1240(4, 4); @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-13" - ) - void method693() { - this.field1208 = new float[this.field1217.length][3]; - this.field1210 = new float[this.field1217.length][3]; - this.field1211 = new float[this.field1217.length][3]; - class465 var1 = ParamComposition.method1053(); - - for (int var2 = 0; var2 < this.field1217.length; ++var2) { - class465 var3 = this.method694(var2); - var1.method2342(var3); - var1.method2350(); - this.field1208[var2] = var1.method2339(); - this.field1210[var2][0] = var3.field3908[12]; - this.field1210[var2][1] = var3.field3908[13]; - this.field1210[var2][2] = var3.field3908[14]; - this.field1211[var2] = var3.method2351(); - } - - var1.method2336(); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)Lrb;", - garbageValue = "-1380153125" - ) - class465 method694(int var1) { - return this.field1217[var1]; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)Lrb;", - garbageValue = "-1405133305" - ) - class465 method695(int var1) { - if (this.field1216[var1] == null) { - this.field1216[var1] = new class465(this.method694(var1)); - if (this.field1218 != null) { - this.field1216[var1].method2346(this.field1218.method695(var1)); - } else { - this.field1216[var1].method2346(class465.field3903); - } - } - - return this.field1216[var1]; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(II)Lrb;", - garbageValue = "-1214410602" - ) - class465 method696(int var1) { - if (this.field1215[var1] == null) { - this.field1215[var1] = new class465(this.method695(var1)); - this.field1215[var1].method2350(); - } + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("au") + final int field1246; + @ObfuscatedName("aa") + final int field1245; - return this.field1215[var1]; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Lrb;I)V", - garbageValue = "2009872809" - ) - void method697(class465 var1) { - this.field1214.method2342(var1); - this.field1206 = true; - this.field1207 = true; + class129(int var3, int var4) { + this.field1246 = var3; + this.field1245 = var4; } @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Lrb;", - garbageValue = "1" + descriptor = "(B)I", + garbageValue = "-11" ) - class465 method698() { - return this.field1214; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1245; } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lrb;", - garbageValue = "-1187043704" + descriptor = "(B)[Lru;", + garbageValue = "94" ) - class465 method699() { - if (this.field1206) { - this.field1213.method2342(this.method698()); - if (this.field1218 != null) { - this.field1213.method2346(this.field1218.method699()); - } - - this.field1206 = false; - } - - return this.field1213; + static class465[] method708() { + return new class465[]{class465.field3926, class465.field3923, class465.field3925, class465.field3924}; } @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)Lrb;", - garbageValue = "295548775" - ) - public class465 method700(int var1) { - if (this.field1207) { - this.field1212.method2342(this.method696(var1)); - this.field1212.method2346(this.method699()); - this.field1207 = false; - } - - return this.field1212; - } + descriptor = "(IIIZIZI)V", + garbageValue = "-1979044926" + ) + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { + int var6 = (var0 + var1) / 2; + int var7 = var0; + World var8 = class361.World_worlds[var6]; + class361.World_worlds[var6] = class361.World_worlds[var1]; + class361.World_worlds[var1] = var8; + + for (int var9 = var0; var9 < var1; ++var9) { + World var11 = class361.World_worlds[var9]; + int var12 = class89.compareWorlds(var11, var8, var2, var3); + int var10; + if (var12 != 0) { + if (var3) { + var10 = -var12; + } else { + var10 = var12; + } + } else if (var4 == -1) { + var10 = 0; + } else { + int var13 = class89.compareWorlds(var11, var8, var4, var5); + if (var5) { + var10 = -var13; + } else { + var10 = var13; + } + } + + if (var10 <= 0) { + World var14 = class361.World_worlds[var9]; + class361.World_worlds[var9] = class361.World_worlds[var7]; + class361.World_worlds[var7++] = var14; + } + } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "1329468643" - ) - float[] method701(int var1) { - return this.field1208[var1]; - } + class361.World_worlds[var1] = class361.World_worlds[var7]; + class361.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + } - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "-1277196406" - ) - float[] method702(int var1) { - return this.field1210[var1]; } - @ObfuscatedName("ag") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "996106282" + descriptor = "(II)V", + garbageValue = "394738351" ) - float[] method703(int var1) { - return this.field1211[var1]; + static void method711(int var0) { + UserComparator7.method674(14); + Login.field751 = var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class13.java b/osrs/src/main/java/class13.java index 3dca9c64b..5e15fce26 100644 --- a/osrs/src/main/java/class13.java +++ b/osrs/src/main/java/class13.java @@ -9,18 +9,16 @@ import java.io.IOException; import java.util.Hashtable; -@ObfuscatedName("ay") +@ObfuscatedName("as") class class13 extends DefaultTlsClient { - @ObfuscatedName("ga") - static int field35; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Lax;" ) final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lap;)V" + descriptor = "(Lax;)V" ) class13(class12 var1) { this.this$1 = var1; @@ -52,299 +50,35 @@ public TlsAuthentication getAuthentication() throws IOException { return new class11(this); } - @ObfuscatedName("ai") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "-21" + descriptor = "(I)[Lnv;", + garbageValue = "173861677" ) - static int method42(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - if (var0 == 1800) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var3)); - return 1; - } else if (var0 != 1801) { - if (var0 == 1802) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } + public static GameBuild[] method50() { + return new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.LIVE, GameBuild.RC, GameBuild.WIP}; } - @ObfuscatedName("bv") + @ObfuscatedName("hy") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "751094160" + descriptor = "(B)V", + garbageValue = "20" ) - static int method43(int var0, Script var1, boolean var2) { - if (var0 == 3800) { - if (VerticalAlignment.guestClanSettings != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - class295.field2496 = VerticalAlignment.guestClanSettings; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - int var3; - if (var0 == 3801) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Client.currentClanSettings[var3] != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - class295.field2496 = Client.currentClanSettings[var3]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3802) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class295.field2496.name; - return 1; - } else if (var0 == 3803) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.allowGuests ? 1 : 0; - return 1; - } else if (var0 == 3804) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1371; - return 1; - } else if (var0 == 3805) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1372; - return 1; - } else if (var0 == 3806) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1370; - return 1; - } else if (var0 == 3807) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1369; - return 1; - } else if (var0 == 3809) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.memberCount; - return 1; - } else if (var0 == 3810) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class295.field2496.memberNames[var3]; - return 1; - } else if (var0 == 3811) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.memberRanks[var3]; - return 1; - } else if (var0 == 3812) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.bannedMemberCount; - return 1; - } else if (var0 == 3813) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class295.field2496.bannedMemberNames[var3]; - return 1; - } else { - int var5; - int var6; - if (var0 == 3814) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.method814(var3, var6, var5); - return 1; - } else if (var0 == 3815) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.currentOwner; - return 1; - } else if (var0 == 3816) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1378; - return 1; - } else if (var0 == 3817) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.method813(Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]); - return 1; - } else if (var0 == 3818) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = class295.field2496.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == 3819) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - class36.method183(var6, var3); - return 1; - } else if (var0 == 3820) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1379[var3]; - return 1; - } else { - if (var0 == 3821) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - HealthBarUpdate.method525(var5, var3, var4); - } - - if (var0 == 3822) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class295.field2496.field1368[var3] ? 1 : 0; - return 1; - } else if (var0 == 3850) { - if (ClanChannelMember.guestClanChannel != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - Interpreter.field704 = ClanChannelMember.guestClanChannel; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } + static final void method51() { + Client.packetWriter.close(); + ObjectSound.method424(); + class36.scene.clear(); - return 1; - } else if (var0 == 3851) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Client.currentClanChannels[var3] != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - Interpreter.field704 = Client.currentClanChannels[var3]; - VarcInt.field1529 = var3; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 3852) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = Interpreter.field704.name; - return 1; - } else if (var0 == 3853) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.field704.field1413; - return 1; - } else if (var0 == 3854) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.field704.field1414; - return 1; - } else if (var0 == 3855) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.field704.method868(); - return 1; - } else if (var0 == 3856) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ((ClanChannelMember)Interpreter.field704.members.get(var3)).username.getName(); - return 1; - } else if (var0 == 3857) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)Interpreter.field704.members.get(var3)).rank; - return 1; - } else if (var0 == 3858) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)Interpreter.field704.members.get(var3)).world; - return 1; - } else if (var0 == 3859) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ArchiveDisk.method2314(VarcInt.field1529, var3); - return 1; - } else if (var0 == 3860) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.field704.method869(Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]); - return 1; - } else if (var0 == 3861) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Interpreter.field704.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == 3890) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SequenceDefinition.varclan != null ? 1 : 0; - return 1; - } else { - return 2; - } - } - } + for (int var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0].clear(); } - } - - @ObfuscatedName("kh") - @ObfuscatedSignature( - descriptor = "(ZLuy;B)V", - garbageValue = "15" - ) - static final void method44(boolean var0, PacketBuffer var1) { - while (true) { - byte var2 = 16; - int var3 = 1 << var2; - if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= var2 + 12) { - int var4 = var1.readBits(var2); - if (var4 != var3 - 1) { - boolean var5 = false; - if (Client.npcs[var4] == null) { - Client.npcs[var4] = new NPC(); - var5 = true; - } - - NPC var6 = Client.npcs[var4]; - Client.npcIndices[++Client.npcCount - 1] = var4; - var6.npcCycle = Client.cycle; - int var10 = var1.readBits(1); - if (var10 == 1) { - Client.field552[++Client.field450 - 1] = var4; - } - int var7 = var1.readBits(1); - var6.definition = class190.getNpcDefinition(var1.readBits(14)); - int var11 = Client.field563[var1.readBits(3)]; - if (var5) { - var6.orientation = var6.rotation = var11; - } - - int var8; - if (var0) { - var8 = var1.readBits(8); - if (var8 > 127) { - var8 -= 256; - } - } else { - var8 = var1.readBits(5); - if (var8 > 15) { - var8 -= 32; - } - } - - int var9; - if (var0) { - var9 = var1.readBits(8); - if (var9 > 127) { - var9 -= 256; - } - } else { - var9 = var1.readBits(5); - if (var9 > 15) { - var9 -= 32; - } - } - - boolean var12 = var1.readBits(1) == 1; - if (var12) { - var1.readBits(32); - } - - WorldMapLabel.method1571(var6); - if (var6.field1020 == 0) { - var6.rotation = 0; - } - - var6.method584(TextureProvider.localPlayer.pathX[0] + var8, TextureProvider.localPlayer.pathY[0] + var9, var7 == 1); - continue; - } - } - - var1.exportIndex(); - return; - } - } - - @ObfuscatedName("oi") - @ObfuscatedSignature( - descriptor = "(B)Loo;", - garbageValue = "-81" - ) - static JagNetThread method45() { - return class59.field309; + Client.field422.method1114(); + System.gc(); + WorldMapManager.method1265(0, 0); + class472.method2350(); + Client.playingJingle = false; + WorldMapSectionType.method1311(); + WorldMapSection2.updateGameState(10); } } \ No newline at end of file diff --git a/osrs/src/main/java/class130.java b/osrs/src/main/java/class130.java index 7d4a9834b..7a449caaa 100644 --- a/osrs/src/main/java/class130.java +++ b/osrs/src/main/java/class130.java @@ -2,74 +2,95 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.List; +import java.util.concurrent.Callable; -@ObfuscatedName("fj") -public enum class130 implements class386 { - @ObfuscatedName("ac") +@ObfuscatedName("fd") +public class class130 implements Callable { + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "[Lup;" ) - field1221(0, 0), - @ObfuscatedName("al") + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfm;" ) - field1223(1, 1), - @ObfuscatedName("ak") + final class131 field1249; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfa;" ) - field1222(2, 2), - @ObfuscatedName("ax") + final class132 field1248; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfq;" ) - field1225(3, 3), + final class133 field1250; @ObfuscatedName("ao") + final int field1251; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfo;" ) - field1224(4, 4); + @Export("this$0") + @ObfuscatedName("this$0") + final class139 this$0; - @ObfuscatedName("wd") - static List field1220; - @ObfuscatedName("ah") - final int field1226; - @ObfuscatedName("ar") - final int field1227; + @ObfuscatedSignature( + descriptor = "(Lfo;Lfm;Lfa;Lfq;I)V" + ) + class130(class139 var1, class131 var2, class132 var3, class133 var4, int var5) { + this.this$0 = var1; + this.field1249 = var2; + this.field1248 = var3; + this.field1250 = var4; + this.field1251 = var5; + } + + @Export("call") + @ObfuscatedName("call") + public Object call() { + this.field1249.method715(); + class131[][] var1; + if (this.field1248 == class132.field1276) { + var1 = this.this$0.field1311; + } else { + var1 = this.this$0.field1316; + } - class130(int var3, int var4) { - this.field1226 = var3; - this.field1227 = var4; + var1[this.field1251][this.field1250.method729()] = this.field1249; + return null; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(IIII)Luz;", + garbageValue = "587580140" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1227; + static SpritePixels method712(int var0, int var1, int var2) { + DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; + long var4 = (long)(var2 << 16 | var0 << 8 | var1); + return (SpritePixels)var3.get(var4); } - @ObfuscatedName("al") + @ObfuscatedName("mt") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "861803654" + descriptor = "(II)V", + garbageValue = "888688994" ) - public static void method704(int var0, int var1) { - VarbitComposition var2 = Messages.getWidget(var0); - int var3 = var2.baseVar; - int var4 = var2.startBit; - int var5 = var2.endBit; - int var6 = Varps.Varps_masks[var5 - var4]; - if (var1 < 0 || var1 > var6) { - var1 = 0; - } + static final void method713(int var0) { + if (HealthBarDefinition.widgetDefinition.loadInterface(var0)) { + Widget[] var1 = HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var0]; + + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3 != null) { + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + } + } - var6 <<= var4; - Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class131.java b/osrs/src/main/java/class131.java index a5aa7f28f..5b72992fc 100644 --- a/osrs/src/main/java/class131.java +++ b/osrs/src/main/java/class131.java @@ -2,105 +2,269 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.io.File; import java.io.IOException; -import java.util.concurrent.Callable; -@ObfuscatedName("fh") -public class class131 implements Callable { - @ObfuscatedName("ur") - @Export("cameraMoveToAcceleration") - static int cameraMoveToAcceleration; - @ObfuscatedName("ac") +@ObfuscatedName("fm") +public class class131 { + @ObfuscatedName("at") + boolean field1254; + @ObfuscatedName("ah") + boolean field1252; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lep;" ) - final class132 field1231; - @ObfuscatedName("al") + class129 field1257; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lep;" ) - final class133 field1230; - @ObfuscatedName("ak") + class129 field1256; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "[Leq;" ) - final class134 field1229; + class126[] field1258; + @ObfuscatedName("au") + boolean field1255; + @ObfuscatedName("aa") + float field1259; + @ObfuscatedName("ac") + float field1260; + @ObfuscatedName("al") + float field1263; + @ObfuscatedName("az") + float field1270; + @ObfuscatedName("ap") + float field1265; + @ObfuscatedName("av") + float field1267; @ObfuscatedName("ax") - final int field1232; - // $FF: synthetic field + float field1268; + @ObfuscatedName("as") + float field1266; + @ObfuscatedName("ay") + float field1269; + @ObfuscatedName("ak") + float field1262; + @ObfuscatedName("aj") + boolean field1253; + @ObfuscatedName("am") + int field1273; + @ObfuscatedName("aq") + float[] field1271; + @ObfuscatedName("ai") + int field1272; + @ObfuscatedName("aw") + int field1274; + @ObfuscatedName("ae") + float field1261; + @ObfuscatedName("an") + float field1264; + + class131() { + this.field1253 = true; + this.field1273 = 0; + } + + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lfk;" + descriptor = "(Luj;II)I", + garbageValue = "-979400309" ) - @Export("this$0") - @ObfuscatedName("this$0") - final class139 this$0; + int method714(Buffer var1, int var2) { + int var3 = var1.readUnsignedShort(); + class311.method1646(var1.readUnsignedByte()); + this.field1257 = class72.method432(var1.readUnsignedByte()); + this.field1256 = class72.method432(var1.readUnsignedByte()); + this.field1254 = var1.readUnsignedByte() != 0; + this.field1258 = new class126[var3]; + class126 var4 = null; + + for (int var5 = 0; var5 < var3; ++var5) { + class126 var6 = new class126(); + var6.method691(var1, var2); + this.field1258[var5] = var6; + if (var4 != null) { + var4.field1211 = var6; + } + var4 = var6; + } + + return var3; + } + + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lfk;Lfz;Lfs;Lfl;I)V" + descriptor = "(I)V", + garbageValue = "2128707334" ) - class131(class139 var1, class132 var2, class133 var3, class134 var4, int var5) { - this.this$0 = var1; - this.field1231 = var2; - this.field1230 = var3; - this.field1229 = var4; - this.field1232 = var5; + void method715() { + this.field1272 = this.field1258[0].field1217; + this.field1274 = this.field1258[this.method722() - 1].field1217; + this.field1271 = new float[this.method719() + 1]; + + for (int var1 = this.method717(); var1 <= this.method718(); ++var1) { + this.field1271[var1 - this.method717()] = class404.method2045(this, (float)var1); + } + + this.field1258 = null; + this.field1261 = class404.method2045(this, (float)(this.method717() - 1)); + this.field1264 = class404.method2045(this, (float)(this.method718() + 1)); } - @Export("call") - @ObfuscatedName("call") - public Object call() { - this.field1231.method710(); - class132[][] var1; - if (this.field1230 == class133.field1260) { - var1 = this.this$0.field1292; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)F", + garbageValue = "-1688546039" + ) + public float method716(int var1) { + if (var1 < this.method717()) { + return this.field1261; } else { - var1 = this.this$0.field1297; + return var1 > this.method718() ? this.field1264 : this.field1271[var1 - this.method717()]; } - - var1[this.field1232][this.field1229.method724()] = this.field1231; - return null; } @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "124775939" ) - public static byte[] method706() { - byte[] var0 = new byte[24]; + int method717() { + return this.field1272; + } - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var0); + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "17" + ) + int method718() { + return this.field1274; + } - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { - } + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "71" + ) + int method719() { + return this.method718() - this.method717(); + } - if (var1 >= 24) { - throw new IOException(); - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { - var0[var2] = -1; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(FI)I", + garbageValue = "2092037965" + ) + int method720(float var1) { + if (this.field1273 < 0 || (float)this.field1258[this.field1273].field1217 > var1 || this.field1258[this.field1273].field1211 != null && (float)this.field1258[this.field1273].field1211.field1217 <= var1) { + if (var1 >= (float)this.method717() && var1 <= (float)this.method718()) { + int var2 = this.method722(); + int var3 = this.field1273; + if (var2 > 0) { + int var4 = 0; + int var5 = var2 - 1; + + do { + int var6 = var5 + var4 >> 1; + if (var1 < (float)this.field1258[var6].field1217) { + if (var1 > (float)this.field1258[var6 - 1].field1217) { + var3 = var6 - 1; + break; + } + + var5 = var6 - 1; + } else { + if (var1 <= (float)this.field1258[var6].field1217) { + var3 = var6; + break; + } + + if (var1 < (float)this.field1258[var6 + 1].field1217) { + var3 = var6; + break; + } + + var4 = var6 + 1; + } + } while(var4 <= var5); + } + + if (var3 != this.field1273) { + this.field1273 = var3; + this.field1253 = true; + } + + return this.field1273; + } else { + return -1; } + } else { + return this.field1273; } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(FI)Leq;", + garbageValue = "-1779778637" + ) + class126 method721(float var1) { + int var2 = this.method720(var1); + return var2 >= 0 && var2 < this.field1258.length ? this.field1258[var2] : null; + } - return var0; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1866632408" + ) + int method722() { + return this.field1258 == null ? 0 : this.field1258.length; } - @ObfuscatedName("mu") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1460663579" + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lto;", + garbageValue = "-575413864" ) - static boolean method707(int var0) { - for (int var1 = 0; var1 < Client.field533; ++var1) { - if (Client.field577[var1] == var0) { - return true; + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); + if (var3.exists()) { + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); + return var10; + } catch (IOException var9) { } } - return false; + String var4 = ""; + if (class521.cacheGamebuild == 33) { + var4 = "_rc"; + } else if (class521.cacheGamebuild == 34) { + var4 = "_wip"; + } + + File var5 = new File(Login.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); + AccessFile var6; + if (!var2 && var5.exists()) { + try { + var6 = new AccessFile(var5, "rw", 10000L); + return var6; + } catch (IOException var8) { + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); + return var6; + } catch (IOException var7) { + throw new RuntimeException(); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class132.java b/osrs/src/main/java/class132.java index 26695863a..fdd071221 100644 --- a/osrs/src/main/java/class132.java +++ b/osrs/src/main/java/class132.java @@ -1,157 +1,59 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") -public class class132 { - @ObfuscatedName("ac") - boolean field1233; - @ObfuscatedName("al") - boolean field1235; - @ObfuscatedName("ak") +@ObfuscatedName("fa") +public class class132 implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfa;" ) - class130 field1238; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lfj;" - ) - class130 field1239; - @ObfuscatedName("ao") + static final class132 field1279; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[Lef;" + descriptor = "Lfa;" ) - class127[] field1237; - @ObfuscatedName("ah") - boolean field1234; + static final class132 field1276; @ObfuscatedName("ar") - float field1247; - @ObfuscatedName("ab") - float field1241; - @ObfuscatedName("am") - float field1244; - @ObfuscatedName("av") - float field1249; - @ObfuscatedName("ag") - float field1242; - @ObfuscatedName("aa") - float field1240; - @ObfuscatedName("ap") - float field1245; - @ObfuscatedName("ay") - float field1250; - @ObfuscatedName("as") - float field1248; - @ObfuscatedName("aj") - float field1243; - @ObfuscatedName("an") - boolean field1236; - @ObfuscatedName("au") - int field1254; - @ObfuscatedName("ai") - float[] field1252; - @ObfuscatedName("ae") - int field1253; - @ObfuscatedName("aw") - int field1255; - @ObfuscatedName("aq") - float field1246; - @ObfuscatedName("az") - float field1251; - - class132() { - this.field1236 = true; - this.field1254 = 0; - } - - @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lul;II)I", - garbageValue = "-1968596819" + descriptor = "Lfa;" ) - int method709(Buffer var1, int var2) { - int var3 = var1.readUnsignedShort(); - AbstractByteArrayCopier.method1886(var1.readUnsignedByte()); - int var5 = var1.readUnsignedByte(); - class130 var6 = (class130)SequenceDefinition.findEnumerated(class186.method950(), var5); - if (var6 == null) { - var6 = class130.field1221; - } - - this.field1238 = var6; - int var7 = var1.readUnsignedByte(); - class130 var8 = (class130)SequenceDefinition.findEnumerated(class186.method950(), var7); - if (var8 == null) { - var8 = class130.field1221; - } - - this.field1239 = var8; - this.field1233 = var1.readUnsignedByte() != 0; - this.field1237 = new class127[var3]; - class127 var11 = null; - - for (int var9 = 0; var9 < var3; ++var9) { - class127 var10 = new class127(); - var10.method691(var1, var2); - this.field1237[var9] = var10; - if (var11 != null) { - var11.field1194 = var10; - } - - var11 = var10; - } - - return var3; - } - - @ObfuscatedName("al") + static final class132 field1278; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "25701091" + descriptor = "Lfa;" ) - void method710() { - this.field1253 = this.field1237[0].field1200; - this.field1255 = this.field1237[this.method717() - 1].field1200; - this.field1252 = new float[this.method714() + 1]; - - for (int var1 = this.method712(); var1 <= this.method713(); ++var1) { - this.field1252[var1 - this.method712()] = class183.method938(this, (float)var1); - } - - this.field1237 = null; - this.field1246 = class183.method938(this, (float)(this.method712() - 1)); - this.field1251 = class183.method938(this, (float)(this.method713() + 1)); - } - - @ObfuscatedName("ak") + static final class132 field1277; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "-1862749488" + descriptor = "Lfa;" ) - public float method711(int var1) { - if (var1 < this.method712()) { - return this.field1246; - } else { - return var1 > this.method713() ? this.field1251 : this.field1252[var1 - this.method712()]; - } - } - - @ObfuscatedName("ax") + static final class132 field1275; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "103" + descriptor = "Lfa;" ) - int method712() { - return this.field1253; + static final class132 field1280; + @ObfuscatedName("aa") + final int field1281; + @ObfuscatedName("ac") + final int field1282; + @ObfuscatedName("al") + final int field1283; + + static { + field1279 = new class132(0, 0, (String)null, 0); + field1276 = new class132(1, 1, (String)null, 9); + field1278 = new class132(2, 2, (String)null, 3); + field1277 = new class132(3, 3, (String)null, 6); + field1275 = new class132(4, 4, (String)null, 1); + field1280 = new class132(5, 5, (String)null, 3); } - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "115" - ) - int method713() { - return this.field1255; + class132(int var1, int var2, String var3, int var4) { + this.field1281 = var1; + this.field1282 = var2; + this.field1283 = var4; } @ObfuscatedName("ah") @@ -159,88 +61,79 @@ int method713() { descriptor = "(B)I", garbageValue = "-11" ) - int method714() { - return this.method713() - this.method712(); + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1282; } @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(FI)I", - garbageValue = "1249933275" + descriptor = "(I)I", + garbageValue = "361473055" ) - int method715(float var1) { - if (this.field1254 < 0 || (float)this.field1237[this.field1254].field1200 > var1 || this.field1237[this.field1254].field1194 != null && (float)this.field1237[this.field1254].field1194.field1200 <= var1) { - if (var1 >= (float)this.method712() && var1 <= (float)this.method713()) { - int var2 = this.method717(); - int var3 = this.field1254; - if (var2 > 0) { - int var4 = 0; - int var5 = var2 - 1; - - do { - int var6 = var5 + var4 >> 1; - if (var1 < (float)this.field1237[var6].field1200) { - if (var1 > (float)this.field1237[var6 - 1].field1200) { - var3 = var6 - 1; - break; - } - - var5 = var6 - 1; - } else { - if (var1 <= (float)this.field1237[var6].field1200) { - var3 = var6; - break; - } - - if (var1 < (float)this.field1237[var6 + 1].field1200) { - var3 = var6; - break; - } - - var4 = var6 + 1; - } - } while(var4 <= var5); - } + int method725() { + return this.field1283; + } - if (var3 != this.field1254) { - this.field1254 = var3; - this.field1236 = true; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "676709272" + ) + @Export("sortItemsByName") + static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + short var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + short var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; } - - return this.field1254; - } else { - return -1; } - } else { - return this.field1254; + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + sortItemsByName(var0, var1, var2, var5 - 1); + sortItemsByName(var0, var1, var5 + 1, var3); } - } - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(FB)Lef;", - garbageValue = "6" - ) - class127 method716(float var1) { - int var2 = this.method715(var1); - return var2 >= 0 && var2 < this.field1237.length ? this.field1237[var2] : null; } - @ObfuscatedName("am") + @ObfuscatedName("li") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2119570978" + descriptor = "([Lnn;Lnn;ZI)V", + garbageValue = "-2026134195" ) - int method717() { - return this.field1237 == null ? 0 : this.field1237.length; - } + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -1611690517 * -1314049341 : var1.width * -1042121905 * -445269073; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -987590619 * -306771027 : var1.height * -141414333 * 809475179; + UrlRequest.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { + UrlRequest.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); + if (var5 != null) { + NPCComposition.method952(var5.group, var3, var4, var2); + } + + if (var1.contentType == 1337) { + } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1742739576" - ) - public static int method708(int var0, int var1) { - return (var0 << 8) + var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class133.java b/osrs/src/main/java/class133.java index 1b7036fea..df8740e39 100644 --- a/osrs/src/main/java/class133.java +++ b/osrs/src/main/java/class133.java @@ -2,462 +2,152 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; - -@ObfuscatedName("fs") -public class class133 implements class386 { +@ObfuscatedName("fq") +public class class133 implements class383 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lfq;" + ) + static final class133 field1296; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lfq;" + ) + static final class133 field1288; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lfq;" + ) + static final class133 field1294; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lfq;" + ) + static final class133 field1292; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lfq;" + ) + static final class133 field1286; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lfq;" + ) + static final class133 field1297; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lfq;" + ) + static final class133 field1285; @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfq;" ) - static final class133 field1257; + static final class133 field1287; @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfq;" ) - static final class133 field1260; - @ObfuscatedName("ak") + static final class133 field1291; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lfq;" + ) + static final class133 field1301; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfq;" ) - static final class133 field1259; + static final class133 field1293; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lfq;" + ) + static final class133 field1298; @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfq;" ) - static final class133 field1262; - @ObfuscatedName("ao") + static final class133 field1299; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfq;" ) - static final class133 field1261; - @ObfuscatedName("ah") + static final class133 field1295; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfq;" ) - static final class133 field1258; - @ObfuscatedName("oj") + static final class133 field1300; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lcf;" + descriptor = "Lfq;" ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("ar") - final int field1265; - @ObfuscatedName("ab") - final int field1263; - @ObfuscatedName("am") - final int field1264; - - static { - field1257 = new class133(0, 0, (String)null, 0); - field1260 = new class133(1, 1, (String)null, 9); - field1259 = new class133(2, 2, (String)null, 3); - field1262 = new class133(3, 3, (String)null, 6); - field1261 = new class133(4, 4, (String)null, 1); - field1258 = new class133(5, 5, (String)null, 3); - } - - class133(int var1, int var2, String var3, int var4) { - this.field1265 = var1; - this.field1263 = var2; - this.field1264 = var4; - } - - @ObfuscatedName("ac") + static final class133 field1290; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "Lfq;" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1263; - } - - @ObfuscatedName("ab") + static final class133 field1289; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2025897930" + descriptor = "Ljt;" ) - int method718() { - return this.field1264; + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("am") + final int field1303; + @ObfuscatedName("aq") + final int field1304; + @ObfuscatedName("ai") + final int field1302; + + static { + field1296 = new class133(0, 0, (String)null, -1, -1); + field1288 = new class133(1, 1, (String)null, 0, 2); + field1294 = new class133(2, 2, (String)null, 1, 2); + field1292 = new class133(3, 3, (String)null, 2, 2); + field1286 = new class133(4, 4, (String)null, 3, 1); + field1297 = new class133(5, 5, (String)null, 4, 1); + field1285 = new class133(6, 6, (String)null, 5, 1); + field1287 = new class133(7, 7, (String)null, 6, 3); + field1291 = new class133(8, 8, (String)null, 7, 3); + field1301 = new class133(9, 9, (String)null, 8, 3); + field1293 = new class133(10, 10, (String)null, 0, 7); + field1298 = new class133(11, 11, (String)null, 1, 7); + field1299 = new class133(12, 12, (String)null, 2, 7); + field1295 = new class133(13, 13, (String)null, 3, 7); + field1300 = new class133(14, 14, (String)null, 4, 7); + field1290 = new class133(15, 15, (String)null, 5, 7); + field1289 = new class133(16, 16, (String)null, 0, 5); } - @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IIIIIIII)Z", - garbageValue = "-1116623065" + descriptor = "(IILjava/lang/String;II)V", + garbageValue = "-1" ) - static final boolean method721(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = ViewportMouse.ViewportMouse_y + var6; - if (var7 < var0 && var7 < var1 && var7 < var2) { - return false; - } else { - var7 = ViewportMouse.ViewportMouse_y - var6; - if (var7 > var0 && var7 > var1 && var7 > var2) { - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x + var6; - if (var7 < var3 && var7 < var4 && var7 < var5) { - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x - var6; - return var7 <= var3 || var7 <= var4 || var7 <= var5; - } - } - } + class133(int var1, int var2, String var3, int var4, int var5) { + this.field1303 = var1; + this.field1304 = var2; + this.field1302 = var4; } - @ObfuscatedName("az") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IZII)V", - garbageValue = "-605983244" + descriptor = "(I)I", + garbageValue = "-2145781629" ) - public static final void method720(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { - PcmPlayer.field179 = var0; - class306.PcmPlayer_stereo = var1; - class225.field1884 = var2; - } else { - throw new IllegalArgumentException(); - } + int method729() { + return this.field1302; } - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "941581685" + descriptor = "(B)I", + garbageValue = "-11" ) - static int method722(int var0, Script var1, boolean var2) { - if (var0 == 3200) { - Interpreter.Interpreter_intStackSize -= 3; - GraphicsDefaults.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); - return 1; - } else { - int var3; - int var4; - int var5; - int var6; - int var7; - if (var0 == 3201) { - Interpreter.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - ArrayList var8 = new ArrayList(); - var8.add(var3); - class202.method1006(var8, var4, var5, var6, var7); - return 1; - } else if (var0 == 3202) { - Interpreter.Interpreter_intStackSize -= 2; - class437.playJingle(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else { - class92 var12; - class91 var13; - String var15; - if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { - boolean var16; - if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { - if (var0 == 3211) { - return 1; - } else if (var0 == 3216) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = 0; - class92 var18 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var3); - if (var18 != null) { - var4 = var18 != class92.field889 ? 1 : 0; - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - return 1; - } else if (var0 == 3218) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = 0; - class91 var10 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var3); - if (var10 != null) { - var4 = var10 != class91.field881 ? 1 : 0; - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - return 1; - } else if (var0 != 3217 && var0 != 3219) { - if (var0 == 3220) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - ItemComposition.method1088(var3, var4); - return 1; - } else if (var0 == 3221) { - Interpreter.Interpreter_intStackSize -= 6; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; - ArrayList var9 = new ArrayList(); - var9.add(var3); - var9.add(var4); - class202.method1006(var9, var5, var6, var7, var11); - return 1; - } else if (var0 == 3222) { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - class206.someMusicMethod(var3, var4, var5, var6); - return 1; - } else { - return 2; - } - } else { - var12 = class92.field889; - var13 = class91.field881; - var16 = true; - boolean var17 = true; - if (var0 == 3217) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var7); - if (var12 == null) { - throw new RuntimeException(String.format("Unrecognized device option %d", var7)); - } - } - - if (var0 == 3219) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var7); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized game option %d", var7)); - } - } - - String var14; - byte var19; - if (var13 == class91.field881) { - switch(var12.field896) { - case 1: - case 2: - case 3: - var19 = 0; - var6 = 1; - break; - case 4: - var19 = 0; - var6 = Integer.MAX_VALUE; - break; - case 5: - var19 = 0; - var6 = 100; - break; - default: - var14 = String.format("Unkown device option: %s.", var12.toString()); - throw new RuntimeException(var14); - } - } else { - switch(var13.field886) { - case 1: - var19 = 0; - var6 = 1; - break; - case 2: - case 3: - case 4: - var19 = 0; - var6 = 100; - break; - default: - var14 = String.format("Unkown game option: %s.", var13.toString()); - throw new RuntimeException(var14); - } - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var19; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; - return 1; - } - } else { - var12 = class92.field889; - var13 = class91.field881; - var16 = false; - if (var0 == 3214) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var6); - if (var12 == null) { - throw new RuntimeException(String.format("Unrecognized device option %d", var6)); - } - } - - if (var0 == 3215) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized game option %d", var6)); - } - } - - if (var0 == 3210) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var6); - if (var12 == null) { - var13 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized client option %d", var6)); - } - } - } else if (var0 == 3182) { - var12 = class92.field890; - } else if (var0 == 3204) { - var13 = class91.field882; - } else if (var0 == 3206) { - var13 = class91.field885; - } else if (var0 == 3208) { - var13 = class91.field884; - } - - if (var13 == class91.field881) { - switch(var12.field896) { - case 1: - var5 = class91.clientPreferences.getIsUsernameHidden() ? 1 : 0; - break; - case 2: - var5 = class91.clientPreferences.getTitleMusicDisabled() ? 1 : 0; - break; - case 3: - var5 = class91.clientPreferences.method546() ? 1 : 0; - break; - case 4: - var5 = class91.clientPreferences.method548(); - break; - case 5: - var5 = FaceNormal.method1334(); - break; - default: - var15 = String.format("Unkown device option: %s.", var12.toString()); - throw new RuntimeException(var15); - } - } else { - switch(var13.field886) { - case 1: - var5 = class91.clientPreferences.getRoofsHidden() ? 1 : 0; - break; - case 2: - var6 = class91.clientPreferences.getCurrentMusicVolume(); - var5 = Math.round((float)(var6 * 100) / 255.0F); - break; - case 3: - var6 = class91.clientPreferences.getCurrentSoundEffectsVolume(); - var5 = Math.round((float)(var6 * 100) / 127.0F); - break; - case 4: - var6 = class91.clientPreferences.getAreaSoundEffectsVolume(); - var5 = Math.round((float)(var6 * 100) / 127.0F); - break; - default: - var15 = String.format("Unkown game option: %s.", var13.toString()); - throw new RuntimeException(var15); - } - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; - return 1; - } - } else { - var12 = class92.field889; - var13 = class91.field881; - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var0 == 3212) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var6); - if (var12 == null) { - throw new RuntimeException(String.format("Unrecognized device option %d", var6)); - } - } - - if (var0 == 3213) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized game option %d", var6)); - } - } - - if (var0 == 3209) { - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = (class92)SequenceDefinition.findEnumerated(class141.method750(), var6); - if (var12 == null) { - var13 = (class91)SequenceDefinition.findEnumerated(class95.method505(), var6); - if (var13 == null) { - throw new RuntimeException(String.format("Unrecognized client option %d", var6)); - } - } - } else if (var0 == 3181) { - var12 = class92.field890; - } else if (var0 == 3203) { - var13 = class91.field882; - } else if (var0 == 3205) { - var13 = class91.field885; - } else if (var0 == 3207) { - var13 = class91.field884; - } - - if (var13 == class91.field881) { - switch(var12.field896) { - case 1: - class91.clientPreferences.setIsUsernameHidden(var5 == 1); - break; - case 2: - class91.clientPreferences.getTitleMusicDisabled(var5 == 1); - break; - case 3: - class91.clientPreferences.method544(var5 == 1); - break; - case 4: - if (var5 < 0) { - var5 = 0; - } - - class91.clientPreferences.method547(var5); - break; - case 5: - FontName.method2482(var5); - break; - default: - var15 = String.format("Unkown device option: %s.", var12.toString()); - throw new RuntimeException(var15); - } - } else { - switch(var13.field886) { - case 1: - class91.clientPreferences.setRoofsHidden(var5 == 1); - break; - case 2: - var5 = Math.min(Math.max(var5, 0), 100); - var6 = Math.round((float)(var5 * 255) / 100.0F); - JagexCache.method921(var6); - break; - case 3: - var5 = Math.min(Math.max(var5, 0), 100); - var6 = Math.round((float)(var5 * 127) / 100.0F); - FloorOverlayDefinition.method1114(var6); - break; - case 4: - var5 = Math.min(Math.max(var5, 0), 100); - var6 = Math.round((float)(var5 * 127) / 100.0F); - class198.method994(var6); - break; - default: - var15 = String.format("Unkown game option: %s.", var13.toString()); - throw new RuntimeException(var15); - } - } - - return 1; - } - } - } + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1304; } } \ No newline at end of file diff --git a/osrs/src/main/java/class134.java b/osrs/src/main/java/class134.java index 49b73706e..5d5b4a9f6 100644 --- a/osrs/src/main/java/class134.java +++ b/osrs/src/main/java/class134.java @@ -2,298 +2,177 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") -public class class134 implements class386 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1268; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1273; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1272; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1281; +import java.util.concurrent.Callable; + +@ObfuscatedName("fe") +class class134 implements Callable { @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1276; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1270; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1278; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1267; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1274; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1280; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "[Lup;" ) - static final class134 field1269; - @ObfuscatedName("aa") + @Export("runesSprite") + static IndexedSprite[] runesSprite; + @ObfuscatedName("ko") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "[Lup;" ) - static final class134 field1266; - @ObfuscatedName("ap") + static IndexedSprite[] field1307; + @ObfuscatedName("uc") + @Export("cameraLookAtAcceleration") + static int cameraMoveToAcceleration; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lfo;" ) - static final class134 field1277; - @ObfuscatedName("ay") + @Export("this$0") + @ObfuscatedName("this$0") + final class139 this$0; + // $FF: synthetic field + @Export("val$workStart") + @ObfuscatedName("val$workStart") + final int val$workStart; + // $FF: synthetic field + @Export("val$workEnd") + @ObfuscatedName("val$workEnd") + final int val$workEnd; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "[Lfd;" ) - static final class134 field1282; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1279; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static final class134 field1271; - @ObfuscatedName("an") + @Export("val$curveLoadJobs") + @ObfuscatedName("val$curveLoadJobs") + final class130[] val$curveLoadJobs; + @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "(Lfo;II[Lfd;)V" ) - static final class134 field1275; - @ObfuscatedName("au") - final int field1285; - @ObfuscatedName("ai") - final int field1284; - @ObfuscatedName("ae") - final int field1283; - - static { - field1268 = new class134(0, 0, (String)null, -1, -1); - field1273 = new class134(1, 1, (String)null, 0, 2); - field1272 = new class134(2, 2, (String)null, 1, 2); - field1281 = new class134(3, 3, (String)null, 2, 2); - field1276 = new class134(4, 4, (String)null, 3, 1); - field1270 = new class134(5, 5, (String)null, 4, 1); - field1278 = new class134(6, 6, (String)null, 5, 1); - field1267 = new class134(7, 7, (String)null, 6, 3); - field1274 = new class134(8, 8, (String)null, 7, 3); - field1280 = new class134(9, 9, (String)null, 8, 3); - field1269 = new class134(10, 10, (String)null, 0, 7); - field1266 = new class134(11, 11, (String)null, 1, 7); - field1277 = new class134(12, 12, (String)null, 2, 7); - field1282 = new class134(13, 13, (String)null, 3, 7); - field1279 = new class134(14, 14, (String)null, 4, 7); - field1271 = new class134(15, 15, (String)null, 5, 7); - field1275 = new class134(16, 16, (String)null, 0, 5); + class134(class139 var1, int var2, int var3, class130[] var4) { + this.this$0 = var1; + this.val$workStart = var2; + this.val$workEnd = var3; + this.val$curveLoadJobs = var4; } - @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;II)V", - garbageValue = "-1" - ) - class134(int var1, int var2, String var3, int var4, int var5) { - this.field1285 = var1; - this.field1284 = var2; - this.field1283 = var4; + @Export("call") + @ObfuscatedName("call") + public Object call() { + for (int var1 = this.val$workStart; var1 < this.val$workEnd; ++var1) { + this.val$curveLoadJobs[var1].call(); + } + + return null; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(IIII)Z", + garbageValue = "392757608" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1284; + static boolean method730(int var0, int var1, int var2) { + return var0 >= 0 && var0 < 4 && var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104; } @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-232140937" + descriptor = "(II)I", + garbageValue = "-1168679162" ) - int method724() { - return this.field1283; + public static int method731(int var0) { + return (var0 & class520.field4148) - 1; } - @ObfuscatedName("as") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "385720754" + descriptor = "(ILdt;ZI)I", + garbageValue = "1497825445" ) - static int method725(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - if (var0 == 1600) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; + static int method732(int var0, Script var1, boolean var2) { + if (var0 == 6200) { + DbTableType.Interpreter_intStackSize -= 2; + Client.field640 = (short)class354.method1896(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]); + if (Client.field640 <= 0) { + Client.field640 = 256; + } + + Client.field636 = (short)class354.method1896(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + if (Client.field636 <= 0) { + Client.field636 = 256; + } + return 1; - } else if (var0 == 1601) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; + } else if (var0 == 6201) { + DbTableType.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } + return 1; - } else { - class344 var7; - if (var0 == 1602) { - if (var3.type == 12) { - var7 = var3.method1877(); - if (var7 != null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7.method1811().method2070(); - return 1; - } - } + } else if (var0 == 6202) { + DbTableType.Interpreter_intStackSize -= 4; + Client.field639 = (short)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + if (Client.field639 <= 0) { + Client.field639 = 1; + } - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == 1603) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == 1604) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == 1605) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == 1606) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == 1607) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == 1608) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == 1609) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 1610) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == 1611) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == 1612) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 1613) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == 1614) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else { - class339 var4; - if (var0 == 1617) { - var4 = var3.method1878(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2923 * -1501316877 * 383918139 : 0; - } + Client.field637 = (short)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + if (Client.field637 <= 0) { + Client.field637 = 32767; + } else if (Client.field637 < Client.field639) { + Client.field637 = Client.field639; + } - if (var0 == 1618) { - var4 = var3.method1878(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2925 * 1245217763 * 1917639115 : 0; - return 1; - } else if (var0 == 1619) { - var7 = var3.method1877(); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1812().method2070() : ""; - return 1; - } else if (var0 == 1620) { - var4 = var3.method1878(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 != null ? var4.field2924 * 1697101243 * 2044708723 : 0; - return 1; - } else if (var0 == 1621) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1822() : 0; - return 1; - } else if (var0 == 1622) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1823() : 0; - return 1; - } else if (var0 == 1623) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1824() : 0; - return 1; - } else if (var0 == 1624) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1814() ? 1 : 0; - return 1; - } else if (var0 != 1625) { - if (var0 == 1626) { - var7 = var3.method1877(); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1813().method2145() : ""; - return 1; - } else if (var0 == 1627) { - var7 = var3.method1877(); - int var5 = var7 != null ? var7.method1818() : 0; - int var6 = var7 != null ? var7.method1817() : 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.min(var5, var6); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.max(var5, var6); - return 1; - } else if (var0 == 1628) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1817() : 0; - return 1; - } else if (var0 == 1629) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1826() : 0; - return 1; - } else if (var0 == 1630) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1825() : 0; - return 1; - } else if (var0 == 1631) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1827() : 0; - return 1; - } else if (var0 == 1632) { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null ? var7.method1828() : 0; - return 1; - } else { - class27 var8; - if (var0 == 1633) { - var8 = var3.method1879(); - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method105(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; - return 1; - } else if (var0 == 1634) { - var8 = var3.method1879(); - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = var8 != null ? var8.method106((char)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]) : 0; - return 1; - } else { - return 2; - } - } - } else { - var7 = var3.method1877(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7 != null && var7.method1815() ? 1 : 0; - return 1; - } + Client.field638 = (short)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + if (Client.field638 <= 0) { + Client.field638 = 1; } + + Client.field634 = (short)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + if (Client.field634 <= 0) { + Client.field634 = 32767; + } else if (Client.field634 < Client.field638) { + Client.field634 = Client.field638; + } + + return 1; + } else if (var0 == 6203) { + if (Client.viewportWidget != null) { + class348.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.viewportHeight; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } else if (var0 == 6204) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == 6205) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class142.method758(Client.field640); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class142.method758(Client.field636); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Language.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class47.canvasHeight; + return 1; + } else { + return 2; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class135.java b/osrs/src/main/java/class135.java index ee9023574..f726be2f6 100644 --- a/osrs/src/main/java/class135.java +++ b/osrs/src/main/java/class135.java @@ -1,151 +1,85 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") -public class class135 implements class126 { - @ObfuscatedName("ac") - static long field1287; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("HitSplatDefinition_fontsArchive") - static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("ag") - @Export("Tiles_saturation") - static int[] Tiles_saturation; +import java.util.ArrayList; - @ObfuscatedName("ac") +@ObfuscatedName("ff") +public class class135 implements class125 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "-338736773" + descriptor = "(Lol;Lol;IZB)Lko;", + garbageValue = "1" ) - public static byte[] method726(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var6 = (byte[])((byte[])var0); - if (var1) { - int var4 = var6.length; - byte[] var5 = new byte[var4]; - System.arraycopy(var6, 0, var5, 0, var4); - return var5; + public static Frames method733(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; + int[] var5 = var0.getGroupFileIds(var2); + + for (int var6 = 0; var6 < var5.length; ++var6) { + byte[] var7 = var0.getFile(var2, var5[var6]); + if (var7 == null) { + var4 = false; } else { - return var6; - } - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lom;I)V", - garbageValue = "-1763952071" - ) - public static void method727(AbstractArchive var0) { - VarcInt.VarcInt_archive = var0; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZB)Z", - garbageValue = "-89" - ) - static boolean method728(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - return false; - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - return false; - } - + int var8 = (var7[0] & 255) << 8 | var7[1] & 255; + byte[] var9; if (var3) { - var10 = -var10; + var9 = var1.getFile(0, var8); + } else { + var9 = var1.getFile(var8, 0); } - int var9 = var10 + var5 * var1; - if (var9 / var1 != var5) { - return false; + if (var9 == null) { + var4 = false; } - - var5 = var9; - var4 = true; } + } - return var4; + if (!var4) { + return null; } else { - throw new IllegalArgumentException("" + var1); + try { + return new Frames(var0, var1, var2, var3); + } catch (Exception var11) { + return null; + } } } - @ObfuscatedName("av") + @ObfuscatedName("if") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "-9" + descriptor = "(Ljava/util/ArrayList;IIIIB)V", + garbageValue = "112" ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } - - @ObfuscatedName("ky") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "30" - ) - static final void method730(int var0, int var1) { - if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { - if (Client.showMouseOverText) { - int var2 = AttackOption.method609(); - String var3; - if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { - var3 = "Use" + " " + Client.field598 + " " + "->"; - } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { - var3 = Client.field599 + " " + Client.field600 + " " + "->"; + static void method734(ArrayList var0, int var1, int var2, int var3, int var4) { + if (!var0.isEmpty()) { + int var5 = (Integer)var0.get(0); + if (var5 == -1 && !Client.playingJingle) { + WorldMapManager.method1265(0, 0); + } else if (var5 != -1) { + boolean var6; + if (class316.field2787.isEmpty()) { + var6 = false; } else { - var3 = class169.method882(var2); + MusicSong var7 = (MusicSong)class316.field2787.get(0); + var6 = var7 != null && var5 == var7.musicTrackGroupId; } - if (Client.menuOptionsCount > 2) { - var3 = var3 + Client.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; - } + if (!var6 && WorldMapIcon_1.clientPreferences.getCurrentMusicVolume() != 0) { + ArrayList var9 = new ArrayList(); - SoundCache.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); + for (int var8 = 0; var8 < var0.size(); ++var8) { + var9.add(new MusicSong(class514.archive6, (Integer)var0.get(var8), 0, WorldMapIcon_1.clientPreferences.getCurrentMusicVolume(), false)); + } + + if (Client.playingJingle) { + class316.field2787.clear(); + class316.field2787.addAll(var9); + EnumComposition.method925(var1, var2, var3, var4); + } else { + PendingSpawn.method505(var9, var1, var2, var3, var4, false); + } + } } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class136.java b/osrs/src/main/java/class136.java index de31e084c..fe0101635 100644 --- a/osrs/src/main/java/class136.java +++ b/osrs/src/main/java/class136.java @@ -1,173 +1,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import java.util.concurrent.Callable; +import java.util.concurrent.ThreadFactory; -@ObfuscatedName("fo") -class class136 implements Callable { - @ObfuscatedName("us") - @ObfuscatedSignature( - descriptor = "Lcg;" - ) - @Export("decimator") - static Decimator decimator; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lfk;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final class139 this$0; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lul;" - ) - @Export("val$p") - @ObfuscatedName("val$p") - final Buffer val$p; - // $FF: synthetic field - @Export("val$version") - @ObfuscatedName("val$version") - final int val$version; - - @ObfuscatedSignature( - descriptor = "(Lfk;Lul;I)V" - ) - class136(class139 var1, Buffer var2, int var3) { - this.this$0 = var1; - this.val$p = var2; - this.val$version = var3; - } - - @Export("call") - @ObfuscatedName("call") - public Object call() { - this.this$0.method736(this.val$p, this.val$version); - return null; - } - - @ObfuscatedName("jr") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1884389430" - ) - static final int method731() { - if (class91.clientPreferences.getRoofsHidden()) { - return class87.Client_plane; - } else { - int var0 = 3; - if (class365.cameraPitch < 310) { - int var1; - int var2; - if (Client.oculusOrbState == 1) { - var1 = ChatChannel.oculusOrbFocalPointX >> 7; - var2 = AbstractWorldMapData.oculusOrbFocalPointY >> 7; - } else { - var1 = TextureProvider.localPlayer.x >> 7; - var2 = TextureProvider.localPlayer.y >> 7; - } - - int var3 = Client.cameraX >> 7; - int var4 = WorldMapArea.cameraZ >> 7; - if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { - return class87.Client_plane; - } - - if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { - return class87.Client_plane; - } - - if ((Tiles.Tiles_renderFlags[class87.Client_plane][var3][var4] & 4) != 0) { - var0 = class87.Client_plane; - } - - int var5; - if (var1 > var3) { - var5 = var1 - var3; - } else { - var5 = var3 - var1; - } - - int var6; - if (var2 > var4) { - var6 = var2 - var4; - } else { - var6 = var4 - var2; - } - - int var7; - int var8; - if (var5 > var6) { - var7 = var6 * 65536 / var5; - var8 = 32768; - - while (var1 != var3) { - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[class87.Client_plane][var3][var4] & 4) != 0) { - var0 = class87.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[class87.Client_plane][var3][var4] & 4) != 0) { - var0 = class87.Client_plane; - } - } - } - } else if (var6 > 0) { - var7 = var5 * 65536 / var6; - var8 = 32768; - - while (var4 != var2) { - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[class87.Client_plane][var3][var4] & 4) != 0) { - var0 = class87.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[class87.Client_plane][var3][var4] & 4) != 0) { - var0 = class87.Client_plane; - } - } - } - } - } - - if (TextureProvider.localPlayer.x >= 0 && TextureProvider.localPlayer.y >= 0 && TextureProvider.localPlayer.x < 13312 && TextureProvider.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[class87.Client_plane][TextureProvider.localPlayer.x >> 7][TextureProvider.localPlayer.y >> 7] & 4) != 0) { - var0 = class87.Client_plane; - } - - return var0; - } else { - return class87.Client_plane; - } - } +@ObfuscatedName("fb") +final class class136 implements ThreadFactory { + @Export("newThread") + @ObfuscatedName("newThread") + public Thread newThread(Runnable var1) { + return new Thread(var1, "OSRS Maya Anim Load"); } } \ No newline at end of file diff --git a/osrs/src/main/java/class137.java b/osrs/src/main/java/class137.java new file mode 100644 index 000000000..ebcdb2384 --- /dev/null +++ b/osrs/src/main/java/class137.java @@ -0,0 +1,101 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fr") +public class class137 { + @ObfuscatedName("ar") + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(CB)B", + garbageValue = "71" + ) + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + 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; + } + + return var1; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lnn;II)V", + garbageValue = "-2139904797" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field3003 == null) { + throw new RuntimeException(); + } else { + if (var0.field3080 == null) { + var0.field3080 = new int[var0.field3003.length]; + } + + var0.field3080[var1] = Integer.MAX_VALUE; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class138.java b/osrs/src/main/java/class138.java index 2ba7bd84f..9d94b0ca1 100644 --- a/osrs/src/main/java/class138.java +++ b/osrs/src/main/java/class138.java @@ -6,88 +6,265 @@ @ObfuscatedName("fi") class class138 implements Callable { - @ObfuscatedName("we") - @Export("foundItemIds") - static short[] foundItemIds; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfk;" + descriptor = "Lfo;" ) @Export("this$0") @ObfuscatedName("this$0") final class139 this$0; // $FF: synthetic field - @Export("val$workStart") - @ObfuscatedName("val$workStart") - final int val$workStart; - // $FF: synthetic field - @Export("val$workEnd") - @ObfuscatedName("val$workEnd") - final int val$workEnd; - // $FF: synthetic field @ObfuscatedSignature( - descriptor = "[Lfh;" + descriptor = "Luj;" ) - @Export("val$curveLoadJobs") - @ObfuscatedName("val$curveLoadJobs") - final class131[] val$curveLoadJobs; + @Export("val$p") + @ObfuscatedName("val$p") + final Buffer val$p; + // $FF: synthetic field + @Export("val$version") + @ObfuscatedName("val$version") + final int val$version; @ObfuscatedSignature( - descriptor = "(Lfk;II[Lfh;)V" + descriptor = "(Lfo;Luj;I)V" ) - class138(class139 var1, int var2, int var3, class131[] var4) { + class138(class139 var1, Buffer var2, int var3) { this.this$0 = var1; - this.val$workStart = var2; - this.val$workEnd = var3; - this.val$curveLoadJobs = var4; + this.val$p = var2; + this.val$version = var3; } @Export("call") @ObfuscatedName("call") public Object call() { - for (int var1 = this.val$workStart; var1 < this.val$workEnd; ++var1) { - this.val$curveLoadJobs[var1].call(); - } - + this.this$0.method740(this.val$p, this.val$version); return null; } - @ObfuscatedName("ac") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lom;Lom;Lom;I)V", - garbageValue = "1994646383" + descriptor = "(B)V", + garbageValue = "0" ) - public static void method732(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - class295.SequenceDefinition_archive = var0; - SequenceDefinition.SequenceDefinition_animationsArchive = var1; - SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; + public static void method737() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); } - @ObfuscatedName("ak") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1830136563" + descriptor = "(ILdt;ZI)I", + garbageValue = "721798432" ) - public static void method733(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; - } + static int method738(int var0, Script var1, boolean var2) { + if (var0 == 6500) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class241.loadWorlds() ? 1 : 0; + return 1; + } else { + World var3; + if (var0 == 6501) { + var3 = Language.worldListStart(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1629606373" - ) - static int method734() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - int var0 = 0; + return 1; + } else if (var0 == 6502) { + var3 = WorldMapData_0.getNextWorldListWorld(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else { + World var4; + int var5; + int var7; + if (var0 == 6506) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var4 = null; + + for (var5 = 0; var5 < World.World_count; ++var5) { + if (var7 == class361.World_worlds[var5].id) { + var4 = class361.World_worlds[var5]; + break; + } + } - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + if (var4 != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 6507) { + DbTableType.Interpreter_intStackSize -= 4; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3] == 1; + PacketWriter.sortWorldList(var7, var10, var5, var6); + return 1; + } else if (var0 != 6511) { + if (var0 == 6512) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + return 1; + } else { + int var8; + ParamComposition var9; + if (var0 == 6513) { + DbTableType.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var9 = Frames.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = VerticalAlignment.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = VerticalAlignment.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6514) { + DbTableType.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var9 = Frames.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = WorldMapSection2.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapSection2.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6515) { + DbTableType.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var9 = Frames.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = class214.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6516) { + DbTableType.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var9 = Frames.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = UserList.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = UserList.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == 6518) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == 6519) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.clientType; + return 1; + } else if (var0 == 6520) { + return 1; + } else if (var0 == 6521) { + return 1; + } else if (var0 == 6522) { + --class127.Interpreter_stringStackSize; + --DbTableType.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --class127.Interpreter_stringStackSize; + --DbTableType.Interpreter_intStackSize; + return 1; + } else if (var0 == 6524) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 6525) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == 6526) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == 6527) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.field424; + return 1; + } else { + return 2; + } + } + } else { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var7 >= 0 && var7 < World.World_count) { + var4 = class361.World_worlds[var7]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } } + } + } - return var0 * 10000 / Client.field551; - } else { - return 10000; + @ObfuscatedName("nu") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1926894842" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { + PacketBufferNode var1 = class113.getPacketBufferNode(ClientPacket.f22, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(ClanChannel.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } } \ No newline at end of file diff --git a/osrs/src/main/java/class139.java b/osrs/src/main/java/class139.java index 2e8b11ff9..c863e51e6 100644 --- a/osrs/src/main/java/class139.java +++ b/osrs/src/main/java/class139.java @@ -1,145 +1,164 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.File; import java.io.IOException; -import java.io.RandomAccessFile; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Future; +import java.util.concurrent.ThreadPoolExecutor; -@ObfuscatedName("fk") +@ObfuscatedName("fo") public class class139 extends DualNode { @ObfuscatedName("ac") - int field1293; - @ObfuscatedName("al") + static ThreadPoolExecutor field1309; + @ObfuscatedName("at") + int field1313; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[[Lfz;" + descriptor = "[[Lfm;" ) - public class132[][] field1297; - @ObfuscatedName("ak") + public class131[][] field1316; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "[[Lfz;" + descriptor = "[[Lfm;" ) - class132[][] field1292; - @ObfuscatedName("ax") + class131[][] field1311; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lkd;" ) - public Skeleton field1298; - @ObfuscatedName("ao") - int field1294; - @ObfuscatedName("ah") - boolean field1291; - @ObfuscatedName("am") - Future field1296; - @ObfuscatedName("av") - List field1295; + public Skeleton field1317; + @ObfuscatedName("ab") + int field1312; + @ObfuscatedName("au") + boolean field1310; + @ObfuscatedName("al") + Future field1315; + @ObfuscatedName("az") + List field1314; @ObfuscatedSignature( - descriptor = "(Lom;Lom;IZ)V", - garbageValue = "0" + descriptor = "(Lol;Lol;IZ)V" ) - public class139(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - this.field1297 = null; - this.field1292 = null; - this.field1294 = 0; - this.field1293 = var3; - byte[] var5 = var1.takeFile(this.field1293 >> 16 & 65535, this.field1293 & 65535); + class139(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + this.field1316 = null; + this.field1311 = null; + this.field1312 = 0; + this.field1313 = var3; + byte[] var5 = var1.takeFile(this.field1313 >> 16 & 65535, this.field1313 & 65535); Buffer var6 = new Buffer(var5); int var7 = var6.readUnsignedByte(); int var8 = var6.readUnsignedShort(); - byte[] var9 = var2.getFile(var8, 0); - this.field1298 = new Skeleton(var8, var9); - this.field1295 = new ArrayList(); - this.field1296 = SoundCache.field214.submit(new class136(this, var6, var7)); + byte[] var9; + if (var4) { + var9 = var2.getFile(0, var8); + } else { + var9 = var2.getFile(var8, 0); + } + + this.field1317 = new Skeleton(var8, var9); + this.field1314 = new ArrayList(); + this.field1315 = field1309.submit(new class138(this, var6, var7)); } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;II)V", - garbageValue = "2000104113" + descriptor = "(Luj;II)V", + garbageValue = "-170957792" ) - void method736(Buffer var1, int var2) { + void method740(Buffer var1, int var2) { var1.readUnsignedShort(); var1.readUnsignedShort(); - this.field1294 = var1.readUnsignedByte(); + this.field1312 = var1.readUnsignedByte(); int var3 = var1.readUnsignedShort(); - this.field1292 = new class132[this.field1298.method1276().method1260()][]; - this.field1297 = new class132[this.field1298.method1275()][]; - class131[] var4 = new class131[var3]; + this.field1311 = new class131[this.field1317.method1455().method1439()][]; + this.field1316 = new class131[this.field1317.method1454()][]; + class130[] var4 = new class130[var3]; int var5; int var7; + int var9; for (var5 = 0; var5 < var3; ++var5) { - class133 var6 = class406.method2057(var1.readUnsignedByte()); - var7 = var1.readShortSmart(); - class134 var8 = class179.method927(var1.readUnsignedByte()); - class132 var9 = new class132(); - var9.method709(var1, var2); - var4[var5] = new class131(this, var9, var6, var8, var7); - int var10 = var6.method718(); - class132[][] var11; - if (var6 == class133.field1260) { - var11 = this.field1292; + var7 = var1.readUnsignedByte(); + class132 var8 = (class132)class12.findEnumerated(Language.method1991(), var7); + if (var8 == null) { + var8 = class132.field1279; + } + + var9 = var1.readShortSmart(); + int var11 = var1.readUnsignedByte(); + class133[] var12 = new class133[]{class133.field1296, class133.field1288, class133.field1294, class133.field1292, class133.field1286, class133.field1297, class133.field1285, class133.field1287, class133.field1291, class133.field1301, class133.field1293, class133.field1298, class133.field1299, class133.field1295, class133.field1300, class133.field1290, class133.field1289}; + class133 var13 = (class133)class12.findEnumerated(var12, var11); + if (var13 == null) { + var13 = class133.field1296; + } + + class131 var20 = new class131(); + var20.method714(var1, var2); + var4[var5] = new class130(this, var20, var8, var13, var9); + int var14 = var8.method725(); + class131[][] var15; + if (var8 == class132.field1276) { + var15 = this.field1311; } else { - var11 = this.field1297; + var15 = this.field1316; } - if (var11[var7] == null) { - var11[var7] = new class132[var10]; + if (var15[var9] == null) { + var15[var9] = new class131[var14]; } - if (var6 == class133.field1261) { - this.field1291 = true; + if (var8 == class132.field1275) { + this.field1310 = true; } } - var5 = var3 / MusicPatchPcmStream.field2855; - int var12 = var3 % MusicPatchPcmStream.field2855; - int var13 = 0; + var5 = var3 / FloorDecoration.field2162; + int var16 = var3 % FloorDecoration.field2162; + int var17 = 0; - for (int var14 = 0; var14 < MusicPatchPcmStream.field2855; ++var14) { - var7 = var13; - var13 += var5; - if (var12 > 0) { - ++var13; - --var12; + for (var9 = 0; var9 < FloorDecoration.field2162; ++var9) { + var7 = var17; + var17 += var5; + if (var16 > 0) { + ++var17; + --var16; } - if (var13 == var7) { + if (var17 == var7) { break; } - this.field1295.add(SoundCache.field214.submit(new class138(this, var7, var13, var4))); + this.field1314.add(field1309.submit(new class134(this, var7, var17, var4))); } } - @ObfuscatedName("al") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "2" + descriptor = "(S)Z", + garbageValue = "136" ) - public boolean method738() { - if (this.field1296 == null && this.field1295 == null) { + public boolean method741() { + if (this.field1315 == null && this.field1314 == null) { return true; } else { - if (this.field1296 != null) { - if (!this.field1296.isDone()) { + if (this.field1315 != null) { + if (!this.field1315.isDone()) { return false; } - this.field1296 = null; + this.field1315 = null; } boolean var1 = true; - for (int var2 = 0; var2 < this.field1295.size(); ++var2) { - if (!((Future)this.field1295.get(var2)).isDone()) { + for (int var2 = 0; var2 < this.field1314.size(); ++var2) { + if (!((Future)this.field1314.get(var2)).isDone()) { var1 = false; } else { - this.field1295.remove(var2); + this.field1314.remove(var2); --var2; } } @@ -147,115 +166,115 @@ public boolean method738() { if (!var1) { return false; } else { - this.field1295 = null; + this.field1314 = null; return true; } } } - @ObfuscatedName("ak") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-17" + garbageValue = "53" ) - public int method739() { - return this.field1294; + public int method742() { + return this.field1312; } - @ObfuscatedName("ax") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-19" + garbageValue = "-99" ) - public boolean method740() { - return this.field1291; + public boolean method743() { + return this.field1310; } - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILed;III)V", - garbageValue = "2056920821" + descriptor = "(ILej;III)V", + garbageValue = "-685417553" ) - public void method741(int var1, class129 var2, int var3, int var4) { - class465 var5 = ParamComposition.method1053(); - this.method742(var5, var3, var2, var1); - this.method744(var5, var3, var2, var1); - this.method743(var5, var3, var2, var1); - var2.method697(var5); - var5.method2336(); + public void method744(int var1, class128 var2, int var3, int var4) { + class462 var5 = WorldMapDecoration.method1329(); + this.method745(var5, var3, var2, var1); + this.method747(var5, var3, var2, var1); + this.method746(var5, var3, var2, var1); + var2.method701(var5); + var5.method2314(); } - @ObfuscatedName("ah") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lrb;ILed;II)V", - garbageValue = "8414091" + descriptor = "(Lrz;ILej;II)V", + garbageValue = "2098789523" ) - void method742(class465 var1, int var2, class129 var3, int var4) { - float[] var5 = var3.method701(this.field1294); + void method745(class462 var1, int var2, class128 var3, int var4) { + float[] var5 = var3.method705(this.field1312); float var6 = var5[0]; float var7 = var5[1]; float var8 = var5[2]; - if (this.field1292[var2] != null) { - class132 var9 = this.field1292[var2][0]; - class132 var10 = this.field1292[var2][1]; - class132 var11 = this.field1292[var2][2]; + if (this.field1311[var2] != null) { + class131 var9 = this.field1311[var2][0]; + class131 var10 = this.field1311[var2][1]; + class131 var11 = this.field1311[var2][2]; if (var9 != null) { - var6 = var9.method711(var4); + var6 = var9.method716(var4); } if (var10 != null) { - var7 = var10.method711(var4); + var7 = var10.method716(var4); } if (var11 != null) { - var8 = var11.method711(var4); + var8 = var11.method716(var4); } } - class464 var16 = Friend.method2240(); - var16.method2332(1.0F, 0.0F, 0.0F, var6); - class464 var14 = Friend.method2240(); - var14.method2332(0.0F, 1.0F, 0.0F, var7); - class464 var15 = Friend.method2240(); - var15.method2332(0.0F, 0.0F, 1.0F, var8); - class464 var12 = Friend.method2240(); - var12.method2334(var15); - var12.method2334(var16); - var12.method2334(var14); - class465 var13 = ParamComposition.method1053(); - var13.method2347(var12); - var1.method2346(var13); - var16.method2330(); - var14.method2330(); - var15.method2330(); - var12.method2330(); - var13.method2336(); + class461 var16 = class214.method1093(); + var16.method2311(1.0F, 0.0F, 0.0F, var6); + class461 var14 = class214.method1093(); + var14.method2311(0.0F, 1.0F, 0.0F, var7); + class461 var15 = class214.method1093(); + var15.method2311(0.0F, 0.0F, 1.0F, var8); + class461 var12 = class214.method1093(); + var12.method2313(var15); + var12.method2313(var16); + var12.method2313(var14); + class462 var13 = WorldMapDecoration.method1329(); + var13.method2325(var12); + var1.method2324(var13); + var16.method2309(); + var14.method2309(); + var15.method2309(); + var12.method2309(); + var13.method2314(); } - @ObfuscatedName("ar") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lrb;ILed;II)V", - garbageValue = "1859229364" + descriptor = "(Lrz;ILej;II)V", + garbageValue = "1029943917" ) - void method743(class465 var1, int var2, class129 var3, int var4) { - float[] var5 = var3.method702(this.field1294); + void method746(class462 var1, int var2, class128 var3, int var4) { + float[] var5 = var3.method706(this.field1312); float var6 = var5[0]; float var7 = var5[1]; float var8 = var5[2]; - if (this.field1292[var2] != null) { - class132 var9 = this.field1292[var2][3]; - class132 var10 = this.field1292[var2][4]; - class132 var11 = this.field1292[var2][5]; + if (this.field1311[var2] != null) { + class131 var9 = this.field1311[var2][3]; + class131 var10 = this.field1311[var2][4]; + class131 var11 = this.field1311[var2][5]; if (var9 != null) { - var6 = var9.method711(var4); + var6 = var9.method716(var4); } if (var10 != null) { - var7 = var10.method711(var4); + var7 = var10.method716(var4); } if (var11 != null) { - var8 = var11.method711(var4); + var8 = var11.method716(var4); } } @@ -264,186 +283,76 @@ void method743(class465 var1, int var2, class129 var3, int var4) { var1.field3908[14] = var8; } - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lrb;ILed;IB)V", - garbageValue = "2" + descriptor = "(Lrz;ILej;IB)V", + garbageValue = "-43" ) - void method744(class465 var1, int var2, class129 var3, int var4) { - float[] var5 = var3.method703(this.field1294); + void method747(class462 var1, int var2, class128 var3, int var4) { + float[] var5 = var3.method707(this.field1312); float var6 = var5[0]; float var7 = var5[1]; float var8 = var5[2]; - if (this.field1292[var2] != null) { - class132 var9 = this.field1292[var2][6]; - class132 var10 = this.field1292[var2][7]; - class132 var11 = this.field1292[var2][8]; + if (this.field1311[var2] != null) { + class131 var9 = this.field1311[var2][6]; + class131 var10 = this.field1311[var2][7]; + class131 var11 = this.field1311[var2][8]; if (var9 != null) { - var6 = var9.method711(var4); + var6 = var9.method716(var4); } if (var10 != null) { - var7 = var10.method711(var4); + var7 = var10.method716(var4); } if (var11 != null) { - var8 = var11.method711(var4); + var8 = var11.method716(var4); } } - class465 var12 = ParamComposition.method1053(); - var12.method2344(var6, var7, var8); - var1.method2346(var12); - var12.method2336(); + class462 var12 = WorldMapDecoration.method1329(); + var12.method2322(var6, var7, var8); + var1.method2324(var12); + var12.method2314(); } - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "8" + descriptor = "(I)[B", + garbageValue = "-1858381549" ) - public static void method735(String var0, String var1, String var2, int var3, int var4) throws IOException { - if (var1 != null && !var1.isEmpty()) { - var0 = var0 + "-" + var1; - } - - UrlRequester.field1162 = var4; - FileSystem.cacheGamebuild = var3; - - try { - GrandExchangeOfferNameComparator.field3614 = System.getProperty("os.name"); - } catch (Exception var19) { - GrandExchangeOfferNameComparator.field3614 = "Unknown"; - } - - class223.field1863 = GrandExchangeOfferNameComparator.field3614.toLowerCase(); - DevicePcmPlayerProvider.userHomeDirectory = null; + public static byte[] method748() { + byte[] var0 = new byte[24]; try { - DevicePcmPlayerProvider.userHomeDirectory = System.getProperty("jagex.userhome"); - } catch (Exception var18) { - } + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var0); - if (DevicePcmPlayerProvider.userHomeDirectory == null) { - try { - DevicePcmPlayerProvider.userHomeDirectory = System.getProperty("user.home"); - } catch (Exception var17) { + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { } - } - if (DevicePcmPlayerProvider.userHomeDirectory != null) { - DevicePcmPlayerProvider.userHomeDirectory = DevicePcmPlayerProvider.userHomeDirectory + "/"; - } - - try { - if (class223.field1863.startsWith("win")) { - if (DevicePcmPlayerProvider.userHomeDirectory == null) { - DevicePcmPlayerProvider.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (DevicePcmPlayerProvider.userHomeDirectory == null) { - DevicePcmPlayerProvider.userHomeDirectory = System.getenv("HOME"); + if (var1 >= 24) { + throw new IOException(); } - - if (DevicePcmPlayerProvider.userHomeDirectory != null) { - DevicePcmPlayerProvider.userHomeDirectory = DevicePcmPlayerProvider.userHomeDirectory + "/"; + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { + var0[var2] = -1; } - } catch (Exception var16) { } - if (DevicePcmPlayerProvider.userHomeDirectory == null) { - DevicePcmPlayerProvider.userHomeDirectory = "~/"; - } - - FriendsList.field3812 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", DevicePcmPlayerProvider.userHomeDirectory, "/tmp/", ""}; - class27.field74 = new String[]{".jagex_cache_" + FileSystem.cacheGamebuild, ".file_store_" + FileSystem.cacheGamebuild}; - int var13 = 0; - - label107: - while (var13 < 4) { - class500.cacheDir = InvDefinition.method954(var0, var2, var13); - if (!class500.cacheDir.exists()) { - class500.cacheDir.mkdirs(); - } - - File[] var6 = class500.cacheDir.listFiles(); - if (var6 == null) { - break; - } - - File[] var7 = var6; - int var8 = 0; - - while (true) { - if (var8 >= var7.length) { - break label107; - } - - File var9 = var7[var8]; - - boolean var10; - try { - RandomAccessFile var11 = new RandomAccessFile(var9, "rw"); - int var12 = var11.read(); - var11.seek(0L); - var11.write(var12); - var11.seek(0L); - var11.close(); - var10 = true; - } catch (Exception var15) { - var10 = false; - } - - if (!var10) { - ++var13; - break; - } - - ++var8; - } - } - - File var5 = class500.cacheDir; - FileSystem.FileSystem_cacheDir = var5; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; - UserComparator5.method674(); - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(WallDecoration.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(WallDecoration.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - UserComparator8.JagexCache_idxFiles = new BufferedFile[UrlRequester.field1162]; - - for (int var14 = 0; var14 < UrlRequester.field1162; ++var14) { - UserComparator8.JagexCache_idxFiles[var14] = new BufferedFile(new AccessFile(WallDecoration.getFile("main_file_cache.idx" + var14), "rw", 1048576L), 6000, 0); - } - - } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1287194553" - ) - static void method737() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + return var0; } - @ObfuscatedName("ib") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "16777215" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-2047450168" ) - static final void method745() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; - - for (int var2 = 0; var2 < var0; ++var2) { - Player var3 = Client.players[var1[var2]]; - if (var3 != null) { - class6.updateActorSequence(var3, 1); - } - } - + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/class14.java b/osrs/src/main/java/class14.java index 5012ad187..3552f02db 100644 --- a/osrs/src/main/java/class14.java +++ b/osrs/src/main/java/class14.java @@ -2,114 +2,267 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.awt.*; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -@ObfuscatedName("as") +@ObfuscatedName("ay") public class class14 { - @ObfuscatedName("bk") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("by") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("jw") - @ObfuscatedSignature( - descriptor = "Lpu;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("vb") - static int field36; - @ObfuscatedName("ac") - final int field40; - @ObfuscatedName("al") - final String field41; - @ObfuscatedName("ak") - final ThreadFactory field42; - @ObfuscatedName("ax") - final ThreadPoolExecutor field43; + @ObfuscatedName("bj") + protected static String field44; + @ObfuscatedName("at") + final int field45; + @ObfuscatedName("ah") + final String field46; + @ObfuscatedName("ar") + final ThreadFactory field47; + @ObfuscatedName("ao") + final ThreadPoolExecutor field48; public class14(String var1, int var2, int var3) { - this.field41 = var1; - this.field40 = var2; - this.field42 = new class16(this); - this.field43 = this.method46(var3); + this.field46 = var1; + this.field45 = var2; + this.field47 = new class16(this); + this.field48 = this.method53(var3); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;", - garbageValue = "-1100148281" + garbageValue = "1434703627" ) - final ThreadPoolExecutor method46(int var1) { - return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field40), this.field42); + final ThreadPoolExecutor method53(int var1) { + return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field45), this.field47); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lag;B)Lai;", - garbageValue = "26" + descriptor = "(Lap;I)Laq;", + garbageValue = "1326084774" ) - public class18 method47(class10 var1) { - if (this.field43.getQueue().remainingCapacity() <= 0) { - System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field43.getCorePoolSize() + " Queue capacity " + this.field40); + public class18 method54(class10 var1) { + if (this.field48.getQueue().remainingCapacity() <= 0) { + System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field48.getCorePoolSize() + " Queue capacity " + this.field45); return new class18("Queue full"); } else { - class18 var2 = new class18(this.field43.submit(new class19(this, var1))); + class18 var2 = new class18(this.field48.submit(new class19(this, var1))); return var2; } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1393067878" + garbageValue = "-2107542128" ) - public final void method48() { + public final void method56() { try { - this.field43.shutdown(); + this.field48.shutdown(); } catch (Exception var2) { System.err.println("Error shutting down RestRequestService\r\n" + var2); } } - @ObfuscatedName("ay") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(II)Lja;", - garbageValue = "1251737533" + descriptor = "(Ljava/lang/CharSequence;Ltt;I)Ljava/lang/String;", + garbageValue = "-576035634" ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; + public static String method52(CharSequence var0, LoginType var1) { + if (var0 == null) { + return null; } else { - var1 = class163.method852(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); - if (var1 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + int var2 = 0; + + int var3; + for (var3 = var0.length(); var2 < var3 && class489.method2381(var0.charAt(var2)); ++var2) { + } + + while (var3 > var2 && class489.method2381(var0.charAt(var3 - 1))) { + --var3; + } + + int var4 = var3 - var2; + if (var4 >= 1) { + byte var6; + if (var1 == null) { + var6 = 12; + } else { + switch(var1.field4102) { + case 1: + var6 = 20; + break; + default: + var6 = 12; + } + } + + if (var4 <= var6) { + StringBuilder var12 = new StringBuilder(var4); + + for (int var14 = var2; var14 < var3; ++var14) { + char var7 = var0.charAt(var14); + boolean var8; + if (Character.isISOControl(var7)) { + var8 = false; + } else if (KeyHandler.isAlphaNumeric(var7)) { + var8 = true; + } else { + char[] var9 = class505.field4104; + int var10 = 0; + + label68: + while (true) { + char var11; + if (var10 >= var9.length) { + var9 = class505.field4103; + + for (var10 = 0; var10 < var9.length; ++var10) { + var11 = var9[var10]; + if (var11 == var7) { + var8 = true; + break label68; + } + } + + var8 = false; + break; + } + + var11 = var9[var10]; + if (var11 == var7) { + var8 = true; + break; + } + + ++var10; + } + } + + if (var8) { + char var13 = FriendsChat.method2219(var7); + if (var13 != 0) { + var12.append(var13); + } + } + } + + if (var12.length() == 0) { + return null; + } + + return var12.toString(); + } } - return var1; + return null; + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIB)Lco;", + garbageValue = "69" + ) + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-69" + ) + static void method58() { + if (class384.clearLoginScreen) { + Login.titleboxSprite = null; + Login.titlebuttonSprite = null; + class134.runesSprite = null; + class250.leftTitleSprite = null; + Login.rightTitleSprite = null; + Login.logoSprite = null; + Login.title_muteSprite = null; + class310.options_buttons_0Sprite = null; + FriendsList.options_buttons_2Sprite = null; + class108.worldSelectBackSprites = null; + class130.worldSelectFlagSprites = null; + class148.worldSelectArrows = null; + MoveSpeed.worldSelectStars = null; + FadeOutTask.field3749 = null; + EnumComposition.field1505.method524(); + WorldMapManager.method1265(0, 100); + class157.method827().method1954(true); + class384.clearLoginScreen = false; } } - @ObfuscatedName("nl") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-63" + descriptor = "(Luj;IIIIIII)V", + garbageValue = "834175330" ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (class358.friendsChat != null) { - PacketBufferNode var1 = ClanChannelMember.getPacketBufferNode(ClientPacket.CLAN_KICKUSER, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + @Export("loadTerrain") + static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7; + if (class134.method730(var1, var2, var3)) { + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; + + while (true) { + var7 = var0.readUnsignedShort(); + if (var7 == 0) { + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -DevicePcmPlayerProvider.method83(var4 + 932731, var5 + 556238) * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; + } + break; + } + + if (var7 == 1) { + int var8 = var0.readUnsignedByte(); + if (var8 == 1) { + var8 = 0; + } + + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; + } + break; + } + + if (var7 <= 49) { + Interpreter.Tiles_overlays[var1][var2][var3] = (short)var0.readShort(); + ViewportMouse.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); + class369.field3559[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); + } else { + class74.Tiles_underlays[var1][var2][var3] = (short)(var7 - 81); + } + } + } else { + while (true) { + var7 = var0.readUnsignedShort(); + if (var7 == 0) { + break; + } + + if (var7 == 1) { + var0.readUnsignedByte(); + break; + } + + if (var7 <= 49) { + var0.readShort(); + } + } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class140.java b/osrs/src/main/java/class140.java index 23d13d60c..a2aec11ff 100644 --- a/osrs/src/main/java/class140.java +++ b/osrs/src/main/java/class140.java @@ -2,202 +2,97 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.IOException; - -@ObfuscatedName("fy") -public enum class140 implements class386 { - @ObfuscatedName("ac") +@ObfuscatedName("fw") +public enum class140 implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lfy;" + descriptor = "Lfw;" ) - field1301(0, 0), - @ObfuscatedName("al") + field1326(0, 0), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lfy;" + descriptor = "Lfw;" ) - field1304(1, 1), - @ObfuscatedName("ak") + field1322(1, 1), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lfy;" + descriptor = "Lfw;" ) - field1303(2, 2), - @ObfuscatedName("ax") + field1325(2, 2), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lfy;" + descriptor = "Lfw;" ) - field1308(3, 3), - @ObfuscatedName("ao") + field1324(3, 3), + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lfy;" + descriptor = "Lfw;" ) - field1306(4, 4), - @ObfuscatedName("ah") + field1320(4, 4), + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lfy;" + descriptor = "Lfw;" ) - field1302(5, 5), - @ObfuscatedName("ar") + field1327(5, 5), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lfy;" + descriptor = "Lfw;" ) - field1307(6, 6), - @ObfuscatedName("ab") + field1319(6, 6), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lfy;" + descriptor = "Lfw;" ) - field1300(7, 7), - @ObfuscatedName("am") + field1321(7, 7), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lfy;" + descriptor = "Lfw;" ) - field1305(8, 8); + field1323(8, 8); - @ObfuscatedName("tr") + @ObfuscatedName("jp") @ObfuscatedSignature( - descriptor = "Lbm;" + descriptor = "Ltk;" ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("av") - final int field1310; - @ObfuscatedName("ag") - final int field1309; + static Fonts field1318; + @ObfuscatedName("az") + final int field1329; + @ObfuscatedName("ap") + final int field1328; class140(int var3, int var4) { - this.field1310 = var3; - this.field1309 = var4; + this.field1329 = var3; + this.field1328 = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1309; + return this.field1328; } - @ObfuscatedName("hu") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "71" + descriptor = "(II)Lgk;", + garbageValue = "1249641264" ) - @Export("reloadJS5") - static void reloadJS5() { - if (class33.varcs.hasUnwrittenChanges()) { - class33.varcs.write(); - } - - MusicPatchNode2.method1658(); - if (class233.mouseRecorder != null) { - class233.mouseRecorder.isRunning = false; - } - - class233.mouseRecorder = null; - Client.packetWriter.close(); - if (GameEngine.taskHandler != null) { - try { - GameEngine.taskHandler.close(); - } catch (Exception var3) { + public static VarcInt method750(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = class30.VarcInt_archive.takeFile(19, var0); + var1 = new VarcInt(); + if (var2 != null) { + var1.method901(new Buffer(var2)); } - } - - GameEngine.taskHandler = null; - class214.method1052(); - WorldMapSection0.method1551(); - class10.scene.clear(); - for (int var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); + VarcInt.VarcInt_cached.put(var1, (long)var0); + return var1; } - - class434.worldMap = null; - ItemComposition.method1088(0, 0); - class470.method2362(); - Client.playingJingle = false; - SoundCache.method228(); - if (class171.pcmPlayer1 != null) { - class171.pcmPlayer1.shutdown(); - } - - class59.field309.method1969(); - WorldMapDecorationType.method1898(); - if (AbstractWorldMapIcon.urlRequester != null) { - AbstractWorldMapIcon.urlRequester.close(); - } - - HealthBar.method577(); - JagexCache.JagexCache_dat2File = null; - JagexCache.JagexCache_idx255File = null; - UserComparator8.JagexCache_idxFiles = null; - class232.method1192(); - UserComparator10.field1188 = null; - Client.archiveLoaders.clear(); - Client.field551 = 0; - class59.field309 = new JagNetThread(); - AbstractWorldMapIcon.urlRequester = new class115(class159.client.field660, 217); - - try { - class139.method735("oldschool", UserComparator3.field1184, SoundSystem.field211.name, 0, 23); - } catch (IOException var2) { - throw new RuntimeException(var2); - } - - UserComparator10.field1188 = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - GameEngine.taskHandler = new TaskHandler(); - class159.client.method155(); - Client.field416 = class94.field929; - DefaultsGroup.updateGameState(0); - } - - @ObfuscatedName("lu") - @ObfuscatedSignature( - descriptor = "(Lnm;IIZI)V", - garbageValue = "1653848905" - ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; - int var5 = var0.height; - if (var0.widthAlignment == 0) { - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { - var0.width = var0.rawWidth * var1 >> 14; - } - - if (var0.heightAlignment == 0) { - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; - } - - if (var0.widthAlignment == 4) { - var0.width = var0.height * var0.field3017 / var0.field3012; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.field3012 * var0.width / var0.field3017; - } - - if (var0.contentType == 1337) { - Client.viewportWidget = var0; - } - - if (var0.type == 12) { - var0.method1877().method1768(var0.width, var0.height); - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args = var0.onResize; - Client.scriptEvents.addFirst(var6); - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/class141.java b/osrs/src/main/java/class141.java index 7cfff140a..8d498f3df 100644 --- a/osrs/src/main/java/class141.java +++ b/osrs/src/main/java/class141.java @@ -2,274 +2,78 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Date; - -@ObfuscatedName("fn") -public enum class141 implements class386 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - field1311(2, 0), - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - field1313(3, 1), - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - field1312(1, 2), - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - field1315(4, 3), +@ObfuscatedName("fj") +public class class141 extends class144 { + @ObfuscatedName("at") + int field1333; + @ObfuscatedName("ah") + int field1330; + @ObfuscatedName("ar") + int field1332; @ObfuscatedName("ao") + int field1331; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lfv;" ) - field1314(0, 4); + final class147 this$0; - @ObfuscatedName("ah") - public final int field1317; - @ObfuscatedName("ar") - @Export("id") - final int id; - - class141(int var3, int var4) { - this.field1317 = var3; - this.id = var4; + @ObfuscatedSignature( + descriptor = "(Lfv;)V" + ) + class141(class147 var1) { + this.this$0 = var1; + this.field1333 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1333 = var1.readUnsignedShort(); + this.field1330 = var1.readInt(); + this.field1332 = var1.readUnsignedByte(); + this.field1331 = var1.readUnsignedByte(); } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1592727780" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) - public static void method749() { - class202.field1582.clear(); + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method813(this.field1333, this.field1330, this.field1332, this.field1331); } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)[Ldh;", - garbageValue = "-2108098513" + descriptor = "(II)Lgr;", + garbageValue = "931002418" ) - static class92[] method750() { - return new class92[]{class92.field891, class92.field889, class92.field892, class92.field890, class92.field893, class92.field894}; + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); } - @ObfuscatedName("bb") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "1466228430" + descriptor = "(IIB)Z", + garbageValue = "-6" ) - static int method752(int var0, Script var1, boolean var2) { - String var3; - int var4; - if (var0 == 4100) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } else { - String var9; - if (var0 == 4101) { - class180.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else if (var0 == 4102) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3 + AbstractWorldMapData.intToString(var4, true); - return 1; - } else if (var0 == 4103) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; - } else { - int var6; - int var10; - if (var0 == 4104) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - long var11 = (11745L + (long)var10) * 86400000L; - Interpreter.Interpreter_calendar.setTime(new Date(var11)); - var6 = Interpreter.Interpreter_calendar.get(5); - int var17 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; - return 1; - } else if (var0 != 4105) { - if (var0 == 4106) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == 4107) { - class180.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class241.method1265(CollisionMap.compareStrings(Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1], WorldMapLabelSize.clientLanguage)); - return 1; - } else { - int var5; - byte[] var13; - Font var14; - if (var0 == 4108) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var13 = class27.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); - return 1; - } else if (var0 == 4109) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var13 = class27.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); - return 1; - } else if (var0 == 4110) { - class180.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9; - } - - return 1; - } else if (var0 == 4111) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == 4112) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3 + (char)var4; - return 1; - } else if (var0 == 4113) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = StructComposition.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4114) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4115) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class135.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4116) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = IsaacCipher.isDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == 4117) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 4118) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); - return 1; - } else if (var0 == 4119) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - StringBuilder var18 = new StringBuilder(var3.length()); - boolean var16 = false; - - for (var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if (var7 == '<') { - var16 = true; - } else if (var7 == '>') { - var16 = false; - } else if (!var16) { - var18.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var18.toString(); - return 1; - } else if (var0 == 4120) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4); - return 1; - } else if (var0 == 4121) { - class180.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); - return 1; - } else if (var0 == 4122) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else if (var0 == 4123) { - class180.Interpreter_stringStackSize -= 3; - var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; - String var15 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 2]; - if (TextureProvider.localPlayer.appearance == null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var15; - return 1; - } else { - switch(TextureProvider.localPlayer.appearance.field2951) { - case 0: - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3; - break; - case 1: - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9; - break; - case 2: - default: - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var15; - } - - return 1; - } - } else { - return 2; - } - } - } else { - class180.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; - if (TextureProvider.localPlayer.appearance != null && TextureProvider.localPlayer.appearance.field2950 != 0) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var9; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3; - } + static final boolean method755(int var0, int var1) { + ObjectComposition var2 = WorldMapSection2.getObjectDefinition(var0); + if (var1 == 11) { + var1 = 10; + } - return 1; - } - } + if (var1 >= 5 && var1 <= 8) { + var1 = 4; } + + return var2.method1003(var1); } } \ No newline at end of file diff --git a/osrs/src/main/java/class142.java b/osrs/src/main/java/class142.java index d16de69f9..d24fb490a 100644 --- a/osrs/src/main/java/class142.java +++ b/osrs/src/main/java/class142.java @@ -2,65 +2,58 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") -public class class142 extends class145 { - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lpu;" - ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("ac") - int field1319; - @ObfuscatedName("al") - int field1321; - @ObfuscatedName("ak") - int field1320; - @ObfuscatedName("ax") - int field1322; +@ObfuscatedName("fh") +public class class142 extends class144 { + @ObfuscatedName("at") + long field1335; + @ObfuscatedName("ah") + String field1334; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfv;" ) - final class148 this$0; + final class147 this$0; @ObfuscatedSignature( - descriptor = "(Lff;)V" + descriptor = "(Lfv;)V" ) - class142(class148 var1) { + class142(class147 var1) { this.this$0 = var1; - this.field1319 = -1; + this.field1335 = -1L; + this.field1334 = null; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1319 = var1.readUnsignedShort(); - this.field1321 = var1.readInt(); - this.field1320 = var1.readUnsignedByte(); - this.field1322 = var1.readUnsignedByte(); + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1335 = var1.readLong(); + } + + this.field1334 = var1.readStringCp1252NullTerminatedOrNull(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method825(this.field1319, this.field1321, this.field1320, this.field1322); + var1.method804(this.field1335, this.field1334, 0); } - @ObfuscatedName("ac") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(Lom;I)V", - garbageValue = "1595932932" + descriptor = "(IB)I", + garbageValue = "0" ) - public static void method753(AbstractArchive var0) { - StructComposition.StructDefinition_archive = var0; + static int method758(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field717 - 7.0D) * 256.0D); } } \ No newline at end of file diff --git a/osrs/src/main/java/class143.java b/osrs/src/main/java/class143.java index 847f065c3..479a5f5dd 100644 --- a/osrs/src/main/java/class143.java +++ b/osrs/src/main/java/class143.java @@ -2,80 +2,41 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") -public class class143 extends class145 { - @ObfuscatedName("ac") - long field1324; - @ObfuscatedName("al") - String field1323; +@ObfuscatedName("fg") +public class class143 extends class144 { + @ObfuscatedName("at") + int field1336; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfv;" ) - final class148 this$0; + final class147 this$0; @ObfuscatedSignature( - descriptor = "(Lff;)V" + descriptor = "(Lfv;)V" ) - class143(class148 var1) { + class143(class147 var1) { this.this$0 = var1; - this.field1324 = -1L; - this.field1323 = null; + this.field1336 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1324 = var1.readLong(); - } - - this.field1323 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1336 = var1.readUnsignedShort(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method817(this.field1324, this.field1323, 0); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "1171307082" - ) - public static float method756(int var0) { - var0 &= 16383; - return (float)(6.283185307179586D * (double)((float)var0 / 16384.0F)); - } - - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "83" - ) - static final void method759() { - if (class183.ClanChat_inClanChat) { - if (class358.friendsChat != null) { - class358.friendsChat.sort(); - } - - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsInFriendsChat(); - } - - class183.ClanChat_inClanChat = false; - } - + var1.method806(this.field1336); } } \ No newline at end of file diff --git a/osrs/src/main/java/class144.java b/osrs/src/main/java/class144.java index 1ee73118a..e90bc3d1a 100644 --- a/osrs/src/main/java/class144.java +++ b/osrs/src/main/java/class144.java @@ -2,66 +2,54 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fa") -public class class144 extends class145 { - @ObfuscatedName("ac") - int field1325; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lff;" - ) - final class148 this$0; - - @ObfuscatedSignature( - descriptor = "(Lff;)V" - ) - class144(class148 var1) { - this.this$0 = var1; - this.field1325 = -1; +@ObfuscatedName("fl") +public abstract class class144 extends Node { + class144() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1325 = var1.readUnsignedShort(); - } + abstract void vmethod3254(Buffer var1); - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method818(this.field1325); - } + abstract void vmethod3248(ClanSettings var1); - @ObfuscatedName("ax") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1547227801" + descriptor = "(Luj;Ltz;I)Ltz;", + garbageValue = "-1693455974" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; - - try { - var0 = class17.getPreferencesFile("", UrlRequester.field1163.name, true); - Buffer var1 = class91.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); + int var3; + if (var1 == null) { + var3 = class184.method927(var2); + var1 = new IterableNodeHashTable(var3); } - try { - if (var0 != null) { - var0.closeSync(true); + for (var3 = 0; var3 < var2; ++var3) { + boolean var4 = var0.readUnsignedByte() == 1; + int var5 = var0.readMedium(); + Object var6; + if (var4) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); } - } catch (Exception var2) { + + var1.put((Node)var6, (long)var5); } + return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class145.java b/osrs/src/main/java/class145.java index 058f50271..55a9c5563 100644 --- a/osrs/src/main/java/class145.java +++ b/osrs/src/main/java/class145.java @@ -2,47 +2,77 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") -public abstract class class145 extends Node { - class145() { +@ObfuscatedName("fs") +public class class145 extends class144 { + @ObfuscatedName("ar") + @Export("RunException_revision") + public static int RunException_revision; + @ObfuscatedName("fj") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + static Archive field1338; + @ObfuscatedName("at") + int field1340; + @ObfuscatedName("ah") + boolean field1339; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lfv;" + ) + final class147 this$0; + + @ObfuscatedSignature( + descriptor = "(Lfv;)V" + ) + class145(class147 var1) { + this.this$0 = var1; + this.field1340 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) @Export("vmethod3254") - abstract void vmethod3254(Buffer var1); + void vmethod3254(Buffer var1) { + this.field1340 = var1.readUnsignedShort(); + this.field1339 = var1.readUnsignedByte() == 1; + } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) @Export("vmethod3248") - abstract void vmethod3248(ClanSettings var1); + void vmethod3248(ClanSettings var1) { + var1.method812(this.field1340, this.field1339); + } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lom;Lom;I)V", - garbageValue = "1295708638" + descriptor = "(I)V", + garbageValue = "-7051987" ) - public static void method763(AbstractArchive var0, AbstractArchive var1) { - KitDefinition.KitDefinition_archive = var0; - KitDefinition.KitDefinition_modelsArchive = var1; - class403.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + public static void method764() { + class172.field1439.clear(); } - @ObfuscatedName("as") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "245688537" + descriptor = "(FFFFLfm;B)V", + garbageValue = "6" ) - static final void method764(String var0) { - PacketBufferNode var1 = ClanChannelMember.getPacketBufferNode(ClientPacket.FIREND_ADDUSER, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + static void method767(float var0, float var1, float var2, float var3, class131 var4) { + float var5 = var1 - var0; + float var6 = var2 - var1; + float var7 = var3 - var2; + float var8 = var6 - var5; + var4.field1267 = var7 - var6 - var8; + var4.field1265 = var8 + var8 + var8; + var4.field1270 = var5 + var5 + var5; + var4.field1263 = var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class146.java b/osrs/src/main/java/class146.java deleted file mode 100644 index afb63b5ee..000000000 --- a/osrs/src/main/java/class146.java +++ /dev/null @@ -1,65 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fm") -public class class146 extends class145 { - @ObfuscatedName("ac") - int field1327; - @ObfuscatedName("al") - boolean field1326; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lff;" - ) - final class148 this$0; - - @ObfuscatedSignature( - descriptor = "(Lff;)V" - ) - class146(class148 var1) { - this.this$0 = var1; - this.field1327 = -1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" - ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1327 = var1.readUnsignedShort(); - this.field1326 = var1.readUnsignedByte() == 1; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" - ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method824(this.field1327, this.field1326); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1923763150" - ) - static void method768(int var0) { - class464.field3897 = var0; - class464.field3898 = new class464[var0]; - class464.field3896 = 0; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1925208332" - ) - public static boolean method767(int var0) { - return (var0 & 1) != 0; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class147.java b/osrs/src/main/java/class147.java new file mode 100644 index 000000000..88a5b817f --- /dev/null +++ b/osrs/src/main/java/class147.java @@ -0,0 +1,135 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fv") +public class class147 { + @ObfuscatedName("at") + long field1344; + @ObfuscatedName("ah") + public int field1346; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lpm;" + ) + IterableNodeDeque field1345; + + @ObfuscatedSignature( + descriptor = "(Luj;)V" + ) + public class147(Buffer var1) { + this.field1346 = -1; + this.field1345 = new IterableNodeDeque(); + this.method769(var1); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Luj;I)V", + garbageValue = "867669029" + ) + void method769(Buffer var1) { + this.field1344 = var1.readLong(); + this.field1346 = var1.readInt(); + + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + Object var3; + if (var2 == 3) { + var3 = new class166(this); + } else if (var2 == 1) { + var3 = new class142(this); + } else if (var2 == 13) { + var3 = new class159(this); + } else if (var2 == 4) { + var3 = new class151(this); + } else if (var2 == 6) { + var3 = new class158(this); + } else if (var2 == 5) { + var3 = new class143(this); + } else if (var2 == 2) { + var3 = new class148(this); + } else if (var2 == 7) { + var3 = new class141(this); + } else if (var2 == 14) { + var3 = new class145(this); + } else if (var2 == 8) { + var3 = new class162(this); + } else if (var2 == 9) { + var3 = new class168(this); + } else if (var2 == 10) { + var3 = new class154(this); + } else if (var2 == 11) { + var3 = new class149(this); + } else if (var2 == 12) { + var3 = new class153(this); + } else { + if (var2 != 15) { + throw new RuntimeException(""); + } + + var3 = new class163(this); + } + + ((class144)var3).vmethod3254(var1); + this.field1345.addFirst((Node)var3); + } + + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lfc;B)V", + garbageValue = "-115" + ) + public void method770(ClanSettings var1) { + if (var1.field1374 == this.field1344 && this.field1346 == var1.field1385) { + for (class144 var2 = (class144)this.field1345.last(); var2 != null; var2 = (class144)this.field1345.previous()) { + var2.vmethod3248(var1); + } + + ++var1.field1385; + } else { + throw new RuntimeException(""); + } + } + + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "193145278" + ) + static int method771(int var0, Script var1, boolean var2) { + if (var0 == 7463) { + boolean var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class165.method863(var3); + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("np") + @ObfuscatedSignature( + descriptor = "(IIIILuz;Lme;I)V", + garbageValue = "2144355739" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { + int var6 = Client.camAngleY & 2047; + int var7 = var3 * var3 + var2 * var2; + if (var7 <= 6400) { + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var10 = var3 * var8 + var9 * var2 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + if (var7 > 2500) { + var4.method2701(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); + } + + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class148.java b/osrs/src/main/java/class148.java index 6410023e1..9ce6545ff 100644 --- a/osrs/src/main/java/class148.java +++ b/osrs/src/main/java/class148.java @@ -2,207 +2,62 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; -import java.util.Iterator; - -@ObfuscatedName("ff") -public class class148 { - @ObfuscatedName("ux") - @Export("cameraLookAtX") - static int cameraLookAtX; - @ObfuscatedName("ac") - long field1333; - @ObfuscatedName("al") - public int field1335; - @ObfuscatedName("ak") +@ObfuscatedName("fp") +public class class148 extends class144 { + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "[Lup;" ) - IterableNodeDeque field1334; - + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("qj") + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("at") + int field1350; + @ObfuscatedName("ah") + byte field1349; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "Lfv;" ) - public class148(Buffer var1) { - this.field1335 = -1; - this.field1334 = new IterableNodeDeque(); - this.method774(var1); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-2147364614" - ) - void method774(Buffer var1) { - this.field1333 = var1.readLong(); - this.field1335 = var1.readInt(); - - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { - Object var3; - if (var2 == 3) { - var3 = new class167(this); - } else if (var2 == 1) { - var3 = new class143(this); - } else if (var2 == 13) { - var3 = new class160(this); - } else if (var2 == 4) { - var3 = new class152(this); - } else if (var2 == 6) { - var3 = new class159(this); - } else if (var2 == 5) { - var3 = new class144(this); - } else if (var2 == 2) { - var3 = new class149(this); - } else if (var2 == 7) { - var3 = new class142(this); - } else if (var2 == 14) { - var3 = new class146(this); - } else if (var2 == 8) { - var3 = new class163(this); - } else if (var2 == 9) { - var3 = new class169(this); - } else if (var2 == 10) { - var3 = new class155(this); - } else if (var2 == 11) { - var3 = new class150(this); - } else if (var2 == 12) { - var3 = new class154(this); - } else { - if (var2 != 15) { - throw new RuntimeException(""); - } + final class147 this$0; - var3 = new class164(this); - } - - ((class145)var3).vmethod3254(var1); - this.field1334.addFirst((Node)var3); - } - - } - - @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "-170736557" + descriptor = "(Lfv;)V" ) - public void method777(ClanSettings var1) { - if (this.field1333 == var1.field1363 && this.field1335 == var1.field1375) { - for (class145 var2 = (class145)this.field1334.last(); var2 != null; var2 = (class145)this.field1334.previous()) { - var2.vmethod3248(var1); - } - - ++var1.field1375; - } else { - throw new RuntimeException(""); - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)Lhp;", - garbageValue = "-1776229004" - ) - @Export("WorldMapElement_get") - public static WorldMapElement WorldMapElement_get(int var0) { - return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-2128582813" - ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ljava/util/ArrayList;IIIIZB)V", - garbageValue = "7" - ) - public static void method776(ArrayList var0, int var1, int var2, int var3, int var4, boolean var5) { - if (!var0.isEmpty()) { - class319.field2791.clear(); - class319.field2798.clear(); - Script.method449(var5); - GrandExchangeOfferNameComparator.method1979(var0, var5); - if (!class319.field2791.isEmpty()) { - MouseHandler.method177(var1, var2, var3, var4); - class319.field2798.add(new AddRequestTask((SongTask)null)); - class319.field2798.add(new class423((SongTask)null, class319.field2800, class319.field2802, class319.field2801)); - ArrayList var6 = new ArrayList(); - var6.add(new class418(new FadeInTask((SongTask)null, 0, true, class319.field2795))); - if (!class319.musicSongs.isEmpty()) { - ArrayList var7 = new ArrayList(); - var7.add(new DelayFadeTask(new ConcurrentMidiTask((SongTask)null, var6), class319.field2793)); - ArrayList var9 = new ArrayList(); - Iterator var10 = class319.musicSongs.iterator(); - - while (var10.hasNext()) { - MusicSong var11 = (MusicSong)var10.next(); - var9.add(var11); - } - - var7.add(new DelayFadeTask(new FadeOutTask(new class416((SongTask)null, var9), 0, false, class319.field2794), class319.musicPlayerStatus)); - class319.field2798.add(new ConcurrentMidiTask((SongTask)null, var7)); - } else { - class319.field2798.add(new DelayFadeTask((SongTask)null, class319.field2793)); - class319.field2798.add(new ConcurrentMidiTask((SongTask)null, var6)); - } - - } - } + class148(class147 var1) { + this.this$0 = var1; + this.field1350 = -1; } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1919662235" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) - static void method780() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - AbstractWorldMapIcon.setLoginResponseString("", "Please enter your username/email address.", ""); - } else if (Login.Login_password.length() == 0) { - AbstractWorldMapIcon.setLoginResponseString("", "Please enter your password.", ""); - } else { - AbstractWorldMapIcon.setLoginResponseString("", "Connecting to server...", ""); - UserComparator6.method690(false); - DefaultsGroup.updateGameState(20); - } + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1350 = var1.readUnsignedShort(); + this.field1349 = var1.readByte(); } - @ObfuscatedName("ai") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)V", - garbageValue = "49" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) - @Export("setFriendsRank") - static final void setFriendsRank(String var0, int var1) { - PacketBufferNode var2 = ClanChannelMember.getPacketBufferNode(ClientPacket.f2, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.writeByteNeg(var1); - Client.packetWriter.addNode(var2); + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method810(this.field1350, this.field1349); } - @ObfuscatedName("hb") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-54" + descriptor = "(ILdt;ZI)I", + garbageValue = "415376551" ) - static final void method781() { - if (Client.logoutTimer > 0) { - CollisionMap.method1166(); - } else { - Client.timer.method2183(); - DefaultsGroup.updateGameState(40); - class11.field33 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); - } + static int method775(int var0, Script var1, boolean var2) { + return 2; } } \ No newline at end of file diff --git a/osrs/src/main/java/class149.java b/osrs/src/main/java/class149.java index 380d3c1af..e7a397bff 100644 --- a/osrs/src/main/java/class149.java +++ b/osrs/src/main/java/class149.java @@ -2,67 +2,324 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") -public class class149 extends class145 { - @ObfuscatedName("ac") - int field1337; - @ObfuscatedName("al") - byte field1336; +@ObfuscatedName("fk") +public class class149 extends class144 { + @ObfuscatedName("at") + int field1354; + @ObfuscatedName("ah") + int field1351; + @ObfuscatedName("ar") + int field1353; + @ObfuscatedName("ao") + int field1352; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfv;" ) - final class148 this$0; + final class147 this$0; @ObfuscatedSignature( - descriptor = "(Lff;)V" + descriptor = "(Lfv;)V" ) - class149(class148 var1) { + class149(class147 var1) { this.this$0 = var1; - this.field1337 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1337 = var1.readUnsignedShort(); - this.field1336 = var1.readByte(); + this.field1354 = var1.readInt(); + this.field1352 = var1.readInt(); + this.field1351 = var1.readUnsignedByte(); + this.field1353 = var1.readUnsignedByte(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method822(this.field1337, this.field1336); + var1.method815(this.field1354, this.field1352, this.field1351, this.field1353); } - @ObfuscatedName("ak") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(BI)C", - garbageValue = "-1818830164" + descriptor = "(II)Lhz;", + garbageValue = "1206229207" ) - public static char method782(byte var0) { - int var1 = var0 & 255; - if (var1 == 0) { - throw new IllegalArgumentException("" + Integer.toString(var1, 16)); + public static HitSplatDefinition method776(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - if (var1 >= 128 && var1 < 160) { - char var2 = class399.cp1252AsciiExtension[var1 - 128]; - if (var2 == 0) { - var2 = '?'; + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "1559513020" + ) + static int method779(int var0, Script var1, boolean var2) { + if (var0 < 1000) { + return class47.method244(var0, var1, var2); + } else if (var0 < 1100) { + return WidgetDefinition.method1738(var0, var1, var2); + } else if (var0 < 1200) { + return class357.method1899(var0, var1, var2); + } else if (var0 < 1300) { + return class426.method2177(var0, var1, var2); + } else if (var0 < 1400) { + return WorldMapRectangle.method1327(var0, var1, var2); + } else if (var0 < 1500) { + return class1.method3(var0, var1, var2); + } else if (var0 < 1600) { + return ClanChannelMember.method768(var0, var1, var2); + } else if (var0 < 1700) { + return ReflectionCheck.method186(var0, var1, var2); + } else if (var0 < 1800) { + return class30.method133(var0, var1, var2); + } else if (var0 < 1900) { + return ItemComposition.method1031(var0, var1, var2); + } else if (var0 < 2000) { + return UserComparator6.method689(var0, var1, var2); + } else if (var0 < 2100) { + return WidgetDefinition.method1738(var0, var1, var2); + } else if (var0 < 2200) { + return class357.method1899(var0, var1, var2); + } else if (var0 < 2300) { + return class426.method2177(var0, var1, var2); + } else if (var0 < 2400) { + return WorldMapRectangle.method1327(var0, var1, var2); + } else if (var0 < 2500) { + return class1.method3(var0, var1, var2); + } else if (var0 < 2600) { + return class168.method874(var0, var1, var2); + } else if (var0 < 2700) { + return class60.method338(var0, var1, var2); + } else if (var0 < 2800) { + return FloorOverlayDefinition.method1038(var0, var1, var2); + } else if (var0 < 2900) { + return UrlRequester.method651(var0, var1, var2); + } else if (var0 < 3000) { + return UserComparator6.method689(var0, var1, var2); + } else if (var0 < 3200) { + return World.method407(var0, var1, var2); + } else if (var0 < 3300) { + return class159.method837(var0, var1, var2); + } else if (var0 < 3400) { + return class463.method2335(var0, var1, var2); + } else if (var0 < 3500) { + return ApproximateRouteStrategy.method356(var0, var1, var2); + } else if (var0 < 3600) { + return RouteStrategy.method1151(var0, var1, var2); + } else if (var0 < 3700) { + return class350.method1890(var0, var1, var2); + } else if (var0 < 3800) { + return SequenceDefinition.method1055(var0, var1, var2); + } else if (var0 < 3900) { + return WorldMapRectangle.method1328(var0, var1, var2); + } else if (var0 < 4000) { + return Actor.method517(var0, var1, var2); + } else if (var0 < 4100) { + return class422.method2168(var0, var1, var2); + } else if (var0 < 4200) { + return ArchiveDiskAction.method1909(var0, var1, var2); + } else if (var0 < 4300) { + return ObjectSound.method425(var0, var1, var2); + } else if (var0 < 5100) { + return class12.method48(var0, var1, var2); + } else if (var0 < 5400) { + return class72.method434(var0, var1, var2); + } else if (var0 < 5600) { + return SoundSystem.method232(var0, var1, var2); + } else if (var0 < 5700) { + return UserComparator9.method682(var0, var1, var2); + } else if (var0 < 6300) { + return class134.method732(var0, var1, var2); + } else if (var0 < 6600) { + return class138.method738(var0, var1, var2); + } else if (var0 < 6700) { + return SecureRandomCallable.method458(var0, var1, var2); + } else if (var0 < 6800) { + return class344.method1878(var0, var1, var2); + } else if (var0 < 6900) { + return class17.method62(var0, var1, var2); + } else if (var0 < 7000) { + return VerticalAlignment.method959(var0, var1, var2); + } else if (var0 < 7100) { + return class148.method775(var0, var1, var2); + } else if (var0 < 7200) { + return class158.method833(var0, var1, var2); + } else if (var0 < 7300) { + return ScriptEvent.method468(var0, var1, var2); + } else if (var0 < 7500) { + return class147.method771(var0, var1, var2); + } else if (var0 < 7600) { + return class59.method333(var0, var1, var2); + } else if (var0 < 7700) { + return class12.method49(var0, var1, var2); + } else { + return var0 < 8100 ? ModelData0.method1599(var0, var1, var2) : 2; + } + } + + @ObfuscatedName("hr") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-869974291" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + int var1 = Login.loginIndex; + if (var0 == -3) { + class139.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { + class139.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { + class139.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { + UserComparator7.method674(3); + Login.field750 = 1; + } else if (var0 == 4) { + class129.method711(0); + } else if (var0 == 5) { + Login.field750 = 2; + class139.setLoginResponseString("Either your account is still logged in, or the last", "world you were using has become unavailable.", "Please try again later."); + } else if (var0 == 68) { + if (!Client.reloadJS5) { + Client.reloadJS5 = true; + ByteArrayPool.reloadJS5(); + return; + } + + class139.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (!Client.onMobile && var0 == 6) { + class139.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (var0 == 7) { + class139.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { + class139.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { + class139.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { + class139.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { + class139.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { + class139.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { + class139.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { + class139.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { + class139.setLoginResponseString("Too many login attempts.", "You can use the Jagex Launcher to continue playing.", "Press the button below to download it now."); + UserComparator7.method674(33); + } else if (var0 == 17) { + class139.setLoginResponseString("To access this free world, log into a", "members world and move your character", "to a non-members area."); + } else if (var0 == 18) { + class129.method711(1); + } else if (var0 == 19) { + class139.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { + class139.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { + class139.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { + class139.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { + class139.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { + class139.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + class139.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { + class139.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + class139.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); + } else if (var0 == 32) { + class129.method711(2); + } else if (var0 == 37) { + class139.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { + class139.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { + UserComparator7.method674(8); + } else { + if (var0 == 56) { + class139.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + WorldMapSection2.updateGameState(11); + return; + } + + if (var0 == 57) { + class139.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + WorldMapSection2.updateGameState(11); + return; + } + + if (var0 == 61) { + class139.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); + UserComparator7.method674(7); + } else { + if (var0 == 62) { + WorldMapSection2.updateGameState(10); + UserComparator7.method674(9); + class139.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); + return; } - var1 = var2; + if (var0 == 63) { + WorldMapSection2.updateGameState(10); + UserComparator7.method674(9); + class139.setLoginResponseString("You were signed out.", "Please sign in again.", ""); + return; + } + + if (var0 == 65 || var0 == 67) { + WorldMapSection2.updateGameState(10); + UserComparator7.method674(9); + class139.setLoginResponseString("Failed to login.", "Please try again.", ""); + return; + } + + if (var0 == 71) { + WorldMapSection2.updateGameState(10); + UserComparator7.method674(7); + class139.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); + } else if (var0 == 73) { + WorldMapSection2.updateGameState(10); + UserComparator7.method674(6); + class139.setLoginResponseString("Your date of birth information is waiting", "to be reviewed by our staff.", "It will be processed shortly."); + } else if (var0 == 72) { + WorldMapSection2.updateGameState(10); + UserComparator7.method674(32); + } else { + class139.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); + } } + } - return (char)var1; + WorldMapSection2.updateGameState(10); + int var4 = Login.loginIndex; + boolean var5 = var1 != var4; + if (!var5 && Client.field648.method2633()) { + UserComparator7.method674(9); } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class15.java b/osrs/src/main/java/class15.java index 2441bb528..235fd042f 100644 --- a/osrs/src/main/java/class15.java +++ b/osrs/src/main/java/class15.java @@ -14,15 +14,15 @@ import java.security.SecureRandom; import java.security.Security; -@ObfuscatedName("aj") +@ObfuscatedName("ak") public class class15 extends SSLSocketFactory { - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Laj;" + descriptor = "Lak;" ) - public static class15 field44; - @ObfuscatedName("ac") - SecureRandom field45; + public static class15 field49; + @ObfuscatedName("at") + SecureRandom field50; static { if (Security.getProvider("BC") == null) { @@ -32,15 +32,15 @@ public class class15 extends SSLSocketFactory { } public class15() { - this.field45 = new SecureRandom(); + this.field50 = new SecureRandom(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;S)Ljavax/net/ssl/SSLSocket;", - garbageValue = "-369" + descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;B)Ljavax/net/ssl/SSLSocket;", + garbageValue = "-15" ) - SSLSocket method51(String var1, TlsClientProtocol var2) { + SSLSocket method59(String var1, TlsClientProtocol var2) { return new class12(this, var2, var1); } @@ -55,8 +55,8 @@ public Socket createSocket(Socket var1, String var2, int var3, boolean var4) thr var1.connect(new InetSocketAddress(var2, var3)); } - TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field45); - return this.method51(var2, var5); + TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field50); + return this.method59(var2, var5); } public String[] getDefaultCipherSuites() { diff --git a/osrs/src/main/java/class150.java b/osrs/src/main/java/class150.java index 2069e6427..6fa88fb90 100644 --- a/osrs/src/main/java/class150.java +++ b/osrs/src/main/java/class150.java @@ -2,195 +2,143 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") -public class class150 extends class145 { - @ObfuscatedName("ac") - int field1338; - @ObfuscatedName("al") - int field1340; - @ObfuscatedName("ak") - int field1339; - @ObfuscatedName("ax") - int field1341; +@ObfuscatedName("fz") +public class class150 extends class160 { + @ObfuscatedName("at") + int field1357; + @ObfuscatedName("ah") + byte field1355; + @ObfuscatedName("ar") + int field1356; + @ObfuscatedName("ao") + String field1358; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lgi;" ) - final class148 this$0; + final class161 this$0; @ObfuscatedSignature( - descriptor = "(Lff;)V" + descriptor = "(Lgi;)V" ) - class150(class148 var1) { + class150(class161 var1) { this.this$0 = var1; + this.field1357 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "1810249387" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1338 = var1.readInt(); - this.field1341 = var1.readInt(); - this.field1340 = var1.readUnsignedByte(); - this.field1339 = var1.readUnsignedByte(); + @Export("vmethod3238") + void vmethod3238(Buffer var1) { + this.field1357 = var1.readUnsignedShort(); + this.field1355 = var1.readByte(); + this.field1356 = var1.readUnsignedShort(); + var1.readLong(); + this.field1358 = var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lgn;B)V", + garbageValue = "-75" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method827(this.field1338, this.field1341, this.field1340, this.field1339); + @Export("vmethod3239") + void vmethod3239(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1357); + var2.rank = this.field1355; + var2.world = this.field1356; + var2.username = new Username(this.field1358); } - @ObfuscatedName("ac") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IB)Lha;", - garbageValue = "84" + descriptor = "(I)V", + garbageValue = "1818675777" ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static void method785() { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; + Login.currentLoginField = 0; } + } @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lul;Ljava/lang/String;I)I", - garbageValue = "-1376508948" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "2073691331" ) - public static int method785(Buffer var0, String var1) { - int var2 = var0.offset; - int var4 = var1.length(); - byte[] var5 = new byte[var4]; - - for (int var6 = 0; var6 < var4; ++var6) { - char var7 = var1.charAt(var6); - if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { - if (var7 == 8364) { - var5[var6] = -128; - } else if (var7 == 8218) { - var5[var6] = -126; - } else if (var7 == 402) { - var5[var6] = -125; - } else if (var7 == 8222) { - var5[var6] = -124; - } else if (var7 == 8230) { - var5[var6] = -123; - } else if (var7 == 8224) { - var5[var6] = -122; - } else if (var7 == 8225) { - var5[var6] = -121; - } else if (var7 == 710) { - var5[var6] = -120; - } else if (var7 == 8240) { - var5[var6] = -119; - } else if (var7 == 352) { - var5[var6] = -118; - } else if (var7 == 8249) { - var5[var6] = -117; - } else if (var7 == 338) { - var5[var6] = -116; - } else if (var7 == 381) { - var5[var6] = -114; - } else if (var7 == 8216) { - var5[var6] = -111; - } else if (var7 == 8217) { - var5[var6] = -110; - } else if (var7 == 8220) { - var5[var6] = -109; - } else if (var7 == 8221) { - var5[var6] = -108; - } else if (var7 == 8226) { - var5[var6] = -107; - } else if (var7 == 8211) { - var5[var6] = -106; - } else if (var7 == 8212) { - var5[var6] = -105; - } else if (var7 == 732) { - var5[var6] = -104; - } else if (var7 == 8482) { - var5[var6] = -103; - } else if (var7 == 353) { - var5[var6] = -102; - } else if (var7 == 8250) { - var5[var6] = -101; - } else if (var7 == 339) { - var5[var6] = -100; - } else if (var7 == 382) { - var5[var6] = -98; - } else if (var7 == 376) { - var5[var6] = -97; - } else { - var5[var6] = 63; - } - } else { - var5[var6] = (byte)var7; - } + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + class137.charToByteCp1252(var0.charAt(var3)); } - var0.writeSmartByteShort(var5.length); - var0.offset += class349.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); - return var0.offset - var2; + return var2; } - @ObfuscatedName("cu") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-1670051292" + descriptor = "([BIII)Z", + garbageValue = "-851651370" ) - static int method789(int var0, Script var1, boolean var2) { - return 2; - } + static final boolean method784(byte[] var0, int var1, int var2) { + boolean var3 = true; + Buffer var4 = new Buffer(var0); + int var5 = -1; - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-405650921" - ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = class115.getTileHeight(var0, var1, class87.Client_plane) - var2; - var0 -= Client.cameraX; - var3 -= class17.cameraY; - var1 -= WorldMapArea.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[class365.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[class365.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[WallDecoration.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[WallDecoration.cameraYaw]; - int var8 = var6 * var1 + var0 * var7 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var5 * var3 - var4 * var1 >> 16; - var1 = var3 * var4 + var5 * var1 >> 16; - if (var1 >= 50) { - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + label57: + while (true) { + int var6 = var4.readIncrSmallSmart(); + if (var6 == 0) { + return var3; } - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + var5 += var6; + int var7 = 0; + boolean var8 = false; + + while (true) { + int var9; + while (!var8) { + var9 = var4.readUShortSmart(); + if (var9 == 0) { + continue label57; + } + + var7 += var9 - 1; + int var10 = var7 & 63; + int var11 = var7 >> 6 & 63; + int var12 = var4.readUnsignedByte() >> 2; + int var13 = var11 + var1; + int var14 = var10 + var2; + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { + ObjectComposition var15 = WorldMapSection2.getObjectDefinition(var5); + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { + if (!var15.needsModelFiles()) { + ++Client.field453; + var3 = false; + } + + var8 = true; + } + } + } + + var9 = var4.readUShortSmart(); + if (var9 == 0) { + break; + } + + var4.readUnsignedByte(); + } } } } \ No newline at end of file diff --git a/osrs/src/main/java/class151.java b/osrs/src/main/java/class151.java index 07b949827..bce2765e6 100644 --- a/osrs/src/main/java/class151.java +++ b/osrs/src/main/java/class151.java @@ -2,170 +2,86 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") -public class class151 extends class161 { - @ObfuscatedName("ac") - int field1343; - @ObfuscatedName("al") - byte field1342; - @ObfuscatedName("ak") - int field1344; - @ObfuscatedName("ax") - String field1345; +import java.awt.*; + +@ObfuscatedName("fx") +public class class151 extends class144 { + @ObfuscatedName("bg") + static Image field1359; + @ObfuscatedName("at") + boolean field1360; + @ObfuscatedName("ah") + byte field1362; + @ObfuscatedName("ar") + byte field1364; + @ObfuscatedName("ao") + byte field1363; + @ObfuscatedName("ab") + byte field1361; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lfv;" ) - final class162 this$0; + final class147 this$0; @ObfuscatedSignature( - descriptor = "(Lgf;)V" + descriptor = "(Lfv;)V" ) - class151(class162 var1) { + class151(class147 var1) { this.this$0 = var1; - this.field1343 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "0" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) - @Export("vmethod3238") - void vmethod3238(Buffer var1) { - this.field1343 = var1.readUnsignedShort(); - this.field1342 = var1.readByte(); - this.field1344 = var1.readUnsignedShort(); - var1.readLong(); - this.field1345 = var1.readStringCp1252NullTerminated(); + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1360 = var1.readUnsignedByte() == 1; + this.field1362 = var1.readByte(); + this.field1364 = var1.readByte(); + this.field1363 = var1.readByte(); + this.field1361 = var1.readByte(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgb;B)V", - garbageValue = "0" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) - @Export("vmethod3239") - void vmethod3239(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1343); - var2.rank = this.field1342; - var2.world = this.field1344; - var2.username = new Username(this.field1345); + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.allowGuests = this.field1360; + var1.field1380 = this.field1362; + var1.field1383 = this.field1364; + var1.field1381 = this.field1363; + var1.field1382 = this.field1361; } - @ObfuscatedName("jp") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(ZLuy;B)V", - garbageValue = "43" + descriptor = "(II)Lfo;", + garbageValue = "1476785465" ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var2; - int var4; - int var5; - int var6; - int var7; - if (!Client.isInInstance) { - var2 = var1.readUnsignedShort(); - int var3 = var1.readUnsignedShortAdd(); - var4 = var1.readUnsignedShort(); - class178.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - class178.xteaKeys[var5][var6] = var1.readInt(); - } - } - - class152.regions = new int[var4]; - HorizontalAlignment.regionMapArchiveIds = new int[var4]; - WorldMapIcon_0.regionLandArchiveIds = new int[var4]; - class345.regionLandArchives = new byte[var4][]; - class201.regionMapArchives = new byte[var4][]; - var4 = 0; - - for (var5 = (var3 - 6) / 8; var5 <= (var3 + 6) / 8; ++var5) { - for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { - var7 = var6 + (var5 << 8); - class152.regions[var4] = var7; - HorizontalAlignment.regionMapArchiveIds[var4] = class198.archive9.getGroupId("m" + var5 + "_" + var6); - WorldMapIcon_0.regionLandArchiveIds[var4] = class198.archive9.getGroupId("l" + var5 + "_" + var6); - ++var4; - } - } - - MouseRecorder.method478(var3, var2, true); + static class139 method788(int var0) { + if (MouseRecorder.method469(var0) != 0) { + return null; } else { - var2 = var1.readUnsignedShortAddLE(); - boolean var15 = var1.readUnsignedByteNeg() == 1; - var4 = var1.readIntME(); - var5 = var1.readUnsignedShort(); - var1.importIndex(); - - int var8; - int var9; - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = var1.readBits(1); - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; - } - } + class139 var2 = (class139)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); + class139 var1; + if (var2 != null) { + var1 = var2; + } else { + var2 = Login.method437(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); + if (var2 != null) { + SequenceDefinition.SequenceDefinition_cachedModel.put(var2, (long)var0); } - } - - var1.exportIndex(); - class178.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - class178.xteaKeys[var6][var7] = var1.readInt(); - } - } - class152.regions = new int[var5]; - HorizontalAlignment.regionMapArchiveIds = new int[var5]; - WorldMapIcon_0.regionLandArchiveIds = new int[var5]; - class345.regionLandArchives = new byte[var5][]; - class201.regionMapArchives = new byte[var5][]; - var5 = 0; - - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = Client.instanceChunkTemplates[var6][var7][var8]; - if (var9 != -1) { - int var10 = var9 >> 14 & 1023; - int var11 = var9 >> 3 & 2047; - int var12 = (var10 / 8 << 8) + var11 / 8; - - int var13; - for (var13 = 0; var13 < var5; ++var13) { - if (class152.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - class152.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - HorizontalAlignment.regionMapArchiveIds[var5] = class198.archive9.getGroupId("m" + var13 + "_" + var14); - WorldMapIcon_0.regionLandArchiveIds[var5] = class198.archive9.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } + var1 = var2; } - MouseRecorder.method478(var4, var2, !var15); + return var1; } - } } \ No newline at end of file diff --git a/osrs/src/main/java/class152.java b/osrs/src/main/java/class152.java index d9286cc63..6400d0dad 100644 --- a/osrs/src/main/java/class152.java +++ b/osrs/src/main/java/class152.java @@ -2,59 +2,47 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") -public class class152 extends class145 { - @ObfuscatedName("jq") - @Export("regions") - static int[] regions; - @ObfuscatedName("ac") - boolean field1347; - @ObfuscatedName("al") - byte field1349; - @ObfuscatedName("ak") - byte field1348; - @ObfuscatedName("ax") - byte field1351; - @ObfuscatedName("ao") - byte field1350; +@ObfuscatedName("fu") +public class class152 extends class160 { + @ObfuscatedName("at") + int field1365; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lgi;" ) - final class148 this$0; + final class161 this$0; @ObfuscatedSignature( - descriptor = "(Lff;)V" + descriptor = "(Lgi;)V" ) - class152(class148 var1) { + class152(class161 var1) { this.this$0 = var1; + this.field1365 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "1810249387" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1347 = var1.readUnsignedByte() == 1; - this.field1349 = var1.readByte(); - this.field1348 = var1.readByte(); - this.field1351 = var1.readByte(); - this.field1350 = var1.readByte(); + @Export("vmethod3238") + void vmethod3238(Buffer var1) { + this.field1365 = var1.readUnsignedShort(); + var1.readUnsignedByte(); + if (var1.readUnsignedByte() != 255) { + --var1.offset; + var1.readLong(); + } + } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lgn;B)V", + garbageValue = "-75" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.allowGuests = this.field1347; - var1.field1371 = this.field1349; - var1.field1372 = this.field1348; - var1.field1370 = this.field1351; - var1.field1369 = this.field1350; + @Export("vmethod3239") + void vmethod3239(ClanChannel var1) { + var1.removeMember(this.field1365); } } \ No newline at end of file diff --git a/osrs/src/main/java/class153.java b/osrs/src/main/java/class153.java index 8050e2a04..5b08bd39f 100644 --- a/osrs/src/main/java/class153.java +++ b/osrs/src/main/java/class153.java @@ -1,101 +1,200 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("fp") -public class class153 extends class161 { - @ObfuscatedName("cy") - static int field1352; - @ObfuscatedName("ac") - int field1353; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +@ObfuscatedName("fy") +public class class153 extends class144 { + @ObfuscatedName("at") + String field1366; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lfv;" ) - final class162 this$0; + final class147 this$0; @ObfuscatedSignature( - descriptor = "(Lgf;)V" + descriptor = "(Lfv;)V" ) - class153(class162 var1) { + class153(class147 var1) { this.this$0 = var1; - this.field1353 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "0" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) - @Export("vmethod3238") - void vmethod3238(Buffer var1) { - this.field1353 = var1.readUnsignedShort(); - var1.readUnsignedByte(); - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); - } - + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1366 = var1.readStringCp1252NullTerminated(); + var1.readInt(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgb;B)V", - garbageValue = "0" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) - @Export("vmethod3239") - void vmethod3239(ClanChannel var1) { - var1.removeMember(this.field1353); + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.name = this.field1366; } - @ObfuscatedName("al") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIIIIIB)I", - garbageValue = "125" + descriptor = "(Luj;II)V", + garbageValue = "-522641810" ) - public static int method796(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { - int var6 = var3; - var3 = var4; - var4 = var6; - } + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); + var2.size = var0.readUnsignedByte(); + var2.id = var0.readInt(); + var2.operations = new int[var2.size]; + var2.creationErrors = new int[var2.size]; + var2.fields = new Field[var2.size]; + var2.intReplaceValues = new int[var2.size]; + var2.methods = new Method[var2.size]; + var2.arguments = new byte[var2.size][][]; - var2 &= 3; - if (var2 == 0) { - return var0; - } else if (var2 == 1) { - return var1; - } else { - return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); + for (int var3 = 0; var3 < var2.size; ++var3) { + try { + int var4 = var0.readUnsignedByte(); + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { + if (var4 == 3 || var4 == 4) { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = var0.readUnsignedByte(); + String[] var8 = new String[var7]; + + for (int var9 = 0; var9 < var7; ++var9) { + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); + byte[][] var10 = new byte[var7][]; + int var12; + if (var4 == 3) { + for (int var11 = 0; var11 < var7; ++var11) { + var12 = var0.readInt(); + var10[var11] = new byte[var12]; + var0.readBytes(var10[var11], 0, var12); + } + } + + var2.operations[var3] = var4; + Class[] var21 = new Class[var7]; + + for (var12 = 0; var12 < var7; ++var12) { + var21[var12] = FloorOverlayDefinition.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = FloorOverlayDefinition.loadClassFromDescriptor(var20); + if (FloorOverlayDefinition.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + Method[] var13 = FloorOverlayDefinition.loadClassFromDescriptor(var5).getDeclaredMethods(); + Method[] var14 = var13; + + for (int var15 = 0; var15 < var14.length; ++var15) { + Method var16 = var14[var15]; + if (Reflection.getMethodName(var16).equals(var6)) { + Class[] var17 = Reflection.getParameterTypes(var16); + if (var17.length == var21.length) { + boolean var18 = true; + + for (int var19 = 0; var19 < var21.length; ++var19) { + if (var17[var19] != var21[var19]) { + var18 = false; + break; + } + } + + if (var18 && var22 == var16.getReturnType()) { + var2.methods[var3] = var16; + } + } + } + } + + var2.arguments[var3] = var10; + } + } else { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = 0; + if (var4 == 1) { + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; + var2.intReplaceValues[var3] = var7; + if (FloorOverlayDefinition.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(FloorOverlayDefinition.loadClassFromDescriptor(var5), var6); + } + } catch (ClassNotFoundException var24) { + var2.creationErrors[var3] = -1; + } catch (SecurityException var25) { + var2.creationErrors[var3] = -2; + } catch (NullPointerException var26) { + var2.creationErrors[var3] = -3; + } catch (Exception var27) { + var2.creationErrors[var3] = -4; + } catch (Throwable var28) { + var2.creationErrors[var3] = -5; + } } - } - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "(I)Ltu;", - garbageValue = "-496192767" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return class434.worldMap; + class36.reflectionChecks.addFirst(var2); } - @ObfuscatedName("iz") + @ObfuscatedName("ib") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "107" + descriptor = "(I)V", + garbageValue = "2091716300" ) - static final int method800(int var0) { - return Math.min(Math.max(var0, 128), 383); + static final void method794() { + if (InterfaceParent.field861) { + UserComparator9.method683(); + InterfaceParent.field861 = false; + } + } - @ObfuscatedName("lc") + @ObfuscatedName("ng") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "1681206525" + descriptor = "(IIIILuz;Lme;B)V", + garbageValue = "4" ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - class208.insertMenuItem(var0, var1, var2, var3, var4, var5, -1, false); + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; + if (var6 > 4225 && var6 < 90000) { + int var7 = Client.camAngleY & 2047; + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; + int var10 = var9 * var2 + var3 * var8 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + double var12 = Math.atan2((double)var10, (double)var11); + int var14 = var5.width / 2 - 25; + int var15 = (int)(Math.sin(var12) * (double)var14); + int var16 = (int)(Math.cos(var12) * (double)var14); + byte var17 = 20; + class11.redHintArrowSprite.method2703(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + } else { + class147.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class154.java b/osrs/src/main/java/class154.java index 384444807..83b791ac4 100644 --- a/osrs/src/main/java/class154.java +++ b/osrs/src/main/java/class154.java @@ -2,60 +2,43 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") -public class class154 extends class145 { - @ObfuscatedName("ac") - String field1354; +@ObfuscatedName("fn") +public class class154 extends class144 { + @ObfuscatedName("at") + int field1367; + @ObfuscatedName("ah") + String field1368; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfv;" ) - final class148 this$0; + final class147 this$0; @ObfuscatedSignature( - descriptor = "(Lff;)V" + descriptor = "(Lfv;)V" ) - class154(class148 var1) { + class154(class147 var1) { this.this$0 = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1354 = var1.readStringCp1252NullTerminated(); - var1.readInt(); + this.field1367 = var1.readInt(); + this.field1368 = var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.name = this.field1354; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "21538" - ) - public static void method802() { - VarcInt.VarcInt_cached.clear(); - } - - @ObfuscatedName("mr") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "354037944" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; + var1.method817(this.field1367, this.field1368); } } \ No newline at end of file diff --git a/osrs/src/main/java/class155.java b/osrs/src/main/java/class155.java deleted file mode 100644 index 3ae7431bb..000000000 --- a/osrs/src/main/java/class155.java +++ /dev/null @@ -1,77 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fx") -public class class155 extends class145 { - @ObfuscatedName("go") - static String field1355; - @ObfuscatedName("ac") - int field1356; - @ObfuscatedName("al") - String field1357; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lff;" - ) - final class148 this$0; - - @ObfuscatedSignature( - descriptor = "(Lff;)V" - ) - class155(class148 var1) { - this.this$0 = var1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" - ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1356 = var1.readInt(); - this.field1357 = var1.readStringCp1252NullTerminated(); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" - ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method830(this.field1356, this.field1357); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "32" - ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - for (int var2 = 0; var2 < var1.ids.length; ++var2) { - var1.ids[var2] = -1; - var1.quantities[var2] = 0; - } - - } - } - - @ObfuscatedName("oq") - @ObfuscatedSignature( - descriptor = "(Lnm;I)Ljava/lang/String;", - garbageValue = "-1055476214" - ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class156.java b/osrs/src/main/java/class156.java new file mode 100644 index 000000000..876eb2e07 --- /dev/null +++ b/osrs/src/main/java/class156.java @@ -0,0 +1,522 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gm") +public class class156 extends class160 { + @ObfuscatedName("at") + String field1396; + @ObfuscatedName("ah") + int field1395; + @ObfuscatedName("ar") + byte field1394; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lgi;" + ) + final class161 this$0; + + @ObfuscatedSignature( + descriptor = "(Lgi;)V" + ) + class156(class161 var1) { + this.this$0 = var1; + this.field1396 = null; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Luj;I)V", + garbageValue = "1810249387" + ) + @Export("vmethod3238") + void vmethod3238(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + var1.readLong(); + } + + this.field1396 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1395 = var1.readUnsignedShort(); + this.field1394 = var1.readByte(); + var1.readLong(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lgn;B)V", + garbageValue = "-75" + ) + @Export("vmethod3239") + void vmethod3239(ClanChannel var1) { + ClanChannelMember var2 = new ClanChannelMember(); + var2.username = new Username(this.field1396); + var2.world = this.field1395; + var2.rank = this.field1394; + var1.addMember(var2); + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lkf;[Liw;I)V", + garbageValue = "277248330" + ) + static final void method823(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + for (var4 = 0; var4 < 104; ++var4) { + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { + var5 = var2; + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 - 1; + } + + if (var5 >= 0) { + var1[var5].setBlockedByFloor(var3, var4); + } + } + } + } + } + + Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; + if (Tiles.rndHue < -8) { + Tiles.rndHue = -8; + } + + if (Tiles.rndHue > 8) { + Tiles.rndHue = 8; + } + + Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; + if (Tiles.rndLightness < -16) { + Tiles.rndLightness = -16; + } + + if (Tiles.rndLightness > 16) { + Tiles.rndLightness = 16; + } + + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { + byte[][] var45 = class93.field948[var2]; + boolean var54 = true; + boolean var55 = true; + boolean var6 = true; + boolean var7 = true; + boolean var8 = true; + var9 = (int)Math.sqrt(5100.0D); + var10 = var9 * 768 >> 8; + + int var19; + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; + var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); + var16 = (var13 << 8) / var15; + var17 = 65536 / var15; + var18 = (var14 << 8) / var15; + var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; + int var20 = (var45[var12][var11 + 1] >> 3) + (var45[var12 - 1][var11] >> 2) + (var45[var12][var11 - 1] >> 2) + (var45[var12 + 1][var11] >> 3) + (var45[var12][var11] >> 1); + Tiles.field843[var12][var11] = var19 - var20; + } + } + + for (var11 = 0; var11 < 104; ++var11) { + class337.Tiles_hue[var11] = 0; + Tiles.Tiles_saturation[var11] = 0; + class185.Tiles_lightness[var11] = 0; + MenuAction.Tiles_hueMultiplier[var11] = 0; + WorldMapLabelSize.field1943[var11] = 0; + } + + for (var11 = -5; var11 < 109; ++var11) { + for (var12 = 0; var12 < 104; ++var12) { + var13 = var11 + 5; + int var10002; + if (var13 >= 0 && var13 < 104) { + long var46 = (long)Math.pow(2.0D, 15.0D) - 1L; + var16 = (int)var46; + var17 = class74.Tiles_underlays[var2][var13][var12] & var16; + if (var17 > 0) { + FloorUnderlayDefinition var48 = class101.method596(var17 - 1); + var10000 = class337.Tiles_hue; + var10000[var12] += var48.hue; + var10000 = Tiles.Tiles_saturation; + var10000[var12] += var48.saturation; + var10000 = class185.Tiles_lightness; + var10000[var12] += var48.lightness; + var10000 = MenuAction.Tiles_hueMultiplier; + var10000[var12] += var48.hueMultiplier; + var10002 = WorldMapLabelSize.field1943[var12]++; + } + } + + var14 = var11 - 5; + if (var14 >= 0 && var14 < 104) { + long var49 = (long)Math.pow(2.0D, 15.0D) - 1L; + var17 = (int)var49; + var18 = class74.Tiles_underlays[var2][var14][var12] & var17; + if (var18 > 0) { + FloorUnderlayDefinition var51 = class101.method596(var18 - 1); + var10000 = class337.Tiles_hue; + var10000[var12] -= var51.hue; + var10000 = Tiles.Tiles_saturation; + var10000[var12] -= var51.saturation; + var10000 = class185.Tiles_lightness; + var10000[var12] -= var51.lightness; + var10000 = MenuAction.Tiles_hueMultiplier; + var10000[var12] -= var51.hueMultiplier; + var10002 = WorldMapLabelSize.field1943[var12]--; + } + } + } + + if (var11 >= 1 && var11 < 103) { + var12 = 0; + var13 = 0; + var14 = 0; + var15 = 0; + var16 = 0; + + for (var17 = -5; var17 < 109; ++var17) { + var18 = var17 + 5; + if (var18 >= 0 && var18 < 104) { + var12 += class337.Tiles_hue[var18]; + var13 += Tiles.Tiles_saturation[var18]; + var14 += class185.Tiles_lightness[var18]; + var15 += MenuAction.Tiles_hueMultiplier[var18]; + var16 += WorldMapLabelSize.field1943[var18]; + } + + var19 = var17 - 5; + if (var19 >= 0 && var19 < 104) { + var12 -= class337.Tiles_hue[var19]; + var13 -= Tiles.Tiles_saturation[var19]; + var14 -= class185.Tiles_lightness[var19]; + var15 -= MenuAction.Tiles_hueMultiplier[var19]; + var16 -= WorldMapLabelSize.field1943[var19]; + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { + if (var2 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var2; + } + + long var52 = (long)Math.pow(2.0D, 15.0D) - 1L; + int var22 = (int)var52; + int var23 = class74.Tiles_underlays[var2][var11][var17] & var22; + int var24 = Interpreter.Tiles_overlays[var2][var11][var17] & var22; + if (var23 > 0 || var24 > 0) { + int var25 = Tiles.Tiles_heights[var2][var11][var17]; + int var26 = Tiles.Tiles_heights[var2][var11 + 1][var17]; + int var27 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; + int var28 = Tiles.Tiles_heights[var2][var11][var17 + 1]; + int var29 = Tiles.field843[var11][var17]; + int var30 = Tiles.field843[var11 + 1][var17]; + int var31 = Tiles.field843[var11 + 1][var17 + 1]; + int var32 = Tiles.field843[var11][var17 + 1]; + int var33 = -1; + int var34 = -1; + int var35; + int var36; + if (var23 > 0) { + var35 = var12 * 256 / var15; + var36 = var13 / var16; + int var37 = var14 / var16; + var33 = Messages.method634(var35, var36, var37); + var35 = var35 + Tiles.rndHue & 255; + var37 += Tiles.rndLightness; + if (var37 < 0) { + var37 = 0; + } else if (var37 > 255) { + var37 = 255; + } + + var34 = Messages.method634(var35, var36, var37); + } + + if (var2 > 0) { + boolean var60 = true; + if (var23 == 0 && ViewportMouse.Tiles_shapes[var2][var11][var17] != 0) { + var60 = false; + } + + if (var24 > 0 && !Canvas.method85(var24 - 1).hideUnderlay) { + var60 = false; + } + + if (var60 && var26 == var25 && var25 == var27 && var25 == var28) { + var10000 = class344.field3130[var2][var11]; + var10000[var17] |= 2340; + } + } + + var35 = 0; + if (var34 != -1) { + var35 = Rasterizer3D.Rasterizer3D_colorPalette[ClanChannel.method861(var34, 96)]; + } + + if (var24 == 0) { + var0.addTile(var2, var11, var17, 0, 0, -1, var25, var26, var27, var28, ClanChannel.method861(var33, var29), ClanChannel.method861(var33, var30), ClanChannel.method861(var33, var31), ClanChannel.method861(var33, var32), 0, 0, 0, 0, var35, 0); + } else { + var36 = ViewportMouse.Tiles_shapes[var2][var11][var17] + 1; + byte var61 = class369.field3559[var2][var11][var17]; + FloorOverlayDefinition var38 = Canvas.method85(var24 - 1); + int var39 = var38.texture; + int var40; + int var41; + int var42; + int var43; + if (var39 >= 0) { + var41 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); + var40 = -1; + } else if (var38.primaryRgb == 16711935) { + var40 = -2; + var39 = -1; + var41 = -2; + } else { + var40 = Messages.method634(var38.hue, var38.saturation, var38.lightness); + var42 = var38.hue + Tiles.rndHue & 255; + var43 = var38.lightness + Tiles.rndLightness; + if (var43 < 0) { + var43 = 0; + } else if (var43 > 255) { + var43 = 255; + } + + var41 = Messages.method634(var42, var38.saturation, var43); + } + + var42 = 0; + if (var41 != -2) { + var42 = Rasterizer3D.Rasterizer3D_colorPalette[class403.method2044(var41, 96)]; + } + + if (var38.secondaryRgb != -1) { + var43 = var38.secondaryHue + Tiles.rndHue & 255; + int var44 = var38.secondaryLightness + Tiles.rndLightness; + if (var44 < 0) { + var44 = 0; + } else if (var44 > 255) { + var44 = 255; + } + + var41 = Messages.method634(var43, var38.secondarySaturation, var44); + var42 = Rasterizer3D.Rasterizer3D_colorPalette[class403.method2044(var41, 96)]; + } + + var0.addTile(var2, var11, var17, var36, var61, var39, var25, var26, var27, var28, ClanChannel.method861(var33, var29), ClanChannel.method861(var33, var30), ClanChannel.method861(var33, var31), ClanChannel.method861(var33, var32), class403.method2044(var40, var29), class403.method2044(var40, var30), class403.method2044(var40, var31), class403.method2044(var40, var32), var35, var42); + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var0.setTileMinPlane(var2, var12, var11, class185.method929(var2, var12, var11)); + } + } + + class74.Tiles_underlays[var2] = null; + Interpreter.Tiles_overlays[var2] = null; + ViewportMouse.Tiles_shapes[var2] = null; + class369.field3559[var2] = null; + class93.field948[var2] = null; + } + + var0.method1488(-50, -10, -50); + + for (var2 = 0; var2 < 104; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; + var3 = 2; + var4 = 4; + + for (var5 = 0; var5 < 4; ++var5) { + if (var5 > 0) { + var2 <<= 3; + var3 <<= 3; + var4 <<= 3; + } + + for (int var56 = 0; var56 <= var5; ++var56) { + for (int var57 = 0; var57 <= 104; ++var57) { + for (int var58 = 0; var58 <= 104; ++var58) { + short var59; + if ((class344.field3130[var56][var58][var57] & var2) != 0) { + var9 = var57; + var10 = var57; + var11 = var56; + + for (var12 = var56; var9 > 0 && (class344.field3130[var56][var58][var9 - 1] & var2) != 0; --var9) { + } + + while (var10 < 104 && (class344.field3130[var56][var58][var10 + 1] & var2) != 0) { + ++var10; + } + + label336: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((class344.field3130[var11 - 1][var58][var13] & var2) == 0) { + break label336; + } + } + + --var11; + } + + label325: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((class344.field3130[var12 + 1][var58][var13] & var2) == 0) { + break label325; + } + } + + ++var12; + } + + var13 = (var12 + 1 - var11) * (var10 - var9 + 1); + if (var13 >= 8) { + var59 = 240; + var15 = Tiles.Tiles_heights[var12][var58][var9] - var59; + var16 = Tiles.Tiles_heights[var11][var58][var9]; + Scene.Scene_addOccluder(var5, 1, var58 * 128, var58 * 128, var9 * 128, var10 * 128 + 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = class344.field3130[var17][var58]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((class344.field3130[var56][var58][var57] & var3) != 0) { + var9 = var58; + var10 = var58; + var11 = var56; + + for (var12 = var56; var9 > 0 && (class344.field3130[var56][var9 - 1][var57] & var3) != 0; --var9) { + } + + while (var10 < 104 && (class344.field3130[var56][var10 + 1][var57] & var3) != 0) { + ++var10; + } + + label389: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((class344.field3130[var11 - 1][var13][var57] & var3) == 0) { + break label389; + } + } + + --var11; + } + + label378: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((class344.field3130[var12 + 1][var13][var57] & var3) == 0) { + break label378; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var59 = 240; + var15 = Tiles.Tiles_heights[var12][var9][var57] - var59; + var16 = Tiles.Tiles_heights[var11][var9][var57]; + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var57 * 128, var57 * 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = class344.field3130[var17][var18]; + var10000[var57] &= ~var3; + } + } + } + } + + if ((class344.field3130[var56][var58][var57] & var4) != 0) { + var9 = var58; + var10 = var58; + var11 = var57; + + for (var12 = var57; var11 > 0 && (class344.field3130[var56][var58][var11 - 1] & var4) != 0; --var11) { + } + + while (var12 < 104 && (class344.field3130[var56][var58][var12 + 1] & var4) != 0) { + ++var12; + } + + label442: + while (var9 > 0) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((class344.field3130[var56][var9 - 1][var13] & var4) == 0) { + break label442; + } + } + + --var9; + } + + label431: + while (var10 < 104) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((class344.field3130[var56][var10 + 1][var13] & var4) == 0) { + break label431; + } + } + + ++var10; + } + + if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { + var13 = Tiles.Tiles_heights[var56][var9][var11]; + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); + + for (var14 = var9; var14 <= var10; ++var14) { + for (var15 = var11; var15 <= var12; ++var15) { + var10000 = class344.field3130[var56][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class157.java b/osrs/src/main/java/class157.java index 7cf5b21fa..07bfa62f3 100644 --- a/osrs/src/main/java/class157.java +++ b/osrs/src/main/java/class157.java @@ -2,63 +2,78 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") -public class class157 extends class161 { - @ObfuscatedName("kb") - @ObfuscatedSignature( - descriptor = "[Lud;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; - @ObfuscatedName("ac") - String field1386; - @ObfuscatedName("al") - int field1385; - @ObfuscatedName("ak") - byte field1384; +@ObfuscatedName("gw") +public class class157 extends class160 { + @ObfuscatedName("an") + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("at") + int field1400; + @ObfuscatedName("ah") + byte field1398; + @ObfuscatedName("ar") + int field1399; + @ObfuscatedName("ao") + String field1401; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgi;" ) - final class162 this$0; + final class161 this$0; @ObfuscatedSignature( - descriptor = "(Lgf;)V" + descriptor = "(Lgi;)V" ) - class157(class162 var1) { + class157(class161 var1) { this.this$0 = var1; - this.field1386 = null; + this.field1400 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "0" + descriptor = "(Luj;I)V", + garbageValue = "1810249387" ) @Export("vmethod3238") void vmethod3238(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); - } - - this.field1386 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1385 = var1.readUnsignedShort(); - this.field1384 = var1.readByte(); + var1.readUnsignedByte(); + this.field1400 = var1.readUnsignedShort(); + this.field1398 = var1.readByte(); + this.field1399 = var1.readUnsignedShort(); var1.readLong(); + this.field1401 = var1.readStringCp1252NullTerminated(); + var1.readUnsignedByte(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgb;B)V", - garbageValue = "0" + descriptor = "(Lgn;B)V", + garbageValue = "-75" ) @Export("vmethod3239") void vmethod3239(ClanChannel var1) { - ClanChannelMember var2 = new ClanChannelMember(); - var2.username = new Username(this.field1386); - var2.world = this.field1385; - var2.rank = this.field1384; - var1.addMember(var2); + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1400); + var2.rank = this.field1398; + var2.world = this.field1399; + var2.username = new Username(this.field1401); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ldo;B)V", + garbageValue = "-120" + ) + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + class323.runScript(var0, 500000, 475000); + } + + @ObfuscatedName("ow") + @ObfuscatedSignature( + descriptor = "(B)Loz;", + garbageValue = "0" + ) + static JagNetThread method827() { + return WorldMapSectionType.field2038; } } \ No newline at end of file diff --git a/osrs/src/main/java/class158.java b/osrs/src/main/java/class158.java index 34f2236f4..56f42d85b 100644 --- a/osrs/src/main/java/class158.java +++ b/osrs/src/main/java/class158.java @@ -2,573 +2,78 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") -public class class158 extends class161 { - @ObfuscatedName("am") - static int[][] field1387; - @ObfuscatedName("ac") - int field1389; - @ObfuscatedName("al") - byte field1388; - @ObfuscatedName("ak") - int field1390; - @ObfuscatedName("ax") - String field1391; +@ObfuscatedName("gl") +public class class158 extends class144 { + @ObfuscatedName("at") + int field1402; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lfv;" ) - final class162 this$0; + final class147 this$0; @ObfuscatedSignature( - descriptor = "(Lgf;)V" + descriptor = "(Lfv;)V" ) - class158(class162 var1) { + class158(class147 var1) { this.this$0 = var1; - this.field1389 = -1; + this.field1402 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "0" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) - @Export("vmethod3238") - void vmethod3238(Buffer var1) { - var1.readUnsignedByte(); - this.field1389 = var1.readUnsignedShort(); - this.field1388 = var1.readByte(); - this.field1390 = var1.readUnsignedShort(); - var1.readLong(); - this.field1391 = var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1402 = var1.readUnsignedShort(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgb;B)V", - garbageValue = "0" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) - @Export("vmethod3239") - void vmethod3239(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1389); - var2.rank = this.field1388; - var2.world = this.field1390; - var2.username = new Username(this.field1391); + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method809(this.field1402); + } + + @ObfuscatedName("ab") + static int method828(long var0) { + return (int)(var0 >>> 14 & 3L); } @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ldl;Lds;III)V", - garbageValue = "-1880567886" + descriptor = "(I)V", + garbageValue = "11323368" ) - @Export("runScriptLogic") - static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { - Object[] var4 = var0.args; - Interpreter.Interpreter_intStackSize = 0; - class180.Interpreter_stringStackSize = 0; - int var5 = -1; - int[] var6 = var1.opcodes; - int[] var7 = var1.intOperands; - byte var8 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field701 = false; - boolean var9 = false; - int var10 = 0; - boolean var29 = false; - - label860: { - label861: { - try { - int var13; - try { - var29 = true; - Interpreter.Interpreter_intLocals = new int[var1.localIntCount]; - int var11 = 0; - class160.Interpreter_stringLocals = new String[var1.localStringCount]; - int var12 = 0; - - int var14; - String var20; - for (var13 = 1; var13 < var4.length; ++var13) { - if (var4[var13] instanceof Integer) { - var14 = (Integer)var4[var13]; - if (var14 == -2147483647) { - var14 = var0.mouseX; - } - - if (var14 == -2147483646) { - var14 = var0.mouseY; - } - - if (var14 == -2147483645) { - var14 = var0.widget != null ? var0.widget.id * 41171959 * -749799993 : -1; - } - - if (var14 == -2147483644) { - var14 = var0.opIndex; - } - - if (var14 == -2147483643) { - var14 = var0.widget != null ? var0.widget.childIndex * 125148757 * 1641180925 : -1; - } - - if (var14 == -2147483642) { - var14 = var0.dragTarget != null ? var0.dragTarget.id * 41171959 * -749799993 : -1; - } - - if (var14 == -2147483641) { - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 125148757 * 1641180925 : -1; - } - - if (var14 == -2147483640) { - var14 = var0.keyTyped; - } - - if (var14 == -2147483639) { - var14 = var0.keyPressed; - } - - Interpreter.Interpreter_intLocals[var11++] = var14; - } else if (var4[var13] instanceof String) { - var20 = (String)var4[var13]; - if (var20.equals("event_opbase")) { - var20 = var0.targetName; - } - - class160.Interpreter_stringLocals[var12++] = var20; - } - } - - Interpreter.field706 = var0.field864; - - label841: - while (true) { - ++var10; - if (var10 > var2) { - throw new RuntimeException(); - } - - ++var5; - int var32 = var6[var5]; - if (var32 >= 100) { - boolean var34; - if (var1.intOperands[var5] == 1) { - var34 = true; - } else { - var34 = false; - } - - var14 = ViewportMouse.method1389(var32, var1, var34); - switch(var14) { - case 0: - var29 = false; - break label841; - case 1: - default: - break; - case 2: - //throw new IllegalStateException(); - } - } else if (var32 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7[var5]; - } else if (var32 == 1) { - var13 = var7[var5]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; - } else if (var32 == 2) { - var13 = var7[var5]; - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ScriptEvent.changeGameOptions(var13); - } else if (var32 == 3) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var1.stringOperands[var5]; - } else if (var32 == 6) { - var5 += var7[var5]; - } else if (var32 == 7) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 8) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 9) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 10) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 21) { - if (Interpreter.Interpreter_frameDepth == 0) { - var29 = false; - break label861; - } - - ScriptFrame var39 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; - var1 = var39.script; - var6 = var1.opcodes; - var7 = var1.intOperands; - var5 = var39.pc; - Interpreter.Interpreter_intLocals = var39.intLocals; - class160.Interpreter_stringLocals = var39.stringLocals; - } else if (var32 == 25) { - var13 = var7[var5]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class36.getVarbit(var13); - } else if (var32 == 27) { - var13 = var7[var5]; - class130.method704(var13, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else if (var32 == 31) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 32) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var5 += var7[var5]; - } - } else if (var32 == 33) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var7[var5]]; - } else if (var32 == 34) { - Interpreter.Interpreter_intLocals[var7[var5]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - } else if (var32 == 35) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class160.Interpreter_stringLocals[var7[var5]]; - } else if (var32 == 36) { - class160.Interpreter_stringLocals[var7[var5]] = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - } else if (var32 == 37) { - var13 = var7[var5]; - class180.Interpreter_stringStackSize -= var13; - var20 = class316.method1656(Interpreter.Interpreter_stringStack, class180.Interpreter_stringStackSize, var13); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var20; - } else if (var32 == 38) { - --Interpreter.Interpreter_intStackSize; - } else if (var32 == 39) { - --class180.Interpreter_stringStackSize; - } else { - int var17; - if (var32 != 40) { - if (var32 == 42) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class33.varcs.getInt(var7[var5]); - } else if (var32 == 43) { - class33.varcs.setInt(var7[var5], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else if (var32 == 44) { - var13 = var7[var5] >> 16; - var14 = var7[var5] & 65535; - int var23 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var23 < 0 || var23 > 5000) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrayLengths[var13] = var23; - byte var24 = -1; - if (var14 == 105) { - var24 = 0; - } - - for (var17 = 0; var17 < var23; ++var17) { - Interpreter.Interpreter_arrays[var13][var17] = var24; - } - } else if (var32 == 45) { - var13 = var7[var5]; - var14 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; - } else if (var32 == 46) { - var13 = var7[var5]; - Interpreter.Interpreter_intStackSize -= 2; - var14 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - } else { - String var21; - if (var32 == 47) { - var21 = class33.varcs.getStringOld(var7[var5]); - if (var21 == null) { - var21 = "null"; - } - - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var21; - } else if (var32 == 48) { - class33.varcs.setStringOld(var7[var5], Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]); - } else if (var32 == 49) { - var21 = class33.varcs.getString(var7[var5]); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var21; - } else if (var32 == 50) { - class33.varcs.setString(var7[var5], Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]); - } else if (var32 == 60) { - IterableNodeHashTable var37 = var1.switches[var7[var5]]; - IntegerNode var36 = (IntegerNode)var37.get((long)Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var36 != null) { - var5 += var36.integer; - } - } else { - Integer var38; - if (var32 == 74) { - var38 = class295.field2496.getTitleGroupValue(var7[var5]); - if (var38 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var38; - } - } else { - if (var32 != 76) { - throw new IllegalStateException(); - } - - var38 = SequenceDefinition.varclan.method2358(var7[var5]); - if (var38 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var38; - } - } - } - } - } else { - var13 = var7[var5]; - Script var35 = class28.getScript(var13); - int[] var15 = new int[var35.localIntCount]; - String[] var16 = new String[var35.localStringCount]; - - for (var17 = 0; var17 < var35.intArgumentCount; ++var17) { - var15[var17] = Interpreter.Interpreter_intStack[var17 + (Interpreter.Interpreter_intStackSize - var35.intArgumentCount)]; - } - - for (var17 = 0; var17 < var35.stringArgumentCount; ++var17) { - var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class180.Interpreter_stringStackSize - var35.stringArgumentCount)]; - } - - Interpreter.Interpreter_intStackSize -= var35.intArgumentCount; - class180.Interpreter_stringStackSize -= var35.stringArgumentCount; - ScriptFrame var22 = new ScriptFrame(); - var22.script = var1; - var22.pc = var5; - var22.intLocals = Interpreter.Interpreter_intLocals; - var22.stringLocals = class160.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; - var1 = var35; - var6 = var35.opcodes; - var7 = var35.intOperands; - var5 = -1; - Interpreter.Interpreter_intLocals = var15; - class160.Interpreter_stringLocals = var16; - } - } - } - } catch (Exception var30) { - var9 = true; - StringBuilder var26 = new StringBuilder(30); - var26.append("").append(var1.key).append(" "); - - for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { - var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); - } - - var26.append("").append(var8); - class190.RunException_sendStackTrace(var26.toString(), var30); - var29 = false; - break label860; - } - } finally { - if (var29) { - while (Interpreter.field713.size() > 0) { - class104 var19 = (class104)Interpreter.field713.remove(0); - TextureProvider.widgetDefaultMenuAction(var19.method600(), var19.method601(), var19.method602(), var19.method603(), ""); - } - - if (Interpreter.field701) { - Interpreter.field701 = false; - GrandExchangeOfferOwnWorldComparator.method351(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - class190.RunException_sendStackTrace("Warning: Script " + var1.field820 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - - } - } - - while (Interpreter.field713.size() > 0) { - class104 var33 = (class104)Interpreter.field713.remove(0); - TextureProvider.widgetDefaultMenuAction(var33.method600(), var33.method601(), var33.method602(), var33.method603(), ""); - } - - if (Interpreter.field701) { - Interpreter.field701 = false; - GrandExchangeOfferOwnWorldComparator.method351(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - class190.RunException_sendStackTrace("Warning: Script " + var1.field820 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - - return; - } - - while (Interpreter.field713.size() > 0) { - class104 var40 = (class104)Interpreter.field713.remove(0); - TextureProvider.widgetDefaultMenuAction(var40.method600(), var40.method601(), var40.method602(), var40.method603(), ""); - } - - if (Interpreter.field701) { - Interpreter.field701 = false; - GrandExchangeOfferOwnWorldComparator.method351(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - class190.RunException_sendStackTrace("Warning: Script " + var1.field820 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - - return; - } - - while (Interpreter.field713.size() > 0) { - class104 var25 = (class104)Interpreter.field713.remove(0); - TextureProvider.widgetDefaultMenuAction(var25.method600(), var25.method601(), var25.method602(), var25.method603(), ""); - } - - if (Interpreter.field701) { - Interpreter.field701 = false; - GrandExchangeOfferOwnWorldComparator.method351(); - } - - if (!var9 && var3 > 0 && var10 >= var3) { - class190.RunException_sendStackTrace("Warning: Script " + var1.field820 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); - } - + static final void method829() { + WorldMapArea.method1213("You can't add yourself to your own ignore list"); } - @ObfuscatedName("aa") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(IIIIIZI)Lud;", - garbageValue = "2006480609" + descriptor = "(ILdt;ZI)I", + garbageValue = "-1589352545" ) - @Export("getItemSprite") - public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { - var4 = 0; - } else if (var4 == 2 && var1 != 1) { - var4 = 1; - } - - long var6 = ((long)var4 << 40) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var3 << 42); - SpritePixels var8; - if (!var5) { - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } - } - - ItemComposition var9 = class214.ItemDefinition_get(var0); - if (var1 > 1 && var9.countobj != null) { - int var10 = -1; - - for (int var11 = 0; var11 < 10; ++var11) { - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { - var9 = class214.ItemDefinition_get(var10); - } - } - - Model var20 = var9.getModel(1); - if (var20 == null) { - return null; + static int method833(int var0, Script var1, boolean var2) { + if (var0 == 7108) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class60.method339() ? 1 : 0; + return 1; } else { - SpritePixels var21 = null; - if (var9.noteTemplate != -1) { - var21 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if (var21 == null) { - return null; - } - } else if (var9.notedId != -1) { - var21 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if (var21 == null) { - return null; - } - } else if (var9.placeholderTemplate != -1) { - var21 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if (var21 == null) { - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; - int var13 = Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_height; - float[] var15 = Rasterizer2D.field4244; - int[] var16 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var16); - var8 = new SpritePixels(36, 32); - Rasterizer3D.method1247(var8.pixels, 36, 32, (float[])null); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.method1248(); - Rasterizer3D.method1251(16, 16); - Rasterizer3D.clips.field2289 = false; - if (var9.placeholderTemplate != -1) { - var21.drawTransBgAt(0, 0); - } - - int var17 = var9.zoom2d; - if (var5) { - var17 = (int)(1.5D * (double)var17); - } else if (var2 == 2) { - var17 = (int)(1.04D * (double)var17); - } - - int var18 = var17 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; - int var19 = var17 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; - var20.calculateBoundsCylinder(); - var20.method1379(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var20.height / 2 + var18 + var9.offsetY2d, var19 + var9.offsetY2d); - if (var9.notedId != -1) { - var21.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { - var8.outline(1); - } - - if (var2 >= 2) { - var8.outline(16777215); - } - - if (var3 != 0) { - var8.shadow(var3); - } - - Rasterizer3D.method1247(var8.pixels, 36, 32, (float[])null); - if (var9.noteTemplate != -1) { - var21.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - class142.ItemDefinition_fontPlain11.draw(class481.method2388(var1), 0, 9, 16776960, 1); - } - - if (!var5) { - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer3D.method1247(var12, var13, var14, var15); - Rasterizer2D.Rasterizer2D_setClipArray(var16); - Rasterizer3D.method1248(); - Rasterizer3D.clips.field2289 = true; - return var8; + return 2; } } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "2036594717" + ) + static int method832(int var0) { + return var0 * 3 + 600; + } } \ No newline at end of file diff --git a/osrs/src/main/java/class159.java b/osrs/src/main/java/class159.java index 01b49a7da..1d6127e4a 100644 --- a/osrs/src/main/java/class159.java +++ b/osrs/src/main/java/class159.java @@ -2,95 +2,420 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.text.ParseException; -import java.util.Date; - -@ObfuscatedName("gl") -public class class159 extends class145 { - @ObfuscatedName("al") - @Export("SpriteBuffer_spriteWidth") - public static int SpriteBuffer_spriteWidth; - @ObfuscatedName("bi") - @Export("client") - @ObfuscatedSignature( - descriptor = "Lclient;" - ) - public static Client client; - @ObfuscatedName("ac") - int field1394; +import java.util.ArrayList; + +@ObfuscatedName("ge") +public class class159 extends class144 { + @ObfuscatedName("at") + long field1405; + @ObfuscatedName("ah") + String field1404; + @ObfuscatedName("ar") + int field1403; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfv;" ) - final class148 this$0; + final class147 this$0; @ObfuscatedSignature( - descriptor = "(Lff;)V" + descriptor = "(Lfv;)V" ) - class159(class148 var1) { + class159(class147 var1) { this.this$0 = var1; - this.field1394 = -1; + this.field1405 = -1L; + this.field1404 = null; + this.field1403 = 0; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1394 = var1.readUnsignedShort(); + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1405 = var1.readLong(); + } + + this.field1404 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1403 = var1.readUnsignedShort(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method821(this.field1394); + var1.method804(this.field1405, this.field1404, this.field1403); } - @ObfuscatedName("ab") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-914201451" + descriptor = "(B)V", + garbageValue = "118" ) - static boolean method840() { - Date var0; - try { - var0 = class20.method76(); - } catch (ParseException var7) { - class19.method67("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); - return false; + static void method834() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.obj != null) { + var0.set(); + } } - if (var0 == null) { - return false; + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "404161563" + ) + static int method837(int var0, Script var1, boolean var2) { + if (var0 == 3200) { + DbTableType.Interpreter_intStackSize -= 3; + class460.queueSoundEffect(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize], Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]); + return 1; } else { - java.util.Calendar var2 = java.util.Calendar.getInstance(); - var2.set(1, var2.get(1) - 13); - var2.set(5, var2.get(5) + 1); - var2.set(11, 0); - var2.set(12, 0); - var2.set(13, 0); - var2.set(14, 0); - Date var3 = var2.getTime(); - boolean var4 = var0.before(var3); - boolean var6 = MoveSpeed.method1187(var0); - if (!var6) { - class19.method67("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); - return false; + int var3; + int var4; + int var5; + int var6; + int var7; + if (var0 == 3201) { + DbTableType.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 4]; + ArrayList var8 = new ArrayList(); + var8.add(var3); + class135.method734(var8, var4, var5, var6, var7); + return 1; + } else if (var0 == 3202) { + DbTableType.Interpreter_intStackSize -= 2; + FileSystem.playJingle(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize], Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + return 1; } else { - if (!var4) { - class153.field1352 = 8388607; + class90 var12; + class89 var13; + String var15; + if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { + boolean var16; + if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { + if (var0 == 3211) { + return 1; + } else if (var0 == 3216) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var4 = 0; + class90 var18 = (class90)class12.findEnumerated(UserComparator3.method679(), var3); + if (var18 != null) { + var4 = var18 != class90.field898 ? 1 : 0; + } + + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4; + return 1; + } else if (var0 == 3218) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var4 = 0; + class89 var10 = (class89)class12.findEnumerated(HealthBar.method569(), var3); + if (var10 != null) { + var4 = var10 != class89.field889 ? 1 : 0; + } + + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4; + return 1; + } else if (var0 != 3217 && var0 != 3219) { + if (var0 == 3220) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + WorldMapManager.method1265(var3, var4); + return 1; + } else if (var0 == 3221) { + DbTableType.Interpreter_intStackSize -= 6; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 4]; + int var11 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 5]; + ArrayList var9 = new ArrayList(); + var9.add(var3); + var9.add(var4); + class135.method734(var9, var5, var6, var7, var11); + return 1; + } else if (var0 == 3222) { + DbTableType.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + class191.someMusicMethod(var3, var4, var5, var6); + return 1; + } else { + return 2; + } + } else { + var12 = class90.field898; + var13 = class89.field889; + var16 = true; + boolean var17 = true; + if (var0 == 3217) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var12 = (class90)class12.findEnumerated(UserComparator3.method679(), var7); + if (var12 == null) { + throw new RuntimeException(String.format("Unrecognized device option %d", var7)); + } + } + + if (var0 == 3219) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var13 = (class89)class12.findEnumerated(HealthBar.method569(), var7); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized game option %d", var7)); + } + } + + String var14; + byte var19; + if (var13 == class89.field889) { + switch(var12.field900) { + case 1: + case 2: + case 3: + var19 = 0; + var6 = 1; + break; + case 4: + var19 = 0; + var6 = Integer.MAX_VALUE; + break; + case 5: + var19 = 0; + var6 = 100; + break; + default: + var14 = String.format("Unkown device option: %s.", var12.toString()); + throw new RuntimeException(var14); + } + } else { + switch(var13.field891) { + case 1: + var19 = 0; + var6 = 1; + break; + case 2: + case 3: + case 4: + var19 = 0; + var6 = 100; + break; + default: + var14 = String.format("Unkown game option: %s.", var13.toString()); + throw new RuntimeException(var14); + } + } + + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var19; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var6; + return 1; + } + } else { + var12 = class90.field898; + var13 = class89.field889; + var16 = false; + if (var0 == 3214) { + var6 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var12 = (class90)class12.findEnumerated(UserComparator3.method679(), var6); + if (var12 == null) { + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); + } + } + + if (var0 == 3215) { + var6 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var13 = (class89)class12.findEnumerated(HealthBar.method569(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); + } + } + + if (var0 == 3210) { + var6 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var12 = (class90)class12.findEnumerated(UserComparator3.method679(), var6); + if (var12 == null) { + var13 = (class89)class12.findEnumerated(HealthBar.method569(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); + } + } + } else if (var0 == 3182) { + var12 = class90.field899; + } else if (var0 == 3204) { + var13 = class89.field888; + } else if (var0 == 3206) { + var13 = class89.field887; + } else if (var0 == 3208) { + var13 = class89.field885; + } + + if (var13 == class89.field889) { + switch(var12.field900) { + case 1: + var5 = WorldMapIcon_1.clientPreferences.getIsUsernameHidden() ? 1 : 0; + break; + case 2: + var5 = WorldMapIcon_1.clientPreferences.getTitleMusicDisabled() ? 1 : 0; + break; + case 3: + var5 = WorldMapIcon_1.clientPreferences.method547() ? 1 : 0; + break; + case 4: + var5 = WorldMapIcon_1.clientPreferences.method549(); + break; + case 5: + var5 = class216.method1099(); + break; + default: + var15 = String.format("Unkown device option: %s.", var12.toString()); + throw new RuntimeException(var15); + } + } else { + switch(var13.field891) { + case 1: + var5 = WorldMapIcon_1.clientPreferences.getRoofsHidden() ? 1 : 0; + break; + case 2: + var6 = WorldMapIcon_1.clientPreferences.getCurrentMusicVolume(); + var5 = Math.round((float)(var6 * 100) / 255.0F); + break; + case 3: + var6 = WorldMapIcon_1.clientPreferences.getCurrentSoundEffectsVolume(); + var5 = Math.round((float)(var6 * 100) / 127.0F); + break; + case 4: + var6 = WorldMapIcon_1.clientPreferences.getAreaSoundEffectsVolume(); + var5 = Math.round((float)(var6 * 100) / 127.0F); + break; + default: + var15 = String.format("Unkown game option: %s.", var13.toString()); + throw new RuntimeException(var15); + } + } + + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var5; + return 1; + } } else { - class153.field1352 = (int)(var0.getTime() / 86400000L - 11745L); - } + var12 = class90.field898; + var13 = class89.field889; + var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var0 == 3212) { + var6 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var12 = (class90)class12.findEnumerated(UserComparator3.method679(), var6); + if (var12 == null) { + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); + } + } + + if (var0 == 3213) { + var6 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var13 = (class89)class12.findEnumerated(HealthBar.method569(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); + } + } + + if (var0 == 3209) { + var6 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var12 = (class90)class12.findEnumerated(UserComparator3.method679(), var6); + if (var12 == null) { + var13 = (class89)class12.findEnumerated(HealthBar.method569(), var6); + if (var13 == null) { + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); + } + } + } else if (var0 == 3181) { + var12 = class90.field899; + } else if (var0 == 3203) { + var13 = class89.field888; + } else if (var0 == 3205) { + var13 = class89.field887; + } else if (var0 == 3207) { + var13 = class89.field885; + } + + if (var13 == class89.field889) { + switch(var12.field900) { + case 1: + WorldMapIcon_1.clientPreferences.setIsUsernameHidden(var5 == 1); + break; + case 2: + WorldMapIcon_1.clientPreferences.getTitleMusicDisabled(var5 == 1); + break; + case 3: + WorldMapIcon_1.clientPreferences.method545(var5 == 1); + break; + case 4: + if (var5 < 0) { + var5 = 0; + } + + WorldMapIcon_1.clientPreferences.method548(var5); + break; + case 5: + class311.method1647(var5); + break; + default: + var15 = String.format("Unkown device option: %s.", var12.toString()); + throw new RuntimeException(var15); + } + } else { + switch(var13.field891) { + case 1: + WorldMapIcon_1.clientPreferences.setRoofsHidden(var5 == 1); + break; + case 2: + var5 = Math.min(Math.max(var5, 0), 100); + var6 = Math.round((float)(var5 * 255) / 100.0F); + Decimator.method323(var6); + break; + case 3: + var5 = Math.min(Math.max(var5, 0), 100); + var6 = Math.round((float)(var5 * 127) / 100.0F); + SoundSystem.method235(var6); + break; + case 4: + var5 = Math.min(Math.max(var5, 0), 100); + var6 = Math.round((float)(var5 * 127) / 100.0F); + Login.method438(var6); + break; + default: + var15 = String.format("Unkown game option: %s.", var13.toString()); + throw new RuntimeException(var15); + } + } - return true; + return 1; + } } } } + + @ObfuscatedName("ms") + @ObfuscatedSignature( + descriptor = "(Lnn;I)V", + garbageValue = "227996304" + ) + @Export("invalidateWidget") + public static void invalidateWidget(Widget var0) { + if (var0 != null && var0.cycle == Client.field523) { + Client.field407[var0.rootIndex] = true; + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/class16.java b/osrs/src/main/java/class16.java index 3c4bd51cd..832a9a2fa 100644 --- a/osrs/src/main/java/class16.java +++ b/osrs/src/main/java/class16.java @@ -5,248 +5,36 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; -@ObfuscatedName("an") +@ObfuscatedName("aj") public class class16 implements ThreadFactory { - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lbw;" - ) - @Export("pcmPlayerProvider") - public static class51 pcmPlayerProvider; - @ObfuscatedName("bi") - static String field47; - @ObfuscatedName("ac") - final ThreadGroup field48; - @ObfuscatedName("al") - final AtomicInteger field49; + @ObfuscatedName("at") + final ThreadGroup field51; + @ObfuscatedName("ah") + final AtomicInteger field52; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Las;" + descriptor = "Lay;" ) @Export("this$0") @ObfuscatedName("this$0") final class14 this$0; @ObfuscatedSignature( - descriptor = "(Las;)V" + descriptor = "(Lay;)V" ) class16(class14 var1) { this.this$0 = var1; - this.field49 = new AtomicInteger(1); + this.field52 = new AtomicInteger(1); SecurityManager var2 = System.getSecurityManager(); - this.field48 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); + this.field51 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); } @Export("newThread") @ObfuscatedName("newThread") public Thread newThread(Runnable var1) { - Thread var2 = new Thread(this.field48, var1, this.this$0.field41 + "-rest-request-" + this.field49.getAndIncrement(), 0L); + Thread var2 = new Thread(this.field51, var1, this.this$0.field46 + "-rest-request-" + this.field52.getAndIncrement(), 0L); var2.setDaemon(true); var2.setPriority(5); return var2; } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "-718248289" - ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; - - for (int var6 = 0; var6 < var5; ++var6) { - char var7 = var0.charAt(var6 + var1); - if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { - if (var7 == 8364) { - var3[var6 + var4] = -128; - } else if (var7 == 8218) { - var3[var6 + var4] = -126; - } else if (var7 == 402) { - var3[var6 + var4] = -125; - } else if (var7 == 8222) { - var3[var6 + var4] = -124; - } else if (var7 == 8230) { - var3[var6 + var4] = -123; - } else if (var7 == 8224) { - var3[var6 + var4] = -122; - } else if (var7 == 8225) { - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; - } else if (var7 == 8240) { - var3[var6 + var4] = -119; - } else if (var7 == 352) { - var3[var6 + var4] = -118; - } else if (var7 == 8249) { - var3[var6 + var4] = -117; - } else if (var7 == 338) { - var3[var6 + var4] = -116; - } else if (var7 == 381) { - var3[var6 + var4] = -114; - } else if (var7 == 8216) { - var3[var6 + var4] = -111; - } else if (var7 == 8217) { - var3[var6 + var4] = -110; - } else if (var7 == 8220) { - var3[var6 + var4] = -109; - } else if (var7 == 8221) { - var3[var6 + var4] = -108; - } else if (var7 == 8226) { - var3[var6 + var4] = -107; - } else if (var7 == 8211) { - var3[var6 + var4] = -106; - } else if (var7 == 8212) { - var3[var6 + var4] = -105; - } else if (var7 == 732) { - var3[var6 + var4] = -104; - } else if (var7 == 8482) { - var3[var6 + var4] = -103; - } else if (var7 == 353) { - var3[var6 + var4] = -102; - } else if (var7 == 8250) { - var3[var6 + var4] = -101; - } else if (var7 == 339) { - var3[var6 + var4] = -100; - } else if (var7 == 382) { - var3[var6 + var4] = -98; - } else if (var7 == 376) { - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; - } - } else { - var3[var6 + var4] = (byte)var7; - } - } - - return var5; - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-70585586" - ) - public static final void method53(int var0, int var1) { - ViewportMouse.ViewportMouse_x = var0; - ViewportMouse.ViewportMouse_y = var1; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; - } - - @ObfuscatedName("ls") - @ObfuscatedSignature( - descriptor = "(Ldc;IIII)V", - garbageValue = "184545664" - ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { - NPCComposition var4 = var0.definition; - if (Client.menuOptionsCount < 400) { - if (var4.transforms != null) { - var4 = var4.transform(); - } - - if (var4 != null) { - if (var4.isInteractable) { - if (!var4.isFollower || Client.followerIndex == var1) { - String var5 = var0.method582(); - int var6; - if (var4.combatLevel != 0 && var0.combatLevelChange != 0) { - var6 = var0.combatLevelChange != -1 ? var0.combatLevelChange * -537106585 * -893205417 : var4.combatLevel * -1524379573 * 1597602147; - var5 = var5 + WidgetDefinition.method1745(var6, TextureProvider.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; - } - - if (var4.isFollower && Client.followerOpsLowPriority) { - class153.insertMenuItemNoShift("Examine", Client.colorStartTag(16776960) + var5, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - class153.insertMenuItemNoShift("Use", Client.field598 + " " + "->" + " " + Client.colorStartTag(16776960) + var5, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((class31.field82 & 2) == 2) { - class153.insertMenuItemNoShift(Client.field599, Client.field600 + " " + "->" + " " + Client.colorStartTag(16776960) + var5, 8, var1, var2, var3); - } - } else { - var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var7 = var4.actions; - int var8; - int var9; - if (var7 != null) { - for (var8 = 4; var8 >= 0; --var8) { - if (var0.method580(var8) && var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { - var9 = 0; - if (var8 == 0) { - var9 = var6 + 9; - } - - if (var8 == 1) { - var9 = var6 + 10; - } - - if (var8 == 2) { - var9 = var6 + 11; - } - - if (var8 == 3) { - var9 = var6 + 12; - } - - if (var8 == 4) { - var9 = var6 + 13; - } - - class153.insertMenuItemNoShift(var7[var8], Client.colorStartTag(16776960) + var5, var9, var1, var2, var3); - } - } - } - - if (var7 != null) { - for (var8 = 4; var8 >= 0; --var8) { - if (var0.method580(var8) && var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { - short var10 = 0; - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > TextureProvider.localPlayer.combatLevel) { - var10 = 2000; - } - - var9 = 0; - if (var8 == 0) { - var9 = var10 + 9; - } - - if (var8 == 1) { - var9 = var10 + 10; - } - - if (var8 == 2) { - var9 = var10 + 11; - } - - if (var8 == 3) { - var9 = var10 + 12; - } - - if (var8 == 4) { - var9 = var10 + 13; - } - - class153.insertMenuItemNoShift(var7[var8], Client.colorStartTag(16776960) + var5, var9, var1, var2, var3); - } - } - } - } - - if (!var4.isFollower || !Client.followerOpsLowPriority) { - class153.insertMenuItemNoShift("Examine", Client.colorStartTag(16776960) + var5, 1003, var1, var2, var3); - } - } - - } - } - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/class160.java b/osrs/src/main/java/class160.java index 680057837..2385110e6 100644 --- a/osrs/src/main/java/class160.java +++ b/osrs/src/main/java/class160.java @@ -2,187 +2,58 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") -public class class160 extends class145 { - @ObfuscatedName("ao") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("ar") - @Export("gameCyclesToDo") - static int gameCyclesToDo; - @ObfuscatedName("ac") - long field1399; - @ObfuscatedName("al") - String field1398; - @ObfuscatedName("ak") - int field1397; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lff;" - ) - final class148 this$0; +@ObfuscatedName("gs") +public abstract class class160 extends Node { + @ObfuscatedName("ct") + static int field1406; - @ObfuscatedSignature( - descriptor = "(Lff;)V" - ) - class160(class148 var1) { - this.this$0 = var1; - this.field1399 = -1L; - this.field1398 = null; - this.field1397 = 0; + class160() { } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "1810249387" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1399 = var1.readLong(); - } - - this.field1398 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1397 = var1.readUnsignedShort(); - } + @Export("vmethod3238") + abstract void vmethod3238(Buffer var1); - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lgn;B)V", + garbageValue = "-75" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method817(this.field1399, this.field1398, this.field1397); - } - - @ObfuscatedName("ac") - public static String method841(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (var0 % 37L == 0L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; 0L != var3; var3 /= 37L) { - ++var2; - } - - StringBuilder var5 = new StringBuilder(var2); + abstract void vmethod3239(ClanChannel var1); - while (var0 != 0L) { - long var6 = var0; - var0 /= 37L; - var5.append(class403.base37Table[(int)(var6 - var0 * 37L)]); - } - - return var5.reverse().toString(); - } - } else { - return null; - } - } - - @ObfuscatedName("ac") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Loa;II)Llx;", - garbageValue = "1083227717" + descriptor = "(ILnn;IIIII[FI)Lnn;", + garbageValue = "171386992" ) - public static PacketBufferNode method842(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = ClanChannelMember.getPacketBufferNode(ClientPacket.f96, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(0); - int var5 = var4.packetBuffer.offset; - var4.packetBuffer.writeByte(var0); - String var6 = var1.toLowerCase(); - int var7 = 0; - byte[] var8 = null; - if (var6.startsWith("yellow:")) { - var7 = 0; - var1 = var1.substring("yellow:".length()); - } else if (var6.startsWith("red:")) { - var7 = 1; - var1 = var1.substring("red:".length()); - } else if (var6.startsWith("green:")) { - var7 = 2; - var1 = var1.substring("green:".length()); - } else if (var6.startsWith("cyan:")) { - var7 = 3; - var1 = var1.substring("cyan:".length()); - } else if (var6.startsWith("purple:")) { - var7 = 4; - var1 = var1.substring("purple:".length()); - } else if (var6.startsWith("white:")) { - var7 = 5; - var1 = var1.substring("white:".length()); - } else if (var6.startsWith("flash1:")) { - var7 = 6; - var1 = var1.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var7 = 7; - var1 = var1.substring("flash2:".length()); - } else if (var6.startsWith("flash3:")) { - var7 = 8; - var1 = var1.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { - var7 = 9; - var1 = var1.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { - var7 = 10; - var1 = var1.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { - var7 = 11; - var1 = var1.substring("glow3:".length()); - } else if (var6.startsWith("rainbow:")) { - var7 = 12; - var1 = var1.substring("rainbow:".length()); - } else if (var6.startsWith("pattern")) { - var8 = class161.method847(var6); - if (var8 != null) { - var7 = var8.length + 12; - var1 = var1.substring("pattern".length() + var8.length + 1); - } - } - - var6 = var1.toLowerCase(); - byte var9 = 0; - if (var6.startsWith("wave:")) { - var9 = 1; - var1 = var1.substring("wave:".length()); - } else if (var6.startsWith("wave2:")) { - var9 = 2; - var1 = var1.substring("wave2:".length()); - } else if (var6.startsWith("shake:")) { - var9 = 3; - var1 = var1.substring("shake:".length()); - } else if (var6.startsWith("scroll:")) { - var9 = 4; - var1 = var1.substring("scroll:".length()); - } else if (var6.startsWith("slide:")) { - var9 = 5; - var1 = var1.substring("slide:".length()); - } - - var4.packetBuffer.writeByte(var7); - var4.packetBuffer.writeByte(var9); - if (var8 != null && Client.param25 >= 214) { - for (int var10 = 0; var10 < var8.length; ++var10) { - var4.packetBuffer.writeByte(var8[var10]); - } - } - - class150.method785(var4.packetBuffer, var1); - if (var0 == class354.field3143.rsOrdinal()) { - var4.packetBuffer.writeByte(var3); - } - - var4.packetBuffer.WriteLengthByte(var4.packetBuffer.offset - var5); - return var4; + static Widget method839(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) { + Widget var8 = new Widget(); + var8.type = var0; + var8.parentId = var1.id; + var8.childIndex = var2; + var8.isIf3 = true; + var8.xAlignment = var3; + var8.yAlignment = var4; + var8.widthAlignment = var5; + var8.heightAlignment = var6; + var8.rawX = (int)((float)var1.width * var7[0]); + var8.rawY = (int)((float)var1.height * var7[1]); + var8.rawWidth = (int)((float)var1.width * var7[2]); + var8.rawHeight = (int)((float)var1.height * var7[3]); + return var8; } - @ObfuscatedName("av") - static final void method845(long var0) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1322800179" + ) + static void method840() { + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; } } \ No newline at end of file diff --git a/osrs/src/main/java/class161.java b/osrs/src/main/java/class161.java index 136df4ec0..eb2805669 100644 --- a/osrs/src/main/java/class161.java +++ b/osrs/src/main/java/class161.java @@ -1,113 +1,74 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") -public abstract class class161 extends Node { - @ObfuscatedName("ut") - @Export("cameraLookAtHeight") - static int cameraLookAtHeight; - - class161() { - } - - @ObfuscatedName("ac") +@ObfuscatedName("gi") +public class class161 { + @ObfuscatedName("at") + long field1407; + @ObfuscatedName("ah") + public long field1409; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "0" + descriptor = "Lpm;" ) - @Export("vmethod3238") - abstract void vmethod3238(Buffer var1); + IterableNodeDeque field1408; - @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lgb;B)V", - garbageValue = "0" + descriptor = "(Luj;)V" ) - @Export("vmethod3239") - abstract void vmethod3239(ClanChannel var1); + public class161(Buffer var1) { + this.field1409 = -1L; + this.field1408 = new IterableNodeDeque(); + this.method843(var1); + } - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)[B", - garbageValue = "95848814" + descriptor = "(Luj;B)V", + garbageValue = "-62" ) - static byte[] method847(String var0) { - boolean var1 = true; - boolean var2 = true; - int var3 = "pattern".length(); - int var4 = 0; - byte[] var5 = new byte[8]; - - while (true) { - int var6 = var3 + var4; - if (var6 >= var0.length()) { - return null; - } - - char var7 = var0.charAt(var6); - if (var7 == ':') { - if (var4 == 0) { - return null; - } - - byte[] var8 = new byte[var4]; - System.arraycopy(var5, 0, var8, 0, var4); - return var8; - } - - if (var5.length == var4) { - return null; - } - - if (var7 >= '0' && var7 <= '9') { - var7 = (char)(var7 - '0'); + void method843(Buffer var1) { + this.field1407 = var1.readLong(); + this.field1409 = var1.readLong(); + + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + Object var3; + if (var2 == 1) { + var3 = new class156(this); + } else if (var2 == 4) { + var3 = new class167(this); + } else if (var2 == 3) { + var3 = new class152(this); + } else if (var2 == 2) { + var3 = new class150(this); } else { - if (var7 < 'a' || var7 > 'z') { - return null; + if (var2 != 5) { + throw new RuntimeException(""); } - var7 = (char)(var7 - 'W'); + var3 = new class157(this); } - var5[var4++] = (byte)var7; + ((class160)var3).vmethod3238(var1); + this.field1408.addFirst((Node)var3); } + } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIIS)V", - garbageValue = "-11714" + descriptor = "(Lgn;I)V", + garbageValue = "1259262891" ) - public static void method846(String[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - int var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - int var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } + public void method844(ClanChannel var1) { + if (var1.key == this.field1407 && this.field1409 == var1.field1421) { + for (class160 var2 = (class160)this.field1408.last(); var2 != null; var2 = (class160)this.field1408.previous()) { + var2.vmethod3239(var1); } - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - method846(var0, var1, var2, var5 - 1); - method846(var0, var1, var5 + 1, var3); + ++var1.field1421; + } else { + throw new RuntimeException(""); } - } } \ No newline at end of file diff --git a/osrs/src/main/java/class162.java b/osrs/src/main/java/class162.java index 29f482c65..542e61ea4 100644 --- a/osrs/src/main/java/class162.java +++ b/osrs/src/main/java/class162.java @@ -2,80 +2,144 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") -public class class162 { - @ObfuscatedName("fo") +@ObfuscatedName("gp") +public class class162 extends class144 { + @ObfuscatedName("at") + int field1411; + @ObfuscatedName("ah") + int field1410; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lre;" + descriptor = "Lfv;" ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("ac") - long field1402; - @ObfuscatedName("al") - public long field1404; - @ObfuscatedName("ak") + final class147 this$0; + @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "(Lfv;)V" ) - IterableNodeDeque field1403; + class162(class147 var1) { + this.this$0 = var1; + } + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) - public class162(Buffer var1) { - this.field1404 = -1L; - this.field1403 = new IterableNodeDeque(); - this.method850(var1); + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1411 = var1.readInt(); + this.field1410 = var1.readInt(); } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "90" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) - void method850(Buffer var1) { - this.field1402 = var1.readLong(); - this.field1404 = var1.readLong(); - - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { - Object var3; - if (var2 == 1) { - var3 = new class157(this); - } else if (var2 == 4) { - var3 = new class168(this); - } else if (var2 == 3) { - var3 = new class153(this); - } else if (var2 == 2) { - var3 = new class151(this); - } else { - if (var2 != 5) { - throw new RuntimeException(""); - } + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method814(this.field1411, this.field1410); + } - var3 = new class158(this); - } + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "6" + ) + static void method845() { + ChatChannel.field835 = new int[2000]; + int var0 = 0; + int var1 = 240; - ((class161)var3).vmethod3238(var1); - this.field1403.addFirst((Node)var3); + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { + var3 = ArchiveLoader.method459((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var0 / 16.0F + 0.075F)); + ChatChannel.field835[var0] = var3; + ++var0; + } + + var1 = 48; + + for (int var5 = var1 / 6; var0 < ChatChannel.field835.length; var1 -= var5) { + var3 = var0 * 2; + + for (int var4 = ArchiveLoader.method459((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < ChatChannel.field835.length; ++var0) { + ChatChannel.field835[var0] = var4; + } } } - @ObfuscatedName("al") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lgb;I)V", - garbageValue = "-913420137" + descriptor = "([BB)V", + garbageValue = "33" ) - public void method851(ClanChannel var1) { - if (this.field1402 == var1.key && var1.field1417 == this.field1404) { - for (class161 var2 = (class161)this.field1403.last(); var2 != null; var2 = (class161)this.field1403.previous()) { - var2.vmethod3239(var1); + @Export("SpriteBuffer_decode") + public static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); + var1.offset = var0.length - 2; + class541.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + class541.SpriteBuffer_xOffsets = new int[class541.SpriteBuffer_spriteCount]; + class541.SpriteBuffer_yOffsets = new int[class541.SpriteBuffer_spriteCount]; + class541.SpriteBuffer_spriteWidths = new int[class541.SpriteBuffer_spriteCount]; + class520.SpriteBuffer_spriteHeights = new int[class541.SpriteBuffer_spriteCount]; + class396.SpriteBuffer_pixels = new byte[class541.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class541.SpriteBuffer_spriteCount * 8; + class541.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + GrandExchangeOfferWorldComparator.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + int var2 = (var1.readUnsignedByte() & 255) + 1; + + int var3; + for (var3 = 0; var3 < class541.SpriteBuffer_spriteCount; ++var3) { + class541.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class541.SpriteBuffer_spriteCount; ++var3) { + class541.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class541.SpriteBuffer_spriteCount; ++var3) { + class541.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class541.SpriteBuffer_spriteCount; ++var3) { + class520.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class541.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + class541.SpriteBuffer_spritePalette = new int[var2]; + + for (var3 = 1; var3 < var2; ++var3) { + class541.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (class541.SpriteBuffer_spritePalette[var3] == 0) { + class541.SpriteBuffer_spritePalette[var3] = 1; } + } - ++var1.field1417; - } else { - throw new RuntimeException(""); + var1.offset = 0; + + for (var3 = 0; var3 < class541.SpriteBuffer_spriteCount; ++var3) { + int var4 = class541.SpriteBuffer_spriteWidths[var3]; + int var5 = class520.SpriteBuffer_spriteHeights[var3]; + int var6 = var5 * var4; + byte[] var7 = new byte[var6]; + class396.SpriteBuffer_pixels[var3] = var7; + int var8 = var1.readUnsignedByte(); + int var9; + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { + var7[var9 + var4 * var10] = var1.readByte(); + } + } + } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class163.java b/osrs/src/main/java/class163.java index c43f7c609..29654288f 100644 --- a/osrs/src/main/java/class163.java +++ b/osrs/src/main/java/class163.java @@ -2,187 +2,65 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") -public class class163 extends class145 { - @ObfuscatedName("ac") - int field1405; - @ObfuscatedName("al") - int field1406; +@ObfuscatedName("gq") +public class class163 extends class144 { + @ObfuscatedName("at") + int field1412; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfv;" ) - final class148 this$0; + final class147 this$0; @ObfuscatedSignature( - descriptor = "(Lff;)V" + descriptor = "(Lfv;)V" ) - class163(class148 var1) { + class163(class147 var1) { this.this$0 = var1; + this.field1412 = -1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) @Export("vmethod3254") void vmethod3254(Buffer var1) { - this.field1405 = var1.readInt(); - this.field1406 = var1.readInt(); + this.field1412 = var1.readUnsignedShort(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) @Export("vmethod3248") void vmethod3248(ClanSettings var1) { - var1.method826(this.field1405, this.field1406); + var1.method811(this.field1412); } - @ObfuscatedName("ac") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lom;Lom;IZB)Lja;", - garbageValue = "0" + descriptor = "(B)V", + garbageValue = "-114" ) - public static Frames method852(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; - int[] var5 = var0.getGroupFileIds(var2); - - for (int var6 = 0; var6 < var5.length; ++var6) { - byte[] var7 = var0.getFile(var2, var5[var6]); - if (var7 == null) { - var4 = false; - } else { - int var8 = (var7[0] & 255) << 8 | var7[1] & 255; - byte[] var9; - if (var3) { - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); - } - - if (var9 == null) { - var4 = false; - } - } - } - - if (!var4) { - return null; - } else { - try { - return new Frames(var0, var1, var2, var3); - } catch (Exception var11) { - return null; - } - } + static final void method849() { + WorldMapArea.method1213("You can't add yourself to your own friend list"); } - @ObfuscatedName("al") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (0L == var0 % 37L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; 0L != var3; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class403.base37Table[(int)(var6 - var0 * 37L)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } - } else { - return null; - } - } - - @ObfuscatedName("iw") + @ObfuscatedName("mx") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "93" + descriptor = "(II)Z", + garbageValue = "2130928035" ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - class91.clientPreferences.setRoofsHidden(!class91.clientPreferences.getRoofsHidden()); - if (class91.clientPreferences.getRoofsHidden()) { - class411.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - class411.addGameMessage(99, "", "Roofs will only be removed selectively"); - } - } - - if (var0.startsWith("zbuf")) { - boolean var1 = class36.method182(var0.substring(5).trim()) == 1; - class159.client.method152(var1); - Rasterizer3D.method1234(var1); - } - - if (var0.equalsIgnoreCase("z")) { - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("displayfps")) { - class91.clientPreferences.method545(); - } - - if (var0.equalsIgnoreCase("renderself")) { - Client.field388 = !Client.field388; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { - if (var0.equalsIgnoreCase("errortest")) { - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { - class434.worldMap.showCoord = !class434.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { - class91.clientPreferences.method544(true); - } - - if (var0.equalsIgnoreCase("fpsoff")) { - class91.clientPreferences.method544(false); - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { - class148.method781(); + static boolean method852(int var0) { + for (int var1 = 0; var1 < Client.field530; ++var1) { + if (Client.field577[var1] == var0) { + return true; } } - PacketBufferNode var2 = ClanChannelMember.getPacketBufferNode(ClientPacket.DOCHEAT, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(var0.length() + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var2); + return false; } } \ No newline at end of file diff --git a/osrs/src/main/java/class164.java b/osrs/src/main/java/class164.java deleted file mode 100644 index 71a5a4357..000000000 --- a/osrs/src/main/java/class164.java +++ /dev/null @@ -1,185 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gm") -public class class164 extends class145 { - @ObfuscatedName("gw") - @Export("currentPort") - static int currentPort; - @ObfuscatedName("ac") - int field1408; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lff;" - ) - final class148 this$0; - - @ObfuscatedSignature( - descriptor = "(Lff;)V" - ) - class164(class148 var1) { - this.this$0 = var1; - this.field1408 = -1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" - ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1408 = var1.readUnsignedShort(); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" - ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method823(this.field1408); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1326457643" - ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); - if (var4 == null) { - var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); - Messages.Messages_hashTable.put(var5, (long)var5.count); - Messages.Messages_queue.add(var5); - Client.chatCycle = Client.cycleCntr; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)Lii;", - garbageValue = "-1509216849" - ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); - var1 = new StructComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - StructComposition.StructDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-2069590441" - ) - public static int method859(int var0, int var1, int var2) { - int var3 = class76.method431(var2 - var1 + 1); - var3 <<= var1; - return var0 & ~var3; - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Lom;III)Z", - garbageValue = "999558105" - ) - public static boolean method862(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { - return false; - } else { - SpriteBuffer_decode(var3); - return true; - } - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-2036046752" - ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class544.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - class326.SpriteBuffer_xOffsets = new int[class544.SpriteBuffer_spriteCount]; - ModelData0.SpriteBuffer_yOffsets = new int[class544.SpriteBuffer_spriteCount]; - class59.SpriteBuffer_spriteWidths = new int[class544.SpriteBuffer_spriteCount]; - class544.SpriteBuffer_spriteHeights = new int[class544.SpriteBuffer_spriteCount]; - AddRequestTask.SpriteBuffer_pixels = new byte[class544.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class544.SpriteBuffer_spriteCount * 8; - class159.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class500.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class544.SpriteBuffer_spriteCount; ++var3) { - class326.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class544.SpriteBuffer_spriteCount; ++var3) { - ModelData0.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class544.SpriteBuffer_spriteCount; ++var3) { - class59.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class544.SpriteBuffer_spriteCount; ++var3) { - class544.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class544.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - class372.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - class372.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (class372.SpriteBuffer_spritePalette[var3] == 0) { - class372.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; - - for (var3 = 0; var3 < class544.SpriteBuffer_spriteCount; ++var3) { - int var4 = class59.SpriteBuffer_spriteWidths[var3]; - int var5 = class544.SpriteBuffer_spriteHeights[var3]; - int var6 = var4 * var5; - byte[] var7 = new byte[var6]; - AddRequestTask.SpriteBuffer_pixels[var3] = var7; - int var8 = var1.readUnsignedByte(); - int var9; - if (var8 == 0) { - for (var9 = 0; var9 < var6; ++var9) { - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { - for (var9 = 0; var9 < var4; ++var9) { - for (int var10 = 0; var10 < var5; ++var10) { - var7[var9 + var4 * var10] = var1.readByte(); - } - } - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class165.java b/osrs/src/main/java/class165.java new file mode 100644 index 000000000..f2a970534 --- /dev/null +++ b/osrs/src/main/java/class165.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gb") +public class class165 { + @ObfuscatedName("oa") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "483365457" + ) + static void method863(boolean var0) { + Client.leftClickOpensMenu = var0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class166.java b/osrs/src/main/java/class166.java index fe8124a7b..a5bdd5797 100644 --- a/osrs/src/main/java/class166.java +++ b/osrs/src/main/java/class166.java @@ -2,12 +2,58 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") -public class class166 { - @ObfuscatedName("cc") +@ObfuscatedName("gu") +public class class166 extends class144 { + @ObfuscatedName("at") + long field1423; + @ObfuscatedName("ah") + String field1422; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lte;" + descriptor = "Lfv;" ) - @Export("loginType") - static LoginType loginType; + final class147 this$0; + + @ObfuscatedSignature( + descriptor = "(Lfv;)V" + ) + class166(class147 var1) { + this.this$0 = var1; + this.field1423 = -1L; + this.field1422 = null; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Luj;I)V", + garbageValue = "-734756620" + ) + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1423 = var1.readLong(); + } + + this.field1422 = var1.readStringCp1252NullTerminatedOrNull(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" + ) + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method808(this.field1423, this.field1422); + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "41" + ) + public static void method866() { + ItemComposition.ItemDefinition_cachedSprites.clear(); + } } \ No newline at end of file diff --git a/osrs/src/main/java/class167.java b/osrs/src/main/java/class167.java index ca1c3dee8..039b5be16 100644 --- a/osrs/src/main/java/class167.java +++ b/osrs/src/main/java/class167.java @@ -2,102 +2,126 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") -public class class167 extends class145 { - @ObfuscatedName("ac") - long field1420; - @ObfuscatedName("al") - String field1419; +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; + +@ObfuscatedName("ga") +public class class167 extends class160 { + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "Lro;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("at") + String field1427; + @ObfuscatedName("ah") + byte field1425; + @ObfuscatedName("ar") + byte field1426; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lgi;" ) - final class148 this$0; + final class161 this$0; @ObfuscatedSignature( - descriptor = "(Lff;)V" + descriptor = "(Lgi;)V" ) - class167(class148 var1) { + class167(class161 var1) { this.this$0 = var1; - this.field1420 = -1L; - this.field1419 = null; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" + descriptor = "(Luj;I)V", + garbageValue = "1810249387" ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1420 = var1.readLong(); + @Export("vmethod3238") + void vmethod3238(Buffer var1) { + this.field1427 = var1.readStringCp1252NullTerminatedOrNull(); + if (this.field1427 != null) { + var1.readUnsignedByte(); + this.field1425 = var1.readByte(); + this.field1426 = var1.readByte(); } - this.field1419 = var1.readStringCp1252NullTerminatedOrNull(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" + descriptor = "(Lgn;B)V", + garbageValue = "-75" ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method820(this.field1420, this.field1419); + @Export("vmethod3239") + void vmethod3239(ClanChannel var1) { + var1.name = this.field1427; + if (this.field1427 != null) { + var1.field1417 = this.field1425; + var1.field1418 = this.field1426; + } + } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;Ltp;B)Ltp;", - garbageValue = "8" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1882833719" ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); - int var3; - if (var1 == null) { - var3 = EnumComposition.method999(var2); - var1 = new IterableNodeHashTable(var3); - } - - for (var3 = 0; var3 < var2; ++var3) { - boolean var4 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); - } - - var1.put((Node)var6, (long)var5); - } + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; + } - return var1; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIIIB)I", + garbageValue = "21" + ) + static final int method867(int var0, int var1, int var2, int var3) { + return var3 * var0 + var2 * var1 >> 16; } - @ObfuscatedName("ax") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(Lom;Ljava/lang/String;Ljava/lang/String;I)Lun;", - garbageValue = "-2109687814" + descriptor = "(I)I", + garbageValue = "-139333947" ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - if (!var0.isValidFileName(var1, var2)) { - return null; - } else { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - IndexedSprite var5; - if (!class164.method862(var0, var3, var4)) { - var5 = null; - } else { - var5 = Widget.method1844(); + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; + if (UserComparator10.garbageCollector == null || !UserComparator10.garbageCollector.isValid()) { + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + UserComparator10.garbageCollector = var2; + GameEngine.garbageCollectorLastCheckTimeMs = -1L; + GameEngine.garbageCollectorLastCollectionTime = -1L; + } + } + } catch (Throwable var11) { + } + } + + if (UserComparator10.garbageCollector != null) { + long var9 = SpotAnimationDefinition.method962(); + long var3 = UserComparator10.garbageCollector.getCollectionTime(); + if (-1L != GameEngine.garbageCollectorLastCollectionTime) { + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; + if (var7 != 0L) { + var0 = (int)(var5 * 100L / var7); + } } - return var5; + GameEngine.garbageCollectorLastCollectionTime = var3; + GameEngine.garbageCollectorLastCheckTimeMs = var9; } + + return var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class168.java b/osrs/src/main/java/class168.java index 284f80416..21832f074 100644 --- a/osrs/src/main/java/class168.java +++ b/osrs/src/main/java/class168.java @@ -2,163 +2,93 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") -public class class168 extends class161 { - @ObfuscatedName("ac") - String field1423; - @ObfuscatedName("al") - byte field1422; - @ObfuscatedName("ak") - byte field1421; +@ObfuscatedName("gf") +public class class168 extends class144 { + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lol;" + ) + public static AbstractArchive field1428; + @ObfuscatedName("at") + int field1429; + @ObfuscatedName("ah") + long field1430; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lfv;" ) - final class162 this$0; + final class147 this$0; @ObfuscatedSignature( - descriptor = "(Lgf;)V" + descriptor = "(Lfv;)V" ) - class168(class162 var1) { + class168(class147 var1) { this.this$0 = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;B)V", - garbageValue = "0" + descriptor = "(Luj;I)V", + garbageValue = "-734756620" ) - @Export("vmethod3238") - void vmethod3238(Buffer var1) { - this.field1423 = var1.readStringCp1252NullTerminatedOrNull(); - if (this.field1423 != null) { - var1.readUnsignedByte(); - this.field1422 = var1.readByte(); - this.field1421 = var1.readByte(); - } - + @Export("vmethod3254") + void vmethod3254(Buffer var1) { + this.field1429 = var1.readInt(); + this.field1430 = var1.readLong(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgb;B)V", - garbageValue = "0" + descriptor = "(Lfc;I)V", + garbageValue = "-2111347169" ) - @Export("vmethod3239") - void vmethod3239(ClanChannel var1) { - var1.name = this.field1423; - if (this.field1423 != null) { - var1.field1414 = this.field1422; - var1.field1413 = this.field1421; - } - + @Export("vmethod3248") + void vmethod3248(ClanSettings var1) { + var1.method816(this.field1429, this.field1430); } - @ObfuscatedName("ao") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "-85" + descriptor = "(ILdt;ZB)I", + garbageValue = "-89" ) - static int method878(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == 100) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = class33.widgetDefinition.method1740(var3); - if (var6.children == null) { - var6.children = new Widget[var5 + 1]; - } - - if (var6.children.length <= var5) { - Widget[] var7 = new Widget[var5 + 1]; - - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; - } - - var6.children = var7; - } - - if (var5 > 0 && var6.children[var5 - 1] == null) { - throw new RuntimeException("" + (var5 - 1)); - } else { - Widget var12 = new Widget(); - var12.type = var4; - var12.parentId = var12.id = var6.id; - var12.childIndex = var5; - var12.isIf3 = true; - if (var4 == 12) { - var12.method1876(); - var12.method1877().method1810(new class107(var12)); - var12.method1877().method1809(new class108(var12)); - } - - var6.children[var5] = var12; - if (var2) { - class416.scriptDotWidget = var12; - } else { - class306.scriptActiveWidget = var12; - } - - ClanChannelMember.invalidateWidget(var6); - return 1; - } - } + static int method874(int var0, Script var1, boolean var2) { + Widget var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + if (var0 == 2500) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == 2501) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == 2502) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == 2503) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == 2504) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == 2505) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.parentId; + return 1; } else { - Widget var9; - if (var0 == 101) { - var9 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - Widget var10 = class33.widgetDefinition.method1740(var9.id); - var10.children[var9.childIndex] = null; - ClanChannelMember.invalidateWidget(var10); - return 1; - } else if (var0 == 102) { - var9 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var9.children = null; - ClanChannelMember.invalidateWidget(var9); - return 1; - } else if (var0 != 200) { - if (var0 == 201) { - var9 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - if (var2) { - class416.scriptDotWidget = var9; - } else { - class306.scriptActiveWidget = var9; - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Widget var11 = class33.widgetDefinition.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - if (var2) { - class416.scriptDotWidget = var11; - } else { - class306.scriptActiveWidget = var11; - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } + return 2; + } + } - return 1; - } + @ObfuscatedName("ou") + @ObfuscatedSignature( + descriptor = "(II)Lte;", + garbageValue = "-847126653" + ) + static class518 method875(int var0) { + class518 var1 = (class518)Client.Widget_cachedModels.get((long)var0); + if (var1 == null) { + var1 = new class518(class267.field2224, SequenceDefinition.method1041(var0), ZoneOperation.method1630(var0)); + Client.Widget_cachedModels.put(var1, (long)var0); } + + return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class169.java b/osrs/src/main/java/class169.java deleted file mode 100644 index f55f9ba74..000000000 --- a/osrs/src/main/java/class169.java +++ /dev/null @@ -1,73 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gz") -public class class169 extends class145 { - @ObfuscatedName("ac") - int field1424; - @ObfuscatedName("al") - long field1425; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lff;" - ) - final class148 this$0; - - @ObfuscatedSignature( - descriptor = "(Lff;)V" - ) - class169(class148 var1) { - this.this$0 = var1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-11659242" - ) - @Export("vmethod3254") - void vmethod3254(Buffer var1) { - this.field1424 = var1.readInt(); - this.field1425 = var1.readLong(); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Lgi;I)V", - garbageValue = "21847466" - ) - @Export("vmethod3248") - void vmethod3248(ClanSettings var1) { - var1.method829(this.field1424, this.field1425); - } - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "-23" - ) - static int method881(int var0, Script var1, boolean var2) { - if (var0 == 6809) { - int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ObjectComposition var4 = class91.getObjectDefinition(var3); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("lw") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "815194863" - ) - static String method882(int var0) { - if (var0 < 0) { - return ""; - } else { - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class17.java b/osrs/src/main/java/class17.java index 9d0566bb4..511d98c78 100644 --- a/osrs/src/main/java/class17.java +++ b/osrs/src/main/java/class17.java @@ -6,26 +6,23 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSessionContext; import javax.security.cert.X509Certificate; -import java.io.File; -import java.io.IOException; import java.security.Principal; import java.security.cert.Certificate; -@ObfuscatedName("au") +@ObfuscatedName("am") class class17 implements SSLSession { - @ObfuscatedName("ku") - @Export("cameraY") - static int cameraY; + @ObfuscatedName("ah") + public static String field53; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Lax;" ) @Export("this$1") @ObfuscatedName("this$1") final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lap;)V" + descriptor = "(Lax;)V" ) class17(class12 var1) { this.this$1 = var1; @@ -70,7 +67,7 @@ public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedExcep } public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { - return this.this$1.field34; + return this.this$1.field43; } public String getPeerHost() { @@ -129,461 +126,138 @@ public void removeValue(String var1) { throw new UnsupportedOperationException(); } - @ObfuscatedName("ak") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lto;", - garbageValue = "110" + descriptor = "(BI)C", + garbageValue = "-1889470685" ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(class500.cacheDir, "preferences" + var0 + ".dat"); - if (var3.exists()) { - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { - } - } - - String var4 = ""; - if (FileSystem.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (FileSystem.cacheGamebuild == 34) { - var4 = "_wip"; - } + public static char method60(byte var0) { + int var1 = var0 & 255; + if (var1 == 0) { + throw new IllegalArgumentException("" + Integer.toString(var1, 16)); + } else { + if (var1 >= 128 && var1 < 160) { + char var2 = class396.cp1252AsciiExtension[var1 - 128]; + if (var2 == 0) { + var2 = '?'; + } - File var5 = new File(DevicePcmPlayerProvider.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); - AccessFile var6; - if (!var2 && var5.exists()) { - try { - var6 = new AccessFile(var5, "rw", 10000L); - return var6; - } catch (IOException var8) { + var1 = var2; } - } - try { - var6 = new AccessFile(var3, "rw", 10000L); - return var6; - } catch (IOException var7) { - throw new RuntimeException(); + return (char)var1; } } - @ObfuscatedName("ar") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "201012705" + descriptor = "(ILdt;ZB)I", + garbageValue = "-81" ) - static int method56(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var3 = class33.widgetDefinition.method1740(var4); + static int method62(int var0, Script var1, boolean var2) { + if (var0 == 6809) { + int var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + ObjectComposition var4 = WorldMapSection2.getObjectDefinition(var3); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; + return 1; } else { - var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + return 2; } + } - int var10; - if (var0 == 1100) { - Interpreter.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3.type == 12) { - class344 var7 = var3.method1877(); - if (var7 != null && var7.method1772(var10, var6)) { - ClanChannelMember.invalidateWidget(var3); - } - } else { - var3.scrollX = var10; - if (var3.scrollX > var3.scrollWidth - var3.width) { - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { - var3.scrollX = 0; - } - - var3.scrollY = var6; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1059264411" + ) + static void method61() { + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1167 = null; + Client.packetWriter.field1168 = null; + Client.packetWriter.field1166 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1164 = 0; + Client.rebootTimer = 0; + class160.method840(); + Client.minimapState = 0; + Client.destinationX = 0; + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; + } - if (var3.scrollY < 0) { - var3.scrollY = 0; - } + class229.localPlayer = null; - ClanChannelMember.invalidateWidget(var3); + for (var0 = 0; var0 < Client.npcs.length; ++var0) { + NPC var1 = Client.npcs[var0]; + if (var1 != null) { + var1.targetIndex = -1; + var1.false0 = false; } + } - return 1; - } else if (var0 == 1101) { - var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1102) { - var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1103) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1104) { - var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1105) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1106) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1107) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1108) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1109) { - Interpreter.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1110) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var10 != var3.sequenceId) { - var3.sequenceId = var10; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - ClanChannelMember.invalidateWidget(var3); - } + class59.method332(); + WorldMapSection2.updateGameState(30); - return 1; - } else if (var0 == 1111) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else { - class344 var9; - if (var0 != 1112) { - class344 var12; - if (var0 == 1113) { - var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3.type == 12) { - var12 = var3.method1877(); - if (var12 != null) { - var12.method1779(); - } - } - - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1114) { - Interpreter.Interpreter_intStackSize -= 3; - if (var3.type == 12) { - var12 = var3.method1877(); - if (var12 != null) { - var12.method1773(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - var12.method1774(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); - } - } else { - var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - } - - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1115) { - var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1116) { - var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1117) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1118) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1119) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1120) { - Interpreter.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - ClanChannelMember.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - PendingSpawn.revalidateWidgetScroll(class33.widgetDefinition.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == 1121) { - class174.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1123) { - var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1125) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FillMode var13 = (FillMode)SequenceDefinition.findEnumerated(class472.FillMode_values(), var10); - if (var13 != null) { - var3.fillMode = var13; - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else { - boolean var5; - if (var0 == 1126) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - var3.field2989 = var5; - return 1; - } else if (var0 == 1127) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else if (var0 == 1129) { - var3.field3119 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - ClanChannelMember.invalidateWidget(var3); - return 1; - } else if (var0 == 1130) { - var3.method1861(Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize], AbstractWorldMapIcon.urlRequester, class304.method1635()); - return 1; - } else if (var0 == 1131) { - Interpreter.Interpreter_intStackSize -= 2; - var3.method1864(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == 1132) { - var3.method1865(Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else { - class339 var14; - if (var0 == 1133) { - --Interpreter.Interpreter_intStackSize; - var14 = var3.method1878(); - if (var14 != null) { - var14.field2923 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1134) { - --Interpreter.Interpreter_intStackSize; - var14 = var3.method1878(); - if (var14 != null) { - var14.field2925 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1135) { - --class180.Interpreter_stringStackSize; - var12 = var3.method1877(); - if (var12 != null) { - var3.text2 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; - } - - return 1; - } else if (var0 == 1136) { - --Interpreter.Interpreter_intStackSize; - var14 = var3.method1878(); - if (var14 != null) { - var14.field2924 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1137) { - --Interpreter.Interpreter_intStackSize; - var12 = var3.method1877(); - if (var12 != null && var12.method1769(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1138) { - --Interpreter.Interpreter_intStackSize; - var12 = var3.method1877(); - if (var12 != null && var12.method1770(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1139) { - --Interpreter.Interpreter_intStackSize; - var12 = var3.method1877(); - if (var12 != null && var12.method1771(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1140) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Client.field422.method1134(); - var9 = var3.method1877(); - if (var9 != null && var9.method1763(var5)) { - if (var5) { - Client.field422.method1132(var3); - } - - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1141) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (!var5 && Client.field422.method1133() == var3) { - Client.field422.method1134(); - ClanChannelMember.invalidateWidget(var3); - } - - var9 = var3.method1877(); - if (var9 != null) { - var9.method1764(var5); - } - - return 1; - } else if (var0 == 1142) { - Interpreter.Interpreter_intStackSize -= 2; - var12 = var3.method1877(); - if (var12 != null && var12.method1787(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1])) { - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1143) { - --Interpreter.Interpreter_intStackSize; - var12 = var3.method1877(); - if (var12 != null && var12.method1787(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize])) { - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1144) { - --Interpreter.Interpreter_intStackSize; - var12 = var3.method1877(); - if (var12 != null) { - var12.method1776(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else if (var0 == 1145) { - --Interpreter.Interpreter_intStackSize; - var12 = var3.method1877(); - if (var12 != null) { - var12.method1775(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - } - - return 1; - } else if (var0 == 1146) { - --Interpreter.Interpreter_intStackSize; - var12 = var3.method1877(); - if (var12 != null) { - var12.method1778(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - } - - return 1; - } else if (var0 == 1147) { - --Interpreter.Interpreter_intStackSize; - var12 = var3.method1877(); - if (var12 != null) { - var12.method1777(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - ClanChannelMember.invalidateWidget(var3); - } - - return 1; - } else { - class27 var11; - if (var0 == 1148) { - Interpreter.Interpreter_intStackSize -= 2; - var11 = var3.method1879(); - if (var11 != null) { - var11.method102(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - } - - return 1; - } else if (var0 == 1149) { - Interpreter.Interpreter_intStackSize -= 2; - var11 = var3.method1879(); - if (var11 != null) { - var11.method104((char)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - } - - return 1; - } else if (var0 == 1150) { - var3.method1862(Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize], AbstractWorldMapIcon.urlRequester); - return 1; - } else { - return 2; - } - } - } - } - } else { - String var8 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - if (!var8.equals(var3.text)) { - if (var3.type == 12) { - var9 = var3.method1877(); - if (var9 != null && var9.method1819()) { - var9.method1765(var8); - } else { - var3.text = var8; - } - } else { - var3.text = var8; - } - - ClanChannelMember.invalidateWidget(var3); - } + for (var0 = 0; var0 < 100; ++var0) { + Client.field407[var0] = true; + } - return 1; - } + if (Client.packetWriter != null && Client.packetWriter.isaacCipher != null) { + PacketBufferNode var2 = class113.getPacketBufferNode(ClientPacket.EVENT_MOUSE_IDLE, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(ApproximateRouteStrategy.getWindowedMode()); + var2.packetBuffer.writeShort(Language.canvasWidth); + var2.packetBuffer.writeShort(class47.canvasHeight); + Client.packetWriter.addNode(var2); } + } - @ObfuscatedName("bi") + @ObfuscatedName("lo") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-236516761" + descriptor = "(Lnn;IIIIIII)V", + garbageValue = "-1558777613" ) - static int method57(int var0, Script var1, boolean var2) { - if (var0 == 7108) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = VarcInt.method976() ? 1 : 0; - return 1; + static final void method63(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field382) { + Client.alternativeScrollbarWidth = 32; } else { - return 2; + Client.alternativeScrollbarWidth = 0; + } + + Client.field382 = false; + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !class19.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + class159.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + class159.invalidateWidget(var0); + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { + var7 = var3 * (var3 - 32) / var4; + if (var7 < 8) { + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + class159.invalidateWidget(var0); + Client.field382 = true; + } + } + + if (Client.mouseWheelRotation != 0) { + var7 = var0.width; + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + var0.scrollY += Client.mouseWheelRotation * 45; + class159.invalidateWidget(var0); + } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class171.java b/osrs/src/main/java/class171.java index de8b776ff..16a9e6be7 100644 --- a/osrs/src/main/java/class171.java +++ b/osrs/src/main/java/class171.java @@ -2,48 +2,646 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") -public class class171 extends class183 { - @ObfuscatedName("tz") +@ObfuscatedName("gt") +public class class171 extends DualNode { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lbu;" + descriptor = "Llk;" ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("ac") - String field1428; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lgr;" - ) - final class172 this$0; + public static EvictingDualNodeHashTable field1438; - @ObfuscatedSignature( - descriptor = "(Lgr;Ljava/lang/String;Ljava/lang/String;)V" - ) - class171(class172 var1, String var2, String var3) { - super(var1, var2); - this.this$0 = var1; - this.field1428 = var3; + static { + field1438 = new EvictingDualNodeHashTable(64); } - @ObfuscatedName("ac") + @ObfuscatedName("jy") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1007456210" + descriptor = "(Ldf;IIIIIS)V", + garbageValue = "-15074" ) - @Export("vmethod3379") - public int vmethod3379() { - return 1; - } + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { + if (var0 instanceof NPC) { + NPCComposition var6 = ((NPC)var0).definition; + if (var6.transforms != null) { + var6 = var6.transform(); + } - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1667250407" - ) - @Export("vmethod3380") - public String vmethod3380() { - return this.field1428; + if (var6 == null) { + return; + } + } + + int var75 = Players.Players_count; + int[] var7 = Players.Players_indices; + boolean var8 = var1 < var75; + int var9 = -2; + if (var0.overheadText != null && (!var8 || !var0.showPublicPlayerChat && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + Canvas.method91(var0, var0.defaultHeight); + if (Client.viewportTempX > -1 && Client.overheadTextLimit < Client.overheadTextCount) { + Client.overheadTextXOffsets[Client.overheadTextLimit] = GrandExchangeOfferTotalQuantityComparator.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextLimit] = GrandExchangeOfferTotalQuantityComparator.fontBold12.ascent; + Client.overheadTextXs[Client.overheadTextLimit] = Client.viewportTempX; + Client.overheadTextYs[Client.overheadTextLimit] = Client.viewportTempY - var9; + Client.overheadTextColors[Client.overheadTextLimit] = var0.field1005; + Client.overheadTextEffects[Client.overheadTextLimit] = var0.field1003; + Client.overheadTextCyclesRemaining[Client.overheadTextLimit] = var0.overheadTextCyclesRemaining; + Client.field594[Client.overheadTextLimit] = var0.field1030; + Client.field601[Client.overheadTextLimit] = var0.overheadText; + ++Client.overheadTextLimit; + var9 += 12; + } + } + + int var15; + int var22; + int var23; + if (!var0.healthBars.method2027()) { + Canvas.method91(var0, var0.defaultHeight + 15); + + for (HealthBar var10 = (HealthBar)var0.healthBars.last(); var10 != null; var10 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var11 = var10.get(Client.cycle); + if (var11 == null) { + if (var10.isEmpty()) { + var10.remove(); + } + } else { + HealthBarDefinition var12 = var10.definition; + SpritePixels var13 = var12.getBackSprite(); + SpritePixels var14 = var12.getFrontSprite(); + int var16 = 0; + if (var13 != null && var14 != null) { + if (var12.widthPadding * 2 < var14.subWidth) { + var16 = var12.widthPadding; + } + + var15 = var14.subWidth - var16 * 2; + } else { + var15 = var12.width; + } + + int var17 = 255; + boolean var18 = true; + int var19 = Client.cycle - var11.cycle; + int var20 = var15 * var11.health2 / var12.width; + int var21; + int var99; + if (var11.cycleOffset > var19) { + var21 = var12.field1498 == 0 ? 0 : var12.field1498 * (var19 / var12.field1498); + var22 = var15 * var11.health / var12.width; + var99 = var21 * (var20 - var22) / var11.cycleOffset + var22; + } else { + var99 = var20; + var21 = var12.int5 + var11.cycleOffset - var19; + if (var12.int3 >= 0) { + var17 = (var21 << 8) / (var12.int5 - var12.int3); + } + } + + if (var11.health2 > 0 && var99 < 1) { + var99 = 1; + } + + if (var13 != null && var14 != null) { + if (var99 == var15) { + var99 += var16 * 2; + } else { + var99 += var16; + } + + var21 = var13.subHeight; + var9 += var21; + var22 = var2 + Client.viewportTempX - (var15 >> 1); + var23 = var3 + Client.viewportTempY - var9; + var22 -= var16; + if (var17 >= 0 && var17 < 255) { + var13.drawTransAt(var22, var23, var17); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var99 + var22, var23 + var21); + var14.drawTransAt(var22, var23, var17); + } else { + var13.drawTransBgAt(var22, var23); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var99 + var22, var23 + var21); + var14.drawTransBgAt(var22, var23); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var9 += 2; + } else { + var9 += 5; + if (Client.viewportTempX > -1) { + var21 = var2 + Client.viewportTempX - (var15 >> 1); + var22 = var3 + Client.viewportTempY - var9; + Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var99, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var99 + var21, var22, var15 - var99, 5, 16711680); + } + + var9 += 2; + } + } + } + } + + if (var9 == -2) { + var9 += 7; + } + + if (var8 && var0.playerCycle == Client.cycle) { + Player var92 = (Player)var0; + boolean var76; + if (Client.drawPlayerNames == 0) { + var76 = false; + } else if (var92 != class229.localPlayer) { + boolean var77 = (Client.drawPlayerNames & 4) != 0; + boolean var78 = var77 || AbstractByteArrayCopier.method1879() && var92.isFriend(); + if (!var78) { + boolean var79 = (Client.drawPlayerNames & 2) != 0; + var78 = var79 && var92.method485(); + } + + var76 = var78; + } else { + var76 = Projectile.method442(); + } + + if (var76) { + Player var94 = (Player)var0; + if (var8) { + Canvas.method91(var0, var0.defaultHeight + 15); + AbstractFont var96 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + var9 += 4; + var96.drawCentered(var94.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var9, 16777215, 0); + var9 += 18; + } + } + } + + if (var8) { + Player var90 = (Player)var0; + if (var90.isHidden) { + return; + } + + if (var90.headIconPk != -1 || var90.headIconPrayer != -1) { + Canvas.method91(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + if (var90.headIconPk != -1) { + var9 += 25; + UrlRequest.headIconPkSprites[var90.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); + } + + if (var90.headIconPrayer != -1) { + var9 += 25; + AbstractByteArrayCopier.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + Canvas.method91(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var9 += class60.headIconHintSprites[1].subHeight; + class60.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); + } + } + } else { + NPC var91 = (NPC)var0; + int[] var93 = var91.method584(); + short[] var95 = var91.method585(); + if (var95 != null && var93 != null) { + for (int var103 = 0; var103 < var95.length; ++var103) { + if (var95[var103] >= 0 && var93[var103] >= 0) { + long var80 = (long)var93[var103] << 8 | (long)var95[var103]; + SpritePixels var82 = (SpritePixels)Client.field631.method2196(var80); + if (var82 == null) { + SpritePixels[] var83 = VertexNormal.method1568(GrandExchangeOfferOwnWorldComparator.archive8, var93[var103], 0); + if (var83 != null && var95[var103] < var83.length) { + var82 = var83[var95[var103]]; + Client.field631.method2197(var80, var82); + } + } + + if (var82 != null) { + Canvas.method91(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var82.drawTransBgAt(var2 + Client.viewportTempX - (var82.subWidth >> 1), Client.viewportTempY + (var3 - var82.subHeight) - 4); + } + } + } + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + Canvas.method91(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + class60.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + for (int var101 = 0; var101 < 4; ++var101) { + int var84 = var0.hitSplatCycles[var101]; + int var102 = var0.hitSplatTypes[var101]; + HitSplatDefinition var97 = null; + int var104 = 0; + if (var102 >= 0) { + if (var84 <= Client.cycle) { + continue; + } + + var97 = class149.method776(var0.hitSplatTypes[var101]); + var104 = var97.field1658; + if (var97 != null && var97.transforms != null) { + var97 = var97.transform(); + if (var97 == null) { + var0.hitSplatCycles[var101] = -1; + continue; + } + } + } else if (var84 < 0) { + continue; + } + + var15 = var0.hitSplatTypes2[var101]; + HitSplatDefinition var105 = null; + if (var15 >= 0) { + var105 = class149.method776(var15); + if (var105 != null && var105.transforms != null) { + var105 = var105.transform(); + } + } + + if (var84 - var104 <= Client.cycle) { + if (var97 == null) { + var0.hitSplatCycles[var101] = -1; + } else { + Canvas.method91(var0, var0.defaultHeight / 2); + if (Client.viewportTempX > -1) { + boolean var98 = true; + if (var101 == 1) { + Client.viewportTempY -= 20; + } + + if (var101 == 2) { + Client.viewportTempX -= 15; + Client.viewportTempY -= 10; + } + + if (var101 == 3) { + Client.viewportTempX += 15; + Client.viewportTempY -= 10; + } + + SpritePixels var85 = null; + SpritePixels var86 = null; + SpritePixels var87 = null; + SpritePixels var88 = null; + var22 = 0; + var23 = 0; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + int var28 = 0; + int var29 = 0; + SpritePixels var30 = null; + SpritePixels var31 = null; + SpritePixels var32 = null; + SpritePixels var33 = null; + int var34 = 0; + int var35 = 0; + int var36 = 0; + int var37 = 0; + int var38 = 0; + int var39 = 0; + int var40 = 0; + int var41 = 0; + int var42 = 0; + var85 = var97.method992(); + int var43; + if (var85 != null) { + var22 = var85.subWidth; + var43 = var85.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var26 = var85.xOffset; + } + + var86 = var97.method993(); + if (var86 != null) { + var23 = var86.subWidth; + var43 = var86.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var27 = var86.xOffset; + } + + var87 = var97.method995(); + if (var87 != null) { + var24 = var87.subWidth; + var43 = var87.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var28 = var87.xOffset; + } + + var88 = var97.method996(); + if (var88 != null) { + var25 = var88.subWidth; + var43 = var88.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var29 = var88.xOffset; + } + + if (var105 != null) { + var30 = var105.method992(); + if (var30 != null) { + var34 = var30.subWidth; + var43 = var30.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var38 = var30.xOffset; + } + + var31 = var105.method993(); + if (var31 != null) { + var35 = var31.subWidth; + var43 = var31.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var39 = var31.xOffset; + } + + var32 = var105.method995(); + if (var32 != null) { + var36 = var32.subWidth; + var43 = var32.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var40 = var32.xOffset; + } + + var33 = var105.method996(); + if (var33 != null) { + var37 = var33.subWidth; + var43 = var33.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var41 = var33.xOffset; + } + } + + Font var89 = var97.getFont(); + if (var89 == null) { + var89 = class369.fontPlain11; + } + + Font var44; + if (var105 != null) { + var44 = var105.getFont(); + if (var44 == null) { + var44 = class369.fontPlain11; + } + } else { + var44 = class369.fontPlain11; + } + + String var45 = null; + String var46 = null; + boolean var47 = false; + int var48 = 0; + var45 = var97.getString(var0.hitSplatValues[var101]); + int var100 = var89.stringWidth(var45); + if (var105 != null) { + var46 = var105.getString(var0.hitSplatValues2[var101]); + var48 = var44.stringWidth(var46); + } + + int var49 = 0; + int var50 = 0; + if (var23 > 0) { + if (var87 == null && var88 == null) { + var49 = 1; + } else { + var49 = var100 / var23 + 1; + } + } + + if (var105 != null && var35 > 0) { + if (var32 == null && var33 == null) { + var50 = 1; + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; + int var52 = var51; + if (var22 > 0) { + var51 += var22; + } + + var51 += 2; + int var53 = var51; + if (var24 > 0) { + var51 += var24; + } + + int var54 = var51; + int var55 = var51; + int var56; + if (var23 > 0) { + var56 = var23 * var49; + var51 += var56; + var55 += (var56 - var100) / 2; + } else { + var51 += var100; + } + + var56 = var51; + if (var25 > 0) { + var51 += var25; + } + + int var57 = 0; + int var58 = 0; + int var59 = 0; + int var60 = 0; + int var61 = 0; + int var62; + if (var105 != null) { + var51 += 2; + var57 = var51; + if (var34 > 0) { + var51 += var34; + } + + var51 += 2; + var58 = var51; + if (var36 > 0) { + var51 += var36; + } + + var59 = var51; + var61 = var51; + if (var35 > 0) { + var62 = var35 * var50; + var51 += var62; + var61 += (var62 - var48) / 2; + } else { + var51 += var48; + } + + var60 = var51; + if (var37 > 0) { + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var101] - Client.cycle; + int var63 = var97.field1657 - var62 * var97.field1657 / var97.field1658; + int var64 = var62 * var97.field1655 / var97.field1658 + -var97.field1655; + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); + int var66 = var64 + (var3 + Client.viewportTempY - 12); + int var67 = var66; + int var68 = var66 + var42; + int var69 = var66 + var97.field1654 + 15; + int var70 = var69 - var89.maxAscent; + int var71 = var69 + var89.maxDescent; + if (var70 < var66) { + var67 = var70; + } + + if (var71 > var68) { + var68 = var71; + } + + int var72 = 0; + int var73; + int var74; + if (var105 != null) { + var72 = var66 + var105.field1654 + 15; + var73 = var72 - var44.maxAscent; + var74 = var72 + var44.maxDescent; + if (var73 < var67) { + ; + } + + if (var74 > var68) { + ; + } + } + + var73 = 255; + if (var97.field1659 >= 0) { + var73 = (var62 << 8) / (var97.field1658 - var97.field1659); + } + + if (var73 >= 0 && var73 < 255) { + if (var85 != null) { + var85.drawTransAt(var65 + var52 - var26, var66, var73); + } + + if (var87 != null) { + var87.drawTransAt(var53 + var65 - var28, var66, var73); + } + + if (var86 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var86.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); + } + } + + if (var88 != null) { + var88.drawTransAt(var65 + var56 - var29, var66, var73); + } + + var89.drawAlpha(var45, var55 + var65, var69, var97.textColor, 0, var73); + if (var105 != null) { + if (var30 != null) { + var30.drawTransAt(var57 + var65 - var38, var66, var73); + } + + if (var32 != null) { + var32.drawTransAt(var65 + var58 - var40, var66, var73); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); + } + } + + if (var33 != null) { + var33.drawTransAt(var60 + var65 - var41, var66, var73); + } + + var44.drawAlpha(var46, var61 + var65, var72, var105.textColor, 0, var73); + } + } else { + if (var85 != null) { + var85.drawTransBgAt(var52 + var65 - var26, var66); + } + + if (var87 != null) { + var87.drawTransBgAt(var65 + var53 - var28, var66); + } + + if (var86 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var86.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); + } + } + + if (var88 != null) { + var88.drawTransBgAt(var65 + var56 - var29, var66); + } + + var89.draw(var45, var65 + var55, var69, var97.textColor | -16777216, 0); + if (var105 != null) { + if (var30 != null) { + var30.drawTransBgAt(var65 + var57 - var38, var66); + } + + if (var32 != null) { + var32.drawTransBgAt(var58 + var65 - var40, var66); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransBgAt(var74 * var35 + (var59 + var65 - var39), var66); + } + } + + if (var33 != null) { + var33.drawTransBgAt(var60 + var65 - var41, var66); + } + + var44.draw(var46, var65 + var61, var72, var105.textColor | -16777216, 0); + } + } + } + } + } + } + + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class172.java b/osrs/src/main/java/class172.java index 1cb9d367b..e5394ee04 100644 --- a/osrs/src/main/java/class172.java +++ b/osrs/src/main/java/class172.java @@ -1,511 +1,24 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -@ObfuscatedName("gr") -public class class172 { - @ObfuscatedName("am") - int field1431; - @ObfuscatedName("av") - String field1433; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - UrlRequest field1429; - @ObfuscatedName("aa") - String field1432; - @ObfuscatedName("ap") - float[] field1430; - @ObfuscatedName("ay") - ArrayList field1436; - @ObfuscatedName("as") - ArrayList field1435; - @ObfuscatedName("aj") - ArrayList field1434; - @ObfuscatedName("an") - Map field1437; - @ObfuscatedName("au") - Map field1438; - - public class172() { - this.field1431 = -1; - this.field1432 = null; - this.field1430 = new float[4]; - this.field1436 = new ArrayList(); - this.field1435 = new ArrayList(); - this.field1434 = new ArrayList(); - this.field1437 = new HashMap(); - this.field1438 = new HashMap(); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Len;I)Z", - garbageValue = "2131230297" - ) - public boolean method887(String var1, UrlRequester var2) { - if (var1 != null && !var1.isEmpty()) { - if (var2 == null) { - return false; - } else { - this.method899(); - - try { - this.field1433 = var1; - this.field1429 = var2.request(new URL(this.field1433)); - this.field1431 = 0; - return true; - } catch (MalformedURLException var4) { - this.method899(); - this.field1431 = 100; - return false; - } - } - } else { - return false; - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Len;I)V", - garbageValue = "-1476947490" - ) - public void method888(UrlRequester var1) { - switch(this.field1431) { - case 0: - this.method900(var1); - break; - case 1: - this.method901(); - break; - default: - return; - } - - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1358158711" - ) - public int method890() { - return this.field1431; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "778119532" - ) - public int method891(String var1) { - return this.field1437.containsKey(var1) ? (Integer)this.field1437.get(var1) : -1; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1794264749" - ) - public String method892(String var1) { - return (String)((String)(this.field1438.containsKey(var1) ? this.field1438.get(var1) : null)); - } - - @ObfuscatedName("ah") +@ObfuscatedName("gg") +public class class172 extends DualNode { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/ArrayList;", - garbageValue = "-1636742003" + descriptor = "Llk;" ) - public ArrayList method893() { - return this.field1435; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/ArrayList;", - garbageValue = "-1336792690" - ) - public ArrayList method894() { - return this.field1434; - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-5" - ) - public String method896() { - return this.field1432; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(B)[F", - garbageValue = "82" - ) - public float[] method897() { - return this.field1430; - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/ArrayList;", - garbageValue = "-1672118960" - ) - public ArrayList method898() { - return this.field1436; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - void method899() { - this.field1429 = null; - this.field1432 = null; - this.field1430[0] = 0.0F; - this.field1430[1] = 0.0F; - this.field1430[2] = 1.0F; - this.field1430[3] = 1.0F; - this.field1436.clear(); - this.field1435.clear(); - this.field1434.clear(); - this.field1437.clear(); - this.field1438.clear(); - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Len;S)V", - garbageValue = "182" - ) - void method900(UrlRequester var1) { - if (this.field1429 != null && this.field1429.isDone()) { - byte[] var2 = this.field1429.getResponse(); - if (var2 == null) { - this.method899(); - this.field1431 = 100; - } else { - try { - this.method906(new class477(var2), var1); - } catch (UnsupportedEncodingException var4) { - this.method899(); - this.field1431 = 102; - return; - } - - this.field1431 = this.field1435.size() > 0 ? 1 : 2; - this.field1429 = null; - } - } - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "14" - ) - void method901() { - Iterator var1 = this.field1435.iterator(); - - class178 var2; - do { - if (!var1.hasNext()) { - var1 = this.field1435.iterator(); - - while (var1.hasNext()) { - var2 = (class178)var1.next(); - if (var2.field1460 != null) { - byte[] var3 = var2.field1460.getResponse(); - if (var3 != null && var3.length > 0) { - this.field1431 = 2; - return; - } - } - } - - this.method899(); - this.field1431 = 101; - return; - } - - var2 = (class178)var1.next(); - } while(var2.field1460 == null || var2.field1460.isDone()); - - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONArray;Len;I)V", - garbageValue = "-2004474628" - ) - void method902(JSONArray var1, UrlRequester var2) throws JSONException { - if (var1 != null) { - for (int var3 = 0; var3 < var1.length(); ++var3) { - try { - JSONObject var4 = var1.getJSONObject(var3); - class178 var5 = new class178(this); - var5.field1460 = var2.request(new URL(var4.getString("src"))); - var5.field1461 = FloorUnderlayDefinition.method1043(var4, "placement"); - this.field1435.add(var5); - } catch (MalformedURLException var6) { - } - } - - } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONArray;I)V", - garbageValue = "1577665850" - ) - void method903(JSONArray var1) throws JSONException { - if (var1 != null) { - for (int var2 = 0; var2 < var1.length(); ++var2) { - JSONObject var3 = var1.getJSONObject(var2); - class179 var4 = new class179(this); - var4.field1466 = var3.getString("text"); - String var7 = var3.getString("align_x"); - byte var6; - if (var7.equals("centre")) { - var6 = 1; - } else if (!var7.equals("bottom") && !var7.equals("right")) { - var6 = 0; - } else { - var6 = 2; - } - - var4.field1464 = var6; - String var10 = var3.getString("align_y"); - byte var9; - if (var10.equals("centre")) { - var9 = 1; - } else if (!var10.equals("bottom") && !var10.equals("right")) { - var9 = 0; - } else { - var9 = 2; - } - - var4.field1465 = var9; - var4.field1463 = var3.getInt("font"); - var4.field1462 = FloorUnderlayDefinition.method1043(var3, "placement"); - this.field1434.add(var4); - } - - } - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;B)V", - garbageValue = "-11" - ) - void method904(JSONObject var1) throws JSONException { - if (var1 != null) { - this.field1430 = FloorUnderlayDefinition.method1043(var1, "clickbounds"); - this.field1432 = var1.getString("endpoint"); - String[] var2 = JSONObject.getNames(var1); - - for (int var3 = 0; var3 < var1.length(); ++var3) { - if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { - try { - int var4 = var1.getInt(var2[var3]); - this.field1436.add(new class180(this, var2[var3], var4)); - } catch (Exception var8) { - try { - String var5 = var1.getString(var2[var3]); - if (var5.equals("true")) { - this.field1436.add(new class180(this, var2[var3], 1)); - } else if (var5.equals("false")) { - this.field1436.add(new class180(this, var2[var3], 0)); - } else { - this.field1436.add(new class171(this, var2[var3], var5)); - } - } catch (Exception var7) { - } - } - } - } - - } - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;I)V", - garbageValue = "-451947529" - ) - void method905(JSONObject var1) throws JSONException { - String[] var2 = JSONObject.getNames(var1); - - for (int var3 = 0; var3 < var1.length(); ++var3) { - try { - int var4 = var1.getInt(var2[var3]); - this.field1437.put(var2[var3], var4); - } catch (Exception var8) { - try { - String var5 = var1.getString(var2[var3]); - if (var5.equals("true")) { - this.field1437.put(var2[var3], 1); - } else if (var5.equals("false")) { - this.field1437.put(var2[var3], 0); - } else { - this.field1438.put(var2[var3], var5); - } - } catch (Exception var7) { - } - } - } + static EvictingDualNodeHashTable field1439; + static { + field1439 = new EvictingDualNodeHashTable(64); } @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lsi;Len;B)V", - garbageValue = "0" - ) - void method906(class477 var1, UrlRequester var2) { - JSONObject var3; - try { - var3 = var1.method2379(); - var3 = var3.getJSONObject("message"); - } catch (Exception var9) { - this.method899(); - this.field1431 = 102; - return; - } - - try { - this.method902(var3.getJSONArray("images"), var2); - } catch (Exception var8) { - this.field1435.clear(); - } - - try { - this.method903(var3.getJSONArray("labels")); - } catch (Exception var7) { - this.field1434.clear(); - } - - try { - this.method904(var3.getJSONObject("behaviour")); - } catch (Exception var6) { - this.field1432 = null; - this.field1430[0] = 0.0F; - this.field1430[1] = 0.0F; - this.field1430[2] = 1.0F; - this.field1430[3] = 1.0F; - this.field1436.clear(); - } - - try { - this.method905(var3.getJSONObject("meta")); - } catch (Exception var5) { - this.field1437.clear(); - this.field1438.clear(); - } - - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Len;I)Z", - garbageValue = "16776960" - ) - public boolean method907(String var1, UrlRequester var2) { - try { - this.method906(new class477(var1.getBytes()), var2); - this.field1431 = this.field1435.size() > 0 ? 1 : 2; - } catch (UnsupportedEncodingException var4) { - this.field1431 = 102; - } - - return this.field1431 < 100; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Lul;B)Ljava/lang/String;", - garbageValue = "100" - ) - @Export("readString") - public static String readString(Buffer var0) { - String var1; - try { - int var2 = var0.readUShortSmart(); - if (var2 > 32767) { - var2 = 32767; - } - - byte[] var3 = new byte[var2]; - var0.offset += class349.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = class92.decodeStringCp1252(var3, 0, var2); - var1 = var4; - } catch (Exception var6) { - var1 = "Cabbage"; - } - - return var1; - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-955507774" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; - if (var0 < 0 || var0 >= 65536) { - var0 >>>= 16; - var1 += 16; - } - - if (var0 >= 256) { - var0 >>>= 8; - var1 += 8; - } - - if (var0 >= 16) { - var0 >>>= 4; - var1 += 4; - } - - if (var0 >= 4) { - var0 >>>= 2; - var1 += 2; - } - - if (var0 >= 1) { - var0 >>>= 1; - ++var1; - } - - return var0 + var1; - } - - @ObfuscatedName("ny") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1926904038" + garbageValue = "-1030508482" ) - static final void method908() { - Client.field525 = Client.cycleCntr; - PcmPlayer.field180 = true; + public static void method883() { + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/class173.java b/osrs/src/main/java/class173.java new file mode 100644 index 000000000..996430105 --- /dev/null +++ b/osrs/src/main/java/class173.java @@ -0,0 +1,15 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gj") +public class class173 extends DualNode { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Llk;" + ) + static EvictingDualNodeHashTable field1440; + + static { + field1440 = new EvictingDualNodeHashTable(64); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class174.java b/osrs/src/main/java/class174.java index d0e5b4333..7d0630b8a 100644 --- a/osrs/src/main/java/class174.java +++ b/osrs/src/main/java/class174.java @@ -2,132 +2,47 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") -public class class174 { - @ObfuscatedName("gv") - static int field1446; - - @ObfuscatedName("lf") +@ObfuscatedName("gy") +public class class174 extends DualNode { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1751113687" + descriptor = "Llk;" ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = ClanChannelMember.getPacketBufferNode(ClientPacket.RESUME_PAUSEBUTTON, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeShort(var1); - var2.packetBuffer.writeIntME(var0); - Client.packetWriter.addNode(var2); - } - - @ObfuscatedName("le") + @Export("archive7") + static EvictingDualNodeHashTable archive7; + @ObfuscatedName("op") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1678554385" + descriptor = "Lcb;" ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { - var1 = var1.substring(0, var2) + "," + var1.substring(var2); - } + @Export("tempMenuAction") + static MenuAction tempMenuAction; - if (var1.length() > 9) { - return " " + Client.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + Client.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + Client.colorStartTag(16776960) + var1 + ""; - } + static { + archive7 = new EvictingDualNodeHashTable(64); } - @ObfuscatedName("mp") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([Lnm;II)V", - garbageValue = "-1247730840" + descriptor = "(II)I", + garbageValue = "-1688673442" ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !CollisionMap.isComponentHidden(var3))) { - if (var3.type == 0) { - if (!var3.isIf3 && CollisionMap.isComponentHidden(var3) && var3 != class64.mousedOverWidgetIf1) { - continue; - } - - drawModelComponents(var0, var3.id); - if (var3.children != null) { - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - class178.method926(var4.group); - } - } - - if (var3.type == 6) { - int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var8 = UserComparator9.runCs1(var3); - if (var8) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } - - if (var5 != -1) { - SequenceDefinition var6 = class36.SequenceDefinition_get(var5); - if (!var6.isCachedModelIdSet()) { - for (var3.modelFrameCycle += Client.field460; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; ClanChannelMember.invalidateWidget(var3)) { - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; - ++var3.modelFrame; - if (var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame = 0; - } - } - } - } else { - var3.modelFrame += Client.field460; - int var7 = var6.method1127(); - if (var3.modelFrame >= var7) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var7) { - var3.modelFrame = 0; - } - } - - ClanChannelMember.invalidateWidget(var3); - } - } - } - - if (var3.rotationKey != 0 && !var3.isIf3) { - int var9 = var3.rotationKey >> 16; - var5 = var3.rotationKey << 16 >> 16; - var9 *= Client.field460; - var5 *= Client.field460; - var3.modelAngleX = var9 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - ClanChannelMember.invalidateWidget(var3); - } - } - } - } - + public static int method884(int var0) { + return class476.field3936[var0 & 16383]; } - @ObfuscatedName("oc") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "512465925" + descriptor = "([BIII)I", + garbageValue = "-2127919093" ) - static void method917() { - if (Client.oculusOrbState == 1) { - Client.oculusOrbOnLocalPlayer = true; + public static int method885(byte[] var0, int var1, int var2) { + int var3 = -1; + + for (int var4 = var1; var4 < var2; ++var4) { + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; } + var3 = ~var3; + return var3; } } \ No newline at end of file diff --git a/osrs/src/main/java/class176.java b/osrs/src/main/java/class176.java index 4bf496e1f..080e90c7b 100644 --- a/osrs/src/main/java/class176.java +++ b/osrs/src/main/java/class176.java @@ -3,12 +3,56 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("gc") -public interface class176 { - @ObfuscatedName("ak") +public class class176 extends DualNode { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1993578896" + descriptor = "Llk;" ) - @Export("useRotation") - int useRotation(); + @Export("archive5") + static EvictingDualNodeHashTable archive5; + @ObfuscatedName("rw") + @ObfuscatedSignature( + descriptor = "Lem;" + ) + @Export("varcs") + static Varcs varcs; + + static { + archive5 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Lnn;I[B[BI)V", + garbageValue = "1486108437" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field3003 == null) { + if (var2 == null) { + return; + } + + var0.field3003 = new byte[11][]; + var0.field3004 = new byte[11][]; + var0.field3073 = new int[11]; + var0.field3072 = new int[11]; + } + + var0.field3003[var1] = var2; + if (var2 != null) { + var0.field2995 = true; + } else { + var0.field2995 = false; + + for (int var4 = 0; var4 < var0.field3003.length; ++var4) { + if (var0.field3003[var4] != null) { + var0.field2995 = true; + break; + } + } + } + + var0.field3004[var1] = var3; + } } \ No newline at end of file diff --git a/osrs/src/main/java/class178.java b/osrs/src/main/java/class178.java deleted file mode 100644 index 65cc08ab3..000000000 --- a/osrs/src/main/java/class178.java +++ /dev/null @@ -1,182 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.util.Random; - -@ObfuscatedName("gh") -public class class178 { - @ObfuscatedName("aj") - static int field1457; - @ObfuscatedName("jn") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("ks") - @ObfuscatedSignature( - descriptor = "[Lun;" - ) - static IndexedSprite[] field1459; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - public UrlRequest field1460; - @ObfuscatedName("al") - public float[] field1461; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lgr;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final class172 this$0; - - @ObfuscatedSignature( - descriptor = "(Lgr;)V" - ) - class178(class172 var1) { - this.this$0 = var1; - this.field1461 = new float[4]; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;I)I", - garbageValue = "-871910304" - ) - static final int method924(long var0, String var2) { - Random var3 = new Random(); - Buffer var4 = new Buffer(128); - Buffer var5 = new Buffer(128); - int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; - var4.writeByte(10); - - int var7; - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.writeInt(var6[0]); - var4.writeInt(var6[1]); - var4.writeLong(var0); - var4.writeLong(0L); - - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.encryptRsa(class74.field730, class74.field729); - var5.writeByte(10); - - for (var7 = 0; var7 < 3; ++var7) { - var5.writeInt(var3.nextInt()); - } - - var5.writeLong(var3.nextLong()); - var5.writeLongMedium(var3.nextLong()); - if (Client.randomDatData != null) { - var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var16 = class131.method706(); - var5.writeBytes(var16, 0, var16.length); - } - - var5.writeLong(var3.nextLong()); - var5.encryptRsa(class74.field730, class74.field729); - var7 = class478.stringCp1252NullTerminatedByteSize(var2); - if (var7 % 8 != 0) { - var7 += 8 - var7 % 8; - } - - Buffer var8 = new Buffer(var7); - var8.writeStringCp1252NullTerminated(var2); - var8.offset = var7; - var8.xteaEncryptAll(var6); - Buffer var9 = new Buffer(var5.offset + var4.offset + var8.offset + 5); - var9.writeByte(2); - var9.writeByte(var4.offset); - var9.writeBytes(var4.array, 0, var4.offset); - var9.writeByte(var5.offset); - var9.writeBytes(var5.array, 0, var5.offset); - var9.writeShort(var8.offset); - var9.writeBytes(var8.array, 0, var8.offset); - String var10 = class233.method1199(var9.array); - - try { - URL var11 = new URL(ScriptEvent.method474("services", false) + "m=accountappeal/login.ws"); - URLConnection var12 = var11.openConnection(); - var12.setDoInput(true); - var12.setDoOutput(true); - var12.setConnectTimeout(5000); - OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); - var13.write("data2=" + Timer.method2181(var10) + "&dest=" + Timer.method2181("passwordchoice.ws")); - var13.flush(); - InputStream var14 = var12.getInputStream(); - var9 = new Buffer(new byte[1000]); - - do { - int var15 = var14.read(var9.array, var9.offset, 1000 - var9.offset); - if (var15 == -1) { - var13.close(); - var14.close(); - String var17 = new String(var9.array); - if (var17.startsWith("OFFLINE")) { - return 4; - } else if (var17.startsWith("WRONG")) { - return 7; - } else if (var17.startsWith("RELOAD")) { - return 3; - } else if (var17.startsWith("Not permitted for social network accounts.")) { - return 6; - } else { - var9.xteaDecryptAll(var6); - - while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { - --var9.offset; - } - - var17 = new String(var9.array, 0, var9.offset); - if (ItemComposition.method1092(var17)) { - VertexNormal.openURL(var17, true, false); - return 2; - } else { - return 5; - } - } - } - - var9.offset += var15; - } while(var9.offset < 1000); - - return 5; - } catch (Throwable var18) { - var18.printStackTrace(); - return 5; - } - } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "10" - ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; - } - - @ObfuscatedName("mb") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1551769490" - ) - static final void method926(int var0) { - if (class33.widgetDefinition.loadInterface(var0)) { - class174.drawModelComponents(class33.widgetDefinition.Widget_interfaceComponents[var0], -1); - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class179.java b/osrs/src/main/java/class179.java deleted file mode 100644 index af0905e5a..000000000 --- a/osrs/src/main/java/class179.java +++ /dev/null @@ -1,50 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gg") -public class class179 { - @ObfuscatedName("ax") - public String field1466; - @ObfuscatedName("ao") - public float[] field1462; - @ObfuscatedName("ah") - public int field1464; - @ObfuscatedName("ar") - public int field1465; - @ObfuscatedName("ab") - public int field1463; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lgr;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final class172 this$0; - - @ObfuscatedSignature( - descriptor = "(Lgr;)V" - ) - class179(class172 var1) { - this.this$0 = var1; - this.field1462 = new float[4]; - this.field1464 = 1; - this.field1465 = 1; - this.field1463 = 0; - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(II)Lfl;", - garbageValue = "-1919119231" - ) - static class134 method927(int var0) { - class134[] var1 = new class134[]{class134.field1268, class134.field1273, class134.field1272, class134.field1281, class134.field1276, class134.field1270, class134.field1278, class134.field1267, class134.field1274, class134.field1280, class134.field1269, class134.field1266, class134.field1277, class134.field1282, class134.field1279, class134.field1271, class134.field1275}; - class134 var2 = (class134)SequenceDefinition.findEnumerated(var1, var0); - if (var2 == null) { - var2 = class134.field1268; - } - - return var2; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class18.java b/osrs/src/main/java/class18.java index ab604cd97..85df40b64 100644 --- a/osrs/src/main/java/class18.java +++ b/osrs/src/main/java/class18.java @@ -1,280 +1,197 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; +import java.util.Arrays; import java.util.concurrent.Future; -@ObfuscatedName("ai") +@ObfuscatedName("aq") public class class18 { - @ObfuscatedName("ac") - Future field52; - @ObfuscatedName("al") - String field51; + @ObfuscatedName("ak") + static int field54; + @ObfuscatedName("kq") + static int field55; + @ObfuscatedName("at") + Future field57; + @ObfuscatedName("ah") + String field56; class18(Future var1) { - this.field52 = var1; + this.field57 = var1; } class18(String var1) { - this.method58(var1); + this.method64(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-979667658" + garbageValue = "-556763021" ) - void method58(String var1) { + void method64(String var1) { if (var1 == null) { var1 = ""; } - this.field51 = var1; - if (this.field52 != null) { - this.field52.cancel(true); - this.field52 = null; + this.field56 = var1; + if (this.field57 != null) { + this.field57.cancel(true); + this.field57 = null; } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1635207847" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "94" ) - public final String method59() { - return this.field51; + public final String method66() { + return this.field56; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "-509501909" ) - public boolean method60() { - return this.field51 != null || this.field52 == null; + public boolean method67() { + return this.field56 != null || this.field57 == null; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1984525165" + descriptor = "(B)Z", + garbageValue = "49" ) - public final boolean method61() { - return this.method60() ? true : this.field52.isDone(); + public final boolean method68() { + return this.method67() ? true : this.field57.isDone(); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)Law;", - garbageValue = "374790018" + descriptor = "(B)Law;", + garbageValue = "-100" ) - public final class20 method62() { - if (this.method60()) { - return new class20(this.field51); - } else if (!this.method61()) { + public final class20 method69() { + if (this.method67()) { + return new class20(this.field56); + } else if (!this.method68()) { return null; } else { try { - return (class20)this.field52.get(); + return (class20)this.field57.get(); } catch (Exception var3) { String var2 = "Error retrieving REST request reply"; System.err.println(var2 + "\r\n" + var3); - this.method58(var2); + this.method64(var2); return new class20(var2); } } } - @ObfuscatedName("ak") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "475812037" + descriptor = "(Lol;I)V", + garbageValue = "1722301374" ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { - return Byte.TYPE; - } else if (var0.equals("I")) { - return Integer.TYPE; - } else if (var0.equals("S")) { - return Short.TYPE; - } else if (var0.equals("J")) { - return Long.TYPE; - } else if (var0.equals("Z")) { - return Boolean.TYPE; - } else if (var0.equals("F")) { - return Float.TYPE; - } else if (var0.equals("D")) { - return Double.TYPE; - } else if (var0.equals("C")) { - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); - } + public static void method65(AbstractArchive var0) { + StructComposition.StructDefinition_archive = var0; } - @ObfuscatedName("aa") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(Lnm;II)V", - garbageValue = "913707510" + descriptor = "(Lnn;Lnb;ZI)V", + garbageValue = "-940953937" ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field3006 == null) { - throw new RuntimeException(); - } else { - if (var0.field3080 == null) { - var0.field3080 = new int[var0.field3006.length]; - } - - var0.field3080[var1] = Integer.MAX_VALUE; + public static void method70(Widget var0, PlayerComposition var1, boolean var2) { + var0.modelType = 7; + var0.field3125 = new PlayerComposition(var1); + if (!var2) { + var0.field3125.equipment = Arrays.copyOf(var0.field3125.field2944, var0.field3125.field2944.length); + var0.field3125.method1756(); } + } - @ObfuscatedName("bo") + @ObfuscatedName("id") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "601237968" + descriptor = "(Lnn;III)V", + garbageValue = "-1252967897" ) - static int method65(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 4200) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class214.ItemDefinition_get(var3).name; - return 1; - } else { - int var4; - ItemComposition var5; - if (var0 == 4201) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = class214.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class19.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { + SpriteMask var3 = var0.method1851(HealthBarDefinition.widgetDefinition, true); + if (var3 == null) { + return; } - return 1; - } else if (var0 == 4202) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = class214.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; + if (var3.contains(var4, var5)) { + var4 -= var3.width / 2; + var5 -= var3.height / 2; + int var6 = Client.camAngleY & 2047; + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var9 = var4 * var8 + var5 * var7 >> 11; + int var10 = var5 * var8 - var7 * var4 >> 11; + int var11 = var9 + class229.localPlayer.x >> 7; + int var12 = class229.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = class113.getPacketBufferNode(ClientPacket.f51, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.writeShort(var11 + NewShit.baseX); + var13.packetBuffer.writeShortAdd(var12 + class101.baseY); + var13.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? (Client.keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); + var13.packetBuffer.writeByte(var4); + var13.packetBuffer.writeByte(var5); + var13.packetBuffer.writeShort(Client.camAngleY); + var13.packetBuffer.writeByte(57); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(89); + var13.packetBuffer.writeShort(class229.localPlayer.x); + var13.packetBuffer.writeShort(class229.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; } + } - return 1; - } else if (var0 == 4203) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).price; - return 1; - } else if (var0 == 4204) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemComposition var6; - if (var0 == 4205) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class214.ItemDefinition_get(var3); - if (var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == 4206) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class214.ItemDefinition_get(var3); - if (var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == 4207) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == 4208) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class214.ItemDefinition_get(var3); - if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == 4209) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class214.ItemDefinition_get(var3); - if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } + } + } - return 1; - } else if (var0 == 4210) { - String var7 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FileSystem.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SoundSystem.foundItemIdCount; - return 1; - } else if (var0 != 4211) { - if (var0 == 4212) { - class317.foundItemIndex = 0; - return 1; - } else if (var0 == 4213) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = class214.ItemDefinition_get(var3).getShiftClickIndex(); - if (var4 == -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + 1; + @ObfuscatedName("jo") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-805283190" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { + NPC var2 = Client.npcs[Client.npcIndices[var1]]; + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { + int var3 = var2.x >> 7; + int var4 = var2.y >> 7; + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { + if (var2.field983 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { + continue; } - return 1; - } else if (var0 == 4214) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).maleModel; - return 1; - } else if (var0 == 4215) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).maleModel1; - return 1; - } else if (var0 == 4216) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).maleModel2; - return 1; - } else if (var0 == 4217) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class214.ItemDefinition_get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.field1817; - return 1; - } else { - return 2; - } - } else { - if (class138.foundItemIds != null && class317.foundItemIndex < SoundSystem.foundItemIdCount) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class138.foundItemIds[++class317.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; } - return 1; + long var5 = Player.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + class36.scene.drawEntity(ItemLayer.Client_plane, var2.x, var2.y, WorldMapDecorationType.getTileHeight(var2.field983 * 64 - 64 + var2.x, var2.field983 * 64 - 64 + var2.y, ItemLayer.Client_plane), var2.field983 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); } } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class180.java b/osrs/src/main/java/class180.java deleted file mode 100644 index 82680a33b..000000000 --- a/osrs/src/main/java/class180.java +++ /dev/null @@ -1,177 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gu") -public class class180 extends class183 { - @ObfuscatedName("ab") - static int field1467; - @ObfuscatedName("ag") - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("ac") - int field1469; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lgr;" - ) - final class172 this$0; - - @ObfuscatedSignature( - descriptor = "(Lgr;Ljava/lang/String;I)V" - ) - class180(class172 var1, String var2, int var3) { - super(var1, var2); - this.this$0 = var1; - this.field1469 = var3; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1007456210" - ) - public int vmethod3379() { - return 0; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-19272" - ) - @Export("vmethod3378") - public int vmethod3378() { - return this.field1469; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Luy;I)V", - garbageValue = "2145499670" - ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = TextureProvider.localPlayer = Client.players[var1] = new Player(); - var2.index = var1; - int var3 = var0.readBits(30); - byte var4 = (byte)(var3 >> 28); - int var5 = var3 >> 14 & 16383; - int var6 = var3 & 16383; - var2.pathX[0] = var5 - class20.baseX; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - class19.baseY; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - class87.Client_plane = var2.plane = var4; - if (Players.cachedAppearanceBuffer[var1] != null) { - var2.read(Players.cachedAppearanceBuffer[var1]); - } - - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.activityFlags[var1] = 0; - Players.Players_emptyIdxCount = 0; - - for (int var7 = 1; var7 < 2048; ++var7) { - if (var1 != var7) { - int var8 = var0.readBits(18); - int var9 = var8 >> 16; - int var10 = var8 >> 8 & 597; - int var11 = var8 & 597; - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); - Players.Players_orientations[var7] = 0; - Players.Players_targetIndices[var7] = -1; - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; - Players.activityFlags[var7] = 0; - } - } - - var0.exportIndex(); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IB)Lix;", - garbageValue = "3" - ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IB)Lug;", - garbageValue = "-114" - ) - @Export("getDbRowType") - public static DbRowType getDbRowType(int var0) { - DbRowType var1 = (DbRowType)DbRowType.DBRowType_cache.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = DbRowType.field4144.takeFile(38, var0); - var1 = new DbRowType(); - if (var2 != null) { - var1.method2543(new Buffer(var2)); - } - - var1.method2546(); - DbRowType.DBRowType_cache.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("kp") - @ObfuscatedSignature( - descriptor = "(Ldj;IILip;I)V", - garbageValue = "-537634927" - ) - static final void method933(Player var0, int var1, int var2, MoveSpeed var3) { - int var4 = var0.pathX[0]; - int var5 = var0.pathY[0]; - int var6 = var0.transformedSize(); - if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { - if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { - class232 var7 = Client.field651; - int var10 = var0.transformedSize(); - Client.field650.approxDestinationX = var1; - Client.field650.approxDestinationY = var2; - Client.field650.approxDestinationSizeX = 1; - Client.field650.approxDestinationSizeY = 1; - ApproximateRouteStrategy var11 = Client.field650; - int var12 = var7.method1190(var4, var5, var10, var11, Client.collisionMaps[var0.plane], true, Client.field592, Client.field593); - if (var12 >= 1) { - for (int var13 = 0; var13 < var12 - 1; ++var13) { - var0.method503(Client.field592[var13], Client.field593[var13], var3); - } - - } - } - } - } - - @ObfuscatedName("oo") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "505958374" - ) - static void method934(int var0) { - Client.oculusOrbState = var0; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class181.java b/osrs/src/main/java/class181.java new file mode 100644 index 000000000..f0f0d2466 --- /dev/null +++ b/osrs/src/main/java/class181.java @@ -0,0 +1,300 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; + +@ObfuscatedName("gd") +public class class181 { + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", + garbageValue = "-820569311" + ) + static File method918(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; + JagexCache.field1848 = new File(Login.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); + String var4 = null; + String var5 = null; + boolean var6 = false; + Buffer var8; + int var11; + File var27; + if (JagexCache.field1848.exists()) { + try { + AccessFile var7 = new AccessFile(JagexCache.field1848, "rw", 10000L); + + int var9; + for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { + var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); + if (var9 == -1) { + throw new IOException(); + } + } + + var8.offset = 0; + var9 = var8.readUnsignedByte(); + if (var9 < 1 || var9 > 3) { + throw new IOException("" + var9); + } + + int var10 = 0; + if (var9 > 1) { + var10 = var8.readUnsignedByte(); + } + + if (var9 <= 2) { + var4 = var8.readStringCp1252NullCircumfixed(); + if (var10 == 1) { + var5 = var8.readStringCp1252NullCircumfixed(); + } + } else { + var4 = var8.readCESUB(); + if (var10 == 1) { + var5 = var8.readCESUB(); + } + } + + var7.close(); + } catch (IOException var25) { + var25.printStackTrace(); + } + + if (var4 != null) { + var27 = new File(var4); + if (!var27.exists()) { + var4 = null; + } + } + + if (var4 != null) { + var27 = new File(var4, "test.dat"); + + boolean var28; + try { + RandomAccessFile var15 = new RandomAccessFile(var27, "rw"); + var11 = var15.read(); + var15.seek(0L); + var15.write(var11); + var15.seek(0L); + var15.close(); + var27.delete(); + var28 = true; + } catch (Exception var23) { + var28 = false; + } + + if (!var28) { + var4 = null; + } + } + } + + if (var4 == null && var2 == 0) { + label134: + for (int var16 = 0; var16 < class85.field859.length; ++var16) { + for (int var17 = 0; var17 < GameObject.field2480.length; ++var17) { + File var18 = new File(GameObject.field2480[var17] + class85.field859[var16] + File.separatorChar + var0 + File.separatorChar); + if (var18.exists()) { + File var19 = new File(var18, "test.dat"); + + boolean var29; + try { + RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); + int var13 = var12.read(); + var12.seek(0L); + var12.write(var13); + var12.seek(0L); + var12.close(); + var19.delete(); + var29 = true; + } catch (Exception var22) { + var29 = false; + } + + if (var29) { + var4 = var18.toString(); + var6 = true; + break label134; + } + } + } + } + } + + if (var4 == null) { + var4 = Login.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; + var6 = true; + } + + File var26; + if (var5 != null) { + var26 = new File(var5); + var27 = new File(var4); + + try { + File[] var33 = var26.listFiles(); + File[] var31 = var33; + + for (var11 = 0; var11 < var31.length; ++var11) { + File var30 = var31[var11]; + File var20 = new File(var27, var30.getName()); + boolean var14 = var30.renameTo(var20); + if (!var14) { + throw new IOException(); + } + } + } catch (Exception var24) { + var24.printStackTrace(); + } + + var6 = true; + } + + if (var6) { + var26 = new File(var4); + var8 = null; + + try { + AccessFile var34 = new AccessFile(JagexCache.field1848, "rw", 10000L); + Buffer var32 = new Buffer(500); + var32.writeByte(3); + var32.writeByte(var8 != null ? 1 : 0); + var32.writeCESU8(var26.getPath()); + if (var8 != null) { + var32.writeCESU8(""); + } + + var34.write(var32.array, 0, var32.offset); + var34.close(); + } catch (IOException var21) { + var21.printStackTrace(); + } + } + + return new File(var4); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "([Lcr;II[I[II)V", + garbageValue = "450863022" + ) + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { + int var5 = var1 - 1; + int var6 = var2 + 1; + int var7 = (var2 + var1) / 2; + World var8 = var0[var7]; + var0[var7] = var0[var1]; + var0[var1] = var8; + + while (var5 < var6) { + boolean var9 = true; + + int var10; + int var11; + int var12; + do { + --var6; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var6].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var6].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var6].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var6].id; + var12 = var8.id; + } + + if (var12 != var11) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + var9 = true; + + do { + ++var5; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var5].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var5].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var5].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var5].id; + var12 = var8.id; + } + + if (var11 != var12) { + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { + World var13 = var0[var5]; + var0[var5] = var0[var6]; + var0[var6] = var13; + } + } + + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); + } + + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "111" + ) + protected static final int method919() { + return GameEngine.keyHandler.getIdleCycles(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class182.java b/osrs/src/main/java/class182.java new file mode 100644 index 000000000..8c15f93e0 --- /dev/null +++ b/osrs/src/main/java/class182.java @@ -0,0 +1,50 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hb") +public class class182 extends DualNode { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Llk;" + ) + static EvictingDualNodeHashTable field1502; + + static { + field1502 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-419579110" + ) + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; + } + } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-66" + ) + static void method921() { + ItemLayer.compass = null; + class11.redHintArrowSprite = null; + VarpDefinition.mapSceneSprites = null; + UrlRequest.headIconPkSprites = null; + AbstractByteArrayCopier.headIconPrayerSprites = null; + class60.headIconHintSprites = null; + class12.mapMarkerSprites = null; + VarpDefinition.crossSprites = null; + HorizontalAlignment.mapDotSprites = null; + class31.scrollBarSprites = null; + class134.field1307 = null; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class183.java b/osrs/src/main/java/class183.java deleted file mode 100644 index 05cbec0a3..000000000 --- a/osrs/src/main/java/class183.java +++ /dev/null @@ -1,239 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hf") -public abstract class class183 { - @ObfuscatedName("ti") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("ax") - String field1483; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lgr;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final class172 this$0; - - @ObfuscatedSignature( - descriptor = "(Lgr;Ljava/lang/String;)V" - ) - class183(class172 var1, String var2) { - this.this$0 = var1; - this.field1483 = var2; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1007456210" - ) - @Export("vmethod3379") - public abstract int vmethod3379(); - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1667250407" - ) - @Export("vmethod3380") - public String vmethod3380() { - return null; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-19272" - ) - @Export("vmethod3378") - public int vmethod3378() { - return -1; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "4207" - ) - public String method940() { - return this.field1483; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lfz;FB)F", - garbageValue = "-84" - ) - static float method938(class132 var0, float var1) { - if (var0 != null && var0.method717() != 0) { - if (var1 < (float)var0.field1237[0].field1200) { - return var0.field1238 == class130.field1221 ? var0.field1237[0].field1197 : class104.method605(var0, var1, true); - } else if (var1 > (float)var0.field1237[var0.method717() - 1].field1200) { - return var0.field1239 == class130.field1221 ? var0.field1237[var0.method717() - 1].field1197 : class104.method605(var0, var1, false); - } else if (var0.field1235) { - return var0.field1237[0].field1197; - } else { - class127 var2 = var0.method716(var1); - boolean var3 = false; - boolean var4 = false; - if (var2 == null) { - return 0.0F; - } else { - float var5; - float var6; - float var7; - if ((double)var2.field1198 == 0.0D && 0.0D == (double)var2.field1195) { - var3 = true; - } else if (Float.MAX_VALUE == var2.field1198 && Float.MAX_VALUE == var2.field1195) { - var4 = true; - } else if (var2.field1194 != null) { - if (var0.field1236) { - var5 = (float)var2.field1200; - float var9 = var2.field1197; - var6 = var5 + var2.field1198 * 0.33333334F; - float var10 = var2.field1195 * 0.33333334F + var9; - float var8 = (float)var2.field1194.field1200; - float var12 = var2.field1194.field1197; - var7 = var8 - var2.field1194.field1196 * 0.33333334F; - float var11 = var12 - 0.33333334F * var2.field1194.field1199; - if (var0.field1233) { - float var15 = var10; - float var16 = var11; - if (var0 != null) { - float var17 = var8 - var5; - if (0.0D != (double)var17) { - float var18 = var6 - var5; - float var19 = var7 - var5; - float[] var20 = new float[]{var18 / var17, var19 / var17}; - var0.field1234 = 0.33333334F == var20[0] && var20[1] == 0.6666667F; - float var21 = var20[0]; - float var22 = var20[1]; - if ((double)var20[0] < 0.0D) { - var20[0] = 0.0F; - } - - if ((double)var20[1] > 1.0D) { - var20[1] = 1.0F; - } - - float var23; - if ((double)var20[0] > 1.0D || var20[1] < -1.0F) { - var20[1] = 1.0F - var20[1]; - if (var20[0] < 0.0F) { - var20[0] = 0.0F; - } - - if (var20[1] < 0.0F) { - var20[1] = 0.0F; - } - - if (var20[0] > 1.0F || var20[1] > 1.0F) { - var23 = (float)(1.0D + (double)(var20[0] * (var20[0] - 2.0F + var20[1])) + (double)var20[1] * ((double)var20[1] - 2.0D)); - if (class128.field1202 + var23 > 0.0F) { - class10.method36(var20); - } - } - - var20[1] = 1.0F - var20[1]; - } - - if (var21 != var20[0]) { - float var13 = var17 * var20[0] + var5; - if ((double)var21 != 0.0D) { - var15 = var9 + var20[0] * (var10 - var9) / var21; - } - } - - if (var22 != var20[1]) { - float var14 = var20[1] * var17 + var5; - if (1.0D != (double)var22) { - var16 = (float)((double)var12 - (1.0D - (double)var20[1]) * (double)(var12 - var11) / (1.0D - (double)var22)); - } - } - - var0.field1247 = var5; - var0.field1241 = var8; - class315.method1654(0.0F, var20[0], var20[1], 1.0F, var0); - var23 = var15 - var9; - float var24 = var16 - var15; - float var25 = var12 - var16; - float var26 = var24 - var23; - var0.field1243 = var25 - var24 - var26; - var0.field1248 = var26 + var26 + var26; - var0.field1250 = var23 + var23 + var23; - var0.field1245 = var9; - } - } - } else { - TileItem.method614(var0, var5, var6, var7, var8, var9, var10, var11, var12); - } - - var0.field1236 = false; - } - } else { - var3 = true; - } - - if (var3) { - return var2.field1197; - } else if (var4) { - return (float)var2.field1200 != var1 && var2.field1194 != null ? var2.field1194.field1197 : var2.field1197; - } else if (var0.field1233) { - if (var0 == null) { - var5 = 0.0F; - } else { - if (var0.field1247 == var1) { - var6 = 0.0F; - } else if (var0.field1241 == var1) { - var6 = 1.0F; - } else { - var6 = (var1 - var0.field1247) / (var0.field1241 - var0.field1247); - } - - if (var0.field1234) { - var7 = var6; - } else { - class128.field1203[3] = var0.field1240; - class128.field1203[2] = var0.field1242; - class128.field1203[1] = var0.field1249; - class128.field1203[0] = var0.field1244 - var6; - class128.field1204[0] = 0.0F; - class128.field1204[1] = 0.0F; - class128.field1204[2] = 0.0F; - class128.field1204[3] = 0.0F; - class128.field1204[4] = 0.0F; - int var27 = PacketBufferNode.method1646(class128.field1203, 3, 0.0F, true, 1.0F, true, class128.field1204); - if (var27 == 1) { - var7 = class128.field1204[0]; - } else { - var7 = 0.0F; - } - } - - var5 = var7 * ((var0.field1243 * var7 + var0.field1248) * var7 + var0.field1250) + var0.field1245; - } - - return var5; - } else { - return DevicePcmPlayerProvider.method84(var0, var1); - } - } - } - } else { - return 0.0F; - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)[Lol;", - garbageValue = "654321032" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.field3530, PlayerType.field3531, PlayerType.field3525, PlayerType.PlayerType_ironman, PlayerType.field3533, PlayerType.PlayerType_ultimateIronman, PlayerType.field3520, PlayerType.field3528, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_playerModerator, PlayerType.field3518, PlayerType.PlayerType_jagexModerator, PlayerType.field3526, PlayerType.field3522, PlayerType.field3529, PlayerType.PlayerType_normal, PlayerType.field3517}; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class184.java b/osrs/src/main/java/class184.java new file mode 100644 index 000000000..cb16c33c1 --- /dev/null +++ b/osrs/src/main/java/class184.java @@ -0,0 +1,30 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hl") +public class class184 extends DualNode { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Llk;" + ) + public static EvictingDualNodeHashTable field1515; + + static { + field1515 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "811454475" + ) + public static int method927(int var0) { + --var0; + var0 |= var0 >>> 1; + var0 |= var0 >>> 2; + var0 |= var0 >>> 4; + var0 |= var0 >>> 8; + var0 |= var0 >>> 16; + return var0 + 1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class185.java b/osrs/src/main/java/class185.java new file mode 100644 index 000000000..1e0535b7a --- /dev/null +++ b/osrs/src/main/java/class185.java @@ -0,0 +1,68 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hi") +public class class185 extends DualNode { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Llk;" + ) + public static EvictingDualNodeHashTable field1516; + @ObfuscatedName("av") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + + static { + field1516 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "1" + ) + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var4 == null) { + var4 = new ItemContainer(); + ItemContainer.itemContainers.put(var4, (long)var0); + } + + if (var4.ids.length <= var1) { + int[] var5 = new int[var1 + 1]; + int[] var6 = new int[var1 + 1]; + + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { + var5[var7] = var4.ids[var7]; + var6[var7] = var4.quantities[var7]; + } + + for (var7 = var4.ids.length; var7 < var1; ++var7) { + var5[var7] = -1; + var6[var7] = 0; + } + + var4.ids = var5; + var4.quantities = var6; + } + + var4.ids[var1] = var2; + var4.quantities[var1] = var3; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1003071638" + ) + static int method929(int var0, int var1, int var2) { + if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { + return 0; + } else { + return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class186.java b/osrs/src/main/java/class186.java deleted file mode 100644 index 16c08af10..000000000 --- a/osrs/src/main/java/class186.java +++ /dev/null @@ -1,47 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.concurrent.ThreadFactory; - -@ObfuscatedName("hl") -final class class186 implements ThreadFactory { - @ObfuscatedName("cl") - @Export("otp") - static String otp; - - public Thread newThread(Runnable var1) { - return new Thread(var1, "OSRS Maya Anim Load"); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1663362302" - ) - public static int method949(int var0, int var1) { - int var2; - for (var2 = 1; var1 > 1; var1 >>= 1) { - if ((var1 & 1) != 0) { - var2 = var0 * var2; - } - - var0 *= var0; - } - - if (var1 == 1) { - return var0 * var2; - } else { - return var2; - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)[Lfj;", - garbageValue = "865282797" - ) - static class130[] method950() { - return new class130[]{class130.field1221, class130.field1223, class130.field1222, class130.field1225, class130.field1224}; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class188.java b/osrs/src/main/java/class188.java deleted file mode 100644 index f4922713e..000000000 --- a/osrs/src/main/java/class188.java +++ /dev/null @@ -1,32 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hd") -public class class188 extends DualNode { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - public static EvictingDualNodeHashTable field1492; - - static { - field1492 = new EvictingDualNodeHashTable(64); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "726259362" - ) - static void method955() { - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (class91.clientPreferences.getUsernameToRemember() != null) { - Login.Login_username = class91.clientPreferences.getUsernameToRemember(); - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; - } - - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class189.java b/osrs/src/main/java/class189.java index 119a8a9c1..5c5aa7ad2 100644 --- a/osrs/src/main/java/class189.java +++ b/osrs/src/main/java/class189.java @@ -1,17 +1,158 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("hj") public class class189 extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) - static EvictingDualNodeHashTable field1494; - @ObfuscatedName("ao") - public static int field1493; + @Export("Widget_cachedSpriteMasks") + public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; static { - field1494 = new EvictingDualNodeHashTable(64); + Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lof;B)I", + garbageValue = "-26" + ) + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); + int var4 = var1.length(); + int var5 = 0; + int var6 = 0; + byte var7 = 0; + byte var8 = 0; + + while (var5 - var7 < var3 || var6 - var8 < var4) { + if (var5 - var7 >= var3) { + return -1; + } + + if (var6 - var8 >= var4) { + return 1; + } + + char var9; + if (var7 != 0) { + var9 = (char)var7; + boolean var14 = false; + } else { + var9 = var0.charAt(var5++); + } + + char var10; + if (var8 != 0) { + var10 = (char)var8; + boolean var15 = false; + } else { + var10 = var1.charAt(var6++); + } + + byte var11; + if (var9 == 198) { + var11 = 69; + } else if (var9 == 230) { + var11 = 101; + } else if (var9 == 223) { + var11 = 115; + } else if (var9 == 338) { + var11 = 69; + } else if (var9 == 339) { + var11 = 101; + } else { + var11 = 0; + } + + var7 = var11; + byte var12; + if (var10 == 198) { + var12 = 69; + } else if (var10 == 230) { + var12 = 101; + } else if (var10 == 223) { + var12 = 115; + } else if (var10 == 338) { + var12 = 69; + } else if (var10 == 339) { + var12 = 101; + } else { + var12 = 0; + } + + var8 = var12; + var9 = TileItem.standardizeChar(var9, var2); + var10 = TileItem.standardizeChar(var10, var2); + if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var10 != var9) { + return class90.lowercaseChar(var9, var2) - class90.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); + + int var17; + char var20; + for (var17 = 0; var17 < var16; ++var17) { + if (var2 == Language.Language_FR) { + var5 = var3 - 1 - var17; + var6 = var4 - 1 - var17; + } else { + var6 = var17; + var5 = var17; + } + + char var18 = var0.charAt(var5); + var20 = var1.charAt(var6); + if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { + var18 = Character.toLowerCase(var18); + var20 = Character.toLowerCase(var20); + if (var20 != var18) { + return class90.lowercaseChar(var18, var2) - class90.lowercaseChar(var20, var2); + } + } + } + + var17 = var3 - var4; + if (var17 != 0) { + return var17; + } else { + for (int var19 = 0; var19 < var16; ++var19) { + var20 = var0.charAt(var19); + char var13 = var1.charAt(var19); + if (var20 != var13) { + return class90.lowercaseChar(var20, var2) - class90.lowercaseChar(var13, var2); + } + } + + return 0; + } + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lol;I)I", + garbageValue = "-1440080925" + ) + static int method954(AbstractArchive var0) { + int var1 = Login.field772.length + Login.field771.length; + String[] var2 = Login.field770; + + for (int var3 = 0; var3 < var2.length; ++var3) { + String var4 = var2[var3]; + if (var0.getGroupId(var4) != -1) { + ++var1; + } + } + + return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class19.java b/osrs/src/main/java/class19.java index c16a7cb42..6027c1ebd 100644 --- a/osrs/src/main/java/class19.java +++ b/osrs/src/main/java/class19.java @@ -5,122 +5,59 @@ import java.io.IOException; import java.util.concurrent.Callable; -@ObfuscatedName("ae") +@ObfuscatedName("ai") public class class19 implements Callable { - @ObfuscatedName("jj") - @Export("baseY") - static int baseY; - @ObfuscatedName("ac") + @ObfuscatedName("eu") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("fv") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Loh;" ) - final class10 field54; + static Archive field59; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lap;" + ) + final class10 field60; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Las;" + descriptor = "Lay;" ) @Export("this$0") @ObfuscatedName("this$0") final class14 this$0; @ObfuscatedSignature( - descriptor = "(Las;Lag;)V" + descriptor = "(Lay;Lap;)V" ) class19(class14 var1, class10 var2) { this.this$0 = var1; - this.field54 = var2; + this.field60 = var2; } @Export("call") @ObfuscatedName("call") public Object call() throws Exception { try { - while (this.field54.method34()) { - Players.method623(10L); + while (this.field60.method37()) { + class219.method1104(10L); } } catch (IOException var2) { return new class20("Error servicing REST query: " + var2.getMessage()); } - return this.field54.method35(); + return this.field60.method38(); } - @ObfuscatedName("ag") + @ObfuscatedName("oq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "44" + descriptor = "(II)V", + garbageValue = "-2072070052" ) - static void method67(String var0, String var1, String var2) { - GameEngine.method166(7); - AbstractWorldMapIcon.setLoginResponseString(var0, var1, var2); - } - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "770676496" - ) - protected static final void method66() { - class314.clock.mark(); - - int var0; - for (var0 = 0; var0 < 32; ++var0) { - GameEngine.graphicsTickTimes[var0] = 0L; + static void method73(int var0) { + if (var0 != Client.loginState) { + Client.loginState = var0; } - - for (var0 = 0; var0 < 32; ++var0) { - GameEngine.clientTickTimes[var0] = 0L; - } - - class160.gameCyclesToDo = 0; - } - - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIIIB)V", - garbageValue = "-11" - ) - @Export("updatePendingSpawn") - static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - PendingSpawn var10 = null; - - for (PendingSpawn var11 = (PendingSpawn)Client.pendingSpawns.last(); var11 != null; var11 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var11.plane && var11.x == var1 && var2 == var11.y && var3 == var11.type) { - var10 = var11; - break; - } - } - - if (var10 == null) { - var10 = new PendingSpawn(); - var10.plane = var0; - var10.type = var3; - var10.x = var1; - var10.y = var2; - var10.field946 = -1; - GrandExchangeOfferOwnWorldComparator.method350(var10); - Client.pendingSpawns.addFirst(var10); - } - - var10.id = var4; - var10.objectType = var5; - var10.rotation = var6; - var10.startCycle = var8; - var10.endCycle = var9; - var10.method506(var7); - } - - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1266586426" - ) - static final void method69(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field408[var4] = true; - } - } - } } \ No newline at end of file diff --git a/osrs/src/main/java/class190.java b/osrs/src/main/java/class190.java deleted file mode 100644 index 396b3ee1f..000000000 --- a/osrs/src/main/java/class190.java +++ /dev/null @@ -1,141 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.io.*; -import java.net.URL; - -@ObfuscatedName("hk") -public class class190 extends DualNode { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - static EvictingDualNodeHashTable field1496; - @ObfuscatedName("ag") - static int field1495; - @ObfuscatedName("fc") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - @Export("archive10") - static Archive archive10; - - static { - field1496 = new EvictingDualNodeHashTable(64); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "-117296699" - ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); - } else { - try { - String var2 = ""; - if (var1 != null) { - Throwable var4 = var1; - String var5; - if (var1 instanceof RunException) { - RunException var6 = (RunException)var1; - var5 = var6.field4315 + " | "; - var4 = var6.parent; - } else { - var5 = ""; - } - - StringWriter var18 = new StringWriter(); - PrintWriter var7 = new PrintWriter(var18); - var4.printStackTrace(var7); - var7.close(); - String var8 = var18.toString(); - BufferedReader var9 = new BufferedReader(new StringReader(var8)); - String var10 = var9.readLine(); - - label55: - while (true) { - while (true) { - String var11 = var9.readLine(); - if (var11 == null) { - var5 = var5 + "| " + var10; - var2 = var5; - break label55; - } - - int var12 = var11.indexOf(40); - int var13 = var11.indexOf(41, var12 + 1); - if (var12 >= 0 && var13 >= 0) { - String var14 = var11.substring(var12 + 1, var13); - int var15 = var14.indexOf(".java:"); - if (var15 >= 0) { - var14 = var14.substring(0, var15) + var14.substring(var15 + 5); - var5 = var5 + var14 + ' '; - continue; - } - - var11 = var11.substring(0, var12); - } - - var11 = var11.trim(); - var11 = var11.substring(var11.lastIndexOf(32) + 1); - var11 = var11.substring(var11.lastIndexOf(9) + 1); - var5 = var5 + var11 + ' '; - } - } - } - - if (var0 != null) { - if (var1 != null) { - var2 = var2 + " | "; - } - - var2 = var2 + var0; - } - - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (class462.RunException_applet == null) { - return; - } - - URL var3 = new URL(class462.RunException_applet.getCodeBase(), "clienterror.ws?cv=" + RunException.RunException_revision + "&cs=" + RunException.field4313 + "&u=" + RunException.field4314 + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + class189.field1493 + "&e=" + var2); - DataInputStream var17 = new DataInputStream(var3.openStream()); - var17.read(); - var17.close(); - } catch (Exception var16) { - } - - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IS)Lhw;", - garbageValue = "13479" - ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); - return var1; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class191.java b/osrs/src/main/java/class191.java index 665bea847..5ee17aec2 100644 --- a/osrs/src/main/java/class191.java +++ b/osrs/src/main/java/class191.java @@ -2,51 +2,50 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +import java.util.ArrayList; + +@ObfuscatedName("hk") public class class191 extends DualNode { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llk;" ) - @Export("archive7") - static EvictingDualNodeHashTable archive7; - @ObfuscatedName("gg") - static String field1499; - @ObfuscatedName("uy") - @Export("cameraMoveToX") - static int cameraMoveToX; - - static { - archive7 = new EvictingDualNodeHashTable(64); - } - - @ObfuscatedName("ac") + public static EvictingDualNodeHashTable field1584; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lom;I)V", - garbageValue = "-1132254955" + descriptor = "Lol;" ) - public static void method958(AbstractArchive var0) { - class30.FloorOverlayDefinition_archive = var0; + static AbstractArchive field1586; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Lnv;" + ) + static GameBuild field1585; + + static { + field1584 = new EvictingDualNodeHashTable(64); } - @ObfuscatedName("al") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IB)Liw;", - garbageValue = "0" + descriptor = "(IIIII)V", + garbageValue = "-993585503" ) - public static HitSplatDefinition method959(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); - var1 = new HitSplatDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + @Export("someMusicMethod") + public static void someMusicMethod(int var0, int var1, int var2, int var3) { + if (class316.musicSongs.size() > 1 && class316.musicSongs.get(0) != null && ((MusicSong)class316.musicSongs.get(0)).midiPcmStream.isReady() && class316.musicSongs.get(1) != null && ((MusicSong)class316.musicSongs.get(1)).midiPcmStream.isReady()) { + EnumComposition.method925(var0, var1, var2, var3); + class316.field2798.add(new SwapSongTask((SongTask)null)); + ArrayList var4 = new ArrayList(); + var4.add(new DelayFadeTask(new FadeInTask((SongTask)null, 1, false, class316.field2796), class316.field2795)); + var4.add(new DelayFadeTask(new FadeOutTask((SongTask)null, 0, false, class316.field2794), class316.musicPlayerStatus)); + class316.field2798.add(new ConcurrentMidiTask((SongTask)null, var4)); + if (class316.field2787.get(0) != null && class316.field2787.get(1) != null) { + MusicSong var5 = (MusicSong)class316.field2787.get(0); + class316.field2787.set(0, class316.musicSongs.get(1)); + class316.field2787.set(1, var5); } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class192.java b/osrs/src/main/java/class192.java new file mode 100644 index 000000000..7bba2c731 --- /dev/null +++ b/osrs/src/main/java/class192.java @@ -0,0 +1,61 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hc") +public class class192 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lhc;" + ) + static final class192 field1593; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lhc;" + ) + static final class192 field1590; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lhc;" + ) + static final class192 field1592; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lhc;" + ) + static final class192 field1591; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lhc;" + ) + static final class192 field1589; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lhc;" + ) + static final class192 field1594; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lhc;" + ) + static final class192 field1588; + @ObfuscatedName("lv") + @Export("cameraYaw") + static int cameraYaw; + + static { + field1593 = new class192(0, class205.field1813); + field1590 = new class192(1, class205.field1815); + field1592 = new class192(2, class205.field1811); + field1591 = new class192(3, class205.field1810); + field1589 = new class192(4, class205.field1816); + field1594 = new class192(5, class205.field1812); + field1588 = new class192(6, class205.field1814); + } + + @ObfuscatedSignature( + descriptor = "(ILhm;)V" + ) + class192(int var1, class205 var2) { + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class193.java b/osrs/src/main/java/class193.java deleted file mode 100644 index ab11b6504..000000000 --- a/osrs/src/main/java/class193.java +++ /dev/null @@ -1,61 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.io.IOException; - -@ObfuscatedName("hh") -public class class193 extends DualNode { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - @Export("archive5") - public static EvictingDualNodeHashTable archive5; - - static { - archive5 = new EvictingDualNodeHashTable(64); - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(Lbi;B)V", - garbageValue = "-42" - ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; - if (var0.sound != null) { - var0.sound.position = 0; - } - - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); - } - - } - - @ObfuscatedName("jm") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1522751942" - ) - static final void method964(boolean var0) { - class313.method1648(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = ClanChannelMember.getPacketBufferNode(ClientPacket.NO_TIMEOUT, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.hadNetworkError = true; - } - } - - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class195.java b/osrs/src/main/java/class195.java new file mode 100644 index 000000000..878cfbb5c --- /dev/null +++ b/osrs/src/main/java/class195.java @@ -0,0 +1,26 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hh") +public class class195 extends DualNode { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Llk;" + ) + public static EvictingDualNodeHashTable field1619; + @ObfuscatedName("ix") + static int field1620; + + static { + field1619 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "13" + ) + public static int method973(int var0) { + return class476.field3937[var0 & 16383]; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class197.java b/osrs/src/main/java/class197.java new file mode 100644 index 000000000..d49d48026 --- /dev/null +++ b/osrs/src/main/java/class197.java @@ -0,0 +1,29 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ho") +public class class197 extends DualNode { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Llk;" + ) + @Export("archive4") + public static EvictingDualNodeHashTable archive4; + + static { + archive4 = new EvictingDualNodeHashTable(64); + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "73" + ) + public static int method976(int var0, int var1, int var2) { + int var3 = class214.method1092(var2 - var1 + 1); + var3 <<= var1; + var0 |= var3; + return var0; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class198.java b/osrs/src/main/java/class198.java deleted file mode 100644 index 325033901..000000000 --- a/osrs/src/main/java/class198.java +++ /dev/null @@ -1,178 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hc") -public class class198 { - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - @Export("archive9") - static Archive archive9; - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2044605112" - ) - public static void method992() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); - } - - @ObfuscatedName("hc") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "64" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - int var1 = Login.loginIndex; - if (var0 == -3) { - AbstractWorldMapIcon.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - AbstractWorldMapIcon.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - AbstractWorldMapIcon.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - GameEngine.method166(3); - Login.field749 = 1; - } else if (var0 == 4) { - class27.method114(0); - } else if (var0 == 5) { - Login.field749 = 2; - AbstractWorldMapIcon.setLoginResponseString("Either your account is still logged in, or the last", "world you were using has become unavailable.", "Please try again later."); - } else if (var0 == 68) { - if (!Client.reloadJS5) { - Client.reloadJS5 = true; - class140.reloadJS5(); - return; - } - - AbstractWorldMapIcon.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (!Client.onMobile && var0 == 6) { - AbstractWorldMapIcon.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - AbstractWorldMapIcon.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - AbstractWorldMapIcon.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - AbstractWorldMapIcon.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - AbstractWorldMapIcon.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - AbstractWorldMapIcon.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - AbstractWorldMapIcon.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - AbstractWorldMapIcon.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - AbstractWorldMapIcon.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - AbstractWorldMapIcon.setLoginResponseString("Too many login attempts.", "You can use the Jagex Launcher to continue playing.", "Press the button below to download it now."); - GameEngine.method166(33); - } else if (var0 == 17) { - AbstractWorldMapIcon.setLoginResponseString("To access this free world, log into a", "members world and move your character", "to a non-members area."); - } else if (var0 == 18) { - class27.method114(1); - } else if (var0 == 19) { - AbstractWorldMapIcon.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - AbstractWorldMapIcon.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - AbstractWorldMapIcon.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - AbstractWorldMapIcon.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - AbstractWorldMapIcon.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - AbstractWorldMapIcon.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - AbstractWorldMapIcon.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - AbstractWorldMapIcon.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - AbstractWorldMapIcon.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); - } else if (var0 == 32) { - class27.method114(2); - } else if (var0 == 37) { - AbstractWorldMapIcon.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - AbstractWorldMapIcon.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { - GameEngine.method166(8); - } else { - if (var0 == 56) { - AbstractWorldMapIcon.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - DefaultsGroup.updateGameState(11); - return; - } - - if (var0 == 57) { - AbstractWorldMapIcon.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - DefaultsGroup.updateGameState(11); - return; - } - - if (var0 == 61) { - AbstractWorldMapIcon.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); - GameEngine.method166(7); - } else { - if (var0 == 62) { - DefaultsGroup.updateGameState(10); - GameEngine.method166(9); - AbstractWorldMapIcon.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); - return; - } - - if (var0 == 63) { - DefaultsGroup.updateGameState(10); - GameEngine.method166(9); - AbstractWorldMapIcon.setLoginResponseString("You were signed out.", "Please sign in again.", ""); - return; - } - - if (var0 == 65 || var0 == 67) { - DefaultsGroup.updateGameState(10); - GameEngine.method166(9); - AbstractWorldMapIcon.setLoginResponseString("Failed to login.", "Please try again.", ""); - return; - } - - if (var0 == 71) { - DefaultsGroup.updateGameState(10); - GameEngine.method166(7); - AbstractWorldMapIcon.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); - } else if (var0 == 73) { - DefaultsGroup.updateGameState(10); - GameEngine.method166(6); - AbstractWorldMapIcon.setLoginResponseString("Your date of birth information is waiting", "to be reviewed by our staff.", "It will be processed shortly."); - } else if (var0 == 72) { - DefaultsGroup.updateGameState(10); - GameEngine.method166(32); - } else { - AbstractWorldMapIcon.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); - } - } - } - - DefaultsGroup.updateGameState(10); - int var4 = Login.loginIndex; - boolean var5 = var4 != var1; - if (!var5 && Client.field648.method2654()) { - GameEngine.method166(9); - } - - } - - @ObfuscatedName("nv") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1161000418" - ) - static final void method994(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - class91.clientPreferences.setAreaSoundEffectsVolume(var0); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class199.java b/osrs/src/main/java/class199.java deleted file mode 100644 index 8d828fe1f..000000000 --- a/osrs/src/main/java/class199.java +++ /dev/null @@ -1,75 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hv") -public class class199 extends DualNode { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - static EvictingDualNodeHashTable field1565; - @ObfuscatedName("ar") - static byte[][][] field1563; - @ObfuscatedName("fe") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("fn") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - static Archive field1567; - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - @Export("archive8") - static Archive archive8; - - static { - field1565 = new EvictingDualNodeHashTable(64); - } - - @ObfuscatedName("ji") - @ObfuscatedSignature( - descriptor = "(Ldj;ZI)V", - garbageValue = "-74786800" - ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { - var0.isUnanimated = true; - } - - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = GrandExchangeOfferAgeComparator.calculateTag(0, 0, 0, false, var0.index); - if (var0.attachedModel != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = class115.getTileHeight(var0.x, var0.y, class87.Client_plane); - var0.playerCycle = Client.cycle; - class10.scene.addNullableObject(class87.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; - } - - var0.tileHeight = class115.getTileHeight(var0.x, var0.y, class87.Client_plane); - var0.playerCycle = Client.cycle; - class10.scene.drawEntity(class87.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); - } - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class2.java b/osrs/src/main/java/class2.java index 3224f13d7..6b6ba8354 100644 --- a/osrs/src/main/java/class2.java +++ b/osrs/src/main/java/class2.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ak") +@ObfuscatedName("ar") public interface class2 { } \ No newline at end of file diff --git a/osrs/src/main/java/class20.java b/osrs/src/main/java/class20.java index 5a1a461df..2cd3b8a3d 100644 --- a/osrs/src/main/java/class20.java +++ b/osrs/src/main/java/class20.java @@ -7,36 +7,35 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; import java.util.Map; @ObfuscatedName("aw") public class class20 { - @ObfuscatedName("jr") - @Export("baseX") - static int baseX; - @ObfuscatedName("ac") - final int field56; - @ObfuscatedName("al") - final Map field58; - @ObfuscatedName("ak") - final String field57; + @ObfuscatedName("tk") + @ObfuscatedSignature( + descriptor = "Lqi;" + ) + @Export("friendsChat") + static FriendsChat friendsChat; + @ObfuscatedName("at") + final int field62; + @ObfuscatedName("ah") + final Map field64; + @ObfuscatedName("ar") + final String field63; class20(String var1) { - this.field56 = 400; - this.field58 = null; - this.field57 = ""; + this.field62 = 400; + this.field64 = null; + this.field63 = ""; } class20(HttpURLConnection var1) throws IOException { - this.field56 = var1.getResponseCode(); + this.field62 = var1.getResponseCode(); var1.getResponseMessage(); - this.field58 = var1.getHeaderFields(); + this.field64 = var1.getHeaderFields(); StringBuilder var2 = new StringBuilder(); - InputStream var3 = this.field56 >= 300 ? var1.getErrorStream() : var1.getInputStream(); + InputStream var3 = this.field62 >= 300 ? var1.getErrorStream() : var1.getInputStream(); if (var3 != null) { InputStreamReader var4 = new InputStreamReader(var3); BufferedReader var5 = new BufferedReader(var4); @@ -49,142 +48,78 @@ public class class20 { var3.close(); } - this.field57 = var2.toString(); + this.field63 = var2.toString(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1672578717" + descriptor = "(B)I", + garbageValue = "3" ) - public int method71() { - return this.field56; + public int method74() { + return this.field62; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Ljava/util/Map;", - garbageValue = "-85" + descriptor = "(I)Ljava/util/Map;", + garbageValue = "1360391754" ) - public Map method72() { - return this.field58; + public Map method75() { + return this.field64; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-21006210" - ) - public String method73() { - return this.field57; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "775264196" + garbageValue = "-541639855" ) - public static int method70(int var0) { - return var0 + -512; + public String method76() { + return this.field63; } - @ObfuscatedName("ar") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1265533406" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "564353501" ) - public static void method74() { - ParamComposition.ParamDefinition_cached.clear(); - } + public static String method77(String var0) { + int var1 = var0.length(); + char[] var2 = new char[var1]; + byte var3 = 2; + + for (int var4 = 0; var4 < var1; ++var4) { + char var5 = var0.charAt(var4); + if (var3 == 0) { + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { + char var6; + if (var5 != 181 && var5 != 402) { + var6 = Character.toTitleCase(var5); + } else { + var6 = var5; + } - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/Date;", - garbageValue = "572472849" - ) - static Date method76() throws ParseException { - SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); - var0.setLenient(false); - StringBuilder var1 = new StringBuilder(); - String[] var2 = Login.field766; - - for (int var3 = 0; var3 < var2.length; ++var3) { - String var4 = var2[var3]; - if (var4 == null) { - class19.method67("Date not valid.", "Please ensure all characters are populated.", ""); - return null; + var5 = var6; } - var1.append(var4); - } - - var1.append("12"); - return var0.parse(var1.toString()); - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-690055453" - ) - public static void method75() { - NPCComposition.NpcDefinition_cached.clear(); - NPCComposition.NpcDefinition_cachedModels.clear(); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "1223727295" - ) - static int method77(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 != 1927 && var0 != 2927) { - int var4; - if (var0 == 1928) { - var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var4 >= 1 && var4 <= 10) { - class104 var5 = new class104(var4, var3.id, var3.childIndex, var3.itemId); - Interpreter.field713.add(var5); - return 1; + if (Character.isLetter(var5)) { + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { + if (Character.isSpaceChar(var5)) { + if (var3 != 2) { + var3 = 1; + } } else { - throw new RuntimeException(); + var3 = 1; } - } else if (var0 == 2928) { - Interpreter.Interpreter_intStackSize -= 3; - int var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (var8 >= 1 && var8 <= 10) { - class104 var6 = new class104(var8, var7, var4, class33.widgetDefinition.method1740(var7).itemId); - Interpreter.field713.add(var6); - return 1; - } else { - throw new RuntimeException(); - } - } else { - return 2; - } - } else if (Interpreter.field706 >= 10) { - throw new RuntimeException(); - } else { - if (var0 >= 2000) { - var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); } else { - var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; + var3 = 2; } - if (var3.onResize == null) { - return 0; - } else { - ScriptEvent var9 = new ScriptEvent(); - var9.widget = var3; - var9.args = var3.onResize; - var9.field864 = Interpreter.field706 + 1; - Client.scriptEvents.addFirst(var9); - return 1; - } + var2[var4] = var5; } + + return new String(var2); } } \ No newline at end of file diff --git a/osrs/src/main/java/class201.java b/osrs/src/main/java/class201.java deleted file mode 100644 index cc38cd0e6..000000000 --- a/osrs/src/main/java/class201.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hq") -public class class201 extends DualNode { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - static EvictingDualNodeHashTable field1580; - @ObfuscatedName("jp") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - - static { - field1580 = new EvictingDualNodeHashTable(64); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class202.java b/osrs/src/main/java/class202.java deleted file mode 100644 index 1f146dee7..000000000 --- a/osrs/src/main/java/class202.java +++ /dev/null @@ -1,112 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.ArrayList; - -@ObfuscatedName("hx") -public class class202 extends DualNode { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - static EvictingDualNodeHashTable field1582; - @ObfuscatedName("ch") - static int field1581; - - static { - field1582 = new EvictingDualNodeHashTable(64); - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)[Lhb;", - garbageValue = "163265038" - ) - static HorizontalAlignment[] method1003() { - return new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1585, HorizontalAlignment.field1586}; - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "1725894118" - ) - static int method1004(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - if (var0 == 1700) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == 1701) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 1702) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; - } else if (var0 == 1707) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method1867() ? 1 : 0; - return 1; - } else if (var0 == 1708) { - return class110.method624(var3); - } else { - return var0 == 1709 ? Canvas.method88(var3) : 2; - } - } - - @ObfuscatedName("hp") - @ObfuscatedSignature( - descriptor = "(IZZZZI)Lok;", - garbageValue = "-1284352202" - ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3, boolean var4) { - ArchiveDisk var5 = null; - if (JagexCache.JagexCache_dat2File != null) { - var5 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, UserComparator8.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var5, UserComparator10.field1188, class59.field309, var0, var1, var2, var3, var4, false); - } - - @ObfuscatedName("is") - @ObfuscatedSignature( - descriptor = "(Ljava/util/ArrayList;IIIII)V", - garbageValue = "976879674" - ) - static void method1006(ArrayList var0, int var1, int var2, int var3, int var4) { - if (!var0.isEmpty()) { - int var5 = (Integer)var0.get(0); - if (var5 == -1 && !Client.playingJingle) { - ItemComposition.method1088(0, 0); - } else if (var5 != -1) { - boolean var6; - if (class319.field2789.isEmpty()) { - var6 = false; - } else { - MusicSong var7 = (MusicSong)class319.field2789.get(0); - var6 = var7 != null && var5 == var7.musicTrackGroupId; - } - - if (!var6 && class91.clientPreferences.getCurrentMusicVolume() != 0) { - ArrayList var9 = new ArrayList(); - - for (int var8 = 0; var8 < var0.size(); ++var8) { - var9.add(new MusicSong(CollisionMap.archive6, (Integer)var0.get(var8), 0, class91.clientPreferences.getCurrentMusicVolume(), false)); - } - - if (Client.playingJingle) { - class275.method1538(var9, var1, var2, var3, var4); - } else { - class148.method776(var9, var1, var2, var3, var4, false); - } - } - } - - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class205.java b/osrs/src/main/java/class205.java new file mode 100644 index 000000000..300a56ed9 --- /dev/null +++ b/osrs/src/main/java/class205.java @@ -0,0 +1,143 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hm") +public class class205 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + static final class205 field1821; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + static final class205 field1817; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + static final class205 field1819; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + static final class205 field1818; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + public static final class205 field1811; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + static final class205 field1822; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + public static final class205 field1810; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + public static final class205 field1812; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + public static final class205 field1813; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + public static final class205 field1816; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + public static final class205 field1814; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + public static final class205 field1815; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + static final class205 field1823; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + static final class205 field1820; + @ObfuscatedName("ay") + public final int field1824; + + static { + field1821 = new class205(0); + field1817 = new class205(1); + field1819 = new class205(2); + field1818 = new class205(3); + field1811 = new class205(4, class192.field1592); + field1822 = new class205(5); + field1810 = new class205(6, class192.field1591); + field1812 = new class205(7, class192.field1594); + field1813 = new class205(8, class192.field1593); + field1816 = new class205(9, class192.field1589); + field1814 = new class205(10, class192.field1588); + field1815 = new class205(11, class192.field1590); + field1823 = new class205(12); + field1820 = new class205(13); + } + + class205(int var1) { + this(var1, (class192)null); + } + + @ObfuscatedSignature( + descriptor = "(ILhc;)V" + ) + class205(int var1, class192 var2) { + this.field1824 = var1; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lol;IIB)Lup;", + garbageValue = "0" + ) + static IndexedSprite method1056(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); + boolean var3; + if (var4 == null) { + var3 = false; + } else { + class162.SpriteBuffer_decode(var4); + var3 = true; + } + + if (!var3) { + return null; + } else { + IndexedSprite var5 = new IndexedSprite(); + var5.width = class541.SpriteBuffer_spriteWidth; + var5.height = GrandExchangeOfferWorldComparator.SpriteBuffer_spriteHeight; + var5.xOffset = class541.SpriteBuffer_xOffsets[0]; + var5.yOffset = class541.SpriteBuffer_yOffsets[0]; + var5.subWidth = class541.SpriteBuffer_spriteWidths[0]; + var5.subHeight = class520.SpriteBuffer_spriteHeights[0]; + var5.palette = class541.SpriteBuffer_spritePalette; + var5.pixels = class396.SpriteBuffer_pixels[0]; + class541.SpriteBuffer_xOffsets = null; + class541.SpriteBuffer_yOffsets = null; + class541.SpriteBuffer_spriteWidths = null; + class520.SpriteBuffer_spriteHeights = null; + class541.SpriteBuffer_spritePalette = null; + class396.SpriteBuffer_pixels = null; + return var5; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class206.java b/osrs/src/main/java/class206.java deleted file mode 100644 index 646374567..000000000 --- a/osrs/src/main/java/class206.java +++ /dev/null @@ -1,42 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.ArrayList; - -@ObfuscatedName("ho") -public class class206 extends DualNode { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - @Export("Widget_cachedSpriteMasks") - public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - - static { - Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(64); - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-926597754" - ) - @Export("someMusicMethod") - public static void someMusicMethod(int var0, int var1, int var2, int var3) { - if (class319.musicSongs.size() > 1 && class319.musicSongs.get(0) != null && ((MusicSong)class319.musicSongs.get(0)).midiPcmStream.isReady() && class319.musicSongs.get(1) != null && ((MusicSong)class319.musicSongs.get(1)).midiPcmStream.isReady()) { - MouseHandler.method177(var0, var1, var2, var3); - class319.field2798.add(new SwapSongTask((SongTask)null)); - ArrayList var4 = new ArrayList(); - var4.add(new DelayFadeTask(new FadeInTask((SongTask)null, 1, false, class319.field2795), class319.field2793)); - var4.add(new DelayFadeTask(new FadeOutTask((SongTask)null, 0, false, class319.field2794), class319.musicPlayerStatus)); - class319.field2798.add(new ConcurrentMidiTask((SongTask)null, var4)); - if (class319.field2789.get(0) != null && class319.field2789.get(1) != null) { - MusicSong var5 = (MusicSong)class319.field2789.get(0); - class319.field2789.set(0, class319.musicSongs.get(1)); - class319.field2789.set(1, var5); - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class207.java b/osrs/src/main/java/class207.java new file mode 100644 index 000000000..a4746b51f --- /dev/null +++ b/osrs/src/main/java/class207.java @@ -0,0 +1,54 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hn") +public class class207 extends class219 { + @ObfuscatedName("at") + String field1826; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lic;" + ) + final class208 this$0; + + @ObfuscatedSignature( + descriptor = "(Lic;Ljava/lang/String;Ljava/lang/String;)V" + ) + class207(class208 var1, String var2, String var3) { + super(var1, var2); + this.this$0 = var1; + this.field1826 = var3; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "561834394" + ) + @Export("vmethod3379") + public int vmethod3379() { + return 1; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "18" + ) + @Export("vmethod3380") + public String vmethod3380() { + return this.field1826; + } + + @ObfuscatedName("ah") + public static boolean method1059(long var0) { + boolean var2 = var0 != 0L; + if (var2) { + boolean var3 = (int)(var0 >>> 16 & 1L) == 1; + var2 = !var3; + } + + return var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class208.java b/osrs/src/main/java/class208.java index d60fd071d..410301664 100644 --- a/osrs/src/main/java/class208.java +++ b/osrs/src/main/java/class208.java @@ -1,106 +1,428 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("iv") -public class class208 extends DualNode { - @ObfuscatedName("ac") +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +@ObfuscatedName("ic") +public class class208 { + @ObfuscatedName("al") + int field1829; + @ObfuscatedName("az") + String field1831; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Lea;" ) - public static EvictingDualNodeHashTable field1648; + UrlRequest field1827; + @ObfuscatedName("av") + String field1830; + @ObfuscatedName("ax") + float[] field1828; + @ObfuscatedName("as") + ArrayList field1833; + @ObfuscatedName("ay") + ArrayList field1834; + @ObfuscatedName("ak") + ArrayList field1832; + @ObfuscatedName("aj") + Map field1835; + @ObfuscatedName("am") + Map field1836; - static { - field1648 = new EvictingDualNodeHashTable(64); + public class208() { + this.field1829 = -1; + this.field1830 = null; + this.field1828 = new float[4]; + this.field1833 = new ArrayList(); + this.field1834 = new ArrayList(); + this.field1832 = new ArrayList(); + this.field1835 = new HashMap(); + this.field1836 = new HashMap(); } - @ObfuscatedName("ab") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([BIIS)Z", - garbageValue = "-1868" + descriptor = "(Ljava/lang/String;Lel;B)Z", + garbageValue = "-18" ) - static final boolean method1028(byte[] var0, int var1, int var2) { - boolean var3 = true; - Buffer var4 = new Buffer(var0); - int var5 = -1; + public boolean method1063(String var1, UrlRequester var2) { + if (var1 != null && !var1.isEmpty()) { + if (var2 == null) { + return false; + } else { + this.method1073(); - label57: - while (true) { - int var6 = var4.readIncrSmallSmart(); - if (var6 == 0) { - return var3; + try { + this.field1831 = var1; + this.field1827 = var2.request(new URL(this.field1831)); + this.field1829 = 0; + return true; + } catch (MalformedURLException var4) { + this.method1073(); + this.field1829 = 100; + return false; + } } + } else { + return false; + } + } - var5 += var6; - int var7 = 0; - boolean var8 = false; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lel;I)V", + garbageValue = "1589272882" + ) + public void method1064(UrlRequester var1) { + switch(this.field1829) { + case 0: + this.method1074(var1); + break; + case 1: + this.method1075(); + break; + default: + return; + } - while (true) { - int var9; - while (!var8) { - var9 = var4.readUShortSmart(); - if (var9 == 0) { - continue label57; - } + } - var7 += var9 - 1; - int var10 = var7 & 63; - int var11 = var7 >> 6 & 63; - int var12 = var4.readUnsignedByte() >> 2; - int var13 = var11 + var1; - int var14 = var10 + var2; - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { - ObjectComposition var15 = class91.getObjectDefinition(var5); - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { - if (!var15.needsModelFiles()) { - ++Client.field455; - var3 = false; - } + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-1" + ) + public int method1065() { + return this.field1829; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "256889728" + ) + public int method1066(String var1) { + return this.field1835.containsKey(var1) ? (Integer)this.field1835.get(var1) : -1; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "1206229207" + ) + public String method1067(String var1) { + return (String)((String)(this.field1836.containsKey(var1) ? this.field1836.get(var1) : null)); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "2021801100" + ) + public ArrayList method1068() { + return this.field1834; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "-2096187297" + ) + public ArrayList method1069() { + return this.field1832; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-944579598" + ) + public String method1070() { + return this.field1830; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "94" + ) + public float[] method1071() { + return this.field1828; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "523040657" + ) + public ArrayList method1072() { + return this.field1833; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "64156006" + ) + void method1073() { + this.field1827 = null; + this.field1830 = null; + this.field1828[0] = 0.0F; + this.field1828[1] = 0.0F; + this.field1828[2] = 1.0F; + this.field1828[3] = 1.0F; + this.field1833.clear(); + this.field1834.clear(); + this.field1832.clear(); + this.field1835.clear(); + this.field1836.clear(); + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lel;I)V", + garbageValue = "357044570" + ) + void method1074(UrlRequester var1) { + if (this.field1827 != null && this.field1827.isDone()) { + byte[] var2 = this.field1827.getResponse(); + if (var2 == null) { + this.method1073(); + this.field1829 = 100; + } else { + try { + this.method1080(new class474(var2), var1); + } catch (UnsupportedEncodingException var4) { + this.method1073(); + this.field1829 = 102; + return; + } + + this.field1829 = this.field1834.size() > 0 ? 1 : 2; + this.field1827 = null; + } + } + } - var8 = true; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-841261467" + ) + void method1075() { + Iterator var1 = this.field1834.iterator(); + + class214 var2; + do { + if (!var1.hasNext()) { + var1 = this.field1834.iterator(); + + while (var1.hasNext()) { + var2 = (class214)var1.next(); + if (var2.field1852 != null) { + byte[] var3 = var2.field1852.getResponse(); + if (var3 != null && var3.length > 0) { + this.field1829 = 2; + return; } } } - var9 = var4.readUShortSmart(); - if (var9 == 0) { - break; + this.method1073(); + this.field1829 = 101; + return; + } + + var2 = (class214)var1.next(); + } while(var2.field1852 == null || var2.field1852.isDone()); + + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONArray;Lel;I)V", + garbageValue = "-1649177141" + ) + void method1076(JSONArray var1, UrlRequester var2) throws JSONException { + if (var1 != null) { + for (int var3 = 0; var3 < var1.length(); ++var3) { + try { + JSONObject var4 = var1.getJSONObject(var3); + class214 var5 = new class214(this); + var5.field1852 = var2.request(new URL(var4.getString("src"))); + var5.field1853 = class9.method27(var4, "placement"); + this.field1834.add(var5); + } catch (MalformedURLException var6) { } + } - var4.readUnsignedByte(); + } + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONArray;B)V", + garbageValue = "1" + ) + void method1077(JSONArray var1) throws JSONException { + if (var1 != null) { + for (int var2 = 0; var2 < var1.length(); ++var2) { + JSONObject var3 = var1.getJSONObject(var2); + class215 var4 = new class215(this); + var4.field1859 = var3.getString("text"); + var4.field1858 = class33.method143(var3.getString("align_x")); + var4.field1856 = class33.method143(var3.getString("align_y")); + var4.field1857 = var3.getInt("font"); + var4.field1855 = class9.method27(var3, "placement"); + this.field1832.add(var4); } + } } - @ObfuscatedName("jy") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-119" + descriptor = "(Lorg/json/JSONObject;I)V", + garbageValue = "1286553511" ) - static boolean method1029() { - return (Client.drawPlayerNames & 4) != 0; + void method1078(JSONObject var1) throws JSONException { + if (var1 != null) { + this.field1828 = class9.method27(var1, "clickbounds"); + this.field1830 = var1.getString("endpoint"); + String[] var2 = JSONObject.getNames(var1); + + for (int var3 = 0; var3 < var1.length(); ++var3) { + if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { + try { + int var4 = var1.getInt(var2[var3]); + this.field1833.add(new class216(this, var2[var3], var4)); + } catch (Exception var8) { + try { + String var5 = var1.getString(var2[var3]); + if (var5.equals("true")) { + this.field1833.add(new class216(this, var2[var3], 1)); + } else if (var5.equals("false")) { + this.field1833.add(new class216(this, var2[var3], 0)); + } else { + this.field1833.add(new class207(this, var2[var3], var5)); + } + } catch (Exception var7) { + } + } + } + } + + } } - @ObfuscatedName("lk") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIIZI)V", - garbageValue = "1833009880" + descriptor = "(Lorg/json/JSONObject;B)V", + garbageValue = "-85" ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { - if (!Client.isMenuOpen) { - if (Client.menuOptionsCount < 500) { - Client.menuActions[Client.menuOptionsCount] = var0; - Client.menuTargets[Client.menuOptionsCount] = var1; - Client.menuOpcodes[Client.menuOptionsCount] = var2; - Client.menuIdentifiers[Client.menuOptionsCount] = var3; - Client.menuArguments1[Client.menuOptionsCount] = var4; - Client.menuArguments2[Client.menuOptionsCount] = var5; - Client.menuItemIds[Client.menuOptionsCount] = var6; - Client.menuShiftClick[Client.menuOptionsCount] = var7; - ++Client.menuOptionsCount; + void method1079(JSONObject var1) throws JSONException { + String[] var2 = JSONObject.getNames(var1); + + for (int var3 = 0; var3 < var1.length(); ++var3) { + try { + int var4 = var1.getInt(var2[var3]); + this.field1835.put(var2[var3], var4); + } catch (Exception var8) { + try { + String var5 = var1.getString(var2[var3]); + if (var5.equals("true")) { + this.field1835.put(var2[var3], 1); + } else if (var5.equals("false")) { + this.field1835.put(var2[var3], 0); + } else { + this.field1836.put(var2[var3], var5); + } + } catch (Exception var7) { + } } + } + + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(Lsv;Lel;I)V", + garbageValue = "1323384211" + ) + void method1080(class474 var1, UrlRequester var2) { + JSONObject var3; + try { + var3 = var1.method2357(); + var3 = var3.getJSONObject("message"); + } catch (Exception var9) { + this.method1073(); + this.field1829 = 102; + return; + } + + try { + this.method1076(var3.getJSONArray("images"), var2); + } catch (Exception var8) { + this.field1834.clear(); + } + + try { + this.method1077(var3.getJSONArray("labels")); + } catch (Exception var7) { + this.field1832.clear(); + } + try { + this.method1078(var3.getJSONObject("behaviour")); + } catch (Exception var6) { + this.field1830 = null; + this.field1828[0] = 0.0F; + this.field1828[1] = 0.0F; + this.field1828[2] = 1.0F; + this.field1828[3] = 1.0F; + this.field1833.clear(); } + + try { + this.method1079(var3.getJSONObject("meta")); + } catch (Exception var5) { + this.field1835.clear(); + this.field1836.clear(); + } + + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lel;I)Z", + garbageValue = "348701890" + ) + public boolean method1081(String var1, UrlRequester var2) { + try { + this.method1080(new class474(var1.getBytes()), var2); + this.field1829 = this.field1834.size() > 0 ? 1 : 2; + } catch (UnsupportedEncodingException var4) { + this.field1829 = 102; + } + + return this.field1829 < 100; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1432052010" + ) + public static void method1062() { + class174.archive7.clear(); } } \ No newline at end of file diff --git a/osrs/src/main/java/class209.java b/osrs/src/main/java/class209.java deleted file mode 100644 index 049cad4c0..000000000 --- a/osrs/src/main/java/class209.java +++ /dev/null @@ -1,84 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ik") -public class class209 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - static final class209 field1649; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - static final class209 field1652; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - static final class209 field1651; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - static final class209 field1655; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - static final class209 field1653; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - static final class209 field1650; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - static final class209 field1654; - - static { - field1649 = new class209(0, class223.field1868); - field1652 = new class209(1, class223.field1865); - field1651 = new class209(2, class223.field1869); - field1655 = new class209(3, class223.field1870); - field1653 = new class209(4, class223.field1871); - field1650 = new class209(5, class223.field1866); - field1654 = new class209(6, class223.field1867); - } - - @ObfuscatedSignature( - descriptor = "(ILij;)V" - ) - class209(int var1, class223 var2) { - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)[Lng;", - garbageValue = "-563682826" - ) - static GameBuild[] method1031() { - return new GameBuild[]{GameBuild.LIVE, GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.WIP}; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)[Llu;", - garbageValue = "50" - ) - public static ServerPacket[] method1033() { - return new ServerPacket[]{ServerPacket.NPC_ANIM_SPECIFIC, ServerPacket.REFLECTIONCHECK_FRIENDLIST, ServerPacket.TRADING_POST_UPDATE, ServerPacket.SEND_PING, ServerPacket.field2649, ServerPacket.IF_SETNPCHEAD, ServerPacket.field2652, ServerPacket.SET_PLAYER_OP, ServerPacket.OBJ_COUNT, ServerPacket.UPDATE_UID192, ServerPacket.OBJ_DEL_LEGACY, ServerPacket.MIDI_SONG_LEGACY, ServerPacket.RESET_ANIMS, ServerPacket.IF_OPENTOP, ServerPacket.UPDATE_INV_STOP_TRANSMIT, ServerPacket.MIDI_SONG_WITH_SECONDARY, ServerPacket.MAPPROJ_ANIM, ServerPacket.OPEN_URL, ServerPacket.field2643, ServerPacket.IF_CLOSESUB, ServerPacket.UPDATE_ZONE_PARTIAL_ENCLOSED, ServerPacket.VARCLAN_ENABLE, ServerPacket.UPDATE_REBOOT_TIMER, ServerPacket.VARP_LARGE, ServerPacket.TRADING_POST_RESULTS, ServerPacket.MESSAGE_CLANCHANNEL, ServerPacket.NPC_SPOTANIM_SPECIFIC, ServerPacket.IF_SETTEXT, ServerPacket.UPDATE_STAT, ServerPacket.UPDATE_IGNORELIST, ServerPacket.IF_SETMODEL, ServerPacket.MAP_ANIM, ServerPacket.IF_SETEVENTS, ServerPacket.MIDI_SONG_STOP, ServerPacket.LOC_ADD_CHANGE, ServerPacket.field2675, ServerPacket.OBJ_ADD, ServerPacket.LOC_ANIM_SPECIFIC, ServerPacket.UPDATE_ZONE_PARTIAL_FOLLOWS, ServerPacket.PLAYER_INFO, ServerPacket.MESSAGE_PRIVATE_ECHO, ServerPacket.UPDATE_RUNWEIGHT, ServerPacket.CAM_LOOKAT_EASED_ANGLE_RELATIVE, ServerPacket.VARP_SMALL, ServerPacket.PLAYER_SPOTANIM_SPECIFIC, ServerPacket.field2672, ServerPacket.IF1_MODELROTATE, ServerPacket.HINT_ARROW, ServerPacket.NEW_PACK_215, ServerPacket.IF_SETANGLE, ServerPacket.IF_SETPLAYERMODEL_OBJ, ServerPacket.field2683, ServerPacket.MESSAGE_PRIVATE, ServerPacket.IF_SETOBJECT, ServerPacket.CAM_MOVETO_EASED_CIRCULAR, ServerPacket.CLANCHANNEL_DELTA, ServerPacket.IF_SETPLAYERMODEL_SELF, ServerPacket.UPDATE_INV_FULL, ServerPacket.CHAT_FILTER_SETTINGS_PRIVATECHAT, ServerPacket.IF_OPENSUB, ServerPacket.IF_SETPOSITION, ServerPacket.CAM_RESET, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2, ServerPacket.CLANSETTINGS_FULL, ServerPacket.CAM_SHAKE, ServerPacket.SET_MAP_FLAG, ServerPacket.MINIMAP_TOGGLE, ServerPacket.UPDATE_FRIENDLIST, ServerPacket.TRIGGER_ONDIALOGABORT, ServerPacket.MIDI_JINGLE, ServerPacket.REBUILD_REGION, ServerPacket.IF_SETPLAYERMODEL_BODYTYPE, ServerPacket.NPC_HEADICON_SPECIFIC, ServerPacket.UPDATE_INV_PARTIAL, ServerPacket.RESET_CLIENT_VARCACHE, ServerPacket.FRIENDLIST_LOADED, ServerPacket.NPC_INFO_SMALL, ServerPacket.MESSAGE_FRIENDCHANNEL, ServerPacket.REFLECTION_CHECK, ServerPacket.VARCLAN, ServerPacket.field2730, ServerPacket.MESSAGE_GAME, ServerPacket.CAM_MOVETO_EASED, ServerPacket.PREFETCH_GAMEOBJECTS, ServerPacket.IF_SETPLAYERMODEL_BASECOLOUR, ServerPacket.SYNC_CLIENT_VARCACHE, ServerPacket.VARCLAN_DISABLE, ServerPacket.UPDATE_RUNENERGY, ServerPacket.IF_SETANIM, ServerPacket.NPC_INFO_LARGE, ServerPacket.IF_SETHIDE, ServerPacket.MESSAGE_CLANCHANNEL_SYSTEM, ServerPacket.field2720, ServerPacket.CLANSETTINGS_DELTA, ServerPacket.RUN_CLIENTSCRIPT, ServerPacket.UPDATE_SITESETTINGS, ServerPacket.UPDATE_ZONE_FULL_FOLLOWS, ServerPacket.LOGOUT_FULL, ServerPacket.EMPTY_PACKET, ServerPacket.HEAT_MAP, ServerPacket.field2736, ServerPacket.field2714, ServerPacket.field2715, ServerPacket.SPOTANIM_SPECIFIC, ServerPacket.IF_SETSCROLLPOS, ServerPacket.UPDATE_FRIENDCHAT_CHANNEL_FULL, ServerPacket.CAM_LOOKAT_EASED_COORD, ServerPacket.LOGOUT, ServerPacket.CAM_MOVETO, ServerPacket.field2744, ServerPacket.NEW_PACKET_CAM_RESET_V2, ServerPacket.IF_SETPLAYERHEAD, ServerPacket.UPDATE_INV_CLEAR, ServerPacket.OBJ_DEL, ServerPacket.LOGIN_SCREEN_PACKET, ServerPacket.REBUILD_REGION_NORMAL, ServerPacket.TOGGLE_OCULUS_ORB, ServerPacket.LOC_DEL, ServerPacket.MIDI_SONG, ServerPacket.ENTER_FREECAM, ServerPacket.SYNTH_SOUND, ServerPacket.MIDI_SWAP, ServerPacket.PLAYER_ANIM_SPECIFIC, ServerPacket.field2738, ServerPacket.field2755}; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "3" - ) - public static boolean method1032(int var0) { - return var0 == WorldMapDecorationType.field3173.id; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class212.java b/osrs/src/main/java/class212.java index 4dd97749f..b0c2984c2 100644 --- a/osrs/src/main/java/class212.java +++ b/osrs/src/main/java/class212.java @@ -1,38 +1,14 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") -public class class212 extends DualNode { - @ObfuscatedName("ac") +@ObfuscatedName("is") +public interface class212 { + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "(I)I", + garbageValue = "-855152300" ) - static EvictingDualNodeHashTable field1679; - - static { - field1679 = new EvictingDualNodeHashTable(64); - } - - @ObfuscatedName("nf") - @ObfuscatedSignature( - descriptor = "(Lnm;I)Lnm;", - garbageValue = "-1852354008" - ) - static Widget method1045(Widget var0) { - int var2 = MouseRecorder.getWidgetFlags(var0); - int var1 = var2 >> 17 & 7; - int var3 = var1; - if (var1 == 0) { - return null; - } else { - for (int var4 = 0; var4 < var3; ++var4) { - var0 = class33.widgetDefinition.method1740(var0.parentId); - if (var0 == null) { - return null; - } - } - - return var0; - } - } + @Export("useRotation") + int useRotation(); } \ No newline at end of file diff --git a/osrs/src/main/java/class214.java b/osrs/src/main/java/class214.java index d94690865..9e9d220f8 100644 --- a/osrs/src/main/java/class214.java +++ b/osrs/src/main/java/class214.java @@ -2,27 +2,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -@ObfuscatedName("im") -public class class214 extends DualNode { - @ObfuscatedName("ac") +@ObfuscatedName("ib") +public class class214 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lea;" + ) + public UrlRequest field1852; + @ObfuscatedName("ah") + public float[] field1853; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Lic;" ) - @Export("archive4") - static EvictingDualNodeHashTable archive4; + @Export("this$0") + @ObfuscatedName("this$0") + final class208 this$0; - static { - archive4 = new EvictingDualNodeHashTable(64); + @ObfuscatedSignature( + descriptor = "(Lic;)V" + ) + class214(class208 var1) { + this.this$0 = var1; + this.field1853 = new float[4]; } - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IB)Liy;", - garbageValue = "-114" + descriptor = "(II)Lhv;", + garbageValue = "-1391716385" ) @Export("ItemDefinition_get") public static ItemComposition ItemDefinition_get(int var0) { @@ -30,7 +38,7 @@ public static ItemComposition ItemDefinition_get(int var0) { if (var1 != null) { return var1; } else { - byte[] var2 = class317.ItemDefinition_archive.takeFile(10, var0); + byte[] var2 = DbRowType.ItemDefinition_archive.takeFile(10, var0); var1 = new ItemComposition(); var1.id = var0; if (var2 != null) { @@ -50,7 +58,7 @@ public static ItemComposition ItemDefinition_get(int var0) { var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); } - if (!HealthBarUpdate.ItemDefinition_inMembersWorld && var1.isMembersOnly) { + if (!class129.ItemDefinition_inMembersWorld && var1.isMembersOnly) { if (var1.noteTemplate == -1 && var1.notedId == -1 && var1.placeholderTemplate == -1) { var1.name = var1.name + " (Members)"; } @@ -74,7 +82,7 @@ public static ItemComposition ItemDefinition_get(int var0) { boolean var6 = false; for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamComposition var5 = class180.getParamDefinition((int)var4.key); + ParamComposition var5 = Frames.getParamDefinition((int)var4.key); if (var5.autoDisable) { var4.remove(); } else { @@ -93,191 +101,28 @@ public static ItemComposition ItemDefinition_get(int var0) { } } - @ObfuscatedName("aj") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IB)Lfk;", - garbageValue = "-119" + descriptor = "(II)I", + garbageValue = "-2138855763" ) - static class139 method1051(int var0) { - class139 var3 = (class139)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); - class139 var2; - class139 var4; - AbstractArchive var5; - AbstractArchive var6; - boolean var7; - byte[] var8; - int var9; - byte[] var10; - if (var3 != null) { - var2 = var3; - } else { - var5 = SequenceDefinition.SequenceDefinition_animationsArchive; - var6 = SequenceDefinition.SequenceDefinition_skeletonsArchive; - var7 = true; - var8 = var5.getFile(var0 >> 16 & 65535, var0 & 65535); - if (var8 == null) { - var7 = false; - var4 = null; - } else { - var9 = (var8[1] & 255) << 8 | var8[2] & 255; - var10 = var6.getFile(var9, 0); - if (var10 == null) { - var7 = false; - } - - if (!var7) { - var4 = null; - } else { - if (SoundCache.field214 == null) { - MusicPatchPcmStream.field2855 = Runtime.getRuntime().availableProcessors(); - SoundCache.field214 = new ThreadPoolExecutor(0, MusicPatchPcmStream.field2855, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(MusicPatchPcmStream.field2855 * 100 + 100), new class186()); - } - - try { - var4 = new class139(var5, var6, var0, false); - } catch (Exception var13) { - var4 = null; - } - } - } - - if (var4 != null) { - SequenceDefinition.SequenceDefinition_cachedModel.put(var4, (long)var0); - } - - var2 = var4; - } - - int var1; - if (var2 == null) { - var1 = 2; - } else { - var1 = var2.method738() ? 0 : 1; - } - - if (var1 != 0) { - return null; - } else { - var3 = (class139)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); - if (var3 != null) { - var2 = var3; - } else { - var5 = SequenceDefinition.SequenceDefinition_animationsArchive; - var6 = SequenceDefinition.SequenceDefinition_skeletonsArchive; - var7 = true; - var8 = var5.getFile(var0 >> 16 & 65535, var0 & 65535); - if (var8 == null) { - var7 = false; - var4 = null; - } else { - var9 = (var8[1] & 255) << 8 | var8[2] & 255; - var10 = var6.getFile(var9, 0); - if (var10 == null) { - var7 = false; - } - - if (!var7) { - var4 = null; - } else { - if (SoundCache.field214 == null) { - MusicPatchPcmStream.field2855 = Runtime.getRuntime().availableProcessors(); - SoundCache.field214 = new ThreadPoolExecutor(0, MusicPatchPcmStream.field2855, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(MusicPatchPcmStream.field2855 * 100 + 100), new class216()); - } - - try { - var4 = new class139(var5, var6, var0, false); - } catch (Exception var12) { - var4 = null; - } - } - } - - if (var4 != null) { - SequenceDefinition.SequenceDefinition_cachedModel.put(var4, (long)var0); - } - - var2 = var4; - } - - return var2; - } + public static int method1092(int var0) { + return class314.field2775[var0]; } - @ObfuscatedName("hx") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2124568966" + descriptor = "(I)Lrq;", + garbageValue = "1839119171" ) - static final void method1052() { - UserComparator10.method682(); - SoundSystem.method226(); - class517.method2526(); - class74.method425(); - PlayerType.method1912(); - EnumComposition.EnumDefinition_cached.clear(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.ItemDefinition_cachedModels.clear(); - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - MouseHandler.method173(); - KitDefinition.KitDefinition_cached.clear(); - ObjTypeCustomisation.method947(); - MusicPatchPcmStream.method1725(); - class33.method135(); - class141.method749(); - class20.method75(); - class315.method1655(); - class20.method74(); - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - SequenceDefinition.SequenceDefinition_cachedModel.clear(); - class198.method992(); - Actor.method511(); - UserComparator3.method676(); - HealthBarDefinition.Widget_cachedModels.method2516(); - class53.Widget_cachedFonts.method2516(); - class206.Widget_cachedSpriteMasks.clear(); - class208.field1648.clear(); - class154.method802(); - class193.archive5.clear(); - class188.field1492.clear(); - Language.method2002(); - KeyHandler.method95(); - UserComparator10.method684(); - UserComparator9.method678(); - Client.Widget_cachedModels.clear(); - Client.archive11.clear(); - PlayerComposition.PlayerAppearance_cachedModels.clear(); - PlayerComposition.field2939.clearFiles(); - PlayerComposition.field2937 = 0; - class33.widgetDefinition.method1744(); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - Client.field631.clearFiles(); - class92.field888.method1950(); - class199.field1567.method1950(); - class190.archive10.method1950(); - SongTask.archive12.method1950(); - SoundSystem.archive2.method1950(); - class313.field2770.method1950(); - WorldMapDecorationType.field3154.method1950(); - class27.archive13.method1950(); - AbstractByteArrayCopier.archive4.method1950(); - class319.field2799.method1950(); - class469.field3930.method1950(); - Language.field3643.method1950(); - class198.archive9.method1950(); - CollisionMap.archive6.method1950(); - GrandExchangeOfferOwnWorldComparator.field361.method1950(); - class317.field2776.method1950(); - class199.archive8.method1950(); - class241.field2052.method1950(); - ArchiveDiskAction.field3538.method1950(); - HorizontalAlignment.field1584.method1950(); - class358.field3177.method1950(); - AABB.field2123.method1950(); + public static class461 method1093() { + synchronized(class461.field3900) { + if (IgnoreList.field3815 == 0) { + return new class461(); + } else { + class461.field3900[--IgnoreList.field3815].method2312(); + return class461.field3900[IgnoreList.field3815]; + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class215.java b/osrs/src/main/java/class215.java new file mode 100644 index 000000000..d1fe62daf --- /dev/null +++ b/osrs/src/main/java/class215.java @@ -0,0 +1,46 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("in") +public class class215 { + @ObfuscatedName("iv") + static int[] field1854; + @ObfuscatedName("ao") + public String field1859; + @ObfuscatedName("ab") + public float[] field1855; + @ObfuscatedName("au") + public int field1858; + @ObfuscatedName("aa") + public int field1856; + @ObfuscatedName("ac") + public int field1857; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lic;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final class208 this$0; + + @ObfuscatedSignature( + descriptor = "(Lic;)V" + ) + class215(class208 var1) { + this.this$0 = var1; + this.field1855 = new float[4]; + this.field1858 = 1; + this.field1856 = 1; + this.field1857 = 0; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SB)V", + garbageValue = "0" + ) + public static void method1095(String[] var0, short[] var1) { + class132.sortItemsByName(var0, var1, 0, var0.length - 1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class216.java b/osrs/src/main/java/class216.java index 9cd52d7b0..1af497d9c 100644 --- a/osrs/src/main/java/class216.java +++ b/osrs/src/main/java/class216.java @@ -2,45 +2,64 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.concurrent.ThreadFactory; +@ObfuscatedName("id") +public class class216 extends class219 { + @ObfuscatedName("ua") + @Export("cameraLookAtY") + static int cameraLookAtY; + @ObfuscatedName("at") + int field1861; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lic;" + ) + final class208 this$0; + + @ObfuscatedSignature( + descriptor = "(Lic;Ljava/lang/String;I)V" + ) + class216(class208 var1, String var2, int var3) { + super(var1, var2); + this.this$0 = var1; + this.field1861 = var3; + } -@ObfuscatedName("iu") -final class class216 implements ThreadFactory { - public Thread newThread(Runnable var1) { - return new Thread(var1, "OSRS Maya Anim Load"); + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "561834394" + ) + public int vmethod3379() { + return 0; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("vmethod3378") + public int vmethod3378() { + return this.field1861; } - @ObfuscatedName("ak") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(CB)C", - garbageValue = "-128" + descriptor = "(B)Z", + garbageValue = "-106" ) - static char method1058(char var0) { - if (var0 == 198) { - return 'E'; - } else if (var0 == 230) { - return 'e'; - } else if (var0 == 223) { - return 's'; - } else if (var0 == 338) { - return 'E'; - } else { - return (char)(var0 == 339 ? 'e' : '\u0000'); - } + public static boolean method1096() { + ReflectionCheck var0 = (ReflectionCheck)class36.reflectionChecks.last(); + return var0 != null; } - @ObfuscatedName("nu") + @ObfuscatedName("mg") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-541702419" + descriptor = "(I)I", + garbageValue = "1337719835" ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = ClanChannelMember.getPacketBufferNode(ClientPacket.f22, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class478.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } + static final int method1099() { + float var0 = 200.0F * ((float)WorldMapIcon_1.clientPreferences.getBrightness() - 0.5F); + return 100 - Math.round(var0); } } \ No newline at end of file diff --git a/osrs/src/main/java/class219.java b/osrs/src/main/java/class219.java new file mode 100644 index 000000000..489cd2c5d --- /dev/null +++ b/osrs/src/main/java/class219.java @@ -0,0 +1,86 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ia") +public abstract class class219 { + @ObfuscatedName("ao") + String field1874; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lic;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final class208 this$0; + + @ObfuscatedSignature( + descriptor = "(Lic;Ljava/lang/String;)V" + ) + class219(class208 var1, String var2) { + this.this$0 = var1; + this.field1874 = var2; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "561834394" + ) + @Export("vmethod3379") + public abstract int vmethod3379(); + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "18" + ) + @Export("vmethod3380") + public String vmethod3380() { + return null; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("vmethod3378") + public int vmethod3378() { + return -1; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-273477420" + ) + public String method1105() { + return this.field1874; + } + + @ObfuscatedName("at") + public static final void method1104(long var0) { + if (var0 > 0L) { + if (0L == var0 % 10L) { + long var2 = var0 - 1L; + + try { + Thread.sleep(var2); + } catch (InterruptedException var8) { + } + + try { + Thread.sleep(1L); + } catch (InterruptedException var7) { + } + } else { + try { + Thread.sleep(var0); + } catch (InterruptedException var6) { + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class221.java b/osrs/src/main/java/class221.java new file mode 100644 index 000000000..5a7fd966c --- /dev/null +++ b/osrs/src/main/java/class221.java @@ -0,0 +1,472 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.awt.datatransfer.Clipboard; + +@ObfuscatedName("ij") +public class class221 implements class29 { + @ObfuscatedName("pk") + static int field1877; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lnn;" + ) + Widget field1880; + @ObfuscatedName("ah") + boolean field1878; + @ObfuscatedName("ar") + boolean field1879; + + public class221() { + this.field1880 = null; + this.field1878 = false; + this.field1879 = false; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "512" + ) + @Export("vmethod3949") + public boolean vmethod3949(int var1) { + if (this.field1880 == null) { + return false; + } else { + class27 var2 = this.field1880.method1873(); + if (var2 == null) { + return false; + } else { + if (var2.method119(var1)) { + switch(var1) { + case 81: + this.field1879 = true; + break; + case 82: + this.field1878 = true; + break; + default: + if (this.method1119(var1)) { + class159.invalidateWidget(this.field1880); + } + } + } + + return var2.method117(var1); + } + } + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1146773117" + ) + public boolean vmethod3989(int var1) { + switch(var1) { + case 81: + this.field1879 = false; + return false; + case 82: + this.field1878 = false; + return false; + default: + return false; + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "984376689" + ) + @Export("vmethod3951") + public boolean vmethod3951(char var1) { + if (this.field1880 == null) { + return false; + } else if (!DirectByteArrayCopier.method1884(var1)) { + return false; + } else { + class341 var2 = this.field1880.method1871(); + if (var2 != null && var2.method1815()) { + class27 var3 = this.field1880.method1873(); + if (var3 == null) { + return false; + } else { + if (var3.method120(var1) && var2.method1776(var1)) { + class159.invalidateWidget(this.field1880); + } + + return var3.method118(var1); + } + } else { + return false; + } + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ZB)Z", + garbageValue = "-49" + ) + @Export("vmethod3953") + public boolean vmethod3953(boolean var1) { + return false; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lnn;I)V", + garbageValue = "950407656" + ) + public void method1112(Widget var1) { + if (var1 != null) { + if (var1 != this.field1880) { + this.method1114(); + this.field1880 = var1; + } + + class339 var2 = var1.method1874(); + if (var2 != null) { + if (!var2.field2934.method1810() && var2.field2931 != null) { + ScriptEvent var3 = new ScriptEvent(); + var3.method467(var1); + var3.setArgs(var2.field2931); + FileSystem.getScriptEvents().addFirst(var3); + } + + var2.field2934.method1759(true); + } + } else { + this.method1114(); + } + + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(S)Lnn;", + garbageValue = "-15065" + ) + public Widget method1113() { + return this.field1880; + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-881991302" + ) + public void method1114() { + if (this.field1880 != null) { + class339 var1 = this.field1880.method1874(); + Widget var2 = this.field1880; + this.field1880 = null; + if (var1 != null) { + if (var1.field2934.method1810() && var1.field2931 != null) { + ScriptEvent var3 = new ScriptEvent(); + var3.method467(var2); + var3.setArgs(var1.field2931); + FileSystem.getScriptEvents().addFirst(var3); + } + + var1.field2934.method1759(false); + } + } + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "2" + ) + boolean method1119(int var1) { + if (this.field1880 == null) { + return false; + } else { + class341 var2 = this.field1880.method1871(); + if (var2 != null && var2.method1815()) { + Clipboard var5; + switch(var1) { + case 13: + this.method1114(); + return true; + case 48: + if (this.field1878) { + var2.method1782(); + } + + return true; + case 65: + if (this.field1878) { + var5 = SpriteMask.client.getClipboard(); + var2.method1801(var5); + } + + return true; + case 66: + if (this.field1878) { + var5 = SpriteMask.client.getClipboard(); + var2.method1800(var5); + } + + return true; + case 67: + if (this.field1878) { + var5 = SpriteMask.client.getClipboard(); + var2.method1802(var5); + } + + return true; + case 84: + if (var2.method1821() == 0) { + var2.method1776(10); + } else if (this.field1879 && var2.method1825()) { + var2.method1776(10); + } else { + class339 var3 = this.field1880.method1874(); + ScriptEvent var4 = new ScriptEvent(); + var4.method467(this.field1880); + var4.setArgs(var3.field2930); + FileSystem.getScriptEvents().addFirst(var4); + this.method1114(); + } + + return true; + case 85: + if (this.field1878) { + var2.method1779(); + } else { + var2.method1777(); + } + + return true; + case 96: + if (this.field1878) { + var2.method1790(this.field1879); + } else { + var2.method1788(this.field1879); + } + + return true; + case 97: + if (this.field1878) { + var2.method1791(this.field1879); + } else { + var2.method1789(this.field1879); + } + + return true; + case 98: + if (this.field1878) { + var2.method1803(); + } else { + var2.method1792(this.field1879); + } + + return true; + case 99: + if (this.field1878) { + var2.method1804(); + } else { + var2.method1793(this.field1879); + } + + return true; + case 101: + if (this.field1878) { + var2.method1780(); + } else { + var2.method1778(); + } + + return true; + case 102: + if (this.field1878) { + var2.method1786(this.field1879); + } else { + var2.method1784(this.field1879); + } + + return true; + case 103: + if (this.field1878) { + var2.method1787(this.field1879); + } else { + var2.method1785(this.field1879); + } + + return true; + case 104: + if (this.field1878) { + var2.method1796(this.field1879); + } else { + var2.method1794(this.field1879); + } + + return true; + case 105: + if (this.field1878) { + var2.method1797(this.field1879); + } else { + var2.method1795(this.field1879); + } + + return true; + default: + return false; + } + } else { + return false; + } + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)[Laa;", + garbageValue = "-14" + ) + public static class6[] method1111() { + return new class6[]{class6.field9}; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Luo;I)V", + garbageValue = "-620397215" + ) + static final void method1120(PacketBuffer var0) { + int var1 = 0; + var0.importIndex(); + + byte[] var10000; + int var2; + int var3; + int var4; + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var3 = Players.Players_indices[var2]; + if ((Players.activityFlags[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = Client.method361(var0); + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + class9.readPlayerUpdate(var0, var3); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var3 = Players.Players_indices[var2]; + if ((Players.activityFlags[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = Client.method361(var0); + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + class9.readPlayerUpdate(var0, var3); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var3 = Players.Players_emptyIndices[var2]; + if ((Players.activityFlags[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = Client.method361(var0); + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (Buddy.updateExternalPlayer(var0, var3)) { + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var3 = Players.Players_emptyIndices[var2]; + if ((Players.activityFlags[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = Client.method361(var0); + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (Buddy.updateExternalPlayer(var0, var3)) { + var10000 = Players.activityFlags; + var10000[var3] = (byte)(var10000[var3] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; + + for (var2 = 1; var2 < 2048; ++var2) { + var10000 = Players.activityFlags; + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var5 = Client.players[var2]; + if (var5 != null) { + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; + } + } + + } + } + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class222.java b/osrs/src/main/java/class222.java new file mode 100644 index 000000000..913f4969b --- /dev/null +++ b/osrs/src/main/java/class222.java @@ -0,0 +1,36 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ix") +public class class222 extends Node { + @ObfuscatedName("ar") + public int field1883; + @ObfuscatedName("ao") + public int field1882; + @ObfuscatedName("ab") + public int field1881; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lnn;" + ) + public Widget field1884; + + @ObfuscatedSignature( + descriptor = "(IIILnn;)V" + ) + public class222(int var1, int var2, int var3, Widget var4) { + this.field1881 = var1; + this.field1883 = var2; + this.field1882 = var3; + this.field1884 = var4; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "0" + ) + static final void method1121(String var0) { + WorldMapArea.method1213(var0 + " is already on your friend list"); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class223.java b/osrs/src/main/java/class223.java index edf16a548..38ec5c8f7 100644 --- a/osrs/src/main/java/class223.java +++ b/osrs/src/main/java/class223.java @@ -2,174 +2,213 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") -public class class223 { +import java.util.Arrays; + +@ObfuscatedName("il") +public class class223 implements class29 { + @ObfuscatedName("gv") + static int field1885; + @ObfuscatedName("jn") + static int field1886; + @ObfuscatedName("at") + char[] field1890; + @ObfuscatedName("ah") + int[] field1896; + @ObfuscatedName("ar") + public int[] field1900; + @ObfuscatedName("ao") + @Export("pressedKeysCount") + public int pressedKeysCount; + @ObfuscatedName("ab") + int[] field1895; + @ObfuscatedName("au") + int field1894; + @ObfuscatedName("aa") + int field1891; @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lij;" - ) - static final class223 field1872; + int field1892; @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lij;" - ) - static final class223 field1875; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lij;" - ) - static final class223 field1874; + int field1893; + @ObfuscatedName("az") + boolean[] field1889; + @ObfuscatedName("ap") + boolean[] field1887; + @ObfuscatedName("av") + boolean[] field1888; @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lij;" - ) - static final class223 field1877; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lij;" - ) - public static final class223 field1869; + public char field1897; + @ObfuscatedName("as") + public int field1899; + + public class223() { + this.field1890 = new char[128]; + this.field1896 = new int[128]; + this.field1900 = new int[128]; + this.pressedKeysCount = 0; + this.field1895 = new int[128]; + this.field1894 = 0; + this.field1891 = 0; + this.field1892 = 0; + this.field1893 = 0; + this.field1889 = new boolean[112]; + this.field1887 = new boolean[112]; + this.field1888 = new boolean[112]; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "512" + ) + @Export("vmethod3949") + public boolean vmethod3949(int var1) { + this.method1125(var1); + this.field1889[var1] = true; + this.field1887[var1] = true; + this.field1888[var1] = false; + this.field1900[++this.pressedKeysCount - 1] = var1; + return true; + } + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "(II)Z", + garbageValue = "-1146773117" ) - static final class223 field1873; + @Export("vmethod3989") + public boolean vmethod3989(int var1) { + this.field1889[var1] = false; + this.field1887[var1] = false; + this.field1888[var1] = true; + this.field1895[++this.field1894 - 1] = var1; + return true; + } + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "(CI)Z", + garbageValue = "984376689" ) - public static final class223 field1870; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lij;" - ) - public static final class223 field1866; - @ObfuscatedName("am") + @Export("vmethod3951") + public boolean vmethod3951(char var1) { + int var2 = this.field1892 + 1 & 127; + if (var2 != this.field1891) { + this.field1896[this.field1892] = -1; + this.field1890[this.field1892] = var1; + this.field1892 = var2; + } + + return false; + } + + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "(ZB)Z", + garbageValue = "-49" ) - public static final class223 field1868; + @Export("vmethod3953") + public boolean vmethod3953(boolean var1) { + return false; + } + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lij;" - ) - public static final class223 field1871; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "(IS)V", + garbageValue = "19704" ) - public static final class223 field1867; - @ObfuscatedName("aa") + void method1125(int var1) { + int var2 = this.field1892 + 1 & 127; + if (var2 != this.field1891) { + this.field1896[this.field1892] = var1; + this.field1890[this.field1892] = 0; + this.field1892 = var2; + } + + } + + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lij;" - ) - public static final class223 field1865; - @ObfuscatedName("ap") + descriptor = "(I)V", + garbageValue = "1513942573" + ) + public void method1127() { + this.field1891 = this.field1893; + this.field1893 = this.field1892; + this.pressedKeysCount = 0; + this.field1894 = 0; + Arrays.fill(this.field1887, false); + Arrays.fill(this.field1888, false); + } + + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "(I)Z", + garbageValue = "1159556377" ) - static final class223 field1876; + public final boolean method1128() { + if (this.field1893 == this.field1891) { + return false; + } else { + this.field1899 = this.field1896[this.field1891]; + this.field1897 = this.field1890[this.field1891]; + this.field1891 = this.field1891 + 1 & 127; + return true; + } + } + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lij;" - ) - static final class223 field1878; - @ObfuscatedName("aw") - public static String field1863; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lui;" + descriptor = "(IB)Z", + garbageValue = "21" ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("as") - public final int field1879; - - static { - field1872 = new class223(0); - field1875 = new class223(1); - field1874 = new class223(2); - field1877 = new class223(3); - field1869 = new class223(4, class209.field1651); - field1873 = new class223(5); - field1870 = new class223(6, class209.field1655); - field1866 = new class223(7, class209.field1650); - field1868 = new class223(8, class209.field1649); - field1871 = new class223(9, class209.field1653); - field1867 = new class223(10, class209.field1654); - field1865 = new class223(11, class209.field1652); - field1876 = new class223(12); - field1878 = new class223(13); - } - - class223(int var1) { - this(var1, (class209)null); + public boolean method1129(int var1) { + return var1 >= 0 && var1 < 112 ? this.field1887[var1] : false; } + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(ILik;)V" + descriptor = "(II)Z", + garbageValue = "1604984140" ) - class223(int var1, class209 var2) { - this.field1879 = var1; + @Export("getKeyPressed") + public boolean getKeyPressed(int var1) { + return var1 >= 0 && var1 < 112 ? this.field1889[var1] : false; } - @ObfuscatedName("gv") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-886545953" + descriptor = "(II)Z", + garbageValue = "1100003987" ) - static void method1129() { - class467.field3921 = System.getenv("JX_ACCESS_TOKEN"); - class191.field1499 = System.getenv("JX_REFRESH_TOKEN"); - LoginScreenAnimation.field1042 = System.getenv("JX_SESSION_ID"); - class155.field1355 = System.getenv("JX_CHARACTER_ID"); - String var0 = System.getenv("JX_DISPLAY_NAME"); - String var1; - if (var0 != null && !var0.isEmpty() && var0.charAt(0) != '#') { - var1 = var0; - } else { - var1 = ""; - } - - Login.field761 = var1; + public boolean method1131(int var1) { + return var1 >= 0 && var1 < 112 ? this.field1888[var1] : false; } - @ObfuscatedName("mj") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "796213891" + descriptor = "(I)[I", + garbageValue = "-1519174440" ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - class36.scrollBarSprites[0].drawAt(var0, var1); - class36.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field459); - int var5 = var3 * (var3 - 32) / var4; - if (var5 < 8) { - var5 = 8; + public int[] method1132() { + int[] var1 = new int[this.pressedKeysCount]; + + for (int var2 = 0; var2 < this.pressedKeysCount; ++var2) { + var1[var2] = this.field1900[var2]; } - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field458); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field463); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field463); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field463); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field463); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field461); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field461); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field461); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field461); + return var1; } - @ObfuscatedName("oj") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(II)Luq;", - garbageValue = "-134807305" + descriptor = "(I)[I", + garbageValue = "353218827" ) - static class521 method1131(int var0) { - class521 var1 = (class521)Client.archive11.get((long)var0); - if (var1 == null) { - var1 = new class521(class313.field2770, var0); + public int[] method1133() { + int[] var1 = new int[this.field1894]; + + for (int var2 = 0; var2 < this.field1894; ++var2) { + var1[var2] = this.field1895[var2]; } return var1; diff --git a/osrs/src/main/java/class224.java b/osrs/src/main/java/class224.java deleted file mode 100644 index 0533c7b9b..000000000 --- a/osrs/src/main/java/class224.java +++ /dev/null @@ -1,411 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.awt.datatransfer.Clipboard; -import java.security.SecureRandom; - -@ObfuscatedName("ib") -public class class224 implements class29 { - @ObfuscatedName("ik") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lnm;" - ) - Widget field1883; - @ObfuscatedName("al") - boolean field1882; - @ObfuscatedName("ak") - boolean field1881; - - public class224() { - this.field1883 = null; - this.field1882 = false; - this.field1881 = false; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1448724719" - ) - @Export("vmethod3949") - public boolean vmethod3949(int var1) { - if (this.field1883 == null) { - return false; - } else { - class27 var2 = this.field1883.method1879(); - if (var2 == null) { - return false; - } else { - if (var2.method109(var1)) { - switch(var1) { - case 81: - this.field1881 = true; - break; - case 82: - this.field1882 = true; - break; - default: - if (this.method1140(var1)) { - ClanChannelMember.invalidateWidget(this.field1883); - } - } - } - - return var2.method107(var1); - } - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-974805318" - ) - public boolean vmethod3989(int var1) { - switch(var1) { - case 81: - this.field1881 = false; - return false; - case 82: - this.field1882 = false; - return false; - default: - return false; - } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "19" - ) - @Export("vmethod3951") - public boolean vmethod3951(char var1) { - if (this.field1883 == null) { - return false; - } else { - boolean var2; - if (var1 >= ' ' && var1 < 127 || var1 > 127 && var1 < 160 || var1 > 160 && var1 <= 255) { - var2 = true; - } else { - label81: { - if (var1 != 0) { - char[] var3 = class399.cp1252AsciiExtension; - - for (int var4 = 0; var4 < var3.length; ++var4) { - char var5 = var3[var4]; - if (var5 == var1) { - var2 = true; - break label81; - } - } - } - - var2 = false; - } - } - - if (!var2) { - return false; - } else { - class344 var7 = this.field1883.method1877(); - if (var7 != null && var7.method1819()) { - class27 var6 = this.field1883.method1879(); - if (var6 == null) { - return false; - } else { - if (var6.method110(var1) && var7.method1780(var1)) { - ClanChannelMember.invalidateWidget(this.field1883); - } - - return var6.method108(var1); - } - } else { - return false; - } - } - } - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "-672025946" - ) - @Export("vmethod3953") - public boolean vmethod3953(boolean var1) { - return false; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lnm;I)V", - garbageValue = "-782706277" - ) - public void method1132(Widget var1) { - this.method1134(); - if (var1 != null) { - this.field1883 = var1; - class342 var2 = var1.method1880(); - if (var2 != null) { - var2.field2936.method1763(true); - if (var2.field2933 != null) { - ScriptEvent var3 = new ScriptEvent(); - var3.method470(var1); - var3.setArgs(var2.field2933); - class7.getScriptEvents().addFirst(var3); - } - } - } - - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(B)Lnm;", - garbageValue = "-68" - ) - public Widget method1133() { - return this.field1883; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-83" - ) - public void method1134() { - if (this.field1883 != null) { - class342 var1 = this.field1883.method1880(); - Widget var2 = this.field1883; - this.field1883 = null; - if (var1 != null) { - var1.field2936.method1763(false); - if (var1.field2933 != null) { - ScriptEvent var3 = new ScriptEvent(); - var3.method470(var2); - var3.setArgs(var1.field2933); - class7.getScriptEvents().addFirst(var3); - } - - } - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "104826143" - ) - boolean method1140(int var1) { - if (this.field1883 == null) { - return false; - } else { - class344 var2 = this.field1883.method1877(); - if (var2 != null && var2.method1819()) { - Clipboard var5; - switch(var1) { - case 13: - this.method1134(); - return true; - case 48: - if (this.field1882) { - var2.method1786(); - } - - return true; - case 65: - if (this.field1882) { - var5 = class159.client.getClipboard(); - var2.method1805(var5); - } - - return true; - case 66: - if (this.field1882) { - var5 = class159.client.getClipboard(); - var2.method1804(var5); - } - - return true; - case 67: - if (this.field1882) { - var5 = class159.client.getClipboard(); - var2.method1806(var5); - } - - return true; - case 84: - if (var2.method1825() == 0) { - var2.method1780(10); - } else if (this.field1881 && var2.method1829()) { - var2.method1780(10); - } else { - class342 var3 = this.field1883.method1880(); - ScriptEvent var4 = new ScriptEvent(); - var4.method470(this.field1883); - var4.setArgs(var3.field2934); - class7.getScriptEvents().addFirst(var4); - this.method1134(); - } - - return true; - case 85: - if (this.field1882) { - var2.method1783(); - } else { - var2.method1781(); - } - - return true; - case 96: - if (this.field1882) { - var2.method1794(this.field1881); - } else { - var2.method1792(this.field1881); - } - - return true; - case 97: - if (this.field1882) { - var2.method1795(this.field1881); - } else { - var2.method1793(this.field1881); - } - - return true; - case 98: - if (this.field1882) { - var2.method1807(); - } else { - var2.method1796(this.field1881); - } - - return true; - case 99: - if (this.field1882) { - var2.method1808(); - } else { - var2.method1797(this.field1881); - } - - return true; - case 101: - if (this.field1882) { - var2.method1784(); - } else { - var2.method1782(); - } - - return true; - case 102: - if (this.field1882) { - var2.method1790(this.field1881); - } else { - var2.method1788(this.field1881); - } - - return true; - case 103: - if (this.field1882) { - var2.method1791(this.field1881); - } else { - var2.method1789(this.field1881); - } - - return true; - case 104: - if (this.field1882) { - var2.method1800(this.field1881); - } else { - var2.method1798(this.field1881); - } - - return true; - case 105: - if (this.field1882) { - var2.method1801(this.field1881); - } else { - var2.method1799(this.field1881); - } - - return true; - default: - return false; - } - } else { - return false; - } - } - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "([BI)Lds;", - garbageValue = "-1039632832" - ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); - Buffer var2 = new Buffer(var0); - var2.offset = var2.array.length - 2; - int var3 = var2.readUnsignedShort(); - int var4 = var2.array.length - 2 - var3 - 12; - var2.offset = var4; - int var5 = var2.readInt(); - var1.localIntCount = var2.readUnsignedShort(); - var1.localStringCount = var2.readUnsignedShort(); - var1.intArgumentCount = var2.readUnsignedShort(); - var1.stringArgumentCount = var2.readUnsignedShort(); - int var6 = var2.readUnsignedByte(); - int var7; - int var8; - if (var6 > 0) { - var1.switches = var1.newIterableNodeHashTable(var6); - - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? EnumComposition.method999(var8) : 1); - var1.switches[var7] = var9; - - while (var8-- > 0) { - int var10 = var2.readInt(); - int var11 = var2.readInt(); - var9.put(new IntegerNode(var11), (long)var10); - } - } - } - - var2.offset = 0; - var1.field820 = var2.readStringCp1252NullTerminatedOrNull(); - var1.opcodes = new int[var5]; - var1.intOperands = new int[var5]; - var1.stringOperands = new String[var5]; - - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { - var8 = var2.readUnsignedShort(); - if (var8 == 3) { - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); - } - } - - return var1; - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "120" - ) - static int method1141(int var0, Script var1, boolean var2) { - return 2; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class225.java b/osrs/src/main/java/class225.java index 5e6a55dbf..97a92c555 100644 --- a/osrs/src/main/java/class225.java +++ b/osrs/src/main/java/class225.java @@ -1,29 +1,106 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") -public class class225 extends Node { - @ObfuscatedName("am") - public static int field1884; - @ObfuscatedName("ak") - public int field1885; - @ObfuscatedName("ax") - public int field1887; +import java.util.Arrays; + +@ObfuscatedName("ir") +public class class225 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + static final class225 field1912; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + static final class225 field1909; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + static final class225 field1911; @ObfuscatedName("ao") - public int field1886; + @ObfuscatedSignature( + descriptor = "Lir;" + ) + static final class225 field1910; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + static final class225 field1908; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + static final class225 field1913; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + static final class225 field1907; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "[Lir;" + ) + static final class225[] field1914; + @ObfuscatedName("ac") + final int field1915; + @ObfuscatedName("al") + final int field1916; + @ObfuscatedName("az") + final int field1917; + + static { + field1912 = new class225(0, 8, 8); + field1909 = new class225(1, 16, 16); + field1911 = new class225(3, 32, 32); + field1910 = new class225(5, 48, 48); + field1908 = new class225(6, 64, 64); + field1913 = new class225(4, 96, 96); + field1907 = new class225(2, 128, 128); + field1914 = RouteStrategy.method1149(); + Arrays.sort(field1914, new class230()); + } + + class225(int var1, int var2, int var3) { + this.field1915 = var1; + this.field1916 = var2; + this.field1917 = var3; + } + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "(I)I", + garbageValue = "-524801234" ) - public Widget field1888; + int method1147() { + return this.field1917 * this.field1916; + } + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IIILnm;)V" + descriptor = "(IIIIIIII)Z", + garbageValue = "-1539205894" ) - public class225(int var1, int var2, int var3, Widget var4) { - this.field1886 = var1; - this.field1885 = var2; - this.field1887 = var3; - this.field1888 = var4; + static final boolean method1148(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = ViewportMouse.ViewportMouse_y + var6; + if (var7 < var0 && var7 < var1 && var7 < var2) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_y - var6; + if (var7 > var0 && var7 > var1 && var7 > var2) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x + var6; + if (var7 < var3 && var7 < var4 && var7 < var5) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; + return var7 <= var3 || var7 <= var4 || var7 <= var5; + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class226.java b/osrs/src/main/java/class226.java deleted file mode 100644 index a0e839e7c..000000000 --- a/osrs/src/main/java/class226.java +++ /dev/null @@ -1,212 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Arrays; - -@ObfuscatedName("it") -public class class226 implements class29 { - @ObfuscatedName("ac") - char[] field1892; - @ObfuscatedName("al") - int[] field1897; - @ObfuscatedName("ak") - public int[] field1902; - @ObfuscatedName("ax") - @Export("pressedKeysCount") - public int pressedKeysCount; - @ObfuscatedName("ao") - int[] field1898; - @ObfuscatedName("ah") - int field1894; - @ObfuscatedName("ar") - int field1896; - @ObfuscatedName("ab") - int field1893; - @ObfuscatedName("am") - int field1895; - @ObfuscatedName("av") - boolean[] field1891; - @ObfuscatedName("ag") - boolean[] field1890; - @ObfuscatedName("aa") - boolean[] field1889; - @ObfuscatedName("ap") - public char field1899; - @ObfuscatedName("ay") - public int field1901; - - public class226() { - this.field1892 = new char[128]; - this.field1897 = new int[128]; - this.field1902 = new int[128]; - this.pressedKeysCount = 0; - this.field1898 = new int[128]; - this.field1894 = 0; - this.field1896 = 0; - this.field1893 = 0; - this.field1895 = 0; - this.field1891 = new boolean[112]; - this.field1890 = new boolean[112]; - this.field1889 = new boolean[112]; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1448724719" - ) - @Export("vmethod3949") - public boolean vmethod3949(int var1) { - this.method1145(var1); - this.field1891[var1] = true; - this.field1890[var1] = true; - this.field1889[var1] = false; - this.field1902[++this.pressedKeysCount - 1] = var1; - return true; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-974805318" - ) - @Export("vmethod3989") - public boolean vmethod3989(int var1) { - this.field1891[var1] = false; - this.field1890[var1] = false; - this.field1889[var1] = true; - this.field1898[++this.field1894 - 1] = var1; - return true; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "19" - ) - @Export("vmethod3951") - public boolean vmethod3951(char var1) { - int var2 = this.field1893 + 1 & 127; - if (var2 != this.field1896) { - this.field1897[this.field1893] = -1; - this.field1892[this.field1893] = var1; - this.field1893 = var2; - } - - return false; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "-672025946" - ) - @Export("vmethod3953") - public boolean vmethod3953(boolean var1) { - return false; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1769728274" - ) - void method1145(int var1) { - int var2 = this.field1893 + 1 & 127; - if (var2 != this.field1896) { - this.field1897[this.field1893] = var1; - this.field1892[this.field1893] = 0; - this.field1893 = var2; - } - - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - public void method1147() { - this.field1896 = this.field1895; - this.field1895 = this.field1893; - this.pressedKeysCount = 0; - this.field1894 = 0; - Arrays.fill(this.field1890, false); - Arrays.fill(this.field1889, false); - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-192433797" - ) - public final boolean method1148() { - if (this.field1896 == this.field1895) { - return false; - } else { - this.field1901 = this.field1897[this.field1896]; - this.field1899 = this.field1892[this.field1896]; - this.field1896 = this.field1896 + 1 & 127; - return true; - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1443777028" - ) - public boolean method1149(int var1) { - return var1 >= 0 && var1 < 112 ? this.field1890[var1] : false; - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-978109184" - ) - @Export("getKeyPressed") - public boolean getKeyPressed(int var1) { - return var1 >= 0 && var1 < 112 ? this.field1891[var1] : false; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1065204501" - ) - public boolean method1151(int var1) { - return var1 >= 0 && var1 < 112 ? this.field1889[var1] : false; - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "118" - ) - public int[] method1152() { - int[] var1 = new int[this.pressedKeysCount]; - - for (int var2 = 0; var2 < this.pressedKeysCount; ++var2) { - var1[var2] = this.field1902[var2]; - } - - return var1; - } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "-31" - ) - public int[] method1153() { - int[] var1 = new int[this.field1894]; - - for (int var2 = 0; var2 < this.field1894; ++var2) { - var1[var2] = this.field1898[var2]; - } - - return var1; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class227.java b/osrs/src/main/java/class227.java new file mode 100644 index 000000000..223611a05 --- /dev/null +++ b/osrs/src/main/java/class227.java @@ -0,0 +1,179 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ig") +public class class227 { + @ObfuscatedName("at") + final int[][] field1928; + @ObfuscatedName("ah") + final int[][] field1927; + @ObfuscatedName("ar") + int field1923; + @ObfuscatedName("ao") + int field1922; + @ObfuscatedName("ab") + final int[] field1925; + @ObfuscatedName("au") + final int[] field1926; + @ObfuscatedName("aa") + final int field1924; + + class227(int var1, int var2) { + this.field1928 = new int[var1][var2]; + this.field1927 = new int[var1][var2]; + int var3 = var2 * var1; + int var4 = class184.method927(var3 / 4); + this.field1925 = new int[var4]; + this.field1926 = new int[var4]; + this.field1924 = var4 - 1; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1222193481" + ) + void method1153() { + for (int var1 = 0; var1 < this.field1928.length; ++var1) { + for (int var2 = 0; var2 < this.field1928[var1].length; ++var2) { + this.field1928[var1][var2] = 0; + this.field1927[var1][var2] = 99999999; + } + } + + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "19" + ) + void method1154(int var1, int var2) { + this.field1923 = var1; + this.field1922 = var2; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "40323441" + ) + int method1155() { + return this.field1923; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1750478119" + ) + int method1156() { + return this.field1922; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1487241351" + ) + int method1157() { + return this.field1928.length; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-63" + ) + int method1158() { + return this.field1928[0].length; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)[[I", + garbageValue = "-32547244" + ) + int[][] method1159() { + return this.field1928; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)[[I", + garbageValue = "2082106732" + ) + int[][] method1160() { + return this.field1927; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)[I", + garbageValue = "-33" + ) + int[] method1161() { + return this.field1925; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "1805149245" + ) + int[] method1162() { + return this.field1926; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "3128" + ) + int method1163() { + return this.field1924; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "516019890" + ) + public static void method1164() { + synchronized(ArchiveDiskActionHandler.field3543) { + if (ArchiveDiskActionHandler.field3542 != 0) { + ArchiveDiskActionHandler.field3542 = 1; + ArchiveDiskActionHandler.field3541 = true; + + try { + ArchiveDiskActionHandler.field3543.wait(); + } catch (InterruptedException var3) { + } + } + + } + } + + @ObfuscatedName("nm") + @ObfuscatedSignature( + descriptor = "(Lnn;I)Lnn;", + garbageValue = "16221133" + ) + static Widget method1165(Widget var0) { + int var2 = class361.getWidgetFlags(var0); + int var1 = var2 >> 17 & 7; + int var3 = var1; + if (var1 == 0) { + return null; + } else { + for (int var4 = 0; var4 < var3; ++var4) { + var0 = HealthBarDefinition.widgetDefinition.method1733(var0.parentId); + if (var0 == null) { + return null; + } + } + + return var0; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class228.java b/osrs/src/main/java/class228.java deleted file mode 100644 index a3644cfa1..000000000 --- a/osrs/src/main/java/class228.java +++ /dev/null @@ -1,93 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Arrays; - -@ObfuscatedName("ic") -public class class228 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static final class228 field1909; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static final class228 field1912; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static final class228 field1911; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static final class228 field1915; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static final class228 field1913; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static final class228 field1910; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static final class228 field1914; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "[Lic;" - ) - static final class228[] field1916; - @ObfuscatedName("ab") - final int field1917; - @ObfuscatedName("am") - final int field1918; - @ObfuscatedName("av") - final int field1919; - - static { - field1909 = new class228(5, 8, 8); - field1912 = new class228(0, 16, 16); - field1911 = new class228(1, 32, 32); - field1915 = new class228(6, 48, 48); - field1913 = new class228(4, 64, 64); - field1910 = new class228(2, 96, 96); - field1914 = new class228(3, 128, 128); - class228[] var0 = new class228[]{field1912, field1911, field1910, field1914, field1913, field1909, field1915}; - field1916 = var0; - Arrays.sort(field1916, new class233()); - } - - class228(int var1, int var2, int var3) { - this.field1917 = var1; - this.field1918 = var2; - this.field1919 = var3; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "14" - ) - int method1168() { - return this.field1919 * this.field1918; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1760324394" - ) - public static int method1169(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 7 & 127L); - return var1; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class229.java b/osrs/src/main/java/class229.java new file mode 100644 index 000000000..09592ecf3 --- /dev/null +++ b/osrs/src/main/java/class229.java @@ -0,0 +1,601 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iy") +public class class229 { + @ObfuscatedName("nq") + @ObfuscatedSignature( + descriptor = "Lds;" + ) + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "[Lig;" + ) + class227[] field1937; + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-2" + ) + public void method1169() { + this.field1937 = new class227[1]; + class225 var1 = class225.field1911; + this.field1937[0] = new class227(var1.field1916, var1.field1917); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IIILit;Liw;Z[I[IB)I", + garbageValue = "-7" + ) + public int method1170(int var1, int var2, int var3, RouteStrategy var4, CollisionMap var5, boolean var6, int[] var7, int[] var8) { + return this.method1171(var1, var2, var3, var4, var5, var6, var7, var8, this.field1937[0]); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIILit;Liw;Z[I[ILig;I)I", + garbageValue = "1698445107" + ) + int method1171(int var1, int var2, int var3, RouteStrategy var4, CollisionMap var5, boolean var6, int[] var7, int[] var8, class227 var9) { + var9.method1153(); + int var10 = var9.method1157(); + int var11 = var9.method1158(); + int[][] var12 = var9.method1160(); + int[][] var13 = var9.method1159(); + int[] var14 = var9.method1161(); + int[] var15 = var9.method1162(); + boolean var16; + if (var3 == 1) { + var16 = this.method1172(var1, var2, var4, var5, var9); + } else if (var3 == 2) { + var16 = this.method1173(var1, var2, var4, var5, var9); + } else { + var16 = this.method1174(var1, var2, var3, var4, var5, var9); + } + + int var17 = var1 - (var10 >> 1); + int var18 = var2 - (var11 >> 1); + int var19 = var9.method1155(); + int var20 = var9.method1156(); + int var21; + int var22; + int var24; + if (!var16) { + if (!var6) { + return -1; + } + + var21 = Integer.MAX_VALUE; + var22 = Integer.MAX_VALUE; + byte var23 = 10; + var24 = var4.approxDestinationX; + int var25 = var4.approxDestinationY; + int var26 = var4.approxDestinationSizeX; + int var27 = var4.approxDestinationSizeY; + + for (int var28 = var24 - var23; var28 <= var23 + var24; ++var28) { + for (int var29 = var25 - var23; var29 <= var25 + var23; ++var29) { + int var30 = var28 - var17; + int var31 = var29 - var18; + if (var30 >= 0 && var31 >= 0 && var30 < var10 && var31 < var11 && var12[var30][var31] < 100) { + int var32 = 0; + if (var28 < var24) { + var32 = var24 - var28; + } else if (var28 > var24 + var26 - 1) { + var32 = var28 - (var26 + var24 - 1); + } + + int var33 = 0; + if (var29 < var25) { + var33 = var25 - var29; + } else if (var29 > var27 + var25 - 1) { + var33 = var29 - (var25 + var27 - 1); + } + + int var34 = var32 * var32 + var33 * var33; + if (var34 < var21 || var34 == var21 && var12[var30][var31] < var22) { + var21 = var34; + var22 = var12[var30][var31]; + var19 = var28; + var20 = var29; + } + } + } + } + + if (var21 == Integer.MAX_VALUE) { + return -1; + } + } + + if (var19 == var1 && var20 == var2) { + var7[0] = var19; + var8[0] = var20; + return 0; + } else { + byte var36 = 0; + var14[var36] = var19; + var21 = var36 + 1; + var15[var36] = var20; + + int var37; + for (var22 = var37 = var13[var19 - var17][var20 - var18]; var19 != var1 || var20 != var2; var22 = var13[var19 - var17][var20 - var18]) { + if (var22 != var37) { + var37 = var22; + var14[var21] = var19; + var15[var21++] = var20; + } + + if ((var22 & 2) != 0) { + ++var19; + } else if ((var22 & 8) != 0) { + --var19; + } + + if ((var22 & 1) != 0) { + ++var20; + } else if ((var22 & 4) != 0) { + --var20; + } + } + + var24 = 0; + + while (var21-- > 0) { + var7[var24] = var14[var21]; + var8[var24++] = var15[var21]; + if (var24 >= var7.length) { + break; + } + } + + return var24; + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IILit;Liw;Lig;I)Z", + garbageValue = "856053681" + ) + final boolean method1172(int var1, int var2, RouteStrategy var3, CollisionMap var4, class227 var5) { + int var6 = var5.method1157(); + int var7 = var5.method1158(); + int[][] var8 = var5.method1160(); + int[][] var9 = var5.method1159(); + int[] var10 = var5.method1161(); + int[] var11 = var5.method1162(); + int var12 = var5.method1163(); + int var13 = var1; + int var14 = var2; + int var15 = var6 >> 1; + int var16 = var7 >> 1; + int var17 = var1 - var15; + int var18 = var2 - var16; + var9[var15][var16] = 99; + var8[var15][var16] = 0; + byte var19 = 0; + int var20 = 0; + var10[var19] = var1; + byte var10001 = var19; + int var25 = var19 + 1; + var11[var10001] = var2; + int[][] var21 = var4.flags; + + while (var25 != var20) { + var13 = var10[var20]; + var14 = var11[var20]; + var20 = var20 + 1 & var12; + var15 = var13 - var17; + var16 = var14 - var18; + int var22 = var13 - var4.xInset; + int var23 = var14 - var4.yInset; + if (var3.hasArrived(1, var13, var14, var4)) { + var5.method1154(var13, var14); + return true; + } + + int var24 = var8[var15][var16] + 1; + if (var15 > 0 && var9[var15 - 1][var16] == 0 && (var21[var22 - 1][var23] & 19136776) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16] = 2; + var8[var15 - 1][var16] = var24; + } + + if (var15 < var6 - 1 && var9[var15 + 1][var16] == 0 && (var21[var22 + 1][var23] & 19136896) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16] = 8; + var8[var15 + 1][var16] = var24; + } + + if (var16 > 0 && var9[var15][var16 - 1] == 0 && (var21[var22][var23 - 1] & 19136770) == 0) { + var10[var25] = var13; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15][var16 - 1] = 1; + var8[var15][var16 - 1] = var24; + } + + if (var16 < var7 - 1 && var9[var15][var16 + 1] == 0 && (var21[var22][var23 + 1] & 19136800) == 0) { + var10[var25] = var13; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15][var16 + 1] = 4; + var8[var15][var16 + 1] = var24; + } + + if (var15 > 0 && var16 > 0 && var9[var15 - 1][var16 - 1] == 0 && (var21[var22 - 1][var23 - 1] & 19136782) == 0 && (var21[var22 - 1][var23] & 19136776) == 0 && (var21[var22][var23 - 1] & 19136770) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16 - 1] = 3; + var8[var15 - 1][var16 - 1] = var24; + } + + if (var15 < var6 - 1 && var16 > 0 && var9[var15 + 1][var16 - 1] == 0 && (var21[var22 + 1][var23 - 1] & 19136899) == 0 && (var21[var22 + 1][var23] & 19136896) == 0 && (var21[var22][var23 - 1] & 19136770) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16 - 1] = 9; + var8[var15 + 1][var16 - 1] = var24; + } + + if (var15 > 0 && var16 < var7 - 1 && var9[var15 - 1][var16 + 1] == 0 && (var21[var22 - 1][var23 + 1] & 19136824) == 0 && (var21[var22 - 1][var23] & 19136776) == 0 && (var21[var22][var23 + 1] & 19136800) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16 + 1] = 6; + var8[var15 - 1][var16 + 1] = var24; + } + + if (var15 < var6 - 1 && var16 < var7 - 1 && var9[var15 + 1][var16 + 1] == 0 && (var21[var22 + 1][var23 + 1] & 19136992) == 0 && (var21[var22 + 1][var23] & 19136896) == 0 && (var21[var22][var23 + 1] & 19136800) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16 + 1] = 12; + var8[var15 + 1][var16 + 1] = var24; + } + } + + var5.method1154(var13, var14); + return false; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(IILit;Liw;Lig;I)Z", + garbageValue = "-247545109" + ) + final boolean method1173(int var1, int var2, RouteStrategy var3, CollisionMap var4, class227 var5) { + int var6 = var5.method1157(); + int var7 = var5.method1158(); + int[][] var8 = var5.method1160(); + int[][] var9 = var5.method1159(); + int[] var10 = var5.method1161(); + int[] var11 = var5.method1162(); + int var12 = var5.method1163(); + int var13 = var1; + int var14 = var2; + int var15 = var6 >> 1; + int var16 = var7 >> 1; + int var17 = var1 - var15; + int var18 = var2 - var16; + var9[var15][var16] = 99; + var8[var15][var16] = 0; + byte var19 = 0; + int var20 = 0; + var10[var19] = var1; + byte var10001 = var19; + int var25 = var19 + 1; + var11[var10001] = var2; + int[][] var21 = var4.flags; + + while (var20 != var25) { + var13 = var10[var20]; + var14 = var11[var20]; + var20 = var20 + 1 & var12; + var15 = var13 - var17; + var16 = var14 - var18; + int var22 = var13 - var4.xInset; + int var23 = var14 - var4.yInset; + if (var3.hasArrived(2, var13, var14, var4)) { + var5.method1154(var13, var14); + return true; + } + + int var24 = var8[var15][var16] + 1; + if (var15 > 0 && var9[var15 - 1][var16] == 0 && (var21[var22 - 1][var23] & 19136782) == 0 && (var21[var22 - 1][var23 + 1] & 19136824) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16] = 2; + var8[var15 - 1][var16] = var24; + } + + if (var15 < var6 - 2 && var9[var15 + 1][var16] == 0 && (var21[var22 + 2][var23] & 19136899) == 0 && (var21[var22 + 2][var23 + 1] & 19136992) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16] = 8; + var8[var15 + 1][var16] = var24; + } + + if (var16 > 0 && var9[var15][var16 - 1] == 0 && (var21[var22][var23 - 1] & 19136782) == 0 && (var21[var22 + 1][var23 - 1] & 19136899) == 0) { + var10[var25] = var13; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15][var16 - 1] = 1; + var8[var15][var16 - 1] = var24; + } + + if (var16 < var7 - 2 && var9[var15][var16 + 1] == 0 && (var21[var22][var23 + 2] & 19136824) == 0 && (var21[var22 + 1][var23 + 2] & 19136992) == 0) { + var10[var25] = var13; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15][var16 + 1] = 4; + var8[var15][var16 + 1] = var24; + } + + if (var15 > 0 && var16 > 0 && var9[var15 - 1][var16 - 1] == 0 && (var21[var22 - 1][var23] & 19136830) == 0 && (var21[var22 - 1][var23 - 1] & 19136782) == 0 && (var21[var22][var23 - 1] & 19136911) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16 - 1] = 3; + var8[var15 - 1][var16 - 1] = var24; + } + + if (var15 < var6 - 2 && var16 > 0 && var9[var15 + 1][var16 - 1] == 0 && (var21[var22 + 1][var23 - 1] & 19136911) == 0 && (var21[var22 + 2][var23 - 1] & 19136899) == 0 && (var21[var22 + 2][var23] & 19136995) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14 - 1; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16 - 1] = 9; + var8[var15 + 1][var16 - 1] = var24; + } + + if (var15 > 0 && var16 < var7 - 2 && var9[var15 - 1][var16 + 1] == 0 && (var21[var22 - 1][var23 + 1] & 19136830) == 0 && (var21[var22 - 1][var23 + 2] & 19136824) == 0 && (var21[var22][var23 + 2] & 19137016) == 0) { + var10[var25] = var13 - 1; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15 - 1][var16 + 1] = 6; + var8[var15 - 1][var16 + 1] = var24; + } + + if (var15 < var6 - 2 && var16 < var7 - 2 && var9[var15 + 1][var16 + 1] == 0 && (var21[var22 + 1][var23 + 2] & 19137016) == 0 && (var21[var22 + 2][var23 + 2] & 19136992) == 0 && (var21[var22 + 2][var23 + 1] & 19136995) == 0) { + var10[var25] = var13 + 1; + var11[var25] = var14 + 1; + var25 = var25 + 1 & var12; + var9[var15 + 1][var16 + 1] = 12; + var8[var15 + 1][var16 + 1] = var24; + } + } + + var5.method1154(var13, var14); + return false; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IIILit;Liw;Lig;I)Z", + garbageValue = "-1907782379" + ) + final boolean method1174(int var1, int var2, int var3, RouteStrategy var4, CollisionMap var5, class227 var6) { + int var7 = var6.method1157(); + int var8 = var6.method1158(); + int[][] var9 = var6.method1160(); + int[][] var10 = var6.method1159(); + int[] var11 = var6.method1161(); + int[] var12 = var6.method1162(); + int var13 = var6.method1163(); + int var14 = var1; + int var15 = var2; + int var16 = var7 >> 1; + int var17 = var8 >> 1; + int var18 = var1 - var16; + int var19 = var2 - var17; + var10[var16][var17] = 99; + var9[var16][var17] = 0; + byte var20 = 0; + int var21 = 0; + var11[var20] = var1; + int var27 = var20 + 1; + var12[var20] = var2; + int[][] var22 = var5.flags; + + while (true) { + label265: + while (true) { + int var23; + int var24; + int var25; + int var26; + do { + do { + do { + label242: + do { + if (var27 == var21) { + var6.method1154(var14, var15); + return false; + } + + var14 = var11[var21]; + var15 = var12[var21]; + var21 = var21 + 1 & var13; + var16 = var14 - var18; + var17 = var15 - var19; + var23 = var14 - var5.xInset; + var24 = var15 - var5.yInset; + if (var4.hasArrived(var3, var14, var15, var5)) { + var6.method1154(var14, var15); + return true; + } + + var25 = var9[var16][var17] + 1; + if (var16 > 0 && var10[var16 - 1][var17] == 0 && (var22[var23 - 1][var24] & 19136782) == 0 && (var22[var23 - 1][var3 + var24 - 1] & 19136824) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3 - 1) { + var11[var27] = var14 - 1; + var12[var27] = var15; + var27 = var27 + 1 & var13; + var10[var16 - 1][var17] = 2; + var9[var16 - 1][var17] = var25; + break; + } + + if ((var22[var23 - 1][var24 + var26] & 19136830) != 0) { + break; + } + + ++var26; + } + } + + if (var16 < var7 - var3 && var10[var16 + 1][var17] == 0 && (var22[var3 + var23][var24] & 19136899) == 0 && (var22[var3 + var23][var3 + var24 - 1] & 19136992) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3 - 1) { + var11[var27] = var14 + 1; + var12[var27] = var15; + var27 = var27 + 1 & var13; + var10[var16 + 1][var17] = 8; + var9[var16 + 1][var17] = var25; + break; + } + + if ((var22[var3 + var23][var24 + var26] & 19136995) != 0) { + break; + } + + ++var26; + } + } + + if (var17 > 0 && var10[var16][var17 - 1] == 0 && (var22[var23][var24 - 1] & 19136782) == 0 && (var22[var3 + var23 - 1][var24 - 1] & 19136899) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3 - 1) { + var11[var27] = var14; + var12[var27] = var15 - 1; + var27 = var27 + 1 & var13; + var10[var16][var17 - 1] = 1; + var9[var16][var17 - 1] = var25; + break; + } + + if ((var22[var23 + var26][var24 - 1] & 19136911) != 0) { + break; + } + + ++var26; + } + } + + if (var17 < var8 - var3 && var10[var16][var17 + 1] == 0 && (var22[var23][var3 + var24] & 19136824) == 0 && (var22[var3 + var23 - 1][var3 + var24] & 19136992) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3 - 1) { + var11[var27] = var14; + var12[var27] = var15 + 1; + var27 = var27 + 1 & var13; + var10[var16][var17 + 1] = 4; + var9[var16][var17 + 1] = var25; + break; + } + + if ((var22[var23 + var26][var3 + var24] & 19137016) != 0) { + break; + } + + ++var26; + } + } + + if (var16 > 0 && var17 > 0 && var10[var16 - 1][var17 - 1] == 0 && (var22[var23 - 1][var24 - 1] & 19136782) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3) { + var11[var27] = var14 - 1; + var12[var27] = var15 - 1; + var27 = var27 + 1 & var13; + var10[var16 - 1][var17 - 1] = 3; + var9[var16 - 1][var17 - 1] = var25; + break; + } + + if ((var22[var23 - 1][var26 + (var24 - 1)] & 19136830) != 0 || (var22[var26 + (var23 - 1)][var24 - 1] & 19136911) != 0) { + break; + } + + ++var26; + } + } + + if (var16 < var7 - var3 && var17 > 0 && var10[var16 + 1][var17 - 1] == 0 && (var22[var3 + var23][var24 - 1] & 19136899) == 0) { + var26 = 1; + + while (true) { + if (var26 >= var3) { + var11[var27] = var14 + 1; + var12[var27] = var15 - 1; + var27 = var27 + 1 & var13; + var10[var16 + 1][var17 - 1] = 9; + var9[var16 + 1][var17 - 1] = var25; + break; + } + + if ((var22[var3 + var23][var26 + (var24 - 1)] & 19136995) != 0 || (var22[var23 + var26][var24 - 1] & 19136911) != 0) { + break; + } + + ++var26; + } + } + + if (var16 > 0 && var17 < var8 - var3 && var10[var16 - 1][var17 + 1] == 0 && (var22[var23 - 1][var3 + var24] & 19136824) == 0) { + for (var26 = 1; var26 < var3; ++var26) { + if ((var22[var23 - 1][var26 + var24] & 19136830) != 0 || (var22[var26 + (var23 - 1)][var3 + var24] & 19137016) != 0) { + continue label242; + } + } + + var11[var27] = var14 - 1; + var12[var27] = var15 + 1; + var27 = var27 + 1 & var13; + var10[var16 - 1][var17 + 1] = 6; + var9[var16 - 1][var17 + 1] = var25; + } + } while(var16 >= var7 - var3); + } while(var17 >= var8 - var3); + } while(var10[var16 + 1][var17 + 1] != 0); + } while((var22[var3 + var23][var3 + var24] & 19136992) != 0); + + for (var26 = 1; var26 < var3; ++var26) { + if ((var22[var23 + var26][var3 + var24] & 19137016) != 0 || (var22[var3 + var23][var26 + var24] & 19136995) != 0) { + continue label265; + } + } + + var11[var27] = var14 + 1; + var12[var27] = var15 + 1; + var27 = var27 + 1 & var13; + var10[var16 + 1][var17 + 1] = 12; + var9[var16 + 1][var17 + 1] = var25; + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class230.java b/osrs/src/main/java/class230.java index 9bb863b98..563f7d03f 100644 --- a/osrs/src/main/java/class230.java +++ b/osrs/src/main/java/class230.java @@ -2,226 +2,66 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") -public class class230 { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lli;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("dl") - @ObfuscatedSignature( - descriptor = "Lun;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("ac") - final int[][] field1931; - @ObfuscatedName("al") - final int[][] field1932; - @ObfuscatedName("ak") - int field1926; - @ObfuscatedName("ax") - int field1927; - @ObfuscatedName("ao") - final int[] field1930; - @ObfuscatedName("ah") - final int[] field1929; - @ObfuscatedName("ar") - final int field1928; - - class230(int var1, int var2) { - this.field1931 = new int[var1][var2]; - this.field1932 = new int[var1][var2]; - int var3 = var2 * var1; - int var4 = EnumComposition.method999(var3 / 4); - this.field1930 = new int[var4]; - this.field1929 = new int[var4]; - this.field1928 = var4 - 1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "79" - ) - void method1173() { - for (int var1 = 0; var1 < this.field1931.length; ++var1) { - for (int var2 = 0; var2 < this.field1931[var1].length; ++var2) { - this.field1931[var1][var2] = 0; - this.field1932[var1][var2] = 99999999; - } - } - - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-19" - ) - void method1174(int var1, int var2) { - this.field1926 = var1; - this.field1927 = var2; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-9624" - ) - int method1175() { - return this.field1926; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-3816" - ) - int method1176() { - return this.field1927; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-796520814" - ) - int method1177() { - return this.field1931.length; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1493129305" - ) - int method1178() { - return this.field1931[0].length; - } +import java.util.Comparator; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)[[I", - garbageValue = "-1798810715" - ) - int[][] method1179() { - return this.field1931; +@ObfuscatedName("ip") +public class class230 implements Comparator { + class230() { } - @ObfuscatedName("ab") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)[[I", - garbageValue = "19" + descriptor = "(Lir;Lir;I)I", + garbageValue = "-1832801643" ) - int[][] method1180() { - return this.field1932; + int method1175(class225 var1, class225 var2) { + return var1.method1147() - var2.method1147(); } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "40" - ) - int[] method1181() { - return this.field1930; + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method1175((class225)var1, (class225)var2); } - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-1267204855" - ) - int[] method1182() { - return this.field1929; + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); } - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2043277042" + descriptor = "(IIIB)V", + garbageValue = "1" ) - int method1183() { - return this.field1928; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "-575404360" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (UserComparator3.World_worlds != null) { - FloorDecoration.doWorldSorting(0, UserComparator3.World_worlds.length - 1, var0, var1, var2, var3); + static final void method1176(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { + for (int var4 = 0; var4 < 8; ++var4) { + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)I", - garbageValue = "-527981427" - ) - public static int method1184(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - throw new NumberFormatException(); - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - throw new NumberFormatException(); - } - - if (var3) { - var10 = -var10; - } - - int var9 = var10 + var5 * var1; - if (var9 / var1 != var5) { - throw new NumberFormatException(); - } - - var5 = var9; - var4 = true; + if (var1 > 0) { + for (var3 = 1; var3 < 8; ++var3) { + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; } + } - if (!var4) { - throw new NumberFormatException(); - } else { - return var5; + if (var2 > 0) { + for (var3 = 1; var3 < 8; ++var3) { + Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; } - } else { - throw new IllegalArgumentException("" + var1); } + + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; + } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; + } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class232.java b/osrs/src/main/java/class232.java index e13d229f1..29452e9a8 100644 --- a/osrs/src/main/java/class232.java +++ b/osrs/src/main/java/class232.java @@ -1,1284 +1,11 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("ik") public class class232 { - @ObfuscatedName("uc") - @Export("cameraLookAtSpeed") - static int cameraLookAtSpeed; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "[Lig;" - ) - class230[] field1939; - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "21" - ) - public void method1189() { - this.field1939 = new class230[1]; - class228 var1 = class228.field1911; - this.field1939[0] = new class230(var1.field1918, var1.field1919); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIILiq;Lih;Z[I[II)I", - garbageValue = "1180709957" - ) - public int method1190(int var1, int var2, int var3, RouteStrategy var4, CollisionMap var5, boolean var6, int[] var7, int[] var8) { - return this.method1191(var1, var2, var3, var4, var5, var6, var7, var8, this.field1939[0]); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(IIILiq;Lih;Z[I[ILig;B)I", - garbageValue = "35" - ) - int method1191(int var1, int var2, int var3, RouteStrategy var4, CollisionMap var5, boolean var6, int[] var7, int[] var8, class230 var9) { - var9.method1173(); - int var10 = var9.method1177(); - int var11 = var9.method1178(); - int[][] var12 = var9.method1180(); - int[][] var13 = var9.method1179(); - int[] var14 = var9.method1181(); - int[] var15 = var9.method1182(); - boolean var16; - if (var3 == 1) { - var16 = this.method1193(var1, var2, var4, var5, var9); - } else if (var3 == 2) { - var16 = this.method1194(var1, var2, var4, var5, var9); - } else { - var16 = this.method1195(var1, var2, var3, var4, var5, var9); - } - - int var17 = var1 - (var10 >> 1); - int var18 = var2 - (var11 >> 1); - int var19 = var9.method1175(); - int var20 = var9.method1176(); - int var21; - int var22; - int var24; - if (!var16) { - if (!var6) { - return -1; - } - - var21 = Integer.MAX_VALUE; - var22 = Integer.MAX_VALUE; - byte var23 = 10; - var24 = var4.approxDestinationX; - int var25 = var4.approxDestinationY; - int var26 = var4.approxDestinationSizeX; - int var27 = var4.approxDestinationSizeY; - - for (int var28 = var24 - var23; var28 <= var23 + var24; ++var28) { - for (int var29 = var25 - var23; var29 <= var25 + var23; ++var29) { - int var30 = var28 - var17; - int var31 = var29 - var18; - if (var30 >= 0 && var31 >= 0 && var30 < var10 && var31 < var11 && var12[var30][var31] < 100) { - int var32 = 0; - if (var28 < var24) { - var32 = var24 - var28; - } else if (var28 > var24 + var26 - 1) { - var32 = var28 - (var26 + var24 - 1); - } - - int var33 = 0; - if (var29 < var25) { - var33 = var25 - var29; - } else if (var29 > var27 + var25 - 1) { - var33 = var29 - (var27 + var25 - 1); - } - - int var34 = var32 * var32 + var33 * var33; - if (var34 < var21 || var34 == var21 && var12[var30][var31] < var22) { - var21 = var34; - var22 = var12[var30][var31]; - var19 = var28; - var20 = var29; - } - } - } - } - - if (var21 == Integer.MAX_VALUE) { - return -1; - } - } - - if (var19 == var1 && var20 == var2) { - var7[0] = var19; - var8[0] = var20; - return 0; - } else { - byte var36 = 0; - var14[var36] = var19; - var21 = var36 + 1; - var15[var36] = var20; - - int var37; - for (var22 = var37 = var13[var19 - var17][var20 - var18]; var19 != var1 || var20 != var2; var22 = var13[var19 - var17][var20 - var18]) { - if (var37 != var22) { - var37 = var22; - var14[var21] = var19; - var15[var21++] = var20; - } - - if ((var22 & 2) != 0) { - ++var19; - } else if ((var22 & 8) != 0) { - --var19; - } - - if ((var22 & 1) != 0) { - ++var20; - } else if ((var22 & 4) != 0) { - --var20; - } - } - - var24 = 0; - - while (var21-- > 0) { - var7[var24] = var14[var21]; - var8[var24++] = var15[var21]; - if (var24 >= var7.length) { - break; - } - } - - return var24; - } - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(IILiq;Lih;Lig;I)Z", - garbageValue = "1570636396" - ) - final boolean method1193(int var1, int var2, RouteStrategy var3, CollisionMap var4, class230 var5) { - int var6 = var5.method1177(); - int var7 = var5.method1178(); - int[][] var8 = var5.method1180(); - int[][] var9 = var5.method1179(); - int[] var10 = var5.method1181(); - int[] var11 = var5.method1182(); - int var12 = var5.method1183(); - int var13 = var1; - int var14 = var2; - int var15 = var6 >> 1; - int var16 = var7 >> 1; - int var17 = var1 - var15; - int var18 = var2 - var16; - var9[var15][var16] = 99; - var8[var15][var16] = 0; - byte var19 = 0; - int var20 = 0; - var10[var19] = var1; - byte var10001 = var19; - int var25 = var19 + 1; - var11[var10001] = var2; - int[][] var21 = var4.flags; - - while (var25 != var20) { - var13 = var10[var20]; - var14 = var11[var20]; - var20 = var20 + 1 & var12; - var15 = var13 - var17; - var16 = var14 - var18; - int var22 = var13 - var4.xInset; - int var23 = var14 - var4.yInset; - if (var3.hasArrived(1, var13, var14, var4)) { - var5.method1174(var13, var14); - return true; - } - - int var24 = var8[var15][var16] + 1; - if (var15 > 0 && var9[var15 - 1][var16] == 0 && (var21[var22 - 1][var23] & 19136776) == 0) { - var10[var25] = var13 - 1; - var11[var25] = var14; - var25 = var25 + 1 & var12; - var9[var15 - 1][var16] = 2; - var8[var15 - 1][var16] = var24; - } - - if (var15 < var6 - 1 && var9[var15 + 1][var16] == 0 && (var21[var22 + 1][var23] & 19136896) == 0) { - var10[var25] = var13 + 1; - var11[var25] = var14; - var25 = var25 + 1 & var12; - var9[var15 + 1][var16] = 8; - var8[var15 + 1][var16] = var24; - } - - if (var16 > 0 && var9[var15][var16 - 1] == 0 && (var21[var22][var23 - 1] & 19136770) == 0) { - var10[var25] = var13; - var11[var25] = var14 - 1; - var25 = var25 + 1 & var12; - var9[var15][var16 - 1] = 1; - var8[var15][var16 - 1] = var24; - } - - if (var16 < var7 - 1 && var9[var15][var16 + 1] == 0 && (var21[var22][var23 + 1] & 19136800) == 0) { - var10[var25] = var13; - var11[var25] = var14 + 1; - var25 = var25 + 1 & var12; - var9[var15][var16 + 1] = 4; - var8[var15][var16 + 1] = var24; - } - - if (var15 > 0 && var16 > 0 && var9[var15 - 1][var16 - 1] == 0 && (var21[var22 - 1][var23 - 1] & 19136782) == 0 && (var21[var22 - 1][var23] & 19136776) == 0 && (var21[var22][var23 - 1] & 19136770) == 0) { - var10[var25] = var13 - 1; - var11[var25] = var14 - 1; - var25 = var25 + 1 & var12; - var9[var15 - 1][var16 - 1] = 3; - var8[var15 - 1][var16 - 1] = var24; - } - - if (var15 < var6 - 1 && var16 > 0 && var9[var15 + 1][var16 - 1] == 0 && (var21[var22 + 1][var23 - 1] & 19136899) == 0 && (var21[var22 + 1][var23] & 19136896) == 0 && (var21[var22][var23 - 1] & 19136770) == 0) { - var10[var25] = var13 + 1; - var11[var25] = var14 - 1; - var25 = var25 + 1 & var12; - var9[var15 + 1][var16 - 1] = 9; - var8[var15 + 1][var16 - 1] = var24; - } - - if (var15 > 0 && var16 < var7 - 1 && var9[var15 - 1][var16 + 1] == 0 && (var21[var22 - 1][var23 + 1] & 19136824) == 0 && (var21[var22 - 1][var23] & 19136776) == 0 && (var21[var22][var23 + 1] & 19136800) == 0) { - var10[var25] = var13 - 1; - var11[var25] = var14 + 1; - var25 = var25 + 1 & var12; - var9[var15 - 1][var16 + 1] = 6; - var8[var15 - 1][var16 + 1] = var24; - } - - if (var15 < var6 - 1 && var16 < var7 - 1 && var9[var15 + 1][var16 + 1] == 0 && (var21[var22 + 1][var23 + 1] & 19136992) == 0 && (var21[var22 + 1][var23] & 19136896) == 0 && (var21[var22][var23 + 1] & 19136800) == 0) { - var10[var25] = var13 + 1; - var11[var25] = var14 + 1; - var25 = var25 + 1 & var12; - var9[var15 + 1][var16 + 1] = 12; - var8[var15 + 1][var16 + 1] = var24; - } - } - - var5.method1174(var13, var14); - return false; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IILiq;Lih;Lig;I)Z", - garbageValue = "-525938769" - ) - final boolean method1194(int var1, int var2, RouteStrategy var3, CollisionMap var4, class230 var5) { - int var6 = var5.method1177(); - int var7 = var5.method1178(); - int[][] var8 = var5.method1180(); - int[][] var9 = var5.method1179(); - int[] var10 = var5.method1181(); - int[] var11 = var5.method1182(); - int var12 = var5.method1183(); - int var13 = var1; - int var14 = var2; - int var15 = var6 >> 1; - int var16 = var7 >> 1; - int var17 = var1 - var15; - int var18 = var2 - var16; - var9[var15][var16] = 99; - var8[var15][var16] = 0; - byte var19 = 0; - int var20 = 0; - var10[var19] = var1; - byte var10001 = var19; - int var25 = var19 + 1; - var11[var10001] = var2; - int[][] var21 = var4.flags; - - while (var25 != var20) { - var13 = var10[var20]; - var14 = var11[var20]; - var20 = var20 + 1 & var12; - var15 = var13 - var17; - var16 = var14 - var18; - int var22 = var13 - var4.xInset; - int var23 = var14 - var4.yInset; - if (var3.hasArrived(2, var13, var14, var4)) { - var5.method1174(var13, var14); - return true; - } - - int var24 = var8[var15][var16] + 1; - if (var15 > 0 && var9[var15 - 1][var16] == 0 && (var21[var22 - 1][var23] & 19136782) == 0 && (var21[var22 - 1][var23 + 1] & 19136824) == 0) { - var10[var25] = var13 - 1; - var11[var25] = var14; - var25 = var25 + 1 & var12; - var9[var15 - 1][var16] = 2; - var8[var15 - 1][var16] = var24; - } - - if (var15 < var6 - 2 && var9[var15 + 1][var16] == 0 && (var21[var22 + 2][var23] & 19136899) == 0 && (var21[var22 + 2][var23 + 1] & 19136992) == 0) { - var10[var25] = var13 + 1; - var11[var25] = var14; - var25 = var25 + 1 & var12; - var9[var15 + 1][var16] = 8; - var8[var15 + 1][var16] = var24; - } - - if (var16 > 0 && var9[var15][var16 - 1] == 0 && (var21[var22][var23 - 1] & 19136782) == 0 && (var21[var22 + 1][var23 - 1] & 19136899) == 0) { - var10[var25] = var13; - var11[var25] = var14 - 1; - var25 = var25 + 1 & var12; - var9[var15][var16 - 1] = 1; - var8[var15][var16 - 1] = var24; - } - - if (var16 < var7 - 2 && var9[var15][var16 + 1] == 0 && (var21[var22][var23 + 2] & 19136824) == 0 && (var21[var22 + 1][var23 + 2] & 19136992) == 0) { - var10[var25] = var13; - var11[var25] = var14 + 1; - var25 = var25 + 1 & var12; - var9[var15][var16 + 1] = 4; - var8[var15][var16 + 1] = var24; - } - - if (var15 > 0 && var16 > 0 && var9[var15 - 1][var16 - 1] == 0 && (var21[var22 - 1][var23] & 19136830) == 0 && (var21[var22 - 1][var23 - 1] & 19136782) == 0 && (var21[var22][var23 - 1] & 19136911) == 0) { - var10[var25] = var13 - 1; - var11[var25] = var14 - 1; - var25 = var25 + 1 & var12; - var9[var15 - 1][var16 - 1] = 3; - var8[var15 - 1][var16 - 1] = var24; - } - - if (var15 < var6 - 2 && var16 > 0 && var9[var15 + 1][var16 - 1] == 0 && (var21[var22 + 1][var23 - 1] & 19136911) == 0 && (var21[var22 + 2][var23 - 1] & 19136899) == 0 && (var21[var22 + 2][var23] & 19136995) == 0) { - var10[var25] = var13 + 1; - var11[var25] = var14 - 1; - var25 = var25 + 1 & var12; - var9[var15 + 1][var16 - 1] = 9; - var8[var15 + 1][var16 - 1] = var24; - } - - if (var15 > 0 && var16 < var7 - 2 && var9[var15 - 1][var16 + 1] == 0 && (var21[var22 - 1][var23 + 1] & 19136830) == 0 && (var21[var22 - 1][var23 + 2] & 19136824) == 0 && (var21[var22][var23 + 2] & 19137016) == 0) { - var10[var25] = var13 - 1; - var11[var25] = var14 + 1; - var25 = var25 + 1 & var12; - var9[var15 - 1][var16 + 1] = 6; - var8[var15 - 1][var16 + 1] = var24; - } - - if (var15 < var6 - 2 && var16 < var7 - 2 && var9[var15 + 1][var16 + 1] == 0 && (var21[var22 + 1][var23 + 2] & 19137016) == 0 && (var21[var22 + 2][var23 + 2] & 19136992) == 0 && (var21[var22 + 2][var23 + 1] & 19136995) == 0) { - var10[var25] = var13 + 1; - var11[var25] = var14 + 1; - var25 = var25 + 1 & var12; - var9[var15 + 1][var16 + 1] = 12; - var8[var15 + 1][var16 + 1] = var24; - } - } - - var5.method1174(var13, var14); - return false; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(IIILiq;Lih;Lig;B)Z", - garbageValue = "58" - ) - final boolean method1195(int var1, int var2, int var3, RouteStrategy var4, CollisionMap var5, class230 var6) { - int var7 = var6.method1177(); - int var8 = var6.method1178(); - int[][] var9 = var6.method1180(); - int[][] var10 = var6.method1179(); - int[] var11 = var6.method1181(); - int[] var12 = var6.method1182(); - int var13 = var6.method1183(); - int var14 = var1; - int var15 = var2; - int var16 = var7 >> 1; - int var17 = var8 >> 1; - int var18 = var1 - var16; - int var19 = var2 - var17; - var10[var16][var17] = 99; - var9[var16][var17] = 0; - byte var20 = 0; - int var21 = 0; - var11[var20] = var1; - int var27 = var20 + 1; - var12[var20] = var2; - int[][] var22 = var5.flags; - - while (true) { - label265: - while (true) { - int var23; - int var24; - int var25; - int var26; - do { - do { - do { - label242: - do { - if (var21 == var27) { - var6.method1174(var14, var15); - return false; - } - - var14 = var11[var21]; - var15 = var12[var21]; - var21 = var21 + 1 & var13; - var16 = var14 - var18; - var17 = var15 - var19; - var23 = var14 - var5.xInset; - var24 = var15 - var5.yInset; - if (var4.hasArrived(var3, var14, var15, var5)) { - var6.method1174(var14, var15); - return true; - } - - var25 = var9[var16][var17] + 1; - if (var16 > 0 && var10[var16 - 1][var17] == 0 && (var22[var23 - 1][var24] & 19136782) == 0 && (var22[var23 - 1][var3 + var24 - 1] & 19136824) == 0) { - var26 = 1; - - while (true) { - if (var26 >= var3 - 1) { - var11[var27] = var14 - 1; - var12[var27] = var15; - var27 = var27 + 1 & var13; - var10[var16 - 1][var17] = 2; - var9[var16 - 1][var17] = var25; - break; - } - - if ((var22[var23 - 1][var24 + var26] & 19136830) != 0) { - break; - } - - ++var26; - } - } - - if (var16 < var7 - var3 && var10[var16 + 1][var17] == 0 && (var22[var3 + var23][var24] & 19136899) == 0 && (var22[var3 + var23][var3 + var24 - 1] & 19136992) == 0) { - var26 = 1; - - while (true) { - if (var26 >= var3 - 1) { - var11[var27] = var14 + 1; - var12[var27] = var15; - var27 = var27 + 1 & var13; - var10[var16 + 1][var17] = 8; - var9[var16 + 1][var17] = var25; - break; - } - - if ((var22[var3 + var23][var24 + var26] & 19136995) != 0) { - break; - } - - ++var26; - } - } - - if (var17 > 0 && var10[var16][var17 - 1] == 0 && (var22[var23][var24 - 1] & 19136782) == 0 && (var22[var3 + var23 - 1][var24 - 1] & 19136899) == 0) { - var26 = 1; - - while (true) { - if (var26 >= var3 - 1) { - var11[var27] = var14; - var12[var27] = var15 - 1; - var27 = var27 + 1 & var13; - var10[var16][var17 - 1] = 1; - var9[var16][var17 - 1] = var25; - break; - } - - if ((var22[var23 + var26][var24 - 1] & 19136911) != 0) { - break; - } - - ++var26; - } - } - - if (var17 < var8 - var3 && var10[var16][var17 + 1] == 0 && (var22[var23][var3 + var24] & 19136824) == 0 && (var22[var3 + var23 - 1][var3 + var24] & 19136992) == 0) { - var26 = 1; - - while (true) { - if (var26 >= var3 - 1) { - var11[var27] = var14; - var12[var27] = var15 + 1; - var27 = var27 + 1 & var13; - var10[var16][var17 + 1] = 4; - var9[var16][var17 + 1] = var25; - break; - } - - if ((var22[var23 + var26][var3 + var24] & 19137016) != 0) { - break; - } - - ++var26; - } - } - - if (var16 > 0 && var17 > 0 && var10[var16 - 1][var17 - 1] == 0 && (var22[var23 - 1][var24 - 1] & 19136782) == 0) { - var26 = 1; - - while (true) { - if (var26 >= var3) { - var11[var27] = var14 - 1; - var12[var27] = var15 - 1; - var27 = var27 + 1 & var13; - var10[var16 - 1][var17 - 1] = 3; - var9[var16 - 1][var17 - 1] = var25; - break; - } - - if ((var22[var23 - 1][var26 + (var24 - 1)] & 19136830) != 0 || (var22[var26 + (var23 - 1)][var24 - 1] & 19136911) != 0) { - break; - } - - ++var26; - } - } - - if (var16 < var7 - var3 && var17 > 0 && var10[var16 + 1][var17 - 1] == 0 && (var22[var3 + var23][var24 - 1] & 19136899) == 0) { - var26 = 1; - - while (true) { - if (var26 >= var3) { - var11[var27] = var14 + 1; - var12[var27] = var15 - 1; - var27 = var27 + 1 & var13; - var10[var16 + 1][var17 - 1] = 9; - var9[var16 + 1][var17 - 1] = var25; - break; - } - - if ((var22[var3 + var23][var26 + (var24 - 1)] & 19136995) != 0 || (var22[var23 + var26][var24 - 1] & 19136911) != 0) { - break; - } - - ++var26; - } - } - - if (var16 > 0 && var17 < var8 - var3 && var10[var16 - 1][var17 + 1] == 0 && (var22[var23 - 1][var3 + var24] & 19136824) == 0) { - for (var26 = 1; var26 < var3; ++var26) { - if ((var22[var23 - 1][var24 + var26] & 19136830) != 0 || (var22[var26 + (var23 - 1)][var3 + var24] & 19137016) != 0) { - continue label242; - } - } - - var11[var27] = var14 - 1; - var12[var27] = var15 + 1; - var27 = var27 + 1 & var13; - var10[var16 - 1][var17 + 1] = 6; - var9[var16 - 1][var17 + 1] = var25; - } - } while(var16 >= var7 - var3); - } while(var17 >= var8 - var3); - } while(var10[var16 + 1][var17 + 1] != 0); - } while((var22[var3 + var23][var3 + var24] & 19136992) != 0); - - for (var26 = 1; var26 < var3; ++var26) { - if ((var22[var26 + var23][var3 + var24] & 19137016) != 0 || (var22[var3 + var23][var26 + var24] & 19136995) != 0) { - continue label265; - } - } - - var11[var27] = var14 + 1; - var12[var27] = var15 + 1; - var27 = var27 + 1 & var13; - var10[var16 + 1][var17 + 1] = 12; - var9[var16 + 1][var17 + 1] = var25; - } - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "48" - ) - public static void method1192() { - FileSystem.FileSystem_cacheFiles.clear(); - } - - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "368795311" - ) - static final int method1196() { - if (class91.clientPreferences.getRoofsHidden()) { - return class87.Client_plane; - } else { - int var0 = class115.getTileHeight(Client.cameraX, WorldMapArea.cameraZ, class87.Client_plane); - return var0 - class17.cameraY < 800 && (Tiles.Tiles_renderFlags[class87.Client_plane][Client.cameraX >> 7][WorldMapArea.cameraZ >> 7] & 4) != 0 ? class87.Client_plane : 3; - } - } - - @ObfuscatedName("jq") - @ObfuscatedSignature( - descriptor = "(Ldi;IIIIIB)V", - garbageValue = "79" - ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCComposition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } - - if (var6 == null) { - return; - } - } - - int var75 = Players.Players_count; - int[] var7 = Players.Players_indices; - boolean var8 = var1 < var75; - int var9 = -2; - if (var0.overheadText != null && (!var8 || !var0.showPublicPlayerChat && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - PlayerType.method1913(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextLimit < Client.overheadTextCount) { - Client.overheadTextXOffsets[Client.overheadTextLimit] = SoundCache.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextLimit] = SoundCache.fontBold12.ascent; - Client.overheadTextXs[Client.overheadTextLimit] = Client.viewportTempX; - Client.overheadTextYs[Client.overheadTextLimit] = Client.viewportTempY - var9; - Client.overheadTextColors[Client.overheadTextLimit] = var0.field998; - Client.overheadTextEffects[Client.overheadTextLimit] = var0.field991; - Client.overheadTextCyclesRemaining[Client.overheadTextLimit] = var0.overheadTextCyclesRemaining; - Client.field595[Client.overheadTextLimit] = var0.field1026; - Client.field602[Client.overheadTextLimit] = var0.overheadText; - ++Client.overheadTextLimit; - var9 += 12; - } - } - - int var15; - int var19; - int var22; - int var23; - if (!var0.healthBars.method2039()) { - PlayerType.method1913(var0, var0.defaultHeight + 15); - - for (HealthBar var10 = (HealthBar)var0.healthBars.last(); var10 != null; var10 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var11 = var10.get(Client.cycle); - if (var11 == null) { - if (var10.isEmpty()) { - var10.remove(); - } - } else { - HealthBarDefinition var12 = var10.definition; - SpritePixels var13 = var12.getBackSprite(); - SpritePixels var14 = var12.getFrontSprite(); - int var16 = 0; - if (var13 != null && var14 != null) { - if (var12.widthPadding * 2 < var14.subWidth) { - var16 = var12.widthPadding; - } - - var15 = var14.subWidth - var16 * 2; - } else { - var15 = var12.width; - } - - int var17 = 255; - boolean var18 = true; - var19 = Client.cycle - var11.cycle; - int var20 = var15 * var11.health2 / var12.width; - int var21; - int var101; - if (var11.cycleOffset > var19) { - var21 = var12.field1556 == 0 ? 0 : var12.field1556 * (var19 / var12.field1556); - var22 = var15 * var11.health / var12.width; - var101 = var21 * (var20 - var22) / var11.cycleOffset + var22; - } else { - var101 = var20; - var21 = var12.int5 + var11.cycleOffset - var19; - if (var12.int3 >= 0) { - var17 = (var21 << 8) / (var12.int5 - var12.int3); - } - } - - if (var11.health2 > 0 && var101 < 1) { - var101 = 1; - } - - if (var13 != null && var14 != null) { - if (var15 == var101) { - var101 += var16 * 2; - } else { - var101 += var16; - } - - var21 = var13.subHeight; - var9 += var21; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var9; - var22 -= var16; - if (var17 >= 0 && var17 < 255) { - var13.drawTransAt(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var101 + var22, var21 + var23); - var14.drawTransAt(var22, var23, var17); - } else { - var13.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var101, var23 + var21); - var14.drawTransBgAt(var22, var23); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var9 += 2; - } else { - var9 += 5; - if (Client.viewportTempX > -1) { - var21 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var9; - Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var101, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var101, var22, var15 - var101, 5, 16711680); - } - - var9 += 2; - } - } - } - } - - if (var9 == -2) { - var9 += 7; - } - - if (var8 && var0.playerCycle == Client.cycle) { - Player var94 = (Player)var0; - boolean var76; - if (Client.drawPlayerNames == 0) { - var76 = false; - } else if (var94 == TextureProvider.localPlayer) { - var76 = WorldMapLabelSize.method1437(); - } else { - var76 = class208.method1029() || ModeWhere.method2014() && var94.isFriend() || class47.method238() && var94.method493(); - } - - if (var76) { - Player var96 = (Player)var0; - if (var8) { - PlayerType.method1913(var0, var0.defaultHeight + 15); - AbstractFont var98 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - var9 += 4; - var98.drawCentered(var96.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var9, 16777215, 0); - var9 += 18; - } - } - } - - int var24; - int var26; - Archive var81; - SpritePixels[] var83; - if (var8) { - Player var92 = (Player)var0; - if (var92.isHidden) { - return; - } - - if (var92.headIconPk != -1 || var92.headIconPrayer != -1) { - PlayerType.method1913(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var92.headIconPk != -1) { - var9 += 25; - UserComparator4.headIconPkSprites[var92.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); - } - - if (var92.headIconPrayer != -1) { - var9 += 25; - class157.headIconPrayerSprites[var92.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - PlayerType.method1913(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var9 += UserComparator8.headIconHintSprites[1].subHeight; - UserComparator8.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var9); - } - } - } else { - NPC var93 = (NPC)var0; - int[] var95 = var93.method587(); - short[] var97 = var93.method588(); - if (var97 != null && var95 != null) { - for (int var77 = 0; var77 < var97.length; ++var77) { - if (var97[var77] >= 0 && var95[var77] >= 0) { - long var78 = (long)var95[var77] << 8 | (long)var97[var77]; - Object var80 = (SpritePixels)Client.field631.method2216(var78); - if (var80 == null) { - var81 = class199.archive8; - var19 = var95[var77]; - SpritePixels[] var82; - if (!class164.method862(var81, var19, 0)) { - var82 = null; - } else { - var83 = new SpritePixels[class544.SpriteBuffer_spriteCount]; - var22 = 0; - - while (true) { - if (var22 >= class544.SpriteBuffer_spriteCount) { - class407.method2062(); - var82 = var83; - break; - } - - SpritePixels var84 = var83[var22] = new SpritePixels(); - var84.width = class159.SpriteBuffer_spriteWidth; - var84.height = class500.SpriteBuffer_spriteHeight; - var84.xOffset = class326.SpriteBuffer_xOffsets[var22]; - var84.yOffset = ModelData0.SpriteBuffer_yOffsets[var22]; - var84.subWidth = class59.SpriteBuffer_spriteWidths[var22]; - var84.subHeight = class544.SpriteBuffer_spriteHeights[var22]; - var24 = var84.subWidth * var84.subHeight; - byte[] var25 = AddRequestTask.SpriteBuffer_pixels[var22]; - var84.pixels = new int[var24]; - - for (var26 = 0; var26 < var24; ++var26) { - var84.pixels[var26] = class372.SpriteBuffer_spritePalette[var25[var26] & 255]; - } - - ++var22; - } - } - - if (var82 != null && var97[var77] < var82.length) { - var80 = var82[var97[var77]]; - Client.field631.method2217(var78, var80); - } - } - - if (var80 != null) { - PlayerType.method1913(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - ((SpritePixels)var80).drawTransBgAt(var2 + Client.viewportTempX - (((SpritePixels)var80).subWidth >> 1), Client.viewportTempY + (var3 - ((SpritePixels)var80).subHeight) - 4); - } - } - } - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - PlayerType.method1913(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - UserComparator8.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - for (int var103 = 0; var103 < 4; ++var103) { - int var86 = var0.hitSplatCycles[var103]; - int var87 = var0.hitSplatTypes[var103]; - HitSplatDefinition var99 = null; - int var88 = 0; - if (var87 >= 0) { - if (var86 <= Client.cycle) { - continue; - } - - var99 = class191.method959(var0.hitSplatTypes[var103]); - var88 = var99.field1715; - if (var99 != null && var99.transforms != null) { - var99 = var99.transform(); - if (var99 == null) { - var0.hitSplatCycles[var103] = -1; - continue; - } - } - } else if (var86 < 0) { - continue; - } - - var15 = var0.hitSplatTypes2[var103]; - HitSplatDefinition var104 = null; - if (var15 >= 0) { - var104 = class191.method959(var15); - if (var104 != null && var104.transforms != null) { - var104 = var104.transform(); - } - } - - if (var86 - var88 <= Client.cycle) { - if (var99 == null) { - var0.hitSplatCycles[var103] = -1; - } else { - PlayerType.method1913(var0, var0.defaultHeight / 2); - if (Client.viewportTempX > -1) { - boolean var100 = true; - if (var103 == 1) { - Client.viewportTempY -= 20; - } - - if (var103 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var103 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - var81 = null; - SpritePixels var89 = null; - SpritePixels var85 = null; - var83 = null; - var22 = 0; - var23 = 0; - var24 = 0; - int var90 = 0; - var26 = 0; - int var27 = 0; - int var28 = 0; - int var29 = 0; - SpritePixels var30 = null; - SpritePixels var31 = null; - SpritePixels var32 = null; - SpritePixels var33 = null; - int var34 = 0; - int var35 = 0; - int var36 = 0; - int var37 = 0; - int var38 = 0; - int var39 = 0; - int var40 = 0; - int var41 = 0; - int var42 = 0; - SpritePixels var105 = var99.method1070(); - int var43; - if (var105 != null) { - var22 = var105.subWidth; - var43 = var105.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var105.xOffset; - } - - var89 = var99.method1071(); - if (var89 != null) { - var23 = var89.subWidth; - var43 = var89.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var89.xOffset; - } - - var85 = var99.method1072(); - if (var85 != null) { - var24 = var85.subWidth; - var43 = var85.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var85.xOffset; - } - - SpritePixels var106 = var99.method1073(); - if (var106 != null) { - var90 = var106.subWidth; - var43 = var106.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var106.xOffset; - } - - if (var104 != null) { - var30 = var104.method1070(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var104.method1071(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var104.method1072(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var40 = var32.xOffset; - } - - var33 = var104.method1073(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var91 = var99.getFont(); - if (var91 == null) { - var91 = class14.fontPlain11; - } - - Font var44; - if (var104 != null) { - var44 = var104.getFont(); - if (var44 == null) { - var44 = class14.fontPlain11; - } - } else { - var44 = class14.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var99.getString(var0.hitSplatValues[var103]); - int var102 = var91.stringWidth(var45); - if (var104 != null) { - var46 = var104.getString(var0.hitSplatValues2[var103]); - var48 = var44.stringWidth(var46); - } - - int var49 = 0; - int var50 = 0; - if (var23 > 0) { - if (var85 == null && var106 == null) { - var49 = 1; - } else { - var49 = var102 / var23 + 1; - } - } - - if (var104 != null && var35 > 0) { - if (var32 == null && var33 == null) { - var50 = 1; - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; - int var52 = var51; - if (var22 > 0) { - var51 += var22; - } - - var51 += 2; - int var53 = var51; - if (var24 > 0) { - var51 += var24; - } - - int var54 = var51; - int var55 = var51; - int var56; - if (var23 > 0) { - var56 = var23 * var49; - var51 += var56; - var55 += (var56 - var102) / 2; - } else { - var51 += var102; - } - - var56 = var51; - if (var90 > 0) { - var51 += var90; - } - - int var57 = 0; - int var58 = 0; - int var59 = 0; - int var60 = 0; - int var61 = 0; - int var62; - if (var104 != null) { - var51 += 2; - var57 = var51; - if (var34 > 0) { - var51 += var34; - } - - var51 += 2; - var58 = var51; - if (var36 > 0) { - var51 += var36; - } - - var59 = var51; - var61 = var51; - if (var35 > 0) { - var62 = var35 * var50; - var51 += var62; - var61 += (var62 - var48) / 2; - } else { - var51 += var48; - } - - var60 = var51; - if (var37 > 0) { - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var103] - Client.cycle; - int var63 = var99.field1711 - var62 * var99.field1711 / var99.field1715; - int var64 = var62 * var99.field1710 / var99.field1715 + -var99.field1710; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var64 + (var3 + Client.viewportTempY - 12); - int var67 = var66; - int var68 = var42 + var66; - int var69 = var66 + var99.field1713 + 15; - int var70 = var69 - var91.maxAscent; - int var71 = var69 + var91.maxDescent; - if (var70 < var66) { - var67 = var70; - } - - if (var71 > var68) { - var68 = var71; - } - - int var72 = 0; - int var73; - int var74; - if (var104 != null) { - var72 = var66 + var104.field1713 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } - - if (var74 > var68) { - ; - } - } - - var73 = 255; - if (var99.field1714 >= 0) { - var73 = (var62 << 8) / (var99.field1715 - var99.field1714); - } - - if (var73 >= 0 && var73 < 255) { - if (var105 != null) { - var105.drawTransAt(var52 + var65 - var26, var66, var73); - } - - if (var85 != null) { - var85.drawTransAt(var65 + var53 - var28, var66, var73); - } - - if (var89 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var89.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); - } - } - - if (var106 != null) { - var106.drawTransAt(var56 + var65 - var29, var66, var73); - } - - var91.drawAlpha(var45, var65 + var55, var69, var99.textColor, 0, var73); - if (var104 != null) { - if (var30 != null) { - var30.drawTransAt(var65 + var57 - var38, var66, var73); - } - - if (var32 != null) { - var32.drawTransAt(var65 + var58 - var40, var66, var73); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); - } - } - - if (var33 != null) { - var33.drawTransAt(var65 + var60 - var41, var66, var73); - } - - var44.drawAlpha(var46, var61 + var65, var72, var104.textColor, 0, var73); - } - } else { - if (var105 != null) { - var105.drawTransBgAt(var65 + var52 - var26, var66); - } - - if (var85 != null) { - var85.drawTransBgAt(var65 + var53 - var28, var66); - } - - if (var89 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var89.drawTransBgAt(var74 * var23 + (var65 + var54 - var27), var66); - } - } - - if (var106 != null) { - var106.drawTransBgAt(var65 + var56 - var29, var66); - } - - var91.draw(var45, var55 + var65, var69, var99.textColor | -16777216, 0); - if (var104 != null) { - if (var30 != null) { - var30.drawTransBgAt(var57 + var65 - var38, var66); - } - - if (var32 != null) { - var32.drawTransBgAt(var65 + var58 - var40, var66); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); - } - } - - if (var33 != null) { - var33.drawTransBgAt(var65 + var60 - var41, var66); - } - - var44.draw(var46, var65 + var61, var72, var104.textColor | -16777216, 0); - } - } - } - } - } - } - - } + @ObfuscatedName("au") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); } } \ No newline at end of file diff --git a/osrs/src/main/java/class233.java b/osrs/src/main/java/class233.java deleted file mode 100644 index 952052711..000000000 --- a/osrs/src/main/java/class233.java +++ /dev/null @@ -1,69 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Comparator; - -@ObfuscatedName("id") -public class class233 implements Comparator { - @ObfuscatedName("ec") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - - class233() { - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lic;Lic;S)I", - garbageValue = "-253" - ) - int method1198(class228 var1, class228 var2) { - return var1.method1168() - var2.method1168(); - } - - @Export("compare") - @ObfuscatedName("compare") - public int compare(Object var1, Object var2) { - return this.method1198((class228)var1, (class228)var2); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "([BI)Ljava/lang/String;", - garbageValue = "-1425233568" - ) - public static String method1199(byte[] var0) { - int var2 = var0.length; - StringBuilder var3 = new StringBuilder(); - - for (int var4 = 0; var4 < var2 + 0; var4 += 3) { - int var5 = var0[var4] & 255; - var3.append(class400.field3683[var5 >>> 2]); - if (var4 < var2 - 1) { - int var6 = var0[var4 + 1] & 255; - var3.append(class400.field3683[(var5 & 3) << 4 | var6 >>> 4]); - if (var4 < var2 - 2) { - int var7 = var0[var4 + 2] & 255; - var3.append(class400.field3683[(var6 & 15) << 2 | var7 >>> 6]).append(class400.field3683[var7 & 63]); - } else { - var3.append(class400.field3683[(var6 & 15) << 2]).append("="); - } - } else { - var3.append(class400.field3683[(var5 & 3) << 4]).append("=="); - } - } - - String var1 = var3.toString(); - return var1; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class240.java b/osrs/src/main/java/class240.java new file mode 100644 index 000000000..34244f683 --- /dev/null +++ b/osrs/src/main/java/class240.java @@ -0,0 +1,162 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jb") +public class class240 implements WorldMapSection { + @ObfuscatedName("at") + int field2015; + @ObfuscatedName("ah") + int field2011; + @ObfuscatedName("ar") + int field2014; + @ObfuscatedName("ao") + int field2013; + @ObfuscatedName("ab") + int field2009; + @ObfuscatedName("au") + int field2016; + @ObfuscatedName("aa") + int field2008; + @ObfuscatedName("ac") + int field2010; + @ObfuscatedName("al") + int field2012; + @ObfuscatedName("az") + int field2017; + + class240() { + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljv;B)V", + garbageValue = "16" + ) + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field2009) { + var1.regionLowX = this.field2009; + } + + if (var1.regionHighX < this.field2009) { + var1.regionHighX = this.field2009; + } + + if (var1.regionLowY > this.field2016) { + var1.regionLowY = this.field2016; + } + + if (var1.regionHighY < this.field2016) { + var1.regionHighY = this.field2016; + } + + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IIIB)Z", + garbageValue = "2" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field2015 && var1 < this.field2011 + this.field2015) { + return var2 >= (this.field2014 << 6) + (this.field2008 << 3) && var2 <= (this.field2014 << 6) + (this.field2008 << 3) + 7 && var3 >= (this.field2013 << 6) + (this.field2010 << 3) && var3 <= (this.field2013 << 6) + (this.field2010 << 3) + 7; + } else { + return false; + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "542110974" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field2009 << 6) + (this.field2012 << 3) && var1 <= (this.field2009 << 6) + (this.field2012 << 3) + 7 && var2 >= (this.field2016 << 6) + (this.field2017 << 3) && var2 <= (this.field2016 << 6) + (this.field2017 << 3) + 7; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIIS)[I", + garbageValue = "12300" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { + return null; + } else { + int[] var4 = new int[]{var2 + (this.field2009 * 64 - this.field2014 * 64) + (this.field2012 * 8 - this.field2008 * 8), var3 + (this.field2016 * 64 - this.field2013 * 64) + (this.field2017 * 8 - this.field2010 * 8)}; + return var4; + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(III)Lmh;", + garbageValue = "-1535299153" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { + return null; + } else { + int var3 = this.field2014 * 64 - this.field2009 * 64 + (this.field2008 * 8 - this.field2012 * 8) + var1; + int var4 = var2 + (this.field2013 * 64 - this.field2016 * 64) + (this.field2010 * 8 - this.field2017 * 8); + return new Coord(this.field2015, var3, var4); + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Luj;B)V", + garbageValue = "-10" + ) + @Export("read") + public void read(Buffer var1) { + this.field2015 = var1.readUnsignedByte(); + this.field2011 = var1.readUnsignedByte(); + this.field2014 = var1.readUnsignedShort(); + this.field2008 = var1.readUnsignedByte(); + this.field2013 = var1.readUnsignedShort(); + this.field2010 = var1.readUnsignedByte(); + this.field2009 = var1.readUnsignedShort(); + this.field2012 = var1.readUnsignedByte(); + this.field2016 = var1.readUnsignedShort(); + this.field2017 = var1.readUnsignedByte(); + this.method1292(); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "7" + ) + void method1292() { + } + + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-976406979" + ) + static final int method1293(int var0) { + return Math.min(Math.max(var0, 128), 383); + } + + @ObfuscatedName("og") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-28" + ) + static void method1294(int var0) { + SequenceDefinition var1 = DynamicObject.SequenceDefinition_get(var0); + if (var1.isCachedModelIdSet()) { + if (MouseRecorder.method469(var1.SequenceDefinition_cachedModelId) == 2) { + Client.field607.add(var1.SequenceDefinition_cachedModelId); + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class241.java b/osrs/src/main/java/class241.java index 7a4687881..d7fa3bc5b 100644 --- a/osrs/src/main/java/class241.java +++ b/osrs/src/main/java/class241.java @@ -1,125 +1,63 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.net.URL; +import java.util.Date; + @ObfuscatedName("jr") public class class241 { - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - static Archive field2052; - @ObfuscatedName("gk") - @ObfuscatedSignature( - descriptor = "Lru;" - ) - static GraphicsDefaults field2053; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "[Led;" - ) - class129[] field2054; - @ObfuscatedName("ak") - int field2055; - - @ObfuscatedSignature( - descriptor = "(Lul;I)V" - ) - class241(Buffer var1, int var2) { - this.field2054 = new class129[var2]; - this.field2055 = var1.readUnsignedByte(); - - for (int var3 = 0; var3 < this.field2054.length; ++var3) { - class129 var4 = new class129(this.field2055, var1, false); - this.field2054[var3] = var4; - } - - this.method1259(); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-43" - ) - void method1259() { - class129[] var1 = this.field2054; - - for (int var2 = 0; var2 < var1.length; ++var2) { - class129 var3 = var1[var2]; - if (var3.field1219 >= 0) { - var3.field1218 = this.field2054[var3.field1219]; - } - } - - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2112190855" - ) - public int method1260() { - return this.field2054.length; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)Led;", - garbageValue = "1689947059" - ) - class129 method1261(int var1) { - return var1 >= this.method1260() ? null : this.field2054[var1]; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(I)[Led;", - garbageValue = "-130902547" - ) - class129[] method1262() { - return this.field2054; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Lfk;II)V", - garbageValue = "1460583301" - ) - void method1263(class139 var1, int var2) { - this.method1264(var1, var2, (boolean[])null, false); - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Lfk;I[ZZI)V", - garbageValue = "-2124527943" - ) - void method1264(class139 var1, int var2, boolean[] var3, boolean var4) { - int var5 = var1.method739(); - int var6 = 0; - class129[] var7 = this.method1262(); - - for (int var8 = 0; var8 < var7.length; ++var8) { - class129 var9 = var7[var8]; - if (var3 == null || var4 == var3[var6]) { - var1.method741(var2, var9, var6, var5); + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2144241360" + ) + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (class542.World_request == null) { + class542.World_request = class60.urlRequester.request(new URL(MoveSpeed.field1933)); + } else if (class542.World_request.isDone()) { + byte[] var0 = class542.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + class361.World_worlds = new World[World.World_count]; + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = class361.World_worlds[var2] = new World(); + var3.id = var1.readUnsignedShort(); + var3.properties = var1.readInt(); + var3.host = var1.readStringCp1252NullTerminated(); + var3.activity = var1.readStringCp1252NullTerminated(); + var3.location = var1.readUnsignedByte(); + var3.population = var1.readShort(); + } + + class181.sortWorlds(class361.World_worlds, 0, class361.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + class542.World_request = null; + return true; } - - ++var6; + } catch (Exception var4) { + var4.printStackTrace(); + class542.World_request = null; } + return false; } - @ObfuscatedName("aj") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-127" + descriptor = "(Ljava/util/Date;I)Z", + garbageValue = "-209283109" ) - public static int method1265(int var0) { - if (var0 > 0) { - return 1; - } else { - return var0 < 0 ? -1 : 0; - } + static boolean method1296(Date var0) { + java.util.Calendar var2 = java.util.Calendar.getInstance(); + var2.set(2, 0); + var2.set(5, 1); + var2.set(1, 1900); + Date var1 = var2.getTime(); + return var0.after(var1); } } \ No newline at end of file diff --git a/osrs/src/main/java/class250.java b/osrs/src/main/java/class250.java new file mode 100644 index 000000000..d53936c43 --- /dev/null +++ b/osrs/src/main/java/class250.java @@ -0,0 +1,105 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("je") +public class class250 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lje;" + ) + static final class250 field2076; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lje;" + ) + static final class250 field2075; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Luz;" + ) + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("ar") + final int field2077; + + static { + field2076 = new class250(0); + field2075 = new class250(1); + } + + class250(int var1) { + this.field2077 = var1; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "([BIILkf;[Liw;B)V", + garbageValue = "-28" + ) + static final void method1333(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); + int var6 = -1; + + while (true) { + int var7 = var5.readIncrSmallSmart(); + if (var7 == 0) { + return; + } + + var6 += var7; + int var8 = 0; + + while (true) { + int var9 = var5.readUShortSmart(); + if (var9 == 0) { + break; + } + + var8 += var9 - 1; + int var10 = var8 & 63; + int var11 = var8 >> 6 & 63; + int var12 = var8 >> 12; + int var13 = var5.readUnsignedByte(); + int var14 = var13 >> 2; + int var15 = var13 & 3; + int var16 = var11 + var1; + int var17 = var10 + var2; + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { + int var18 = var12; + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { + var18 = var12 - 1; + } + + CollisionMap var19 = null; + if (var18 >= 0) { + var19 = var4[var18]; + } + + Interpreter.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); + } + } + } + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "205742925" + ) + static String method1332() { + StringBuilder var0 = new StringBuilder(); + + Message var2; + for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0.append(var2.text).append('\n')) { + var2 = (Message)var1.next(); + if (var2.sender != null && !var2.sender.isEmpty()) { + var0.append(var2.sender).append(':'); + } + } + + return var0.toString(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class251.java b/osrs/src/main/java/class251.java new file mode 100644 index 000000000..e1613607d --- /dev/null +++ b/osrs/src/main/java/class251.java @@ -0,0 +1,97 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("jd") +public class class251 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + static final class251 field2079; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + static final class251 field2078; + @ObfuscatedName("ar") + final int field2080; + + static { + field2079 = new class251(0); + field2078 = new class251(1); + } + + class251(int var1) { + this.field2080 = var1; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "([FIFI)F", + garbageValue = "-1267695907" + ) + static float method1335(float[] var0, int var1, float var2) { + float var3 = var0[var1]; + + for (int var4 = var1 - 1; var4 >= 0; --var4) { + var3 = var0[var4] + var2 * var3; + } + + return var3; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1945515950" + ) + public static void method1334(int var0) { + if (!class316.musicSongs.isEmpty()) { + Iterator var1 = class316.musicSongs.iterator(); + + while (var1.hasNext()) { + MusicSong var2 = (MusicSong)var1.next(); + if (var2 != null) { + var2.musicTrackVolume = var0; + } + } + + MusicSong var3 = (MusicSong)class316.musicSongs.get(0); + if (var3 != null && var3.midiPcmStream != null && var3.midiPcmStream.isReady() && !var3.field2884) { + var3.midiPcmStream.setPcmStreamVolume(var0); + var3.field2886 = (float)var0; + } + } + + } + + @ObfuscatedName("ne") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", + garbageValue = "24" + ) + static String method1336(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; + if (Client.gameBuild == 1) { + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { + var0 = "local"; + } + + String var3 = ""; + if (MenuAction.param9 != null) { + var3 = "/p=" + MenuAction.param9; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + class85.clientLanguage + "/a=" + DevicePcmPlayerProvider.field66 + var3 + "/"; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class252.java b/osrs/src/main/java/class252.java new file mode 100644 index 000000000..fbc086d4f --- /dev/null +++ b/osrs/src/main/java/class252.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ji") +public class class252 { + @ObfuscatedName("gj") + @Export("currentPort") + static int currentPort; + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "8601" + ) + public static void method1337() { + VarbitComposition.VarbitDefinition_cached.clear(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class259.java b/osrs/src/main/java/class259.java deleted file mode 100644 index fa2c2dabd..000000000 --- a/osrs/src/main/java/class259.java +++ /dev/null @@ -1,3413 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jg") -public class class259 extends class242 { - @ObfuscatedSignature( - descriptor = "(Ljb;)V" - ) - class259(Clips var1) { - super(var1); - } - - @ObfuscatedName("ah") - @Export("vmethod1374") - void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12) { - int var13 = var5 - var4; - int var14 = var2 - var1; - int var15 = var6 - var4; - int var16 = var3 - var1; - int var17 = var11 - var10; - int var18 = var12 - var10; - float var19 = var8 - var7; - float var20 = var9 - var7; - int var21; - if (var3 != var2) { - var21 = (var6 - var5 << 14) / (var3 - var2); - } else { - var21 = 0; - } - - int var22; - if (var2 != var1) { - var22 = (var13 << 14) / var14; - } else { - var22 = 0; - } - - int var23; - if (var3 != var1) { - var23 = (var15 << 14) / var16; - } else { - var23 = 0; - } - - int var24 = var13 * var16 - var15 * var14; - if (var24 != 0) { - int var25 = (var17 * var16 - var18 * var14 << 8) / var24; - int var26 = (var18 * var13 - var17 * var15 << 8) / var24; - float var27 = (var19 * (float)var16 - var20 * (float)var14) / (float)var24; - float var28 = (var20 * (float)var13 - var19 * (float)var15) / (float)var24; - int[] var29 = super.field2059.Rasterizer3D_rowOffsets; - int var30 = super.field2059.field2281; - if (var1 <= var2 && var1 <= var3) { - if (var1 < var30) { - if (var2 > var30) { - var2 = var30; - } - - if (var3 > var30) { - var3 = var30; - } - - var10 = var25 + ((var10 << 8) - var25 * var4); - var7 = var7 - var27 * (float)var4 + var27; - if (var2 < var3) { - var6 = var4 <<= 14; - if (var1 < 0) { - var6 -= var23 * var1; - var4 -= var22 * var1; - var10 -= var26 * var1; - var7 -= var28 * (float)var1; - var1 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var21 * var2; - var2 = 0; - } - - if (var2 != var1 && var23 < var22 || var2 == var1 && var23 > var21) { - var3 -= var2; - var2 -= var1; - var1 = var29[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var25, var7, var27); - var6 += var23; - var5 += var21; - var10 += var26; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); - var6 += var23; - var4 += var22; - var10 += var26; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var28; - } - } else { - var3 -= var2; - var2 -= var1; - var1 = var29[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var25, var7, var27); - var6 += var23; - var5 += var21; - var10 += var26; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); - var6 += var23; - var4 += var22; - var10 += var26; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var28; - } - } - } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var23 * var1; - var4 -= var22 * var1; - var10 -= var26 * var1; - var7 -= var28 * (float)var1; - var1 = 0; - } - - var6 <<= 14; - if (var3 < 0) { - var6 -= var3 * var21; - var3 = 0; - } - - if (var3 != var1 && var23 < var22 || var3 == var1 && var21 > var22) { - var2 -= var3; - var3 -= var1; - var1 = var29[var1]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); - var6 += var21; - var4 += var22; - var10 += var26; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var25, var7, var27); - var5 += var23; - var4 += var22; - var10 += var26; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var28; - } - } else { - var2 -= var3; - var3 -= var1; - var1 = var29[var1]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); - var6 += var21; - var4 += var22; - var10 += var26; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var25, var7, var27); - var5 += var23; - var4 += var22; - var10 += var26; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var28; - } - } - } - } - } else if (var2 <= var3) { - if (var2 < var30) { - if (var3 > var30) { - var3 = var30; - } - - if (var1 > var30) { - var1 = var30; - } - - var11 = (var11 << 8) - var5 * var25 + var25; - var8 = var8 - var27 * (float)var5 + var27; - if (var3 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var22 * var2; - var5 -= var21 * var2; - var11 -= var26 * var2; - var8 -= var28 * (float)var2; - var2 = 0; - } - - var6 <<= 14; - if (var3 < 0) { - var6 -= var3 * var23; - var3 = 0; - } - - if (var3 != var2 && var22 < var21 || var3 == var2 && var22 > var23) { - var1 -= var3; - var3 -= var2; - var2 = var29[var2]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var25, var8, var27); - var4 += var22; - var6 += var23; - var11 += var26; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); - var4 += var22; - var5 += var21; - var11 += var26; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var28; - } - } else { - var1 -= var3; - var3 -= var2; - var2 = var29[var2]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var25, var8, var27); - var4 += var22; - var6 += var23; - var11 += var26; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); - var4 += var22; - var5 += var21; - var11 += var26; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var28; - } - } - } else { - var6 = var5 <<= 14; - if (var2 < 0) { - var6 -= var22 * var2; - var5 -= var21 * var2; - var11 -= var26 * var2; - var8 -= var28 * (float)var2; - var2 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var23 * var1; - var1 = 0; - } - - if (var22 < var21) { - var3 -= var1; - var1 -= var2; - var2 = var29[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); - var4 += var23; - var5 += var21; - var11 += var26; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var25, var8, var27); - var6 += var22; - var5 += var21; - var11 += var26; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var28; - } - } else { - var3 -= var1; - var1 -= var2; - var2 = var29[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); - var4 += var23; - var5 += var21; - var11 += var26; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var25, var8, var27); - var6 += var22; - var5 += var21; - var11 += var26; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var28; - } - } - } - } - } else if (var3 < var30) { - if (var1 > var30) { - var1 = var30; - } - - if (var2 > var30) { - var2 = var30; - } - - var12 = var25 + ((var12 << 8) - var25 * var6); - var9 = var9 - var27 * (float)var6 + var27; - if (var1 < var2) { - var5 = var6 <<= 14; - if (var3 < 0) { - var5 -= var3 * var21; - var6 -= var3 * var23; - var12 -= var3 * var26; - var9 -= var28 * (float)var3; - var3 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var22 * var1; - var1 = 0; - } - - if (var21 < var23) { - var2 -= var1; - var1 -= var3; - var3 = var29[var3]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var25, var9, var27); - var5 += var21; - var4 += var22; - var12 += var26; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); - var5 += var21; - var6 += var23; - var12 += var26; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var28; - } - } else { - var2 -= var1; - var1 -= var3; - var3 = var29[var3]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var25, var9, var27); - var5 += var21; - var4 += var22; - var12 += var26; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); - var5 += var21; - var6 += var23; - var12 += var26; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var28; - } - } - } else { - var4 = var6 <<= 14; - if (var3 < 0) { - var4 -= var3 * var21; - var6 -= var3 * var23; - var12 -= var3 * var26; - var9 -= var28 * (float)var3; - var3 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var22 * var2; - var2 = 0; - } - - if (var21 < var23) { - var1 -= var2; - var2 -= var3; - var3 = var29[var3]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); - var5 += var22; - var6 += var23; - var12 += var26; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var25, var9, var27); - var4 += var21; - var6 += var23; - var12 += var26; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var28; - } - } else { - var1 -= var2; - var2 -= var3; - var3 = var29[var3]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); - var5 += var22; - var6 += var23; - var12 += var26; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var28; - } - } - - this.method1408(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var25, var9, var27); - var4 += var21; - var6 += var23; - var12 += var26; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var28; - } - } - } - } - } - } - - @ObfuscatedName("ar") - @Export("vmethod1366") - void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10) { - int var11 = var5 - var4; - int var12 = var2 - var1; - int var13 = var6 - var4; - int var14 = var3 - var1; - float var15 = var8 - var7; - float var16 = var9 - var7; - int var17; - if (var3 != var2) { - var17 = (var6 - var5 << 14) / (var3 - var2); - } else { - var17 = 0; - } - - int var18; - if (var2 != var1) { - var18 = (var11 << 14) / var12; - } else { - var18 = 0; - } - - int var19; - if (var3 != var1) { - var19 = (var13 << 14) / var14; - } else { - var19 = 0; - } - - int var20 = var11 * var14 - var13 * var12; - if (var20 != 0) { - float var21 = (var15 * (float)var14 - var16 * (float)var12) / (float)var20; - float var22 = (var16 * (float)var11 - var15 * (float)var13) / (float)var20; - int[] var23 = super.field2059.Rasterizer3D_rowOffsets; - int var24 = super.field2059.field2281; - if (var1 <= var2 && var1 <= var3) { - if (var1 < var24) { - if (var2 > var24) { - var2 = var24; - } - - if (var3 > var24) { - var3 = var24; - } - - var7 = var7 - var21 * (float)var4 + var21; - if (var2 < var3) { - var6 = var4 <<= 14; - if (var1 < 0) { - var6 -= var19 * var1; - var4 -= var18 * var1; - var7 -= var22 * (float)var1; - var1 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var17 * var2; - var2 = 0; - } - - if (var2 != var1 && var19 < var18 || var2 == var1 && var19 > var17) { - var3 -= var2; - var2 -= var1; - var1 = var23[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14, var7, var21); - var6 += var19; - var5 += var17; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); - var6 += var19; - var4 += var18; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var22; - } - } else { - var3 -= var2; - var2 -= var1; - var1 = var23[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14, var7, var21); - var6 += var19; - var5 += var17; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); - var6 += var19; - var4 += var18; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var22; - } - } - } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var19 * var1; - var4 -= var18 * var1; - var7 -= var22 * (float)var1; - var1 = 0; - } - - var6 <<= 14; - if (var3 < 0) { - var6 -= var3 * var17; - var3 = 0; - } - - if (var3 != var1 && var19 < var18 || var3 == var1 && var17 > var18) { - var2 -= var3; - var3 -= var1; - var1 = var23[var1]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); - var6 += var17; - var4 += var18; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14, var7, var21); - var5 += var19; - var4 += var18; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var22; - } - } else { - var2 -= var3; - var3 -= var1; - var1 = var23[var1]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); - var6 += var17; - var4 += var18; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14, var7, var21); - var5 += var19; - var4 += var18; - var1 += Rasterizer2D.Rasterizer2D_width; - var7 += var22; - } - } - } - } - } else if (var2 <= var3) { - if (var2 < var24) { - if (var3 > var24) { - var3 = var24; - } - - if (var1 > var24) { - var1 = var24; - } - - var8 = var8 - var21 * (float)var5 + var21; - if (var3 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var18 * var2; - var5 -= var17 * var2; - var8 -= var22 * (float)var2; - var2 = 0; - } - - var6 <<= 14; - if (var3 < 0) { - var6 -= var3 * var19; - var3 = 0; - } - - if (var3 != var2 && var18 < var17 || var3 == var2 && var18 > var19) { - var1 -= var3; - var3 -= var2; - var2 = var23[var2]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14, var8, var21); - var4 += var18; - var6 += var19; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); - var4 += var18; - var5 += var17; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var22; - } - } else { - var1 -= var3; - var3 -= var2; - var2 = var23[var2]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14, var8, var21); - var4 += var18; - var6 += var19; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); - var4 += var18; - var5 += var17; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var22; - } - } - } else { - var6 = var5 <<= 14; - if (var2 < 0) { - var6 -= var18 * var2; - var5 -= var17 * var2; - var8 -= var22 * (float)var2; - var2 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var19 * var1; - var1 = 0; - } - - if (var18 < var17) { - var3 -= var1; - var1 -= var2; - var2 = var23[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); - var4 += var19; - var5 += var17; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14, var8, var21); - var6 += var18; - var5 += var17; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var22; - } - } else { - var3 -= var1; - var1 -= var2; - var2 = var23[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); - var4 += var19; - var5 += var17; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14, var8, var21); - var6 += var18; - var5 += var17; - var2 += Rasterizer2D.Rasterizer2D_width; - var8 += var22; - } - } - } - } - } else if (var3 < var24) { - if (var1 > var24) { - var1 = var24; - } - - if (var2 > var24) { - var2 = var24; - } - - var9 = var9 - var21 * (float)var6 + var21; - if (var1 < var2) { - var5 = var6 <<= 14; - if (var3 < 0) { - var5 -= var3 * var17; - var6 -= var3 * var19; - var9 -= var22 * (float)var3; - var3 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var18 * var1; - var1 = 0; - } - - if (var17 < var19) { - var2 -= var1; - var1 -= var3; - var3 = var23[var3]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14, var9, var21); - var5 += var17; - var4 += var18; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); - var5 += var17; - var6 += var19; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var22; - } - } else { - var2 -= var1; - var1 -= var3; - var3 = var23[var3]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14, var9, var21); - var5 += var17; - var4 += var18; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); - var5 += var17; - var6 += var19; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var22; - } - } - } else { - var4 = var6 <<= 14; - if (var3 < 0) { - var4 -= var3 * var17; - var6 -= var3 * var19; - var9 -= var22 * (float)var3; - var3 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var18 * var2; - var2 = 0; - } - - if (var17 < var19) { - var1 -= var2; - var2 -= var3; - var3 = var23[var3]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); - var5 += var18; - var6 += var19; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14, var9, var21); - var4 += var17; - var6 += var19; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var22; - } - } else { - var1 -= var2; - var2 -= var3; - var3 = var23[var3]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); - var5 += var18; - var6 += var19; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var22; - } - } - - this.method1410(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14, var9, var21); - var4 += var17; - var6 += var19; - var3 += Rasterizer2D.Rasterizer2D_width; - var9 += var22; - } - } - } - } - } - } - - @ObfuscatedName("ab") - @Export("vmethod1378") - void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2059.Rasterizer3D_textureLoader.getTexturePixels(var22); - int var24; - if (var23 == null) { - var24 = super.field2059.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class242.method1268(var24, var10), class242.method1268(var24, var11), class242.method1268(var24, var12)); - } else { - super.field2057 = super.field2059.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2056 = super.field2059.Rasterizer3D_textureLoader.vmethod3989(var22); - var24 = var5 - var4; - int var25 = var2 - var1; - int var26 = var6 - var4; - int var27 = var3 - var1; - int var28 = var11 - var10; - int var29 = var12 - var10; - int var30 = 0; - if (var2 != var1) { - var30 = (var5 - var4 << 14) / (var2 - var1); - } - - int var31 = 0; - if (var3 != var2) { - var31 = (var6 - var5 << 14) / (var3 - var2); - } - - int var32 = 0; - if (var3 != var1) { - var32 = (var4 - var6 << 14) / (var1 - var3); - } - - int var33 = var24 * var27 - var26 * var25; - if (var33 != 0) { - int var34 = (var28 * var27 - var29 * var25 << 9) / var33; - int var35 = (var29 * var24 - var28 * var26 << 9) / var33; - float var36 = var8 - var7; - float var37 = var9 - var7; - float var38 = (var36 * (float)var27 - var37 * (float)var25) / (float)var33; - float var39 = (var37 * (float)var24 - var36 * (float)var26) / (float)var33; - int var40 = super.field2059.field2290; - var14 = var13 - var14; - var17 = var16 - var17; - var20 = var19 - var20; - var15 -= var13; - var18 -= var16; - var21 -= var19; - int var41 = var15 * var16 - var18 * var13 << 14; - int var42 = (int)(((long)(var18 * var19 - var16 * var21) << 3 << 14) / (long)var40); - int var43 = (int)(((long)(var13 * var21 - var19 * var15) << 14) / (long)var40); - int var44 = var16 * var14 - var13 * var17 << 14; - int var45 = (int)(((long)(var19 * var17 - var16 * var20) << 3 << 14) / (long)var40); - int var46 = (int)(((long)(var13 * var20 - var19 * var14) << 14) / (long)var40); - int var47 = var17 * var15 - var18 * var14 << 14; - int var48 = (int)(((long)(var18 * var20 - var17 * var21) << 3 << 14) / (long)var40); - int var49 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var40); - int[] var50 = super.field2059.Rasterizer3D_rowOffsets; - int var51 = super.field2059.field2281; - int var52; - if (var1 <= var2 && var1 <= var3) { - if (var1 < var51) { - if (var2 > var51) { - var2 = var51; - } - - if (var3 > var51) { - var3 = var51; - } - - var10 = var34 + ((var10 << 9) - var34 * var4); - var7 = var7 - var38 * (float)var4 + var38; - if (var2 < var3) { - var6 = var4 <<= 14; - if (var1 < 0) { - var6 -= var32 * var1; - var4 -= var30 * var1; - var10 -= var35 * var1; - var7 -= var39 * (float)var1; - var1 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var31 * var2; - var2 = 0; - } - - var52 = var1 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if ((var2 == var1 || var32 >= var30) && (var2 != var1 || var32 <= var31)) { - var3 -= var2; - var2 -= var1; - var1 = var50[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var32; - var5 += var31; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var32; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } else { - var3 -= var2; - var2 -= var1; - var1 = var50[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var32; - var5 += var31; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var32; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var32 * var1; - var4 -= var30 * var1; - var10 -= var35 * var1; - var7 -= var39 * (float)var1; - var1 = 0; - } - - var6 <<= 14; - if (var3 < 0) { - var6 -= var3 * var31; - var3 = 0; - } - - var52 = var1 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if (var3 != var1 && var32 < var30 || var3 == var1 && var31 > var30) { - var2 -= var3; - var3 -= var1; - var1 = var50[var1]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var31; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var5 += var32; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } else { - var2 -= var3; - var3 -= var1; - var1 = var50[var1]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var31; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var5 += var32; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - } - } - } else if (var2 <= var3) { - if (var2 < var51) { - if (var3 > var51) { - var3 = var51; - } - - if (var1 > var51) { - var1 = var51; - } - - var11 = var34 + ((var11 << 9) - var5 * var34); - var8 = var8 - var38 * (float)var5 + var38; - if (var3 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var30 * var2; - var5 -= var31 * var2; - var11 -= var35 * var2; - var8 -= var39 * (float)var2; - var2 = 0; - } - - var6 <<= 14; - if (var3 < 0) { - var6 -= var3 * var32; - var3 = 0; - } - - var52 = var2 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if ((var3 == var2 || var30 >= var31) && (var3 != var2 || var30 <= var32)) { - var1 -= var3; - var3 -= var2; - var2 = var50[var2]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var30; - var6 += var32; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var30; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } else { - var1 -= var3; - var3 -= var2; - var2 = var50[var2]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var30; - var6 += var32; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var30; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - } else { - var6 = var5 <<= 14; - if (var2 < 0) { - var6 -= var30 * var2; - var5 -= var31 * var2; - var11 -= var35 * var2; - var8 -= var39 * (float)var2; - var2 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var32 * var1; - var1 = 0; - } - - var52 = var2 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if (var30 < var31) { - var3 -= var1; - var1 -= var2; - var2 = var50[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var32; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var6 += var30; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } else { - var3 -= var1; - var1 -= var2; - var2 = var50[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var32; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var6 += var30; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - } - } - } else if (var3 < var51) { - if (var1 > var51) { - var1 = var51; - } - - if (var2 > var51) { - var2 = var51; - } - - var12 = (var12 << 9) - var34 * var6 + var34; - var9 = var9 - var38 * (float)var6 + var38; - if (var1 < var2) { - var5 = var6 <<= 14; - if (var3 < 0) { - var5 -= var3 * var31; - var6 -= var3 * var32; - var12 -= var3 * var35; - var9 -= var39 * (float)var3; - var3 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var30 * var1; - var1 = 0; - } - - var52 = var3 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if (var31 < var32) { - var2 -= var1; - var1 -= var3; - var3 = var50[var3]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var31; - var4 += var30; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var31; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } else { - var2 -= var1; - var1 -= var3; - var3 = var50[var3]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var31; - var4 += var30; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var31; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - } else { - var4 = var6 <<= 14; - if (var3 < 0) { - var4 -= var3 * var31; - var6 -= var3 * var32; - var12 -= var3 * var35; - var9 -= var39 * (float)var3; - var3 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var30 * var2; - var2 = 0; - } - - var52 = var3 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if (var31 < var32) { - var1 -= var2; - var2 -= var3; - var3 = var50[var3]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var30; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var4 += var31; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } else { - var1 -= var2; - var2 -= var3; - var3 = var50[var3]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var30; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - - this.method1417(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var4 += var31; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - } - } - } - } - } - - @ObfuscatedName("am") - @Export("vmethod1362") - void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2059.Rasterizer3D_textureLoader.getTexturePixels(var22); - int var24; - if (var23 == null) { - var24 = super.field2059.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class242.method1268(var24, var10), class242.method1268(var24, var11), class242.method1268(var24, var12)); - } else { - super.field2057 = super.field2059.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2056 = super.field2059.Rasterizer3D_textureLoader.vmethod3989(var22); - var24 = var5 - var4; - int var25 = var2 - var1; - int var26 = var6 - var4; - int var27 = var3 - var1; - int var28 = var11 - var10; - int var29 = var12 - var10; - int var30 = 0; - if (var2 != var1) { - var30 = (var5 - var4 << 14) / (var2 - var1); - } - - int var31 = 0; - if (var3 != var2) { - var31 = (var6 - var5 << 14) / (var3 - var2); - } - - int var32 = 0; - if (var3 != var1) { - var32 = (var4 - var6 << 14) / (var1 - var3); - } - - int var33 = var24 * var27 - var26 * var25; - if (var33 != 0) { - int var34 = (var28 * var27 - var29 * var25 << 9) / var33; - int var35 = (var29 * var24 - var28 * var26 << 9) / var33; - float var36 = var8 - var7; - float var37 = var9 - var7; - float var38 = (var36 * (float)var27 - var37 * (float)var25) / (float)var33; - float var39 = (var37 * (float)var24 - var36 * (float)var26) / (float)var33; - int var40 = super.field2059.field2290; - var14 = var13 - var14; - var17 = var16 - var17; - var20 = var19 - var20; - var15 -= var13; - var18 -= var16; - var21 -= var19; - int var41 = var15 * var16 - var18 * var13 << 14; - int var42 = (int)(((long)(var18 * var19 - var16 * var21) << 14) / (long)var40); - int var43 = (int)(((long)(var13 * var21 - var19 * var15) << 14) / (long)var40); - int var44 = var16 * var14 - var13 * var17 << 14; - int var45 = (int)(((long)(var19 * var17 - var16 * var20) << 14) / (long)var40); - int var46 = (int)(((long)(var13 * var20 - var19 * var14) << 14) / (long)var40); - int var47 = var17 * var15 - var18 * var14 << 14; - int var48 = (int)(((long)(var18 * var20 - var17 * var21) << 14) / (long)var40); - int var49 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var40); - int[] var50 = super.field2059.Rasterizer3D_rowOffsets; - int var51 = super.field2059.field2281; - int var52; - if (var1 <= var2 && var1 <= var3) { - if (var1 < var51) { - if (var2 > var51) { - var2 = var51; - } - - if (var3 > var51) { - var3 = var51; - } - - var10 = var34 + ((var10 << 9) - var34 * var4); - var7 = var7 - var38 * (float)var4 + var38; - if (var2 < var3) { - var6 = var4 <<= 14; - if (var1 < 0) { - var6 -= var32 * var1; - var4 -= var30 * var1; - var7 -= var39 * (float)var1; - var10 -= var35 * var1; - var1 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var31 * var2; - var2 = 0; - } - - var52 = var1 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if ((var2 == var1 || var32 >= var30) && (var2 != var1 || var32 <= var31)) { - var3 -= var2; - var2 -= var1; - var1 = var50[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var32; - var5 += var31; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var32; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } else { - var3 -= var2; - var2 -= var1; - var1 = var50[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var32; - var5 += var31; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var32; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var32 * var1; - var4 -= var30 * var1; - var7 -= var39 * (float)var1; - var10 -= var35 * var1; - var1 = 0; - } - - var6 <<= 14; - if (var3 < 0) { - var6 -= var3 * var31; - var3 = 0; - } - - var52 = var1 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if (var3 != var1 && var32 < var30 || var3 == var1 && var31 > var30) { - var2 -= var3; - var3 -= var1; - var1 = var50[var1]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var31; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var5 += var32; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } else { - var2 -= var3; - var3 -= var1; - var1 = var50[var1]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var6 += var31; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); - var5 += var32; - var4 += var30; - var10 += var35; - var1 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var7 += var39; - } - } - } - } - } else if (var2 <= var3) { - if (var2 < var51) { - if (var3 > var51) { - var3 = var51; - } - - if (var1 > var51) { - var1 = var51; - } - - var11 = var34 + ((var11 << 9) - var5 * var34); - var8 = var8 - var38 * (float)var5 + var38; - if (var3 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var30 * var2; - var5 -= var31 * var2; - var8 -= var39 * (float)var2; - var11 -= var35 * var2; - var2 = 0; - } - - var6 <<= 14; - if (var3 < 0) { - var6 -= var3 * var32; - var3 = 0; - } - - var52 = var2 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if ((var3 == var2 || var30 >= var31) && (var3 != var2 || var30 <= var32)) { - var1 -= var3; - var3 -= var2; - var2 = var50[var2]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var30; - var6 += var32; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var30; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } else { - var1 -= var3; - var3 -= var2; - var2 = var50[var2]; - - while (true) { - --var3; - if (var3 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var30; - var6 += var32; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var30; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - } else { - var6 = var5 <<= 14; - if (var2 < 0) { - var6 -= var30 * var2; - var5 -= var31 * var2; - var8 -= var39 * (float)var2; - var11 -= var35 * var2; - var2 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var32 * var1; - var1 = 0; - } - - var52 = var2 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if (var30 < var31) { - var3 -= var1; - var1 -= var2; - var2 = var50[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var32; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var6 += var30; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } else { - var3 -= var1; - var1 -= var2; - var2 = var50[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var3; - if (var3 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var4 += var32; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); - var6 += var30; - var5 += var31; - var11 += var35; - var2 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var8 += var39; - } - } - } - } - } else if (var3 < var51) { - if (var1 > var51) { - var1 = var51; - } - - if (var2 > var51) { - var2 = var51; - } - - var12 = (var12 << 9) - var34 * var6 + var34; - var9 = var9 - var38 * (float)var6 + var38; - if (var1 < var2) { - var5 = var6 <<= 14; - if (var3 < 0) { - var5 -= var3 * var31; - var6 -= var3 * var32; - var9 -= var39 * (float)var3; - var12 -= var3 * var35; - var3 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var30 * var1; - var1 = 0; - } - - var52 = var3 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if (var31 < var32) { - var2 -= var1; - var1 -= var3; - var3 = var50[var3]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var31; - var4 += var30; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var31; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } else { - var2 -= var1; - var1 -= var3; - var3 = var50[var3]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var31; - var4 += var30; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var31; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - } else { - var4 = var6 <<= 14; - if (var3 < 0) { - var4 -= var3 * var31; - var6 -= var3 * var32; - var9 -= var39 * (float)var3; - var12 -= var3 * var35; - var3 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var30 * var2; - var2 = 0; - } - - var52 = var3 - super.field2059.field2287; - var41 += var43 * var52; - var44 += var46 * var52; - var47 += var49 * var52; - if (var31 < var32) { - var1 -= var2; - var2 -= var3; - var3 = var50[var3]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var30; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var4 += var31; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } else { - var1 -= var2; - var2 -= var3; - var3 = var50[var3]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var5 += var30; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - - this.method1419(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); - var4 += var31; - var6 += var32; - var12 += var35; - var3 += Rasterizer2D.Rasterizer2D_width; - var41 += var43; - var44 += var46; - var47 += var49; - var9 += var39; - } - } - } - } - } - } - } - - @ObfuscatedName("bv") - final void method1404(int[] var1, float[] var2, int var3, int var4, float var5) { - int var6 = method1412(var2[var3], var5) ? 1 : 0; - int var7 = 1 - var6; - var1[var3] = var7 * var1[var3] + var6 * var4; - var2[var3] = (float)var6 * var5 + (float)var7 * var2[var3]; - } - - @ObfuscatedName("ba") - final void method1405(int[] var1, float[] var2, int var3, int var4, float var5) { - if (method1412(var2[var3], var5)) { - int var6 = (var4 & (var4 >> 31 & 1) - 1) >> 8; - var1[var3] = super.field2058[var6]; - var2[var3] = var5; - } - - } - - @ObfuscatedName("bz") - final void method1406(int[] var1, float[] var2, int var3, int var4, int var5, float var6) { - if (method1412(var2[var3], var6)) { - int var7 = var1[var3]; - var1[var3] = ((var7 & 16711935) * var5 >> 8 & 16711935) + var4 + (var5 * (var7 & 65280) >> 8 & 65280); - } - - } - - @ObfuscatedName("bb") - final void method1407(int[] var1, float[] var2, int var3, int var4, int var5, int var6, float var7) { - if (method1412(var2[var3], var7)) { - int var8 = (var4 & (var4 >> 31 & 1) - 1) >> 8; - int var9 = super.field2058[var8]; - var9 = ((var9 & 65280) * var6 >> 8 & 65280) + ((var9 & 16711935) * var6 >> 8 & 16711935); - int var10 = var1[var3]; - var1[var3] = var9 + ((var10 & 16711935) * var5 >> 8 & 16711935) + (var5 * (var10 & 65280) >> 8 & 65280); - } - - } - - @ObfuscatedName("bo") - final void method1408(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, float var9, float var10) { - if (super.field2059.field2278) { - if (var6 > super.field2059.field2285) { - var6 = super.field2059.field2285; - } - - if (var5 < 0) { - var5 = 0; - } - } - - if (var5 < var6) { - var2 += var5; - var7 += var5 * var8; - var9 += var10 * (float)var5; - int var11; - int var12; - if (super.field2059.field2289) { - var4 = var6 - var5 >> 2; - var8 <<= 2; - if (super.field2059.field2282 == 0) { - if (var4 > 0) { - do { - var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2058[var11]; - var7 += var8; - this.method1404(var1, Rasterizer2D.field4244, var2, var3, var9); - var9 += var10; - ++var2; - this.method1404(var1, Rasterizer2D.field4244, var2, var3, var9); - var9 += var10; - ++var2; - this.method1404(var1, Rasterizer2D.field4244, var2, var3, var9); - var9 += var10; - ++var2; - this.method1404(var1, Rasterizer2D.field4244, var2, var3, var9); - var9 += var10; - ++var2; - --var4; - } while(var4 > 0); - } - - var4 = var6 - var5 & 3; - if (var4 > 0) { - var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2058[var11]; - - do { - this.method1404(var1, Rasterizer2D.field4244, var2, var3, var9); - var9 += var10; - ++var2; - --var4; - } while(var4 > 0); - } - } else { - var11 = super.field2059.field2282; - var12 = 256 - super.field2059.field2282; - int var13; - if (var4 > 0) { - do { - var13 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2058[var13]; - var7 += var8; - var3 = ((var3 & 16711935) * var12 >> 8 & 16711935) + (var12 * (var3 & 65280) >> 8 & 65280); - this.method1406(var1, Rasterizer2D.field4244, var2, var3, var11, var9); - ++var2; - var9 += var10; - this.method1406(var1, Rasterizer2D.field4244, var2, var3, var11, var9); - ++var2; - var9 += var10; - this.method1406(var1, Rasterizer2D.field4244, var2, var3, var11, var9); - ++var2; - var9 += var10; - this.method1406(var1, Rasterizer2D.field4244, var2, var3, var11, var9); - ++var2; - var9 += var10; - --var4; - } while(var4 > 0); - } - - var4 = var6 - var5 & 3; - if (var4 > 0) { - var13 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2058[var13]; - var3 = ((var3 & 16711935) * var12 >> 8 & 16711935) + (var12 * (var3 & 65280) >> 8 & 65280); - - do { - this.method1406(var1, Rasterizer2D.field4244, var2, var3, var11, var9); - ++var2; - var9 += var10; - --var4; - } while(var4 > 0); - } - } - - } else { - var4 = var6 - var5; - if (super.field2059.field2282 == 0) { - do { - this.method1405(var1, Rasterizer2D.field4244, var2, var7, var9); - var9 += var10; - ++var2; - var7 += var8; - --var4; - } while(var4 > 0); - } else { - var11 = super.field2059.field2282; - var12 = 256 - super.field2059.field2282; - - do { - this.method1407(var1, Rasterizer2D.field4244, var2, var3, var11, var12, var9); - var9 += var10; - ++var2; - var7 += var8; - --var4; - } while(var4 > 0); - } - - } - } - } - - @ObfuscatedName("bp") - final void method1410(int[] var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8) { - if (super.field2059.field2278) { - if (var6 > super.field2059.field2285) { - var6 = super.field2059.field2285; - } - - if (var5 < 0) { - var5 = 0; - } - } - - if (var5 < var6) { - var2 += var5; - var4 = var6 - var5 >> 2; - var7 += var8 * (float)var5; - if (super.field2059.field2282 != 0) { - if (super.field2059.field2282 == 254) { - while (true) { - --var4; - if (var4 < 0) { - var4 = var6 - var5 & 3; - - while (true) { - --var4; - if (var4 < 0) { - return; - } - - var1[var2++] = var1[var2]; - } - } - - var1[var2++] = var1[var2]; - var1[var2++] = var1[var2]; - var1[var2++] = var1[var2]; - var1[var2++] = var1[var2]; - } - } else { - int var9 = super.field2059.field2282; - int var10 = 256 - super.field2059.field2282; - var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); - - while (true) { - --var4; - if (var4 < 0) { - var4 = var6 - var5 & 3; - - while (true) { - --var4; - if (var4 < 0) { - return; - } - - this.method1406(var1, Rasterizer2D.field4244, var2, var3, var9, var7); - ++var2; - var7 += var8; - } - } - - this.method1406(var1, Rasterizer2D.field4244, var2, var3, var9, var7); - ++var2; - var7 += var8; - this.method1406(var1, Rasterizer2D.field4244, var2, var3, var9, var7); - ++var2; - var7 += var8; - this.method1406(var1, Rasterizer2D.field4244, var2, var3, var9, var7); - ++var2; - var7 += var8; - this.method1406(var1, Rasterizer2D.field4244, var2, var3, var9, var7); - ++var2; - var7 += var8; - } - } - } else { - while (true) { - --var4; - if (var4 < 0) { - var4 = var6 - var5 & 3; - - while (true) { - --var4; - if (var4 < 0) { - return; - } - - this.method1404(var1, Rasterizer2D.field4244, var2, var3, var7); - var7 += var8; - ++var2; - } - } - - this.method1404(var1, Rasterizer2D.field4244, var2, var3, var7); - var7 += var8; - ++var2; - this.method1404(var1, Rasterizer2D.field4244, var2, var3, var7); - var7 += var8; - ++var2; - this.method1404(var1, Rasterizer2D.field4244, var2, var3, var7); - var7 += var8; - ++var2; - this.method1404(var1, Rasterizer2D.field4244, var2, var3, var7); - var7 += var8; - ++var2; - } - } - } - } - - @ObfuscatedName("bu") - final void method1417(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { - if (super.field2059.field2278) { - if (var7 > super.field2059.field2285) { - var7 = super.field2059.field2285; - } - - if (var6 < 0) { - var6 = 0; - } - } - - if (var6 < var7) { - var5 += var6; - var8 += var9 * var6; - var10 += var11 * (float)var6; - int var20 = var7 - var6; - int var10000; - int var18; - int var19; - int var21; - int var22; - int var23; - int var24; - int var25; - int var26; - if (super.field2057) { - var26 = var6 - super.field2059.field2284; - var12 += (var15 >> 3) * var26; - var13 += var26 * (var16 >> 3); - var14 += var26 * (var17 >> 3); - var25 = var14 >> 12; - if (var25 != 0) { - var21 = var12 / var25; - var22 = var13 / var25; - if (var21 < 0) { - var21 = 0; - } else if (var21 > 4032) { - var21 = 4032; - } - } else { - var21 = 0; - var22 = 0; - } - - var12 += var15; - var13 += var16; - var14 += var17; - var25 = var14 >> 12; - if (var25 != 0) { - var23 = var12 / var25; - var24 = var13 / var25; - if (var23 < 0) { - var23 = 0; - } else if (var23 > 4032) { - var23 = 4032; - } - } else { - var23 = 0; - var24 = 0; - } - - var3 = (var21 << 20) + var22; - var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 20); - var20 >>= 3; - var9 <<= 3; - var18 = var8 >> 8; - if (super.field2056) { - if (var20 > 0) { - do { - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var10000 = var3 + var19; - var10 += var11; - var21 = var23; - var22 = var24; - var12 += var15; - var13 += var16; - var14 += var17; - var25 = var14 >> 12; - if (var25 != 0) { - var23 = var12 / var25; - var24 = var13 / var25; - if (var23 < 0) { - var23 = 0; - } else if (var23 > 4032) { - var23 = 4032; - } - } else { - var23 = 0; - var24 = 0; - } - - var3 = (var21 << 20) + var22; - var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 20); - var8 += var9; - var18 = var8 >> 8; - --var20; - } while(var20 > 0); - } - - var20 = var7 - var6 & 7; - if (var20 > 0) { - do { - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - --var20; - } while(var20 > 0); - } - } else { - if (var20 > 0) { - do { - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var10000 = var3 + var19; - var10 += var11; - var21 = var23; - var22 = var24; - var12 += var15; - var13 += var16; - var14 += var17; - var25 = var14 >> 12; - if (var25 != 0) { - var23 = var12 / var25; - var24 = var13 / var25; - if (var23 < 0) { - var23 = 0; - } else if (var23 > 4032) { - var23 = 4032; - } - } else { - var23 = 0; - var24 = 0; - } - - var3 = (var21 << 20) + var22; - var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 20); - var8 += var9; - var18 = var8 >> 8; - --var20; - } while(var20 > 0); - } - - var20 = var7 - var6 & 7; - if (var20 > 0) { - do { - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - --var20; - } while(var20 > 0); - } - } - } else { - var26 = var6 - super.field2059.field2284; - var12 += (var15 >> 3) * var26; - var13 += var26 * (var16 >> 3); - var14 += var26 * (var17 >> 3); - var25 = var14 >> 14; - if (var25 != 0) { - var21 = var12 / var25; - var22 = var13 / var25; - if (var21 < 0) { - var21 = 0; - } else if (var21 > 16256) { - var21 = 16256; - } - } else { - var21 = 0; - var22 = 0; - } - - var12 += var15; - var13 += var16; - var14 += var17; - var25 = var14 >> 14; - if (var25 != 0) { - var23 = var12 / var25; - var24 = var13 / var25; - if (var23 < 0) { - var23 = 0; - } else if (var23 > 16256) { - var23 = 16256; - } - } else { - var23 = 0; - var24 = 0; - } - - var3 = (var21 << 18) + var22; - var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 18); - var20 >>= 3; - var9 <<= 3; - var18 = var8 >> 8; - if (super.field2056) { - if (var20 > 0) { - do { - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var10000 = var3 + var19; - var10 += var11; - var21 = var23; - var22 = var24; - var12 += var15; - var13 += var16; - var14 += var17; - var25 = var14 >> 14; - if (var25 != 0) { - var23 = var12 / var25; - var24 = var13 / var25; - if (var23 < 0) { - var23 = 0; - } else if (var23 > 16256) { - var23 = 16256; - } - } else { - var23 = 0; - var24 = 0; - } - - var3 = (var21 << 18) + var22; - var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 18); - var8 += var9; - var18 = var8 >> 8; - --var20; - } while(var20 > 0); - } - - var20 = var7 - var6 & 7; - if (var20 > 0) { - do { - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - --var20; - } while(var20 > 0); - } - } else { - if (var20 > 0) { - do { - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var10000 = var3 + var19; - var10 += var11; - var21 = var23; - var22 = var24; - var12 += var15; - var13 += var16; - var14 += var17; - var25 = var14 >> 14; - if (var25 != 0) { - var23 = var12 / var25; - var24 = var13 / var25; - if (var23 < 0) { - var23 = 0; - } else if (var23 > 16256) { - var23 = 16256; - } - } else { - var23 = 0; - var24 = 0; - } - - var3 = (var21 << 18) + var22; - var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 18); - var8 += var9; - var18 = var8 >> 8; - --var20; - } while(var20 > 0); - } - - var20 = var7 - var6 & 7; - if (var20 > 0) { - do { - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - --var20; - } while(var20 > 0); - } - } - } - - } - } - - @ObfuscatedName("bf") - final void method1419(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { - if (super.field2059.field2278) { - if (var7 > super.field2059.field2285) { - var7 = super.field2059.field2285; - } - - if (var6 < 0) { - var6 = 0; - } - } - - if (var6 < var7) { - var5 += var6; - var8 += var9 * var6; - var10 += var11 * (float)var6; - int var20 = var7 - var6; - int var18; - int var19; - int var21; - int var22; - int var23; - int var24; - int var25; - int var26; - if (super.field2057) { - var26 = var6 - super.field2059.field2284; - var12 += var26 * var15; - var13 += var26 * var16; - var14 += var17 * var26; - var25 = var14 >> 12; - if (var25 != 0) { - var21 = var12 / var25; - var22 = var13 / var25; - } else { - var21 = 0; - var22 = 0; - } - - var12 += var20 * var15; - var13 += var20 * var16; - var14 += var17 * var20; - var25 = var14 >> 12; - if (var25 != 0) { - var23 = var12 / var25; - var24 = var13 / var25; - } else { - var23 = 0; - var24 = 0; - } - - var3 = (var21 << 20) + var22; - var19 = (var24 - var22) / var20 + ((var23 - var21) / var20 << 20); - var20 >>= 3; - var9 <<= 3; - var18 = var8 >> 8; - if (super.field2056) { - if (var20 > 0) { - do { - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - var8 += var9; - var18 = var8 >> 8; - --var20; - } while(var20 > 0); - } - - var20 = var7 - var6 & 7; - if (var20 > 0) { - do { - method1413(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - --var20; - } while(var20 > 0); - } - } else { - if (var20 > 0) { - do { - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - var8 += var9; - var18 = var8 >> 8; - --var20; - } while(var20 > 0); - } - - var20 = var7 - var6 & 7; - if (var20 > 0) { - do { - method1414(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - --var20; - } while(var20 > 0); - } - } - } else { - var26 = var6 - super.field2059.field2284; - var12 += var26 * var15; - var13 += var26 * var16; - var14 += var17 * var26; - var25 = var14 >> 14; - if (var25 != 0) { - var21 = var12 / var25; - var22 = var13 / var25; - } else { - var21 = 0; - var22 = 0; - } - - var12 += var20 * var15; - var13 += var20 * var16; - var14 += var17 * var20; - var25 = var14 >> 14; - if (var25 != 0) { - var23 = var12 / var25; - var24 = var13 / var25; - } else { - var23 = 0; - var24 = 0; - } - - var3 = (var21 << 18) + var22; - var19 = (var24 - var22) / var20 + ((var23 - var21) / var20 << 18); - var20 >>= 3; - var9 <<= 3; - var18 = var8 >> 8; - if (super.field2056) { - if (var20 > 0) { - do { - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - var8 += var9; - var18 = var8 >> 8; - --var20; - } while(var20 > 0); - } - - var20 = var7 - var6 & 7; - if (var20 > 0) { - do { - method1415(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - --var20; - } while(var20 > 0); - } - } else { - if (var20 > 0) { - do { - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - var8 += var9; - var18 = var8 >> 8; - --var20; - } while(var20 > 0); - } - - var20 = var7 - var6 & 7; - if (var20 > 0) { - do { - method1416(var1, Rasterizer2D.field4244, var2, var5, var18, var3, var10); - ++var5; - var3 += var19; - var10 += var11; - --var20; - } while(var20 > 0); - } - } - } - - } - } - - @ObfuscatedName("bt") - static final boolean method1412(float var0, float var1) { - return var1 > var0; - } - - @ObfuscatedName("bm") - static final void method1413(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { - if (method1412(var1[var3], var6)) { - int var7 = var2[(var5 & 4032) + (var5 >>> 26)]; - var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; - var1[var3] = var6; - } - - } - - @ObfuscatedName("br") - static final void method1414(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { - int var7 = var2[(var5 & 4032) + (var5 >>> 26)]; - if (var7 != 0) { - if (method1412(var1[var3], var6)) { - var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; - var1[var3] = var6; - } - - } - } - - @ObfuscatedName("bs") - static final void method1415(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { - if (method1412(var1[var3], var6)) { - int var7 = var2[(var5 >>> 25) + (var5 & 16256)]; - var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; - var1[var3] = var6; - } - - } - - @ObfuscatedName("bc") - static final void method1416(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { - int var7 = var2[(var5 >>> 25) + (var5 & 16256)]; - if (var7 != 0) { - if (method1412(var1[var3], var6)) { - var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; - var1[var3] = var6; - } - - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class26.java b/osrs/src/main/java/class26.java new file mode 100644 index 000000000..bc6b20efc --- /dev/null +++ b/osrs/src/main/java/class26.java @@ -0,0 +1,37 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import netscape.js.JSObject; + +import java.applet.Applet; + +@ObfuscatedName("be") +public class class26 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-707108412" + ) + public static void method107(Applet var0, String var1) throws Throwable { + JSObject.getWindow(var0).eval(var1); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)Ljava/lang/Object;", + garbageValue = "107" + ) + public static Object method108(Applet var0, String var1) throws Throwable { + return JSObject.getWindow(var0).call(var1, (Object[])null); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "-224433790" + ) + @Export("invoke") + public static Object invoke(Applet var0, String var1, Object[] var2) throws Throwable { + return JSObject.getWindow(var0).call(var1, var2); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class266.java b/osrs/src/main/java/class266.java deleted file mode 100644 index b7b162820..000000000 --- a/osrs/src/main/java/class266.java +++ /dev/null @@ -1,407 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ko") -public class class266 { - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "36" - ) - static int method1430(int var0, Script var1, boolean var2) { - String var3; - if (var0 == 3100) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - class411.addGameMessage(0, "", var3); - return 1; - } else if (var0 == 3101) { - Interpreter.Interpreter_intStackSize -= 2; - WorldMapEvent.performPlayerAnimation(TextureProvider.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == 3103) { - if (!Interpreter.field702) { - Interpreter.field701 = true; - } - - return 1; - } else { - int var10; - if (var0 == 3104) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var10 = 0; - if (AttackOption.isNumber(var3)) { - var10 = class36.method182(var3); - } - - PacketBufferNode var15 = ClanChannelMember.getPacketBufferNode(ClientPacket.RESUME_COUNTDIALOG, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeInt(var10); - Client.packetWriter.addNode(var15); - return 1; - } else { - PacketBufferNode var12; - if (var0 == 3105) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.RESUME_NAMEDIALOG, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeByte(var3.length() + 1); - var12.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == 3106) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.RESUME_STRINGDIALOG, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeByte(var3.length() + 1); - var12.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var12); - return 1; - } else { - String var7; - int var8; - if (var0 == 3107) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - GrandExchangeOfferTotalQuantityComparator.method1976(var8, var7); - return 1; - } else if (var0 == 3108) { - Interpreter.Interpreter_intStackSize -= 3; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Widget var11 = class33.widgetDefinition.method1740(var5); - TaskHandler.clickWidget(var11, var8, var10); - return 1; - } else if (var0 == 3109) { - Interpreter.Interpreter_intStackSize -= 2; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Widget var14 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - TaskHandler.clickWidget(var14, var8, var10); - return 1; - } else if (var0 == 3110) { - UserComparator8.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3111) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class91.clientPreferences.getRoofsHidden() ? 1 : 0; - return 1; - } else if (var0 == 3112) { - class91.clientPreferences.setRoofsHidden(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == 3113) { - var3 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - VertexNormal.openURL(var3, var4, false); - return 1; - } else if (var0 == 3115) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.RESUME_OBJDIALOG, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(var8); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == 3116) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class180.Interpreter_stringStackSize -= 2; - var7 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize]; - String var9 = Interpreter.Interpreter_stringStack[class180.Interpreter_stringStackSize + 1]; - if (var7.length() > 500) { - return 1; - } else if (var9.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = ClanChannelMember.getPacketBufferNode(ClientPacket.f66, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + class478.stringCp1252NullTerminatedByteSize(var7) + class478.stringCp1252NullTerminatedByteSize(var9)); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - var6.packetBuffer.writeStringCp1252NullTerminated(var9); - var6.packetBuffer.writeByteNeg(var8); - Client.packetWriter.addNode(var6); - return 1; - } - } else if (var0 == 3117) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3118) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3119) { - Client.field388 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; - } - - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; - } - - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; - } - - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; - } - - return 1; - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; - return 1; - } else if (var0 == 3125) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3126) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3127) { - class154.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == 3128) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class47.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == 3129) { - Interpreter.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3132) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class340.canvasWidth; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class491.canvasHeight; - return 1; - } else if (var0 == 3133) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3134) { - return 1; - } else if (var0 == 3135) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field508 = 3; - Client.field505 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field508 = 2; - Client.field505 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field508 = 0; - return 1; - } else if (var0 == 3139) { - Client.field508 = 1; - return 1; - } else if (var0 == 3140) { - Client.field508 = 3; - Client.field505 = var2 ? class416.scriptDotWidget.id * 41171959 * -749799993 : class306.scriptActiveWidget.id * 41171959 * -749799993; - return 1; - } else { - boolean var13; - if (var0 == 3141) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class91.clientPreferences.setIsUsernameHidden(var13); - return 1; - } else if (var0 == 3142) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class91.clientPreferences.getIsUsernameHidden() ? 1 : 0; - return 1; - } else if (var0 == 3143) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var13; - if (!var13) { - class91.clientPreferences.setUsernameToRemember(""); - } - - return 1; - } else if (var0 == 3144) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; - return 1; - } else if (var0 == 3145) { - return 1; - } else if (var0 == 3146) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class91.clientPreferences.getTitleMusicDisabled(!var13); - return 1; - } else if (var0 == 3147) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class91.clientPreferences.getTitleMusicDisabled() ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class138.method734(); - return 1; - } else if (var0 == 3155) { - --class180.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3156) { - return 1; - } else if (var0 == 3157) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3161) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3162) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3163) { - --class180.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3165) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3166) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3167) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3168) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3169) { - return 1; - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3172) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3173) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3174) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --class180.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --class180.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3181) { - FontName.method2482(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 3182) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FaceNormal.method1334(); - return 1; - } else if (var0 == 3189) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class462.method2327(var8); - return 1; - } else { - return 2; - } - } - } - } - } - } - - @ObfuscatedName("ko") - @ObfuscatedSignature( - descriptor = "(IIIIII)Z", - garbageValue = "-277761006" - ) - static final boolean method1431(int var0, int var1, int var2, int var3, int var4) { - PendingSpawn var5 = null; - - for (PendingSpawn var6 = (PendingSpawn)Client.pendingSpawns.last(); var6 != null; var6 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var6.plane && var6.x == var1 && var2 == var6.y && var3 == var6.type) { - var5 = var6; - break; - } - } - - if (var5 != null) { - var5.field946 = var4; - return true; - } else { - return false; - } - } - - @ObfuscatedName("ob") - @ObfuscatedSignature( - descriptor = "([BII)V", - garbageValue = "-1820839232" - ) - static void method1432(byte[] var0, int var1) { - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; - } - - class424.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class267.java b/osrs/src/main/java/class267.java new file mode 100644 index 000000000..0e55cd452 --- /dev/null +++ b/osrs/src/main/java/class267.java @@ -0,0 +1,123 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kz") +public class class267 { + @ObfuscatedName("aq") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("gs") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + static Archive field2224; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "[Lej;" + ) + class128[] field2225; + @ObfuscatedName("ar") + int field2226; + + @ObfuscatedSignature( + descriptor = "(Luj;I)V" + ) + class267(Buffer var1, int var2) { + this.field2225 = new class128[var2]; + this.field2226 = var1.readUnsignedByte(); + + for (int var3 = 0; var3 < this.field2225.length; ++var3) { + class128 var4 = new class128(this.field2226, var1, false); + this.field2225[var3] = var4; + } + + this.method1438(); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1372666290" + ) + void method1438() { + class128[] var1 = this.field2225; + + for (int var2 = 0; var2 < var1.length; ++var2) { + class128 var3 = var1[var2]; + if (var3.field1238 >= 0) { + var3.field1237 = this.field2225[var3.field1238]; + } + } + + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "4095" + ) + public int method1439() { + return this.field2225.length; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)Lej;", + garbageValue = "-2147483647" + ) + class128 method1440(int var1) { + return var1 >= this.method1439() ? null : this.field2225[var1]; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)[Lej;", + garbageValue = "-943395454" + ) + class128[] method1441() { + return this.field2225; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Lfo;IB)V", + garbageValue = "-54" + ) + void method1442(class139 var1, int var2) { + this.method1443(var1, var2, (boolean[])null, false); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lfo;I[ZZI)V", + garbageValue = "-869028175" + ) + void method1443(class139 var1, int var2, boolean[] var3, boolean var4) { + int var5 = var1.method742(); + int var6 = 0; + class128[] var7 = this.method1441(); + + for (int var8 = 0; var8 < var7.length; ++var8) { + class128 var9 = var7[var8]; + if (var3 == null || var4 == var3[var6]) { + var1.method744(var2, var9, var6, var5); + } + + ++var6; + } + + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "618264850" + ) + public static void method1444() { + ObjectComposition.ObjectDefinition_cached.clear(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + ObjectComposition.ObjectDefinition_cachedEntities.clear(); + ObjectComposition.ObjectDefinition_cachedModels.clear(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class242.java b/osrs/src/main/java/class268.java similarity index 66% rename from osrs/src/main/java/class242.java rename to osrs/src/main/java/class268.java index 48adcb5d9..487fdfb0c 100644 --- a/osrs/src/main/java/class242.java +++ b/osrs/src/main/java/class268.java @@ -2,68 +2,68 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jj") -public abstract class class242 extends Rasterizer2D { +@ObfuscatedName("kn") +public abstract class class268 extends Rasterizer2D { + @ObfuscatedName("at") + boolean field2228; + @ObfuscatedName("ah") + boolean field2227; + @ObfuscatedName("aa") + int[] field2229; @ObfuscatedName("ac") - boolean field2056; - @ObfuscatedName("al") - boolean field2057; - @ObfuscatedName("ar") - int[] field2058; - @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lkh;" ) - Clips field2059; + Clips field2230; @ObfuscatedSignature( - descriptor = "(Ljb;)V" + descriptor = "(Lkh;)V" ) - class242(Clips var1) { - this.field2056 = false; - this.field2057 = false; - this.field2058 = Rasterizer3D.Rasterizer3D_colorPalette; - this.field2059 = var1; + class268(Clips var1) { + this.field2228 = false; + this.field2227 = false; + this.field2229 = Rasterizer3D.Rasterizer3D_colorPalette; + this.field2230 = var1; } - @ObfuscatedName("ac") - void method1266(int[] var1, int var2, int var3, float[] var4) { - Rasterizer2D.method2659(var1, var2, var3, var4); + @ObfuscatedName("at") + void method1445(int[] var1, int var2, int var3, float[] var4) { + Rasterizer2D.method2637(var1, var2, var3, var4); } - @ObfuscatedName("ax") - void method1269(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, byte var13, byte var14, byte var15, byte var16) { - var10 = method1267(var10, var13, var14, var15, var16); - var11 = method1267(var11, var13, var14, var15, var16); - var12 = method1267(var12, var13, var14, var15, var16); + @ObfuscatedName("ao") + void method1448(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, byte var13, byte var14, byte var15, byte var16) { + var10 = method1446(var10, var13, var14, var15, var16); + var11 = method1446(var11, var13, var14, var15, var16); + var12 = method1446(var12, var13, var14, var15, var16); this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, var10, var11, var12); } - @ObfuscatedName("ao") - void method1270(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, byte var11, byte var12, byte var13, byte var14) { - int var15 = method1267(var10, var11, var12, var13, var14); - var10 = this.field2058[var15]; + @ObfuscatedName("ab") + void method1449(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, byte var11, byte var12, byte var13, byte var14) { + int var15 = method1446(var10, var11, var12, var13, var14); + var10 = this.field2229[var15]; this.vmethod1366(var1, var2, var3, var4, var5, var6, var7, var8, var9, var10); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("vmethod1374") abstract void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12); - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("vmethod1366") abstract void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10); - @ObfuscatedName("ab") + @ObfuscatedName("ac") @Export("vmethod1378") abstract void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22); - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("vmethod1362") abstract void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22); - @ObfuscatedName("al") - static int method1267(int var0, byte var1, byte var2, byte var3, byte var4) { + @ObfuscatedName("ah") + static int method1446(int var0, byte var1, byte var2, byte var3, byte var4) { int var5 = var0 >> 10 & 63; int var6 = var0 >> 7 & 7; int var7 = var0 & 127; @@ -83,8 +83,8 @@ static int method1267(int var0, byte var1, byte var2, byte var3, byte var4) { return (var5 << 10 | var6 << 7 | var7) & 65535; } - @ObfuscatedName("ak") - static final int method1268(int var0, int var1) { + @ObfuscatedName("ar") + static final int method1447(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; diff --git a/osrs/src/main/java/class27.java b/osrs/src/main/java/class27.java index d9561d195..6b7661b93 100644 --- a/osrs/src/main/java/class27.java +++ b/osrs/src/main/java/class27.java @@ -1,115 +1,107 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import java.applet.Applet; import java.util.Arrays; -@ObfuscatedName("bk") +@ObfuscatedName("bd") public class class27 { - @ObfuscatedName("au") - static String[] field74; - @ObfuscatedName("fp") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("ar") - int[] field77; - @ObfuscatedName("ab") - int[] field76; + @ObfuscatedName("aa") + int[] field80; + @ObfuscatedName("ac") + int[] field81; public class27() { - this.field77 = new int[112]; - this.field76 = new int[192]; - Arrays.fill(this.field77, 3); - Arrays.fill(this.field76, 3); + this.field80 = new int[112]; + this.field81 = new int[192]; + Arrays.fill(this.field80, 3); + Arrays.fill(this.field81, 3); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1970517025" + garbageValue = "-1639161786" ) - public void method102(int var1, int var2) { - if (this.method111(var1) && this.method113(var2)) { - this.field77[var1] = var2; + public void method111(int var1, int var2) { + if (this.method121(var1) && this.method123(var2)) { + this.field80[var1] = var2; } } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(CII)V", - garbageValue = "-1891863343" + garbageValue = "-87016088" ) - public void method104(char var1, int var2) { - if (this.method112(var1) && this.method113(var2)) { - this.field76[var1] = var2; + public void method113(char var1, int var2) { + if (this.method122(var1) && this.method123(var2)) { + this.field81[var1] = var2; } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "24" + descriptor = "(II)I", + garbageValue = "1141320535" ) - public int method105(int var1) { - return this.method111(var1) ? this.field77[var1] : 0; + public int method115(int var1) { + return this.method121(var1) ? this.field80[var1] : 0; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(CI)I", - garbageValue = "-535571819" + garbageValue = "832183208" ) - public int method106(char var1) { - return this.method112(var1) ? this.field76[var1] : 0; + public int method116(char var1) { + return this.method122(var1) ? this.field81[var1] : 0; } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-101" + descriptor = "(II)Z", + garbageValue = "-1834915572" ) - public boolean method107(int var1) { - return this.method111(var1) && (this.field77[var1] == 1 || this.field77[var1] == 3); + public boolean method117(int var1) { + return this.method121(var1) && (this.field80[var1] == 1 || this.field80[var1] == 3); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "9" + descriptor = "(CI)Z", + garbageValue = "1013987055" ) - public boolean method108(char var1) { - return this.method112(var1) && (this.field76[var1] == 1 || this.field76[var1] == 3); + public boolean method118(char var1) { + return this.method122(var1) && (this.field81[var1] == 1 || this.field81[var1] == 3); } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1930578634" + garbageValue = "1584083272" ) - public boolean method109(int var1) { - return this.method111(var1) && (this.field77[var1] == 2 || this.field77[var1] == 3); + public boolean method119(int var1) { + return this.method121(var1) && (this.field80[var1] == 2 || this.field80[var1] == 3); } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "37" + descriptor = "(CI)Z", + garbageValue = "-769837729" ) - public boolean method110(char var1) { - return this.method112(var1) && (this.field76[var1] == 2 || this.field76[var1] == 3); + public boolean method120(char var1) { + return this.method122(var1) && (this.field81[var1] == 2 || this.field81[var1] == 3); } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "0" + descriptor = "(II)Z", + garbageValue = "2115531423" ) - boolean method111(int var1) { + boolean method121(int var1) { if (var1 >= 0 && var1 < 112) { return true; } else { @@ -118,12 +110,12 @@ boolean method111(int var1) { } } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(CI)Z", - garbageValue = "-1032091509" + garbageValue = "494262388" ) - boolean method112(char var1) { + boolean method122(char var1) { if (var1 >= 0 && var1 < 192) { return true; } else { @@ -132,12 +124,12 @@ boolean method112(char var1) { } } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1780470681" + descriptor = "(IS)Z", + garbageValue = "9461" ) - boolean method113(int var1) { + boolean method123(int var1) { if (var1 >= 0 && var1 < 4) { return true; } else { @@ -146,28 +138,49 @@ boolean method113(int var1) { } } - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "534503383" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-1746840644" ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; + public static void method112(Applet var0, String var1) { + class31.field85 = var0; + if (var1 != null) { + class31.field86 = var1; } + } - @ObfuscatedName("ai") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-376109619" + descriptor = "(Lnh;I)V", + garbageValue = "-1843378433" ) - static void method114(int var0) { - GameEngine.method166(14); - Login.field748 = var0; + public static void method110(Huffman var0) { + class350.huffman = var0; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "70" + ) + static int method114(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else if (var1 == -1) { + return 0; + } else { + int var3 = 0; + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; + } + } + + return var3; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class274.java b/osrs/src/main/java/class274.java deleted file mode 100644 index e875248a9..000000000 --- a/osrs/src/main/java/class274.java +++ /dev/null @@ -1,149 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ks") -public class class274 implements WorldMapSection { - @ObfuscatedName("cx") - static int field2399; - @ObfuscatedName("ac") - int field2401; - @ObfuscatedName("al") - int field2404; - @ObfuscatedName("ak") - int field2403; - @ObfuscatedName("ax") - int field2409; - @ObfuscatedName("ao") - int field2406; - @ObfuscatedName("ah") - int field2402; - @ObfuscatedName("ar") - int field2407; - @ObfuscatedName("ab") - int field2400; - @ObfuscatedName("am") - int field2405; - @ObfuscatedName("av") - int field2408; - - class274() { - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lkz;I)V", - garbageValue = "1844466074" - ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2406) { - var1.regionLowX = this.field2406; - } - - if (var1.regionHighX < this.field2406) { - var1.regionHighX = this.field2406; - } - - if (var1.regionLowY > this.field2402) { - var1.regionLowY = this.field2402; - } - - if (var1.regionHighY < this.field2402) { - var1.regionHighY = this.field2402; - } - - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1135530948" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field2401 && var1 < this.field2401 + this.field2404) { - return var2 >= (this.field2403 << 6) + (this.field2407 << 3) && var2 <= (this.field2403 << 6) + (this.field2407 << 3) + 7 && var3 >= (this.field2409 << 6) + (this.field2400 << 3) && var3 <= (this.field2409 << 6) + (this.field2400 << 3) + 7; - } else { - return false; - } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1124460333" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field2406 << 6) + (this.field2405 << 3) && var1 <= (this.field2406 << 6) + (this.field2405 << 3) + 7 && var2 >= (this.field2402 << 6) + (this.field2408 << 3) && var2 <= (this.field2402 << 6) + (this.field2408 << 3) + 7; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "557011185" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; - } else { - int[] var4 = new int[]{var2 + (this.field2406 * 64 - this.field2403 * 64) + (this.field2405 * 8 - this.field2407 * 8), var3 + (this.field2402 * 64 - this.field2409 * 64) + (this.field2408 * 8 - this.field2400 * 8)}; - return var4; - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(III)Lmo;", - garbageValue = "-1670709360" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } else { - int var3 = this.field2403 * 64 - this.field2406 * 64 + (this.field2407 * 8 - this.field2405 * 8) + var1; - int var4 = var2 + (this.field2409 * 64 - this.field2402 * 64) + (this.field2400 * 8 - this.field2408 * 8); - return new Coord(this.field2401, var3, var4); - } - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-801073373" - ) - @Export("read") - public void read(Buffer var1) { - this.field2401 = var1.readUnsignedByte(); - this.field2404 = var1.readUnsignedByte(); - this.field2403 = var1.readUnsignedShort(); - this.field2407 = var1.readUnsignedByte(); - this.field2409 = var1.readUnsignedShort(); - this.field2400 = var1.readUnsignedByte(); - this.field2406 = var1.readUnsignedShort(); - this.field2405 = var1.readUnsignedByte(); - this.field2402 = var1.readUnsignedShort(); - this.field2408 = var1.readUnsignedByte(); - this.method1535(); - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "54" - ) - void method1535() { - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1696512982" - ) - static int method1536(int var0) { - return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class275.java b/osrs/src/main/java/class275.java deleted file mode 100644 index ea21fff3f..000000000 --- a/osrs/src/main/java/class275.java +++ /dev/null @@ -1,41 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.ArrayList; - -@ObfuscatedName("kp") -public class class275 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lom;I)V", - garbageValue = "-770626975" - ) - public static void method1537(AbstractArchive var0) { - EnumComposition.EnumDefinition_archive = var0; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Ljava/util/ArrayList;IIIII)V", - garbageValue = "459181923" - ) - public static void method1538(ArrayList var0, int var1, int var2, int var3, int var4) { - class319.field2789.clear(); - class319.field2789.addAll(var0); - MouseHandler.method177(var1, var2, var3, var4); - } - - @ObfuscatedName("mv") - @ObfuscatedSignature( - descriptor = "(Lnm;I)Lnm;", - garbageValue = "1424851041" - ) - static Widget method1539(Widget var0) { - Widget var1 = class212.method1045(var0); - if (var1 == null) { - var1 = var0.parent; - } - - return var1; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class28.java b/osrs/src/main/java/class28.java index 52bac12be..86ce9c82f 100644 --- a/osrs/src/main/java/class28.java +++ b/osrs/src/main/java/class28.java @@ -2,41 +2,100 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("by") +@ObfuscatedName("bl") public class class28 { - @ObfuscatedName("ai") - @Export("ByteArrayPool_arrays") - public static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("dk") + @ObfuscatedName("bd") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("dc") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("nf") - @Export("menuX") - static int menuX; static { 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, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IB)Lds;", - garbageValue = "14" + descriptor = "(IB)V", + garbageValue = "0" ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); if (var1 != null) { - return var1; - } else { - byte[] var2 = SongTask.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; + for (int var2 = 0; var2 < var1.ids.length; ++var2) { + var1.ids[var2] = -1; + var1.quantities[var2] = 0; + } + + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Lcr;I)V", + garbageValue = "-802183786" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + boolean var1 = var0.isMembersOnly(); + if (var1 != class129.ItemDefinition_inMembersWorld) { + ItemComposition.ItemDefinition_cached.clear(); + ItemComposition.HealthBarDefinition_cachedSprites.clear(); + ItemComposition.ItemDefinition_cachedSprites.clear(); + class129.ItemDefinition_inMembersWorld = var1; + } + } + + if (var0.properties != Client.worldProperties) { + Archive var3 = GrandExchangeOfferOwnWorldComparator.archive8; + int var2 = var0.properties; + if ((var2 & class522.field4160.rsOrdinal()) != 0) { + Login.logoSprite = class313.SpriteBuffer_getIndexedSpriteByName(var3, "logo_deadman_mode", ""); + } else if ((var2 & class522.field4161.rsOrdinal()) != 0) { + Login.logoSprite = class313.SpriteBuffer_getIndexedSpriteByName(var3, "logo_seasonal_mode", ""); + } else if ((var2 & class522.field4154.rsOrdinal()) != 0) { + Login.logoSprite = class313.SpriteBuffer_getIndexedSpriteByName(var3, "logo_speedrunning", ""); } else { - var1 = class224.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; + Login.logoSprite = class313.SpriteBuffer_getIndexedSpriteByName(var3, "logo", ""); } } + + Friend.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + ItemLayer.field2109 = var0.field679; + WorldMapCacheName.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + AbstractSocket.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; + class252.currentPort = WorldMapCacheName.worldPort; + } + + @ObfuscatedName("ls") + @ObfuscatedSignature( + descriptor = "(III)Ljava/lang/String;", + garbageValue = "-1398097704" + ) + static final String method126(int var0, int var1) { + int var2 = var1 - var0; + if (var2 < -9) { + return class167.colorStartTag(16711680); + } else if (var2 < -6) { + return class167.colorStartTag(16723968); + } else if (var2 < -3) { + return class167.colorStartTag(16740352); + } else if (var2 < 0) { + return class167.colorStartTag(16756736); + } else if (var2 > 9) { + return class167.colorStartTag(65280); + } else if (var2 > 6) { + return class167.colorStartTag(4259584); + } else if (var2 > 3) { + return class167.colorStartTag(8453888); + } else { + return var2 > 0 ? class167.colorStartTag(12648192) : class167.colorStartTag(16776960); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class257.java b/osrs/src/main/java/class283.java similarity index 88% rename from osrs/src/main/java/class257.java rename to osrs/src/main/java/class283.java index 85bfa6a3a..8d4fae3f5 100644 --- a/osrs/src/main/java/class257.java +++ b/osrs/src/main/java/class283.java @@ -2,16 +2,16 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") -public class class257 extends class242 { +@ObfuscatedName("kx") +public class class283 extends class268 { @ObfuscatedSignature( - descriptor = "(Ljb;)V" + descriptor = "(Lkh;)V" ) - class257(Clips var1) { + class283(Clips var1) { super(var1); } - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("vmethod1374") void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12) { int var13 = var5 - var4; @@ -45,8 +45,8 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var22 != 0) { int var23 = (var17 * var16 - var18 * var14 << 8) / var22; int var24 = (var18 * var13 - var17 * var15 << 8) / var22; - int[] var25 = super.field2059.Rasterizer3D_rowOffsets; - int var26 = super.field2059.field2281; + int[] var25 = super.field2230.Rasterizer3D_rowOffsets; + int var26 = super.field2230.field2449; if (var1 <= var2 && var1 <= var3) { if (var1 < var26) { if (var2 > var26) { @@ -87,7 +87,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var23); var6 += var21; var5 += var19; var10 += var24; @@ -95,7 +95,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); var6 += var21; var4 += var20; var10 += var24; @@ -115,7 +115,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var23); var6 += var21; var5 += var19; var10 += var24; @@ -123,7 +123,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); var6 += var21; var4 += var20; var10 += var24; @@ -159,7 +159,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var23); var6 += var19; var4 += var20; var10 += var24; @@ -167,7 +167,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var23); var5 += var21; var4 += var20; var10 += var24; @@ -187,7 +187,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var23); var6 += var19; var4 += var20; var10 += var24; @@ -195,7 +195,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var23); var5 += var21; var4 += var20; var10 += var24; @@ -244,7 +244,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var23); var4 += var20; var6 += var21; var11 += var24; @@ -252,7 +252,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); var4 += var20; var5 += var19; var11 += var24; @@ -272,7 +272,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var23); var4 += var20; var6 += var21; var11 += var24; @@ -280,7 +280,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); var4 += var20; var5 += var19; var11 += var24; @@ -316,7 +316,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var23); var4 += var21; var5 += var19; var11 += var24; @@ -324,7 +324,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var23); var6 += var20; var5 += var19; var11 += var24; @@ -344,7 +344,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var23); var4 += var21; var5 += var19; var11 += var24; @@ -352,7 +352,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var23); var6 += var20; var5 += var19; var11 += var24; @@ -400,7 +400,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var23); var5 += var19; var4 += var20; var12 += var24; @@ -408,7 +408,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); var5 += var19; var6 += var21; var12 += var24; @@ -428,7 +428,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var23); var5 += var19; var4 += var20; var12 += var24; @@ -436,7 +436,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); var5 += var19; var6 += var21; var12 += var24; @@ -472,7 +472,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var23); var5 += var20; var6 += var21; var12 += var24; @@ -480,7 +480,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var23); var4 += var19; var6 += var21; var12 += var24; @@ -500,7 +500,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var23); var5 += var20; var6 += var21; var12 += var24; @@ -508,7 +508,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1393(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var23); + this.method1571(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var23); var4 += var19; var6 += var21; var12 += var24; @@ -520,7 +520,7 @@ void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("vmethod1366") void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10) { int var11 = 0; @@ -538,8 +538,8 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo var13 = (var4 - var6 << 14) / (var1 - var3); } - int[] var14 = super.field2059.Rasterizer3D_rowOffsets; - int var15 = super.field2059.field2281; + int[] var14 = super.field2230.Rasterizer3D_rowOffsets; + int var15 = super.field2230.field2449; if (var1 <= var2 && var1 <= var3) { if (var1 < var15) { if (var2 > var15) { @@ -578,14 +578,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14); var6 += var13; var5 += var12; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); var6 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -604,14 +604,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14); var6 += var13; var5 += var12; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); var6 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -645,14 +645,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14); var6 += var12; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14); var5 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -671,14 +671,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14); var6 += var12; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14); var5 += var13; var4 += var11; var1 += Rasterizer2D.Rasterizer2D_width; @@ -724,14 +724,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14); var4 += var11; var6 += var13; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); var4 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -750,14 +750,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14); var4 += var11; var6 += var13; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); var4 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -791,14 +791,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14); var4 += var13; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14); var6 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -817,14 +817,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14); var4 += var13; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14); var6 += var11; var5 += var12; var2 += Rasterizer2D.Rasterizer2D_width; @@ -869,14 +869,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14); var5 += var12; var4 += var11; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); var5 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -895,14 +895,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14); var5 += var12; var4 += var11; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); var5 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -936,14 +936,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14); var5 += var11; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14); var4 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -962,14 +962,14 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14); var5 += var11; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; } } - this.method1395(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14); + this.method1573(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14); var4 += var12; var6 += var13; var3 += Rasterizer2D.Rasterizer2D_width; @@ -979,16 +979,16 @@ void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("ab") + @ObfuscatedName("ac") void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2059.Rasterizer3D_textureLoader.getTexturePixels(var22); + int[] var23 = super.field2230.Rasterizer3D_textureLoader.getTexturePixels(var22); int var24; if (var23 == null) { - var24 = super.field2059.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class242.method1268(var24, var10), class242.method1268(var24, var11), class242.method1268(var24, var12)); + var24 = super.field2230.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class268.method1447(var24, var10), class268.method1447(var24, var11), class268.method1447(var24, var12)); } else { - super.field2057 = super.field2059.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2056 = super.field2059.Rasterizer3D_textureLoader.vmethod3989(var22); + super.field2227 = super.field2230.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2228 = super.field2230.Rasterizer3D_textureLoader.vmethod3989(var22); var24 = var5 - var4; int var25 = var2 - var1; int var26 = var6 - var4; @@ -1014,7 +1014,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var33 != 0) { int var34 = (var28 * var27 - var29 * var25 << 9) / var33; int var35 = (var29 * var24 - var28 * var26 << 9) / var33; - int var36 = super.field2059.field2290; + int var36 = super.field2230.field2458; var14 = var13 - var14; var17 = var16 - var17; var20 = var19 - var20; @@ -1030,8 +1030,8 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo int var43 = var17 * var15 - var18 * var14 << 14; int var44 = (int)(((long)(var18 * var20 - var17 * var21) << 3 << 14) / (long)var36); int var45 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var36); - int[] var46 = super.field2059.Rasterizer3D_rowOffsets; - int var47 = super.field2059.field2281; + int[] var46 = super.field2230.Rasterizer3D_rowOffsets; + int var47 = super.field2230.field2449; int var48; if (var1 <= var2 && var1 <= var3) { if (var1 < var47) { @@ -1059,7 +1059,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var48 = var1 - super.field2059.field2287; + var48 = var1 - super.field2230.field2453; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1077,7 +1077,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1088,7 +1088,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1111,7 +1111,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1122,7 +1122,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1147,7 +1147,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var48 = var1 - super.field2059.field2287; + var48 = var1 - super.field2230.field2453; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1165,7 +1165,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1176,7 +1176,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1199,7 +1199,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1210,7 +1210,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1248,7 +1248,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var3 = 0; } - var48 = var2 - super.field2059.field2287; + var48 = var2 - super.field2230.field2453; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1266,7 +1266,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1277,7 +1277,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1300,7 +1300,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1311,7 +1311,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1336,7 +1336,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var48 = var2 - super.field2059.field2287; + var48 = var2 - super.field2230.field2453; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1354,7 +1354,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -1365,7 +1365,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -1388,7 +1388,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -1399,7 +1399,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -1436,7 +1436,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var1 = 0; } - var48 = var3 - super.field2059.field2287; + var48 = var3 - super.field2230.field2453; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1454,7 +1454,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -1465,7 +1465,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -1488,7 +1488,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -1499,7 +1499,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -1524,7 +1524,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo var2 = 0; } - var48 = var3 - super.field2059.field2287; + var48 = var3 - super.field2230.field2453; var37 += var39 * var48; var40 += var42 * var48; var43 += var45 * var48; @@ -1542,7 +1542,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -1553,7 +1553,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -1576,7 +1576,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -1587,7 +1587,7 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1397(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1575(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -1603,16 +1603,16 @@ void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - @ObfuscatedName("am") + @ObfuscatedName("al") void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { - int[] var23 = super.field2059.Rasterizer3D_textureLoader.getTexturePixels(var22); + int[] var23 = super.field2230.Rasterizer3D_textureLoader.getTexturePixels(var22); int var24; if (var23 == null) { - var24 = super.field2059.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); - this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class242.method1268(var24, var10), class242.method1268(var24, var11), class242.method1268(var24, var12)); + var24 = super.field2230.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class268.method1447(var24, var10), class268.method1447(var24, var11), class268.method1447(var24, var12)); } else { - super.field2057 = super.field2059.Rasterizer3D_textureLoader.isLowDetail(var22); - super.field2056 = super.field2059.Rasterizer3D_textureLoader.vmethod3989(var22); + super.field2227 = super.field2230.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2228 = super.field2230.Rasterizer3D_textureLoader.vmethod3989(var22); var24 = var5 - var4; int var25 = var2 - var1; int var26 = var6 - var4; @@ -1638,7 +1638,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo if (var33 != 0) { int var34 = (var28 * var27 - var29 * var25 << 9) / var33; int var35 = (var29 * var24 - var28 * var26 << 9) / var33; - int var36 = super.field2059.field2290; + int var36 = super.field2230.field2458; var14 = var13 - var14; var17 = var16 - var17; var20 = var19 - var20; @@ -1654,9 +1654,9 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo int var43 = var17 * var15 - var18 * var14 << 14; int var44 = (int)(((long)(var18 * var20 - var17 * var21) << 14) / (long)var36); int var45 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var36); - int[] var46 = super.field2059.Rasterizer3D_rowOffsets; - int var47 = super.field2059.field2281; - int var48 = super.field2059.field2287; + int[] var46 = super.field2230.Rasterizer3D_rowOffsets; + int var47 = super.field2230.field2449; + int var48 = super.field2230.field2453; int var49; if (var1 <= var2 && var1 <= var3) { if (var1 < var47) { @@ -1702,7 +1702,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1713,7 +1713,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1736,7 +1736,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var5 += var31; var10 += var35; @@ -1747,7 +1747,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var32; var4 += var30; var10 += var35; @@ -1790,7 +1790,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1801,7 +1801,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1824,7 +1824,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var6 += var31; var4 += var30; var10 += var35; @@ -1835,7 +1835,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var37, var40, var43, var38, var41, var44); var5 += var32; var4 += var30; var10 += var35; @@ -1891,7 +1891,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1902,7 +1902,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1925,7 +1925,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var6 += var32; var11 += var35; @@ -1936,7 +1936,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var30; var5 += var31; var11 += var35; @@ -1979,7 +1979,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -1990,7 +1990,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -2013,7 +2013,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var4 += var32; var5 += var31; var11 += var35; @@ -2024,7 +2024,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var37, var40, var43, var38, var41, var44); var6 += var30; var5 += var31; var11 += var35; @@ -2079,7 +2079,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -2090,7 +2090,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -2113,7 +2113,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var4 += var30; var12 += var35; @@ -2124,7 +2124,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var31; var6 += var32; var12 += var35; @@ -2167,7 +2167,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -2178,7 +2178,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -2201,7 +2201,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo return; } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var5 += var30; var6 += var32; var12 += var35; @@ -2212,7 +2212,7 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } } - this.method1399(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); + this.method1577(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var37, var40, var43, var38, var41, var44); var4 += var31; var6 += var32; var12 += var35; @@ -2229,10 +2229,10 @@ void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, flo } @ObfuscatedName("bv") - final void method1393(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - if (super.field2059.field2278) { - if (var6 > super.field2059.field2285) { - var6 = super.field2059.field2285; + final void method1571(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + if (super.field2230.field2446) { + if (var6 > super.field2230.field2455) { + var6 = super.field2230.field2455; } if (var5 < 0) { @@ -2247,14 +2247,14 @@ final void method1393(int[] var1, int var2, int var3, int var4, int var5, int va int var10; int var11; int var12; - if (super.field2059.field2289) { + if (super.field2230.field2457) { var4 = var6 - var5 >> 2; var8 <<= 2; - if (super.field2059.field2282 == 0) { + if (super.field2230.field2452 == 0) { if (var4 > 0) { do { var9 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2058[var9]; + var3 = super.field2229[var9]; var7 += var8; var1[var2++] = var3; var1[var2++] = var3; @@ -2267,7 +2267,7 @@ final void method1393(int[] var1, int var2, int var3, int var4, int var5, int va var4 = var6 - var5 & 3; if (var4 > 0) { var9 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2058[var9]; + var3 = super.field2229[var9]; do { var1[var2++] = var3; @@ -2275,12 +2275,12 @@ final void method1393(int[] var1, int var2, int var3, int var4, int var5, int va } while(var4 > 0); } } else { - var9 = super.field2059.field2282; - var10 = 256 - super.field2059.field2282; + var9 = super.field2230.field2452; + var10 = 256 - super.field2230.field2452; if (var4 > 0) { do { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2058[var11]; + var3 = super.field2229[var11]; var7 += var8; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); var12 = var1[var2]; @@ -2298,7 +2298,7 @@ final void method1393(int[] var1, int var2, int var3, int var4, int var5, int va var4 = var6 - var5 & 3; if (var4 > 0) { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2058[var11]; + var3 = super.field2229[var11]; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); do { @@ -2311,20 +2311,20 @@ final void method1393(int[] var1, int var2, int var3, int var4, int var5, int va } else { var4 = var6 - var5; - if (super.field2059.field2282 == 0) { + if (super.field2230.field2452 == 0) { do { var9 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var1[var2++] = super.field2058[var9]; + var1[var2++] = super.field2229[var9]; var7 += var8; --var4; } while(var4 > 0); } else { - var9 = super.field2059.field2282; - var10 = 256 - super.field2059.field2282; + var9 = super.field2230.field2452; + var10 = 256 - super.field2230.field2452; do { var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; - var3 = super.field2058[var11]; + var3 = super.field2229[var11]; var7 += var8; var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); var12 = var1[var2]; @@ -2337,11 +2337,11 @@ final void method1393(int[] var1, int var2, int var3, int var4, int var5, int va } } - @ObfuscatedName("ba") - void method1395(int[] var1, int var2, int var3, int var4, int var5, int var6) { - if (super.field2059.field2278) { - if (var6 > super.field2059.field2285) { - var6 = super.field2059.field2285; + @ObfuscatedName("bf") + void method1573(int[] var1, int var2, int var3, int var4, int var5, int var6) { + if (super.field2230.field2446) { + if (var6 > super.field2230.field2455) { + var6 = super.field2230.field2455; } if (var5 < 0) { @@ -2352,8 +2352,8 @@ void method1395(int[] var1, int var2, int var3, int var4, int var5, int var6) { if (var5 < var6) { var2 += var5; var4 = var6 - var5 >> 2; - if (super.field2059.field2282 != 0) { - if (super.field2059.field2282 == 254) { + if (super.field2230.field2452 != 0) { + if (super.field2230.field2452 == 254) { while (true) { --var4; if (var4 < 0) { @@ -2375,8 +2375,8 @@ void method1395(int[] var1, int var2, int var3, int var4, int var5, int var6) { var1[var2++] = var1[var2]; } } else { - int var7 = super.field2059.field2282; - int var8 = 256 - super.field2059.field2282; + int var7 = super.field2230.field2452; + int var8 = 256 - super.field2230.field2452; var3 = ((var3 & 16711935) * var8 >> 8 & 16711935) + (var8 * (var3 & 65280) >> 8 & 65280); while (true) { @@ -2431,11 +2431,11 @@ void method1395(int[] var1, int var2, int var3, int var4, int var5, int var6) { } } - @ObfuscatedName("bz") - void method1397(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { - if (super.field2059.field2278) { - if (var7 > super.field2059.field2285) { - var7 = super.field2059.field2285; + @ObfuscatedName("bg") + void method1575(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + if (super.field2230.field2446) { + if (var7 > super.field2230.field2455) { + var7 = super.field2230.field2455; } if (var6 < 0) { @@ -2456,8 +2456,8 @@ void method1397(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var22; int var23; int var24; - if (super.field2057) { - var24 = var6 - super.field2059.field2284; + if (super.field2227) { + var24 = var6 - super.field2230.field2454; var10 += (var13 >> 3) * var24; var11 += var24 * (var14 >> 3); var12 += (var15 >> 3) * var24; @@ -2497,7 +2497,7 @@ void method1397(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2056) { + if (super.field2228) { if (var18 > 0) { do { var4 = var2[(var3 & 4032) + (var3 >>> 26)]; @@ -2652,7 +2652,7 @@ void method1397(int[] var1, int[] var2, int var3, int var4, int var5, int var6, } } } else { - var24 = var6 - super.field2059.field2284; + var24 = var6 - super.field2230.field2454; var10 += (var13 >> 3) * var24; var11 += var24 * (var14 >> 3); var12 += (var15 >> 3) * var24; @@ -2692,7 +2692,7 @@ void method1397(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2056) { + if (super.field2228) { if (var18 > 0) { do { var4 = var2[(var3 & 16256) + (var3 >>> 25)]; @@ -2851,11 +2851,11 @@ void method1397(int[] var1, int[] var2, int var3, int var4, int var5, int var6, } } - @ObfuscatedName("bb") - void method1399(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { - if (super.field2059.field2278) { - if (var7 > super.field2059.field2285) { - var7 = super.field2059.field2285; + @ObfuscatedName("ba") + void method1577(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + if (super.field2230.field2446) { + if (var7 > super.field2230.field2455) { + var7 = super.field2230.field2455; } if (var6 < 0) { @@ -2875,8 +2875,8 @@ void method1399(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var22; int var23; int var24; - if (super.field2057) { - var24 = var6 - super.field2059.field2284; + if (super.field2227) { + var24 = var6 - super.field2230.field2454; var10 += var13 * var24; var11 += var24 * var14; var12 += var24 * var15; @@ -2906,7 +2906,7 @@ void method1399(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2056) { + if (super.field2228) { if (var18 > 0) { do { var4 = var2[(var3 & 4032) + (var3 >>> 26)]; @@ -3019,7 +3019,7 @@ void method1399(int[] var1, int[] var2, int var3, int var4, int var5, int var6, } } } else { - var24 = var6 - super.field2059.field2284; + var24 = var6 - super.field2230.field2454; var10 += var13 * var24; var11 += var24 * var14; var12 += var24 * var15; @@ -3049,7 +3049,7 @@ void method1399(int[] var1, int[] var2, int var3, int var4, int var5, int var6, var18 >>= 3; var9 <<= 3; var16 = var8 >> 8; - if (super.field2056) { + if (super.field2228) { if (var18 > 0) { do { var4 = var2[(var3 & 16256) + (var3 >>> 25)]; diff --git a/osrs/src/main/java/class284.java b/osrs/src/main/java/class284.java deleted file mode 100644 index 00cb206bf..000000000 --- a/osrs/src/main/java/class284.java +++ /dev/null @@ -1,49 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ku") -public class class284 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - static final class284 field2464; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - static final class284 field2465; - @ObfuscatedName("am") - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("ak") - final int field2466; - - static { - field2464 = new class284(0); - field2465 = new class284(1); - } - - class284(int var1) { - this.field2466 = var1; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "102" - ) - static final void method1572() { - class436.method2211("Your ignore list is full. Max of 100 for free users, and 400 for members"); - } - - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "(B)Lit;", - garbageValue = "-33" - ) - public static class226 method1573() { - return Client.keyHandlerInstance; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class285.java b/osrs/src/main/java/class285.java index 462b09a1d..9cef030fc 100644 --- a/osrs/src/main/java/class285.java +++ b/osrs/src/main/java/class285.java @@ -1,27 +1,3413 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") -public class class285 { - @ObfuscatedName("ac") +@ObfuscatedName("kk") +public class class285 extends class268 { @ObfuscatedSignature( - descriptor = "Lki;" + descriptor = "(Lkh;)V" ) - static final class285 field2467; + class285(Clips var1) { + super(var1); + } + + @ObfuscatedName("au") + @Export("vmethod1374") + void vmethod1374(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12) { + int var13 = var5 - var4; + int var14 = var2 - var1; + int var15 = var6 - var4; + int var16 = var3 - var1; + int var17 = var11 - var10; + int var18 = var12 - var10; + float var19 = var8 - var7; + float var20 = var9 - var7; + int var21; + if (var3 != var2) { + var21 = (var6 - var5 << 14) / (var3 - var2); + } else { + var21 = 0; + } + + int var22; + if (var2 != var1) { + var22 = (var13 << 14) / var14; + } else { + var22 = 0; + } + + int var23; + if (var3 != var1) { + var23 = (var15 << 14) / var16; + } else { + var23 = 0; + } + + int var24 = var13 * var16 - var15 * var14; + if (var24 != 0) { + int var25 = (var17 * var16 - var18 * var14 << 8) / var24; + int var26 = (var18 * var13 - var17 * var15 << 8) / var24; + float var27 = (var19 * (float)var16 - var20 * (float)var14) / (float)var24; + float var28 = (var20 * (float)var13 - var19 * (float)var15) / (float)var24; + int[] var29 = super.field2230.Rasterizer3D_rowOffsets; + int var30 = super.field2230.field2449; + if (var1 <= var2 && var1 <= var3) { + if (var1 < var30) { + if (var2 > var30) { + var2 = var30; + } + + if (var3 > var30) { + var3 = var30; + } + + var10 = var25 + ((var10 << 8) - var25 * var4); + var7 = var7 - var27 * (float)var4 + var27; + if (var2 < var3) { + var6 = var4 <<= 14; + if (var1 < 0) { + var6 -= var23 * var1; + var4 -= var22 * var1; + var10 -= var26 * var1; + var7 -= var28 * (float)var1; + var1 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var21 * var2; + var2 = 0; + } + + if (var2 != var1 && var23 < var22 || var2 == var1 && var23 > var21) { + var3 -= var2; + var2 -= var1; + var1 = var29[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var5 >> 14, var10, var25, var7, var27); + var6 += var23; + var5 += var21; + var10 += var26; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); + var6 += var23; + var4 += var22; + var10 += var26; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var28; + } + } else { + var3 -= var2; + var2 -= var1; + var1 = var29[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var6 >> 14, var10, var25, var7, var27); + var6 += var23; + var5 += var21; + var10 += var26; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); + var6 += var23; + var4 += var22; + var10 += var26; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var28; + } + } + } else { + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var23 * var1; + var4 -= var22 * var1; + var10 -= var26 * var1; + var7 -= var28 * (float)var1; + var1 = 0; + } + + var6 <<= 14; + if (var3 < 0) { + var6 -= var3 * var21; + var3 = 0; + } + + if (var3 != var1 && var23 < var22 || var3 == var1 && var21 > var22) { + var2 -= var3; + var3 -= var1; + var1 = var29[var1]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var6 >> 14, var4 >> 14, var10, var25, var7, var27); + var6 += var21; + var4 += var22; + var10 += var26; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var10, var25, var7, var27); + var5 += var23; + var4 += var22; + var10 += var26; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var28; + } + } else { + var2 -= var3; + var3 -= var1; + var1 = var29[var1]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var6 >> 14, var10, var25, var7, var27); + var6 += var21; + var4 += var22; + var10 += var26; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var10, var25, var7, var27); + var5 += var23; + var4 += var22; + var10 += var26; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var28; + } + } + } + } + } else if (var2 <= var3) { + if (var2 < var30) { + if (var3 > var30) { + var3 = var30; + } + + if (var1 > var30) { + var1 = var30; + } + + var11 = (var11 << 8) - var5 * var25 + var25; + var8 = var8 - var27 * (float)var5 + var27; + if (var3 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var22 * var2; + var5 -= var21 * var2; + var11 -= var26 * var2; + var8 -= var28 * (float)var2; + var2 = 0; + } + + var6 <<= 14; + if (var3 < 0) { + var6 -= var3 * var23; + var3 = 0; + } + + if (var3 != var2 && var22 < var21 || var3 == var2 && var22 > var23) { + var1 -= var3; + var3 -= var2; + var2 = var29[var2]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var6 >> 14, var11, var25, var8, var27); + var4 += var22; + var6 += var23; + var11 += var26; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); + var4 += var22; + var5 += var21; + var11 += var26; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var28; + } + } else { + var1 -= var3; + var3 -= var2; + var2 = var29[var2]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var4 >> 14, var11, var25, var8, var27); + var4 += var22; + var6 += var23; + var11 += var26; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); + var4 += var22; + var5 += var21; + var11 += var26; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var28; + } + } + } else { + var6 = var5 <<= 14; + if (var2 < 0) { + var6 -= var22 * var2; + var5 -= var21 * var2; + var11 -= var26 * var2; + var8 -= var28 * (float)var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var23 * var1; + var1 = 0; + } + + if (var22 < var21) { + var3 -= var1; + var1 -= var2; + var2 = var29[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var11, var25, var8, var27); + var4 += var23; + var5 += var21; + var11 += var26; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var6 >> 14, var5 >> 14, var11, var25, var8, var27); + var6 += var22; + var5 += var21; + var11 += var26; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var28; + } + } else { + var3 -= var1; + var1 -= var2; + var2 = var29[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var11, var25, var8, var27); + var4 += var23; + var5 += var21; + var11 += var26; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var6 >> 14, var11, var25, var8, var27); + var6 += var22; + var5 += var21; + var11 += var26; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var28; + } + } + } + } + } else if (var3 < var30) { + if (var1 > var30) { + var1 = var30; + } + + if (var2 > var30) { + var2 = var30; + } + + var12 = var25 + ((var12 << 8) - var25 * var6); + var9 = var9 - var27 * (float)var6 + var27; + if (var1 < var2) { + var5 = var6 <<= 14; + if (var3 < 0) { + var5 -= var3 * var21; + var6 -= var3 * var23; + var12 -= var3 * var26; + var9 -= var28 * (float)var3; + var3 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var22 * var1; + var1 = 0; + } + + if (var21 < var23) { + var2 -= var1; + var1 -= var3; + var3 = var29[var3]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var4 >> 14, var12, var25, var9, var27); + var5 += var21; + var4 += var22; + var12 += var26; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); + var5 += var21; + var6 += var23; + var12 += var26; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var28; + } + } else { + var2 -= var1; + var1 -= var3; + var3 = var29[var3]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var5 >> 14, var12, var25, var9, var27); + var5 += var21; + var4 += var22; + var12 += var26; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); + var5 += var21; + var6 += var23; + var12 += var26; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var28; + } + } + } else { + var4 = var6 <<= 14; + if (var3 < 0) { + var4 -= var3 * var21; + var6 -= var3 * var23; + var12 -= var3 * var26; + var9 -= var28 * (float)var3; + var3 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var22 * var2; + var2 = 0; + } + + if (var21 < var23) { + var1 -= var2; + var2 -= var3; + var3 = var29[var3]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var5 >> 14, var6 >> 14, var12, var25, var9, var27); + var5 += var22; + var6 += var23; + var12 += var26; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var4 >> 14, var6 >> 14, var12, var25, var9, var27); + var4 += var21; + var6 += var23; + var12 += var26; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var28; + } + } else { + var1 -= var2; + var2 -= var3; + var3 = var29[var3]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var5 >> 14, var12, var25, var9, var27); + var5 += var22; + var6 += var23; + var12 += var26; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var28; + } + } + + this.method1586(Rasterizer2D.Rasterizer2D_pixels, var3, 0, 0, var6 >> 14, var4 >> 14, var12, var25, var9, var27); + var4 += var21; + var6 += var23; + var12 += var26; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var28; + } + } + } + } + } + } + + @ObfuscatedName("aa") + @Export("vmethod1366") + void vmethod1366(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10) { + int var11 = var5 - var4; + int var12 = var2 - var1; + int var13 = var6 - var4; + int var14 = var3 - var1; + float var15 = var8 - var7; + float var16 = var9 - var7; + int var17; + if (var3 != var2) { + var17 = (var6 - var5 << 14) / (var3 - var2); + } else { + var17 = 0; + } + + int var18; + if (var2 != var1) { + var18 = (var11 << 14) / var12; + } else { + var18 = 0; + } + + int var19; + if (var3 != var1) { + var19 = (var13 << 14) / var14; + } else { + var19 = 0; + } + + int var20 = var11 * var14 - var13 * var12; + if (var20 != 0) { + float var21 = (var15 * (float)var14 - var16 * (float)var12) / (float)var20; + float var22 = (var16 * (float)var11 - var15 * (float)var13) / (float)var20; + int[] var23 = super.field2230.Rasterizer3D_rowOffsets; + int var24 = super.field2230.field2449; + if (var1 <= var2 && var1 <= var3) { + if (var1 < var24) { + if (var2 > var24) { + var2 = var24; + } + + if (var3 > var24) { + var3 = var24; + } + + var7 = var7 - var21 * (float)var4 + var21; + if (var2 < var3) { + var6 = var4 <<= 14; + if (var1 < 0) { + var6 -= var19 * var1; + var4 -= var18 * var1; + var7 -= var22 * (float)var1; + var1 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var17 * var2; + var2 = 0; + } + + if (var2 != var1 && var19 < var18 || var2 == var1 && var19 > var17) { + var3 -= var2; + var2 -= var1; + var1 = var23[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var5 >> 14, var7, var21); + var6 += var19; + var5 += var17; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); + var6 += var19; + var4 += var18; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var22; + } + } else { + var3 -= var2; + var2 -= var1; + var1 = var23[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var6 >> 14, var7, var21); + var6 += var19; + var5 += var17; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); + var6 += var19; + var4 += var18; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var22; + } + } + } else { + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var19 * var1; + var4 -= var18 * var1; + var7 -= var22 * (float)var1; + var1 = 0; + } + + var6 <<= 14; + if (var3 < 0) { + var6 -= var3 * var17; + var3 = 0; + } + + if (var3 != var1 && var19 < var18 || var3 == var1 && var17 > var18) { + var2 -= var3; + var3 -= var1; + var1 = var23[var1]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var6 >> 14, var4 >> 14, var7, var21); + var6 += var17; + var4 += var18; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var5 >> 14, var4 >> 14, var7, var21); + var5 += var19; + var4 += var18; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var22; + } + } else { + var2 -= var3; + var3 -= var1; + var1 = var23[var1]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var6 >> 14, var7, var21); + var6 += var17; + var4 += var18; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var1, var10, 0, var4 >> 14, var5 >> 14, var7, var21); + var5 += var19; + var4 += var18; + var1 += Rasterizer2D.Rasterizer2D_width; + var7 += var22; + } + } + } + } + } else if (var2 <= var3) { + if (var2 < var24) { + if (var3 > var24) { + var3 = var24; + } + + if (var1 > var24) { + var1 = var24; + } + + var8 = var8 - var21 * (float)var5 + var21; + if (var3 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var18 * var2; + var5 -= var17 * var2; + var8 -= var22 * (float)var2; + var2 = 0; + } + + var6 <<= 14; + if (var3 < 0) { + var6 -= var3 * var19; + var3 = 0; + } + + if (var3 != var2 && var18 < var17 || var3 == var2 && var18 > var19) { + var1 -= var3; + var3 -= var2; + var2 = var23[var2]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var6 >> 14, var8, var21); + var4 += var18; + var6 += var19; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); + var4 += var18; + var5 += var17; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var22; + } + } else { + var1 -= var3; + var3 -= var2; + var2 = var23[var2]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var4 >> 14, var8, var21); + var4 += var18; + var6 += var19; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); + var4 += var18; + var5 += var17; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var22; + } + } + } else { + var6 = var5 <<= 14; + if (var2 < 0) { + var6 -= var18 * var2; + var5 -= var17 * var2; + var8 -= var22 * (float)var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var19 * var1; + var1 = 0; + } + + if (var18 < var17) { + var3 -= var1; + var1 -= var2; + var2 = var23[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var4 >> 14, var5 >> 14, var8, var21); + var4 += var19; + var5 += var17; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var6 >> 14, var5 >> 14, var8, var21); + var6 += var18; + var5 += var17; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var22; + } + } else { + var3 -= var1; + var1 -= var2; + var2 = var23[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var4 >> 14, var8, var21); + var4 += var19; + var5 += var17; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var2, var10, 0, var5 >> 14, var6 >> 14, var8, var21); + var6 += var18; + var5 += var17; + var2 += Rasterizer2D.Rasterizer2D_width; + var8 += var22; + } + } + } + } + } else if (var3 < var24) { + if (var1 > var24) { + var1 = var24; + } + + if (var2 > var24) { + var2 = var24; + } + + var9 = var9 - var21 * (float)var6 + var21; + if (var1 < var2) { + var5 = var6 <<= 14; + if (var3 < 0) { + var5 -= var3 * var17; + var6 -= var3 * var19; + var9 -= var22 * (float)var3; + var3 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var18 * var1; + var1 = 0; + } + + if (var17 < var19) { + var2 -= var1; + var1 -= var3; + var3 = var23[var3]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var4 >> 14, var9, var21); + var5 += var17; + var4 += var18; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); + var5 += var17; + var6 += var19; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var22; + } + } else { + var2 -= var1; + var1 -= var3; + var3 = var23[var3]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var5 >> 14, var9, var21); + var5 += var17; + var4 += var18; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); + var5 += var17; + var6 += var19; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var22; + } + } + } else { + var4 = var6 <<= 14; + if (var3 < 0) { + var4 -= var3 * var17; + var6 -= var3 * var19; + var9 -= var22 * (float)var3; + var3 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var18 * var2; + var2 = 0; + } + + if (var17 < var19) { + var1 -= var2; + var2 -= var3; + var3 = var23[var3]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var5 >> 14, var6 >> 14, var9, var21); + var5 += var18; + var6 += var19; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var4 >> 14, var6 >> 14, var9, var21); + var4 += var17; + var6 += var19; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var22; + } + } else { + var1 -= var2; + var2 -= var3; + var3 = var23[var3]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var5 >> 14, var9, var21); + var5 += var18; + var6 += var19; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var22; + } + } + + this.method1588(Rasterizer2D.Rasterizer2D_pixels, var3, var10, 0, var6 >> 14, var4 >> 14, var9, var21); + var4 += var17; + var6 += var19; + var3 += Rasterizer2D.Rasterizer2D_width; + var9 += var22; + } + } + } + } + } + } + + @ObfuscatedName("ac") + @Export("vmethod1378") + void vmethod1378(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { + int[] var23 = super.field2230.Rasterizer3D_textureLoader.getTexturePixels(var22); + int var24; + if (var23 == null) { + var24 = super.field2230.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class268.method1447(var24, var10), class268.method1447(var24, var11), class268.method1447(var24, var12)); + } else { + super.field2227 = super.field2230.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2228 = super.field2230.Rasterizer3D_textureLoader.vmethod3989(var22); + var24 = var5 - var4; + int var25 = var2 - var1; + int var26 = var6 - var4; + int var27 = var3 - var1; + int var28 = var11 - var10; + int var29 = var12 - var10; + int var30 = 0; + if (var2 != var1) { + var30 = (var5 - var4 << 14) / (var2 - var1); + } + + int var31 = 0; + if (var3 != var2) { + var31 = (var6 - var5 << 14) / (var3 - var2); + } + + int var32 = 0; + if (var3 != var1) { + var32 = (var4 - var6 << 14) / (var1 - var3); + } + + int var33 = var24 * var27 - var26 * var25; + if (var33 != 0) { + int var34 = (var28 * var27 - var29 * var25 << 9) / var33; + int var35 = (var29 * var24 - var28 * var26 << 9) / var33; + float var36 = var8 - var7; + float var37 = var9 - var7; + float var38 = (var36 * (float)var27 - var37 * (float)var25) / (float)var33; + float var39 = (var37 * (float)var24 - var36 * (float)var26) / (float)var33; + int var40 = super.field2230.field2458; + var14 = var13 - var14; + var17 = var16 - var17; + var20 = var19 - var20; + var15 -= var13; + var18 -= var16; + var21 -= var19; + int var41 = var15 * var16 - var18 * var13 << 14; + int var42 = (int)(((long)(var18 * var19 - var16 * var21) << 3 << 14) / (long)var40); + int var43 = (int)(((long)(var13 * var21 - var19 * var15) << 14) / (long)var40); + int var44 = var16 * var14 - var13 * var17 << 14; + int var45 = (int)(((long)(var19 * var17 - var16 * var20) << 3 << 14) / (long)var40); + int var46 = (int)(((long)(var13 * var20 - var19 * var14) << 14) / (long)var40); + int var47 = var17 * var15 - var18 * var14 << 14; + int var48 = (int)(((long)(var18 * var20 - var17 * var21) << 3 << 14) / (long)var40); + int var49 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var40); + int[] var50 = super.field2230.Rasterizer3D_rowOffsets; + int var51 = super.field2230.field2449; + int var52; + if (var1 <= var2 && var1 <= var3) { + if (var1 < var51) { + if (var2 > var51) { + var2 = var51; + } + + if (var3 > var51) { + var3 = var51; + } + + var10 = var34 + ((var10 << 9) - var34 * var4); + var7 = var7 - var38 * (float)var4 + var38; + if (var2 < var3) { + var6 = var4 <<= 14; + if (var1 < 0) { + var6 -= var32 * var1; + var4 -= var30 * var1; + var10 -= var35 * var1; + var7 -= var39 * (float)var1; + var1 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var31 * var2; + var2 = 0; + } + + var52 = var1 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if ((var2 == var1 || var32 >= var30) && (var2 != var1 || var32 <= var31)) { + var3 -= var2; + var2 -= var1; + var1 = var50[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var32; + var5 += var31; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var32; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } else { + var3 -= var2; + var2 -= var1; + var1 = var50[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var32; + var5 += var31; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var32; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + } else { + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var32 * var1; + var4 -= var30 * var1; + var10 -= var35 * var1; + var7 -= var39 * (float)var1; + var1 = 0; + } + + var6 <<= 14; + if (var3 < 0) { + var6 -= var3 * var31; + var3 = 0; + } + + var52 = var1 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if (var3 != var1 && var32 < var30 || var3 == var1 && var31 > var30) { + var2 -= var3; + var3 -= var1; + var1 = var50[var1]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var31; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var5 += var32; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } else { + var2 -= var3; + var3 -= var1; + var1 = var50[var1]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var31; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var5 += var32; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + } + } + } else if (var2 <= var3) { + if (var2 < var51) { + if (var3 > var51) { + var3 = var51; + } + + if (var1 > var51) { + var1 = var51; + } + + var11 = var34 + ((var11 << 9) - var5 * var34); + var8 = var8 - var38 * (float)var5 + var38; + if (var3 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var30 * var2; + var5 -= var31 * var2; + var11 -= var35 * var2; + var8 -= var39 * (float)var2; + var2 = 0; + } + + var6 <<= 14; + if (var3 < 0) { + var6 -= var3 * var32; + var3 = 0; + } + + var52 = var2 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if ((var3 == var2 || var30 >= var31) && (var3 != var2 || var30 <= var32)) { + var1 -= var3; + var3 -= var2; + var2 = var50[var2]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var30; + var6 += var32; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var30; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } else { + var1 -= var3; + var3 -= var2; + var2 = var50[var2]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var30; + var6 += var32; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var30; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + } else { + var6 = var5 <<= 14; + if (var2 < 0) { + var6 -= var30 * var2; + var5 -= var31 * var2; + var11 -= var35 * var2; + var8 -= var39 * (float)var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var32 * var1; + var1 = 0; + } + + var52 = var2 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if (var30 < var31) { + var3 -= var1; + var1 -= var2; + var2 = var50[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var32; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var6 += var30; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } else { + var3 -= var1; + var1 -= var2; + var2 = var50[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var32; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var6 += var30; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + } + } + } else if (var3 < var51) { + if (var1 > var51) { + var1 = var51; + } + + if (var2 > var51) { + var2 = var51; + } + + var12 = (var12 << 9) - var34 * var6 + var34; + var9 = var9 - var38 * (float)var6 + var38; + if (var1 < var2) { + var5 = var6 <<= 14; + if (var3 < 0) { + var5 -= var3 * var31; + var6 -= var3 * var32; + var12 -= var3 * var35; + var9 -= var39 * (float)var3; + var3 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var30 * var1; + var1 = 0; + } + + var52 = var3 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if (var31 < var32) { + var2 -= var1; + var1 -= var3; + var3 = var50[var3]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var31; + var4 += var30; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var31; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } else { + var2 -= var1; + var1 -= var3; + var3 = var50[var3]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var31; + var4 += var30; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var31; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + } else { + var4 = var6 <<= 14; + if (var3 < 0) { + var4 -= var3 * var31; + var6 -= var3 * var32; + var12 -= var3 * var35; + var9 -= var39 * (float)var3; + var3 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var30 * var2; + var2 = 0; + } + + var52 = var3 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if (var31 < var32) { + var1 -= var2; + var2 -= var3; + var3 = var50[var3]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var30; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var4 += var31; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } else { + var1 -= var2; + var2 -= var3; + var3 = var50[var3]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var30; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + + this.method1595(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var4 += var31; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + } + } + } + } + } + @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lki;" - ) - static final class285 field2468; - @ObfuscatedName("ak") - final int field2469; + @Export("vmethod1362") + void vmethod1362(int var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8, float var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20, int var21, int var22) { + int[] var23 = super.field2230.Rasterizer3D_textureLoader.getTexturePixels(var22); + int var24; + if (var23 == null) { + var24 = super.field2230.Rasterizer3D_textureLoader.getAverageTextureRGB(var22); + this.vmethod1374(var1, var2, var3, var4, var5, var6, var7, var8, var9, class268.method1447(var24, var10), class268.method1447(var24, var11), class268.method1447(var24, var12)); + } else { + super.field2227 = super.field2230.Rasterizer3D_textureLoader.isLowDetail(var22); + super.field2228 = super.field2230.Rasterizer3D_textureLoader.vmethod3989(var22); + var24 = var5 - var4; + int var25 = var2 - var1; + int var26 = var6 - var4; + int var27 = var3 - var1; + int var28 = var11 - var10; + int var29 = var12 - var10; + int var30 = 0; + if (var2 != var1) { + var30 = (var5 - var4 << 14) / (var2 - var1); + } + + int var31 = 0; + if (var3 != var2) { + var31 = (var6 - var5 << 14) / (var3 - var2); + } + + int var32 = 0; + if (var3 != var1) { + var32 = (var4 - var6 << 14) / (var1 - var3); + } + + int var33 = var24 * var27 - var26 * var25; + if (var33 != 0) { + int var34 = (var28 * var27 - var29 * var25 << 9) / var33; + int var35 = (var29 * var24 - var28 * var26 << 9) / var33; + float var36 = var8 - var7; + float var37 = var9 - var7; + float var38 = (var36 * (float)var27 - var37 * (float)var25) / (float)var33; + float var39 = (var37 * (float)var24 - var36 * (float)var26) / (float)var33; + int var40 = super.field2230.field2458; + var14 = var13 - var14; + var17 = var16 - var17; + var20 = var19 - var20; + var15 -= var13; + var18 -= var16; + var21 -= var19; + int var41 = var15 * var16 - var18 * var13 << 14; + int var42 = (int)(((long)(var18 * var19 - var16 * var21) << 14) / (long)var40); + int var43 = (int)(((long)(var13 * var21 - var19 * var15) << 14) / (long)var40); + int var44 = var16 * var14 - var13 * var17 << 14; + int var45 = (int)(((long)(var19 * var17 - var16 * var20) << 14) / (long)var40); + int var46 = (int)(((long)(var13 * var20 - var19 * var14) << 14) / (long)var40); + int var47 = var17 * var15 - var18 * var14 << 14; + int var48 = (int)(((long)(var18 * var20 - var17 * var21) << 14) / (long)var40); + int var49 = (int)(((long)(var21 * var14 - var15 * var20) << 14) / (long)var40); + int[] var50 = super.field2230.Rasterizer3D_rowOffsets; + int var51 = super.field2230.field2449; + int var52; + if (var1 <= var2 && var1 <= var3) { + if (var1 < var51) { + if (var2 > var51) { + var2 = var51; + } + + if (var3 > var51) { + var3 = var51; + } + + var10 = var34 + ((var10 << 9) - var34 * var4); + var7 = var7 - var38 * (float)var4 + var38; + if (var2 < var3) { + var6 = var4 <<= 14; + if (var1 < 0) { + var6 -= var32 * var1; + var4 -= var30 * var1; + var7 -= var39 * (float)var1; + var10 -= var35 * var1; + var1 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var31 * var2; + var2 = 0; + } + + var52 = var1 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if ((var2 == var1 || var32 >= var30) && (var2 != var1 || var32 <= var31)) { + var3 -= var2; + var2 -= var1; + var1 = var50[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var32; + var5 += var31; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var32; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } else { + var3 -= var2; + var2 -= var1; + var1 = var50[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var32; + var5 += var31; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var32; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + } else { + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var32 * var1; + var4 -= var30 * var1; + var7 -= var39 * (float)var1; + var10 -= var35 * var1; + var1 = 0; + } + + var6 <<= 14; + if (var3 < 0) { + var6 -= var3 * var31; + var3 = 0; + } + + var52 = var1 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if (var3 != var1 && var32 < var30 || var3 == var1 && var31 > var30) { + var2 -= var3; + var3 -= var1; + var1 = var50[var1]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var6 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var31; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var5 >> 14, var4 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var5 += var32; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } else { + var2 -= var3; + var3 -= var1; + var1 = var50[var1]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var6 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var6 += var31; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var1, var4 >> 14, var5 >> 14, var10, var34, var7, var38, var41, var44, var47, var42, var45, var48); + var5 += var32; + var4 += var30; + var10 += var35; + var1 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var7 += var39; + } + } + } + } + } else if (var2 <= var3) { + if (var2 < var51) { + if (var3 > var51) { + var3 = var51; + } + + if (var1 > var51) { + var1 = var51; + } + + var11 = var34 + ((var11 << 9) - var5 * var34); + var8 = var8 - var38 * (float)var5 + var38; + if (var3 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var30 * var2; + var5 -= var31 * var2; + var8 -= var39 * (float)var2; + var11 -= var35 * var2; + var2 = 0; + } + + var6 <<= 14; + if (var3 < 0) { + var6 -= var3 * var32; + var3 = 0; + } + + var52 = var2 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if ((var3 == var2 || var30 >= var31) && (var3 != var2 || var30 <= var32)) { + var1 -= var3; + var3 -= var2; + var2 = var50[var2]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var30; + var6 += var32; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var30; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } else { + var1 -= var3; + var3 -= var2; + var2 = var50[var2]; + + while (true) { + --var3; + if (var3 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var30; + var6 += var32; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var30; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + } else { + var6 = var5 <<= 14; + if (var2 < 0) { + var6 -= var30 * var2; + var5 -= var31 * var2; + var8 -= var39 * (float)var2; + var11 -= var35 * var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var32 * var1; + var1 = 0; + } + + var52 = var2 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if (var30 < var31) { + var3 -= var1; + var1 -= var2; + var2 = var50[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var4 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var32; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var6 >> 14, var5 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var6 += var30; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } else { + var3 -= var1; + var1 -= var2; + var2 = var50[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var3; + if (var3 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var4 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var4 += var32; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var2, var5 >> 14, var6 >> 14, var11, var34, var8, var38, var41, var44, var47, var42, var45, var48); + var6 += var30; + var5 += var31; + var11 += var35; + var2 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var8 += var39; + } + } + } + } + } else if (var3 < var51) { + if (var1 > var51) { + var1 = var51; + } + + if (var2 > var51) { + var2 = var51; + } + + var12 = (var12 << 9) - var34 * var6 + var34; + var9 = var9 - var38 * (float)var6 + var38; + if (var1 < var2) { + var5 = var6 <<= 14; + if (var3 < 0) { + var5 -= var3 * var31; + var6 -= var3 * var32; + var9 -= var39 * (float)var3; + var12 -= var3 * var35; + var3 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var30 * var1; + var1 = 0; + } + + var52 = var3 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if (var31 < var32) { + var2 -= var1; + var1 -= var3; + var3 = var50[var3]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var31; + var4 += var30; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var31; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } else { + var2 -= var1; + var1 -= var3; + var3 = var50[var3]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var31; + var4 += var30; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var31; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + } else { + var4 = var6 <<= 14; + if (var3 < 0) { + var4 -= var3 * var31; + var6 -= var3 * var32; + var9 -= var39 * (float)var3; + var12 -= var3 * var35; + var3 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var30 * var2; + var2 = 0; + } + + var52 = var3 - super.field2230.field2453; + var41 += var43 * var52; + var44 += var46 * var52; + var47 += var49 * var52; + if (var31 < var32) { + var1 -= var2; + var2 -= var3; + var3 = var50[var3]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var5 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var30; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var4 >> 14, var6 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var4 += var31; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } else { + var1 -= var2; + var2 -= var3; + var3 = var50[var3]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } - static { - field2467 = new class285(0); - field2468 = new class285(1); + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var5 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var5 += var30; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + + this.method1597(Rasterizer2D.Rasterizer2D_pixels, var23, 0, 0, var3, var6 >> 14, var4 >> 14, var12, var34, var9, var38, var41, var44, var47, var42, var45, var48); + var4 += var31; + var6 += var32; + var12 += var35; + var3 += Rasterizer2D.Rasterizer2D_width; + var41 += var43; + var44 += var46; + var47 += var49; + var9 += var39; + } + } + } + } + } + } + } + + @ObfuscatedName("bv") + final void method1582(int[] var1, float[] var2, int var3, int var4, float var5) { + int var6 = method1590(var2[var3], var5) ? 1 : 0; + int var7 = 1 - var6; + var1[var3] = var7 * var1[var3] + var6 * var4; + var2[var3] = (float)var6 * var5 + (float)var7 * var2[var3]; + } + + @ObfuscatedName("bf") + final void method1583(int[] var1, float[] var2, int var3, int var4, float var5) { + if (method1590(var2[var3], var5)) { + int var6 = (var4 & (var4 >> 31 & 1) - 1) >> 8; + var1[var3] = super.field2229[var6]; + var2[var3] = var5; + } + + } + + @ObfuscatedName("bg") + final void method1584(int[] var1, float[] var2, int var3, int var4, int var5, float var6) { + if (method1590(var2[var3], var6)) { + int var7 = var1[var3]; + var1[var3] = ((var7 & 16711935) * var5 >> 8 & 16711935) + var4 + (var5 * (var7 & 65280) >> 8 & 65280); + } + + } + + @ObfuscatedName("ba") + final void method1585(int[] var1, float[] var2, int var3, int var4, int var5, int var6, float var7) { + if (method1590(var2[var3], var7)) { + int var8 = (var4 & (var4 >> 31 & 1) - 1) >> 8; + int var9 = super.field2229[var8]; + var9 = ((var9 & 65280) * var6 >> 8 & 65280) + ((var9 & 16711935) * var6 >> 8 & 16711935); + int var10 = var1[var3]; + var1[var3] = var9 + ((var10 & 16711935) * var5 >> 8 & 16711935) + (var5 * (var10 & 65280) >> 8 & 65280); + } + + } + + @ObfuscatedName("bm") + final void method1586(int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, float var9, float var10) { + if (super.field2230.field2446) { + if (var6 > super.field2230.field2455) { + var6 = super.field2230.field2455; + } + + if (var5 < 0) { + var5 = 0; + } + } + + if (var5 < var6) { + var2 += var5; + var7 += var5 * var8; + var9 += var10 * (float)var5; + int var11; + int var12; + if (super.field2230.field2457) { + var4 = var6 - var5 >> 2; + var8 <<= 2; + if (super.field2230.field2452 == 0) { + if (var4 > 0) { + do { + var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; + var3 = super.field2229[var11]; + var7 += var8; + this.method1582(var1, Rasterizer2D.field4245, var2, var3, var9); + var9 += var10; + ++var2; + this.method1582(var1, Rasterizer2D.field4245, var2, var3, var9); + var9 += var10; + ++var2; + this.method1582(var1, Rasterizer2D.field4245, var2, var3, var9); + var9 += var10; + ++var2; + this.method1582(var1, Rasterizer2D.field4245, var2, var3, var9); + var9 += var10; + ++var2; + --var4; + } while(var4 > 0); + } + + var4 = var6 - var5 & 3; + if (var4 > 0) { + var11 = (var7 & (var7 >> 31 & 1) - 1) >> 8; + var3 = super.field2229[var11]; + + do { + this.method1582(var1, Rasterizer2D.field4245, var2, var3, var9); + var9 += var10; + ++var2; + --var4; + } while(var4 > 0); + } + } else { + var11 = super.field2230.field2452; + var12 = 256 - super.field2230.field2452; + int var13; + if (var4 > 0) { + do { + var13 = (var7 & (var7 >> 31 & 1) - 1) >> 8; + var3 = super.field2229[var13]; + var7 += var8; + var3 = ((var3 & 16711935) * var12 >> 8 & 16711935) + (var12 * (var3 & 65280) >> 8 & 65280); + this.method1584(var1, Rasterizer2D.field4245, var2, var3, var11, var9); + ++var2; + var9 += var10; + this.method1584(var1, Rasterizer2D.field4245, var2, var3, var11, var9); + ++var2; + var9 += var10; + this.method1584(var1, Rasterizer2D.field4245, var2, var3, var11, var9); + ++var2; + var9 += var10; + this.method1584(var1, Rasterizer2D.field4245, var2, var3, var11, var9); + ++var2; + var9 += var10; + --var4; + } while(var4 > 0); + } + + var4 = var6 - var5 & 3; + if (var4 > 0) { + var13 = (var7 & (var7 >> 31 & 1) - 1) >> 8; + var3 = super.field2229[var13]; + var3 = ((var3 & 16711935) * var12 >> 8 & 16711935) + (var12 * (var3 & 65280) >> 8 & 65280); + + do { + this.method1584(var1, Rasterizer2D.field4245, var2, var3, var11, var9); + ++var2; + var9 += var10; + --var4; + } while(var4 > 0); + } + } + + } else { + var4 = var6 - var5; + if (super.field2230.field2452 == 0) { + do { + this.method1583(var1, Rasterizer2D.field4245, var2, var7, var9); + var9 += var10; + ++var2; + var7 += var8; + --var4; + } while(var4 > 0); + } else { + var11 = super.field2230.field2452; + var12 = 256 - super.field2230.field2452; + + do { + this.method1585(var1, Rasterizer2D.field4245, var2, var3, var11, var12, var9); + var9 += var10; + ++var2; + var7 += var8; + --var4; + } while(var4 > 0); + } + + } + } + } + + @ObfuscatedName("bp") + final void method1588(int[] var1, int var2, int var3, int var4, int var5, int var6, float var7, float var8) { + if (super.field2230.field2446) { + if (var6 > super.field2230.field2455) { + var6 = super.field2230.field2455; + } + + if (var5 < 0) { + var5 = 0; + } + } + + if (var5 < var6) { + var2 += var5; + var4 = var6 - var5 >> 2; + var7 += var8 * (float)var5; + if (super.field2230.field2452 != 0) { + if (super.field2230.field2452 == 254) { + while (true) { + --var4; + if (var4 < 0) { + var4 = var6 - var5 & 3; + + while (true) { + --var4; + if (var4 < 0) { + return; + } + + var1[var2++] = var1[var2]; + } + } + + var1[var2++] = var1[var2]; + var1[var2++] = var1[var2]; + var1[var2++] = var1[var2]; + var1[var2++] = var1[var2]; + } + } else { + int var9 = super.field2230.field2452; + int var10 = 256 - super.field2230.field2452; + var3 = ((var3 & 16711935) * var10 >> 8 & 16711935) + (var10 * (var3 & 65280) >> 8 & 65280); + + while (true) { + --var4; + if (var4 < 0) { + var4 = var6 - var5 & 3; + + while (true) { + --var4; + if (var4 < 0) { + return; + } + + this.method1584(var1, Rasterizer2D.field4245, var2, var3, var9, var7); + ++var2; + var7 += var8; + } + } + + this.method1584(var1, Rasterizer2D.field4245, var2, var3, var9, var7); + ++var2; + var7 += var8; + this.method1584(var1, Rasterizer2D.field4245, var2, var3, var9, var7); + ++var2; + var7 += var8; + this.method1584(var1, Rasterizer2D.field4245, var2, var3, var9, var7); + ++var2; + var7 += var8; + this.method1584(var1, Rasterizer2D.field4245, var2, var3, var9, var7); + ++var2; + var7 += var8; + } + } + } else { + while (true) { + --var4; + if (var4 < 0) { + var4 = var6 - var5 & 3; + + while (true) { + --var4; + if (var4 < 0) { + return; + } + + this.method1582(var1, Rasterizer2D.field4245, var2, var3, var7); + var7 += var8; + ++var2; + } + } + + this.method1582(var1, Rasterizer2D.field4245, var2, var3, var7); + var7 += var8; + ++var2; + this.method1582(var1, Rasterizer2D.field4245, var2, var3, var7); + var7 += var8; + ++var2; + this.method1582(var1, Rasterizer2D.field4245, var2, var3, var7); + var7 += var8; + ++var2; + this.method1582(var1, Rasterizer2D.field4245, var2, var3, var7); + var7 += var8; + ++var2; + } + } + } } - class285(int var1) { - this.field2469 = var1; + @ObfuscatedName("bu") + final void method1595(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { + if (super.field2230.field2446) { + if (var7 > super.field2230.field2455) { + var7 = super.field2230.field2455; + } + + if (var6 < 0) { + var6 = 0; + } + } + + if (var6 < var7) { + var5 += var6; + var8 += var9 * var6; + var10 += var11 * (float)var6; + int var20 = var7 - var6; + int var10000; + int var18; + int var19; + int var21; + int var22; + int var23; + int var24; + int var25; + int var26; + if (super.field2227) { + var26 = var6 - super.field2230.field2454; + var12 += (var15 >> 3) * var26; + var13 += var26 * (var16 >> 3); + var14 += var26 * (var17 >> 3); + var25 = var14 >> 12; + if (var25 != 0) { + var21 = var12 / var25; + var22 = var13 / var25; + if (var21 < 0) { + var21 = 0; + } else if (var21 > 4032) { + var21 = 4032; + } + } else { + var21 = 0; + var22 = 0; + } + + var12 += var15; + var13 += var16; + var14 += var17; + var25 = var14 >> 12; + if (var25 != 0) { + var23 = var12 / var25; + var24 = var13 / var25; + if (var23 < 0) { + var23 = 0; + } else if (var23 > 4032) { + var23 = 4032; + } + } else { + var23 = 0; + var24 = 0; + } + + var3 = (var21 << 20) + var22; + var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 20); + var20 >>= 3; + var9 <<= 3; + var18 = var8 >> 8; + if (super.field2228) { + if (var20 > 0) { + do { + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var10000 = var3 + var19; + var10 += var11; + var21 = var23; + var22 = var24; + var12 += var15; + var13 += var16; + var14 += var17; + var25 = var14 >> 12; + if (var25 != 0) { + var23 = var12 / var25; + var24 = var13 / var25; + if (var23 < 0) { + var23 = 0; + } else if (var23 > 4032) { + var23 = 4032; + } + } else { + var23 = 0; + var24 = 0; + } + + var3 = (var21 << 20) + var22; + var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 20); + var8 += var9; + var18 = var8 >> 8; + --var20; + } while(var20 > 0); + } + + var20 = var7 - var6 & 7; + if (var20 > 0) { + do { + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + --var20; + } while(var20 > 0); + } + } else { + if (var20 > 0) { + do { + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var10000 = var3 + var19; + var10 += var11; + var21 = var23; + var22 = var24; + var12 += var15; + var13 += var16; + var14 += var17; + var25 = var14 >> 12; + if (var25 != 0) { + var23 = var12 / var25; + var24 = var13 / var25; + if (var23 < 0) { + var23 = 0; + } else if (var23 > 4032) { + var23 = 4032; + } + } else { + var23 = 0; + var24 = 0; + } + + var3 = (var21 << 20) + var22; + var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 20); + var8 += var9; + var18 = var8 >> 8; + --var20; + } while(var20 > 0); + } + + var20 = var7 - var6 & 7; + if (var20 > 0) { + do { + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + --var20; + } while(var20 > 0); + } + } + } else { + var26 = var6 - super.field2230.field2454; + var12 += (var15 >> 3) * var26; + var13 += var26 * (var16 >> 3); + var14 += var26 * (var17 >> 3); + var25 = var14 >> 14; + if (var25 != 0) { + var21 = var12 / var25; + var22 = var13 / var25; + if (var21 < 0) { + var21 = 0; + } else if (var21 > 16256) { + var21 = 16256; + } + } else { + var21 = 0; + var22 = 0; + } + + var12 += var15; + var13 += var16; + var14 += var17; + var25 = var14 >> 14; + if (var25 != 0) { + var23 = var12 / var25; + var24 = var13 / var25; + if (var23 < 0) { + var23 = 0; + } else if (var23 > 16256) { + var23 = 16256; + } + } else { + var23 = 0; + var24 = 0; + } + + var3 = (var21 << 18) + var22; + var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 18); + var20 >>= 3; + var9 <<= 3; + var18 = var8 >> 8; + if (super.field2228) { + if (var20 > 0) { + do { + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var10000 = var3 + var19; + var10 += var11; + var21 = var23; + var22 = var24; + var12 += var15; + var13 += var16; + var14 += var17; + var25 = var14 >> 14; + if (var25 != 0) { + var23 = var12 / var25; + var24 = var13 / var25; + if (var23 < 0) { + var23 = 0; + } else if (var23 > 16256) { + var23 = 16256; + } + } else { + var23 = 0; + var24 = 0; + } + + var3 = (var21 << 18) + var22; + var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 18); + var8 += var9; + var18 = var8 >> 8; + --var20; + } while(var20 > 0); + } + + var20 = var7 - var6 & 7; + if (var20 > 0) { + do { + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + --var20; + } while(var20 > 0); + } + } else { + if (var20 > 0) { + do { + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var10000 = var3 + var19; + var10 += var11; + var21 = var23; + var22 = var24; + var12 += var15; + var13 += var16; + var14 += var17; + var25 = var14 >> 14; + if (var25 != 0) { + var23 = var12 / var25; + var24 = var13 / var25; + if (var23 < 0) { + var23 = 0; + } else if (var23 > 16256) { + var23 = 16256; + } + } else { + var23 = 0; + var24 = 0; + } + + var3 = (var21 << 18) + var22; + var19 = (var24 - var22 >> 3) + (var23 - var21 >> 3 << 18); + var8 += var9; + var18 = var8 >> 8; + --var20; + } while(var20 > 0); + } + + var20 = var7 - var6 & 7; + if (var20 > 0) { + do { + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + --var20; + } while(var20 > 0); + } + } + } + + } + } + + @ObfuscatedName("by") + final void method1597(int[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, float var10, float var11, int var12, int var13, int var14, int var15, int var16, int var17) { + if (super.field2230.field2446) { + if (var7 > super.field2230.field2455) { + var7 = super.field2230.field2455; + } + + if (var6 < 0) { + var6 = 0; + } + } + + if (var6 < var7) { + var5 += var6; + var8 += var9 * var6; + var10 += var11 * (float)var6; + int var20 = var7 - var6; + int var18; + int var19; + int var21; + int var22; + int var23; + int var24; + int var25; + int var26; + if (super.field2227) { + var26 = var6 - super.field2230.field2454; + var12 += var26 * var15; + var13 += var26 * var16; + var14 += var17 * var26; + var25 = var14 >> 12; + if (var25 != 0) { + var21 = var12 / var25; + var22 = var13 / var25; + } else { + var21 = 0; + var22 = 0; + } + + var12 += var20 * var15; + var13 += var20 * var16; + var14 += var17 * var20; + var25 = var14 >> 12; + if (var25 != 0) { + var23 = var12 / var25; + var24 = var13 / var25; + } else { + var23 = 0; + var24 = 0; + } + + var3 = (var21 << 20) + var22; + var19 = (var24 - var22) / var20 + ((var23 - var21) / var20 << 20); + var20 >>= 3; + var9 <<= 3; + var18 = var8 >> 8; + if (super.field2228) { + if (var20 > 0) { + do { + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + var8 += var9; + var18 = var8 >> 8; + --var20; + } while(var20 > 0); + } + + var20 = var7 - var6 & 7; + if (var20 > 0) { + do { + method1591(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + --var20; + } while(var20 > 0); + } + } else { + if (var20 > 0) { + do { + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + var8 += var9; + var18 = var8 >> 8; + --var20; + } while(var20 > 0); + } + + var20 = var7 - var6 & 7; + if (var20 > 0) { + do { + method1592(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + --var20; + } while(var20 > 0); + } + } + } else { + var26 = var6 - super.field2230.field2454; + var12 += var26 * var15; + var13 += var26 * var16; + var14 += var17 * var26; + var25 = var14 >> 14; + if (var25 != 0) { + var21 = var12 / var25; + var22 = var13 / var25; + } else { + var21 = 0; + var22 = 0; + } + + var12 += var20 * var15; + var13 += var20 * var16; + var14 += var17 * var20; + var25 = var14 >> 14; + if (var25 != 0) { + var23 = var12 / var25; + var24 = var13 / var25; + } else { + var23 = 0; + var24 = 0; + } + + var3 = (var21 << 18) + var22; + var19 = (var24 - var22) / var20 + ((var23 - var21) / var20 << 18); + var20 >>= 3; + var9 <<= 3; + var18 = var8 >> 8; + if (super.field2228) { + if (var20 > 0) { + do { + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + var8 += var9; + var18 = var8 >> 8; + --var20; + } while(var20 > 0); + } + + var20 = var7 - var6 & 7; + if (var20 > 0) { + do { + method1593(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + --var20; + } while(var20 > 0); + } + } else { + if (var20 > 0) { + do { + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + var8 += var9; + var18 = var8 >> 8; + --var20; + } while(var20 > 0); + } + + var20 = var7 - var6 & 7; + if (var20 > 0) { + do { + method1594(var1, Rasterizer2D.field4245, var2, var5, var18, var3, var10); + ++var5; + var3 += var19; + var10 += var11; + --var20; + } while(var20 > 0); + } + } + } + + } + } + + @ObfuscatedName("bw") + static final boolean method1590(float var0, float var1) { + return var1 > var0; + } + + @ObfuscatedName("bj") + static final void method1591(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + if (method1590(var1[var3], var6)) { + int var7 = var2[(var5 & 4032) + (var5 >>> 26)]; + var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; + var1[var3] = var6; + } + + } + + @ObfuscatedName("bn") + static final void method1592(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + int var7 = var2[(var5 & 4032) + (var5 >>> 26)]; + if (var7 != 0) { + if (method1590(var1[var3], var6)) { + var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; + var1[var3] = var6; + } + + } + } + + @ObfuscatedName("bo") + static final void method1593(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + if (method1590(var1[var3], var6)) { + int var7 = var2[(var5 >>> 25) + (var5 & 16256)]; + var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; + var1[var3] = var6; + } + + } + + @ObfuscatedName("bt") + static final void method1594(int[] var0, float[] var1, int[] var2, int var3, int var4, int var5, float var6) { + int var7 = var2[(var5 >>> 25) + (var5 & 16256)]; + if (var7 != 0) { + if (method1590(var1[var3], var6)) { + var0[var3] = (var4 * (var7 & 65280) & 16711680) + ((var7 & 16711935) * var4 & -16711936) >> 8; + var1[var3] = var6; + } + + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class286.java b/osrs/src/main/java/class286.java deleted file mode 100644 index 2fcef2856..000000000 --- a/osrs/src/main/java/class286.java +++ /dev/null @@ -1,43 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("la") -public class class286 { - @ObfuscatedName("ar") - static int field2470; - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(Lni;I)Z", - garbageValue = "-249009883" - ) - static boolean method1574(PlayerComposition var0) { - if (var0.equipment[0] < 512) { - return false; - } else { - ItemComposition var1 = class214.ItemDefinition_get(var0.equipment[0] - 512); - return var1.maleModel1 != class223.field1865.field1879 && var1.maleModel2 != class223.field1865.field1879; - } - } - - @ObfuscatedName("lj") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "863743368" - ) - static void method1575() { - if (Client.isSpellSelected) { - Widget var0 = class33.widgetDefinition.getWidgetChild(JagexCache.selectedSpellWidget, Client.selectedSpellChildIndex); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - Interpreter.runScriptEvent(var1); - } - - Client.selectedSpellItemId = -1; - Client.isSpellSelected = false; - ClanChannelMember.invalidateWidget(var0); - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class29.java b/osrs/src/main/java/class29.java index 2fc3eeb8c..c4de8f1c4 100644 --- a/osrs/src/main/java/class29.java +++ b/osrs/src/main/java/class29.java @@ -2,36 +2,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bd") +@ObfuscatedName("bi") public interface class29 { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1448724719" + descriptor = "(IS)Z", + garbageValue = "512" ) @Export("vmethod3949") boolean vmethod3949(int var1); - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-974805318" + garbageValue = "-1146773117" ) @Export("vmethod3989") boolean vmethod3989(int var1); - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "19" + descriptor = "(CI)Z", + garbageValue = "984376689" ) @Export("vmethod3951") boolean vmethod3951(char var1); - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "-672025946" + descriptor = "(ZB)Z", + garbageValue = "-49" ) @Export("vmethod3953") boolean vmethod3953(boolean var1); diff --git a/osrs/src/main/java/class291.java b/osrs/src/main/java/class291.java new file mode 100644 index 000000000..7bc6bb622 --- /dev/null +++ b/osrs/src/main/java/class291.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lm") +public interface class291 extends class293 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class292.java b/osrs/src/main/java/class292.java new file mode 100644 index 000000000..7ca2d75aa --- /dev/null +++ b/osrs/src/main/java/class292.java @@ -0,0 +1,139 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lz") +public abstract class class292 implements class294 { + @ObfuscatedName("me") + @ObfuscatedSignature( + descriptor = "Lkg;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("at") + protected int field2496; + + @ObfuscatedSignature( + descriptor = "(Lnt;Lof;I)V" + ) + protected class292(StudioGame var1, Language var2, int var3) { + this.field2496 = var3; + } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "1464044439" + ) + static final void method1606(int var0, int var1, boolean var2) { + if (!var2 || var0 != DefaultsGroup.timeOfPreviousKeyPress || class223.field1886 != var1) { + DefaultsGroup.timeOfPreviousKeyPress = var0; + class223.field1886 = var1; + WorldMapSection2.updateGameState(25); + LoginPacket.drawLoadingMessage("Loading - please wait.", true); + int var3 = NewShit.baseX; + int var4 = class101.baseY; + NewShit.baseX = (var0 - 6) * 8; + class101.baseY = (var1 - 6) * 8; + int var5 = NewShit.baseX - var3; + int var6 = class101.baseY - var4; + var3 = NewShit.baseX; + var4 = class101.baseY; + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 65536; ++var7) { + NPC var8 = Client.npcs[var7]; + if (var8 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var8.pathX; + var10000[var9] -= var5; + var10000 = var8.pathY; + var10000[var9] -= var6; + } + + var8.x -= var5 * 128; + var8.y -= var6 * 128; + } + } + + for (var7 = 0; var7 < 2048; ++var7) { + Player var21 = Client.players[var7]; + if (var21 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var21.pathX; + var10000[var9] -= var5; + var10000 = var21.pathY; + var10000[var9] -= var6; + } + + var21.x -= var5 * 128; + var21.y -= var6 * 128; + } + } + + byte var20 = 0; + byte var18 = 104; + byte var22 = 1; + if (var5 < 0) { + var20 = 103; + var18 = -1; + var22 = -1; + } + + byte var10 = 0; + byte var11 = 104; + byte var12 = 1; + if (var6 < 0) { + var10 = 103; + var11 = -1; + var12 = -1; + } + + int var14; + for (int var13 = var20; var13 != var18; var13 += var22) { + for (var14 = var10; var14 != var11; var14 += var12) { + int var15 = var13 + var5; + int var16 = var14 + var6; + + for (int var17 = 0; var17 < 4; ++var17) { + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + } else { + Client.groundItems[var17][var13][var14] = null; + } + } + } + } + + for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { + var19.x -= var5; + var19.y -= var6; + if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { + var19.remove(); + } + } + + if (Client.destinationX != 0) { + Client.destinationX -= var5; + Client.destinationY -= var6; + } + + Client.soundEffectCount = 0; + Client.isCameraLocked = false; + ViewportMouse.cameraX -= var5 << 7; + class36.cameraZ -= var6 << 7; + LoginScreenAnimation.oculusOrbFocalPointX -= var5 << 7; + ScriptFrame.oculusOrbFocalPointY -= var6 << 7; + Client.field535 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14].clear(); + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class293.java b/osrs/src/main/java/class293.java new file mode 100644 index 000000000..2455a3be2 --- /dev/null +++ b/osrs/src/main/java/class293.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lc") +public interface class293 { +} \ No newline at end of file diff --git a/osrs/src/main/java/class294.java b/osrs/src/main/java/class294.java index a62312419..e661cd43c 100644 --- a/osrs/src/main/java/class294.java +++ b/osrs/src/main/java/class294.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lc") -public interface class294 extends class296 { +@ObfuscatedName("lb") +public interface class294 extends Iterable { } \ No newline at end of file diff --git a/osrs/src/main/java/class295.java b/osrs/src/main/java/class295.java index 3cd1b30be..de2d853b9 100644 --- a/osrs/src/main/java/class295.java +++ b/osrs/src/main/java/class295.java @@ -1,27 +1,7 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") -public abstract class class295 implements class297 { - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("SequenceDefinition_archive") - static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lgi;" - ) - static ClanSettings field2496; - @ObfuscatedName("ac") - protected int field2498; - - @ObfuscatedSignature( - descriptor = "(Lnp;Loa;I)V" - ) - protected class295(StudioGame var1, Language var2, int var3) { - this.field2498 = var3; - } +@ObfuscatedName("lr") +public interface class295 { + @ObfuscatedName("at") + void method1607(Object var1); } \ No newline at end of file diff --git a/osrs/src/main/java/class296.java b/osrs/src/main/java/class296.java deleted file mode 100644 index 2d53c2acb..000000000 --- a/osrs/src/main/java/class296.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lv") -public interface class296 { -} \ No newline at end of file diff --git a/osrs/src/main/java/class297.java b/osrs/src/main/java/class297.java deleted file mode 100644 index 2be2700cd..000000000 --- a/osrs/src/main/java/class297.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lw") -public interface class297 extends Iterable { -} \ No newline at end of file diff --git a/osrs/src/main/java/class298.java b/osrs/src/main/java/class298.java deleted file mode 100644 index 28e0c2614..000000000 --- a/osrs/src/main/java/class298.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lo") -public interface class298 { - @ObfuscatedName("ac") - void method1616(Object var1); -} \ No newline at end of file diff --git a/osrs/src/main/java/class3.java b/osrs/src/main/java/class3.java index f73339780..190235604 100644 --- a/osrs/src/main/java/class3.java +++ b/osrs/src/main/java/class3.java @@ -2,11 +2,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ax") +@ObfuscatedName("ao") public interface class3 { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;)Lul;" + descriptor = "(Luj;)Luj;" ) @Export("vmethod12") Buffer vmethod12(Buffer var1); diff --git a/osrs/src/main/java/class30.java b/osrs/src/main/java/class30.java index 9bd16565a..2e577bca2 100644 --- a/osrs/src/main/java/class30.java +++ b/osrs/src/main/java/class30.java @@ -3,144 +3,130 @@ import net.runelite.mapping.ObfuscatedSignature; import javax.imageio.ImageIO; +import java.util.ArrayList; +import java.util.Iterator; -@ObfuscatedName("be") +@ObfuscatedName("bv") public class class30 { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lol;" ) - @Export("FloorOverlayDefinition_archive") - static AbstractArchive FloorOverlayDefinition_archive; + @Export("VarcInt_archive") + public static AbstractArchive VarcInt_archive; static { ImageIO.setUseCache(false); } - @ObfuscatedName("ac") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)[Lnq;", - garbageValue = "-42" + descriptor = "(Ljava/util/ArrayList;ZI)V", + garbageValue = "358922906" ) - static class360[] method121() { - return new class360[]{class360.field3179, class360.field3180}; - } + static void method131(ArrayList var0, boolean var1) { + if (!var1) { + class316.field2787.clear(); + } - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Ltp;ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "42" - ) - static String method122(IterableNodeHashTable var0, int var1, String var2) { - if (var0 == null) { - return var2; - } else { - ObjectNode var3 = (ObjectNode)var0.get((long)var1); - return var3 == null ? var2 : (String)var3.obj; + Iterator var2 = var0.iterator(); + + while (var2.hasNext()) { + MusicSong var3 = (MusicSong)var2.next(); + if (var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { + if (!var1) { + class316.field2787.add(var3); + } + + class316.field2790.add(var3); + } } - } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)[Lsz;", - garbageValue = "-651272604" - ) - static class468[] method120() { - return new class468[]{class468.field3927, class468.field3925, class468.field3926, class468.field3924}; } - @ObfuscatedName("aw") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "2111489575" + descriptor = "(ILdt;ZI)I", + garbageValue = "-2029161315" ) - static int method123(int var0, Script var1, boolean var2) { - Widget var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == 2500) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == 2501) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; + static int method133(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + if (var0 == 1700) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.itemId; return 1; - } else if (var0 == 2502) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == 2503) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; + } else if (var0 == 1701) { + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + return 1; - } else if (var0 == 2504) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + } else if (var0 == 1702) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.childIndex; return 1; - } else if (var0 == 2505) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; + } else if (var0 == 1707) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.method1861() ? 1 : 0; return 1; + } else if (var0 == 1708) { + return class310.method1645(var3); } else { - return 2; + return var0 == 1709 ? GrandExchangeOfferTotalQuantityComparator.method1965(var3) : 2; } } - @ObfuscatedName("ih") + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "106" + descriptor = "([BI)[B", + garbageValue = "-1158445957" ) - static void method124() { - if (class434.worldMap != null) { - class434.worldMap.method2432(class87.Client_plane, (TextureProvider.localPlayer.x >> 7) + class20.baseX, (TextureProvider.localPlayer.y >> 7) + class19.baseY, false); - class434.worldMap.loadCache(); - } + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); + int var2 = var1.readUnsignedByte(); + int var3 = var1.readInt(); + if (var3 >= 0 && (AbstractArchive.maximumContainerSize == 0 || var3 <= AbstractArchive.maximumContainerSize)) { + if (var2 == 0) { + byte[] var4 = new byte[var3]; + var1.readBytes(var4, 0, var3); + return var4; + } else { + int var6 = var1.readInt(); + if (var6 < 0 || AbstractArchive.maximumContainerSize != 0 && var6 > AbstractArchive.maximumContainerSize) { + throw new RuntimeException(); + } else { + byte[] var5 = new byte[var6]; + if (var2 == 1) { + BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); + } + return var5; + } + } + } else { + throw new RuntimeException(); + } } - @ObfuscatedName("ke") + @ObfuscatedName("nj") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1209602899" + garbageValue = "1125993888" ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[class87.Client_plane][var0][var1]; - if (var2 == null) { - class10.scene.removeGroundItemPile(class87.Client_plane, var0, var1); - } else { - long var3 = -99999999L; - TileItem var5 = null; - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemComposition var7 = class214.ItemDefinition_get(var6.id); - long var8 = (long)var7.price; - if (var7.isStackable == 1) { - var8 *= var6.quantity < Integer.MAX_VALUE ? (long)(var6.quantity + 1) : (long)var6.quantity; - } - - if (var8 > var3) { - var3 = var8; - var5 = var6; - } - } - - if (var5 == null) { - class10.scene.removeGroundItemPile(class87.Client_plane, var0, var1); - } else { - var2.addLast(var5); - TileItem var12 = null; - TileItem var11 = null; - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var5.id != var6.id) { - if (var12 == null) { - var12 = var6; - } - - if (var6.id != var12.id && var11 == null) { - var11 = var6; - } - } - } - - long var9 = GrandExchangeOfferAgeComparator.calculateTag(var0, var1, 3, false, 0); - class10.scene.newGroundItemPile(class87.Client_plane, var0, var1, class115.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class87.Client_plane), var5, var9, var12, var11); + static final void method134(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : ItemContainer.guestClanChannel; + if (var2 != null && var1 >= 0 && var1 < var2.method857()) { + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); + if (var3.rank == -1) { + String var4 = var3.username.getName(); + PacketBufferNode var5 = class113.getPacketBufferNode(ClientPacket.f65, Client.packetWriter.isaacCipher); + var5.packetBuffer.writeByte(3 + ClanChannel.stringCp1252NullTerminatedByteSize(var4)); + var5.packetBuffer.writeByte(var0); + var5.packetBuffer.writeShort(var1); + var5.packetBuffer.writeStringCp1252NullTerminated(var4); + Client.packetWriter.addNode(var5); } } } diff --git a/osrs/src/main/java/class301.java b/osrs/src/main/java/class301.java new file mode 100644 index 000000000..86323af1f --- /dev/null +++ b/osrs/src/main/java/class301.java @@ -0,0 +1,18 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lx") +public class class301 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-407525522" + ) + public static final void method1625(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; + ViewportMouse.ViewportMouse_y = var1; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class302.java b/osrs/src/main/java/class302.java new file mode 100644 index 000000000..9d2a3af0f --- /dev/null +++ b/osrs/src/main/java/class302.java @@ -0,0 +1,95 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lp") +public class class302 { + @ObfuscatedName("wx") + @ObfuscatedSignature( + descriptor = "Lrg;" + ) + static ArchiveDisk field2511; + @ObfuscatedName("up") + static int field2510; + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(Lnn;IIB)V", + garbageValue = "51" + ) + public static void method1626(Widget var0, int var1, int var2) { + PlayerComposition var3 = var0.field3125; + boolean var4 = var2 != var3.field2947; + var3.field2947 = var2; + if (var4) { + int var5; + int var7; + if (var3.field2947 == var1) { + for (var5 = 0; var5 < PlayerComposition.equipmentIndices.length; ++var5) { + var7 = PlayerComposition.equipmentIndices[var5]; + if (var3.equipment[var7] > 0 && var3.equipment[var7] < 512) { + var3.equipment[var7] = var3.field2944[var7]; + } + } + } else { + label62: { + if (var3.equipment[0] >= 512) { + boolean var8; + if (var3.equipment[0] < 512) { + var8 = false; + } else { + ItemComposition var6 = class214.ItemDefinition_get(var3.equipment[0] - 512); + var8 = var6.maleModel1 != class205.field1815.field1824 && var6.maleModel2 != class205.field1815.field1824; + } + + if (!var8) { + break label62; + } + } + + var3.equipment[class205.field1815.field1824] = 1; + } + + for (var5 = 0; var5 < 7; ++var5) { + var7 = PlayerComposition.equipmentIndices[var5]; + if (var3.equipment[var7] > 0 && var3.equipment[var7] < 512) { + MoveSpeed.method1167(var2, var3.equipment, var5); + } + } + } + } + + var3.method1756(); + } + + @ObfuscatedName("nb") + @ObfuscatedSignature( + descriptor = "(Ldc;ZB)V", + garbageValue = "-113" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { + HealthBarDefinition.widgetDefinition.method1736(var2); + } + + for (IntegerNode var4 = (IntegerNode)Client.widgetFlags.first(); var4 != null; var4 = (IntegerNode)Client.widgetFlags.next()) { + if ((var4.key >> 48 & 65535L) == (long)var2) { + var4.remove(); + } + } + + Widget var5 = HealthBarDefinition.widgetDefinition.method1733(var3); + if (var5 != null) { + class159.invalidateWidget(var5); + } + + if (Client.rootInterface != -1) { + class514.runIntfCloseListener(Client.rootInterface, 1); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class303.java b/osrs/src/main/java/class303.java new file mode 100644 index 000000000..06357ca66 --- /dev/null +++ b/osrs/src/main/java/class303.java @@ -0,0 +1,61 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lh") +public class class303 { + @ObfuscatedName("ac") + static int field2512; + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "86" + ) + static final void method1628(int var0, int var1) { + if (var0 < 128) { + var0 = 128; + } else if (var0 > 383) { + var0 = 383; + } + + if (Varcs.cameraPitch < var0) { + Varcs.cameraPitch = (var0 - Varcs.cameraPitch) * class134.cameraMoveToAcceleration / 1000 + Varcs.cameraPitch + class60.cameraLookAtSpeed; + if (Varcs.cameraPitch > var0) { + Varcs.cameraPitch = var0; + } + } else if (Varcs.cameraPitch > var0) { + Varcs.cameraPitch -= (Varcs.cameraPitch - var0) * class134.cameraMoveToAcceleration / 1000 + class60.cameraLookAtSpeed; + if (Varcs.cameraPitch < var0) { + Varcs.cameraPitch = var0; + } + } + + var1 &= 2047; + int var2 = var1 - class192.cameraYaw; + if (var2 > 1024) { + var2 -= 2048; + } else if (var2 < -1024) { + var2 += 2048; + } + + if (var2 > 0) { + class192.cameraYaw = class192.cameraYaw + class60.cameraLookAtSpeed + var2 * class134.cameraMoveToAcceleration / 1000; + class192.cameraYaw &= 2047; + } else if (var2 < 0) { + class192.cameraYaw -= class60.cameraLookAtSpeed + -var2 * class134.cameraMoveToAcceleration / 1000; + class192.cameraYaw &= 2047; + } + + int var3 = var1 - class192.cameraYaw; + if (var3 > 1024) { + var3 -= 2048; + } else if (var3 < -1024) { + var3 += 2048; + } + + if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { + class192.cameraYaw = var1; + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class304.java b/osrs/src/main/java/class304.java index ac6665470..a885390cb 100644 --- a/osrs/src/main/java/class304.java +++ b/osrs/src/main/java/class304.java @@ -1,163 +1,5 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") -public class class304 { - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Luy;II)Z", - garbageValue = "-1822480707" - ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { - if (var0.readBits(1) != 0) { - updateExternalPlayer(var0, var1); - } - - var3 = var0.readBits(13); - var4 = var0.readBits(13); - boolean var12 = var0.readBits(1) == 1; - if (var12) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { - throw new RuntimeException(); - } else { - Player var6 = Client.players[var1] = new Player(); - var6.index = var1; - if (Players.cachedAppearanceBuffer[var1] != null) { - var6.read(Players.cachedAppearanceBuffer[var1]); - } - - var6.orientation = Players.Players_orientations[var1]; - var6.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var6.pathTraversed[0] = Players.playerMovementSpeeds[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - class20.baseX, (var10 << 13) + var4 - class19.baseY); - var6.hasMovementPending = false; - return true; - } - } else if (var2 == 1) { - var3 = var0.readBits(2); - var4 = Players.Players_regions[var1]; - Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); - return false; - } else { - int var5; - int var11; - if (var2 == 2) { - var3 = var0.readBits(5); - var4 = var3 >> 3; - var5 = var3 & 7; - var11 = Players.Players_regions[var1]; - var7 = (var11 >> 28) + var4 & 3; - var8 = var11 >> 14 & 255; - var9 = var11 & 255; - if (var5 == 0) { - --var8; - --var9; - } - - if (var5 == 1) { - --var9; - } - - if (var5 == 2) { - ++var8; - --var9; - } - - if (var5 == 3) { - --var8; - } - - if (var5 == 4) { - ++var8; - } - - if (var5 == 5) { - --var8; - ++var9; - } - - if (var5 == 6) { - ++var9; - } - - if (var5 == 7) { - ++var8; - ++var9; - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); - return false; - } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var11 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var11 + var7 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); - return false; - } - } - } - - @ObfuscatedName("hq") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-1658366352" - ) - static long method1635() { - return Client.playerUUID; - } - - @ObfuscatedName("me") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "703311848" - ) - static void method1636() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (class33.widgetDefinition.loadInterface(var1)) { - boolean var2 = true; - Widget[] var3 = class33.widgetDefinition.Widget_interfaceComponents[var1]; - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { - if (var3[var4] != null) { - var2 = var3[var4].isIf3; - break; - } - } - - if (!var2) { - var4 = (int)var0.key; - Widget var5 = class33.widgetDefinition.method1740(var4); - if (var5 != null) { - ClanChannelMember.invalidateWidget(var5); - } - } - } - } - - } +@ObfuscatedName("li") +public interface class304 { } \ No newline at end of file diff --git a/osrs/src/main/java/class306.java b/osrs/src/main/java/class306.java deleted file mode 100644 index a5491f5c6..000000000 --- a/osrs/src/main/java/class306.java +++ /dev/null @@ -1,25 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("le") -public class class306 { - @ObfuscatedName("ah") - @Export("PcmPlayer_stereo") - public static boolean PcmPlayer_stereo; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lnm;" - ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)Llx;", - garbageValue = "28" - ) - static PacketBufferNode method1639() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class307.java b/osrs/src/main/java/class307.java deleted file mode 100644 index 9ff26ee97..000000000 --- a/osrs/src/main/java/class307.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lg") -public interface class307 { -} \ No newline at end of file diff --git a/osrs/src/main/java/class31.java b/osrs/src/main/java/class31.java index 3f82d0c3c..21491807a 100644 --- a/osrs/src/main/java/class31.java +++ b/osrs/src/main/java/class31.java @@ -4,177 +4,47 @@ import java.applet.Applet; -@ObfuscatedName("bv") +@ObfuscatedName("bf") public class class31 { - @ObfuscatedName("ac") - static Applet field83; - @ObfuscatedName("al") - static String field84; - @ObfuscatedName("py") - static int field82; + @ObfuscatedName("at") + static Applet field85; + @ObfuscatedName("ah") + static String field86; + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "[Lup;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; static { - field83 = null; - field84 = ""; + field85 = null; + field86 = ""; } - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIB)Lds;", - garbageValue = "0" + descriptor = "(IIII)I", + garbageValue = "978522160" ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = class132.method708(var1, var0); - Script var4 = MouseHandler.method175(var3, var0); - if (var4 != null) { - return var4; + public static int method135(int var0, int var1, int var2) { + var2 &= 3; + if (var2 == 0) { + return var0; + } else if (var2 == 1) { + return var1; } else { - var3 = class347.method1883(var2, var0); - var4 = MouseHandler.method175(var3, var0); - if (var4 != null) { - return var4; - } else { - var3 = class20.method70(var0); - var4 = MouseHandler.method175(var3, var0); - return var4 != null ? var4 : null; - } + return var2 == 2 ? 7 - var0 : 7 - var1; } } - @ObfuscatedName("ap") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "121" + descriptor = "(IB)Lco;", + garbageValue = "67" ) - static int method127(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - } - - String var4 = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { - } - } - - var4 = var4.substring(0, var4.length() - 1); - } - - Object[] var9 = new Object[var4.length() + 1]; - - int var7; - for (var7 = var9.length - 1; var7 >= 1; --var7) { - if (var4.charAt(var7 - 1) == 's') { - var9[var7] = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - } else { - var9[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var7 != -1) { - var9[0] = new Integer(var7); - } else { - var9 = null; - } - - if (var0 == 1400) { - var3.onClick = var9; - } else if (var0 == 1401) { - var3.onHold = var9; - } else if (var0 == 1402) { - var3.onRelease = var9; - } else if (var0 == 1403) { - var3.onMouseOver = var9; - } else if (var0 == 1404) { - var3.onMouseLeave = var9; - } else if (var0 == 1405) { - var3.onDrag = var9; - } else if (var0 == 1406) { - var3.onTargetLeave = var9; - } else if (var0 == 1407) { - var3.onVarTransmit = var9; - var3.varTransmitTriggers = var5; - } else if (var0 == 1408) { - var3.onTimer = var9; - } else if (var0 == 1409) { - var3.onOp = var9; - } else if (var0 == 1410) { - var3.onDragComplete = var9; - } else if (var0 == 1411) { - var3.onClickRepeat = var9; - } else if (var0 == 1412) { - var3.onMouseRepeat = var9; - } else if (var0 == 1414) { - var3.onInvTransmit = var9; - var3.invTransmitTriggers = var5; - } else if (var0 == 1415) { - var3.onStatTransmit = var9; - var3.statTransmitTriggers = var5; - } else if (var0 == 1416) { - var3.onTargetEnter = var9; - } else if (var0 == 1417) { - var3.onScroll = var9; - } else if (var0 == 1418) { - var3.onChatTransmit = var9; - } else if (var0 == 1419) { - var3.onKey = var9; - } else if (var0 == 1420) { - var3.onFriendTransmit = var9; - } else if (var0 == 1421) { - var3.onClanTransmit = var9; - } else if (var0 == 1422) { - var3.onMiscTransmit = var9; - } else if (var0 == 1423) { - var3.onDialogAbort = var9; - } else if (var0 == 1424) { - var3.onSubChange = var9; - } else if (var0 == 1425) { - var3.onStockTransmit = var9; - } else if (var0 == 1426) { - var3.field3118 = var9; - } else if (var0 == 1427) { - var3.onResize = var9; - } else if (var0 == 1428) { - var3.field3113 = var9; - } else if (var0 == 1429) { - var3.field3096 = var9; - } else if (var0 == 1430) { - var3.field3100 = var9; - } else if (var0 == 1431) { - var3.field3104 = var9; - } else if (var0 == 1434) { - var3.field3117 = var9; - } else if (var0 == 1435) { - var3.field3105 = var9; - } else { - if (var0 < 1436 || var0 > 1439) { - return 2; - } - - class342 var8 = var3.method1880(); - if (var8 != null) { - if (var0 == 1436) { - var8.field2933 = var9; - } else if (var0 == 1437) { - var8.field2932 = var9; - } else if (var0 == 1438) { - var8.field2934 = var9; - } else if (var0 == 1439) { - var8.field2935 = var9; - } - } - } - - var3.hasListener = true; - return 1; + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); } } \ No newline at end of file diff --git a/osrs/src/main/java/class310.java b/osrs/src/main/java/class310.java new file mode 100644 index 000000000..1e8867943 --- /dev/null +++ b/osrs/src/main/java/class310.java @@ -0,0 +1,32 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lg") +public class class310 { + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lup;" + ) + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("fo") + static long field2769; + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(Lnn;I)I", + garbageValue = "1270605570" + ) + static int method1645(Widget var0) { + if (var0.type != 11) { + --class127.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + String var1 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var0.method1862(var1); + return 1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class311.java b/osrs/src/main/java/class311.java new file mode 100644 index 000000000..115bf7efc --- /dev/null +++ b/osrs/src/main/java/class311.java @@ -0,0 +1,57 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.HashMap; +import java.util.TimeZone; + + +@ObfuscatedName("lt") +public final class class311 { + @ObfuscatedName("ar") + static final HashMap field2771; + + static { + field2771 = new HashMap(); + TimeZone var0; + synchronized(field2771) { + TimeZone var2 = (TimeZone)field2771.get("Europe/London"); + if (var2 == null) { + var2 = TimeZone.getTimeZone("Europe/London"); + field2771.put("Europe/London", var2); + } + + var0 = var2; + } + + java.util.Calendar.getInstance(var0); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)Lfw;", + garbageValue = "-1631504286" + ) + static class140 method1646(int var0) { + class140 var1 = (class140)class12.findEnumerated(UserComparator8.method671(), var0); + if (var1 == null) { + var1 = class140.field1323; + } + + return var1; + } + + @ObfuscatedName("me") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-256877556" + ) + static final void method1647(int var0) { + var0 = Math.max(Math.min(var0, 100), 0); + var0 = 100 - var0; + float var1 = 0.5F + (float)var0 / 200.0F; + Rasterizer3D.method1415((double)var1); + ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).setBrightness((double)var1); + class166.method866(); + WorldMapIcon_1.clientPreferences.setBrightness((double)var1); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class312.java b/osrs/src/main/java/class312.java new file mode 100644 index 000000000..5be1d8099 --- /dev/null +++ b/osrs/src/main/java/class312.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mb") +public final class class312 { + @ObfuscatedName("at") + static long field2773; + @ObfuscatedName("ah") + static long field2772; +} \ No newline at end of file diff --git a/osrs/src/main/java/class313.java b/osrs/src/main/java/class313.java index 90168e059..d7eb1ab01 100644 --- a/osrs/src/main/java/class313.java +++ b/osrs/src/main/java/class313.java @@ -1,23 +1,29 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") +@ObfuscatedName("md") public class class313 { - @ObfuscatedName("gq") + @ObfuscatedName("fg") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Loh;" ) - static Archive field2770; + @Export("archive4") + static Archive archive4; - @ObfuscatedName("ho") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1304134289" + descriptor = "(Lol;Ljava/lang/String;Ljava/lang/String;B)Lup;", + garbageValue = "12" ) - static final void method1648() { - if (class171.pcmPlayer1 != null) { - class171.pcmPlayer1.run(); + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + if (!var0.isValidFileName(var1, var2)) { + return null; + } else { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + return class205.method1056(var0, var3, var4); } - } } \ No newline at end of file diff --git a/osrs/src/main/java/class314.java b/osrs/src/main/java/class314.java index f7f80949b..7acba793c 100644 --- a/osrs/src/main/java/class314.java +++ b/osrs/src/main/java/class314.java @@ -1,1047 +1,73 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.TimeZone; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - - -@ObfuscatedName("mj") -public final class class314 { - @ObfuscatedName("ak") - static final HashMap field2772; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lhu;" - ) - @Export("clock") - static Clock clock; +@ObfuscatedName("my") +public class class314 { + @ObfuscatedName("at") + static int[] field2775; + @ObfuscatedName("hu") + static String field2776; static { - field2772 = new HashMap(); - java.util.Calendar.getInstance(getMethodName("Europe/London")); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/util/TimeZone;", - garbageValue = "-1775212150" - ) - @Export("getMethodName") - static TimeZone getMethodName(String var0) { - synchronized(field2772) { - TimeZone var2 = (TimeZone)field2772.get(var0); - if (var2 == null) { - var2 = TimeZone.getTimeZone(var0); - field2772.put(var0, var2); - } - - return var2; + new Object(); + field2775 = new int[33]; + field2775[0] = 0; + int var0 = 2; + + for (int var1 = 1; var1 < 33; ++var1) { + field2775[var1] = var0 - 1; + var0 += var0; } - } - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "27" - ) - public static boolean method1650(int var0) { - return var0 >= WorldMapDecorationType.field3171.id && var0 <= WorldMapDecorationType.field3166.id; } - @ObfuscatedName("av") + @ObfuscatedName("ij") @ObfuscatedSignature( - descriptor = "(B)Ljava/util/Date;", - garbageValue = "-13" + descriptor = "(IIIB)V", + garbageValue = "26" ) - static Date method1652() { - java.util.Calendar var0 = java.util.Calendar.getInstance(); - var0.set(2, 0); - var0.set(5, 1); - var0.set(1, 1900); - return var0.getTime(); - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(IIIIIILjt;Lih;I)V", - garbageValue = "-1043876293" - ) - @Export("addObjects") - static final void addObjects(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { - if (var0 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var0; - } - - ObjectComposition var8 = class91.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; - } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; + static final void method1649(int var0, int var1, int var2) { + if (ViewportMouse.cameraX < var0) { + ViewportMouse.cameraX = (var0 - ViewportMouse.cameraX) * class1.cameraLookAtAcceleration / 1000 + ViewportMouse.cameraX + WorldMapIcon_0.cameraMoveToSpeed; + if (ViewportMouse.cameraX > var0) { + ViewportMouse.cameraX = var0; } + } - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var12][var13] + var15[var11][var13] + var15[var11][var14] + var15[var12][var14] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = GrandExchangeOfferAgeComparator.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; + if (ViewportMouse.cameraX > var0) { + ViewportMouse.cameraX -= (ViewportMouse.cameraX - var0) * class1.cameraLookAtAcceleration / 1000 + WorldMapIcon_0.cameraMoveToSpeed; + if (ViewportMouse.cameraX < var0) { + ViewportMouse.cameraX = var0; } + } - if (var8.hasSound()) { - LoginScreenAnimation.method529(var0, var1, var2, var8, var4); + if (SecureRandomFuture.cameraY < var1) { + SecureRandomFuture.cameraY = (var1 - SecureRandomFuture.cameraY) * class1.cameraLookAtAcceleration / 1000 + SecureRandomFuture.cameraY + WorldMapIcon_0.cameraMoveToSpeed; + if (SecureRandomFuture.cameraY > var1) { + SecureRandomFuture.cameraY = var1; } + } - Object var22; - if (var5 == 22) { - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var22, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else { - int var31; - if (var5 != 10 && var5 != 11) { - int[] var10000; - if (var5 >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.method1287(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = UserComparator6.field1191[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field844[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - Tiles.field835[var0][var1][var2] = 50; - Tiles.field835[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = UserComparator6.field1191[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - Tiles.field835[var0][var1][var2 + 1] = 50; - Tiles.field835[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = UserComparator6.field1191[var0][var1]; - var10000[1 + var2] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - Tiles.field835[var0][var1 + 1][var2] = 50; - Tiles.field835[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = UserComparator6.field1191[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - Tiles.field835[var0][var1][var2] = 50; - Tiles.field835[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = UserComparator6.field1191[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1156(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method1293(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field843[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - Tiles.field835[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - Tiles.field835[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - Tiles.field835[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - Tiles.field835[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1156(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { - var28 = var4 + 1 & 3; - Object var23; - Object var24; - if (var8.animationId == -1 && var8.transforms == null) { - var23 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); - var24 = var8.getEntity(2, var28, var15, var17, var16, var18); - } else { - var23 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - var24 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var23, (Renderable)var24, Tiles.field844[var4], Tiles.field844[var28], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = UserComparator6.field1191[var0][var1]; - var10000[var2] |= 585; - var10000 = UserComparator6.field1191[var0][var1]; - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { - var10000 = UserComparator6.field1191[var0][var1]; - var10000[var2 + 1] |= 1170; - var10000 = UserComparator6.field1191[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = UserComparator6.field1191[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = UserComparator6.field1191[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = UserComparator6.field1191[var0][var1]; - var10000[var2] |= 1170; - var10000 = UserComparator6.field1191[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1156(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method1293(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field843[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - Tiles.field835[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - Tiles.field835[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - Tiles.field835[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - Tiles.field835[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method1156(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.method1287(var0, var1, var2, var16, 1, 1, (Renderable)var22, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method1293(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, Tiles.field844[var4], 0, 0, 0, var19, var21); - } else { - Object var25; - long var29; - if (var5 == 5) { - var28 = 16; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var29 != 0L) { - var28 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var29)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field844[var4], 0, var28 * Tiles.field847[var4], var28 * Tiles.field845[var4], var19, var21); - } else if (var5 == 6) { - var28 = 8; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var29 != 0L) { - var28 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var29)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field848[var4], var28 * Tiles.field846[var4], var19, var21); - } else if (var5 == 7) { - var31 = var4 + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var31 + 4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 4, var31 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var22, (Renderable)null, 256, var31, 0, 0, var19, var21); - } else if (var5 == 8) { - var28 = 8; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var29 != 0L) { - var28 = class91.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var29)).int2 / 2; - } - - int var27 = var4 + 2 & 3; - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field848[var4], var28 * Tiles.field846[var4], var19, var21); - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - if (var22 != null && var6.method1287(var0, var1, var2, var16, var9, var10, (Renderable)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { - var31 = 15; - if (var22 instanceof Model) { - var31 = ((Model)var22).method1363() / 4; - if (var31 > 30) { - var31 = 30; - } - } - - for (int var32 = 0; var32 <= var9; ++var32) { - for (int var33 = 0; var33 <= var10; ++var33) { - if (var31 > Tiles.field835[var0][var32 + var1][var33 + var2]) { - Tiles.field835[var0][var32 + var1][var33 + var2] = (byte)var31; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } + if (SecureRandomFuture.cameraY > var1) { + SecureRandomFuture.cameraY -= (SecureRandomFuture.cameraY - var1) * class1.cameraLookAtAcceleration / 1000 + WorldMapIcon_0.cameraMoveToSpeed; + if (SecureRandomFuture.cameraY < var1) { + SecureRandomFuture.cameraY = var1; } } - } - @ObfuscatedName("hh") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-176913511" - ) - static void method1653() { - int var0; - if (Client.field416 == class94.field929) { - class10.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0] = new CollisionMap(104, 104); + if (class36.cameraZ < var2) { + class36.cameraZ = (var2 - class36.cameraZ) * class1.cameraLookAtAcceleration / 1000 + class36.cameraZ + WorldMapIcon_0.cameraMoveToSpeed; + if (class36.cameraZ > var2) { + class36.cameraZ = var2; } + } - SpriteMask.sceneMinimapSprite = new SpritePixels(512, 512); - Login.Login_loadingText = "Starting game engine..."; - Login.Login_loadingPercent = 5; - Client.field416 = class94.field934; - } else if (class94.field934 == Client.field416) { - Login.Login_loadingText = "Prepared visibility map"; - Login.Login_loadingPercent = 10; - Client.field416 = class94.field933; - } else { - Archive var39; - if (class94.field933 == Client.field416) { - class92.field888 = class202.newArchive(0, false, true, true, false); - class199.field1567 = class202.newArchive(1, false, true, true, false); - SoundSystem.archive2 = class202.newArchive(2, true, false, true, false); - AbstractByteArrayCopier.archive4 = class202.newArchive(3, false, true, true, false); - class469.field3930 = class202.newArchive(4, false, true, true, false); - class198.archive9 = class202.newArchive(5, true, true, true, false); - CollisionMap.archive6 = class202.newArchive(6, true, true, true, false); - GrandExchangeOfferOwnWorldComparator.field361 = class202.newArchive(7, false, true, true, false); - class199.archive8 = class202.newArchive(8, false, true, true, false); - class241.field2052 = class202.newArchive(9, false, true, true, false); - class190.archive10 = class202.newArchive(10, false, true, true, false); - Language.field3643 = class202.newArchive(11, false, true, true, false); - SongTask.archive12 = class202.newArchive(12, false, true, true, false); - class27.archive13 = class202.newArchive(13, true, false, true, false); - ArchiveDiskAction.field3538 = class202.newArchive(14, false, true, true, false); - class317.field2776 = class202.newArchive(15, false, true, true, false); - WorldMapDecorationType.field3154 = class202.newArchive(17, true, true, true, false); - class358.field3177 = class202.newArchive(18, false, true, true, false); - AABB.field2123 = class202.newArchive(19, false, true, true, false); - HorizontalAlignment.field1584 = class202.newArchive(20, false, true, true, false); - class313.field2770 = class202.newArchive(21, false, true, true, false); - ArchiveDisk var36 = null; - if (JagexCache.JagexCache_dat2File != null) { - var36 = new ArchiveDisk(22, JagexCache.JagexCache_dat2File, UserComparator8.JagexCache_idxFiles[22], 1000000); - } - - var39 = new Archive(var36, UserComparator10.field1188, class59.field309, 22, false, true, true, true, true); - class319.field2799 = var39; - Login.Login_loadingText = "Connecting to update server"; - Login.Login_loadingPercent = 20; - Client.field416 = class94.field941; - } else if (class94.field941 == Client.field416) { - byte var33 = 0; - var0 = var33 + class92.field888.percentage() * 4 / 100; - var0 += class199.field1567.percentage() * 4 / 100; - var0 += SoundSystem.archive2.percentage() * 2 / 100; - var0 += AbstractByteArrayCopier.archive4.percentage() * 2 / 100; - var0 += class469.field3930.percentage() * 6 / 100; - var0 += class198.archive9.percentage() * 4 / 100; - var0 += CollisionMap.archive6.percentage() * 2 / 100; - var0 += GrandExchangeOfferOwnWorldComparator.field361.percentage() * 54 / 100; - var0 += class199.archive8.percentage() * 2 / 100; - var0 += class241.field2052.percentage() * 2 / 100; - var0 += class190.archive10.percentage() * 2 / 100; - var0 += Language.field3643.percentage() * 2 / 100; - var0 += SongTask.archive12.percentage() * 2 / 100; - var0 += class27.archive13.percentage() * 2 / 100; - var0 += ArchiveDiskAction.field3538.percentage() * 2 / 100; - var0 += class317.field2776.percentage() * 2 / 100; - var0 += AABB.field2123.percentage() / 100; - var0 += class358.field3177.percentage() / 100; - var0 += HorizontalAlignment.field1584.percentage() / 100; - var0 += class313.field2770.percentage() / 100; - var0 += class319.field2799.percentage() / 100; - var0 += WorldMapDecorationType.field3154.method1915() && WorldMapDecorationType.field3154.isFullyLoaded() ? 1 : 0; - if (var0 != 100) { - if (var0 != 0) { - Login.Login_loadingText = "Checking for updates - " + var0 + "%"; - } - - Login.Login_loadingPercent = 30; - } else { - MusicSong.method1732(class92.field888, "Animations"); - MusicSong.method1732(class199.field1567, "Skeletons"); - MusicSong.method1732(class469.field3930, "Sound FX"); - MusicSong.method1732(class198.archive9, "Maps"); - MusicSong.method1732(CollisionMap.archive6, "Music Tracks"); - MusicSong.method1732(GrandExchangeOfferOwnWorldComparator.field361, "Models"); - MusicSong.method1732(class199.archive8, "Sprites"); - MusicSong.method1732(Language.field3643, "Music Jingles"); - MusicSong.method1732(ArchiveDiskAction.field3538, "Music Samples"); - MusicSong.method1732(class317.field2776, "Music Patches"); - MusicSong.method1732(AABB.field2123, "World Map"); - MusicSong.method1732(class358.field3177, "World Map Geography"); - MusicSong.method1732(HorizontalAlignment.field1584, "World Map Ground"); - class241.field2053 = new GraphicsDefaults(); - class241.field2053.decode(WorldMapDecorationType.field3154); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.field416 = class94.field936; - } - } else { - int var5; - if (class94.field936 == Client.field416) { - class133.method720(22050, !Client.isLowDetail, 2); - ArrayList var41 = new ArrayList(3); - TaskHandler var28 = GameEngine.taskHandler; - short var29 = 2048; - if (var29 < 256) { - var29 = 256; - } - - PcmPlayer var34; - try { - PcmPlayer var25 = class16.pcmPlayerProvider.player(); - var25.samples = new int[(class306.PcmPlayer_stereo ? 2 : 1) * 256]; - var25.field195 = var29; - var25.init(); - var25.capacity = (var29 & -1024) + 1024; - if (var25.capacity > 16384) { - var25.capacity = 16384; - } - - var25.open(var25.capacity); - if (class225.field1884 > 0 && UserComparator4.soundSystem == null) { - UserComparator4.soundSystem = new SoundSystem(); - class353.soundSystemExecutor = Executors.newScheduledThreadPool(1); - class353.soundSystemExecutor.scheduleAtFixedRate(UserComparator4.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (UserComparator4.soundSystem != null) { - if (UserComparator4.soundSystem.players[0] != null) { - throw new IllegalArgumentException(); - } - - UserComparator4.soundSystem.players[0] = var25; - } - - var34 = var25; - } catch (Throwable var22) { - var34 = new PcmPlayer(); - } - - class171.pcmPlayer1 = var34; - class140.pcmStreamMixer = new PcmStreamMixer(); - PcmStreamMixer var27 = new PcmStreamMixer(); - var27.addSubStream(class140.pcmStreamMixer); - - for (var5 = 0; var5 < 3; ++var5) { - MidiPcmStream var31 = new MidiPcmStream(); - var31.method1671(9, 128); - var27.addSubStream(var31); - var41.add(var31); - } - - class171.pcmPlayer1.setStream(var27); - class1.method2(class317.field2776, ArchiveDiskAction.field3538, class469.field3930, var41); - class136.decimator = new Decimator(22050, PcmPlayer.field179); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.field416 = class94.field931; - class353.field3142 = new Fonts(class199.archive8, class27.archive13); - } else { - int var14; - if (class94.field931 == Client.field416) { - FontName[] var40 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; - var14 = var40.length; - Fonts var26 = class353.field3142; - FontName[] var42 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; - Client.fontsMap = var26.createMap(var42); - if (Client.fontsMap.size() < var14) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var14 + "%"; - Login.Login_loadingPercent = 40; - } else { - class14.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - UserComparator6.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - SoundCache.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - Skeleton.field2060 = Client.field641.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.field416 = class94.field938; - } - } else { - Archive var2; - int var3; - if (Client.field416 == class94.field938) { - var0 = Archive.method1922(class190.archive10, class199.archive8); - var2 = class199.archive8; - var3 = Login.field769.length + Login.field767.length; - String[] var24 = Login.field768; - - for (var5 = 0; var5 < var24.length; ++var5) { - String var30 = var24[var5]; - if (var2.getGroupId(var30) != -1) { - ++var3; - } - } - - if (var0 < var3) { - Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var3 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - DefaultsGroup.updateGameState(5); - Client.field416 = class94.field928; - } - } else if (class94.field928 == Client.field416) { - if (!SoundSystem.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + SoundSystem.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else if (!class313.field2770.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + (80 + SongTask.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 60; - } else { - class191.method958(SoundSystem.archive2); - var39 = SoundSystem.archive2; - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var39; - class145.method763(SoundSystem.archive2, GrandExchangeOfferOwnWorldComparator.field361); - class517.method2530(SoundSystem.archive2, GrandExchangeOfferOwnWorldComparator.field361, Client.isLowDetail); - Archive var32 = SoundSystem.archive2; - var2 = GrandExchangeOfferOwnWorldComparator.field361; - NPCComposition.NpcDefinition_archive = var32; - NPCComposition.field1595 = var2; - class142.method753(SoundSystem.archive2); - Projectile.method436(SoundSystem.archive2, GrandExchangeOfferOwnWorldComparator.field361, Client.isMembersWorld, class14.fontPlain11); - class138.method732(SoundSystem.archive2, class92.field888, class199.field1567); - Archive var15 = SoundSystem.archive2; - Archive var4 = GrandExchangeOfferOwnWorldComparator.field361; - SpotAnimationDefinition.SpotAnimationDefinition_archive = var15; - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var4; - Archive var43 = SoundSystem.archive2; - VarbitComposition.VarbitDefinition_archive = var43; - Archive var6 = SoundSystem.archive2; - VarpDefinition.VarpDefinition_archive = var6; - VarpDefinition.field1501 = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - class33.widgetDefinition = new WidgetDefinition(AbstractByteArrayCopier.archive4, GrandExchangeOfferOwnWorldComparator.field361, class199.archive8, class27.archive13, class319.field2799); - Decimator.method313(SoundSystem.archive2); - class275.method1537(SoundSystem.archive2); - class135.method727(SoundSystem.archive2); - Message.method338(SoundSystem.archive2); - FloorOverlayDefinition.method1108(SoundSystem.archive2); - MilliClock.method935(SoundSystem.archive2); - Varcs.method625(SoundSystem.archive2); - HealthBarDefinition.Widget_cachedModels = new class512(UrlRequester.field1163, 54, WorldMapLabelSize.clientLanguage, SoundSystem.archive2); - class53.Widget_cachedFonts = new class512(UrlRequester.field1163, 47, WorldMapLabelSize.clientLanguage, SoundSystem.archive2); - class33.varcs = new Varcs(); - UserComparator9.method680(SoundSystem.archive2, class199.archive8, class27.archive13); - Archive var35 = SoundSystem.archive2; - Archive var8 = class199.archive8; - HealthBarDefinition.HealthBarDefinition_archive = var35; - HealthBarDefinition.field1549 = var8; - Archive var37 = SoundSystem.archive2; - Archive var10 = class199.archive8; - WorldMapElement.WorldMapElement_archive = var10; - if (var37.isFullyLoaded()) { - DevicePcmPlayerProvider.WorldMapElement_count = var37.getGroupFileCount(35); - WorldMapElement.WorldMapElement_cached = new WorldMapElement[DevicePcmPlayerProvider.WorldMapElement_count]; - - for (int var11 = 0; var11 < DevicePcmPlayerProvider.WorldMapElement_count; ++var11) { - byte[] var12 = var37.takeFile(35, var11); - WorldMapElement.WorldMapElement_cached[var11] = new WorldMapElement(var11); - if (var12 != null) { - WorldMapElement.WorldMapElement_cached[var11].decode(new Buffer(var12)); - WorldMapElement.WorldMapElement_cached[var11].method967(); - } - } - } - - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.field416 = class94.field935; - } - } else if (class94.field935 == Client.field416) { - var0 = 0; - if (JSException.compass == null) { - JSException.compass = class47.SpriteBuffer_getSprite(class199.archive8, class241.field2053.compass, 0); - } else { - ++var0; - } - - if (ParamComposition.redHintArrowSprite == null) { - ParamComposition.redHintArrowSprite = class47.SpriteBuffer_getSprite(class199.archive8, class241.field2053.field3881, 0); - } else { - ++var0; - } - - IndexedSprite[] var1; - if (KitDefinition.mapSceneSprites == null) { - var2 = class199.archive8; - var3 = class241.field2053.mapScenes; - if (!class164.method862(var2, var3, 0)) { - var1 = null; - } else { - var1 = class512.method2517(); - } - - KitDefinition.mapSceneSprites = var1; - } else { - ++var0; - } - - SpritePixels var7; - byte[] var9; - SpritePixels[] var16; - int var17; - int var18; - int var19; - SpritePixels[] var23; - if (UserComparator4.headIconPkSprites == null) { - var2 = class199.archive8; - var3 = class241.field2053.headIconsPk; - if (!class164.method862(var2, var3, 0)) { - var23 = null; - } else { - var16 = new SpritePixels[class544.SpriteBuffer_spriteCount]; - var17 = 0; - - while (true) { - if (var17 >= class544.SpriteBuffer_spriteCount) { - class407.method2062(); - var23 = var16; - break; - } - - var7 = var16[var17] = new SpritePixels(); - var7.width = class159.SpriteBuffer_spriteWidth; - var7.height = class500.SpriteBuffer_spriteHeight; - var7.xOffset = class326.SpriteBuffer_xOffsets[var17]; - var7.yOffset = ModelData0.SpriteBuffer_yOffsets[var17]; - var7.subWidth = class59.SpriteBuffer_spriteWidths[var17]; - var7.subHeight = class544.SpriteBuffer_spriteHeights[var17]; - var18 = var7.subWidth * var7.subHeight; - var9 = AddRequestTask.SpriteBuffer_pixels[var17]; - var7.pixels = new int[var18]; - - for (var19 = 0; var19 < var18; ++var19) { - var7.pixels[var19] = class372.SpriteBuffer_spritePalette[var9[var19] & 255]; - } - - ++var17; - } - } - - UserComparator4.headIconPkSprites = var23; - } else { - ++var0; - } - - if (class157.headIconPrayerSprites == null) { - var2 = class199.archive8; - var3 = class241.field2053.field3883; - if (!class164.method862(var2, var3, 0)) { - var23 = null; - } else { - var16 = new SpritePixels[class544.SpriteBuffer_spriteCount]; - var17 = 0; - - while (true) { - if (var17 >= class544.SpriteBuffer_spriteCount) { - class407.method2062(); - var23 = var16; - break; - } - - var7 = var16[var17] = new SpritePixels(); - var7.width = class159.SpriteBuffer_spriteWidth; - var7.height = class500.SpriteBuffer_spriteHeight; - var7.xOffset = class326.SpriteBuffer_xOffsets[var17]; - var7.yOffset = ModelData0.SpriteBuffer_yOffsets[var17]; - var7.subWidth = class59.SpriteBuffer_spriteWidths[var17]; - var7.subHeight = class544.SpriteBuffer_spriteHeights[var17]; - var18 = var7.subHeight * var7.subWidth; - var9 = AddRequestTask.SpriteBuffer_pixels[var17]; - var7.pixels = new int[var18]; - - for (var19 = 0; var19 < var18; ++var19) { - var7.pixels[var19] = class372.SpriteBuffer_spritePalette[var9[var19] & 255]; - } - - ++var17; - } - } - - class157.headIconPrayerSprites = var23; - } else { - ++var0; - } - - if (UserComparator8.headIconHintSprites == null) { - var2 = class199.archive8; - var3 = class241.field2053.field3879; - if (!class164.method862(var2, var3, 0)) { - var23 = null; - } else { - var16 = new SpritePixels[class544.SpriteBuffer_spriteCount]; - var17 = 0; - - while (true) { - if (var17 >= class544.SpriteBuffer_spriteCount) { - class407.method2062(); - var23 = var16; - break; - } - - var7 = var16[var17] = new SpritePixels(); - var7.width = class159.SpriteBuffer_spriteWidth; - var7.height = class500.SpriteBuffer_spriteHeight; - var7.xOffset = class326.SpriteBuffer_xOffsets[var17]; - var7.yOffset = ModelData0.SpriteBuffer_yOffsets[var17]; - var7.subWidth = class59.SpriteBuffer_spriteWidths[var17]; - var7.subHeight = class544.SpriteBuffer_spriteHeights[var17]; - var18 = var7.subHeight * var7.subWidth; - var9 = AddRequestTask.SpriteBuffer_pixels[var17]; - var7.pixels = new int[var18]; - - for (var19 = 0; var19 < var18; ++var19) { - var7.pixels[var19] = class372.SpriteBuffer_spritePalette[var9[var19] & 255]; - } - - ++var17; - } - } - - UserComparator8.headIconHintSprites = var23; - } else { - ++var0; - } - - if (class47.mapMarkerSprites == null) { - class47.mapMarkerSprites = ScriptEvent.method468(class199.archive8, class241.field2053.field3884, 0); - } else { - ++var0; - } - - if (EnumComposition.crossSprites == null) { - var2 = class199.archive8; - var3 = class241.field2053.field3876; - if (!class164.method862(var2, var3, 0)) { - var23 = null; - } else { - var16 = new SpritePixels[class544.SpriteBuffer_spriteCount]; - var17 = 0; - - while (true) { - if (var17 >= class544.SpriteBuffer_spriteCount) { - class407.method2062(); - var23 = var16; - break; - } - - var7 = var16[var17] = new SpritePixels(); - var7.width = class159.SpriteBuffer_spriteWidth; - var7.height = class500.SpriteBuffer_spriteHeight; - var7.xOffset = class326.SpriteBuffer_xOffsets[var17]; - var7.yOffset = ModelData0.SpriteBuffer_yOffsets[var17]; - var7.subWidth = class59.SpriteBuffer_spriteWidths[var17]; - var7.subHeight = class544.SpriteBuffer_spriteHeights[var17]; - var18 = var7.subWidth * var7.subHeight; - var9 = AddRequestTask.SpriteBuffer_pixels[var17]; - var7.pixels = new int[var18]; - - for (var19 = 0; var19 < var18; ++var19) { - var7.pixels[var19] = class372.SpriteBuffer_spritePalette[var9[var19] & 255]; - } - - ++var17; - } - } - - EnumComposition.crossSprites = var23; - } else { - ++var0; - } - - if (class103.mapDotSprites == null) { - class103.mapDotSprites = ScriptEvent.method468(class199.archive8, class241.field2053.field3882, 0); - } else { - ++var0; - } - - if (class36.scrollBarSprites == null) { - var2 = class199.archive8; - var3 = class241.field2053.field3885; - if (!class164.method862(var2, var3, 0)) { - var1 = null; - } else { - var1 = class512.method2517(); - } - - class36.scrollBarSprites = var1; - } else { - ++var0; - } - - if (class178.field1459 == null) { - var2 = class199.archive8; - var3 = class241.field2053.field3878; - if (!class164.method862(var2, var3, 0)) { - var1 = null; - } else { - var1 = class512.method2517(); - } - - class178.field1459 = var1; - } else { - ++var0; - } - - if (var0 < 11) { - Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = class178.field1459; - ParamComposition.redHintArrowSprite.normalize(); - var14 = (int)(Math.random() * 21.0D) - 10; - int var20 = (int)(Math.random() * 21.0D) - 10; - var3 = (int)(Math.random() * 21.0D) - 10; - int var21 = (int)(Math.random() * 41.0D) - 20; - KitDefinition.mapSceneSprites[0].shiftColors(var21 + var14, var20 + var21, var21 + var3); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.field416 = class94.field940; - } - } else if (class94.field940 == Client.field416) { - if (!class241.field2052.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - class305.textureProvider = new TextureProvider(class241.field2052, class199.archive8, 20, class91.clientPreferences.getBrightness(), Client.isLowDetail ? 64 : 128); - Rasterizer3D.method1235(class305.textureProvider); - Rasterizer3D.method1236(class91.clientPreferences.getBrightness()); - Client.field416 = class94.field930; - } - } else if (class94.field930 == Client.field416) { - var0 = class305.textureProvider.getLoadedPercentage(); - if (var0 < 100) { - Login.Login_loadingText = "Loading textures - " + var0 + "%"; - Login.Login_loadingPercent = 90; - } else { - Login.Login_loadingText = "Loaded textures"; - Login.Login_loadingPercent = 90; - Client.field416 = class94.field927; - } - } else if (class94.field927 == Client.field416) { - class233.mouseRecorder = new MouseRecorder(); - GameEngine.taskHandler.newThreadTask(class233.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.field416 = class94.field937; - } else if (Client.field416 == class94.field937) { - if (!class190.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var38 = new Huffman(class190.archive10.takeFileByNames("huffman", "")); - class349.huffman = var38; - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.field416 = class94.field942; - } - } else if (class94.field942 == Client.field416) { - if (!AbstractByteArrayCopier.archive4.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + AbstractByteArrayCopier.archive4.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!class319.field2799.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + class319.field2799.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!SongTask.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + SongTask.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!class27.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + class27.archive13.loadPercent() / 50) + "%"; - Login.Login_loadingPercent = 96; - } else { - Login.Login_loadingText = "Loaded interfaces"; - Login.Login_loadingPercent = 98; - if (SongTask.archive12.isValidFileName("version.dat", "")) { - Buffer var13 = new Buffer(SongTask.archive12.takeFileByNames("version.dat", "")); - var13.readUnsignedShort(); - } - - Client.field416 = class94.field939; - } - } else if (class94.field939 == Client.field416) { - Login.Login_loadingPercent = 100; - if (AABB.field2123.getGroupCount() > 0 && !AABB.field2123.tryLoadGroupByName(WorldMapCacheName.field2482.name)) { - Login.Login_loadingText = "Loading world map - " + AABB.field2123.groupLoadPercentByName(WorldMapCacheName.field2482.name) / 10 + "%"; - } else { - if (class434.worldMap == null) { - class434.worldMap = new WorldMap(); - class434.worldMap.init(AABB.field2123, class358.field3177, HorizontalAlignment.field1584, SoundCache.fontBold12, Client.fontsMap, KitDefinition.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.field416 = class94.field932; - } - } else { - if (class94.field932 == Client.field416) { - DefaultsGroup.updateGameState(10); - } - - } - } - } + if (class36.cameraZ > var2) { + class36.cameraZ -= (class36.cameraZ - var2) * class1.cameraLookAtAcceleration / 1000 + WorldMapIcon_0.cameraMoveToSpeed; + if (class36.cameraZ < var2) { + class36.cameraZ = var2; } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class315.java b/osrs/src/main/java/class315.java deleted file mode 100644 index 00b4c78e8..000000000 --- a/osrs/src/main/java/class315.java +++ /dev/null @@ -1,35 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mm") -public final class class315 { - @ObfuscatedName("al") - static long field2773; - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(FFFFLfz;B)V", - garbageValue = "0" - ) - static void method1654(float var0, float var1, float var2, float var3, class132 var4) { - float var5 = var1 - var0; - float var6 = var2 - var1; - float var7 = var3 - var2; - float var8 = var6 - var5; - var4.field1240 = var7 - var6 - var8; - var4.field1242 = var8 + var8 + var8; - var4.field1249 = var5 + var5 + var5; - var4.field1244 = var0; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1734109525" - ) - public static void method1655() { - ItemComposition.ItemDefinition_cached.clear(); - ItemComposition.HealthBarDefinition_cachedSprites.clear(); - ItemComposition.ItemDefinition_cachedSprites.clear(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class316.java b/osrs/src/main/java/class316.java index 699565aef..2e13d1cc2 100644 --- a/osrs/src/main/java/class316.java +++ b/osrs/src/main/java/class316.java @@ -1,44 +1,67 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +@ObfuscatedName("mi") public class class316 { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "1726171577" + descriptor = "Lol;" ) - public static String method1656(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var3 = var0[var1]; - return var3 == null ? "null" : var3.toString(); - } else { - int var8 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var8; ++var5) { - CharSequence var6 = var0[var5]; - if (var6 == null) { - var4 += 4; - } else { - var4 += var6.length(); - } - } - - StringBuilder var9 = new StringBuilder(var4); + public static AbstractArchive field2792; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lol;" + ) + public static AbstractArchive field2791; + @ObfuscatedName("ao") + @Export("midiPcmStream") + public static ArrayList midiPcmStream; + @ObfuscatedName("ab") + public static LinkedList field2790; + @ObfuscatedName("au") + @Export("musicSongs") + public static ArrayList musicSongs; + @ObfuscatedName("aa") + public static ArrayList field2787; + @ObfuscatedName("ac") + static ArrayList field2798; + @ObfuscatedName("al") + public static final List field2793; + @ObfuscatedName("az") + @Export("musicPlayerStatus") + static int musicPlayerStatus; + @ObfuscatedName("ap") + static int field2794; + @ObfuscatedName("av") + static int field2795; + @ObfuscatedName("ax") + static int field2796; - for (int var10 = var1; var10 < var8; ++var10) { - CharSequence var7 = var0[var10]; - if (var7 == null) { - var9.append("null"); - } else { - var9.append(var7); - } - } + static { + midiPcmStream = null; + field2790 = new LinkedList(); + musicSongs = new ArrayList(3); + field2787 = new ArrayList(3); + field2798 = new ArrayList(); + field2793 = new ArrayList(); + musicPlayerStatus = 0; + field2794 = 0; + field2795 = 0; + field2796 = 0; + } - return var9.toString(); - } + @ObfuscatedName("nh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1493963164" + ) + static final void method1650() { + Client.field520 = Client.cycleCntr; + InterfaceParent.field861 = true; } } \ No newline at end of file diff --git a/osrs/src/main/java/class317.java b/osrs/src/main/java/class317.java deleted file mode 100644 index 4e2634f7e..000000000 --- a/osrs/src/main/java/class317.java +++ /dev/null @@ -1,36 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mw") -public class class317 { - @ObfuscatedName("wo") - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("ac") - static int[] field2775; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("ItemDefinition_archive") - static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("fx") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - static Archive field2776; - - static { - new Object(); - field2775 = new int[33]; - field2775[0] = 0; - int var0 = 2; - - for (int var1 = 1; var1 < 33; ++var1) { - field2775[var1] = var0 - 1; - var0 += var0; - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class319.java b/osrs/src/main/java/class319.java index 90d0274e4..767a395e2 100644 --- a/osrs/src/main/java/class319.java +++ b/osrs/src/main/java/class319.java @@ -2,358 +2,37 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.awt.*; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; +import java.util.concurrent.ThreadFactory; -@ObfuscatedName("mr") -public class class319 { - @ObfuscatedName("ac") +@ObfuscatedName("mv") +class class319 implements ThreadFactory { + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Lmn;" ) - static AbstractArchive field2800; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - static AbstractArchive field2802; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - static AbstractArchive field2801; - @ObfuscatedName("ax") - @Export("midiPcmStream") - public static ArrayList midiPcmStream; - @ObfuscatedName("ao") - public static LinkedList field2791; - @ObfuscatedName("ah") - @Export("musicSongs") - public static ArrayList musicSongs; - @ObfuscatedName("ar") - public static ArrayList field2789; - @ObfuscatedName("ab") - static ArrayList field2798; - @ObfuscatedName("am") - public static final List field2792; - @ObfuscatedName("av") - @Export("musicPlayerStatus") - static int musicPlayerStatus; - @ObfuscatedName("ag") - static int field2794; - @ObfuscatedName("aa") - static int field2793; - @ObfuscatedName("ap") - static int field2795; - @ObfuscatedName("ba") - static Image field2797; - @ObfuscatedName("gt") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - static Archive field2799; - - static { - midiPcmStream = null; - field2791 = new LinkedList(); - musicSongs = new ArrayList(3); - field2789 = new ArrayList(3); - field2798 = new ArrayList(); - field2792 = new ArrayList(); - musicPlayerStatus = 0; - field2794 = 0; - field2793 = 0; - field2795 = 0; - } + @Export("this$0") + @ObfuscatedName("this$0") + final MidiPcmStream this$0; - @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(CLoa;B)C", - garbageValue = "84" + descriptor = "(Lmn;)V" ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { - if (var0 >= 192 && var0 <= 198) { - return 'A'; - } - - if (var0 == 199) { - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { - return 'U'; - } - - if (var0 == 221) { - return 'Y'; - } - - if (var0 == 223) { - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { - return 'a'; - } - - if (var0 == 231) { - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { - return 'u'; - } - - if (var0 == 253 || var0 == 255) { - return 'y'; - } - } + class319(MidiPcmStream var1) { + this.this$0 = var1; + } - if (var0 == 338) { - return 'O'; - } else if (var0 == 339) { - return 'o'; - } else { - return var0 == 376 ? 'Y' : var0; - } + @Export("newThread") + @ObfuscatedName("newThread") + public Thread newThread(Runnable var1) { + return new Thread(var1, "OSRS WAV Load"); } - @ObfuscatedName("bf") + @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-1456273213" + descriptor = "(IB)I", + garbageValue = "29" ) - static int method1660(int var0, Script var1, boolean var2) { - if (var0 == 6500) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.loadWorlds() ? 1 : 0; - return 1; - } else { - World var3; - if (var0 == 6501) { - var3 = class53.worldListStart(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 6502) { - var3 = DevicePcmPlayerProvider.getNextWorldListWorld(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else { - World var4; - int var5; - int var7; - if (var0 == 6506) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = null; - - for (var5 = 0; var5 < World.World_count; ++var5) { - if (var7 == UserComparator3.World_worlds[var5].id) { - var4 = UserComparator3.World_worlds[var5]; - break; - } - } - - if (var4 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == 6507) { - Interpreter.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; - class230.sortWorldList(var7, var10, var5, var6); - return 1; - } else if (var0 != 6511) { - if (var0 == 6512) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else { - int var8; - ParamComposition var9; - if (var0 == 6513) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = class180.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class190.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class190.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6514) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = class180.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class91.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class91.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6515) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = class180.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class214.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6516) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = class180.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = class164.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class164.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == 6518) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == 6519) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType; - return 1; - } else if (var0 == 6520) { - return 1; - } else if (var0 == 6521) { - return 1; - } else if (var0 == 6522) { - --class180.Interpreter_stringStackSize; - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --class180.Interpreter_stringStackSize; - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 6524) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 6525) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == 6526) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == 6527) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field427; - return 1; - } else { - return 2; - } - } - } else { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var7 >= 0 && var7 < World.World_count) { - var4 = UserComparator3.World_worlds[var7]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - } - } + static final int method1705(int var0) { + return Math.abs(var0 - class192.cameraYaw) > 1024 ? (var0 < class192.cameraYaw ? 1 : -1) * 2048 + var0 : var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class320.java b/osrs/src/main/java/class320.java new file mode 100644 index 000000000..2f3c69596 --- /dev/null +++ b/osrs/src/main/java/class320.java @@ -0,0 +1,64 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mm") +public class class320 { + @ObfuscatedName("at") + int field2841; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lcg;" + ) + class53 field2840; + + @ObfuscatedSignature( + descriptor = "(ILcg;)V" + ) + class320(int var1, class53 var2) { + this.field2841 = var1; + this.field2840 = var2; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)[Loc;", + garbageValue = "48" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.field3523, PlayerType.PlayerType_playerModerator, PlayerType.field3518, PlayerType.PlayerType_normal, PlayerType.field3519, PlayerType.field3515, PlayerType.field3526, PlayerType.PlayerType_hardcoreIronman, PlayerType.field3529, PlayerType.PlayerType_ironman, PlayerType.PlayerType_ultimateIronman, PlayerType.field3521, PlayerType.PlayerType_jagexModerator, PlayerType.field3517, PlayerType.field3527, PlayerType.field3528, PlayerType.field3513}; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "194" + ) + static void method1707() { + class74.Tiles_underlays = null; + Interpreter.Tiles_overlays = null; + ViewportMouse.Tiles_shapes = null; + class369.field3559 = null; + class344.field3130 = null; + class93.field948 = null; + Tiles.field843 = null; + class337.Tiles_hue = null; + Tiles.Tiles_saturation = null; + class185.Tiles_lightness = null; + MenuAction.Tiles_hueMultiplier = null; + WorldMapLabelSize.field1943 = null; + } + + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1466473405" + ) + static void method1708() { + if (Client.field387) { + AccessFile.addPlayerToScene(class229.localPlayer, false); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class322.java b/osrs/src/main/java/class322.java index c58f1832a..c5bd75bff 100644 --- a/osrs/src/main/java/class322.java +++ b/osrs/src/main/java/class322.java @@ -2,28 +2,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.concurrent.ThreadFactory; - -@ObfuscatedName("mz") -class class322 implements ThreadFactory { - // $FF: synthetic field +@ObfuscatedName("mf") +public interface class322 { + @ObfuscatedName("im") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "(III)V", + garbageValue = "-1786579284" ) - @Export("this$0") - @ObfuscatedName("this$0") - final MidiPcmStream this$0; - - @ObfuscatedSignature( - descriptor = "(Lmt;)V" - ) - class322(MidiPcmStream var1) { - this.this$0 = var1; - } - - @Export("newThread") - @ObfuscatedName("newThread") - public Thread newThread(Runnable var1) { - return new Thread(var1, "OSRS WAV Load"); - } + @Export("vmethod1644") + void vmethod1644(int var1, int var2); } \ No newline at end of file diff --git a/osrs/src/main/java/class323.java b/osrs/src/main/java/class323.java index fb73d305a..f1aa35e08 100644 --- a/osrs/src/main/java/class323.java +++ b/osrs/src/main/java/class323.java @@ -1,21 +1,75 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mu") -public class class323 { - @ObfuscatedName("ac") - int field2844; - @ObfuscatedName("al") +import java.util.PriorityQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicBoolean; + +@ObfuscatedName("mo") +class class323 implements Callable { + @ObfuscatedName("vh") + static int field2851; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lmn;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final MidiPcmStream this$0; + // $FF: synthetic field + @Export("val$cancelled") + @ObfuscatedName("val$cancelled") + final AtomicBoolean val$cancelled; + @ObfuscatedSignature( - descriptor = "Lcu;" + descriptor = "(Lmn;Ljava/util/concurrent/atomic/AtomicBoolean;)V" ) - class53 field2843; + class323(MidiPcmStream var1, AtomicBoolean var2) { + this.this$0 = var1; + this.val$cancelled = var2; + } + + @Export("call") + @ObfuscatedName("call") + public Object call() { + PriorityQueue var1 = this.this$0.field2822; + while (true) { + class320 var2 = null; + synchronized(var1) { + if (var1.isEmpty() || this.val$cancelled.get()) { + return null; + } + + var2 = (class320)var1.remove(); + } + + var2.field2840.method304(); + } + } + + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(ILcu;)V" + descriptor = "(Ldo;III)V", + garbageValue = "1668364198" ) - class323(int var1, class53 var2) { - this.field2844 = var1; - this.field2843 = var2; + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; + Script var4; + if (class7.isWorldMapEvent(var0.type)) { + class133.worldMapEvent = (WorldMapEvent)var3[0]; + WorldMapElement var5 = class141.WorldMapElement_get(class133.worldMapEvent.mapElement); + var4 = ModeWhere.getWorldMapScript(var0.type, var5.objectId, var5.category); + } else { + int var6 = (Integer)var3[0]; + var4 = HealthBarUpdate.getScript(var6); + } + + if (var4 != null) { + ApproximateRouteStrategy.runScriptLogic(var0, var4, var1, var2); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class325.java b/osrs/src/main/java/class325.java deleted file mode 100644 index f95a3a0c3..000000000 --- a/osrs/src/main/java/class325.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mh") -public interface class325 { - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "328818380" - ) - @Export("vmethod1644") - void vmethod1644(int var1, int var2); -} \ No newline at end of file diff --git a/osrs/src/main/java/class326.java b/osrs/src/main/java/class326.java deleted file mode 100644 index 0dc74dd30..000000000 --- a/osrs/src/main/java/class326.java +++ /dev/null @@ -1,52 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.PriorityQueue; -import java.util.concurrent.Callable; -import java.util.concurrent.atomic.AtomicBoolean; - -@ObfuscatedName("ml") -class class326 implements Callable { - @ObfuscatedName("ax") - @Export("SpriteBuffer_xOffsets") - public static int[] SpriteBuffer_xOffsets; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lmt;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final MidiPcmStream this$0; - // $FF: synthetic field - @Export("val$cancelled") - @ObfuscatedName("val$cancelled") - final AtomicBoolean val$cancelled; - - @ObfuscatedSignature( - descriptor = "(Lmt;Ljava/util/concurrent/atomic/AtomicBoolean;)V" - ) - class326(MidiPcmStream var1, AtomicBoolean var2) { - this.this$0 = var1; - this.val$cancelled = var2; - } - - @Export("call") - @ObfuscatedName("call") - public Object call() { - PriorityQueue var1 = this.this$0.field2825; - - while (true) { - class323 var2 = null; - synchronized(var1) { - if (var1.isEmpty() || this.val$cancelled.get()) { - return null; - } - - var2 = (class323)var1.remove(); - } - - var2.field2843.method299(); - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class327.java b/osrs/src/main/java/class327.java new file mode 100644 index 000000000..e291ef0a3 --- /dev/null +++ b/osrs/src/main/java/class327.java @@ -0,0 +1,98 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Comparator; + +@ObfuscatedName("mu") +public class class327 implements Comparator { + class327() { + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lmm;Lmm;I)I", + garbageValue = "456447247" + ) + int method1725(class320 var1, class320 var2) { + return var1.field2841 - var2.field2841; + } + + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method1725((class320)var1, (class320)var2); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "31" + ) + static final void method1726() { + for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { + if (var0.plane == ItemLayer.Client_plane && Client.cycle <= var0.cycleEnd) { + if (Client.cycle >= var0.cycleStart) { + NPC var1; + int var2; + Player var3; + if (!var0.isMoving && var0.field804 != 0) { + if (var0.field804 > 0) { + var1 = Client.npcs[var0.field804 - 1]; + if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { + var0.sourceX = var1.x; + var0.sourceY = var1.y; + var0.setDestination(var0.field794, var0.field796, var0.field800, Client.cycle); + } + } else { + var2 = -var0.field804 - 1; + if (var2 == Client.localPlayerIndex) { + var3 = class229.localPlayer; + } else { + var3 = Client.players[var2]; + } + + if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { + var0.sourceX = var3.x; + var0.sourceY = var3.y; + var0.setDestination(var0.field794, var0.field796, var0.field800, Client.cycle); + } + } + } + + if (var0.targetIndex > 0) { + var1 = Client.npcs[var0.targetIndex - 1]; + if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { + var0.setDestination(var1.x, var1.y, WorldMapDecorationType.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); + } + } + + if (var0.targetIndex < 0) { + var2 = -var0.targetIndex - 1; + if (var2 == Client.localPlayerIndex) { + var3 = class229.localPlayer; + } else { + var3 = Client.players[var2]; + } + + if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { + var0.setDestination(var3.x, var3.y, WorldMapDecorationType.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); + } + } + + var0.advance(Client.field460); + class36.scene.drawEntity(ItemLayer.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); + } + } else { + var0.remove(); + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class329.java b/osrs/src/main/java/class329.java new file mode 100644 index 000000000..df796e924 --- /dev/null +++ b/osrs/src/main/java/class329.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.ObfuscatedName; + +import java.util.BitSet; + +@ObfuscatedName("ml") +public class class329 extends Node { + @ObfuscatedName("at") + int field2893; + @ObfuscatedName("ah") + BitSet field2894; + + class329(int var1) { + this.field2893 = var1; + this.field2894 = new BitSet(128); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class33.java b/osrs/src/main/java/class33.java index d49662207..24446069f 100644 --- a/osrs/src/main/java/class33.java +++ b/osrs/src/main/java/class33.java @@ -1,766 +1,77 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bz") +@ObfuscatedName("ba") public class class33 { - @ObfuscatedName("ay") - public static short[][] field87; - @ObfuscatedName("eu") - @ObfuscatedSignature( - descriptor = "Lnt;" - ) - @Export("widgetDefinition") - static WidgetDefinition widgetDefinition; - @ObfuscatedName("rv") - @ObfuscatedSignature( - descriptor = "Lek;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("ar") - int field91; - @ObfuscatedName("ab") + @ObfuscatedName("aa") int field90; + @ObfuscatedName("ac") + int field91; class33(int var1, int var2) { - this.field91 = var1; - this.field90 = var2; + this.field90 = var1; + this.field91 = var2; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lbd;I)Z", - garbageValue = "-114567882" + descriptor = "(Lbi;I)Z", + garbageValue = "1979217570" ) - boolean method133(class29 var1) { + boolean method142(class29 var1) { if (var1 == null) { return false; } else { - switch(this.field91) { + switch(this.field90) { case 1: - return var1.vmethod3949(this.field90); + return var1.vmethod3949(this.field91); case 2: - return var1.vmethod3989(this.field90); + return var1.vmethod3989(this.field91); case 3: - return var1.vmethod3951((char)this.field90); + return var1.vmethod3951((char)this.field91); case 4: - return var1.vmethod3953(this.field90 == 1); + return var1.vmethod3953(this.field91 == 1); default: return false; } } } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IIII)Lud;", - garbageValue = "1018953264" - ) - static SpritePixels method134(int var0, int var1, int var2) { - DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; - long var4 = (long)(var2 << 16 | var0 << 8 | var1); - return (SpritePixels)var3.get(var4); - } - - @ObfuscatedName("ab") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "973188034" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1755486935" ) - public static void method135() { - WorldMapElement.HitSplatDefinition_cached2.clear(); + static int method143(String var0) { + if (var0.equals("centre")) { + return 1; + } else { + return !var0.equals("bottom") && !var0.equals("right") ? 0 : 2; + } } - @ObfuscatedName("ll") + @ObfuscatedName("kd") @ObfuscatedSignature( - descriptor = "(IIIIILjava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "102" + descriptor = "(Ldn;I)V", + garbageValue = "-56685834" ) - @Export("menuAction") - static final void menuAction(int var0, int var1, int var2, int var3, int var4, String var5, String var6, int var7, int var8) { - if (var2 >= 2000) { - var2 -= 2000; - } - - PacketBufferNode var9; - if (var2 == 16) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.f97, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortAdd(Actor.field958); - var9.packetBuffer.writeShortLE(var3); - var9.packetBuffer.writeIntME(class4.field2); - var9.packetBuffer.writeShortAdd(var0 + class20.baseX); - var9.packetBuffer.writeShort(class129.field1205); - var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeShortLE(class19.baseY + var1); - Client.packetWriter.addNode(var9); - } - - if (var2 == 1008 || var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1012) { - class434.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - - Widget var10; - int var11; - if (var2 == 28) { - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.WIDGET_TYPE, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var9); - var10 = widgetDefinition.method1740(var1); - if (var10 != null && var10.cs1Instructions != null && var10.cs1Instructions[0][0] == 5) { - var11 = var10.cs1Instructions[0][1]; - Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; - ScriptEvent.changeGameOptions(var11); - } - } - - if (var2 == 4) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOC2, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortAdd(var3); - var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeShortAdd(var0 + class20.baseX); - var9.packetBuffer.writeShortLE(class19.baseY + var1); - Client.packetWriter.addNode(var9); - } - - if (var2 == 1) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.field2534, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntIME(class4.field2); - var9.packetBuffer.writeShortLE(var0 + class20.baseX); - var9.packetBuffer.writeShort(Actor.field958); - var9.packetBuffer.writeShortAdd(class129.field1205); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeShortAddLE(class19.baseY + var1); - Client.packetWriter.addNode(var9); - } - - if (var2 == 20) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJ3, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(class19.baseY + var1); - var9.packetBuffer.writeShortAddLE(var3); - var9.packetBuffer.writeShortAddLE(var0 + class20.baseX); - var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var9); - } - - PacketBufferNode var14; - NPC var15; - if (var2 == 7) { - var15 = Client.npcs[var3]; - if (var15 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.f69, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShortAdd(Actor.field958); - var14.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeInt(class4.field2); - var14.packetBuffer.writeShortLE(var3); - var14.packetBuffer.writeShortAddLE(class129.field1205); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 6) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOC4, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(class19.baseY + var1); - var9.packetBuffer.writeShortAddLE(var3); - var9.packetBuffer.writeShortAddLE(var0 + class20.baseX); - var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var9); - } - - Player var16; - if (var2 == 14) { - var16 = Client.players[var3]; - if (var16 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.f4, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeIntME(class4.field2); - var14.packetBuffer.writeShortAdd(Actor.field958); - var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShortAdd(var3); - var14.packetBuffer.writeShortAddLE(class129.field1205); - Client.packetWriter.addNode(var14); - } - } - - Widget var17; - if (var2 == 57 || var2 == 1007) { - var17 = widgetDefinition.getWidgetChild(var1, var0); - if (var17 != null) { - TextureProvider.widgetDefaultMenuAction(var3, var1, var0, var4, var6); - } - } - - if (var2 == 48) { - var16 = Client.players[var3]; - if (var16 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER5, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 50) { - var16 = Client.players[var3]; - if (var16 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 23) { - if (Client.isMenuOpen) { - class10.scene.setViewportWalking(); - } else { - class10.scene.menuOpen(class87.Client_plane, var0, var1, true); - } - } - - if (var2 == 13) { - var15 = Client.npcs[var3]; - if (var15 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPC5, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var14); - } - } - - PacketBufferNode var12; - if (var2 == 1003) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var15 = Client.npcs[var3]; - if (var15 != null) { - NPCComposition var18 = var15.definition; - if (var18.transforms != null) { - var18 = var18.transform(); - } - - if (var18 != null) { - var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPCE, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShortAddLE(var18.id); - Client.packetWriter.addNode(var12); - } - } - } - - if (var2 == 21) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJ4, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortAdd(var3); - var9.packetBuffer.writeShort(var0 + class20.baseX); - var9.packetBuffer.writeShort(class19.baseY + var1); - var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var9); - } - - if (var2 == 44) { - var16 = Client.players[var3]; - if (var16 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShortAddLE(var3); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 11) { - var15 = Client.npcs[var3]; - if (var15 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPC3, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShortAddLE(var3); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 5) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOC3, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortAddLE(class19.baseY + var1); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.writeShortLE(var0 + class20.baseX); - var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var9); - } - - if (var2 == 15) { - var16 = Client.players[var3]; - if (var16 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYERT, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShort(Client.selectedSpellItemId); - var14.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); - var14.packetBuffer.writeIntLE(JagexCache.selectedSpellWidget); - var14.packetBuffer.writeShortLE(var3); - var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 51) { - var16 = Client.players[var3]; - if (var16 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER8, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 22) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJ5, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeShort(class19.baseY + var1); - var9.packetBuffer.writeShortLE(var0 + class20.baseX); - var9.packetBuffer.writeShortAddLE(var3); - Client.packetWriter.addNode(var9); - } - - if (var2 == 24) { - var17 = widgetDefinition.method1740(var1); - if (var17 != null) { - boolean var13 = true; - if (var17.contentType > 0) { - var13 = EnumComposition.method1002(var17); - } - - if (var13) { - var12 = ClanChannelMember.getPacketBufferNode(ClientPacket.WIDGET_TYPE, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var12); - } - } - } - - if (var2 == 2) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOCT, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); - var9.packetBuffer.writeShort(var0 + class20.baseX); - var9.packetBuffer.writeIntIME(JagexCache.selectedSpellWidget); - var9.packetBuffer.writeShortLE(var3); - var9.packetBuffer.writeShortLE(class19.baseY + var1); - var9.packetBuffer.writeShortAdd(Client.selectedSpellItemId); - Client.packetWriter.addNode(var9); - } - - if (var2 == 30 && Client.meslayerContinueWidget == null) { - class174.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = widgetDefinition.getWidgetChild(var1, var0); - ClanChannelMember.invalidateWidget(Client.meslayerContinueWidget); - } - - if (var2 == 12) { - var15 = Client.npcs[var3]; - if (var15 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPC4, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 9) { - var15 = Client.npcs[var3]; - if (var15 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPC1, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShortAdd(var3); - var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 49) { - var16 = Client.players[var3]; - if (var16 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 19) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJ2, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortAddLE(var0 + class20.baseX); - var9.packetBuffer.writeShort(class19.baseY + var1); - var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeShortAdd(var3); - Client.packetWriter.addNode(var9); - } - - if (var2 == 1002) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOCE, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortAdd(var3); - Client.packetWriter.addNode(var9); - } - - if (var2 == 17) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJT, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortAdd(var3); - var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeInt(JagexCache.selectedSpellWidget); - var9.packetBuffer.writeShort(Client.selectedSpellItemId); - var9.packetBuffer.writeShortAddLE(class19.baseY + var1); - var9.packetBuffer.writeShortAddLE(var0 + class20.baseX); - var9.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var9); - } - - if (var2 == 46) { - var16 = Client.players[var3]; - if (var16 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER3, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShortAdd(var3); - var14.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 3) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOC1, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortAdd(var0 + class20.baseX); - var9.packetBuffer.writeShortAddLE(class19.baseY + var1); - var9.packetBuffer.writeShortAddLE(var3); - var9.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var9); - } - - if (var2 == 45) { - var16 = Client.players[var3]; - if (var16 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER2, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 10) { - var15 = Client.npcs[var3]; - if (var15 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPC2, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShortAdd(var3); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 1004) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJE, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(class19.baseY + var1); - var9.packetBuffer.writeShort(var0 + class20.baseX); - var9.packetBuffer.writeShortAdd(var3); - Client.packetWriter.addNode(var9); - } - - if (var2 == 58) { - var17 = widgetDefinition.getWidgetChild(var1, var0); - if (var17 != null) { - if (var17.field3105 != null) { - ScriptEvent var19 = new ScriptEvent(); - var19.widget = var17; - var19.opIndex = var3; - var19.targetName = var6; - var19.args = var17.field3105; - Interpreter.runScriptEvent(var19); - } - - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.IF_BUTTONT, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShortAddLE(Client.selectedSpellChildIndex); - var14.packetBuffer.writeInt(var1); - var14.packetBuffer.writeShortAdd(var4); - var14.packetBuffer.writeIntIME(JagexCache.selectedSpellWidget); - var14.packetBuffer.writeShortAddLE(Client.selectedSpellItemId); - var14.packetBuffer.writeShortAddLE(var0); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 18) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPOBJ1, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortAdd(class19.baseY + var1); - var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeShortAdd(var0 + class20.baseX); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - - if (var2 == 1001) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPLOC5, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.writeShortAdd(class19.baseY + var1); - var9.packetBuffer.writeShortAdd(var0 + class20.baseX); - var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var9); - } - - if (var2 == 29) { - var9 = ClanChannelMember.getPacketBufferNode(ClientPacket.WIDGET_TYPE, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var9); - var10 = widgetDefinition.method1740(var1); - if (var10 != null && var10.cs1Instructions != null && var10.cs1Instructions[0][0] == 5) { - var11 = var10.cs1Instructions[0][1]; - if (Varps.Varps_main[var11] != var10.cs1ComparisonValues[0]) { - Varps.Varps_main[var11] = var10.cs1ComparisonValues[0]; - ScriptEvent.changeGameOptions(var11); - } - } - } - - if (var2 == 47) { - var16 = Client.players[var3]; - if (var16 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShortAddLE(var3); - var14.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - Client.packetWriter.addNode(var14); - } - } - - if (var2 == 26) { - GrandExchangeOfferOwnWorldComparator.method351(); - } - - if (var2 == 25) { - var17 = widgetDefinition.getWidgetChild(var1, var0); - if (var17 != null) { - class286.method1575(); - class478.method2385(var1, var0, KitDefinition.Widget_unpackTargetMask(MouseRecorder.getWidgetFlags(var17)), var4); - Client.isItemSelected = 0; - Client.field599 = class155.Widget_getSpellActionName(var17); - if (Client.field599 == null) { - Client.field599 = "null"; - } - - if (var17.isIf3) { - Client.field600 = var17.dataText + Client.colorStartTag(16777215); - } else { - Client.field600 = Client.colorStartTag(65280) + var17.field3124 + Client.colorStartTag(16777215); - } - } - - } else { - if (var2 == 8) { - var15 = Client.npcs[var3]; - if (var15 != null) { - Client.mouseCrossX = var7; - Client.mouseCrossY = var8; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var14 = ClanChannelMember.getPacketBufferNode(ClientPacket.OPNPCT, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeIntIME(JagexCache.selectedSpellWidget); - var14.packetBuffer.writeShortAdd(Client.selectedSpellItemId); - var14.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var14.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); - var14.packetBuffer.writeShortAddLE(var3); - Client.packetWriter.addNode(var14); - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - ClanChannelMember.invalidateWidget(widgetDefinition.method1740(class4.field2)); - } - - if (Client.isSpellSelected) { - class286.method1575(); - } - - } + static void method144(NPC var0) { + var0.field983 = var0.definition.size; + var0.field1018 = var0.definition.rotation; + var0.walkSequence = var0.definition.walkSequence; + var0.walkBackSequence = var0.definition.walkBackSequence; + var0.walkLeftSequence = var0.definition.walkLeftSequence; + var0.walkRightSequence = var0.definition.walkRightSequence; + var0.idleSequence = var0.definition.idleSequence; + var0.turnLeftSequence = var0.definition.turnLeftSequence; + var0.turnRightSequence = var0.definition.turnRightSequence; + var0.runSequence = var0.definition.runSequence; + var0.runBackSequence = var0.definition.runBackSequence; + var0.runLeftSequence = var0.definition.runLeftSequence; + var0.runRightSequence = var0.definition.runRightSequence; + var0.crawlSequence = var0.definition.crawlSequence; + var0.crawlBackSequence = var0.definition.crawlBackSequence; + var0.crawlLeftSequence = var0.definition.crawlLeftSequence; + var0.crawlRightSequence = var0.definition.crawlRightSequence; } } \ No newline at end of file diff --git a/osrs/src/main/java/class330.java b/osrs/src/main/java/class330.java deleted file mode 100644 index 6d8280b29..000000000 --- a/osrs/src/main/java/class330.java +++ /dev/null @@ -1,71 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Comparator; - -@ObfuscatedName("me") -public class class330 implements Comparator { - class330() { - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lmu;Lmu;B)I", - garbageValue = "1" - ) - int method1728(class323 var1, class323 var2) { - return var1.field2844 - var2.field2844; - } - - @Export("compare") - @ObfuscatedName("compare") - public int compare(Object var1, Object var2) { - return this.method1728((class323)var1, (class323)var2); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "-1" - ) - static int method1729(int var0, Script var1, boolean var2) { - if (var0 == 6754) { - int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - NPCComposition var4 = class190.getNpcDefinition(var3); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; - return 1; - } else { - NPCComposition var5; - if (var0 == 6764) { - Interpreter.Interpreter_intStackSize -= 2; - var5 = class190.getNpcDefinition(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.method1020(var6); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.method1022(var6); - return 1; - } else if (var0 == 6765) { - var5 = class190.getNpcDefinition(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5 != null ? var5.combatLevel * -1524379573 * 1597602147 : 0; - return 1; - } else { - return 2; - } - } - } - - @ObfuscatedName("od") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1170534602" - ) - static void method1730(boolean var0) { - Client.leftClickOpensMenu = var0; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class332.java b/osrs/src/main/java/class332.java deleted file mode 100644 index 829ec24be..000000000 --- a/osrs/src/main/java/class332.java +++ /dev/null @@ -1,443 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.BitSet; - -@ObfuscatedName("my") -public class class332 extends Node { - @ObfuscatedName("ac") - int field2895; - @ObfuscatedName("al") - BitSet field2896; - - class332(int var1) { - this.field2895 = var1; - this.field2896 = new BitSet(128); - } - - @ObfuscatedName("kk") - @ObfuscatedSignature( - descriptor = "(ZLuy;I)V", - garbageValue = "2118721779" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field492 = 0; - Client.field450 = 0; - var1.importIndex(); - int var2 = var1.readBits(8); - int var3; - if (var2 < Client.npcCount) { - for (var3 = var2; var3 < Client.npcCount; ++var3) { - Client.field561[++Client.field492 - 1] = Client.npcIndices[var3]; - } - } - - if (var2 > Client.npcCount) { - throw new RuntimeException(""); - } else { - Client.npcCount = 0; - - int var6; - int var7; - int var8; - int var9; - for (var3 = 0; var3 < var2; ++var3) { - int var4 = Client.npcIndices[var3]; - NPC var5 = Client.npcs[var4]; - var6 = var1.readBits(1); - if (var6 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var4; - var5.npcCycle = Client.cycle; - } else { - var7 = var1.readBits(2); - if (var7 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var4; - var5.npcCycle = Client.cycle; - Client.field552[++Client.field450 - 1] = var4; - } else if (var7 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var4; - var5.npcCycle = Client.cycle; - var8 = var1.readBits(3); - var5.move(var8, MoveSpeed.WALK); - var9 = var1.readBits(1); - if (var9 == 1) { - Client.field552[++Client.field450 - 1] = var4; - } - } else if (var7 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var4; - var5.npcCycle = Client.cycle; - if (var1.readBits(1) == 1) { - var8 = var1.readBits(3); - var5.move(var8, MoveSpeed.RUN); - var9 = var1.readBits(3); - var5.move(var9, MoveSpeed.RUN); - } else { - var8 = var1.readBits(3); - var5.move(var8, MoveSpeed.CRAWL); - } - - var8 = var1.readBits(1); - if (var8 == 1) { - Client.field552[++Client.field450 - 1] = var4; - } - } else if (var7 == 3) { - Client.field561[++Client.field492 - 1] = var4; - } - } - } - - class13.method44(var0, var1); - - for (var2 = 0; var2 < Client.field450; ++var2) { - var3 = Client.field552[var2]; - NPC var14 = Client.npcs[var3]; - int var15 = var1.readUnsignedByte(); - if ((var15 & 64) != 0) { - var6 = var1.readUnsignedByte(); - var15 += var6 << 8; - } - - if ((var15 & 2048) != 0) { - var6 = var1.readUnsignedByte(); - var15 += var6 << 16; - } - - if ((var15 & 128) != 0) { - var6 = var1.readUnsignedShortAdd(); - if (var6 == 65535) { - var6 = -1; - } - - var7 = var1.readUnsignedByte(); - if (var6 == var14.sequence && var6 != -1) { - var8 = class36.SequenceDefinition_get(var6).replyMode; - if (var8 == 1) { - var14.sequenceFrame = 0; - var14.sequenceFrameCycle = 0; - var14.sequenceDelay = var7; - var14.currentSequenceFrameIndex = 0; - } - - if (var8 == 2) { - var14.currentSequenceFrameIndex = 0; - } - } else if (var6 == -1 || var14.sequence == -1 || class36.SequenceDefinition_get(var6).forcedPriority >= class36.SequenceDefinition_get(var14.sequence).forcedPriority) { - var14.sequence = var6; - var14.sequenceFrame = 0; - var14.sequenceFrameCycle = 0; - var14.sequenceDelay = var7; - var14.currentSequenceFrameIndex = 0; - var14.field1023 = var14.pathLength; - } - } - - if ((var15 & 2) != 0) { - var14.definition = class190.getNpcDefinition(var1.readIntME()); - WorldMapLabel.method1571(var14); - var14.method591(); - } - - if ((var15 & 32768) != 0) { - var14.field1016 = var1.readByteAdd(); - var14.field1013 = var1.readByte(); - var14.field1021 = var1.readByte(); - var14.field1010 = var1.readByteSub(); - var14.spotAnimation = var1.readIntME() + Client.cycle; - var14.exactMoveArrive1Cycle = var1.readUnsignedShort() + Client.cycle; - var14.exactMoveDirection = var1.readUnsignedShortAdd(); - var14.pathLength = 1; - var14.field1023 = 0; - var14.field1016 += var14.pathX[0]; - var14.field1013 += var14.pathY[0]; - var14.field1021 += var14.pathX[0]; - var14.field1010 += var14.pathY[0]; - } - - if ((var15 & 8) != 0) { - var1.readUnsignedShort(); - var1.readInt(); - } - - int var10; - int var11; - int[] var16; - short[] var17; - short[] var18; - long var19; - boolean var22; - if ((var15 & 16384) != 0) { - var6 = var1.readUnsignedByte(); - if ((var6 & 1) == 1) { - var14.method595(); - } else { - var16 = null; - if ((var6 & 2) == 2) { - var8 = var1.readUnsignedByteAdd(); - var16 = new int[var8]; - - for (var9 = 0; var9 < var8; ++var9) { - var10 = var1.readUnsignedShortAdd(); - var10 = var10 == 65535 ? -1 : var10; - var16[var9] = var10; - } - } - - var17 = null; - if ((var6 & 4) == 4) { - var9 = 0; - if (var14.definition.recolorTo != null) { - var9 = var14.definition.recolorTo.length; - } - - var17 = new short[var9]; - - for (var10 = 0; var10 < var9; ++var10) { - var17[var10] = (short)var1.readUnsignedShortAdd(); - } - } - - var18 = null; - if ((var6 & 8) == 8) { - var10 = 0; - if (var14.definition.retextureTo != null) { - var10 = var14.definition.retextureTo.length; - } - - var18 = new short[var10]; - - for (var11 = 0; var11 < var10; ++var11) { - var18[var11] = (short)var1.readUnsignedShort(); - } - } - - var22 = false; - if ((var6 & 16) != 0) { - var22 = var1.readUnsignedByteNeg() == 1; - } - - var19 = (long)(++NPC.field1076 - 1); - var14.method592(new NewShit(var19, var16, var17, var18, var22)); - } - } - - if ((var15 & 512) != 0) { - var14.method578(var1.readStringCp1252NullTerminated()); - } - - if ((var15 & 4096) != 0) { - var6 = var1.readUnsignedByteAdd(); - if ((var6 & 1) == 1) { - var14.method596(); - } else { - var16 = null; - if ((var6 & 2) == 2) { - var8 = var1.readUnsignedByte(); - var16 = new int[var8]; - - for (var9 = 0; var9 < var8; ++var9) { - var10 = var1.readIntME(); - var10 = var10 == 65535 ? -1 : var10; - var16[var9] = var10; - } - } - - var17 = null; - if ((var6 & 4) == 4) { - var9 = 0; - if (var14.definition.recolorTo != null) { - var9 = var14.definition.recolorTo.length; - } - - var17 = new short[var9]; - - for (var10 = 0; var10 < var9; ++var10) { - var17[var10] = (short)var1.readIntME(); - } - } - - var18 = null; - if ((var6 & 8) == 8) { - var10 = 0; - if (var14.definition.retextureTo != null) { - var10 = var14.definition.retextureTo.length; - } - - var18 = new short[var10]; - - for (var11 = 0; var11 < var10; ++var11) { - var18[var11] = (short)var1.readUnsignedShortAdd(); - } - } - - var22 = false; - if ((var6 & 16) != 0) { - var22 = var1.readUnsignedByte() == 1; - } - - var19 = (long)(++NPC.field1077 - 1); - var14.method594(new NewShit(var19, var16, var17, var18, var22)); - } - } - - if ((var15 & 262144) != 0) { - var6 = var1.readInt(); - var14.turnLeftSequence = (var6 & 1) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.turnLeftSequence * -683029639 * -518279479; - var14.turnRightSequence = (var6 & 2) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.turnRightSequence * -650094419 * 53136165; - var14.walkSequence = (var6 & 4) != 0 ? var1.readUnsignedShortAdd() : var14.definition.walkSequence * 12153249 * 1652208225; - var14.walkBackSequence = (var6 & 8) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.walkBackSequence * -601680513 * 514763391; - var14.walkLeftSequence = (var6 & 16) != 0 ? var1.readUnsignedShort() : var14.definition.walkLeftSequence * 407029447 * 193862391; - var14.walkRightSequence = (var6 & 32) != 0 ? var1.readIntME() : var14.definition.walkRightSequence * -1457167705 * 1557013783; - var14.runSequence = (var6 & 64) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.runSequence * -1220844931 * -1279088939; - var14.runBackSequence = (var6 & 128) != 0 ? var1.readUnsignedShortAdd() : var14.definition.runBackSequence * -1135999935 * -1929114687; - var14.runLeftSequence = (var6 & 256) != 0 ? var1.readIntME() : var14.definition.runLeftSequence * 1482173473 * -1555933215; - var14.runRightSequence = (var6 & 512) != 0 ? var1.readUnsignedShort() : var14.definition.runRightSequence * -2140161505 * -936033825; - var14.crawlSequence = (var6 & 1024) != 0 ? var1.readUnsignedShort() : var14.definition.crawlSequence * 700539735 * 578435175; - var14.crawlBackSequence = (var6 & 2048) != 0 ? var1.readUnsignedShort() : var14.definition.crawlBackSequence * 279963805 * -2084184651; - var14.crawlLeftSequence = (var6 & 4096) != 0 ? var1.readIntME() : var14.definition.crawlLeftSequence * -2021467469 * 1677812859; - var14.crawlRightSequence = (var6 & 8192) != 0 ? var1.readUnsignedShortAdd() : var14.definition.crawlRightSequence * 1071402625 * 999682433; - var14.idleSequence = (var6 & 16384) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.idleSequence * -771436155 * 1122795341; - } - - if ((var15 & 131072) != 0) { - var6 = var1.readUnsignedByteAdd(); - - for (var7 = 0; var7 < var6; ++var7) { - var8 = var1.readUnsignedByteSub(); - var9 = var1.readUnsignedShortAddLE(); - var10 = var1.readUnsignedIntME(); - var14.updateSpotAnimation(var8, var9, var10 >> 16, var10 & 65535); - } - } - - if ((var15 & 8192) != 0) { - var14.method579(var1.readUnsignedByteSub()); - } - - if ((var15 & 32) != 0) { - var14.overheadText = var1.readStringCp1252NullTerminated(); - var14.overheadTextCyclesRemaining = 100; - } - - if ((var15 & 16) != 0) { - var6 = var1.readUnsignedShort(); - var7 = var1.readIntME(); - var14.field964 = var1.readUnsignedByteAdd() == 1; - if (Client.param25 >= 212) { - var14.field995 = var6; - var14.field996 = var7; - } else { - var8 = var14.x - (var6 - class20.baseX - class20.baseX) * 64; - var9 = var14.y - (var7 - class19.baseY - class19.baseY) * 64; - if (var8 != 0 || var9 != 0) { - var11 = (int)(Math.atan2((double)var8, (double)var9) * 325.94932345220167D) & 2047; - var14.movingOrientation = var11; - } - } - } - - if ((var15 & 256) != 0) { - var14.combatLevelChange = var1.readUnsignedIntLE(); - } - - if ((var15 & 4) != 0) { - var14.targetIndex = var1.readIntME(); - var14.targetIndex += var1.readUnsignedByte() << 16; - var6 = 16777215; - if (var6 == var14.targetIndex) { - var14.targetIndex = -1; - } - } - - if ((var15 & 1) != 0) { - var6 = var1.readUnsignedByte(); - int var12; - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var9 = -1; - var10 = -1; - var11 = -1; - var8 = var1.readUShortSmart(); - if (var8 == 32767) { - var8 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - var9 = var1.readUShortSmart(); - var11 = var1.readUShortSmart(); - } else if (var8 != 32766) { - var10 = var1.readUShortSmart(); - } else { - var8 = -1; - } - - var12 = var1.readUShortSmart(); - var14.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); - } - } - - var7 = var1.readUnsignedByteAdd(); - if (var7 > 0) { - for (var8 = 0; var8 < var7; ++var8) { - var9 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - if (var10 != 32767) { - var11 = var1.readUShortSmart(); - var12 = var1.readUnsignedByte(); - int var13 = var10 > 0 ? var1.readUnsignedByteNeg() : var12; - var14.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); - } else { - var14.removeHealthBar(var9); - } - } - } - } - - if ((var15 & 1024) != 0) { - var14.recolourStartCycle = Client.cycle + var1.readUnsignedShort(); - var14.recolourEndCycle = Client.cycle + var1.readUnsignedShortAddLE(); - var14.recolourHue = var1.readByteSub(); - var14.recolourSaturation = var1.readByte(); - var14.recolourLuminance = var1.readByteNeg(); - var14.recolourAmount = (byte)var1.readUnsignedByte(); - } - - if ((var15 & 65536) != 0) { - var6 = var1.readUnsignedByteNeg(); - var16 = new int[8]; - var17 = new short[8]; - - for (var9 = 0; var9 < 8; ++var9) { - if ((var6 & 1 << var9) != 0) { - var16[var9] = var1.readNullableLargeSmart(); - var17[var9] = (short)var1.readShortSmartSub(); - } else { - var16[var9] = -1; - var17[var9] = -1; - } - } - - var14.method590(var16, var17); - } - } - - for (var2 = 0; var2 < Client.field492; ++var2) { - var3 = Client.field561[var2]; - if (Client.npcs[var3].npcCycle != Client.cycle) { - Client.npcs[var3].definition = null; - Client.npcs[var3] = null; - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var2 = 0; var2 < Client.npcCount; ++var2) { - if (Client.npcs[Client.npcIndices[var2]] == null) { - throw new RuntimeException(var2 + "," + Client.npcCount); - } - } - - } - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class334.java b/osrs/src/main/java/class334.java new file mode 100644 index 000000000..3908e8b9f --- /dev/null +++ b/osrs/src/main/java/class334.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mc") +public interface class334 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "5" + ) + @Export("vmethod5708") + void vmethod5708(); +} \ No newline at end of file diff --git a/osrs/src/main/java/class336.java b/osrs/src/main/java/class336.java new file mode 100644 index 000000000..613e84048 --- /dev/null +++ b/osrs/src/main/java/class336.java @@ -0,0 +1,215 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mp") +public class class336 { + @ObfuscatedName("at") + public int field2923; + @ObfuscatedName("ah") + public int field2921; + @ObfuscatedName("ar") + public int field2922; + + class336() { + } + + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1748948438" + ) + static final void method1740() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { + var0 = class229.localPlayer.x; + var1 = class229.localPlayer.y; + if (LoginScreenAnimation.oculusOrbFocalPointX - var0 < -500 || LoginScreenAnimation.oculusOrbFocalPointX - var0 > 500 || ScriptFrame.oculusOrbFocalPointY - var1 < -500 || ScriptFrame.oculusOrbFocalPointY - var1 > 500) { + LoginScreenAnimation.oculusOrbFocalPointX = var0; + ScriptFrame.oculusOrbFocalPointY = var1; + } + + if (var0 != LoginScreenAnimation.oculusOrbFocalPointX) { + LoginScreenAnimation.oculusOrbFocalPointX += (var0 - LoginScreenAnimation.oculusOrbFocalPointX) / 16; + } + + if (var1 != ScriptFrame.oculusOrbFocalPointY) { + ScriptFrame.oculusOrbFocalPointY += (var1 - ScriptFrame.oculusOrbFocalPointY) / 16; + } + + var2 = LoginScreenAnimation.oculusOrbFocalPointX >> 7; + var3 = ScriptFrame.oculusOrbFocalPointY >> 7; + var4 = WorldMapDecorationType.getTileHeight(LoginScreenAnimation.oculusOrbFocalPointX, ScriptFrame.oculusOrbFocalPointY, ItemLayer.Client_plane); + var5 = 0; + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { + int var8 = ItemLayer.Client_plane; + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { + ++var8; + } + + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; + if (var9 > var5) { + var5 = var9; + } + } + } + } + + var6 = var5 * 192; + if (var6 > 98048) { + var6 = 98048; + } + + if (var6 < 32768) { + var6 = 32768; + } + + if (var6 > Client.field473) { + Client.field473 += (var6 - Client.field473) / 24; + } else if (var6 < Client.field473) { + Client.field473 += (var6 - Client.field473) / 80; + } + + class12.field41 = WorldMapDecorationType.getTileHeight(class229.localPlayer.x, class229.localPlayer.y, ItemLayer.Client_plane) - Client.camFollowHeight; + } else if (Client.oculusOrbState == 1) { + WorldMapCacheName.method1356(); + short var10 = -1; + if (Client.keyHandlerInstance.getKeyPressed(33)) { + var10 = 0; + } else if (Client.keyHandlerInstance.getKeyPressed(49)) { + var10 = 1024; + } + + if (Client.keyHandlerInstance.getKeyPressed(48)) { + if (var10 == 0) { + var10 = 1792; + } else if (var10 == 1024) { + var10 = 1280; + } else { + var10 = 1536; + } + } else if (Client.keyHandlerInstance.getKeyPressed(50)) { + if (var10 == 0) { + var10 = 256; + } else if (var10 == 1024) { + var10 = 768; + } else { + var10 = 512; + } + } + + byte var11 = 0; + if (Client.keyHandlerInstance.getKeyPressed(35)) { + var11 = -1; + } else if (Client.keyHandlerInstance.getKeyPressed(51)) { + var11 = 1; + } + + var2 = 0; + if (var10 >= 0 || var11 != 0) { + var2 = Client.keyHandlerInstance.getKeyPressed(81) ? Client.oculusOrbSlowedSpeed * -1965908365 * 1910388411 : Client.oculusOrbNormalSpeed * -203139789 * -29381125; + var2 *= 16; + Client.field462 = var10; + Client.field477 = var11; + } + + if (Client.field471 < var2) { + Client.field471 += var2 / 8; + if (Client.field471 > var2) { + Client.field471 = var2; + } + } else if (Client.field471 > var2) { + Client.field471 = Client.field471 * 9 / 10; + } + + if (Client.field471 > 0) { + var3 = Client.field471 / 16; + if (Client.field462 >= 0) { + var0 = Client.field462 - class192.cameraYaw & 2047; + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; + LoginScreenAnimation.oculusOrbFocalPointX += var3 * var4 / 65536; + ScriptFrame.oculusOrbFocalPointY += var5 * var3 / 65536; + } + + if (Client.field477 != 0) { + class12.field41 += var3 * Client.field477; + if (class12.field41 > 0) { + class12.field41 = 0; + } + } + } else { + Client.field462 = -1; + Client.field477 = -1; + } + + if (Client.keyHandlerInstance.getKeyPressed(13)) { + Client.packetWriter.addNode(class113.getPacketBufferNode(ClientPacket.field2593, Client.packetWriter.isaacCipher)); + Client.oculusOrbState = 0; + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && class19.mouseCam) { + var0 = MouseHandler.MouseHandler_y - Client.field464; + Client.camAngleDX = var0 * 2; + Client.field464 = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.field464) / 2 : MouseHandler.MouseHandler_y * -357791911 * 1534415081; + var1 = Client.field478 - MouseHandler.MouseHandler_x; + Client.camAngleDY = var1 * 2; + Client.field478 = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.field478) / 2 : MouseHandler.MouseHandler_x * 1619580465 * -948387119; + } else { + if (Client.keyHandlerInstance.getKeyPressed(96)) { + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (Client.keyHandlerInstance.getKeyPressed(97)) { + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; + } + + if (Client.keyHandlerInstance.getKeyPressed(98)) { + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (Client.keyHandlerInstance.getKeyPressed(99)) { + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; + } + + Client.field464 = MouseHandler.MouseHandler_y; + Client.field478 = MouseHandler.MouseHandler_x; + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; + Client.camAngleX += Client.camAngleDX / 2; + if (Client.camAngleX < 128) { + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { + Client.camAngleX = 383; + } + + } + + @ObfuscatedName("oi") + @ObfuscatedSignature( + descriptor = "(Luj;IS)V", + garbageValue = "241" + ) + static void method1741(Buffer var0, int var1) { + NewShit.method936(var0.array, var1); + if (JagexCache.JagexCache_randomDat != null) { + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); + } catch (Exception var3) { + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class337.java b/osrs/src/main/java/class337.java index e53efa575..2457a094d 100644 --- a/osrs/src/main/java/class337.java +++ b/osrs/src/main/java/class337.java @@ -1,14 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mg") -public interface class337 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-118" - ) - @Export("vmethod5708") - void vmethod5708(); +@ObfuscatedName("mz") +public class class337 { + @ObfuscatedName("az") + @Export("Tiles_hue") + static int[] Tiles_hue; } \ No newline at end of file diff --git a/osrs/src/main/java/class338.java b/osrs/src/main/java/class338.java new file mode 100644 index 000000000..7cbb18d3d --- /dev/null +++ b/osrs/src/main/java/class338.java @@ -0,0 +1,62 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.net.MalformedURLException; +import java.net.URL; + +@ObfuscatedName("nd") +public class class338 { + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Luu;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lea;" + ) + UrlRequest field2926; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Luz;" + ) + SpritePixels field2927; + + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lel;)V" + ) + class338(String var1, UrlRequester var2) { + try { + this.field2926 = var2.request(new URL(var1)); + } catch (MalformedURLException var4) { + this.field2926 = null; + } + + } + + @ObfuscatedSignature( + descriptor = "(Lea;)V" + ) + class338(UrlRequest var1) { + this.field2926 = var1; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)Luz;", + garbageValue = "1464542862" + ) + SpritePixels method1742() { + if (this.field2927 == null && this.field2926 != null && this.field2926.isDone()) { + if (this.field2926.getResponse() != null) { + this.field2927 = WorldMapArchiveLoader.method2391(this.field2926.getResponse()); + } + + this.field2926 = null; + } + + return this.field2927; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class339.java b/osrs/src/main/java/class339.java index ad644b414..e49e2e857 100644 --- a/osrs/src/main/java/class339.java +++ b/osrs/src/main/java/class339.java @@ -1,25 +1,175 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nx") +import java.awt.*; +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; + +@ObfuscatedName("nq") public class class339 { - @ObfuscatedName("ac") - public int field2923; - @ObfuscatedName("al") - public int field2925; - @ObfuscatedName("ak") - public int field2924; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lni;" + ) + public class341 field2934; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lmp;" + ) + class336 field2929; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lbd;" + ) + class27 field2928; + @ObfuscatedName("ao") + public Object[] field2932; + @ObfuscatedName("ab") + public Object[] field2931; + @ObfuscatedName("au") + public Object[] field2933; + @ObfuscatedName("aa") + public Object[] field2930; class339() { + this.field2934 = new class341(); + this.field2929 = new class336(); + this.field2928 = new class27(); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-687709037" + ) + static void method1743(Component var0) { + var0.removeMouseListener(MouseHandler.MouseHandler_instance); + var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.removeFocusListener(MouseHandler.MouseHandler_instance); + MouseHandler.MouseHandler_currentButtonVolatile = 0; } - @ObfuscatedName("ae") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-250555554" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "99" ) - static void method1746() { - GameEngine.method166(24); - AbstractWorldMapIcon.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); + public static void method1744(String var0, String var1, String var2, int var3, int var4) throws IOException { + if (var1 != null && !var1.isEmpty()) { + var0 = var0 + "-" + var1; + } + + UserComparator6.field1202 = var4; + class521.cacheGamebuild = var3; + + try { + class90.field893 = System.getProperty("os.name"); + } catch (Exception var19) { + class90.field893 = "Unknown"; + } + + ClanChannel.field1413 = class90.field893.toLowerCase(); + Login.userHomeDirectory = null; + + try { + Login.userHomeDirectory = System.getProperty("jagex.userhome"); + } catch (Exception var18) { + } + + if (Login.userHomeDirectory == null) { + try { + Login.userHomeDirectory = System.getProperty("user.home"); + } catch (Exception var17) { + } + } + + if (Login.userHomeDirectory != null) { + Login.userHomeDirectory = Login.userHomeDirectory + "/"; + } + + try { + if (ClanChannel.field1413.startsWith("win")) { + if (Login.userHomeDirectory == null) { + Login.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (Login.userHomeDirectory == null) { + Login.userHomeDirectory = System.getenv("HOME"); + } + + if (Login.userHomeDirectory != null) { + Login.userHomeDirectory = Login.userHomeDirectory + "/"; + } + } catch (Exception var16) { + } + + if (Login.userHomeDirectory == null) { + Login.userHomeDirectory = "~/"; + } + + GameObject.field2480 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", Login.userHomeDirectory, "/tmp/", ""}; + class85.field859 = new String[]{".jagex_cache_" + class521.cacheGamebuild, ".file_store_" + class521.cacheGamebuild}; + int var13 = 0; + + label107: + while (var13 < 4) { + JagexCache.cacheDir = class181.method918(var0, var2, var13); + if (!JagexCache.cacheDir.exists()) { + JagexCache.cacheDir.mkdirs(); + } + + File[] var6 = JagexCache.cacheDir.listFiles(); + if (var6 == null) { + break; + } + + File[] var7 = var6; + int var8 = 0; + + while (true) { + if (var8 >= var7.length) { + break label107; + } + + File var9 = var7[var8]; + + boolean var10; + try { + RandomAccessFile var11 = new RandomAccessFile(var9, "rw"); + int var12 = var11.read(); + var11.seek(0L); + var11.write(var12); + var11.seek(0L); + var11.close(); + var10 = true; + } catch (Exception var15) { + var10 = false; + } + + if (!var10) { + ++var13; + break; + } + + ++var8; + } + } + + File var5 = JagexCache.cacheDir; + FileSystem.FileSystem_cacheDir = var5; + if (!FileSystem.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; + PacketWriter.method643(); + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class10.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class10.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + KeyHandler.JagexCache_idxFiles = new BufferedFile[UserComparator6.field1202]; + + for (int var14 = 0; var14 < UserComparator6.field1202; ++var14) { + KeyHandler.JagexCache_idxFiles[var14] = new BufferedFile(new AccessFile(class10.getFile("main_file_cache.idx" + var14), "rw", 1048576L), 6000, 0); + } + + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class340.java b/osrs/src/main/java/class340.java deleted file mode 100644 index ce60c5b75..000000000 --- a/osrs/src/main/java/class340.java +++ /dev/null @@ -1,9 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("nv") -public class class340 { - @ObfuscatedName("aw") - @Export("canvasWidth") - public static int canvasWidth; -} \ No newline at end of file diff --git a/osrs/src/main/java/class341.java b/osrs/src/main/java/class341.java index d3b6d8f1c..804812ba2 100644 --- a/osrs/src/main/java/class341.java +++ b/osrs/src/main/java/class341.java @@ -1,59 +1,1241 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.net.MalformedURLException; -import java.net.URL; +import java.awt.datatransfer.*; -@ObfuscatedName("nd") +@ObfuscatedName("ni") public class class341 { - @ObfuscatedName("of") - @Export("menuWidth") - static int menuWidth; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lpv;" + ) + class406 field2969; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lpv;" + ) + class406 field2970; + @ObfuscatedName("ai") + boolean field2950; + @ObfuscatedName("aw") + boolean field2952; + @ObfuscatedName("ae") + int field2954; + @ObfuscatedName("an") + boolean field2951; + @ObfuscatedName("ag") + int field2956; + @ObfuscatedName("ad") + int field2953; + @ObfuscatedName("af") + int field2955; + @ObfuscatedName("be") + int field2959; + @ObfuscatedName("bd") + int field2958; + @ObfuscatedName("bl") + int field2963; + @ObfuscatedName("bi") + int field2962; + @ObfuscatedName("bv") + int field2966; + @ObfuscatedName("bf") + int field2960; + @ObfuscatedName("bg") + int field2961; + @ObfuscatedName("ba") + int field2957; + @ObfuscatedName("bm") + int field2964; + @ObfuscatedName("bp") + int field2965; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lmc;" + ) + class334 field2968; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lmc;" + ) + class334 field2967; + + class341() { + this.field2969 = new class406(); + this.field2970 = new class406(); + this.field2950 = false; + this.field2952 = true; + this.field2954 = 0; + this.field2951 = false; + this.field2956 = 0; + this.field2953 = 0; + this.field2955 = 0; + this.field2959 = 0; + this.field2958 = 0; + this.field2963 = 0; + this.field2962 = 0; + this.field2966 = Integer.MAX_VALUE; + this.field2960 = Integer.MAX_VALUE; + this.field2961 = 0; + this.field2957 = 0; + this.field2964 = 0; + this.field2965 = 0; + this.field2969.method2062(1); + this.field2970.method2062(1); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + void method1758() { + this.field2954 = (this.field2954 + 1) % 60; + if (this.field2962 > 0) { + --this.field2962; + } + + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "-1199149744" + ) + public boolean method1759(boolean var1) { + var1 = var1 && this.field2952; + boolean var2 = this.field2950 != var1; + this.field2950 = var1; + if (!this.field2950) { + this.method1783(this.field2959, this.field2959); + } + + return var2; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "18331512" + ) + public void method1760(boolean var1) { + this.field2952 = var1; + this.field2950 = var1 && this.field2950; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Z", + garbageValue = "1" + ) + public boolean method1761(String var1) { + String var2 = this.field2969.method2056(); + if (!var2.equals(var1)) { + var1 = this.method1827(var1); + this.field2969.method2069(var1); + this.method1783(this.field2958, this.field2959); + this.method1768(this.field2964, this.field2965); + this.method1831(); + this.method1836(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Z", + garbageValue = "-65" + ) + boolean method1762(String var1) { + this.field2970.method2069(var1); + return true; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lpa;B)Z", + garbageValue = "116" + ) + boolean method1763(AbstractFont var1) { + boolean var2 = !this.field2951; + this.field2969.method2061(var1); + this.field2970.method2061(var1); + this.field2951 = true; + var2 |= this.method1768(this.field2964, this.field2965); + var2 |= this.method1783(this.field2958, this.field2959); + if (this.method1831()) { + this.method1836(); + var2 = true; + } + + return var2; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "101" + ) + public boolean method1764(int var1, int var2) { + boolean var3 = this.field2961 != var1 || var2 != this.field2957; + this.field2961 = var1; + this.field2957 = var2; + var3 |= this.method1768(this.field2964, this.field2965); + return var3; + } + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "(II)Z", + garbageValue = "-229674282" ) - UrlRequest field2928; + public boolean method1765(int var1) { + if (var1 < 0) { + var1 = Integer.MAX_VALUE; + } + + boolean var2 = var1 == this.field2969.method2080(); + this.field2969.method2057(var1); + this.field2970.method2057(var1); + if (this.method1831()) { + this.method1836(); + var2 = true; + } + + return var2; + } + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lud;" + descriptor = "(IB)Z", + garbageValue = "8" ) - SpritePixels field2929; + public boolean method1766(int var1) { + this.field2969.method2059(var1); + if (this.method1831()) { + this.method1836(); + return true; + } else { + return false; + } + } + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Len;)V" + descriptor = "(II)Z", + garbageValue = "117249639" ) - class341(String var1, UrlRequester var2) { - try { - this.field2928 = var2.request(new URL(var1)); - } catch (MalformedURLException var4) { - this.field2928 = null; + public boolean method1767(int var1) { + this.field2960 = var1; + if (this.method1831()) { + this.method1836(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-285626466" + ) + public boolean method1768(int var1, int var2) { + if (!this.method1815()) { + this.field2964 = var1; + this.field2965 = var2; + return false; + } else { + int var3 = this.field2964; + int var4 = this.field2965; + int var5 = Math.max(0, this.field2969.method2075() - this.field2961 + 2); + int var6 = Math.max(0, this.field2969.method2076() - this.field2957 + 1); + this.field2964 = Math.max(0, Math.min(var5, var1)); + this.field2965 = Math.max(0, Math.min(var6, var2)); + return var3 != this.field2964 || var4 != this.field2965; + } + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "18" + ) + public boolean method1769(int var1, int var2) { + boolean var3 = true; + if (var1 < 0 || var1 > 2) { + var3 = false; } + if (var2 < 0 || var2 > 2) { + var3 = false; + } + + return var3 ? this.field2969.method2063(var1, var2) : false; } + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Leq;)V" + descriptor = "(IB)V", + garbageValue = "-56" ) - class341(UrlRequest var1) { - this.field2928 = var1; + public void method1770(int var1) { + this.field2969.method2064(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)Lud;", - garbageValue = "1517070019" + descriptor = "(IB)V", + garbageValue = "-15" ) - SpritePixels method1747() { - if (this.field2929 == null && this.field2928 != null && this.field2928.isDone()) { - if (this.field2928.getResponse() != null) { - this.field2929 = Frames.method1335(this.field2928.getResponse()); + public void method1771(int var1) { + this.field2956 = var1; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "312320630" + ) + public void method1772(int var1) { + this.field2969.method2062(var1); + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1049067680" + ) + public void method1773(int var1) { + this.field2969.method2060(var1); + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1504264243" + ) + public boolean method1774(int var1) { + this.field2955 = var1; + String var2 = this.field2969.method2056(); + int var3 = var2.length(); + var2 = this.method1827(var2); + if (var2.length() != var3) { + this.field2969.method2069(var2); + this.method1768(this.field2964, this.field2965); + this.method1831(); + this.method1836(); + return true; + } else { + return false; + } + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "611320825" + ) + public void method1775() { + this.field2951 = false; + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1918004716" + ) + public boolean method1776(int var1) { + if (this.method1837(var1)) { + this.method1781(); + class407 var2 = this.field2969.method2066((char)var1, this.field2959, this.field2966); + this.method1783(var2.method2094(), var2.method2094()); + this.method1831(); + this.method1836(); + } + + return true; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "125" + ) + public void method1777() { + if (!this.method1781() && this.field2959 > 0) { + int var1 = this.field2969.method2071(this.field2959 - 1); + this.method1836(); + this.method1783(var1, var1); + } + + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1496895197" + ) + public void method1778() { + if (!this.method1781() && this.field2959 < this.field2969.method2055()) { + int var1 = this.field2969.method2071(this.field2959); + this.method1836(); + this.method1783(var1, var1); + } + + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "2" + ) + public void method1779() { + if (!this.method1781() && this.field2959 > 0) { + class497 var1 = this.method1829(this.field2959 - 1); + int var2 = this.field2969.method2072((Integer)var1.field4074, this.field2959); + this.method1836(); + this.method1783(var2, var2); + } + + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "576864564" + ) + public void method1780() { + if (!this.method1781() && this.field2959 < this.field2969.method2055()) { + class497 var1 = this.method1829(this.field2959); + int var2 = this.field2969.method2072(this.field2959, (Integer)var1.field4073); + this.method1836(); + this.method1783(var2, var2); + } + + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1514418987" + ) + boolean method1781() { + if (!this.method1826()) { + return false; + } else { + int var1 = this.field2969.method2072(this.field2958, this.field2959); + this.method1836(); + this.method1783(var1, var1); + return true; + } + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "154519165" + ) + public void method1782() { + this.method1783(0, this.field2969.method2055()); + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "1917418195" + ) + public boolean method1783(int var1, int var2) { + if (!this.method1815()) { + this.field2958 = var1; + this.field2959 = var2; + return false; + } else { + if (var1 > this.field2969.method2055()) { + var1 = this.field2969.method2055(); } - this.field2928 = null; + if (var2 > this.field2969.method2055()) { + var2 = this.field2969.method2055(); + } + + boolean var3 = this.field2958 != var1 || var2 != this.field2959; + this.field2958 = var1; + if (var2 != this.field2959) { + this.field2959 = var2; + this.field2954 = 0; + this.method1834(); + } + + if (var3 && this.field2967 != null) { + this.field2967.vmethod5708(); + } + + return var3; + } + } + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "64" + ) + public void method1784(boolean var1) { + class497 var2 = this.method1830(this.field2959); + this.method1832((Integer)var2.field4074, var1); + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-114" + ) + public void method1785(boolean var1) { + class497 var2 = this.method1830(this.field2959); + this.method1832((Integer)var2.field4073, var1); + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "941946265" + ) + public void method1786(boolean var1) { + this.method1832(0, var1); + } + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "2021236230" + ) + public void method1787(boolean var1) { + this.method1832(this.field2969.method2055(), var1); + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1171552759" + ) + public void method1788(boolean var1) { + if (this.method1826() && !var1) { + this.method1832(Math.min(this.field2958, this.field2959), var1); + } else if (this.field2959 > 0) { + this.method1832(this.field2959 - 1, var1); + } + + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-81" + ) + public void method1789(boolean var1) { + if (this.method1826() && !var1) { + this.method1832(Math.max(this.field2958, this.field2959), var1); + } else if (this.field2959 < this.field2969.method2055()) { + this.method1832(this.field2959 + 1, var1); + } + + } + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1880064758" + ) + public void method1790(boolean var1) { + if (this.field2959 > 0) { + class497 var2 = this.method1829(this.field2959 - 1); + this.method1832((Integer)var2.field4074, var1); + } + + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-214351650" + ) + public void method1791(boolean var1) { + if (this.field2959 < this.field2969.method2055()) { + class497 var2 = this.method1829(this.field2959 + 1); + this.method1832((Integer)var2.field4073, var1); } - return this.field2929; + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-2098854575" + ) + public void method1792(boolean var1) { + if (this.field2959 > 0) { + this.method1832(this.field2969.method2074(this.field2959, -1), var1); + } + + } + + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "115" + ) + public void method1793(boolean var1) { + if (this.field2959 < this.field2969.method2055()) { + this.method1832(this.field2969.method2074(this.field2959, 1), var1); + } + + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1022985895" + ) + public void method1794(boolean var1) { + if (this.field2959 > 0) { + int var2 = this.method1833(); + this.method1832(this.field2969.method2074(this.field2959, -var2), var1); + } + + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-828148265" + ) + public void method1795(boolean var1) { + if (this.field2959 < this.field2969.method2055()) { + int var2 = this.method1833(); + this.method1832(this.field2969.method2074(this.field2959, var2), var1); + } + + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-618248059" + ) + public void method1796(boolean var1) { + class410 var2 = this.field2969.method2065(0, this.field2959); + class497 var3 = var2.method2137(); + this.method1832(this.field2969.method2073((Integer)var3.field4074, this.field2965), var1); + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-993585503" + ) + public void method1797(boolean var1) { + class410 var2 = this.field2969.method2065(0, this.field2959); + class497 var3 = var2.method2137(); + this.method1832(this.field2969.method2073((Integer)var3.field4074, this.field2957 + this.field2965), var1); + } + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(IIZZI)V", + garbageValue = "470461038" + ) + public void method1798(int var1, int var2, boolean var3, boolean var4) { + boolean var5 = false; + class497 var6; + int var8; + if (!this.field2951) { + var8 = 0; + } else { + var1 += this.field2964; + var2 += this.field2965; + var6 = this.method1838(); + var8 = this.field2969.method2073(var1 - (Integer)var6.field4074, var2 - (Integer)var6.field4073); + } + + if (var3 && var4) { + this.field2953 = 1; + var6 = this.method1829(var8); + class497 var7 = this.method1829(this.field2963); + this.method1828(var7, var6); + } else if (var3) { + this.field2953 = 1; + var6 = this.method1829(var8); + this.method1783((Integer)var6.field4074, (Integer)var6.field4073); + this.field2963 = (Integer)var6.field4074; + } else if (var4) { + this.method1783(this.field2963, var8); + } else { + if (this.field2962 > 0 && var8 == this.field2963) { + if (this.field2958 == this.field2959) { + this.field2953 = 1; + var6 = this.method1829(var8); + this.method1783((Integer)var6.field4074, (Integer)var6.field4073); + } else { + this.field2953 = 2; + var6 = this.method1830(var8); + this.method1783((Integer)var6.field4074, (Integer)var6.field4073); + } + } else { + this.field2953 = 0; + this.method1783(var8, var8); + this.field2963 = var8; + } + + this.field2962 = 25; + } + + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-292946076" + ) + public void method1799(int var1, int var2) { + if (this.field2951 && this.method1810()) { + var1 += this.field2964; + var2 += this.field2965; + class497 var3 = this.method1838(); + int var4 = this.field2969.method2073(var1 - (Integer)var3.field4074, var2 - (Integer)var3.field4073); + class497 var5; + class497 var6; + switch(this.field2953) { + case 0: + this.method1783(this.field2958, var4); + break; + case 1: + var5 = this.method1829(this.field2963); + var6 = this.method1829(var4); + this.method1828(var5, var6); + break; + case 2: + var5 = this.method1830(this.field2963); + var6 = this.method1830(var4); + this.method1828(var5, var6); + } + } + + } + + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", + garbageValue = "-307910360" + ) + public void method1800(Clipboard var1) { + class410 var2 = this.field2969.method2065(this.field2958, this.field2959); + if (!var2.method2133()) { + String var3 = var2.method2131(); + if (!var3.isEmpty()) { + var1.setContents(new StringSelection(var3), (ClipboardOwner)null); + } + } + + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", + garbageValue = "2135903606" + ) + public void method1801(Clipboard var1) { + if (this.method1826()) { + this.method1800(var1); + this.method1781(); + } + + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", + garbageValue = "1435827067" + ) + public void method1802(Clipboard var1) { + Transferable var2 = var1.getContents((Object)null); + if (var2 != null && var2.isDataFlavorSupported(DataFlavor.stringFlavor)) { + try { + String var3 = this.method1827((String)var2.getTransferData(DataFlavor.stringFlavor)); + this.method1781(); + class407 var4 = this.field2969.method2067(var3, this.field2959, this.field2966); + this.method1783(var4.method2094(), var4.method2094()); + this.method1831(); + this.method1836(); + } catch (Exception var5) { + } + } + + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-288828294" + ) + public void method1803() { + this.field2965 = Math.max(0, this.field2965 - this.field2969.method2077()); + } + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "34" + ) + public void method1804() { + int var1 = Math.max(0, this.field2969.method2076() - this.field2957); + this.field2965 = Math.min(var1, this.field2965 + this.field2969.method2077()); + } + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "(Lmc;I)V", + garbageValue = "-1869847655" + ) + public void method1805(class334 var1) { + this.field2968 = var1; + } + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(Lmc;I)V", + garbageValue = "-1051047872" + ) + public void method1806(class334 var1) { + this.field2967 = var1; + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(I)Lpv;", + garbageValue = "2075539041" + ) + public class406 method1807() { + return this.field2969; + } + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(I)Lpv;", + garbageValue = "1030146297" + ) + public class406 method1808() { + return this.field2970; + } + + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "(B)Lpd;", + garbageValue = "126" + ) + public class410 method1809() { + return this.field2969.method2065(this.field2958, this.field2959); + } + + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2065405253" + ) + public boolean method1810() { + return this.field2950; + } + + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "32" + ) + public boolean method1811() { + return this.field2952; + } + + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "1" + ) + public boolean method1812() { + return this.method1810() && this.field2954 % 60 < 30; + } + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "0" + ) + public int method1813() { + return this.field2959; + } + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-93" + ) + public int method1814() { + return this.field2958; + } + + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1339355429" + ) + public boolean method1815() { + return this.field2951; + } + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-914270657" + ) + public int method1816() { + return this.field2964; + } + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-59337247" + ) + public int method1817() { + return this.field2965; + } + + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "183448923" + ) + public int method1818() { + return this.field2969.method2080(); + } + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1901590514" + ) + public int method1819() { + return this.field2969.method2081(); + } + + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "433958524" + ) + public int method1820() { + return this.field2960; + } + + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "27" + ) + public int method1821() { + return this.field2956; + } + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1220088206" + ) + public int method1822() { + return this.field2969.method2082(); + } + + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "8" + ) + public int method1823() { + return this.field2955; + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1771864931" + ) + public int method1824() { + return this.field2969.method2083(); + } + + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "48" + ) + public boolean method1825() { + return this.method1819() > 1; + } + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-760216869" + ) + boolean method1826() { + return this.field2959 != this.field2958; + } + + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "-79" + ) + String method1827(String var1) { + StringBuilder var2 = new StringBuilder(var1.length()); + + for (int var3 = 0; var3 < var1.length(); ++var3) { + char var4 = var1.charAt(var3); + if (this.method1837(var4)) { + var2.append(var4); + } + } + + return var2.toString(); + } + + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "(Lti;Lti;I)V", + garbageValue = "-1148711859" + ) + void method1828(class497 var1, class497 var2) { + if ((Integer)var2.field4074 < (Integer)var1.field4074) { + this.method1783((Integer)var1.field4073, (Integer)var2.field4074); + } else { + this.method1783((Integer)var1.field4074, (Integer)var2.field4073); + } + + } + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "(II)Lti;", + garbageValue = "377951962" + ) + class497 method1829(int var1) { + int var2 = this.field2969.method2055(); + int var3 = 0; + int var4 = var2; + + int var5; + for (var5 = var1; var5 > 0; --var5) { + if (this.method1835(this.field2969.method2051(var5 - 1).field3716)) { + var3 = var5; + break; + } + } + + for (var5 = var1; var5 < var2; ++var5) { + if (this.method1835(this.field2969.method2051(var5).field3716)) { + var4 = var5; + break; + } + } + + return new class497(var3, var4); + } + + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "(II)Lti;", + garbageValue = "-1182045499" + ) + class497 method1830(int var1) { + int var2 = this.field2969.method2055(); + int var3 = 0; + int var4 = var2; + + int var5; + for (var5 = var1; var5 > 0; --var5) { + if (this.field2969.method2051(var5 - 1).field3716 == '\n') { + var3 = var5; + break; + } + } + + for (var5 = var1; var5 < var2; ++var5) { + if (this.field2969.method2051(var5).field3716 == '\n') { + var4 = var5; + break; + } + } + + return new class497(var3, var4); + } + + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1603465990" + ) + boolean method1831() { + if (!this.method1815()) { + return false; + } else { + boolean var1 = false; + if (this.field2969.method2055() > this.field2960) { + this.field2969.method2072(this.field2960, this.field2969.method2055()); + var1 = true; + } + + int var2 = this.method1819(); + int var3; + if (this.field2969.method2078() > var2) { + var3 = this.field2969.method2074(0, var2) - 1; + this.field2969.method2072(var3, this.field2969.method2055()); + var1 = true; + } + + if (var1) { + var3 = this.field2959; + int var4 = this.field2958; + int var5 = this.field2969.method2055(); + if (this.field2959 > var5) { + var3 = var5; + } + + if (this.field2958 > var5) { + var4 = var5; + } + + this.method1783(var4, var3); + } + + return var1; + } + } + + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(IZI)V", + garbageValue = "2086601547" + ) + void method1832(int var1, boolean var2) { + if (var2) { + this.method1783(this.field2958, var1); + } else { + this.method1783(var1, var1); + } + + } + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-1" + ) + int method1833() { + return this.field2957 / this.field2969.method2077(); + } + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1786950999" + ) + void method1834() { + class410 var1 = this.field2969.method2065(0, this.field2959); + class497 var2 = var1.method2137(); + int var3 = this.field2969.method2077(); + int var4 = (Integer)var2.field4074 - 10; + int var5 = var4 + 20; + int var6 = (Integer)var2.field4073 - 3; + int var7 = var3 + var6 + 6; + int var8 = this.field2964; + int var9 = var8 + this.field2961; + int var10 = this.field2965; + int var11 = var10 + this.field2957; + int var12 = this.field2964; + int var13 = this.field2965; + if (var4 < var8) { + var12 = var4; + } else if (var5 > var9) { + var12 = var5 - this.field2961; + } + + if (var6 < var10) { + var13 = var6; + } else if (var7 > var11) { + var13 = var7 - this.field2957; + } + + this.method1768(var12, var13); + } + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "1" + ) + boolean method1835(int var1) { + return var1 == 32 || var1 == 10 || var1 == 9; + } + + @ObfuscatedName("dt") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "336" + ) + void method1836() { + if (this.field2968 != null) { + this.field2968.vmethod5708(); + } + + } + + @ObfuscatedName("di") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1431244165" + ) + boolean method1837(int var1) { + switch(this.field2955) { + case 1: + return KeyHandler.isAlphaNumeric((char)var1); + case 2: + return class10.isCharAlphabetic((char)var1); + case 3: + return Player.isDigit((char)var1); + case 4: + char var2 = (char)var1; + if (Player.isDigit(var2)) { + return true; + } else { + if (var2 != 'k' && var2 != 'K' && var2 != 'm' && var2 != 'M' && var2 != 'b' && var2 != 'B') { + return false; + } + + return true; + } + default: + return true; + } + } + + @ObfuscatedName("dk") + @ObfuscatedSignature( + descriptor = "(I)Lti;", + garbageValue = "-306061048" + ) + class497 method1838() { + int var1 = this.field2969.method2084(this.field2961); + int var2 = this.field2969.method2085(this.field2957); + return new class497(var1, var2); } } \ No newline at end of file diff --git a/osrs/src/main/java/class342.java b/osrs/src/main/java/class342.java index 716e2ef4d..783d3ab1f 100644 --- a/osrs/src/main/java/class342.java +++ b/osrs/src/main/java/class342.java @@ -1,35 +1,26 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; + +import java.util.concurrent.ScheduledExecutorService; @ObfuscatedName("no") public class class342 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lnz;" - ) - public class344 field2936; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lnx;" - ) - class339 field2931; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lbk;" - ) - class27 field2930; - @ObfuscatedName("ax") - public Object[] field2935; - @ObfuscatedName("ao") - public Object[] field2933; + @ObfuscatedName("at") + public static final short[] field2973; @ObfuscatedName("ah") - public Object[] field2932; + public static final short[][] field2974; @ObfuscatedName("ar") - public Object[] field2934; + public static final short[] field2972; + @ObfuscatedName("ao") + public static final short[][] field2975; + @ObfuscatedName("ac") + @Export("soundSystemExecutor") + public static ScheduledExecutorService soundSystemExecutor; - class342() { - this.field2936 = new class344(); - this.field2931 = new class339(); - this.field2930 = new class27(); + static { + field2973 = new short[]{6798, 8741, 25238, 4626, 4550}; + field2974 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010, -22122, 937, 8130, -13422, 30385}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; + field2972 = new short[]{-10304, 9104, -1, -1, -1}; + field2975 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002, -22116, 945, 8144, -13414, 30389}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; } } \ No newline at end of file diff --git a/osrs/src/main/java/class344.java b/osrs/src/main/java/class344.java index ad5586b58..ca552012b 100644 --- a/osrs/src/main/java/class344.java +++ b/osrs/src/main/java/class344.java @@ -1,1241 +1,74 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.awt.datatransfer.*; - -@ObfuscatedName("nz") +@ObfuscatedName("ng") public class class344 { - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lpp;" - ) - class409 field2972; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lpp;" - ) - class409 field2971; - @ObfuscatedName("ae") - boolean field2952; - @ObfuscatedName("aw") - boolean field2953; - @ObfuscatedName("aq") - int field2957; - @ObfuscatedName("az") - boolean field2954; - @ObfuscatedName("at") - int field2958; - @ObfuscatedName("af") - int field2956; - @ObfuscatedName("ad") - int field2955; - @ObfuscatedName("bn") - int field2964; - @ObfuscatedName("bk") - int field2963; - @ObfuscatedName("by") - int field2967; - @ObfuscatedName("bd") - int field2961; - @ObfuscatedName("be") - int field2962; - @ObfuscatedName("bv") - int field2966; - @ObfuscatedName("ba") - int field2959; - @ObfuscatedName("bz") - int field2968; - @ObfuscatedName("bb") - int field2960; - @ObfuscatedName("bo") - int field2965; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lmg;" - ) - class337 field2969; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lmg;" - ) - class337 field2970; - - class344() { - this.field2972 = new class409(); - this.field2971 = new class409(); - this.field2952 = false; - this.field2953 = true; - this.field2957 = 0; - this.field2954 = false; - this.field2958 = 0; - this.field2956 = 0; - this.field2955 = 0; - this.field2964 = 0; - this.field2963 = 0; - this.field2967 = 0; - this.field2961 = 0; - this.field2962 = Integer.MAX_VALUE; - this.field2966 = Integer.MAX_VALUE; - this.field2959 = 0; - this.field2968 = 0; - this.field2960 = 0; - this.field2965 = 0; - this.field2972.method2075(1); - this.field2971.method2075(1); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "120" - ) - void method1762() { - this.field2957 = (this.field2957 + 1) % 60; - if (this.field2961 > 0) { - --this.field2961; - } - - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "523317409" - ) - public boolean method1763(boolean var1) { - var1 = var1 && this.field2953; - boolean var2 = this.field2952 != var1; - this.field2952 = var1; - if (!this.field2952) { - this.method1787(this.field2964, this.field2964); - } - - return var2; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1481904343" - ) - public void method1764(boolean var1) { - this.field2953 = var1; - this.field2952 = var1 && this.field2952; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-2133127223" - ) - public boolean method1765(String var1) { - String var2 = this.field2972.method2070(); - if (!var2.equals(var1)) { - var1 = this.method1831(var1); - this.field2972.method2082(var1); - this.method1787(this.field2963, this.field2964); - this.method1772(this.field2960, this.field2965); - this.method1835(); - this.method1840(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "1293964055" - ) - boolean method1766(String var1) { - this.field2971.method2082(var1); - return true; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Lpk;I)Z", - garbageValue = "2045619310" - ) - boolean method1767(AbstractFont var1) { - boolean var2 = !this.field2954; - this.field2972.method2074(var1); - this.field2971.method2074(var1); - this.field2954 = true; - var2 |= this.method1772(this.field2960, this.field2965); - var2 |= this.method1787(this.field2963, this.field2964); - if (this.method1835()) { - this.method1840(); - var2 = true; - } - - return var2; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "70" - ) - public boolean method1768(int var1, int var2) { - boolean var3 = this.field2959 != var1 || var2 != this.field2968; - this.field2959 = var1; - this.field2968 = var2; - var3 |= this.method1772(this.field2960, this.field2965); - return var3; - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-74" - ) - public boolean method1769(int var1) { - if (var1 < 0) { - var1 = Integer.MAX_VALUE; - } - - boolean var2 = var1 == this.field2972.method2093(); - this.field2972.method2071(var1); - this.field2971.method2071(var1); - if (this.method1835()) { - this.method1840(); - var2 = true; - } - - return var2; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "6" - ) - public boolean method1770(int var1) { - this.field2972.method2072(var1); - if (this.method1835()) { - this.method1840(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1717570728" - ) - public boolean method1771(int var1) { - this.field2966 = var1; - if (this.method1835()) { - this.method1840(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1634456183" - ) - public boolean method1772(int var1, int var2) { - if (!this.method1819()) { - this.field2960 = var1; - this.field2965 = var2; - return false; - } else { - int var3 = this.field2960; - int var4 = this.field2965; - int var5 = Math.max(0, this.field2972.method2088() - this.field2959 + 2); - int var6 = Math.max(0, this.field2972.method2089() - this.field2968 + 1); - this.field2960 = Math.max(0, Math.min(var5, var1)); - this.field2965 = Math.max(0, Math.min(var6, var2)); - return var3 != this.field2960 || var4 != this.field2965; - } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "2093677654" - ) - public boolean method1773(int var1, int var2) { - boolean var3 = true; - if (var1 < 0 || var1 > 2) { - var3 = false; - } - - if (var2 < 0 || var2 > 2) { - var3 = false; - } - - return var3 ? this.field2972.method2076(var1, var2) : false; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-939191131" - ) - public void method1774(int var1) { - this.field2972.method2077(var1); - } - @ObfuscatedName("ay") + static int[][][] field3130; + @ObfuscatedName("fh") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-592386576" - ) - public void method1775(int var1) { - this.field2958 = var1; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "3" - ) - public void method1776(int var1) { - this.field2972.method2075(var1); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1498031514" - ) - public void method1777(int var1) { - this.field2972.method2073(var1); - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "180" - ) - public boolean method1778(int var1) { - this.field2955 = var1; - String var2 = this.field2972.method2070(); - int var3 = var2.length(); - var2 = this.method1831(var2); - if (var2.length() != var3) { - this.field2972.method2082(var2); - this.method1772(this.field2960, this.field2965); - this.method1835(); - this.method1840(); - return true; - } else { - return false; - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-969199499" + descriptor = "Loh;" ) - public void method1779() { - this.field2954 = false; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "4138" - ) - public boolean method1780(int var1) { - if (this.method1841(var1)) { - this.method1785(); - class410 var2 = this.field2972.method2079((char)var1, this.field2964, this.field2962); - this.method1787(var2.method2107(), var2.method2107()); - this.method1835(); - this.method1840(); - } - - return true; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "755624940" - ) - public void method1781() { - if (!this.method1785() && this.field2964 > 0) { - int var1 = this.field2972.method2084(this.field2964 - 1); - this.method1840(); - this.method1787(var1, var1); - } - - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "22" - ) - public void method1782() { - if (!this.method1785() && this.field2964 < this.field2972.method2069()) { - int var1 = this.field2972.method2084(this.field2964); - this.method1840(); - this.method1787(var1, var1); - } - - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2101637945" - ) - public void method1783() { - if (!this.method1785() && this.field2964 > 0) { - class500 var1 = this.method1833(this.field2964 - 1); - int var2 = this.field2972.method2085((Integer)var1.field4079, this.field2964); - this.method1840(); - this.method1787(var2, var2); - } - - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-882101391" - ) - public void method1784() { - if (!this.method1785() && this.field2964 < this.field2972.method2069()) { - class500 var1 = this.method1833(this.field2964); - int var2 = this.field2972.method2085(this.field2964, (Integer)var1.field4080); - this.method1840(); - this.method1787(var2, var2); - } - - } + @Export("archive2") + static Archive archive2; + @ObfuscatedName("th") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-639259447" - ) - boolean method1785() { - if (!this.method1830()) { - return false; - } else { - int var1 = this.field2972.method2085(this.field2963, this.field2964); - this.method1840(); - this.method1787(var1, var1); - return true; - } - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-3" - ) - public void method1786() { - this.method1787(0, this.field2972.method2069()); - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-504671047" - ) - public boolean method1787(int var1, int var2) { - if (!this.method1819()) { - this.field2963 = var1; - this.field2964 = var2; - return false; - } else { - if (var1 > this.field2972.method2069()) { - var1 = this.field2972.method2069(); - } - - if (var2 > this.field2972.method2069()) { - var2 = this.field2972.method2069(); - } - - boolean var3 = this.field2963 != var1 || var2 != this.field2964; - this.field2963 = var1; - if (var2 != this.field2964) { - this.field2964 = var2; - this.field2957 = 0; - this.method1838(); - } - - if (var3 && this.field2970 != null) { - this.field2970.vmethod5708(); - } - - return var3; - } - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "55" - ) - public void method1788(boolean var1) { - class500 var2 = this.method1834(this.field2964); - this.method1836((Integer)var2.field4079, var1); - } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "2010552592" - ) - public void method1789(boolean var1) { - class500 var2 = this.method1834(this.field2964); - this.method1836((Integer)var2.field4080, var1); - } - - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-81" - ) - public void method1790(boolean var1) { - this.method1836(0, var1); - } - - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1475070773" - ) - public void method1791(boolean var1) { - this.method1836(this.field2972.method2069(), var1); - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1914804723" - ) - public void method1792(boolean var1) { - if (this.method1830() && !var1) { - this.method1836(Math.min(this.field2963, this.field2964), var1); - } else if (this.field2964 > 0) { - this.method1836(this.field2964 - 1, var1); - } - - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1254852438" - ) - public void method1793(boolean var1) { - if (this.method1830() && !var1) { - this.method1836(Math.max(this.field2963, this.field2964), var1); - } else if (this.field2964 < this.field2972.method2069()) { - this.method1836(this.field2964 + 1, var1); - } - - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1246989574" - ) - public void method1794(boolean var1) { - if (this.field2964 > 0) { - class500 var2 = this.method1833(this.field2964 - 1); - this.method1836((Integer)var2.field4079, var1); - } - - } - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-589145055" - ) - public void method1795(boolean var1) { - if (this.field2964 < this.field2972.method2069()) { - class500 var2 = this.method1833(this.field2964 + 1); - this.method1836((Integer)var2.field4080, var1); - } - - } - - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1596308602" - ) - public void method1796(boolean var1) { - if (this.field2964 > 0) { - this.method1836(this.field2972.method2087(this.field2964, -1), var1); - } - - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1852812163" - ) - public void method1797(boolean var1) { - if (this.field2964 < this.field2972.method2069()) { - this.method1836(this.field2972.method2087(this.field2964, 1), var1); - } - - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-28" - ) - public void method1798(boolean var1) { - if (this.field2964 > 0) { - int var2 = this.method1837(); - this.method1836(this.field2972.method2087(this.field2964, -var2), var1); - } - - } - - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-196223675" - ) - public void method1799(boolean var1) { - if (this.field2964 < this.field2972.method2069()) { - int var2 = this.method1837(); - this.method1836(this.field2972.method2087(this.field2964, var2), var1); - } - - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "18712" - ) - public void method1800(boolean var1) { - class413 var2 = this.field2972.method2078(0, this.field2964); - class500 var3 = var2.method2151(); - this.method1836(this.field2972.method2086((Integer)var3.field4079, this.field2965), var1); - } - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-124" - ) - public void method1801(boolean var1) { - class413 var2 = this.field2972.method2078(0, this.field2964); - class500 var3 = var2.method2151(); - this.method1836(this.field2972.method2086((Integer)var3.field4079, this.field2968 + this.field2965), var1); - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(IIZZI)V", - garbageValue = "-1267266894" + descriptor = "([BILjava/lang/CharSequence;I)I", + garbageValue = "-1554381486" ) - public void method1802(int var1, int var2, boolean var3, boolean var4) { - boolean var5 = false; - class500 var6; - int var8; - if (!this.field2954) { - var8 = 0; - } else { - var1 += this.field2960; - var2 += this.field2965; - var6 = this.method1842(); - var8 = this.field2972.method2086(var1 - (Integer)var6.field4079, var2 - (Integer)var6.field4080); - } - - if (var3 && var4) { - this.field2956 = 1; - var6 = this.method1833(var8); - class500 var7 = this.method1833(this.field2967); - this.method1832(var7, var6); - } else if (var3) { - this.field2956 = 1; - var6 = this.method1833(var8); - this.method1787((Integer)var6.field4079, (Integer)var6.field4080); - this.field2967 = (Integer)var6.field4079; - } else if (var4) { - this.method1787(this.field2967, var8); - } else { - if (this.field2961 > 0 && var8 == this.field2967) { - if (this.field2964 == this.field2963) { - this.field2956 = 1; - var6 = this.method1833(var8); - this.method1787((Integer)var6.field4079, (Integer)var6.field4080); - } else { - this.field2956 = 2; - var6 = this.method1834(var8); - this.method1787((Integer)var6.field4079, (Integer)var6.field4080); - } + public static int method1877(byte[] var0, int var1, CharSequence var2) { + int var3 = var2.length(); + int var4 = var1; + + for (int var5 = 0; var5 < var3; ++var5) { + char var6 = var2.charAt(var5); + if (var6 <= 127) { + var0[var4++] = (byte)var6; + } else if (var6 <= 2047) { + var0[var4++] = (byte)(192 | var6 >> 6); + var0[var4++] = (byte)(128 | var6 & '?'); } else { - this.field2956 = 0; - this.method1787(var8, var8); - this.field2967 = var8; + var0[var4++] = (byte)(224 | var6 >> '\f'); + var0[var4++] = (byte)(128 | var6 >> 6 & 63); + var0[var4++] = (byte)(128 | var6 & '?'); } - - this.field2961 = 25; } + return var4 - var1; } @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1597491058" - ) - public void method1803(int var1, int var2) { - if (this.field2954 && this.method1814()) { - var1 += this.field2960; - var2 += this.field2965; - class500 var3 = this.method1842(); - int var4 = this.field2972.method2086(var1 - (Integer)var3.field4079, var2 - (Integer)var3.field4080); - class500 var5; - class500 var6; - switch(this.field2956) { - case 0: - this.method1787(this.field2963, var4); - break; - case 1: - var5 = this.method1833(this.field2967); - var6 = this.method1833(var4); - this.method1832(var5, var6); - break; - case 2: - var5 = this.method1834(this.field2967); - var6 = this.method1834(var4); - this.method1832(var5, var6); - } - } - - } - - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", - garbageValue = "-839335368" - ) - public void method1804(Clipboard var1) { - class413 var2 = this.field2972.method2078(this.field2963, this.field2964); - if (!var2.method2147()) { - String var3 = var2.method2145(); - if (!var3.isEmpty()) { - var1.setContents(new StringSelection(var3), (ClipboardOwner)null); - } - } - - } - - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/datatransfer/Clipboard;I)V", - garbageValue = "2087668691" - ) - public void method1805(Clipboard var1) { - if (this.method1830()) { - this.method1804(var1); - this.method1785(); - } - - } - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/datatransfer/Clipboard;B)V", - garbageValue = "84" - ) - public void method1806(Clipboard var1) { - Transferable var2 = var1.getContents((Object)null); - if (var2 != null && var2.isDataFlavorSupported(DataFlavor.stringFlavor)) { - try { - String var3 = this.method1831((String)var2.getTransferData(DataFlavor.stringFlavor)); - this.method1785(); - class410 var4 = this.field2972.method2080(var3, this.field2964, this.field2962); - this.method1787(var4.method2107(), var4.method2107()); - this.method1835(); - this.method1840(); - } catch (Exception var5) { - } - } - - } - - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - public void method1807() { - this.field2965 = Math.max(0, this.field2965 - this.field2972.method2090()); - } - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-794433961" - ) - public void method1808() { - int var1 = Math.max(0, this.field2972.method2089() - this.field2968); - this.field2965 = Math.min(var1, this.field2965 + this.field2972.method2090()); - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(Lmg;I)V", - garbageValue = "-1738038140" - ) - public void method1809(class337 var1) { - this.field2969 = var1; - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(Lmg;I)V", - garbageValue = "1967767680" - ) - public void method1810(class337 var1) { - this.field2970 = var1; - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(B)Lpp;", - garbageValue = "-4" - ) - public class409 method1811() { - return this.field2972; - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(I)Lpp;", - garbageValue = "1583287029" - ) - public class409 method1812() { - return this.field2971; - } - - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "(I)Lpr;", - garbageValue = "1493883876" - ) - public class413 method1813() { - return this.field2972.method2078(this.field2963, this.field2964); - } - - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "435699001" - ) - public boolean method1814() { - return this.field2952; - } - - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "515348942" - ) - public boolean method1815() { - return this.field2953; - } - - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "30" - ) - public boolean method1816() { - return this.method1814() && this.field2957 % 60 < 30; - } - - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-272595100" - ) - public int method1817() { - return this.field2964; - } - - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "6" - ) - public int method1818() { - return this.field2963; - } - - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1559709726" - ) - public boolean method1819() { - return this.field2954; - } - - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1987240412" - ) - public int method1820() { - return this.field2960; - } - - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-123" - ) - public int method1821() { - return this.field2965; - } - - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1717649091" - ) - public int method1822() { - return this.field2972.method2093(); - } - - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "61" + descriptor = "(ILdt;ZI)I", + garbageValue = "2094869525" ) - public int method1823() { - return this.field2972.method2094(); - } - - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "418287158" - ) - public int method1824() { - return this.field2966; - } - - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "250709855" - ) - public int method1825() { - return this.field2958; - } - - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-150919313" - ) - public int method1826() { - return this.field2972.method2095(); - } - - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "128" - ) - public int method1827() { - return this.field2955; - } - - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "29102" - ) - public int method1828() { - return this.field2972.method2096(); - } - - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "114534110" - ) - public boolean method1829() { - return this.method1823() > 1; - } - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-455222882" - ) - boolean method1830() { - return this.field2964 != this.field2963; - } - - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "-21" - ) - String method1831(String var1) { - StringBuilder var2 = new StringBuilder(var1.length()); - - for (int var3 = 0; var3 < var1.length(); ++var3) { - char var4 = var1.charAt(var3); - if (this.method1841(var4)) { - var2.append(var4); - } - } - - return var2.toString(); - } - - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "(Ltw;Ltw;I)V", - garbageValue = "1806400604" - ) - void method1832(class500 var1, class500 var2) { - if ((Integer)var2.field4079 < (Integer)var1.field4079) { - this.method1787((Integer)var1.field4080, (Integer)var2.field4079); + static int method1878(int var0, Script var1, boolean var2) { + if (var0 == 6754) { + int var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + NPCComposition var4 = VerticalAlignment.getNpcDefinition(var3); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; + return 1; } else { - this.method1787((Integer)var1.field4079, (Integer)var2.field4080); - } - - } - - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "(II)Ltw;", - garbageValue = "772728945" - ) - class500 method1833(int var1) { - int var2 = this.field2972.method2069(); - int var3 = 0; - int var4 = var2; - - int var5; - for (var5 = var1; var5 > 0; --var5) { - if (this.method1839(this.field2972.method2065(var5 - 1).field3713)) { - var3 = var5; - break; - } - } - - for (var5 = var1; var5 < var2; ++var5) { - if (this.method1839(this.field2972.method2065(var5).field3713)) { - var4 = var5; - break; - } - } - - return new class500(var3, var4); - } - - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "(II)Ltw;", - garbageValue = "-1936541681" - ) - class500 method1834(int var1) { - int var2 = this.field2972.method2069(); - int var3 = 0; - int var4 = var2; - - int var5; - for (var5 = var1; var5 > 0; --var5) { - if (this.field2972.method2065(var5 - 1).field3713 == '\n') { - var3 = var5; - break; - } - } - - for (var5 = var1; var5 < var2; ++var5) { - if (this.field2972.method2065(var5).field3713 == '\n') { - var4 = var5; - break; - } - } - - return new class500(var3, var4); - } - - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1778479023" - ) - boolean method1835() { - if (!this.method1819()) { - return false; - } else { - boolean var1 = false; - if (this.field2972.method2069() > this.field2966) { - this.field2972.method2085(this.field2966, this.field2972.method2069()); - var1 = true; - } - - int var2 = this.method1823(); - int var3; - if (this.field2972.method2091() > var2) { - var3 = this.field2972.method2087(0, var2) - 1; - this.field2972.method2085(var3, this.field2972.method2069()); - var1 = true; - } - - if (var1) { - var3 = this.field2964; - int var4 = this.field2963; - int var5 = this.field2972.method2069(); - if (this.field2964 > var5) { - var3 = var5; - } - - if (this.field2963 > var5) { - var4 = var5; - } - - this.method1787(var4, var3); - } - - return var1; - } - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "-1307117212" - ) - void method1836(int var1, boolean var2) { - if (var2) { - this.method1787(this.field2963, var1); - } else { - this.method1787(var1, var1); - } - - } - - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "996246059" - ) - int method1837() { - return this.field2968 / this.field2972.method2090(); - } - - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1596440102" - ) - void method1838() { - class413 var1 = this.field2972.method2078(0, this.field2964); - class500 var2 = var1.method2151(); - int var3 = this.field2972.method2090(); - int var4 = (Integer)var2.field4079 - 10; - int var5 = var4 + 20; - int var6 = (Integer)var2.field4080 - 3; - int var7 = var6 + var3 + 6; - int var8 = this.field2960; - int var9 = var8 + this.field2959; - int var10 = this.field2965; - int var11 = var10 + this.field2968; - int var12 = this.field2960; - int var13 = this.field2965; - if (var4 < var8) { - var12 = var4; - } else if (var5 > var9) { - var12 = var5 - this.field2959; - } - - if (var6 < var10) { - var13 = var6; - } else if (var7 > var11) { - var13 = var7 - this.field2968; - } - - this.method1772(var12, var13); - } - - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "5" - ) - boolean method1839(int var1) { - return var1 == 32 || var1 == 10 || var1 == 9; - } - - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "844665494" - ) - void method1840() { - if (this.field2969 != null) { - this.field2969.vmethod5708(); - } - - } - - @ObfuscatedName("dm") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "0" - ) - boolean method1841(int var1) { - switch(this.field2955) { - case 1: - return Decimator.isAlphaNumeric((char)var1); - case 2: - return class135.isCharAlphabetic((char)var1); - case 3: - return IsaacCipher.isDigit((char)var1); - case 4: - char var2 = (char)var1; - if (IsaacCipher.isDigit(var2)) { - return true; + NPCComposition var5; + if (var0 == 6764) { + DbTableType.Interpreter_intStackSize -= 2; + var5 = VerticalAlignment.getNpcDefinition(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]); + int var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var5.method949(var6); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var5.method951(var6); + return 1; + } else if (var0 == 6765) { + var5 = VerticalAlignment.getNpcDefinition(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var5 != null ? var5.combatLevel * 550789923 * -1916672885 : 0; + return 1; } else { - if (var2 != 'k' && var2 != 'K' && var2 != 'm' && var2 != 'M' && var2 != 'b' && var2 != 'B') { - return false; - } - - return true; + return 2; } - default: - return true; } } - - @ObfuscatedName("ds") - @ObfuscatedSignature( - descriptor = "(I)Ltw;", - garbageValue = "-1694076835" - ) - class500 method1842() { - int var1 = this.field2972.method2097(this.field2959); - int var2 = this.field2972.method2098(this.field2968); - return new class500(var1, var2); - } } \ No newline at end of file diff --git a/osrs/src/main/java/class345.java b/osrs/src/main/java/class345.java deleted file mode 100644 index 8cbb08d52..000000000 --- a/osrs/src/main/java/class345.java +++ /dev/null @@ -1,37 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nb") -public class class345 { - @ObfuscatedName("ac") - public static final short[] field2973; - @ObfuscatedName("al") - public static final short[][] field2975; - @ObfuscatedName("ak") - public static final short[] field2974; - @ObfuscatedName("ax") - public static final short[][] field2976; - @ObfuscatedName("netscape/js") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - - static { - field2973 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2975 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010, -22122, 937, 8130, -13422, 30385}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; - field2974 = new short[]{-10304, 9104, -1, -1, -1}; - field2976 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002, -22116, 945, 8144, -13414, 30389}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "23" - ) - public static int method1843(int var0, int var1, int var2) { - int var3 = class76.method431(var2 - var1 + 1); - var3 <<= var1; - var0 |= var3; - return var0; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class347.java b/osrs/src/main/java/class347.java deleted file mode 100644 index 03fc1c03f..000000000 --- a/osrs/src/main/java/class347.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nc") -public class class347 { - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1988472595" - ) - public static int method1883(int var0, int var1) { - return (-3 - var0 << 8) + var1; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class348.java b/osrs/src/main/java/class348.java new file mode 100644 index 000000000..0948596ce --- /dev/null +++ b/osrs/src/main/java/class348.java @@ -0,0 +1,131 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nw") +public class class348 { + @ObfuscatedName("ar") + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; + @ObfuscatedName("pu") + @Export("selectedSpellWidget") + static int selectedSpellWidget; + + @ObfuscatedName("jg") + @ObfuscatedSignature( + descriptor = "(IIIIZB)V", + garbageValue = "-10" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { + var2 = 1; + } + + if (var3 < 1) { + var3 = 1; + } + + int var5 = var3 - 334; + int var6; + if (var5 < 0) { + var6 = Client.field640; + } else if (var5 >= 100) { + var6 = Client.field636; + } else { + var6 = (Client.field636 - Client.field640) * var5 / 100 + Client.field640; + } + + int var7 = var3 * var6 * 512 / (var2 * 334); + int var8; + int var9; + short var10; + if (var7 < Client.field638) { + var10 = Client.field638; + var6 = var10 * var2 * 334 / (var3 * 512); + if (var6 > Client.field637) { + var6 = Client.field637; + var8 = var3 * var6 * 512 / (var10 * 334); + var9 = (var2 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); + } + + var0 += var9; + var2 -= var9 * 2; + } + } else if (var7 > Client.field634) { + var10 = Client.field634; + var6 = var10 * var2 * 334 / (var3 * 512); + if (var6 < Client.field639) { + var6 = Client.field639; + var8 = var10 * var2 * 334 / (var6 * 512); + var9 = (var3 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); + } + + var1 += var9; + var3 -= var9 * 2; + } + } + + Client.viewportZoom = var3 * var6 / 334; + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + class102.method603(var2, var3); + } + + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; + } + + @ObfuscatedName("mz") + @ObfuscatedSignature( + descriptor = "(Lnn;I)V", + garbageValue = "1443967648" + ) + static final void method1886(Widget var0) { + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field546 == -1) { + Client.field546 = var0.spriteId2; + Client.field547 = var0.spriteId; + } + + if (Client.playerAppearance.field2947 == 1) { + var0.spriteId2 = Client.field546; + } else { + var0.spriteId2 = Client.field547; + } + + } else if (var1 == 325) { + if (Client.field546 == -1) { + Client.field546 = var0.spriteId2; + Client.field547 = var0.spriteId; + } + + if (Client.playerAppearance.field2947 == 1) { + var0.spriteId2 = Client.field547; + } else { + var0.spriteId2 = Client.field546; + } + + } else if (var1 == 327) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 0; + } else if (var1 == 328) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class349.java b/osrs/src/main/java/class349.java deleted file mode 100644 index 392e10580..000000000 --- a/osrs/src/main/java/class349.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nk") -public class class349 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lns;" - ) - @Export("huffman") - public static Huffman huffman; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("ItemDefinition_modelArchive") - static AbstractArchive ItemDefinition_modelArchive; -} \ No newline at end of file diff --git a/osrs/src/main/java/class350.java b/osrs/src/main/java/class350.java new file mode 100644 index 000000000..ee679221c --- /dev/null +++ b/osrs/src/main/java/class350.java @@ -0,0 +1,375 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ny") +public class class350 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lnh;" + ) + @Export("huffman") + static Huffman huffman; + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "-857536144" + ) + static int method1890(int var0, Script var1, boolean var2) { + if (var0 == 3600) { + if (class12.friendSystem.friendListStatus == 0) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -2; + } else if (class12.friendSystem.friendListStatus == 1) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class12.friendSystem.friendsList.getSize(); + } + + return 1; + } else { + int var3; + if (var0 == 3601) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (class12.friendSystem.method408() && var3 >= 0 && var3 < class12.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)class12.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3602) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (class12.friendSystem.method408() && var3 >= 0 && var3 < class12.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = ((Buddy)class12.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3603) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (class12.friendSystem.method408() && var3 >= 0 && var3 < class12.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = ((Buddy)class12.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + String var5; + if (var0 == 3604) { + var5 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + int var9 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class12.setFriendsRank(var5, var9); + return 1; + } else if (var0 == 3605) { + var5 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + class12.friendSystem.addFriend(var5); + return 1; + } else if (var0 == 3606) { + var5 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + class12.friendSystem.removeFriend(var5); + return 1; + } else if (var0 == 3607) { + var5 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + class12.friendSystem.addIgnore(var5); + return 1; + } else if (var0 == 3608) { + var5 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + boolean var6 = true; + class12.friendSystem.removeIgnore(var5, var6); + return 1; + } else if (var0 == 3609) { + var5 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var5 = UserComparator7.method675(var5); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class12.friendSystem.isFriended(new Username(var5, class89.loginType), false) ? 1 : 0; + return 1; + } else if (var0 == 3611) { + if (class20.friendsChat != null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = class20.friendsChat.name; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3612) { + if (class20.friendsChat != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class20.friendsChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3613) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (class20.friendsChat != null && var3 < class20.friendsChat.getSize()) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = class20.friendsChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3614) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (class20.friendsChat != null && var3 < class20.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = ((Buddy)class20.friendsChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3615) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (class20.friendsChat != null && var3 < class20.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = ((Buddy)class20.friendsChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3616) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class20.friendsChat != null ? class20.friendsChat.minKick : 0; + return 1; + } else if (var0 == 3617) { + var5 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + InvDefinition.clanKickUser(var5); + return 1; + } else if (var0 == 3618) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class20.friendsChat != null ? class20.friendsChat.rank * 1192779189 * 1177118877 : 0; + return 1; + } else if (var0 == 3619) { + var5 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + class138.Clan_joinChat(var5); + return 1; + } else if (var0 == 3620) { + WorldMapSectionType.Clan_leaveChat(); + return 1; + } else if (var0 == 3621) { + if (!class12.friendSystem.method408()) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class12.friendSystem.ignoreList.getSize(); + } + + return 1; + } else if (var0 == 3622) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (class12.friendSystem.method408() && var3 >= 0 && var3 < class12.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)class12.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3623) { + var5 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var5 = UserComparator7.method675(var5); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class12.friendSystem.isIgnored(new Username(var5, class89.loginType)) ? 1 : 0; + return 1; + } else if (var0 == 3624) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (class20.friendsChat != null && var3 < class20.friendsChat.getSize() && class20.friendsChat.get(var3).getUsername().equals(class229.localPlayer.username)) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3625) { + if (class20.friendsChat != null && class20.friendsChat.owner != null) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = class20.friendsChat.owner; + } else { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == 3626) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (class20.friendsChat != null && var3 < class20.friendsChat.getSize() && ((ClanMate)class20.friendsChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 != 3627) { + if (var0 == 3628) { + class12.friendSystem.friendsList.removeComparator(); + return 1; + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } else if (var0 == 3639) { + class12.friendSystem.friendsList.sort(); + return 1; + } else if (var0 == 3640) { + class12.friendSystem.ignoreList.removeComparator(); + return 1; + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3643) { + class12.friendSystem.ignoreList.sort(); + return 1; + } else if (var0 == 3644) { + if (class20.friendsChat != null) { + class20.friendsChat.removeComparator(); + } + + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } else if (var0 == 3655) { + if (class20.friendsChat != null) { + class20.friendsChat.sort(); + } + + return 1; + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class12.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (class20.friendsChat != null) { + class20.friendsChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (class20.friendsChat != null && var3 < class20.friendsChat.getSize() && ((ClanMate)class20.friendsChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class351.java b/osrs/src/main/java/class351.java new file mode 100644 index 000000000..343a69c52 --- /dev/null +++ b/osrs/src/main/java/class351.java @@ -0,0 +1,72 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nu") +public enum class351 implements class383 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + field3148(0), + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + field3146(1), + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + field3147(2), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + field3144(3), + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + field3145(4); + + @ObfuscatedName("au") + final int field3149; + + class351(int var3) { + this.field3149 = var3; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-11" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3149; + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(Lhs;B)Z", + garbageValue = "113" + ) + static boolean method1892(ObjectComposition var0) { + if (var0.transforms != null) { + int[] var1 = var0.transforms; + + for (int var2 = 0; var2 < var1.length; ++var2) { + int var3 = var1[var2]; + ObjectComposition var4 = WorldMapSection2.getObjectDefinition(var3); + if (var4.mapIconId != -1) { + return true; + } + } + } else if (var0.mapIconId != -1) { + return true; + } + + return false; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class353.java b/osrs/src/main/java/class353.java deleted file mode 100644 index 63cb00f1e..000000000 --- a/osrs/src/main/java/class353.java +++ /dev/null @@ -1,17 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.concurrent.ScheduledExecutorService; - -@ObfuscatedName("nw") -public class class353 { - @ObfuscatedName("ab") - @Export("soundSystemExecutor") - public static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("jc") - @ObfuscatedSignature( - descriptor = "Ltt;" - ) - static Fonts field3142; -} \ No newline at end of file diff --git a/osrs/src/main/java/class354.java b/osrs/src/main/java/class354.java index 989cc6843..c0db693be 100644 --- a/osrs/src/main/java/class354.java +++ b/osrs/src/main/java/class354.java @@ -1,62 +1,28 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ny") -public enum class354 implements class386 { - @ObfuscatedName("ac") +@ObfuscatedName("nf") +public class class354 { + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "(II)I", + garbageValue = "1854178059" ) - field3145(0), - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - field3147(1), - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - field3146(2), - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - field3143(3), - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - field3148(4); - - @ObfuscatedName("kg") - static int field3144; - @ObfuscatedName("ah") - final int field3149; - - class354(int var3) { - this.field3149 = var3; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3149; + static int method1896(int var0) { + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); } - @ObfuscatedName("al") + @ObfuscatedName("oc") @ObfuscatedSignature( - descriptor = "(Lud;IIII)V", - garbageValue = "902612467" + descriptor = "(Luj;I)V", + garbageValue = "-390178192" ) - static void method1895(SpritePixels var0, int var1, int var2, int var3) { - DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; - long var6 = (long)(var3 << 16 | var1 << 8 | var2); - var4.put(var0, var6, var0.pixels.length * 4); + static void method1897(Buffer var0) { + if (Client.randomDatData != null) { + var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + } else { + byte[] var1 = class139.method748(); + var0.writeBytes(var1, 0, var1.length); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class355.java b/osrs/src/main/java/class355.java new file mode 100644 index 000000000..e70d00fb5 --- /dev/null +++ b/osrs/src/main/java/class355.java @@ -0,0 +1,26 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nk") +public final class class355 { + @ObfuscatedName("lx") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1520986974" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); + } + + if (var1.length() > 9) { + return " " + class167.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + class167.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class167.colorStartTag(16776960) + var1 + ""; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class359.java b/osrs/src/main/java/class356.java similarity index 63% rename from osrs/src/main/java/class359.java rename to osrs/src/main/java/class356.java index fa1859f99..575cd4752 100644 --- a/osrs/src/main/java/class359.java +++ b/osrs/src/main/java/class356.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ne") -public class class359 { +@ObfuscatedName("ns") +public class class356 { static { Math.sqrt(8192.0D); } diff --git a/osrs/src/main/java/class357.java b/osrs/src/main/java/class357.java index 96d08e098..c875ccad6 100644 --- a/osrs/src/main/java/class357.java +++ b/osrs/src/main/java/class357.java @@ -1,145 +1,447 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -@ObfuscatedName("nj") +@ObfuscatedName("nm") public class class357 { - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lul;IB)V", - garbageValue = "70" + descriptor = "Lnm;" ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); - var2.size = var0.readUnsignedByte(); - var2.id = var0.readInt(); - var2.operations = new int[var2.size]; - var2.creationErrors = new int[var2.size]; - var2.fields = new Field[var2.size]; - var2.intReplaceValues = new int[var2.size]; - var2.methods = new Method[var2.size]; - var2.arguments = new byte[var2.size][][]; - - for (int var3 = 0; var3 < var2.size; ++var3) { - try { - int var4 = var0.readUnsignedByte(); - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { - if (var4 == 3 || var4 == 4) { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = var0.readUnsignedByte(); - String[] var8 = new String[var7]; - - for (int var9 = 0; var9 < var7; ++var9) { - var8[var9] = var0.readStringCp1252NullTerminated(); - } + static final class357 field3179; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + static final class357 field3178; + @ObfuscatedName("bh") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("ar") + final int field3181; + @ObfuscatedName("ao") + final int field3180; - String var20 = var0.readStringCp1252NullTerminated(); - byte[][] var10 = new byte[var7][]; - int var12; - if (var4 == 3) { - for (int var11 = 0; var11 < var7; ++var11) { - var12 = var0.readInt(); - var10[var11] = new byte[var12]; - var0.readBytes(var10[var11], 0, var12); - } - } + static { + field3179 = new class357(51, 27, 800, 0, 16, 16); + field3178 = new class357(25, 28, 800, 656, 40, 40); + } - var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; + class357(int var1, int var2, int var3, int var4, int var5, int var6) { + this.field3181 = var5; + this.field3180 = var6; + } - for (var12 = 0; var12 < var7; ++var12) { - var21[var12] = class18.loadClassFromDescriptor(var8[var12]); - } + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "1617415071" + ) + static int method1899(int var0, Script var1, boolean var2) { + int var4 = -1; + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var3 = HealthBarDefinition.widgetDefinition.method1733(var4); + } else { + var3 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + } + + int var10; + if (var0 == 1100) { + DbTableType.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + int var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + if (var3.type == 12) { + class341 var7 = var3.method1871(); + if (var7 != null && var7.method1768(var10, var6)) { + class159.invalidateWidget(var3); + } + } else { + var3.scrollX = var10; + if (var3.scrollX > var3.scrollWidth - var3.width) { + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { + var3.scrollX = 0; + } + + var3.scrollY = var6; + if (var3.scrollY > var3.scrollHeight - var3.height) { + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { + var3.scrollY = 0; + } + + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1101) { + var3.color = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1102) { + var3.fill = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1103) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1104) { + var3.lineWid = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1105) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1106) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1107) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1108) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1109) { + DbTableType.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 5]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1110) { + var10 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var10 != var3.sequenceId) { + var3.sequenceId = var10; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + class159.invalidateWidget(var3); + } - Class var22 = class18.loadClassFromDescriptor(var20); - if (class18.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); + return 1; + } else if (var0 == 1111) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class159.invalidateWidget(var3); + return 1; + } else { + class341 var9; + if (var0 != 1112) { + class341 var12; + if (var0 == 1113) { + var3.fontId = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var3.type == 12) { + var12 = var3.method1871(); + if (var12 != null) { + var12.method1775(); } + } - Method[] var13 = class18.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if (var21.length == var17.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var17[var19] != var21[var19]) { - var18 = false; - break; - } - } - - if (var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; - } - } - } + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1114) { + DbTableType.Interpreter_intStackSize -= 3; + if (var3.type == 12) { + var12 = var3.method1871(); + if (var12 != null) { + var12.method1769(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize], Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + var12.method1770(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]); } + } else { + var3.textXAlignment = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + } - var2.arguments[var3] = var10; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1115) { + var3.textShadowed = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1116) { + var3.outline = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1117) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1118) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1119) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1120) { + DbTableType.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + class159.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { + class132.revalidateWidgetScroll(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var4 >> 16], var3, false); } - } else { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); + + return 1; + } else if (var0 == 1121) { + class10.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1123) { + var3.color2 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1125) { + var10 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + FillMode var13 = (FillMode)class12.findEnumerated(WallDecoration.FillMode_values(), var10); + if (var13 != null) { + var3.fillMode = var13; + class159.invalidateWidget(var3); } - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (class18.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); + return 1; + } else { + boolean var5; + if (var0 == 1126) { + var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + var3.field2989 = var5; + return 1; + } else if (var0 == 1127) { + var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else if (var0 == 1129) { + var3.field3117 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + class159.invalidateWidget(var3); + return 1; + } else if (var0 == 1130) { + var3.method1855(Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize], class60.urlRequester, ModelData0.method1598()); + return 1; + } else if (var0 == 1131) { + DbTableType.Interpreter_intStackSize -= 2; + var3.method1858(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize], Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == 1132) { + var3.method1859(Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + return 1; + } else { + class336 var14; + if (var0 == 1133) { + --DbTableType.Interpreter_intStackSize; + var14 = var3.method1872(); + if (var14 != null) { + var14.field2923 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1134) { + --DbTableType.Interpreter_intStackSize; + var14 = var3.method1872(); + if (var14 != null) { + var14.field2921 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1135) { + --class127.Interpreter_stringStackSize; + var12 = var3.method1871(); + if (var12 != null) { + var3.text2 = Interpreter.Interpreter_stringStack[class127.Interpreter_stringStackSize]; + } + + return 1; + } else if (var0 == 1136) { + --DbTableType.Interpreter_intStackSize; + var14 = var3.method1872(); + if (var14 != null) { + var14.field2922 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1137) { + --DbTableType.Interpreter_intStackSize; + var12 = var3.method1871(); + if (var12 != null && var12.method1765(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize])) { + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1138) { + --DbTableType.Interpreter_intStackSize; + var12 = var3.method1871(); + if (var12 != null && var12.method1766(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize])) { + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1139) { + --DbTableType.Interpreter_intStackSize; + var12 = var3.method1871(); + if (var12 != null && var12.method1767(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize])) { + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1140) { + var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + Client.field422.method1114(); + var9 = var3.method1871(); + if (var9 != null && var9.method1759(var5)) { + if (var5) { + Client.field422.method1112(var3); + } + + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1141) { + var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + if (!var5 && Client.field422.method1113() == var3) { + Client.field422.method1114(); + class159.invalidateWidget(var3); + } + + var9 = var3.method1871(); + if (var9 != null) { + var9.method1760(var5); + } + + return 1; + } else if (var0 == 1142) { + DbTableType.Interpreter_intStackSize -= 2; + var12 = var3.method1871(); + if (var12 != null && var12.method1783(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize], Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1])) { + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1143) { + --DbTableType.Interpreter_intStackSize; + var12 = var3.method1871(); + if (var12 != null && var12.method1783(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize], Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize])) { + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1144) { + --DbTableType.Interpreter_intStackSize; + var12 = var3.method1871(); + if (var12 != null) { + var12.method1772(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]); + class159.invalidateWidget(var3); + } + + return 1; + } else if (var0 == 1145) { + --DbTableType.Interpreter_intStackSize; + var12 = var3.method1871(); + if (var12 != null) { + var12.method1771(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]); + } + + return 1; + } else if (var0 == 1146) { + --DbTableType.Interpreter_intStackSize; + var12 = var3.method1871(); + if (var12 != null) { + var12.method1774(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]); + } + + return 1; + } else if (var0 == 1147) { + --DbTableType.Interpreter_intStackSize; + var12 = var3.method1871(); + if (var12 != null) { + var12.method1773(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]); + class159.invalidateWidget(var3); + } + + return 1; + } else { + class27 var11; + if (var0 == 1148) { + DbTableType.Interpreter_intStackSize -= 2; + var11 = var3.method1873(); + if (var11 != null) { + var11.method111(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize], Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + } + + return 1; + } else if (var0 == 1149) { + DbTableType.Interpreter_intStackSize -= 2; + var11 = var3.method1873(); + if (var11 != null) { + var11.method113((char)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize], Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]); + } + + return 1; + } else if (var0 == 1150) { + var3.method1856(Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize], class60.urlRequester); + return 1; + } else { + return 2; + } + } + } + } + } else { + String var8 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + if (var3.type == 12) { + var9 = var3.method1871(); + if (var9 != null && var9.method1815()) { + var9.method1761(var8); + } else { + var3.text = var8; } - var2.fields[var3] = Reflection.findField(class18.loadClassFromDescriptor(var5), var6); + class159.invalidateWidget(var3); + } else if (!var8.equals(var3.text)) { + var3.text = var8; + class159.invalidateWidget(var3); } - } catch (ClassNotFoundException var24) { - var2.creationErrors[var3] = -1; - } catch (SecurityException var25) { - var2.creationErrors[var3] = -2; - } catch (NullPointerException var26) { - var2.creationErrors[var3] = -3; - } catch (Exception var27) { - var2.creationErrors[var3] = -4; - } catch (Throwable var28) { - var2.creationErrors[var3] = -5; + + return 1; } } - - class36.reflectionChecks.addFirst(var2); } - @ObfuscatedName("my") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1825300957" + descriptor = "(Loh;Ljava/lang/String;I)V", + garbageValue = "-587575754" ) - static final void method1901(int var0) { - if (class33.widgetDefinition.loadInterface(var0)) { - Widget[] var1 = class33.widgetDefinition.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } - } - - } + static void method1900(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field549 += var2.groupCount; } } \ No newline at end of file diff --git a/osrs/src/main/java/class358.java b/osrs/src/main/java/class358.java deleted file mode 100644 index c02dab5f3..000000000 --- a/osrs/src/main/java/class358.java +++ /dev/null @@ -1,18 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nr") -public final class class358 { - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - static Archive field3177; - @ObfuscatedName("th") - @ObfuscatedSignature( - descriptor = "Lrl;" - ) - @Export("friendsChat") - static FriendsChat friendsChat; -} \ No newline at end of file diff --git a/osrs/src/main/java/class36.java b/osrs/src/main/java/class36.java index 096e74d65..a735bd834 100644 --- a/osrs/src/main/java/class36.java +++ b/osrs/src/main/java/class36.java @@ -2,90 +2,201 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +import java.text.ParseException; +import java.util.Date; + +@ObfuscatedName("bw") public class class36 { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lpm;" ) @Export("reflectionChecks") public static IterableNodeDeque reflectionChecks; - @ObfuscatedName("kh") + @ObfuscatedName("jj") @ObfuscatedSignature( - descriptor = "[Lun;" + descriptor = "Lkf;" ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; + @Export("scene") + static Scene scene; + @ObfuscatedName("kk") + @Export("cameraZ") + static int cameraZ; static { reflectionChecks = new IterableNodeDeque(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1924526365" + descriptor = "(B)[Llo;", + garbageValue = "88" ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var1 = Messages.getWidget(var0); - int var2 = var1.baseVar; - int var3 = var1.startBit; - int var4 = var1.endBit; - int var5 = Varps.Varps_masks[var4 - var3]; - return Varps.Varps_main[var2] >> var3 & var5; + static LoginPacket[] method183() { + return new LoginPacket[]{LoginPacket.NEW_LOGIN_CONNECTION, LoginPacket.RECONNECT_LOGIN_CONNECTION, LoginPacket.field2766, LoginPacket.field2765, LoginPacket.field2764, LoginPacket.field2761}; } - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(II)Lif;", - garbageValue = "1398442265" + descriptor = "(I)Z", + garbageValue = "1667921404" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static boolean method184() { + Date var0; + try { + var0 = class395.method2040(); + } catch (ParseException var7) { + UserComparator7.method674(7); + class139.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); + return false; + } + + if (var0 == null) { + return false; } else { - byte[] var2 = class295.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + java.util.Calendar var2 = java.util.Calendar.getInstance(); + var2.set(1, var2.get(1) - 13); + var2.set(5, var2.get(5) + 1); + var2.set(11, 0); + var2.set(12, 0); + var2.set(13, 0); + var2.set(14, 0); + Date var3 = var2.getTime(); + boolean var4 = var0.before(var3); + boolean var6 = class241.method1296(var0); + if (!var6) { + UserComparator7.method674(7); + class139.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); + return false; + } else { + if (!var4) { + class160.field1406 = 8388607; + } else { + class160.field1406 = (int)(var0.getTime() / 86400000L - 11745L); + } - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; + return true; + } } } - @ObfuscatedName("ax") + @ObfuscatedName("no") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1831211968" + descriptor = "(Lnn;IIII)V", + garbageValue = "-1700622537" ) - public static int method182(CharSequence var0) { - return class230.method1184(var0, 10, true); - } + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + class102.method604(); + SpriteMask var4 = var0.method1851(HealthBarDefinition.widgetDefinition, false); + if (var4 != null) { + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); + if (Client.minimapState != 2 && Client.minimapState != 5) { + int var5 = Client.camAngleY & 2047; + int var6 = class229.localPlayer.x / 32 + 48; + int var7 = 464 - class229.localPlayer.y / 32; + class102.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); - @ObfuscatedName("ne") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1735203823" - ) - static final void method183(int var0, int var1) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method868()) { - ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - if (var2.rank == -1) { - PacketBufferNode var3 = ClanChannelMember.getPacketBufferNode(ClientPacket.f83, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(3 + class478.stringCp1252NullTerminatedByteSize(var2.username.getName())); - var3.packetBuffer.writeByte(var0); - var3.packetBuffer.writeShort(var1); - var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); - Client.packetWriter.addNode(var3); + int var8; + int var9; + int var10; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { + var9 = Client.mapIconXs[var8] * 4 + 2 - class229.localPlayer.x / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - class229.localPlayer.y / 32; + class147.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { + for (var9 = 0; var9 < 104; ++var9) { + NodeDeque var14 = Client.groundItems[ItemLayer.Client_plane][var8][var9]; + if (var14 != null) { + var11 = var8 * 4 + 2 - class229.localPlayer.x / 32; + var12 = var9 * 4 + 2 - class229.localPlayer.y / 32; + class147.drawSpriteOnMinimap(var1, var2, var11, var12, HorizontalAlignment.mapDotSprites[0], var4); + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { + NPC var15 = Client.npcs[Client.npcIndices[var8]]; + if (var15 != null && var15.isVisible()) { + NPCComposition var17 = var15.definition; + if (var17 != null && var17.transforms != null) { + var17 = var17.transform(); + } + + if (var17 != null && var17.drawMapDot && var17.isInteractable) { + var11 = var15.x / 32 - class229.localPlayer.x / 32; + var12 = var15.y / 32 - class229.localPlayer.y / 32; + class147.drawSpriteOnMinimap(var1, var2, var11, var12, HorizontalAlignment.mapDotSprites[1], var4); + } + } + } + + var8 = Players.Players_count; + int[] var18 = Players.Players_indices; + + for (var10 = 0; var10 < var8; ++var10) { + Player var16 = Client.players[var18[var10]]; + if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != class229.localPlayer) { + var12 = var16.x / 32 - class229.localPlayer.x / 32; + int var13 = var16.y / 32 - class229.localPlayer.y / 32; + if (var16.isFriend()) { + class147.drawSpriteOnMinimap(var1, var2, var12, var13, HorizontalAlignment.mapDotSprites[3], var4); + } else if (class229.localPlayer.team != 0 && var16.team != 0 && var16.team == class229.localPlayer.team) { + class147.drawSpriteOnMinimap(var1, var2, var12, var13, HorizontalAlignment.mapDotSprites[4], var4); + } else if (var16.method485()) { + class147.drawSpriteOnMinimap(var1, var2, var12, var13, HorizontalAlignment.mapDotSprites[5], var4); + } else if (var16.isClanMember()) { + class147.drawSpriteOnMinimap(var1, var2, var12, var13, HorizontalAlignment.mapDotSprites[6], var4); + } else { + class147.drawSpriteOnMinimap(var1, var2, var12, var13, HorizontalAlignment.mapDotSprites[2], var4); + } + } } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; + if (var19 != null) { + var11 = var19.x / 32 - class229.localPlayer.x / 32; + var12 = var19.y / 32 - class229.localPlayer.y / 32; + class153.worldToMinimap(var1, var2, var11, var12, class12.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - NewShit.baseX * 4 + 2 - class229.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - class101.baseY * 4 + 2 - class229.localPlayer.y / 32; + class153.worldToMinimap(var1, var2, var10, var11, class12.mapMarkerSprites[1], var4); + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { + Player var20 = Client.players[Client.hintArrowPlayerIndex]; + if (var20 != null) { + var11 = var20.x / 32 - class229.localPlayer.x / 32; + var12 = var20.y / 32 - class229.localPlayer.y / 32; + class153.worldToMinimap(var1, var2, var11, var12, class12.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - class229.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - class229.localPlayer.y / 32; + class147.drawSpriteOnMinimap(var1, var2, var10, var11, class12.mapMarkerSprites[0], var4); + } + + if (!class229.localPlayer.isHidden) { + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } + + Client.field408[var3] = true; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class360.java b/osrs/src/main/java/class360.java deleted file mode 100644 index 7d7100695..000000000 --- a/osrs/src/main/java/class360.java +++ /dev/null @@ -1,76 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nq") -public class class360 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lnq;" - ) - static final class360 field3179; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lnq;" - ) - static final class360 field3180; - @ObfuscatedName("ak") - final int field3181; - @ObfuscatedName("ax") - final int field3182; - - static { - field3179 = new class360(51, 27, 800, 0, 16, 16); - field3180 = new class360(25, 28, 800, 656, 40, 40); - } - - class360(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3181 = var5; - this.field3182 = var6; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1417914088" - ) - public static int method1902(int var0) { - return var0 != 0 && var0 != 1 ? -1 : 0; - } - - @ObfuscatedName("lx") - @ObfuscatedSignature( - descriptor = "([Lnm;IIIZB)V", - garbageValue = "50" - ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { - Widget var6 = var0[var5]; - if (var6 != null && var6.parentId == var1) { - class140.alignWidgetSize(var6, var2, var3, var4); - Username.alignWidgetPosition(var6, var2, var3); - if (var6.scrollX > var6.scrollWidth - var6.width) { - var6.scrollX = var6.scrollWidth - var6.width; - } - - if (var6.scrollX < 0) { - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { - var6.scrollY = 0; - } - - if (var6.type == 0) { - PendingSpawn.revalidateWidgetScroll(var0, var6, var4); - } - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class361.java b/osrs/src/main/java/class361.java new file mode 100644 index 000000000..be41db00c --- /dev/null +++ b/osrs/src/main/java/class361.java @@ -0,0 +1,58 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nz") +public class class361 { + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "[Lcr;" + ) + @Export("World_worlds") + static World[] World_worlds; + + static { + int var0 = 0; + int var1 = 0; + class357[] var2 = new class357[]{class357.field3179, class357.field3178}; + class357[] var3 = var2; + + for (int var4 = 0; var4 < var3.length; ++var4) { + class357 var5 = var3[var4]; + if (var5.field3181 > var0) { + var0 = var5.field3181; + } + + if (var5.field3180 > var1) { + var1 = var5.field3180; + } + } + + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1795808199" + ) + public static int method1902(int var0, int var1) { + int var2; + for (var2 = 0; var1 > 0; --var1) { + var2 = var2 << 1 | var0 & 1; + var0 >>>= 1; + } + + return var2; + } + + @ObfuscatedName("ns") + @ObfuscatedSignature( + descriptor = "(Lnn;I)I", + garbageValue = "571282441" + ) + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); + return var1 != null ? var1.integer : var0.flags; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class362.java b/osrs/src/main/java/class362.java new file mode 100644 index 000000000..8afc60e10 --- /dev/null +++ b/osrs/src/main/java/class362.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nl") +public class class362 { + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IB)[B", + garbageValue = "-38" + ) + @Export("ByteArrayPool_getArray") + public static byte[] ByteArrayPool_getArray(int var0) { + return ServerPacket.ByteArrayPool_getArrayBool(var0, false); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class363.java b/osrs/src/main/java/class363.java deleted file mode 100644 index 124e11fc6..000000000 --- a/osrs/src/main/java/class363.java +++ /dev/null @@ -1,9 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("nf") -public class class363 { - @ObfuscatedName("gr") - @Export("js5Port") - static int js5Port; -} \ No newline at end of file diff --git a/osrs/src/main/java/class364.java b/osrs/src/main/java/class364.java index e4b7949be..0a6c7eea3 100644 --- a/osrs/src/main/java/class364.java +++ b/osrs/src/main/java/class364.java @@ -1,11 +1,44 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oh") -public class class364 { +@ObfuscatedName("oi") +public enum class364 implements class383 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + field3511(-1), + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + field3508(0), + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + field3510(1), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + field3509(2); + @ObfuscatedName("ab") + final int field3512; + + class364(int var3) { + this.field3512 = var3; + } + + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lun;" + descriptor = "(B)I", + garbageValue = "-11" ) - static IndexedSprite field3198; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3512; + } } \ No newline at end of file diff --git a/osrs/src/main/java/class365.java b/osrs/src/main/java/class365.java deleted file mode 100644 index 757256a44..000000000 --- a/osrs/src/main/java/class365.java +++ /dev/null @@ -1,29 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("of") -public class class365 { - @ObfuscatedName("jt") - static int field3199; - @ObfuscatedName("la") - @Export("cameraPitch") - static int cameraPitch; - - static { - int var0 = 0; - int var1 = 0; - class360[] var2 = class30.method121(); - - for (int var3 = 0; var3 < var2.length; ++var3) { - class360 var4 = var2[var3]; - if (var4.field3181 > var0) { - var0 = var4.field3181; - } - - if (var4.field3182 > var1) { - var1 = var4.field3182; - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class367.java b/osrs/src/main/java/class367.java deleted file mode 100644 index a15387019..000000000 --- a/osrs/src/main/java/class367.java +++ /dev/null @@ -1,545 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("os") -public enum class367 implements class386 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Los;" - ) - field3512(-1), - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Los;" - ) - field3514(0), - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Los;" - ) - field3513(1), - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Los;" - ) - field3515(2); - - @ObfuscatedName("ao") - final int field3516; - - class367(int var3) { - this.field3516 = var3; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3516; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lpu;Lpu;Lpu;I)V", - garbageValue = "-266598843" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (class340.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - class379.loginBoxCenter = Login.loginBoxX + 180; - if (Login.worldSelectOpen) { - ArchiveDiskActionHandler.method1914(var0, var1); - } else { - PcmPlayer.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - int var4; - if (Client.gameState == 0 || Client.gameState == 5) { - byte var3 = 20; - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); - var4 = 253 - var3; - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); - } - - String var6; - String var7; - String var8; - String var9; - short var23; - int var24; - short var25; - if (Client.gameState == 20) { - Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); - var23 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var24 += 7; - if (Login.loginIndex != 4 && Login.loginIndex != 10) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var24, 16777215, 0); - var25 = 200; - if (class91.clientPreferences.getIsUsernameHidden()) { - var8 = Login.Login_username; - var7 = class92.method486('*', var8.length()); - var6 = var7; - } else { - var6 = Login.Login_username; - } - - for (var6 = var6; var0.stringWidth(var6) > var25; var6 = var6.substring(0, var6.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var24, 16777215, 0); - var24 += 15; - var8 = Login.Login_password; - var7 = class92.method486('*', var8.length()); - - for (var9 = var7; var0.stringWidth(var9) > var25; var9 = var9.substring(1)) { - } - - var0.draw("Password: " + var9, Login.loginBoxX + 180 - 108, var24, 16777215, 0); - var24 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { - Login.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var14; - if (Login.loginIndex == 0) { - var23 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 30; - var4 = Login.loginBoxX + 180 - 80; - var14 = 291; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawLines("New User", var4 - 73, var14 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var4 = Login.loginBoxX + 180 + 80; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawLines("Existing User", var4 - 73, var14 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var23 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var4 = Login.loginBoxX + 180 - 80; - var14 = 321; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Continue", var4, var14 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Cancel", var4, var14 + 5, 16777215, 0); - } else if (Login.loginIndex == 2) { - var23 = 201; - var0.drawCentered(Login.Login_response1, class379.loginBoxCenter, var23, 16776960, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, class379.loginBoxCenter, var24, 16776960, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, class379.loginBoxCenter, var24, 16776960, 0); - var24 += 15; - var24 += 7; - var0.draw("Login: ", class379.loginBoxCenter - 110, var24, 16777215, 0); - var25 = 200; - if (class91.clientPreferences.getIsUsernameHidden()) { - var8 = Login.Login_username; - var7 = class92.method486('*', var8.length()); - var6 = var7; - } else { - var6 = Login.Login_username; - } - - for (var6 = var6; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), class379.loginBoxCenter - 70, var24, 16777215, 0); - var24 += 15; - var8 = Login.Login_password; - var7 = class92.method486('*', var8.length()); - - for (var9 = var7; var0.stringWidth(var9) > var25; var9 = var9.substring(1)) { - } - - var0.draw("Password: " + var9 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), class379.loginBoxCenter - 108, var24, 16777215, 0); - var24 += 15; - var23 = 277; - int var10 = class379.loginBoxCenter + -117; - IndexedSprite var11 = ClanSettings.method828(Client.Login_isUsernameRemembered, Login.field742); - var11.drawAt(var10, var23); - var10 = var10 + var11.subWidth + 5; - var1.draw("Remember username", var10, var23 + 13, 16776960, 0); - var10 = class379.loginBoxCenter + 24; - var11 = ClanSettings.method828(class91.clientPreferences.getIsUsernameHidden(), Login.field743); - var11.drawAt(var10, var23); - var10 = var10 + var11.subWidth + 5; - var1.draw("Hide username", var10, var23 + 13, 16776960, 0); - var24 = var23 + 15; - int var12 = class379.loginBoxCenter - 80; - short var13 = 321; - VarcInt.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); - var0.drawCentered("Login", var12, var13 + 5, 16777215, 0); - var12 = class379.loginBoxCenter + 80; - VarcInt.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); - var0.drawCentered("Cancel", var12, var13 + 5, 16777215, 0); - var23 = 357; - switch(Login.field749) { - case 2: - class16.field47 = "Having trouble logging in?"; - break; - default: - class16.field47 = "Can't login? Click here."; - } - - class481.field3945 = new Bounds(class379.loginBoxCenter, var23, var1.stringWidth(class16.field47), 11); - Message.field349 = new Bounds(class379.loginBoxCenter, var23, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(class16.field47, class379.loginBoxCenter, var23, 16777215, 0); - } else if (Login.loginIndex == 3) { - var23 = 201; - var0.drawCentered("Incorrect username or password.", Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 20; - var1.drawCentered("If you have upgraded to a Jagex Account, you", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 20; - var1.drawCentered("need to log in using the Jagex Launcher instead.", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var4 = Login.loginBoxX + 180; - var14 = 276; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var2.drawCentered("Try again", var4, var14 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var14 = 326; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var2.drawCentered("Forgotten password?", var4, var14 + 5, 16777215, 0); - } else { - String var5; - if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var23 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var5 = "PIN: "; - var7 = class186.otp; - var6 = class92.method486('*', var7.length()); - var0.draw(var5 + var6 + (Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var24, 16777215, 0); - var24 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var24, 16776960, 0); - var24 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var24, 16776960, 0); - int var16 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; - int var17 = var24 - var0.ascent; - IndexedSprite var18; - if (Login.field741) { - var18 = class534.options_buttons_2Sprite; - } else { - var18 = class519.options_buttons_0Sprite; - } - - var18.drawAt(var16, var17); - var24 += 15; - int var19 = Login.loginBoxX + 180 - 80; - short var26 = 321; - VarcInt.titlebuttonSprite.drawAt(var19 - 73, var26 - 20); - var0.drawCentered("Continue", var19, var26 + 5, 16777215, 0); - var19 = Login.loginBoxX + 180 + 80; - VarcInt.titlebuttonSprite.drawAt(var19 - 73, var26 - 20); - var0.drawCentered("Cancel", var19, var26 + 5, 16777215, 0); - var1.drawCentered("Can't login? Click here.", Login.loginBoxX + 180, var26 + 36, 16777215, 0); - } else { - int var20; - short var28; - if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var23 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var24 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var24, 16777215, 0); - var25 = 174; - if (class91.clientPreferences.getIsUsernameHidden()) { - var8 = Login.Login_username; - var7 = class92.method486('*', var8.length()); - var6 = var7; - } else { - var6 = Login.Login_username; - } - - for (var6 = var6; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var24, 16777215, 0); - var24 += 15; - var20 = Login.loginBoxX + 180 - 80; - var28 = 321; - VarcInt.titlebuttonSprite.drawAt(var20 - 73, var28 - 20); - var0.drawCentered("Recover", var20, var28 + 5, 16777215, 0); - var20 = Login.loginBoxX + 180 + 80; - VarcInt.titlebuttonSprite.drawAt(var20 - 73, var28 - 20); - var0.drawCentered("Back", var20, var28 + 5, 16777215, 0); - var28 = 356; - var1.drawCentered("Still having trouble logging in?", class379.loginBoxCenter, var28, 268435455, 0); - } else if (Login.loginIndex == 6) { - var23 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var4 = Login.loginBoxX + 180; - var14 = 321; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Back", var4, var14 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - if (MusicPatchNode2.field2778 && !Client.onMobile) { - var23 = 201; - var0.drawCentered(Login.Login_response1, class379.loginBoxCenter, var23, 16776960, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, class379.loginBoxCenter, var24, 16776960, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, class379.loginBoxCenter, var24, 16776960, 0); - var4 = class379.loginBoxCenter - 150; - var24 += 10; - - int var27; - for (var27 = 0; var27 < 8; ++var27) { - VarcInt.titlebuttonSprite.method2693(var4, var24, 30, 40); - boolean var21 = var27 == Login.field751 & Client.cycle % 40 < 20; - var0.draw((Login.field766[var27] == null ? "" : Login.field766[var27]) + (var21 ? Client.colorStartTag(16776960) + "|" : ""), var4 + 10, var24 + 27, 16777215, 0); - if (var27 != 1 && var27 != 3) { - var4 += 35; - } else { - var4 += 50; - var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var24 + 27, 16777215, 0); - } - } - - var27 = class379.loginBoxCenter - 80; - short var30 = 321; - VarcInt.titlebuttonSprite.drawAt(var27 - 73, var30 - 20); - var0.drawCentered("Submit", var27, var30 + 5, 16777215, 0); - var27 = class379.loginBoxCenter + 80; - VarcInt.titlebuttonSprite.drawAt(var27 - 73, var30 - 20); - var0.drawCentered("Cancel", var27, var30 + 5, 16777215, 0); - } else { - var23 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var4 = Login.loginBoxX + 180 - 80; - var14 = 321; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Set Date of Birth", var4, var14 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Back", var4, var14 + 5, 16777215, 0); - } - } else if (Login.loginIndex == 8) { - var23 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var4 = Login.loginBoxX + 180 - 80; - var14 = 321; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Privacy Policy", var4, var14 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Back", var4, var14 + 5, 16777215, 0); - } else if (Login.loginIndex == 9) { - var23 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 25; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 25; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); - var4 = Login.loginBoxX + 180; - var14 = 311; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Try again", var4, var14 + 5, 16777215, 0); - } else if (Login.loginIndex == 10) { - var24 = Login.loginBoxX + 180; - var25 = 209; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var25, 16776960, 0); - var4 = var25 + 20; - Login.field775.drawAt(var24 - 109, var4); - if (Login.field761.isEmpty()) { - class364.field3198.drawAt(var24 - 48, var4 + 18); - } else { - class364.field3198.drawAt(var24 - 48, var4 + 5); - var0.drawCentered(Login.field761, var24, var4 + 68 - 15, 16776960, 0); - } - } else if (Login.loginIndex == 12) { - var24 = class379.loginBoxCenter; - var25 = 216; - var2.drawCentered("Before using this app, please read and accept our", var24, var25, 16777215, 0); - var4 = var25 + 17; - var2.drawCentered("terms of use, privacy policy, and end user licence", var24, var4, 16777215, 0); - var4 += 17; - var2.drawCentered("agreement (EULA).", var24, var4, 16777215, 0); - var4 += 17; - var2.drawCentered("By accepting, you agree to these documents.", var24, var4, 16777215, 0); - var24 = class379.loginBoxCenter - 80; - var25 = 311; - VarcInt.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); - var0.drawCentered("Accept", var24, var25 + 5, 16777215, 0); - var24 = class379.loginBoxCenter + 80; - VarcInt.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); - var0.drawCentered("Decline", var24, var25 + 5, 16777215, 0); - } else if (Login.loginIndex == 13) { - var23 = 231; - var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var23, 16777215, 0); - var24 = var23 + 20; - var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var24, 16777215, 0); - var4 = Login.loginBoxX + 180; - var23 = 311; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 14) { - var23 = 201; - String var15 = ""; - var5 = ""; - var6 = ""; - switch(Login.field748) { - case 0: - var15 = "Your account has been involved"; - var5 = "in serious rule breaking."; - var6 = ""; - break; - case 1: - var15 = "Your account has been locked due to"; - var5 = "suspicious activity."; - var6 = "Please recover your account."; - break; - case 2: - var15 = "The unpaid balance on your account needs"; - var5 = "to be resolved before you can play."; - var6 = Strings.field3355; - break; - default: - class429.Login_promptCredentials(false); - } - - var0.drawCentered(var15, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 20; - var0.drawCentered(var5, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 20; - var0.drawCentered(var6, Login.loginBoxX + 180, var24, 16776960, 0); - var20 = Login.loginBoxX + 180; - var28 = 276; - VarcInt.titlebuttonSprite.drawAt(var20 - 73, var28 - 20); - if (Login.field748 == 1) { - var0.drawCentered("Recover Account", var20, var28 + 5, 16777215, 0); - } else { - var0.drawCentered("View Appeal Options", var20, var28 + 5, 16777215, 0); - } - - var20 = Login.loginBoxX + 180; - var28 = 326; - VarcInt.titlebuttonSprite.drawAt(var20 - 73, var28 - 20); - var0.drawCentered("Back", var20, var28 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var23 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var4 = Login.loginBoxX + 180; - var14 = 301; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Ok", var4, var14 + 5, 16777215, 0); - } else if (Login.loginIndex == 32) { - var23 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var4 = Login.loginBoxX + 180 - 80; - var14 = 321; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Set Date of Birth", var4, var14 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var0.drawCentered("Back", var4, var14 + 5, 16777215, 0); - } else if (Login.loginIndex == 33) { - var23 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 20; - var1.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 20; - var1.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var4 = Login.loginBoxX + 180; - var14 = 276; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var2.drawCentered("Download Launcher", var4, var14 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var14 = 326; - VarcInt.titlebuttonSprite.drawAt(var4 - 73, var14 - 20); - var2.drawCentered("Back", var4, var14 + 5, 16777215, 0); - } - } - } - } - - if (Client.gameState >= 10) { - int[] var22 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var22); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class491.canvasHeight); - class544.field4278.draw(Login.xPadding - 22, Client.cycle); - class544.field4278.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var22); - } - - Login.title_muteSprite[class91.clientPreferences.getTitleMusicDisabled() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && Language.Language_EN == WorldMapLabelSize.clientLanguage) { - if (Varcs.field1138 != null) { - var24 = Login.xPadding + 5; - var25 = 463; - byte var29 = 100; - byte var31 = 35; - Varcs.field1138.drawAt(var24, var25); - var0.drawCentered("World" + " " + Client.worldId, var29 / 2 + var24, var31 / 2 + var25 - 2, 16777215, 0); - if (class91.World_request != null) { - var1.drawCentered("Loading...", var29 / 2 + var24, var31 / 2 + var25 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var29 / 2 + var24, var31 / 2 + var25 + 12, 16777215, 0); - } - } else { - Varcs.field1138 = class167.SpriteBuffer_getIndexedSpriteByName(class199.archive8, "sl_button", ""); - } - } - - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class369.java b/osrs/src/main/java/class369.java new file mode 100644 index 000000000..0c4d51975 --- /dev/null +++ b/osrs/src/main/java/class369.java @@ -0,0 +1,35 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oy") +public class class369 extends DualNode { + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lol;" + ) + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("aa") + static byte[][][] field3559; + @ObfuscatedName("gh") + static String field3560; + @ObfuscatedName("jg") + @ObfuscatedSignature( + descriptor = "Lpf;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + Archive field3564; + @ObfuscatedName("ah") + int field3563; + @ObfuscatedName("ar") + byte field3562; + + class369() { + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class372.java b/osrs/src/main/java/class372.java deleted file mode 100644 index 4ec0cae17..000000000 --- a/osrs/src/main/java/class372.java +++ /dev/null @@ -1,74 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ou") -public class class372 extends DualNode { - @ObfuscatedName("ab") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("de") - @ObfuscatedSignature( - descriptor = "Lun;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - Archive field3565; - @ObfuscatedName("al") - int field3564; - @ObfuscatedName("ak") - byte field3563; - - class372() { - } - - @ObfuscatedName("al") - public static boolean method1929(long var0) { - boolean var2 = 0L != var0; - if (var2) { - boolean var3 = (int)(var0 >>> 16 & 1L) == 1; - var2 = !var3; - } - - return var2; - } - - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-655297732" - ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); - int var2 = var1.readUnsignedByte(); - int var3 = var1.readInt(); - if (var3 >= 0 && (AbstractArchive.maximumContainerSize == 0 || var3 <= AbstractArchive.maximumContainerSize)) { - if (var2 == 0) { - byte[] var4 = new byte[var3]; - var1.readBytes(var4, 0, var3); - return var4; - } else { - int var6 = var1.readInt(); - if (var6 < 0 || AbstractArchive.maximumContainerSize != 0 && var6 > AbstractArchive.maximumContainerSize) { - throw new RuntimeException(); - } else { - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } - - return var5; - } - } - } else { - throw new RuntimeException(); - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class376.java b/osrs/src/main/java/class376.java new file mode 100644 index 000000000..095e48486 --- /dev/null +++ b/osrs/src/main/java/class376.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ou") +public class class376 { + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "Lrl;" + ) + static GraphicsDefaults field3614; +} \ No newline at end of file diff --git a/osrs/src/main/java/class379.java b/osrs/src/main/java/class379.java deleted file mode 100644 index de3569f3b..000000000 --- a/osrs/src/main/java/class379.java +++ /dev/null @@ -1,24 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("op") -public class class379 { - @ObfuscatedName("az") - @Export("loginBoxCenter") - static int loginBoxCenter; - - @ObfuscatedName("ng") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-960191990" - ) - static void method1983(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { - if ((long)var0 == (var1.key >> 48 & 65535L)) { - var1.remove(); - } - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class381.java b/osrs/src/main/java/class381.java new file mode 100644 index 000000000..51012b456 --- /dev/null +++ b/osrs/src/main/java/class381.java @@ -0,0 +1,178 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.HashMap; + +@ObfuscatedName("os") +public class class381 { + @ObfuscatedName("at") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lrv;" + ) + @Export("bounds") + Bounds bounds; + @ObfuscatedName("ar") + int[] field3630; + @ObfuscatedName("ao") + int[] field3629; + @ObfuscatedName("ab") + int field3628; + + public class381() { + this.spriteMap = new HashMap(); + this.bounds = new Bounds(0, 0); + this.field3630 = new int[2048]; + this.field3629 = new int[2048]; + this.field3628 = 0; + class162.method845(); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-18604685" + ) + void method1983(int var1) { + int var2 = var1 * 2 + 1; + double[] var3 = class384.method1990(0.0D, (double)((float)var1 / 3.0F), var1); + double var4 = var3[var1] * var3[var1]; + int[] var6 = new int[var2 * var2]; + boolean var7 = false; + + for (int var8 = 0; var8 < var2; ++var8) { + for (int var9 = 0; var9 < var2; ++var9) { + int var10 = var6[var9 + var2 * var8] = (int)(256.0D * (var3[var9] * var3[var8] / var4)); + if (!var7 && var10 > 0) { + var7 = true; + } + } + } + + SpritePixels var11 = new SpritePixels(var6, var2, var2); + this.spriteMap.put(var1, var11); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)Luz;", + garbageValue = "1127436045" + ) + SpritePixels method1984(int var1) { + if (!this.spriteMap.containsKey(var1)) { + this.method1983(var1); + } + + return (SpritePixels)this.spriteMap.get(var1); + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1542973383" + ) + public final void method1985(int var1, int var2) { + if (this.field3628 < this.field3630.length) { + this.field3630[this.field3628] = var1; + this.field3629[this.field3628] = var2; + ++this.field3628; + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-26946" + ) + public final void method1986() { + this.field3628 = 0; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IILuz;FB)V", + garbageValue = "127" + ) + public final void method1987(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(var4 * 18.0F); + SpritePixels var6 = this.method1984(var5); + int var7 = var5 * 2 + 1; + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); + Bounds var9 = new Bounds(0, 0); + this.bounds.setHigh(var7, var7); + System.nanoTime(); + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field3628; ++var10) { + var11 = this.field3630[var10]; + var12 = this.field3629[var10]; + int var13 = (int)((float)(var11 - var1) * var4) - var5; + int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; + this.bounds.setLow(var13, var14); + this.bounds.method2301(var8, var9); + this.method1988(var6, var3, var9); + } + + System.nanoTime(); + System.nanoTime(); + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { + if (var3.pixels[var10] == 0) { + var3.pixels[var10] = -16777216; + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; + if (var11 <= 0) { + var3.pixels[var10] = -16777216; + } else { + if (var11 > ChatChannel.field835.length) { + var11 = ChatChannel.field835.length; + } + + var12 = ChatChannel.field835[var11 - 1]; + var3.pixels[var10] = -16777216 | var12; + } + } + } + + System.nanoTime(); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Luz;Luz;Lrv;I)V", + garbageValue = "-1645913083" + ) + void method1988(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { + int var4 = 0; + int var5 = 0; + if (var3.lowX == 0) { + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; + int var7 = var3.lowX + var2.subWidth * var3.lowY; + + for (int var8 = 0; var8 < var3.highY; ++var8) { + for (int var9 = 0; var9 < var3.highX; ++var9) { + int[] var10000 = var2.pixels; + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; + var7 += var2.subWidth - var3.highX; + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class382.java b/osrs/src/main/java/class382.java new file mode 100644 index 000000000..6263e7baf --- /dev/null +++ b/osrs/src/main/java/class382.java @@ -0,0 +1,36 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ot") +public class class382 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lot;" + ) + static final class382 field3636; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lot;" + ) + static final class382 field3633; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lot;" + ) + static final class382 field3635; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lot;" + ) + static final class382 field3634; + + static { + field3636 = new class382(); + field3633 = new class382(); + field3635 = new class382(); + field3634 = new class382(); + } + + class382() { + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class386.java b/osrs/src/main/java/class383.java similarity index 60% rename from osrs/src/main/java/class386.java rename to osrs/src/main/java/class383.java index cf9a6ffd6..4f5089b20 100644 --- a/osrs/src/main/java/class386.java +++ b/osrs/src/main/java/class383.java @@ -2,12 +2,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("on") -public interface class386 { - @ObfuscatedName("ac") +@ObfuscatedName("oj") +public interface class383 { + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/osrs/src/main/java/class384.java b/osrs/src/main/java/class384.java index dd36e25b7..5684a98bd 100644 --- a/osrs/src/main/java/class384.java +++ b/osrs/src/main/java/class384.java @@ -4,210 +4,34 @@ import java.util.HashMap; -@ObfuscatedName("ow") +@ObfuscatedName("op") public class class384 { - @ObfuscatedName("am") - static int[] field3629; - @ObfuscatedName("ac") - @Export("spriteMap") - final HashMap spriteMap; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lrx;" - ) - @Export("bounds") - Bounds bounds; - @ObfuscatedName("ak") - int[] field3631; - @ObfuscatedName("ax") - int[] field3632; - @ObfuscatedName("ao") - int field3630; - - public class384() { - this.spriteMap = new HashMap(); - this.bounds = new Bounds(0, 0); - this.field3631 = new int[2048]; - this.field3632 = new int[2048]; - this.field3630 = 0; - field3629 = new int[2000]; - int var1 = 0; - int var2 = 240; - - int var4; - for (byte var3 = 12; var1 < 16; var2 -= var3) { - var4 = class538.method2658((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + (float)var1 * 0.425F / 16.0F)); - field3629[var1] = var4; - ++var1; - } - - var2 = 48; - - for (int var6 = var2 / 6; var1 < field3629.length; var2 -= var6) { - var4 = var1 * 2; - - for (int var5 = class538.method2658((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < field3629.length; ++var1) { - field3629[var1] = var5; - } - } - - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1432707829" - ) - void method1995(int var1) { - int var2 = var1 * 2 + 1; - double var4 = (double)((float)var1 / 3.0F); - int var6 = var1 * 2 + 1; - double[] var7 = new double[var6]; - int var8 = -var1; - - for (int var9 = 0; var8 <= var1; ++var9) { - double var16 = (double)(var8 - 0) / var4; - double var14 = Math.exp(var16 * -var16 / 2.0D) / Math.sqrt(6.283185307179586D); - double var12 = var14 / var4; - var7[var9] = var12; - ++var8; - } - - double[] var18 = var7; - double var19 = var7[var1] * var7[var1]; - int[] var21 = new int[var2 * var2]; - boolean var22 = false; - - for (int var11 = 0; var11 < var2; ++var11) { - for (int var23 = 0; var23 < var2; ++var23) { - int var13 = var21[var23 + var11 * var2] = (int)(var18[var11] * var18[var23] / var19 * 256.0D); - if (!var22 && var13 > 0) { - var22 = true; - } - } - } - - SpritePixels var24 = new SpritePixels(var21, var2, var2); - this.spriteMap.put(var1, var24); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)Lud;", - garbageValue = "297405994" - ) - SpritePixels method1996(int var1) { - if (!this.spriteMap.containsKey(var1)) { - this.method1995(var1); - } - - return (SpritePixels)this.spriteMap.get(var1); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-659509092" - ) - public final void method1997(int var1, int var2) { - if (this.field3630 < this.field3631.length) { - this.field3631[this.field3630] = var1; - this.field3632[this.field3630] = var2; - ++this.field3630; - } - } + @ObfuscatedName("ah") + @Export("clearLoginScreen") + static boolean clearLoginScreen; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1095059460" - ) - public final void method1998() { - this.field3630 = 0; + static { + new HashMap(); } - @ObfuscatedName("ao") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IILud;FI)V", - garbageValue = "1259929010" + descriptor = "(DDII)[D", + garbageValue = "-1133509454" ) - public final void method1999(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(var4 * 18.0F); - SpritePixels var6 = this.method1996(var5); - int var7 = var5 * 2 + 1; - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); - Bounds var9 = new Bounds(0, 0); - this.bounds.setHigh(var7, var7); - System.nanoTime(); + public static double[] method1990(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; + double[] var6 = new double[var5]; + int var7 = -var4; - int var10; - int var11; - int var12; - for (var10 = 0; var10 < this.field3630; ++var10) { - var11 = this.field3631[var10]; - var12 = this.field3632[var10]; - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; - this.bounds.setLow(var13, var14); - this.bounds.method2322(var8, var9); - this.method2000(var6, var3, var9); + for (int var8 = 0; var7 <= var4; ++var8) { + double var15 = ((double)var7 - var0) / var2; + double var13 = Math.exp(-var15 * var15 / 2.0D) / Math.sqrt(6.283185307179586D); + double var11 = var13 / var2; + var6[var8] = var11; + ++var7; } - System.nanoTime(); - System.nanoTime(); - - for (var10 = 0; var10 < var3.pixels.length; ++var10) { - if (var3.pixels[var10] == 0) { - var3.pixels[var10] = -16777216; - } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; - if (var11 <= 0) { - var3.pixels[var10] = -16777216; - } else { - if (var11 > field3629.length) { - var11 = field3629.length; - } - - var12 = field3629[var11 - 1]; - var3.pixels[var10] = -16777216 | var12; - } - } - } - - System.nanoTime(); - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Lud;Lud;Lrx;I)V", - garbageValue = "-493691057" - ) - void method2000(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { - int var4 = 0; - int var5 = 0; - if (var3.lowX == 0) { - var4 = var1.subWidth - var3.highX; - } - - if (var3.lowY == 0) { - var5 = var1.subHeight - var3.highY; - } - - int var6 = var4 + var5 * var1.subWidth; - int var7 = var2.subWidth * var3.lowY + var3.lowX; - - for (int var8 = 0; var8 < var3.highY; ++var8) { - for (int var9 = 0; var9 < var3.highX; ++var9) { - int[] var10000 = var2.pixels; - int var10001 = var7++; - var10000[var10001] += var1.pixels[var6++]; - } - - var6 += var1.subWidth - var3.highX; - var7 += var2.subWidth - var3.highX; - } - - } + return var6; } } \ No newline at end of file diff --git a/osrs/src/main/java/class385.java b/osrs/src/main/java/class385.java deleted file mode 100644 index 67ecf3f07..000000000 --- a/osrs/src/main/java/class385.java +++ /dev/null @@ -1,36 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("oi") -public class class385 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Loi;" - ) - static final class385 field3635; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Loi;" - ) - static final class385 field3637; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Loi;" - ) - static final class385 field3636; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Loi;" - ) - static final class385 field3638; - - static { - field3635 = new class385(); - field3637 = new class385(); - field3636 = new class385(); - field3638 = new class385(); - } - - class385() { - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class387.java b/osrs/src/main/java/class387.java deleted file mode 100644 index f8ad9978f..000000000 --- a/osrs/src/main/java/class387.java +++ /dev/null @@ -1,10 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -import java.util.HashMap; - -@ObfuscatedName("ot") -public class class387 { - static { - new HashMap(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class395.java b/osrs/src/main/java/class395.java new file mode 100644 index 000000000..b66913521 --- /dev/null +++ b/osrs/src/main/java/class395.java @@ -0,0 +1,56 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; + +@ObfuscatedName("pr") +public final class class395 { + @ObfuscatedName("am") + static int field3683; + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/Date;", + garbageValue = "-1974311975" + ) + static Date method2040() throws ParseException { + SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); + var0.setLenient(false); + StringBuilder var1 = new StringBuilder(); + String[] var2 = Login.field769; + + for (int var3 = 0; var3 < var2.length; ++var3) { + String var4 = var2[var3]; + if (var4 == null) { + UserComparator7.method674(7); + class139.setLoginResponseString("Date not valid.", "Please ensure all characters are populated.", ""); + return null; + } + + var1.append(var4); + } + + var1.append("12"); + return var0.parse(var1.toString()); + } + + @ObfuscatedName("je") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1509651634" + ) + static int method2041(int var0, int var1) { + int var2 = var1 - 334; + if (var2 < 0) { + var2 = 0; + } else if (var2 > 100) { + var2 = 100; + } + + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; + return var0 * var3 / 256; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class396.java b/osrs/src/main/java/class396.java new file mode 100644 index 000000000..c3fbdb790 --- /dev/null +++ b/osrs/src/main/java/class396.java @@ -0,0 +1,55 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pp") +public class class396 { + @ObfuscatedName("at") + @Export("cp1252AsciiExtension") + static final char[] cp1252AsciiExtension; + @ObfuscatedName("al") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("rs") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + @Export("mouseWheel") + static class212 mouseWheel; + + static { + cp1252AsciiExtension = new char[]{'\u20ac', '\u0000', '\u201a', '\u0192', '\u201e', '\u2026', '\u2020', '\u2021', '\u02c6', '\u2030', '\u0160', '\u2039', '\u0152', '\u0000', '\u017d', '\u0000', '\u0000', '\u2018', '\u2019', '\u201c', '\u201d', '\u2022', '\u2013', '\u2014', '\u02dc', '\u2122', '\u0161', '\u203a', '\u0153', '\u0000', '\u017e', '\u0178'}; + } + + @ObfuscatedName("mw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1031282913" + ) + static void method2042() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (HealthBarDefinition.widgetDefinition.loadInterface(var1)) { + boolean var2 = true; + Widget[] var3 = HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var1]; + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { + if (var3[var4] != null) { + var2 = var3[var4].isIf3; + break; + } + } + + if (!var2) { + var4 = (int)var0.key; + Widget var5 = HealthBarDefinition.widgetDefinition.method1733(var4); + if (var5 != null) { + class159.invalidateWidget(var5); + } + } + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class397.java b/osrs/src/main/java/class397.java new file mode 100644 index 000000000..745dd30bc --- /dev/null +++ b/osrs/src/main/java/class397.java @@ -0,0 +1,89 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("pb") +public class class397 { + @ObfuscatedName("at") + static char[] field3689; + @ObfuscatedName("ah") + static char[] field3687; + @ObfuscatedName("ar") + static char[] field3688; + @ObfuscatedName("ao") + static int[] field3690; + + static { + field3689 = new char[64]; + + int var0; + for (var0 = 0; var0 < 26; ++var0) { + field3689[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3689[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3689[var0] = (char)(var0 + 48 - 52); + } + + field3689[62] = '+'; + field3689[63] = '/'; + field3687 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3687[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3687[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3687[var0] = (char)(var0 + 48 - 52); + } + + field3687[62] = '*'; + field3687[63] = '-'; + field3688 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3688[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3688[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3688[var0] = (char)(var0 + 48 - 52); + } + + field3688[62] = '-'; + field3688[63] = '_'; + field3690 = new int[128]; + + for (var0 = 0; var0 < field3690.length; ++var0) { + field3690[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { + field3690[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { + field3690[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { + field3690[var0] = var0 - 48 + 52; + } + + int[] var2 = field3690; + field3690[43] = 62; + var2[42] = 62; + int[] var1 = field3690; + field3690[47] = 63; + var1[45] = 63; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class398.java b/osrs/src/main/java/class398.java index 13132ed52..0048ba644 100644 --- a/osrs/src/main/java/class398.java +++ b/osrs/src/main/java/class398.java @@ -1,14 +1,11 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pw") +import java.util.regex.Pattern; + + +@ObfuscatedName("pl") public final class class398 { - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "65535" - ) - static int method2052(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field715 - 7.0D) * 256.0D); + static { + Pattern.compile("^\\D*(\\d+)\\D*$"); } } \ No newline at end of file diff --git a/osrs/src/main/java/class399.java b/osrs/src/main/java/class399.java index 3a363e6f6..90bc50916 100644 --- a/osrs/src/main/java/class399.java +++ b/osrs/src/main/java/class399.java @@ -1,13 +1,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pv") +@ObfuscatedName("pz") public class class399 { - @ObfuscatedName("ac") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - - static { - cp1252AsciiExtension = new char[]{'\u20ac', '\u0000', '\u201a', '\u0192', '\u201e', '\u2026', '\u2020', '\u2021', '\u02c6', '\u2030', '\u0160', '\u2039', '\u0152', '\u0000', '\u017d', '\u0000', '\u0000', '\u2018', '\u2019', '\u201c', '\u201d', '\u2022', '\u2013', '\u2014', '\u02dc', '\u2122', '\u0161', '\u203a', '\u0153', '\u0000', '\u017e', '\u0178'}; - } + @ObfuscatedName("ro") + @ObfuscatedSignature( + descriptor = "Ltl;" + ) + @Export("Widget_cachedModels") + static class509 Widget_cachedModels; } \ No newline at end of file diff --git a/osrs/src/main/java/class4.java b/osrs/src/main/java/class4.java index 5564461d9..1d1493ad7 100644 --- a/osrs/src/main/java/class4.java +++ b/osrs/src/main/java/class4.java @@ -1,235 +1,67 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") -public final class class4 { - @ObfuscatedName("ix") - static int field2; +import java.util.Collections; - @ObfuscatedName("al") +@ObfuscatedName("ab") +public final class class4 { + @ObfuscatedName("iy") @ObfuscatedSignature( - descriptor = "(II)Lio;", - garbageValue = "-2052088854" + descriptor = "Lro;" ) - public static FloorOverlayDefinition method4(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class30.FloorOverlayDefinition_archive.takeFile(4, var0); - var1 = new FloorOverlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); - } - - var1.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); - return var1; - } - } + static AbstractSocket field4; - @ObfuscatedName("ah") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "71" + descriptor = "([I[II)V", + garbageValue = "1584240093" ) - static final void method5(int var0, int var1, int var2) { - int var3; - for (var3 = 0; var3 < 8; ++var3) { - for (int var4 = 0; var4 < 8; ++var4) { - Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; - } - } + public static void method5(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { + Clock.ByteArrayPool_alternativeSizes = var0; + class267.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; + class1.ByteArrayPool_arrays = new byte[var0.length][][]; - if (var1 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; + for (int var2 = 0; var2 < Clock.ByteArrayPool_alternativeSizes.length; ++var2) { + class1.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; + ByteArrayPool.field3780.add(var0[var2]); } - } - if (var2 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; - } - } - - if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; - } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; - } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + Collections.sort(ByteArrayPool.field3780); + } else { + Clock.ByteArrayPool_alternativeSizes = null; + class267.ByteArrayPool_altSizeArrayCounts = null; + class1.ByteArrayPool_arrays = null; + Renderable.method1514(); } - } - @ObfuscatedName("am") + @ObfuscatedName("nk") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "159845582" + descriptor = "(IIZB)V", + garbageValue = "0" ) - static int method6(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - } - - int var11; - if (var0 == 1300) { - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]); - return 1; - } else { - --class180.Interpreter_stringStackSize; - return 1; - } - } else { - int var6; - if (var0 == 1301) { - Interpreter.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var4.parent = class33.widgetDefinition.getWidgetChild(var11, var6); - return 1; - } else if (var0 == 1302) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1303) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 1304) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 1305) { - var4.dataText = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - return 1; - } else if (var0 == 1306) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--class180.Interpreter_stringStackSize]; - return 1; - } else if (var0 == 1307) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1309) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else { - int var7; - byte[] var9; - if (var0 != 1350) { - byte var5; - if (var0 == 1351) { - Interpreter.Interpreter_intStackSize -= 2; - var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; - InterfaceParent.Widget_setKey(var4, var5, var9, var10); - return 1; - } else if (var0 == 1352) { - Interpreter.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - ScriptFrame.Widget_setKeyRate(var4, var11, var6, var7); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == 1353) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ScriptFrame.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } else if (var0 == 1354) { - --Interpreter.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - class18.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == 1355) { - var5 = 10; - class18.Widget_setKeyIgnoreHeld(var4, var5); - return 1; - } else { - return 2; - } - } else { - byte[] var8 = null; - var9 = null; - if (var3) { - Interpreter.Interpreter_intStackSize -= 10; - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { - } - - if (var7 > 0) { - var8 = new byte[var7 / 2]; - var9 = new byte[var7 / 2]; - - for (var7 -= 2; var7 >= 0; var7 -= 2) { - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; - } - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - InterfaceParent.Widget_setKey(var4, var7, var8, var9); - return 1; - } else { - throw new RuntimeException(); - } - } + static final void method6(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method857()) { + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + PacketBufferNode var4 = class113.getPacketBufferNode(ClientPacket.f10, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(4 + ClanChannel.stringCp1252NullTerminatedByteSize(var3.username.getName())); + var4.packetBuffer.writeByte(var0); + var4.packetBuffer.writeShort(var1); + var4.packetBuffer.writeBoolean(var2); + var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); + Client.packetWriter.addNode(var4); } } } - @ObfuscatedName("cw") + @ObfuscatedName("ov") @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "1678584936" + descriptor = "(S)Z", + garbageValue = "2291" ) - static int method7(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == 8000) { - --Interpreter.Interpreter_intStackSize; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_arrayLengths[var3]; - Frames.method1337(Interpreter.Interpreter_arrays[var3], new int[var4], 0, var4 - 1); - return 1; - } else if (var0 == 8001) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_arrayLengths[var3]; - if (var6 <= 1) { - return 1; - } else { - class424.method2177(Interpreter.Interpreter_arrays[var3], var6, var4, var5); - return 1; - } - } else { - return 2; - } + static boolean method7() { + return WorldMapIcon_1.clientPreferences.method561() >= Client.param21; } } \ No newline at end of file diff --git a/osrs/src/main/java/class400.java b/osrs/src/main/java/class400.java index 6ae00cbe4..b638f7eef 100644 --- a/osrs/src/main/java/class400.java +++ b/osrs/src/main/java/class400.java @@ -1,89 +1,21 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("po") -public class class400 { - @ObfuscatedName("ac") - static char[] field3683; - @ObfuscatedName("al") - static char[] field3685; - @ObfuscatedName("ak") - static char[] field3684; - @ObfuscatedName("ax") - static int[] field3686; +@ObfuscatedName("pe") +public final class class400 { + @ObfuscatedName("at") + @Export("base37Table") + public static final char[] base37Table; + @ObfuscatedName("ah") + static long[] field3693; static { - field3683 = new char[64]; + base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; + field3693 = new long[12]; - int var0; - for (var0 = 0; var0 < 26; ++var0) { - field3683[var0] = (char)(var0 + 65); + for (int var0 = 0; var0 < field3693.length; ++var0) { + field3693[var0] = (long)Math.pow(37.0D, (double)var0); } - for (var0 = 26; var0 < 52; ++var0) { - field3683[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3683[var0] = (char)(var0 + 48 - 52); - } - - field3683[62] = '+'; - field3683[63] = '/'; - field3685 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3685[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3685[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3685[var0] = (char)(var0 + 48 - 52); - } - - field3685[62] = '*'; - field3685[63] = '-'; - field3684 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3684[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3684[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3684[var0] = (char)(var0 + 48 - 52); - } - - field3684[62] = '-'; - field3684[63] = '_'; - field3686 = new int[128]; - - for (var0 = 0; var0 < field3686.length; ++var0) { - field3686[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { - field3686[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { - field3686[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { - field3686[var0] = var0 - 48 + 52; - } - - int[] var2 = field3686; - field3686[43] = 62; - var2[42] = 62; - int[] var1 = field3686; - field3686[47] = 63; - var1[45] = 63; } } \ No newline at end of file diff --git a/osrs/src/main/java/class401.java b/osrs/src/main/java/class401.java deleted file mode 100644 index c24d53690..000000000 --- a/osrs/src/main/java/class401.java +++ /dev/null @@ -1,63 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.regex.Pattern; - - -@ObfuscatedName("pa") -public final class class401 { - static { - Pattern.compile("^\\D*(\\d+)\\D*$"); - } - - @ObfuscatedName("ii") - @ObfuscatedSignature( - descriptor = "(Lnm;III)V", - garbageValue = "898277930" - ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.method1857(class33.widgetDefinition, true); - if (var3 == null) { - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if (var3.contains(var4, var5)) { - var4 -= var3.width / 2; - var5 -= var3.height / 2; - int var6 = Client.camAngleY & 2047; - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var9 = var7 * var5 + var4 * var8 >> 11; - int var10 = var8 * var5 - var4 * var7 >> 11; - int var11 = var9 + TextureProvider.localPlayer.x >> 7; - int var12 = TextureProvider.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = ClanChannelMember.getPacketBufferNode(ClientPacket.f51, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.writeShortAdd(var12 + class19.baseY); - var13.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? (Client.keyHandlerInstance.getKeyPressed(81) ? 2 : 1) : 0); - var13.packetBuffer.writeShortAdd(var11 + class20.baseX); - var13.packetBuffer.writeByte(var4); - var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.camAngleY); - var13.packetBuffer.writeByte(57); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(89); - var13.packetBuffer.writeShort(TextureProvider.localPlayer.x); - var13.packetBuffer.writeShort(TextureProvider.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } - } - - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class402.java b/osrs/src/main/java/class402.java new file mode 100644 index 000000000..70254dd6e --- /dev/null +++ b/osrs/src/main/java/class402.java @@ -0,0 +1,65 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pw") +public final class class402 { + @ObfuscatedName("al") + static int field3694; + @ObfuscatedName("at") + final Object field3696; + @ObfuscatedName("ah") + int field3695; + + class402(Object var1, int var2) { + this.field3696 = var1; + this.field3695 = var2; + } + + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "-6" + ) + static void method2043(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, class89.loginType); + + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != class229.localPlayer && var7.username != null && var7.username.equals(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = class113.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3[var6]); + var8.packetBuffer.writeByteNeg(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = class113.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByteSub(0); + var8.packetBuffer.writeIntME(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = class113.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByteSub(0); + var8.packetBuffer.writeShort(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = class113.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var3[var6]); + var8.packetBuffer.writeByteSub(0); + Client.packetWriter.addNode(var8); + } + + var4 = true; + break; + } + } + + if (!var4) { + GrandExchangeOfferUnitPriceComparator.addGameMessage(4, "", "Unable to find " + var1); + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class403.java b/osrs/src/main/java/class403.java index d3dc4ef0f..be26d27fa 100644 --- a/osrs/src/main/java/class403.java +++ b/osrs/src/main/java/class403.java @@ -2,33 +2,82 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("px") -public final class class403 { - @ObfuscatedName("ac") - @Export("base37Table") - static final char[] base37Table; - @ObfuscatedName("al") - static long[] field3688; - @ObfuscatedName("ak") - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - - static { - base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; - field3688 = new long[12]; - - for (int var0 = 0; var0 < field3688.length; ++var0) { - field3688[var0] = (long)Math.pow(37.0D, (double)var0); +import java.util.ConcurrentModificationException; +import java.util.Iterator; +import java.util.NoSuchElementException; + +@ObfuscatedName("pg") +public class class403 implements Iterator { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lps;" + ) + class404 field3699; + @ObfuscatedName("ah") + int field3697; + @ObfuscatedName("ar") + int field3698; + + @ObfuscatedSignature( + descriptor = "(Lps;)V" + ) + class403(class404 var1) { + this.field3697 = 0; + this.field3698 = this.field3699.field3700; + this.field3699 = var1; + } + + @Export("hasNext") + @ObfuscatedName("hasNext") + public boolean hasNext() { + return this.field3697 < this.field3699.field3701; + } + + @Export("next") + @ObfuscatedName("next") + public Object next() { + if (this.field3699.field3700 != this.field3698) { + throw new ConcurrentModificationException(); + } else if (this.field3697 < this.field3699.field3701) { + Object var1 = this.field3699.field3703[this.field3697].field3696; + ++this.field3697; + return var1; + } else { + throw new NoSuchElementException(); } + } + @Export("remove") + @ObfuscatedName("remove") + public void remove() { + throw new UnsupportedOperationException(); } @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lbw;I)V", - garbageValue = "-1869845736" + descriptor = "(IIB)I", + garbageValue = "14" ) - public static final void method2054(class51 var0) { - class16.pcmPlayerProvider = var0; + static final int method2044(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class404.java b/osrs/src/main/java/class404.java new file mode 100644 index 000000000..7775a7afd --- /dev/null +++ b/osrs/src/main/java/class404.java @@ -0,0 +1,352 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.*; + +@ObfuscatedName("ps") +public class class404 extends AbstractQueue { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "[Lpw;" + ) + class402[] field3703; + @ObfuscatedName("ah") + Map field3702; + @ObfuscatedName("ar") + int field3701; + @ObfuscatedName("ao") + final Comparator field3704; + @ObfuscatedName("ab") + int field3700; + + public class404(int var1, Comparator var2) { + this.field3700 = 0; + this.field3703 = new class402[var1]; + this.field3702 = new HashMap(); + this.field3704 = var2; + } + + public class404(int var1) { + this(var1, (Comparator)null); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1191377810" + ) + void method2046() { + int var1 = (this.field3703.length << 1) + 1; + this.field3703 = (class402[])((class402[])Arrays.copyOf(this.field3703, var1)); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1996732562" + ) + void method2047(int var1) { + class402 var2; + int var3; + for (var2 = this.field3703[var1]; var1 > 0; var1 = var3) { + var3 = var1 - 1 >>> 1; + class402 var4 = this.field3703[var3]; + if (this.field3704 != null) { + if (this.field3704.compare(var2.field3696, var4.field3696) >= 0) { + break; + } + } else if (((Comparable)var2.field3696).compareTo(var4.field3696) >= 0) { + break; + } + + this.field3703[var1] = var4; + this.field3703[var1].field3695 = var1; + } + + this.field3703[var1] = var2; + this.field3703[var1].field3695 = var1; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-500854691" + ) + void method2048(int var1) { + class402 var2 = this.field3703[var1]; + + int var8; + for (int var3 = this.field3701 >>> 1; var1 < var3; var1 = var8) { + int var4 = (var1 << 1) + 1; + class402 var5 = this.field3703[var4]; + int var6 = (var1 << 1) + 2; + class402 var7 = this.field3703[var6]; + if (this.field3704 != null) { + if (var6 < this.field3701 && this.field3704.compare(var5.field3696, var7.field3696) > 0) { + var8 = var6; + } else { + var8 = var4; + } + } else if (var6 < this.field3701 && ((Comparable)var5.field3696).compareTo(var7.field3696) > 0) { + var8 = var6; + } else { + var8 = var4; + } + + if (this.field3704 != null) { + if (this.field3704.compare(var2.field3696, this.field3703[var8].field3696) <= 0) { + break; + } + } else if (((Comparable)var2.field3696).compareTo(this.field3703[var8].field3696) <= 0) { + break; + } + + this.field3703[var1] = this.field3703[var8]; + this.field3703[var1].field3695 = var1; + } + + this.field3703[var1] = var2; + this.field3703[var1].field3695 = var1; + } + + @Export("remove") + @ObfuscatedName("remove") + public boolean remove(Object var1) { + class402 var2 = (class402)this.field3702.remove(var1); + if (var2 == null) { + return false; + } else { + ++this.field3700; + --this.field3701; + if (this.field3701 == var2.field3695) { + this.field3703[this.field3701] = null; + return true; + } else { + class402 var3 = this.field3703[this.field3701]; + this.field3703[this.field3701] = null; + this.field3703[var2.field3695] = var3; + this.field3703[var2.field3695].field3695 = var2.field3695; + this.method2048(var2.field3695); + if (var3 == this.field3703[var2.field3695]) { + this.method2047(var2.field3695); + } + + return true; + } + } + } + + @Export("peek") + @ObfuscatedName("peek") + public Object peek() { + return this.field3701 == 0 ? null : this.field3703[0].field3696; + } + + @Export("size") + @ObfuscatedName("size") + public int size() { + return this.field3701; + } + + @Export("offer") + @ObfuscatedName("offer") + public boolean offer(Object var1) { + if (this.field3702.containsKey(var1)) { + throw new IllegalArgumentException(""); + } else { + ++this.field3700; + int var2 = this.field3701; + if (var2 >= this.field3703.length) { + this.method2046(); + } + + ++this.field3701; + if (var2 == 0) { + this.field3703[0] = new class402(var1, 0); + this.field3702.put(var1, this.field3703[0]); + } else { + this.field3703[var2] = new class402(var1, var2); + this.field3702.put(var1, this.field3703[var2]); + this.method2047(var2); + } + + return true; + } + } + + @Export("poll") + @ObfuscatedName("poll") + public Object poll() { + if (this.field3701 == 0) { + return null; + } else { + ++this.field3700; + Object var1 = this.field3703[0].field3696; + this.field3702.remove(var1); + --this.field3701; + if (this.field3701 == 0) { + this.field3703[this.field3701] = null; + } else { + this.field3703[0] = this.field3703[this.field3701]; + this.field3703[0].field3695 = 0; + this.field3703[this.field3701] = null; + this.method2048(0); + } + + return var1; + } + } + + @Export("contains") + @ObfuscatedName("contains") + public boolean contains(Object var1) { + return this.field3702.containsKey(var1); + } + + @Export("toArray") + @ObfuscatedName("toArray") + public Object[] toArray() { + Object[] var1 = super.toArray(); + if (this.field3704 != null) { + Arrays.sort(var1, this.field3704); + } else { + Arrays.sort(var1); + } + + return var1; + } + + @Export("iterator") + @ObfuscatedName("iterator") + public Iterator iterator() { + return new class403(this); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lfm;FB)F", + garbageValue = "0" + ) + static float method2045(class131 var0, float var1) { + if (var0 != null && var0.method722() != 0) { + if (var1 < (float)var0.field1258[0].field1217) { + return var0.field1257 == class129.field1244 ? var0.field1258[0].field1213 : Decimator.method321(var0, var1, true); + } else if (var1 > (float)var0.field1258[var0.method722() - 1].field1217) { + return var0.field1256 == class129.field1244 ? var0.field1258[var0.method722() - 1].field1213 : Decimator.method321(var0, var1, false); + } else if (var0.field1252) { + return var0.field1258[0].field1213; + } else { + class126 var2 = var0.method721(var1); + boolean var3 = false; + boolean var4 = false; + if (var2 == null) { + return 0.0F; + } else { + float var5; + float var6; + float var7; + if ((double)var2.field1212 == 0.0D && (double)var2.field1216 == 0.0D) { + var3 = true; + } else if (var2.field1212 == Float.MAX_VALUE && Float.MAX_VALUE == var2.field1216) { + var4 = true; + } else if (var2.field1211 != null) { + if (var0.field1253) { + var5 = (float)var2.field1217; + float var9 = var2.field1213; + var6 = var5 + var2.field1212 * 0.33333334F; + float var10 = 0.33333334F * var2.field1216 + var9; + float var8 = (float)var2.field1211.field1217; + float var12 = var2.field1211.field1213; + var7 = var8 - var2.field1211.field1215 * 0.33333334F; + float var11 = var12 - 0.33333334F * var2.field1211.field1214; + if (var0.field1254) { + Language.method1997(var0, var5, var6, var7, var8, var9, var10, var11, var12); + } else if (var0 != null) { + var0.field1259 = var5; + float var13 = var8 - var5; + float var14 = var12 - var9; + float var15 = var6 - var5; + float var16 = 0.0F; + float var17 = 0.0F; + if ((double)var15 != 0.0D) { + var16 = (var10 - var9) / var15; + } + + var15 = var8 - var7; + if (0.0D != (double)var15) { + var17 = (var12 - var11) / var15; + } + + float var18 = 1.0F / (var13 * var13); + float var19 = var16 * var13; + float var20 = var13 * var17; + var0.field1263 = (var20 + var19 - var14 - var14) * var18 / var13; + var0.field1270 = var18 * (var14 + var14 + var14 - var19 - var19 - var20); + var0.field1265 = var16; + var0.field1267 = var9; + } + + var0.field1253 = false; + } + } else { + var3 = true; + } + + if (var3) { + return var2.field1213; + } else if (var4) { + return (float)var2.field1217 != var1 && var2.field1211 != null ? var2.field1211.field1213 : var2.field1213; + } else if (var0.field1254) { + if (var0 == null) { + var5 = 0.0F; + } else { + if (var0.field1259 == var1) { + var6 = 0.0F; + } else if (var0.field1260 == var1) { + var6 = 1.0F; + } else { + var6 = (var1 - var0.field1259) / (var0.field1260 - var0.field1259); + } + + if (var0.field1255) { + var7 = var6; + } else { + class127.field1221[3] = var0.field1267; + class127.field1221[2] = var0.field1265; + class127.field1221[1] = var0.field1270; + class127.field1221[0] = var0.field1263 - var6; + class127.field1220[0] = 0.0F; + class127.field1220[1] = 0.0F; + class127.field1220[2] = 0.0F; + class127.field1220[3] = 0.0F; + class127.field1220[4] = 0.0F; + int var21 = FloorUnderlayDefinition.method967(class127.field1221, 3, 0.0F, true, 1.0F, true, class127.field1220); + if (var21 == 1) { + var7 = class127.field1220[0]; + } else { + var7 = 0.0F; + } + } + + var5 = var7 * (var0.field1266 + (var0.field1269 + var0.field1262 * var7) * var7) + var0.field1268; + } + + return var5; + } else { + if (var0 == null) { + var5 = 0.0F; + } else { + var6 = var1 - var0.field1259; + var5 = var0.field1267 + var6 * (var6 * (var0.field1270 + var6 * var0.field1263) + var0.field1265); + } + + return var5; + } + } + } + } else { + return 0.0F; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class405.java b/osrs/src/main/java/class405.java deleted file mode 100644 index 717fa867e..000000000 --- a/osrs/src/main/java/class405.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("pd") -public final class class405 { - @ObfuscatedName("ac") - final Object field3692; - @ObfuscatedName("al") - int field3691; - - class405(Object var1, int var2) { - this.field3692 = var1; - this.field3691 = var2; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class406.java b/osrs/src/main/java/class406.java index 78132a54c..4cc49e8ed 100644 --- a/osrs/src/main/java/class406.java +++ b/osrs/src/main/java/class406.java @@ -2,107 +2,811 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ConcurrentModificationException; -import java.util.Iterator; -import java.util.NoSuchElementException; +import java.util.ArrayList; + +@ObfuscatedName("pv") +public class class406 { + @ObfuscatedName("ak") + int field3710; + @ObfuscatedName("aj") + int field3709; + @ObfuscatedName("am") + int field3711; + @ObfuscatedName("aq") + int field3712; + @ObfuscatedName("ai") + int field3708; + @ObfuscatedName("aw") + boolean field3705; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lpa;" + ) + AbstractFont field3714; + @ObfuscatedName("an") + ArrayList field3713; + @ObfuscatedName("ag") + int field3707; + @ObfuscatedName("ad") + int field3706; + + public class406() { + this.field3710 = Integer.MAX_VALUE; + this.field3709 = Integer.MAX_VALUE; + this.field3711 = 0; + this.field3712 = 0; + this.field3708 = 0; + this.field3705 = true; + this.field3713 = new ArrayList(); + this.field3707 = 0; + this.field3706 = 0; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Lpn;", + garbageValue = "-1648887293" + ) + public class408 method2051(int var1) { + return (class408)this.field3713.get(var1); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)Lpn;", + garbageValue = "-1618780366" + ) + class408 method2052() { + return this.field3713.size() == 0 ? null : (class408)this.field3713.get(this.field3713.size() - 1); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2001561937" + ) + public boolean method2053() { + return this.field3713.size() == 0; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-607330455" + ) + boolean method2054() { + return this.field3709 > 1; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-917985217" + ) + public int method2055() { + return this.field3713.size(); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1548157009" + ) + public String method2056() { + if (this.method2053()) { + return ""; + } else { + StringBuilder var1 = new StringBuilder(this.method2055()); + + for (int var2 = 0; var2 < this.method2055(); ++var2) { + class408 var3 = this.method2051(var2); + var1.append(var3.field3716); + } + + return var1.toString(); + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1319008258" + ) + public void method2057(int var1) { + if (this.field3714 != null && var1 < this.field3714.ascent * 2) { + var1 = Integer.MAX_VALUE; + } + + if (this.field3710 != var1) { + this.field3710 = var1; + this.method2086(); + } + + } -@ObfuscatedName("pm") -public class class406 implements Iterator { @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lpn;" + descriptor = "(II)V", + garbageValue = "1206229207" ) - class407 field3695; + public void method2059(int var1) { + if (this.field3709 != var1) { + this.field3709 = var1; + this.method2086(); + } + + } + @ObfuscatedName("al") - int field3694; + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2046388223" + ) + public void method2060(int var1) { + if (this.field3706 != var1) { + this.field3706 = var1; + this.method2086(); + } + + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Lpa;B)V", + garbageValue = "83" + ) + public void method2061(AbstractFont var1) { + if (var1 != this.field3714) { + this.field3714 = var1; + if (this.field3714 != null) { + if (this.field3708 == 0) { + this.field3708 = this.field3714.ascent; + } + + if (!this.method2053()) { + this.method2086(); + } + } + } + + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1301835621" + ) + public void method2062(int var1) { + if (this.field3707 != var1) { + this.field3707 = var1; + this.method2086(); + } + + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "203029050" + ) + public boolean method2063(int var1, int var2) { + if (this.field3711 != var1 || var2 != this.field3712) { + this.field3711 = var1; + this.field3712 = var2; + this.method2086(); + } + + return true; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-36" + ) + public void method2064(int var1) { + if (this.field3708 != var1) { + this.field3708 = var1; + this.method2086(); + } + + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(IIB)Lpd;", + garbageValue = "-125" + ) + public class410 method2065(int var1, int var2) { + if (var2 == var1) { + return new class410(this, 0, 0); + } else if (var1 <= this.field3713.size() && var2 <= this.field3713.size()) { + return var2 < var1 ? new class410(this, var2, var1) : new class410(this, var1, var2); + } else { + return new class410(this, 0, 0); + } + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(CIIB)Lpx;", + garbageValue = "51" + ) + public class407 method2066(char var1, int var2, int var3) { + return this.method2067(Character.toString(var1), var2, var3); + } + @ObfuscatedName("ak") - int field3693; + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;III)Lpx;", + garbageValue = "1271891096" + ) + public class407 method2067(String var1, int var2, int var3) { + if (var3 == 0) { + var3 = Integer.MAX_VALUE; + } + int var4 = var2; + if (this.field3713.size() >= var3) { + this.method2087(var2, var2); + return new class407(var2, true); + } else { + this.field3713.ensureCapacity(this.field3713.size() + var1.length()); + + for (int var5 = 0; var5 < var1.length() && this.field3713.size() < var3; ++var5) { + class408 var6 = new class408(); + var6.field3716 = var1.charAt(var5); + this.field3713.add(var4, var6); + ++var4; + } + + this.method2087(var2, var4); + if (this.field3709 != 0 && this.method2078() > this.field3709) { + while (var4 != var2) { + --var4; + this.method2071(var4); + if (this.method2078() <= this.field3709) { + break; + } + } + + return new class407(var4, true); + } else { + return new class407(var4, false); + } + } + } + + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lpn;)V" + descriptor = "(Ljava/lang/String;IB)Lpx;", + garbageValue = "-98" ) - class406(class407 var1) { - this.field3694 = 0; - this.field3693 = this.field3695.field3697; - this.field3695 = var1; + class407 method2068(String var1, int var2) { + return this.method2067(var1, this.field3713.size(), var2); } - @Export("hasNext") - @ObfuscatedName("hasNext") - public boolean hasNext() { - return this.field3694 < this.field3695.field3696; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Lpx;", + garbageValue = "-83" + ) + public class407 method2069(String var1) { + this.method2070(); + return this.method2068(var1, 0); } - @Export("next") - @ObfuscatedName("next") - public Object next() { - if (this.field3695.field3697 != this.field3693) { - throw new ConcurrentModificationException(); - } else if (this.field3694 < this.field3695.field3696) { - Object var1 = this.field3695.field3699[this.field3694].field3692; - ++this.field3694; - return var1; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "95" + ) + void method2070() { + this.field3713.clear(); + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-620955221" + ) + public int method2071(int var1) { + return this.method2072(var1, var1 + 1); + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "58" + ) + public int method2072(int var1, int var2) { + int var3; + if (var2 < var1) { + var3 = var2; + var2 = var1; + var1 = var3; + } + + this.field3713.subList(var1, var2).clear(); + var3 = var1; + if (this.method2054() && this.field3707 == 1) { + while (var3 > 0) { + --var3; + char var4 = ((class408)this.field3713.get(var3)).field3716; + if (var4 == ' ' || var4 == '\t') { + break; + } + } + } + + this.method2087(var3, var2); + return var1; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-769092328" + ) + public int method2073(int var1, int var2) { + if (this.field3714 == null) { + return 0; + } else if (this.method2054() && var1 > this.field3710) { + return this.field3713.size(); } else { - throw new NoSuchElementException(); + if (!this.field3713.isEmpty()) { + for (int var3 = 0; var3 < this.field3713.size(); ++var3) { + class408 var4 = (class408)this.field3713.get(var3); + if (var2 <= var4.field3718 + this.method2077()) { + if (var2 < var4.field3718) { + break; + } + + if (var1 < var4.field3717) { + return var3 > 0 ? var3 - 1 : 0; + } + + if (1 + var3 != this.field3713.size() && ((class408)this.field3713.get(1 + var3)).field3718 != var4.field3718) { + int var5 = this.method2089((class408)this.field3713.get(var3), false); + if (var1 < var5 + var4.field3717) { + return var3; + } + + if (var2 <= var4.field3718 + this.method2077()) { + return var3 + 1; + } + } + } + } + + class408 var6 = (class408)this.field3713.get(this.field3713.size() - 1); + if (var1 >= var6.field3717 && var1 <= var6.field3717 + this.method2079() && var2 >= var6.field3718 && var2 <= var6.field3718 + this.method2077()) { + return this.field3713.size() - 1; + } + } + + return this.field3713.size(); } } - @Export("remove") - @ObfuscatedName("remove") - public void remove() { - throw new UnsupportedOperationException(); + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "795729934" + ) + public int method2074(int var1, int var2) { + if (this.field3714 != null && !this.method2053() && var1 <= this.field3713.size()) { + byte var3; + if (var2 > 0) { + var3 = 1; + } else { + var3 = -1; + var2 = -var2; + } + + int var4 = 0; + int var5 = 0; + if (var1 > 0) { + class408 var6 = (class408)this.field3713.get(var1 - 1); + var4 = var6.field3717 + this.method2088(var1 - 1); + var5 = var6.field3718; + } else if (var3 == -1 && var1 == 0) { + return 0; + } + + int var14 = 16777215; + int var7 = 0; + int var8 = var1; + int var9 = 16777215; + int var10 = var3 == 1 ? this.field3713.size() + 1 : 0; + + for (int var11 = var3 + var1; var11 != var10; var11 += var3) { + class408 var12 = (class408)this.field3713.get(var11 - 1); + if (var5 != var12.field3718) { + ++var7; + var5 = var12.field3718; + if (var7 > var2) { + return var8; + } + } + + if (var7 == var2) { + int var13 = Math.abs(var12.field3717 + this.method2088(var11 - 1) - var4); + if (var13 >= var9) { + return var8; + } + + var8 = var11; + var9 = var13; + } + } + + if (var3 == 1) { + return this.field3713.size(); + } else { + if (var5 != 0) { + ++var7; + } + + return var9 == 16777215 || var7 == var2 && var4 < var9 ? 0 : var8; + } + } else { + return 0; + } } - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(II)Lir;", - garbageValue = "-1697714323" + descriptor = "(I)I", + garbageValue = "-612896858" ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + public int method2075() { + if (!this.field3713.isEmpty() && this.method2078() == 1) { + return this.field3713.isEmpty() ? 0 : ((class408)this.field3713.get(this.field3713.size() - 1)).field3717 + this.method2079(); } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); + int var1 = -1; + int var2 = 0; + + for (int var3 = this.field3713.size() - 1; var3 >= 0; --var3) { + class408 var4 = (class408)this.field3713.get(var3); + if (var1 != var4.field3718) { + int var5 = this.method2089(var4, false) + var4.field3717; + var2 = Math.max(var5, var2); + var1 = var4.field3718; + } } - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var2; + } + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "6" + ) + public int method2076() { + return this.method2053() ? 0 : this.field3714.ascent + ((class408)this.field3713.get(this.field3713.size() - 1)).field3718; + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-593841574" + ) + public int method2077() { + return this.field3708; + } + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "93" + ) + public int method2078() { + return this.method2076() / this.field3714.ascent; + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-918826426" + ) + int method2079() { + return this.method2053() ? 0 : this.method2089((class408)this.field3713.get(this.field3713.size() - 1), false); + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-379034894" + ) + public int method2080() { + return this.field3710; + } + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2096364291" + ) + public int method2081() { + return this.field3709; + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1926453895" + ) + public int method2082() { + return this.field3707; + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-163729135" + ) + public int method2083() { + return this.field3706; + } + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1438354732" + ) + public int method2084(int var1) { + switch(this.field3711) { + case 0: + return 0; + case 1: + return var1 / 2; + case 2: + return var1; + default: + return 0; + } + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1172186374" + ) + public int method2085(int var1) { + switch(this.field3712) { + case 0: + return 0; + case 1: + return var1 / 2; + case 2: return var1; + default: + return 0; } } - @ObfuscatedName("ar") + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + void method2086() { + this.method2087(0, this.field3713.size()); + } + + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(II)Lfs;", - garbageValue = "2022917395" + descriptor = "(III)V", + garbageValue = "605694861" ) - static class133 method2057(int var0) { - class133[] var1 = new class133[]{class133.field1257, class133.field1260, class133.field1259, class133.field1262, class133.field1261, class133.field1258}; - class133 var2 = (class133)SequenceDefinition.findEnumerated(var1, var0); - if (var2 == null) { - var2 = class133.field1257; + void method2087(int var1, int var2) { + if (!this.method2053() && this.field3714 != null) { + class497 var3 = this.method2090(var1, var2); + boolean var4 = (Integer)var3.field4074 == 0 && (Integer)var3.field4073 == this.field3713.size(); + int var5 = (Integer)var3.field4074; + int var6 = 0; + int var7 = var4 ? 0 : ((class408)this.field3713.get((Integer)var3.field4074)).field3718 * 1044781787 * -969780909; + int var8 = 0; + + int var9; + for (var9 = (Integer)var3.field4074; var9 <= (Integer)var3.field4073; ++var9) { + boolean var10 = var9 >= this.field3713.size(); + class408 var11 = (class408)this.field3713.get(!var10 ? var9 : this.field3713.size() - 1); + int var12 = !var10 ? this.method2089(var11, false) : 0; + boolean var13 = !var10 && var11.field3716 == '\n'; + boolean var14 = !var10 && this.method2054() && var12 + var6 > this.field3710; + if (var13 || var14 || var10) { + int var15 = var9; + int var16 = 0; + int var17; + int var18; + class408 var19; + if (var14) { + var17 = 0; + if (this.field3707 == 1) { + for (var18 = var9; var18 > var5; --var18) { + var19 = (class408)this.field3713.get(var18); + var17 += var18 < var15 ? this.method2089(var19, false) : 0; + if (var19.field3716 == ' ' || var19.field3716 == '\n') { + var15 = var18; + var6 -= var17; + var16 = var17; + break; + } + } + } + } + + var17 = -this.method2084(var6); + + for (var18 = var5; var18 < var15; ++var18) { + var19 = (class408)this.field3713.get(var18); + int var20 = this.method2089(var19, false); + var19.field3717 = var17; + var19.field3718 = var7; + var17 += var20; + } + + var5 = var15; + var6 = var16; + var7 += this.method2077(); + ++var8; + } + + var6 += !var10 ? var12 : 0; + } + + if (this.field3712 != 0 && var4) { + var9 = var8 * this.method2077(); + int var23 = this.method2085(var9); + + for (int var21 = 0; var21 < this.field3713.size(); ++var21) { + class408 var22 = (class408)this.field3713.get(var21); + var22.field3718 -= var23; + } + } + } + } - return var2; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1124192376" + ) + int method2088(int var1) { + return var1 < this.field3713.size() ? this.method2089((class408)this.field3713.get(var1), false) : 0; } - @ObfuscatedName("am") + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(Lpn;ZI)I", + garbageValue = "2090126332" + ) + int method2089(class408 var1, boolean var2) { + if (var1.field3716 == '\n') { + return 0; + } else if (this.field3706 == 0) { + int var3 = this.field3714.advances[var1.field3716]; + if (var3 == 0) { + return var1.field3716 == '\t' ? this.field3714.advances[32] * 3 : this.field3714.advances[32]; + } else { + return var3; + } + } else { + return this.field3714.advances[42]; + } + } + + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(Lom;IB)Z", - garbageValue = "1" + descriptor = "(III)Lti;", + garbageValue = "-139251767" ) - public static boolean method2058(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - if (var2 == null) { - return false; + class497 method2090(int var1, int var2) { + int var3 = Math.min(var1, var2); + int var4 = Math.max(var1, var2); + int var5 = this.field3713.size(); + if (var3 == 0 && var4 == var5) { + return new class497(0, var5); } else { - class164.SpriteBuffer_decode(var2); - return true; + int var6 = this.method2091(var3, false); + int var7 = this.method2092(var4, false); + int var8; + switch(this.field3712) { + case 0: + if (this.field3711 == 0) { + return new class497(var6, var5); + } + + var8 = this.method2091(var3, true); + return new class497(var8, var5); + case 1: + return new class497(0, var5); + case 2: + if (this.field3711 == 2) { + return new class497(0, var7); + } + + var8 = this.method2092(var4, true); + return new class497(0, var8); + default: + return new class497(0, var5); + } + } + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(IZB)I", + garbageValue = "-36" + ) + int method2091(int var1, boolean var2) { + if (var1 < this.field3713.size()) { + int var3 = ((class408)this.field3713.get(var1)).field3718; + + for (int var4 = var1; var4 > 0; --var4) { + if (((class408)this.field3713.get(var4 - 1)).field3718 < var3) { + if (!var2) { + return var4; + } + + var2 = false; + var3 = ((class408)this.field3713.get(var4 - 1)).field3718; + } + } + } + + return 0; + } + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(IZI)I", + garbageValue = "-1768880978" + ) + int method2092(int var1, boolean var2) { + if (var1 < this.field3713.size()) { + int var3 = ((class408)this.field3713.get(var1)).field3718; + + for (int var4 = var1; var4 < this.field3713.size() - 1; ++var4) { + if (((class408)this.field3713.get(var4 + 1)).field3718 > var3) { + if (!var2) { + return var4; + } + + var2 = false; + var3 = ((class408)this.field3713.get(var4 + 1)).field3718; + } + } + } + + return this.field3713.size(); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lol;Lol;ZI)V", + garbageValue = "-180086044" + ) + public static void method2058(AbstractArchive var0, AbstractArchive var1, boolean var2) { + ObjectComposition.ObjectDefinition_archive = var0; + ObjectComposition.ObjectDefinition_modelsArchive = var1; + ObjectComposition.ObjectDefinition_isLowDetail = var2; + } + + @ObfuscatedName("mi") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "51" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (HealthBarDefinition.widgetDefinition.loadInterface(var0)) { + AbstractWorldMapData.updateInterface(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); } } } \ No newline at end of file diff --git a/osrs/src/main/java/class407.java b/osrs/src/main/java/class407.java index 62177e7a9..288e9d034 100644 --- a/osrs/src/main/java/class407.java +++ b/osrs/src/main/java/class407.java @@ -2,238 +2,717 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.*; +@ObfuscatedName("px") +public class class407 { + @ObfuscatedName("at") + int field3715; -@ObfuscatedName("pn") -public class class407 extends AbstractQueue { - @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Lpd;" + descriptor = "(IZ)V", + garbageValue = "1" ) - class405[] field3699; - @ObfuscatedName("al") - Map field3698; - @ObfuscatedName("ak") - int field3696; - @ObfuscatedName("ax") - final Comparator field3700; - @ObfuscatedName("ao") - int field3697; - - public class407(int var1, Comparator var2) { - this.field3697 = 0; - this.field3699 = new class405[var1]; - this.field3698 = new HashMap(); - this.field3700 = var2; + class407(int var1, boolean var2) { + this.field3715 = var1; } - public class407(int var1) { - this(var1, (Comparator)null); - } - - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "677116728" + descriptor = "(S)I", + garbageValue = "6521" ) - void method2059() { - int var1 = (this.field3699.length << 1) + 1; - this.field3699 = (class405[])((class405[])Arrays.copyOf(this.field3699, var1)); + public int method2094() { + return this.field3715; } - @ObfuscatedName("al") + @ObfuscatedName("kx") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1848491495" + descriptor = "(IIIIILjava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "-45" ) - void method2060(int var1) { - class405 var2; - int var3; - for (var2 = this.field3699[var1]; var1 > 0; var1 = var3) { - var3 = var1 - 1 >>> 1; - class405 var4 = this.field3699[var3]; - if (this.field3700 != null) { - if (this.field3700.compare(var2.field3692, var4.field3692) >= 0) { - break; - } - } else if (((Comparable)var2.field3692).compareTo(var4.field3692) >= 0) { - break; - } - - this.field3699[var1] = var4; - this.field3699[var1].field3691 = var1; + @Export("menuAction") + static final void menuAction(int var0, int var1, int var2, int var3, int var4, String var5, String var6, int var7, int var8) { + if (var2 >= 2000) { + var2 -= 2000; } - this.field3699[var1] = var2; - this.field3699[var1].field3691 = var1; - } + PacketBufferNode var9; + if (var2 == 1004) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var9 = class113.getPacketBufferNode(ClientPacket.OPOBJ2, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(var3); + var9.packetBuffer.writeShort(class101.baseY + var1); + var9.packetBuffer.writeShort(var0 + NewShit.baseX); + Client.packetWriter.addNode(var9); + } - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1866393303" - ) - void method2061(int var1) { - class405 var2 = this.field3699[var1]; - - int var8; - for (int var3 = this.field3696 >>> 1; var1 < var3; var1 = var8) { - int var4 = (var1 << 1) + 1; - class405 var5 = this.field3699[var4]; - int var6 = (var1 << 1) + 2; - class405 var7 = this.field3699[var6]; - if (this.field3700 != null) { - if (var6 < this.field3696 && this.field3700.compare(var5.field3692, var7.field3692) > 0) { - var8 = var6; + if (var2 == 26) { + class520.method2526(); + } + + if (var2 == 22) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(class101.baseY + var1); + var9.packetBuffer.writeIntME(var3); + var9.packetBuffer.writeIntME(var0 + NewShit.baseX); + var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var9); + } + + Widget var18; + if (var2 == 25) { + var18 = HealthBarDefinition.widgetDefinition.getWidgetChild(var1, var0); + if (var18 != null) { + class53.method308(); + FadeOutTask.method2154(var1, var0, WorldMapData_0.Widget_unpackTargetMask(class361.getWidgetFlags(var18)), var4); + Client.isItemSelected = 0; + Client.field599 = class89.Widget_getSpellActionName(var18); + if (Client.field599 == null) { + Client.field599 = "null"; + } + + if (var18.isIf3) { + Client.field598 = var18.dataText + class167.colorStartTag(16777215); } else { - var8 = var4; + Client.field598 = class167.colorStartTag(65280) + var18.field3122 + class167.colorStartTag(16777215); } - } else if (var6 < this.field3696 && ((Comparable)var5.field3692).compareTo(var7.field3692) > 0) { - var8 = var6; - } else { - var8 = var4; } - if (this.field3700 != null) { - if (this.field3700.compare(var2.field3692, this.field3699[var8].field3692) <= 0) { - break; + } else { + if (var2 == 6) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.OPLOC4, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeIntME(class101.baseY + var1); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); + Client.packetWriter.addNode(var9); + } + + PacketBufferNode var10; + NPC var14; + if (var2 == 11) { + var14 = Client.npcs[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPNPC3, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntME(var3); + var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); } - } else if (((Comparable)var2.field3692).compareTo(this.field3699[var8].field3692) <= 0) { - break; } - this.field3699[var1] = this.field3699[var8]; - this.field3699[var1].field3691 = var1; - } + if (var2 == 12) { + var14 = Client.npcs[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPNPC4, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + } - this.field3699[var1] = var2; - this.field3699[var1].field3691 = var1; - } + Player var15; + if (var2 == 48) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.WIDGET_TYPE, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntME(var3); + var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } - @Export("remove") - @ObfuscatedName("remove") - public boolean remove(Object var1) { - class405 var2 = (class405)this.field3698.remove(var1); - if (var2 == null) { - return false; - } else { - ++this.field3697; - --this.field3696; - if (this.field3696 == var2.field3691) { - this.field3699[this.field3696] = null; - return true; - } else { - class405 var3 = this.field3699[this.field3696]; - this.field3699[this.field3696] = null; - this.field3699[var2.field3691] = var3; - this.field3699[var2.field3691].field3691 = var2.field3691; - this.method2061(var2.field3691); - if (var3 == this.field3699[var2.field3691]) { - this.method2060(var2.field3691); - } - - return true; + if (var2 == 3) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.field2573, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortLE(class101.baseY + var1); + var9.packetBuffer.writeShort(var0 + NewShit.baseX); + var9.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var9); } - } - } - @Export("peek") - @ObfuscatedName("peek") - public Object peek() { - return this.field3696 == 0 ? null : this.field3699[0].field3692; - } + if (var2 == 17) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.OPOBJ3, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortLE(var0 + NewShit.baseX); + var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortAdd(class101.baseY + var1); + var9.packetBuffer.writeIntLE(class348.selectedSpellWidget); + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var9.packetBuffer.writeShort(Client.selectedSpellItemId); + var9.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var9); + } - @Export("size") - @ObfuscatedName("size") - public int size() { - return this.field3696; - } + if (var2 == 20) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.field2558, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); + var9.packetBuffer.writeShort(class101.baseY + var1); + var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } - @Export("offer") - @ObfuscatedName("offer") - public boolean offer(Object var1) { - if (this.field3698.containsKey(var1)) { - throw new IllegalArgumentException(""); - } else { - ++this.field3697; - int var2 = this.field3696; - if (var2 >= this.field3699.length) { - this.method2059(); + if (var2 == 51) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYER8, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var10); + } } - ++this.field3696; - if (var2 == 0) { - this.field3699[0] = new class405(var1, 0); - this.field3698.put(var1, this.field3699[0]); - } else { - this.field3699[var2] = new class405(var1, var2); - this.field3698.put(var1, this.field3699[var2]); - this.method2060(var2); + if (var2 == 30 && Client.meslayerContinueWidget == null) { + class10.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = HealthBarDefinition.widgetDefinition.getWidgetChild(var1, var0); + class159.invalidateWidget(Client.meslayerContinueWidget); } - return true; - } - } + if (var2 == 21) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.field2546, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(class101.baseY + var1); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeIntME(var0 + NewShit.baseX); + Client.packetWriter.addNode(var9); + } - @Export("poll") - @ObfuscatedName("poll") - public Object poll() { - if (this.field3696 == 0) { - return null; - } else { - ++this.field3697; - Object var1 = this.field3699[0].field3692; - this.field3698.remove(var1); - --this.field3696; - if (this.field3696 == 0) { - this.field3699[this.field3696] = null; - } else { - this.field3699[0] = this.field3699[this.field3696]; - this.field3699[0].field3691 = 0; - this.field3699[this.field3696] = null; - this.method2061(0); - } - - return var1; - } - } + if (var2 == 50) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYER7, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShortLE(var3); + var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } - @Export("contains") - @ObfuscatedName("contains") - public boolean contains(Object var1) { - return this.field3698.containsKey(var1); - } + if (var2 == 57 || var2 == 1007) { + var18 = HealthBarDefinition.widgetDefinition.getWidgetChild(var1, var0); + if (var18 != null) { + FloorOverlayDefinition.widgetDefaultMenuAction(var3, var1, var0, var4, var6); + } + } - @Export("toArray") - @ObfuscatedName("toArray") - public Object[] toArray() { - Object[] var1 = super.toArray(); - if (this.field3700 != null) { - Arrays.sort(var1, this.field3700); - } else { - Arrays.sort(var1); - } + int var11; + Widget var16; + if (var2 == 28) { + var9 = class113.getPacketBufferNode(ClientPacket.WIDGET_TYPE5, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var9); + var16 = HealthBarDefinition.widgetDefinition.method1733(var1); + if (var16 != null && var16.cs1Instructions != null && var16.cs1Instructions[0][0] == 5) { + var11 = var16.cs1Instructions[0][1]; + Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; + Projectile.changeGameOptions(var11); + } + } - return var1; - } + PacketBufferNode var13; + if (var2 == 24) { + var18 = HealthBarDefinition.widgetDefinition.method1733(var1); + if (var18 != null) { + boolean var12 = true; + if (var18.contentType > 0) { + var12 = class101.method597(var18); + } - @Export("iterator") - @ObfuscatedName("iterator") - public Iterator iterator() { - return new class406(this); - } + if (var12) { + var13 = class113.getPacketBufferNode(ClientPacket.WIDGET_TYPE5, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var13); + } + } + } - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-105" - ) - public static void method2062() { - class326.SpriteBuffer_xOffsets = null; - ModelData0.SpriteBuffer_yOffsets = null; - class59.SpriteBuffer_spriteWidths = null; - class544.SpriteBuffer_spriteHeights = null; - class372.SpriteBuffer_spritePalette = null; - AddRequestTask.SpriteBuffer_pixels = null; + if (var2 == 47) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 2) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.OPLOCT, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(var3); + var9.packetBuffer.writeIntME(Client.selectedSpellItemId); + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var9.packetBuffer.writeShortLE(class101.baseY + var1); + var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); + var9.packetBuffer.writeIntIME(class348.selectedSpellWidget); + var9.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var9); + } + + if (var2 == 1002) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var9 = class113.getPacketBufferNode(ClientPacket.OPLOCE, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var9); + } + + if (var2 == 8) { + var14 = Client.npcs[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPNPCT, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(class348.selectedSpellWidget); + var10.packetBuffer.writeShortLE(var3); + var10.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var10.packetBuffer.writeShortAdd(Client.selectedSpellItemId); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 58) { + var18 = HealthBarDefinition.widgetDefinition.getWidgetChild(var1, var0); + if (var18 != null) { + if (var18.field3098 != null) { + ScriptEvent var17 = new ScriptEvent(); + var17.widget = var18; + var17.opIndex = var3; + var17.targetName = var6; + var17.args = var18.field3098; + class157.runScriptEvent(var17); + } + + var10 = class113.getPacketBufferNode(ClientPacket.f6, Client.packetWriter.isaacCipher); + var10.packetBuffer.method2613(class348.selectedSpellWidget); + var10.packetBuffer.writeShortAdd(var0); + var10.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); + var10.packetBuffer.writeIntLE(var1); + var10.packetBuffer.writeShortAdd(var4); + var10.packetBuffer.writeIntME(Client.selectedSpellItemId); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 16) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.f53, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); + var9.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortAdd(class59.field302); + var9.packetBuffer.writeIntME(var3); + var9.packetBuffer.writeIntME(class221.field1877); + var9.packetBuffer.writeShort(class101.baseY + var1); + var9.packetBuffer.writeInt(class195.field1620); + Client.packetWriter.addNode(var9); + } + + if (var2 == 1001) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.OPLOC5, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); + var9.packetBuffer.writeShortAdd(class101.baseY + var1); + var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var9); + } + + if (var2 == 10) { + var14 = Client.npcs[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPNPC2, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 9) { + var14 = Client.npcs[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPNPC1, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 15) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYERT, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeIntME(Client.selectedSpellItemId); + var10.packetBuffer.writeShortLE(var3); + var10.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); + var10.packetBuffer.writeIntLE(class348.selectedSpellWidget); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 1) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.field2604, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntLE(class195.field1620); + var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); + var9.packetBuffer.writeShortLE(class221.field1877); + var9.packetBuffer.writeShortAdd(var3); + var9.packetBuffer.writeShortLE(class59.field302); + var9.packetBuffer.writeShortAdd(class101.baseY + var1); + Client.packetWriter.addNode(var9); + } + + if (var2 == 1003) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var14 = Client.npcs[var3]; + if (var14 != null) { + NPCComposition var19 = var14.definition; + if (var19.transforms != null) { + var19 = var19.transform(); + } + + if (var19 != null) { + var13 = class113.getPacketBufferNode(ClientPacket.CLOSE_MODAL, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeIntME(var19.id); + Client.packetWriter.addNode(var13); + } + } + } + + if (var2 == 4) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.field2595, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(class101.baseY + var1); + var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); + var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + + if (var2 == 1008 || var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1012) { + NewShit.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); + } + + if (var2 == 49) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 23) { + if (Client.isMenuOpen) { + class36.scene.setViewportWalking(); + } else { + class36.scene.menuOpen(ItemLayer.Client_plane, var0, var1, true); + } + } + + if (var2 == 44) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYER1, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 45) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYER2, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 7) { + var14 = Client.npcs[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.field2587, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntME(var3); + var10.packetBuffer.writeShort(class59.field302); + var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeIntIME(class195.field1620); + var10.packetBuffer.writeShort(class221.field1877); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 29) { + var9 = class113.getPacketBufferNode(ClientPacket.WIDGET_TYPE5, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var9); + var16 = HealthBarDefinition.widgetDefinition.method1733(var1); + if (var16 != null && var16.cs1Instructions != null && var16.cs1Instructions[0][0] == 5) { + var11 = var16.cs1Instructions[0][1]; + if (Varps.Varps_main[var11] != var16.cs1ComparisonValues[0]) { + Varps.Varps_main[var11] = var16.cs1ComparisonValues[0]; + Projectile.changeGameOptions(var11); + } + } + } + + if (var2 == 13) { + var14 = Client.npcs[var3]; + if (var14 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPNPC5, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 19) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.OPLOC2, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); + var9.packetBuffer.writeIntME(class101.baseY + var1); + var9.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var9); + } + + if (var2 == 14) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.EVENT_MOUSE_CLICK, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShort(class221.field1877); + var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShortLE(class59.field302); + var10.packetBuffer.writeShortLE(var3); + var10.packetBuffer.writeInt(class195.field1620); + Client.packetWriter.addNode(var10); + } + } + + if (var2 == 5) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.OPLOC3, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var9.packetBuffer.writeIntME(class101.baseY + var1); + var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); + var9.packetBuffer.writeShortAdd(var3); + Client.packetWriter.addNode(var9); + } + + if (var2 == 18) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class113.getPacketBufferNode(ClientPacket.OPLOC1, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(class101.baseY + var1); + var9.packetBuffer.writeShort(var0 + NewShit.baseX); + var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + Client.packetWriter.addNode(var9); + } + + if (var2 == 46) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var7; + Client.mouseCrossY = var8; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYER3, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + } + + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + class159.invalidateWidget(HealthBarDefinition.widgetDefinition.method1733(class195.field1620)); + } + + if (Client.isSpellSelected) { + class53.method308(); + } + + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class408.java b/osrs/src/main/java/class408.java new file mode 100644 index 000000000..05906ce98 --- /dev/null +++ b/osrs/src/main/java/class408.java @@ -0,0 +1,37 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pn") +public class class408 { + @ObfuscatedName("at") + public char field3716; + @ObfuscatedName("ah") + public int field3717; + @ObfuscatedName("ar") + public int field3718; + + class408() { + this.field3717 = 0; + this.field3718 = 0; + } + + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "(Ltu;I)Ljava/lang/Object;", + garbageValue = "-458356510" + ) + static Object method2096(class514 var0) { + if (var0 == null) { + throw new IllegalStateException("popValueOfType() failure - null baseVarType"); + } else { + switch(var0.field4129) { + case 0: + return Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + case 2: + return Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + default: + throw new IllegalStateException("popValueOfType() failure - unsupported type"); + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class409.java b/osrs/src/main/java/class409.java deleted file mode 100644 index 3ac4c80ff..000000000 --- a/osrs/src/main/java/class409.java +++ /dev/null @@ -1,799 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.ArrayList; - -@ObfuscatedName("pp") -public class class409 { - @ObfuscatedName("aj") - int field3705; - @ObfuscatedName("an") - int field3706; - @ObfuscatedName("au") - int field3708; - @ObfuscatedName("ai") - int field3704; - @ObfuscatedName("ae") - int field3702; - @ObfuscatedName("aw") - boolean field3701; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lpk;" - ) - AbstractFont field3710; - @ObfuscatedName("az") - ArrayList field3709; - @ObfuscatedName("at") - int field3707; - @ObfuscatedName("af") - int field3703; - - public class409() { - this.field3705 = Integer.MAX_VALUE; - this.field3706 = Integer.MAX_VALUE; - this.field3708 = 0; - this.field3704 = 0; - this.field3702 = 0; - this.field3701 = true; - this.field3709 = new ArrayList(); - this.field3707 = 0; - this.field3703 = 0; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)Lpe;", - garbageValue = "391282708" - ) - public class411 method2065(int var1) { - return (class411)this.field3709.get(var1); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)Lpe;", - garbageValue = "-2102583593" - ) - class411 method2066() { - return this.field3709.size() == 0 ? null : (class411)this.field3709.get(this.field3709.size() - 1); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-15" - ) - public boolean method2067() { - return this.field3709.size() == 0; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-122" - ) - boolean method2068() { - return this.field3706 > 1; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1628091187" - ) - public int method2069() { - return this.field3709.size(); - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "1" - ) - public String method2070() { - if (this.method2067()) { - return ""; - } else { - StringBuilder var1 = new StringBuilder(this.method2069()); - - for (int var2 = 0; var2 < this.method2069(); ++var2) { - class411 var3 = this.method2065(var2); - var1.append(var3.field3713); - } - - return var1.toString(); - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1556362413" - ) - public void method2071(int var1) { - if (this.field3710 != null && var1 < this.field3710.ascent * 2) { - var1 = Integer.MAX_VALUE; - } - - if (this.field3705 != var1) { - this.field3705 = var1; - this.method2099(); - } - - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "36" - ) - public void method2072(int var1) { - if (this.field3706 != var1) { - this.field3706 = var1; - this.method2099(); - } - - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1148190983" - ) - public void method2073(int var1) { - if (this.field3703 != var1) { - this.field3703 = var1; - this.method2099(); - } - - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(Lpk;I)V", - garbageValue = "1676896473" - ) - public void method2074(AbstractFont var1) { - if (var1 != this.field3710) { - this.field3710 = var1; - if (this.field3710 != null) { - if (this.field3702 == 0) { - this.field3702 = this.field3710.ascent; - } - - if (!this.method2067()) { - this.method2099(); - } - } - } - - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "903704871" - ) - public void method2075(int var1) { - if (this.field3707 != var1) { - this.field3707 = var1; - this.method2099(); - } - - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "2058162248" - ) - public boolean method2076(int var1, int var2) { - if (this.field3708 != var1 || var2 != this.field3704) { - this.field3708 = var1; - this.field3704 = var2; - this.method2099(); - } - - return true; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1814750102" - ) - public void method2077(int var1) { - if (this.field3702 != var1) { - this.field3702 = var1; - this.method2099(); - } - - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(III)Lpr;", - garbageValue = "1762179013" - ) - public class413 method2078(int var1, int var2) { - if (var2 == var1) { - return new class413(this, 0, 0); - } else if (var1 <= this.field3709.size() && var2 <= this.field3709.size()) { - return var2 < var1 ? new class413(this, var2, var1) : new class413(this, var1, var2); - } else { - return new class413(this, 0, 0); - } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(CIIS)Lpb;", - garbageValue = "7902" - ) - public class410 method2079(char var1, int var2, int var3) { - return this.method2080(Character.toString(var1), var2, var3); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IIB)Lpb;", - garbageValue = "-45" - ) - public class410 method2080(String var1, int var2, int var3) { - if (var3 == 0) { - var3 = Integer.MAX_VALUE; - } - - int var4 = var2; - if (this.field3709.size() >= var3) { - this.method2100(var2, var2); - return new class410(var2, true); - } else { - this.field3709.ensureCapacity(this.field3709.size() + var1.length()); - - for (int var5 = 0; var5 < var1.length() && this.field3709.size() < var3; ++var5) { - class411 var6 = new class411(); - var6.field3713 = var1.charAt(var5); - this.field3709.add(var4, var6); - ++var4; - } - - this.method2100(var2, var4); - if (this.field3706 != 0 && this.method2091() > this.field3706) { - while (var4 != var2) { - --var4; - this.method2084(var4); - if (this.method2091() <= this.field3706) { - break; - } - } - - return new class410(var4, true); - } else { - return new class410(var4, false); - } - } - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lpb;", - garbageValue = "-2106167498" - ) - class410 method2081(String var1, int var2) { - return this.method2080(var1, this.field3709.size(), var2); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Lpb;", - garbageValue = "-2022964950" - ) - public class410 method2082(String var1) { - this.method2083(); - return this.method2081(var1, 0); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-14773" - ) - void method2083() { - this.field3709.clear(); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "398036956" - ) - public int method2084(int var1) { - return this.method2085(var1, var1 + 1); - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "895943109" - ) - public int method2085(int var1, int var2) { - int var3; - if (var2 < var1) { - var3 = var2; - var2 = var1; - var1 = var3; - } - - this.field3709.subList(var1, var2).clear(); - var3 = var1; - if (this.method2068() && this.field3707 == 1) { - while (var3 > 0) { - --var3; - char var4 = ((class411)this.field3709.get(var3)).field3713; - if (var4 == ' ' || var4 == '\t') { - break; - } - } - } - - this.method2100(var3, var2); - return var1; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1582951780" - ) - public int method2086(int var1, int var2) { - if (this.field3710 == null) { - return 0; - } else if (this.method2068() && var1 > this.field3705) { - return this.field3709.size(); - } else { - if (!this.field3709.isEmpty()) { - for (int var3 = 0; var3 < this.field3709.size(); ++var3) { - class411 var4 = (class411)this.field3709.get(var3); - if (var2 <= var4.field3714 + this.method2090()) { - if (var2 < var4.field3714) { - break; - } - - if (var1 < var4.field3715) { - return var3 > 0 ? var3 - 1 : 0; - } - - if (1 + var3 != this.field3709.size() && ((class411)this.field3709.get(var3 + 1)).field3714 != var4.field3714) { - int var5 = this.method2102((class411)this.field3709.get(var3), false); - if (var1 < var5 + var4.field3715) { - return var3; - } - - if (var2 <= var4.field3714 + this.method2090()) { - return var3 + 1; - } - } - } - } - - class411 var6 = (class411)this.field3709.get(this.field3709.size() - 1); - if (var1 >= var6.field3715 && var1 <= var6.field3715 + this.method2092() && var2 >= var6.field3714 && var2 <= var6.field3714 + this.method2090()) { - return this.field3709.size() - 1; - } - } - - return this.field3709.size(); - } - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1702844331" - ) - public int method2087(int var1, int var2) { - if (this.field3710 != null && !this.method2067() && var1 <= this.field3709.size()) { - byte var3; - if (var2 > 0) { - var3 = 1; - } else { - var3 = -1; - var2 = -var2; - } - - int var4 = 0; - int var5 = 0; - if (var1 > 0) { - class411 var6 = (class411)this.field3709.get(var1 - 1); - var4 = var6.field3715 + this.method2101(var1 - 1); - var5 = var6.field3714; - } else if (var3 == -1 && var1 == 0) { - return 0; - } - - int var14 = 16777215; - int var7 = 0; - int var8 = var1; - int var9 = 16777215; - int var10 = var3 == 1 ? this.field3709.size() + 1 : 0; - - for (int var11 = var3 + var1; var10 != var11; var11 += var3) { - class411 var12 = (class411)this.field3709.get(var11 - 1); - if (var5 != var12.field3714) { - ++var7; - var5 = var12.field3714; - if (var7 > var2) { - return var8; - } - } - - if (var7 == var2) { - int var13 = Math.abs(var12.field3715 + this.method2101(var11 - 1) - var4); - if (var13 >= var9) { - return var8; - } - - var8 = var11; - var9 = var13; - } - } - - if (var3 == 1) { - return this.field3709.size(); - } else { - if (var5 != 0) { - ++var7; - } - - return var9 == 16777215 || var7 == var2 && var4 < var9 ? 0 : var8; - } - } else { - return 0; - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-512196245" - ) - public int method2088() { - if (!this.field3709.isEmpty() && this.method2091() == 1) { - return this.field3709.isEmpty() ? 0 : ((class411)this.field3709.get(this.field3709.size() - 1)).field3715 + this.method2092(); - } else { - int var1 = -1; - int var2 = 0; - - for (int var3 = this.field3709.size() - 1; var3 >= 0; --var3) { - class411 var4 = (class411)this.field3709.get(var3); - if (var1 != var4.field3714) { - int var5 = this.method2102(var4, false) + var4.field3715; - var2 = Math.max(var5, var2); - var1 = var4.field3714; - } - } - - return var2; - } - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "67" - ) - public int method2089() { - return this.method2067() ? 0 : this.field3710.ascent + ((class411)this.field3709.get(this.field3709.size() - 1)).field3714; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-51" - ) - public int method2090() { - return this.field3702; - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "458527670" - ) - public int method2091() { - return this.method2089() / this.field3710.ascent; - } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-317463978" - ) - int method2092() { - return this.method2067() ? 0 : this.method2102((class411)this.field3709.get(this.field3709.size() - 1), false); - } - - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "4" - ) - public int method2093() { - return this.field3705; - } - - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-59557509" - ) - public int method2094() { - return this.field3706; - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1977390124" - ) - public int method2095() { - return this.field3707; - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "13" - ) - public int method2096() { - return this.field3703; - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1372497203" - ) - public int method2097(int var1) { - switch(this.field3708) { - case 0: - return 0; - case 1: - return var1 / 2; - case 2: - return var1; - default: - return 0; - } - } - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1982314148" - ) - public int method2098(int var1) { - switch(this.field3704) { - case 0: - return 0; - case 1: - return var1 / 2; - case 2: - return var1; - default: - return 0; - } - } - - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2112190855" - ) - void method2099() { - this.method2100(0, this.field3709.size()); - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2040581189" - ) - void method2100(int var1, int var2) { - if (!this.method2067() && this.field3710 != null) { - class500 var3 = this.method2103(var1, var2); - boolean var4 = (Integer)var3.field4079 == 0 && (Integer)var3.field4080 == this.field3709.size(); - int var5 = (Integer)var3.field4079; - int var6 = 0; - int var7 = var4 ? 0 : ((class411)this.field3709.get((Integer)var3.field4079)).field3714 * 1441776133 * 402832077; - int var8 = 0; - - int var9; - for (var9 = (Integer)var3.field4079; var9 <= (Integer)var3.field4080; ++var9) { - boolean var10 = var9 >= this.field3709.size(); - class411 var11 = (class411)this.field3709.get(!var10 ? var9 : this.field3709.size() - 1); - int var12 = !var10 ? this.method2102(var11, false) : 0; - boolean var13 = !var10 && var11.field3713 == '\n'; - boolean var14 = !var10 && this.method2068() && var12 + var6 > this.field3705; - if (var13 || var14 || var10) { - int var15 = var9; - int var16 = 0; - int var17; - int var18; - class411 var19; - if (var14) { - var17 = 0; - if (this.field3707 == 1) { - for (var18 = var9; var18 > var5; --var18) { - var19 = (class411)this.field3709.get(var18); - var17 += var18 < var15 ? this.method2102(var19, false) : 0; - if (var19.field3713 == ' ' || var19.field3713 == '\n') { - var15 = var18; - var6 -= var17; - var16 = var17; - break; - } - } - } - } - - var17 = -this.method2097(var6); - - for (var18 = var5; var18 < var15; ++var18) { - var19 = (class411)this.field3709.get(var18); - int var20 = this.method2102(var19, false); - var19.field3715 = var17; - var19.field3714 = var7; - var17 += var20; - } - - var5 = var15; - var6 = var16; - var7 += this.method2090(); - ++var8; - } - - var6 += !var10 ? var12 : 0; - } - - if (this.field3704 != 0 && var4) { - var9 = var8 * this.method2090(); - int var23 = this.method2098(var9); - - for (int var21 = 0; var21 < this.field3709.size(); ++var21) { - class411 var22 = (class411)this.field3709.get(var21); - var22.field3714 -= var23; - } - } - - } - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1039874623" - ) - int method2101(int var1) { - return var1 < this.field3709.size() ? this.method2102((class411)this.field3709.get(var1), false) : 0; - } - - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(Lpe;ZI)I", - garbageValue = "1478006177" - ) - int method2102(class411 var1, boolean var2) { - if (var1.field3713 == '\n') { - return 0; - } else if (this.field3703 == 0) { - int var3 = this.field3710.advances[var1.field3713]; - if (var3 == 0) { - return var1.field3713 == '\t' ? this.field3710.advances[32] * 3 : this.field3710.advances[32]; - } else { - return var3; - } - } else { - return this.field3710.advances[42]; - } - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(IIB)Ltw;", - garbageValue = "26" - ) - class500 method2103(int var1, int var2) { - int var3 = Math.min(var1, var2); - int var4 = Math.max(var1, var2); - int var5 = this.field3709.size(); - if (var3 == 0 && var4 == var5) { - return new class500(0, var5); - } else { - int var6 = this.method2104(var3, false); - int var7 = this.method2105(var4, false); - int var8; - switch(this.field3704) { - case 0: - if (this.field3708 == 0) { - return new class500(var6, var5); - } - - var8 = this.method2104(var3, true); - return new class500(var8, var5); - case 1: - return new class500(0, var5); - case 2: - if (this.field3708 == 2) { - return new class500(0, var7); - } - - var8 = this.method2105(var4, true); - return new class500(0, var8); - default: - return new class500(0, var5); - } - } - } - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(IZS)I", - garbageValue = "-9654" - ) - int method2104(int var1, boolean var2) { - if (var1 < this.field3709.size()) { - int var3 = ((class411)this.field3709.get(var1)).field3714; - - for (int var4 = var1; var4 > 0; --var4) { - if (((class411)this.field3709.get(var4 - 1)).field3714 < var3) { - if (!var2) { - return var4; - } - - var2 = false; - var3 = ((class411)this.field3709.get(var4 - 1)).field3714; - } - } - } - - return 0; - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(IZI)I", - garbageValue = "-1749016193" - ) - int method2105(int var1, boolean var2) { - if (var1 < this.field3709.size()) { - int var3 = ((class411)this.field3709.get(var1)).field3714; - - for (int var4 = var1; var4 < this.field3709.size() - 1; ++var4) { - if (((class411)this.field3709.get(var4 + 1)).field3714 > var3) { - if (!var2) { - return var4; - } - - var2 = false; - var3 = ((class411)this.field3709.get(var4 + 1)).field3714; - } - } - } - - return this.field3709.size(); - } - - @ObfuscatedName("ov") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-11" - ) - static void method2106(int var0) { - if (var0 != Client.loginState) { - Client.loginState = var0; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class410.java b/osrs/src/main/java/class410.java index dd919a4d0..725a2b28d 100644 --- a/osrs/src/main/java/class410.java +++ b/osrs/src/main/java/class410.java @@ -1,88 +1,183 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pb") -public class class410 { - @ObfuscatedName("ac") - int field3711; +import java.util.Date; +@ObfuscatedName("pd") +public class class410 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IZ)V", - garbageValue = "1" + descriptor = "Lpv;" ) - class410(int var1, boolean var2) { - this.field3711 = var1; - } + class406 field3743; + @ObfuscatedName("ah") + int field3741; + @ObfuscatedName("ar") + int field3742; - @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-15695" + descriptor = "(Lpv;II)V" ) - public int method2107() { - return this.field3711; + class410(class406 var1, int var2, int var3) { + this.field3741 = 0; + this.field3742 = 0; + this.field3743 = var1; + this.field3741 = var2; + this.field3742 = var3; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1656605881" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "2063026916" ) - static final boolean method2108(char var0) { - if (Character.isISOControl(var0)) { - return false; - } else if (Decimator.isAlphaNumeric(var0)) { - return true; + public String method2131() { + if (this.method2133()) { + return ""; } else { - char[] var1 = class508.field4108; - - int var2; - char var3; - for (var2 = 0; var2 < var1.length; ++var2) { - var3 = var1[var2]; - if (var0 == var3) { - return true; - } + StringBuilder var1 = new StringBuilder(this.method2134()); + + for (int var2 = this.field3741; var2 < this.field3742; ++var2) { + class408 var3 = this.field3743.method2051(var2); + var1.append(var3.field3716); } - var1 = class508.field4109; + return var1.toString(); + } + } - for (var2 = 0; var2 < var1.length; ++var2) { - var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1949431779" + ) + boolean method2132(int var1) { + return this.field3743.method2083() == 2 || this.field3743.method2083() == 1 && (!this.field3743.field3705 || this.field3742 - 1 != var1); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "43" + ) + public boolean method2133() { + return this.field3742 == this.field3741; + } + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "25" + ) + public int method2134() { + return this.field3742 - this.field3741; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Lpn;I)Z", + garbageValue = "-1150378981" + ) + boolean method2135(class408 var1) { + if (this.field3743.field3706 == 2) { + return true; + } else if (this.field3743.field3706 == 0) { return false; + } else { + return this.field3743.method2052() != var1; } } - @ObfuscatedName("lz") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-1849908879" + descriptor = "(S)I", + garbageValue = "128" ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (class33.widgetDefinition.loadInterface(var0)) { - class9.field16 = null; - Tile.drawInterface(class33.widgetDefinition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (class9.field16 != null) { - Tile.drawInterface(class9.field16, -1412584499, var1, var2, var3, var4, GrandExchangeEvent.field3617, class10.field24, var7); - class9.field16 = null; + int method2136() { + if (this.method2133()) { + return 0; + } else { + class408 var1 = this.field3743.method2051(this.field3742 - 1); + if (var1.field3716 == '\n') { + return 0; + } else if (this.method2135(var1)) { + return this.field3743.field3714.advances[42]; + } else { + int var2 = this.field3743.field3714.advances[var1.field3716]; + if (var2 == 0) { + return var1.field3716 == '\t' ? this.field3743.field3714.advances[32] * 3 : this.field3743.field3714.advances[32]; + } else { + return var2; + } } + } + } + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)Lti;", + garbageValue = "-1126162265" + ) + public class497 method2137() { + if (this.method2133()) { + return new class497(0, 0); } else { - if (var7 != -1) { - Client.field408[var7] = true; + class408 var1 = this.field3743.method2051(this.field3742 - 1); + return new class497(var1.field3717 + this.method2136(), var1.field3718); + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)Lpn;", + garbageValue = "262474299" + ) + public class408 method2138(int var1) { + return var1 >= 0 && var1 < this.method2134() ? this.field3743.method2051(this.field3741 + var1) : null; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-127" + ) + public static final void method2139() { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; + } + + @ObfuscatedName("nz") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1487231086" + ) + static void method2140(String var0) { + MenuAction.param9 = var0; + + try { + String var1 = SpriteMask.client.getParameter(Integer.toString(18)); + String var2 = SpriteMask.client.getParameter(Integer.toString(13)); + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; + if (var0.length() == 0) { + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field408[var8] = true; - } + String var4 = var3 + "; Expires="; + long var6 = SpotAnimationDefinition.method962() + 94608000000L; + Calendar.Calendar_calendar.setTime(new Date(var6)); + int var8 = Calendar.Calendar_calendar.get(7); + int var9 = Calendar.Calendar_calendar.get(5); + int var10 = Calendar.Calendar_calendar.get(2); + int var11 = Calendar.Calendar_calendar.get(1); + int var12 = Calendar.Calendar_calendar.get(11); + int var13 = Calendar.Calendar_calendar.get(12); + int var14 = Calendar.Calendar_calendar.get(13); + String var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; + var3 = var4 + var5 + "; Max-Age=" + 94608000L; } + class26.method107(SpriteMask.client, "document.cookie=\"" + var3 + "\""); + } catch (Throwable var15) { } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class411.java b/osrs/src/main/java/class411.java deleted file mode 100644 index fecb5fc47..000000000 --- a/osrs/src/main/java/class411.java +++ /dev/null @@ -1,30 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pe") -public class class411 { - @ObfuscatedName("wf") - static long field3712; - @ObfuscatedName("ac") - public char field3713; - @ObfuscatedName("al") - public int field3715; - @ObfuscatedName("ak") - public int field3714; - - class411() { - this.field3715 = 0; - this.field3714 = 0; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;B)V", - garbageValue = "56" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - class164.addChatMessage(var0, var1, var2, (String)null); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class413.java b/osrs/src/main/java/class413.java index 0f6fbf949..0eb3ff8e6 100644 --- a/osrs/src/main/java/class413.java +++ b/osrs/src/main/java/class413.java @@ -1,136 +1,75 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pr") -public class class413 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lpp;" - ) - class409 field3740; - @ObfuscatedName("al") - int field3739; - @ObfuscatedName("ak") - int field3738; +import java.util.ArrayList; +import java.util.Iterator; + +@ObfuscatedName("pq") +public class class413 extends SongTask { + @ObfuscatedName("at") + ArrayList field3745; @ObfuscatedSignature( - descriptor = "(Lpp;II)V" + descriptor = "(Lql;Ljava/util/ArrayList;)V" ) - class413(class409 var1, int var2, int var3) { - this.field3739 = 0; - this.field3738 = 0; - this.field3740 = var1; - this.field3739 = var2; - this.field3738 = var3; + public class413(SongTask var1, ArrayList var2) { + super(var1); + super.field3756 = "ClearRequestTask"; + this.field3745 = var2; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1895014245" + descriptor = "(I)Z", + garbageValue = "-799935345" ) - public String method2145() { - if (this.method2147()) { - return ""; + @Export("vmethod2142") + public boolean vmethod2142() { + if (this.field3745.isEmpty()) { + return true; } else { - StringBuilder var1 = new StringBuilder(this.method2148()); + Iterator var1 = this.field3745.iterator(); - for (int var2 = this.field3739; var2 < this.field3738; ++var2) { - class411 var3 = this.field3740.method2065(var2); - var1.append(var3.field3713); - } + while (var1.hasNext()) { + MusicSong var2 = (MusicSong)var1.next(); - return var1.toString(); - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-819207986" - ) - boolean method2146(int var1) { - return this.field3740.method2096() == 2 || this.field3740.method2096() == 1 && (!this.field3740.field3701 || this.field3738 - 1 != var1); - } + try { + if (class316.musicSongs.contains(var2)) { + if (var2 == null) { + class316.musicSongs.remove(var2); + } else { + if (var2.midiPcmStream.field2830 > 0) { + --var2.midiPcmStream.field2830; + } - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-70" - ) - public boolean method2147() { - return this.field3738 == this.field3739; - } + if (var2.midiPcmStream.field2830 == 0) { + var2.midiPcmStream.clear(); + var2.midiPcmStream.method1657(); + var2.midiPcmStream.setPcmStreamVolume(0); + } - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-40" - ) - public int method2148() { - return this.field3738 - this.field3739; - } + int var3 = var2.musicTrackGroupId; + int var4 = var2.musicTrackFileId; + Iterator var5 = class316.field2793.iterator(); - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Lpe;B)Z", - garbageValue = "4" - ) - boolean method2149(class411 var1) { - if (this.field3740.field3703 == 2) { - return true; - } else if (this.field3740.field3703 == 0) { - return false; - } else { - return this.field3740.method2066() != var1; - } - } + while (var5.hasNext()) { + class322 var6 = (class322)var5.next(); + var6.vmethod1644(var3, var4); + } - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1508488797" - ) - int method2150() { - if (this.method2147()) { - return 0; - } else { - class411 var1 = this.field3740.method2065(this.field3738 - 1); - if (var1.field3713 == '\n') { - return 0; - } else if (this.method2149(var1)) { - return this.field3740.field3710.advances[42]; - } else { - int var2 = this.field3740.field3710.advances[var1.field3713]; - if (var2 == 0) { - return var1.field3713 == '\t' ? this.field3740.field3710.advances[32] * 3 : this.field3740.field3710.advances[32]; - } else { - return var2; + class316.musicSongs.remove(var2); + } + } + } catch (Exception var8) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var8); + this.method2160(var8.getMessage()); + class316.musicSongs.clear(); + return true; } } - } - } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)Ltw;", - garbageValue = "-1209602899" - ) - public class500 method2151() { - if (this.method2147()) { - return new class500(0, 0); - } else { - class411 var1 = this.field3740.method2065(this.field3738 - 1); - return new class500(var1.field3715 + this.method2150(), var1.field3714); + return true; } } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(IB)Lpe;", - garbageValue = "-52" - ) - public class411 method2152(int var1) { - return var1 >= 0 && var1 < this.method2148() ? this.field3740.method2065(this.field3739 + var1) : null; - } } \ No newline at end of file diff --git a/osrs/src/main/java/class305.java b/osrs/src/main/java/class415.java similarity index 62% rename from osrs/src/main/java/class305.java rename to osrs/src/main/java/class415.java index 9570f3223..8980f07c1 100644 --- a/osrs/src/main/java/class305.java +++ b/osrs/src/main/java/class415.java @@ -7,25 +7,87 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Iterator; -@ObfuscatedName("lt") -public class class305 { - @ObfuscatedName("ay") +@ObfuscatedName("py") +public class class415 extends SongTask { @ObfuscatedSignature( - descriptor = "Lun;" + descriptor = "(Lql;)V" ) - static IndexedSprite field2513; - @ObfuscatedName("mv") + public class415(SongTask var1) { + super(var1); + super.field3756 = "StartSongTask"; + } + + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "(I)Z", + garbageValue = "-799935345" ) - @Export("textureProvider") - static TextureProvider textureProvider; + @Export("vmethod2142") + public boolean vmethod2142() { + Iterator var1 = class316.musicSongs.iterator(); + + while (var1.hasNext()) { + MusicSong var2 = (MusicSong)var1.next(); + if (var2 != null && !var2.field2883 && var2.midiPcmStream != null) { + try { + var2.midiPcmStream.method1656(); + var2.midiPcmStream.setPcmStreamVolume(0); + if (var2.field2891 != null) { + var2.midiPcmStream.setMusicTrack(var2.field2891, var2.musicTrackBoolean); + } + + var2.field2891 = null; + var2.field2881 = null; + var2.musicTrackArchive = null; + var2.field2883 = true; + } catch (Exception var4) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var4); + this.method2160(var4.getMessage()); + return true; + } + } + } + + super.field3754 = true; + return true; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "([BB)Ljava/lang/String;", + garbageValue = "14" + ) + public static String method2150(byte[] var0) { + int var2 = var0.length; + StringBuilder var3 = new StringBuilder(); + + for (int var4 = 0; var4 < var2 + 0; var4 += 3) { + int var5 = var0[var4] & 255; + var3.append(class397.field3689[var5 >>> 2]); + if (var4 < var2 - 1) { + int var6 = var0[var4 + 1] & 255; + var3.append(class397.field3689[(var5 & 3) << 4 | var6 >>> 4]); + if (var4 < var2 - 2) { + int var7 = var0[var4 + 2] & 255; + var3.append(class397.field3689[(var6 & 15) << 2 | var7 >>> 6]).append(class397.field3689[var7 & 63]); + } else { + var3.append(class397.field3689[(var6 & 15) << 2]).append("="); + } + } else { + var3.append(class397.field3689[(var5 & 3) << 4]).append("=="); + } + } + + String var1 = var3.toString(); + return var1; + } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Luy;B)V", - garbageValue = "52" + descriptor = "(Luo;I)V", + garbageValue = "1697357932" ) @Export("performReflectionCheck") public static void performReflectionCheck(PacketBuffer var0) { @@ -121,49 +183,4 @@ public static void performReflectionCheck(PacketBuffer var0) { var1.remove(); } } - - @ObfuscatedName("ma") - @ObfuscatedSignature( - descriptor = "(Lnm;IIIIIII)V", - garbageValue = "-754549131" - ) - static final void method1638(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field381) { - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; - } - - Client.field381 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !UserComparator8.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - ClanChannelMember.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - ClanChannelMember.invalidateWidget(var0); - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { - var7 = var3 * (var3 - 32) / var4; - if (var7 < 8) { - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - ClanChannelMember.invalidateWidget(var0); - Client.field381 = true; - } - } - - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { - var0.scrollY += Client.mouseWheelRotation * 45; - ClanChannelMember.invalidateWidget(var0); - } - } - - } } \ No newline at end of file diff --git a/osrs/src/main/java/class416.java b/osrs/src/main/java/class416.java deleted file mode 100644 index 175758ac3..000000000 --- a/osrs/src/main/java/class416.java +++ /dev/null @@ -1,87 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.applet.Applet; -import java.util.ArrayList; -import java.util.Iterator; - -@ObfuscatedName("qi") -public class class416 extends SongTask { - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lnm;" - ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; - @ObfuscatedName("ac") - ArrayList field3743; - - @ObfuscatedSignature( - descriptor = "(Lqm;Ljava/util/ArrayList;)V" - ) - public class416(SongTask var1, ArrayList var2) { - super(var1); - super.field3753 = "ClearRequestTask"; - this.field3743 = var2; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-90" - ) - @Export("vmethod2142") - public boolean vmethod2142() { - if (this.field3743.isEmpty()) { - return true; - } else { - Iterator var1 = this.field3743.iterator(); - - while (var1.hasNext()) { - MusicSong var2 = (MusicSong)var1.next(); - - try { - if (class319.musicSongs.contains(var2)) { - if (var2 == null) { - class319.musicSongs.remove(var2); - } else { - if (var2.midiPcmStream.field2833 > 0) { - --var2.midiPcmStream.field2833; - } - - if (var2.midiPcmStream.field2833 == 0) { - var2.midiPcmStream.clear(); - var2.midiPcmStream.method1666(); - var2.midiPcmStream.setPcmStreamVolume(0); - } - - WorldMapDecorationType.method1897(var2.musicTrackGroupId, var2.musicTrackFileId); - class319.musicSongs.remove(var2); - } - } - } catch (Exception var4) { - class190.RunException_sendStackTrace((String)null, var4); - this.method2170(var4.getMessage()); - class319.musicSongs.clear(); - return true; - } - } - - return true; - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)V", - garbageValue = "25" - ) - public static void method2159(Applet var0, String var1) { - class31.field83 = var0; - if (var1 != null) { - class31.field84 = var1; - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class418.java b/osrs/src/main/java/class418.java deleted file mode 100644 index 03eb4318a..000000000 --- a/osrs/src/main/java/class418.java +++ /dev/null @@ -1,51 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Iterator; - -@ObfuscatedName("qw") -public class class418 extends SongTask { - @ObfuscatedSignature( - descriptor = "(Lqm;)V" - ) - public class418(SongTask var1) { - super(var1); - super.field3753 = "StartSongTask"; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-90" - ) - @Export("vmethod2142") - public boolean vmethod2142() { - Iterator var1 = class319.musicSongs.iterator(); - - while (var1.hasNext()) { - MusicSong var2 = (MusicSong)var1.next(); - if (var2 != null && !var2.field2884 && var2.midiPcmStream != null) { - try { - var2.midiPcmStream.method1665(); - var2.midiPcmStream.setPcmStreamVolume(0); - if (var2.field2892 != null) { - var2.midiPcmStream.setMusicTrack(var2.field2892, var2.musicTrackBoolean); - } - - var2.field2892 = null; - var2.field2883 = null; - var2.musicTrackArchive = null; - var2.field2884 = true; - } catch (Exception var4) { - class190.RunException_sendStackTrace((String)null, var4); - this.method2170(var4.getMessage()); - return true; - } - } - } - - super.field3752 = true; - return true; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class420.java b/osrs/src/main/java/class420.java new file mode 100644 index 000000000..fd6089359 --- /dev/null +++ b/osrs/src/main/java/class420.java @@ -0,0 +1,93 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("qo") +public class class420 extends SongTask { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lol;" + ) + AbstractArchive field3762; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lol;" + ) + AbstractArchive field3761; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lol;" + ) + AbstractArchive field3760; + + @ObfuscatedSignature( + descriptor = "(Lql;Lol;Lol;Lol;)V" + ) + public class420(SongTask var1, AbstractArchive var2, AbstractArchive var3, AbstractArchive var4) { + super(var1); + this.field3762 = var2; + this.field3761 = var3; + this.field3760 = var4; + super.field3756 = "LoadSongTask"; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-799935345" + ) + @Export("vmethod2142") + public boolean vmethod2142() { + int var1 = 0; + Iterator var2 = class316.musicSongs.iterator(); + + while (true) { + while (var2.hasNext()) { + MusicSong var3 = (MusicSong)var2.next(); + if (var3 != null && var3.midiPcmStream.field2830 > 1 && var3.midiPcmStream.method1661()) { + this.method2160("Attempted to load patches of already loading midiplayer!"); + return true; + } + + if (var3 != null && !var3.field2882) { + try { + if (var3.musicTrackArchive != null && var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { + if (var3.field2891 == null) { + var3.field2891 = MusicTrack.readTrack(var3.musicTrackArchive, var3.musicTrackGroupId, var3.musicTrackFileId); + if (var3.field2891 == null) { + continue; + } + } + + if (var3.field2881 == null) { + var3.field2881 = new SoundCache(this.field3760, this.field3761); + } + + if (var3.midiPcmStream.method1654(var3.field2891, this.field3762, var3.field2881)) { + ++var1; + var3.field2882 = true; + var3.midiPcmStream.method1655(); + } + } else { + ++var1; + } + } catch (Exception var5) { + GrandExchangeOfferWorldComparator.RunException_sendStackTrace((String)null, var5); + this.method2160(var5.getMessage()); + return true; + } + } else { + ++var1; + } + } + + if (var1 == class316.musicSongs.size()) { + return true; + } + + return false; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class424.java b/osrs/src/main/java/class421.java similarity index 91% rename from osrs/src/main/java/class424.java rename to osrs/src/main/java/class421.java index 1edf8e75c..599972648 100644 --- a/osrs/src/main/java/class424.java +++ b/osrs/src/main/java/class421.java @@ -3,9 +3,9 @@ import java.util.Random; -@ObfuscatedName("qn") -public class class424 { - @ObfuscatedName("ac") +@ObfuscatedName("qp") +public class class421 { + @ObfuscatedName("at") @Export("writeRandomDat") public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { if (var2 == var0) { @@ -53,7 +53,7 @@ public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, } - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { @@ -71,8 +71,8 @@ public static void clearIntArray(int[] var0, int var1, int var2) { } - @ObfuscatedName("ag") - public static void method2177(int[] var0, int var1, int var2, int var3) { + @ObfuscatedName("ap") + public static void method2166(int[] var0, int var1, int var2, int var3) { if (var2 == 0 && var3 == 0) { var2 = (int)(Math.random() * 2.147483647E9D); var3 = (int)(Math.random() * 2.147483647E9D); diff --git a/osrs/src/main/java/class422.java b/osrs/src/main/java/class422.java new file mode 100644 index 000000000..94a67bf89 --- /dev/null +++ b/osrs/src/main/java/class422.java @@ -0,0 +1,300 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qy") +public class class422 { + @ObfuscatedName("ab") + static int field3763; + @ObfuscatedName("at") + int field3767; + @ObfuscatedName("ah") + int field3764; + @ObfuscatedName("ar") + int field3766; + @ObfuscatedName("ao") + int field3765; + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + boolean var1 = true; + int var2 = 10 - Integer.toString(this.field3767).length(); + int var3 = 10 - Integer.toString(this.field3766).length(); + int var4 = 10 - Integer.toString(this.field3764).length(); + String var5 = " ".substring(10 - var2); + String var6 = " ".substring(10 - var3); + String var7 = " ".substring(10 - var4); + return " Size: " + this.field3767 + var5 + "Created: " + this.field3764 + var7 + "Total used: " + this.field3766 + var6 + "Max-In-Use: " + this.field3765; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "([I[IIII)V", + garbageValue = "-2144991667" + ) + public static void method2167(int[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + int var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + int var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + int var8 = var6 == Integer.MAX_VALUE ? 0 : 1; + + for (int var9 = var2; var9 < var3; ++var9) { + if (var0[var9] < (var9 & var8) + var6) { + int var10 = var0[var9]; + var0[var9] = var0[var5]; + var0[var5] = var10; + int var11 = var1[var9]; + var1[var9] = var1[var5]; + var1[var5++] = var11; + } + } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + method2167(var0, var1, var2, var5 - 1); + method2167(var0, var1, var5 + 1, var3); + } + + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "1334389960" + ) + static int method2168(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == 4000) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 + var4; + return 1; + } else if (var0 == 4001) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == 4002) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 * var3; + return 1; + } else if (var0 == 4003) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == 4004) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == 4005) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; + } else { + int var5; + int var6; + int var7; + if (var0 == 4006) { + DbTableType.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); + return 1; + } else if (var0 == 4007) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; + return 1; + } else if (var0 == 4008) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == 4009) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == 4010) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == 4011) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == 4012) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); + } + + return 1; + } else if (var0 == 4013) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + switch(var4) { + case 0: + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; + case 1: + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3; + break; + case 2: + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; + case 3: + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + break; + case 4: + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + break; + default: + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); + } + + return 1; + } + } else if (var0 == 4014) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 & var4; + return 1; + } else if (var0 == 4015) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 | var4; + return 1; + } else if (var0 == 4016) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 < var4 ? var3 : var4; + return 1; + } else if (var0 == 4017) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 > var4 ? var3 : var4; + return 1; + } else if (var0 == 4018) { + DbTableType.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); + return 1; + } else if (var0 == 4025) { + var3 = UserComparator4.method665(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == 4026) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; + return 1; + } else if (var0 == 4027) { + DbTableType.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class197.method976(var3, var4, var5); + return 1; + } else if (var0 == 4028) { + DbTableType.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class93.method500(var3, var4, var5); + return 1; + } else if (var0 == 4029) { + DbTableType.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var6 = 31 - var5; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; + return 1; + } else if (var0 == 4030) { + DbTableType.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + var3 = class93.method500(var3, var5, var6); + var7 = class214.method1092(var6 - var5 + 1); + if (var4 > var7) { + var4 = var7; + } + + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 | var4 << var5; + return 1; + } else if (var0 == 4032) { + Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1] = class174.method884(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4033) { + Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1] = class195.method973(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4034) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = PacketBufferNode.method1635(var3, var4); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var5; + return 1; + } else if (var0 == 4035) { + Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4036) { + String var15 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; + var4 = -1; + if (ClientPacket.isNumber(var15)) { + var4 = Huffman.method1888(var15); + } + + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4; + return 1; + } else { + return 2; + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class423.java b/osrs/src/main/java/class423.java deleted file mode 100644 index 68a5eade1..000000000 --- a/osrs/src/main/java/class423.java +++ /dev/null @@ -1,93 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Iterator; - -@ObfuscatedName("ql") -public class class423 extends SongTask { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - AbstractArchive field3758; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - AbstractArchive field3759; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - AbstractArchive field3757; - - @ObfuscatedSignature( - descriptor = "(Lqm;Lom;Lom;Lom;)V" - ) - public class423(SongTask var1, AbstractArchive var2, AbstractArchive var3, AbstractArchive var4) { - super(var1); - this.field3758 = var2; - this.field3759 = var3; - this.field3757 = var4; - super.field3753 = "LoadSongTask"; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-90" - ) - @Export("vmethod2142") - public boolean vmethod2142() { - int var1 = 0; - Iterator var2 = class319.musicSongs.iterator(); - - while (true) { - while (var2.hasNext()) { - MusicSong var3 = (MusicSong)var2.next(); - if (var3 != null && var3.midiPcmStream.field2833 > 1 && var3.midiPcmStream.method1670()) { - this.method2170("Attempted to load patches of already loading midiplayer!"); - return true; - } - - if (var3 != null && !var3.field2887) { - try { - if (var3.musicTrackArchive != null && var3.musicTrackGroupId != -1 && var3.musicTrackFileId != -1) { - if (var3.field2892 == null) { - var3.field2892 = MusicTrack.readTrack(var3.musicTrackArchive, var3.musicTrackGroupId, var3.musicTrackFileId); - if (var3.field2892 == null) { - continue; - } - } - - if (var3.field2883 == null) { - var3.field2883 = new SoundCache(this.field3757, this.field3759); - } - - if (var3.midiPcmStream.method1663(var3.field2892, this.field3758, var3.field2883)) { - ++var1; - var3.field2887 = true; - var3.midiPcmStream.method1664(); - } - } else { - ++var1; - } - } catch (Exception var5) { - class190.RunException_sendStackTrace((String)null, var5); - this.method2170(var5.getMessage()); - return true; - } - } else { - ++var1; - } - } - - if (var1 == class319.musicSongs.size()) { - return true; - } - - return false; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class425.java b/osrs/src/main/java/class425.java deleted file mode 100644 index 2605a8d69..000000000 --- a/osrs/src/main/java/class425.java +++ /dev/null @@ -1,41 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("qj") -public class class425 { - @ObfuscatedName("au") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("ac") - int field3761; - @ObfuscatedName("al") - int field3763; - @ObfuscatedName("ak") - int field3762; - @ObfuscatedName("ax") - int field3764; - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - boolean var1 = true; - int var2 = 10 - Integer.toString(this.field3761).length(); - int var3 = 10 - Integer.toString(this.field3762).length(); - int var4 = 10 - Integer.toString(this.field3763).length(); - String var5 = " ".substring(10 - var2); - String var6 = " ".substring(10 - var3); - String var7 = " ".substring(10 - var4); - return " Size: " + this.field3761 + var5 + "Created: " + this.field3763 + var7 + "Total used: " + this.field3762 + var6 + "Max-In-Use: " + this.field3764; - } - - @ObfuscatedName("ox") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-921532851" - ) - static void method2178() { - Client.packetWriter.addNode(ClanChannelMember.getPacketBufferNode(ClientPacket.FREECAM_EXIT, Client.packetWriter.isaacCipher)); - Client.oculusOrbState = 0; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class426.java b/osrs/src/main/java/class426.java new file mode 100644 index 000000000..cf56bbd3d --- /dev/null +++ b/osrs/src/main/java/class426.java @@ -0,0 +1,95 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qj") +public class class426 { + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "777593325" + ) + static int method2177(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + } else { + var3 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + } + + class159.invalidateWidget(var3); + int var4; + int var5; + if (var0 != 1200 && var0 != 1205 && var0 != 1212) { + if (var0 == 1201) { + var3.modelType = 2; + var3.modelId = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + return 1; + } else if (var0 == 1202) { + var3.modelType = 3; + var3.modelId = class229.localPlayer.appearance.getChatHeadId(); + return 1; + } else if (var0 == 1207) { + boolean var7 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize] == 1; + class18.method70(var3, class229.localPlayer.appearance, var7); + return 1; + } else if (var0 == 1208) { + var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var3.field3125 == null) { + throw new RuntimeException(""); + } else { + AbstractWorldMapData.method1323(var3, var4); + return 1; + } + } else if (var0 == 1209) { + DbTableType.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + if (var3.field3125 == null) { + throw new RuntimeException(""); + } else { + ZoneOperation.method1633(var3, var4, var5); + return 1; + } + } else if (var0 == 1210) { + var4 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var3.field3125 == null) { + throw new RuntimeException(""); + } else { + class302.method1626(var3, class229.localPlayer.appearance.field2947, var4); + return 1; + } + } else { + return 2; + } + } else { + DbTableType.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemComposition var6 = class214.ItemDefinition_get(var4); + var3.modelAngleX = var6.xan2d; + var3.modelAngleY = var6.yan2d; + var3.modelAngleZ = var6.zan2d; + var3.modelOffsetX = var6.offsetX2d; + var3.modelOffsetY = var6.offsetY2d; + var3.modelZoom = var6.zoom2d; + if (var0 == 1205) { + var3.itemQuantityMode = 0; + } else if (var0 == 1212 | 1 == var6.isStackable) { + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; + } + + if (var3.modelRotation > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.modelRotation; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class427.java b/osrs/src/main/java/class427.java index 05715a4b5..23ae8d345 100644 --- a/osrs/src/main/java/class427.java +++ b/osrs/src/main/java/class427.java @@ -1,41 +1,38 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qt") +@ObfuscatedName("qw") public class class427 { - @ObfuscatedName("jc") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "-1086858940" + descriptor = "([BIIII[Liw;I)V", + garbageValue = "-294639369" ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { - byte var2 = 4; - int var3 = var2 + 6; - int var4 = var2 + 6; - int var5 = UserComparator6.fontPlain12.lineWidth(var0, 250); - int var6 = UserComparator6.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 16777215); - UserComparator6.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - class19.method69(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2); - if (var1) { - class223.rasterProvider.drawFull(0, 0); - } else { - int var7 = var3; - int var8 = var4; - int var9 = var5; - int var10 = var6; - - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { - Client.field407[var11] = true; + static final void method2178(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var7; + int var8; + for (int var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 64; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { + int[] var10000 = var5[var6].flags[var7 + var1]; + var10000[var8 + var2] &= -16777217; } } } + } + + Buffer var12 = new Buffer(var0); + for (var7 = 0; var7 < 4; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + for (int var9 = 0; var9 < 64; ++var9) { + int var10 = var8 + var1; + int var11 = var9 + var2; + class14.loadTerrain(var12, var7, var10, var11, var3 + var10, var11 + var4, 0); + } + } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class428.java b/osrs/src/main/java/class428.java new file mode 100644 index 000000000..618a8cecc --- /dev/null +++ b/osrs/src/main/java/class428.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("qg") +public class class428 { + @ObfuscatedName("or") + @Export("menuWidth") + static int menuWidth; +} \ No newline at end of file diff --git a/osrs/src/main/java/class429.java b/osrs/src/main/java/class429.java deleted file mode 100644 index 405eb2610..000000000 --- a/osrs/src/main/java/class429.java +++ /dev/null @@ -1,34 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("qr") -public class class429 { - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1179877011" - ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - if (!class159.client.method357() && !class159.client.method359() && !class159.client.method358()) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - GameEngine.method166(2); - if (var0) { - Login.Login_password = ""; - } - - class188.method955(); - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - - } else { - GameEngine.method166(10); - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class430.java b/osrs/src/main/java/class430.java index 4e6bf120c..05f34c928 100644 --- a/osrs/src/main/java/class430.java +++ b/osrs/src/main/java/class430.java @@ -1,63 +1,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qh") +@ObfuscatedName("qr") public class class430 { - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "-12" + descriptor = "Lqr;" ) - public static String method2190(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - int var5 = var1; + static final class430 field3795; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lqr;" + ) + static final class430 field3794; + @ObfuscatedName("ar") + final String field3796; - int var8; - for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { - int var7 = var0[var5++] & 255; - if (var7 < 128) { - if (var7 == 0) { - var8 = 65533; - } else { - var8 = var7; - } - } else if (var7 < 192) { - var8 = 65533; - } else if (var7 < 224) { - if (var5 < var6 && (var0[var5] & 192) == 128) { - var8 = (var7 & 31) << 6 | var0[var5++] & 63; - if (var8 < 128) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 240) { - if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { - var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 < 2048) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 248) { - if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { - var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 >= 65536 && var8 <= 1114111) { - var8 = 65533; - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } - } + static { + field3795 = new class430("Basic"); + field3794 = new class430("Bearer"); + } - return new String(var3, 0, var4); + class430(String var1) { + this.field3796 = var1; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1414159306" + ) + String method2179() { + return this.field3796; } } \ No newline at end of file diff --git a/osrs/src/main/java/class431.java b/osrs/src/main/java/class431.java new file mode 100644 index 000000000..282a34c7a --- /dev/null +++ b/osrs/src/main/java/class431.java @@ -0,0 +1,178 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import javax.net.ssl.HttpsURLConnection; +import java.text.DecimalFormat; +import java.util.*; +import java.util.Map.Entry; + +@ObfuscatedName("qf") +public class class431 { + @ObfuscatedName("ao") + final Map field3799; + @ObfuscatedName("ab") + final Map field3798; + @ObfuscatedName("au") + final DecimalFormat field3797; + + public class431() { + this.field3799 = new HashMap(); + this.field3798 = new HashMap(); + this.field3797 = new DecimalFormat(); + this.field3797.setMaximumFractionDigits(2); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljavax/net/ssl/HttpsURLConnection;I)V", + garbageValue = "514712825" + ) + public void method2180(HttpsURLConnection var1) { + Iterator var2 = this.field3799.entrySet().iterator(); + + while (var2.hasNext()) { + Entry var3 = (Entry)var2.next(); + var1.setRequestProperty((String)var3.getKey(), (String)var3.getValue()); + } + + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/Map;", + garbageValue = "289317846" + ) + public Map method2181() { + return this.field3799; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-1068565867" + ) + public void method2182(String var1, String var2) { + if (var1 != null && !var1.isEmpty()) { + this.field3799.put(var1, var2 != null ? var2 : ""); + } + + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "90" + ) + public void method2183(String var1) { + if (var1 != null && !var1.isEmpty()) { + this.field3799.remove(var1); + } + + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Lqr;Ljava/lang/String;I)V", + garbageValue = "-1582767971" + ) + void method2184(class430 var1, String var2) { + String var3 = String.format("%s %s", var1.method2179(), var2); + this.method2182("Authorization", var3); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;S)V", + garbageValue = "1431" + ) + public void method2185(String var1) { + this.method2184(class430.field3795, var1); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1155653800" + ) + public void method2186(String var1) { + this.method2184(class430.field3794, var1); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lsi;B)V", + garbageValue = "-85" + ) + public void method2187(class472 var1) { + this.field3799.put("Content-Type", var1.method2348()); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "37" + ) + public void method2188() { + this.field3799.remove("Content-Type"); + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Lsi;B)V", + garbageValue = "4" + ) + public void method2189(class472 var1) { + this.method2190(var1, 1.0F); + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(Lsi;FI)V", + garbageValue = "-974878647" + ) + void method2190(class472 var1, float var2) { + this.field3798.put(var1, Math.max(0.0F, Math.min(1.0F, var2))); + this.method2191(); + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1694240959" + ) + void method2191() { + this.field3799.remove("Accept"); + if (!this.field3798.isEmpty()) { + this.field3799.put("Accept", this.method2192()); + } + + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1880009483" + ) + String method2192() { + ArrayList var1 = new ArrayList(this.field3798.entrySet()); + Collections.sort(var1, new class432(this)); + StringBuilder var2 = new StringBuilder(); + Iterator var3 = var1.iterator(); + + while (var3.hasNext()) { + Entry var4 = (Entry)var3.next(); + if (var2.length() > 0) { + var2.append(","); + } + + var2.append(((class472)var4.getKey()).method2348()); + float var5 = (Float)var4.getValue(); + if (var5 < 1.0F) { + String var6 = this.field3797.format((double)var5); + var2.append(";q=").append(var6); + } + } + + return var2.toString(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class432.java b/osrs/src/main/java/class432.java index 4a5009e37..183cf5732 100644 --- a/osrs/src/main/java/class432.java +++ b/osrs/src/main/java/class432.java @@ -2,563 +2,50 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qy") -public class class432 { - @ObfuscatedName("al") +import java.util.Comparator; +import java.util.Map.Entry; + +@ObfuscatedName("qx") +class class432 implements Comparator { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IB)Lng;", - garbageValue = "-17" + descriptor = "Lol;" ) - public static GameBuild method2191(int var0) { - GameBuild[] var1 = class209.method1031(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - GameBuild var3 = var1[var2]; - if (var0 == var3.buildId) { - return var3; - } - } - - return null; - } - - @ObfuscatedName("ak") + @Export("WorldMapElement_archive") + public static AbstractArchive WorldMapElement_archive; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Lte;I)Ljava/lang/String;", - garbageValue = "1990083355" + descriptor = "Lqf;" ) - public static String method2192(CharSequence var0, LoginType var1) { - if (var0 == null) { - return null; - } else { - int var2 = 0; - - int var3; - for (var3 = var0.length(); var2 < var3 && DevicePcmPlayerProvider.method82(var0.charAt(var2)); ++var2) { - } - - while (var3 > var2 && DevicePcmPlayerProvider.method82(var0.charAt(var3 - 1))) { - --var3; - } - - int var4 = var3 - var2; - if (var4 >= 1) { - byte var6; - if (var1 == null) { - var6 = 12; - } else { - switch(var1.field4106) { - case 8: - var6 = 20; - break; - default: - var6 = 12; - } - } - - if (var4 <= var6) { - StringBuilder var10 = new StringBuilder(var4); + @Export("this$0") + @ObfuscatedName("this$0") + final class431 this$0; - for (int var11 = var2; var11 < var3; ++var11) { - char var7 = var0.charAt(var11); - if (class410.method2108(var7)) { - char var8; - switch(var7) { - case ' ': - case '-': - case '_': - case '\u00a0': - var8 = '_'; - break; - case '#': - case '[': - case ']': - var8 = var7; - break; - case '\u00c0': - case '\u00c1': - case '\u00c2': - case '\u00c3': - case '\u00c4': - case '\u00e0': - case '\u00e1': - case '\u00e2': - case '\u00e3': - case '\u00e4': - var8 = 'a'; - break; - case '\u00c7': - case '\u00e7': - var8 = 'c'; - break; - case '\u00c8': - case '\u00c9': - case '\u00ca': - case '\u00cb': - case '\u00e8': - case '\u00e9': - case '\u00ea': - case '\u00eb': - var8 = 'e'; - break; - case '\u00cd': - case '\u00ce': - case '\u00cf': - case '\u00ed': - case '\u00ee': - case '\u00ef': - var8 = 'i'; - break; - case '\u00d1': - case '\u00f1': - var8 = 'n'; - break; - case '\u00d2': - case '\u00d3': - case '\u00d4': - case '\u00d5': - case '\u00d6': - case '\u00f2': - case '\u00f3': - case '\u00f4': - case '\u00f5': - case '\u00f6': - var8 = 'o'; - break; - case '\u00d9': - case '\u00da': - case '\u00db': - case '\u00dc': - case '\u00f9': - case '\u00fa': - case '\u00fb': - case '\u00fc': - var8 = 'u'; - break; - case '\u00df': - var8 = 'b'; - break; - case '\u00ff': - case '\u0178': - var8 = 'y'; - break; - default: - var8 = Character.toLowerCase(var7); - } - - if (var8 != 0) { - var10.append(var8); - } - } - } - - if (var10.length() == 0) { - return null; - } - - return var10.toString(); - } - } - - return null; - } - } - - @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1639340549" + descriptor = "(Lqf;)V" ) - static final int method2193(int var0, int var1, int var2) { - int var3 = var0 / var2; - int var4 = var0 & var2 - 1; - int var5 = var1 / var2; - int var6 = var1 & var2 - 1; - int var7 = Login.method433(var3, var5); - int var8 = Login.method433(var3 + 1, var5); - int var9 = Login.method433(var3, var5 + 1); - int var10 = Login.method433(var3 + 1, var5 + 1); - int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; - int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); - int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; - int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); - int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; - int var15 = ((65536 - var16) * var11 >> 16) + (var16 * var13 >> 16); - return var15; + class432(class431 var1) { + this.this$0 = var1; } - @ObfuscatedName("jw") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-2048863537" + descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;I)I", + garbageValue = "-2140651191" ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - if (TextureProvider.localPlayer.x >> 7 == Client.destinationX && TextureProvider.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - if (Client.field388) { - class199.addPlayerToScene(TextureProvider.localPlayer, false); - } - - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - class199.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); - } - - TileItem.addNpcsToScene(true); - WorldMapArchiveLoader.method2420(); - TileItem.addNpcsToScene(false); - class471.method2366(); - - for (GraphicsObject var4 = (GraphicsObject)Client.graphicsObjects.last(); var4 != null; var4 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var4.plane == class87.Client_plane && !var4.isFinished) { - if (Client.cycle >= var4.cycleStart) { - var4.advance(Client.field460); - if (var4.isFinished) { - var4.remove(); - } else { - class10.scene.drawEntity(var4.plane, var4.x, var4.y, var4.z, 60, var4, 0, -1L, false); - } - } - } else { - var4.remove(); - } - } - - class53.setViewportShape(var0, var1, var2, var3, true); - var0 = Client.viewportOffsetX; - var1 = Client.viewportOffsetY; - var2 = Client.viewportWidth; - var3 = Client.viewportHeight; - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - Rasterizer3D.method1248(); - Rasterizer2D.method2682(); - int var37 = Client.camAngleX; - if (Client.field476 / 256 > var37) { - var37 = Client.field476 / 256; - } - - if (Client.cameraShaking[4] && Client.cameraMoveIntensity[4] + 128 > var37) { - var37 = Client.cameraMoveIntensity[4] + 128; - } - - int var5 = Client.camAngleY & 2047; - int var6 = ChatChannel.oculusOrbFocalPointX; - int var7 = class433.field3789; - int var8 = AbstractWorldMapData.oculusOrbFocalPointY; - int var9 = var37 * 3 + 600; - int var12 = var3 - 334; - if (var12 < 0) { - var12 = 0; - } else if (var12 > 100) { - var12 = 100; - } - - int var13 = (Client.zoomWidth - Client.zoomHeight) * var12 / 100 + Client.zoomHeight; - int var11 = var13 * var9 / 256; - var12 = 2048 - var37 & 2047; - var13 = 2048 - var5 & 2047; - int var14 = 0; - int var15 = 0; - int var16 = var11; - int var17; - int var18; - int var19; - if (var12 != 0) { - var17 = Rasterizer3D.Rasterizer3D_sine[var12]; - var18 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var19 = var18 * var15 - var17 * var11 >> 16; - var16 = var18 * var11 + var15 * var17 >> 16; - var15 = var19; - } - - if (var13 != 0) { - var17 = Rasterizer3D.Rasterizer3D_sine[var13]; - var18 = Rasterizer3D.Rasterizer3D_cosine[var13]; - var19 = var17 * var16 + var14 * var18 >> 16; - var16 = var18 * var16 - var14 * var17 >> 16; - var14 = var19; - } - - if (Client.isCameraLocked) { - AbstractUserComparator.field3834 = var6 - var14; - TriBool.field3849 = var7 - var15; - JagexCache.field1450 = var8 - var16; - class14.field36 = var37; - GrandExchangeOfferOwnWorldComparator.field360 = var5; - } else { - Client.cameraX = var6 - var14; - class17.cameraY = var7 - var15; - WorldMapArea.cameraZ = var8 - var16; - class365.cameraPitch = var37; - WallDecoration.cameraYaw = var5; - } - - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (ChatChannel.oculusOrbFocalPointX >> 7 != TextureProvider.localPlayer.x >> 7 || AbstractWorldMapData.oculusOrbFocalPointY >> 7 != TextureProvider.localPlayer.y >> 7)) { - var17 = TextureProvider.localPlayer.plane; - var18 = (ChatChannel.oculusOrbFocalPointX >> 7) + class20.baseX; - var19 = (AbstractWorldMapData.oculusOrbFocalPointY >> 7) + class19.baseY; - PacketBufferNode var20 = ClanChannelMember.getPacketBufferNode(ClientPacket.f20, Client.packetWriter.isaacCipher); - var20.packetBuffer.writeShortAddLE(var18); - var20.packetBuffer.writeShortLE(var19); - var20.packetBuffer.writeInt(Client.field366); - var20.packetBuffer.writeByteAdd(var17); - Client.packetWriter.addNode(var20); - } - - if (!Client.isCameraLocked) { - var11 = class136.method731(); - } else { - var11 = class232.method1196(); - } - - var12 = Client.cameraX; - var13 = class17.cameraY; - var14 = WorldMapArea.cameraZ; - var15 = class365.cameraPitch; - var16 = WallDecoration.cameraYaw; - - for (var17 = 0; var17 < 5; ++var17) { - if (Client.cameraShaking[var17]) { - var18 = (int)(Math.random() * (double)(Client.cameraShakeIntensity[var17] * 2 + 1) - (double)Client.cameraShakeIntensity[var17] + Math.sin((double)Client.cameraShakeCycle[var17] * ((double)Client.cameraShakeSpeed[var17] / 100.0D)) * (double)Client.cameraMoveIntensity[var17]); - if (var17 == 0) { - Client.cameraX += var18; - } - - if (var17 == 1) { - class17.cameraY += var18; - } - - if (var17 == 2) { - WorldMapArea.cameraZ += var18; - } - - if (var17 == 3) { - WallDecoration.cameraYaw = var18 + WallDecoration.cameraYaw & 2047; - } - - if (var17 == 4) { - class365.cameraPitch += var18; - if (class365.cameraPitch < 128) { - class365.cameraPitch = 128; - } - - if (class365.cameraPitch > 383) { - class365.cameraPitch = 383; - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var17 = MouseHandler.MouseHandler_lastPressedX; - var18 = MouseHandler.MouseHandler_lastPressedY; - } - - if (var17 >= var0 && var17 < var0 + var2 && var18 >= var1 && var18 < var3 + var1) { - class16.method53(var17 - var0, var18 - var1); - } else { - SpotAnimationDefinition.method1038(); - } - - class313.method1648(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class313.method1648(); - var19 = Rasterizer3D.get3dZoom(); - Rasterizer3D.method1234(class159.client.field121); - Rasterizer3D.clips.field2290 = Client.viewportZoom; - class10.scene.draw(Client.cameraX, class17.cameraY, WorldMapArea.cameraZ, class365.cameraPitch, WallDecoration.cameraYaw, var11); - Rasterizer3D.method1234(false); - if (Client.renderSelf) { - Rasterizer2D.method2683(); - } - - Rasterizer3D.clips.field2290 = var19; - class313.method1648(); - class10.scene.clearTempGameObjects(); - Client.overheadTextLimit = 0; - boolean var38 = false; - int var21 = -1; - int var22 = -1; - int var23 = Players.Players_count; - int[] var24 = Players.Players_indices; - - int var25; - for (var25 = 0; var25 < var23 + Client.npcCount; ++var25) { - Object var26; - if (var25 < var23) { - var26 = Client.players[var24[var25]]; - if (var24[var25] == Client.combatTargetPlayerIndex) { - var38 = true; - var21 = var25; - continue; - } - - if (var26 == TextureProvider.localPlayer) { - var22 = var25; - continue; - } - } else { - var26 = Client.npcs[Client.npcIndices[var25 - var23]]; - } - - class232.drawActor2d((Actor)var26, var25, var0, var1, var2, var3); - } - - if (Client.field388 && var22 != -1) { - class232.drawActor2d(TextureProvider.localPlayer, var22, var0, var1, var2, var3); - } - - if (var38) { - class232.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var21, var0, var1, var2, var3); - } - - for (var25 = 0; var25 < Client.overheadTextLimit; ++var25) { - int var39 = Client.overheadTextXs[var25]; - int var27 = Client.overheadTextYs[var25]; - int var28 = Client.overheadTextXOffsets[var25]; - int var29 = Client.overheadTextAscents[var25]; - boolean var30 = true; - - while (var30) { - var30 = false; - - for (int var31 = 0; var31 < var25; ++var31) { - if (var27 + 2 > Client.overheadTextYs[var31] - Client.overheadTextAscents[var31] && var27 - var29 < Client.overheadTextYs[var31] + 2 && var39 - var28 < Client.overheadTextXOffsets[var31] + Client.overheadTextXs[var31] && var28 + var39 > Client.overheadTextXs[var31] - Client.overheadTextXOffsets[var31] && Client.overheadTextYs[var31] - Client.overheadTextAscents[var31] < var27) { - var27 = Client.overheadTextYs[var31] - Client.overheadTextAscents[var31]; - var30 = true; - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var25]; - Client.viewportTempY = Client.overheadTextYs[var25] = var27; - String var40 = Client.field602[var25]; - if (Client.chatEffects == 0) { - int var32 = 16776960; - if (Client.overheadTextColors[var25] < 6) { - var32 = Client.field580[Client.overheadTextColors[var25]]; - } - - if (Client.overheadTextColors[var25] == 6) { - var32 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var25] == 7) { - var32 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var25] == 8) { - var32 = Client.viewportDrawCount % 20 < 10 ? '\ub000' : 8454016; - } - - int var33; - if (Client.overheadTextColors[var25] == 9) { - var33 = 150 - Client.overheadTextCyclesRemaining[var25]; - if (var33 < 50) { - var32 = var33 * 1280 + 16711680; - } else if (var33 < 100) { - var32 = 16776960 - (var33 - 50) * 327680; - } else if (var33 < 150) { - var32 = (var33 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var25] == 10) { - var33 = 150 - Client.overheadTextCyclesRemaining[var25]; - if (var33 < 50) { - var32 = var33 * 5 + 16711680; - } else if (var33 < 100) { - var32 = 16711935 - (var33 - 50) * 327680; - } else if (var33 < 150) { - var32 = (var33 - 100) * 327680 + 255 - (var33 - 100) * 5; - } - } - - if (Client.overheadTextColors[var25] == 11) { - var33 = 150 - Client.overheadTextCyclesRemaining[var25]; - if (var33 < 50) { - var32 = 16777215 - var33 * 327685; - } else if (var33 < 100) { - var32 = (var33 - 50) * 327685 + 65280; - } else if (var33 < 150) { - var32 = 16777215 - (var33 - 100) * 327680; - } - } - - int var34; - if (Client.overheadTextColors[var25] == 12 && Client.field595[var25] == null) { - var33 = var40.length(); - Client.field595[var25] = new int[var33]; - - for (var34 = 0; var34 < var33; ++var34) { - int var35 = (int)(64.0F * ((float)var34 / (float)var33)); - int var36 = var35 << 10 | 896 | 64; - Client.field595[var25][var34] = class481.field3942[var36]; - } - } - - if (Client.overheadTextEffects[var25] == 0) { - SoundCache.fontBold12.method2130(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var32, 0, Client.field595[var25]); - } - - if (Client.overheadTextEffects[var25] == 1) { - SoundCache.fontBold12.method2127(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var32, 0, Client.viewportDrawCount, Client.field595[var25]); - } - - if (Client.overheadTextEffects[var25] == 2) { - SoundCache.fontBold12.method2128(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var32, 0, Client.viewportDrawCount, Client.field595[var25]); - } - - if (Client.overheadTextEffects[var25] == 3) { - SoundCache.fontBold12.method2129(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, var32, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var25], Client.field595[var25]); - } - - if (Client.overheadTextEffects[var25] == 4) { - var33 = (150 - Client.overheadTextCyclesRemaining[var25]) * (SoundCache.fontBold12.stringWidth(var40) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - SoundCache.fontBold12.method2131(var40, var0 + Client.viewportTempX + 50 - var33, Client.viewportTempY + var1, var32, 0, Client.field595[var25]); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - - if (Client.overheadTextEffects[var25] == 5) { - var33 = 150 - Client.overheadTextCyclesRemaining[var25]; - var34 = 0; - if (var33 < 25) { - var34 = var33 - 25; - } else if (var33 > 125) { - var34 = var33 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - SoundCache.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - SoundCache.fontBold12.method2130(var40, var0 + Client.viewportTempX, var34 + Client.viewportTempY + var1, var32, 0, Client.field595[var25]); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - SoundCache.fontBold12.drawCentered(var40, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); - } - } - - HealthBarDefinition.method991(var0, var1); - ((TextureProvider)Rasterizer3D.clips.Rasterizer3D_textureLoader).animate(Client.field460); - ConcurrentMidiTask.method2173(); - Client.cameraX = var12; - class17.cameraY = var13; - WorldMapArea.cameraZ = var14; - class365.cameraPitch = var15; - WallDecoration.cameraYaw = var16; - if (Client.isLoading && class59.field309.method1968(true, false) == 0) { - Client.isLoading = false; - } + int method2193(Entry var1, Entry var2) { + return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); + } - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class427.drawLoadingMessage("Loading - please wait.", false); - } + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method2193((Entry)var1, (Entry)var2); + } + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); } } \ No newline at end of file diff --git a/osrs/src/main/java/class433.java b/osrs/src/main/java/class433.java index e6ccc4d19..aaf829a6f 100644 --- a/osrs/src/main/java/class433.java +++ b/osrs/src/main/java/class433.java @@ -1,38 +1,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qf") +@ObfuscatedName("qm") public class class433 { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lqf;" + descriptor = "Lqm;" ) - static final class433 field3790; - @ObfuscatedName("al") + public static final class433 field3801; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lqf;" + descriptor = "Lqm;" ) - static final class433 field3791; - @ObfuscatedName("lw") - static int field3789; - @ObfuscatedName("ak") - final String field3792; + static final class433 field3802; + @ObfuscatedName("ar") + final int field3803; static { - field3790 = new class433("Basic"); - field3791 = new class433("Bearer"); + field3801 = new class433(1); + field3802 = new class433(0); } - class433(String var1) { - this.field3792 = var1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "36" - ) - String method2195() { - return this.field3792; + class433(int var1) { + this.field3803 = var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class434.java b/osrs/src/main/java/class434.java index a580673ba..8261ca105 100644 --- a/osrs/src/main/java/class434.java +++ b/osrs/src/main/java/class434.java @@ -2,184 +2,47 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import javax.net.ssl.HttpsURLConnection; -import java.text.DecimalFormat; -import java.util.*; -import java.util.Map.Entry; +import java.util.Comparator; @ObfuscatedName("qv") -public class class434 { - @ObfuscatedName("wj") +class class434 implements Comparator { + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ltu;" + descriptor = "Lqc;" ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("ax") - final Map field3796; - @ObfuscatedName("ao") - final Map field3795; - @ObfuscatedName("ah") - final DecimalFormat field3794; + @Export("this$0") + @ObfuscatedName("this$0") + final class435 this$0; - public class434() { - this.field3796 = new HashMap(); - this.field3795 = new HashMap(); - this.field3794 = new DecimalFormat(); - this.field3794.setMaximumFractionDigits(2); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljavax/net/ssl/HttpsURLConnection;B)V", - garbageValue = "69" - ) - public void method2196(HttpsURLConnection var1) { - Iterator var2 = this.field3796.entrySet().iterator(); - - while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); - var1.setRequestProperty((String)var3.getKey(), (String)var3.getValue()); - } - - } - - @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/Map;", - garbageValue = "-1436798954" + descriptor = "(Lqc;)V" ) - public Map method2197() { - return this.field3796; + class434(class435 var1) { + this.this$0 = var1; } - @ObfuscatedName("ak") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "2031585126" + descriptor = "(Lqe;Lqe;I)I", + garbageValue = "1841574446" ) - public void method2198(String var1, String var2) { - if (var1 != null && !var1.isEmpty()) { - this.field3796.put(var1, var2 != null ? var2 : ""); + int method2194(class436 var1, class436 var2) { + if (var1.field3814 > var2.field3814) { + return 1; + } else { + return var1.field3814 < var2.field3814 ? -1 : 0; } - - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-476420420" - ) - public void method2199(String var1) { - if (var1 != null && !var1.isEmpty()) { - this.field3796.remove(var1); - } - - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Lqf;Ljava/lang/String;B)V", - garbageValue = "38" - ) - void method2200(class433 var1, String var2) { - String var3 = String.format("%s %s", var1.method2195(), var2); - this.method2198("Authorization", var3); - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "696444770" - ) - public void method2201(String var1) { - this.method2200(class433.field3790, var1); - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1668239999" - ) - public void method2202(String var1) { - this.method2200(class433.field3791, var1); - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Lst;I)V", - garbageValue = "1867259345" - ) - public void method2203(class475 var1) { - this.field3796.put("Content-Type", var1.method2373()); - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "25" - ) - public void method2204() { - this.field3796.remove("Content-Type"); } - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(Lst;I)V", - garbageValue = "807760846" - ) - public void method2205(class475 var1) { - this.method2206(var1, 1.0F); + @Export("compare") + @ObfuscatedName("compare") + public int compare(Object var1, Object var2) { + return this.method2194((class436)var1, (class436)var2); } - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Lst;FI)V", - garbageValue = "1069776907" - ) - void method2206(class475 var1, float var2) { - this.field3795.put(var1, Math.max(0.0F, Math.min(1.0F, var2))); - this.method2207(); - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-118" - ) - void method2207() { - this.field3796.remove("Accept"); - if (!this.field3795.isEmpty()) { - this.field3796.put("Accept", this.method2208()); - } - - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "58" - ) - String method2208() { - ArrayList var1 = new ArrayList(this.field3795.entrySet()); - Collections.sort(var1, new class435(this)); - StringBuilder var2 = new StringBuilder(); - Iterator var3 = var1.iterator(); - - while (var3.hasNext()) { - Entry var4 = (Entry)var3.next(); - if (var2.length() > 0) { - var2.append(","); - } - - var2.append(((class475)var4.getKey()).method2373()); - float var5 = (Float)var4.getValue(); - if (var5 < 1.0F) { - String var6 = this.field3794.format((double)var5); - var2.append(";q=").append(var6); - } - } - - return var2.toString(); + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + return super.equals(var1); } } \ No newline at end of file diff --git a/osrs/src/main/java/class435.java b/osrs/src/main/java/class435.java index bc90528b7..197440848 100644 --- a/osrs/src/main/java/class435.java +++ b/osrs/src/main/java/class435.java @@ -3,43 +3,211 @@ import net.runelite.mapping.ObfuscatedSignature; import java.util.Comparator; -import java.util.Map.Entry; +import java.util.HashMap; +import java.util.Map; -@ObfuscatedName("qa") -class class435 implements Comparator { - // $FF: synthetic field +@ObfuscatedName("qc") +public final class class435 { + @ObfuscatedName("at") + final Comparator field3805; + @ObfuscatedName("ah") + final Map field3806; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lqv;" + descriptor = "Lps;" ) - @Export("this$0") - @ObfuscatedName("this$0") - final class434 this$0; + final class404 field3809; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lps;" + ) + final class404 field3808; + @ObfuscatedName("ab") + final long field3807; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lqm;" + ) + final class433 field3810; + @ObfuscatedName("aa") + final int field3804; @ObfuscatedSignature( - descriptor = "(Lqv;)V" + descriptor = "(JILqm;)V" ) - class435(class434 var1) { - this.this$0 = var1; + class435(long var1, int var3, class433 var4) { + this.field3805 = new class434(this); + this.field3807 = var1; + this.field3804 = var3; + this.field3810 = var4; + if (this.field3804 == -1) { + this.field3806 = new HashMap(64); + this.field3809 = new class404(64, this.field3805); + this.field3808 = null; + } else { + if (this.field3810 == null) { + throw new IllegalArgumentException(""); + } + + this.field3806 = new HashMap(this.field3804); + this.field3809 = new class404(this.field3804, this.field3805); + this.field3808 = new class404(this.field3804); + } + } - @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;B)I", - garbageValue = "0" + descriptor = "(ILqm;)V" ) - int method2209(Entry var1, Entry var2) { - return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); + public class435(int var1, class433 var2) { + this(-1L, var1, var2); } - @Export("compare") - @ObfuscatedName("compare") - public int compare(Object var1, Object var2) { - return this.method2209((Entry)var1, (Entry)var2); + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "2" + ) + boolean method2195() { + return this.field3804 != -1; } - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - return super.equals(var1); + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;B)Ljava/lang/Object;", + garbageValue = "122" + ) + public Object method2196(Object var1) { + synchronized(this) { + if (-1L != this.field3807) { + this.method2199(); + } + + class436 var3 = (class436)this.field3806.get(var1); + if (var3 == null) { + return null; + } else { + this.method2198(var3, false); + return var3.field3812; + } + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "1227309321" + ) + public Object method2197(Object var1, Object var2) { + synchronized(this) { + if (this.field3807 != -1L) { + this.method2199(); + } + + class436 var4 = (class436)this.field3806.get(var1); + if (var4 != null) { + Object var8 = var4.field3812; + var4.field3812 = var2; + this.method2198(var4, false); + return var8; + } else { + class436 var5; + if (this.method2195() && this.field3806.size() == this.field3804) { + var5 = (class436)this.field3808.remove(); + this.field3806.remove(var5.field3811); + this.field3809.remove(var5); + } + + var5 = new class436(var2, var1); + this.field3806.put(var1, var5); + this.method2198(var5, true); + return null; + } + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Lqe;ZB)V", + garbageValue = "14" + ) + void method2198(class436 var1, boolean var2) { + if (!var2) { + this.field3809.remove(var1); + if (this.method2195()) { + } + } + + var1.field3814 = System.currentTimeMillis(); + if (this.method2195()) { + switch(this.field3810.field3803) { + case 0: + ++var1.field3813; + break; + case 1: + var1.field3813 = var1.field3814; + } + + this.field3808.add(var1); + } + + this.field3809.add(var1); + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-704318355" + ) + void method2199() { + if (this.field3807 == -1L) { + throw new IllegalStateException(""); + } else { + long var1 = System.currentTimeMillis() - this.field3807; + + while (!this.field3809.isEmpty()) { + class436 var3 = (class436)this.field3809.peek(); + if (var3.field3814 >= var1) { + return; + } + + this.field3806.remove(var3.field3811); + this.field3809.remove(var3); + if (this.method2195()) { + this.field3808.remove(var3); + } + } + + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-189414151" + ) + @Export("clearFiles") + public void clearFiles() { + synchronized(this) { + this.field3806.clear(); + this.field3809.clear(); + if (this.method2195()) { + this.field3808.clear(); + } + + } + } + + @ObfuscatedName("in") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "12" + ) + static final void method2201() { + if (Client.field535 != ItemLayer.Client_plane) { + Client.field535 = ItemLayer.Client_plane; + WorldMapDecoration.method1330(ItemLayer.Client_plane); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class436.java b/osrs/src/main/java/class436.java index cceaab258..12e9238a5 100644 --- a/osrs/src/main/java/class436.java +++ b/osrs/src/main/java/class436.java @@ -2,166 +2,54 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qs") -public class class436 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lqs;" - ) - public static final class436 field3797; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lqs;" - ) - static final class436 field3798; - @ObfuscatedName("ak") - final int field3799; - - static { - field3797 = new class436(1); - field3798 = new class436(0); - } - - class436(int var1) { - this.field3799 = var1; +@ObfuscatedName("qe") +public final class class436 implements Comparable { + @ObfuscatedName("at") + Object field3812; + @ObfuscatedName("ah") + Object field3811; + @ObfuscatedName("ar") + long field3814; + @ObfuscatedName("ao") + long field3813; + + class436(Object var1, Object var2) { + this.field3812 = var1; + this.field3811 = var2; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "30" + descriptor = "(Lqe;I)I", + garbageValue = "1786312392" ) - @Export("addImageTag") - static String addImageTag(int var0) { - return ""; + int method2202(class436 var1) { + if (this.field3813 < var1.field3813) { + return -1; + } else { + return this.field3813 > var1.field3813 ? 1 : 0; + } } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "112" - ) - static final void method2211(String var0) { - class411.addGameMessage(30, "", var0); + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (var1 instanceof class436) { + return this.field3811.equals(((class436)var1).field3811); + } else { + throw new IllegalArgumentException(); + } } - @ObfuscatedName("nc") - @ObfuscatedSignature( - descriptor = "(Lnm;IIII)V", - garbageValue = "-1362386286" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - class313.method1648(); - SpriteMask var4 = var0.method1857(class33.widgetDefinition, false); - if (var4 != null) { - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); - if (Client.minimapState != 2 && Client.minimapState != 5) { - int var5 = Client.camAngleY & 2047; - int var6 = TextureProvider.localPlayer.x / 32 + 48; - int var7 = 464 - TextureProvider.localPlayer.y / 32; - SpriteMask.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); - - int var8; - int var9; - int var10; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { - var9 = Client.mapIconXs[var8] * 4 + 2 - TextureProvider.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - TextureProvider.localPlayer.y / 32; - SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { - for (var9 = 0; var9 < 104; ++var9) { - NodeDeque var15 = Client.groundItems[class87.Client_plane][var8][var9]; - if (var15 != null) { - var11 = var8 * 4 + 2 - TextureProvider.localPlayer.x / 32; - var12 = var9 * 4 + 2 - TextureProvider.localPlayer.y / 32; - SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var11, var12, class103.mapDotSprites[0], var4); - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { - NPC var14 = Client.npcs[Client.npcIndices[var8]]; - if (var14 != null && var14.isVisible()) { - NPCComposition var18 = var14.definition; - if (var18 != null && var18.transforms != null) { - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { - var11 = var14.x / 32 - TextureProvider.localPlayer.x / 32; - var12 = var14.y / 32 - TextureProvider.localPlayer.y / 32; - SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var11, var12, class103.mapDotSprites[1], var4); - } - } - } - - var8 = Players.Players_count; - int[] var17 = Players.Players_indices; - - for (var10 = 0; var10 < var8; ++var10) { - Player var16 = Client.players[var17[var10]]; - if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != TextureProvider.localPlayer) { - var12 = var16.x / 32 - TextureProvider.localPlayer.x / 32; - int var13 = var16.y / 32 - TextureProvider.localPlayer.y / 32; - if (var16.isFriend()) { - SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var12, var13, class103.mapDotSprites[3], var4); - } else if (TextureProvider.localPlayer.team != 0 && var16.team != 0 && var16.team == TextureProvider.localPlayer.team) { - SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var12, var13, class103.mapDotSprites[4], var4); - } else if (var16.method493()) { - SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var12, var13, class103.mapDotSprites[5], var4); - } else if (var16.isClanMember()) { - SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var12, var13, class103.mapDotSprites[6], var4); - } else { - SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var12, var13, class103.mapDotSprites[2], var4); - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { - NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; - if (var19 != null) { - var11 = var19.x / 32 - TextureProvider.localPlayer.x / 32; - var12 = var19.y / 32 - TextureProvider.localPlayer.y / 32; - Language.worldToMinimap(var1, var2, var11, var12, class47.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - class20.baseX * 4 + 2 - TextureProvider.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - class19.baseY * 4 + 2 - TextureProvider.localPlayer.y / 32; - Language.worldToMinimap(var1, var2, var10, var11, class47.mapMarkerSprites[1], var4); - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { - Player var20 = Client.players[Client.hintArrowPlayerIndex]; - if (var20 != null) { - var11 = var20.x / 32 - TextureProvider.localPlayer.x / 32; - var12 = var20.y / 32 - TextureProvider.localPlayer.y / 32; - Language.worldToMinimap(var1, var2, var11, var12, class47.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - TextureProvider.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - TextureProvider.localPlayer.y / 32; - SecureRandomFuture.drawSpriteOnMinimap(var1, var2, var10, var11, class47.mapMarkerSprites[0], var4); - } - - if (!TextureProvider.localPlayer.isHidden) { - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); - } - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); - } + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + return this.field3811.hashCode(); + } - Client.field407[var3] = true; - } + @Export("compareTo") + @ObfuscatedName("compareTo") + public int compareTo(Object var1) { + return this.method2202((class436)var1); } } \ No newline at end of file diff --git a/osrs/src/main/java/class437.java b/osrs/src/main/java/class437.java deleted file mode 100644 index 093051f1e..000000000 --- a/osrs/src/main/java/class437.java +++ /dev/null @@ -1,65 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.ArrayList; -import java.util.Comparator; - -@ObfuscatedName("qp") -class class437 implements Comparator { - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lqe;" - ) - @Export("this$0") - @ObfuscatedName("this$0") - final class438 this$0; - - @ObfuscatedSignature( - descriptor = "(Lqe;)V" - ) - class437(class438 var1) { - this.this$0 = var1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lqd;Lqd;I)I", - garbageValue = "-199204638" - ) - int method2213(class439 var1, class439 var2) { - if (var1.field3809 > var2.field3809) { - return 1; - } else { - return var1.field3809 < var2.field3809 ? -1 : 0; - } - } - - @Export("compare") - @ObfuscatedName("compare") - public int compare(Object var1, Object var2) { - return this.method2213((class439)var1, (class439)var2); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("im") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1139961954" - ) - @Export("playJingle") - static void playJingle(int var0, int var1) { - if (class91.clientPreferences.getCurrentMusicVolume() != 0 && var0 != -1) { - ArrayList var2 = new ArrayList(); - var2.add(new MusicSong(Language.field3643, var0, 0, class91.clientPreferences.getCurrentMusicVolume(), false)); - class148.method776(var2, 0, 0, 0, 0, true); - Client.playingJingle = true; - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class438.java b/osrs/src/main/java/class438.java deleted file mode 100644 index ebdfc6401..000000000 --- a/osrs/src/main/java/class438.java +++ /dev/null @@ -1,197 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Comparator; -import java.util.HashMap; -import java.util.Map; - -@ObfuscatedName("qe") -public final class class438 { - @ObfuscatedName("ac") - final Comparator field3801; - @ObfuscatedName("al") - final Map field3802; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lpn;" - ) - final class407 field3804; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lpn;" - ) - final class407 field3805; - @ObfuscatedName("ao") - final long field3803; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lqs;" - ) - final class436 field3806; - @ObfuscatedName("ar") - final int field3800; - - @ObfuscatedSignature( - descriptor = "(JILqs;)V" - ) - class438(long var1, int var3, class436 var4) { - this.field3801 = new class437(this); - this.field3803 = var1; - this.field3800 = var3; - this.field3806 = var4; - if (this.field3800 == -1) { - this.field3802 = new HashMap(64); - this.field3804 = new class407(64, this.field3801); - this.field3805 = null; - } else { - if (this.field3806 == null) { - throw new IllegalArgumentException(""); - } - - this.field3802 = new HashMap(this.field3800); - this.field3804 = new class407(this.field3800, this.field3801); - this.field3805 = new class407(this.field3800); - } - - } - - @ObfuscatedSignature( - descriptor = "(ILqs;)V" - ) - public class438(int var1, class436 var2) { - this(-1L, var1, var2); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "111" - ) - boolean method2215() { - return this.field3800 != -1; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "1480842854" - ) - public Object method2216(Object var1) { - synchronized(this) { - if (this.field3803 != -1L) { - this.method2219(); - } - - class439 var3 = (class439)this.field3802.get(var1); - if (var3 == null) { - return null; - } else { - this.method2218(var3, false); - return var3.field3807; - } - } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "-496116903" - ) - public Object method2217(Object var1, Object var2) { - synchronized(this) { - if (this.field3803 != -1L) { - this.method2219(); - } - - class439 var4 = (class439)this.field3802.get(var1); - if (var4 != null) { - Object var8 = var4.field3807; - var4.field3807 = var2; - this.method2218(var4, false); - return var8; - } else { - class439 var5; - if (this.method2215() && this.field3802.size() == this.field3800) { - var5 = (class439)this.field3805.remove(); - this.field3802.remove(var5.field3808); - this.field3804.remove(var5); - } - - var5 = new class439(var2, var1); - this.field3802.put(var1, var5); - this.method2218(var5, true); - return null; - } - } - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Lqd;ZI)V", - garbageValue = "396560222" - ) - void method2218(class439 var1, boolean var2) { - if (!var2) { - this.field3804.remove(var1); - if (this.method2215() && !this.field3805.remove(var1)) { - throw new IllegalStateException(""); - } - } - - var1.field3809 = System.currentTimeMillis(); - if (this.method2215()) { - switch(this.field3806.field3799) { - case 0: - ++var1.field3810; - break; - case 1: - var1.field3810 = var1.field3809; - } - - this.field3805.add(var1); - } - - this.field3804.add(var1); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "21" - ) - void method2219() { - long var1 = System.currentTimeMillis() - this.field3803; - - while (!this.field3804.isEmpty()) { - class439 var3 = (class439)this.field3804.peek(); - if (var3.field3809 >= var1) { - return; - } - - this.field3802.remove(var3.field3808); - this.field3804.remove(var3); - if (this.method2215()) { - this.field3805.remove(var3); - } - } - - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" - ) - @Export("clearFiles") - public void clearFiles() { - synchronized(this) { - this.field3802.clear(); - this.field3804.clear(); - if (this.method2215()) { - this.field3805.clear(); - } - - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class439.java b/osrs/src/main/java/class439.java deleted file mode 100644 index feebcf9cb..000000000 --- a/osrs/src/main/java/class439.java +++ /dev/null @@ -1,55 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("qd") -public final class class439 implements Comparable { - @ObfuscatedName("ac") - Object field3807; - @ObfuscatedName("al") - Object field3808; - @ObfuscatedName("ak") - long field3809; - @ObfuscatedName("ax") - long field3810; - - class439(Object var1, Object var2) { - this.field3807 = var1; - this.field3808 = var2; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lqd;I)I", - garbageValue = "-1884046273" - ) - int method2221(class439 var1) { - if (this.field3810 < var1.field3810) { - return -1; - } else { - return this.field3810 > var1.field3810 ? 1 : 0; - } - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (var1 instanceof class439) { - return this.field3808.equals(((class439)var1).field3808); - } else { - throw new IllegalArgumentException(); - } - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - return this.field3808.hashCode(); - } - - @Export("compareTo") - @ObfuscatedName("compareTo") - public int compareTo(Object var1) { - return this.method2221((class439)var1); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class458.java b/osrs/src/main/java/class458.java new file mode 100644 index 000000000..bf41b3513 --- /dev/null +++ b/osrs/src/main/java/class458.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ry") +public class class458 { + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1658967602" + ) + static void method2306() { + class541.SpriteBuffer_xOffsets = null; + class541.SpriteBuffer_yOffsets = null; + class541.SpriteBuffer_spriteWidths = null; + class520.SpriteBuffer_spriteHeights = null; + class541.SpriteBuffer_spritePalette = null; + class396.SpriteBuffer_pixels = null; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class46.java b/osrs/src/main/java/class46.java index bd8bc742c..d00e3ef08 100644 --- a/osrs/src/main/java/class46.java +++ b/osrs/src/main/java/class46.java @@ -1,67 +1,67 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("bs") public class class46 { - @ObfuscatedName("ac") + @ObfuscatedName("at") int field219; - @ObfuscatedName("al") - int field222; - @ObfuscatedName("ak") - int field221; - @ObfuscatedName("ax") - int field224; - @ObfuscatedName("ao") - int field223; @ObfuscatedName("ah") - int field220; + int field216; @ObfuscatedName("ar") - int[] field225; + int field218; + @ObfuscatedName("ao") + int field217; + @ObfuscatedName("ab") + int field215; + @ObfuscatedName("au") + int field220; + @ObfuscatedName("aa") + int[] field221; class46() { - class60 var1 = VorbisSample.field267; - this.field219 = var1.method327(16); - this.field222 = var1.method327(24); - this.field221 = var1.method327(24); - this.field224 = var1.method327(24) + 1; - this.field223 = var1.method327(6) + 1; - this.field220 = var1.method327(8); - int[] var2 = new int[this.field223]; + class60 var1 = VorbisSample.field264; + this.field219 = var1.method335(16); + this.field216 = var1.method335(24); + this.field218 = var1.method335(24); + this.field217 = var1.method335(24) + 1; + this.field215 = var1.method335(6) + 1; + this.field220 = var1.method335(8); + int[] var2 = new int[this.field215]; int var3; - for (var3 = 0; var3 < this.field223; ++var3) { + for (var3 = 0; var3 < this.field215; ++var3) { int var4 = 0; - int var5 = var1.method327(3); - boolean var6 = var1.method328() != 0; + int var5 = var1.method335(3); + boolean var6 = var1.method336() != 0; if (var6) { - var4 = var1.method327(5); + var4 = var1.method335(5); } var2[var3] = var4 << 3 | var5; } - this.field225 = new int[this.field223 * 8]; + this.field221 = new int[this.field215 * 8]; - for (var3 = 0; var3 < this.field223 * 8; ++var3) { - this.field225[var3] = (var2[var3 >> 3] & 1 << (var3 & 7)) != 0 ? var1.method327(8) : -1; + for (var3 = 0; var3 < this.field215 * 8; ++var3) { + this.field221[var3] = (var2[var3 >> 3] & 1 << (var3 & 7)) != 0 ? var1.method335(8) : -1; } } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([FIZLcz;)V" + descriptor = "([FIZLcw;)V" ) - void method236(float[] var1, int var2, boolean var3, class60 var4) { + void method243(float[] var1, int var2, boolean var3, class60 var4) { int var5; for (var5 = 0; var5 < var2; ++var5) { var1[var5] = 0.0F; } if (!var3) { - var5 = VorbisSample.field266[this.field220].field254; - int var6 = this.field221 - this.field222; - int var7 = var6 / this.field224; + var5 = VorbisSample.field263[this.field220].field252; + int var6 = this.field218 - this.field216; + int var7 = var6 / this.field217; int[] var8 = new int[var7]; for (int var9 = 0; var9 < 8; ++var9) { @@ -71,41 +71,41 @@ void method236(float[] var1, int var2, boolean var3, class60 var4) { int var11; int var12; if (var9 == 0) { - var11 = VorbisSample.field266[this.field220].method296(var4); + var11 = VorbisSample.field263[this.field220].method301(var4); for (var12 = var5 - 1; var12 >= 0; --var12) { if (var10 + var12 < var7) { - var8[var10 + var12] = var11 % this.field223; + var8[var10 + var12] = var11 % this.field215; } - var11 /= this.field223; + var11 /= this.field215; } } for (var11 = 0; var11 < var5; ++var11) { var12 = var8[var10]; - int var13 = this.field225[var9 + var12 * 8]; + int var13 = this.field221[var9 + var12 * 8]; if (var13 >= 0) { - int var14 = var10 * this.field224 + this.field222; - VorbisCodebook var15 = VorbisSample.field266[var13]; + int var14 = var10 * this.field217 + this.field216; + VorbisCodebook var15 = VorbisSample.field263[var13]; int var16; if (this.field219 == 0) { - var16 = this.field224 / var15.field254; + var16 = this.field217 / var15.field252; for (int var17 = 0; var17 < var16; ++var17) { - float[] var21 = var15.method297(var4); + float[] var21 = var15.method302(var4); - for (int var19 = 0; var19 < var15.field254; ++var19) { + for (int var19 = 0; var19 < var15.field252; ++var19) { var1[var14 + var17 + var19 * var16] += var21[var19]; } } } else { var16 = 0; - while (var16 < this.field224) { - float[] var20 = var15.method297(var4); + while (var16 < this.field217) { + float[] var20 = var15.method302(var4); - for (int var18 = 0; var18 < var15.field254; ++var18) { + for (int var18 = 0; var18 < var15.field252; ++var18) { var1[var14 + var16] += var20[var18]; ++var16; } diff --git a/osrs/src/main/java/class460.java b/osrs/src/main/java/class460.java new file mode 100644 index 000000000..96a1b6ba4 --- /dev/null +++ b/osrs/src/main/java/class460.java @@ -0,0 +1,60 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("rb") +public class class460 { + @ObfuscatedName("at") + float field3898; + @ObfuscatedName("ah") + float field3896; + @ObfuscatedName("ar") + float field3897; + + static { + new class460(0.0F, 0.0F, 0.0F); + new class460(1.0F, 1.0F, 1.0F); + new class460(1.0F, 0.0F, 0.0F); + new class460(0.0F, 1.0F, 0.0F); + new class460(0.0F, 0.0F, 1.0F); + } + + class460(float var1, float var2, float var3) { + this.field3898 = var1; + this.field3896 = var2; + this.field3897 = var3; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)F", + garbageValue = "56" + ) + final float method2307() { + return (float)Math.sqrt((double)(this.field3897 * this.field3897 + this.field3896 * this.field3896 + this.field3898 * this.field3898)); + } + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + return this.field3898 + ", " + this.field3896 + ", " + this.field3897; + } + + @ObfuscatedName("ih") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-986184126" + ) + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (WorldMapIcon_1.clientPreferences.getCurrentSoundEffectsVolume() != 0 && var1 != 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var0; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = 0; + ++Client.soundEffectCount; + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class461.java b/osrs/src/main/java/class461.java new file mode 100644 index 000000000..0b1efc30b --- /dev/null +++ b/osrs/src/main/java/class461.java @@ -0,0 +1,122 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("rq") +public final class class461 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "[Lrq;" + ) + static class461[] field3900; + @ObfuscatedName("ah") + static int field3899; + @ObfuscatedName("ao") + float field3903; + @ObfuscatedName("ab") + float field3902; + @ObfuscatedName("au") + float field3904; + @ObfuscatedName("aa") + float field3901; + + static { + field3900 = new class461[0]; + FontName.method2459(100); + new class461(); + } + + class461() { + this.method2312(); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-905673513" + ) + public void method2309() { + synchronized(field3900) { + if (IgnoreList.field3815 < field3899 - 1) { + field3900[++IgnoreList.field3815 - 1] = this; + } + + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(FFFFI)V", + garbageValue = "1133120924" + ) + void method2310(float var1, float var2, float var3, float var4) { + this.field3903 = var1; + this.field3902 = var2; + this.field3904 = var3; + this.field3901 = var4; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(FFFFI)V", + garbageValue = "1735434078" + ) + public void method2311(float var1, float var2, float var3, float var4) { + float var5 = (float)Math.sin((double)(var4 * 0.5F)); + float var6 = (float)Math.cos((double)(0.5F * var4)); + this.field3903 = var1 * var5; + this.field3902 = var5 * var2; + this.field3904 = var3 * var5; + this.field3901 = var6; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "210229291" + ) + final void method2312() { + this.field3904 = 0.0F; + this.field3902 = 0.0F; + this.field3903 = 0.0F; + this.field3901 = 1.0F; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Lrq;I)V", + garbageValue = "992983838" + ) + public final void method2313(class461 var1) { + this.method2310(this.field3904 * var1.field3902 + var1.field3901 * this.field3903 + this.field3901 * var1.field3903 - var1.field3904 * this.field3902, var1.field3902 * this.field3901 + (this.field3902 * var1.field3901 - var1.field3903 * this.field3904) + this.field3903 * var1.field3904, this.field3901 * var1.field3904 + (var1.field3903 * this.field3902 + this.field3904 * var1.field3901 - this.field3903 * var1.field3902), var1.field3901 * this.field3901 - var1.field3903 * this.field3903 - var1.field3902 * this.field3902 - var1.field3904 * this.field3904); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (!(var1 instanceof class461)) { + return false; + } else { + class461 var2 = (class461)var1; + return var2.field3903 == this.field3903 && var2.field3902 == this.field3902 && this.field3904 == var2.field3904 && var2.field3901 == this.field3901; + } + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + boolean var1 = true; + float var2 = 1.0F; + var2 = 31.0F * var2 + this.field3903; + var2 = this.field3902 + 31.0F * var2; + var2 = 31.0F * var2 + this.field3904; + var2 = this.field3901 + 31.0F * var2; + return (int)var2; + } + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + return this.field3903 + "," + this.field3902 + "," + this.field3904 + "," + this.field3901; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class462.java b/osrs/src/main/java/class462.java index b2c5c1ae1..541876acf 100644 --- a/osrs/src/main/java/class462.java +++ b/osrs/src/main/java/class462.java @@ -2,80 +2,448 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.applet.Applet; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import java.util.Arrays; -@ObfuscatedName("rf") -public class class462 { - @ObfuscatedName("ac") - @Export("RunException_applet") - public static Applet RunException_applet; - - @ObfuscatedName("ow") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-123351457" - ) - static void method2327(int var0) { - SequenceDefinition var1 = class36.SequenceDefinition_get(var0); - if (var1.isCachedModelIdSet()) { - int var3 = var1.SequenceDefinition_cachedModelId; - class139 var5 = (class139)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var3); - class139 var4; - if (var5 != null) { - var4 = var5; +@ObfuscatedName("rz") +public final class class462 { + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "[Lrz;" + ) + static class462[] field3907; + @ObfuscatedName("ar") + static int field3906; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lrz;" + ) + public static final class462 field3905; + @ObfuscatedName("ab") + public float[] field3908; + + static { + field3907 = new class462[0]; + ServerPacket.method1640(100); + field3905 = new class462(); + } + + public class462() { + this.field3908 = new float[16]; + this.method2318(); + } + + @ObfuscatedSignature( + descriptor = "(Lrz;)V" + ) + public class462(class462 var1) { + this.field3908 = new float[16]; + this.method2320(var1); + } + + @ObfuscatedSignature( + descriptor = "(Luj;Z)V" + ) + public class462(Buffer var1, boolean var2) { + this.field3908 = new float[16]; + this.method2315(var1, var2); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2018425549" + ) + public void method2314() { + synchronized(field3907) { + if (DirectByteArrayCopier.field3136 < field3906 - 1) { + field3907[++DirectByteArrayCopier.field3136 - 1] = this; + } + + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Luj;ZI)V", + garbageValue = "-1679447945" + ) + void method2315(Buffer var1, boolean var2) { + if (var2) { + class463 var3 = new class463(); + int var6 = var1.readShort(); + var6 &= 16383; + float var5 = (float)(6.283185307179586D * (double)((float)var6 / 16384.0F)); + var3.method2331(var5); + int var9 = var1.readShort(); + var9 &= 16383; + float var8 = (float)(6.283185307179586D * (double)((float)var9 / 16384.0F)); + var3.method2332(var8); + int var12 = var1.readShort(); + var12 &= 16383; + float var11 = (float)(6.283185307179586D * (double)((float)var12 / 16384.0F)); + var3.method2333(var11); + var3.method2334((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); + this.method2326(var3); + } else { + for (int var13 = 0; var13 < 16; ++var13) { + this.field3908[var13] = var1.method2565(); + } + } + + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "1" + ) + float[] method2316() { + float[] var1 = new float[3]; + if ((double)this.field3908[2] < 0.999D && (double)this.field3908[2] > -0.999D) { + var1[1] = (float)(-Math.asin((double)this.field3908[2])); + double var2 = Math.cos((double)var1[1]); + var1[0] = (float)Math.atan2((double)this.field3908[6] / var2, (double)this.field3908[10] / var2); + var1[2] = (float)Math.atan2((double)this.field3908[1] / var2, (double)this.field3908[0] / var2); + } else { + var1[0] = 0.0F; + var1[1] = (float)Math.atan2((double)this.field3908[2], 0.0D); + var1[2] = (float)Math.atan2((double)(-this.field3908[9]), (double)this.field3908[5]); + } + + return var1; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "5" + ) + public float[] method2317() { + float[] var1 = new float[]{(float)(-Math.asin((double)this.field3908[6])), 0.0F, 0.0F}; + double var2 = Math.cos((double)var1[0]); + double var4; + double var6; + if (Math.abs(var2) > 0.005D) { + var4 = (double)this.field3908[2]; + var6 = (double)this.field3908[10]; + double var8 = (double)this.field3908[4]; + double var10 = (double)this.field3908[5]; + var1[1] = (float)Math.atan2(var4, var6); + var1[2] = (float)Math.atan2(var8, var10); + } else { + var4 = (double)this.field3908[1]; + var6 = (double)this.field3908[0]; + if (this.field3908[6] < 0.0F) { + var1[1] = (float)Math.atan2(var4, var6); } else { - AbstractArchive var7 = SequenceDefinition.SequenceDefinition_animationsArchive; - AbstractArchive var8 = SequenceDefinition.SequenceDefinition_skeletonsArchive; - boolean var9 = true; - byte[] var10 = var7.getFile(var3 >> 16 & 65535, var3 & 65535); - class139 var6; - if (var10 == null) { - var9 = false; - var6 = null; - } else { - int var11 = (var10[1] & 255) << 8 | var10[2] & 255; - byte[] var12 = var8.getFile(var11, 0); - if (var12 == null) { - var9 = false; - } - - if (!var9) { - var6 = null; - } else { - if (SoundCache.field214 == null) { - MusicPatchPcmStream.field2855 = Runtime.getRuntime().availableProcessors(); - SoundCache.field214 = new ThreadPoolExecutor(0, MusicPatchPcmStream.field2855, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(MusicPatchPcmStream.field2855 * 100 + 100), new class73()); - } - - try { - var6 = new class139(var7, var8, var3, false); - } catch (Exception var14) { - var6 = null; - } - } + var1[1] = (float)(-Math.atan2(var4, var6)); + } + + var1[2] = 0.0F; + } + + return var1; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-60" + ) + void method2318() { + this.field3908[0] = 1.0F; + this.field3908[1] = 0.0F; + this.field3908[2] = 0.0F; + this.field3908[3] = 0.0F; + this.field3908[4] = 0.0F; + this.field3908[5] = 1.0F; + this.field3908[6] = 0.0F; + this.field3908[7] = 0.0F; + this.field3908[8] = 0.0F; + this.field3908[9] = 0.0F; + this.field3908[10] = 1.0F; + this.field3908[11] = 0.0F; + this.field3908[12] = 0.0F; + this.field3908[13] = 0.0F; + this.field3908[14] = 0.0F; + this.field3908[15] = 1.0F; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "77" + ) + public void method2319() { + this.field3908[0] = 0.0F; + this.field3908[1] = 0.0F; + this.field3908[2] = 0.0F; + this.field3908[3] = 0.0F; + this.field3908[4] = 0.0F; + this.field3908[5] = 0.0F; + this.field3908[6] = 0.0F; + this.field3908[7] = 0.0F; + this.field3908[8] = 0.0F; + this.field3908[9] = 0.0F; + this.field3908[10] = 0.0F; + this.field3908[11] = 0.0F; + this.field3908[12] = 0.0F; + this.field3908[13] = 0.0F; + this.field3908[14] = 0.0F; + this.field3908[15] = 0.0F; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lrz;I)V", + garbageValue = "-1456016137" + ) + public void method2320(class462 var1) { + System.arraycopy(var1.field3908, 0, this.field3908, 0, 16); + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(FB)V", + garbageValue = "93" + ) + public void method2321(float var1) { + this.method2322(var1, var1, var1); + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(FFFB)V", + garbageValue = "111" + ) + public void method2322(float var1, float var2, float var3) { + this.method2318(); + this.field3908[0] = var1; + this.field3908[5] = var2; + this.field3908[10] = var3; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lrz;I)V", + garbageValue = "-459748559" + ) + public void method2323(class462 var1) { + for (int var2 = 0; var2 < this.field3908.length; ++var2) { + float[] var10000 = this.field3908; + var10000[var2] += var1.field3908[var2]; + } + + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Lrz;I)V", + garbageValue = "1005316731" + ) + public void method2324(class462 var1) { + float var2 = var1.field3908[12] * this.field3908[3] + var1.field3908[8] * this.field3908[2] + var1.field3908[0] * this.field3908[0] + this.field3908[1] * var1.field3908[4]; + float var3 = var1.field3908[9] * this.field3908[2] + var1.field3908[5] * this.field3908[1] + this.field3908[0] * var1.field3908[1] + var1.field3908[13] * this.field3908[3]; + float var4 = var1.field3908[14] * this.field3908[3] + var1.field3908[6] * this.field3908[1] + var1.field3908[2] * this.field3908[0] + var1.field3908[10] * this.field3908[2]; + float var5 = this.field3908[3] * var1.field3908[15] + var1.field3908[3] * this.field3908[0] + var1.field3908[7] * this.field3908[1] + this.field3908[2] * var1.field3908[11]; + float var6 = this.field3908[7] * var1.field3908[12] + this.field3908[4] * var1.field3908[0] + var1.field3908[4] * this.field3908[5] + this.field3908[6] * var1.field3908[8]; + float var7 = this.field3908[7] * var1.field3908[13] + this.field3908[5] * var1.field3908[5] + var1.field3908[1] * this.field3908[4] + var1.field3908[9] * this.field3908[6]; + float var8 = this.field3908[7] * var1.field3908[14] + this.field3908[4] * var1.field3908[2] + var1.field3908[6] * this.field3908[5] + this.field3908[6] * var1.field3908[10]; + float var9 = var1.field3908[11] * this.field3908[6] + var1.field3908[3] * this.field3908[4] + this.field3908[5] * var1.field3908[7] + this.field3908[7] * var1.field3908[15]; + float var10 = this.field3908[8] * var1.field3908[0] + this.field3908[9] * var1.field3908[4] + this.field3908[10] * var1.field3908[8] + this.field3908[11] * var1.field3908[12]; + float var11 = var1.field3908[1] * this.field3908[8] + var1.field3908[5] * this.field3908[9] + var1.field3908[9] * this.field3908[10] + this.field3908[11] * var1.field3908[13]; + float var12 = this.field3908[8] * var1.field3908[2] + this.field3908[9] * var1.field3908[6] + this.field3908[10] * var1.field3908[10] + this.field3908[11] * var1.field3908[14]; + float var13 = this.field3908[11] * var1.field3908[15] + var1.field3908[7] * this.field3908[9] + var1.field3908[3] * this.field3908[8] + var1.field3908[11] * this.field3908[10]; + float var14 = var1.field3908[8] * this.field3908[14] + var1.field3908[0] * this.field3908[12] + var1.field3908[4] * this.field3908[13] + this.field3908[15] * var1.field3908[12]; + float var15 = var1.field3908[9] * this.field3908[14] + this.field3908[12] * var1.field3908[1] + this.field3908[13] * var1.field3908[5] + var1.field3908[13] * this.field3908[15]; + float var16 = var1.field3908[14] * this.field3908[15] + this.field3908[12] * var1.field3908[2] + var1.field3908[6] * this.field3908[13] + var1.field3908[10] * this.field3908[14]; + float var17 = this.field3908[13] * var1.field3908[7] + var1.field3908[3] * this.field3908[12] + var1.field3908[11] * this.field3908[14] + this.field3908[15] * var1.field3908[15]; + this.field3908[0] = var2; + this.field3908[1] = var3; + this.field3908[2] = var4; + this.field3908[3] = var5; + this.field3908[4] = var6; + this.field3908[5] = var7; + this.field3908[6] = var8; + this.field3908[7] = var9; + this.field3908[8] = var10; + this.field3908[9] = var11; + this.field3908[10] = var12; + this.field3908[11] = var13; + this.field3908[12] = var14; + this.field3908[13] = var15; + this.field3908[14] = var16; + this.field3908[15] = var17; + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(Lrq;I)V", + garbageValue = "-2073322468" + ) + public void method2325(class461 var1) { + float var2 = var1.field3901 * var1.field3901; + float var3 = var1.field3901 * var1.field3903; + float var4 = var1.field3901 * var1.field3902; + float var5 = var1.field3901 * var1.field3904; + float var6 = var1.field3903 * var1.field3903; + float var7 = var1.field3903 * var1.field3902; + float var8 = var1.field3904 * var1.field3903; + float var9 = var1.field3902 * var1.field3902; + float var10 = var1.field3902 * var1.field3904; + float var11 = var1.field3904 * var1.field3904; + this.field3908[0] = var2 + var6 - var11 - var9; + this.field3908[1] = var5 + var7 + var5 + var7; + this.field3908[2] = var8 - var4 - var4 + var8; + this.field3908[4] = var7 - var5 - var5 + var7; + this.field3908[5] = var9 + var2 - var6 - var11; + this.field3908[6] = var3 + var3 + var10 + var10; + this.field3908[8] = var4 + var8 + var8 + var4; + this.field3908[9] = var10 + (var10 - var3 - var3); + this.field3908[10] = var2 + var11 - var9 - var6; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(Lrj;I)V", + garbageValue = "-1749310376" + ) + void method2326(class463 var1) { + this.field3908[0] = var1.field3917; + this.field3908[1] = var1.field3912; + this.field3908[2] = var1.field3916; + this.field3908[3] = 0.0F; + this.field3908[4] = var1.field3914; + this.field3908[5] = var1.field3910; + this.field3908[6] = var1.field3918; + this.field3908[7] = 0.0F; + this.field3908[8] = var1.field3909; + this.field3908[9] = var1.field3911; + this.field3908[10] = var1.field3913; + this.field3908[11] = 0.0F; + this.field3908[12] = var1.field3920; + this.field3908[13] = var1.field3915; + this.field3908[14] = var1.field3919; + this.field3908[15] = 1.0F; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)F", + garbageValue = "868032907" + ) + float method2327() { + return this.field3908[5] * this.field3908[3] * this.field3908[8] * this.field3908[14] + this.field3908[4] * this.field3908[3] * this.field3908[10] * this.field3908[13] + (this.field3908[8] * this.field3908[7] * this.field3908[2] * this.field3908[13] + this.field3908[15] * this.field3908[6] * this.field3908[1] * this.field3908[8] + this.field3908[13] * this.field3908[11] * this.field3908[6] * this.field3908[0] + (this.field3908[15] * this.field3908[5] * this.field3908[0] * this.field3908[10] - this.field3908[5] * this.field3908[0] * this.field3908[11] * this.field3908[14] - this.field3908[6] * this.field3908[0] * this.field3908[9] * this.field3908[15]) + this.field3908[14] * this.field3908[9] * this.field3908[0] * this.field3908[7] - this.field3908[7] * this.field3908[0] * this.field3908[10] * this.field3908[13] - this.field3908[15] * this.field3908[10] * this.field3908[4] * this.field3908[1] + this.field3908[11] * this.field3908[4] * this.field3908[1] * this.field3908[14] - this.field3908[1] * this.field3908[6] * this.field3908[11] * this.field3908[12] - this.field3908[14] * this.field3908[1] * this.field3908[7] * this.field3908[8] + this.field3908[1] * this.field3908[7] * this.field3908[10] * this.field3908[12] + this.field3908[15] * this.field3908[2] * this.field3908[4] * this.field3908[9] - this.field3908[13] * this.field3908[11] * this.field3908[2] * this.field3908[4] - this.field3908[2] * this.field3908[5] * this.field3908[8] * this.field3908[15] + this.field3908[12] * this.field3908[2] * this.field3908[5] * this.field3908[11] - this.field3908[12] * this.field3908[9] * this.field3908[7] * this.field3908[2] - this.field3908[9] * this.field3908[3] * this.field3908[4] * this.field3908[14]) - this.field3908[10] * this.field3908[5] * this.field3908[3] * this.field3908[12] - this.field3908[6] * this.field3908[3] * this.field3908[8] * this.field3908[13] + this.field3908[12] * this.field3908[9] * this.field3908[3] * this.field3908[6]; + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-536017222" + ) + public void method2328() { + float var1 = 1.0F / this.method2327(); + float var2 = (this.field3908[7] * this.field3908[9] * this.field3908[14] + this.field3908[15] * this.field3908[10] * this.field3908[5] - this.field3908[14] * this.field3908[5] * this.field3908[11] - this.field3908[15] * this.field3908[9] * this.field3908[6] + this.field3908[13] * this.field3908[6] * this.field3908[11] - this.field3908[10] * this.field3908[7] * this.field3908[13]) * var1; + float var3 = (this.field3908[13] * this.field3908[10] * this.field3908[3] + (this.field3908[15] * -this.field3908[1] * this.field3908[10] + this.field3908[11] * this.field3908[1] * this.field3908[14] + this.field3908[2] * this.field3908[9] * this.field3908[15] - this.field3908[13] * this.field3908[11] * this.field3908[2] - this.field3908[14] * this.field3908[9] * this.field3908[3])) * var1; + float var4 = var1 * (this.field3908[15] * this.field3908[6] * this.field3908[1] - this.field3908[14] * this.field3908[7] * this.field3908[1] - this.field3908[15] * this.field3908[2] * this.field3908[5] + this.field3908[2] * this.field3908[7] * this.field3908[13] + this.field3908[3] * this.field3908[5] * this.field3908[14] - this.field3908[13] * this.field3908[6] * this.field3908[3]); + float var5 = (this.field3908[5] * this.field3908[2] * this.field3908[11] + this.field3908[11] * this.field3908[6] * -this.field3908[1] + this.field3908[10] * this.field3908[1] * this.field3908[7] - this.field3908[7] * this.field3908[2] * this.field3908[9] - this.field3908[10] * this.field3908[5] * this.field3908[3] + this.field3908[6] * this.field3908[3] * this.field3908[9]) * var1; + float var6 = var1 * (this.field3908[12] * this.field3908[7] * this.field3908[10] + (this.field3908[14] * this.field3908[11] * this.field3908[4] + -this.field3908[4] * this.field3908[10] * this.field3908[15] + this.field3908[6] * this.field3908[8] * this.field3908[15] - this.field3908[12] * this.field3908[11] * this.field3908[6] - this.field3908[7] * this.field3908[8] * this.field3908[14])); + float var7 = var1 * (this.field3908[11] * this.field3908[2] * this.field3908[12] + (this.field3908[0] * this.field3908[10] * this.field3908[15] - this.field3908[0] * this.field3908[11] * this.field3908[14] - this.field3908[8] * this.field3908[2] * this.field3908[15]) + this.field3908[3] * this.field3908[8] * this.field3908[14] - this.field3908[12] * this.field3908[10] * this.field3908[3]); + float var8 = (this.field3908[3] * this.field3908[6] * this.field3908[12] + (this.field3908[14] * this.field3908[7] * this.field3908[0] + this.field3908[6] * -this.field3908[0] * this.field3908[15] + this.field3908[4] * this.field3908[2] * this.field3908[15] - this.field3908[2] * this.field3908[7] * this.field3908[12] - this.field3908[3] * this.field3908[4] * this.field3908[14])) * var1; + float var9 = var1 * (this.field3908[8] * this.field3908[2] * this.field3908[7] + (this.field3908[11] * this.field3908[6] * this.field3908[0] - this.field3908[10] * this.field3908[7] * this.field3908[0] - this.field3908[2] * this.field3908[4] * this.field3908[11]) + this.field3908[10] * this.field3908[3] * this.field3908[4] - this.field3908[6] * this.field3908[3] * this.field3908[8]); + float var10 = var1 * (this.field3908[13] * this.field3908[7] * this.field3908[8] + this.field3908[15] * this.field3908[4] * this.field3908[9] - this.field3908[4] * this.field3908[11] * this.field3908[13] - this.field3908[5] * this.field3908[8] * this.field3908[15] + this.field3908[11] * this.field3908[5] * this.field3908[12] - this.field3908[7] * this.field3908[9] * this.field3908[12]); + float var11 = var1 * (this.field3908[8] * this.field3908[1] * this.field3908[15] + this.field3908[15] * this.field3908[9] * -this.field3908[0] + this.field3908[0] * this.field3908[11] * this.field3908[13] - this.field3908[12] * this.field3908[1] * this.field3908[11] - this.field3908[8] * this.field3908[3] * this.field3908[13] + this.field3908[12] * this.field3908[9] * this.field3908[3]); + float var12 = (this.field3908[7] * this.field3908[1] * this.field3908[12] + (this.field3908[15] * this.field3908[5] * this.field3908[0] - this.field3908[13] * this.field3908[7] * this.field3908[0] - this.field3908[4] * this.field3908[1] * this.field3908[15]) + this.field3908[13] * this.field3908[3] * this.field3908[4] - this.field3908[12] * this.field3908[3] * this.field3908[5]) * var1; + float var13 = var1 * (this.field3908[8] * this.field3908[5] * this.field3908[3] + (this.field3908[11] * this.field3908[5] * -this.field3908[0] + this.field3908[0] * this.field3908[7] * this.field3908[9] + this.field3908[11] * this.field3908[1] * this.field3908[4] - this.field3908[8] * this.field3908[7] * this.field3908[1] - this.field3908[3] * this.field3908[4] * this.field3908[9])); + float var14 = var1 * (this.field3908[14] * this.field3908[9] * -this.field3908[4] + this.field3908[13] * this.field3908[4] * this.field3908[10] + this.field3908[14] * this.field3908[5] * this.field3908[8] - this.field3908[5] * this.field3908[10] * this.field3908[12] - this.field3908[13] * this.field3908[8] * this.field3908[6] + this.field3908[9] * this.field3908[6] * this.field3908[12]); + float var15 = (this.field3908[13] * this.field3908[2] * this.field3908[8] + this.field3908[10] * this.field3908[1] * this.field3908[12] + (this.field3908[9] * this.field3908[0] * this.field3908[14] - this.field3908[13] * this.field3908[0] * this.field3908[10] - this.field3908[1] * this.field3908[8] * this.field3908[14]) - this.field3908[12] * this.field3908[2] * this.field3908[9]) * var1; + float var16 = var1 * (this.field3908[12] * this.field3908[2] * this.field3908[5] + (this.field3908[14] * -this.field3908[0] * this.field3908[5] + this.field3908[0] * this.field3908[6] * this.field3908[13] + this.field3908[14] * this.field3908[1] * this.field3908[4] - this.field3908[6] * this.field3908[1] * this.field3908[12] - this.field3908[13] * this.field3908[4] * this.field3908[2])); + float var17 = var1 * (this.field3908[4] * this.field3908[2] * this.field3908[9] + this.field3908[5] * this.field3908[0] * this.field3908[10] - this.field3908[9] * this.field3908[6] * this.field3908[0] - this.field3908[10] * this.field3908[4] * this.field3908[1] + this.field3908[8] * this.field3908[1] * this.field3908[6] - this.field3908[2] * this.field3908[5] * this.field3908[8]); + this.field3908[0] = var2; + this.field3908[1] = var3; + this.field3908[2] = var4; + this.field3908[3] = var5; + this.field3908[4] = var6; + this.field3908[5] = var7; + this.field3908[6] = var8; + this.field3908[7] = var9; + this.field3908[8] = var10; + this.field3908[9] = var11; + this.field3908[10] = var12; + this.field3908[11] = var13; + this.field3908[12] = var14; + this.field3908[13] = var15; + this.field3908[14] = var16; + this.field3908[15] = var17; + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "-616853758" + ) + public float[] method2329() { + float[] var1 = new float[3]; + class460 var2 = new class460(this.field3908[0], this.field3908[1], this.field3908[2]); + class460 var3 = new class460(this.field3908[4], this.field3908[5], this.field3908[6]); + class460 var4 = new class460(this.field3908[8], this.field3908[9], this.field3908[10]); + var1[0] = var2.method2307(); + var1[1] = var3.method2307(); + var1[2] = var4.method2307(); + return var1; + } + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + StringBuilder var1 = new StringBuilder(); + this.method2317(); + this.method2316(); + + for (int var2 = 0; var2 < 4; ++var2) { + for (int var3 = 0; var3 < 4; ++var3) { + if (var3 > 0) { + var1.append("\t"); } - if (var6 != null) { - SequenceDefinition.SequenceDefinition_cachedModel.put(var6, (long)var3); + float var4 = this.field3908[var3 + var2 * 4]; + if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { + var4 = 0.0F; } - var4 = var6; + var1.append(var4); } - int var2; - if (var4 == null) { - var2 = 2; - } else { - var2 = var4.method738() ? 0 : 1; - } + var1.append("\n"); + } - if (var2 == 2) { - Client.field608.add(var1.SequenceDefinition_cachedModelId); + return var1.toString(); + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + boolean var1 = true; + byte var2 = 1; + int var3 = var2 * 31 + Arrays.hashCode(this.field3908); + return var3; + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (!(var1 instanceof class462)) { + return false; + } else { + class462 var2 = (class462)var1; + + for (int var3 = 0; var3 < 16; ++var3) { + if (var2.field3908[var3] != this.field3908[var3]) { + return false; + } } + return true; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class463.java b/osrs/src/main/java/class463.java index d4f59f8d8..a005b87d2 100644 --- a/osrs/src/main/java/class463.java +++ b/osrs/src/main/java/class463.java @@ -2,67 +2,290 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ro") +@ObfuscatedName("rj") public class class463 { - @ObfuscatedName("oh") - @Export("menuY") - static int menuY; + @ObfuscatedName("at") + float field3917; + @ObfuscatedName("ah") + float field3912; + @ObfuscatedName("ar") + float field3916; + @ObfuscatedName("ao") + float field3914; + @ObfuscatedName("ab") + float field3910; + @ObfuscatedName("au") + float field3918; + @ObfuscatedName("aa") + float field3909; @ObfuscatedName("ac") - float field3893; + float field3911; @ObfuscatedName("al") - float field3895; - @ObfuscatedName("ak") - float field3894; + float field3913; + @ObfuscatedName("az") + float field3920; + @ObfuscatedName("ap") + float field3915; + @ObfuscatedName("av") + float field3919; static { - new class463(0.0F, 0.0F, 0.0F); - new class463(1.0F, 1.0F, 1.0F); - new class463(1.0F, 0.0F, 0.0F); - new class463(0.0F, 1.0F, 0.0F); - new class463(0.0F, 0.0F, 1.0F); - NPC.method581(100); + new class463(); } - class463(float var1, float var2, float var3) { - this.field3893 = var1; - this.field3895 = var2; - this.field3894 = var3; + class463() { + this.method2330(); } - @ObfuscatedName("al") + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1136254272" + ) + void method2330() { + this.field3919 = 0.0F; + this.field3915 = 0.0F; + this.field3920 = 0.0F; + this.field3911 = 0.0F; + this.field3909 = 0.0F; + this.field3918 = 0.0F; + this.field3914 = 0.0F; + this.field3916 = 0.0F; + this.field3912 = 0.0F; + this.field3913 = 1.0F; + this.field3910 = 1.0F; + this.field3917 = 1.0F; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "1766211153" + ) + void method2331(float var1) { + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field3912; + float var5 = this.field3910; + float var6 = this.field3911; + float var7 = this.field3915; + this.field3912 = var2 * var4 - this.field3916 * var3; + this.field3916 = var4 * var3 + var2 * this.field3916; + this.field3910 = var5 * var2 - this.field3918 * var3; + this.field3918 = this.field3918 * var2 + var5 * var3; + this.field3911 = var2 * var6 - var3 * this.field3913; + this.field3913 = this.field3913 * var2 + var3 * var6; + this.field3915 = var7 * var2 - this.field3919 * var3; + this.field3919 = var3 * var7 + var2 * this.field3919; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(FB)V", + garbageValue = "16" + ) + void method2332(float var1) { + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field3917; + float var5 = this.field3914; + float var6 = this.field3909; + float var7 = this.field3920; + this.field3917 = var3 * this.field3916 + var2 * var4; + this.field3916 = var2 * this.field3916 - var3 * var4; + this.field3914 = var3 * this.field3918 + var5 * var2; + this.field3918 = this.field3918 * var2 - var3 * var5; + this.field3909 = var2 * var6 + var3 * this.field3913; + this.field3913 = var2 * this.field3913 - var3 * var6; + this.field3920 = var7 * var2 + var3 * this.field3919; + this.field3919 = var2 * this.field3919 - var7 * var3; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "1612992617" + ) + void method2333(float var1) { + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field3917; + float var5 = this.field3914; + float var6 = this.field3909; + float var7 = this.field3920; + this.field3917 = var4 * var2 - this.field3912 * var3; + this.field3912 = this.field3912 * var2 + var4 * var3; + this.field3914 = var5 * var2 - var3 * this.field3910; + this.field3910 = var2 * this.field3910 + var3 * var5; + this.field3909 = var6 * var2 - var3 * this.field3911; + this.field3911 = var3 * var6 + var2 * this.field3911; + this.field3920 = var7 * var2 - var3 * this.field3915; + this.field3915 = var3 * var7 + this.field3915 * var2; + } + + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)F", - garbageValue = "-718087487" + descriptor = "(FFFB)V", + garbageValue = "4" ) - final float method2328() { - return (float)Math.sqrt((double)(this.field3893 * this.field3893 + this.field3895 * this.field3895 + this.field3894 * this.field3894)); + void method2334(float var1, float var2, float var3) { + this.field3920 += var1; + this.field3915 += var2; + this.field3919 += var3; } @Export("toString") @ObfuscatedName("toString") public String toString() { - return this.field3893 + ", " + this.field3895 + ", " + this.field3894; + return this.field3917 + "," + this.field3914 + "," + this.field3909 + "," + this.field3920 + "\n" + this.field3912 + "," + this.field3910 + "," + this.field3911 + "," + this.field3915 + "\n" + this.field3916 + "," + this.field3918 + "," + this.field3913 + "," + this.field3919; } - @ObfuscatedName("lt") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lnm;S)Ljava/lang/String;", - garbageValue = "-20030" + descriptor = "(ILdt;ZB)I", + garbageValue = "-99" ) - static String method2329(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; + static int method2335(int var0, Script var1, boolean var2) { + if (var0 == 3300) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.cycle; + return 1; + } else { + int var3; + int var4; + if (var0 == 3301) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = ClientPreferences.method535(var3, var4); + return 1; + } else if (var0 == 3302) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class182.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == 3303) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class27.method114(var3, var4); + return 1; + } else if (var0 == 3304) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = LoginPacket.getInvDefinition(var3).size; + return 1; + } else if (var0 == 3305) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } else if (var0 == 3306) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } else if (var0 == 3307) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; + } else { + int var5; + if (var0 == 3308) { + var3 = ItemLayer.Client_plane; + var4 = (class229.localPlayer.x >> 7) + NewShit.baseX; + var5 = (class229.localPlayer.y >> 7) + class101.baseY; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } else if (var0 == 3309) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } else if (var0 == 3310) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } else if (var0 == 3311) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } else if (var0 == 3312) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } else if (var0 == 3313) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = ClientPreferences.method535(var3, var4); + return 1; + } else if (var0 == 3314) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class182.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == 3315) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class27.method114(var3, var4); + return 1; + } else if (var0 == 3316) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; } - var0 = var0.substring(0, var3) + class517.method2534(VarcInt.method977(var1, var2 - 1)) + var0.substring(var3 + 2); + return 1; + } else if (var0 == 3317) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } else if (var0 == 3318) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } else if (var0 == 3321) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.runEnergy / 100; + return 1; + } else if (var0 == 3322) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.weight; + return 1; + } else if (var0 == 3323) { + if (Client.playerMod) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 3324) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } else if (var0 == 3325) { + DbTableType.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == 3326) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.lastMouseRecordX; + return 1; + } else if (var0 == 3327) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.lastMouseRecordY; + return 1; + } else if (var0 == 3331) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; + } else if (var0 == 3332) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Client.field564[var3]; + return 1; + } else { + return 2; } } } - - return var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class464.java b/osrs/src/main/java/class464.java index b3b634f8c..e5b70c4d4 100644 --- a/osrs/src/main/java/class464.java +++ b/osrs/src/main/java/class464.java @@ -1,124 +1,14 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rd") -public final class class464 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "[Lrd;" - ) - static class464[] field3898; - @ObfuscatedName("al") - static int field3897; - @ObfuscatedName("ak") - static int field3896; - @ObfuscatedName("ax") - float field3902; - @ObfuscatedName("ao") - float field3900; +@ObfuscatedName("ri") +public class class464 { + @ObfuscatedName("at") + float[] field3921; @ObfuscatedName("ah") - float field3899; - @ObfuscatedName("ar") - float field3901; + int field3922; - static { - field3898 = new class464[0]; - class146.method768(100); - new class464(); - } - - class464() { - this.method2333(); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1744815510" - ) - public void method2330() { - synchronized(field3898) { - if (field3896 < field3897 - 1) { - field3898[++field3896 - 1] = this; - } - - } - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(FFFFI)V", - garbageValue = "1915313855" - ) - void method2331(float var1, float var2, float var3, float var4) { - this.field3902 = var1; - this.field3900 = var2; - this.field3899 = var3; - this.field3901 = var4; - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(FFFFI)V", - garbageValue = "-1238110919" - ) - public void method2332(float var1, float var2, float var3, float var4) { - float var5 = (float)Math.sin((double)(0.5F * var4)); - float var6 = (float)Math.cos((double)(0.5F * var4)); - this.field3902 = var1 * var5; - this.field3900 = var5 * var2; - this.field3899 = var5 * var3; - this.field3901 = var6; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "33554432" - ) - final void method2333() { - this.field3899 = 0.0F; - this.field3900 = 0.0F; - this.field3902 = 0.0F; - this.field3901 = 1.0F; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Lrd;I)V", - garbageValue = "255330704" - ) - public final void method2334(class464 var1) { - this.method2331(this.field3901 * var1.field3902 + this.field3902 * var1.field3901 + var1.field3900 * this.field3899 - var1.field3899 * this.field3900, this.field3902 * var1.field3899 + this.field3901 * var1.field3900 + (this.field3900 * var1.field3901 - this.field3899 * var1.field3902), var1.field3899 * this.field3901 + (var1.field3901 * this.field3899 + this.field3900 * var1.field3902 - this.field3902 * var1.field3900), var1.field3901 * this.field3901 - this.field3902 * var1.field3902 - var1.field3900 * this.field3900 - var1.field3899 * this.field3899); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (!(var1 instanceof class464)) { - return false; - } else { - class464 var2 = (class464)var1; - return this.field3902 == var2.field3902 && var2.field3900 == this.field3900 && this.field3899 == var2.field3899 && this.field3901 == var2.field3901; - } - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - boolean var1 = true; - float var2 = 1.0F; - var2 = this.field3902 + var2 * 31.0F; - var2 = this.field3900 + var2 * 31.0F; - var2 = 31.0F * var2 + this.field3899; - var2 = this.field3901 + var2 * 31.0F; - return (int)var2; - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - return this.field3902 + "," + this.field3900 + "," + this.field3899 + "," + this.field3901; + class464(float[] var1, int var2) { + this.field3921 = var1; + this.field3922 = var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/class465.java b/osrs/src/main/java/class465.java index cd00d5efe..c44c15bfa 100644 --- a/osrs/src/main/java/class465.java +++ b/osrs/src/main/java/class465.java @@ -2,470 +2,46 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Arrays; - -@ObfuscatedName("rb") -public final class class465 { - @ObfuscatedName("al") +@ObfuscatedName("ru") +public enum class465 implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "[Lrb;" + descriptor = "Lru;" ) - static class465[] field3907; - @ObfuscatedName("ak") - static int field3904; - @ObfuscatedName("ax") - static int field3905; + field3926(1, 1), @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lrb;" - ) - public static final class465 field3903; - @ObfuscatedName("ui") - @Export("cameraLookAtAcceleration") - static int cameraLookAtAcceleration; - @ObfuscatedName("ao") - public float[] field3908; - - static { - field3907 = new class465[0]; - class76.method430(100); - field3903 = new class465(); - } - - public class465() { - this.field3908 = new float[16]; - this.method2340(); - } - - @ObfuscatedSignature( - descriptor = "(Lrb;)V" - ) - public class465(class465 var1) { - this.field3908 = new float[16]; - this.method2342(var1); - } - - @ObfuscatedSignature( - descriptor = "(Lul;Z)V" - ) - public class465(Buffer var1, boolean var2) { - this.field3908 = new float[16]; - this.method2337(var1, var2); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-695246876" + descriptor = "Lru;" ) - public void method2336() { - synchronized(field3907) { - if (field3905 < field3904 - 1) { - field3907[++field3905 - 1] = this; - } - - } - } - - @ObfuscatedName("ax") + field3923(0, 2), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lul;ZI)V", - garbageValue = "332749023" + descriptor = "Lru;" ) - void method2337(Buffer var1, boolean var2) { - if (var2) { - class466 var3 = new class466(); - var3.method2353(class143.method756(var1.readShort())); - var3.method2354(class143.method756(var1.readShort())); - var3.method2355(class143.method756(var1.readShort())); - var3.method2356((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); - this.method2348(var3); - } else { - for (int var4 = 0; var4 < 16; ++var4) { - this.field3908[var4] = var1.method2586(); - } - } - - } - + field3925(3, 3), @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "-1165307425" + descriptor = "Lru;" ) - float[] method2338() { - float[] var1 = new float[3]; - if ((double)this.field3908[2] < 0.999D && (double)this.field3908[2] > -0.999D) { - var1[1] = (float)(-Math.asin((double)this.field3908[2])); - double var2 = Math.cos((double)var1[1]); - var1[0] = (float)Math.atan2((double)this.field3908[6] / var2, (double)this.field3908[10] / var2); - var1[2] = (float)Math.atan2((double)this.field3908[1] / var2, (double)this.field3908[0] / var2); - } else { - var1[0] = 0.0F; - var1[1] = (float)Math.atan2((double)this.field3908[2], 0.0D); - var1[2] = (float)Math.atan2((double)(-this.field3908[9]), (double)this.field3908[5]); - } - - return var1; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(B)[F", - garbageValue = "83" - ) - public float[] method2339() { - float[] var1 = new float[]{(float)(-Math.asin((double)this.field3908[6])), 0.0F, 0.0F}; - double var2 = Math.cos((double)var1[0]); - double var4; - double var6; - if (Math.abs(var2) > 0.005D) { - var4 = (double)this.field3908[2]; - var6 = (double)this.field3908[10]; - double var8 = (double)this.field3908[4]; - double var10 = (double)this.field3908[5]; - var1[1] = (float)Math.atan2(var4, var6); - var1[2] = (float)Math.atan2(var8, var10); - } else { - var4 = (double)this.field3908[1]; - var6 = (double)this.field3908[0]; - if (this.field3908[6] < 0.0F) { - var1[1] = (float)Math.atan2(var4, var6); - } else { - var1[1] = (float)(-Math.atan2(var4, var6)); - } - - var1[2] = 0.0F; - } - - return var1; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "624646995" - ) - void method2340() { - this.field3908[0] = 1.0F; - this.field3908[1] = 0.0F; - this.field3908[2] = 0.0F; - this.field3908[3] = 0.0F; - this.field3908[4] = 0.0F; - this.field3908[5] = 1.0F; - this.field3908[6] = 0.0F; - this.field3908[7] = 0.0F; - this.field3908[8] = 0.0F; - this.field3908[9] = 0.0F; - this.field3908[10] = 1.0F; - this.field3908[11] = 0.0F; - this.field3908[12] = 0.0F; - this.field3908[13] = 0.0F; - this.field3908[14] = 0.0F; - this.field3908[15] = 1.0F; - } + field3924(2, 10); @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1094416342" - ) - public void method2341() { - this.field3908[0] = 0.0F; - this.field3908[1] = 0.0F; - this.field3908[2] = 0.0F; - this.field3908[3] = 0.0F; - this.field3908[4] = 0.0F; - this.field3908[5] = 0.0F; - this.field3908[6] = 0.0F; - this.field3908[7] = 0.0F; - this.field3908[8] = 0.0F; - this.field3908[9] = 0.0F; - this.field3908[10] = 0.0F; - this.field3908[11] = 0.0F; - this.field3908[12] = 0.0F; - this.field3908[13] = 0.0F; - this.field3908[14] = 0.0F; - this.field3908[15] = 0.0F; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lrb;I)V", - garbageValue = "-1754099381" - ) - public void method2342(class465 var1) { - System.arraycopy(var1.field3908, 0, this.field3908, 0, 16); - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "-184544595" - ) - public void method2343(float var1) { - this.method2344(var1, var1, var1); - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(FFFI)V", - garbageValue = "-1816436529" - ) - public void method2344(float var1, float var2, float var3) { - this.method2340(); - this.field3908[0] = var1; - this.field3908[5] = var2; - this.field3908[10] = var3; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Lrb;B)V", - garbageValue = "6" - ) - public void method2345(class465 var1) { - for (int var2 = 0; var2 < this.field3908.length; ++var2) { - float[] var10000 = this.field3908; - var10000[var2] += var1.field3908[var2]; - } - - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Lrb;B)V", - garbageValue = "-104" - ) - public void method2346(class465 var1) { - float var2 = var1.field3908[0] * this.field3908[0] + var1.field3908[4] * this.field3908[1] + this.field3908[2] * var1.field3908[8] + var1.field3908[12] * this.field3908[3]; - float var3 = this.field3908[2] * var1.field3908[9] + this.field3908[1] * var1.field3908[5] + var1.field3908[1] * this.field3908[0] + this.field3908[3] * var1.field3908[13]; - float var4 = var1.field3908[14] * this.field3908[3] + var1.field3908[10] * this.field3908[2] + var1.field3908[6] * this.field3908[1] + var1.field3908[2] * this.field3908[0]; - float var5 = var1.field3908[15] * this.field3908[3] + var1.field3908[11] * this.field3908[2] + this.field3908[0] * var1.field3908[3] + this.field3908[1] * var1.field3908[7]; - float var6 = var1.field3908[12] * this.field3908[7] + var1.field3908[0] * this.field3908[4] + var1.field3908[4] * this.field3908[5] + this.field3908[6] * var1.field3908[8]; - float var7 = this.field3908[4] * var1.field3908[1] + var1.field3908[5] * this.field3908[5] + this.field3908[6] * var1.field3908[9] + var1.field3908[13] * this.field3908[7]; - float var8 = var1.field3908[10] * this.field3908[6] + var1.field3908[2] * this.field3908[4] + var1.field3908[6] * this.field3908[5] + this.field3908[7] * var1.field3908[14]; - float var9 = var1.field3908[11] * this.field3908[6] + this.field3908[5] * var1.field3908[7] + this.field3908[4] * var1.field3908[3] + this.field3908[7] * var1.field3908[15]; - float var10 = var1.field3908[0] * this.field3908[8] + this.field3908[9] * var1.field3908[4] + var1.field3908[8] * this.field3908[10] + var1.field3908[12] * this.field3908[11]; - float var11 = this.field3908[11] * var1.field3908[13] + this.field3908[10] * var1.field3908[9] + this.field3908[8] * var1.field3908[1] + var1.field3908[5] * this.field3908[9]; - float var12 = this.field3908[10] * var1.field3908[10] + this.field3908[9] * var1.field3908[6] + this.field3908[8] * var1.field3908[2] + var1.field3908[14] * this.field3908[11]; - float var13 = var1.field3908[3] * this.field3908[8] + var1.field3908[7] * this.field3908[9] + var1.field3908[11] * this.field3908[10] + var1.field3908[15] * this.field3908[11]; - float var14 = this.field3908[15] * var1.field3908[12] + this.field3908[14] * var1.field3908[8] + this.field3908[13] * var1.field3908[4] + this.field3908[12] * var1.field3908[0]; - float var15 = var1.field3908[13] * this.field3908[15] + var1.field3908[9] * this.field3908[14] + this.field3908[13] * var1.field3908[5] + var1.field3908[1] * this.field3908[12]; - float var16 = var1.field3908[14] * this.field3908[15] + var1.field3908[10] * this.field3908[14] + var1.field3908[6] * this.field3908[13] + var1.field3908[2] * this.field3908[12]; - float var17 = var1.field3908[11] * this.field3908[14] + this.field3908[12] * var1.field3908[3] + var1.field3908[7] * this.field3908[13] + this.field3908[15] * var1.field3908[15]; - this.field3908[0] = var2; - this.field3908[1] = var3; - this.field3908[2] = var4; - this.field3908[3] = var5; - this.field3908[4] = var6; - this.field3908[5] = var7; - this.field3908[6] = var8; - this.field3908[7] = var9; - this.field3908[8] = var10; - this.field3908[9] = var11; - this.field3908[10] = var12; - this.field3908[11] = var13; - this.field3908[12] = var14; - this.field3908[13] = var15; - this.field3908[14] = var16; - this.field3908[15] = var17; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Lrd;I)V", - garbageValue = "-2131255556" - ) - public void method2347(class464 var1) { - float var2 = var1.field3901 * var1.field3901; - float var3 = var1.field3901 * var1.field3902; - float var4 = var1.field3901 * var1.field3900; - float var5 = var1.field3901 * var1.field3899; - float var6 = var1.field3902 * var1.field3902; - float var7 = var1.field3900 * var1.field3902; - float var8 = var1.field3902 * var1.field3899; - float var9 = var1.field3900 * var1.field3900; - float var10 = var1.field3899 * var1.field3900; - float var11 = var1.field3899 * var1.field3899; - this.field3908[0] = var6 + var2 - var11 - var9; - this.field3908[1] = var7 + var7 + var5 + var5; - this.field3908[2] = var8 - var4 - var4 + var8; - this.field3908[4] = var7 - var5 - var5 + var7; - this.field3908[5] = var9 + var2 - var6 - var11; - this.field3908[6] = var10 + var3 + var10 + var3; - this.field3908[8] = var4 + var8 + var8 + var4; - this.field3908[9] = var10 + (var10 - var3 - var3); - this.field3908[10] = var11 + var2 - var9 - var6; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lrz;B)V", - garbageValue = "76" - ) - void method2348(class466 var1) { - this.field3908[0] = var1.field3911; - this.field3908[1] = var1.field3915; - this.field3908[2] = var1.field3914; - this.field3908[3] = 0.0F; - this.field3908[4] = var1.field3920; - this.field3908[5] = var1.field3917; - this.field3908[6] = var1.field3913; - this.field3908[7] = 0.0F; - this.field3908[8] = var1.field3918; - this.field3908[9] = var1.field3910; - this.field3908[10] = var1.field3916; - this.field3908[11] = 0.0F; - this.field3908[12] = var1.field3919; - this.field3908[13] = var1.field3912; - this.field3908[14] = var1.field3909; - this.field3908[15] = 1.0F; - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(B)F", - garbageValue = "-125" - ) - float method2349() { - return this.field3908[6] * this.field3908[3] * this.field3908[9] * this.field3908[12] + (this.field3908[10] * this.field3908[7] * this.field3908[1] * this.field3908[12] + (this.field3908[11] * this.field3908[4] * this.field3908[1] * this.field3908[14] + (this.field3908[14] * this.field3908[0] * this.field3908[7] * this.field3908[9] + this.field3908[15] * this.field3908[0] * this.field3908[5] * this.field3908[10] - this.field3908[14] * this.field3908[11] * this.field3908[5] * this.field3908[0] - this.field3908[15] * this.field3908[9] * this.field3908[6] * this.field3908[0] + this.field3908[11] * this.field3908[0] * this.field3908[6] * this.field3908[13] - this.field3908[10] * this.field3908[7] * this.field3908[0] * this.field3908[13] - this.field3908[10] * this.field3908[4] * this.field3908[1] * this.field3908[15]) + this.field3908[8] * this.field3908[6] * this.field3908[1] * this.field3908[15] - this.field3908[11] * this.field3908[6] * this.field3908[1] * this.field3908[12] - this.field3908[8] * this.field3908[7] * this.field3908[1] * this.field3908[14]) + this.field3908[15] * this.field3908[2] * this.field3908[4] * this.field3908[9] - this.field3908[13] * this.field3908[11] * this.field3908[2] * this.field3908[4] - this.field3908[15] * this.field3908[8] * this.field3908[5] * this.field3908[2] + this.field3908[2] * this.field3908[5] * this.field3908[11] * this.field3908[12] + this.field3908[13] * this.field3908[8] * this.field3908[7] * this.field3908[2] - this.field3908[12] * this.field3908[7] * this.field3908[2] * this.field3908[9] - this.field3908[14] * this.field3908[9] * this.field3908[4] * this.field3908[3] + this.field3908[13] * this.field3908[4] * this.field3908[3] * this.field3908[10] + this.field3908[5] * this.field3908[3] * this.field3908[8] * this.field3908[14] - this.field3908[10] * this.field3908[3] * this.field3908[5] * this.field3908[12] - this.field3908[13] * this.field3908[3] * this.field3908[6] * this.field3908[8]); - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1302965817" - ) - public void method2350() { - float var1 = 1.0F / this.method2349(); - float var2 = var1 * (this.field3908[13] * this.field3908[6] * this.field3908[11] + (this.field3908[10] * this.field3908[5] * this.field3908[15] - this.field3908[11] * this.field3908[5] * this.field3908[14] - this.field3908[15] * this.field3908[6] * this.field3908[9]) + this.field3908[7] * this.field3908[9] * this.field3908[14] - this.field3908[10] * this.field3908[7] * this.field3908[13]); - float var3 = (this.field3908[14] * this.field3908[1] * this.field3908[11] + this.field3908[15] * this.field3908[10] * -this.field3908[1] + this.field3908[15] * this.field3908[2] * this.field3908[9] - this.field3908[11] * this.field3908[2] * this.field3908[13] - this.field3908[14] * this.field3908[3] * this.field3908[9] + this.field3908[13] * this.field3908[10] * this.field3908[3]) * var1; - float var4 = (this.field3908[1] * this.field3908[6] * this.field3908[15] - this.field3908[14] * this.field3908[7] * this.field3908[1] - this.field3908[15] * this.field3908[2] * this.field3908[5] + this.field3908[13] * this.field3908[7] * this.field3908[2] + this.field3908[14] * this.field3908[3] * this.field3908[5] - this.field3908[13] * this.field3908[3] * this.field3908[6]) * var1; - float var5 = var1 * (this.field3908[9] * this.field3908[3] * this.field3908[6] + (this.field3908[11] * this.field3908[2] * this.field3908[5] + this.field3908[6] * -this.field3908[1] * this.field3908[11] + this.field3908[1] * this.field3908[7] * this.field3908[10] - this.field3908[7] * this.field3908[2] * this.field3908[9] - this.field3908[10] * this.field3908[3] * this.field3908[5])); - float var6 = var1 * (this.field3908[10] * this.field3908[7] * this.field3908[12] + (this.field3908[14] * this.field3908[11] * this.field3908[4] + this.field3908[15] * -this.field3908[4] * this.field3908[10] + this.field3908[15] * this.field3908[6] * this.field3908[8] - this.field3908[12] * this.field3908[6] * this.field3908[11] - this.field3908[14] * this.field3908[8] * this.field3908[7])); - float var7 = (this.field3908[10] * this.field3908[0] * this.field3908[15] - this.field3908[0] * this.field3908[11] * this.field3908[14] - this.field3908[15] * this.field3908[2] * this.field3908[8] + this.field3908[2] * this.field3908[11] * this.field3908[12] + this.field3908[14] * this.field3908[8] * this.field3908[3] - this.field3908[10] * this.field3908[3] * this.field3908[12]) * var1; - float var8 = var1 * (this.field3908[15] * this.field3908[6] * -this.field3908[0] + this.field3908[14] * this.field3908[7] * this.field3908[0] + this.field3908[2] * this.field3908[4] * this.field3908[15] - this.field3908[12] * this.field3908[7] * this.field3908[2] - this.field3908[14] * this.field3908[3] * this.field3908[4] + this.field3908[12] * this.field3908[3] * this.field3908[6]); - float var9 = (this.field3908[10] * this.field3908[3] * this.field3908[4] + this.field3908[7] * this.field3908[2] * this.field3908[8] + (this.field3908[11] * this.field3908[6] * this.field3908[0] - this.field3908[7] * this.field3908[0] * this.field3908[10] - this.field3908[2] * this.field3908[4] * this.field3908[11]) - this.field3908[8] * this.field3908[3] * this.field3908[6]) * var1; - float var10 = (this.field3908[15] * this.field3908[4] * this.field3908[9] - this.field3908[4] * this.field3908[11] * this.field3908[13] - this.field3908[5] * this.field3908[8] * this.field3908[15] + this.field3908[12] * this.field3908[5] * this.field3908[11] + this.field3908[13] * this.field3908[8] * this.field3908[7] - this.field3908[12] * this.field3908[7] * this.field3908[9]) * var1; - float var11 = var1 * (this.field3908[12] * this.field3908[9] * this.field3908[3] + (this.field3908[15] * this.field3908[1] * this.field3908[8] + this.field3908[15] * -this.field3908[0] * this.field3908[9] + this.field3908[0] * this.field3908[11] * this.field3908[13] - this.field3908[11] * this.field3908[1] * this.field3908[12] - this.field3908[3] * this.field3908[8] * this.field3908[13])); - float var12 = (this.field3908[13] * this.field3908[4] * this.field3908[3] + this.field3908[7] * this.field3908[1] * this.field3908[12] + (this.field3908[0] * this.field3908[5] * this.field3908[15] - this.field3908[0] * this.field3908[7] * this.field3908[13] - this.field3908[15] * this.field3908[4] * this.field3908[1]) - this.field3908[5] * this.field3908[3] * this.field3908[12]) * var1; - float var13 = (this.field3908[9] * this.field3908[7] * this.field3908[0] + this.field3908[5] * -this.field3908[0] * this.field3908[11] + this.field3908[11] * this.field3908[4] * this.field3908[1] - this.field3908[7] * this.field3908[1] * this.field3908[8] - this.field3908[4] * this.field3908[3] * this.field3908[9] + this.field3908[8] * this.field3908[5] * this.field3908[3]) * var1; - float var14 = (this.field3908[12] * this.field3908[6] * this.field3908[9] + (this.field3908[13] * this.field3908[4] * this.field3908[10] + -this.field3908[4] * this.field3908[9] * this.field3908[14] + this.field3908[8] * this.field3908[5] * this.field3908[14] - this.field3908[12] * this.field3908[10] * this.field3908[5] - this.field3908[13] * this.field3908[6] * this.field3908[8])) * var1; - float var15 = (this.field3908[9] * this.field3908[0] * this.field3908[14] - this.field3908[13] * this.field3908[0] * this.field3908[10] - this.field3908[14] * this.field3908[1] * this.field3908[8] + this.field3908[10] * this.field3908[1] * this.field3908[12] + this.field3908[13] * this.field3908[8] * this.field3908[2] - this.field3908[12] * this.field3908[2] * this.field3908[9]) * var1; - float var16 = var1 * (this.field3908[4] * this.field3908[1] * this.field3908[14] + this.field3908[14] * this.field3908[5] * -this.field3908[0] + this.field3908[0] * this.field3908[6] * this.field3908[13] - this.field3908[1] * this.field3908[6] * this.field3908[12] - this.field3908[2] * this.field3908[4] * this.field3908[13] + this.field3908[5] * this.field3908[2] * this.field3908[12]); - float var17 = var1 * (this.field3908[4] * this.field3908[2] * this.field3908[9] + this.field3908[5] * this.field3908[0] * this.field3908[10] - this.field3908[9] * this.field3908[0] * this.field3908[6] - this.field3908[10] * this.field3908[4] * this.field3908[1] + this.field3908[8] * this.field3908[1] * this.field3908[6] - this.field3908[5] * this.field3908[2] * this.field3908[8]); - this.field3908[0] = var2; - this.field3908[1] = var3; - this.field3908[2] = var4; - this.field3908[3] = var5; - this.field3908[4] = var6; - this.field3908[5] = var7; - this.field3908[6] = var8; - this.field3908[7] = var9; - this.field3908[8] = var10; - this.field3908[9] = var11; - this.field3908[10] = var12; - this.field3908[11] = var13; - this.field3908[12] = var14; - this.field3908[13] = var15; - this.field3908[14] = var16; - this.field3908[15] = var17; - } - + final int field3927; @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "1974456847" - ) - public float[] method2351() { - float[] var1 = new float[3]; - class463 var2 = new class463(this.field3908[0], this.field3908[1], this.field3908[2]); - class463 var3 = new class463(this.field3908[4], this.field3908[5], this.field3908[6]); - class463 var4 = new class463(this.field3908[8], this.field3908[9], this.field3908[10]); - var1[0] = var2.method2328(); - var1[1] = var3.method2328(); - var1[2] = var4.method2328(); - return var1; - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - StringBuilder var1 = new StringBuilder(); - this.method2339(); - this.method2338(); - - for (int var2 = 0; var2 < 4; ++var2) { - for (int var3 = 0; var3 < 4; ++var3) { - if (var3 > 0) { - var1.append("\t"); - } + final int field3928; - float var4 = this.field3908[var3 + var2 * 4]; - if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { - var4 = 0.0F; - } - - var1.append(var4); - } - - var1.append("\n"); - } - - return var1.toString(); - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - boolean var1 = true; - byte var2 = 1; - int var3 = var2 * 31 + Arrays.hashCode(this.field3908); - return var3; - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (!(var1 instanceof class465)) { - return false; - } else { - class465 var2 = (class465)var1; - - for (int var3 = 0; var3 < 16; ++var3) { - if (var2.field3908[var3] != this.field3908[var3]) { - return false; - } - } - - return true; - } + class465(int var3, int var4) { + this.field3927 = var3; + this.field3928 = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([BILjava/lang/CharSequence;B)I", - garbageValue = "-72" + descriptor = "(B)I", + garbageValue = "-11" ) - public static int method2335(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); - int var4 = var1; - - for (int var5 = 0; var5 < var3; ++var5) { - char var6 = var2.charAt(var5); - if (var6 <= 127) { - var0[var4++] = (byte)var6; - } else if (var6 <= 2047) { - var0[var4++] = (byte)(192 | var6 >> 6); - var0[var4++] = (byte)(128 | var6 & '?'); - } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); - var0[var4++] = (byte)(128 | var6 >> 6 & 63); - var0[var4++] = (byte)(128 | var6 & '?'); - } - } - - return var4 - var1; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3928; } } \ No newline at end of file diff --git a/osrs/src/main/java/class466.java b/osrs/src/main/java/class466.java index 50783011b..b622255f7 100644 --- a/osrs/src/main/java/class466.java +++ b/osrs/src/main/java/class466.java @@ -1,142 +1,34 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rz") -public class class466 { - @ObfuscatedName("ac") - float field3911; - @ObfuscatedName("al") - float field3915; - @ObfuscatedName("ak") - float field3914; - @ObfuscatedName("ax") - float field3920; - @ObfuscatedName("ao") - float field3917; - @ObfuscatedName("ah") - float field3913; - @ObfuscatedName("ar") - float field3918; - @ObfuscatedName("ab") - float field3910; - @ObfuscatedName("am") - float field3916; - @ObfuscatedName("av") - float field3919; - @ObfuscatedName("ag") - float field3912; - @ObfuscatedName("aa") - float field3909; - - static { - new class466(); - } - - class466() { - this.method2352(); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1690063443" - ) - void method2352() { - this.field3909 = 0.0F; - this.field3912 = 0.0F; - this.field3919 = 0.0F; - this.field3910 = 0.0F; - this.field3918 = 0.0F; - this.field3913 = 0.0F; - this.field3920 = 0.0F; - this.field3914 = 0.0F; - this.field3915 = 0.0F; - this.field3916 = 1.0F; - this.field3917 = 1.0F; - this.field3911 = 1.0F; - } - - @ObfuscatedName("al") +@ObfuscatedName("rx") +public class class466 implements class471 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(FB)V", - garbageValue = "-16" + descriptor = "Lty;" ) - void method2353(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field3915; - float var5 = this.field3917; - float var6 = this.field3910; - float var7 = this.field3912; - this.field3915 = var2 * var4 - var3 * this.field3914; - this.field3914 = var3 * var4 + var2 * this.field3914; - this.field3917 = var2 * var5 - this.field3913 * var3; - this.field3913 = var5 * var3 + var2 * this.field3913; - this.field3910 = var2 * var6 - this.field3916 * var3; - this.field3916 = var6 * var3 + this.field3916 * var2; - this.field3912 = var7 * var2 - this.field3909 * var3; - this.field3909 = var3 * var7 + this.field3909 * var2; - } + public final class501 field3929; - @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(FB)V", - garbageValue = "121" + descriptor = "(Ltq;)V" ) - void method2354(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field3911; - float var5 = this.field3920; - float var6 = this.field3918; - float var7 = this.field3919; - this.field3911 = var3 * this.field3914 + var2 * var4; - this.field3914 = var2 * this.field3914 - var4 * var3; - this.field3920 = var5 * var2 + var3 * this.field3913; - this.field3913 = var2 * this.field3913 - var5 * var3; - this.field3918 = var6 * var2 + var3 * this.field3916; - this.field3916 = var2 * this.field3916 - var6 * var3; - this.field3919 = this.field3909 * var3 + var7 * var2; - this.field3909 = this.field3909 * var2 - var3 * var7; + class466(class502 var1) { + this.field3929 = var1; } - @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "1352671223" + descriptor = "(Lrt;)V" ) - void method2355(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field3911; - float var5 = this.field3920; - float var6 = this.field3918; - float var7 = this.field3919; - this.field3911 = var2 * var4 - var3 * this.field3915; - this.field3915 = var3 * var4 + this.field3915 * var2; - this.field3920 = var5 * var2 - this.field3917 * var3; - this.field3917 = var5 * var3 + var2 * this.field3917; - this.field3918 = var6 * var2 - this.field3910 * var3; - this.field3910 = var6 * var3 + this.field3910 * var2; - this.field3919 = var7 * var2 - var3 * this.field3912; - this.field3912 = var3 * var7 + var2 * this.field3912; + public class466(class467 var1) { + this(new class502(var1)); } - @ObfuscatedName("ao") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(FFFI)V", - garbageValue = "1852296601" + descriptor = "(II)I", + garbageValue = "-1855937345" ) - void method2356(float var1, float var2, float var3) { - this.field3919 += var1; - this.field3912 += var2; - this.field3909 += var3; - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - return this.field3911 + "," + this.field3920 + "," + this.field3918 + "," + this.field3919 + "\n" + this.field3915 + "," + this.field3917 + "," + this.field3910 + "," + this.field3912 + "\n" + this.field3914 + "," + this.field3913 + "," + this.field3916 + "," + this.field3909; + public int method2337(int var1) { + return this.field3929.vmethod8144(var1); } } \ No newline at end of file diff --git a/osrs/src/main/java/class467.java b/osrs/src/main/java/class467.java index bbd73abac..6e58566a5 100644 --- a/osrs/src/main/java/class467.java +++ b/osrs/src/main/java/class467.java @@ -1,16 +1,74 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("rg") -public class class467 { - @ObfuscatedName("gh") - static String field3921; - @ObfuscatedName("ac") - float[] field3922; - @ObfuscatedName("al") - int field3923; +@ObfuscatedName("rt") +public abstract class class467 extends class292 implements class534 { + @ObfuscatedSignature( + descriptor = "(Lnt;Lof;I)V" + ) + protected class467(StudioGame var1, Language var2, int var3) { + super(var1, var2, var3); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IB)Lsj;", + garbageValue = "-61" + ) + @Export("vmethod8207") + protected abstract class469 vmethod8207(int var1); + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-973269100" + ) + public int method2338() { + return super.field2496; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "415168938" + ) + @Export("vmethod8697") + public Object vmethod8697(int var1) { + class469 var2 = this.vmethod8207(var1); + return var2 != null && var2.method2345() ? var2.method2346() : null; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Luj;I)Lux;", + garbageValue = "-475761809" + ) + public class535 method2340(Buffer var1) { + int var2 = var1.readUnsignedShort(); + class469 var3 = this.vmethod8207(var2); + class535 var4 = new class535(var2); + Class var5 = var3.field3930.field4130; + if (var5 == Integer.class) { + var4.field4243 = var1.readInt(); + } else if (var5 == Long.class) { + var4.field4243 = var1.readLong(); + } else if (var5 == String.class) { + var4.field4243 = var1.readStringCp1252NullCircumfixed(); + } else { + if (!class530.class.isAssignableFrom(var5)) { + throw new IllegalStateException(); + } + + try { + class530 var6 = (class530)var5.newInstance(); + var6.method2631(var1); + var4.field4243 = var6; + } catch (InstantiationException var7) { + } catch (IllegalAccessException var8) { + } + } - class467(float[] var1, int var2) { - this.field3922 = var1; - this.field3923 = var2; + return var4; } } \ No newline at end of file diff --git a/osrs/src/main/java/class468.java b/osrs/src/main/java/class468.java index 616f278d9..d95d8181a 100644 --- a/osrs/src/main/java/class468.java +++ b/osrs/src/main/java/class468.java @@ -2,46 +2,18 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sz") -public enum class468 implements class386 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lsz;" - ) - field3924(0, 1), - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lsz;" - ) - field3926(2, 2), - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lsz;" - ) - field3925(3, 3), - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lsz;" - ) - field3927(1, 10); - - @ObfuscatedName("ao") - final int field3929; - @ObfuscatedName("ah") - final int field3928; - - class468(int var3, int var4) { - this.field3929 = var3; - this.field3928 = var4; +@ObfuscatedName("sg") +public class class468 extends class469 { + public class468(int var1) { + super(var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(Luj;II)V", + garbageValue = "-1867165172" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3928; + @Export("vmethod7769") + void vmethod7769(Buffer var1, int var2) { } } \ No newline at end of file diff --git a/osrs/src/main/java/class469.java b/osrs/src/main/java/class469.java index 5fb0b5756..c66d4bd35 100644 --- a/osrs/src/main/java/class469.java +++ b/osrs/src/main/java/class469.java @@ -1,39 +1,108 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sr") -public class class469 implements class474 { - @ObfuscatedName("fa") +@ObfuscatedName("sj") +public abstract class class469 implements class291 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Ltu;" ) - static Archive field3930; - @ObfuscatedName("ac") + class514 field3930; + + class469(int var1) { + } + + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lts;" + descriptor = "(Luj;II)V", + garbageValue = "-1867165172" ) - public final class504 field3931; + @Export("vmethod7769") + abstract void vmethod7769(Buffer var1, int var2); + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lty;)V" + descriptor = "(Luj;B)V", + garbageValue = "0" ) - class469(class505 var1) { - this.field3931 = var1; + public void method2343(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; + } + + class465 var3 = (class465)class12.findEnumerated(class129.method708(), var2); + if (var3 != null) { + switch(var3.field3927) { + case 0: + class12.findEnumerated(MilliClock.method1100(), var1.readUnsignedByte()); + break; + case 1: + int var4 = var1.readUnsignedByte(); + this.field3930 = class472.method2349(var4); + if (this.field3930 != null) { + break; + } + + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4); + case 2: + var1.readStringCp1252NullCircumfixed(); + break; + default: + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); + } + } else { + this.vmethod7769(var1, var2); + } + } } + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lsm;)V" + descriptor = "(I)Z", + garbageValue = "984690534" ) - public class469(class470 var1) { - this(new class505(var1)); + boolean method2345() { + return this.field3930 != null; } @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "11" + descriptor = "(I)Ljava/lang/Object;", + garbageValue = "1989421795" ) - public int method2358(int var1) { - return this.field3931.vmethod8144(var1); + Object method2346() { + if (this.field3930 == class514.field4126) { + return 0; + } else if (this.field3930 == class514.field4124) { + return -1L; + } else { + return this.field3930 == class514.field4125 ? "" : null; + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Ltf;", + garbageValue = "1997766495" + ) + @Export("getDbRowType") + public static DbRowType getDbRowType(int var0) { + DbRowType var1 = (DbRowType)DbRowType.DBRowType_cache.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = DbRowType.field4140.takeFile(38, var0); + var1 = new DbRowType(); + if (var2 != null) { + var1.method2520(new Buffer(var2)); + } + + var1.method2523(); + DbRowType.DBRowType_cache.put(var1, (long)var0); + return var1; + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class47.java b/osrs/src/main/java/class47.java index ebb49b2ef..e4c5f2cc4 100644 --- a/osrs/src/main/java/class47.java +++ b/osrs/src/main/java/class47.java @@ -4,82 +4,144 @@ import java.util.concurrent.locks.ReentrantLock; -@ObfuscatedName("bj") +@ObfuscatedName("bx") public class class47 { - @ObfuscatedName("kz") + @ObfuscatedName("ae") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("fu") @ObfuscatedSignature( - descriptor = "[Lud;" + descriptor = "Loh;" ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; - @ObfuscatedName("ac") + @Export("archive12") + static Archive archive12; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lcw;" + descriptor = "Lcv;" ) - VorbisSample field228; - @ObfuscatedName("al") + VorbisSample field225; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lbs;" + descriptor = "Lbt;" ) - RawSound field227; - @ObfuscatedName("ak") - ReentrantLock field229; + RawSound field224; + @ObfuscatedName("ar") + ReentrantLock field226; @ObfuscatedSignature( - descriptor = "(Lcw;Lbs;)V" + descriptor = "(Lcv;Lbt;)V" ) class47(VorbisSample var1, RawSound var2) { - this.field228 = var1; - this.field227 = var2; - this.field229 = new ReentrantLock(); + this.field225 = var1; + this.field224 = var2; + this.field226 = new ReentrantLock(); } - @ObfuscatedName("al") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lom;III)Lud;", - garbageValue = "1460191246" + descriptor = "(ILdt;ZI)I", + garbageValue = "1747596015" ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - if (!class164.method862(var0, var1, var2)) { - return null; - } else { - SpritePixels var4 = new SpritePixels(); - var4.width = class159.SpriteBuffer_spriteWidth; - var4.height = class500.SpriteBuffer_spriteHeight; - var4.xOffset = class326.SpriteBuffer_xOffsets[0]; - var4.yOffset = ModelData0.SpriteBuffer_yOffsets[0]; - var4.subWidth = class59.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class544.SpriteBuffer_spriteHeights[0]; - int var5 = var4.subHeight * var4.subWidth; - byte[] var6 = AddRequestTask.SpriteBuffer_pixels[0]; - var4.pixels = new int[var5]; + static int method244(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == 100) { + DbTableType.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + if (var4 == 0) { + throw new RuntimeException(); + } else { + Widget var6 = HealthBarDefinition.widgetDefinition.method1733(var3); + if (var6.children == null) { + var6.children = new Widget[var5 + 1]; + } - for (int var7 = 0; var7 < var5; ++var7) { - var4.pixels[var7] = class372.SpriteBuffer_spritePalette[var6[var7] & 255]; - } + if (var6.children.length <= var5) { + Widget[] var7 = new Widget[var5 + 1]; - class407.method2062(); - return var4; - } - } + for (int var8 = 0; var8 < var6.children.length; ++var8) { + var7[var8] = var6.children[var8]; + } - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1083704336" - ) - static boolean method238() { - return (Client.drawPlayerNames & 2) != 0; - } + var6.children = var7; + } - @ObfuscatedName("mt") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "117649211" - ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; + if (var5 > 0 && var6.children[var5 - 1] == null) { + throw new RuntimeException("" + (var5 - 1)); + } else { + Widget var12 = new Widget(); + var12.type = var4; + var12.parentId = var12.id = var6.id; + var12.childIndex = var5; + var12.isIf3 = true; + if (var4 == 12) { + var12.method1870(); + var12.method1871().method1806(new class105(var12)); + var12.method1871().method1805(new class106(var12)); + } + + var6.children[var5] = var12; + if (var2) { + Interpreter.scriptDotWidget = var12; + } else { + HealthBar.scriptActiveWidget = var12; + } + + class159.invalidateWidget(var6); + return 1; + } + } + } else { + Widget var9; + if (var0 == 101) { + var9 = var2 ? Interpreter.scriptDotWidget : HealthBar.scriptActiveWidget; + Widget var10 = HealthBarDefinition.widgetDefinition.method1733(var9.id); + var10.children[var9.childIndex] = null; + class159.invalidateWidget(var10); + return 1; + } else if (var0 == 102) { + var9 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + var9.children = null; + class159.invalidateWidget(var9); + return 1; + } else if (var0 != 200) { + if (var0 == 201) { + var9 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + if (var9 != null) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + if (var2) { + Interpreter.scriptDotWidget = var9; + } else { + HealthBar.scriptActiveWidget = var9; + } + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + Widget var11 = HealthBarDefinition.widgetDefinition.getWidgetChild(var3, var4); + if (var11 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 1; + if (var2) { + Interpreter.scriptDotWidget = var11; + } else { + HealthBar.scriptActiveWidget = var11; + } + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class470.java b/osrs/src/main/java/class470.java index 11f467dec..429697340 100644 --- a/osrs/src/main/java/class470.java +++ b/osrs/src/main/java/class470.java @@ -1,92 +1,5 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sm") -public abstract class class470 extends class295 implements class537 { - @ObfuscatedSignature( - descriptor = "(Lnp;Loa;I)V" - ) - protected class470(StudioGame var1, Language var2, int var3) { - super(var1, var2, var3); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)Lsl;", - garbageValue = "-799452482" - ) - @Export("vmethod8207") - protected abstract class472 vmethod8207(int var1); - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1745704270" - ) - public int method2359() { - return super.field2498; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-123056323" - ) - @Export("vmethod8697") - public Object vmethod8697(int var1) { - class472 var2 = this.vmethod8207(var1); - return var2 != null && var2.method2369() ? var2.method2370() : null; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Lul;I)Lut;", - garbageValue = "-1458029459" - ) - public class538 method2361(Buffer var1) { - int var2 = var1.readUnsignedShort(); - class472 var3 = this.vmethod8207(var2); - class538 var4 = new class538(var2); - Class var5 = var3.field3932.field4134; - if (var5 == Integer.class) { - var4.field4242 = var1.readInt(); - } else if (var5 == Long.class) { - var4.field4242 = var1.readLong(); - } else if (var5 == String.class) { - var4.field4242 = var1.readStringCp1252NullCircumfixed(); - } else { - if (!class533.class.isAssignableFrom(var5)) { - throw new IllegalStateException(); - } - - try { - class533 var6 = (class533)var5.newInstance(); - var6.method2652(var1); - var4.field4242 = var6; - } catch (InstantiationException var7) { - } catch (IllegalAccessException var8) { - } - } - - return var4; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-89620142" - ) - public static void method2362() { - class319.field2789.clear(); - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "1657121032" - ) - static int method2363(int var0, Script var1, boolean var2) { - return 2; - } +@ObfuscatedName("sr") +public interface class470 { } \ No newline at end of file diff --git a/osrs/src/main/java/class471.java b/osrs/src/main/java/class471.java index 58c703142..7a0dccbe0 100644 --- a/osrs/src/main/java/class471.java +++ b/osrs/src/main/java/class471.java @@ -1,85 +1,5 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sw") -public class class471 extends class472 { - public class471(int var1) { - super(var1); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lul;IS)V", - garbageValue = "6664" - ) - @Export("vmethod7769") - void vmethod7769(Buffer var1, int var2) { - } - - @ObfuscatedName("jx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-701668096" - ) - static final void method2366() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { - if (var0.plane == class87.Client_plane && Client.cycle <= var0.cycleEnd) { - if (Client.cycle >= var0.cycleStart) { - NPC var1; - int var2; - Player var3; - if (!var0.isMoving && var0.field804 != 0) { - if (var0.field804 > 0) { - var1 = Client.npcs[var0.field804 - 1]; - if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { - var0.sourceX = var1.x; - var0.sourceY = var1.y; - var0.setDestination(var0.field800, var0.field789, var0.field797, Client.cycle); - } - } else { - var2 = -var0.field804 - 1; - if (var2 == Client.localPlayerIndex) { - var3 = TextureProvider.localPlayer; - } else { - var3 = Client.players[var2]; - } - - if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.sourceX = var3.x; - var0.sourceY = var3.y; - var0.setDestination(var0.field800, var0.field789, var0.field797, Client.cycle); - } - } - } - - if (var0.targetIndex > 0) { - var1 = Client.npcs[var0.targetIndex - 1]; - if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { - var0.setDestination(var1.x, var1.y, class115.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - if (var0.targetIndex < 0) { - var2 = -var0.targetIndex - 1; - if (var2 == Client.localPlayerIndex) { - var3 = TextureProvider.localPlayer; - } else { - var3 = Client.players[var2]; - } - - if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.setDestination(var3.x, var3.y, class115.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - var0.advance(Client.field460); - class10.scene.drawEntity(class87.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); - } - } else { - var0.remove(); - } - } - - } +@ObfuscatedName("sa") +public interface class471 extends class470 { } \ No newline at end of file diff --git a/osrs/src/main/java/class472.java b/osrs/src/main/java/class472.java index c3490de26..ba1e496d9 100644 --- a/osrs/src/main/java/class472.java +++ b/osrs/src/main/java/class472.java @@ -1,111 +1,133 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sl") -public abstract class class472 implements class294 { - @ObfuscatedName("ac") +@ObfuscatedName("si") +public class class472 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ltr;" + descriptor = "Lsi;" ) - class517 field3932; - - class472(int var1) { - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lul;IS)V", - garbageValue = "6664" - ) - @Export("vmethod7769") - abstract void vmethod7769(Buffer var1, int var2); - - @ObfuscatedName("ak") + public static final class472 field3931; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "-1679983256" + descriptor = "Lsi;" ) - public void method2368(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; - } + static final class472 field3932; + @ObfuscatedName("ar") + String field3933; - class468 var3 = (class468)SequenceDefinition.findEnumerated(class30.method120(), var2); - if (var3 != null) { - switch(var3.field3929) { - case 0: - int var5 = var1.readUnsignedByte(); - this.field3932 = Tile.method1230(var5); - if (this.field3932 != null) { - break; - } + static { + field3931 = new class472("application/json"); + field3932 = new class472("text/plain"); + } - throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); - case 1: - var1.readStringCp1252NullCircumfixed(); - break; - case 2: - class367[] var4 = new class367[]{class367.field3514, class367.field3513, class367.field3515, class367.field3512}; - SequenceDefinition.findEnumerated(var4, var1.readUnsignedByte()); - break; - default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); - } - } else { - this.vmethod7769(var1, var2); - } - } + class472(String var1) { + this.field3933 = var1; } - @ObfuscatedName("ax") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1797957438" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1925429052" ) - boolean method2369() { - return this.field3932 != null; + public String method2348() { + return this.field3933; } - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/Object;", - garbageValue = "1069039915" + descriptor = "(II)Ltu;", + garbageValue = "-2020292957" ) - Object method2370() { - if (this.field3932 == class517.field4129) { - return 0; - } else if (this.field3932 == class517.field4131) { - return -1L; + public static class514 method2349(int var0) { + int var1 = class512.field4123[var0]; + if (var1 == 1) { + return class514.field4126; + } else if (var1 == 2) { + return class514.field4125; } else { - return this.field3932 == class517.field4130 ? "" : null; + return var1 == 3 ? class514.field4124 : null; } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)[Luf;", - garbageValue = "-1429373012" + descriptor = "(I)V", + garbageValue = "-2006289317" ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field4257, FillMode.SOLID, FillMode.field4258}; + public static void method2350() { + class316.field2787.clear(); } - @ObfuscatedName("bw") + @ObfuscatedName("kn") @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "47" + descriptor = "(Luo;B)V", + garbageValue = "-41" ) - static int method2371(int var0, Script var1, boolean var2) { - if (var0 == 7463) { - boolean var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class330.method1730(var3); - return 1; + static final void method2351(PacketBuffer var0) { + var0.importIndex(); + int var1 = var0.readBits(8); + int var2; + if (var1 < Client.npcCount) { + for (var2 = var1; var2 < Client.npcCount; ++var2) { + Client.field559[++Client.field489 - 1] = Client.npcIndices[var2]; + } + } + + if (var1 > Client.npcCount) { + throw new RuntimeException(""); } else { - return 2; + Client.npcCount = 0; + + for (var2 = 0; var2 < var1; ++var2) { + int var3 = Client.npcIndices[var2]; + NPC var4 = Client.npcs[var3]; + int var5 = var0.readBits(1); + if (var5 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + } else { + int var6 = var0.readBits(2); + if (var6 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + Client.field550[++Client.field449 - 1] = var3; + } else { + int var7; + int var8; + if (var6 == 1) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + var7 = var0.readBits(3); + var4.move(var7, MoveSpeed.WALK); + var8 = var0.readBits(1); + if (var8 == 1) { + Client.field550[++Client.field449 - 1] = var3; + } + } else if (var6 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + if (var0.readBits(1) == 1) { + var7 = var0.readBits(3); + var4.move(var7, MoveSpeed.RUN); + var8 = var0.readBits(3); + var4.move(var8, MoveSpeed.RUN); + } else { + var7 = var0.readBits(3); + var4.move(var7, MoveSpeed.CRAWL); + } + + var7 = var0.readBits(1); + if (var7 == 1) { + Client.field550[++Client.field449 - 1] = var3; + } + } else if (var6 == 3) { + Client.field559[++Client.field489 - 1] = var3; + } + } + } + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class473.java b/osrs/src/main/java/class473.java index 633d34aef..51d25400b 100644 --- a/osrs/src/main/java/class473.java +++ b/osrs/src/main/java/class473.java @@ -1,5 +1,24 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("su") +import java.io.UnsupportedEncodingException; + +@ObfuscatedName("sd") public interface class473 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)Lsi;", + garbageValue = "-24" + ) + @Export("vmethod2213") + class472 vmethod2213(); + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)[B", + garbageValue = "0" + ) + @Export("vmethod7797") + byte[] vmethod7797() throws UnsupportedEncodingException; } \ No newline at end of file diff --git a/osrs/src/main/java/class474.java b/osrs/src/main/java/class474.java index fdbf4c1bc..1ff509f8a 100644 --- a/osrs/src/main/java/class474.java +++ b/osrs/src/main/java/class474.java @@ -1,5 +1,91 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("sh") -public interface class474 extends class473 { +import java.io.UnsupportedEncodingException; + +@ObfuscatedName("sv") +public class class474 implements class473 { + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lorg/json/JSONObject;" + ) + JSONObject field3934; + + public class474(byte[] var1) throws UnsupportedEncodingException { + this.method2355(var1); + } + + public class474(JSONObject var1) { + this.field3934 = var1; + } + + public class474(String var1) throws UnsupportedEncodingException { + this.method2356(var1); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)Lsi;", + garbageValue = "-24" + ) + public class472 vmethod2213() { + return class472.field3931; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)[B", + garbageValue = "0" + ) + @Export("vmethod7797") + public byte[] vmethod7797() throws UnsupportedEncodingException { + return this.field3934 == null ? new byte[0] : this.field3934.toString().getBytes("UTF-8"); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "-1436694020" + ) + void method2355(byte[] var1) throws UnsupportedEncodingException { + String var2 = new String(var1, "UTF-8"); + this.method2356(var2); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1963139059" + ) + void method2356(String var1) throws UnsupportedEncodingException { + try { + if (var1.charAt(0) == '{') { + this.field3934 = new JSONObject(var1); + } else { + if (var1.charAt(0) != '[') { + throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); + } + + JSONArray var2 = new JSONArray(var1); + this.field3934 = new JSONObject(); + this.field3934.method2727("arrayValues", var2); + } + + } catch (JSONException var3) { + throw new UnsupportedEncodingException(var3.getMessage()); + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)Lorg/json/JSONObject;", + garbageValue = "70" + ) + public JSONObject method2357() { + return this.field3934; + } } \ No newline at end of file diff --git a/osrs/src/main/java/class475.java b/osrs/src/main/java/class475.java index 64a06bd4d..dee44b95e 100644 --- a/osrs/src/main/java/class475.java +++ b/osrs/src/main/java/class475.java @@ -1,36 +1,101 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("st") -public class class475 { - @ObfuscatedName("ac") +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +@ObfuscatedName("sk") +public class class475 implements class473 { + @ObfuscatedName("at") + final Map field3935; + + public class475(Map var1) { + this.field3935 = var1; + } + + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lst;" + descriptor = "(B)Lsi;", + garbageValue = "-24" ) - public static final class475 field3933; - @ObfuscatedName("al") + @Export("vmethod2213") + public class472 vmethod2213() { + return null; + } + + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lst;" + descriptor = "(B)[B", + garbageValue = "0" ) - static final class475 field3934; - @ObfuscatedName("ak") - String field3935; - - static { - field3933 = new class475("application/json"); - field3934 = new class475("text/plain"); + @Export("vmethod7797") + public byte[] vmethod7797() throws UnsupportedEncodingException { + return this.method2361().getBytes("UTF-8"); } - class475(String var1) { - this.field3935 = var1; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-2008716639" + ) + public String method2361() throws UnsupportedEncodingException { + StringBuilder var1 = new StringBuilder(); + Iterator var2 = this.field3935.entrySet().iterator(); + + while (var2.hasNext()) { + Entry var3 = (Entry)var2.next(); + String var4 = URLEncoder.encode((String)var3.getKey(), "UTF-8"); + String var5 = URLEncoder.encode((String)var3.getValue(), "UTF-8"); + var1.append(var4).append("=").append(var5).append("&"); + } + + if (var1.length() == 0) { + return ""; + } else { + var1.deleteCharAt(var1.length() - 1); + var1.insert(0, "?"); + return var1.toString(); + } } - @ObfuscatedName("ac") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "733315880" + descriptor = "([Ljava/lang/String;[IIIB)V", + garbageValue = "-67" ) - public String method2373() { - return this.field3935; + public static void method2362(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + int var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + int var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } + } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + method2362(var0, var1, var2, var5 - 1); + method2362(var0, var1, var5 + 1, var3); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class476.java b/osrs/src/main/java/class476.java index c69c9b456..d93951b9d 100644 --- a/osrs/src/main/java/class476.java +++ b/osrs/src/main/java/class476.java @@ -1,24 +1,21 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import java.io.UnsupportedEncodingException; +@ObfuscatedName("sc") +public class class476 { + @ObfuscatedName("ab") + static final int[] field3936; + @ObfuscatedName("au") + static final int[] field3937; -@ObfuscatedName("sd") -public interface class476 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)Lst;", - garbageValue = "1" - ) - @Export("vmethod2213") - class475 vmethod2213(); + static { + field3936 = new int[16384]; + field3937 = new int[16384]; + double var0 = 3.834951969714103E-4D; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "17" - ) - @Export("vmethod7797") - byte[] vmethod7797() throws UnsupportedEncodingException; + for (int var2 = 0; var2 < 16384; ++var2) { + field3936[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); + field3937[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/class477.java b/osrs/src/main/java/class477.java index c59b17bdf..a906811eb 100644 --- a/osrs/src/main/java/class477.java +++ b/osrs/src/main/java/class477.java @@ -1,91 +1,21 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import java.io.UnsupportedEncodingException; - -@ObfuscatedName("si") -public class class477 implements class476 { - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lorg/json/JSONObject;" - ) - JSONObject field3936; - - public class477(byte[] var1) throws UnsupportedEncodingException { - this.method2377(var1); - } - - public class477(JSONObject var1) { - this.field3936 = var1; - } - - public class477(String var1) throws UnsupportedEncodingException { - this.method2378(var1); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)Lst;", - garbageValue = "1" - ) - public class475 vmethod2213() { - return class475.field3933; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "17" - ) - @Export("vmethod7797") - public byte[] vmethod7797() throws UnsupportedEncodingException { - return this.field3936 == null ? new byte[0] : this.field3936.toString().getBytes("UTF-8"); - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-1876533299" - ) - void method2377(byte[] var1) throws UnsupportedEncodingException { - String var2 = new String(var1, "UTF-8"); - this.method2378(var2); - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1250526518" - ) - void method2378(String var1) throws UnsupportedEncodingException { - try { - if (var1.charAt(0) == '{') { - this.field3936 = new JSONObject(var1); - } else { - if (var1.charAt(0) != '[') { - throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); - } - - JSONArray var2 = new JSONArray(var1); - this.field3936 = new JSONObject(); - this.field3936.method2750("arrayValues", var2); - } - - } catch (JSONException var3) { - throw new UnsupportedEncodingException(var3.getMessage()); +@ObfuscatedName("sx") +public class class477 { + @ObfuscatedName("ax") + static final int[] field3939; + @ObfuscatedName("as") + static final int[] field3938; + + static { + field3939 = new int[2048]; + field3938 = new int[2048]; + double var0 = 0.0030679615757712823D; + + for (int var2 = 0; var2 < 2048; ++var2) { + field3939[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); + field3938[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); } - } - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(S)Lorg/json/JSONObject;", - garbageValue = "-32336" - ) - public JSONObject method2379() { - return this.field3936; } } \ No newline at end of file diff --git a/osrs/src/main/java/class478.java b/osrs/src/main/java/class478.java index 21b7ba4c0..3a1cdbd66 100644 --- a/osrs/src/main/java/class478.java +++ b/osrs/src/main/java/class478.java @@ -2,95 +2,236 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -@ObfuscatedName("sq") -public class class478 implements class476 { - @ObfuscatedName("ac") - final Map field3937; - - public class478(Map var1) { - this.field3937 = var1; - } - - @ObfuscatedName("ac") +@ObfuscatedName("ss") +public class class478 { + @ObfuscatedName("au") + static int[] field3942; + @ObfuscatedName("aa") + public static int[] field3940; + @ObfuscatedName("ti") @ObfuscatedSignature( - descriptor = "(B)Lst;", - garbageValue = "1" + descriptor = "Lfc;" ) - @Export("vmethod2213") - public class475 vmethod2213() { - return null; - } + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + + static { + field3942 = new int[32768]; + + for (int var0 = 0; var0 < 32768; ++var0) { + field3942[var0] = method2363(var0); + } + + if (field3940 == null) { + field3940 = new int[65536]; + double var25 = 0.949999988079071D; + + for (int var2 = 0; var2 < 65536; ++var2) { + double var3 = 0.0078125D + (double)(var2 >> 10 & 63) / 64.0D; + double var5 = (double)(var2 >> 7 & 7) / 8.0D + 0.0625D; + double var7 = (double)(var2 & 127) / 128.0D; + double var9 = var7; + double var11 = var7; + double var13 = var7; + if (var5 != 0.0D) { + double var15; + if (var7 < 0.5D) { + var15 = (1.0D + var5) * var7; + } else { + var15 = var5 + var7 - var7 * var5; + } + + double var17 = var7 * 2.0D - var15; + double var19 = var3 + 0.3333333333333333D; + if (var19 > 1.0D) { + --var19; + } + + double var23 = var3 - 0.3333333333333333D; + if (var23 < 0.0D) { + ++var23; + } + + if (var19 * 6.0D < 1.0D) { + var9 = var17 + var19 * (var15 - var17) * 6.0D; + } else if (2.0D * var19 < 1.0D) { + var9 = var15; + } else if (3.0D * var19 < 2.0D) { + var9 = var17 + (0.6666666666666666D - var19) * (var15 - var17) * 6.0D; + } else { + var9 = var17; + } + + if (var3 * 6.0D < 1.0D) { + var11 = var17 + var3 * (var15 - var17) * 6.0D; + } else if (2.0D * var3 < 1.0D) { + var11 = var15; + } else if (3.0D * var3 < 2.0D) { + var11 = var17 + (0.6666666666666666D - var3) * (var15 - var17) * 6.0D; + } else { + var11 = var17; + } + + if (6.0D * var23 < 1.0D) { + var13 = var17 + var23 * (var15 - var17) * 6.0D; + } else if (var23 * 2.0D < 1.0D) { + var13 = var15; + } else if (var23 * 3.0D < 2.0D) { + var13 = var17 + (var15 - var17) * (0.6666666666666666D - var23) * 6.0D; + } else { + var13 = var17; + } + } + + var9 = Math.pow(var9, var25); + var11 = Math.pow(var11, var25); + var13 = Math.pow(var13, var25); + int var27 = (int)(var9 * 256.0D); + int var16 = (int)(var11 * 256.0D); + int var28 = (int)(256.0D * var13); + int var18 = var28 + (var16 << 8) + (var27 << 16); + field3940[var2] = var18 & 16777215; + } + } - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "17" - ) - @Export("vmethod7797") - public byte[] vmethod7797() throws UnsupportedEncodingException { - return this.method2383().getBytes("UTF-8"); } - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1386536231" + descriptor = "(II)I", + garbageValue = "-2145901051" ) - public String method2383() throws UnsupportedEncodingException { - StringBuilder var1 = new StringBuilder(); - Iterator var2 = this.field3937.entrySet().iterator(); - - while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); - String var4 = URLEncoder.encode((String)var3.getKey(), "UTF-8"); - String var5 = URLEncoder.encode((String)var3.getValue(), "UTF-8"); - var1.append(var4).append("=").append(var5).append("&"); + static final int method2363(int var0) { + double var1 = (double)(var0 >> 10 & 31) / 31.0D; + double var3 = (double)(var0 >> 5 & 31) / 31.0D; + double var5 = (double)(var0 & 31) / 31.0D; + double var7 = var1; + if (var3 < var1) { + var7 = var3; } - if (var1.length() == 0) { - return ""; - } else { - var1.deleteCharAt(var1.length() - 1); - var1.insert(0, "?"); - return var1.toString(); + if (var5 < var7) { + var7 = var5; + } + + double var9 = var1; + if (var3 > var1) { + var9 = var3; + } + + if (var5 > var9) { + var9 = var5; + } + + double var11 = 0.0D; + double var13 = 0.0D; + double var15 = (var9 + var7) / 2.0D; + if (var9 != var7) { + if (var15 < 0.5D) { + var13 = (var9 - var7) / (var7 + var9); + } + + if (var15 >= 0.5D) { + var13 = (var9 - var7) / (2.0D - var9 - var7); + } + + if (var1 == var9) { + var11 = (var3 - var5) / (var9 - var7); + } else if (var9 == var3) { + var11 = 2.0D + (var5 - var1) / (var9 - var7); + } else if (var5 == var9) { + var11 = (var1 - var3) / (var9 - var7) + 4.0D; + } + } + + int var17 = (int)(var11 * 256.0D / 6.0D); + var17 &= 255; + double var18 = 256.0D * var13; + if (var18 < 0.0D) { + var18 = 0.0D; + } else if (var18 > 255.0D) { + var18 = 255.0D; + } + + if (var15 > 0.7D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.75D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.85D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.95D) { + var18 /= 2.0D; + var18 = Math.floor(var18); + } + + if (var15 > 0.995D) { + var15 = 0.995D; } + + int var20 = (int)((double)(var17 / 4 * 8) + var18 / 32.0D); + return (int)(128.0D * var15) + (var20 << 7); } - @ObfuscatedName("bx") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1087819617" + descriptor = "(IB)I", + garbageValue = "124" ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; + public static int method2364(int var0) { + return 255 - (var0 & 255); } - @ObfuscatedName("lm") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "2037077846" + descriptor = "(I)V", + garbageValue = "930574871" ) - static void method2385(int var0, int var1, int var2, int var3) { - Widget var4 = class33.widgetDefinition.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - Interpreter.runScriptEvent(var5); + static void method2365() { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + class139.setLoginResponseString("", "Please enter your username/email address.", ""); + } else if (Login.Login_password.length() == 0) { + class139.setLoginResponseString("", "Please enter your password.", ""); + } else { + class139.setLoginResponseString("", "Connecting to server...", ""); + VerticalAlignment.method958(false); + WorldMapSection2.updateGameState(20); } + } + + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1143986054" + ) + static final void method2366(int var0, int var1) { + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { + if (Client.showMouseOverText) { + int var2 = Client.menuOptionsCount - 1; + String var4; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { + var4 = "Use" + " " + Client.field597 + " " + "->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { + var4 = Client.field599 + " " + Client.field598 + " " + "->"; + } else { + var4 = ReflectionCheck.method187(var2); + } + + if (Client.menuOptionsCount > 2) { + var4 = var4 + class167.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; + } - Client.selectedSpellItemId = var3; - Client.isSpellSelected = true; - JagexCache.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - class31.field82 = var2; - ClanChannelMember.invalidateWidget(var4); + GrandExchangeOfferTotalQuantityComparator.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); + } + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class479.java b/osrs/src/main/java/class479.java deleted file mode 100644 index 6c6f4c2be..000000000 --- a/osrs/src/main/java/class479.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("sy") -public class class479 { - @ObfuscatedName("ao") - static final int[] field3939; - @ObfuscatedName("ah") - static final int[] field3938; - - static { - field3939 = new int[16384]; - field3938 = new int[16384]; - double var0 = 3.834951969714103E-4D; - - for (int var2 = 0; var2 < 16384; ++var2) { - field3939[var2] = (int)(16384.0D * Math.sin(var0 * (double)var2)); - field3938[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class480.java b/osrs/src/main/java/class480.java deleted file mode 100644 index 348f5e2f8..000000000 --- a/osrs/src/main/java/class480.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("sf") -public class class480 { - @ObfuscatedName("ap") - static final int[] field3940; - @ObfuscatedName("ay") - static final int[] field3941; - - static { - field3940 = new int[2048]; - field3941 = new int[2048]; - double var0 = 0.0030679615757712823D; - - for (int var2 = 0; var2 < 2048; ++var2) { - field3940[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - field3941[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class481.java b/osrs/src/main/java/class481.java deleted file mode 100644 index b8527a403..000000000 --- a/osrs/src/main/java/class481.java +++ /dev/null @@ -1,714 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Iterator; - -@ObfuscatedName("sa") -public class class481 { - @ObfuscatedName("wb") - static Iterator field3944; - @ObfuscatedName("ah") - static int[] field3943; - @ObfuscatedName("ar") - public static int[] field3942; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lrx;" - ) - static Bounds field3945; - - static { - field3943 = new int[32768]; - - for (int var0 = 0; var0 < 32768; ++var0) { - field3943[var0] = method2386(var0); - } - - if (field3942 == null) { - field3942 = new int[65536]; - double var25 = 0.949999988079071D; - - for (int var2 = 0; var2 < 65536; ++var2) { - double var3 = 0.0078125D + (double)(var2 >> 10 & 63) / 64.0D; - double var5 = 0.0625D + (double)(var2 >> 7 & 7) / 8.0D; - double var7 = (double)(var2 & 127) / 128.0D; - double var9 = var7; - double var11 = var7; - double var13 = var7; - if (var5 != 0.0D) { - double var15; - if (var7 < 0.5D) { - var15 = (1.0D + var5) * var7; - } else { - var15 = var5 + var7 - var7 * var5; - } - - double var17 = var7 * 2.0D - var15; - double var19 = var3 + 0.3333333333333333D; - if (var19 > 1.0D) { - --var19; - } - - double var23 = var3 - 0.3333333333333333D; - if (var23 < 0.0D) { - ++var23; - } - - if (6.0D * var19 < 1.0D) { - var9 = var17 + (var15 - var17) * 6.0D * var19; - } else if (var19 * 2.0D < 1.0D) { - var9 = var15; - } else if (var19 * 3.0D < 2.0D) { - var9 = var17 + (var15 - var17) * (0.6666666666666666D - var19) * 6.0D; - } else { - var9 = var17; - } - - if (var3 * 6.0D < 1.0D) { - var11 = 6.0D * (var15 - var17) * var3 + var17; - } else if (var3 * 2.0D < 1.0D) { - var11 = var15; - } else if (var3 * 3.0D < 2.0D) { - var11 = (0.6666666666666666D - var3) * (var15 - var17) * 6.0D + var17; - } else { - var11 = var17; - } - - if (6.0D * var23 < 1.0D) { - var13 = var17 + 6.0D * (var15 - var17) * var23; - } else if (2.0D * var23 < 1.0D) { - var13 = var15; - } else if (var23 * 3.0D < 2.0D) { - var13 = var17 + 6.0D * (0.6666666666666666D - var23) * (var15 - var17); - } else { - var13 = var17; - } - } - - var9 = Math.pow(var9, var25); - var11 = Math.pow(var11, var25); - var13 = Math.pow(var13, var25); - int var27 = (int)(var9 * 256.0D); - int var16 = (int)(var11 * 256.0D); - int var28 = (int)(256.0D * var13); - int var18 = var28 + (var16 << 8) + (var27 << 16); - field3942[var2] = var18 & 16777215; - } - } - - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "68" - ) - static final int method2386(int var0) { - double var1 = (double)(var0 >> 10 & 31) / 31.0D; - double var3 = (double)(var0 >> 5 & 31) / 31.0D; - double var5 = (double)(var0 & 31) / 31.0D; - double var7 = var1; - if (var3 < var1) { - var7 = var3; - } - - if (var5 < var7) { - var7 = var5; - } - - double var9 = var1; - if (var3 > var1) { - var9 = var3; - } - - if (var5 > var9) { - var9 = var5; - } - - double var11 = 0.0D; - double var13 = 0.0D; - double var15 = (var9 + var7) / 2.0D; - if (var9 != var7) { - if (var15 < 0.5D) { - var13 = (var9 - var7) / (var9 + var7); - } - - if (var15 >= 0.5D) { - var13 = (var9 - var7) / (2.0D - var9 - var7); - } - - if (var1 == var9) { - var11 = (var3 - var5) / (var9 - var7); - } else if (var3 == var9) { - var11 = 2.0D + (var5 - var1) / (var9 - var7); - } else if (var9 == var5) { - var11 = (var1 - var3) / (var9 - var7) + 4.0D; - } - } - - int var17 = (int)(var11 * 256.0D / 6.0D); - var17 &= 255; - double var18 = var13 * 256.0D; - if (var18 < 0.0D) { - var18 = 0.0D; - } else if (var18 > 255.0D) { - var18 = 255.0D; - } - - if (var15 > 0.7D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.75D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.85D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.95D) { - var18 /= 2.0D; - var18 = Math.floor(var18); - } - - if (var15 > 0.995D) { - var15 = 0.995D; - } - - int var20 = (int)(var18 / 32.0D + (double)(var17 / 4 * 8)); - return (var20 << 7) + (int)(var15 * 128.0D); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "2" - ) - public static int method2387(int var0) { - return 255 - (var0 & 255); - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Ljt;[Lih;B)V", - garbageValue = "-54" - ) - static final void method2389(Scene var0, CollisionMap[] var1) { - int var2; - int var3; - int var4; - int var5; - for (var2 = 0; var2 < 4; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { - var5 = var2; - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 - 1; - } - - if (var5 >= 0) { - var1[var5].setBlockedByFloor(var3, var4); - } - } - } - } - } - - Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; - if (Tiles.rndHue < -8) { - Tiles.rndHue = -8; - } - - if (Tiles.rndHue > 8) { - Tiles.rndHue = 8; - } - - Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; - if (Tiles.rndLightness < -16) { - Tiles.rndLightness = -16; - } - - if (Tiles.rndLightness > 16) { - Tiles.rndLightness = 16; - } - - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int[] var10000; - int var17; - int var18; - for (var2 = 0; var2 < 4; ++var2) { - byte[][] var45 = Tiles.field835[var2]; - boolean var54 = true; - boolean var55 = true; - boolean var6 = true; - boolean var7 = true; - boolean var8 = true; - var9 = (int)Math.sqrt(5100.0D); - var10 = var9 * 768 >> 8; - - int var19; - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; - var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); - var16 = (var13 << 8) / var15; - var17 = 65536 / var15; - var18 = (var14 << 8) / var15; - var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; - int var20 = (var45[var12][var11 + 1] >> 3) + (var45[var12 - 1][var11] >> 2) + (var45[var12][var11 - 1] >> 2) + (var45[var12 + 1][var11] >> 3) + (var45[var12][var11] >> 1); - class158.field1387[var12][var11] = var19 - var20; - } - } - - for (var11 = 0; var11 < 104; ++var11) { - SecureRandomFuture.Tiles_hue[var11] = 0; - class135.Tiles_saturation[var11] = 0; - Tiles.Tiles_lightness[var11] = 0; - WorldMapSection2.Tiles_hueMultiplier[var11] = 0; - Script.field812[var11] = 0; - } - - for (var11 = -5; var11 < 109; ++var11) { - for (var12 = 0; var12 < 104; ++var12) { - var13 = var11 + 5; - int var10002; - if (var13 >= 0 && var13 < 104) { - long var46 = (long)Math.pow(2.0D, 15.0D) - 1L; - var16 = (int)var46; - var17 = World.Tiles_underlays[var2][var13][var12] & var16; - if (var17 > 0) { - FloorUnderlayDefinition var48 = KitDefinition.method979(var17 - 1); - var10000 = SecureRandomFuture.Tiles_hue; - var10000[var12] += var48.hue; - var10000 = class135.Tiles_saturation; - var10000[var12] += var48.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var12] += var48.lightness; - var10000 = WorldMapSection2.Tiles_hueMultiplier; - var10000[var12] += var48.hueMultiplier; - var10002 = Script.field812[var12]++; - } - } - - var14 = var11 - 5; - if (var14 >= 0 && var14 < 104) { - long var49 = (long)Math.pow(2.0D, 15.0D) - 1L; - var17 = (int)var49; - var18 = World.Tiles_underlays[var2][var14][var12] & var17; - if (var18 > 0) { - FloorUnderlayDefinition var51 = KitDefinition.method979(var18 - 1); - var10000 = SecureRandomFuture.Tiles_hue; - var10000[var12] -= var51.hue; - var10000 = class135.Tiles_saturation; - var10000[var12] -= var51.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var12] -= var51.lightness; - var10000 = WorldMapSection2.Tiles_hueMultiplier; - var10000[var12] -= var51.hueMultiplier; - var10002 = Script.field812[var12]--; - } - } - } - - if (var11 >= 1 && var11 < 103) { - var12 = 0; - var13 = 0; - var14 = 0; - var15 = 0; - var16 = 0; - - for (var17 = -5; var17 < 109; ++var17) { - var18 = var17 + 5; - if (var18 >= 0 && var18 < 104) { - var12 += SecureRandomFuture.Tiles_hue[var18]; - var13 += class135.Tiles_saturation[var18]; - var14 += Tiles.Tiles_lightness[var18]; - var15 += WorldMapSection2.Tiles_hueMultiplier[var18]; - var16 += Script.field812[var18]; - } - - var19 = var17 - 5; - if (var19 >= 0 && var19 < 104) { - var12 -= SecureRandomFuture.Tiles_hue[var19]; - var13 -= class135.Tiles_saturation[var19]; - var14 -= Tiles.Tiles_lightness[var19]; - var15 -= WorldMapSection2.Tiles_hueMultiplier[var19]; - var16 -= Script.field812[var19]; - } - - if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { - if (var2 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var2; - } - - long var52 = (long)Math.pow(2.0D, 15.0D) - 1L; - int var22 = (int)var52; - int var23 = World.Tiles_underlays[var2][var11][var17] & var22; - int var24 = VertexNormal.Tiles_overlays[var2][var11][var17] & var22; - if (var23 > 0 || var24 > 0) { - int var25 = Tiles.Tiles_heights[var2][var11][var17]; - int var26 = Tiles.Tiles_heights[var2][var11 + 1][var17]; - int var27 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; - int var28 = Tiles.Tiles_heights[var2][var11][var17 + 1]; - int var29 = class158.field1387[var11][var17]; - int var30 = class158.field1387[var11 + 1][var17]; - int var31 = class158.field1387[var11 + 1][var17 + 1]; - int var32 = class158.field1387[var11][var17 + 1]; - int var33 = -1; - int var34 = -1; - int var35; - int var36; - if (var23 > 0) { - var35 = var12 * 256 / var15; - var36 = var13 / var16; - int var37 = var14 / var16; - var33 = EnumComposition.method1001(var35, var36, var37); - var35 = var35 + Tiles.rndHue & 255; - var37 += Tiles.rndLightness; - if (var37 < 0) { - var37 = 0; - } else if (var37 > 255) { - var37 = 255; - } - - var34 = EnumComposition.method1001(var35, var36, var37); - } - - if (var2 > 0) { - boolean var60 = true; - if (var23 == 0 && SecureRandomFuture.Tiles_shapes[var2][var11][var17] != 0) { - var60 = false; - } - - if (var24 > 0 && !class4.method4(var24 - 1).hideUnderlay) { - var60 = false; - } - - if (var60 && var25 == var26 && var25 == var27 && var25 == var28) { - var10000 = UserComparator6.field1191[var2][var11]; - var10000[var17] |= 2340; - } - } - - var35 = 0; - if (var34 != -1) { - var35 = Rasterizer3D.Rasterizer3D_colorPalette[ScriptEvent.method472(var34, 96)]; - } - - if (var24 == 0) { - var0.addTile(var2, var11, var17, 0, 0, -1, var25, var26, var27, var28, ScriptEvent.method472(var33, var29), ScriptEvent.method472(var33, var30), ScriptEvent.method472(var33, var31), ScriptEvent.method472(var33, var32), 0, 0, 0, 0, var35, 0); - } else { - var36 = SecureRandomFuture.Tiles_shapes[var2][var11][var17] + 1; - byte var61 = class199.field1563[var2][var11][var17]; - FloorOverlayDefinition var38 = class4.method4(var24 - 1); - int var39 = var38.texture; - int var40; - int var41; - int var42; - int var43; - if (var39 >= 0) { - var41 = Rasterizer3D.clips.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); - var40 = -1; - } else if (var38.primaryRgb == 16711935) { - var40 = -2; - var39 = -1; - var41 = -2; - } else { - var40 = EnumComposition.method1001(var38.hue, var38.saturation, var38.lightness); - var42 = var38.hue + Tiles.rndHue & 255; - var43 = var38.lightness + Tiles.rndLightness; - if (var43 < 0) { - var43 = 0; - } else if (var43 > 255) { - var43 = 255; - } - - var41 = EnumComposition.method1001(var42, var38.saturation, var43); - } - - var42 = 0; - if (var41 != -2) { - var42 = Rasterizer3D.Rasterizer3D_colorPalette[FloorUnderlayDefinition.method1044(var41, 96)]; - } - - if (var38.secondaryRgb != -1) { - var43 = var38.secondaryHue + Tiles.rndHue & 255; - int var44 = var38.secondaryLightness + Tiles.rndLightness; - if (var44 < 0) { - var44 = 0; - } else if (var44 > 255) { - var44 = 255; - } - - var41 = EnumComposition.method1001(var43, var38.secondarySaturation, var44); - var42 = Rasterizer3D.Rasterizer3D_colorPalette[FloorUnderlayDefinition.method1044(var41, 96)]; - } - - var0.addTile(var2, var11, var17, var36, var61, var39, var25, var26, var27, var28, ScriptEvent.method472(var33, var29), ScriptEvent.method472(var33, var30), ScriptEvent.method472(var33, var31), ScriptEvent.method472(var33, var32), FloorUnderlayDefinition.method1044(var40, var29), FloorUnderlayDefinition.method1044(var40, var30), FloorUnderlayDefinition.method1044(var40, var31), FloorUnderlayDefinition.method1044(var40, var32), var35, var42); - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var0.setTileMinPlane(var2, var12, var11, WorldMapLabel.method1570(var2, var12, var11)); - } - } - - World.Tiles_underlays[var2] = null; - VertexNormal.Tiles_overlays[var2] = null; - SecureRandomFuture.Tiles_shapes[var2] = null; - class199.field1563[var2] = null; - Tiles.field835[var2] = null; - } - - var0.method1308(-50, -10, -50); - - for (var2 = 0; var2 < 104; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var0.setLinkBelow(var2, var3); - } - } - } - - var2 = 1; - var3 = 2; - var4 = 4; - - for (var5 = 0; var5 < 4; ++var5) { - if (var5 > 0) { - var2 <<= 3; - var3 <<= 3; - var4 <<= 3; - } - - for (int var56 = 0; var56 <= var5; ++var56) { - for (int var57 = 0; var57 <= 104; ++var57) { - for (int var58 = 0; var58 <= 104; ++var58) { - short var59; - if ((UserComparator6.field1191[var56][var58][var57] & var2) != 0) { - var9 = var57; - var10 = var57; - var11 = var56; - - for (var12 = var56; var9 > 0 && (UserComparator6.field1191[var56][var58][var9 - 1] & var2) != 0; --var9) { - } - - while (var10 < 104 && (UserComparator6.field1191[var56][var58][var10 + 1] & var2) != 0) { - ++var10; - } - - label335: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((UserComparator6.field1191[var11 - 1][var58][var13] & var2) == 0) { - break label335; - } - } - - --var11; - } - - label324: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((UserComparator6.field1191[var12 + 1][var58][var13] & var2) == 0) { - break label324; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - if (var13 >= 8) { - var59 = 240; - var15 = Tiles.Tiles_heights[var12][var58][var9] - var59; - var16 = Tiles.Tiles_heights[var11][var58][var9]; - Scene.Scene_addOccluder(var5, 1, var58 * 128, var58 * 128, var9 * 128, var10 * 128 + 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = UserComparator6.field1191[var17][var58]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((UserComparator6.field1191[var56][var58][var57] & var3) != 0) { - var9 = var58; - var10 = var58; - var11 = var56; - - for (var12 = var56; var9 > 0 && (UserComparator6.field1191[var56][var9 - 1][var57] & var3) != 0; --var9) { - } - - while (var10 < 104 && (UserComparator6.field1191[var56][var10 + 1][var57] & var3) != 0) { - ++var10; - } - - label388: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((UserComparator6.field1191[var11 - 1][var13][var57] & var3) == 0) { - break label388; - } - } - - --var11; - } - - label377: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((UserComparator6.field1191[var12 + 1][var13][var57] & var3) == 0) { - break label377; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - if (var13 >= 8) { - var59 = 240; - var15 = Tiles.Tiles_heights[var12][var9][var57] - var59; - var16 = Tiles.Tiles_heights[var11][var9][var57]; - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var57 * 128, var57 * 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = UserComparator6.field1191[var17][var18]; - var10000[var57] &= ~var3; - } - } - } - } - - if ((UserComparator6.field1191[var56][var58][var57] & var4) != 0) { - var9 = var58; - var10 = var58; - var11 = var57; - - for (var12 = var57; var11 > 0 && (UserComparator6.field1191[var56][var58][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (UserComparator6.field1191[var56][var58][var12 + 1] & var4) != 0) { - ++var12; - } - - label441: - while (var9 > 0) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((UserComparator6.field1191[var56][var9 - 1][var13] & var4) == 0) { - break label441; - } - } - - --var9; - } - - label430: - while (var10 < 104) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((UserComparator6.field1191[var56][var10 + 1][var13] & var4) == 0) { - break label430; - } - } - - ++var10; - } - - if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { - var13 = Tiles.Tiles_heights[var56][var9][var11]; - Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); - - for (var14 = var9; var14 <= var10; ++var14) { - for (var15 = var11; var15 <= var12; ++var15) { - var10000 = UserComparator6.field1191[var56][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } - } - - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1686145446" - ) - static final String method2388(int var0) { - if (var0 < 100000) { - return "" + var0 + ""; - } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; - } - } - - @ObfuscatedName("ku") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1569421925" - ) - static void method2390(int var0, int var1) { - int var2 = SoundCache.fontBold12.stringWidth("Choose Option"); - - int var3; - int var4; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - var4 = SoundCache.fontBold12.stringWidth(class169.method882(var3)); - if (var4 > var2) { - var2 = var4; - } - } - - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - var4 = var0 - var2 / 2; - if (var2 + var4 > class340.canvasWidth) { - var4 = class340.canvasWidth - var2; - } - - if (var4 < 0) { - var4 = 0; - } - - int var5 = var1; - if (var3 + var1 > class491.canvasHeight) { - var5 = class491.canvasHeight - var3; - } - - if (var5 < 0) { - var5 = 0; - } - - class28.menuX = var4; - class463.menuY = var5; - class341.menuWidth = var2; - Language.menuHeight = Client.menuOptionsCount * 15 + 22; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class487.java b/osrs/src/main/java/class487.java new file mode 100644 index 000000000..674cc8879 --- /dev/null +++ b/osrs/src/main/java/class487.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("sz") +public interface class487 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)Lsb;", + garbageValue = "-87" + ) + @Export("get") + PlatformInfo get(); +} \ No newline at end of file diff --git a/osrs/src/main/java/class488.java b/osrs/src/main/java/class488.java new file mode 100644 index 000000000..3b05d0042 --- /dev/null +++ b/osrs/src/main/java/class488.java @@ -0,0 +1,89 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("sp") +public class class488 extends class491 { + @ObfuscatedName("at") + int field3989; + @ObfuscatedName("ah") + int field3988; + @ObfuscatedName("ar") + double field3986; + @ObfuscatedName("ao") + double field3985; + @ObfuscatedName("ab") + double field3984; + @ObfuscatedName("au") + double field3987; + @ObfuscatedName("aa") + double field3983; + + public class488(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + super(var9, var10); + this.field3989 = 0; + this.field3988 = 0; + this.field3986 = 0.0D; + this.field3985 = 0.0D; + this.field3984 = 0.0D; + this.field3987 = 0.0D; + this.field3983 = 0.0D; + this.field3989 = var3; + this.field3988 = var6; + if ((var5 - var8) * (var7 - var1) == (var4 - var7) * (var8 - var2)) { + this.field3986 = (double)var4; + this.field3985 = (double)var5; + } else { + double var11 = (double)((float)(var7 + var1)) / 2.0D; + double var13 = (double)((float)(var8 + var2)) / 2.0D; + double var15 = (double)((float)(var4 + var7)) / 2.0D; + double var17 = (double)((float)(var5 + var8)) / 2.0D; + double var19 = (double)(var7 - var1) * -1.0D / (double)(var8 - var2); + double var21 = (double)(var4 - var7) * -1.0D / (double)(var5 - var8); + this.field3986 = (var19 * var11 - var21 * var15 + var17 - var13) / (var19 - var21); + this.field3985 = var13 + var19 * (this.field3986 - var11); + this.field3984 = Math.sqrt(Math.pow(this.field3986 - (double)var1, 2.0D) + Math.pow(this.field3985 - (double)var2, 2.0D)); + this.field3987 = Math.atan2((double)var2 - this.field3985, (double)var1 - this.field3986); + double var23 = Math.atan2((double)var8 - this.field3985, (double)var7 - this.field3986); + this.field3983 = Math.atan2((double)var5 - this.field3985, (double)var4 - this.field3986); + boolean var25 = this.field3987 <= var23 && var23 <= this.field3983 || this.field3983 <= var23 && var23 <= this.field3987; + if (!var25) { + this.field3983 += (double)(this.field3987 - this.field3983 > 0.0D ? 2 : -2) * 3.141592653589793D; + } + + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "2" + ) + public int vmethod2386() { + double var1 = this.method2390(); + double var3 = this.field3987 + var1 * (this.field3983 - this.field3987); + return (int)Math.round(this.field3986 + this.field3984 * Math.cos(var3)); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "124" + ) + public int vmethod2387() { + double var1 = this.method2390(); + double var3 = var1 * (this.field3983 - this.field3987) + this.field3987; + return (int)Math.round(this.field3985 + this.field3984 * Math.sin(var3)); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1254922863" + ) + @Export("vmethod2320") + public int vmethod2320() { + double var1 = this.method2390(); + return (int)Math.round((double)this.field3989 + var1 * (double)(this.field3988 - this.field3989)); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class489.java b/osrs/src/main/java/class489.java new file mode 100644 index 000000000..723a569c4 --- /dev/null +++ b/osrs/src/main/java/class489.java @@ -0,0 +1,75 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("sf") +public class class489 extends class491 { + @ObfuscatedName("wn") + static long field3990; + @ObfuscatedName("at") + int field3995; + @ObfuscatedName("ah") + int field3992; + @ObfuscatedName("ar") + int field3994; + @ObfuscatedName("ao") + int field3993; + @ObfuscatedName("ab") + int field3991; + @ObfuscatedName("au") + int field3996; + + public class489(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + super(var7, var8); + this.field3995 = 0; + this.field3992 = 0; + this.field3994 = 0; + this.field3993 = 0; + this.field3991 = 0; + this.field3996 = 0; + this.field3995 = var1; + this.field3992 = var2; + this.field3994 = var3; + this.field3993 = var4; + this.field3991 = var5; + this.field3996 = var6; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "2" + ) + public int vmethod2386() { + double var1 = this.method2390(); + return (int)Math.round((double)(this.field3993 - this.field3995) * var1 + (double)this.field3995); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "124" + ) + public int vmethod2387() { + double var1 = this.method2390(); + return (int)Math.round((double)this.field3992 + (double)(this.field3991 - this.field3992) * var1); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1254922863" + ) + public int vmethod2320() { + double var1 = this.method2390(); + return (int)Math.round((double)this.field3994 + (double)(this.field3996 - this.field3994) * var1); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1028387364" + ) + public static final boolean method2381(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class490.java b/osrs/src/main/java/class490.java index 4d8a8908d..b95a3635e 100644 --- a/osrs/src/main/java/class490.java +++ b/osrs/src/main/java/class490.java @@ -1,14 +1,28 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("sk") -public interface class490 { - @ObfuscatedName("ac") +@ObfuscatedName("sm") +public class class490 extends class492 { + @ObfuscatedName("at") + int field3998; + @ObfuscatedName("ah") + int field3997; + + public class490(int var1, int var2, int var3, int var4) { + super(var3, var4); + this.field3998 = 0; + this.field3997 = 0; + this.field3998 = var1; + this.field3997 = var2; + } + + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lsx;", - garbageValue = "-2060739021" + descriptor = "(I)I", + garbageValue = "-287739597" ) - @Export("get") - PlatformInfo get(); + public int method2385() { + double var1 = this.method2390(); + return (int)Math.round(var1 * (double)(this.field3997 - this.field3998) + (double)this.field3998); + } } \ No newline at end of file diff --git a/osrs/src/main/java/class491.java b/osrs/src/main/java/class491.java index 0d2868bdf..d569d9ad8 100644 --- a/osrs/src/main/java/class491.java +++ b/osrs/src/main/java/class491.java @@ -1,92 +1,30 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("so") -public class class491 extends class494 { - @ObfuscatedName("aq") - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("ac") - int field3992; - @ObfuscatedName("al") - int field3993; - @ObfuscatedName("ak") - double field3988; - @ObfuscatedName("ax") - double field3991; - @ObfuscatedName("ao") - double field3989; - @ObfuscatedName("ah") - double field3987; - @ObfuscatedName("ar") - double field3990; - - public class491(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - super(var9, var10); - this.field3992 = 0; - this.field3993 = 0; - this.field3988 = 0.0D; - this.field3991 = 0.0D; - this.field3989 = 0.0D; - this.field3987 = 0.0D; - this.field3990 = 0.0D; - this.field3992 = var3; - this.field3993 = var6; - if ((var5 - var8) * (var7 - var1) == (var4 - var7) * (var8 - var2)) { - this.field3988 = (double)var4; - this.field3991 = (double)var5; - } else { - double var11 = (double)((float)(var7 + var1)) / 2.0D; - double var13 = (double)((float)(var8 + var2)) / 2.0D; - double var15 = (double)((float)(var4 + var7)) / 2.0D; - double var17 = (double)((float)(var5 + var8)) / 2.0D; - double var19 = -1.0D * (double)(var7 - var1) / (double)(var8 - var2); - double var21 = (double)(var4 - var7) * -1.0D / (double)(var5 - var8); - this.field3988 = (var19 * var11 - var21 * var15 + var17 - var13) / (var19 - var21); - this.field3991 = var13 + (this.field3988 - var11) * var19; - this.field3989 = Math.sqrt(Math.pow(this.field3988 - (double)var1, 2.0D) + Math.pow(this.field3991 - (double)var2, 2.0D)); - this.field3987 = Math.atan2((double)var2 - this.field3991, (double)var1 - this.field3988); - double var23 = Math.atan2((double)var8 - this.field3991, (double)var7 - this.field3988); - this.field3990 = Math.atan2((double)var5 - this.field3991, (double)var4 - this.field3988); - boolean var25 = this.field3987 <= var23 && var23 <= this.field3990 || this.field3990 <= var23 && var23 <= this.field3987; - if (!var25) { - this.field3990 += 3.141592653589793D * (double)(this.field3987 - this.field3990 > 0.0D ? 2 : -2); - } - - } +@ObfuscatedName("sq") +public abstract class class491 extends class492 { + class491(int var1, int var2) { + super(var1, var2); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-437522182" + descriptor = "(B)I", + garbageValue = "2" ) - public int vmethod2349() { - double var1 = this.method2414(); - double var3 = this.field3987 + var1 * (this.field3990 - this.field3987); - return (int)Math.round(this.field3988 + this.field3989 * Math.cos(var3)); - } + public abstract int vmethod2386(); - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1670157872" + descriptor = "(B)I", + garbageValue = "124" ) - public int vmethod2347() { - double var1 = this.method2414(); - double var3 = (this.field3990 - this.field3987) * var1 + this.field3987; - return (int)Math.round(this.field3991 + this.field3989 * Math.sin(var3)); - } + public abstract int vmethod2387(); - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "54" + descriptor = "(I)I", + garbageValue = "1254922863" ) - @Export("vmethod2320") - public int vmethod2320() { - double var1 = this.method2414(); - return (int)Math.round(var1 * (double)(this.field3993 - this.field3992) + (double)this.field3992); - } + public abstract int vmethod2320(); } \ No newline at end of file diff --git a/osrs/src/main/java/class492.java b/osrs/src/main/java/class492.java index c91f863d7..1d485d7ec 100644 --- a/osrs/src/main/java/class492.java +++ b/osrs/src/main/java/class492.java @@ -1,87 +1,47 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Iterator; - -@ObfuscatedName("sc") -public class class492 extends class494 { +@ObfuscatedName("so") +public abstract class class492 { @ObfuscatedName("ac") - int field3994; + int field4000; @ObfuscatedName("al") - int field3997; - @ObfuscatedName("ak") - int field3996; - @ObfuscatedName("ax") - int field3999; - @ObfuscatedName("ao") - int field3998; - @ObfuscatedName("ah") - int field3995; - - public class492(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - super(var7, var8); - this.field3994 = 0; - this.field3997 = 0; - this.field3996 = 0; - this.field3999 = 0; - this.field3998 = 0; - this.field3995 = 0; - this.field3994 = var1; - this.field3997 = var2; - this.field3996 = var3; - this.field3999 = var4; - this.field3998 = var5; - this.field3995 = var6; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-437522182" - ) - public int vmethod2349() { - double var1 = this.method2414(); - return (int)Math.round(var1 * (double)(this.field3999 - this.field3994) + (double)this.field3994); + int field4001; + @ObfuscatedName("az") + double field3999; + @ObfuscatedName("ap") + int field4002; + + class492(int var1, int var2) { + this.field4000 = 0; + this.field4001 = 0; + this.field3999 = 0.0D; + this.field4002 = 0; + this.field4000 = var1; + this.field4001 = 0; + this.field4002 = var2 >= 0 && var2 <= 27 ? var2 : 0; + this.field3999 = PlayerType.method1907(this.field4001, this.field4000, this.field4002); } - @ObfuscatedName("al") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1670157872" + descriptor = "(I)V", + garbageValue = "-1511635495" ) - public int vmethod2347() { - double var1 = this.method2414(); - return (int)Math.round((double)this.field3997 + var1 * (double)(this.field3998 - this.field3997)); - } + public void method2389() { + if (this.field4001 < this.field4000) { + ++this.field4001; + this.field3999 = PlayerType.method1907(this.field4001, this.field4000, this.field4002); + } - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "54" - ) - public int vmethod2320() { - double var1 = this.method2414(); - return (int)Math.round((double)this.field3996 + (double)(this.field3995 - this.field3996) * var1); } - @ObfuscatedName("nh") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "69" + descriptor = "(B)D", + garbageValue = "-60" ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); - } - - if (class358.friendsChat != null) { - class358.friendsChat.invalidateIgnoreds(); - } - + double method2390() { + return this.field3999; } } \ No newline at end of file diff --git a/osrs/src/main/java/class493.java b/osrs/src/main/java/class493.java deleted file mode 100644 index e8d1595fa..000000000 --- a/osrs/src/main/java/class493.java +++ /dev/null @@ -1,35 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("sp") -public class class493 extends class495 { - @ObfuscatedName("ra") - @ObfuscatedSignature( - descriptor = "Lgc;" - ) - @Export("mouseWheel") - static class176 mouseWheel; - @ObfuscatedName("ac") - int field4001; - @ObfuscatedName("al") - int field4002; - - public class493(int var1, int var2, int var3, int var4) { - super(var3, var4); - this.field4001 = 0; - this.field4002 = 0; - this.field4001 = var1; - this.field4002 = var2; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-502803957" - ) - public int method2409() { - double var1 = this.method2414(); - return (int)Math.round((double)this.field4001 + var1 * (double)(this.field4002 - this.field4001)); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class494.java b/osrs/src/main/java/class494.java deleted file mode 100644 index 2016dafe9..000000000 --- a/osrs/src/main/java/class494.java +++ /dev/null @@ -1,34 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("th") -public abstract class class494 extends class495 { - class494(int var1, int var2) { - super(var1, var2); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-437522182" - ) - @Export("vmethod2349") - public abstract int vmethod2349(); - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1670157872" - ) - @Export("vmethod2347") - public abstract int vmethod2347(); - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "54" - ) - @Export("vmethod2320") - public abstract int vmethod2320(); -} \ No newline at end of file diff --git a/osrs/src/main/java/class495.java b/osrs/src/main/java/class495.java deleted file mode 100644 index 4303e75c6..000000000 --- a/osrs/src/main/java/class495.java +++ /dev/null @@ -1,67 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ti") -public abstract class class495 { - @ObfuscatedName("ab") - int field4004; - @ObfuscatedName("am") - int field4006; - @ObfuscatedName("av") - double field4003; - @ObfuscatedName("ag") - int field4005; - - class495(int var1, int var2) { - this.field4004 = 0; - this.field4006 = 0; - this.field4003 = 0.0D; - this.field4005 = 0; - this.field4004 = var1; - this.field4006 = 0; - this.field4005 = var2 >= 0 && var2 <= 27 ? var2 : 0; - this.field4003 = MenuAction.method428(this.field4006, this.field4004, this.field4005); - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2121571736" - ) - public void method2413() { - if (this.field4006 < this.field4004) { - ++this.field4006; - this.field4003 = MenuAction.method428(this.field4006, this.field4004, this.field4005); - } - - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)D", - garbageValue = "1788156713" - ) - double method2414() { - return this.field4003; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Lul;[II)[Ljava/lang/Object;", - garbageValue = "1602002103" - ) - static Object[] method2415(Buffer var0, int[] var1) { - int var2 = var0.readUShortSmart(); - Object[] var3 = new Object[var1.length * var2]; - - for (int var4 = 0; var4 < var2; ++var4) { - for (int var5 = 0; var5 < var1.length; ++var5) { - int var6 = var1.length * var4 + var5; - class517 var7 = Tile.method1230(var1[var5]); - var3[var6] = var7.method2532(var0); - } - } - - return var3; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class497.java b/osrs/src/main/java/class497.java new file mode 100644 index 000000000..2bd164677 --- /dev/null +++ b/osrs/src/main/java/class497.java @@ -0,0 +1,63 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ti") +public class class497 { + @ObfuscatedName("at") + public final Object field4074; + @ObfuscatedName("ah") + public final Object field4073; + + public class497(Object var1, Object var2) { + this.field4074 = var1; + this.field4073 = var2; + } + + @Export("toString") + @ObfuscatedName("toString") + public String toString() { + return this.field4074 + ", " + this.field4073; + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (var1 != null && var1 instanceof class497) { + class497 var2 = (class497)var1; + if (this.field4074 == null) { + if (var2.field4074 != null) { + return false; + } + } else if (!this.field4074.equals(var2.field4074)) { + return false; + } + + if (this.field4073 == null) { + if (var2.field4073 != null) { + return false; + } + } else if (!this.field4073.equals(var2.field4073)) { + return false; + } + + return true; + } else { + return false; + } + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + int var1 = 0; + if (this.field4074 != null) { + var1 += this.field4074.hashCode(); + } + + if (this.field4073 != null) { + var1 += 31 * this.field4073.hashCode(); + } + + return var1; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class5.java b/osrs/src/main/java/class5.java index 77628737c..17af1d6d7 100644 --- a/osrs/src/main/java/class5.java +++ b/osrs/src/main/java/class5.java @@ -5,40 +5,40 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -@ObfuscatedName("ah") +@ObfuscatedName("au") public class class5 implements class2 { - @ObfuscatedName("ac") - final MessageDigest field3; + @ObfuscatedName("at") + final MessageDigest field5; @ObfuscatedSignature( - descriptor = "(Lam;)V" + descriptor = "(Lal;)V" ) class5(class8 var1) { - this.field3 = this.method12(); + this.field5 = this.method12(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") boolean method8(int var1, String var2, long var3) { byte[] var5 = this.method11(var2, var3); return method9(var5) >= var1; } - @ObfuscatedName("ax") + @ObfuscatedName("ao") byte[] method11(String var1, long var2) { StringBuilder var4 = new StringBuilder(); var4.append(var1).append(Long.toHexString(var2)); - this.field3.reset(); + this.field5.reset(); try { - this.field3.update(var4.toString().getBytes("UTF-8")); + this.field5.update(var4.toString().getBytes("UTF-8")); } catch (UnsupportedEncodingException var6) { var6.printStackTrace(); } - return this.field3.digest(); + return this.field5.digest(); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") MessageDigest method12() { try { return MessageDigest.getInstance("SHA-256"); @@ -48,7 +48,7 @@ MessageDigest method12() { } } - @ObfuscatedName("al") + @ObfuscatedName("ah") static int method9(byte[] var0) { int var1 = 0; byte[] var2 = var0; @@ -65,7 +65,7 @@ static int method9(byte[] var0) { return var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") static int method10(byte var0) { int var1 = 0; if (var0 == 0) { diff --git a/osrs/src/main/java/class500.java b/osrs/src/main/java/class500.java deleted file mode 100644 index a12ea6c38..000000000 --- a/osrs/src/main/java/class500.java +++ /dev/null @@ -1,71 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -import java.io.File; - -@ObfuscatedName("tw") -public class class500 { - @ObfuscatedName("ak") - @Export("SpriteBuffer_spriteHeight") - public static int SpriteBuffer_spriteHeight; - @ObfuscatedName("ao") - @Export("cacheDir") - static File cacheDir; - @ObfuscatedName("ac") - public final Object field4079; - @ObfuscatedName("al") - public final Object field4080; - - public class500(Object var1, Object var2) { - this.field4079 = var1; - this.field4080 = var2; - } - - @Export("toString") - @ObfuscatedName("toString") - public String toString() { - return this.field4079 + ", " + this.field4080; - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (var1 != null && var1 instanceof class500) { - class500 var2 = (class500)var1; - if (this.field4079 == null) { - if (var2.field4079 != null) { - return false; - } - } else if (!this.field4079.equals(var2.field4079)) { - return false; - } - - if (this.field4080 == null) { - if (var2.field4080 != null) { - return false; - } - } else if (!this.field4080.equals(var2.field4080)) { - return false; - } - - return true; - } else { - return false; - } - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - int var1 = 0; - if (this.field4079 != null) { - var1 += this.field4079.hashCode(); - } - - if (this.field4080 != null) { - var1 += 31 * this.field4080.hashCode(); - } - - return var1; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class504.java b/osrs/src/main/java/class501.java similarity index 58% rename from osrs/src/main/java/class504.java rename to osrs/src/main/java/class501.java index 723e67b69..308b412ec 100644 --- a/osrs/src/main/java/class504.java +++ b/osrs/src/main/java/class501.java @@ -1,19 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ts") -public interface class504 extends Iterable { - @ObfuscatedName("ac") +@ObfuscatedName("ty") +public interface class501 extends Iterable { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-3541308" + descriptor = "(IB)I", + garbageValue = "-17" ) int vmethod8144(int var1); - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(ILjava/lang/Object;B)V", - garbageValue = "78" + garbageValue = "-122" ) void vmethod8143(int var1, Object var2); } \ No newline at end of file diff --git a/osrs/src/main/java/class502.java b/osrs/src/main/java/class502.java new file mode 100644 index 000000000..b07a1b568 --- /dev/null +++ b/osrs/src/main/java/class502.java @@ -0,0 +1,70 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +@ObfuscatedName("tq") +public class class502 implements class501 { + @ObfuscatedName("at") + Map field4089; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lur;" + ) + final class534 field4090; + + @ObfuscatedSignature( + descriptor = "(Lur;)V" + ) + public class502(class534 var1) { + this.field4090 = var1; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-17" + ) + @Export("vmethod8144") + public int vmethod8144(int var1) { + if (this.field4089 != null) { + class535 var2 = (class535)this.field4089.get(var1); + if (var2 != null) { + return (Integer)var2.field4243; + } + } + + return (Integer)this.field4090.vmethod8697(var1); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "-122" + ) + @Export("vmethod8143") + public void vmethod8143(int var1, Object var2) { + if (this.field4089 == null) { + this.field4089 = new HashMap(); + this.field4089.put(var1, new class535(var1, var2)); + } else { + class535 var3 = (class535)this.field4089.get(var1); + if (var3 == null) { + this.field4089.put(var1, new class535(var1, var2)); + } else { + var3.field4243 = var2; + } + } + + } + + @Export("iterator") + @ObfuscatedName("iterator") + public Iterator iterator() { + return this.field4089 == null ? Collections.emptyList().iterator() : this.field4089.values().iterator(); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class503.java b/osrs/src/main/java/class503.java new file mode 100644 index 000000000..1421ca6f6 --- /dev/null +++ b/osrs/src/main/java/class503.java @@ -0,0 +1,7 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ts") +public class class503 { + @ObfuscatedName("ax") + public static short[] field4091; +} \ No newline at end of file diff --git a/osrs/src/main/java/class505.java b/osrs/src/main/java/class505.java index 5b8e957c3..3f2ab6332 100644 --- a/osrs/src/main/java/class505.java +++ b/osrs/src/main/java/class505.java @@ -1,70 +1,14 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +@ObfuscatedName("tg") +public class class505 { + @ObfuscatedName("ar") + public static final char[] field4104; + @ObfuscatedName("ao") + public static final char[] field4103; -@ObfuscatedName("ty") -public class class505 implements class504 { - @ObfuscatedName("ac") - Map field4095; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Luv;" - ) - final class537 field4096; - - @ObfuscatedSignature( - descriptor = "(Luv;)V" - ) - public class505(class537 var1) { - this.field4096 = var1; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-3541308" - ) - @Export("vmethod8144") - public int vmethod8144(int var1) { - if (this.field4095 != null) { - class538 var2 = (class538)this.field4095.get(var1); - if (var2 != null) { - return (Integer)var2.field4242; - } - } - - return (Integer)this.field4096.vmethod8697(var1); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;B)V", - garbageValue = "78" - ) - @Export("vmethod8143") - public void vmethod8143(int var1, Object var2) { - if (this.field4095 == null) { - this.field4095 = new HashMap(); - this.field4095.put(var1, new class538(var1, var2)); - } else { - class538 var3 = (class538)this.field4095.get(var1); - if (var3 == null) { - this.field4095.put(var1, new class538(var1, var2)); - } else { - var3.field4242 = var2; - } - } - - } - - @Export("iterator") - @ObfuscatedName("iterator") - public Iterator iterator() { - return this.field4095 == null ? Collections.emptyList().iterator() : this.field4095.values().iterator(); + static { + field4104 = new char[]{' ', '\u00a0', '_', '-', '\u00e0', '\u00e1', '\u00e2', '\u00e4', '\u00e3', '\u00c0', '\u00c1', '\u00c2', '\u00c4', '\u00c3', '\u00e8', '\u00e9', '\u00ea', '\u00eb', '\u00c8', '\u00c9', '\u00ca', '\u00cb', '\u00ed', '\u00ee', '\u00ef', '\u00cd', '\u00ce', '\u00cf', '\u00f2', '\u00f3', '\u00f4', '\u00f6', '\u00f5', '\u00d2', '\u00d3', '\u00d4', '\u00d6', '\u00d5', '\u00f9', '\u00fa', '\u00fb', '\u00fc', '\u00d9', '\u00da', '\u00db', '\u00dc', '\u00e7', '\u00c7', '\u00ff', '\u0178', '\u00f1', '\u00d1', '\u00df'}; + field4103 = new char[]{'[', ']', '#'}; } } \ No newline at end of file diff --git a/osrs/src/main/java/class508.java b/osrs/src/main/java/class508.java index 95a26c534..36ceb6c3b 100644 --- a/osrs/src/main/java/class508.java +++ b/osrs/src/main/java/class508.java @@ -1,14 +1,45 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tv") -public class class508 { - @ObfuscatedName("ak") - static final char[] field4108; - @ObfuscatedName("ax") - static final char[] field4109; +import java.util.Iterator; - static { - field4108 = new char[]{' ', '\u00a0', '_', '-', '\u00e0', '\u00e1', '\u00e2', '\u00e4', '\u00e3', '\u00c0', '\u00c1', '\u00c2', '\u00c4', '\u00c3', '\u00e8', '\u00e9', '\u00ea', '\u00eb', '\u00c8', '\u00c9', '\u00ca', '\u00cb', '\u00ed', '\u00ee', '\u00ef', '\u00cd', '\u00ce', '\u00cf', '\u00f2', '\u00f3', '\u00f4', '\u00f6', '\u00f5', '\u00d2', '\u00d3', '\u00d4', '\u00d6', '\u00d5', '\u00f9', '\u00fa', '\u00fb', '\u00fc', '\u00d9', '\u00da', '\u00db', '\u00dc', '\u00e7', '\u00c7', '\u00ff', '\u0178', '\u00f1', '\u00d1', '\u00df'}; - field4109 = new char[]{'[', ']', '#'}; +@ObfuscatedName("tx") +class class508 implements Iterator { + @ObfuscatedName("at") + int field4119; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ltl;" + ) + @Export("this$0") + @ObfuscatedName("this$0") + final class509 this$0; + + @ObfuscatedSignature( + descriptor = "(Ltl;)V" + ) + class508(class509 var1) { + this.this$0 = var1; + } + + @Export("hasNext") + @ObfuscatedName("hasNext") + public boolean hasNext() { + return this.field4119 < this.this$0.method2338(); + } + + @Export("next") + @ObfuscatedName("next") + public Object next() { + int var1 = ++this.field4119 - 1; + class468 var2 = (class468)this.this$0.field4121.get((long)var1); + return var2 != null ? var2 : this.this$0.method2492(var1); + } + + @Export("remove") + @ObfuscatedName("remove") + public void remove() { + throw new UnsupportedOperationException(); } } \ No newline at end of file diff --git a/osrs/src/main/java/class509.java b/osrs/src/main/java/class509.java new file mode 100644 index 000000000..55d3c5594 --- /dev/null +++ b/osrs/src/main/java/class509.java @@ -0,0 +1,81 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.util.Iterator; + +@ObfuscatedName("tl") +public class class509 extends class467 implements class294 { + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lol;" + ) + final AbstractArchive field4122; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lls;" + ) + final DemotingHashTable field4121; + @ObfuscatedName("ao") + final int field4120; + + @ObfuscatedSignature( + descriptor = "(Lnt;ILof;Lol;)V" + ) + public class509(StudioGame var1, int var2, Language var3, AbstractArchive var4) { + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); + this.field4121 = new DemotingHashTable(64); + this.field4122 = var4; + this.field4120 = var2; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IB)Lsj;", + garbageValue = "-61" + ) + @Export("vmethod8207") + protected class469 vmethod8207(int var1) { + synchronized(this.field4121) { + class468 var2 = (class468)this.field4121.get((long)var1); + if (var2 == null) { + var2 = this.method2492(var1); + this.field4121.method1611(var2, (long)var1); + } + + return var2; + } + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(IB)Lsg;", + garbageValue = "0" + ) + class468 method2492(int var1) { + byte[] var2 = this.field4122.takeFile(this.field4120, var1); + class468 var3 = new class468(var1); + if (var2 != null) { + var3.method2343(new Buffer(var2)); + } + + return var3; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-985406624" + ) + public void method2493() { + synchronized(this.field4121) { + this.field4121.clear(); + } + } + + @Export("iterator") + @ObfuscatedName("iterator") + public Iterator iterator() { + return new class508(this); + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class51.java b/osrs/src/main/java/class51.java index de36a67f5..9becd7b06 100644 --- a/osrs/src/main/java/class51.java +++ b/osrs/src/main/java/class51.java @@ -2,12 +2,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bq") public interface class51 { - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(S)Lbu;", - garbageValue = "25906" + descriptor = "(S)Lby;", + garbageValue = "-2211" ) @Export("player") PcmPlayer player(); diff --git a/osrs/src/main/java/class510.java b/osrs/src/main/java/class510.java new file mode 100644 index 000000000..c52d41f70 --- /dev/null +++ b/osrs/src/main/java/class510.java @@ -0,0 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("tc") +public interface class510 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Luj;B)V", + garbageValue = "-42" + ) + @Export("vmethod8274") + void vmethod8274(Object var1, Buffer var2); + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Luj;B)Ljava/lang/Object;", + garbageValue = "-69" + ) + @Export("vmethod8273") + Object vmethod8273(Buffer var1); +} \ No newline at end of file diff --git a/osrs/src/main/java/class511.java b/osrs/src/main/java/class511.java index dd7fa69cd..ec60f891f 100644 --- a/osrs/src/main/java/class511.java +++ b/osrs/src/main/java/class511.java @@ -2,56 +2,184 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.Iterator; - -@ObfuscatedName("tn") -class class511 implements Iterator { - @ObfuscatedName("ac") - int field4124; - // $FF: synthetic field +@ObfuscatedName("tv") +final class class511 implements class510 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ltx;" + descriptor = "(Ljava/lang/Object;Luj;B)V", + garbageValue = "-42" ) - @Export("this$0") - @ObfuscatedName("this$0") - final class512 this$0; + @Export("vmethod8274") + public void vmethod8274(Object var1, Buffer var2) { + this.method2496((Integer)var1, var2); + } + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ltx;)V" + descriptor = "(Luj;B)Ljava/lang/Object;", + garbageValue = "-69" ) - class511(class512 var1) { - this.this$0 = var1; + @Export("vmethod8273") + public Object vmethod8273(Buffer var1) { + return var1.readInt(); } - @Export("hasNext") - @ObfuscatedName("hasNext") - public boolean hasNext() { - return this.field4124 < this.this$0.method2359(); - } - - @Export("next") - @ObfuscatedName("next") - public Object next() { - int var1 = ++this.field4124 - 1; - class471 var2 = (class471)this.this$0.field4126.get((long)var1); - return var2 != null ? var2 : this.this$0.method2515(var1); - } - - @Export("remove") - @ObfuscatedName("remove") - public void remove() { - throw new UnsupportedOperationException(); + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Integer;Luj;I)V", + garbageValue = "-1691146966" + ) + void method2496(Integer var1, Buffer var2) { + var2.writeInt(var1); } - @ObfuscatedName("mf") + @ObfuscatedName("jj") @ObfuscatedSignature( - descriptor = "(IIIIIIIB)V", - garbageValue = "0" + descriptor = "(IIIIIB)V", + garbageValue = "-83" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (class33.widgetDefinition.loadInterface(var0)) { - class108.updateInterface(class33.widgetDefinition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = class36.scene.getBoundaryObjectTag(var0, var1, var2); + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (0L != var5) { + var7 = class36.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + if (class207.method1059(var5)) { + var10 = var4; + } + + int[] var11 = class102.sceneMinimapSprite.pixels; + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; + var13 = class232.Entity_unpackID(var5); + ObjectComposition var14 = WorldMapSection2.getObjectDefinition(var13); + if (var14.mapSceneId != -1) { + IndexedSprite var15 = VarpDefinition.mapSceneSprites[var14.mapSceneId]; + if (var15 != null) { + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; + var15.drawAt(var16 + var1 * 4 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); + } + } else { + if (var9 == 0 || var9 == 2) { + if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 1) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; + } + } + + if (var9 == 3) { + if (var8 == 0) { + var11[var12] = var10; + } else if (var8 == 1) { + var11[var12 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var11[var12 + 1536] = var10; + } + } + + if (var9 == 2) { + if (var8 == 3) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 1) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; + } + } + } + } + + var5 = class36.scene.getGameObjectTag(var0, var1, var2); + if (var5 != 0L) { + var7 = class36.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = class232.Entity_unpackID(var5); + ObjectComposition var24 = WorldMapSection2.getObjectDefinition(var10); + int var19; + if (var24.mapSceneId != -1) { + IndexedSprite var18 = VarpDefinition.mapSceneSprites[var24.mapSceneId]; + if (var18 != null) { + var13 = (var24.sizeX * 4 - var18.subWidth) / 2; + var19 = (var24.sizeY * 4 - var18.subHeight) / 2; + var18.drawAt(var13 + var1 * 4 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); + } + } else if (var9 == 9) { + var12 = 15658734; + if (class207.method1059(var5)) { + var12 = 15597568; + } + + int[] var20 = class102.sceneMinimapSprite.pixels; + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; + if (var8 != 0 && var8 != 2) { + var20[var19] = var12; + var20[var19 + 1 + 512] = var12; + var20[var19 + 1024 + 2] = var12; + var20[var19 + 1536 + 3] = var12; + } else { + var20[var19 + 1536] = var12; + var20[var19 + 1 + 1024] = var12; + var20[var19 + 512 + 2] = var12; + var20[var19 + 3] = var12; + } + } + } + + var5 = class36.scene.getFloorDecorationTag(var0, var1, var2); + if (var5 != 0L) { + var7 = class232.Entity_unpackID(var5); + ObjectComposition var21 = WorldMapSection2.getObjectDefinition(var7); + if (var21.mapSceneId != -1) { + IndexedSprite var22 = VarpDefinition.mapSceneSprites[var21.mapSceneId]; + if (var22 != null) { + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; + int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; + var22.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); + } + } } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class512.java b/osrs/src/main/java/class512.java index baa289d51..a775356de 100644 --- a/osrs/src/main/java/class512.java +++ b/osrs/src/main/java/class512.java @@ -1,105 +1,11 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.Iterator; - -@ObfuscatedName("tx") -public class class512 extends class470 implements class297 { - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - final AbstractArchive field4127; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - final DemotingHashTable field4126; - @ObfuscatedName("ax") - final int field4125; - - @ObfuscatedSignature( - descriptor = "(Lnp;ILoa;Lom;)V" - ) - public class512(StudioGame var1, int var2, Language var3, AbstractArchive var4) { - super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); - this.field4126 = new DemotingHashTable(64); - this.field4127 = var4; - this.field4125 = var2; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)Lsl;", - garbageValue = "-799452482" - ) - @Export("vmethod8207") - protected class472 vmethod8207(int var1) { - synchronized(this.field4126) { - class471 var2 = (class471)this.field4126.get((long)var1); - if (var2 == null) { - var2 = this.method2515(var1); - this.field4126.method1620(var2, (long)var1); - } - - return var2; - } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(IB)Lsw;", - garbageValue = "37" - ) - class471 method2515(int var1) { - byte[] var2 = this.field4127.takeFile(this.field4125, var1); - class471 var3 = new class471(var1); - if (var2 != null) { - var3.method2368(new Buffer(var2)); - } - - return var3; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-585456351" - ) - public void method2516() { - synchronized(this.field4126) { - this.field4126.clear(); - } - } - - @Export("iterator") - @ObfuscatedName("iterator") - public Iterator iterator() { - return new class511(this); - } +@ObfuscatedName("tm") +public class class512 { @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(B)[Lun;", - garbageValue = "2" - ) - public static IndexedSprite[] method2517() { - IndexedSprite[] var0 = new IndexedSprite[class544.SpriteBuffer_spriteCount]; - - for (int var1 = 0; var1 < class544.SpriteBuffer_spriteCount; ++var1) { - IndexedSprite var2 = var0[var1] = new IndexedSprite(); - var2.width = class159.SpriteBuffer_spriteWidth; - var2.height = class500.SpriteBuffer_spriteHeight; - var2.xOffset = class326.SpriteBuffer_xOffsets[var1]; - var2.yOffset = ModelData0.SpriteBuffer_yOffsets[var1]; - var2.subWidth = class59.SpriteBuffer_spriteWidths[var1]; - var2.subHeight = class544.SpriteBuffer_spriteHeights[var1]; - var2.palette = class372.SpriteBuffer_spritePalette; - var2.pixels = AddRequestTask.SpriteBuffer_pixels[var1]; - } + static final int[] field4123; - class407.method2062(); - return var0; + static { + field4123 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } } \ No newline at end of file diff --git a/osrs/src/main/java/class513.java b/osrs/src/main/java/class513.java index 2168e4df1..41023a441 100644 --- a/osrs/src/main/java/class513.java +++ b/osrs/src/main/java/class513.java @@ -3,20 +3,33 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("td") -public interface class513 { - @ObfuscatedName("ac") +final class class513 implements class510 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lul;I)V", - garbageValue = "-397863290" + descriptor = "(Ljava/lang/Object;Luj;B)V", + garbageValue = "-42" ) @Export("vmethod8274") - void vmethod8274(Object var1, Buffer var2); + public void vmethod8274(Object var1, Buffer var2) { + this.method2500((Long)var1, var2); + } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lul;I)Ljava/lang/Object;", - garbageValue = "-1456241929" + descriptor = "(Luj;B)Ljava/lang/Object;", + garbageValue = "-69" ) @Export("vmethod8273") - Object vmethod8273(Buffer var1); + public Object vmethod8273(Buffer var1) { + return var1.readLong(); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Long;Luj;B)V", + garbageValue = "79" + ) + void method2500(Long var1, Buffer var2) { + var2.writeLong(var1); + } } \ No newline at end of file diff --git a/osrs/src/main/java/class514.java b/osrs/src/main/java/class514.java index ec155d374..f6be06004 100644 --- a/osrs/src/main/java/class514.java +++ b/osrs/src/main/java/class514.java @@ -2,34 +2,165 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tg") -final class class514 implements class513 { - @ObfuscatedName("ac") +@ObfuscatedName("tu") +public class class514 implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lul;I)V", - garbageValue = "-397863290" + descriptor = "Ltu;" ) - @Export("vmethod8274") - public void vmethod8274(Object var1, Buffer var2) { - this.method2520((Integer)var1, var2); + public static final class514 field4126; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Ltu;" + ) + public static final class514 field4124; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ltu;" + ) + public static final class514 field4125; + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("ao") + public final int field4129; + @ObfuscatedName("ab") + public final int field4128; + @ObfuscatedName("au") + public final Class field4130; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Ltc;" + ) + public final class510 field4131; + + static { + field4126 = new class514(0, 0, Integer.class, new class511()); + field4124 = new class514(1, 1, Long.class, new class513()); + field4125 = new class514(2, 2, String.class, new class515()); } - @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lul;I)Ljava/lang/Object;", - garbageValue = "-1456241929" + descriptor = "(IILjava/lang/Class;Ltc;)V" ) - @Export("vmethod8273") - public Object vmethod8273(Buffer var1) { - return var1.readInt(); + class514(int var1, int var2, Class var3, class510 var4) { + this.field4129 = var1; + this.field4128 = var2; + this.field4130 = var3; + this.field4131 = var4; } @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lul;I)V", - garbageValue = "1661995876" + descriptor = "(B)I", + garbageValue = "-11" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4128; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Luj;I)Ljava/lang/Object;", + garbageValue = "-2037622624" + ) + public Object method2506(Buffer var1) { + return this.field4131.vmethod8273(var1); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)[Ltu;", + garbageValue = "-2123619619" + ) + public static class514[] method2503() { + return new class514[]{field4126, field4124, field4125}; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;B)Ltu;", + garbageValue = "5" + ) + public static class514 method2504(Class var0) { + class514[] var1 = method2503(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + class514 var3 = var1[var2]; + if (var3.field4130 == var0) { + return var3; + } + } + + return null; + } + + @ObfuscatedName("ju") + @ObfuscatedSignature( + descriptor = "(IIIS)V", + garbageValue = "-5207" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = WorldMapDecorationType.getTileHeight(var0, var1, ItemLayer.Client_plane) - var2; + var0 -= ViewportMouse.cameraX; + var3 -= SecureRandomFuture.cameraY; + var1 -= class36.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[Varcs.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[Varcs.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[class192.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[class192.cameraYaw]; + int var8 = var6 * var1 + var0 * var7 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var3 * var5 - var4 * var1 >> 16; + var1 = var5 * var1 + var4 * var3 >> 16; + if (var1 >= 50) { + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + } + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "38" + ) + static final boolean method2508(int var0) { + if (var0 < 0) { + return false; + } else { + int var1 = Client.menuOpcodes[var0]; + if (var1 >= 2000) { + var1 -= 2000; + } + + return var1 == 1007; + } + } + + @ObfuscatedName("mv") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1571518188" ) - void method2520(Integer var1, Buffer var2) { - var2.writeInt(var1); + @Export("runIntfCloseListener") + static final void runIntfCloseListener(int var0, int var1) { + if (HealthBarDefinition.widgetDefinition.loadInterface(var0)) { + UserComparator5.runComponentCloseListeners(HealthBarDefinition.widgetDefinition.Widget_interfaceComponents[var0], var1); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class515.java b/osrs/src/main/java/class515.java index 39169f996..839908864 100644 --- a/osrs/src/main/java/class515.java +++ b/osrs/src/main/java/class515.java @@ -1,11 +1,39 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tk") -public class class515 { - @ObfuscatedName("al") - static final int[] field4128; +@ObfuscatedName("ta") +final class class515 implements class510 { + @ObfuscatedName("ox") + @Export("menuHeight") + static int menuHeight; - static { - field4128 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Luj;B)V", + garbageValue = "-42" + ) + @Export("vmethod8274") + public void vmethod8274(Object var1, Buffer var2) { + this.method2510((String)var1, var2); + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Luj;B)Ljava/lang/Object;", + garbageValue = "-69" + ) + @Export("vmethod8273") + public Object vmethod8273(Buffer var1) { + return var1.readStringCp1252NullTerminated(); + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Luj;I)V", + garbageValue = "919376125" + ) + void method2510(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); } } \ No newline at end of file diff --git a/osrs/src/main/java/class516.java b/osrs/src/main/java/class516.java index f04d30647..8fecef3af 100644 --- a/osrs/src/main/java/class516.java +++ b/osrs/src/main/java/class516.java @@ -1,35 +1,43 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tq") -final class class516 implements class513 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lul;I)V", - garbageValue = "-397863290" - ) - @Export("vmethod8274") - public void vmethod8274(Object var1, Buffer var2) { - this.method2523((Long)var1, var2); - } - +@ObfuscatedName("tj") +public final class class516 { @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lul;I)Ljava/lang/Object;", - garbageValue = "-1456241929" + descriptor = "(S)Z", + garbageValue = "6525" ) - @Export("vmethod8273") - public Object vmethod8273(Buffer var1) { - return var1.readLong(); - } + public static boolean method2513() { + boolean var0 = false; + boolean var1 = false; + if (!class316.field2798.isEmpty()) { + SongTask var2 = (SongTask)class316.field2798.get(0); + if (var2 == null) { + class316.field2798.remove(0); + } else if (var2.vmethod2142()) { + if (var2.method2156()) { + System.out.println("Error in midimanager.service: " + var2.method2158()); + var0 = true; + } else { + if (var2.method2159() != null) { + class316.field2798.add(1, var2.method2159()); + } - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lul;B)V", - garbageValue = "1" - ) - void method2523(Long var1, Buffer var2) { - var2.writeLong(var1); + var1 = var2.method2157(); + } + + class316.field2798.remove(0); + } else { + var1 = var2.method2157(); + } + } + + if (var0) { + class316.field2798.clear(); + SecureRandomCallable.method457(); + } + + return var1; } } \ No newline at end of file diff --git a/osrs/src/main/java/class517.java b/osrs/src/main/java/class517.java deleted file mode 100644 index 62b0461f4..000000000 --- a/osrs/src/main/java/class517.java +++ /dev/null @@ -1,146 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("tr") -public class class517 implements class386 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Ltr;" - ) - public static final class517 field4129; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Ltr;" - ) - public static final class517 field4131; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Ltr;" - ) - public static final class517 field4130; - @ObfuscatedName("ax") - public final int field4133; - @ObfuscatedName("ao") - public final int field4132; - @ObfuscatedName("ah") - public final Class field4134; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Ltd;" - ) - public final class513 field4135; - - static { - field4129 = new class517(2, 0, Integer.class, new class514()); - field4131 = new class517(1, 1, Long.class, new class516()); - field4130 = new class517(0, 2, String.class, new class518()); - } - - @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Ltd;)V" - ) - class517(int var1, int var2, Class var3, class513 var4) { - this.field4133 = var1; - this.field4132 = var2; - this.field4134 = var3; - this.field4135 = var4; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4132; - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lul;I)Ljava/lang/Object;", - garbageValue = "-1115238999" - ) - public Object method2532(Buffer var1) { - return this.field4135.vmethod8273(var1); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lom;Lom;ZI)V", - garbageValue = "2080268851" - ) - public static void method2530(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectComposition.ObjectDefinition_archive = var0; - ObjectComposition.ObjectDefinition_modelsArchive = var1; - ObjectComposition.ObjectDefinition_isLowDetail = var2; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-4677" - ) - public static void method2526() { - class190.field1496.clear(); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "618410019" - ) - public static boolean method2527(int var0) { - return (var0 >> 20 & 1) != 0; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)[Ltr;", - garbageValue = "-527981427" - ) - public static class517[] method2528() { - return new class517[]{field4130, field4129, field4131}; - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Class;B)Ltr;", - garbageValue = "25" - ) - public static class517 method2529(Class var0) { - class517[] var1 = method2528(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - class517 var3 = var1[var2]; - if (var3.field4134 == var0) { - return var3; - } - } - - return null; - } - - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "119" - ) - static void method2533() { - PacketBufferNode var0 = ClanChannelMember.getPacketBufferNode(ClientPacket.EVENT_WINDOW_SETTING, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(class178.getWindowedMode()); - var0.packetBuffer.writeShort(class340.canvasWidth); - var0.packetBuffer.writeShort(class491.canvasHeight); - Client.packetWriter.addNode(var0); - } - - @ObfuscatedName("mm") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-352823613" - ) - static final String method2534(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class518.java b/osrs/src/main/java/class518.java index a9c5064d4..b9a13cb34 100644 --- a/osrs/src/main/java/class518.java +++ b/osrs/src/main/java/class518.java @@ -1,35 +1,105 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("tz") -final class class518 implements class513 { - @ObfuscatedName("ac") +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@ObfuscatedName("te") +public class class518 extends DualNode { + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "[Ltu;" + ) + class514[] field4139; + @ObfuscatedName("ab") + List field4138; + @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lul;I)V", - garbageValue = "-397863290" + descriptor = "(Lol;I)V" ) - @Export("vmethod8274") - public void vmethod8274(Object var1, Buffer var2) { - this.method2535((String)var1, var2); + public class518(AbstractArchive var1, int var2) { + byte[] var3 = var1.takeFile(var2, 0); + this.method2517(new Buffer(var3)); } - @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lul;I)Ljava/lang/Object;", - garbageValue = "-1456241929" + descriptor = "(Lol;II)V" ) - @Export("vmethod8273") - public Object vmethod8273(Buffer var1) { - return var1.readStringCp1252NullTerminated(); + public class518(AbstractArchive var1, int var2, int var3) { + byte[] var4 = var1.takeFile(var2, var3 + 1); + this.method2517(new Buffer(var4)); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Luj;I)V", + garbageValue = "-1944052091" + ) + void method2517(Buffer var1) { + int var2 = var1.packBytesToInt(); + this.field4139 = new class514[var2]; + this.field4138 = new ArrayList(var2); + + for (int var3 = 0; var3 < var2; ++var3) { + this.field4139[var3] = (class514)class12.findEnumerated(class514.method2503(), var1.readUnsignedByte()); + int var4 = var1.packBytesToInt(); + HashMap var5 = new HashMap(var4); + + while (var4-- > 0) { + Object var6 = this.field4139[var3].method2506(var1); + int var7 = var1.packBytesToInt(); + ArrayList var8 = new ArrayList(); + + while (var7-- > 0) { + int var9 = var1.packBytesToInt(); + var8.add(var9); + } + + var5.put(var6, var8); + } + + this.field4138.add(var3, var5); + } + } @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lul;B)V", - garbageValue = "112" + descriptor = "(Ljava/lang/Object;IB)Ljava/util/List;", + garbageValue = "40" ) - void method2535(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); + public List method2518(Object var1, int var2) { + if (var2 < 0) { + var2 = 0; + } + + Map var3 = (Map)this.field4138.get(var2); + return (List)var3.get(var1); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)[Lup;", + garbageValue = "-1344314706" + ) + public static IndexedSprite[] method2519() { + IndexedSprite[] var0 = new IndexedSprite[class541.SpriteBuffer_spriteCount]; + + for (int var1 = 0; var1 < class541.SpriteBuffer_spriteCount; ++var1) { + IndexedSprite var2 = var0[var1] = new IndexedSprite(); + var2.width = class541.SpriteBuffer_spriteWidth; + var2.height = GrandExchangeOfferWorldComparator.SpriteBuffer_spriteHeight; + var2.xOffset = class541.SpriteBuffer_xOffsets[var1]; + var2.yOffset = class541.SpriteBuffer_yOffsets[var1]; + var2.subWidth = class541.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = class520.SpriteBuffer_spriteHeights[var1]; + var2.palette = class541.SpriteBuffer_spritePalette; + var2.pixels = class396.SpriteBuffer_pixels[var1]; + } + + class458.method2306(); + return var0; } } \ No newline at end of file diff --git a/osrs/src/main/java/class519.java b/osrs/src/main/java/class519.java deleted file mode 100644 index 8d1920d9c..000000000 --- a/osrs/src/main/java/class519.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("tj") -public final class class519 { - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lun;" - ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; -} \ No newline at end of file diff --git a/osrs/src/main/java/class520.java b/osrs/src/main/java/class520.java new file mode 100644 index 000000000..ae79a6d1d --- /dev/null +++ b/osrs/src/main/java/class520.java @@ -0,0 +1,107 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.io.*; + +@ObfuscatedName("uf") +public class class520 { + @ObfuscatedName("ar") + static final int field4148; + @ObfuscatedName("ao") + static final int field4147; + @ObfuscatedName("aa") + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; + + static { + field4148 = (int)(Math.pow(2.0D, 4.0D) - 1.0D); + field4147 = (int)(Math.pow(2.0D, 8.0D) - 1.0D); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)[Lly;", + garbageValue = "-51" + ) + public static ZoneOperation[] method2524() { + return new ZoneOperation[]{ZoneOperation.LOC_ANIM, ZoneOperation.field2616, ZoneOperation.field2620, ZoneOperation.field2618, ZoneOperation.OBJ_DEL, ZoneOperation.field2622, ZoneOperation.LOC_DEL, ZoneOperation.LOC_ADD_CHANGE, ZoneOperation.AREA_SOUND, ZoneOperation.field2625, ZoneOperation.OBJ_COUNT, ZoneOperation.MAPPROJ_ANIM, ZoneOperation.PREFETCH_GAMEOBJECTS}; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", + garbageValue = "-1924207396" + ) + static String method2525(Throwable var0) throws IOException { + String var1; + if (var0 instanceof RunException) { + RunException var2 = (RunException)var0; + var1 = var2.field4320 + " | "; + var0 = var2.parent; + } else { + var1 = ""; + } + + StringWriter var12 = new StringWriter(); + PrintWriter var3 = new PrintWriter(var12); + var0.printStackTrace(var3); + var3.close(); + String var4 = var12.toString(); + BufferedReader var5 = new BufferedReader(new StringReader(var4)); + String var6 = var5.readLine(); + + while (true) { + while (true) { + String var7 = var5.readLine(); + if (var7 == null) { + var1 = var1 + "| " + var6; + return var1; + } + + int var8 = var7.indexOf(40); + int var9 = var7.indexOf(41, var8 + 1); + if (var8 >= 0 && var9 >= 0) { + String var10 = var7.substring(var8 + 1, var9); + int var11 = var10.indexOf(".java:"); + if (var11 >= 0) { + var10 = var10.substring(0, var11) + var10.substring(var11 + 5); + var1 = var1 + var10 + ' '; + continue; + } + + var7 = var7.substring(0, var8); + } + + var7 = var7.trim(); + var7 = var7.substring(var7.lastIndexOf(32) + 1); + var7 = var7.substring(var7.lastIndexOf(9) + 1); + var1 = var1 + var7 + ' '; + } + } + } + + @ObfuscatedName("nd") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "471269719" + ) + static final void method2526() { + PacketBufferNode var0 = class113.getPacketBufferNode(ClientPacket.FREECAM_EXIT, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var0); + Interpreter.field703 = true; + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { + if (var1.type == 0 || var1.type == 3) { + class302.closeInterface(var1, true); + } + } + + if (Client.meslayerContinueWidget != null) { + class159.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + + Interpreter.field703 = false; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class521.java b/osrs/src/main/java/class521.java index 7ed33acb1..c58b336d3 100644 --- a/osrs/src/main/java/class521.java +++ b/osrs/src/main/java/class521.java @@ -1,81 +1,16 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@ObfuscatedName("uq") -public class class521 extends DualNode { - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "[Ltr;" - ) - class517[] field4142; - @ObfuscatedName("ao") - List field4141; - - @ObfuscatedSignature( - descriptor = "(Lom;I)V" - ) - public class521(AbstractArchive var1, int var2) { - byte[] var3 = var1.takeFile(var2, 0); - this.method2541(new Buffer(var3)); - } - - @ObfuscatedSignature( - descriptor = "(Lom;II)V" - ) - public class521(AbstractArchive var1, int var2, int var3) { - byte[] var4 = var1.takeFile(var2, var3 + 1); - this.method2541(new Buffer(var4)); - } - - @ObfuscatedName("ac") +@ObfuscatedName("ue") +public class class521 { + @ObfuscatedName("ak") + @Export("cacheGamebuild") + static int cacheGamebuild; + @ObfuscatedName("um") @ObfuscatedSignature( - descriptor = "(Lul;I)V", - garbageValue = "677675313" + descriptor = "Lce;" ) - void method2541(Buffer var1) { - int var2 = var1.packBytesToInt(); - this.field4142 = new class517[var2]; - this.field4141 = new ArrayList(var2); - - for (int var3 = 0; var3 < var2; ++var3) { - this.field4142[var3] = (class517)SequenceDefinition.findEnumerated(class517.method2528(), var1.readUnsignedByte()); - int var4 = var1.packBytesToInt(); - HashMap var5 = new HashMap(var4); - - while (var4-- > 0) { - Object var6 = this.field4142[var3].method2532(var1); - int var7 = var1.packBytesToInt(); - ArrayList var8 = new ArrayList(); - - while (var7-- > 0) { - int var9 = var1.packBytesToInt(); - var8.add(var9); - } - - var5.put(var6, var8); - } - - this.field4141.add(var3, var5); - } - - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;II)Ljava/util/List;", - garbageValue = "17353223" - ) - public List method2542(Object var1, int var2) { - if (var2 < 0) { - var2 = 0; - } - - Map var3 = (Map)this.field4141.get(var2); - return (List)var3.get(var1); - } + @Export("decimator") + static Decimator decimator; } \ No newline at end of file diff --git a/osrs/src/main/java/class525.java b/osrs/src/main/java/class522.java similarity index 51% rename from osrs/src/main/java/class525.java rename to osrs/src/main/java/class522.java index 5cd85763f..190669ce4 100644 --- a/osrs/src/main/java/class525.java +++ b/osrs/src/main/java/class522.java @@ -2,191 +2,191 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("um") -public enum class525 implements class386 { - @ObfuscatedName("ac") +@ObfuscatedName("ug") +public enum class522 implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4150(1), - @ObfuscatedName("al") + field4158(1), + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4154(2), - @ObfuscatedName("ak") + field4152(2), + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4153(4), - @ObfuscatedName("ax") + field4157(4), + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4157(8), - @ObfuscatedName("ao") + field4155(8), + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4168(16), - @ObfuscatedName("ah") + field4163(16), + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4165(32), - @ObfuscatedName("ar") + field4174(32), + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4171(64, true), - @ObfuscatedName("ab") + field4162(64, true), + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4162(128), - @ObfuscatedName("am") + field4164(128), + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4155(256, true), - @ObfuscatedName("av") + field4154(256, true), + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4175(512), - @ObfuscatedName("ag") + field4179(512), + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4152(1024), - @ObfuscatedName("aa") + field4156(1024), + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4161(2048), - @ObfuscatedName("ap") + field4175(2048), + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lug;" + ) + field4177(4096), + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4169(4096), + field4173(8192), @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4177(8192), - @ObfuscatedName("as") + field4178(16384), + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4172(16384), + field4169(32768), @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4167(32768), - @ObfuscatedName("an") + field4153(65536), + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4156(65536), - @ObfuscatedName("au") + field4170(131072), + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4174(131072), + field4172(262144), @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4166(262144), - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lum;" - ) - field4163(524288), + field4168(524288), @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) field4176(1048576), - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4170(2097152), - @ObfuscatedName("az") + field4166(2097152), + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4178(4194304), - @ObfuscatedName("at") + field4171(4194304), + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4173(8388608), - @ObfuscatedName("af") + field4167(8388608), + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4164(16777216), - @ObfuscatedName("ad") + field4165(16777216), + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) field4151(33554432), - @ObfuscatedName("bn") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4179(67108864, true), - @ObfuscatedName("bk") + field4180(67108864, true), + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4160(134217728), - @ObfuscatedName("by") + field4159(134217728), + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4181(268435456), - @ObfuscatedName("bd") + field4182(268435456), + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4158(536870912, true), - @ObfuscatedName("be") + field4160(536870912, true), + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4159(1073741824, true), - @ObfuscatedName("bv") + field4161(1073741824, true), + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lum;" + descriptor = "Lug;" ) - field4180(Integer.MIN_VALUE); + field4181(Integer.MIN_VALUE); - @ObfuscatedName("ba") - final int field4182; + @ObfuscatedName("bg") + final int field4183; - class525(int var3) { - this.field4182 = var3; + class522(int var3) { + this.field4183 = var3; } @ObfuscatedSignature( descriptor = "(IZ)V", garbageValue = "1" ) - class525(int var3, boolean var4) { - this.field4182 = var3; + class522(int var3, boolean var4) { + this.field4183 = var3; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4182; + return this.field4183; } } \ No newline at end of file diff --git a/osrs/src/main/java/class523.java b/osrs/src/main/java/class523.java deleted file mode 100644 index 860fecef3..000000000 --- a/osrs/src/main/java/class523.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("uu") -public class class523 { - @ObfuscatedName("ak") - static final int field4148; - @ObfuscatedName("ax") - static final int field4149; - - static { - field4148 = (int)(Math.pow(2.0D, 4.0D) - 1.0D); - field4149 = (int)(Math.pow(2.0D, 8.0D) - 1.0D); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class527.java b/osrs/src/main/java/class527.java new file mode 100644 index 000000000..d31b83221 --- /dev/null +++ b/osrs/src/main/java/class527.java @@ -0,0 +1,68 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("um") +public class class527 { + @ObfuscatedName("at") + int[] field4191; + @ObfuscatedName("ah") + short[] field4192; + + @ObfuscatedSignature( + descriptor = "(Lhw;)V" + ) + public class527(NPCComposition var1) { + this.field4191 = new int[8]; + this.field4192 = new short[8]; + int var2 = 0; + if (var1.method947()) { + var2 = var1.method948().length; + System.arraycopy(var1.method948(), 0, this.field4191, 0, var2); + System.arraycopy(var1.method950(), 0, this.field4192, 0, var2); + } + + for (int var3 = var2; var3 < 8; ++var3) { + this.field4191[var3] = -1; + this.field4192[var3] = -1; + } + + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "1522434870" + ) + public int[] method2619() { + return this.field4191; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)[S", + garbageValue = "-2015204847" + ) + public short[] method2620() { + return this.field4192; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IISI)V", + garbageValue = "-561705498" + ) + public void method2621(int var1, int var2, short var3) { + this.field4191[var1] = var2; + this.field4192[var1] = var3; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "([I[SI)V", + garbageValue = "1404172969" + ) + public void method2622(int[] var1, short[] var2) { + this.field4191 = var1; + this.field4192 = var2; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class53.java b/osrs/src/main/java/class53.java index d48bedb73..a748650a3 100644 --- a/osrs/src/main/java/class53.java +++ b/osrs/src/main/java/class53.java @@ -1,62 +1,59 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cu") +import java.util.Arrays; + +@ObfuscatedName("cg") public class class53 extends Node { - @ObfuscatedName("ry") - @ObfuscatedSignature( - descriptor = "Ltx;" - ) - @Export("Widget_cachedFonts") - static class512 Widget_cachedFonts; - @ObfuscatedName("ac") + @ObfuscatedName("cy") + static int field256; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lbj;" + descriptor = "Lbx;" ) - class47 field260; + class47 field257; public class53() { - this.field260 = null; + this.field257 = null; } @ObfuscatedSignature( - descriptor = "(Lcw;)V" + descriptor = "(Lcv;)V" ) class53(VorbisSample var1) { if (var1 != null) { - this.field260 = new class47(var1, (RawSound)null); + this.field257 = new class47(var1, (RawSound)null); } } @ObfuscatedSignature( - descriptor = "(Lbs;)V" + descriptor = "(Lbt;)V" ) public class53(RawSound var1) { - this.field260 = new class47((VorbisSample)null, var1); + this.field257 = new class47((VorbisSample)null, var1); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1320640993" + garbageValue = "-925391311" ) - public boolean method298() { - return this.field260 == null; + public boolean method303() { + return this.field257 == null; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)Lbs;", - garbageValue = "248890116" + descriptor = "(I)Lbt;", + garbageValue = "1961444927" ) - public RawSound method299() { - if (this.field260 != null && this.field260.field229.tryLock()) { + public RawSound method304() { + if (this.field257 != null && this.field257.field226.tryLock()) { RawSound var1; try { - var1 = this.method301(); + var1 = this.method306(); } finally { - this.field260.field229.unlock(); + this.field257.field226.unlock(); } return var1; @@ -65,20 +62,20 @@ public RawSound method299() { } } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Lbs;", - garbageValue = "-262816062" + descriptor = "(I)Lbt;", + garbageValue = "-96589694" ) - public RawSound method300() { - if (this.field260 != null) { - this.field260.field229.lock(); + public RawSound method305() { + if (this.field257 != null) { + this.field257.field226.lock(); RawSound var1; try { - var1 = this.method301(); + var1 = this.method306(); } finally { - this.field260.field229.unlock(); + this.field257.field226.unlock(); } return var1; @@ -87,120 +84,168 @@ public RawSound method300() { } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Lbs;", - garbageValue = "1547022770" + descriptor = "(I)Lbt;", + garbageValue = "-1970113950" ) - RawSound method301() { - if (this.field260.field227 == null) { - this.field260.field227 = this.field260.field228.toRawSound((int[])null); - this.field260.field228 = null; + RawSound method306() { + if (this.field257.field224 == null) { + this.field257.field224 = this.field257.field225.toRawSound((int[])null); + this.field257.field225 = null; } - return this.field260.field227; + return this.field257.field224; } - @ObfuscatedName("ab") + @ObfuscatedName("ht") @ObfuscatedSignature( - descriptor = "(B)Lcv;", - garbageValue = "-111" + descriptor = "(I)V", + garbageValue = "1624794329" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return DevicePcmPlayerProvider.getNextWorldListWorld(); - } + static void method307() { + Client.mouseLastLastPressedTimeMillis = -1L; + Message.mouseRecorder.index = 0; + class357.hasFocus = true; + Client.hadFocus = true; + Client.timeOfPreviousKeyPress = -1L; + class36.reflectionChecks = new IterableNodeDeque(); + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1167 = null; + Client.packetWriter.field1168 = null; + Client.packetWriter.field1166 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1164 = 0; + Client.rebootTimer = 0; + Client.logoutTimer = 0; + Client.hintArrowType = 0; + class160.method840(); + WorldMapEvent.method1382(0); + LoginScreenAnimation.method523(); + Client.isItemSelected = 0; + Client.isSpellSelected = false; + Client.soundEffectCount = 0; + Client.camAngleY = 0; + Client.oculusOrbState = 0; + MidiPcmStream.field2799 = null; + Client.minimapState = 0; + Client.field535 = -1; + Client.destinationX = 0; + Client.destinationY = 0; + Client.playerAttackOption = AttackOption.AttackOption_hidden; + Client.npcAttackOption = AttackOption.AttackOption_hidden; + Client.npcCount = 0; + Players.Players_count = 0; + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Players.cachedAppearanceBuffer[var0] = null; + Players.playerMovementSpeeds[var0] = MoveSpeed.WALK; + } - @ObfuscatedName("jd") - @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "1325251796" - ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; } - if (var3 < 1) { - var3 = 1; + for (var0 = 0; var0 < 65536; ++var0) { + Client.npcs[var0] = null; } - int var5 = var3 - 334; - int var6; - if (var5 < 0) { - var6 = Client.field634; - } else if (var5 >= 100) { - var6 = Client.field633; - } else { - var6 = (Client.field633 - Client.field634) * var5 / 100 + Client.field634; - } - - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var18; - if (var7 < Client.field638) { - var18 = Client.field638; - var6 = var18 * var2 * 334 / (var3 * 512); - if (var6 > Client.field640) { - var6 = Client.field640; - var8 = var3 * var6 * 512 / (var18 * 334); - var9 = (var2 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); - } + Client.combatTargetPlayerIndex = -1; + Client.projectiles.clear(); + Client.graphicsObjects.clear(); - var0 += var9; - var2 -= var9 * 2; - } - } else if (var7 > Client.field635) { - var18 = Client.field635; - var6 = var18 * var2 * 334 / (var3 * 512); - if (var6 < Client.field639) { - var6 = Client.field639; - var8 = var18 * var2 * 334 / (var6 * 512); - var9 = (var3 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); + for (var0 = 0; var0 < 4; ++var0) { + for (int var1 = 0; var1 < 104; ++var1) { + for (int var2 = 0; var2 < 104; ++var2) { + Client.groundItems[var0][var1][var2] = null; } + } + } + + Client.pendingSpawns = new NodeDeque(); + class12.friendSystem.clear(); + if (VarpDefinition.field1443 > 5000) { + } - var1 += var9; - var3 -= var9 * 2; + for (var0 = 0; var0 < VarpDefinition.field1443; ++var0) { + VarpDefinition var3 = FloorOverlayDefinition.VarpDefinition_get(var0); + if (var3 != null) { + Varps.Varps_temp[var0] = 0; + Varps.Varps_main[var0] = 0; } } - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - int[] var17 = new int[9]; + class176.varcs.clearTransient(); + Client.followerIndex = -1; + if (Client.rootInterface != -1) { + HealthBarDefinition.widgetDefinition.method1736(Client.rootInterface); + } - for (var9 = 0; var9 < var17.length; ++var9) { - int var10 = var9 * 32 + 15 + 128; - int var11 = var10 * 3 + 600; - int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; - int var15 = var3 - 334; - if (var15 < 0) { - var15 = 0; - } else if (var15 > 100) { - var15 = 100; - } + for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { + class302.closeInterface(var4, true); + } - int var16 = (Client.zoomWidth - Client.zoomHeight) * var15 / 100 + Client.zoomHeight; - int var14 = var16 * var11 / 256; - var17[var9] = var13 * var14 >> 16; - } + Client.rootInterface = -1; + Client.interfaceParents = new NodeHashTable(8); + Client.meslayerContinueWidget = null; + class160.method840(); + Client.playerAppearance.method1746((int[])null, (int[])null, new int[]{0, 0, 0, 0, 0}, 0, -1); + + for (var0 = 0; var0 < 8; ++var0) { + Client.playerMenuActions[var0] = null; + Client.playerOptionsPriorities[var0] = false; + } + + class59.method332(); + Client.isLoading = true; + + for (var0 = 0; var0 < 100; ++var0) { + Client.field407[var0] = true; + } + + if (Client.packetWriter != null && Client.packetWriter.isaacCipher != null) { + PacketBufferNode var5 = class113.getPacketBufferNode(ClientPacket.EVENT_MOUSE_IDLE, Client.packetWriter.isaacCipher); + var5.packetBuffer.writeByte(ApproximateRouteStrategy.getWindowedMode()); + var5.packetBuffer.writeShort(Language.canvasWidth); + var5.packetBuffer.writeShort(class47.canvasHeight); + Client.packetWriter.addNode(var5); + } - Scene.Scene_buildVisiblityMap(var17, 500, 800, var2 * 334 / var3, 334); + class20.friendsChat = null; + class478.guestClanSettings = null; + Arrays.fill(Client.currentClanSettings, (Object)null); + ItemContainer.guestClanChannel = null; + Arrays.fill(Client.currentClanChannels, (Object)null); + + for (var0 = 0; var0 < 8; ++var0) { + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); } - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; + class6.grandExchangeEvents = null; + Client.reloadJS5 = false; + } + + @ObfuscatedName("lf") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "50042051" + ) + static void method308() { + if (Client.isSpellSelected) { + Widget var0 = HealthBarDefinition.widgetDefinition.getWidgetChild(class348.selectedSpellWidget, Client.selectedSpellChildIndex); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + class157.runScriptEvent(var1); + } + + Client.selectedSpellItemId = -1; + Client.isSpellSelected = false; + class159.invalidateWidget(var0); + } } } \ No newline at end of file diff --git a/osrs/src/main/java/class530.java b/osrs/src/main/java/class530.java index aa65b6dd4..4c1f382fb 100644 --- a/osrs/src/main/java/class530.java +++ b/osrs/src/main/java/class530.java @@ -1,85 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("up") -public class class530 { - @ObfuscatedName("ac") - int[] field4190; - @ObfuscatedName("al") - short[] field4191; - - @ObfuscatedSignature( - descriptor = "(Lhw;)V" - ) - public class530(NPCComposition var1) { - this.field4190 = new int[8]; - this.field4191 = new short[8]; - int var2 = 0; - if (var1.method1018()) { - var2 = var1.method1019().length; - System.arraycopy(var1.method1019(), 0, this.field4190, 0, var2); - System.arraycopy(var1.method1021(), 0, this.field4191, 0, var2); - } - - for (int var3 = var2; var3 < 8; ++var3) { - this.field4190[var3] = -1; - this.field4191[var3] = -1; - } - - } - - @ObfuscatedName("ac") +@ObfuscatedName("ua") +public interface class530 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-1994168844" + descriptor = "(Luj;B)V" ) - public int[] method2639() { - return this.field4190; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)[S", - garbageValue = "-2141879918" - ) - public short[] method2640() { - return this.field4191; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(IISB)V", - garbageValue = "44" - ) - public void method2641(int var1, int var2, short var3) { - this.field4190[var1] = var2; - this.field4191[var1] = var3; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "([I[SI)V", - garbageValue = "-616052812" - ) - public void method2642(int[] var1, short[] var2) { - this.field4190 = var1; - this.field4191 = var2; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-47" - ) - static final int method2643(int var0, int var1) { - int var2 = class432.method2193(45365 + var0, 91923 + var1, 4) - 128 + (class432.method2193(10294 + var0, 37821 + var1, 2) - 128 >> 1) + (class432.method2193(var0, var1, 1) - 128 >> 2); - var2 = (int)(0.3D * (double)var2) + 35; - if (var2 < 10) { - var2 = 10; - } else if (var2 > 60) { - var2 = 60; - } - - return var2; - } + void method2631(Buffer var1); } \ No newline at end of file diff --git a/osrs/src/main/java/class531.java b/osrs/src/main/java/class531.java new file mode 100644 index 000000000..4a35df0a1 --- /dev/null +++ b/osrs/src/main/java/class531.java @@ -0,0 +1,74 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("us") +public class class531 implements class383 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lus;" + ) + public static final class531 field4234; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lus;" + ) + public static final class531 field4233; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lus;" + ) + static final class531 field4237; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lus;" + ) + static final class531 field4236; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lus;" + ) + static final class531 field4235; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lus;" + ) + static final class531 field4238; + @ObfuscatedName("aa") + final int field4239; + @ObfuscatedName("ac") + final int field4240; + + static { + field4234 = new class531(1, 0); + field4233 = new class531(3, 2); + field4237 = new class531(4, 5); + field4236 = new class531(2, 6); + field4235 = new class531(0, 7); + field4238 = new class531(5, 8); + } + + class531(int var1, int var2) { + this.field4239 = var1; + this.field4240 = var2; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1094976837" + ) + public boolean method2633() { + return this == field4233; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-11" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4240; + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class533.java b/osrs/src/main/java/class533.java deleted file mode 100644 index bf26cec81..000000000 --- a/osrs/src/main/java/class533.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("uk") -public interface class533 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lul;B)V" - ) - void method2652(Buffer var1); -} \ No newline at end of file diff --git a/osrs/src/main/java/class534.java b/osrs/src/main/java/class534.java index dcdc40716..2d5274343 100644 --- a/osrs/src/main/java/class534.java +++ b/osrs/src/main/java/class534.java @@ -2,79 +2,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("uh") -public class class534 implements class386 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Luh;" - ) - public static final class534 field4231; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Luh;" - ) - public static final class534 field4232; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Luh;" - ) - static final class534 field4235; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Luh;" - ) - static final class534 field4237; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Luh;" - ) - static final class534 field4236; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Luh;" - ) - static final class534 field4234; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lun;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("ar") - final int field4239; - @ObfuscatedName("ab") - final int field4238; - - static { - field4231 = new class534(5, 0); - field4232 = new class534(2, 2); - field4235 = new class534(1, 5); - field4237 = new class534(3, 6); - field4236 = new class534(4, 7); - field4234 = new class534(0, 8); - } - - class534(int var1, int var2) { - this.field4239 = var1; - this.field4238 = var2; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4238; - } - +@ObfuscatedName("ur") +public interface class534 { @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "91579028" + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "415168938" ) - public boolean method2654() { - return this == field4232; - } + @Export("vmethod8697") + Object vmethod8697(int var1); } \ No newline at end of file diff --git a/osrs/src/main/java/class535.java b/osrs/src/main/java/class535.java new file mode 100644 index 000000000..ca811124a --- /dev/null +++ b/osrs/src/main/java/class535.java @@ -0,0 +1,42 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ux") +public class class535 { + @ObfuscatedName("at") + public final int field4244; + @ObfuscatedName("ah") + public Object field4243; + + public class535(int var1) { + this.field4244 = var1; + } + + public class535(int var1, Object var2) { + this.field4244 = var1; + this.field4243 = var2; + } + + @Export("hashCode") + @ObfuscatedName("hashCode") + public int hashCode() { + return super.hashCode(); + } + + @Export("equals") + @ObfuscatedName("equals") + public boolean equals(Object var1) { + if (!(var1 instanceof class535)) { + return false; + } else { + class535 var2 = (class535)var1; + if (var2.field4243 == null && this.field4243 != null) { + return false; + } else if (this.field4243 == null && var2.field4243 != null) { + return false; + } else { + return this.field4244 == var2.field4244 && var2.field4243.equals(this.field4243); + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class537.java b/osrs/src/main/java/class537.java deleted file mode 100644 index 88e768cc3..000000000 --- a/osrs/src/main/java/class537.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("uv") -public interface class537 { - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-123056323" - ) - @Export("vmethod8697") - Object vmethod8697(int var1); -} \ No newline at end of file diff --git a/osrs/src/main/java/class538.java b/osrs/src/main/java/class538.java deleted file mode 100644 index 1b103e854..000000000 --- a/osrs/src/main/java/class538.java +++ /dev/null @@ -1,104 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ut") -public class class538 { - @ObfuscatedName("ac") - public final int field4243; - @ObfuscatedName("al") - public Object field4242; - - public class538(int var1) { - this.field4243 = var1; - } - - public class538(int var1, Object var2) { - this.field4243 = var1; - this.field4242 = var2; - } - - @Export("hashCode") - @ObfuscatedName("hashCode") - public int hashCode() { - return super.hashCode(); - } - - @Export("equals") - @ObfuscatedName("equals") - public boolean equals(Object var1) { - if (!(var1 instanceof class538)) { - return false; - } else { - class538 var2 = (class538)var1; - if (var2.field4242 == null && this.field4242 != null) { - return false; - } else if (this.field4242 == null && var2.field4242 != null) { - return false; - } else { - return var2.field4243 == this.field4243 && var2.field4242.equals(this.field4242); - } - } - } - - @ObfuscatedName("ac") - public static final int method2658(double var0, double var2, double var4) { - double var6 = var4; - double var8 = var4; - double var10 = var4; - if (0.0D != var2) { - double var12; - if (var4 < 0.5D) { - var12 = var4 * (1.0D + var2); - } else { - var12 = var2 + var4 - var4 * var2; - } - - double var14 = var4 * 2.0D - var12; - double var16 = var0 + 0.3333333333333333D; - if (var16 > 1.0D) { - --var16; - } - - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } - - if (6.0D * var16 < 1.0D) { - var6 = var16 * 6.0D * (var12 - var14) + var14; - } else if (2.0D * var16 < 1.0D) { - var6 = var12; - } else if (var16 * 3.0D < 2.0D) { - var6 = (0.6666666666666666D - var16) * (var12 - var14) * 6.0D + var14; - } else { - var6 = var14; - } - - if (6.0D * var0 < 1.0D) { - var8 = var0 * (var12 - var14) * 6.0D + var14; - } else if (var0 * 2.0D < 1.0D) { - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = var14 + (0.6666666666666666D - var0) * (var12 - var14) * 6.0D; - } else { - var8 = var14; - } - - if (6.0D * var20 < 1.0D) { - var10 = var14 + var20 * 6.0D * (var12 - var14); - } else if (2.0D * var20 < 1.0D) { - var10 = var12; - } else if (var20 * 3.0D < 2.0D) { - var10 = var14 + (var12 - var14) * (0.6666666666666666D - var20) * 6.0D; - } else { - var10 = var14; - } - } - - int var22 = (int)(256.0D * var6); - int var13 = (int)(var8 * 256.0D); - int var23 = (int)(var10 * 256.0D); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class541.java b/osrs/src/main/java/class541.java new file mode 100644 index 000000000..ec53c376b --- /dev/null +++ b/osrs/src/main/java/class541.java @@ -0,0 +1,24 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("uc") +public class class541 { + @ObfuscatedName("at") + @Export("SpriteBuffer_spriteCount") + static int SpriteBuffer_spriteCount; + @ObfuscatedName("ah") + @Export("SpriteBuffer_spriteWidth") + public static int SpriteBuffer_spriteWidth; + @ObfuscatedName("ao") + @Export("SpriteBuffer_xOffsets") + public static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("ab") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("au") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("ac") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; +} \ No newline at end of file diff --git a/osrs/src/main/java/class542.java b/osrs/src/main/java/class542.java new file mode 100644 index 000000000..79b1e873b --- /dev/null +++ b/osrs/src/main/java/class542.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ub") +public class class542 { + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lea;" + ) + @Export("World_request") + static UrlRequest World_request; +} \ No newline at end of file diff --git a/osrs/src/main/java/class544.java b/osrs/src/main/java/class544.java index c81bd3572..33510c397 100644 --- a/osrs/src/main/java/class544.java +++ b/osrs/src/main/java/class544.java @@ -1,18 +1,273 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ue") +@ObfuscatedName("ut") public class class544 { + @ObfuscatedName("ah") + int field4294; + @ObfuscatedName("ar") + int field4298; + @ObfuscatedName("ao") + int field4296; + @ObfuscatedName("ab") + int field4292; + @ObfuscatedName("au") + int field4300; + @ObfuscatedName("aa") + int field4291; @ObfuscatedName("ac") - @Export("SpriteBuffer_spriteCount") - public static int SpriteBuffer_spriteCount; + int field4293; + @ObfuscatedName("al") + int field4295; + @ObfuscatedName("az") + boolean field4290; + @ObfuscatedName("ap") + int field4297; + @ObfuscatedName("av") + int field4301; + @ObfuscatedName("ax") + int field4302; + @ObfuscatedName("as") + int field4299; + + public class544() { + this.field4293 = 0; + this.field4295 = 0; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIZB)V", + garbageValue = "0" + ) + public void method2712(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, boolean var9) { + this.field4294 = var1; + this.field4298 = var2; + this.field4296 = var3; + this.field4292 = var4; + this.field4300 = var5; + this.field4291 = var6; + this.field4293 = var7; + this.field4295 = var8; + this.field4290 = var9; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "82" + ) + public void method2713(int var1, int var2, int var3, int var4) { + this.field4297 = var1; + this.field4301 = var2; + this.field4302 = var3; + this.field4299 = var4; + } + @ObfuscatedName("ar") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "(Lpv;Lpf;I)V", + garbageValue = "72760556" + ) + public void method2714(class406 var1, Font var2) { + if (var2 != null) { + int var3 = var2.ascent; + int var4 = Math.min(this.field4292, (int)((float)var3 * 0.9F)); + int var5 = var1.method2084(this.field4296); + int var6 = var1.method2085(this.field4292); + int var7 = var5 + (this.field4294 - this.field4300); + int var8 = var6 + var3 + (this.field4298 - this.field4291); + Rasterizer2D.Rasterizer2D_setClip(this.field4294, this.field4298, this.field4294 + this.field4296, this.field4292 + this.field4298); + int var9 = this.field4295; + int var10 = this.field4293; + if (var9 > var10) { + int var11 = var9; + var9 = var10; + var10 = var11; + } + + class410 var21 = var1.method2065(0, var9); + class410 var12 = var1.method2065(var9, var10); + class410 var13 = var1.method2065(var10, var1.method2055()); + class410 var14 = var1.method2065(0, this.field4293); + int var16; + int var18; + if (!var12.method2133()) { + int var15 = var2.maxAscent + var2.maxDescent; + + for (var16 = 0; var16 < var12.method2134(); ++var16) { + class408 var17 = var12.method2138(var16); + var18 = var7 + var17.field3717; + int var19 = var2.charWidth(var17.field3716); + int var20 = var8 + var17.field3718 - var3; + Rasterizer2D.Rasterizer2D_fillRectangle(var18, var20, var19, var15, this.field4299); + } + } + + if (!var21.method2133()) { + var2.method2112(var21, var7, var8, this.field4297, this.field4301, -1); + } + + if (!var12.method2133()) { + var2.method2112(var12, var7, var8, this.field4302, this.field4301, -1); + } + + if (!var13.method2133()) { + var2.method2112(var13, var7, var8, this.field4297, this.field4301, -1); + } + + if (this.field4290) { + class497 var22 = var14.method2137(); + var16 = var7 + (Integer)var22.field4074; + int var23 = var8 + (Integer)var22.field4073; + var18 = var23 - var4; + Rasterizer2D.Rasterizer2D_drawLine(var16, var23, var16, var18, this.field4297); + if (this.field4301 != -1) { + Rasterizer2D.Rasterizer2D_drawLine(var16 + 1, var23 + 1, var16 + 1, var18 + 1, this.field4301); + } + } + + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Lof;II)Lld;", + garbageValue = "-1670201559" ) - static LoginScreenAnimation field4278; + public static PacketBufferNode method2711(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = class113.getPacketBufferNode(ClientPacket.f96, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(0); + int var5 = var4.packetBuffer.offset; + var4.packetBuffer.writeByte(var0); + String var6 = var1.toLowerCase(); + int var7 = 0; + byte[] var8 = null; + if (var6.startsWith("yellow:")) { + var7 = 0; + var1 = var1.substring("yellow:".length()); + } else if (var6.startsWith("red:")) { + var7 = 1; + var1 = var1.substring("red:".length()); + } else if (var6.startsWith("green:")) { + var7 = 2; + var1 = var1.substring("green:".length()); + } else if (var6.startsWith("cyan:")) { + var7 = 3; + var1 = var1.substring("cyan:".length()); + } else if (var6.startsWith("purple:")) { + var7 = 4; + var1 = var1.substring("purple:".length()); + } else if (var6.startsWith("white:")) { + var7 = 5; + var1 = var1.substring("white:".length()); + } else if (var6.startsWith("flash1:")) { + var7 = 6; + var1 = var1.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var7 = 7; + var1 = var1.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { + var7 = 8; + var1 = var1.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { + var7 = 9; + var1 = var1.substring("glow1:".length()); + } else if (var6.startsWith("glow2:")) { + var7 = 10; + var1 = var1.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { + var7 = 11; + var1 = var1.substring("glow3:".length()); + } else if (var6.startsWith("rainbow:")) { + var7 = 12; + var1 = var1.substring("rainbow:".length()); + } else if (var6.startsWith("pattern")) { + boolean var10 = true; + boolean var11 = true; + int var12 = "pattern".length(); + int var13 = 0; + byte[] var14 = new byte[8]; + + byte[] var9; + while (true) { + int var15 = var12 + var13; + if (var15 >= var6.length()) { + var9 = null; + break; + } + + char var16 = var6.charAt(var15); + if (var16 == ':') { + if (var13 == 0) { + var9 = null; + } else { + byte[] var17 = new byte[var13]; + System.arraycopy(var14, 0, var17, 0, var13); + var9 = var17; + } + break; + } + + if (var14.length == var13) { + var9 = null; + break; + } + + if (var16 >= '0' && var16 <= '9') { + var16 = (char)(var16 - '0'); + } else { + if (var16 < 'a' || var16 > 'z') { + var9 = null; + break; + } + + var16 = (char)(var16 - 'W'); + } + + var14[var13++] = (byte)var16; + } + + var8 = var9; + if (var9 != null) { + var7 = var9.length + 12; + var1 = var1.substring("pattern".length() + var9.length + 1); + } + } + + var6 = var1.toLowerCase(); + byte var18 = 0; + if (var6.startsWith("wave:")) { + var18 = 1; + var1 = var1.substring("wave:".length()); + } else if (var6.startsWith("wave2:")) { + var18 = 2; + var1 = var1.substring("wave2:".length()); + } else if (var6.startsWith("shake:")) { + var18 = 3; + var1 = var1.substring("shake:".length()); + } else if (var6.startsWith("scroll:")) { + var18 = 4; + var1 = var1.substring("scroll:".length()); + } else if (var6.startsWith("slide:")) { + var18 = 5; + var1 = var1.substring("slide:".length()); + } + + var4.packetBuffer.writeByte(var7); + var4.packetBuffer.writeByte(var18); + if (var8 != null && Client.param25 >= 214) { + for (int var19 = 0; var19 < var8.length; ++var19) { + var4.packetBuffer.writeByte(var8[var19]); + } + } + + PcmPlayer.method210(var4.packetBuffer, var1); + if (var0 == class351.field3144.rsOrdinal()) { + var4.packetBuffer.writeByte(var3); + } + + var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); + return var4; + } } \ No newline at end of file diff --git a/osrs/src/main/java/class547.java b/osrs/src/main/java/class547.java deleted file mode 100644 index b40022a6d..000000000 --- a/osrs/src/main/java/class547.java +++ /dev/null @@ -1,132 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("vz") -public class class547 { - @ObfuscatedName("al") - int field4291; - @ObfuscatedName("ak") - int field4290; - @ObfuscatedName("ax") - int field4296; - @ObfuscatedName("ao") - int field4293; - @ObfuscatedName("ah") - int field4289; - @ObfuscatedName("ar") - int field4295; - @ObfuscatedName("ab") - int field4287; - @ObfuscatedName("am") - int field4292; - @ObfuscatedName("av") - boolean field4285; - @ObfuscatedName("ag") - int field4288; - @ObfuscatedName("aa") - int field4286; - @ObfuscatedName("ap") - int field4294; - @ObfuscatedName("ay") - int field4297; - - public class547() { - this.field4287 = 0; - this.field4292 = 0; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIZI)V", - garbageValue = "-1556835629" - ) - public void method2734(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, boolean var9) { - this.field4291 = var1; - this.field4290 = var2; - this.field4296 = var3; - this.field4293 = var4; - this.field4289 = var5; - this.field4295 = var6; - this.field4287 = var7; - this.field4292 = var8; - this.field4285 = var9; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "826854600" - ) - public void method2735(int var1, int var2, int var3, int var4) { - this.field4288 = var1; - this.field4286 = var2; - this.field4294 = var3; - this.field4297 = var4; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Lpp;Lpu;B)V", - garbageValue = "0" - ) - public void method2736(class409 var1, Font var2) { - if (var2 != null) { - int var3 = var2.ascent; - int var4 = Math.min(this.field4293, (int)(0.9F * (float)var3)); - int var5 = var1.method2097(this.field4296); - int var6 = var1.method2098(this.field4293); - int var7 = var5 + (this.field4291 - this.field4289); - int var8 = var6 + var3 + (this.field4290 - this.field4295); - Rasterizer2D.Rasterizer2D_setClip(this.field4291, this.field4290, this.field4296 + this.field4291, this.field4293 + this.field4290); - int var9 = this.field4292; - int var10 = this.field4287; - if (var9 > var10) { - int var11 = var9; - var9 = var10; - var10 = var11; - } - - class413 var21 = var1.method2078(0, var9); - class413 var12 = var1.method2078(var9, var10); - class413 var13 = var1.method2078(var10, var1.method2069()); - class413 var14 = var1.method2078(0, this.field4287); - int var16; - int var18; - if (!var12.method2147()) { - int var15 = var2.maxAscent + var2.maxDescent; - - for (var16 = 0; var16 < var12.method2148(); ++var16) { - class411 var17 = var12.method2152(var16); - var18 = var7 + var17.field3715; - int var19 = var2.charWidth(var17.field3713); - int var20 = var8 + var17.field3714 - var3; - Rasterizer2D.Rasterizer2D_fillRectangle(var18, var20, var19, var15, this.field4297); - } - } - - if (!var21.method2147()) { - var2.method2126(var21, var7, var8, this.field4288, this.field4286, -1); - } - - if (!var12.method2147()) { - var2.method2126(var12, var7, var8, this.field4294, this.field4286, -1); - } - - if (!var13.method2147()) { - var2.method2126(var13, var7, var8, this.field4288, this.field4286, -1); - } - - if (this.field4285) { - class500 var22 = var14.method2151(); - var16 = var7 + (Integer)var22.field4079; - int var23 = var8 + (Integer)var22.field4080; - var18 = var23 - var4; - Rasterizer2D.Rasterizer2D_drawLine(var16, var23, var16, var18, this.field4288); - if (this.field4286 != -1) { - Rasterizer2D.Rasterizer2D_drawLine(var16 + 1, var23 + 1, var16 + 1, var18 + 1, this.field4286); - } - } - - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class553.java b/osrs/src/main/java/class550.java similarity index 67% rename from osrs/src/main/java/class553.java rename to osrs/src/main/java/class550.java index 1e1be1934..a7965767a 100644 --- a/osrs/src/main/java/class553.java +++ b/osrs/src/main/java/class550.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("vj") -public class class553 { - @ObfuscatedName("ac") - public static final int[] field4311; +@ObfuscatedName("vz") +public class class550 { + @ObfuscatedName("at") + public static final int[] field4316; static { - field4311 = new int[]{16777215, 14942979, 16747520, 16772352, 32806, 2375822, 7547266, 16720268, 11884176, 5261772, 10724259, 13970688, 15693351, 16577588, 494960, 2208255, 10178454, 16756679, 13722276, 8105443, 16751190, 2543274, 7591918, 10246609, 10021057, 11894492, 2894892, 9699842, 6371605, 13680896, 4882723, 14504, 8388736, 14025328, 10682978, 4004472}; + field4316 = new int[]{16777215, 14942979, 16747520, 16772352, 32806, 2375822, 7547266, 16720268, 11884176, 5261772, 10724259, 13970688, 15693351, 16577588, 494960, 2208255, 10178454, 16756679, 13722276, 8105443, 16751190, 2543274, 7591918, 10246609, 10021057, 11894492, 2894892, 9699842, 6371605, 13680896, 4882723, 14504, 8388736, 14025328, 10682978, 4004472}; } } \ No newline at end of file diff --git a/osrs/src/main/java/class59.java b/osrs/src/main/java/class59.java index 30fb9aeaf..b4104f8bb 100644 --- a/osrs/src/main/java/class59.java +++ b/osrs/src/main/java/class59.java @@ -2,59 +2,49 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cy") +import java.util.LinkedList; +import java.util.List; + +@ObfuscatedName("ct") public class class59 { - @ObfuscatedName("wn") + @ObfuscatedName("iz") + static int field302; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Loo;" + descriptor = "Lbu;" ) - static JagNetThread field309; + VorbisFloor field305; @ObfuscatedName("ah") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("af") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("cz") - static String field307; - @ObfuscatedName("hp") - static String field308; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lbc;" - ) - VorbisFloor field310; - @ObfuscatedName("al") - boolean field311; - @ObfuscatedName("ak") - int[] field313; - @ObfuscatedName("ax") - int[] field314; + boolean field303; + @ObfuscatedName("ar") + int[] field307; @ObfuscatedName("ao") - boolean[] field312; + int[] field306; + @ObfuscatedName("ab") + boolean[] field304; @ObfuscatedSignature( - descriptor = "(Lbc;Z[I[I[Z)V" + descriptor = "(Lbu;Z[I[I[Z)V" ) class59(VorbisFloor var1, boolean var2, int[] var3, int[] var4, boolean[] var5) { - this.field310 = var1; - this.field311 = var2; - this.field313 = var3; - this.field314 = var4; - this.field312 = var5; + this.field305 = var1; + this.field303 = var2; + this.field307 = var3; + this.field306 = var4; + this.field304 = var5; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "([FII)V", - garbageValue = "2130530034" + garbageValue = "-121312327" ) - void method324(float[] var1, int var2) { - int var3 = this.field310.field175.length; - VorbisFloor var10000 = this.field310; - int var4 = VorbisFloor.field171[this.field310.multiplier - 1]; - boolean[] var5 = this.field312; - this.field312[1] = true; + void method329(float[] var1, int var2) { + int var3 = this.field305.field175.length; + VorbisFloor var10000 = this.field305; + int var4 = VorbisFloor.field170[this.field305.multiplier - 1]; + boolean[] var5 = this.field304; + this.field304[1] = true; var5[0] = true; int var6; @@ -63,37 +53,37 @@ void method324(float[] var1, int var2) { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { - var7 = this.field310.method202(this.field313, var6); - var8 = this.field310.method203(this.field313, var6); - var9 = this.field310.method204(this.field313[var7], this.field314[var7], this.field313[var8], this.field314[var8], this.field313[var6]); - var10 = this.field314[var6]; + var7 = this.field305.method205(this.field307, var6); + var8 = this.field305.method206(this.field307, var6); + var9 = this.field305.method207(this.field307[var7], this.field306[var7], this.field307[var8], this.field306[var8], this.field307[var6]); + var10 = this.field306[var6]; int var11 = var4 - var9; int var13 = (var11 < var9 ? var11 : var9) << 1; if (var10 != 0) { - boolean[] var14 = this.field312; - this.field312[var8] = true; + boolean[] var14 = this.field304; + this.field304[var8] = true; var14[var7] = true; - this.field312[var6] = true; + this.field304[var6] = true; if (var10 >= var13) { - this.field314[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + this.field306[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - this.field314[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + this.field306[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - this.field312[var6] = false; - this.field314[var6] = var9; + this.field304[var6] = false; + this.field306[var6] = var9; } } this.VarbisFloor_sort(0, var3 - 1); var6 = 0; - var7 = this.field310.multiplier * this.field314[0]; + var7 = this.field305.multiplier * this.field306[0]; for (var8 = 1; var8 < var3; ++var8) { - if (this.field312[var8]) { - var9 = this.field313[var8]; - var10 = this.field310.multiplier * this.field314[var8]; - this.field310.method205(var6, var7, var9, var10, var1, var2); + if (this.field304[var8]) { + var9 = this.field307[var8]; + var10 = this.field305.multiplier * this.field306[var8]; + this.field305.method208(var6, var7, var9, var10, var1, var2); if (var9 >= var2) { return; } @@ -103,7 +93,7 @@ void method324(float[] var1, int var2) { } } - var10000 = this.field310; + var10000 = this.field305; float var16 = VorbisFloor.VorbisFloor_decibelStatics[var7]; for (var9 = var6; var9 < var2; ++var9) { @@ -112,46 +102,268 @@ void method324(float[] var1, int var2) { } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "467756903" + garbageValue = "-1465438441" ) - boolean method325() { - return this.field311; + boolean method330() { + return this.field303; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2030001337" + garbageValue = "1888348492" ) @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { int var3 = var1; - int var4 = this.field313[var1]; - int var5 = this.field314[var1]; - boolean var6 = this.field312[var1]; + int var4 = this.field307[var1]; + int var5 = this.field306[var1]; + boolean var6 = this.field304[var1]; for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = this.field313[var7]; + int var8 = this.field307[var7]; if (var8 < var4) { - this.field313[var3] = var8; - this.field314[var3] = this.field314[var7]; - this.field312[var3] = this.field312[var7]; + this.field307[var3] = var8; + this.field306[var3] = this.field306[var7]; + this.field304[var3] = this.field304[var7]; ++var3; - this.field313[var7] = this.field313[var3]; - this.field314[var7] = this.field314[var3]; - this.field312[var7] = this.field312[var3]; + this.field307[var7] = this.field307[var3]; + this.field306[var7] = this.field306[var3]; + this.field304[var7] = this.field304[var3]; } } - this.field313[var3] = var4; - this.field314[var3] = var5; - this.field312[var3] = var6; + this.field307[var3] = var4; + this.field306[var3] = var5; + this.field304[var3] = var6; this.VarbisFloor_sort(var1, var3 - 1); this.VarbisFloor_sort(var3 + 1, var2); } } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1858684336" + ) + static void method332() { + ItemContainer.itemContainers = new NodeHashTable(32); + } + + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "(ILdt;ZB)I", + garbageValue = "5" + ) + static int method333(int var0, Script var1, boolean var2) { + int var3; + int var5; + int var7; + Object var21; + class518 var22; + if (var0 != 7500 && var0 != 7508) { + if (var0 != 7501) { + int var4; + int var6; + if (var0 == 7502) { + DbTableType.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 2]; + var6 = SequenceDefinition.method1041(var4); + var7 = ZoneOperation.method1630(var4); + int var8 = class134.method731(var4); + DbRowType var23 = class469.getDbRowType(var3); + DbTableType var24 = FadeOutTask.getDbTableType(var6); + int[] var25 = var24.types[var7]; + int var12 = 0; + int var13 = var25.length; + if (var8 >= 0) { + if (var8 >= var13) { + throw new RuntimeException("Tuple index out-of-bounds. Requested: " + var8 + ", Max: " + var13); + } + + var12 = var8; + var13 = var8 + 1; + } + + Object[] var14 = var23.getColumnType(var7); + if (var14 == null && var24.defaultValues != null) { + var14 = var24.defaultValues[var7]; + } + + int var15; + int var16; + if (var14 == null) { + for (var15 = var12; var15 < var13; ++var15) { + var16 = var25[var15]; + class514 var17 = class472.method2349(var16); + if (var17 == class514.field4125) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = MusicPatchNode.method1723(var16); + } + } + + return 1; + } else { + var15 = var14.length / var25.length; + if (var5 >= 0 && var5 < var15) { + for (var16 = var12; var16 < var13; ++var16) { + int var19 = var16 + var25.length * var5; + class514 var18 = class472.method2349(var25[var16]); + if (var18 == class514.field4125) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = (String)var14[var19]; + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (Integer)var14[var19]; + } + } + + return 1; + } else { + throw new RuntimeException(); + } + } + } else if (var0 == 7503) { + DbTableType.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize + 1]; + var5 = 0; + var6 = SequenceDefinition.method1041(var4); + var7 = ZoneOperation.method1630(var4); + DbRowType var26 = class469.getDbRowType(var3); + DbTableType var9 = FadeOutTask.getDbTableType(var6); + int[] var10 = var9.types[var7]; + Object[] var11 = var26.getColumnType(var7); + if (var11 == null && var9.defaultValues != null) { + var11 = var9.defaultValues[var7]; + } + + if (var11 != null) { + var5 = var11.length / var10.length; + } + + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var5; + return 1; + } else if (var0 != 7504 && var0 != 7510) { + if (var0 == 7505) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + DbRowType var28 = class469.getDbRowType(var3); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var28.tableId; + return 1; + } else if (var0 == 7506) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var4 = -1; + if (DevicePcmPlayerProvider.field67 != null && var3 >= 0 && var3 < DevicePcmPlayerProvider.field67.size()) { + var4 = (Integer)DevicePcmPlayerProvider.field67.get(var3); + } + + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4; + return 1; + } else if (var0 != 7507 && var0 != 7509) { + return 2; + } else { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var21 = WorldMapLabelSize.method1187(var3); + var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var22 = class168.method875(var5); + if (var22 == null) { + throw new RuntimeException(); + } else if (SequenceDefinition.method1041(var5) != Client.field545) { + throw new RuntimeException(); + } else if (DevicePcmPlayerProvider.field67 == null && DevicePcmPlayerProvider.field67.isEmpty()) { + throw new RuntimeException(); + } else { + var7 = class134.method731(var5); + List var20 = var22.method2518(var21, var7); + DevicePcmPlayerProvider.field67 = new LinkedList(DevicePcmPlayerProvider.field67); + if (var20 != null) { + DevicePcmPlayerProvider.field67.retainAll(var20); + } else { + DevicePcmPlayerProvider.field67.clear(); + } + + class10.field30 = DevicePcmPlayerProvider.field67.iterator(); + if (var0 == 7507) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.field67.size(); + } + + return 1; + } + } + } else { + --DbTableType.Interpreter_intStackSize; + var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; + class518 var27 = UserComparator4.method668(var3); + if (var27 == null) { + throw new RuntimeException(); + } else { + DevicePcmPlayerProvider.field67 = var27.method2518(0, 0); + var5 = 0; + if (DevicePcmPlayerProvider.field67 != null) { + Client.field545 = var3; + class10.field30 = DevicePcmPlayerProvider.field67.iterator(); + var5 = DevicePcmPlayerProvider.field67.size(); + } + + if (var0 == 7504) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var5; + } + + return 1; + } + } + } else { + if (class10.field30 != null && class10.field30.hasNext()) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = (Integer)class10.field30.next(); + } else { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + } else { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var21 = WorldMapLabelSize.method1187(var3); + var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + var22 = class168.method875(var5); + if (var22 == null) { + throw new RuntimeException(); + } else { + var7 = class134.method731(var5); + DevicePcmPlayerProvider.field67 = var22.method2518(var21, var7); + if (DevicePcmPlayerProvider.field67 != null) { + Client.field545 = SequenceDefinition.method1041(var5); + class10.field30 = DevicePcmPlayerProvider.field67.iterator(); + if (var0 == 7500) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.field67.size(); + } + } else { + Client.field545 = -1; + class10.field30 = null; + if (var0 == 7500) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = 0; + } + } + + return 1; + } + } + } + + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(Lcb;III)V", + garbageValue = "1570010040" + ) + static final void method334(MenuAction var0, int var1, int var2) { + if (var0 != null) { + class407.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.itemId, var0.action, var0.target, var1, var2); + } + + } } \ No newline at end of file diff --git a/osrs/src/main/java/class6.java b/osrs/src/main/java/class6.java index ed3b73e6a..dad10b5f0 100644 --- a/osrs/src/main/java/class6.java +++ b/osrs/src/main/java/class6.java @@ -2,690 +2,246 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ar") -public enum class6 implements class386 { - @ObfuscatedName("ac") +import java.awt.*; +import java.util.ArrayList; + +@ObfuscatedName("aa") +public enum class6 implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Laa;" ) - field4(0, 0); + field9(0, 0); - @ObfuscatedName("al") - public final int field6; - @ObfuscatedName("ak") - final int field5; + @ObfuscatedName("wa") + @ObfuscatedSignature( + descriptor = "Lov;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("bl") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("km") + static int field6; + @ObfuscatedName("ah") + final int field10; + @ObfuscatedName("ar") + final int field11; class6(int var3, int var4) { - this.field6 = var3; - this.field5 = var4; + this.field10 = var3; + this.field11 = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field5; + return this.field11; } - @ObfuscatedName("il") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ldi;II)V", - garbageValue = "1987002078" + descriptor = "(Lol;Lol;ZII)V", + garbageValue = "-1391050872" ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - int var2; - int var3; - int var4; - int var5; - int var7; - SequenceDefinition var11; - if (var0.spotAnimation >= Client.cycle) { - var2 = Math.max(1, var0.spotAnimation - Client.cycle); - var3 = var0.field971 * 64 + var0.field1016 * 128; - var4 = var0.field971 * 64 + var0.field1013 * 128; - var0.x += (var3 - var0.x) / var2; - var0.y += (var4 - var0.y) / var2; - var0.field1024 = 0; - var0.orientation = var0.exactMoveDirection; - } else if (var0.exactMoveArrive1Cycle >= Client.cycle) { - JagexCache.method918(var0); - } else { - var0.movementSequence = var0.idleSequence; - if (var0.pathLength == 0) { - var0.field1024 = 0; - } else { - label554: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var11 = class36.SequenceDefinition_get(var0.sequence); - if (var0.field1023 > 0 && var11.precedenceAnimating == 0) { - ++var0.field1024; - break label554; - } - - if (var0.field1023 <= 0 && var11.priority == 0) { - ++var0.field1024; - break label554; - } - } - - var2 = var0.x; - var3 = var0.y; - var4 = var0.field971 * 64 + var0.pathX[var0.pathLength - 1] * 128; - var5 = var0.field971 * 64 + var0.pathY[var0.pathLength - 1] * 128; - if (var2 < var4) { - if (var3 < var5) { - var0.orientation = 1280; - } else if (var3 > var5) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var2 > var4) { - if (var3 < var5) { - var0.orientation = 768; - } else if (var3 > var5) { - var0.orientation = 256; - } else { - var0.orientation = 512; - } - } else if (var3 < var5) { - var0.orientation = 1024; - } else if (var3 > var5) { - var0.orientation = 0; - } - - MoveSpeed var6 = var0.pathTraversed[var0.pathLength - 1]; - if (var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { - var7 = var0.orientation - var0.rotation & 2047; - if (var7 > 1024) { - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; - if (var7 >= -256 && var7 <= 256) { - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; - int var9 = 4; - boolean var10 = true; - if (var0 instanceof NPC) { - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { - if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1020 != 0) { - var9 = 2; - } - - if (var0.pathLength > 2) { - var9 = 6; - } - - if (var0.pathLength > 3) { - var9 = 8; - } - - if (var0.field1024 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1024; - } - } else { - if (var0.pathLength > 1) { - var9 = 6; - } - - if (var0.pathLength > 2) { - var9 = 8; - } - - if (var0.field1024 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1024; - } - } - - if (var6 == MoveSpeed.RUN) { - var9 <<= 1; - } else if (var6 == MoveSpeed.CRAWL) { - var9 >>= 1; - } - - if (var9 >= 8) { - if (var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } else if (var0.walkBackSequence == var0.movementSequence && var0.runBackSequence != -1) { - var0.movementSequence = var0.runBackSequence; - } else if (var0.walkLeftSequence == var0.movementSequence && var0.runLeftSequence != -1) { - var0.movementSequence = var0.runLeftSequence; - } else if (var0.movementSequence == var0.walkRightSequence && var0.runRightSequence != -1) { - var0.movementSequence = var0.runRightSequence; - } - } else if (var9 <= 2) { - if (var0.walkSequence == var0.movementSequence && var0.crawlSequence != -1) { - var0.movementSequence = var0.crawlSequence; - } else if (var0.movementSequence == var0.walkBackSequence && var0.crawlBackSequence != -1) { - var0.movementSequence = var0.crawlBackSequence; - } else if (var0.walkLeftSequence == var0.movementSequence && var0.crawlLeftSequence != -1) { - var0.movementSequence = var0.crawlLeftSequence; - } else if (var0.movementSequence == var0.walkRightSequence && var0.crawlRightSequence != -1) { - var0.movementSequence = var0.crawlRightSequence; - } - } - - if (var4 != var2 || var3 != var5) { - if (var2 < var4) { - var0.x += var9; - if (var0.x > var4) { - var0.x = var4; - } - } else if (var2 > var4) { - var0.x -= var9; - if (var0.x < var4) { - var0.x = var4; - } - } - - if (var3 < var5) { - var0.y += var9; - if (var0.y > var5) { - var0.y = var5; - } - } else if (var3 > var5) { - var0.y -= var9; - if (var0.y < var5) { - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { - --var0.pathLength; - if (var0.field1023 > 0) { - --var0.field1023; - } - } - } else { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if (var0.field1023 > 0) { - --var0.field1023; - } - } - } + static void method14(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (class384.clearLoginScreen) { + if (var3 == 4) { + UserComparator7.method674(4); } - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = 0; - var0.exactMoveArrive1Cycle = 0; - var0.method519(); - var0.x = var0.field971 * 64 + var0.pathX[0] * 128; - var0.y = var0.pathY[0] * 128 + var0.field971 * 64; - var0.method512(); - } - - if (TextureProvider.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = 0; - var0.exactMoveArrive1Cycle = 0; - var0.method519(); - var0.x = var0.field971 * 64 + var0.pathX[0] * 128; - var0.y = var0.pathY[0] * 128 + var0.field971 * 64; - var0.method512(); - } - if (var0.targetIndex != -1) { - var11 = null; - var3 = 65536; - Object var18; - if (var0.targetIndex < var3) { - var18 = Client.npcs[var0.targetIndex]; + } else { + if (var3 == 0) { + ClientPreferences.method568(var2); } else { - var18 = Client.players[var0.targetIndex - var3]; - } - - if (var18 != null) { - var4 = var0.x - ((Actor)var18).x; - var5 = var0.y - ((Actor)var18).y; - if (var4 != 0 || var5 != 0) { - var7 = (int)(Math.atan2((double)var4, (double)var5) * 325.94932345220167D) & 2047; - var0.orientation = var7; - } - } else if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - } - - int var12; - if (var0.pathLength == 0 || var0.field1024 > 0) { - var2 = -1; - if (var0.field995 != -1 && var0.field996 != -1) { - var3 = var0.field995 * 128 - class20.baseX * 128 + 64; - var4 = var0.field996 * 128 - class19.baseY * 128 + 64; - var5 = var0.x - var3; - var12 = var0.y - var4; - if (var5 != 0 || var12 != 0) { - var7 = (int)(Math.atan2((double)var5, (double)var12) * 325.94932345220167D) & 2047; - var2 = var7; - } - } else if (var0.movingOrientation != -1) { - var2 = var0.movingOrientation; - } - - if (var2 != -1) { - var0.orientation = var2; - if (var0.field964) { - var0.rotation = var0.orientation; - } - } - - var0.method521(); + UserComparator7.method674(var3); + } + + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + class250.leftTitleSprite = WorldMapArchiveLoader.method2391(var4); + Login.rightTitleSprite = class250.leftTitleSprite.mirrorHorizontally(); + MenuAction.method435(var1, Client.worldProperties); + Login.titleboxSprite = class313.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + Login.titlebuttonSprite = class313.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + Login.field776 = class313.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); + class11.field38 = class313.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); + class313.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); + class134.runesSprite = Skills.method1895(var1, "runes", ""); + Login.title_muteSprite = Skills.method1895(var1, "title_mute", ""); + class310.options_buttons_0Sprite = class313.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + Login.field779 = class313.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + FriendsList.options_buttons_2Sprite = class313.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + GrandExchangeEvents.field3611 = class313.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + NPCComposition.field1532 = class310.options_buttons_0Sprite.subWidth; + class113.field1178 = class310.options_buttons_0Sprite.subHeight; + EnumComposition.field1505 = new LoginScreenAnimation(class134.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; + Login.field769 = new String[8]; + Login.field753 = 0; + } + + class53.field256 = 0; + NewShit.otp = ""; + Login.field744 = true; + Login.worldSelectOpen = false; + if (!WorldMapIcon_1.clientPreferences.getTitleMusicDisabled()) { + ArrayList var5 = new ArrayList(); + var5.add(new MusicSong(class514.archive6, "scape main", "", 255, false)); + PendingSpawn.method505(var5, 0, 0, 0, 100, false); + } else { + WorldMapManager.method1265(0, 0); + } + + class472.method2350(); + class157.method827().method1954(false); + class384.clearLoginScreen = true; + Login.xPadding = (Language.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class157.loginBoxCenter = Login.loginBoxX + 180; + class250.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); } + } - var2 = var0.orientation - var0.rotation & 2047; - if (var2 != 0) { - boolean var16 = true; - boolean var17 = true; - ++var0.field1004; - var5 = var2 > 1024 ? -1 : 1; - var0.rotation += var0.field1020 * var5; - boolean var19 = true; - if (var2 < var0.field1020 || var2 > 2048 - var0.field1020) { - var0.rotation = var0.orientation; - var19 = false; - } - - if (var0.field1020 > 0 && var0.movementSequence == var0.idleSequence && (var0.field1004 > 25 || var19)) { - if (var5 == -1 && var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else if (var5 == 1 && var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - - var0.rotation &= 2047; - } else { - if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - var0.field1004 = 0; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(IIIIIZI)Luz;", + garbageValue = "-328465387" + ) + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { + var4 = 0; + } else if (var4 == 2 && var1 != 1) { + var4 = 1; } - var0.isWalking = false; - if (var0.movementSequence != -1) { - var11 = class36.SequenceDefinition_get(var0.movementSequence); - if (var11 != null) { - if (!var11.isCachedModelIdSet() && var11.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var11.frameIds.length && var0.movementFrameCycle > var11.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - FontName.method2481(var11, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var11.frameIds.length) { - if (var11.frameCount > 0) { - var0.movementFrame -= var11.frameCount; - if (var11.field1849) { - ++var0.field993; - } - - if (var0.movementFrame < 0 || var0.movementFrame >= var11.frameIds.length || var11.field1849 && var0.field993 >= var11.iterations) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - var0.field993 = 0; - } - } else { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - } - - FontName.method2481(var11, var0.movementFrame, var0.x, var0.y); - } - } else if (var11.isCachedModelIdSet()) { - ++var0.movementFrame; - var3 = var11.method1127(); - if (var0.movementFrame < var3) { - ModeWhere.method2013(var11, var0.movementFrame, var0.x, var0.y); - } else { - if (var11.frameCount > 0) { - var0.movementFrame -= var11.frameCount; - if (var11.field1849) { - ++var0.field993; - } - - if (var0.movementFrame < 0 || var0.movementFrame >= var3 || var11.field1849 && var0.field993 >= var11.iterations) { - var0.movementFrame = 0; - var0.movementFrameCycle = 0; - var0.field993 = 0; - } - } else { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - } - - ModeWhere.method2013(var11, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; - } - } else { - var0.movementSequence = -1; + long var6 = ((long)var4 << 40) + (long)var0 + ((long)var1 << 16) + ((long)var2 << 38) + ((long)var3 << 42); + SpritePixels var8; + if (!var5) { + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { + return var8; } } - IterableNodeHashTableIterator var20 = new IterableNodeHashTableIterator(var0.method518()); - - for (SpotAnimation var14 = (SpotAnimation)var20.method2484(); var14 != null; var14 = (SpotAnimation)var20.next()) { - if (var14.field4304 != -1 && Client.cycle >= var14.field4308) { - var4 = class406.SpotAnimationDefinition_get(var14.field4304).sequence; - if (var4 == -1) { - var14.remove(); - --var0.field1007; - } else { - var14.field4306 = Math.max(var14.field4306, 0); - SequenceDefinition var15 = class36.SequenceDefinition_get(var4); - if (var15.frameIds != null && !var15.isCachedModelIdSet()) { - ++var14.field4305; - if (var14.field4306 < var15.frameIds.length && var14.field4305 > var15.frameLengths[var14.field4306]) { - var14.field4305 = 1; - ++var14.field4306; - FontName.method2481(var15, var14.field4306, var0.x, var0.y); - } + ItemComposition var9 = class214.ItemDefinition_get(var0); + if (var1 > 1 && var9.countobj != null) { + int var10 = -1; - if (var14.field4306 >= var15.frameIds.length) { - var14.remove(); - --var0.field1007; - } - } else if (var15.isCachedModelIdSet()) { - ++var14.field4306; - var12 = var15.method1127(); - if (var14.field4306 < var12) { - ModeWhere.method2013(var15, var14.field4306, var0.x, var0.y); - } else { - var14.remove(); - --var0.field1007; - } - } else { - var14.remove(); - --var0.field1007; - } + for (int var11 = 0; var11 < 10; ++var11) { + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { + var10 = var9.countobj[var11]; } } - } - SequenceDefinition var21; - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var21 = class36.SequenceDefinition_get(var0.sequence); - if (var21.precedenceAnimating == 1 && var0.field1023 > 0 && var0.spotAnimation <= Client.cycle && var0.exactMoveArrive1Cycle < Client.cycle) { - var0.sequenceDelay = 1; - return; + if (var10 != -1) { + var9 = class214.ItemDefinition_get(var10); } } - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var21 = class36.SequenceDefinition_get(var0.sequence); - if (var21 == null) { - var0.sequence = -1; - } else if (!var21.isCachedModelIdSet() && var21.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var21.frameIds.length && var0.sequenceFrameCycle > var21.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - FontName.method2481(var21, var0.sequenceFrame, var0.x, var0.y); + Model var22 = var9.getModel(1); + if (var22 == null) { + return null; + } else { + SpritePixels var23 = null; + if (var9.noteTemplate != -1) { + var23 = getItemSprite(var9.note, 10, 1, 0, 0, true); + if (var23 == null) { + return null; } - - if (var0.sequenceFrame >= var21.frameIds.length) { - var0.sequenceFrame -= var21.frameCount; - ++var0.currentSequenceFrameIndex; - if (var0.currentSequenceFrameIndex >= var21.iterations) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var21.frameIds.length) { - FontName.method2481(var21, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } + } else if (var9.notedId != -1) { + var23 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + if (var23 == null) { + return null; } - - var0.isWalking = var21.stretches; - } else if (var21.isCachedModelIdSet()) { - ++var0.sequenceFrame; - var4 = var21.method1127(); - if (var0.sequenceFrame < var4) { - ModeWhere.method2013(var21, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequenceFrame -= var21.frameCount; - ++var0.currentSequenceFrameIndex; - if (var0.currentSequenceFrameIndex >= var21.iterations) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var4) { - ModeWhere.method2013(var21, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } + } else if (var9.placeholderTemplate != -1) { + var23 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + if (var23 == null) { + return null; } - } else { - var0.sequence = -1; } - } - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "569925847" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = class10.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (var5 != 0L) { - var7 = class10.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - if (class372.method1929(var5)) { - var10 = var4; + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; + int var13 = Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_height; + float[] var15 = Rasterizer2D.field4245; + int[] var16 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var16); + var8 = new SpritePixels(36, 32); + Rasterizer3D.method1426(var8.pixels, 36, 32, (float[])null); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.method1427(); + Rasterizer3D.method1430(16, 16); + Rasterizer3D.clips.field2457 = false; + if (var9.placeholderTemplate != -1) { + var23.drawTransBgAt(0, 0); } - int[] var11 = SpriteMask.sceneMinimapSprite.pixels; - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; - var13 = SecureRandomFuture.Entity_unpackID(var5); - ObjectComposition var14 = class91.getObjectDefinition(var13); - if (var14.mapSceneId != -1) { - IndexedSprite var15 = KitDefinition.mapSceneSprites[var14.mapSceneId]; - if (var15 != null) { - int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; - int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; - var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); - } - } else { - if (var9 == 0 || var9 == 2) { - if (var8 == 0) { - var11[var12] = var10; - var11[var12 + 512] = var10; - var11[var12 + 1024] = var10; - var11[var12 + 1536] = var10; - } else if (var8 == 1) { - var11[var12] = var10; - var11[var12 + 1] = var10; - var11[var12 + 2] = var10; - var11[var12 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 3] = var10; - var11[var12 + 512 + 3] = var10; - var11[var12 + 1024 + 3] = var10; - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { - var11[var12 + 1536] = var10; - var11[var12 + 1536 + 1] = var10; - var11[var12 + 1536 + 2] = var10; - var11[var12 + 1536 + 3] = var10; - } - } - - if (var9 == 3) { - if (var8 == 0) { - var11[var12] = var10; - } else if (var8 == 1) { - var11[var12 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { - var11[var12 + 1536] = var10; - } - } - - if (var9 == 2) { - if (var8 == 3) { - var11[var12] = var10; - var11[var12 + 512] = var10; - var11[var12 + 1024] = var10; - var11[var12 + 1536] = var10; - } else if (var8 == 0) { - var11[var12] = var10; - var11[var12 + 1] = var10; - var11[var12 + 2] = var10; - var11[var12 + 3] = var10; - } else if (var8 == 1) { - var11[var12 + 3] = var10; - var11[var12 + 512 + 3] = var10; - var11[var12 + 1024 + 3] = var10; - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 1536] = var10; - var11[var12 + 1536 + 1] = var10; - var11[var12 + 1536 + 2] = var10; - var11[var12 + 1536 + 3] = var10; - } - } + int var17 = var9.zoom2d; + if (var5) { + var17 = (int)(1.5D * (double)var17); + } else if (var2 == 2) { + var17 = (int)((double)var17 * 1.04D); } - } - - var5 = class10.scene.getGameObjectTag(var0, var1, var2); - if (var5 != 0L) { - var7 = class10.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = SecureRandomFuture.Entity_unpackID(var5); - ObjectComposition var24 = class91.getObjectDefinition(var10); - int var19; - if (var24.mapSceneId != -1) { - IndexedSprite var18 = KitDefinition.mapSceneSprites[var24.mapSceneId]; - if (var18 != null) { - var13 = (var24.sizeX * 4 - var18.subWidth) / 2; - var19 = (var24.sizeY * 4 - var18.subHeight) / 2; - var18.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); - } - } else if (var9 == 9) { - var12 = 15658734; - if (class372.method1929(var5)) { - var12 = 15597568; - } - int[] var20 = SpriteMask.sceneMinimapSprite.pixels; - var19 = var1 * 4 + (103 - var2) * 2048 + 24624; - if (var8 != 0 && var8 != 2) { - var20[var19] = var12; - var20[var19 + 1 + 512] = var12; - var20[var19 + 1024 + 2] = var12; - var20[var19 + 1536 + 3] = var12; - } else { - var20[var19 + 1536] = var12; - var20[var19 + 1 + 1024] = var12; - var20[var19 + 512 + 2] = var12; - var20[var19 + 3] = var12; - } + int var18 = var17 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; + int var19 = var17 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; + var22.calculateBoundsCylinder(); + var22.method1556(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var22.height / 2 + var18 + var9.offsetY2d, var19 + var9.offsetY2d); + if (var9.notedId != -1) { + var23.drawTransBgAt(0, 0); } - } - var5 = class10.scene.getFloorDecorationTag(var0, var1, var2); - if (0L != var5) { - var7 = SecureRandomFuture.Entity_unpackID(var5); - ObjectComposition var21 = class91.getObjectDefinition(var7); - if (var21.mapSceneId != -1) { - IndexedSprite var22 = KitDefinition.mapSceneSprites[var21.mapSceneId]; - if (var22 != null) { - var10 = (var21.sizeX * 4 - var22.subWidth) / 2; - int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; - var22.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); - } + if (var2 >= 1) { + var8.outline(1); } - } - } + if (var2 >= 2) { + var8.outline(16777215); + } - @ObfuscatedName("no") - @ObfuscatedSignature( - descriptor = "(Lnm;I)V", - garbageValue = "-2045006615" - ) - static final void method16(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field548 == -1) { - Client.field548 = var0.spriteId2; - Client.field549 = var0.spriteId; + if (var3 != 0) { + var8.shadow(var3); } - if (Client.playerAppearance.field2950 == 1) { - var0.spriteId2 = Client.field548; - } else { - var0.spriteId2 = Client.field549; + Rasterizer3D.method1426(var8.pixels, 36, 32, (float[])null); + if (var9.noteTemplate != -1) { + var23.drawTransBgAt(0, 0); } - } else if (var1 == 325) { - if (Client.field548 == -1) { - Client.field548 = var0.spriteId2; - Client.field549 = var0.spriteId; + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + Font var20 = TaskHandler.ItemDefinition_fontPlain11; + String var21; + if (var1 < 100000) { + var21 = "" + var1 + ""; + } else if (var1 < 10000000) { + var21 = "" + var1 / 1000 + "K" + ""; + } else { + var21 = "" + var1 / 1000000 + "M" + ""; + } + + var20.draw(var21, 0, 9, 16776960, 1); } - if (Client.playerAppearance.field2950 == 1) { - var0.spriteId2 = Client.field549; - } else { - var0.spriteId2 = Client.field548; + if (!var5) { + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); } - } else if (var1 == 327) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 0; - } else if (var1 == 328) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 1; + Rasterizer3D.method1426(var12, var13, var14, var15); + Rasterizer2D.Rasterizer2D_setClipArray(var16); + Rasterizer3D.method1427(); + Rasterizer3D.clips.field2457 = true; + return var8; } } } \ No newline at end of file diff --git a/osrs/src/main/java/class60.java b/osrs/src/main/java/class60.java index b26ee1bf4..7a280753a 100644 --- a/osrs/src/main/java/class60.java +++ b/osrs/src/main/java/class60.java @@ -1,27 +1,54 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cz") +@ObfuscatedName("cw") public class class60 { - @ObfuscatedName("ac") - byte[] field315; - @ObfuscatedName("al") - int field317; - @ObfuscatedName("ak") + @ObfuscatedName("ws") + @ObfuscatedSignature( + descriptor = "Lsb;" + ) + static PlatformInfo field312; + @ObfuscatedName("ab") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("io") + @ObfuscatedSignature( + descriptor = "Lel;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "[Luz;" + ) + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + @ObfuscatedName("oc") + @Export("menuY") + static int menuY; + @ObfuscatedName("uz") + @Export("cameraLookAtSpeed") + static int cameraLookAtSpeed; + @ObfuscatedName("at") + byte[] field314; + @ObfuscatedName("ah") + int field315; + @ObfuscatedName("ar") int field316; class60() { - this.field315 = null; - this.field317 = 0; + this.field314 = null; + this.field315 = 0; this.field316 = 0; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1668070165" + garbageValue = "1826933410" ) - int method327(int var1) { + int method335(int var1) { int var2 = 0; int var3; @@ -29,51 +56,195 @@ int method327(int var1) { for (var3 = 0; var1 >= 8 - this.field316; var1 -= var4) { var4 = 8 - this.field316; int var5 = (1 << var4) - 1; - var2 += (this.field315[this.field317] >> this.field316 & var5) << var3; + var2 += (this.field314[this.field315] >> this.field316 & var5) << var3; this.field316 = 0; - ++this.field317; + ++this.field315; var3 += var4; } if (var1 > 0) { var4 = (1 << var1) - 1; - var2 += (this.field315[this.field317] >> this.field316 & var4) << var3; + var2 += (this.field314[this.field315] >> this.field316 & var4) << var3; this.field316 += var1; } return var2; } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1671970145" + descriptor = "(B)I", + garbageValue = "100" ) - int method328() { - int var1 = this.field315[this.field317] >> this.field316 & 1; + int method336() { + int var1 = this.field314[this.field315] >> this.field316 & 1; ++this.field316; - this.field317 += this.field316 >> 3; + this.field315 += this.field316 >> 3; this.field316 &= 7; return var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "([BIS)V", - garbageValue = "-20687" + descriptor = "([BIB)V", + garbageValue = "-31" ) - void method329(byte[] var1, int var2) { - this.field315 = var1; - this.field317 = var2; + void method337(byte[] var1, int var2) { + this.field314 = var1; + this.field315 = var2; this.field316 = 0; } - @ObfuscatedName("ar") + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(ILdt;ZB)I", + garbageValue = "3" + ) + static int method338(int var0, Script var1, boolean var2) { + Widget var3 = HealthBarDefinition.widgetDefinition.method1733(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); + if (var0 == 2600) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == 2601) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == 2602) { + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == 2603) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == 2604) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == 2605) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == 2606) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == 2607) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == 2608) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == 2609) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 2610) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == 2611) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == 2612) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 2613) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == 2614) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + class336 var4; + if (var0 == 2617) { + var4 = var3.method1872(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2923 * 1307671165 * -2042671403 : 0; + } + + if (var0 == 2618) { + var4 = var3.method1872(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2921 * -1246608637 * -1141194837 : 0; + return 1; + } else { + class341 var7; + if (var0 == 2619) { + var7 = var3.method1871(); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1808().method2056() : ""; + return 1; + } else if (var0 == 2620) { + var4 = var3.method1872(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2922 * -1028807547 * -113724339 : 0; + return 1; + } else if (var0 == 2621) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1818() : 0; + return 1; + } else if (var0 == 2622) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1819() : 0; + return 1; + } else if (var0 == 2623) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1820() : 0; + return 1; + } else if (var0 == 2624) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null && var7.method1810() ? 1 : 0; + return 1; + } else if (var0 != 2625) { + if (var0 == 2626) { + var7 = var3.method1871(); + Interpreter.Interpreter_stringStack[++class127.Interpreter_stringStackSize - 1] = var7 != null ? var7.method1809().method2131() : ""; + return 1; + } else if (var0 == 2627) { + var7 = var3.method1871(); + int var5 = var7 != null ? var7.method1814() : 0; + int var6 = var7 != null ? var7.method1813() : 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Math.min(var5, var6); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = Math.max(var5, var6); + return 1; + } else if (var0 == 2628) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1813() : 0; + return 1; + } else if (var0 == 2629) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1822() : 0; + return 1; + } else if (var0 == 2630) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1821() : 0; + return 1; + } else if (var0 == 2631) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1823() : 0; + return 1; + } else if (var0 == 2632) { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null ? var7.method1824() : 0; + return 1; + } else { + class27 var8; + if (var0 == 2633) { + var8 = var3.method1873(); + Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1] = var8 != null ? var8.method115(Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1]) : 0; + return 1; + } else if (var0 == 2634) { + var8 = var3.method1873(); + Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1] = var8 != null ? var8.method116((char)Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize - 1]) : 0; + return 1; + } else { + return 2; + } + } + } else { + var7 = var3.method1871(); + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7 != null && var7.method1811() ? 1 : 0; + return 1; + } + } + } + } + + @ObfuscatedName("kw") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "1" + descriptor = "(B)Z", + garbageValue = "-128" ) - public static boolean method330(int var0) { - return var0 >= WorldMapDecorationType.field3150.id && var0 <= WorldMapDecorationType.field3153.id || var0 == WorldMapDecorationType.field3152.id; + static final boolean method339() { + return Client.isMenuOpen; } } \ No newline at end of file diff --git a/osrs/src/main/java/class64.java b/osrs/src/main/java/class64.java deleted file mode 100644 index cc6bf29d3..000000000 --- a/osrs/src/main/java/class64.java +++ /dev/null @@ -1,88 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.concurrent.ThreadFactory; - -@ObfuscatedName("ck") -class class64 implements ThreadFactory { - @ObfuscatedName("ow") - @ObfuscatedSignature( - descriptor = "Lnm;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lclient;" - ) - final Client this$0; - - @ObfuscatedSignature( - descriptor = "(Lclient;)V" - ) - class64(Client var1) { - this.this$0 = var1; - } - - public Thread newThread(Runnable var1) { - return new Thread(var1, "OSRS Maya Anim Load"); - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Lcv;Lcv;IZB)I", - garbageValue = "37" - ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { - int var4 = var0.population; - int var5 = var1.population; - if (!var3) { - if (var4 == -1) { - var4 = 2001; - } - - if (var5 == -1) { - var5 = 2001; - } - } - - return var4 - var5; - } else if (var2 == 2) { - return var0.location - var1.location; - } else if (var2 == 3) { - if (var0.activity.equals("-")) { - if (var1.activity.equals("-")) { - return 0; - } else { - return var3 ? -1 : 1; - } - } else if (var1.activity.equals("-")) { - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); - } - } else if (var2 == 4) { - return var0.method392() ? (var1.method392() ? 0 : 1) : (var1.method392() ? -1 : 0); - } else if (var2 == 5) { - return var0.method390() ? (var1.method390() ? 0 : 1) : (var1.method390() ? -1 : 0); - } else if (var2 == 6) { - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } else { - return var0.id - var1.id; - } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2137865647" - ) - static final int method336() { - return ViewportMouse.ViewportMouse_x; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class7.java b/osrs/src/main/java/class7.java index d84919071..679f4df58 100644 --- a/osrs/src/main/java/class7.java +++ b/osrs/src/main/java/class7.java @@ -2,144 +2,95 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -@ObfuscatedName("ab") +@ObfuscatedName("ac") public class class7 { - @ObfuscatedName("ac") - ExecutorService field7; - @ObfuscatedName("al") - Future field8; - @ObfuscatedName("ak") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Lul;" + descriptor = "Lrv;" ) - final Buffer field10; - @ObfuscatedName("ax") + static Bounds field13; + @ObfuscatedName("fc") @ObfuscatedSignature( - descriptor = "Lax;" + descriptor = "Loh;" ) - final class3 field9; + static Archive field12; + @ObfuscatedName("at") + ExecutorService field14; + @ObfuscatedName("ah") + Future field15; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Luj;" + ) + final Buffer field17; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lao;" + ) + final class3 field16; @ObfuscatedSignature( - descriptor = "(Lul;Lax;)V" + descriptor = "(Luj;Lao;)V" ) public class7(Buffer var1, class3 var2) { - this.field7 = Executors.newSingleThreadExecutor(); - this.field10 = var1; - this.field9 = var2; - this.method21(); + this.field14 = Executors.newSingleThreadExecutor(); + this.field17 = var1; + this.field16 = var2; + this.method20(); } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "8" + descriptor = "(I)Z", + garbageValue = "-1139388423" ) public boolean method17() { - return this.field8.isDone(); + return this.field15.isDone(); } - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "40" + garbageValue = "-85" ) public void method18() { - this.field7.shutdown(); - this.field7 = null; + this.field14.shutdown(); + this.field14 = null; } - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Lul;", - garbageValue = "1362565755" + descriptor = "(I)Luj;", + garbageValue = "1719469539" ) public Buffer method19() { try { - return (Buffer)this.field8.get(); + return (Buffer)this.field15.get(); } catch (Exception var2) { return null; } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-693034688" - ) - void method21() { - this.field8 = this.field7.submit(new class1(this, this.field10, this.field9)); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-20434766" + garbageValue = "670467057" ) - static long method20() { - try { - URL var0 = new URL(ScriptEvent.method474("services", false) + "m=accountappeal/login.ws"); - URLConnection var1 = var0.openConnection(); - var1.setRequestProperty("connection", "close"); - var1.setDoInput(true); - var1.setDoOutput(true); - var1.setConnectTimeout(5000); - OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); - var2.write("data1=req"); - var2.flush(); - InputStream var3 = var1.getInputStream(); - Buffer var4 = new Buffer(new byte[1000]); - - do { - int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); - if (var5 == -1) { - var4.offset = 0; - long var7 = var4.readLong(); - return var7; - } - - var4.offset += var5; - } while(var4.offset < 1000); - - return 0L; - } catch (Exception var9) { - return 0L; - } - } - - @ObfuscatedName("ht") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1063387188" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - CollisionMap.method1166(); - switch(var0) { - case 1: - GameEngine.method166(24); - AbstractWorldMapIcon.setLoginResponseString("", "You were disconnected from the server.", ""); - break; - case 2: - class339.method1746(); - } - + void method20() { + this.field15 = this.field14.submit(new class1(this, this.field17, this.field16)); } - @ObfuscatedName("jt") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)Lpf;", - garbageValue = "2097624965" + descriptor = "(IB)Z", + garbageValue = "1" ) - @Export("getScriptEvents") - public static NodeDeque getScriptEvents() { - return Client.scriptEvents; + @Export("isWorldMapEvent") + public static boolean isWorldMapEvent(int var0) { + return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; } } \ No newline at end of file diff --git a/osrs/src/main/java/class72.java b/osrs/src/main/java/class72.java new file mode 100644 index 000000000..deacfe351 --- /dev/null +++ b/osrs/src/main/java/class72.java @@ -0,0 +1,108 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Iterator; + +@ObfuscatedName("ch") +public class class72 { + @ObfuscatedName("ab") + static final BigInteger field729; + @ObfuscatedName("au") + static final BigInteger field730; + + static { + field729 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field730 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Lep;", + garbageValue = "1917414227" + ) + static class129 method432(int var0) { + class129[] var1 = new class129[]{class129.field1244, class129.field1241, class129.field1243, class129.field1242, class129.field1240}; + class129 var2 = (class129)class12.findEnumerated(var1, var0); + if (var2 == null) { + var2 = class129.field1244; + } + + return var2; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + public static void method431() { + class182.field1502.clear(); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lol;IS)V", + garbageValue = "-25767" + ) + public static void method433(AbstractArchive var0, int var1) { + if (!class316.field2787.isEmpty()) { + ArrayList var2 = new ArrayList(); + Iterator var3 = class316.field2787.iterator(); + + while (var3.hasNext()) { + MusicSong var4 = (MusicSong)var3.next(); + var4.field2883 = false; + var4.field2882 = false; + var4.field2884 = false; + var4.field2880 = false; + var4.musicTrackArchive = var0; + var4.musicTrackVolume = var1; + var4.field2886 = 0.0F; + var2.add(var4); + } + + PendingSpawn.method505(var2, class316.musicPlayerStatus, class316.field2794, class316.field2795, class316.field2796, false); + } + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(ILdt;ZI)I", + garbageValue = "1084979795" + ) + static int method434(int var0, Script var1, boolean var2) { + if (var0 == 5306) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = ApproximateRouteStrategy.getWindowedMode(); + return 1; + } else { + int var3; + if (var0 == 5307) { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + class9.setWindowedMode(var3); + } + + return 1; + } else if (var0 == 5308) { + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = WorldMapIcon_1.clientPreferences.method563(); + return 1; + } else if (var0 != 5309) { + if (var0 == 5310) { + --DbTableType.Interpreter_intStackSize; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + WorldMapIcon_1.clientPreferences.method562(var3); + } + + return 1; + } + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class73.java b/osrs/src/main/java/class73.java deleted file mode 100644 index 2439f1e08..000000000 --- a/osrs/src/main/java/class73.java +++ /dev/null @@ -1,145 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.util.concurrent.ThreadFactory; - -@ObfuscatedName("cd") -final class class73 implements ThreadFactory { - @Export("newThread") - @ObfuscatedName("newThread") - public Thread newThread(Runnable var1) { - return new Thread(var1, "OSRS Maya Anim Load"); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)Lhz;", - garbageValue = "1119787820" - ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)Lht;", - garbageValue = "-1308783411" - ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); - var1 = new EnumComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2027765065" - ) - static final void method423() { - for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { - int var10002 = Client.queuedSoundEffectDelays[var0]--; - if (Client.queuedSoundEffectDelays[var0] >= -10) { - SoundEffect var9 = Client.soundEffects[var0]; - if (var9 == null) { - Object var10000 = null; - var9 = SoundEffect.readSoundEffect(class469.field3930, Client.soundEffectIds[var0], 0); - if (var9 == null) { - continue; - } - - int[] var12 = Client.queuedSoundEffectDelays; - var12[var0] += var9.calculateDelay(); - Client.soundEffects[var0] = var9; - } - - if (Client.queuedSoundEffectDelays[var0] < 0) { - int var2; - if (Client.soundLocations[var0] != 0) { - int var3 = (Client.soundLocations[var0] & 255) * 128; - int var4 = Client.soundLocations[var0] >> 16 & 255; - int var5 = var4 * 128 + 64 - TextureProvider.localPlayer.x; - if (var5 < 0) { - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - TextureProvider.localPlayer.y; - if (var7 < 0) { - var7 = -var7; - } - - int var8 = var5 + var7 - 128; - if (var8 > var3) { - Client.queuedSoundEffectDelays[var0] = -100; - continue; - } - - if (var8 < 0) { - var8 = 0; - } - - var2 = (var3 - var8) * class91.clientPreferences.getAreaSoundEffectsVolume() / var3; - } else { - var2 = class91.clientPreferences.getCurrentSoundEffectsVolume(); - } - - if (var2 > 0) { - RawSound var10 = var9.toRawSound().resample(class136.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); - var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - class140.pcmStreamMixer.addSubStream(var11); - } - - Client.queuedSoundEffectDelays[var0] = -100; - } - } else { - --Client.soundEffectCount; - - for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { - Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; - Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; - Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; - Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; - Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; - } - - --var0; - } - } - - if (Client.playingJingle && !Strings.method1907()) { - if (class91.clientPreferences.getCurrentMusicVolume() != 0 && ScriptFrame.method334()) { - VarcInt.method975(CollisionMap.archive6, class91.clientPreferences.getCurrentMusicVolume()); - } - - Client.playingJingle = false; - } - - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class74.java b/osrs/src/main/java/class74.java index 73462258a..58ab54581 100644 --- a/osrs/src/main/java/class74.java +++ b/osrs/src/main/java/class74.java @@ -1,208 +1,20 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; import java.math.BigInteger; -import java.util.Iterator; -@ObfuscatedName("ct") +@ObfuscatedName("cz") public class class74 { - @ObfuscatedName("ao") - static final BigInteger field730; + @ObfuscatedName("at") + static final BigInteger field742; @ObfuscatedName("ah") - static final BigInteger field729; + static final BigInteger field741; + @ObfuscatedName("ao") + @Export("Tiles_underlays") + static short[][][] Tiles_underlays; static { - field730 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field729 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "-25" - ) - static final int method424(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "6345" - ) - public static void method425() { - DbRowType.DBRowType_cache.clear(); - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-970557765" - ) - static void method426() { - Iterator var0 = class319.musicSongs.iterator(); - - while (var0.hasNext()) { - MusicSong var1 = (MusicSong)var0.next(); - if (var1 != null) { - var1.midiPcmStream.clear(); - var1.midiPcmStream.method1666(); - var1.midiPcmStream.setPcmStreamVolume(0); - var1.midiPcmStream.field2833 = 0; - WorldMapDecorationType.method1897(var1.musicTrackGroupId, var1.musicTrackFileId); - } - } - - class319.musicSongs.clear(); - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "-1821439381" - ) - static int method427(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3903) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == 3904) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == 3905) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == 3906) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == 3907) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == 3908) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; - } else { - int var12; - if (var0 == 3910) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; - return 1; - } else if (var0 == 3911) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; - return 1; - } else if (var0 == 3912) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; - return 1; - } else if (var0 == 3913) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; - return 1; - } else { - boolean var13; - if (var0 == 3914) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Varps.grandExchangeEvents != null) { - Varps.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } - - return 1; - } else if (var0 == 3915) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Varps.grandExchangeEvents != null) { - Varps.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); - } - - return 1; - } else if (var0 == 3916) { - Interpreter.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - if (Varps.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - Varps.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } - - return 1; - } else if (var0 == 3917) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Varps.grandExchangeEvents != null) { - Varps.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } - - return 1; - } else if (var0 == 3918) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Varps.grandExchangeEvents != null) { - Varps.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } - - return 1; - } else if (var0 == 3919) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.grandExchangeEvents == null ? 0 : Varps.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var11; - if (var0 == 3920) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.world; - return 1; - } else if (var0 == 3921) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var11.getOfferName(); - return 1; - } else if (var0 == 3922) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); - return 1; - } else if (var0 == 3923) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); - long var5 = GrandExchangeOfferTotalQuantityComparator.method1971() - class411.field3712 - var11.age; - int var7 = (int)(var5 / 3600000L); - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; - Interpreter.Interpreter_stringStack[++class180.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == 3924) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == 3925) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == 3926) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Varps.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } else if (var0 == 3939) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class214.ItemDefinition_get(var3).isTradable ? 1 : 0; - return 1; - } else { - return 2; - } - } - } - } + field742 = new BigInteger("10001", 16); + field741 = new BigInteger("850174caa25e7608dd4a92f60946ae0011b578e0da829e93de3169dbf59d67460a86139a1843088971808d1b8b97572c5002f6d6a760038af0b0b8f3b1a5362cfc5151edcedc2df5fadf70a85c7b12e24eb4a8f8d7f1e5a523910fdda2964063936666111808b5b27513ec83e9e6a7b30e45f252d93096d0fc2d0370da3871d5", 16); } } \ No newline at end of file diff --git a/osrs/src/main/java/class76.java b/osrs/src/main/java/class76.java deleted file mode 100644 index aa922e5bf..000000000 --- a/osrs/src/main/java/class76.java +++ /dev/null @@ -1,127 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -import java.math.BigInteger; - -@ObfuscatedName("cl") -public class class76 { - @ObfuscatedName("ac") - static final BigInteger field738; - @ObfuscatedName("al") - static final BigInteger field739; - - static { - field738 = new BigInteger("10001", 16); - field739 = new BigInteger("cc90697b065845f69ec9f317c5c2120b275cdf1e7dbc83f9bd6f48b14bc9225b7400ccc4d6942e14ada8e923e99c75bfa6f001f0a92bdbf435c59a0e86120e2526ebdc45626349cbc249b24e878b5eb1a2ff432b56dafa8eb5a6282883286733f87bdb2e843f8848ec651045f7295208ea0627602d4352099e730d2b57905e95", 16); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1393359399" - ) - static void method430(int var0) { - class465.field3904 = var0; - class465.field3907 = new class465[var0]; - class465.field3905 = 0; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1583079321" - ) - public static int method431(int var0) { - return class317.field2775[var0]; - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(ILds;ZB)I", - garbageValue = "0" - ) - static int method432(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = class33.widgetDefinition.method1740(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - } - - ClanChannelMember.invalidateWidget(var3); - int var4; - int var5; - if (var0 != 1200 && var0 != 1205 && var0 != 1212) { - if (var0 == 1201) { - var3.modelType = 2; - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 1202) { - var3.modelType = 3; - var3.modelId = TextureProvider.localPlayer.appearance.getChatHeadId(); - return 1; - } else if (var0 == 1207) { - boolean var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Strings.method1908(var3, TextureProvider.localPlayer.appearance, var7); - return 1; - } else if (var0 == 1208) { - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3.field3127 == null) { - throw new RuntimeException(""); - } else { - ZoneOperation.method1645(var3, var4); - return 1; - } - } else if (var0 == 1209) { - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3.field3127 == null) { - throw new RuntimeException(""); - } else { - UrlRequest.method664(var3, var4, var5); - return 1; - } - } else if (var0 == 1210) { - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3.field3127 == null) { - throw new RuntimeException(""); - } else { - UrlRequester.method653(var3, TextureProvider.localPlayer.appearance.field2950, var4); - return 1; - } - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemComposition var6 = class214.ItemDefinition_get(var4); - var3.modelAngleX = var6.xan2d; - var3.modelAngleY = var6.yan2d; - var3.modelAngleZ = var6.zan2d; - var3.modelOffsetX = var6.offsetX2d; - var3.modelOffsetY = var6.offsetY2d; - var3.modelZoom = var6.zoom2d; - if (var0 == 1205) { - var3.itemQuantityMode = 0; - } else if (var0 == 1212 | 1 == var6.isStackable) { - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; - } - - if (var3.modelRotation > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.modelRotation; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class8.java b/osrs/src/main/java/class8.java index 3d0794fc4..423288828 100644 --- a/osrs/src/main/java/class8.java +++ b/osrs/src/main/java/class8.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("am") +@ObfuscatedName("al") public class class8 { - @ObfuscatedName("ac") - final int field11; - @ObfuscatedName("al") - final int field12; - @ObfuscatedName("ak") - final String field13; + @ObfuscatedName("at") + final int field19; + @ObfuscatedName("ah") + final int field18; + @ObfuscatedName("ar") + final String field20; @ObfuscatedSignature( - descriptor = "(Lul;)V" + descriptor = "(Luj;)V" ) class8(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); } class8(int var1, int var2, String var3) { - this.field11 = var1; - this.field12 = var2; - this.field13 = var3; + this.field19 = var1; + this.field18 = var2; + this.field20 = var3; } - @ObfuscatedName("ac") - String method24() { - return Integer.toHexString(this.field11) + Integer.toHexString(this.field12) + this.field13; + @ObfuscatedName("at") + String method21() { + return Integer.toHexString(this.field19) + Integer.toHexString(this.field18) + this.field20; } - @ObfuscatedName("al") - int method25() { - return this.field12; + @ObfuscatedName("ah") + int method22() { + return this.field18; } } \ No newline at end of file diff --git a/osrs/src/main/java/class85.java b/osrs/src/main/java/class85.java new file mode 100644 index 000000000..c52e28ac7 --- /dev/null +++ b/osrs/src/main/java/class85.java @@ -0,0 +1,15 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dg") +public class class85 { + @ObfuscatedName("am") + static String[] field859; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + @Export("clientLanguage") + static Language clientLanguage; +} \ No newline at end of file diff --git a/osrs/src/main/java/class87.java b/osrs/src/main/java/class87.java deleted file mode 100644 index 1eb2a6a1b..000000000 --- a/osrs/src/main/java/class87.java +++ /dev/null @@ -1,129 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("df") -public class class87 { - @ObfuscatedName("md") - @Export("Client_plane") - static int Client_plane; - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1072817040" - ) - static void method461() { - synchronized(ArchiveDiskActionHandler.field3545) { - if (ArchiveDiskActionHandler.field3544 == 0) { - UserComparator3.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - UserComparator3.ArchiveDiskActionHandler_thread.setDaemon(true); - UserComparator3.ArchiveDiskActionHandler_thread.start(); - UserComparator3.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3544 = 600; - ArchiveDiskActionHandler.field3543 = false; - } - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(ILds;ZI)I", - garbageValue = "949731211" - ) - static int method462(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class416.scriptDotWidget : class306.scriptActiveWidget; - if (var0 == 1500) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == 1501) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == 1502) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == 1503) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == 1504) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == 1505) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-103317779" - ) - static final void method463(int var0) { - int[] var1 = SpriteMask.sceneMinimapSprite.pixels; - int var2 = var1.length; - - int var3; - for (var3 = 0; var3 < var2; ++var3) { - var1[var3] = 0; - } - - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { - var4 = (103 - var3) * 2048 + 24628; - - for (var5 = 1; var5 < 103; ++var5) { - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { - class10.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - class10.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } - - var4 += 4; - } - } - - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - SpriteMask.sceneMinimapSprite.setRaster(); - - int var6; - for (var5 = 1; var5 < 103; ++var5) { - for (var6 = 1; var6 < 103; ++var6) { - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { - class6.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { - class6.drawObject(var0 + 1, var6, var5, var3, var4); - } - } - } - - Client.mapIconCount = 0; - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - long var7 = class10.scene.getFloorDecorationTag(Client_plane, var5, var6); - if (0L != var7) { - int var9 = SecureRandomFuture.Entity_unpackID(var7); - int var10 = class91.getObjectDefinition(var9).mapIconId; - if (var10 >= 0 && class148.WorldMapElement_get(var10).field1518) { - Client.mapIcons[Client.mapIconCount] = class148.WorldMapElement_get(var10).getSpriteBool(false); - Client.mapIconXs[Client.mapIconCount] = var5; - Client.mapIconYs[Client.mapIconCount] = var6; - ++Client.mapIconCount; - } - } - } - } - - class223.rasterProvider.apply(); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class89.java b/osrs/src/main/java/class89.java new file mode 100644 index 000000000..77adcdedd --- /dev/null +++ b/osrs/src/main/java/class89.java @@ -0,0 +1,120 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dm") +public enum class89 implements class383 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Ldm;" + ) + field889(0, -1), + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Ldm;" + ) + field886(1, 1), + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ldm;" + ) + field888(2, 7), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ldm;" + ) + field887(3, 8), + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Ldm;" + ) + field885(4, 9); + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Ltt;" + ) + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("au") + final int field891; + @ObfuscatedName("aa") + final int field890; + + class89(int var3, int var4) { + this.field891 = var3; + this.field890 = var4; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-11" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field890; + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lcr;Lcr;IZI)I", + garbageValue = "-1326256206" + ) + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { + int var4 = var0.population; + int var5 = var1.population; + if (!var3) { + if (var4 == -1) { + var4 = 2001; + } + + if (var5 == -1) { + var5 = 2001; + } + } + + return var4 - var5; + } else if (var2 == 2) { + return var0.location - var1.location; + } else if (var2 == 3) { + if (var0.activity.equals("-")) { + if (var1.activity.equals("-")) { + return 0; + } else { + return var3 ? -1 : 1; + } + } else if (var1.activity.equals("-")) { + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); + } + } else if (var2 == 4) { + return var0.method401() ? (var1.method401() ? 0 : 1) : (var1.method401() ? -1 : 0); + } else if (var2 == 5) { + return var0.method399() ? (var1.method399() ? 0 : 1) : (var1.method399() ? -1 : 0); + } else if (var2 == 6) { + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; + } + } + + @ObfuscatedName("nt") + @ObfuscatedSignature( + descriptor = "(Lnn;B)Ljava/lang/String;", + garbageValue = "-100" + ) + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (WorldMapData_0.Widget_unpackTargetMask(class361.getWidgetFlags(var0)) == 0) { + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class9.java b/osrs/src/main/java/class9.java index 76e185708..b9c61ce69 100644 --- a/osrs/src/main/java/class9.java +++ b/osrs/src/main/java/class9.java @@ -1,97 +1,444 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("av") -public class class9 implements class386 { - @ObfuscatedName("ac") +@ObfuscatedName("az") +public class class9 implements class383 { + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Laz;" ) - public static final class9 field14; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lav;" - ) - public static final class9 field15; - @ObfuscatedName("ak") + public static final class9 field22; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Laz;" ) - static final class9 field17; - @ObfuscatedName("ax") + public static final class9 field21; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Laz;" ) - static final class9 field19; + static final class9 field25; @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Laz;" ) - static final class9 field18; - @ObfuscatedName("qo") + static final class9 field24; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Lnm;" + descriptor = "Laz;" ) - static Widget[] field16; - @ObfuscatedName("ah") - int field22; - @ObfuscatedName("ar") - String field23; - @ObfuscatedName("ab") - boolean field20; - @ObfuscatedName("am") - boolean field21; + static final class9 field23; + @ObfuscatedName("au") + int field28; + @ObfuscatedName("aa") + String field29; + @ObfuscatedName("ac") + boolean field26; + @ObfuscatedName("al") + boolean field27; static { - field14 = new class9(0, "POST", true, true); - field15 = new class9(1, "GET", true, false); - field17 = new class9(2, "PUT", false, true); - field19 = new class9(3, "PATCH", false, true); - field18 = new class9(4, "DELETE", false, true); + field22 = new class9(0, "POST", true, true); + field21 = new class9(1, "GET", true, false); + field25 = new class9(2, "PUT", false, true); + field24 = new class9(3, "PATCH", false, true); + field23 = new class9(4, "DELETE", false, true); } class9(int var1, String var2, boolean var3, boolean var4) { - this.field22 = var1; - this.field23 = var2; - this.field20 = var3; - this.field21 = var4; + this.field28 = var1; + this.field29 = var2; + this.field26 = var3; + this.field27 = var4; } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" + descriptor = "(B)Z", + garbageValue = "-82" + ) + boolean method23() { + return this.field26; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-11" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field22; + return this.field28; } @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "62" + ) + public String method24() { + return this.field29; + } + + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1688270936" + garbageValue = "1331729662" ) - boolean method26() { - return this.field20; + boolean method25() { + return this.field27; } @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1083861304" + descriptor = "(Luo;IB)V", + garbageValue = "10" + ) + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; + if (var2) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); + Player var4 = Client.players[var1]; + if (var3 == 0) { + if (var2) { + var4.hasMovementPending = false; + } else if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (class101.baseY + var4.pathY[0] >> 13) + (NewShit.baseX + var4.pathX[0] >> 13 << 14); + if (var4.movingOrientation != -1) { + Players.Players_orientations[var1] = var4.movingOrientation; + } else { + Players.Players_orientations[var1] = var4.orientation; + } + + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { + Buddy.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { + var5 = var0.readBits(3); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + --var6; + --var7; + } else if (var5 == 1) { + --var7; + } else if (var5 == 2) { + ++var6; + --var7; + } else if (var5 == 3) { + --var6; + } else if (var5 == 4) { + ++var6; + } else if (var5 == 5) { + --var6; + ++var7; + } else if (var5 == 6) { + ++var7; + } else if (var5 == 7) { + ++var6; + ++var7; + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.hasMovementPending = false; + } else if (var2) { + var4.hasMovementPending = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.hasMovementPending = false; + var4.move(var6, var7, Players.playerMovementSpeeds[var1]); + } + + } else if (var3 == 2) { + var5 = var0.readBits(4); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + var6 -= 2; + var7 -= 2; + } else if (var5 == 1) { + --var6; + var7 -= 2; + } else if (var5 == 2) { + var7 -= 2; + } else if (var5 == 3) { + ++var6; + var7 -= 2; + } else if (var5 == 4) { + var6 += 2; + var7 -= 2; + } else if (var5 == 5) { + var6 -= 2; + --var7; + } else if (var5 == 6) { + var6 += 2; + --var7; + } else if (var5 == 7) { + var6 -= 2; + } else if (var5 == 8) { + var6 += 2; + } else if (var5 == 9) { + var6 -= 2; + ++var7; + } else if (var5 == 10) { + var6 += 2; + ++var7; + } else if (var5 == 11) { + var6 -= 2; + var7 += 2; + } else if (var5 == 12) { + --var6; + var7 += 2; + } else if (var5 == 13) { + var7 += 2; + } else if (var5 == 14) { + ++var6; + var7 += 2; + } else if (var5 == 15) { + var6 += 2; + var7 += 2; + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.hasMovementPending = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.hasMovementPending = false; + var4.move(var6, var7, Players.playerMovementSpeeds[var1]); + } + } else { + var4.resetPath(var6, var7); + var4.hasMovementPending = false; + } + + } else { + var5 = var0.readBits(1); + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { + var6 = var0.readBits(12); + var7 = var6 >> 10; + var8 = var6 >> 5 & 31; + if (var8 > 15) { + var8 -= 32; + } + + var9 = var6 & 31; + if (var9 > 15) { + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; + var11 = var9 + var4.pathY[0]; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.hasMovementPending = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.hasMovementPending = false; + var4.move(var10, var11, Players.playerMovementSpeeds[var1]); + } + } else { + var4.resetPath(var10, var11); + var4.hasMovementPending = false; + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + ItemLayer.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (var8 + NewShit.baseX + var4.pathX[0] & 16383) - NewShit.baseX; + var11 = (var9 + class101.baseY + var4.pathY[0] & 16383) - class101.baseY; + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var10, var11); + var4.hasMovementPending = false; + } else if (var2) { + var4.hasMovementPending = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.hasMovementPending = false; + var4.move(var10, var11, Players.playerMovementSpeeds[var1]); + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + ItemLayer.Client_plane = var4.plane; + } + + } + } + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;I)[F", + garbageValue = "-257144128" ) - public String method27() { - return this.field23; + static float[] method27(JSONObject var0, String var1) throws JSONException { + float[] var2 = new float[4]; + + try { + JSONArray var3 = var0.getJSONArray(var1); + var2[0] = (float)var3.optDouble(0, 0.0D); + var2[1] = (float)var3.optDouble(1, 0.0D); + var2[2] = (float)var3.optDouble(2, 1.0D); + var2[3] = (float)var3.optDouble(3, 1.0D); + } catch (JSONException var4) { + var2[0] = 0.0F; + var2[1] = 0.0F; + var2[2] = 1.0F; + var2[3] = 1.0F; + } + + return var2; } - @ObfuscatedName("am") + @ObfuscatedName("hd") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2015680525" + descriptor = "(I)V", + garbageValue = "77503344" + ) + static final void method29() { + if (Client.logoutTimer > 0) { + class13.method51(); + } else { + Client.timer.method2171(); + WorldMapSection2.updateGameState(40); + class4.field4 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); + } + } + + @ObfuscatedName("ie") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "416478591" ) - boolean method28() { - return this.field21; + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { + WorldMapIcon_1.clientPreferences.setRoofsHidden(!WorldMapIcon_1.clientPreferences.getRoofsHidden()); + if (WorldMapIcon_1.clientPreferences.getRoofsHidden()) { + GrandExchangeOfferUnitPriceComparator.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + GrandExchangeOfferUnitPriceComparator.addGameMessage(99, "", "Roofs will only be removed selectively"); + } + } + + if (var0.startsWith("zbuf")) { + boolean var1 = Huffman.method1888(var0.substring(5).trim()) == 1; + SpriteMask.client.method161(var1); + Rasterizer3D.method1413(var1); + } + + if (var0.equalsIgnoreCase("z")) { + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("displayfps")) { + WorldMapIcon_1.clientPreferences.method546(); + } + + if (var0.equalsIgnoreCase("renderself")) { + Client.field387 = !Client.field387; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { + if (var0.equalsIgnoreCase("errortest")) { + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { + NewShit.worldMap.showCoord = !NewShit.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { + WorldMapIcon_1.clientPreferences.method545(true); + } + + if (var0.equalsIgnoreCase("fpsoff")) { + WorldMapIcon_1.clientPreferences.method545(false); + } + + if (var0.equalsIgnoreCase("gc")) { + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { + method29(); + } + } + + PacketBufferNode var2 = class113.getPacketBufferNode(ClientPacket.DOCHEAT, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(var0.length() + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var2); + } + + @ObfuscatedName("ip") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1070211689" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field613 = 0L; + if (var0 >= 2) { + Client.isResizable = true; + } else { + Client.isResizable = false; + } + + if (ApproximateRouteStrategy.getWindowedMode() == 1) { + SpriteMask.client.setMaxCanvasSize(765, 503); + } else { + SpriteMask.client.setMaxCanvasSize(7680, 2160); + } + + if (Client.gameState >= 25 && Client.packetWriter != null && Client.packetWriter.isaacCipher != null) { + PacketBufferNode var1 = class113.getPacketBufferNode(ClientPacket.EVENT_MOUSE_IDLE, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(ApproximateRouteStrategy.getWindowedMode()); + var1.packetBuffer.writeShort(Language.canvasWidth); + var1.packetBuffer.writeShort(class47.canvasHeight); + Client.packetWriter.addNode(var1); + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class90.java b/osrs/src/main/java/class90.java new file mode 100644 index 000000000..6d5fc7a4e --- /dev/null +++ b/osrs/src/main/java/class90.java @@ -0,0 +1,545 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dr") +public enum class90 implements class383 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field898(0, -1), + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field895(1, 2), + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field897(2, 3), + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field896(3, 4), + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field894(4, 5), + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field899(5, 6); + + @ObfuscatedName("av") + public static short[][] field892; + @ObfuscatedName("ae") + static String field893; + @ObfuscatedName("aa") + final int field900; + @ObfuscatedName("ac") + final int field901; + + class90(int var3, int var4) { + this.field900 = var3; + this.field901 = var4; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-11" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field901; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "-9" + ) + static boolean method473(int var0, int var1) { + return var0 != 4 || var1 < 8; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(CLof;B)I", + garbageValue = "53" + ) + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { + var0 = Character.toLowerCase(var0); + var2 = (var0 << 4) + 1; + } + + if (var0 == 241 && var1 == Language.Language_ES) { + var2 = 1762; + } + + return var2; + } + + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "892396745" + ) + static final void method476() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.endCycle == -1) { + var0.startCycle = 0; + ScriptFrame.method344(var0); + } else { + var0.remove(); + } + } + + } + + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(ZLuo;I)V", + garbageValue = "2029902605" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field489 = 0; + Client.field449 = 0; + class472.method2351(var1); + + int var3; + int var8; + int var9; + int var10; + int var12; + int var19; + while (true) { + byte var2 = 16; + var3 = 1 << var2; + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) < var2 + 12) { + break; + } + + int var4 = var1.readBits(var2); + if (var4 == var3 - 1) { + break; + } + + boolean var5 = false; + if (Client.npcs[var4] == null) { + Client.npcs[var4] = new NPC(); + var5 = true; + } + + NPC var20 = Client.npcs[var4]; + Client.npcIndices[++Client.npcCount - 1] = var4; + var20.npcCycle = Client.cycle; + var19 = var1.readBits(1); + var10 = Client.field563[var1.readBits(3)]; + if (var5) { + var20.orientation = var20.rotation = var10; + } + + if (var0) { + var8 = var1.readBits(8); + if (var8 > 127) { + var8 -= 256; + } + } else { + var8 = var1.readBits(5); + if (var8 > 15) { + var8 -= 32; + } + } + + boolean var11 = var1.readBits(1) == 1; + if (var11) { + var1.readBits(32); + } + + var12 = var1.readBits(1); + if (var12 == 1) { + Client.field550[++Client.field449 - 1] = var4; + } + + if (var0) { + var9 = var1.readBits(8); + if (var9 > 127) { + var9 -= 256; + } + } else { + var9 = var1.readBits(5); + if (var9 > 15) { + var9 -= 32; + } + } + + var20.definition = VerticalAlignment.getNpcDefinition(var1.readBits(14)); + class33.method144(var20); + if (var20.field1018 == 0) { + var20.rotation = 0; + } + + var20.method581(class229.localPlayer.pathX[0] + var8, class229.localPlayer.pathY[0] + var9, var19 == 1); + } + + var1.exportIndex(); + + int var21; + for (var21 = 0; var21 < Client.field449; ++var21) { + var3 = Client.field550[var21]; + NPC var14 = Client.npcs[var3]; + int var22 = var1.readUnsignedByte(); + int var6; + if ((var22 & 16) != 0) { + var6 = var1.readUnsignedByte(); + var22 += var6 << 8; + } + + if ((var22 & 256) != 0) { + var6 = var1.readUnsignedByte(); + var22 += var6 << 16; + } + + int[] var7; + short[] var15; + short[] var16; + long var17; + int var23; + boolean var24; + if ((var22 & 4096) != 0) { + var6 = var1.readUnsignedShortAdd(); + if ((var6 & 1) == 1) { + var14.method593(); + } else { + var7 = null; + if ((var6 & 2) == 2) { + var8 = var1.readUnsignedByteSub(); + var7 = new int[var8]; + + for (var9 = 0; var9 < var8; ++var9) { + var10 = var1.readUnsignedShortLE(); + var10 = var10 == 65535 ? -1 : var10; + var7[var9] = var10; + } + } + + var15 = null; + if ((var6 & 4) == 4) { + var9 = 0; + if (var14.definition.recolorTo != null) { + var9 = var14.definition.recolorTo.length; + } + + var15 = new short[var9]; + + for (var10 = 0; var10 < var9; ++var10) { + var15[var10] = (short)var1.readUnsignedShortLE(); + } + } + + var16 = null; + if ((var6 & 8) == 8) { + var10 = 0; + if (var14.definition.retextureTo != null) { + var10 = var14.definition.retextureTo.length; + } + + var16 = new short[var10]; + + for (var23 = 0; var23 < var10; ++var23) { + var16[var23] = (short)var1.readUnsignedIntIME(); + } + } + + var24 = false; + if ((var6 & 16) != 0) { + var24 = var1.readUnsignedShortAdd() == 1; + } + + var17 = (long)(++NPC.field1080 - 1); + var14.method591(new NewShit(var17, var7, var15, var16, var24)); + } + } + + if ((var22 & 65536) != 0) { + var6 = var1.readUnsignedByte(); + var7 = new int[8]; + var15 = new short[8]; + + for (var9 = 0; var9 < 8; ++var9) { + if ((var6 & 1 << var9) != 0) { + var7[var9] = var1.readNullableLargeSmart(); + var15[var9] = (short)var1.readShortSmartSub(); + } else { + var7[var9] = -1; + var15[var9] = -1; + } + } + + var14.method587(var7, var15); + } + + if ((var22 & 262144) != 0) { + var6 = var1.readUnsignedIntME(); + var14.turnLeftSequence = (var6 & 1) != 0 ? var1.readUnsignedShort() : var14.definition.turnLeftSequence * 2124045029 * 1875038957; + var14.turnRightSequence = (var6 & 2) != 0 ? var1.readUnsignedIntIME() : var14.definition.turnRightSequence * 1814511787 * -810894845; + var14.walkSequence = (var6 & 4) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.walkSequence * -980344253 * 380025451; + var14.walkBackSequence = (var6 & 8) != 0 ? var1.readUnsignedIntIME() : var14.definition.walkBackSequence * -347828473 * -666784073; + var14.walkLeftSequence = (var6 & 16) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.walkLeftSequence * -914310317 * -1721155365; + var14.walkRightSequence = (var6 & 32) != 0 ? var1.readUnsignedIntIME() : var14.definition.walkRightSequence * 1760273377 * 832299041; + var14.runSequence = (var6 & 64) != 0 ? var1.readUnsignedShortLE() : var14.definition.runSequence * -1490443197 * 795658347; + var14.runBackSequence = (var6 & 128) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.runBackSequence * -217719435 * 1622952669; + var14.runLeftSequence = (var6 & 256) != 0 ? var1.readUnsignedIntIME() : var14.definition.runLeftSequence * -556683877 * 168358035; + var14.runRightSequence = (var6 & 512) != 0 ? var1.readUnsignedShort() : var14.definition.runRightSequence * -732977015 * 1800293817; + var14.crawlSequence = (var6 & 1024) != 0 ? var1.readUnsignedIntIME() : var14.definition.crawlSequence * -400554641 * 2053962127; + var14.crawlBackSequence = (var6 & 2048) != 0 ? var1.readUnsignedShort() : var14.definition.crawlBackSequence * -418592841 * -280377849; + var14.crawlLeftSequence = (var6 & 4096) != 0 ? var1.readUnsignedIntIME() : var14.definition.crawlLeftSequence * 1849100485 * -2053163507; + var14.crawlRightSequence = (var6 & 8192) != 0 ? var1.readUnsignedIntIME() : var14.definition.crawlRightSequence * 1731690515 * 694176283; + var14.idleSequence = (var6 & 16384) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.idleSequence * 929101693 * 70810069; + } + + if ((var22 & 1) != 0) { + var6 = var1.readUnsignedShortLE(); + if (var6 == 65535) { + var6 = -1; + } + + var19 = var1.readUnsignedByte(); + if (var6 == var14.sequence && var6 != -1) { + var8 = DynamicObject.SequenceDefinition_get(var6).replyMode; + if (var8 == 1) { + var14.sequenceFrame = 0; + var14.sequenceFrameCycle = 0; + var14.sequenceDelay = var19; + var14.currentSequenceFrameIndex = 0; + } + + if (var8 == 2) { + var14.currentSequenceFrameIndex = 0; + } + } else if (var6 == -1 || var14.sequence == -1 || DynamicObject.SequenceDefinition_get(var6).forcedPriority >= DynamicObject.SequenceDefinition_get(var14.sequence).forcedPriority) { + var14.sequence = var6; + var14.sequenceFrame = 0; + var14.sequenceFrameCycle = 0; + var14.sequenceDelay = var19; + var14.currentSequenceFrameIndex = 0; + var14.field1029 = var14.pathLength; + } + } + + if ((var22 & 1024) != 0) { + var14.field1013 = var1.readByteAdd(); + var14.field1012 = var1.readByteNeg(); + var14.field1024 = var1.readByteAdd(); + var14.field1010 = var1.readByteNeg(); + var14.spotAnimation = var1.readUnsignedShortAddLE() + Client.cycle; + var14.exactMoveArrive1Cycle = var1.readUnsignedShortAddLE() + Client.cycle; + var14.exactMoveDirection = var1.readUnsignedShortAddLE(); + var14.pathLength = 1; + var14.field1029 = 0; + var14.field1013 += var14.pathX[0]; + var14.field1012 += var14.pathY[0]; + var14.field1024 += var14.pathX[0]; + var14.field1010 += var14.pathY[0]; + } + + if ((var22 & 8192) != 0) { + var14.combatLevelChange = var1.readIntIME(); + } + + if ((var22 & 32) != 0) { + var6 = var1.readUnsignedShort(); + var19 = var1.readUnsignedShortLE(); + var14.field969 = var1.readUnsignedByteSub() == 1; + if (Client.param25 >= 212) { + var14.field995 = var6; + var14.field997 = var19; + } else { + var8 = var14.x - (var6 - NewShit.baseX - NewShit.baseX) * 64; + var9 = var14.y - (var19 - class101.baseY - class101.baseY) * 64; + if (var8 != 0 || var9 != 0) { + var14.movingOrientation = SequenceDefinition.method1040(var8, var9); + } + } + } + + if ((var22 & 128) != 0) { + var14.targetIndex = var1.readUnsignedShort(); + var14.targetIndex += var1.readUnsignedByteSub() << 16; + var6 = 16777215; + if (var6 == var14.targetIndex) { + var14.targetIndex = -1; + } + } + + if ((var22 & 2) != 0) { + var6 = var1.readUnsignedShortAdd(); + if (var6 > 0) { + for (var19 = 0; var19 < var6; ++var19) { + var9 = -1; + var10 = -1; + var23 = -1; + var8 = var1.readUShortSmart(); + if (var8 == 32767) { + var8 = var1.readUShortSmart(); + var10 = var1.readUShortSmart(); + var9 = var1.readUShortSmart(); + var23 = var1.readUShortSmart(); + } else if (var8 != 32766) { + var10 = var1.readUShortSmart(); + } else { + var8 = -1; + } + + var12 = var1.readUShortSmart(); + var14.addHitSplat(var8, var10, var9, var23, Client.cycle, var12); + } + } + + var19 = var1.readUnsignedByteNeg(); + if (var19 > 0) { + for (var8 = 0; var8 < var19; ++var8) { + var9 = var1.readUShortSmart(); + var10 = var1.readUShortSmart(); + if (var10 != 32767) { + var23 = var1.readUShortSmart(); + var12 = var1.readUnsignedByte(); + int var13 = var10 > 0 ? var1.readUnsignedByte() : var12; + var14.addHealthBar(var9, Client.cycle, var10, var23, var12, var13); + } else { + var14.removeHealthBar(var9); + } + } + } + } + + if ((var22 & 16384) != 0) { + var14.method575(var1.readStringCp1252NullTerminated()); + } + + if ((var22 & 32768) != 0) { + var14.method576(var1.readUnsignedByteSub()); + } + + if ((var22 & 131072) != 0) { + var6 = var1.readUnsignedByte(); + + for (var19 = 0; var19 < var6; ++var19) { + var8 = var1.readUnsignedByte(); + var9 = var1.readUnsignedShort(); + var10 = var1.readIntIME(); + var14.updateSpotAnimation(var8, var9, var10 >> 16, var10 & 65535); + } + } + + if ((var22 & 2048) != 0) { + var14.recolourStartCycle = Client.cycle + var1.readUnsignedShortLE(); + var14.recolourEndCycle = Client.cycle + var1.readUnsignedShortAddLE(); + var14.recolourHue = var1.readByteAdd(); + var14.recolourSaturation = var1.readByteNeg(); + var14.recolourLuminance = var1.readByteAdd(); + var14.recolourAmount = (byte)var1.readUnsignedByteNeg(); + } + + if ((var22 & 512) != 0) { + var6 = var1.readUnsignedByteSub(); + if ((var6 & 1) == 1) { + var14.method592(); + } else { + var7 = null; + if ((var6 & 2) == 2) { + var8 = var1.readUnsignedByteSub(); + var7 = new int[var8]; + + for (var9 = 0; var9 < var8; ++var9) { + var10 = var1.readUnsignedShort(); + var10 = var10 == 65535 ? -1 : var10; + var7[var9] = var10; + } + } + + var15 = null; + if ((var6 & 4) == 4) { + var9 = 0; + if (var14.definition.recolorTo != null) { + var9 = var14.definition.recolorTo.length; + } + + var15 = new short[var9]; + + for (var10 = 0; var10 < var9; ++var10) { + var15[var10] = (short)var1.readUnsignedShort(); + } + } + + var16 = null; + if ((var6 & 8) == 8) { + var10 = 0; + if (var14.definition.retextureTo != null) { + var10 = var14.definition.retextureTo.length; + } + + var16 = new short[var10]; + + for (var23 = 0; var23 < var10; ++var23) { + var16[var23] = (short)var1.readUnsignedIntIME(); + } + } + + var24 = false; + if ((var6 & 16) != 0) { + var24 = var1.readUnsignedShortAdd() == 1; + } + + var17 = (long)(++NPC.field1081 - 1); + var14.method589(new NewShit(var17, var7, var15, var16, var24)); + } + } + + if ((var22 & 8) != 0) { + var14.definition = VerticalAlignment.getNpcDefinition(var1.readUnsignedShortLE()); + class33.method144(var14); + var14.method588(); + } + + if ((var22 & 4) != 0) { + var14.overheadText = var1.readStringCp1252NullTerminated(); + var14.overheadTextCyclesRemaining = 100; + } + + if ((var22 & 64) != 0) { + var1.readUnsignedIntIME(); + var1.readUnsignedIntME(); + } + } + + for (var21 = 0; var21 < Client.field489; ++var21) { + var3 = Client.field559[var21]; + if (Client.npcs[var3].npcCycle != Client.cycle) { + Client.npcs[var3].definition = null; + Client.npcs[var3] = null; + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var21 = 0; var21 < Client.npcCount; ++var21) { + if (Client.npcs[Client.npcIndices[var21]] == null) { + throw new RuntimeException(var21 + "," + Client.npcCount); + } + } + + } + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class91.java b/osrs/src/main/java/class91.java deleted file mode 100644 index 562846a0a..000000000 --- a/osrs/src/main/java/class91.java +++ /dev/null @@ -1,124 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("do") -public enum class91 implements class386 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - field881(0, -1), - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - field883(1, 1), - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - field882(2, 7), - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - field885(3, 8), - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - field884(4, 9); - - @ObfuscatedName("wx") - @ObfuscatedSignature( - descriptor = "Ldy;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Leq;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("ah") - final int field886; - @ObfuscatedName("ar") - final int field887; - - class91(int var3, int var4) { - this.field886 = var3; - this.field887 = var4; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field887; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)Liz;", - garbageValue = "1356482974" - ) - @Export("getObjectDefinition") - public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "48" - ) - static void method482(int var0, int var1, int var2) { - if (var0 != 0) { - int var3 = var0 >> 8; - int var4 = var0 >> 4 & 7; - int var5 = var0 & 15; - Client.soundEffectIds[Client.soundEffectCount] = var3; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; - Client.soundEffects[Client.soundEffectCount] = null; - int var6 = (var1 - 64) / 128; - int var7 = (var2 - 64) / 128; - Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); - ++Client.soundEffectCount; - } - } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "74" - ) - static void method483() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class92.java b/osrs/src/main/java/class92.java index f04dc2df2..55b4d1caa 100644 --- a/osrs/src/main/java/class92.java +++ b/osrs/src/main/java/class92.java @@ -1,115 +1,156 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dh") -public enum class92 implements class386 { +@ObfuscatedName("da") +public class class92 { + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class92 field942; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class92 field935; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class92 field940; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class92 field938; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class92 field933; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class92 field943; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class92 field932; @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lda;" ) - field889(0, -1), + static final class92 field934; @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lda;" ) - field892(1, 2), - @ObfuscatedName("ak") + static final class92 field937; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class92 field947; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class92 field939; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lda;" ) - field891(2, 3), + static final class92 field944; @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lda;" ) - field894(3, 4), - @ObfuscatedName("ao") + static final class92 field945; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lda;" ) - field893(4, 5), - @ObfuscatedName("ah") + static final class92 field941; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lda;" ) - field890(5, 6); - - @ObfuscatedName("fy") + static final class92 field946; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Lda;" ) - static Archive field888; - @ObfuscatedName("ar") - final int field896; - @ObfuscatedName("ab") - final int field895; + static final class92 field936; - class92(int var3, int var4) { - this.field896 = var3; - this.field895 = var4; + static { + field942 = new class92(); + field935 = new class92(); + field940 = new class92(); + field938 = new class92(); + field933 = new class92(); + field943 = new class92(); + field932 = new class92(); + field934 = new class92(); + field937 = new class92(); + field947 = new class92(); + field939 = new class92(); + field944 = new class92(); + field945 = new class92(); + field941 = new class92(); + field946 = new class92(); + field936 = new class92(); } - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1243971674" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field895; + class92() { } - @ObfuscatedName("ao") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "-128" + descriptor = "(II)Lgh;", + garbageValue = "-1228219586" ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - - for (int var5 = 0; var5 < var2; ++var5) { - int var6 = var0[var5 + var1] & 255; - if (var6 != 0) { - if (var6 >= 128 && var6 < 160) { - char var7 = class399.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; - } - - var6 = var7; - } - - var3[var4++] = (char)var6; + public static HealthBarDefinition method497(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); + var1 = new HealthBarDefinition(); + var1.field1494 = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); } - } - return new String(var3, 0, var4); + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("ay") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(CII)Ljava/lang/String;", - garbageValue = "1422226008" + descriptor = "(II)I", + garbageValue = "1040473159" ) - public static String method486(char var0, int var1) { - char[] var2 = new char[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var2[var3] = var0; + static int method498(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; + } else { + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; } - - return new String(var2); } - @ObfuscatedName("om") + @ObfuscatedName("jv") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-82" + descriptor = "(B)V", + garbageValue = "124" ) - public static boolean method487() { - return Client.staffModLevel >= 2; + static void method499() { + if (class229.localPlayer.x >> 7 == Client.destinationX && class229.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; + } + } } \ No newline at end of file diff --git a/osrs/src/main/java/class93.java b/osrs/src/main/java/class93.java new file mode 100644 index 000000000..4b99d87f4 --- /dev/null +++ b/osrs/src/main/java/class93.java @@ -0,0 +1,130 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dw") +public class class93 { + @ObfuscatedName("ac") + static byte[][][] field948; + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "60" + ) + public static int method501() { + return ViewportMouse.ViewportMouse_entityCount; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "1385698501" + ) + public static int method500(int var0, int var1, int var2) { + int var3 = class214.method1092(var2 - var1 + 1); + var3 <<= var1; + return var0 & ~var3; + } + + @ObfuscatedName("md") + @ObfuscatedSignature( + descriptor = "(Lnn;I)V", + garbageValue = "-296278834" + ) + static final void method502(Widget var0) { + String var1; + int var2; + int var3; + if (var0.buttonType == 1) { + var1 = var0.buttonText; + var2 = var0.id; + var3 = var0.itemId; + GrandExchangeOfferTotalQuantityComparator.insertMenuItem(var1, "", 24, 0, 0, var2, var3, false); + } + + if (var0.buttonType == 2 && !Client.isSpellSelected) { + var1 = class89.Widget_getSpellActionName(var0); + if (var1 != null) { + KeyHandler.method106(var1, class167.colorStartTag(65280) + var0.field3122, 25, 0, -1, var0.id, var0.itemId); + } + } + + if (var0.buttonType == 3) { + WorldMapSectionType.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); + } + + if (var0.buttonType == 4) { + WorldMapSectionType.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + } + + if (var0.buttonType == 5) { + WorldMapSectionType.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { + WorldMapSectionType.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + } + + if (var0.isIf3) { + int var5; + String var9; + if (Client.isSpellSelected) { + var2 = class361.getWidgetFlags(var0); + boolean var8 = (var2 >> 21 & 1) != 0; + if (var8 && (UrlRequest.field1182 & 32) == 32) { + var9 = Client.field599; + String var4 = Client.field598 + " " + "->" + " " + var0.dataText; + var5 = var0.childIndex; + int var6 = var0.id; + int var7 = var0.itemId; + GrandExchangeOfferTotalQuantityComparator.insertMenuItem(var9, var4, 58, 0, var5, var6, var7, false); + } + } else { + String var10; + for (int var13 = 9; var13 >= 5; --var13) { + if (!GraphicsObject.method428(class361.getWidgetFlags(var0), var13) && var0.onOp == null) { + var10 = null; + } else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { + var10 = var0.actions[var13]; + } else { + var10 = null; + } + + if (var10 != null) { + KeyHandler.method106(var10, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id, var0.itemId); + } + } + + var1 = class89.Widget_getSpellActionName(var0); + if (var1 != null) { + var10 = var0.dataText; + var3 = var0.childIndex; + int var11 = var0.id; + var5 = var0.itemId; + GrandExchangeOfferTotalQuantityComparator.insertMenuItem(var1, var10, 25, 0, var3, var11, var5, false); + } + + for (var2 = 4; var2 >= 0; --var2) { + if (!GraphicsObject.method428(class361.getWidgetFlags(var0), var2) && var0.onOp == null) { + var9 = null; + } else if (var0.actions != null && var0.actions.length > var2 && var0.actions[var2] != null && var0.actions[var2].trim().length() != 0) { + var9 = var0.actions[var2]; + } else { + var9 = null; + } + + if (var9 != null) { + GrandExchangeOfferTotalQuantityComparator.insertMenuItem(var9, var0.dataText, 57, var2 + 1, var0.childIndex, var0.id, var0.itemId, var0.prioritizeMenuEntry); + } + } + + var3 = class361.getWidgetFlags(var0); + boolean var12 = (var3 & 1) != 0; + if (var12) { + WorldMapSectionType.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + } + } + } + + } +} \ No newline at end of file diff --git a/osrs/src/main/java/class94.java b/osrs/src/main/java/class94.java deleted file mode 100644 index 5902fb088..000000000 --- a/osrs/src/main/java/class94.java +++ /dev/null @@ -1,112 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("du") -public class class94 { - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field929; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field934; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field933; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field941; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field936; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field931; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field938; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field928; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field935; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field940; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field930; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field927; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field937; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field942; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field939; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - static final class94 field932; - @ObfuscatedName("ju") - @Export("timeOfPreviousKeyPress") - static int timeOfPreviousKeyPress; - - static { - field929 = new class94(); - field934 = new class94(); - field933 = new class94(); - field941 = new class94(); - field936 = new class94(); - field931 = new class94(); - field938 = new class94(); - field928 = new class94(); - field935 = new class94(); - field940 = new class94(); - field930 = new class94(); - field927 = new class94(); - field937 = new class94(); - field942 = new class94(); - field939 = new class94(); - field932 = new class94(); - } - - class94() { - } -} \ No newline at end of file diff --git a/osrs/src/main/java/class95.java b/osrs/src/main/java/class95.java deleted file mode 100644 index 8c74a38ae..000000000 --- a/osrs/src/main/java/class95.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dr") -public class class95 { - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)[Ldo;", - garbageValue = "1031859933" - ) - static class91[] method505() { - return new class91[]{class91.field884, class91.field882, class91.field885, class91.field883, class91.field881}; - } -} \ No newline at end of file diff --git a/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java b/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java deleted file mode 100644 index cfcd68c01..000000000 --- a/osrs/src/main/java/net/runelite/rs/ObfuscatedClassMap.java +++ /dev/null @@ -1,561 +0,0 @@ -package net.runelite.rs; - -import java.util.HashMap; - -public class ObfuscatedClassMap extends HashMap { - public static ObfuscatedClassMap INSTANCE = new ObfuscatedClassMap(); - static { - INSTANCE.put("AABB", "jl"); - INSTANCE.put("AbstractArchive", "om"); - INSTANCE.put("AbstractByteArrayCopier", "nn"); - INSTANCE.put("AbstractFont", "pk"); - INSTANCE.put("AbstractRasterProvider", "ui"); - INSTANCE.put("AbstractSocket", "re"); - INSTANCE.put("AbstractSound", "cb"); - INSTANCE.put("AbstractUserComparator", "rv"); - INSTANCE.put("AbstractWorldMapData", "kv"); - INSTANCE.put("AbstractWorldMapIcon", "ll"); - INSTANCE.put("AccessFile", "to"); - INSTANCE.put("Actor", "di"); - INSTANCE.put("AddRequestTask", "pi"); - INSTANCE.put("Animation", "ji"); - INSTANCE.put("ApproximateRouteStrategy", "cs"); - INSTANCE.put("Archive", "ok"); - INSTANCE.put("ArchiveDisk", "rw"); - INSTANCE.put("ArchiveDiskAction", "oe"); - INSTANCE.put("ArchiveDiskActionHandler", "ob"); - INSTANCE.put("ArchiveLoader", "dn"); - INSTANCE.put("AttackOption", "em"); - INSTANCE.put("AudioFilter", "cq"); - INSTANCE.put("BoundaryObject", "kr"); - INSTANCE.put("Bounds", "rx"); - INSTANCE.put("Buddy", "ri"); - INSTANCE.put("BuddyRankComparator", "eu"); - INSTANCE.put("Buffer", "ul"); - INSTANCE.put("BufferedFile", "tl"); - INSTANCE.put("BufferedNetSocket", "rc"); - INSTANCE.put("BufferedSink", "net/runelite/rs"); - INSTANCE.put("BufferedSource", "rj"); - INSTANCE.put("ByteArrayPool", "qo"); - INSTANCE.put("BZip2Decompressor", "ur"); - INSTANCE.put("BZip2State", "uo"); - INSTANCE.put("Calendar", "na"); - INSTANCE.put("Canvas", "at"); - INSTANCE.put("ChatChannel", "dg"); - INSTANCE.put("ClanChannel", "gb"); - INSTANCE.put("ClanChannelMember", "fv"); - INSTANCE.put("ClanMate", "rm"); - INSTANCE.put("ClanSettings", "gi"); - INSTANCE.put("class0", "ac"); - INSTANCE.put("class1", "al"); - INSTANCE.put("class10", "ag"); - INSTANCE.put("class103", "da"); - INSTANCE.put("class104", "eo"); - INSTANCE.put("class107", "ec"); - INSTANCE.put("class108", "eg"); - INSTANCE.put("class11", "aa"); - INSTANCE.put("class110", "ex"); - INSTANCE.put("class115", "es"); - INSTANCE.put("class12", "ap"); - INSTANCE.put("class126", "ep"); - INSTANCE.put("class127", "ef"); - INSTANCE.put("class128", "ew"); - INSTANCE.put("class129", "ed"); - INSTANCE.put("class13", "ay"); - INSTANCE.put("class130", "fj"); - INSTANCE.put("class131", "fh"); - INSTANCE.put("class132", "fz"); - INSTANCE.put("class133", "fs"); - INSTANCE.put("class134", "fl"); - INSTANCE.put("class135", "fe"); - INSTANCE.put("class136", "fo"); - INSTANCE.put("class138", "fi"); - INSTANCE.put("class139", "fk"); - INSTANCE.put("class14", "as"); - INSTANCE.put("class140", "fy"); - INSTANCE.put("class141", "fn"); - INSTANCE.put("class142", "fb"); - INSTANCE.put("class143", "ft"); - INSTANCE.put("class144", "fa"); - INSTANCE.put("class145", "fg"); - INSTANCE.put("class146", "fm"); - INSTANCE.put("class148", "ff"); - INSTANCE.put("class149", "fw"); - INSTANCE.put("class15", "aj"); - INSTANCE.put("class150", "fc"); - INSTANCE.put("class151", "fr"); - INSTANCE.put("class152", "fq"); - INSTANCE.put("class153", "fp"); - INSTANCE.put("class154", "fu"); - INSTANCE.put("class155", "fx"); - INSTANCE.put("class157", "ge"); - INSTANCE.put("class158", "gj"); - INSTANCE.put("class159", "gl"); - INSTANCE.put("class16", "an"); - INSTANCE.put("class160", "gq"); - INSTANCE.put("class161", "gt"); - INSTANCE.put("class162", "gf"); - INSTANCE.put("class163", "gk"); - INSTANCE.put("class164", "gm"); - INSTANCE.put("class166", "gx"); - INSTANCE.put("class167", "gp"); - INSTANCE.put("class168", "gd"); - INSTANCE.put("class169", "gz"); - INSTANCE.put("class17", "au"); - INSTANCE.put("class171", "gn"); - INSTANCE.put("class172", "gr"); - INSTANCE.put("class174", "gs"); - INSTANCE.put("class176", "gc"); - INSTANCE.put("class178", "gh"); - INSTANCE.put("class179", "gg"); - INSTANCE.put("class18", "ai"); - INSTANCE.put("class180", "gu"); - INSTANCE.put("class183", "hf"); - INSTANCE.put("class186", "hl"); - INSTANCE.put("class188", "hd"); - INSTANCE.put("class189", "hs"); - INSTANCE.put("class19", "ae"); - INSTANCE.put("class190", "hk"); - INSTANCE.put("class191", "hn"); - INSTANCE.put("class193", "hh"); - INSTANCE.put("class198", "hc"); - INSTANCE.put("class199", "hv"); - INSTANCE.put("class2", "ak"); - INSTANCE.put("class20", "aw"); - INSTANCE.put("class201", "hq"); - INSTANCE.put("class202", "hx"); - INSTANCE.put("class206", "ho"); - INSTANCE.put("class208", "iv"); - INSTANCE.put("class209", "ik"); - INSTANCE.put("class212", "in"); - INSTANCE.put("class214", "im"); - INSTANCE.put("class216", "iu"); - INSTANCE.put("class223", "ij"); - INSTANCE.put("class224", "ib"); - INSTANCE.put("class225", "il"); - INSTANCE.put("class226", "it"); - INSTANCE.put("class228", "ic"); - INSTANCE.put("class230", "ig"); - INSTANCE.put("class232", "ia"); - INSTANCE.put("class233", "id"); - INSTANCE.put("class241", "jr"); - INSTANCE.put("class242", "jj"); - INSTANCE.put("class257", "jm"); - INSTANCE.put("class259", "jg"); - INSTANCE.put("class266", "ko"); - INSTANCE.put("class27", "bk"); - INSTANCE.put("class274", "ks"); - INSTANCE.put("class275", "kp"); - INSTANCE.put("class28", "by"); - INSTANCE.put("class284", "ku"); - INSTANCE.put("class285", "ki"); - INSTANCE.put("class286", "la"); - INSTANCE.put("class29", "bd"); - INSTANCE.put("class294", "lc"); - INSTANCE.put("class295", "lk"); - INSTANCE.put("class296", "lv"); - INSTANCE.put("class297", "lw"); - INSTANCE.put("class298", "lo"); - INSTANCE.put("class3", "ax"); - INSTANCE.put("class30", "be"); - INSTANCE.put("class304", "lp"); - INSTANCE.put("class305", "lt"); - INSTANCE.put("class306", "le"); - INSTANCE.put("class307", "lg"); - INSTANCE.put("class31", "bv"); - INSTANCE.put("class313", "ma"); - INSTANCE.put("class314", "mj"); - INSTANCE.put("class315", "mm"); - INSTANCE.put("class316", "mc"); - INSTANCE.put("class317", "mw"); - INSTANCE.put("class319", "mr"); - INSTANCE.put("class322", "mz"); - INSTANCE.put("class323", "mu"); - INSTANCE.put("class325", "mh"); - INSTANCE.put("class326", "ml"); - INSTANCE.put("class33", "bz"); - INSTANCE.put("class330", "me"); - INSTANCE.put("class332", "my"); - INSTANCE.put("class337", "mg"); - INSTANCE.put("class339", "nx"); - INSTANCE.put("class340", "nv"); - INSTANCE.put("class341", "nd"); - INSTANCE.put("class342", "no"); - INSTANCE.put("class344", "nz"); - INSTANCE.put("class345", "nb"); - INSTANCE.put("class347", "nc"); - INSTANCE.put("class349", "nk"); - INSTANCE.put("class353", "nw"); - INSTANCE.put("class354", "ny"); - INSTANCE.put("class357", "nj"); - INSTANCE.put("class358", "nr"); - INSTANCE.put("class359", "ne"); - INSTANCE.put("class36", "bp"); - INSTANCE.put("class360", "nq"); - INSTANCE.put("class363", "nf"); - INSTANCE.put("class364", "oh"); - INSTANCE.put("class365", "of"); - INSTANCE.put("class367", "os"); - INSTANCE.put("class372", "ou"); - INSTANCE.put("class379", "op"); - INSTANCE.put("class384", "ow"); - INSTANCE.put("class385", "oi"); - INSTANCE.put("class386", "on"); - INSTANCE.put("class387", "ot"); - INSTANCE.put("class398", "pw"); - INSTANCE.put("class399", "pv"); - INSTANCE.put("class4", "ao"); - INSTANCE.put("class400", "po"); - INSTANCE.put("class401", "pa"); - INSTANCE.put("class403", "px"); - INSTANCE.put("class405", "pd"); - INSTANCE.put("class406", "pm"); - INSTANCE.put("class407", "pn"); - INSTANCE.put("class409", "pp"); - INSTANCE.put("class410", "pb"); - INSTANCE.put("class411", "pe"); - INSTANCE.put("class413", "pr"); - INSTANCE.put("class416", "qi"); - INSTANCE.put("class418", "qw"); - INSTANCE.put("class423", "ql"); - INSTANCE.put("class424", "qn"); - INSTANCE.put("class425", "qj"); - INSTANCE.put("class427", "qt"); - INSTANCE.put("class429", "qr"); - INSTANCE.put("class430", "qh"); - INSTANCE.put("class432", "qy"); - INSTANCE.put("class433", "qf"); - INSTANCE.put("class434", "qv"); - INSTANCE.put("class435", "qa"); - INSTANCE.put("class436", "qs"); - INSTANCE.put("class437", "qp"); - INSTANCE.put("class438", "qe"); - INSTANCE.put("class439", "qd"); - INSTANCE.put("class46", "bg"); - INSTANCE.put("class462", "rf"); - INSTANCE.put("class463", "ro"); - INSTANCE.put("class464", "rd"); - INSTANCE.put("class465", "rb"); - INSTANCE.put("class466", "rz"); - INSTANCE.put("class467", "rg"); - INSTANCE.put("class468", "sz"); - INSTANCE.put("class469", "sr"); - INSTANCE.put("class47", "bj"); - INSTANCE.put("class470", "sm"); - INSTANCE.put("class471", "sw"); - INSTANCE.put("class472", "sl"); - INSTANCE.put("class473", "su"); - INSTANCE.put("class474", "sh"); - INSTANCE.put("class475", "st"); - INSTANCE.put("class476", "sd"); - INSTANCE.put("class477", "si"); - INSTANCE.put("class478", "sq"); - INSTANCE.put("class479", "sy"); - INSTANCE.put("class480", "sf"); - INSTANCE.put("class481", "sa"); - INSTANCE.put("class490", "sk"); - INSTANCE.put("class491", "so"); - INSTANCE.put("class492", "sc"); - INSTANCE.put("class493", "sp"); - INSTANCE.put("class494", "th"); - INSTANCE.put("class495", "ti"); - INSTANCE.put("class5", "ah"); - INSTANCE.put("class500", "tw"); - INSTANCE.put("class504", "ts"); - INSTANCE.put("class505", "ty"); - INSTANCE.put("class508", "tv"); - INSTANCE.put("class51", "bw"); - INSTANCE.put("class511", "tn"); - INSTANCE.put("class512", "tx"); - INSTANCE.put("class513", "td"); - INSTANCE.put("class514", "tg"); - INSTANCE.put("class515", "tk"); - INSTANCE.put("class516", "tq"); - INSTANCE.put("class517", "tr"); - INSTANCE.put("class518", "tz"); - INSTANCE.put("class519", "tj"); - INSTANCE.put("class521", "uq"); - INSTANCE.put("class523", "uu"); - INSTANCE.put("class525", "um"); - INSTANCE.put("class53", "cu"); - INSTANCE.put("class530", "up"); - INSTANCE.put("class533", "uk"); - INSTANCE.put("class534", "uh"); - INSTANCE.put("class537", "uv"); - INSTANCE.put("class538", "ut"); - INSTANCE.put("class544", "ue"); - INSTANCE.put("class547", "vz"); - INSTANCE.put("class553", "vj"); - INSTANCE.put("class59", "cy"); - INSTANCE.put("class6", "ar"); - INSTANCE.put("class60", "cz"); - INSTANCE.put("class64", "ck"); - INSTANCE.put("class7", "ab"); - INSTANCE.put("class73", "cd"); - INSTANCE.put("class74", "ct"); - INSTANCE.put("class76", "cl"); - INSTANCE.put("class8", "am"); - INSTANCE.put("class87", "df"); - INSTANCE.put("class9", "av"); - INSTANCE.put("class91", "do"); - INSTANCE.put("class92", "dh"); - INSTANCE.put("class94", "du"); - INSTANCE.put("class95", "dr"); - INSTANCE.put("Client", "client"); - INSTANCE.put("ClientPacket", "ln"); - INSTANCE.put("ClientPreferences", "dy"); - INSTANCE.put("Clips", "jb"); - INSTANCE.put("Clock", "hu"); - INSTANCE.put("CollisionMap", "ih"); - INSTANCE.put("com/jagex/oldscape/pub/OtlTokenRequester", "com/jagex/oldscape/pub/OtlTokenRequester"); - INSTANCE.put("com/jagex/oldscape/pub/RefreshAccessTokenRequester", "com/jagex/oldscape/pub/RefreshAccessTokenRequester"); - INSTANCE.put("com/jagex/oldscape/pub/RefreshAccessTokenResponse", "com/jagex/oldscape/pub/RefreshAccessTokenResponse"); - INSTANCE.put("ConcurrentMidiTask", "qz"); - INSTANCE.put("Coord", "mo"); - INSTANCE.put("DbRowType", "ug"); - INSTANCE.put("DbTableType", "uz"); - INSTANCE.put("Decimator", "cg"); - INSTANCE.put("DefaultsGroup", "rh"); - INSTANCE.put("DelayFadeTask", "qb"); - INSTANCE.put("DemotingHashTable", "ls"); - INSTANCE.put("DesktopPlatformInfoProvider", "sn"); - INSTANCE.put("DevicePcmPlayer", "af"); - INSTANCE.put("DevicePcmPlayerProvider", "az"); - INSTANCE.put("DirectByteArrayCopier", "nh"); - INSTANCE.put("DirectWrapper", "lz"); - INSTANCE.put("DualNode", "sb"); - INSTANCE.put("DualNodeDeque", "pl"); - INSTANCE.put("DynamicObject", "dx"); - INSTANCE.put("EnumComposition", "ht"); - INSTANCE.put("EvictingDualNodeHashTable", "lr"); - INSTANCE.put("FaceNormal", "jv"); - INSTANCE.put("FadeInTask", "qg"); - INSTANCE.put("FadeOutTask", "qk"); - INSTANCE.put("FileSystem", "ga"); - INSTANCE.put("FillMode", "uf"); - INSTANCE.put("FloorDecoration", "jd"); - INSTANCE.put("FloorOverlayDefinition", "io"); - INSTANCE.put("FloorUnderlayDefinition", "ie"); - INSTANCE.put("Font", "pu"); - INSTANCE.put("FontName", "tc"); - INSTANCE.put("Fonts", "tt"); - INSTANCE.put("Frames", "ja"); - INSTANCE.put("Friend", "rq"); - INSTANCE.put("FriendLoginUpdate", "rr"); - INSTANCE.put("FriendsChat", "rl"); - INSTANCE.put("FriendsList", "rt"); - INSTANCE.put("FriendSystem", "ci"); - INSTANCE.put("GameBuild", "ng"); - INSTANCE.put("GameEngine", "bb"); - INSTANCE.put("GameObject", "kl"); - INSTANCE.put("GrandExchangeEvent", "od"); - INSTANCE.put("GrandExchangeEvents", "ox"); - INSTANCE.put("GrandExchangeOffer", "og"); - INSTANCE.put("GrandExchangeOfferAgeComparator", "oy"); - INSTANCE.put("GrandExchangeOfferNameComparator", "oz"); - INSTANCE.put("GrandExchangeOfferOwnWorldComparator", "cm"); - INSTANCE.put("GrandExchangeOfferTotalQuantityComparator", "oc"); - INSTANCE.put("GrandExchangeOfferUnitPriceComparator", "oj"); - INSTANCE.put("GrandExchangeOfferWorldComparator", "ov"); - INSTANCE.put("GraphicsDefaults", "ru"); - INSTANCE.put("GraphicsObject", "ch"); - INSTANCE.put("GZipDecompressor", "vb"); - INSTANCE.put("HealthBar", "db"); - INSTANCE.put("HealthBarDefinition", "hj"); - INSTANCE.put("HealthBarUpdate", "dt"); - INSTANCE.put("HitSplatDefinition", "iw"); - INSTANCE.put("HorizontalAlignment", "hb"); - INSTANCE.put("Huffman", "ns"); - INSTANCE.put("Ignored", "ry"); - INSTANCE.put("IgnoreList", "qu"); - INSTANCE.put("IndexedSprite", "un"); - INSTANCE.put("Instrument", "cp"); - INSTANCE.put("IntegerNode", "ss"); - INSTANCE.put("InterfaceParent", "de"); - INSTANCE.put("Interpreter", "cx"); - INSTANCE.put("IntHashTable", "vr"); - INSTANCE.put("InvDefinition", "hm"); - INSTANCE.put("IsaacCipher", "vd"); - INSTANCE.put("ItemComposition", "iy"); - INSTANCE.put("ItemContainer", "dk"); - INSTANCE.put("ItemLayer", "jc"); - INSTANCE.put("IterableDualNodeQueue", "pt"); - INSTANCE.put("IterableDualNodeQueueIterator", "ps"); - INSTANCE.put("IterableNodeDeque", "py"); - INSTANCE.put("IterableNodeDequeDescendingIterator", "pj"); - INSTANCE.put("IterableNodeHashTable", "tp"); - INSTANCE.put("IterableNodeHashTableIterator", "tm"); - INSTANCE.put("JagexCache", "gv"); - INSTANCE.put("JagNetThread", "oo"); - INSTANCE.put("JSException", "pq"); - INSTANCE.put("KeyHandler", "ad"); - INSTANCE.put("KitDefinition", "hz"); - INSTANCE.put("Language", "oa"); - INSTANCE.put("Link", "sg"); - INSTANCE.put("LinkDeque", "ph"); - INSTANCE.put("Login", "ca"); - INSTANCE.put("LoginPacket", "mi"); - INSTANCE.put("LoginScreenAnimation", "dd"); - INSTANCE.put("LoginType", "te"); - INSTANCE.put("LongNode", "se"); - INSTANCE.put("MenuAction", "cf"); - INSTANCE.put("Message", "cr"); - INSTANCE.put("Messages", "er"); - INSTANCE.put("MidiFileReader", "mf"); - INSTANCE.put("MidiPcmStream", "mt"); - INSTANCE.put("MilliClock", "go"); - INSTANCE.put("Model", "jn"); - INSTANCE.put("ModelData", "jw"); - INSTANCE.put("ModelData0", "km"); - INSTANCE.put("ModeWhere", "or"); - INSTANCE.put("MouseHandler", "bo"); - INSTANCE.put("MouseRecorder", "dp"); - INSTANCE.put("MouseWheelHandler", "aq"); - INSTANCE.put("MoveSpeed", "ip"); - INSTANCE.put("MusicPatch", "mq"); - INSTANCE.put("MusicPatchNode", "ms"); - INSTANCE.put("MusicPatchNode2", "mx"); - INSTANCE.put("MusicPatchPcmStream", "mn"); - INSTANCE.put("MusicSong", "mv"); - INSTANCE.put("MusicTrack", "mk"); - INSTANCE.put("NanoClock", "gy"); - INSTANCE.put("NewShit", "he"); - INSTANCE.put("Node", "sj"); - INSTANCE.put("NodeDeque", "pf"); - INSTANCE.put("NodeHashTable", "tf"); - INSTANCE.put("NPC", "dc"); - INSTANCE.put("NPCComposition", "hw"); - INSTANCE.put("ObjectComposition", "iz"); - INSTANCE.put("ObjectNode", "sv"); - INSTANCE.put("ObjectSound", "cj"); - INSTANCE.put("ObjTypeCustomisation", "hy"); - INSTANCE.put("Occluder", "je"); - INSTANCE.put("org/json/JSONArray", "org/json/JSONArray"); - INSTANCE.put("org/json/JSONException", "org/json/JSONException"); - INSTANCE.put("org/json/JSONObject", "org/json/JSONObject"); - INSTANCE.put("org/json/JSONString", "org/json/JSONString"); - INSTANCE.put("org/json/JSONTokener", "org/json/JSONTokener"); - INSTANCE.put("org/json/Null", "org/json/JSONObject$Null"); - INSTANCE.put("OtlTokenResponse", "com/jagex/oldscape/pub/OtlTokenResponse"); - INSTANCE.put("PacketBuffer", "uy"); - INSTANCE.put("PacketBufferNode", "lx"); - INSTANCE.put("PacketWriter", "ez"); - INSTANCE.put("ParamComposition", "ix"); - INSTANCE.put("PcmPlayer", "bu"); - INSTANCE.put("PcmStream", "bi"); - INSTANCE.put("PcmStreamMixer", "bm"); - INSTANCE.put("PcmStreamMixerListener", "cc"); - INSTANCE.put("PendingSpawn", "dw"); - INSTANCE.put("PlatformInfo", "sx"); - INSTANCE.put("Player", "dj"); - INSTANCE.put("PlayerComposition", "ni"); - INSTANCE.put("Players", "ei"); - INSTANCE.put("PlayerType", "ol"); - INSTANCE.put("PrivateChatMode", "va"); - INSTANCE.put("Projectile", "dv"); - INSTANCE.put("Rasterizer2D", "uc"); - INSTANCE.put("Rasterizer3D", "jx"); - INSTANCE.put("RasterProvider", "ba"); - INSTANCE.put("RawPcmStream", "bx"); - INSTANCE.put("RawSound", "bs"); - INSTANCE.put("ReflectionCheck", "bt"); - INSTANCE.put("Renderable", "jy"); - INSTANCE.put("RouteStrategy", "iq"); - INSTANCE.put("RunException", "ve"); - INSTANCE.put("Scene", "jt"); - INSTANCE.put("SceneTileModel", "jf"); - INSTANCE.put("SceneTilePaint", "jz"); - INSTANCE.put("Script", "ds"); - INSTANCE.put("ScriptEvent", "dl"); - INSTANCE.put("ScriptFrame", "cn"); - INSTANCE.put("SecureRandomCallable", "dz"); - INSTANCE.put("SecureRandomFuture", "dm"); - INSTANCE.put("SequenceDefinition", "if"); - INSTANCE.put("ServerPacket", "lu"); - INSTANCE.put("Skeleton", "ju"); - INSTANCE.put("Skills", "nu"); - INSTANCE.put("SoftWrapper", "ld"); - INSTANCE.put("SongTask", "qm"); - INSTANCE.put("SoundCache", "bl"); - INSTANCE.put("SoundEffect", "br"); - INSTANCE.put("SoundEnvelope", "bf"); - INSTANCE.put("SoundSystem", "bh"); - INSTANCE.put("SpotAnimation", "vk"); - INSTANCE.put("SpotAnimationDefinition", "ir"); - INSTANCE.put("SpriteMask", "mp"); - INSTANCE.put("SpritePixels", "ud"); - INSTANCE.put("Strings", "oq"); - INSTANCE.put("StructComposition", "ii"); - INSTANCE.put("StudioGame", "np"); - INSTANCE.put("SwapSongTask", "pz"); - INSTANCE.put("Task", "hi"); - INSTANCE.put("TaskHandler", "gw"); - INSTANCE.put("Texture", "jo"); - INSTANCE.put("TextureLoader", "kg"); - INSTANCE.put("TextureProvider", "jq"); - INSTANCE.put("Tile", "jh"); - INSTANCE.put("TileItem", "el"); - INSTANCE.put("Tiles", "dq"); - INSTANCE.put("Timer", "qq"); - INSTANCE.put("TriBool", "ra"); - INSTANCE.put("UrlRequest", "eq"); - INSTANCE.put("UrlRequester", "en"); - INSTANCE.put("User", "rp"); - INSTANCE.put("UserComparator1", "uw"); - INSTANCE.put("UserComparator10", "ea"); - INSTANCE.put("UserComparator2", "ux"); - INSTANCE.put("UserComparator3", "ev"); - INSTANCE.put("UserComparator4", "ej"); - INSTANCE.put("UserComparator5", "eb"); - INSTANCE.put("UserComparator6", "ey"); - INSTANCE.put("UserComparator7", "eh"); - INSTANCE.put("UserComparator8", "et"); - INSTANCE.put("UserComparator9", "ee"); - INSTANCE.put("UserList", "rn"); - INSTANCE.put("Username", "vf"); - INSTANCE.put("Usernamed", "qc"); - INSTANCE.put("VarbitComposition", "is"); - INSTANCE.put("VarcInt", "hg"); - INSTANCE.put("Varcs", "ek"); - INSTANCE.put("VarpDefinition", "ha"); - INSTANCE.put("Varps", "md"); - INSTANCE.put("VertexNormal", "jp"); - INSTANCE.put("VerticalAlignment", "hr"); - INSTANCE.put("ViewportMouse", "netscape/js"); - INSTANCE.put("VorbisCodebook", "ce"); - INSTANCE.put("VorbisFloor", "bc"); - INSTANCE.put("VorbisMapping", "bq"); - INSTANCE.put("VorbisSample", "cw"); - INSTANCE.put("WallDecoration", "kq"); - INSTANCE.put("Widget", "nm"); - INSTANCE.put("WidgetDefinition", "nt"); - INSTANCE.put("World", "cv"); - INSTANCE.put("WorldMap", "tu"); - INSTANCE.put("WorldMapArchiveLoader", "tb"); - INSTANCE.put("WorldMapArea", "kz"); - INSTANCE.put("WorldMapAreaData", "lj"); - INSTANCE.put("WorldMapCacheName", "lh"); - INSTANCE.put("WorldMapData_0", "kj"); - INSTANCE.put("WorldMapData_1", "kh"); - INSTANCE.put("WorldMapDecoration", "kt"); - INSTANCE.put("WorldMapDecorationType", "nl"); - INSTANCE.put("WorldMapElement", "hp"); - INSTANCE.put("WorldMapEvent", "li"); - INSTANCE.put("WorldMapIcon_0", "kf"); - INSTANCE.put("WorldMapIcon_1", "kb"); - INSTANCE.put("WorldMapLabel", "kd"); - INSTANCE.put("WorldMapLabelSize", "ka"); - INSTANCE.put("WorldMapManager", "kk"); - INSTANCE.put("WorldMapRectangle", "kx"); - INSTANCE.put("WorldMapRegion", "ke"); - INSTANCE.put("WorldMapScaleHandler", "lf"); - INSTANCE.put("WorldMapSection", "lm"); - INSTANCE.put("WorldMapSection0", "kw"); - INSTANCE.put("WorldMapSection1", "ly"); - INSTANCE.put("WorldMapSection2", "kn"); - INSTANCE.put("WorldMapSectionType", "ky"); - INSTANCE.put("WorldMapSprite", "kc"); - INSTANCE.put("Wrapper", "lb"); - INSTANCE.put("ZoneOperation", "lq"); - } -} \ No newline at end of file diff --git a/osrs/src/main/java/net/runelite/rs/Reflection.java b/osrs/src/main/java/net/runelite/rs/Reflection.java index 773d1b2f4..7169635c5 100644 --- a/osrs/src/main/java/net/runelite/rs/Reflection.java +++ b/osrs/src/main/java/net/runelite/rs/Reflection.java @@ -3,6 +3,7 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +//import net.runelite.rs.ObfuscatedClassMap; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -22,7 +23,7 @@ public static void reportFindField(Class className, String fieldName) {} public static void reportInvoke(Method method, Object object, Object[] args) {} static { - ObfuscatedClassMap.INSTANCE.forEach((deobClassName, obfuscatedClassName) -> { +/* ObfuscatedClassMap.INSTANCE.forEach((deobClassName, obfuscatedClassName) -> { if (!deobClassName.contains("/") && !obfuscatedClassName.contains("/")) { Class c = null; try { @@ -32,7 +33,7 @@ public static void reportInvoke(Method method, Object object, Object[] args) {} } classes.put(obfuscatedClassName, c); } - }); + });*/ } public static Class findClass(String name) throws ClassNotFoundException { diff --git a/osrs/src/main/java/org/json/JSONArray.java b/osrs/src/main/java/org/json/JSONArray.java index c3997e73a..8f09c906c 100644 --- a/osrs/src/main/java/org/json/JSONArray.java +++ b/osrs/src/main/java/org/json/JSONArray.java @@ -22,7 +22,7 @@ public JSONArray() { this.myArrayList = new ArrayList(); } - public JSONArray(org.json.JSONTokener var1) throws org.json.JSONException { + public JSONArray(JSONTokener var1) throws JSONException { this(); char var2 = var1.nextClean(); char var3; @@ -72,7 +72,7 @@ public JSONArray(org.json.JSONTokener var1) throws org.json.JSONException { } } - public JSONArray(String var1) throws org.json.JSONException { + public JSONArray(String var1) throws JSONException { this(new JSONTokener(var1)); } @@ -80,29 +80,29 @@ public JSONArray(Collection var1) { this.myArrayList = var1 == null ? new ArrayList() : new ArrayList(var1); } - public JSONArray(Object var1) throws org.json.JSONException { + public JSONArray(Object var1) throws JSONException { this(); if (!var1.getClass().isArray()) { - throw new org.json.JSONException("JSONArray initial value should be a string or collection or array."); + throw new JSONException("JSONArray initial value should be a string or collection or array."); } else { int var2 = Array.getLength(var1); for (int var3 = 0; var3 < var2; ++var3) { - this.method2746(Array.get(var1, var3)); + this.method2723(Array.get(var1, var3)); } } } - public JSONArray(Object var1, boolean var2) throws org.json.JSONException { + public JSONArray(Object var1, boolean var2) throws JSONException { this(); if (!var1.getClass().isArray()) { - throw new org.json.JSONException("JSONArray initial value should be a string or collection or array."); + throw new JSONException("JSONArray initial value should be a string or collection or array."); } else { int var3 = Array.getLength(var1); for (int var4 = 0; var4 < var3; ++var4) { - this.method2746(new JSONObject(Array.get(var1, var4), var2)); + this.method2723(new JSONObject(Array.get(var1, var4), var2)); } } @@ -121,62 +121,62 @@ public JSONArray(Collection var1, boolean var2) { } @ObfuscatedName("opt") - public Object method2745(int var1) { + public Object method2722(int var1) { return var1 >= 0 && var1 < this.length() ? this.myArrayList.get(var1) : null; } @ObfuscatedName("get") - public Object method2744(int var1) throws org.json.JSONException { - Object var2 = this.method2745(var1); + public Object method2721(int var1) throws JSONException { + Object var2 = this.method2722(var1); if (var2 == null) { - throw new org.json.JSONException("JSONArray[" + var1 + "] not found."); + throw new JSONException("JSONArray[" + var1 + "] not found."); } else { return var2; } } @ObfuscatedName("put") - public JSONArray method2746(Object var1) { + public JSONArray method2723(Object var1) { this.myArrayList.add(var1); return this; } @Export("getBoolean") @ObfuscatedName("getBoolean") - public boolean getBoolean(int var1) throws org.json.JSONException { - Object var2 = this.method2744(var1); + public boolean getBoolean(int var1) throws JSONException { + Object var2 = this.method2721(var1); if (var2.equals(Boolean.FALSE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("false")) { return false; } else if (var2.equals(Boolean.TRUE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("true")) { return true; } else { - throw new org.json.JSONException("JSONArray[" + var1 + "] is not a Boolean."); + throw new JSONException("JSONArray[" + var1 + "] is not a Boolean."); } } @Export("getInt") @ObfuscatedName("getInt") - public int getInt(int var1) throws org.json.JSONException { - Object var2 = this.method2744(var1); + public int getInt(int var1) throws JSONException { + Object var2 = this.method2721(var1); return var2 instanceof Number ? ((Number)var2).intValue() : (int)this.getDouble(var1); } @Export("getLong") @ObfuscatedName("getLong") - public long getLong(int var1) throws org.json.JSONException { - Object var2 = this.method2744(var1); + public long getLong(int var1) throws JSONException { + Object var2 = this.method2721(var1); return var2 instanceof Number ? ((Number)var2).longValue() : (long)this.getDouble(var1); } @Export("getDouble") @ObfuscatedName("getDouble") - public double getDouble(int var1) throws org.json.JSONException { - Object var2 = this.method2744(var1); + public double getDouble(int var1) throws JSONException { + Object var2 = this.method2721(var1); try { return var2 instanceof Number ? ((Number)var2).doubleValue() : Double.valueOf((String)var2); } catch (Exception var4) { - throw new org.json.JSONException("JSONArray[" + var1 + "] is not a number."); + throw new JSONException("JSONArray[" + var1 + "] is not a number."); } } @@ -188,7 +188,7 @@ public int length() { @Export("join") @ObfuscatedName("join") - public String join(String var1) throws org.json.JSONException { + public String join(String var1) throws JSONException { int var2 = this.length(); StringBuffer var3 = new StringBuffer(); @@ -215,18 +215,18 @@ public double optDouble(int var1, double var2) { @Export("getJSONObject") @ObfuscatedName("getJSONObject") - public JSONObject getJSONObject(int var1) throws org.json.JSONException { - Object var2 = this.method2744(var1); + public JSONObject getJSONObject(int var1) throws JSONException { + Object var2 = this.method2721(var1); if (var2 instanceof JSONObject) { return (JSONObject)var2; } else { - throw new org.json.JSONException("JSONArray[" + var1 + "] is not a JSONObject."); + throw new JSONException("JSONArray[" + var1 + "] is not a JSONObject."); } } @Export("toString") @ObfuscatedName("toString") - String toString(int var1, int var2) throws org.json.JSONException { + String toString(int var1, int var2) throws JSONException { int var3 = this.length(); if (var3 == 0) { return "[]"; @@ -265,7 +265,7 @@ String toString(int var1, int var2) throws org.json.JSONException { @Export("write") @ObfuscatedName("write") - public Writer write(Writer var1) throws org.json.JSONException { + public Writer write(Writer var1) throws JSONException { try { boolean var2 = false; int var3 = this.length(); @@ -291,7 +291,7 @@ public Writer write(Writer var1) throws org.json.JSONException { var1.write(93); return var1; } catch (IOException var7) { - throw new org.json.JSONException(var7); + throw new JSONException(var7); } } @@ -308,7 +308,7 @@ public String toString() { @Export("getString") @ObfuscatedName("getString") public String getString(int var1) throws JSONException { - return this.method2744(var1).toString(); + return this.method2721(var1).toString(); } @Export("optBoolean") @@ -344,7 +344,7 @@ public long optLong(int var1, long var2) { @Export("optString") @ObfuscatedName("optString") public String optString(int var1, String var2) { - Object var3 = this.method2745(var1); + Object var3 = this.method2722(var1); return var3 != null ? var3.toString() : var2; } } \ No newline at end of file diff --git a/osrs/src/main/java/org/json/JSONObject.java b/osrs/src/main/java/org/json/JSONObject.java index 8b2b9a67c..705c1272a 100644 --- a/osrs/src/main/java/org/json/JSONObject.java +++ b/osrs/src/main/java/org/json/JSONObject.java @@ -11,6 +11,7 @@ import java.util.*; import java.util.Map.Entry; + @Implements("org/json/JSONObject") @ObfuscatedName("org/json/JSONObject") public class JSONObject { @@ -18,17 +19,17 @@ public class JSONObject { @ObfuscatedName("NULL") public static final Object NULL; @ObfuscatedName("map") - Map field4317; + Map field4322; static { NULL = new Null(); } public JSONObject() { - this.field4317 = new HashMap(); + this.field4322 = new HashMap(); } - public JSONObject(org.json.JSONTokener var1) throws org.json.JSONException { + public JSONObject(JSONTokener var1) throws JSONException { this(); if (var1.nextClean() != '{') { throw var1.syntaxError("A JSONObject text must begin with '{'"); @@ -72,7 +73,7 @@ public JSONObject(org.json.JSONTokener var1) throws org.json.JSONException { } } - public JSONObject(String var1) throws org.json.JSONException { + public JSONObject(String var1) throws JSONException { this(new JSONTokener(var1)); } @@ -82,45 +83,45 @@ public JSONObject(Object var1, boolean var2) { } public JSONObject(Map var1) { - this.field4317 = (Map)(var1 == null ? new HashMap() : var1); + this.field4322 = (Map)(var1 == null ? new HashMap() : var1); } public JSONObject(Map var1, boolean var2) { - this.field4317 = new HashMap(); + this.field4322 = new HashMap(); if (var1 != null) { Iterator var3 = var1.entrySet().iterator(); while (var3.hasNext()) { Entry var4 = (Entry)var3.next(); - this.field4317.put(var4.getKey(), new JSONObject(var4.getValue(), var2)); + this.field4322.put(var4.getKey(), new JSONObject(var4.getValue(), var2)); } } } @ObfuscatedName("opt") - public Object method2749(String var1) { - return var1 == null ? null : this.field4317.get(var1); + public Object method2726(String var1) { + return var1 == null ? null : this.field4322.get(var1); } @ObfuscatedName("get") - public Object method2748(String var1) throws org.json.JSONException { - Object var2 = this.method2749(var1); + public Object method2725(String var1) throws JSONException { + Object var2 = this.method2726(var1); if (var2 == null) { - throw new org.json.JSONException("JSONObject[" + quote(var1) + "] not found."); + throw new JSONException("JSONObject[" + quote(var1) + "] not found."); } else { return var2; } } @ObfuscatedName("put") - public JSONObject method2750(String var1, Object var2) throws org.json.JSONException { + public JSONObject method2727(String var1, Object var2) throws JSONException { if (var1 == null) { - throw new org.json.JSONException("Null key."); + throw new JSONException("Null key."); } else { if (var2 != null) { testValidity(var2); - this.field4317.put(var1, var2); + this.field4322.put(var1, var2); } else { this.remove(var1); } @@ -131,51 +132,51 @@ public JSONObject method2750(String var1, Object var2) throws org.json.JSONExcep @Export("getBoolean") @ObfuscatedName("getBoolean") - public boolean getBoolean(String var1) throws org.json.JSONException { - Object var2 = this.method2748(var1); + public boolean getBoolean(String var1) throws JSONException { + Object var2 = this.method2725(var1); if (var2.equals(Boolean.FALSE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("false")) { return false; } else if (var2.equals(Boolean.TRUE) || var2 instanceof String && ((String)var2).equalsIgnoreCase("true")) { return true; } else { - throw new org.json.JSONException("JSONObject[" + quote(var1) + "] is not a Boolean."); + throw new JSONException("JSONObject[" + quote(var1) + "] is not a Boolean."); } } @Export("getLong") @ObfuscatedName("getLong") - public long getLong(String var1) throws org.json.JSONException { - Object var2 = this.method2748(var1); + public long getLong(String var1) throws JSONException { + Object var2 = this.method2725(var1); return var2 instanceof Number ? ((Number)var2).longValue() : (long)this.getDouble(var1); } @Export("keys") @ObfuscatedName("keys") public Iterator keys() { - return this.field4317.keySet().iterator(); - } - - @Export("getInt") - @ObfuscatedName("getInt") - public int getInt(String var1) throws org.json.JSONException { - Object var2 = this.method2748(var1); - return var2 instanceof Number ? ((Number)var2).intValue() : (int)this.getDouble(var1); + return this.field4322.keySet().iterator(); } @Export("length") @ObfuscatedName("length") public int length() { - return this.field4317.size(); + return this.field4322.size(); + } + + @Export("getInt") + @ObfuscatedName("getInt") + public int getInt(String var1) throws JSONException { + Object var2 = this.method2725(var1); + return var2 instanceof Number ? ((Number)var2).intValue() : (int)this.getDouble(var1); } @Export("getJSONArray") @ObfuscatedName("getJSONArray") - public org.json.JSONArray getJSONArray(String var1) throws org.json.JSONException { - Object var2 = this.method2748(var1); - if (var2 instanceof org.json.JSONArray) { - return (org.json.JSONArray)var2; + public JSONArray getJSONArray(String var1) throws JSONException { + Object var2 = this.method2725(var1); + if (var2 instanceof JSONArray) { + return (JSONArray)var2; } else { - throw new org.json.JSONException("JSONObject[" + quote(var1) + "] is not a JSONArray."); + throw new JSONException("JSONObject[" + quote(var1) + "] is not a JSONArray."); } } @@ -209,19 +210,19 @@ void populateInternalMap(Object var1, boolean var2) { Object var9 = Reflection.invoke(var6, var1, (Object[])null); if (var9 == null) { - this.field4317.put(var8, NULL); + this.field4322.put(var8, NULL); } else if (var9.getClass().isArray()) { - this.field4317.put(var8, new org.json.JSONArray(var9, var2)); + this.field4322.put(var8, new JSONArray(var9, var2)); } else if (var9 instanceof Collection) { - this.field4317.put(var8, new org.json.JSONArray((Collection)var9, var2)); + this.field4322.put(var8, new JSONArray((Collection)var9, var2)); } else if (var9 instanceof Map) { - this.field4317.put(var8, new JSONObject((Map)var9, var2)); + this.field4322.put(var8, new JSONObject((Map)var9, var2)); } else if (this.isStandardProperty(var9.getClass())) { - this.field4317.put(var8, var9); + this.field4322.put(var8, var9); } else if (!var9.getClass().getPackage().getName().startsWith("java") && var9.getClass().getClassLoader() != null) { - this.field4317.put(var8, new JSONObject(var9, var2)); + this.field4322.put(var8, new JSONObject(var9, var2)); } else { - this.field4317.put(var8, var9.toString()); + this.field4322.put(var8, var9.toString()); } } } catch (Exception var10) { @@ -234,41 +235,41 @@ void populateInternalMap(Object var1, boolean var2) { @Export("remove") @ObfuscatedName("remove") public Object remove(String var1) { - return this.field4317.remove(var1); + return this.field4322.remove(var1); } @Export("getJSONObject") @ObfuscatedName("getJSONObject") - public JSONObject getJSONObject(String var1) throws org.json.JSONException { - Object var2 = this.method2748(var1); + public JSONObject getJSONObject(String var1) throws JSONException { + Object var2 = this.method2725(var1); if (var2 instanceof JSONObject) { return (JSONObject)var2; } else { - throw new org.json.JSONException("JSONObject[" + quote(var1) + "] is not a JSONObject."); + throw new JSONException("JSONObject[" + quote(var1) + "] is not a JSONObject."); } } @Export("sortedKeys") @ObfuscatedName("sortedKeys") public Iterator sortedKeys() { - return (new TreeSet(this.field4317.keySet())).iterator(); + return (new TreeSet(this.field4322.keySet())).iterator(); } @Export("getDouble") @ObfuscatedName("getDouble") - public double getDouble(String var1) throws org.json.JSONException { - Object var2 = this.method2748(var1); + public double getDouble(String var1) throws JSONException { + Object var2 = this.method2725(var1); try { return var2 instanceof Number ? ((Number)var2).doubleValue() : Double.valueOf((String)var2); } catch (Exception var4) { - throw new org.json.JSONException("JSONObject[" + quote(var1) + "] is not a number."); + throw new JSONException("JSONObject[" + quote(var1) + "] is not a number."); } } @Export("toString") @ObfuscatedName("toString") - String toString(int var1, int var2) throws org.json.JSONException { + String toString(int var1, int var2) throws JSONException { int var4 = this.length(); if (var4 == 0) { return "{}"; @@ -281,7 +282,7 @@ String toString(int var1, int var2) throws org.json.JSONException { var8 = var5.next(); var6.append(quote(var8.toString())); var6.append(": "); - var6.append(valueToString(this.field4317.get(var8), var1, var2)); + var6.append(valueToString(this.field4322.get(var8), var1, var2)); } else { while (true) { int var3; @@ -309,7 +310,7 @@ String toString(int var1, int var2) throws org.json.JSONException { var6.append(quote(var8.toString())); var6.append(": "); - var6.append(valueToString(this.field4317.get(var8), var1, var7)); + var6.append(valueToString(this.field4322.get(var8), var1, var7)); } } @@ -320,7 +321,7 @@ String toString(int var1, int var2) throws org.json.JSONException { @Export("write") @ObfuscatedName("write") - public Writer write(Writer var1) throws org.json.JSONException { + public Writer write(Writer var1) throws JSONException { try { boolean var2 = false; Iterator var3 = this.keys(); @@ -334,11 +335,11 @@ public Writer write(Writer var1) throws org.json.JSONException { Object var4 = var3.next(); var1.write(quote(var4.toString())); var1.write(58); - Object var5 = this.field4317.get(var4); + Object var5 = this.field4322.get(var4); if (var5 instanceof JSONObject) { ((JSONObject)var5).write(var1); - } else if (var5 instanceof org.json.JSONArray) { - ((org.json.JSONArray)var5).write(var1); + } else if (var5 instanceof JSONArray) { + ((JSONArray)var5).write(var1); } else { var1.write(valueToString(var5)); } @@ -347,14 +348,14 @@ public Writer write(Writer var1) throws org.json.JSONException { var1.write(125); return var1; } catch (IOException var7) { - throw new org.json.JSONException(var7); + throw new JSONException(var7); } } @Export("getString") @ObfuscatedName("getString") - public String getString(String var1) throws org.json.JSONException { - return this.method2748(var1).toString(); + public String getString(String var1) throws JSONException { + return this.method2725(var1).toString(); } @Export("toString") @@ -372,7 +373,7 @@ public String toString() { Object var3 = var1.next(); var2.append(quote(var3.toString())); var2.append(':'); - var2.append(valueToString(this.field4317.get(var3))); + var2.append(valueToString(this.field4322.get(var3))); } var2.append('}'); @@ -384,13 +385,13 @@ public String toString() { @Export("putOnce") @ObfuscatedName("putOnce") - public JSONObject putOnce(String var1, Object var2) throws org.json.JSONException { + public JSONObject putOnce(String var1, Object var2) throws JSONException { if (var1 != null && var2 != null) { - if (this.method2749(var1) != null) { - throw new org.json.JSONException("Duplicate key \"" + var1 + "\""); + if (this.method2726(var1) != null) { + throw new JSONException("Duplicate key \"" + var1 + "\""); } - this.method2750(var1, var2); + this.method2727(var1, var2); } return this; @@ -416,7 +417,7 @@ public boolean optBoolean(String var1, boolean var2) { @ObfuscatedName("optDouble") public double optDouble(String var1, double var2) { try { - Object var4 = this.method2749(var1); + Object var4 = this.method2726(var1); return var4 instanceof Number ? ((Number)var4).doubleValue() : new Double((String)var4); } catch (Exception var5) { return var2; @@ -446,15 +447,15 @@ public long optLong(String var1, long var2) { @Export("optString") @ObfuscatedName("optString") public String optString(String var1, String var2) { - Object var3 = this.method2749(var1); + Object var3 = this.method2726(var1); return var3 != null ? var3.toString() : var2; } @Export("putOpt") @ObfuscatedName("putOpt") - public JSONObject putOpt(String var1, Object var2) throws org.json.JSONException { + public JSONObject putOpt(String var1, Object var2) throws JSONException { if (var1 != null && var2 != null) { - this.method2750(var1, var2); + this.method2727(var1, var2); } return this; @@ -480,14 +481,14 @@ public static String[] getNames(JSONObject var0) { @Export("testValidity") @ObfuscatedName("testValidity") - static void testValidity(Object var0) throws org.json.JSONException { + static void testValidity(Object var0) throws JSONException { if (var0 != null) { if (var0 instanceof Double) { if (((Double)var0).isInfinite() || ((Double)var0).isNaN()) { - throw new org.json.JSONException("JSON does not allow non-finite numbers."); + throw new JSONException("JSON does not allow non-finite numbers."); } } else if (var0 instanceof Float && (((Float)var0).isInfinite() || ((Float)var0).isNaN())) { - throw new org.json.JSONException("JSON does not allow non-finite numbers."); + throw new JSONException("JSON does not allow non-finite numbers."); } } @@ -495,9 +496,9 @@ static void testValidity(Object var0) throws org.json.JSONException { @Export("numberToString") @ObfuscatedName("numberToString") - public static String numberToString(Number var0) throws org.json.JSONException { + public static String numberToString(Number var0) throws JSONException { if (var0 == null) { - throw new org.json.JSONException("Null pointer"); + throw new JSONException("Null pointer"); } else { testValidity(var0); String var1 = var0.toString(); @@ -574,11 +575,11 @@ public static String quote(String var0) { @Export("valueToString") @ObfuscatedName("valueToString") - static String valueToString(Object var0, int var1, int var2) throws org.json.JSONException { + static String valueToString(Object var0, int var1, int var2) throws JSONException { if (var0 != null && !var0.equals((Object)null)) { try { - if (var0 instanceof org.json.JSONString) { - String var3 = ((org.json.JSONString)var0).toJSONString(); + if (var0 instanceof JSONString) { + String var3 = ((JSONString)var0).toJSONString(); if (var3 instanceof String) { return (String)var3; } @@ -592,14 +593,14 @@ static String valueToString(Object var0, int var1, int var2) throws org.json.JSO return var0.toString(); } else if (var0 instanceof JSONObject) { return ((JSONObject)var0).toString(var1, var2); - } else if (var0 instanceof org.json.JSONArray) { - return ((org.json.JSONArray)var0).toString(var1, var2); + } else if (var0 instanceof JSONArray) { + return ((JSONArray)var0).toString(var1, var2); } else if (var0 instanceof Map) { return (new JSONObject((Map)var0)).toString(var1, var2); } else if (var0 instanceof Collection) { - return (new org.json.JSONArray((Collection)var0)).toString(var1, var2); + return (new JSONArray((Collection)var0)).toString(var1, var2); } else { - return var0.getClass().isArray() ? (new org.json.JSONArray(var0)).toString(var1, var2) : quote(var0.toString()); + return var0.getClass().isArray() ? (new JSONArray(var0)).toString(var1, var2) : quote(var0.toString()); } } else { return "null"; @@ -608,14 +609,14 @@ static String valueToString(Object var0, int var1, int var2) throws org.json.JSO @Export("valueToString") @ObfuscatedName("valueToString") - static String valueToString(Object var0) throws org.json.JSONException { + static String valueToString(Object var0) throws JSONException { if (var0 != null && !var0.equals((Object)null)) { - if (var0 instanceof org.json.JSONString) { + if (var0 instanceof JSONString) { String var1; try { var1 = ((JSONString)var0).toJSONString(); } catch (Exception var3) { - throw new org.json.JSONException(var3); + throw new JSONException(var3); } if (var1 instanceof String) { @@ -625,11 +626,11 @@ static String valueToString(Object var0) throws org.json.JSONException { } } else if (var0 instanceof Number) { return numberToString((Number)var0); - } else if (!(var0 instanceof Boolean) && !(var0 instanceof JSONObject) && !(var0 instanceof org.json.JSONArray)) { + } else if (!(var0 instanceof Boolean) && !(var0 instanceof JSONObject) && !(var0 instanceof JSONArray)) { if (var0 instanceof Map) { return (new JSONObject((Map)var0)).toString(); } else if (var0 instanceof Collection) { - return (new org.json.JSONArray((Collection)var0)).toString(); + return (new JSONArray((Collection)var0)).toString(); } else { return var0.getClass().isArray() ? (new JSONArray(var0)).toString() : quote(var0.toString()); } diff --git a/osrs/src/main/java/org/json/JSONTokener.java b/osrs/src/main/java/org/json/JSONTokener.java index 979576a28..7a215f34c 100644 --- a/osrs/src/main/java/org/json/JSONTokener.java +++ b/osrs/src/main/java/org/json/JSONTokener.java @@ -3,9 +3,6 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; import java.io.BufferedReader; import java.io.IOException; @@ -40,7 +37,7 @@ public JSONTokener(Reader var1) { @Export("nextClean") @ObfuscatedName("nextClean") - public char nextClean() throws org.json.JSONException { + public char nextClean() throws JSONException { char var1; do { var1 = this.next(); @@ -51,7 +48,7 @@ public char nextClean() throws org.json.JSONException { @Export("next") @ObfuscatedName("next") - public char next() throws org.json.JSONException { + public char next() throws JSONException { if (this.useLastChar) { this.useLastChar = false; if (this.lastChar != 0) { @@ -64,7 +61,7 @@ public char next() throws org.json.JSONException { try { var1 = this.reader.read(); } catch (IOException var3) { - throw new org.json.JSONException(var3); + throw new JSONException(var3); } if (var1 <= 0) { @@ -80,7 +77,7 @@ public char next() throws org.json.JSONException { @Export("nextTo") @ObfuscatedName("nextString") - public String nextTo(char var1) throws org.json.JSONException { + public String nextTo(char var1) throws JSONException { StringBuffer var3 = new StringBuffer(); while (true) { @@ -152,24 +149,24 @@ public String toString() { @Export("back") @ObfuscatedName("back") - public void back() throws org.json.JSONException { + public void back() throws JSONException { if (!this.useLastChar && this.index > 0) { --this.index; this.useLastChar = true; } else { - throw new org.json.JSONException("Stepping back two steps is not supported"); + throw new JSONException("Stepping back two steps is not supported"); } } @Export("syntaxError") @ObfuscatedName("syntaxError") - public org.json.JSONException syntaxError(String var1) { - return new org.json.JSONException(var1 + this.toString()); + public JSONException syntaxError(String var1) { + return new JSONException(var1 + this.toString()); } @Export("next") @ObfuscatedName("next") - public String next(int var1) throws org.json.JSONException { + public String next(int var1) throws JSONException { if (var1 == 0) { return ""; } else { @@ -187,7 +184,7 @@ public String next(int var1) throws org.json.JSONException { var3 += var4; } } catch (IOException var6) { - throw new org.json.JSONException(var6); + throw new JSONException(var6); } this.index += var3; diff --git a/osrs/src/main/java/org/json/Null.java b/osrs/src/main/java/org/json/Null.java index d164b5326..dbfa11cde 100644 --- a/osrs/src/main/java/org/json/Null.java +++ b/osrs/src/main/java/org/json/Null.java @@ -4,13 +4,15 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; + @Implements("org/json/Null") @ObfuscatedName("org/json/JSONObject$Null") final class Null { + + Null() { } - public final Object clone() { return this; } From 129c1f130e78e4bec62f05d39861021f2091ff29 Mon Sep 17 00:00:00 2001 From: Kaballist Date: Wed, 22 Nov 2023 19:42:11 -0800 Subject: [PATCH 17/17] rev 218 --- .gitignore | 3 +- .../java/net/runelite/rs/api/RSBuffer.java | 311 ++- .../java/net/runelite/rs/api/RSClient.java | 44 + .../java/net/runelite/rs/api/RSDbTable.java | 10 + .../runelite/rs/api/RSInterfaceParent.java | 6 + .../net/runelite/rs/api/RSNodeHashTable.java | 2 + .../java/net/runelite/rs/api/RSWidget.java | 3 +- .../runelite/rs/api/RSWidgetDefinition.java | 2 - .../main/java/net/runelite/api/Buffer.java | 92 +- .../main/java/net/runelite/api/Client.java | 8 +- api/src/main/java/net/runelite/api/Item.kt | 9 + .../kotlin/eventbus/events/IfOpenSubEvent.kt | 2 +- .../kotlin/eventbus/events/ScriptPreFired.kt | 2 +- cache/build.gradle.kts | 1 + .../java/net/runelite/cache/AreaManager.java | 12 +- .../main/java/net/runelite/cache/Cache.java | 9 +- .../java/net/runelite/cache/DBRowManager.java | 12 +- .../runelite/cache/DBTableIndexManager.java | 12 +- .../net/runelite/cache/DBTableManager.java | 12 +- .../net/runelite/cache/HeightMapDumper.java | 7 +- .../net/runelite/cache/InterfaceManager.java | 14 +- .../net/runelite/cache/InventoryManager.java | 12 +- .../java/net/runelite/cache/ItemManager.java | 18 +- .../net/runelite/cache/MapImageDumper.java | 41 +- .../java/net/runelite/cache/NpcManager.java | 16 +- .../net/runelite/cache/ObjectManager.java | 16 +- .../net/runelite/cache/OverlayManager.java | 14 +- .../net/runelite/cache/SpriteManager.java | 11 +- .../net/runelite/cache/StructManager.java | 14 +- .../net/runelite/cache/TextureManager.java | 14 +- .../net/runelite/cache/UnderlayManager.java | 14 +- .../cache/definitions/DBTableIndex.java | 5 +- .../cache/definitions/ItemDefinition.java | 3 +- .../definitions/LocationsDefinition.java | 5 +- .../cache/definitions/ModelDefinition.java | 211 +- .../cache/definitions/NpcDefinition.java | 3 +- .../cache/definitions/ObjectDefinition.java | 9 +- .../cache/definitions/ScriptDefinition.java | 3 +- .../cache/definitions/SequenceDefinition.java | 3 +- .../cache/definitions/StructDefinition.java | 3 +- .../cache/definitions/WorldMapDefinition.java | 3 +- .../exporters/InterfaceExporter.java | 3 +- .../definitions/exporters/ItemExporter.java | 3 +- .../definitions/exporters/NpcExporter.java | 3 +- .../definitions/exporters/ObjectExporter.java | 3 +- .../definitions/exporters/SpriteExporter.java | 5 +- .../loaders/DBTableIndexLoader.java | 7 +- .../definitions/loaders/InterfaceLoader.java | 7 +- .../cache/definitions/loaders/ItemLoader.java | 3 +- .../cache/definitions/loaders/MapLoader.java | 5 +- .../cache/definitions/loaders/NpcLoader.java | 3 +- .../definitions/loaders/ObjectLoader.java | 19 +- .../definitions/loaders/ScriptLoader.java | 11 +- .../definitions/loaders/SequenceLoader.java | 3 +- .../definitions/loaders/StructLoader.java | 3 +- .../definitions/loaders/WorldMapLoader.java | 10 +- .../loaders/sound/InstrumentLoader.java | 2 +- .../loaders/sound/SoundEffectTrackLoader.java | 2 +- .../definitions/providers/ModelProvider.java | 3 +- .../definitions/savers/InterfaceSaver.java | 226 -- .../cache/definitions/savers/ItemSaver.java | 235 -- .../definitions/savers/LocationSaver.java | 78 - .../cache/definitions/savers/NpcSaver.java | 190 -- .../cache/definitions/savers/ObjectSaver.java | 236 -- .../cache/definitions/savers/ScriptSaver.java | 11 +- .../java/net/runelite/cache/fs/Archive.java | 14 +- .../net/runelite/cache/fs/ArchiveFiles.java | 8 +- .../java/net/runelite/cache/fs/Container.java | 22 +- .../java/net/runelite/cache/fs/Index.java | 7 +- .../java/net/runelite/cache/fs/Storage.java | 14 +- .../java/net/runelite/cache/fs/Store.java | 12 +- .../runelite/cache/fs/flat/FlatStorage.java | 38 +- .../net/runelite/cache/fs/jagex/DataFile.java | 9 +- .../runelite/cache/fs/jagex/DiskStorage.java | 97 +- .../runelite/cache/fs/jagex/IndexFile.java | 9 +- .../net/runelite/cache/index/IndexData.java | 1 - .../net/runelite/cache/io/OutputStream.java | 1 + .../net/runelite/cache/item/Graphics3D.java | 14 - .../cache/item/ItemSpriteFactory.java | 120 +- .../java/net/runelite/cache/item/Model.java | 535 +--- .../net/runelite/cache/item/SpritePixels.java | 8 +- .../runelite/cache/models/ObjExporter.java | 3 +- .../net/runelite/cache/region/Region.java | 5 +- .../runelite/cache/region/RegionLoader.java | 9 +- .../cache/script/assembler/Assembler.java | 9 +- .../cache/script/assembler/LabelVisitor.java | 5 +- .../cache/script/assembler/ScriptWriter.java | 7 +- .../cache/script/assembler/rs2asm.interp | 60 + .../script/assembler/rs2asmBaseListener.java | 11 +- .../cache/script/assembler/rs2asmLexer.interp | 53 + .../cache/script/assembler/rs2asmLexer.java | 258 +- .../script/assembler/rs2asmListener.java | 2 +- .../cache/script/assembler/rs2asmParser.java | 2165 ++++++++--------- .../script/disassembler/Disassembler.java | 7 +- .../java/net/runelite/cache/util/BZip2.java | 74 +- .../runelite/cache/util/BigBufferedImage.java | 31 +- .../MapSaver.java => util/BzStream.java} | 105 +- .../net/runelite/cache/util/Djb2Manager.java | 5 +- .../java/net/runelite/cache/util/GZip.java | 11 +- .../net/runelite/cache/util/LibBZip2.java | 47 + .../runelite/cache/util/ScriptVarType.java | 5 +- .../runelite/cache/util/XteaKeyManager.java | 5 +- .../script/disassembler/DisassemblerTest.java | 1 + .../main/java/dev/hoot/api/magic/Magic.java | 4 +- .../dev/hoot/api/packets/WidgetPackets.java | 6 +- .../java/dev/hoot/api/widgets/Prayers.java | 4 +- client/src/main/java/meteor/Main.kt | 24 +- .../java/meteor/api/ClientPacketManager.kt | 363 +++ .../src/main/java/meteor/api/ClientPackets.kt | 1279 ++++------ client/src/main/java/meteor/api/Items.kt | 2 +- .../alchemicalhydra/AlchemicalHydraPlugin.kt | 13 +- .../meteor/plugins/autoalch/AutoAlchPlugin.kt | 5 +- .../plugins/autokraken/AutoKrakenPlugin.kt | 5 +- .../meteor/plugins/autologhop/AutoLogHop.kt | 4 +- .../java/meteor/plugins/bank/BankSearch.kt | 1 - .../meteor/plugins/banksetups/BankSetups.kt | 4 +- .../meteor/plugins/fighter/FighterPlugin.kt | 7 +- .../jadautoprayer/JadAutoPrayerPlugin.kt | 11 +- .../main/java/meteor/plugins/meteor/Meteor.kt | 9 +- .../plugins/muspahassist/MuspahAssist.kt | 18 +- .../prayerflicker/PrayerFlickerPlugin.kt | 6 +- .../java/meteor/plugins/pvpkeys/PvPKeys.kt | 2 +- .../wintertodtfletcher/WintertodtHelper.kt | 4 +- .../cluescrolls/clues/CrypticClue.java | 2 +- .../plugins/devtools/EventInspector.java | 12 +- .../devtools/EventInspectorSubscriber.kt | 4 +- .../quests/templeoftheeye/TempleOfTheEye.java | 3 +- .../questhelper/steps/QuestSyncStep.java | 1 - client/src/main/resources/runelite/12/10003 | Bin 19 -> 0 bytes client/src/main/resources/runelite/12/10004 | Bin 34 -> 0 bytes client/src/main/resources/runelite/12/1048 | Bin 472 -> 0 bytes .../src/main/resources/runelite/12/1048.hash | 1 - client/src/main/resources/runelite/12/1049 | Bin 454 -> 0 bytes .../src/main/resources/runelite/12/1049.hash | 1 - client/src/main/resources/runelite/12/1050 | Bin 373 -> 0 bytes .../src/main/resources/runelite/12/1050.hash | 1 - client/src/main/resources/runelite/12/125 | Bin 3321 -> 0 bytes .../src/main/resources/runelite/12/125.hash | 1 - client/src/main/resources/runelite/12/129 | Bin 2031 -> 0 bytes .../src/main/resources/runelite/12/129.hash | 1 - client/src/main/resources/runelite/12/1651 | Bin 434 -> 0 bytes .../src/main/resources/runelite/12/1651.hash | 1 - client/src/main/resources/runelite/12/2091 | Bin 1142 -> 0 bytes .../src/main/resources/runelite/12/2091.hash | 1 - client/src/main/resources/runelite/12/223 | Bin 1824 -> 0 bytes .../src/main/resources/runelite/12/223.hash | 1 - client/src/main/resources/runelite/12/276 | Bin 248 -> 0 bytes .../src/main/resources/runelite/12/276.hash | 1 - client/src/main/resources/runelite/12/277 | Bin 5350 -> 0 bytes .../src/main/resources/runelite/12/277.hash | 1 - client/src/main/resources/runelite/12/279 | Bin 351 -> 0 bytes .../src/main/resources/runelite/12/279.hash | 1 - client/src/main/resources/runelite/12/300 | Bin 265 -> 0 bytes .../src/main/resources/runelite/12/300.hash | 1 - client/src/main/resources/runelite/12/3238 | Bin 696 -> 0 bytes .../src/main/resources/runelite/12/3238.hash | 1 - client/src/main/resources/runelite/12/327 | Bin 137 -> 0 bytes .../src/main/resources/runelite/12/327.hash | 1 - client/src/main/resources/runelite/12/3764 | Bin 269 -> 0 bytes .../src/main/resources/runelite/12/3764.hash | 1 - client/src/main/resources/runelite/12/3898 | Bin 436 -> 0 bytes .../src/main/resources/runelite/12/3898.hash | 1 - client/src/main/resources/runelite/12/3899 | Bin 519 -> 0 bytes .../src/main/resources/runelite/12/3899.hash | 1 - client/src/main/resources/runelite/12/39 | Bin 268 -> 0 bytes client/src/main/resources/runelite/12/39.hash | 1 - client/src/main/resources/runelite/12/3900 | Bin 430 -> 0 bytes .../src/main/resources/runelite/12/3900.hash | 1 - client/src/main/resources/runelite/12/395 | Bin 2903 -> 0 bytes .../src/main/resources/runelite/12/395.hash | 1 - client/src/main/resources/runelite/12/396 | Bin 615 -> 0 bytes .../src/main/resources/runelite/12/396.hash | 1 - client/src/main/resources/runelite/12/42 | Bin 489 -> 0 bytes client/src/main/resources/runelite/12/42.hash | 1 - client/src/main/resources/runelite/12/4742 | Bin 233 -> 0 bytes .../src/main/resources/runelite/12/4742.hash | 1 - client/src/main/resources/runelite/12/5517 | Bin 1286 -> 0 bytes .../src/main/resources/runelite/12/5517.hash | 1 - client/src/main/resources/runelite/12/5730 | Bin 1011 -> 0 bytes .../src/main/resources/runelite/12/5730.hash | 1 - client/src/main/resources/runelite/12/6004 | Bin 126 -> 0 bytes .../src/main/resources/runelite/12/6004.hash | 1 - client/src/main/resources/runelite/12/679 | Bin 639 -> 0 bytes .../src/main/resources/runelite/12/679.hash | 1 - client/src/main/resources/runelite/12/681 | Bin 2044 -> 0 bytes .../src/main/resources/runelite/12/681.hash | 1 - client/src/main/resources/runelite/12/73 | Bin 5790 -> 0 bytes client/src/main/resources/runelite/12/73.hash | 1 - client/src/main/resources/runelite/12/806 | Bin 597 -> 0 bytes .../src/main/resources/runelite/12/806.hash | 1 - client/src/main/resources/runelite/12/84 | Bin 13138 -> 0 bytes client/src/main/resources/runelite/12/84.hash | 1 - client/src/main/resources/runelite/12/89 | Bin 4009 -> 0 bytes client/src/main/resources/runelite/12/89.hash | 1 - client/src/main/resources/runelite/12/909 | Bin 3339 -> 0 bytes .../src/main/resources/runelite/12/909.hash | 1 - client/src/main/resources/runelite/12/920 | Bin 1476 -> 0 bytes .../src/main/resources/runelite/12/920.hash | 1 - client/src/main/resources/runelite/index | Bin 148 -> 144 bytes gradle/libs.versions.toml | 2 +- .../java/com/openosrs/injector/Injector.java | 36 +- .../injector/injectors/RSApiInjector.java | 2 +- .../injector/injectors/raw/ScriptVM.java | 161 +- .../src/main/java/mixins/RSClientMixin.java | 130 +- .../java/mixins/RSItemCompositionMixin.java | 4 +- .../java/mixins/RSVarbitCompositionMixin.java | 24 +- .../src/main/java/mixins/RSWidgetMixin.java | 7 + .../src/main/java/mixins/ReflectionMixin.java | 102 - .../src/main/java/mixins/ScriptVMMixin.java | 96 +- mixins/src/main/java/mixins/VarbitMixin.java | 2 +- osrs/src/main/java/AbstractWorldMapData.java | 3 +- .../main/java/ApproximateRouteStrategy.java | 25 +- osrs/src/main/java/ArchiveDiskAction.java | 2 +- osrs/src/main/java/Bounds.java | 4 +- osrs/src/main/java/Buffer.java | 36 +- osrs/src/main/java/Client.java | 231 +- osrs/src/main/java/ClientPacket.java | 97 +- .../main/java/{class518.java => DbTable.java} | 16 +- osrs/src/main/java/FadeOutTask.java | 2 +- osrs/src/main/java/FriendsList.java | 2 +- ...GrandExchangeOfferUnitPriceComparator.java | 6 +- osrs/src/main/java/Interpreter.java | 12 +- osrs/src/main/java/InvDefinition.java | 2 +- osrs/src/main/java/ItemComposition.java | 2 +- osrs/src/main/java/Messages.java | 3 +- osrs/src/main/java/NewShit.java | 2 +- osrs/src/main/java/ObjectSound.java | 10 +- osrs/src/main/java/PacketBufferNode.java | 4 +- osrs/src/main/java/Player.java | 3 +- osrs/src/main/java/PlayerComposition.java | 6 +- osrs/src/main/java/Reflection.java | 161 -- osrs/src/main/java/ReflectionCheck.java | 6 +- osrs/src/main/java/Scene.java | 3 +- osrs/src/main/java/Script.java | 2 +- osrs/src/main/java/ScriptOpcodes.java | 3 + osrs/src/main/java/Skills.java | 2 +- osrs/src/main/java/SoundSystem.java | 2 +- osrs/src/main/java/TextureProvider.java | 10 +- osrs/src/main/java/UrlRequest.java | 3 +- osrs/src/main/java/UserComparator4.java | 6 +- osrs/src/main/java/UserComparator8.java | 4 +- osrs/src/main/java/Widget.java | 2 +- osrs/src/main/java/World.java | 2 +- osrs/src/main/java/WorldMap.java | 6 +- osrs/src/main/java/WorldMapAreaData.java | 4 +- osrs/src/main/java/WorldMapCacheName.java | 6 +- osrs/src/main/java/WorldMapElement.java | 2 +- osrs/src/main/java/WorldMapIcon_0.java | 2 +- osrs/src/main/java/WorldMapLabelSize.java | 4 +- osrs/src/main/java/class10.java | 4 +- osrs/src/main/java/class106.java | 40 +- osrs/src/main/java/class132.java | 4 +- osrs/src/main/java/class145.java | 2 +- osrs/src/main/java/class149.java | 200 +- osrs/src/main/java/class157.java | 1 + osrs/src/main/java/class168.java | 7 +- osrs/src/main/java/class171.java | 7 +- osrs/src/main/java/class172.java | 6 +- osrs/src/main/java/class173.java | 6 +- osrs/src/main/java/class182.java | 5 +- osrs/src/main/java/class184.java | 6 +- osrs/src/main/java/class185.java | 5 +- osrs/src/main/java/class191.java | 5 +- osrs/src/main/java/class195.java | 6 +- osrs/src/main/java/class302.java | 3 +- osrs/src/main/java/class303.java | 8 +- osrs/src/main/java/class314.java | 12 +- osrs/src/main/java/class336.java | 6 +- osrs/src/main/java/class344.java | 2 +- osrs/src/main/java/class350.java | 2 +- osrs/src/main/java/class36.java | 2 +- osrs/src/main/java/class402.java | 2 +- osrs/src/main/java/class404.java | 4 +- osrs/src/main/java/class406.java | 2 +- osrs/src/main/java/class407.java | 76 +- osrs/src/main/java/class59.java | 8 +- osrs/src/main/java/class60.java | 8 +- osrs/src/main/java/class72.java | 2 +- osrs/src/main/java/class90.java | 48 +- osrs/src/main/java/class93.java | 2 +- .../main/java/net/runelite/rs/Reflection.java | 6 +- .../kotlin/meteor/scripts/AssembleScripts.kt | 22 +- .../src/main/scripts/CombatInterfaceSP.hash | 2 +- .../src/main/scripts/CombatInterfaceSP.rs2asm | 7 + scripts/src/main/scripts/CommandScript.hash | 1 - scripts/src/main/scripts/CommandScript.rs2asm | 1084 --------- .../src/main/scripts/ToplevelCompassOp.hash | 1 - .../src/main/scripts/ToplevelCompassOp.rs2asm | 70 - 288 files changed, 4220 insertions(+), 6404 deletions(-) create mode 100644 api-rs/src/main/java/net/runelite/rs/api/RSDbTable.java delete mode 100644 cache/src/main/java/net/runelite/cache/definitions/savers/InterfaceSaver.java delete mode 100644 cache/src/main/java/net/runelite/cache/definitions/savers/ItemSaver.java delete mode 100644 cache/src/main/java/net/runelite/cache/definitions/savers/LocationSaver.java delete mode 100644 cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java delete mode 100644 cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java create mode 100644 cache/src/main/java/net/runelite/cache/script/assembler/rs2asm.interp create mode 100644 cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.interp rename cache/src/main/java/net/runelite/cache/{definitions/savers/MapSaver.java => util/BzStream.java} (53%) create mode 100644 cache/src/main/java/net/runelite/cache/util/LibBZip2.java create mode 100644 client/src/main/java/meteor/api/ClientPacketManager.kt delete mode 100644 client/src/main/resources/runelite/12/10003 delete mode 100644 client/src/main/resources/runelite/12/10004 delete mode 100644 client/src/main/resources/runelite/12/1048 delete mode 100644 client/src/main/resources/runelite/12/1048.hash delete mode 100644 client/src/main/resources/runelite/12/1049 delete mode 100644 client/src/main/resources/runelite/12/1049.hash delete mode 100644 client/src/main/resources/runelite/12/1050 delete mode 100644 client/src/main/resources/runelite/12/1050.hash delete mode 100644 client/src/main/resources/runelite/12/125 delete mode 100644 client/src/main/resources/runelite/12/125.hash delete mode 100644 client/src/main/resources/runelite/12/129 delete mode 100644 client/src/main/resources/runelite/12/129.hash delete mode 100644 client/src/main/resources/runelite/12/1651 delete mode 100644 client/src/main/resources/runelite/12/1651.hash delete mode 100644 client/src/main/resources/runelite/12/2091 delete mode 100644 client/src/main/resources/runelite/12/2091.hash delete mode 100644 client/src/main/resources/runelite/12/223 delete mode 100644 client/src/main/resources/runelite/12/223.hash delete mode 100644 client/src/main/resources/runelite/12/276 delete mode 100644 client/src/main/resources/runelite/12/276.hash delete mode 100644 client/src/main/resources/runelite/12/277 delete mode 100644 client/src/main/resources/runelite/12/277.hash delete mode 100644 client/src/main/resources/runelite/12/279 delete mode 100644 client/src/main/resources/runelite/12/279.hash delete mode 100644 client/src/main/resources/runelite/12/300 delete mode 100644 client/src/main/resources/runelite/12/300.hash delete mode 100644 client/src/main/resources/runelite/12/3238 delete mode 100644 client/src/main/resources/runelite/12/3238.hash delete mode 100644 client/src/main/resources/runelite/12/327 delete mode 100644 client/src/main/resources/runelite/12/327.hash delete mode 100644 client/src/main/resources/runelite/12/3764 delete mode 100644 client/src/main/resources/runelite/12/3764.hash delete mode 100644 client/src/main/resources/runelite/12/3898 delete mode 100644 client/src/main/resources/runelite/12/3898.hash delete mode 100644 client/src/main/resources/runelite/12/3899 delete mode 100644 client/src/main/resources/runelite/12/3899.hash delete mode 100644 client/src/main/resources/runelite/12/39 delete mode 100644 client/src/main/resources/runelite/12/39.hash delete mode 100644 client/src/main/resources/runelite/12/3900 delete mode 100644 client/src/main/resources/runelite/12/3900.hash delete mode 100644 client/src/main/resources/runelite/12/395 delete mode 100644 client/src/main/resources/runelite/12/395.hash delete mode 100644 client/src/main/resources/runelite/12/396 delete mode 100644 client/src/main/resources/runelite/12/396.hash delete mode 100644 client/src/main/resources/runelite/12/42 delete mode 100644 client/src/main/resources/runelite/12/42.hash delete mode 100644 client/src/main/resources/runelite/12/4742 delete mode 100644 client/src/main/resources/runelite/12/4742.hash delete mode 100644 client/src/main/resources/runelite/12/5517 delete mode 100644 client/src/main/resources/runelite/12/5517.hash delete mode 100644 client/src/main/resources/runelite/12/5730 delete mode 100644 client/src/main/resources/runelite/12/5730.hash delete mode 100644 client/src/main/resources/runelite/12/6004 delete mode 100644 client/src/main/resources/runelite/12/6004.hash delete mode 100644 client/src/main/resources/runelite/12/679 delete mode 100644 client/src/main/resources/runelite/12/679.hash delete mode 100644 client/src/main/resources/runelite/12/681 delete mode 100644 client/src/main/resources/runelite/12/681.hash delete mode 100644 client/src/main/resources/runelite/12/73 delete mode 100644 client/src/main/resources/runelite/12/73.hash delete mode 100644 client/src/main/resources/runelite/12/806 delete mode 100644 client/src/main/resources/runelite/12/806.hash delete mode 100644 client/src/main/resources/runelite/12/84 delete mode 100644 client/src/main/resources/runelite/12/84.hash delete mode 100644 client/src/main/resources/runelite/12/89 delete mode 100644 client/src/main/resources/runelite/12/89.hash delete mode 100644 client/src/main/resources/runelite/12/909 delete mode 100644 client/src/main/resources/runelite/12/909.hash delete mode 100644 client/src/main/resources/runelite/12/920 delete mode 100644 client/src/main/resources/runelite/12/920.hash delete mode 100644 mixins/src/main/java/mixins/ReflectionMixin.java rename osrs/src/main/java/{class518.java => DbTable.java} (88%) delete mode 100644 osrs/src/main/java/Reflection.java create mode 100644 osrs/src/main/java/ScriptOpcodes.java delete mode 100644 scripts/src/main/scripts/CommandScript.hash delete mode 100644 scripts/src/main/scripts/CommandScript.rs2asm delete mode 100644 scripts/src/main/scripts/ToplevelCompassOp.hash delete mode 100644 scripts/src/main/scripts/ToplevelCompassOp.rs2asm diff --git a/.gitignore b/.gitignore index a026d3e6e..c266e8cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ injected-client/src/main/java client/src/main/resources/injected-client.jar cache/scripts cache/cache -wix311 \ No newline at end of file +wix311 +/packet-deob/ diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java b/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java index 35950dc60..a0f75ae6d 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSBuffer.java @@ -8,143 +8,196 @@ public interface RSBuffer extends Buffer, RSNode @Import("array") byte[] getPayload(); + @Import("offset") int getOffset(); @Import("offset") void setOffset(int offset); -@Import("readUnsignedByteAdd") -@Override -int readUnsignedByteAdd$api(); - -@Import("readUnsignedByteNeg") -@Override -int readUnsignedByteNeg$api(); - -; - -@Import("readUnsignedByteSub") -@Override -int readUnsignedByteSub$api(); - -@Import("readUnsignedByte") -@Override -int readUnsignedByte$api(); - -@Import("readByte") -@Override -byte readByte$api(); - -@Import("readUnsignedShort") -@Override -int readUnsignedShort$api(); - -@Import("readShort") -@Override -int readShort$api(); @Import("readStringCp1252NullTerminated") -@Override String readString(); -@Import("readShortSmart") -@Override -int readShortSmart$api(); - -@Import("readUShortSmart") -@Override -int readUShortSmart$api(); - -@Import("writeByte") -@Override -void writeByte$api(int i); - -@Import("writeInt") -@Override -void writeInt$api(int i); - -@Import("writeIntLE") -@Override -void writeIntLE$api(int i); - -@Import("writeIntIME") -@Override -void writeIntIME$api(int i); - -@Import("writeIntME") -@Override -void writeIntME$api(int i); - -@Import("writeShortLE") -@Override -void writeShortLE$api(int i); - -@Import("writeShortAdd") -@Override -void writeShortAdd$api(int i); - -@Import("writeShortAddLE") -@Override -void writeShortAddLE$api(int i); - -@Import("readUnsignedShortLE") -@Override -int readUnsignedShortLE$api(); - -@Import("readUnsignedShortAdd") -@Override -int readUnsignedShortAdd$api(); - -@Import("readUnsignedShortAddLE") -@Override -int readUnsignedShortAddLE$api(); - -@Import("readSignedShortAddLE") -@Override -int readSignedShortAddLE$api(); - -@Import("readInt") -@Override -int readInt$api(); - -@Import("readIntLE") -@Override -int readIntLE$api(); - -@Import("readUnsignedByteS") -@Override -int readIntIME(); - -@Import("method2447") -@Override -int readIntME(); - -@Import("writeLong") -@Override -void writeLong$api(long l); - -@Import("writeLongMedium") -@Override -void writeLongMedium$api(long l); - -@Import("writeShort") -@Override -void writeShort$api(int i); - -@Import("writeByteAdd") -@Override -void writeByteAdd$api(int i); - -@Import("writeByteSub") -@Override -void writeByteSub$api(int i); - -@Import("writeByteNeg") -@Override -void writeByteNeg$api(int i); -@Import("writeStringCp1252NullTerminated") -@Override -void writeString(String s); -} \ No newline at end of file + @Import("writeByte") + @Override + void writeByte$api(int p0); + @Import("writeShort") + @Override + void writeShort$api(int p0); + @Import("writeMedium") + @Override + void writeMedium$api(int p0); + @Import("writeInt") + @Override + void writeInt$api(int p0); + @Import("writeLongMedium") + @Override + void writeLongMedium$api(long p0); + @Import("writeLong") + @Override + void writeLong$api(long p0); + @Import("writeBoolean") + @Override + void writeBoolean$api(boolean p0); + @Import("writeStringCp1252NullTerminated") + @Override + void writeStringCp1252NullTerminated$api(String p0); + @Import("writeStringCp1252NullCircumfixed") + @Override + void writeStringCp1252NullCircumfixed$api(String p0); + @Import("writeCESU8") + @Override + void writeCESU8$api(CharSequence p0); + @Import("writeBytes") + @Override + void writeBytes$api(byte[] p0, int p1, int p2); + @Import("writeBuffer") + @Override + void writeBuffer$api(Buffer p0); + @Import("writeLengthInt") + @Override + void writeLengthInt$api(int p0); + @Import("writeLengthShort") + @Override + void writeLengthShort$api(int p0); + @Import("writeLengthByte") + @Override + void writeLengthByte$api(int p0); + @Import("writeSmartByteShort") + @Override + void writeSmartByteShort$api(int p0); + @Import("writeVarInt") + @Override + void writeVarInt$api(int p0); + @Import("readUnsignedByte") + @Override + int readUnsignedByte$api(); + @Import("readByte") + @Override + byte readByte$api(); + @Import("readUnsignedShort") + @Override + int readUnsignedShort$api(); + @Import("readShort") + @Override + int readShort$api(); + @Import("readMedium") + @Override + int readMedium$api(); + @Import("readInt") + @Override + int readInt$api(); + @Import("readLong") + @Override + long readLong$api(); + @Import("readBoolean") + @Override + boolean readBoolean$api(); + @Import("readStringCp1252NullTerminatedOrNull") + @Override + String readStringCp1252NullTerminatedOrNull$api(); + @Import("readStringCp1252NullCircumfixed") + @Override + String readStringCp1252NullCircumfixed$api(); + @Import("readCESUB") + @Override + String readCESUB$api(); + @Import("readBytes") + @Override + void readBytes$api(byte[] p0, int p1, int p2); + @Import("readShortSmart") + @Override + int readShortSmart$api(); + @Import("readUShortSmart") + @Override + int readUShortSmart$api(); + @Import("readShortSmartSub") + @Override + int readShortSmartSub$api(); + @Import("readIncrSmallSmart") + @Override + int readIncrSmallSmart$api(); + @Import("readLargeSmart") + @Override + int readLargeSmart$api(); + @Import("readNullableLargeSmart") + @Override + int readNullableLargeSmart$api(); + @Import("readVarInt") + @Override + int readVarInt$api(); + @Import("writeCrc") + @Override + int writeCrc$api(int p0); + @Import("writeByteAdd") + @Override + void writeByteAdd$api(int p0); + @Import("writeByteNeg") + @Override + void writeByteNeg$api(int p0); + @Import("writeByteSub") + @Override + void writeByteSub$api(int p0); + @Import("readUnsignedByteAdd") + @Override + int readUnsignedByteAdd$api(); + @Import("readUnsignedByteSub") + @Override + int readUnsignedByteSub$api(); + @Import("readUnsignedByteNeg") + @Override + int readUnsignedByteNeg$api(); + @Import("readByteAdd") + @Override + byte readByteAdd$api(); + @Import("readByteNeg") + @Override + byte readByteNeg$api(); + @Import("readByteSub") + @Override + byte readByteSub$api(); + @Import("writeShortAdd") + @Override + void writeShortAdd$api(int p0); + @Import("writeIntME") + @Override + void writeIntME$api(int p0); + @Import("writeShortLE") + @Override + void writeShortLE$api(int p0); + @Import("readUnsignedShortLE") + @Override + int readUnsignedShortLE$api(); + @Import("readUnsignedShortAdd") + @Override + int readUnsignedShortAdd$api(); + @Import("readUnsignedShortAddLE") + @Override + int readUnsignedShortAddLE$api(); + @Import("readShortLE") + @Override + int readShortLE$api(); + @Import("readShortAdd") + @Override + int readShortAdd$api(); + @Import("readShortAddLE") + @Override + int readShortAddLE$api(); + @Import("writeIntIME") + @Override + void writeIntIME$api(int p0); + @Import("writeIntLE") + @Override + void writeIntLE$api(int p0); + @Import("readIntME") + @Override + int readIntME$api(); + @Import("readUnsignedIntIME") + @Override + int readUnsignedIntIME$api(); + @Import("readUnsignedIntME") + @Override + int readUnsignedIntME$api(); +} diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java index 7c653051b..9f2b7336f 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSClient.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSClient.java @@ -26,9 +26,11 @@ import java.math.BigInteger; import java.util.ArrayList; +import java.util.List; import java.util.Map; import net.runelite.api.*; +import net.runelite.api.mixins.Inject; import net.runelite.api.packets.ClientPacket; import net.runelite.api.packets.IsaacCipher; import net.runelite.api.clan.ClanRank; @@ -1530,6 +1532,10 @@ public interface RSClient extends RSGameEngine, Client Unethical */ +/* + @Import("runScriptLogic") + void runScriptLogic(RSScriptEvent ev, RSScript s, int ex, int var2);*/ + @Import("Login_response0") String getLoginResponse0(); @@ -1724,4 +1730,42 @@ public interface RSClient extends RSGameEngine, Client @Import("musicSongs") ArrayList getMusicSongs(); + + @Import("openInterface") + WidgetNode openRSInterface(int componentId, int interfaceId, int modalMode); + @Import("closeInterface") + void closeRSInterface(WidgetNode interfaceNode, boolean unload); + @Construct + RSInterfaceParent newInterfaceParent(); + @Import("runComponentCloseListeners") + void runComponentCloseListeners(Widget[] var0, int var1); + + @Import("e1") + RSEvictingDualNodeHashTable getE1(); + @Import("e2") + RSEvictingDualNodeHashTable getE2(); + @Import("e3") + RSEvictingDualNodeHashTable getE3(); + @Import("e4") + RSEvictingDualNodeHashTable getE4(); + @Import("e5") + RSEvictingDualNodeHashTable getE5(); + @Import("e6") + RSEvictingDualNodeHashTable getE6(); + @Import("e7") + RSEvictingDualNodeHashTable getE7(); + @Import("e8") + RSEvictingDualNodeHashTable getE8(); + @Import("archive4") + RSEvictingDualNodeHashTable getArchive4(); + @Import("archive5") + RSEvictingDualNodeHashTable getArchive5(); + @Import("archive7") + RSEvictingDualNodeHashTable getArchive7(); + @Import("archive11") + RSEvictingDualNodeHashTable getArchive11(); + @Import("getDbTable") + RSDbTable getDbTable(int var0); + + } diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSDbTable.java b/api-rs/src/main/java/net/runelite/rs/api/RSDbTable.java new file mode 100644 index 000000000..dfe8df482 --- /dev/null +++ b/api-rs/src/main/java/net/runelite/rs/api/RSDbTable.java @@ -0,0 +1,10 @@ +package net.runelite.rs.api; + +import java.util.List; +import net.runelite.mapping.Import; + +public interface RSDbTable +{ + @Import("columns") + List getColumns(); +} diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSInterfaceParent.java b/api-rs/src/main/java/net/runelite/rs/api/RSInterfaceParent.java index 76d7909db..e39c38153 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSInterfaceParent.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSInterfaceParent.java @@ -9,7 +9,13 @@ public interface RSInterfaceParent extends RSNode, WidgetNode @Override int getId(); + @Import("group") + void setId(int id); + @Import("type") @Override int getModalMode(); + + @Import("type") + void setModalMode(int modalMode); } diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSNodeHashTable.java b/api-rs/src/main/java/net/runelite/rs/api/RSNodeHashTable.java index e93b47853..0e05ea3bc 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSNodeHashTable.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSNodeHashTable.java @@ -14,4 +14,6 @@ public interface RSNodeHashTable extends HashTable @Import("buckets") RSNode[] getBuckets(); + @Import("put") + void put(RSNode var1, long var2); } diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSWidget.java b/api-rs/src/main/java/net/runelite/rs/api/RSWidget.java index 25bf381ac..06d6903d2 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSWidget.java @@ -488,8 +488,7 @@ public interface RSWidget extends Widget RSWidget setHeightMode(int heightMode); @Import("getFont") - @Override - RSFont getFont(); + RSFont getRSFont(RSWidgetDefinition var1); @Import("fill") @Override diff --git a/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java b/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java index ee06a613e..e126a2301 100644 --- a/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java +++ b/api-rs/src/main/java/net/runelite/rs/api/RSWidgetDefinition.java @@ -16,8 +16,6 @@ public interface RSWidgetDefinition @Import("Widget_cachedModels") RSEvictingDualNodeHashTable getModelsCache(); - @Import("Widget_cachedFonts") - RSEvictingDualNodeHashTable getFontsCache(); @Import("Widget_cachedSpriteMasks") RSEvictingDualNodeHashTable getSpriteMasksCache(); diff --git a/api/src/main/java/net/runelite/api/Buffer.java b/api/src/main/java/net/runelite/api/Buffer.java index 9b3a32f64..b858475cd 100644 --- a/api/src/main/java/net/runelite/api/Buffer.java +++ b/api/src/main/java/net/runelite/api/Buffer.java @@ -2,43 +2,71 @@ public interface Buffer extends Node { - byte[] getPayload(); - int getOffset(); - void writeMediumMiddle$api(int i); - int readUnsignedByteAdd$api(); - int readUnsignedByteNeg$api(); - int readUnsignedByteSub$api(); + byte[] getPayload(); + int getOffset(); + void setOffset(int offset); + String readString(); + void writeByte$api(int p0); + void writeShort$api(int p0); + void writeMedium$api(int p0); + void writeInt$api(int p0); + void writeLongMedium$api(long p0); + void writeLong$api(long p0); + void writeBoolean$api(boolean p0); + void writeStringCp1252NullTerminated$api(String p0); + void writeStringCp1252NullCircumfixed$api(String p0); + void writeCESU8$api(CharSequence p0); + void writeBytes$api(byte[] p0, int p1, int p2); + void writeBuffer$api(Buffer p0); + void writeLengthInt$api(int p0); + void writeLengthShort$api(int p0); + void writeLengthByte$api(int p0); + void writeSmartByteShort$api(int p0); + void writeVarInt$api(int p0); int readUnsignedByte$api(); byte readByte$api(); int readUnsignedShort$api(); int readShort$api(); - String readString(); - - int readSignedShortAddLE$api(); + int readMedium$api(); + int readInt$api(); + long readLong$api(); + boolean readBoolean$api(); + String readStringCp1252NullTerminatedOrNull$api(); + String readStringCp1252NullCircumfixed$api(); + String readCESUB$api(); + void readBytes$api(byte[] p0, int p1, int p2); int readShortSmart$api(); int readUShortSmart$api(); - void writeByte$api(int i); - void writeInt$api(int i); - void writeIntLE$api(int i); - void writeIntIME$api(int i); - void writeIntME$api(int i); - int readInt$api(); - int readIntIME(); - int readIntME(); - int readIntLE$api(); - void writeShortLE$api(int i); - void writeShortAdd$api(int i); - void writeShortAddLE$api(int i); - int readUnsignedShortLE$api(); - int readUnsignedShortAdd$api(); - int readUnsignedShortAddLE$api(); - void writeLong$api(long l); - void writeLongMedium$api(long l); - void writeShort$api(int i); - void writeByteAdd$api(int i); - void writeByteSub$api(int i); - void writeByteNeg$api(int i); - void writeString(String s); -} \ No newline at end of file + int readShortSmartSub$api(); + int readIncrSmallSmart$api(); + int readLargeSmart$api(); + int readNullableLargeSmart$api(); + int readVarInt$api(); + int writeCrc$api(int p0); + void writeByteAdd$api(int p0); + void writeByteNeg$api(int p0); + void writeByteSub$api(int p0); + int readUnsignedByteAdd$api(); + int readUnsignedByteSub$api(); + int readUnsignedByteNeg$api(); + byte readByteAdd$api(); + byte readByteNeg$api(); + byte readByteSub$api(); + void writeShortAdd$api(int p0); + void writeShortAddLE$api(int p0); + void writeShortLE$api(int p0); + int readUnsignedShortLE$api(); + int readUnsignedShortAdd$api(); + int readUnsignedShortAddLE$api(); + int readShortLE$api(); + int readShortAdd$api(); + int readShortAddLE$api(); + void writeIntLE$api(int p0); + void writeIntME$api(int p0); + void writeIntIME$api(int p0); + int readIntME$api(); + int readUnsignedIntIME$api(); + int readUnsignedIntME$api(); +} diff --git a/api/src/main/java/net/runelite/api/Client.java b/api/src/main/java/net/runelite/api/Client.java index 34f7034e0..596991e5b 100644 --- a/api/src/main/java/net/runelite/api/Client.java +++ b/api/src/main/java/net/runelite/api/Client.java @@ -37,6 +37,7 @@ import meteor.Logger; import net.runelite.api.annotations.VarCInt; import net.runelite.api.annotations.Varbit; +import net.runelite.api.mixins.Inject; import net.runelite.api.packets.ClientPacket; import net.runelite.api.packets.IsaacCipher; import net.runelite.api.packets.PacketBufferNode; @@ -53,6 +54,7 @@ import net.runelite.api.widgets.ItemQuantityMode; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; +import net.runelite.api.widgets.WidgetModalMode; import org.intellij.lang.annotations.MagicConstant; /** @@ -2544,8 +2546,9 @@ default void interact(int identifier, int opcode, int param0, int param1, int cl /** * Gets a entry out of a DBTable Row */ - Object getDBTableField(int rowID, int column, int tupleIndex, int fieldIndex); + Object[] getDBTableField(int rowID, int column, int tupleIndex); + List getDBRowsByValue(int rowID, int column, int tupleIndex, Object value); void sendClickPacket(java.awt.Point clickPoint); Boolean getPendingClickPacketOverride(); @@ -2557,4 +2560,7 @@ default void interact(int identifier, int opcode, int param0, int param1, int cl void setPacketOverride(PacketBufferNode packetOverride); void setHost(String host); + void closeInterface(WidgetNode interfaceNode, boolean unload); + WidgetNode openInterface(int componentId, int interfaceId, @MagicConstant(valuesFromClass = WidgetModalMode.class) int modalMode); + } diff --git a/api/src/main/java/net/runelite/api/Item.kt b/api/src/main/java/net/runelite/api/Item.kt index ac8042d57..38ff20a66 100644 --- a/api/src/main/java/net/runelite/api/Item.kt +++ b/api/src/main/java/net/runelite/api/Item.kt @@ -414,6 +414,15 @@ open class Item(private val id : Int = 0, val quantity: Int = 0) : Identifiable, infix fun interact(idx: Int) { invoke(idx) } + // interact predicate based on the args and what arg is on the item + // if the item has the arg, then it will invoke the action + // check if it has action + fun interact(vararg args: String) { + if (hasAction(*args)) { + this.interact(args[0]) + } + } + fun invoke(index: Int) { client.callbacks.post(Events.INTERACT, getMenu(index)?.let { Interact(it) }) diff --git a/api/src/main/kotlin/eventbus/events/IfOpenSubEvent.kt b/api/src/main/kotlin/eventbus/events/IfOpenSubEvent.kt index 7c1c0c7ca..af5aca161 100644 --- a/api/src/main/kotlin/eventbus/events/IfOpenSubEvent.kt +++ b/api/src/main/kotlin/eventbus/events/IfOpenSubEvent.kt @@ -5,7 +5,7 @@ import meteor.Event /** * @author Kris | 24/10/2021 */ -data class IfOpenSubEvent( +data class openInterfaceEvent( val targetComponent: Int, val interfaceId: Int, val walkType: Int diff --git a/api/src/main/kotlin/eventbus/events/ScriptPreFired.kt b/api/src/main/kotlin/eventbus/events/ScriptPreFired.kt index 8e23757a7..695559600 100644 --- a/api/src/main/kotlin/eventbus/events/ScriptPreFired.kt +++ b/api/src/main/kotlin/eventbus/events/ScriptPreFired.kt @@ -30,4 +30,4 @@ import net.runelite.api.ScriptEvent /** * An event that is fired before the designated script is ran */ -class ScriptPreFired(val scriptId: Int, val scriptEvent: ScriptEvent? = null) : Event() \ No newline at end of file +data class ScriptPreFired(val scriptId: Int, val scriptEvent: ScriptEvent? = null) : Event() \ No newline at end of file diff --git a/cache/build.gradle.kts b/cache/build.gradle.kts index f85fa06c9..b963da9ad 100644 --- a/cache/build.gradle.kts +++ b/cache/build.gradle.kts @@ -38,6 +38,7 @@ dependencies { compileOnly(projects.http) with(libs) { + implementation(jna) annotationProcessor(lombok) compileOnly(lombok) implementation(gson) diff --git a/cache/src/main/java/net/runelite/cache/AreaManager.java b/cache/src/main/java/net/runelite/cache/AreaManager.java index 96967b84b..fc9abd8fe 100644 --- a/cache/src/main/java/net/runelite/cache/AreaManager.java +++ b/cache/src/main/java/net/runelite/cache/AreaManager.java @@ -24,19 +24,15 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.AreaDefinition; +import net.runelite.cache.definitions.loaders.AreaLoader; +import net.runelite.cache.fs.*; + import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.runelite.cache.definitions.AreaDefinition; -import net.runelite.cache.definitions.loaders.AreaLoader; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; public class AreaManager { diff --git a/cache/src/main/java/net/runelite/cache/Cache.java b/cache/src/main/java/net/runelite/cache/Cache.java index 96e9b6bc7..5b109006e 100644 --- a/cache/src/main/java/net/runelite/cache/Cache.java +++ b/cache/src/main/java/net/runelite/cache/Cache.java @@ -24,14 +24,11 @@ */ package net.runelite.cache; +import net.runelite.cache.fs.Store; +import org.apache.commons.cli.*; + import java.io.File; import java.io.IOException; -import net.runelite.cache.fs.Store; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; public class Cache { diff --git a/cache/src/main/java/net/runelite/cache/DBRowManager.java b/cache/src/main/java/net/runelite/cache/DBRowManager.java index 22c577f0c..749f7baa1 100644 --- a/cache/src/main/java/net/runelite/cache/DBRowManager.java +++ b/cache/src/main/java/net/runelite/cache/DBRowManager.java @@ -24,19 +24,15 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.DBRowDefinition; +import net.runelite.cache.definitions.loaders.DBRowLoader; +import net.runelite.cache.fs.*; + import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.runelite.cache.definitions.DBRowDefinition; -import net.runelite.cache.definitions.loaders.DBRowLoader; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; public class DBRowManager { diff --git a/cache/src/main/java/net/runelite/cache/DBTableIndexManager.java b/cache/src/main/java/net/runelite/cache/DBTableIndexManager.java index f78dfab0c..5287b8e6e 100644 --- a/cache/src/main/java/net/runelite/cache/DBTableIndexManager.java +++ b/cache/src/main/java/net/runelite/cache/DBTableIndexManager.java @@ -24,19 +24,15 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.DBTableIndex; +import net.runelite.cache.definitions.loaders.DBTableIndexLoader; +import net.runelite.cache.fs.*; + import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.runelite.cache.definitions.DBTableIndex; -import net.runelite.cache.definitions.loaders.DBTableIndexLoader; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; public class DBTableIndexManager { diff --git a/cache/src/main/java/net/runelite/cache/DBTableManager.java b/cache/src/main/java/net/runelite/cache/DBTableManager.java index ecf4dd478..b4e004d54 100644 --- a/cache/src/main/java/net/runelite/cache/DBTableManager.java +++ b/cache/src/main/java/net/runelite/cache/DBTableManager.java @@ -24,19 +24,15 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.DBTableDefinition; +import net.runelite.cache.definitions.loaders.DBTableLoader; +import net.runelite.cache.fs.*; + import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.runelite.cache.definitions.DBTableDefinition; -import net.runelite.cache.definitions.loaders.DBTableLoader; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; public class DBTableManager { diff --git a/cache/src/main/java/net/runelite/cache/HeightMapDumper.java b/cache/src/main/java/net/runelite/cache/HeightMapDumper.java index 1e855754e..d65ca1d5f 100644 --- a/cache/src/main/java/net/runelite/cache/HeightMapDumper.java +++ b/cache/src/main/java/net/runelite/cache/HeightMapDumper.java @@ -24,9 +24,6 @@ */ package net.runelite.cache; -import java.awt.Color; -import java.awt.image.BufferedImage; -import java.io.IOException; import net.runelite.cache.fs.Store; import net.runelite.cache.region.Region; import net.runelite.cache.region.RegionLoader; @@ -34,6 +31,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.IOException; + public class HeightMapDumper { private static final Logger logger = LoggerFactory.getLogger(HeightMapDumper.class); diff --git a/cache/src/main/java/net/runelite/cache/InterfaceManager.java b/cache/src/main/java/net/runelite/cache/InterfaceManager.java index ccfcfedd3..bfb9da798 100644 --- a/cache/src/main/java/net/runelite/cache/InterfaceManager.java +++ b/cache/src/main/java/net/runelite/cache/InterfaceManager.java @@ -24,20 +24,16 @@ */ package net.runelite.cache; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; import net.runelite.cache.definitions.InterfaceDefinition; import net.runelite.cache.definitions.exporters.InterfaceExporter; import net.runelite.cache.definitions.loaders.InterfaceLoader; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; +import net.runelite.cache.fs.*; import net.runelite.cache.util.Namer; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; + public class InterfaceManager { private final Store store; diff --git a/cache/src/main/java/net/runelite/cache/InventoryManager.java b/cache/src/main/java/net/runelite/cache/InventoryManager.java index 772d48b1a..588272e7b 100644 --- a/cache/src/main/java/net/runelite/cache/InventoryManager.java +++ b/cache/src/main/java/net/runelite/cache/InventoryManager.java @@ -24,18 +24,14 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.InventoryDefinition; +import net.runelite.cache.definitions.loaders.InventoryLoader; +import net.runelite.cache.fs.*; + import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.runelite.cache.definitions.InventoryDefinition; -import net.runelite.cache.definitions.loaders.InventoryLoader; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; public class InventoryManager { diff --git a/cache/src/main/java/net/runelite/cache/ItemManager.java b/cache/src/main/java/net/runelite/cache/ItemManager.java index 8e05bc80e..e54d3f209 100644 --- a/cache/src/main/java/net/runelite/cache/ItemManager.java +++ b/cache/src/main/java/net/runelite/cache/ItemManager.java @@ -24,23 +24,19 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.ItemDefinition; +import net.runelite.cache.definitions.exporters.ItemExporter; +import net.runelite.cache.definitions.loaders.ItemLoader; +import net.runelite.cache.definitions.providers.ItemProvider; +import net.runelite.cache.fs.*; +import net.runelite.cache.util.IDClass; + import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.runelite.cache.definitions.ItemDefinition; -import net.runelite.cache.definitions.exporters.ItemExporter; -import net.runelite.cache.definitions.loaders.ItemLoader; -import net.runelite.cache.definitions.providers.ItemProvider; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; -import net.runelite.cache.util.IDClass; public class ItemManager implements ItemProvider { diff --git a/cache/src/main/java/net/runelite/cache/MapImageDumper.java b/cache/src/main/java/net/runelite/cache/MapImageDumper.java index 83b7d5a42..7b52b1d09 100644 --- a/cache/src/main/java/net/runelite/cache/MapImageDumper.java +++ b/cache/src/main/java/net/runelite/cache/MapImageDumper.java @@ -24,36 +24,15 @@ */ package net.runelite.cache; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.imageio.ImageIO; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import lombok.extern.slf4j.Slf4j; -import net.runelite.cache.definitions.AreaDefinition; -import net.runelite.cache.definitions.ObjectDefinition; -import net.runelite.cache.definitions.OverlayDefinition; -import net.runelite.cache.definitions.SpriteDefinition; -import net.runelite.cache.definitions.UnderlayDefinition; +import net.runelite.cache.definitions.*; import net.runelite.cache.definitions.loaders.OverlayLoader; import net.runelite.cache.definitions.loaders.SpriteLoader; import net.runelite.cache.definitions.loaders.UnderlayLoader; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; +import net.runelite.cache.fs.*; import net.runelite.cache.item.RSTextureProvider; import net.runelite.cache.models.JagexColor; import net.runelite.cache.region.Location; @@ -63,12 +42,16 @@ import net.runelite.cache.util.BigBufferedImage; import net.runelite.cache.util.KeyProvider; import net.runelite.cache.util.XteaKeyManager; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.*; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.List; +import java.util.*; @Slf4j @Accessors(chain = true) diff --git a/cache/src/main/java/net/runelite/cache/NpcManager.java b/cache/src/main/java/net/runelite/cache/NpcManager.java index b59c533b5..151ae6661 100644 --- a/cache/src/main/java/net/runelite/cache/NpcManager.java +++ b/cache/src/main/java/net/runelite/cache/NpcManager.java @@ -24,22 +24,18 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.NpcDefinition; +import net.runelite.cache.definitions.exporters.NpcExporter; +import net.runelite.cache.definitions.loaders.NpcLoader; +import net.runelite.cache.fs.*; +import net.runelite.cache.util.IDClass; + import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.runelite.cache.definitions.NpcDefinition; -import net.runelite.cache.definitions.exporters.NpcExporter; -import net.runelite.cache.definitions.loaders.NpcLoader; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; -import net.runelite.cache.util.IDClass; public class NpcManager { diff --git a/cache/src/main/java/net/runelite/cache/ObjectManager.java b/cache/src/main/java/net/runelite/cache/ObjectManager.java index ba39ae923..9504cd877 100644 --- a/cache/src/main/java/net/runelite/cache/ObjectManager.java +++ b/cache/src/main/java/net/runelite/cache/ObjectManager.java @@ -24,22 +24,18 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.ObjectDefinition; +import net.runelite.cache.definitions.exporters.ObjectExporter; +import net.runelite.cache.definitions.loaders.ObjectLoader; +import net.runelite.cache.fs.*; +import net.runelite.cache.util.IDClass; + import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.runelite.cache.definitions.ObjectDefinition; -import net.runelite.cache.definitions.exporters.ObjectExporter; -import net.runelite.cache.definitions.loaders.ObjectLoader; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; -import net.runelite.cache.util.IDClass; public class ObjectManager { diff --git a/cache/src/main/java/net/runelite/cache/OverlayManager.java b/cache/src/main/java/net/runelite/cache/OverlayManager.java index 6940227c0..c0b3f6d79 100644 --- a/cache/src/main/java/net/runelite/cache/OverlayManager.java +++ b/cache/src/main/java/net/runelite/cache/OverlayManager.java @@ -24,20 +24,16 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.OverlayDefinition; +import net.runelite.cache.definitions.loaders.OverlayLoader; +import net.runelite.cache.definitions.providers.OverlayProvider; +import net.runelite.cache.fs.*; + import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.runelite.cache.definitions.OverlayDefinition; -import net.runelite.cache.definitions.loaders.OverlayLoader; -import net.runelite.cache.definitions.providers.OverlayProvider; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; public class OverlayManager implements OverlayProvider { diff --git a/cache/src/main/java/net/runelite/cache/SpriteManager.java b/cache/src/main/java/net/runelite/cache/SpriteManager.java index a18dd4f6b..a5b854da7 100644 --- a/cache/src/main/java/net/runelite/cache/SpriteManager.java +++ b/cache/src/main/java/net/runelite/cache/SpriteManager.java @@ -26,11 +26,6 @@ import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.util.Collection; -import java.util.Collections; import net.runelite.cache.definitions.SpriteDefinition; import net.runelite.cache.definitions.exporters.SpriteExporter; import net.runelite.cache.definitions.loaders.SpriteLoader; @@ -40,6 +35,12 @@ import net.runelite.cache.fs.Storage; import net.runelite.cache.fs.Store; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.Collections; + public class SpriteManager implements SpriteProvider { private final Store store; diff --git a/cache/src/main/java/net/runelite/cache/StructManager.java b/cache/src/main/java/net/runelite/cache/StructManager.java index bd816a4ab..77e2894da 100644 --- a/cache/src/main/java/net/runelite/cache/StructManager.java +++ b/cache/src/main/java/net/runelite/cache/StructManager.java @@ -24,19 +24,15 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.StructDefinition; +import net.runelite.cache.definitions.loaders.StructLoader; +import net.runelite.cache.definitions.providers.StructProvider; +import net.runelite.cache.fs.*; + import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.runelite.cache.definitions.StructDefinition; -import net.runelite.cache.definitions.loaders.StructLoader; -import net.runelite.cache.definitions.providers.StructProvider; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; public class StructManager implements StructProvider { diff --git a/cache/src/main/java/net/runelite/cache/TextureManager.java b/cache/src/main/java/net/runelite/cache/TextureManager.java index 9eeb3504f..0b01d4753 100644 --- a/cache/src/main/java/net/runelite/cache/TextureManager.java +++ b/cache/src/main/java/net/runelite/cache/TextureManager.java @@ -24,18 +24,14 @@ */ package net.runelite.cache; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import net.runelite.cache.definitions.TextureDefinition; import net.runelite.cache.definitions.loaders.TextureLoader; import net.runelite.cache.definitions.providers.TextureProvider; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; +import net.runelite.cache.fs.*; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; public class TextureManager implements TextureProvider { diff --git a/cache/src/main/java/net/runelite/cache/UnderlayManager.java b/cache/src/main/java/net/runelite/cache/UnderlayManager.java index 3bba2230a..64d39cc3b 100644 --- a/cache/src/main/java/net/runelite/cache/UnderlayManager.java +++ b/cache/src/main/java/net/runelite/cache/UnderlayManager.java @@ -24,20 +24,16 @@ */ package net.runelite.cache; +import net.runelite.cache.definitions.UnderlayDefinition; +import net.runelite.cache.definitions.loaders.UnderlayLoader; +import net.runelite.cache.definitions.providers.UnderlayProvider; +import net.runelite.cache.fs.*; + import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.runelite.cache.definitions.UnderlayDefinition; -import net.runelite.cache.definitions.loaders.UnderlayLoader; -import net.runelite.cache.definitions.providers.UnderlayProvider; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.ArchiveFiles; -import net.runelite.cache.fs.FSFile; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; public class UnderlayManager implements UnderlayProvider { diff --git a/cache/src/main/java/net/runelite/cache/definitions/DBTableIndex.java b/cache/src/main/java/net/runelite/cache/definitions/DBTableIndex.java index c0afdedfe..d36002e26 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/DBTableIndex.java +++ b/cache/src/main/java/net/runelite/cache/definitions/DBTableIndex.java @@ -24,11 +24,12 @@ */ package net.runelite.cache.definitions; -import java.util.List; -import java.util.Map; import lombok.Data; import net.runelite.cache.util.BaseVarType; +import java.util.List; +import java.util.Map; + @Data public class DBTableIndex { diff --git a/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java index 11eb6bef2..2ace7c46d 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java @@ -24,9 +24,10 @@ */ package net.runelite.cache.definitions; -import java.util.Map; import lombok.Data; +import java.util.Map; + @Data public class ItemDefinition { diff --git a/cache/src/main/java/net/runelite/cache/definitions/LocationsDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/LocationsDefinition.java index 435cdd474..c84cf5f35 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/LocationsDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/LocationsDefinition.java @@ -24,11 +24,12 @@ */ package net.runelite.cache.definitions; -import java.util.ArrayList; -import java.util.List; import lombok.Data; import net.runelite.cache.region.Location; +import java.util.ArrayList; +import java.util.List; + @Data public class LocationsDefinition { diff --git a/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java index 939fdf90d..5ba4c115b 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java @@ -1,11 +1,12 @@ package net.runelite.cache.definitions; -import java.util.Arrays; import lombok.Data; import net.runelite.cache.models.CircularAngle; import net.runelite.cache.models.FaceNormal; import net.runelite.cache.models.VertexNormal; +import java.util.Arrays; + @Data public class ModelDefinition { @@ -151,119 +152,133 @@ else if (var15 == 1) } } - /** - * Computes the UV coordinates for every three-vertex face that has a - * texture. - */ public void computeTextureUVCoordinates() { this.faceTextureUCoordinates = new float[faceCount][]; this.faceTextureVCoordinates = new float[faceCount][]; + if (faceTextures == null) + { + return; + } + for (int i = 0; i < faceCount; i++) { - int textureCoordinate; - if (textureCoords == null) + if (faceTextures[i] == -1) { - textureCoordinate = -1; - } - else - { - textureCoordinate = textureCoords[i]; + continue; } - int textureIdx; - if (faceTextures == null) + float u0, u1, u2, v0, v1, v2; + + if (textureCoords != null && textureCoords[i] != -1) { - textureIdx = -1; + int tfaceIdx = textureCoords[i] & 0xff; + int triangleA = faceIndices1[i]; + int triangleB = faceIndices2[i]; + int triangleC = faceIndices3[i]; + int texA = texIndices1[tfaceIdx]; + int texB = texIndices2[tfaceIdx]; + int texC = texIndices3[tfaceIdx]; + + // v1 = vertex[texA] + float v1x = (float) vertexX[texA]; + float v1y = (float) vertexY[texA]; + float v1z = (float) vertexZ[texA]; + // v2 = vertex[texB] - v1 + float v2x = (float) vertexX[texB] - v1x; + float v2y = (float) vertexY[texB] - v1y; + float v2z = (float) vertexZ[texB] - v1z; + // v3 = vertex[texC] - v1 + float v3x = (float) vertexX[texC] - v1x; + float v3y = (float) vertexY[texC] - v1y; + float v3z = (float) vertexZ[texC] - v1z; + + // v4 = vertex[triangleA] - v1 + float v4x = (float) vertexX[triangleA] - v1x; + float v4y = (float) vertexY[triangleA] - v1y; + float v4z = (float) vertexZ[triangleA] - v1z; + // v5 = vertex[triangleB] - v1 + float v5x = (float) vertexX[triangleB] - v1x; + float v5y = (float) vertexY[triangleB] - v1y; + float v5z = (float) vertexZ[triangleB] - v1z; + // v6 = vertex[triangleC] - v1 + float v6x = (float) vertexX[triangleC] - v1x; + float v6y = (float) vertexY[triangleC] - v1y; + float v6z = (float) vertexZ[triangleC] - v1z; + + // v7 = v2 x v3 + float v7x = v2y * v3z - v2z * v3y; + float v7y = v2z * v3x - v2x * v3z; + float v7z = v2x * v3y - v2y * v3x; + + // v8 = v3 x v7 + float v8x = v3y * v7z - v3z * v7y; + float v8y = v3z * v7x - v3x * v7z; + float v8z = v3x * v7y - v3y * v7x; + + // f = 1 / (v8 â‹… v2) + float f = 1.0F / (v8x * v2x + v8y * v2y + v8z * v2z); + + // u0 = (v8 â‹… v4) * f + u0 = (v8x * v4x + v8y * v4y + v8z * v4z) * f; + // u1 = (v8 â‹… v5) * f + u1 = (v8x * v5x + v8y * v5y + v8z * v5z) * f; + // u2 = (v8 â‹… v6) * f + u2 = (v8x * v6x + v8y * v6y + v8z * v6z) * f; + + // v8 = v2 x v7 + v8x = v2y * v7z - v2z * v7y; + v8y = v2z * v7x - v2x * v7z; + v8z = v2x * v7y - v2y * v7x; + + // f = 1 / (v8 â‹… v3) + f = 1.0F / (v8x * v3x + v8y * v3y + v8z * v3z); + + // v0 = (v8 â‹… v4) * f + v0 = (v8x * v4x + v8y * v4y + v8z * v4z) * f; + // v1 = (v8 â‹… v5) * f + v1 = (v8x * v5x + v8y * v5y + v8z * v5z) * f; + // v2 = (v8 â‹… v6) * f + v2 = (v8x * v6x + v8y * v6y + v8z * v6z) * f; } else { - textureIdx = faceTextures[i] & 0xFFFF; + // Without a texture face, the client assigns tex = triangle, but the resulting + // calculations can be reduced: + // + // v1 = vertex[texA] + // v2 = vertex[texB] - v1 + // v3 = vertex[texC] - v1 + // + // v4 = 0 + // v5 = v2 + // v6 = v3 + // + // v7 = v2 x v3 + // + // v8 = v3 x v7 + // u0 = (v8 . v4) / (v8 . v2) // 0 because v4 is 0 + // u1 = (v8 . v5) / (v8 . v2) // 1 because v5=v2 + // u2 = (v8 . v6) / (v8 . v2) // 0 because v8 is perpendicular to v3/v6 + // + // v8 = v2 x v7 + // v0 = (v8 . v4) / (v8 â‹… v3) // 0 because v4 is 0 + // v1 = (v8 . v5) / (v8 â‹… v3) // 0 because v8 is perpendicular to v5/v2 + // v2 = (v8 . v6) / (v8 â‹… v3) // 1 because v6=v3 + + u0 = 0f; + v0 = 0f; + + u1 = 1f; + v1 = 0f; + + u2 = 0f; + v2 = 1f; } - if (textureIdx != -1) - { - float[] u = new float[3]; - float[] v = new float[3]; - - if (textureCoordinate == -1) - { - u[0] = 0.0F; - v[0] = 1.0F; - - u[1] = 1.0F; - v[1] = 1.0F; - - u[2] = 0.0F; - v[2] = 0.0F; - } - else - { - textureCoordinate &= 0xFF; - - byte textureRenderType = 0; - if (textureRenderTypes != null) - { - textureRenderType = textureRenderTypes[textureCoordinate]; - } - - if (textureRenderType == 0) - { - int faceVertexIdx1 = faceIndices1[i]; - int faceVertexIdx2 = faceIndices2[i]; - int faceVertexIdx3 = faceIndices3[i]; - - short triangleVertexIdx1 = texIndices1[textureCoordinate]; - short triangleVertexIdx2 = texIndices2[textureCoordinate]; - short triangleVertexIdx3 = texIndices3[textureCoordinate]; - - float triangleX = (float) vertexX[triangleVertexIdx1]; - float triangleY = (float) vertexY[triangleVertexIdx1]; - float triangleZ = (float) vertexZ[triangleVertexIdx1]; - - float f_882_ = (float) vertexX[triangleVertexIdx2] - triangleX; - float f_883_ = (float) vertexY[triangleVertexIdx2] - triangleY; - float f_884_ = (float) vertexZ[triangleVertexIdx2] - triangleZ; - float f_885_ = (float) vertexX[triangleVertexIdx3] - triangleX; - float f_886_ = (float) vertexY[triangleVertexIdx3] - triangleY; - float f_887_ = (float) vertexZ[triangleVertexIdx3] - triangleZ; - float f_888_ = (float) vertexX[faceVertexIdx1] - triangleX; - float f_889_ = (float) vertexY[faceVertexIdx1] - triangleY; - float f_890_ = (float) vertexZ[faceVertexIdx1] - triangleZ; - float f_891_ = (float) vertexX[faceVertexIdx2] - triangleX; - float f_892_ = (float) vertexY[faceVertexIdx2] - triangleY; - float f_893_ = (float) vertexZ[faceVertexIdx2] - triangleZ; - float f_894_ = (float) vertexX[faceVertexIdx3] - triangleX; - float f_895_ = (float) vertexY[faceVertexIdx3] - triangleY; - float f_896_ = (float) vertexZ[faceVertexIdx3] - triangleZ; - - float f_897_ = f_883_ * f_887_ - f_884_ * f_886_; - float f_898_ = f_884_ * f_885_ - f_882_ * f_887_; - float f_899_ = f_882_ * f_886_ - f_883_ * f_885_; - float f_900_ = f_886_ * f_899_ - f_887_ * f_898_; - float f_901_ = f_887_ * f_897_ - f_885_ * f_899_; - float f_902_ = f_885_ * f_898_ - f_886_ * f_897_; - float f_903_ = 1.0F / (f_900_ * f_882_ + f_901_ * f_883_ + f_902_ * f_884_); - - u[0] = (f_900_ * f_888_ + f_901_ * f_889_ + f_902_ * f_890_) * f_903_; - u[1] = (f_900_ * f_891_ + f_901_ * f_892_ + f_902_ * f_893_) * f_903_; - u[2] = (f_900_ * f_894_ + f_901_ * f_895_ + f_902_ * f_896_) * f_903_; - - f_900_ = f_883_ * f_899_ - f_884_ * f_898_; - f_901_ = f_884_ * f_897_ - f_882_ * f_899_; - f_902_ = f_882_ * f_898_ - f_883_ * f_897_; - f_903_ = 1.0F / (f_900_ * f_885_ + f_901_ * f_886_ + f_902_ * f_887_); - - v[0] = (f_900_ * f_888_ + f_901_ * f_889_ + f_902_ * f_890_) * f_903_; - v[1] = (f_900_ * f_891_ + f_901_ * f_892_ + f_902_ * f_893_) * f_903_; - v[2] = (f_900_ * f_894_ + f_901_ * f_895_ + f_902_ * f_896_) * f_903_; - } - } - - this.faceTextureUCoordinates[i] = u; - this.faceTextureVCoordinates[i] = v; - } + this.faceTextureUCoordinates[i] = new float[]{u0, u1, u2}; + this.faceTextureVCoordinates[i] = new float[]{v0, v1, v2}; } } diff --git a/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java index c700a64f4..14c552aa0 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java @@ -25,9 +25,10 @@ package net.runelite.cache.definitions; -import java.util.Map; import lombok.Data; +import java.util.Map; + @Data public class NpcDefinition { diff --git a/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java index 0bea8f3ed..4ec875bfd 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java @@ -25,9 +25,10 @@ package net.runelite.cache.definitions; -import java.util.Map; import lombok.Data; +import java.util.Map; + @Data public class ObjectDefinition { @@ -43,7 +44,7 @@ public class ObjectDefinition private short[] textureToReplace; private int sizeX = 1; private int sizeY = 1; - private int anInt2083 = 0; + private int ambientSoundDistance = 0; private int[] ambientSoundIds; private int offsetX = 0; private boolean mergeNormals = false; @@ -73,8 +74,8 @@ public class ObjectDefinition private int varpID = -1; private int ambientSoundId = -1; private boolean aBool2111 = false; - private int anInt2112 = 0; - private int anInt2113 = 0; + private int ambientSoundChangeTicksMin = 0; + private int ambientSoundChangeTicksMax = 0; private boolean blocksProjectile = true; private boolean randomizeAnimStart; private Map params = null; diff --git a/cache/src/main/java/net/runelite/cache/definitions/ScriptDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ScriptDefinition.java index cb57851b8..241ba0755 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/ScriptDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/ScriptDefinition.java @@ -24,9 +24,10 @@ */ package net.runelite.cache.definitions; -import java.util.Map; import lombok.Data; +import java.util.Map; + @Data public class ScriptDefinition { diff --git a/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java index ff97ae6c6..ec66a9524 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java @@ -24,9 +24,10 @@ */ package net.runelite.cache.definitions; -import java.util.Map; import lombok.Data; +import java.util.Map; + @Data public class SequenceDefinition { diff --git a/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java index 455ce9ea5..c94bda2e6 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java @@ -24,9 +24,10 @@ */ package net.runelite.cache.definitions; -import java.util.Map; import lombok.Data; +import java.util.Map; + @Data public class StructDefinition { diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java index 30c61f73b..2a0aee3e4 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java @@ -24,10 +24,11 @@ */ package net.runelite.cache.definitions; -import java.util.List; import lombok.Data; import net.runelite.cache.region.Position; +import java.util.List; + @Data public class WorldMapDefinition { diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/InterfaceExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/InterfaceExporter.java index b1020b9a5..06ad2bd53 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/exporters/InterfaceExporter.java +++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/InterfaceExporter.java @@ -26,10 +26,11 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import net.runelite.cache.definitions.InterfaceDefinition; + import java.io.File; import java.io.FileWriter; import java.io.IOException; -import net.runelite.cache.definitions.InterfaceDefinition; public class InterfaceExporter { diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/ItemExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/ItemExporter.java index 5dddff97e..b6a61e4f7 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/exporters/ItemExporter.java +++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/ItemExporter.java @@ -26,10 +26,11 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import net.runelite.cache.definitions.ItemDefinition; + import java.io.File; import java.io.FileWriter; import java.io.IOException; -import net.runelite.cache.definitions.ItemDefinition; public class ItemExporter { diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/NpcExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/NpcExporter.java index eec1be340..fa39c69dd 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/exporters/NpcExporter.java +++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/NpcExporter.java @@ -26,10 +26,11 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import net.runelite.cache.definitions.NpcDefinition; + import java.io.File; import java.io.FileWriter; import java.io.IOException; -import net.runelite.cache.definitions.NpcDefinition; public class NpcExporter { diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/ObjectExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/ObjectExporter.java index 994bff625..c29d8b35a 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/exporters/ObjectExporter.java +++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/ObjectExporter.java @@ -26,10 +26,11 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import net.runelite.cache.definitions.ObjectDefinition; + import java.io.File; import java.io.FileWriter; import java.io.IOException; -import net.runelite.cache.definitions.ObjectDefinition; public class ObjectExporter { diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/SpriteExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/SpriteExporter.java index 9c073d5e3..143085d63 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/exporters/SpriteExporter.java +++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/SpriteExporter.java @@ -24,11 +24,12 @@ */ package net.runelite.cache.definitions.exporters; +import net.runelite.cache.definitions.SpriteDefinition; + +import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import javax.imageio.ImageIO; -import net.runelite.cache.definitions.SpriteDefinition; public class SpriteExporter { diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/DBTableIndexLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/DBTableIndexLoader.java index ba1ff1749..a016996fa 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/DBTableIndexLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/DBTableIndexLoader.java @@ -24,13 +24,14 @@ */ package net.runelite.cache.definitions.loaders; +import net.runelite.cache.definitions.DBTableIndex; +import net.runelite.cache.io.InputStream; +import net.runelite.cache.util.BaseVarType; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import net.runelite.cache.definitions.DBTableIndex; -import net.runelite.cache.io.InputStream; -import net.runelite.cache.util.BaseVarType; public class DBTableIndexLoader { diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java index 69db420f9..aaadcb576 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java @@ -24,13 +24,14 @@ */ package net.runelite.cache.definitions.loaders; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import net.runelite.cache.definitions.ClientScript1Instruction; import net.runelite.cache.definitions.InterfaceDefinition; import net.runelite.cache.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class InterfaceLoader { public InterfaceDefinition load(int id, byte[] b) diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java index 3eedd23ba..a11447131 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java @@ -25,12 +25,13 @@ package net.runelite.cache.definitions.loaders; -import java.util.HashMap; import net.runelite.cache.definitions.ItemDefinition; import net.runelite.cache.io.InputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.HashMap; + public class ItemLoader { private static final Logger logger = LoggerFactory.getLogger(ItemLoader.class); diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/MapLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/MapLoader.java index 340b9bd39..eb0034881 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/MapLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/MapLoader.java @@ -27,9 +27,8 @@ import net.runelite.cache.definitions.MapDefinition; import net.runelite.cache.definitions.MapDefinition.Tile; import net.runelite.cache.io.InputStream; -import static net.runelite.cache.region.Region.X; -import static net.runelite.cache.region.Region.Y; -import static net.runelite.cache.region.Region.Z; + +import static net.runelite.cache.region.Region.*; public class MapLoader { diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java index 62016b852..16f36c6d1 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java @@ -24,13 +24,14 @@ */ package net.runelite.cache.definitions.loaders; -import java.util.HashMap; import lombok.Data; import lombok.experimental.Accessors; import lombok.extern.slf4j.Slf4j; import net.runelite.cache.definitions.NpcDefinition; import net.runelite.cache.io.InputStream; +import java.util.HashMap; + @Accessors(chain = true) @Data @Slf4j diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java index 157234e01..fbaafd1c0 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java @@ -24,13 +24,14 @@ */ package net.runelite.cache.definitions.loaders; -import java.util.HashMap; -import java.util.Map; import net.runelite.cache.definitions.ObjectDefinition; import net.runelite.cache.io.InputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.HashMap; +import java.util.Map; + public class ObjectLoader { private static final Logger logger = LoggerFactory.getLogger(ObjectLoader.class); @@ -285,22 +286,22 @@ else if (opcode == 77) else if (opcode == 78) { def.setAmbientSoundId(is.readUnsignedShort()); - def.setAnInt2083(is.readUnsignedByte()); + def.setAmbientSoundDistance(is.readUnsignedByte()); } else if (opcode == 79) { - def.setAnInt2112(is.readUnsignedShort()); - def.setAnInt2113(is.readUnsignedShort()); - def.setAnInt2083(is.readUnsignedByte()); + def.setAmbientSoundChangeTicksMin(is.readUnsignedShort()); + def.setAmbientSoundChangeTicksMax(is.readUnsignedShort()); + def.setAmbientSoundDistance(is.readUnsignedByte()); int length = is.readUnsignedByte(); - int[] anIntArray2084 = new int[length]; + int[] ambientSoundIds = new int[length]; for (int index = 0; index < length; ++index) { - anIntArray2084[index] = is.readUnsignedShort(); + ambientSoundIds[index] = is.readUnsignedShort(); } - def.setAmbientSoundIds(anIntArray2084); + def.setAmbientSoundIds(ambientSoundIds); } else if (opcode == 81) { diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java index 0762bdfff..82fbcbca5 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java @@ -24,14 +24,13 @@ */ package net.runelite.cache.definitions.loaders; -import java.util.LinkedHashMap; -import java.util.Map; import net.runelite.cache.definitions.ScriptDefinition; import net.runelite.cache.io.InputStream; -import static net.runelite.cache.script.Opcodes.SCONST; -import static net.runelite.cache.script.Opcodes.POP_INT; -import static net.runelite.cache.script.Opcodes.POP_STRING; -import static net.runelite.cache.script.Opcodes.RETURN; + +import java.util.LinkedHashMap; +import java.util.Map; + +import static net.runelite.cache.script.Opcodes.*; public class ScriptLoader { diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/SequenceLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/SequenceLoader.java index 41e218b4d..9dd1c7e07 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/SequenceLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/SequenceLoader.java @@ -24,10 +24,11 @@ */ package net.runelite.cache.definitions.loaders; -import java.util.HashMap; import net.runelite.cache.definitions.SequenceDefinition; import net.runelite.cache.io.InputStream; +import java.util.HashMap; + public class SequenceLoader { public SequenceDefinition load(int id, byte[] b) diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java index 4137da8f3..e0873ba3a 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java @@ -24,10 +24,11 @@ */ package net.runelite.cache.definitions.loaders; -import java.util.HashMap; import net.runelite.cache.definitions.StructDefinition; import net.runelite.cache.io.InputStream; +import java.util.HashMap; + public class StructLoader { public StructDefinition load(int id, byte[] b) diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java index 371b6491c..a6f3f41da 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java @@ -24,16 +24,12 @@ */ package net.runelite.cache.definitions.loaders; -import java.util.LinkedList; -import net.runelite.cache.definitions.WorldMapDefinition; -import net.runelite.cache.definitions.WorldMapType0; -import net.runelite.cache.definitions.WorldMapType1; -import net.runelite.cache.definitions.WorldMapType2; -import net.runelite.cache.definitions.WorldMapType3; -import net.runelite.cache.definitions.WorldMapTypeBase; +import net.runelite.cache.definitions.*; import net.runelite.cache.io.InputStream; import net.runelite.cache.region.Position; +import java.util.LinkedList; + public class WorldMapLoader { @SuppressWarnings("unchecked") diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/InstrumentLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/InstrumentLoader.java index f3d232676..d0b9db097 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/InstrumentLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/InstrumentLoader.java @@ -24,8 +24,8 @@ */ package net.runelite.cache.definitions.loaders.sound; -import net.runelite.cache.definitions.sound.InstrumentDefinition; import net.runelite.cache.definitions.sound.AudioEnvelopeDefinition; +import net.runelite.cache.definitions.sound.InstrumentDefinition; import net.runelite.cache.io.InputStream; public class InstrumentLoader diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffectTrackLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffectTrackLoader.java index 3b991fdc7..40abce43a 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffectTrackLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffectTrackLoader.java @@ -24,8 +24,8 @@ */ package net.runelite.cache.definitions.loaders.sound; -import net.runelite.cache.definitions.sound.SoundEffectTrackDefinition; import net.runelite.cache.definitions.sound.InstrumentDefinition; +import net.runelite.cache.definitions.sound.SoundEffectTrackDefinition; import net.runelite.cache.io.InputStream; public class SoundEffectTrackLoader diff --git a/cache/src/main/java/net/runelite/cache/definitions/providers/ModelProvider.java b/cache/src/main/java/net/runelite/cache/definitions/providers/ModelProvider.java index 36a8412b8..0fd731520 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/providers/ModelProvider.java +++ b/cache/src/main/java/net/runelite/cache/definitions/providers/ModelProvider.java @@ -24,9 +24,10 @@ */ package net.runelite.cache.definitions.providers; -import java.io.IOException; import net.runelite.cache.definitions.ModelDefinition; +import java.io.IOException; + public interface ModelProvider { ModelDefinition provide(int modelId) throws IOException; diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/InterfaceSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/InterfaceSaver.java deleted file mode 100644 index 61151a415..000000000 --- a/cache/src/main/java/net/runelite/cache/definitions/savers/InterfaceSaver.java +++ /dev/null @@ -1,226 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.cache.definitions.savers; - -import net.runelite.cache.definitions.ClientScript1Instruction; -import net.runelite.cache.definitions.InterfaceDefinition; -import net.runelite.cache.io.OutputStream; - -public class InterfaceSaver -{ - public byte[] save(InterfaceDefinition def) - { - if (def.isIf3) - { - return saveIf3(def); - } - else - { - return saveIf1(def); - } - } - - private byte[] saveIf3(InterfaceDefinition def) - { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - - private byte[] saveIf1(InterfaceDefinition def) - { - OutputStream out = new OutputStream(); - out.writeByte(def.type); - out.writeByte(def.menuType); - out.writeShort(def.contentType); - out.writeShort(def.originalX); - out.writeShort(def.originalY); - out.writeShort(def.originalWidth); - out.writeShort(def.originalHeight); - out.writeByte(def.opacity); - out.writeShort(def.parentId); - out.writeShort(def.hoveredSiblingId); - if (def.alternateOperators != null) - { - out.writeByte(def.alternateOperators.length); - for (int i = 0; i < def.alternateOperators.length; ++i) - { - out.writeByte(def.alternateOperators[i]); - out.writeShort(def.alternateRhs[i]); - } - } - else - { - out.writeByte(0); - } - if (def.clientScripts != null) - { - out.writeByte(def.clientScripts.length); - for (int i = 0; i < def.clientScripts.length; ++i) - { - int len = 0; - for (int j = 0; j < def.clientScripts[i].length; ++j) - { - ClientScript1Instruction ins = def.clientScripts[i][j]; - len++; - if (ins.operands != null) - { - len += ins.operands.length; - } - } - out.writeShort(len); - for (int j = 0; j < def.clientScripts[i].length; ++j) - { - ClientScript1Instruction ins = def.clientScripts[i][j]; - out.writeShort(ins.opcode.ordinal()); - if (ins.operands != null) - { - for (int op : ins.operands) - { - out.writeShort(op); - } - } - } - } - } - else - { - out.writeByte(0); - } - if (def.type == 0) - { - out.writeShort(def.scrollHeight); - out.writeByte(def.isHidden ? 1 : 0); - } - if (def.type == 1) - { - out.writeShort(0); - out.writeByte(0); - } - if (def.type == 2) - { - out.writeByte((def.clickMask & 268435456) != 0 ? 1 : 0); - out.writeByte((def.clickMask & 1073741824) != 0 ? 1 : 0); - out.writeByte((def.clickMask & Integer.MIN_VALUE) != 0 ? 1 : 0); - out.writeByte((def.clickMask & 536870912) != 0 ? 1 : 0); - out.writeByte(def.xPitch); - out.writeByte(def.yPitch); - for (int i = 0; i < 20; ++i) - { - if (def.sprites[i] != -1) - { - out.writeByte(1); - out.writeShort(def.xOffsets[i]); - out.writeShort(def.yOffsets[i]); - out.writeShort(def.sprites[i]); - } - else - { - out.writeByte(0); - } - } - for (int i = 0; i < 5; ++i) - { - if (def.configActions[i] != null) - { - out.writeString(def.configActions[i]); - } - else - { - out.writeString(""); - } - } - } - if (def.type == 3) - { - out.writeByte(def.filled ? 1 : 0); - } - if (def.type == 4 || def.type == 1) - { - out.writeByte(def.xTextAlignment); - out.writeByte(def.yTextAlignment); - out.writeByte(def.lineHeight); - out.writeShort(def.fontId); - out.writeByte(def.textShadowed ? 1 : 0); - } - if (def.type == 4) - { - out.writeString(def.text); - out.writeString(def.alternateText); - } - if (def.type == 1 || def.type == 3 || def.type == 4) - { - out.writeInt(def.textColor); - } - if (def.type == 3 || def.type == 4) - { - out.writeInt(def.alternateTextColor); - out.writeInt(def.hoveredTextColor); - out.writeInt(def.alternateHoveredTextColor); - } - if (def.type == 5) - { - out.writeInt(def.spriteId); - out.writeInt(def.alternateSpriteId); - } - if (def.type == 6) - { - out.writeShort(def.modelId); - out.writeShort(def.alternateModelId); - out.writeShort(def.animation); - out.writeShort(def.alternateAnimation); - out.writeShort(def.modelZoom); - out.writeShort(def.rotationX); - out.writeShort(def.rotationZ); - } - if (def.type == 7) - { - out.writeByte(def.xTextAlignment); - out.writeShort(def.fontId); - out.writeByte(def.textShadowed ? 1 : 0); - out.writeInt(def.textColor); - out.writeShort(def.xPitch); - out.writeShort(def.yPitch); - out.writeByte((def.clickMask & 1073741824) != 0 ? 1 : 0); - for (int i = 0; i < 5; ++i) - { - out.writeString(def.configActions[i]); - } - } - if (def.type == 8) - { - out.writeString(def.text); - } - if (def.menuType == 2 || def.type == 2) - { - out.writeString(def.targetVerb); - out.writeString(def.spellName); - out.writeShort((def.clickMask >>> 11) & 63); - } - if (def.menuType == 1 || def.menuType == 4 || def.menuType == 5 || def.menuType == 6) - { - out.writeString(def.tooltip); - } - return out.flip(); - } -} diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/ItemSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/ItemSaver.java deleted file mode 100644 index baa9af3be..000000000 --- a/cache/src/main/java/net/runelite/cache/definitions/savers/ItemSaver.java +++ /dev/null @@ -1,235 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.cache.definitions.savers; - -import java.util.Map.Entry; -import net.runelite.cache.definitions.ItemDefinition; -import net.runelite.cache.io.OutputStream; - -public class ItemSaver -{ - public byte[] save(ItemDefinition item) - { - OutputStream out = new OutputStream(); - if (item.inventoryModel != 0) - { - out.writeByte(1); - out.writeShort(item.inventoryModel); - } - if (item.name != null) - { - out.writeByte(2); - out.writeString(item.name); - } - out.writeByte(4); - out.writeShort(item.zoom2d); - out.writeByte(5); - out.writeShort(item.xan2d); - out.writeByte(6); - out.writeShort(item.yan2d); - out.writeByte(7); - out.writeShort(item.xOffset2d); - out.writeByte(8); - out.writeShort(item.yOffset2d); - if (item.stackable != 0) - { - out.writeByte(11); - } - out.writeByte(12); - out.writeInt(item.cost); - if (item.members) - { - out.writeByte(16); - } - if (item.maleModel0 != -1 || item.maleOffset != 0) - { - out.writeByte(23); - out.writeShort(item.maleModel0); - out.writeByte(item.maleOffset); - } - if (item.maleModel1 != -1) - { - out.writeByte(24); - out.writeShort(item.maleModel1); - } - if (item.femaleModel0 != -1 || item.femaleOffset != 0) - { - out.writeByte(25); - out.writeShort(item.femaleModel0); - out.writeByte(item.femaleOffset); - } - if (item.femaleModel1 != -1) - { - out.writeByte(26); - out.writeShort(item.femaleModel1); - } - for (int i = 0; i < 5; ++i) - { - if (item.options[i] != null) - { - out.writeByte(30 + i); - out.writeString(item.options[i]); - } - } - for (int i = 0; i < 5; ++i) - { - if (item.interfaceOptions[i] != null) - { - out.writeByte(35 + i); - out.writeString(item.interfaceOptions[i]); - } - } - if (item.colorFind != null && item.colorReplace != null) - { - out.writeByte(40); - out.writeByte(item.colorFind.length); - for (int i = 0; i < item.colorFind.length; ++i) - { - out.writeShort(item.colorFind[i]); - out.writeShort(item.colorReplace[i]); - } - } - if (item.textureFind != null && item.textureReplace != null) - { - out.writeByte(41); - out.writeByte(item.textureFind.length); - for (int i = 0; i < item.textureFind.length; ++i) - { - out.writeShort(item.textureFind[i]); - out.writeShort(item.textureReplace[i]); - } - } - out.writeByte(42); - out.writeByte(item.shiftClickDropIndex); - if (item.isTradeable) - { - out.writeByte(65); - } - if (item.maleModel2 != -1) - { - out.writeByte(78); - out.writeShort(item.maleModel2); - } - if (item.femaleModel2 != -1) - { - out.writeByte(79); - out.writeShort(item.femaleModel2); - } - if (item.maleHeadModel != -1) - { - out.writeByte(90); - out.writeShort(item.maleHeadModel); - } - if (item.femaleHeadModel != -1) - { - out.writeByte(91); - out.writeShort(item.femaleHeadModel); - } - if (item.maleHeadModel2 != -1) - { - out.writeByte(92); - out.writeShort(item.maleHeadModel2); - } - if (item.femaleHeadModel2 != -1) - { - out.writeByte(93); - out.writeShort(item.femaleHeadModel2); - } - out.writeByte(95); - out.writeShort(item.zan2d); - if (item.notedID != -1) - { - out.writeByte(97); - out.writeShort(item.notedID); - } - if (item.notedTemplate != -1) - { - out.writeByte(98); - out.writeShort(item.notedTemplate); - } - if (item.countObj != null) - { - for (int i = 0; i < 10; ++i) - { - out.writeByte(100 + i); - out.writeShort(item.countObj[i]); - out.writeShort(item.countCo[i]); - } - } - out.writeByte(110); - out.writeShort(item.resizeX); - out.writeByte(111); - out.writeShort(item.resizeY); - out.writeByte(112); - out.writeShort(item.resizeZ); - out.writeByte(113); - out.writeByte(item.ambient); - out.writeByte(114); - out.writeByte(item.contrast); - out.writeByte(115); - out.writeByte(item.team); - if (item.boughtId != -1) - { - out.writeByte(139); - out.writeShort(item.boughtId); - } - if (item.boughtTemplateId != -1) - { - out.writeByte(140); - out.writeShort(item.boughtTemplateId); - } - if (item.placeholderId != -1) - { - out.writeByte(148); - out.writeShort(item.placeholderId); - } - if (item.placeholderTemplateId != -1) - { - out.writeByte(149); - out.writeShort(item.placeholderTemplateId); - } - if (item.params != null) - { - out.writeByte(249); - out.writeByte(item.params.size()); - for (Entry entry : item.params.entrySet()) - { - out.writeByte(entry.getValue() instanceof String ? 1 : 0); - out.write24BitInt(entry.getKey()); - if (entry.getValue() instanceof String) - { - out.writeString((String) entry.getValue()); - } - else - { - out.writeInt((Integer) entry.getValue()); - } - } - } - out.writeByte(0); - - return out.flip(); - } -} diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/LocationSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/LocationSaver.java deleted file mode 100644 index 2086bd7e7..000000000 --- a/cache/src/main/java/net/runelite/cache/definitions/savers/LocationSaver.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.cache.definitions.savers; - -import com.google.common.collect.LinkedListMultimap; -import com.google.common.collect.Multimap; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import net.runelite.cache.definitions.LocationsDefinition; -import net.runelite.cache.io.OutputStream; -import net.runelite.cache.region.Location; - -public class LocationSaver -{ - public byte[] save(LocationsDefinition locs) - { - Multimap locById = LinkedListMultimap.create(); - List sortedLocs = new ArrayList<>(locs.getLocations()); - sortedLocs.sort((l1, l2) -> Integer.compare(l1.getId(), l2.getId())); - for (Location loc : sortedLocs) - { - locById.put(loc.getId(), loc); - } - OutputStream out = new OutputStream(); - int prevId = -1; - for (Integer id : locById.keySet()) - { - int diffId = id - prevId; - prevId = id; - - out.writeShortSmart(diffId); - - Collection locations = locById.get(id); - int position = 0; - for (Location loc : locations) - { - int packedPosition = (loc.getPosition().getZ() << 12) - | (loc.getPosition().getX() << 6) - | (loc.getPosition().getY()); - - int diffPos = packedPosition - position; - position = packedPosition; - - out.writeShortSmart(diffPos + 1); - - int packedAttributes = (loc.getType() << 2) | loc.getOrientation(); - out.writeByte(packedAttributes); - } - - out.writeShortSmart(0); - } - out.writeShortSmart(0); - return out.flip(); - } -} diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java deleted file mode 100644 index cf65b016b..000000000 --- a/cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.cache.definitions.savers; - -import java.util.Map; -import net.runelite.cache.definitions.NpcDefinition; -import net.runelite.cache.io.OutputStream; - -public class NpcSaver -{ - public byte[] save(NpcDefinition npc) - { - OutputStream out = new OutputStream(); - if (npc.models != null) - { - out.writeByte(1); - out.writeByte(npc.models.length); - for (int modelId : npc.models) - { - out.writeShort(modelId); - } - } - if (npc.name != null) - { - out.writeByte(2); - out.writeString(npc.name); - } - if (npc.size != 1) - { - out.writeByte(12); - out.writeByte(npc.size); - } - if (npc.standingAnimation != -1) - { - out.writeByte(13); - out.writeShort(npc.standingAnimation); - } - if (npc.walkingAnimation != -1) - { - out.writeByte(14); - out.writeShort(npc.walkingAnimation); - } - if (npc.idleRotateLeftAnimation != -1) - { - out.writeByte(15); - out.writeShort(npc.idleRotateLeftAnimation); - } - if (npc.idleRotateRightAnimation != -1) - { - out.writeByte(16); - out.writeShort(npc.idleRotateRightAnimation); - } - if (npc.rotate180Animation != -1 || npc.rotateLeftAnimation != -1 || npc.rotateRightAnimation != -1) - { - out.writeByte(17); - out.writeShort(npc.walkingAnimation); - out.writeShort(npc.rotate180Animation); - out.writeShort(npc.rotateLeftAnimation); - out.writeShort(npc.rotateRightAnimation); - } - for (int i = 0; i < 5; ++i) - { - if (npc.actions[i] != null) - { - out.writeByte(30 + i); - out.writeString(npc.actions[i]); - } - } - if (npc.recolorToFind != null && npc.recolorToReplace != null) - { - out.writeByte(40); - out.writeByte(npc.recolorToFind.length); - for (int i = 0; i < npc.recolorToFind.length; ++i) - { - out.writeShort(npc.recolorToFind[i]); - out.writeShort(npc.recolorToReplace[i]); - } - } - if (npc.retextureToFind != null && npc.retextureToReplace != null) - { - out.writeByte(41); - out.writeByte(npc.retextureToFind.length); - for (int i = 0; i < npc.retextureToFind.length; ++i) - { - out.writeShort(npc.retextureToFind[i]); - out.writeShort(npc.retextureToReplace[i]); - } - } - if (npc.chatheadModels != null) - { - out.writeByte(60); - out.writeByte(npc.chatheadModels.length); - for (int modelId : npc.chatheadModels) - { - out.writeShort(modelId); - } - } - if (!npc.isMinimapVisible) - { - out.writeByte(93); - } - if (npc.combatLevel != -1) - { - out.writeByte(95); - out.writeShort(npc.combatLevel); - } - out.writeByte(97); - out.writeShort(npc.widthScale); - out.writeByte(98); - out.writeShort(npc.heightScale); - if (npc.hasRenderPriority) - { - out.writeByte(99); - } - out.writeByte(100); - out.writeByte(npc.ambient); - out.writeByte(101); - out.writeByte(npc.contrast); - out.writeByte(103); - out.writeShort(npc.rotationSpeed); - if (!npc.isInteractable) - { - out.writeByte(107); - } - if (!npc.rotationFlag) - { - out.writeByte(109); - } - if (npc.isPet) - { - out.writeByte(111); - } - if (npc.configs != null) - { - out.writeByte(118); - out.writeShort(npc.varbitId); - out.writeShort(npc.varpIndex); - - int[] c = npc.configs; - out.writeShort(c[c.length - 1]); - out.writeByte(c.length - 2); - for (int i = 0; i <= c.length - 2; ++i) - { - out.writeShort(c[i]); - } - } - if (npc.params != null) - { - out.writeByte(249); - out.writeByte(npc.params.size()); - for (Map.Entry entry : npc.params.entrySet()) - { - out.writeByte(entry.getValue() instanceof String ? 1 : 0); - out.write24BitInt(entry.getKey()); - if (entry.getValue() instanceof String) - { - out.writeString((String) entry.getValue()); - } - else - { - out.writeInt((Integer) entry.getValue()); - } - } - } - out.writeByte(0); - return out.flip(); - } -} diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java deleted file mode 100644 index 666c9e50f..000000000 --- a/cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.cache.definitions.savers; - -import java.util.Map; -import net.runelite.cache.definitions.ObjectDefinition; -import net.runelite.cache.io.OutputStream; - -public class ObjectSaver -{ - public byte[] save(ObjectDefinition obj) - { - OutputStream out = new OutputStream(); - if (obj.getObjectTypes() != null && obj.getObjectModels() != null) - { - out.writeByte(1); - out.writeByte(obj.getObjectTypes().length); - for (int i = 0; i < obj.getObjectTypes().length; ++i) - { - out.writeShort(obj.getObjectModels()[i]); - out.writeByte(obj.getObjectTypes()[i]); - } - } - if (obj.getName() != null) - { - out.writeByte(2); - out.writeString(obj.getName()); - } - if (obj.getObjectTypes() == null && obj.getObjectModels() != null) - { - out.writeByte(5); - out.writeByte(obj.getObjectModels().length); - for (int i = 0; i < obj.getObjectModels().length; ++i) - { - out.writeShort(obj.getObjectModels()[i]); - } - } - out.writeByte(14); - out.writeByte(obj.getSizeX()); - out.writeByte(15); - out.writeByte(obj.getSizeY()); - if (obj.getInteractType() == 0 && !obj.isBlocksProjectile()) - { - out.writeByte(17); - } - else if (!obj.isBlocksProjectile()) - { - out.writeByte(18); - } - if (obj.getWallOrDoor() != -1) - { - out.writeByte(19); - out.writeByte(obj.getWallOrDoor()); - } - if (obj.getContouredGround() == 0) - { - out.writeByte(21); - } - if (!obj.isMergeNormals()) - { - out.writeByte(22); - } - if (obj.isABool2111()) - { - out.writeByte(23); - } - if (obj.getAnimationID() != -1) - { - out.writeByte(24); - out.writeShort(obj.getAnimationID()); - } - if (obj.getInteractType() == 1) - { - out.writeByte(27); - } - out.writeByte(28); - out.writeByte(obj.getDecorDisplacement()); - out.writeByte(29); - out.writeByte(obj.getAmbient()); - out.writeByte(39); - out.writeByte(obj.getContrast() / 25); - for (int i = 0; i < 5; ++i) - { - out.writeByte(30 + i); - String action = obj.getActions()[i]; - out.writeString(action != null ? action : "Hidden"); - } - if (obj.getRecolorToFind() != null && obj.getRecolorToReplace() != null) - { - out.writeByte(40); - out.writeByte(obj.getRecolorToFind().length); - for (int i = 0; i < obj.getRecolorToFind().length; ++i) - { - out.writeShort(obj.getRecolorToFind()[i]); - out.writeShort(obj.getRecolorToReplace()[i]); - } - } - if (obj.getRetextureToFind() != null && obj.getTextureToReplace() != null) - { - out.writeByte(41); - out.writeByte(obj.getRetextureToFind().length); - for (int i = 0; i < obj.getRetextureToFind().length; ++i) - { - out.writeShort(obj.getRetextureToFind()[i]); - out.writeShort(obj.getTextureToReplace()[i]); - } - } - if (obj.isRotated()) - { - out.writeByte(62); - } - if (!obj.isShadow()) - { - out.writeByte(64); - } - out.writeByte(65); - out.writeShort(obj.getModelSizeX()); - out.writeByte(66); - out.writeShort(obj.getModelSizeHeight()); - out.writeByte(67); - out.writeShort(obj.getModelSizeY()); - if (obj.getMapSceneID() != -1) - { - out.writeByte(68); - out.writeShort(obj.getMapSceneID()); - } - if (obj.getBlockingMask() != 0) - { - out.writeByte(69); - out.writeByte(obj.getBlockingMask()); - } - out.writeByte(70); - out.writeShort(obj.getOffsetX()); - out.writeByte(71); - out.writeShort(obj.getOffsetHeight()); - out.writeByte(72); - out.writeShort(obj.getOffsetY()); - if (obj.isObstructsGround()) - { - out.writeByte(73); - } - if (obj.isHollow()) - { - out.writeByte(74); - } - if (obj.getSupportsItems() != -1) - { - out.writeByte(75); - out.writeByte(obj.getSupportsItems()); - } - if (obj.getAmbientSoundId() != -1) - { - out.writeByte(78); - out.writeShort(obj.getAmbientSoundId()); - out.writeByte(obj.getAnInt2083()); - } - if (obj.getAmbientSoundIds() != null) - { - out.writeByte(79); - out.writeShort(obj.getAnInt2112()); - out.writeShort(obj.getAnInt2113()); - out.writeByte(obj.getAnInt2083()); - out.writeByte(obj.getAmbientSoundIds().length); - for (int i : obj.getAmbientSoundIds()) - { - out.writeShort(i); - } - } - if (obj.getContouredGround() != -1) - { - out.writeByte(81); - out.writeByte(obj.getContouredGround() / 256); - } - if (obj.getMapAreaId() != -1) - { - out.writeByte(82); - out.writeShort(obj.getMapAreaId()); - } - if (obj.getConfigChangeDest() != null) - { - out.writeByte(92); - out.writeShort(obj.getVarbitID()); - out.writeShort(obj.getVarpID()); - - int[] c = obj.getConfigChangeDest(); - out.writeShort(c[c.length - 1]); - out.writeByte(c.length - 2); - for (int i = 0; i <= c.length - 2; ++i) - { - out.writeShort(c[i]); - } - } - if (obj.getParams() != null) - { - out.writeByte(249); - out.writeByte(obj.getParams().size()); - for (Map.Entry entry : obj.getParams().entrySet()) - { - out.writeByte(entry.getValue() instanceof String ? 1 : 0); - out.write24BitInt(entry.getKey()); - if (entry.getValue() instanceof String) - { - out.writeString((String) entry.getValue()); - } - else - { - out.writeInt((Integer) entry.getValue()); - } - } - } - out.writeByte(0); - return out.flip(); - } -} diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java index 3b130c4c5..6bdb30b7f 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java +++ b/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java @@ -24,14 +24,13 @@ */ package net.runelite.cache.definitions.savers; -import java.util.Map; -import java.util.Map.Entry; import net.runelite.cache.definitions.ScriptDefinition; import net.runelite.cache.io.OutputStream; -import static net.runelite.cache.script.Opcodes.SCONST; -import static net.runelite.cache.script.Opcodes.POP_INT; -import static net.runelite.cache.script.Opcodes.POP_STRING; -import static net.runelite.cache.script.Opcodes.RETURN; + +import java.util.Map; +import java.util.Map.Entry; + +import static net.runelite.cache.script.Opcodes.*; public class ScriptSaver { diff --git a/cache/src/main/java/net/runelite/cache/fs/Archive.java b/cache/src/main/java/net/runelite/cache/fs/Archive.java index d7b8435f3..27b146edc 100644 --- a/cache/src/main/java/net/runelite/cache/fs/Archive.java +++ b/cache/src/main/java/net/runelite/cache/fs/Archive.java @@ -24,11 +24,12 @@ */ package net.runelite.cache.fs; -import java.io.IOException; import net.runelite.cache.index.FileData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class Archive { private static final Logger logger = LoggerFactory.getLogger(Archive.class); @@ -41,7 +42,6 @@ public class Archive private int revision; private int compression; private FileData[] fileData; - private byte[] hash; // used by webservice, sha256 hash of content public Archive(Index index, int id) { @@ -211,14 +211,4 @@ public void setFileData(FileData[] fileData) { this.fileData = fileData; } - - public byte[] getHash() - { - return hash; - } - - public void setHash(byte[] hash) - { - this.hash = hash; - } } diff --git a/cache/src/main/java/net/runelite/cache/fs/ArchiveFiles.java b/cache/src/main/java/net/runelite/cache/fs/ArchiveFiles.java index 2642b1fbb..812e31206 100644 --- a/cache/src/main/java/net/runelite/cache/fs/ArchiveFiles.java +++ b/cache/src/main/java/net/runelite/cache/fs/ArchiveFiles.java @@ -25,17 +25,13 @@ package net.runelite.cache.fs; import com.google.common.base.Preconditions; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; import net.runelite.cache.io.InputStream; import net.runelite.cache.io.OutputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.*; + public class ArchiveFiles { private static final Logger logger = LoggerFactory.getLogger(ArchiveFiles.class); diff --git a/cache/src/main/java/net/runelite/cache/fs/Container.java b/cache/src/main/java/net/runelite/cache/fs/Container.java index 9d57264bc..de2da5fa8 100644 --- a/cache/src/main/java/net/runelite/cache/fs/Container.java +++ b/cache/src/main/java/net/runelite/cache/fs/Container.java @@ -24,9 +24,7 @@ */ package net.runelite.cache.fs; -import static com.google.common.primitives.Bytes.concat; import com.google.common.primitives.Ints; -import java.io.IOException; import net.runelite.cache.fs.jagex.CompressionType; import net.runelite.cache.io.InputStream; import net.runelite.cache.io.OutputStream; @@ -37,6 +35,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + +import static com.google.common.primitives.Bytes.concat; + public class Container { private static final Logger logger = LoggerFactory.getLogger(Container.class); @@ -88,6 +90,10 @@ public void compress(byte[] data, int[] keys) throws IOException } this.data = stream.flip(); + + Crc32 crc32 = new Crc32(); + crc32.update(this.data, 0, this.data.length - (revision != -1 ? 2 : 0)); + this.crc = crc32.getHash(); } public static Container decompress(byte[] b, int[] keys) throws IOException @@ -144,12 +150,6 @@ public static Container decompress(byte[] b, int[] keys) throws IOException int decompressedLength = stream.readInt(); data = BZip2.decompress(stream.getRemaining(), compressedLength); - - if (data == null) - { - return null; - } - assert data.length == decompressedLength; break; @@ -172,12 +172,6 @@ public static Container decompress(byte[] b, int[] keys) throws IOException int decompressedLength = stream.readInt(); data = GZip.decompress(stream.getRemaining(), compressedLength); - - if (data == null) - { - return null; - } - assert data.length == decompressedLength; break; diff --git a/cache/src/main/java/net/runelite/cache/fs/Index.java b/cache/src/main/java/net/runelite/cache/fs/Index.java index 6e915f933..0d3ebab12 100644 --- a/cache/src/main/java/net/runelite/cache/fs/Index.java +++ b/cache/src/main/java/net/runelite/cache/fs/Index.java @@ -24,9 +24,6 @@ */ package net.runelite.cache.fs; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; import net.runelite.cache.index.ArchiveData; import net.runelite.cache.index.FileData; import net.runelite.cache.index.IndexData; @@ -34,6 +31,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + public class Index { private static final Logger logger = LoggerFactory.getLogger(Index.class); diff --git a/cache/src/main/java/net/runelite/cache/fs/Storage.java b/cache/src/main/java/net/runelite/cache/fs/Storage.java index 6bcdb8881..aa43ff23f 100644 --- a/cache/src/main/java/net/runelite/cache/fs/Storage.java +++ b/cache/src/main/java/net/runelite/cache/fs/Storage.java @@ -37,7 +37,17 @@ public interface Storage extends AutoCloseable void save(Store store) throws IOException; - byte[] loadArchive(Archive archive) throws IOException; + byte[] load(int index, int archive) throws IOException; - void saveArchive(Archive archive, byte[] data) throws IOException; + void store(int index, int archive, byte[] data) throws IOException; + + default byte[] loadArchive(Archive archive) throws IOException + { + return load(archive.getIndex().getId(), archive.getArchiveId()); + } + + default void saveArchive(Archive archive, byte[] data) throws IOException + { + store(archive.getIndex().getId(), archive.getArchiveId(), data); + } } diff --git a/cache/src/main/java/net/runelite/cache/fs/Store.java b/cache/src/main/java/net/runelite/cache/fs/Store.java index 6423a8039..2b660726e 100644 --- a/cache/src/main/java/net/runelite/cache/fs/Store.java +++ b/cache/src/main/java/net/runelite/cache/fs/Store.java @@ -24,17 +24,17 @@ */ package net.runelite.cache.fs; +import net.runelite.cache.IndexType; +import net.runelite.cache.fs.jagex.DiskStorage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.Closeable; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import net.runelite.cache.IndexType; -import net.runelite.cache.fs.jagex.DiskStorage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class Store implements Closeable { @@ -94,7 +94,7 @@ public boolean equals(Object obj) return true; } - public final Index addIndex(int id) throws FileNotFoundException + public final Index addIndex(int id) { for (Index i : indexes) { diff --git a/cache/src/main/java/net/runelite/cache/fs/flat/FlatStorage.java b/cache/src/main/java/net/runelite/cache/fs/flat/FlatStorage.java index 9afe72785..a9ad83afc 100644 --- a/cache/src/main/java/net/runelite/cache/fs/flat/FlatStorage.java +++ b/cache/src/main/java/net/runelite/cache/fs/flat/FlatStorage.java @@ -24,28 +24,16 @@ */ package net.runelite.cache.fs.flat; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.PrintStream; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import net.runelite.cache.fs.Archive; import net.runelite.cache.fs.Index; import net.runelite.cache.fs.Storage; import net.runelite.cache.fs.Store; import net.runelite.cache.index.FileData; +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.util.*; + /** * A Storage that stores the cache as a series of flat files, designed * to be git revisioned. @@ -179,9 +167,6 @@ else if (fileData != null) case "crc": archive.setCrc(Integer.parseInt(value)); continue; - case "hash": - archive.setHash(Base64.getDecoder().decode(value)); - continue; case "compression": archive.setCompression(Integer.parseInt(value)); continue; @@ -230,13 +215,6 @@ public void save(Store store) throws IOException br.printf("revision=%d\n", archive.getRevision()); br.printf("crc=%d\n", archive.getCrc()); - if (archive.getHash() != null) - { - br.append("hash="); - br.write(Base64.getEncoder().encode(archive.getHash())); - br.append("\n"); - } - byte[] contents = store.getStorage().loadArchive(archive); if (contents != null) { @@ -256,14 +234,14 @@ public void save(Store store) throws IOException } @Override - public byte[] loadArchive(Archive archive) throws IOException + public byte[] load(int index, int archive) { - return data.get((long) archive.getIndex().getId() << 32 | archive.getArchiveId()); + return data.get((long) index << 32 | archive); } @Override - public void saveArchive(Archive archive, byte[] bytes) throws IOException + public void store(int index, int archive, byte[] bytes) { - data.put((long) archive.getIndex().getId() << 32 | archive.getArchiveId(), bytes); + data.put((long) index << 32 | archive, bytes); } } diff --git a/cache/src/main/java/net/runelite/cache/fs/jagex/DataFile.java b/cache/src/main/java/net/runelite/cache/fs/jagex/DataFile.java index 7b79f8b4f..94c56afb2 100644 --- a/cache/src/main/java/net/runelite/cache/fs/jagex/DataFile.java +++ b/cache/src/main/java/net/runelite/cache/fs/jagex/DataFile.java @@ -24,15 +24,12 @@ */ package net.runelite.cache.fs.jagex; -import java.io.Closeable; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.nio.ByteBuffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.*; +import java.nio.ByteBuffer; + public class DataFile implements Closeable { private static final Logger logger = LoggerFactory.getLogger(DataFile.class); diff --git a/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java b/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java index 0e1353706..19f81c144 100644 --- a/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java +++ b/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java @@ -24,22 +24,17 @@ */ package net.runelite.cache.fs.jagex; -import com.google.common.primitives.Ints; +import net.runelite.cache.fs.*; +import net.runelite.cache.index.ArchiveData; +import net.runelite.cache.index.IndexData; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import net.runelite.cache.fs.Archive; -import net.runelite.cache.fs.Container; -import net.runelite.cache.fs.Index; -import net.runelite.cache.fs.Storage; -import net.runelite.cache.fs.Store; -import net.runelite.cache.index.ArchiveData; -import net.runelite.cache.index.IndexData; -import net.runelite.cache.util.Crc32; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DiskStorage implements Storage { @@ -87,6 +82,11 @@ public void close() throws IOException private IndexFile getIndex(int i) throws FileNotFoundException { + if (i == 255) + { + return index255; + } + for (IndexFile indexFile : indexFiles) { if (indexFile.getIndexFileId() == i) @@ -157,30 +157,6 @@ private void loadIndex(Index index) throws IOException assert res.revision == -1; } - @Override - public byte[] loadArchive(Archive archive) throws IOException - { - Index index = archive.getIndex(); - IndexFile indexFile = getIndex(index.getId()); - - assert indexFile.getIndexFileId() == index.getId(); - - IndexEntry entry = indexFile.read(archive.getArchiveId()); - if (entry == null) - { - logger.debug("can't read archive " + archive.getArchiveId() + " from index " + index.getId()); - return null; - } - - assert entry.getId() == archive.getArchiveId(); - - logger.trace("Loading archive {} for index {} from sector {} length {}", - archive.getArchiveId(), index.getId(), entry.getSector(), entry.getLength()); - - byte[] archiveData = data.read(index.getId(), entry.getId(), entry.getSector(), entry.getLength()); - return archiveData; - } - @Override public void save(Store store) throws IOException { @@ -200,40 +176,45 @@ private void saveIndex(Index index) throws IOException Container container = new Container(index.getCompression(), -1); // index data revision is always -1 container.compress(data, null); byte[] compressedData = container.data; - DataFileWriteResult res = this.data.write(index255.getIndexFileId(), index.getId(), compressedData); - index255.write(new IndexEntry(index255, index.getId(), res.sector, res.compressedLength)); + store(255, index.getId(), compressedData); - Crc32 crc = new Crc32(); - crc.update(compressedData, 0, compressedData.length); - index.setCrc(crc.getHash()); + index.setCrc(container.crc); } @Override - public void saveArchive(Archive a, byte[] archiveData) throws IOException + public byte[] load(int index, int archive) throws IOException { - Index index = a.getIndex(); - IndexFile indexFile = getIndex(index.getId()); - assert indexFile.getIndexFileId() == index.getId(); + IndexFile indexFile = getIndex(index); - DataFileWriteResult res = data.write(index.getId(), a.getArchiveId(), archiveData); - indexFile.write(new IndexEntry(indexFile, a.getArchiveId(), res.sector, res.compressedLength)); + assert indexFile.getIndexFileId() == index; - byte compression = archiveData[0]; - int compressedSize = Ints.fromBytes(archiveData[1], archiveData[2], - archiveData[3], archiveData[4]); + IndexEntry entry = indexFile.read(archive); + if (entry == null) + { + logger.debug("can't read archive {} from index {}", archive, index); + return null; + } + + assert entry.getId() == archive; - // don't crc the appended revision, if it is there - int length = 1 // compression type - + 4 // compressed size - + compressedSize - + (compression != CompressionType.NONE ? 4 : 0); + logger.trace("Loading archive {} for index {} from sector {} length {}", + archive, index, entry.getSector(), entry.getLength()); + + byte[] archiveData = data.read(index, entry.getId(), entry.getSector(), entry.getLength()); + return archiveData; + } + + @Override + public void store(int index, int archive, byte[] archiveData) throws IOException + { + IndexFile indexFile = getIndex(index); + assert indexFile.getIndexFileId() == index; - Crc32 crc = new Crc32(); - crc.update(archiveData, 0, length); - a.setCrc(crc.getHash()); + DataFileWriteResult res = data.write(index, archive, archiveData); + indexFile.write(new IndexEntry(indexFile, archive, res.sector, res.compressedLength)); logger.trace("Saved archive {}/{} at sector {}, compressed length {}", - index.getId(), a.getArchiveId(), res.sector, res.compressedLength); + index, archive, res.sector, res.compressedLength); } } diff --git a/cache/src/main/java/net/runelite/cache/fs/jagex/IndexFile.java b/cache/src/main/java/net/runelite/cache/fs/jagex/IndexFile.java index b95ae70e3..3987509f4 100644 --- a/cache/src/main/java/net/runelite/cache/fs/jagex/IndexFile.java +++ b/cache/src/main/java/net/runelite/cache/fs/jagex/IndexFile.java @@ -24,15 +24,12 @@ */ package net.runelite.cache.fs.jagex; -import java.io.Closeable; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.util.Objects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.*; +import java.util.Objects; + public class IndexFile implements Closeable { private static final Logger logger = LoggerFactory.getLogger(IndexFile.class); diff --git a/cache/src/main/java/net/runelite/cache/index/IndexData.java b/cache/src/main/java/net/runelite/cache/index/IndexData.java index 38747bd45..d644eaae2 100644 --- a/cache/src/main/java/net/runelite/cache/index/IndexData.java +++ b/cache/src/main/java/net/runelite/cache/index/IndexData.java @@ -54,7 +54,6 @@ public void load(byte[] data) { throw new IllegalArgumentException("Unknown flags"); } - assert (hash & ~3) == 0; int validArchivesCount = protocol >= 7 ? stream.readBigSmart() : stream.readUnsignedShort(); int lastArchiveId = 0; diff --git a/cache/src/main/java/net/runelite/cache/io/OutputStream.java b/cache/src/main/java/net/runelite/cache/io/OutputStream.java index fd31d1b96..30ac256ab 100644 --- a/cache/src/main/java/net/runelite/cache/io/OutputStream.java +++ b/cache/src/main/java/net/runelite/cache/io/OutputStream.java @@ -25,6 +25,7 @@ package net.runelite.cache.io; import com.google.common.base.Preconditions; + import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/cache/src/main/java/net/runelite/cache/item/Graphics3D.java b/cache/src/main/java/net/runelite/cache/item/Graphics3D.java index 85e599fe5..5745dcb40 100644 --- a/cache/src/main/java/net/runelite/cache/item/Graphics3D.java +++ b/cache/src/main/java/net/runelite/cache/item/Graphics3D.java @@ -33,9 +33,6 @@ class Graphics3D extends Rasterizer2D public static final int[] SINE = new int[2048]; // sine angles for each of the 2048 units, * 65536 and stored as an int public static final int[] COSINE = new int[2048]; // cosine - private static int[] field1932 = new int[512]; - static int[] field1933 = new int[2048]; - static { for (int i = 0; i < 2048; ++i) @@ -43,17 +40,6 @@ class Graphics3D extends Rasterizer2D SINE[i] = (int) (65536.0D * Math.sin((double) i * UNIT)); COSINE[i] = (int) (65536.0D * Math.cos((double) i * UNIT)); } - - int var0; - for (var0 = 1; var0 < 512; ++var0) - { - field1932[var0] = 32768 / var0; - } - - for (var0 = 1; var0 < 2048; ++var0) - { - field1933[var0] = 65536 / var0; - } } private final RSTextureProvider textureProvider; diff --git a/cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java b/cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java index b2f643f02..13b732bf3 100644 --- a/cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java +++ b/cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java @@ -24,8 +24,6 @@ */ package net.runelite.cache.item; -import java.awt.image.BufferedImage; -import java.io.IOException; import net.runelite.cache.definitions.ItemDefinition; import net.runelite.cache.definitions.ModelDefinition; import net.runelite.cache.definitions.providers.ItemProvider; @@ -36,22 +34,25 @@ import net.runelite.cache.models.JagexColor; import net.runelite.cache.models.VertexNormal; +import java.awt.image.BufferedImage; +import java.io.IOException; + public class ItemSpriteFactory { - public static final BufferedImage createSprite(ItemProvider itemProvider, ModelProvider modelProvider, - SpriteProvider spriteProvider, TextureProvider textureProvider, - int itemId, int quantity, int border, int shadowColor, - boolean noted) throws IOException + public static BufferedImage createSprite(ItemProvider itemProvider, ModelProvider modelProvider, + SpriteProvider spriteProvider, TextureProvider textureProvider, + int itemId, int quantity, int border, int shadowColor, + boolean noted) throws IOException { - Sprite spritePixels = createSpritePixels(itemProvider, modelProvider, spriteProvider, textureProvider, - itemId, quantity, border, shadowColor, noted); + SpritePixels spritePixels = createSpritePixels(itemProvider, modelProvider, spriteProvider, textureProvider, + itemId, quantity, border, shadowColor, noted); return spritePixels == null ? null : spritePixels.toBufferedImage(); } - private static final Sprite createSpritePixels(ItemProvider itemProvider, ModelProvider modelProvider, - SpriteProvider spriteProvider, TextureProvider textureProvider, - int itemId, int quantity, int border, int shadowColor, - boolean noted) throws IOException + private static SpritePixels createSpritePixels(ItemProvider itemProvider, ModelProvider modelProvider, + SpriteProvider spriteProvider, TextureProvider textureProvider, + int itemId, int quantity, int border, int shadowColor, + boolean noted) throws IOException { ItemDefinition item = itemProvider.provide(itemId); @@ -79,11 +80,11 @@ private static final Sprite createSpritePixels(ItemProvider itemProvider, ModelP return null; } - Sprite auxSpritePixels = null; + SpritePixels auxSpritePixels = null; if (item.notedTemplate != -1) { auxSpritePixels = createSpritePixels(itemProvider, modelProvider, spriteProvider, textureProvider, - item.notedID, 10, 1, 0, true); + item.notedID, 10, 1, 0, true); if (auxSpritePixels == null) { return null; @@ -101,7 +102,7 @@ else if (item.boughtTemplateId != -1) else if (item.placeholderTemplateId != -1) { auxSpritePixels = createSpritePixels(itemProvider, modelProvider, spriteProvider, textureProvider, - item.placeholderId, quantity, 0, 0, false); + item.placeholderId, quantity, 0, 0, false); if (auxSpritePixels == null) { return null; @@ -109,8 +110,9 @@ else if (item.placeholderTemplateId != -1) } RSTextureProvider rsTextureProvider = new RSTextureProvider(textureProvider, spriteProvider); + rsTextureProvider.brightness = JagexColor.BRIGHTNESS_MAX; - Sprite spritePixels = new Sprite(36, 32); + SpritePixels spritePixels = new SpritePixels(36, 32); Graphics3D graphics = new Graphics3D(rsTextureProvider); graphics.setBrightness(JagexColor.BRIGHTNESS_MAX); graphics.setRasterBuffer(spritePixels.pixels, 36, 32); @@ -137,13 +139,13 @@ else if (border == 2) int var18 = zoom2d * Graphics3D.COSINE[item.xan2d] >> 16; itemModel.calculateBoundsCylinder(); - itemModel.rotateAndProject(graphics, 0, - item.yan2d, - item.zan2d, - item.xan2d, - item.xOffset2d, - itemModel.modelHeight / 2 + var17 + item.yOffset2d, - var18 + item.yOffset2d); + itemModel.projectAndDraw(graphics, 0, + item.yan2d, + item.zan2d, + item.xan2d, + item.xOffset2d, + itemModel.modelHeight / 2 + var17 + item.yOffset2d, + var18 + item.yOffset2d); if (item.boughtTemplateId != -1) { auxSpritePixels.drawAtOn(graphics, 0, 0); @@ -171,8 +173,8 @@ else if (border == 2) } graphics.setRasterBuffer(graphics.graphicsPixels, - graphics.graphicsPixelsWidth, - graphics.graphicsPixelsHeight); + graphics.graphicsPixelsWidth, + graphics.graphicsPixelsHeight); graphics.setRasterClipping(); graphics.rasterGouraudLowRes = true; @@ -210,7 +212,6 @@ private static Model getModel(ModelProvider modelProvider, ItemDefinition item) } itemModel = light(inventoryModel, item.ambient + 64, item.contrast + 768, -50, -10, -50); - itemModel.isItemModel = true; return itemModel; } @@ -220,9 +221,9 @@ private static Model light(ModelDefinition def, int ambient, int contrast, int x int somethingMagnitude = (int) Math.sqrt((double) (z * z + x * x + y * y)); int var7 = somethingMagnitude * contrast >> 8; Model litModel = new Model(); - litModel.field1856 = new int[def.faceCount]; - litModel.field1854 = new int[def.faceCount]; - litModel.field1823 = new int[def.faceCount]; + litModel.faceColors1 = new int[def.faceCount]; + litModel.faceColors2 = new int[def.faceCount]; + litModel.faceColors3 = new int[def.faceCount]; if (def.numTextureFaces > 0 && def.textureCoords != null) { int[] var9 = new int[def.numTextureFaces]; @@ -236,19 +237,19 @@ private static Model light(ModelDefinition def, int ambient, int contrast, int x } } - litModel.field1852 = 0; + litModel.numTextureFaces = 0; for (var10 = 0; var10 < def.numTextureFaces; ++var10) { if (var9[var10] > 0 && def.textureRenderTypes[var10] == 0) { - ++litModel.field1852; + ++litModel.numTextureFaces; } } - litModel.field1844 = new int[litModel.field1852]; - litModel.field1865 = new int[litModel.field1852]; - litModel.field1846 = new int[litModel.field1852]; + litModel.texIndices1 = new int[litModel.numTextureFaces]; + litModel.texIndices2 = new int[litModel.numTextureFaces]; + litModel.texIndices3 = new int[litModel.numTextureFaces]; var10 = 0; @@ -256,9 +257,9 @@ private static Model light(ModelDefinition def, int ambient, int contrast, int x { if (var9[i] > 0 && def.textureRenderTypes[i] == 0) { - litModel.field1844[var10] = def.texIndices1[i] & '\uffff'; - litModel.field1865[var10] = def.texIndices2[i] & '\uffff'; - litModel.field1846[var10] = def.texIndices3[i] & '\uffff'; + litModel.texIndices1[var10] = def.texIndices1[i] & '\uffff'; + litModel.texIndices2[var10] = def.texIndices2[i] & '\uffff'; + litModel.texIndices3[var10] = def.texIndices3[i] & '\uffff'; var9[i] = var10++; } else @@ -267,17 +268,17 @@ private static Model light(ModelDefinition def, int ambient, int contrast, int x } } - litModel.field1840 = new byte[def.faceCount]; + litModel.textureCoords = new byte[def.faceCount]; for (int i = 0; i < def.faceCount; ++i) { if (def.textureCoords[i] != -1) { - litModel.field1840[i] = (byte) var9[def.textureCoords[i] & 255]; + litModel.textureCoords[i] = (byte) var9[def.textureCoords[i] & 255]; } else { - litModel.field1840[i] = -1; + litModel.textureCoords[i] = -1; } } } @@ -335,17 +336,17 @@ private static Model light(ModelDefinition def, int ambient, int contrast, int x { faceNormal = def.faceNormals[faceIdx]; tmp = (y * faceNormal.y + z * faceNormal.z + x * faceNormal.x) / (var7 / 2 + var7) + ambient; - litModel.field1856[faceIdx] = method2608(def.faceColors[faceIdx] & '\uffff', tmp); - litModel.field1823[faceIdx] = -1; + litModel.faceColors1[faceIdx] = method2608(def.faceColors[faceIdx] & '\uffff', tmp); + litModel.faceColors3[faceIdx] = -1; } else if (faceType == 3) { - litModel.field1856[faceIdx] = 128; - litModel.field1823[faceIdx] = -1; + litModel.faceColors1[faceIdx] = 128; + litModel.faceColors3[faceIdx] = -1; } else { - litModel.field1823[faceIdx] = -2; + litModel.faceColors3[faceIdx] = -2; } } else @@ -354,15 +355,15 @@ else if (faceType == 3) vertexNormal = def.vertexNormals[def.faceIndices1[faceIdx]]; tmp = (y * vertexNormal.y + z * vertexNormal.z + x * vertexNormal.x) / (var7 * vertexNormal.magnitude) + ambient; - litModel.field1856[faceIdx] = method2608(var15, tmp); + litModel.faceColors1[faceIdx] = method2608(var15, tmp); vertexNormal = def.vertexNormals[def.faceIndices2[faceIdx]]; tmp = (y * vertexNormal.y + z * vertexNormal.z + x * vertexNormal.x) / (var7 * vertexNormal.magnitude) + ambient; - litModel.field1854[faceIdx] = method2608(var15, tmp); + litModel.faceColors2[faceIdx] = method2608(var15, tmp); vertexNormal = def.vertexNormals[def.faceIndices3[faceIdx]]; tmp = (y * vertexNormal.y + z * vertexNormal.z + x * vertexNormal.x) / (var7 * vertexNormal.magnitude) + ambient; - litModel.field1823[faceIdx] = method2608(var15, tmp); + litModel.faceColors3[faceIdx] = method2608(var15, tmp); } } else if (faceType != 0) @@ -371,12 +372,12 @@ else if (faceType != 0) { faceNormal = def.faceNormals[faceIdx]; tmp = (y * faceNormal.y + z * faceNormal.z + x * faceNormal.x) / (var7 / 2 + var7) + ambient; - litModel.field1856[faceIdx] = bound2to126(tmp); - litModel.field1823[faceIdx] = -1; + litModel.faceColors1[faceIdx] = bound2to126(tmp); + litModel.faceColors3[faceIdx] = -1; } else { - litModel.field1823[faceIdx] = -2; + litModel.faceColors3[faceIdx] = -2; } } else @@ -384,15 +385,15 @@ else if (faceType != 0) vertexNormal = def.vertexNormals[def.faceIndices1[faceIdx]]; tmp = (y * vertexNormal.y + z * vertexNormal.z + x * vertexNormal.x) / (var7 * vertexNormal.magnitude) + ambient; - litModel.field1856[faceIdx] = bound2to126(tmp); + litModel.faceColors1[faceIdx] = bound2to126(tmp); vertexNormal = def.vertexNormals[def.faceIndices2[faceIdx]]; tmp = (y * vertexNormal.y + z * vertexNormal.z + x * vertexNormal.x) / (var7 * vertexNormal.magnitude) + ambient; - litModel.field1854[faceIdx] = bound2to126(tmp); + litModel.faceColors2[faceIdx] = bound2to126(tmp); vertexNormal = def.vertexNormals[def.faceIndices3[faceIdx]]; tmp = (y * vertexNormal.y + z * vertexNormal.z + x * vertexNormal.x) / (var7 * vertexNormal.magnitude) + ambient; - litModel.field1823[faceIdx] = bound2to126(tmp); + litModel.faceColors3[faceIdx] = bound2to126(tmp); } } @@ -404,14 +405,13 @@ else if (faceType != 0) litModel.indices1 = def.faceIndices1; litModel.indices2 = def.faceIndices2; litModel.indices3 = def.faceIndices3; - litModel.field1838 = def.faceRenderPriorities; - litModel.field1882 = def.faceTransparencies; - litModel.field1842 = def.priority; - litModel.field1841 = def.faceTextures; + litModel.facePriorities = def.faceRenderPriorities; + litModel.faceTransparencies = def.faceTransparencies; + litModel.faceTextures = def.faceTextures; return litModel; } - static final int method2608(int var0, int var1) + static int method2608(int var0, int var1) { var1 = ((var0 & 127) * var1) >> 7; var1 = bound2to126(var1); @@ -419,7 +419,7 @@ static final int method2608(int var0, int var1) return (var0 & 65408) + var1; } - static final int bound2to126(int var0) + static int bound2to126(int var0) { if (var0 < 2) { diff --git a/cache/src/main/java/net/runelite/cache/item/Model.java b/cache/src/main/java/net/runelite/cache/item/Model.java index e35943acf..41ad14673 100644 --- a/cache/src/main/java/net/runelite/cache/item/Model.java +++ b/cache/src/main/java/net/runelite/cache/item/Model.java @@ -26,27 +26,22 @@ class Model extends Renderable { - boolean[] field1887 = new boolean[4700]; - boolean[] field1885 = new boolean[4700]; - int[] modelViewportYs = new int[4700]; - int[] modelViewportXs = new int[4700]; - int[] modelViewportZs = new int[4700]; - int[] yViewportBuffer = new int[4700]; - int[] field1839 = new int[4700]; - int[] field1869 = new int[4700]; - int[] field1871 = new int[1600]; - int[][] field1868 = new int[1600][512]; - int[] field1872 = new int[12]; - int[][] field1874 = new int[12][2000]; - int[] field1857 = new int[2000]; - int[] field1863 = new int[2000]; - int[] field1877 = new int[12]; - int[] field1831 = new int[10]; - int[] field1837 = new int[10]; - int[] xViewportBuffer = new int[10]; + boolean[] faceClipped = new boolean[6500]; + int[] modelViewportYs = new int[6500]; + int[] modelViewportXs = new int[6500]; + int[] modelViewportZs = new int[6500]; + int[] modelLocalX = new int[6500]; + int[] modelLocalY = new int[6500]; + int[] modelLocalZ = new int[6500]; + int[] distanceFaceCount = new int[6000]; + int[][] facesByDistance = new int[6000][512]; + int[] numOfPriority = new int[12]; + int[][] orderedFaces = new int[12][2000]; + int[] eq10 = new int[2000]; + int[] eq11 = new int[2000]; + int[] lt10 = new int[12]; static int[] Model_sine; static int[] Model_cosine; - static int[] field1890; int verticesCount; int[] verticesX; int[] verticesY; @@ -55,19 +50,17 @@ class Model extends Renderable int[] indices1; int[] indices2; int[] indices3; - int[] field1856; - int[] field1854; - int[] field1823; - byte[] field1838; - byte[] field1882; - byte[] field1840; - short[] field1841; - byte field1842; - int field1852; - int[] field1844; - int[] field1865; - int[] field1846; - public boolean isItemModel; + int[] faceColors1; + int[] faceColors2; + int[] faceColors3; + byte[] facePriorities; + byte[] faceTransparencies; + byte[] textureCoords; + short[] faceTextures; + int numTextureFaces; + int[] texIndices1; + int[] texIndices2; + int[] texIndices3; int boundsType; int bottomY; int XYZMag; @@ -81,16 +74,13 @@ class Model extends Renderable { Model_sine = Graphics3D.SINE; Model_cosine = Graphics3D.COSINE; - field1890 = Graphics3D.field1933; } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field1842 = 0; - this.field1852 = 0; - this.isItemModel = false; + this.numTextureFaces = 0; this.extremeX = -1; this.extremeY = -1; this.extremeZ = -1; @@ -133,9 +123,9 @@ public void calculateBoundsCylinder() } } - public final void rotateAndProject(Graphics3D graphics, int rotation_1, int yRotation, int zRotation, int xRotation, int xOffset, int yOffset, int zOffset) + public final void projectAndDraw(Graphics3D graphics, int yzRotation, int xzRotation, int xyRotation, int orientation, int xOffset, int yOffset, int zOffset) { - field1871[0] = -1; + distanceFaceCount[0] = -1; // (re?)Calculate magnitude as necessary if (this.boundsType != 2 && this.boundsType != 1) { @@ -160,8 +150,8 @@ public final void rotateAndProject(Graphics3D graphics, int rotation_1, int yRot } // rotate + perspective transform - int sinX = Model_sine[xRotation]; - int cosX = Model_cosine[xRotation]; + int sinX = Model_sine[orientation]; + int cosX = Model_cosine[orientation]; int zRelatedVariable = sinX * yOffset + cosX * zOffset >> 16; for (int i = 0; i < this.verticesCount; ++i) @@ -169,30 +159,30 @@ public final void rotateAndProject(Graphics3D graphics, int rotation_1, int yRot int x = this.verticesX[i]; int y = this.verticesY[i]; int z = this.verticesZ[i]; - if (zRotation != 0) + if (xyRotation != 0) { - int sinZ = Model_sine[zRotation]; - int cosZ = Model_cosine[zRotation]; + int sinZ = Model_sine[xyRotation]; + int cosZ = Model_cosine[xyRotation]; int tmp; tmp = y * sinZ + x * cosZ >> 16; y = y * cosZ - x * sinZ >> 16; x = tmp; } - if (rotation_1 != 0) + if (yzRotation != 0) { - int sinR1 = Model_sine[rotation_1]; - int cosR1 = Model_cosine[rotation_1]; + int sinR1 = Model_sine[yzRotation]; + int cosR1 = Model_cosine[yzRotation]; int tmp; tmp = y * cosR1 - z * sinR1 >> 16; z = y * sinR1 + z * cosR1 >> 16; y = tmp; } - if (yRotation != 0) + if (xzRotation != 0) { - int sinY = Model_sine[yRotation]; - int cosY = Model_cosine[yRotation]; + int sinY = Model_sine[xzRotation]; + int cosY = Model_cosine[xzRotation]; int tmp; tmp = z * sinY + x * cosY >> 16; z = z * cosY - x * sinY >> 16; @@ -207,25 +197,24 @@ public final void rotateAndProject(Graphics3D graphics, int rotation_1, int yRot modelViewportZs[i] = z - zRelatedVariable; modelViewportYs[i] = x * graphics.Rasterizer3D_zoom / z + graphics.centerX; modelViewportXs[i] = tmp * graphics.Rasterizer3D_zoom / z + graphics.centerY; - if (this.field1852 > 0) + if (faceTextures != null) { - yViewportBuffer[i] = x; - field1839[i] = tmp; - field1869[i] = z; + modelLocalX[i] = x; + modelLocalY[i] = tmp; + modelLocalZ[i] = z; } } - this.method0(graphics, false, false, 0); + this.draw(graphics); } - - private void method0(Graphics3D graphics, boolean var1, boolean var3, int var4) + private void draw(Graphics3D graphics) { - if (this.diameter < 1600) + if (this.diameter < 6000) { for (int var5 = 0; var5 < this.diameter; ++var5) { - field1871[var5] = 0; + distanceFaceCount[var5] = 0; } int var7; @@ -236,17 +225,13 @@ private void method0(Graphics3D graphics, boolean var1, boolean var3, int var4) int var13; int var14; int var15; - int var16; int var17; - int var18; - int var19; - int var20; int var27; int var26; for (var26 = 0; var26 < this.indicesCount; ++var26) { - if (this.field1823[var26] != -2) + if (this.faceColors3[var26] != -2) { var7 = this.indices1[var26]; var27 = this.indices2[var26]; @@ -254,67 +239,37 @@ private void method0(Graphics3D graphics, boolean var1, boolean var3, int var4) var10 = modelViewportYs[var7]; var11 = modelViewportYs[var27]; var12 = modelViewportYs[var9]; - if (var1 && (var10 == -5000 || var11 == -5000 || var12 == -5000)) + + if ((var10 - var11) * (modelViewportXs[var9] - modelViewportXs[var27]) - (var12 - var11) * (modelViewportXs[var7] - modelViewportXs[var27]) > 0) { - var13 = yViewportBuffer[var7]; - var14 = yViewportBuffer[var27]; - var15 = yViewportBuffer[var9]; - var16 = field1839[var7]; - var17 = field1839[var27]; - var18 = field1839[var9]; - var19 = field1869[var7]; - var20 = field1869[var27]; - int var21 = field1869[var9]; - var13 -= var14; - var15 -= var14; - var16 -= var17; - var18 -= var17; - var19 -= var20; - var21 -= var20; - int var22 = var16 * var21 - var19 * var18; - int var23 = var19 * var15 - var13 * var21; - int var24 = var13 * var18 - var16 * var15; - if (var14 * var22 + var17 * var23 + var20 * var24 > 0) + if (var10 >= 0 && var11 >= 0 && var12 >= 0 && var10 <= graphics.rasterClipX && var11 <= graphics.rasterClipX && var12 <= graphics.rasterClipX) { - field1885[var26] = true; - int var25 = (modelViewportZs[var7] + modelViewportZs[var27] + modelViewportZs[var9]) / 3 + this.radius; - field1868[var25][field1871[var25]++] = var26; + faceClipped[var26] = false; } - } - else - { - if ((var10 - var11) * (modelViewportXs[var9] - modelViewportXs[var27]) - (var12 - var11) * (modelViewportXs[var7] - modelViewportXs[var27]) > 0) + else { - field1885[var26] = false; - if (var10 >= 0 && var11 >= 0 && var12 >= 0 && var10 <= graphics.rasterClipX && var11 <= graphics.rasterClipX && var12 <= graphics.rasterClipX) - { - field1887[var26] = false; - } - else - { - field1887[var26] = true; - } - - var13 = (modelViewportZs[var7] + modelViewportZs[var27] + modelViewportZs[var9]) / 3 + this.radius; - field1868[var13][field1871[var13]++] = var26; + faceClipped[var26] = true; } + + var13 = (modelViewportZs[var7] + modelViewportZs[var27] + modelViewportZs[var9]) / 3 + this.radius; + facesByDistance[var13][distanceFaceCount[var13]++] = var26; } } } int[] var8; - if (this.field1838 == null) + if (this.facePriorities == null) { for (var26 = this.diameter - 1; var26 >= 0; --var26) { - var7 = field1871[var26]; + var7 = distanceFaceCount[var26]; if (var7 > 0) { - var8 = field1868[var26]; + var8 = facesByDistance[var26]; for (var9 = 0; var9 < var7; ++var9) { - this.method2706(graphics, var8[var9]); + this.rasterFace(graphics, var8[var9]); } } } @@ -324,67 +279,67 @@ private void method0(Graphics3D graphics, boolean var1, boolean var3, int var4) { for (var26 = 0; var26 < 12; ++var26) { - field1872[var26] = 0; - field1877[var26] = 0; + numOfPriority[var26] = 0; + lt10[var26] = 0; } for (var26 = this.diameter - 1; var26 >= 0; --var26) { - var7 = field1871[var26]; + var7 = distanceFaceCount[var26]; if (var7 > 0) { - var8 = field1868[var26]; + var8 = facesByDistance[var26]; for (var9 = 0; var9 < var7; ++var9) { var10 = var8[var9]; - byte var31 = this.field1838[var10]; - var12 = field1872[var31]++; - field1874[var31][var12] = var10; + byte var31 = this.facePriorities[var10]; + var12 = numOfPriority[var31]++; + orderedFaces[var31][var12] = var10; if (var31 < 10) { - field1877[var31] += var26; + lt10[var31] += var26; } else if (var31 == 10) { - field1857[var12] = var26; + eq10[var12] = var26; } else { - field1863[var12] = var26; + eq11[var12] = var26; } } } } var26 = 0; - if (field1872[1] > 0 || field1872[2] > 0) + if (numOfPriority[1] > 0 || numOfPriority[2] > 0) { - var26 = (field1877[1] + field1877[2]) / (field1872[1] + field1872[2]); + var26 = (lt10[1] + lt10[2]) / (numOfPriority[1] + numOfPriority[2]); } var7 = 0; - if (field1872[3] > 0 || field1872[4] > 0) + if (numOfPriority[3] > 0 || numOfPriority[4] > 0) { - var7 = (field1877[3] + field1877[4]) / (field1872[3] + field1872[4]); + var7 = (lt10[3] + lt10[4]) / (numOfPriority[3] + numOfPriority[4]); } var27 = 0; - if (field1872[6] > 0 || field1872[8] > 0) + if (numOfPriority[6] > 0 || numOfPriority[8] > 0) { - var27 = (field1877[8] + field1877[6]) / (field1872[8] + field1872[6]); + var27 = (lt10[8] + lt10[6]) / (numOfPriority[8] + numOfPriority[6]); } var10 = 0; - var11 = field1872[10]; - int[] var28 = field1874[10]; - int[] var29 = field1857; + var11 = numOfPriority[10]; + int[] var28 = orderedFaces[10]; + int[] var29 = eq10; if (var10 == var11) { var10 = 0; - var11 = field1872[11]; - var28 = field1874[11]; - var29 = field1863; + var11 = numOfPriority[11]; + var28 = orderedFaces[11]; + var29 = eq11; } if (var10 < var11) @@ -400,13 +355,13 @@ else if (var31 == 10) { while (var14 == 0 && var9 > var26) { - this.method2706(graphics, var28[var10++]); - if (var10 == var11 && var28 != field1874[11]) + this.rasterFace(graphics, var28[var10++]); + if (var10 == var11 && var28 != orderedFaces[11]) { var10 = 0; - var11 = field1872[11]; - var28 = field1874[11]; - var29 = field1863; + var11 = numOfPriority[11]; + var28 = orderedFaces[11]; + var29 = eq11; } if (var10 < var11) @@ -421,13 +376,13 @@ else if (var31 == 10) while (var14 == 3 && var9 > var7) { - this.method2706(graphics, var28[var10++]); - if (var10 == var11 && var28 != field1874[11]) + this.rasterFace(graphics, var28[var10++]); + if (var10 == var11 && var28 != orderedFaces[11]) { var10 = 0; - var11 = field1872[11]; - var28 = field1874[11]; - var29 = field1863; + var11 = numOfPriority[11]; + var28 = orderedFaces[11]; + var29 = eq11; } if (var10 < var11) @@ -442,13 +397,13 @@ else if (var31 == 10) while (var14 == 5 && var9 > var27) { - this.method2706(graphics, var28[var10++]); - if (var10 == var11 && var28 != field1874[11]) + this.rasterFace(graphics, var28[var10++]); + if (var10 == var11 && var28 != orderedFaces[11]) { var10 = 0; - var11 = field1872[11]; - var28 = field1874[11]; - var29 = field1863; + var11 = numOfPriority[11]; + var28 = orderedFaces[11]; + var29 = eq11; } if (var10 < var11) @@ -461,24 +416,24 @@ else if (var31 == 10) } } - var15 = field1872[var14]; - int[] var30 = field1874[var14]; + var15 = numOfPriority[var14]; + int[] var30 = orderedFaces[var14]; for (var17 = 0; var17 < var15; ++var17) { - this.method2706(graphics, var30[var17]); + this.rasterFace(graphics, var30[var17]); } } while (var9 != -1000) { - this.method2706(graphics, var28[var10++]); - if (var10 == var11 && var28 != field1874[11]) + this.rasterFace(graphics, var28[var10++]); + if (var10 == var11 && var28 != orderedFaces[11]) { var10 = 0; - var28 = field1874[11]; - var11 = field1872[11]; - var29 = field1863; + var28 = orderedFaces[11]; + var11 = numOfPriority[11]; + var29 = eq11; } if (var10 < var11) @@ -495,279 +450,57 @@ else if (var31 == 10) } } - private void method2706(Graphics3D graphics, int var1) - { - if (field1885[var1]) - { - this.method2707(graphics, var1); - } - else - { - int var2 = this.indices1[var1]; - int var3 = this.indices2[var1]; - int var4 = this.indices3[var1]; - graphics.rasterClipEnable = field1887[var1]; - if (this.field1882 == null) - { - graphics.rasterAlpha = 0; - } - else - { - graphics.rasterAlpha = this.field1882[var1] & 255; - } - - if (this.field1841 != null && this.field1841[var1] != -1) - { - int var5; - int var6; - int var7; - if (this.field1840 != null && this.field1840[var1] != -1) - { - int var8 = this.field1840[var1] & 255; - var5 = this.field1844[var8]; - var6 = this.field1865[var8]; - var7 = this.field1846[var8]; - } - else - { - var5 = var2; - var6 = var3; - var7 = var4; - } - - if (this.field1823[var1] == -1) - { - graphics.rasterTextureAffine(modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], this.field1856[var1], this.field1856[var1], this.field1856[var1], yViewportBuffer[var5], yViewportBuffer[var6], yViewportBuffer[var7], field1839[var5], field1839[var6], field1839[var7], field1869[var5], field1869[var6], field1869[var7], this.field1841[var1]); - } - else - { - graphics.rasterTextureAffine(modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], this.field1856[var1], this.field1854[var1], this.field1823[var1], yViewportBuffer[var5], yViewportBuffer[var6], yViewportBuffer[var7], field1839[var5], field1839[var6], field1839[var7], field1869[var5], field1869[var6], field1869[var7], this.field1841[var1]); - } - } - else if (this.field1823[var1] == -1) - { - int[] field1889 = graphics.colorPalette; - graphics.rasterFlat(modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], field1889[this.field1856[var1]]); - } - else - { - graphics.rasterGouraud(modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], this.field1856[var1], this.field1854[var1], this.field1823[var1]); - } - - } - } - - - private void method2707(Graphics3D graphics, int var1) + private void rasterFace(Graphics3D graphics, int face) { - int var2 = graphics.centerX; - int var3 = graphics.centerY; - int var4 = 0; - int var5 = this.indices1[var1]; - int var6 = this.indices2[var1]; - int var7 = this.indices3[var1]; - int var8 = field1869[var5]; - int var9 = field1869[var6]; - int var10 = field1869[var7]; - if (this.field1882 == null) + int var2 = this.indices1[face]; + int var3 = this.indices2[face]; + int var4 = this.indices3[face]; + graphics.rasterClipEnable = faceClipped[face]; + if (this.faceTransparencies == null) { graphics.rasterAlpha = 0; } else { - graphics.rasterAlpha = this.field1882[var1] & 255; + graphics.rasterAlpha = this.faceTransparencies[face] & 255; } - int var11; - int var12; - int var13; - int var14; - if (var8 >= 50) + if (this.faceTextures != null && this.faceTextures[face] != -1) { - field1831[var4] = modelViewportYs[var5]; - field1837[var4] = modelViewportXs[var5]; - xViewportBuffer[var4++] = this.field1856[var1]; - } - else - { - var11 = yViewportBuffer[var5]; - var12 = field1839[var5]; - var13 = this.field1856[var1]; - if (var10 >= 50) + int var5; + int var6; + int var7; + if (this.textureCoords != null && this.textureCoords[face] != -1) { - var14 = field1890[var10 - var8] * (50 - var8); - field1831[var4] = var2 + graphics.Rasterizer3D_zoom * (var11 + ((yViewportBuffer[var7] - var11) * var14 >> 16)) / 50; - field1837[var4] = var3 + graphics.Rasterizer3D_zoom * (var12 + ((field1839[var7] - var12) * var14 >> 16)) / 50; - xViewportBuffer[var4++] = var13 + ((this.field1823[var1] - var13) * var14 >> 16); + int var8 = this.textureCoords[face] & 255; + var5 = this.texIndices1[var8]; + var6 = this.texIndices2[var8]; + var7 = this.texIndices3[var8]; } - - if (var9 >= 50) + else { - var14 = field1890[var9 - var8] * (50 - var8); - field1831[var4] = var2 + graphics.Rasterizer3D_zoom * (var11 + ((yViewportBuffer[var6] - var11) * var14 >> 16)) / 50; - field1837[var4] = var3 + graphics.Rasterizer3D_zoom * (var12 + ((field1839[var6] - var12) * var14 >> 16)) / 50; - xViewportBuffer[var4++] = var13 + ((this.field1854[var1] - var13) * var14 >> 16); + var5 = var2; + var6 = var3; + var7 = var4; } - } - if (var9 >= 50) - { - field1831[var4] = modelViewportYs[var6]; - field1837[var4] = modelViewportXs[var6]; - xViewportBuffer[var4++] = this.field1854[var1]; - } - else - { - var11 = yViewportBuffer[var6]; - var12 = field1839[var6]; - var13 = this.field1854[var1]; - if (var8 >= 50) + if (this.faceColors3[face] == -1) { - var14 = field1890[var8 - var9] * (50 - var9); - field1831[var4] = var2 + graphics.Rasterizer3D_zoom * (var11 + ((yViewportBuffer[var5] - var11) * var14 >> 16)) / 50; - field1837[var4] = var3 + graphics.Rasterizer3D_zoom * (var12 + ((field1839[var5] - var12) * var14 >> 16)) / 50; - xViewportBuffer[var4++] = var13 + ((this.field1856[var1] - var13) * var14 >> 16); + graphics.rasterTextureAffine(modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], this.faceColors1[face], this.faceColors1[face], this.faceColors1[face], modelLocalX[var5], modelLocalX[var6], modelLocalX[var7], modelLocalY[var5], modelLocalY[var6], modelLocalY[var7], modelLocalZ[var5], modelLocalZ[var6], modelLocalZ[var7], this.faceTextures[face]); } - - if (var10 >= 50) + else { - var14 = field1890[var10 - var9] * (50 - var9); - field1831[var4] = var2 + graphics.Rasterizer3D_zoom * (var11 + ((yViewportBuffer[var7] - var11) * var14 >> 16)) / 50; - field1837[var4] = var3 + graphics.Rasterizer3D_zoom * (var12 + ((field1839[var7] - var12) * var14 >> 16)) / 50; - xViewportBuffer[var4++] = var13 + ((this.field1823[var1] - var13) * var14 >> 16); + graphics.rasterTextureAffine(modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], this.faceColors1[face], this.faceColors2[face], this.faceColors3[face], modelLocalX[var5], modelLocalX[var6], modelLocalX[var7], modelLocalY[var5], modelLocalY[var6], modelLocalY[var7], modelLocalZ[var5], modelLocalZ[var6], modelLocalZ[var7], this.faceTextures[face]); } } - - if (var10 >= 50) + else if (this.faceColors3[face] == -1) { - field1831[var4] = modelViewportYs[var7]; - field1837[var4] = modelViewportXs[var7]; - xViewportBuffer[var4++] = this.field1823[var1]; + int[] field1889 = graphics.colorPalette; + graphics.rasterFlat(modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], field1889[this.faceColors1[face]]); } else { - var11 = yViewportBuffer[var7]; - var12 = field1839[var7]; - var13 = this.field1823[var1]; - if (var9 >= 50) - { - var14 = field1890[var9 - var10] * (50 - var10); - field1831[var4] = var2 + graphics.Rasterizer3D_zoom * (var11 + ((yViewportBuffer[var6] - var11) * var14 >> 16)) / 50; - field1837[var4] = var3 + graphics.Rasterizer3D_zoom * (var12 + ((field1839[var6] - var12) * var14 >> 16)) / 50; - xViewportBuffer[var4++] = var13 + ((this.field1854[var1] - var13) * var14 >> 16); - } - - if (var8 >= 50) - { - var14 = field1890[var8 - var10] * (50 - var10); - field1831[var4] = var2 + graphics.Rasterizer3D_zoom * (var11 + ((yViewportBuffer[var5] - var11) * var14 >> 16)) / 50; - field1837[var4] = var3 + graphics.Rasterizer3D_zoom * (var12 + ((field1839[var5] - var12) * var14 >> 16)) / 50; - xViewportBuffer[var4++] = var13 + ((this.field1856[var1] - var13) * var14 >> 16); - } + graphics.rasterGouraud(modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], this.faceColors1[face], this.faceColors2[face], this.faceColors3[face]); } - - var11 = field1831[0]; - var12 = field1831[1]; - var13 = field1831[2]; - var14 = field1837[0]; - int var15 = field1837[1]; - int var16 = field1837[2]; - graphics.rasterClipEnable = false; - int var17; - int var18; - int var19; - int var20; - if (var4 == 3) - { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > graphics.rasterClipX || var12 > graphics.rasterClipX || var13 > graphics.rasterClipX) - { - graphics.rasterClipEnable = true; - } - - if (this.field1841 != null && this.field1841[var1] != -1) - { - if (this.field1840 != null && this.field1840[var1] != -1) - { - var20 = this.field1840[var1] & 255; - var17 = this.field1844[var20]; - var18 = this.field1865[var20]; - var19 = this.field1846[var20]; - } - else - { - var17 = var5; - var18 = var6; - var19 = var7; - } - - if (this.field1823[var1] == -1) - { - graphics.rasterTextureAffine(var14, var15, var16, var11, var12, var13, this.field1856[var1], this.field1856[var1], this.field1856[var1], yViewportBuffer[var17], yViewportBuffer[var18], yViewportBuffer[var19], field1839[var17], field1839[var18], field1839[var19], field1869[var17], field1869[var18], field1869[var19], this.field1841[var1]); - } - else - { - graphics.rasterTextureAffine(var14, var15, var16, var11, var12, var13, xViewportBuffer[0], xViewportBuffer[1], xViewportBuffer[2], yViewportBuffer[var17], yViewportBuffer[var18], yViewportBuffer[var19], field1839[var17], field1839[var18], field1839[var19], field1869[var17], field1869[var18], field1869[var19], this.field1841[var1]); - } - } - else if (this.field1823[var1] == -1) - { - int[] field1889 = graphics.colorPalette; - graphics.rasterFlat(var14, var15, var16, var11, var12, var13, field1889[this.field1856[var1]]); - } - else - { - graphics.rasterGouraud(var14, var15, var16, var11, var12, var13, xViewportBuffer[0], xViewportBuffer[1], xViewportBuffer[2]); - } - } - - if (var4 == 4) - { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > graphics.rasterClipX || var12 > graphics.rasterClipX || var13 > graphics.rasterClipX || field1831[3] < 0 || field1831[3] > graphics.rasterClipX) - { - graphics.rasterClipEnable = true; - } - - if (this.field1841 != null && this.field1841[var1] != -1) - { - if (this.field1840 != null && this.field1840[var1] != -1) - { - var20 = this.field1840[var1] & 255; - var17 = this.field1844[var20]; - var18 = this.field1865[var20]; - var19 = this.field1846[var20]; - } - else - { - var17 = var5; - var18 = var6; - var19 = var7; - } - - short var21 = this.field1841[var1]; - if (this.field1823[var1] == -1) - { - graphics.rasterTextureAffine(var14, var15, var16, var11, var12, var13, this.field1856[var1], this.field1856[var1], this.field1856[var1], yViewportBuffer[var17], yViewportBuffer[var18], yViewportBuffer[var19], field1839[var17], field1839[var18], field1839[var19], field1869[var17], field1869[var18], field1869[var19], var21); - graphics.rasterTextureAffine(var14, var16, field1837[3], var11, var13, field1831[3], this.field1856[var1], this.field1856[var1], this.field1856[var1], yViewportBuffer[var17], yViewportBuffer[var18], yViewportBuffer[var19], field1839[var17], field1839[var18], field1839[var19], field1869[var17], field1869[var18], field1869[var19], var21); - } - else - { - graphics.rasterTextureAffine(var14, var15, var16, var11, var12, var13, xViewportBuffer[0], xViewportBuffer[1], xViewportBuffer[2], yViewportBuffer[var17], yViewportBuffer[var18], yViewportBuffer[var19], field1839[var17], field1839[var18], field1839[var19], field1869[var17], field1869[var18], field1869[var19], var21); - graphics.rasterTextureAffine(var14, var16, field1837[3], var11, var13, field1831[3], xViewportBuffer[0], xViewportBuffer[2], xViewportBuffer[3], yViewportBuffer[var17], yViewportBuffer[var18], yViewportBuffer[var19], field1839[var17], field1839[var18], field1839[var19], field1869[var17], field1869[var18], field1869[var19], var21); - } - } - else if (this.field1823[var1] == -1) - { - int[] field1889 = graphics.colorPalette; - var17 = field1889[this.field1856[var1]]; - graphics.rasterFlat(var14, var15, var16, var11, var12, var13, var17); - graphics.rasterFlat(var14, var16, field1837[3], var11, var13, field1831[3], var17); - } - else - { - graphics.rasterGouraud(var14, var15, var16, var11, var12, var13, xViewportBuffer[0], xViewportBuffer[1], xViewportBuffer[2]); - graphics.rasterGouraud(var14, var16, field1837[3], var11, var13, field1831[3], xViewportBuffer[0], xViewportBuffer[2], xViewportBuffer[3]); - } - } - } } \ No newline at end of file diff --git a/cache/src/main/java/net/runelite/cache/item/SpritePixels.java b/cache/src/main/java/net/runelite/cache/item/SpritePixels.java index ed8be85a1..8bfada5bc 100644 --- a/cache/src/main/java/net/runelite/cache/item/SpritePixels.java +++ b/cache/src/main/java/net/runelite/cache/item/SpritePixels.java @@ -26,7 +26,7 @@ import java.awt.image.BufferedImage; -class Sprite +class SpritePixels { public int[] pixels; public int width; @@ -34,7 +34,7 @@ class Sprite public int offsetX; int offsetY; - public Sprite(int[] var1, int var2, int var3) + public SpritePixels(int[] var1, int var2, int var3) { this.pixels = var1; this.width = var2; @@ -43,7 +43,7 @@ public Sprite(int[] var1, int var2, int var3) this.offsetX = 0; } - public Sprite(int var1, int var2) + public SpritePixels(int var1, int var2) { this(new int[var2 * var1], var1, var2); } @@ -108,7 +108,7 @@ public void drawShadow(int color) } - public void drawAtOn(Rasterizer2D graphics, int x, int y) + public void drawAtOn(Rasterizer2D graphics, int x, int y) { x += this.offsetX; y += this.offsetY; diff --git a/cache/src/main/java/net/runelite/cache/models/ObjExporter.java b/cache/src/main/java/net/runelite/cache/models/ObjExporter.java index c2f141b60..d9bc254c6 100644 --- a/cache/src/main/java/net/runelite/cache/models/ObjExporter.java +++ b/cache/src/main/java/net/runelite/cache/models/ObjExporter.java @@ -24,11 +24,12 @@ */ package net.runelite.cache.models; -import java.io.PrintWriter; import net.runelite.cache.TextureManager; import net.runelite.cache.definitions.ModelDefinition; import net.runelite.cache.definitions.TextureDefinition; +import java.io.PrintWriter; + public class ObjExporter { private static final double BRIGHTNESS = JagexColor.BRIGHTNESS_MIN; diff --git a/cache/src/main/java/net/runelite/cache/region/Region.java b/cache/src/main/java/net/runelite/cache/region/Region.java index 17ecddce2..92b7a1f8c 100644 --- a/cache/src/main/java/net/runelite/cache/region/Region.java +++ b/cache/src/main/java/net/runelite/cache/region/Region.java @@ -24,12 +24,13 @@ */ package net.runelite.cache.region; -import java.util.ArrayList; -import java.util.List; import net.runelite.cache.definitions.LocationsDefinition; import net.runelite.cache.definitions.MapDefinition; import net.runelite.cache.definitions.MapDefinition.Tile; +import java.util.ArrayList; +import java.util.List; + public class Region { diff --git a/cache/src/main/java/net/runelite/cache/region/RegionLoader.java b/cache/src/main/java/net/runelite/cache/region/RegionLoader.java index a0085f09b..534b6442d 100644 --- a/cache/src/main/java/net/runelite/cache/region/RegionLoader.java +++ b/cache/src/main/java/net/runelite/cache/region/RegionLoader.java @@ -24,10 +24,6 @@ */ package net.runelite.cache.region; -import java.io.IOException; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; import lombok.extern.slf4j.Slf4j; import net.runelite.cache.IndexType; import net.runelite.cache.definitions.LocationsDefinition; @@ -40,6 +36,11 @@ import net.runelite.cache.fs.Store; import net.runelite.cache.util.KeyProvider; +import java.io.IOException; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + @Slf4j public class RegionLoader { diff --git a/cache/src/main/java/net/runelite/cache/script/assembler/Assembler.java b/cache/src/main/java/net/runelite/cache/script/assembler/Assembler.java index 73251e5a7..8fdad0d43 100644 --- a/cache/src/main/java/net/runelite/cache/script/assembler/Assembler.java +++ b/cache/src/main/java/net/runelite/cache/script/assembler/Assembler.java @@ -24,10 +24,6 @@ */ package net.runelite.cache.script.assembler; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; import net.runelite.cache.definitions.ScriptDefinition; import net.runelite.cache.script.Instructions; import net.runelite.cache.script.assembler.rs2asmParser.ProgContext; @@ -35,6 +31,11 @@ import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.ParseTreeWalker; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; + public class Assembler { private final Instructions instructions; diff --git a/cache/src/main/java/net/runelite/cache/script/assembler/LabelVisitor.java b/cache/src/main/java/net/runelite/cache/script/assembler/LabelVisitor.java index b78cfd652..8f510eeba 100644 --- a/cache/src/main/java/net/runelite/cache/script/assembler/LabelVisitor.java +++ b/cache/src/main/java/net/runelite/cache/script/assembler/LabelVisitor.java @@ -24,11 +24,12 @@ */ package net.runelite.cache.script.assembler; -import java.util.HashMap; -import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.HashMap; +import java.util.Map; + public class LabelVisitor extends rs2asmBaseListener { private static final Logger logger = LoggerFactory.getLogger(LabelVisitor.class); diff --git a/cache/src/main/java/net/runelite/cache/script/assembler/ScriptWriter.java b/cache/src/main/java/net/runelite/cache/script/assembler/ScriptWriter.java index 739769c21..95b748be5 100644 --- a/cache/src/main/java/net/runelite/cache/script/assembler/ScriptWriter.java +++ b/cache/src/main/java/net/runelite/cache/script/assembler/ScriptWriter.java @@ -24,11 +24,6 @@ */ package net.runelite.cache.script.assembler; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; import net.runelite.cache.definitions.ScriptDefinition; import net.runelite.cache.script.Instruction; import net.runelite.cache.script.Instructions; @@ -36,6 +31,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.*; + public class ScriptWriter extends rs2asmBaseListener { private static final Logger logger = LoggerFactory.getLogger(ScriptWriter.class); diff --git a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asm.interp b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asm.interp new file mode 100644 index 000000000..3bc045e60 --- /dev/null +++ b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asm.interp @@ -0,0 +1,60 @@ +token literal names: +null +'.id ' +'.int_stack_count ' +'.string_stack_count ' +'.int_var_count ' +'.string_var_count ' +':' +null +null +null +null +null +null + +token symbolic names: +null +null +null +null +null +null +null +NEWLINE +INT +QSTRING +IDENTIFIER +COMMENT +WS + +rule names: +prog +header +id +int_stack_count +string_stack_count +int_var_count +string_var_count +id_value +int_stack_value +string_stack_value +int_var_value +string_var_value +line +instruction +label +instruction_name +name_string +name_opcode +instruction_operand +operand_int +operand_qstring +operand_label +switch_lookup +switch_key +switch_value + + +atn: +[4, 1, 12, 149, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 1, 0, 5, 0, 52, 8, 0, 10, 0, 12, 0, 55, 9, 0, 1, 0, 1, 0, 4, 0, 59, 8, 0, 11, 0, 12, 0, 60, 5, 0, 63, 8, 0, 10, 0, 12, 0, 66, 9, 0, 1, 0, 1, 0, 4, 0, 70, 8, 0, 11, 0, 12, 0, 71, 4, 0, 74, 8, 0, 11, 0, 12, 0, 75, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 83, 8, 1, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 3, 12, 113, 8, 12, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 3, 15, 123, 8, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 3, 18, 133, 8, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 0, 0, 25, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 0, 0, 138, 0, 53, 1, 0, 0, 0, 2, 82, 1, 0, 0, 0, 4, 84, 1, 0, 0, 0, 6, 87, 1, 0, 0, 0, 8, 90, 1, 0, 0, 0, 10, 93, 1, 0, 0, 0, 12, 96, 1, 0, 0, 0, 14, 99, 1, 0, 0, 0, 16, 101, 1, 0, 0, 0, 18, 103, 1, 0, 0, 0, 20, 105, 1, 0, 0, 0, 22, 107, 1, 0, 0, 0, 24, 112, 1, 0, 0, 0, 26, 114, 1, 0, 0, 0, 28, 117, 1, 0, 0, 0, 30, 122, 1, 0, 0, 0, 32, 124, 1, 0, 0, 0, 34, 126, 1, 0, 0, 0, 36, 132, 1, 0, 0, 0, 38, 134, 1, 0, 0, 0, 40, 136, 1, 0, 0, 0, 42, 138, 1, 0, 0, 0, 44, 140, 1, 0, 0, 0, 46, 144, 1, 0, 0, 0, 48, 146, 1, 0, 0, 0, 50, 52, 5, 7, 0, 0, 51, 50, 1, 0, 0, 0, 52, 55, 1, 0, 0, 0, 53, 51, 1, 0, 0, 0, 53, 54, 1, 0, 0, 0, 54, 64, 1, 0, 0, 0, 55, 53, 1, 0, 0, 0, 56, 58, 3, 2, 1, 0, 57, 59, 5, 7, 0, 0, 58, 57, 1, 0, 0, 0, 59, 60, 1, 0, 0, 0, 60, 58, 1, 0, 0, 0, 60, 61, 1, 0, 0, 0, 61, 63, 1, 0, 0, 0, 62, 56, 1, 0, 0, 0, 63, 66, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 64, 65, 1, 0, 0, 0, 65, 73, 1, 0, 0, 0, 66, 64, 1, 0, 0, 0, 67, 69, 3, 24, 12, 0, 68, 70, 5, 7, 0, 0, 69, 68, 1, 0, 0, 0, 70, 71, 1, 0, 0, 0, 71, 69, 1, 0, 0, 0, 71, 72, 1, 0, 0, 0, 72, 74, 1, 0, 0, 0, 73, 67, 1, 0, 0, 0, 74, 75, 1, 0, 0, 0, 75, 73, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 1, 1, 0, 0, 0, 77, 83, 3, 4, 2, 0, 78, 83, 3, 6, 3, 0, 79, 83, 3, 8, 4, 0, 80, 83, 3, 10, 5, 0, 81, 83, 3, 12, 6, 0, 82, 77, 1, 0, 0, 0, 82, 78, 1, 0, 0, 0, 82, 79, 1, 0, 0, 0, 82, 80, 1, 0, 0, 0, 82, 81, 1, 0, 0, 0, 83, 3, 1, 0, 0, 0, 84, 85, 5, 1, 0, 0, 85, 86, 3, 14, 7, 0, 86, 5, 1, 0, 0, 0, 87, 88, 5, 2, 0, 0, 88, 89, 3, 16, 8, 0, 89, 7, 1, 0, 0, 0, 90, 91, 5, 3, 0, 0, 91, 92, 3, 18, 9, 0, 92, 9, 1, 0, 0, 0, 93, 94, 5, 4, 0, 0, 94, 95, 3, 20, 10, 0, 95, 11, 1, 0, 0, 0, 96, 97, 5, 5, 0, 0, 97, 98, 3, 22, 11, 0, 98, 13, 1, 0, 0, 0, 99, 100, 5, 8, 0, 0, 100, 15, 1, 0, 0, 0, 101, 102, 5, 8, 0, 0, 102, 17, 1, 0, 0, 0, 103, 104, 5, 8, 0, 0, 104, 19, 1, 0, 0, 0, 105, 106, 5, 8, 0, 0, 106, 21, 1, 0, 0, 0, 107, 108, 5, 8, 0, 0, 108, 23, 1, 0, 0, 0, 109, 113, 3, 26, 13, 0, 110, 113, 3, 28, 14, 0, 111, 113, 3, 44, 22, 0, 112, 109, 1, 0, 0, 0, 112, 110, 1, 0, 0, 0, 112, 111, 1, 0, 0, 0, 113, 25, 1, 0, 0, 0, 114, 115, 3, 30, 15, 0, 115, 116, 3, 36, 18, 0, 116, 27, 1, 0, 0, 0, 117, 118, 5, 10, 0, 0, 118, 119, 5, 6, 0, 0, 119, 29, 1, 0, 0, 0, 120, 123, 3, 32, 16, 0, 121, 123, 3, 34, 17, 0, 122, 120, 1, 0, 0, 0, 122, 121, 1, 0, 0, 0, 123, 31, 1, 0, 0, 0, 124, 125, 5, 10, 0, 0, 125, 33, 1, 0, 0, 0, 126, 127, 5, 8, 0, 0, 127, 35, 1, 0, 0, 0, 128, 133, 3, 38, 19, 0, 129, 133, 3, 40, 20, 0, 130, 133, 3, 42, 21, 0, 131, 133, 1, 0, 0, 0, 132, 128, 1, 0, 0, 0, 132, 129, 1, 0, 0, 0, 132, 130, 1, 0, 0, 0, 132, 131, 1, 0, 0, 0, 133, 37, 1, 0, 0, 0, 134, 135, 5, 8, 0, 0, 135, 39, 1, 0, 0, 0, 136, 137, 5, 9, 0, 0, 137, 41, 1, 0, 0, 0, 138, 139, 5, 10, 0, 0, 139, 43, 1, 0, 0, 0, 140, 141, 3, 46, 23, 0, 141, 142, 5, 6, 0, 0, 142, 143, 3, 48, 24, 0, 143, 45, 1, 0, 0, 0, 144, 145, 5, 8, 0, 0, 145, 47, 1, 0, 0, 0, 146, 147, 5, 10, 0, 0, 147, 49, 1, 0, 0, 0, 9, 53, 60, 64, 71, 75, 82, 112, 122, 132] \ No newline at end of file diff --git a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmBaseListener.java b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmBaseListener.java index b793e66c6..2639079d1 100644 --- a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmBaseListener.java +++ b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmBaseListener.java @@ -1,4 +1,4 @@ -// Generated from net\runelite\cache\script\assembler\rs2asm.g4 by ANTLR 4.6 +// Generated from net/runelite/cache/script/assembler/rs2asm.g4 by ANTLR 4.13.1 package net.runelite.cache.script.assembler; import org.antlr.v4.runtime.ParserRuleContext; @@ -10,6 +10,7 @@ * which can be extended to create a listener which only needs to handle a subset * of the available methods. */ +@SuppressWarnings("CheckReturnValue") public class rs2asmBaseListener implements rs2asmListener { /** @@ -518,7 +519,7 @@ public void exitSwitch_value(rs2asmParser.Switch_valueContext ctx) *

The default implementation does nothing.

*/ @Override - public void visitTerminal(TerminalNode node) + public void enterEveryRule(ParserRuleContext ctx) { } @@ -528,7 +529,7 @@ public void visitTerminal(TerminalNode node) *

The default implementation does nothing.

*/ @Override - public void visitErrorNode(ErrorNode node) + public void exitEveryRule(ParserRuleContext ctx) { } @@ -538,7 +539,7 @@ public void visitErrorNode(ErrorNode node) *

The default implementation does nothing.

*/ @Override - public void enterEveryRule(ParserRuleContext ctx) + public void visitTerminal(TerminalNode node) { } @@ -548,7 +549,7 @@ public void enterEveryRule(ParserRuleContext ctx) *

The default implementation does nothing.

*/ @Override - public void exitEveryRule(ParserRuleContext ctx) + public void visitErrorNode(ErrorNode node) { } } \ No newline at end of file diff --git a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.interp b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.interp new file mode 100644 index 000000000..0b1fbfa63 --- /dev/null +++ b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.interp @@ -0,0 +1,53 @@ +token literal names: +null +'.id ' +'.int_stack_count ' +'.string_stack_count ' +'.int_var_count ' +'.string_var_count ' +':' +null +null +null +null +null +null + +token symbolic names: +null +null +null +null +null +null +null +NEWLINE +INT +QSTRING +IDENTIFIER +COMMENT +WS + +rule names: +T__0 +T__1 +T__2 +T__3 +T__4 +T__5 +NEWLINE +INT +QSTRING +IDENTIFIER +COMMENT +WS + +channel names: +DEFAULT_TOKEN_CHANNEL +HIDDEN + +mode names: +DEFAULT_MODE + +atn: +[4, 0, 12, 151, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 4, 6, 108, 8, 6, 11, 6, 12, 6, 109, 1, 7, 3, 7, 113, 8, 7, 1, 7, 4, 7, 116, 8, 7, 11, 7, 12, 7, 117, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 124, 8, 8, 10, 8, 12, 8, 127, 9, 8, 1, 8, 1, 8, 1, 9, 4, 9, 132, 8, 9, 11, 9, 12, 9, 133, 1, 10, 1, 10, 5, 10, 138, 8, 10, 10, 10, 12, 10, 141, 9, 10, 1, 10, 1, 10, 1, 11, 4, 11, 146, 8, 11, 11, 11, 12, 11, 147, 1, 11, 1, 11, 0, 0, 12, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 1, 0, 6, 2, 0, 10, 10, 13, 13, 1, 0, 48, 57, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 2, 0, 34, 34, 92, 92, 4, 0, 48, 57, 65, 90, 95, 95, 97, 122, 2, 0, 9, 9, 32, 32, 158, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 1, 25, 1, 0, 0, 0, 3, 30, 1, 0, 0, 0, 5, 48, 1, 0, 0, 0, 7, 69, 1, 0, 0, 0, 9, 85, 1, 0, 0, 0, 11, 104, 1, 0, 0, 0, 13, 107, 1, 0, 0, 0, 15, 112, 1, 0, 0, 0, 17, 119, 1, 0, 0, 0, 19, 131, 1, 0, 0, 0, 21, 135, 1, 0, 0, 0, 23, 145, 1, 0, 0, 0, 25, 26, 5, 46, 0, 0, 26, 27, 5, 105, 0, 0, 27, 28, 5, 100, 0, 0, 28, 29, 5, 32, 0, 0, 29, 2, 1, 0, 0, 0, 30, 31, 5, 46, 0, 0, 31, 32, 5, 105, 0, 0, 32, 33, 5, 110, 0, 0, 33, 34, 5, 116, 0, 0, 34, 35, 5, 95, 0, 0, 35, 36, 5, 115, 0, 0, 36, 37, 5, 116, 0, 0, 37, 38, 5, 97, 0, 0, 38, 39, 5, 99, 0, 0, 39, 40, 5, 107, 0, 0, 40, 41, 5, 95, 0, 0, 41, 42, 5, 99, 0, 0, 42, 43, 5, 111, 0, 0, 43, 44, 5, 117, 0, 0, 44, 45, 5, 110, 0, 0, 45, 46, 5, 116, 0, 0, 46, 47, 5, 32, 0, 0, 47, 4, 1, 0, 0, 0, 48, 49, 5, 46, 0, 0, 49, 50, 5, 115, 0, 0, 50, 51, 5, 116, 0, 0, 51, 52, 5, 114, 0, 0, 52, 53, 5, 105, 0, 0, 53, 54, 5, 110, 0, 0, 54, 55, 5, 103, 0, 0, 55, 56, 5, 95, 0, 0, 56, 57, 5, 115, 0, 0, 57, 58, 5, 116, 0, 0, 58, 59, 5, 97, 0, 0, 59, 60, 5, 99, 0, 0, 60, 61, 5, 107, 0, 0, 61, 62, 5, 95, 0, 0, 62, 63, 5, 99, 0, 0, 63, 64, 5, 111, 0, 0, 64, 65, 5, 117, 0, 0, 65, 66, 5, 110, 0, 0, 66, 67, 5, 116, 0, 0, 67, 68, 5, 32, 0, 0, 68, 6, 1, 0, 0, 0, 69, 70, 5, 46, 0, 0, 70, 71, 5, 105, 0, 0, 71, 72, 5, 110, 0, 0, 72, 73, 5, 116, 0, 0, 73, 74, 5, 95, 0, 0, 74, 75, 5, 118, 0, 0, 75, 76, 5, 97, 0, 0, 76, 77, 5, 114, 0, 0, 77, 78, 5, 95, 0, 0, 78, 79, 5, 99, 0, 0, 79, 80, 5, 111, 0, 0, 80, 81, 5, 117, 0, 0, 81, 82, 5, 110, 0, 0, 82, 83, 5, 116, 0, 0, 83, 84, 5, 32, 0, 0, 84, 8, 1, 0, 0, 0, 85, 86, 5, 46, 0, 0, 86, 87, 5, 115, 0, 0, 87, 88, 5, 116, 0, 0, 88, 89, 5, 114, 0, 0, 89, 90, 5, 105, 0, 0, 90, 91, 5, 110, 0, 0, 91, 92, 5, 103, 0, 0, 92, 93, 5, 95, 0, 0, 93, 94, 5, 118, 0, 0, 94, 95, 5, 97, 0, 0, 95, 96, 5, 114, 0, 0, 96, 97, 5, 95, 0, 0, 97, 98, 5, 99, 0, 0, 98, 99, 5, 111, 0, 0, 99, 100, 5, 117, 0, 0, 100, 101, 5, 110, 0, 0, 101, 102, 5, 116, 0, 0, 102, 103, 5, 32, 0, 0, 103, 10, 1, 0, 0, 0, 104, 105, 5, 58, 0, 0, 105, 12, 1, 0, 0, 0, 106, 108, 7, 0, 0, 0, 107, 106, 1, 0, 0, 0, 108, 109, 1, 0, 0, 0, 109, 107, 1, 0, 0, 0, 109, 110, 1, 0, 0, 0, 110, 14, 1, 0, 0, 0, 111, 113, 5, 45, 0, 0, 112, 111, 1, 0, 0, 0, 112, 113, 1, 0, 0, 0, 113, 115, 1, 0, 0, 0, 114, 116, 7, 1, 0, 0, 115, 114, 1, 0, 0, 0, 116, 117, 1, 0, 0, 0, 117, 115, 1, 0, 0, 0, 117, 118, 1, 0, 0, 0, 118, 16, 1, 0, 0, 0, 119, 125, 5, 34, 0, 0, 120, 124, 8, 2, 0, 0, 121, 122, 5, 92, 0, 0, 122, 124, 7, 3, 0, 0, 123, 120, 1, 0, 0, 0, 123, 121, 1, 0, 0, 0, 124, 127, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 125, 126, 1, 0, 0, 0, 126, 128, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 128, 129, 5, 34, 0, 0, 129, 18, 1, 0, 0, 0, 130, 132, 7, 4, 0, 0, 131, 130, 1, 0, 0, 0, 132, 133, 1, 0, 0, 0, 133, 131, 1, 0, 0, 0, 133, 134, 1, 0, 0, 0, 134, 20, 1, 0, 0, 0, 135, 139, 5, 59, 0, 0, 136, 138, 8, 0, 0, 0, 137, 136, 1, 0, 0, 0, 138, 141, 1, 0, 0, 0, 139, 137, 1, 0, 0, 0, 139, 140, 1, 0, 0, 0, 140, 142, 1, 0, 0, 0, 141, 139, 1, 0, 0, 0, 142, 143, 6, 10, 0, 0, 143, 22, 1, 0, 0, 0, 144, 146, 7, 5, 0, 0, 145, 144, 1, 0, 0, 0, 146, 147, 1, 0, 0, 0, 147, 145, 1, 0, 0, 0, 147, 148, 1, 0, 0, 0, 148, 149, 1, 0, 0, 0, 149, 150, 6, 11, 0, 0, 150, 24, 1, 0, 0, 0, 9, 0, 109, 112, 117, 123, 125, 133, 139, 147, 1, 0, 1, 0] \ No newline at end of file diff --git a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.java b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.java index 0328da7ae..8a317951a 100644 --- a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.java +++ b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.java @@ -1,91 +1,71 @@ -// Generated from net\runelite\cache\script\assembler\rs2asm.g4 by ANTLR 4.6 +// Generated from net/runelite/cache/script/assembler/rs2asm.g4 by ANTLR 4.13.1 package net.runelite.cache.script.assembler; -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.Lexer; -import org.antlr.v4.runtime.RuntimeMetaData; -import org.antlr.v4.runtime.Vocabulary; -import org.antlr.v4.runtime.VocabularyImpl; +import org.antlr.v4.runtime.*; import org.antlr.v4.runtime.atn.ATN; import org.antlr.v4.runtime.atn.ATNDeserializer; import org.antlr.v4.runtime.atn.LexerATNSimulator; import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) +@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue", "this-escape"}) public class rs2asmLexer extends Lexer { + static + { + RuntimeMetaData.checkVersion("4.13.1", RuntimeMetaData.VERSION); + } + + protected static final DFA[] _decisionToDFA; + protected static final PredictionContextCache _sharedContextCache = + new PredictionContextCache(); public static final int T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, NEWLINE = 7, INT = 8, QSTRING = 9, IDENTIFIER = 10, COMMENT = 11, WS = 12; - public static final String[] ruleNames = { - "T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "NEWLINE", "INT", "QSTRING", - "IDENTIFIER", "COMMENT", "WS" + public static String[] channelNames = { + "DEFAULT_TOKEN_CHANNEL", "HIDDEN" + }; + + public static String[] modeNames = { + "DEFAULT_MODE" }; + + private static String[] makeRuleNames() + { + return new String[]{ + "T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "NEWLINE", "INT", "QSTRING", + "IDENTIFIER", "COMMENT", "WS" + }; + } + + public static final String[] ruleNames = makeRuleNames(); + + private static String[] makeLiteralNames() + { + return new String[]{ + null, "'.id '", "'.int_stack_count '", "'.string_stack_count '", "'.int_var_count '", + "'.string_var_count '", "':'" + }; + } + + private static final String[] _LITERAL_NAMES = makeLiteralNames(); + + private static String[] makeSymbolicNames() + { + return new String[]{ + null, null, null, null, null, null, null, "NEWLINE", "INT", "QSTRING", + "IDENTIFIER", "COMMENT", "WS" + }; + } + + private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames(); + public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); + /** * @deprecated Use {@link #VOCABULARY} instead. */ @Deprecated public static final String[] tokenNames; - public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2\16\u0099\b\1\4\2" + - "\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4" + - "\13\t\13\4\f\t\f\4\r\t\r\3\2\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3" + - "\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4" + - "\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\5\3\5\3" + - "\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6" + - "\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3" + - "\b\6\bn\n\b\r\b\16\bo\3\t\5\ts\n\t\3\t\6\tv\n\t\r\t\16\tw\3\n\3\n\3\n" + - "\3\n\7\n~\n\n\f\n\16\n\u0081\13\n\3\n\3\n\3\13\6\13\u0086\n\13\r\13\16" + - "\13\u0087\3\f\3\f\7\f\u008c\n\f\f\f\16\f\u008f\13\f\3\f\3\f\3\r\6\r\u0094" + - "\n\r\r\r\16\r\u0095\3\r\3\r\2\2\16\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n" + - "\23\13\25\f\27\r\31\16\3\2\b\4\2\f\f\17\17\3\2\62;\6\2\f\f\17\17$$^^\4" + - "\2$$^^\6\2\62;C\\aac|\4\2\13\13\"\"\u00a0\2\3\3\2\2\2\2\5\3\2\2\2\2\7" + - "\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2" + - "\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\3\33\3\2\2\2\5" + - " \3\2\2\2\7\62\3\2\2\2\tG\3\2\2\2\13W\3\2\2\2\rj\3\2\2\2\17m\3\2\2\2\21" + - "r\3\2\2\2\23y\3\2\2\2\25\u0085\3\2\2\2\27\u0089\3\2\2\2\31\u0093\3\2\2" + - "\2\33\34\7\60\2\2\34\35\7k\2\2\35\36\7f\2\2\36\37\7\"\2\2\37\4\3\2\2\2" + - " !\7\60\2\2!\"\7k\2\2\"#\7p\2\2#$\7v\2\2$%\7a\2\2%&\7u\2\2&\'\7v\2\2\'" + - "(\7c\2\2()\7e\2\2)*\7m\2\2*+\7a\2\2+,\7e\2\2,-\7q\2\2-.\7w\2\2./\7p\2" + - "\2/\60\7v\2\2\60\61\7\"\2\2\61\6\3\2\2\2\62\63\7\60\2\2\63\64\7u\2\2\64" + - "\65\7v\2\2\65\66\7t\2\2\66\67\7k\2\2\678\7p\2\289\7i\2\29:\7a\2\2:;\7" + - "u\2\2;<\7v\2\2<=\7c\2\2=>\7e\2\2>?\7m\2\2?@\7a\2\2@A\7e\2\2AB\7q\2\2B" + - "C\7w\2\2CD\7p\2\2DE\7v\2\2EF\7\"\2\2F\b\3\2\2\2GH\7\60\2\2HI\7k\2\2IJ" + - "\7p\2\2JK\7v\2\2KL\7a\2\2LM\7x\2\2MN\7c\2\2NO\7t\2\2OP\7a\2\2PQ\7e\2\2" + - "QR\7q\2\2RS\7w\2\2ST\7p\2\2TU\7v\2\2UV\7\"\2\2V\n\3\2\2\2WX\7\60\2\2X" + - "Y\7u\2\2YZ\7v\2\2Z[\7t\2\2[\\\7k\2\2\\]\7p\2\2]^\7i\2\2^_\7a\2\2_`\7x" + - "\2\2`a\7c\2\2ab\7t\2\2bc\7a\2\2cd\7e\2\2de\7q\2\2ef\7w\2\2fg\7p\2\2gh" + - "\7v\2\2hi\7\"\2\2i\f\3\2\2\2jk\7<\2\2k\16\3\2\2\2ln\t\2\2\2ml\3\2\2\2" + - "no\3\2\2\2om\3\2\2\2op\3\2\2\2p\20\3\2\2\2qs\7/\2\2rq\3\2\2\2rs\3\2\2" + - "\2su\3\2\2\2tv\t\3\2\2ut\3\2\2\2vw\3\2\2\2wu\3\2\2\2wx\3\2\2\2x\22\3\2" + - "\2\2y\177\7$\2\2z~\n\4\2\2{|\7^\2\2|~\t\5\2\2}z\3\2\2\2}{\3\2\2\2~\u0081" + - "\3\2\2\2\177}\3\2\2\2\177\u0080\3\2\2\2\u0080\u0082\3\2\2\2\u0081\177" + - "\3\2\2\2\u0082\u0083\7$\2\2\u0083\24\3\2\2\2\u0084\u0086\t\6\2\2\u0085" + - "\u0084\3\2\2\2\u0086\u0087\3\2\2\2\u0087\u0085\3\2\2\2\u0087\u0088\3\2" + - "\2\2\u0088\26\3\2\2\2\u0089\u008d\7=\2\2\u008a\u008c\n\2\2\2\u008b\u008a" + - "\3\2\2\2\u008c\u008f\3\2\2\2\u008d\u008b\3\2\2\2\u008d\u008e\3\2\2\2\u008e" + - "\u0090\3\2\2\2\u008f\u008d\3\2\2\2\u0090\u0091\b\f\2\2\u0091\30\3\2\2" + - "\2\u0092\u0094\t\7\2\2\u0093\u0092\3\2\2\2\u0094\u0095\3\2\2\2\u0095\u0093" + - "\3\2\2\2\u0095\u0096\3\2\2\2\u0096\u0097\3\2\2\2\u0097\u0098\b\r\2\2\u0098" + - "\32\3\2\2\2\13\2orw}\177\u0087\u008d\u0095\3\2\3\2"; - public static final ATN _ATN = - new ATNDeserializer().deserialize(_serializedATN.toCharArray()); - protected static final DFA[] _decisionToDFA; - protected static final PredictionContextCache _sharedContextCache = - new PredictionContextCache(); - private static final String[] _LITERAL_NAMES = { - null, "'.id '", "'.int_stack_count '", "'.string_stack_count '", "'.int_var_count '", - "'.string_var_count '", "':'" - }; - private static final String[] _SYMBOLIC_NAMES = { - null, null, null, null, null, null, null, "NEWLINE", "INT", "QSTRING", - "IDENTIFIER", "COMMENT", "WS" - }; - public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); - public static String[] modeNames = { - "DEFAULT_MODE" - }; static { @@ -105,13 +85,18 @@ public class rs2asmLexer extends Lexer } } - static + @Override + @Deprecated + public String[] getTokenNames() { - _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()]; - for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) - { - _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i); - } + return tokenNames; + } + + @Override + + public Vocabulary getVocabulary() + { + return VOCABULARY; } public rs2asmLexer(CharStream input) @@ -121,16 +106,15 @@ public rs2asmLexer(CharStream input) } @Override - public String[] getRuleNames() + public String getGrammarFileName() { - return ruleNames; + return "rs2asm.g4"; } @Override - - public Vocabulary getVocabulary() + public String[] getRuleNames() { - return VOCABULARY; + return ruleNames; } @Override @@ -140,27 +124,121 @@ public String getSerializedATN() } @Override - public String getGrammarFileName() + public String[] getChannelNames() { - return "rs2asm.g4"; + return channelNames; } @Override - public ATN getATN() + public String[] getModeNames() { - return _ATN; + return modeNames; } @Override - public String[] getModeNames() + public ATN getATN() { - return modeNames; + return _ATN; } - @Override - @Deprecated - public String[] getTokenNames() + public static final String _serializedATN = + "\u0004\u0000\f\u0097\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001" + + "\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004" + + "\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007" + + "\u0007\u0007\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b" + + "\u0007\u000b\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000" + + "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001" + + "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001" + + "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001" + + "\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002" + + "\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002" + + "\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002" + + "\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0003" + + "\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003" + + "\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003" + + "\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004" + + "\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004" + + "\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004" + + "\u0001\u0004\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0006\u0004\u0006" + + "l\b\u0006\u000b\u0006\f\u0006m\u0001\u0007\u0003\u0007q\b\u0007\u0001" + + "\u0007\u0004\u0007t\b\u0007\u000b\u0007\f\u0007u\u0001\b\u0001\b\u0001" + + "\b\u0001\b\u0005\b|\b\b\n\b\f\b\u007f\t\b\u0001\b\u0001\b\u0001\t\u0004" + + "\t\u0084\b\t\u000b\t\f\t\u0085\u0001\n\u0001\n\u0005\n\u008a\b\n\n\n\f" + + "\n\u008d\t\n\u0001\n\u0001\n\u0001\u000b\u0004\u000b\u0092\b\u000b\u000b" + + "\u000b\f\u000b\u0093\u0001\u000b\u0001\u000b\u0000\u0000\f\u0001\u0001" + + "\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r\u0007\u000f" + + "\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0001\u0000\u0006\u0002\u0000\n" + + "\n\r\r\u0001\u000009\u0004\u0000\n\n\r\r\"\"\\\\\u0002\u0000\"\"\\\\\u0004" + + "\u000009AZ__az\u0002\u0000\t\t \u009e\u0000\u0001\u0001\u0000\u0000\u0000" + + "\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005\u0001\u0000\u0000\u0000" + + "\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001\u0000\u0000\u0000\u0000" + + "\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000\u0000\u0000\u0000\u000f" + + "\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000\u0000\u0000\u0000\u0013" + + "\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000\u0000\u0000\u0000\u0017" + + "\u0001\u0000\u0000\u0000\u0001\u0019\u0001\u0000\u0000\u0000\u0003\u001e" + + "\u0001\u0000\u0000\u0000\u00050\u0001\u0000\u0000\u0000\u0007E\u0001\u0000" + + "\u0000\u0000\tU\u0001\u0000\u0000\u0000\u000bh\u0001\u0000\u0000\u0000" + + "\rk\u0001\u0000\u0000\u0000\u000fp\u0001\u0000\u0000\u0000\u0011w\u0001" + + "\u0000\u0000\u0000\u0013\u0083\u0001\u0000\u0000\u0000\u0015\u0087\u0001" + + "\u0000\u0000\u0000\u0017\u0091\u0001\u0000\u0000\u0000\u0019\u001a\u0005" + + ".\u0000\u0000\u001a\u001b\u0005i\u0000\u0000\u001b\u001c\u0005d\u0000" + + "\u0000\u001c\u001d\u0005 \u0000\u0000\u001d\u0002\u0001\u0000\u0000\u0000" + + "\u001e\u001f\u0005.\u0000\u0000\u001f \u0005i\u0000\u0000 !\u0005n\u0000" + + "\u0000!\"\u0005t\u0000\u0000\"#\u0005_\u0000\u0000#$\u0005s\u0000\u0000" + + "$%\u0005t\u0000\u0000%&\u0005a\u0000\u0000&\'\u0005c\u0000\u0000\'(\u0005" + + "k\u0000\u0000()\u0005_\u0000\u0000)*\u0005c\u0000\u0000*+\u0005o\u0000" + + "\u0000+,\u0005u\u0000\u0000,-\u0005n\u0000\u0000-.\u0005t\u0000\u0000" + + "./\u0005 \u0000\u0000/\u0004\u0001\u0000\u0000\u000001\u0005.\u0000\u0000" + + "12\u0005s\u0000\u000023\u0005t\u0000\u000034\u0005r\u0000\u000045\u0005" + + "i\u0000\u000056\u0005n\u0000\u000067\u0005g\u0000\u000078\u0005_\u0000" + + "\u000089\u0005s\u0000\u00009:\u0005t\u0000\u0000:;\u0005a\u0000\u0000" + + ";<\u0005c\u0000\u0000<=\u0005k\u0000\u0000=>\u0005_\u0000\u0000>?\u0005" + + "c\u0000\u0000?@\u0005o\u0000\u0000@A\u0005u\u0000\u0000AB\u0005n\u0000" + + "\u0000BC\u0005t\u0000\u0000CD\u0005 \u0000\u0000D\u0006\u0001\u0000\u0000" + + "\u0000EF\u0005.\u0000\u0000FG\u0005i\u0000\u0000GH\u0005n\u0000\u0000" + + "HI\u0005t\u0000\u0000IJ\u0005_\u0000\u0000JK\u0005v\u0000\u0000KL\u0005" + + "a\u0000\u0000LM\u0005r\u0000\u0000MN\u0005_\u0000\u0000NO\u0005c\u0000" + + "\u0000OP\u0005o\u0000\u0000PQ\u0005u\u0000\u0000QR\u0005n\u0000\u0000" + + "RS\u0005t\u0000\u0000ST\u0005 \u0000\u0000T\b\u0001\u0000\u0000\u0000" + + "UV\u0005.\u0000\u0000VW\u0005s\u0000\u0000WX\u0005t\u0000\u0000XY\u0005" + + "r\u0000\u0000YZ\u0005i\u0000\u0000Z[\u0005n\u0000\u0000[\\\u0005g\u0000" + + "\u0000\\]\u0005_\u0000\u0000]^\u0005v\u0000\u0000^_\u0005a\u0000\u0000" + + "_`\u0005r\u0000\u0000`a\u0005_\u0000\u0000ab\u0005c\u0000\u0000bc\u0005" + + "o\u0000\u0000cd\u0005u\u0000\u0000de\u0005n\u0000\u0000ef\u0005t\u0000" + + "\u0000fg\u0005 \u0000\u0000g\n\u0001\u0000\u0000\u0000hi\u0005:\u0000" + + "\u0000i\f\u0001\u0000\u0000\u0000jl\u0007\u0000\u0000\u0000kj\u0001\u0000" + + "\u0000\u0000lm\u0001\u0000\u0000\u0000mk\u0001\u0000\u0000\u0000mn\u0001" + + "\u0000\u0000\u0000n\u000e\u0001\u0000\u0000\u0000oq\u0005-\u0000\u0000" + + "po\u0001\u0000\u0000\u0000pq\u0001\u0000\u0000\u0000qs\u0001\u0000\u0000" + + "\u0000rt\u0007\u0001\u0000\u0000sr\u0001\u0000\u0000\u0000tu\u0001\u0000" + + "\u0000\u0000us\u0001\u0000\u0000\u0000uv\u0001\u0000\u0000\u0000v\u0010" + + "\u0001\u0000\u0000\u0000w}\u0005\"\u0000\u0000x|\b\u0002\u0000\u0000y" + + "z\u0005\\\u0000\u0000z|\u0007\u0003\u0000\u0000{x\u0001\u0000\u0000\u0000" + + "{y\u0001\u0000\u0000\u0000|\u007f\u0001\u0000\u0000\u0000}{\u0001\u0000" + + "\u0000\u0000}~\u0001\u0000\u0000\u0000~\u0080\u0001\u0000\u0000\u0000" + + "\u007f}\u0001\u0000\u0000\u0000\u0080\u0081\u0005\"\u0000\u0000\u0081" + + "\u0012\u0001\u0000\u0000\u0000\u0082\u0084\u0007\u0004\u0000\u0000\u0083" + + "\u0082\u0001\u0000\u0000\u0000\u0084\u0085\u0001\u0000\u0000\u0000\u0085" + + "\u0083\u0001\u0000\u0000\u0000\u0085\u0086\u0001\u0000\u0000\u0000\u0086" + + "\u0014\u0001\u0000\u0000\u0000\u0087\u008b\u0005;\u0000\u0000\u0088\u008a" + + "\b\u0000\u0000\u0000\u0089\u0088\u0001\u0000\u0000\u0000\u008a\u008d\u0001" + + "\u0000\u0000\u0000\u008b\u0089\u0001\u0000\u0000\u0000\u008b\u008c\u0001" + + "\u0000\u0000\u0000\u008c\u008e\u0001\u0000\u0000\u0000\u008d\u008b\u0001" + + "\u0000\u0000\u0000\u008e\u008f\u0006\n\u0000\u0000\u008f\u0016\u0001\u0000" + + "\u0000\u0000\u0090\u0092\u0007\u0005\u0000\u0000\u0091\u0090\u0001\u0000" + + "\u0000\u0000\u0092\u0093\u0001\u0000\u0000\u0000\u0093\u0091\u0001\u0000" + + "\u0000\u0000\u0093\u0094\u0001\u0000\u0000\u0000\u0094\u0095\u0001\u0000" + + "\u0000\u0000\u0095\u0096\u0006\u000b\u0000\u0000\u0096\u0018\u0001\u0000" + + "\u0000\u0000\t\u0000mpu{}\u0085\u008b\u0093\u0001\u0000\u0001\u0000"; + public static final ATN _ATN = + new ATNDeserializer().deserialize(_serializedATN.toCharArray()); + + static { - return tokenNames; + _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()]; + for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) + { + _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i); + } } } \ No newline at end of file diff --git a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmListener.java b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmListener.java index d4d8e39ab..ef024bf19 100644 --- a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmListener.java +++ b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmListener.java @@ -1,4 +1,4 @@ -// Generated from net\runelite\cache\script\assembler\rs2asm.g4 by ANTLR 4.6 +// Generated from net/runelite/cache/script/assembler/rs2asm.g4 by ANTLR 4.13.1 package net.runelite.cache.script.assembler; import org.antlr.v4.runtime.tree.ParseTreeListener; diff --git a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmParser.java b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmParser.java index c07fa7c79..81d7d1e61 100644 --- a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmParser.java +++ b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmParser.java @@ -1,15 +1,7 @@ -// Generated from net\runelite\cache\script\assembler\rs2asm.g4 by ANTLR 4.6 +// Generated from net/runelite/cache/script/assembler/rs2asm.g4 by ANTLR 4.13.1 package net.runelite.cache.script.assembler; -import java.util.List; -import org.antlr.v4.runtime.NoViableAltException; -import org.antlr.v4.runtime.Parser; -import org.antlr.v4.runtime.ParserRuleContext; -import org.antlr.v4.runtime.RecognitionException; -import org.antlr.v4.runtime.RuntimeMetaData; -import org.antlr.v4.runtime.TokenStream; -import org.antlr.v4.runtime.Vocabulary; -import org.antlr.v4.runtime.VocabularyImpl; +import org.antlr.v4.runtime.*; import org.antlr.v4.runtime.atn.ATN; import org.antlr.v4.runtime.atn.ATNDeserializer; import org.antlr.v4.runtime.atn.ParserATNSimulator; @@ -18,9 +10,19 @@ import org.antlr.v4.runtime.tree.ParseTreeListener; import org.antlr.v4.runtime.tree.TerminalNode; -@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) +import java.util.List; + +@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"}) public class rs2asmParser extends Parser { + static + { + RuntimeMetaData.checkVersion("4.13.1", RuntimeMetaData.VERSION); + } + + protected static final DFA[] _decisionToDFA; + protected static final PredictionContextCache _sharedContextCache = + new PredictionContextCache(); public static final int T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, NEWLINE = 7, INT = 8, QSTRING = 9, IDENTIFIER = 10, COMMENT = 11, WS = 12; @@ -33,70 +35,47 @@ public class rs2asmParser extends Parser RULE_instruction_operand = 18, RULE_operand_int = 19, RULE_operand_qstring = 20, RULE_operand_label = 21, RULE_switch_lookup = 22, RULE_switch_key = 23, RULE_switch_value = 24; - public static final String[] ruleNames = { - "prog", "header", "id", "int_stack_count", "string_stack_count", "int_var_count", - "string_var_count", "id_value", "int_stack_value", "string_stack_value", - "int_var_value", "string_var_value", "line", "instruction", "label", "instruction_name", - "name_string", "name_opcode", "instruction_operand", "operand_int", "operand_qstring", - "operand_label", "switch_lookup", "switch_key", "switch_value" - }; + + private static String[] makeRuleNames() + { + return new String[]{ + "prog", "header", "id", "int_stack_count", "string_stack_count", "int_var_count", + "string_var_count", "id_value", "int_stack_value", "string_stack_value", + "int_var_value", "string_var_value", "line", "instruction", "label", + "instruction_name", "name_string", "name_opcode", "instruction_operand", + "operand_int", "operand_qstring", "operand_label", "switch_lookup", "switch_key", + "switch_value" + }; + } + + public static final String[] ruleNames = makeRuleNames(); + + private static String[] makeLiteralNames() + { + return new String[]{ + null, "'.id '", "'.int_stack_count '", "'.string_stack_count '", "'.int_var_count '", + "'.string_var_count '", "':'" + }; + } + + private static final String[] _LITERAL_NAMES = makeLiteralNames(); + + private static String[] makeSymbolicNames() + { + return new String[]{ + null, null, null, null, null, null, null, "NEWLINE", "INT", "QSTRING", + "IDENTIFIER", "COMMENT", "WS" + }; + } + + private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames(); + public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); + /** * @deprecated Use {@link #VOCABULARY} instead. */ @Deprecated public static final String[] tokenNames; - public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\16\u0097\4\2\t\2" + - "\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13" + - "\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22" + - "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31" + - "\4\32\t\32\3\2\7\2\66\n\2\f\2\16\29\13\2\3\2\3\2\6\2=\n\2\r\2\16\2>\7" + - "\2A\n\2\f\2\16\2D\13\2\3\2\3\2\6\2H\n\2\r\2\16\2I\6\2L\n\2\r\2\16\2M\3" + - "\3\3\3\3\3\3\3\3\3\5\3U\n\3\3\4\3\4\3\4\3\5\3\5\3\5\3\6\3\6\3\6\3\7\3" + - "\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n\3\13\3\13\3\f\3\f\3\r\3\r\3\16\3\16" + - "\3\16\5\16s\n\16\3\17\3\17\3\17\3\20\3\20\3\20\3\21\3\21\5\21}\n\21\3" + - "\22\3\22\3\23\3\23\3\24\3\24\3\24\3\24\5\24\u0087\n\24\3\25\3\25\3\26" + - "\3\26\3\27\3\27\3\30\3\30\3\30\3\30\3\31\3\31\3\32\3\32\3\32\2\2\33\2" + - "\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\2\2\u008c\2\67\3" + - "\2\2\2\4T\3\2\2\2\6V\3\2\2\2\bY\3\2\2\2\n\\\3\2\2\2\f_\3\2\2\2\16b\3\2" + - "\2\2\20e\3\2\2\2\22g\3\2\2\2\24i\3\2\2\2\26k\3\2\2\2\30m\3\2\2\2\32r\3" + - "\2\2\2\34t\3\2\2\2\36w\3\2\2\2 |\3\2\2\2\"~\3\2\2\2$\u0080\3\2\2\2&\u0086" + - "\3\2\2\2(\u0088\3\2\2\2*\u008a\3\2\2\2,\u008c\3\2\2\2.\u008e\3\2\2\2\60" + - "\u0092\3\2\2\2\62\u0094\3\2\2\2\64\66\7\t\2\2\65\64\3\2\2\2\669\3\2\2" + - "\2\67\65\3\2\2\2\678\3\2\2\28B\3\2\2\29\67\3\2\2\2:<\5\4\3\2;=\7\t\2\2" + - "<;\3\2\2\2=>\3\2\2\2><\3\2\2\2>?\3\2\2\2?A\3\2\2\2@:\3\2\2\2AD\3\2\2\2" + - "B@\3\2\2\2BC\3\2\2\2CK\3\2\2\2DB\3\2\2\2EG\5\32\16\2FH\7\t\2\2GF\3\2\2" + - "\2HI\3\2\2\2IG\3\2\2\2IJ\3\2\2\2JL\3\2\2\2KE\3\2\2\2LM\3\2\2\2MK\3\2\2" + - "\2MN\3\2\2\2N\3\3\2\2\2OU\5\6\4\2PU\5\b\5\2QU\5\n\6\2RU\5\f\7\2SU\5\16" + - "\b\2TO\3\2\2\2TP\3\2\2\2TQ\3\2\2\2TR\3\2\2\2TS\3\2\2\2U\5\3\2\2\2VW\7" + - "\3\2\2WX\5\20\t\2X\7\3\2\2\2YZ\7\4\2\2Z[\5\22\n\2[\t\3\2\2\2\\]\7\5\2" + - "\2]^\5\24\13\2^\13\3\2\2\2_`\7\6\2\2`a\5\26\f\2a\r\3\2\2\2bc\7\7\2\2c" + - "d\5\30\r\2d\17\3\2\2\2ef\7\n\2\2f\21\3\2\2\2gh\7\n\2\2h\23\3\2\2\2ij\7" + - "\n\2\2j\25\3\2\2\2kl\7\n\2\2l\27\3\2\2\2mn\7\n\2\2n\31\3\2\2\2os\5\34" + - "\17\2ps\5\36\20\2qs\5.\30\2ro\3\2\2\2rp\3\2\2\2rq\3\2\2\2s\33\3\2\2\2" + - "tu\5 \21\2uv\5&\24\2v\35\3\2\2\2wx\7\f\2\2xy\7\b\2\2y\37\3\2\2\2z}\5\"" + - "\22\2{}\5$\23\2|z\3\2\2\2|{\3\2\2\2}!\3\2\2\2~\177\7\f\2\2\177#\3\2\2" + - "\2\u0080\u0081\7\n\2\2\u0081%\3\2\2\2\u0082\u0087\5(\25\2\u0083\u0087" + - "\5*\26\2\u0084\u0087\5,\27\2\u0085\u0087\3\2\2\2\u0086\u0082\3\2\2\2\u0086" + - "\u0083\3\2\2\2\u0086\u0084\3\2\2\2\u0086\u0085\3\2\2\2\u0087\'\3\2\2\2" + - "\u0088\u0089\7\n\2\2\u0089)\3\2\2\2\u008a\u008b\7\13\2\2\u008b+\3\2\2" + - "\2\u008c\u008d\7\f\2\2\u008d-\3\2\2\2\u008e\u008f\5\60\31\2\u008f\u0090" + - "\7\b\2\2\u0090\u0091\5\62\32\2\u0091/\3\2\2\2\u0092\u0093\7\n\2\2\u0093" + - "\61\3\2\2\2\u0094\u0095\7\f\2\2\u0095\63\3\2\2\2\13\67>BIMTr|\u0086"; - public static final ATN _ATN = - new ATNDeserializer().deserialize(_serializedATN.toCharArray()); - protected static final DFA[] _decisionToDFA; - protected static final PredictionContextCache _sharedContextCache = - new PredictionContextCache(); - private static final String[] _LITERAL_NAMES = { - null, "'.id '", "'.int_stack_count '", "'.string_stack_count '", "'.int_var_count '", - "'.string_var_count '", "':'" - }; - private static final String[] _SYMBOLIC_NAMES = { - null, null, null, null, null, null, null, "NEWLINE", "INT", "QSTRING", - "IDENTIFIER", "COMMENT", "WS" - }; - public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); static { @@ -116,26 +95,24 @@ public class rs2asmParser extends Parser } } - static + @Override + @Deprecated + public String[] getTokenNames() { - _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()]; - for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) - { - _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i); - } + return tokenNames; } - public rs2asmParser(TokenStream input) + @Override + + public Vocabulary getVocabulary() { - super(input); - _interp = new ParserATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache); + return VOCABULARY; } @Override - @Deprecated - public String[] getTokenNames() + public String getGrammarFileName() { - return tokenNames; + return "rs2asm.g4"; } @Override @@ -145,28 +122,78 @@ public String[] getRuleNames() } @Override - - public Vocabulary getVocabulary() + public String getSerializedATN() { - return VOCABULARY; + return _serializedATN; } @Override - public String getSerializedATN() + public ATN getATN() { - return _serializedATN; + return _ATN; } - @Override - public String getGrammarFileName() + public rs2asmParser(TokenStream input) { - return "rs2asm.g4"; + super(input); + _interp = new ParserATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache); } - @Override - public ATN getATN() + @SuppressWarnings("CheckReturnValue") + public static class ProgContext extends ParserRuleContext { - return _ATN; + public List NEWLINE() + { + return getTokens(rs2asmParser.NEWLINE); + } + + public TerminalNode NEWLINE(int i) + { + return getToken(rs2asmParser.NEWLINE, i); + } + + public List header() + { + return getRuleContexts(HeaderContext.class); + } + + public HeaderContext header(int i) + { + return getRuleContext(HeaderContext.class, i); + } + + public List line() + { + return getRuleContexts(LineContext.class); + } + + public LineContext line(int i) + { + return getRuleContext(LineContext.class, i); + } + + public ProgContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_prog; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterProg(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitProg(this); + } } public final ProgContext prog() throws RecognitionException @@ -196,7 +223,7 @@ public final ProgContext prog() throws RecognitionException setState(64); _errHandler.sync(this); _la = _input.LA(1); - while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << T__1) | (1L << T__2) | (1L << T__3) | (1L << T__4))) != 0)) + while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 62L) != 0)) { { { @@ -216,7 +243,8 @@ public final ProgContext prog() throws RecognitionException setState(60); _errHandler.sync(this); _la = _input.LA(1); - } while (_la == NEWLINE); + } + while (_la == NEWLINE); } } setState(66); @@ -246,13 +274,15 @@ public final ProgContext prog() throws RecognitionException setState(71); _errHandler.sync(this); _la = _input.LA(1); - } while (_la == NEWLINE); + } + while (_la == NEWLINE); } } setState(75); _errHandler.sync(this); _la = _input.LA(1); - } while (_la == INT || _la == IDENTIFIER); + } + while (_la == INT || _la == IDENTIFIER); } } catch (RecognitionException re) @@ -268,6 +298,58 @@ public final ProgContext prog() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class HeaderContext extends ParserRuleContext + { + public IdContext id() + { + return getRuleContext(IdContext.class, 0); + } + + public Int_stack_countContext int_stack_count() + { + return getRuleContext(Int_stack_countContext.class, 0); + } + + public String_stack_countContext string_stack_count() + { + return getRuleContext(String_stack_countContext.class, 0); + } + + public Int_var_countContext int_var_count() + { + return getRuleContext(Int_var_countContext.class, 0); + } + + public String_var_countContext string_var_count() + { + return getRuleContext(String_var_countContext.class, 0); + } + + public HeaderContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_header; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterHeader(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitHeader(this); + } + } + public final HeaderContext header() throws RecognitionException { HeaderContext _localctx = new HeaderContext(_ctx, getState()); @@ -330,6 +412,38 @@ public final HeaderContext header() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class IdContext extends ParserRuleContext + { + public Id_valueContext id_value() + { + return getRuleContext(Id_valueContext.class, 0); + } + + public IdContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_id; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterId(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitId(this); + } + } + public final IdContext id() throws RecognitionException { IdContext _localctx = new IdContext(_ctx, getState()); @@ -357,6 +471,38 @@ public final IdContext id() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class Int_stack_countContext extends ParserRuleContext + { + public Int_stack_valueContext int_stack_value() + { + return getRuleContext(Int_stack_valueContext.class, 0); + } + + public Int_stack_countContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_int_stack_count; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterInt_stack_count(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitInt_stack_count(this); + } + } + public final Int_stack_countContext int_stack_count() throws RecognitionException { Int_stack_countContext _localctx = new Int_stack_countContext(_ctx, getState()); @@ -384,33 +530,99 @@ public final Int_stack_countContext int_stack_count() throws RecognitionExceptio return _localctx; } - public final String_stack_countContext string_stack_count() throws RecognitionException + @SuppressWarnings("CheckReturnValue") + public static class String_stack_countContext extends ParserRuleContext { - String_stack_countContext _localctx = new String_stack_countContext(_ctx, getState()); - enterRule(_localctx, 8, RULE_string_stack_count); - try + public String_stack_valueContext string_stack_value() { - enterOuterAlt(_localctx, 1); - { - setState(90); - match(T__2); - setState(91); - string_stack_value(); - } + return getRuleContext(String_stack_valueContext.class, 0); } - catch (RecognitionException re) + + public String_stack_countContext(ParserRuleContext parent, int invokingState) { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); + super(parent, invokingState); } - finally + + @Override + public int getRuleIndex() { - exitRule(); + return RULE_string_stack_count; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) + ((rs2asmListener) listener).enterString_stack_count(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) + ((rs2asmListener) listener).exitString_stack_count(this); + } + } + + public final String_stack_countContext string_stack_count() throws RecognitionException + { + String_stack_countContext _localctx = new String_stack_countContext(_ctx, getState()); + enterRule(_localctx, 8, RULE_string_stack_count); + try + { + enterOuterAlt(_localctx, 1); + { + setState(90); + match(T__2); + setState(91); + string_stack_value(); + } + } + catch (RecognitionException re) + { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally + { + exitRule(); } return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class Int_var_countContext extends ParserRuleContext + { + public Int_var_valueContext int_var_value() + { + return getRuleContext(Int_var_valueContext.class, 0); + } + + public Int_var_countContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_int_var_count; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterInt_var_count(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitInt_var_count(this); + } + } + public final Int_var_countContext int_var_count() throws RecognitionException { Int_var_countContext _localctx = new Int_var_countContext(_ctx, getState()); @@ -438,6 +650,38 @@ public final Int_var_countContext int_var_count() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class String_var_countContext extends ParserRuleContext + { + public String_var_valueContext string_var_value() + { + return getRuleContext(String_var_valueContext.class, 0); + } + + public String_var_countContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_string_var_count; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterString_var_count(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitString_var_count(this); + } + } + public final String_var_countContext string_var_count() throws RecognitionException { String_var_countContext _localctx = new String_var_countContext(_ctx, getState()); @@ -465,6 +709,38 @@ public final String_var_countContext string_var_count() throws RecognitionExcept return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class Id_valueContext extends ParserRuleContext + { + public TerminalNode INT() + { + return getToken(rs2asmParser.INT, 0); + } + + public Id_valueContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_id_value; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterId_value(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitId_value(this); + } + } + public final Id_valueContext id_value() throws RecognitionException { Id_valueContext _localctx = new Id_valueContext(_ctx, getState()); @@ -490,6 +766,38 @@ public final Id_valueContext id_value() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class Int_stack_valueContext extends ParserRuleContext + { + public TerminalNode INT() + { + return getToken(rs2asmParser.INT, 0); + } + + public Int_stack_valueContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_int_stack_value; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterInt_stack_value(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitInt_stack_value(this); + } + } + public final Int_stack_valueContext int_stack_value() throws RecognitionException { Int_stack_valueContext _localctx = new Int_stack_valueContext(_ctx, getState()); @@ -515,6 +823,40 @@ public final Int_stack_valueContext int_stack_value() throws RecognitionExceptio return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class String_stack_valueContext extends ParserRuleContext + { + public TerminalNode INT() + { + return getToken(rs2asmParser.INT, 0); + } + + public String_stack_valueContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_string_stack_value; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) + ((rs2asmListener) listener).enterString_stack_value(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) + ((rs2asmListener) listener).exitString_stack_value(this); + } + } + public final String_stack_valueContext string_stack_value() throws RecognitionException { String_stack_valueContext _localctx = new String_stack_valueContext(_ctx, getState()); @@ -540,6 +882,38 @@ public final String_stack_valueContext string_stack_value() throws RecognitionEx return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class Int_var_valueContext extends ParserRuleContext + { + public TerminalNode INT() + { + return getToken(rs2asmParser.INT, 0); + } + + public Int_var_valueContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_int_var_value; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterInt_var_value(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitInt_var_value(this); + } + } + public final Int_var_valueContext int_var_value() throws RecognitionException { Int_var_valueContext _localctx = new Int_var_valueContext(_ctx, getState()); @@ -565,6 +939,38 @@ public final Int_var_valueContext int_var_value() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class String_var_valueContext extends ParserRuleContext + { + public TerminalNode INT() + { + return getToken(rs2asmParser.INT, 0); + } + + public String_var_valueContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_string_var_value; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterString_var_value(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitString_var_value(this); + } + } + public final String_var_valueContext string_var_value() throws RecognitionException { String_var_valueContext _localctx = new String_var_valueContext(_ctx, getState()); @@ -590,14 +996,56 @@ public final String_var_valueContext string_var_value() throws RecognitionExcept return _localctx; } - public final LineContext line() throws RecognitionException + @SuppressWarnings("CheckReturnValue") + public static class LineContext extends ParserRuleContext { - LineContext _localctx = new LineContext(_ctx, getState()); - enterRule(_localctx, 24, RULE_line); - try + public InstructionContext instruction() { - setState(112); - _errHandler.sync(this); + return getRuleContext(InstructionContext.class, 0); + } + + public LabelContext label() + { + return getRuleContext(LabelContext.class, 0); + } + + public Switch_lookupContext switch_lookup() + { + return getRuleContext(Switch_lookupContext.class, 0); + } + + public LineContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_line; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterLine(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitLine(this); + } + } + + public final LineContext line() throws RecognitionException + { + LineContext _localctx = new LineContext(_ctx, getState()); + enterRule(_localctx, 24, RULE_line); + try + { + setState(112); + _errHandler.sync(this); switch (getInterpreter().adaptivePredict(_input, 6, _ctx)) { case 1: @@ -636,6 +1084,43 @@ public final LineContext line() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class InstructionContext extends ParserRuleContext + { + public Instruction_nameContext instruction_name() + { + return getRuleContext(Instruction_nameContext.class, 0); + } + + public Instruction_operandContext instruction_operand() + { + return getRuleContext(Instruction_operandContext.class, 0); + } + + public InstructionContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_instruction; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterInstruction(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitInstruction(this); + } + } + public final InstructionContext instruction() throws RecognitionException { InstructionContext _localctx = new InstructionContext(_ctx, getState()); @@ -663,6 +1148,38 @@ public final InstructionContext instruction() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class LabelContext extends ParserRuleContext + { + public TerminalNode IDENTIFIER() + { + return getToken(rs2asmParser.IDENTIFIER, 0); + } + + public LabelContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_label; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterLabel(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitLabel(this); + } + } + public final LabelContext label() throws RecognitionException { LabelContext _localctx = new LabelContext(_ctx, getState()); @@ -690,6 +1207,43 @@ public final LabelContext label() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class Instruction_nameContext extends ParserRuleContext + { + public Name_stringContext name_string() + { + return getRuleContext(Name_stringContext.class, 0); + } + + public Name_opcodeContext name_opcode() + { + return getRuleContext(Name_opcodeContext.class, 0); + } + + public Instruction_nameContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_instruction_name; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterInstruction_name(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitInstruction_name(this); + } + } + public final Instruction_nameContext instruction_name() throws RecognitionException { Instruction_nameContext _localctx = new Instruction_nameContext(_ctx, getState()); @@ -731,6 +1285,38 @@ public final Instruction_nameContext instruction_name() throws RecognitionExcept return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class Name_stringContext extends ParserRuleContext + { + public TerminalNode IDENTIFIER() + { + return getToken(rs2asmParser.IDENTIFIER, 0); + } + + public Name_stringContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_name_string; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterName_string(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitName_string(this); + } + } + public final Name_stringContext name_string() throws RecognitionException { Name_stringContext _localctx = new Name_stringContext(_ctx, getState()); @@ -756,6 +1342,38 @@ public final Name_stringContext name_string() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class Name_opcodeContext extends ParserRuleContext + { + public TerminalNode INT() + { + return getToken(rs2asmParser.INT, 0); + } + + public Name_opcodeContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_name_opcode; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterName_opcode(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitName_opcode(this); + } + } + public final Name_opcodeContext name_opcode() throws RecognitionException { Name_opcodeContext _localctx = new Name_opcodeContext(_ctx, getState()); @@ -781,6 +1399,50 @@ public final Name_opcodeContext name_opcode() throws RecognitionException return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class Instruction_operandContext extends ParserRuleContext + { + public Operand_intContext operand_int() + { + return getRuleContext(Operand_intContext.class, 0); + } + + public Operand_qstringContext operand_qstring() + { + return getRuleContext(Operand_qstringContext.class, 0); + } + + public Operand_labelContext operand_label() + { + return getRuleContext(Operand_labelContext.class, 0); + } + + public Instruction_operandContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + + @Override + public int getRuleIndex() + { + return RULE_instruction_operand; + } + + @Override + public void enterRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) + ((rs2asmListener) listener).enterInstruction_operand(this); + } + + @Override + public void exitRule(ParseTreeListener listener) + { + if (listener instanceof rs2asmListener) + ((rs2asmListener) listener).exitInstruction_operand(this); + } + } + public final Instruction_operandContext instruction_operand() throws RecognitionException { Instruction_operandContext _localctx = new Instruction_operandContext(_ctx, getState()); @@ -834,985 +1496,74 @@ public final Instruction_operandContext instruction_operand() throws Recognition return _localctx; } - public final Operand_intContext operand_int() throws RecognitionException + @SuppressWarnings("CheckReturnValue") + public static class Operand_intContext extends ParserRuleContext { - Operand_intContext _localctx = new Operand_intContext(_ctx, getState()); - enterRule(_localctx, 38, RULE_operand_int); - try + public TerminalNode INT() { - enterOuterAlt(_localctx, 1); - { - setState(134); - match(INT); - } + return getToken(rs2asmParser.INT, 0); } - catch (RecognitionException re) + + public Operand_intContext(ParserRuleContext parent, int invokingState) { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally - { - exitRule(); - } - return _localctx; - } - - public final Operand_qstringContext operand_qstring() throws RecognitionException - { - Operand_qstringContext _localctx = new Operand_qstringContext(_ctx, getState()); - enterRule(_localctx, 40, RULE_operand_qstring); - try - { - enterOuterAlt(_localctx, 1); - { - setState(136); - match(QSTRING); - } - } - catch (RecognitionException re) - { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally - { - exitRule(); - } - return _localctx; - } - - public final Operand_labelContext operand_label() throws RecognitionException - { - Operand_labelContext _localctx = new Operand_labelContext(_ctx, getState()); - enterRule(_localctx, 42, RULE_operand_label); - try - { - enterOuterAlt(_localctx, 1); - { - setState(138); - match(IDENTIFIER); - } - } - catch (RecognitionException re) - { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally - { - exitRule(); - } - return _localctx; - } - - public final Switch_lookupContext switch_lookup() throws RecognitionException - { - Switch_lookupContext _localctx = new Switch_lookupContext(_ctx, getState()); - enterRule(_localctx, 44, RULE_switch_lookup); - try - { - enterOuterAlt(_localctx, 1); - { - setState(140); - switch_key(); - setState(141); - match(T__5); - setState(142); - switch_value(); - } - } - catch (RecognitionException re) - { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally - { - exitRule(); - } - return _localctx; - } - - public final Switch_keyContext switch_key() throws RecognitionException - { - Switch_keyContext _localctx = new Switch_keyContext(_ctx, getState()); - enterRule(_localctx, 46, RULE_switch_key); - try - { - enterOuterAlt(_localctx, 1); - { - setState(144); - match(INT); - } - } - catch (RecognitionException re) - { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally - { - exitRule(); - } - return _localctx; - } - - public final Switch_valueContext switch_value() throws RecognitionException - { - Switch_valueContext _localctx = new Switch_valueContext(_ctx, getState()); - enterRule(_localctx, 48, RULE_switch_value); - try - { - enterOuterAlt(_localctx, 1); - { - setState(146); - match(IDENTIFIER); - } - } - catch (RecognitionException re) - { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally - { - exitRule(); - } - return _localctx; - } - - public static class ProgContext extends ParserRuleContext - { - public ProgContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public List NEWLINE() - { - return getTokens(rs2asmParser.NEWLINE); - } - - public TerminalNode NEWLINE(int i) - { - return getToken(rs2asmParser.NEWLINE, i); - } - - public List header() - { - return getRuleContexts(HeaderContext.class); - } - - public HeaderContext header(int i) - { - return getRuleContext(HeaderContext.class, i); - } - - public List line() - { - return getRuleContexts(LineContext.class); - } - - public LineContext line(int i) - { - return getRuleContext(LineContext.class, i); - } - - @Override - public int getRuleIndex() - { - return RULE_prog; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterProg(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitProg(this); - } - } - } - - public static class HeaderContext extends ParserRuleContext - { - public HeaderContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public IdContext id() - { - return getRuleContext(IdContext.class, 0); - } - - public Int_stack_countContext int_stack_count() - { - return getRuleContext(Int_stack_countContext.class, 0); - } - - public String_stack_countContext string_stack_count() - { - return getRuleContext(String_stack_countContext.class, 0); - } - - public Int_var_countContext int_var_count() - { - return getRuleContext(Int_var_countContext.class, 0); - } - - public String_var_countContext string_var_count() - { - return getRuleContext(String_var_countContext.class, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_header; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterHeader(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitHeader(this); - } - } - } - - public static class IdContext extends ParserRuleContext - { - public IdContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public Id_valueContext id_value() - { - return getRuleContext(Id_valueContext.class, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_id; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterId(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitId(this); - } - } - } - - public static class Int_stack_countContext extends ParserRuleContext - { - public Int_stack_countContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public Int_stack_valueContext int_stack_value() - { - return getRuleContext(Int_stack_valueContext.class, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_int_stack_count; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterInt_stack_count(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitInt_stack_count(this); - } - } - } - - public static class String_stack_countContext extends ParserRuleContext - { - public String_stack_countContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public String_stack_valueContext string_stack_value() - { - return getRuleContext(String_stack_valueContext.class, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_string_stack_count; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterString_stack_count(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitString_stack_count(this); - } - } - } - - public static class Int_var_countContext extends ParserRuleContext - { - public Int_var_countContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public Int_var_valueContext int_var_value() - { - return getRuleContext(Int_var_valueContext.class, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_int_var_count; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterInt_var_count(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitInt_var_count(this); - } - } - } - - public static class String_var_countContext extends ParserRuleContext - { - public String_var_countContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public String_var_valueContext string_var_value() - { - return getRuleContext(String_var_valueContext.class, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_string_var_count; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterString_var_count(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitString_var_count(this); - } - } - } - - public static class Id_valueContext extends ParserRuleContext - { - public Id_valueContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public TerminalNode INT() - { - return getToken(rs2asmParser.INT, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_id_value; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterId_value(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitId_value(this); - } - } - } - - public static class Int_stack_valueContext extends ParserRuleContext - { - public Int_stack_valueContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public TerminalNode INT() - { - return getToken(rs2asmParser.INT, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_int_stack_value; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterInt_stack_value(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitInt_stack_value(this); - } - } - } - - public static class String_stack_valueContext extends ParserRuleContext - { - public String_stack_valueContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public TerminalNode INT() - { - return getToken(rs2asmParser.INT, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_string_stack_value; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterString_stack_value(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitString_stack_value(this); - } - } - } - - public static class Int_var_valueContext extends ParserRuleContext - { - public Int_var_valueContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public TerminalNode INT() - { - return getToken(rs2asmParser.INT, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_int_var_value; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterInt_var_value(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitInt_var_value(this); - } - } - } - - public static class String_var_valueContext extends ParserRuleContext - { - public String_var_valueContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public TerminalNode INT() - { - return getToken(rs2asmParser.INT, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_string_var_value; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterString_var_value(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitString_var_value(this); - } - } - } - - public static class LineContext extends ParserRuleContext - { - public LineContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public InstructionContext instruction() - { - return getRuleContext(InstructionContext.class, 0); - } - - public LabelContext label() - { - return getRuleContext(LabelContext.class, 0); - } - - public Switch_lookupContext switch_lookup() - { - return getRuleContext(Switch_lookupContext.class, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_line; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterLine(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitLine(this); - } - } - } - - public static class InstructionContext extends ParserRuleContext - { - public InstructionContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public Instruction_nameContext instruction_name() - { - return getRuleContext(Instruction_nameContext.class, 0); - } - - public Instruction_operandContext instruction_operand() - { - return getRuleContext(Instruction_operandContext.class, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_instruction; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterInstruction(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitInstruction(this); - } - } - } - - public static class LabelContext extends ParserRuleContext - { - public LabelContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public TerminalNode IDENTIFIER() - { - return getToken(rs2asmParser.IDENTIFIER, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_label; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterLabel(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitLabel(this); - } - } - } - - public static class Instruction_nameContext extends ParserRuleContext - { - public Instruction_nameContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public Name_stringContext name_string() - { - return getRuleContext(Name_stringContext.class, 0); - } - - public Name_opcodeContext name_opcode() - { - return getRuleContext(Name_opcodeContext.class, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_instruction_name; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterInstruction_name(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitInstruction_name(this); - } - } - } - - public static class Name_stringContext extends ParserRuleContext - { - public Name_stringContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public TerminalNode IDENTIFIER() - { - return getToken(rs2asmParser.IDENTIFIER, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_name_string; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterName_string(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitName_string(this); - } - } - } - - public static class Name_opcodeContext extends ParserRuleContext - { - public Name_opcodeContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public TerminalNode INT() - { - return getToken(rs2asmParser.INT, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_name_opcode; - } - - @Override - public void enterRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterName_opcode(this); - } - } - - @Override - public void exitRule(ParseTreeListener listener) - { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitName_opcode(this); - } - } - } - - public static class Instruction_operandContext extends ParserRuleContext - { - public Instruction_operandContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public Operand_intContext operand_int() - { - return getRuleContext(Operand_intContext.class, 0); - } - - public Operand_qstringContext operand_qstring() - { - return getRuleContext(Operand_qstringContext.class, 0); - } - - public Operand_labelContext operand_label() - { - return getRuleContext(Operand_labelContext.class, 0); + super(parent, invokingState); } @Override public int getRuleIndex() { - return RULE_instruction_operand; + return RULE_operand_int; } @Override public void enterRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterInstruction_operand(this); - } + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterOperand_int(this); } @Override public void exitRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitInstruction_operand(this); - } + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitOperand_int(this); } } - public static class Operand_intContext extends ParserRuleContext + public final Operand_intContext operand_int() throws RecognitionException { - public Operand_intContext(ParserRuleContext parent, int invokingState) - { - super(parent, invokingState); - } - - public TerminalNode INT() - { - return getToken(rs2asmParser.INT, 0); - } - - @Override - public int getRuleIndex() - { - return RULE_operand_int; - } - - @Override - public void enterRule(ParseTreeListener listener) + Operand_intContext _localctx = new Operand_intContext(_ctx, getState()); + enterRule(_localctx, 38, RULE_operand_int); + try { - if (listener instanceof rs2asmListener) + enterOuterAlt(_localctx, 1); { - ((rs2asmListener) listener).enterOperand_int(this); + setState(134); + match(INT); } } - - @Override - public void exitRule(ParseTreeListener listener) + catch (RecognitionException re) { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitOperand_int(this); - } + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally + { + exitRule(); } + return _localctx; } + @SuppressWarnings("CheckReturnValue") public static class Operand_qstringContext extends ParserRuleContext { - public Operand_qstringContext(ParserRuleContext parent, int invokingState) + public TerminalNode QSTRING() { - super(parent, invokingState); + return getToken(rs2asmParser.QSTRING, 0); } - public TerminalNode QSTRING() + public Operand_qstringContext(ParserRuleContext parent, int invokingState) { - return getToken(rs2asmParser.QSTRING, 0); + super(parent, invokingState); } @Override @@ -1824,32 +1575,52 @@ public int getRuleIndex() @Override public void enterRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterOperand_qstring(this); - } + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterOperand_qstring(this); } @Override public void exitRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitOperand_qstring(this); + } + } + + public final Operand_qstringContext operand_qstring() throws RecognitionException + { + Operand_qstringContext _localctx = new Operand_qstringContext(_ctx, getState()); + enterRule(_localctx, 40, RULE_operand_qstring); + try + { + enterOuterAlt(_localctx, 1); { - ((rs2asmListener) listener).exitOperand_qstring(this); + setState(136); + match(QSTRING); } } + catch (RecognitionException re) + { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally + { + exitRule(); + } + return _localctx; } + @SuppressWarnings("CheckReturnValue") public static class Operand_labelContext extends ParserRuleContext { - public Operand_labelContext(ParserRuleContext parent, int invokingState) + public TerminalNode IDENTIFIER() { - super(parent, invokingState); + return getToken(rs2asmParser.IDENTIFIER, 0); } - public TerminalNode IDENTIFIER() + public Operand_labelContext(ParserRuleContext parent, int invokingState) { - return getToken(rs2asmParser.IDENTIFIER, 0); + super(parent, invokingState); } @Override @@ -1861,29 +1632,44 @@ public int getRuleIndex() @Override public void enterRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterOperand_label(this); - } + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterOperand_label(this); } @Override public void exitRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).exitOperand_label(this); - } + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitOperand_label(this); } } - public static class Switch_lookupContext extends ParserRuleContext + public final Operand_labelContext operand_label() throws RecognitionException { - public Switch_lookupContext(ParserRuleContext parent, int invokingState) + Operand_labelContext _localctx = new Operand_labelContext(_ctx, getState()); + enterRule(_localctx, 42, RULE_operand_label); + try { - super(parent, invokingState); + enterOuterAlt(_localctx, 1); + { + setState(138); + match(IDENTIFIER); + } + } + catch (RecognitionException re) + { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally + { + exitRule(); } + return _localctx; + } + @SuppressWarnings("CheckReturnValue") + public static class Switch_lookupContext extends ParserRuleContext + { public Switch_keyContext switch_key() { return getRuleContext(Switch_keyContext.class, 0); @@ -1894,6 +1680,11 @@ public Switch_valueContext switch_value() return getRuleContext(Switch_valueContext.class, 0); } + public Switch_lookupContext(ParserRuleContext parent, int invokingState) + { + super(parent, invokingState); + } + @Override public int getRuleIndex() { @@ -1903,32 +1694,56 @@ public int getRuleIndex() @Override public void enterRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterSwitch_lookup(this); - } + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterSwitch_lookup(this); } @Override public void exitRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitSwitch_lookup(this); + } + } + + public final Switch_lookupContext switch_lookup() throws RecognitionException + { + Switch_lookupContext _localctx = new Switch_lookupContext(_ctx, getState()); + enterRule(_localctx, 44, RULE_switch_lookup); + try + { + enterOuterAlt(_localctx, 1); { - ((rs2asmListener) listener).exitSwitch_lookup(this); + setState(140); + switch_key(); + setState(141); + match(T__5); + setState(142); + switch_value(); } } + catch (RecognitionException re) + { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally + { + exitRule(); + } + return _localctx; } + @SuppressWarnings("CheckReturnValue") public static class Switch_keyContext extends ParserRuleContext { - public Switch_keyContext(ParserRuleContext parent, int invokingState) + public TerminalNode INT() { - super(parent, invokingState); + return getToken(rs2asmParser.INT, 0); } - public TerminalNode INT() + public Switch_keyContext(ParserRuleContext parent, int invokingState) { - return getToken(rs2asmParser.INT, 0); + super(parent, invokingState); } @Override @@ -1940,32 +1755,52 @@ public int getRuleIndex() @Override public void enterRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterSwitch_key(this); - } + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterSwitch_key(this); } @Override public void exitRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitSwitch_key(this); + } + } + + public final Switch_keyContext switch_key() throws RecognitionException + { + Switch_keyContext _localctx = new Switch_keyContext(_ctx, getState()); + enterRule(_localctx, 46, RULE_switch_key); + try + { + enterOuterAlt(_localctx, 1); { - ((rs2asmListener) listener).exitSwitch_key(this); + setState(144); + match(INT); } } + catch (RecognitionException re) + { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally + { + exitRule(); + } + return _localctx; } + @SuppressWarnings("CheckReturnValue") public static class Switch_valueContext extends ParserRuleContext { - public Switch_valueContext(ParserRuleContext parent, int invokingState) + public TerminalNode IDENTIFIER() { - super(parent, invokingState); + return getToken(rs2asmParser.IDENTIFIER, 0); } - public TerminalNode IDENTIFIER() + public Switch_valueContext(ParserRuleContext parent, int invokingState) { - return getToken(rs2asmParser.IDENTIFIER, 0); + super(parent, invokingState); } @Override @@ -1977,19 +1812,131 @@ public int getRuleIndex() @Override public void enterRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) - { - ((rs2asmListener) listener).enterSwitch_value(this); - } + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).enterSwitch_value(this); } @Override public void exitRule(ParseTreeListener listener) { - if (listener instanceof rs2asmListener) + if (listener instanceof rs2asmListener) ((rs2asmListener) listener).exitSwitch_value(this); + } + } + + public final Switch_valueContext switch_value() throws RecognitionException + { + Switch_valueContext _localctx = new Switch_valueContext(_ctx, getState()); + enterRule(_localctx, 48, RULE_switch_value); + try + { + enterOuterAlt(_localctx, 1); { - ((rs2asmListener) listener).exitSwitch_value(this); + setState(146); + match(IDENTIFIER); } } + catch (RecognitionException re) + { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally + { + exitRule(); + } + return _localctx; + } + + public static final String _serializedATN = + "\u0004\u0001\f\u0095\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002" + + "\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004\u0007\u0004\u0002" + + "\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007\u0007\u0007\u0002" + + "\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b\u0007\u000b\u0002" + + "\f\u0007\f\u0002\r\u0007\r\u0002\u000e\u0007\u000e\u0002\u000f\u0007\u000f" + + "\u0002\u0010\u0007\u0010\u0002\u0011\u0007\u0011\u0002\u0012\u0007\u0012" + + "\u0002\u0013\u0007\u0013\u0002\u0014\u0007\u0014\u0002\u0015\u0007\u0015" + + "\u0002\u0016\u0007\u0016\u0002\u0017\u0007\u0017\u0002\u0018\u0007\u0018" + + "\u0001\u0000\u0005\u00004\b\u0000\n\u0000\f\u00007\t\u0000\u0001\u0000" + + "\u0001\u0000\u0004\u0000;\b\u0000\u000b\u0000\f\u0000<\u0005\u0000?\b" + + "\u0000\n\u0000\f\u0000B\t\u0000\u0001\u0000\u0001\u0000\u0004\u0000F\b" + + "\u0000\u000b\u0000\f\u0000G\u0004\u0000J\b\u0000\u000b\u0000\f\u0000K" + + "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0003\u0001" + + "S\b\u0001\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003" + + "\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0005\u0001\u0005" + + "\u0001\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007" + + "\u0001\b\u0001\b\u0001\t\u0001\t\u0001\n\u0001\n\u0001\u000b\u0001\u000b" + + "\u0001\f\u0001\f\u0001\f\u0003\fq\b\f\u0001\r\u0001\r\u0001\r\u0001\u000e" + + "\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f\u0003\u000f{\b\u000f" + + "\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012" + + "\u0001\u0012\u0001\u0012\u0003\u0012\u0085\b\u0012\u0001\u0013\u0001\u0013" + + "\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016" + + "\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018" + + "\u0001\u0018\u0000\u0000\u0019\u0000\u0002\u0004\u0006\b\n\f\u000e\u0010" + + "\u0012\u0014\u0016\u0018\u001a\u001c\u001e \"$&(*,.0\u0000\u0000\u008a" + + "\u00005\u0001\u0000\u0000\u0000\u0002R\u0001\u0000\u0000\u0000\u0004T" + + "\u0001\u0000\u0000\u0000\u0006W\u0001\u0000\u0000\u0000\bZ\u0001\u0000" + + "\u0000\u0000\n]\u0001\u0000\u0000\u0000\f`\u0001\u0000\u0000\u0000\u000e" + + "c\u0001\u0000\u0000\u0000\u0010e\u0001\u0000\u0000\u0000\u0012g\u0001" + + "\u0000\u0000\u0000\u0014i\u0001\u0000\u0000\u0000\u0016k\u0001\u0000\u0000" + + "\u0000\u0018p\u0001\u0000\u0000\u0000\u001ar\u0001\u0000\u0000\u0000\u001c" + + "u\u0001\u0000\u0000\u0000\u001ez\u0001\u0000\u0000\u0000 |\u0001\u0000" + + "\u0000\u0000\"~\u0001\u0000\u0000\u0000$\u0084\u0001\u0000\u0000\u0000" + + "&\u0086\u0001\u0000\u0000\u0000(\u0088\u0001\u0000\u0000\u0000*\u008a" + + "\u0001\u0000\u0000\u0000,\u008c\u0001\u0000\u0000\u0000.\u0090\u0001\u0000" + + "\u0000\u00000\u0092\u0001\u0000\u0000\u000024\u0005\u0007\u0000\u0000" + + "32\u0001\u0000\u0000\u000047\u0001\u0000\u0000\u000053\u0001\u0000\u0000" + + "\u000056\u0001\u0000\u0000\u00006@\u0001\u0000\u0000\u000075\u0001\u0000" + + "\u0000\u00008:\u0003\u0002\u0001\u00009;\u0005\u0007\u0000\u0000:9\u0001" + + "\u0000\u0000\u0000;<\u0001\u0000\u0000\u0000<:\u0001\u0000\u0000\u0000" + + "<=\u0001\u0000\u0000\u0000=?\u0001\u0000\u0000\u0000>8\u0001\u0000\u0000" + + "\u0000?B\u0001\u0000\u0000\u0000@>\u0001\u0000\u0000\u0000@A\u0001\u0000" + + "\u0000\u0000AI\u0001\u0000\u0000\u0000B@\u0001\u0000\u0000\u0000CE\u0003" + + "\u0018\f\u0000DF\u0005\u0007\u0000\u0000ED\u0001\u0000\u0000\u0000FG\u0001" + + "\u0000\u0000\u0000GE\u0001\u0000\u0000\u0000GH\u0001\u0000\u0000\u0000" + + "HJ\u0001\u0000\u0000\u0000IC\u0001\u0000\u0000\u0000JK\u0001\u0000\u0000" + + "\u0000KI\u0001\u0000\u0000\u0000KL\u0001\u0000\u0000\u0000L\u0001\u0001" + + "\u0000\u0000\u0000MS\u0003\u0004\u0002\u0000NS\u0003\u0006\u0003\u0000" + + "OS\u0003\b\u0004\u0000PS\u0003\n\u0005\u0000QS\u0003\f\u0006\u0000RM\u0001" + + "\u0000\u0000\u0000RN\u0001\u0000\u0000\u0000RO\u0001\u0000\u0000\u0000" + + "RP\u0001\u0000\u0000\u0000RQ\u0001\u0000\u0000\u0000S\u0003\u0001\u0000" + + "\u0000\u0000TU\u0005\u0001\u0000\u0000UV\u0003\u000e\u0007\u0000V\u0005" + + "\u0001\u0000\u0000\u0000WX\u0005\u0002\u0000\u0000XY\u0003\u0010\b\u0000" + + "Y\u0007\u0001\u0000\u0000\u0000Z[\u0005\u0003\u0000\u0000[\\\u0003\u0012" + + "\t\u0000\\\t\u0001\u0000\u0000\u0000]^\u0005\u0004\u0000\u0000^_\u0003" + + "\u0014\n\u0000_\u000b\u0001\u0000\u0000\u0000`a\u0005\u0005\u0000\u0000" + + "ab\u0003\u0016\u000b\u0000b\r\u0001\u0000\u0000\u0000cd\u0005\b\u0000" + + "\u0000d\u000f\u0001\u0000\u0000\u0000ef\u0005\b\u0000\u0000f\u0011\u0001" + + "\u0000\u0000\u0000gh\u0005\b\u0000\u0000h\u0013\u0001\u0000\u0000\u0000" + + "ij\u0005\b\u0000\u0000j\u0015\u0001\u0000\u0000\u0000kl\u0005\b\u0000" + + "\u0000l\u0017\u0001\u0000\u0000\u0000mq\u0003\u001a\r\u0000nq\u0003\u001c" + + "\u000e\u0000oq\u0003,\u0016\u0000pm\u0001\u0000\u0000\u0000pn\u0001\u0000" + + "\u0000\u0000po\u0001\u0000\u0000\u0000q\u0019\u0001\u0000\u0000\u0000" + + "rs\u0003\u001e\u000f\u0000st\u0003$\u0012\u0000t\u001b\u0001\u0000\u0000" + + "\u0000uv\u0005\n\u0000\u0000vw\u0005\u0006\u0000\u0000w\u001d\u0001\u0000" + + "\u0000\u0000x{\u0003 \u0010\u0000y{\u0003\"\u0011\u0000zx\u0001\u0000" + + "\u0000\u0000zy\u0001\u0000\u0000\u0000{\u001f\u0001\u0000\u0000\u0000" + + "|}\u0005\n\u0000\u0000}!\u0001\u0000\u0000\u0000~\u007f\u0005\b\u0000" + + "\u0000\u007f#\u0001\u0000\u0000\u0000\u0080\u0085\u0003&\u0013\u0000\u0081" + + "\u0085\u0003(\u0014\u0000\u0082\u0085\u0003*\u0015\u0000\u0083\u0085\u0001" + + "\u0000\u0000\u0000\u0084\u0080\u0001\u0000\u0000\u0000\u0084\u0081\u0001" + + "\u0000\u0000\u0000\u0084\u0082\u0001\u0000\u0000\u0000\u0084\u0083\u0001" + + "\u0000\u0000\u0000\u0085%\u0001\u0000\u0000\u0000\u0086\u0087\u0005\b" + + "\u0000\u0000\u0087\'\u0001\u0000\u0000\u0000\u0088\u0089\u0005\t\u0000" + + "\u0000\u0089)\u0001\u0000\u0000\u0000\u008a\u008b\u0005\n\u0000\u0000" + + "\u008b+\u0001\u0000\u0000\u0000\u008c\u008d\u0003.\u0017\u0000\u008d\u008e" + + "\u0005\u0006\u0000\u0000\u008e\u008f\u00030\u0018\u0000\u008f-\u0001\u0000" + + "\u0000\u0000\u0090\u0091\u0005\b\u0000\u0000\u0091/\u0001\u0000\u0000" + + "\u0000\u0092\u0093\u0005\n\u0000\u0000\u00931\u0001\u0000\u0000\u0000" + + "\t5<@GKRpz\u0084"; + public static final ATN _ATN = + new ATNDeserializer().deserialize(_serializedATN.toCharArray()); + + static + { + _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()]; + for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) + { + _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i); + } } } \ No newline at end of file diff --git a/cache/src/main/java/net/runelite/cache/script/disassembler/Disassembler.java b/cache/src/main/java/net/runelite/cache/script/disassembler/Disassembler.java index 523796c49..c125ef858 100644 --- a/cache/src/main/java/net/runelite/cache/script/disassembler/Disassembler.java +++ b/cache/src/main/java/net/runelite/cache/script/disassembler/Disassembler.java @@ -26,9 +26,6 @@ import com.google.common.escape.Escaper; import com.google.common.escape.Escapers; -import java.io.IOException; -import java.util.Map; -import java.util.Map.Entry; import net.runelite.cache.definitions.ScriptDefinition; import net.runelite.cache.script.Instruction; import net.runelite.cache.script.Instructions; @@ -36,6 +33,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.util.Map; +import java.util.Map.Entry; + public class Disassembler { private static final Logger logger = LoggerFactory.getLogger(Disassembler.class); diff --git a/cache/src/main/java/net/runelite/cache/util/BZip2.java b/cache/src/main/java/net/runelite/cache/util/BZip2.java index cde6fc55d..0a1bdf6c9 100644 --- a/cache/src/main/java/net/runelite/cache/util/BZip2.java +++ b/cache/src/main/java/net/runelite/cache/util/BZip2.java @@ -24,21 +24,19 @@ */ package net.runelite.cache.util; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Arrays; +import com.sun.jna.Memory; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; import org.apache.commons.compress.utils.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import java.io.*; +import java.util.Arrays; + +import static net.runelite.cache.util.LibBZip2.*; public class BZip2 { - private static final Logger logger = LoggerFactory.getLogger(BZip2.class); + private static final boolean USE_NATIVE_BZIP2 = "true".equalsIgnoreCase(System.getProperty("runelite.useNativeBzip")); private static final byte[] BZIP_HEADER = new byte[] { @@ -48,6 +46,11 @@ public class BZip2 }; public static byte[] compress(byte[] bytes) throws IOException + { + return USE_NATIVE_BZIP2 ? compressLibBZip2(bytes) : compressApache(bytes); + } + + public static byte[] compressApache(byte[] bytes) throws IOException { InputStream is = new ByteArrayInputStream(bytes); ByteArrayOutputStream bout = new ByteArrayOutputStream(); @@ -66,6 +69,59 @@ public static byte[] compress(byte[] bytes) throws IOException return Arrays.copyOfRange(out, BZIP_HEADER.length, out.length); // remove header.. } + // byte-for-byte compatability with Jagex's compression + public static byte[] compressLibBZip2(byte[] data) throws IOException + { + LibBZip2 libBZip2 = LibBZip2.INSTANCE; + + BzStream stream = new BzStream(); + stream.next_in = new Memory(data.length); + stream.avail_in = data.length; + stream.next_in.write(0, data, 0, data.length); + + int outsz = 65536; + Memory out = new Memory(outsz); + stream.next_out = out; + stream.avail_out = outsz; + + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + + if (libBZip2.BZ2_bzCompressInit(stream, 1, 0, 0) != BZ_OK) + { + throw new IOException("BZ2_bzCompressInit() error"); + } + try + { + int offset = BZIP_HEADER.length; + int i; + do + { + i = libBZip2.BZ2_bzCompress(stream, LibBZip2.BZ_FINISH); + if (i == BZ_FINISH_OK || i == BZ_STREAM_END) + { + int wrote = outsz - stream.avail_out; + buffer.write(out.getByteArray(offset, wrote - offset)); + offset = 0; + stream.next_out = out; + stream.avail_out = outsz; + } + else + { + throw new IOException("BZ2_bzCompress() error"); + } + } while (i != BZ_STREAM_END); + } + finally + { + if (libBZip2.BZ2_bzCompressEnd(stream) != BZ_OK) + { + throw new IOException("BZ2_bzCompressEnd() error"); + } + } + + return buffer.toByteArray(); + } + public static byte[] decompress(byte[] bytes, int len) throws IOException { byte[] data = new byte[len + BZIP_HEADER.length]; diff --git a/cache/src/main/java/net/runelite/cache/util/BigBufferedImage.java b/cache/src/main/java/net/runelite/cache/util/BigBufferedImage.java index 1579c9e74..3ed25269c 100644 --- a/cache/src/main/java/net/runelite/cache/util/BigBufferedImage.java +++ b/cache/src/main/java/net/runelite/cache/util/BigBufferedImage.java @@ -11,36 +11,25 @@ * http://nyomdmegteis.hu/en/ */ -import java.awt.Point; -import java.awt.Rectangle; +import lombok.extern.slf4j.Slf4j; + +import javax.imageio.ImageIO; +import javax.imageio.ImageReadParam; +import javax.imageio.ImageReader; +import javax.imageio.stream.ImageInputStream; +import java.awt.*; import java.awt.color.ColorSpace; -import java.awt.image.BandedSampleModel; -import java.awt.image.BufferedImage; -import java.awt.image.ColorModel; -import java.awt.image.ComponentColorModel; -import java.awt.image.DataBuffer; -import java.awt.image.Raster; -import java.awt.image.RenderedImage; -import java.awt.image.SampleModel; -import java.awt.image.WritableRaster; +import java.awt.image.*; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.Iterator; import java.util.List; +import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.imageio.ImageIO; -import javax.imageio.ImageReadParam; -import javax.imageio.ImageReader; -import javax.imageio.stream.ImageInputStream; -import lombok.extern.slf4j.Slf4j; @Slf4j public class BigBufferedImage extends BufferedImage @@ -97,7 +86,7 @@ public static BufferedImage create(File inputFile, int imageType) throws IOExcep } catch (InterruptedException ex) { - ex.printStackTrace(); + log.error(null, ex); } } } diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/MapSaver.java b/cache/src/main/java/net/runelite/cache/util/BzStream.java similarity index 53% rename from cache/src/main/java/net/runelite/cache/definitions/savers/MapSaver.java rename to cache/src/main/java/net/runelite/cache/util/BzStream.java index 855ccd413..6ff91fe46 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/savers/MapSaver.java +++ b/cache/src/main/java/net/runelite/cache/util/BzStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Adam + * Copyright (c) 2023, Adam * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,53 +22,68 @@ * (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.cache.definitions.savers; +package net.runelite.cache.util; -import net.runelite.cache.definitions.MapDefinition; -import net.runelite.cache.definitions.MapDefinition.Tile; -import net.runelite.cache.io.OutputStream; -import static net.runelite.cache.region.Region.X; -import static net.runelite.cache.region.Region.Y; -import static net.runelite.cache.region.Region.Z; +import com.sun.jna.Pointer; +import com.sun.jna.Structure; -public class MapSaver +import java.util.Arrays; +import java.util.List; + +public class BzStream extends Structure { - public byte[] save(MapDefinition map) + /* + char *next_in; + unsigned int avail_in; + unsigned int total_in_lo32; + unsigned int total_in_hi32; + + char *next_out; + unsigned int avail_out; + unsigned int total_out_lo32; + unsigned int total_out_hi32; + + void *state; + + void *(*bzalloc)(void *,int,int); + void (*bzfree)(void *,void *); + void *opaque; + */ + public Pointer next_in; + public int avail_in; + public int total_in_lo32; + public int total_in_hi32; + + public Pointer next_out; + public int avail_out; + public int total_out_lo32; + public int total_out_hi32; + + public Pointer state; + + public Pointer bzalloc; + public Pointer bzfree; + public Pointer opaque; + + @Override + protected List getFieldOrder() { - Tile[][][] tiles = map.getTiles(); - OutputStream out = new OutputStream(); - for (int z = 0; z < Z; z++) - { - for (int x = 0; x < X; x++) - { - for (int y = 0; y < Y; y++) - { - Tile tile = tiles[z][x][y]; - if (tile.attrOpcode != 0) - { - out.writeByte(tile.attrOpcode); - out.writeByte(tile.overlayId); - } - if (tile.settings != 0) - { - out.writeByte(tile.settings + 49); - } - if (tile.underlayId != 0) - { - out.writeByte(tile.underlayId + 81); - } - if (tile.height == null) - { - out.writeByte(0); - } - else - { - out.writeByte(1); - out.writeByte(tile.height); - } - } - } - } - return out.flip(); + return Arrays.asList( + "next_in", + "avail_in", + "total_in_lo32", + "total_in_hi32", + + "next_out", + "avail_out", + "total_out_lo32", + "total_out_hi32", + + "state", + + "bzalloc", + "bzfree", + "opaque" + ); } } diff --git a/cache/src/main/java/net/runelite/cache/util/Djb2Manager.java b/cache/src/main/java/net/runelite/cache/util/Djb2Manager.java index 5db676fd2..d1f8c0560 100644 --- a/cache/src/main/java/net/runelite/cache/util/Djb2Manager.java +++ b/cache/src/main/java/net/runelite/cache/util/Djb2Manager.java @@ -24,12 +24,13 @@ */ package net.runelite.cache.util; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class Djb2Manager { diff --git a/cache/src/main/java/net/runelite/cache/util/GZip.java b/cache/src/main/java/net/runelite/cache/util/GZip.java index faae86eaa..fdb1496c5 100644 --- a/cache/src/main/java/net/runelite/cache/util/GZip.java +++ b/cache/src/main/java/net/runelite/cache/util/GZip.java @@ -25,17 +25,14 @@ package net.runelite.cache.util; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; import org.apache.commons.compress.utils.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.*; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; + public class GZip { private static final Logger logger = LoggerFactory.getLogger(GZip.class); diff --git a/cache/src/main/java/net/runelite/cache/util/LibBZip2.java b/cache/src/main/java/net/runelite/cache/util/LibBZip2.java new file mode 100644 index 000000000..4d4c31f23 --- /dev/null +++ b/cache/src/main/java/net/runelite/cache/util/LibBZip2.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2023, Adam + * 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.cache.util; + +import com.sun.jna.Library; +import com.sun.jna.Native; + +public interface LibBZip2 extends Library +{ + LibBZip2 INSTANCE = Native.load("libbz2", LibBZip2.class); + + int BZ_OK = 0; + int BZ_RUN_OK = 1; + int BZ_FLUSH_OK = 2; + int BZ_FINISH_OK = 3; + int BZ_STREAM_END = 4; + + int BZ_RUN = 0; + int BZ_FLUSH = 1; + int BZ_FINISH = 2; + + int BZ2_bzCompressInit(BzStream stream, int blockSize100k, int verbosity, int workFactor); + int BZ2_bzCompress(BzStream stream, int action); + int BZ2_bzCompressEnd(BzStream stream); +} \ No newline at end of file diff --git a/cache/src/main/java/net/runelite/cache/util/ScriptVarType.java b/cache/src/main/java/net/runelite/cache/util/ScriptVarType.java index f67cc0c09..d6644407a 100644 --- a/cache/src/main/java/net/runelite/cache/util/ScriptVarType.java +++ b/cache/src/main/java/net/runelite/cache/util/ScriptVarType.java @@ -24,11 +24,12 @@ */ package net.runelite.cache.util; -import java.util.HashMap; -import java.util.Map; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.HashMap; +import java.util.Map; + @AllArgsConstructor @Getter public enum ScriptVarType diff --git a/cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java b/cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java index 669bb6a02..9cfc57151 100644 --- a/cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java +++ b/cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java @@ -26,14 +26,15 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class XteaKeyManager implements KeyProvider { diff --git a/cache/src/test/java/net/runelite/cache/script/disassembler/DisassemblerTest.java b/cache/src/test/java/net/runelite/cache/script/disassembler/DisassemblerTest.java index ba18683be..719723a07 100644 --- a/cache/src/test/java/net/runelite/cache/script/disassembler/DisassemblerTest.java +++ b/cache/src/test/java/net/runelite/cache/script/disassembler/DisassemblerTest.java @@ -45,6 +45,7 @@ import static net.runelite.cache.Cache.loadStore; + public class DisassemblerTest { private static final Logger logger = LoggerFactory.getLogger(DisassemblerTest.class); diff --git a/client/src/main/java/dev/hoot/api/magic/Magic.java b/client/src/main/java/dev/hoot/api/magic/Magic.java index f5dbcbeec..161cbd256 100644 --- a/client/src/main/java/dev/hoot/api/magic/Magic.java +++ b/client/src/main/java/dev/hoot/api/magic/Magic.java @@ -14,6 +14,8 @@ import java.util.Arrays; +import static meteor.api.ClientPacketManagerKt.queueClickPacket; + public class Magic { private static final int SPELLBOOK_VARBIT = 4070; @@ -71,7 +73,7 @@ public static void selectSpell(Spell spell) Widget widget = Widgets.get(spell.getWidget()); if (widget != null) { - ClientPackets.INSTANCE.queueClickPacket(widget.getClickPoint()); + queueClickPacket(widget.getClickPoint()); widget.interact(0); } } diff --git a/client/src/main/java/dev/hoot/api/packets/WidgetPackets.java b/client/src/main/java/dev/hoot/api/packets/WidgetPackets.java index bf53a66af..97beca4d6 100644 --- a/client/src/main/java/dev/hoot/api/packets/WidgetPackets.java +++ b/client/src/main/java/dev/hoot/api/packets/WidgetPackets.java @@ -184,7 +184,7 @@ public static void queueWidgetAction10Packet(int widgetId, int itemId, int child public static void queueResumePauseWidgetPacket(int widgetId, int childId) { - createContinuePacket(widgetId, childId).send(); + // createContinuePacket(widgetId, childId).send(); } public static void queueWidgetOnWidgetPacket(int sourceWidgetId, int sourceSlot, int sourceItemId, int destinationWidgetId, int destinationSlot, int destinationItemId) @@ -284,8 +284,8 @@ public static PacketBufferNode createWidgetOnWidget(int sourceWidgetId, int sour return ClientPackets.INSTANCE.createItemWidgetOnItemWidgetPacket(sourceWidgetId, sourceSlot, sourceItemId, destinationWidgetId, destinationSlot, destinationItemId); } - public static PacketBufferNode createContinuePacket(int widgetId, int childId) + public void createContinuePacket(int widgetId, int childId) { - return ClientPackets.INSTANCE.createContinuePacket(widgetId, childId); + //TODO } } \ No newline at end of file diff --git a/client/src/main/java/dev/hoot/api/widgets/Prayers.java b/client/src/main/java/dev/hoot/api/widgets/Prayers.java index a0ab3f209..6f30bc98f 100644 --- a/client/src/main/java/dev/hoot/api/widgets/Prayers.java +++ b/client/src/main/java/dev/hoot/api/widgets/Prayers.java @@ -9,6 +9,8 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; +import static meteor.api.ClientPacketManagerKt.queueClickPacket; + public class Prayers { public static boolean isEnabled(Prayer prayer) @@ -36,7 +38,7 @@ public static void toggleQuickPrayer(boolean enabled) Widget widget = Widgets.get(WidgetInfo.MINIMAP_QUICK_PRAYER_ORB); if (widget != null) { - ClientPackets.INSTANCE.queueClickPacket(widget.getClickPoint()); + queueClickPacket(widget.getClickPoint()); widget.interact(enabled ? "Activate" : "Deactivate"); } diff --git a/client/src/main/java/meteor/Main.kt b/client/src/main/java/meteor/Main.kt index 23c66a545..97b18ee5d 100644 --- a/client/src/main/java/meteor/Main.kt +++ b/client/src/main/java/meteor/Main.kt @@ -12,7 +12,6 @@ import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.compose.ui.window.* -import com.google.gson.Gson import dev.hoot.api.events.AutomatedMenu import dev.hoot.api.game.GameThread import eventbus.Events @@ -23,8 +22,12 @@ import eventbus.events.MenuOptionClicked import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import meteor.Configuration.EXTERNALS_DIR -import meteor.api.loot.Interact import meteor.api.ClientPackets +import meteor.api.createClientPacket +import meteor.api.loot.Interact +import meteor.api.queueClickPacket +import meteor.chat.ChatCommandManager +import meteor.chat.ChatMessageManager import meteor.config.ConfigManager import meteor.dev.widgetinspector.WidgetInspector import meteor.game.* @@ -35,10 +38,13 @@ import meteor.menus.WidgetMenuOption import meteor.plugins.EventSubscriber import meteor.plugins.PluginManager import meteor.plugins.meteor.MeteorConfig +import meteor.plugins.privateserver.PrivateServerConfig import meteor.plugins.xptracker.XpTrackerService +import meteor.rmi.handshake.HandshakeClient +import meteor.rmi.handshake.HandshakeService import meteor.rs.Applet import meteor.rs.AppletConfiguration -import meteor.session.SessionManager +import meteor.ui.composables.preferences.uiColor import meteor.ui.composables.ui.windowContent import meteor.ui.overlay.OverlayManager import meteor.ui.overlay.OverlayRenderer @@ -53,17 +59,9 @@ import meteor.util.Proxy import meteor.util.RuntimeConfigLoader import net.runelite.api.* import net.runelite.api.hooks.Callbacks -import meteor.chat.ChatCommandManager -import meteor.chat.ChatMessageManager -import meteor.plugins.privateserver.PrivateServerConfig -import meteor.rmi.handshake.HandshakeService -import meteor.rmi.handshake.HandshakeClient -import meteor.ui.composables.preferences.uiColor -import net.runelite.api.packets.ClientPacket import net.runelite.client.plugins.gpu.GpuPlugin import net.runelite.http.api.chat.ChatClient import net.runelite.http.api.xp.XpClient -import net.runelite.rs.api.RSClient import okhttp3.OkHttpClient import org.apache.commons.lang3.time.StopWatch import org.jetbrains.skiko.OS @@ -296,10 +294,10 @@ object Main : ApplicationScope, EventSubscriber() { Player.client = client Tile.client = client KEVENT.subscribe(Events.INTERACT) { - GameThread.invoke { ClientPackets.createClientPacket(it.data.menu)!!.send() } + GameThread.invoke { createClientPacket(it.data.menu)!!.send() } } KEVENT.subscribe(Events.SEND_CLICK_PACKET) { - GameThread.invoke { ClientPackets.queueClickPacket(it.data.clickPoint) } + GameThread.invoke {queueClickPacket(it.data.clickPoint) } } KEVENT.subscribe(Events.MENU_OPTION_CLICKED) { //These are api onClicks (before client code is usable) diff --git a/client/src/main/java/meteor/api/ClientPacketManager.kt b/client/src/main/java/meteor/api/ClientPacketManager.kt new file mode 100644 index 000000000..d8cbdb2dc --- /dev/null +++ b/client/src/main/java/meteor/api/ClientPacketManager.kt @@ -0,0 +1,363 @@ +package meteor.api + +import ClientPacket +import dev.hoot.api.InteractionException +import dev.hoot.api.events.AutomatedMenu +import dev.hoot.api.packets.WidgetPackets +import dev.hoot.api.widgets.Widgets +import meteor.Main +import meteor.api.ClientPackets.createClickPacket +import meteor.api.ClientPackets.createGroundItemAction1Packet +import meteor.api.ClientPackets.createGroundItemAction2Packet +import meteor.api.ClientPackets.createGroundItemAction3Packet +import meteor.api.ClientPackets.createGroundItemAction4Packet +import meteor.api.ClientPackets.createGroundItemAction5Packet +import meteor.api.ClientPackets.createItemWidgetOnGameObjectPacket +import meteor.api.ClientPackets.createItemWidgetOnNPCPacket +import meteor.api.ClientPackets.createItemWidgetOnPlayerPacket +import meteor.api.ClientPackets.createNPCAction1Packet +import meteor.api.ClientPackets.createNPCAction2Packet +import meteor.api.ClientPackets.createNPCAction3Packet +import meteor.api.ClientPackets.createNPCAction4Packet +import meteor.api.ClientPackets.createNPCAction5Packet +import meteor.api.ClientPackets.createObjectAction1Packet +import meteor.api.ClientPackets.createObjectAction2Packet +import meteor.api.ClientPackets.createObjectAction3Packet +import meteor.api.ClientPackets.createObjectAction4Packet +import meteor.api.ClientPackets.createObjectAction5Packet +import meteor.api.ClientPackets.createPlayerAction1Packet +import meteor.api.ClientPackets.createPlayerAction2Packet +import meteor.api.ClientPackets.createPlayerAction3Packet +import meteor.api.ClientPackets.createPlayerAction4Packet +import meteor.api.ClientPackets.createPlayerAction5Packet +import meteor.api.ClientPackets.createPlayerAction6Packet +import meteor.api.ClientPackets.createPlayerAction7Packet +import meteor.api.ClientPackets.createPlayerAction8Packet +import meteor.plugins.meteor.AutoInteractOverlay +import meteor.rs.ClientThread +import net.runelite.api.MenuAction +import net.runelite.api.packets.PacketBufferNode +import net.runelite.api.widgets.Widget +import net.runelite.api.widgets.WidgetType +import java.awt.Point + +fun preparePacketBuffer(opcode: Int, size: Int): PacketBufferNode { + + val clientPacket = Main.client.createClientPacket(opcode, size) + return Main.client.preparePacket( + clientPacket, + Main.client.packetWriter.isaacCipher + ) +} +fun preparePacketBuffer(clientPacket: ClientPacket): PacketBufferNode { + val clientPacket = Main.client.createClientPacket(clientPacket.id, clientPacket.length) + return Main.client.preparePacket( + clientPacket, + Main.client.packetWriter.isaacCipher + ) +} +fun queueClickPacket(clickPoint: Point) { + AutoInteractOverlay.interactPoint = clickPoint + queueClickPacket(clickPoint.x, clickPoint.y) +} + + +fun queueClickPacket(mouseInfo: Int, x: Int, y: Int) { + ClientThread.invoke { createClickPacket(mouseInfo, x, y).send() } +} + +fun queueClickPacket(x: Int, y: Int) { + Main.client.mouseLastPressedMillis = System.currentTimeMillis() + var mousePressedTime = + Main.client.mouseLastPressedMillis - Main.client.clientMouseLastPressedMillis + if (mousePressedTime < 0) { + mousePressedTime = 0 + } + if (mousePressedTime > 32767) { + mousePressedTime = 32767 + } + Main.client.clientMouseLastPressedMillis = Main.client.mouseLastPressedMillis + val mouseInfo = (mousePressedTime shl 1) + 1 + queueClickPacket(mouseInfo.toInt(), x, y) + Main.logger.error("--Click-Packet-- $x.$y") +} + +fun createClickPacket(x: Int, y: Int, override: Boolean = false): PacketBufferNode { + Main.client.mouseLastPressedMillis = System.currentTimeMillis() + var mousePressedTime = + Main.client.mouseLastPressedMillis - Main.client.clientMouseLastPressedMillis + if (mousePressedTime < 0) { + mousePressedTime = 0 + } + if (mousePressedTime > 32767) { + mousePressedTime = 32767 + } + Main.client.clientMouseLastPressedMillis = Main.client.mouseLastPressedMillis + val mouseInfo = (mousePressedTime shl 1) + 1 + return createClickPacket(mouseInfo.toInt(), x, y) +} + + +/** + * attempts to create a client packet from the provided [menu] + * @param menu the menu we extract the information that we need to create the packet + */ + +//remake this function with named arguments + +fun createClientPacket(menu: AutomatedMenu): PacketBufferNode? { + val opcode = menu.opcode + val client = Main.client + val id = menu.identifier + val param0 = menu.param0 + val param1 = menu.param1 + var selectedWidgetItemId = client.selectedSpellItemId + var selectedWidgetSlot = client.selectedSpellChildIndex + val selectedWidget = client.selectedSpellWidget + var result: PacketBufferNode? = null + result = when (opcode) { + MenuAction.ITEM_USE_ON_GAME_OBJECT, MenuAction.WIDGET_TARGET_ON_GAME_OBJECT -> createItemWidgetOnGameObjectPacket( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + selectedSpellChildIndex = selectedWidgetSlot, + selectedSpellItemId = selectedWidgetItemId, + selectedSpellWidget = selectedWidget, + shiftPressed = false + ) + MenuAction.GAME_OBJECT_FIRST_OPTION -> createObjectAction1Packet( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + shiftPressed = false + ) + MenuAction.GAME_OBJECT_SECOND_OPTION -> createObjectAction2Packet( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + shiftPressed = false + ) + MenuAction.GAME_OBJECT_THIRD_OPTION -> createObjectAction3Packet( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + shiftPressed = false + ) + MenuAction.GAME_OBJECT_FOURTH_OPTION -> createObjectAction4Packet( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + shiftPressed = false + ) + MenuAction.GAME_OBJECT_FIFTH_OPTION -> createObjectAction5Packet( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + shiftPressed = false + ) + MenuAction.ITEM_USE_ON_NPC, MenuAction.WIDGET_TARGET_ON_NPC -> createItemWidgetOnNPCPacket( + id = id, + selectedSpellWidget = selectedWidget, + selectedSpellItemId = selectedWidgetItemId, + selectedSpellChildIndex = selectedWidgetSlot, + shiftPressed = false + ) + MenuAction.NPC_FIRST_OPTION -> createNPCAction1Packet(id = id, shiftPressed = false) + MenuAction.NPC_SECOND_OPTION -> createNPCAction2Packet(id = id, shiftPressed = false) + MenuAction.NPC_THIRD_OPTION -> createNPCAction3Packet(id = id, shiftPressed = false) + MenuAction.NPC_FOURTH_OPTION -> createNPCAction4Packet(id = id, shiftPressed = false) + MenuAction.NPC_FIFTH_OPTION -> createNPCAction5Packet(id = id, shiftPressed = false) + MenuAction.ITEM_USE_ON_PLAYER, MenuAction.WIDGET_TARGET_ON_PLAYER -> createItemWidgetOnPlayerPacket( + id = id, + selectedSpellItemId = selectedWidgetItemId, + selectedSpellChildIndex = selectedWidgetSlot, + selectedSpellWidget = selectedWidget, + shiftPressed = false + ) + MenuAction.PLAYER_FIRST_OPTION -> createPlayerAction1Packet(id = id, shiftPressed = false) + MenuAction.PLAYER_SECOND_OPTION -> createPlayerAction2Packet(id = id, shiftPressed = false) + MenuAction.PLAYER_THIRD_OPTION -> createPlayerAction3Packet(id = id, shiftPressed = false) + MenuAction.PLAYER_FOURTH_OPTION -> createPlayerAction4Packet(id = id, shiftPressed = false) + MenuAction.PLAYER_FIFTH_OPTION -> createPlayerAction5Packet(id = id, shiftPressed = false) + MenuAction.PLAYER_SIXTH_OPTION -> createPlayerAction6Packet(id = id, shiftPressed = false) + MenuAction.PLAYER_SEVENTH_OPTION -> createPlayerAction7Packet(id = id, shiftPressed = false) + MenuAction.PLAYER_EIGTH_OPTION -> createPlayerAction8Packet(id = id, shiftPressed = false) +/* MenuAction.ITEM_USE_ON_GROUND_ITEM, MenuAction.WIDGET_TARGET_ON_GROUND_ITEM -> createItemWidgetOnGroundItemPacket( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + selectedSpellChildIndex = selectedWidgetSlot, + selectedWidgetItemId = selectedWidgetItemId, + selectedSpellWidget = selectedWidget, + shiftPressed = false + )*/ + MenuAction.GROUND_ITEM_FIRST_OPTION -> createGroundItemAction1Packet( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + shiftPressed = false + ) + MenuAction.GROUND_ITEM_SECOND_OPTION -> createGroundItemAction2Packet( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + shiftPressed = false + ) + MenuAction.GROUND_ITEM_THIRD_OPTION -> createGroundItemAction3Packet( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + shiftPressed = false + ) + MenuAction.GROUND_ITEM_FOURTH_OPTION -> createGroundItemAction4Packet( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + shiftPressed = false + ) + MenuAction.GROUND_ITEM_FIFTH_OPTION -> createGroundItemAction5Packet( + id = id, + worldX = param0 + client.baseX, + worldY = param1 + client.baseY, + shiftPressed = false + ) + MenuAction.WIDGET_USE_ON_ITEM, MenuAction.ITEM_USE_ON_ITEM, MenuAction.WIDGET_TARGET_ON_WIDGET -> { + val targetParent: Widget? = Widgets.fromId(param1) + val targetChild: Widget? = targetParent?.getChild(param0) + var childItemId = -1 + if (targetChild != null) { + childItemId = targetChild.itemId + } + val source: Widget = client.getWidget(selectedWidget)!! + if (source.type == WidgetType.GRAPHIC) { + selectedWidgetSlot = -1 + selectedWidgetItemId = -1 + } + ClientPackets.createItemWidgetOnItemWidgetPacket( + widgetID = selectedWidget, + slot = selectedWidgetSlot, + selectedSpellItemId = selectedWidgetItemId, + id = param1, + itemId = param0, + selectedSpellChildIndex = childItemId + ) + } + MenuAction.WIDGET_FIRST_OPTION -> ClientPackets.createWidgetAction1Packet( + param1 = param1, + itemId = -1, + param0 = param0 + ) + MenuAction.WIDGET_SECOND_OPTION -> ClientPackets.createWidgetAction2Packet( + param1 = param1, + itemId = -1, + param0 = param0 + ) + MenuAction.WIDGET_THIRD_OPTION -> ClientPackets.createWidgetAction3Packet( + param1 = param1, + itemId = -1, + param0 = param0 + ) + MenuAction.WIDGET_FOURTH_OPTION -> ClientPackets.createWidgetAction4Packet( + param1 = param1, + itemId = -1, + param0 = param0 + ) + MenuAction.WIDGET_FIFTH_OPTION -> ClientPackets.createWidgetAction5Packet( + param1 = param1, + itemId = -1, + param0 = param0 + ) + MenuAction.WIDGET_TYPE_1 -> WidgetPackets.createType1Action(param1) + //MenuAction.WIDGET_CONTINUE -> WidgetPackets.createContinuePacket(parentId = param1, slotId = param0) + MenuAction.WALK -> { + + client.destinationX = param0 + client.destinationY = param1 + ClientPackets.createMovementPacket( + five = 5, + x = param0 + client.baseX, + y = param1 + client.baseY, + shiftPressed = false + ) + } + MenuAction.CC_OP_LOW_PRIORITY, + MenuAction.CC_OP -> { + + val widget = Widgets.fromId(param1) + var child: Widget? = null + if (param0 != -1) + child = widget?.getChild(param0) + createDefaultAction(id, param1, child?.itemId ?: -1, param0) + + } + else -> null + } + result?.let { + Main.logger.warn("--Auto-Packet-- ${opcode.name} id:$id :param0:$param0 param1: $param1") + return it + } + throw InteractionException("Couldn't parse packet from opcode: $opcode") + + + + +} +fun createDefaultAction(type: Int, widgetPackedId: Int, itemId: Int, itemSlot: Int): PacketBufferNode { + return when(type){ + 1 -> ClientPackets.createWidgetAction1Packet( + param1 = widgetPackedId, + itemId = itemId, + param0 = itemSlot + ) + 2 -> ClientPackets.createWidgetAction2Packet( + param1 = widgetPackedId, + itemId = itemId, + param0 = itemSlot + ) + 3 -> ClientPackets.createWidgetAction3Packet( + param1 = widgetPackedId, + itemId = itemId, + param0 = itemSlot + ) + 4 -> ClientPackets.createWidgetAction4Packet( + param1 = widgetPackedId, + itemId = itemId, + param0 = itemSlot + ) + 5 -> ClientPackets.createWidgetAction5Packet( + param1 = widgetPackedId, + itemId = itemId, + param0 = itemSlot + ) + 6 -> ClientPackets.createWidgetAction6Packet( + param1 = widgetPackedId, + itemId = itemId, + param0 = itemSlot + ) + 7 -> ClientPackets.createWidgetAction7Packet( + param1 = widgetPackedId, + itemId = itemId, + param0 = itemSlot + ) + 8 -> ClientPackets.createWidgetAction8Packet( + param1 = widgetPackedId, + itemId = itemId, + param0 = itemSlot + ) + 9 -> ClientPackets.createWidgetAction9Packet( + param1 = widgetPackedId, + itemId = itemId, + param0 = itemSlot + ) + 10 -> ClientPackets.createWidgetAction10Packet( + param1 = widgetPackedId, + itemId = itemId, + param0 = itemSlot + ) + + else -> { + Main.logger.warn("Couldn't parse packet from type: $type") + throw InteractionException("Couldn't parse packet from type: $type") + } + } +} \ No newline at end of file diff --git a/client/src/main/java/meteor/api/ClientPackets.kt b/client/src/main/java/meteor/api/ClientPackets.kt index 50e645235..dea61c9f0 100644 --- a/client/src/main/java/meteor/api/ClientPackets.kt +++ b/client/src/main/java/meteor/api/ClientPackets.kt @@ -1,805 +1,484 @@ -@file:Suppress("DEPRECATION") package meteor.api import ClientPacket -import dev.hoot.api.InteractionException -import dev.hoot.api.events.AutomatedMenu -import dev.hoot.api.packets.WidgetPackets -import dev.hoot.api.widgets.Widgets -import meteor.Main -import meteor.plugins.meteor.AutoInteractOverlay -import meteor.rs.ClientThread.invoke -import net.runelite.api.MenuAction import net.runelite.api.packets.PacketBufferNode -import net.runelite.api.widgets.Widget -import net.runelite.api.widgets.WidgetType -import java.awt.Point -import class113 as class1131 - -/** - * an object for calling various Client Packets - * @author Null - */ -object ClientPackets { - // OPOBJ1 - // param0: worldX - // param1: worldY - fun createGroundItemAction1Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPNPC5) - bufferNode.packetBuffer.`writeShortAdd$api`(worldY) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAdd$api`(worldX) - bufferNode.packetBuffer.`writeShort$api`(groundItemId) - return bufferNode - } - - // OPOBJ2 - // param0: worldX - // param1: worldY - fun createGroundItemAction2Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ2) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) - bufferNode.packetBuffer.`writeShort$api`(worldY) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAdd$api`(groundItemId) - return bufferNode - } - - // OPOBJ3 - // param0: worldX - // param1: worldY - fun createGroundItemAction3Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ3) - bufferNode.packetBuffer.`writeShortLE$api`(worldY) - bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - return bufferNode - } - - // OPOBJ4 - // param0: worldX - // param1: worldY - fun createGroundItemAction4Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOCT) - bufferNode.packetBuffer.`writeShortAdd$api`(groundItemId) - bufferNode.packetBuffer.`writeShort$api`(worldX) - bufferNode.packetBuffer.`writeShort$api`(worldY) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - return bufferNode - } - - // OPOBJ5 - // param0: worldX - // param1: worldY - fun createGroundItemAction5Packet(groundItemId: Int, worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ5) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShort$api`(worldY) - bufferNode.packetBuffer.`writeShortLE$api`(worldX) - bufferNode.packetBuffer.`writeShortAddLE$api`(groundItemId) - return bufferNode - } - - // OPLOC1 - // param0: worldX - // param1: worldY - fun createObjectAction1Packet( - objectID: Int, - worldX: Int, - worldY: Int, - shiftPressed: Boolean - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOC1) - bufferNode.packetBuffer.`writeShortAdd$api`(worldX) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) - bufferNode.packetBuffer.`writeShortAddLE$api`(objectID) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - return bufferNode - } - - // OPLOC2 - // param0: worldX - // param1: worldY - fun createObjectAction2Packet( - objectID: Int, - worldX: Int, - worldY: Int, - shiftPressed: Boolean - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.CLICK) - bufferNode.packetBuffer.`writeShortAdd$api`(objectID) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAdd$api`(worldX) - bufferNode.packetBuffer.`writeShortLE$api`(worldY) - return bufferNode - } - - // OPLOC3 - // param0: worldX - // param1: worldY - fun createObjectAction3Packet( - objectID: Int, - worldX: Int, - worldY: Int, - shiftPressed: Boolean - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOC3) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) - bufferNode.packetBuffer.`writeShort$api`(objectID) - bufferNode.packetBuffer.`writeShortLE$api`(worldX) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) - return bufferNode - } - - // OPLOC4 - // param0: worldX - // param1: worldY - fun createObjectAction4Packet( - objectID: Int, - worldX: Int, - worldY: Int, - shiftPressed: Boolean - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOC4) - bufferNode.packetBuffer.`writeShortLE$api`(worldY) - bufferNode.packetBuffer.`writeShortAddLE$api`(objectID) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - return bufferNode - } - - // OPLOC5 - // param0: worldX - // param1: worldY - fun createObjectAction5Packet( - objectID: Int, - worldX: Int, - worldY: Int, - shiftPressed: Boolean - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOC5) - bufferNode.packetBuffer.`writeShortLE$api`(worldY) - bufferNode.packetBuffer.`writeShortAddLE$api`(objectID) - bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - return bufferNode - } - - // OPLOCT - // param0: worldX - // param1: worldY - fun createItemWidgetOnGameObjectPacket( - objectID: Int, - worldX: Int, - worldY: Int, - itemSlot: Int, - itemId: Int, - itemWidgetID: Int, - shiftPressed: Boolean - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOCE) - bufferNode.packetBuffer.`writeShortAddLE$api`(itemSlot) - bufferNode.packetBuffer.`writeShort$api`(worldX) - bufferNode.packetBuffer.`writeShortLE$api`(worldY) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortLE$api`(objectID) - bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) - bufferNode.packetBuffer.`writeShortAdd$api`(itemId) - return bufferNode - } - - //OPNPCT - fun createItemWidgetOnNPCPacket( - npcIdx: Int, - itemWidgetID: Int, - itemID: Int, - itemSlot: Int, - shiftPressed: Boolean - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER3) - bufferNode.packetBuffer.`writeIntIME$api`(itemWidgetID) - bufferNode.packetBuffer.`writeShortAdd$api`(itemID) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortLE$api`(npcIdx) - bufferNode.packetBuffer.`writeShortAddLE$api`(itemSlot) - return bufferNode - } - - //OPNPC1 - fun createNPCAction1Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPNPC1) - bufferNode.packetBuffer.`writeShortAdd$api`(npcIdx) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - return bufferNode - } - - //OPNPC2 - fun createNPCAction2Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPNPC2) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAdd$api`(npcIdx) - return bufferNode - } - - //OPNPC3 - fun createNPCAction3Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPNPC3) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAddLE$api`(npcIdx) - return bufferNode - } - - //OPNPC4 - fun createNPCAction4Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPNPC4) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShort$api`(npcIdx) - return bufferNode - } - - //OPNPC5 - fun createNPCAction5Packet(npcIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPNPC5) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortLE$api`(npcIdx) - return bufferNode - } - - //OPPLAYERT - fun createItemWidgetOnPlayerPacket( - playerIdx: Int, - itemId: Int, - itemSlot: Int, - itemWidgetID: Int, - shiftPressed: Boolean - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYERT) - bufferNode.packetBuffer.`writeShort$api`(playerIdx) - bufferNode.packetBuffer.`writeShortAdd$api`(itemWidgetID) - bufferNode.packetBuffer.`writeIntLE$api`(itemSlot) - bufferNode.packetBuffer.`writeShortLE$api`(itemId) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - return bufferNode - } - - ///OPPLAYER1 - fun createPlayerAction1Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER1) - bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) - return bufferNode - } - - ///OPPLAYER2 - fun createPlayerAction2Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER2) - bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShort$api`(playerIdx) - return bufferNode - } - - ///OPPLAYER3 - fun createPlayerAction3Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER3) - bufferNode.packetBuffer.`writeShortAdd$api`(playerIdx) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - return bufferNode - } - - ///OPPLAYER4 - fun createPlayerAction4Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER4) - bufferNode.packetBuffer.`writeShortAddLE$api`(playerIdx) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) - return bufferNode - } - - ///OPPLAYER5 - fun createPlayerAction5Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER5) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortLE$api`(playerIdx) - return bufferNode - } - - ///OPPLAYER6 - fun createPlayerAction6Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER6) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortLE$api`(playerIdx) - return bufferNode - } - - ///OPPLAYER7 - fun createPlayerAction7Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER7) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShort$api`(playerIdx) - return bufferNode - } - - ///OPPLAYER8 - fun createPlayerAction8Packet(playerIdx: Int, shiftPressed: Boolean): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER8) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortLE$api`(playerIdx) - return bufferNode - } - - //OPLOCT - fun createItemWidgetOnGroundItemPacket( - groundItemID: Int, - worldX: Int, - worldY: Int, - itemSlot: Int, - itemID: Int, - itemWidgetID: Int, - shiftPressed: Boolean - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.OPLOCT) - bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAddLE$api`(itemWidgetID) - bufferNode.packetBuffer.`writeShort$api`(worldX) - bufferNode.packetBuffer.`writeIntIME$api`(groundItemID) - bufferNode.packetBuffer.`writeShortLE$api`(itemID) - bufferNode.packetBuffer.`writeShortLE$api`(worldY) - bufferNode.packetBuffer.`writeShortAdd$api`(itemSlot) - return bufferNode - } - - //IF_BUTTONT - // param0: destinationSlot - // param1: destinationWidgetId - fun createItemWidgetOnItemWidgetPacket( - sourceWidgetId: Int, - sourceSlot: Int, - sourceItemId: Int, - destinationWidgetId: Int, - destinationSlot: Int, - destinationItemId: Int - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTONT) - bufferNode.packetBuffer.`writeShortAddLE$api`(sourceSlot) - bufferNode.packetBuffer.`writeInt$api`(destinationWidgetId) - bufferNode.packetBuffer.`writeShortAdd$api`(destinationItemId) - bufferNode.packetBuffer.`writeIntIME$api`(sourceWidgetId) - bufferNode.packetBuffer.`writeShortAddLE$api`(sourceItemId) - bufferNode.packetBuffer.`writeShortAddLE$api`(destinationSlot) - return bufferNode - } - - // IF_BUTTON1 - // param0: childId - // param1: widgetId - fun createWidgetAction1Packet( - widgetId: Int, - itemId: Int, - childId: Int, - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON1) - bufferNode.packetBuffer.`writeInt$api`(widgetId) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeShort$api`(itemId) - return bufferNode - } - - // IF_BUTTON2 - // param0: childId - // param1: widgetId - fun createWidgetAction2Packet( - widgetId: Int, - itemId: Int, - childId: Int, - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON2) - bufferNode.packetBuffer.`writeInt$api`(widgetId) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeShort$api`(itemId) - return bufferNode - } - - // IF_BUTTON3 - // param0: childId - // param1: widgetId - fun createWidgetAction3Packet( - widgetId: Int, - itemId: Int, - childId: Int, - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON3) - bufferNode.packetBuffer.`writeInt$api`(widgetId) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeShort$api`(itemId) - return bufferNode - } - - // IF_BUTTON4 - // param0: childId - // param1: widgetId - fun createWidgetAction4Packet( - widgetId: Int, - itemId: Int, - childId: Int, - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON4) - bufferNode.packetBuffer.`writeInt$api`(widgetId) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeShort$api`(itemId) - return bufferNode - } - - // IF_BUTTON5 - // param0: childId - // param1: widgetId - fun createWidgetAction5Packet( - widgetId: Int, - itemId: Int, - childId: Int, - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON5) - bufferNode.packetBuffer.`writeInt$api`(widgetId) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeShort$api`(itemId) - return bufferNode - } - - // IF_BUTTON6 - // param0: childId - // param1: widgetId - fun createWidgetAction6Packet( - widgetId: Int, - itemId: Int, - childId: Int, - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON6) - bufferNode.packetBuffer.`writeInt$api`(widgetId) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeShort$api`(itemId) - return bufferNode - } - - // IF_BUTTON7 - // param0: childId - // param1: widgetId - fun createWidgetAction7Packet( - widgetId: Int, - itemId: Int, - childId: Int, - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON7) - bufferNode.packetBuffer.`writeInt$api`(widgetId) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeShort$api`(itemId) - return bufferNode - } - - // IF_BUTTON8 - // param0: childId - // param1: widgetId - fun createWidgetAction8Packet( - widgetId: Int, - itemId: Int, - childId: Int, - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON8) - bufferNode.packetBuffer.`writeInt$api`(widgetId) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeShort$api`(itemId) - return bufferNode - } - - // IF_BUTTON9 - // param0: childId - // param1: widgetId - fun createWidgetAction9Packet( - widgetId: Int, - itemId: Int, - childId: Int, - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON9) - bufferNode.packetBuffer.`writeInt$api`(widgetId) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeShort$api`(itemId) - return bufferNode - } - - // IF_BUTTON10 - // param0: childId - // param1: widgetId - fun createWidgetAction10Packet( - widgetId: Int, - itemId: Int, - childId: Int, - ): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON10) - bufferNode.packetBuffer. `writeInt$api`(widgetId) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeShort$api`(itemId) - return bufferNode - } - - // CLICK - fun createClickPacket(mouseInfo: Int, x: Int, y: Int): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.EVENT_MOUSE_CLICK) - bufferNode.packetBuffer.`writeShort$api`(mouseInfo) - bufferNode.packetBuffer.`writeShort$api`(y) - bufferNode.packetBuffer.`writeShort$api`(x) - return bufferNode - } - - // WALK - fun createMovementPacket(worldX: Int, worldY: Int, shiftPressed: Boolean): PacketBufferNode { - - val bufferNode = preparePacketBuffer(ClientPacket.OPLOC5) - bufferNode.packetBuffer.`writeByte$api`(5) - bufferNode.packetBuffer.`writeShortAdd$api`(worldY) - bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) - bufferNode.packetBuffer.`writeShortAdd$api`(worldX) - return bufferNode - } - - // CONTINUE - fun createContinuePacket(widgetId: Int, childId: Int): PacketBufferNode { - val bufferNode = preparePacketBuffer(ClientPacket.RESUME_PAUSEBUTTON) - bufferNode.packetBuffer.`writeShort$api`(childId) - bufferNode.packetBuffer.`writeIntME$api`(widgetId) - return bufferNode - } - - /** - * creates a new packetBuffer with the provided [opcode] and [size] - */ - fun preparePacketBuffer(opcode: Int, size: Int): PacketBufferNode { - - val clientPacket = Main.client.createClientPacket(opcode, size) - return Main.client.preparePacket( - clientPacket, - Main.client.packetWriter.isaacCipher - ) - } - fun preparePacketBuffer(clientPacket: ClientPacket): PacketBufferNode { - val clientPacket = Main.client.createClientPacket(clientPacket.id, clientPacket.length) - return Main.client.preparePacket( - clientPacket, - Main.client.packetWriter.isaacCipher - ) - } - fun queueClickPacket(clickPoint: Point) { - AutoInteractOverlay.interactPoint = clickPoint - queueClickPacket(clickPoint.x, clickPoint.y) - } - - fun queueClickPacket(mouseInfo: Int, x: Int, y: Int) { - invoke { createClickPacket(mouseInfo, x, y).send() } - } - - fun queueClickPacket(x: Int, y: Int) { - Main.client.mouseLastPressedMillis = System.currentTimeMillis() - var mousePressedTime = - Main.client.mouseLastPressedMillis - Main.client.clientMouseLastPressedMillis - if (mousePressedTime < 0) { - mousePressedTime = 0 - } - if (mousePressedTime > 32767) { - mousePressedTime = 32767 - } - Main.client.clientMouseLastPressedMillis = Main.client.mouseLastPressedMillis - val mouseInfo = (mousePressedTime shl 1) + 1 - queueClickPacket(mouseInfo.toInt(), x, y) - Main.logger.error("--Click-Packet-- $x.$y") - } - - fun createClickPacket(x: Int, y: Int, override: Boolean = false): PacketBufferNode { - Main.client.mouseLastPressedMillis = System.currentTimeMillis() - var mousePressedTime = - Main.client.mouseLastPressedMillis - Main.client.clientMouseLastPressedMillis - if (mousePressedTime < 0) { - mousePressedTime = 0 - } - if (mousePressedTime > 32767) { - mousePressedTime = 32767 - } - Main.client.clientMouseLastPressedMillis = Main.client.mouseLastPressedMillis - val mouseInfo = (mousePressedTime shl 1) + 1 - return createClickPacket(mouseInfo.toInt(), x, y) - } - - /** - * attempts to create a client packet from the provided [menu] - * @param menu the menu we extract the information that we need to create the packet - */ - fun createClientPacket(menu: AutomatedMenu): PacketBufferNode? { - val opcode = menu.opcode - val client = Main.client - val id = menu.identifier - val param0 = menu.param0 - val param1 = menu.param1 - var selectedWidgetItemId = client.selectedSpellItemId - var selectedWidgetSlot = client.selectedSpellChildIndex - // Yes, keeping both in case of a future fix in naming - val selectedWidget = client.selectedSpellWidget - var result : PacketBufferNode? = null - result = when (opcode) { - MenuAction.ITEM_USE_ON_GAME_OBJECT, MenuAction.WIDGET_TARGET_ON_GAME_OBJECT -> createItemWidgetOnGameObjectPacket( - id, - param0 + client.baseX, - param1 + client.baseY, - selectedWidgetSlot, - selectedWidgetItemId, - selectedWidget, - false - ) - MenuAction.GAME_OBJECT_FIRST_OPTION -> createObjectAction1Packet( - id, - param0 + client.baseX, - param1 + client.baseY, - false - ) - MenuAction.GAME_OBJECT_SECOND_OPTION -> createObjectAction2Packet( - id, - param0 + client.baseX, - param1 + client.baseY, - false - ) - MenuAction.GAME_OBJECT_THIRD_OPTION -> createObjectAction3Packet( - id, - param0 + client.baseX, - param1 + client.baseY, - false - ) - MenuAction.GAME_OBJECT_FOURTH_OPTION -> createObjectAction4Packet( - id, - param0 + client.baseX, - param1 + client.baseY, - false - ) - MenuAction.GAME_OBJECT_FIFTH_OPTION -> createObjectAction5Packet( - id, - param0 + client.baseX, - param1 + client.baseY, - false - ) - MenuAction.ITEM_USE_ON_NPC, MenuAction.WIDGET_TARGET_ON_NPC -> createItemWidgetOnNPCPacket( - id, - selectedWidget, - selectedWidgetItemId, - selectedWidgetSlot, - false) - MenuAction.NPC_FIRST_OPTION -> createNPCAction1Packet(id, false) - MenuAction.NPC_SECOND_OPTION -> createNPCAction2Packet(id, false) - MenuAction.NPC_THIRD_OPTION -> createNPCAction3Packet(id, false) - MenuAction.NPC_FOURTH_OPTION -> createNPCAction4Packet(id, false) - MenuAction.NPC_FIFTH_OPTION -> createNPCAction5Packet(id, false) - MenuAction.ITEM_USE_ON_PLAYER, MenuAction.WIDGET_TARGET_ON_PLAYER -> createItemWidgetOnPlayerPacket( - id, - selectedWidgetItemId, - selectedWidgetSlot, - selectedWidget, - false) - MenuAction.PLAYER_FIRST_OPTION -> createPlayerAction1Packet(id, false) - MenuAction.PLAYER_SECOND_OPTION -> createPlayerAction2Packet(id, false) - MenuAction.PLAYER_THIRD_OPTION -> createPlayerAction3Packet(id, false) - MenuAction.PLAYER_FOURTH_OPTION -> createPlayerAction4Packet(id, false) - MenuAction.PLAYER_FIFTH_OPTION -> createPlayerAction5Packet(id, false) - MenuAction.PLAYER_SIXTH_OPTION -> createPlayerAction6Packet(id, false) - MenuAction.PLAYER_SEVENTH_OPTION -> createPlayerAction7Packet(id, false) - MenuAction.PLAYER_EIGTH_OPTION -> createPlayerAction8Packet(id, false) - MenuAction.ITEM_USE_ON_GROUND_ITEM, MenuAction.WIDGET_TARGET_ON_GROUND_ITEM -> createItemWidgetOnGroundItemPacket( - id, - param0 + client.baseX, - param1 + client.baseY, - selectedWidgetSlot, - selectedWidgetItemId, - selectedWidget, - false - ) - MenuAction.GROUND_ITEM_FIRST_OPTION -> createGroundItemAction1Packet( - id, - param0 + client.baseX, - param1 + client.baseY, - false - ) - MenuAction.GROUND_ITEM_SECOND_OPTION -> createGroundItemAction2Packet( - id, - param0 + client.baseX, - param1 + client.baseY, - false - ) - MenuAction.GROUND_ITEM_THIRD_OPTION -> createGroundItemAction3Packet( - id, - param0 + client.baseX, - param1 + client.baseY, - false - ) - MenuAction.GROUND_ITEM_FOURTH_OPTION -> createGroundItemAction4Packet( - id, - param0 + client.baseX, - param1 + client.baseY, - false - ) - MenuAction.GROUND_ITEM_FIFTH_OPTION -> createGroundItemAction5Packet( - id, - param0 + client.baseX, - param1 + client.baseY, - false - ) - MenuAction.WIDGET_USE_ON_ITEM, MenuAction.ITEM_USE_ON_ITEM, MenuAction.WIDGET_TARGET_ON_WIDGET -> { - val targetParent: Widget? = Widgets.fromId(param1) - val targetChild: Widget? = targetParent?.getChild(param0) - var childItemId = -1 - if (targetChild != null) { - childItemId = targetChild.itemId - } - val source: Widget = client.getWidget(selectedWidget)!! - if (source.type == WidgetType.GRAPHIC) { - selectedWidgetSlot = -1 - selectedWidgetItemId = -1 - } - createItemWidgetOnItemWidgetPacket( - selectedWidget, - selectedWidgetSlot, - selectedWidgetItemId, - param1, - param0, - childItemId) - } - MenuAction.WIDGET_FIRST_OPTION -> createWidgetAction1Packet( - param1, - -1, - param0 - ) - MenuAction.WIDGET_SECOND_OPTION -> createWidgetAction2Packet( - param1, - -1, - param0 - ) - MenuAction.WIDGET_THIRD_OPTION -> createWidgetAction3Packet( - param1, - -1, - param0 - ) - MenuAction.WIDGET_FOURTH_OPTION -> createWidgetAction4Packet( - param1, - -1, - param0 - ) - MenuAction.WIDGET_FIFTH_OPTION -> createWidgetAction5Packet( - param1, - -1, - param0 - ) - MenuAction.WIDGET_TYPE_1 -> WidgetPackets.createType1Action(param1) - MenuAction.WIDGET_CONTINUE -> WidgetPackets.createContinuePacket(param1, param0) - MenuAction.WALK -> { - client.destinationX = param0 - client.destinationY = param1 - createMovementPacket( - param0 + client.baseX, - param1 + client.baseY, - false - ) - } - MenuAction.CC_OP_LOW_PRIORITY, - MenuAction.CC_OP -> { - val widget = Widgets.fromId(param1) ?: null - var child: Widget? = null - if (param0 != -1) - child = widget!!.getChild(param0) - - if (child == null) - WidgetPackets.createDefaultAction(id, param1, -1, param0) - else - WidgetPackets.createDefaultAction(id, param1, child.itemId, param0) - } - else -> null - } - result?.let { - val packetType = opcode - Main.logger.warn("--Auto-Packet-- ${packetType.name} id:$id :param0:$param0 param1: $param1") - return it - } - throw InteractionException("Couldn't parse packet from opcode: $opcode") - } -} \ No newline at end of file + +object ClientPackets { +// OPNPC2 +// Size: 3 +// Deobfuscated Name: OPNPC2 +fun createNPCAction2Packet(shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC2) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortLE$api`(id) + return bufferNode +} + + +// OPNPC3 +// Size: 3 +// Deobfuscated Name: OPNPC3 +fun createNPCAction3Packet(id: Int, shiftPressed: Boolean): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC3) + bufferNode.packetBuffer.`writeShortAddLE$api`(id) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + return bufferNode +} + + +// IF_BUTTON10 +// Size: 8 +// Deobfuscated Name: IF_BUTTON10 +fun createWidgetAction10Packet(param1: Int, param0: Int, itemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON10) + bufferNode.packetBuffer.`writeInt$api`(param1) + bufferNode.packetBuffer.`writeShort$api`(param0) + bufferNode.packetBuffer.`writeShort$api`(itemId) + return bufferNode +} + + +// OPPLAYERT +// Size: 11 +// Deobfuscated Name: OPPLAYERT +fun createItemWidgetOnPlayerPacket(shiftPressed: Boolean, selectedSpellItemId: Int, id: Int, selectedSpellChildIndex: Int, selectedSpellWidget: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYERT) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAddLE$api`(selectedSpellItemId) + bufferNode.packetBuffer.`writeShortLE$api`(id) + bufferNode.packetBuffer.`writeShortAdd$api`(selectedSpellChildIndex) + bufferNode.packetBuffer.`writeIntME$api`(selectedSpellWidget) + return bufferNode +} + + +// MOVE_GAMECLICK +// Size: -1 +// Deobfuscated Name: MOVE_GAMECLICK +fun createMovementPacket(five: Int, y: Int, x: Int, shiftPressed: Boolean): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.MOVE_GAMECLICK) + bufferNode.packetBuffer.`writeByte$api`(five) + bufferNode.packetBuffer.`writeShort$api`(x) + bufferNode.packetBuffer.`writeShortAdd$api`(y) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + return bufferNode +} + + +// OPPLAYER1 +// Size: 3 +// Deobfuscated Name: OPPLAYER1 +fun createPlayerAction1Packet(id: Int, shiftPressed: Boolean): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER1) + bufferNode.packetBuffer.`writeShort$api`(id) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + return bufferNode +} + + +// IF_BUTTONT +// Size: 16 +// Deobfuscated Name: IF_BUTTONT +fun createItemWidgetOnItemWidgetPacket(id: Int, slot: Int, selectedSpellChildIndex: Int, widgetID: Int, itemId: Int, selectedSpellItemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTONT) + bufferNode.packetBuffer.`writeIntIME$api`(id) + bufferNode.packetBuffer.`writeShortAdd$api`(slot) + bufferNode.packetBuffer.`writeShortAdd$api`(selectedSpellChildIndex) + bufferNode.packetBuffer.`writeIntME$api`(widgetID) + bufferNode.packetBuffer.`writeShortAdd$api`(itemId) + bufferNode.packetBuffer.`writeShortAddLE$api`(selectedSpellItemId) + return bufferNode +} + + +// OPNPC1 +// Size: 3 +// Deobfuscated Name: OPNPC1 +fun createNPCAction1Packet(id: Int, shiftPressed: Boolean): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC1) + bufferNode.packetBuffer.`writeShort$api`(id) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + return bufferNode +} + + +// OPNPCT +// Size: 11 +// Deobfuscated Name: OPNPCT +fun createItemWidgetOnNPCPacket(selectedSpellWidget: Int, id: Int, shiftPressed: Boolean, selectedSpellChildIndex: Int, selectedSpellItemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPNPCT) + bufferNode.packetBuffer.`writeInt$api`(selectedSpellWidget) + bufferNode.packetBuffer.`writeShortLE$api`(id) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(selectedSpellChildIndex) + bufferNode.packetBuffer.`writeShortAdd$api`(selectedSpellItemId) + return bufferNode +} + + +// IF_BUTTON2 +// Size: 8 +// Deobfuscated Name: IF_BUTTON2 +fun createWidgetAction2Packet(param1: Int, param0: Int, itemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON2) + bufferNode.packetBuffer.`writeInt$api`(param1) + bufferNode.packetBuffer.`writeShort$api`(param0) + bufferNode.packetBuffer.`writeShort$api`(itemId) + return bufferNode +} + + +// IF_BUTTON4 +// Size: 8 +// Deobfuscated Name: IF_BUTTON4 +fun createWidgetAction4Packet(param1: Int, param0: Int, itemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON4) + bufferNode.packetBuffer.`writeInt$api`(param1) + bufferNode.packetBuffer.`writeShort$api`(param0) + bufferNode.packetBuffer.`writeShort$api`(itemId) + return bufferNode +} + + +// IF_BUTTON5 +// Size: 8 +// Deobfuscated Name: IF_BUTTON5 +fun createWidgetAction5Packet(param1: Int, param0: Int, itemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON5) + bufferNode.packetBuffer.`writeInt$api`(param1) + bufferNode.packetBuffer.`writeShort$api`(param0) + bufferNode.packetBuffer.`writeShort$api`(itemId) + return bufferNode +} + + +// IF_BUTTON9 +// Size: 8 +// Deobfuscated Name: IF_BUTTON9 +fun createWidgetAction9Packet(param1: Int, param0: Int, itemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON9) + bufferNode.packetBuffer.`writeInt$api`(param1) + bufferNode.packetBuffer.`writeShort$api`(param0) + bufferNode.packetBuffer.`writeShort$api`(itemId) + return bufferNode +} + + +// OPOBJ2 +// Size: 7 +// Deobfuscated Name: OPOBJ2 +fun createGroundItemAction2Packet(shiftPressed: Boolean, worldX: Int, worldY: Int, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ2) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) + bufferNode.packetBuffer.`writeShortLE$api`(id) + return bufferNode +} + + +// OPPLAYER2 +// Size: 3 +// Deobfuscated Name: OPPLAYER2 +fun createPlayerAction2Packet(shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER2) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(id) + return bufferNode +} + + +// IF_BUTTON8 +// Size: 8 +// Deobfuscated Name: IF_BUTTON8 +fun createWidgetAction8Packet(param1: Int, param0: Int, itemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON8) + bufferNode.packetBuffer.`writeInt$api`(param1) + bufferNode.packetBuffer.`writeShort$api`(param0) + bufferNode.packetBuffer.`writeShort$api`(itemId) + return bufferNode +} + + +// OPNPC5 +// Size: 3 +// Deobfuscated Name: OPNPC5 +fun createNPCAction5Packet(shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC5) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(id) + return bufferNode +} + + +// OPOBJ3 +// Size: 7 +// Deobfuscated Name: OPOBJ3 +fun createGroundItemAction3Packet(worldX: Int, worldY: Int, shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ3) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + bufferNode.packetBuffer.`writeShort$api`(worldY) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(id) + return bufferNode +} + + +// IF_BUTTON3 +// Size: 8 +// Deobfuscated Name: IF_BUTTON3 +fun createWidgetAction3Packet(param1: Int, param0: Int, itemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON3) + bufferNode.packetBuffer.`writeInt$api`(param1) + bufferNode.packetBuffer.`writeShort$api`(param0) + bufferNode.packetBuffer.`writeShort$api`(itemId) + return bufferNode +} + + +// OPPLAYER5 +// Size: 3 +// Deobfuscated Name: OPPLAYER5 +fun createPlayerAction5Packet(id: Int, shiftPressed: Boolean): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER5) + bufferNode.packetBuffer.`writeShortAddLE$api`(id) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + return bufferNode +} + + +// OPOBJ4 +// Size: 7 +// Deobfuscated Name: OPOBJ4 +fun createGroundItemAction4Packet(worldY: Int, id: Int, shiftPressed: Boolean, worldX: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ4) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) + bufferNode.packetBuffer.`writeShort$api`(id) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) + return bufferNode +} + + +// EVENT_MOUSE_CLICK +// Size: 6 +// Deobfuscated Name: EVENT_MOUSE_CLICK +fun createClickPacket(mouseData: Int, y: Int, x: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.EVENT_MOUSE_CLICK) + bufferNode.packetBuffer.`writeShort$api`(mouseData) + bufferNode.packetBuffer.`writeShort$api`(x) + bufferNode.packetBuffer.`writeShort$api`(y) + return bufferNode +} + + +// OPLOC3 +// Size: 7 +// Deobfuscated Name: OPLOC3 +fun createObjectAction3Packet(shiftPressed: Boolean, worldY: Int, worldX: Int, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC3) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + bufferNode.packetBuffer.`writeShortAdd$api`(id) + return bufferNode +} + + +// OPPLAYER4 +// Size: 3 +// Deobfuscated Name: OPPLAYER4 +fun createPlayerAction4Packet(shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER4) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAddLE$api`(id) + return bufferNode +} + + +// IF_BUTTON7 +// Size: 8 +// Deobfuscated Name: IF_BUTTON7 +fun createWidgetAction7Packet(param1: Int, param0: Int, itemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON7) + bufferNode.packetBuffer.`writeInt$api`(param1) + bufferNode.packetBuffer.`writeShort$api`(param0) + bufferNode.packetBuffer.`writeShort$api`(itemId) + return bufferNode +} + + +// OPOBJ1 +// Size: 7 +// Deobfuscated Name: OPOBJ1 +fun createGroundItemAction1Packet(worldY: Int, worldX: Int, id: Int, shiftPressed: Boolean): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ1) + bufferNode.packetBuffer.`writeShort$api`(worldY) + bufferNode.packetBuffer.`writeShort$api`(worldX) + bufferNode.packetBuffer.`writeShortLE$api`(id) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + return bufferNode +} + + +// OPPLAYER7 +// Size: 3 +// Deobfuscated Name: OPPLAYER7 +fun createPlayerAction7Packet(id: Int, shiftPressed: Boolean): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER7) + bufferNode.packetBuffer.`writeShortLE$api`(id) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + return bufferNode +} + + +// OPNPC4 +// Size: 3 +// Deobfuscated Name: OPNPC4 +fun createNPCAction4Packet(shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPNPC4) + bufferNode.packetBuffer.`writeByteNeg$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(id) + return bufferNode +} + + +// OPLOCT +// Size: 15 +// Deobfuscated Name: OPLOCT +fun createItemWidgetOnGameObjectPacket(id: Int, selectedSpellItemId: Int, selectedSpellChildIndex: Int, worldY: Int, worldX: Int, selectedSpellWidget: Int, shiftPressed: Boolean): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPLOCT) + bufferNode.packetBuffer.`writeShortAdd$api`(id) + bufferNode.packetBuffer.`writeShortAddLE$api`(selectedSpellItemId) + bufferNode.packetBuffer.`writeShort$api`(selectedSpellChildIndex) + bufferNode.packetBuffer.`writeShortLE$api`(worldY) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + bufferNode.packetBuffer.`writeIntLE$api`(selectedSpellWidget) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + return bufferNode +} + + +// OPLOC1 +// Size: 7 +// Deobfuscated Name: OPLOC1 +fun createObjectAction1Packet(shiftPressed: Boolean, worldY: Int, worldX: Int, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC1) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortLE$api`(worldY) + bufferNode.packetBuffer.`writeShort$api`(worldX) + bufferNode.packetBuffer.`writeShortAdd$api`(id) + return bufferNode +} + + +// OPPLAYER6 +// Size: 3 +// Deobfuscated Name: OPPLAYER6 +fun createPlayerAction6Packet(shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER6) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(id) + return bufferNode +} + + +// IF_BUTTON1 +// Size: 8 +// Deobfuscated Name: IF_BUTTON1 +fun createWidgetAction1Packet(param1: Int, param0: Int, itemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON1) + bufferNode.packetBuffer.`writeInt$api`(param1) + bufferNode.packetBuffer.`writeShort$api`(param0) + bufferNode.packetBuffer.`writeShort$api`(itemId) + return bufferNode +} + + +// IF_BUTTON6 +// Size: 8 +// Deobfuscated Name: IF_BUTTON6 +fun createWidgetAction6Packet(param1: Int, param0: Int, itemId: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.IF_BUTTON6) + bufferNode.packetBuffer.`writeInt$api`(param1) + bufferNode.packetBuffer.`writeShort$api`(param0) + bufferNode.packetBuffer.`writeShort$api`(itemId) + return bufferNode +} + + +// OPLOC2 +// Size: 7 +// Deobfuscated Name: OPLOC2 +fun createObjectAction2Packet(worldY: Int, worldX: Int, shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC2) + bufferNode.packetBuffer.`writeShort$api`(worldY) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(id) + return bufferNode +} + + +// OPPLAYER3 +// Size: 3 +// Deobfuscated Name: OPPLAYER3 +fun createPlayerAction3Packet(shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER3) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShort$api`(id) + return bufferNode +} + + +// OPLOC5 +// Size: 7 +// Deobfuscated Name: OPLOC5 +fun createObjectAction5Packet(worldX: Int, worldY: Int, shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC5) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + bufferNode.packetBuffer.`writeShortAdd$api`(worldY) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAdd$api`(id) + return bufferNode +} + + +// OPLOC4 +// Size: 7 +// Deobfuscated Name: OPLOC4 +fun createObjectAction4Packet(shiftPressed: Boolean, worldY: Int, id: Int, worldX: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPLOC4) + bufferNode.packetBuffer.`writeByteAdd$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) + bufferNode.packetBuffer.`writeShort$api`(id) + bufferNode.packetBuffer.`writeShortAdd$api`(worldX) + return bufferNode +} + + +// OPPLAYER8 +// Size: 3 +// Deobfuscated Name: OPPLAYER8 +fun createPlayerAction8Packet(shiftPressed: Boolean, id: Int): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPPLAYER8) + bufferNode.packetBuffer.`writeByte$api`(if (shiftPressed) 1 else 0) + bufferNode.packetBuffer.`writeShortLE$api`(id) + return bufferNode +} + + +// OPOBJ5 +// Size: 7 +// Deobfuscated Name: OPOBJ5 +fun createGroundItemAction5Packet(worldY: Int, id: Int, worldX: Int, shiftPressed: Boolean): PacketBufferNode { + val bufferNode = preparePacketBuffer(ClientPacket.OPOBJ5) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldY) + bufferNode.packetBuffer.`writeShortAddLE$api`(id) + bufferNode.packetBuffer.`writeShortAddLE$api`(worldX) + bufferNode.packetBuffer.`writeByteSub$api`(if (shiftPressed) 1 else 0) + return bufferNode +} + +} diff --git a/client/src/main/java/meteor/api/Items.kt b/client/src/main/java/meteor/api/Items.kt index 9f62cf64b..9a8ad0b90 100644 --- a/client/src/main/java/meteor/api/Items.kt +++ b/client/src/main/java/meteor/api/Items.kt @@ -429,7 +429,7 @@ object Items { } else { val menu = item.getMenu(withdrawOption.menuIndex + 1) menu?.let { - ClientPackets.createClientPacket(it)!!.send() + createClientPacket(it)!!.send() if (withdrawOption == Bank.WithdrawOption.X) { Dialog.enterInput(amount) Time.sleepUntil({ !Dialog.isOpen() }, 1200) diff --git a/client/src/main/java/meteor/plugins/alchemicalhydra/AlchemicalHydraPlugin.kt b/client/src/main/java/meteor/plugins/alchemicalhydra/AlchemicalHydraPlugin.kt index 17d54538b..096cab9e9 100644 --- a/client/src/main/java/meteor/plugins/alchemicalhydra/AlchemicalHydraPlugin.kt +++ b/client/src/main/java/meteor/plugins/alchemicalhydra/AlchemicalHydraPlugin.kt @@ -2,17 +2,18 @@ package meteor.plugins.alchemicalhydra import dev.hoot.api.events.AutomatedMenu import eventbus.events.* -import meteor.api.ClientPackets import meteor.api.NPCs +import meteor.api.createClientPacket +import meteor.api.queueClickPacket import meteor.game.NpcUtil import meteor.game.SpriteManager +import meteor.outline.ModelOutlineRenderer import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor import meteor.rs.ClientThread import net.runelite.api.* import net.runelite.api.coords.LocalPoint import net.runelite.api.coords.WorldPoint -import meteor.outline.ModelOutlineRenderer import java.util.* @PluginDescriptor( @@ -331,8 +332,8 @@ class AlchemicalHydraPlugin : Plugin() { if (client.getBoostedSkillLevel(Skill.PRAYER) <= 0) { return } - ClientPackets.queueClickPacket(prayerWidget.clickPoint) - ClientPackets.createClientPacket(AutomatedMenu(1, MenuAction.CC_OP.id, prayerWidget.itemId, prayerWidget.id))!!.send() + queueClickPacket(prayerWidget.clickPoint) + createClientPacket(AutomatedMenu(1, MenuAction.CC_OP.id, prayerWidget.itemId, prayerWidget.id))!!.send() } private fun deactivatePrayer(prayer: Prayer?) { @@ -347,8 +348,8 @@ class AlchemicalHydraPlugin : Plugin() { if (client.getBoostedSkillLevel(Skill.PRAYER) <= 0) { return } - ClientPackets.queueClickPacket(prayerWidget.clickPoint) - ClientPackets.createClientPacket(AutomatedMenu(1, MenuAction.CC_OP.id, prayerWidget.itemId, prayerWidget.id))!!.send() + queueClickPacket(prayerWidget.clickPoint) + createClientPacket(AutomatedMenu(1, MenuAction.CC_OP.id, prayerWidget.itemId, prayerWidget.id))!!.send() } companion object { diff --git a/client/src/main/java/meteor/plugins/autoalch/AutoAlchPlugin.kt b/client/src/main/java/meteor/plugins/autoalch/AutoAlchPlugin.kt index 20e67f31e..75eaa612e 100644 --- a/client/src/main/java/meteor/plugins/autoalch/AutoAlchPlugin.kt +++ b/client/src/main/java/meteor/plugins/autoalch/AutoAlchPlugin.kt @@ -5,13 +5,12 @@ import dev.hoot.api.magic.Regular import eventbus.events.GameTick import eventbus.events.StatChanged import meteor.api.Items -import meteor.api.ClientPackets +import meteor.api.queueClickPacket import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor import meteor.util.CalcUtils import net.runelite.api.Skill import java.util.* -import kotlin.math.roundToInt @PluginDescriptor( name = "Auto Alch", @@ -44,7 +43,7 @@ class AutoAlchPlugin : Plugin() { else Regular.LOW_LEVEL_ALCHEMY Items.getFirst(config.itemID())?.let{ - ClientPackets.queueClickPacket(it.clickPoint) + queueClickPacket(it.clickPoint) Magic.cast(spellToUse,it) } } diff --git a/client/src/main/java/meteor/plugins/autokraken/AutoKrakenPlugin.kt b/client/src/main/java/meteor/plugins/autokraken/AutoKrakenPlugin.kt index 9787cb451..11b9722e4 100644 --- a/client/src/main/java/meteor/plugins/autokraken/AutoKrakenPlugin.kt +++ b/client/src/main/java/meteor/plugins/autokraken/AutoKrakenPlugin.kt @@ -1,14 +1,13 @@ package meteor.plugins.autokraken import eventbus.events.GameTick -import meteor.api.ClientPackets import meteor.api.Items import meteor.api.Loots import meteor.api.NPCs +import meteor.api.queueClickPacket import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor import net.runelite.api.Skill -import rs117.hd.data.NpcID import kotlin.random.Random @PluginDescriptor(name = "Auto Kraken", description = "Automatically triggers Kraken & focuses the Kraken boss.", enabledByDefault = false) @@ -111,7 +110,7 @@ class AutoKrakenPlugin: Plugin() { ) return if (edible != null) { - ClientPackets.queueClickPacket(edible.clickPoint) + queueClickPacket(edible.clickPoint) edible.interact("Eat") setRandomHealthThreshold() waitTicks = 3 diff --git a/client/src/main/java/meteor/plugins/autologhop/AutoLogHop.kt b/client/src/main/java/meteor/plugins/autologhop/AutoLogHop.kt index a3cd83512..334a90ef6 100644 --- a/client/src/main/java/meteor/plugins/autologhop/AutoLogHop.kt +++ b/client/src/main/java/meteor/plugins/autologhop/AutoLogHop.kt @@ -9,7 +9,7 @@ import meteor.Main import meteor.Main.executor import meteor.Main.worldService import meteor.api.Items -import meteor.api.ClientPackets +import meteor.api.queueClickPacket import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor import meteor.rs.ClientThread @@ -130,7 +130,7 @@ class AutoLogHop : Plugin() { //client.invokeMenuAction("Grand Exchange", "Ring of wealth ( )", 3, MenuAction.CC_OP.getId(), -1, equipment.getId()); val ring: WidgetInfo = WidgetInfo.EQUIPMENT_RING val ringWidget: Widget = client.getWidget(ring)!! - ClientPackets.queueClickPacket(ringWidget.clickPoint) + queueClickPacket(ringWidget.clickPoint) WidgetPackets.widgetAction(ringWidget, "Grand Exchange") } diff --git a/client/src/main/java/meteor/plugins/bank/BankSearch.kt b/client/src/main/java/meteor/plugins/bank/BankSearch.kt index 980b82ff2..6e161548b 100644 --- a/client/src/main/java/meteor/plugins/bank/BankSearch.kt +++ b/client/src/main/java/meteor/plugins/bank/BankSearch.kt @@ -27,7 +27,6 @@ package meteor.plugins.bank import meteor.Main import meteor.rs.ClientThread -import net.runelite.api.Client import net.runelite.api.ScriptID import net.runelite.api.VarClientInt import net.runelite.api.VarClientStr diff --git a/client/src/main/java/meteor/plugins/banksetups/BankSetups.kt b/client/src/main/java/meteor/plugins/banksetups/BankSetups.kt index 97bf9175a..546b4afa6 100644 --- a/client/src/main/java/meteor/plugins/banksetups/BankSetups.kt +++ b/client/src/main/java/meteor/plugins/banksetups/BankSetups.kt @@ -8,8 +8,8 @@ import dev.hoot.api.packets.ItemPackets import eventbus.events.ClientTick import eventbus.events.GameTick import eventbus.events.MenuOptionClicked -import meteor.api.ClientPackets import meteor.api.Items +import meteor.api.queueClickPacket import meteor.game.ItemManager import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor @@ -171,7 +171,7 @@ class BankSetups : Plugin() { item.id, item.slot ) - ClientPackets.queueClickPacket(item.clickPoint) + queueClickPacket(item.clickPoint) } } state = 4 diff --git a/client/src/main/java/meteor/plugins/fighter/FighterPlugin.kt b/client/src/main/java/meteor/plugins/fighter/FighterPlugin.kt index 247818808..926525fea 100644 --- a/client/src/main/java/meteor/plugins/fighter/FighterPlugin.kt +++ b/client/src/main/java/meteor/plugins/fighter/FighterPlugin.kt @@ -12,10 +12,7 @@ import eventbus.events.ChatMessage import eventbus.events.GameTick import meteor.Logger import meteor.Main -import meteor.api.Items -import meteor.api.Loots -import meteor.api.NPCs -import meteor.api.ClientPackets +import meteor.api.* import meteor.game.ItemManager import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor @@ -111,7 +108,7 @@ class FighterPlugin : Plugin() { else Regular.LOW_LEVEL_ALCHEMY.widget.id alchItem?.forEach { - ClientPackets.queueClickPacket(it.clickPoint) + queueClickPacket(it.clickPoint) ItemPackets.queueSpellOnItemPacket(it.id, it.slot, spellToUse) return } diff --git a/client/src/main/java/meteor/plugins/jadautoprayer/JadAutoPrayerPlugin.kt b/client/src/main/java/meteor/plugins/jadautoprayer/JadAutoPrayerPlugin.kt index 3e3b3b763..4f8435e04 100644 --- a/client/src/main/java/meteor/plugins/jadautoprayer/JadAutoPrayerPlugin.kt +++ b/client/src/main/java/meteor/plugins/jadautoprayer/JadAutoPrayerPlugin.kt @@ -1,16 +1,13 @@ package meteor.plugins.jadautoprayer -import com.google.common.eventbus.Subscribe import dev.hoot.api.events.AutomatedMenu import eventbus.events.AnimationChanged -import meteor.api.ClientPackets +import meteor.api.createClientPacket +import meteor.api.queueClickPacket import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor import meteor.rs.ClientThread import net.runelite.api.* -import net.runelite.api.mixins.Inject -import net.runelite.api.widgets.Widget -import net.runelite.api.widgets.WidgetInfo @PluginDescriptor( name = "Jad Auto Prayer", @@ -58,8 +55,8 @@ class JadAutoPrayerPlugin : Plugin() { if (client.getBoostedSkillLevel(Skill.PRAYER) <= 0) { return } - ClientPackets.queueClickPacket(prayerWidget.clickPoint) - ClientPackets.createClientPacket(AutomatedMenu(1, MenuAction.CC_OP.id, prayerWidget.itemId, prayerWidget.id))!!.send() + queueClickPacket(prayerWidget.clickPoint) + createClientPacket(AutomatedMenu(1, MenuAction.CC_OP.id, prayerWidget.itemId, prayerWidget.id))!!.send() } diff --git a/client/src/main/java/meteor/plugins/meteor/Meteor.kt b/client/src/main/java/meteor/plugins/meteor/Meteor.kt index 5d89d7675..9b0e00be0 100644 --- a/client/src/main/java/meteor/plugins/meteor/Meteor.kt +++ b/client/src/main/java/meteor/plugins/meteor/Meteor.kt @@ -17,10 +17,9 @@ import eventbus.events.MenuOptionClicked import meteor.Configuration import meteor.Logger import meteor.Main -import meteor.api.ClientPackets - +import meteor.api.createClientPacket +import meteor.api.queueClickPacket import meteor.config.ConfigManager - import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor import meteor.rs.ClientThread @@ -53,13 +52,13 @@ class Meteor : Plugin(daemon = true) { try { if (config.mouseBehavior() != MouseBehavior.DISABLED) { ClientThread.invoke { - ClientPackets.queueClickPacket(clickPoint.x, clickPoint.y) + queueClickPacket(clickPoint.x, clickPoint.y) mouseHandler.sendMovement(clickPoint.x, clickPoint.y) } } GameThread.invoke { try { - val packetBufferNode = ClientPackets.createClientPacket(it) + val packetBufferNode = createClientPacket(it) if (packetBufferNode != null) packetBufferNode.send() else println("No valid packet to write") } catch (ex: InteractionException) { log.debug("{}, falling back to invoke", ex.message!!) diff --git a/client/src/main/java/meteor/plugins/muspahassist/MuspahAssist.kt b/client/src/main/java/meteor/plugins/muspahassist/MuspahAssist.kt index 6c848fd4a..8635acc4f 100644 --- a/client/src/main/java/meteor/plugins/muspahassist/MuspahAssist.kt +++ b/client/src/main/java/meteor/plugins/muspahassist/MuspahAssist.kt @@ -15,9 +15,7 @@ import dev.hoot.api.events.AutomatedMenu import dev.hoot.api.game.GameThread import dev.hoot.api.widgets.Prayers import eventbus.events.* -import meteor.api.ClientPackets -import meteor.api.Items -import meteor.api.NPCs +import meteor.api.* import meteor.config.ConfigManager import meteor.game.ItemVariationMapping import meteor.plugins.Plugin @@ -344,7 +342,7 @@ class MuspahAssist() : Plugin() { ClientThread.invokeLater { mageGear.forEach {id -> Items.getFirst(id)?.let { - ClientPackets.queueClickPacket(it.clickPoint) + queueClickPacket(it.clickPoint) it.interact(2) } } @@ -354,7 +352,7 @@ class MuspahAssist() : Plugin() { ClientThread.invokeLater { rangeGear.forEach {id -> Items.getFirst(id)?.let { - ClientPackets.queueClickPacket(it.clickPoint) + queueClickPacket(it.clickPoint) it.interact(2) } } @@ -364,7 +362,7 @@ class MuspahAssist() : Plugin() { ClientThread.invokeLater { shieldGear.forEach {id -> Items.getFirst(id)?.let { - ClientPackets.queueClickPacket(it.clickPoint) + queueClickPacket(it.clickPoint) it.interact(2) } } @@ -382,8 +380,8 @@ class MuspahAssist() : Plugin() { if (client.getBoostedSkillLevel(Skill.PRAYER) <= 0) { return } - ClientPackets.queueClickPacket(prayerWidget.clickPoint) - ClientPackets.createClientPacket(AutomatedMenu(1, MenuAction.CC_OP.id, prayerWidget.itemId, prayerWidget.id))!!.send() + queueClickPacket(prayerWidget.clickPoint) + createClientPacket(AutomatedMenu(1, MenuAction.CC_OP.id, prayerWidget.itemId, prayerWidget.id))!!.send() } fun getActivePrayers(): List { return Prayer.values().filter { Prayers.isEnabled(it) } @@ -400,7 +398,7 @@ class MuspahAssist() : Plugin() { if (client.getBoostedSkillLevel(Skill.PRAYER) <= 0) { return } - ClientPackets.queueClickPacket(prayerWidget.clickPoint) - ClientPackets.createClientPacket(AutomatedMenu(1, MenuAction.CC_OP.id, prayerWidget.itemId, prayerWidget.id))!!.send() + queueClickPacket(prayerWidget.clickPoint) + createClientPacket(AutomatedMenu(1, MenuAction.CC_OP.id, prayerWidget.itemId, prayerWidget.id))!!.send() } } \ No newline at end of file diff --git a/client/src/main/java/meteor/plugins/prayerflicker/PrayerFlickerPlugin.kt b/client/src/main/java/meteor/plugins/prayerflicker/PrayerFlickerPlugin.kt index 610528f56..3fa884b05 100644 --- a/client/src/main/java/meteor/plugins/prayerflicker/PrayerFlickerPlugin.kt +++ b/client/src/main/java/meteor/plugins/prayerflicker/PrayerFlickerPlugin.kt @@ -7,7 +7,7 @@ import dev.hoot.api.widgets.Widgets import eventbus.events.ClientTick import eventbus.events.GameTick import eventbus.events.MenuOptionClicked -import meteor.api.ClientPackets +import meteor.api.queueClickPacket import meteor.input.KeyManager import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor @@ -35,9 +35,9 @@ class PrayerFlickerPlugin : Plugin() { val quickPrayerOrb = Widgets.get(quickPrayerWidgetID) if (!this::clickPoint.isInitialized) clickPoint = quickPrayerOrb.clickPoint - ClientPackets.queueClickPacket(clickPoint) + queueClickPacket(clickPoint) WidgetPackets.widgetAction(quickPrayerOrb, "Activate") - ClientPackets.queueClickPacket(clickPoint) + queueClickPacket(clickPoint) WidgetPackets.widgetAction(quickPrayerOrb, "Deactivate") } diff --git a/client/src/main/java/meteor/plugins/pvpkeys/PvPKeys.kt b/client/src/main/java/meteor/plugins/pvpkeys/PvPKeys.kt index 9f9dbd1de..fc1934e17 100644 --- a/client/src/main/java/meteor/plugins/pvpkeys/PvPKeys.kt +++ b/client/src/main/java/meteor/plugins/pvpkeys/PvPKeys.kt @@ -200,7 +200,7 @@ class PvPKeys : Plugin() { override fun hotkeyPressed() { ClientThread.invokeLater { meleeGear.forEach { - Items.getFirst(it)?.interact(2) + Items.getFirst(it)?.interact("Wield") } } } diff --git a/client/src/main/java/meteor/plugins/wintertodtfletcher/WintertodtHelper.kt b/client/src/main/java/meteor/plugins/wintertodtfletcher/WintertodtHelper.kt index 07265371b..98c918515 100644 --- a/client/src/main/java/meteor/plugins/wintertodtfletcher/WintertodtHelper.kt +++ b/client/src/main/java/meteor/plugins/wintertodtfletcher/WintertodtHelper.kt @@ -3,8 +3,8 @@ package meteor.plugins.wintertodtfletcher import dev.hoot.api.game.Skills import eventbus.events.GameTick import eventbus.events.HitsplatApplied -import meteor.api.ClientPackets import meteor.api.Items +import meteor.api.queueClickPacket import meteor.plugins.Plugin import meteor.plugins.PluginDescriptor import net.runelite.api.Item @@ -73,7 +73,7 @@ class WintertodtHelper : Plugin() { for (item in items) { if (item.actions?.contains("Eat") == true) { allowance++ - ClientPackets.queueClickPacket(item.clickPoint) + queueClickPacket(item.clickPoint) item.interact("Eat") return true } diff --git a/client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java b/client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java index c213df8d0..fb88419a5 100644 --- a/client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java +++ b/client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java @@ -191,7 +191,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc new CrypticClue("Ghostly bones.", null, "Kill an Ankou."), new CrypticClue("Search through chests found in the upstairs of houses in eastern Falador.", CLOSED_CHEST_375, new WorldPoint(3041, 3364, 1), "The house is located southwest of the Falador Party Room. There are two chests in the room, search the northern chest."), new CrypticClue("Let's hope you don't meet a watery death when you encounter this fiend.", null, "Kill a waterfiend."), - new CrypticClue("Reflection is the weakness for these eyes of evil.", null, "Kill a basilisk."), + new CrypticClue("net.runelite.rs.Reflection is the weakness for these eyes of evil.", null, "Kill a basilisk."), new CrypticClue("Search a bookcase in Lumbridge Swamp.", BOOKCASE_9523, new WorldPoint(3146, 3177, 0), "Located in Father Urhney's house in Lumbridge Swamp."), new CrypticClue("Surround my bones in fire, ontop the wooden pyre. Finally lay me to rest, before my one last test.", null, "Kill a confused/lost barbarian to receive mangled bones. Construct and burn a pyre ship. Kill the ferocious barbarian spirit that spawns to receive a clue casket."), new CrypticClue("Fiendish cooks probably won't dig the dirty dishes.", new WorldPoint(3043, 4974, 1), "Dig by the fire in the Rogues' Den."), diff --git a/client/src/main/java/net/runelite/client/plugins/devtools/EventInspector.java b/client/src/main/java/net/runelite/client/plugins/devtools/EventInspector.java index 3b5d0db2c..b367ccae1 100644 --- a/client/src/main/java/net/runelite/client/plugins/devtools/EventInspector.java +++ b/client/src/main/java/net/runelite/client/plugins/devtools/EventInspector.java @@ -157,7 +157,7 @@ public class EventInspector extends EventInspectorSubscriber { private final JCheckBox groundItemDel = new JCheckBox("Ground Item Del", false); private final JCheckBox groundItemUpdate = new JCheckBox("Ground Item Update", false); private final JCheckBox ifOpenTop = new JCheckBox("Top Interfaces", false); - private final JCheckBox ifOpenSub = new JCheckBox("Sub Interfaces", false); + private final JCheckBox openInterface = new JCheckBox("Sub Interfaces", false); private final JCheckBox ifCloseSub = new JCheckBox("Close Sub Interfaces", false); private final JCheckBox ifMoveSub = new JCheckBox("Move Sub Interfaces", false); private final JCheckBox miscInterfacePackets = new JCheckBox("Misc. Interface Packets", true); @@ -447,7 +447,7 @@ private void addInterfacesPanel(JPanel panel) { panel.add(clientScripts); panel.add(ifEvents); panel.add(ifOpenTop); - panel.add(ifOpenSub); + panel.add(openInterface); panel.add(ifCloseSub); panel.add(ifMoveSub); panel.add(miscInterfacePackets); @@ -1309,7 +1309,7 @@ public void onIfOpenTopEvent(IfOpenTopEvent event) { } @Override - public void onIfOpenSubEvent(IfOpenSubEvent event) { + public void onopenInterfaceEvent(openInterfaceEvent event) { resetTrackedVariables(); /* Because open sub and move sub are quite similar in nature, we have to keep track of its state to filter out moves. */ if (lastMoveSub != null) { @@ -1331,9 +1331,9 @@ public void onIfOpenSubEvent(IfOpenSubEvent event) { topId = "" + (event.getTargetComponent() >> 16); } addLine("Sub interface", - "IfOpenSub(" + id + ", topInterface = " + topId + "openInterface(" + id + ", topInterface = " + topId + ", topComponent = " + (event.getTargetComponent() & 0xFFFF) - + ", modal = " + (event.getWalkType() == WidgetModalMode.MODAL_NOCLICKTHROUGH) + ")", true, ifOpenSub); + + ", modal = " + (event.getWalkType() == WidgetModalMode.MODAL_NOCLICKTHROUGH) + ")", true, openInterface); } @Override @@ -1646,7 +1646,7 @@ public void onScriptPreFired(ScriptPreFired event) { resetTrackedVariables(); ScriptEvent scriptEvent = event.getScriptEvent(); /* Filter out the non-server created scripts. Do note that other plugins may call CS2s, such as the quest helper plugin. */ - if (scriptEvent == null || scriptEvent.getSource() != null || scriptEvent.type() != 76) return; + // if (scriptEvent == null || scriptEvent.getSource() != null /*|| scriptEvent.type() != 76*/) return; final Object[] arguments = scriptEvent.getArguments(); final int scriptId = Integer.parseInt(arguments[0].toString()); if (ignoredClientScripts.contains(scriptId)) return; diff --git a/client/src/main/java/net/runelite/client/plugins/devtools/EventInspectorSubscriber.kt b/client/src/main/java/net/runelite/client/plugins/devtools/EventInspectorSubscriber.kt index d5fa7269d..9fae61c91 100644 --- a/client/src/main/java/net/runelite/client/plugins/devtools/EventInspectorSubscriber.kt +++ b/client/src/main/java/net/runelite/client/plugins/devtools/EventInspectorSubscriber.kt @@ -117,7 +117,7 @@ open class EventInspectorSubscriber : DevToolsFrame(), KEventSubscriber { open fun onHashTableNodeGetCall(it: HashTableNodeGetCall) {} open fun onHashTableNodePut(it: HashTableNodePut) {} open fun onHintArrowEvent(it: HintArrowEvent) {} - open fun onIfOpenSubEvent(it: IfOpenSubEvent) {} + open fun onopenInterfaceEvent(it: openInterfaceEvent) {} open fun onIfOpenTopEvent(it: IfOpenTopEvent) {} open fun onJinglePlayed(it: JinglePlayed) {} open fun onMinimapStateChange(it: MinimapStateChange) {} @@ -449,7 +449,7 @@ open class EventInspectorSubscriber : DevToolsFrame(), KEventSubscriber { } subscribeEvent(Events.HASH_TABLE_NODE_PUT) { executeIfListening { onHashTableNodePut(it) } } subscribeEvent(Events.HINT_ARROW_EVENT) { executeIfListening { onHintArrowEvent(it) } } - subscribeEvent(Events.IF_OPEN_SUB_EVENT) { executeIfListening { onIfOpenSubEvent(it) } } + subscribeEvent(Events.IF_OPEN_SUB_EVENT) { executeIfListening { onopenInterfaceEvent(it) } } subscribeEvent(Events.IF_OPEN_TOP_EVENT) { executeIfListening { onIfOpenTopEvent(it) } } subscribeEvent(Events.INTERACTING_CHANGED) { executeIfListening { onInteractingChanged(it) } } subscribeEvent(Events.JINGLE_PLAYED) { executeIfListening { onJinglePlayed(it) } } diff --git a/client/src/main/java/net/runelite/client/plugins/questhelper/quests/templeoftheeye/TempleOfTheEye.java b/client/src/main/java/net/runelite/client/plugins/questhelper/quests/templeoftheeye/TempleOfTheEye.java index 52c466ec3..0c97ff4ab 100644 --- a/client/src/main/java/net/runelite/client/plugins/questhelper/quests/templeoftheeye/TempleOfTheEye.java +++ b/client/src/main/java/net/runelite/client/plugins/questhelper/quests/templeoftheeye/TempleOfTheEye.java @@ -74,8 +74,7 @@ 13742: Apprentice Tamara puzzle 13743: Apprentice Felix puzzle 13744: Apprentice Cordelia puzzle -13745: Quest offered -13747 - 13752: Energy orbs +13745: Quest offered: Energy orbs 13753: One-time Wizard's Tower teleport 13759: Guardians of the Rift Tutorial progress */ diff --git a/client/src/main/java/net/runelite/client/plugins/questhelper/steps/QuestSyncStep.java b/client/src/main/java/net/runelite/client/plugins/questhelper/steps/QuestSyncStep.java index ee7b22d07..f6d3a2d43 100644 --- a/client/src/main/java/net/runelite/client/plugins/questhelper/steps/QuestSyncStep.java +++ b/client/src/main/java/net/runelite/client/plugins/questhelper/steps/QuestSyncStep.java @@ -97,7 +97,6 @@ void scrollToWidget(Widget widget) final int newScroll = Math.max(0, Math.min(parent.getScrollHeight(), (widget.getRelativeY() / 2 + (widget.getHeight()) / 2) - parent.getHeight() / 2)); - client.runScript( ScriptID.UPDATE_SCROLLBAR, QuestWidgets.QUESTLIST_SCROLLBAR.getId(), diff --git a/client/src/main/resources/runelite/12/10003 b/client/src/main/resources/runelite/12/10003 deleted file mode 100644 index f6749c8dbbd01a59f19894bad70ee44b7b5d3b5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 RcmZQz5M=-YMi2o3i~s?J02lxO diff --git a/client/src/main/resources/runelite/12/10004 b/client/src/main/resources/runelite/12/10004 deleted file mode 100644 index cacd86703f32cab29027ad1e3454fd5c87b420a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34 ccmZQzP-XxD5XmS!k%2)J#A5+sCJ1H(02a3a3IG5A diff --git a/client/src/main/resources/runelite/12/1048 b/client/src/main/resources/runelite/12/1048 deleted file mode 100644 index d3d6649fcf84f8d017bde603b0e2f300deef7cd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 472 zcmZQzkYr#G{Ko(R>_CcGcPZ-C@Mcc*C#VKvxGtNILJ^22B1uS zX$hJP%x;jY$=1vcbu!3BZ2XHLK49fv3}LV_Fjs*clNXZjT2TOYj~d82Tuxd53pI!j iK_okdsqAE$3JHG*$qWi)1}z3~WO*}i06E~OVgvxLIY%=9 diff --git a/client/src/main/resources/runelite/12/1048.hash b/client/src/main/resources/runelite/12/1048.hash deleted file mode 100644 index fcfba2b68..000000000 --- a/client/src/main/resources/runelite/12/1048.hash +++ /dev/null @@ -1 +0,0 @@ -654085BE2DFBFB0D64DB0508B593E1640C32945E9ACB7999B04768E6BD497169 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/1049 b/client/src/main/resources/runelite/12/1049 deleted file mode 100644 index 0b32aa7fc232cc682507279ddf928378163aef4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 454 zcmZQz00QO)2IkDXywswo{QO*>%-qZp2Fc?f2?hqBOnzwznhgI!1_mXFJo%a#fd-T? zSaKc%8C1ex1!Ta?WrCUwvV$3k%_3n9v6uyHJ+c%lgCa~ZqaOnokj==z1|<0zw1A`+ z5aaO+NGs5$DxmLOD+)sLeKPaF0iebJHkFBg5ro0OzZhaaE7)v4u-Tqq%{aq}ShE=s cW`ne_f=xvyfWgFmfq_93B<>D&16Tzk0IrxuL;wH) diff --git a/client/src/main/resources/runelite/12/1049.hash b/client/src/main/resources/runelite/12/1049.hash deleted file mode 100644 index 1fe1c9f56..000000000 --- a/client/src/main/resources/runelite/12/1049.hash +++ /dev/null @@ -1 +0,0 @@ -50412AFEF99FE459B822400E7621F766E801EFCFCDBA8213E7F099C9E9D14890 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/1050 b/client/src/main/resources/runelite/12/1050 deleted file mode 100644 index 54f45e0e740eb775503569e1a59cd693aea26c0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZQzP-K7s76vXLlbu15fq_X5EXc^f0i;<#B7*;*%GiN4BLf?l6a|ZM+yYaKV3L8S zfdOi!4OjrAQW?y82qszimoo4#U|?X*$8m^+Q0y| zK?=+#Rv#N&pCC#4Sm63VzGYw_);=b%K5!VA0fPh-EI`BpVSojgfNW5hG6S(N5QF4o G7?c60GcT|J diff --git a/client/src/main/resources/runelite/12/1050.hash b/client/src/main/resources/runelite/12/1050.hash deleted file mode 100644 index 2d66d7aca..000000000 --- a/client/src/main/resources/runelite/12/1050.hash +++ /dev/null @@ -1 +0,0 @@ -9365BC83CB2365C7BC3FBFC90C01232DD242740014E14D456BBAA0622D5570F0 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/125 b/client/src/main/resources/runelite/12/125 deleted file mode 100644 index 05f323ada086490a001ba47e2793212042bd6b25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3321 zcmdT{-D@0G6hAk2Wab1oZ z;@l~}2``Iekc~Fu;W$f2gEG#u67Jgd-uPAgT+Gv?Oyiv-t5#N4h@Qq#EtO{LHIxLF z4YHSuNxVHl=F7B-6IW+mMK2u|<20U>Y^B=D%A;za1sCG_rRE=^)qGX+WUqGP|DPvA z?+LqC^JLz|E!mBe!C)GH^r;V38uunuRgB_Znio6EaWUpDMgqp!=2ms8pJ)9~5mYep z06lakDmmAsgdp5^sZ>Y^E?!Y$N{ZcASg`$W)&8D@jQq_I0Pk0j-4l%F=sc z>Q^m7@iP)H>oul5t9YTvve5Zi%XNV(pVKbIBqwFbRS+!`JqOlxT9*wjHB=;z=#*C8 z%d#@j8Tlm>;m$1f{6Ri>zRK0)S5+RCFs6Kp9RHbvd=s4&1|(1G-F}z5X}3b~(h6+NdWj@`oq9WHrA$vhPhQh~~!Oy9cxuP9&AXMKye87@@9sO0MBE;4-s9OFAs)F5-pt5RhAf>#< zu(yr#j8`|9m^)n!D_PD7o0zW!JL>$%Qn-5OCt`v6IFz)DMVVDuG2+D8TZScrH-fi$ zvbMGse5|%jchT$MYiq>Lh{>ZZuN=H<@1$4LBxhv0niZ2$Uj`r6FNwZ}EwT_ARi6}B zdU$G}8%*1{MvZIEvd?N(Ze&?mQuvLw?Gt#O>WW|Da*$_>%fPs|iXT>SY6iDr)j~BB zEm1AI{6J#dAiI%mlvzgMx55CxEn(6EpTaMcb+3!dd#tarQahUDIZV2rx&xxg{;6@q z>y1&j^to`zumq2XVUqp0zvdQ`wQ|xs{Cn@#TGk%^nZvJll`9wzEm+wri{<$v7lKXu|!Dr#O1%G@|k7JLHeGf?UCfif= z7!Fq%J?uGrzLr@(b}ID*TFL9StXomQ1CKxYk9QGyhBR@79oO$Z!!5~6*R#AlDNCkp zYM_$z^BbRX7=~h@Y+66j6*$BFgZtXT_Du%veJ?S^s0p;r>rzdG^31mRC8zV^9cN{K z@WJr#5#81!3=C$Ey1+@eXGsy2?dyLc0e;bS;ybHmbl^Df+sAv4Vj|6cUpMqo~a8_U<*#PKWuE zc<6%$KZh8Ed;k^nDX;O}7e7LR5BUi3S5-aknnMU;!&G-y*Zk^FS5*_8CZYr%(V9?0 z=5nYSJ3h2!zHlT0N)uVH2{l4fp_$Mgoh9nEvQ{X;1Gst5&GX5jt%3XB@C?lqjOYv& z{kY-vfDF+y!iWp?MkUwfU?hKS5Iw|@^|9fzDzGW`Zbm>BPpAiaf=&{h`bGE&lyv+) zyb1Z#mvigqWvHAjd=0P6?znmj)5XH&wX-*J-)wJh6G06OgCd7Qg0p0d78bc2>`E~OvJ zDF_21zcCV_WbW&%M_LBm(LFvwC8Y0*O!6ST+6nU<#nO+InWP`X*xgAe-kir$u|UJxr|c_b{hQ&^TD8F{HDy~AP#LFH2L#Fdsd3zr-KwT9Ra3$eJpK=r z?1w%ZQe3=^Il~!pMz&1*)PpCVir@MwBxJ!?TeVuXnzH4OOEj~7R|`?)Ia_$F2n_ag zt5Ethn2qP9nbMv-5Lz1grwW@#|I)*=nD+2g!Mq(hjt3kbqWpLtzctJ$KIZl5$-e-n Cxdw&+ diff --git a/client/src/main/resources/runelite/12/129.hash b/client/src/main/resources/runelite/12/129.hash deleted file mode 100644 index 0ec5f1229..000000000 --- a/client/src/main/resources/runelite/12/129.hash +++ /dev/null @@ -1 +0,0 @@ -8FAD64F66E1F60651E501B731C7B3D97D0453A04EFDDBC9D820890263C00BD4B \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/1651 b/client/src/main/resources/runelite/12/1651 deleted file mode 100644 index 3fb2a0fb5bdf9ec6559abbe57d45dbd9f8d499c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmZuty9&ZU5S)AXhy=6|v=l*7Xjur9JRdq!iH{y$&{va74G*B)cv}~xFL$>ALg@B-aA`jCn&8P=&PxfEm-()q$E5Kj+p z^fsXDRwL}Xy2I8?xuXwY;3j8meY^HHC$XJ*=*;PS8cu3Ei_lrnc{iNQc9x;Dr1NGt zx$Ue%XGQ1La0=U5ht8VL#BfU6sY0isGvp#M#NHO~>9E`J^RviXkAb?bf4m)k(426+ z_9pjFFYqef zN>5$|!DDWE)uVrcC-E-C`R2Xtu33W;AME43H#6V-o+UDCZNIl);pMt@qIHVaHGOQg zT7Nb{T4jM$BFk0yVLD=_IGyb zbpAEb4dzH`4KQ{Uau>hOmD`;ohky}vWglVBy0C2N$MRu9&nYgJUhm(X+i-aw#Hr0%tU~+J9gwz_SalL~A@!nV9g<4+gW~VdOW( zYUD1Rz(|J}65H)+J!Zf5?cNCqliE42wL4s!T$IQ_I&xR40j6e}2{lE6dS%c7<@sz# zg=MvRsA4M--#EG%p(B`u7|P*7D9R;zp&EgV@1UeyFr_ zot~`(gK*{n%%Pg9Nx(xO-%GqaO}ua~LHT_|=`W4Uo%6&GtbV|yKXS&FZFzRzv5p+q zA3D}CliIdtac_-pFV^w@r69*%%o`000|OEX4s(MO#w%w9i>G$O_uOtL7&^Fv^b>7? z|AFgPD|aj0dgi0B3a%Ea>>bVG&| SnDC)4QA;2d_=6cdGk*a-T)-Is diff --git a/client/src/main/resources/runelite/12/223.hash b/client/src/main/resources/runelite/12/223.hash deleted file mode 100644 index 584255e5c..000000000 --- a/client/src/main/resources/runelite/12/223.hash +++ /dev/null @@ -1 +0,0 @@ -CC6B44F72A4F6314B7CB3EDF891CF7AAEAC91608423E01D57A8A7F3D30904200 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/276 b/client/src/main/resources/runelite/12/276 deleted file mode 100644 index 7fd623177955aedca139549cf070750840ff4006..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmXZVO%8%E5C!0eh~O`{U_so}ohz4K1TWCa1dS0*9lfI0vVEbMe$#Z?86d8N0%-pOI6K^pT6YW+ wI&q(#P51mBO%R>Xlul_zXEdh;ozn$f(iL6P4J~PfLug;4jHq)$ diff --git a/client/src/main/resources/runelite/12/276.hash b/client/src/main/resources/runelite/12/276.hash deleted file mode 100644 index e4d5241bf..000000000 --- a/client/src/main/resources/runelite/12/276.hash +++ /dev/null @@ -1 +0,0 @@ -DC2D875DFF91D7D0184670EC9CD4E5980C051D8D4BD0F591935FD603409A7369 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/277 b/client/src/main/resources/runelite/12/277 deleted file mode 100644 index 2ba5f883b72a2c0bab1fd30ce991516fd0906f8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5350 zcmcgwOK)366rStr#Ia-7ZsNSt=H>ykWznKaSyX@!5}-C|n>O9BLT<1VtEpWjjtYN* ze}ELqmOp^RvOE?@ynX`WAtAwr4GRe8`_3KTCfYf zv?ckShR*Vze78DNF-3VGdzz|FL4WdE#H(nC4!bmj9U9=0>hyLKCHYRB1^-%tw*`7z zI7g!;=u98Pn!~Gat1qSOwvs;OqqBpZQ<-m-;WIum9UNdNf}uB#ITImgqCQ2B^4Z7g zLq7X?ht@b+q89oKo~_V}jn*Ok993u^aIE6#%y&AgE5=Fd%&2kFPNO0{QSF3LYsH_g z_S#9_V$ywk0w{deB+dD0&$*fxLiUZpx02clP5c*0UyE6D@|+=M-B2b;xo#-qq}(u+ z5-B$gr9jGtq2x%pWhfa^ZW~IPlubhkxDa(6Xx5LBV%OGK%nzjFOckZrS(qk|Mrj05 zLQ8S^j$;^njo!V$UOQz@A#Kn~?7JC4&oEDh3+(+eMcxKj7nsHge$s68KE!r?SisTK zZZ|{QZk}qNU>6RAj7f_7)-PaAKPK>UJjNr7&V|KCu6U?%o}g5j{e)YPuR0fnSQ|8# z-B;2}v!RZsCj3p2(uxbb+OiuyIy(A8#S%A|l%l8jky@WrE7>oU@iORW%br2Ejwuqc zjXSpj=YfN?udqD4X`0kX3cocjCB%K_KcA|Yj_qUqHcu*EUVS{6GEg3 ztdy+F357umzNc3{;0U$`bLJU>2{Z4gp8QWTCN6AFs%n^@#Ai?tZN#BW;Ah#Ni79Oc z#6hRyN3Ody_Un)ZuIqkq!w+uy!G<5)@`Kxcu!#XQFVGxzs|9r z^?+=el;eP@(VRSV5@LTSsBX+t`9D;vrgcfh8lW64Ui1_kfajVEnAJ58M;)*`y@jC8 z_XC0X0ti-Qpb%(Llb3l4+shx#%--*OE3J6wY zpb%&=fnX1R3t^~l2;5x&!HNtN0xc#GY_(z`=+4^DTHwA22v%gE5NI)h;LC*LYa!G3 zEO18$1S>L72(*|$u=Svwg^|7?@GJrZD>6_Bw3tBXE@1Us(8H*oMB*t52v%gE5ZdQ< z83$G>1>aFVi{VS2|tS@gh zcVDU1E=hY;$~edh@uE=W6&D-bxQ0evbMAt?4#^Lf?ZkmmRjWFqhda&vYSgIQukJ@% z%|@$IZ$zz~YE*0P?yBup^}W`WNWkC#m@CPW2<7WR<6XH8!=Q$9PO6P+YqMI}+uA|N zakcT_pmj$?-vlfFWAHpYdF0N+HPrE?lktTD;n~m){TFm%q_^|*yTj?wg?A)8fEYDv z(OdQEZoSdm)95hj2$Q~c7bEfHFqFEt>Gq&2th>n40!k~+Jf-y7aEjw1d;V)8_zTyf z-WkVAQF0K?_re*xXzKFFjP*9VN^JoPu0{63!-fTl9~z#^bfdc{-ymI=Y0n$Z8&qLx zacI+0UJ8<9b-9Ml)a79IwK!rP$sYhBwJyglfxgH~nbI%HyEK2N5-ZZY13&Amsl&ZC z2?R|`U0rv$DKP?i+fk!%3ricOr;CR!z6#>iUy8us!e7;#5+mV^Re^Jf;*-X6J;)P-E(3Tq?8Q)Du43yr#srtu@&A3TxbOp+r9l3dC@uIGX}^DD diff --git a/client/src/main/resources/runelite/12/277.hash b/client/src/main/resources/runelite/12/277.hash deleted file mode 100644 index 4ec16fdd5..000000000 --- a/client/src/main/resources/runelite/12/277.hash +++ /dev/null @@ -1 +0,0 @@ -BD7800759535B55460308E8C1224F7E662641E803F37C54231C8C8FC46F77AF4 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/279 b/client/src/main/resources/runelite/12/279 deleted file mode 100644 index e7ecc500d71fa92bbc7ab9cfef0afa75d5cf4a96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 351 zcmaKoF%H5o3`L(?i2`DXkQh1^5U_FpRxZE^3aV%YVyL(y#{$Pr85nRBJ8^#g&ky9V zCPrEaJIFF?31h9oNb_C?at(#!g;hKX3j=DJ>YUg{sH`esey$(4Q&abs_SoH@O;7oP z4QxSgM&2r+d268TNpJ4`&@xEskzt(OXN>4(X1v~Ue}!4W4H=G5YW;c8 U@FiczX(7>xgROHQ(_sSg0TDtZO#lD@ diff --git a/client/src/main/resources/runelite/12/279.hash b/client/src/main/resources/runelite/12/279.hash deleted file mode 100644 index 7a7a40a9f..000000000 --- a/client/src/main/resources/runelite/12/279.hash +++ /dev/null @@ -1 +0,0 @@ -FD851583852C34596F250D63AEDB0A13B294129108A9DB52B6BDF2D51EDA0BFC \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/300 b/client/src/main/resources/runelite/12/300 deleted file mode 100644 index 858e8e4de05717c70dfc767012ae54f6cc879de4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmY*UF$%&k6n(W|ExI~58PGv{1SfHG6Y2#*i6+=4#Y8Gj&K{%S4cr~Qg=aB8oebph z{(Jwwp8y$vp}#}Xf=#+YhKjXERx0bVI6t^fc4 diff --git a/client/src/main/resources/runelite/12/300.hash b/client/src/main/resources/runelite/12/300.hash deleted file mode 100644 index 1e9b3ddc9..000000000 --- a/client/src/main/resources/runelite/12/300.hash +++ /dev/null @@ -1 +0,0 @@ -1DEBBDF2928F79FE6BDEC5FB3BBF52A18A111D16CF7E079F51B349C6F6DB654A \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/3238 b/client/src/main/resources/runelite/12/3238 deleted file mode 100644 index 7a2ce370c45d48f0fe18d3c3c784d44a22dbe8d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 696 zcma)4IS#@w5F95Y0vak1DJY;od?3__f|6gPK%#*JiLdbjI?e~d9!4@TA#vejc4zkR z0%P!+0mF{m4BB)KfEO)m4R?nuFIJmvk?oP3fhjN{uSo2X^<`dQkv=SyH5a@AqqUwI z!62q*%#nL1F}QeOk$*anOg}makY4I^TAo7;BF>i{?j=y}kj5>!8PV|*yVmI|(d~dF zmfo5X1FseLW<)n)ms^oOg!nDUGoqEcrTwhk7kpL-hJsfJs*QeM$B-{L%EZvL0p<;( CgCQFL diff --git a/client/src/main/resources/runelite/12/3238.hash b/client/src/main/resources/runelite/12/3238.hash deleted file mode 100644 index ee74f9f6c..000000000 --- a/client/src/main/resources/runelite/12/3238.hash +++ /dev/null @@ -1 +0,0 @@ -E0D381F621CE48D26245E0E974C877FCFAD8AA369DB9B562E9A1B247D9A7D7EE \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/327 b/client/src/main/resources/runelite/12/327 deleted file mode 100644 index 38169ad337ba0b0b8ceb5da469412783b3602dfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmZQzU|_ryvgOt)sdKks>yA@n`T&+c&w!mTbeT^+O}V4CqYusBLz(~p diff --git a/client/src/main/resources/runelite/12/3764.hash b/client/src/main/resources/runelite/12/3764.hash deleted file mode 100644 index d365cbedb..000000000 --- a/client/src/main/resources/runelite/12/3764.hash +++ /dev/null @@ -1 +0,0 @@ -2B0FFE1ECCE5F46FFA036D3BD2CEC46530410E5DE7B2F688A2C22D75706A7089 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/3898 b/client/src/main/resources/runelite/12/3898 deleted file mode 100644 index 3478c4edc16b8c386f1f8a09e7b018914439f6d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 436 zcmZQzkYr#G{Ko(R>_Cc%-qZp2Fc?f2?hqBOnzwznhgI!1_mXdBr8Y-xtiG+ z6oI;#Kt?bKz)WNZb0Ma4Ah9_mtRaG&V2hEZxWMLsMHu}UxPY1%8Q6d%H-i?C^a2}# z(-$Bou=6is0Gq+ezZhZ(7uWzUumPSV7{G=w0Aw)4R7QpqU^dWMAV)$R#}2lT1x#}B aFMz0IhNy#(%r6)iL_tg!piiJd%?JRPo;gVX diff --git a/client/src/main/resources/runelite/12/3900.hash b/client/src/main/resources/runelite/12/3900.hash deleted file mode 100644 index 6b984c313..000000000 --- a/client/src/main/resources/runelite/12/3900.hash +++ /dev/null @@ -1 +0,0 @@ -03D7F1AF9E8405CB4A74779254E8C65563123F865CC0181186238B038A740755 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/395 b/client/src/main/resources/runelite/12/395 deleted file mode 100644 index 70a3aeaeee193ab4b960110c93e0c5feb2341736..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2903 zcmeHJ%}-N75TEV7M{U8h5kEpnOaV2G7%j#qAw?4t4}> z6Z{K|#CX!9e}NZ0d&84Qkpun*Iv=}zuR;Y42M$c~_G4ytcIG$xb{2r>5w}y+x|=XY z{mBx*IQCkmLtBtef>Q=F{UK6ErrbK9+bez$JgzL=t+c)S-ZL+Nkxy3fk}P%Dj521n zMe2gS0&oGhQ!qihgU*&qGXNKH7-K< z6q3XIYUt&BWi50v(bdkdo*%Z#c+MP^dfmllfW3)g!W?NnzvxKKi7p~zV6!(A} zMeiV1$t&@2SMv7WKu}c%Nm_34q+Sqvi#-h7z&TME@`gdOz<1HU5T*;mz-VY^;?kvY3SS5~x|GKzPyw~sS$PX(2+xg>^1haem zfro#j4v-T0lXAx?IT|UU3kokdBo{u*Kt&37l5aVwEK$CxM|xW>$rxKub~?(dtXVO> zEK|BldP(W;A{u7Cv_?g5u}Hsn9?(E3%fGlZhD+^LA71RkLqE+fk$6*Z8JTq> z2$cs-S*z9ZNLZ*QSVix;jLlO?%2iie&wGs}uhq^jG=t}VTv^(@qHKt4T)SP9Cyq+s9Y`^KH93jKMEp%-F62uIMZEvI z4Z54i@hd2WRzQDa7x#0HRPl+3v4&MWYe{i?Er*F9v6b`3?s0<)|_FctnNJ UHmet^fc4 diff --git a/client/src/main/resources/runelite/12/395.hash b/client/src/main/resources/runelite/12/395.hash deleted file mode 100644 index f9a788b0f..000000000 --- a/client/src/main/resources/runelite/12/395.hash +++ /dev/null @@ -1 +0,0 @@ -4FBD7B233290094750CBC41F83480BD07C834086262FA3B862C27ED3F4620771 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/396 b/client/src/main/resources/runelite/12/396 deleted file mode 100644 index 584e549a93364c7d66f13fb23962ef1b00601f60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 615 zcma)4OG*Pl5Pdyul4%ump^L1HKN$1|BF2>vaFIn8*-3)qFxVhu#8npF#VdFR&!8)B zkhmALUUiQV6tRb?se1M4SC0WQz|OD(Ab}m++>U(5=Xbe368v~PIRUnrTVDqD#jzU7 zx4JI9AB@J@a?TF4pOBu0dN|8k>`BX)V^-%H!XOoA2?t^eg#u#Gl&D$r81{ukm_U|u z<@%;bsC3^dr)QHq?}P=E&ab_83QlQci+y;3A=rBSL1ilEdi<~-mrUO^@4CP} z_o0=gKjf%P2D@57Yv`F7Y}qS&RdrSCR6=EViMmplu-uB`&vD!WZ^g>LuaSLRrgCoZ vV*C0pax87rpt1HKU4g1lBk4MEskoR!c@u0hybvi8dE}T+N&8O} diff --git a/client/src/main/resources/runelite/12/396.hash b/client/src/main/resources/runelite/12/396.hash deleted file mode 100644 index ebf379aeb..000000000 --- a/client/src/main/resources/runelite/12/396.hash +++ /dev/null @@ -1 +0,0 @@ -B6196093530C36795254AA35C06E5DFB9B6D0280939FDFC05BE38B5752AAE758 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/42 b/client/src/main/resources/runelite/12/42 deleted file mode 100644 index 514d29ecd93f18b6fc42ee8f7635a3599bc224e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 489 zcmaKpJ&wXa427SW0R&C7MGz^M3W*CKaRSf^QB#K^1w>jw&pD|0ISjW#*w4dH1D4{M zvA;Z9Hc$XRH@LO+5VYuXhQc19+H6+;%er3wRqJYt;tKpSIRs)41K!OkTkp1?+5E+R z(G|ROh1#EWopoJFU0H9^AM;Oj)?On$>>m0P4~CR7J{TbL?BuCPsc1p9j($EBV)`FlJ|_P-YioM^|n#qdfh?>Hzb=)FyZt42vBiJA)O5WQF)}A6S!6+o%#s+YQ~VT~l;W0q}~-FFg4AyVh0wM&(z z!rJOVhe2OwyQ8%(=CvOApQ4MCt~*VVw*SZ{RVlM&Wf%Jom0ihK?v(1M6FG*zVkBn12Jl@UKjxq)VGdTjE=n z6isLGIv{mF#58)d50Vs4e%$v)cft_zn1T2OA1@B|mgi7j$gc`RMq@}My9!E33V-^b zJ|qXu57We`By+_J1D|OUm)G}C7J`{Kph653vGS}vTb6#aK<;|~Phq+zSABtui2)gg zW!NgpV?H>zHZeOqS?|=J7F&73_%DF&CHD9nz#CoYh#td+%c>7gEblEnJZb!1k~wCC Iqcr;4U(JzV;{X5v diff --git a/client/src/main/resources/runelite/12/5517.hash b/client/src/main/resources/runelite/12/5517.hash deleted file mode 100644 index 662e93513..000000000 --- a/client/src/main/resources/runelite/12/5517.hash +++ /dev/null @@ -1 +0,0 @@ -03F0602CC099FE01A79ABACACE87EDA07B9D5B4A91ECACB75D211BAC799C81E0 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/5730 b/client/src/main/resources/runelite/12/5730 deleted file mode 100644 index af3e09f0d812fd45516b49e6ef78154f63efc53e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1011 zcmaJ=OG*Pl5Pdz}$s~T5fVfZ)Q6suFYY`C?vJ%k?C{AP`Mi7O#^8%j0O;qp_ZvAWp zFQFS(E(NVmcbw>8k*R)N{p#0U0W44l5YfjnOJ5$-u?X88=17~`xSD_=-l9zU0yAu^ zK86U3z~m*Hh)@yDG%FE8Mz)N33%g5R^IjVvEZb?)8b9_lyS#V2LUDAFaxhOU=bPY= zr9tiw$$Ao7AS5F?f;~vL({_8kyL*^*(w($>f{CY4<^n)J?e9MLMTjF`z{f?=tE_IrZRugdZ7TQx z&gqKEx4I?$MFQK*vZha8Z5L7-MO3ZMP$d-Ai64zZmW5CRSPUiTw2r*B@~PJ_<)^Gp zjL2ghHP$jxYo}-bO_av|dyT%SPz5)nZ3YY1J!t8dZ1Yox$|@j#);oF;OGVKfnr~N` BS`z>O diff --git a/client/src/main/resources/runelite/12/5730.hash b/client/src/main/resources/runelite/12/5730.hash deleted file mode 100644 index c7f6b62c3..000000000 --- a/client/src/main/resources/runelite/12/5730.hash +++ /dev/null @@ -1 +0,0 @@ -6956895280C02D72F53B8D5D6DD4DF69FE3EE565C9927023F8C6590F3FF65993 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/6004 b/client/src/main/resources/runelite/12/6004 deleted file mode 100644 index 09e6345eb52ff5531f540a42e8b85e5a1510fd74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmZQzP-I|WUNhFfeEU`Fae@3Kc+UkZJ~j3ISK^ZKJCM62ui!!hS?E_&3MgS8L2*3aU diff --git a/client/src/main/resources/runelite/12/6004.hash b/client/src/main/resources/runelite/12/6004.hash deleted file mode 100644 index d85bef7f5..000000000 --- a/client/src/main/resources/runelite/12/6004.hash +++ /dev/null @@ -1 +0,0 @@ -DEC91CFC6FBA0B927EE291A372CFE618232170A27CF96EEADAD29D1D4B761A82 \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/679 b/client/src/main/resources/runelite/12/679 deleted file mode 100644 index 6913cd0ca2bdb64907cec1caa83c1c1b8fe19ace..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmZXRJ5B>J5QfKVJCG1CkENhYL(dHmU5Y@FhDQZtkyfB3#im0dNE`$TXn+&3W{LX8Joyr`QQw)hX^6rulM5QK@dl^_U>; z#OO1)Lzu~n$QaL}CbFqZ^lcM5(QNA4J1gh5FYz%$4(sMa0G~ml;uwXtN@{)N)U=@DCk0w0!0_+{1b9^$ej`HD4_s} z22nthN1)*m-~p)Ukaz(apg;=W%09d!Eh2b;r#6 zgV}L~b;U6&Ic5!-BU*T8A@jv*E+<5iJ2YN^vO(T@e_)~k@)?JT2~01DLbDmRIL$+- znnBMrJ3*oeo+ba8I(K83@}H| zs^d%O)NHh6$x%l$Mc(dS_aTbmP8i2QJCw~tbMJLx-S{u4`h}!ySER&V+uaQ9W7XJQ zVo(%=mugT)eO$xgU0qfcIL!G4sO58;d@f{7@2$~Z_(wn-#LYv(`F#;CtB|~HK!1cM zWF!;y4LP(u(moigZI9VH*6)~&!B*7mWg?1`pw-IMM*S@Wk`YXFb&PT`bK6Fy#$=sU z<^Chz=(bk>`I8vkGZ)UbE^BA?r7k($aMJ09C41E=V06AZ%3b>@myc~kRswHC^$GId zNWI`)aUrisO)dPV2pIxCPVEgT*Oq|5JpnD?JjR9b9FM}gjR#D$Pg9kS=Aq1M`=xyd zd(eSw=S$;-uskhsRh)O07fC5KE~Jw@ABin^Ui_t=b^hBwTA_-^4o~7q%s6(iof$<) zNbJ}EOEyTLO8f@4?5Ge+76=v~frNN(*u#1Fj&GdU3B!>RUtgbl&iT&kUK;@5HauFr zgIA;qEaCq={%*r#qmva_V1{D=CjriWhBrjSj}QJq;``h108V_$V|i*Ud>A#{XrP4i z_}of)Xl&R1PVe9l4rIw$o~kgj4fg8*=WwRdID!AHZ;@`GC8Jvi!mGWg_&T?rH0X%oJd4t?I0SH(L^*x1q_77Rfa%M0B&U}tZ&Jo zi=U4G-1m|7HP73;N`fbbZGzqLc3lB(k%*Od#+c>=dlnFi@Z(^|ZgPNymr&(_7TyPT z;`#@%^)%RTAHdR;i7}VpP>Sgg?YkMnAz30%>ECMH4R9Ir>_*;+v*eQw80nnj3_b-H zaJ+^;N}Vk8gmaD4Wu7^Y7@TusoK=IfW^gVToJ*7sN8e{%X3}8#B8d%Bc1x+W6w@Un z<^h;gC1(ocQo(X@;Qu7)lpCt~$em6fMXnuq=~K&-R+yD>jjM*WM)UB`3cP{`+jE_c_3ou&3&e3zl06@ z%05{<(rt_)B*?0~e?FNB+)kH_I#BeAzzTB+ydr^*WCB}L1&VEJ%vU7v{!CzJx|tXjSktl~v1$#kQL*&yJ0y}Ag;S8TiZea&!jljq6hM49X5{R`@c z<$)QMQ%638#&M`0m2zHW30N_?*Rs0I*H@sv44_bs)YhS5k4iR+MmgH&JWB3phaAwZ zv+HuiBKOUK7olGxC)gq9CXS!_)-81H83VS7td7Gu&3ga1g0$Q5dLaqHxeJig8iC6bRg;v?)mYciBIZE>$Bf?pemV5TeqQh&Jf- zy>fx4O@P+&y;F+_TO#L;$Q*ZFVfEnxW1)<*>f1K#H{aPyf;cKLZ^^4HP)gp!_#)3s zW4Da&7n^C8qe<|BZonHGN!aQ5ZWM-PyHA>gwGYH8raFlTP@h@(8SIx(P^|Vm-&bMa z57m~dBDWXrVl~A0R^3YQGk`z5sBTf4!8d#EfXq%k5xHZmqITACG`(!chUgIc;? zyX^+E3%rm)-}81nC5Uo|7X5;apJ9jz8fnv!euQNb4X{IF@7xS~Jtt_x$uA_Y?99ov zAGzzE%=B$xJD8|WZ}IlC?r>eXyKXcL19x3rQ*R7#S4bjHnlv_=7z1?Opo=yLrN zfCq7K73^Dh*ie1n8M=|$!vhBu+jckz+E}I1%%8?23)->ry*NE={5K7>5z-DAtR`6T zEf?#&t(;(}dTty$9XF&P5%pWZG ze>_fY`C)5k6M|fLCZ|U{- N^!i77{gba({smr62gd*a diff --git a/client/src/main/resources/runelite/12/73.hash b/client/src/main/resources/runelite/12/73.hash deleted file mode 100644 index 95b738283..000000000 --- a/client/src/main/resources/runelite/12/73.hash +++ /dev/null @@ -1 +0,0 @@ -2BCAAB2E9DD0FA4284107C7B73FE722A2B63F2024ADD4AD8430724078A2CC1FE \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/806 b/client/src/main/resources/runelite/12/806 deleted file mode 100644 index 653887b61e50125ec944d4cc06038c7f40c3acc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 597 zcmbVK!A`I2*XRIePm}?wwFJ79Xofk*ImZQG(aoVWBn%Van?BGViuiy_ zZdP24^cN!vUaq!*QjPz@x`)0^qQaVUqTQ0ms11s2@@o2@FYnpp%@S#8-Jt)NyAO-b z3h@ZIkc+|-%n&6vROOky&Gfg`=M7fZekX0qOK5OR<-Bz#y}R?YxkMzv63)3*Z0>U{ w;~nBU3SHlt2kT5VGt=?d7Q3DUNzpiB(f>%^do5GC%vI%9@)@V(m0yec0Zh$7Jpcdz diff --git a/client/src/main/resources/runelite/12/806.hash b/client/src/main/resources/runelite/12/806.hash deleted file mode 100644 index 0417d1658..000000000 --- a/client/src/main/resources/runelite/12/806.hash +++ /dev/null @@ -1 +0,0 @@ -F24070EC29F94E90F83578CF29B242EB9F31D6255578C69F51814E9C199B6E8E \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/84 b/client/src/main/resources/runelite/12/84 deleted file mode 100644 index 64f18b334c28855bc98a813f4e484ed402b3aa4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13138 zcmds8U5r~t6`t#B@A|HHZSP+;fmU_fq{>gBPBv1KDy_5$3Pc4OT8b(l6vu1ty4~1| z*GU7SC>1|X@Pa^4Re~fy5r`)w9(d>j63|kl2p*6q@CE`3h^K&rgtUC$IWzXy>sw{B zyWWzk^~~IJ&pmVg=FGV>v&QTg}=O5tX#( zmZF6sU_#1(R5Kr7nY_NMg@;g{AwSs{tsaO#PGS&Je3bc6JOX{kWX{GTP+*h!NIb%@ zAUqY15D7vl9$`cfuEZl`_$YfV9${1vz8#M+CI~OZBf#!rscQ9Tb+%%i5I!KlgNG`m zBS$PSFXQbLNoCH&6BM`4JQk0jrg&3FVg z&DD4WHO;r;5!5u_iAQjzIW{|cq*(4T4I)YD&}`c@cY_QDUC%HXH}?Xblrkmdkdz7^ zmUddoNXii@Gg6L9IVNS+kba5-aQt&J0JBn#NjWNIM#>Q>BPr8T4of*M<&cyqDaB7f zm0?yaZrfs9+ZH>T8t#la%_4D9I7yGe0r_I&#b=!rk{%@CMeL)K-!S=U(%?n&>ijV) z0wS)Sxo~c&RxXqmORYk+w$!RLYxRW(q1EFLK&w!6Sm4c4>tRDuIg`>m ztei(vlKM5Th+s-BiufLa?J5b-22n(9bVJH(AoGem zB(DtTt~xD~g6dReOKR{YRLr-Of{Y5=#sCmDNTfZTOpwprfK0l^lxsluZG3TkODBt( z7wNR;o*f=?-fNG0?Fo79GxFl3*PfEL$-b_2;5mVPl#{_r51{nw2RZQrlLHDl85h;L z?&y<>rj{Dd;R(?uaw_CVm|d?JbD#W?N?_S&t2FhuuCDI|&Wt4<)-NpSd_M673t}HCWI`=rdEE=R zOa;ERQoje3mvTnZlk(PtrKX(;$M37GtdtfiCoa^M<}so@uBoaSPk9qog(R9W$5BdT zN@|2u-r?Yg2^{Z8)Ow}RKnss|A%l48F==6SBXQxEV$Na4%48s7-ULS)?zf(!@D0mR zc&gbrf5lj1I9*|8T5i@Zo`eHEu~KQ)OXn+Mhcz11NooN6UiUPpbKjayyO^U-Y}|$} zw!?RjN1jVo_` z2l$kyeocD@?En?0FHN;evj?k(kV`Oh4VslRjup5B`wykW9PR>Hcy^6R@x9p_|1_ao z!~Euq9WVZcnzYFjmbm0a@SRSM?N{mBgq626ivcW+;oUD$dO#obOO*C^1e<cW%UBQ7NxsX&bXvv2hVNFIA4xa1pnv+aFz@wSWosO7{Ii{j*Sw@m^i$dM`lz4E zJ}pX_zyeeDjWDvj!IC&r75g_ z>Gf(>bDsfdcK0oc(ceMTy>@s3tk63pX=*e;`IJ-Svpr_LEzDQgRP$|@7bfn@{#J&B z|FK~%=j?Z{_nl<^kH@rr4BozDdVun6$Cw_Ncw0NB2PH=Eyo4sn#HL=B(e01pxz5wB zgvG5SbW&iK3o~A4^C_93NB?ZIPtxt1Nxi){FlK*;{Myk9u>rwFf}X5Ly0DD3akpqO z0c%or1_EDx>NQX%p6i%l=Orq$D*_+xJnb<=F0V?d|96<$gKE9gf{i(eftwQ`h&;4#(lmDs(HDa7)HWrPI39t@}{AC_ZIb zq=RFJ{Y0}-nlG1DTK-m!hSD|BPPfIj#xIQ@1{Qe?fgfO_+?yezH@qz=?1DV~OyNOn zaS>(X0mxf*#J+|GAeIo+kN2D3na-`cOzn0Z+Cig_4K|;H`$gQft1vDOQw{vsC}?2H zTl6j_d*Pl-ZP;GZ|5bx($(5J9-Sgu{t)u>ku$U7neomMY2u{}6y(5n(yCnnM z84Bm-=L^+ltx})&F!&5>qkL9ds5hEcDG^!Xh2uGoRhApgmiLa@gHI!GEp04&2SL2} z0je5FXYVoDf-(5B5Y++>`#e&^rkrY>osrc&a_jWk(cIkv*ZsgrkJg=d2UouoKocse zvi}|_iKm3D?2hUbdl!Jpw`?jvyk0ITy7DpQ@zJ*IiBi2=q+s9n`|4h72%$3WP(<#7oatWPg{M3weHD*%znxCRJ^o~83@jD zs?j`OC@*!z2#T~7lhc4lT{AaNRm+KRJPN|U6QR$G1j|{74N*w&SjC1YgfSEnWKj9122|wrob!X> zR=+1kVNB+_+Eulw-s;#H@`2D>VL|+h**G?0Uw_R}&WA!Pz1B`dOx^|AY_iq)0srT)-|PWaat3IxY_ zPHO$6;#}w!NX7Y5JSlY&RSEUR(~VGC`aJ|)OT0sG&3@E+hIK~TX}ArIvKMfo;+2to z)>!gi8)+$ru^J86ZJM3PqXH&`J8@6X#!dUj^MFjVuuLX3avXCIKYrPto2dVZlZhS9oh0O#q{$g;a?Y9@u%?8pDIx2pZ4FN3 p9-K&BL46TFO7?yHC>d)?#u}WN-{1!c1D={RCN=k#J&vzQUFY!S=2ep*A<}u+H$< zO}<3xl1fI*c+5%3gCNjs)iyP1Rjc@_B1*!*V8uti$1*ZWZIb#=BqTVyDR#(Qe3Z6nD zgs9a@ghd`ffwYJ;&b`YsE|L~lL{F1`Zo(_+-v#f@3Q)B#Mx(GBuCzyC zB%w_lh&t-1qmq|*(5WygJVtHmv&M$ua67Do@u_#1D#m7tTfrd*YO~JTd7s#82r7*O zU;&?!4n?U`W!0R9Sgs`E(8!t9{(wYArm2_FE}T1#CTQ2m|4q5}JrBi*F`sMrzf+;w z`0TJ1SLeby^QgOPE1qG?eU%&KVl+P`m52$|R|{2RSJv92b75~3#EQfdTX+KCPnA*f zxg?k$`CE<1a+CO=B?;=P&GW%<*j^2u-w1o1u)k_DyRhiy8j52cRfyHiB8>yCog{Z^ z5mXxGaL@}!7vk{hk~sa!Fo^r@^=U4$$V+EU`($HRV50P2TrIZ^g3luKusYn4vO?F<&Y_Yb zCE7DpQp!4$IYXysxHez+1xnUV5XGaM9H&kASEP-QM$u=jSkl;4msgoq)Xctkn@o{<=702U${^aS%OJU+= za8c!V@I{`6G?)N(4V)KSE#rs7@WYoCADH11ecSG)@DmIl$92 zASOV!zu?Vl-n{P38{WL>&0C~3)$dBRXqSh&YOf6Gv<;pQI8pO9)S@~Vh%Hy7D#5C@`}r9i7vz?4+1&X0A!n#h`a7Dk_29O6|*Y9 z7m(l9AWI1E3xQ^}`CfP0F-sEuu}V!s{>_tz9xV?@>(2Zf+^}}}VQ^E@CE{g|r{M8) zU=q+SFyKLoxQ<313>3D^)v4wClZh8jN_# zBz(dkuMpX3i=>Vn|&=&4Mo==L!GJx1*nDX!5Nm1G(z7| zli)hofay$Woy1)bXtnqoDU5Z%0hogGB2PqSzxV0Fy$ngs+|wA?H$jdTHa}=c4a!?7 zxxZzF!*yACrs1iE!fI9phANYWIMBdQVV`V}3RT5f6&PYNsFiwW*;q3*jLJWBG7nHp z1FE=UNiZ>%Xo2maid>SF^E4(!XQDj$uR{ax2FQ!-HDfUzrNV?)QZsO(xqdqstaOR_ zODD>XxIyyf*r)83DU6@*Jbt!09&g#kvK3C-eWfU1Us!BgnW6>W+#O1 zq#D`OHLY^>+4t(x-)}r;Uz)vrZ#x>*ZcdWkg$+f9fK#vPu+Hy-e{~UafCvk3StH?w KIU^#v4E_R?@9q%* diff --git a/client/src/main/resources/runelite/12/909.hash b/client/src/main/resources/runelite/12/909.hash deleted file mode 100644 index a8b1bd2a5..000000000 --- a/client/src/main/resources/runelite/12/909.hash +++ /dev/null @@ -1 +0,0 @@ -AFE505CAB72304D58550DAD9CB244482089FFB49A4641630CEE2F483D0C224FB \ No newline at end of file diff --git a/client/src/main/resources/runelite/12/920 b/client/src/main/resources/runelite/12/920 deleted file mode 100644 index 07a55a8a4a896759e513da03c49cdcee1557e7d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1476 zcmds1O=}ZT6g~6NWJX$|*kCItsh|il8#f}fKcIFa#Eswwu^HQ1&D1osbm!KsOWiaO z-3fvppg%yjihDtDE4Xkaf}V5V3>gwzy7rO0``*3hp8N6UJ;04q6n<$P0Dm|jeTX^E z9_Gzn;rxUD0j|aGO@p~wUkhnIz+3{GeRD(sTQu}y&Ia^xW9qW3&K=%!#Dpk-MsPdp zE~m|2Yk9rd%R1>MX36eGmBKURbgof~OqxktXA-qtr*_y*&Vfx{2t{{>aI1z&U330B3=Trv@&E3oVUzvidu;4p6Utb{RgD>3^)TKdkYl z3ZMKs))qU*cx(UO+6QK*5WYA7a!LK1xnGK9&G%21H0~=3a}E5fI9?pb1ygb=l-hf4 z8`DGNnca3rG9!ECjRBJAqISXuSF)9ryJ=%{twWLYS{sdfSv#doywPuW_QwRSyxz;1 zUP&)Y+THA*-Zk@nHRj!1&9)m$>CUaJ)oqVNv_4i|j`@^eu0nAK7(OMDRlXrLhYqgX z#3wl+yQk;Cy%b!q*d(Ho$A74944vW*&~#c&rz!q|GZIvw!~6Y|%OT@Tl};VFc= chpUupl#dwf6Xi3Dr$>Vb`^S{Z;RqJ~0_r=0`2YX_ diff --git a/client/src/main/resources/runelite/12/920.hash b/client/src/main/resources/runelite/12/920.hash deleted file mode 100644 index 9a1829643..000000000 --- a/client/src/main/resources/runelite/12/920.hash +++ /dev/null @@ -1 +0,0 @@ -030CB9830EAD6F61CFC5ED1CA60AE3434900998EFB8237E9C750321775312072 \ No newline at end of file diff --git a/client/src/main/resources/runelite/index b/client/src/main/resources/runelite/index index 0c08468537bdd653d67fd14aa74b6e2ae865ec6f..e856c72b34c466e6cfd5c6f0eabfe46d02510f00 100644 GIT binary patch delta 24 ccmbQjIDt`sfk#~!h(#E9SR{a0a-v8B04Qw(IsgCw delta 28 dcmbQhIE7J!fk#~!h=DYV1Q1ICvD8F?1^_YD17rXI diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 411823d81..47acef2f6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -48,7 +48,7 @@ commons-csv = {group = "org.apache.commons", name = "commons-csv", version = "_" commons-cli = {group = "commons-cli", name = "commons-cli", version = "1.4"} netty-buffer = {group = "io.netty", name = "netty-buffer", version = "4.1.68.Final"} okhttp = {group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.2"} -atlr4-runtime = {group = "org.antlr", name = "antlr4-runtime", version = "4.9.2"} +atlr4-runtime = {group = "org.antlr", name = "antlr4-runtime", version = "4.13.1"} commons-compress = {group = "org.apache.commons", name = "commons-compress", version = "1.21"} commons-text = {group = "org.apache.commons", name = "commons-text", version = "_"} slf4j-simple = {group = "org.slf4j", name = "slf4j-simple", version = "_"} diff --git a/injector/src/main/java/com/openosrs/injector/Injector.java b/injector/src/main/java/com/openosrs/injector/Injector.java index 37007a162..b5223fb9d 100644 --- a/injector/src/main/java/com/openosrs/injector/Injector.java +++ b/injector/src/main/java/com/openosrs/injector/Injector.java @@ -8,28 +8,25 @@ package com.openosrs.injector; import asm.util.JarUtil; -import com.google.common.hash.Hashing; import com.openosrs.injector.injection.InjectData; import com.openosrs.injector.injection.InjectTaskHandler; import com.openosrs.injector.injectors.*; import com.openosrs.injector.injectors.raw.*; + import com.openosrs.injector.rsapi.RSApi; + import com.openosrs.injector.transformers.EnumInvokeVirtualFixer; import com.openosrs.injector.transformers.InjectTransformer; import com.openosrs.injector.transformers.Java8Ifier; import com.openosrs.injector.transformers.SourceChanger; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.Comparator; import java.util.Objects; -import joptsimple.ArgumentAcceptingOptionSpec; -import joptsimple.OptionParser; -import joptsimple.OptionSet; -import joptsimple.util.EnumConverter; + import meteor.Logger; import asm.ClassFile; import asm.ClassGroup; @@ -45,31 +42,7 @@ public class Injector extends InjectData implements InjectTaskHandler public static ArrayList report = new ArrayList<>(); public static void main(String[] args) { - OptionParser parser = new OptionParser(); - - ArgumentAcceptingOptionSpec vanillaFileOption = - parser.accepts("vanilla", "Vanilla OSRS gamepack file") - .withRequiredArg().ofType(File.class); - - ArgumentAcceptingOptionSpec oprsVerOption = - parser.accepts("version", "OpenOSRS version") - .withRequiredArg().ofType(String.class); - - ArgumentAcceptingOptionSpec outFileOption = - parser.accepts("output", "Output file, jar if outmode is jar, folder if outmode is files") - .withRequiredArg().ofType(File.class); - - ArgumentAcceptingOptionSpec outModeOption = - parser.accepts("outmode") - .withRequiredArg().ofType(OutputMode.class) - .withValuesConvertedBy(new EnumConverter<>(OutputMode.class) { - @Override - public OutputMode convert(String value) { - return super.convert(value.toUpperCase()); - } - }); - - OptionSet options = parser.parse(args); + String oprsVer = "1.0-SNAPSHOT"; injector.vanilla = load( @@ -162,6 +135,7 @@ public void injectVanilla() { transform(new SourceChanger(this)); injector.vanilla.addClass(reflection); + } private void inject(com.openosrs.injector.injectors.Injector injector) { diff --git a/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java index e6152f118..a13a31730 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java @@ -214,7 +214,7 @@ private void injectMethods(ClassFile deobClass, RSApiClass implementingClass) final ClassFile targetClass = InjectUtil.vanillaFromApiMethod(inject, apiMethod); final Method vanillaMethod = inject.toVanilla(deobMethod); final String garbage = DeobAnnotations.getDecoder(deobMethod); - log.debug("[DEBUG] Injecting invoker {} for {} into {}", apiMethod.getMethod(), vanillaMethod.getPoolMethod(), targetClass.getPoolClass()); + //log.debug("[DEBUG] Injecting invoker {} for {} into {}", apiMethod.getMethod(), vanillaMethod.getPoolMethod(), targetClass.getPoolClass()); InjectInvoke.inject(targetClass, apiMethod, vanillaMethod, garbage); ++voke; apiMethod.setInjected(true); diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java index 40fc96346..31bd1d606 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java @@ -64,15 +64,12 @@ import asm.execution.MethodContext; import asm.execution.StackContext; -public class ScriptVM extends AbstractInjector -{ - public ScriptVM(InjectData inject) - { +public class ScriptVM extends AbstractInjector { + public ScriptVM(InjectData inject) { super(inject); } - public void inject() - { + public void inject() { final ClassGroup vanilla = inject.getVanilla(); /* @@ -89,7 +86,7 @@ public void inject() The script's instruction array is identified by looking for the getfield from script.instructions - bn.g @ rev 163 : + for rev 163 : // Jump back to here if vmExecuteOpcode returns true aload6 // Script.instructions iinc 5 1 // ++PC @@ -102,12 +99,14 @@ public void inject() if_icmpge L52 */ - final ClassFile deobScript = inject.getDeobfuscated().findClass("Script"); + final ClassFile deobScript = vanilla.findClass("Script"); final String scriptObName = deobScript.getName(); final Field scriptInstructions = InjectUtil.findField(inject, "opcodes", "Script"); final Field scriptStatePC = InjectUtil.findField(inject, "pc", "ScriptFrame"); + System.out.println(scriptInstructions); + System.out.println(scriptStatePC); final ClassFile vanillaClient = vanilla.findClass("Client"); @@ -136,82 +135,75 @@ public void inject() ALoad localInstructionLoad = null; MethodContext methodContext = pcontext.get(); - for (InstructionContext instrCtx : methodContext.getInstructionContexts()) - { + + for (InstructionContext instrCtx : methodContext.getInstructionContexts()) { Instruction instr = instrCtx.getInstruction(); + //System.out.println("INSTRUCTION: " + instrCtx.getInstruction().toString()); - if (instr instanceof AStore) - { + if (instr instanceof AStore) { AStore store = (AStore) instr; StackContext storedVarCtx = instrCtx.getPops().get(0); - + var name = storedVarCtx.getType().getInternalName(); // Find AStores that store a Script - if (storedVarCtx.getType().getInternalName().equals("Script")) - { + if (name.equals(scriptObName)) { + System.out.println("Found script store: " + name); scriptStores.add(store); } // Find AStores that store the instructions InstructionContext pusherCtx = storedVarCtx.getPushed(); - if (pusherCtx.getInstruction() instanceof GetField) - { + if (pusherCtx.getInstruction() instanceof GetField) { GetField getField = (GetField) pusherCtx.getInstruction(); - if (getField.getMyField().equals(scriptInstructions)) - { + if (getField.getMyField().equals(scriptInstructions)) { instructionArrayLocalVar = store.getVariableIndex(); } } } - // Find the local that invokedFromPc is set from - if (instr instanceof PutField put) - { - if (put.getMyField() == scriptStatePC) - { + if (instr instanceof PutField) { + PutField put = (PutField) instr; + if (put.getMyField() == scriptStatePC) { pcLocalVar = instrCtx.getPops().stream() .map(StackContext::getPushed) .filter(i -> i.getInstruction() instanceof ILoad) .map(i -> ((ILoad) i.getInstruction()).getVariableIndex()) .findFirst() - .orElse(null); + .orElseThrow(null); } } } // Find opcode load // This has to run after the first loop because it relies on instructionArrayLocalVar being set - if (instructionArrayLocalVar == null) - { + if (instructionArrayLocalVar == null) { throw new InjectException("Unable to find local instruction array"); } - for (InstructionContext instrCtx : methodContext.getInstructionContexts()) - { + for (InstructionContext instrCtx : methodContext.getInstructionContexts()) { Instruction instr = instrCtx.getInstruction(); - if (instr instanceof IALoad) - { + if (instr instanceof IALoad) { StackContext array = instrCtx.getPops().get(1); // Check where the array came from (looking for a getField scriptInstructions InstructionContext pushedCtx = array.getPushed(); Instruction pushed = pushedCtx.getInstruction(); - if (pushed instanceof ALoad) - { + if (pushed instanceof ALoad) { ALoad arrayLoad = (ALoad) pushed; - if (arrayLoad.getVariableIndex() == instructionArrayLocalVar) - { + if (arrayLoad.getVariableIndex() == instructionArrayLocalVar) { //Find the istore IStore istore = (IStore) instrCtx.getPushes().get(0).getPopped().stream() .map(InstructionContext::getInstruction) .filter(i -> i instanceof IStore) .findFirst() - .orElse(null); - if (istore != null) - { + .orElseThrow(null); + if (istore != null) { currentOpcodeStore = istore; localInstructionLoad = arrayLoad; + log.debug("[DEBUG] Found instruction array load {}", localInstructionLoad.getVariableIndex()); + log.debug("[DEBUG] currentOpcodeStore {}", currentOpcodeStore.getVariableIndex()); } } + } } } @@ -225,15 +217,12 @@ public void inject() log.debug("[DEBUG] Found script index {}", outerSciptIdx); ListIterator instrIter = instrs.getInstructions().listIterator(); - while (instrIter.hasNext()) - { + while (instrIter.hasNext()) { Instruction instr = instrIter.next(); - if (instr instanceof AStore) - { + if (instr instanceof AStore) { AStore il = (AStore) instr; - if (il.getVariableIndex() == outerSciptIdx) - { + if (il.getVariableIndex() == outerSciptIdx) { instrIter.previous(); instrIter.add(new Dup(instrs)); instrIter.add(new InvokeStatic(instrs, setCurrentScript.getPoolMethod())); @@ -245,22 +234,18 @@ public void inject() // Add PutStatics to all PC IStores and IIncs { - if (pcLocalVar == null) - { + if (pcLocalVar == null) { throw new InjectException("Unable to find ILoad for invokedFromPc IStore"); } log.debug("[DEBUG] Found pc index {}", pcLocalVar); ListIterator instrIter = instrs.getInstructions().listIterator(); - while (instrIter.hasNext()) - { + while (instrIter.hasNext()) { Instruction instr = instrIter.next(); - if (instr instanceof IStore) - { + if (instr instanceof IStore) { IStore il = (IStore) instr; - if (il.getVariableIndex() == pcLocalVar) - { + if (il.getVariableIndex() == pcLocalVar) { instrIter.previous(); instrIter.add(new Dup(instrs)); instrIter.add(new PutStatic(instrs, currentScriptPCField)); @@ -268,11 +253,9 @@ public void inject() } } - if (instr instanceof IInc) - { + if (instr instanceof IInc) { IInc iinc = (IInc) instr; - if (iinc.getVariableIndex() == pcLocalVar) - { + if (iinc.getVariableIndex() == pcLocalVar) { instrIter.add(new ILoad(instrs, pcLocalVar)); instrIter.add(new PutStatic(instrs, currentScriptPCField)); } @@ -281,34 +264,88 @@ public void inject() } // Inject call to vmExecuteOpcode - log.debug("[DEBUG] Found instruction array index {}", instructionArrayLocalVar); - if (currentOpcodeStore == null) - { + //log.debug("[DEBUG] Found instruction array index {}", instructionArrayLocalVar); + if (currentOpcodeStore == null) { throw new InjectException("Unable to find IStore for current opcode"); } + + /** + * for rev 218 + * L58 { + * f_new (Locals[15]: ScriptEvent, Script, int, int, [Ljava/lang/Object;, int, [I, [I, int, int, int, int, int, int, int) (Stack[0]) + * iinc 5 1 + * } + * L59 { + * aload 6 + * iload 5 + * iaload + * istore 17 + * } + * L60 { + * iload 17 + * bipush 100 + * if_icmplt L72 + * } + * L61 { + * aload 1 // reference to arg1 + * getfield Script.intOperands:int[] + * iload 5 + * iaload + * iconst_1 + * if_icmpne L64 + * } + * L62 { + * iconst_1 + * istore 18 + * } + */ + + /* + [DEBUG] Found instruction array load 6 + [DEBUG] currentOpcodeStore 17 + [DEBUG] Found script index 1 + [DEBUG] Found pc index 5 + */ + + // Existing code... + int istorepc = instrs.getInstructions().indexOf(currentOpcodeStore); assert istorepc >= 0; + System.out.println("istorepc: " + istorepc); Label nextIteration = instrs.createLabelFor(localInstructionLoad); + System.out.println("currentOpcodeStore: " + currentOpcodeStore.getVariableIndex()); + +// Debug statements to display indices before adding instructions + System.out.println("Before adding instructions:"); + System.out.println("Index 1: " + (istorepc + 1)); + System.out.println("Index 2: " + (istorepc + 2)); + System.out.println("Index 3: " + (istorepc + 3)); + instrs.addInstruction(istorepc + 1, new ILoad(instrs, currentOpcodeStore.getVariableIndex())); + System.out.println("vmExecuteOpcode: " + vmExecuteOpcode.getName() + " " + "istorepc: " + (istorepc + 1)); instrs.addInstruction(istorepc + 2, new InvokeStatic(instrs, vmExecuteOpcode.getPoolMethod())); instrs.addInstruction(istorepc + 3, new IfNe(instrs, nextIteration)); + System.out.println("Script instructions: " + scriptInstructions.getName() + " " + "istorepc: " + (istorepc + 3)); + Instructions runScriptInstrs = runScript.getCode().getInstructions(); + ListIterator instrIter = runScriptInstrs.getInstructions().listIterator(); while (instrIter.hasNext()) { Instruction instr = instrIter.next(); + //log.debug("[DEBUG] Checking instruction {}", instr.getInstructions()); - if (instr instanceof InvokeStatic) - { + if (instr instanceof InvokeStatic) { InvokeStatic invokeStatic = (InvokeStatic) instr; - if(invokeStatic.getMethod().getType().getReturnValue().toString().equals("L"+scriptObName+";")) { + if (invokeStatic.getMethod().getType().getReturnValue().toString().equals("L" + scriptObName + ";")) { instrIter.add(new Dup(instrs)); instrIter.add(new InvokeStatic(instrs, setCurrentScript.getPoolMethod())); instrIter.next(); } } } + } } \ No newline at end of file diff --git a/mixins/src/main/java/mixins/RSClientMixin.java b/mixins/src/main/java/mixins/RSClientMixin.java index 639420e14..e4d8dd760 100644 --- a/mixins/src/main/java/mixins/RSClientMixin.java +++ b/mixins/src/main/java/mixins/RSClientMixin.java @@ -109,6 +109,8 @@ public void setCallbacks(Callbacks callbacks) { this.callbacks = callbacks; } + + @Inject private DrawCallbacks drawCallbacks; @@ -2454,15 +2456,32 @@ public RSEvictingDualNodeHashTable getWidgetSpriteCache() @Inject public static void checkResize() { + check("EnumDefinition_cached", client.getEnumDefinitionCache()); + check("SpotAnimationDefinition_cached", client.getSpotAnimationDefinitionCache()); + check("SpotAnimationDefinition_cachedModels", client.getSpotAnimationDefinitionModlesCache()); check("Script_cached", client.getScriptCache()); check("StructDefinition_cached", client.getRSStructCompositionCache()); check("HealthBarDefinition_cached", client.getHealthBarCache()); check("HealthBarDefinition_cachedSprites", client.getHealthBarSpriteCache()); check("ObjectDefinition_cachedModels", client.getObjectDefinitionModelsCache()); //check("Widget_cachedSprites", client.getWidgetSpriteCache()); + + check("e1", client.getE1()); + check("e2", client.getE2()); + check("e3", client.getE3()); + check("archive7", client.getArchive7()); + check("archive5", client.getArchive5()); + check("e4", client.getE4()); + check("e5", client.getE5()); + check("e6", client.getE6()); + check("e7", client.getE7()); + check("e8", client.getE8()); + check("archive4", client.getArchive4()); + check("archive11", client.getArchive11()); + + check("ItemDefinition_cached", client.getItemCompositionCache()); check("VarbitDefinition_cached", client.getVarbitCache()); - check("EnumDefinition_cached", client.getEnumDefinitionCache()); check("FloorUnderlayDefinition_cached", client.getFloorUnderlayDefinitionCache()); check("FloorOverlayDefinition_cached", client.getFloorOverlayDefinitionCache()); check("HitSplatDefinition_cached", client.getHitSplatDefinitionCache()); @@ -2482,12 +2501,10 @@ public static void checkResize() { check("SequenceDefinition_cached", client.getSequenceDefinitionCache()); check("SequenceDefinition_cachedFrames", client.getSequenceDefinitionFramesCache()); check("SequenceDefinition_cachedModel", client.getSequenceDefinitionModelsCache()); - check("SpotAnimationDefinition_cached", client.getSpotAnimationDefinitionCache()); - check("SpotAnimationDefinition_cachedModels", client.getSpotAnimationDefinitionModlesCache()); check("VarcInt_cached", client.getVarcIntCache()); check("VarpDefinition_cached", client.getVarpDefinitionCache()); check("Widget_cachedModels", client.getModelsCache()); - // check("Widget_cachedFonts", client.getFontsCache()); + // check("Widget_cachedFonts", client.getFontsCache()); check("Widget_cachedSpriteMasks", client.getSpriteMasksCache()); // check("WorldMapElement_cachedSprites", client.getSpritesCache()); } @@ -3191,12 +3208,79 @@ public static void onRootInterfaceChange(int idx) { public static void onRunEnergyChanged(int idx) { client.getCallbacks().post(Events.RUN_ENERGY_CHANGED_EVENT, new RunEnergyChangedEvent(client.getEnergy())); } + @Inject + @Override + public void closeInterface(WidgetNode interfaceNode, boolean unload) + { + WidgetNode widgetNode = (WidgetNode) interfaceNode; + if (widgetNode != this.getComponentTable().get(widgetNode.getHash())) + { + throw new IllegalArgumentException("WidgetNode is no longer valid"); + } + else + { + this.closeRSInterface(widgetNode, unload); + } + } + @Inject + @Override + public WidgetNode openInterface(int componentId, int interfaceId, int modalMode) + { + assert this.isClientThread() : "openInterface must be called on client thread"; + + Widget component = this.getWidget(componentId); + if (component == null) + { + throw new IllegalStateException("component does not exist"); + } + else if (component.getType() != 0) + { + throw new IllegalStateException("component is not a layer"); + } + else + { + RSInterfaceParent interfaceNode = (RSInterfaceParent) this.getComponentTable().get((long) componentId); + if (interfaceNode != null) + { + this.closeInterface(interfaceNode, interfaceId != interfaceNode.getId()); + } + + Iterator iter = this.getComponentTable().iterator(); + + RSInterfaceParent iface; + do + { + if (!iter.hasNext()) + { + interfaceNode = newInterfaceParent(); + interfaceNode.setId(interfaceId); + interfaceNode.setModalMode(modalMode); + this.getComponentTable().put(interfaceNode, (long) componentId); + this.getWidgetDefinition().loadInterface$api(interfaceId); + this.revalidateWidgetScroll(this.getWidgetDefinition().getWidgets()[componentId >> 16], component, false); + this.copy$runWidgetOnLoadListener(interfaceId); + int topLevelInterfaceId = this.getTopLevelInterfaceId(); + if (topLevelInterfaceId != -1 && this.getWidgetDefinition().loadInterface$api(topLevelInterfaceId)) + { + this.runComponentCloseListeners (this.getWidgetDefinition().getWidgets()[topLevelInterfaceId], 1); + } + + return interfaceNode; + } + + iface = (RSInterfaceParent) iter.next(); + } + while (iface.getId() != interfaceId); + + throw new IllegalStateException("interface " + interfaceId + " is already open"); + } + } @Inject - @MethodHook(value = "ifOpenSub", end = true) + @MethodHook(value = "openInterface", end = true) public static void onSubInterfaceChange(int targetComponent, int interfaceId, int walkType) { client.getCallbacks() - .post(Events.IF_OPEN_SUB_EVENT, new IfOpenSubEvent(targetComponent, interfaceId, walkType)); + .post(Events.IF_OPEN_SUB_EVENT, new openInterfaceEvent(targetComponent, interfaceId, walkType)); } @Inject @@ -3230,10 +3314,18 @@ public void setQuestState(Quest quest, QuestState questState) { public QuestState getQuestState(Quest quest) { return questStates.get(quest); } - @Inject @Override - public Object getDBTableField(int rowID, int column, int tupleIndex, int fieldIndex) + public List getDBRowsByValue(int rowID, int column, int tupleIndex, Object value) + { + RSDbTable dbTable = client.getDbTable((rowID << 12 | column << 4)); + Map columns = (Map) dbTable.getColumns().get(tupleIndex); + List rows = (List) columns.get(value); + return rows == null ? Collections.emptyList() : Collections.unmodifiableList(rows); + } + @Inject + @Override + public Object[] getDBTableField(int rowID, int column, int tupleIndex) { RSDbRowType dbRowType = client.getDbRowType(rowID); RSDbTableType dbTableType = client.getDbTableType(dbRowType.getTableId()); @@ -3246,27 +3338,29 @@ public Object getDBTableField(int rowID, int column, int tupleIndex, int fieldIn columnType = dbTableType.getDefaultValues()[column]; } - if (columnType == null) + if (tupleIndex >= type.length) { - return null; + throw new IllegalArgumentException("tuple index too large"); } - else if (tupleIndex >= type.length) + else if (columnType == null) { - throw new IllegalArgumentException("tuple index too large"); + return new Object[0]; } else { - if (fieldIndex > columnType.length / type.length) - { - throw new IllegalArgumentException("field index too large"); - } - else + int fieldLength = columnType.length / type.length; + Object[] field = new Object[fieldLength]; + + for (int fieldIndex = 0; fieldIndex < fieldLength; ++fieldIndex) { - return columnType[tupleIndex * type.length + fieldIndex]; + field[fieldIndex] = columnType[fieldIndex * type.length + tupleIndex]; } + + return field; } } + @Inject @Override public int getEnergy() { diff --git a/mixins/src/main/java/mixins/RSItemCompositionMixin.java b/mixins/src/main/java/mixins/RSItemCompositionMixin.java index 0cc4afdb4..39a2e3467 100644 --- a/mixins/src/main/java/mixins/RSItemCompositionMixin.java +++ b/mixins/src/main/java/mixins/RSItemCompositionMixin.java @@ -23,9 +23,9 @@ public abstract class RSItemCompositionMixin implements RSItemComposition @Inject private int shiftClickActionIndex = DEFAULT_CUSTOM_SHIFT_CLICK_INDEX; - @MethodHook(value = "", end = true) + @MethodHook(value = "", end = true) @Inject - public static void rl$clinit() + public void rl$init() { RSEvictingDualNodeHashTable cachedModels2 = client.getItemCompositionCache(); cachedModels2.resize(1024); diff --git a/mixins/src/main/java/mixins/RSVarbitCompositionMixin.java b/mixins/src/main/java/mixins/RSVarbitCompositionMixin.java index ef4a00f28..f7ba3dc33 100644 --- a/mixins/src/main/java/mixins/RSVarbitCompositionMixin.java +++ b/mixins/src/main/java/mixins/RSVarbitCompositionMixin.java @@ -11,16 +11,16 @@ @Mixin(RSVarbitComposition.class) public abstract class RSVarbitCompositionMixin implements RSVarbitComposition { - @Shadow("client") - private static RSClient client; + @Shadow("client") + private static RSClient client; - @MethodHook(value = "", end = true) - @Inject - public static void rl$clinit() - { - if (client != null) { - RSEvictingDualNodeHashTable varbitCache = client.getVarbitCache(); - varbitCache.resize(256); - } - } -} + @MethodHook(value = "", end = true) + @Inject + public void rl$init() + { + if (client != null) { + RSEvictingDualNodeHashTable cachedModels2 = client.getItemCompositionCache(); + cachedModels2.resize(1024); + } + } +} \ No newline at end of file diff --git a/mixins/src/main/java/mixins/RSWidgetMixin.java b/mixins/src/main/java/mixins/RSWidgetMixin.java index 9a0719502..e29a4bbd5 100644 --- a/mixins/src/main/java/mixins/RSWidgetMixin.java +++ b/mixins/src/main/java/mixins/RSWidgetMixin.java @@ -711,4 +711,11 @@ public void onModelRotation(int idx) { public void onModelVisibilityChange(int idx) { client.getCallbacks().post(Events.WIDGET_VISIBILITY_CHANGE, new WidgetVisibilityChange(isHidden())); } + + @Inject + @Override + public RSFont getFont() + { + return getRSFont(client.getWidgetDefinition()); + } } diff --git a/mixins/src/main/java/mixins/ReflectionMixin.java b/mixins/src/main/java/mixins/ReflectionMixin.java deleted file mode 100644 index c474eb207..000000000 --- a/mixins/src/main/java/mixins/ReflectionMixin.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2020 ThatGamerBlue - * 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 mixins; - -import net.runelite.api.mixins.*; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSReflection; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -/** - * Because we inject into the deob, we can hook into these reflection checks. - * There is no evidence that Jagex actually uses any of these checks - * Better safe than sorry I suppose though. - * We only report method invocations by default. - */ -@Mixin(RSReflection.class) -public abstract class ReflectionMixin implements RSReflection -{ - @Shadow("client") - private static RSClient client; - - @Inject - public static boolean reportClasses = false; - - @Inject - public static boolean reportFields = false; - - @Copy("reportFindClass") - @Replace("reportFindClass") - public static void reportFindClass(String className) { - if (reportClasses) - client.getLogger().error("ReflectionLookup:Class - " + className); - } - - @Copy("reportFindField") - @Replace("reportFindField") - public static void reportFindField(Class clazz, String fieldName) { - if (!reportFields) - return; - - for (Field f : clazz.getDeclaredFields()) { - for (Annotation a : f.getAnnotations()) { - if (a instanceof ObfuscatedName) { - String obfuscatedName = ((ObfuscatedName) a).value(); - if (obfuscatedName.equals(fieldName)) { - client.getLogger().error("ReflectionLookup:Field - " + clazz.getName() + "." + f.getName()); - } - } - } - } - } - - @Copy("reportInvoke") - @Replace("reportInvoke") - public static void reportInvoke(Method method, Object reference, Object[] args) { - String className = method.getClass().getName(); - int arg = 0; - client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - " + className + "." + method.getName()); - if (reference != null) - client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - reference - " + reference.getClass().getName()); - for (Object o : args) { - client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - arg" + arg + " - " + o.getClass().getName()); - if (o instanceof Integer) - client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - intValue" + arg + " - " + o); - if (o instanceof String) - client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - strValue" + arg + " - " + o); - if (o instanceof Long) - client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - longValue" + arg + " - " + o); - if (o instanceof Byte) - client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - byteValue" + arg + " - " + o); - if (o instanceof Boolean) - client.getLogger().error("net.runelite.net.runelite.net.runelite.net.runelite.rs.Reflection:INVOKE - boolValue" + arg + " - " + o); - arg++; - } - } -} diff --git a/mixins/src/main/java/mixins/ScriptVMMixin.java b/mixins/src/main/java/mixins/ScriptVMMixin.java index bcf0ef32e..781f12a73 100644 --- a/mixins/src/main/java/mixins/ScriptVMMixin.java +++ b/mixins/src/main/java/mixins/ScriptVMMixin.java @@ -48,8 +48,8 @@ @Mixin(RSClient.class) public abstract class ScriptVMMixin implements RSClient { - @Shadow("client") - private static RSClient client; + @Shadow("client") + private static RSClient client; @Inject private static RSScript currentScript; @@ -61,24 +61,6 @@ public abstract class ScriptVMMixin implements RSClient @Inject private static int currentScriptPC; - // Call is injected by the raw injector - @Inject - static void setCurrentScript(RSScript script) - { - if (rootScriptEvent != null) - { - if (script != null) - { - ScriptPreFired event = new ScriptPreFired((int) script.getHash(), rootScriptEvent); - client.getCallbacks().post(Events.SCRIPT_PRE_FIRED, event); - } - - rootScriptEvent = null; - } - - currentScript = script; - } - // Call is injected into runScript by the ScriptVM raw injector @Inject static boolean vmExecuteOpcode(int opcode) @@ -86,11 +68,19 @@ static boolean vmExecuteOpcode(int opcode) switch (opcode) { case RUNELITE_EXECUTE: + assert currentScript.getInstructions()[currentScriptPC] == RUNELITE_EXECUTE; + + int stringStackSize = client.getStringStackSize(); String stringOp = client.getStringStack()[--stringStackSize]; client.setStringStackSize(stringStackSize); + client.getLogger().info("ScriptVM: " + stringOp); + client.getLogger().info("Current script: " + currentScript.toString()); + client.getLogger().info("Current scriptPC: " + currentScriptPC); + + if ("debug".equals(stringOp)) { @@ -123,7 +113,7 @@ static boolean vmExecuteOpcode(int opcode) client.setIntStackSize(intStackSize); return true; } - else if ("mes".equals(stringOp)) + else if ("mes".equalsIgnoreCase(stringOp)) { int intStackSize = client.getIntStackSize(); int messageType = client.getIntStack()[--intStackSize]; @@ -133,6 +123,7 @@ else if ("mes".equals(stringOp)) client.addChatMessage(ChatMessageType.of(messageType), "", message, null, true); return true; } + System.out.println("Current script: " + currentScript.toString()); ScriptCallbackEvent event = new ScriptCallbackEvent(currentScript, stringOp); client.getCallbacks().post(Events.SCRIPT_CALLBACK, event); return false; @@ -158,14 +149,45 @@ else if ("mes".equals(stringOp)) return false; } + // Call is injected by the raw injector + @Inject + static void setCurrentScript(RSScript script) + { + if (rootScriptEvent != null) + { + if(script != null) { + ScriptPreFired event = new ScriptPreFired((int) script.getHash(), rootScriptEvent); + client.getCallbacks().post(Events.SCRIPT_PRE_FIRED, event); + } + rootScriptEvent = null; + } + + currentScript = script; + + } + + @Inject public static int currentQuestRow = -1; + @Copy("runScriptLogic") + @Replace("runScriptLogic") + static void copy$runScriptLogic(RSScriptEvent event, RSScript var4, int maxExecutionTime, int var2) + { + try { + copy$runScriptLogic(event, var4, maxExecutionTime, var2); + + } catch (Exception e) { + e.printStackTrace(); + + } + } + @Copy("runScript") @Replace("runScript") static void copy$runScript(RSScriptEvent event, int maxExecutionTime, int var2) { Object[] arguments = event.getArguments(); - assert arguments != null && arguments.length > 0; + if (arguments[0] instanceof JavaScriptCallback) { try @@ -174,7 +196,7 @@ else if ("mes".equals(stringOp)) } catch (Exception e) { - client.getLogger().error("Error in JavaScriptCallback", e); + e.printStackTrace(); } } else @@ -184,6 +206,9 @@ else if ("mes".equals(stringOp)) rootScriptEvent = event; copy$runScript(event, maxExecutionTime, var2); } + catch (Exception exception) { + exception.printStackTrace(); + } finally { currentScript = null; @@ -191,13 +216,6 @@ else if ("mes".equals(stringOp)) } } - @Copy("runScriptLogic") - @Replace("runScriptLogic") - static void copy$runScriptLogic(RSScriptEvent event, RSScript var4, int maxExecutionTime, int var2) - { - copy$runScriptLogic(event, var4, maxExecutionTime, var2); - } - @Inject @Override public void runScript(Object... args) @@ -209,20 +227,24 @@ public void runScript(Object... args) @Override public void runScriptEvent(RSScriptEvent event) { - assert isClientThread() : "runScriptEvent must be called on client thread"; - assert currentScript == null : "scripts are not reentrant"; + Object[] args = event.getArguments(); + int scriptId = (int) args[0]; + + //assert isClientThread() : "runScriptEvent must be called on client thread"; + //assert currentScript == null : "scripts are not reentrant"; runScript(event, 5000000, 0); boolean assertionsEnabled = false; - assert assertionsEnabled = true; + //assert assertionsEnabled = true; - Object[] args = event.getArguments(); - if (assertionsEnabled && args[0] instanceof Integer) + if (args[0] instanceof Integer) { - int scriptId = (int) args[0]; RSScript script = (RSScript) client.getScriptCache().get(scriptId); if (script != null) { + + + int intCount = 0, stringCount = 0; for (int i = 1; i < args.length; i++) { @@ -235,6 +257,8 @@ public void runScriptEvent(RSScriptEvent event) stringCount++; } } + System.out.println("Script " + scriptId + " was called" + + script.getIntArgumentCount() + "+" + script.getStringArgumentCount() + ", got " + intCount + "+" + stringCount); assert script.getIntArgumentCount() == intCount && script.getStringArgumentCount() == stringCount : "Script " + scriptId + " was called with the incorrect number of arguments; takes " diff --git a/mixins/src/main/java/mixins/VarbitMixin.java b/mixins/src/main/java/mixins/VarbitMixin.java index 66b8d6e61..984f1ee30 100644 --- a/mixins/src/main/java/mixins/VarbitMixin.java +++ b/mixins/src/main/java/mixins/VarbitMixin.java @@ -60,7 +60,7 @@ public RSVarbitComposition getVarbitComposition(int id) if (varbit == null) { - //log.trace("Cache miss for varbit {}", id); + //System.out.printf("Cache miss for varbit {}", id); client.rs$getVarbit(id); // preload varbit varbit = (RSVarbitComposition) getVarbitCache().get(id); varbitCache.put(id, varbit); diff --git a/osrs/src/main/java/AbstractWorldMapData.java b/osrs/src/main/java/AbstractWorldMapData.java index ec6527f8d..64580de34 100644 --- a/osrs/src/main/java/AbstractWorldMapData.java +++ b/osrs/src/main/java/AbstractWorldMapData.java @@ -9,7 +9,8 @@ @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { @ObfuscatedName("uk") - static int field2045; + @Export("cameraLookAtY") + static int cameraMoveToY; @ObfuscatedName("ab") int field2051; @ObfuscatedName("au") diff --git a/osrs/src/main/java/ApproximateRouteStrategy.java b/osrs/src/main/java/ApproximateRouteStrategy.java index 6557aff4a..c6e6f1f76 100644 --- a/osrs/src/main/java/ApproximateRouteStrategy.java +++ b/osrs/src/main/java/ApproximateRouteStrategy.java @@ -3,6 +3,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import static net.runelite.rs.ScriptOpcodes.RUNELITE_EXECUTE; + @ObfuscatedName("cm") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { @@ -68,7 +70,7 @@ static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { } if (var14 == -2147483645) { - var14 = var0.widget != null ? var0.widget.id * 898987495 * 225496535 : -1; + var14 = var0.widget != null ? var0.widget.id : -1; } if (var14 == -2147483644) { @@ -76,15 +78,15 @@ static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { } if (var14 == -2147483643) { - var14 = var0.widget != null ? var0.widget.childIndex * 1774053999 * 355251343 : -1; + var14 = var0.widget != null ? var0.widget.childIndex : -1; } if (var14 == -2147483642) { - var14 = var0.dragTarget != null ? var0.dragTarget.id * 898987495 * 225496535 : -1; + var14 = var0.dragTarget != null ? var0.dragTarget.id: -1; } if (var14 == -2147483641) { - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1774053999 * 355251343 : -1; + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex: -1; } if (var14 == -2147483640) { @@ -125,7 +127,7 @@ static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { var34 = false; } - var14 = class149.method779(var32, var1, var34); + var14 = class149.opCodeCheck(var32, var1, var34); switch(var14) { case 0: var29 = false; @@ -134,7 +136,9 @@ static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { default: break; case 2: - throw new IllegalStateException(); + if(var32 != RUNELITE_EXECUTE) { + throw new IllegalStateException(); + } } } else if (var32 == 0) { Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var7[var5]; @@ -342,6 +346,7 @@ static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { } var26.append("").append(var8); + var30.printStackTrace(); GrandExchangeOfferWorldComparator.RunException_sendStackTrace(var26.toString(), var30); var29 = false; break label860; @@ -359,7 +364,7 @@ static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { } if (!var9 && var3 > 0 && var10 >= var3) { - GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.field823 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.instructions + " finished at op count " + var10 + " of max " + var2, (Throwable)null); } } @@ -376,7 +381,7 @@ static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { } if (!var9 && var3 > 0 && var10 >= var3) { - GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.field823 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.instructions + " finished at op count " + var10 + " of max " + var2, (Throwable)null); } return; @@ -393,7 +398,7 @@ static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { } if (!var9 && var3 > 0 && var10 >= var3) { - GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.field823 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.instructions + " finished at op count " + var10 + " of max " + var2, (Throwable)null); } return; @@ -410,7 +415,7 @@ static void runScriptLogic(ScriptEvent var0, Script var1, int var2, int var3) { } if (!var9 && var3 > 0 && var10 >= var3) { - GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.field823 + " finished at op count " + var10 + " of max " + var2, (Throwable)null); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("Warning: Script " + var1.instructions + " finished at op count " + var10 + " of max " + var2, (Throwable)null); } } diff --git a/osrs/src/main/java/ArchiveDiskAction.java b/osrs/src/main/java/ArchiveDiskAction.java index 5ca941151..2296d900b 100644 --- a/osrs/src/main/java/ArchiveDiskAction.java +++ b/osrs/src/main/java/ArchiveDiskAction.java @@ -258,7 +258,7 @@ static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { if (Client.isItemSelected == 1) { WorldMapSectionType.insertMenuItemNoShift("Use", Client.field597 + " " + "->" + " " + class167.colorStartTag(16777215) + var4, 14, var1, var2, var3); } else if (Client.isSpellSelected) { - if ((UrlRequest.field1182 & 8) == 8) { + if ((UrlRequest.selectedSpellFlags & 8) == 8) { WorldMapSectionType.insertMenuItemNoShift(Client.field599, Client.field598 + " " + "->" + " " + class167.colorStartTag(16777215) + var4, 15, var1, var2, var3); } } else { diff --git a/osrs/src/main/java/Bounds.java b/osrs/src/main/java/Bounds.java index 53f306846..becf836e1 100644 --- a/osrs/src/main/java/Bounds.java +++ b/osrs/src/main/java/Bounds.java @@ -78,7 +78,7 @@ void method2302(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { - var2.highX = (var2.highX * -2085674849 - (var1.lowX * -2085674849 - this.lowX * -2085674849)) * 1385823071; + var2.highX = (var2.highX - (var1.lowX - this.lowX)); var2.lowX = var1.lowX; } @@ -101,7 +101,7 @@ void method2303(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { - var2.highY = (var2.highY * -1396881341 - (var1.lowY * -1396881341 - this.lowY * -1396881341)) * -453294997; + var2.highY = (var2.highY - (var1.lowY - this.lowY)); var2.lowY = var1.lowY; } diff --git a/osrs/src/main/java/Buffer.java b/osrs/src/main/java/Buffer.java index b0bfbd26a..26b406774 100644 --- a/osrs/src/main/java/Buffer.java +++ b/osrs/src/main/java/Buffer.java @@ -398,8 +398,7 @@ public int readMedium() { descriptor = "(B)I", garbageValue = "89" ) - @Export("readUnsignedByteAdd") - public int readUnsignedByteAdd() { + public int notRUBA() { this.offset += 3; int var1 = ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 8388607) { @@ -896,8 +895,8 @@ public void writeByteSub(int var1) { descriptor = "(I)I", garbageValue = "-756845354" ) - @Export("readUnsignedShortAdd") - public int readUnsignedShortAdd() { + @Export("readUnsignedByteAdd") + public int readUnsignedByteAdd() { return this.array[++this.offset - 1] - 128 & 255; } @@ -967,8 +966,8 @@ public void writeShortAdd(int var1) { descriptor = "(II)V", garbageValue = "-2051245858" ) - @Export("writeIntME") - public void writeIntME(int var1) { + @Export("writeShortAddLE") + public void writeShortAddLE(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 + 128); } @@ -1000,8 +999,8 @@ public int readUnsignedShortLE() { descriptor = "(I)I", garbageValue = "201481069" ) - @Export("readUnsignedIntIME") - public int readUnsignedIntIME() { + @Export("readUnsignedShortAdd") + public int readUnsignedShortAdd() { this.offset += 2; return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } @@ -1022,7 +1021,7 @@ public int readUnsignedShortAddLE() { descriptor = "(B)I", garbageValue = "88" ) - public int method2602() { + public int readShortLE() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); if (var1 > 32767) { @@ -1037,8 +1036,8 @@ public int method2602() { descriptor = "(I)I", garbageValue = "-1774495709" ) - @Export("readShortLE") - public int readShortLE() { + @Export("readShortAdd") + public int readShortAdd() { this.offset += 2; int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 32767) { @@ -1053,7 +1052,7 @@ public int readShortLE() { descriptor = "(I)I", garbageValue = "-1535378058" ) - public int method2604() { + public int readShortAddLE() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); if (var1 > 32767) { @@ -1144,8 +1143,8 @@ public int method2610() { descriptor = "(II)V", garbageValue = "392771780" ) - @Export("writeIntIME") - public void writeIntIME(int var1) { + @Export("writeIntLE") + public void writeIntLE(int var1) { this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 >> 16); @@ -1157,8 +1156,8 @@ public void writeIntIME(int var1) { descriptor = "(IB)V", garbageValue = "20" ) - @Export("writeIntLE") - public void writeIntLE(int var1) { + @Export("writeIntME") + public void writeIntME(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 24); @@ -1170,7 +1169,8 @@ public void writeIntLE(int var1) { descriptor = "(II)V", garbageValue = "116974832" ) - public void method2613(int var1) { + @Export("writeIntIME") + public void writeIntIME(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 16); this.array[++this.offset - 1] = (byte)(var1 >> 24); this.array[++this.offset - 1] = (byte)var1; @@ -1193,7 +1193,7 @@ public int readIntME() { descriptor = "(B)I", garbageValue = "126" ) - public int readIntIME() { + public int readUnsignedIntIME() { this.offset += 4; return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); } diff --git a/osrs/src/main/java/Client.java b/osrs/src/main/java/Client.java index 77de589a8..35a250356 100644 --- a/osrs/src/main/java/Client.java +++ b/osrs/src/main/java/Client.java @@ -110,7 +110,8 @@ boolean shouldProcessClick(){ @Export("cameraShakeSpeed") static int[] cameraShakeSpeed; @ObfuscatedName("vw") - static int[] field589; + @Export("cameraShakeCycle") + static int[] cameraShakeCycle; @ObfuscatedName("vc") @Export("zoomHeight") static short zoomHeight; @@ -829,9 +830,9 @@ boolean shouldProcessClick(){ @ObfuscatedName("sh") static String field600; @ObfuscatedName("sb") - static long[] field615; + static long[] crossWorldMessageIds; @ObfuscatedName("sz") - static int field533; + static int crossWorldMessageIdsIndex; @ObfuscatedName("sp") @ObfuscatedSignature( descriptor = "Lil;" @@ -1238,8 +1239,8 @@ boolean shouldProcessClick(){ publicChatMode = 0; tradeChatMode = 0; field600 = ""; - field615 = new long[100]; - field533 = 0; + crossWorldMessageIds = new long[100]; + crossWorldMessageIdsIndex = 0; keyHandlerInstance = new class223(); field422 = new class221(); field530 = 0; @@ -1275,7 +1276,7 @@ boolean shouldProcessClick(){ cameraShakeIntensity = new int[5]; cameraMoveIntensity = new int[5]; cameraShakeSpeed = new int[5]; - field589 = new int[5]; + cameraShakeCycle = new int[5]; field640 = 256; field636 = 205; zoomHeight = 256; @@ -2181,27 +2182,27 @@ final void doCycleLoggedOut() { var32.packetBuffer.writeBytes(var9.array, 0, var9.array.length); var32.packetBuffer.writeByte(clientType); var32.packetBuffer.writeInt(0); - var32.packetBuffer.writeIntIME(PcmPlayer.field181.hash); - var32.packetBuffer.method2613(SoundSystem.field209.hash); - var32.packetBuffer.writeIntLE(class145.field1338.hash); - var32.packetBuffer.method2613(class7.field12.hash); - var32.packetBuffer.writeIntLE(class514.archive6.hash); - var32.packetBuffer.writeIntLE(StructComposition.field1637.hash); - var32.packetBuffer.method2613(class313.archive4.hash); - var32.packetBuffer.writeIntIME(UserComparator7.field1190.hash); - var32.packetBuffer.writeIntLE(WorldMapDecorationType.archive10.hash); - var32.packetBuffer.writeIntIME(SpotAnimationDefinition.field1597.hash); - var32.packetBuffer.method2613(Canvas.field68.hash); - var32.packetBuffer.writeIntIME(VarbitComposition.archive13.hash); + var32.packetBuffer.writeIntLE(PcmPlayer.field181.hash); + var32.packetBuffer.writeIntIME(SoundSystem.field209.hash); + var32.packetBuffer.writeIntME(class145.field1338.hash); + var32.packetBuffer.writeIntIME(class7.field12.hash); + var32.packetBuffer.writeIntME(class514.archive6.hash); + var32.packetBuffer.writeIntME(StructComposition.field1637.hash); + var32.packetBuffer.writeIntIME(class313.archive4.hash); + var32.packetBuffer.writeIntLE(UserComparator7.field1190.hash); + var32.packetBuffer.writeIntME(WorldMapDecorationType.archive10.hash); + var32.packetBuffer.writeIntLE(SpotAnimationDefinition.field1597.hash); + var32.packetBuffer.writeIntIME(Canvas.field68.hash); + var32.packetBuffer.writeIntLE(VarbitComposition.archive13.hash); var32.packetBuffer.writeInt(WorldMapData_0.field1938.hash); - var32.packetBuffer.method2613(0); - var32.packetBuffer.writeIntLE(class47.archive12.hash); - var32.packetBuffer.writeIntLE(GrandExchangeOfferOwnWorldComparator.archive8.hash); - var32.packetBuffer.writeIntLE(Language.field3643.hash); + var32.packetBuffer.writeIntIME(0); + var32.packetBuffer.writeIntME(class47.archive12.hash); + var32.packetBuffer.writeIntME(GrandExchangeOfferOwnWorldComparator.archive8.hash); + var32.packetBuffer.writeIntME(Language.field3643.hash); var32.packetBuffer.writeInt(WorldMapSection0.archive9.hash); - var32.packetBuffer.writeIntLE(class19.field59.hash); - var32.packetBuffer.writeIntIME(class344.archive2.hash); - var32.packetBuffer.writeIntIME(BuddyRankComparator.field1200.hash); + var32.packetBuffer.writeIntME(class19.field59.hash); + var32.packetBuffer.writeIntLE(class344.archive2.hash); + var32.packetBuffer.writeIntLE(BuddyRankComparator.field1200.hash); var32.packetBuffer.xteaEncrypt(var29, var8, var32.packetBuffer.offset); var32.packetBuffer.writeLengthShort(var32.packetBuffer.offset - var6); packetWriter.addNode(var32); @@ -2658,7 +2659,7 @@ final void doCycleLoggedIn() { var5 = (int)var16; if(shouldProcessClick()) { - PacketBufferNode var18 = class113.getPacketBufferNode(ClientPacket.CLICK, packetWriter.isaacCipher); + PacketBufferNode var18 = class113.getPacketBufferNode(ClientPacket.EVENT_MOUSE_CLICK, packetWriter.isaacCipher); var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); var18.packetBuffer.writeShort(var4); var18.packetBuffer.writeShort(var3); @@ -2673,7 +2674,7 @@ final void doCycleLoggedIn() { } if (keyHandlerInstance.pressedKeysCount > 0) { - var14 = class113.getPacketBufferNode(ClientPacket.IF_BUTTONT, packetWriter.isaacCipher); + var14 = class113.getPacketBufferNode(ClientPacket.IDLE, packetWriter.isaacCipher); var14.packetBuffer.writeShort(0); var2 = var14.packetBuffer.offset; long var19 = SpotAnimationDefinition.method962(); @@ -2957,8 +2958,8 @@ final void doCycleLoggedIn() { var6 = class229.localPlayer.pathY[0] + class101.baseY; var26 = class113.getPacketBufferNode(ClientPacket.f20, packetWriter.isaacCipher); var26.packetBuffer.writeInt(0); - var26.packetBuffer.writeIntME(var5); - var26.packetBuffer.writeIntME(var6); + var26.packetBuffer.writeShortAddLE(var5); + var26.packetBuffer.writeShortAddLE(var6); var26.packetBuffer.writeByte(var4); packetWriter.addNode(var26); } @@ -3074,9 +3075,9 @@ final void doCycleLoggedIn() { } if (!field404) { - var5 = Messages.field1154 * 128 + 64; - var6 = AbstractWorldMapData.field2045 * 128 + 64; - var7 = WorldMapDecorationType.getTileHeight(var5, var6, ItemLayer.Client_plane) - class302.field2510; + var5 = Messages.cameraMoveToX * 128 + 64; + var6 = AbstractWorldMapData.cameraMoveToY * 128 + 64; + var7 = WorldMapDecorationType.getTileHeight(var5, var6, ItemLayer.Client_plane) - class302.cameraMoveToHeight; var8 = var5 - ViewportMouse.cameraX; var9 = var7 - SecureRandomFuture.cameraY; var10 = var6 - class36.cameraZ; @@ -3099,7 +3100,7 @@ final void doCycleLoggedIn() { } for (var5 = 0; var5 < 5; ++var5) { - var10002 = field589[var5]++; + var10002 = cameraShakeCycle[var5]++; } class176.varcs.tryWrite(); @@ -3159,12 +3160,12 @@ final void doCycleLoggedIn() { int[] var43 = var48.field1884.method1867(); if (var43 != null) { var26 = class113.getPacketBufferNode(ClientPacket.f97, packetWriter.isaacCipher); - var26.packetBuffer.writeIntIME(var43[1]); + var26.packetBuffer.writeIntLE(var43[1]); var26.packetBuffer.writeInt(var43[0]); var26.packetBuffer.writeShortLE(var48.field1884.childIndex); var26.packetBuffer.writeInt(var43[2]); - var26.packetBuffer.writeIntIME(var48.field1884.id); - var26.packetBuffer.writeIntLE(var48.field1884.method1865()); + var26.packetBuffer.writeIntLE(var48.field1884.id); + var26.packetBuffer.writeIntME(var48.field1884.method1865()); packetWriter.addNode(var26); } } @@ -3527,7 +3528,7 @@ final boolean method385(PacketWriter var1) { } if (var59 == null) { - var59 = UserComparator8.ifOpenSub(var7, var8, var9); + var59 = UserComparator8.openInterface(var7, var8, var9); } } @@ -3600,14 +3601,14 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.field2648 == var1.serverPacket) { publicChatMode = var3.readUnsignedByteNeg(); - tradeChatMode = var3.readUnsignedShortAdd(); + tradeChatMode = var3.readUnsignedByteAdd(); var1.serverPacket = null; return true; } Widget var25; if (ServerPacket.SEND_PING == var1.serverPacket) { - var21 = var3.readUnsignedIntIME(); + var21 = var3.readUnsignedShortAdd(); var5 = var3.readUnsignedIntME(); var25 = HealthBarDefinition.widgetDefinition.method1733(var5); if (var25 != null && var25.type == 0) { @@ -3858,9 +3859,9 @@ final boolean method385(PacketWriter var1) { var16 = var3.readUnsignedShortAddLE(); var24 = var3.readUnsignedShort(); var11 = var3.method2610(); - var26 = var3.readUnsignedShortAdd() * 4; + var26 = var3.readUnsignedByteAdd() * 4; var65 = var3.readUnsignedByte() * 4; - var18 = var3.readUnsignedIntIME(); + var18 = var3.readUnsignedShortAdd(); var81 = var3.readByteAdd(); var9 = var57 + var7; var23 = var81 + var8; @@ -3887,7 +3888,7 @@ final boolean method385(PacketWriter var1) { Widget var22; if (ServerPacket.UPDATE_ZONE_FULL_FOLLOWS == var1.serverPacket) { var21 = var3.readUnsignedByte(); - var5 = var3.readUnsignedShortAdd(); + var5 = var3.readUnsignedByteAdd(); var6 = var3.readInt(); var22 = HealthBarDefinition.widgetDefinition.method1733(var6); ZoneOperation.method1633(var22, var21, var5); @@ -3898,14 +3899,14 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.HINT_ARROW == var1.serverPacket) { var21 = var3.readUnsignedShortLE(); - var5 = var3.readIntIME(); - var6 = var3.readUnsignedShortAdd(); + var5 = var3.readUnsignedIntIME(); + var6 = var3.readUnsignedByteAdd(); var75 = (InterfaceParent)interfaceParents.get((long)var5); if (var75 != null) { class302.closeInterface(var75, var21 != var75.group); } - UserComparator8.ifOpenSub(var5, var21, var6); + UserComparator8.openInterface(var5, var21, var6); var1.serverPacket = null; return true; } @@ -3934,8 +3935,8 @@ final boolean method385(PacketWriter var1) { var7 = var3.readUnsignedShort(); for (var8 = 0; var8 < var7; ++var8) { - var9 = var3.readUnsignedIntIME(); - var23 = var3.readUnsignedShortAdd(); + var9 = var3.readUnsignedShortAdd(); + var23 = var3.readUnsignedByteAdd(); if (var23 == 255) { var23 = var3.readInt(); } @@ -3960,7 +3961,7 @@ final boolean method385(PacketWriter var1) { Widget var74; if (ServerPacket.field2674 == var1.serverPacket) { - var21 = var3.readIntIME(); + var21 = var3.readUnsignedIntIME(); var74 = HealthBarDefinition.widgetDefinition.method1733(var21); for (var6 = 0; var6 < var74.itemIds.length; ++var6) { @@ -3985,7 +3986,7 @@ final boolean method385(PacketWriter var1) { var82 = false; for (var65 = 0; var65 < 100; ++var65) { - if (field615[var65] == var32) { + if (crossWorldMessageIds[var65] == var32) { var82 = true; break; } @@ -3996,8 +3997,8 @@ final boolean method385(PacketWriter var1) { } if (!var82 && field479 == 0) { - field615[field533] = var32; - field533 = (field533 + 1) % 100; + crossWorldMessageIds[crossWorldMessageIdsIndex] = var32; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; var34 = AbstractFont.escapeBrackets(class20.method77(class128.readString(var3))); byte var87; if (var90.isPrivileged) { @@ -4055,7 +4056,7 @@ final boolean method385(PacketWriter var1) { } if (ServerPacket.UPDATE_STAT == var1.serverPacket) { - var21 = var3.method2602(); + var21 = var3.readShortLE(); var5 = var3.readInt(); var25 = HealthBarDefinition.widgetDefinition.method1733(var5); if (var21 != var25.sequenceId || var21 == -1) { @@ -4175,9 +4176,9 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.MESSAGE_GAME == var1.serverPacket) { var5 = var3.readUnsignedShortLE(); - var7 = var3.readUnsignedShortAdd(); + var7 = var3.readUnsignedByteAdd(); var6 = var3.readUnsignedIntME(); - var21 = var3.readUnsignedIntIME(); + var21 = var3.readUnsignedShortAdd(); Player var95; if (var21 == localPlayerIndex) { var95 = class229.localPlayer; @@ -4194,7 +4195,7 @@ final boolean method385(PacketWriter var1) { } if (ServerPacket.MIDI_JINGLE == var1.serverPacket) { - var21 = var3.readUnsignedIntIME(); + var21 = var3.readUnsignedShortAdd(); WorldMapEvent.method1383(var21); changedItemContainers[++changedItemContainersCount - 1 & 31] = var21 & 32767; var1.serverPacket = null; @@ -4206,8 +4207,8 @@ final boolean method385(PacketWriter var1) { var5 = var3.readInt(); var6 = class167.getGcDuration(); PacketBufferNode var79 = class113.getPacketBufferNode(ClientPacket.OPHELDD, packetWriter.isaacCipher); - var79.packetBuffer.method2613(var21); - var79.packetBuffer.writeIntLE(var5); + var79.packetBuffer.writeIntIME(var21); + var79.packetBuffer.writeIntME(var5); var79.packetBuffer.writeByteNeg(var6); var79.packetBuffer.writeByte(GameEngine.fps); packetWriter.addNode(var79); @@ -4260,14 +4261,14 @@ final boolean method385(PacketWriter var1) { cameraShakeIntensity[var21] = var5; cameraMoveIntensity[var21] = var6; cameraShakeSpeed[var21] = var7; - field589[var21] = 0; + cameraShakeCycle[var21] = 0; var1.serverPacket = null; return true; } Widget var93; if (ServerPacket.UPDATE_UID192 == var1.serverPacket) { - var21 = var3.readUnsignedIntIME(); + var21 = var3.readUnsignedShortAdd(); var5 = var3.readInt(); var6 = var3.readUnsignedShortLE(); var7 = var3.readUnsignedShortAddLE(); @@ -4424,7 +4425,7 @@ final boolean method385(PacketWriter var1) { ScriptFrame.cameraLookAtX = var3.readUnsignedByte(); class216.cameraLookAtY = var3.readUnsignedByte(); class127.cameraLookAtHeight = var3.readUnsignedShort(); - WorldMapIcon_0.cameraMoveToSpeed = var3.readUnsignedByte(); + WorldMapIcon_0.cameraLookAtSpeed = var3.readUnsignedByte(); class1.cameraLookAtAcceleration = var3.readUnsignedByte(); if (class1.cameraLookAtAcceleration >= 100) { ViewportMouse.cameraX = ScriptFrame.cameraLookAtX * 128 + 64; @@ -4477,7 +4478,7 @@ final boolean method385(PacketWriter var1) { var62 = true; } else { for (var65 = 0; var65 < 100; ++var65) { - if (var36 == field615[var65]) { + if (var36 == crossWorldMessageIds[var65]) { var62 = true; break; } @@ -4485,8 +4486,8 @@ final boolean method385(PacketWriter var1) { } if (!var62) { - field615[field533] = var36; - field533 = (field533 + 1) % 100; + crossWorldMessageIds[crossWorldMessageIdsIndex] = var36; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; var34 = class128.readString(var3); var26 = var76 >= 0 ? 43 : 46; ArchiveLoader.addChatMessage(var26, "", var34, var96.name); @@ -4499,7 +4500,7 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.UPDATE_INV_FULL == var1.serverPacket) { var8 = var3.readUnsignedShortAddLE(); var5 = var3.readUnsignedShortLE(); - var7 = var3.readUnsignedIntIME(); + var7 = var3.readUnsignedShortAdd(); var6 = var3.readUnsignedShortLE(); var21 = var3.readUnsignedShortAddLE(); if (var21 == 65535) { @@ -4514,7 +4515,7 @@ final boolean method385(PacketWriter var1) { } if (ServerPacket.OBJ_DEL_LEGACY == var1.serverPacket) { - var21 = var3.readIntIME(); + var21 = var3.readUnsignedIntIME(); var20 = var3.readStringCp1252NullTerminated(); var25 = HealthBarDefinition.widgetDefinition.method1733(var21); if (!var20.equals(var25.text)) { @@ -4528,7 +4529,7 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.field2757 == var1.serverPacket) { var5 = var3.readUnsignedShort(); - var7 = var3.readUnsignedIntIME(); + var7 = var3.readUnsignedShortAdd(); var21 = var3.readUnsignedShortLE(); var6 = var3.readUnsignedShortAddLE(); class191.someMusicMethod(var21, var5, var6, var7); @@ -4561,7 +4562,7 @@ final boolean method385(PacketWriter var1) { boolean var85 = false; for (var15 = 0; var15 < 100; ++var15) { - if (field615[var15] == var63) { + if (crossWorldMessageIds[var15] == var63) { var85 = true; break; } @@ -4572,8 +4573,8 @@ final boolean method385(PacketWriter var1) { } if (!var85 && field479 == 0) { - field615[field533] = var63; - field533 = (field533 + 1) % 100; + crossWorldMessageIds[crossWorldMessageIdsIndex] = var63; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; var40 = AbstractFont.escapeBrackets(class20.method77(class128.readString(var3))); if (var97.modIcon != -1) { ArchiveLoader.addChatMessage(9, FloorUnderlayDefinition.addImageTag(var97.modIcon) + var52, var40, HitSplatDefinition.base37DecodeLong(var27)); @@ -4657,8 +4658,8 @@ final boolean method385(PacketWriter var1) { var21 = var3.readUnsignedShortAddLE(); var94 = npcs[var21]; var6 = var3.readUnsignedShortAddLE(); - var5 = var3.readIntIME(); - var7 = var3.readUnsignedShortAdd(); + var5 = var3.readUnsignedIntIME(); + var7 = var3.readUnsignedByteAdd(); if (var94 != null) { var94.updateSpotAnimation(var7, var6, var5 >> 16, var5 & 65535); } @@ -4695,7 +4696,7 @@ final boolean method385(PacketWriter var1) { var21 = var3.readUnsignedIntME(); var5 = var3.readUnsignedShortLE(); short var60 = (short)var3.readShort(); - var7 = var3.readUnsignedShortAdd(); + var7 = var3.readUnsignedByteAdd(); var94 = npcs[var5]; if (var94 != null) { var94.method586(var7, var21, var60); @@ -4818,7 +4819,7 @@ final boolean method385(PacketWriter var1) { } if (ServerPacket.UPDATE_RUNENERGY == var1.serverPacket) { - class18.field55 = var3.readUnsignedShortAdd(); + class18.field55 = var3.readUnsignedByteAdd(); class6.field6 = var3.readUnsignedByteSub(); var1.serverPacket = null; return true; @@ -4905,7 +4906,7 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.IF_SETTEXT == var1.serverPacket) { var21 = var3.readUnsignedIntME(); - var5 = var3.readIntIME(); + var5 = var3.readUnsignedIntIME(); InterfaceParent var86 = (InterfaceParent)interfaceParents.get((long)var5); var75 = (InterfaceParent)interfaceParents.get((long)var21); if (var75 != null) { @@ -5004,8 +5005,8 @@ final boolean method385(PacketWriter var1) { var15 = var3.readUnsignedShortLE(); var57 = var3.readByte(); var18 = var3.readUnsignedByteSub(); - var16 = var3.readUnsignedIntIME(); - var17 = var3.readUnsignedShortAdd(); + var16 = var3.readUnsignedShortAdd(); + var17 = var3.readUnsignedByteAdd(); var81 = var3.readByteAdd(); var65 = var3.readUnsignedByte() * 4; var9 = var57 + var7; @@ -5045,9 +5046,9 @@ final boolean method385(PacketWriter var1) { } if (ServerPacket.NEW_PACK_215 == var1.serverPacket) { - var21 = var3.method2602(); - var5 = var3.method2604(); - var6 = var3.readIntIME(); + var21 = var3.readShortLE(); + var5 = var3.readShortAddLE(); + var6 = var3.readUnsignedIntIME(); var22 = HealthBarDefinition.widgetDefinition.method1733(var6); if (var5 != var22.rawX || var21 != var22.rawY || var22.xAlignment != 0 || var22.yAlignment != 0) { var22.rawX = var5; @@ -5078,7 +5079,7 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.IF_SETSCROLLPOS == var1.serverPacket) { var21 = var3.method2607(); - var5 = var3.readUnsignedIntIME(); + var5 = var3.readUnsignedShortAdd(); if (var5 == 65535) { var5 = -1; } @@ -5107,7 +5108,7 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.OPEN_URL == var1.serverPacket) { var21 = var3.readUnsignedShortLE(); var5 = var3.readUnsignedShortLE(); - var6 = var3.readIntIME(); + var6 = var3.readUnsignedIntIME(); var22 = HealthBarDefinition.widgetDefinition.method1733(var6); var22.rotationKey = var5 + (var21 << 16); var1.serverPacket = null; @@ -5115,8 +5116,8 @@ final boolean method385(PacketWriter var1) { } if (ServerPacket.field2728 == var1.serverPacket) { - class18.field55 = var3.readUnsignedShortAdd(); - class6.field6 = var3.readUnsignedShortAdd(); + class18.field55 = var3.readUnsignedByteAdd(); + class6.field6 = var3.readUnsignedByteAdd(); for (var21 = class18.field55; var21 < class18.field55 + 8; ++var21) { for (var5 = class6.field6; var5 < class6.field6 + 8; ++var5) { @@ -5141,14 +5142,14 @@ final boolean method385(PacketWriter var1) { isCameraLocked = true; field400 = false; field404 = true; - Messages.field1154 = var3.readUnsignedByte(); - AbstractWorldMapData.field2045 = var3.readUnsignedByte(); - class302.field2510 = var3.readUnsignedShort(); + Messages.cameraMoveToX = var3.readUnsignedByte(); + AbstractWorldMapData.cameraMoveToY = var3.readUnsignedByte(); + class302.cameraMoveToHeight = var3.readUnsignedShort(); var21 = var3.readUnsignedShort(); var5 = var3.readUnsignedByte(); - var6 = Messages.field1154 * 128 + 64; - var7 = AbstractWorldMapData.field2045 * 128 + 64; - var8 = WorldMapDecorationType.getTileHeight(var6, var7, ItemLayer.Client_plane) - class302.field2510; + var6 = Messages.cameraMoveToX * 128 + 64; + var7 = AbstractWorldMapData.cameraMoveToY * 128 + 64; + var8 = WorldMapDecorationType.getTileHeight(var6, var7, ItemLayer.Client_plane) - class302.cameraMoveToHeight; var9 = var6 - ViewportMouse.cameraX; var23 = var8 - SecureRandomFuture.cameraY; var11 = var7 - class36.cameraZ; @@ -5204,7 +5205,7 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.NPC_INFO_SMALL == var1.serverPacket) { var9 = var3.readUnsignedShortAddLE(); - var23 = var3.readUnsignedShortAdd(); + var23 = var3.readUnsignedByteAdd(); var6 = var3.readMedium(); var21 = var6 >> 16; var5 = var6 >> 8 & 255; @@ -5234,7 +5235,7 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.field2718 == var1.serverPacket) { var21 = var3.readUnsignedIntME(); - var5 = var3.readUnsignedIntIME(); + var5 = var3.readUnsignedShortAdd(); if (var5 == 65535) { var5 = -1; } @@ -5290,14 +5291,14 @@ final boolean method385(PacketWriter var1) { isCameraLocked = false; field402 = false; field404 = false; - Messages.field1154 = 0; - AbstractWorldMapData.field2045 = 0; - class302.field2510 = 0; + Messages.cameraMoveToX = 0; + AbstractWorldMapData.cameraMoveToY = 0; + class302.cameraMoveToHeight = 0; field403 = false; - class60.cameraLookAtSpeed = 0; + class60.cameraMoveToSpeed = 0; class134.cameraMoveToAcceleration = 0; class1.cameraLookAtAcceleration = 0; - WorldMapIcon_0.cameraMoveToSpeed = 0; + WorldMapIcon_0.cameraLookAtSpeed = 0; ScriptFrame.cameraLookAtX = 0; class216.cameraLookAtY = 0; class127.cameraLookAtHeight = 0; @@ -5327,15 +5328,15 @@ final boolean method385(PacketWriter var1) { isCameraLocked = true; field400 = false; field404 = false; - Messages.field1154 = var3.readUnsignedByte(); - AbstractWorldMapData.field2045 = var3.readUnsignedByte(); - class302.field2510 = var3.readUnsignedShort(); - class60.cameraLookAtSpeed = var3.readUnsignedByte(); + Messages.cameraMoveToX = var3.readUnsignedByte(); + AbstractWorldMapData.cameraMoveToY = var3.readUnsignedByte(); + class302.cameraMoveToHeight = var3.readUnsignedShort(); + class60.cameraMoveToSpeed = var3.readUnsignedByte(); class134.cameraMoveToAcceleration = var3.readUnsignedByte(); if (class134.cameraMoveToAcceleration >= 100) { - var21 = Messages.field1154 * 128 + 64; - var5 = AbstractWorldMapData.field2045 * 128 + 64; - var6 = WorldMapDecorationType.getTileHeight(var21, var5, ItemLayer.Client_plane) - class302.field2510; + var21 = Messages.cameraMoveToX * 128 + 64; + var5 = AbstractWorldMapData.cameraMoveToY * 128 + 64; + var6 = WorldMapDecorationType.getTileHeight(var21, var5, ItemLayer.Client_plane) - class302.cameraMoveToHeight; var7 = var21 - ViewportMouse.cameraX; var8 = var6 - SecureRandomFuture.cameraY; var9 = var5 - class36.cameraZ; @@ -5358,7 +5359,7 @@ final boolean method385(PacketWriter var1) { if (ServerPacket.IF_SETHIDE == var1.serverPacket) { class396.method2042(); var21 = var3.readUnsignedByteNeg(); - var5 = var3.readIntIME(); + var5 = var3.readUnsignedIntIME(); var6 = var3.readUnsignedByte(); var7 = var3.readUnsignedByteSub(); experience[var6] = var5; @@ -5420,7 +5421,7 @@ final boolean method385(PacketWriter var1) { break; } - if (var45 == field615[var15]) { + if (var45 == crossWorldMessageIds[var15]) { var13 = true; break; } @@ -5430,8 +5431,8 @@ final boolean method385(PacketWriter var1) { } if (!var13) { - field615[field533] = var45; - field533 = (field533 + 1) % 100; + crossWorldMessageIds[crossWorldMessageIdsIndex] = var45; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; var40 = AbstractFont.escapeBrackets(class128.readString(var3)); var16 = var76 >= 0 ? 41 : 44; if (var10.modIcon != -1) { @@ -5452,7 +5453,7 @@ final boolean method385(PacketWriter var1) { var5 = -1; } - var6 = var3.readIntIME(); + var6 = var3.readUnsignedIntIME(); var7 = var3.readUnsignedShort(); if (var7 == 65535) { var7 = -1; @@ -5485,7 +5486,7 @@ final boolean method385(PacketWriter var1) { } if (ServerPacket.field2743 == var1.serverPacket) { - var21 = var3.readIntIME(); + var21 = var3.readUnsignedIntIME(); var5 = var3.readUnsignedShortLE(); var25 = HealthBarDefinition.widgetDefinition.method1733(var21); if (var25.modelType != 2 || var5 != var25.modelId) { @@ -5505,12 +5506,12 @@ final boolean method385(PacketWriter var1) { return false; } - GrandExchangeOfferWorldComparator.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1979699673 * 581410409 : -1) + "," + (var1.field1168 != null ? var1.field1168.id * 1979699673 * 581410409 : -1) + "," + (var1.field1166 != null ? var1.field1166.id * 1979699673 * 581410409 : -1) + "," + var1.serverPacketLength, (Throwable)null); + GrandExchangeOfferWorldComparator.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1168 != null ? var1.field1168.id : -1) + "," + (var1.field1166 != null ? var1.field1166.id : -1) + "," + var1.serverPacketLength, (Throwable)null); class13.method51(); } catch (IOException var47) { class9.method29(); } catch (Exception var48) { - var20 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1979699673 * 581410409 : -1) + "," + (var1.field1168 != null ? var1.field1168.id * 1979699673 * 581410409 : -1) + "," + (var1.field1166 != null ? var1.field1166.id * 1979699673 * 581410409 : -1) + "," + var1.serverPacketLength + "," + (class229.localPlayer.pathX[0] + NewShit.baseX) + "," + (class229.localPlayer.pathY[0] + class101.baseY) + ","; + var20 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1168 != null ? var1.field1168.id : -1) + "," + (var1.field1166 != null ? var1.field1166.id : -1) + "," + var1.serverPacketLength + "," + (class229.localPlayer.pathX[0] + NewShit.baseX) + "," + (class229.localPlayer.pathY[0] + class101.baseY) + ","; for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { var20 = var20 + var3.array[var6] + ","; @@ -5781,11 +5782,11 @@ final void method391() { if (draggedOnWidget != null && class227.method1165(clickedWidget) != null) { PacketBufferNode var9 = class113.getPacketBufferNode(ClientPacket.field2559, packetWriter.isaacCipher); var9.packetBuffer.writeShortAdd(clickedWidget.itemId); - var9.packetBuffer.writeIntME(draggedOnWidget.childIndex); - var9.packetBuffer.writeIntLE(clickedWidget.id); + var9.packetBuffer.writeShortAddLE(draggedOnWidget.childIndex); + var9.packetBuffer.writeIntME(clickedWidget.id); var9.packetBuffer.writeInt(draggedOnWidget.id); var9.packetBuffer.writeShortAdd(clickedWidget.childIndex); - var9.packetBuffer.writeIntME(draggedOnWidget.itemId); + var9.packetBuffer.writeShortAddLE(draggedOnWidget.itemId); packetWriter.addNode(var9); } } else if (this.shouldLeftClickOpenMenu()) { @@ -5826,7 +5827,7 @@ public Username username() { ) void method394(int var1) { if (param25 >= 216) { - PacketBufferNode var2 = class113.getPacketBufferNode(ClientPacket.OPPLAYER5, packetWriter.isaacCipher); + PacketBufferNode var2 = class113.getPacketBufferNode(ClientPacket.UNKNOWN2, packetWriter.isaacCipher); var2.packetBuffer.writeByte(var1); packetWriter.addNode(var2); } diff --git a/osrs/src/main/java/ClientPacket.java b/osrs/src/main/java/ClientPacket.java index 02f5c469d..f369171a9 100644 --- a/osrs/src/main/java/ClientPacket.java +++ b/osrs/src/main/java/ClientPacket.java @@ -46,7 +46,7 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("f5") + @Export("OPPLAYERT") public static final ClientPacket OPPLAYERT; @ObfuscatedName("ac") @ObfuscatedSignature( @@ -69,7 +69,7 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("PING_STATS") + @Export("MOVE_GAMECLICK") public static final ClientPacket MOVE_GAMECLICK; @ObfuscatedName("av") @ObfuscatedSignature( @@ -93,8 +93,8 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("f6") - public static final ClientPacket f6; + @Export("IF_BUTTONT") + public static final ClientPacket IF_BUTTONT; @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "Llq;" @@ -141,12 +141,13 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("OPLOC2") - public static final ClientPacket OPLOC2; + @Export("OPOBJ2") + public static final ClientPacket OPOBJ2; @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "Llq;" ) + @Export("OPPLAYER2") public static final ClientPacket OPPLAYER2; @ObfuscatedName("ad") @ObfuscatedSignature( @@ -158,8 +159,8 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("IF_BUTTONT") - public static final ClientPacket IF_BUTTONT; + @Export("IDLE") + public static final ClientPacket IDLE; @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "Llq;" @@ -187,7 +188,8 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - public static final ClientPacket field2558; + @Export("OPOBJ3") + public static final ClientPacket OPOBJ3; @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "Llq;" @@ -209,8 +211,8 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("WIDGET_TYPE") - public static final ClientPacket WIDGET_TYPE; + @Export("OPPLAYER5") + public static final ClientPacket OPPLAYER5; @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "Llq;" @@ -226,19 +228,20 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - public static final ClientPacket field2546; + @Export("OPOBJ4") + public static final ClientPacket OPOBJ4; @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("OPOBJ3") - public static final ClientPacket OPOBJ3; + @Export("OPOBJT") + public static final ClientPacket OPOBJT; @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("CLICK") - public static final ClientPacket CLICK; + @Export("EVENT_MOUSE_CLICK") + public static final ClientPacket EVENT_MOUSE_CLICK; @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "Llq;" @@ -302,7 +305,8 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - public static final ClientPacket OPLOC1; + @Export("OPOBJ1") + public static final ClientPacket OPOBJ1; @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "Llq;" @@ -367,13 +371,14 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("OPOBJ4") + @Export("OPLOCT") public static final ClientPacket OPLOCT; @ObfuscatedName("cl") @ObfuscatedSignature( descriptor = "Llq;" ) - public static final ClientPacket field2573; + @Export("OPLOC1") + public static final ClientPacket OPLOC1; @ObfuscatedName("cs") @ObfuscatedSignature( descriptor = "Llq;" @@ -389,8 +394,7 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("OPPLAYER5") - public static final ClientPacket OPPLAYER5; + public static final ClientPacket UNKNOWN2; @ObfuscatedName("cn") @ObfuscatedSignature( descriptor = "Llq;" @@ -412,8 +416,8 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("OPOBJ2") - public static final ClientPacket OPOBJ2; + @Export("OPOBJE") + public static final ClientPacket OPOBJE; @ObfuscatedName("cc") @ObfuscatedSignature( descriptor = "Llq;" @@ -436,8 +440,8 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("EVENT_MOUSE_CLICK") - public static final ClientPacket EVENT_MOUSE_CLICK; + @Export("OPPLAYERU") + public static final ClientPacket OPPLAYERU; @ObfuscatedName("cz") @ObfuscatedSignature( descriptor = "Llq;" @@ -477,7 +481,8 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - public static final ClientPacket field2595; + @Export("OPLOC2") + public static final ClientPacket OPLOC2; @ObfuscatedName("dd") @ObfuscatedSignature( descriptor = "Llq;" @@ -510,8 +515,7 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("OPOBJ5") - public static final ClientPacket OPOBJ5; + public static final ClientPacket NOTUSED1; @ObfuscatedName("do") @ObfuscatedSignature( descriptor = "Llq;" @@ -522,7 +526,7 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("MOVE_GAMECLICK") + @Export("OPLOC5") public static final ClientPacket OPLOC5; @ObfuscatedName("dm") @ObfuscatedSignature( @@ -575,7 +579,8 @@ public class ClientPacket implements class304 { @ObfuscatedSignature( descriptor = "Llq;" ) - public static final ClientPacket field2605; + @Export("OPOBJ5") + public static final ClientPacket OPOBJ5; @ObfuscatedName("dl") @Export("id") public final int id; @@ -598,7 +603,7 @@ public class ClientPacket implements class304 { f2 = new ClientPacket(11, -1); f20 = new ClientPacket(12, 9); OPPLAYER1 = new ClientPacket(13, 3); - f6 = new ClientPacket(14, 16); + IF_BUTTONT = new ClientPacket(14, 16); OPNPC1 = new ClientPacket(15, 3); OPNPCT = new ClientPacket(16, 11); IF_BUTTON2 = new ClientPacket(17, 8); @@ -606,24 +611,24 @@ public class ClientPacket implements class304 { IF_BUTTON4 = new ClientPacket(19, 8); IF_BUTTON5 = new ClientPacket(20, 8); IF_BUTTON9 = new ClientPacket(21, 8); - OPLOC2 = new ClientPacket(22, 7); + OPOBJ2 = new ClientPacket(22, 7); OPPLAYER2 = new ClientPacket(23, 3); f88 = new ClientPacket(24, -1); - IF_BUTTONT = new ClientPacket(25, -2); + IDLE = new ClientPacket(25, -2); f1 = new ClientPacket(26, 1); IF_BUTTON8 = new ClientPacket(27, 8); NO_TIMEOUT = new ClientPacket(28, 0); OPNPC5 = new ClientPacket(29, 3); - field2558 = new ClientPacket(30, 7); + OPOBJ3 = new ClientPacket(30, 7); IF_BUTTON3 = new ClientPacket(31, 8); f66 = new ClientPacket(32, -2); field2606 = new ClientPacket(33, 2); - WIDGET_TYPE = new ClientPacket(34, 3); + OPPLAYER5 = new ClientPacket(34, 3); FREECAM_EXIT = new ClientPacket(35, 0); field2559 = new ClientPacket(36, 16); - field2546 = new ClientPacket(37, 7); - OPOBJ3 = new ClientPacket(38, 15); - CLICK = new ClientPacket(39, 6); + OPOBJ4 = new ClientPacket(37, 7); + OPOBJT = new ClientPacket(38, 15); + EVENT_MOUSE_CLICK = new ClientPacket(39, 6); OPLOC3 = new ClientPacket(40, 7); OPPLAYER4 = new ClientPacket(41, 3); RESUME_NAMEDIALOG = new ClientPacket(42, -1); @@ -634,7 +639,7 @@ public class ClientPacket implements class304 { SOUND_SONGEND = new ClientPacket(47, 4); CLAN_KICKUSER = new ClientPacket(48, -1); IF_BUTTON7 = new ClientPacket(49, 8); - OPLOC1 = new ClientPacket(50, 7); + OPOBJ1 = new ClientPacket(50, 7); OPPLAYER7 = new ClientPacket(51, 3); f51 = new ClientPacket(52, -1); WIDGET_TYPE5 = new ClientPacket(53, 4); @@ -646,31 +651,31 @@ public class ClientPacket implements class304 { RESUME_OBJDIALOG = new ClientPacket(59, 2); f96 = new ClientPacket(60, -1); OPLOCT = new ClientPacket(61, 15); - field2573 = new ClientPacket(62, 7); + OPLOC1 = new ClientPacket(62, 7); field2580 = new ClientPacket(63, 4); OPPLAYER6 = new ClientPacket(64, 3); - OPPLAYER5 = new ClientPacket(65, 1); + UNKNOWN2 = new ClientPacket(65, 1); FRIEND_DELETE_USER = new ClientPacket(66, -1); CHAT_SEND_ABUSE_REPORT = new ClientPacket(67, -1); field2608 = new ClientPacket(68, 2); - OPOBJ2 = new ClientPacket(69, 6); + OPOBJE = new ClientPacket(69, 6); IF_BUTTON1 = new ClientPacket(70, 8); EVENT_APPLET_FOCUS = new ClientPacket(71, 1); f52 = new ClientPacket(72, -1); - EVENT_MOUSE_CLICK = new ClientPacket(73, 11); + OPPLAYERU = new ClientPacket(73, 11); field2587 = new ClientPacket(74, 11); f9 = new ClientPacket(75, 13); RESUME_PAUSEBUTTON = new ClientPacket(76, 6); CHAT_SENDPRIVATE = new ClientPacket(77, -2); REFLECTION_CHECK_REPLY = new ClientPacket(78, -1); IF_BUTTON6 = new ClientPacket(79, 8); - field2595 = new ClientPacket(80, 7); + OPLOC2 = new ClientPacket(80, 7); FIREND_ADDUSER = new ClientPacket(81, -1); field2604 = new ClientPacket(82, 15); field2593 = new ClientPacket(83, 0); OPPLAYER3 = new ClientPacket(84, 3); f65 = new ClientPacket(85, -1); - OPOBJ5 = new ClientPacket(86, -1); + NOTUSED1 = new ClientPacket(86, -1); f83 = new ClientPacket(87, -1); OPLOC5 = new ClientPacket(88, 7); f22 = new ClientPacket(89, -1); @@ -681,7 +686,7 @@ public class ClientPacket implements class304 { OPLOC4 = new ClientPacket(94, 7); OPPLAYER8 = new ClientPacket(95, 3); OPHELDD = new ClientPacket(96, 10); - field2605 = new ClientPacket(97, 7); + OPOBJ5 = new ClientPacket(97, 7); } ClientPacket(int var1, int var2) { diff --git a/osrs/src/main/java/class518.java b/osrs/src/main/java/DbTable.java similarity index 88% rename from osrs/src/main/java/class518.java rename to osrs/src/main/java/DbTable.java index b9a13cb34..f9a6a0cf7 100644 --- a/osrs/src/main/java/class518.java +++ b/osrs/src/main/java/DbTable.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,19 +8,20 @@ import java.util.Map; @ObfuscatedName("te") -public class class518 extends DualNode { +public class DbTable extends DualNode { @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "[Ltu;" ) class514[] field4139; @ObfuscatedName("ab") - List field4138; + @Export("columns") + List columns; @ObfuscatedSignature( descriptor = "(Lol;I)V" ) - public class518(AbstractArchive var1, int var2) { + public DbTable(AbstractArchive var1, int var2) { byte[] var3 = var1.takeFile(var2, 0); this.method2517(new Buffer(var3)); } @@ -27,7 +29,7 @@ public class518(AbstractArchive var1, int var2) { @ObfuscatedSignature( descriptor = "(Lol;II)V" ) - public class518(AbstractArchive var1, int var2, int var3) { + public DbTable(AbstractArchive var1, int var2, int var3) { byte[] var4 = var1.takeFile(var2, var3 + 1); this.method2517(new Buffer(var4)); } @@ -40,7 +42,7 @@ public class518(AbstractArchive var1, int var2, int var3) { void method2517(Buffer var1) { int var2 = var1.packBytesToInt(); this.field4139 = new class514[var2]; - this.field4138 = new ArrayList(var2); + this.columns = new ArrayList(var2); for (int var3 = 0; var3 < var2; ++var3) { this.field4139[var3] = (class514)class12.findEnumerated(class514.method2503(), var1.readUnsignedByte()); @@ -60,7 +62,7 @@ void method2517(Buffer var1) { var5.put(var6, var8); } - this.field4138.add(var3, var5); + this.columns.add(var3, var5); } } @@ -75,7 +77,7 @@ public List method2518(Object var1, int var2) { var2 = 0; } - Map var3 = (Map)this.field4138.get(var2); + Map var3 = (Map)this.columns.get(var2); return (List)var3.get(var1); } diff --git a/osrs/src/main/java/FadeOutTask.java b/osrs/src/main/java/FadeOutTask.java index 4d14e503f..0f9d3fcd1 100644 --- a/osrs/src/main/java/FadeOutTask.java +++ b/osrs/src/main/java/FadeOutTask.java @@ -125,7 +125,7 @@ static void method2154(int var0, int var1, int var2, int var3) { Client.isSpellSelected = true; class348.selectedSpellWidget = var0; Client.selectedSpellChildIndex = var1; - UrlRequest.field1182 = var2; + UrlRequest.selectedSpellFlags = var2; class159.invalidateWidget(var4); } } \ No newline at end of file diff --git a/osrs/src/main/java/FriendsList.java b/osrs/src/main/java/FriendsList.java index f31ac0ce2..ec26d5d01 100644 --- a/osrs/src/main/java/FriendsList.java +++ b/osrs/src/main/java/FriendsList.java @@ -141,7 +141,7 @@ public void read(Buffer var1, int var2) { if (var6 != var11.world) { var11.int2 = ++this.field3818 - 1; if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * 1393374135) * -977987065; + var11.int2 = -(var11.int2); } var11.world = var6; diff --git a/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java index b99fb6f80..04cd5d2e0 100644 --- a/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/osrs/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -56,13 +56,13 @@ static final void loadRegions(boolean var0, PacketBuffer var1, boolean var2) { if (!Client.isInInstance) { int var4; if (var2) { - var1.readShortLE(); + var1.readShortAdd(); var4 = var1.readUnsignedShort(); var3 = var1.readUnsignedShort(); var5 = var1.readUnsignedShort(); } else { var4 = var1.readUnsignedShort(); - var3 = var1.readUnsignedIntIME(); + var3 = var1.readUnsignedShortAdd(); var5 = var1.readUnsignedShort(); } @@ -93,7 +93,7 @@ static final void loadRegions(boolean var0, PacketBuffer var1, boolean var2) { class292.method1606(var3, var4, true); } else { - var3 = var1.readUnsignedIntIME(); + var3 = var1.readUnsignedShortAdd(); boolean var16 = var1.readUnsignedByte() == 1; var5 = var1.readUnsignedShort(); var6 = var1.readUnsignedShort(); diff --git a/osrs/src/main/java/Interpreter.java b/osrs/src/main/java/Interpreter.java index 4f2faffbc..567df3592 100644 --- a/osrs/src/main/java/Interpreter.java +++ b/osrs/src/main/java/Interpreter.java @@ -162,7 +162,7 @@ static final void updatePlayers(PacketBuffer var0, int var1) { var23 = var0.readUnsignedShortAddLE(); var9 = var23 >> 8; var24 = var9 >= 13 && var9 <= 20 ? var9 - 12 : 0; - PlayerType var11 = (PlayerType)class12.findEnumerated(class320.PlayerType_values(), var0.readUnsignedShortAdd()); + PlayerType var11 = (PlayerType)class12.findEnumerated(class320.PlayerType_values(), var0.readUnsignedByteAdd()); boolean var12 = var0.readUnsignedByte() == 1; var13 = var0.readUnsignedByte(); var14 = var0.offset; @@ -243,7 +243,7 @@ static final void updatePlayers(PacketBuffer var0, int var1) { for (var9 = 0; var9 < var23; ++var9) { var24 = var0.readUnsignedByteSub(); var27 = var0.readUnsignedShort(); - var32 = var0.readIntIME(); + var32 = var0.readUnsignedIntIME(); var5.updateSpotAnimation(var24, var27, var32 >> 16, var32 & 65535); } } @@ -265,7 +265,7 @@ static final void updatePlayers(PacketBuffer var0, int var1) { int var34; if ((var6 & 16) != 0) { - var23 = var0.readUnsignedShortAdd(); + var23 = var0.readUnsignedByteAdd(); if (var23 > 0) { for (var9 = 0; var9 < var23; ++var9) { var27 = -1; @@ -295,7 +295,7 @@ static final void updatePlayers(PacketBuffer var0, int var1) { var32 = var0.readUShortSmart(); if (var32 != 32767) { var13 = var0.readUShortSmart(); - var14 = var0.readUnsignedShortAdd(); + var14 = var0.readUnsignedByteAdd(); var34 = var32 > 0 ? var0.readUnsignedByteNeg() : var14; var5.addHealthBar(var27, Client.cycle, var32, var13, var14, var34); } else { @@ -306,7 +306,7 @@ static final void updatePlayers(PacketBuffer var0, int var1) { } if ((var6 & 2) != 0) { - var23 = var0.readUnsignedShortAdd(); + var23 = var0.readUnsignedByteAdd(); byte[] var28 = new byte[var23]; Buffer var31 = new Buffer(var28); var0.method2617(var28, 0, var23); @@ -336,7 +336,7 @@ static final void updatePlayers(PacketBuffer var0, int var1) { if ((var6 & 8) != 0) { var23 = var0.readUnsignedShortLE(); PlayerType var36 = (PlayerType)class12.findEnumerated(class320.PlayerType_values(), var0.readUnsignedByteSub()); - boolean var35 = var0.readUnsignedShortAdd() == 1; + boolean var35 = var0.readUnsignedByteAdd() == 1; var27 = var0.readUnsignedByte(); var32 = var0.offset; if (var5.username != null && var5.appearance != null) { diff --git a/osrs/src/main/java/InvDefinition.java b/osrs/src/main/java/InvDefinition.java index 73f5b60ef..0af106ef6 100644 --- a/osrs/src/main/java/InvDefinition.java +++ b/osrs/src/main/java/InvDefinition.java @@ -77,7 +77,7 @@ public static void method879(AbstractArchive var0, AbstractArchive var1) { garbageValue = "264426483" ) public static void method877() { - class173.field1440.clear(); + class173.e4.clear(); } @ObfuscatedName("ny") diff --git a/osrs/src/main/java/ItemComposition.java b/osrs/src/main/java/ItemComposition.java index 2d12cf837..0fa083a62 100644 --- a/osrs/src/main/java/ItemComposition.java +++ b/osrs/src/main/java/ItemComposition.java @@ -827,7 +827,7 @@ public String getStringParam(int var1, String var2) { public int getShiftClickIndex() { if (this.shiftClickIndex != -1 && this.inventoryActions != null) { if (this.shiftClickIndex >= 0) { - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 1804659871 * -1176948897 : -1; + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex : -1; } else { return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } diff --git a/osrs/src/main/java/Messages.java b/osrs/src/main/java/Messages.java index f3d39dc3f..8aee692dc 100644 --- a/osrs/src/main/java/Messages.java +++ b/osrs/src/main/java/Messages.java @@ -35,7 +35,8 @@ public class Messages { @ObfuscatedName("gk") static String field1155; @ObfuscatedName("uu") - static int field1154; + @Export("cameraLookAtX") + static int cameraMoveToX; static { Messages_channels = new HashMap(); diff --git a/osrs/src/main/java/NewShit.java b/osrs/src/main/java/NewShit.java index 94754a915..ee1197339 100644 --- a/osrs/src/main/java/NewShit.java +++ b/osrs/src/main/java/NewShit.java @@ -76,7 +76,7 @@ static Script newScript(byte[] var0) { } var2.offset = 0; - var1.field823 = var2.readStringCp1252NullTerminatedOrNull(); + var1.instructions = var2.readStringCp1252NullTerminatedOrNull(); var1.opcodes = new int[var5]; var1.intOperands = new int[var5]; var1.stringOperands = new String[var5]; diff --git a/osrs/src/main/java/ObjectSound.java b/osrs/src/main/java/ObjectSound.java index 54bf9f126..53c72d370 100644 --- a/osrs/src/main/java/ObjectSound.java +++ b/osrs/src/main/java/ObjectSound.java @@ -267,7 +267,7 @@ static int method425(int var0, Script var1, boolean var2) { ) static final void method424() { class72.method431(); - class184.field1515.clear(); + class184.e5.clear(); InvDefinition.method877(); KitDefinition.method907(); DbTableType.DBTableType_cache.clear(); @@ -281,7 +281,7 @@ static final void method424() { InvDefinition.InvDefinition_cached.clear(); class267.method1444(); WorldMapElement.HitSplatDefinition_cached2.clear(); - class185.field1516.clear(); + class185.e6.clear(); InterfaceParent.method464(); ItemComposition.ItemDefinition_cached.clear(); ItemComposition.HealthBarDefinition_cachedSprites.clear(); @@ -297,14 +297,14 @@ static final void method424() { class399.Widget_cachedModels.method2493(); Players.Widget_cachedFonts.method2493(); class189.Widget_cachedSpriteMasks.clear(); - class191.field1584.clear(); + class191.e7.clear(); VarcInt.VarcInt_cached.clear(); VarcInt.method900(); - class171.field1438.clear(); + class171.e2.clear(); class208.method1062(); class197.archive4.clear(); LoginPacket.method1643(); - class195.field1619.clear(); + class195.e8.clear(); Client.Widget_cachedModels.clear(); Client.archive11.clear(); RouteStrategy.method1150(); diff --git a/osrs/src/main/java/PacketBufferNode.java b/osrs/src/main/java/PacketBufferNode.java index 960e43a99..e51ba24de 100644 --- a/osrs/src/main/java/PacketBufferNode.java +++ b/osrs/src/main/java/PacketBufferNode.java @@ -144,7 +144,7 @@ static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { if (Client.isItemSelected == 1) { WorldMapSectionType.insertMenuItemNoShift("Use", Client.field597 + " " + "->" + " " + class167.colorStartTag(65535) + var19.name, 1, var18, var14, var25); } else if (Client.isSpellSelected) { - if ((UrlRequest.field1182 & 4) == 4) { + if ((UrlRequest.selectedSpellFlags & 4) == 4) { WorldMapSectionType.insertMenuItemNoShift(Client.field599, Client.field598 + " " + "->" + " " + class167.colorStartTag(65535) + var19.name, 2, var18, var14, var25); } } else { @@ -254,7 +254,7 @@ static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { if (Client.isItemSelected == 1) { WorldMapSectionType.insertMenuItemNoShift("Use", Client.field597 + " " + "->" + " " + class167.colorStartTag(16748608) + var38.name, 16, var34.id, var14, var25); } else if (Client.isSpellSelected) { - if ((UrlRequest.field1182 & 1) == 1) { + if ((UrlRequest.selectedSpellFlags & 1) == 1) { WorldMapSectionType.insertMenuItemNoShift(Client.field599, Client.field598 + " " + "->" + " " + class167.colorStartTag(16748608) + var38.name, 17, var34.id, var14, var25); } } else { diff --git a/osrs/src/main/java/Player.java b/osrs/src/main/java/Player.java index 4adaa9611..d5147f03c 100644 --- a/osrs/src/main/java/Player.java +++ b/osrs/src/main/java/Player.java @@ -397,7 +397,8 @@ void checkIsFriend() { descriptor = "(B)Z", garbageValue = "14" ) - boolean method485() { + @Export("isFriendsChatMember") + boolean isFriendsChatMember() { if (this.isInFriendsChat == TriBool.TriBool_unknown) { this.updateIsInFriendsChat(); } diff --git a/osrs/src/main/java/PlayerComposition.java b/osrs/src/main/java/PlayerComposition.java index da31ff725..284ecf389 100644 --- a/osrs/src/main/java/PlayerComposition.java +++ b/osrs/src/main/java/PlayerComposition.java @@ -610,8 +610,8 @@ static final void drawEntities(int var0, int var1, int var2, int var3) { var17 = (ScriptFrame.oculusOrbFocalPointY >> 7) + class101.baseY; PacketBufferNode var18 = class113.getPacketBufferNode(ClientPacket.f20, Client.packetWriter.isaacCipher); var18.packetBuffer.writeInt(Client.field367); - var18.packetBuffer.writeIntME(var16); - var18.packetBuffer.writeIntME(var17); + var18.packetBuffer.writeShortAddLE(var16); + var18.packetBuffer.writeShortAddLE(var17); var18.packetBuffer.writeByte(var15); Client.packetWriter.addNode(var18); } @@ -641,7 +641,7 @@ static final void drawEntities(int var0, int var1, int var2, int var3) { for (var16 = 0; var16 < 5; ++var16) { if (Client.cameraShaking[var16]) { - var17 = (int)(Math.random() * (double)(Client.cameraShakeIntensity[var16] * 2 + 1) - (double)Client.cameraShakeIntensity[var16] + Math.sin((double)Client.field589[var16] * ((double)Client.cameraShakeSpeed[var16] / 100.0D)) * (double)Client.cameraMoveIntensity[var16]); + var17 = (int)(Math.random() * (double)(Client.cameraShakeIntensity[var16] * 2 + 1) - (double)Client.cameraShakeIntensity[var16] + Math.sin((double)Client.cameraShakeCycle[var16] * ((double)Client.cameraShakeSpeed[var16] / 100.0D)) * (double)Client.cameraMoveIntensity[var16]); if (var16 == 0) { ViewportMouse.cameraX += var17; } diff --git a/osrs/src/main/java/Reflection.java b/osrs/src/main/java/Reflection.java deleted file mode 100644 index 9b6348085..000000000 --- a/osrs/src/main/java/Reflection.java +++ /dev/null @@ -1,161 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ObfuscatedClassMap; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.math.BigInteger; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; - -public class Reflection { - static Map> classes = new HashMap<>(); - - //These are mixed in - public static void reportFindClass(String className) {} - public static void reportFindField(Class className, String fieldName) {} - public static void reportInvoke(Method method, Object object, Object[] args) {} - - static { - ObfuscatedClassMap.INSTANCE.forEach((deobClassName, obfuscatedClassName) -> { - if (!deobClassName.contains("/") && !obfuscatedClassName.contains("/")) { - Class c = null; - try { - c = Class.forName(deobClassName); - } catch (Exception e) { - e.printStackTrace(); - } - classes.put(obfuscatedClassName, c); - } - }); - } - - public static Class findClass(String name) throws ClassNotFoundException { - Class clazz = classes.get(name); - if (clazz != null) { - reportFindClass(clazz.getName()); - return clazz; - } - return Class.forName(name); - } - - public static Field findField(Class clazz, String name) throws NoSuchFieldException { - reportFindField(clazz, name); - for (Field f : clazz.getDeclaredFields()) { - ObfuscatedName annotation = f.getAnnotation(ObfuscatedName.class); - if ((annotation != null) && annotation.value().equals(name)) { - return f; - } - } - return clazz.getDeclaredField(name); - } - - public static String getMethodName(Method method) { - ObfuscatedName annotation = method.getAnnotation(ObfuscatedName.class); - if (annotation != null) { - return annotation.value(); - } - return method.getName(); - } - - public static Class[] getParameterTypes(Method method) { - ObfuscatedSignature sig = method.getAnnotation(ObfuscatedSignature.class); - Class[] types = method.getParameterTypes(); - if (sig == null) { - return types; - } - String s = sig.descriptor(); - int i = s.lastIndexOf(')'); - char c = s.charAt(i - 1); - Class last; - switch (c) { - case 'B' : - last = byte.class; - break; - case 'I' : - last = int.class; - break; - case 'S' : - last = short.class; - break; - default : - throw new IllegalStateException();} - - types = Arrays.copyOf(types, types.length + 1); - types[types.length - 1] = last; - return types; - } - - public static int getInt(Field field, Object obj) throws IllegalArgumentException, IllegalAccessException { - boolean unset = false; - if ((field.getModifiers() & Modifier.PRIVATE) == 0) { - - - field.setAccessible(true); - unset = true; - } - int i; - try { - i = field.getInt(obj); - } catch (Exception ex) { - throw ex; - } finally { - if (unset) { - field.setAccessible(false); - } - } - ObfuscatedGetter og = field.getAnnotation(ObfuscatedGetter.class); - if (og != null) { - int getter = og.intValue(); - int setter = modInverse(getter); - - i *= setter; - } - return i; - } - - public static void setInt(Field field, Object obj, int value) throws IllegalArgumentException, IllegalAccessException { - ObfuscatedGetter og = field.getAnnotation(ObfuscatedGetter.class); - if (og != null) { - int getter = og.intValue(); - - value *= getter; - } - boolean unset = false; - if ((field.getModifiers() & Modifier.PRIVATE) == 0) { - - - field.setAccessible(true); - unset = true; - } - try { - field.setInt(obj, value); - } finally { - if (unset) { - field.setAccessible(false); - } - } - } - - public static BigInteger modInverse(BigInteger val, int bits) { - BigInteger shift = BigInteger.ONE.shiftLeft(bits); - return val.modInverse(shift); - } - - public static int modInverse(int val) { - return modInverse(BigInteger.valueOf(val), 32).intValue(); - } - - public static Object invoke(Method method, Object object, Object[] args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException { - reportInvoke(method, object, args); - try { - return method.invoke(object, args); - } catch (Throwable ex) { - throw ex; - } - } -} \ No newline at end of file diff --git a/osrs/src/main/java/ReflectionCheck.java b/osrs/src/main/java/ReflectionCheck.java index a23f0ed1e..9b3297368 100644 --- a/osrs/src/main/java/ReflectionCheck.java +++ b/osrs/src/main/java/ReflectionCheck.java @@ -103,12 +103,12 @@ static int method186(int var0, Script var1, boolean var2) { class336 var4; if (var0 == 1617) { var4 = var3.method1872(); - Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2923 * 1307671165 * -2042671403 : 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2923 : 0; } if (var0 == 1618) { var4 = var3.method1872(); - Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2921 * -1246608637 * -1141194837 : 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2921 : 0; return 1; } else if (var0 == 1619) { var7 = var3.method1871(); @@ -116,7 +116,7 @@ static int method186(int var0, Script var1, boolean var2) { return 1; } else if (var0 == 1620) { var4 = var3.method1872(); - Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2922 * -1028807547 * -113724339 : 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2922 : 0; return 1; } else if (var0 == 1621) { var7 = var3.method1871(); diff --git a/osrs/src/main/java/Scene.java b/osrs/src/main/java/Scene.java index 697da48ea..309399f5a 100644 --- a/osrs/src/main/java/Scene.java +++ b/osrs/src/main/java/Scene.java @@ -668,7 +668,8 @@ public void method1473(int var1, int var2, int var3, int var4) { } @ObfuscatedName("am") - public void method1474(int var1, int var2, int var3) { + @Export("removeBoundaryObject") + public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { var4.boundaryObject = null; diff --git a/osrs/src/main/java/Script.java b/osrs/src/main/java/Script.java index 39f75ac54..213e6171a 100644 --- a/osrs/src/main/java/Script.java +++ b/osrs/src/main/java/Script.java @@ -13,7 +13,7 @@ public class Script extends DualNode { @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; @ObfuscatedName("ah") - String field823; + String instructions; @ObfuscatedName("ar") @Export("opcodes") int[] opcodes; diff --git a/osrs/src/main/java/ScriptOpcodes.java b/osrs/src/main/java/ScriptOpcodes.java new file mode 100644 index 000000000..a91a3cebd --- /dev/null +++ b/osrs/src/main/java/ScriptOpcodes.java @@ -0,0 +1,3 @@ +public class ScriptOpcodes { + public static final int RUNELITE_EXECUTE = 6599; +} \ No newline at end of file diff --git a/osrs/src/main/java/Skills.java b/osrs/src/main/java/Skills.java index 8c19d2d89..bbaf0b68c 100644 --- a/osrs/src/main/java/Skills.java +++ b/osrs/src/main/java/Skills.java @@ -51,7 +51,7 @@ public static IndexedSprite[] method1895(AbstractArchive var0, String var1, Stri if (!var6) { var5 = null; } else { - var5 = class518.method2519(); + var5 = DbTable.method2519(); } return var5; diff --git a/osrs/src/main/java/SoundSystem.java b/osrs/src/main/java/SoundSystem.java index 381797bc9..bc4d16547 100644 --- a/osrs/src/main/java/SoundSystem.java +++ b/osrs/src/main/java/SoundSystem.java @@ -637,7 +637,7 @@ static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var29 = var10.getFont(HealthBarDefinition.widgetDefinition); if (var29 != null) { Client.field649.method2712(var12, var13, var10.width, var10.height, var37.method1816(), var37.method1817(), var37.method1813(), var37.method1814(), var37.method1812()); - var22 = var10.textShadowed ? var10.spriteShadow * -457439149 * -1616413733 : -1; + var22 = var10.textShadowed ? var10.spriteShadow : -1; if (!var37.method1810() && var37.method1807().method2053()) { Client.field649.method2713(var35.field2922, var22, var35.field2923, var35.field2921); Client.field649.method2714(var37.method1808(), var29); diff --git a/osrs/src/main/java/TextureProvider.java b/osrs/src/main/java/TextureProvider.java index e3552e798..81432da29 100644 --- a/osrs/src/main/java/TextureProvider.java +++ b/osrs/src/main/java/TextureProvider.java @@ -244,13 +244,13 @@ static final void method1529() { Client.isCameraLocked = false; Client.field402 = false; Client.field404 = false; - Messages.field1154 = 0; - AbstractWorldMapData.field2045 = 0; - class302.field2510 = 0; - class60.cameraLookAtSpeed = 0; + Messages.cameraMoveToX = 0; + AbstractWorldMapData.cameraMoveToY = 0; + class302.cameraMoveToHeight = 0; + class60.cameraMoveToSpeed = 0; class134.cameraMoveToAcceleration = 0; class1.cameraLookAtAcceleration = 0; - WorldMapIcon_0.cameraMoveToSpeed = 0; + WorldMapIcon_0.cameraLookAtSpeed = 0; ScriptFrame.cameraLookAtX = 0; class216.cameraLookAtY = 0; class127.cameraLookAtHeight = 0; diff --git a/osrs/src/main/java/UrlRequest.java b/osrs/src/main/java/UrlRequest.java index cdebd61b0..53c5948fd 100644 --- a/osrs/src/main/java/UrlRequest.java +++ b/osrs/src/main/java/UrlRequest.java @@ -19,7 +19,8 @@ public class UrlRequest { @Export("headIconPkSprites") static SpritePixels[] headIconPkSprites; @ObfuscatedName("pr") - static int field1182; + @Export("selectedSpellFlags") + static int selectedSpellFlags; @ObfuscatedName("at") final URL field1184; @ObfuscatedName("ao") diff --git a/osrs/src/main/java/UserComparator4.java b/osrs/src/main/java/UserComparator4.java index 06593d5f5..0badcbfe5 100644 --- a/osrs/src/main/java/UserComparator4.java +++ b/osrs/src/main/java/UserComparator4.java @@ -241,10 +241,10 @@ static final void method667(int var0, int var1) { descriptor = "(II)Lte;", garbageValue = "-125616841" ) - static class518 method668(int var0) { - class518 var1 = (class518)Client.archive11.get((long)var0); + static DbTable method668(int var0) { + DbTable var1 = (DbTable)Client.archive11.get((long)var0); if (var1 == null) { - var1 = new class518(class267.field2224, var0); + var1 = new DbTable(class267.field2224, var0); } return var1; diff --git a/osrs/src/main/java/UserComparator8.java b/osrs/src/main/java/UserComparator8.java index 6b34d49b3..5d28540c2 100644 --- a/osrs/src/main/java/UserComparator8.java +++ b/osrs/src/main/java/UserComparator8.java @@ -62,8 +62,8 @@ public static void method670(AbstractArchive var0, AbstractArchive var1) { descriptor = "(IIII)Ldc;", garbageValue = "853776255" ) - @Export("ifOpenSub") - static final InterfaceParent ifOpenSub(int var0, int var1, int var2) { + @Export("openInterface") + static final InterfaceParent openInterface(int var0, int var1, int var2) { InterfaceParent var3 = new InterfaceParent(); var3.group = var1; var3.type = var2; diff --git a/osrs/src/main/java/Widget.java b/osrs/src/main/java/Widget.java index e4a1c1067..5dd8d8269 100644 --- a/osrs/src/main/java/Widget.java +++ b/osrs/src/main/java/Widget.java @@ -1194,7 +1194,7 @@ public SpriteMask method1851(WidgetDefinition var1, boolean var2) { var2 = false; } - int var3 = var2 ? this.spriteId * -1029572693 * -2036249853 : this.spriteId2 * -1780213167 * 277573297; + int var3 = var2 ? this.spriteId : this.spriteId2; if (var3 == -1) { return null; } else { diff --git a/osrs/src/main/java/World.java b/osrs/src/main/java/World.java index b40f6b03d..63372ff42 100644 --- a/osrs/src/main/java/World.java +++ b/osrs/src/main/java/World.java @@ -381,7 +381,7 @@ static int method407(int var0, Script var1, boolean var2) { return 1; } else if (var0 == 3140) { Client.field505 = 3; - Client.field499 = var2 ? Interpreter.scriptDotWidget.id * 898987495 * 225496535 : HealthBar.scriptActiveWidget.id * 898987495 * 225496535; + Client.field499 = var2 ? Interpreter.scriptDotWidget.id : HealthBar.scriptActiveWidget.id ; return 1; } else { boolean var15; diff --git a/osrs/src/main/java/WorldMap.java b/osrs/src/main/java/WorldMap.java index 2ee995b99..f4f2b7e39 100644 --- a/osrs/src/main/java/WorldMap.java +++ b/osrs/src/main/java/WorldMap.java @@ -393,8 +393,8 @@ void method2401(int var1, int var2, boolean var3, long var4) { var13 = this.mouseCoord.plane; PacketBufferNode var14 = class113.getPacketBufferNode(ClientPacket.f20, Client.packetWriter.isaacCipher); var14.packetBuffer.writeInt(0); - var14.packetBuffer.writeIntME(var16); - var14.packetBuffer.writeIntME(var12); + var14.packetBuffer.writeShortAddLE(var16); + var14.packetBuffer.writeShortAddLE(var12); var14.packetBuffer.writeByte(var13); Client.packetWriter.addNode(var14); } else { @@ -409,7 +409,7 @@ void method2401(int var1, int var2, boolean var3, long var4) { if (var11) { PacketBufferNode var15 = class113.getPacketBufferNode(ClientPacket.field2580, Client.packetWriter.isaacCipher); - var15.packetBuffer.writeIntIME(this.mouseCoord.packed()); + var15.packetBuffer.writeIntLE(this.mouseCoord.packed()); Client.packetWriter.addNode(var15); this.field4052 = 0L; } diff --git a/osrs/src/main/java/WorldMapAreaData.java b/osrs/src/main/java/WorldMapAreaData.java index 7df242288..88d2336ed 100644 --- a/osrs/src/main/java/WorldMapAreaData.java +++ b/osrs/src/main/java/WorldMapAreaData.java @@ -203,7 +203,7 @@ static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, } if (var1 == 0) { - class36.scene.method1474(var0, var2, var3); + class36.scene.removeBoundaryObject(var0, var2, var3); if (var14.interactType != 0) { Client.collisionMaps[var0].method1142(var2, var3, var45, var46, var14.boolean1); } @@ -241,7 +241,7 @@ static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, Scene var47 = class36.scene; CollisionMap var37 = Client.collisionMaps[var0]; ObjectComposition var38 = WorldMapSection2.getObjectDefinition(var4); - var17 = var7 >= 0 ? var7 : var38.animationId * -1341489307 * 1434557037; + var17 = var7 >= 0 ? var7 : var38.animationId ; if (var5 != 1 && var5 != 3) { var18 = var38.sizeX; var19 = var38.sizeY; diff --git a/osrs/src/main/java/WorldMapCacheName.java b/osrs/src/main/java/WorldMapCacheName.java index 0a806a4d7..c35c2b3ca 100644 --- a/osrs/src/main/java/WorldMapCacheName.java +++ b/osrs/src/main/java/WorldMapCacheName.java @@ -313,7 +313,7 @@ static void method1354() { if (!var4) { var31 = null; } else { - var31 = class518.method2519(); + var31 = DbTable.method2519(); } VarpDefinition.mapSceneSprites = var31; @@ -371,7 +371,7 @@ static void method1354() { if (!var4) { var31 = null; } else { - var31 = class518.method2519(); + var31 = DbTable.method2519(); } class31.scrollBarSprites = var31; @@ -393,7 +393,7 @@ static void method1354() { if (!var4) { var31 = null; } else { - var31 = class518.method2519(); + var31 = DbTable.method2519(); } class134.field1307 = var31; diff --git a/osrs/src/main/java/WorldMapElement.java b/osrs/src/main/java/WorldMapElement.java index 00a90a247..6183255af 100644 --- a/osrs/src/main/java/WorldMapElement.java +++ b/osrs/src/main/java/WorldMapElement.java @@ -235,7 +235,7 @@ public void method894() { ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1 * 1450652377 * -351523479; + int var2 = this.sprite1 ; return this.getSprite(var2); } diff --git a/osrs/src/main/java/WorldMapIcon_0.java b/osrs/src/main/java/WorldMapIcon_0.java index 3e0844cae..3de2a5379 100644 --- a/osrs/src/main/java/WorldMapIcon_0.java +++ b/osrs/src/main/java/WorldMapIcon_0.java @@ -8,7 +8,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("ul") @Export("cameraMoveSpeed") - static int cameraMoveToSpeed; + static int cameraLookAtSpeed; @ObfuscatedName("at") @Export("element") final int element; diff --git a/osrs/src/main/java/WorldMapLabelSize.java b/osrs/src/main/java/WorldMapLabelSize.java index e2e7689a5..d67a27a3b 100644 --- a/osrs/src/main/java/WorldMapLabelSize.java +++ b/osrs/src/main/java/WorldMapLabelSize.java @@ -133,7 +133,7 @@ static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { String var5 = var0.method578(); int var6; if (var4.combatLevel != 0 && var0.combatLevelChange != 0) { - var6 = var0.combatLevelChange != -1 ? var0.combatLevelChange * -1350642785 * -375551905 : var4.combatLevel * 550789923 * -1916672885; + var6 = var0.combatLevelChange != -1 ? var0.combatLevelChange : var4.combatLevel ; var5 = var5 + class28.method126(var6, class229.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; } @@ -144,7 +144,7 @@ static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { if (Client.isItemSelected == 1) { WorldMapSectionType.insertMenuItemNoShift("Use", Client.field597 + " " + "->" + " " + class167.colorStartTag(16776960) + var5, 7, var1, var2, var3); } else if (Client.isSpellSelected) { - if ((UrlRequest.field1182 & 2) == 2) { + if ((UrlRequest.selectedSpellFlags & 2) == 2) { WorldMapSectionType.insertMenuItemNoShift(Client.field599, Client.field598 + " " + "->" + " " + class167.colorStartTag(16776960) + var5, 8, var1, var2, var3); } } else { diff --git a/osrs/src/main/java/class10.java b/osrs/src/main/java/class10.java index 0ebc01fba..cdbc9b7cf 100644 --- a/osrs/src/main/java/class10.java +++ b/osrs/src/main/java/class10.java @@ -280,8 +280,8 @@ public static boolean isCharAlphabetic(char var0) { @Export("resumePauseWidget") static void resumePauseWidget(int var0, int var1) { PacketBufferNode var2 = class113.getPacketBufferNode(ClientPacket.RESUME_PAUSEBUTTON, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeIntLE(var0); - var2.packetBuffer.writeIntME(var1); + var2.packetBuffer.writeIntME(var0); + var2.packetBuffer.writeShortAddLE(var1); Client.packetWriter.addNode(var2); } } \ No newline at end of file diff --git a/osrs/src/main/java/class106.java b/osrs/src/main/java/class106.java index c2503af4c..e7b1f0a0c 100644 --- a/osrs/src/main/java/class106.java +++ b/osrs/src/main/java/class106.java @@ -99,13 +99,13 @@ static final void processZoneOperation(ZoneOperation var0) { var2 = var1.readUnsignedByte(); var3 = (var2 >> 4 & 7) + class18.field55; var4 = (var2 & 7) + class6.field6; - var5 = var1.readUnsignedShortAdd(); + var5 = var1.readUnsignedByteAdd(); var6 = var1.readUnsignedShortAddLE(); - var1.readUnsignedIntIME(); + var1.readUnsignedShortAdd(); var1.readUnsignedByteNeg(); var7 = var1.readInt(); var1.readUnsignedByteSub(); - var1.readUnsignedIntIME(); + var1.readUnsignedShortAdd(); if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { var31 = new TileItem(); var31.id = var6; @@ -125,7 +125,7 @@ static final void processZoneOperation(ZoneOperation var0) { var3 = var2 >> 4 & 15; var4 = var2 & 7; var5 = var1.readUnsignedByteSub(); - var6 = var1.readUnsignedIntIME(); + var6 = var1.readUnsignedShortAdd(); var7 = var1.readUnsignedByteSub(); var8 = (var7 >> 4 & 7) + class18.field55; var9 = (var7 & 7) + class6.field6; @@ -174,14 +174,14 @@ static final void processZoneOperation(ZoneOperation var0) { if (ZoneOperation.OBJ_COUNT == var0) { var2 = var1.readUnsignedByteNeg(); var38 = var1.readByteAdd(); - var4 = var1.readUnsignedIntIME(); + var4 = var1.readUnsignedShortAdd(); var5 = var1.readUnsignedByteSub(); var6 = var1.readUnsignedByteSub() * 4; var7 = var1.readUnsignedByte(); var8 = (var7 >> 4 & 7) + class18.field55; var9 = (var7 & 7) + class6.field6; var10 = var1.readUnsignedShortLE(); - var11 = var1.readUnsignedByteAdd(); + var11 = var1.notRUBA(); var12 = var1.method2608(); byte var44 = var1.readByteNeg(); var14 = var1.readUnsignedByteSub() * 4; @@ -201,11 +201,11 @@ static final void processZoneOperation(ZoneOperation var0) { } else { NodeDeque var33; if (ZoneOperation.LOC_ANIM == var0) { - var2 = var1.readUnsignedShortAdd(); + var2 = var1.readUnsignedByteAdd(); var3 = (var2 >> 4 & 7) + class18.field55; var4 = (var2 & 7) + class6.field6; var5 = var1.readUnsignedShortLE(); - var6 = var1.readUnsignedShortAdd(); + var6 = var1.readUnsignedByteAdd(); if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { var33 = Client.groundItems[ItemLayer.Client_plane][var3][var4]; if (var33 != null) { @@ -228,9 +228,9 @@ static final void processZoneOperation(ZoneOperation var0) { var7 = var1.readUnsignedByteNeg(); var8 = (var7 >> 4 & 7) + class18.field55; var9 = (var7 & 7) + class6.field6; - var10 = var1.readUnsignedIntIME(); + var10 = var1.readUnsignedShortAdd(); var11 = var1.readUnsignedShortAddLE(); - var12 = var1.readUnsignedShortAdd(); + var12 = var1.readUnsignedByteAdd(); var13 = var12 >> 2; var14 = var12 & 3; var15 = Client.field652[var13]; @@ -293,10 +293,10 @@ static final void processZoneOperation(ZoneOperation var0) { } if (ZoneOperation.PREFETCH_GAMEOBJECTS == var0) { - var2 = var1.readUnsignedShortAdd(); + var2 = var1.readUnsignedByteAdd(); var3 = (var2 >> 4 & 7) + class18.field55; var4 = (var2 & 7) + class6.field6; - var5 = var1.readUnsignedShortAdd(); + var5 = var1.readUnsignedByteAdd(); var6 = var5 >> 2; var7 = var5 & 3; var8 = Client.field652[var6]; @@ -310,12 +310,12 @@ static final void processZoneOperation(ZoneOperation var0) { var4 = (var3 >> 4 & 7) + class18.field55; var5 = (var3 & 7) + class6.field6; var6 = var1.readUnsignedShort(); - var7 = var1.readUnsignedShortAdd() * 4; + var7 = var1.readUnsignedByteAdd() * 4; byte var41 = var1.readByteSub(); var9 = var1.readUnsignedByteNeg(); var10 = var1.readUnsignedByteNeg() * 4; var11 = var1.readUnsignedShortAddLE(); - var12 = var1.readUnsignedByteAdd(); + var12 = var1.notRUBA(); var13 = var1.readUnsignedShortLE(); var14 = var1.method2609(); byte var45 = var1.readByteAdd(); @@ -332,10 +332,10 @@ static final void processZoneOperation(ZoneOperation var0) { } } else if (ZoneOperation.OBJ_DEL == var0) { - var2 = var1.readUnsignedByteAdd(); + var2 = var1.notRUBA(); var3 = var1.readUnsignedShortAddLE(); var4 = var1.readUnsignedByte(); - var5 = var1.readUnsignedShortAdd(); + var5 = var1.readUnsignedByteAdd(); var6 = (var5 >> 4 & 7) + class18.field55; var7 = (var5 & 7) + class6.field6; var8 = var1.readUnsignedByte() * 4; @@ -344,7 +344,7 @@ static final void processZoneOperation(ZoneOperation var0) { byte var42 = var1.readByteAdd(); byte var43 = var1.readByteNeg(); var13 = var1.readUnsignedByteSub(); - var14 = var1.readUnsignedShortAdd() * 4; + var14 = var1.readUnsignedByteAdd() * 4; var11 = var42 + var6; var12 = var43 + var7; if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var11 >= 0 && var12 >= 0 && var11 < 104 && var12 < 104 && var10 != 65535) { @@ -362,7 +362,7 @@ static final void processZoneOperation(ZoneOperation var0) { var3 = var2 >> 2; var4 = var2 & 3; var5 = Client.field652[var3]; - var6 = var1.readUnsignedIntIME(); + var6 = var1.readUnsignedShortAdd(); var7 = var1.readUnsignedByteSub(); var8 = (var7 >> 4 & 7) + class18.field55; var9 = (var7 & 7) + class6.field6; @@ -429,7 +429,7 @@ static final void processZoneOperation(ZoneOperation var0) { } else if (ZoneOperation.field2622 == var0) { var2 = var1.readUnsignedShort(); var3 = var1.readUnsignedByteSub(); - var4 = var1.readUnsignedIntIME(); + var4 = var1.readUnsignedShortAdd(); var5 = var1.readUnsignedByteSub(); var6 = (var5 >> 4 & 7) + class18.field55; var7 = (var5 & 7) + class6.field6; @@ -441,7 +441,7 @@ static final void processZoneOperation(ZoneOperation var0) { } } else if (ZoneOperation.field2625 == var0) { - var2 = var1.readIntIME(); + var2 = var1.readUnsignedIntIME(); var3 = var1.readUnsignedByte(); var4 = (var3 >> 4 & 7) + class18.field55; var5 = (var3 & 7) + class6.field6; diff --git a/osrs/src/main/java/class132.java b/osrs/src/main/java/class132.java index fdd071221..8b494caf1 100644 --- a/osrs/src/main/java/class132.java +++ b/osrs/src/main/java/class132.java @@ -120,8 +120,8 @@ static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { ) @Export("revalidateWidgetScroll") static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -1611690517 * -1314049341 : var1.width * -1042121905 * -445269073; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -987590619 * -306771027 : var1.height * -141414333 * 809475179; + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height; UrlRequest.resizeInterface(var0, var1.id, var3, var4, var2); if (var1.children != null) { UrlRequest.resizeInterface(var1.children, var1.id, var3, var4, var2); diff --git a/osrs/src/main/java/class145.java b/osrs/src/main/java/class145.java index 55a9c5563..0d61cb0ce 100644 --- a/osrs/src/main/java/class145.java +++ b/osrs/src/main/java/class145.java @@ -57,7 +57,7 @@ void vmethod3248(ClanSettings var1) { garbageValue = "-7051987" ) public static void method764() { - class172.field1439.clear(); + class172.e3.clear(); } @ObfuscatedName("ao") diff --git a/osrs/src/main/java/class149.java b/osrs/src/main/java/class149.java index e7a397bff..0961dd8f6 100644 --- a/osrs/src/main/java/class149.java +++ b/osrs/src/main/java/class149.java @@ -74,107 +74,107 @@ public static HitSplatDefinition method776(int var0) { descriptor = "(ILdt;ZI)I", garbageValue = "1559513020" ) - static int method779(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return class47.method244(var0, var1, var2); - } else if (var0 < 1100) { - return WidgetDefinition.method1738(var0, var1, var2); - } else if (var0 < 1200) { - return class357.method1899(var0, var1, var2); - } else if (var0 < 1300) { - return class426.method2177(var0, var1, var2); - } else if (var0 < 1400) { - return WorldMapRectangle.method1327(var0, var1, var2); - } else if (var0 < 1500) { - return class1.method3(var0, var1, var2); - } else if (var0 < 1600) { - return ClanChannelMember.method768(var0, var1, var2); - } else if (var0 < 1700) { - return ReflectionCheck.method186(var0, var1, var2); - } else if (var0 < 1800) { - return class30.method133(var0, var1, var2); - } else if (var0 < 1900) { - return ItemComposition.method1031(var0, var1, var2); - } else if (var0 < 2000) { - return UserComparator6.method689(var0, var1, var2); - } else if (var0 < 2100) { - return WidgetDefinition.method1738(var0, var1, var2); - } else if (var0 < 2200) { - return class357.method1899(var0, var1, var2); - } else if (var0 < 2300) { - return class426.method2177(var0, var1, var2); - } else if (var0 < 2400) { - return WorldMapRectangle.method1327(var0, var1, var2); - } else if (var0 < 2500) { - return class1.method3(var0, var1, var2); - } else if (var0 < 2600) { - return class168.method874(var0, var1, var2); - } else if (var0 < 2700) { - return class60.method338(var0, var1, var2); - } else if (var0 < 2800) { - return FloorOverlayDefinition.method1038(var0, var1, var2); - } else if (var0 < 2900) { - return UrlRequester.method651(var0, var1, var2); - } else if (var0 < 3000) { - return UserComparator6.method689(var0, var1, var2); - } else if (var0 < 3200) { - return World.method407(var0, var1, var2); - } else if (var0 < 3300) { - return class159.method837(var0, var1, var2); - } else if (var0 < 3400) { - return class463.method2335(var0, var1, var2); - } else if (var0 < 3500) { - return ApproximateRouteStrategy.method356(var0, var1, var2); - } else if (var0 < 3600) { - return RouteStrategy.method1151(var0, var1, var2); - } else if (var0 < 3700) { - return class350.method1890(var0, var1, var2); - } else if (var0 < 3800) { - return SequenceDefinition.method1055(var0, var1, var2); - } else if (var0 < 3900) { - return WorldMapRectangle.method1328(var0, var1, var2); - } else if (var0 < 4000) { - return Actor.method517(var0, var1, var2); - } else if (var0 < 4100) { - return class422.method2168(var0, var1, var2); - } else if (var0 < 4200) { - return ArchiveDiskAction.method1909(var0, var1, var2); - } else if (var0 < 4300) { - return ObjectSound.method425(var0, var1, var2); - } else if (var0 < 5100) { - return class12.method48(var0, var1, var2); - } else if (var0 < 5400) { - return class72.method434(var0, var1, var2); - } else if (var0 < 5600) { - return SoundSystem.method232(var0, var1, var2); - } else if (var0 < 5700) { - return UserComparator9.method682(var0, var1, var2); - } else if (var0 < 6300) { - return class134.method732(var0, var1, var2); - } else if (var0 < 6600) { - return class138.method738(var0, var1, var2); - } else if (var0 < 6700) { - return SecureRandomCallable.method458(var0, var1, var2); - } else if (var0 < 6800) { - return class344.method1878(var0, var1, var2); - } else if (var0 < 6900) { - return class17.method62(var0, var1, var2); - } else if (var0 < 7000) { - return VerticalAlignment.method959(var0, var1, var2); - } else if (var0 < 7100) { - return class148.method775(var0, var1, var2); - } else if (var0 < 7200) { - return class158.method833(var0, var1, var2); - } else if (var0 < 7300) { - return ScriptEvent.method468(var0, var1, var2); - } else if (var0 < 7500) { - return class147.method771(var0, var1, var2); - } else if (var0 < 7600) { - return class59.method333(var0, var1, var2); - } else if (var0 < 7700) { - return class12.method49(var0, var1, var2); + static int opCodeCheck(int opCode, Script var1, boolean var2) { + if (opCode < 1000) { + return class47.method244(opCode, var1, var2); + } else if (opCode < 1100) { + return WidgetDefinition.method1738(opCode, var1, var2); + } else if (opCode < 1200) { + return class357.method1899(opCode, var1, var2); + } else if (opCode < 1300) { + return class426.method2177(opCode, var1, var2); + } else if (opCode < 1400) { + return WorldMapRectangle.method1327(opCode, var1, var2); + } else if (opCode < 1500) { + return class1.method3(opCode, var1, var2); + } else if (opCode < 1600) { + return ClanChannelMember.method768(opCode, var1, var2); + } else if (opCode < 1700) { + return ReflectionCheck.method186(opCode, var1, var2); + } else if (opCode < 1800) { + return class30.method133(opCode, var1, var2); + } else if (opCode < 1900) { + return ItemComposition.method1031(opCode, var1, var2); + } else if (opCode < 2000) { + return UserComparator6.method689(opCode, var1, var2); + } else if (opCode < 2100) { + return WidgetDefinition.method1738(opCode, var1, var2); + } else if (opCode < 2200) { + return class357.method1899(opCode, var1, var2); + } else if (opCode < 2300) { + return class426.method2177(opCode, var1, var2); + } else if (opCode < 2400) { + return WorldMapRectangle.method1327(opCode, var1, var2); + } else if (opCode < 2500) { + return class1.method3(opCode, var1, var2); + } else if (opCode < 2600) { + return class168.method874(opCode, var1, var2); + } else if (opCode < 2700) { + return class60.method338(opCode, var1, var2); + } else if (opCode < 2800) { + return FloorOverlayDefinition.method1038(opCode, var1, var2); + } else if (opCode < 2900) { + return UrlRequester.method651(opCode, var1, var2); + } else if (opCode < 3000) { + return UserComparator6.method689(opCode, var1, var2); + } else if (opCode < 3200) { + return World.method407(opCode, var1, var2); + } else if (opCode < 3300) { + return class159.method837(opCode, var1, var2); + } else if (opCode < 3400) { + return class463.method2335(opCode, var1, var2); + } else if (opCode < 3500) { + return ApproximateRouteStrategy.method356(opCode, var1, var2); + } else if (opCode < 3600) { + return RouteStrategy.method1151(opCode, var1, var2); + } else if (opCode < 3700) { + return class350.method1890(opCode, var1, var2); + } else if (opCode < 3800) { + return SequenceDefinition.method1055(opCode, var1, var2); + } else if (opCode < 3900) { + return WorldMapRectangle.method1328(opCode, var1, var2); + } else if (opCode < 4000) { + return Actor.method517(opCode, var1, var2); + } else if (opCode < 4100) { + return class422.method2168(opCode, var1, var2); + } else if (opCode < 4200) { + return ArchiveDiskAction.method1909(opCode, var1, var2); + } else if (opCode < 4300) { + return ObjectSound.method425(opCode, var1, var2); + } else if (opCode < 5100) { + return class12.method48(opCode, var1, var2); + } else if (opCode < 5400) { + return class72.method434(opCode, var1, var2); + } else if (opCode < 5600) { + return SoundSystem.method232(opCode, var1, var2); + } else if (opCode < 5700) { + return UserComparator9.method682(opCode, var1, var2); + } else if (opCode < 6300) { + return class134.method732(opCode, var1, var2); + } else if (opCode < 6600) { + return class138.method738(opCode, var1, var2); + } else if (opCode < 6700) { + return SecureRandomCallable.method458(opCode, var1, var2); + } else if (opCode < 6800) { + return class344.method1878(opCode, var1, var2); + } else if (opCode < 6900) { + return class17.method62(opCode, var1, var2); + } else if (opCode < 7000) { + return VerticalAlignment.method959(opCode, var1, var2); + } else if (opCode < 7100) { + return class148.method775(opCode, var1, var2); + } else if (opCode < 7200) { + return class158.method833(opCode, var1, var2); + } else if (opCode < 7300) { + return ScriptEvent.method468(opCode, var1, var2); + } else if (opCode < 7500) { + return class147.method771(opCode, var1, var2); + } else if (opCode < 7600) { + return class59.method333(opCode, var1, var2); + } else if (opCode < 7700) { + return class12.method49(opCode, var1, var2); } else { - return var0 < 8100 ? ModelData0.method1599(var0, var1, var2) : 2; + return opCode < 8100 ? ModelData0.method1599(opCode, var1, var2) : 2; } } diff --git a/osrs/src/main/java/class157.java b/osrs/src/main/java/class157.java index 07bfa62f3..d9c192153 100644 --- a/osrs/src/main/java/class157.java +++ b/osrs/src/main/java/class157.java @@ -65,6 +65,7 @@ void vmethod3239(ClanChannel var1) { ) @Export("runScriptEvent") public static void runScriptEvent(ScriptEvent var0) { + class323.runScript(var0, 500000, 475000); } diff --git a/osrs/src/main/java/class168.java b/osrs/src/main/java/class168.java index 21832f074..cd522956e 100644 --- a/osrs/src/main/java/class168.java +++ b/osrs/src/main/java/class168.java @@ -82,10 +82,11 @@ static int method874(int var0, Script var1, boolean var2) { descriptor = "(II)Lte;", garbageValue = "-847126653" ) - static class518 method875(int var0) { - class518 var1 = (class518)Client.Widget_cachedModels.get((long)var0); + @Export("getDbTable") + static DbTable getDbTable(int var0) { + DbTable var1 = (DbTable)Client.Widget_cachedModels.get((long)var0); if (var1 == null) { - var1 = new class518(class267.field2224, SequenceDefinition.method1041(var0), ZoneOperation.method1630(var0)); + var1 = new DbTable(class267.field2224, SequenceDefinition.method1041(var0), ZoneOperation.method1630(var0)); Client.Widget_cachedModels.put(var1, (long)var0); } diff --git a/osrs/src/main/java/class171.java b/osrs/src/main/java/class171.java index 16a9e6be7..d947f62bf 100644 --- a/osrs/src/main/java/class171.java +++ b/osrs/src/main/java/class171.java @@ -8,10 +8,11 @@ public class class171 extends DualNode { @ObfuscatedSignature( descriptor = "Llk;" ) - public static EvictingDualNodeHashTable field1438; + @Export("e2") + public static EvictingDualNodeHashTable e2; static { - field1438 = new EvictingDualNodeHashTable(64); + e2 = new EvictingDualNodeHashTable(64); } @ObfuscatedName("jy") @@ -156,7 +157,7 @@ static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4 boolean var78 = var77 || AbstractByteArrayCopier.method1879() && var92.isFriend(); if (!var78) { boolean var79 = (Client.drawPlayerNames & 2) != 0; - var78 = var79 && var92.method485(); + var78 = var79 && var92.isFriendsChatMember(); } var76 = var78; diff --git a/osrs/src/main/java/class172.java b/osrs/src/main/java/class172.java index e5394ee04..14090b8ee 100644 --- a/osrs/src/main/java/class172.java +++ b/osrs/src/main/java/class172.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,10 +8,11 @@ public class class172 extends DualNode { @ObfuscatedSignature( descriptor = "Llk;" ) - static EvictingDualNodeHashTable field1439; + @Export("e3") + static EvictingDualNodeHashTable e3; static { - field1439 = new EvictingDualNodeHashTable(64); + e3 = new EvictingDualNodeHashTable(64); } @ObfuscatedName("au") diff --git a/osrs/src/main/java/class173.java b/osrs/src/main/java/class173.java index 996430105..cc64d228d 100644 --- a/osrs/src/main/java/class173.java +++ b/osrs/src/main/java/class173.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,9 +8,10 @@ public class class173 extends DualNode { @ObfuscatedSignature( descriptor = "Llk;" ) - static EvictingDualNodeHashTable field1440; + @Export("e4") + static EvictingDualNodeHashTable e4; static { - field1440 = new EvictingDualNodeHashTable(64); + e4 = new EvictingDualNodeHashTable(64); } } \ No newline at end of file diff --git a/osrs/src/main/java/class182.java b/osrs/src/main/java/class182.java index 8c15f93e0..65bce2750 100644 --- a/osrs/src/main/java/class182.java +++ b/osrs/src/main/java/class182.java @@ -8,10 +8,11 @@ public class class182 extends DualNode { @ObfuscatedSignature( descriptor = "Llk;" ) - static EvictingDualNodeHashTable field1502; + @Export("e1") + static EvictingDualNodeHashTable e1; static { - field1502 = new EvictingDualNodeHashTable(64); + e1 = new EvictingDualNodeHashTable(64); } @ObfuscatedName("ah") diff --git a/osrs/src/main/java/class184.java b/osrs/src/main/java/class184.java index cb16c33c1..4412fa168 100644 --- a/osrs/src/main/java/class184.java +++ b/osrs/src/main/java/class184.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,10 +8,11 @@ public class class184 extends DualNode { @ObfuscatedSignature( descriptor = "Llk;" ) - public static EvictingDualNodeHashTable field1515; + @Export("e5") + public static EvictingDualNodeHashTable e5; static { - field1515 = new EvictingDualNodeHashTable(64); + e5 = new EvictingDualNodeHashTable(64); } @ObfuscatedName("ab") diff --git a/osrs/src/main/java/class185.java b/osrs/src/main/java/class185.java index 1e0535b7a..05ddf3b6b 100644 --- a/osrs/src/main/java/class185.java +++ b/osrs/src/main/java/class185.java @@ -8,13 +8,14 @@ public class class185 extends DualNode { @ObfuscatedSignature( descriptor = "Llk;" ) - public static EvictingDualNodeHashTable field1516; + @Export("e6") + public static EvictingDualNodeHashTable e6; @ObfuscatedName("av") @Export("Tiles_lightness") static int[] Tiles_lightness; static { - field1516 = new EvictingDualNodeHashTable(64); + e6 = new EvictingDualNodeHashTable(64); } @ObfuscatedName("ao") diff --git a/osrs/src/main/java/class191.java b/osrs/src/main/java/class191.java index 5ee17aec2..0a04726bc 100644 --- a/osrs/src/main/java/class191.java +++ b/osrs/src/main/java/class191.java @@ -10,7 +10,8 @@ public class class191 extends DualNode { @ObfuscatedSignature( descriptor = "Llk;" ) - public static EvictingDualNodeHashTable field1584; + @Export("e7") + public static EvictingDualNodeHashTable e7; @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "Lol;" @@ -23,7 +24,7 @@ public class class191 extends DualNode { static GameBuild field1585; static { - field1584 = new EvictingDualNodeHashTable(64); + e7 = new EvictingDualNodeHashTable(64); } @ObfuscatedName("au") diff --git a/osrs/src/main/java/class195.java b/osrs/src/main/java/class195.java index 878cfbb5c..b1aa61d4f 100644 --- a/osrs/src/main/java/class195.java +++ b/osrs/src/main/java/class195.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,12 +8,13 @@ public class class195 extends DualNode { @ObfuscatedSignature( descriptor = "Llk;" ) - public static EvictingDualNodeHashTable field1619; + @Export("e8") + public static EvictingDualNodeHashTable e8; @ObfuscatedName("ix") static int field1620; static { - field1619 = new EvictingDualNodeHashTable(64); + e8 = new EvictingDualNodeHashTable(64); } @ObfuscatedName("ar") diff --git a/osrs/src/main/java/class302.java b/osrs/src/main/java/class302.java index 9d2a3af0f..57e3daaf9 100644 --- a/osrs/src/main/java/class302.java +++ b/osrs/src/main/java/class302.java @@ -10,7 +10,8 @@ public class class302 { ) static ArchiveDisk field2511; @ObfuscatedName("up") - static int field2510; + @Export("cameraLookAtHeight") + static int cameraMoveToHeight; @ObfuscatedName("bo") @ObfuscatedSignature( diff --git a/osrs/src/main/java/class303.java b/osrs/src/main/java/class303.java index 06357ca66..d60288381 100644 --- a/osrs/src/main/java/class303.java +++ b/osrs/src/main/java/class303.java @@ -19,12 +19,12 @@ static final void method1628(int var0, int var1) { } if (Varcs.cameraPitch < var0) { - Varcs.cameraPitch = (var0 - Varcs.cameraPitch) * class134.cameraMoveToAcceleration / 1000 + Varcs.cameraPitch + class60.cameraLookAtSpeed; + Varcs.cameraPitch = (var0 - Varcs.cameraPitch) * class134.cameraMoveToAcceleration / 1000 + Varcs.cameraPitch + class60.cameraMoveToSpeed; if (Varcs.cameraPitch > var0) { Varcs.cameraPitch = var0; } } else if (Varcs.cameraPitch > var0) { - Varcs.cameraPitch -= (Varcs.cameraPitch - var0) * class134.cameraMoveToAcceleration / 1000 + class60.cameraLookAtSpeed; + Varcs.cameraPitch -= (Varcs.cameraPitch - var0) * class134.cameraMoveToAcceleration / 1000 + class60.cameraMoveToSpeed; if (Varcs.cameraPitch < var0) { Varcs.cameraPitch = var0; } @@ -39,10 +39,10 @@ static final void method1628(int var0, int var1) { } if (var2 > 0) { - class192.cameraYaw = class192.cameraYaw + class60.cameraLookAtSpeed + var2 * class134.cameraMoveToAcceleration / 1000; + class192.cameraYaw = class192.cameraYaw + class60.cameraMoveToSpeed + var2 * class134.cameraMoveToAcceleration / 1000; class192.cameraYaw &= 2047; } else if (var2 < 0) { - class192.cameraYaw -= class60.cameraLookAtSpeed + -var2 * class134.cameraMoveToAcceleration / 1000; + class192.cameraYaw -= class60.cameraMoveToSpeed + -var2 * class134.cameraMoveToAcceleration / 1000; class192.cameraYaw &= 2047; } diff --git a/osrs/src/main/java/class314.java b/osrs/src/main/java/class314.java index 7acba793c..1fef01cae 100644 --- a/osrs/src/main/java/class314.java +++ b/osrs/src/main/java/class314.java @@ -28,42 +28,42 @@ public class class314 { ) static final void method1649(int var0, int var1, int var2) { if (ViewportMouse.cameraX < var0) { - ViewportMouse.cameraX = (var0 - ViewportMouse.cameraX) * class1.cameraLookAtAcceleration / 1000 + ViewportMouse.cameraX + WorldMapIcon_0.cameraMoveToSpeed; + ViewportMouse.cameraX = (var0 - ViewportMouse.cameraX) * class1.cameraLookAtAcceleration / 1000 + ViewportMouse.cameraX + WorldMapIcon_0.cameraLookAtSpeed; if (ViewportMouse.cameraX > var0) { ViewportMouse.cameraX = var0; } } if (ViewportMouse.cameraX > var0) { - ViewportMouse.cameraX -= (ViewportMouse.cameraX - var0) * class1.cameraLookAtAcceleration / 1000 + WorldMapIcon_0.cameraMoveToSpeed; + ViewportMouse.cameraX -= (ViewportMouse.cameraX - var0) * class1.cameraLookAtAcceleration / 1000 + WorldMapIcon_0.cameraLookAtSpeed; if (ViewportMouse.cameraX < var0) { ViewportMouse.cameraX = var0; } } if (SecureRandomFuture.cameraY < var1) { - SecureRandomFuture.cameraY = (var1 - SecureRandomFuture.cameraY) * class1.cameraLookAtAcceleration / 1000 + SecureRandomFuture.cameraY + WorldMapIcon_0.cameraMoveToSpeed; + SecureRandomFuture.cameraY = (var1 - SecureRandomFuture.cameraY) * class1.cameraLookAtAcceleration / 1000 + SecureRandomFuture.cameraY + WorldMapIcon_0.cameraLookAtSpeed; if (SecureRandomFuture.cameraY > var1) { SecureRandomFuture.cameraY = var1; } } if (SecureRandomFuture.cameraY > var1) { - SecureRandomFuture.cameraY -= (SecureRandomFuture.cameraY - var1) * class1.cameraLookAtAcceleration / 1000 + WorldMapIcon_0.cameraMoveToSpeed; + SecureRandomFuture.cameraY -= (SecureRandomFuture.cameraY - var1) * class1.cameraLookAtAcceleration / 1000 + WorldMapIcon_0.cameraLookAtSpeed; if (SecureRandomFuture.cameraY < var1) { SecureRandomFuture.cameraY = var1; } } if (class36.cameraZ < var2) { - class36.cameraZ = (var2 - class36.cameraZ) * class1.cameraLookAtAcceleration / 1000 + class36.cameraZ + WorldMapIcon_0.cameraMoveToSpeed; + class36.cameraZ = (var2 - class36.cameraZ) * class1.cameraLookAtAcceleration / 1000 + class36.cameraZ + WorldMapIcon_0.cameraLookAtSpeed; if (class36.cameraZ > var2) { class36.cameraZ = var2; } } if (class36.cameraZ > var2) { - class36.cameraZ -= (class36.cameraZ - var2) * class1.cameraLookAtAcceleration / 1000 + WorldMapIcon_0.cameraMoveToSpeed; + class36.cameraZ -= (class36.cameraZ - var2) * class1.cameraLookAtAcceleration / 1000 + WorldMapIcon_0.cameraLookAtSpeed; if (class36.cameraZ < var2) { class36.cameraZ = var2; } diff --git a/osrs/src/main/java/class336.java b/osrs/src/main/java/class336.java index 613e84048..f5165c6ae 100644 --- a/osrs/src/main/java/class336.java +++ b/osrs/src/main/java/class336.java @@ -114,7 +114,7 @@ static final void method1740() { var2 = 0; if (var10 >= 0 || var11 != 0) { - var2 = Client.keyHandlerInstance.getKeyPressed(81) ? Client.oculusOrbSlowedSpeed * -1965908365 * 1910388411 : Client.oculusOrbNormalSpeed * -203139789 * -29381125; + var2 = Client.keyHandlerInstance.getKeyPressed(81) ? Client.oculusOrbSlowedSpeed : Client.oculusOrbNormalSpeed ; var2 *= 16; Client.field462 = var10; Client.field477 = var11; @@ -159,10 +159,10 @@ static final void method1740() { if (MouseHandler.MouseHandler_currentButton == 4 && class19.mouseCam) { var0 = MouseHandler.MouseHandler_y - Client.field464; Client.camAngleDX = var0 * 2; - Client.field464 = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.field464) / 2 : MouseHandler.MouseHandler_y * -357791911 * 1534415081; + Client.field464 = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.field464) / 2 : MouseHandler.MouseHandler_y ; var1 = Client.field478 - MouseHandler.MouseHandler_x; Client.camAngleDY = var1 * 2; - Client.field478 = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.field478) / 2 : MouseHandler.MouseHandler_x * 1619580465 * -948387119; + Client.field478 = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.field478) / 2 : MouseHandler.MouseHandler_x ; } else { if (Client.keyHandlerInstance.getKeyPressed(96)) { Client.camAngleDY += (-24 - Client.camAngleDY) / 2; diff --git a/osrs/src/main/java/class344.java b/osrs/src/main/java/class344.java index ca552012b..77d332952 100644 --- a/osrs/src/main/java/class344.java +++ b/osrs/src/main/java/class344.java @@ -64,7 +64,7 @@ static int method1878(int var0, Script var1, boolean var2) { return 1; } else if (var0 == 6765) { var5 = VerticalAlignment.getNpcDefinition(Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var5 != null ? var5.combatLevel * 550789923 * -1916672885 : 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var5 != null ? var5.combatLevel : 0; return 1; } else { return 2; diff --git a/osrs/src/main/java/class350.java b/osrs/src/main/java/class350.java index ee679221c..1a85d5a39 100644 --- a/osrs/src/main/java/class350.java +++ b/osrs/src/main/java/class350.java @@ -139,7 +139,7 @@ static int method1890(int var0, Script var1, boolean var2) { InvDefinition.clanKickUser(var5); return 1; } else if (var0 == 3618) { - Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class20.friendsChat != null ? class20.friendsChat.rank * 1192779189 * 1177118877 : 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = class20.friendsChat != null ? class20.friendsChat.rank : 0; return 1; } else if (var0 == 3619) { var5 = Interpreter.Interpreter_stringStack[--class127.Interpreter_stringStackSize]; diff --git a/osrs/src/main/java/class36.java b/osrs/src/main/java/class36.java index a735bd834..0095e5e26 100644 --- a/osrs/src/main/java/class36.java +++ b/osrs/src/main/java/class36.java @@ -147,7 +147,7 @@ static final void drawMinimap(Widget var0, int var1, int var2, int var3) { class147.drawSpriteOnMinimap(var1, var2, var12, var13, HorizontalAlignment.mapDotSprites[3], var4); } else if (class229.localPlayer.team != 0 && var16.team != 0 && var16.team == class229.localPlayer.team) { class147.drawSpriteOnMinimap(var1, var2, var12, var13, HorizontalAlignment.mapDotSprites[4], var4); - } else if (var16.method485()) { + } else if (var16.isFriendsChatMember()) { class147.drawSpriteOnMinimap(var1, var2, var12, var13, HorizontalAlignment.mapDotSprites[5], var4); } else if (var16.isClanMember()) { class147.drawSpriteOnMinimap(var1, var2, var12, var13, HorizontalAlignment.mapDotSprites[6], var4); diff --git a/osrs/src/main/java/class402.java b/osrs/src/main/java/class402.java index 70254dd6e..67d878fd0 100644 --- a/osrs/src/main/java/class402.java +++ b/osrs/src/main/java/class402.java @@ -38,7 +38,7 @@ static void method2043(int var0, String var1) { } else if (var0 == 4) { var8 = class113.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); var8.packetBuffer.writeByteSub(0); - var8.packetBuffer.writeIntME(var3[var6]); + var8.packetBuffer.writeShortAddLE(var3[var6]); Client.packetWriter.addNode(var8); } else if (var0 == 6) { var8 = class113.getPacketBufferNode(ClientPacket.OPPLAYER6, Client.packetWriter.isaacCipher); diff --git a/osrs/src/main/java/class404.java b/osrs/src/main/java/class404.java index 7775a7afd..c8ad67360 100644 --- a/osrs/src/main/java/class404.java +++ b/osrs/src/main/java/class404.java @@ -153,7 +153,7 @@ public int size() { @ObfuscatedName("offer") public boolean offer(Object var1) { if (this.field3702.containsKey(var1)) { - throw new IllegalArgumentException(""); + //throw new IllegalArgumentException(""); } else { ++this.field3700; int var2 = this.field3701; @@ -173,6 +173,8 @@ public boolean offer(Object var1) { return true; } + return true; + } @Export("poll") diff --git a/osrs/src/main/java/class406.java b/osrs/src/main/java/class406.java index 4cc49e8ed..3af592402 100644 --- a/osrs/src/main/java/class406.java +++ b/osrs/src/main/java/class406.java @@ -608,7 +608,7 @@ void method2087(int var1, int var2) { boolean var4 = (Integer)var3.field4074 == 0 && (Integer)var3.field4073 == this.field3713.size(); int var5 = (Integer)var3.field4074; int var6 = 0; - int var7 = var4 ? 0 : ((class408)this.field3713.get((Integer)var3.field4074)).field3718 * 1044781787 * -969780909; + int var7 = var4 ? 0 : ((class408)this.field3713.get((Integer)var3.field4074)).field3718; int var8 = 0; int var9; diff --git a/osrs/src/main/java/class407.java b/osrs/src/main/java/class407.java index 288e9d034..5fe3647c2 100644 --- a/osrs/src/main/java/class407.java +++ b/osrs/src/main/java/class407.java @@ -41,7 +41,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossY = var8; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - var9 = class113.getPacketBufferNode(ClientPacket.OPOBJ2, Client.packetWriter.isaacCipher); + var9 = class113.getPacketBufferNode(ClientPacket.OPOBJE, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShortAdd(var3); var9.packetBuffer.writeShort(class101.baseY + var1); var9.packetBuffer.writeShort(var0 + NewShit.baseX); @@ -59,10 +59,10 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var9 = class113.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(class101.baseY + var1); - var9.packetBuffer.writeIntME(var3); - var9.packetBuffer.writeIntME(var0 + NewShit.baseX); + var9 = class113.getPacketBufferNode(ClientPacket.OPOBJ5, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAddLE(class101.baseY + var1); + var9.packetBuffer.writeShortAddLE(var3); + var9.packetBuffer.writeShortAddLE(var0 + NewShit.baseX); var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); Client.packetWriter.addNode(var9); } @@ -96,7 +96,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.destinationY = var1; var9 = class113.getPacketBufferNode(ClientPacket.OPLOC4, Client.packetWriter.isaacCipher); var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeIntME(class101.baseY + var1); + var9.packetBuffer.writeShortAddLE(class101.baseY + var1); var9.packetBuffer.writeShort(var3); var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); Client.packetWriter.addNode(var9); @@ -114,7 +114,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.destinationX = var0; Client.destinationY = var1; var10 = class113.getPacketBufferNode(ClientPacket.OPNPC3, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeIntME(var3); + var10.packetBuffer.writeShortAddLE(var3); var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); Client.packetWriter.addNode(var10); } @@ -146,8 +146,8 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var10 = class113.getPacketBufferNode(ClientPacket.WIDGET_TYPE, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeIntME(var3); + var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYER5, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShortAddLE(var3); var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); Client.packetWriter.addNode(var10); } @@ -160,7 +160,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var9 = class113.getPacketBufferNode(ClientPacket.field2573, Client.packetWriter.isaacCipher); + var9 = class113.getPacketBufferNode(ClientPacket.OPLOC1, Client.packetWriter.isaacCipher); var9.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); var9.packetBuffer.writeShortLE(class101.baseY + var1); var9.packetBuffer.writeShort(var0 + NewShit.baseX); @@ -175,11 +175,11 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var9 = class113.getPacketBufferNode(ClientPacket.OPOBJ3, Client.packetWriter.isaacCipher); + var9 = class113.getPacketBufferNode(ClientPacket.OPOBJT, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShortLE(var0 + NewShit.baseX); var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); var9.packetBuffer.writeShortAdd(class101.baseY + var1); - var9.packetBuffer.writeIntLE(class348.selectedSpellWidget); + var9.packetBuffer.writeIntME(class348.selectedSpellWidget); var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); var9.packetBuffer.writeShort(Client.selectedSpellItemId); var9.packetBuffer.writeShortAdd(var3); @@ -193,7 +193,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var9 = class113.getPacketBufferNode(ClientPacket.field2558, Client.packetWriter.isaacCipher); + var9 = class113.getPacketBufferNode(ClientPacket.OPOBJ3, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); var9.packetBuffer.writeShort(class101.baseY + var1); var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); @@ -230,11 +230,11 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var9 = class113.getPacketBufferNode(ClientPacket.field2546, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(class101.baseY + var1); + var9 = class113.getPacketBufferNode(ClientPacket.OPOBJ4, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortAddLE(class101.baseY + var1); var9.packetBuffer.writeShort(var3); var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeIntME(var0 + NewShit.baseX); + var9.packetBuffer.writeShortAddLE(var0 + NewShit.baseX); Client.packetWriter.addNode(var9); } @@ -303,7 +303,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.destinationY = var1; var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYER4, Client.packetWriter.isaacCipher); var10.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var10.packetBuffer.writeIntME(var3); + var10.packetBuffer.writeShortAddLE(var3); Client.packetWriter.addNode(var10); } } @@ -317,11 +317,11 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.destinationY = var1; var9 = class113.getPacketBufferNode(ClientPacket.OPLOCT, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShortAdd(var3); - var9.packetBuffer.writeIntME(Client.selectedSpellItemId); + var9.packetBuffer.writeShortAddLE(Client.selectedSpellItemId); var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); var9.packetBuffer.writeShortLE(class101.baseY + var1); var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); - var9.packetBuffer.writeIntIME(class348.selectedSpellWidget); + var9.packetBuffer.writeIntLE(class348.selectedSpellWidget); var9.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); Client.packetWriter.addNode(var9); } @@ -332,7 +332,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossColor = 2; Client.mouseCrossState = 0; var9 = class113.getPacketBufferNode(ClientPacket.OPLOCE, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(var3); + var9.packetBuffer.writeShortAddLE(var3); Client.packetWriter.addNode(var9); } @@ -367,13 +367,13 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S class157.runScriptEvent(var17); } - var10 = class113.getPacketBufferNode(ClientPacket.f6, Client.packetWriter.isaacCipher); - var10.packetBuffer.method2613(class348.selectedSpellWidget); + var10 = class113.getPacketBufferNode(ClientPacket.IF_BUTTONT, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntIME(class348.selectedSpellWidget); var10.packetBuffer.writeShortAdd(var0); var10.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); - var10.packetBuffer.writeIntLE(var1); + var10.packetBuffer.writeIntME(var1); var10.packetBuffer.writeShortAdd(var4); - var10.packetBuffer.writeIntME(Client.selectedSpellItemId); + var10.packetBuffer.writeShortAddLE(Client.selectedSpellItemId); Client.packetWriter.addNode(var10); } } @@ -389,8 +389,8 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); var9.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); var9.packetBuffer.writeShortAdd(class59.field302); - var9.packetBuffer.writeIntME(var3); - var9.packetBuffer.writeIntME(class221.field1877); + var9.packetBuffer.writeShortAddLE(var3); + var9.packetBuffer.writeShortAddLE(class221.field1877); var9.packetBuffer.writeShort(class101.baseY + var1); var9.packetBuffer.writeInt(class195.field1620); Client.packetWriter.addNode(var9); @@ -454,10 +454,10 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.destinationY = var1; var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYERT, Client.packetWriter.isaacCipher); var10.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var10.packetBuffer.writeIntME(Client.selectedSpellItemId); + var10.packetBuffer.writeShortAddLE(Client.selectedSpellItemId); var10.packetBuffer.writeShortLE(var3); var10.packetBuffer.writeShortAdd(Client.selectedSpellChildIndex); - var10.packetBuffer.writeIntLE(class348.selectedSpellWidget); + var10.packetBuffer.writeIntME(class348.selectedSpellWidget); Client.packetWriter.addNode(var10); } } @@ -470,7 +470,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.destinationX = var0; Client.destinationY = var1; var9 = class113.getPacketBufferNode(ClientPacket.field2604, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntLE(class195.field1620); + var9.packetBuffer.writeIntME(class195.field1620); var9.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); var9.packetBuffer.writeShortLE(class221.field1877); @@ -494,7 +494,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S if (var19 != null) { var13 = class113.getPacketBufferNode(ClientPacket.CLOSE_MODAL, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeIntME(var19.id); + var13.packetBuffer.writeShortAddLE(var19.id); Client.packetWriter.addNode(var13); } } @@ -507,7 +507,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var9 = class113.getPacketBufferNode(ClientPacket.field2595, Client.packetWriter.isaacCipher); + var9 = class113.getPacketBufferNode(ClientPacket.OPLOC2, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShort(class101.baseY + var1); var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); var9.packetBuffer.writeByteSub(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); @@ -585,10 +585,10 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.destinationX = var0; Client.destinationY = var1; var10 = class113.getPacketBufferNode(ClientPacket.field2587, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeIntME(var3); + var10.packetBuffer.writeShortAddLE(var3); var10.packetBuffer.writeShort(class59.field302); var10.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var10.packetBuffer.writeIntIME(class195.field1620); + var10.packetBuffer.writeIntLE(class195.field1620); var10.packetBuffer.writeShort(class221.field1877); Client.packetWriter.addNode(var10); } @@ -631,10 +631,10 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var9 = class113.getPacketBufferNode(ClientPacket.OPLOC2, Client.packetWriter.isaacCipher); + var9 = class113.getPacketBufferNode(ClientPacket.OPOBJ2, Client.packetWriter.isaacCipher); var9.packetBuffer.writeByte(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); - var9.packetBuffer.writeIntME(class101.baseY + var1); + var9.packetBuffer.writeShortAddLE(class101.baseY + var1); var9.packetBuffer.writeShortLE(var3); Client.packetWriter.addNode(var9); } @@ -648,7 +648,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var10 = class113.getPacketBufferNode(ClientPacket.EVENT_MOUSE_CLICK, Client.packetWriter.isaacCipher); + var10 = class113.getPacketBufferNode(ClientPacket.OPPLAYERU, Client.packetWriter.isaacCipher); var10.packetBuffer.writeShort(class221.field1877); var10.packetBuffer.writeByteAdd(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); var10.packetBuffer.writeShortLE(class59.field302); @@ -667,7 +667,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.destinationY = var1; var9 = class113.getPacketBufferNode(ClientPacket.OPLOC3, Client.packetWriter.isaacCipher); var9.packetBuffer.writeByteNeg(Client.keyHandlerInstance.getKeyPressed(82) ? 1 : 0); - var9.packetBuffer.writeIntME(class101.baseY + var1); + var9.packetBuffer.writeShortAddLE(class101.baseY + var1); var9.packetBuffer.writeShortAdd(var0 + NewShit.baseX); var9.packetBuffer.writeShortAdd(var3); Client.packetWriter.addNode(var9); @@ -680,7 +680,7 @@ static final void menuAction(int var0, int var1, int var2, int var3, int var4, S Client.mouseCrossState = 0; Client.destinationX = var0; Client.destinationY = var1; - var9 = class113.getPacketBufferNode(ClientPacket.OPLOC1, Client.packetWriter.isaacCipher); + var9 = class113.getPacketBufferNode(ClientPacket.OPOBJ1, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShort(class101.baseY + var1); var9.packetBuffer.writeShort(var0 + NewShit.baseX); var9.packetBuffer.writeShortLE(var3); diff --git a/osrs/src/main/java/class59.java b/osrs/src/main/java/class59.java index b4104f8bb..9056e6654 100644 --- a/osrs/src/main/java/class59.java +++ b/osrs/src/main/java/class59.java @@ -164,7 +164,7 @@ static int method333(int var0, Script var1, boolean var2) { int var5; int var7; Object var21; - class518 var22; + DbTable var22; if (var0 != 7500 && var0 != 7508) { if (var0 != 7501) { int var4; @@ -270,7 +270,7 @@ static int method333(int var0, Script var1, boolean var2) { var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; var21 = WorldMapLabelSize.method1187(var3); var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; - var22 = class168.method875(var5); + var22 = class168.getDbTable(var5); if (var22 == null) { throw new RuntimeException(); } else if (SequenceDefinition.method1041(var5) != Client.field545) { @@ -298,7 +298,7 @@ static int method333(int var0, Script var1, boolean var2) { } else { --DbTableType.Interpreter_intStackSize; var3 = Interpreter.Interpreter_intStack[DbTableType.Interpreter_intStackSize]; - class518 var27 = UserComparator4.method668(var3); + DbTable var27 = UserComparator4.method668(var3); if (var27 == null) { throw new RuntimeException(); } else { @@ -330,7 +330,7 @@ static int method333(int var0, Script var1, boolean var2) { var3 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; var21 = WorldMapLabelSize.method1187(var3); var5 = Interpreter.Interpreter_intStack[--DbTableType.Interpreter_intStackSize]; - var22 = class168.method875(var5); + var22 = class168.getDbTable(var5); if (var22 == null) { throw new RuntimeException(); } else { diff --git a/osrs/src/main/java/class60.java b/osrs/src/main/java/class60.java index 7a280753a..0d4fe533d 100644 --- a/osrs/src/main/java/class60.java +++ b/osrs/src/main/java/class60.java @@ -29,7 +29,7 @@ public class class60 { static int menuY; @ObfuscatedName("uz") @Export("cameraLookAtSpeed") - static int cameraLookAtSpeed; + static int cameraMoveToSpeed; @ObfuscatedName("at") byte[] field314; @ObfuscatedName("ah") @@ -151,12 +151,12 @@ static int method338(int var0, Script var1, boolean var2) { class336 var4; if (var0 == 2617) { var4 = var3.method1872(); - Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2923 * 1307671165 * -2042671403 : 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2923 : 0; } if (var0 == 2618) { var4 = var3.method1872(); - Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2921 * -1246608637 * -1141194837 : 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2921 : 0; return 1; } else { class341 var7; @@ -166,7 +166,7 @@ static int method338(int var0, Script var1, boolean var2) { return 1; } else if (var0 == 2620) { var4 = var3.method1872(); - Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2922 * -1028807547 * -113724339 : 0; + Interpreter.Interpreter_intStack[++DbTableType.Interpreter_intStackSize - 1] = var4 != null ? var4.field2922: 0; return 1; } else if (var0 == 2621) { var7 = var3.method1871(); diff --git a/osrs/src/main/java/class72.java b/osrs/src/main/java/class72.java index deacfe351..d70bbda62 100644 --- a/osrs/src/main/java/class72.java +++ b/osrs/src/main/java/class72.java @@ -38,7 +38,7 @@ static class129 method432(int var0) { garbageValue = "1" ) public static void method431() { - class182.field1502.clear(); + class182.e1.clear(); } @ObfuscatedName("ac") diff --git a/osrs/src/main/java/class90.java b/osrs/src/main/java/class90.java index 6d5fc7a4e..d58260ae6 100644 --- a/osrs/src/main/java/class90.java +++ b/osrs/src/main/java/class90.java @@ -217,7 +217,7 @@ static final void updateNpcs(boolean var0, PacketBuffer var1) { int var23; boolean var24; if ((var22 & 4096) != 0) { - var6 = var1.readUnsignedShortAdd(); + var6 = var1.readUnsignedByteAdd(); if ((var6 & 1) == 1) { var14.method593(); } else { @@ -257,13 +257,13 @@ static final void updateNpcs(boolean var0, PacketBuffer var1) { var16 = new short[var10]; for (var23 = 0; var23 < var10; ++var23) { - var16[var23] = (short)var1.readUnsignedIntIME(); + var16[var23] = (short)var1.readUnsignedShortAdd(); } } var24 = false; if ((var6 & 16) != 0) { - var24 = var1.readUnsignedShortAdd() == 1; + var24 = var1.readUnsignedByteAdd() == 1; } var17 = (long)(++NPC.field1080 - 1); @@ -291,21 +291,21 @@ static final void updateNpcs(boolean var0, PacketBuffer var1) { if ((var22 & 262144) != 0) { var6 = var1.readUnsignedIntME(); - var14.turnLeftSequence = (var6 & 1) != 0 ? var1.readUnsignedShort() : var14.definition.turnLeftSequence * 2124045029 * 1875038957; - var14.turnRightSequence = (var6 & 2) != 0 ? var1.readUnsignedIntIME() : var14.definition.turnRightSequence * 1814511787 * -810894845; - var14.walkSequence = (var6 & 4) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.walkSequence * -980344253 * 380025451; - var14.walkBackSequence = (var6 & 8) != 0 ? var1.readUnsignedIntIME() : var14.definition.walkBackSequence * -347828473 * -666784073; - var14.walkLeftSequence = (var6 & 16) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.walkLeftSequence * -914310317 * -1721155365; - var14.walkRightSequence = (var6 & 32) != 0 ? var1.readUnsignedIntIME() : var14.definition.walkRightSequence * 1760273377 * 832299041; - var14.runSequence = (var6 & 64) != 0 ? var1.readUnsignedShortLE() : var14.definition.runSequence * -1490443197 * 795658347; - var14.runBackSequence = (var6 & 128) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.runBackSequence * -217719435 * 1622952669; - var14.runLeftSequence = (var6 & 256) != 0 ? var1.readUnsignedIntIME() : var14.definition.runLeftSequence * -556683877 * 168358035; - var14.runRightSequence = (var6 & 512) != 0 ? var1.readUnsignedShort() : var14.definition.runRightSequence * -732977015 * 1800293817; - var14.crawlSequence = (var6 & 1024) != 0 ? var1.readUnsignedIntIME() : var14.definition.crawlSequence * -400554641 * 2053962127; - var14.crawlBackSequence = (var6 & 2048) != 0 ? var1.readUnsignedShort() : var14.definition.crawlBackSequence * -418592841 * -280377849; - var14.crawlLeftSequence = (var6 & 4096) != 0 ? var1.readUnsignedIntIME() : var14.definition.crawlLeftSequence * 1849100485 * -2053163507; - var14.crawlRightSequence = (var6 & 8192) != 0 ? var1.readUnsignedIntIME() : var14.definition.crawlRightSequence * 1731690515 * 694176283; - var14.idleSequence = (var6 & 16384) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.idleSequence * 929101693 * 70810069; + var14.turnLeftSequence = (var6 & 1) != 0 ? var1.readUnsignedShort() : var14.definition.turnLeftSequence ; + var14.turnRightSequence = (var6 & 2) != 0 ? var1.readUnsignedShortAdd() : var14.definition.turnRightSequence ; + var14.walkSequence = (var6 & 4) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.walkSequence ; + var14.walkBackSequence = (var6 & 8) != 0 ? var1.readUnsignedShortAdd() : var14.definition.walkBackSequence ; + var14.walkLeftSequence = (var6 & 16) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.walkLeftSequence ; + var14.walkRightSequence = (var6 & 32) != 0 ? var1.readUnsignedShortAdd() : var14.definition.walkRightSequence ; + var14.runSequence = (var6 & 64) != 0 ? var1.readUnsignedShortLE() : var14.definition.runSequence ; + var14.runBackSequence = (var6 & 128) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.runBackSequence ; + var14.runLeftSequence = (var6 & 256) != 0 ? var1.readUnsignedShortAdd() : var14.definition.runLeftSequence ; + var14.runRightSequence = (var6 & 512) != 0 ? var1.readUnsignedShort() : var14.definition.runRightSequence ; + var14.crawlSequence = (var6 & 1024) != 0 ? var1.readUnsignedShortAdd() : var14.definition.crawlSequence ; + var14.crawlBackSequence = (var6 & 2048) != 0 ? var1.readUnsignedShort() : var14.definition.crawlBackSequence ; + var14.crawlLeftSequence = (var6 & 4096) != 0 ? var1.readUnsignedShortAdd() : var14.definition.crawlLeftSequence ; + var14.crawlRightSequence = (var6 & 8192) != 0 ? var1.readUnsignedShortAdd() : var14.definition.crawlRightSequence ; + var14.idleSequence = (var6 & 16384) != 0 ? var1.readUnsignedShortAddLE() : var14.definition.idleSequence ; } if ((var22 & 1) != 0) { @@ -354,7 +354,7 @@ static final void updateNpcs(boolean var0, PacketBuffer var1) { } if ((var22 & 8192) != 0) { - var14.combatLevelChange = var1.readIntIME(); + var14.combatLevelChange = var1.readUnsignedIntIME(); } if ((var22 & 32) != 0) { @@ -383,7 +383,7 @@ static final void updateNpcs(boolean var0, PacketBuffer var1) { } if ((var22 & 2) != 0) { - var6 = var1.readUnsignedShortAdd(); + var6 = var1.readUnsignedByteAdd(); if (var6 > 0) { for (var19 = 0; var19 < var6; ++var19) { var9 = -1; @@ -437,7 +437,7 @@ static final void updateNpcs(boolean var0, PacketBuffer var1) { for (var19 = 0; var19 < var6; ++var19) { var8 = var1.readUnsignedByte(); var9 = var1.readUnsignedShort(); - var10 = var1.readIntIME(); + var10 = var1.readUnsignedIntIME(); var14.updateSpotAnimation(var8, var9, var10 >> 16, var10 & 65535); } } @@ -492,13 +492,13 @@ static final void updateNpcs(boolean var0, PacketBuffer var1) { var16 = new short[var10]; for (var23 = 0; var23 < var10; ++var23) { - var16[var23] = (short)var1.readUnsignedIntIME(); + var16[var23] = (short)var1.readUnsignedShortAdd(); } } var24 = false; if ((var6 & 16) != 0) { - var24 = var1.readUnsignedShortAdd() == 1; + var24 = var1.readUnsignedByteAdd() == 1; } var17 = (long)(++NPC.field1081 - 1); @@ -518,7 +518,7 @@ static final void updateNpcs(boolean var0, PacketBuffer var1) { } if ((var22 & 64) != 0) { - var1.readUnsignedIntIME(); + var1.readUnsignedShortAdd(); var1.readUnsignedIntME(); } } diff --git a/osrs/src/main/java/class93.java b/osrs/src/main/java/class93.java index 4b99d87f4..4a50373e9 100644 --- a/osrs/src/main/java/class93.java +++ b/osrs/src/main/java/class93.java @@ -71,7 +71,7 @@ static final void method502(Widget var0) { if (Client.isSpellSelected) { var2 = class361.getWidgetFlags(var0); boolean var8 = (var2 >> 21 & 1) != 0; - if (var8 && (UrlRequest.field1182 & 32) == 32) { + if (var8 && (UrlRequest.selectedSpellFlags & 32) == 32) { var9 = Client.field599; String var4 = Client.field598 + " " + "->" + " " + var0.dataText; var5 = var0.childIndex; diff --git a/osrs/src/main/java/net/runelite/rs/Reflection.java b/osrs/src/main/java/net/runelite/rs/Reflection.java index 7169635c5..680f7065c 100644 --- a/osrs/src/main/java/net/runelite/rs/Reflection.java +++ b/osrs/src/main/java/net/runelite/rs/Reflection.java @@ -3,7 +3,7 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -//import net.runelite.rs.ObfuscatedClassMap; +import net.runelite.rs.ObfuscatedClassMap; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -23,7 +23,7 @@ public static void reportFindField(Class className, String fieldName) {} public static void reportInvoke(Method method, Object object, Object[] args) {} static { -/* ObfuscatedClassMap.INSTANCE.forEach((deobClassName, obfuscatedClassName) -> { + ObfuscatedClassMap.INSTANCE.forEach((deobClassName, obfuscatedClassName) -> { if (!deobClassName.contains("/") && !obfuscatedClassName.contains("/")) { Class c = null; try { @@ -33,7 +33,7 @@ public static void reportInvoke(Method method, Object object, Object[] args) {} } classes.put(obfuscatedClassName, c); } - });*/ + }); } public static Class findClass(String name) throws ClassNotFoundException { diff --git a/scripts/src/main/kotlin/meteor/scripts/AssembleScripts.kt b/scripts/src/main/kotlin/meteor/scripts/AssembleScripts.kt index 6472be05f..016358880 100644 --- a/scripts/src/main/kotlin/meteor/scripts/AssembleScripts.kt +++ b/scripts/src/main/kotlin/meteor/scripts/AssembleScripts.kt @@ -25,20 +25,13 @@ package meteor.scripts import com.google.common.io.Files -import meteor.Logger.Companion.getLogger -import java.io.File -import net.runelite.cache.script.assembler.Assembler -import net.runelite.cache.definitions.savers.ScriptSaver -import net.runelite.cache.IndexType import com.google.common.io.MoreFiles import com.google.common.io.RecursiveDeleteOption -import java.io.IOException -import java.io.FileInputStream -import java.lang.RuntimeException -import kotlin.jvm.JvmStatic -import java.io.DataOutputStream -import java.io.FileOutputStream -import java.lang.NumberFormatException +import meteor.Logger.Companion.getLogger +import net.runelite.cache.IndexType +import net.runelite.cache.definitions.savers.ScriptSaver +import net.runelite.cache.script.assembler.Assembler +import java.io.* class AssembleScripts private constructor(private val scriptDirectory: File, private val outputDirectory: File) { private val log = getLogger(AssembleScripts::class.java) @@ -67,7 +60,7 @@ class AssembleScripts private constructor(private val scriptDirectory: File, pri FileInputStream(scriptFile).use { fin -> val script = assembler.assemble(fin) val packedScript = saver.save(script) - val targetFile = File(scriptOut, Integer.toString(script.id)) + val targetFile = File(scriptOut, script.id.toString()) Files.write(packedScript, targetFile) // Copy hash file @@ -107,8 +100,7 @@ class AssembleScripts private constructor(private val scriptDirectory: File, pri if (indexFolder.isDirectory) { val indexId = indexFolder.name.toInt() for (archiveFile in indexFolder.listFiles()) { - var archiveId: Int - archiveId = try { + val archiveId: Int = try { archiveFile.name.toInt() } catch (ex: NumberFormatException) { continue diff --git a/scripts/src/main/scripts/CombatInterfaceSP.hash b/scripts/src/main/scripts/CombatInterfaceSP.hash index aac2533be..e4ae6b0cc 100644 --- a/scripts/src/main/scripts/CombatInterfaceSP.hash +++ b/scripts/src/main/scripts/CombatInterfaceSP.hash @@ -1 +1 @@ -2FC8550899F90C47C4B86863A8287C1381FE594088C821EF32533D1F447C2372 \ No newline at end of file +E201FF4289808D0410C8F3896365385C0254CB3F632C4CD556692EEC5B608489 \ No newline at end of file diff --git a/scripts/src/main/scripts/CombatInterfaceSP.rs2asm b/scripts/src/main/scripts/CombatInterfaceSP.rs2asm index 5601e0c12..8a8db3bef 100644 --- a/scripts/src/main/scripts/CombatInterfaceSP.rs2asm +++ b/scripts/src/main/scripts/CombatInterfaceSP.rs2asm @@ -22,6 +22,13 @@ if_setonvartransmit iconst 186 iload 0 + iconst 3 + iconst 1 + sconst "IY" + iload 0 + if_setonstattransmit + iconst 186 + iload 0 iconst 94 iconst 1 sconst "IY" diff --git a/scripts/src/main/scripts/CommandScript.hash b/scripts/src/main/scripts/CommandScript.hash deleted file mode 100644 index 95b738283..000000000 --- a/scripts/src/main/scripts/CommandScript.hash +++ /dev/null @@ -1 +0,0 @@ -2BCAAB2E9DD0FA4284107C7B73FE722A2B63F2024ADD4AD8430724078A2CC1FE \ No newline at end of file diff --git a/scripts/src/main/scripts/CommandScript.rs2asm b/scripts/src/main/scripts/CommandScript.rs2asm deleted file mode 100644 index 8430fed12..000000000 --- a/scripts/src/main/scripts/CommandScript.rs2asm +++ /dev/null @@ -1,1084 +0,0 @@ -.id 73 -.int_stack_count 2 -.string_stack_count 0 -.int_var_count 10 -.string_var_count 0 - iconst 10616885 - if_gethide - iconst 1 - if_icmpeq LABEL9 - iconst 10616886 - if_gethide - iconst 1 - if_icmpeq LABEL9 - jump LABEL10 -LABEL9: - return -LABEL10: - get_varbit 8119 - iconst 0 - if_icmpeq LABEL19 - iconst -1 - iconst 162 - invoke 1701 - iconst 0 - if_icmpeq LABEL19 - jump LABEL20 -LABEL19: - return -LABEL20: - get_varc_string 335 - string_length - istore 2 - iconst 0 - istore 3 - staffmodlevel - iconst 0 - if_icmpgt LABEL29 - jump LABEL60 -LABEL29: - iconst 1 - istore 3 - sconst "`" - iload 1 - string_indexof_char - iconst -1 - if_icmpne LABEL37 - jump LABEL42 -LABEL37: - iload 2 - iconst 0 - if_icmpeq LABEL41 - jump LABEL42 -LABEL41: - return -LABEL42: - sconst ":" - iload 1 - string_indexof_char - iconst -1 - if_icmpne LABEL48 - jump LABEL60 -LABEL48: - get_varc_string 335 - sconst "::" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL55 - jump LABEL60 -LABEL55: - iload 2 - iconst 2 - if_icmpeq LABEL59 - jump LABEL60 -LABEL59: - return -LABEL60: - iconst 0 - istore 4 - iconst -1 - istore 5 - iconst 0 - istore 6 - iconst -1 - istore 7 - iconst 0 - istore 8 - iconst -1 - istore 9 - iload 0 - iconst 84 - if_icmpeq LABEL76 - jump LABEL801 -LABEL76: - invoke 1984 - iload 2 - iconst 0 - if_icmpgt LABEL81 - jump LABEL800 -LABEL81: - iload 3 - iconst 1 - if_icmpeq LABEL85 - jump LABEL152 -LABEL85: - sconst "give" - iload 2 - invoke 4481 - iconst 1 - if_icmpeq LABEL91 - jump LABEL95 -LABEL91: - get_varc_string 335 - string_length - istore 2 - jump LABEL152 -LABEL95: - sconst "set" - iload 2 - invoke 4481 - iconst 1 - if_icmpeq LABEL101 - jump LABEL105 -LABEL101: - get_varc_string 335 - string_length - istore 2 - jump LABEL152 -LABEL105: - sconst "get" - iload 2 - invoke 4481 - iconst 1 - if_icmpeq LABEL111 - jump LABEL115 -LABEL111: - get_varc_string 335 - string_length - istore 2 - jump LABEL152 -LABEL115: - sconst "tele" - iload 2 - invoke 4481 - iconst 1 - if_icmpeq LABEL121 - jump LABEL125 -LABEL121: - get_varc_string 335 - string_length - istore 2 - jump LABEL152 -LABEL125: - sconst "~" - iload 2 - invoke 4481 - iconst 1 - if_icmpeq LABEL131 - jump LABEL135 -LABEL131: - get_varc_string 335 - string_length - istore 2 - jump LABEL152 -LABEL135: - get_varc_string 335 - sconst "::" - iconst 0 - string_indexof_string - istore 7 - iload 7 - iconst 0 - if_icmpgt LABEL144 - jump LABEL152 -LABEL144: - get_varc_string 335 - iload 7 - iload 2 - substring - set_varc_string 335 - get_varc_string 335 - string_length - istore 2 -LABEL152: - get_varc_string 335 - sconst "::" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL159 - jump LABEL162 -LABEL159: - iconst 1 - istore 4 - jump LABEL188 -LABEL162: - get_varc_int 41 - iconst 5 - if_icmpeq LABEL166 - jump LABEL169 -LABEL166: - iconst 41 - istore 5 - jump LABEL188 -LABEL169: - get_varc_int 41 - iconst 4 - if_icmpeq LABEL173 - jump LABEL176 -LABEL173: - iconst 9 - istore 5 - jump LABEL188 -LABEL176: - get_varc_int 41 - iconst 6 - if_icmpeq LABEL180 - jump LABEL188 -LABEL180: - invoke 5262 - iconst 1 - if_icmpeq LABEL184 - jump LABEL188 -LABEL184: - iconst 41 - iconst 1 - istore 8 - istore 5 -LABEL188: - get_varc_string 335 - sconst "////" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL195 - jump LABEL223 -LABEL195: - invoke 5262 - iconst 1 - if_icmpeq LABEL199 - jump LABEL223 -LABEL199: - iconst 4 - iconst 41 - iconst 1 - istore 8 - istore 5 - istore 6 - get_varc_string 335 - sconst "////@" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL212 - jump LABEL216 -LABEL212: - iconst 4 - istore 9 - iconst 5 - istore 6 -LABEL216: - get_varbit 13120 - iconst 1 - if_icmpeq LABEL220 - jump LABEL222 -LABEL220: - iconst 4 - istore 9 -LABEL222: - jump LABEL558 -LABEL223: - get_varc_string 335 - sconst "///" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL230 - jump LABEL252 -LABEL230: - iconst 3 - iconst 44 - istore 5 - istore 6 - get_varc_string 335 - sconst "///@" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL241 - jump LABEL245 -LABEL241: - iconst 3 - istore 9 - iconst 4 - istore 6 -LABEL245: - get_varbit 13120 - iconst 1 - if_icmpeq LABEL249 - jump LABEL251 -LABEL249: - iconst 3 - istore 9 -LABEL251: - jump LABEL558 -LABEL252: - get_varc_string 335 - sconst "//" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL259 - jump LABEL281 -LABEL259: - iconst 2 - iconst 41 - istore 5 - istore 6 - get_varc_string 335 - sconst "//@" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL270 - jump LABEL274 -LABEL270: - iconst 2 - istore 9 - iconst 3 - istore 6 -LABEL274: - get_varbit 13120 - iconst 1 - if_icmpeq LABEL278 - jump LABEL280 -LABEL278: - iconst 2 - istore 9 -LABEL280: - jump LABEL558 -LABEL281: - get_varc_string 335 - lowercase - sconst "/gc " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL296 - get_varc_string 335 - lowercase - sconst "/@gc " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL296 - jump LABEL319 -LABEL296: - iconst 4 - iconst 44 - istore 5 - istore 6 - get_varc_string 335 - lowercase - sconst "/@gc " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL308 - jump LABEL312 -LABEL308: - iconst 3 - istore 9 - iconst 5 - istore 6 -LABEL312: - get_varbit 13120 - iconst 1 - if_icmpeq LABEL316 - jump LABEL318 -LABEL316: - iconst 3 - istore 9 -LABEL318: - jump LABEL558 -LABEL319: - get_varc_string 335 - lowercase - sconst "/c " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL334 - get_varc_string 335 - lowercase - sconst "/@c " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL334 - jump LABEL356 -LABEL334: - iconst 3 - iconst 41 - istore 5 - istore 6 - get_varc_string 335 - sconst "/@c " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL345 - jump LABEL349 -LABEL345: - iconst 2 - istore 9 - iconst 4 - istore 6 -LABEL349: - get_varbit 13120 - iconst 1 - if_icmpeq LABEL353 - jump LABEL355 -LABEL353: - iconst 2 - istore 9 -LABEL355: - jump LABEL558 -LABEL356: - invoke 5262 - iconst 1 - if_icmpeq LABEL360 - jump LABEL399 -LABEL360: - get_varc_string 335 - lowercase - sconst "/g " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL375 - get_varc_string 335 - lowercase - sconst "/@g " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL375 - jump LABEL399 -LABEL375: - iconst 3 - iconst 41 - iconst 1 - istore 8 - istore 5 - istore 6 - get_varc_string 335 - sconst "/@g " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL388 - jump LABEL392 -LABEL388: - iconst 4 - istore 9 - iconst 4 - istore 6 -LABEL392: - get_varbit 13120 - iconst 1 - if_icmpeq LABEL396 - jump LABEL398 -LABEL396: - iconst 4 - istore 9 -LABEL398: - jump LABEL558 -LABEL399: - get_varc_string 335 - lowercase - sconst "/f " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL413 - get_varc_string 335 - sconst "/@f " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL413 - jump LABEL435 -LABEL413: - iconst 3 - iconst 9 - istore 5 - istore 6 - get_varc_string 335 - sconst "/@f " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL424 - jump LABEL428 -LABEL424: - iconst 1 - istore 9 - iconst 4 - istore 6 -LABEL428: - get_varbit 13120 - iconst 1 - if_icmpeq LABEL432 - jump LABEL434 -LABEL432: - iconst 1 - istore 9 -LABEL434: - jump LABEL558 -LABEL435: - get_varc_string 335 - lowercase - sconst "/p " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL449 - get_varc_string 335 - sconst "/@p " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL449 - jump LABEL471 -LABEL449: - iconst 3 - iconst 2 - istore 5 - istore 6 - get_varc_string 335 - sconst "/@p " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL460 - jump LABEL464 -LABEL460: - iconst 0 - istore 9 - iconst 4 - istore 6 -LABEL464: - get_varbit 13120 - iconst 1 - if_icmpeq LABEL468 - jump LABEL470 -LABEL468: - iconst 0 - istore 9 -LABEL470: - jump LABEL558 -LABEL471: - get_varc_string 335 - sconst "/" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL478 - jump LABEL558 -LABEL478: - get_varc_string 335 - sconst "/@p" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL485 - jump LABEL492 -LABEL485: - iconst 0 - iconst 2 - iconst 3 - istore 6 - istore 5 - istore 9 - jump LABEL558 -LABEL492: - get_varc_string 335 - sconst "/@f" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL499 - jump LABEL506 -LABEL499: - iconst 1 - iconst 9 - iconst 3 - istore 6 - istore 5 - istore 9 - jump LABEL558 -LABEL506: - get_varc_string 335 - sconst "/@c" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL513 - jump LABEL520 -LABEL513: - iconst 2 - iconst 41 - iconst 3 - istore 6 - istore 5 - istore 9 - jump LABEL558 -LABEL520: - get_varc_string 335 - sconst "/@gc" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL527 - jump LABEL534 -LABEL527: - iconst 3 - iconst 44 - iconst 4 - istore 6 - istore 5 - istore 9 - jump LABEL558 -LABEL534: - get_varc_string 335 - sconst "/@g" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL541 - jump LABEL548 -LABEL541: - iconst 4 - iconst 41 - iconst 3 - istore 6 - istore 5 - istore 9 - jump LABEL558 -LABEL548: - iconst 1 - iconst 9 - istore 5 - istore 6 - get_varbit 13120 - iconst 1 - if_icmpeq LABEL556 - jump LABEL558 -LABEL556: - iconst 1 - istore 9 -LABEL558: - iload 5 - iconst 44 - if_icmpeq LABEL562 - jump LABEL596 -LABEL562: - activeclansettings_find_listened - iconst 1 - if_icmpeq LABEL566 - jump LABEL593 -LABEL566: - activeclanchannel_find_listened - iconst 1 - if_icmpeq LABEL570 - jump LABEL593 -LABEL570: - activeclansettings_getallowunaffined - iconst 1 - if_icmpeq LABEL574 - jump LABEL590 -LABEL574: - get_varclansetting 33 - switch - 1001: LABEL577 - 1002: LABEL577 - 1003: LABEL577 - 1004: LABEL577 - 1005: LABEL577 - 1006: LABEL577 - jump LABEL580 -LABEL577: - sconst "You are not chatting as a guest in a channel at the moment." - mes - jump LABEL589 -LABEL580: - get_varc_string 335 - iload 6 - iload 2 - substring - iconst 4 - iconst 0 - iconst 0 - iload 9 - invoke 5517 -LABEL589: - jump LABEL592 -LABEL590: - sconst "Guests are not invited to speak in this clan's channel." - mes -LABEL592: - jump LABEL595 -LABEL593: - sconst "You are not chatting as a guest in a clan channel at the moment." - mes -LABEL595: - jump LABEL796 -LABEL596: - iload 5 - iconst 41 - if_icmpeq LABEL600 - jump LABEL664 -LABEL600: - iload 8 - iconst 0 - if_icmpeq LABEL604 - jump LABEL635 -LABEL604: - iconst 0 - activeclanchannel_find_affined - iconst 1 - if_icmpeq LABEL609 - jump LABEL635 -LABEL609: - chat_playername - removetags - activeclanchannel_getuserslot - istore 7 - iload 7 - iconst -1 - if_icmpne LABEL617 - jump LABEL632 -LABEL617: - iload 7 - activeclanchannel_getuserrank - activeclanchannel_getranktalk - if_icmpge LABEL622 - jump LABEL632 -LABEL622: - get_varc_string 335 - iload 6 - iload 2 - substring - iconst 3 - iconst 0 - iconst 0 - iload 9 - invoke 5517 - jump LABEL634 -LABEL632: - sconst "You do not have the required rank to talk in the clan's channel." - mes -LABEL634: - jump LABEL663 -LABEL635: - iload 8 - iconst 1 - if_icmpeq LABEL639 - jump LABEL654 -LABEL639: - iconst 1 - activeclanchannel_find_affined - iconst 1 - if_icmpeq LABEL644 - jump LABEL654 -LABEL644: - get_varc_string 335 - iload 6 - iload 2 - substring - iconst 3 - iconst 1 - iconst 0 - iload 9 - invoke 5517 - jump LABEL663 -LABEL654: - iload 8 - iconst 1 - if_icmpeq LABEL658 - jump LABEL661 -LABEL658: - sconst "You are not chatting in the channel of your Iron Group at the moment." - mes - jump LABEL663 -LABEL661: - sconst "You are not chatting in the channel of your Clan at the moment." - mes -LABEL663: - jump LABEL796 -LABEL664: - iload 5 - iconst 9 - if_icmpeq LABEL668 - jump LABEL698 -LABEL668: - clan_getchatcount - iconst 0 - if_icmpgt LABEL672 - jump LABEL688 -LABEL672: - get_varbit 4394 - iconst 1 - if_icmpeq LABEL676 - jump LABEL678 -LABEL676: - clan_leavechat - jump LABEL687 -LABEL678: - get_varc_string 335 - iload 6 - iload 2 - substring - iconst 2 - iconst -1 - iconst 0 - iload 9 - invoke 5517 -LABEL687: - jump LABEL697 -LABEL688: - get_varc_string 335 - iload 6 - iload 2 - substring - iconst 0 - iconst -1 - iconst 0 - iconst -1 - invoke 5517 -LABEL697: - jump LABEL796 -LABEL698: - iload 5 - iconst 2 - if_icmpeq LABEL702 - jump LABEL712 -LABEL702: - get_varc_string 335 - iload 6 - iload 2 - substring - iconst 0 - iconst -1 - iconst 0 - iload 9 - invoke 5517 - jump LABEL796 -LABEL712: - iload 4 - iconst 1 - if_icmpeq LABEL716 - jump LABEL790 -LABEL716: - iload 2 - iconst 2 - if_icmpgt LABEL720 - jump LABEL783 -LABEL720: - ; move chatout_add under if ($length2 > 2) to only add for :: commands - get_varc_string 335 - invoke 77 ; chatout_add - get_varc_string 335 - sconst "::toggleroof" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL727 - jump LABEL742 -LABEL727: - iconst 1 - 3215 - iconst 1 - if_icmpeq LABEL732 - jump LABEL737 -LABEL732: - iconst 0 - invoke 4583 - sconst "Roofs will only be removed selectively. This setting will not be saved." - mes - jump LABEL741 -LABEL737: - iconst 1 - invoke 4583 - sconst "Roofs are now all hidden. This setting will not be saved." - mes -LABEL741: - jump LABEL782 -LABEL742: - get_varc_string 335 - sconst "::wiki " - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL754 - get_varc_string 335 - sconst "::wiki" - compare - iconst 0 - if_icmpeq LABEL754 - sconst "runeliteCommand" ; load callback name - runelite_callback ; invoke callback - jump LABEL757 -LABEL754: - get_varc_string 335 - invoke 3299 - jump LABEL782 -LABEL757: - get_varc_string 335 - sconst "::bank" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL764 - jump LABEL771 -LABEL764: - sconst "Hey, everyone, I just tried to do something very silly!" - iconst 0 - iconst -1 - iconst 0 - iconst -1 - invoke 5517 - jump LABEL782 -LABEL771: - get_varc_string 335 - invoke 224 - set_varc_string 335 - get_varc_string 335 - string_length - istore 2 - get_varc_string 335 - iconst 2 - iload 2 - substring - docheat -LABEL782: - jump LABEL789 -LABEL783: - get_varc_string 335 - iconst 0 - iconst -1 - iconst 0 - iconst -1 - invoke 5517 -LABEL789: - jump LABEL796 -LABEL790: - get_varc_string 335 - iconst 0 - iconst -1 - iconst 1 - iload 9 - invoke 5517 -LABEL796: - ; see comment above - jump AFTER_CHATOUT_ADD - get_varc_string 335 - invoke 77 -AFTER_CHATOUT_ADD: - sconst "" - set_varc_string 335 -LABEL800: - jump LABEL876 -LABEL801: - iload 0 - iconst 104 - if_icmpeq LABEL805 - jump LABEL811 -LABEL805: - iload 3 - sconst "devtoolsEnabled" - runelite_callback - iconst 1 - if_icmpeq LABEL809 - jump LABEL810 -LABEL809: - invoke 75 -LABEL810: - jump LABEL876 -LABEL811: - iload 0 - iconst 105 - if_icmpeq LABEL815 - jump LABEL821 -LABEL815: - iload 3 - sconst "devtoolsEnabled" - runelite_callback - iconst 1 - if_icmpeq LABEL819 - jump LABEL820 -LABEL819: - invoke 76 -LABEL820: - jump LABEL876 -LABEL821: - iload 0 - iconst 80 - if_icmpeq LABEL825 - jump LABEL870 -LABEL825: - iconst 40697936 - iconst 1 - cc_find - iconst 1 - if_icmpeq LABEL831 - jump LABEL832 -LABEL831: - return -LABEL832: - get_varc_string 356 - string_length - iconst 0 - if_icmpgt LABEL837 - jump LABEL857 -LABEL837: - get_varc_string 356 - friend_test - iconst 1 - if_icmpeq LABEL842 - jump LABEL845 -LABEL842: - get_varc_string 356 - invoke 107 - return -LABEL845: - get_varc_int 60 - clientclock - if_icmpgt LABEL849 - jump LABEL850 -LABEL849: - return -LABEL850: - clientclock - iconst 50 - add - set_varc_int 60 - sconst "That player was not found on your Friends list." - mes - return -LABEL857: - get_varc_int 60 - clientclock - if_icmpgt LABEL861 - jump LABEL862 -LABEL861: - return -LABEL862: - clientclock - iconst 50 - add - set_varc_int 60 - sconst "You haven't received any messages to which you can reply." - mes - return - jump LABEL876 -LABEL870: - get_varc_string 335 - iconst 0 - iload 0 - iload 1 - invoke 74 - iconst 1 ; check if we're ignoring input - iconst 0 ; - sconst "blockChatInput" ; - runelite_callback ; - if_icmpeq SKIPSETVARC ; skip setting varc with input - set_varc_string 335 - jump LABEL876 ; jump over SKIPSETVARC -SKIPSETVARC: - pop_string ; pop message -LABEL876: - invoke 223 - return diff --git a/scripts/src/main/scripts/ToplevelCompassOp.hash b/scripts/src/main/scripts/ToplevelCompassOp.hash deleted file mode 100644 index 2d66d7aca..000000000 --- a/scripts/src/main/scripts/ToplevelCompassOp.hash +++ /dev/null @@ -1 +0,0 @@ -9365BC83CB2365C7BC3FBFC90C01232DD242740014E14D456BBAA0622D5570F0 \ No newline at end of file diff --git a/scripts/src/main/scripts/ToplevelCompassOp.rs2asm b/scripts/src/main/scripts/ToplevelCompassOp.rs2asm deleted file mode 100644 index 437356a25..000000000 --- a/scripts/src/main/scripts/ToplevelCompassOp.rs2asm +++ /dev/null @@ -1,70 +0,0 @@ -.id 1050 -.int_stack_count 1 -.string_stack_count 0 -.int_var_count 1 -.string_var_count 0 - iload 0 - iconst 4 - if_icmpgt LABEL10 - get_varbit 542 - iconst 1 - if_icmpeq LABEL10 - get_varbit 4606 - iconst 0 - if_icmpne LABEL10 - jump LABEL11 -LABEL10: - return -LABEL11: - iconst 2266 - iconst 1 - iconst 0 - sound_synth - iload 0 - switch - 1: LABEL18 - 2: LABEL25 - 3: LABEL32 - 4: LABEL39 - jump LABEL45 -LABEL18: - iconst 225 - iconst 5 - randominc - add - sconst "lookPreservePitch" - runelite_callback - iconst 0 - cam_forceangle - jump LABEL45 -LABEL25: - iconst 225 - iconst 5 - randominc - add - sconst "lookPreservePitch" - runelite_callback - iconst 1536 - cam_forceangle - jump LABEL45 -LABEL32: - iconst 225 - iconst 5 - randominc - add - sconst "lookPreservePitch" - runelite_callback - iconst 1024 - cam_forceangle - jump LABEL45 -LABEL39: - iconst 225 - iconst 5 - randominc - add - sconst "lookPreservePitch" - runelite_callback - iconst 512 - cam_forceangle -LABEL45: - return